#include <config.h>
#include <sys/types.h>
#include "flow.h"
-#include <assert.h>
#include <errno.h>
#include <inttypes.h>
#include <limits.h>
#include "csum.h"
#include "dynamic-string.h"
#include "hash.h"
+#include "jhash.h"
#include "match.h"
#include "ofpbuf.h"
#include "openflow/openflow.h"
return ofpbuf_try_pull(packet, sizeof(struct icmp6_hdr));
}
+static void
+parse_mpls(struct ofpbuf *b, struct flow *flow)
+{
+ struct mpls_hdr *mh;
+
+ while ((mh = ofpbuf_try_pull(b, sizeof *mh))) {
+ if (flow->mpls_depth++ == 0) {
+ flow->mpls_lse = mh->mpls_lse;
+ }
+ if (mh->mpls_lse & htonl(MPLS_BOS_MASK)) {
+ break;
+ }
+ }
+}
+
static void
parse_vlan(struct ofpbuf *b, struct flow *flow)
{
}
ofpbuf_pull(b, sizeof *llc);
- return llc->snap.snap_type;
+
+ if (ntohs(llc->snap.snap_type) >= ETH_TYPE_MIN) {
+ return llc->snap.snap_type;
+ }
+
+ return htons(FLOW_DL_TYPE_NONE);
}
static int
*
* - packet->l2 to the start of the Ethernet header.
*
+ * - packet->l2_5 to the start of the MPLS shim header.
+ *
* - packet->l3 to just past the Ethernet header, or just past the
* vlan_header if one is present, to the first byte of the payload of the
* Ethernet frame.
memset(flow, 0, sizeof *flow);
if (tnl) {
- assert(tnl != &flow->tunnel);
+ ovs_assert(tnl != &flow->tunnel);
flow->tunnel = *tnl;
}
flow->in_port = ofp_in_port;
flow->skb_priority = skb_priority;
flow->skb_mark = skb_mark;
- packet->l2 = b.data;
- packet->l3 = NULL;
- packet->l4 = NULL;
- packet->l7 = NULL;
+ packet->l2 = b.data;
+ packet->l2_5 = NULL;
+ packet->l3 = NULL;
+ packet->l4 = NULL;
+ packet->l7 = NULL;
if (b.size < sizeof *eth) {
return;
}
flow->dl_type = parse_ethertype(&b);
+ /* Parse mpls, copy l3 ttl. */
+ if (eth_type_mpls(flow->dl_type)) {
+ packet->l2_5 = b.data;
+ parse_mpls(&b, flow);
+ }
+
/* Network layer. */
packet->l3 = b.data;
if (flow->dl_type == htons(ETH_TYPE_IP)) {
void
flow_get_metadata(const struct flow *flow, struct flow_metadata *fmd)
{
- BUILD_ASSERT_DECL(FLOW_WC_SEQ == 18);
+ BUILD_ASSERT_DECL(FLOW_WC_SEQ == 20);
fmd->tun_id = flow->tunnel.tun_id;
fmd->metadata = flow->metadata;
uint32_t
flow_wildcards_hash(const struct flow_wildcards *wc, uint32_t basis)
{
- return flow_hash(&wc->masks, basis);;
+ return flow_hash(&wc->masks, basis);
}
/* Returns true if 'a' and 'b' represent the same wildcards, false if they are
fields.tp_port = flow->tp_src ^ flow->tp_dst;
}
}
- return hash_bytes(&fields, sizeof fields, basis);
+ return jhash_bytes(&fields, sizeof fields, basis);
}
/* Hashes the portions of 'flow' designated by 'fields'. */
switch (fields) {
case NX_HASH_FIELDS_ETH_SRC:
- return hash_bytes(flow->dl_src, sizeof flow->dl_src, basis);
+ return jhash_bytes(flow->dl_src, sizeof flow->dl_src, basis);
case NX_HASH_FIELDS_SYMMETRIC_L4:
return flow_hash_symmetric_l4(flow, basis);
flow->vlan_tci |= htons((pcp << VLAN_PCP_SHIFT) | VLAN_CFI);
}
+/* Sets the MPLS Label that 'flow' matches to 'label', which is interpreted
+ * as an OpenFlow 1.1 "mpls_label" value. */
+void
+flow_set_mpls_label(struct flow *flow, ovs_be32 label)
+{
+ set_mpls_lse_label(&flow->mpls_lse, label);
+}
+
+/* Sets the MPLS TTL that 'flow' matches to 'ttl', which should be in the
+ * range 0...255. */
+void
+flow_set_mpls_ttl(struct flow *flow, uint8_t ttl)
+{
+ set_mpls_lse_ttl(&flow->mpls_lse, ttl);
+}
+
+/* Sets the MPLS TC that 'flow' matches to 'tc', which should be in the
+ * range 0...7. */
+void
+flow_set_mpls_tc(struct flow *flow, uint8_t tc)
+{
+ set_mpls_lse_tc(&flow->mpls_lse, tc);
+}
+
+/* Sets the MPLS BOS bit that 'flow' matches to which should be 0 or 1. */
+void
+flow_set_mpls_bos(struct flow *flow, uint8_t bos)
+{
+ set_mpls_lse_bos(&flow->mpls_lse, bos);
+}
+
/* Puts into 'b' a packet that flow_extract() would parse as having the given
* 'flow'.
*
memcpy(arp->ar_tha, flow->arp_tha, ETH_ADDR_LEN);
}
}
+
+ if (eth_type_mpls(flow->dl_type)) {
+ b->l2_5 = b->l3;
+ push_mpls(b, flow->dl_type, flow->mpls_lse);
+ }
}
\f
/* Compressed flow. */
}
}
- return mhash_finish(hash, p - mask->masks.values);
+ return mhash_finish(hash, (p - mask->masks.values) * 4);
}
/* Returns a hash value for the bits of 'flow' where there are 1-bits in
}
}
- return mhash_finish(hash, p - mask->masks.values);
+ return mhash_finish(hash, (p - mask->masks.values) * 4);
}
\f
/* Initializes 'dst' as a copy of 'src'. The caller must eventually free 'dst'