X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-api-dbus.c;h=1f254d1608d6636f377be7f468f7c1a01dfcdab4;hb=60cd11786766ebc148b7ec088962dd6e112f8762;hp=227658f4f9df1661b57a2e84cd91185c54b9b671;hpb=77ca8b40f2d0c8b1cbf9960bd5a5b2aec36fef38;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-api-dbus.c b/src/afb-api-dbus.c
index 227658f4..1f254d16 100644
--- a/src/afb-api-dbus.c
+++ b/src/afb-api-dbus.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015-2018 "IoT.bzh"
+ * Copyright (C) 2015-2019 "IoT.bzh"
  * Author José Bollo <jose.bollo@iot.bzh>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#if defined(WITH_DBUS_TRANSPARENCY)
+#if WITH_DBUS_TRANSPARENCY
 
 #define _GNU_SOURCE
 
@@ -33,8 +33,6 @@
 
 #include <afb/afb-event-x2.h>
 
-#include "afb-systemd.h"
-
 #include "afb-session.h"
 #include "afb-msg-json.h"
 #include "afb-api.h"
@@ -44,8 +42,10 @@
 #include "afb-cred.h"
 #include "afb-evt.h"
 #include "afb-xreq.h"
-#include "verbose.h"
 
+#include "verbose.h"
+#include "systemd.h"
+#include "jobs.h"
 
 static const char DEFAULT_PATH_PREFIX[] = "/org/agl/afb/api/";
 
@@ -130,7 +130,8 @@ static struct api_dbus *make_api_dbus_3(int system, const char *path, size_t pat
 	}
 
 	/* choose the bus */
-	sdbus = (system ? afb_systemd_get_system_bus : afb_systemd_get_user_bus)();
+	jobs_acquire_event_manager();
+	sdbus = (system ? systemd_get_system_bus : systemd_get_user_bus)();
 	if (sdbus == NULL)
 		goto error2;
 
@@ -286,6 +287,8 @@ static int api_dbus_client_on_reply(sd_bus_message *message, void *userdata, sd_
 	int rc;
 	struct dbus_memo *memo;
 	const char *json, *error, *info;
+	struct json_object *object;
+	enum json_tokener_error jerr;
 
 	/* retrieve the recorded data */
 	memo = userdata;
@@ -297,7 +300,14 @@ static int api_dbus_client_on_reply(sd_bus_message *message, void *userdata, sd_
 		afb_xreq_reply(memo->xreq, NULL, "error", "dbus error");
 	} else {
 		/* report the answer */
-		afb_xreq_reply(memo->xreq, *json ? json_tokener_parse(json) : NULL, *error ? error : NULL, *info ? info : NULL);
+		if (!*json)
+			object = NULL;
+		else {
+			object = json_tokener_parse_verbose(json, &jerr);
+			if (jerr != json_tokener_success)
+				object = json_object_new_string(json);
+		}
+		afb_xreq_reply(memo->xreq, object, *error ? error : NULL, *info ? info : NULL);
 	}
 	api_dbus_client_memo_destroy(memo);
 	return 1;
@@ -358,11 +368,14 @@ static int api_dbus_client_on_broadcast_event(sd_bus_message *m, void *userdata,
 {
 	struct json_object *object;
 	const char *event, *data;
+	enum json_tokener_error jerr;
 	int rc = sd_bus_message_read(m, "ss", &event, &data);
 	if (rc < 0)
 		ERROR("unreadable broadcasted event");
 	else {
-		object = json_tokener_parse(data);
+		object = json_tokener_parse_verbose(data, &jerr);
+		if (jerr != json_tokener_success)
+			object = json_object_new_string(data);
 		afb_evt_broadcast(event, object);
 	}
 	return 1;
@@ -441,6 +454,7 @@ static void api_dbus_client_event_push(struct api_dbus *api, int id, const char
 {
 	struct json_object *object;
 	struct dbus_event *ev;
+	enum json_tokener_error jerr;
 
 	/* retrieves the event */
 	ev = api_dbus_client_event_search(api, id, name);
@@ -450,7 +464,9 @@ static void api_dbus_client_event_push(struct api_dbus *api, int id, const char
 	}
 
 	/* destroys the event */
-	object = json_tokener_parse(data);
+	object = json_tokener_parse_verbose(data, &jerr);
+	if (jerr != json_tokener_success)
+		object = json_object_new_string(data);
 	afb_evt_event_x2_push(ev->event, object);
 }
 
@@ -650,7 +666,7 @@ struct origin
 	struct afb_cred *cred;
 
 	/* the origin */
-	char name[1];
+	char name[];
 };
 
 /* get the credentials for the message */
@@ -694,7 +710,7 @@ static struct origin *afb_api_dbus_server_origin_get(struct api_dbus *api, const
 	}
 
 	/* not found, create it */
-	origin = malloc(strlen(sender) + sizeof *origin);
+	origin = malloc(strlen(sender) + 1 + sizeof *origin);
 	if (origin == NULL)
 		errno = ENOMEM;
 	else {
@@ -926,6 +942,7 @@ static int api_dbus_server_on_object_called(sd_bus_message *message, void *userd
 	uint32_t flags;
 	struct afb_session *session;
 	struct listener *listener;
+	enum json_tokener_error jerr;
 
 	/* check the interface */
 	if (strcmp(sd_bus_message_get_interface(message), api->name) != 0)
@@ -961,8 +978,8 @@ static int api_dbus_server_on_object_called(sd_bus_message *message, void *userd
 	dreq->xreq.context.flags = flags;
 	dreq->xreq.cred = afb_cred_mixed_on_behalf_import(listener->origin->cred, uuid, creds && creds[0] ? creds : NULL);
 	dreq->message = sd_bus_message_ref(message);
-	dreq->json = json_tokener_parse(dreq->request);
-	if (dreq->json == NULL && strcmp(dreq->request, "null")) {
+	dreq->json = json_tokener_parse_verbose(dreq->request, &jerr);
+	if (jerr != json_tokener_success) {
 		/* lazy error detection of json request. Is it to improve? */
 		dreq->json = json_object_new_string(dreq->request);
 	}