/*
- * Copyright (c) 2008, 2009, 2010 Nicira Networks.
+ * Copyright (c) 2008, 2009, 2010, 2011 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 "compiler.h"
#include "dynamic-string.h"
#include "flow.h"
+#include "multipath.h"
#include "nx-match.h"
#include "ofp-util.h"
#include "ofpbuf.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);
}
rewind(pcap);
- snprintf(command, sizeof command, "/usr/sbin/tcpdump -e -n -r /dev/fd/%d 2>/dev/null",
+ snprintf(command, sizeof command, "/usr/sbin/tcpdump -t -e -n -r /dev/fd/%d 2>/dev/null",
fileno(pcap));
tcpdump = popen(command, "r");
fclose(pcap);
ds_put_cstr(string, name);
}
+
static void
print_note(struct ds *string, const struct nx_action_note *nan)
{
}
}
+static int
+nx_action_len(enum nx_action_subtype subtype)
+{
+ switch (subtype) {
+ case NXAST_SNAT__OBSOLETE: return -1;
+ case NXAST_RESUBMIT: return sizeof(struct nx_action_resubmit);
+ case NXAST_SET_TUNNEL: return sizeof(struct nx_action_set_tunnel);
+ case NXAST_DROP_SPOOFED_ARP:
+ return sizeof(struct nx_action_drop_spoofed_arp);
+ case NXAST_SET_QUEUE: return sizeof(struct nx_action_set_queue);
+ case NXAST_POP_QUEUE: return sizeof(struct nx_action_pop_queue);
+ case NXAST_REG_MOVE: return sizeof(struct nx_action_reg_move);
+ case NXAST_REG_LOAD: return sizeof(struct nx_action_reg_load);
+ case NXAST_NOTE: return -1;
+ case NXAST_SET_TUNNEL64: return sizeof(struct nx_action_set_tunnel64);
+ case NXAST_MULTIPATH: return sizeof(struct nx_action_multipath);
+ case NXAST_AUTOPATH: return sizeof (struct nx_action_autopath);
+ default: return -1;
+ }
+}
+
static void
ofp_print_nx_action(struct ds *string, const struct nx_action_header *nah)
{
- 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));
- break;
- }
+ int subtype = ntohs(nah->subtype);
+ int required_len = nx_action_len(subtype);
+ int len = ntohs(nah->len);
- case NXAST_SET_TUNNEL: {
- const struct nx_action_set_tunnel *nast =
- (struct nx_action_set_tunnel *)nah;
- ds_put_format(string, "set_tunnel:%#"PRIx32, ntohl(nast->tun_id));
- break;
+ if (required_len != -1 && required_len != len) {
+ ds_put_format(string, "***Nicira action %"PRIu16" wrong length: %d***",
+ subtype, len);
+ return;
}
- case NXAST_DROP_SPOOFED_ARP:
- ds_put_cstr(string, "drop_spoofed_arp");
- break;
+ if (subtype <= TYPE_MAXIMUM(enum nx_action_subtype)) {
+ 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;
+
+ switch ((enum nx_action_subtype) subtype) {
+ case NXAST_RESUBMIT:
+ nar = (struct nx_action_resubmit *)nah;
+ ds_put_format(string, "resubmit:");
+ ofp_print_port_name(string, ntohs(nar->in_port));
+ return;
- 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));
- break;
- }
+ case NXAST_SET_TUNNEL:
+ nast = (struct nx_action_set_tunnel *)nah;
+ ds_put_format(string, "set_tunnel:%#"PRIx32, ntohl(nast->tun_id));
+ return;
- case NXAST_POP_QUEUE:
- ds_put_cstr(string, "pop_queue");
- break;
+ case NXAST_DROP_SPOOFED_ARP:
+ ds_put_cstr(string, "drop_spoofed_arp");
+ return;
- case NXAST_NOTE:
- print_note(string, (const struct nx_action_note *) nah);
- break;
+ case NXAST_SET_QUEUE:
+ nasq = (struct nx_action_set_queue *)nah;
+ ds_put_format(string, "set_queue:%u", ntohl(nasq->queue_id));
+ return;
- default:
- ds_put_format(string, "***unknown Nicira action:%d***",
- ntohs(nah->subtype));
+ case NXAST_POP_QUEUE:
+ ds_put_cstr(string, "pop_queue");
+ return;
+
+ case NXAST_NOTE:
+ print_note(string, (const struct nx_action_note *) nah);
+ return;
+
+ case NXAST_REG_MOVE:
+ move = (const struct nx_action_reg_move *) nah;
+ nxm_format_reg_move(move, string);
+ return;
+
+ case NXAST_REG_LOAD:
+ load = (const struct nx_action_reg_load *) nah;
+ nxm_format_reg_load(load, string);
+ return;
+
+ case NXAST_SET_TUNNEL64:
+ nast64 = (const struct nx_action_set_tunnel64 *) nah;
+ ds_put_format(string, "set_tunnel64:%#"PRIx64,
+ ntohll(nast64->tun_id));
+ return;
+
+ case NXAST_MULTIPATH:
+ nam = (const struct nx_action_multipath *) nah;
+ multipath_format(nam, string);
+ return;
+
+ case NXAST_AUTOPATH:
+ naa = (const struct nx_action_autopath *)nah;
+ ds_put_format(string, "autopath(%u,", ntohl(naa->id));
+ nxm_format_field_bits(string, ntohl(naa->dst),
+ nxm_decode_ofs(naa->ofs_nbits),
+ nxm_decode_n_bits(naa->ofs_nbits));
+ ds_put_char(string, ')');
+ return;
+
+ case NXAST_SNAT__OBSOLETE:
+ default:
+ break;
+ }
+ }
+
+ ds_put_format(string, "***unknown Nicira action:%d***", subtype);
+}
+
+static int
+ofp_action_len(enum ofp_action_type type)
+{
+ switch (type) {
+ case OFPAT_OUTPUT: return sizeof(struct ofp_action_output);
+ case OFPAT_SET_VLAN_VID: return sizeof(struct ofp_action_vlan_vid);
+ case OFPAT_SET_VLAN_PCP: return sizeof(struct ofp_action_vlan_pcp);
+ case OFPAT_STRIP_VLAN: return sizeof(struct ofp_action_header);
+ case OFPAT_SET_DL_SRC: return sizeof(struct ofp_action_dl_addr);
+ case OFPAT_SET_DL_DST: return sizeof(struct ofp_action_dl_addr);
+ case OFPAT_SET_NW_SRC: return sizeof(struct ofp_action_nw_addr);
+ case OFPAT_SET_NW_DST: return sizeof(struct ofp_action_nw_addr);
+ case OFPAT_SET_NW_TOS: return sizeof(struct ofp_action_nw_tos);
+ case OFPAT_SET_TP_SRC: return sizeof(struct ofp_action_tp_port);
+ case OFPAT_SET_TP_DST: return sizeof(struct ofp_action_tp_port);
+ case OFPAT_ENQUEUE: return sizeof(struct ofp_action_enqueue);
+ case OFPAT_VENDOR: return -1;
+ default: return -1;
}
}
ofp_print_action(struct ds *string, const struct ofp_action_header *ah,
size_t actions_len)
{
- uint16_t type;
+ enum ofp_action_type type;
+ int required_len;
size_t len;
- struct openflow_action {
- size_t min_size;
- size_t max_size;
- };
-
- 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_ENQUEUE] = {
- sizeof(struct ofp_action_enqueue),
- sizeof(struct ofp_action_enqueue),
- }
- /* OFPAT_VENDOR is not here, since it would blow up the array size. */
- };
-
if (actions_len < sizeof *ah) {
ds_put_format(string, "***action array too short for next action***\n");
return -1;
type = ntohs(ah->type);
len = ntohs(ah->len);
if (actions_len < len) {
- ds_put_format(string, "***truncated action %"PRIu16"***\n", type);
+ ds_put_format(string, "***truncated action %d***\n", (int) type);
return -1;
}
if ((len % OFP_ACTION_ALIGN) != 0) {
ds_put_format(string,
- "***action %"PRIu16" length not a multiple of %d***\n",
- type, OFP_ACTION_ALIGN);
+ "***action %d length not a multiple of %d***\n",
+ (int) type, OFP_ACTION_ALIGN);
return -1;
}
- 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;
- }
+ required_len = ofp_action_len(type);
+ if (required_len >= 0 && len != required_len) {
+ ds_put_format(string,
+ "***action %d wrong length: %zu***\n", (int) type, len);
+ return -1;
}
switch (type) {
}
default:
- ds_put_format(string, "(decoder %"PRIu16" not implemented)", type);
+ ds_put_format(string, "(decoder %d not implemented)", (int) type);
break;
}
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;
}
}
uint16_t flags;
flags = ntohs(osc->flags);
+
+ ds_put_cstr(string, " frags=");
+ switch (flags & OFPC_FRAG_MASK) {
+ case OFPC_FRAG_NORMAL:
+ ds_put_cstr(string, "normal");
+ flags &= ~OFPC_FRAG_MASK;
+ break;
+ case OFPC_FRAG_DROP:
+ ds_put_cstr(string, "drop");
+ flags &= ~OFPC_FRAG_MASK;
+ break;
+ case OFPC_FRAG_REASM:
+ ds_put_cstr(string, "reassemble");
+ flags &= ~OFPC_FRAG_MASK;
+ break;
+ }
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,
}
print_wild(&f, "nw_tos=", w & OFPFW_NW_TOS, verbosity,
"%u", om->nw_tos);
- if (om->nw_proto == IP_TYPE_ICMP) {
+ if (om->nw_proto == IPPROTO_ICMP) {
print_wild(&f, "icmp_type=", w & OFPFW_ICMP_TYPE, verbosity,
"%d", ntohs(om->icmp_type));
print_wild(&f, "icmp_code=", w & OFPFW_ICMP_CODE, verbosity,
enum ofputil_msg_code code, int verbosity)
{
struct flow_mod fm;
+ bool need_priority;
int error;
- error = ofputil_decode_flow_mod(&fm, oh, NXFF_OPENFLOW10);
+ error = ofputil_decode_flow_mod(&fm, oh, true);
if (error) {
ofp_print_error(s, error);
return;
default:
ds_put_format(s, "cmd:%d", fm.command);
}
+ if (fm.table_id != 0) {
+ ds_put_format(s, " table_id:%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 = nx_match_to_string(nxm, ntohs(nfm->match_len));
+ 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 (ds_last(s) != ' ') {
if (fm.hard_timeout != OFP_FLOW_PERMANENT) {
ds_put_format(s, "hard:%"PRIu16" ", fm.hard_timeout);
}
- if (fm.cr.priority != OFP_DEFAULT_PRIORITY && verbosity >= 3) {
+ if (fm.cr.priority != OFP_DEFAULT_PRIORITY && need_priority) {
ds_put_format(s, "pri:%"PRIu16" ", fm.cr.priority);
}
if (fm.buffer_id != UINT32_MAX) {
struct ofputil_flow_removed fr;
int error;
- error = ofputil_decode_flow_removed(&fr, oh, NXFF_OPENFLOW10);
+ error = ofputil_decode_flow_removed(&fr, oh);
if (error) {
ofp_print_error(string, error);
return;
}
+ ds_put_char(string, ' ');
cls_rule_format(&fr.rule, string);
ds_put_cstr(string, " reason=");
}
}
-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),
- /* Nicira error extensions. */
- ERROR_CODE(OFPET_BAD_REQUEST, NXBRC_NXM_INVALID),
- ERROR_CODE(OFPET_BAD_REQUEST, NXBRC_NXM_BAD_TYPE),
- ERROR_CODE(OFPET_BAD_REQUEST, NXBRC_NXM_BAD_VALUE),
- ERROR_CODE(OFPET_BAD_REQUEST, NXBRC_NXM_BAD_MASK),
- ERROR_CODE(OFPET_BAD_REQUEST, NXBRC_NXM_BAD_PREREQ),
- ERROR_CODE(OFPET_BAD_REQUEST, NXBRC_NXM_DUP_TYPE),
-
- 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),
- /* Nicira error extenstions. */
- ERROR_CODE(OFPET_FLOW_MOD_FAILED, NXFMFC_HARDWARE),
- ERROR_CODE(OFPET_FLOW_MOD_FAILED, NXFMFC_BAD_TABLE_ID),
-
- 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)
-{
- 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;
- }
- }
- return "?";
-}
-
static void
ofp_print_error(struct ds *string, int error)
{
- int type = get_ofp_err_type(error);
- int code = get_ofp_err_code(error);
if (string->length) {
ds_put_char(string, ' ');
}
- ds_put_format(string, " ***decode error type:%d(%s) code:%d(%s)***",
- type, lookup_error_type(type),
- code, lookup_error_code(type, code));
-}
-
-static void
-ofp_print_nx_error_msg(struct ds *string, const struct ofp_error_msg *oem)
-{
- size_t len = ntohs(oem->header.length);
- const struct nx_vendor_error *nve = (struct nx_vendor_error *)oem->data;
- int vendor = ntohl(nve->vendor);
- int type = ntohs(nve->type);
- int code = ntohs(nve->code);
-
- ds_put_format(string, " vendor:%x type:%d(%s) code:%d(%s) payload:\n",
- vendor,
- type, lookup_error_type(type),
- code, lookup_error_code(type, code));
-
- ds_put_hex_dump(string, nve + 1, len - sizeof *oem - sizeof *nve,
- 0, true);
+ ds_put_cstr(string, "***decode error: ");
+ ofputil_format_error(string, error);
+ ds_put_cstr(string, "***\n");
}
static void
ofp_print_error_msg(struct ds *string, const struct ofp_error_msg *oem)
{
size_t len = ntohs(oem->header.length);
- int type = ntohs(oem->type);
- int code = ntohs(oem->code);
+ size_t payload_ofs, payload_len;
+ const void *payload;
+ int error;
char *s;
-
- if (type == NXET_VENDOR && code == NXVC_VENDOR_ERROR) {
- if (len < sizeof *oem + sizeof(struct nx_vendor_error)) {
- ds_put_format(string,
- "(***truncated extended error message is %zu bytes "
- "when it should be at least %zu***)\n",
- len, sizeof(struct nx_vendor_error));
- return;
- }
-
- return ofp_print_nx_error_msg(string, oem);
+ error = ofputil_decode_error_msg(&oem->header, &payload_ofs);
+ if (!is_ofp_error(error)) {
+ ofp_print_error(string, error);
+ ds_put_hex_dump(string, oem->data, len - sizeof *oem, 0, true);
+ return;
}
- ds_put_format(string, " type:%d(%s) code:%d(%s) payload:\n",
- type, lookup_error_type(type),
- code, lookup_error_code(type, code));
+ ds_put_char(string, ' ');
+ ofputil_format_error(string, error);
+ ds_put_char(string, '\n');
- switch (type) {
+ payload = (const uint8_t *) oem + payload_ofs;
+ payload_len = len - payload_ofs;
+ switch (get_ofp_err_type(error)) {
case OFPET_HELLO_FAILED:
- ds_put_printable(string, (char *) oem->data, len - sizeof *oem);
+ ds_put_printable(string, payload, payload_len);
break;
case OFPET_BAD_REQUEST:
- s = ofp_to_string(oem->data, len - sizeof *oem, 1);
+ 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);
+ ds_put_hex_dump(string, payload, payload_len, 0, true);
break;
}
}
{
const struct ofp_desc_stats *ods = ofputil_stats_body(oh);
+ 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",
struct flow_stats_request fsr;
int error;
- error = ofputil_decode_flow_stats_request(&fsr, oh, NXFF_OPENFLOW10);
+ error = ofputil_decode_flow_stats_request(&fsr, oh);
if (error) {
ofp_print_error(string, error);
return;
ofp_print_port_name(string, fsr.out_port);
}
+ /* 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_print_ofpst_flow_reply(struct ds *string, const struct ofp_header *oh,
- int verbosity)
-{
- size_t len = ofputil_stats_body_len(oh);
- const char *body = ofputil_stats_body(oh);
- const char *pos = body;
- for (;;) {
- const struct ofp_flow_stats *fs;
- ptrdiff_t bytes_left = body + len - pos;
- size_t length;
-
- ds_put_char(string, '\n');
-
- 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, " cookie=0x%"PRIx64", duration=",
- ntohll(fs->cookie));
- ofp_print_duration(string, ntohl(fs->duration_sec),
- ntohl(fs->duration_nsec));
- ds_put_format(string, ", table_id=%"PRIu8", ", fs->table_id);
- ds_put_format(string, "priority=%"PRIu16", ", ntohs(fs->priority));
- 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));
- }
- if (fs->hard_timeout != htons(OFP_FLOW_PERMANENT)) {
- ds_put_format(string, "hard_timeout=%"PRIu16",",
- ntohs(fs->hard_timeout));
- }
- ofp_print_match(string, &fs->match, verbosity);
- ds_put_char(string, ' ');
- ofp_print_actions(string, fs->actions, length - sizeof *fs);
-
- pos += length;
- }
-}
-
-static void
-ofp_print_nxst_flow_reply(struct ds *string, const struct ofp_header *oh)
+ofp_print_flow_stats_reply(struct ds *string, const struct ofp_header *oh)
{
struct ofpbuf b;
- ofpbuf_use_const(&b, ofputil_nxstats_body(oh),
- ofputil_nxstats_body_len(oh));
- while (b.size > 0) {
- const struct nx_flow_stats *fs;
- union ofp_action *actions;
- struct cls_rule rule;
- size_t actions_len, n_actions;
- size_t length;
- int match_len;
- int error;
-
- fs = ofpbuf_try_pull(&b, sizeof *fs);
- if (!fs) {
- ds_put_format(string, " ***%td leftover bytes at end***", b.size);
- break;
- }
+ ofpbuf_use_const(&b, oh, ntohs(oh->length));
+ for (;;) {
+ struct ofputil_flow_stats fs;
+ int retval;
- length = ntohs(fs->length);
- if (length < sizeof *fs) {
- ds_put_format(string, " ***nx_flow_stats claims length %zu***",
- length);
+ retval = ofputil_decode_flow_stats_reply(&fs, &b);
+ if (retval) {
+ if (retval != EOF) {
+ ds_put_cstr(string, " ***parse error***");
+ }
break;
}
- match_len = ntohs(fs->match_len);
- if (match_len > length - sizeof *fs) {
- ds_put_format(string, " ***length=%zu match_len=%d***",
- length, match_len);
- break;
- }
+ ds_put_char(string, '\n');
ds_put_format(string, " cookie=0x%"PRIx64", duration=",
- ntohll(fs->cookie));
- ofp_print_duration(string, ntohl(fs->duration_sec),
- ntohl(fs->duration_nsec));
- ds_put_format(string, ", table_id=%"PRIu8", ", fs->table_id);
- ds_put_format(string, "priority=%"PRIu16", ", ntohs(fs->priority));
- 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));
+ ntohll(fs.cookie));
+ ofp_print_duration(string, fs.duration_sec, fs.duration_nsec);
+ ds_put_format(string, ", table_id=%"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);
}
- error = nx_pull_match(&b, match_len, ntohs(fs->priority), &rule);
- if (error) {
- ofp_print_error(string, error);
- break;
- }
-
- actions_len = length - sizeof *fs - ROUND_UP(match_len, 8);
- error = ofputil_pull_actions(&b, actions_len, &actions, &n_actions);
- if (error) {
- ofp_print_error(string, error);
- break;
- }
-
- cls_rule_format(&rule, string);
+ cls_rule_format(&fs.rule, string);
ds_put_char(string, ' ');
- ofp_print_actions(string, (const struct ofp_action_header *) actions,
- n_actions * sizeof *actions);
- ds_put_char(string, '\n');
+ ofp_print_actions(string,
+ (const struct ofp_action_header *) fs.actions,
+ fs.n_actions * sizeof *fs.actions);
}
}
ofp_print_ofp_aggregate_stats_reply (
struct ds *string, const struct ofp_aggregate_stats_reply *asr)
{
- 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, " 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 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, '?');
ofp_print_ofpst_port_request(struct ds *string, const struct ofp_header *oh)
{
const struct ofp_port_stats_request *psr = ofputil_stats_body(oh);
- ds_put_format(string, "port_no=%"PRIu16, ntohs(psr->port_no));
+ ds_put_format(string, " port_no=%"PRIu16, ntohs(psr->port_no));
}
static void
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);
}
}
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)));
}
}
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
-ofp_print_nxt_status_message(struct ds *string, const struct ofp_header *oh)
-{
- struct ofpbuf b;
-
- ofpbuf_use_const(&b, oh, ntohs(oh->length));
- ofpbuf_pull(&b, sizeof *oh);
- ds_put_char(string, '"');
- ds_put_printable(string, b.data, b.size);
- ds_put_char(string, '"');
-}
-
-static void
-ofp_print_nxt_tun_id_from_cookie(struct ds *string,
- const struct nxt_tun_id_cookie *ntic)
-{
- ds_put_format(string, " set=%"PRIu8, ntic->set);
-}
-
static void
ofp_print_nxt_role_message(struct ds *string,
const struct nx_role_request *nrr)
}
}
+static void
+ofp_print_nxt_flow_mod_table_id(struct ds *string,
+ const struct nxt_flow_mod_table_id *nfmti)
+{
+ ds_put_format(string, " %s", nfmti->set ? "enable" : "disable");
+}
+
static void
ofp_print_nxt_set_flow_format(struct ds *string,
const struct nxt_set_flow_format *nsff)
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:
break;
case OFPUTIL_OFPST_FLOW_REPLY:
+ case OFPUTIL_NXST_FLOW_REPLY:
ofp_print_stats_reply(string, oh);
- ofp_print_ofpst_flow_reply(string, oh, verbosity);
+ ofp_print_flow_stats_reply(string, oh);
break;
case OFPUTIL_OFPST_QUEUE_REPLY:
ofp_print_ofpst_aggregate_reply(string, oh);
break;
- case OFPUTIL_NXT_STATUS_REQUEST:
- case OFPUTIL_NXT_STATUS_REPLY:
- ofp_print_nxt_status_message(string, oh);
- break;
-
- case OFPUTIL_NXT_TUN_ID_FROM_COOKIE:
- ofp_print_nxt_tun_id_from_cookie(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;
ofp_print_flow_mod(string, msg, code, verbosity);
break;
- case OFPUTIL_NXST_FLOW_REPLY:
- ofp_print_nxst_flow_reply(string, oh);
- break;
-
case OFPUTIL_NXST_AGGREGATE_REPLY:
ofp_print_stats_reply(string, oh);
ofp_print_nxst_aggregate_reply(string, msg);
struct ds string = DS_EMPTY_INITIALIZER;
const struct ofp_header *oh = oh_;
- if (len < sizeof(struct ofp_header)) {
- ds_put_cstr(&string, "OpenFlow packet too short:\n");
+ 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 (oh->version != OFP_VERSION) {
ds_put_format(&string, "Bad OpenFlow version %"PRIu8":\n",
oh->version);
} else if (ntohs(oh->length) > len) {
ds_put_format(&string,
- "(***truncated to %zu bytes from %"PRIu16"***)",
+ "(***truncated to %zu bytes from %"PRIu16"***)\n",
len, ntohs(oh->length));
} else if (ntohs(oh->length) < len) {
ds_put_format(&string,
git://git.onelab.eu / sliver-openvswitch.git / blobdiff