#include <stdio.h>
#include <stdlib.h>
-#include <jansson.h>
#include <argp.h>
#include <event2/event.h>
#include <talloc.h>
-#include <sys/time.h>
#include <signal.h>
-#include <pthread.h>
#include <tid_internal.h>
+#include <mon_internal.h>
+#include <tr_mon.h>
#include <tr_tid.h>
#include <tr_trp.h>
#include <tr_config.h>
#include <tr_debug.h>
#define TALLOC_DEBUG_ENABLE 1
-#define DEBUG_HARDCODED_PEER_TABLE 1
-#define DEBUG_PING_SELF 0
/***** 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;
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)"},
+ { "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 {
- char *config_dir;
+ int version_requested;
+ int validate_config_and_exit;
+ char *config_dir;
};
/* parser for individual options - fills in a struct cmdline_args */
struct cmdline_args *arguments=state->input;
switch (key) {
- case 'c':
- if (arg == NULL) {
- /* somehow we got called without an argument */
- return ARGP_ERR_UNKNOWN;
- }
- arguments->config_dir=arg;
- break;
+ case 'c':
+ if (arg == NULL) {
+ /* somehow we got called without an argument */
+ return ARGP_ERR_UNKNOWN;
+ }
+ arguments->config_dir=arg;
+ break;
+
+ case 1:
+ arguments->version_requested=1;
+ break;
+
+ case 'C':
+ arguments->validate_config_and_exit=1;
+ break;
- default:
- return ARGP_ERR_UNKNOWN;
+ default:
+ return ARGP_ERR_UNKNOWN;
}
return 0; /* success */
}
#endif /* TALLOC_DEBUG_ENABLE */
-
-#if DEBUG_PING_SELF
-struct thingy {
- TRPS_INSTANCE *trps;
- struct event *ev;
-};
-
-static void debug_ping(evutil_socket_t fd, short what, void *arg)
-{
- 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);
-}
-#endif /* DEBUG_PING_SELF */
-
static void configure_signals(void)
{
sigset_t signals;
TR_INSTANCE *tr = NULL;
struct cmdline_args opts;
struct event_base *ev_base;
- struct tr_socket_event tids_ev;
+ struct tr_socket_event tids_ev = {0};
+ 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 */
-
configure_signals();
/* we're going to be multithreaded, so disable null context tracking */
/***** parse command-line arguments *****/
/* set defaults */
+ opts.version_requested=0;
+ opts.validate_config_and_exit=0;
opts.config_dir=".";
/* parse the command line*/
/* 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.");
}
/***** initialize the trust path query server instance *****/
- if (NULL == (tr->tids = tids_create (tr))) {
+ if (NULL == (tr->tids = tids_new(tr))) {
tr_crit("Error initializing Trust Path Query Server instance.");
return 1;
}
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;
+
/***** process configuration *****/
tr->cfgwatch=tr_cfgwatch_create(tr);
if (tr->cfgwatch == NULL) {
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) {
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)) {
tr_crit("Error initializing Trust Path Query Server instance.");
return 1;
}
/* install TRP handler events */
+ 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_HARDCODED_PEER_TABLE
- {
- TRP_PEER *hc_peer=NULL;
- char *s=NULL;
-
- hc_peer=trp_peer_new(main_ctx); /* will later be stolen by ptable context */
- if (hc_peer==NULL) {
- tr_crit("Unable to allocate new peer. Aborting.");
- return 1;
- }
- trp_peer_set_server(hc_peer, "epsilon.vmnet");
- trp_peer_set_gssname(hc_peer, tr_new_name("tr-epsilon-vmnet@apc.painless-security.com"));
- switch (tr->trps->port) {
- case 10000:
- trp_peer_set_port(hc_peer, 10001);
- break;
- case 10001:
- trp_peer_set_port(hc_peer, 10000);
- break;
- default:
- tr_crit("Cannot use hardcoded peer table with port other than 10000 or 10001.");
- return 1;
- }
- if (TRP_SUCCESS != trps_add_peer(tr->trps, hc_peer)) {
- tr_crit("Unable to add peer.");
- return 1;
- }
-
- hc_peer=trp_peer_new(main_ctx); /* will later be stolen by ptable context */
- if (hc_peer==NULL) {
- tr_crit("Unable to allocate new peer. Aborting.");
- return 1;
- }
- trp_peer_set_server(hc_peer, "epsilon.vmnet");
- trp_peer_set_gssname(hc_peer, tr_new_name("trpc@apc.painless-security.com"));
- trp_peer_set_port(hc_peer, 10002); /* not really used */
- if (TRP_SUCCESS != trps_add_peer(tr->trps, hc_peer)) {
- tr_crit("Unable to add peer.");
- return 1;
- }
-
- s=trp_ptable_to_str(main_ctx, tr->trps->ptable, NULL, NULL);
- tr_debug("Peer Table:\n%s\n", s);
- talloc_free(s);
- }
-#endif /* DEBUG_HARDCODED_PEER_TABLE */
-
-#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);
projects / trust_router.git / blobdiff