projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ofp-parse: Fix invalid memory use.
[openvswitch]
/
utilities
/
ovs-ofctl.c
diff --git
a/utilities/ovs-ofctl.c
b/utilities/ovs-ofctl.c
index 6c7e3ac105dccad032c5afcc1fede675a7352d12..3d101789df92fb79499baa455f269ba7b5aaef90 100644
(file)
--- a/
utilities/ovs-ofctl.c
+++ b/
utilities/ovs-ofctl.c
@@
-658,7
+658,7
@@
do_flow_mod__(int argc, char *argv[], uint16_t command)
flow_mod_table_id = false;
parse_ofp_flow_mod_str(&requests, &flow_format, &flow_mod_table_id,
flow_mod_table_id = false;
parse_ofp_flow_mod_str(&requests, &flow_format, &flow_mod_table_id,
- argc > 2 ? argv[2] : "", command);
+ argc > 2 ? argv[2] : "", command
, false
);
check_final_format_for_flow_mod(flow_format);
open_vconn(argv[1], &vconn);
check_final_format_for_flow_mod(flow_format);
open_vconn(argv[1], &vconn);
@@
-1035,7
+1035,7
@@
read_flows_from_file(const char *filename, struct classifier *cls, int index)
struct flow_mod fm;
ofpbuf_init(&actions, 64);
struct flow_mod fm;
ofpbuf_init(&actions, 64);
- parse_ofp_str(&fm,
&actions, ds_cstr(&s)
);
+ parse_ofp_str(&fm,
OFPFC_ADD, ds_cstr(&s), true
);
version = xmalloc(sizeof *version);
version->cookie = fm.cookie;
version = xmalloc(sizeof *version);
version->cookie = fm.cookie;
@@
-1308,7
+1308,7
@@
do_parse_flow(int argc OVS_UNUSED, char *argv[])
list_init(&packets);
parse_ofp_flow_mod_str(&packets, &flow_format, &flow_mod_table_id,
list_init(&packets);
parse_ofp_flow_mod_str(&packets, &flow_format, &flow_mod_table_id,
- argv[1], OFPFC_ADD);
+ argv[1], OFPFC_ADD
, false
);
print_packet_list(&packets);
}
print_packet_list(&packets);
}