X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=tid%2Fexample%2Ftidc_main.c;h=f1dfce59d7659df706ba9b784612a499154171f8;hb=1ec949998ea6bc2c21e808346052b2e92d50479b;hp=9f270186d3545c95a792cec1a6498c6c1cde8557;hpb=45c8d1e8259cae6eaaee3b4a66660a9aa92b1d5b;p=trust_router.git diff --git a/tid/example/tidc_main.c b/tid/example/tidc_main.c index 9f27018..f1dfce5 100644 --- a/tid/example/tidc_main.c +++ b/tid/example/tidc_main.c @@ -35,16 +35,14 @@ #include #include #include +#include #include #include #include #include - -void static tidc_print_usage (const char *name) -{ - printf("Usage: %s []\n", name); -} +#include +#include static void tidc_resp_handler (TIDC_INSTANCE * tidc, TID_REQ *req, @@ -54,6 +52,7 @@ static void tidc_resp_handler (TIDC_INSTANCE * tidc, int c_keylen = 0; unsigned char *c_keybuf = NULL; int i; + struct timeval tv; printf ("Response received! Realm = %s, Community = %s.\n", resp->realm->buf, resp->comm->buf); @@ -67,7 +66,12 @@ static void tidc_resp_handler (TIDC_INSTANCE * tidc, fprintf(stderr, "tidc_resp_handler: Response does not contain server info.\n"); return; } - + if (tid_srvr_get_key_expiration(tid_resp_get_server(resp, 0), &tv)) + printf("Error reading key expiration\n"); + else + printf("Key expiration: %s", ctime(&tv.tv_sec)); + + if (0 > (c_keylen = tr_compute_dh_key(&c_keybuf, resp->servers->aaa_server_dh->pub_key, req->tidc_dh))) { @@ -86,58 +90,154 @@ static void tidc_resp_handler (TIDC_INSTANCE * tidc, return; } + +static void print_version_info(void) +{ + printf("Moonshot TID Client %s\n\n", PACKAGE_VERSION); +} + +/* command-line option setup */ + +/* argp global parameters */ +const char *argp_program_bug_address=PACKAGE_BUGREPORT; /* bug reporting address */ + +/* doc strings */ +static const char doc[]=PACKAGE_NAME " - Moonshot TID Client " 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[] = { + { "version", 'v', NULL, 0, "Print version information and exit"}, + { NULL } +}; + +/* structure for communicating with option parser */ +struct cmdline_args { + char *server; + char *rp_realm; + char *target_realm; + char *community; + int port; /* optional */ +}; + +/* parser for individual options - fills in a struct cmdline_args */ +static error_t parse_option(int key, char *arg, struct argp_state *state) +{ + /* get a shorthand to the command line argument structure, part of state */ + struct cmdline_args *arguments=state->input; + + switch (key) { + case ARGP_KEY_ARG: /* handle argument (not option) */ + switch (state->arg_num) { + case 0: + arguments->server=arg; + break; + + case 1: + arguments->rp_realm=arg; + break; + + case 2: + arguments->target_realm=arg; + break; + + case 3: + arguments->community=arg; + break; + + case 4: + arguments->port=tr_parse_port(arg); /* optional */ + if (arguments->port < 0) { + switch(-(arguments->port)) { + case ERANGE: + printf("\nError parsing port (%s): port must be an integer in the range 1 - 65535\n\n", arg); + break; + + default: + printf("\nError parsing port (%s): %s\n\n", arg, strerror(-arguments->port)); + break; + } + argp_usage(state); + } + break; + + default: + /* too many arguments */ + argp_usage(state); + } + break; + + case ARGP_KEY_END: /* no more arguments */ + if (state->arg_num < 4) { + /* not enough arguments encountered */ + argp_usage(state); + } + break; + + case 'v': + print_version_info(); + exit(0); + + default: + 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, - const char *argv[]) + char *argv[]) { TIDC_INSTANCE *tidc; - char *server = NULL; - char *rp_realm = NULL; - char *realm = NULL; - char *coi = NULL; - int port = TID_PORT; int conn = 0; int rc; gss_ctx_id_t gssctx; + struct cmdline_args opts; + + /* parse the command line*/ + /* set defaults */ + opts.server=NULL; + opts.rp_realm=NULL; + opts.target_realm=NULL; + opts.community=NULL; + opts.port=TID_PORT; + + argp_parse(&argp, argc, argv, 0, 0, &opts); + /* TBD -- validity checking, dealing with quotes, etc. */ + + print_version_info(); + + /* Use standalone logging */ + tr_log_open(); /* set logging levels */ talloc_set_log_stderr(); tr_log_threshold(LOG_CRIT); tr_console_threshold(LOG_DEBUG); - /* Parse command-line arguments */ - if (argc < 5 || argc > 6) { - tidc_print_usage(argv[0]); - exit(1); - } - - /* TBD -- validity checking, dealing with quotes, etc. */ - server = (char *)argv[1]; - rp_realm = (char *) argv[2]; - realm = (char *)argv[3]; - coi = (char *)argv[4]; - - if (argc > 5) { - port = strtol(argv[5], NULL, 10); - } - - printf("TIDC Client:\nServer = %s, rp_realm = %s, target_realm = %s, community = %s, port = %i\n", server, rp_realm, realm, coi, port); + printf("TIDC Client:\nServer = %s, rp_realm = %s, target_realm = %s, community = %s, port = %i\n", opts.server, opts.rp_realm, opts.target_realm, opts.community, opts.port); /* Create a TID client instance & the client DH */ tidc = tidc_create(); - if (NULL == (tidc->client_dh = tr_create_dh_params(NULL, 0))) { + tidc_set_dh(tidc, tr_create_dh_params(NULL, 0)); + if (tidc_get_dh(tidc) == NULL) { printf("Error creating client DH params.\n"); return 1; } /* Set-up TID connection */ - if (-1 == (conn = tidc_open_connection(tidc, server, port, &gssctx))) { + if (-1 == (conn = tidc_open_connection(tidc, opts.server, opts.port, &gssctx))) { /* Handle error */ printf("Error in tidc_open_connection.\n"); return 1; }; /* Send a TID request */ - if (0 > (rc = tidc_send_request(tidc, conn, gssctx, rp_realm, realm, coi, + if (0 > (rc = tidc_send_request(tidc, conn, gssctx, opts.rp_realm, opts.target_realm, opts.community, &tidc_resp_handler, NULL))) { /* Handle error */ printf("Error in tidc_send_request, rc = %d.\n", rc);