/*
- * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014 Nicira, Inc.
+ * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016 Nicira, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
#include "ofp-actions.h"
#include "ofp-errors.h"
#include "ofp-msgs.h"
+#include "ofp-prop.h"
#include "ofp-util.h"
#include "ofpbuf.h"
+#include "openflow/netronome-ext.h"
#include "packets.h"
#include "random.h"
+#include "tun-metadata.h"
#include "unaligned.h"
#include "type-props.h"
-#include "vlog.h"
+#include "openvswitch/vlog.h"
#include "bitmap.h"
VLOG_DEFINE_THIS_MODULE(ofp_util);
* in the peer and so there's not much point in showing a lot of them. */
static struct vlog_rate_limit bad_ofmsg_rl = VLOG_RATE_LIMIT_INIT(1, 5);
-static enum ofputil_table_miss ofputil_table_miss_from_config(
- ovs_be32 config_, enum ofp_version);
+static enum ofputil_table_vacancy ofputil_decode_table_vacancy(
+ ovs_be32 config, enum ofp_version);
+static enum ofputil_table_eviction ofputil_decode_table_eviction(
+ ovs_be32 config, enum ofp_version);
+static ovs_be32 ofputil_encode_table_config(enum ofputil_table_miss,
+ enum ofputil_table_eviction,
+ enum ofputil_table_vacancy,
+ enum ofp_version);
-struct ofp_prop_header {
- ovs_be16 type;
- ovs_be16 len;
-};
-
-/* Pulls a property, beginning with struct ofp_prop_header, from the beginning
- * of 'msg'. Stores the type of the property in '*typep' and, if 'property' is
- * nonnull, the entire property, including the header, in '*property'. Returns
- * 0 if successful, otherwise an error code.
- *
- * This function pulls the property's stated size padded out to a multiple of
- * 'alignment' bytes. The common case in OpenFlow is an 'alignment' of 8, so
- * you can use ofputil_pull_property() for that case. */
-static enum ofperr
-ofputil_pull_property__(struct ofpbuf *msg, struct ofpbuf *property,
- unsigned int alignment, uint16_t *typep)
-{
- struct ofp_prop_header *oph;
- unsigned int padded_len;
- unsigned int len;
-
- if (ofpbuf_size(msg) < sizeof *oph) {
- return OFPERR_OFPBPC_BAD_LEN;
- }
-
- oph = ofpbuf_data(msg);
- len = ntohs(oph->len);
- padded_len = ROUND_UP(len, alignment);
- if (len < sizeof *oph || padded_len > ofpbuf_size(msg)) {
- return OFPERR_OFPBPC_BAD_LEN;
- }
-
- *typep = ntohs(oph->type);
- if (property) {
- ofpbuf_use_const(property, ofpbuf_data(msg), len);
- }
- ofpbuf_pull(msg, padded_len);
- return 0;
-}
-
-/* Pulls a property, beginning with struct ofp_prop_header, from the beginning
- * of 'msg'. Stores the type of the property in '*typep' and, if 'property' is
- * nonnull, the entire property, including the header, in '*property'. Returns
- * 0 if successful, otherwise an error code.
- *
- * This function pulls the property's stated size padded out to a multiple of
- * 8 bytes, which is the common case for OpenFlow properties. */
static enum ofperr
-ofputil_pull_property(struct ofpbuf *msg, struct ofpbuf *property,
- uint16_t *typep)
-{
- return ofputil_pull_property__(msg, property, 8, typep);
-}
-
-static void OVS_PRINTF_FORMAT(2, 3)
-log_property(bool loose, const char *message, ...)
+ofputil_check_mask(uint16_t type, uint32_t mask)
{
- enum vlog_level level = loose ? VLL_DBG : VLL_WARN;
- if (!vlog_should_drop(THIS_MODULE, level, &bad_ofmsg_rl)) {
- va_list args;
-
- va_start(args, message);
- vlog_valist(THIS_MODULE, level, message, args);
- va_end(args);
- }
-}
+ switch (type) {
+ case OFPACPT_PACKET_IN_SLAVE:
+ case OFPACPT_PACKET_IN_MASTER:
+ if (mask > MAXIMUM_MASK_PACKET_IN) {
+ return OFPERR_OFPACFC_INVALID;
+ }
+ break;
-static size_t
-start_property(struct ofpbuf *msg, uint16_t type)
-{
- size_t start_ofs = ofpbuf_size(msg);
- struct ofp_prop_header *oph;
+ case OFPACPT_FLOW_REMOVED_SLAVE:
+ case OFPACPT_FLOW_REMOVED_MASTER:
+ if (mask > MAXIMUM_MASK_FLOW_REMOVED) {
+ return OFPERR_OFPACFC_INVALID;
+ }
+ break;
- oph = ofpbuf_put_uninit(msg, sizeof *oph);
- oph->type = htons(type);
- oph->len = htons(4); /* May be updated later by end_property(). */
- return start_ofs;
-}
+ case OFPACPT_PORT_STATUS_SLAVE:
+ case OFPACPT_PORT_STATUS_MASTER:
+ if (mask > MAXIMUM_MASK_PORT_STATUS) {
+ return OFPERR_OFPACFC_INVALID;
+ }
+ break;
-static void
-end_property(struct ofpbuf *msg, size_t start_ofs)
-{
- struct ofp_prop_header *oph;
+ case OFPACPT_ROLE_STATUS_SLAVE:
+ case OFPACPT_ROLE_STATUS_MASTER:
+ if (mask > MAXIMUM_MASK_ROLE_STATUS) {
+ return OFPERR_OFPACFC_INVALID;
+ }
+ break;
- oph = ofpbuf_at_assert(msg, start_ofs, sizeof *oph);
- oph->len = htons(ofpbuf_size(msg) - start_ofs);
- ofpbuf_padto(msg, ROUND_UP(ofpbuf_size(msg), 8));
-}
+ case OFPACPT_TABLE_STATUS_SLAVE:
+ case OFPACPT_TABLE_STATUS_MASTER:
+ if ((mask < MINIMUM_MASK_TABLE_STATUS && mask != 0) |
+ (mask > MAXIMUM_MASK_TABLE_STATUS)) {
+ return OFPERR_OFPACFC_INVALID;
+ }
+ break;
-static void
-put_bitmap_properties(struct ofpbuf *msg, uint64_t bitmap)
-{
- for (; bitmap; bitmap = zero_rightmost_1bit(bitmap)) {
- start_property(msg, rightmost_1bit_idx(bitmap));
+ case OFPACPT_REQUESTFORWARD_SLAVE:
+ case OFPACPT_REQUESTFORWARD_MASTER:
+ if (mask > MAXIMUM_MASK_REQUESTFORWARD) {
+ return OFPERR_OFPACFC_INVALID;
+ }
+ break;
}
+ return 0;
}
/* Given the wildcard bit count in the least-significant 6 of 'wcbits', returns
void
ofputil_wildcard_from_ofpfw10(uint32_t ofpfw, struct flow_wildcards *wc)
{
- BUILD_ASSERT_DECL(FLOW_WC_SEQ == 28);
+ BUILD_ASSERT_DECL(FLOW_WC_SEQ == 35);
/* Initialize most of wc. */
flow_wildcards_init_catchall(wc);
}
if (!(ofpfw & OFPFW10_DL_SRC)) {
- memset(wc->masks.dl_src, 0xff, ETH_ADDR_LEN);
+ WC_MASK_FIELD(wc, dl_src);
}
if (!(ofpfw & OFPFW10_DL_DST)) {
- memset(wc->masks.dl_dst, 0xff, ETH_ADDR_LEN);
+ WC_MASK_FIELD(wc, dl_dst);
}
if (!(ofpfw & OFPFW10_DL_TYPE)) {
wc->masks.dl_type = OVS_BE16_MAX;
match->flow.dl_type = ofputil_dl_type_from_openflow(ofmatch->dl_type);
match->flow.tp_src = ofmatch->tp_src;
match->flow.tp_dst = ofmatch->tp_dst;
- memcpy(match->flow.dl_src, ofmatch->dl_src, ETH_ADDR_LEN);
- memcpy(match->flow.dl_dst, ofmatch->dl_dst, ETH_ADDR_LEN);
+ match->flow.dl_src = ofmatch->dl_src;
+ match->flow.dl_dst = ofmatch->dl_dst;
match->flow.nw_tos = ofmatch->nw_tos & IP_DSCP_MASK;
match->flow.nw_proto = ofmatch->nw_proto;
} else if (match->wc.masks.vlan_tci & htons(VLAN_CFI)
&& !(match->flow.vlan_tci & htons(VLAN_CFI))) {
ofmatch->dl_vlan = htons(OFP10_VLAN_NONE);
- ofpfw |= OFPFW10_DL_VLAN_PCP;
} else {
if (!(match->wc.masks.vlan_tci & htons(VLAN_VID_MASK))) {
ofpfw |= OFPFW10_DL_VLAN;
/* Compose most of the match structure. */
ofmatch->wildcards = htonl(ofpfw);
ofmatch->in_port = htons(ofp_to_u16(match->flow.in_port.ofp_port));
- memcpy(ofmatch->dl_src, match->flow.dl_src, ETH_ADDR_LEN);
- memcpy(ofmatch->dl_dst, match->flow.dl_dst, ETH_ADDR_LEN);
+ ofmatch->dl_src = match->flow.dl_src;
+ ofmatch->dl_dst = match->flow.dl_dst;
ofmatch->dl_type = ofputil_dl_type_to_openflow(match->flow.dl_type);
ofmatch->nw_src = match->flow.nw_src;
ofmatch->nw_dst = match->flow.nw_dst;
ofputil_pull_ofp11_match(struct ofpbuf *buf, struct match *match,
uint16_t *padded_match_len)
{
- struct ofp11_match_header *omh = ofpbuf_data(buf);
+ struct ofp11_match_header *omh = buf->data;
uint16_t match_len;
- if (ofpbuf_size(buf) < sizeof *omh) {
+ if (buf->size < sizeof *omh) {
return OFPERR_OFPBMC_BAD_LEN;
}
case OFPMT_STANDARD: {
struct ofp11_match *om;
- if (match_len != sizeof *om || ofpbuf_size(buf) < sizeof *om) {
+ if (match_len != sizeof *om || buf->size < sizeof *om) {
return OFPERR_OFPBMC_BAD_LEN;
}
om = ofpbuf_pull(buf, sizeof *om);
struct match *match)
{
uint16_t wc = ntohl(ofmatch->wildcards);
- uint8_t dl_src_mask[ETH_ADDR_LEN];
- uint8_t dl_dst_mask[ETH_ADDR_LEN];
bool ipv4, arp, rarp;
- int i;
match_init_catchall(match);
match_set_in_port(match, ofp_port);
}
- for (i = 0; i < ETH_ADDR_LEN; i++) {
- dl_src_mask[i] = ~ofmatch->dl_src_mask[i];
- }
- match_set_dl_src_masked(match, ofmatch->dl_src, dl_src_mask);
-
- for (i = 0; i < ETH_ADDR_LEN; i++) {
- dl_dst_mask[i] = ~ofmatch->dl_dst_mask[i];
- }
- match_set_dl_dst_masked(match, ofmatch->dl_dst, dl_dst_mask);
+ match_set_dl_src_masked(match, ofmatch->dl_src,
+ eth_addr_invert(ofmatch->dl_src_mask));
+ match_set_dl_dst_masked(match, ofmatch->dl_dst,
+ eth_addr_invert(ofmatch->dl_dst_mask));
if (!(wc & OFPFW11_DL_VLAN)) {
if (ofmatch->dl_vlan == htons(OFPVID11_NONE)) {
struct ofp11_match *ofmatch)
{
uint32_t wc = 0;
- int i;
memset(ofmatch, 0, sizeof *ofmatch);
ofmatch->omh.type = htons(OFPMT_STANDARD);
ofmatch->in_port = ofputil_port_to_ofp11(match->flow.in_port.ofp_port);
}
- memcpy(ofmatch->dl_src, match->flow.dl_src, ETH_ADDR_LEN);
- for (i = 0; i < ETH_ADDR_LEN; i++) {
- ofmatch->dl_src_mask[i] = ~match->wc.masks.dl_src[i];
- }
-
- memcpy(ofmatch->dl_dst, match->flow.dl_dst, ETH_ADDR_LEN);
- for (i = 0; i < ETH_ADDR_LEN; i++) {
- ofmatch->dl_dst_mask[i] = ~match->wc.masks.dl_dst[i];
- }
+ ofmatch->dl_src = match->flow.dl_src;
+ ofmatch->dl_src_mask = eth_addr_invert(match->wc.masks.dl_src);
+ ofmatch->dl_dst = match->flow.dl_dst;
+ ofmatch->dl_dst_mask = eth_addr_invert(match->wc.masks.dl_dst);
if (match->wc.masks.vlan_tci == htons(0)) {
wc |= OFPFW11_DL_VLAN | OFPFW11_DL_VLAN_PCP;
/* Only use the first 32-bit element of the bitmap as that is all the
* current implementation supports. Subsequent elements are ignored which
- * should have no effect on session negotiation until Open vSwtich supports
+ * should have no effect on session negotiation until Open vSwitch supports
* wire-protocol versions greater than 31.
*/
allowed_versions = ntohl(bitmap[0]);
ofpbuf_pull(&msg, sizeof *oh);
*allowed_versions = version_bitmap_from_version(oh->version);
- while (ofpbuf_size(&msg)) {
+ while (msg.size) {
const struct ofp_hello_elem_header *oheh;
unsigned int len;
- if (ofpbuf_size(&msg) < sizeof *oheh) {
+ if (msg.size < sizeof *oheh) {
return false;
}
- oheh = ofpbuf_data(&msg);
+ oheh = msg.data;
len = ntohs(oheh->length);
if (len < sizeof *oheh || !ofpbuf_try_pull(&msg, ROUND_UP(len, 8))) {
return false;
fm->out_group = (ofm->command == OFPFC_DELETE ||
ofm->command == OFPFC_DELETE_STRICT
? ntohl(ofm->out_group)
- : OFPG11_ANY);
+ : OFPG_ANY);
raw_flags = ofm->flags;
} else {
uint16_t command;
fm->importance = 0;
fm->buffer_id = ntohl(ofm->buffer_id);
fm->out_port = u16_to_ofp(ntohs(ofm->out_port));
- fm->out_group = OFPG11_ANY;
+ fm->out_group = OFPG_ANY;
raw_flags = ofm->flags;
} else if (raw == OFPRAW_NXT_FLOW_MOD) {
/* Nicira extended flow_mod. */
fm->importance = 0;
fm->buffer_id = ntohl(nfm->buffer_id);
fm->out_port = u16_to_ofp(ntohs(nfm->out_port));
- fm->out_group = OFPG11_ANY;
+ fm->out_group = OFPG_ANY;
raw_flags = nfm->flags;
} else {
OVS_NOT_REACHED();
fm->command = command & 0xff;
fm->table_id = command >> 8;
} else {
+ if (command > 0xff) {
+ VLOG_WARN_RL(&bad_ofmsg_rl, "flow_mod has explicit table_id "
+ "but flow_mod_table_id extension is not enabled");
+ }
fm->command = command;
fm->table_id = 0xff;
}
}
- error = ofpacts_pull_openflow_instructions(&b, ofpbuf_size(&b),
+ if (fm->command > OFPFC_DELETE_STRICT) {
+ return OFPERR_OFPFMFC_BAD_COMMAND;
+ }
+
+ error = ofpacts_pull_openflow_instructions(&b, b.size,
oh->version, ofpacts);
if (error) {
return error;
}
- fm->ofpacts = ofpbuf_data(ofpacts);
- fm->ofpacts_len = ofpbuf_size(ofpacts);
+ fm->ofpacts = ofpacts->data;
+ fm->ofpacts_len = ofpacts->size;
error = ofputil_decode_flow_mod_flags(raw_flags, fm->command,
oh->version, &fm->flags);
mm->meter.flags & OFPMF13_PKTPS) {
return OFPERR_OFPMMFC_BAD_FLAGS;
}
- mm->meter.bands = ofpbuf_data(bands);
+ mm->meter.bands = bands->data;
- error = ofputil_pull_bands(&b, ofpbuf_size(&b), &mm->meter.n_bands, bands);
+ error = ofputil_pull_bands(&b, b.size, &mm->meter.n_bands, bands);
if (error) {
return error;
}
const struct ofputil_meter_config *mc)
{
struct ofpbuf *msg = ofpbuf_from_list(list_back(replies));
- size_t start_ofs = ofpbuf_size(msg);
- struct ofp13_meter_config *reply = ofpbuf_put_uninit(msg, sizeof *reply);
- reply->flags = htons(mc->flags);
- reply->meter_id = htonl(mc->meter_id);
+ size_t start_ofs = msg->size;
+ struct ofp13_meter_config *reply;
+ ofpbuf_put_uninit(msg, sizeof *reply);
ofputil_put_bands(mc->n_bands, mc->bands, msg);
- reply->length = htons(ofpbuf_size(msg) - start_ofs);
+ reply = ofpbuf_at_assert(msg, start_ofs, sizeof *reply);
+ reply->flags = htons(mc->flags);
+ reply->meter_id = htonl(mc->meter_id);
+ reply->length = htons(msg->size - start_ofs);
ofpmp_postappend(replies, start_ofs);
}
enum ofperr err;
/* Pull OpenFlow headers for the first call. */
- if (!msg->frame) {
+ if (!msg->header) {
ofpraw_pull_assert(msg);
}
- if (!ofpbuf_size(msg)) {
+ if (!msg->size) {
return EOF;
}
if (!omc) {
VLOG_WARN_RL(&bad_ofmsg_rl,
"OFPMP_METER_CONFIG reply has %"PRIu32" leftover bytes at end",
- ofpbuf_size(msg));
+ msg->size);
return OFPERR_OFPBRC_BAD_LEN;
}
}
mc->meter_id = ntohl(omc->meter_id);
mc->flags = ntohs(omc->flags);
- mc->bands = ofpbuf_data(bands);
+ mc->bands = bands->data;
return 0;
}
enum ofperr err;
/* Pull OpenFlow headers for the first call. */
- if (!msg->frame) {
+ if (!msg->header) {
ofpraw_pull_assert(msg);
}
- if (!ofpbuf_size(msg)) {
+ if (!msg->size) {
return EOF;
}
if (!oms) {
VLOG_WARN_RL(&bad_ofmsg_rl,
"OFPMP_METER reply has %"PRIu32" leftover bytes at end",
- ofpbuf_size(msg));
+ msg->size);
return OFPERR_OFPBRC_BAD_LEN;
}
ms->byte_in_count = ntohll(oms->byte_in_count);
ms->duration_sec = ntohl(oms->duration_sec);
ms->duration_nsec = ntohl(oms->duration_nsec);
- ms->bands = ofpbuf_data(bands);
+ ms->bands = bands->data;
return 0;
}
nfm->command = ofputil_tid_command(fm, protocol);
nfm->cookie = fm->new_cookie;
match_len = nx_put_match(msg, &fm->match, fm->cookie, fm->cookie_mask);
- nfm = ofpbuf_l3(msg);
+ nfm = msg->msg;
nfm->idle_timeout = htons(fm->idle_timeout);
nfm->hard_timeout = htons(fm->hard_timeout);
nfm->priority = htons(fm->priority);
fsr->aggregate = aggregate;
ofputil_match_from_ofp10_match(&ofsr->match, &fsr->match);
fsr->out_port = u16_to_ofp(ntohs(ofsr->out_port));
- fsr->out_group = OFPG11_ANY;
+ fsr->out_group = OFPG_ANY;
fsr->table_id = ofsr->table_id;
fsr->cookie = fsr->cookie_mask = htonll(0);
if (error) {
return error;
}
- if (ofpbuf_size(b)) {
+ if (b->size) {
return OFPERR_OFPBRC_BAD_LEN;
}
fsr->aggregate = aggregate;
fsr->out_port = u16_to_ofp(ntohs(nfsr->out_port));
- fsr->out_group = OFPG11_ANY;
+ fsr->out_group = OFPG_ANY;
fsr->table_id = nfsr->table_id;
return 0;
}
/* Constructs and returns an OFPT_QUEUE_GET_CONFIG request for the specified
- * 'port', suitable for OpenFlow version 'version'. */
+ * 'port' and 'queue', suitable for OpenFlow version 'version'.
+ *
+ * 'queue' is honored only for OpenFlow 1.4 and later; older versions always
+ * request all queues. */
struct ofpbuf *
ofputil_encode_queue_get_config_request(enum ofp_version version,
- ofp_port_t port)
+ ofp_port_t port,
+ uint32_t queue)
{
struct ofpbuf *request;
version, 0);
qgcr10 = ofpbuf_put_zeros(request, sizeof *qgcr10);
qgcr10->port = htons(ofp_to_u16(port));
- } else {
+ } else if (version < OFP14_VERSION) {
struct ofp11_queue_get_config_request *qgcr11;
request = ofpraw_alloc(OFPRAW_OFPT11_QUEUE_GET_CONFIG_REQUEST,
version, 0);
qgcr11 = ofpbuf_put_zeros(request, sizeof *qgcr11);
qgcr11->port = ofputil_port_to_ofp11(port);
+ } else {
+ struct ofp14_queue_desc_request *qdr14;
+
+ request = ofpraw_alloc(OFPRAW_OFPST14_QUEUE_DESC_REQUEST,
+ version, 0);
+ qdr14 = ofpbuf_put_zeros(request, sizeof *qdr14);
+ qdr14->port = ofputil_port_to_ofp11(port);
+ qdr14->queue = htonl(queue);
}
return request;
* code. */
enum ofperr
ofputil_decode_queue_get_config_request(const struct ofp_header *oh,
- ofp_port_t *port)
+ ofp_port_t *port, uint32_t *queue)
{
const struct ofp10_queue_get_config_request *qgcr10;
const struct ofp11_queue_get_config_request *qgcr11;
+ const struct ofp14_queue_desc_request *qdr14;
enum ofpraw raw;
struct ofpbuf b;
switch ((int) raw) {
case OFPRAW_OFPT10_QUEUE_GET_CONFIG_REQUEST:
- qgcr10 = ofpbuf_data(&b);
+ qgcr10 = b.data;
*port = u16_to_ofp(ntohs(qgcr10->port));
- return 0;
+ *queue = OFPQ_ALL;
+ break;
case OFPRAW_OFPT11_QUEUE_GET_CONFIG_REQUEST:
- qgcr11 = ofpbuf_data(&b);
- return ofputil_port_from_ofp11(qgcr11->port, port);
+ qgcr11 = b.data;
+ *queue = OFPQ_ALL;
+ enum ofperr error = ofputil_port_from_ofp11(qgcr11->port, port);
+ if (error || *port == OFPP_ANY) {
+ return error;
+ }
+ break;
+
+ case OFPRAW_OFPST14_QUEUE_DESC_REQUEST:
+ qdr14 = b.data;
+ *queue = ntohl(qdr14->queue);
+ return ofputil_port_from_ofp11(qdr14->port, port);
+
+ default:
+ OVS_NOT_REACHED();
}
- OVS_NOT_REACHED();
+ return (ofp_to_u16(*port) < ofp_to_u16(OFPP_MAX)
+ ? 0
+ : OFPERR_OFPQOFC_BAD_PORT);
}
/* Constructs and returns the beginning of a reply to
- * OFPT_QUEUE_GET_CONFIG_REQUEST 'oh'. The caller may append information about
- * individual queues with ofputil_append_queue_get_config_reply(). */
-struct ofpbuf *
-ofputil_encode_queue_get_config_reply(const struct ofp_header *oh)
+ * OFPT_QUEUE_GET_CONFIG_REQUEST or OFPMP_QUEUE_DESC request 'oh'. The caller
+ * may append information about individual queues with
+ * ofputil_append_queue_get_config_reply(). */
+void
+ofputil_start_queue_get_config_reply(const struct ofp_header *request,
+ struct ovs_list *replies)
{
- struct ofp10_queue_get_config_reply *qgcr10;
- struct ofp11_queue_get_config_reply *qgcr11;
struct ofpbuf *reply;
enum ofperr error;
- struct ofpbuf b;
- enum ofpraw raw;
ofp_port_t port;
+ uint32_t queue;
- error = ofputil_decode_queue_get_config_request(oh, &port);
+ error = ofputil_decode_queue_get_config_request(request, &port, &queue);
ovs_assert(!error);
- ofpbuf_use_const(&b, oh, ntohs(oh->length));
- raw = ofpraw_pull_assert(&b);
-
+ enum ofpraw raw = ofpraw_decode_assert(request);
switch ((int) raw) {
case OFPRAW_OFPT10_QUEUE_GET_CONFIG_REQUEST:
reply = ofpraw_alloc_reply(OFPRAW_OFPT10_QUEUE_GET_CONFIG_REPLY,
- oh, 0);
- qgcr10 = ofpbuf_put_zeros(reply, sizeof *qgcr10);
+ request, 0);
+ struct ofp10_queue_get_config_reply *qgcr10
+ = ofpbuf_put_zeros(reply, sizeof *qgcr10);
qgcr10->port = htons(ofp_to_u16(port));
break;
case OFPRAW_OFPT11_QUEUE_GET_CONFIG_REQUEST:
reply = ofpraw_alloc_reply(OFPRAW_OFPT11_QUEUE_GET_CONFIG_REPLY,
- oh, 0);
- qgcr11 = ofpbuf_put_zeros(reply, sizeof *qgcr11);
+ request, 0);
+ struct ofp11_queue_get_config_reply *qgcr11
+ = ofpbuf_put_zeros(reply, sizeof *qgcr11);
qgcr11->port = ofputil_port_to_ofp11(port);
break;
+ case OFPRAW_OFPST14_QUEUE_DESC_REQUEST:
+ reply = ofpraw_alloc_stats_reply(request, 0);
+ break;
+
default:
OVS_NOT_REACHED();
}
- return reply;
+ list_init(replies);
+ list_push_back(replies, &reply->list_node);
}
static void
-put_queue_rate(struct ofpbuf *reply, enum ofp_queue_properties property,
- uint16_t rate)
+put_ofp10_queue_rate(struct ofpbuf *reply,
+ enum ofp10_queue_properties property, uint16_t rate)
{
if (rate != UINT16_MAX) {
- struct ofp_queue_prop_rate *oqpr;
+ struct ofp10_queue_prop_rate *oqpr;
oqpr = ofpbuf_put_zeros(reply, sizeof *oqpr);
oqpr->prop_header.property = htons(property);
}
}
-/* Appends a queue description for 'queue_id' to the
- * OFPT_QUEUE_GET_CONFIG_REPLY already in 'oh'. */
+static void
+put_ofp14_queue_rate(struct ofpbuf *reply,
+ enum ofp14_queue_desc_prop_type type, uint16_t rate)
+{
+ if (rate != UINT16_MAX) {
+ ofpprop_put_u16(reply, type, rate);
+ }
+}
+
void
-ofputil_append_queue_get_config_reply(struct ofpbuf *reply,
- const struct ofputil_queue_config *oqc)
+ofputil_append_queue_get_config_reply(const struct ofputil_queue_config *qc,
+ struct ovs_list *replies)
{
- const struct ofp_header *oh = ofpbuf_data(reply);
- size_t start_ofs, len_ofs;
+ enum ofp_version ofp_version = ofpmp_version(replies);
+ struct ofpbuf *reply = ofpbuf_from_list(list_back(replies));
+ size_t start_ofs = reply->size;
+ size_t len_ofs;
ovs_be16 *len;
- start_ofs = ofpbuf_size(reply);
- if (oh->version < OFP12_VERSION) {
- struct ofp10_packet_queue *opq10;
+ if (ofp_version < OFP14_VERSION) {
+ if (ofp_version < OFP12_VERSION) {
+ struct ofp10_packet_queue *opq10;
- opq10 = ofpbuf_put_zeros(reply, sizeof *opq10);
- opq10->queue_id = htonl(oqc->queue_id);
- len_ofs = (char *) &opq10->len - (char *) ofpbuf_data(reply);
- } else {
- struct ofp11_queue_get_config_reply *qgcr11;
- struct ofp12_packet_queue *opq12;
- ovs_be32 port;
+ opq10 = ofpbuf_put_zeros(reply, sizeof *opq10);
+ opq10->queue_id = htonl(qc->queue);
+ len_ofs = (char *) &opq10->len - (char *) reply->data;
+ } else {
+ struct ofp12_packet_queue *opq12;
- qgcr11 = ofpbuf_l3(reply);
- port = qgcr11->port;
+ opq12 = ofpbuf_put_zeros(reply, sizeof *opq12);
+ opq12->port = ofputil_port_to_ofp11(qc->port);
+ opq12->queue_id = htonl(qc->queue);
+ len_ofs = (char *) &opq12->len - (char *) reply->data;
+ }
- opq12 = ofpbuf_put_zeros(reply, sizeof *opq12);
- opq12->port = port;
- opq12->queue_id = htonl(oqc->queue_id);
- len_ofs = (char *) &opq12->len - (char *) ofpbuf_data(reply);
+ put_ofp10_queue_rate(reply, OFPQT10_MIN_RATE, qc->min_rate);
+ put_ofp10_queue_rate(reply, OFPQT11_MAX_RATE, qc->max_rate);
+ } else {
+ struct ofp14_queue_desc *oqd = ofpbuf_put_zeros(reply, sizeof *oqd);
+ oqd->port_no = ofputil_port_to_ofp11(qc->port);
+ oqd->queue_id = htonl(qc->queue);
+ len_ofs = (char *) &oqd->len - (char *) reply->data;
+ put_ofp14_queue_rate(reply, OFPQDPT14_MIN_RATE, qc->min_rate);
+ put_ofp14_queue_rate(reply, OFPQDPT14_MAX_RATE, qc->max_rate);
}
- put_queue_rate(reply, OFPQT_MIN_RATE, oqc->min_rate);
- put_queue_rate(reply, OFPQT_MAX_RATE, oqc->max_rate);
-
len = ofpbuf_at(reply, len_ofs, sizeof *len);
- *len = htons(ofpbuf_size(reply) - start_ofs);
-}
-
-/* Decodes the initial part of an OFPT_QUEUE_GET_CONFIG_REPLY from 'reply' and
- * stores in '*port' the port that the reply is about. The caller may call
- * ofputil_pull_queue_get_config_reply() to obtain information about individual
- * queues included in the reply. Returns 0 if successful, otherwise an
- * ofperr.*/
-enum ofperr
-ofputil_decode_queue_get_config_reply(struct ofpbuf *reply, ofp_port_t *port)
-{
- const struct ofp10_queue_get_config_reply *qgcr10;
- const struct ofp11_queue_get_config_reply *qgcr11;
- enum ofpraw raw;
-
- raw = ofpraw_pull_assert(reply);
- switch ((int) raw) {
- case OFPRAW_OFPT10_QUEUE_GET_CONFIG_REPLY:
- qgcr10 = ofpbuf_pull(reply, sizeof *qgcr10);
- *port = u16_to_ofp(ntohs(qgcr10->port));
- return 0;
+ *len = htons(reply->size - start_ofs);
- case OFPRAW_OFPT11_QUEUE_GET_CONFIG_REPLY:
- qgcr11 = ofpbuf_pull(reply, sizeof *qgcr11);
- return ofputil_port_from_ofp11(qgcr11->port, port);
+ if (ofp_version >= OFP14_VERSION) {
+ ofpmp_postappend(replies, start_ofs);
}
-
- OVS_NOT_REACHED();
}
static enum ofperr
-parse_queue_rate(const struct ofp_queue_prop_header *hdr, uint16_t *rate)
+parse_ofp10_queue_rate(const struct ofp10_queue_prop_header *hdr,
+ uint16_t *rate)
{
- const struct ofp_queue_prop_rate *oqpr;
+ const struct ofp10_queue_prop_rate *oqpr;
if (hdr->len == htons(sizeof *oqpr)) {
- oqpr = (const struct ofp_queue_prop_rate *) hdr;
+ oqpr = (const struct ofp10_queue_prop_rate *) hdr;
*rate = ntohs(oqpr->rate);
return 0;
} else {
}
}
-/* Decodes information about a queue from the OFPT_QUEUE_GET_CONFIG_REPLY in
- * 'reply' and stores it in '*queue'. ofputil_decode_queue_get_config_reply()
- * must already have pulled off the main header.
- *
- * This function returns EOF if the last queue has already been decoded, 0 if a
- * queue was successfully decoded into '*queue', or an ofperr if there was a
- * problem decoding 'reply'. */
-int
-ofputil_pull_queue_get_config_reply(struct ofpbuf *reply,
- struct ofputil_queue_config *queue)
+static int
+ofputil_pull_queue_get_config_reply10(struct ofpbuf *msg,
+ struct ofputil_queue_config *queue)
{
- const struct ofp_header *oh;
- unsigned int opq_len;
- unsigned int len;
+ const struct ofp_header *oh = msg->header;
+ unsigned int opq_len; /* Length of protocol-specific queue header. */
+ unsigned int len; /* Total length of queue + properties. */
- if (!ofpbuf_size(reply)) {
- return EOF;
+ /* Obtain the port number from the message header. */
+ if (oh->version == OFP10_VERSION) {
+ const struct ofp10_queue_get_config_reply *oqgcr10 = msg->msg;
+ queue->port = u16_to_ofp(ntohs(oqgcr10->port));
+ } else {
+ const struct ofp11_queue_get_config_reply *oqgcr11 = msg->msg;
+ enum ofperr error = ofputil_port_from_ofp11(oqgcr11->port,
+ &queue->port);
+ if (error) {
+ return error;
+ }
}
- queue->min_rate = UINT16_MAX;
- queue->max_rate = UINT16_MAX;
-
- oh = reply->frame;
+ /* Pull off the queue header and get the queue number and length. */
if (oh->version < OFP12_VERSION) {
const struct ofp10_packet_queue *opq10;
-
- opq10 = ofpbuf_try_pull(reply, sizeof *opq10);
+ opq10 = ofpbuf_try_pull(msg, sizeof *opq10);
if (!opq10) {
return OFPERR_OFPBRC_BAD_LEN;
}
- queue->queue_id = ntohl(opq10->queue_id);
+ queue->queue = ntohl(opq10->queue_id);
len = ntohs(opq10->len);
opq_len = sizeof *opq10;
} else {
const struct ofp12_packet_queue *opq12;
-
- opq12 = ofpbuf_try_pull(reply, sizeof *opq12);
+ opq12 = ofpbuf_try_pull(msg, sizeof *opq12);
if (!opq12) {
return OFPERR_OFPBRC_BAD_LEN;
}
- queue->queue_id = ntohl(opq12->queue_id);
+ queue->queue = ntohl(opq12->queue_id);
len = ntohs(opq12->len);
opq_len = sizeof *opq12;
}
- if (len < opq_len || len > ofpbuf_size(reply) + opq_len || len % 8) {
+ /* Length check. */
+ if (len < opq_len || len > msg->size + opq_len || len % 8) {
return OFPERR_OFPBRC_BAD_LEN;
}
len -= opq_len;
+ /* Pull properties. The format of these properties differs from used in
+ * OF1.4+ so we can't use the common property functions. */
while (len > 0) {
- const struct ofp_queue_prop_header *hdr;
+ const struct ofp10_queue_prop_header *hdr;
unsigned int property;
unsigned int prop_len;
enum ofperr error = 0;
- hdr = ofpbuf_at_assert(reply, 0, sizeof *hdr);
+ hdr = ofpbuf_at_assert(msg, 0, sizeof *hdr);
prop_len = ntohs(hdr->len);
- if (prop_len < sizeof *hdr || prop_len > ofpbuf_size(reply) || prop_len % 8) {
+ if (prop_len < sizeof *hdr || prop_len > msg->size || prop_len % 8) {
return OFPERR_OFPBRC_BAD_LEN;
}
property = ntohs(hdr->property);
switch (property) {
- case OFPQT_MIN_RATE:
- error = parse_queue_rate(hdr, &queue->min_rate);
+ case OFPQT10_MIN_RATE:
+ error = parse_ofp10_queue_rate(hdr, &queue->min_rate);
break;
- case OFPQT_MAX_RATE:
- error = parse_queue_rate(hdr, &queue->max_rate);
+ case OFPQT11_MAX_RATE:
+ error = parse_ofp10_queue_rate(hdr, &queue->max_rate);
break;
default:
return error;
}
- ofpbuf_pull(reply, prop_len);
+ ofpbuf_pull(msg, prop_len);
len -= prop_len;
}
return 0;
}
+static int
+ofputil_pull_queue_get_config_reply14(struct ofpbuf *msg,
+ struct ofputil_queue_config *queue)
+{
+ struct ofp14_queue_desc *oqd14 = ofpbuf_try_pull(msg, sizeof *oqd14);
+ if (!oqd14) {
+ return OFPERR_OFPBRC_BAD_LEN;
+ }
+ enum ofperr error = ofputil_port_from_ofp11(oqd14->port_no, &queue->port);
+ if (error) {
+ return error;
+ }
+ queue->queue = ntohl(oqd14->queue_id);
+
+ /* Length check. */
+ unsigned int len = ntohs(oqd14->len);
+ if (len < sizeof *oqd14 || len > msg->size + sizeof *oqd14 || len % 8) {
+ return OFPERR_OFPBRC_BAD_LEN;
+ }
+ len -= sizeof *oqd14;
+
+ struct ofpbuf properties;
+ ofpbuf_use_const(&properties, ofpbuf_pull(msg, len), len);
+ while (properties.size > 0) {
+ struct ofpbuf payload;
+ uint64_t type;
+
+ error = ofpprop_pull(&properties, &payload, &type);
+ if (error) {
+ return error;
+ }
+
+ switch (type) {
+ case OFPQDPT14_MIN_RATE:
+ error = ofpprop_parse_u16(&payload, &queue->min_rate);
+ break;
+
+ case OFPQDPT14_MAX_RATE:
+ error = ofpprop_parse_u16(&payload, &queue->max_rate);
+ break;
+
+ default:
+ error = OFPPROP_UNKNOWN(true, "queue desc", type);
+ break;
+ }
+
+ if (error) {
+ return error;
+ }
+ }
+
+ return 0;
+}
+
+/* Decodes information about a queue from the OFPT_QUEUE_GET_CONFIG_REPLY in
+ * 'reply' and stores it in '*queue'. ofputil_decode_queue_get_config_reply()
+ * must already have pulled off the main header.
+ *
+ * This function returns EOF if the last queue has already been decoded, 0 if a
+ * queue was successfully decoded into '*queue', or an ofperr if there was a
+ * problem decoding 'reply'. */
+int
+ofputil_pull_queue_get_config_reply(struct ofpbuf *msg,
+ struct ofputil_queue_config *queue)
+{
+ enum ofpraw raw;
+ if (!msg->header) {
+ /* Pull OpenFlow header. */
+ raw = ofpraw_pull_assert(msg);
+
+ /* Pull protocol-specific ofp_queue_get_config_reply header (OF1.4
+ * doesn't have one at all). */
+ if (raw == OFPRAW_OFPT10_QUEUE_GET_CONFIG_REPLY) {
+ ofpbuf_pull(msg, sizeof(struct ofp10_queue_get_config_reply));
+ } else if (raw == OFPRAW_OFPT11_QUEUE_GET_CONFIG_REPLY) {
+ ofpbuf_pull(msg, sizeof(struct ofp11_queue_get_config_reply));
+ } else {
+ ovs_assert(raw == OFPRAW_OFPST14_QUEUE_DESC_REPLY);
+ }
+ } else {
+ raw = ofpraw_decode_assert(msg->header);
+ }
+
+ queue->min_rate = UINT16_MAX;
+ queue->max_rate = UINT16_MAX;
+
+ if (!msg->size) {
+ return EOF;
+ } else if (raw == OFPRAW_OFPST14_QUEUE_DESC_REPLY) {
+ return ofputil_pull_queue_get_config_reply14(msg, queue);
+ } else {
+ return ofputil_pull_queue_get_config_reply10(msg, queue);
+ }
+}
+
/* Converts an OFPST_FLOW, OFPST_AGGREGATE, NXST_FLOW, or NXST_AGGREGATE
* request 'oh', into an abstract flow_stats_request in 'fsr'. Returns 0 if
* successful, otherwise an OpenFlow error code. */
raw = ofpraw_pull_assert(&b);
switch ((int) raw) {
case OFPRAW_OFPST10_FLOW_REQUEST:
- return ofputil_decode_ofpst10_flow_request(fsr, ofpbuf_data(&b), false);
+ return ofputil_decode_ofpst10_flow_request(fsr, b.data, false);
case OFPRAW_OFPST10_AGGREGATE_REQUEST:
- return ofputil_decode_ofpst10_flow_request(fsr, ofpbuf_data(&b), true);
+ return ofputil_decode_ofpst10_flow_request(fsr, b.data, true);
case OFPRAW_OFPST11_FLOW_REQUEST:
return ofputil_decode_ofpst11_flow_request(fsr, &b, false);
match_len = nx_put_match(msg, &fsr->match,
fsr->cookie, fsr->cookie_mask);
- nfsr = ofpbuf_l3(msg);
+ nfsr = msg->msg;
nfsr->out_port = htons(ofp_to_u16(fsr->out_port));
nfsr->match_len = htons(match_len);
nfsr->table_id = fsr->table_id;
enum ofperr error;
enum ofpraw raw;
- error = (msg->frame
- ? ofpraw_decode(&raw, msg->frame)
+ error = (msg->header ? ofpraw_decode(&raw, msg->header)
: ofpraw_pull(&raw, msg));
if (error) {
return error;
}
- oh = msg->frame;
+ oh = msg->header;
- if (!ofpbuf_size(msg)) {
+ if (!msg->size) {
return EOF;
} else if (raw == OFPRAW_OFPST11_FLOW_REPLY
|| raw == OFPRAW_OFPST13_FLOW_REPLY) {
ofs = ofpbuf_try_pull(msg, sizeof *ofs);
if (!ofs) {
VLOG_WARN_RL(&bad_ofmsg_rl, "OFPST_FLOW reply has %"PRIu32" leftover "
- "bytes at end", ofpbuf_size(msg));
+ "bytes at end", msg->size);
return EINVAL;
}
ofs = ofpbuf_try_pull(msg, sizeof *ofs);
if (!ofs) {
VLOG_WARN_RL(&bad_ofmsg_rl, "OFPST_FLOW reply has %"PRIu32" leftover "
- "bytes at end", ofpbuf_size(msg));
+ "bytes at end", msg->size);
return EINVAL;
}
nfs = ofpbuf_try_pull(msg, sizeof *nfs);
if (!nfs) {
VLOG_WARN_RL(&bad_ofmsg_rl, "NXST_FLOW reply has %"PRIu32" leftover "
- "bytes at end", ofpbuf_size(msg));
+ "bytes at end", msg->size);
return EINVAL;
}
VLOG_WARN_RL(&bad_ofmsg_rl, "OFPST_FLOW reply bad instructions");
return EINVAL;
}
- fs->ofpacts = ofpbuf_data(ofpacts);
- fs->ofpacts_len = ofpbuf_size(ofpacts);
+ fs->ofpacts = ofpacts->data;
+ fs->ofpacts_len = ofpacts->size;
return 0;
}
struct ovs_list *replies)
{
struct ofpbuf *reply = ofpbuf_from_list(list_back(replies));
- size_t start_ofs = ofpbuf_size(reply);
+ size_t start_ofs = reply->size;
enum ofp_version version = ofpmp_version(replies);
enum ofpraw raw = ofpmp_decode_raw(replies);
version);
ofs = ofpbuf_at_assert(reply, start_ofs, sizeof *ofs);
- ofs->length = htons(ofpbuf_size(reply) - start_ofs);
+ ofs->length = htons(reply->size - start_ofs);
ofs->table_id = fs->table_id;
ofs->pad = 0;
ofs->duration_sec = htonl(fs->duration_sec);
ofpacts_put_openflow_actions(fs->ofpacts, fs->ofpacts_len, reply,
version);
ofs = ofpbuf_at_assert(reply, start_ofs, sizeof *ofs);
- ofs->length = htons(ofpbuf_size(reply) - start_ofs);
+ ofs->length = htons(reply->size - start_ofs);
ofs->table_id = fs->table_id;
ofs->pad = 0;
ofputil_match_to_ofp10_match(&fs->match, &ofs->match);
ofpacts_put_openflow_actions(fs->ofpacts, fs->ofpacts_len, reply,
version);
nfs = ofpbuf_at_assert(reply, start_ofs, sizeof *nfs);
- nfs->length = htons(ofpbuf_size(reply) - start_ofs);
+ nfs->length = htons(reply->size - start_ofs);
nfs->table_id = fs->table_id;
nfs->pad = 0;
nfs->duration_sec = htonl(fs->duration_sec);
ofpbuf_use_const(&msg, reply, ntohs(reply->length));
ofpraw_pull_assert(&msg);
- asr = ofpbuf_l3(&msg);
+ asr = msg.msg;
stats->packet_count = ntohll(get_32aligned_be64(&asr->packet_count));
stats->byte_count = ntohll(get_32aligned_be64(&asr->byte_count));
stats->flow_count = ntohl(asr->flow_count);
if (error) {
return error;
}
- if (ofpbuf_size(&b)) {
+ if (b.size) {
return OFPERR_OFPBRC_BAD_LEN;
}
ofpbuf_put_zeros(msg, sizeof *nfr);
match_len = nx_put_match(msg, &fr->match, 0, 0);
- nfr = ofpbuf_l3(msg);
+ nfr = msg->msg;
nfr->cookie = fr->cookie;
nfr->priority = htons(fr->priority);
nfr->reason = reason;
return msg;
}
-static void
-ofputil_decode_packet_in_finish(struct ofputil_packet_in *pin,
- struct match *match, struct ofpbuf *b)
-{
- pin->packet = ofpbuf_data(b);
- pin->packet_len = ofpbuf_size(b);
-
- pin->fmd.in_port = match->flow.in_port.ofp_port;
- pin->fmd.tun_id = match->flow.tunnel.tun_id;
- pin->fmd.tun_src = match->flow.tunnel.ip_src;
- pin->fmd.tun_dst = match->flow.tunnel.ip_dst;
- pin->fmd.metadata = match->flow.metadata;
- memcpy(pin->fmd.regs, match->flow.regs, sizeof pin->fmd.regs);
- pin->fmd.pkt_mark = match->flow.pkt_mark;
-}
-
enum ofperr
ofputil_decode_packet_in(struct ofputil_packet_in *pin,
const struct ofp_header *oh)
raw = ofpraw_pull_assert(&b);
if (raw == OFPRAW_OFPT13_PACKET_IN || raw == OFPRAW_OFPT12_PACKET_IN) {
const struct ofp13_packet_in *opi;
- struct match match;
int error;
size_t packet_in_size;
}
opi = ofpbuf_pull(&b, packet_in_size);
- error = oxm_pull_match_loose(&b, &match);
+ error = oxm_pull_match_loose(&b, &pin->flow_metadata);
if (error) {
return error;
}
pin->cookie = opi->cookie;
}
- ofputil_decode_packet_in_finish(pin, &match, &b);
+ pin->packet = b.data;
+ pin->packet_len = b.size;
} else if (raw == OFPRAW_OFPT10_PACKET_IN) {
const struct ofp10_packet_in *opi;
opi = ofpbuf_pull(&b, offsetof(struct ofp10_packet_in, data));
pin->packet = opi->data;
- pin->packet_len = ofpbuf_size(&b);
+ pin->packet_len = b.size;
- pin->fmd.in_port = u16_to_ofp(ntohs(opi->in_port));
+ match_init_catchall(&pin->flow_metadata);
+ match_set_in_port(&pin->flow_metadata, u16_to_ofp(ntohs(opi->in_port)));
pin->reason = opi->reason;
pin->buffer_id = ntohl(opi->buffer_id);
pin->total_len = ntohs(opi->total_len);
} else if (raw == OFPRAW_OFPT11_PACKET_IN) {
const struct ofp11_packet_in *opi;
+ ofp_port_t in_port;
enum ofperr error;
opi = ofpbuf_pull(&b, sizeof *opi);
- pin->packet = ofpbuf_data(&b);
- pin->packet_len = ofpbuf_size(&b);
+ pin->packet = b.data;
+ pin->packet_len = b.size;
pin->buffer_id = ntohl(opi->buffer_id);
- error = ofputil_port_from_ofp11(opi->in_port, &pin->fmd.in_port);
+ error = ofputil_port_from_ofp11(opi->in_port, &in_port);
if (error) {
return error;
}
+ match_init_catchall(&pin->flow_metadata);
+ match_set_in_port(&pin->flow_metadata, in_port);
pin->total_len = ntohs(opi->total_len);
pin->reason = opi->reason;
pin->table_id = opi->table_id;
} else if (raw == OFPRAW_NXT_PACKET_IN) {
const struct nx_packet_in *npi;
- struct match match;
int error;
npi = ofpbuf_pull(&b, sizeof *npi);
- error = nx_pull_match_loose(&b, ntohs(npi->match_len), &match, NULL,
- NULL);
+ error = nx_pull_match_loose(&b, ntohs(npi->match_len),
+ &pin->flow_metadata, NULL, NULL);
if (error) {
return error;
}
pin->buffer_id = ntohl(npi->buffer_id);
pin->total_len = ntohs(npi->total_len);
- ofputil_decode_packet_in_finish(pin, &match, &b);
+ pin->packet = b.data;
+ pin->packet_len = b.size;
} else {
OVS_NOT_REACHED();
}
return 0;
}
-static void
-ofputil_packet_in_to_match(const struct ofputil_packet_in *pin,
- struct match *match)
-{
- int i;
-
- match_init_catchall(match);
- if (pin->fmd.tun_id != htonll(0)) {
- match_set_tun_id(match, pin->fmd.tun_id);
- }
- if (pin->fmd.tun_src != htonl(0)) {
- match_set_tun_src(match, pin->fmd.tun_src);
- }
- if (pin->fmd.tun_dst != htonl(0)) {
- match_set_tun_dst(match, pin->fmd.tun_dst);
- }
- if (pin->fmd.metadata != htonll(0)) {
- match_set_metadata(match, pin->fmd.metadata);
- }
-
- for (i = 0; i < FLOW_N_REGS; i++) {
- if (pin->fmd.regs[i]) {
- match_set_reg(match, i, pin->fmd.regs[i]);
- }
- }
-
- if (pin->fmd.pkt_mark != 0) {
- match_set_pkt_mark(match, pin->fmd.pkt_mark);
- }
-
- match_set_in_port(match, pin->fmd.in_port);
-}
-
static struct ofpbuf *
ofputil_encode_ofp10_packet_in(const struct ofputil_packet_in *pin)
{
htonl(0), pin->packet_len);
opi = ofpbuf_put_zeros(packet, offsetof(struct ofp10_packet_in, data));
opi->total_len = htons(pin->total_len);
- opi->in_port = htons(ofp_to_u16(pin->fmd.in_port));
+ opi->in_port = htons(ofp_to_u16(pin->flow_metadata.flow.in_port.ofp_port));
opi->reason = pin->reason;
opi->buffer_id = htonl(pin->buffer_id);
{
struct nx_packet_in *npi;
struct ofpbuf *packet;
- struct match match;
size_t match_len;
- ofputil_packet_in_to_match(pin, &match);
-
/* The final argument is just an estimate of the space required. */
packet = ofpraw_alloc_xid(OFPRAW_NXT_PACKET_IN, OFP10_VERSION,
- htonl(0), (sizeof(struct flow_metadata) * 2
- + 2 + pin->packet_len));
+ htonl(0), NXM_TYPICAL_LEN + 2 + pin->packet_len);
ofpbuf_put_zeros(packet, sizeof *npi);
- match_len = nx_put_match(packet, &match, 0, 0);
+ match_len = nx_put_match(packet, &pin->flow_metadata, 0, 0);
ofpbuf_put_zeros(packet, 2);
ofpbuf_put(packet, pin->packet, pin->packet_len);
- npi = ofpbuf_l3(packet);
+ npi = packet->msg;
npi->buffer_id = htonl(pin->buffer_id);
npi->total_len = htons(pin->total_len);
npi->reason = pin->reason;
htonl(0), pin->packet_len);
opi = ofpbuf_put_zeros(packet, sizeof *opi);
opi->buffer_id = htonl(pin->buffer_id);
- opi->in_port = ofputil_port_to_ofp11(pin->fmd.in_port);
+ opi->in_port = ofputil_port_to_ofp11(pin->flow_metadata.flow.in_port.ofp_port);
opi->in_phy_port = opi->in_port;
opi->total_len = htons(pin->total_len);
opi->reason = pin->reason;
enum ofputil_protocol protocol)
{
struct ofp13_packet_in *opi;
- struct match match;
enum ofpraw packet_in_raw;
enum ofp_version packet_in_version;
size_t packet_in_size;
packet_in_size = sizeof (struct ofp13_packet_in);
}
- ofputil_packet_in_to_match(pin, &match);
-
/* The final argument is just an estimate of the space required. */
packet = ofpraw_alloc_xid(packet_in_raw, packet_in_version,
- htonl(0), (sizeof(struct flow_metadata) * 2
- + 2 + pin->packet_len));
+ htonl(0), NXM_TYPICAL_LEN + 2 + pin->packet_len);
ofpbuf_put_zeros(packet, packet_in_size);
- oxm_put_match(packet, &match, ofputil_protocol_to_ofp_version(protocol));
+ oxm_put_match(packet, &pin->flow_metadata,
+ ofputil_protocol_to_ofp_version(protocol));
ofpbuf_put_zeros(packet, 2);
ofpbuf_put(packet, pin->packet, pin->packet_len);
- opi = ofpbuf_l3(packet);
+ opi = packet->msg;
opi->pi.buffer_id = htonl(pin->buffer_id);
opi->pi.total_len = htons(pin->total_len);
opi->pi.reason = pin->reason;
ofpbuf_use_const(&b, oh, ntohs(oh->length));
raw = ofpraw_pull_assert(&b);
+ ofpbuf_clear(ofpacts);
if (raw == OFPRAW_OFPT11_PACKET_OUT) {
enum ofperr error;
const struct ofp11_packet_out *opo = ofpbuf_pull(&b, sizeof *opo);
return OFPERR_OFPBRC_BAD_PORT;
}
- po->ofpacts = ofpbuf_data(ofpacts);
- po->ofpacts_len = ofpbuf_size(ofpacts);
+ po->ofpacts = ofpacts->data;
+ po->ofpacts_len = ofpacts->size;
if (po->buffer_id == UINT32_MAX) {
- po->packet = ofpbuf_data(&b);
- po->packet_len = ofpbuf_size(&b);
+ po->packet = b.data;
+ po->packet_len = b.size;
} else {
po->packet = NULL;
po->packet_len = 0;
const struct ofp10_phy_port *opp)
{
pp->port_no = u16_to_ofp(ntohs(opp->port_no));
- memcpy(pp->hw_addr, opp->hw_addr, OFP_ETH_ALEN);
+ pp->hw_addr = opp->hw_addr;
ovs_strlcpy(pp->name, opp->name, OFP_MAX_PORT_NAME_LEN);
pp->config = ntohl(opp->config) & OFPPC10_ALL;
if (error) {
return error;
}
- memcpy(pp->hw_addr, op->hw_addr, OFP_ETH_ALEN);
+ pp->hw_addr = op->hw_addr;
ovs_strlcpy(pp->name, op->name, OFP_MAX_PORT_NAME_LEN);
pp->config = ntohl(op->config) & OFPPC11_ALL;
parse_ofp14_port_ethernet_property(const struct ofpbuf *payload,
struct ofputil_phy_port *pp)
{
- struct ofp14_port_desc_prop_ethernet *eth = ofpbuf_data(payload);
+ struct ofp14_port_desc_prop_ethernet *eth = payload->data;
- if (ofpbuf_size(payload) != sizeof *eth) {
+ if (payload->size != sizeof *eth) {
return OFPERR_OFPBPC_BAD_LEN;
}
}
len = ntohs(op->length);
- if (len < sizeof *op || len - sizeof *op > ofpbuf_size(msg)) {
+ if (len < sizeof *op || len - sizeof *op > msg->size) {
return OFPERR_OFPBRC_BAD_LEN;
}
len -= sizeof *op;
if (error) {
return error;
}
- memcpy(pp->hw_addr, op->hw_addr, OFP_ETH_ALEN);
+ pp->hw_addr = op->hw_addr;
ovs_strlcpy(pp->name, op->name, OFP_MAX_PORT_NAME_LEN);
pp->config = ntohl(op->config) & OFPPC11_ALL;
pp->state = ntohl(op->state) & OFPPS11_ALL;
- while (ofpbuf_size(&properties) > 0) {
+ while (properties.size > 0) {
struct ofpbuf payload;
enum ofperr error;
- uint16_t type;
+ uint64_t type;
- error = ofputil_pull_property(&properties, &payload, &type);
+ error = ofpprop_pull(&properties, &payload, &type);
if (error) {
return error;
}
break;
default:
- log_property(true, "unknown port property %"PRIu16, type);
- error = 0;
+ error = OFPPROP_UNKNOWN(true, "port", type);
break;
}
memset(opp, 0, sizeof *opp);
opp->port_no = htons(ofp_to_u16(pp->port_no));
- memcpy(opp->hw_addr, pp->hw_addr, ETH_ADDR_LEN);
+ opp->hw_addr = pp->hw_addr;
ovs_strlcpy(opp->name, pp->name, OFP_MAX_PORT_NAME_LEN);
opp->config = htonl(pp->config & OFPPC10_ALL);
memset(op, 0, sizeof *op);
op->port_no = ofputil_port_to_ofp11(pp->port_no);
- memcpy(op->hw_addr, pp->hw_addr, ETH_ADDR_LEN);
+ op->hw_addr = pp->hw_addr;
ovs_strlcpy(op->name, pp->name, OFP_MAX_PORT_NAME_LEN);
op->config = htonl(pp->config & OFPPC11_ALL);
op = ofpbuf_put_zeros(b, sizeof *op);
op->port_no = ofputil_port_to_ofp11(pp->port_no);
op->length = htons(sizeof *op + sizeof *eth);
- memcpy(op->hw_addr, pp->hw_addr, ETH_ADDR_LEN);
+ op->hw_addr = pp->hw_addr;
ovs_strlcpy(op->name, pp->name, sizeof op->name);
op->config = htonl(pp->config & OFPPC11_ALL);
op->state = htonl(pp->state & OFPPS11_ALL);
- eth = ofpbuf_put_zeros(b, sizeof *eth);
- eth->type = htons(OFPPDPT14_ETHERNET);
- eth->length = htons(sizeof *eth);
+ eth = ofpprop_put_zeros(b, OFPPDPT14_ETHERNET, sizeof *eth);
eth->curr = netdev_port_features_to_ofp11(pp->curr);
eth->advertised = netdev_port_features_to_ofp11(pp->advertised);
eth->supported = netdev_port_features_to_ofp11(pp->supported);
ofp_port_t port)
{
struct ofpbuf *request;
- ovs_be32 ofp11_port;
switch (ofp_version) {
case OFP10_VERSION:
request = ofpraw_alloc(OFPRAW_OFPST10_PORT_DESC_REQUEST,
ofp_version, 0);
break;
-
- case OFP15_VERSION:
+ case OFP15_VERSION:{
+ struct ofp15_port_desc_request *req;
request = ofpraw_alloc(OFPRAW_OFPST15_PORT_DESC_REQUEST,
ofp_version, 0);
- ofp11_port = ofputil_port_to_ofp11(port);
- ofpbuf_put(request, &ofp11_port, sizeof ofp11_port);
+ req = ofpbuf_put_zeros(request, sizeof *req);
+ req->port_no = ofputil_port_to_ofp11(port);
break;
-
+ }
default:
OVS_NOT_REACHED();
}
struct ovs_list *replies)
{
struct ofpbuf *reply = ofpbuf_from_list(list_back(replies));
- size_t start_ofs = ofpbuf_size(reply);
+ size_t start_ofs = reply->size;
ofputil_put_phy_port(ofpmp_version(replies), pp, reply);
ofpmp_postappend(replies, start_ofs);
}
\f
-/* ofputil_switch_features */
-
-#define OFPC_COMMON (OFPC_FLOW_STATS | OFPC_TABLE_STATS | OFPC_PORT_STATS | \
- OFPC_IP_REASM | OFPC_QUEUE_STATS)
-BUILD_ASSERT_DECL((int) OFPUTIL_C_FLOW_STATS == OFPC_FLOW_STATS);
-BUILD_ASSERT_DECL((int) OFPUTIL_C_TABLE_STATS == OFPC_TABLE_STATS);
-BUILD_ASSERT_DECL((int) OFPUTIL_C_PORT_STATS == OFPC_PORT_STATS);
-BUILD_ASSERT_DECL((int) OFPUTIL_C_IP_REASM == OFPC_IP_REASM);
-BUILD_ASSERT_DECL((int) OFPUTIL_C_QUEUE_STATS == OFPC_QUEUE_STATS);
-BUILD_ASSERT_DECL((int) OFPUTIL_C_ARP_MATCH_IP == OFPC_ARP_MATCH_IP);
+/* ofputil_switch_config */
-static uint32_t
-ofputil_capabilities_mask(enum ofp_version ofp_version)
+/* Decodes 'oh', which must be an OFPT_GET_CONFIG_REPLY or OFPT_SET_CONFIG
+ * message, into 'config'. Returns false if 'oh' contained any flags that
+ * aren't specified in its version of OpenFlow, true otherwise. */
+static bool
+ofputil_decode_switch_config(const struct ofp_header *oh,
+ struct ofputil_switch_config *config)
{
- /* Handle capabilities whose bit is unique for all OpenFlow versions */
- switch (ofp_version) {
- case OFP10_VERSION:
- case OFP11_VERSION:
- return OFPC_COMMON | OFPC_ARP_MATCH_IP;
- case OFP12_VERSION:
- case OFP13_VERSION:
- case OFP14_VERSION:
- case OFP15_VERSION:
- return OFPC_COMMON | OFPC12_PORT_BLOCKED;
- default:
- /* Caller needs to check osf->header.version itself */
- return 0;
- }
-}
+ const struct ofp_switch_config *osc;
+ struct ofpbuf b;
-/* Decodes an OpenFlow 1.0 or 1.1 "switch_features" structure 'osf' into an
- * abstract representation in '*features'. Initializes '*b' to iterate over
+ ofpbuf_use_const(&b, oh, ntohs(oh->length));
+ ofpraw_pull_assert(&b);
+ osc = ofpbuf_pull(&b, sizeof *osc);
+
+ config->frag = ntohs(osc->flags) & OFPC_FRAG_MASK;
+ config->miss_send_len = ntohs(osc->miss_send_len);
+
+ ovs_be16 valid_mask = htons(OFPC_FRAG_MASK);
+ if (oh->version < OFP13_VERSION) {
+ const ovs_be16 ttl_bit = htons(OFPC_INVALID_TTL_TO_CONTROLLER);
+ valid_mask |= ttl_bit;
+ config->invalid_ttl_to_controller = (osc->flags & ttl_bit) != 0;
+ } else {
+ config->invalid_ttl_to_controller = -1;
+ }
+
+ return !(osc->flags & ~valid_mask);
+}
+
+void
+ofputil_decode_get_config_reply(const struct ofp_header *oh,
+ struct ofputil_switch_config *config)
+{
+ ofputil_decode_switch_config(oh, config);
+}
+
+enum ofperr
+ofputil_decode_set_config(const struct ofp_header *oh,
+ struct ofputil_switch_config *config)
+{
+ return (ofputil_decode_switch_config(oh, config)
+ ? 0
+ : OFPERR_OFPSCFC_BAD_FLAGS);
+}
+
+static struct ofpbuf *
+ofputil_put_switch_config(const struct ofputil_switch_config *config,
+ struct ofpbuf *b)
+{
+ const struct ofp_header *oh = b->data;
+ struct ofp_switch_config *osc = ofpbuf_put_zeros(b, sizeof *osc);
+ osc->flags = htons(config->frag);
+ if (config->invalid_ttl_to_controller > 0 && oh->version < OFP13_VERSION) {
+ osc->flags |= htons(OFPC_INVALID_TTL_TO_CONTROLLER);
+ }
+ osc->miss_send_len = htons(config->miss_send_len);
+ return b;
+}
+
+struct ofpbuf *
+ofputil_encode_get_config_reply(const struct ofp_header *request,
+ const struct ofputil_switch_config *config)
+{
+ struct ofpbuf *b = ofpraw_alloc_reply(OFPRAW_OFPT_GET_CONFIG_REPLY,
+ request, 0);
+ return ofputil_put_switch_config(config, b);
+}
+
+struct ofpbuf *
+ofputil_encode_set_config(const struct ofputil_switch_config *config,
+ enum ofp_version version)
+{
+ struct ofpbuf *b = ofpraw_alloc(OFPRAW_OFPT_SET_CONFIG, version, 0);
+ return ofputil_put_switch_config(config, b);
+}
+\f
+/* ofputil_switch_features */
+
+#define OFPC_COMMON (OFPC_FLOW_STATS | OFPC_TABLE_STATS | OFPC_PORT_STATS | \
+ OFPC_IP_REASM | OFPC_QUEUE_STATS)
+BUILD_ASSERT_DECL((int) OFPUTIL_C_FLOW_STATS == OFPC_FLOW_STATS);
+BUILD_ASSERT_DECL((int) OFPUTIL_C_TABLE_STATS == OFPC_TABLE_STATS);
+BUILD_ASSERT_DECL((int) OFPUTIL_C_PORT_STATS == OFPC_PORT_STATS);
+BUILD_ASSERT_DECL((int) OFPUTIL_C_IP_REASM == OFPC_IP_REASM);
+BUILD_ASSERT_DECL((int) OFPUTIL_C_QUEUE_STATS == OFPC_QUEUE_STATS);
+BUILD_ASSERT_DECL((int) OFPUTIL_C_ARP_MATCH_IP == OFPC_ARP_MATCH_IP);
+
+static uint32_t
+ofputil_capabilities_mask(enum ofp_version ofp_version)
+{
+ /* Handle capabilities whose bit is unique for all OpenFlow versions */
+ switch (ofp_version) {
+ case OFP10_VERSION:
+ case OFP11_VERSION:
+ return OFPC_COMMON | OFPC_ARP_MATCH_IP;
+ case OFP12_VERSION:
+ case OFP13_VERSION:
+ case OFP14_VERSION:
+ case OFP15_VERSION:
+ return OFPC_COMMON | OFPC12_PORT_BLOCKED;
+ default:
+ /* Caller needs to check osf->header.version itself */
+ return 0;
+ }
+}
+
+/* Decodes an OpenFlow 1.0 or 1.1 "switch_features" structure 'osf' into an
+ * abstract representation in '*features'. Initializes '*b' to iterate over
* the OpenFlow port structures following 'osf' with later calls to
* ofputil_pull_phy_port(). Returns 0 if successful, otherwise an
* OFPERR_* value. */
bool
ofputil_switch_features_has_ports(struct ofpbuf *b)
{
- struct ofp_header *oh = ofpbuf_data(b);
+ struct ofp_header *oh = b->data;
size_t phy_port_size;
if (oh->version >= OFP13_VERSION) {
/* The feature reply has no room for more ports. Probably the list is
* truncated. Drop the ports and tell the caller to retrieve them with
* OFPST_PORT_DESC. */
- ofpbuf_set_size(b, sizeof *oh + sizeof(struct ofp_switch_features));
+ b->size = sizeof *oh + sizeof(struct ofp_switch_features);
ofpmsg_update_length(b);
return false;
}
ofputil_put_switch_features_port(const struct ofputil_phy_port *pp,
struct ofpbuf *b)
{
- const struct ofp_header *oh = ofpbuf_data(b);
+ const struct ofp_header *oh = b->data;
if (oh->version < OFP13_VERSION) {
/* Try adding a port description to the message, but drop it again if
* the buffer overflows. (This possibility for overflow is why
* OpenFlow 1.3+ moved port descriptions into a multipart message.) */
- size_t start_ofs = ofpbuf_size(b);
+ size_t start_ofs = b->size;
ofputil_put_phy_port(oh->version, pp, b);
- if (ofpbuf_size(b) > UINT16_MAX) {
- ofpbuf_set_size(b, start_ofs);
+ if (b->size > UINT16_MAX) {
+ b->size = start_ofs;
}
}
}
parse_port_mod_ethernet_property(struct ofpbuf *property,
struct ofputil_port_mod *pm)
{
- struct ofp14_port_mod_prop_ethernet *eth = ofpbuf_data(property);
+ ovs_be32 advertise;
+ enum ofperr error;
- if (ofpbuf_size(property) != sizeof *eth) {
- return OFPERR_OFPBRC_BAD_LEN;
+ error = ofpprop_parse_be32(property, &advertise);
+ if (!error) {
+ pm->advertise = netdev_port_features_from_ofp11(advertise);
}
-
- pm->advertise = netdev_port_features_from_ofp11(eth->advertise);
- return 0;
+ return error;
}
/* Decodes the OpenFlow "port mod" message in '*oh' into an abstract form in
raw = ofpraw_pull_assert(&b);
if (raw == OFPRAW_OFPT10_PORT_MOD) {
- const struct ofp10_port_mod *opm = ofpbuf_data(&b);
+ const struct ofp10_port_mod *opm = b.data;
pm->port_no = u16_to_ofp(ntohs(opm->port_no));
- memcpy(pm->hw_addr, opm->hw_addr, ETH_ADDR_LEN);
+ pm->hw_addr = opm->hw_addr;
pm->config = ntohl(opm->config) & OFPPC10_ALL;
pm->mask = ntohl(opm->mask) & OFPPC10_ALL;
pm->advertise = netdev_port_features_from_ofp10(opm->advertise);
} else if (raw == OFPRAW_OFPT11_PORT_MOD) {
- const struct ofp11_port_mod *opm = ofpbuf_data(&b);
+ const struct ofp11_port_mod *opm = b.data;
enum ofperr error;
error = ofputil_port_from_ofp11(opm->port_no, &pm->port_no);
return error;
}
- memcpy(pm->hw_addr, opm->hw_addr, ETH_ADDR_LEN);
+ pm->hw_addr = opm->hw_addr;
pm->config = ntohl(opm->config) & OFPPC11_ALL;
pm->mask = ntohl(opm->mask) & OFPPC11_ALL;
pm->advertise = netdev_port_features_from_ofp11(opm->advertise);
return error;
}
- memcpy(pm->hw_addr, opm->hw_addr, ETH_ADDR_LEN);
+ pm->hw_addr = opm->hw_addr;
pm->config = ntohl(opm->config) & OFPPC11_ALL;
pm->mask = ntohl(opm->mask) & OFPPC11_ALL;
- while (ofpbuf_size(&b) > 0) {
+ while (b.size > 0) {
struct ofpbuf property;
enum ofperr error;
- uint16_t type;
+ uint64_t type;
- error = ofputil_pull_property(&b, &property, &type);
+ error = ofpprop_pull(&b, &property, &type);
if (error) {
return error;
}
break;
default:
- log_property(loose, "unknown port_mod property %"PRIu16, type);
- if (loose) {
- error = 0;
- } else if (type == OFPPMPT14_EXPERIMENTER) {
- error = OFPERR_OFPBPC_BAD_EXPERIMENTER;
- } else {
- error = OFPERR_OFPBRC_BAD_TYPE;
- }
+ error = OFPPROP_UNKNOWN(loose, "port_mod", type);
break;
}
b = ofpraw_alloc(OFPRAW_OFPT10_PORT_MOD, ofp_version, 0);
opm = ofpbuf_put_zeros(b, sizeof *opm);
opm->port_no = htons(ofp_to_u16(pm->port_no));
- memcpy(opm->hw_addr, pm->hw_addr, ETH_ADDR_LEN);
+ opm->hw_addr = pm->hw_addr;
opm->config = htonl(pm->config & OFPPC10_ALL);
opm->mask = htonl(pm->mask & OFPPC10_ALL);
opm->advertise = netdev_port_features_to_ofp10(pm->advertise);
b = ofpraw_alloc(OFPRAW_OFPT11_PORT_MOD, ofp_version, 0);
opm = ofpbuf_put_zeros(b, sizeof *opm);
opm->port_no = ofputil_port_to_ofp11(pm->port_no);
- memcpy(opm->hw_addr, pm->hw_addr, ETH_ADDR_LEN);
+ opm->hw_addr = pm->hw_addr;
opm->config = htonl(pm->config & OFPPC11_ALL);
opm->mask = htonl(pm->mask & OFPPC11_ALL);
opm->advertise = netdev_port_features_to_ofp11(pm->advertise);
}
case OFP14_VERSION:
case OFP15_VERSION: {
- struct ofp14_port_mod_prop_ethernet *eth;
struct ofp14_port_mod *opm;
- b = ofpraw_alloc(OFPRAW_OFPT14_PORT_MOD, ofp_version, sizeof *eth);
+ b = ofpraw_alloc(OFPRAW_OFPT14_PORT_MOD, ofp_version, 0);
opm = ofpbuf_put_zeros(b, sizeof *opm);
opm->port_no = ofputil_port_to_ofp11(pm->port_no);
- memcpy(opm->hw_addr, pm->hw_addr, ETH_ADDR_LEN);
+ opm->hw_addr = pm->hw_addr;
opm->config = htonl(pm->config & OFPPC11_ALL);
opm->mask = htonl(pm->mask & OFPPC11_ALL);
if (pm->advertise) {
- eth = ofpbuf_put_zeros(b, sizeof *eth);
- eth->type = htons(OFPPMPT14_ETHERNET);
- eth->length = htons(sizeof *eth);
- eth->advertise = netdev_port_features_to_ofp11(pm->advertise);
+ ofpprop_put_be32(b, OFPPMPT14_ETHERNET,
+ netdev_port_features_to_ofp11(pm->advertise));
}
break;
}
static enum ofperr
pull_table_feature_property(struct ofpbuf *msg, struct ofpbuf *payload,
- uint16_t *typep)
+ uint64_t *typep)
{
enum ofperr error;
- error = ofputil_pull_property(msg, payload, typep);
+ error = ofpprop_pull(msg, payload, typep);
if (payload && !error) {
- ofpbuf_pull(payload, sizeof(struct ofp_prop_header));
+ ofpbuf_pull(payload, (char *)payload->msg - (char *)payload->header);
}
return error;
}
{
uint32_t types = 0;
- while (ofpbuf_size(payload) > 0) {
- uint16_t type;
+ while (payload->size > 0) {
enum ofperr error;
+ uint64_t type;
- error = ofputil_pull_property__(payload, NULL, 1, &type);
+ error = ofpprop_pull__(payload, NULL, 1, 0x10000, &type);
if (error) {
return error;
}
parse_instruction_ids(struct ofpbuf *payload, bool loose, uint32_t *insts)
{
*insts = 0;
- while (ofpbuf_size(payload) > 0) {
+ while (payload->size > 0) {
enum ovs_instruction_type inst;
enum ofperr error;
- uint16_t ofpit;
+ uint64_t ofpit;
/* OF1.3 and OF1.4 aren't clear about padding in the instruction IDs.
* It seems clear that they aren't padded to 8 bytes, though, because
*
* Anyway, we just assume they're all glommed together on byte
* boundaries. */
- error = ofputil_pull_property__(payload, NULL, 1, &ofpit);
+ error = ofpprop_pull__(payload, NULL, 1, 0x10000, &ofpit);
if (error) {
return error;
}
size_t i;
memset(next_tables, 0, bitmap_n_bytes(255));
- for (i = 0; i < ofpbuf_size(payload); i++) {
- uint8_t id = ((const uint8_t *) ofpbuf_data(payload))[i];
+ for (i = 0; i < payload->size; i++) {
+ uint8_t id = ((const uint8_t *) payload->data)[i];
if (id >= 255) {
return OFPERR_OFPBPC_BAD_VALUE;
}
struct mf_bitmap exact = MF_BITMAP_INITIALIZER;
struct mf_bitmap masked = MF_BITMAP_INITIALIZER;
- while (ofpbuf_size(payload) > 0) {
+ while (payload->size > 0) {
const struct mf_field *field;
enum ofperr error;
bool hasmask;
memset(tf, 0, sizeof *tf);
- if (!msg->frame) {
+ if (!msg->header) {
ofpraw_pull_assert(msg);
}
- oh = ofpbuf_l2(msg);
+ oh = msg->header;
- if (!ofpbuf_size(msg)) {
+ if (!msg->size) {
return EOF;
}
- if (ofpbuf_size(msg) < sizeof *otf) {
+ if (msg->size < sizeof *otf) {
return OFPERR_OFPBPC_BAD_LEN;
}
- otf = ofpbuf_data(msg);
+ otf = msg->data;
len = ntohs(otf->length);
- if (len < sizeof *otf || len % 8 || len > ofpbuf_size(msg)) {
+ if (len < sizeof *otf || len % 8 || len > msg->size) {
return OFPERR_OFPBPC_BAD_LEN;
}
ofpbuf_use_const(&properties, ofpbuf_pull(msg, len), len);
ovs_strlcpy(tf->name, otf->name, OFP_MAX_TABLE_NAME_LEN);
tf->metadata_match = otf->metadata_match;
tf->metadata_write = otf->metadata_write;
- tf->miss_config = ofputil_table_miss_from_config(otf->config, oh->version);
+ tf->miss_config = OFPUTIL_TABLE_MISS_DEFAULT;
+ if (oh->version >= OFP14_VERSION) {
+ uint32_t caps = ntohl(otf->capabilities);
+ tf->supports_eviction = (caps & OFPTC14_EVICTION) != 0;
+ tf->supports_vacancy_events = (caps & OFPTC14_VACANCY_EVENTS) != 0;
+ } else {
+ tf->supports_eviction = -1;
+ tf->supports_vacancy_events = -1;
+ }
tf->max_entries = ntohl(otf->max_entries);
- while (ofpbuf_size(&properties) > 0) {
+ while (properties.size > 0) {
struct ofpbuf payload;
enum ofperr error;
- uint16_t type;
+ uint64_t type;
error = pull_table_feature_property(&properties, &payload, &type);
if (error) {
case OFPTFPT13_EXPERIMENTER:
case OFPTFPT13_EXPERIMENTER_MISS:
default:
- log_property(loose, "unknown table features property %"PRIu16,
- type);
- error = loose ? 0 : OFPERR_OFPBPC_BAD_TYPE;
+ error = OFPPROP_UNKNOWN(loose, "table features", type);
break;
}
if (error) {
size_t start_ofs;
int field;
- start_ofs = start_property(reply, property);
+ start_ofs = ofpprop_start(reply, property);
BITMAP_FOR_EACH_1 (field, MFF_N_IDS, fields->bm) {
nx_put_header(reply, field, version,
masks && bitmap_is_set(masks->bm, field));
}
- end_property(reply, start_ofs);
+ ofpprop_end(reply, start_ofs);
}
static void
enum ofp13_table_feature_prop_type set_fields_type,
int miss_offset, enum ofp_version version)
{
- size_t start_ofs;
-
- start_ofs = start_property(reply, actions_type + miss_offset);
- put_bitmap_properties(reply,
- ntohl(ofpact_bitmap_to_openflow(taf->ofpacts,
- version)));
- end_property(reply, start_ofs);
-
+ ofpprop_put_bitmap(reply, actions_type + miss_offset,
+ ntohl(ofpact_bitmap_to_openflow(taf->ofpacts,
+ version)));
put_fields_property(reply, &taf->set_fields, NULL,
set_fields_type + miss_offset, version);
}
size_t start_ofs;
uint8_t table_id;
- start_ofs = start_property(reply, OFPTFPT13_INSTRUCTIONS + miss_offset);
- put_bitmap_properties(reply,
- ntohl(ovsinst_bitmap_to_openflow(tif->instructions,
- version)));
- end_property(reply, start_ofs);
+ ofpprop_put_bitmap(reply, OFPTFPT13_INSTRUCTIONS + miss_offset,
+ ntohl(ovsinst_bitmap_to_openflow(tif->instructions,
+ version)));
- start_ofs = start_property(reply, OFPTFPT13_NEXT_TABLES + miss_offset);
+ start_ofs = ofpprop_start(reply, OFPTFPT13_NEXT_TABLES + miss_offset);
BITMAP_FOR_EACH_1 (table_id, 255, tif->next) {
ofpbuf_put(reply, &table_id, 1);
}
- end_property(reply, start_ofs);
+ ofpprop_end(reply, start_ofs);
put_table_action_features(reply, &tif->write,
OFPTFPT13_WRITE_ACTIONS,
{
struct ofpbuf *reply = ofpbuf_from_list(list_back(replies));
enum ofp_version version = ofpmp_version(replies);
- size_t start_ofs = ofpbuf_size(reply);
+ size_t start_ofs = reply->size;
struct ofp13_table_features *otf;
otf = ofpbuf_put_zeros(reply, sizeof *otf);
ovs_strlcpy(otf->name, tf->name, sizeof otf->name);
otf->metadata_match = tf->metadata_match;
otf->metadata_write = tf->metadata_write;
- otf->config = ofputil_table_miss_to_config(tf->miss_config, version);
+ if (version >= OFP14_VERSION) {
+ if (tf->supports_eviction) {
+ otf->capabilities |= htonl(OFPTC14_EVICTION);
+ }
+ if (tf->supports_vacancy_events) {
+ otf->capabilities |= htonl(OFPTC14_VACANCY_EVENTS);
+ }
+ }
otf->max_entries = htonl(tf->max_entries);
put_table_instruction_features(reply, &tf->nonmiss, 0, version);
OFPTFPT13_WILDCARDS, version);
otf = ofpbuf_at_assert(reply, start_ofs, sizeof *otf);
- otf->length = htons(ofpbuf_size(reply) - start_ofs);
+ otf->length = htons(reply->size - start_ofs);
ofpmp_postappend(replies, start_ofs);
}
-/* ofputil_table_mod */
+static enum ofperr
+parse_table_desc_vacancy_property(struct ofpbuf *property,
+ struct ofputil_table_desc *td)
+{
+ struct ofp14_table_mod_prop_vacancy *otv = property->data;
-/* Given 'config', taken from an OpenFlow 'version' message that specifies
- * table configuration (a table mod, table stats, or table features message),
- * returns the table miss configuration that it specifies. */
-static enum ofputil_table_miss
-ofputil_table_miss_from_config(ovs_be32 config_, enum ofp_version version)
+ if (property->size != sizeof *otv) {
+ return OFPERR_OFPBPC_BAD_LEN;
+ }
+
+ td->table_vacancy.vacancy_down = otv->vacancy_down;
+ td->table_vacancy.vacancy_up = otv->vacancy_up;
+ td->table_vacancy.vacancy = otv->vacancy;
+ return 0;
+}
+
+/* Decodes the next OpenFlow "table desc" message (of possibly several) from
+ * 'msg' into an abstract form in '*td'. Returns 0 if successful, EOF if the
+ * last "table desc" in 'msg' was already decoded, otherwise an OFPERR_*
+ * value. */
+int
+ofputil_decode_table_desc(struct ofpbuf *msg,
+ struct ofputil_table_desc *td,
+ enum ofp_version version)
{
- uint32_t config = ntohl(config_);
+ struct ofp14_table_desc *otd;
+ struct ofpbuf properties;
+ size_t length;
- if (version < OFP13_VERSION) {
- switch (config & OFPTC11_TABLE_MISS_MASK) {
- case OFPTC11_TABLE_MISS_CONTROLLER:
- return OFPUTIL_TABLE_MISS_CONTROLLER;
+ memset(td, 0, sizeof *td);
- case OFPTC11_TABLE_MISS_CONTINUE:
- return OFPUTIL_TABLE_MISS_CONTINUE;
+ if (!msg->header) {
+ ofpraw_pull_assert(msg);
+ }
- case OFPTC11_TABLE_MISS_DROP:
- return OFPUTIL_TABLE_MISS_DROP;
+ if (!msg->size) {
+ return EOF;
+ }
+
+ otd = ofpbuf_try_pull(msg, sizeof *otd);
+ if (!otd) {
+ VLOG_WARN_RL(&bad_ofmsg_rl, "OFP14_TABLE_DESC reply has %"PRIu32" "
+ "leftover bytes at end", msg->size);
+ return OFPERR_OFPBRC_BAD_LEN;
+ }
+
+ td->table_id = otd->table_id;
+ length = ntohs(otd->length);
+ if (length < sizeof *otd || length - sizeof *otd > msg->size) {
+ VLOG_WARN_RL(&bad_ofmsg_rl, "OFP14_TABLE_DESC reply claims invalid "
+ "length %"PRIuSIZE, length);
+ return OFPERR_OFPBRC_BAD_LEN;
+ }
+ length -= sizeof *otd;
+ ofpbuf_use_const(&properties, ofpbuf_pull(msg, length), length);
+
+ td->eviction = ofputil_decode_table_eviction(otd->config, version);
+ td->vacancy = ofputil_decode_table_vacancy(otd->config, version);
+ td->eviction_flags = UINT32_MAX;
+
+ while (properties.size > 0) {
+ struct ofpbuf payload;
+ enum ofperr error;
+ uint64_t type;
+
+ error = ofpprop_pull(&properties, &payload, &type);
+ if (error) {
+ return error;
+ }
+
+ switch (type) {
+ case OFPTMPT14_EVICTION:
+ error = ofpprop_parse_u32(&payload, &td->eviction_flags);
+ break;
+
+ case OFPTMPT14_VACANCY:
+ error = parse_table_desc_vacancy_property(&payload, td);
+ break;
default:
- VLOG_WARN_RL(&bad_ofmsg_rl, "bad table miss config %d", config);
- return OFPUTIL_TABLE_MISS_CONTROLLER;
+ error = OFPPROP_UNKNOWN(true, "table_desc", type);
+ break;
+ }
+
+ if (error) {
+ return error;
}
+ }
+
+ return 0;
+}
+
+/* Encodes and returns a request to obtain description of tables of a switch.
+ * The message is encoded for OpenFlow version 'ofp_version'. */
+struct ofpbuf *
+ofputil_encode_table_desc_request(enum ofp_version ofp_version)
+{
+ struct ofpbuf *request = NULL;
+
+ if (ofp_version >= OFP14_VERSION) {
+ request = ofpraw_alloc(OFPRAW_OFPST14_TABLE_DESC_REQUEST,
+ ofp_version, 0);
} else {
- return OFPUTIL_TABLE_MISS_DEFAULT;
+ ovs_fatal(0, "dump-table-desc needs OpenFlow 1.4 or later "
+ "(\'-O OpenFlow14\')");
}
+
+ return request;
}
-/* Given a table miss configuration, returns the corresponding OpenFlow table
- * configuration for use in an OpenFlow message of the given 'version'. */
-ovs_be32
-ofputil_table_miss_to_config(enum ofputil_table_miss miss,
- enum ofp_version version)
+/* Function to append Table desc information in a reply list. */
+void
+ofputil_append_table_desc_reply(const struct ofputil_table_desc *td,
+ struct ovs_list *replies,
+ enum ofp_version version)
+{
+ struct ofpbuf *reply = ofpbuf_from_list(list_back(replies));
+ size_t start_otd;
+ struct ofp14_table_desc *otd;
+
+ start_otd = reply->size;
+ ofpbuf_put_zeros(reply, sizeof *otd);
+ if (td->eviction_flags != UINT32_MAX) {
+ ofpprop_put_u32(reply, OFPTMPT14_EVICTION, td->eviction_flags);
+ }
+ if (td->vacancy == OFPUTIL_TABLE_VACANCY_ON) {
+ struct ofp14_table_mod_prop_vacancy *otv;
+
+ otv = ofpprop_put_zeros(reply, OFPTMPT14_VACANCY, sizeof *otv);
+ otv->vacancy_down = td->table_vacancy.vacancy_down;
+ otv->vacancy_up = td->table_vacancy.vacancy_up;
+ otv->vacancy = td->table_vacancy.vacancy;
+ }
+
+ otd = ofpbuf_at_assert(reply, start_otd, sizeof *otd);
+ otd->length = htons(reply->size - start_otd);
+ otd->table_id = td->table_id;
+ otd->config = ofputil_encode_table_config(OFPUTIL_TABLE_MISS_DEFAULT,
+ td->eviction, td->vacancy,
+ version);
+ ofpmp_postappend(replies, start_otd);
+}
+
+/* This function parses Vacancy property, and decodes the
+ * ofp14_table_mod_prop_vacancy in ofputil_table_mod.
+ * Returns OFPERR_OFPBPC_BAD_VALUE error code when vacancy_down is
+ * greater than vacancy_up and also when current vacancy has non-zero
+ * value. Returns 0 on success. */
+static enum ofperr
+parse_table_mod_vacancy_property(struct ofpbuf *property,
+ struct ofputil_table_mod *tm)
+{
+ struct ofp14_table_mod_prop_vacancy *otv = property->data;
+
+ if (property->size != sizeof *otv) {
+ return OFPERR_OFPBPC_BAD_LEN;
+ }
+ tm->table_vacancy.vacancy_down = otv->vacancy_down;
+ tm->table_vacancy.vacancy_up = otv->vacancy_up;
+ if (tm->table_vacancy.vacancy_down > tm->table_vacancy.vacancy_up) {
+ OFPPROP_LOG(&bad_ofmsg_rl, false,
+ "Value of vacancy_down is greater than vacancy_up");
+ return OFPERR_OFPBPC_BAD_VALUE;
+ }
+ if (tm->table_vacancy.vacancy_down > 100 ||
+ tm->table_vacancy.vacancy_up > 100) {
+ OFPPROP_LOG(&bad_ofmsg_rl, false, "Vacancy threshold percentage "
+ "should not be greater than 100");
+ return OFPERR_OFPBPC_BAD_VALUE;
+ }
+ tm->table_vacancy.vacancy = otv->vacancy;
+ if (tm->table_vacancy.vacancy) {
+ OFPPROP_LOG(&bad_ofmsg_rl, false,
+ "Vacancy value should be zero for table-mod messages");
+ return OFPERR_OFPBPC_BAD_VALUE;
+ }
+ return 0;
+}
+
+/* Given 'config', taken from an OpenFlow 'version' message that specifies
+ * table configuration (a table mod, table stats, or table features message),
+ * returns the table vacancy configuration that it specifies.
+ *
+ * Only OpenFlow 1.4 and later specify table vacancy configuration this way,
+ * so for other 'version' this function always returns
+ * OFPUTIL_TABLE_VACANCY_DEFAULT. */
+static enum ofputil_table_vacancy
+ofputil_decode_table_vacancy(ovs_be32 config, enum ofp_version version)
+{
+ return (version < OFP14_VERSION ? OFPUTIL_TABLE_VACANCY_DEFAULT
+ : config & htonl(OFPTC14_VACANCY_EVENTS) ? OFPUTIL_TABLE_VACANCY_ON
+ : OFPUTIL_TABLE_VACANCY_OFF);
+}
+
+/* Given 'config', taken from an OpenFlow 'version' message that specifies
+ * table configuration (a table mod, table stats, or table features message),
+ * returns the table eviction configuration that it specifies.
+ *
+ * Only OpenFlow 1.4 and later specify table eviction configuration this way,
+ * so for other 'version' values this function always returns
+ * OFPUTIL_TABLE_EVICTION_DEFAULT. */
+static enum ofputil_table_eviction
+ofputil_decode_table_eviction(ovs_be32 config, enum ofp_version version)
{
- if (version < OFP13_VERSION) {
+ return (version < OFP14_VERSION ? OFPUTIL_TABLE_EVICTION_DEFAULT
+ : config & htonl(OFPTC14_EVICTION) ? OFPUTIL_TABLE_EVICTION_ON
+ : OFPUTIL_TABLE_EVICTION_OFF);
+}
+
+/* Returns a bitmap of OFPTC* values suitable for 'config' fields in various
+ * OpenFlow messages of the given 'version', based on the provided 'miss' and
+ * 'eviction' values. */
+static ovs_be32
+ofputil_encode_table_config(enum ofputil_table_miss miss,
+ enum ofputil_table_eviction eviction,
+ enum ofputil_table_vacancy vacancy,
+ enum ofp_version version)
+{
+ uint32_t config = 0;
+ /* See the section "OFPTC_* Table Configuration" in DESIGN.md for more
+ * information on the crazy evolution of this field. */
+ switch (version) {
+ case OFP10_VERSION:
+ /* OpenFlow 1.0 didn't have such a field, any value ought to do. */
+ return htonl(0);
+
+ case OFP11_VERSION:
+ case OFP12_VERSION:
+ /* OpenFlow 1.1 and 1.2 define only OFPTC11_TABLE_MISS_*. */
switch (miss) {
- case OFPUTIL_TABLE_MISS_CONTROLLER:
case OFPUTIL_TABLE_MISS_DEFAULT:
+ /* Really this shouldn't be used for encoding (the caller should
+ * provide a specific value) but I can't imagine that defaulting to
+ * the fall-through case here will hurt. */
+ case OFPUTIL_TABLE_MISS_CONTROLLER:
+ default:
return htonl(OFPTC11_TABLE_MISS_CONTROLLER);
-
case OFPUTIL_TABLE_MISS_CONTINUE:
return htonl(OFPTC11_TABLE_MISS_CONTINUE);
-
case OFPUTIL_TABLE_MISS_DROP:
return htonl(OFPTC11_TABLE_MISS_DROP);
+ }
+ OVS_NOT_REACHED();
+
+ case OFP13_VERSION:
+ /* OpenFlow 1.3 removed OFPTC11_TABLE_MISS_* and didn't define any new
+ * flags, so this is correct. */
+ return htonl(0);
+
+ case OFP14_VERSION:
+ case OFP15_VERSION:
+ /* OpenFlow 1.4 introduced OFPTC14_EVICTION and
+ * OFPTC14_VACANCY_EVENTS. */
+ if (eviction == OFPUTIL_TABLE_EVICTION_ON) {
+ config |= OFPTC14_EVICTION;
+ }
+ if (vacancy == OFPUTIL_TABLE_VACANCY_ON) {
+ config |= OFPTC14_VACANCY_EVENTS;
+ }
+ return htonl(config);
+ }
+
+ OVS_NOT_REACHED();
+}
+
+/* Given 'config', taken from an OpenFlow 'version' message that specifies
+ * table configuration (a table mod, table stats, or table features message),
+ * returns the table miss configuration that it specifies.
+ *
+ * Only OpenFlow 1.1 and 1.2 specify table miss configurations this way, so for
+ * other 'version' values this function always returns
+ * OFPUTIL_TABLE_MISS_DEFAULT. */
+static enum ofputil_table_miss
+ofputil_decode_table_miss(ovs_be32 config_, enum ofp_version version)
+{
+ uint32_t config = ntohl(config_);
+
+ if (version == OFP11_VERSION || version == OFP12_VERSION) {
+ switch (config & OFPTC11_TABLE_MISS_MASK) {
+ case OFPTC11_TABLE_MISS_CONTROLLER:
+ return OFPUTIL_TABLE_MISS_CONTROLLER;
+
+ case OFPTC11_TABLE_MISS_CONTINUE:
+ return OFPUTIL_TABLE_MISS_CONTINUE;
+
+ case OFPTC11_TABLE_MISS_DROP:
+ return OFPUTIL_TABLE_MISS_DROP;
default:
- OVS_NOT_REACHED();
+ VLOG_WARN_RL(&bad_ofmsg_rl, "bad table miss config %d", config);
+ return OFPUTIL_TABLE_MISS_CONTROLLER;
}
} else {
- return htonl(0);
+ return OFPUTIL_TABLE_MISS_DEFAULT;
}
}
enum ofpraw raw;
struct ofpbuf b;
+ memset(pm, 0, sizeof *pm);
+ pm->miss = OFPUTIL_TABLE_MISS_DEFAULT;
+ pm->eviction = OFPUTIL_TABLE_EVICTION_DEFAULT;
+ pm->eviction_flags = UINT32_MAX;
+ pm->vacancy = OFPUTIL_TABLE_VACANCY_DEFAULT;
ofpbuf_use_const(&b, oh, ntohs(oh->length));
raw = ofpraw_pull_assert(&b);
if (raw == OFPRAW_OFPT11_TABLE_MOD) {
- const struct ofp11_table_mod *otm = ofpbuf_data(&b);
+ const struct ofp11_table_mod *otm = b.data;
pm->table_id = otm->table_id;
- pm->miss_config = ofputil_table_miss_from_config(otm->config,
- oh->version);
+ pm->miss = ofputil_decode_table_miss(otm->config, oh->version);
} else if (raw == OFPRAW_OFPT14_TABLE_MOD) {
const struct ofp14_table_mod *otm = ofpbuf_pull(&b, sizeof *otm);
pm->table_id = otm->table_id;
- pm->miss_config = ofputil_table_miss_from_config(otm->config,
- oh->version);
- /* We do not understand any properties yet, so we do not bother
- * parsing them. */
+ pm->miss = ofputil_decode_table_miss(otm->config, oh->version);
+ pm->eviction = ofputil_decode_table_eviction(otm->config, oh->version);
+ pm->vacancy = ofputil_decode_table_vacancy(otm->config, oh->version);
+ while (b.size > 0) {
+ struct ofpbuf property;
+ enum ofperr error;
+ uint64_t type;
+
+ error = ofpprop_pull(&b, &property, &type);
+ if (error) {
+ return error;
+ }
+
+ switch (type) {
+ case OFPTMPT14_EVICTION:
+ error = ofpprop_parse_u32(&property, &pm->eviction);
+ break;
+
+ case OFPTMPT14_VACANCY:
+ error = parse_table_mod_vacancy_property(&property, pm);
+ break;
+
+ default:
+ error = OFPERR_OFPBRC_BAD_TYPE;
+ break;
+ }
+
+ if (error) {
+ return error;
+ }
+ }
} else {
return OFPERR_OFPBRC_BAD_TYPE;
}
return 0;
}
-/* Converts the abstract form of a "table mod" message in '*pm' into an OpenFlow
- * message suitable for 'protocol', and returns that encoded form in a buffer
- * owned by the caller. */
+/* Converts the abstract form of a "table mod" message in '*tm' into an
+ * OpenFlow message suitable for 'protocol', and returns that encoded form in a
+ * buffer owned by the caller. */
struct ofpbuf *
-ofputil_encode_table_mod(const struct ofputil_table_mod *pm,
+ofputil_encode_table_mod(const struct ofputil_table_mod *tm,
enum ofputil_protocol protocol)
{
enum ofp_version ofp_version = ofputil_protocol_to_ofp_version(protocol);
b = ofpraw_alloc(OFPRAW_OFPT11_TABLE_MOD, ofp_version, 0);
otm = ofpbuf_put_zeros(b, sizeof *otm);
- otm->table_id = pm->table_id;
- otm->config = ofputil_table_miss_to_config(pm->miss_config,
- ofp_version);
+ otm->table_id = tm->table_id;
+ otm->config = ofputil_encode_table_config(tm->miss, tm->eviction,
+ tm->vacancy, ofp_version);
break;
}
case OFP14_VERSION:
b = ofpraw_alloc(OFPRAW_OFPT14_TABLE_MOD, ofp_version, 0);
otm = ofpbuf_put_zeros(b, sizeof *otm);
- otm->table_id = pm->table_id;
- otm->config = ofputil_table_miss_to_config(pm->miss_config,
- ofp_version);
+ otm->table_id = tm->table_id;
+ otm->config = ofputil_encode_table_config(tm->miss, tm->eviction,
+ tm->vacancy, ofp_version);
+
+ if (tm->eviction_flags != UINT32_MAX) {
+ ofpprop_put_u32(b, OFPTMPT14_EVICTION, tm->eviction_flags);
+ }
+ if (tm->vacancy == OFPUTIL_TABLE_VACANCY_ON) {
+ struct ofp14_table_mod_prop_vacancy *otv;
+
+ otv = ofpprop_put_zeros(b, OFPTMPT14_VACANCY, sizeof *otv);
+ otv->vacancy_down = tm->table_vacancy.vacancy_down;
+ otv->vacancy_up = tm->table_vacancy.vacancy_up;
+ }
break;
}
default:
if (raw == OFPRAW_OFPT12_ROLE_REQUEST ||
raw == OFPRAW_OFPT12_ROLE_REPLY) {
- const struct ofp12_role_request *orr = ofpbuf_l3(&b);
+ const struct ofp12_role_request *orr = b.msg;
if (orr->role != htonl(OFPCR12_ROLE_NOCHANGE) &&
orr->role != htonl(OFPCR12_ROLE_EQUAL) &&
}
} else if (raw == OFPRAW_NXT_ROLE_REQUEST ||
raw == OFPRAW_NXT_ROLE_REPLY) {
- const struct nx_role_request *nrr = ofpbuf_l3(&b);
+ const struct nx_role_request *nrr = b.msg;
BUILD_ASSERT(NX_ROLE_OTHER + 1 == OFPCR12_ROLE_EQUAL);
BUILD_ASSERT(NX_ROLE_MASTER + 1 == OFPCR12_ROLE_MASTER);
raw = ofpraw_pull_assert(&b);
ovs_assert(raw == OFPRAW_OFPT14_ROLE_STATUS);
- r = ofpbuf_l3(&b);
+ r = b.msg;
if (r->role != htonl(OFPCR12_ROLE_NOCHANGE) &&
r->role != htonl(OFPCR12_ROLE_EQUAL) &&
r->role != htonl(OFPCR12_ROLE_MASTER) &&
return 0;
}
-/* Table stats. */
+/* Encodes 'rf' according to 'protocol', and returns the encoded message.
+ * 'protocol' must be for OpenFlow 1.4 or later. */
+struct ofpbuf *
+ofputil_encode_requestforward(const struct ofputil_requestforward *rf,
+ enum ofputil_protocol protocol)
+{
+ enum ofp_version ofp_version = ofputil_protocol_to_ofp_version(protocol);
+ struct ofpbuf *inner;
+
+ switch (rf->reason) {
+ case OFPRFR_GROUP_MOD:
+ inner = ofputil_encode_group_mod(ofp_version, rf->group_mod);
+ break;
+
+ case OFPRFR_METER_MOD:
+ inner = ofputil_encode_meter_mod(ofp_version, rf->meter_mod);
+ break;
+
+ case OFPRFR_N_REASONS:
+ default:
+ OVS_NOT_REACHED();
+ }
+
+ struct ofp_header *inner_oh = inner->data;
+ inner_oh->xid = rf->xid;
+ inner_oh->length = htons(inner->size);
+
+ struct ofpbuf *outer = ofpraw_alloc_xid(OFPRAW_OFPT14_REQUESTFORWARD,
+ ofp_version, htonl(0),
+ inner->size);
+ ofpbuf_put(outer, inner->data, inner->size);
+ ofpbuf_delete(inner);
+
+ return outer;
+}
+
+/* Decodes OFPT_REQUESTFORWARD message 'outer'. On success, puts the decoded
+ * form into '*rf' and returns 0, and the caller is later responsible for
+ * freeing the content of 'rf', with ofputil_destroy_requestforward(rf). On
+ * failure, returns an ofperr and '*rf' is indeterminate. */
+enum ofperr
+ofputil_decode_requestforward(const struct ofp_header *outer,
+ struct ofputil_requestforward *rf)
+{
+ struct ofpbuf b;
+ enum ofperr error;
+
+ ofpbuf_use_const(&b, outer, ntohs(outer->length));
+
+ /* Skip past outer message. */
+ enum ofpraw outer_raw = ofpraw_pull_assert(&b);
+ ovs_assert(outer_raw == OFPRAW_OFPT14_REQUESTFORWARD);
+
+ /* Validate inner message. */
+ if (b.size < sizeof(struct ofp_header)) {
+ return OFPERR_OFPBFC_MSG_BAD_LEN;
+ }
+ const struct ofp_header *inner = b.data;
+ unsigned int inner_len = ntohs(inner->length);
+ if (inner_len < sizeof(struct ofp_header) || inner_len > b.size) {
+ return OFPERR_OFPBFC_MSG_BAD_LEN;
+ }
+ if (inner->version != outer->version) {
+ return OFPERR_OFPBRC_BAD_VERSION;
+ }
+
+ /* Parse inner message. */
+ enum ofptype type;
+ error = ofptype_decode(&type, inner);
+ if (error) {
+ return error;
+ }
+
+ rf->xid = inner->xid;
+ if (type == OFPTYPE_GROUP_MOD) {
+ rf->reason = OFPRFR_GROUP_MOD;
+ rf->group_mod = xmalloc(sizeof *rf->group_mod);
+ error = ofputil_decode_group_mod(inner, rf->group_mod);
+ if (error) {
+ free(rf->group_mod);
+ return error;
+ }
+ } else if (type == OFPTYPE_METER_MOD) {
+ rf->reason = OFPRFR_METER_MOD;
+ rf->meter_mod = xmalloc(sizeof *rf->meter_mod);
+ ofpbuf_init(&rf->bands, 64);
+ error = ofputil_decode_meter_mod(inner, rf->meter_mod, &rf->bands);
+ if (error) {
+ free(rf->meter_mod);
+ ofpbuf_uninit(&rf->bands);
+ return error;
+ }
+ } else {
+ return OFPERR_OFPBFC_MSG_UNSUP;
+ }
+
+ return 0;
+}
+
+/* Frees the content of 'rf', which should have been initialized through a
+ * successful call to ofputil_decode_requestforward(). */
+void
+ofputil_destroy_requestforward(struct ofputil_requestforward *rf)
+{
+ if (!rf) {
+ return;
+ }
+
+ switch (rf->reason) {
+ case OFPRFR_GROUP_MOD:
+ ofputil_uninit_group_mod(rf->group_mod);
+ free(rf->group_mod);
+ break;
+
+ case OFPRFR_METER_MOD:
+ ofpbuf_uninit(&rf->bands);
+ free(rf->meter_mod);
+ break;
+
+ case OFPRFR_N_REASONS:
+ OVS_NOT_REACHED();
+ }
+}
+
+/* Table stats. */
/* OpenFlow 1.0 and 1.1 don't distinguish between a field that cannot be
* matched and a field that must be wildcarded. This function returns a bitmap
out->metadata_write = features->metadata_write;
out->instructions = ovsinst_bitmap_to_openflow(
features->nonmiss.instructions, OFP12_VERSION);
- out->config = ofputil_table_miss_to_config(features->miss_config,
- OFP12_VERSION);
+ out->config = ofputil_encode_table_config(features->miss_config,
+ OFPUTIL_TABLE_EVICTION_DEFAULT,
+ OFPUTIL_TABLE_VACANCY_DEFAULT,
+ OFP12_VERSION);
out->max_entries = htonl(features->max_entries);
out->active_count = htonl(stats->active_count);
out->lookup_count = htonll(stats->lookup_count);
const struct ofputil_table_stats *stats,
const struct ofputil_table_features *features)
{
- struct ofp_header *oh = ofpbuf_l2(reply);
+ struct ofp_header *oh = reply->header;
ovs_assert(stats->table_id == features->table_id);
features->nonmiss.apply.ofpacts = ofpact_bitmap_from_openflow(
ots->write_actions, OFP11_VERSION);
features->miss = features->nonmiss;
- features->miss_config = ofputil_table_miss_from_config(ots->config,
- OFP11_VERSION);
+ features->miss_config = ofputil_decode_table_miss(ots->config,
+ OFP11_VERSION);
features->match = mf_bitmap_from_of11(ots->match);
features->wildcard = mf_bitmap_from_of11(ots->wildcards);
bitmap_or(features->match.bm, features->wildcard.bm, MFF_N_IDS);
ovs_strlcpy(features->name, ots->name, sizeof features->name);
features->metadata_match = ots->metadata_match;
features->metadata_write = ots->metadata_write;
- features->miss_config = ofputil_table_miss_from_config(ots->config,
- OFP12_VERSION);
+ features->miss_config = ofputil_decode_table_miss(ots->config,
+ OFP12_VERSION);
features->max_entries = ntohl(ots->max_entries);
features->nonmiss.instructions = ovsinst_bitmap_from_openflow(
{
const struct ofp_header *oh;
- if (!msg->frame) {
+ if (!msg->header) {
ofpraw_pull_assert(msg);
}
- oh = msg->frame;
+ oh = msg->header;
- if (!ofpbuf_size(msg)) {
+ if (!msg->size) {
return EOF;
}
memset(stats, 0, sizeof *stats);
memset(features, 0, sizeof *features);
+ features->supports_eviction = -1;
+ features->supports_vacancy_events = -1;
switch ((enum ofp_version) oh->version) {
case OFP10_VERSION:
struct nx_flow_monitor_request *nfmr;
uint16_t flags;
- if (!msg->frame) {
+ if (!msg->header) {
ofpraw_pull_assert(msg);
}
- if (!ofpbuf_size(msg)) {
+ if (!msg->size) {
return EOF;
}
nfmr = ofpbuf_try_pull(msg, sizeof *nfmr);
if (!nfmr) {
VLOG_WARN_RL(&bad_ofmsg_rl, "NXST_FLOW_MONITOR request has %"PRIu32" "
- "leftover bytes at end", ofpbuf_size(msg));
+ "leftover bytes at end", msg->size);
return OFPERR_OFPBRC_BAD_LEN;
}
size_t start_ofs;
int match_len;
- if (!ofpbuf_size(msg)) {
+ if (!msg->size) {
ofpraw_put(OFPRAW_NXST_FLOW_MONITOR_REQUEST, OFP10_VERSION, msg);
}
- start_ofs = ofpbuf_size(msg);
+ start_ofs = msg->size;
ofpbuf_put_zeros(msg, sizeof *nfmr);
match_len = nx_put_match(msg, &rq->match, htonll(0), htonll(0));
unsigned int length;
struct ofp_header *oh;
- if (!msg->frame) {
+ if (!msg->header) {
ofpraw_pull_assert(msg);
}
- if (!ofpbuf_size(msg)) {
+ ofpbuf_clear(ofpacts);
+ if (!msg->size) {
return EOF;
}
- if (ofpbuf_size(msg) < sizeof(struct nx_flow_update_header)) {
+ if (msg->size < sizeof(struct nx_flow_update_header)) {
goto bad_len;
}
- oh = msg->frame;
+ oh = msg->header;
- nfuh = ofpbuf_data(msg);
+ nfuh = msg->data;
update->event = ntohs(nfuh->event);
length = ntohs(nfuh->length);
- if (length > ofpbuf_size(msg) || length % 8) {
+ if (length > msg->size || length % 8) {
goto bad_len;
}
return error;
}
- update->ofpacts = ofpbuf_data(ofpacts);
- update->ofpacts_len = ofpbuf_size(ofpacts);
+ update->ofpacts = ofpacts->data;
+ update->ofpacts_len = ofpacts->size;
return 0;
} else {
VLOG_WARN_RL(&bad_ofmsg_rl,
bad_len:
VLOG_WARN_RL(&bad_ofmsg_rl, "NXST_FLOW_MONITOR reply has %"PRIu32" "
- "leftover bytes at end", ofpbuf_size(msg));
+ "leftover bytes at end", msg->size);
return OFPERR_OFPBRC_BAD_LEN;
}
size_t start_ofs;
msg = ofpbuf_from_list(list_back(replies));
- start_ofs = ofpbuf_size(msg);
+ start_ofs = msg->size;
if (update->event == NXFME_ABBREV) {
struct nx_flow_update_abbrev *nfua;
}
nfuh = ofpbuf_at_assert(msg, start_ofs, sizeof *nfuh);
- nfuh->length = htons(ofpbuf_size(msg) - start_ofs);
+ nfuh->length = htons(msg->size - start_ofs);
nfuh->event = htons(update->event);
ofpmp_postappend(replies, start_ofs);
msg = ofpraw_alloc(OFPRAW_OFPT10_PACKET_OUT, OFP10_VERSION, size);
ofpbuf_put_zeros(msg, sizeof *opo);
- actions_ofs = ofpbuf_size(msg);
+ actions_ofs = msg->size;
ofpacts_put_openflow_actions(po->ofpacts, po->ofpacts_len, msg,
ofp_version);
- opo = ofpbuf_l3(msg);
+ opo = msg->msg;
opo->buffer_id = htonl(po->buffer_id);
opo->in_port = htons(ofp_to_u16(po->in_port));
- opo->actions_len = htons(ofpbuf_size(msg) - actions_ofs);
+ opo->actions_len = htons(msg->size - actions_ofs);
break;
}
ofpbuf_put_zeros(msg, sizeof *opo);
len = ofpacts_put_openflow_actions(po->ofpacts, po->ofpacts_len, msg,
ofp_version);
- opo = ofpbuf_l3(msg);
+ opo = msg->msg;
opo->buffer_id = htonl(po->buffer_id);
opo->in_port = ofputil_port_to_ofp11(po->in_port);
opo->actions_len = htons(len);
ofpbuf_use_const(&rq_buf, rq, ntohs(rq->length));
ofpraw_pull_assert(&rq_buf);
- reply = ofpraw_alloc_reply(OFPRAW_OFPT_ECHO_REPLY, rq, ofpbuf_size(&rq_buf));
- ofpbuf_put(reply, ofpbuf_data(&rq_buf), ofpbuf_size(&rq_buf));
+ reply = ofpraw_alloc_reply(OFPRAW_OFPT_ECHO_REPLY, rq, rq_buf.size);
+ ofpbuf_put(reply, rq_buf.data, rq_buf.size);
return reply;
}
}
const char *
-ofputil_frag_handling_to_string(enum ofp_config_flags flags)
+ofputil_frag_handling_to_string(enum ofputil_frag_handling frag)
{
- switch (flags & OFPC_FRAG_MASK) {
- case OFPC_FRAG_NORMAL: return "normal";
- case OFPC_FRAG_DROP: return "drop";
- case OFPC_FRAG_REASM: return "reassemble";
- case OFPC_FRAG_NX_MATCH: return "nx-match";
+ switch (frag) {
+ case OFPUTIL_FRAG_NORMAL: return "normal";
+ case OFPUTIL_FRAG_DROP: return "drop";
+ case OFPUTIL_FRAG_REASM: return "reassemble";
+ case OFPUTIL_FRAG_NX_MATCH: return "nx-match";
}
OVS_NOT_REACHED();
}
bool
-ofputil_frag_handling_from_string(const char *s, enum ofp_config_flags *flags)
+ofputil_frag_handling_from_string(const char *s,
+ enum ofputil_frag_handling *frag)
{
if (!strcasecmp(s, "normal")) {
- *flags = OFPC_FRAG_NORMAL;
+ *frag = OFPUTIL_FRAG_NORMAL;
} else if (!strcasecmp(s, "drop")) {
- *flags = OFPC_FRAG_DROP;
+ *frag = OFPUTIL_FRAG_DROP;
} else if (!strcasecmp(s, "reassemble")) {
- *flags = OFPC_FRAG_REASM;
+ *frag = OFPUTIL_FRAG_REASM;
} else if (!strcasecmp(s, "nx-match")) {
- *flags = OFPC_FRAG_NX_MATCH;
+ *frag = OFPUTIL_FRAG_NX_MATCH;
} else {
return false;
}
ofputil_group_from_string(const char *s, uint32_t *group_idp)
{
if (!strcasecmp(s, "any")) {
- *group_idp = OFPG11_ANY;
+ *group_idp = OFPG_ANY;
} else if (!strcasecmp(s, "all")) {
- *group_idp = OFPG11_ALL;
+ *group_idp = OFPG_ALL;
} else if (!str_to_uint(s, 10, group_idp)) {
VLOG_WARN("%s is not a valid group ID. (Valid group IDs are "
"32-bit nonnegative integers or the keywords ANY or "
/* Appends to 's' a string representation of the OpenFlow group ID 'group_id'.
* Most groups' string representation is just the number, but for special
- * groups, e.g. OFPG11_ALL, it is the name, e.g. "ALL". */
+ * groups, e.g. OFPG_ALL, it is the name, e.g. "ALL". */
void
ofputil_format_group(uint32_t group_id, struct ds *s)
{
/* Puts in the 'bufsize' byte in 'namebuf' a null-terminated string
* representation of OpenFlow group ID 'group_id'. Most group are represented
- * as just their number, but special groups, e.g. OFPG11_ALL, are represented
+ * as just their number, but special groups, e.g. OFPG_ALL, are represented
* by name, e.g. "ALL". */
void
ofputil_group_to_string(uint32_t group_id,
char namebuf[MAX_GROUP_NAME_LEN + 1], size_t bufsize)
{
switch (group_id) {
- case OFPG11_ALL:
+ case OFPG_ALL:
ovs_strlcpy(namebuf, "ALL", bufsize);
break;
- case OFPG11_ANY:
+ case OFPG_ANY:
ovs_strlcpy(namebuf, "ANY", bufsize);
break;
}
case OFP14_VERSION:
case OFP15_VERSION:
- return ofpbuf_size(b) ? ofputil_pull_ofp14_port(pp, b) : EOF;
+ return b->size ? ofputil_pull_ofp14_port(pp, b) : EOF;
default:
OVS_NOT_REACHED();
}
wc.masks.nw_ttl = 0;
}
if (!(may_match & MAY_ARP_SHA)) {
- memset(wc.masks.arp_sha, 0, ETH_ADDR_LEN);
+ WC_UNMASK_FIELD(&wc, arp_sha);
}
if (!(may_match & MAY_ARP_THA)) {
- memset(wc.masks.arp_tha, 0, ETH_ADDR_LEN);
+ WC_UNMASK_FIELD(&wc, arp_tha);
}
if (!(may_match & MAY_IPV6)) {
wc.masks.ipv6_src = wc.masks.ipv6_dst = in6addr_any;
ps14->rx_errors = htonll(ops->stats.rx_errors);
ps14->tx_errors = htonll(ops->stats.tx_errors);
- eth = ofpbuf_put_uninit(reply, sizeof *eth);
- eth->type = htons(OFPPSPT14_ETHERNET);
- eth->length = htons(sizeof *eth);
- memset(eth->pad, 0, sizeof eth->pad);
+ eth = ofpprop_put_zeros(reply, OFPPSPT14_ETHERNET, sizeof *eth);
eth->rx_frame_err = htonll(ops->stats.rx_frame_errors);
eth->rx_over_err = htonll(ops->stats.rx_over_errors);
eth->rx_crc_err = htonll(ops->stats.rx_crc_errors);
parse_ofp14_port_stats_ethernet_property(const struct ofpbuf *payload,
struct ofputil_port_stats *ops)
{
- const struct ofp14_port_stats_prop_ethernet *eth = ofpbuf_data(payload);
+ const struct ofp14_port_stats_prop_ethernet *eth = payload->data;
- if (ofpbuf_size(payload) != sizeof *eth) {
+ if (payload->size != sizeof *eth) {
return OFPERR_OFPBPC_BAD_LEN;
}
}
len = ntohs(ps14->length);
- if (len < sizeof *ps14 || len - sizeof *ps14 > ofpbuf_size(msg)) {
+ if (len < sizeof *ps14 || len - sizeof *ps14 > msg->size) {
return OFPERR_OFPBRC_BAD_LEN;
}
len -= sizeof *ps14;
ops->stats.rx_crc_errors = UINT64_MAX;
ops->stats.collisions = UINT64_MAX;
- while (ofpbuf_size(&properties) > 0) {
+ while (properties.size > 0) {
struct ofpbuf payload;
enum ofperr error;
- uint16_t type;
+ uint64_t type;
- error = ofputil_pull_property(&properties, &payload, &type);
+ error = ofpprop_pull(&properties, &payload, &type);
if (error) {
return error;
}
break;
default:
- log_property(true, "unknown port stats property %"PRIu16, type);
- error = 0;
+ error = OFPPROP_UNKNOWN(true, "port stats", type);
break;
}
enum ofperr error;
enum ofpraw raw;
- error = (msg->frame
- ? ofpraw_decode(&raw, msg->frame)
+ error = (msg->header ? ofpraw_decode(&raw, msg->header)
: ofpraw_pull(&raw, msg));
if (error) {
return error;
}
- if (!ofpbuf_size(msg)) {
+ if (!msg->size) {
return EOF;
} else if (raw == OFPRAW_OFPST14_PORT_REPLY) {
return ofputil_pull_ofp14_port_stats(ps, msg);
bad_len:
VLOG_WARN_RL(&bad_ofmsg_rl, "OFPST_PORT reply has %"PRIu32" leftover "
- "bytes at end", ofpbuf_size(msg));
+ "bytes at end", msg->size);
return OFPERR_OFPBRC_BAD_LEN;
}
void
ofputil_bucket_list_destroy(struct ovs_list *buckets)
{
- struct ofputil_bucket *bucket, *next_bucket;
+ struct ofputil_bucket *bucket;
- LIST_FOR_EACH_SAFE (bucket, next_bucket, list_node, buckets) {
- list_remove(&bucket->list_node);
+ LIST_FOR_EACH_POP (bucket, list_node, buckets) {
free(bucket->ofpacts);
free(bucket);
}
return request;
}
+void
+ofputil_uninit_group_desc(struct ofputil_group_desc *gd)
+{
+ ofputil_bucket_list_destroy(&gd->buckets);
+ free(&gd->props.fields);
+}
+
/* Decodes the OpenFlow group description request in 'oh', returning the group
* whose description is requested, or OFPG_ALL if stats for all groups was
* requested. */
uint32_t group_id)
{
struct ofpbuf *request;
- ovs_be32 gid;
switch (ofp_version) {
case OFP10_VERSION:
request = ofpraw_alloc(OFPRAW_OFPST11_GROUP_DESC_REQUEST,
ofp_version, 0);
break;
- case OFP15_VERSION:
+ case OFP15_VERSION:{
+ struct ofp15_group_desc_request *req;
request = ofpraw_alloc(OFPRAW_OFPST15_GROUP_DESC_REQUEST,
ofp_version, 0);
- gid = htonl(group_id);
- ofpbuf_put(request, &gid, sizeof gid);
+ req = ofpbuf_put_zeros(request, sizeof *req);
+ req->group_id = htonl(group_id);
break;
+ }
default:
OVS_NOT_REACHED();
}
size_t i;
gs->bucket_stats = NULL;
- error = (msg->frame
- ? ofpraw_decode(&raw, msg->frame)
+ error = (msg->header ? ofpraw_decode(&raw, msg->header)
: ofpraw_pull(&raw, msg));
if (error) {
return error;
}
- if (!ofpbuf_size(msg)) {
+ if (!msg->size) {
return EOF;
}
if (!ogs11) {
VLOG_WARN_RL(&bad_ofmsg_rl, "%s reply has %"PRIu32" leftover bytes at end",
- ofpraw_get_name(raw), ofpbuf_size(msg));
+ ofpraw_get_name(raw), msg->size);
return OFPERR_OFPBRC_BAD_LEN;
}
length = ntohs(ogs11->length);
obc = ofpbuf_try_pull(msg, gs->n_buckets * sizeof *obc);
if (!obc) {
VLOG_WARN_RL(&bad_ofmsg_rl, "%s reply has %"PRIu32" leftover bytes at end",
- ofpraw_get_name(raw), ofpbuf_size(msg));
+ ofpraw_get_name(raw), msg->size);
return OFPERR_OFPBRC_BAD_LEN;
}
struct ofp11_bucket *ob;
size_t start;
- start = ofpbuf_size(openflow);
+ start = openflow->size;
ofpbuf_put_zeros(openflow, sizeof *ob);
ofpacts_put_openflow_actions(bucket->ofpacts, bucket->ofpacts_len,
openflow, ofp_version);
ob = ofpbuf_at_assert(openflow, start, sizeof *ob);
- ob->len = htons(ofpbuf_size(openflow) - start);
+ ob->len = htons(openflow->size - start);
ob->weight = htons(bucket->weight);
ob->watch_port = ofputil_port_to_ofp11(bucket->watch_port);
ob->watch_group = htonl(bucket->watch_group);
}
-static void
-ofputil_put_ofp15_group_bucket_prop_weight(ovs_be16 weight,
- struct ofpbuf *openflow)
-{
- size_t start_ofs;
- struct ofp15_group_bucket_prop_weight *prop;
-
- start_ofs = start_property(openflow, OFPGBPT15_WEIGHT);
- ofpbuf_put_zeros(openflow, sizeof *prop - sizeof(struct ofp_prop_header));
- prop = ofpbuf_at_assert(openflow, start_ofs, sizeof *prop);
- prop->weight = weight;
- end_property(openflow, start_ofs);
-}
-
-static void
-ofputil_put_ofp15_group_bucket_prop_watch(ovs_be32 watch, uint16_t type,
- struct ofpbuf *openflow)
-{
- size_t start_ofs;
- struct ofp15_group_bucket_prop_watch *prop;
-
- start_ofs = start_property(openflow, type);
- ofpbuf_put_zeros(openflow, sizeof *prop - sizeof(struct ofp_prop_header));
- prop = ofpbuf_at_assert(openflow, start_ofs, sizeof *prop);
- prop->watch = watch;
- end_property(openflow, start_ofs);
-}
-
static void
ofputil_put_ofp15_bucket(const struct ofputil_bucket *bucket,
uint32_t bucket_id, enum ofp11_group_type group_type,
struct ofp15_bucket *ob;
size_t start, actions_start, actions_len;
- start = ofpbuf_size(openflow);
+ start = openflow->size;
ofpbuf_put_zeros(openflow, sizeof *ob);
- actions_start = ofpbuf_size(openflow);
+ actions_start = openflow->size;
ofpacts_put_openflow_actions(bucket->ofpacts, bucket->ofpacts_len,
openflow, ofp_version);
- actions_len = ofpbuf_size(openflow) - actions_start;
+ actions_len = openflow->size - actions_start;
if (group_type == OFPGT11_SELECT) {
- ofputil_put_ofp15_group_bucket_prop_weight(htons(bucket->weight),
- openflow);
+ ofpprop_put_u16(openflow, OFPGBPT15_WEIGHT, bucket->weight);
}
if (bucket->watch_port != OFPP_ANY) {
- ovs_be32 port = ofputil_port_to_ofp11(bucket->watch_port);
- ofputil_put_ofp15_group_bucket_prop_watch(port,
- OFPGBPT15_WATCH_PORT,
- openflow);
+ ofpprop_put_be32(openflow, OFPGBPT15_WATCH_PORT,
+ ofputil_port_to_ofp11(bucket->watch_port));
}
if (bucket->watch_group != OFPG_ANY) {
- ovs_be32 group = htonl(bucket->watch_group);
- ofputil_put_ofp15_group_bucket_prop_watch(group,
- OFPGBPT15_WATCH_GROUP,
- openflow);
+ ofpprop_put_u32(openflow, OFPGBPT15_WATCH_GROUP, bucket->watch_group);
}
ob = ofpbuf_at_assert(openflow, start, sizeof *ob);
- ob->len = htons(ofpbuf_size(openflow) - start);
+ ob->len = htons(openflow->size - start);
ob->action_array_len = htons(actions_len);
ob->bucket_id = htonl(bucket_id);
}
+static void
+ofputil_put_group_prop_ntr_selection_method(enum ofp_version ofp_version,
+ const struct ofputil_group_props *gp,
+ struct ofpbuf *openflow)
+{
+ struct ntr_group_prop_selection_method *prop;
+ size_t start;
+
+ start = openflow->size;
+ ofpbuf_put_zeros(openflow, sizeof *prop);
+ oxm_put_field_array(openflow, &gp->fields, ofp_version);
+ prop = ofpbuf_at_assert(openflow, start, sizeof *prop);
+ prop->type = htons(OFPGPT15_EXPERIMENTER);
+ prop->experimenter = htonl(NTR_VENDOR_ID);
+ prop->exp_type = htonl(NTRT_SELECTION_METHOD);
+ strcpy(prop->selection_method, gp->selection_method);
+ prop->selection_method_param = htonll(gp->selection_method_param);
+ ofpprop_end(openflow, start);
+}
+
static void
ofputil_append_ofp11_group_desc_reply(const struct ofputil_group_desc *gds,
- struct ovs_list *buckets,
+ const struct ovs_list *buckets,
struct ovs_list *replies,
enum ofp_version version)
{
struct ofputil_bucket *bucket;
size_t start_ogds;
- start_ogds = ofpbuf_size(reply);
+ start_ogds = reply->size;
ofpbuf_put_zeros(reply, sizeof *ogds);
LIST_FOR_EACH (bucket, list_node, buckets) {
ofputil_put_ofp11_bucket(bucket, reply, version);
}
ogds = ofpbuf_at_assert(reply, start_ogds, sizeof *ogds);
- ogds->length = htons(ofpbuf_size(reply) - start_ogds);
+ ogds->length = htons(reply->size - start_ogds);
ogds->type = gds->type;
ogds->group_id = htonl(gds->group_id);
static void
ofputil_append_ofp15_group_desc_reply(const struct ofputil_group_desc *gds,
- struct ovs_list *buckets,
+ const struct ovs_list *buckets,
struct ovs_list *replies,
enum ofp_version version)
{
struct ofputil_bucket *bucket;
size_t start_ogds, start_buckets;
- start_ogds = ofpbuf_size(reply);
+ start_ogds = reply->size;
ofpbuf_put_zeros(reply, sizeof *ogds);
- start_buckets = ofpbuf_size(reply);
+ start_buckets = reply->size;
LIST_FOR_EACH (bucket, list_node, buckets) {
ofputil_put_ofp15_bucket(bucket, bucket->bucket_id,
gds->type, reply, version);
}
ogds = ofpbuf_at_assert(reply, start_ogds, sizeof *ogds);
- ogds->length = htons(ofpbuf_size(reply) - start_ogds);
ogds->type = gds->type;
ogds->group_id = htonl(gds->group_id);
- ogds->bucket_list_len = htons(ofpbuf_size(reply) - start_buckets);
+ ogds->bucket_list_len = htons(reply->size - start_buckets);
+
+ /* Add group properties */
+ if (gds->props.selection_method[0]) {
+ ofputil_put_group_prop_ntr_selection_method(version, &gds->props,
+ reply);
+ }
+ ogds->length = htons(reply->size - start_ogds);
ofpmp_postappend(replies, start_ogds);
}
* initialized with ofpmp_init(). */
void
ofputil_append_group_desc_reply(const struct ofputil_group_desc *gds,
- struct ovs_list *buckets,
+ const struct ovs_list *buckets,
struct ovs_list *replies)
{
enum ofp_version version = ofpmp_version(replies);
bucket->bucket_id = bucket_id++;
bucket->ofpacts = ofpbuf_steal_data(&ofpacts);
- bucket->ofpacts_len = ofpbuf_size(&ofpacts);
+ bucket->ofpacts_len = ofpacts.size;
list_push_back(buckets, &bucket->list_node);
}
return 0;
}
-static enum ofperr
-parse_ofp15_group_bucket_prop_weight(const struct ofpbuf *payload,
- ovs_be16 *weight)
-{
- struct ofp15_group_bucket_prop_weight *prop = ofpbuf_data(payload);
-
- if (ofpbuf_size(payload) != sizeof *prop) {
- log_property(false, "OpenFlow bucket weight property length "
- "%u is not valid", ofpbuf_size(payload));
- return OFPERR_OFPBPC_BAD_LEN;
- }
-
- *weight = prop->weight;
-
- return 0;
-}
-
-static enum ofperr
-parse_ofp15_group_bucket_prop_watch(const struct ofpbuf *payload,
- ovs_be32 *watch)
-{
- struct ofp15_group_bucket_prop_watch *prop = ofpbuf_data(payload);
-
- if (ofpbuf_size(payload) != sizeof *prop) {
- log_property(false, "OpenFlow bucket watch port or group "
- "property length %u is not valid", ofpbuf_size(payload));
- return OFPERR_OFPBPC_BAD_LEN;
- }
-
- *watch = prop->watch;
-
- return 0;
-}
-
static enum ofperr
ofputil_pull_ofp15_buckets(struct ofpbuf *msg, size_t buckets_length,
- enum ofp_version version, struct ovs_list *buckets)
+ enum ofp_version version, uint8_t group_type,
+ struct ovs_list *buckets)
{
struct ofp15_bucket *ob;
size_t ob_len, actions_len, properties_len;
ovs_be32 watch_port = ofputil_port_to_ofp11(OFPP_ANY);
ovs_be32 watch_group = htonl(OFPG_ANY);
- ovs_be16 weight = htons(1);
+ ovs_be16 weight = htons(group_type == OFPGT11_SELECT ? 1 : 0);
ofpbuf_init(&ofpacts, 0);
ofpbuf_use_const(&properties, ofpbuf_pull(msg, properties_len),
properties_len);
- while (ofpbuf_size(&properties) > 0) {
+ while (properties.size > 0) {
struct ofpbuf payload;
- uint16_t type;
+ uint64_t type;
- err = ofputil_pull_property(&properties, &payload, &type);
+ err = ofpprop_pull(&properties, &payload, &type);
if (err) {
goto err;
}
switch (type) {
case OFPGBPT15_WEIGHT:
- err = parse_ofp15_group_bucket_prop_weight(&payload, &weight);
+ err = ofpprop_parse_be16(&payload, &weight);
break;
case OFPGBPT15_WATCH_PORT:
- err = parse_ofp15_group_bucket_prop_watch(&payload,
- &watch_port);
+ err = ofpprop_parse_be32(&payload, &watch_port);
break;
case OFPGBPT15_WATCH_GROUP:
- err = parse_ofp15_group_bucket_prop_watch(&payload,
- &watch_group);
+ err = ofpprop_parse_be32(&payload, &watch_group);
break;
default:
- log_property(false, "unknown group bucket property %"PRIu16,
- type);
- err = OFPERR_OFPBPC_BAD_TYPE;
+ err = OFPPROP_UNKNOWN(false, "group bucket", type);
break;
}
}
bucket->ofpacts = ofpbuf_steal_data(&ofpacts);
- bucket->ofpacts_len = ofpbuf_size(&ofpacts);
+ bucket->ofpacts_len = ofpacts.size;
list_push_back(buckets, &bucket->list_node);
continue;
return 0;
}
+static void
+ofputil_init_group_properties(struct ofputil_group_props *gp)
+{
+ memset(gp, 0, sizeof *gp);
+}
+
+static enum ofperr
+parse_group_prop_ntr_selection_method(struct ofpbuf *payload,
+ enum ofp11_group_type group_type,
+ enum ofp15_group_mod_command group_cmd,
+ struct ofputil_group_props *gp)
+{
+ struct ntr_group_prop_selection_method *prop = payload->data;
+ size_t fields_len, method_len;
+ enum ofperr error;
+
+ switch (group_type) {
+ case OFPGT11_SELECT:
+ break;
+ case OFPGT11_ALL:
+ case OFPGT11_INDIRECT:
+ case OFPGT11_FF:
+ OFPPROP_LOG(&bad_ofmsg_rl, false, "ntr selection method property is "
+ "only allowed for select groups");
+ return OFPERR_OFPBPC_BAD_VALUE;
+ default:
+ OVS_NOT_REACHED();
+ }
+
+ switch (group_cmd) {
+ case OFPGC15_ADD:
+ case OFPGC15_MODIFY:
+ break;
+ case OFPGC15_DELETE:
+ case OFPGC15_INSERT_BUCKET:
+ case OFPGC15_REMOVE_BUCKET:
+ OFPPROP_LOG(&bad_ofmsg_rl, false, "ntr selection method property is "
+ "only allowed for add and delete group modifications");
+ return OFPERR_OFPBPC_BAD_VALUE;
+ default:
+ OVS_NOT_REACHED();
+ }
+
+ if (payload->size < sizeof *prop) {
+ OFPPROP_LOG(&bad_ofmsg_rl, false, "ntr selection method property "
+ "length %u is not valid", payload->size);
+ return OFPERR_OFPBPC_BAD_LEN;
+ }
+
+ method_len = strnlen(prop->selection_method, NTR_MAX_SELECTION_METHOD_LEN);
+
+ if (method_len == NTR_MAX_SELECTION_METHOD_LEN) {
+ OFPPROP_LOG(&bad_ofmsg_rl, false,
+ "ntr selection method is not null terminated");
+ return OFPERR_OFPBPC_BAD_VALUE;
+ }
+
+ if (strcmp("hash", prop->selection_method)) {
+ OFPPROP_LOG(&bad_ofmsg_rl, false,
+ "ntr selection method '%s' is not supported",
+ prop->selection_method);
+ return OFPERR_OFPBPC_BAD_VALUE;
+ }
+
+ strcpy(gp->selection_method, prop->selection_method);
+ gp->selection_method_param = ntohll(prop->selection_method_param);
+
+ if (!method_len && gp->selection_method_param) {
+ OFPPROP_LOG(&bad_ofmsg_rl, false, "ntr selection method parameter is "
+ "non-zero but selection method is empty");
+ return OFPERR_OFPBPC_BAD_VALUE;
+ }
+
+ ofpbuf_pull(payload, sizeof *prop);
+
+ fields_len = ntohs(prop->length) - sizeof *prop;
+ if (!method_len && fields_len) {
+ OFPPROP_LOG(&bad_ofmsg_rl, false, "ntr selection method parameter is "
+ "zero but fields are provided");
+ return OFPERR_OFPBPC_BAD_VALUE;
+ }
+
+ error = oxm_pull_field_array(payload->data, fields_len,
+ &gp->fields);
+ if (error) {
+ OFPPROP_LOG(&bad_ofmsg_rl, false,
+ "ntr selection method fields are invalid");
+ return error;
+ }
+
+ return 0;
+}
+
+static enum ofperr
+parse_ofp15_group_properties(struct ofpbuf *msg,
+ enum ofp11_group_type group_type,
+ enum ofp15_group_mod_command group_cmd,
+ struct ofputil_group_props *gp,
+ size_t properties_len)
+{
+ struct ofpbuf properties;
+
+ ofpbuf_use_const(&properties, ofpbuf_pull(msg, properties_len),
+ properties_len);
+
+ while (properties.size > 0) {
+ struct ofpbuf payload;
+ enum ofperr error;
+ uint64_t type;
+
+ error = ofpprop_pull(&properties, &payload, &type);
+ if (error) {
+ return error;
+ }
+
+ switch (type) {
+ case OFPPROP_EXP(NTR_VENDOR_ID, NTRT_SELECTION_METHOD):
+ case OFPPROP_EXP(NTR_COMPAT_VENDOR_ID, NTRT_SELECTION_METHOD):
+ error = parse_group_prop_ntr_selection_method(&payload, group_type,
+ group_cmd, gp);
+ break;
+
+ default:
+ error = OFPPROP_UNKNOWN(false, "group", type);
+ break;
+ }
+
+ if (error) {
+ return error;
+ }
+ }
+
+ return 0;
+}
+
static int
ofputil_decode_ofp11_group_desc_reply(struct ofputil_group_desc *gd,
struct ofpbuf *msg,
struct ofp11_group_desc_stats *ogds;
size_t length;
- if (!msg->frame) {
+ if (!msg->header) {
ofpraw_pull_assert(msg);
}
- if (!ofpbuf_size(msg)) {
+ if (!msg->size) {
return EOF;
}
ogds = ofpbuf_try_pull(msg, sizeof *ogds);
if (!ogds) {
VLOG_WARN_RL(&bad_ofmsg_rl, "OFPST11_GROUP_DESC reply has %"PRIu32" "
- "leftover bytes at end", ofpbuf_size(msg));
+ "leftover bytes at end", msg->size);
return OFPERR_OFPBRC_BAD_LEN;
}
gd->type = ogds->type;
gd->group_id = ntohl(ogds->group_id);
length = ntohs(ogds->length);
- if (length < sizeof *ogds || length - sizeof *ogds > ofpbuf_size(msg)) {
+ if (length < sizeof *ogds || length - sizeof *ogds > msg->size) {
VLOG_WARN_RL(&bad_ofmsg_rl, "OFPST11_GROUP_DESC reply claims invalid "
"length %"PRIuSIZE, length);
return OFPERR_OFPBRC_BAD_LEN;
{
struct ofp15_group_desc_stats *ogds;
uint16_t length, bucket_list_len;
+ int error;
- if (!msg->frame) {
+ if (!msg->header) {
ofpraw_pull_assert(msg);
}
- if (!ofpbuf_size(msg)) {
+ if (!msg->size) {
return EOF;
}
ogds = ofpbuf_try_pull(msg, sizeof *ogds);
if (!ogds) {
VLOG_WARN_RL(&bad_ofmsg_rl, "OFPST11_GROUP_DESC reply has %"PRIu32" "
- "leftover bytes at end", ofpbuf_size(msg));
+ "leftover bytes at end", msg->size);
return OFPERR_OFPBRC_BAD_LEN;
}
gd->type = ogds->type;
gd->group_id = ntohl(ogds->group_id);
length = ntohs(ogds->length);
- if (length < sizeof *ogds || length - sizeof *ogds > ofpbuf_size(msg)) {
+ if (length < sizeof *ogds || length - sizeof *ogds > msg->size) {
VLOG_WARN_RL(&bad_ofmsg_rl, "OFPST11_GROUP_DESC reply claims invalid "
"length %u", length);
return OFPERR_OFPBRC_BAD_LEN;
"bucket list length %u", bucket_list_len);
return OFPERR_OFPBRC_BAD_LEN;
}
+ error = ofputil_pull_ofp15_buckets(msg, bucket_list_len, version, gd->type,
+ &gd->buckets);
+ if (error) {
+ return error;
+ }
- return ofputil_pull_ofp15_buckets(msg, bucket_list_len, version,
- &gd->buckets);
+ /* By definition group desc messages don't have a group mod command.
+ * However, parse_group_prop_ntr_selection_method() checks to make sure
+ * that the command is OFPGC15_ADD or OFPGC15_DELETE to guard
+ * against group mod messages with other commands supplying
+ * a NTR selection method group experimenter property.
+ * Such properties are valid for group desc replies so
+ * claim that the group mod command is OFPGC15_ADD to
+ * satisfy the check in parse_group_prop_ntr_selection_method() */
+ return parse_ofp15_group_properties(msg, gd->type, OFPGC15_ADD, &gd->props,
+ length - sizeof *ogds - bucket_list_len);
}
/* Converts a group description reply in 'msg' into an abstract
ofputil_decode_group_desc_reply(struct ofputil_group_desc *gd,
struct ofpbuf *msg, enum ofp_version version)
{
+ ofputil_init_group_properties(&gd->props);
+
switch (version)
{
case OFP11_VERSION:
}
}
+void
+ofputil_uninit_group_mod(struct ofputil_group_mod *gm)
+{
+ ofputil_bucket_list_destroy(&gm->buckets);
+}
+
static struct ofpbuf *
ofputil_encode_ofp11_group_mod(enum ofp_version ofp_version,
const struct ofputil_group_mod *gm)
struct ofputil_bucket *bucket;
b = ofpraw_alloc(OFPRAW_OFPT11_GROUP_MOD, ofp_version, 0);
- start_ogm = ofpbuf_size(b);
+ start_ogm = b->size;
ofpbuf_put_zeros(b, sizeof *ogm);
LIST_FOR_EACH (bucket, list_node, &gm->buckets) {
struct id_pool *bucket_ids = NULL;
b = ofpraw_alloc(OFPRAW_OFPT15_GROUP_MOD, ofp_version, 0);
- start_ogm = ofpbuf_size(b);
+ start_ogm = b->size;
ofpbuf_put_zeros(b, sizeof *ogm);
LIST_FOR_EACH (bucket, list_node, &gm->buckets) {
ogm->type = gm->type;
ogm->group_id = htonl(gm->group_id);
ogm->command_bucket_id = htonl(gm->command_bucket_id);
- ogm->bucket_array_len = htons(ofpbuf_size(b) - start_ogm - sizeof *ogm);
+ ogm->bucket_array_len = htons(b->size - start_ogm - sizeof *ogm);
+
+ /* Add group properties */
+ if (gm->props.selection_method[0]) {
+ ofputil_put_group_prop_ntr_selection_method(ofp_version, &gm->props, b);
+ }
id_pool_destroy(bucket_ids);
return b;
}
static void
-bad_group_cmd(enum ofp15_group_mod_command cmd) {
+bad_group_cmd(enum ofp15_group_mod_command cmd)
+{
const char *opt_version;
const char *version;
const char *cmd_str;
case OFPGC15_REMOVE_BUCKET:
version = "1.5";
opt_version = "15";
+ break;
default:
OVS_NOT_REACHED();
break;
case OFPGC15_REMOVE_BUCKET:
- cmd_str = "insert-bucket";
+ cmd_str = "remove-bucket";
break;
default:
struct ofputil_group_mod *gm)
{
const struct ofp11_group_mod *ogm;
+ enum ofperr error;
ogm = ofpbuf_pull(msg, sizeof *ogm);
gm->command = ntohs(ogm->command);
gm->group_id = ntohl(ogm->group_id);
gm->command_bucket_id = OFPG15_BUCKET_ALL;
- return ofputil_pull_ofp11_buckets(msg, ofpbuf_size(msg), ofp_version,
- &gm->buckets);
+ error = ofputil_pull_ofp11_buckets(msg, msg->size, ofp_version,
+ &gm->buckets);
+
+ /* OF1.3.5+ prescribes an error when an OFPGC_DELETE includes buckets. */
+ if (!error
+ && ofp_version >= OFP13_VERSION
+ && gm->command == OFPGC11_DELETE
+ && !list_is_empty(&gm->buckets)) {
+ error = OFPERR_OFPGMFC_INVALID_GROUP;
+ }
+
+ return error;
}
static enum ofperr
}
bucket_list_len = ntohs(ogm->bucket_array_len);
- if (bucket_list_len < ofpbuf_size(msg)) {
- VLOG_WARN_RL(&bad_ofmsg_rl, "group has %u trailing bytes",
- ofpbuf_size(msg) - bucket_list_len);
- return OFPERR_OFPGMFC_BAD_BUCKET;
+ error = ofputil_pull_ofp15_buckets(msg, bucket_list_len, ofp_version,
+ gm->type, &gm->buckets);
+ if (error) {
+ return error;
}
- return ofputil_pull_ofp15_buckets(msg, bucket_list_len, ofp_version,
- &gm->buckets);
+ return parse_ofp15_group_properties(msg, gm->type, gm->command, &gm->props,
+ msg->size);
}
/* Converts OpenFlow group mod message 'oh' into an abstract group mod in
ofpbuf_use_const(&msg, oh, ntohs(oh->length));
ofpraw_pull_assert(&msg);
+ ofputil_init_group_properties(&gm->props);
+
switch (ofp_version)
{
case OFP11_VERSION:
case OFPGT11_FF:
break;
default:
- OVS_NOT_REACHED();
+ return OFPERR_OFPGMFC_BAD_TYPE;
}
switch (gm->command) {
}
break;
default:
- OVS_NOT_REACHED();
+ return OFPERR_OFPGMFC_BAD_COMMAND;
}
LIST_FOR_EACH (bucket, list_node, &gm->buckets) {
+ if (bucket->weight && gm->type != OFPGT11_SELECT) {
+ return OFPERR_OFPGMFC_INVALID_GROUP;
+ }
+
switch (gm->type) {
case OFPGT11_ALL:
case OFPGT11_INDIRECT:
}
break;
default:
- OVS_NOT_REACHED();
+ /* Returning BAD TYPE to be consistent
+ * though gm->type has been checked already. */
+ return OFPERR_OFPGMFC_BAD_TYPE;
}
}
}
len = ntohs(qs14->length);
- if (len < sizeof *qs14 || len - sizeof *qs14 > ofpbuf_size(msg)) {
+ if (len < sizeof *qs14 || len - sizeof *qs14 > msg->size) {
return OFPERR_OFPBRC_BAD_LEN;
}
ofpbuf_pull(msg, len - sizeof *qs14);
enum ofperr error;
enum ofpraw raw;
- error = (msg->frame
- ? ofpraw_decode(&raw, msg->frame)
+ error = (msg->header ? ofpraw_decode(&raw, msg->header)
: ofpraw_pull(&raw, msg));
if (error) {
return error;
}
- if (!ofpbuf_size(msg)) {
+ if (!msg->size) {
return EOF;
} else if (raw == OFPRAW_OFPST14_QUEUE_REPLY) {
return ofputil_pull_ofp14_queue_stats(qs, msg);
bad_len:
VLOG_WARN_RL(&bad_ofmsg_rl, "OFPST_QUEUE reply has %"PRIu32" leftover "
- "bytes at end", ofpbuf_size(msg));
+ "bytes at end", msg->size);
return OFPERR_OFPBRC_BAD_LEN;
}
raw = ofpraw_pull_assert(&b);
ovs_assert(raw == OFPRAW_OFPT14_BUNDLE_CONTROL);
- m = ofpbuf_l3(&b);
+ m = b.msg;
msg->bundle_id = ntohl(m->bundle_id);
msg->type = ntohs(m->type);
msg->flags = ntohs(m->flags);
return 0;
}
+struct ofpbuf *
+ofputil_encode_bundle_ctrl_request(enum ofp_version ofp_version,
+ struct ofputil_bundle_ctrl_msg *bc)
+{
+ struct ofpbuf *request;
+ struct ofp14_bundle_ctrl_msg *m;
+
+ switch (ofp_version) {
+ case OFP10_VERSION:
+ case OFP11_VERSION:
+ case OFP12_VERSION:
+ case OFP13_VERSION:
+ ovs_fatal(0, "bundles need OpenFlow 1.4 or later "
+ "(\'-O OpenFlow14\')");
+ case OFP14_VERSION:
+ case OFP15_VERSION:
+ request = ofpraw_alloc(OFPRAW_OFPT14_BUNDLE_CONTROL, ofp_version, 0);
+ m = ofpbuf_put_zeros(request, sizeof *m);
+
+ m->bundle_id = htonl(bc->bundle_id);
+ m->type = htons(bc->type);
+ m->flags = htons(bc->flags);
+ break;
+ default:
+ OVS_NOT_REACHED();
+ }
+
+ return request;
+}
+
struct ofpbuf *
ofputil_encode_bundle_ctrl_reply(const struct ofp_header *oh,
struct ofputil_bundle_ctrl_msg *msg)
return buf;
}
+/* Return true for bundlable state change requests, false for other messages.
+ */
+static bool
+ofputil_is_bundlable(enum ofptype type)
+{
+ switch (type) {
+ /* Minimum required by OpenFlow 1.4. */
+ case OFPTYPE_PORT_MOD:
+ case OFPTYPE_FLOW_MOD:
+ return true;
+
+ /* Nice to have later. */
+ case OFPTYPE_FLOW_MOD_TABLE_ID:
+ case OFPTYPE_GROUP_MOD:
+ case OFPTYPE_TABLE_MOD:
+ case OFPTYPE_METER_MOD:
+ case OFPTYPE_PACKET_OUT:
+ case OFPTYPE_NXT_TLV_TABLE_MOD:
+
+ /* Not to be bundlable. */
+ case OFPTYPE_ECHO_REQUEST:
+ case OFPTYPE_FEATURES_REQUEST:
+ case OFPTYPE_GET_CONFIG_REQUEST:
+ case OFPTYPE_SET_CONFIG:
+ case OFPTYPE_BARRIER_REQUEST:
+ case OFPTYPE_ROLE_REQUEST:
+ case OFPTYPE_ECHO_REPLY:
+ case OFPTYPE_SET_FLOW_FORMAT:
+ case OFPTYPE_SET_PACKET_IN_FORMAT:
+ case OFPTYPE_SET_CONTROLLER_ID:
+ case OFPTYPE_FLOW_AGE:
+ case OFPTYPE_FLOW_MONITOR_CANCEL:
+ case OFPTYPE_SET_ASYNC_CONFIG:
+ case OFPTYPE_GET_ASYNC_REQUEST:
+ case OFPTYPE_DESC_STATS_REQUEST:
+ case OFPTYPE_FLOW_STATS_REQUEST:
+ case OFPTYPE_AGGREGATE_STATS_REQUEST:
+ case OFPTYPE_TABLE_STATS_REQUEST:
+ case OFPTYPE_TABLE_FEATURES_STATS_REQUEST:
+ case OFPTYPE_TABLE_DESC_REQUEST:
+ case OFPTYPE_PORT_STATS_REQUEST:
+ case OFPTYPE_QUEUE_STATS_REQUEST:
+ case OFPTYPE_PORT_DESC_STATS_REQUEST:
+ case OFPTYPE_FLOW_MONITOR_STATS_REQUEST:
+ case OFPTYPE_METER_STATS_REQUEST:
+ case OFPTYPE_METER_CONFIG_STATS_REQUEST:
+ case OFPTYPE_METER_FEATURES_STATS_REQUEST:
+ case OFPTYPE_GROUP_STATS_REQUEST:
+ case OFPTYPE_GROUP_DESC_STATS_REQUEST:
+ case OFPTYPE_GROUP_FEATURES_STATS_REQUEST:
+ case OFPTYPE_QUEUE_GET_CONFIG_REQUEST:
+ case OFPTYPE_BUNDLE_CONTROL:
+ case OFPTYPE_BUNDLE_ADD_MESSAGE:
+ case OFPTYPE_HELLO:
+ case OFPTYPE_ERROR:
+ case OFPTYPE_FEATURES_REPLY:
+ case OFPTYPE_GET_CONFIG_REPLY:
+ case OFPTYPE_PACKET_IN:
+ case OFPTYPE_FLOW_REMOVED:
+ case OFPTYPE_PORT_STATUS:
+ case OFPTYPE_BARRIER_REPLY:
+ case OFPTYPE_QUEUE_GET_CONFIG_REPLY:
+ case OFPTYPE_DESC_STATS_REPLY:
+ case OFPTYPE_FLOW_STATS_REPLY:
+ case OFPTYPE_QUEUE_STATS_REPLY:
+ case OFPTYPE_PORT_STATS_REPLY:
+ case OFPTYPE_TABLE_STATS_REPLY:
+ case OFPTYPE_AGGREGATE_STATS_REPLY:
+ case OFPTYPE_PORT_DESC_STATS_REPLY:
+ case OFPTYPE_ROLE_REPLY:
+ case OFPTYPE_FLOW_MONITOR_PAUSED:
+ case OFPTYPE_FLOW_MONITOR_RESUMED:
+ case OFPTYPE_FLOW_MONITOR_STATS_REPLY:
+ case OFPTYPE_GET_ASYNC_REPLY:
+ case OFPTYPE_GROUP_STATS_REPLY:
+ case OFPTYPE_GROUP_DESC_STATS_REPLY:
+ case OFPTYPE_GROUP_FEATURES_STATS_REPLY:
+ case OFPTYPE_METER_STATS_REPLY:
+ case OFPTYPE_METER_CONFIG_STATS_REPLY:
+ case OFPTYPE_METER_FEATURES_STATS_REPLY:
+ case OFPTYPE_TABLE_FEATURES_STATS_REPLY:
+ case OFPTYPE_TABLE_DESC_REPLY:
+ case OFPTYPE_ROLE_STATUS:
+ case OFPTYPE_REQUESTFORWARD:
+ case OFPTYPE_NXT_TLV_TABLE_REQUEST:
+ case OFPTYPE_NXT_TLV_TABLE_REPLY:
+ break;
+ }
+
+ return false;
+}
+
enum ofperr
ofputil_decode_bundle_add(const struct ofp_header *oh,
- struct ofputil_bundle_add_msg *msg)
+ struct ofputil_bundle_add_msg *msg,
+ enum ofptype *type_ptr)
{
const struct ofp14_bundle_ctrl_msg *m;
struct ofpbuf b;
enum ofpraw raw;
size_t inner_len;
+ enum ofperr error;
+ enum ofptype type;
ofpbuf_use_const(&b, oh, ntohs(oh->length));
raw = ofpraw_pull_assert(&b);
msg->bundle_id = ntohl(m->bundle_id);
msg->flags = ntohs(m->flags);
- msg->msg = ofpbuf_data(&b);
+ msg->msg = b.data;
+ if (msg->msg->version != oh->version) {
+ return OFPERR_NXBFC_BAD_VERSION;
+ }
inner_len = ntohs(msg->msg->length);
- if (inner_len < sizeof(struct ofp_header) || inner_len > ofpbuf_size(&b)) {
+ if (inner_len < sizeof(struct ofp_header) || inner_len > b.size) {
return OFPERR_OFPBFC_MSG_BAD_LEN;
}
+ if (msg->msg->xid != oh->xid) {
+ return OFPERR_OFPBFC_MSG_BAD_XID;
+ }
+
+ /* Reject unbundlable messages. */
+ if (!type_ptr) {
+ type_ptr = &type;
+ }
+ error = ofptype_decode(type_ptr, msg->msg);
+ if (error) {
+ VLOG_WARN_RL(&bad_ofmsg_rl, "OFPT14_BUNDLE_ADD_MESSAGE contained "
+ "message is unparsable (%s)", ofperr_get_name(error));
+ return OFPERR_OFPBFC_MSG_UNSUP; /* 'error' would be confusing. */
+ }
+
+ if (!ofputil_is_bundlable(*type_ptr)) {
+ VLOG_WARN_RL(&bad_ofmsg_rl, "%s message not allowed inside "
+ "OFPT14_BUNDLE_ADD_MESSAGE", ofptype_get_name(*type_ptr));
+ return OFPERR_OFPBFC_MSG_UNSUP;
+ }
return 0;
}
struct ofpbuf *request;
struct ofp14_bundle_ctrl_msg *m;
- request = ofpraw_alloc(OFPRAW_OFPT14_BUNDLE_ADD_MESSAGE, ofp_version, 0);
+ /* Must use the same xid as the embedded message. */
+ request = ofpraw_alloc_xid(OFPRAW_OFPT14_BUNDLE_ADD_MESSAGE, ofp_version,
+ msg->msg->xid, 0);
m = ofpbuf_put_zeros(request, sizeof *m);
m->bundle_id = htonl(msg->bundle_id);
return request;
}
+
+static void
+encode_tlv_table_mappings(struct ofpbuf *b, struct ovs_list *mappings)
+{
+ struct ofputil_tlv_map *map;
+
+ LIST_FOR_EACH (map, list_node, mappings) {
+ struct nx_tlv_map *nx_map;
+
+ nx_map = ofpbuf_put_zeros(b, sizeof *nx_map);
+ nx_map->option_class = htons(map->option_class);
+ nx_map->option_type = map->option_type;
+ nx_map->option_len = map->option_len;
+ nx_map->index = htons(map->index);
+ }
+}
+
+struct ofpbuf *
+ofputil_encode_tlv_table_mod(enum ofp_version ofp_version,
+ struct ofputil_tlv_table_mod *ttm)
+{
+ struct ofpbuf *b;
+ struct nx_tlv_table_mod *nx_ttm;
+
+ b = ofpraw_alloc(OFPRAW_NXT_TLV_TABLE_MOD, ofp_version, 0);
+ nx_ttm = ofpbuf_put_zeros(b, sizeof *nx_ttm);
+ nx_ttm->command = htons(ttm->command);
+ encode_tlv_table_mappings(b, &ttm->mappings);
+
+ return b;
+}
+
+static enum ofperr
+decode_tlv_table_mappings(struct ofpbuf *msg, unsigned int max_fields,
+ struct ovs_list *mappings)
+{
+ list_init(mappings);
+
+ while (msg->size) {
+ struct nx_tlv_map *nx_map;
+ struct ofputil_tlv_map *map;
+
+ nx_map = ofpbuf_pull(msg, sizeof *nx_map);
+ map = xmalloc(sizeof *map);
+ list_push_back(mappings, &map->list_node);
+
+ map->option_class = ntohs(nx_map->option_class);
+ map->option_type = nx_map->option_type;
+
+ map->option_len = nx_map->option_len;
+ if (map->option_len % 4 || map->option_len > TLV_MAX_OPT_SIZE) {
+ VLOG_WARN_RL(&bad_ofmsg_rl,
+ "tlv table option length (%u) is not a valid option size",
+ map->option_len);
+ ofputil_uninit_tlv_table(mappings);
+ return OFPERR_NXTTMFC_BAD_OPT_LEN;
+ }
+
+ map->index = ntohs(nx_map->index);
+ if (map->index >= max_fields) {
+ VLOG_WARN_RL(&bad_ofmsg_rl,
+ "tlv table field index (%u) is too large (max %u)",
+ map->index, max_fields - 1);
+ ofputil_uninit_tlv_table(mappings);
+ return OFPERR_NXTTMFC_BAD_FIELD_IDX;
+ }
+ }
+
+ return 0;
+}
+
+enum ofperr
+ofputil_decode_tlv_table_mod(const struct ofp_header *oh,
+ struct ofputil_tlv_table_mod *ttm)
+{
+ struct ofpbuf msg;
+ struct nx_tlv_table_mod *nx_ttm;
+
+ ofpbuf_use_const(&msg, oh, ntohs(oh->length));
+ ofpraw_pull_assert(&msg);
+
+ nx_ttm = ofpbuf_pull(&msg, sizeof *nx_ttm);
+ ttm->command = ntohs(nx_ttm->command);
+ if (ttm->command > NXTTMC_CLEAR) {
+ VLOG_WARN_RL(&bad_ofmsg_rl,
+ "tlv table mod command (%u) is out of range",
+ ttm->command);
+ return OFPERR_NXTTMFC_BAD_COMMAND;
+ }
+
+ return decode_tlv_table_mappings(&msg, TUN_METADATA_NUM_OPTS,
+ &ttm->mappings);
+}
+
+struct ofpbuf *
+ofputil_encode_tlv_table_reply(const struct ofp_header *oh,
+ struct ofputil_tlv_table_reply *ttr)
+{
+ struct ofpbuf *b;
+ struct nx_tlv_table_reply *nx_ttr;
+
+ b = ofpraw_alloc_reply(OFPRAW_NXT_TLV_TABLE_REPLY, oh, 0);
+ nx_ttr = ofpbuf_put_zeros(b, sizeof *nx_ttr);
+ nx_ttr->max_option_space = htonl(ttr->max_option_space);
+ nx_ttr->max_fields = htons(ttr->max_fields);
+
+ encode_tlv_table_mappings(b, &ttr->mappings);
+
+ return b;
+}
+
+/* Decodes the NXT_TLV_TABLE_REPLY message in 'oh' into '*ttr'. Returns 0
+ * if successful, otherwise an ofperr.
+ *
+ * The decoder verifies that the indexes in 'ttr->mappings' are less than
+ * 'ttr->max_fields', but the caller must ensure, if necessary, that they are
+ * less than TUN_METADATA_NUM_OPTS. */
+enum ofperr
+ofputil_decode_tlv_table_reply(const struct ofp_header *oh,
+ struct ofputil_tlv_table_reply *ttr)
+{
+ struct ofpbuf msg;
+ struct nx_tlv_table_reply *nx_ttr;
+
+ ofpbuf_use_const(&msg, oh, ntohs(oh->length));
+ ofpraw_pull_assert(&msg);
+
+ nx_ttr = ofpbuf_pull(&msg, sizeof *nx_ttr);
+ ttr->max_option_space = ntohl(nx_ttr->max_option_space);
+ ttr->max_fields = ntohs(nx_ttr->max_fields);
+
+ return decode_tlv_table_mappings(&msg, ttr->max_fields, &ttr->mappings);
+}
+
+void
+ofputil_uninit_tlv_table(struct ovs_list *mappings)
+{
+ struct ofputil_tlv_map *map;
+
+ LIST_FOR_EACH_POP (map, list_node, mappings) {
+ free(map);
+ }
+}
+
+/* Decodes the OpenFlow "set async config" request and "get async config
+ * reply" message in '*oh' into an abstract form in 'master' and 'slave'.
+ *
+ * If 'loose' is true, this function ignores properties and values that it does
+ * not understand, as a controller would want to do when interpreting
+ * capabilities provided by a switch. If 'loose' is false, this function
+ * treats unknown properties and values as an error, as a switch would want to
+ * do when interpreting a configuration request made by a controller.
+ *
+ * Returns 0 if successful, otherwise an OFPERR_* value.
+ *
+ * Returns error code OFPERR_OFPACFC_INVALID if the value of mask is not in
+ * the valid range of mask.
+ *
+ * Returns error code OFPERR_OFPACFC_UNSUPPORTED if the configuration is not
+ * supported.*/
+enum ofperr
+ofputil_decode_set_async_config(const struct ofp_header *oh,
+ uint32_t master[OAM_N_TYPES],
+ uint32_t slave[OAM_N_TYPES],
+ bool loose)
+{
+ enum ofpraw raw;
+ struct ofpbuf b;
+
+ ofpbuf_use_const(&b, oh, ntohs(oh->length));
+ raw = ofpraw_pull_assert(&b);
+
+ if (raw == OFPRAW_OFPT13_SET_ASYNC ||
+ raw == OFPRAW_NXT_SET_ASYNC_CONFIG ||
+ raw == OFPRAW_OFPT13_GET_ASYNC_REPLY) {
+ const struct nx_async_config *msg = ofpmsg_body(oh);
+
+ master[OAM_PACKET_IN] = ntohl(msg->packet_in_mask[0]);
+ master[OAM_PORT_STATUS] = ntohl(msg->port_status_mask[0]);
+ master[OAM_FLOW_REMOVED] = ntohl(msg->flow_removed_mask[0]);
+
+ slave[OAM_PACKET_IN] = ntohl(msg->packet_in_mask[1]);
+ slave[OAM_PORT_STATUS] = ntohl(msg->port_status_mask[1]);
+ slave[OAM_FLOW_REMOVED] = ntohl(msg->flow_removed_mask[1]);
+
+ } else if (raw == OFPRAW_OFPT14_SET_ASYNC ||
+ raw == OFPRAW_OFPT14_GET_ASYNC_REPLY) {
+
+ while (b.size > 0) {
+ struct ofpbuf property;
+ enum ofperr error;
+ uint64_t type;
+ uint32_t mask;
+
+ error = ofpprop_pull__(&b, &property, 8, 0xfffe, &type);
+ if (error) {
+ return error;
+ }
+
+ error = ofpprop_parse_u32(&property, &mask);
+ if (error) {
+ return error;
+ }
+
+ if (!loose) {
+ error = ofputil_check_mask(type, mask);
+ if (error) {
+ return error;
+ }
+ }
+
+ switch (type) {
+ case OFPACPT_PACKET_IN_SLAVE:
+ slave[OAM_PACKET_IN] = mask;
+ break;
+
+ case OFPACPT_PACKET_IN_MASTER:
+ master[OAM_PACKET_IN] = mask;
+ break;
+
+ case OFPACPT_PORT_STATUS_SLAVE:
+ slave[OAM_PORT_STATUS] = mask;
+ break;
+
+ case OFPACPT_PORT_STATUS_MASTER:
+ master[OAM_PORT_STATUS] = mask;
+ break;
+
+ case OFPACPT_FLOW_REMOVED_SLAVE:
+ slave[OAM_FLOW_REMOVED] = mask;
+ break;
+
+ case OFPACPT_FLOW_REMOVED_MASTER:
+ master[OAM_FLOW_REMOVED] = mask;
+ break;
+
+ case OFPACPT_ROLE_STATUS_SLAVE:
+ slave[OAM_ROLE_STATUS] = mask;
+ break;
+
+ case OFPACPT_ROLE_STATUS_MASTER:
+ master[OAM_ROLE_STATUS] = mask;
+ break;
+
+ case OFPACPT_TABLE_STATUS_SLAVE:
+ slave[OAM_TABLE_STATUS] = mask;
+ break;
+
+ case OFPACPT_TABLE_STATUS_MASTER:
+ master[OAM_TABLE_STATUS] = mask;
+ break;
+
+ case OFPACPT_REQUESTFORWARD_SLAVE:
+ slave[OAM_REQUESTFORWARD] = mask;
+ break;
+
+ case OFPACPT_REQUESTFORWARD_MASTER:
+ master[OAM_REQUESTFORWARD] = mask;
+ break;
+
+ default:
+ error = loose ? 0 : OFPERR_OFPACFC_UNSUPPORTED;
+ return error;
+ }
+ }
+ } else {
+ return OFPERR_OFPBRC_BAD_VERSION;
+ }
+ return 0;
+}
+
+/* Append all asynchronous configuration properties in GET_ASYNC_REPLY
+ * message, describing if various set of asynchronous messages are enabled
+ * or not. */
+static enum ofperr
+ofputil_get_async_reply(struct ofpbuf *buf, const uint32_t master_mask,
+ const uint32_t slave_mask, const uint32_t type)
+{
+ int role;
+
+ for (role = 0; role < 2; role++) {
+ enum ofp14_async_config_prop_type prop_type;
+
+ switch (type) {
+ case OAM_PACKET_IN:
+ prop_type = (role ? OFPACPT_PACKET_IN_SLAVE
+ : OFPACPT_PACKET_IN_MASTER);
+ break;
+
+ case OAM_PORT_STATUS:
+ prop_type = (role ? OFPACPT_PORT_STATUS_SLAVE
+ : OFPACPT_PORT_STATUS_MASTER);
+ break;
+
+ case OAM_FLOW_REMOVED:
+ prop_type = (role ? OFPACPT_FLOW_REMOVED_SLAVE
+ : OFPACPT_FLOW_REMOVED_MASTER);
+ break;
+
+ case OAM_ROLE_STATUS:
+ prop_type = (role ? OFPACPT_ROLE_STATUS_SLAVE
+ : OFPACPT_ROLE_STATUS_MASTER);
+ break;
+
+ case OAM_TABLE_STATUS:
+ prop_type = (role ? OFPACPT_TABLE_STATUS_SLAVE
+ : OFPACPT_TABLE_STATUS_MASTER);
+ break;
+
+ case OAM_REQUESTFORWARD:
+ prop_type = (role ? OFPACPT_REQUESTFORWARD_SLAVE
+ : OFPACPT_REQUESTFORWARD_MASTER);
+ break;
+
+ default:
+ return OFPERR_OFPBRC_BAD_TYPE;
+ }
+ ofpprop_put_u32(buf, prop_type, role ? slave_mask : master_mask);
+ }
+
+ return 0;
+}
+
+/* Returns a OpenFlow message that encodes 'asynchronous configuration' properly
+ * as a reply to get async config request. */
+struct ofpbuf *
+ofputil_encode_get_async_config(const struct ofp_header *oh,
+ uint32_t master[OAM_N_TYPES],
+ uint32_t slave[OAM_N_TYPES])
+{
+ struct ofpbuf *buf;
+ uint32_t type;
+
+ buf = ofpraw_alloc_reply((oh->version < OFP14_VERSION
+ ? OFPRAW_OFPT13_GET_ASYNC_REPLY
+ : OFPRAW_OFPT14_GET_ASYNC_REPLY), oh, 0);
+
+ if (oh->version < OFP14_VERSION) {
+ struct nx_async_config *msg;
+ msg = ofpbuf_put_zeros(buf, sizeof *msg);
+
+ msg->packet_in_mask[0] = htonl(master[OAM_PACKET_IN]);
+ msg->port_status_mask[0] = htonl(master[OAM_PORT_STATUS]);
+ msg->flow_removed_mask[0] = htonl(master[OAM_FLOW_REMOVED]);
+
+ msg->packet_in_mask[1] = htonl(slave[OAM_PACKET_IN]);
+ msg->port_status_mask[1] = htonl(slave[OAM_PORT_STATUS]);
+ msg->flow_removed_mask[1] = htonl(slave[OAM_FLOW_REMOVED]);
+ } else if (oh->version == OFP14_VERSION) {
+ for (type = 0; type < OAM_N_TYPES; type++) {
+ ofputil_get_async_reply(buf, master[type], slave[type], type);
+ }
+ }
+
+ return buf;
+}
projects / cascardo / ovs.git / blobdiff