X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=bindings%2Fsamples%2FHelloWorld.c;h=844aa1b2c3b0614e987a17197f38f8ef98ec35dc;hb=e84fc44c47b42651fef17405f5bc09e5079d4a72;hp=cb4a5a4ad0e79b3c8539b8eb9bc93811e912dca3;hpb=6797f9722dd3e5463e0f7c118397955bb59a40c7;p=src%2Fapp-framework-binder.git

diff --git a/bindings/samples/HelloWorld.c b/bindings/samples/HelloWorld.c
index cb4a5a4a..844aa1b2 100644
--- a/bindings/samples/HelloWorld.c
+++ b/bindings/samples/HelloWorld.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015, 2016, 2017 "IoT.bzh"
+ * Copyright (C) 2015-2018 "IoT.bzh"
  * Author "Fulup Ar Foll"
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,16 +17,19 @@
 #define _GNU_SOURCE
 #include <stdio.h>
 #include <string.h>
+#include <pthread.h>
+
 #include <json-c/json.h>
 
+#define AFB_BINDING_VERSION 3
 #include <afb/afb-binding.h>
 
-const struct afb_binding_interface *interface;
+static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
 
 struct event
 {
 	struct event *next;
-	struct afb_event event;
+	afb_event_t event;
 	char tag[1];
 };
 
@@ -56,7 +59,7 @@ static int event_del(const char *tag)
 	*p = e->next;
 
 	/* destroys */
-	afb_event_drop(e->event);
+	afb_event_unref(e->event);
 	free(e);
 	return 0;
 }
@@ -76,8 +79,8 @@ static int event_add(const char *tag, const char *name)
 	strcpy(e->tag, tag);
 
 	/* make the event */
-	e->event = afb_daemon_make_event(interface->daemon, name);
-	if (!e->event.closure) { free(e); return -1; }
+	e->event = afb_daemon_make_event(name);
+	if (!e->event) { free(e); return -1; }
 
 	/* link */
 	e->next = events;
@@ -85,14 +88,14 @@ static int event_add(const char *tag, const char *name)
 	return 0;
 }
 
-static int event_subscribe(struct afb_req request, const char *tag)
+static int event_subscribe(afb_req_t request, const char *tag)
 {
 	struct event *e;
 	e = event_get(tag);
 	return e ? afb_req_subscribe(request, e->event) : -1;
 }
 
-static int event_unsubscribe(struct afb_req request, const char *tag)
+static int event_unsubscribe(afb_req_t request, const char *tag)
 {
 	struct event *e;
 	e = event_get(tag);
@@ -106,44 +109,51 @@ static int event_push(struct json_object *args, const char *tag)
 	return e ? afb_event_push(e->event, json_object_get(args)) : -1;
 }
 
+static int event_broadcast(struct json_object *args, const char *tag)
+{
+	struct event *e;
+	e = event_get(tag);
+	return e ? afb_event_broadcast(e->event, json_object_get(args)) : -1;
+}
+
 // Sample Generic Ping Debug API
-static void ping(struct afb_req request, json_object *jresp, const char *tag)
+static void ping(afb_req_t request, json_object *jresp, const char *tag)
 {
 	static int pingcount = 0;
 	json_object *query = afb_req_json(request);
 	afb_req_success_f(request, jresp, "Ping Binder Daemon tag=%s count=%d query=%s", tag, ++pingcount, json_object_to_json_string(query));
 }
 
-static void pingSample (struct afb_req request)
+static void pingSample (afb_req_t request)
 {
 	ping(request, json_object_new_string ("Some String"), "pingSample");
 }
 
-static void pingFail (struct afb_req request)
+static void pingFail (afb_req_t request)
 {
 	afb_req_fail(request, "failed", "Ping Binder Daemon fails");
 }
 
-static void pingNull (struct afb_req request)
+static void pingNull (afb_req_t request)
 {
 	ping(request, NULL, "pingNull");
 }
 
-static void pingBug (struct afb_req request)
+static void pingBug (afb_req_t request)
 {
-	ping((struct afb_req){NULL,NULL}, NULL, "pingBug");
+	ping(NULL, NULL, "pingBug");
 }
 
-static void pingEvent(struct afb_req request)
+static void pingEvent(afb_req_t request)
 {
 	json_object *query = afb_req_json(request);
-	afb_daemon_broadcast_event(interface->daemon, "event", json_object_get(query));
+	afb_daemon_broadcast_event("event", json_object_get(query));
 	ping(request, json_object_get(query), "event");
 }
 
 
 // For samples https://linuxprograms.wordpress.com/2010/05/20/json-c-libjson-tutorial/
-static void pingJson (struct afb_req request) {
+static void pingJson (afb_req_t request) {
     json_object *jresp, *embed;
 
     jresp = json_object_new_object();
@@ -159,17 +169,12 @@ static void pingJson (struct afb_req request) {
     ping(request, jresp, "pingJson");
 }
 
-static void subcallcb (void *prequest, int iserror, json_object *object)
+static void subcallcb (void *closure, json_object *object, const char *error, const char *info, afb_req_t request)
 {
-	struct afb_req request = afb_req_unstore(prequest);
-	if (iserror)
-		afb_req_fail(request, "failed", json_object_to_json_string(object));
-	else
-		afb_req_success(request, object, NULL);
-	afb_req_unref(request);
+        afb_req_reply(request, json_object_get(object), error, info);
 }
 
-static void subcall (struct afb_req request)
+static void subcall (afb_req_t request)
 {
 	const char *api = afb_req_value(request, "api");
 	const char *verb = afb_req_value(request, "verb");
@@ -179,107 +184,268 @@ static void subcall (struct afb_req request)
 	if (object == NULL)
 		afb_req_fail(request, "failed", "bad arguments");
 	else
-		afb_req_subcall(request, api, verb, object, subcallcb, afb_req_store(request));
+		afb_req_subcall(request, api, verb, object, afb_req_subcall_pass_events, subcallcb, NULL);
 }
 
-static void eventadd (struct afb_req request)
+static void subcallsync (afb_req_t request)
+{
+	int rc;
+	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 *result, *object = api && verb && args ? json_tokener_parse(args) : NULL;
+
+	if (object == NULL)
+		afb_req_fail(request, "failed", "bad arguments");
+	else {
+		rc = afb_req_subcall_sync_legacy(request, api, verb, object, &result);
+		if (rc >= 0)
+			afb_req_success(request, result, NULL);
+		else {
+			afb_req_fail(request, "failed", json_object_to_json_string(result));
+			json_object_put(result);
+		}
+	}
+}
+
+static void eventadd (afb_req_t request)
 {
 	const char *tag = afb_req_value(request, "tag");
 	const char *name = afb_req_value(request, "name");
 
+	pthread_mutex_lock(&mutex);
 	if (tag == NULL || name == NULL)
 		afb_req_fail(request, "failed", "bad arguments");
 	else if (0 != event_add(tag, name))
 		afb_req_fail(request, "failed", "creation error");
 	else
 		afb_req_success(request, NULL, NULL);
+	pthread_mutex_unlock(&mutex);
 }
 
-static void eventdel (struct afb_req request)
+static void eventdel (afb_req_t request)
 {
 	const char *tag = afb_req_value(request, "tag");
 
+	pthread_mutex_lock(&mutex);
 	if (tag == NULL)
 		afb_req_fail(request, "failed", "bad arguments");
 	else if (0 != event_del(tag))
 		afb_req_fail(request, "failed", "deletion error");
 	else
 		afb_req_success(request, NULL, NULL);
+	pthread_mutex_unlock(&mutex);
 }
 
-static void eventsub (struct afb_req request)
+static void eventsub (afb_req_t request)
 {
 	const char *tag = afb_req_value(request, "tag");
 
+	pthread_mutex_lock(&mutex);
 	if (tag == NULL)
 		afb_req_fail(request, "failed", "bad arguments");
 	else if (0 != event_subscribe(request, tag))
 		afb_req_fail(request, "failed", "subscription error");
 	else
 		afb_req_success(request, NULL, NULL);
+	pthread_mutex_unlock(&mutex);
 }
 
-static void eventunsub (struct afb_req request)
+static void eventunsub (afb_req_t request)
 {
 	const char *tag = afb_req_value(request, "tag");
 
+	pthread_mutex_lock(&mutex);
 	if (tag == NULL)
 		afb_req_fail(request, "failed", "bad arguments");
 	else if (0 != event_unsubscribe(request, tag))
 		afb_req_fail(request, "failed", "unsubscription error");
 	else
 		afb_req_success(request, NULL, NULL);
+	pthread_mutex_unlock(&mutex);
 }
 
-static void eventpush (struct afb_req request)
+static void eventpush (afb_req_t request)
 {
 	const char *tag = afb_req_value(request, "tag");
 	const char *data = afb_req_value(request, "data");
 	json_object *object = data ? json_tokener_parse(data) : NULL;
 
+	pthread_mutex_lock(&mutex);
 	if (tag == NULL)
 		afb_req_fail(request, "failed", "bad arguments");
 	else if (0 > event_push(object, tag))
 		afb_req_fail(request, "failed", "push error");
 	else
 		afb_req_success(request, NULL, NULL);
+	pthread_mutex_unlock(&mutex);
+	json_object_put(object);
 }
 
-static void exitnow (struct afb_req request)
+static void callcb (void *prequest, json_object *object, const char *error, const char *info, afb_api_t api)
 {
-	exit(0);
+	afb_req_t request = prequest;
+	afb_req_reply(request, json_object_get(object), error, info);
+	afb_req_unref(request);
+}
+
+static void call (afb_req_t 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;
+
+	afb_service_call(api, verb, object, callcb, afb_req_addref(request));
+}
+
+static void callsync (afb_req_t 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;
+	json_object *result;
+	char *error, *info;
+
+	afb_service_call_sync(api, verb, object, &result, &error, &info);
+	afb_req_reply(request, result, error, info);
+	free(error);
+	free(info);
+}
+
+static void verbose (afb_req_t request)
+{
+	int level = 5;
+	json_object *query = afb_req_json(request), *l;
+
+	if (json_object_is_type(query,json_type_int))
+		level = json_object_get_int(query);
+	else if (json_object_object_get_ex(query, "level", &l) && json_object_is_type(l, json_type_int))
+		level = json_object_get_int(l);
+
+	if (!json_object_object_get_ex(query,"message",&l))
+		l = query;
+
+	AFB_REQ_VERBOSE(request, level, "verbose called for %s", json_object_get_string(l));
+	afb_req_success(request, NULL, NULL);
+}
+
+static void exitnow (afb_req_t request)
+{
+	int code = 0;
+	json_object *query = afb_req_json(request), *l;
+
+	if (json_object_is_type(query,json_type_int))
+		code = json_object_get_int(query);
+	else if (json_object_object_get_ex(query, "code", &l) && json_object_is_type(l, json_type_int))
+		code = json_object_get_int(l);
+
+	if (!json_object_object_get_ex(query,"reason",&l))
+		l = NULL;
+
+	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);
+}
+
+static void broadcast(afb_req_t request)
+{
+	const char *tag = afb_req_value(request, "tag");
+	const char *name = afb_req_value(request, "name");
+	const char *data = afb_req_value(request, "data");
+	json_object *object = data ? json_tokener_parse(data) : NULL;
+
+	if (tag != NULL) {
+		pthread_mutex_lock(&mutex);
+		if (0 > event_broadcast(object, tag))
+			afb_req_fail(request, "failed", "broadcast error");
+		else
+			afb_req_success(request, NULL, NULL);
+		pthread_mutex_unlock(&mutex);
+	} else if (name != NULL) {
+		if (0 > afb_daemon_broadcast_event(name, object))
+			afb_req_fail(request, "failed", "broadcast error");
+		else
+			afb_req_success(request, NULL, NULL);
+	} else {
+		afb_req_fail(request, "failed", "bad arguments");
+	}
+	json_object_put(object);
+}
+
+static void hasperm (afb_req_t request)
+{
+	const char *perm = afb_req_value(request, "perm");
+	if (afb_req_has_permission(request, perm))
+		afb_req_success_f(request, NULL, "permission %s granted", perm?:"(null)");
+	else
+		afb_req_fail_f(request, "not-granted", "permission %s NOT granted", perm?:"(null)");
+}
+
+static void appid (afb_req_t request)
+{
+	char *aid = afb_req_get_application_id(request);
+	afb_req_success_f(request, aid ? json_object_new_string(aid) : NULL, "application is %s", aid?:"?");
+	free(aid);
+}
+
+static void uid (afb_req_t request)
+{
+	int uid = afb_req_get_uid(request);
+	afb_req_success_f(request, json_object_new_int(uid), "uid is %d", uid);
+}
+
+static int preinit(afb_api_t api)
+{
+	AFB_API_NOTICE(api, "hello binding comes to live");
+	return 0;
+}
+
+static int init(afb_api_t api)
+{
+	AFB_API_NOTICE(api, "hello binding starting");
+	return 0;
+}
+
+static void onevent(afb_api_t api, const char *event, struct json_object *object)
+{
+	AFB_API_NOTICE(api, "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 struct afb_verb_desc_v1 verbs[]= {
-  {"ping"     , AFB_SESSION_NONE, pingSample  , "Ping Application Framework"},
-  {"pingfail" , AFB_SESSION_NONE, pingFail    , "Fails"},
-  {"pingnull" , AFB_SESSION_NONE, pingNull    , "Return NULL"},
-  {"pingbug"  , AFB_SESSION_NONE, pingBug     , "Do a Memory Violation"},
-  {"pingJson" , AFB_SESSION_NONE, pingJson    , "Return a JSON object"},
-  {"pingevent", AFB_SESSION_NONE, pingEvent   , "Send an event"},
-  {"subcall",   AFB_SESSION_NONE, subcall     , "Call api/verb(args)"},
-  {"eventadd",  AFB_SESSION_NONE, eventadd    , "adds the event of 'name' for the 'tag'"},
-  {"eventdel",  AFB_SESSION_NONE, eventdel    , "deletes the event of 'tag'"},
-  {"eventsub",  AFB_SESSION_NONE, eventsub    , "subscribes to the event of 'tag'"},
-  {"eventunsub",AFB_SESSION_NONE, eventunsub  , "unsubscribes to the event of 'tag'"},
-  {"eventpush", AFB_SESSION_NONE, eventpush   , "pushs the event of 'tag' with the 'data'"},
-  {"exit",      AFB_SESSION_NONE, exitnow     , "exits from afb-daemon"},
-  {NULL}
+static const struct afb_verb_v3 verbs[]= {
+  { .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="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="hasperm",     .callback=hasperm },
+  { .verb="appid",       .callback=appid },
+  { .verb="uid",         .callback=uid },
+  { .verb="exit",        .callback=exitnow },
+  { .verb=NULL}
 };
 
-static const struct afb_binding plugin_desc = {
-	.type = AFB_BINDING_VERSION_1,
-	.v1 = {
-		.info = "Minimal Hello World Sample",
-		.prefix = "hello",
-		.verbs = verbs
-	}
+const struct afb_binding_v3 afbBindingV3 = {
+	.api = "hello",
+	.specification = NULL,
+	.verbs = verbs,
+	.preinit = preinit,
+	.init = init,
+	.onevent = onevent
 };
 
-const struct afb_binding *afbBindingV1Register (const struct afb_binding_interface *itf)
-{
-	interface = itf;
-	return &plugin_desc;
-}