ofproto: Rework and fix bugs in port change detection.

[openvswitch] / utilities / ovs-controller.c

diff --git a/utilities/ovs-controller.c b/utilities/ovs-controller.c
index f5e5014374c2fc86ad0cae0dda939f191f19897f..ae0ea3da1b2c5d0699d4a8bcd6267a9a2c1f426b 100644 (file)
--- a/utilities/ovs-controller.c
+++ b/utilities/ovs-controller.c
@@ -139,7 +139,6 @@ main(int argc, char *argv[])
         ovs_fatal(0, "no active or passive switch connections");
     }
 
-    die_if_already_running();
     daemonize_start();
 
     retval = unixctl_server_create(unixctl_path, &unixctl);
@@ -269,7 +268,8 @@ read_flow_file(const char *name)
     }
 
     flow_format = NXFF_OPENFLOW10;
-    while (parse_ofp_add_flow_file(&default_flows, &flow_format, stream)) {
+    while (parse_ofp_flow_mod_file(&default_flows, &flow_format, stream,
+                                   OFPFC_ADD)) {
         continue;
     }