Merge pull request #52 from painless-security/jennifer/subprocess_status

Report whether TID requests succeed and better clean up zombie TID / MON processes (pull request 4)

diff --combined tr/tr_main.c
index 1968bde,68f682e..630668c
--- 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;
    }
@@@ -152,15 -146,17 +152,17 @@@ static void configure_signals(void
  }
  
  /* TODO move this function */
- static json_t *tr_mon_handle_version(void *cookie)
+ static MON_RC tr_mon_handle_version(void *cookie, json_t **result_ptr)
  {
-   return json_string(PACKAGE_VERSION);
+   *result_ptr = json_string(PACKAGE_VERSION);
+   return (*result_ptr == NULL) ? MON_NOMEM : MON_SUCCESS;
  }
  
- static json_t *tr_mon_handle_uptime(void *cookie)
+ static MON_RC tr_mon_handle_uptime(void *cookie, json_t **result_ptr)
  {
    time_t *start_time = cookie;
-   return json_integer(time(NULL) - (*start_time));
+   *result_ptr = json_integer(time(NULL) - (*start_time));
+   return (*result_ptr == NULL) ? MON_NOMEM : MON_SUCCESS;
  }
  
  int main(int argc, char *argv[])
@@@ -171,6 -167,7 +173,7 @@@
    struct cmdline_args opts;
    struct event_base *ev_base;
    struct tr_socket_event tids_ev = {0};
+   struct event *tids_sweep_ev;
    struct tr_socket_event mon_ev = {0};
    struct event *cfgwatch_ev;
  
@@@ -192,7 -189,6 +195,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,7 -233,8 +240,8 @@@
    /* 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);
- 
+   tr_tid_register_mons_handlers(tr->tids, tr->mons);
+   
    /***** process configuration *****/
    tr->cfgwatch=tr_cfgwatch_create(tr);
    if (tr->cfgwatch == NULL) {
@@@ -253,11 -250,6 +257,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) {
@@@ -280,11 -272,7 +284,7 @@@
  
    /* install TID server events */
    tr_debug("Initializing TID server events.");
-   if (0 != tr_tids_event_init(ev_base,
-                               tr->tids,
-                               tr->cfg_mgr,
-                               tr->trps,
-                              &tids_ev)) {
+   if (0 != tr_tids_event_init(ev_base, tr->tids, tr->cfg_mgr, tr->trps, &tids_ev, &tids_sweep_ev)) {
      tr_crit("Error initializing Trust Path Query Server instance.");
      return 1;
    }