Merge 'master' into 'next'.

[sliver-openvswitch.git] / utilities / ovs-controller.c

diff --git a/utilities/ovs-controller.c b/utilities/ovs-controller.c
index 27c8e47..89e6a56 100644 (file)
--- a/utilities/ovs-controller.c
+++ b/utilities/ovs-controller.c
@@ -261,6 +261,7 @@ static void
 read_flow_file(const char *name)
 {
     enum nx_flow_format flow_format;
+    bool flow_mod_table_id;
     FILE *stream;
 
     stream = fopen(optarg, "r");
@@ -269,8 +270,10 @@ read_flow_file(const char *name)
     }
 
     flow_format = NXFF_OPENFLOW10;
-    while (parse_ofp_flow_mod_file(&default_flows, &flow_format, stream,
-                                   OFPFC_ADD)) {
+    flow_mod_table_id = false;
+    while (parse_ofp_flow_mod_file(&default_flows,
+                                   &flow_format, &flow_mod_table_id,
+                                   stream, OFPFC_ADD)) {
         continue;
     }
 
@@ -325,10 +328,8 @@ parse_options(int argc, char *argv[])
         {"version",     no_argument, 0, 'V'},
         DAEMON_LONG_OPTIONS,
         VLOG_LONG_OPTIONS,
-#ifdef HAVE_OPENSSL
-        STREAM_SSL_LONG_OPTIONS
+        STREAM_SSL_LONG_OPTIONS,
         {"peer-ca-cert", required_argument, 0, OPT_PEER_CA_CERT},
-#endif
         {0, 0, 0, 0},
     };
     char *short_options = long_options_to_short_options(long_options);
@@ -401,13 +402,11 @@ parse_options(int argc, char *argv[])
         VLOG_OPTION_HANDLERS
         DAEMON_OPTION_HANDLERS
 
-#ifdef HAVE_OPENSSL
         STREAM_SSL_OPTION_HANDLERS
 
         case OPT_PEER_CA_CERT:
             stream_ssl_set_peer_ca_cert_file(optarg);
             break;
-#endif
 
         case '?':
             exit(EXIT_FAILURE);