X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-api-dbus.c;h=76894caa929df537d84a4bfe98aef404945dcff3;hb=e80c1a7ae27456d546e202b1c498e9337d42ce14;hp=8c55ed016a472a4e8d4bba2f4a620b597b733e40;hpb=d7e4faba5d1744160d538edd74bc4bdd8a173b1a;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-api-dbus.c b/src/afb-api-dbus.c
index 8c55ed01..76894caa 100644
--- a/src/afb-api-dbus.c
+++ b/src/afb-api-dbus.c
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#if defined(WITH_DBUS_TRANSPARENCY)
+#if WITH_DBUS_TRANSPARENCY
 
 #define _GNU_SOURCE
 
@@ -45,6 +45,7 @@
 
 #include "verbose.h"
 #include "systemd.h"
+#include "jobs.h"
 
 static const char DEFAULT_PATH_PREFIX[] = "/org/agl/afb/api/";
 
@@ -129,6 +130,7 @@ static struct api_dbus *make_api_dbus_3(int system, const char *path, size_t pat
 	}
 
 	/* choose the bus */
+	jobs_acquire_event_manager();
 	sdbus = (system ? systemd_get_system_bus : systemd_get_user_bus)();
 	if (sdbus == NULL)
 		goto error2;
@@ -366,15 +368,19 @@ static int api_dbus_client_on_broadcast_event(sd_bus_message *m, void *userdata,
 {
 	struct json_object *object;
 	const char *event, *data;
+	const unsigned char *uuid;
+	size_t szuuid;
+	uint8_t hop;
 	enum json_tokener_error jerr;
-	int rc = sd_bus_message_read(m, "ss", &event, &data);
+
+	int rc = sd_bus_message_read(m, "ssayy", &event, &data, &uuid, &szuuid, &hop);
 	if (rc < 0)
 		ERROR("unreadable broadcasted event");
 	else {
 		object = json_tokener_parse_verbose(data, &jerr);
 		if (jerr != json_tokener_success)
 			object = json_object_new_string(data);
-		afb_evt_broadcast(event, object);
+		afb_evt_rebroadcast(event, object, uuid, hop);
 	}
 	return 1;
 }
@@ -633,7 +639,7 @@ error:
 static void afb_api_dbus_server_event_add(void *closure, const char *event, int eventid);
 static void afb_api_dbus_server_event_remove(void *closure, const char *event, int eventid);
 static void afb_api_dbus_server_event_push(void *closure, const char *event, int eventid, struct json_object *object);
-static void afb_api_dbus_server_event_broadcast(void *closure, const char *event, int eventid, struct json_object *object);
+static void afb_api_dbus_server_event_broadcast(void *closure, const char *event, struct json_object *object, const uuid_binary_t uuid, uint8_t hop);
 
 /* the interface for events broadcasting */
 static const struct afb_evt_itf evt_broadcast_itf = {
@@ -664,7 +670,7 @@ struct origin
 	struct afb_cred *cred;
 
 	/* the origin */
-	char name[1];
+	char name[];
 };
 
 /* get the credentials for the message */
@@ -708,7 +714,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 {
@@ -915,14 +921,15 @@ static void afb_api_dbus_server_event_push(void *closure, const char *event, int
 	json_object_put(object);
 }
 
-static void afb_api_dbus_server_event_broadcast(void *closure, const char *event, int eventid, struct json_object *object)
+static void afb_api_dbus_server_event_broadcast(void *closure, const char *event, struct json_object *object, const uuid_binary_t uuid, uint8_t hop)
 {
 	int rc;
 	struct api_dbus *api;
 
 	api = closure;
 	rc = sd_bus_emit_signal(api->sdbus, api->path, api->name, "broadcast",
-			"ss", event, json_object_to_json_string_ext(object, JSON_C_TO_STRING_PLAIN|JSON_C_TO_STRING_NOSLASHESCAPE));
+			"ssayy", event, json_object_to_json_string_ext(object, JSON_C_TO_STRING_PLAIN|JSON_C_TO_STRING_NOSLASHESCAPE),
+			uuid, UUID_BINARY_LENGTH, hop);
 	if (rc < 0)
 		ERROR("error while broadcasting event %s", event);
 	json_object_put(object);
@@ -974,7 +981,7 @@ static int api_dbus_server_on_object_called(sd_bus_message *message, void *userd
 
 	/* fulfill the request and emit it */
 	dreq->xreq.context.flags = flags;
-	dreq->xreq.cred = afb_cred_mixed_on_behalf_import(listener->origin->cred, uuid, creds && creds[0] ? creds : NULL);
+	dreq->xreq.cred = afb_cred_mixed_on_behalf_import(listener->origin->cred, &dreq->xreq.context, creds && creds[0] ? creds : NULL);
 	dreq->message = sd_bus_message_ref(message);
 	dreq->json = json_tokener_parse_verbose(dreq->request, &jerr);
 	if (jerr != json_tokener_success) {