X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fmain.c;h=1c85411a87217c530c5cb82f9ea617e56fa09ee5;hb=8d322ebdd04d6de2d5649626bbc23aae0d0ed556;hp=9fbbb072d7ae17f23afb4524813fbf1ac1e52530;hpb=84e049cf2312286ad1895cbebc82cabd5c30b9bb;p=src%2Fapp-framework-binder.git diff --git a/src/main.c b/src/main.c index 9fbbb072..1c85411a 100644 --- a/src/main.c +++ b/src/main.c @@ -28,6 +28,9 @@ #include #include +#include + +#include #include "afb-config.h" #include "afb-hswitch.h" @@ -38,14 +41,18 @@ #include "afb-hsrv.h" #include "afb-context.h" #include "afb-hreq.h" -#include "afb-sig-handler.h" -#include "afb-thread.h" +#include "jobs.h" #include "afb-session.h" #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; @@ -92,9 +99,11 @@ static void start_list(struct afb_config_list *list, +--------------------------------------------------------- */ static void exit_handler() { - if (childpid > 0) + /* TODO: check whether using SIGHUP isn't better */ + if (SELF_PGROUP) + killpg(0, SIGKILL); + else if (childpid > 0) killpg(childpid, SIGKILL); - /* TODO: check whether using SIGHUP isn't better */ } /*---------------------------------------------------------- @@ -194,8 +203,8 @@ 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; } @@ -212,8 +221,7 @@ static struct afb_hsrv *start_http_server() 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); @@ -239,7 +247,8 @@ static void on_sigchld(int signum, siginfo_t *info, void *uctx) case CLD_KILLED: case CLD_DUMPED: childpid = 0; - killpg(info->si_pid, SIGKILL); + if (!SELF_PGROUP) + killpg(info->si_pid, SIGKILL); waitpid(info->si_pid, NULL, 0); exit(0); } @@ -255,52 +264,83 @@ static void on_sigchld(int signum, siginfo_t *info, void *uctx) #define SUBST_CHAR '@' #define SUBST_STR "@" -static int instanciate_command_args() +static char *instanciate_string(char *arg, const char *port, const char *token) { - 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; - } + char *resu, *it, *wr; + int chg, dif; + + /* get the changes */ + chg = 0; + dif = 0; + it = strchrnul(arg, SUBST_CHAR); + while (*it) { + switch(*++it) { + case 'p': chg++; dif += (int)strlen(port) - 2; break; + case 't': chg++; dif += (int)strlen(token) - 2; break; + case SUBST_CHAR: it++; chg++; dif--; break; + default: break; + } + it = strchrnul(it, SUBST_CHAR); + } + + /* return arg when no change */ + if (!chg) + return arg; + + /* allocates the result */ + resu = malloc((it - arg) + dif + 1); + if (!resu) { + ERROR("out of memory"); + return NULL; + } + + /* instanciate the arguments */ + wr = resu; + for (;;) { + it = strchrnul(arg, SUBST_CHAR); + wr = mempcpy(wr, arg, it - arg); + if (!*it) + break; + switch(*++it) { + case 'p': wr = stpcpy(wr, port); break; + case 't': wr = stpcpy(wr, token); break; + default: *wr++ = SUBST_CHAR; + case SUBST_CHAR: *wr++ = *it; } + arg = ++it; + } + + *wr = 0; + return resu; +} + +static int instanciate_environ(const char *port, const char *token) +{ + extern char **environ; + char *repl; + int i; + + /* instanciate the environment */ + for (i = 0 ; environ[i] ; i++) { + repl = instanciate_string(environ[i], port, token); + if (!repl) + return -1; + environ[i] = repl; + } + return 0; +} + +static int instanciate_command_args(const char *port, const char *token) +{ + char *repl; + int i; + + /* instanciate the arguments */ + for (i = 0 ; config->exec[i] ; i++) { + repl = instanciate_string(config->exec[i], port, token); + if (!repl) + return -1; + config->exec[i] = repl; } return 0; } @@ -308,11 +348,16 @@ static int instanciate_command_args() static int execute_command() { struct sigaction siga; + char port[20]; + int rc; /* 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; @@ -324,122 +369,134 @@ static int execute_command() if (childpid) return 0; - /* makes arguments */ - if (instanciate_command_args() >= 0) { - setpgid(0, 0); - execv(config->exec[0], config->exec); - ERROR("can't launch %s: %m", config->exec[0]); + /* compute the string for port */ + if (config->httpdPort) + rc = snprintf(port, sizeof port, "%d", config->httpdPort); + else + rc = snprintf(port, sizeof port, "%cp", SUBST_CHAR); + if (rc < 0 || rc >= (int)(sizeof port)) { + ERROR("port->txt failed"); + } + else { + /* instanciate arguments and environment */ + if (instanciate_command_args(port, config->token) >= 0 + && instanciate_environ(port, config->token) >= 0) { + /* run */ + 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 + | job for starting the daemon +--------------------------------------------------------- */ -int main(int argc, char *argv[]) +static void start() { struct afb_hsrv *hsrv; - struct sd_event *eventloop; - - LOGAUTH("afb-daemon"); - - // ------------- Build session handler & init config ------- - config = afb_config_parse_arguments(argc, argv); - atexit(exit_handler); // ------------------ sanity check ---------------------------------------- if (config->httpdPort <= 0) { ERROR("no port is defined"); - exit(1); + goto error; } - afb_session_init(config->nbSessionMax, config->cntxTimeout, config->token, afb_apis_count()); + mkdir(config->workdir, S_IRWXU | S_IRGRP | S_IXGRP); + if (chdir(config->workdir) < 0) { + ERROR("Can't enter working dir %s", config->workdir); + goto error; + } 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"); + + afb_session_init(config->nbSessionMax, config->cntxTimeout, config->token); + 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); + goto error; } - if (afb_sig_handler_init() < 0) { - 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; - } - - if (afb_thread_init(3, 1, 20) < 0) { - ERROR("failed to initialise threading"); - return 1; + goto error; } - // let's run this program with a low priority - nice(20); - - // ------------------ Finaly Process Commands ----------------------------- - // let's not take the risk to run as ROOT - //if (getuid() == 0) goto errorNoRoot; DEBUG("Init config done"); - // --------- run ----------- - if (config->background) { - // --------- in background mode ----------- - INFO("entering background mode"); - daemonize(); - } else { - // ---- in foreground mode -------------------- - INFO("entering foreground mode"); - } - - /* ignore any SIGPIPE */ - signal(SIGPIPE, SIG_IGN); - /* install trace of requests */ if (config->tracereq) afb_hook_req_create(NULL, NULL, NULL, config->tracereq, NULL, NULL); /* start the services */ if (afb_apis_start_all_services(1) < 0) - exit(1); + goto error; /* start the HTTP server */ if (!config->noHttpd) { hsrv = start_http_server(); if (hsrv == NULL) - exit(1); + goto error; } /* run the command */ if (execute_command() < 0) - exit(1); + goto error; + + /* ready */ + sd_notify(1, "READY=1"); + return; +error: + exit(1); +} +/*--------------------------------------------------------- + | main + | Parse option and launch action + +--------------------------------------------------------- */ - /* signal that ready */ - if (config->readyfd != 0) { - static const char readystr[] = "READY=1"; - write(config->readyfd, readystr, sizeof(readystr) - 1); - close(config->readyfd); +int main(int argc, char *argv[]) +{ + // let's run this program with a low priority + nice(20); + + LOGAUTH("afb-daemon"); + + sd_fds_init(); + + // ------------- Build session handler & init config ------- + config = afb_config_parse_arguments(argc, argv); + + // --------- run ----------- + if (config->background) { + // --------- in background mode ----------- + INFO("entering background mode"); + daemonize(); + } else { + // ---- in foreground mode -------------------- + INFO("entering foreground mode"); } - // infinite loop - eventloop = afb_common_get_event_loop(); - for (;;) - sd_event_run(eventloop, 30000000); + /* handle groups */ +// atexit(exit_handler); - WARNING("hoops returned from infinite loop [report bug]"); + /* ignore any SIGPIPE */ + signal(SIGPIPE, SIG_IGN); - return 0; + /* enter job processing */ + jobs_start(3, 0, 50, start); + WARNING("hoops returned from jobs_enter! [report bug]"); + return 1; } +