X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-api-so-v1.c;h=739d2557c9a7053ded1d4bc2cc1d59902e4081b9;hb=22cba30f139a006fadb5fdf521f9c4c5bfbfac4a;hp=4bfd8d99397e0b8a9f444de777d727bfe6f48d1d;hpb=863a97b989aecce8b52a09168c0668ad40df8e1c;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-api-so-v1.c b/src/afb-api-so-v1.c
index 4bfd8d99..739d2557 100644
--- a/src/afb-api-so-v1.c
+++ b/src/afb-api-so-v1.c
@@ -16,7 +16,7 @@
  */
 
 #define _GNU_SOURCE
-#define NO_BINDING_VERBOSE_MACRO
+#define AFB_BINDING_PRAGMA_NO_VERBOSE_MACRO
 
 #include <string.h>
 #include <dlfcn.h>
@@ -27,6 +27,7 @@
 #include <afb/afb-binding.h>
 
 #include "afb-api.h"
+#include "afb-api-so-v1.h"
 #include "afb-apiset.h"
 #include "afb-svc.h"
 #include "afb-evt.h"
@@ -70,11 +71,7 @@ static void call_cb(void *closure, struct afb_xreq *xreq)
 	struct api_so_v1 *desc = closure;
 
 	verb = search(desc, xreq->verb);
-	if (!verb)
-		afb_xreq_fail_unknown_verb(xreq);
-	else
-		if (!xreq_session_check_apply(xreq, verb->session))
-			afb_xreq_call(xreq, verb->callback);
+	afb_xreq_call_verb_v1(xreq, verb);
 }
 
 static int service_start_cb(void *closure, int share_session, int onneed, struct afb_apiset *apiset)
@@ -109,7 +106,7 @@ static int service_start_cb(void *closure, int share_session, int onneed, struct
 
 	/* get the event handler if any */
 	onevent = dlsym(desc->handle, afb_api_so_v1_service_event);
-	desc->service = afb_svc_create(apiset, share_session, init, onevent);
+	desc->service = afb_svc_create_v1(apiset, share_session, init, onevent);
 	if (desc->service == NULL) {
 		/* starting error */
 		ERROR("Starting service %s failed", desc->binding->v1.prefix);
@@ -154,8 +151,6 @@ struct json_object *describe_cb(void *closure)
 		a = json_object_new_array();
 		json_object_object_add(f, "name", json_object_new_string(verb->name));
 		json_object_object_add(f, "info", json_object_new_string(verb->info));
-		if (verb->session & AFB_SESSION_CREATE)
-			json_object_array_add(a, json_object_new_string("session-create"));
 		if (verb->session & AFB_SESSION_CLOSE)
 			json_object_array_add(a, json_object_new_string("session-close"));
 		if (verb->session & AFB_SESSION_RENEW)
@@ -210,7 +205,7 @@ int afb_api_so_v1_add(const char *path, void *handle, struct afb_apiset *apiset)
 	desc->handle = handle;
 
 	/* init the interface */
-	afb_ditf_init(&desc->ditf, path);
+	afb_ditf_init_v1(&desc->ditf, path);
 
 	/* init the binding */
 	NOTICE("binding [%s] calling registering function %s", path, afb_api_so_v1_register);