IPIP: Add IP{v4,v6} over IP{v4,v6} configured tunnel support.

Change-Id: I166301c9e2388bae5f70ec0179d663a2703e27f5
Signed-off-by: Ole Troan <ot@cisco.com>

1 files changed, 0 insertions, 165 deletions

diff --git a/src/plugins/sixrd/ip4_sixrd.c b/src/plugins/sixrd/ip4_sixrd.c
deleted file mode 100644
index f700f14978c..00000000000
--- a/src/plugins/sixrd/ip4_sixrd.c
+++ /dev/null
@@ -1,165 +0,0 @@
-/*---------------------------------------------------------------------------
- * Copyright (c) 2009-2014 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *---------------------------------------------------------------------------
- */
-
-#include "sixrd.h"
-
-vlib_node_registration_t ip4_sixrd_node;
-
-typedef enum {
-  IP4_SIXRD_NEXT_IP6_LOOKUP,
-  IP4_SIXRD_NEXT_DROP,
-  IP4_SIXRD_N_NEXT,
-} ip4_sixrd_next_t;
-
-typedef struct {
-  u32 tunnel_id;
-  u32 length;
-  ip4_address_t src;
-  ip4_address_t dst;
-} sixrd_rx_trace_t;
-
-u8 *
-format_sixrd_rx_trace (u8 * s, va_list * args)
-{
-  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
-  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  sixrd_rx_trace_t *t = va_arg (*args, sixrd_rx_trace_t *);
-
-  s = format (s, "6RD: tunnel %d len %d src %U dst %U",
-	      t->tunnel_id, clib_net_to_host_u16 (t->length),
-	      format_ip4_address, &t->src, format_ip4_address, &t->dst);
-  return s;
-}
-
-/*
- * ip4_sixrd_sec_check
- */
-static_always_inline void
-ip4_sixrd_sec_check(sixrd_tunnel_t *t, ip4_address_t sa4,
-		    ip6_address_t sa6, u8 *error) {
-  if (PREDICT_FALSE(sixrd_get_addr_net(t, sa6.as_u64[0]) != sa4.as_u32))
-    *error = SIXRD_ERROR_SEC_CHECK;
-}
-
-/*
- * ip4_sixrd
- */
-uword ip4_sixrd(vlib_main_t *vm, vlib_node_runtime_t *node,
-		vlib_frame_t *frame) {
-  u32 n_left_from, *from, next_index, *to_next, n_left_to_next;
-  vlib_node_runtime_t *error_node = vlib_node_get_runtime(vm, ip4_sixrd_node.index);
-  vnet_interface_main_t * im = &vnet_get_main()->interface_main;
-  u32 thread_index = vlib_get_thread_index ();
-
-  from = vlib_frame_vector_args(frame);
-  n_left_from = frame->n_vectors;
-  next_index = node->cached_next_index;
-  while (n_left_from > 0) {
-    vlib_get_next_frame(vm, node, next_index, to_next, n_left_to_next);
-
-    /* Single loop */
-    while (n_left_from > 0 && n_left_to_next > 0) {
-      u32 pi0;
-      vlib_buffer_t *p0;
-      u8 error0 = SIXRD_ERROR_NONE;
-      sixrd_tunnel_t *t0 = 0;
-      ip4_header_t *ip40;
-      ip6_header_t *ip60;
-      u32 tunnel_sw_if_index = ~0;
-      u32 next0 = IP4_SIXRD_NEXT_DROP;
-
-      pi0 = to_next[0] = from[0];
-      from += 1;
-      n_left_from -= 1;
-      to_next += 1;
-      n_left_to_next -= 1;
-
-      p0 = vlib_get_buffer(vm, pi0);
-      ip40 = vlib_buffer_get_current(p0);
-
-      /* Throw away anything that isn't IP in IP. */
-      if (PREDICT_TRUE(ip40->protocol == IP_PROTOCOL_IPV6 && clib_net_to_host_u16(ip40->length) >= 60)) {
-        vlib_buffer_advance(p0, sizeof(ip4_header_t));
-        t0 = ip4_sixrd_get_tunnel(vnet_buffer(p0)->ip.adj_index[VLIB_TX], (ip4_address_t *)&ip40->dst_address, &error0);
-      } else {
-        error0 = SIXRD_ERROR_BAD_PROTOCOL;
-      }
-
-      if (!t0) {
-	error0 = SIXRD_ERROR_NO_TUNNEL;
-	goto error;
-      }
-
-      tunnel_sw_if_index = t0->sw_if_index;
-
-      /* SIXRD inbound security check */
-      if (t0->security_check) {
-	ip60 = vlib_buffer_get_current(p0);
-        ip4_sixrd_sec_check(t0, ip40->src_address, ip60->src_address, &error0);
-      }
-      next0 = error0 == SIXRD_ERROR_NONE ? IP4_SIXRD_NEXT_IP6_LOOKUP
-                                         : IP4_SIXRD_NEXT_DROP;
-
-      if (PREDICT_FALSE(p0->flags & VLIB_BUFFER_IS_TRACED)) {
-        sixrd_rx_trace_t *tr = vlib_add_trace(vm, node, p0, sizeof(*tr));
-        tr->tunnel_id = tunnel_sw_if_index;
-	tr->length = ip40->length;
-	tr->src.as_u32 = ip40->src_address.as_u32;
-	tr->dst.as_u32 = ip40->dst_address.as_u32;
-      }
-
-      error:
-      if (PREDICT_TRUE(error0 == SIXRD_ERROR_NONE)) {
-	u32 len = vlib_buffer_length_in_chain (vm, p0);
-	vlib_increment_combined_counter (im->combined_sw_if_counters
-					 + VNET_INTERFACE_COUNTER_RX,
-					 thread_index,
-					 tunnel_sw_if_index,
-					 1 /* packets */ ,
-					 len /* bytes */ );
-
-	vnet_buffer (p0)->sw_if_index[VLIB_RX] = tunnel_sw_if_index;
-      } else {
-	p0->error = error_node->errors[error0];
-      }
-      vlib_validate_buffer_enqueue_x1(vm, node, next_index, to_next,
-                                      n_left_to_next, pi0, next0);
-    }
-    vlib_put_next_frame(vm, node, next_index, n_left_to_next);
-  }
-  return frame->n_vectors;
-}
-
-static char *sixrd_error_strings[] = {
-#define _(sym, string) string,
-    foreach_sixrd_error
-#undef _
-};
-
-VLIB_REGISTER_NODE(ip4_sixrd_node) = {
-  .function = ip4_sixrd,
-  .name = "ip4-sixrd",
-  .vector_size = sizeof(u32),
-  .format_trace = format_sixrd_rx_trace,
-  .n_errors = SIXRD_N_ERROR,
-  .error_strings = sixrd_error_strings,
-  .n_next_nodes = IP4_SIXRD_N_NEXT,
-  .next_nodes =
-  {
-    [IP4_SIXRD_NEXT_IP6_LOOKUP] = "ip6-lookup",
-    [IP4_SIXRD_NEXT_DROP] = "error-drop",
-  },
-};