projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
python: Remove unused imports.
[openvswitch]
/
utilities
/
ovs-ofctl.c
diff --git
a/utilities/ovs-ofctl.c
b/utilities/ovs-ofctl.c
index fef7fdacc33d00a9318ab6b20ac4ae6cb24b579d..164d0830f6b2803ce048ad5d8542fd819a8ebe6d 100644
(file)
--- a/
utilities/ovs-ofctl.c
+++ b/
utilities/ovs-ofctl.c
@@
-138,7
+138,7
@@
parse_options(int argc, char *argv[])
usage();
case 'V':
usage();
case 'V':
-
OVS_PRINT_VERSION
(OFP_VERSION, OFP_VERSION);
+
ovs_print_version
(OFP_VERSION, OFP_VERSION);
exit(EXIT_SUCCESS);
case OPT_STRICT:
exit(EXIT_SUCCESS);
case OPT_STRICT:
@@
-534,7
+534,7
@@
static void
do_dump_flows__(int argc, char *argv[], bool aggregate)
{
enum nx_flow_format min_flow_format, flow_format;
do_dump_flows__(int argc, char *argv[], bool aggregate)
{
enum nx_flow_format min_flow_format, flow_format;
- struct flow_stats_request fsr;
+ struct
ofputil_
flow_stats_request fsr;
struct ofpbuf *request;
struct vconn *vconn;
struct ofpbuf *request;
struct vconn *vconn;
@@
-1041,11
+1041,9
@@
read_flows_from_file(const char *filename, struct classifier *cls, int index)
min_flow_format = NXFF_OPENFLOW10;
while (!ds_get_preprocessed_line(&s, file)) {
struct fte_version *version;
min_flow_format = NXFF_OPENFLOW10;
while (!ds_get_preprocessed_line(&s, file)) {
struct fte_version *version;
+ struct ofputil_flow_mod fm;
enum nx_flow_format min_ff;
enum nx_flow_format min_ff;
- struct ofpbuf actions;
- struct flow_mod fm;
- ofpbuf_init(&actions, 64);
parse_ofp_str(&fm, OFPFC_ADD, ds_cstr(&s), true);
version = xmalloc(sizeof *version);
parse_ofp_str(&fm, OFPFC_ADD, ds_cstr(&s), true);
version = xmalloc(sizeof *version);
@@
-1053,8
+1051,8
@@
read_flows_from_file(const char *filename, struct classifier *cls, int index)
version->idle_timeout = fm.idle_timeout;
version->hard_timeout = fm.hard_timeout;
version->flags = fm.flags & (OFPFF_SEND_FLOW_REM | OFPFF_EMERG);
version->idle_timeout = fm.idle_timeout;
version->hard_timeout = fm.hard_timeout;
version->flags = fm.flags & (OFPFF_SEND_FLOW_REM | OFPFF_EMERG);
- version->
n_actions = actions.size / sizeof *version->
actions;
- version->
actions = ofpbuf_steal_data(&actions)
;
+ version->
actions = fm.
actions;
+ version->
n_actions = fm.n_actions
;
min_ff = ofputil_min_flow_format(&fm.cr);
min_flow_format = MAX(min_flow_format, min_ff);
min_ff = ofputil_min_flow_format(&fm.cr);
min_flow_format = MAX(min_flow_format, min_ff);
@@
-1078,7
+1076,7
@@
static void
read_flows_from_switch(struct vconn *vconn, enum nx_flow_format flow_format,
struct classifier *cls, int index)
{
read_flows_from_switch(struct vconn *vconn, enum nx_flow_format flow_format,
struct classifier *cls, int index)
{
- struct flow_stats_request fsr;
+ struct
ofputil_
flow_stats_request fsr;
struct ofpbuf *request;
ovs_be32 send_xid;
bool done;
struct ofpbuf *request;
ovs_be32 send_xid;
bool done;
@@
-1154,7
+1152,7
@@
fte_make_flow_mod(const struct fte *fte, int index, uint16_t command,
enum nx_flow_format flow_format, struct list *packets)
{
const struct fte_version *version = fte->versions[index];
enum nx_flow_format flow_format, struct list *packets)
{
const struct fte_version *version = fte->versions[index];
- struct flow_mod fm;
+ struct
ofputil_
flow_mod fm;
struct ofpbuf *ofm;
fm.cr = fte->rule;
struct ofpbuf *ofm;
fm.cr = fte->rule;
@@
-1402,7
+1400,8
@@
do_parse_nx_match(int argc OVS_UNUSED, char *argv[] OVS_UNUSED)
puts(out);
free(out);
} else {
puts(out);
free(out);
} else {
- printf("nx_pull_match() returned error %x\n", error);
+ printf("nx_pull_match() returned error %x (%s)\n", error,
+ ofputil_error_to_string(error));
}
ofpbuf_uninit(&nx_match);
}
ofpbuf_uninit(&nx_match);