* 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));
}
}
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, "%d", 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, "]");
+ 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 pri:%d buf:%#x\n",
+ 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'
{
const struct ofp_flow_expired *ofe = oh;
- ofp_print_match(string, &ofe->match);
+ ofp_print_match(string, &ofe->match, verbosity);
ds_put_format(string,
- " pri%"PRIu16" secs%"PRIu32" pkts%"PRIu64" bytes%"PRIu64"n",
+ " 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));
ds_put_format(string, " table_id=%"PRIu8", ", fsr->table_id);
}
- ofp_print_match(string, &fsr->match);
+ ofp_print_match(string, &fsr->match, verbosity);
}
static void
break;
}
- ds_put_format(string, " duration=%"PRIu32" s, ", ntohl(fs->duration));
+ 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);
+ 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');
ds_put_format(string, " table_id=%"PRIu8", ", asr->table_id);
}
- ofp_print_match(string, &asr->match);
+ ofp_print_match(string, &asr->match, verbosity);
}
static void
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;
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'
projects / openvswitch / blobdiff