X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fmain.c;h=f1ebd969ac2b751175b6dac490374cef4156d933;hb=e2c431bcda7f057b4767c3e8142b9e0ca0d32bc6;hp=62db31707ec36938ed5599ceec6ae1d11b0d7eb4;hpb=0af860df66cded39478fd6690dea4ce0f8b7c799;p=src%2Fapp-framework-binder.git diff --git a/src/main.c b/src/main.c index 62db3170..f1ebd969 100644 --- a/src/main.c +++ b/src/main.c @@ -25,8 +25,12 @@ #include #include #include +#include #include +#include + +#include #include "afb-config.h" #include "afb-hswitch.h" @@ -43,8 +47,16 @@ #include "verbose.h" #include "afb-common.h" #include "afb-hook.h" +#include "sd-fds.h" -#include +/* + if SELF_PGROUP == 0 the launched command is the group leader + if SELF_PGROUP != 0 afb-daemon is the group leader +*/ +#define SELF_PGROUP 1 + +static struct afb_config *config; +static pid_t childpid; /*---------------------------------------------------------- | helpers for handling list of arguments @@ -83,19 +95,23 @@ static void start_list(struct afb_config_list *list, } /*---------------------------------------------------------- - | closeSession - | try to close everything before leaving + | exit_handler + | Handles on exit specific actions +--------------------------------------------------------- */ -static void closeSession(int status, void *data) +static void exit_handler() { - /* struct afb_config *config = data; */ + /* TODO: check whether using SIGHUP isn't better */ + if (SELF_PGROUP) + killpg(0, SIGKILL); + else if (childpid > 0) + killpg(childpid, SIGKILL); } /*---------------------------------------------------------- | daemonize | set the process in background +--------------------------------------------------------- */ -static void daemonize(struct afb_config *config) +static void daemonize() { int consoleFD; int pid; @@ -155,7 +171,7 @@ static int init_alias(void *closure, char *spec) 0, 0); } -static int init_http_server(struct afb_hsrv *hsrv, struct afb_config *config) +static int init_http_server(struct afb_hsrv *hsrv) { if (!afb_hsrv_add_handler (hsrv, config->rootapi, afb_hswitch_websocket_switch, NULL, 20)) @@ -183,13 +199,13 @@ static int init_http_server(struct afb_hsrv *hsrv, struct afb_config *config) return 1; } -static struct afb_hsrv *start_http_server(struct afb_config *config) +static struct afb_hsrv *start_http_server() { int rc; struct afb_hsrv *hsrv; - if (afb_hreq_init_download_path("/tmp")) { /* TODO: sessiondir? */ - ERROR("unable to set the tmp directory"); + if (afb_hreq_init_download_path(config->uploaddir)) { + ERROR("unable to set the upload directory %s", config->uploaddir); return NULL; } @@ -200,14 +216,13 @@ static struct afb_hsrv *start_http_server(struct afb_config *config) } if (!afb_hsrv_set_cache_timeout(hsrv, config->cacheTimeout) - || !init_http_server(hsrv, config)) { + || !init_http_server(hsrv)) { ERROR("initialisation of httpd failed"); afb_hsrv_put(hsrv); return NULL; } - NOTICE("Waiting port=%d rootdir=%s", config->httpdPort, - config->rootdir); + NOTICE("Waiting port=%d rootdir=%s", config->httpdPort, config->rootdir); NOTICE("Browser URL= http:/*localhost:%d", config->httpdPort); rc = afb_hsrv_start(hsrv, (uint16_t) config->httpdPort, 15); @@ -220,6 +235,119 @@ static struct afb_hsrv *start_http_server(struct afb_config *config) return hsrv; } +/*--------------------------------------------------------- + | execute_command + | + +--------------------------------------------------------- */ + +static void on_sigchld(int signum, siginfo_t *info, void *uctx) +{ + if (info->si_pid == childpid) { + switch (info->si_code) { + case CLD_EXITED: + case CLD_KILLED: + case CLD_DUMPED: + childpid = 0; + if (!SELF_PGROUP) + killpg(info->si_pid, SIGKILL); + waitpid(info->si_pid, NULL, 0); + exit(0); + } + } +} + +/* +# @@ @ +# @p port +# @t token +*/ + +#define SUBST_CHAR '@' +#define SUBST_STR "@" + +static int instanciate_command_args() +{ + char *orig, *repl, *sub, *val, port[20]; + int i, rc, r; + size_t s, l; + + rc = snprintf(port, sizeof port, "%d", config->httpdPort); + if (rc < 0 || rc >= (int)(sizeof port)) + return -1; + + for (i = 0 ; (orig = config->exec[i]) ; i++) { + repl = 0; + s = 0; + for(;;) { + sub = strchrnul(orig, SUBST_CHAR); + l = sub - orig; + if (repl) + repl = mempcpy(repl, orig, l); + else + s += l; + if (!*sub) { + /* at end */ + if (repl || orig == config->exec[i]) + break; + repl = malloc(1 + s); + if (!repl) + return -1; + orig = config->exec[i]; + config->exec[i] = repl; + repl[s] = 0; + } else { + r = 2; + switch(sub[1]) { + case 'p': val = port; break; + case 't': val = config->token ? : ""; break; + default: r = 1; + case SUBST_CHAR: val = SUBST_STR; break; + } + orig = &sub[r]; + l = strlen(val); + if (repl) + repl = mempcpy(repl, val, l); + else + s += l; + } + } + } + return 0; +} + +static int execute_command() +{ + struct sigaction siga; + + /* check whether a command is to execute or not */ + if (!config->exec || !config->exec[0]) + return 0; + + if (SELF_PGROUP) + setpgid(0, 0); + + /* install signal handler */ + memset(&siga, 0, sizeof siga); + siga.sa_sigaction = on_sigchld; + siga.sa_flags = SA_SIGINFO; + sigaction(SIGCHLD, &siga, NULL); + + /* fork now */ + childpid = fork(); + if (childpid) + return 0; + + /* makes arguments */ + if (instanciate_command_args() >= 0) { + if (!SELF_PGROUP) + setpgid(0, 0); + execv(config->exec[0], config->exec); + ERROR("can't launch %s: %m", config->exec[0]); + } + exit(1); + return -1; +} + /*--------------------------------------------------------- | main | Parse option and launch action @@ -228,14 +356,15 @@ static struct afb_hsrv *start_http_server(struct afb_config *config) int main(int argc, char *argv[]) { struct afb_hsrv *hsrv; - struct afb_config *config; struct sd_event *eventloop; LOGAUTH("afb-daemon"); + sd_fds_init(); + // ------------- Build session handler & init config ------- config = afb_config_parse_arguments(argc, argv); - on_exit(closeSession, config); + atexit(exit_handler); // ------------------ sanity check ---------------------------------------- if (config->httpdPort <= 0) { @@ -243,30 +372,24 @@ int main(int argc, char *argv[]) exit(1); } - afb_session_init(config->nbSessionMax, config->cntxTimeout, - config->token, afb_apis_count()); - - afb_api_so_set_timeout(config->apiTimeout); - if (config->ldpaths) { - if (afb_api_so_add_pathset(config->ldpaths) < 0) { - ERROR("initialisation of bindings within %s failed", - config->ldpaths); - exit(1); - } + mkdir(config->workdir, S_IRWXU | S_IRGRP | S_IXGRP); + if (chdir(config->workdir) < 0) { + ERROR("Can't enter working dir %s", config->workdir); + exit(1); } - start_list(config->dbus_clients, afb_api_dbus_add_client, - "the afb-dbus client"); - start_list(config->ws_clients, afb_api_ws_add_client, - "the afb-websocket client"); + afb_api_so_set_timeout(config->apiTimeout); + start_list(config->dbus_clients, afb_api_dbus_add_client, "the afb-dbus client"); + start_list(config->ws_clients, afb_api_ws_add_client, "the afb-websocket client"); + start_list(config->ldpaths, afb_api_so_add_pathset, "the binding path set"); start_list(config->so_bindings, afb_api_so_add_binding, "the binding"); - start_list(config->dbus_servers, afb_api_dbus_add_server, - "the afb-dbus service"); - start_list(config->ws_servers, afb_api_ws_add_server, - "the afb-websocket service"); - if (!afb_hreq_init_cookie - (config->httpdPort, config->rootapi, config->cntxTimeout)) { + afb_session_init(config->nbSessionMax, config->cntxTimeout, config->token, afb_apis_count()); + + start_list(config->dbus_servers, afb_api_dbus_add_server, "the afb-dbus service"); + start_list(config->ws_servers, afb_api_ws_add_server, "the afb-websocket service"); + + if (!afb_hreq_init_cookie(config->httpdPort, config->rootapi, config->cntxTimeout)) { ERROR("initialisation of cookies failed"); exit(1); } @@ -275,8 +398,8 @@ int main(int argc, char *argv[]) ERROR("failed to initialise signal handlers"); return 1; } - // if directory does not exist createit - mkdir(config->rootdir, O_RDWR | S_IRWXU | S_IRGRP); + + // set the root dir if (afb_common_rootdir_set(config->rootdir) < 0) { ERROR("failed to set common root directory"); return 1; @@ -299,7 +422,7 @@ int main(int argc, char *argv[]) if (config->background) { // --------- in background mode ----------- INFO("entering background mode"); - daemonize(config); + daemonize(); } else { // ---- in foreground mode -------------------- INFO("entering foreground mode"); @@ -312,22 +435,31 @@ int main(int argc, char *argv[]) if (config->tracereq) afb_hook_req_create(NULL, NULL, NULL, config->tracereq, NULL, NULL); - /* start the HTTP server */ - hsrv = start_http_server(config); - if (hsrv == NULL) - exit(1); - /* start the services */ if (afb_apis_start_all_services(1) < 0) exit(1); + /* start the HTTP server */ + if (!config->noHttpd) { + hsrv = start_http_server(); + if (hsrv == NULL) + exit(1); + } + + /* run the command */ + if (execute_command() < 0) + exit(1); + + /* signal that ready */ if (config->readyfd != 0) { static const char readystr[] = "READY=1"; write(config->readyfd, readystr, sizeof(readystr) - 1); close(config->readyfd); } + // infinite loop eventloop = afb_common_get_event_loop(); + sd_notify(1, "READY=1"); for (;;) sd_event_run(eventloop, 30000000);