jsonrpc: Make jsonrpc_error() internal.

This function is an implementation detail.  The JSONRPC unit test used it,
but not for any good reason, so this commit changes the test to avoid
using it.

Signed-off-by: Ben Pfaff <blp@nicira.com>

diff --git a/lib/jsonrpc.c b/lib/jsonrpc.c
index 705cef7..3a6077f 100644 (file)
--- a/lib/jsonrpc.c
+++ b/lib/jsonrpc.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2010, 2011 Nicira Networks.
+ * Copyright (c) 2009, 2010, 2011, 2012 Nicira Networks.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -55,6 +55,7 @@ static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(5, 5);
 
 static void jsonrpc_received(struct jsonrpc *);
 static void jsonrpc_cleanup(struct jsonrpc *);
+static void jsonrpc_error(struct jsonrpc *, int error);
 
 /* This is just the same as stream_open() except that it uses the default
  * JSONRPC ports if none is specified. */
@@ -396,7 +397,7 @@ jsonrpc_received(struct jsonrpc *rpc)
     rpc->received = msg;
 }
 
-void
+static void
 jsonrpc_error(struct jsonrpc *rpc, int error)
 {
     assert(error);

diff --git a/lib/jsonrpc.h b/lib/jsonrpc.h
index 5100d74..ff04a54 100644 (file)
--- a/lib/jsonrpc.h
+++ b/lib/jsonrpc.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2010 Nicira Networks.
+ * Copyright (c) 2009, 2010, 2012 Nicira Networks.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -47,7 +47,6 @@ void jsonrpc_close(struct jsonrpc *);
 void jsonrpc_run(struct jsonrpc *);
 void jsonrpc_wait(struct jsonrpc *);
 
-void jsonrpc_error(struct jsonrpc *, int error);
 int jsonrpc_get_status(const struct jsonrpc *);
 size_t jsonrpc_get_backlog(const struct jsonrpc *);
 const char *jsonrpc_get_name(const struct jsonrpc *);

diff --git a/tests/test-jsonrpc.c b/tests/test-jsonrpc.c
index d892ece..f431f86 100644 (file)
--- a/tests/test-jsonrpc.c
+++ b/tests/test-jsonrpc.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2010, 2011 Nicira Networks.
+ * Copyright (c) 2009, 2010, 2011, 2012 Nicira Networks.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -138,11 +138,11 @@ print_and_free_json(struct json *json)
 \f
 /* 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 {
@@ -151,21 +151,19 @@ 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;
     }
 }
 
@@ -212,12 +210,16 @@ do_listen(int argc OVS_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");