X-Git-Url: http://www.project-moonshot.org/gitweb/?p=trust_router.git;a=blobdiff_plain;f=tr%2Ftr_main.c;h=8c8202d9d43787ed5452533a410f8cc01b89efcd;hp=20ea516afce2c028f40a71163a9eb1d46847fe12;hb=98be752015619fab5d29405bea10158a0e26d044;hpb=c0fa19a9bcf2d7faa65a2135d3d81ae4178bd301

diff --git a/tr/tr_main.c b/tr/tr_main.c
index 20ea516..8c8202d 100644
--- a/tr/tr_main.c
+++ b/tr/tr_main.c
@@ -34,15 +34,14 @@
 
 #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 <mon_internal.h>
+#include <tr_mon.h>
 #include <tr_tid.h>
 #include <tr_trp.h>
 #include <tr_config.h>
@@ -81,8 +80,8 @@ static const char arg_doc[]=""; /* string describing arguments, if any */
  * { 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)"},
+    { "config-validate", 'C', NULL, 0, "Validate configuration files and exit"},
     { "version", 1, NULL, 0, "Print version information and exit"},
-    { "validate-config", 'v', NULL, 0, "Validate configuration files and exit"},
     { NULL }
 };
 
@@ -112,7 +111,7 @@ static error_t parse_option(int key, char *arg, struct argp_state *state)
       arguments->version_requested=1;
       break;
 
-    case 'v':
+    case 'C':
       arguments->validate_config_and_exit=1;
       break;
 
@@ -159,6 +158,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();
@@ -199,11 +199,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))) {
@@ -211,6 +210,15 @@ 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;
+  }
+  /* Monitor our tids/trps instances */
+  tr->mons->tids = tr->tids;
+  tr->mons->trps = tr->trps;
+
   /***** process configuration *****/
   tr->cfgwatch=tr_cfgwatch_create(tr);
   if (tr->cfgwatch == NULL) {
@@ -244,7 +252,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_mons_event_init(ev_base, tr->mons, tr->cfg_mgr, &mon_ev)) {
+    tr_crit("Error initializing monitoring interface.");
+    return 1;
+  }
 
   /* install TID server events */
   tr_debug("Initializing TID server events.");