hs-proxy: Avoid creating a client context 43/26043/3
authorMarius Vlad <marius.vlad@collabora.com>
Mon, 15 Feb 2021 11:51:13 +0000 (13:51 +0200)
committerMarius Vlad <marius.vlad@collabora.com>
Wed, 3 Mar 2021 14:41:47 +0000 (16:41 +0200)
The subscribe mechanism requires that the client itself performs the
subscribe (it assumes a unique, distinct afb_req_t type in order to
create the client context) and attempting to handle one,
automatically would not really work, so only use it (the fake sub mechanism)
the keep track of application w/ the help of the client_list.

Bug-AGL: SPEC-3796

Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
Change-Id: I783614e1db83280878b77b786e4f80fccd1a74a1

src/hs-proxy.cpp

index 33cfce3..7571dad 100644 (file)
@@ -56,7 +56,6 @@ static void api_callback(void *closure, struct json_object *object, const char *
 
     /* if we have an error then we couldn't start the application so we remove it */
     if (error) {
-           clientManager->removeClientCtxt(cdata->clientCtx);
            clientManager->removeClient(cdata->appid);
     }
 
@@ -179,12 +178,6 @@ void HS_AfmMainProxy::start(struct hs_instance *instance, afb_req_t request, con
            return;
     }
 
-    cdata->clientCtx = clientManager->createClientCtxt(request, id);
-    HS_Client *client = clientManager->addClient(request, id);
-    if (client) {
-           if (client->handleRequest(request, "subscribe"))
-                   AFB_WARNING("Failed to handle subcribe\n");
-    }
-
+    clientManager->addClient(request, id);
     api_call(request->api, _afm_main, __FUNCTION__, json_object_new_string(id.c_str()), cdata);
 }