Merge pull request #53 from painless-security/jennifer/show_routes

Add show routes message support (pull request 5)

diff --combined tr/tr_main.c
index 630668c,1b8da2b..1f18e4e
--- 1/tr/tr_main.c
--- 2/tr/tr_main.c
+++ b/tr/tr_main.c
@@@ -81,15 -81,13 +81,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 -106,10 +108,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;
    }
@@@ -195,7 -189,6 +195,7 @@@ int main(int argc, char *argv[]
    /***** parse command-line arguments *****/
    /* set defaults */
    opts.version_requested=0;
 +  opts.validate_config_and_exit=0;
    opts.config_dir=".";
  
    /* parse the command line*/
@@@ -241,7 -234,8 +241,8 @@@
    mons_register_handler(tr->mons, MON_CMD_SHOW, OPT_TYPE_SHOW_VERSION, tr_mon_handle_version, NULL);
    mons_register_handler(tr->mons, MON_CMD_SHOW, OPT_TYPE_SHOW_UPTIME, tr_mon_handle_uptime, &start_time);
    tr_tid_register_mons_handlers(tr->tids, tr->mons);
-   
+   tr_trp_register_mons_handlers(tr->trps, tr->mons);
+ 
    /***** process configuration *****/
    tr->cfgwatch=tr_cfgwatch_create(tr);
    if (tr->cfgwatch == NULL) {
@@@ -257,11 -251,6 +258,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) {