Checkpoint commit: refactoring the request code in TIDS for better reuse

[trust_router.git] / tr / tr_main.c

diff --git a/tr/tr_main.c b/tr/tr_main.c
index 1f2e2de..86fb8a9 100644 (file)
--- a/tr/tr_main.c
+++ b/tr/tr_main.c
@@ -34,13 +34,10 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <jansson.h>
 #include <argp.h>
 #include <event2/event.h>
 #include <talloc.h>
-#include <sys/time.h>
 #include <signal.h>
-#include <pthread.h>
 
 #include <tid_internal.h>
 #include <tr_tid.h>
@@ -55,6 +52,11 @@
 
 /***** command-line option handling / setup *****/
 
+static void print_version_info(void)
+{
+  printf("Moonshot Trust Router %s\n\n", PACKAGE_VERSION);
+}
+
 /* Strip trailing / from a path name.*/
 static void remove_trailing_slash(char *s) {
   size_t n;
@@ -69,19 +71,21 @@ static void remove_trailing_slash(char *s) {
 const char *argp_program_bug_address=PACKAGE_BUGREPORT; /* bug reporting address */
 
 /* doc strings */
-static const char doc[]=PACKAGE_NAME " - Moonshot Trust Router";
+static const char doc[]=PACKAGE_NAME " - Moonshot Trust Router " PACKAGE_VERSION;
 static const char arg_doc[]=""; /* string describing arguments, if any */
 
 /* define the options here. Fields are:
  * { long-name, short-name, variable name, options, help description } */
 static const struct argp_option cmdline_options[] = {
     { "config-dir", 'c', "DIR", 0, "Specify configuration file location (default is current directory)"},
+    { "version", 'v', NULL, 0, "Print version information and exit"},
     { NULL }
 };
 
 /* structure for communicating with option parser */
 struct cmdline_args {
-  char *config_dir;
+    int version_requested;
+    char *config_dir;
 };
 
 /* parser for individual options - fills in a struct cmdline_args */
@@ -91,16 +95,20 @@ static error_t parse_option(int key, char *arg, struct argp_state *state)
   struct cmdline_args *arguments=state->input;
 
   switch (key) {
-  case 'c':
-    if (arg == NULL) {
-      /* somehow we got called without an argument */
+    case 'c':
+      if (arg == NULL) {
+        /* somehow we got called without an argument */
+        return ARGP_ERR_UNKNOWN;
+      }
+      arguments->config_dir=arg;
+      break;
+
+    case 'v':
+      arguments->version_requested=1;
+      break;
+
+    default:
       return ARGP_ERR_UNKNOWN;
-    }
-    arguments->config_dir=arg;
-    break;
-
-  default:
-    return ARGP_ERR_UNKNOWN;
   }
 
   return 0; /* success */
@@ -142,6 +150,7 @@ int main(int argc, char *argv[])
   struct cmdline_args opts;
   struct event_base *ev_base;
   struct tr_socket_event tids_ev = {0};
+//  struct tr_socket_event mon_ev = {0};
   struct event *cfgwatch_ev;
 
   configure_signals();
@@ -159,6 +168,7 @@ int main(int argc, char *argv[])
 
   /***** parse command-line arguments *****/
   /* set defaults */
+  opts.version_requested=0;
   opts.config_dir=".";
 
   /* parse the command line*/
@@ -167,6 +177,12 @@ int main(int argc, char *argv[])
   /* process options */
   remove_trailing_slash(opts.config_dir);
 
+
+  /***** Print version info *****/
+  print_version_info();
+  if (opts.version_requested)
+    return 0; /* requested that we print version and exit */
+
   /***** create a Trust Router instance *****/
   if (NULL == (tr = tr_create(main_ctx))) {
     tr_crit("Unable to create Trust Router instance, exiting.");
@@ -174,11 +190,10 @@ int main(int argc, char *argv[])
   }
 
   /***** initialize the trust path query server instance *****/
-  if (NULL == (tr->tids = tids_create())) {
+  if (NULL == (tr->tids = tids_new(tr))) {
     tr_crit("Error initializing Trust Path Query Server instance.");
     return 1;
   }
-  talloc_steal(tr, tr->tids);
 
   /***** initialize the trust router protocol server instance *****/
   if (NULL == (tr->trps = trps_new(tr))) {
@@ -186,6 +201,12 @@ int main(int argc, char *argv[])
     return 1;
   }
 
+//  /***** initialize the monitoring interface instance *****/
+//  if (NULL == (tr->mons = mons_new(tr))) {
+//    tr_crit("Error initializing monitoring interface instance.");
+//    return 1;
+//  }
+
   /***** process configuration *****/
   tr->cfgwatch=tr_cfgwatch_create(tr);
   if (tr->cfgwatch == NULL) {
@@ -214,7 +235,12 @@ int main(int argc, char *argv[])
     return 1;
   }
 
-  /*tr_status_event_init();*/ /* install status reporting events */
+//  /* install monitoring interface events */
+//  tr_debug("Initializing monitoring interface events.");
+//  if (0 != tr_mon_event_init(tr->mons, ev_base, &mon_ev)) {
+//    tr_crit("Error initializing monitoring interface.");
+//    return 1;
+//  }
 
   /* install TID server events */
   tr_debug("Initializing TID server events.");