/*
- * Copyright (c) 2008, 2009, 2010, 2011 Nicira Networks.
+ * Copyright (c) 2008, 2009, 2010, 2011, 2012 Nicira, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
#include "compiler.h"
#include "dynamic-string.h"
#include "flow.h"
+#include "learn.h"
#include "multipath.h"
+#include "meta-flow.h"
+#include "netdev.h"
#include "nx-match.h"
+#include "ofp-errors.h"
#include "ofp-util.h"
#include "ofpbuf.h"
#include "openflow/openflow.h"
#include "unaligned.h"
#include "util.h"
-static void ofp_print_port_name(struct ds *string, uint16_t port);
static void ofp_print_queue_name(struct ds *string, uint32_t port);
-static void ofp_print_error(struct ds *, int error);
+static void ofp_print_error(struct ds *, enum ofperr);
/* Returns a string that represents the contents of the Ethernet frame in the
- * 'len' bytes starting at 'data' to 'stream' as output by tcpdump.
- * 'total_len' specifies the full length of the Ethernet frame (of which 'len'
- * bytes were captured).
- *
- * The caller must free the returned string.
- *
- * This starts and kills a tcpdump subprocess so it's quite expensive. */
+ * 'len' bytes starting at 'data'. The caller must free the returned string.*/
char *
-ofp_packet_to_string(const void *data, size_t len, size_t total_len OVS_UNUSED)
+ofp_packet_to_string(const void *data, size_t len)
{
struct ds ds = DS_EMPTY_INITIALIZER;
struct ofpbuf buf;
-
- char command[128];
- FILE *pcap;
- FILE *tcpdump;
- int status;
- int c;
+ struct flow flow;
ofpbuf_use_const(&buf, data, len);
-
- pcap = tmpfile();
- if (!pcap) {
- ovs_error(errno, "tmpfile");
- return xstrdup("<error>");
- }
- pcap_write_header(pcap);
- pcap_write(pcap, &buf);
- fflush(pcap);
- if (ferror(pcap)) {
- ovs_error(errno, "error writing temporary file");
+ flow_extract(&buf, 0, 0, 0, &flow);
+ flow_format(&ds, &flow);
+
+ if (buf.l7) {
+ if (flow.nw_proto == IPPROTO_TCP) {
+ struct tcp_header *th = buf.l4;
+ ds_put_format(&ds, " tcp_csum:%"PRIx16,
+ ntohs(th->tcp_csum));
+ } else if (flow.nw_proto == IPPROTO_UDP) {
+ struct udp_header *uh = buf.l4;
+ ds_put_format(&ds, " udp_csum:%"PRIx16,
+ ntohs(uh->udp_csum));
+ }
}
- rewind(pcap);
- snprintf(command, sizeof command, "/usr/sbin/tcpdump -t -e -n -r /dev/fd/%d 2>/dev/null",
- fileno(pcap));
- tcpdump = popen(command, "r");
- fclose(pcap);
- if (!tcpdump) {
- ovs_error(errno, "exec(\"%s\")", command);
- return xstrdup("<error>");
- }
+ ds_put_char(&ds, '\n');
- while ((c = getc(tcpdump)) != EOF) {
- ds_put_char(&ds, c);
- }
-
- status = pclose(tcpdump);
- if (WIFEXITED(status)) {
- if (WEXITSTATUS(status))
- ovs_error(0, "tcpdump exited with status %d", WEXITSTATUS(status));
- } else if (WIFSIGNALED(status)) {
- ovs_error(0, "tcpdump exited with signal %d", WTERMSIG(status));
- }
return ds_cstr(&ds);
}
static void
-ofp_print_packet_in(struct ds *string, const struct ofp_packet_in *op,
+ofp_print_packet_in(struct ds *string, const struct ofp_header *oh,
int verbosity)
{
- size_t len = ntohs(op->header.length);
- size_t data_len;
+ struct ofputil_packet_in pin;
+ int error;
+ int i;
+
+ error = ofputil_decode_packet_in(&pin, oh);
+ if (error) {
+ ofp_print_error(string, error);
+ return;
+ }
+
+ if (pin.table_id) {
+ ds_put_format(string, " table_id=%"PRIu8, pin.table_id);
+ }
- ds_put_format(string, " total_len=%"PRIu16" in_port=",
- ntohs(op->total_len));
- ofp_print_port_name(string, ntohs(op->in_port));
+ if (pin.cookie) {
+ ds_put_format(string, " cookie=0x%"PRIx64, ntohll(pin.cookie));
+ }
+
+ ds_put_format(string, " total_len=%"PRIu16" in_port=", pin.total_len);
+ ofputil_format_port(pin.fmd.in_port, string);
+
+ if (pin.fmd.tun_id_mask) {
+ ds_put_format(string, " tun_id=0x%"PRIx64, ntohll(pin.fmd.tun_id));
+ if (pin.fmd.tun_id_mask != htonll(UINT64_MAX)) {
+ ds_put_format(string, "/0x%"PRIx64, ntohll(pin.fmd.tun_id_mask));
+ }
+ }
- if (op->reason == OFPR_ACTION)
- ds_put_cstr(string, " (via action)");
- else if (op->reason != OFPR_NO_MATCH)
- ds_put_format(string, " (***reason %"PRIu8"***)", op->reason);
+ for (i = 0; i < FLOW_N_REGS; i++) {
+ if (pin.fmd.reg_masks[i]) {
+ ds_put_format(string, " reg%d=0x%"PRIx32, i, pin.fmd.regs[i]);
+ if (pin.fmd.reg_masks[i] != UINT32_MAX) {
+ ds_put_format(string, "/0x%"PRIx32, pin.fmd.reg_masks[i]);
+ }
+ }
+ }
- data_len = len - offsetof(struct ofp_packet_in, data);
- ds_put_format(string, " data_len=%zu", data_len);
- if (op->buffer_id == htonl(UINT32_MAX)) {
+ ds_put_format(string, " (via %s)",
+ ofputil_packet_in_reason_to_string(pin.reason));
+
+ ds_put_format(string, " data_len=%zu", pin.packet_len);
+ if (pin.buffer_id == UINT32_MAX) {
ds_put_format(string, " (unbuffered)");
- if (ntohs(op->total_len) != data_len)
+ if (pin.total_len != pin.packet_len) {
ds_put_format(string, " (***total_len != data_len***)");
+ }
} else {
- ds_put_format(string, " buffer=0x%08"PRIx32, ntohl(op->buffer_id));
- if (ntohs(op->total_len) < data_len)
+ ds_put_format(string, " buffer=0x%08"PRIx32, pin.buffer_id);
+ if (pin.total_len < pin.packet_len) {
ds_put_format(string, " (***total_len < data_len***)");
+ }
}
ds_put_char(string, '\n');
if (verbosity > 0) {
- struct flow flow;
- struct ofpbuf packet;
-
- ofpbuf_use_const(&packet, op->data, data_len);
- flow_extract(&packet, 0, ntohs(op->in_port), &flow);
- flow_format(string, &flow);
- ds_put_char(string, '\n');
- }
- if (verbosity > 1) {
- char *packet = ofp_packet_to_string(op->data, data_len,
- ntohs(op->total_len));
+ char *packet = ofp_packet_to_string(pin.packet, pin.packet_len);
ds_put_cstr(string, packet);
free(packet);
}
}
-static void ofp_print_port_name(struct ds *string, uint16_t port)
-{
- const char *name;
- switch (port) {
- case OFPP_IN_PORT:
- name = "IN_PORT";
- break;
- case OFPP_TABLE:
- name = "TABLE";
- break;
- case OFPP_NORMAL:
- name = "NORMAL";
- break;
- case OFPP_FLOOD:
- name = "FLOOD";
- break;
- case OFPP_ALL:
- name = "ALL";
- break;
- case OFPP_CONTROLLER:
- name = "CONTROLLER";
- break;
- case OFPP_LOCAL:
- name = "LOCAL";
- break;
- case OFPP_NONE:
- name = "NONE";
- break;
- default:
- ds_put_format(string, "%"PRIu16, port);
- return;
- }
- ds_put_cstr(string, name);
-}
-
-
static void
print_note(struct ds *string, const struct nx_action_note *nan)
{
const struct nx_action_multipath *nam;
const struct nx_action_autopath *naa;
const struct nx_action_output_reg *naor;
+ const struct nx_action_fin_timeout *naft;
+ const struct nx_action_controller *nac;
+ struct mf_subfield subfield;
uint16_t port;
switch (code) {
- case OFPUTIL_OFPAT_OUTPUT:
+ case OFPUTIL_OFPAT10_OUTPUT:
port = ntohs(a->output.port);
if (port < OFPP_MAX) {
ds_put_format(s, "output:%"PRIu16, port);
} else {
- ofp_print_port_name(s, port);
+ ofputil_format_port(port, s);
if (port == OFPP_CONTROLLER) {
if (a->output.max_len != htons(0)) {
ds_put_format(s, ":%"PRIu16, ntohs(a->output.max_len));
}
break;
- case OFPUTIL_OFPAT_ENQUEUE:
+ case OFPUTIL_OFPAT10_ENQUEUE:
oae = (const struct ofp_action_enqueue *) a;
ds_put_format(s, "enqueue:");
- ofp_print_port_name(s, ntohs(oae->port));
+ ofputil_format_port(ntohs(oae->port), s);
ds_put_format(s, "q%"PRIu32, ntohl(oae->queue_id));
break;
- case OFPUTIL_OFPAT_SET_VLAN_VID:
+ case OFPUTIL_OFPAT10_SET_VLAN_VID:
ds_put_format(s, "mod_vlan_vid:%"PRIu16,
ntohs(a->vlan_vid.vlan_vid));
break;
- case OFPUTIL_OFPAT_SET_VLAN_PCP:
+ case OFPUTIL_OFPAT10_SET_VLAN_PCP:
ds_put_format(s, "mod_vlan_pcp:%"PRIu8, a->vlan_pcp.vlan_pcp);
break;
- case OFPUTIL_OFPAT_STRIP_VLAN:
+ case OFPUTIL_OFPAT10_STRIP_VLAN:
ds_put_cstr(s, "strip_vlan");
break;
- case OFPUTIL_OFPAT_SET_DL_SRC:
+ case OFPUTIL_OFPAT10_SET_DL_SRC:
oada = (const struct ofp_action_dl_addr *) a;
ds_put_format(s, "mod_dl_src:"ETH_ADDR_FMT,
ETH_ADDR_ARGS(oada->dl_addr));
break;
- case OFPUTIL_OFPAT_SET_DL_DST:
+ case OFPUTIL_OFPAT10_SET_DL_DST:
oada = (const struct ofp_action_dl_addr *) a;
ds_put_format(s, "mod_dl_dst:"ETH_ADDR_FMT,
ETH_ADDR_ARGS(oada->dl_addr));
break;
- case OFPUTIL_OFPAT_SET_NW_SRC:
+ case OFPUTIL_OFPAT10_SET_NW_SRC:
ds_put_format(s, "mod_nw_src:"IP_FMT, IP_ARGS(&a->nw_addr.nw_addr));
break;
- case OFPUTIL_OFPAT_SET_NW_DST:
+ case OFPUTIL_OFPAT10_SET_NW_DST:
ds_put_format(s, "mod_nw_dst:"IP_FMT, IP_ARGS(&a->nw_addr.nw_addr));
break;
- case OFPUTIL_OFPAT_SET_NW_TOS:
+ case OFPUTIL_OFPAT10_SET_NW_TOS:
ds_put_format(s, "mod_nw_tos:%d", a->nw_tos.nw_tos);
break;
- case OFPUTIL_OFPAT_SET_TP_SRC:
+ case OFPUTIL_OFPAT10_SET_TP_SRC:
ds_put_format(s, "mod_tp_src:%d", ntohs(a->tp_port.tp_port));
break;
- case OFPUTIL_OFPAT_SET_TP_DST:
+ case OFPUTIL_OFPAT10_SET_TP_DST:
ds_put_format(s, "mod_tp_dst:%d", ntohs(a->tp_port.tp_port));
break;
case OFPUTIL_NXAST_RESUBMIT:
nar = (struct nx_action_resubmit *)a;
ds_put_format(s, "resubmit:");
- ofp_print_port_name(s, ntohs(nar->in_port));
+ ofputil_format_port(ntohs(nar->in_port), s);
break;
case OFPUTIL_NXAST_RESUBMIT_TABLE:
nar = (struct nx_action_resubmit *)a;
ds_put_format(s, "resubmit(");
if (nar->in_port != htons(OFPP_IN_PORT)) {
- ofp_print_port_name(s, ntohs(nar->in_port));
+ ofputil_format_port(ntohs(nar->in_port), s);
}
ds_put_char(s, ',');
if (nar->table != 255) {
case OFPUTIL_NXAST_AUTOPATH:
naa = (const struct nx_action_autopath *)a;
ds_put_format(s, "autopath(%u,", ntohl(naa->id));
- nxm_format_field_bits(s, ntohl(naa->dst),
- nxm_decode_ofs(naa->ofs_nbits),
- nxm_decode_n_bits(naa->ofs_nbits));
+ nxm_decode(&subfield, naa->dst, naa->ofs_nbits);
+ mf_format_subfield(&subfield, s);
ds_put_char(s, ')');
break;
case OFPUTIL_NXAST_OUTPUT_REG:
naor = (const struct nx_action_output_reg *) a;
ds_put_cstr(s, "output:");
- nxm_format_field_bits(s, ntohl(naor->src),
- nxm_decode_ofs(naor->ofs_nbits),
- nxm_decode_n_bits(naor->ofs_nbits));
+ nxm_decode(&subfield, naor->src, naor->ofs_nbits);
+ mf_format_subfield(&subfield, s);
+ break;
+
+ case OFPUTIL_NXAST_LEARN:
+ learn_format((const struct nx_action_learn *) a, s);
+ break;
+
+ case OFPUTIL_NXAST_DEC_TTL:
+ ds_put_cstr(s, "dec_ttl");
+ break;
+
+ case OFPUTIL_NXAST_EXIT:
+ ds_put_cstr(s, "exit");
+ break;
+
+ case OFPUTIL_NXAST_FIN_TIMEOUT:
+ naft = (const struct nx_action_fin_timeout *) a;
+ ds_put_cstr(s, "fin_timeout(");
+ if (naft->fin_idle_timeout) {
+ ds_put_format(s, "idle_timeout=%"PRIu16",",
+ ntohs(naft->fin_idle_timeout));
+ }
+ if (naft->fin_hard_timeout) {
+ ds_put_format(s, "hard_timeout=%"PRIu16",",
+ ntohs(naft->fin_hard_timeout));
+ }
+ ds_chomp(s, ',');
+ ds_put_char(s, ')');
+ break;
+
+ case OFPUTIL_NXAST_CONTROLLER:
+ nac = (const struct nx_action_controller *) a;
+ ds_put_cstr(s, "controller(");
+ if (nac->reason != OFPR_ACTION) {
+ ds_put_format(s, "reason=%s,",
+ ofputil_packet_in_reason_to_string(nac->reason));
+ }
+ if (nac->max_len != htons(UINT16_MAX)) {
+ ds_put_format(s, "max_len=%"PRIu16",", ntohs(nac->max_len));
+ }
+ if (nac->controller_id != htons(0)) {
+ ds_put_format(s, "id=%"PRIu16",", ntohs(nac->controller_id));
+ }
+ ds_chomp(s, ',');
+ ds_put_char(s, ')');
break;
default:
ofp_print_packet_out(struct ds *string, const struct ofp_packet_out *opo,
int verbosity)
{
- size_t len = ntohs(opo->header.length);
- size_t actions_len = ntohs(opo->actions_len);
+ struct ofputil_packet_out po;
+ enum ofperr error;
- ds_put_cstr(string, " in_port=");
- ofp_print_port_name(string, ntohs(opo->in_port));
-
- ds_put_format(string, " actions_len=%zu ", actions_len);
- if (actions_len > (ntohs(opo->header.length) - sizeof *opo)) {
- ds_put_format(string, "***packet too short for action length***\n");
+ error = ofputil_decode_packet_out(&po, opo);
+ if (error) {
+ ofp_print_error(string, error);
return;
}
- if (actions_len % sizeof(union ofp_action)) {
- ds_put_format(string, "***action length not a multiple of %zu***\n",
- sizeof(union ofp_action));
- }
- ofp_print_actions(string, (const union ofp_action *) opo->actions,
- actions_len / sizeof(union ofp_action));
- if (ntohl(opo->buffer_id) == UINT32_MAX) {
- int data_len = len - sizeof *opo - actions_len;
- ds_put_format(string, " data_len=%d", data_len);
- if (verbosity > 0 && len > sizeof *opo) {
- char *packet = ofp_packet_to_string(
- (uint8_t *)opo->actions + actions_len, data_len, data_len);
+ ds_put_cstr(string, " in_port=");
+ ofputil_format_port(po.in_port, string);
+
+ ds_put_char(string, ' ');
+ ofp_print_actions(string, po.actions, po.n_actions);
+
+ if (po.buffer_id == UINT32_MAX) {
+ ds_put_format(string, " data_len=%zu", po.packet_len);
+ if (verbosity > 0 && po.packet_len > 0) {
+ char *packet = ofp_packet_to_string(po.packet, po.packet_len);
ds_put_char(string, '\n');
ds_put_cstr(string, packet);
free(packet);
}
} else {
- ds_put_format(string, " buffer=0x%08"PRIx32, ntohl(opo->buffer_id));
+ ds_put_format(string, " buffer=0x%08"PRIx32, po.buffer_id);
}
ds_put_char(string, '\n');
}
static int
compare_ports(const void *a_, const void *b_)
{
- const struct ofp_phy_port *a = a_;
- const struct ofp_phy_port *b = b_;
- uint16_t ap = ntohs(a->port_no);
- uint16_t bp = ntohs(b->port_no);
+ const struct ofputil_phy_port *a = a_;
+ const struct ofputil_phy_port *b = b_;
+ uint16_t ap = a->port_no;
+ uint16_t bp = b->port_no;
return ap < bp ? -1 : ap > bp;
}
-struct bit_name {
- uint32_t bit;
- const char *name;
-};
-
static void
ofp_print_bit_names(struct ds *string, uint32_t bits,
- const struct bit_name bit_names[])
+ const char *(*bit_to_name)(uint32_t bit))
{
int n = 0;
+ int i;
if (!bits) {
ds_put_cstr(string, "0");
return;
}
- for (; bits && bit_names->name; bit_names++) {
- if (bits & bit_names->bit) {
- if (n++) {
- ds_put_char(string, ' ');
+ for (i = 0; i < 32; i++) {
+ uint32_t bit = UINT32_C(1) << i;
+
+ if (bits & bit) {
+ const char *name = bit_to_name(bit);
+ if (name) {
+ if (n++) {
+ ds_put_char(string, ' ');
+ }
+ ds_put_cstr(string, name);
+ bits &= ~bit;
}
- ds_put_cstr(string, bit_names->name);
- bits &= ~bit_names->bit;
}
}
if (bits) {
- if (n++) {
+ if (n) {
ds_put_char(string, ' ');
}
ds_put_format(string, "0x%"PRIx32, bits);
}
}
+static const char *
+netdev_feature_to_name(uint32_t bit)
+{
+ enum netdev_features f = bit;
+
+ switch (f) {
+ case NETDEV_F_10MB_HD: return "10MB-HD";
+ case NETDEV_F_10MB_FD: return "10MB-FD";
+ case NETDEV_F_100MB_HD: return "100MB-HD";
+ case NETDEV_F_100MB_FD: return "100MB-FD";
+ case NETDEV_F_1GB_HD: return "1GB-HD";
+ case NETDEV_F_1GB_FD: return "1GB-FD";
+ case NETDEV_F_10GB_FD: return "10GB-FD";
+ case NETDEV_F_40GB_FD: return "40GB-FD";
+ case NETDEV_F_100GB_FD: return "100GB-FD";
+ case NETDEV_F_1TB_FD: return "1TB-FD";
+ case NETDEV_F_OTHER: return "OTHER";
+ case NETDEV_F_COPPER: return "COPPER";
+ case NETDEV_F_FIBER: return "FIBER";
+ case NETDEV_F_AUTONEG: return "AUTO_NEG";
+ case NETDEV_F_PAUSE: return "AUTO_PAUSE";
+ case NETDEV_F_PAUSE_ASYM: return "AUTO_PAUSE_ASYM";
+ }
+
+ return NULL;
+}
+
static void
-ofp_print_port_features(struct ds *string, uint32_t features)
+ofp_print_port_features(struct ds *string, enum netdev_features features)
{
- static const struct bit_name feature_bits[] = {
- { OFPPF_10MB_HD, "10MB-HD" },
- { OFPPF_10MB_FD, "10MB-FD" },
- { OFPPF_100MB_HD, "100MB-HD" },
- { OFPPF_100MB_FD, "100MB-FD" },
- { OFPPF_1GB_HD, "1GB-HD" },
- { OFPPF_1GB_FD, "1GB-FD" },
- { OFPPF_10GB_FD, "10GB-FD" },
- { OFPPF_COPPER, "COPPER" },
- { OFPPF_FIBER, "FIBER" },
- { OFPPF_AUTONEG, "AUTO_NEG" },
- { OFPPF_PAUSE, "AUTO_PAUSE" },
- { OFPPF_PAUSE_ASYM, "AUTO_PAUSE_ASYM" },
- { 0, NULL },
- };
-
- ofp_print_bit_names(string, features, feature_bits);
+ ofp_print_bit_names(string, features, netdev_feature_to_name);
ds_put_char(string, '\n');
}
+static const char *
+ofputil_port_config_to_name(uint32_t bit)
+{
+ enum ofputil_port_config pc = bit;
+
+ switch (pc) {
+ case OFPUTIL_PC_PORT_DOWN: return "PORT_DOWN";
+ case OFPUTIL_PC_NO_STP: return "NO_STP";
+ case OFPUTIL_PC_NO_RECV: return "NO_RECV";
+ case OFPUTIL_PC_NO_RECV_STP: return "NO_RECV_STP";
+ case OFPUTIL_PC_NO_FLOOD: return "NO_FLOOD";
+ case OFPUTIL_PC_NO_FWD: return "NO_FWD";
+ case OFPUTIL_PC_NO_PACKET_IN: return "NO_PACKET_IN";
+ }
+
+ return NULL;
+}
+
static void
-ofp_print_port_config(struct ds *string, uint32_t config)
+ofp_print_port_config(struct ds *string, enum ofputil_port_config config)
{
- static const struct bit_name config_bits[] = {
- { OFPPC_PORT_DOWN, "PORT_DOWN" },
- { OFPPC_NO_STP, "NO_STP" },
- { OFPPC_NO_RECV, "NO_RECV" },
- { OFPPC_NO_RECV_STP, "NO_RECV_STP" },
- { OFPPC_NO_FLOOD, "NO_FLOOD" },
- { OFPPC_NO_FWD, "NO_FWD" },
- { OFPPC_NO_PACKET_IN, "NO_PACKET_IN" },
- { 0, NULL },
- };
-
- ofp_print_bit_names(string, config, config_bits);
+ ofp_print_bit_names(string, config, ofputil_port_config_to_name);
ds_put_char(string, '\n');
}
+static const char *
+ofputil_port_state_to_name(uint32_t bit)
+{
+ enum ofputil_port_state ps = bit;
+
+ switch (ps) {
+ case OFPUTIL_PS_LINK_DOWN: return "LINK_DOWN";
+ case OFPUTIL_PS_BLOCKED: return "BLOCKED";
+ case OFPUTIL_PS_LIVE: return "LIVE";
+
+ case OFPUTIL_PS_STP_LISTEN:
+ case OFPUTIL_PS_STP_LEARN:
+ case OFPUTIL_PS_STP_FORWARD:
+ case OFPUTIL_PS_STP_BLOCK:
+ /* Handled elsewhere. */
+ return NULL;
+ }
+
+ return NULL;
+}
+
static void
-ofp_print_port_state(struct ds *string, uint32_t state)
+ofp_print_port_state(struct ds *string, enum ofputil_port_state state)
{
- static const struct bit_name state_bits[] = {
- { OFPPS_LINK_DOWN, "LINK_DOWN" },
- { 0, NULL },
- };
- uint32_t stp_state;
+ enum ofputil_port_state stp_state;
/* The STP state is a 2-bit field so it doesn't fit in with the bitmask
* pattern. We have to special case it.
* talking to OVS, so we'd always print STP_LISTEN in that case.
* Therefore, we don't print anything at all if the value is STP_LISTEN, to
* avoid confusing users. */
- stp_state = state & OFPPS_STP_MASK;
+ stp_state = state & OFPUTIL_PS_STP_MASK;
if (stp_state) {
- ds_put_cstr(string, (stp_state == OFPPS_STP_LEARN ? "STP_LEARN"
- : stp_state == OFPPS_STP_FORWARD ? "STP_FORWARD"
- : "STP_BLOCK"));
- state &= ~OFPPS_STP_MASK;
+ ds_put_cstr(string,
+ (stp_state == OFPUTIL_PS_STP_LEARN ? "STP_LEARN"
+ : stp_state == OFPUTIL_PS_STP_FORWARD ? "STP_FORWARD"
+ : "STP_BLOCK"));
+ state &= ~OFPUTIL_PS_STP_MASK;
if (state) {
- ofp_print_bit_names(string, state, state_bits);
+ ofp_print_bit_names(string, state, ofputil_port_state_to_name);
}
} else {
- ofp_print_bit_names(string, state, state_bits);
+ ofp_print_bit_names(string, state, ofputil_port_state_to_name);
}
ds_put_char(string, '\n');
}
static void
-ofp_print_phy_port(struct ds *string, const struct ofp_phy_port *port)
+ofp_print_phy_port(struct ds *string, const struct ofputil_phy_port *port)
{
- char name[OFP_MAX_PORT_NAME_LEN];
+ char name[sizeof port->name];
int j;
memcpy(name, port->name, sizeof name);
name[j] = '\0';
ds_put_char(string, ' ');
- ofp_print_port_name(string, ntohs(port->port_no));
+ ofputil_format_port(port->port_no, string);
ds_put_format(string, "(%s): addr:"ETH_ADDR_FMT"\n",
name, ETH_ADDR_ARGS(port->hw_addr));
ds_put_cstr(string, " config: ");
- ofp_print_port_config(string, ntohl(port->config));
+ ofp_print_port_config(string, port->config);
ds_put_cstr(string, " state: ");
- ofp_print_port_state(string, ntohl(port->state));
+ ofp_print_port_state(string, port->state);
if (port->curr) {
ds_put_format(string, " current: ");
- ofp_print_port_features(string, ntohl(port->curr));
+ ofp_print_port_features(string, port->curr);
}
if (port->advertised) {
ds_put_format(string, " advertised: ");
- ofp_print_port_features(string, ntohl(port->advertised));
+ ofp_print_port_features(string, port->advertised);
}
if (port->supported) {
ds_put_format(string, " supported: ");
- ofp_print_port_features(string, ntohl(port->supported));
+ ofp_print_port_features(string, port->supported);
}
if (port->peer) {
ds_put_format(string, " peer: ");
- ofp_print_port_features(string, ntohl(port->peer));
+ ofp_print_port_features(string, port->peer);
}
+ ds_put_format(string, " speed: %"PRIu32" Mbps now, "
+ "%"PRIu32" Mbps max\n",
+ port->curr_speed / UINT32_C(1000),
+ port->max_speed / UINT32_C(1000));
+}
+
+/* Given a buffer 'b' that contains an array of OpenFlow ports of type
+ * 'ofp_version', writes a detailed description of each port into
+ * 'string'. */
+static void
+ofp_print_phy_ports(struct ds *string, uint8_t ofp_version,
+ struct ofpbuf *b)
+{
+ size_t n_ports;
+ struct ofputil_phy_port *ports;
+ enum ofperr error;
+ size_t i;
+
+ n_ports = ofputil_count_phy_ports(ofp_version, b);
+
+ ports = xmalloc(n_ports * sizeof *ports);
+ for (i = 0; i < n_ports; i++) {
+ error = ofputil_pull_phy_port(ofp_version, b, &ports[i]);
+ if (error) {
+ ofp_print_error(string, error);
+ goto exit;
+ }
+ }
+ qsort(ports, n_ports, sizeof *ports, compare_ports);
+ for (i = 0; i < n_ports; i++) {
+ ofp_print_phy_port(string, &ports[i]);
+ }
+
+exit:
+ free(ports);
+}
+
+static const char *
+ofputil_capabilities_to_name(uint32_t bit)
+{
+ enum ofputil_capabilities capabilities = bit;
+
+ switch (capabilities) {
+ case OFPUTIL_C_FLOW_STATS: return "FLOW_STATS";
+ case OFPUTIL_C_TABLE_STATS: return "TABLE_STATS";
+ case OFPUTIL_C_PORT_STATS: return "PORT_STATS";
+ case OFPUTIL_C_IP_REASM: return "IP_REASM";
+ case OFPUTIL_C_QUEUE_STATS: return "QUEUE_STATS";
+ case OFPUTIL_C_ARP_MATCH_IP: return "ARP_MATCH_IP";
+ case OFPUTIL_C_STP: return "STP";
+ case OFPUTIL_C_GROUP_STATS: return "GROUP_STATS";
+ }
+
+ return NULL;
+}
+
+static const char *
+ofputil_action_bitmap_to_name(uint32_t bit)
+{
+ enum ofputil_action_bitmap action = bit;
+
+ switch (action) {
+ case OFPUTIL_A_OUTPUT: return "OUTPUT";
+ case OFPUTIL_A_SET_VLAN_VID: return "SET_VLAN_VID";
+ case OFPUTIL_A_SET_VLAN_PCP: return "SET_VLAN_PCP";
+ case OFPUTIL_A_STRIP_VLAN: return "STRIP_VLAN";
+ case OFPUTIL_A_SET_DL_SRC: return "SET_DL_SRC";
+ case OFPUTIL_A_SET_DL_DST: return "SET_DL_DST";
+ case OFPUTIL_A_SET_NW_SRC: return "SET_NW_SRC";
+ case OFPUTIL_A_SET_NW_DST: return "SET_NW_DST";
+ case OFPUTIL_A_SET_NW_ECN: return "SET_NW_ECN";
+ case OFPUTIL_A_SET_NW_TOS: return "SET_NW_TOS";
+ case OFPUTIL_A_SET_TP_SRC: return "SET_TP_SRC";
+ case OFPUTIL_A_SET_TP_DST: return "SET_TP_DST";
+ case OFPUTIL_A_ENQUEUE: return "ENQUEUE";
+ case OFPUTIL_A_COPY_TTL_OUT: return "COPY_TTL_OUT";
+ case OFPUTIL_A_COPY_TTL_IN: return "COPY_TTL_IN";
+ case OFPUTIL_A_SET_MPLS_LABEL: return "SET_MPLS_LABEL";
+ case OFPUTIL_A_SET_MPLS_TC: return "SET_MPLS_TC";
+ case OFPUTIL_A_SET_MPLS_TTL: return "SET_MPLS_TTL";
+ case OFPUTIL_A_DEC_MPLS_TTL: return "DEC_MPLS_TTL";
+ case OFPUTIL_A_PUSH_VLAN: return "PUSH_VLAN";
+ case OFPUTIL_A_POP_VLAN: return "POP_VLAN";
+ case OFPUTIL_A_PUSH_MPLS: return "PUSH_MPLS";
+ case OFPUTIL_A_POP_MPLS: return "POP_MPLS";
+ case OFPUTIL_A_SET_QUEUE: return "SET_QUEUE";
+ case OFPUTIL_A_GROUP: return "GROUP";
+ case OFPUTIL_A_SET_NW_TTL: return "SET_NW_TTL";
+ case OFPUTIL_A_DEC_NW_TTL: return "DEC_NW_TTL";
+ }
+
+ return NULL;
}
static void
ofp_print_switch_features(struct ds *string,
const struct ofp_switch_features *osf)
{
- size_t len = ntohs(osf->header.length);
- struct ofp_phy_port *port_list;
- int n_ports;
- int i;
+ struct ofputil_switch_features features;
+ enum ofperr error;
+ struct ofpbuf b;
- ds_put_format(string, " ver:0x%x, dpid:%016"PRIx64"\n",
- osf->header.version, ntohll(osf->datapath_id));
- ds_put_format(string, "n_tables:%d, n_buffers:%d\n", osf->n_tables,
- ntohl(osf->n_buffers));
- ds_put_format(string, "features: capabilities:%#x, actions:%#x\n",
- ntohl(osf->capabilities), ntohl(osf->actions));
+ error = ofputil_decode_switch_features(osf, &features, &b);
+ if (error) {
+ ofp_print_error(string, error);
+ return;
+ }
- n_ports = (len - sizeof *osf) / sizeof *osf->ports;
+ ds_put_format(string, " dpid:%016"PRIx64"\n", features.datapath_id);
+ ds_put_format(string, "n_tables:%"PRIu8", n_buffers:%"PRIu32"\n",
+ features.n_tables, features.n_buffers);
- port_list = xmemdup(osf->ports, len - sizeof *osf);
- qsort(port_list, n_ports, sizeof *port_list, compare_ports);
- for (i = 0; i < n_ports; i++) {
- ofp_print_phy_port(string, &port_list[i]);
- }
- free(port_list);
+ ds_put_cstr(string, "capabilities: ");
+ ofp_print_bit_names(string, features.capabilities,
+ ofputil_capabilities_to_name);
+ ds_put_char(string, '\n');
+
+ ds_put_cstr(string, "actions: ");
+ ofp_print_bit_names(string, features.actions,
+ ofputil_action_bitmap_to_name);
+ ds_put_char(string, '\n');
+
+ ofp_print_phy_ports(string, osf->header.version, &b);
}
static void
ofp_print_switch_config(struct ds *string, const struct ofp_switch_config *osc)
{
- uint16_t flags;
+ enum ofp_config_flags flags;
flags = ntohs(osc->flags);
- ds_put_cstr(string, " frags=");
- switch (flags & OFPC_FRAG_MASK) {
- case OFPC_FRAG_NORMAL:
- ds_put_cstr(string, "normal");
- flags &= ~OFPC_FRAG_MASK;
- break;
- case OFPC_FRAG_DROP:
- ds_put_cstr(string, "drop");
- flags &= ~OFPC_FRAG_MASK;
- break;
- case OFPC_FRAG_REASM:
- ds_put_cstr(string, "reassemble");
- flags &= ~OFPC_FRAG_MASK;
- break;
+ ds_put_format(string, " frags=%s", ofputil_frag_handling_to_string(flags));
+ flags &= ~OFPC_FRAG_MASK;
+
+ if (flags & OFPC_INVALID_TTL_TO_CONTROLLER) {
+ ds_put_format(string, " invalid_ttl_to_controller");
+ flags &= ~OFPC_INVALID_TTL_TO_CONTROLLER;
}
+
if (flags) {
ds_put_format(string, " ***unknown flags 0x%04"PRIx16"***", flags);
}
"%u", om->nw_tos);
if (om->nw_proto == IPPROTO_ICMP) {
print_wild(&f, "icmp_type=", w & OFPFW_ICMP_TYPE, verbosity,
- "%d", ntohs(om->icmp_type));
+ "%d", ntohs(om->tp_src));
print_wild(&f, "icmp_code=", w & OFPFW_ICMP_CODE, verbosity,
- "%d", ntohs(om->icmp_code));
+ "%d", ntohs(om->tp_dst));
} else {
print_wild(&f, "tp_src=", w & OFPFW_TP_SRC, verbosity,
"%d", ntohs(om->tp_src));
{
struct ofputil_flow_mod fm;
bool need_priority;
- int error;
+ enum ofperr error;
- error = ofputil_decode_flow_mod(&fm, oh, true);
+ error = ofputil_decode_flow_mod(&fm, oh, OFPUTIL_P_OF10_TID);
if (error) {
ofp_print_error(s, error);
return;
if (ds_last(s) != ' ') {
ds_put_char(s, ' ');
}
- if (fm.cookie != htonll(0)) {
- ds_put_format(s, "cookie:0x%"PRIx64" ", ntohll(fm.cookie));
+ if (fm.new_cookie != htonll(0)) {
+ ds_put_format(s, "cookie:0x%"PRIx64" ", ntohll(fm.new_cookie));
+ }
+ if (fm.cookie_mask != htonll(0)) {
+ ds_put_format(s, "cookie:0x%"PRIx64"/0x%"PRIx64" ",
+ ntohll(fm.cookie), ntohll(fm.cookie_mask));
}
if (fm.idle_timeout != OFP_FLOW_PERMANENT) {
ds_put_format(s, "idle:%"PRIu16" ", fm.idle_timeout);
ds_put_format(s, "buf:0x%"PRIx32" ", fm.buffer_id);
}
if (fm.flags != 0) {
- ds_put_format(s, "flags:0x%"PRIx16" ", fm.flags);
+ uint16_t flags = fm.flags;
+
+ if (flags & OFPFF_SEND_FLOW_REM) {
+ ds_put_cstr(s, "send_flow_rem ");
+ }
+ if (flags & OFPFF_CHECK_OVERLAP) {
+ ds_put_cstr(s, "check_overlap ");
+ }
+ if (flags & OFPFF_EMERG) {
+ ds_put_cstr(s, "emerg ");
+ }
+
+ flags &= ~(OFPFF_SEND_FLOW_REM | OFPFF_CHECK_OVERLAP | OFPFF_EMERG);
+ if (flags) {
+ ds_put_format(s, "flags:0x%"PRIx16" ", flags);
+ }
}
ofp_print_actions(s, fm.actions, fm.n_actions);
ds_put_char(string, 's');
}
+static const char *
+ofp_flow_removed_reason_to_string(enum ofp_flow_removed_reason reason)
+{
+ static char s[32];
+
+ switch (reason) {
+ case OFPRR_IDLE_TIMEOUT:
+ return "idle";
+ case OFPRR_HARD_TIMEOUT:
+ return "hard";
+ case OFPRR_DELETE:
+ return "delete";
+ case OFPRR_GROUP_DELETE:
+ return "group_delete";
+ default:
+ sprintf(s, "%d", (int) reason);
+ return s;
+ }
+}
+
static void
ofp_print_flow_removed(struct ds *string, const struct ofp_header *oh)
{
struct ofputil_flow_removed fr;
- int error;
+ enum ofperr error;
error = ofputil_decode_flow_removed(&fr, oh);
if (error) {
ds_put_char(string, ' ');
cls_rule_format(&fr.rule, string);
- ds_put_cstr(string, " reason=");
- switch (fr.reason) {
- case OFPRR_IDLE_TIMEOUT:
- ds_put_cstr(string, "idle");
- break;
- case OFPRR_HARD_TIMEOUT:
- ds_put_cstr(string, "hard");
- break;
- case OFPRR_DELETE:
- ds_put_cstr(string, "delete");
- break;
- default:
- ds_put_format(string, "**%"PRIu8"**", fr.reason);
- break;
- }
+ ds_put_format(string, " reason=%s",
+ ofp_flow_removed_reason_to_string(fr.reason));
if (fr.cookie != htonll(0)) {
ds_put_format(string, " cookie:0x%"PRIx64, ntohll(fr.cookie));
}
static void
-ofp_print_port_mod(struct ds *string, const struct ofp_port_mod *opm)
+ofp_print_port_mod(struct ds *string, const struct ofp_header *oh)
{
- ds_put_format(string, "port: %d: addr:"ETH_ADDR_FMT", config: %#x, mask:%#x\n",
- ntohs(opm->port_no), ETH_ADDR_ARGS(opm->hw_addr),
- ntohl(opm->config), ntohl(opm->mask));
+ struct ofputil_port_mod pm;
+ enum ofperr error;
+
+ error = ofputil_decode_port_mod(oh, &pm);
+ if (error) {
+ ofp_print_error(string, error);
+ return;
+ }
+
+ ds_put_format(string, "port: %"PRIu16": addr:"ETH_ADDR_FMT"\n",
+ pm.port_no, ETH_ADDR_ARGS(pm.hw_addr));
+
+ ds_put_format(string, " config: ");
+ ofp_print_port_config(string, pm.config);
+
+ ds_put_format(string, " mask: ");
+ ofp_print_port_config(string, pm.mask);
+
ds_put_format(string, " advertise: ");
- if (opm->advertise) {
- ofp_print_port_features(string, ntohl(opm->advertise));
+ if (pm.advertise) {
+ ofp_print_port_features(string, pm.advertise);
} else {
ds_put_format(string, "UNCHANGED\n");
}
}
static void
-ofp_print_error(struct ds *string, int error)
+ofp_print_error(struct ds *string, enum ofperr error)
{
if (string->length) {
ds_put_char(string, ' ');
}
- ds_put_cstr(string, "***decode error: ");
- ofputil_format_error(string, error);
- ds_put_cstr(string, "***\n");
+ ds_put_format(string, "***decode error: %s***\n", ofperr_get_name(error));
}
static void
size_t len = ntohs(oem->header.length);
size_t payload_ofs, payload_len;
const void *payload;
- int error;
+ enum ofperr error;
char *s;
- error = ofputil_decode_error_msg(&oem->header, &payload_ofs);
- if (!is_ofp_error(error)) {
- ofp_print_error(string, error);
+ error = ofperr_decode_msg(&oem->header, &payload_ofs);
+ if (!error) {
+ ds_put_cstr(string, "***decode error***");
ds_put_hex_dump(string, oem->data, len - sizeof *oem, 0, true);
return;
}
- ds_put_char(string, ' ');
- ofputil_format_error(string, error);
- ds_put_char(string, '\n');
+ ds_put_format(string, " %s\n", ofperr_get_name(error));
payload = (const uint8_t *) oem + payload_ofs;
payload_len = len - payload_ofs;
- switch (get_ofp_err_type(error)) {
- case OFPET_HELLO_FAILED:
+ if (error == OFPERR_OFPHFC_INCOMPATIBLE || error == OFPERR_OFPHFC_EPERM) {
ds_put_printable(string, payload, payload_len);
- break;
-
- case OFPET_BAD_REQUEST:
+ } else {
s = ofp_to_string(payload, payload_len, 1);
ds_put_cstr(string, s);
free(s);
- break;
-
- default:
- ds_put_hex_dump(string, payload, payload_len, 0, true);
- break;
}
}
static void
ofp_print_port_status(struct ds *string, const struct ofp_port_status *ops)
{
- if (ops->reason == OFPPR_ADD) {
+ struct ofputil_port_status ps;
+ enum ofperr error;
+
+ error = ofputil_decode_port_status(ops, &ps);
+ if (error) {
+ ofp_print_error(string, error);
+ return;
+ }
+
+ if (ps.reason == OFPPR_ADD) {
ds_put_format(string, " ADD:");
- } else if (ops->reason == OFPPR_DELETE) {
+ } else if (ps.reason == OFPPR_DELETE) {
ds_put_format(string, " DEL:");
- } else if (ops->reason == OFPPR_MODIFY) {
+ } else if (ps.reason == OFPPR_MODIFY) {
ds_put_format(string, " MOD:");
}
- ofp_print_phy_port(string, &ops->desc);
+ ofp_print_phy_port(string, &ps.desc);
}
static void
const struct ofp_stats_msg *osm)
{
struct ofputil_flow_stats_request fsr;
- int error;
+ enum ofperr error;
error = ofputil_decode_flow_stats_request(&fsr, &osm->header);
if (error) {
if (fsr.out_port != OFPP_NONE) {
ds_put_cstr(string, " out_port=");
- ofp_print_port_name(string, fsr.out_port);
+ ofputil_format_port(fsr.out_port, string);
}
/* A flow stats request doesn't include a priority, but cls_rule_format()
struct ofputil_flow_stats fs;
int retval;
- retval = ofputil_decode_flow_stats_reply(&fs, &b);
+ retval = ofputil_decode_flow_stats_reply(&fs, &b, true);
if (retval) {
if (retval != EOF) {
ds_put_cstr(string, " ***parse error***");
ds_put_format(string, "n_packets=%"PRIu64", ", fs.packet_count);
ds_put_format(string, "n_bytes=%"PRIu64", ", fs.byte_count);
if (fs.idle_timeout != OFP_FLOW_PERMANENT) {
- ds_put_format(string, "idle_timeout=%"PRIu16",", fs.idle_timeout);
+ ds_put_format(string, "idle_timeout=%"PRIu16", ", fs.idle_timeout);
}
if (fs.hard_timeout != OFP_FLOW_PERMANENT) {
- ds_put_format(string, "hard_timeout=%"PRIu16",", fs.hard_timeout);
+ ds_put_format(string, "hard_timeout=%"PRIu16", ", fs.hard_timeout);
+ }
+ if (fs.idle_age >= 0) {
+ ds_put_format(string, "idle_age=%d, ", fs.idle_age);
+ }
+ if (fs.hard_age >= 0 && fs.hard_age != fs.duration_sec) {
+ ds_put_format(string, "hard_age=%d, ", fs.hard_age);
}
cls_rule_format(&fs.rule, string);
- ds_put_char(string, ' ');
+ if (string->string[string->length - 1] != ' ') {
+ ds_put_char(string, ' ');
+ }
ofp_print_actions(string, fs.actions, fs.n_actions);
}
}
const struct ofp_queue_stats_request *qsr)
{
ds_put_cstr(string, "port=");
- ofp_print_port_name(string, ntohs(qsr->port_no));
+ ofputil_format_port(ntohs(qsr->port_no), string);
ds_put_cstr(string, " queue=");
ofp_print_queue_name(string, ntohl(qsr->queue_id));
for (; n--; qs++) {
ds_put_cstr(string, " port ");
- ofp_print_port_name(string, ntohs(qs->port_no));
+ ofputil_format_port(ntohs(qs->port_no), string);
ds_put_cstr(string, " queue ");
ofp_print_queue_name(string, ntohl(qs->queue_id));
ds_put_cstr(string, ": ");
}
}
+static void
+ofp_print_ofpst_port_desc_reply(struct ds *string,
+ const struct ofp_header *oh)
+{
+ struct ofpbuf b;
+
+ ofpbuf_use_const(&b, oh, ntohs(oh->length));
+ ofpbuf_pull(&b, sizeof(struct ofp_stats_msg));
+ ds_put_char(string, '\n');
+ ofp_print_phy_ports(string, oh->version, &b);
+}
+
static void
ofp_print_stats_request(struct ds *string, const struct ofp_header *oh)
{
static void
ofp_print_nxt_flow_mod_table_id(struct ds *string,
- const struct nxt_flow_mod_table_id *nfmti)
+ const struct nx_flow_mod_table_id *nfmti)
{
ds_put_format(string, " %s", nfmti->set ? "enable" : "disable");
}
static void
ofp_print_nxt_set_flow_format(struct ds *string,
- const struct nxt_set_flow_format *nsff)
+ const struct nx_set_flow_format *nsff)
{
uint32_t format = ntohl(nsff->format);
ds_put_cstr(string, " format=");
- if (ofputil_flow_format_is_valid(format)) {
- ds_put_cstr(string, ofputil_flow_format_to_string(format));
+ if (ofputil_nx_flow_format_is_valid(format)) {
+ ds_put_cstr(string, ofputil_nx_flow_format_to_string(format));
} else {
ds_put_format(string, "%"PRIu32, format);
}
}
+static void
+ofp_print_nxt_set_packet_in_format(struct ds *string,
+ const struct nx_set_packet_in_format *nspf)
+{
+ uint32_t format = ntohl(nspf->format);
+
+ ds_put_cstr(string, " format=");
+ if (ofputil_packet_in_format_is_valid(format)) {
+ ds_put_cstr(string, ofputil_packet_in_format_to_string(format));
+ } else {
+ ds_put_format(string, "%"PRIu32, format);
+ }
+}
+
+static const char *
+ofp_port_reason_to_string(enum ofp_port_reason reason)
+{
+ static char s[32];
+
+ switch (reason) {
+ case OFPPR_ADD:
+ return "add";
+
+ case OFPPR_DELETE:
+ return "delete";
+
+ case OFPPR_MODIFY:
+ return "modify";
+
+ default:
+ sprintf(s, "%d", (int) reason);
+ return s;
+ }
+}
+
+static void
+ofp_print_nxt_set_async_config(struct ds *string,
+ const struct nx_async_config *nac)
+{
+ int i;
+
+ for (i = 0; i < 2; i++) {
+ int j;
+
+ ds_put_format(string, "\n %s:\n", i == 0 ? "master" : "slave");
+
+ ds_put_cstr(string, " PACKET_IN:");
+ for (j = 0; j < 32; j++) {
+ if (nac->packet_in_mask[i] & htonl(1u << j)) {
+ ds_put_format(string, " %s",
+ ofputil_packet_in_reason_to_string(j));
+ }
+ }
+ if (!nac->packet_in_mask[i]) {
+ ds_put_cstr(string, " (off)");
+ }
+ ds_put_char(string, '\n');
+
+ ds_put_cstr(string, " PORT_STATUS:");
+ for (j = 0; j < 32; j++) {
+ if (nac->port_status_mask[i] & htonl(1u << j)) {
+ ds_put_format(string, " %s", ofp_port_reason_to_string(j));
+ }
+ }
+ if (!nac->port_status_mask[i]) {
+ ds_put_cstr(string, " (off)");
+ }
+ ds_put_char(string, '\n');
+
+ ds_put_cstr(string, " FLOW_REMOVED:");
+ for (j = 0; j < 32; j++) {
+ if (nac->flow_removed_mask[i] & htonl(1u << j)) {
+ ds_put_format(string, " %s",
+ ofp_flow_removed_reason_to_string(j));
+ }
+ }
+ if (!nac->flow_removed_mask[i]) {
+ ds_put_cstr(string, " (off)");
+ }
+ ds_put_char(string, '\n');
+ }
+}
+
+static void
+ofp_print_nxt_set_controller_id(struct ds *string,
+ const struct nx_controller_id *nci)
+{
+ ds_put_format(string, " id=%"PRIu16, ntohs(nci->controller_id));
+}
+
static void
ofp_to_string__(const struct ofp_header *oh,
const struct ofputil_msg_type *type, struct ds *string,
enum ofputil_msg_code code;
const void *msg = oh;
- ds_put_format(string, "%s (xid=0x%"PRIx32"):",
- ofputil_msg_type_name(type), ntohl(oh->xid));
+ ds_put_cstr(string, ofputil_msg_type_name(type));
+ switch (oh->version) {
+ case OFP10_VERSION:
+ break;
+ case OFP11_VERSION:
+ ds_put_cstr(string, " (OF1.1)");
+ break;
+ default:
+ ds_put_format(string, " (OF 0x%02"PRIx8")", oh->version);
+ break;
+ }
+ ds_put_format(string, " (xid=0x%"PRIx32"):", ntohl(oh->xid));
code = ofputil_msg_type_code(type);
switch (code) {
break;
case OFPUTIL_OFPT_PACKET_IN:
+ case OFPUTIL_NXT_PACKET_IN:
ofp_print_packet_in(string, msg, verbosity);
break;
break;
case OFPUTIL_OFPT_FLOW_MOD:
+ case OFPUTIL_NXT_FLOW_MOD:
ofp_print_flow_mod(string, msg, code, verbosity);
break;
break;
case OFPUTIL_OFPST_DESC_REQUEST:
+ case OFPUTIL_OFPST_PORT_DESC_REQUEST:
ofp_print_stats_request(string, oh);
break;
ofp_print_ofpst_aggregate_reply(string, msg);
break;
+ case OFPUTIL_OFPST_PORT_DESC_REPLY:
+ ofp_print_stats_reply(string, oh);
+ ofp_print_ofpst_port_desc_reply(string, oh);
+ break;
+
case OFPUTIL_NXT_ROLE_REQUEST:
case OFPUTIL_NXT_ROLE_REPLY:
ofp_print_nxt_role_message(string, msg);
ofp_print_nxt_set_flow_format(string, msg);
break;
- case OFPUTIL_NXT_FLOW_MOD:
- ofp_print_flow_mod(string, msg, code, verbosity);
+ case OFPUTIL_NXT_SET_PACKET_IN_FORMAT:
+ ofp_print_nxt_set_packet_in_format(string, msg);
+ break;
+
+ case OFPUTIL_NXT_FLOW_AGE:
+ break;
+
+ case OFPUTIL_NXT_SET_CONTROLLER_ID:
+ ofp_print_nxt_set_controller_id(string, msg);
+ break;
+
+ case OFPUTIL_NXT_SET_ASYNC_CONFIG:
+ ofp_print_nxt_set_async_config(string, msg);
break;
case OFPUTIL_NXST_AGGREGATE_REPLY:
} else if (len < sizeof(struct ofp_header)) {
ds_put_format(&string, "OpenFlow packet too short (only %zu bytes):\n",
len);
- } else if (oh->version != OFP_VERSION) {
- ds_put_format(&string, "Bad OpenFlow version %"PRIu8":\n",
- oh->version);
} else if (ntohs(oh->length) > len) {
ds_put_format(&string,
"(***truncated to %zu bytes from %"PRIu16"***)\n",
ntohs(oh->length), len);
} else {
const struct ofputil_msg_type *type;
- int error;
+ enum ofperr error;
error = ofputil_decode_msg_type(oh, &type);
if (!error) {
ds_put_hex_dump(&string, oh, len, 0, true);
return ds_steal_cstr(&string);
}
-
-/* Returns the name for the specified OpenFlow message type as a string,
- * e.g. "OFPT_FEATURES_REPLY". If no name is known, the string returned is a
- * hex number, e.g. "0x55".
- *
- * The caller must free the returned string when it is no longer needed. */
-char *
-ofp_message_type_to_string(uint8_t type)
-{
- const char *name;
-
- switch (type) {
- case OFPT_HELLO:
- name = "HELLO";
- break;
- case OFPT_ERROR:
- name = "ERROR";
- break;
- case OFPT_ECHO_REQUEST:
- name = "ECHO_REQUEST";
- break;
- case OFPT_ECHO_REPLY:
- name = "ECHO_REPLY";
- break;
- case OFPT_VENDOR:
- name = "VENDOR";
- break;
- case OFPT_FEATURES_REQUEST:
- name = "FEATURES_REQUEST";
- break;
- case OFPT_FEATURES_REPLY:
- name = "FEATURES_REPLY";
- break;
- case OFPT_GET_CONFIG_REQUEST:
- name = "GET_CONFIG_REQUEST";
- break;
- case OFPT_GET_CONFIG_REPLY:
- name = "GET_CONFIG_REPLY";
- break;
- case OFPT_SET_CONFIG:
- name = "SET_CONFIG";
- break;
- case OFPT_PACKET_IN:
- name = "PACKET_IN";
- break;
- case OFPT_FLOW_REMOVED:
- name = "FLOW_REMOVED";
- break;
- case OFPT_PORT_STATUS:
- name = "PORT_STATUS";
- break;
- case OFPT_PACKET_OUT:
- name = "PACKET_OUT";
- break;
- case OFPT_FLOW_MOD:
- name = "FLOW_MOD";
- break;
- case OFPT_PORT_MOD:
- name = "PORT_MOD";
- break;
- case OFPT_STATS_REQUEST:
- name = "STATS_REQUEST";
- break;
- case OFPT_STATS_REPLY:
- name = "STATS_REPLY";
- break;
- case OFPT_BARRIER_REQUEST:
- name = "BARRIER_REQUEST";
- break;
- case OFPT_BARRIER_REPLY:
- name = "BARRIER_REPLY";
- break;
- case OFPT_QUEUE_GET_CONFIG_REQUEST:
- name = "QUEUE_GET_CONFIG_REQUEST";
- break;
- case OFPT_QUEUE_GET_CONFIG_REPLY:
- name = "QUEUE_GET_CONFIG_REPLY";
- break;
- default:
- name = NULL;
- break;
- }
-
- return name ? xasprintf("OFPT_%s", name) : xasprintf("0x%02"PRIx8, type);
-}
\f
static void
print_and_free(FILE *stream, char *string)
}
/* Dumps the contents of the Ethernet frame in the 'len' bytes starting at
- * 'data' to 'stream' using tcpdump. 'total_len' specifies the full length of
- * the Ethernet frame (of which 'len' bytes were captured).
- *
- * This starts and kills a tcpdump subprocess so it's quite expensive. */
+ * 'data' to 'stream'. */
void
-ofp_print_packet(FILE *stream, const void *data, size_t len, size_t total_len)
+ofp_print_packet(FILE *stream, const void *data, size_t len)
{
- print_and_free(stream, ofp_packet_to_string(data, len, total_len));
+ print_and_free(stream, ofp_packet_to_string(data, len));
}
git://git.onelab.eu / sliver-openvswitch.git / blobdiff