X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=bindings%2Fsamples%2FHelloWorld.c;h=002c4721720dcc159dd312af87793a8073f98add;hb=04186fd953298be8b8c5673b5fcd01f0893986ff;hp=0f58a43b26d3a2d14504b6916f75c1f132ee3363;hpb=b67e18b39830a01750721787bf3bdc5d71983144;p=src%2Fapp-framework-binder.git

diff --git a/bindings/samples/HelloWorld.c b/bindings/samples/HelloWorld.c
index 0f58a43b..002c4721 100644
--- a/bindings/samples/HelloWorld.c
+++ b/bindings/samples/HelloWorld.c
@@ -169,10 +169,10 @@ static void pingJson (afb_req request) {
     ping(request, jresp, "pingJson");
 }
 
-static void subcallcb (void *prequest, int iserror, json_object *object)
+static void subcallcb (void *prequest, int status, json_object *object)
 {
 	afb_req request = afb_req_unstore(prequest);
-	if (iserror)
+	if (status < 0)
 		afb_req_fail(request, "failed", json_object_to_json_string(object));
 	else
 		afb_req_success(request, json_object_get(object), NULL);
@@ -192,6 +192,27 @@ static void subcall (afb_req request)
 		afb_req_subcall(request, api, verb, object, subcallcb, afb_req_store(request));
 }
 
+static void subcallreqcb (void *prequest, int status, json_object *object, afb_req request)
+{
+	if (status < 0)
+		afb_req_fail(request, "failed", json_object_to_json_string(object));
+	else
+		afb_req_success(request, json_object_get(object), NULL);
+}
+
+static void subcallreq (afb_req request)
+{
+	const char *api = afb_req_value(request, "api");
+	const char *verb = afb_req_value(request, "verb");
+	const char *args = afb_req_value(request, "args");
+	json_object *object = api && verb && args ? json_tokener_parse(args) : NULL;
+
+	if (object == NULL)
+		afb_req_fail(request, "failed", "bad arguments");
+	else
+		afb_req_subcall_req(request, api, verb, object, subcallreqcb, NULL);
+}
+
 static void subcallsync (afb_req request)
 {
 	int rc;
@@ -204,7 +225,7 @@ static void subcallsync (afb_req request)
 		afb_req_fail(request, "failed", "bad arguments");
 	else {
 		rc = afb_req_subcall_sync(request, api, verb, object, &result);
-		if (rc)
+		if (rc >= 0)
 			afb_req_success(request, result, NULL);
 		else {
 			afb_req_fail(request, "failed", json_object_to_json_string(result));
@@ -287,10 +308,10 @@ static void eventpush (afb_req request)
 	json_object_put(object);
 }
 
-static void callcb (void *prequest, int iserror, json_object *object)
+static void callcb (void *prequest, int status, json_object *object)
 {
 	afb_req request = afb_req_unstore(prequest);
-	if (iserror)
+	if (status < 0)
 		afb_req_fail(request, "failed", json_object_to_json_string(object));
 	else
 		afb_req_success(request, json_object_get(object), NULL);
@@ -322,7 +343,7 @@ static void callsync (afb_req request)
 		afb_req_fail(request, "failed", "bad arguments");
 	else {
 		rc = afb_service_call_sync(api, verb, object, &result);
-		if (rc)
+		if (rc >= 0)
 			afb_req_success(request, result, NULL);
 		else {
 			afb_req_fail(request, "failed", json_object_to_json_string(result));
@@ -361,7 +382,7 @@ static void exitnow (afb_req request)
 	if (!json_object_object_get_ex(query,"reason",&l))
 		l = NULL;
 
-	REQ_NOTICE(request, "in phase of exiting with code %d, reason: %s", code, l ? json_object_get_string(l) : "unknown");
+	AFB_REQ_NOTICE(request, "in phase of exiting with code %d, reason: %s", code, l ? json_object_get_string(l) : "unknown");
 	afb_req_success(request, NULL, NULL);
 	exit(code);
 }
@@ -393,43 +414,44 @@ static void broadcast(afb_req request)
 
 static int preinit()
 {
-	NOTICE("hello binding comes to live");
+	AFB_NOTICE("hello binding comes to live");
 	return 0;
 }
 
 static int init()
 {
-	NOTICE("hello binding starting");
+	AFB_NOTICE("hello binding starting");
 	return 0;
 }
 
 static void onevent(const char *event, struct json_object *object)
 {
-	NOTICE("received event %s(%s)", event, json_object_to_json_string(object));
+	AFB_NOTICE("received event %s(%s)", event, json_object_to_json_string(object));
 }
 
 // NOTE: this sample does not use session to keep test a basic as possible
 //       in real application most APIs should be protected with AFB_SESSION_CHECK
 static const afb_verb_v2 verbs[]= {
-  { "ping"     ,    pingSample , NULL, AFB_SESSION_NONE },
-  { "pingfail" ,    pingFail   , NULL, AFB_SESSION_NONE },
-  { "pingnull" ,    pingNull   , NULL, AFB_SESSION_NONE },
-  { "pingbug"  ,    pingBug    , NULL, AFB_SESSION_NONE },
-  { "pingJson" ,    pingJson   , NULL, AFB_SESSION_NONE },
-  { "pingevent",    pingEvent  , NULL, AFB_SESSION_NONE },
-  { "subcall",      subcall    , NULL, AFB_SESSION_NONE },
-  { "subcallsync",  subcallsync, NULL, AFB_SESSION_NONE },
-  { "eventadd",     eventadd   , NULL, AFB_SESSION_NONE },
-  { "eventdel",     eventdel   , NULL, AFB_SESSION_NONE },
-  { "eventsub",     eventsub   , NULL, AFB_SESSION_NONE },
-  { "eventunsub",   eventunsub , NULL, AFB_SESSION_NONE },
-  { "eventpush",    eventpush  , NULL, AFB_SESSION_NONE },
-  { "call",         call       , NULL, AFB_SESSION_NONE },
-  { "callsync",     callsync   , NULL, AFB_SESSION_NONE },
-  { "verbose",      verbose    , NULL, AFB_SESSION_NONE },
-  { "broadcast",    broadcast  , NULL, AFB_SESSION_NONE },
-  { "exit",         exitnow    , NULL, AFB_SESSION_NONE },
-  { NULL}
+  { .verb="ping",        .callback=pingSample },
+  { .verb="pingfail",    .callback=pingFail },
+  { .verb="pingnull",    .callback=pingNull },
+  { .verb="pingbug",     .callback=pingBug },
+  { .verb="pingJson",    .callback=pingJson },
+  { .verb="pingevent",   .callback=pingEvent },
+  { .verb="subcall",     .callback=subcall },
+  { .verb="subcallreq",  .callback=subcallreq },
+  { .verb="subcallsync", .callback=subcallsync },
+  { .verb="eventadd",    .callback=eventadd },
+  { .verb="eventdel",    .callback=eventdel },
+  { .verb="eventsub",    .callback=eventsub },
+  { .verb="eventunsub",  .callback=eventunsub },
+  { .verb="eventpush",   .callback=eventpush },
+  { .verb="call",        .callback=call },
+  { .verb="callsync",    .callback=callsync },
+  { .verb="verbose",     .callback=verbose },
+  { .verb="broadcast",   .callback=broadcast },
+  { .verb="exit",        .callback=exitnow },
+  { .verb=NULL}
 };
 
 const afb_binding_v2 afbBindingV2 = {