Merge pull request #50 from painless-security/jennifer/refactoring_tids

TID refactoring (pull request 2)

diff --combined tr/tr_main.c
index 4f09d12,7fad36f..8c8202d
--- 1/tr/tr_main.c
--- 2/tr/tr_main.c
+++ b/tr/tr_main.c
@@@ -34,15 -34,14 +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,15 -80,13 +80,15 @@@ static const char arg_doc[]=""; /* stri
   * { 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"},
 +    { "config-validate", 'C', NULL, 0, "Validate configuration files and exit"},
 +    { "version", 1, NULL, 0, "Print version information and exit"},
      { NULL }
  };
  
  /* structure for communicating with option parser */
  struct cmdline_args {
      int version_requested;
 +    int validate_config_and_exit;
      char *config_dir;
  };
  
@@@ -108,14 -105,10 +107,14 @@@ static error_t parse_option(int key, ch
        arguments->config_dir=arg;
        break;
  
 -    case 'v':
 +    case 1:
        arguments->version_requested=1;
        break;
  
 +    case 'C':
 +      arguments->validate_config_and_exit=1;
 +      break;
 +
      default:
        return ARGP_ERR_UNKNOWN;
    }
@@@ -159,6 -152,7 +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();
@@@ -177,7 -171,6 +177,7 @@@
    /***** parse command-line arguments *****/
    /* set defaults */
    opts.version_requested=0;
 +  opts.validate_config_and_exit=0;
    opts.config_dir=".";
  
    /* parse the command line*/
@@@ -199,11 -192,10 +199,10 @@@
    }
  
    /***** 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 -203,15 +210,15 @@@
      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) {
@@@ -226,11 -227,6 +234,11 @@@
      return 1;
    }
  
 +  /***** Exit here if we are just validating our configuration *****/
 +  if (opts.validate_config_and_exit) {
 +    printf("Valid configuration found in %s.\n", opts.config_dir);
 +    return 0;
 +  }
    /***** Set up the event loop *****/
    ev_base=tr_event_loop_init(); /* Set up the event loop */
    if (ev_base==NULL) {
@@@ -244,7 -240,12 +252,12 @@@
      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.");