ofproto: Check for overlapping flows only in the target table.

[sliver-openvswitch.git] / tests / test-openflowd.c

diff --git a/tests/test-openflowd.c b/tests/test-openflowd.c
index 016e1cb..4cd9312 100644 (file)
--- a/tests/test-openflowd.c
+++ b/tests/test-openflowd.c
@@ -109,7 +109,7 @@ main(int argc, char *argv[])
         exit(EXIT_FAILURE);
     }
 
-    unixctl_command_register("exit", test_openflowd_exit, &exiting);
+    unixctl_command_register("exit", "", test_openflowd_exit, &exiting);
 
     VLOG_INFO("Open vSwitch version %s", VERSION BUILDNR);
     VLOG_INFO("OpenFlow protocol version 0x%02x", OFP_VERSION);
@@ -123,12 +123,16 @@ main(int argc, char *argv[])
     /* Add ports to the datapath if requested by the user. */
     SSET_FOR_EACH (port, &s.ports) {
         struct netdev *netdev;
+        char *name, *type;
 
-        error = netdev_open(port, "system", &netdev);
+        netdev_parse_name(port, &name, &type);
+        error = netdev_open(name, type, &netdev);
         if (error) {
             VLOG_FATAL("%s: failed to open network device (%s)",
                        port, strerror(error));
         }
+        free(name);
+        free(type);
 
         error = ofproto_port_add(ofproto, netdev, NULL);
         if (error) {