X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-ditf.c;h=4ee5af7f11fa84a36f7796c783df3eaa23d25653;hb=52384789f904e7ebbfb901e15cc62521c9b9468f;hp=9d65d30c138430c99aa75103a3f3195309d71a01;hpb=05e0214d821f1a7604b4a0897907f347761b56e6;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-ditf.c b/src/afb-ditf.c
index 9d65d30c..4ee5af7f 100644
--- a/src/afb-ditf.c
+++ b/src/afb-ditf.c
@@ -16,14 +16,15 @@
  */
 
 #define _GNU_SOURCE
-#define NO_BINDING_VERBOSE_MACRO
 
+#include <stdio.h>
 #include <string.h>
 #include <errno.h>
 
 #include <json-c/json.h>
 
-#include <afb/afb-binding.h>
+#include <afb/afb-binding-v1.h>
+#include <afb/afb-binding-v2.h>
 
 #include "afb-ditf.h"
 #include "afb-evt.h"
@@ -105,16 +106,16 @@ static int queue_job_cb(void *closure, void (*callback)(int signum, void *arg),
 static void hooked_vverbose_cb(void *closure, int level, const char *file, int line, const char *function, const char *fmt, va_list args)
 {
 	struct afb_ditf *ditf = closure;
+	va_list ap;
+	va_copy(ap, args);
 	vverbose_cb(closure, level, file, line, function, fmt, args);
-	afb_hook_ditf_vverbose(ditf, level, file, line, function, fmt, args);
-	vverbose_cb(closure, level, file, line, function, fmt, args);
+	afb_hook_ditf_vverbose(ditf, level, file, line, function, fmt, ap);
+	va_end(ap);
 }
 
 static void hooked_old_vverbose_cb(void *closure, int level, const char *file, int line, const char *fmt, va_list args)
 {
-	struct afb_ditf *ditf = closure;
-	old_vverbose_cb(closure, level, file, line, fmt, args);
-	afb_hook_ditf_vverbose(ditf, level, file, line, "", fmt, args);
+	hooked_vverbose_cb(closure, level, file, line, "?", fmt, args);
 }
 
 static struct afb_event hooked_event_make_cb(void *closure, const char *name)
@@ -179,7 +180,8 @@ static int hooked_queue_job_cb(void *closure, void (*callback)(int signum, void
 }
 
 static const struct afb_daemon_itf daemon_itf = {
-	.vverbose = old_vverbose_cb,
+	.vverbose_v1 = old_vverbose_cb,
+	.vverbose_v2 = vverbose_cb,
 	.event_make = event_make_cb,
 	.event_broadcast = event_broadcast_cb,
 	.get_event_loop = afb_common_get_event_loop,
@@ -191,7 +193,8 @@ static const struct afb_daemon_itf daemon_itf = {
 };
 
 static const struct afb_daemon_itf hooked_daemon_itf = {
-	.vverbose = hooked_old_vverbose_cb,
+	.vverbose_v1 = hooked_old_vverbose_cb,
+	.vverbose_v2 = hooked_vverbose_cb,
 	.event_make = hooked_event_make_cb,
 	.event_broadcast = hooked_event_broadcast_cb,
 	.get_event_loop = hooked_get_event_loop,
@@ -202,11 +205,21 @@ static const struct afb_daemon_itf hooked_daemon_itf = {
 	.queue_job = hooked_queue_job_cb
 };
 
-void afb_ditf_init(struct afb_ditf *ditf, const char *prefix)
+void afb_ditf_init_v2(struct afb_ditf *ditf, const char *prefix, struct afb_binding_data_v2 *data)
 {
-	ditf->interface.verbosity = verbosity;
-	ditf->interface.mode = AFB_MODE_LOCAL;
-	ditf->interface.daemon.closure = ditf;
+	ditf->version = 2;
+	ditf->v2 = data;
+	data->daemon.closure = ditf;
+	afb_ditf_rename(ditf, prefix);
+}
+
+void afb_ditf_init_v1(struct afb_ditf *ditf, const char *prefix, struct afb_binding_interface_v1 *itf)
+{
+	ditf->version = 1;
+	ditf->v1 = itf;
+	itf->verbosity = verbosity;
+	itf->mode = AFB_MODE_LOCAL;
+	itf->daemon.closure = ditf;
 	afb_ditf_rename(ditf, prefix);
 }
 
@@ -218,9 +231,15 @@ void afb_ditf_rename(struct afb_ditf *ditf, const char *prefix)
 
 void afb_ditf_update_hook(struct afb_ditf *ditf)
 {
-	if (afb_hook_flags_ditf(ditf->prefix))
-		ditf->interface.daemon.itf = &hooked_daemon_itf;
-	else
-		ditf->interface.daemon.itf = &daemon_itf;
+	int hooked = !!afb_hook_flags_ditf(ditf->prefix);
+	switch (ditf->version) {
+	case 1:
+		ditf->v1->daemon.itf = hooked ? &hooked_daemon_itf : &daemon_itf;
+		break;
+	default:
+	case 2:
+		ditf->v2->daemon.itf = hooked ? &hooked_daemon_itf : &daemon_itf;
+		break;
+	}
 }