X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fmain.c;h=df35d88dbdf14ce172ae0d1760359856da37fff3;hb=62ae98a8b627d356b5d22da0b32aa116244ac2f6;hp=6ec392a275d6cb2cec0b5534c46fbc167f93f671;hpb=3e56dc3fc7ce31cb932fbd86e78eea02049d0b7e;p=src%2Fapp-framework-binder.git diff --git a/src/main.c b/src/main.c index 6ec392a2..df35d88d 100644 --- a/src/main.c +++ b/src/main.c @@ -283,7 +283,6 @@ static struct afb_hsrv *start_http_server() /*--------------------------------------------------------- | execute_command - | +--------------------------------------------------------- */ static void on_sigchld(int signum, siginfo_t *info, void *uctx) @@ -505,8 +504,8 @@ static void startup_call_current(struct startup_req *sreq) 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_xreq_process(&sreq->xreq, main_apiset); @@ -526,7 +525,7 @@ static void run_startup_calls() list = config->calls; if (list) { sreq = calloc(1, sizeof *sreq); - sreq->session = afb_session_create("startup", 3600); + sreq->session = afb_session_create(3600); sreq->current = list; startup_call_current(sreq); } @@ -594,7 +593,7 @@ static void start(int signum) 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->ws_clients, afb_api_ws_add_client_weak, "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");