X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafm-user-daemon.c;h=a7053815a6cbf7a67b0ce4de0483468631b7b37a;hb=941eb7ef734e7d6a9de9c7af13345e63f708d169;hp=24e07d33524dd701ca68c9100c5f00a2180a20cc;hpb=728bc162968a99f25dbe07ae8e48e53281f01253;p=src%2Fapp-framework-main.git diff --git a/src/afm-user-daemon.c b/src/afm-user-daemon.c index 24e07d3..a705381 100644 --- a/src/afm-user-daemon.c +++ b/src/afm-user-daemon.c @@ -1,5 +1,5 @@ /* - Copyright 2015 IoT.bzh + Copyright 2015, 2016, 2017 IoT.bzh author: José Bollo @@ -24,15 +24,21 @@ #include #include -#include +#include #include "verbose.h" #include "utils-jbus.h" #include "utils-json.h" +#include "utils-systemd.h" #include "afm.h" -#include "afm-db.h" #include "afm-launch-mode.h" +#ifdef LEGACY_MODE_WITHOUT_SYSTEMD +# include "afm-db.h" #include "afm-run.h" +#else +# include "afm-udb.h" +#include "afm-urun.h" +#endif /* * name of the application @@ -43,12 +49,19 @@ static const char appname[] = "afm-user-daemon"; * string for printing usage */ static const char usagestr[] = +#ifdef LEGACY_MODE_WITHOUT_SYSTEMD "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" +#else + "usage: %s [option(s)]\n" + "\n" +#endif " -d run as a daemon\n" + " -u addr address of user D-Bus to use\n" + " -s addr address of system D-Bus to use\n" " -q quiet\n" " -v verbose\n" "\n"; @@ -56,11 +69,18 @@ static const char usagestr[] = /* * Option definition for getopt_long */ +#ifdef LEGACY_MODE_WITHOUT_SYSTEMD 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' }, +#else +static const char options_s[] = "hdqv"; +static struct option options_l[] = { +#endif + { "user-dbus", required_argument, NULL, 'u' }, + { "system-dbus", required_argument, NULL, 's' }, { "daemon", no_argument, NULL, 'd' }, { "quiet", no_argument, NULL, 'q' }, { "verbose", no_argument, NULL, 'v' }, @@ -81,7 +101,11 @@ static struct jbus *jbuses[2]; /* * Handle to the database of applications */ +#ifdef LEGACY_MODE_WITHOUT_SYSTEMD static struct afm_db *afdb; +#else +static struct afm_udb *afudb; +#endif /* * Returned error strings @@ -150,7 +174,11 @@ static void on_runnables(struct sd_bus_message *smsg, struct json_object *obj, v { struct json_object *resp; INFO("method runnables called"); +#ifdef LEGACY_MODE_WITHOUT_SYSTEMD resp = afm_db_application_list(afdb); +#else + resp = afm_udb_applications_public(afudb); +#endif jbus_reply_j(smsg, resp); json_object_put(resp); } @@ -176,12 +204,15 @@ static void on_detail(struct sd_bus_message *smsg, struct json_object *obj, void /* wants details for appid */ INFO("method detail called for %s", appid); +#ifdef LEGACY_MODE_WITHOUT_SYSTEMD resp = afm_db_get_application_public(afdb, appid); +#else + resp = afm_udb_get_application_public(afudb, appid); +#endif reply(smsg, resp, error_not_found); json_object_put(resp); } - /* * On query "start" from 'smsg' with parameters of 'obj'. */ @@ -213,7 +244,11 @@ static void on_start(struct sd_bus_message *smsg, struct json_object *obj, void /* get the application */ INFO("method start called for %s mode=%s", appid, name_of_launch_mode(mode)); +#ifdef LEGACY_MODE_WITHOUT_SYSTEMD appli = afm_db_get_application(afdb, appid); +#else + appli = afm_udb_get_application_private(afudb, appid); +#endif if (appli == NULL) { jbus_reply_error_s(smsg, error_not_found); return; @@ -221,7 +256,11 @@ static void on_start(struct sd_bus_message *smsg, struct json_object *obj, void /* launch the application */ uri = NULL; +#ifdef LEGACY_MODE_WITHOUT_SYSTEMD runid = afm_run_start(appli, mode, &uri); +#else + runid = afm_urun_start(appli); +#endif if (runid <= 0) { jbus_reply_error_s(smsg, error_cant_start); free(uri); @@ -242,7 +281,11 @@ static void on_start(struct sd_bus_message *smsg, struct json_object *obj, void && j_add_string(resp, "uri", uri)) jbus_reply_j(smsg, resp); else { - afm_run_stop(runid); +#ifdef LEGACY_MODE_WITHOUT_SYSTEMD + afm_run_terminate(runid); +#else + afm_urun_terminate(runid); +#endif jbus_reply_error_s(smsg, error_system); } json_object_put(resp); @@ -250,29 +293,103 @@ static void on_start(struct sd_bus_message *smsg, struct json_object *obj, void } /* - * On query "stop" from 'smsg' with parameters of 'obj'. + * On query "once" from 'smsg' with parameters of 'obj'. */ -static void on_stop(struct sd_bus_message *smsg, struct json_object *obj, void *unused) +static void on_once(struct sd_bus_message *smsg, struct json_object *obj, void *unused) +{ + const char *appid; + struct json_object *appli, *resp; + int runid; + + /* get the parameters */ + if (!j_read_string(obj, &appid) && !j_read_string_at(obj, "id", &appid)) { + jbus_reply_error_s(smsg, error_bad_request); + return; + } + + /* get the application */ + INFO("method once called for %s", appid); +#ifdef LEGACY_MODE_WITHOUT_SYSTEMD + appli = afm_db_get_application(afdb, appid); +#else + appli = afm_udb_get_application_private(afudb, appid); +#endif + if (appli == NULL) { + jbus_reply_error_s(smsg, error_not_found); + return; + } + + /* launch the application */ +#ifdef LEGACY_MODE_WITHOUT_SYSTEMD + runid = afm_run_once(appli); +#else + runid = afm_urun_once(appli); +#endif + if (runid <= 0) { + jbus_reply_error_s(smsg, error_cant_start); + return; + } + + /* returns the state */ +#ifdef LEGACY_MODE_WITHOUT_SYSTEMD + resp = afm_run_state(runid); +#else + resp = afm_urun_state(afudb, runid); +#endif + reply(smsg, resp, error_not_found); + json_object_put(resp); +} + +/* + * On query "pause" from 'smsg' with parameters of 'obj'. + */ +static void on_pause(struct sd_bus_message *smsg, struct json_object *obj, void *unused) { int runid, status; - if (onrunid(smsg, obj, "stop", &runid)) { - status = afm_run_stop(runid); + if (onrunid(smsg, obj, "pause", &runid)) { +#ifdef LEGACY_MODE_WITHOUT_SYSTEMD + status = afm_run_pause(runid); +#else + status = afm_urun_pause(runid); +#endif reply_status(smsg, status, error_not_found); } } /* - * On query "continue" from 'smsg' with parameters of 'obj'. + * On query "resume" from 'smsg' with parameters of 'obj'. */ -static void on_continue(struct sd_bus_message *smsg, struct json_object *obj, void *unused) +static void on_resume(struct sd_bus_message *smsg, struct json_object *obj, void *unused) { int runid, status; - if (onrunid(smsg, obj, "continue", &runid)) { - status = afm_run_continue(runid); + if (onrunid(smsg, obj, "resume", &runid)) { +#ifdef LEGACY_MODE_WITHOUT_SYSTEMD + status = afm_run_resume(runid); +#else + status = afm_urun_resume(runid); +#endif reply_status(smsg, status, error_not_found); } } +/* + * On query "stop" from 'smsg' with parameters of 'obj'. + */ +static void on_stop(struct sd_bus_message *smsg, struct json_object *obj, void *unused) +{ + NOTICE("call to obsolete 'stop'"); + on_pause(smsg, obj, unused); +} + +/* + * On query "continue" from 'smsg' with parameters of 'obj'. + */ +static void on_continue(struct sd_bus_message *smsg, struct json_object *obj, void *unused) +{ + NOTICE("call to obsolete 'continue'"); + on_resume(smsg, obj, unused); +} + /* * On query "terminate" from 'smsg' with parameters of 'obj'. */ @@ -280,7 +397,11 @@ static void on_terminate(struct sd_bus_message *smsg, struct json_object *obj, v { int runid, status; if (onrunid(smsg, obj, "terminate", &runid)) { +#ifdef LEGACY_MODE_WITHOUT_SYSTEMD status = afm_run_terminate(runid); +#else + status = afm_urun_terminate(runid); +#endif reply_status(smsg, status, error_not_found); } } @@ -292,7 +413,11 @@ static void on_runners(struct sd_bus_message *smsg, struct json_object *obj, voi { struct json_object *resp; INFO("method runners called"); +#ifdef LEGACY_MODE_WITHOUT_SYSTEMD resp = afm_run_list(); +#else + resp = afm_urun_list(afudb); +#endif jbus_reply_j(smsg, resp); json_object_put(resp); } @@ -305,7 +430,11 @@ static void on_state(struct sd_bus_message *smsg, struct json_object *obj, void int runid; struct json_object *resp; if (onrunid(smsg, obj, "state", &runid)) { +#ifdef LEGACY_MODE_WITHOUT_SYSTEMD resp = afm_run_state(runid); +#else + resp = afm_urun_state(afudb, runid); +#endif reply(smsg, resp, error_not_found); json_object_put(resp); } @@ -359,8 +488,17 @@ static void on_uninstall(struct sd_bus_message *smsg, const char *msg, void *unu */ static void on_signal_changed(struct json_object *obj, void *unused) { +#ifdef LEGACY_MODE_WITHOUT_SYSTEMD /* update the database */ afm_db_update_applications(afdb); +#else + /* enforce daemon reload */ + systemd_daemon_reload(1); + systemd_unit_restart_name(1, "sockets.target"); + + /* update the database */ + afm_udb_update(afudb); +#endif /* re-propagate now */ jbus_send_signal_j(user_bus, "changed", obj); } @@ -379,20 +517,63 @@ static int daemonize() return 0; } +/* + * Opens a sd-bus connection and returns it in 'ret'. + * The sd-bus connexion is intended to be for user if 'isuser' + * is not null. The adress is the default address when 'address' + * is NULL or, otherwise, the given address. + * It might be necessary to pass the address as an argument because + * library systemd uses secure_getenv to retrieves the default + * addresses and secure_getenv might return NULL in some cases. + */ +static int open_bus(sd_bus **ret, int isuser, const char *address) +{ + sd_bus *b; + int rc; + + if (address == NULL) + return (isuser ? sd_bus_default_user : sd_bus_default_system)(ret); + + rc = sd_bus_new(&b); + if (rc < 0) + return rc; + + rc = sd_bus_set_address(b, address); + if (rc < 0) + goto fail; + + sd_bus_set_bus_client(b, 1); + + rc = sd_bus_start(b); + if (rc < 0) + goto fail; + + *ret = b; + return 0; + +fail: + sd_bus_unref(b); + return rc; +} + /* * ENTRY POINT OF AFM-USER-DAEMON */ int main(int ac, char **av) { int i, daemon = 0, rc; +#ifdef LEGACY_MODE_WITHOUT_SYSTEMD enum afm_launch_mode mode; +#endif struct sd_event *evloop; struct sd_bus *sysbus, *usrbus; - + const char *sys_bus_addr, *usr_bus_addr; LOGAUTH(appname); /* first interpretation of arguments */ + sys_bus_addr = NULL; + usr_bus_addr = NULL; while ((i = getopt_long(ac, av, options_s, options_l, NULL)) >= 0) { switch (i) { case 'h': @@ -408,6 +589,7 @@ int main(int ac, char **av) case 'd': daemon = 1; break; +#ifdef LEGACY_MODE_WITHOUT_SYSTEMD case 'r': break; case 'a': @@ -420,6 +602,13 @@ int main(int ac, char **av) } set_default_launch_mode(mode); break; +#endif + case 'u': + usr_bus_addr = optarg; + break; + case 's': + sys_bus_addr = optarg; + break; case ':': ERROR("missing argument value"); return 1; @@ -432,6 +621,7 @@ int main(int ac, char **av) /* init random generator */ srandom((unsigned int)time(NULL)); +#ifdef LEGACY_MODE_WITHOUT_SYSTEMD /* init runners */ if (afm_run_init()) { ERROR("afm_run_init failed"); @@ -441,7 +631,7 @@ int main(int ac, char **av) /* init framework */ afdb = afm_db_create(); if (!afdb) { - ERROR("afm_create failed"); + ERROR("afm_db_create failed"); return 1; } if (afm_db_add_root(afdb, FWK_APP_DIR)) { @@ -473,6 +663,14 @@ int main(int ac, char **av) ERROR("afm_update_applications failed"); return 1; } +#else + /* init database */ + afudb = afm_udb_create(0, 1, "afm-appli-"); + if (!afudb) { + ERROR("afm_udb_create failed"); + return 1; + } +#endif /* daemonize if requested */ if (daemon && daemonize()) { @@ -486,7 +684,7 @@ int main(int ac, char **av) ERROR("can't create event loop"); return 1; } - rc = sd_bus_open_system(&sysbus); + rc = open_bus(&sysbus, 0, sys_bus_addr); if (rc < 0) { ERROR("can't create system bus"); return 1; @@ -496,7 +694,7 @@ int main(int ac, char **av) ERROR("can't attach system bus to event loop"); return 1; } - rc = sd_bus_open_user(&usrbus); + rc = open_bus(&usrbus, 1, usr_bus_addr); if (rc < 0) { ERROR("can't create user bus"); return 1; @@ -531,18 +729,22 @@ int main(int ac, char **av) 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, "once", on_once, NULL) || jbus_add_service_j(user_bus, "terminate", on_terminate, NULL) + || jbus_add_service_j(user_bus, "pause", on_pause, NULL) + || jbus_add_service_j(user_bus, "resume", on_resume, 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) #if defined(EXPLICIT_CALL) || jbus_add_service_s(user_bus, "install", on_install, NULL) - || jbus_add_service_s(user_bus, "uninstall", on_uninstall, NULL)) { + || jbus_add_service_s(user_bus, "uninstall", on_uninstall, NULL) #else || 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")) { + || jbus_add_service_s(user_bus, "uninstall", (void (*)(struct sd_bus_message *, const char *, void *))propagate, "uninstall") #endif + ) { ERROR("adding services failed"); return 1; }