/*
- * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014 Nicira, Inc.
+ * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 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 "hash.h"
#include "jhash.h"
#include "match.h"
-#include "ofpbuf.h"
+#include "dp-packet.h"
#include "openflow/openflow.h"
#include "packets.h"
#include "odp-util.h"
FLOW_U64S
};
+/* Asserts that field 'f1' follows immediately after 'f0' in struct flow,
+ * without any intervening padding. */
+#define ASSERT_SEQUENTIAL(f0, f1) \
+ BUILD_ASSERT_DECL(offsetof(struct flow, f0) \
+ + MEMBER_SIZEOF(struct flow, f0) \
+ == offsetof(struct flow, f1))
+
+/* Asserts that fields 'f0' and 'f1' are in the same 32-bit aligned word within
+ * struct flow. */
+#define ASSERT_SAME_WORD(f0, f1) \
+ BUILD_ASSERT_DECL(offsetof(struct flow, f0) / 4 \
+ == offsetof(struct flow, f1) / 4)
+
+/* Asserts that 'f0' and 'f1' are both sequential and within the same 32-bit
+ * aligned word in struct flow. */
+#define ASSERT_SEQUENTIAL_SAME_WORD(f0, f1) \
+ ASSERT_SEQUENTIAL(f0, f1); \
+ ASSERT_SAME_WORD(f0, f1)
+
/* miniflow_extract() assumes the following to be true to optimize the
* extraction process. */
-BUILD_ASSERT_DECL(offsetof(struct flow, dl_type) + 2
- == offsetof(struct flow, vlan_tci) &&
- offsetof(struct flow, dl_type) / 4
- == offsetof(struct flow, vlan_tci) / 4 );
-
-BUILD_ASSERT_DECL(offsetof(struct flow, nw_frag) + 3
- == offsetof(struct flow, nw_proto) &&
- offsetof(struct flow, nw_tos) + 2
- == offsetof(struct flow, nw_proto) &&
- offsetof(struct flow, nw_ttl) + 1
- == offsetof(struct flow, nw_proto) &&
- offsetof(struct flow, nw_frag) / 4
- == offsetof(struct flow, nw_tos) / 4 &&
- offsetof(struct flow, nw_ttl) / 4
- == offsetof(struct flow, nw_tos) / 4 &&
- offsetof(struct flow, nw_proto) / 4
- == offsetof(struct flow, nw_tos) / 4);
+ASSERT_SEQUENTIAL_SAME_WORD(dl_type, vlan_tci);
+
+ASSERT_SEQUENTIAL_SAME_WORD(nw_frag, nw_tos);
+ASSERT_SEQUENTIAL_SAME_WORD(nw_tos, nw_ttl);
+ASSERT_SEQUENTIAL_SAME_WORD(nw_ttl, nw_proto);
/* TCP flags in the middle of a BE64, zeroes in the other half. */
BUILD_ASSERT_DECL(offsetof(struct flow, tcp_flags) % 8 == 4);
#define TCP_FLAGS_BE32(tcp_ctl) ((OVS_FORCE ovs_be32)TCP_FLAGS_BE16(tcp_ctl))
#endif
-BUILD_ASSERT_DECL(offsetof(struct flow, tp_src) + 2
- == offsetof(struct flow, tp_dst) &&
- offsetof(struct flow, tp_src) / 4
- == offsetof(struct flow, tp_dst) / 4);
+ASSERT_SEQUENTIAL_SAME_WORD(tp_src, tp_dst);
/* Removes 'size' bytes from the head end of '*datap', of size '*sizep', which
* must contain at least 'size' bytes of data. Returns the first byte of data
* removed. */
static inline const void *
-data_pull(void **datap, size_t *sizep, size_t size)
+data_pull(const void **datap, size_t *sizep, size_t size)
{
- char *data = (char *)*datap;
+ const char *data = *datap;
*datap = data + size;
*sizep -= size;
return data;
* the head end of '*datap' and returns the first byte removed. Otherwise,
* returns a null pointer without modifying '*datap'. */
static inline const void *
-data_try_pull(void **datap, size_t *sizep, size_t size)
+data_try_pull(const void **datap, size_t *sizep, size_t size)
{
return OVS_LIKELY(*sizep >= size) ? data_pull(datap, sizep, size) : NULL;
}
* away. Some GCC versions gave warnings on ALWAYS_INLINE, so these are
* defined as macros. */
-#if (FLOW_WC_SEQ != 29)
+#if (FLOW_WC_SEQ != 31)
#define MINIFLOW_ASSERT(X) ovs_assert(X)
BUILD_MESSAGE("FLOW_WC_SEQ changed: miniflow_extract() will have runtime "
"assertions enabled. Consider updating FLOW_WC_SEQ after "
/* Pulls the MPLS headers at '*datap' and returns the count of them. */
static inline int
-parse_mpls(void **datap, size_t *sizep)
+parse_mpls(const void **datap, size_t *sizep)
{
const struct mpls_hdr *mh;
int count = 0;
}
static inline ovs_be16
-parse_vlan(void **datap, size_t *sizep)
+parse_vlan(const void **datap, size_t *sizep)
{
const struct eth_header *eth = *datap;
}
static inline ovs_be16
-parse_ethertype(void **datap, size_t *sizep)
+parse_ethertype(const void **datap, size_t *sizep)
{
const struct llc_snap_header *llc;
ovs_be16 proto;
return htons(FLOW_DL_TYPE_NONE);
}
-static inline bool
-parse_icmpv6(void **datap, size_t *sizep, const struct icmp6_hdr *icmp,
+static inline void
+parse_icmpv6(const void **datap, size_t *sizep, const struct icmp6_hdr *icmp,
const struct in6_addr **nd_target,
uint8_t arp_buf[2][ETH_ADDR_LEN])
{
*nd_target = data_try_pull(datap, sizep, sizeof **nd_target);
if (OVS_UNLIKELY(!*nd_target)) {
- return false;
+ return;
}
while (*sizep >= 8) {
int opt_len = nd_opt->nd_opt_len * 8;
if (!opt_len || opt_len > *sizep) {
- goto invalid;
+ return;
}
/* Store the link layer address if the appropriate option is
}
if (OVS_UNLIKELY(!data_try_pull(datap, sizep, opt_len))) {
- goto invalid;
+ return;
}
}
}
- return true;
+ return;
invalid:
- return false;
+ *nd_target = NULL;
+ memset(arp_buf[0], 0, ETH_ADDR_LEN);
+ memset(arp_buf[1], 0, ETH_ADDR_LEN);
+ return;
}
/* Initializes 'flow' members from 'packet' and 'md'
* otherwise UINT16_MAX.
*/
void
-flow_extract(struct ofpbuf *packet, const struct pkt_metadata *md,
- struct flow *flow)
+flow_extract(struct dp_packet *packet, struct flow *flow)
{
struct {
struct miniflow mf;
COVERAGE_INC(flow_extract);
miniflow_initialize(&m.mf, m.buf);
- miniflow_extract(packet, md, &m.mf);
+ miniflow_extract(packet, &m.mf);
miniflow_expand(&m.mf, flow);
}
/* Caller is responsible for initializing 'dst' with enough storage for
* FLOW_U64S * 8 bytes. */
void
-miniflow_extract(struct ofpbuf *packet, const struct pkt_metadata *md,
- struct miniflow *dst)
+miniflow_extract(struct dp_packet *packet, struct miniflow *dst)
{
- void *data = ofpbuf_data(packet);
- size_t size = ofpbuf_size(packet);
+ const struct pkt_metadata *md = &packet->md;
+ const void *data = dp_packet_data(packet);
+ size_t size = dp_packet_size(packet);
uint64_t *values = miniflow_values(dst);
struct mf_ctx mf = { 0, values, values + FLOW_U64S };
- char *l2;
+ const char *l2;
ovs_be16 dl_type;
uint8_t nw_frag, nw_tos, nw_ttl, nw_proto;
/* Metadata. */
- if (md) {
- if (md->tunnel.ip_dst) {
- miniflow_push_words(mf, tunnel, &md->tunnel,
- sizeof md->tunnel / sizeof(uint64_t));
- }
- if (md->skb_priority || md->pkt_mark) {
- miniflow_push_uint32(mf, skb_priority, md->skb_priority);
- miniflow_push_uint32(mf, pkt_mark, md->pkt_mark);
- }
- miniflow_push_uint32(mf, dp_hash, md->dp_hash);
- miniflow_push_uint32(mf, in_port, odp_to_u32(md->in_port.odp_port));
- if (md->recirc_id) {
- miniflow_push_uint32(mf, recirc_id, md->recirc_id);
- miniflow_pad_to_64(mf, actset_output);
- }
+ if (md->tunnel.ip_dst) {
+ miniflow_push_words(mf, tunnel, &md->tunnel,
+ sizeof md->tunnel / sizeof(uint64_t));
+ }
+ if (md->skb_priority || md->pkt_mark) {
+ miniflow_push_uint32(mf, skb_priority, md->skb_priority);
+ miniflow_push_uint32(mf, pkt_mark, md->pkt_mark);
+ }
+ miniflow_push_uint32(mf, dp_hash, md->dp_hash);
+ miniflow_push_uint32(mf, in_port, odp_to_u32(md->in_port.odp_port));
+ if (md->recirc_id) {
+ miniflow_push_uint32(mf, recirc_id, md->recirc_id);
+ miniflow_pad_to_64(mf, conj_id);
}
/* Initialize packet's layer pointer and offsets. */
l2 = data;
- ofpbuf_set_frame(packet, data);
+ dp_packet_reset_offsets(packet);
/* Must have full Ethernet header to proceed. */
if (OVS_UNLIKELY(size < sizeof(struct eth_header))) {
ovs_be16 vlan_tci;
/* Link layer. */
- BUILD_ASSERT(offsetof(struct flow, dl_dst) + 6
- == offsetof(struct flow, dl_src));
+ ASSERT_SEQUENTIAL(dl_dst, dl_src);
miniflow_push_macs(mf, dl_dst, data);
/* dl_type, vlan_tci. */
vlan_tci = parse_vlan(&data, &size);
if (OVS_UNLIKELY(size - tot_len > UINT8_MAX)) {
goto out;
}
- ofpbuf_set_l2_pad_size(packet, size - tot_len);
+ dp_packet_set_l2_pad_size(packet, size - tot_len);
size = tot_len; /* Never pull padding. */
/* Push both source and destination address at once. */
if (OVS_UNLIKELY(size - plen > UINT8_MAX)) {
goto out;
}
- ofpbuf_set_l2_pad_size(packet, size - plen);
+ dp_packet_set_l2_pad_size(packet, size - plen);
size = plen; /* Never pull padding. */
miniflow_push_words(mf, ipv6_src, &nh->ip6_src,
}
/* Must be adjacent. */
- BUILD_ASSERT(offsetof(struct flow, arp_sha) + 6
- == offsetof(struct flow, arp_tha));
+ ASSERT_SEQUENTIAL(arp_sha, arp_tha);
memcpy(arp_buf[0], arp->ar_sha, ETH_ADDR_LEN);
memcpy(arp_buf[1], arp->ar_tha, ETH_ADDR_LEN);
miniflow_push_be32(mf, arp_tha[2], 0);
miniflow_push_be32(mf, tcp_flags,
TCP_FLAGS_BE32(tcp->tcp_ctl));
- miniflow_push_words(mf, tp_src, &tcp->tcp_src, 1);
+ miniflow_push_be16(mf, tp_src, tcp->tcp_src);
+ miniflow_push_be16(mf, tp_dst, tcp->tcp_dst);
miniflow_pad_to_64(mf, igmp_group_ip4);
}
} else if (OVS_LIKELY(nw_proto == IPPROTO_UDP)) {
if (OVS_LIKELY(size >= UDP_HEADER_LEN)) {
const struct udp_header *udp = data;
- miniflow_push_words(mf, tp_src, &udp->udp_src, 1);
+ miniflow_push_be16(mf, tp_src, udp->udp_src);
+ miniflow_push_be16(mf, tp_dst, udp->udp_dst);
miniflow_pad_to_64(mf, igmp_group_ip4);
}
} else if (OVS_LIKELY(nw_proto == IPPROTO_SCTP)) {
if (OVS_LIKELY(size >= SCTP_HEADER_LEN)) {
const struct sctp_header *sctp = data;
- miniflow_push_words(mf, tp_src, &sctp->sctp_src, 1);
+ miniflow_push_be16(mf, tp_src, sctp->sctp_src);
+ miniflow_push_be16(mf, tp_dst, sctp->sctp_dst);
miniflow_pad_to_64(mf, igmp_group_ip4);
}
} else if (OVS_LIKELY(nw_proto == IPPROTO_ICMP)) {
const struct icmp6_hdr *icmp = data_pull(&data, &size,
sizeof *icmp);
memset(arp_buf, 0, sizeof arp_buf);
- if (OVS_LIKELY(parse_icmpv6(&data, &size, icmp, &nd_target,
- arp_buf))) {
- if (nd_target) {
- miniflow_push_words(mf, nd_target, nd_target,
- sizeof *nd_target / 8);
- }
- miniflow_push_macs(mf, arp_sha, arp_buf);
- miniflow_pad_to_64(mf, tcp_flags);
- miniflow_push_be16(mf, tp_src, htons(icmp->icmp6_type));
- miniflow_push_be16(mf, tp_dst, htons(icmp->icmp6_code));
- miniflow_pad_to_64(mf, igmp_group_ip4);
+ parse_icmpv6(&data, &size, icmp, &nd_target, arp_buf);
+ if (nd_target) {
+ miniflow_push_words(mf, nd_target, nd_target,
+ sizeof *nd_target / 8);
}
+ miniflow_push_macs(mf, arp_sha, arp_buf);
+ miniflow_pad_to_64(mf, tcp_flags);
+ miniflow_push_be16(mf, tp_src, htons(icmp->icmp6_type));
+ miniflow_push_be16(mf, tp_dst, htons(icmp->icmp6_code));
+ miniflow_pad_to_64(mf, igmp_group_ip4);
}
}
}
}
}
-/* Initializes 'fmd' with the metadata found in 'flow'. */
+/* Initializes 'flow_metadata' with the metadata found in 'flow'. */
void
-flow_get_metadata(const struct flow *flow, struct flow_metadata *fmd)
+flow_get_metadata(const struct flow *flow, struct match *flow_metadata)
{
- BUILD_ASSERT_DECL(FLOW_WC_SEQ == 29);
+ int i;
- fmd->dp_hash = flow->dp_hash;
- fmd->recirc_id = flow->recirc_id;
- fmd->tun_id = flow->tunnel.tun_id;
- fmd->tun_src = flow->tunnel.ip_src;
- fmd->tun_dst = flow->tunnel.ip_dst;
- fmd->metadata = flow->metadata;
- memcpy(fmd->regs, flow->regs, sizeof fmd->regs);
- fmd->pkt_mark = flow->pkt_mark;
- fmd->in_port = flow->in_port.ofp_port;
+ BUILD_ASSERT_DECL(FLOW_WC_SEQ == 31);
+
+ match_init_catchall(flow_metadata);
+ if (flow->tunnel.tun_id != htonll(0)) {
+ match_set_tun_id(flow_metadata, flow->tunnel.tun_id);
+ }
+ if (flow->tunnel.ip_src != htonl(0)) {
+ match_set_tun_src(flow_metadata, flow->tunnel.ip_src);
+ }
+ if (flow->tunnel.ip_dst != htonl(0)) {
+ match_set_tun_dst(flow_metadata, flow->tunnel.ip_dst);
+ }
+ if (flow->tunnel.gbp_id != htons(0)) {
+ match_set_tun_gbp_id(flow_metadata, flow->tunnel.gbp_id);
+ }
+ if (flow->tunnel.gbp_flags) {
+ match_set_tun_gbp_flags(flow_metadata, flow->tunnel.gbp_flags);
+ }
+ if (flow->metadata != htonll(0)) {
+ match_set_metadata(flow_metadata, flow->metadata);
+ }
+
+ for (i = 0; i < FLOW_N_REGS; i++) {
+ if (flow->regs[i]) {
+ match_set_reg(flow_metadata, i, flow->regs[i]);
+ }
+ }
+
+ if (flow->pkt_mark != 0) {
+ match_set_pkt_mark(flow_metadata, flow->pkt_mark);
+ }
+
+ match_set_in_port(flow_metadata, flow->in_port.ofp_port);
}
char *
/* As this function is most often used for formatting a packet in a
* packet-in message, skip formatting the packet context fields that are
- * all-zeroes (Openflow spec encourages leaving out all-zeroes context
- * fields from the packet-in messages). We make an exception with the
- * 'in_port' field, which we always format, as packets usually have an
- * in_port, and 0 is a port just like any other port. */
+ * all-zeroes to make the print-out easier on the eyes. This means that a
+ * missing context field implies a zero value for that field. This is
+ * similar to OpenFlow encoding of these fields, as the specification
+ * states that all-zeroes context fields should not be encoded in the
+ * packet-in messages. */
+ if (!flow->in_port.ofp_port) {
+ WC_UNMASK_FIELD(wc, in_port);
+ }
if (!flow->skb_priority) {
WC_UNMASK_FIELD(wc, skb_priority);
}
if (!flow->recirc_id) {
WC_UNMASK_FIELD(wc, recirc_id);
}
+ if (!flow->dp_hash) {
+ WC_UNMASK_FIELD(wc, dp_hash);
+ }
for (int i = 0; i < FLOW_N_REGS; i++) {
if (!flow->regs[i]) {
WC_UNMASK_FIELD(wc, regs[i]);
memset(&wc->masks, 0x0, sizeof wc->masks);
/* Update this function whenever struct flow changes. */
- BUILD_ASSERT_DECL(FLOW_WC_SEQ == 29);
+ BUILD_ASSERT_DECL(FLOW_WC_SEQ == 31);
if (flow->tunnel.ip_dst) {
if (flow->tunnel.flags & FLOW_TNL_F_KEY) {
WC_MASK_FIELD(wc, tunnel.ip_ttl);
WC_MASK_FIELD(wc, tunnel.tp_src);
WC_MASK_FIELD(wc, tunnel.tp_dst);
+ WC_MASK_FIELD(wc, tunnel.gbp_id);
+ WC_MASK_FIELD(wc, tunnel.gbp_flags);
} else if (flow->tunnel.tun_id) {
WC_MASK_FIELD(wc, tunnel.tun_id);
}
- /* metadata and regs wildcarded. */
+ /* metadata, regs, and conj_id wildcarded. */
WC_MASK_FIELD(wc, skb_priority);
WC_MASK_FIELD(wc, pkt_mark);
flow_wc_map(const struct flow *flow)
{
/* Update this function whenever struct flow changes. */
- BUILD_ASSERT_DECL(FLOW_WC_SEQ == 29);
+ BUILD_ASSERT_DECL(FLOW_WC_SEQ == 31);
uint64_t map = (flow->tunnel.ip_dst) ? MINIFLOW_MAP(tunnel) : 0;
flow_wildcards_clear_non_packet_fields(struct flow_wildcards *wc)
{
/* Update this function whenever struct flow changes. */
- BUILD_ASSERT_DECL(FLOW_WC_SEQ == 29);
+ BUILD_ASSERT_DECL(FLOW_WC_SEQ == 31);
memset(&wc->masks.metadata, 0, sizeof wc->masks.metadata);
memset(&wc->masks.regs, 0, sizeof wc->masks.regs);
wc->masks.actset_output = 0;
+ wc->masks.conj_id = 0;
}
/* Returns true if 'wc' matches every packet, false if 'wc' fixes any bits or
return hash;
}
-BUILD_ASSERT_DECL(offsetof(struct flow, tp_src) + 2
- == offsetof(struct flow, tp_dst) &&
- offsetof(struct flow, tp_src) / 4
- == offsetof(struct flow, tp_dst) / 4);
-BUILD_ASSERT_DECL(offsetof(struct flow, ipv6_src) + 16
- == offsetof(struct flow, ipv6_dst));
+ASSERT_SEQUENTIAL_SAME_WORD(tp_src, tp_dst);
+ASSERT_SEQUENTIAL(ipv6_src, ipv6_dst);
/* Calculates the 5-tuple hash from the given flow. */
uint32_t
flow->mpls_lse[0] = set_mpls_lse_values(ttl, tc, 1, htonl(label));
/* Clear all L3 and L4 fields and dp_hash. */
- BUILD_ASSERT(FLOW_WC_SEQ == 29);
+ BUILD_ASSERT(FLOW_WC_SEQ == 31);
memset((char *) flow + FLOW_SEGMENT_2_ENDS_AT, 0,
sizeof(struct flow) - FLOW_SEGMENT_2_ENDS_AT);
flow->dp_hash = 0;
}
static size_t
-flow_compose_l4(struct ofpbuf *b, const struct flow *flow)
+flow_compose_l4(struct dp_packet *p, const struct flow *flow)
{
size_t l4_len = 0;
struct tcp_header *tcp;
l4_len = sizeof *tcp;
- tcp = ofpbuf_put_zeros(b, l4_len);
+ tcp = dp_packet_put_zeros(p, l4_len);
tcp->tcp_src = flow->tp_src;
tcp->tcp_dst = flow->tp_dst;
tcp->tcp_ctl = TCP_CTL(ntohs(flow->tcp_flags), 5);
struct udp_header *udp;
l4_len = sizeof *udp;
- udp = ofpbuf_put_zeros(b, l4_len);
+ udp = dp_packet_put_zeros(p, l4_len);
udp->udp_src = flow->tp_src;
udp->udp_dst = flow->tp_dst;
} else if (flow->nw_proto == IPPROTO_SCTP) {
struct sctp_header *sctp;
l4_len = sizeof *sctp;
- sctp = ofpbuf_put_zeros(b, l4_len);
+ sctp = dp_packet_put_zeros(p, l4_len);
sctp->sctp_src = flow->tp_src;
sctp->sctp_dst = flow->tp_dst;
} else if (flow->nw_proto == IPPROTO_ICMP) {
struct icmp_header *icmp;
l4_len = sizeof *icmp;
- icmp = ofpbuf_put_zeros(b, l4_len);
+ icmp = dp_packet_put_zeros(p, l4_len);
icmp->icmp_type = ntohs(flow->tp_src);
icmp->icmp_code = ntohs(flow->tp_dst);
icmp->icmp_csum = csum(icmp, ICMP_HEADER_LEN);
struct igmp_header *igmp;
l4_len = sizeof *igmp;
- igmp = ofpbuf_put_zeros(b, l4_len);
+ igmp = dp_packet_put_zeros(p, l4_len);
igmp->igmp_type = ntohs(flow->tp_src);
igmp->igmp_code = ntohs(flow->tp_dst);
put_16aligned_be32(&igmp->group, flow->igmp_group_ip4);
struct icmp6_hdr *icmp;
l4_len = sizeof *icmp;
- icmp = ofpbuf_put_zeros(b, l4_len);
+ icmp = dp_packet_put_zeros(p, l4_len);
icmp->icmp6_type = ntohs(flow->tp_src);
icmp->icmp6_code = ntohs(flow->tp_dst);
struct nd_opt_hdr *nd_opt;
l4_len += sizeof *nd_target;
- nd_target = ofpbuf_put_zeros(b, sizeof *nd_target);
+ nd_target = dp_packet_put_zeros(p, sizeof *nd_target);
*nd_target = flow->nd_target;
if (!eth_addr_is_zero(flow->arp_sha)) {
l4_len += 8;
- nd_opt = ofpbuf_put_zeros(b, 8);
+ nd_opt = dp_packet_put_zeros(p, 8);
nd_opt->nd_opt_len = 1;
nd_opt->nd_opt_type = ND_OPT_SOURCE_LINKADDR;
memcpy(nd_opt + 1, flow->arp_sha, ETH_ADDR_LEN);
}
if (!eth_addr_is_zero(flow->arp_tha)) {
l4_len += 8;
- nd_opt = ofpbuf_put_zeros(b, 8);
+ nd_opt = dp_packet_put_zeros(p, 8);
nd_opt->nd_opt_len = 1;
nd_opt->nd_opt_type = ND_OPT_TARGET_LINKADDR;
memcpy(nd_opt + 1, flow->arp_tha, ETH_ADDR_LEN);
}
}
icmp->icmp6_cksum = (OVS_FORCE uint16_t)
- csum(icmp, (char *)ofpbuf_tail(b) - (char *)icmp);
+ csum(icmp, (char *)dp_packet_tail(p) - (char *)icmp);
}
}
return l4_len;
* valid. It hasn't got some checksums filled in, for one, and lots of fields
* are just zeroed.) */
void
-flow_compose(struct ofpbuf *b, const struct flow *flow)
+flow_compose(struct dp_packet *p, const struct flow *flow)
{
size_t l4_len;
/* eth_compose() sets l3 pointer and makes sure it is 32-bit aligned. */
- eth_compose(b, flow->dl_dst, flow->dl_src, ntohs(flow->dl_type), 0);
+ eth_compose(p, flow->dl_dst, flow->dl_src, ntohs(flow->dl_type), 0);
if (flow->dl_type == htons(FLOW_DL_TYPE_NONE)) {
- struct eth_header *eth = ofpbuf_l2(b);
- eth->eth_type = htons(ofpbuf_size(b));
+ struct eth_header *eth = dp_packet_l2(p);
+ eth->eth_type = htons(dp_packet_size(p));
return;
}
if (flow->vlan_tci & htons(VLAN_CFI)) {
- eth_push_vlan(b, htons(ETH_TYPE_VLAN), flow->vlan_tci);
+ eth_push_vlan(p, htons(ETH_TYPE_VLAN), flow->vlan_tci);
}
if (flow->dl_type == htons(ETH_TYPE_IP)) {
struct ip_header *ip;
- ip = ofpbuf_put_zeros(b, sizeof *ip);
+ ip = dp_packet_put_zeros(p, sizeof *ip);
ip->ip_ihl_ver = IP_IHL_VER(5, 4);
ip->ip_tos = flow->nw_tos;
ip->ip_ttl = flow->nw_ttl;
}
}
- ofpbuf_set_l4(b, ofpbuf_tail(b));
+ dp_packet_set_l4(p, dp_packet_tail(p));
- l4_len = flow_compose_l4(b, flow);
+ l4_len = flow_compose_l4(p, flow);
- ip = ofpbuf_l3(b);
- ip->ip_tot_len = htons(b->l4_ofs - b->l3_ofs + l4_len);
+ ip = dp_packet_l3(p);
+ ip->ip_tot_len = htons(p->l4_ofs - p->l3_ofs + l4_len);
ip->ip_csum = csum(ip, sizeof *ip);
} else if (flow->dl_type == htons(ETH_TYPE_IPV6)) {
struct ovs_16aligned_ip6_hdr *nh;
- nh = ofpbuf_put_zeros(b, sizeof *nh);
+ nh = dp_packet_put_zeros(p, sizeof *nh);
put_16aligned_be32(&nh->ip6_flow, htonl(6 << 28) |
htonl(flow->nw_tos << 20) | flow->ipv6_label);
nh->ip6_hlim = flow->nw_ttl;
memcpy(&nh->ip6_src, &flow->ipv6_src, sizeof(nh->ip6_src));
memcpy(&nh->ip6_dst, &flow->ipv6_dst, sizeof(nh->ip6_dst));
- ofpbuf_set_l4(b, ofpbuf_tail(b));
+ dp_packet_set_l4(p, dp_packet_tail(p));
- l4_len = flow_compose_l4(b, flow);
+ l4_len = flow_compose_l4(p, flow);
- nh = ofpbuf_l3(b);
+ nh = dp_packet_l3(p);
nh->ip6_plen = htons(l4_len);
} else if (flow->dl_type == htons(ETH_TYPE_ARP) ||
flow->dl_type == htons(ETH_TYPE_RARP)) {
struct arp_eth_header *arp;
- arp = ofpbuf_put_zeros(b, sizeof *arp);
- ofpbuf_set_l3(b, arp);
+ arp = dp_packet_put_zeros(p, sizeof *arp);
+ dp_packet_set_l3(p, arp);
arp->ar_hrd = htons(1);
arp->ar_pro = htons(ETH_TYPE_IP);
arp->ar_hln = ETH_ADDR_LEN;
if (eth_type_mpls(flow->dl_type)) {
int n;
- b->l2_5_ofs = b->l3_ofs;
+ p->l2_5_ofs = p->l3_ofs;
for (n = 1; n < FLOW_MAX_MPLS_LABELS; n++) {
if (flow->mpls_lse[n - 1] & htonl(MPLS_BOS_MASK)) {
break;
}
}
while (n > 0) {
- push_mpls(b, flow->dl_type, flow->mpls_lse[--n]);
+ push_mpls(p, flow->dl_type, flow->mpls_lse[--n]);
}
}
}