X-Git-Url: http://www.project-moonshot.org/gitweb/?p=trust_router.git;a=blobdiff_plain;f=tr%2Ftr_main.c;h=5f8215d2b245fd1cabc02b790ff307a7dd492411;hp=91a494d32c295dad76f42ab63f54d709e9126e26;hb=86f808dde0595769d045eb82ef414174953ab67e;hpb=53ab8fd0668d83134baf386020069e81085d13a2 diff --git a/tr/tr_main.c b/tr/tr_main.c index 91a494d..5f8215d 100644 --- a/tr/tr_main.c +++ b/tr/tr_main.c @@ -34,25 +34,32 @@ #include #include -#include #include #include #include -#include +#include +#include -#include #include +#include +#include #include #include #include #include #include +#include #include #define TALLOC_DEBUG_ENABLE 1 /***** command-line option handling / setup *****/ +static void print_version_info(void) +{ + printf("Moonshot Trust Router %s\n\n", PACKAGE_VERSION); +} + /* Strip trailing / from a path name.*/ static void remove_trailing_slash(char *s) { size_t n; @@ -67,19 +74,21 @@ static void remove_trailing_slash(char *s) { const char *argp_program_bug_address=PACKAGE_BUGREPORT; /* bug reporting address */ /* doc strings */ -static const char doc[]=PACKAGE_NAME " - Moonshot Trust Router"; +static const char doc[]=PACKAGE_NAME " - Moonshot Trust Router " PACKAGE_VERSION; static const char arg_doc[]=""; /* string describing arguments, if any */ /* define the options here. Fields are: * { 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"}, { NULL } }; /* structure for communicating with option parser */ struct cmdline_args { - char *config_dir; + int version_requested; + char *config_dir; }; /* parser for individual options - fills in a struct cmdline_args */ @@ -89,16 +98,20 @@ static error_t parse_option(int key, char *arg, struct argp_state *state) struct cmdline_args *arguments=state->input; switch (key) { - case 'c': - if (arg == NULL) { - /* somehow we got called without an argument */ + case 'c': + if (arg == NULL) { + /* somehow we got called without an argument */ + return ARGP_ERR_UNKNOWN; + } + arguments->config_dir=arg; + break; + + case 'v': + arguments->version_requested=1; + break; + + default: return ARGP_ERR_UNKNOWN; - } - arguments->config_dir=arg; - break; - - default: - return ARGP_ERR_UNKNOWN; } return 0; /* success */ @@ -123,48 +136,46 @@ static void tr_talloc_log(const char *msg) } #endif /* TALLOC_DEBUG_ENABLE */ +static void configure_signals(void) +{ + sigset_t signals; + /* ignore SIGPIPE */ + sigemptyset(&signals); + sigaddset(&signals, SIGPIPE); + pthread_sigmask(SIG_BLOCK, &signals, NULL); +} -#if DEBUG_PING_SELF -struct thingy { - TRPS_INSTANCE *trps; - struct event *ev; -}; +/* 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 void debug_ping(evutil_socket_t fd, short what, void *arg) +static MON_RC tr_handle_uptime(void *cookie, json_t **result_ptr) { - TALLOC_CTX *tmp_ctx=talloc_new(NULL); - struct thingy *thingy=(struct thingy *)arg; - TRPS_INSTANCE *trps=thingy->trps; - TRP_REQ *req=NULL; - TR_MSG msg; - char *encoded=NULL; - struct timeval interval={1, 0}; - static int count=10; - TR_NAME *name=NULL; - - tr_debug("debug_ping entered"); - if (trps->trpc==NULL) - tr_trpc_initiate(trps, trps->hostname, trps->port); - - /* create a TRP route request msg */ - req=trp_req_new(tmp_ctx); - name=tr_new_name("community"); - trp_req_set_comm(req, name); - name=tr_new_name("realm"); - trp_req_set_realm(req, name); - tr_msg_set_trp_req(&msg, req); - encoded=tr_msg_encode(&msg); - if (encoded==NULL) - tr_err("debug_ping: error encoding TRP message."); - else { - tr_debug("debug_ping: sending message"); - trps_send_msg(trps, NULL, encoded); - tr_msg_free_encoded(encoded); - } - if (count-- > 0) - evtimer_add(thingy->ev, &interval); + 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; } -#endif /* DEBUG_PING_SELF */ + +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[]) { @@ -173,14 +184,14 @@ int main(int argc, char *argv[]) TR_INSTANCE *tr = NULL; struct cmdline_args opts; struct event_base *ev_base; - struct tr_socket_event tids_ev; - TR_TRPS_EVENTS *trps_ev; + struct tr_socket_event tids_ev = {0}; + struct event *tids_sweep_ev; + struct tr_socket_event mon_ev = {0}; struct event *cfgwatch_ev; -#if DEBUG_PING_SELF - struct event *debug_ping_ev; - struct timeval notime={0, 0}; - struct thingy thingy={NULL}; -#endif /* DEBUG_PING_SELF */ + + time_t start_time = time(NULL); /* TODO move this? */ + + configure_signals(); /* we're going to be multithreaded, so disable null context tracking */ talloc_set_abort_fn(tr_abort); @@ -195,6 +206,7 @@ int main(int argc, char *argv[]) /***** parse command-line arguments *****/ /* set defaults */ + opts.version_requested=0; opts.config_dir="."; /* parse the command line*/ @@ -203,12 +215,47 @@ int main(int argc, char *argv[]) /* process options */ remove_trailing_slash(opts.config_dir); + + /***** Print version info *****/ + print_version_info(); + if (opts.version_requested) + return 0; /* requested that we print version and exit */ + /***** create a Trust Router instance *****/ if (NULL == (tr = tr_create(main_ctx))) { tr_crit("Unable to create Trust Router instance, exiting."); return 1; } + /***** initialize the trust path query server instance *****/ + if (NULL == (tr->tids = tids_new(tr))) { + tr_crit("Error initializing Trust Path Query Server instance."); + return 1; + } + + /***** initialize the trust router protocol server instance *****/ + if (NULL == (tr->trps = trps_new(tr))) { + tr_crit("Error initializing Trust Router Protocol Server instance."); + 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) { @@ -217,23 +264,13 @@ int main(int argc, char *argv[]) } tr->cfgwatch->config_dir=opts.config_dir; tr->cfgwatch->cfg_mgr=tr->cfg_mgr; + tr->cfgwatch->update_cb=tr_config_changed; /* handle configuration changes */ + tr->cfgwatch->update_cookie=(void *)tr; if (0 != tr_read_and_apply_config(tr->cfgwatch)) { tr_crit("Error reading configuration, exiting."); return 1; } - /***** initialize the trust path query server instance *****/ - if (NULL == (tr->tids = tids_create (tr))) { - tr_crit("Error initializing Trust Path Query Server instance."); - return 1; - } - - /***** initialize the trust router protocol server instance *****/ - if (NULL == (tr->trps = trps_new(tr))) { - tr_crit("Error initializing Trust Router Protocol Server instance."); - return 1; - } - /***** Set up the event loop *****/ ev_base=tr_event_loop_init(); /* Set up the event loop */ if (ev_base==NULL) { @@ -241,49 +278,36 @@ int main(int argc, char *argv[]) return 1; } - /* install configuration file watching events */ - tr->cfgwatch->poll_interval=(struct timeval) {1,0}; /* set poll interval in {sec, usec} */ - tr->cfgwatch->settling_time=(struct timeval) {5,0}; /* delay for changes to settle before updating */ - /* TODO: pull these settings out of the configuration files */ - /* already set config_dir, fstat_list and n_files earlier */ if (0 != tr_cfgwatch_event_init(ev_base, tr->cfgwatch, &cfgwatch_ev)) { tr_crit("Error initializing configuration file watcher."); 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 */ - if (0 != tr_tids_event_init(ev_base, - tr->tids, - tr->cfg_mgr, - &tids_ev)) { + tr_debug("Initializing TID server events."); + 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; } /* install TRP handler events */ - trps_ev=tr_trps_events_new(main_ctx); - if (0 != tr_trps_event_init(ev_base, - tr->trps, - tr->cfg_mgr, - trps_ev)) { + tr_debug("Initializing Dynamic Trust Router Protocol events."); + if (TRP_SUCCESS != tr_trps_event_init(ev_base, tr)) { tr_crit("Error initializing Trust Path Query Server instance."); return 1; } -#if DEBUG_PING_SELF - /* for debugging, send a message to peers on a timer */ - debug_ping_ev=evtimer_new(ev_base, debug_ping, (void *)&thingy); - thingy.trps=tr->trps; - thingy.ev=debug_ping_ev; - evtimer_add(debug_ping_ev, ¬ime); -#endif /* DEBUG_PING_SELF */ - + tr_debug("Starting event loop."); tr_event_loop_run(ev_base); /* does not return until we are done */ - /* TODO: ensure talloc is properly used so this actually works */ tr_destroy(tr); /* thanks to talloc, should destroy everything */ talloc_free(main_ctx);