From: Simon Horman <horms@verge.net.au>
Date: Mon, 14 Nov 2011 08:41:28 +0000 (+0900)
Subject: Make unixctl_command_register() idempotent
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4895c7016139e2e59c17b1d9c39aa3eca90399da;p=openvswitch

Make unixctl_command_register() idempotent

The assert() statement in unixctl_command_register() implies that it is
intended to be idempotent but inserting the same name and callback twice
would fail because:

* The callback is not stored directly in the hash, rather it the
  cb element of a struct unixctl_command which is stored in the hash.

* Insertion would be attempted even if the entry was already present.
---

diff --git a/lib/unixctl.c b/lib/unixctl.c
index 7cc7e5e2..d75166fe 100644
--- a/lib/unixctl.c
+++ b/lib/unixctl.c
@@ -115,9 +115,14 @@ unixctl_command_register(const char *name, const char *args,
         unixctl_cb_func *cb, void *aux)
 {
     struct unixctl_command *command;
+    struct unixctl_command *lookup = shash_find_data(&commands, name);
+
+    assert(!lookup || lookup->cb == cb);
+
+    if (lookup) {
+        return;
+    }
 
-    assert(!shash_find_data(&commands, name)
-           || shash_find_data(&commands, name) == cb);
     command = xmalloc(sizeof *command);
     command->args = args;
     command->cb = cb;