Remove debugging code.

[trust_router.git] / tr / tr_main.c

diff --git a/tr/tr_main.c b/tr/tr_main.c
index 7a31d5b..5eb825e 100644 (file)
--- a/tr/tr_main.c
+++ b/tr/tr_main.c
@@ -39,14 +39,16 @@
 #include <event2/event.h>
 #include <talloc.h>
 #include <sys/time.h>
+#include <signal.h>
+#include <pthread.h>
 
-#include <tr.h>
 #include <tid_internal.h>
 #include <tr_tid.h>
 #include <tr_trp.h>
 #include <tr_config.h>
 #include <tr_event.h>
 #include <tr_cfgwatch.h>
+#include <tr.h>
 #include <tr_debug.h>
 
 #define TALLOC_DEBUG_ENABLE 1
@@ -123,6 +125,15 @@ static void tr_talloc_log(const char *msg)
 }
 #endif /* TALLOC_DEBUG_ENABLE */
 
+static void configure_signals(void)
+{
+  sigset_t signals;
+  /* ignore SIGPIPE */
+  sigemptyset(&signals);
+  sigaddset(&signals, SIGPIPE);
+  pthread_sigmask(SIG_BLOCK, &signals, NULL);
+}
+
 int main(int argc, char *argv[])
 {
   TALLOC_CTX *main_ctx=NULL;
@@ -131,9 +142,10 @@ int main(int argc, char *argv[])
   struct cmdline_args opts;
   struct event_base *ev_base;
   struct tr_socket_event tids_ev;
-  TR_TRPS_EVENTS *trps_ev;
   struct event *cfgwatch_ev;
 
+  configure_signals();
+
   /* we're going to be multithreaded, so disable null context tracking */
   talloc_set_abort_fn(tr_abort);
   talloc_disable_null_tracking();
@@ -161,6 +173,18 @@ int main(int argc, char *argv[])
     return 1;
   }
 
+  /***** initialize the trust path query server instance *****/
+  if (NULL == (tr->tids = tids_create (tr))) {
+    tr_crit("Error initializing Trust Path Query Server instance.");
+    return 1;
+  }
+
+  /***** initialize the trust router protocol server instance *****/
+  if (NULL == (tr->trps = trps_new(tr))) {
+    tr_crit("Error initializing Trust Router Protocol Server instance.");
+    return 1;
+  }
+
   /***** process configuration *****/
   tr->cfgwatch=tr_cfgwatch_create(tr);
   if (tr->cfgwatch == NULL) {
@@ -169,23 +193,13 @@ int main(int argc, char *argv[])
   }
   tr->cfgwatch->config_dir=opts.config_dir;
   tr->cfgwatch->cfg_mgr=tr->cfg_mgr;
+  tr->cfgwatch->update_cb=tr_config_changed; /* handle configuration changes */
+  tr->cfgwatch->update_cookie=(void *)tr;
   if (0 != tr_read_and_apply_config(tr->cfgwatch)) {
     tr_crit("Error reading configuration, exiting.");
     return 1;
   }
 
-  /***** initialize the trust path query server instance *****/
-  if (NULL == (tr->tids = tids_create (tr))) {
-    tr_crit("Error initializing Trust Path Query Server instance.");
-    return 1;
-  }
-
-  /***** initialize the trust router protocol server instance *****/
-  if (NULL == (tr->trps = trps_new(tr))) {
-    tr_crit("Error initializing Trust Router Protocol Server instance.");
-    return 1;
-  }
-
   /***** Set up the event loop *****/
   ev_base=tr_event_loop_init(); /* Set up the event loop */
   if (ev_base==NULL) {
@@ -193,11 +207,6 @@ int main(int argc, char *argv[])
     return 1;
   }
 
-  /* install configuration file watching events */
-  tr->cfgwatch->poll_interval=(struct timeval) {1,0}; /* set poll interval in {sec, usec} */
-  tr->cfgwatch->settling_time=(struct timeval) {5,0}; /* delay for changes to settle before updating */
-  /* TODO: pull these settings out of the configuration files */
-
   /* already set config_dir, fstat_list and n_files earlier */
   if (0 != tr_cfgwatch_event_init(ev_base, tr->cfgwatch, &cfgwatch_ev)) {
     tr_crit("Error initializing configuration file watcher.");
@@ -210,24 +219,20 @@ int main(int argc, char *argv[])
   if (0 != tr_tids_event_init(ev_base,
                               tr->tids,
                               tr->cfg_mgr,
+                              tr->trps,
                              &tids_ev)) {
     tr_crit("Error initializing Trust Path Query Server instance.");
     return 1;
   }
 
   /* install TRP handler events */
-  trps_ev=tr_trps_events_new(main_ctx);
-  if (0 != tr_trps_event_init(ev_base,
-                              tr->trps,
-                              tr->cfg_mgr,
-                              trps_ev)) {
+  if (TRP_SUCCESS != tr_trps_event_init(ev_base, tr)) {
     tr_crit("Error initializing Trust Path Query Server instance.");
     return 1;
   }
 
   tr_event_loop_run(ev_base); /* does not return until we are done */
 
-  /* TODO: ensure talloc is properly used so this actually works */
   tr_destroy(tr); /* thanks to talloc, should destroy everything */
 
   talloc_free(main_ctx);