*/
#define _GNU_SOURCE
-#define NO_BINDING_VERBOSE_MACRO
#include <stdlib.h>
#include <stdio.h>
+#include <stdint.h>
+#include <signal.h>
#include <string.h>
#include <unistd.h>
#include <fcntl.h>
#include <sys/stat.h>
#include <sys/wait.h>
+#if !defined(NO_CALL_PERSONALITY)
+#include <sys/personality.h>
+#endif
+
#include <json-c/json.h>
-#include <systemd/sd-event.h>
#include <systemd/sd-daemon.h>
-#include <afb/afb-binding.h>
-
#include "afb-config.h"
#include "afb-hswitch.h"
-#include "afb-apis.h"
+#include "afb-apiset.h"
#include "afb-api-so.h"
#include "afb-api-dbus.h"
#include "afb-api-ws.h"
#include "afb-hsrv.h"
-#include "afb-context.h"
#include "afb-hreq.h"
#include "afb-xreq.h"
#include "jobs.h"
#include "afb-session.h"
#include "verbose.h"
#include "afb-common.h"
+#include "afb-monitor.h"
#include "afb-hook.h"
#include "sd-fds.h"
+#include "afb-debug.h"
+#include "process-name.h"
/*
if SELF_PGROUP == 0 the launched command is the group leader
*/
#define SELF_PGROUP 1
+struct afb_apiset *main_apiset;
+
static struct afb_config *config;
static pid_t childpid;
static int run_start(void *closure, char *value)
{
- int (*starter) (const char *value) = closure;
- return starter(value) >= 0;
+ int (*starter) (const char *value, struct afb_apiset *apiset) = closure;
+ return starter(value, main_apiset) >= 0;
}
-static void start_list(struct afb_config_list *list,
- int (*starter) (const char *value), const char *message)
+static void apiset_start_list(struct afb_config_list *list,
+ int (*starter) (const char *value, struct afb_apiset *apiset), const char *message)
{
list = run_for_list(list, run_start, starter);
if (list) {
static int init_http_server(struct afb_hsrv *hsrv)
{
if (!afb_hsrv_add_handler
- (hsrv, config->rootapi, afb_hswitch_websocket_switch, NULL, 20))
+ (hsrv, config->rootapi, afb_hswitch_websocket_switch, main_apiset, 20))
return 0;
if (!afb_hsrv_add_handler
- (hsrv, config->rootapi, afb_hswitch_apis, NULL, 10))
+ (hsrv, config->rootapi, afb_hswitch_apis, main_apiset, 10))
return 0;
if (run_for_list(config->aliases, init_alias, hsrv))
/*---------------------------------------------------------
| execute_command
- |
+--------------------------------------------------------- */
static void on_sigchld(int signum, siginfo_t *info, void *uctx)
switch(*++it) {
case 'p': wr = stpcpy(wr, port); break;
case 't': wr = stpcpy(wr, token); break;
- default: *wr++ = SUBST_CHAR;
+ default: *wr++ = SUBST_CHAR; /*@fallthrough@*/
case SUBST_CHAR: *wr++ = *it;
}
arg = ++it;
{
struct sigaction siga;
char port[20];
+ const char *token;
int rc;
/* check whether a command is to execute or not */
}
else {
/* instanciate arguments and environment */
- if (instanciate_command_args(port, config->token) >= 0
- && instanciate_environ(port, config->token) >= 0) {
+ token = afb_session_initial_token();
+ if (instanciate_command_args(port, token) >= 0
+ && instanciate_environ(port, token) >= 0) {
/* run */
if (!SELF_PGROUP)
setpgid(0, 0);
struct afb_session *session;
};
-static void startup_call_reply(struct afb_xreq *xreq, int iserror, struct json_object *obj)
+static void startup_call_reply(struct afb_xreq *xreq, int status, struct json_object *obj)
{
struct startup_req *sreq = CONTAINER_OF_XREQ(struct startup_req, xreq);
- if (!iserror)
+ if (status >= 0)
NOTICE("startup call %s returned %s", sreq->current->value, json_object_get_string(obj));
else {
ERROR("startup call %s ERROR! %s", sreq->current->value, json_object_get_string(obj));
if (verb) {
json = strchr(verb, ':');
if (json) {
- memset(&sreq->xreq, 0, sizeof sreq->xreq);
afb_xreq_init(&sreq->xreq, &startup_xreq_itf);
afb_context_init(&sreq->xreq.context, sreq->session, NULL);
sreq->xreq.context.validated = 1;
sreq->api = strndup(api, verb - api);
sreq->verb = strndup(verb + 1, json - verb - 1);
- sreq->xreq.api = sreq->api;
- sreq->xreq.verb = sreq->verb;
+ sreq->xreq.request.api = sreq->api;
+ sreq->xreq.request.verb = sreq->verb;
sreq->xreq.json = json_tokener_parse(json + 1);
if (sreq->api && sreq->verb && sreq->xreq.json) {
- afb_apis_call(&sreq->xreq);
- afb_xreq_unref(&sreq->xreq);
+ afb_xreq_process(&sreq->xreq, main_apiset);
return;
}
}
| job for starting the daemon
+--------------------------------------------------------- */
-static void start()
+static void start(int signum)
{
struct afb_hsrv *hsrv;
+ afb_debug("start-entry");
+
+ if (signum) {
+ ERROR("start aborted: received signal %s", strsignal(signum));
+ exit(1);
+ }
+
// ------------------ sanity check ----------------------------------------
if (config->httpdPort <= 0) {
ERROR("no port is defined");
}
/* configure the daemon */
- afb_apis_set_timeout(config->apiTimeout);
afb_session_init(config->nbSessionMax, config->cntxTimeout, config->token);
if (!afb_hreq_init_cookie(config->httpdPort, config->rootapi, config->cntxTimeout)) {
ERROR("initialisation of cookies failed");
goto error;
}
+ main_apiset = afb_apiset_create("main", config->apiTimeout);
+ if (!main_apiset) {
+ ERROR("can't create main api set");
+ goto error;
+ }
+ if (afb_monitor_init() < 0) {
+ ERROR("failed to setup monitor");
+ goto error;
+ }
/* install hooks */
if (config->tracereq)
afb_hook_create_xreq(NULL, NULL, NULL, config->tracereq, NULL, NULL);
if (config->traceditf)
afb_hook_create_ditf(NULL, config->traceditf, NULL, NULL);
+ if (config->tracesvc)
+ afb_hook_create_svc(NULL, config->tracesvc, NULL, NULL);
+ if (config->traceevt)
+ afb_hook_create_evt(NULL, config->traceevt, NULL, NULL);
/* load bindings */
- 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_debug("start-load");
+ apiset_start_list(config->so_bindings, afb_api_so_add_binding, "the binding");
+ apiset_start_list(config->dbus_clients, afb_api_dbus_add_client, "the afb-dbus client");
+ apiset_start_list(config->ws_clients, afb_api_ws_add_client, "the afb-websocket client");
+ apiset_start_list(config->ldpaths, afb_api_so_add_pathset_fails, "the binding path set");
+ apiset_start_list(config->weak_ldpaths, afb_api_so_add_pathset_nofails, "the weak binding path set");
- 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");
+ apiset_start_list(config->dbus_servers, afb_api_dbus_add_server, "the afb-dbus service");
+ apiset_start_list(config->ws_servers, afb_api_ws_add_server, "the afb-websocket service");
DEBUG("Init config done");
/* start the services */
- if (afb_apis_start_all_services(1) < 0)
+ afb_debug("start-start");
+#if !defined(NO_CALL_PERSONALITY)
+ personality((unsigned long)-1L);
+#endif
+ if (afb_apiset_start_all_services(main_apiset, 1) < 0)
goto error;
/* start the HTTP server */
+ afb_debug("start-http");
if (!config->noHttpd) {
hsrv = start_http_server();
if (hsrv == NULL)
goto error;
}
+ /* run the startup calls */
+ afb_debug("start-call");
+ run_startup_calls();
+
/* run the command */
+ afb_debug("start-exec");
if (execute_command() < 0)
goto error;
/* ready */
sd_notify(1, "READY=1");
-
- /* run the startup calls */
- run_startup_calls();
return;
error:
exit(1);
int main(int argc, char *argv[])
{
+ afb_debug("main-entry");
+
// let's run this program with a low priority
nice(20);
// ------------- Build session handler & init config -------
config = afb_config_parse_arguments(argc, argv);
- INFO("running with pid %d", getpid());
+ if (config->name) {
+ verbose_set_name(config->name, 0);
+ process_name_set_name(config->name);
+ process_name_replace_cmdline(argv, config->name);
+ }
+ afb_debug("main-args");
// --------- run -----------
if (config->background) {
// ---- in foreground mode --------------------
INFO("entering foreground mode");
}
+ INFO("running with pid %d", getpid());
/* set the daemon environment */
setup_daemon();
+ afb_debug("main-start");
+
/* enter job processing */
jobs_start(3, 0, 50, start);
WARNING("hoops returned from jobs_enter! [report bug]");
Code Review / src / app-framework-binder.git / blobdiff