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 a03ef4b..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>
@@ -153,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();
@@ -192,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))) {
@@ -204,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) {
@@ -232,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.");