X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-svc.c;h=c52ad654a0fb2eff8ab0b9799331d53dfe644381;hb=13bd63c1bd4055cba1316042267b31c4776af256;hp=03ff4b84b830ccb7a8853968ec49e1b2653a9b0b;hpb=5b5a2e4412eea806451c016da9fb285bc09c17ab;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-svc.c b/src/afb-svc.c
index 03ff4b84..c52ad654 100644
--- a/src/afb-svc.c
+++ b/src/afb-svc.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 "IoT.bzh"
+ * Copyright (C) 2016, 2017 "IoT.bzh"
  * Author: José Bollo <jose.bollo@iot.bzh>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -24,7 +24,7 @@
 #include <afb/afb-req-itf.h>
 #include <afb/afb-service-itf.h>
 
-#include "session.h"
+#include "afb-session.h"
 #include "afb-context.h"
 #include "afb-evt.h"
 #include "afb-subcall.h"
@@ -36,7 +36,7 @@
 struct afb_svc
 {
 	/* session of the service */
-	struct AFB_clientCtx *session;
+	struct afb_session *session;
 
 	/* event listener of the service or NULL */
 	struct afb_evt_listener *listener;
@@ -64,7 +64,7 @@ struct svc_req
 };
 
 /* functions for services */
-static void svc_on_event(struct afb_svc *svc, const char *event, struct json_object *object);
+static void svc_on_event(struct afb_svc *svc, const char *event, int eventid, struct json_object *object);
 static void svc_call(struct afb_svc *svc, const char *api, const char *verb, struct json_object *args,
 				void (*callback)(void*, int, struct json_object*), void *closure);
 
@@ -73,6 +73,12 @@ static const struct afb_service_itf service_itf = {
 	.call = (void*)svc_call
 };
 
+/* the interface for events */
+static const struct afb_evt_itf evt_itf = {
+	.broadcast = (void*)svc_on_event,
+	.push = (void*)svc_on_event
+};
+
 /* functions for requests of services */
 static void svcreq_addref(struct svc_req *svcreq);
 static void svcreq_unref(struct svc_req *svcreq);
@@ -94,8 +100,8 @@ const struct afb_req_itf afb_svc_req_itf = {
 	.subcall = (void*)svcreq_subcall
 };
 
-/* the common session for services sahring their session */
-static struct AFB_clientCtx *common_session;
+/* the common session for services sharing their session */
+static struct afb_session *common_session;
 
 /*
  * Creates a new service
@@ -114,23 +120,24 @@ struct afb_svc *afb_svc_create(int share_session, int (*init)(struct afb_service
 	if (share_session) {
 		/* session shared with other svcs */
 		if (common_session == NULL) {
-			common_session = ctxClientCreate (NULL, 0);
+			common_session = afb_session_create (NULL, 0);
 			if (common_session == NULL)
 				goto error2;
 		}
-		svc->session = ctxClientAddRef(common_session);
+		svc->session = afb_session_addref(common_session);
 	} else {
 		/* session dedicated to the svc */
-		svc->session = ctxClientCreate (NULL, 0);
+		svc->session = afb_session_create (NULL, 0);
 		if (svc->session == NULL)
 			goto error2;
 	}
 
 	/* initialises the listener if needed */
+	svc->on_event = on_event;
 	if (on_event == NULL)
 		svc->listener = NULL;
 	else {
-		svc->listener = afb_evt_listener_create((void*)svc_on_event, svc);
+		svc->listener = afb_evt_listener_create(&evt_itf, svc);
 		if (svc->listener == NULL)
 			goto error3;
 	}
@@ -146,7 +153,7 @@ error4:
 	if (svc->listener != NULL)
 		afb_evt_listener_unref(svc->listener);
 error3:
-	ctxClientUnref(svc->session);
+	afb_session_unref(svc->session);
 error2:
 	free(svc);
 error:
@@ -156,9 +163,10 @@ error:
 /*
  * Propagates the event to the service
  */
-static void svc_on_event(struct afb_svc *svc, const char *event, struct json_object *object)
+static void svc_on_event(struct afb_svc *svc, const char *event, int eventid, struct json_object *object)
 {
 	svc->on_event(event, object);
+	json_object_put(object);
 }
 
 /*