Introduce afb_eventid

[src/app-framework-binder.git] / src / afb-stub-ws.c

diff --git a/src/afb-stub-ws.c b/src/afb-stub-ws.c
index 083f72b..e7c8997 100644 (file)
--- a/src/afb-stub-ws.c
+++ b/src/afb-stub-ws.c
@@ -35,7 +35,7 @@
 #include <json-c/json.h>
 #include <systemd/sd-event.h>
 
-#include <afb/afb-event-itf.h>
+#include <afb/afb-event.h>
 
 #include "afb-common.h"
 
@@ -211,7 +211,7 @@ static int server_req_subscribe_cb(struct afb_xreq *xreq, struct afb_event event
 
        rc = afb_evt_add_watch(wreq->stubws->listener, event);
        if (rc >= 0)
-               rc = afb_proto_ws_call_subscribe(wreq->call,  afb_evt_event_name(event), afb_evt_event_id(event));
+               rc = afb_proto_ws_call_subscribe(wreq->call,  afb_evt_event_fullname(event), afb_evt_event_id(event));
        if (rc < 0)
                ERROR("error while subscribing event");
        return rc;
@@ -222,7 +222,7 @@ static int server_req_unsubscribe_cb(struct afb_xreq *xreq, struct afb_event eve
        int rc, rc2;
        struct server_req *wreq = CONTAINER_OF_XREQ(struct server_req, xreq);
 
-       rc = afb_proto_ws_call_unsubscribe(wreq->call,  afb_evt_event_name(event), afb_evt_event_id(event));
+       rc = afb_proto_ws_call_unsubscribe(wreq->call,  afb_evt_event_fullname(event), afb_evt_event_id(event));
        rc2 = afb_evt_remove_watch(wreq->stubws->listener, event);
        if (rc >= 0 && rc2 < 0)
                rc = rc2;
@@ -248,7 +248,7 @@ static struct client_event *client_event_search(struct afb_stub_ws *stubws, uint
        struct client_event *ev;
 
        ev = stubws->events;
-       while (ev != NULL && (ev->eventid != eventid || 0 != strcmp(afb_evt_event_name(ev->event), name)))
+       while (ev != NULL && (ev->eventid != eventid || 0 != strcmp(afb_evt_event_fullname(ev->event), name)))
                ev = ev->next;
 
        return ev;
@@ -260,7 +260,7 @@ static void client_call_cb(void * closure, struct afb_xreq *xreq)
        struct afb_stub_ws *stubws = closure;
 
        afb_proto_ws_client_call(stubws->proto, xreq->verb, afb_xreq_json(xreq), afb_session_uuid(xreq->context.session), xreq);
-       afb_xreq_addref(xreq);
+       afb_xreq_unhooked_addref(xreq);
 }
 
 static void client_on_description_cb(void *closure, struct json_object *data)
@@ -334,7 +334,7 @@ static void on_reply_success(void *closure, void *request, struct json_object *r
        struct afb_xreq *xreq = request;
 
        afb_xreq_success(xreq, result, *info ? info : NULL);
-       afb_xreq_unref(xreq);
+       afb_xreq_unhooked_unref(xreq);
 }
 
 static void on_reply_fail(void *closure, void *request, const char *status, const char *info)
@@ -342,7 +342,7 @@ static void on_reply_fail(void *closure, void *request, const char *status, cons
        struct afb_xreq *xreq = request;
 
        afb_xreq_fail(xreq, status, *info ? info : NULL);
-       afb_xreq_unref(xreq);
+       afb_xreq_unhooked_unref(xreq);
 }
 
 static void on_event_create(void *closure, const char *event_name, int event_id)
@@ -394,7 +394,7 @@ static void on_event_remove(void *closure, const char *event_name, int event_id)
        *prv = ev->next;
 
        /* destroys the event */
-       afb_event_drop(ev->event);
+       afb_event_unref(ev->event);
        free(ev);
 }
 
@@ -585,7 +585,7 @@ static void drop_all_events(struct afb_stub_ws *stubws)
 
        while (ev) {
                nxt = ev->next;
-               afb_event_drop(ev->event);
+               afb_event_unref(ev->event);
                free(ev);
                ev = nxt;
        }
@@ -680,7 +680,7 @@ struct afb_api afb_stub_ws_client_api(struct afb_stub_ws *stubws)
        assert(!stubws->listener); /* check client */
        api.closure = stubws;
        api.itf = &ws_api_itf;
-       api.noconcurrency = 0;
+       api.group = NULL;
        return api;
 }