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

diff --git a/bindings/samples/HelloWorld.c b/bindings/samples/HelloWorld.c
index 77de24a2..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,19 +414,19 @@ 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
@@ -418,6 +439,7 @@ static const afb_verb_v2 verbs[]= {
   { .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 },