Merge pull request #57 from painless-security/jennifer/show_rp_clients

Add show rp_clients command (pull request 9)

diff --combined tr/tr_main.c
index 1f18e4e,6260bbb..61f210c
--- 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;
    }
@@@ -151,20 -145,30 +151,30 @@@ static void configure_signals(void
    pthread_sigmask(SIG_BLOCK, &signals, NULL);
  }
  
- /* TODO move this function */
- static MON_RC tr_mon_handle_version(void *cookie, json_t **result_ptr)
+ /* Monitoring handlers */
+ static MON_RC tr_handle_version(void *cookie, json_t **result_ptr)
  {
    *result_ptr = json_string(PACKAGE_VERSION);
    return (*result_ptr == NULL) ? MON_NOMEM : MON_SUCCESS;
  }
  
- static MON_RC tr_mon_handle_uptime(void *cookie, json_t **result_ptr)
+ static MON_RC tr_handle_uptime(void *cookie, json_t **result_ptr)
  {
    time_t *start_time = cookie;
    *result_ptr = json_integer(time(NULL) - (*start_time));
    return (*result_ptr == NULL) ? MON_NOMEM : MON_SUCCESS;
  }
  
+ static MON_RC tr_handle_show_rp_clients(void *cookie, json_t **response_ptr)
+ {
+   TR_CFG_MGR *cfg_mgr = talloc_get_type_abort(cookie, TR_CFG_MGR);
+ 
+   *response_ptr = tr_rp_clients_to_json(cfg_mgr->active->rp_clients);
+   return (*response_ptr == NULL) ? MON_NOMEM : MON_SUCCESS;
+ }
+ 
+ 
+ 
  int main(int argc, char *argv[])
  {
    TALLOC_CTX *main_ctx=NULL;
@@@ -195,7 -199,6 +205,7 @@@
    /***** parse command-line arguments *****/
    /* set defaults */
    opts.version_requested=0;
 +  opts.validate_config_and_exit=0;
    opts.config_dir=".";
  
    /* parse the command line*/
@@@ -237,9 -240,10 +247,10 @@@
    tr->mons->tids = tr->tids;
    tr->mons->trps = tr->trps;
  
-   /* TODO do this more systematically */
-   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);
+   /* Register monitoring handlers */
+   mons_register_handler(tr->mons, MON_CMD_SHOW, OPT_TYPE_SHOW_VERSION, tr_handle_version, NULL);
+   mons_register_handler(tr->mons, MON_CMD_SHOW, OPT_TYPE_SHOW_UPTIME, tr_handle_uptime, &start_time);
+   mons_register_handler(tr->mons, MON_CMD_SHOW, OPT_TYPE_SHOW_RP_CLIENTS, tr_handle_show_rp_clients, tr->cfg_mgr);
    tr_tid_register_mons_handlers(tr->tids, tr->mons);
    tr_trp_register_mons_handlers(tr->trps, tr->mons);
  
@@@ -258,11 -262,6 +269,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) {