/*
- * Copyright (c) 2008, 2009, 2010 Nicira Networks.
+ * Copyright (c) 2008, 2009, 2010, 2011, 2012 Nicira Networks.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
#include <stdlib.h>
#include <ctype.h>
+#include "bundle.h"
#include "byte-order.h"
#include "compiler.h"
#include "dynamic-string.h"
#include "flow.h"
+#include "learn.h"
+#include "multipath.h"
+#include "meta-flow.h"
+#include "nx-match.h"
+#include "ofp-errors.h"
+#include "ofp-util.h"
#include "ofpbuf.h"
#include "openflow/openflow.h"
#include "openflow/nicira-ext.h"
#include "packets.h"
#include "pcap.h"
+#include "type-props.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 *, 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;
+ struct flow flow;
+
+ ofpbuf_use_const(&buf, data, len);
+ 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));
+ }
+ }
- char command[128];
- FILE *pcap;
- FILE *tcpdump;
- int status;
- int c;
+ ds_put_char(&ds, '\n');
- buf.data = (void *) data;
- buf.size = len;
+ return ds_cstr(&ds);
+}
- 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");
- }
- rewind(pcap);
+static void
+ofp_print_packet_in(struct ds *string, const struct ofp_header *oh,
+ int verbosity)
+{
+ struct ofputil_packet_in pin;
+ int error;
+ int i;
- snprintf(command, sizeof command, "/usr/sbin/tcpdump -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>");
+ error = ofputil_decode_packet_in(&pin, oh);
+ if (error) {
+ ofp_print_error(string, error);
+ return;
}
- while ((c = getc(tcpdump)) != EOF) {
- ds_put_char(&ds, c);
+ if (pin.table_id) {
+ ds_put_format(string, " table_id=%"PRIu8, pin.table_id);
}
- 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));
+ if (pin.cookie) {
+ ds_put_format(string, " cookie=0x%"PRIx64, ntohll(pin.cookie));
}
- return ds_cstr(&ds);
-}
-/* Pretty-print the OFPT_PACKET_IN packet of 'len' bytes at 'oh' to 'stream'
- * at the given 'verbosity' level. */
-static void
-ofp_packet_in(struct ds *string, const void *oh, size_t len, int verbosity)
-{
- const struct ofp_packet_in *op = oh;
- size_t data_len;
+ 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));
+ }
+ }
- ds_put_format(string, " total_len=%"PRIu16" in_port=",
- ntohs(op->total_len));
- ofp_print_port_name(string, ntohs(op->in_port));
+ 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]);
+ }
+ }
+ }
- 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);
+ ds_put_format(string, " (via %s)",
+ ofputil_packet_in_reason_to_string(pin.reason));
- data_len = len - offsetof(struct ofp_packet_in, data);
- ds_put_format(string, " data_len=%zu", data_len);
- if (htonl(op->buffer_id) == UINT32_MAX) {
+ 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;
- struct ofp_match match;
- packet.data = (void *) op->data;
- packet.size = data_len;
- flow_extract(&packet, 0, ntohs(op->in_port), &flow);
- flow_to_match(&flow, 0, false, &match);
- ofp_print_match(string, &match, verbosity);
- 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)
+static void
+print_note(struct ds *string, const struct nx_action_note *nan)
{
- 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;
+ size_t len;
+ size_t i;
+
+ ds_put_cstr(string, "note:");
+ len = ntohs(nan->len) - offsetof(struct nx_action_note, note);
+ for (i = 0; i < len; i++) {
+ if (i) {
+ ds_put_char(string, '.');
+ }
+ ds_put_format(string, "%02"PRIx8, nan->note[i]);
}
- ds_put_cstr(string, name);
}
static void
-ofp_print_nx_action(struct ds *string, const struct nx_action_header *nah)
+ofp_print_action(struct ds *s, const union ofp_action *a,
+ enum ofputil_action_code code)
{
- switch (ntohs(nah->subtype)) {
- case NXAST_RESUBMIT: {
- const struct nx_action_resubmit *nar = (struct nx_action_resubmit *)nah;
- ds_put_format(string, "resubmit:");
- ofp_print_port_name(string, ntohs(nar->in_port));
+ const struct ofp_action_enqueue *oae;
+ const struct ofp_action_dl_addr *oada;
+ const struct nx_action_set_tunnel64 *nast64;
+ const struct nx_action_set_tunnel *nast;
+ const struct nx_action_set_queue *nasq;
+ const struct nx_action_resubmit *nar;
+ const struct nx_action_reg_move *move;
+ const struct nx_action_reg_load *load;
+ 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:
+ port = ntohs(a->output.port);
+ if (port < OFPP_MAX) {
+ ds_put_format(s, "output:%"PRIu16, port);
+ } else {
+ 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));
+ } else {
+ ds_put_cstr(s, ":all");
+ }
+ }
+ }
break;
- }
- case NXAST_SET_TUNNEL: {
- const struct nx_action_set_tunnel *nast =
- (struct nx_action_set_tunnel *)nah;
- ds_put_format(string, "set_tunnel:0x%08"PRIx32, ntohl(nast->tun_id));
+ case OFPUTIL_OFPAT_ENQUEUE:
+ oae = (const struct ofp_action_enqueue *) a;
+ ds_put_format(s, "enqueue:");
+ ofputil_format_port(ntohs(oae->port), s);
+ ds_put_format(s, "q%"PRIu32, ntohl(oae->queue_id));
break;
- }
- case NXAST_DROP_SPOOFED_ARP:
- ds_put_cstr(string, "drop_spoofed_arp");
+ case OFPUTIL_OFPAT_SET_VLAN_VID:
+ ds_put_format(s, "mod_vlan_vid:%"PRIu16,
+ ntohs(a->vlan_vid.vlan_vid));
break;
- case NXAST_SET_QUEUE: {
- const struct nx_action_set_queue *nasq =
- (struct nx_action_set_queue *)nah;
- ds_put_format(string, "set_queue:%u", ntohl(nasq->queue_id));
+ case OFPUTIL_OFPAT_SET_VLAN_PCP:
+ ds_put_format(s, "mod_vlan_pcp:%"PRIu8, a->vlan_pcp.vlan_pcp);
break;
- }
- case NXAST_POP_QUEUE:
- ds_put_cstr(string, "pop_queue");
+ case OFPUTIL_OFPAT_STRIP_VLAN:
+ ds_put_cstr(s, "strip_vlan");
break;
- default:
- ds_put_format(string, "***unknown Nicira action:%d***",
- ntohs(nah->subtype));
- }
-}
+ case OFPUTIL_OFPAT_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;
-static int
-ofp_print_action(struct ds *string, const struct ofp_action_header *ah,
- size_t actions_len)
-{
- uint16_t type;
- size_t len;
+ case OFPUTIL_OFPAT_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;
- struct openflow_action {
- size_t min_size;
- size_t max_size;
- };
+ case OFPUTIL_OFPAT_SET_NW_SRC:
+ ds_put_format(s, "mod_nw_src:"IP_FMT, IP_ARGS(&a->nw_addr.nw_addr));
+ break;
- const struct openflow_action of_actions[] = {
- [OFPAT_OUTPUT] = {
- sizeof(struct ofp_action_output),
- sizeof(struct ofp_action_output),
- },
- [OFPAT_SET_VLAN_VID] = {
- sizeof(struct ofp_action_vlan_vid),
- sizeof(struct ofp_action_vlan_vid),
- },
- [OFPAT_SET_VLAN_PCP] = {
- sizeof(struct ofp_action_vlan_pcp),
- sizeof(struct ofp_action_vlan_pcp),
- },
- [OFPAT_STRIP_VLAN] = {
- sizeof(struct ofp_action_header),
- sizeof(struct ofp_action_header),
- },
- [OFPAT_SET_DL_SRC] = {
- sizeof(struct ofp_action_dl_addr),
- sizeof(struct ofp_action_dl_addr),
- },
- [OFPAT_SET_DL_DST] = {
- sizeof(struct ofp_action_dl_addr),
- sizeof(struct ofp_action_dl_addr),
- },
- [OFPAT_SET_NW_SRC] = {
- sizeof(struct ofp_action_nw_addr),
- sizeof(struct ofp_action_nw_addr),
- },
- [OFPAT_SET_NW_DST] = {
- sizeof(struct ofp_action_nw_addr),
- sizeof(struct ofp_action_nw_addr),
- },
- [OFPAT_SET_NW_TOS] = {
- sizeof(struct ofp_action_nw_tos),
- sizeof(struct ofp_action_nw_tos),
- },
- [OFPAT_SET_TP_SRC] = {
- sizeof(struct ofp_action_tp_port),
- sizeof(struct ofp_action_tp_port),
- },
- [OFPAT_SET_TP_DST] = {
- sizeof(struct ofp_action_tp_port),
- sizeof(struct ofp_action_tp_port),
- }
- /* OFPAT_VENDOR is not here, since it would blow up the array size. */
- };
+ case OFPUTIL_OFPAT_SET_NW_DST:
+ ds_put_format(s, "mod_nw_dst:"IP_FMT, IP_ARGS(&a->nw_addr.nw_addr));
+ break;
- if (actions_len < sizeof *ah) {
- ds_put_format(string, "***action array too short for next action***\n");
- return -1;
- }
+ case OFPUTIL_OFPAT_SET_NW_TOS:
+ ds_put_format(s, "mod_nw_tos:%d", a->nw_tos.nw_tos);
+ break;
- type = ntohs(ah->type);
- len = ntohs(ah->len);
- if (actions_len < len) {
- ds_put_format(string, "***truncated action %"PRIu16"***\n", type);
- return -1;
- }
+ case OFPUTIL_OFPAT_SET_TP_SRC:
+ ds_put_format(s, "mod_tp_src:%d", ntohs(a->tp_port.tp_port));
+ break;
- if ((len % 8) != 0) {
- ds_put_format(string,
- "***action %"PRIu16" length not a multiple of 8***\n",
- type);
- return -1;
- }
+ case OFPUTIL_OFPAT_SET_TP_DST:
+ ds_put_format(s, "mod_tp_dst:%d", ntohs(a->tp_port.tp_port));
+ break;
- if (type < ARRAY_SIZE(of_actions)) {
- const struct openflow_action *act = &of_actions[type];
- if ((len < act->min_size) || (len > act->max_size)) {
- ds_put_format(string,
- "***action %"PRIu16" wrong length: %zu***\n", type, len);
- return -1;
- }
- }
+ case OFPUTIL_NXAST_RESUBMIT:
+ nar = (struct nx_action_resubmit *)a;
+ ds_put_format(s, "resubmit:");
+ ofputil_format_port(ntohs(nar->in_port), s);
+ break;
- switch (type) {
- case OFPAT_OUTPUT: {
- struct ofp_action_output *oa = (struct ofp_action_output *)ah;
- uint16_t port = ntohs(oa->port);
- if (port < OFPP_MAX) {
- ds_put_format(string, "output:%"PRIu16, port);
- } else {
- ofp_print_port_name(string, port);
- if (port == OFPP_CONTROLLER) {
- if (oa->max_len) {
- ds_put_format(string, ":%"PRIu16, ntohs(oa->max_len));
- } else {
- ds_put_cstr(string, ":all");
- }
- }
+ case OFPUTIL_NXAST_RESUBMIT_TABLE:
+ nar = (struct nx_action_resubmit *)a;
+ ds_put_format(s, "resubmit(");
+ if (nar->in_port != htons(OFPP_IN_PORT)) {
+ ofputil_format_port(ntohs(nar->in_port), s);
}
+ ds_put_char(s, ',');
+ if (nar->table != 255) {
+ ds_put_format(s, "%"PRIu8, nar->table);
+ }
+ ds_put_char(s, ')');
break;
- }
- case OFPAT_ENQUEUE: {
- struct ofp_action_enqueue *ea = (struct ofp_action_enqueue *)ah;
- unsigned int port = ntohs(ea->port);
- unsigned int queue_id = ntohl(ea->queue_id);
- ds_put_format(string, "enqueue:");
- if (port != OFPP_IN_PORT) {
- ds_put_format(string, "%u", port);
- } else {
- ds_put_cstr(string, "IN_PORT");
- }
- ds_put_format(string, "q%u", queue_id);
+ case OFPUTIL_NXAST_SET_TUNNEL:
+ nast = (struct nx_action_set_tunnel *)a;
+ ds_put_format(s, "set_tunnel:%#"PRIx32, ntohl(nast->tun_id));
break;
- }
- case OFPAT_SET_VLAN_VID: {
- struct ofp_action_vlan_vid *va = (struct ofp_action_vlan_vid *)ah;
- ds_put_format(string, "mod_vlan_vid:%"PRIu16, ntohs(va->vlan_vid));
+ case OFPUTIL_NXAST_SET_QUEUE:
+ nasq = (struct nx_action_set_queue *)a;
+ ds_put_format(s, "set_queue:%u", ntohl(nasq->queue_id));
break;
- }
- case OFPAT_SET_VLAN_PCP: {
- struct ofp_action_vlan_pcp *va = (struct ofp_action_vlan_pcp *)ah;
- ds_put_format(string, "mod_vlan_pcp:%"PRIu8, va->vlan_pcp);
+ case OFPUTIL_NXAST_POP_QUEUE:
+ ds_put_cstr(s, "pop_queue");
break;
- }
- case OFPAT_STRIP_VLAN:
- ds_put_cstr(string, "strip_vlan");
+ case OFPUTIL_NXAST_NOTE:
+ print_note(s, (const struct nx_action_note *) a);
break;
- case OFPAT_SET_DL_SRC: {
- struct ofp_action_dl_addr *da = (struct ofp_action_dl_addr *)ah;
- ds_put_format(string, "mod_dl_src:"ETH_ADDR_FMT,
- ETH_ADDR_ARGS(da->dl_addr));
+ case OFPUTIL_NXAST_REG_MOVE:
+ move = (const struct nx_action_reg_move *) a;
+ nxm_format_reg_move(move, s);
break;
- }
- case OFPAT_SET_DL_DST: {
- struct ofp_action_dl_addr *da = (struct ofp_action_dl_addr *)ah;
- ds_put_format(string, "mod_dl_dst:"ETH_ADDR_FMT,
- ETH_ADDR_ARGS(da->dl_addr));
+ case OFPUTIL_NXAST_REG_LOAD:
+ load = (const struct nx_action_reg_load *) a;
+ nxm_format_reg_load(load, s);
break;
- }
- case OFPAT_SET_NW_SRC: {
- struct ofp_action_nw_addr *na = (struct ofp_action_nw_addr *)ah;
- ds_put_format(string, "mod_nw_src:"IP_FMT, IP_ARGS(&na->nw_addr));
+ case OFPUTIL_NXAST_SET_TUNNEL64:
+ nast64 = (const struct nx_action_set_tunnel64 *) a;
+ ds_put_format(s, "set_tunnel64:%#"PRIx64,
+ ntohll(nast64->tun_id));
break;
- }
- case OFPAT_SET_NW_DST: {
- struct ofp_action_nw_addr *na = (struct ofp_action_nw_addr *)ah;
- ds_put_format(string, "mod_nw_dst:"IP_FMT, IP_ARGS(&na->nw_addr));
+ case OFPUTIL_NXAST_MULTIPATH:
+ nam = (const struct nx_action_multipath *) a;
+ multipath_format(nam, s);
break;
- }
- case OFPAT_SET_NW_TOS: {
- struct ofp_action_nw_tos *nt = (struct ofp_action_nw_tos *)ah;
- ds_put_format(string, "mod_nw_tos:%d", nt->nw_tos);
+ case OFPUTIL_NXAST_AUTOPATH:
+ naa = (const struct nx_action_autopath *)a;
+ ds_put_format(s, "autopath(%u,", ntohl(naa->id));
+ nxm_decode(&subfield, naa->dst, naa->ofs_nbits);
+ mf_format_subfield(&subfield, s);
+ ds_put_char(s, ')');
break;
- }
- case OFPAT_SET_TP_SRC: {
- struct ofp_action_tp_port *ta = (struct ofp_action_tp_port *)ah;
- ds_put_format(string, "mod_tp_src:%d", ntohs(ta->tp_port));
+ case OFPUTIL_NXAST_BUNDLE:
+ case OFPUTIL_NXAST_BUNDLE_LOAD:
+ bundle_format((const struct nx_action_bundle *) a, s);
break;
- }
- case OFPAT_SET_TP_DST: {
- struct ofp_action_tp_port *ta = (struct ofp_action_tp_port *)ah;
- ds_put_format(string, "mod_tp_dst:%d", ntohs(ta->tp_port));
+ case OFPUTIL_NXAST_OUTPUT_REG:
+ naor = (const struct nx_action_output_reg *) a;
+ ds_put_cstr(s, "output:");
+ 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 OFPAT_VENDOR: {
- struct ofp_action_vendor_header *avh
- = (struct ofp_action_vendor_header *)ah;
- if (len < sizeof *avh) {
- ds_put_format(string, "***ofpat_vendor truncated***\n");
- return -1;
+ 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 (avh->vendor == htonl(NX_VENDOR_ID)) {
- ofp_print_nx_action(string, (struct nx_action_header *)avh);
- } else {
- ds_put_format(string, "vendor action:0x%x", ntohl(avh->vendor));
+ 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:
- ds_put_format(string, "(decoder %"PRIu16" not implemented)", type);
break;
}
-
- return len;
}
void
-ofp_print_actions(struct ds *string, const struct ofp_action_header *action,
- size_t actions_len)
+ofp_print_actions(struct ds *string, const union ofp_action *actions,
+ size_t n_actions)
{
- uint8_t *p = (uint8_t *)action;
- int len = 0;
+ const union ofp_action *a;
+ size_t left;
ds_put_cstr(string, "actions=");
- if (!actions_len) {
+ if (!n_actions) {
ds_put_cstr(string, "drop");
}
- while (actions_len > 0) {
- if (len) {
- ds_put_cstr(string, ",");
- }
- len = ofp_print_action(string, (struct ofp_action_header *)p,
- actions_len);
- if (len < 0) {
- return;
+
+ OFPUTIL_ACTION_FOR_EACH (a, left, actions, n_actions) {
+ int code = ofputil_decode_action(a);
+ if (code >= 0) {
+ if (a != actions) {
+ ds_put_cstr(string, ",");
+ }
+ ofp_print_action(string, a, code);
+ } else {
+ ofp_print_error(string, -code);
}
- p += len;
- actions_len -= len;
+ }
+ if (left > 0) {
+ ds_put_format(string, " ***%zu leftover bytes following actions",
+ left * sizeof *a);
}
}
-/* Pretty-print the OFPT_PACKET_OUT packet of 'len' bytes at 'oh' to 'string'
- * at the given 'verbosity' level. */
-static void ofp_packet_out(struct ds *string, const void *oh, size_t len,
- int verbosity)
+static void
+ofp_print_packet_out(struct ds *string, const struct ofp_packet_out *opo,
+ int verbosity)
{
- const struct ofp_packet_out *opo = oh;
- 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;
}
- ofp_print_actions(string, opo->actions, actions_len);
- 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');
}
return ap < bp ? -1 : ap > bp;
}
-static void ofp_print_port_features(struct ds *string, uint32_t features)
+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[])
{
- if (features == 0) {
- ds_put_cstr(string, "Unsupported\n");
+ int n = 0;
+
+ if (!bits) {
+ ds_put_cstr(string, "0");
return;
}
- if (features & OFPPF_10MB_HD) {
- ds_put_cstr(string, "10MB-HD ");
- }
- if (features & OFPPF_10MB_FD) {
- ds_put_cstr(string, "10MB-FD ");
- }
- if (features & OFPPF_100MB_HD) {
- ds_put_cstr(string, "100MB-HD ");
- }
- if (features & OFPPF_100MB_FD) {
- ds_put_cstr(string, "100MB-FD ");
- }
- if (features & OFPPF_1GB_HD) {
- ds_put_cstr(string, "1GB-HD ");
- }
- if (features & OFPPF_1GB_FD) {
- ds_put_cstr(string, "1GB-FD ");
- }
- if (features & OFPPF_10GB_FD) {
- ds_put_cstr(string, "10GB-FD ");
- }
- if (features & OFPPF_COPPER) {
- ds_put_cstr(string, "COPPER ");
- }
- if (features & OFPPF_FIBER) {
- ds_put_cstr(string, "FIBER ");
- }
- if (features & OFPPF_AUTONEG) {
- ds_put_cstr(string, "AUTO_NEG ");
+
+ for (; bits && bit_names->name; bit_names++) {
+ if (bits & bit_names->bit) {
+ if (n++) {
+ ds_put_char(string, ' ');
+ }
+ ds_put_cstr(string, bit_names->name);
+ bits &= ~bit_names->bit;
+ }
}
- if (features & OFPPF_PAUSE) {
- ds_put_cstr(string, "AUTO_PAUSE ");
+
+ if (bits) {
+ if (n++) {
+ ds_put_char(string, ' ');
+ }
+ ds_put_format(string, "0x%"PRIx32, bits);
}
- if (features & OFPPF_PAUSE_ASYM) {
- ds_put_cstr(string, "AUTO_PAUSE_ASYM ");
+}
+
+static void
+ofp_print_port_features(struct ds *string, uint32_t 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);
+ ds_put_char(string, '\n');
+}
+
+static void
+ofp_print_port_config(struct ds *string, uint32_t 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);
+ ds_put_char(string, '\n');
+}
+
+static void
+ofp_print_port_state(struct ds *string, uint32_t state)
+{
+ static const struct bit_name state_bits[] = {
+ { OFPPS_LINK_DOWN, "LINK_DOWN" },
+ { 0, NULL },
+ };
+ uint32_t 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.
+ *
+ * OVS doesn't support STP, so this field will always be 0 if we are
+ * 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;
+ 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;
+ if (state) {
+ ofp_print_bit_names(string, state, state_bits);
+ }
+ } else {
+ ofp_print_bit_names(string, state, state_bits);
}
ds_put_char(string, '\n');
}
static void
ofp_print_phy_port(struct ds *string, const struct ofp_phy_port *port)
{
- uint8_t name[OFP_MAX_PORT_NAME_LEN];
+ char name[OFP_MAX_PORT_NAME_LEN];
int j;
memcpy(name, port->name, sizeof name);
for (j = 0; j < sizeof name - 1; j++) {
- if (!isprint(name[j])) {
+ if (!isprint((unsigned char) name[j])) {
break;
}
}
name[j] = '\0';
ds_put_char(string, ' ');
- ofp_print_port_name(string, ntohs(port->port_no));
- ds_put_format(string, "(%s): addr:"ETH_ADDR_FMT", config: %#x, state:%#x\n",
- name, ETH_ADDR_ARGS(port->hw_addr), ntohl(port->config),
- ntohl(port->state));
+ ofputil_format_port(ntohs(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));
+
+ ds_put_cstr(string, " state: ");
+ ofp_print_port_state(string, ntohl(port->state));
+
if (port->curr) {
ds_put_format(string, " current: ");
ofp_print_port_features(string, ntohl(port->curr));
}
}
-/* 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 OVS_UNUSED)
+ofp_print_switch_features(struct ds *string,
+ const struct ofp_switch_features *osf)
{
- const struct ofp_switch_features *osf = oh;
+ size_t len = ntohs(osf->header.length);
struct ofp_phy_port *port_list;
int n_ports;
int i;
ds_put_format(string, "features: capabilities:%#x, actions:%#x\n",
ntohl(osf->capabilities), ntohl(osf->actions));
- if (ntohs(osf->header.length) >= sizeof *osf) {
- len = MIN(len, ntohs(osf->header.length));
- }
n_ports = (len - sizeof *osf) / sizeof *osf->ports;
port_list = xmemdup(osf->ports, len - sizeof *osf);
free(port_list);
}
-/* 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 OVS_UNUSED, int verbosity OVS_UNUSED)
+ofp_print_switch_config(struct ds *string, const struct ofp_switch_config *osc)
{
- const struct ofp_switch_config *osc = oh;
- uint16_t flags;
+ enum ofp_config_flags flags;
flags = ntohs(osc->flags);
+
+ 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);
}
}
static void
-print_ip_netmask(struct ds *string, const char *leader, uint32_t ip,
+print_ip_netmask(struct ds *string, const char *leader, ovs_be32 ip,
uint32_t wild_bits, int verbosity)
{
if (wild_bits >= 32 && verbosity < 2) {
if (om->dl_type == htons(ETH_TYPE_IP)) {
if (!(w & OFPFW_NW_PROTO)) {
skip_proto = true;
- if (om->nw_proto == IP_TYPE_ICMP) {
+ if (om->nw_proto == IPPROTO_ICMP) {
ds_put_cstr(&f, "icmp,");
- } else if (om->nw_proto == IP_TYPE_TCP) {
+ } else if (om->nw_proto == IPPROTO_TCP) {
ds_put_cstr(&f, "tcp,");
- } else if (om->nw_proto == IP_TYPE_UDP) {
+ } else if (om->nw_proto == IPPROTO_UDP) {
ds_put_cstr(&f, "udp,");
} else {
ds_put_cstr(&f, "ip,");
skip_type = false;
}
}
- if (w & NXFW_TUN_ID) {
- ds_put_cstr(&f, "tun_id_wild,");
- }
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,
(w & OFPFW_NW_DST_MASK) >> OFPFW_NW_DST_SHIFT, verbosity);
if (!skip_proto) {
if (om->dl_type == htons(ETH_TYPE_ARP)) {
- print_wild(&f, "opcode=", w & OFPFW_NW_PROTO, verbosity,
+ print_wild(&f, "arp_op=", w & OFPFW_NW_PROTO, verbosity,
"%u", om->nw_proto);
} else {
print_wild(&f, "nw_proto=", w & OFPFW_NW_PROTO, verbosity,
"%u", om->nw_proto);
- print_wild(&f, "nw_tos=", w & OFPFW_NW_TOS, verbosity,
- "%u", om->nw_tos);
}
}
- if (om->nw_proto == IP_TYPE_ICMP) {
+ print_wild(&f, "nw_tos=", w & OFPFW_NW_TOS, verbosity,
+ "%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));
print_wild(&f, "tp_dst=", w & OFPFW_TP_DST, verbosity,
"%d", ntohs(om->tp_dst));
}
+ if (ds_last(&f) == ',') {
+ f.length--;
+ }
return ds_cstr(&f);
}
-/* Pretty-print the OFPT_FLOW_MOD packet of 'len' bytes at 'oh' to 'string'
- * at the given 'verbosity' level. */
static void
-ofp_print_flow_mod(struct ds *string, const void *oh, size_t len,
- int verbosity)
+ofp_print_flow_mod(struct ds *s, const struct ofp_header *oh,
+ enum ofputil_msg_code code, int verbosity)
{
- const struct ofp_flow_mod *ofm = oh;
+ struct ofputil_flow_mod fm;
+ bool need_priority;
+ enum ofperr error;
- ds_put_char(string, ' ');
- ofp_print_match(string, &ofm->match, verbosity);
- if (ds_last(string) != ' ') {
- ds_put_char(string, ' ');
+ error = ofputil_decode_flow_mod(&fm, oh, true);
+ if (error) {
+ ofp_print_error(s, error);
+ return;
}
- switch (ntohs(ofm->command)) {
+ ds_put_char(s, ' ');
+ switch (fm.command) {
case OFPFC_ADD:
- ds_put_cstr(string, "ADD:");
+ ds_put_cstr(s, "ADD");
break;
case OFPFC_MODIFY:
- ds_put_cstr(string, "MOD:");
+ ds_put_cstr(s, "MOD");
break;
case OFPFC_MODIFY_STRICT:
- ds_put_cstr(string, "MOD_STRICT:");
+ ds_put_cstr(s, "MOD_STRICT");
break;
case OFPFC_DELETE:
- ds_put_cstr(string, "DEL:");
+ ds_put_cstr(s, "DEL");
break;
case OFPFC_DELETE_STRICT:
- ds_put_cstr(string, "DEL_STRICT:");
+ ds_put_cstr(s, "DEL_STRICT");
break;
default:
- ds_put_format(string, "cmd:%d", ntohs(ofm->command));
+ ds_put_format(s, "cmd:%d", fm.command);
+ }
+ if (fm.table_id != 0) {
+ ds_put_format(s, " table:%d", fm.table_id);
+ }
+
+ ds_put_char(s, ' ');
+ if (verbosity >= 3 && code == OFPUTIL_OFPT_FLOW_MOD) {
+ const struct ofp_flow_mod *ofm = (const struct ofp_flow_mod *) oh;
+ ofp_print_match(s, &ofm->match, verbosity);
+
+ /* ofp_print_match() doesn't print priority. */
+ need_priority = true;
+ } else if (verbosity >= 3 && code == OFPUTIL_NXT_FLOW_MOD) {
+ const struct nx_flow_mod *nfm = (const struct nx_flow_mod *) oh;
+ const void *nxm = nfm + 1;
+ char *nxm_s;
+
+ nxm_s = nx_match_to_string(nxm, ntohs(nfm->match_len));
+ ds_put_cstr(s, nxm_s);
+ free(nxm_s);
+
+ /* nx_match_to_string() doesn't print priority. */
+ need_priority = true;
+ } else {
+ cls_rule_format(&fm.cr, s);
+
+ /* cls_rule_format() does print priority. */
+ need_priority = false;
}
- if (ofm->cookie != htonll(0)) {
- ds_put_format(string, " cookie:0x%"PRIx64, ntohll(ofm->cookie));
+
+ if (ds_last(s) != ' ') {
+ ds_put_char(s, ' ');
}
- if (ofm->idle_timeout != htons(OFP_FLOW_PERMANENT)) {
- ds_put_format(string, " idle:%d", ntohs(ofm->idle_timeout));
+ if (fm.cookie != htonll(0)) {
+ ds_put_format(s, "cookie:0x%"PRIx64" ", ntohll(fm.cookie));
}
- if (ofm->hard_timeout != htons(OFP_FLOW_PERMANENT)) {
- ds_put_format(string, " hard:%d", ntohs(ofm->hard_timeout));
+ if (fm.idle_timeout != OFP_FLOW_PERMANENT) {
+ ds_put_format(s, "idle:%"PRIu16" ", fm.idle_timeout);
}
- if (ofm->priority != htons(32768)) {
- ds_put_format(string, " pri:%"PRIu16, ntohs(ofm->priority));
+ if (fm.hard_timeout != OFP_FLOW_PERMANENT) {
+ ds_put_format(s, "hard:%"PRIu16" ", fm.hard_timeout);
}
- if (ofm->buffer_id != htonl(UINT32_MAX)) {
- ds_put_format(string, " buf:%#"PRIx32, ntohl(ofm->buffer_id));
+ if (fm.cr.priority != OFP_DEFAULT_PRIORITY && need_priority) {
+ ds_put_format(s, "pri:%"PRIu16" ", fm.cr.priority);
}
- if (ofm->flags != htons(0)) {
- ds_put_format(string, " flags:%"PRIx16, ntohs(ofm->flags));
+ if (fm.buffer_id != UINT32_MAX) {
+ ds_put_format(s, "buf:0x%"PRIx32" ", fm.buffer_id);
}
- ds_put_cstr(string, " ");
- ofp_print_actions(string, ofm->actions,
- len - offsetof(struct ofp_flow_mod, actions));
- ds_put_char(string, '\n');
+ if (fm.flags != 0) {
+ 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);
}
-/* Pretty-print the OFPT_FLOW_REMOVED packet of 'len' bytes at 'oh' to 'string'
- * at the given 'verbosity' level. */
static void
-ofp_print_flow_removed(struct ds *string, const void *oh,
- size_t len OVS_UNUSED, int verbosity)
+ofp_print_duration(struct ds *string, unsigned int sec, unsigned int nsec)
+{
+ ds_put_format(string, "%u", sec);
+ if (nsec > 0) {
+ ds_put_format(string, ".%09u", nsec);
+ while (string->string[string->length - 1] == '0') {
+ string->length--;
+ }
+ }
+ ds_put_char(string, 's');
+}
+
+static const char *
+ofp_flow_removed_reason_to_string(enum ofp_flow_removed_reason reason)
{
- const struct ofp_flow_removed *ofr = oh;
+ static char s[32];
- ofp_print_match(string, &ofr->match, verbosity);
- ds_put_cstr(string, " reason=");
- switch (ofr->reason) {
+ switch (reason) {
case OFPRR_IDLE_TIMEOUT:
- ds_put_cstr(string, "idle");
- break;
+ return "idle";
case OFPRR_HARD_TIMEOUT:
- ds_put_cstr(string, "hard");
- break;
+ return "hard";
case OFPRR_DELETE:
- ds_put_cstr(string, "delete");
- break;
+ return "delete";
default:
- ds_put_format(string, "**%"PRIu8"**", ofr->reason);
- break;
+ 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;
+ enum ofperr error;
- if (ofr->cookie != htonll(0)) {
- ds_put_format(string, " cookie:0x%"PRIx64, ntohll(ofr->cookie));
+ error = ofputil_decode_flow_removed(&fr, oh);
+ if (error) {
+ ofp_print_error(string, error);
+ return;
}
- if (ofr->priority != htons(32768)) {
- ds_put_format(string, " pri:%"PRIu16, ntohs(ofr->priority));
+
+ ds_put_char(string, ' ');
+ cls_rule_format(&fr.rule, string);
+
+ 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));
}
- ds_put_format(string, " secs%"PRIu32" nsecs%"PRIu32
- " idle%"PRIu16" pkts%"PRIu64" bytes%"PRIu64"\n",
- ntohl(ofr->duration_sec), ntohl(ofr->duration_nsec),
- ntohs(ofr->idle_timeout), ntohll(ofr->packet_count),
- ntohll(ofr->byte_count));
+ ds_put_cstr(string, " duration");
+ ofp_print_duration(string, fr.duration_sec, fr.duration_nsec);
+ ds_put_format(string, " idle%"PRIu16" pkts%"PRIu64" bytes%"PRIu64"\n",
+ fr.idle_timeout, fr.packet_count, fr.byte_count);
}
static void
-ofp_print_port_mod(struct ds *string, const void *oh, size_t len OVS_UNUSED,
- int verbosity OVS_UNUSED)
+ofp_print_port_mod(struct ds *string, const struct ofp_port_mod *opm)
{
- const struct ofp_port_mod *opm = 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 error_type {
- int type;
- int code;
- const char *name;
-};
-
-static const struct error_type error_types[] = {
-#define ERROR_TYPE(TYPE) {TYPE, -1, #TYPE}
-#define ERROR_CODE(TYPE, CODE) {TYPE, CODE, #CODE}
- ERROR_TYPE(OFPET_HELLO_FAILED),
- ERROR_CODE(OFPET_HELLO_FAILED, OFPHFC_INCOMPATIBLE),
- ERROR_CODE(OFPET_HELLO_FAILED, OFPHFC_EPERM),
-
- ERROR_TYPE(OFPET_BAD_REQUEST),
- ERROR_CODE(OFPET_BAD_REQUEST, OFPBRC_BAD_VERSION),
- ERROR_CODE(OFPET_BAD_REQUEST, OFPBRC_BAD_TYPE),
- ERROR_CODE(OFPET_BAD_REQUEST, OFPBRC_BAD_STAT),
- ERROR_CODE(OFPET_BAD_REQUEST, OFPBRC_BAD_VENDOR),
- ERROR_CODE(OFPET_BAD_REQUEST, OFPBRC_BAD_SUBTYPE),
- ERROR_CODE(OFPET_BAD_REQUEST, OFPBRC_EPERM),
- ERROR_CODE(OFPET_BAD_REQUEST, OFPBRC_BAD_LEN),
- ERROR_CODE(OFPET_BAD_REQUEST, OFPBRC_BUFFER_EMPTY),
- ERROR_CODE(OFPET_BAD_REQUEST, OFPBRC_BUFFER_UNKNOWN),
-
- ERROR_TYPE(OFPET_BAD_ACTION),
- ERROR_CODE(OFPET_BAD_ACTION, OFPBAC_BAD_TYPE),
- ERROR_CODE(OFPET_BAD_ACTION, OFPBAC_BAD_LEN),
- ERROR_CODE(OFPET_BAD_ACTION, OFPBAC_BAD_VENDOR),
- ERROR_CODE(OFPET_BAD_ACTION, OFPBAC_BAD_VENDOR_TYPE),
- ERROR_CODE(OFPET_BAD_ACTION, OFPBAC_BAD_OUT_PORT),
- ERROR_CODE(OFPET_BAD_ACTION, OFPBAC_BAD_ARGUMENT),
- ERROR_CODE(OFPET_BAD_ACTION, OFPBAC_EPERM),
- ERROR_CODE(OFPET_BAD_ACTION, OFPBAC_TOO_MANY),
-
- ERROR_TYPE(OFPET_FLOW_MOD_FAILED),
- ERROR_CODE(OFPET_FLOW_MOD_FAILED, OFPFMFC_ALL_TABLES_FULL),
- ERROR_CODE(OFPET_FLOW_MOD_FAILED, OFPFMFC_OVERLAP),
- ERROR_CODE(OFPET_FLOW_MOD_FAILED, OFPFMFC_EPERM),
- ERROR_CODE(OFPET_FLOW_MOD_FAILED, OFPFMFC_BAD_EMERG_TIMEOUT),
- ERROR_CODE(OFPET_FLOW_MOD_FAILED, OFPFMFC_BAD_COMMAND),
-
- ERROR_TYPE(OFPET_PORT_MOD_FAILED),
- ERROR_CODE(OFPET_PORT_MOD_FAILED, OFPPMFC_BAD_PORT),
- ERROR_CODE(OFPET_PORT_MOD_FAILED, OFPPMFC_BAD_HW_ADDR)
-};
-#define N_ERROR_TYPES ARRAY_SIZE(error_types)
-
-static const char *
-lookup_error_type(int type)
-{
- const struct error_type *t;
-
- for (t = error_types; t < &error_types[N_ERROR_TYPES]; t++) {
- if (t->type == type && t->code == -1) {
- return t->name;
- }
- }
- return "?";
-}
-
-static const char *
-lookup_error_code(int type, int code)
+static void
+ofp_print_error(struct ds *string, enum ofperr error)
{
- const struct error_type *t;
-
- for (t = error_types; t < &error_types[N_ERROR_TYPES]; t++) {
- if (t->type == type && t->code == code) {
- return t->name;
- }
+ if (string->length) {
+ ds_put_char(string, ' ');
}
- return "?";
+ ds_put_format(string, "***decode error: %s***\n", ofperr_get_name(error));
}
-/* Pretty-print the OFPT_ERROR 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 OVS_UNUSED)
+ofp_print_error_msg(struct ds *string, const struct ofp_error_msg *oem)
{
- const struct ofp_error_msg *oem = oh;
- int type = ntohs(oem->type);
- int code = ntohs(oem->code);
+ size_t len = ntohs(oem->header.length);
+ size_t payload_ofs, payload_len;
+ const void *payload;
+ enum ofperr error;
char *s;
- ds_put_format(string, " type%d(%s) code%d(%s) payload:\n",
- type, lookup_error_type(type),
- code, lookup_error_code(type, code));
+ 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;
+ }
- switch (type) {
- case OFPET_HELLO_FAILED:
- ds_put_printable(string, (char *) oem->data, len - sizeof *oem);
- break;
+ ds_put_format(string, " %s\n", ofperr_get_name(error));
- case OFPET_BAD_REQUEST:
- s = ofp_to_string(oem->data, len - sizeof *oem, 1);
+ payload = (const uint8_t *) oem + payload_ofs;
+ payload_len = len - payload_ofs;
+ if (error == OFPERR_OFPHFC_INCOMPATIBLE || error == OFPERR_OFPHFC_EPERM) {
+ ds_put_printable(string, payload, payload_len);
+ } else {
+ s = ofp_to_string(payload, payload_len, 1);
ds_put_cstr(string, s);
free(s);
- break;
-
- default:
- ds_put_hex_dump(string, oem->data, len - sizeof *oem, 0, true);
- break;
}
}
-/* Pretty-print the OFPT_PORT_STATUS packet of 'len' bytes at 'oh' to 'string'
- * at the given 'verbosity' level. */
static void
-ofp_print_port_status(struct ds *string, const void *oh, size_t len OVS_UNUSED,
- int verbosity OVS_UNUSED)
+ofp_print_port_status(struct ds *string, const struct ofp_port_status *ops)
{
- const struct ofp_port_status *ops = oh;
-
if (ops->reason == OFPPR_ADD) {
ds_put_format(string, " ADD:");
} else if (ops->reason == OFPPR_DELETE) {
}
static void
-ofp_desc_stats_reply(struct ds *string, const void *body,
- size_t len OVS_UNUSED, int verbosity OVS_UNUSED)
+ofp_print_ofpst_desc_reply(struct ds *string, const struct ofp_desc_stats *ods)
{
- const struct ofp_desc_stats *ods = body;
-
+ ds_put_char(string, '\n');
ds_put_format(string, "Manufacturer: %.*s\n",
(int) sizeof ods->mfr_desc, ods->mfr_desc);
ds_put_format(string, "Hardware: %.*s\n",
}
static void
-ofp_flow_stats_request(struct ds *string, const void *oh,
- size_t len OVS_UNUSED, int verbosity)
+ofp_print_flow_stats_request(struct ds *string,
+ const struct ofp_stats_msg *osm)
{
- const struct ofp_flow_stats_request *fsr = oh;
+ struct ofputil_flow_stats_request fsr;
+ enum ofperr error;
- if (fsr->table_id == 0xff) {
- ds_put_format(string, " table_id=any, ");
- } else {
- ds_put_format(string, " table_id=%"PRIu8", ", fsr->table_id);
+ error = ofputil_decode_flow_stats_request(&fsr, &osm->header);
+ if (error) {
+ ofp_print_error(string, error);
+ return;
+ }
+
+ if (fsr.table_id != 0xff) {
+ ds_put_format(string, " table=%"PRIu8, fsr.table_id);
}
- ofp_print_match(string, &fsr->match, verbosity);
+ if (fsr.out_port != OFPP_NONE) {
+ ds_put_cstr(string, " out_port=");
+ ofputil_format_port(fsr.out_port, string);
+ }
+
+ /* A flow stats request doesn't include a priority, but cls_rule_format()
+ * will print one unless it is OFP_DEFAULT_PRIORITY. */
+ fsr.match.priority = OFP_DEFAULT_PRIORITY;
+
+ ds_put_char(string, ' ');
+ cls_rule_format(&fsr.match, string);
}
static void
-ofp_flow_stats_reply(struct ds *string, const void *body_, size_t len,
- int verbosity)
+ofp_print_flow_stats_reply(struct ds *string, const struct ofp_header *oh)
{
- const char *body = body_;
- const char *pos = body;
+ struct ofpbuf b;
+
+ ofpbuf_use_const(&b, oh, ntohs(oh->length));
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);
+ struct ofputil_flow_stats fs;
+ int retval;
+
+ retval = ofputil_decode_flow_stats_reply(&fs, &b, true);
+ if (retval) {
+ if (retval != EOF) {
+ ds_put_cstr(string, " ***parse error***");
}
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_char(string, '\n');
- ds_put_format(string, " cookie=0x%"PRIx64", ", ntohll(fs->cookie));
- ds_put_format(string, "duration_sec=%"PRIu32"s, ",
- ntohl(fs->duration_sec));
- ds_put_format(string, "duration_nsec=%"PRIu32"ns, ",
- ntohl(fs->duration_nsec));
- 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));
- if (fs->idle_timeout != htons(OFP_FLOW_PERMANENT)) {
- ds_put_format(string, "idle_timeout=%"PRIu16",",
- ntohs(fs->idle_timeout));
+ ds_put_format(string, " cookie=0x%"PRIx64", duration=",
+ ntohll(fs.cookie));
+ ofp_print_duration(string, fs.duration_sec, fs.duration_nsec);
+ ds_put_format(string, ", table=%"PRIu8", ", fs.table_id);
+ 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);
}
- if (fs->hard_timeout != htons(OFP_FLOW_PERMANENT)) {
- ds_put_format(string, "hard_timeout=%"PRIu16",",
- ntohs(fs->hard_timeout));
+ if (fs.hard_timeout != OFP_FLOW_PERMANENT) {
+ 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);
}
- ofp_print_match(string, &fs->match, verbosity);
- ofp_print_actions(string, fs->actions, length - sizeof *fs);
- ds_put_char(string, '\n');
- pos += length;
+ cls_rule_format(&fs.rule, string);
+ if (string->string[string->length - 1] != ' ') {
+ ds_put_char(string, ' ');
+ }
+ ofp_print_actions(string, fs.actions, fs.n_actions);
}
}
static void
-ofp_aggregate_stats_request(struct ds *string, const void *oh,
- size_t len OVS_UNUSED, int verbosity)
+ofp_print_ofpst_aggregate_reply(struct ds *string,
+ const struct ofp_aggregate_stats_reply *asr)
{
- 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);
+ ds_put_format(string, " packet_count=%"PRIu64,
+ ntohll(get_32aligned_be64(&asr->packet_count)));
+ ds_put_format(string, " byte_count=%"PRIu64,
+ ntohll(get_32aligned_be64(&asr->byte_count)));
+ ds_put_format(string, " flow_count=%"PRIu32, ntohl(asr->flow_count));
}
static void
-ofp_aggregate_stats_reply(struct ds *string, const void *body_,
- size_t len OVS_UNUSED, int verbosity OVS_UNUSED)
+ofp_print_nxst_aggregate_reply(struct ds *string,
+ const struct nx_aggregate_stats_reply *nasr)
{
- 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));
+ ds_put_format(string, " packet_count=%"PRIu64, ntohll(nasr->packet_count));
+ ds_put_format(string, " byte_count=%"PRIu64, ntohll(nasr->byte_count));
+ ds_put_format(string, " flow_count=%"PRIu32, ntohl(nasr->flow_count));
}
static void print_port_stat(struct ds *string, const char *leader,
- uint64_t stat, int more)
+ const ovs_32aligned_be64 *statp, int more)
{
+ uint64_t stat = ntohll(get_32aligned_be64(statp));
+
ds_put_cstr(string, leader);
- if (stat != -1) {
+ if (stat != UINT64_MAX) {
ds_put_format(string, "%"PRIu64, stat);
} else {
ds_put_char(string, '?');
}
static void
-ofp_port_stats_request(struct ds *string, const void *body_,
- size_t len OVS_UNUSED, int verbosity OVS_UNUSED)
+ofp_print_ofpst_port_request(struct ds *string,
+ const struct ofp_port_stats_request *psr)
{
- const struct ofp_port_stats_request *psr = body_;
- ds_put_format(string, "port_no=%"PRIu16, ntohs(psr->port_no));
+ ds_put_format(string, " port_no=%"PRIu16, ntohs(psr->port_no));
}
static void
-ofp_port_stats_reply(struct ds *string, const void *body, size_t len,
- int verbosity)
+ofp_print_ofpst_port_reply(struct ds *string, const struct ofp_header *oh,
+ int verbosity)
{
- const struct ofp_port_stats *ps = body;
- size_t n = len / sizeof *ps;
+ const struct ofp_port_stats *ps = ofputil_stats_body(oh);
+ size_t n = ofputil_stats_body_len(oh) / sizeof *ps;
ds_put_format(string, " %zu ports\n", n);
if (verbosity < 1) {
return;
ds_put_format(string, " port %2"PRIu16": ", ntohs(ps->port_no));
ds_put_cstr(string, "rx ");
- print_port_stat(string, "pkts=", ntohll(ps->rx_packets), 1);
- print_port_stat(string, "bytes=", ntohll(ps->rx_bytes), 1);
- print_port_stat(string, "drop=", ntohll(ps->rx_dropped), 1);
- print_port_stat(string, "errs=", ntohll(ps->rx_errors), 1);
- print_port_stat(string, "frame=", ntohll(ps->rx_frame_err), 1);
- print_port_stat(string, "over=", ntohll(ps->rx_over_err), 1);
- print_port_stat(string, "crc=", ntohll(ps->rx_crc_err), 0);
+ print_port_stat(string, "pkts=", &ps->rx_packets, 1);
+ print_port_stat(string, "bytes=", &ps->rx_bytes, 1);
+ print_port_stat(string, "drop=", &ps->rx_dropped, 1);
+ print_port_stat(string, "errs=", &ps->rx_errors, 1);
+ print_port_stat(string, "frame=", &ps->rx_frame_err, 1);
+ print_port_stat(string, "over=", &ps->rx_over_err, 1);
+ print_port_stat(string, "crc=", &ps->rx_crc_err, 0);
ds_put_cstr(string, " tx ");
- print_port_stat(string, "pkts=", ntohll(ps->tx_packets), 1);
- print_port_stat(string, "bytes=", ntohll(ps->tx_bytes), 1);
- print_port_stat(string, "drop=", ntohll(ps->tx_dropped), 1);
- print_port_stat(string, "errs=", ntohll(ps->tx_errors), 1);
- print_port_stat(string, "coll=", ntohll(ps->collisions), 0);
+ print_port_stat(string, "pkts=", &ps->tx_packets, 1);
+ print_port_stat(string, "bytes=", &ps->tx_bytes, 1);
+ print_port_stat(string, "drop=", &ps->tx_dropped, 1);
+ print_port_stat(string, "errs=", &ps->tx_errors, 1);
+ print_port_stat(string, "coll=", &ps->collisions, 0);
}
}
static void
-ofp_table_stats_reply(struct ds *string, const void *body, size_t len,
- int verbosity)
+ofp_print_ofpst_table_reply(struct ds *string, const struct ofp_header *oh,
+ int verbosity)
{
- const struct ofp_table_stats *ts = body;
- size_t n = len / sizeof *ts;
+ const struct ofp_table_stats *ts = ofputil_stats_body(oh);
+ size_t n = ofputil_stats_body_len(oh) / 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';
+ ovs_strlcpy(name, ts->name, sizeof name);
ds_put_format(string, " %d: %-8s: ", ts->table_id, name);
ds_put_format(string, "wild=0x%05"PRIx32", ", ntohl(ts->wildcards));
ds_put_format(string, "active=%"PRIu32"\n", ntohl(ts->active_count));
ds_put_cstr(string, " ");
ds_put_format(string, "lookup=%"PRIu64", ",
- ntohll(ts->lookup_count));
+ ntohll(get_32aligned_be64(&ts->lookup_count)));
ds_put_format(string, "matched=%"PRIu64"\n",
- ntohll(ts->matched_count));
+ ntohll(get_32aligned_be64(&ts->matched_count)));
}
}
}
static void
-ofp_queue_stats_request(struct ds *string, const void *body_,
- size_t len OVS_UNUSED, int verbosity OVS_UNUSED)
+ofp_print_ofpst_queue_request(struct ds *string,
+ const struct ofp_queue_stats_request *qsr)
{
- const struct ofp_queue_stats_request *qsr = body_;
-
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));
}
static void
-ofp_queue_stats_reply(struct ds *string, const void *body, size_t len,
- int verbosity)
+ofp_print_ofpst_queue_reply(struct ds *string, const struct ofp_header *oh,
+ int verbosity)
{
- const struct ofp_queue_stats *qs = body;
- size_t n = len / sizeof *qs;
+ const struct ofp_queue_stats *qs = ofputil_stats_body(oh);
+ size_t n = ofputil_stats_body_len(oh) / sizeof *qs;
ds_put_format(string, " %zu queues\n", n);
if (verbosity < 1) {
return;
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, ": ");
- print_port_stat(string, "bytes=", ntohll(qs->tx_bytes), 1);
- print_port_stat(string, "pkts=", ntohll(qs->tx_packets), 1);
- print_port_stat(string, "errors=", ntohll(qs->tx_errors), 0);
+ print_port_stat(string, "bytes=", &qs->tx_bytes, 1);
+ print_port_stat(string, "pkts=", &qs->tx_packets, 1);
+ print_port_stat(string, "errors=", &qs->tx_errors, 0);
}
}
static void
-vendor_stat(struct ds *string, const void *body, size_t len,
- int verbosity OVS_UNUSED)
+ofp_print_stats_request(struct ds *string, const struct ofp_header *oh)
{
- ds_put_format(string, " vendor=%08"PRIx32, ntohl(*(uint32_t *) body));
- ds_put_format(string, " %zu bytes additional data",
- len - sizeof(uint32_t));
-}
+ const struct ofp_stats_msg *srq = (const struct ofp_stats_msg *) oh;
-enum stats_direction {
- REQUEST,
- REPLY
-};
+ if (srq->flags) {
+ ds_put_format(string, " ***unknown flags 0x%04"PRIx16"***",
+ ntohs(srq->flags));
+ }
+}
static void
-print_stats(struct ds *string, int type, const void *body, size_t body_len,
- int verbosity, enum stats_direction direction)
+ofp_print_stats_reply(struct ds *string, const struct ofp_header *oh)
{
- struct stats_msg {
- size_t min_body, max_body;
- void (*printer)(struct ds *, const void *, size_t len, int verbosity);
- };
+ const struct ofp_stats_msg *srp = (const struct ofp_stats_msg *) oh;
- struct stats_type {
- int type;
- const char *name;
- struct stats_msg request;
- struct stats_msg reply;
- };
+ if (srp->flags) {
+ uint16_t flags = ntohs(srp->flags);
- static const struct stats_type stats_types[] = {
- {
- OFPST_DESC,
- "description",
- { 0, 0, NULL },
- { 0, SIZE_MAX, ofp_desc_stats_reply },
- },
- {
- 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",
- { sizeof(struct ofp_port_stats_request),
- sizeof(struct ofp_port_stats_request),
- ofp_port_stats_request },
- { 0, SIZE_MAX, ofp_port_stats_reply },
- },
- {
- OFPST_QUEUE,
- "queue",
- { sizeof(struct ofp_queue_stats_request),
- sizeof(struct ofp_queue_stats_request),
- ofp_queue_stats_request },
- { 0, SIZE_MAX, ofp_queue_stats_reply },
- },
- {
- OFPST_VENDOR,
- "vendor-specific",
- { sizeof(uint32_t), SIZE_MAX, vendor_stat },
- { sizeof(uint32_t), SIZE_MAX, vendor_stat },
- },
- {
- -1,
- "unknown",
- { 0, 0, NULL, },
- { 0, 0, NULL, },
- },
- };
+ ds_put_cstr(string, " flags=");
+ if (flags & OFPSF_REPLY_MORE) {
+ ds_put_cstr(string, "[more]");
+ flags &= ~OFPSF_REPLY_MORE;
+ }
+ if (flags) {
+ ds_put_format(string, "[***unknown flags 0x%04"PRIx16"***]",
+ flags);
+ }
+ }
+}
- const struct stats_type *s;
- const struct stats_msg *m;
+static void
+ofp_print_echo(struct ds *string, const struct ofp_header *oh, int verbosity)
+{
+ size_t len = ntohs(oh->length);
- if (type >= ARRAY_SIZE(stats_types) || !stats_types[type].name) {
- ds_put_format(string, " ***unknown type %d***", type);
- return;
- }
- for (s = stats_types; s->type >= 0; s++) {
- if (s->type == type) {
- break;
- }
+ ds_put_format(string, " %zu bytes of payload\n", len - sizeof *oh);
+ if (verbosity > 1) {
+ ds_put_hex_dump(string, oh + 1, len - sizeof *oh, 0, true);
}
- 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;
+static void
+ofp_print_nxt_role_message(struct ds *string,
+ const struct nx_role_request *nrr)
+{
+ unsigned int role = ntohl(nrr->role);
+
+ ds_put_cstr(string, " role=");
+ if (role == NX_ROLE_OTHER) {
+ ds_put_cstr(string, "other");
+ } else if (role == NX_ROLE_MASTER) {
+ ds_put_cstr(string, "master");
+ } else if (role == NX_ROLE_SLAVE) {
+ ds_put_cstr(string, "slave");
+ } else {
+ ds_put_format(string, "%u", role);
}
- if (m->printer) {
- m->printer(string, body, body_len, verbosity);
+}
+
+static void
+ofp_print_nxt_flow_mod_table_id(struct ds *string,
+ 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 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));
+ } else {
+ ds_put_format(string, "%"PRIu32, format);
}
}
static void
-ofp_stats_request(struct ds *string, const void *oh, size_t len, int verbosity)
+ofp_print_nxt_set_packet_in_format(struct ds *string,
+ const struct nx_set_packet_in_format *nspf)
{
- const struct ofp_stats_request *srq = oh;
+ uint32_t format = ntohl(nspf->format);
- if (srq->flags) {
- ds_put_format(string, " ***unknown flags 0x%04"PRIx16"***",
- ntohs(srq->flags));
+ 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";
- print_stats(string, ntohs(srq->type), srq->body,
- len - offsetof(struct ofp_stats_request, body),
- verbosity, REQUEST);
+ case OFPPR_DELETE:
+ return "delete";
+
+ case OFPPR_MODIFY:
+ return "modify";
+
+ default:
+ sprintf(s, "%d", (int) reason);
+ return s;
+ }
}
static void
-ofp_stats_reply(struct ds *string, const void *oh, size_t len, int verbosity)
+ofp_print_nxt_set_async_config(struct ds *string,
+ const struct nx_async_config *nac)
{
- const struct ofp_stats_reply *srp = oh;
+ int i;
- 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;
+ 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 (flags) {
- ds_put_format(string, "[***unknown flags 0x%04"PRIx16"***]", flags);
+ 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');
}
+}
- print_stats(string, ntohs(srp->type), srp->body,
- len - offsetof(struct ofp_stats_reply, body),
- verbosity, REPLY);
+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_echo(struct ds *string, const void *oh, size_t len, int verbosity)
+ofp_to_string__(const struct ofp_header *oh,
+ const struct ofputil_msg_type *type, struct ds *string,
+ int verbosity)
{
- const struct ofp_header *hdr = oh;
+ enum ofputil_msg_code code;
+ const void *msg = 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);
- }
-}
+ ds_put_format(string, "%s (xid=0x%"PRIx32"):",
+ ofputil_msg_type_name(type), ntohl(oh->xid));
-struct openflow_packet {
- uint8_t type;
- const char *name;
- size_t min_size;
- void (*printer)(struct ds *, const void *, size_t len, int verbosity);
-};
+ code = ofputil_msg_type_code(type);
+ switch (code) {
+ case OFPUTIL_MSG_INVALID:
+ break;
+
+ case OFPUTIL_OFPT_HELLO:
+ ds_put_char(string, '\n');
+ ds_put_hex_dump(string, oh + 1, ntohs(oh->length) - sizeof *oh,
+ 0, true);
+ break;
+
+ case OFPUTIL_OFPT_ERROR:
+ ofp_print_error_msg(string, msg);
+ break;
+
+ case OFPUTIL_OFPT_ECHO_REQUEST:
+ case OFPUTIL_OFPT_ECHO_REPLY:
+ ofp_print_echo(string, oh, verbosity);
+ break;
+
+ case OFPUTIL_OFPT_FEATURES_REQUEST:
+ break;
+
+ case OFPUTIL_OFPT_FEATURES_REPLY:
+ ofp_print_switch_features(string, msg);
+ break;
+
+ case OFPUTIL_OFPT_GET_CONFIG_REQUEST:
+ break;
+
+ case OFPUTIL_OFPT_GET_CONFIG_REPLY:
+ case OFPUTIL_OFPT_SET_CONFIG:
+ ofp_print_switch_config(string, msg);
+ break;
+
+ case OFPUTIL_OFPT_PACKET_IN:
+ case OFPUTIL_NXT_PACKET_IN:
+ ofp_print_packet_in(string, msg, verbosity);
+ break;
+
+ case OFPUTIL_OFPT_FLOW_REMOVED:
+ case OFPUTIL_NXT_FLOW_REMOVED:
+ ofp_print_flow_removed(string, msg);
+ break;
+
+ case OFPUTIL_OFPT_PORT_STATUS:
+ ofp_print_port_status(string, msg);
+ break;
+
+ case OFPUTIL_OFPT_PACKET_OUT:
+ ofp_print_packet_out(string, msg, verbosity);
+ break;
+
+ case OFPUTIL_OFPT_FLOW_MOD:
+ case OFPUTIL_NXT_FLOW_MOD:
+ ofp_print_flow_mod(string, msg, code, verbosity);
+ break;
+
+ case OFPUTIL_OFPT_PORT_MOD:
+ ofp_print_port_mod(string, msg);
+ break;
+
+ case OFPUTIL_OFPT_BARRIER_REQUEST:
+ case OFPUTIL_OFPT_BARRIER_REPLY:
+ break;
+
+ case OFPUTIL_OFPT_QUEUE_GET_CONFIG_REQUEST:
+ case OFPUTIL_OFPT_QUEUE_GET_CONFIG_REPLY:
+ /* XXX */
+ break;
+
+ case OFPUTIL_OFPST_DESC_REQUEST:
+ ofp_print_stats_request(string, oh);
+ break;
+
+ case OFPUTIL_OFPST_FLOW_REQUEST:
+ case OFPUTIL_NXST_FLOW_REQUEST:
+ case OFPUTIL_OFPST_AGGREGATE_REQUEST:
+ case OFPUTIL_NXST_AGGREGATE_REQUEST:
+ ofp_print_stats_request(string, oh);
+ ofp_print_flow_stats_request(string, msg);
+ break;
+
+ case OFPUTIL_OFPST_TABLE_REQUEST:
+ ofp_print_stats_request(string, oh);
+ break;
+
+ case OFPUTIL_OFPST_PORT_REQUEST:
+ ofp_print_stats_request(string, oh);
+ ofp_print_ofpst_port_request(string, msg);
+ break;
+
+ case OFPUTIL_OFPST_QUEUE_REQUEST:
+ ofp_print_stats_request(string, oh);
+ ofp_print_ofpst_queue_request(string, msg);
+ break;
+
+ case OFPUTIL_OFPST_DESC_REPLY:
+ ofp_print_stats_reply(string, oh);
+ ofp_print_ofpst_desc_reply(string, msg);
+ break;
+
+ case OFPUTIL_OFPST_FLOW_REPLY:
+ case OFPUTIL_NXST_FLOW_REPLY:
+ ofp_print_stats_reply(string, oh);
+ ofp_print_flow_stats_reply(string, oh);
+ break;
+
+ case OFPUTIL_OFPST_QUEUE_REPLY:
+ ofp_print_stats_reply(string, oh);
+ ofp_print_ofpst_queue_reply(string, oh, verbosity);
+ break;
+
+ case OFPUTIL_OFPST_PORT_REPLY:
+ ofp_print_stats_reply(string, oh);
+ ofp_print_ofpst_port_reply(string, oh, verbosity);
+ break;
+
+ case OFPUTIL_OFPST_TABLE_REPLY:
+ ofp_print_stats_reply(string, oh);
+ ofp_print_ofpst_table_reply(string, oh, verbosity);
+ break;
+
+ case OFPUTIL_OFPST_AGGREGATE_REPLY:
+ ofp_print_stats_reply(string, oh);
+ ofp_print_ofpst_aggregate_reply(string, msg);
+ break;
+
+ case OFPUTIL_NXT_ROLE_REQUEST:
+ case OFPUTIL_NXT_ROLE_REPLY:
+ ofp_print_nxt_role_message(string, msg);
+ break;
+
+ case OFPUTIL_NXT_FLOW_MOD_TABLE_ID:
+ ofp_print_nxt_flow_mod_table_id(string, msg);
+ break;
+
+ case OFPUTIL_NXT_SET_FLOW_FORMAT:
+ ofp_print_nxt_set_flow_format(string, msg);
+ break;
+
+ case OFPUTIL_NXT_SET_PACKET_IN_FORMAT:
+ ofp_print_nxt_set_packet_in_format(string, msg);
+ break;
+
+ case OFPUTIL_NXT_FLOW_AGE:
+ break;
-static const struct openflow_packet packets[] = {
- {
- OFPT_HELLO,
- "hello",
- sizeof (struct ofp_header),
- NULL,
- },
- {
- OFPT_FEATURES_REQUEST,
- "features_request",
- sizeof (struct ofp_header),
- NULL,
- },
- {
- 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,
- "packet_in",
- offsetof(struct ofp_packet_in, data),
- ofp_packet_in,
- },
- {
- OFPT_PACKET_OUT,
- "packet_out",
- sizeof (struct ofp_packet_out),
- ofp_packet_out,
- },
- {
- OFPT_FLOW_MOD,
- "flow_mod",
- sizeof (struct ofp_flow_mod),
- ofp_print_flow_mod,
- },
- {
- OFPT_FLOW_REMOVED,
- "flow_removed",
- sizeof (struct ofp_flow_removed),
- ofp_print_flow_removed,
- },
- {
- OFPT_PORT_MOD,
- "port_mod",
- sizeof (struct ofp_port_mod),
- ofp_print_port_mod,
- },
- {
- OFPT_PORT_STATUS,
- "port_status",
- sizeof (struct ofp_port_status),
- ofp_print_port_status
- },
- {
- OFPT_ERROR,
- "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,
- },
- {
- OFPT_VENDOR,
- "vendor",
- sizeof (struct ofp_vendor_header),
- NULL,
- },
- {
- OFPT_BARRIER_REQUEST,
- "barrier_request",
- sizeof (struct ofp_header),
- NULL,
- },
- {
- OFPT_BARRIER_REPLY,
- "barrier_reply",
- sizeof (struct ofp_header),
- NULL,
+ 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:
+ ofp_print_stats_reply(string, oh);
+ ofp_print_nxst_aggregate_reply(string, msg);
+ break;
}
-};
+}
/* Composes and returns a string representing the OpenFlow packet of 'len'
* bytes at 'oh' at the given 'verbosity' level. 0 is a minimal amount of
{
struct ds string = DS_EMPTY_INITIALIZER;
const struct ofp_header *oh = oh_;
- const struct openflow_packet *pkt;
-
- if (len < sizeof(struct ofp_header)) {
- 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 != 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);
- }
-
- for (pkt = packets; ; pkt++) {
- if (pkt >= &packets[ARRAY_SIZE(packets)]) {
- ds_put_format(&string, "Unknown OpenFlow packet type %"PRIu8":\n",
- oh->type);
- ds_put_hex_dump(&string, oh, len, 0, true);
- return ds_cstr(&string);
- } else if (oh->type == pkt->type) {
- break;
- }
- }
-
- ds_put_format(&string, "%s (xid=0x%"PRIx32"):", pkt->name, oh->xid);
-
- if (ntohs(oh->length) > len)
- ds_put_format(&string, " (***truncated to %zu bytes from %"PRIu16"***)",
- len, ntohs(oh->length));
- else if (ntohs(oh->length) < len) {
- ds_put_format(&string, " (***only uses %"PRIu16" bytes out of %zu***)\n",
- ntohs(oh->length), len);
- len = ntohs(oh->length);
- }
- if (len < pkt->min_size) {
- ds_put_format(&string, " (***length=%zu < min_size=%zu***)\n",
- len, pkt->min_size);
- } else if (!pkt->printer) {
- if (len > sizeof *oh) {
- ds_put_format(&string, " length=%"PRIu16" (decoder not implemented)\n",
- ntohs(oh->length));
- }
+ if (!len) {
+ ds_put_cstr(&string, "OpenFlow message is empty\n");
+ } else if (len < sizeof(struct ofp_header)) {
+ ds_put_format(&string, "OpenFlow packet too short (only %zu bytes):\n",
+ len);
+ } else if (ntohs(oh->length) > len) {
+ ds_put_format(&string,
+ "(***truncated to %zu bytes from %"PRIu16"***)\n",
+ len, ntohs(oh->length));
+ } else if (ntohs(oh->length) < len) {
+ ds_put_format(&string,
+ "(***only uses %"PRIu16" bytes out of %zu***)\n",
+ ntohs(oh->length), len);
} 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');
+ const struct ofputil_msg_type *type;
+ enum ofperr error;
+
+ error = ofputil_decode_msg_type(oh, &type);
+ if (!error) {
+ ofp_to_string__(oh, type, &string, verbosity);
+ if (verbosity >= 5) {
+ if (ds_last(&string) != '\n') {
+ ds_put_char(&string, '\n');
+ }
+ ds_put_hex_dump(&string, oh, len, 0, true);
+ }
+ if (ds_last(&string) != '\n') {
+ ds_put_char(&string, '\n');
+ }
+ return ds_steal_cstr(&string);
+ }
+
+ ofp_print_error(&string, error);
}
- return ds_cstr(&string);
+ 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,
char *
ofp_message_type_to_string(uint8_t type)
{
- struct ds s = DS_EMPTY_INITIALIZER;
- const struct openflow_packet *pkt;
- for (pkt = packets; ; pkt++) {
- if (pkt >= &packets[ARRAY_SIZE(packets)]) {
- ds_put_format(&s, "0x%02"PRIx8, type);
- break;
- } else if (type == pkt->type) {
- const char *p;
+ const char *name;
- ds_put_cstr(&s, "OFPT_");
- for (p = pkt->name; *p; p++) {
- ds_put_char(&s, toupper((unsigned char) *p));
- }
- break;
- }
+ 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 ds_cstr(&s);
+
+ return name ? xasprintf("OFPT_%s", name) : xasprintf("0x%02"PRIx8, type);
}
\f
static void
}
/* 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