diff options
| author |   Ciara Loftus <ciara.loftus@intel.com> | 2016-09-30 15:47:03 +0100 |
|---|---|---|
| committer | Ciara Loftus <ciara.loftus@intel.com> | 2017-04-05 09:06:23 +0100 |
| commit | 7eac916e1b00d6a3393a09925e1634d71bf30568 (patch) | |
| tree | 94a3167a1abf03e62a2207f28905263a2b09229e /src/vnet/ipsec-gre | |
| parent | 63d5bae6401049debadfa9fcc3f18d8118b80441 (diff) | |
GRE over IPv6
Refactors the GRE node to work with both IPv4 and IPv6 transports.
Note that this changes the binary configuration API to support both
address families; each address uses the same memory for either
address type and a flag to indicate which is in use.
The CLI and VAT syntax remains unchanged; the code detects whether
an IPv4 or an IPv6 address was given.
Configuration examples:
IPv4 CLI: create gre tunnel src 192.168.1.1 dst 192.168.1.2
IPv6 CLI: create gre tunnel src 2620:124:9000::1 dst 2620:124:9000::2
IPv4 VAT: gre_add_del_tunnel src 192.168.1.1 dst 192.168.1.2
IPv6 VAT: gre_add_del_tunnel src 2620:124:9000::1 dst 2620:124:9000::2
Change-Id: Ica8ee775dc101047fb8cd41617ddc8fafc2741b0
Signed-off-by: Ciara Loftus <ciara.loftus@intel.com>
Diffstat (limited to 'src/vnet/ipsec-gre')
| -rw-r--r-- | src/vnet/ipsec-gre/node.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/vnet/ipsec-gre/node.c b/src/vnet/ipsec-gre/node.c index d20f248a6c8..217d323ad65 100644 --- a/src/vnet/ipsec-gre/node.c +++ b/src/vnet/ipsec-gre/node.c @@ -92,6 +92,8 @@ ipsec_gre_input (vlib_main_t * vm, u32 n_left_from, next_index, * from, * to_next; u64 cached_tunnel_key = (u64) ~0; u32 cached_tunnel_sw_if_index = 0, tunnel_sw_if_index; + u32 tun_src0, tun_dst0; + u32 tun_src1, tun_dst1; from = vlib_frame_vector_args (from_frame); n_left_from = from_frame->n_vectors; @@ -146,10 +148,10 @@ ipsec_gre_input (vlib_main_t * vm, ip1 = vlib_buffer_get_current (b1); /* Save src + dst ip4 address */ - vnet_buffer(b0)->gre.src = ip0->src_address.as_u32; - vnet_buffer(b0)->gre.dst = ip0->dst_address.as_u32; - vnet_buffer(b1)->gre.src = ip1->src_address.as_u32; - vnet_buffer(b1)->gre.dst = ip1->dst_address.as_u32; + tun_src0 = ip0->src_address.as_u32; + tun_dst0 = ip0->dst_address.as_u32; + tun_src1 = ip1->src_address.as_u32; + tun_dst1 = ip1->dst_address.as_u32; vlib_buffer_advance (b0, sizeof (*ip0)); vlib_buffer_advance (b1, sizeof (*ip1)); @@ -197,8 +199,7 @@ ipsec_gre_input (vlib_main_t * vm, /* For L2 payload set input sw_if_index to GRE tunnel for learning */ if (PREDICT_TRUE(next0 == IPSEC_GRE_INPUT_NEXT_L2_INPUT)) { - u64 key = ((u64)(vnet_buffer(b0)->gre.dst) << 32) | - (u64)(vnet_buffer(b0)->gre.src); + u64 key = ((u64)(tun_dst0) << 32) | (u64)(tun_src0); if (cached_tunnel_key != key) { @@ -230,8 +231,7 @@ drop0: /* For L2 payload set input sw_if_index to GRE tunnel for learning */ if (PREDICT_TRUE(next1 == IPSEC_GRE_INPUT_NEXT_L2_INPUT)) { - u64 key = ((u64)(vnet_buffer(b1)->gre.dst) << 32) | - (u64)(vnet_buffer(b1)->gre.src); + u64 key = ((u64)(tun_dst1) << 32) | (u64)(tun_src1); if (cached_tunnel_key != key) { @@ -297,6 +297,7 @@ drop1: u16 version0, protocol0; int verr0; u32 next0; + u32 tun_src0, tun_dst0; bi0 = from[0]; to_next[0] = bi0; @@ -308,8 +309,8 @@ drop1: b0 = vlib_get_buffer (vm, bi0); ip0 = vlib_buffer_get_current (b0); - vnet_buffer(b0)->gre.src = ip0->src_address.as_u32; - vnet_buffer(b0)->gre.dst = ip0->dst_address.as_u32; + tun_src0 = ip0->src_address.as_u32; + tun_dst0 = ip0->dst_address.as_u32; vlib_buffer_advance (b0, sizeof (*ip0)); @@ -337,8 +338,7 @@ drop1: /* For L2 payload set input sw_if_index to GRE tunnel for learning */ if (PREDICT_FALSE(next0 == IPSEC_GRE_INPUT_NEXT_L2_INPUT)) { - u64 key = ((u64)(vnet_buffer(b0)->gre.dst) << 32) | - (u64)(vnet_buffer(b0)->gre.src); + u64 key = ((u64)(tun_dst0) << 32) | (u64)(tun_src0); if (cached_tunnel_key != key) { |