Use json_is_true() in place of json_boolean_value() for compatibility

[trust_router.git] / tr / trpc_main.c

diff --git a/tr/trpc_main.c b/tr/trpc_main.c
index e9e0de6..db29417 100644 (file)
--- a/tr/trpc_main.c
+++ b/tr/trpc_main.c
@@ -41,7 +41,7 @@
 #include <gsscon.h>
 #include <tr_debug.h>
 #include <tr_trp.h>
-#include <trust_router/tr_dh.h>
+#include <tr_inet_util.h>
 
 
 /* command-line option setup */
@@ -50,7 +50,7 @@
 const char *argp_program_bug_address=PACKAGE_BUGREPORT; /* bug reporting address */
 
 /* doc strings */
-static const char doc[]=PACKAGE_NAME " - TRP Client";
+static const char doc[]=PACKAGE_NAME " - Moonshot Trust Router TRP Client";
 static const char arg_doc[]="<message> <server> [<port>]"; /* string describing arguments, if any */
 
 /* define the options here. Fields are:
@@ -93,7 +93,19 @@ static error_t parse_option(int key, char *arg, struct argp_state *state)
       break;
 
     case 2:
-      arguments->port=strtol(arg, NULL, 10); /* optional */
+      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:
@@ -124,9 +136,7 @@ int main (int argc,
 {
   TALLOC_CTX *main_ctx=talloc_new(NULL);
   TRPC_INSTANCE *trpc=NULL;
-  int conn = 0;
-  int rc;
-  gss_ctx_id_t gssctx;
+  TRP_CONNECTION *conn=NULL;
   struct cmdline_args opts;
 
   /* parse the command line*/
@@ -137,7 +147,6 @@ int main (int argc,
   opts.repeat=1;
 
   argp_parse(&argp, argc, argv, 0, 0, &opts);
-  /* TBD -- validity checking, dealing with quotes, etc. */
 
   /* Use standalone logging */
   tr_log_open();
@@ -149,25 +158,27 @@ int main (int argc,
 
   printf("TRPC Client:\nServer = %s, port = %i\n", opts.server, opts.port);
  
-  /* Create a TRP client instance & the client DH */
-  trpc = trpc_new(main_ctx);
-  if (NULL == (trpc->client_dh = tr_create_dh_params(NULL, 0))) {
-    printf("Error creating client DH params.\n");
+  conn=trp_connection_new(trpc);
+  if (conn==NULL) {
+    printf("Could not allocate TRP_CONNECTION.\n");
     return 1;
   }
-
+  trpc = trpc_new(main_ctx);
+  trpc_set_server(trpc, opts.server);
+  trpc_set_port(trpc, opts.port);
+  trpc_set_conn(trpc, conn);
   /* Set-up TRP connection */
-  if (-1 == (conn = trpc_open_connection(trpc, opts.server, opts.port, &gssctx))) {
+  if (TRP_SUCCESS != trpc_connect(trpc)) {
     /* Handle error */
-    printf("Error in trpc_open_connection.\n");
+    printf("Error in trpc_connect.\n");
     return 1;
-  };
+  }
 
   /* Send a TRP message */
   while ((opts.repeat==-1) || (opts.repeat-->0)) {
-    if (0 > (rc = trpc_send_msg(trpc, conn, gssctx, opts.msg, NULL, NULL))) {
+    if (TRP_SUCCESS != trpc_send_msg(trpc, opts.msg)) {
       /* Handle error */
-      printf("Error in trpc_send_request, rc = %d.\n", rc);
+      printf("Error in trpc_send_request.");
       return 1;
     }
     usleep(1000000);