work in progress

[src/app-framework-binder.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index b42f2ab..2401043 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -16,17 +16,25 @@
  * limitations under the License.
  */
 
-#include <syslog.h>
+#define _GNU_SOURCE
+#include <stdio.h>
+#include <string.h>
+#include <getopt.h>
 #include <setjmp.h>
 #include <signal.h>
-#include <getopt.h>
-#include <pwd.h>
-#include <pthread.h>
+#include <syslog.h>
+#include <fcntl.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 
+/*
+#include <pwd.h>
+#include <pthread.h>
+*/
+
 #include "local-def.h"
 #include "afb-apis.h"
+#include "session.h"
 
 #if !defined(PLUGIN_INSTALL_DIR)
 #error "you should define PLUGIN_INSTALL_DIR"
@@ -426,10 +434,10 @@ static void signalError(int signum)
        sigset_t sigset;
 
        // unlock signal to allow a new signal to come
-       sigemptyset(&sigset);
-       sigaddset(&sigset, signum);
-       sigprocmask(SIG_UNBLOCK, &sigset, 0);
        if (error_handler != NULL) {
+               sigemptyset(&sigset);
+               sigaddset(&sigset, signum);
+               sigprocmask(SIG_UNBLOCK, &sigset, 0);
                longjmp(*error_handler, signum);
        }
 }
@@ -548,7 +556,7 @@ int main(int argc, char *argv[])  {
   if (session->config->ldpaths) 
     afb_apis_add_pathset(session->config->ldpaths);
 
-  ctxStoreInit(CTX_NBCLIENTS);
+  ctxStoreInit(CTX_NBCLIENTS, session->config->cntxTimeout, afb_apis_count(), session->config->token);
 
   install_error_handlers();