Fixed Plugin.private bug, added "no session mode" fixed plugin API

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

diff --git a/src/main.c b/src/main.c
index 89b7023..8a4532d 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -72,9 +72,10 @@ static sigjmp_buf exitPoint; // context save for set/longjmp
  #define SET_CONFIG_EXIT    138
 
  #define SET_SMACK          140
- #define SET_PLUGINS        141
- #define SET_APITIMEOUT     142
- #define SET_CNTXTIMEOUT    143
+ #define SET_AUTH_TOKEN     141
+ #define SET_PLUGINS        142
+ #define SET_APITIMEOUT     143
+ #define SET_CNTXTIMEOUT    144
 
  #define DISPLAY_VERSION    150
  #define DISPLAY_HELP       151
@@ -108,6 +109,7 @@ static  AFB_options cliOptions [] = {
 
   {SET_SMACK        ,1,"smack"           , "Set Smack Label [default demo]"},
   {SET_PLUGINS      ,1,"mods"            , "Enable module [default all]"},
+  {SET_AUTH_TOKEN   ,1,"token"           , "Initial Secret [default=non]"},
   
   {DISPLAY_VERSION  ,0,"version"         , "Display version and copyright"},
   {DISPLAY_HELP     ,0,"help"            , "Display this help"},
@@ -157,7 +159,7 @@ void signalQuit (int signum) {
          fprintf (stderr,"  --%-15s %s\n", command, cliOptions[ind].help);
       }
     }
-    fprintf (stderr,"Example:\n  %s\\\n  --verbose --port=1234 --smack=xxxx --mods=alsa:dbus\n", name);
+    fprintf (stderr,"Example:\n  %s\\\n  --verbose --port=1234 --smack=xxxx --token='azerty' --mods=alsa:dbus\n", name);
 } // end printHelp
 
 /*----------------------------------------------------------
@@ -348,6 +350,11 @@ int main(int argc, char *argv[])  {
        cliconfig.smack   = optarg;
        break;
 
+    case SET_AUTH_TOKEN:
+       if (optarg == 0) goto needValueForOption;
+       cliconfig.token   = optarg;
+       break;
+
     case SET_PLUGINS:
        if (optarg == 0) goto needValueForOption;
        fprintf (stderr, "Not Implemented yet\n");
@@ -427,11 +434,10 @@ int main(int argc, char *argv[])  {
 
   }
   }
-  // Create session config
-  configInit (/* session & config are initialized globally */);
-
+ 
   // if exist merge config file with CLI arguments
   configLoadFile  (session, &cliconfig);
+  initPlugins(session);
 
   // ------------------ sanity check ----------------------------------------
   if  ((session->background) && (session->foreground)) {