X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafm-user-daemon.c;h=cbb51e56f529fc732dcefc0491af0b21fb96d3b8;hb=c36ac6398097e09284f5d889ac2f994038a7d260;hp=346c58b6225d0e42fe25c5ad6a4762b75fb8a7b7;hpb=e2f138ca6b0f61d1a1cde1fd305dd7f0aaf4aa0e;p=src%2Fapp-framework-main.git

diff --git a/src/afm-user-daemon.c b/src/afm-user-daemon.c
index 346c58b..cbb51e5 100644
--- a/src/afm-user-daemon.c
+++ b/src/afm-user-daemon.c
@@ -20,34 +20,45 @@
 #include <stdio.h>
 #include <time.h>
 #include <getopt.h>
+#include <string.h>
 
 #include <json.h>
 
 #include "verbose.h"
 #include "utils-jbus.h"
-#include "af-db.h"
-#include "af-run.h"
+#include "utils-json.h"
+#include "afm.h"
+#include "afm-db.h"
+#include "afm-launch-mode.h"
+#include "afm-run.h"
 
+/*
+ * name of the application
+ */
 static const char appname[] = "afm-user-daemon";
 
-static void usage()
-{
-	printf(
-		"usage: %s [-q] [-v] [-r rootdir]... [-a appdir]...\n"
-		"\n"
-		"   -a appdir    adds an application directory\n"
-		"   -r rootdir   adds a root directory of applications\n"
-		"   -d           run as a daemon\n"
-		"   -q           quiet\n"
-		"   -v           verbose\n"
-		"\n",
-		appname
-	);
-}
+/*
+ * string for printing usage
+ */
+static const char usagestr[] =
+	"usage: %s [-q] [-v] [-m mode] [-r rootdir]... [-a appdir]...\n"
+	"\n"
+	"   -a appdir    adds an application directory\n"
+	"   -r rootdir   adds a root directory of applications\n"
+	"   -m mode      set default launch mode (local or remote)\n"
+	"   -d           run as a daemon\n"
+	"   -q           quiet\n"
+	"   -v           verbose\n"
+	"\n";
 
-static struct option options[] = {
+/*
+ * Option definition for getopt_long
+ */
+static const char options_s[] = "hdqvr:a:m:";
+static struct option options_l[] = {
 	{ "root",        required_argument, NULL, 'r' },
 	{ "application", required_argument, NULL, 'a' },
+	{ "mode",        required_argument, NULL, 'm' },
 	{ "daemon",      no_argument,       NULL, 'd' },
 	{ "quiet",       no_argument,       NULL, 'q' },
 	{ "verbose",     no_argument,       NULL, 'v' },
@@ -55,25 +66,60 @@ static struct option options[] = {
 	{ NULL, 0, NULL, 0 }
 };
 
-static struct jbus *jbus;
-static struct af_db *afdb;
+/*
+ * Connections to D-Bus
+ * This is an array for using the function
+ *    jbus_read_write_dispatch_multiple
+ * directly without transformations.
+ */
+static struct jbus *jbuses[2];
+#define system_bus  jbuses[0]
+#define user_bus    jbuses[1]
+
+/*
+ * Handle to the database of applications
+ */
+static struct afm_db *afdb;
 
+/*
+ * Returned error strings
+ */
 const char error_nothing[] = "[]";
 const char error_bad_request[] = "\"bad request\"";
 const char error_not_found[] = "\"not found\"";
 const char error_cant_start[] = "\"can't start\"";
+const char error_system[] = "\"system error\"";
 
-static const char *getappid(struct json_object *obj)
-{
-	return json_type_string == json_object_get_type(obj) ? json_object_get_string(obj) : NULL;
-}
 
-static int getrunid(struct json_object *obj)
+/*
+ * retrieves the 'runid' in 'obj' parameters received with the
+ * request 'jreq' 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.
+ */
+static int onrunid(struct jreq *jreq, struct json_object *obj,
+						const char *method, int *runid)
 {
-	return json_type_int == json_object_get_type(obj) ? json_object_get_int(obj) : 0;
+	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);
+		return 0;
+	}
+
+	INFO("method %s called for %d", method, *runid);
+	return 1;
 }
 
-static void reply(struct jreq *jreq, struct json_object *resp, const char *errstr)
+/*
+ * Sends the reply 'resp' to the request 'jreq' 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,
+						const char *errstr)
 {
 	if (resp)
 		jbus_reply_j(jreq, resp);
@@ -81,98 +127,244 @@ static void reply(struct jreq *jreq, struct json_object *resp, const char *errst
 		jbus_reply_error_s(jreq, errstr);
 }
 
-static void reply_status(struct jreq *jreq, int status)
+/*
+ * Sends the reply "true" to the request 'jreq' 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)
 {
 	if (status)
-		jbus_reply_error_s(jreq, error_not_found);
+		jbus_reply_error_s(jreq, errstr);
 	else
 		jbus_reply_s(jreq, "true");
 }
 
-static void on_runnables(struct jreq *jreq, struct json_object *obj)
+/*
+ * On query "runnables" from 'jreq' 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)
 {
-	struct json_object *resp = af_db_application_list(afdb);
+	struct json_object *resp;
+	INFO("method runnables called");
+	resp = afm_db_application_list(afdb);
 	jbus_reply_j(jreq, resp);
-	json_object_put(obj);
+	json_object_put(resp);
 }
 
-static void on_detail(struct jreq *jreq, struct json_object *obj)
+/*
+ * On query "detail" from 'jreq' with parameters of 'obj'.
+ */
+static void on_detail(struct jreq *jreq, struct json_object *obj, void *unused)
 {
-	const char *appid = getappid(obj);
-	struct json_object *resp = af_db_get_application_public(afdb, appid);
+	const char *appid;
+	struct json_object *resp;
+
+	/* get the parameters */
+	if (j_read_string(obj, &appid))
+		; /* appid as a string */
+	else if (j_read_string_at(obj, "id", &appid))
+		; /* appid as obj.id string */
+	else {
+		INFO("method detail called but bad request!");
+		jbus_reply_error_s(jreq, 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);
-	json_object_put(obj);
+	json_object_put(resp);
 }
 
-static void on_start(struct jreq *jreq, struct json_object *obj)
+
+/*
+ * On query "start" from 'jreq' with parameters of 'obj'.
+ */
+static void on_start(struct jreq *jreq, struct json_object *obj, void *unused)
 {
-	const char *appid;
-	struct json_object *appli;
+	const char *appid, *modestr;
+	char *uri;
+	struct json_object *appli, *resp;
 	int runid;
 	char runidstr[20];
-
-	appid = getappid(obj);
-	if (appid == NULL)
+	enum afm_launch_mode mode;
+
+	/* get the parameters */
+	mode = invalid_launch_mode;
+	if (j_read_string(obj, &appid)) {
+		mode = get_default_launch_mode();
+	} else if (j_read_string_at(obj, "id", &appid)) {
+		if (j_read_string_at(obj, "mode", &modestr)) {
+			mode = launch_mode_of_name(modestr);
+		} else {
+			mode = get_default_launch_mode();
+		}
+	}
+	if (!is_valid_launch_mode(mode)) {
 		jbus_reply_error_s(jreq, error_bad_request);
+		return;
+	}
+
+	/* get the application */
+	INFO("method start called for %s mode=%s", appid,
+						name_of_launch_mode(mode));
+	appli = afm_db_get_application(afdb, appid);
+	if (appli == NULL) {
+		jbus_reply_error_s(jreq, error_not_found);
+		return;
+	}
+
+	/* launch the application */
+	uri = NULL;
+	runid = afm_run_start(appli, mode, &uri);
+	if (runid <= 0) {
+		jbus_reply_error_s(jreq, error_cant_start);
+		free(uri);
+		return;
+	}
+
+	if (uri == NULL) {
+		/* returns only the runid */
+		snprintf(runidstr, sizeof runidstr, "%d", runid);
+		runidstr[sizeof runidstr - 1] = 0;
+		jbus_reply_s(jreq, runidstr);
+		return;
+	}
+
+	/* returns the runid and its uri */
+	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);
 	else {
-		appli = af_db_get_application(afdb, appid);
-		if (appli == NULL)
-			jbus_reply_error_s(jreq, error_not_found);
-		else {
-			runid = af_run_start(appli);
-			if (runid <= 0)
-				jbus_reply_error_s(jreq, error_cant_start);
-			else {
-				snprintf(runidstr, sizeof runidstr, "%d", runid);
-				runidstr[sizeof runidstr - 1] = 0;
-				jbus_reply_s(jreq, runidstr);
-			}
-		}
+		afm_run_stop(runid);
+		jbus_reply_error_s(jreq, error_system);
 	}
-	json_object_put(obj);
+	json_object_put(resp);
+	free(uri);
 }
 
-static void on_stop(struct jreq *jreq, struct json_object *obj)
+/*
+ * On query "stop" from 'jreq' with parameters of 'obj'.
+ */
+static void on_stop(struct jreq *jreq, struct json_object *obj, void *unused)
 {
-	int runid = getrunid(obj);
-	int status = af_run_stop(runid);
-	reply_status(jreq, status);
-	json_object_put(obj);
+	int runid, status;
+	if (onrunid(jreq, obj, "stop", &runid)) {
+		status = afm_run_stop(runid);
+		reply_status(jreq, status, error_not_found);
+	}
 }
 
-static void on_continue(struct jreq *jreq, struct json_object *obj)
+/*
+ * On query "continue" from 'jreq' with parameters of 'obj'.
+ */
+static void on_continue(struct jreq *jreq, struct json_object *obj, void *unused)
 {
-	int runid = getrunid(obj);
-	int status = af_run_continue(runid);
-	reply_status(jreq, status);
-	json_object_put(obj);
+	int runid, status;
+	if (onrunid(jreq, obj, "continue", &runid)) {
+		status = afm_run_continue(runid);
+		reply_status(jreq, status, error_not_found);
+	}
 }
 
-static void on_terminate(struct jreq *jreq, struct json_object *obj)
+/*
+ * On query "terminate" from 'jreq' with parameters of 'obj'.
+ */
+static void on_terminate(struct jreq *jreq, struct json_object *obj, void *unused)
 {
-	int runid = getrunid(obj);
-	int status = af_run_terminate(runid);
-	reply_status(jreq, status);
-	json_object_put(obj);
+	int runid, status;
+	if (onrunid(jreq, obj, "terminate", &runid)) {
+		status = afm_run_terminate(runid);
+		reply_status(jreq, status, error_not_found);
+	}
 }
 
-static void on_runners(struct jreq *jreq, struct json_object *obj)
+/*
+ * On query "runners" from 'jreq' with parameters of 'obj'.
+ */
+static void on_runners(struct jreq *jreq, struct json_object *obj, void *unused)
 {
-	struct json_object *resp = af_run_list();
+	struct json_object *resp;
+	INFO("method runners called");
+	resp = afm_run_list();
 	jbus_reply_j(jreq, resp);
 	json_object_put(resp);
-	json_object_put(obj);
 }
 
-static void on_state(struct jreq *jreq, struct json_object *obj)
+/*
+ * On query "state" from 'jreq' with parameters of 'obj'.
+ */
+static void on_state(struct jreq *jreq, struct json_object *obj, void *unused)
 {
-	int runid = getrunid(obj);
-	struct json_object *resp = af_run_state(runid);
-	reply(jreq, resp, error_not_found);
-	json_object_put(resp);
-	json_object_put(obj);
+	int runid;
+	struct json_object *resp;
+	if (onrunid(jreq, obj, "state", &runid)) {
+		resp = afm_run_state(runid);
+		reply(jreq, 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 principle is very simple: call the corresponding system method
+ * and reply its response to the caller.
+ *
+ * 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)
+ */
+static void propagate(struct jreq *jreq, 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);
+		free(reply);
+	}
+	else
+		jbus_reply_error_s(jreq, error_system);
+}
+
+/*
+ * On query "install" from 'jreq' with parameters of 'msg'.
+ */
+static void on_install(struct jreq *jreq, const char *msg, void *unused)
+{
+	return propagate(jreq, msg, "install");
 }
 
+/*
+ * On query "uninstall" from 'jreq' with parameters of 'msg'.
+ */
+static void on_uninstall(struct jreq *jreq, const char *msg, void *unused)
+{
+	return propagate(jreq, msg, "uninstall");
+}
+
+/*
+ * On system signaling that applications list changed
+ */
+static void on_signal_changed(struct json_object *obj, void *unused)
+{
+	/* update the database */
+	afm_db_update_applications(afdb);
+	/* re-propagate now */
+	jbus_send_signal_j(user_bus, "changed", obj);
+}
+
+/*
+ * Tiny routine to daemonize the program
+ * Return 0 on success or -1 on failure.
+ */
 static int daemonize()
 {
 	int rc = fork();
@@ -183,17 +375,21 @@ static int daemonize()
 	return 0;
 }
 
+/*
+ * ENTRY POINT OF AFM-USER-DAEMON
+ */
 int main(int ac, char **av)
 {
 	int i, daemon = 0;
+	enum afm_launch_mode mode;
 
 	LOGAUTH(appname);
 
 	/* first interpretation of arguments */
-	while ((i = getopt_long(ac, av, "hdqvr:a:", options, NULL)) >= 0) {
+	while ((i = getopt_long(ac, av, options_s, options_l, NULL)) >= 0) {
 		switch (i) {
 		case 'h':
-			usage();
+			printf(usagestr, appname);
 			return 0;
 		case 'q':
 			if (verbosity)
@@ -209,6 +405,14 @@ int main(int ac, char **av)
 			break;
 		case 'a':
 			break;
+		case 'm':
+			mode = launch_mode_of_name(optarg);
+			if (!is_valid_launch_mode(mode)) {
+				ERROR("invalid mode '%s'", optarg);
+				return 1;
+			}
+			set_default_launch_mode(mode);
+			break;
 		case ':':
 			ERROR("missing argument value");
 			return 1;
@@ -222,76 +426,96 @@ int main(int ac, char **av)
 	srandom((unsigned int)time(NULL));
 
 	/* init runners */
-	if (af_run_init()) {
-		ERROR("af_run_init failed");
+	if (afm_run_init()) {
+		ERROR("afm_run_init failed");
 		return 1;
 	}
 
 	/* init framework */
-	afdb = af_db_create();
+	afdb = afm_db_create();
 	if (!afdb) {
-		ERROR("af_create failed");
+		ERROR("afm_create failed");
 		return 1;
 	}
-	if (af_db_add_root(afdb, FWK_APP_DIR)) {
+	if (afm_db_add_root(afdb, FWK_APP_DIR)) {
 		ERROR("can't add root %s", FWK_APP_DIR);
 		return 1;
 	}
 
 	/* second interpretation of arguments */
 	optind = 1;
-	while ((i = getopt_long(ac, av, "hdqvr:a:", options, NULL)) >= 0) {
+	while ((i = getopt_long(ac, av, options_s, options_l, NULL)) >= 0) {
 		switch (i) {
 		case 'r':
-			if (af_db_add_root(afdb, optarg)) {
+			if (afm_db_add_root(afdb, optarg)) {
 				ERROR("can't add root %s", optarg);
 				return 1;
 			}
 			break;
 		case 'a':
-			if (af_db_add_application(afdb, optarg)) {
-                                ERROR("can't add application %s", optarg);
-                                return 1;
-                        }
+			if (afm_db_add_application(afdb, optarg)) {
+				ERROR("can't add application %s", optarg);
+				return 1;
+			}
 			break;
 		}
 	}
 
 	/* update the database */
-	if (af_db_update_applications(afdb)) {
-		ERROR("af_update_applications failed");
+	if (afm_db_update_applications(afdb)) {
+		ERROR("afm_update_applications failed");
 		return 1;
 	}
 
+	/* daemonize if requested */
 	if (daemon && daemonize()) {
 		ERROR("daemonization failed");
 		return 1;
 	}
 
-	/* init service	*/
-	jbus = create_jbus(1, "/org/AGL/afmMain");
-	if (!jbus) {
+	/* connects to the system bus */
+	system_bus = create_jbus_system(AFM_SYSTEM_DBUS_PATH);
+	if (!system_bus) {
+		ERROR("create_jbus failed for system");
+		return 1;
+	}
+
+	/* observe signals of system */
+	if(jbus_on_signal_j(system_bus, "changed", on_signal_changed, NULL)) {
+		ERROR("adding signal observer failed");
+		return 1;
+	}
+
+	/* connect to the session bus */
+	user_bus = create_jbus_session(AFM_USER_DBUS_PATH);
+	if (!user_bus) {
 		ERROR("create_jbus failed");
 		return 1;
 	}
-	if(jbus_add_service_j(jbus, "runnables", on_runnables)
-	|| jbus_add_service_j(jbus, "detail", on_detail)
-	|| jbus_add_service_j(jbus, "start", on_start)
-	|| jbus_add_service_j(jbus, "terminate", on_terminate)
-	|| jbus_add_service_j(jbus, "stop", on_stop)
-	|| jbus_add_service_j(jbus, "continue", on_continue)
-	|| jbus_add_service_j(jbus, "runners", on_runners)
-	|| jbus_add_service_j(jbus, "state", on_state)) {
+
+	/* init services */
+	if (jbus_add_service_j(user_bus, "runnables", on_runnables, NULL)
+	 || jbus_add_service_j(user_bus, "detail",    on_detail, NULL)
+	 || jbus_add_service_j(user_bus, "start",     on_start, NULL)
+	 || jbus_add_service_j(user_bus, "terminate", on_terminate, NULL)
+	 || jbus_add_service_j(user_bus, "stop",      on_stop, NULL)
+	 || jbus_add_service_j(user_bus, "continue",  on_continue, NULL)
+	 || jbus_add_service_j(user_bus, "runners",   on_runners, NULL)
+	 || jbus_add_service_j(user_bus, "state",     on_state, NULL)
+	 || jbus_add_service_s(user_bus, "install",   on_install, NULL)
+	 || jbus_add_service_s(user_bus, "uninstall", on_uninstall, NULL)) {
 		ERROR("adding services failed");
 		return 1;
 	}
 
-	/* start and run */
-	if (jbus_start_serving(jbus)) {
-		ERROR("cant start server");
+	/* start servicing */
+	if (jbus_start_serving(user_bus)) {
+		ERROR("can't start server");
 		return 1;
 	}
-	while (!jbus_read_write_dispatch(jbus, -1));
+
+	/* run until error */
+	while (jbus_read_write_dispatch_multiple(jbuses, 2, -1, 20) >= 0);
 	return 0;
 }