X-Git-Url: http://www.project-moonshot.org/gitweb/?p=trust_router.git;a=blobdiff_plain;f=tr%2Ftr_main.c;fp=tr%2Ftr_main.c;h=73c429e58dafeedfc4e1e103d5c82ae9f7bd63eb;hp=a03ef4b12bf0e2069633ad83a08b5818c5cbba8d;hb=6f65c9cce86719147d0b4dcc9823b25443c2d185;hpb=eaa1a8ceed54fbfadc2638cf383aaa12ab446a57 diff --git a/tr/tr_main.c b/tr/tr_main.c index a03ef4b..73c429e 100644 --- a/tr/tr_main.c +++ b/tr/tr_main.c @@ -34,15 +34,15 @@ #include #include -#include #include #include #include -#include #include -#include +#include #include +#include +#include #include #include #include @@ -81,13 +81,15 @@ static const char arg_doc[]=""; /* string describing arguments, if any */ * { 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; }; @@ -106,10 +108,14 @@ static error_t parse_option(int key, char *arg, struct argp_state *state) 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; } @@ -145,6 +151,38 @@ static void configure_signals(void) pthread_sigmask(SIG_BLOCK, &signals, NULL); } +/* 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_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; +} + +static MON_RC tr_handle_show_cfg_serial(void *cookie, json_t **response_ptr) +{ + TR_CFG_MGR *cfg_mgr = talloc_get_type_abort(cookie, TR_CFG_MGR); + + *response_ptr = tr_cfg_files_to_json_array(cfg_mgr->active); + return (*response_ptr == NULL) ? MON_NOMEM : MON_SUCCESS; +} + + + int main(int argc, char *argv[]) { TALLOC_CTX *main_ctx=NULL; @@ -153,8 +191,12 @@ int main(int argc, char *argv[]) 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; + time_t start_time = time(NULL); /* TODO move this? */ + configure_signals(); /* we're going to be multithreaded, so disable null context tracking */ @@ -171,6 +213,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*/ @@ -192,11 +235,10 @@ int main(int argc, char *argv[]) } /***** 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))) { @@ -204,6 +246,23 @@ int main(int argc, char *argv[]) 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; + + /* 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_CONFIG_FILES, tr_handle_show_cfg_serial, tr->cfg_mgr); + 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); + /***** process configuration *****/ tr->cfgwatch=tr_cfgwatch_create(tr); if (tr->cfgwatch == NULL) { @@ -219,6 +278,11 @@ int main(int argc, char *argv[]) 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) { @@ -232,19 +296,23 @@ int main(int argc, char *argv[]) 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."); - 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; } + /* tell the trps which port the tid server listens on */ + tr->trps->tids_port = tr->tids->tids_port; + /* install TRP handler events */ tr_debug("Initializing Dynamic Trust Router Protocol events."); if (TRP_SUCCESS != tr_trps_event_init(ev_base, tr)) {