ofp-parse: Generalize parse_ofp_add_flow_file() to parse_ofp_flow_mod_file().

An upcoming commit will want to pass a different command.

diff --git a/lib/ofp-parse.c b/lib/ofp-parse.c
index 1c69d880bdda56eb299a6ceea56c88b05fa30501..de7cd9c72e17603dc096a21c330e7113baf2ab67 100644 (file)
--- a/lib/ofp-parse.c
+++ b/lib/ofp-parse.c
@@ -871,8 +871,8 @@ parse_ofp_flow_mod_str(struct list *packets, enum nx_flow_format *cur_format,
  * 'stream' and the command is always OFPFC_ADD.  Returns false if end-of-file
  * is reached before reading a flow, otherwise true. */
 bool
-parse_ofp_add_flow_file(struct list *packets, enum nx_flow_format *cur,
-                        FILE *stream)
+parse_ofp_flow_mod_file(struct list *packets, enum nx_flow_format *cur,
+                        FILE *stream, uint16_t command)
 {
     struct ds s;
     bool ok;
@@ -880,7 +880,7 @@ parse_ofp_add_flow_file(struct list *packets, enum nx_flow_format *cur,
     ds_init(&s);
     ok = ds_get_preprocessed_line(&s, stream) == 0;
     if (ok) {
-        parse_ofp_flow_mod_str(packets, cur, ds_cstr(&s), OFPFC_ADD);
+        parse_ofp_flow_mod_str(packets, cur, ds_cstr(&s), command);
     }
     ds_destroy(&s);
 

diff --git a/lib/ofp-parse.h b/lib/ofp-parse.h
index 3132f16c18548331ff02275a6118435e66d0a275..c8cdade1f1c6db20c82faec733dba3a8765c772d 100644 (file)
--- a/lib/ofp-parse.h
+++ b/lib/ofp-parse.h
@@ -34,8 +34,8 @@ void parse_ofp_str(struct flow_mod *, uint8_t *table_idx,
 
 void parse_ofp_flow_mod_str(struct list *packets, enum nx_flow_format *cur,
                             char *string, uint16_t command);
-bool parse_ofp_add_flow_file(struct list *packets, enum nx_flow_format *cur,
-                             FILE *);
+bool parse_ofp_flow_mod_file(struct list *packets, enum nx_flow_format *cur,
+                             FILE *, uint16_t command);
 
 void parse_ofp_flow_stats_request_str(struct flow_stats_request *,
                                       bool aggregate, char *string);

diff --git a/utilities/ovs-controller.c b/utilities/ovs-controller.c
index f5e5014374c2fc86ad0cae0dda939f191f19897f..af9e11f0d749083925f4b16da6955f163990ef2f 100644 (file)
--- a/utilities/ovs-controller.c
+++ b/utilities/ovs-controller.c
@@ -269,7 +269,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;
     }
 

diff --git a/utilities/ovs-ofctl.c b/utilities/ovs-ofctl.c
index e7997c61e82b95639851baa67e424fbc785e071b..6c476951bde0238f9ed99716f3acfde3efc15ae2 100644 (file)
--- a/utilities/ovs-ofctl.c
+++ b/utilities/ovs-ofctl.c
@@ -674,7 +674,7 @@ do_add_flows(int argc OVS_UNUSED, char *argv[])
     flow_format = set_initial_format_for_flow_mod(&requests);
 
     open_vconn(argv[1], &vconn);
-    while (parse_ofp_add_flow_file(&requests, &flow_format, file)) {
+    while (parse_ofp_flow_mod_file(&requests, &flow_format, file, OFPFC_ADD)) {
         check_final_format_for_flow_mod(flow_format);
         transact_multiple_noreply(vconn, &requests);
     }
@@ -1339,7 +1339,7 @@ do_parse_flows(int argc OVS_UNUSED, char *argv[])
     }
 
     list_init(&packets);
-    while (parse_ofp_add_flow_file(&packets, &flow_format, file)) {
+    while (parse_ofp_flow_mod_file(&packets, &flow_format, file, OFPFC_ADD)) {
         print_packet_list(&packets);
     }
     fclose(file);