X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=utilities%2Fovs-controller.c;h=c38c8123669f91f7284596c41b24e221e9ef5e48;hb=6f20002c1201c1fc78fc7cedb49b103d8afe9da6;hp=5675f8974738f674249dba772b2a3784e80068c9;hpb=b3907fbc6c74ddad7507d0f7abb1f5a2528cd2be;p=openvswitch diff --git a/utilities/ovs-controller.c b/utilities/ovs-controller.c index 5675f897..c38c8123 100644 --- a/utilities/ovs-controller.c +++ b/utilities/ovs-controller.c @@ -260,7 +260,7 @@ do_switching(struct switch_ *sw) static void read_flow_file(const char *name) { - struct ofpbuf *b; + enum nx_flow_format flow_format; FILE *stream; stream = fopen(optarg, "r"); @@ -268,8 +268,9 @@ read_flow_file(const char *name) ovs_fatal(errno, "%s: open", name); } - while ((b = parse_ofp_add_flow_file(stream)) != NULL) { - list_push_back(&default_flows, &b->list_node); + flow_format = NXFF_OPENFLOW10; + while (parse_ofp_add_flow_file(&default_flows, &flow_format, stream)) { + continue; } fclose(stream);