void
ofputil_wildcard_from_ofpfw10(uint32_t ofpfw, struct flow_wildcards *wc)
{
- BUILD_ASSERT_DECL(FLOW_WC_SEQ == 25);
+ BUILD_ASSERT_DECL(FLOW_WC_SEQ == 26);
/* Initialize most of wc. */
flow_wildcards_init_catchall(wc);
ofputil_pull_ofp11_match(struct ofpbuf *buf, struct match *match,
uint16_t *padded_match_len)
{
- struct ofp11_match_header *omh = buf->data;
+ struct ofp11_match_header *omh = ofpbuf_data(buf);
uint16_t match_len;
- if (buf->size < sizeof *omh) {
+ if (ofpbuf_size(buf) < sizeof *omh) {
return OFPERR_OFPBMC_BAD_LEN;
}
case OFPMT_STANDARD: {
struct ofp11_match *om;
- if (match_len != sizeof *om || buf->size < sizeof *om) {
+ if (match_len != sizeof *om || ofpbuf_size(buf) < sizeof *om) {
return OFPERR_OFPBMC_BAD_LEN;
}
om = ofpbuf_pull(buf, sizeof *om);
ofpbuf_pull(&msg, sizeof *oh);
*allowed_versions = version_bitmap_from_version(oh->version);
- while (msg.size) {
+ while (ofpbuf_size(&msg)) {
const struct ofp_hello_elem_header *oheh;
unsigned int len;
- if (msg.size < sizeof *oheh) {
+ if (ofpbuf_size(&msg) < sizeof *oheh) {
return false;
}
- oheh = msg.data;
+ oheh = ofpbuf_data(&msg);
len = ntohs(oheh->length);
if (len < sizeof *oheh || !ofpbuf_try_pull(&msg, ROUND_UP(len, 8))) {
return false;
return error;
}
- error = ofpacts_pull_openflow_instructions(&b, b.size, oh->version,
+ error = ofpacts_pull_openflow_instructions(&b, ofpbuf_size(&b), oh->version,
ofpacts);
if (error) {
return error;
ofputil_normalize_match(&fm->match);
/* Now get the actions. */
- error = ofpacts_pull_openflow_actions(&b, b.size, oh->version,
+ error = ofpacts_pull_openflow_actions(&b, ofpbuf_size(&b), oh->version,
ofpacts);
if (error) {
return error;
if (error) {
return error;
}
- error = ofpacts_pull_openflow_actions(&b, b.size, oh->version,
+ error = ofpacts_pull_openflow_actions(&b, ofpbuf_size(&b), oh->version,
ofpacts);
if (error) {
return error;
}
}
- fm->ofpacts = ofpacts->data;
- fm->ofpacts_len = ofpacts->size;
+ fm->ofpacts = ofpbuf_data(ofpacts);
+ fm->ofpacts_len = ofpbuf_size(ofpacts);
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 = bands->data;
+ mm->meter.bands = ofpbuf_data(bands);
- error = ofputil_pull_bands(&b, b.size, &mm->meter.n_bands, bands);
+ error = ofputil_pull_bands(&b, ofpbuf_size(&b), &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 = msg->size;
+ 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);
ofputil_put_bands(mc->n_bands, mc->bands, msg);
- reply->length = htons(msg->size - start_ofs);
+ reply->length = htons(ofpbuf_size(msg) - start_ofs);
ofpmp_postappend(replies, start_ofs);
}
enum ofperr err;
/* Pull OpenFlow headers for the first call. */
- if (!msg->l2) {
+ if (!msg->frame) {
ofpraw_pull_assert(msg);
}
- if (!msg->size) {
+ if (!ofpbuf_size(msg)) {
return EOF;
}
if (!omc) {
VLOG_WARN_RL(&bad_ofmsg_rl,
"OFPMP_METER_CONFIG reply has %"PRIu32" leftover bytes at end",
- msg->size);
+ ofpbuf_size(msg));
return OFPERR_OFPBRC_BAD_LEN;
}
}
mc->meter_id = ntohl(omc->meter_id);
mc->flags = ntohs(omc->flags);
- mc->bands = bands->data;
+ mc->bands = ofpbuf_data(bands);
return 0;
}
enum ofperr err;
/* Pull OpenFlow headers for the first call. */
- if (!msg->l2) {
+ if (!msg->frame) {
ofpraw_pull_assert(msg);
}
- if (!msg->size) {
+ if (!ofpbuf_size(msg)) {
return EOF;
}
if (!oms) {
VLOG_WARN_RL(&bad_ofmsg_rl,
"OFPMP_METER reply has %"PRIu32" leftover bytes at end",
- msg->size);
+ ofpbuf_size(msg));
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 = bands->data;
+ ms->bands = ofpbuf_data(bands);
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_get_l3(msg);
+ nfm = ofpbuf_l3(msg);
nfm->idle_timeout = htons(fm->idle_timeout);
nfm->hard_timeout = htons(fm->hard_timeout);
nfm->priority = htons(fm->priority);
if (error) {
return error;
}
- if (b->size) {
+ if (ofpbuf_size(b)) {
return OFPERR_OFPBRC_BAD_LEN;
}
switch ((int) raw) {
case OFPRAW_OFPT10_QUEUE_GET_CONFIG_REQUEST:
- qgcr10 = b.data;
+ qgcr10 = ofpbuf_data(&b);
*port = u16_to_ofp(ntohs(qgcr10->port));
return 0;
case OFPRAW_OFPT11_QUEUE_GET_CONFIG_REQUEST:
- qgcr11 = b.data;
+ qgcr11 = ofpbuf_data(&b);
return ofputil_port_from_ofp11(qgcr11->port, port);
}
ofputil_append_queue_get_config_reply(struct ofpbuf *reply,
const struct ofputil_queue_config *oqc)
{
- const struct ofp_header *oh = reply->data;
+ const struct ofp_header *oh = ofpbuf_data(reply);
size_t start_ofs, len_ofs;
ovs_be16 *len;
- start_ofs = reply->size;
+ start_ofs = ofpbuf_size(reply);
if (oh->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 *) reply->data;
+ 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;
- qgcr11 = ofpbuf_get_l3(reply);
+ qgcr11 = ofpbuf_l3(reply);
port = qgcr11->port;
opq12 = ofpbuf_put_zeros(reply, sizeof *opq12);
opq12->port = port;
opq12->queue_id = htonl(oqc->queue_id);
- len_ofs = (char *) &opq12->len - (char *) reply->data;
+ len_ofs = (char *) &opq12->len - (char *) ofpbuf_data(reply);
}
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(reply->size - start_ofs);
+ *len = htons(ofpbuf_size(reply) - start_ofs);
}
/* Decodes the initial part of an OFPT_QUEUE_GET_CONFIG_REPLY from 'reply' and
unsigned int opq_len;
unsigned int len;
- if (!reply->size) {
+ if (!ofpbuf_size(reply)) {
return EOF;
}
queue->min_rate = UINT16_MAX;
queue->max_rate = UINT16_MAX;
- oh = reply->l2;
+ oh = reply->frame;
if (oh->version < OFP12_VERSION) {
const struct ofp10_packet_queue *opq10;
opq_len = sizeof *opq12;
}
- if (len < opq_len || len > reply->size + opq_len || len % 8) {
+ if (len < opq_len || len > ofpbuf_size(reply) + opq_len || len % 8) {
return OFPERR_OFPBRC_BAD_LEN;
}
len -= opq_len;
hdr = ofpbuf_at_assert(reply, 0, sizeof *hdr);
prop_len = ntohs(hdr->len);
- if (prop_len < sizeof *hdr || prop_len > reply->size || prop_len % 8) {
+ if (prop_len < sizeof *hdr || prop_len > ofpbuf_size(reply) || prop_len % 8) {
return OFPERR_OFPBRC_BAD_LEN;
}
raw = ofpraw_pull_assert(&b);
switch ((int) raw) {
case OFPRAW_OFPST10_FLOW_REQUEST:
- return ofputil_decode_ofpst10_flow_request(fsr, b.data, false);
+ return ofputil_decode_ofpst10_flow_request(fsr, ofpbuf_data(&b), false);
case OFPRAW_OFPST10_AGGREGATE_REQUEST:
- return ofputil_decode_ofpst10_flow_request(fsr, b.data, true);
+ return ofputil_decode_ofpst10_flow_request(fsr, ofpbuf_data(&b), 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_get_l3(msg);
+ nfsr = ofpbuf_l3(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->l2
- ? ofpraw_decode(&raw, msg->l2)
+ error = (msg->frame
+ ? ofpraw_decode(&raw, msg->frame)
: ofpraw_pull(&raw, msg));
if (error) {
return error;
}
- oh = msg->l2;
+ oh = msg->frame;
- if (!msg->size) {
+ if (!ofpbuf_size(msg)) {
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", msg->size);
+ "bytes at end", ofpbuf_size(msg));
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", msg->size);
+ "bytes at end", ofpbuf_size(msg));
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", msg->size);
+ "bytes at end", ofpbuf_size(msg));
return EINVAL;
}
OVS_NOT_REACHED();
}
- fs->ofpacts = ofpacts->data;
- fs->ofpacts_len = ofpacts->size;
+ fs->ofpacts = ofpbuf_data(ofpacts);
+ fs->ofpacts_len = ofpbuf_size(ofpacts);
return 0;
}
struct list *replies)
{
struct ofpbuf *reply = ofpbuf_from_list(list_back(replies));
- size_t start_ofs = reply->size;
+ size_t start_ofs = ofpbuf_size(reply);
enum ofpraw raw;
- enum ofp_version version = ((struct ofp_header *)reply->data)->version;
+ enum ofp_version version = ((struct ofp_header *)ofpbuf_data(reply))->version;
- ofpraw_decode_partial(&raw, reply->data, reply->size);
+ ofpraw_decode_partial(&raw, ofpbuf_data(reply), ofpbuf_size(reply));
if (raw == OFPRAW_OFPST11_FLOW_REPLY || raw == OFPRAW_OFPST13_FLOW_REPLY) {
struct ofp11_flow_stats *ofs;
version);
ofs = ofpbuf_at_assert(reply, start_ofs, sizeof *ofs);
- ofs->length = htons(reply->size - start_ofs);
+ ofs->length = htons(ofpbuf_size(reply) - 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(reply->size - start_ofs);
+ ofs->length = htons(ofpbuf_size(reply) - 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(reply->size - start_ofs);
+ nfs->length = htons(ofpbuf_size(reply) - 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_get_l3(&msg);
+ asr = ofpbuf_l3(&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 (b.size) {
+ if (ofpbuf_size(&b)) {
return OFPERR_OFPBRC_BAD_LEN;
}
nfr = ofpbuf_put_zeros(msg, sizeof *nfr);
match_len = nx_put_match(msg, &fr->match, 0, 0);
- nfr = ofpbuf_get_l3(msg);
+ nfr = ofpbuf_l3(msg);
nfr->cookie = fr->cookie;
nfr->priority = htons(fr->priority);
nfr->reason = fr->reason;
ofputil_decode_packet_in_finish(struct ofputil_packet_in *pin,
struct match *match, struct ofpbuf *b)
{
- pin->packet = b->data;
- pin->packet_len = b->size;
+ 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;
opi = ofpbuf_pull(&b, offsetof(struct ofp10_packet_in, data));
pin->packet = opi->data;
- pin->packet_len = b.size;
+ pin->packet_len = ofpbuf_size(&b);
pin->fmd.in_port = u16_to_ofp(ntohs(opi->in_port));
pin->reason = opi->reason;
opi = ofpbuf_pull(&b, sizeof *opi);
- pin->packet = b.data;
- pin->packet_len = b.size;
+ pin->packet = ofpbuf_data(&b);
+ pin->packet_len = ofpbuf_size(&b);
pin->buffer_id = ntohl(opi->buffer_id);
error = ofputil_port_from_ofp11(opi->in_port, &pin->fmd.in_port);
ofpbuf_put_zeros(packet, 2);
ofpbuf_put(packet, pin->packet, pin->packet_len);
- npi = ofpbuf_get_l3(packet);
+ npi = ofpbuf_l3(packet);
npi->buffer_id = htonl(pin->buffer_id);
npi->total_len = htons(pin->total_len);
npi->reason = pin->reason;
ofpbuf_put_zeros(packet, 2);
ofpbuf_put(packet, pin->packet, pin->packet_len);
- opi = ofpbuf_get_l3(packet);
+ opi = ofpbuf_l3(packet);
opi->pi.buffer_id = htonl(pin->buffer_id);
opi->pi.total_len = htons(pin->total_len);
opi->pi.reason = pin->reason;
return OFPERR_OFPBRC_BAD_PORT;
}
- po->ofpacts = ofpacts->data;
- po->ofpacts_len = ofpacts->size;
+ po->ofpacts = ofpbuf_data(ofpacts);
+ po->ofpacts_len = ofpbuf_size(ofpacts);
if (po->buffer_id == UINT32_MAX) {
- po->packet = b.data;
- po->packet_len = b.size;
+ po->packet = ofpbuf_data(&b);
+ po->packet_len = ofpbuf_size(&b);
} else {
po->packet = NULL;
po->packet_len = 0;
switch (ofp_version) {
case OFP10_VERSION: {
struct ofp10_phy_port *opp;
- if (b->size + sizeof *opp <= UINT16_MAX) {
+ if (ofpbuf_size(b) + sizeof *opp <= UINT16_MAX) {
opp = ofpbuf_put_uninit(b, sizeof *opp);
ofputil_encode_ofp10_phy_port(pp, opp);
}
case OFP12_VERSION:
case OFP13_VERSION: {
struct ofp11_port *op;
- if (b->size + sizeof *op <= UINT16_MAX) {
+ if (ofpbuf_size(b) + sizeof *op <= UINT16_MAX) {
op = ofpbuf_put_uninit(b, sizeof *op);
ofputil_encode_ofp11_port(pp, op);
}
features->capabilities = ntohl(osf->capabilities) &
ofputil_capabilities_mask(oh->version);
- if (b->size % ofputil_get_phy_port_size(oh->version)) {
+ if (ofpbuf_size(b) % ofputil_get_phy_port_size(oh->version)) {
return OFPERR_OFPBRC_BAD_LEN;
}
bool
ofputil_switch_features_ports_trunc(struct ofpbuf *b)
{
- struct ofp_header *oh = b->data;
+ struct ofp_header *oh = ofpbuf_data(b);
if (max_ports_in_features(oh)) {
/* Remove all the ports. */
- b->size = (sizeof(struct ofp_header)
- + sizeof(struct ofp_switch_features));
+ ofpbuf_set_size(b, (sizeof(struct ofp_header) +
+ sizeof(struct ofp_switch_features)));
ofpmsg_update_length(b);
return true;
ofputil_put_switch_features_port(const struct ofputil_phy_port *pp,
struct ofpbuf *b)
{
- const struct ofp_header *oh = b->data;
+ const struct ofp_header *oh = ofpbuf_data(b);
if (oh->version < OFP13_VERSION) {
ofputil_put_phy_port(oh->version, pp, b);
raw = ofpraw_pull_assert(&b);
if (raw == OFPRAW_OFPT10_PORT_MOD) {
- const struct ofp10_port_mod *opm = b.data;
+ const struct ofp10_port_mod *opm = ofpbuf_data(&b);
pm->port_no = u16_to_ofp(ntohs(opm->port_no));
memcpy(pm->hw_addr, opm->hw_addr, ETH_ADDR_LEN);
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 = b.data;
+ const struct ofp11_port_mod *opm = ofpbuf_data(&b);
enum ofperr error;
error = ofputil_port_from_ofp11(opm->port_no, &pm->port_no);
struct ofp_prop_header *oph;
unsigned int len;
- if (msg->size < sizeof *oph) {
+ if (ofpbuf_size(msg) < sizeof *oph) {
return OFPERR_OFPTFFC_BAD_LEN;
}
- oph = msg->data;
+ oph = ofpbuf_data(msg);
len = ntohs(oph->len);
- if (len < sizeof *oph || ROUND_UP(len, 8) > msg->size) {
+ if (len < sizeof *oph || ROUND_UP(len, 8) > ofpbuf_size(msg)) {
return OFPERR_OFPTFFC_BAD_LEN;
}
*typep = ntohs(oph->type);
if (payload) {
- ofpbuf_use_const(payload, msg->data, len);
+ ofpbuf_use_const(payload, ofpbuf_data(msg), len);
ofpbuf_pull(payload, sizeof *oph);
}
ofpbuf_pull(msg, ROUND_UP(len, 8));
uint16_t type;
*ids = 0;
- while (payload->size > 0) {
+ while (ofpbuf_size(payload) > 0) {
enum ofperr error = ofputil_pull_property(payload, NULL, &type);
if (error) {
return error;
parse_instruction_ids(struct ofpbuf *payload, bool loose, uint32_t *insts)
{
*insts = 0;
- while (payload->size > 0) {
+ while (ofpbuf_size(payload) > 0) {
enum ovs_instruction_type inst;
enum ofperr error;
uint16_t ofpit;
size_t i;
memset(next_tables, 0, bitmap_n_bytes(255));
- for (i = 0; i < payload->size; i++) {
- uint8_t id = ((const uint8_t *) payload->data)[i];
+ for (i = 0; i < ofpbuf_size(payload); i++) {
+ uint8_t id = ((const uint8_t *) ofpbuf_data(payload))[i];
if (id >= 255) {
return OFPERR_OFPTFFC_BAD_ARGUMENT;
}
uint64_t exact, masked;
exact = masked = 0;
- while (payload->size > 0) {
+ while (ofpbuf_size(payload) > 0) {
const struct mf_field *field;
enum ofperr error;
bool hasmask;
struct ofp13_table_features *otf;
unsigned int len;
- if (!msg->l2) {
- msg->l2 = msg->data;
+ if (!msg->frame) {
ofpraw_pull_assert(msg);
}
- if (!msg->size) {
+ if (!ofpbuf_size(msg)) {
return EOF;
}
- if (msg->size < sizeof *otf) {
+ if (ofpbuf_size(msg) < sizeof *otf) {
return OFPERR_OFPTFFC_BAD_LEN;
}
- otf = msg->data;
+ otf = ofpbuf_data(msg);
len = ntohs(otf->length);
- if (len < sizeof *otf || len % 8 || len > msg->size) {
+ if (len < sizeof *otf || len % 8 || len > ofpbuf_size(msg)) {
return OFPERR_OFPTFFC_BAD_LEN;
}
ofpbuf_pull(msg, sizeof *otf);
tf->config = ntohl(otf->config);
tf->max_entries = ntohl(otf->max_entries);
- while (msg->size > 0) {
+ while (ofpbuf_size(msg) > 0) {
struct ofpbuf payload;
enum ofperr error;
uint16_t type;
raw = ofpraw_pull_assert(&b);
if (raw == OFPRAW_OFPT11_TABLE_MOD) {
- const struct ofp11_table_mod *otm = b.data;
+ const struct ofp11_table_mod *otm = ofpbuf_data(&b);
pm->table_id = otm->table_id;
pm->config = ntohl(otm->config);
if (raw == OFPRAW_OFPT12_ROLE_REQUEST ||
raw == OFPRAW_OFPT12_ROLE_REPLY) {
- const struct ofp12_role_request *orr = ofpbuf_get_l3(&b);
+ const struct ofp12_role_request *orr = ofpbuf_l3(&b);
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_get_l3(&b);
+ const struct nx_role_request *nrr = ofpbuf_l3(&b);
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_get_l3(&b);
+ r = ofpbuf_l3(&b);
if (r->role != htonl(OFPCR12_ROLE_NOCHANGE) &&
r->role != htonl(OFPCR12_ROLE_EQUAL) &&
r->role != htonl(OFPCR12_ROLE_MASTER) &&
struct nx_flow_monitor_request *nfmr;
uint16_t flags;
- if (!msg->l2) {
- msg->l2 = msg->data;
+ if (!msg->frame) {
ofpraw_pull_assert(msg);
}
- if (!msg->size) {
+ if (!ofpbuf_size(msg)) {
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", msg->size);
+ "leftover bytes at end", ofpbuf_size(msg));
return OFPERR_OFPBRC_BAD_LEN;
}
size_t start_ofs;
int match_len;
- if (!msg->size) {
+ if (!ofpbuf_size(msg)) {
ofpraw_put(OFPRAW_NXST_FLOW_MONITOR_REQUEST, OFP10_VERSION, msg);
}
- start_ofs = msg->size;
+ start_ofs = ofpbuf_size(msg);
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->l2) {
- msg->l2 = msg->data;
+ if (!msg->frame) {
ofpraw_pull_assert(msg);
}
- if (!msg->size) {
+ if (!ofpbuf_size(msg)) {
return EOF;
}
- if (msg->size < sizeof(struct nx_flow_update_header)) {
+ if (ofpbuf_size(msg) < sizeof(struct nx_flow_update_header)) {
goto bad_len;
}
- oh = msg->l2;
+ oh = msg->frame;
- nfuh = msg->data;
+ nfuh = ofpbuf_data(msg);
update->event = ntohs(nfuh->event);
length = ntohs(nfuh->length);
- if (length > msg->size || length % 8) {
+ if (length > ofpbuf_size(msg) || length % 8) {
goto bad_len;
}
return error;
}
- update->ofpacts = ofpacts->data;
- update->ofpacts_len = ofpacts->size;
+ update->ofpacts = ofpbuf_data(ofpacts);
+ update->ofpacts_len = ofpbuf_size(ofpacts);
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", msg->size);
+ "leftover bytes at end", ofpbuf_size(msg));
return OFPERR_OFPBRC_BAD_LEN;
}
enum ofp_version version;
msg = ofpbuf_from_list(list_back(replies));
- start_ofs = msg->size;
- version = ((struct ofp_header *)msg->l2)->version;
+ start_ofs = ofpbuf_size(msg);
+ version = ((struct ofp_header *)msg->frame)->version;
if (update->event == NXFME_ABBREV) {
struct nx_flow_update_abbrev *nfua;
}
nfuh = ofpbuf_at_assert(msg, start_ofs, sizeof *nfuh);
- nfuh->length = htons(msg->size - start_ofs);
+ nfuh->length = htons(ofpbuf_size(msg) - 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 = msg->size;
+ actions_ofs = ofpbuf_size(msg);
ofpacts_put_openflow_actions(po->ofpacts, po->ofpacts_len, msg,
ofp_version);
- opo = ofpbuf_get_l3(msg);
+ opo = ofpbuf_l3(msg);
opo->buffer_id = htonl(po->buffer_id);
opo->in_port = htons(ofp_to_u16(po->in_port));
- opo->actions_len = htons(msg->size - actions_ofs);
+ opo->actions_len = htons(ofpbuf_size(msg) - actions_ofs);
break;
}
ofpbuf_put_zeros(msg, sizeof *opo);
len = ofpacts_put_openflow_actions(po->ofpacts, po->ofpacts_len, msg,
ofp_version);
- opo = ofpbuf_get_l3(msg);
+ opo = ofpbuf_l3(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, rq_buf.size);
- ofpbuf_put(reply, rq_buf.data, rq_buf.size);
+ reply = ofpraw_alloc_reply(OFPRAW_OFPT_ECHO_REPLY, rq, ofpbuf_size(&rq_buf));
+ ofpbuf_put(reply, ofpbuf_data(&rq_buf), ofpbuf_size(&rq_buf));
return reply;
}
bool
ofputil_port_from_string(const char *s, ofp_port_t *portp)
{
- uint32_t port32;
+ unsigned int port32; /* int is at least 32 bits wide. */
+ if (*s == '-') {
+ VLOG_WARN("Negative value %s is not a valid port number.", s);
+ return false;
+ }
*portp = 0;
if (str_to_uint(s, 10, &port32)) {
if (port32 < ofp_to_u16(OFPP_MAX)) {
* 'ofp_version', returns the number of elements. */
size_t ofputil_count_phy_ports(uint8_t ofp_version, struct ofpbuf *b)
{
- return b->size / ofputil_get_phy_port_size(ofp_version);
+ return ofpbuf_size(b) / ofputil_get_phy_port_size(ofp_version);
}
/* ofp-util.def lists the mapping from names to action. */
const struct ofputil_port_stats *ops)
{
struct ofpbuf *msg = ofpbuf_from_list(list_back(replies));
- struct ofp_header *oh = msg->data;
+ struct ofp_header *oh = ofpbuf_data(msg);
switch ((enum ofp_version)oh->version) {
case OFP13_VERSION: {
ofpbuf_use_const(&b, oh, ntohs(oh->length));
ofpraw_pull_assert(&b);
- return b.size / ofputil_get_port_stats_size(oh->version);
+ return ofpbuf_size(&b) / ofputil_get_port_stats_size(oh->version);
}
/* Converts an OFPST_PORT_STATS reply in 'msg' into an abstract
enum ofperr error;
enum ofpraw raw;
- error = (msg->l2
- ? ofpraw_decode(&raw, msg->l2)
+ error = (msg->frame
+ ? ofpraw_decode(&raw, msg->frame)
: ofpraw_pull(&raw, msg));
if (error) {
return error;
}
- if (!msg->size) {
+ if (!ofpbuf_size(msg)) {
return EOF;
} else if (raw == OFPRAW_OFPST13_PORT_REPLY) {
const struct ofp13_port_stats *ps13;
bad_len:
VLOG_WARN_RL(&bad_ofmsg_rl, "OFPST_PORT reply has %"PRIu32" leftover "
- "bytes at end", msg->size);
+ "bytes at end", ofpbuf_size(msg));
return OFPERR_OFPBRC_BAD_LEN;
}
return request;
}
-static void *
-ofputil_group_stats_to_ofp11(const struct ofputil_group_stats *ogs,
- size_t base_len, struct list *replies)
+static void
+ofputil_group_stats_to_ofp11__(const struct ofputil_group_stats *gs,
+ struct ofp11_group_stats *gs11, size_t length,
+ struct ofp11_bucket_counter bucket_cnts[])
{
- struct ofp11_bucket_counter *bc11;
- struct ofp11_group_stats *gs11;
- size_t length;
int i;
- length = base_len + sizeof(struct ofp11_bucket_counter) * ogs->n_buckets;
-
- gs11 = ofpmp_append(replies, length);
- memset(gs11, 0, base_len);
+ memset(gs11, 0, length);
gs11->length = htons(length);
- gs11->group_id = htonl(ogs->group_id);
- gs11->ref_count = htonl(ogs->ref_count);
- gs11->packet_count = htonll(ogs->packet_count);
- gs11->byte_count = htonll(ogs->byte_count);
-
- bc11 = (void *) (((uint8_t *) gs11) + base_len);
- for (i = 0; i < ogs->n_buckets; i++) {
- const struct bucket_counter *obc = &ogs->bucket_stats[i];
+ gs11->group_id = htonl(gs->group_id);
+ gs11->ref_count = htonl(gs->ref_count);
+ gs11->packet_count = htonll(gs->packet_count);
+ gs11->byte_count = htonll(gs->byte_count);
- bc11[i].packet_count = htonll(obc->packet_count);
- bc11[i].byte_count = htonll(obc->byte_count);
+ for (i = 0; i < gs->n_buckets; i++) {
+ bucket_cnts[i].packet_count = htonll(gs->bucket_stats[i].packet_count);
+ bucket_cnts[i].byte_count = htonll(gs->bucket_stats[i].byte_count);
}
-
- return gs11;
}
static void
-ofputil_append_of13_group_stats(const struct ofputil_group_stats *ogs,
- struct list *replies)
+ofputil_group_stats_to_ofp11(const struct ofputil_group_stats *gs,
+ struct ofp11_group_stats *gs11, size_t length)
{
- struct ofp13_group_stats *gs13;
+ ofputil_group_stats_to_ofp11__(gs, gs11, length, gs11->bucket_stats);
+}
- gs13 = ofputil_group_stats_to_ofp11(ogs, sizeof *gs13, replies);
- gs13->duration_sec = htonl(ogs->duration_sec);
- gs13->duration_nsec = htonl(ogs->duration_nsec);
+static void
+ofputil_group_stats_to_ofp13(const struct ofputil_group_stats *gs,
+ struct ofp13_group_stats *gs13, size_t length)
+{
+ ofputil_group_stats_to_ofp11__(gs, &gs13->gs, length, gs13->bucket_stats);
+ gs13->duration_sec = htonl(gs->duration_sec);
+ gs13->duration_nsec = htonl(gs->duration_nsec);
}
-/* Encodes 'ogs' properly for the format of the list of group statistics
+/* Encodes 'gs' properly for the format of the list of group statistics
* replies already begun in 'replies' and appends it to the list. 'replies'
* must have originally been initialized with ofpmp_init(). */
void
ofputil_append_group_stats(struct list *replies,
- const struct ofputil_group_stats *ogs)
+ const struct ofputil_group_stats *gs)
{
struct ofpbuf *msg = ofpbuf_from_list(list_back(replies));
- struct ofp_header *oh = msg->data;
+ struct ofp_header *oh = ofpbuf_data(msg);
+ size_t length;
- switch ((enum ofp_version)oh->version) {
+ switch ((enum ofp_version) oh->version) {
case OFP11_VERSION:
- case OFP12_VERSION:
- ofputil_group_stats_to_ofp11(ogs, sizeof(struct ofp11_group_stats),
- replies);
- break;
+ case OFP12_VERSION:{
+ struct ofp11_group_stats *reply;
+
+ length = gs->n_buckets * sizeof reply->bucket_stats[0]
+ + sizeof *reply;
+ reply = ofpmp_append(replies, length);
+ ofputil_group_stats_to_ofp11(gs, reply, length);
+ break;
+ }
case OFP13_VERSION:
- ofputil_append_of13_group_stats(ogs, replies);
- break;
+ case OFP14_VERSION:{
+ struct ofp13_group_stats *reply;
- case OFP14_VERSION:
- OVS_NOT_REACHED();
- break;
+ length = gs->n_buckets * sizeof reply->bucket_stats[0]
+ + sizeof *reply;
+ reply = ofpmp_append(replies, length);
+ ofputil_group_stats_to_ofp13(gs, reply, length);
+ break;
+ }
case OFP10_VERSION:
default:
OVS_NOT_REACHED();
}
}
-
/* Returns an OpenFlow group features request for OpenFlow version
* 'ofp_version'. */
struct ofpbuf *
size_t i;
gs->bucket_stats = NULL;
- error = (msg->l2
- ? ofpraw_decode(&raw, msg->l2)
+ error = (msg->frame
+ ? ofpraw_decode(&raw, msg->frame)
: ofpraw_pull(&raw, msg));
if (error) {
return error;
}
- if (!msg->size) {
+ if (!ofpbuf_size(msg)) {
return EOF;
}
if (!ogs11) {
VLOG_WARN_RL(&bad_ofmsg_rl, "%s reply has %"PRIu32" leftover bytes at end",
- ofpraw_get_name(raw), msg->size);
+ ofpraw_get_name(raw), ofpbuf_size(msg));
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), msg->size);
+ ofpraw_get_name(raw), ofpbuf_size(msg));
return OFPERR_OFPBRC_BAD_LEN;
}
struct ofp11_group_desc_stats *ogds;
struct ofputil_bucket *bucket;
size_t start_ogds;
- enum ofp_version version = ((struct ofp_header *)reply->data)->version;
+ enum ofp_version version = ((struct ofp_header *)ofpbuf_data(reply))->version;
- start_ogds = reply->size;
+ start_ogds = ofpbuf_size(reply);
ofpbuf_put_zeros(reply, sizeof *ogds);
LIST_FOR_EACH (bucket, list_node, buckets) {
struct ofp11_bucket *ob;
size_t start_ob;
- start_ob = reply->size;
+ start_ob = ofpbuf_size(reply);
ofpbuf_put_zeros(reply, sizeof *ob);
ofpacts_put_openflow_actions(bucket->ofpacts, bucket->ofpacts_len,
reply, version);
ob = ofpbuf_at_assert(reply, start_ob, sizeof *ob);
- ob->len = htons(reply->size - start_ob);
+ ob->len = htons(ofpbuf_size(reply) - start_ob);
ob->weight = htons(bucket->weight);
ob->watch_port = ofputil_port_to_ofp11(bucket->watch_port);
ob->watch_group = htonl(bucket->watch_group);
}
ogds = ofpbuf_at_assert(reply, start_ogds, sizeof *ogds);
- ogds->length = htons(reply->size - start_ogds);
+ ogds->length = htons(ofpbuf_size(reply) - start_ogds);
ogds->type = gds->type;
ogds->group_id = htonl(gds->group_id);
}
bucket->watch_group = ntohl(ob->watch_group);
bucket->ofpacts = ofpbuf_steal_data(&ofpacts);
- bucket->ofpacts_len = ofpacts.size;
+ bucket->ofpacts_len = ofpbuf_size(&ofpacts);
list_push_back(buckets, &bucket->list_node);
}
struct ofp11_group_desc_stats *ogds;
size_t length;
- if (!msg->l2) {
+ if (!msg->frame) {
ofpraw_pull_assert(msg);
}
- if (!msg->size) {
+ if (!ofpbuf_size(msg)) {
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", msg->size);
+ "leftover bytes at end", ofpbuf_size(msg));
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 > msg->size) {
+ if (length < sizeof *ogds || length - sizeof *ogds > ofpbuf_size(msg)) {
VLOG_WARN_RL(&bad_ofmsg_rl, "OFPST11_GROUP_DESC reply claims invalid "
"length %"PRIuSIZE, length);
return OFPERR_OFPBRC_BAD_LEN;
case OFP13_VERSION:
case OFP14_VERSION:
b = ofpraw_alloc(OFPRAW_OFPT11_GROUP_MOD, ofp_version, 0);
- start_ogm = b->size;
+ start_ogm = ofpbuf_size(b);
ofpbuf_put_zeros(b, sizeof *ogm);
LIST_FOR_EACH (bucket, list_node, &gm->buckets) {
- start_bucket = b->size;
+ start_bucket = ofpbuf_size(b);
ofpbuf_put_zeros(b, sizeof *ob);
if (bucket->ofpacts && bucket->ofpacts_len) {
ofpacts_put_openflow_actions(bucket->ofpacts,
ofp_version);
}
ob = ofpbuf_at_assert(b, start_bucket, sizeof *ob);
- ob->len = htons(b->size - start_bucket);;
+ ob->len = htons(ofpbuf_size(b) - start_bucket);;
ob->weight = htons(bucket->weight);
ob->watch_port = ofputil_port_to_ofp11(bucket->watch_port);
ob->watch_group = htonl(bucket->watch_group);
gm->type = ogm->type;
gm->group_id = ntohl(ogm->group_id);
- err = ofputil_pull_buckets(&msg, msg.size, oh->version, &gm->buckets);
+ err = ofputil_pull_buckets(&msg, ofpbuf_size(&msg), oh->version, &gm->buckets);
if (err) {
return err;
}
ofpbuf_use_const(&b, oh, ntohs(oh->length));
ofpraw_pull_assert(&b);
- return b.size / ofputil_get_queue_stats_size(oh->version);
+ return ofpbuf_size(&b) / ofputil_get_queue_stats_size(oh->version);
}
static enum ofperr
enum ofperr error;
enum ofpraw raw;
- error = (msg->l2
- ? ofpraw_decode(&raw, msg->l2)
+ error = (msg->frame
+ ? ofpraw_decode(&raw, msg->frame)
: ofpraw_pull(&raw, msg));
if (error) {
return error;
}
- if (!msg->size) {
+ if (!ofpbuf_size(msg)) {
return EOF;
} else if (raw == OFPRAW_OFPST13_QUEUE_REPLY) {
const struct ofp13_queue_stats *qs13;
bad_len:
VLOG_WARN_RL(&bad_ofmsg_rl, "OFPST_QUEUE reply has %"PRIu32" leftover "
- "bytes at end", msg->size);
+ "bytes at end", ofpbuf_size(msg));
return OFPERR_OFPBRC_BAD_LEN;
}
const struct ofputil_queue_stats *oqs)
{
struct ofpbuf *msg = ofpbuf_from_list(list_back(replies));
- struct ofp_header *oh = msg->data;
+ struct ofp_header *oh = ofpbuf_data(msg);
switch ((enum ofp_version)oh->version) {
case OFP13_VERSION: {
git://git.onelab.eu / sliver-openvswitch.git / blobdiff