ip6: set local flag on outbound echo reply

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

diff --git a/src/vnet/ip/icmp6.c b/src/vnet/ip/icmp6.c
index 9d283ff..b0fdadb 100644 (file)
--- a/src/vnet/ip/icmp6.c
+++ b/src/vnet/ip/icmp6.c
@@ -40,6 +40,7 @@
 #include <vlib/vlib.h>
 #include <vnet/ip/ip.h>
 #include <vnet/pg/pg.h>
+#include <vnet/ip/ip_sas.h>
 
 static u8 *
 format_ip6_icmp_type_and_code (u8 * s, va_list * args)
@@ -130,7 +131,7 @@ static char *icmp_error_strings[] = {
 
 typedef enum
 {
-  ICMP_INPUT_NEXT_DROP,
+  ICMP_INPUT_NEXT_PUNT,
   ICMP_INPUT_N_NEXT,
 } icmp_input_next_t;
 
@@ -199,7 +200,7 @@ ip6_icmp_input (vlib_main_t * vm,
 
          next0 = im->input_next_index_by_type[type0];
          error0 =
-           next0 == ICMP_INPUT_NEXT_DROP ? ICMP6_ERROR_UNKNOWN_TYPE : error0;
+           next0 == ICMP_INPUT_NEXT_PUNT ? ICMP6_ERROR_UNKNOWN_TYPE : error0;
 
          /* Check code is valid for type. */
          error0 =
@@ -223,7 +224,7 @@ ip6_icmp_input (vlib_main_t * vm,
 
          b0->error = node->errors[error0];
 
-         next0 = error0 != ICMP6_ERROR_NONE ? ICMP_INPUT_NEXT_DROP : next0;
+         next0 = error0 != ICMP6_ERROR_NONE ? ICMP_INPUT_NEXT_PUNT : next0;
 
          vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
                                           to_next, n_left_to_next,
@@ -250,7 +251,7 @@ VLIB_REGISTER_NODE (ip6_icmp_input_node) = {
 
   .n_next_nodes = 1,
   .next_nodes = {
-    [ICMP_INPUT_NEXT_DROP] = "ip6-drop",
+    [ICMP_INPUT_NEXT_PUNT] = "ip6-punt",
   },
 };
 /* *INDENT-ON* */
@@ -350,6 +351,9 @@ ip6_icmp_echo_request (vlib_main_t * vm,
                                vnet_buffer (p1)->sw_if_index[VLIB_RX]);
          vnet_buffer (p1)->sw_if_index[VLIB_TX] = fib_index1;
 
+         p0->flags |= VNET_BUFFER_F_LOCALLY_ORIGINATED;
+         p1->flags |= VNET_BUFFER_F_LOCALLY_ORIGINATED;
+
          /* verify speculative enqueues, maybe switch current next frame */
          /* if next0==next1==next_index then nothing special needs to be done */
          vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
@@ -403,6 +407,7 @@ ip6_icmp_echo_request (vlib_main_t * vm,
                                vnet_buffer (p0)->sw_if_index[VLIB_RX]);
          vnet_buffer (p0)->sw_if_index[VLIB_TX] = fib_index0;
 
+         p0->flags |= VNET_BUFFER_F_LOCALLY_ORIGINATED;
          /* Verify speculative enqueue, maybe switch current next frame */
          vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
                                           to_next, n_left_to_next,
@@ -475,8 +480,6 @@ ip6_icmp_error (vlib_main_t * vm,
   u32 *from, *to_next;
   uword n_left_from, n_left_to_next;
   ip6_icmp_error_next_t next_index;
-  ip6_main_t *im = &ip6_main;
-  ip_lookup_main_t *lm = &im->lookup_main;
 
   from = vlib_frame_vector_args (frame);
   n_left_from = frame->n_vectors;
@@ -507,7 +510,7 @@ ip6_icmp_error (vlib_main_t * vm,
          vlib_buffer_t *p0, *org_p0;
          ip6_header_t *ip0, *out_ip0;
          icmp46_header_t *icmp0;
-         u32 sw_if_index0, if_add_index0;
+         u32 sw_if_index0;
          int bogus_length;
 
          org_p0 = vlib_get_buffer (vm, org_pi0);
@@ -547,18 +550,10 @@ ip6_icmp_error (vlib_main_t * vm,
          out_ip0->protocol = IP_PROTOCOL_ICMP6;
          out_ip0->hop_limit = 0xff;
          out_ip0->dst_address = ip0->src_address;
-         if_add_index0 =
-           lm->if_address_pool_index_by_sw_if_index[sw_if_index0];
-         if (PREDICT_TRUE (if_add_index0 != ~0))
-           {
-             ip_interface_address_t *if_add =
-               pool_elt_at_index (lm->if_address_pool, if_add_index0);
-             ip6_address_t *if_ip =
-               ip_interface_address_get_address (lm, if_add);
-             out_ip0->src_address = *if_ip;
-           }
-         else                  /* interface has no IP6 address - should not happen */
-           {
+         /* Prefer a source address from "offending interface" */
+         if (!ip6_sas_by_sw_if_index (sw_if_index0, &out_ip0->dst_address,
+                                      &out_ip0->src_address))
+           { /* interface has no IP6 address - should not happen */
              next0 = IP6_ICMP_ERROR_NEXT_DROP;
              error0 = ICMP6_ERROR_DROP;
            }
@@ -784,7 +779,7 @@ icmp6_init (vlib_main_t * vm)
 #undef _
 
   clib_memset (cm->input_next_index_by_type,
-              ICMP_INPUT_NEXT_DROP, sizeof (cm->input_next_index_by_type));
+              ICMP_INPUT_NEXT_PUNT, sizeof (cm->input_next_index_by_type));
   clib_memset (cm->max_valid_code_by_type, 0,
               sizeof (cm->max_valid_code_by_type));
 
@@ -816,7 +811,7 @@ icmp6_init (vlib_main_t * vm)
   icmp6_register_type (vm, ICMP6_echo_request,
                       ip6_icmp_echo_request_node.index);
 
-  return vlib_call_init_function (vm, ip6_neighbor_init);
+  return (NULL);
 }
 
 VLIB_INIT_FUNCTION (icmp6_init);