diff options
| author |   Neale Ranns <nranns@cisco.com> | 2019-07-04 14:12:50 +0000 |
|---|---|---|
| committer |   Florin Coras <florin.coras@gmail.com> | 2019-07-05 17:57:33 +0000 |
| commit | 81cfa9cf388a742bad0d71ba1c92debb04c6cdba (patch) | |
| tree | 5d70a658456730b7c6834d9a0c2279ec40d25bd8 /src/vnet | |
| parent | fe2fff37bbe215f092a452e8322de7f885fc0298 (diff) | |
vxlan-gbp: Decap ignores reserved bits
Type: fix
from the draft:
3. Backward Compatibility
VXLAN [RFC7348] requires reserved fields to be set to zero on
transmit and ignored on receive.
Change-Id: I98544907894f1a6eba9595a37c3c88322905630e
Signed-off-by: Neale Ranns <nranns@cisco.com>
Diffstat (limited to 'src/vnet')
| -rw-r--r-- | src/vnet/vxlan-gbp/decap.c | 38 | ||||
| -rw-r--r-- | src/vnet/vxlan-gbp/vxlan_gbp_packet.h | 2 |
2 files changed, 22 insertions, 18 deletions
diff --git a/src/vnet/vxlan-gbp/decap.c b/src/vnet/vxlan-gbp/decap.c index 23995c49fcb..927c778b211 100644 --- a/src/vnet/vxlan-gbp/decap.c +++ b/src/vnet/vxlan-gbp/decap.c @@ -76,9 +76,11 @@ vxlan4_gbp_find_tunnel (vxlan_gbp_main_t * vxm, last_tunnel_cache4 * cache, vxlan4_gbp_tunnel_key_t key4; int rv; - key4.key[1] = ((u64) fib_index << 32) | vxlan_gbp0->vni_reserved; - key4.key[0] = (((u64) ip4_0->dst_address.as_u32 << 32) | - ip4_0->src_address.as_u32); + key4.key[1] = (((u64) fib_index << 32) | + (vxlan_gbp0->vni_reserved & + clib_host_to_net_u32 (0xffffff00))); + key4.key[0] = + (((u64) ip4_0->dst_address.as_u32 << 32) | ip4_0->src_address.as_u32); if (PREDICT_FALSE (key4.key[0] != cache->key[0] || key4.key[1] != cache->key[1])) @@ -122,7 +124,9 @@ vxlan6_gbp_find_tunnel (vxlan_gbp_main_t * vxm, last_tunnel_cache6 * cache, .key = { [0] = ip6_0->src_address.as_u64[0], [1] = ip6_0->src_address.as_u64[1], - [2] = (((u64) fib_index) << 32) | vxlan_gbp0->vni_reserved, + [2] = ((((u64) fib_index) << 32) | + (vxlan_gbp0->vni_reserved & + clib_host_to_net_u32 (0xffffff00))), } }; int rv; @@ -293,13 +297,13 @@ vxlan_gbp_input (vlib_main_t * vm, vlib_buffer_advance (b0, sizeof *vxlan_gbp0); vlib_buffer_advance (b1, sizeof *vxlan_gbp1); + u8 i_and_g0 = ((flags0 & VXLAN_GBP_FLAGS_GI) == VXLAN_GBP_FLAGS_GI); + u8 i_and_g1 = ((flags1 & VXLAN_GBP_FLAGS_GI) == VXLAN_GBP_FLAGS_GI); + /* Validate VXLAN_GBP tunnel encap-fib index against packet */ - if (PREDICT_FALSE - (t0 == NULL - || flags0 != (VXLAN_GBP_FLAGS_I | VXLAN_GBP_FLAGS_G))) + if (PREDICT_FALSE (t0 == NULL || !i_and_g0)) { - if (t0 != NULL - && flags0 != (VXLAN_GBP_FLAGS_I | VXLAN_GBP_FLAGS_G)) + if (t0 != NULL && !i_and_g0) { error0 = VXLAN_GBP_ERROR_BAD_FLAGS; vlib_increment_combined_counter @@ -335,11 +339,9 @@ vxlan_gbp_input (vlib_main_t * vm, vnet_buffer2 (b0)->gbp.sclass = vxlan_gbp_get_sclass (vxlan_gbp0); - if (PREDICT_FALSE - (t1 == 0 || flags1 != (VXLAN_GBP_FLAGS_I | VXLAN_GBP_FLAGS_G))) + if (PREDICT_FALSE (t1 == NULL || !i_and_g1)) { - if (t1 != 0 - && flags1 != (VXLAN_GBP_FLAGS_I | VXLAN_GBP_FLAGS_G)) + if (t1 != NULL && !i_and_g1) { error1 = VXLAN_GBP_ERROR_BAD_FLAGS; vlib_increment_combined_counter @@ -443,13 +445,13 @@ vxlan_gbp_input (vlib_main_t * vm, /* pop (ip, udp, vxlan_gbp) */ vlib_buffer_advance (b0, sizeof (*vxlan_gbp0)); + + u8 i_and_g0 = ((flags0 & VXLAN_GBP_FLAGS_GI) == VXLAN_GBP_FLAGS_GI); + /* Validate VXLAN_GBP tunnel encap-fib index against packet */ - if (PREDICT_FALSE - (t0 == NULL - || flags0 != (VXLAN_GBP_FLAGS_I | VXLAN_GBP_FLAGS_G))) + if (PREDICT_FALSE (t0 == NULL || !i_and_g0)) { - if (t0 != NULL - && flags0 != (VXLAN_GBP_FLAGS_I | VXLAN_GBP_FLAGS_G)) + if (t0 != NULL && !i_and_g0) { error0 = VXLAN_GBP_ERROR_BAD_FLAGS; vlib_increment_combined_counter diff --git a/src/vnet/vxlan-gbp/vxlan_gbp_packet.h b/src/vnet/vxlan-gbp/vxlan_gbp_packet.h index 58fe00323b0..e655b333b89 100644 --- a/src/vnet/vxlan-gbp/vxlan_gbp_packet.h +++ b/src/vnet/vxlan-gbp/vxlan_gbp_packet.h @@ -104,6 +104,8 @@ typedef enum #undef _ } __attribute__ ((packed)) vxlan_gbp_flags_t; +#define VXLAN_GBP_FLAGS_GI (VXLAN_GBP_FLAGS_G|VXLAN_GBP_FLAGS_I) + #define foreach_vxlan_gbp_gpflags \ _ (0x40, D) \ _ (0x20, E) \ |