ip: Replace Sematics for Interface IP addresses

[vpp.git] / src / vnet / ip / ip6_input.c

diff --git a/src/vnet/ip/ip6_input.c b/src/vnet/ip/ip6_input.c
index 3b38d34..ebcfd5a 100644 (file)
--- a/src/vnet/ip/ip6_input.c
+++ b/src/vnet/ip/ip6_input.c
@@ -62,8 +62,8 @@ format_ip6_input_trace (u8 * s, va_list * va)
 
 /* Validate IP v6 packets and pass them either to forwarding code
    or drop exception packets. */
-static uword
-ip6_input (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame)
+VLIB_NODE_FN (ip6_input_node) (vlib_main_t * vm, vlib_node_runtime_t * node,
+                              vlib_frame_t * frame)
 {
   vnet_main_t *vnm = vnet_get_main ();
   ip6_main_t *im = &ip6_main;
@@ -73,7 +73,7 @@ ip6_input (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame)
   vlib_node_runtime_t *error_node =
     vlib_node_get_runtime (vm, ip6_input_node.index);
   vlib_simple_counter_main_t *cm;
-  u32 thread_index = vlib_get_thread_index ();
+  u32 thread_index = vm->thread_index;
 
   from = vlib_frame_vector_args (frame);
   n_left_from = frame->n_vectors;
@@ -218,15 +218,16 @@ ip6_input (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame)
   return frame->n_vectors;
 }
 
+#ifndef CLIB_MARCH_VARIANT
 char *ip6_error_strings[] = {
 #define _(sym,string) string,
   foreach_ip6_error
 #undef _
 };
+#endif /* CLIB_MARCH_VARIANT */
 
 /* *INDENT-OFF* */
 VLIB_REGISTER_NODE (ip6_input_node) = {
-  .function = ip6_input,
   .name = "ip6-input",
   .vector_size = sizeof (u32),
 
@@ -246,8 +247,8 @@ VLIB_REGISTER_NODE (ip6_input_node) = {
 };
 /* *INDENT-ON* */
 
-VLIB_NODE_FUNCTION_MULTIARCH (ip6_input_node, ip6_input)
-     static clib_error_t *ip6_init (vlib_main_t * vm)
+static clib_error_t *
+ip6_init (vlib_main_t * vm)
 {
   ethernet_register_input_type (vm, ETHERNET_TYPE_IP6, ip6_input_node.index);
   ppp_register_input_protocol (vm, PPP_PROTOCOL_ip6, ip6_input_node.index);
@@ -265,11 +266,33 @@ VLIB_NODE_FUNCTION_MULTIARCH (ip6_input_node, ip6_input)
   /* Default hop limit for packets we generate. */
   ip6_main.host_config.ttl = 64;
 
+
+  uword *u = hash_get (ip_main.protocol_info_by_name, "IPV6_FRAGMENTATION");
+  if (u)
+    {
+      ip_protocol_info_t *info =
+       vec_elt_at_index (ip_main.protocol_infos, *u);
+      ASSERT (NULL == info->format_header);
+      info->format_header = format_ip6_frag_hdr;
+    }
   return /* no error */ 0;
 }
 
 VLIB_INIT_FUNCTION (ip6_init);
 
+static clib_error_t *
+ip6_main_loop_enter (vlib_main_t * vm)
+{
+  ip6_main_t *im = &ip6_main;
+  vlib_thread_main_t *tm = &vlib_thread_main;
+
+  throttle_init (&im->nd_throttle, tm->n_vlib_mains, 1e-3);
+
+  return 0;
+}
+
+VLIB_MAIN_LOOP_ENTER_FUNCTION (ip6_main_loop_enter);
+
 /*
  * fd.io coding-style-patch-verification: ON
  *