X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=tests%2Ftest-jsonrpc.c;h=7cc708a50a7a7f08f84838c2db77193fdb5ac70c;hb=780325b5b8d4c0552b4b7719e0a38200d99f6b08;hp=da92cec90196a10d296a194e7c0c8c83a5887bd8;hpb=9467fe624698a9b72f81bb1ddfce33a5fc85281c;p=sliver-openvswitch.git

diff --git a/tests/test-jsonrpc.c b/tests/test-jsonrpc.c
index da92cec90..7cc708a50 100644
--- a/tests/test-jsonrpc.c
+++ b/tests/test-jsonrpc.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009 Nicira Networks.
+ * Copyright (c) 2009, 2010, 2011, 2012 Nicira, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -42,9 +42,8 @@ static void parse_options(int argc, char *argv[]);
 int
 main(int argc, char *argv[])
 {
+    proctitle_init(argc, argv);
     set_program_name(argv[0]);
-    time_init();
-    vlog_init();
     parse_options(argc, argv);
     run_command(argc - optind, argv + optind, all_commands);
     return 0;
@@ -54,17 +53,16 @@ static void
 parse_options(int argc, char *argv[])
 {
     enum {
-        OPT_BOOTSTRAP_CA_CERT = UCHAR_MAX + 1
+        OPT_BOOTSTRAP_CA_CERT = UCHAR_MAX + 1,
+        DAEMON_OPTION_ENUMS
     };
     static struct option long_options[] = {
-        {"verbose", optional_argument, 0, 'v'},
-        {"help", no_argument, 0, 'h'},
+        {"verbose", optional_argument, NULL, 'v'},
+        {"help", no_argument, NULL, 'h'},
         DAEMON_LONG_OPTIONS,
-#ifdef HAVE_OPENSSL
-        {"bootstrap-ca-cert", required_argument, 0, OPT_BOOTSTRAP_CA_CERT},
-        STREAM_SSL_LONG_OPTIONS
-#endif
-        {0, 0, 0, 0},
+        {"bootstrap-ca-cert", required_argument, NULL, OPT_BOOTSTRAP_CA_CERT},
+        STREAM_SSL_LONG_OPTIONS,
+        {NULL, 0, NULL, 0},
     };
     char *short_options = long_options_to_short_options(long_options);
 
@@ -84,13 +82,11 @@ parse_options(int argc, char *argv[])
 
         DAEMON_OPTION_HANDLERS
 
-#ifdef HAVE_OPENSSL
         STREAM_SSL_OPTION_HANDLERS
 
         case OPT_BOOTSTRAP_CA_CERT:
             stream_ssl_set_ca_cert_file(optarg, true);
             break;
-#endif
 
         case '?':
             exit(EXIT_FAILURE);
@@ -142,11 +138,11 @@ print_and_free_json(struct json *json)
 
 /* Command implementations. */
 
-static void
+static int
 handle_rpc(struct jsonrpc *rpc, struct jsonrpc_msg *msg, bool *done)
 {
-    struct jsonrpc_msg *reply = NULL;
     if (msg->type == JSONRPC_REQUEST) {
+        struct jsonrpc_msg *reply = NULL;
         if (!strcmp(msg->method, "echo")) {
             reply = jsonrpc_create_reply(json_clone(msg->params), msg->id);
         } else {
@@ -155,26 +151,24 @@ handle_rpc(struct jsonrpc *rpc, struct jsonrpc_msg *msg, bool *done)
             reply = jsonrpc_create_error(error, msg->id);
             ovs_error(0, "unknown request %s", msg->method);
         }
-
+        jsonrpc_send(rpc, reply);
+        return 0;
     } else if (msg->type == JSONRPC_NOTIFY) {
         if (!strcmp(msg->method, "shutdown")) {
             *done = true;
+            return 0;
         } else {
-            jsonrpc_error(rpc, ENOTTY);
             ovs_error(0, "unknown notification %s", msg->method);
+            return ENOTTY;
         }
     } else {
-        jsonrpc_error(rpc, EPROTO);
         ovs_error(0, "unsolicited JSON-RPC reply or error");
-    }
-
-    if (reply) {
-        jsonrpc_send(rpc, reply);
+        return EPROTO;
     }
 }
 
 static void
-do_listen(int argc UNUSED, char *argv[])
+do_listen(int argc OVS_UNUSED, char *argv[])
 {
     struct pstream *pstream;
     struct jsonrpc **rpcs;
@@ -182,9 +176,7 @@ do_listen(int argc UNUSED, char *argv[])
     bool done;
     int error;
 
-    die_if_already_running();
-
-    error = pstream_open(argv[1], &pstream);
+    error = jsonrpc_pstream_open(argv[1], &pstream, DSCP_DEFAULT);
     if (error) {
         ovs_fatal(error, "could not listen on \"%s\"", argv[1]);
     }
@@ -218,12 +210,16 @@ do_listen(int argc UNUSED, char *argv[])
             if (!jsonrpc_get_backlog(rpc)) {
                 error = jsonrpc_recv(rpc, &msg);
                 if (!error) {
-                    handle_rpc(rpc, msg, &done);
+                    error = handle_rpc(rpc, msg, &done);
                     jsonrpc_msg_destroy(msg);
+                } else if (error == EAGAIN) {
+                    error = 0;
                 }
             }
 
-            error = jsonrpc_get_status(rpc);
+            if (!error) {
+                error = jsonrpc_get_status(rpc);
+            }
             if (error) {
                 jsonrpc_close(rpc);
                 ovs_error(error, "connection closed");
@@ -250,11 +246,12 @@ do_listen(int argc UNUSED, char *argv[])
         }
         poll_block();
     }
+    free(rpcs);
+    pstream_close(pstream);
 }
 
-
 static void
-do_request(int argc UNUSED, char *argv[])
+do_request(int argc OVS_UNUSED, char *argv[])
 {
     struct jsonrpc_msg *msg;
     struct jsonrpc *rpc;
@@ -272,7 +269,8 @@ do_request(int argc UNUSED, char *argv[])
         ovs_fatal(0, "not a valid JSON-RPC request: %s", string);
     }
 
-    error = stream_open_block(argv[1], &stream);
+    error = stream_open_block(jsonrpc_stream_open(argv[1], &stream,
+                              DSCP_DEFAULT), &stream);
     if (error) {
         ovs_fatal(error, "could not open \"%s\"", argv[1]);
     }
@@ -293,7 +291,7 @@ do_request(int argc UNUSED, char *argv[])
 }
 
 static void
-do_notify(int argc UNUSED, char *argv[])
+do_notify(int argc OVS_UNUSED, char *argv[])
 {
     struct jsonrpc_msg *msg;
     struct jsonrpc *rpc;
@@ -311,7 +309,8 @@ do_notify(int argc UNUSED, char *argv[])
         ovs_fatal(0, "not a JSON RPC-valid notification: %s", string);
     }
 
-    error = stream_open_block(argv[1], &stream);
+    error = stream_open_block(jsonrpc_stream_open(argv[1], &stream,
+                              DSCP_DEFAULT), &stream);
     if (error) {
         ovs_fatal(error, "could not open \"%s\"", argv[1]);
     }
@@ -319,13 +318,13 @@ do_notify(int argc UNUSED, char *argv[])
 
     error = jsonrpc_send_block(rpc, msg);
     if (error) {
-        ovs_fatal(error, "could not send request");
+        ovs_fatal(error, "could not send notification");
     }
     jsonrpc_close(rpc);
 }
 
 static void
-do_help(int argc UNUSED, char *argv[] UNUSED)
+do_help(int argc OVS_UNUSED, char *argv[] OVS_UNUSED)
 {
     usage();
 }