#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 TR 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 TR 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;
- int port; /* optional */
- int repeat; /* how many times to repeat, or -1 for infinite */
+ unsigned 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 */
static error_t parse_option(int key, char *arg, struct argp_state *state)
{
+ long tmp_l = 0;
+
/* get a shorthand to the command line argument structure, part of state */
struct cmdline_args *arguments=state->input;
switch (key) {
- case 'r':
- if (arg==NULL)
- arguments->repeat=-1;
- else
- arguments->repeat=strtol(arg, NULL, 10);
- break;
-
- case ARGP_KEY_ARG: /* handle argument (not option) */
- switch (state->arg_num) {
- case 0:
- arguments->msg=arg;
+ case 'v':
+ print_version_info();
+ exit(0);
break;
- case 1:
- arguments->server=arg;
+ case ARGP_KEY_ARG: /* handle argument (not option) */
+ switch (state->arg_num) {
+ case 0:
+ arguments->server = arg;
+ break;
+
+ case 1:
+ 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;
+ 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:
+ 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 2:
- arguments->port=strtol(arg, NULL, 10); /* optional */
+ case ARGP_KEY_END: /* no more arguments */
+ if (state->arg_num < 3) {
+ /* not enough arguments encountered */
+ argp_usage(state);
+ }
break;
default:
- /* too many arguments */
- argp_usage(state);
- }
- break;
-
- case ARGP_KEY_END: /* no more arguments */
- if (state->arg_num < 2) {
- /* not enough arguments encountered */
- argp_usage(state);
- }
- break;
-
- default:
- return ARGP_ERR_UNKNOWN;
+ return ARGP_ERR_UNKNOWN;
}
return 0; /* success */
/* assemble the argp parser */
static struct argp argp = {cmdline_options, parse_option, arg_doc, doc};
-int main (int argc,
- char *argv[])
+int main(int argc, char *argv[])
{
TALLOC_CTX *main_ctx=talloc_new(NULL);
- MONC_INSTANCE *monc=NULL;
+ MONC_INSTANCE *monc = NULL;
+ MON_REQ *req = NULL;
+ MON_RESP *resp = NULL;
+ unsigned int ii;
+
struct cmdline_args opts;
- int rc;
- int conn;
- gss_ctx_id_t gssctx;
+ 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);
-
- printf("TR Monitor:\nServer = %s, port = %i\n", opts.server, opts.port);
+ tr_console_threshold(LOG_WARNING);
/* Create a MON client instance & the client DH */
- monc = monc_create();
- if (NULL == (monc->client_dh = tr_create_dh_params(main_ctx, 0))) {
+ 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");
- return 1;
+ goto cleanup;
}
/* Set-up MON connection */
- if (-1 == (conn = monc_open_connection(monc, opts.server, opts.port, &gssctx))) {
+ if (0 != monc_open_connection(monc, opts.server, opts.port)) {
/* Handle error */
- printf("Error in monc_open_connection.\n");
- return 1;
+ printf("Error opening connection to %s:%d.\n", opts.server, opts.port);
+ goto cleanup;
};
- /* Send a MON request */
- if (0 > (rc = monc_send_request(monc, conn, gssctx, NULL, NULL))) {
+ req = mon_req_new(main_ctx, opts.command);
+ for (ii=0; ii < opts.n_options; ii++)
+ mon_req_add_option(req, opts.options[ii]);
+
+ /* Send a MON request and get the response */
+ resp = monc_send_request(main_ctx, monc, req);
+
+ if (resp == NULL) {
/* Handle error */
- printf("Error in monc_send_request, rc = %d.\n", rc);
- return 1;
+ printf("Error executing monitoring request.\n");
+ goto cleanup;
}
+ /* Print the JSON to stdout */
+ json_dumpf(mon_resp_encode(resp), stdout, JSON_INDENT(4));
+ printf("\n");
+
+ /* success */
+ retval = 0;
+
/* Clean-up the MON client instance, and exit */
- monc_destroy(monc);
+cleanup:
talloc_free(main_ctx);
- return 0;
+ return retval;
}