-/*
- * Copyright (C) 2015 "IoT.bzh"
+/*
+ * Copyright (C) 2015, 2016, 2017 "IoT.bzh"
* Author "Fulup Ar Foll"
* Author José Bollo <jose.bollo@iot.bzh>
*
*/
#define _GNU_SOURCE
+#define NO_BINDING_VERBOSE_MACRO
#include <stdlib.h>
#include <stdio.h>
#include "afb-apis.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-sig-handler.h"
+#include "afb-thread.h"
#include "session.h"
#include "verbose.h"
#include "afb-common.h"
+#include "afb-hook.h"
-#include "afb-plugin.h"
+#include <afb/afb-binding.h>
-#if !defined(PLUGIN_INSTALL_DIR)
-#error "you should define PLUGIN_INSTALL_DIR"
+#if !defined(BINDING_INSTALL_DIR)
+#error "you should define BINDING_INSTALL_DIR"
#endif
-#define AFB_VERSION "0.4"
+#define TRACEREQ_NO 0
+#define TRACEREQ_COMMON 1
+#define TRACEREQ_EXTRA 2
+#define TRACEREQ_ALL 3
+
+#define AFB_VERSION "0.5"
// Define command line option
#define SET_VERBOSE 1
#define DBUS_CLIENT 20
#define DBUS_SERVICE 21
-#define SO_PLUGIN 22
+#define SO_BINDING 22
+
+#define SET_SESSIONMAX 23
+
+#define WS_CLIENT 24
+#define WS_SERVICE 25
+
+#define SET_ROOT_HTTP 26
+
+#define SET_TRACEREQ 27
// Command line structure hold cli --command + help text
typedef struct {
// Supported option
static AFB_options cliOptions [] = {
- {SET_VERBOSE ,0,"verbose" , "Verbose Mode"},
+ {SET_VERBOSE ,0,"verbose" , "Verbose Mode, repeat to increase verbosity"},
{SET_FORGROUND ,0,"foreground" , "Get all in foreground mode"},
{SET_BACKGROUND ,0,"daemon" , "Get all in background mode"},
{SET_TCP_PORT ,1,"port" , "HTTP listening TCP port [default 1234]"},
- {SET_ROOT_DIR ,1,"rootdir" , "HTTP Root Directory [default $HOME/.AFB]"},
+ {SET_ROOT_DIR ,1,"rootdir" , "Root Directory [default $HOME/.AFB]"},
+ {SET_ROOT_HTTP ,1,"roothttp" , "HTTP Root Directory [default rootdir]"},
{SET_ROOT_BASE ,1,"rootbase" , "Angular Base Root URL [default /opa]"},
{SET_ROOT_API ,1,"rootapi" , "HTML Root API URL [default /api]"},
{SET_ALIAS ,1,"alias" , "Muliple url map outside of rootdir [eg: --alias=/icons:/usr/share/icons]"},
-
- {SET_APITIMEOUT ,1,"apitimeout" , "Plugin API timeout in seconds [default 10]"},
+
+ {SET_APITIMEOUT ,1,"apitimeout" , "Binding API timeout in seconds [default 10]"},
{SET_CNTXTIMEOUT ,1,"cntxtimeout" , "Client Session Context Timeout [default 900]"},
- {SET_CACHE_TIMEOUT,1,"cache-eol" , "Client cache end of live [default 3600s]"},
-
+ {SET_CACHE_TIMEOUT,1,"cache-eol" , "Client cache end of live [default 3600]"},
+
{SET_SESSION_DIR ,1,"sessiondir" , "Sessions file path [default rootdir/sessions]"},
- {SET_LDPATH ,1,"ldpaths" , "Load Plugins from dir1:dir2:... [default = PLUGIN_INSTALL_DIR"},
+ {SET_LDPATH ,1,"ldpaths" , "Load bindingss from dir1:dir2:... [default = "BINDING_INSTALL_DIR"]"},
{SET_AUTH_TOKEN ,1,"token" , "Initial Secret [default=no-session, --token="" for session without authentication]"},
-
+
{DISPLAY_VERSION ,0,"version" , "Display version and copyright"},
{DISPLAY_HELP ,0,"help" , "Display this help"},
{DBUS_CLIENT ,1,"dbus-client" , "bind to an afb service through dbus"},
{DBUS_SERVICE ,1,"dbus-server" , "provides an afb service through dbus"},
- {SO_PLUGIN ,1,"plugin" , "load the plugin of path"},
+ {WS_CLIENT ,1,"ws-client" , "bind to an afb service through websocket"},
+ {WS_SERVICE ,1,"ws-server" , "provides an afb service through websockets"},
+ {SO_BINDING ,1,"binding" , "load the binding of path"},
+
+ {SET_SESSIONMAX ,1,"session-max" , "max count of session simultaneously [default 10]"},
+
+ {SET_TRACEREQ ,1,"tracereq" , "log the requests: no, common, extra, all"},
{0, 0, NULL, NULL}
};
fprintf(file, "\n----------------------------------------- \n");
fprintf(file, " AFB [Application Framework Binder] version=%s |\n", AFB_VERSION);
fprintf(file, " \n");
- fprintf(file, " Copyright(C) 2016 /IoT.bzh [fulup -at- iot.bzh]\n");
+ fprintf(file, " Copyright (C) 2015, 2016, 2017 \"IoT.bzh\" [fulup -at- iot.bzh]\n");
fprintf(file, " AFB comes with ABSOLUTELY NO WARRANTY.\n");
fprintf(file, " Licence Apache 2\n\n");
exit (0);
fprintf (file, " --%-15s %s\n", command, cliOptions[ind].help);
}
}
- fprintf (file, "Example:\n %s\\\n --verbose --port=1234 --token='azerty' --ldpaths=build/plugins:/usr/lib64/agl/plugins\n", name);
+ fprintf (file, "Example:\n %s\\\n --verbose --port=1234 --token='azerty' --ldpaths=build/bindings:/usr/lib64/agl/bindings\n", name);
}
// load config from disk and merge with CLI option
// default HTTP port
if (config->httpdPort == 0)
config->httpdPort = 1234;
-
- // default Plugin API timeout
+
+ // default binding API timeout
if (config->apiTimeout == 0)
config->apiTimeout = DEFLT_API_TIMEOUT;
-
+
// default AUTH_TOKEN
if (config->token == NULL)
config->token = DEFLT_AUTH_TOKEN;
if (config->cntxTimeout == 0)
config->cntxTimeout = DEFLT_CNTX_TIMEOUT;
+ // max count of sessions
+ if (config->nbSessionMax == 0)
+ config->nbSessionMax = CTX_NBCLIENTS;
+
if (config->rootdir == NULL) {
config->rootdir = getenv("AFBDIR");
if (config->rootdir == NULL) {
// if directory does not exist createit
mkdir (config->rootdir, O_RDWR | S_IRWXU | S_IRGRP);
}
-
+
// if no Angular/HTML5 rootbase let's try '/' as default
if (config->rootbase == NULL)
config->rootbase = "/opa";
-
+
if (config->rootapi == NULL)
config->rootapi = "/api";
if (config->ldpaths == NULL)
- config->ldpaths = PLUGIN_INSTALL_DIR;
+ config->ldpaths = BINDING_INSTALL_DIR;
// if no session dir create a default path from rootdir
if (config->sessiondir == NULL) {
if (optarg == 0) goto needValueForOption;
if (!sscanf (optarg, "%d", &config->httpdPort)) goto notAnInteger;
break;
-
+
case SET_APITIMEOUT:
if (optarg == 0) goto needValueForOption;
if (!sscanf (optarg, "%d", &config->apiTimeout)) goto notAnInteger;
if (optarg == 0) goto needValueForOption;
config->rootdir = optarg;
INFO("Forcing Rootdir=%s",config->rootdir);
- break;
-
+ break;
+
+ case SET_ROOT_HTTP:
+ if (optarg == 0) goto needValueForOption;
+ config->roothttp = optarg;
+ INFO("Forcing Root HTTP=%s",config->roothttp);
+ break;
+
case SET_ROOT_BASE:
if (optarg == 0) goto needValueForOption;
config->rootbase = optarg;
config->rootapi = optarg;
INFO("Forcing Rootapi=%s",config->rootapi);
break;
-
+
case SET_ALIAS:
if (optarg == 0) goto needValueForOption;
if ((unsigned)config->aliascount < sizeof (config->aliasdir) / sizeof (config->aliasdir[0])) {
}
} else {
ERROR("Too many aliases [max:%d] %s ignored", MAX_ALIAS, optarg);
- }
+ }
break;
-
+
case SET_AUTH_TOKEN:
if (optarg == 0) goto needValueForOption;
config->token = optarg;
if (!sscanf (optarg, "%d", &config->cacheTimeout)) goto notAnInteger;
break;
+ case SET_SESSIONMAX:
+ if (optarg == 0) goto needValueForOption;
+ if (!sscanf (optarg, "%d", &config->nbSessionMax)) goto notAnInteger;
+ break;
+
case SET_FORGROUND:
if (optarg != 0) goto noValueForOption;
config->background = 0;
case DBUS_CLIENT:
case DBUS_SERVICE:
- case SO_PLUGIN:
+ case WS_CLIENT:
+ case WS_SERVICE:
+ case SO_BINDING:
if (optarg == 0) goto needValueForOption;
add_item(config, optc, optarg);
break;
+ case SET_TRACEREQ:
+ if (optarg == 0) goto needValueForOption;
+ if (!strcmp(optarg, "no")) config->tracereq = TRACEREQ_NO;
+ else if (!strcmp(optarg, "common")) config->tracereq = TRACEREQ_COMMON;
+ else if (!strcmp(optarg, "extra")) config->tracereq = TRACEREQ_EXTRA;
+ else if (!strcmp(optarg, "all")) config->tracereq = TRACEREQ_ALL;
+ else goto badMode;
+ break;
+
case DISPLAY_VERSION:
if (optarg != 0) goto noValueForOption;
printVersion(stdout);
}
}
free(gnuOptions);
-
+
config_set_default (config);
return;
+--------------------------------------------------------- */
static int init_http_server(struct afb_hsrv *hsrv, struct afb_config * config)
{
- int idx;
+ int idx, dfd;
+
+ dfd = afb_common_rootdir_get_fd();
if (!afb_hsrv_add_handler(hsrv, config->rootapi, afb_hswitch_websocket_switch, NULL, 20))
return 0;
return 0;
for (idx = 0; idx < config->aliascount; idx++)
- if (!afb_hsrv_add_alias (hsrv, config->aliasdir[idx].url, config->aliasdir[idx].path, 0))
+ if (!afb_hsrv_add_alias (hsrv, config->aliasdir[idx].url, dfd, config->aliasdir[idx].path, 0, 0))
return 0;
- if (!afb_hsrv_add_alias(hsrv, "", config->rootdir, -10))
- return 0;
+ if (config->roothttp != NULL) {
+ if (!afb_hsrv_add_alias(hsrv, "", dfd, config->roothttp, -10, 1))
+ return 0;
+ }
if (!afb_hsrv_add_handler(hsrv, config->rootbase, afb_hswitch_one_page_api_redirect, NULL, -20))
return 0;
exit(1);
}
break;
- case SO_PLUGIN:
- if (afb_api_so_add_plugin(item->value) < 0) {
- ERROR("can't start the plugin of path %s",item->value);
+ case WS_CLIENT:
+ if (afb_api_ws_add_client(item->value) < 0) {
+ ERROR("can't start the afb-websocket client of path %s",item->value);
+ exit(1);
+ }
+ break;
+ case WS_SERVICE:
+ if (afb_api_ws_add_server(item->value) < 0) {
+ ERROR("can't start the afb-websocket service of path %s",item->value);
+ exit(1);
+ }
+ break;
+ case SO_BINDING:
+ if (afb_api_so_add_binding(item->value) < 0) {
+ ERROR("can't start the binding of path %s",item->value);
exit(1);
}
break;
exit (1);
}
- if (config->ldpaths)
- afb_api_so_add_pathset(config->ldpaths);
+ 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);
+ }
+ }
start_items(config->items);
config->items = NULL;
- ctxStoreInit(CTX_NBCLIENTS, config->cntxTimeout, config->token, afb_apis_count());
+ ctxStoreInit(config->nbSessionMax, config->cntxTimeout, config->token, afb_apis_count());
if (!afb_hreq_init_cookie(config->httpdPort, config->rootapi, DEFLT_CNTX_TIMEOUT)) {
ERROR("initialisation of cookies failed");
exit (1);
}
if (afb_sig_handler_init() < 0) {
- ERROR("main fail to initialise signal handlers");
+ ERROR("failed to initialise signal handlers");
+ return 1;
+ }
+
+ 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;
}
INFO("entering foreground mode");
}
+ /* ignore any SIGPIPE */
+ signal(SIGPIPE, SIG_IGN);
+
+ /* install trace of requests */
+ switch(config->tracereq) {
+ default:
+ case TRACEREQ_NO:
+ break;
+ case TRACEREQ_COMMON:
+ afb_hook_req_create(NULL, NULL, NULL, afb_hook_flags_req_common, NULL, NULL);
+ break;
+ case TRACEREQ_EXTRA:
+ afb_hook_req_create(NULL, NULL, NULL, afb_hook_flags_req_extra, NULL, NULL);
+ break;
+ case TRACEREQ_ALL:
+ afb_hook_req_create(NULL, NULL, NULL, afb_hook_flags_req_all, NULL, NULL);
+ break;
+ }
+
+ /* 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);
+
if (config->readyfd != 0) {
static const char readystr[] = "READY=1";
write(config->readyfd, readystr, sizeof(readystr) - 1);
Code Review / src / app-framework-binder.git / blobdiff