X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=tid%2Fexample%2Ftidc_main.c;h=4ca37800cf7dd6930812f0f279294d7d89564190;hb=ef677b2b70f9e79bc1660bfbacba3a40ce74304f;hp=3088e6bb582667047a26b0649dc12bba4c62d6df;hpb=9883dc6b60bc95f04961e3590fe3ed8732147f13;p=trust_router.git

diff --git a/tid/example/tidc_main.c b/tid/example/tidc_main.c
index 3088e6b..4ca3780 100644
--- a/tid/example/tidc_main.c
+++ b/tid/example/tidc_main.c
@@ -35,15 +35,18 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <talloc.h>
+#include <argp.h>
 
 #include <gsscon.h>
+#include <tr_debug.h>
 #include <tid_internal.h>
 #include <trust_router/tr_dh.h>
+#include <trust_router/tid.h>
+#include <tr_inet_util.h>
 
-void static tidc_print_usage (const char *name)
-{
-  printf("Usage: %s <server> <RP-realm> <target-realm> <community> [<port>]\n", name);
-}
+struct tidc_resp_cookie {
+  int succeeded;
+};
 
 static void tidc_resp_handler (TIDC_INSTANCE * tidc, 
 			TID_REQ *req,
@@ -53,9 +56,13 @@ static void tidc_resp_handler (TIDC_INSTANCE * tidc,
   int c_keylen = 0;
   unsigned char *c_keybuf = NULL;
   int i;
+  struct timeval tv;
+  struct tidc_resp_cookie *data = (struct tidc_resp_cookie *) cookie;
 
   printf ("Response received! Realm = %s, Community = %s.\n", resp->realm->buf, resp->comm->buf);
 
+  data->succeeded = 0;
+
   /* Generate the client key -- TBD, handle more than one server */
   if (TID_SUCCESS != resp->result) {
     fprintf(stderr, "tidc_resp_handler: Response is an error.\n");
@@ -66,7 +73,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))) {
@@ -82,66 +94,176 @@ static void tidc_resp_handler (TIDC_INSTANCE * tidc,
   }
   printf("\n");
 
+  data->succeeded = 1;
   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[]="<server> <RP-realm> <target-realm> <community> [<port>]"; /* 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 */
+}
+
+/* Exit values */
+#define EXIT_OK 0
+#define EXIT_REQ_FAILED 2
+#define EXIT_ERROR 1
+
+/* 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;
+  struct tidc_resp_cookie cookie = {0};
 
-  talloc_set_log_stderr();
-  /* Parse command-line arguments */ 
-  if (argc < 5 || argc > 6) {
-    tidc_print_usage(argv[0]);
-    exit(1);
-  }
+  /* 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. */
-  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);
-  }
+  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);
 
-  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;
+    return EXIT_ERROR;
   }
 
   /* 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;
+    return EXIT_ERROR;
   };
 
   /* Send a TID request */
-  if (0 > (rc = tidc_send_request(tidc, conn, gssctx, rp_realm, realm, coi, 
-				  &tidc_resp_handler, NULL))) {
+  if (0 > (rc = tidc_send_request(tidc, conn, gssctx, opts.rp_realm, opts.target_realm, opts.community, 
+				  &tidc_resp_handler, &cookie))) {
     /* Handle error */
     printf("Error in tidc_send_request, rc = %d.\n", rc);
-    return 1;
+    return EXIT_ERROR;
   }
     
   /* Clean-up the TID client instance, and exit */
   tidc_destroy(tidc);
 
-  return 0;
+  if (cookie.succeeded)
+    return EXIT_OK;
+  else
+    return EXIT_REQ_FAILED;
 }