use upoll for event loop

also add '#pragma once' in headers

Change-Id: I90cc2d53ec60d4d1e66cf0f229109621e4019864
Signed-off-by: José Bollo <jose.bollo@iot.bzh>

25 files changed, 1550 insertions, 746 deletions

diff --git a/include/afb-plugin.h b/include/afb-plugin.h
index 4064f9e9..2c9935e6 100644
--- a/include/afb-plugin.h
+++ b/include/afb-plugin.h
@@ -15,6 +15,8 @@
  * limitations under the License.
  */
 
+#pragma once
+
 struct afb_req;
 
 /* Plugin Type */
@@ -61,13 +63,12 @@ enum AFB_Mode {
 	AFB_MODE_GLOBAL
 };
 
-struct afb_poll;
-
 struct AFB_interface
 {
 	int verbosity;
 	enum AFB_Mode mode;
-	struct afb_poll (*poll_open)(int fd, void *closure);
+	const struct afb_pollitf *pollitf;
+	void *pollclosure;
 };
 
 extern const struct AFB_plugin *pluginRegister (const struct AFB_interface *interface);
diff --git a/include/afb-poll-itf.h b/include/afb-poll-itf.h
index 2c8889b6..b70eb993 100644
--- a/include/afb-poll-itf.h
+++ b/include/afb-poll-itf.h
@@ -15,17 +15,15 @@
  * limitations under the License.
  */
 
-struct afb_poll_itf
-{
-	int (*on_readable)(void *, void (*cb)(void *));
-	int (*on_writable)(void *, void (*cb)(void *));
-	int (*on_hangup)(void *, void (*cb)(void *));
-	void (*close)(void *data);
-};
+#pragma once
 
-struct afb_poll
+struct afb_pollitf
 {
-	const struct afb_poll_itf *itf;
-	void *data;
+	int (*wait)(int timeout, void *pollclosure);
+	void *(*open)(int fd, void *closure, void *pollclosure);
+	int (*on_readable)(void *hndl, void (*cb)(void *closure));
+	int (*on_writable)(void *hndl, void (*cb)(void *closure));
+	void (*on_hangup)(void *hndl, void (*cb)(void *closure));
+	void (*close)(void *hndl);
 };
 
diff --git a/include/afb-req-itf.h b/include/afb-req-itf.h
index 7f7472f1..357ffd7b 100644
--- a/include/afb-req-itf.h
+++ b/include/afb-req-itf.h
@@ -15,6 +15,8 @@
  * limitations under the License.
  */
 
+#pragma once
+
 struct json_object;
 
 struct afb_arg {
diff --git a/plugins/afm-main-plugin/CMakeLists.txt b/plugins/afm-main-plugin/CMakeLists.txt
index 5ed1d4b2..8aaa1344 100644
--- a/plugins/afm-main-plugin/CMakeLists.txt
+++ b/plugins/afm-main-plugin/CMakeLists.txt
@@ -1,5 +1,5 @@
 
-ADD_LIBRARY(afm-main-api MODULE afm-main-plugin.c utils-jbus.c)
+ADD_LIBRARY(afm-main-api MODULE afm-main-plugin.c utils-sbus.c utils-jbus.c)
 SET_TARGET_PROPERTIES(afm-main-api PROPERTIES PREFIX "")
 TARGET_LINK_LIBRARIES(afm-main-api ${link_libraries})
 INCLUDE_DIRECTORIES(${include_dirs})
diff --git a/plugins/afm-main-plugin/afm-main-plugin.c b/plugins/afm-main-plugin/afm-main-plugin.c
index b026fd80..418cc508 100644
--- a/plugins/afm-main-plugin/afm-main-plugin.c
+++ b/plugins/afm-main-plugin/afm-main-plugin.c
@@ -23,7 +23,9 @@
 
 #include "afb-plugin.h"
 #include "afb-req-itf.h"
+#include "afb-poll-itf.h"
 
+#include "utils-sbus.h"
 #include "utils-jbus.h"
 
 static const char _auto_[]      = "auto";
@@ -276,14 +278,33 @@ static const struct AFB_plugin plug_desc = {
 	.apis = plug_apis
 };
 
+static struct sbus_itf sbusitf;
+
 const struct AFB_plugin *pluginRegister(const struct AFB_interface *itf)
 {
+	struct sbus *sbus;
+
+	if (interface != NULL)
+		return NULL;
+
 	interface = itf;
+	sbusitf.wait = itf->pollitf->wait;
+	sbusitf.open = itf->pollitf->open;
+	sbusitf.on_readable = itf->pollitf->on_readable;
+	sbusitf.on_writable = itf->pollitf->on_writable;
+	sbusitf.on_hangup = itf->pollitf->on_hangup;
+	sbusitf.close = itf->pollitf->close;
+
+	sbus = sbus_session(&sbusitf, itf->pollclosure);
+	if (sbus == NULL) {
+		fprintf(stderr, "ERROR: %s:%d: can't connect to DBUS session\n", __FILE__, __LINE__);
+		return NULL;
+	}
 
-	jbus = create_jbus_session("/org/AGL/afm/user");
+	jbus = create_jbus(sbus, "/org/AGL/afm/user");
         if (jbus)
 		return &plug_desc;
-	fprintf(stderr, "ERROR: %s:%d: can't connect to DBUS session\n", __FILE__, __LINE__);
+	sbus_unref(sbus);
 	return NULL;
 }
 
diff --git a/plugins/afm-main-plugin/utils-jbus.c b/plugins/afm-main-plugin/utils-jbus.c
index 3bea2c23..4872987f 100644
--- a/plugins/afm-main-plugin/utils-jbus.c
+++ b/plugins/afm-main-plugin/utils-jbus.c
@@ -25,8 +25,8 @@
 #include <assert.h>
 
 #include <json.h>
-#include <dbus/dbus.h>
 
+#include "utils-sbus.h"
 #include "utils-jbus.h"
 
 /*
@@ -37,21 +37,7 @@
 /*
  * errors messages generated by jbus
  */
-#if defined(NO_JSON_ERROR_STRING)
-static const char invalid_request_string[] = "invalid request";
 static const char out_of_memory_string[] = "out of memory";
-#else
-static const char invalid_request_string[] = "\"invalid request\"";
-static const char out_of_memory_string[] = "\"out of memory\"";
-#endif
-
-/*
- * structure for handled requests
- */
-struct jreq {
-	DBusConnection *connection; /* connection of the request */
-	DBusMessage *request;       /* message of the request */
-};
 
 /*
  * structure for services
@@ -59,9 +45,9 @@ struct jreq {
 struct jservice {
 	struct jservice *next;	/* link to the next service */
 	char *method;		/* method name for the service */
-	void (*oncall_s) (struct jreq *, const char *, void *);
+	void (*oncall_s) (struct sbusmsg *, const char *, void *);
 				/* string callback */
-	void (*oncall_j) (struct jreq *, struct json_object *, void *);
+	void (*oncall_j) (struct sbusmsg *, struct json_object *, void *);
 				/* json callback */
 	void *data;		/* closure data for the callbacks */
 };
@@ -80,24 +66,13 @@ struct jsignal {
 };
 
 /*
- * structure for asynchronous requests (resp-onse w-aiter)
+ * structure for asynchronous requests
  */
 struct jrespw {
-	struct jrespw *next;	/* next asynchronous */
-	dbus_uint32_t serial;	/* serial dbus number */
-	void *data;		/* closure data for the callbacks */
-	void (*onresp_s) (int, const char *, void *);
-				/* string callback */
-	void (*onresp_j) (int, struct json_object *, void *);
+	struct jbus *jbus;
+	void (*onresp) (int, struct json_object *, void *);
 				/* json callback */
-};
-
-/*
- * structure for synchronous requests
- */
-struct respsync {
-	int replied;	/* boolean flag indicating reply */
-	char *value;	/* copy of the returned value */
+	void *data;		/* closure data for the callbacks */
 };
 
 /*
@@ -105,53 +80,71 @@ struct respsync {
  */
 struct jbus {
 	int refcount;			/* referenced how many time */
-	DBusConnection *connection;	/* connection to DBU */
+	struct sbus *sbus;
+	struct sbus_service *sservice;
+	struct sbus_signal *ssignal;
 	struct json_tokener *tokener;	/* string to json tokenizer */
 	struct jservice *services;	/* first service */
 	struct jsignal *signals;	/* first signal */
-	struct jrespw *waiters;		/* first response waiter */
 	char *path;			/* dbus path */
 	char *name;			/* dbus name */
-	int watchnr;			/* counter of watching need */
-	int watchfd;			/* file to watch */
-	short watchflags;		/* watched flags */
 };
 
 /*********************** STATIC COMMON METHODS *****************/
 
 /*
- * Frees the ressources attached to a request
- */
-static inline void free_jreq(struct jreq *jreq)
-{
-	dbus_message_unref(jreq->request);
-	dbus_connection_unref(jreq->connection);
-	free(jreq);
-}
-
-/*
  * Replies the error "out of memory".
  * This function is intended to be used in services when an
  * allocation fails. Thus, it set errno to ENOMEM and
  * returns -1.
  */
-static inline int reply_out_of_memory(struct jreq *jreq)
+static inline int reply_out_of_memory(struct sbusmsg *smsg)
 {
-	jbus_reply_error_s(jreq, out_of_memory_string);
+	jbus_reply_error_s(smsg, out_of_memory_string);
 	errno = ENOMEM;
 	return -1;
 }
 
 /*
- * Checks if the incoming 'message' matches the interface
- * linked to 'jbus'.
+ * Parses the json-string 'msg' to create a json object stored
+ * in 'obj'. It uses the tokener of 'jbus'. This is a small
+ * improvement to avoid recreation of tokeners.
  *
- * Returns 1 if it matches or 0 wether it does not matches.
+ * Returns 1 in case of success and put the result in *'obj'.
+ * Returns 0 in case of error and put NULL in *'obj'.
  */
-static int matchitf(struct jbus *jbus, DBusMessage * message)
+static int jparse(struct jbus *jbus, const char *msg, struct json_object **obj)
+{
+	json_tokener_reset(jbus->tokener);
+	*obj = json_tokener_parse_ex(jbus->tokener, msg, -1);
+	if (json_tokener_get_error(jbus->tokener) == json_tokener_success)
+		return 1;
+	json_object_put(*obj);
+	*obj = NULL;
+	return 0;
+}
+
+static void on_service_call(struct sbusmsg *smsg, const char *content, struct jbus *jbus)
 {
-	const char *itf = dbus_message_get_interface(message);
-	return itf != NULL && !strcmp(itf, jbus->name);
+	struct jservice *service;
+	const char *member;
+	struct json_object *obj;
+
+	member = sbus_member(smsg);
+	service = jbus->services;
+	while (service != NULL) {
+		if (!strcmp(service->method, member)) {
+			if (service->oncall_s)
+				service->oncall_s(smsg, content, service->data);
+			else if (service->oncall_j) {
+				if (!jparse(jbus, content, &obj))
+					obj = json_object_new_string(content);
+				service->oncall_j(smsg, obj, service->data);
+				json_object_put(obj);
+			}
+		}
+		service = service->next;
+	}
 }
 
 /*
@@ -165,12 +158,21 @@ static int matchitf(struct jbus *jbus, DBusMessage * message)
 static int add_service(
 		struct jbus *jbus,
 		const char *method,
-		void (*oncall_s) (struct jreq *, const char *, void *),
-		void (*oncall_j) (struct jreq *, struct json_object *, void *),
+		void (*oncall_s) (struct sbusmsg *, const char *, void *),
+		void (*oncall_j) (struct sbusmsg *, struct json_object *, void *),
 		void *data)
 {
 	struct jservice *srv;
 
+	/* connection of the service */
+	if (jbus->sservice == NULL) {
+		jbus->sservice = sbus_add_service(jbus->sbus,
+				NULL, jbus->path, jbus->name, NULL,
+				(void*)on_service_call, jbus);
+		if (jbus->sservice == NULL)
+			goto error;
+	}
+
 	/* allocation */
 	srv = malloc(sizeof *srv);
 	if (srv == NULL) {
@@ -195,9 +197,33 @@ static int add_service(
  error2:
 	free(srv);
  error:
+	errno = ENOMEM;
 	return -1;
 }
 
+static void on_signal_event(const struct sbusmsg *smsg, const char *content, struct jbus *jbus)
+{
+	struct jsignal *signal;
+	const char *member;
+	struct json_object *obj;
+
+	member = sbus_member(smsg);
+	signal = jbus->signals;
+	while (signal != NULL) {
+		if (!strcmp(signal->name, member)) {
+			if (signal->onsignal_s)
+				signal->onsignal_s(content, signal->data);
+			else if (signal->onsignal_j) {
+				if (!jparse(jbus, content, &obj))
+					obj = json_object_new_string(content);
+				signal->onsignal_j(obj, signal->data);
+				json_object_put(obj);
+			}
+		}
+		signal = signal->next;
+	}
+}
+
 /*
  * Adds to 'jbus' a handler for the signal of 'name' emmited by
  * the sender and the interface that 'jbus' is linked to.
@@ -215,17 +241,15 @@ static int add_signal(
 		void (*onsignal_j) (struct json_object *, void *),
 		void *data)
 {
-	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);
+	/* connection of the signal */
+	if (jbus->ssignal == NULL) {
+		jbus->ssignal = sbus_add_signal(jbus->sbus,
+				NULL, jbus->path, jbus->name, NULL,
+				(void*)on_signal_event, jbus);
+		if (jbus->ssignal == NULL)
+			goto error;
 	}
 
 	/* allocation */
@@ -252,6 +276,17 @@ static int add_signal(
 	return -1;
 }
 
+static void on_reply_j(int status, const char *reply, struct jrespw *jrespw)
+{
+	struct json_object *obj;
+
+	if (!jparse(jrespw->jbus, reply, &obj))
+		obj = json_object_new_string(reply);
+	jrespw->onresp(status, obj, jrespw->data);
+	json_object_put(obj);
+	free(jrespw);
+}
+
 /*
  * Creates a message for 'method' with one string parameter being 'query'
  * and sends it to the destination, object and interface linked to 'jbus'.
@@ -269,359 +304,37 @@ static int call(
 		void (*onresp_j) (int, struct json_object *, void *),
 		void *data)
 {
-	DBusMessage *msg;
 	struct jrespw *resp;
 
+	if (onresp_j == NULL)
+		return sbus_call(jbus->sbus, jbus->name, jbus->path, jbus->name,
+				method, query, onresp_s, data);
+
 	/* allocates the response structure */
 	resp = malloc(sizeof *resp);
-	if (resp == NULL) {
-		errno = ENOMEM;
+	if (resp == NULL)
 		goto error;
-	}
-
-	/* creates the message */
-	msg = dbus_message_new_method_call(jbus->name, jbus->path, jbus->name,
-								method);
-	if (msg == NULL) {
-		errno = ENOMEM;
-		goto error2;
-	}
-
-	/* fill it */
-	if (!dbus_message_append_args
-	    (msg, DBUS_TYPE_STRING, &query, DBUS_TYPE_INVALID)) {
-		errno = ENOMEM;
-		goto error3;
-	}
-
-	/* send it */
-	if (!dbus_connection_send(jbus->connection, msg, &resp->serial)) {
-		/* TODO: which error? */
-		goto error3;
-	}
-
-	/* release the message that is not more used */
-	dbus_message_unref(msg);
 
 	/* fulfill the response structure */
+	resp->jbus = jbus;
+	resp->onresp = onresp_j;
 	resp->data = data;
-	resp->onresp_s = onresp_s;
-	resp->onresp_j = onresp_j;
+	if (sbus_call(jbus->sbus, jbus->name, jbus->path, jbus->name,
+				method, query, (void*)on_reply_j, resp))
+		goto error2;
 
-	/* links the response to list of reponse waiters */
-	resp->next = jbus->waiters;
-	jbus->waiters = resp;
 	return 0;
 
- error3:
-	dbus_message_unref(msg);
  error2:
 	free(resp);
  error:
+	errno = ENOMEM;
 	return -1;
 }
 
-/*
- * Callback function for synchronous calls.
- * This function fills the respsync structure pointed by 'data'
- * with the copy of the answer.
- */
-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;
-}
-
-/*
- * Parses the json-string 'msg' to create a json object stored
- * in 'obj'. It uses the tokener of 'jbus'. This is a small
- * improvement to avoid recreation of tokeners.
- *
- * Returns 1 in case of success and put the result in *'obj'.
- * Returns 0 in case of error and put NULL in *'obj'.
- */
-static int jparse(struct jbus *jbus, const char *msg, struct json_object **obj)
-{
-	json_tokener_reset(jbus->tokener);
-	*obj = json_tokener_parse_ex(jbus->tokener, msg, -1);
-	if (json_tokener_get_error(jbus->tokener) == json_tokener_success)
-		return 1;
-	json_object_put(*obj);
-	*obj = NULL;
-	return 0;
-}
-
-/*********************** STATIC DBUS MESSAGE HANDLING *****************/
-
-/*
- * Handles incomming responses 'message' on 'jbus'. Response are
- * either expected if 'iserror' == 0 or errors if 'iserror' != 0.
- *
- * Returns DBUS_HANDLER_RESULT_HANDLED or DBUS_HANDLER_RESULT_NOT_YET_HANDLED
- * as defined by the dbus function 'dbus_connection_add_filter'.
- */
-static DBusHandlerResult incoming_resp(
-		struct jbus *jbus,
-		DBusMessage * message,
-		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 = 0;
-	else {
-		status = -1;
-		str = NULL;
-		reply = NULL;
-	}
-
-	/* treat it */
-	if (jrw->onresp_s)
-		jrw->onresp_s(iserror ? -1 : status, str, jrw->data);
-	else {
-		status = jparse(jbus, str, &reply) - 1;
-		jrw->onresp_j(iserror ? -1 : status, reply, jrw->data);
-		json_object_put(reply);
-	}
-
-	free(jrw);
-	return DBUS_HANDLER_RESULT_HANDLED;
-}
-
-/*
- * Handles incomming on 'jbus' method calls for 'message'.
- *
- * Returns DBUS_HANDLER_RESULT_HANDLED or DBUS_HANDLER_RESULT_NOT_YET_HANDLED
- * as defined by the dbus function 'dbus_connection_add_filter'.
- */
-static DBusHandlerResult incoming_call(
-		struct jbus *jbus,
-		DBusMessage * message)
-{
-	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;
-
-	/* creates and init the jreq structure */
-	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 parameter of the message */
-	if (!dbus_message_get_args
-	    (message, NULL, DBUS_TYPE_STRING, &str, DBUS_TYPE_INVALID))
-		goto invalid_request;
-
-	/* send the message to the callback */
-	if (srv->oncall_s) {
-		/* handling strings only */
-		srv->oncall_s(jreq, str, srv->data);
-	} else {
-		/* handling json only */
-		if (!jparse(jbus, str, &query))
-			goto invalid_request;
-		srv->oncall_j(jreq, query, srv->data);
-		json_object_put(query);
-	}
-	return DBUS_HANDLER_RESULT_HANDLED;
-
-invalid_request:
-	jbus_reply_error_s(jreq, invalid_request_string);
-	return DBUS_HANDLER_RESULT_HANDLED;
-}
-
-/*
- * Handles incomming on 'jbus' signal propagated with 'message'.
- *
- * This is a design choice to ignore invalid signals.
- *
- * Returns DBUS_HANDLER_RESULT_HANDLED or DBUS_HANDLER_RESULT_NOT_YET_HANDLED
- * as defined by the dbus function 'dbus_connection_add_filter'.
- */
-static DBusHandlerResult incoming_signal(
-		struct jbus *jbus,
-		DBusMessage * message)
-{
-	struct jsignal *sig;
-	const char *str;
-	const char *name;
-	struct json_object *obj;
-
-	/* search for the signal name */
-	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, sig->data);
-		} else {
-			/* handling json only (if valid) */
-			if (jparse(jbus, str, &obj)) {
-				sig->onsignal_j(obj, sig->data);
-				json_object_put(obj);
-			}
-		}
-	}
-	return DBUS_HANDLER_RESULT_HANDLED;
-}
-
-/*
- * Filters incomming messages as defined by the dbus function
- * 'dbus_connection_add_filter'.
- * Returns DBUS_HANDLER_RESULT_HANDLED or DBUS_HANDLER_RESULT_NOT_YET_HANDLED.
- */
-static DBusHandlerResult incoming(
-		DBusConnection * connection,
-		DBusMessage * message,
-		void *data)
-{
-	struct jbus *jbus = data;
-	switch (dbus_message_get_type(message)) {
-	case DBUS_MESSAGE_TYPE_METHOD_CALL:
-		return incoming_call(jbus, message);
-	case DBUS_MESSAGE_TYPE_METHOD_RETURN:
-		return incoming_resp(jbus, message, 0);
-	case DBUS_MESSAGE_TYPE_ERROR:
-		return incoming_resp(jbus, message, 1);
-	case DBUS_MESSAGE_TYPE_SIGNAL:
-		return incoming_signal(jbus, message);
-	}
-	return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-}
-
-/*********************** STATIC DBUS WATCH/POLLING INTERFACE **********/
-
-/*
- * Set the watched flags of 'jbus' following what DBUS expects by 'watch'
- */
-static void watchset(DBusWatch * watch, struct jbus *jbus)
-{
-	unsigned int flags;
-	short wf;
-
-	flags = dbus_watch_get_flags(watch);
-	wf = jbus->watchflags;
-	if (dbus_watch_get_enabled(watch)) {
-		if (flags & DBUS_WATCH_READABLE)
-			wf |= POLLIN;
-		if (flags & DBUS_WATCH_WRITABLE)
-			wf |= POLLOUT;
-	} else {
-		if (flags & DBUS_WATCH_READABLE)
-			wf &= ~POLLIN;
-		if (flags & DBUS_WATCH_WRITABLE)
-			wf &= ~POLLOUT;
-	}
-	jbus->watchflags = wf;
-}
-
-/*
- * DBUS Callback for removing a 'watch'.
- * See function 'dbus_connection_set_watch_functions'
- */
-static void watchdel(DBusWatch * watch, void *data)
-{
-	struct jbus *jbus = data;
-
-	assert(jbus->watchnr > 0);
-	assert(jbus->watchfd == dbus_watch_get_unix_fd(watch));
-	jbus->watchnr--;
-}
-
-/*
- * DBUS Callback for changing a 'watch'.
- * See function 'dbus_connection_set_watch_functions'
- */
-static void watchtoggle(DBusWatch * watch, void *data)
-{
-	struct jbus *jbus = data;
-
-	assert(jbus->watchnr > 0);
-	assert(jbus->watchfd == dbus_watch_get_unix_fd(watch));
-	watchset(watch, jbus);
-}
-
-/*
- * DBUS Callback for adding a 'watch'.
- * See function 'dbus_connection_set_watch_functions'
- */
-static dbus_bool_t watchadd(DBusWatch * watch, void *data)
-{
-	struct jbus *jbus = data;
-	if (jbus->watchnr == 0) {
-		jbus->watchfd = dbus_watch_get_unix_fd(watch);
-		jbus->watchflags = 0;
-	} else if (jbus->watchfd != dbus_watch_get_unix_fd(watch))
-		return FALSE;
-	jbus->watchnr++;
-	watchset(watch, jbus);
-	return TRUE;
-}
-
 /********************* MAIN FUNCTIONS *****************************************/
 
 /*
- * Creates a 'jbus' bound to DBUS system using 'path' and returns it.
- * See 'create_jbus'
- */
-struct jbus *create_jbus_system(const char *path)
-{
-	return create_jbus(path, 0);
-}
-
-/*
- * Creates a 'jbus' bound to DBUS session using 'path' and returns it.
- * See 'create_jbus'
- */
-struct jbus *create_jbus_session(const char *path)
-{
-	return create_jbus(path, 1);
-}
-
-/*
  * Creates a 'jbus' bound the 'path' and it derived names and linked
  * either to the DBUS SYSTEM when 'session' is nul or to the DBUS SESSION
  * if 'session' is not nul.
@@ -638,7 +351,7 @@ struct jbus *create_jbus_session(const char *path)
  *
  * Returns the created jbus or NULL in case of error.
  */
-struct jbus *create_jbus(const char *path, int session)
+struct jbus *create_jbus(struct sbus *sbus, const char *path)
 {
 	struct jbus *jbus;
 	char *name;
@@ -687,14 +400,7 @@ struct jbus *create_jbus(const char *path, int session)
 	}
 
 	/* connect and init */
-	jbus->connection = dbus_bus_get(session ? DBUS_BUS_SESSION
-						: DBUS_BUS_SYSTEM, NULL);
-	if (jbus->connection == NULL
-	    || !dbus_connection_add_filter(jbus->connection, incoming, jbus,
-									NULL)
-	    || !dbus_connection_set_watch_functions(jbus->connection, watchadd,
-					watchdel, watchtoggle, jbus, NULL))
-		goto error2;
+	jbus->sbus = sbus;
 
 	return jbus;
 
@@ -719,16 +425,25 @@ void jbus_addref(struct jbus *jbus)
 void jbus_unref(struct jbus *jbus)
 {
 	struct jservice *srv;
+	struct jsignal *sig;
 	if (!--jbus->refcount) {
-		if (jbus->connection != NULL)
-			dbus_connection_unref(jbus->connection);
 		while ((srv = jbus->services) != NULL) {
 			jbus->services = srv->next;
 			free(srv->method);
 			free(srv);
 		}
+		while ((sig = jbus->signals) != NULL) {
+			jbus->signals = sig->next;
+			free(sig->name);
+			free(sig);
+		}
+		if (jbus->sservice != NULL)
+			sbus_remove_service(jbus->sbus, jbus->sservice);
+		if (jbus->ssignal != NULL)
+			sbus_remove_signal(jbus->sbus, jbus->ssignal);
 		if (jbus->tokener != NULL)
 			json_tokener_free(jbus->tokener);
+		sbus_unref(jbus->sbus);
 		free(jbus->name);
 		free(jbus->path);
 		free(jbus);
@@ -736,79 +451,49 @@ void jbus_unref(struct jbus *jbus)
 }
 
 /*
- * Replies an error of string 'error' to the request handled by 'jreq'.
- * Also destroys the request 'jreq' that must not be used later.
+ * Replies an error of string 'error' to the request handled by 'smsg'.
+ * Also destroys the request 'smsg' that must not be used later.
  *
  * Returns 0 in case of success or -1 in case of error.
  */
-int jbus_reply_error_s(struct jreq *jreq, const char *error)
+int jbus_reply_error_s(struct sbusmsg *smsg, 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;
+	return sbus_reply_error(smsg, error);
 }
 
 /*
- * Replies an error of json 'reply' to the request handled by 'jreq'.
- * Also destroys the request 'jreq' that must not be used later.
+ * Replies an error of json 'reply' to the request handled by 'smsg'.
+ * Also destroys the request 'smsg' that must not be used later.
  *
  * Returns 0 in case of success or -1 in case of error.
  */
-int jbus_reply_error_j(struct jreq *jreq, struct json_object *reply)
+int jbus_reply_error_j(struct sbusmsg *smsg, 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);
+	return str ? jbus_reply_error_s(smsg, str) : reply_out_of_memory(smsg);
 }
 
 /*
- * Replies normally the string 'reply' to the request handled by 'jreq'.
- * Also destroys the request 'jreq' that must not be used later.
+ * Replies normally the string 'reply' to the request handled by 'smsg'.
+ * Also destroys the request 'smsg' that must not be used later.
  *
  * Returns 0 in case of success or -1 in case of error.
  */
-int jbus_reply_s(struct jreq *jreq, const char *reply)
+int jbus_reply_s(struct sbusmsg *smsg, 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;
+	return sbus_reply(smsg, reply);
 }
 
 /*
- * Replies normally the json 'reply' to the request handled by 'jreq'.
- * Also destroys the request 'jreq' that must not be used later.
+ * Replies normally the json 'reply' to the request handled by 'smsg'.
+ * Also destroys the request 'smsg' that must not be used later.
  *
  * Returns 0 in case of success or -1 in case of error.
  */
-int jbus_reply_j(struct jreq *jreq, struct json_object *reply)
+int jbus_reply_j(struct sbusmsg *smsg, 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);
+	return str ? jbus_reply_s(smsg, str) : reply_out_of_memory(smsg);
 }
 
 /*
@@ -818,28 +503,7 @@ int jbus_reply_j(struct jreq *jreq, struct json_object *reply)
  */
 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_set_sender(message, jbus->name)
-	    || !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;
+	return sbus_send_signal(jbus->sbus, jbus->name, jbus->path, jbus->name, name, content);
 }
 
 /*
@@ -864,7 +528,7 @@ int jbus_send_signal_j(struct jbus *jbus, const char *name,
  *
  * The callback 'oncall' is invoked for handling incoming method
  * calls. It receives 3 parameters:
- *   1. struct jreq *: a handler to data to be used for replying
+ *   1. struct sbusmsg *: a handler to data to be used for replying
  *   2. const char *: the received string
  *   3. void *: the closure 'data' set by this function
  *
@@ -873,7 +537,7 @@ int jbus_send_signal_j(struct jbus *jbus, const char *name,
 int jbus_add_service_s(
 		struct jbus *jbus,
 		const char *method,
-		void (*oncall) (struct jreq *, const char *, void *),
+		void (*oncall) (struct sbusmsg *, const char *, void *),
 		void *data)
 {
 	return add_service(jbus, method, oncall, NULL, data);
@@ -885,7 +549,7 @@ int jbus_add_service_s(
  *
  * The callback 'oncall' is invoked for handling incoming method
  * calls. It receives 3 parameters:
- *   1. struct jreq *: a handler to data to be used for replying
+ *   1. struct sbusmsg *: a handler to data to be used for replying
  *   2. struct json_object *: the received json
  *   3. void *: the closure 'data' set by this function
  *
@@ -894,7 +558,7 @@ int jbus_add_service_s(
 int jbus_add_service_j(
 		struct jbus *jbus,
 		const char *method,
-		void (*oncall) (struct jreq *, struct json_object *, void *),
+		void (*oncall) (struct sbusmsg *, struct json_object *, void *),
 		void *data)
 {
 	return add_service(jbus, method, NULL, oncall, data);
@@ -911,146 +575,7 @@ int jbus_add_service_j(
  */
 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;
-	}
-}
-
-/*
- * Fills the at least 'njbuses' structures of array 'fds' with data needed
- * to poll the 'njbuses' buses pointed by 'jbuses'.
- *
- * Returns the count of 'fds' structures filled.
- */
-int jbus_fill_pollfds(struct jbus **jbuses, int njbuses, struct pollfd *fds)
-{
-	int i, r;
-
-	for (r = i = 0; i < njbuses; i++) {
-		if (jbuses[i]->watchnr) {
-			fds[r].fd = jbuses[i]->watchfd;
-			fds[r].events = jbuses[i]->watchflags;
-			r++;
-		}
-	}
-	return r;
-}
-
-/*
- * Dispatchs a maximum of 'maxcount' events received by poll in 'fds' for the
- * 'njbuses' jbuses of the array 'jbuses'.
- *
- * Returns the count of event dispatched.
- */
-int jbus_dispatch_pollfds(
-		struct jbus **jbuses,
-		int njbuses,
-		struct pollfd *fds,
-		int maxcount)
-{
-	int i, r, n;
-	DBusDispatchStatus sts;
-
-	for (r = n = i = 0; i < njbuses && n < maxcount; i++) {
-		if (jbuses[i]->watchnr && fds[r].fd == jbuses[i]->watchfd) {
-			if (fds[r].revents) {
-				dbus_connection_read_write(
-						jbuses[i]->connection, 0);
-				sts = dbus_connection_get_dispatch_status(
-							jbuses[i]->connection);
-				while (sts == DBUS_DISPATCH_DATA_REMAINS
-							&& n < maxcount) {
-					sts = dbus_connection_dispatch(
-							jbuses[i]->connection);
-					n++;
-				}
-			}
-			r++;
-		}
-	}
-	return n;
-}
-
-/*
- * Dispatches 'maxcount' of buffered data from the 'njbuses' jbuses of the
- * array 'jbuses'.
- *
- * Returns the count of event dispatched.
- */
-int jbus_dispatch_multiple(struct jbus **jbuses, int njbuses, int maxcount)
-{
-	int i, r;
-	DBusDispatchStatus sts;
-
-	for (i = r = 0; i < njbuses && r < maxcount; i++) {
-		dbus_connection_read_write(jbuses[i]->connection, 0);
-		sts = dbus_connection_get_dispatch_status(
-							jbuses[i]->connection);
-		while (sts == DBUS_DISPATCH_DATA_REMAINS && r < maxcount) {
-			sts = dbus_connection_dispatch(jbuses[i]->connection);
-			r++;
-		}
-	}
-	return r;
-}
-
-/*
- * Polls during at most 'toms' milliseconds and dispatches 'maxcount'
- * of events from the 'njbuses' jbuses of the array 'jbuses'.
- *
- * Returns the count of event dispatched or -1 in case of error.
- */
-int jbus_read_write_dispatch_multiple(
-		struct jbus **jbuses,
-		int njbuses,
-		int toms,
-		int maxcount)
-{
-	int n, r, s;
-	struct pollfd *fds;
-
-	if (njbuses < 0 || njbuses > 100) {
-		errno = EINVAL;
-		return -1;
-	}
-	fds = alloca((unsigned)njbuses * sizeof *fds);
-	assert(fds != NULL);
-
-	r = jbus_dispatch_multiple(jbuses, njbuses, maxcount);
-	if (r)
-		return r;
-	n = jbus_fill_pollfds(jbuses, njbuses, fds);
-	for (;;) {
-		s = poll(fds, (nfds_t) n, toms);
-		if (s >= 0)
-			break;
-		if (errno != EINTR)
-			return r ? r : s;
-		toms = 0;
-	}
-	n = jbus_dispatch_pollfds(jbuses, njbuses, fds, maxcount - r);
-	return n >= 0 ? r + n : r ? r : n;
-}
-
-/*
- * Polls during at most 'toms' milliseconds and dispatches
- * the events from 'jbus'.
- *
- * Returns the count of event dispatched or -1 in case of error.
- */
-int jbus_read_write_dispatch(struct jbus *jbus, int toms)
-{
-	int r = jbus_read_write_dispatch_multiple(&jbus, 1, toms, 1000);
-	return r < 0 ? r : 0;
+	return sbus_add_name(jbus->sbus, jbus->name);
 }
 
 /*
@@ -1158,12 +683,8 @@ char *jbus_call_ss_sync(
 		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;
+	return sbus_call_sync(jbus->sbus, jbus->name, jbus->path, jbus->name,
+			method, query);
 }
 
 /*
@@ -1264,25 +785,50 @@ int jbus_on_signal_j(
 
 /****************** FEW LITTLE TESTS *****************************************/
 
-#ifdef SERVER
+#if defined(SERVER)||defined(CLIENT)
 #include <stdio.h>
 #include <unistd.h>
-struct jbus *jbus;
-void ping(struct jreq *jreq, struct json_object *request, void *unused)
+#include "utils-upoll.h"
+
+static int mwait(int timeout, void *closure)
+{
+	upoll_wait(-1);
+	return 0;
+}
+
+static const struct sbus_itf uitf = {
+	.wait = (void*)mwait,
+	.open = (void*)upoll_open,
+	.on_readable = (void*)upoll_on_readable,
+	.on_writable = (void*)upoll_on_writable,
+	.on_hangup = (void*)upoll_on_hangup,
+	.close = (void*)upoll_close
+};
+
+static struct sbus *sbus;
+static struct jbus *jbus;
+
+static struct sbus *msbus()
+{
+	return sbus ? : (sbus = sbus_session(&uitf, NULL));
+}
+
+#ifdef SERVER
+void ping(struct sbusmsg *smsg, struct json_object *request, void *unused)
 {
 	printf("ping(%s) -> %s\n", json_object_to_json_string(request),
 	       json_object_to_json_string(request));
-	jbus_reply_j(jreq, request);
+	jbus_reply_j(smsg, request);
 	json_object_put(request);
 }
 
-void incr(struct jreq *jreq, struct json_object *request, void *unused)
+void incr(struct sbusmsg *smsg, struct json_object *request, void *unused)
 {
 	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_reply_j(smsg, res);
 	jbus_send_signal_j(jbus, "incremented", res);
 	json_object_put(res);
 	json_object_put(request);
@@ -1291,18 +837,17 @@ void incr(struct jreq *jreq, struct json_object *request, void *unused)
 int main()
 {
 	int s1, s2, s3;
-	jbus = create_jbus(1, "/bzh/iot/jdbus");
+	jbus = create_jbus(msbus(), "/bzh/iot/jdbus");
 	s1 = jbus_add_service_j(jbus, "ping", ping, NULL);
 	s2 = jbus_add_service_j(jbus, "incr", incr, NULL);
 	s3 = jbus_start_serving(jbus);
 	printf("started %d %d %d\n", s1, s2, s3);
-	while (!jbus_read_write_dispatch(jbus, -1)) ;
+	while (!mwait(-1,jbus)) ;
+	return 0;
 }
 #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,
@@ -1310,25 +855,28 @@ void onresp(int status, struct json_object *response, void *data)
 	json_object_put(response);
 }
 
-void signaled(const char *data)
+void signaled(const char *content, void *data)
 {
-	printf("signaled with {%s}\n", data);
+	printf("signaled with {%s}/%s\n", content, (char*)data);
 }
 
 int main()
 {
 	int i = 10;
-	jbus = create_jbus(1, "/bzh/iot/jdbus");
-	jbus_on_signal_s(jbus, "incremented", signaled);
+	jbus = create_jbus(msbus(), "/bzh/iot/jdbus");
+	jbus_on_signal_s(jbus, "incremented", signaled, "closure-signal");
 	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);
+		mwait(-1,jbus);
 	}
 	printf("[[[%s]]]\n",
 	       jbus_call_ss_sync(jbus, "ping", "\"formidable!\""));
-	while (!jbus_read_write_dispatch(jbus, -1)) ;
+	while (!mwait(-1,jbus)) ;
+	return 0;
 }
 #endif
+#endif
+
diff --git a/plugins/afm-main-plugin/utils-jbus.h b/plugins/afm-main-plugin/utils-jbus.h
index 10690984..d85b8aff 100644
--- a/plugins/afm-main-plugin/utils-jbus.h
+++ b/plugins/afm-main-plugin/utils-jbus.h
@@ -16,44 +16,16 @@
  limitations under the License.
 */
 
-struct jreq;
+#pragma once
+
+struct sbusmsg;
 struct jbus;
-struct pollfd;
 
-extern struct jbus *create_jbus(const char *path, int session);
-extern struct jbus *create_jbus_session(const char *path);
-extern struct jbus *create_jbus_system(const char *path);
+extern struct jbus *create_jbus(struct sbus *sbus, const char *path);
 
 extern void jbus_addref(struct jbus *jbus);
 extern void jbus_unref(struct jbus *jbus);
 
-extern int jbus_fill_pollfds(
-		struct jbus **jbuses,
-		int njbuses,
-		struct pollfd *fds);
-
-extern int jbus_dispatch_pollfds(
-		struct jbus **jbuses,
-		 int njbuses,
-		 struct pollfd *fds,
-		 int maxcount);
-
-extern int jbus_read_write_dispatch_multiple(
-		struct jbus **jbuses,
-		int njbuses,
-		int toms,
-		int maxcount);
-
-extern int jbus_dispatch_multiple(
-		struct jbus **jbuses,
-		int njbuses,
-		int maxcount);
-
-extern int jbus_read_write_dispatch(
-		struct jbus *jbus,
-		int toms);
-
-
 /* verbs for the clients */
 extern int jbus_call_ss(
 		struct jbus *jbus,
@@ -117,31 +89,31 @@ extern int jbus_on_signal_j(
 
 /* verbs for servers */
 extern int jbus_reply_s(
-		struct jreq *jreq,
+		struct sbusmsg *smsg,
 		const char *reply);
 
 extern int jbus_reply_j(
-		struct jreq *jreq,
+		struct sbusmsg *smsg,
 		struct json_object *reply);
 
 extern int jbus_reply_error_s(
-		struct jreq *jreq,
+		struct sbusmsg *smsg,
 		const char *reply);
 
 extern int jbus_reply_error_j(
-		struct jreq *jreq,
+		struct sbusmsg *smsg,
 		struct json_object *reply);
 
 extern int jbus_add_service_s(
 		struct jbus *jbus,
 		const char *method,
-		void (*oncall) (struct jreq *, const char *, void *),
+		void (*oncall) (struct sbusmsg *, const char *, void *),
 		void *data);
 
 extern int jbus_add_service_j(
 		struct jbus *jbus,
 		const char *method,
-		void (*oncall) (struct jreq *, struct json_object *, void *),
+		void (*oncall) (struct sbusmsg *, struct json_object *, void *),
 		void *data);
 
 extern int jbus_start_serving(
diff --git a/plugins/afm-main-plugin/utils-sbus.c b/plugins/afm-main-plugin/utils-sbus.c
new file mode 100644
index 00000000..a5c63c65
--- /dev/null
+++ b/plugins/afm-main-plugin/utils-sbus.c
@@ -0,0 +1,1037 @@
+/*
+ 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 <poll.h>
+#include <assert.h>
+
+#include <dbus/dbus.h>
+
+#include "utils-sbus.h"
+
+/*
+ * errors messages generated by sbus
+ */
+static const char invalid_request_string[] = "invalid request";
+static const char out_of_memory_string[] = "out of memory";
+
+/*
+ * structure for handled messages
+ */
+struct sbusmsg {
+	DBusMessage *message;       /* message of the message */
+	DBusConnection *connection; /* connection of the message */
+};
+
+/*
+ * structure for services
+ */
+struct sbus_service {
+	struct sbus_service *next;	/* link to the next service */
+	char *destination;		/* destination for the service */
+	char *path;		/* path for the service */
+	char *iface;		/* iface for the service */
+	char *member;		/* member for the service */
+	void (*oncall) (struct sbusmsg *, const char *, void *);
+				/* callback */
+	void *closure;		/* closure for the callbacks */
+};
+
+/*
+ * structure for signals
+ */
+struct sbus_signal {
+	struct sbus_signal *next;	/* link to the next signal */
+	char *sender;		/* expected sender of the signal */
+	char *path;		/* expected path of the signal */
+	char *iface;		/* expected iface of the signal */
+	char *member;		/* expected member of the signal */
+	void (*onsignal) (const struct sbusmsg *, const char *, void *);
+				/* callback */
+	void *closure;		/* closure for the callbacks */
+};
+
+/*
+ * structure for asynchronous requests (resp-onse w-aiter)
+ */
+struct srespw {
+	struct srespw *next;	/* next asynchronous */
+	dbus_uint32_t serial;	/* serial dbus number */
+	void *closure;		/* closure for the callbacks */
+	void (*onresp) (int, const char *, void *);
+				/* callback */
+};
+
+/*
+ * structure for synchronous calls
+ */
+struct respsync {
+	int replied;	/* boolean flag indicating reply */
+	int status;     /* received status */
+	char *value;	/* copy of the returned value */
+};
+
+/*
+ * structure for handling either client or server sbus on dbus
+ */
+struct sbus {
+	int refcount;			/* referenced how many time */
+	DBusConnection *connection;	/* connection to DBU */
+	const struct sbus_itf *itf;	/* interface to the main loop */
+	void *itfclo;
+	struct sbus_service *services;	/* first service */
+	struct sbus_signal *signals;	/* first signal */
+	struct srespw *waiters;		/* first response waiter */
+	
+};
+
+static struct sbus system_sbus;
+static struct sbus session_sbus;
+
+/*********************** STATIC COMMON METHODS *****************/
+
+/*
+ * Frees the ressources attached to a message
+ */
+static inline void free_sbusmsg(struct sbusmsg *smsg)
+{
+	dbus_message_unref(smsg->message);
+	dbus_connection_unref(smsg->connection);
+	free(smsg);
+}
+
+/*
+ * Replies the error "out of memory".
+ * This function is intended to be used in services when an
+ * allocation fails. Thus, it set errno to ENOMEM and
+ * returns -1.
+ */
+static inline int reply_out_of_memory(struct sbusmsg *smsg)
+{
+	sbus_reply_error(smsg, out_of_memory_string);
+	errno = ENOMEM;
+	return -1;
+}
+
+/*
+ * Checks if the incoming 'message' matches the interface
+ * linked to 'sbus'.
+ *
+ * Returns 1 if it matches or 0 wether it does not matches.
+ */
+/*
+static int matchitf(struct sbus *sbus, DBusMessage * message)
+{
+	const char *itf = dbus_message_get_interface(message);
+	return itf != NULL && !strcmp(itf, sbus->name);
+}
+*/
+
+/*
+ * Callback function for synchronous calls.
+ * This function fills the respsync structure pointed by 'data'
+ * with the copy of the answer.
+ */
+static void sync_of_replies(int status, const char *value, struct respsync *s)
+{
+	s->status = status;
+	s->value = status ? NULL : strdup(value ? value : "");
+	s->replied = 1;
+}
+
+/*
+ * Creates and returns the rule for 'signal'.
+ */
+static char *rule_of_signal(struct sbus_signal *signal)
+{
+	char *rule;
+	return asprintf(&rule,
+			"type='signal%s%s%s%s%s%s%s%s'",
+			signal->sender ? "',sender='" : "",
+				signal->sender ? signal->sender : "",
+			signal->path   ? "',path='" : "",
+				signal->path   ? signal->path : "",
+			signal->iface  ? "',interface='" : "",
+				signal->iface  ? signal->iface : "",
+			signal->member  ? "',member='" : "",
+				signal->member  ? signal->member : ""
+		) < 0 ? NULL : rule;
+}
+
+/*********************** STATIC DBUS MESSAGE HANDLING *****************/
+
+/*
+ * Handles incomming responses 'message' on 'sbus'. Response are
+ * either expected if 'iserror' == 0 or errors if 'iserror' != 0.
+ *
+ * Returns DBUS_HANDLER_RESULT_HANDLED or DBUS_HANDLER_RESULT_NOT_YET_HANDLED
+ * as defined by the dbus function 'dbus_connection_add_filter'.
+ */
+static DBusHandlerResult incoming_resp(
+		struct sbus *sbus,
+		DBusMessage * message,
+		int iserror)
+{
+	int status;
+	const char *str;
+	struct srespw *jrw, **prv;
+	dbus_uint32_t serial;
+
+	/* search for the waiter */
+	serial = dbus_message_get_reply_serial(message);
+	prv = &sbus->waiters;
+	while ((jrw = *prv) != NULL) {
+		if (jrw->serial == serial)
+			goto found;
+		prv = &jrw->next;
+	}
+	return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+
+	/* treat it */
+ found:
+	*prv = jrw->next;
+	if (jrw->onresp) {
+		/* retrieve the string value */
+		if (dbus_message_get_args
+		    (message, NULL, DBUS_TYPE_STRING, &str, DBUS_TYPE_INVALID))
+			status = 0;
+		else {
+			status = -1;
+			str = NULL;
+		}
+		/* call now */
+		jrw->onresp(iserror ? -1 : status, str, jrw->closure);
+	}
+	free(jrw);
+	return DBUS_HANDLER_RESULT_HANDLED;
+}
+
+/*
+ * Handles incomming on 'sbus' method calls for 'message'.
+ *
+ * Returns DBUS_HANDLER_RESULT_HANDLED or DBUS_HANDLER_RESULT_NOT_YET_HANDLED
+ * as defined by the dbus function 'dbus_connection_add_filter'.
+ */
+static DBusHandlerResult incoming_call(
+		struct sbus *sbus,
+		DBusMessage * message)
+{
+	struct sbus_service *service;
+	struct sbusmsg *smsg;
+	const char *str;
+
+	/* search for the service */
+	service = sbus->services;
+	while (service != NULL) {
+		if ((service->destination == NULL || !strcmp(service->destination, dbus_message_get_destination(message)))
+		 && (service->path == NULL || !strcmp(service->path, dbus_message_get_path(message)))
+		 && (service->iface == NULL || !strcmp(service->iface, dbus_message_get_interface(message)))
+		 && (service->member == NULL || !strcmp(service->member, dbus_message_get_member(message))))
+			goto found;
+		service = service->next;
+	}
+	return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+
+ found:
+	/* creates and init the smsg structure */
+	smsg = malloc(sizeof *smsg);
+	if (smsg == NULL)
+		return DBUS_HANDLER_RESULT_NEED_MEMORY;
+	smsg->message = dbus_message_ref(message);
+	smsg->connection = dbus_connection_ref(sbus->connection);
+
+	/* retrieve the string parameter of the message */
+	if (!dbus_message_get_args
+	    (message, NULL, DBUS_TYPE_STRING, &str, DBUS_TYPE_INVALID))
+		goto invalid_request;
+
+	/* handling strings only */
+	service->oncall(smsg, str, service->closure);
+	return DBUS_HANDLER_RESULT_HANDLED;
+
+invalid_request:
+	sbus_reply_error(smsg, invalid_request_string);
+	return DBUS_HANDLER_RESULT_HANDLED;
+}
+
+/*
+ * Handles incomming on 'sbus' signal propagated with 'message'.
+ *
+ * This is a design choice to ignore invalid signals.
+ *
+ * Returns DBUS_HANDLER_RESULT_HANDLED or DBUS_HANDLER_RESULT_NOT_YET_HANDLED
+ * as defined by the dbus function 'dbus_connection_add_filter'.
+ */
+static DBusHandlerResult incoming_signal(
+		struct sbus *sbus,
+		DBusMessage * message)
+{
+	DBusHandlerResult result;
+	struct sbus_signal *signal;
+	struct sbusmsg smsg;
+	const char *str;
+
+	/* retrieve the string value */
+	result = DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+	if (!dbus_message_get_args(message, NULL,
+				DBUS_TYPE_STRING, &str, DBUS_TYPE_INVALID))
+		goto end;
+
+	/* search a handler */
+	smsg.message = message;
+	smsg.connection = NULL;
+	signal = sbus->signals;
+	while (signal != NULL) {
+		if ((signal->path == NULL || !strcmp(signal->path, dbus_message_get_path(message)))
+		 && (signal->iface == NULL || !strcmp(signal->iface, dbus_message_get_interface(message)))
+		 && (signal->member == NULL || !strcmp(signal->member, dbus_message_get_member(message)))) {
+			signal->onsignal(&smsg, str, signal->closure);
+			result = DBUS_HANDLER_RESULT_HANDLED;
+		}
+		signal = signal->next;
+	}
+ end:
+	return result;
+}
+
+/*
+ * Filters incomming messages as defined by the dbus function
+ * 'dbus_connection_add_filter'.
+ * Returns DBUS_HANDLER_RESULT_HANDLED or DBUS_HANDLER_RESULT_NOT_YET_HANDLED.
+ */
+static DBusHandlerResult incoming(
+		DBusConnection * connection,
+		DBusMessage * message,
+		struct sbus *sbus)
+{
+	switch (dbus_message_get_type(message)) {
+	case DBUS_MESSAGE_TYPE_METHOD_CALL:
+		return incoming_call(sbus, message);
+	case DBUS_MESSAGE_TYPE_METHOD_RETURN:
+		return incoming_resp(sbus, message, 0);
+	case DBUS_MESSAGE_TYPE_ERROR:
+		return incoming_resp(sbus, message, 1);
+	case DBUS_MESSAGE_TYPE_SIGNAL:
+		return incoming_signal(sbus, message);
+	}
+	return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+}
+
+/*********************** STATIC DBUS WATCH/POLLING INTERFACE **********/
+
+struct swatch {
+	DBusConnection *connection;
+	DBusWatch *watch;
+	void *hndl;
+};
+
+static void on_hangup(struct swatch *s)
+{
+	dbus_watch_handle(s->watch, DBUS_WATCH_HANGUP);
+	while (dbus_connection_dispatch(s->connection) == DBUS_DISPATCH_DATA_REMAINS);
+}
+
+static void on_readable(struct swatch *s)
+{
+	dbus_watch_handle(s->watch, DBUS_WATCH_READABLE);
+	while (dbus_connection_dispatch(s->connection) == DBUS_DISPATCH_DATA_REMAINS);
+}
+
+static void on_writable(struct swatch *s)
+{
+	dbus_watch_handle(s->watch, DBUS_WATCH_WRITABLE);
+	while (dbus_connection_dispatch(s->connection) == DBUS_DISPATCH_DATA_REMAINS);
+}
+
+/*
+ * DBUS Callback for removing a 'watch'.
+ * See function 'dbus_connection_set_watch_functions'
+ */
+static void watchdel(DBusWatch *watch, struct sbus *sbus)
+{
+	struct swatch *s = dbus_watch_get_data(watch);
+	sbus->itf->close(s->hndl);
+	free(s);
+}
+
+/*
+ * DBUS Callback for changing a 'watch'.
+ * See function 'dbus_connection_set_watch_functions'
+ */
+static void watchtoggle(DBusWatch *watch, struct sbus *sbus)
+{
+	struct swatch *s = dbus_watch_get_data(watch);
+	int enabled = (int)dbus_watch_get_enabled(watch);
+	unsigned int flags = dbus_watch_get_flags(watch);
+	if (flags & DBUS_WATCH_READABLE)
+		sbus->itf->on_readable(s->hndl, enabled ? (void*)on_readable : NULL);
+	if (flags & DBUS_WATCH_WRITABLE)
+		sbus->itf->on_writable(s->hndl, enabled ? (void*)on_writable : NULL);
+}
+
+
+/*
+ * DBUS Callback for adding a 'watch'.
+ * See function 'dbus_connection_set_watch_functions'
+ */
+static dbus_bool_t watchadd(DBusWatch *watch, struct sbus *sbus)
+{
+	int fd;
+	struct swatch *s;
+
+	s = malloc(sizeof *s);
+	if (s == NULL)
+		goto error;
+	fd = dbus_watch_get_unix_fd(watch);
+	s->hndl = sbus->itf->open(fd, s, sbus->itfclo);
+	if (s->hndl == NULL)
+		goto error2;
+	s->watch = watch;
+	s->connection = sbus->connection;
+	dbus_watch_set_data(watch, s, NULL);
+	sbus->itf->on_hangup(s->hndl, (void*)on_hangup);
+	watchtoggle(watch, sbus);
+	return TRUE;
+ error2:
+	free(s);
+ error:
+	return FALSE;
+}
+
+/*
+ * Creates a 'sbus' bound the 'path' and it derived names and linked
+ * either to the DBUS SYSTEM when 'session' is nul or to the DBUS SESSION
+ * if 'session' is not nul.
+ *
+ * The parameter 'path' is intended to be the path of a DBUS single object.
+ * Single means that it exists only one instance of the object on the
+ * given bus. That path implies 2 derived DBUS names:
+ *   1. the destination name of the program that handles the object
+ *   2. the interface name of the object
+ * These names are derived by removing the heading slash (/) and
+ * by replacing all occurences of slashes by dots.
+ * For example, passing path = /a/b/c means that the object /a/b/c is
+ * handled by the destination a.b.c and replies to the interface a.b.c
+ *
+ * Returns the created sbus or NULL in case of error.
+ */
+static struct sbus *get_sbus(const struct sbus_itf *itf, void *itfclo, struct sbus *sbus)
+{
+	/* create the sbus object */
+	if (sbus->refcount > 0) {
+		if (itf != sbus->itf)
+			goto error;
+		goto success;
+	}
+
+	/* connect and init */
+	sbus->connection = dbus_bus_get(sbus == &session_sbus ? DBUS_BUS_SESSION
+						: DBUS_BUS_SYSTEM, NULL);
+	if (sbus->connection == NULL)
+		goto error;
+
+	sbus->itf = itf;
+	sbus->itfclo = itfclo;
+	if (!dbus_connection_add_filter(sbus->connection, (void*)incoming, sbus, NULL)
+	 || !dbus_connection_set_watch_functions(sbus->connection, (void*)watchadd,
+					(void*)watchdel, (void*)watchtoggle, sbus, NULL)) 
+		goto error2;
+
+ success:
+	sbus->refcount++;
+	return sbus;
+
+ error2:
+	dbus_connection_unref(sbus->connection);
+	sbus->connection = NULL;
+ error:
+	return NULL;
+}
+
+/********************* MAIN FUNCTIONS *****************************************/
+
+/*
+ * Creates a 'sbus' bound to DBUS system using 'path' and returns it.
+ * See 'create_sbus'
+ */
+struct sbus *sbus_system(const struct sbus_itf *itf, void *itfclo)
+{
+	return get_sbus(itf, itfclo, &system_sbus);
+}
+
+/*
+ * Creates a 'sbus' bound to DBUS session using 'path' and returns it.
+ * See 'create_sbus'
+ */
+struct sbus *sbus_session(const struct sbus_itf *itf, void *itfclo)
+{
+	return get_sbus(itf, itfclo, &session_sbus);
+}
+
+/*
+ * Adds one reference to 'sbus'.
+ */
+void sbus_addref(struct sbus *sbus)
+{
+	sbus->refcount++;
+}
+
+/*
+ * Removes one reference to 'sbus'. Destroys 'sbus' and it related
+ * data if the count of references decrease to zero.
+ */
+void sbus_unref(struct sbus *sbus)
+{
+	struct srespw *w;
+	if (!--sbus->refcount) {
+		while (sbus->services != NULL)
+			sbus_remove_service(sbus, sbus->services);
+		while (sbus->signals != NULL)
+			sbus_remove_signal(sbus, sbus->signals);
+		if (sbus->connection != NULL) {
+			dbus_connection_unref(sbus->connection);
+			sbus->connection = NULL;
+		}
+		while ((w = sbus->waiters)) {
+			sbus->waiters = w->next;
+			if (w->onresp)
+				w->onresp(-1, "cancelled", w->closure);
+			free(w);
+		}
+	}
+}
+
+/*
+ * Sends from 'sbus' the signal of 'member' handling the string 'content'.
+ *
+ * Returns 0 in case of success or -1 in case of error.
+ */
+int sbus_send_signal(struct sbus *sbus, const char *sender, const char *path, const char *iface, const char *member, const char *content)
+{
+	int rc = -1;
+	DBusMessage *message;
+
+	message = dbus_message_new_signal(path, iface, member);
+	if (message == NULL)
+		goto error;
+
+	if (sender != NULL && !dbus_message_set_sender(message, sender))
+		goto error2;
+
+	if (!dbus_message_append_args(message, DBUS_TYPE_STRING, &content,
+					 DBUS_TYPE_INVALID))
+		goto error2;
+
+	if (dbus_connection_send(sbus->connection, message, NULL))
+		rc = 0;
+
+	dbus_message_unref(message);
+	return rc;
+
+ error2:
+	dbus_message_unref(message);
+
+ error:
+	errno = ENOMEM;
+	return -1;
+}
+
+/*
+ * Asynchronous call to 'method' of 'sbus' passing the string 'query'.
+ * On response, the function 'onresp' is called with the returned string
+ * value and the closure 'closure'.
+ * The function 'onresp' is invoked with 3 parameters:
+ *   1. int: 0 if no error or -1 if error.
+ *   2. const char *: the returned string (might be NULL if error)
+ *   3. void *: the closure 'closure'
+ *
+ * Returns 0 in case of success or -1 in case of error.
+ */
+int sbus_call(
+		struct sbus *sbus,
+		const char *destination,
+		const char *path,
+		const char *iface,
+		const char *method,
+		const char *query,
+		void (*onresp) (int, const char *, void *),
+		void *closure)
+{
+	DBusMessage *msg;
+	struct srespw *resp;
+
+	/* allocates the response structure */
+	resp = malloc(sizeof *resp);
+	if (resp == NULL) {
+		errno = ENOMEM;
+		goto error;
+	}
+
+	/* creates the message */
+	msg = dbus_message_new_method_call(destination, path, iface, method);
+	if (msg == NULL) {
+		errno = ENOMEM;
+		goto error2;
+	}
+
+	/* fill it */
+	if (!dbus_message_append_args
+	    (msg, DBUS_TYPE_STRING, &query, DBUS_TYPE_INVALID)) {
+		errno = ENOMEM;
+		goto error3;
+	}
+
+	/* send it */
+	if (!dbus_connection_send(sbus->connection, msg, &resp->serial)) {
+		/* TODO: which error? */
+		goto error3;
+	}
+
+	/* release the message that is not more used */
+	dbus_message_unref(msg);
+
+	/* fulfill the response structure */
+	resp->closure = closure;
+	resp->onresp = onresp;
+
+	/* links the response to list of reponse waiters */
+	resp->next = sbus->waiters;
+	sbus->waiters = resp;
+	return 0;
+
+ error3:
+	dbus_message_unref(msg);
+ error2:
+	free(resp);
+ error:
+	return -1;
+}
+
+/*
+ * Synchronous call to 'method' of 'sbus' passing the string 'query'.
+ * The returned string response is returned.
+ *
+ * Returns the string response or NULL in case of error.
+ */
+char *sbus_call_sync(
+		struct sbus *sbus,
+		const char *destination,
+		const char *path,
+		const char *iface,
+		const char *method,
+		const char *query)
+{
+	struct respsync synchro;
+	synchro.value = NULL;
+	synchro.replied = sbus_call(sbus, destination, path,
+				    iface, method, query,
+				    (void*)sync_of_replies, &synchro);
+	while (!synchro.replied)
+		if (sbus->itf->wait(-1, sbus->itfclo) != 0)
+			return NULL;
+	return synchro.value;
+}
+
+
+/*
+ * Records for 'sbus' the string signal handler 'onsig' with closure 'closure'
+ * for the signal of 'member'.
+ * The callback handler is called with 2 arguments:
+ *   1. char *: the string parameter associated to the signal
+ *   2. void *: the closure closure.
+ *
+ * Returns 0 in case of success or -1 otherwise.
+ */
+struct sbus_signal *sbus_add_signal(
+		struct sbus *sbus,
+		const char *sender,
+		const char *path,
+		const char *iface,
+		const char *member,
+		void (*onsignal) (const struct sbusmsg *, const char *, void *),
+		void *closure)
+{
+	char *rule;
+	struct sbus_signal *signal;
+
+	/* allocation */
+	signal = calloc(1, sizeof *signal);
+	if (signal == NULL)
+		goto error;
+	if (sender != NULL) {
+		signal->sender = strdup(sender);
+		if (!signal->sender)
+			goto error2;
+	}
+	if (path != NULL) {
+		signal->path = strdup(path);
+		if (!signal->path)
+			goto error2;
+	}
+	if (iface != NULL) {
+		signal->iface = strdup(iface);
+		if (!signal->iface)
+			goto error2;
+	}
+	if (member != NULL) {
+		signal->member = strdup(member);
+		if (!signal->member)
+			goto error2;
+	}
+
+	/* record the signal */
+	rule = rule_of_signal(signal);
+	if (rule == NULL)
+		goto error2;
+	dbus_bus_add_match(sbus->connection, rule, NULL);
+	free(rule);
+
+	/* record the signal */
+	signal->onsignal = onsignal;
+	signal->closure = closure;
+	signal->next = sbus->signals;
+	sbus->signals = signal;
+
+	return signal;
+
+ error2:
+	free(signal->sender);
+	free(signal->path);
+	free(signal->iface);
+	free(signal->member);
+	free(signal);
+ error:
+	errno = ENOMEM;
+	return NULL;
+}
+
+/*
+ * Removes the 'signal' handler from 'sbus'
+ * Returns 0 in case of success or -1 in case of error.
+ */
+int sbus_remove_signal(struct sbus *sbus, struct sbus_signal *signal)
+{
+	char *rule;
+	struct sbus_signal **it;
+
+	it = &sbus->signals;
+	while (*it != NULL) {
+		if (*it == signal)
+			goto found;
+		it = &(*it)->next;
+	}
+	errno = EINVAL;
+	return -1;
+
+found:
+	rule = rule_of_signal(signal);
+	if (rule != NULL) {
+		dbus_bus_remove_match(sbus->connection, rule, NULL);
+		free(rule);
+	}
+	*it = signal->next;
+	free(signal->sender);
+	free(signal->path);
+	free(signal->iface);
+	free(signal->member);
+	free(signal);
+	return 0;
+}
+
+/*
+ * Start to serve: activate services declared for 'sbus'.
+ * This function, in fact, declares 'sbus' as the receiver
+ * for calls to the destination derived from the path set at
+ * 'sbus' creation.
+ * It also allows 'sbus' to emit signals of that origin.
+ *
+ * Returns 0 in case of success or -1 in case of error.
+ */
+int sbus_add_name(struct sbus *sbus, const char *name)
+{
+	int status = dbus_bus_request_name(sbus->connection, 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;
+	}
+}
+
+/*
+ * Adds to 'sbus' a service handling calls to the 'method' using
+ * the callback 'oncall' and the closure value 'closure'.
+ *
+ * The callback 'oncall' is invoked for handling incoming method
+ * calls. It receives 3 parameters:
+ *   1. struct sbusmsg *: a handler to data to be used for replying
+ *   2. const char *: the received string
+ *   3. void *: the closure 'closure' set by this function
+ *
+ * Returns 0 in case of success or -1 in case of error.
+ */
+struct sbus_service *sbus_add_service(
+		struct sbus *sbus,
+		const char *destination,
+		const char *path,
+		const char *iface,
+		const char *member,
+		void (*oncall) (struct sbusmsg *, const char *, void *),
+		void *closure)
+{
+	struct sbus_service *service;
+
+	/* allocation */
+	service = calloc(1, sizeof *service);
+	if (service == NULL)
+		goto error;
+	if (destination != NULL) {
+		service->destination = strdup(destination);
+		if (!service->destination)
+			goto error2;
+	}
+	if (path != NULL) {
+		service->path = strdup(path);
+		if (!service->path)
+			goto error2;
+	}
+	if (iface != NULL) {
+		service->iface = strdup(iface);
+		if (!service->iface)
+			goto error2;
+	}
+	if (member != NULL) {
+		service->member = strdup(member);
+		if (!service->member)
+			goto error2;
+	}
+
+	/* record the service */
+	service->oncall = oncall;
+	service->closure = closure;
+	service->next = sbus->services;
+	sbus->services = service;
+
+	return service;
+
+ error2:
+	free(service->destination);
+	free(service->path);
+	free(service->iface);
+	free(service->member);
+	free(service);
+ error:
+	errno = ENOMEM;
+	return NULL;
+}
+
+/*
+ * Removes the 'service' handler from 'sbus'
+ * Returns 0 in case of success or -1 in case of error.
+ */
+int sbus_remove_service(struct sbus *sbus, struct sbus_service *service)
+{
+	struct sbus_service **it;
+
+	it = &sbus->services;
+	while (*it != NULL) {
+		if (*it == service)
+			goto found;
+		it = &(*it)->next;
+	}
+	errno = EINVAL;
+	return -1;
+
+found:
+	*it = service->next;
+	free(service->destination);
+	free(service->path);
+	free(service->iface);
+	free(service->member);
+	free(service);
+	return 0;
+}
+
+const char *sbus_sender(const struct sbusmsg *smsg)
+{
+	return dbus_message_get_sender(smsg->message);
+}
+
+const char *sbus_destination(const struct sbusmsg *smsg)
+{
+	return dbus_message_get_destination(smsg->message);
+}
+
+const char *sbus_path(const struct sbusmsg *smsg)
+{
+	return dbus_message_get_path(smsg->message);
+}
+
+const char *sbus_interface(const struct sbusmsg *smsg)
+{
+	return dbus_message_get_interface(smsg->message);
+}
+
+const char *sbus_member(const struct sbusmsg *smsg)
+{
+	return dbus_message_get_member(smsg->message);
+}
+
+/*
+ * Replies an error of string 'error' to the request handled by 'smsg'.
+ * Also destroys the request 'smsg' that must not be used later.
+ *
+ * Returns 0 in case of success or -1 in case of error.
+ */
+int sbus_reply_error(struct sbusmsg *smsg, const char *error)
+{
+	int rc = -1;
+	DBusMessage *message;
+
+	message = dbus_message_new_error(smsg->message, DBUS_ERROR_FAILED,
+								error);
+	if (message == NULL)
+		errno = ENOMEM;
+	else {
+		if (dbus_connection_send(smsg->connection, message, NULL))
+			rc = 0;
+		dbus_message_unref(message);
+	}
+	free_sbusmsg(smsg);
+	return rc;
+}
+
+/*
+ * Replies normally the string 'reply' to the request handled by 'smsg'.
+ * Also destroys the request 'smsg' that must not be used later.
+ *
+ * Returns 0 in case of success or -1 in case of error.
+ */
+int sbus_reply(struct sbusmsg *smsg, const char *reply)
+{
+	int rc = -1;
+	DBusMessage *message;
+
+	message = dbus_message_new_method_return(smsg->message);
+	if (message == NULL)
+		return reply_out_of_memory(smsg);
+
+	if (!dbus_message_append_args
+	    (message, DBUS_TYPE_STRING, &reply, DBUS_TYPE_INVALID)) {
+		dbus_message_unref(message);
+		return reply_out_of_memory(smsg);
+	}
+
+	if (dbus_connection_send(smsg->connection, message, NULL))
+		rc = 0;
+	dbus_message_unref(message);
+	free_sbusmsg(smsg);
+	return rc;
+}
+
+/****************** FEW LITTLE TESTS *****************************************/
+
+#if defined(SERVER)||defined(CLIENT)
+#include <stdio.h>
+#include <unistd.h>
+#include "utils-upoll.h"
+
+static int mwait(int timeout, void *closure)
+{
+	upoll_wait(timeout);
+	return 0;
+}
+
+static const struct sbus_itf uitf = {
+	.wait = (void*)mwait,
+	.open = (void*)upoll_open,
+	.on_readable = (void*)upoll_on_readable,
+	.on_writable = (void*)upoll_on_writable,
+	.on_hangup = (void*)upoll_on_hangup,
+	.close = (void*)upoll_close
+};
+
+static const char name[] = "org.toto";
+static const char path[] = "/org/toto";
+static const char iface[] = "org.toto";
+static struct sbus *sbus;
+
+#ifdef SERVER
+void ping(struct sbusmsg *smsg, const char *request, void *unused)
+{
+	printf("ping(%s) -> %s\n", request, request);
+	sbus_reply(smsg, request);
+}
+
+void incr(struct sbusmsg *smsg, const char *request, void *unused)
+{
+	static int counter = 0;
+	char res[150];
+	sprintf(res, "%d", ++counter);
+	printf("incr(%s) -> %s\n", request, res);
+	sbus_reply(smsg, res);
+	sbus_send_signal(sbus, name, path, iface, "incremented", res);
+}
+
+int main()
+{
+	int s1, s2, s3;
+	sbus = sbus_session(&uitf, NULL);
+	s3 = !sbus_add_name(sbus, name);
+	s1 = !!sbus_add_service(sbus, name, path, iface, "ping", ping, NULL);
+	s2 = !!sbus_add_service(sbus, name, path, iface, "incr", incr, NULL);
+	printf("started %d %d %d\n", s1, s2, s3);
+	while (1) upoll_wait(-1);
+}
+#endif
+
+#ifdef CLIENT
+void onresp(int status, const char *response, void *closure)
+{
+	printf("resp: %d, %s, %s\n", status, (const char *)closure, response);
+}
+
+void signaled(const struct sbusmsg *req, const char *data, void *closure)
+{
+	printf("signaled with {%s}/%s\n", data, (const char*)closure);
+}
+
+int main()
+{
+	int i = 10;
+	sbus = sbus_session(&uitf, NULL);
+	sbus_add_signal(sbus, name, path, iface, "incremented", signaled, "signal");
+	while (i--) {
+		sbus_call(sbus, name, path, iface, "ping", "{'toto':[1,2,3,4,true,'toto']}", onresp, "ping");
+		sbus_call(sbus, name, path, iface, "incr", "{'doit':'for-me'}", onresp, "incr");
+		upoll_wait(1);
+	}
+	printf("[[[%s]]]\n", sbus_call_sync(sbus, name, path, iface, "ping", "formidable!"));
+	while (1) upoll_wait(-1);
+}
+#endif
+#endif
diff --git a/plugins/afm-main-plugin/utils-sbus.h b/plugins/afm-main-plugin/utils-sbus.h
new file mode 100644
index 00000000..8a9dfc59
--- /dev/null
+++ b/plugins/afm-main-plugin/utils-sbus.h
@@ -0,0 +1,98 @@
+/*
+ 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.
+*/
+
+#pragma once
+
+struct sbus;
+struct sbusmsg;
+struct sbus_signal;
+struct sbus_service;
+
+struct sbus_itf
+{
+	int (*wait)(int timeout, void *itfclo);
+	void *(*open)(int fd, void *closure, void *itfclo);
+	int (*on_readable)(void *hndl, void (*callback)(void *closure));
+	int (*on_writable)(void *hndl, void (*callback)(void *closure));
+	void (*on_hangup)(void *hndl, void (*callback)(void *closure));
+	void (*close)(void *hndl);
+};
+
+extern struct sbus *sbus_session(const struct sbus_itf *itf, void *itfclo);
+extern struct sbus *sbus_system(const struct sbus_itf *itf, void *itfclo);
+
+extern void sbus_addref(struct sbus *sbus);
+extern void sbus_unref(struct sbus *sbus);
+
+extern int sbus_send_signal(struct sbus *sbus, const char *sender, const char *path, const char *iface, const char *name, const char *content);
+
+extern int sbus_call(
+		struct sbus *sbus,
+		const char *destination,
+		const char *path,
+		const char *iface,
+		const char *method,
+		const char *query,
+		void (*onresp) (int, const char *, void *),
+		void *closure);
+
+extern char *sbus_call_sync(
+		struct sbus *sbus,
+		const char *destination,
+		const char *path,
+		const char *iface,
+		const char *method,
+		const char *query);
+
+extern struct sbus_signal *sbus_add_signal(
+		struct sbus *sbus,
+		const char *sender,
+		const char *path,
+		const char *iface,
+		const char *name,
+		void (*onsignal) (const struct sbusmsg *, const char *, void *),
+		void *closure);
+
+extern int sbus_remove_signal(struct sbus *sbus, struct sbus_signal *signal);
+
+extern int sbus_add_name(struct sbus *sbus, const char *name);
+
+extern struct sbus_service *sbus_add_service(
+		struct sbus *sbus,
+		const char *destination,
+		const char *path,
+		const char *iface,
+		const char *member,
+		void (*oncall) (struct sbusmsg *, const char *, void *),
+		void *closure);
+
+extern int sbus_remove_service(struct sbus *sbus, struct sbus_service *service);
+
+extern const char *sbus_sender(const struct sbusmsg *smsg);
+
+extern const char *sbus_destination(const struct sbusmsg *smsg);
+
+extern const char *sbus_path(const struct sbusmsg *smsg);
+
+extern const char *sbus_interface(const struct sbusmsg *smsg);
+
+extern const char *sbus_member(const struct sbusmsg *smsg);
+
+extern int sbus_reply_error(struct sbusmsg *smsg, const char *error);
+extern int sbus_reply(struct sbusmsg *smsg, const char *reply);
+
diff --git a/src/afb-api-so.c b/src/afb-api-so.c
index 2616e0bc..e31216e0 100644
--- a/src/afb-api-so.c
+++ b/src/afb-api-so.c
@@ -56,21 +56,15 @@ static int api_timeout = 15;
 
 static const char plugin_register_function[] = "pluginRegister";
 
-static const struct afb_poll_itf upoll_itf = {
+static const struct afb_pollitf upollitf = {
+	.wait = (void*)upoll_wait,
+	.open = (void*)upoll_open,
 	.on_readable = (void*)upoll_on_readable,
 	.on_writable = (void*)upoll_on_writable,
 	.on_hangup = (void*)upoll_on_hangup,
 	.close = (void*)upoll_close
 };
 
-static struct afb_poll itf_poll_open(int fd, void *closure)
-{
-	struct afb_poll result;
-	result.data = upoll_open(fd, closure);
-	result.itf = result.data ? &upoll_itf : NULL;
-	return result;
-}
-
 static void free_context(struct api_so_desc *desc, void *context)
 {
 	void (*cb)(void*);
@@ -198,7 +192,8 @@ int afb_api_so_add_plugin(const char *path)
 	/* init the interface */
 	desc->interface.verbosity = 0;
 	desc->interface.mode = AFB_MODE_LOCAL;
-	desc->interface.poll_open = itf_poll_open;
+	desc->interface.pollitf = &upollitf;
+	desc->interface.pollclosure = NULL;
 
 	/* init the plugin */
 	desc->plugin = pluginRegisterFct(&desc->interface);
diff --git a/src/afb-api-so.h b/src/afb-api-so.h
index 9c2a570b..fe4d76b0 100644
--- a/src/afb-api-so.h
+++ b/src/afb-api-so.h
@@ -16,6 +16,8 @@
  */
 
 
+#pragma once
+
 extern int afb_api_so_add_plugin(const char *path);
 
 extern int afb_api_so_add_directory(const char *path);
diff --git a/src/afb-apis.h b/src/afb-apis.h
index 97778b64..59c7008f 100644
--- a/src/afb-apis.h
+++ b/src/afb-apis.h
@@ -15,6 +15,8 @@
  * limitations under the License.
  */
 
+#pragma once
+
 struct afb_req;
 struct AFB_clientCtx;
 
diff --git a/src/afb-config.h b/src/afb-config.h
index bd8d07a0..87691af0 100644
--- a/src/afb-config.h
+++ b/src/afb-config.h
@@ -21,6 +21,8 @@
 #ifndef LOCAL_DEF_H
 #define LOCAL_DEF_H
 
+#pragma once
+
 /* other definitions --------------------------------------------------- */
 
 // Note: because of a bug in libmagic MAGIC_DB NULL should not be used for default
diff --git a/src/afb-hreq.h b/src/afb-hreq.h
index 5c09e4e6..aa2cf117 100644
--- a/src/afb-hreq.h
+++ b/src/afb-hreq.h
@@ -15,7 +15,8 @@
  * limitations under the License.
  */
 
-struct AFB_session;
+#pragma once
+
 struct AFB_clientCtx;
 struct json_object;
 
diff --git a/src/afb-hsrv.h b/src/afb-hsrv.h
index c22f57ee..b422df47 100644
--- a/src/afb-hsrv.h
+++ b/src/afb-hsrv.h
@@ -16,6 +16,8 @@
  limitations under the License.
 */
 
+#pragma once
+
 struct afb_hsrv;
 struct afb_hreq;
 
diff --git a/src/afb-hswitch.h b/src/afb-hswitch.h
index f18b8b14..f70a0bf8 100644
--- a/src/afb-hswitch.h
+++ b/src/afb-hswitch.h
@@ -16,6 +16,8 @@
  * limitations under the License.
  */
 
+#pragma once
+
 struct afb_hreq;
 extern int afb_hswitch_apis(struct afb_hreq *hreq, void *data);
 extern int afb_hswitch_one_page_api_redirect(struct afb_hreq *hreq, void *data);
diff --git a/src/afb-method.h b/src/afb-method.h
index fde9dbfc..1411d29f 100644
--- a/src/afb-method.h
+++ b/src/afb-method.h
@@ -16,6 +16,8 @@
  */
 
 
+#pragma once
+
 enum afb_method {
 	afb_method_none = 0,
 	afb_method_get = 1,
diff --git a/src/afb-websock.h b/src/afb-websock.h
index 4a0a3e55..646e98f8 100644
--- a/src/afb-websock.h
+++ b/src/afb-websock.h
@@ -15,6 +15,8 @@
  * limitations under the License.
  */
 
+#pragma once
+
 struct afb_hreq;
 extern int afb_websock_check_upgrade(struct afb_hreq *hreq);
 
diff --git a/src/afb-ws-json.h b/src/afb-ws-json.h
index 2d3cfd75..c9328634 100644
--- a/src/afb-ws-json.h
+++ b/src/afb-ws-json.h
@@ -15,6 +15,8 @@
  * limitations under the License.
  */
 
+#pragma once
+
 struct afb_ws_json;
 struct AFB_clientCtx;
 
diff --git a/src/afb-ws.h b/src/afb-ws.h
index a8af90ac..1faec65c 100644
--- a/src/afb-ws.h
+++ b/src/afb-ws.h
@@ -15,6 +15,8 @@
  * limitations under the License.
  */
 
+#pragma once
+
 struct afb_ws;
 
 struct afb_ws_itf
diff --git a/src/session.h b/src/session.h
index c11921b6..0a61612d 100644
--- a/src/session.h
+++ b/src/session.h
@@ -16,6 +16,8 @@
  */
 // User Client Session Context
 
+#pragma once
+
 struct AFB_clientCtx
 {
 	time_t expiration;    // expiration time of the token
diff --git a/src/utils-upoll.c b/src/utils-upoll.c
index 6db2246d..d72a0e8b 100644
--- a/src/utils-upoll.c
+++ b/src/utils-upoll.c
@@ -25,9 +25,11 @@
 #include "utils-upoll.h"
 
 
+struct upollfd;
+
 struct upoll
 {
-	int fd;
+	struct upollfd *fd;
 	void (*read)(void *);
 	void (*write)(void *);
 	void (*hangup)(void *);
@@ -35,25 +37,67 @@ struct upoll
 	struct upoll *next;
 };
 
+struct upollfd
+{
+	int fd;
+	uint32_t events;
+	struct upollfd *next;
+	struct upoll *head;
+};
+
 static int pollfd = 0;
-static struct upoll *head = NULL;
+static struct upollfd *head = NULL;
 static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
 
-int upoll_is_valid(struct upoll *upoll)
+static int update(struct upollfd *ufd)
 {
-	struct upoll *it = head;
-	while (it != NULL) {
-		if (it == upoll)
-			return 1;
-		it = it->next;
+	int rc;
+	struct upoll *u;
+	struct epoll_event e;
+	uint32_t events;
+	struct upollfd **prv;
+
+	events = 0;
+	pthread_mutex_lock(&mutex);
+	u = ufd->head;
+	if (u == NULL) {
+		/* no more watchers */
+		prv = &head;
+		while(*prv) {
+			if (*prv == ufd) {
+				*prv = ufd->next;
+				break;
+			}
+			prv = &(*prv)->next;
+		}
+		pthread_mutex_unlock(&mutex);
+		epoll_ctl(pollfd, EPOLL_CTL_DEL, ufd->fd, NULL);
+		free(ufd);
+		return 0;
 	}
-	return 0;
+	/* compute the events for the watchers */
+	while (u != NULL) {
+		if (u->read != NULL)
+			events |= EPOLLIN;
+		if (u->write != NULL)
+			events |= EPOLLOUT;
+		u = u->next;
+	}
+	pthread_mutex_unlock(&mutex);
+	if (ufd->events == events)
+		return 0;
+	e.events = events;
+	e.data.ptr = ufd;
+	rc = epoll_ctl(pollfd, EPOLL_CTL_MOD, ufd->fd, &e);
+	if (rc == 0)
+		ufd->events = events;
+	return rc;
 }
 
-struct upoll *upoll_open(int fd, void *closure)
+static struct upollfd *get_fd(int fd)
 {
 	struct epoll_event e;
-	struct upoll *result;
+	struct upollfd *result;
 	int rc;
 
 	/* opens the epoll stream */
@@ -69,6 +113,14 @@ struct upoll *upoll_open(int fd, void *closure)
 		}
 	}
 
+	/* search */
+	result = head;
+	while (result != NULL) {
+		if (result->fd == fd)
+			return result;
+		result = result->next;
+	}
+
 	/* allocates */
 	result = calloc(1, sizeof *result);
 	if (result == NULL)
@@ -76,7 +128,6 @@ struct upoll *upoll_open(int fd, void *closure)
 
 	/* init */
 	result->fd = fd;
-	result->closure = closure;
 	pthread_mutex_lock(&mutex);
 	result->next = head;
 	head = result;
@@ -91,18 +142,52 @@ struct upoll *upoll_open(int fd, void *closure)
 
 	/* revert on error */
 	rc = errno;
-	upoll_close(result);
+	update(result);
 	errno = rc;
 	return NULL;
 }
 
-static int update(struct upoll *upoll)
+int upoll_is_valid(struct upoll *upoll)
 {
-	struct epoll_event e;
-	e.events = (uint32_t)((upoll->read != NULL ? EPOLLIN : 0 )
-		 | (upoll->write != NULL ? EPOLLOUT : 0));
-	e.data.ptr = upoll;
-	return epoll_ctl(pollfd, EPOLL_CTL_MOD, upoll->fd, &e);
+	struct upollfd *itfd = head;
+	struct upoll *it;
+	while (itfd != NULL) {
+		it = itfd->head;
+		while (it != NULL) {
+			if (it == upoll)
+				return 1;
+			it = it->next;
+		}
+		itfd = itfd->next;
+	}
+	return 0;
+}
+
+struct upoll *upoll_open(int fd, void *closure)
+{
+	struct upollfd *ufd;
+	struct upoll *result;
+
+	/* allocates */
+	result = calloc(1, sizeof *result);
+	if (result == NULL)
+		return NULL;
+
+	/* get for fd */
+	ufd = get_fd(fd);
+	if (ufd == NULL) {
+		free(result);
+		return NULL;
+	}
+
+	/* init */
+	result->fd = ufd;
+	result->closure = closure;
+	pthread_mutex_lock(&mutex);
+	result->next = ufd->head;
+	ufd->head = result;
+	pthread_mutex_unlock(&mutex);
+	return result;
 }
 
 int upoll_on_readable(struct upoll *upoll, void (*process)(void *))
@@ -111,7 +196,7 @@ int upoll_on_readable(struct upoll *upoll, void (*process)(void *))
 	assert(upoll_is_valid(upoll));
 
 	upoll->read = process;
-	return update(upoll);
+	return update(upoll->fd);
 }
 
 int upoll_on_writable(struct upoll *upoll, void (*process)(void *))
@@ -120,7 +205,7 @@ int upoll_on_writable(struct upoll *upoll, void (*process)(void *))
 	assert(upoll_is_valid(upoll));
 
 	upoll->write = process;
-	return update(upoll);
+	return update(upoll->fd);
 }
 
 void upoll_on_hangup(struct upoll *upoll, void (*process)(void *))
@@ -134,38 +219,56 @@ void upoll_on_hangup(struct upoll *upoll, void (*process)(void *))
 void upoll_close(struct upoll *upoll)
 {
 	struct upoll **it;
+	struct upollfd *ufd;
 
 	assert(pollfd != 0);
 	assert(upoll_is_valid(upoll));
 
-	epoll_ctl(pollfd, EPOLL_CTL_DEL, upoll->fd, NULL);
+	ufd = upoll->fd;
 	pthread_mutex_lock(&mutex);
-	it = &head;
+	it = &ufd->head;
 	while (*it != upoll)
 		it = &(*it)->next;
 	*it = upoll->next;
 	pthread_mutex_unlock(&mutex);
 	free(upoll);
+	update(ufd);
 }
 
-void upoll_wait(int timeout)
+int upoll_wait(int timeout)
 {
 	int rc;
 	struct epoll_event e;
-	struct upoll *upoll;
+	struct upollfd *ufd;
+	struct upoll *u;
 
-	if (pollfd == 0)
-		return;
+	if (pollfd == 0) {
+		errno = ECANCELED;
+		return -1;
+	}
 
-	rc = epoll_wait(pollfd, &e, 1, timeout);
+	do {
+		rc = epoll_wait(pollfd, &e, 1, timeout);
+	} while (rc < 0 && errno == EINTR);
 	if (rc == 1) {
-		upoll = e.data.ptr;
-		if ((e.events & EPOLLIN) && upoll->read)
-			upoll->read(upoll->closure);
-		if ((e.events & EPOLLOUT) && upoll->write)
-			upoll->write(upoll->closure);
-		if ((e.events & EPOLLHUP) && upoll->hangup)
-			upoll->hangup(upoll->closure);
+		ufd = e.data.ptr;
+		u = ufd->head;
+		while (u != NULL) {
+			if ((e.events & EPOLLIN) && u->read) {
+				u->read(u->closure);
+				break;
+			}
+			if ((e.events & EPOLLOUT) && u->write) {
+				u->write(u->closure);
+				break;
+			}
+			if ((e.events & EPOLLHUP) && u->hangup) {
+				u->hangup(u->closure);
+				break;
+			}
+			u = u->next;
+		}
 	}
+	return rc < 0 ? rc : 0;
 }
 
diff --git a/src/utils-upoll.h b/src/utils-upoll.h
index 705fbc36..56692d3f 100644
--- a/src/utils-upoll.h
+++ b/src/utils-upoll.h
@@ -15,6 +15,8 @@
  * limitations under the License.
  */
 
+#pragma once
+
 struct upoll;
 
 extern int upoll_is_valid(struct upoll *upoll);
@@ -28,5 +30,7 @@ extern void upoll_on_hangup(struct upoll *upoll, void (*process)(void *closure))
 
 extern void upoll_close(struct upoll *upoll);
 
-extern void upoll_wait(int timeout);
+extern int upoll_wait(int timeout);
+
+
 
diff --git a/src/verbose.h b/src/verbose.h
index 09254b22..25bd85b0 100644
--- a/src/verbose.h
+++ b/src/verbose.h
@@ -16,6 +16,8 @@
  limitations under the License.
 */
 
+#pragma once
+
 #if !defined(NDEBUG)
 #include <syslog.h>
 extern int verbosity;
diff --git a/src/websock.h b/src/websock.h
index c40a364c..7785a0c0 100644
--- a/src/websock.h
+++ b/src/websock.h
@@ -21,6 +21,8 @@
  *   Copyright 2010-2012 self.disconnect (APACHE-2)
  */
 
+#pragma once
+
 struct iovec;
 
 #define WEBSOCKET_CODE_OK                1000