X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-stub-ws.c;h=693a0d0c03e4aec8a7036ba7ef135ae77931080b;hb=d35293b1f03edc446900dcdcce941c83178271d7;hp=2b6a2328a152a600e109eff42b26d93bf85fa5a7;hpb=7a7268a5697b0b988bcabc00390878edee941b4e;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-stub-ws.c b/src/afb-stub-ws.c
index 2b6a2328..693a0d0c 100644
--- a/src/afb-stub-ws.c
+++ b/src/afb-stub-ws.c
@@ -33,7 +33,6 @@
 #include <pthread.h>
 
 #include <json-c/json.h>
-#include <systemd/sd-event.h>
 
 #include <afb/afb-event.h>
 
@@ -209,9 +208,9 @@ static int server_req_subscribe_cb(struct afb_xreq *xreq, struct afb_eventid *ev
 	int rc;
 	struct server_req *wreq = CONTAINER_OF_XREQ(struct server_req, xreq);
 
-	rc = afb_evt_add_watch(wreq->stubws->listener, event);
+	rc = afb_evt_eventid_add_watch(wreq->stubws->listener, event);
 	if (rc >= 0)
-		rc = afb_proto_ws_call_subscribe(wreq->call,  afb_evt_event_fullname(event), afb_evt_event_id(event));
+		rc = afb_proto_ws_call_subscribe(wreq->call,  afb_evt_eventid_fullname(event), afb_evt_eventid_id(event));
 	if (rc < 0)
 		ERROR("error while subscribing event");
 	return rc;
@@ -222,8 +221,8 @@ static int server_req_unsubscribe_cb(struct afb_xreq *xreq, struct afb_eventid *
 	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_fullname(event), afb_evt_event_id(event));
-	rc2 = afb_evt_remove_watch(wreq->stubws->listener, event);
+	rc = afb_proto_ws_call_unsubscribe(wreq->call,  afb_evt_eventid_fullname(event), afb_evt_eventid_id(event));
+	rc2 = afb_evt_eventid_remove_watch(wreq->stubws->listener, event);
 	if (rc >= 0 && rc2 < 0)
 		rc = rc2;
 	if (rc < 0)
@@ -248,7 +247,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->id != eventid || 0 != strcmp(afb_evt_event_fullname(ev->eventid), name)))
+	while (ev != NULL && (ev->id != eventid || 0 != strcmp(afb_evt_eventid_fullname(ev->eventid), name)))
 		ev = ev->next;
 
 	return ev;
@@ -360,7 +359,7 @@ static void on_event_create(void *closure, const char *event_name, int event_id)
 	/* no conflict, try to add it */
 	ev = malloc(sizeof *ev);
 	if (ev != NULL) {
-		ev->eventid = afb_evt_create_event(event_name);
+		ev->eventid = afb_evt_eventid_create(event_name);
 		if (ev->eventid != NULL) {
 			ev->refcount = 1;
 			ev->id = event_id;
@@ -394,7 +393,7 @@ static void on_event_remove(void *closure, const char *event_name, int event_id)
 	*prv = ev->next;
 
 	/* destroys the event */
-	afb_evt_event_unref(ev->eventid);
+	afb_evt_eventid_unref(ev->eventid);
 	free(ev);
 }
 
@@ -436,7 +435,7 @@ static void on_event_push(void *closure, const char *event_name, int event_id, s
 	/* check conflicts */
 	ev = client_event_search(stubws, event_id, event_name);
 	if (ev)
-		afb_evt_push(ev->eventid, data);
+		afb_evt_eventid_push(ev->eventid, data);
 	else
 		ERROR("unreadable push event");
 }
@@ -480,6 +479,7 @@ static void on_call(void *closure, struct afb_proto_ws_call *call, const char *v
 	/* init the context */
 	if (afb_context_connect(&wreq->xreq.context, sessionid, NULL) < 0)
 		goto unconnected;
+	wreq->xreq.context.validated = 1;
 
 	/* makes the call */
 	wreq->xreq.cred = afb_cred_addref(stubws->cred);
@@ -585,7 +585,7 @@ static void drop_all_events(struct afb_stub_ws *stubws)
 
 	while (ev) {
 		nxt = ev->next;
-		afb_evt_event_unref(ev->eventid);
+		afb_evt_eventid_unref(ev->eventid);
 		free(ev);
 		ev = nxt;
 	}
@@ -611,9 +611,9 @@ static struct afb_stub_ws *afb_stub_ws_create(int fd, const char *apiname, struc
 		errno = ENOMEM;
 	else {
 		if (client)
-			stubws->proto = afb_proto_ws_create_client(fd, &client_itf, stubws);
+			stubws->proto = afb_proto_ws_create_client(afb_common_get_event_loop(), fd, &client_itf, stubws);
 		else
-			stubws->proto = afb_proto_ws_create_server(fd, &server_itf, stubws);
+			stubws->proto = afb_proto_ws_create_server(afb_common_get_event_loop(), fd, &server_itf, stubws);
 		if (stubws->proto != NULL) {
 			strcpy(stubws->apiname, apiname);
 			stubws->apiset = afb_apiset_addref(apiset);