ofputil_packet_in_format_is_valid(enum nx_packet_in_format packet_in_format)
{
switch (packet_in_format) {
- case NXPIF_OPENFLOW10:
- case NXPIF_NXM:
+ case NXPIF_STANDARD:
+ case NXPIF_NXT_PACKET_IN:
+ case NXPIF_NXT_PACKET_IN2:
return true;
}
ofputil_packet_in_format_to_string(enum nx_packet_in_format packet_in_format)
{
switch (packet_in_format) {
- case NXPIF_OPENFLOW10:
- return "openflow10";
- case NXPIF_NXM:
- return "nxm";
+ case NXPIF_STANDARD:
+ return "standard";
+ case NXPIF_NXT_PACKET_IN:
+ return "nxt_packet_in";
+ case NXPIF_NXT_PACKET_IN2:
+ return "nxt_packet_in2";
default:
OVS_NOT_REACHED();
}
int
ofputil_packet_in_format_from_string(const char *s)
{
- return (!strcmp(s, "openflow10") ? NXPIF_OPENFLOW10
- : !strcmp(s, "nxm") ? NXPIF_NXM
+ return (!strcmp(s, "standard") || !strcmp(s, "openflow10")
+ ? NXPIF_STANDARD
+ : !strcmp(s, "nxt_packet_in") || !strcmp(s, "nxm")
+ ? NXPIF_NXT_PACKET_IN
+ : !strcmp(s, "nxt_packet_in2")
+ ? NXPIF_NXT_PACKET_IN2
: -1);
}
bool
ofputil_decode_hello(const struct ofp_header *oh, uint32_t *allowed_versions)
{
- struct ofpbuf msg;
- bool ok = true;
-
- ofpbuf_use_const(&msg, oh, ntohs(oh->length));
+ struct ofpbuf msg = ofpbuf_const_initializer(oh, ntohs(oh->length));
ofpbuf_pull(&msg, sizeof *oh);
*allowed_versions = version_bitmap_from_version(oh->version);
+
+ bool ok = true;
while (msg.size) {
const struct ofp_hello_elem_header *oheh;
unsigned int len;
{
ovs_be16 raw_flags;
enum ofperr error;
- struct ofpbuf b;
- enum ofpraw raw;
/* Ignored for non-delete actions */
fm->delete_reason = OFPRR_DELETE;
- ofpbuf_use_const(&b, oh, ntohs(oh->length));
- raw = ofpraw_pull_assert(&b);
+ struct ofpbuf b = ofpbuf_const_initializer(oh, ntohs(oh->length));
+ enum ofpraw raw = ofpraw_pull_assert(&b);
if (raw == OFPRAW_OFPT11_FLOW_MOD) {
/* Standard OpenFlow 1.1+ flow_mod. */
const struct ofp11_flow_mod *ofm;
struct ofputil_meter_mod *mm,
struct ofpbuf *bands)
{
- const struct ofp13_meter_mod *omm;
- struct ofpbuf b;
-
- ofpbuf_use_const(&b, oh, ntohs(oh->length));
+ struct ofpbuf b = ofpbuf_const_initializer(oh, ntohs(oh->length));
ofpraw_pull_assert(&b);
- omm = ofpbuf_pull(&b, sizeof *omm);
+ const struct ofp13_meter_mod *omm = ofpbuf_pull(&b, sizeof *omm);
/* Translate the message. */
mm->command = ntohs(omm->command);
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;
-
- ofpbuf_use_const(&b, oh, ntohs(oh->length));
- raw = ofpraw_pull_assert(&b);
+ struct ofpbuf b = ofpbuf_const_initializer(oh, ntohs(oh->length));
+ enum ofpraw raw = ofpraw_pull_assert(&b);
switch ((int) raw) {
case OFPRAW_OFPT10_QUEUE_GET_CONFIG_REQUEST:
}
len -= sizeof *oqd14;
- struct ofpbuf properties;
- ofpbuf_use_const(&properties, ofpbuf_pull(msg, len), len);
+ struct ofpbuf properties = ofpbuf_const_initializer(ofpbuf_pull(msg, len),
+ len);
while (properties.size > 0) {
struct ofpbuf payload;
uint64_t type;
ofputil_decode_flow_stats_request(struct ofputil_flow_stats_request *fsr,
const struct ofp_header *oh)
{
- enum ofpraw raw;
- struct ofpbuf b;
-
- ofpbuf_use_const(&b, oh, ntohs(oh->length));
- raw = ofpraw_pull_assert(&b);
+ struct ofpbuf b = ofpbuf_const_initializer(oh, ntohs(oh->length));
+ enum ofpraw raw = ofpraw_pull_assert(&b);
switch ((int) raw) {
case OFPRAW_OFPST10_FLOW_REQUEST:
return ofputil_decode_ofpst10_flow_request(fsr, b.data, false);
ofputil_decode_aggregate_stats_reply(struct ofputil_aggregate_stats *stats,
const struct ofp_header *reply)
{
- struct ofp_aggregate_stats_reply *asr;
- struct ofpbuf msg;
-
- ofpbuf_use_const(&msg, reply, ntohs(reply->length));
+ struct ofpbuf msg = ofpbuf_const_initializer(reply, ntohs(reply->length));
ofpraw_pull_assert(&msg);
- asr = msg.msg;
+ struct ofp_aggregate_stats_reply *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);
ofputil_decode_flow_removed(struct ofputil_flow_removed *fr,
const struct ofp_header *oh)
{
- enum ofpraw raw;
- struct ofpbuf b;
-
- ofpbuf_use_const(&b, oh, ntohs(oh->length));
- raw = ofpraw_pull_assert(&b);
+ struct ofpbuf b = ofpbuf_const_initializer(oh, ntohs(oh->length));
+ enum ofpraw raw = ofpraw_pull_assert(&b);
if (raw == OFPRAW_OFPT11_FLOW_REMOVED) {
const struct ofp12_flow_removed *ofr;
enum ofperr error;
return msg;
}
+/* The caller has done basic initialization of '*pin'; the other output
+ * arguments needs to be initialized. */
+static enum ofperr
+decode_nx_packet_in2(const struct ofp_header *oh,
+ struct ofputil_packet_in *pin,
+ size_t *total_len, uint32_t *buffer_id)
+{
+ *total_len = 0;
+ *buffer_id = UINT32_MAX;
+
+ struct ofpbuf properties;
+ ofpbuf_use_const(&properties, oh, ntohs(oh->length));
+ ofpraw_pull_assert(&properties);
+
+ while (properties.size > 0) {
+ struct ofpbuf payload;
+ uint64_t type;
+
+ enum ofperr error = ofpprop_pull(&properties, &payload, &type);
+ if (error) {
+ return error;
+ }
+
+ switch (type) {
+ case NXPINT_PACKET:
+ pin->packet = payload.msg;
+ pin->packet_len = ofpbuf_msgsize(&payload);
+ break;
+
+ case NXPINT_FULL_LEN: {
+ uint32_t u32;
+ error = ofpprop_parse_u32(&payload, &u32);
+ *total_len = u32;
+ break;
+ }
+
+ case NXPINT_BUFFER_ID:
+ error = ofpprop_parse_u32(&payload, buffer_id);
+ break;
+
+ case NXPINT_TABLE_ID:
+ error = ofpprop_parse_u8(&payload, &pin->table_id);
+ break;
+
+ case NXPINT_COOKIE:
+ error = ofpprop_parse_be64(&payload, &pin->cookie);
+ break;
+
+ case NXPINT_REASON: {
+ uint8_t reason;
+ error = ofpprop_parse_u8(&payload, &reason);
+ pin->reason = reason;
+ break;
+ }
+
+ case NXPINT_METADATA:
+ error = oxm_decode_match(payload.msg, ofpbuf_msgsize(&payload),
+ &pin->flow_metadata);
+ break;
+
+ case NXPINT_USERDATA:
+ pin->userdata = payload.msg;
+ pin->userdata_len = ofpbuf_msgsize(&payload);
+ break;
+
+ default:
+ error = OFPPROP_UNKNOWN(true, "NX_PACKET_IN2", type);
+ break;
+ }
+ if (error) {
+ return error;
+ }
+ }
+
+ if (!pin->packet_len) {
+ VLOG_WARN_RL(&bad_ofmsg_rl, "NXT_PACKET_IN2 lacks packet");
+ return OFPERR_OFPBRC_BAD_LEN;
+ } else if (!*total_len) {
+ *total_len = pin->packet_len;
+ } else if (*total_len < pin->packet_len) {
+ VLOG_WARN_RL(&bad_ofmsg_rl, "NXT_PACKET_IN2 claimed full_len < len");
+ return OFPERR_OFPBRC_BAD_LEN;
+ }
+
+ return 0;
+}
+
/* Decodes the packet-in message starting at 'oh' into '*pin'. Populates
* 'pin->packet' and 'pin->len' with the part of the packet actually included
* in the message, and '*total_len' with the original length of the packet
struct ofputil_packet_in *pin,
size_t *total_len, uint32_t *buffer_id)
{
- enum ofpraw raw;
- struct ofpbuf b;
-
memset(pin, 0, sizeof *pin);
pin->cookie = OVS_BE64_MAX;
- ofpbuf_use_const(&b, oh, ntohs(oh->length));
- raw = ofpraw_pull_assert(&b);
+ struct ofpbuf b = ofpbuf_const_initializer(oh, ntohs(oh->length));
+ enum ofpraw raw = ofpraw_pull_assert(&b);
if (raw == OFPRAW_OFPT13_PACKET_IN || raw == OFPRAW_OFPT12_PACKET_IN) {
const struct ofp12_packet_in *opi = ofpbuf_pull(&b, sizeof *opi);
const ovs_be64 *cookie = (raw == OFPRAW_OFPT13_PACKET_IN
}
pin->packet = b.data;
- pin->len = b.size;
+ 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->len = b.size;
+ pin->packet = CONST_CAST(uint8_t *, opi->data);
+ pin->packet_len = b.size;
match_init_catchall(&pin->flow_metadata);
match_set_in_port(&pin->flow_metadata,
opi = ofpbuf_pull(&b, sizeof *opi);
pin->packet = b.data;
- pin->len = b.size;
+ pin->packet_len = b.size;
*buffer_id = ntohl(opi->buffer_id);
error = ofputil_port_from_ofp11(opi->in_port, &in_port);
*total_len = ntohs(npi->total_len);
pin->packet = b.data;
- pin->len = b.size;
+ pin->packet_len = b.size;
+ } else if (raw == OFPRAW_NXT_PACKET_IN2) {
+ return decode_nx_packet_in2(oh, pin, total_len, buffer_id);
} else {
OVS_NOT_REACHED();
}
struct ofpbuf *msg;
msg = ofpraw_alloc_xid(OFPRAW_OFPT10_PACKET_IN, OFP10_VERSION,
- htonl(0), pin->len);
+ htonl(0), pin->packet_len);
opi = ofpbuf_put_zeros(msg, offsetof(struct ofp10_packet_in, data));
- opi->total_len = htons(pin->len);
+ opi->total_len = htons(pin->packet_len);
opi->in_port = htons(ofp_to_u16(pin->flow_metadata.flow.in_port.ofp_port));
opi->reason = encode_packet_in_reason(pin->reason, OFP10_VERSION);
opi->buffer_id = htonl(buffer_id);
static struct ofpbuf *
ofputil_encode_nx_packet_in(const struct ofputil_packet_in *pin,
- uint32_t buffer_id)
+ enum ofp_version version, uint32_t buffer_id)
{
struct nx_packet_in *npi;
struct ofpbuf *msg;
size_t match_len;
/* The final argument is just an estimate of the space required. */
- msg = ofpraw_alloc_xid(OFPRAW_NXT_PACKET_IN, OFP10_VERSION,
- htonl(0), NXM_TYPICAL_LEN + 2 + pin->len);
+ msg = ofpraw_alloc_xid(OFPRAW_NXT_PACKET_IN, version,
+ htonl(0), NXM_TYPICAL_LEN + 2 + pin->packet_len);
ofpbuf_put_zeros(msg, sizeof *npi);
match_len = nx_put_match(msg, &pin->flow_metadata, 0, 0);
ofpbuf_put_zeros(msg, 2);
npi = msg->msg;
npi->buffer_id = htonl(buffer_id);
- npi->total_len = htons(pin->len);
- npi->reason = encode_packet_in_reason(pin->reason, OFP10_VERSION);
+ npi->total_len = htons(pin->packet_len);
+ npi->reason = encode_packet_in_reason(pin->reason, version);
npi->table_id = pin->table_id;
npi->cookie = pin->cookie;
npi->match_len = htons(match_len);
return msg;
}
+static struct ofpbuf *
+ofputil_encode_nx_packet_in2(const struct ofputil_packet_in *pin,
+ enum ofp_version version, uint32_t buffer_id,
+ size_t include_bytes)
+{
+ /* 'extra' is just an estimate of the space required. */
+ size_t extra = include_bytes + NXM_TYPICAL_LEN + 256;
+ struct ofpbuf *msg = ofpraw_alloc_xid(OFPRAW_NXT_PACKET_IN2, version,
+ htonl(0), extra);
+
+ /* Add packet properties. */
+ ofpprop_put(msg, NXPINT_PACKET, pin->packet, include_bytes);
+ if (include_bytes != pin->packet_len) {
+ ofpprop_put_u32(msg, NXPINT_FULL_LEN, pin->packet_len);
+ }
+ if (buffer_id != UINT32_MAX) {
+ ofpprop_put_u32(msg, NXPINT_BUFFER_ID, buffer_id);
+ }
+
+ /* Add flow properties. */
+ ofpprop_put_u8(msg, NXPINT_TABLE_ID, pin->table_id);
+ if (pin->cookie != OVS_BE64_MAX) {
+ ofpprop_put_be64(msg, NXPINT_COOKIE, pin->cookie);
+ }
+
+ /* Add other properties. */
+ ofpprop_put_u8(msg, NXPINT_REASON,
+ encode_packet_in_reason(pin->reason, version));
+
+ size_t start = ofpprop_start(msg, NXPINT_METADATA);
+ oxm_put_raw(msg, &pin->flow_metadata, version);
+ ofpprop_end(msg, start);
+
+ if (pin->userdata_len) {
+ ofpprop_put(msg, NXPINT_USERDATA, pin->userdata, pin->userdata_len);
+ }
+
+ ofpmsg_update_length(msg);
+ return msg;
+}
+
static struct ofpbuf *
ofputil_encode_ofp11_packet_in(const struct ofputil_packet_in *pin,
uint32_t buffer_id)
struct ofpbuf *msg;
msg = ofpraw_alloc_xid(OFPRAW_OFPT11_PACKET_IN, OFP11_VERSION,
- htonl(0), pin->len);
+ htonl(0), pin->packet_len);
opi = ofpbuf_put_zeros(msg, sizeof *opi);
opi->buffer_id = htonl(buffer_id);
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->len);
+ opi->total_len = htons(pin->packet_len);
opi->reason = encode_packet_in_reason(pin->reason, OFP11_VERSION);
opi->table_id = pin->table_id;
/* The final argument is just an estimate of the space required. */
msg = ofpraw_alloc_xid(raw, version,
- htonl(0), NXM_TYPICAL_LEN + 2 + pin->len);
+ htonl(0), NXM_TYPICAL_LEN + 2 + pin->packet_len);
struct ofp12_packet_in *opi = ofpbuf_put_zeros(msg, sizeof *opi);
opi->buffer_id = htonl(buffer_id);
- opi->total_len = htons(pin->len);
+ opi->total_len = htons(pin->packet_len);
opi->reason = encode_packet_in_reason(pin->reason, version);
opi->table_id = pin->table_id;
ofp_port_t in_port = pin->flow_metadata.flow.in_port.ofp_port;
uint32_t buffer_id = (max_len != OFPCML12_NO_BUFFER && pktbuf
? pktbuf_save(pktbuf, pin->packet,
- pin->len, in_port)
+ pin->packet_len, in_port)
: UINT32_MAX);
+ /* Calculate the number of bytes of the packet to include in the
+ * packet-in:
+ *
+ * - If not buffered, the whole thing.
+ *
+ * - Otherwise, no more than 'max_len' bytes. */
+ size_t include_bytes = (buffer_id == UINT32_MAX
+ ? pin->packet_len
+ : MIN(max_len, pin->packet_len));
+
struct ofpbuf *msg;
- switch (protocol) {
- case OFPUTIL_P_OF10_STD:
- case OFPUTIL_P_OF10_STD_TID:
- case OFPUTIL_P_OF10_NXM:
- case OFPUTIL_P_OF10_NXM_TID:
- msg = (packet_in_format == NXPIF_NXM
- ? ofputil_encode_nx_packet_in(pin, buffer_id)
- : ofputil_encode_ofp10_packet_in(pin, buffer_id));
- break;
+ switch (packet_in_format) {
+ case NXPIF_STANDARD:
+ switch (protocol) {
+ case OFPUTIL_P_OF10_STD:
+ case OFPUTIL_P_OF10_STD_TID:
+ case OFPUTIL_P_OF10_NXM:
+ case OFPUTIL_P_OF10_NXM_TID:
+ msg = ofputil_encode_ofp10_packet_in(pin, buffer_id);
+ break;
- case OFPUTIL_P_OF11_STD:
- msg = ofputil_encode_ofp11_packet_in(pin, buffer_id);
+ case OFPUTIL_P_OF11_STD:
+ msg = ofputil_encode_ofp11_packet_in(pin, buffer_id);
+ break;
+
+ case OFPUTIL_P_OF12_OXM:
+ case OFPUTIL_P_OF13_OXM:
+ case OFPUTIL_P_OF14_OXM:
+ case OFPUTIL_P_OF15_OXM:
+ msg = ofputil_encode_ofp12_packet_in(pin, version, buffer_id);
+ break;
+
+ default:
+ OVS_NOT_REACHED();
+ }
break;
- case OFPUTIL_P_OF12_OXM:
- case OFPUTIL_P_OF13_OXM:
- case OFPUTIL_P_OF14_OXM:
- case OFPUTIL_P_OF15_OXM:
- msg = ofputil_encode_ofp12_packet_in(pin, version, buffer_id);
+ case NXPIF_NXT_PACKET_IN:
+ msg = ofputil_encode_nx_packet_in(pin, version, buffer_id);
break;
+ case NXPIF_NXT_PACKET_IN2:
+ return ofputil_encode_nx_packet_in2(pin, version, buffer_id,
+ include_bytes);
+
default:
OVS_NOT_REACHED();
}
- /* Append some of the packet:
- *
- * - If not buffered, the whole thing.
- *
- * - Otherwise, no more than 'max_len' bytes. */
- ofpbuf_put(msg, pin->packet,
- (buffer_id == UINT32_MAX
- ? pin->len
- : MIN(max_len, pin->len)));
-
+ ofpbuf_put(msg, pin->packet, include_bytes);
ofpmsg_update_length(msg);
return msg;
}
const struct ofp_header *oh,
struct ofpbuf *ofpacts)
{
- enum ofpraw raw;
- struct ofpbuf b;
-
- ofpbuf_use_const(&b, oh, ntohs(oh->length));
- raw = ofpraw_pull_assert(&b);
+ struct ofpbuf b = ofpbuf_const_initializer(oh, ntohs(oh->length));
+ enum ofpraw raw = ofpraw_pull_assert(&b);
ofpbuf_clear(ofpacts);
if (raw == OFPRAW_OFPT11_PACKET_OUT) {
static enum ofperr
ofputil_pull_ofp14_port(struct ofputil_phy_port *pp, struct ofpbuf *msg)
{
- struct ofpbuf properties;
- struct ofp14_port *op;
- enum ofperr error;
- size_t len;
-
- op = ofpbuf_try_pull(msg, sizeof *op);
+ struct ofp14_port *op = ofpbuf_try_pull(msg, sizeof *op);
if (!op) {
return OFPERR_OFPBRC_BAD_LEN;
}
- len = ntohs(op->length);
+ size_t len = ntohs(op->length);
if (len < sizeof *op || len - sizeof *op > msg->size) {
return OFPERR_OFPBRC_BAD_LEN;
}
len -= sizeof *op;
- ofpbuf_use_const(&properties, ofpbuf_pull(msg, len), len);
- error = ofputil_port_from_ofp11(op->port_no, &pp->port_no);
+ enum ofperr error = ofputil_port_from_ofp11(op->port_no, &pp->port_no);
if (error) {
return error;
}
pp->config = ntohl(op->config) & OFPPC11_ALL;
pp->state = ntohl(op->state) & OFPPS11_ALL;
+ struct ofpbuf properties = ofpbuf_const_initializer(ofpbuf_pull(msg, len),
+ len);
while (properties.size > 0) {
struct ofpbuf payload;
enum ofperr error;
ofputil_decode_port_desc_stats_request(const struct ofp_header *request,
ofp_port_t *port)
{
- struct ofpbuf b;
- enum ofpraw raw;
-
- ofpbuf_use_const(&b, request, ntohs(request->length));
- raw = ofpraw_pull_assert(&b);
+ struct ofpbuf b = ofpbuf_const_initializer(request,
+ ntohs(request->length));
+ enum ofpraw raw = ofpraw_pull_assert(&b);
if (raw == OFPRAW_OFPST10_PORT_DESC_REQUEST) {
*port = OFPP_ANY;
return 0;
ofputil_decode_switch_config(const struct ofp_header *oh,
struct ofputil_switch_config *config)
{
- const struct ofp_switch_config *osc;
- struct ofpbuf b;
-
- ofpbuf_use_const(&b, oh, ntohs(oh->length));
+ struct ofpbuf b = ofpbuf_const_initializer(oh, ntohs(oh->length));
ofpraw_pull_assert(&b);
- osc = ofpbuf_pull(&b, sizeof *osc);
+ const struct ofp_switch_config *osc = ofpbuf_pull(&b, sizeof *osc);
config->frag = ntohs(osc->flags) & OFPC_FRAG_MASK;
config->miss_send_len = ntohs(osc->miss_send_len);
}
}
-/* 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. */
+/* Pulls an OpenFlow "switch_features" structure from 'b' and decodes it into
+ * an abstract representation in '*features', readying '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. */
enum ofperr
-ofputil_decode_switch_features(const struct ofp_header *oh,
- struct ofputil_switch_features *features,
- struct ofpbuf *b)
+ofputil_pull_switch_features(struct ofpbuf *b,
+ struct ofputil_switch_features *features)
{
- const struct ofp_switch_features *osf;
- enum ofpraw raw;
-
- ofpbuf_use_const(b, oh, ntohs(oh->length));
- raw = ofpraw_pull_assert(b);
-
- osf = ofpbuf_pull(b, sizeof *osf);
+ const struct ofp_header *oh = b->data;
+ enum ofpraw raw = ofpraw_pull_assert(b);
+ const struct ofp_switch_features *osf = ofpbuf_pull(b, sizeof *osf);
features->datapath_id = ntohll(osf->datapath_id);
features->n_buffers = ntohl(osf->n_buffers);
features->n_tables = osf->n_tables;
ofputil_decode_port_status(const struct ofp_header *oh,
struct ofputil_port_status *ps)
{
- const struct ofp_port_status *ops;
- struct ofpbuf b;
- int retval;
-
- ofpbuf_use_const(&b, oh, ntohs(oh->length));
+ struct ofpbuf b = ofpbuf_const_initializer(oh, ntohs(oh->length));
ofpraw_pull_assert(&b);
- ops = ofpbuf_pull(&b, sizeof *ops);
+ const struct ofp_port_status *ops = ofpbuf_pull(&b, sizeof *ops);
if (ops->reason != OFPPR_ADD &&
ops->reason != OFPPR_DELETE &&
ops->reason != OFPPR_MODIFY) {
}
ps->reason = ops->reason;
- retval = ofputil_pull_phy_port(oh->version, &b, &ps->desc);
+ int retval = ofputil_pull_phy_port(oh->version, &b, &ps->desc);
ovs_assert(retval != EOF);
return retval;
}
ofputil_decode_port_mod(const struct ofp_header *oh,
struct ofputil_port_mod *pm, bool loose)
{
- enum ofpraw raw;
- struct ofpbuf b;
-
- ofpbuf_use_const(&b, oh, ntohs(oh->length));
- raw = ofpraw_pull_assert(&b);
-
+ struct ofpbuf b = ofpbuf_const_initializer(oh, ntohs(oh->length));
+ enum ofpraw raw = ofpraw_pull_assert(&b);
if (raw == OFPRAW_OFPT10_PORT_MOD) {
const struct ofp10_port_mod *opm = b.data;
ofputil_decode_table_features(struct ofpbuf *msg,
struct ofputil_table_features *tf, bool loose)
{
- const struct ofp_header *oh;
- struct ofp13_table_features *otf;
- struct ofpbuf properties;
- unsigned int len;
-
memset(tf, 0, sizeof *tf);
if (!msg->header) {
ofpraw_pull_assert(msg);
}
- oh = msg->header;
if (!msg->size) {
return EOF;
}
+ const struct ofp_header *oh = msg->header;
+ struct ofp13_table_features *otf = msg->data;
if (msg->size < sizeof *otf) {
return OFPERR_OFPBPC_BAD_LEN;
}
- otf = msg->data;
- len = ntohs(otf->length);
+ unsigned int len = ntohs(otf->length);
if (len < sizeof *otf || len % 8 || len > msg->size) {
return OFPERR_OFPBPC_BAD_LEN;
}
- ofpbuf_use_const(&properties, ofpbuf_pull(msg, len), len);
- ofpbuf_pull(&properties, sizeof *otf);
tf->table_id = otf->table_id;
if (tf->table_id == OFPTT_ALL) {
}
tf->max_entries = ntohl(otf->max_entries);
+ struct ofpbuf properties = ofpbuf_const_initializer(ofpbuf_pull(msg, len),
+ len);
+ ofpbuf_pull(&properties, sizeof *otf);
while (properties.size > 0) {
struct ofpbuf payload;
enum ofperr error;
struct ofputil_table_desc *td,
enum ofp_version version)
{
- struct ofp14_table_desc *otd;
- struct ofpbuf properties;
- size_t length;
-
memset(td, 0, sizeof *td);
if (!msg->header) {
return EOF;
}
- otd = ofpbuf_try_pull(msg, sizeof *otd);
+ struct ofp14_table_desc *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);
}
td->table_id = otd->table_id;
- length = ntohs(otd->length);
+ size_t 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;
+ struct ofpbuf properties = ofpbuf_const_initializer(
+ ofpbuf_pull(msg, length), length);
while (properties.size > 0) {
struct ofpbuf payload;
enum ofperr error;
ofputil_decode_table_mod(const struct ofp_header *oh,
struct ofputil_table_mod *pm)
{
- 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);
+ struct ofpbuf b = ofpbuf_const_initializer(oh, ntohs(oh->length));
+ enum ofpraw raw = ofpraw_pull_assert(&b);
if (raw == OFPRAW_OFPT11_TABLE_MOD) {
const struct ofp11_table_mod *otm = b.data;
ofputil_decode_role_message(const struct ofp_header *oh,
struct ofputil_role_request *rr)
{
- struct ofpbuf b;
- enum ofpraw raw;
-
- ofpbuf_use_const(&b, oh, ntohs(oh->length));
- raw = ofpraw_pull_assert(&b);
-
+ struct ofpbuf b = ofpbuf_const_initializer(oh, ntohs(oh->length));
+ enum ofpraw raw = ofpraw_pull_assert(&b);
if (raw == OFPRAW_OFPT12_ROLE_REQUEST ||
raw == OFPRAW_OFPT12_ROLE_REPLY) {
const struct ofp12_role_request *orr = b.msg;
ofputil_decode_role_status(const struct ofp_header *oh,
struct ofputil_role_status *rs)
{
- struct ofpbuf b;
- enum ofpraw raw;
- const struct ofp14_role_status *r;
-
- ofpbuf_use_const(&b, oh, ntohs(oh->length));
- raw = ofpraw_pull_assert(&b);
+ struct ofpbuf b = ofpbuf_const_initializer(oh, ntohs(oh->length));
+ enum ofpraw raw = ofpraw_pull_assert(&b);
ovs_assert(raw == OFPRAW_OFPT14_ROLE_STATUS);
- r = b.msg;
+ const struct ofp14_role_status *r = b.msg;
if (r->role != htonl(OFPCR12_ROLE_NOCHANGE) &&
r->role != htonl(OFPCR12_ROLE_EQUAL) &&
r->role != htonl(OFPCR12_ROLE_MASTER) &&
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));
+ struct ofpbuf b = ofpbuf_const_initializer(outer, ntohs(outer->length));
/* Skip past outer message. */
enum ofpraw outer_raw = ofpraw_pull_assert(&b);
/* Parse inner message. */
enum ofptype type;
- error = ofptype_decode(&type, inner);
+ enum ofperr error = ofptype_decode(&type, inner);
if (error) {
return error;
}
struct ofpbuf *
make_echo_reply(const struct ofp_header *rq)
{
- struct ofpbuf rq_buf;
- struct ofpbuf *reply;
-
- ofpbuf_use_const(&rq_buf, rq, ntohs(rq->length));
+ struct ofpbuf rq_buf = ofpbuf_const_initializer(rq, ntohs(rq->length));
ofpraw_pull_assert(&rq_buf);
- reply = ofpraw_alloc_reply(OFPRAW_OFPT_ECHO_REPLY, rq, rq_buf.size);
+ struct ofpbuf *reply = ofpraw_alloc_reply(OFPRAW_OFPT_ECHO_REPLY,
+ rq, rq_buf.size);
ofpbuf_put(reply, rq_buf.data, rq_buf.size);
return reply;
}
ofputil_pull_ofp14_port_stats(struct ofputil_port_stats *ops,
struct ofpbuf *msg)
{
- const struct ofp14_port_stats *ps14;
- struct ofpbuf properties;
- enum ofperr error;
- size_t len;
-
- ps14 = ofpbuf_try_pull(msg, sizeof *ps14);
+ const struct ofp14_port_stats *ps14 = ofpbuf_try_pull(msg, sizeof *ps14);
if (!ps14) {
return OFPERR_OFPBRC_BAD_LEN;
}
- len = ntohs(ps14->length);
+ size_t len = ntohs(ps14->length);
if (len < sizeof *ps14 || len - sizeof *ps14 > msg->size) {
return OFPERR_OFPBRC_BAD_LEN;
}
len -= sizeof *ps14;
- ofpbuf_use_const(&properties, ofpbuf_pull(msg, len), len);
- error = ofputil_port_from_ofp11(ps14->port_no, &ops->port_no);
+ enum ofperr error = ofputil_port_from_ofp11(ps14->port_no, &ops->port_no);
if (error) {
return error;
}
ops->stats.rx_crc_errors = UINT64_MAX;
ops->stats.collisions = UINT64_MAX;
+ struct ofpbuf properties = ofpbuf_const_initializer(ofpbuf_pull(msg, len),
+ len);
while (properties.size > 0) {
struct ofpbuf payload;
enum ofperr error;
size_t
ofputil_count_port_stats(const struct ofp_header *oh)
{
- struct ofputil_port_stats ps;
- struct ofpbuf b;
- size_t n = 0;
-
- ofpbuf_use_const(&b, oh, ntohs(oh->length));
+ struct ofpbuf b = ofpbuf_const_initializer(oh, ntohs(oh->length));
ofpraw_pull_assert(&b);
- while (!ofputil_decode_port_stats(&ps, &b)) {
- n++;
+
+ for (size_t n = 0; ; n++) {
+ struct ofputil_port_stats ps;
+ if (ofputil_decode_port_stats(&ps, &b)) {
+ return n;
+ }
}
- return n;
}
/* Converts an OFPST_PORT_STATS reply in 'msg' into an abstract
uint32_t
ofputil_decode_group_desc_request(const struct ofp_header *oh)
{
- struct ofpbuf request;
- enum ofpraw raw;
-
- ofpbuf_use_const(&request, oh, ntohs(oh->length));
- raw = ofpraw_pull_assert(&request);
+ struct ofpbuf request = ofpbuf_const_initializer(oh, ntohs(oh->length));
+ enum ofpraw raw = ofpraw_pull_assert(&request);
if (raw == OFPRAW_OFPST11_GROUP_DESC_REQUEST) {
return OFPG_ALL;
} else if (raw == OFPRAW_OFPST15_GROUP_DESC_REQUEST) {
struct ofputil_bucket *bucket = NULL;
struct ofpbuf ofpacts;
enum ofperr err = OFPERR_OFPGMFC_BAD_BUCKET;
- struct ofpbuf properties;
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);
}
properties_len = ob_len - sizeof *ob - actions_len;
- ofpbuf_use_const(&properties, ofpbuf_pull(msg, properties_len),
- properties_len);
-
+ struct ofpbuf properties = ofpbuf_const_initializer(
+ ofpbuf_pull(msg, properties_len), properties_len);
while (properties.size > 0) {
struct ofpbuf payload;
uint64_t type;
struct ofputil_group_props *gp,
size_t properties_len)
{
- struct ofpbuf properties;
-
- ofpbuf_use_const(&properties, ofpbuf_pull(msg, properties_len),
- properties_len);
-
+ struct ofpbuf properties = ofpbuf_const_initializer(
+ ofpbuf_pull(msg, properties_len), properties_len);
while (properties.size > 0) {
struct ofpbuf payload;
enum ofperr error;
ofputil_decode_group_mod(const struct ofp_header *oh,
struct ofputil_group_mod *gm)
{
- enum ofp_version ofp_version = oh->version;
- struct ofpbuf msg;
- struct ofputil_bucket *bucket;
- enum ofperr err;
+ ofputil_init_group_properties(&gm->props);
- ofpbuf_use_const(&msg, oh, ntohs(oh->length));
+ enum ofp_version ofp_version = oh->version;
+ struct ofpbuf msg = ofpbuf_const_initializer(oh, ntohs(oh->length));
ofpraw_pull_assert(&msg);
- ofputil_init_group_properties(&gm->props);
-
+ enum ofperr err;
switch (ofp_version)
{
case OFP11_VERSION:
default:
OVS_NOT_REACHED();
}
-
if (err) {
return err;
}
return OFPERR_OFPGMFC_BAD_COMMAND;
}
+ struct ofputil_bucket *bucket;
LIST_FOR_EACH (bucket, list_node, &gm->buckets) {
if (bucket->weight && gm->type != OFPGT11_SELECT) {
return OFPERR_OFPGMFC_INVALID_GROUP;
size_t
ofputil_count_queue_stats(const struct ofp_header *oh)
{
- struct ofputil_queue_stats qs;
- struct ofpbuf b;
- size_t n = 0;
-
- ofpbuf_use_const(&b, oh, ntohs(oh->length));
+ struct ofpbuf b = ofpbuf_const_initializer(oh, ntohs(oh->length));
ofpraw_pull_assert(&b);
- while (!ofputil_decode_queue_stats(&qs, &b)) {
- n++;
+
+ for (size_t n = 0; ; n++) {
+ struct ofputil_queue_stats qs;
+ if (ofputil_decode_queue_stats(&qs, &b)) {
+ return n;
+ }
}
- return n;
}
static enum ofperr
ofputil_decode_bundle_ctrl(const struct ofp_header *oh,
struct ofputil_bundle_ctrl_msg *msg)
{
- struct ofpbuf b;
- enum ofpraw raw;
- const struct ofp14_bundle_ctrl_msg *m;
-
- ofpbuf_use_const(&b, oh, ntohs(oh->length));
- raw = ofpraw_pull_assert(&b);
+ struct ofpbuf b = ofpbuf_const_initializer(oh, ntohs(oh->length));
+ enum ofpraw raw = ofpraw_pull_assert(&b);
ovs_assert(raw == OFPRAW_OFPT14_BUNDLE_CONTROL);
- m = b.msg;
+ const struct ofp14_bundle_ctrl_msg *m = b.msg;
msg->bundle_id = ntohl(m->bundle_id);
msg->type = ntohs(m->type);
msg->flags = ntohs(m->flags);
enum ofperr
ofputil_decode_bundle_add(const struct ofp_header *oh,
struct ofputil_bundle_add_msg *msg,
- enum ofptype *type_ptr)
+ enum ofptype *typep)
{
- 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);
+ struct ofpbuf b = ofpbuf_const_initializer(oh, ntohs(oh->length));
+ enum ofpraw raw = ofpraw_pull_assert(&b);
ovs_assert(raw == OFPRAW_OFPT14_BUNDLE_ADD_MESSAGE);
- m = ofpbuf_pull(&b, sizeof *m);
+ const struct ofp14_bundle_ctrl_msg *m = ofpbuf_pull(&b, sizeof *m);
msg->bundle_id = ntohl(m->bundle_id);
msg->flags = ntohs(m->flags);
if (msg->msg->version != oh->version) {
return OFPERR_NXBFC_BAD_VERSION;
}
- inner_len = ntohs(msg->msg->length);
+ size_t inner_len = ntohs(msg->msg->length);
if (inner_len < sizeof(struct ofp_header) || inner_len > b.size) {
return OFPERR_OFPBFC_MSG_BAD_LEN;
}
}
/* Reject unbundlable messages. */
- if (!type_ptr) {
- type_ptr = &type;
- }
- error = ofptype_decode(type_ptr, msg->msg);
+ enum ofptype type;
+ enum ofperr error = ofptype_decode(&type, 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)) {
+ if (!ofputil_is_bundlable(type)) {
VLOG_WARN_RL(&bad_ofmsg_rl, "%s message not allowed inside "
- "OFPT14_BUNDLE_ADD_MESSAGE", ofptype_get_name(*type_ptr));
+ "OFPT14_BUNDLE_ADD_MESSAGE", ofptype_get_name(type));
return OFPERR_OFPBFC_MSG_UNSUP;
}
+ if (typep) {
+ *typep = type;
+ }
return 0;
}
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));
+ struct ofpbuf msg = ofpbuf_const_initializer(oh, ntohs(oh->length));
ofpraw_pull_assert(&msg);
- nx_ttm = ofpbuf_pull(&msg, sizeof *nx_ttm);
+ struct nx_tlv_table_mod *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,
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));
+ struct ofpbuf msg = ofpbuf_const_initializer(oh, ntohs(oh->length));
ofpraw_pull_assert(&msg);
- nx_ttr = ofpbuf_pull(&msg, sizeof *nx_ttr);
+ struct nx_tlv_table_reply *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);
const struct ofputil_async_cfg *basis,
struct ofputil_async_cfg *ac)
{
- enum ofpraw raw;
- struct ofpbuf b;
-
- ofpbuf_use_const(&b, oh, ntohs(oh->length));
- raw = ofpraw_pull_assert(&b);
+ struct ofpbuf b = ofpbuf_const_initializer(oh, ntohs(oh->length));
+ enum ofpraw raw = ofpraw_pull_assert(&b);
if (raw == OFPRAW_OFPT13_SET_ASYNC ||
raw == OFPRAW_NXT_SET_ASYNC_CONFIG ||
projects / cascardo / ovs.git / blobdiff