git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
utilites: rename ovs-lib.sh to ovs-lib
[sliver-openvswitch.git]
/
utilities
/
ovs-ofctl.c
diff --git
a/utilities/ovs-ofctl.c
b/utilities/ovs-ofctl.c
index
ce9723b
..
cf77300
100644
(file)
--- a/
utilities/ovs-ofctl.c
+++ b/
utilities/ovs-ofctl.c
@@
-187,10
+187,10
@@
usage(void)
" replace-flows SWITCH FILE replace flows with those in FILE\n"
" monitor SWITCH [MISSLEN] print packets received from SWITCH\n"
"\nFor OpenFlow switches and controllers:\n"
" replace-flows SWITCH FILE replace flows with those in FILE\n"
" monitor SWITCH [MISSLEN] print packets received from SWITCH\n"
"\nFor OpenFlow switches and controllers:\n"
- " probe
VCONN probe whether VCONN
is up\n"
- " ping
VCONN [N]
latency of N-byte echos\n"
- " benchmark
VCONN N COUNT
bandwidth of COUNT N-byte echos\n"
- "where
each SWITCH
is an active OpenFlow connection method.\n",
+ " probe
TARGET probe whether TARGET
is up\n"
+ " ping
TARGET [N]
latency of N-byte echos\n"
+ " benchmark
TARGET N COUNT
bandwidth of COUNT N-byte echos\n"
+ "where
SWITCH or TARGET
is an active OpenFlow connection method.\n",
program_name, program_name);
vconn_usage(true, false, false);
vlog_usage();
program_name, program_name);
vconn_usage(true, false, false);
vlog_usage();
@@
-839,6
+839,11
@@
do_mod_port(int argc OVS_UNUSED, char *argv[])
} else if (!strcasecmp(argv[3], "noflood")) {
opm->mask |= htonl(OFPPC_NO_FLOOD);
opm->config |= htonl(OFPPC_NO_FLOOD);
} else if (!strcasecmp(argv[3], "noflood")) {
opm->mask |= htonl(OFPPC_NO_FLOOD);
opm->config |= htonl(OFPPC_NO_FLOOD);
+ } else if (!strcasecmp(argv[3], "forward")) {
+ opm->mask |= htonl(OFPPC_NO_FWD);
+ } else if (!strcasecmp(argv[3], "noforward")) {
+ opm->mask |= htonl(OFPPC_NO_FWD);
+ opm->config |= htonl(OFPPC_NO_FWD);
} else {
ovs_fatal(0, "unknown mod-port command '%s'", argv[3]);
}
} else {
ovs_fatal(0, "unknown mod-port command '%s'", argv[3]);
}
@@
-1421,7
+1426,7
@@
do_parse_flows(int argc OVS_UNUSED, char *argv[])
file = fopen(argv[1], "r");
if (file == NULL) {
file = fopen(argv[1], "r");
if (file == NULL) {
- ovs_fatal(errno, "%s: open", argv[
2
]);
+ ovs_fatal(errno, "%s: open", argv[
1
]);
}
flow_format = NXFF_OPENFLOW10;
}
flow_format = NXFF_OPENFLOW10;