#include "netdev.h"
#include "nx-match.h"
#include "ofp-actions.h"
+#include "ofpbuf.h"
#include "ofp-errors.h"
#include "ofp-msgs.h"
#include "ofp-util.h"
-#include "ofpbuf.h"
#include "openflow/openflow.h"
#include "openflow/nicira-ext.h"
#include "packets.h"
+#include "dp-packet.h"
#include "type-props.h"
#include "unaligned.h"
#include "odp-util.h"
static void ofp_print_queue_name(struct ds *string, uint32_t port);
static void ofp_print_error(struct ds *, enum ofperr);
-
+static void ofp_print_table_features(struct ds *,
+ const struct ofputil_table_features *,
+ const struct ofputil_table_stats *);
/* Returns a string that represents the contents of the Ethernet frame in the
* 'len' bytes starting at 'data'. The caller must free the returned string.*/
ofp_packet_to_string(const void *data, size_t len)
{
struct ds ds = DS_EMPTY_INITIALIZER;
- const struct pkt_metadata md = PKT_METADATA_INITIALIZER(0);
- struct ofpbuf buf;
+ struct dp_packet buf;
struct flow flow;
size_t l4_size;
- ofpbuf_use_const(&buf, data, len);
- flow_extract(&buf, &md, &flow);
+ dp_packet_use_const(&buf, data, len);
+ flow_extract(&buf, &flow);
flow_format(&ds, &flow);
- l4_size = ofpbuf_l4_size(&buf);
+ l4_size = dp_packet_l4_size(&buf);
if (flow.nw_proto == IPPROTO_TCP && l4_size >= TCP_HEADER_LEN) {
- struct tcp_header *th = ofpbuf_l4(&buf);
+ struct tcp_header *th = dp_packet_l4(&buf);
ds_put_format(&ds, " tcp_csum:%"PRIx16, ntohs(th->tcp_csum));
} else if (flow.nw_proto == IPPROTO_UDP && l4_size >= UDP_HEADER_LEN) {
- struct udp_header *uh = ofpbuf_l4(&buf);
+ struct udp_header *uh = dp_packet_l4(&buf);
ds_put_format(&ds, " udp_csum:%"PRIx16, ntohs(uh->udp_csum));
} else if (flow.nw_proto == IPPROTO_SCTP && l4_size >= SCTP_HEADER_LEN) {
- struct sctp_header *sh = ofpbuf_l4(&buf);
+ struct sctp_header *sh = dp_packet_l4(&buf);
ds_put_format(&ds, " sctp_csum:%"PRIx32,
ntohl(get_16aligned_be32(&sh->sctp_csum)));
+ } else if (flow.nw_proto == IPPROTO_ICMP && l4_size >= ICMP_HEADER_LEN) {
+ struct icmp_header *icmph = dp_packet_l4(&buf);
+ ds_put_format(&ds, " icmp_csum:%"PRIx16,
+ ntohs(icmph->icmp_csum));
+ } else if (flow.nw_proto == IPPROTO_ICMPV6 && l4_size >= ICMP6_HEADER_LEN) {
+ struct icmp6_header *icmp6h = dp_packet_l4(&buf);
+ ds_put_format(&ds, " icmp6_csum:%"PRIx16,
+ ntohs(icmp6h->icmp6_cksum));
}
ds_put_char(&ds, '\n');
ds_put_format(string, " tun_dst="IP_FMT, IP_ARGS(pin.fmd.tun_dst));
}
+ if (pin.fmd.gbp_id != htons(0)) {
+ ds_put_format(string, " gbp_id=%"PRIu16,
+ ntohs(pin.fmd.gbp_id));
+ }
+
+ if (pin.fmd.gbp_flags) {
+ ds_put_format(string, " gbp_flags=0x%02"PRIx8, pin.fmd.gbp_flags);
+ }
+
if (pin.fmd.metadata != htonll(0)) {
ds_put_format(string, " metadata=0x%"PRIx64, ntohll(pin.fmd.metadata));
}
return NULL;
}
-static const char *
-ofputil_action_bitmap_to_name(uint32_t bit)
-{
- enum ofputil_action_bitmap action = bit;
-
- switch (action) {
- case OFPUTIL_A_OUTPUT: return "OUTPUT";
- case OFPUTIL_A_SET_VLAN_VID: return "SET_VLAN_VID";
- case OFPUTIL_A_SET_VLAN_PCP: return "SET_VLAN_PCP";
- case OFPUTIL_A_STRIP_VLAN: return "STRIP_VLAN";
- case OFPUTIL_A_SET_DL_SRC: return "SET_DL_SRC";
- case OFPUTIL_A_SET_DL_DST: return "SET_DL_DST";
- case OFPUTIL_A_SET_NW_SRC: return "SET_NW_SRC";
- case OFPUTIL_A_SET_NW_DST: return "SET_NW_DST";
- case OFPUTIL_A_SET_NW_ECN: return "SET_NW_ECN";
- case OFPUTIL_A_SET_NW_TOS: return "SET_NW_TOS";
- case OFPUTIL_A_SET_TP_SRC: return "SET_TP_SRC";
- case OFPUTIL_A_SET_TP_DST: return "SET_TP_DST";
- case OFPUTIL_A_SET_FIELD: return "SET_FIELD";
- case OFPUTIL_A_ENQUEUE: return "ENQUEUE";
- case OFPUTIL_A_COPY_TTL_OUT: return "COPY_TTL_OUT";
- case OFPUTIL_A_COPY_TTL_IN: return "COPY_TTL_IN";
- case OFPUTIL_A_SET_MPLS_LABEL: return "SET_MPLS_LABEL";
- case OFPUTIL_A_SET_MPLS_TC: return "SET_MPLS_TC";
- case OFPUTIL_A_SET_MPLS_TTL: return "SET_MPLS_TTL";
- case OFPUTIL_A_DEC_MPLS_TTL: return "DEC_MPLS_TTL";
- case OFPUTIL_A_PUSH_VLAN: return "PUSH_VLAN";
- case OFPUTIL_A_POP_VLAN: return "POP_VLAN";
- case OFPUTIL_A_PUSH_MPLS: return "PUSH_MPLS";
- case OFPUTIL_A_POP_MPLS: return "POP_MPLS";
- case OFPUTIL_A_SET_QUEUE: return "SET_QUEUE";
- case OFPUTIL_A_GROUP: return "GROUP";
- case OFPUTIL_A_SET_NW_TTL: return "SET_NW_TTL";
- case OFPUTIL_A_DEC_NW_TTL: return "DEC_NW_TTL";
- }
-
- return NULL;
-}
-
static void
ofp_print_switch_features(struct ds *string, const struct ofp_header *oh)
{
switch ((enum ofp_version)oh->version) {
case OFP10_VERSION:
ds_put_cstr(string, "actions: ");
- ofp_print_bit_names(string, features.actions,
- ofputil_action_bitmap_to_name, ' ');
+ ofpact_bitmap_format(features.ofpacts, string);
ds_put_char(string, '\n');
break;
case OFP11_VERSION:
static void print_wild(struct ds *string, const char *leader, int is_wild,
int verbosity, const char *format, ...)
- PRINTF_FORMAT(5, 6);
+ OVS_PRINTF_FORMAT(5, 6);
static void print_wild(struct ds *string, const char *leader, int is_wild,
int verbosity, const char *format, ...)
print_wild(&f, "tp_dst=", w & OFPFW10_TP_DST, verbosity,
"%d", ntohs(om->tp_dst));
}
- if (ds_last(&f) == ',') {
- f.length--;
- }
+ ds_chomp(&f, ',');
return ds_cstr(&f);
}
if (fm.hard_timeout != OFP_FLOW_PERMANENT) {
ds_put_format(s, "hard:%"PRIu16" ", fm.hard_timeout);
}
+ if (fm.importance != 0) {
+ ds_put_format(s, "importance:%"PRIu16" ", fm.importance);
+ }
if (fm.priority != OFP_DEFAULT_PRIORITY && need_priority) {
ds_put_format(s, "pri:%"PRIu16" ", fm.priority);
}
}
static void
-ofp_print_table_miss_config(struct ds *string, const uint32_t config)
+ofp_print_table_miss_config(struct ds *string, enum ofputil_table_miss miss)
{
- uint32_t table_miss_config = config & OFPTC11_TABLE_MISS_MASK;
-
- switch (table_miss_config) {
- case OFPTC11_TABLE_MISS_CONTROLLER:
+ switch (miss) {
+ case OFPUTIL_TABLE_MISS_CONTROLLER:
ds_put_cstr(string, "controller\n");
break;
- case OFPTC11_TABLE_MISS_CONTINUE:
+ case OFPUTIL_TABLE_MISS_CONTINUE:
ds_put_cstr(string, "continue\n");
break;
- case OFPTC11_TABLE_MISS_DROP:
+ case OFPUTIL_TABLE_MISS_DROP:
ds_put_cstr(string, "drop\n");
break;
+ case OFPUTIL_TABLE_MISS_DEFAULT:
default:
- ds_put_cstr(string, "Unknown\n");
+ ds_put_format(string, "Unknown (%d)\n", miss);
break;
}
}
ds_put_format(string, " table_id=%"PRIu8, pm.table_id);
}
- ds_put_cstr(string, ", flow_miss_config=");
- ofp_print_table_miss_config(string, pm.config);
+ if (pm.miss_config != OFPUTIL_TABLE_MISS_DEFAULT) {
+ ds_put_cstr(string, ", flow_miss_config=");
+ ofp_print_table_miss_config(string, pm.miss_config);
+ }
}
static void
ds_put_format(string, " %s\n", ofperr_get_name(error));
if (error == OFPERR_OFPHFC_INCOMPATIBLE || error == OFPERR_OFPHFC_EPERM) {
- ds_put_printable(string, ofpbuf_data(&payload), ofpbuf_size(&payload));
+ ds_put_printable(string, payload.data, payload.size);
} else {
- s = ofp_to_string(ofpbuf_data(&payload), ofpbuf_size(&payload), 1);
+ s = ofp_to_string(payload.data, payload.size, 1);
ds_put_cstr(string, s);
free(s);
}
if (fs->flags) {
ofp_print_flow_flags(string, fs->flags);
}
+ if (fs->importance != 0) {
+ ds_put_format(string, "importance=%"PRIu16", ", fs->importance);
+ }
if (fs->idle_age >= 0) {
ds_put_format(string, "idle_age=%d, ", fs->idle_age);
}
}
static void
-ofp_print_one_ofpst_table_reply(struct ds *string, enum ofp_version ofp_version,
- const char *name, struct ofp12_table_stats *ts)
-{
- char name_[OFP_MAX_TABLE_NAME_LEN + 1];
-
- /* ofp13_table_stats is different */
- if (ofp_version > OFP12_VERSION) {
- return;
- }
-
- ovs_strlcpy(name_, name, sizeof name_);
-
- ds_put_format(string, " %d: %-8s: ", ts->table_id, name_);
- ds_put_format(string, "wild=0x%05"PRIx64", ", ntohll(ts->wildcards));
- ds_put_format(string, "max=%6"PRIu32", ", ntohl(ts->max_entries));
- 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));
- ds_put_format(string, "matched=%"PRIu64"\n", ntohll(ts->matched_count));
-
- if (ofp_version < OFP11_VERSION) {
- return;
- }
-
- ds_put_cstr(string, " ");
- ds_put_format(string, "match=0x%08"PRIx64", ", ntohll(ts->match));
- ds_put_format(string, "instructions=0x%08"PRIx32", ",
- ntohl(ts->instructions));
- ds_put_format(string, "config=0x%08"PRIx32"\n", ntohl(ts->config));
- ds_put_cstr(string, " ");
- ds_put_format(string, "write_actions=0x%08"PRIx32", ",
- ntohl(ts->write_actions));
- ds_put_format(string, "apply_actions=0x%08"PRIx32"\n",
- ntohl(ts->apply_actions));
-
- if (ofp_version < OFP12_VERSION) {
- return;
- }
-
- ds_put_cstr(string, " ");
- ds_put_format(string, "write_setfields=0x%016"PRIx64"\n",
- ntohll(ts->write_setfields));
- ds_put_cstr(string, " ");
- ds_put_format(string, "apply_setfields=0x%016"PRIx64"\n",
- ntohll(ts->apply_setfields));
- ds_put_cstr(string, " ");
- ds_put_format(string, "metadata_match=0x%016"PRIx64"\n",
- ntohll(ts->metadata_match));
- ds_put_cstr(string, " ");
- ds_put_format(string, "metadata_write=0x%016"PRIx64"\n",
- ntohll(ts->metadata_write));
-}
-
-static void
-ofp_print_ofpst_table_reply13(struct ds *string, const struct ofp_header *oh,
- int verbosity)
-{
- struct ofp13_table_stats *ts;
- struct ofpbuf b;
- size_t n;
-
- ofpbuf_use_const(&b, oh, ntohs(oh->length));
- ofpraw_pull_assert(&b);
-
- n = ofpbuf_size(&b) / sizeof *ts;
- ds_put_format(string, " %"PRIuSIZE" tables\n", n);
- if (verbosity < 1) {
- return;
- }
-
- for (;;) {
- ts = ofpbuf_try_pull(&b, sizeof *ts);
- if (!ts) {
- return;
- }
- ds_put_format(string,
- " %d: active=%"PRIu32", lookup=%"PRIu64 \
- ", matched=%"PRIu64"\n",
- ts->table_id, ntohl(ts->active_count),
- ntohll(ts->lookup_count), ntohll(ts->matched_count));
- }
-}
-
-static void
-ofp_print_ofpst_table_reply12(struct ds *string, const struct ofp_header *oh,
- int verbosity)
-{
- struct ofp12_table_stats *ts;
- struct ofpbuf b;
- size_t n;
-
- ofpbuf_use_const(&b, oh, ntohs(oh->length));
- ofpraw_pull_assert(&b);
-
- n = ofpbuf_size(&b) / sizeof *ts;
- ds_put_format(string, " %"PRIuSIZE" tables\n", n);
- if (verbosity < 1) {
- return;
- }
-
- for (;;) {
- ts = ofpbuf_try_pull(&b, sizeof *ts);
- if (!ts) {
- return;
- }
-
- ofp_print_one_ofpst_table_reply(string, OFP12_VERSION, ts->name, ts);
- }
-}
-
-static void
-ofp_print_ofpst_table_reply11(struct ds *string, const struct ofp_header *oh,
- int verbosity)
-{
- struct ofp11_table_stats *ts;
- struct ofpbuf b;
- size_t n;
-
- ofpbuf_use_const(&b, oh, ntohs(oh->length));
- ofpraw_pull_assert(&b);
-
- n = ofpbuf_size(&b) / sizeof *ts;
- ds_put_format(string, " %"PRIuSIZE" tables\n", n);
- if (verbosity < 1) {
- return;
- }
-
- for (;;) {
- struct ofp12_table_stats ts12;
-
- ts = ofpbuf_try_pull(&b, sizeof *ts);
- if (!ts) {
- return;
- }
-
- ts12.table_id = ts->table_id;
- ts12.wildcards = htonll(ntohl(ts->wildcards));
- ts12.max_entries = ts->max_entries;
- ts12.active_count = ts->active_count;
- ts12.lookup_count = ts->lookup_count;
- ts12.matched_count = ts->matched_count;
- ts12.match = htonll(ntohl(ts->match));
- ts12.instructions = ts->instructions;
- ts12.config = ts->config;
- ts12.write_actions = ts->write_actions;
- ts12.apply_actions = ts->apply_actions;
- ofp_print_one_ofpst_table_reply(string, OFP11_VERSION, ts->name, &ts12);
- }
-}
-
-static void
-ofp_print_ofpst_table_reply10(struct ds *string, const struct ofp_header *oh,
- int verbosity)
+ofp_print_table_stats_reply(struct ds *string, const struct ofp_header *oh)
{
- struct ofp10_table_stats *ts;
struct ofpbuf b;
- size_t n;
ofpbuf_use_const(&b, oh, ntohs(oh->length));
ofpraw_pull_assert(&b);
- n = ofpbuf_size(&b) / sizeof *ts;
- ds_put_format(string, " %"PRIuSIZE" tables\n", n);
- if (verbosity < 1) {
- return;
- }
-
for (;;) {
- struct ofp12_table_stats ts12;
+ struct ofputil_table_features features;
+ struct ofputil_table_stats stats;
+ int retval;
- ts = ofpbuf_try_pull(&b, sizeof *ts);
- if (!ts) {
+ retval = ofputil_decode_table_stats_reply(&b, &stats, &features);
+ if (retval) {
+ if (retval != EOF) {
+ ofp_print_error(string, retval);
+ }
return;
}
- ts12.table_id = ts->table_id;
- ts12.wildcards = htonll(ntohl(ts->wildcards));
- ts12.max_entries = ts->max_entries;
- ts12.active_count = ts->active_count;
- ts12.lookup_count = get_32aligned_be64(&ts->lookup_count);
- ts12.matched_count = get_32aligned_be64(&ts->matched_count);
- ofp_print_one_ofpst_table_reply(string, OFP10_VERSION, ts->name, &ts12);
- }
-}
-
-static void
-ofp_print_ofpst_table_reply(struct ds *string, const struct ofp_header *oh,
- int verbosity)
-{
- switch ((enum ofp_version)oh->version) {
- case OFP15_VERSION:
- case OFP14_VERSION:
- case OFP13_VERSION:
- ofp_print_ofpst_table_reply13(string, oh, verbosity);
- break;
-
- case OFP12_VERSION:
- ofp_print_ofpst_table_reply12(string, oh, verbosity);
- break;
-
- case OFP11_VERSION:
- ofp_print_ofpst_table_reply11(string, oh, verbosity);
- break;
-
- case OFP10_VERSION:
- ofp_print_ofpst_table_reply10(string, oh, verbosity);
- break;
-
- default:
- OVS_NOT_REACHED();
+ ofp_print_table_features(string, &features, &stats);
}
}
ofp_print_version(oh, string);
}
+static void
+ofp_print_bucket_id(struct ds *s, const char *label, uint32_t bucket_id,
+ enum ofp_version ofp_version)
+{
+ if (ofp_version < OFP15_VERSION) {
+ return;
+ }
+
+ ds_put_cstr(s, label);
+
+ switch (bucket_id) {
+ case OFPG15_BUCKET_FIRST:
+ ds_put_cstr(s, "first");
+ break;
+ case OFPG15_BUCKET_LAST:
+ ds_put_cstr(s, "last");
+ break;
+ case OFPG15_BUCKET_ALL:
+ ds_put_cstr(s, "all");
+ break;
+ default:
+ ds_put_format(s, "%"PRIu32, bucket_id);
+ break;
+ }
+
+ ds_put_char(s, ',');
+}
+
static void
ofp_print_group(struct ds *s, uint32_t group_id, uint8_t type,
- struct list *p_buckets)
+ struct ovs_list *p_buckets, enum ofp_version ofp_version,
+ bool suppress_type)
{
- static const char *type_str[] = { "all", "select", "indirect",
- "ff", "unknown" };
struct ofputil_bucket *bucket;
- ds_put_format(s, "group_id=%"PRIu32",type=%s",
- group_id, type_str[type > 4 ? 4 : type]);
+ ds_put_format(s, "group_id=%"PRIu32, group_id);
+
+ if (!suppress_type) {
+ static const char *type_str[] = { "all", "select", "indirect",
+ "ff", "unknown" };
+ ds_put_format(s, ",type=%s", type_str[type > 4 ? 4 : type]);
+ }
+
if (!p_buckets) {
return;
}
+ ds_put_char(s, ',');
+
LIST_FOR_EACH (bucket, list_node, p_buckets) {
- ds_put_cstr(s, ",bucket=");
+ ds_put_cstr(s, "bucket=");
+ ofp_print_bucket_id(s, "bucket_id:", bucket->bucket_id, ofp_version);
if (bucket->weight != 1) {
ds_put_format(s, "weight:%"PRIu16",", bucket->weight);
}
ds_put_cstr(s, "actions=");
ofpacts_format(bucket->ofpacts, bucket->ofpacts_len, s);
+ ds_put_char(s, ',');
}
+
+ ds_chomp(s, ',');
}
static void
ds_put_char(s, '\n');
ds_put_char(s, ' ');
- ofp_print_group(s, gd.group_id, gd.type, &gd.buckets);
+ ofp_print_group(s, gd.group_id, gd.type, &gd.buckets, oh->version,
+ false);
+ ofputil_bucket_list_destroy(&gd.buckets);
}
}
}
}
+static const char *
+group_type_to_string(enum ofp11_group_type type)
+{
+ switch (type) {
+ case OFPGT11_ALL: return "all";
+ case OFPGT11_SELECT: return "select";
+ case OFPGT11_INDIRECT: return "indirect";
+ case OFPGT11_FF: return "fast failover";
+ default: OVS_NOT_REACHED();
+ }
+}
+
static void
ofp_print_group_features(struct ds *string, const struct ofp_header *oh)
{
struct ofputil_group_features features;
+ int i;
ofputil_decode_group_features_reply(oh, &features);
ds_put_format(string, " Capabilities: 0x%"PRIx32"\n",
features.capabilities);
- if (features.types & (1u << OFPGT11_ALL)) {
- ds_put_format(string, " All group :\n");
- ds_put_format(string,
- " max_groups = %#"PRIx32" actions=0x%08"PRIx32"\n",
- features.max_groups[0], features.actions[0]);
- }
-
- if (features.types & (1u << OFPGT11_SELECT)) {
- ds_put_format(string, " Select group :\n");
- ds_put_format(string, " max_groups = %#"PRIx32" "
- "actions=0x%08"PRIx32"\n",
- features.max_groups[1], features.actions[1]);
- }
-
- if (features.types & (1u << OFPGT11_INDIRECT)) {
- ds_put_format(string, " Indirect group :\n");
- ds_put_format(string, " max_groups = %#"PRIx32" "
- "actions=0x%08"PRIx32"\n",
- features.max_groups[2], features.actions[2]);
- }
-
- if (features.types & (1u << OFPGT11_FF)) {
- ds_put_format(string, " Fast Failover group :\n");
- ds_put_format(string, " max_groups = %#"PRIx32" "
- "actions=0x%08"PRIx32"\n",
- features.max_groups[3], features.actions[3]);
+ for (i = 0; i < OFPGT12_N_TYPES; i++) {
+ if (features.types & (1u << i)) {
+ ds_put_format(string, " %s group:\n", group_type_to_string(i));
+ ds_put_format(string, " max_groups=%#"PRIx32"\n",
+ features.max_groups[i]);
+ ds_put_format(string, " actions: ");
+ ofpact_bitmap_format(features.ofpacts[i], string);
+ ds_put_char(string, '\n');
+ }
}
}
{
struct ofputil_group_mod gm;
int error;
+ bool bucket_command = false;
error = ofputil_decode_group_mod(oh, &gm);
if (error) {
ds_put_cstr(s, "DEL");
break;
+ case OFPGC15_INSERT_BUCKET:
+ ds_put_cstr(s, "INSERT_BUCKET");
+ bucket_command = true;
+ break;
+
+ case OFPGC15_REMOVE_BUCKET:
+ ds_put_cstr(s, "REMOVE_BUCKET");
+ bucket_command = true;
+ break;
+
default:
ds_put_format(s, "cmd:%"PRIu16"", gm.command);
}
ds_put_char(s, ' ');
- ofp_print_group(s, gm.group_id, gm.type, &gm.buckets);
-}
-
-static const char *
-ofp13_action_to_string(uint32_t bit)
-{
- switch (bit) {
-#define OFPAT13_ACTION(ENUM, STRUCT, EXTENSIBLE, NAME) \
- case 1u << ENUM: return NAME;
-#include "ofp-util.def"
+ if (bucket_command) {
+ ofp_print_bucket_id(s, "command_bucket_id:",
+ gm.command_bucket_id, oh->version);
}
- return NULL;
+
+ ofp_print_group(s, gm.group_id, gm.type, &gm.buckets, oh->version,
+ bucket_command);
+ ofputil_bucket_list_destroy(&gm.buckets);
}
static void
print_table_action_features(struct ds *s,
const struct ofputil_table_action_features *taf)
{
- ds_put_cstr(s, " actions: ");
- ofp_print_bit_names(s, taf->actions, ofp13_action_to_string, ',');
- ds_put_char(s, '\n');
+ if (taf->ofpacts) {
+ ds_put_cstr(s, " actions: ");
+ ofpact_bitmap_format(taf->ofpacts, s);
+ ds_put_char(s, '\n');
+ }
- ds_put_cstr(s, " supported on Set-Field: ");
if (!bitmap_is_all_zeros(taf->set_fields.bm, MFF_N_IDS)) {
int i;
+ ds_put_cstr(s, " supported on Set-Field:");
BITMAP_FOR_EACH_1 (i, MFF_N_IDS, taf->set_fields.bm) {
- ds_put_format(s, "%s,", mf_from_id(i)->name);
+ ds_put_format(s, " %s", mf_from_id(i)->name);
}
- ds_chomp(s, ',');
- } else {
- ds_put_cstr(s, "none");
+ ds_put_char(s, '\n');
}
- ds_put_char(s, '\n');
}
static bool
table_action_features_equal(const struct ofputil_table_action_features *a,
const struct ofputil_table_action_features *b)
{
- return (a->actions == b->actions
+ return (a->ofpacts == b->ofpacts
&& bitmap_equal(a->set_fields.bm, b->set_fields.bm, MFF_N_IDS));
}
+static bool
+table_action_features_empty(const struct ofputil_table_action_features *taf)
+{
+ return !taf->ofpacts && bitmap_is_all_zeros(taf->set_fields.bm, MFF_N_IDS);
+}
+
static void
print_table_instruction_features(
struct ds *s, const struct ofputil_table_instruction_features *tif)
{
int start, end;
- ds_put_cstr(s, " next tables: ");
- for (start = bitmap_scan(tif->next, 1, 0, 255); start < 255;
- start = bitmap_scan(tif->next, 1, end, 255)) {
- end = bitmap_scan(tif->next, 0, start + 1, 255);
- if (end == start + 1) {
- ds_put_format(s, "%d,", start);
- } else {
- ds_put_format(s, "%d-%d,", start, end - 1);
+ if (!bitmap_is_all_zeros(tif->next, 255)) {
+ ds_put_cstr(s, " next tables: ");
+ for (start = bitmap_scan(tif->next, 1, 0, 255); start < 255;
+ start = bitmap_scan(tif->next, 1, end, 255)) {
+ end = bitmap_scan(tif->next, 0, start + 1, 255);
+ if (end == start + 1) {
+ ds_put_format(s, "%d,", start);
+ } else {
+ ds_put_format(s, "%d-%d,", start, end - 1);
+ }
}
+ ds_chomp(s, ',');
+ if (ds_last(s) == ' ') {
+ ds_put_cstr(s, "none");
+ }
+ ds_put_char(s, '\n');
}
- ds_chomp(s, ',');
- if (ds_last(s) == ' ') {
- ds_put_cstr(s, "none");
- }
- ds_put_char(s, '\n');
- ds_put_cstr(s, " instructions: ");
if (tif->instructions) {
+ ds_put_cstr(s, " instructions: ");
int i;
for (i = 0; i < 32; i++) {
}
}
ds_chomp(s, ',');
- } else {
- ds_put_cstr(s, "none");
+ ds_put_char(s, '\n');
}
- ds_put_char(s, '\n');
- if (table_action_features_equal(&tif->write, &tif->apply)) {
- ds_put_cstr(s, " Write-Actions and Apply-Actions features:\n");
- print_table_action_features(s, &tif->write);
- } else {
+ if (!table_action_features_equal(&tif->write, &tif->apply)) {
ds_put_cstr(s, " Write-Actions features:\n");
print_table_action_features(s, &tif->write);
ds_put_cstr(s, " Apply-Actions features:\n");
print_table_action_features(s, &tif->apply);
+ } else if (tif->write.ofpacts
+ || !bitmap_is_all_zeros(tif->write.set_fields.bm, MFF_N_IDS)) {
+ ds_put_cstr(s, " Write-Actions and Apply-Actions features:\n");
+ print_table_action_features(s, &tif->write);
}
}
&& table_action_features_equal(&a->apply, &b->apply));
}
-static void
-ofp_print_table_features(struct ds *s, const struct ofp_header *oh)
+static bool
+table_instruction_features_empty(
+ const struct ofputil_table_instruction_features *tif)
{
- struct ofpbuf b;
-
- ofpbuf_use_const(&b, oh, ntohs(oh->length));
-
- for (;;) {
- struct ofputil_table_features tf;
- int retval;
- int i;
+ return (bitmap_is_all_zeros(tif->next, 255)
+ && !tif->instructions
+ && table_action_features_empty(&tif->write)
+ && table_action_features_empty(&tif->apply));
+}
- retval = ofputil_decode_table_features(&b, &tf, true);
- if (retval) {
- if (retval != EOF) {
- ofp_print_error(s, retval);
- }
- return;
- }
+static void
+ofp_print_table_features(struct ds *s,
+ const struct ofputil_table_features *features,
+ const struct ofputil_table_stats *stats)
+{
+ int i;
- ds_put_format(s, "\n table %"PRIu8":\n", tf.table_id);
- ds_put_format(s, " name=\"%s\"\n", tf.name);
+ ds_put_format(s, "\n table %"PRIu8, features->table_id);
+ if (features->name[0]) {
+ ds_put_format(s, " (\"%s\")", features->name);
+ }
+ ds_put_cstr(s, ":\n");
+ if (stats) {
+ ds_put_format(s, " active=%"PRIu32", ", stats->active_count);
+ ds_put_format(s, "lookup=%"PRIu64", ", stats->lookup_count);
+ ds_put_format(s, "matched=%"PRIu64"\n", stats->matched_count);
+ }
+ if (features->metadata_match || features->metadata_match) {
ds_put_format(s, " metadata: match=%#"PRIx64" write=%#"PRIx64"\n",
- ntohll(tf.metadata_match), ntohll(tf.metadata_write));
+ ntohll(features->metadata_match),
+ ntohll(features->metadata_write));
+ }
+ if (features->miss_config != OFPUTIL_TABLE_MISS_DEFAULT) {
ds_put_cstr(s, " config=");
- ofp_print_table_miss_config(s, tf.config);
+ ofp_print_table_miss_config(s, features->miss_config);
+ }
- ds_put_format(s, " max_entries=%"PRIu32"\n", tf.max_entries);
+ if (features->max_entries) {
+ ds_put_format(s, " max_entries=%"PRIu32"\n", features->max_entries);
+ }
- if (table_instruction_features_equal(&tf.nonmiss, &tf.miss)) {
- ds_put_cstr(s, " instructions (table miss and others):\n");
- print_table_instruction_features(s, &tf.nonmiss);
- } else {
- ds_put_cstr(s, " instructions (other than table miss):\n");
- print_table_instruction_features(s, &tf.nonmiss);
- ds_put_cstr(s, " instructions (table miss):\n");
- print_table_instruction_features(s, &tf.miss);
- }
+ if (!table_instruction_features_equal(&features->nonmiss,
+ &features->miss)) {
+ ds_put_cstr(s, " instructions (other than table miss):\n");
+ print_table_instruction_features(s, &features->nonmiss);
+ ds_put_cstr(s, " instructions (table miss):\n");
+ print_table_instruction_features(s, &features->miss);
+ } else if (!table_instruction_features_empty(&features->nonmiss)) {
+ ds_put_cstr(s, " instructions (table miss and others):\n");
+ print_table_instruction_features(s, &features->nonmiss);
+ }
+ if (!bitmap_is_all_zeros(features->match.bm, MFF_N_IDS)){
ds_put_cstr(s, " matching:\n");
- BITMAP_FOR_EACH_1 (i, MFF_N_IDS, tf.match.bm) {
+ BITMAP_FOR_EACH_1 (i, MFF_N_IDS, features->match.bm) {
const struct mf_field *f = mf_from_id(i);
- bool mask = bitmap_is_set(tf.mask.bm, i);
- bool wildcard = bitmap_is_set(tf.wildcard.bm, i);
+ bool mask = bitmap_is_set(features->mask.bm, i);
+ bool wildcard = bitmap_is_set(features->wildcard.bm, i);
ds_put_format(s, " %s: %s\n",
f->name,
}
}
+static void
+ofp_print_table_features_reply(struct ds *s, const struct ofp_header *oh)
+{
+ struct ofpbuf b;
+
+ ofpbuf_use_const(&b, oh, ntohs(oh->length));
+
+ for (;;) {
+ struct ofputil_table_features tf;
+ int retval;
+
+ retval = ofputil_decode_table_features(&b, &tf, true);
+ if (retval) {
+ if (retval != EOF) {
+ ofp_print_error(s, retval);
+ }
+ return;
+ }
+ ofp_print_table_features(s, &tf, NULL);
+ }
+}
+
static const char *
bundle_flags_to_name(uint32_t bit)
{
case OFPTYPE_TABLE_FEATURES_STATS_REQUEST:
case OFPTYPE_TABLE_FEATURES_STATS_REPLY:
- ofp_print_table_features(string, oh);
+ ofp_print_table_features_reply(string, oh);
break;
case OFPTYPE_HELLO:
case OFPTYPE_TABLE_STATS_REPLY:
ofp_print_stats(string, oh);
- ofp_print_ofpst_table_reply(string, oh, verbosity);
+ ofp_print_table_stats_reply(string, oh);
break;
case OFPTYPE_AGGREGATE_STATS_REPLY:
projects / cascardo / ovs.git / blobdiff