#include <stdio.h>
#include <talloc.h>
#include <argp.h>
-#include <unistd.h>
#include <mon_internal.h>
-#include <gsscon.h>
#include <tr_debug.h>
-#include <trust_router/tr_dh.h>
/* command-line option setup */
+static void print_version_info(void)
+{
+ printf("Moonshot Trust Router Monitoring Client %s\n\n", PACKAGE_VERSION);
+}
+
/* argp global parameters */
const char *argp_program_bug_address=PACKAGE_BUGREPORT; /* bug reporting address */
/* doc strings */
-static const char doc[]=PACKAGE_NAME " - TR Monitoring Client";
-static const char arg_doc[]="<message> <server> [<port>]"; /* string describing arguments, if any */
+static const char doc[]=PACKAGE_NAME " - Moonshot Trust Router Monitoring Client";
+static const char arg_doc[]="<server> <port> <command> [<option> ...]"; /* 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[] = {
- { "repeat", 'r', "N", OPTION_ARG_OPTIONAL, "Repeat message until terminated, or N times." },
- {NULL}
+ { "version", 'v', NULL, 0, "Print version information and exit" },
+ {NULL}
};
+#define MAX_OPTIONS 20
/* structure for communicating with option parser */
struct cmdline_args {
- char *msg;
char *server;
- unsigned int port; /* optional */
- int repeat; /* how many times to repeat, or -1 for infinite */
+ int port;
+ MON_CMD command;
+ MON_OPT_TYPE options[MAX_OPTIONS];
+ unsigned int n_options;
};
/* parser for individual options - fills in a struct cmdline_args */
struct cmdline_args *arguments=state->input;
switch (key) {
- case 'r':
- if (arg==NULL)
- arguments->repeat=-1;
- else
- tmp_l = strtol(arg, NULL, 10);
- if ((errno == 0) && (tmp_l > 0) && (tmp_l < INT_MAX))
- arguments->repeat = (int) tmp_l;
- else
- argp_usage(state);
+ case 'v':
+ print_version_info();
+ exit(0);
break;
case ARGP_KEY_ARG: /* handle argument (not option) */
switch (state->arg_num) {
case 0:
- arguments->msg=arg;
+ arguments->server = arg;
break;
case 1:
- arguments->server=arg;
- break;
-
- case 2:
tmp_l = strtol(arg, NULL, 10);
if (errno || (tmp_l < 0) || (tmp_l > 65535)) /* max valid port */
argp_usage(state);
- arguments->port=(unsigned int) tmp_l;
+ arguments->port = (int) tmp_l; /* we already checked the range */
+ break;
+
+ case 2:
+ arguments->command=mon_cmd_from_string(arg);
+ if (arguments->command == MON_CMD_UNKNOWN) {
+ printf("\nUnknown command '%s'\n", arg);
+ argp_usage(state);
+ }
break;
default:
- /* too many arguments */
- argp_usage(state);
+ if (arguments->n_options >= MAX_OPTIONS) {
+ printf("\nToo many command options given, limit is %d\n", MAX_OPTIONS);
+ argp_usage(state);
+ }
+
+ arguments->options[arguments->n_options] = mon_opt_type_from_string(arg);
+ if (arguments->options[arguments->n_options] == OPT_TYPE_UNKNOWN) {
+ printf("\nUnknown command option '%s'\n", arg);
+ argp_usage(state);
+ }
+ arguments->n_options++;
+ break;
}
break;
case ARGP_KEY_END: /* no more arguments */
- if (state->arg_num < 2) {
+ if (state->arg_num < 3) {
/* not enough arguments encountered */
argp_usage(state);
}
MONC_INSTANCE *monc = NULL;
MON_REQ *req = NULL;
MON_RESP *resp = NULL;
+ unsigned int ii;
struct cmdline_args opts;
int retval=1; /* exit with an error status unless this gets set to zero */
/* parse the command line*/
/* set defaults */
- opts.msg=NULL;
- opts.server=NULL;
- opts.port=TRP_PORT;
- opts.repeat=1;
+ opts.server = NULL;
+ opts.port = TRP_PORT;
+ opts.command = MON_CMD_UNKNOWN;
+ opts.n_options = 0;
argp_parse(&argp, argc, argv, 0, 0, &opts);
/* set logging levels */
talloc_set_log_stderr();
tr_log_threshold(LOG_CRIT);
- tr_console_threshold(LOG_DEBUG);
+ tr_console_threshold(LOG_WARNING);
- printf("TR Monitor:\nServer = %s, port = %i\n", opts.server, opts.port);
-
- /* Create a MON client instance & the client DH */
+ /* Create a MON client instance */
monc = monc_new(main_ctx);
if (monc == NULL) {
printf("Error allocating client instance.\n");
goto cleanup;
}
-
- /* fill in the DH parameters */
- monc_set_dh(monc, tr_create_dh_params(NULL, 0));
- if (monc_get_dh(monc) == NULL) {
- printf("Error creating client DH params.\n");
- goto cleanup;
- }
-
/* Set-up MON connection */
if (0 != monc_open_connection(monc, opts.server, opts.port)) {
/* Handle error */
goto cleanup;
};
- req = mon_req_new(main_ctx, MON_CMD_SHOW);
+ req = mon_req_new(main_ctx, opts.command);
+ for (ii=0; ii < opts.n_options; ii++) {
+ if (MON_SUCCESS != mon_req_add_option(req, opts.options[ii])) {
+ printf("Error adding option '%s' to request. Request not sent.\n",
+ mon_opt_type_to_string(opts.options[ii]));
+ goto cleanup;
+ }
+
+ }
/* Send a MON request and get the response */
resp = monc_send_request(main_ctx, monc, req);
goto cleanup;
}
+ /* Print the JSON to stdout */
+ json_dumpf(mon_resp_encode(resp), stdout, JSON_INDENT(4));
+ printf("\n");
+
/* success */
retval = 0;
projects / trust_router.git / blobdiff