"usage: %s [OPTIONS] COMMAND [ARG...]\n"
"\nFor OpenFlow switches:\n"
" show SWITCH show OpenFlow information\n"
- " status SWITCH [KEY] report statistics (about KEY)\n"
" dump-desc SWITCH print switch description\n"
" dump-tables SWITCH print table stats\n"
" mod-port SWITCH IFACE ACT modify port behavior\n"
dump_trivial_transaction(argv[1], OFPT_GET_CONFIG_REQUEST);
}
-static void
-do_status(int argc, char *argv[])
-{
- struct nicira_header *request, *reply;
- struct vconn *vconn;
- struct ofpbuf *b;
-
- request = make_nxmsg(sizeof *request, NXT_STATUS_REQUEST, &b);
- if (argc > 2) {
- ofpbuf_put(b, argv[2], strlen(argv[2]));
- update_openflow_length(b);
- }
- open_vconn(argv[1], &vconn);
- run(vconn_transact(vconn, b, &b), "talking to %s", argv[1]);
- vconn_close(vconn);
-
- if (b->size < sizeof *reply) {
- ovs_fatal(0, "short reply (%zu bytes)", b->size);
- }
- reply = b->data;
- if (reply->header.type != OFPT_VENDOR
- || reply->vendor != ntohl(NX_VENDOR_ID)
- || reply->subtype != ntohl(NXT_STATUS_REPLY)) {
- ofp_print(stderr, b->data, b->size, verbosity + 2);
- ovs_fatal(0, "bad reply");
- }
-
- fwrite(reply + 1, b->size - sizeof *reply, 1, stdout);
-}
-
static void
do_dump_desc(int argc OVS_UNUSED, char *argv[])
{
negotiate_highest_flow_format(struct vconn *vconn, const struct cls_rule *rule,
bool cookie_support, ovs_be64 cookie)
{
- int flow_format;
+ enum nx_flow_format min_format;
+ min_format = ofputil_min_flow_format(rule, cookie_support, cookie);
if (preferred_flow_format != -1) {
- enum nx_flow_format min_format;
+ if (preferred_flow_format < min_format) {
+ ovs_fatal(0, "%s: cannot use requested flow format %s for "
+ "specified flow", vconn_get_name(vconn),
+ ofputil_flow_format_to_string(min_format));
+ }
- min_format = ofputil_min_flow_format(rule, cookie_support, cookie);
- if (preferred_flow_format >= min_format) {
- set_flow_format(vconn, preferred_flow_format);
- return preferred_flow_format;
+ set_flow_format(vconn, preferred_flow_format);
+ return preferred_flow_format;
+ } else {
+ enum nx_flow_format flow_format;
+
+ if (try_set_flow_format(vconn, NXFF_NXM)) {
+ flow_format = NXFF_NXM;
+ } else if (try_set_flow_format(vconn, NXFF_TUN_ID_FROM_COOKIE)) {
+ flow_format = NXFF_TUN_ID_FROM_COOKIE;
+ } else {
+ flow_format = NXFF_OPENFLOW10;
}
- VLOG_WARN("%s: cannot use requested flow format %s for "
- "specified flow", vconn_get_name(vconn),
- ofputil_flow_format_to_string(min_format));
- }
+ if (flow_format < min_format) {
+ ovs_fatal(0, "%s: cannot use switch's most advanced flow format "
+ "%s for specified flow", vconn_get_name(vconn),
+ ofputil_flow_format_to_string(min_format));
+ }
- if (try_set_flow_format(vconn, NXFF_NXM)) {
- flow_format = NXFF_NXM;
- } else if (try_set_flow_format(vconn, NXFF_TUN_ID_FROM_COOKIE)) {
- flow_format = NXFF_TUN_ID_FROM_COOKIE;
- } else {
- flow_format = NXFF_OPENFLOW10;
+ VLOG_DBG("%s: negotiated flow format %s", vconn_get_name(vconn),
+ ofputil_flow_format_to_string(flow_format));
+ return flow_format;
}
-
- VLOG_DBG("%s: negotiated flow format %s", vconn_get_name(vconn),
- ofputil_flow_format_to_string(flow_format));
- return flow_format;
}
static void
struct vconn *vconn;
FILE *file;
- file = fopen(argv[2], "r");
+ file = !strcmp(argv[2], "-") ? stdin : fopen(argv[2], "r");
if (file == NULL) {
ovs_fatal(errno, "%s: open", argv[2]);
}
}
vconn_close(vconn);
- fclose(file);
+ if (file != stdin) {
+ fclose(file);
+ }
}
static void
static const struct command all_commands[] = {
{ "show", 1, 1, do_show },
- { "status", 1, 2, do_status },
{ "monitor", 1, 2, do_monitor },
{ "snoop", 1, 1, do_snoop },
{ "dump-desc", 1, 1, do_dump_desc },