Add plugin for the framework afm-main

Change-Id: Ib0bfba52aac8a60afc9a80a564202689e28b18ff

5 files changed, 873 insertions, 0 deletions

diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index c66de5e7..769cc1e1 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -2,3 +2,4 @@ ADD_SUBDIRECTORY(session)
 ADD_SUBDIRECTORY(samples)
 ADD_SUBDIRECTORY(audio)
 ADD_SUBDIRECTORY(radio)
+ADD_SUBDIRECTORY(afm-main-plugin)
diff --git a/plugins/afm-main-plugin/CMakeLists.txt b/plugins/afm-main-plugin/CMakeLists.txt
new file mode 100644
index 00000000..673bc951
--- /dev/null
+++ b/plugins/afm-main-plugin/CMakeLists.txt
@@ -0,0 +1,14 @@
+
+
+pkg_check_modules(EXTRAS REQUIRED dbus-1)
+add_compile_options(${EXTRAS_CFLAGS})
+include_directories(${EXTRAS_INCLUDE_DIRS})
+link_libraries(${EXTRAS_LIBRARIES})
+
+ADD_LIBRARY(afm-main-api MODULE afm-main-plugin.c utils-jbus.c)
+SET_TARGET_PROPERTIES(afm-main-api PROPERTIES PREFIX "")
+TARGET_LINK_LIBRARIES(afm-main-api ${link_libraries})
+INCLUDE_DIRECTORIES(${include_dirs})
+INSTALL(TARGETS afm-main-api
+          LIBRARY DESTINATION ${plugin_install_dir})
+
diff --git a/plugins/afm-main-plugin/afm-main-plugin.c b/plugins/afm-main-plugin/afm-main-plugin.c
new file mode 100644
index 00000000..a1325008
--- /dev/null
+++ b/plugins/afm-main-plugin/afm-main-plugin.c
@@ -0,0 +1,91 @@
+/*
+ * Copyright (C) 2015 "IoT.bzh"
+ * Author "Fulup Ar Foll"
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#include "local-def.h"
+
+#include "utils-jbus.h"
+
+static const char _id_[] = "id";
+static struct jbus *jbus;
+
+static struct json_object *call_void(AFB_request *request)
+{
+	struct json_object *obj = jbus_call_sj_sync(jbus, request->api, "true");
+	request->errcode = obj ? MHD_HTTP_OK : MHD_HTTP_FAILED_DEPENDENCY;
+	return obj;
+}
+
+static struct json_object *call_appid(AFB_request *request)
+{
+	struct json_object *obj;
+	char *sid;
+	const char *id = getQueryValue(request, _id_);
+	if (id == NULL) {
+		request->errcode = MHD_HTTP_BAD_REQUEST;
+		return NULL;
+	}
+	if (0 >= asprintf(&sid, "\"%s\"", id)) {
+		request->errcode = MHD_HTTP_INTERNAL_SERVER_ERROR;
+		return NULL;
+	}
+	obj = jbus_call_sj_sync(jbus, request->api, sid);
+	free(sid);
+	request->errcode = obj ? MHD_HTTP_OK : MHD_HTTP_FAILED_DEPENDENCY;
+	return obj;
+}
+
+static struct json_object *call_runid(AFB_request *request)
+{
+	struct json_object *obj;
+	const char *id = getQueryValue(request, _id_);
+	if (id == NULL) {
+		request->errcode = MHD_HTTP_BAD_REQUEST;
+		return NULL;
+	}
+	obj = jbus_call_sj_sync(jbus, request->api, id);
+	request->errcode = obj ? MHD_HTTP_OK : MHD_HTTP_FAILED_DEPENDENCY;
+	return obj;
+}
+
+static AFB_restapi plug_apis[] =
+{
+	{"runnables", AFB_SESSION_CHECK, (AFB_apiCB)call_void,  "Get list of runnable applications"},
+	{"detail"   , AFB_SESSION_CHECK, (AFB_apiCB)call_appid, "Get the details for one application"},
+	{"start"    , AFB_SESSION_CHECK, (AFB_apiCB)call_appid, "Start an application"},
+	{"terminate", AFB_SESSION_CHECK, (AFB_apiCB)call_runid, "Terminate a running application"},
+	{"stop"     , AFB_SESSION_CHECK, (AFB_apiCB)call_runid, "Stop (pause) a running application"},
+	{"continue" , AFB_SESSION_CHECK, (AFB_apiCB)call_runid, "Continue (resume) a stopped application"},
+	{"runners"  , AFB_SESSION_CHECK, (AFB_apiCB)call_void,  "Get the list of running applications"},
+	{"state"    , AFB_SESSION_CHECK, (AFB_apiCB)call_runid, "Get the state of a running application"},
+	{NULL}
+};
+
+static AFB_plugin plug_desc = {
+	.type = AFB_PLUGIN_JSON,
+	.info = "Application Framework Master Service",
+	.prefix = "afm-main",
+	.apis = plug_apis
+};
+
+AFB_plugin *pluginRegister()
+{
+	jbus = create_jbus(1, "/org/AGL/afm-main");
+	return jbus ? &plug_desc : NULL;
+}
+
diff --git a/plugins/afm-main-plugin/utils-jbus.c b/plugins/afm-main-plugin/utils-jbus.c
new file mode 100644
index 00000000..7e65723a
--- /dev/null
+++ b/plugins/afm-main-plugin/utils-jbus.c
@@ -0,0 +1,714 @@
+/*
+ Copyright 2015 IoT.bzh
+
+ author: José Bollo <jose.bollo@iot.bzh>
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+#define _GNU_SOURCE
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <errno.h>
+#include <string.h>
+
+#include <json.h>
+#include <dbus/dbus.h>
+
+#include "utils-jbus.h"
+
+struct jreq;
+struct jservice;
+struct jbus;
+
+/* structure for handled requests */
+struct jreq {
+	DBusConnection *connection;
+	DBusMessage *request;
+};
+
+/* structure for recorded services */
+struct jservice {
+	struct jservice *next;
+	char *method;
+	void (*oncall_s)(struct jreq *, const char *);
+	void (*oncall_j)(struct jreq *, struct json_object *);
+};
+
+/* structure for signal handlers */
+struct jsignal {
+	struct jsignal *next;
+	char *name;
+	void (*onsignal_s)(const char *);
+	void (*onsignal_j)(struct json_object *);
+};
+
+/* structure for recording asynchronous requests */
+struct jrespw {
+	struct jrespw *next;
+	dbus_uint32_t serial;
+	void *data;
+	void (*onresp_s)(int, const char*, void *);
+	void (*onresp_j)(int, struct json_object*, void *);
+};
+
+/* structure for synchronous requests */
+struct respsync {
+	int replied;
+	char *value;
+};
+
+/* structure for handling either client or server jbus on dbus */
+struct jbus {
+	int refcount;
+	struct jservice *services;
+	DBusConnection *connection;
+	struct jsignal *signals;
+	struct jrespw *waiters;
+	char *path;
+	char *name;
+};
+
+/*********************** STATIC COMMON METHODS *****************/
+
+static inline void free_jreq(struct jreq *jreq)
+{
+	dbus_message_unref(jreq->request);
+	dbus_connection_unref(jreq->connection);
+	free(jreq);
+}
+
+static inline int reply_out_of_memory(struct jreq *jreq)
+{
+	static const char out_of_memory[] = "out of memory";
+	jbus_reply_error_s(jreq, out_of_memory);
+	errno = ENOMEM;
+	return -1;
+}
+
+static inline int reply_invalid_request(struct jreq *jreq)
+{
+	static const char invalid_request[] = "invalid request";
+	jbus_reply_error_s(jreq, invalid_request);
+	return DBUS_HANDLER_RESULT_HANDLED;
+}
+
+static int matchitf(struct jbus *jbus, DBusMessage *message)
+{
+	const char *itf = dbus_message_get_interface(message);
+	return itf != NULL && !strcmp(itf, jbus->name);
+}
+
+static int add_service(
+		struct jbus *jbus,
+		const char *method,
+		void (*oncall_s)(struct jreq*, const char*),
+		void (*oncall_j)(struct jreq*, struct json_object*)
+)
+{
+	struct jservice *srv;
+
+	/* allocation */
+	srv = malloc(sizeof * srv);
+	if (srv == NULL) {
+		errno = ENOMEM;
+		goto error;
+	}
+	srv->method = strdup(method);
+	if (!srv->method) {
+		errno = ENOMEM;
+		goto error2;
+	}
+
+	/* record the service */
+	srv->oncall_s = oncall_s;
+	srv->oncall_j = oncall_j;
+	srv->next = jbus->services;
+	jbus->services = srv;
+
+	return 0;
+
+error2:
+	free(srv);
+error:
+	return -1;
+}
+
+static int add_signal(
+	struct jbus *jbus,
+	const char *name,
+	void (*onsignal_s)(const char*),
+	void (*onsignal_j)(struct json_object*)
+)
+{
+	char *rule;
+	struct jsignal *sig;
+
+	/* record the signal */
+	if (jbus->signals == NULL) {
+		if (0 >= asprintf(&rule, "type='signal',sender='%s',interface='%s',path='%s'", jbus->name, jbus->name, jbus->path))
+			return -1;
+		dbus_bus_add_match(jbus->connection, rule, NULL);
+		free(rule);
+	}
+
+	/* allocation */
+	sig = malloc(sizeof * sig);
+	if (sig == NULL)
+		goto error;
+	sig->name = strdup(name);
+	if (!sig->name)
+		goto error2;
+
+	/* record the signal */
+	sig->onsignal_s = onsignal_s;
+	sig->onsignal_j = onsignal_j;
+	sig->next = jbus->signals;
+	jbus->signals = sig;
+
+	return 0;
+
+error2:
+	free(sig);
+error:
+	errno = ENOMEM;
+	return -1;
+}
+
+static int call(
+	struct jbus *jbus,
+	const char *method,
+	const char *query,
+	void (*onresp_s)(int status, const char *response, void *data),
+	void (*onresp_j)(int status, struct json_object *response, void *data),
+	void *data
+)
+{
+	DBusMessage *msg;
+	struct jrespw *resp;
+
+	resp = malloc(sizeof * resp);
+	if (resp == NULL) {
+		errno = ENOMEM;
+		goto error;
+	}
+
+	msg = dbus_message_new_method_call(jbus->name, jbus->path, jbus->name, method);
+	if (msg == NULL) {
+		errno = ENOMEM;
+		goto error2;
+	}
+
+	if (!dbus_message_append_args(msg, DBUS_TYPE_STRING, &query, DBUS_TYPE_INVALID)) {
+		errno = ENOMEM;
+		goto error3;
+	}
+
+	if (!dbus_connection_send(jbus->connection, msg, &resp->serial)) {
+		goto error3;
+	}
+
+	dbus_message_unref(msg);
+	resp->data = data;
+	resp->onresp_s = onresp_s;
+	resp->onresp_j = onresp_j;
+	resp->next = jbus->waiters;
+	jbus->waiters = resp;
+	return 0;
+
+error3:
+	dbus_message_unref(msg);
+error2:
+	free(resp);
+error:
+	return -1;
+}
+
+static void sync_of_replies(int status, const char *value, void *data)
+{
+	struct respsync *s = data;
+	s->value = status ? NULL : strdup(value ? value : "");
+	s->replied = 1;
+}
+
+static DBusHandlerResult incoming_resp(DBusConnection *connection, DBusMessage *message, struct jbus *jbus, int iserror)
+{
+	int status;
+	const char *str;
+	struct jrespw *jrw, **prv;
+	struct json_object *reply;
+	dbus_uint32_t serial;
+
+	/* search for the waiter */
+	serial = dbus_message_get_reply_serial(message);
+	prv = &jbus->waiters;
+	while ((jrw = *prv) != NULL && jrw->serial != serial)
+		prv = &jrw->next;
+	if (jrw == NULL)
+		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+	*prv = jrw->next;
+
+	/* retrieve the string value */
+	if (!dbus_message_get_args(message, NULL, DBUS_TYPE_STRING, &str, DBUS_TYPE_INVALID)) {
+		status = -1;
+		str = NULL;
+		reply = NULL;
+	}
+
+	/* treat it */
+	if (jrw->onresp_s)
+		jrw->onresp_s(iserror ? -1 : status, str, jrw->data);
+	else {
+		reply = json_tokener_parse(str);
+		status = reply ? 0 : -1;
+		jrw->onresp_j(iserror ? -1 : status, reply, jrw->data);
+	}
+
+	free(jrw);
+	return DBUS_HANDLER_RESULT_HANDLED;
+}
+
+static DBusHandlerResult incoming_call(DBusConnection *connection, DBusMessage *message, struct jbus *jbus)
+{
+	struct jservice *srv;
+	struct jreq *jreq;
+	const char *str;
+	const char *method;
+	struct json_object *query;
+
+	/* search for the service */
+	if (!matchitf(jbus, message))
+		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+	method = dbus_message_get_member(message);
+	if (method == NULL)
+		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+	srv = jbus->services;
+	while(srv != NULL && strcmp(method, srv->method))
+		srv = srv->next;
+	if (srv == NULL)
+		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+
+	/* handle the message */
+	jreq = malloc(sizeof * jreq);
+	if (jreq == NULL)
+		return DBUS_HANDLER_RESULT_NEED_MEMORY;
+	jreq->request = dbus_message_ref(message);
+	jreq->connection = dbus_connection_ref(jbus->connection);
+	
+	/* retrieve the string value */
+	if (!dbus_message_get_args(message, NULL, DBUS_TYPE_STRING, &str, DBUS_TYPE_INVALID))
+		return reply_invalid_request(jreq);
+	if (srv->oncall_s) {
+		/* handling strings only */
+		srv->oncall_s(jreq, str);
+	}
+	else {
+		/* handling json only */
+		query = json_tokener_parse(str);
+		if (query == NULL)
+			return reply_invalid_request(jreq);
+		srv->oncall_j(jreq, query);
+	}
+	return DBUS_HANDLER_RESULT_HANDLED;
+}
+
+static DBusHandlerResult incoming_signal(DBusConnection *connection, DBusMessage *message, struct jbus *jbus)
+{
+	struct jsignal *sig;
+	const char *str;
+	const char *name;
+	struct json_object *obj;
+
+	/* search for the service */
+	if (!matchitf(jbus, message))
+		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+	name = dbus_message_get_member(message);
+	if (name == NULL)
+		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+	sig = jbus->signals;
+	while(sig != NULL && strcmp(name, sig->name))
+		sig = sig->next;
+	if (sig == NULL)
+		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+
+	/* retrieve the string value */
+	if (dbus_message_get_args(message, NULL, DBUS_TYPE_STRING, &str, DBUS_TYPE_INVALID)) {
+		if (sig->onsignal_s) {
+			/* handling strings only */
+			sig->onsignal_s(str);
+		}
+		else {
+			/* handling json only */
+			obj = json_tokener_parse(str);
+			if (obj != NULL)
+				sig->onsignal_j(obj);
+		}
+	}
+	return DBUS_HANDLER_RESULT_HANDLED;
+}
+
+static DBusHandlerResult incoming(DBusConnection *connection, DBusMessage *message, void *data)
+{
+	switch(dbus_message_get_type(message)) {
+	case DBUS_MESSAGE_TYPE_METHOD_CALL:
+		return incoming_call(connection, message, (struct jbus*)data);
+	case DBUS_MESSAGE_TYPE_METHOD_RETURN:
+		return incoming_resp(connection, message, (struct jbus*)data, 0);
+	case DBUS_MESSAGE_TYPE_ERROR:
+		return incoming_resp(connection, message, (struct jbus*)data, 1);
+	case DBUS_MESSAGE_TYPE_SIGNAL:
+		return incoming_signal(connection, message, (struct jbus*)data);
+	}
+	return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+}
+
+/************************** MAIN FUNCTIONS *****************************************/
+
+struct jbus *create_jbus(int session, const char *path)
+{
+	struct jbus *jbus;
+	char *name;
+
+	/* create the context and connect */
+	jbus = calloc(1, sizeof * jbus);
+	if (jbus == NULL) {
+		errno = ENOMEM;
+		goto error;
+	}
+	jbus->refcount = 1;
+	jbus->path = strdup(path);
+	jbus->name = NULL;
+	if (jbus->path == NULL) {
+		errno = ENOMEM;
+		goto error2;
+	}
+	while(*path == '/') path++;
+	jbus->name = name = strdup(path);
+	if (name == NULL) {
+		errno = ENOMEM;
+		goto error2;
+	}
+	while(*name) {
+		if (*name == '/')
+			*name = '.';
+		name++;
+	}
+	name--;
+	while (name >= jbus->name && *name == '.')
+		*name-- = 0;
+	if (!*jbus->name) {
+		errno = EINVAL;
+		goto error2;
+	}
+
+	/* connect */
+	jbus->connection = dbus_bus_get(session ? DBUS_BUS_SESSION : DBUS_BUS_SYSTEM, NULL);
+	if (jbus->connection == NULL) {
+		goto error2;
+	}
+	if (!dbus_connection_add_filter(jbus->connection, incoming, jbus, NULL)) {
+		goto error2;
+	}
+
+	return jbus;
+
+error2:
+	jbus_unref(jbus);
+error:
+	return NULL;
+}
+
+void jbus_addref(struct jbus *jbus)
+{
+	jbus->refcount++;
+}
+
+void jbus_unref(struct jbus *jbus)
+{
+	struct jservice *srv;
+	if (!--jbus->refcount) {
+		dbus_connection_unref(jbus->connection);
+		while((srv = jbus->services) != NULL) {
+			jbus->services = srv->next;
+			free(srv->method);
+			free(srv);
+		}
+		free(jbus->name);
+		free(jbus->path);
+		free(jbus);
+	}
+}
+
+int jbus_reply_error_s(struct jreq *jreq, const char *error)
+{
+	int rc = -1;
+	DBusMessage *message;
+
+	message = dbus_message_new_error(jreq->request, DBUS_ERROR_FAILED, error);
+	if (message == NULL)
+		errno = ENOMEM;
+	else {
+		if (dbus_connection_send(jreq->connection, message, NULL))
+			rc = 0;
+		dbus_message_unref(message);
+	}
+	free_jreq(jreq);
+	return rc;
+}
+
+int jbus_reply_error_j(struct jreq *jreq, struct json_object *reply)
+{
+	const char *str = json_object_to_json_string(reply);
+	return str ? jbus_reply_error_s(jreq, str) : reply_out_of_memory(jreq);
+}
+
+int jbus_reply_s(struct jreq *jreq, const char *reply)
+{
+	int rc = -1;
+	DBusMessage *message;
+
+	message = dbus_message_new_method_return(jreq->request);
+	if (message == NULL)
+		return reply_out_of_memory(jreq);
+
+	if (!dbus_message_append_args(message, DBUS_TYPE_STRING, &reply, DBUS_TYPE_INVALID)) {
+		dbus_message_unref(message);
+		return reply_out_of_memory(jreq);
+	}
+
+	if (dbus_connection_send(jreq->connection, message, NULL))
+		rc = 0;
+	dbus_message_unref(message);
+	free_jreq(jreq);
+	return rc;
+}
+
+int jbus_reply_j(struct jreq *jreq, struct json_object *reply)
+{
+	const char *str = json_object_to_json_string(reply);
+	return str ? jbus_reply_s(jreq, str) : reply_out_of_memory(jreq);
+}
+
+int jbus_send_signal_s(struct jbus *jbus, const char *name, const char *content)
+{
+	int rc = -1;
+	DBusMessage *message;
+
+	message = dbus_message_new_signal(jbus->path, jbus->name, name);
+	if (message == NULL)
+		goto error;
+
+	if (!dbus_message_append_args(message, DBUS_TYPE_STRING, &content, DBUS_TYPE_INVALID)) {
+		dbus_message_unref(message);
+		goto error;
+	}
+
+	if (dbus_connection_send(jbus->connection, message, NULL))
+		rc = 0;
+	dbus_message_unref(message);
+	return rc;
+
+error:
+	errno = ENOMEM;
+	return -1;
+}
+
+int jbus_send_signal_j(struct jbus *jbus, const char *name, struct json_object *content)
+{
+	const char *str = json_object_to_json_string(content);
+	if (str == NULL) {
+		errno = ENOMEM;
+		return -1;
+	}
+	return jbus_send_signal_s(jbus, name, str);
+}
+
+int jbus_add_service_s(struct jbus *jbus, const char *method, void (*oncall)(struct jreq *, const char *))
+{
+	return add_service(jbus, method, oncall, NULL);
+}
+
+int jbus_add_service_j(struct jbus *jbus, const char *method, void (*oncall)(struct jreq *, struct json_object *))
+{
+	return add_service(jbus, method, NULL, oncall);
+}
+
+int jbus_start_serving(struct jbus *jbus)
+{
+	int status = dbus_bus_request_name(jbus->connection, jbus->name, DBUS_NAME_FLAG_DO_NOT_QUEUE, NULL);
+	switch (status) {
+	case DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER:
+	case DBUS_REQUEST_NAME_REPLY_ALREADY_OWNER:
+		return 0;
+	case DBUS_REQUEST_NAME_REPLY_EXISTS:
+	case DBUS_REQUEST_NAME_REPLY_IN_QUEUE:
+	default:
+		errno = EADDRINUSE;
+		return -1;
+	}
+}
+
+int jbus_read_write_dispatch(struct jbus *jbus, int toms)
+{
+	if (dbus_connection_read_write_dispatch(jbus->connection, toms));
+		return 0;
+	errno = EPIPE;
+	return -1;
+}
+
+int jbus_call_ss(struct jbus *jbus, const char *method, const char *query, void (*onresp)(int, const char*, void*), void *data)
+{
+	return call(jbus, method, query, onresp, NULL, data);
+}
+
+int jbus_call_sj(struct jbus *jbus, const char *method, const char *query, void (*onresp)(int, struct json_object*, void*), void *data)
+{
+	return call(jbus, method, query, NULL, onresp, data);
+}
+
+int jbus_call_js(struct jbus *jbus, const char *method, struct json_object *query, void (*onresp)(int, const char*, void*), void *data)
+{
+	const char *str = json_object_to_json_string(query);
+	if (str == NULL) {
+		errno = ENOMEM;
+		return -1;
+	}
+	return call(jbus, method, str, onresp, NULL, data);
+}
+
+int jbus_call_jj(struct jbus *jbus, const char *method, struct json_object *query, void (*onresp)(int, struct json_object*, void*), void *data)
+{
+	const char *str = json_object_to_json_string(query);
+	if (str == NULL) {
+		errno = ENOMEM;
+		return -1;
+	}
+	return call(jbus, method, str, NULL, onresp, data);
+}
+
+char *jbus_call_ss_sync(struct jbus *jbus, const char *method, const char *query)
+{
+	struct respsync synchro;
+	synchro.value = NULL;
+	synchro.replied = jbus_call_ss(jbus, method, query, sync_of_replies, &synchro);
+	while (!synchro.replied && !jbus_read_write_dispatch(jbus, -1));
+	return synchro.value;
+}
+
+struct json_object *jbus_call_sj_sync(struct jbus *jbus, const char *method, const char *query)
+{
+	const char *str = jbus_call_ss_sync(jbus, method, query);
+	return str ? json_tokener_parse(str) : NULL;
+}
+
+
+char *jbus_call_js_sync(struct jbus *jbus, const char *method, struct json_object *query)
+{
+	const char *str = json_object_to_json_string(query);
+	if (str == NULL) {
+		errno = ENOMEM;
+		return NULL;
+	}
+	return jbus_call_ss_sync(jbus, method, str);
+}
+
+struct json_object *jbus_call_jj_sync(struct jbus *jbus, const char *method, struct json_object *query)
+{
+	const char *str = json_object_to_json_string(query);
+	if (str == NULL) {
+		errno = ENOMEM;
+		return NULL;
+	}
+	return jbus_call_sj_sync(jbus, method, str);
+}
+
+int jbus_on_signal_s(struct jbus *jbus, const char *name, void (*onsig)(const char *))
+{
+	return add_signal(jbus, name, onsig, NULL);
+}
+
+int jbus_on_signal_j(struct jbus *jbus, const char *name, void (*onsig)(struct json_object *))
+{
+	return add_signal(jbus, name, NULL, onsig);
+}
+
+/************************** FEW LITTLE TESTS *****************************************/
+
+#ifdef SERVER
+#include <stdio.h>
+#include <unistd.h>
+struct jbus *jbus;
+void ping(struct jreq *jreq, struct json_object *request)
+{
+printf("ping(%s) -> %s\n",json_object_to_json_string(request),json_object_to_json_string(request));
+	jbus_reply_j(jreq, request);
+	json_object_put(request);	
+}
+void incr(struct jreq *jreq, struct json_object *request)
+{
+	static int counter = 0;
+	struct json_object *res = json_object_new_int(++counter);
+printf("incr(%s) -> %s\n",json_object_to_json_string(request),json_object_to_json_string(res));
+	jbus_reply_j(jreq, res);
+jbus_send_signal_j(jbus, "incremented", res);
+	json_object_put(res);
+	json_object_put(request);
+}
+int main()
+{
+	int s1, s2, s3;
+	jbus = create_jbus(1, "/bzh/iot/jdbus");
+	s1 = jbus_add_service_j(jbus, "ping", ping);
+	s2 = jbus_add_service_j(jbus, "incr", incr);
+	s3 = jbus_start_serving(jbus);
+	printf("started %d %d %d\n", s1, s2, s3);
+	while (!jbus_read_write_dispatch (jbus, -1))
+		;
+}
+#endif
+#ifdef CLIENT
+#include <stdio.h>
+#include <unistd.h>
+struct jbus *jbus;
+void onresp(int status, struct json_object *response, void *data)
+{
+	printf("resp: %d, %s, %s\n",status,(char*)data,json_object_to_json_string(response));
+	json_object_put(response);
+}
+void signaled(const char *data)
+{
+	printf("signaled with {%s}\n", data);
+}
+int main()
+{
+	int i = 10;
+	jbus = create_jbus(1, "/bzh/iot/jdbus");
+	jbus_on_signal_s(jbus, "incremented", signaled);
+	while(i--) {
+		jbus_call_sj(jbus, "ping", "{\"toto\":[1,2,3,4,true,\"toto\"]}", onresp, "ping");
+		jbus_call_sj(jbus, "incr", "{\"doit\":\"for-me\"}", onresp, "incr");
+		jbus_read_write_dispatch (jbus, 1);
+	}
+	printf("[[[%s]]]\n", jbus_call_ss_sync(jbus, "ping", "\"formidable!\""));
+	while (!jbus_read_write_dispatch (jbus, -1))
+		;
+}
+#endif
+
+
+
+
+
+
+
+
diff --git a/plugins/afm-main-plugin/utils-jbus.h b/plugins/afm-main-plugin/utils-jbus.h
new file mode 100644
index 00000000..68e9b68a
--- /dev/null
+++ b/plugins/afm-main-plugin/utils-jbus.h
@@ -0,0 +1,53 @@
+/*
+ Copyright 2015 IoT.bzh
+
+ author: José Bollo <jose.bollo@iot.bzh>
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+
+
+struct jreq;
+struct jbus;
+
+extern struct jbus *create_jbus(int session, const char *path);
+extern void jbus_addref(struct jbus *jbus);
+extern void jbus_unref(struct jbus *jbus);
+
+extern int jbus_read_write_dispatch(struct jbus *jbus, int toms);
+
+/* verbs for the clients */
+extern int jbus_call_ss(struct jbus *jbus, const char *method, const char *query, void (*onresp)(int, const char *, void *), void *data);
+extern int jbus_call_js(struct jbus *jbus, const char *method, struct json_object *query, void (*onresp)(int, const char *, void *), void *data);
+extern int jbus_call_sj(struct jbus *jbus, const char *method, const char *query, void (*onresp)(int, struct json_object *, void *), void *data);
+extern int jbus_call_jj(struct jbus *jbus, const char *method, struct json_object *query, void (*onresp)(int, struct json_object *, void *), void *data);
+
+extern char *jbus_call_ss_sync(struct jbus *jbus, const char *method, const char *query);
+extern char *jbus_call_js_sync(struct jbus *jbus, const char *method, struct json_object *query);
+extern struct json_object *jbus_call_sj_sync(struct jbus *jbus, const char *method, const char *query);
+extern struct json_object *jbus_call_jj_sync(struct jbus *jbus, const char *method, struct json_object *query);
+
+extern int jbus_on_signal_s(struct jbus *jbus, const char *name, void (*onsignal)(const char *));
+extern int jbus_on_signal_j(struct jbus *jbus, const char *name, void (*onsignal)(struct json_object *));
+
+/* verbs for servers */
+extern int jbus_reply_s(struct jreq *jreq, const char *reply);
+extern int jbus_reply_j(struct jreq *jreq, struct json_object *reply);
+extern int jbus_reply_error_s(struct jreq *jreq, const char *reply);
+extern int jbus_reply_error_j(struct jreq *jreq, struct json_object *reply);
+
+extern int jbus_add_service_s(struct jbus *jbus, const char *method, void (*oncall)(struct jreq *, const char *));
+extern int jbus_add_service_j(struct jbus *jbus, const char *method, void (*oncall)(struct jreq *, struct json_object *));
+extern int jbus_start_serving(struct jbus *jbus);
+extern int jbus_send_signal_s(struct jbus *jbus, const char *name, const char *content);
+extern int jbus_send_signal_j(struct jbus *jbus, const char *name, struct json_object *content);