Merge pull request #51 from painless-security/jennifer/monitoring_client_and_server

First functioning monitoring client/server (pull request 3)

diff --combined tr/tr_main.c
index 8c8202d,3c74730..1968bde
--- 1/tr/tr_main.c
--- 2/tr/tr_main.c
+++ b/tr/tr_main.c
@@@ -38,6 -38,7 +38,7 @@@
  #include <event2/event.h>
  #include <talloc.h>
  #include <signal.h>
+ #include <time.h>
  
  #include <tid_internal.h>
  #include <mon_internal.h>
@@@ -80,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;
  };
  
@@@ -107,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;
    }
@@@ -150,6 -145,18 +151,18 @@@ static void configure_signals(void
    pthread_sigmask(SIG_BLOCK, &signals, NULL);
  }
  
+ /* TODO move this function */
+ static json_t *tr_mon_handle_version(void *cookie)
+ {
+   return json_string(PACKAGE_VERSION);
+ }
+ 
+ static json_t *tr_mon_handle_uptime(void *cookie)
+ {
+   time_t *start_time = cookie;
+   return json_integer(time(NULL) - (*start_time));
+ }
+ 
  int main(int argc, char *argv[])
  {
    TALLOC_CTX *main_ctx=NULL;
@@@ -161,6 -168,8 +174,8 @@@
    struct tr_socket_event mon_ev = {0};
    struct event *cfgwatch_ev;
  
+   time_t start_time = time(NULL); /* TODO move this? */
+ 
    configure_signals();
  
    /* we're going to be multithreaded, so disable null context tracking */
@@@ -177,7 -186,6 +192,7 @@@
    /***** parse command-line arguments *****/
    /* set defaults */
    opts.version_requested=0;
 +  opts.validate_config_and_exit=0;
    opts.config_dir=".";
  
    /* parse the command line*/
@@@ -219,6 -227,10 +234,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);
+ 
    /***** process configuration *****/
    tr->cfgwatch=tr_cfgwatch_create(tr);
    if (tr->cfgwatch == NULL) {
@@@ -234,11 -246,6 +253,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) {