#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>
* { 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"},
- { "validate-config", 'v', NULL, 0, "Validate configuration files and exit"},
{ NULL }
};
arguments->version_requested=1;
break;
- case 'v':
+ case 'C':
arguments->validate_config_and_exit=1;
break;
struct cmdline_args opts;
struct event_base *ev_base;
struct tr_socket_event tids_ev = {0};
+ struct tr_socket_event mon_ev = {0};
struct event *cfgwatch_ev;
configure_signals();
}
/***** 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))) {
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;
}
- /*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.");