aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/CMakeLists.txt2
-rw-r--r--src/afm-system-daemon.c49
-rw-r--r--src/afm-user-daemon.c161
-rw-r--r--src/utils-jbus.c928
-rw-r--r--src/utils-jbus.h50
5 files changed, 424 insertions, 766 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4676c66..f7c9843 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -25,7 +25,7 @@ pkg_check_modules(EXTRAS REQUIRED
openssl
xmlsec1 xmlsec1-openssl
json-c
- dbus-1
+ libsystemd
)
add_compile_options(${EXTRAS_CFLAGS})
diff --git a/src/afm-system-daemon.c b/src/afm-system-daemon.c
index 25d9456..b7f878f 100644
--- a/src/afm-system-daemon.c
+++ b/src/afm-system-daemon.c
@@ -22,6 +22,8 @@
#include <getopt.h>
#include <errno.h>
+#include <systemd/sd-bus.h>
+#include <systemd/sd-event.h>
#include <json.h>
#include "verbose.h"
@@ -66,7 +68,7 @@ const char error_bad_request[] = "\"bad request\"";
const char error_not_found[] = "\"not found\"";
const char error_cant_start[] = "\"can't start\"";
-static void on_install(struct jreq *jreq, struct json_object *req, void *unused)
+static void on_install(struct sd_bus_message *smsg, struct json_object *req, void *unused)
{
const char *wgtfile;
const char *root;
@@ -89,22 +91,22 @@ static void on_install(struct jreq *jreq, struct json_object *req, void *unused)
break;
}
default:
- jbus_reply_error_s(jreq, error_bad_request);
+ jbus_reply_error_s(smsg, error_bad_request);
return;
}
/* install the widget */
ifo = install_widget(wgtfile, root, force);
if (ifo == NULL)
- jbus_reply_error_s(jreq, "\"installation failed\"");
+ jbus_reply_error_s(smsg, "\"installation failed\"");
else {
/* build the response */
resp = json_object_new_object();
if(!resp || !j_add_string(resp, "added", wgt_info_desc(ifo)->idaver))
- jbus_reply_error_s(jreq, "\"out of memory but installed!\"");
+ jbus_reply_error_s(smsg, "\"out of memory but installed!\"");
else {
jbus_send_signal_s(jbus, "changed", "true");
- jbus_reply_j(jreq, resp);
+ jbus_reply_j(smsg, resp);
}
/* clean-up */
@@ -113,7 +115,7 @@ static void on_install(struct jreq *jreq, struct json_object *req, void *unused)
}
}
-static void on_uninstall(struct jreq *jreq, struct json_object *req, void *unused)
+static void on_uninstall(struct sd_bus_message *smsg, struct json_object *req, void *unused)
{
const char *idaver;
const char *root;
@@ -132,17 +134,17 @@ static void on_uninstall(struct jreq *jreq, struct json_object *req, void *unuse
break;
}
default:
- jbus_reply_error_s(jreq, error_bad_request);
+ jbus_reply_error_s(smsg, error_bad_request);
return;
}
/* install the widget */
rc = uninstall_widget(idaver, root);
if (rc)
- jbus_reply_error_s(jreq, "\"uninstallation had error\"");
+ jbus_reply_error_s(smsg, "\"uninstallation had error\"");
else {
jbus_send_signal_s(jbus, "changed", "true");
- jbus_reply_s(jreq, "true");
+ jbus_reply_s(smsg, "true");
}
}
@@ -158,7 +160,9 @@ static int daemonize()
int main(int ac, char **av)
{
- int i, daemon = 0;
+ int i, daemon = 0, rc;
+ struct sd_event *evloop;
+ struct sd_bus *sysbus;
LOGAUTH(appname);
@@ -216,8 +220,25 @@ int main(int ac, char **av)
return 1;
}
+ /* get systemd objects */
+ rc = sd_event_new(&evloop);
+ if (rc < 0) {
+ ERROR("can't create event loop");
+ return 1;
+ }
+ rc = sd_bus_open_system(&sysbus);
+ if (rc < 0) {
+ ERROR("can't create system bus");
+ return 1;
+ }
+ rc = sd_bus_attach_event(sysbus, evloop, 0);
+ if (rc < 0) {
+ ERROR("can't attach system bus to event loop");
+ return 1;
+ }
+
/* init service */
- jbus = create_jbus_system(AFM_SYSTEM_DBUS_PATH);
+ jbus = create_jbus(sysbus, AFM_SYSTEM_DBUS_PATH);
if (!jbus) {
ERROR("create_jbus failed");
return 1;
@@ -229,11 +250,11 @@ int main(int ac, char **av)
}
/* start and run */
- if (jbus_start_serving(jbus)) {
+ if (jbus_start_serving(jbus) < 0) {
ERROR("can't start server");
return 1;
}
- while (!jbus_read_write_dispatch(jbus, -1));
+ for(;;)
+ sd_event_run(evloop, (uint64_t)-1);
return 0;
}
-
diff --git a/src/afm-user-daemon.c b/src/afm-user-daemon.c
index 2b7ec7a..24e07d3 100644
--- a/src/afm-user-daemon.c
+++ b/src/afm-user-daemon.c
@@ -22,6 +22,8 @@
#include <getopt.h>
#include <string.h>
+#include <systemd/sd-bus.h>
+#include <systemd/sd-event.h>
#include <json.h>
#include "verbose.h"
@@ -93,20 +95,20 @@ const char error_system[] = "\"system error\"";
/*
* retrieves the 'runid' in 'obj' parameters received with the
- * request 'jreq' for the 'method'.
+ * request 'smsg' for the 'method'.
*
* Returns 1 in case of success.
* Otherwise, if the 'runid' can't be retrived, an error stating
- * the bad request is replied for 'jreq' and 0 is returned.
+ * the bad request is replied for 'smsg' and 0 is returned.
*/
-static int onrunid(struct jreq *jreq, struct json_object *obj,
+static int onrunid(struct sd_bus_message *smsg, struct json_object *obj,
const char *method, int *runid)
{
if (!j_read_integer(obj, runid)
&& !j_read_integer_at(obj, "runid", runid)) {
INFO("bad request method %s: %s", method,
json_object_to_json_string(obj));
- jbus_reply_error_s(jreq, error_bad_request);
+ jbus_reply_error_s(smsg, error_bad_request);
return 0;
}
@@ -115,48 +117,48 @@ static int onrunid(struct jreq *jreq, struct json_object *obj,
}
/*
- * Sends the reply 'resp' to the request 'jreq' if 'resp' is not NULL.
+ * Sends the reply 'resp' to the request 'smsg' if 'resp' is not NULL.
* Otherwise, when 'resp' is NULL replies the error string 'errstr'.
*/
-static void reply(struct jreq *jreq, struct json_object *resp,
+static void reply(struct sd_bus_message *smsg, struct json_object *resp,
const char *errstr)
{
if (resp)
- jbus_reply_j(jreq, resp);
+ jbus_reply_j(smsg, resp);
else
- jbus_reply_error_s(jreq, errstr);
+ jbus_reply_error_s(smsg, errstr);
}
/*
- * Sends the reply "true" to the request 'jreq' if 'status' is zero.
+ * Sends the reply "true" to the request 'smsg' if 'status' is zero.
* Otherwise, when 'status' is not zero replies the error string 'errstr'.
*/
-static void reply_status(struct jreq *jreq, int status, const char *errstr)
+static void reply_status(struct sd_bus_message *smsg, int status, const char *errstr)
{
if (status)
- jbus_reply_error_s(jreq, errstr);
+ jbus_reply_error_s(smsg, errstr);
else
- jbus_reply_s(jreq, "true");
+ jbus_reply_s(smsg, "true");
}
/*
- * On query "runnables" from 'jreq' with parameters of 'obj'.
+ * On query "runnables" from 'smsg' with parameters of 'obj'.
*
* Nothing is expected in 'obj' that can be anything.
*/
-static void on_runnables(struct jreq *jreq, struct json_object *obj, void *unused)
+static void on_runnables(struct sd_bus_message *smsg, struct json_object *obj, void *unused)
{
struct json_object *resp;
INFO("method runnables called");
resp = afm_db_application_list(afdb);
- jbus_reply_j(jreq, resp);
+ jbus_reply_j(smsg, resp);
json_object_put(resp);
}
/*
- * On query "detail" from 'jreq' with parameters of 'obj'.
+ * On query "detail" from 'smsg' with parameters of 'obj'.
*/
-static void on_detail(struct jreq *jreq, struct json_object *obj, void *unused)
+static void on_detail(struct sd_bus_message *smsg, struct json_object *obj, void *unused)
{
const char *appid;
struct json_object *resp;
@@ -168,22 +170,22 @@ static void on_detail(struct jreq *jreq, struct json_object *obj, void *unused)
; /* appid as obj.id string */
else {
INFO("method detail called but bad request!");
- jbus_reply_error_s(jreq, error_bad_request);
+ jbus_reply_error_s(smsg, error_bad_request);
return;
}
/* wants details for appid */
INFO("method detail called for %s", appid);
resp = afm_db_get_application_public(afdb, appid);
- reply(jreq, resp, error_not_found);
+ reply(smsg, resp, error_not_found);
json_object_put(resp);
}
/*
- * On query "start" from 'jreq' with parameters of 'obj'.
+ * On query "start" from 'smsg' with parameters of 'obj'.
*/
-static void on_start(struct jreq *jreq, struct json_object *obj, void *unused)
+static void on_start(struct sd_bus_message *smsg, struct json_object *obj, void *unused)
{
const char *appid, *modestr;
char *uri;
@@ -204,7 +206,7 @@ static void on_start(struct jreq *jreq, struct json_object *obj, void *unused)
}
}
if (!is_valid_launch_mode(mode)) {
- jbus_reply_error_s(jreq, error_bad_request);
+ jbus_reply_error_s(smsg, error_bad_request);
return;
}
@@ -213,7 +215,7 @@ static void on_start(struct jreq *jreq, struct json_object *obj, void *unused)
name_of_launch_mode(mode));
appli = afm_db_get_application(afdb, appid);
if (appli == NULL) {
- jbus_reply_error_s(jreq, error_not_found);
+ jbus_reply_error_s(smsg, error_not_found);
return;
}
@@ -221,7 +223,7 @@ static void on_start(struct jreq *jreq, struct json_object *obj, void *unused)
uri = NULL;
runid = afm_run_start(appli, mode, &uri);
if (runid <= 0) {
- jbus_reply_error_s(jreq, error_cant_start);
+ jbus_reply_error_s(smsg, error_cant_start);
free(uri);
return;
}
@@ -230,7 +232,7 @@ static void on_start(struct jreq *jreq, struct json_object *obj, void *unused)
/* returns only the runid */
snprintf(runidstr, sizeof runidstr, "%d", runid);
runidstr[sizeof runidstr - 1] = 0;
- jbus_reply_s(jreq, runidstr);
+ jbus_reply_s(smsg, runidstr);
return;
}
@@ -238,80 +240,80 @@ static void on_start(struct jreq *jreq, struct json_object *obj, void *unused)
resp = json_object_new_object();
if (resp != NULL && j_add_integer(resp, "runid", runid)
&& j_add_string(resp, "uri", uri))
- jbus_reply_j(jreq, resp);
+ jbus_reply_j(smsg, resp);
else {
afm_run_stop(runid);
- jbus_reply_error_s(jreq, error_system);
+ jbus_reply_error_s(smsg, error_system);
}
json_object_put(resp);
free(uri);
}
/*
- * On query "stop" from 'jreq' with parameters of 'obj'.
+ * On query "stop" from 'smsg' with parameters of 'obj'.
*/
-static void on_stop(struct jreq *jreq, struct json_object *obj, void *unused)
+static void on_stop(struct sd_bus_message *smsg, struct json_object *obj, void *unused)
{
int runid, status;
- if (onrunid(jreq, obj, "stop", &runid)) {
+ if (onrunid(smsg, obj, "stop", &runid)) {
status = afm_run_stop(runid);
- reply_status(jreq, status, error_not_found);
+ reply_status(smsg, status, error_not_found);
}
}
/*
- * On query "continue" from 'jreq' with parameters of 'obj'.
+ * On query "continue" from 'smsg' with parameters of 'obj'.
*/
-static void on_continue(struct jreq *jreq, struct json_object *obj, void *unused)
+static void on_continue(struct sd_bus_message *smsg, struct json_object *obj, void *unused)
{
int runid, status;
- if (onrunid(jreq, obj, "continue", &runid)) {
+ if (onrunid(smsg, obj, "continue", &runid)) {
status = afm_run_continue(runid);
- reply_status(jreq, status, error_not_found);
+ reply_status(smsg, status, error_not_found);
}
}
/*
- * On query "terminate" from 'jreq' with parameters of 'obj'.
+ * On query "terminate" from 'smsg' with parameters of 'obj'.
*/
-static void on_terminate(struct jreq *jreq, struct json_object *obj, void *unused)
+static void on_terminate(struct sd_bus_message *smsg, struct json_object *obj, void *unused)
{
int runid, status;
- if (onrunid(jreq, obj, "terminate", &runid)) {
+ if (onrunid(smsg, obj, "terminate", &runid)) {
status = afm_run_terminate(runid);
- reply_status(jreq, status, error_not_found);
+ reply_status(smsg, status, error_not_found);
}
}
/*
- * On query "runners" from 'jreq' with parameters of 'obj'.
+ * On query "runners" from 'smsg' with parameters of 'obj'.
*/
-static void on_runners(struct jreq *jreq, struct json_object *obj, void *unused)
+static void on_runners(struct sd_bus_message *smsg, struct json_object *obj, void *unused)
{
struct json_object *resp;
INFO("method runners called");
resp = afm_run_list();
- jbus_reply_j(jreq, resp);
+ jbus_reply_j(smsg, resp);
json_object_put(resp);
}
/*
- * On query "state" from 'jreq' with parameters of 'obj'.
+ * On query "state" from 'smsg' with parameters of 'obj'.
*/
-static void on_state(struct jreq *jreq, struct json_object *obj, void *unused)
+static void on_state(struct sd_bus_message *smsg, struct json_object *obj, void *unused)
{
int runid;
struct json_object *resp;
- if (onrunid(jreq, obj, "state", &runid)) {
+ if (onrunid(smsg, obj, "state", &runid)) {
resp = afm_run_state(runid);
- reply(jreq, resp, error_not_found);
+ reply(smsg, resp, error_not_found);
json_object_put(resp);
}
}
/*
* Calls the system daemon to achieve application management of
- * the 'method' gotten from 'jreq' with the parameter's string 'msg'.
+ * the 'method' gotten from 'smsg' with the parameter's string 'msg'.
*
* The principle is very simple: call the corresponding system method
* and reply its response to the caller.
@@ -319,36 +321,36 @@ static void on_state(struct jreq *jreq, struct json_object *obj, void *unused)
* The request and reply is synchronous and is blocking.
* It is possible to implment it in an asynchrounous way but it
* would brake the common behaviour. It would be a call like
- * jbus_call_ss(system_bus, method, msg, callback, jreq)
+ * jbus_call_ss(system_bus, method, msg, callback, smsg)
*/
-static void propagate(struct jreq *jreq, const char *msg, const char *method)
+static void propagate(struct sd_bus_message *smsg, const char *msg, const char *method)
{
char *reply;
INFO("method %s propagated with %s", method, msg);
reply = jbus_call_ss_sync(system_bus, method, msg);
if (reply) {
- jbus_reply_s(jreq, reply);
+ jbus_reply_s(smsg, reply);
free(reply);
}
else
- jbus_reply_error_s(jreq, error_system);
+ jbus_reply_error_s(smsg, error_system);
}
#if defined(EXPLICIT_CALL)
/*
- * On query "install" from 'jreq' with parameters of 'msg'.
+ * On query "install" from 'smsg' with parameters of 'msg'.
*/
-static void on_install(struct jreq *jreq, const char *msg, void *unused)
+static void on_install(struct sd_bus_message *smsg, const char *msg, void *unused)
{
- return propagate(jreq, msg, "install");
+ return propagate(smsg, msg, "install");
}
/*
- * On query "uninstall" from 'jreq' with parameters of 'msg'.
+ * On query "uninstall" from 'smsg' with parameters of 'msg'.
*/
-static void on_uninstall(struct jreq *jreq, const char *msg, void *unused)
+static void on_uninstall(struct sd_bus_message *smsg, const char *msg, void *unused)
{
- return propagate(jreq, msg, "uninstall");
+ return propagate(smsg, msg, "uninstall");
}
#endif
@@ -382,8 +384,11 @@ static int daemonize()
*/
int main(int ac, char **av)
{
- int i, daemon = 0;
+ int i, daemon = 0, rc;
enum afm_launch_mode mode;
+ struct sd_event *evloop;
+ struct sd_bus *sysbus, *usrbus;
+
LOGAUTH(appname);
@@ -475,8 +480,35 @@ int main(int ac, char **av)
return 1;
}
+ /* get systemd objects */
+ rc = sd_event_new(&evloop);
+ if (rc < 0) {
+ ERROR("can't create event loop");
+ return 1;
+ }
+ rc = sd_bus_open_system(&sysbus);
+ if (rc < 0) {
+ ERROR("can't create system bus");
+ return 1;
+ }
+ rc = sd_bus_attach_event(sysbus, evloop, 0);
+ if (rc < 0) {
+ ERROR("can't attach system bus to event loop");
+ return 1;
+ }
+ rc = sd_bus_open_user(&usrbus);
+ if (rc < 0) {
+ ERROR("can't create user bus");
+ return 1;
+ }
+ rc = sd_bus_attach_event(usrbus, evloop, 0);
+ if (rc < 0) {
+ ERROR("can't attach user bus to event loop");
+ return 1;
+ }
+
/* connects to the system bus */
- system_bus = create_jbus_system(AFM_SYSTEM_DBUS_PATH);
+ system_bus = create_jbus(sysbus, AFM_SYSTEM_DBUS_PATH);
if (!system_bus) {
ERROR("create_jbus failed for system");
return 1;
@@ -489,7 +521,7 @@ int main(int ac, char **av)
}
/* connect to the session bus */
- user_bus = create_jbus_session(AFM_USER_DBUS_PATH);
+ user_bus = create_jbus(usrbus, AFM_USER_DBUS_PATH);
if (!user_bus) {
ERROR("create_jbus failed");
return 1;
@@ -508,21 +540,22 @@ int main(int ac, char **av)
|| jbus_add_service_s(user_bus, "install", on_install, NULL)
|| jbus_add_service_s(user_bus, "uninstall", on_uninstall, NULL)) {
#else
- || jbus_add_service_s(user_bus, "install", (void (*)(struct jreq *, const char *, void *))propagate, "install")
- || jbus_add_service_s(user_bus, "uninstall", (void (*)(struct jreq *, const char *, void *))propagate, "uninstall")) {
+ || jbus_add_service_s(user_bus, "install", (void (*)(struct sd_bus_message *, const char *, void *))propagate, "install")
+ || jbus_add_service_s(user_bus, "uninstall", (void (*)(struct sd_bus_message *, const char *, void *))propagate, "uninstall")) {
#endif
ERROR("adding services failed");
return 1;
}
/* start servicing */
- if (jbus_start_serving(user_bus)) {
+ if (jbus_start_serving(user_bus) < 0) {
ERROR("can't start server");
return 1;
}
/* run until error */
- while (jbus_read_write_dispatch_multiple(jbuses, 2, -1, 20) >= 0);
+ for(;;)
+ sd_event_run(evloop, (uint64_t)-1);
return 0;
}
diff --git a/src/utils-jbus.c b/src/utils-jbus.c
index 408d65c..c3bb1e7 100644
--- a/src/utils-jbus.c
+++ b/src/utils-jbus.c
@@ -25,7 +25,8 @@
#include <assert.h>
#include <json.h>
-#include <dbus/dbus.h>
+#include <systemd/sd-bus.h>
+#include <systemd/sd-bus-protocol.h>
#include "utils-jbus.h"
@@ -37,21 +38,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 +46,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 sd_bus_message *, const char *, void *);
/* string callback */
- void (*oncall_j) (struct jreq *, struct json_object *, void *);
+ void (*oncall_j) (struct sd_bus_message *, struct json_object *, void *);
/* json callback */
void *data; /* closure data for the callbacks */
};
@@ -80,24 +67,15 @@ 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 */
+ struct jbus *jbus;
void (*onresp_s) (int, const char *, void *);
/* string callback */
void (*onresp_j) (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,28 +83,24 @@ struct respsync {
*/
struct jbus {
int refcount; /* referenced how many time */
- DBusConnection *connection; /* connection to DBU */
+ struct sd_bus *sdbus;
+ struct sd_bus_slot *sservice;
+ struct sd_bus_slot *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)
+static int mkerrno(int rc)
{
- dbus_message_unref(jreq->request);
- dbus_connection_unref(jreq->connection);
- free(jreq);
+ if (rc >= 0)
+ return rc;
+ errno = -rc;
+ return -1;
}
/*
@@ -135,23 +109,64 @@ static inline void free_jreq(struct jreq *jreq)
* 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 sd_bus_message *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)
{
- const char *itf = dbus_message_get_interface(message);
- return itf != NULL && !strcmp(itf, jbus->name);
+ 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 int on_service_call(struct sd_bus_message *smsg, struct jbus *jbus, sd_bus_error *error)
+{
+ struct jservice *service;
+ const char *member, *content;
+ struct json_object *obj;
+
+ /* check the type */
+ if (!sd_bus_message_has_signature(smsg, "s")
+ || sd_bus_message_read_basic(smsg, 's', &content) < 0) {
+ sd_bus_error_set_const(error, "bad signature", "");
+ return 1;
+ }
+
+ /* dispatch */
+ member = sd_bus_message_get_member(smsg);
+ service = jbus->services;
+ while (service != NULL) {
+ if (!strcmp(service->method, member)) {
+ sd_bus_message_ref(smsg);
+ 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);
+ }
+ return 1;
+ }
+ service = service->next;
+ }
+ return 0;
}
/*
@@ -165,12 +180,22 @@ 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 sd_bus_message *, const char *, void *),
+ void (*oncall_j) (struct sd_bus_message *, struct json_object *, void *),
void *data)
{
+ int rc;
struct jservice *srv;
+ /* connection of the service */
+ if (jbus->sservice == NULL) {
+ rc = sd_bus_add_object(jbus->sdbus, &jbus->sservice, jbus->path, (void*)on_service_call, jbus);
+ if (rc < 0) {
+ errno = -rc;
+ goto error;
+ }
+ }
+
/* allocation */
srv = malloc(sizeof *srv);
if (srv == NULL) {
@@ -198,6 +223,36 @@ static int add_service(
return -1;
}
+static int on_signal_event(struct sd_bus_message *smsg, struct jbus *jbus, sd_bus_error *error)
+{
+ struct jsignal *signal;
+ const char *member, *content;
+ struct json_object *obj;
+
+ /* check the type */
+ if (!sd_bus_message_has_signature(smsg, "s")
+ || sd_bus_message_read_basic(smsg, 's', &content) < 0)
+ return 0;
+
+ /* dispatch */
+ member = sd_bus_message_get_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;
+ }
+ return 0;
+}
+
/*
* Adds to 'jbus' a handler for the signal of 'name' emmited by
* the sender and the interface that 'jbus' is linked to.
@@ -215,26 +270,36 @@ static int add_signal(
void (*onsignal_j) (struct json_object *, void *),
void *data)
{
- char *rule;
+ int rc;
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);
+ char *match;
+
+ /* connection of the signal */
+ if (jbus->ssignal == NULL) {
+ rc = asprintf(&match, "type='signal',path='%s',interface='%s'", jbus->path, jbus->name);
+ if (rc < 0) {
+ errno = ENOMEM;
+ goto error;
+ }
+ rc = sd_bus_add_match(jbus->sdbus, &jbus->ssignal, match, (void*)on_signal_event, jbus);
+ free(match);
+ if (rc < 0) {
+ errno = -rc;
+ goto error;
+ }
}
/* allocation */
sig = malloc(sizeof *sig);
- if (sig == NULL)
+ if (sig == NULL) {
+ errno = ENOMEM;
goto error;
+ }
sig->name = strdup(name);
- if (!sig->name)
+ if (!sig->name) {
+ errno = ENOMEM;
goto error2;
+ }
/* record the signal */
sig->onsignal_s = onsignal_s;
@@ -248,10 +313,40 @@ static int add_signal(
error2:
free(sig);
error:
- errno = ENOMEM;
return -1;
}
+static int on_reply(struct sd_bus_message *smsg, struct jrespw *jrespw, sd_bus_error *error)
+{
+ struct json_object *obj;
+ const char *reply;
+ int iserror;
+
+ /* check the type */
+ if (!sd_bus_message_has_signature(smsg, "s")
+ || sd_bus_message_read_basic(smsg, 's', &reply) < 0) {
+ sd_bus_error_set_const(error, "bad signature", "");
+ goto end;
+ }
+ iserror = sd_bus_message_is_method_error(smsg, NULL);
+
+ /* dispatch string? */
+ if (jrespw->onresp_s != NULL) {
+ jrespw->onresp_s(iserror, reply, jrespw->data);
+ goto end;
+ }
+
+ /* dispatch json */
+ if (!jparse(jrespw->jbus, reply, &obj))
+ obj = json_object_new_string(reply);
+ jrespw->onresp_j(iserror, obj, jrespw->data);
+ json_object_put(obj);
+
+ end:
+ free(jrespw);
+ return 1;
+}
+
/*
* Creates a message for 'method' with one string parameter being 'query'
* and sends it to the destination, object and interface linked to 'jbus'.
@@ -269,7 +364,7 @@ static int call(
void (*onresp_j) (int, struct json_object *, void *),
void *data)
{
- DBusMessage *msg;
+ int rc;
struct jrespw *resp;
/* allocates the response structure */
@@ -279,349 +374,29 @@ static int call(
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->data = data;
+ resp->jbus = jbus;
resp->onresp_s = onresp_s;
resp->onresp_j = onresp_j;
+ resp->data = data;
+
+ rc = sd_bus_call_method_async(jbus->sdbus, NULL, jbus->name, jbus->path, jbus->name, method, (void*)on_reply, resp, "s", query);
+ if (rc < 0) {
+ errno = -rc;
+ 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:
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 +413,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 sd_bus *sdbus, const char *path)
{
struct jbus *jbus;
char *name;
@@ -687,14 +462,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->sdbus = sd_bus_ref(sdbus);
return jbus;
@@ -720,26 +488,24 @@ void jbus_unref(struct jbus *jbus)
{
struct jservice *srv;
struct jsignal *sig;
- struct jrespw *wtr;
if (!--jbus->refcount) {
- if (jbus->connection != NULL)
- dbus_connection_unref(jbus->connection);
- while ((wtr = jbus->waiters) != NULL) {
- jbus->waiters = wtr->next;
- free(wtr);
+ 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);
}
- while ((srv = jbus->services) != NULL) {
- jbus->services = srv->next;
- free(srv->method);
- free(srv);
- }
+ if (jbus->sservice != NULL)
+ sd_bus_slot_unref(jbus->sservice);
+ if (jbus->ssignal != NULL)
+ sd_bus_slot_unref(jbus->ssignal);
if (jbus->tokener != NULL)
json_tokener_free(jbus->tokener);
+ sd_bus_unref(jbus->sdbus);
free(jbus->name);
free(jbus->path);
free(jbus);
@@ -747,79 +513,53 @@ 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 sd_bus_message *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;
+ int rc = sd_bus_reply_method_errorf(smsg, SD_BUS_ERROR_FAILED, "%s", error);
+ sd_bus_message_unref(smsg);
+ return mkerrno(rc);
}
/*
- * 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 sd_bus_message *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 sd_bus_message *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;
+ int rc = sd_bus_reply_method_return(smsg, "s", reply);
+ sd_bus_message_unref(smsg);
+ return mkerrno(rc);
}
/*
- * 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 sd_bus_message *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);
}
/*
@@ -829,28 +569,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 mkerrno(sd_bus_emit_signal(jbus->sdbus, jbus->path, jbus->name, name, "s", content));
}
/*
@@ -875,7 +594,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 sd_bus_message *: a handler to data to be used for replying
* 2. const char *: the received string
* 3. void *: the closure 'data' set by this function
*
@@ -884,7 +603,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 sd_bus_message *, const char *, void *),
void *data)
{
return add_service(jbus, method, oncall, NULL, data);
@@ -896,7 +615,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 sd_bus_message *: 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
*
@@ -905,7 +624,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 sd_bus_message *, struct json_object *, void *),
void *data)
{
return add_service(jbus, method, NULL, oncall, data);
@@ -922,146 +641,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 mkerrno(sd_bus_request_name(jbus->sdbus, jbus->name, 0));
}
/*
@@ -1169,12 +749,31 @@ 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;
+ sd_bus_message *smsg = NULL;
+ sd_bus_error error = SD_BUS_ERROR_NULL;
+ char *result = NULL;
+ const char *reply;
+
+ /* makes the call */
+ if (mkerrno(sd_bus_call_method(jbus->sdbus, jbus->name, jbus->path, jbus->name, method, &error, &smsg, "s", query)) < 0)
+ goto error;
+
+ /* check if error */
+ if (sd_bus_message_is_method_error(smsg, NULL))
+ goto error;
+
+ /* check the returned type */
+ if (!sd_bus_message_has_signature(smsg, "s")
+ || sd_bus_message_read_basic(smsg, 's', &reply) < 0)
+ goto error;
+
+ /* get the result */
+ result = strdup(reply);
+
+error:
+ sd_bus_message_unref(smsg);
+ sd_bus_error_free(&error);
+ return result;
}
/*
@@ -1275,25 +874,54 @@ 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)
+
+static struct sd_bus *msbus()
+{
+ static struct sd_bus *r = NULL;
+ if (r == NULL) {
+ static sd_event *e;
+ sd_event_default(&e);
+ sd_bus_open_user(&r);
+ sd_bus_attach_event(r, e, 0);
+ }
+ return r;
+}
+
+static sd_event *events()
+{
+ static sd_event *ev = NULL;
+ if (ev == NULL)
+ ev = sd_bus_get_event(msbus());
+ return ev;
+}
+
+static int mwait(int timeout, void *closure)
+{
+ sd_event_run(events(), -1);
+ return 0;
+}
+
+static struct jbus *jbus;
+
+#ifdef SERVER
+void ping(struct sd_bus_message *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 sd_bus_message *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);
@@ -1302,18 +930,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,
@@ -1321,25 +948,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);
+ int i = 1;
+ 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/src/utils-jbus.h b/src/utils-jbus.h
index 1069098..ff4c8fa 100644
--- a/src/utils-jbus.h
+++ b/src/utils-jbus.h
@@ -16,44 +16,18 @@
limitations under the License.
*/
-struct jreq;
+#pragma once
+
+struct sd_bus;
+
+struct sd_bus_message;
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 sd_bus *sdbus, 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 +91,31 @@ extern int jbus_on_signal_j(
/* verbs for servers */
extern int jbus_reply_s(
- struct jreq *jreq,
+ struct sd_bus_message *smsg,
const char *reply);
extern int jbus_reply_j(
- struct jreq *jreq,
+ struct sd_bus_message *smsg,
struct json_object *reply);
extern int jbus_reply_error_s(
- struct jreq *jreq,
+ struct sd_bus_message *smsg,
const char *reply);
extern int jbus_reply_error_j(
- struct jreq *jreq,
+ struct sd_bus_message *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 sd_bus_message *, 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 sd_bus_message *, struct json_object *, void *),
void *data);
extern int jbus_start_serving(