* derivatives without specific, written prior permission.
*/
+#include <config.h>
#include "ofp-print.h"
#include "xtoxll.h"
#include "openflow.h"
#include "packets.h"
+static void ofp_print_port_name(struct ds *string, uint16_t port);
+
/* 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'
const struct ofp_packet_in *op = oh;
size_t data_len;
- ds_put_format(string, " total_len=%"PRIu16" in_port=%"PRIu8,
- ntohs(op->total_len), ntohs(op->in_port));
+ ds_put_format(string, " total_len=%"PRIu16" in_port=",
+ ntohs(op->total_len));
+ ofp_print_port_name(string, ntohs(op->in_port));
if (op->reason == OFPR_ACTION)
ds_put_cstr(string, " (via action)");
static void ofp_print_port_name(struct ds *string, uint16_t port)
{
- if (port == UINT16_MAX) {
- ds_put_cstr(string, "none");
- } else if (port == OFPP_FLOOD) {
- ds_put_cstr(string, "flood");
- } else if (port == OFPP_CONTROLLER) {
- ds_put_cstr(string, "controller");
- } else {
+ const char *name;
+ switch (port) {
+ 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
{
switch (ntohs(a->type)) {
case OFPAT_OUTPUT:
- ds_put_cstr(string, "output(");
- ofp_print_port_name(string, ntohs(a->arg.output.port));
- if (a->arg.output.port == htons(OFPP_CONTROLLER)) {
- ds_put_format(string, ", max %"PRIu16" bytes", ntohs(a->arg.output.max_len));
+ {
+ uint16_t port = ntohs(a->arg.output.port);
+ if (port < OFPP_MAX) {
+ ds_put_format(string, "output:%"PRIu16, port);
+ } else {
+ ofp_print_port_name(string, port);
+ if (port == OFPP_CONTROLLER) {
+ if (a->arg.output.max_len) {
+ ds_put_format(string, ":%"PRIu16,
+ ntohs(a->arg.output.max_len));
+ } else {
+ ds_put_cstr(string, ":all");
+ }
+ }
+ }
+ }
+ break;
+
+ case OFPAT_SET_DL_VLAN:
+ ds_put_cstr(string, "mod_vlan:");
+ if (ntohs(a->arg.vlan_id) == OFP_VLAN_NONE) {
+ ds_put_cstr(string, "strip");
+ } else {
+ ds_put_format(string, "%"PRIu16, ntohs(a->arg.vlan_id));
}
- ds_put_cstr(string, ")");
+ break;
+
+ case OFPAT_SET_DL_SRC:
+ ds_put_format(string, "mod_dl_src:"ETH_ADDR_FMT,
+ ETH_ADDR_ARGS(a->arg.dl_addr));
+ break;
+
+ case OFPAT_SET_DL_DST:
+ ds_put_format(string, "mod_dl_dst:"ETH_ADDR_FMT,
+ ETH_ADDR_ARGS(a->arg.dl_addr));
+ break;
+
+ case OFPAT_SET_NW_SRC:
+ ds_put_format(string, "mod_nw_src:"IP_FMT, IP_ARGS(&a->arg.nw_addr));
+ break;
+
+ case OFPAT_SET_NW_DST:
+ ds_put_format(string, "mod_nw_dst:"IP_FMT, IP_ARGS(&a->arg.nw_addr));
+ break;
+
+ case OFPAT_SET_TP_SRC:
+ ds_put_format(string, "mod_tp_src:%d", ntohs(a->arg.tp));
+ break;
+
+ case OFPAT_SET_TP_DST:
+ ds_put_format(string, "mod_tp_dst:%d", ntohs(a->arg.tp));
break;
default:
- ds_put_format(string, "(decoder %"PRIu16" not implemented)", ntohs(a->type));
+ ds_put_format(string, "(decoder %"PRIu16" not implemented)",
+ ntohs(a->type));
break;
}
}
size_t n_bytes)
{
size_t i;
+ int n_actions = n_bytes / sizeof *actions;
- ds_put_cstr(string, " actions[");
- for (i = 0; i < n_bytes / sizeof *actions; i++) {
+ ds_put_format(string, "action%s=", n_actions == 1 ? "" : "s");
+ for (i = 0; i < n_actions; i++) {
if (i) {
- ds_put_cstr(string, "; ");
+ ds_put_cstr(string, ",");
}
ofp_print_action(string, &actions[i]);
}
if (n_bytes % sizeof *actions) {
if (i) {
- ds_put_cstr(string, "; ");
+ ds_put_cstr(string, ",");
}
- ds_put_cstr(string, "; ***trailing garbage***");
+ ds_put_cstr(string, ", ***trailing garbage***");
}
- ds_put_cstr(string, "]");
}
/* Pretty-print the OFPT_PACKET_OUT packet of 'len' bytes at 'oh' to 'string'
if (verbosity > 0 && len > sizeof *opo) {
char *packet = ofp_packet_to_string(opo->u.data, len - sizeof *opo,
len - sizeof *opo);
+ ds_put_char(string, '\n');
ds_put_cstr(string, packet);
free(packet);
}
}
name[j] = '\0';
- ds_put_format(string, " %2d(%s): addr:"ETH_ADDR_FMT", speed:%d, flags:%#x, "
- "feat:%#x\n", ntohs(port->port_no), name,
+ ds_put_char(string, ' ');
+ ofp_print_port_name(string, ntohs(port->port_no));
+ ds_put_format(string, "(%s): addr:"ETH_ADDR_FMT", speed:%d, flags:%#x, "
+ "feat:%#x\n", name,
ETH_ADDR_ARGS(port->hw_addr), ntohl(port->speed),
ntohl(port->flags), ntohl(port->features));
}
-/* Pretty-print the OFPT_DATA_HELLO packet of 'len' bytes at 'oh' to 'stream'
- * at the given 'verbosity' level. */
-void ofp_print_data_hello(struct ds *string, const void *oh, size_t len,
- int verbosity)
+/* Pretty-print the struct ofp_switch_features of 'len' bytes at 'oh' to
+ * 'string' at the given 'verbosity' level. */
+static void
+ofp_print_switch_features(struct ds *string, const void *oh, size_t len,
+ int verbosity)
{
- const struct ofp_data_hello *odh = oh;
+ const struct ofp_switch_features *osf = oh;
struct ofp_phy_port port_list[OFPP_MAX];
int n_ports;
int i;
-
- ds_put_format(string, "dp id:%"PRIx64"\n", ntohll(odh->datapath_id));
- ds_put_format(string, "tables: exact:%d, mac:%d, compressed:%d, general:%d\n",
- ntohl(odh->n_exact), ntohl(odh->n_mac_only),
- ntohl(odh->n_compression), ntohl(odh->n_general));
- ds_put_format(string, "buffers: size:%d, number:%d, miss_len:%d\n",
- ntohl(odh->buffer_mb), ntohl(odh->n_buffers),
- ntohs(odh->miss_send_len));
+ ds_put_format(string, "dp id:%"PRIx64"\n", ntohll(osf->datapath_id));
+ ds_put_format(string, "tables: exact:%d, compressed:%d, general:%d\n",
+ ntohl(osf->n_exact),
+ ntohl(osf->n_compression), ntohl(osf->n_general));
+ ds_put_format(string, "buffers: size:%d, number:%d\n",
+ ntohl(osf->buffer_mb), ntohl(osf->n_buffers));
ds_put_format(string, "features: capabilities:%#x, actions:%#x\n",
- ntohl(odh->capabilities), ntohl(odh->actions));
+ ntohl(osf->capabilities), ntohl(osf->actions));
- if (ntohs(odh->header.length) >= sizeof *odh) {
- len = MIN(len, ntohs(odh->header.length));
+ if (ntohs(osf->header.length) >= sizeof *osf) {
+ len = MIN(len, ntohs(osf->header.length));
}
- n_ports = (len - sizeof *odh) / sizeof *odh->ports;
+ n_ports = (len - sizeof *osf) / sizeof *osf->ports;
- memcpy(port_list, odh->ports, (len - sizeof *odh));
+ memcpy(port_list, osf->ports, (len - sizeof *osf));
qsort(port_list, n_ports, sizeof port_list[0], compare_ports);
for (i = 0; i < n_ports; i++) {
ofp_print_phy_port(string, &port_list[i]);
}
}
+/* Pretty-print the struct ofp_switch_config of 'len' bytes at 'oh' to 'string'
+ * at the given 'verbosity' level. */
+static void
+ofp_print_switch_config(struct ds *string, const void *oh, size_t len,
+ int verbosity)
+{
+ const struct ofp_switch_config *osc = oh;
+ uint16_t flags;
+
+ flags = ntohs(osc->flags);
+ if (flags & OFPC_SEND_FLOW_EXP) {
+ flags &= ~OFPC_SEND_FLOW_EXP;
+ ds_put_format(string, " (sending flow expirations)");
+ }
+ if (flags) {
+ ds_put_format(string, " ***unknown flags %04"PRIx16"***", flags);
+ }
+
+ ds_put_format(string, " miss_send_len=%"PRIu16"\n", ntohs(osc->miss_send_len));
+}
+
static void print_wild(struct ds *string, const char *leader, int is_wild,
- const char *format, ...) __attribute__((format(printf, 4, 5)));
+ int verbosity, const char *format, ...)
+ __attribute__((format(printf, 5, 6)));
static void print_wild(struct ds *string, const char *leader, int is_wild,
- const char *format, ...)
+ int verbosity, const char *format, ...)
{
+ if (is_wild && verbosity < 2) {
+ return;
+ }
ds_put_cstr(string, leader);
if (!is_wild) {
va_list args;
ds_put_format_valist(string, format, args);
va_end(args);
} else {
- ds_put_char(string, '?');
+ ds_put_char(string, '*');
}
}
/* Pretty-print the ofp_match structure */
-static void ofp_print_match(struct ds *f, const struct ofp_match *om)
+static void ofp_print_match(struct ds *f, const struct ofp_match *om,
+ int verbosity)
{
uint16_t w = ntohs(om->wildcards);
- print_wild(f, "inport", w & OFPFW_IN_PORT, "%04x", ntohs(om->in_port));
- print_wild(f, ":vlan", w & OFPFW_DL_VLAN, "%04x", ntohs(om->dl_vlan));
- print_wild(f, " mac[", w & OFPFW_DL_SRC,
- ETH_ADDR_FMT, ETH_ADDR_ARGS(om->dl_src));
- print_wild(f, "->", w & OFPFW_DL_DST,
- ETH_ADDR_FMT, ETH_ADDR_ARGS(om->dl_dst));
- print_wild(f, "] type", w & OFPFW_DL_TYPE, "%04x", ntohs(om->dl_type));
- print_wild(f, " ip[", w & OFPFW_NW_SRC, IP_FMT, IP_ARGS(&om->nw_src));
- print_wild(f, "->", w & OFPFW_NW_DST, IP_FMT, IP_ARGS(&om->nw_dst));
- print_wild(f, "] proto", w & OFPFW_NW_PROTO, "%u", om->nw_proto);
- print_wild(f, " tport[", w & OFPFW_TP_SRC, "%d", ntohs(om->tp_src));
- print_wild(f, "->", w & OFPFW_TP_DST, "%d", ntohs(om->tp_dst));
- ds_put_cstr(f, "]\n");
+ print_wild(f, "in_port=", w & OFPFW_IN_PORT, verbosity,
+ "%d,", ntohs(om->in_port));
+ print_wild(f, "dl_vlan=", w & OFPFW_DL_VLAN, verbosity,
+ "%04x,", ntohs(om->dl_vlan));
+ print_wild(f, "dl_src=", w & OFPFW_DL_SRC, verbosity,
+ ETH_ADDR_FMT",", ETH_ADDR_ARGS(om->dl_src));
+ print_wild(f, "dl_dst=", w & OFPFW_DL_DST, verbosity,
+ ETH_ADDR_FMT",", ETH_ADDR_ARGS(om->dl_dst));
+ print_wild(f, "dl_type=", w & OFPFW_DL_TYPE, verbosity,
+ "%04x,", ntohs(om->dl_type));
+ print_wild(f, "nw_src=", w & OFPFW_NW_SRC, verbosity,
+ IP_FMT",", IP_ARGS(&om->nw_src));
+ print_wild(f, "nw_dst=", w & OFPFW_NW_DST, verbosity,
+ IP_FMT",", IP_ARGS(&om->nw_dst));
+ print_wild(f, "nw_proto=", w & OFPFW_NW_PROTO, verbosity,
+ "%u,", om->nw_proto);
+ print_wild(f, "tp_src=", w & OFPFW_TP_SRC, verbosity,
+ "%d,", ntohs(om->tp_src));
+ print_wild(f, "tp_dst=", w & OFPFW_TP_DST, verbosity,
+ "%d,", ntohs(om->tp_dst));
}
/* Pretty-print the OFPT_FLOW_MOD packet of 'len' bytes at 'oh' to 'string'
{
const struct ofp_flow_mod *ofm = oh;
- ofp_print_match(string, &ofm->match);
- ds_put_format(string, " cmd:%d idle:%d buf:%#x grp:%d\n", ntohs(ofm->command),
- ntohs(ofm->max_idle), ntohl(ofm->buffer_id), ntohl(ofm->group_id));
+ ofp_print_match(string, &ofm->match, verbosity);
+ ds_put_format(string, " cmd:%d idle:%d pri:%d buf:%#x",
+ ntohs(ofm->command), ntohs(ofm->max_idle),
+ ofm->match.wildcards ? ntohs(ofm->priority) : (uint16_t)-1,
+ ntohl(ofm->buffer_id));
+ ofp_print_actions(string, ofm->actions,
+ len - offsetof(struct ofp_flow_mod, actions));
+ ds_put_char(string, '\n');
}
/* Pretty-print the OFPT_FLOW_EXPIRED packet of 'len' bytes at 'oh' to 'string'
* at the given 'verbosity' level. */
-void ofp_print_flow_expired(struct ds *string, const void *oh, size_t len,
- int verbosity)
+static void
+ofp_print_flow_expired(struct ds *string, const void *oh, size_t len,
+ int verbosity)
{
const struct ofp_flow_expired *ofe = oh;
- ofp_print_match(string, &ofe->match);
+ ofp_print_match(string, &ofe->match, verbosity);
ds_put_format(string,
- " secs%d pkts%lld bytes%lld\n", ntohl(ofe->duration),
- ntohll(ofe->packet_count), ntohll(ofe->byte_count));
+ " pri%"PRIu16" secs%"PRIu32" pkts%"PRIu64" bytes%"PRIu64"\n",
+ ofe->match.wildcards ? ntohs(ofe->priority) : (uint16_t)-1,
+ ntohl(ofe->duration), ntohll(ofe->packet_count),
+ ntohll(ofe->byte_count));
+}
+
+/* Pretty-print the OFPT_ERROR_MSG packet of 'len' bytes at 'oh' to 'string'
+ * at the given 'verbosity' level. */
+static void
+ofp_print_error_msg(struct ds *string, const void *oh, size_t len,
+ int verbosity)
+{
+ const struct ofp_error_msg *oem = oh;
+
+ ds_put_format(string,
+ " type%d code%d\n", ntohs(oem->type), ntohs(oem->code));
}
/* Pretty-print the OFPT_PORT_STATUS packet of 'len' bytes at 'oh' to 'string'
* at the given 'verbosity' level. */
-void ofp_print_port_status(struct ds *string, const void *oh, size_t len,
- int verbosity)
+static void
+ofp_print_port_status(struct ds *string, const void *oh, size_t len,
+ int verbosity)
{
const struct ofp_port_status *ops = oh;
ofp_print_phy_port(string, &ops->desc);
}
+static void
+ofp_flow_stats_request(struct ds *string, const void *oh, size_t len,
+ int verbosity)
+{
+ const struct ofp_flow_stats_request *fsr = oh;
+
+ if (fsr->table_id == 0xff) {
+ ds_put_format(string, " table_id=any, ");
+ } else {
+ ds_put_format(string, " table_id=%"PRIu8", ", fsr->table_id);
+ }
+
+ ofp_print_match(string, &fsr->match, verbosity);
+}
+
+static void
+ofp_flow_stats_reply(struct ds *string, const void *body_, size_t len,
+ int verbosity)
+{
+ const char *body = body_;
+ const char *pos = body;
+ for (;;) {
+ const struct ofp_flow_stats *fs;
+ ptrdiff_t bytes_left = body + len - pos;
+ size_t length;
+
+ if (bytes_left < sizeof *fs) {
+ if (bytes_left != 0) {
+ ds_put_format(string, " ***%td leftover bytes at end***",
+ bytes_left);
+ }
+ break;
+ }
+
+ fs = (const void *) pos;
+ length = ntohs(fs->length);
+ if (length < sizeof *fs) {
+ ds_put_format(string, " ***length=%zu shorter than minimum %zu***",
+ length, sizeof *fs);
+ break;
+ } else if (length > bytes_left) {
+ ds_put_format(string,
+ " ***length=%zu but only %td bytes left***",
+ length, bytes_left);
+ break;
+ } else if ((length - sizeof *fs) % sizeof fs->actions[0]) {
+ ds_put_format(string,
+ " ***length=%zu has %zu bytes leftover in "
+ "final action***",
+ length,
+ (length - sizeof *fs) % sizeof fs->actions[0]);
+ break;
+ }
+
+ ds_put_format(string, " duration=%"PRIu32"s, ", ntohl(fs->duration));
+ ds_put_format(string, "table_id=%"PRIu8", ", fs->table_id);
+ ds_put_format(string, "priority=%"PRIu16", ",
+ fs->match.wildcards ? ntohs(fs->priority) : (uint16_t)-1);
+ ds_put_format(string, "n_packets=%"PRIu64", ",
+ ntohll(fs->packet_count));
+ ds_put_format(string, "n_bytes=%"PRIu64", ", ntohll(fs->byte_count));
+ ds_put_format(string, "max_idle=%"PRIu16",", ntohs(fs->max_idle));
+ ofp_print_match(string, &fs->match, verbosity);
+ ofp_print_actions(string, fs->actions, length - sizeof *fs);
+ ds_put_char(string, '\n');
+
+ pos += length;
+ }
+}
+
+static void
+ofp_aggregate_stats_request(struct ds *string, const void *oh, size_t len,
+ int verbosity)
+{
+ const struct ofp_aggregate_stats_request *asr = oh;
+
+ if (asr->table_id == 0xff) {
+ ds_put_format(string, " table_id=any, ");
+ } else {
+ ds_put_format(string, " table_id=%"PRIu8", ", asr->table_id);
+ }
+
+ ofp_print_match(string, &asr->match, verbosity);
+}
+
+static void
+ofp_aggregate_stats_reply(struct ds *string, const void *body_, size_t len,
+ int verbosity)
+{
+ const struct ofp_aggregate_stats_reply *asr = body_;
+
+ ds_put_format(string, " packet_count=%"PRIu64, ntohll(asr->packet_count));
+ ds_put_format(string, " byte_count=%"PRIu64, ntohll(asr->byte_count));
+ ds_put_format(string, " flow_count=%"PRIu32, ntohl(asr->flow_count));
+}
+
+static void
+ofp_port_stats_reply(struct ds *string, const void *body, size_t len,
+ int verbosity)
+{
+ const struct ofp_port_stats *ps = body;
+ size_t n = len / sizeof *ps;
+ ds_put_format(string, " %zu ports\n", n);
+ if (verbosity < 1) {
+ return;
+ }
+
+ for (; n--; ps++) {
+ ds_put_format(string, " port %"PRIu16": ", ntohs(ps->port_no));
+ ds_put_format(string, "rx %"PRIu64", ", ntohll(ps->rx_count));
+ ds_put_format(string, "tx %"PRIu64", ", ntohll(ps->tx_count));
+ ds_put_format(string, "dropped %"PRIu64"\n", ntohll(ps->drop_count));
+ }
+}
+
+static void
+ofp_table_stats_reply(struct ds *string, const void *body, size_t len,
+ int verbosity)
+{
+ const struct ofp_table_stats *ts = body;
+ size_t n = len / sizeof *ts;
+ ds_put_format(string, " %zu tables\n", n);
+ if (verbosity < 1) {
+ return;
+ }
+
+ for (; n--; ts++) {
+ char name[OFP_MAX_TABLE_NAME_LEN + 1];
+ strncpy(name, ts->name, sizeof name);
+ name[OFP_MAX_TABLE_NAME_LEN] = '\0';
+
+ ds_put_format(string, " table %"PRIu8": ", ts->table_id);
+ ds_put_format(string, "name %-8s, ", name);
+ ds_put_format(string, "max %6"PRIu32", ", ntohl(ts->max_entries));
+ ds_put_format(string, "active %6"PRIu32", ", ntohl(ts->active_count));
+ ds_put_format(string, "matched %6"PRIu64"\n",
+ ntohll(ts->matched_count));
+ }
+}
+
+enum stats_direction {
+ REQUEST,
+ REPLY
+};
+
+static void
+print_stats(struct ds *string, int type, const void *body, size_t body_len,
+ int verbosity, enum stats_direction direction)
+{
+ struct stats_msg {
+ size_t min_body, max_body;
+ void (*printer)(struct ds *, const void *, size_t len, int verbosity);
+ };
+
+ struct stats_type {
+ const char *name;
+ struct stats_msg request;
+ struct stats_msg reply;
+ };
+
+ static const struct stats_type stats_types[] = {
+ [OFPST_FLOW] = {
+ "flow",
+ { sizeof(struct ofp_flow_stats_request),
+ sizeof(struct ofp_flow_stats_request),
+ ofp_flow_stats_request },
+ { 0, SIZE_MAX, ofp_flow_stats_reply },
+ },
+ [OFPST_AGGREGATE] = {
+ "aggregate",
+ { sizeof(struct ofp_aggregate_stats_request),
+ sizeof(struct ofp_aggregate_stats_request),
+ ofp_aggregate_stats_request },
+ { sizeof(struct ofp_aggregate_stats_reply),
+ sizeof(struct ofp_aggregate_stats_reply),
+ ofp_aggregate_stats_reply },
+ },
+ [OFPST_TABLE] = {
+ "table",
+ { 0, 0, NULL },
+ { 0, SIZE_MAX, ofp_table_stats_reply },
+ },
+ [OFPST_PORT] = {
+ "port",
+ { 0, 0, NULL, },
+ { 0, SIZE_MAX, ofp_port_stats_reply },
+ },
+ };
+
+ const struct stats_type *s;
+ const struct stats_msg *m;
+
+ if (type >= ARRAY_SIZE(stats_types) || !stats_types[type].name) {
+ ds_put_format(string, " ***unknown type %d***", type);
+ return;
+ }
+ s = &stats_types[type];
+ ds_put_format(string, " type=%d(%s)\n", type, s->name);
+
+ m = direction == REQUEST ? &s->request : &s->reply;
+ if (body_len < m->min_body || body_len > m->max_body) {
+ ds_put_format(string, " ***body_len=%zu not in %zu...%zu***",
+ body_len, m->min_body, m->max_body);
+ return;
+ }
+ if (m->printer) {
+ m->printer(string, body, body_len, verbosity);
+ }
+}
+
+static void
+ofp_stats_request(struct ds *string, const void *oh, size_t len, int verbosity)
+{
+ const struct ofp_stats_request *srq = oh;
+
+ if (srq->flags) {
+ ds_put_format(string, " ***unknown flags %04"PRIx16"***",
+ ntohs(srq->flags));
+ }
+
+ print_stats(string, ntohs(srq->type), srq->body,
+ len - offsetof(struct ofp_stats_request, body),
+ verbosity, REQUEST);
+}
+
+static void
+ofp_stats_reply(struct ds *string, const void *oh, size_t len, int verbosity)
+{
+ const struct ofp_stats_reply *srp = oh;
+
+ ds_put_cstr(string, " flags=");
+ if (!srp->flags) {
+ ds_put_cstr(string, "none");
+ } else {
+ uint16_t flags = ntohs(srp->flags);
+ if (flags & OFPSF_REPLY_MORE) {
+ ds_put_cstr(string, "[more]");
+ flags &= ~OFPSF_REPLY_MORE;
+ }
+ if (flags) {
+ ds_put_format(string, "[***unknown%04"PRIx16"***]", flags);
+ }
+ }
+
+ print_stats(string, ntohs(srp->type), srp->body,
+ len - offsetof(struct ofp_stats_reply, body),
+ verbosity, REPLY);
+}
+
+static void
+ofp_echo(struct ds *string, const void *oh, size_t len, int verbosity)
+{
+ const struct ofp_header *hdr = oh;
+
+ ds_put_format(string, " %zu bytes of payload\n", len - sizeof *hdr);
+ if (verbosity > 1) {
+ ds_put_hex_dump(string, hdr, len - sizeof *hdr, 0, true);
+ }
+}
+
struct openflow_packet {
const char *name;
size_t min_size;
};
static const struct openflow_packet packets[] = {
- [OFPT_CONTROL_HELLO] = {
- "ofp_control_hello",
- sizeof (struct ofp_control_hello),
+ [OFPT_FEATURES_REQUEST] = {
+ "features_request",
+ sizeof (struct ofp_header),
NULL,
},
- [OFPT_DATA_HELLO] = {
- "ofp_data_hello",
- sizeof (struct ofp_data_hello),
- ofp_print_data_hello,
+ [OFPT_FEATURES_REPLY] = {
+ "features_reply",
+ sizeof (struct ofp_switch_features),
+ ofp_print_switch_features,
+ },
+ [OFPT_GET_CONFIG_REQUEST] = {
+ "get_config_request",
+ sizeof (struct ofp_header),
+ NULL,
+ },
+ [OFPT_GET_CONFIG_REPLY] = {
+ "get_config_reply",
+ sizeof (struct ofp_switch_config),
+ ofp_print_switch_config,
+ },
+ [OFPT_SET_CONFIG] = {
+ "set_config",
+ sizeof (struct ofp_switch_config),
+ ofp_print_switch_config,
},
[OFPT_PACKET_IN] = {
- "ofp_packet_in",
+ "packet_in",
offsetof(struct ofp_packet_in, data),
ofp_packet_in,
},
[OFPT_PACKET_OUT] = {
- "ofp_packet_out",
+ "packet_out",
sizeof (struct ofp_packet_out),
ofp_packet_out,
},
[OFPT_FLOW_MOD] = {
- "ofp_flow_mod",
+ "flow_mod",
sizeof (struct ofp_flow_mod),
ofp_print_flow_mod,
},
[OFPT_FLOW_EXPIRED] = {
- "ofp_flow_expired",
+ "flow_expired",
sizeof (struct ofp_flow_expired),
ofp_print_flow_expired,
},
[OFPT_PORT_MOD] = {
- "ofp_port_mod",
+ "port_mod",
sizeof (struct ofp_port_mod),
NULL,
},
[OFPT_PORT_STATUS] = {
- "ofp_port_status",
+ "port_status",
sizeof (struct ofp_port_status),
ofp_print_port_status
},
+ [OFPT_ERROR_MSG] = {
+ "error_msg",
+ sizeof (struct ofp_error_msg),
+ ofp_print_error_msg,
+ },
+ [OFPT_STATS_REQUEST] = {
+ "stats_request",
+ sizeof (struct ofp_stats_request),
+ ofp_stats_request,
+ },
+ [OFPT_STATS_REPLY] = {
+ "stats_reply",
+ sizeof (struct ofp_stats_reply),
+ ofp_stats_reply,
+ },
+ [OFPT_ECHO_REQUEST] = {
+ "echo_request",
+ sizeof (struct ofp_header),
+ ofp_echo,
+ },
+ [OFPT_ECHO_REPLY] = {
+ "echo_reply",
+ sizeof (struct ofp_header),
+ ofp_echo,
+ },
};
/* Composes and returns a string representing the OpenFlow packet of 'len'
ds_put_cstr(&string, "OpenFlow packet too short:\n");
ds_put_hex_dump(&string, oh, len, 0, true);
return ds_cstr(&string);
- } else if (oh->version != 1) {
+ } else if (oh->version != OFP_VERSION) {
ds_put_format(&string, "Bad OpenFlow version %"PRIu8":\n", oh->version);
ds_put_hex_dump(&string, oh, len, 0, true);
return ds_cstr(&string);
ds_put_format(&string, " (***length=%zu < min_size=%zu***)\n",
len, pkt->min_size);
} else if (!pkt->printer) {
- ds_put_format(&string, " length=%zu (decoder not implemented)\n",
- ntohs(oh->length));
+ if (len > sizeof *oh) {
+ ds_put_format(&string, " length=%"PRIu16" (decoder not implemented)\n",
+ ntohs(oh->length));
+ }
} else {
pkt->printer(&string, oh, len, verbosity);
}
if (verbosity >= 3) {
ds_put_hex_dump(&string, oh, len, 0, true);
}
+ if (string.string[string.length - 1] != '\n') {
+ ds_put_char(&string, '\n');
+ }
return ds_cstr(&string);
}
-
-char *
-ofp_table_to_string(const struct ofp_table* ot)
-{
- return xasprintf("id: %d name: %-8s n_flows: %6d max_flows: %6d",
- ntohs(ot->table_id), ot->name, ntohl(ot->n_flows),
- ntohl(ot->max_flows));
-}
\f
static void
print_and_free(FILE *stream, char *string)
print_and_free(stream, ofp_to_string(oh, len, verbosity));
}
-/* Pretty print a openflow table */
-void
-ofp_print_table(FILE *stream, const struct ofp_table *ot)
-{
- print_and_free(stream, ofp_table_to_string(ot));
-}
-
/* 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).
git://git.onelab.eu / sliver-openvswitch.git / blobdiff