ICMP46 error: Clone first buffer instead of "truncating" original buffer

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

diff --git a/src/vnet/ip/icmp6.c b/src/vnet/ip/icmp6.c
index fd5d0ec..ff83a0c 100644 (file)
--- a/src/vnet/ip/icmp6.c
+++ b/src/vnet/ip/icmp6.c
@@ -493,15 +493,29 @@ ip6_icmp_error (vlib_main_t * vm,
 
       while (n_left_from > 0 && n_left_to_next > 0)
        {
-         u32 pi0 = from[0];
+         /*
+          * Duplicate first buffer and free the original chain.  Keep
+          * as much of the original packet as possible, within the
+          * minimum MTU. We chat "a little" here by keeping whatever
+          * is available in the first buffer.
+          */
+
+         u32 pi0 = ~0;
+         u32 org_pi0 = from[0];
          u32 next0 = IP6_ICMP_ERROR_NEXT_LOOKUP;
          u8 error0 = ICMP6_ERROR_NONE;
-         vlib_buffer_t *p0;
+         vlib_buffer_t *p0, *org_p0;
          ip6_header_t *ip0, *out_ip0;
          icmp46_header_t *icmp0;
          u32 sw_if_index0, if_add_index0;
          int bogus_length;
 
+         org_p0 = vlib_get_buffer (vm, org_pi0);
+         p0 = vlib_buffer_copy_no_chain (vm, org_p0, &pi0);
+         vlib_buffer_free_one (vm, org_pi0);
+         if (!p0 || pi0 == ~0) /* Out of buffers */
+           continue;
+
          /* Speculatively enqueue p0 to the current next frame */
          to_next[0] = pi0;
          from += 1;
@@ -509,30 +523,19 @@ ip6_icmp_error (vlib_main_t * vm,
          n_left_from -= 1;
          n_left_to_next -= 1;
 
-         p0 = vlib_get_buffer (vm, pi0);
          ip0 = vlib_buffer_get_current (p0);
          sw_if_index0 = vnet_buffer (p0)->sw_if_index[VLIB_RX];
 
-         /* RFC4443 says to keep as much of the original packet as possible
-          * within the minimum MTU. We cheat "a little" here by keeping whatever fits
-          * in the first buffer, to be more efficient */
-         if (PREDICT_FALSE (p0->total_length_not_including_first_buffer))
-           {                   /* clear current_length of all other buffers in chain */
-             vlib_buffer_t *b = p0;
-             p0->total_length_not_including_first_buffer = 0;
-             while (b->flags & VLIB_BUFFER_NEXT_PRESENT)
-               {
-                 b = vlib_get_buffer (vm, b->next_buffer);
-                 b->current_length = 0;
-               }
-           }
+         /* Add IP header and ICMPv6 header including a 4 byte data field */
+         vlib_buffer_advance (p0,
+                              -(sizeof (ip6_header_t) +
+                                sizeof (icmp46_header_t) + 4));
+
+         vnet_buffer (p0)->sw_if_index[VLIB_TX] = ~0;
+         p0->flags |= VNET_BUFFER_F_LOCALLY_ORIGINATED;
          p0->current_length =
            p0->current_length > 1280 ? 1280 : p0->current_length;
 
-         /* Add IP header and ICMPv6 header including a 4 byte data field */
-         vlib_buffer_advance (p0,
-                              -sizeof (ip6_header_t) -
-                              sizeof (icmp46_header_t) - 4);
          out_ip0 = vlib_buffer_get_current (p0);
          icmp0 = (icmp46_header_t *) & out_ip0[1];
 
@@ -571,11 +574,10 @@ ip6_icmp_error (vlib_main_t * vm,
            ip6_tcp_udp_icmp_compute_checksum (vm, p0, out_ip0,
                                               &bogus_length);
 
-
-
          /* Update error status */
          if (error0 == ICMP6_ERROR_NONE)
            error0 = icmp6_icmp_type_to_error (icmp0->type);
+
          vlib_error_count (vm, node->node_index, error0, 1);
 
          /* Verify speculative enqueue, maybe switch current next frame */
@@ -600,7 +602,7 @@ VLIB_REGISTER_NODE (ip6_icmp_error_node) = {
 
   .n_next_nodes = IP6_ICMP_ERROR_N_NEXT,
   .next_nodes = {
-    [IP6_ICMP_ERROR_NEXT_DROP] = "ip6-drop",
+    [IP6_ICMP_ERROR_NEXT_DROP] = "error-drop",
     [IP6_ICMP_ERROR_NEXT_LOOKUP] = "ip6-lookup",
   },
 
@@ -773,24 +775,25 @@ icmp6_init (vlib_main_t * vm)
   foreach_icmp6_code;
 #undef _
 
-  memset (cm->input_next_index_by_type,
-         ICMP_INPUT_NEXT_DROP, sizeof (cm->input_next_index_by_type));
-  memset (cm->max_valid_code_by_type, 0, sizeof (cm->max_valid_code_by_type));
+  clib_memset (cm->input_next_index_by_type,
+              ICMP_INPUT_NEXT_DROP, sizeof (cm->input_next_index_by_type));
+  clib_memset (cm->max_valid_code_by_type, 0,
+              sizeof (cm->max_valid_code_by_type));
 
 #define _(a,n,t) cm->max_valid_code_by_type[ICMP6_##a] = clib_max (cm->max_valid_code_by_type[ICMP6_##a], n);
   foreach_icmp6_code;
 #undef _
 
-  memset (cm->min_valid_hop_limit_by_type, 0,
-         sizeof (cm->min_valid_hop_limit_by_type));
+  clib_memset (cm->min_valid_hop_limit_by_type, 0,
+              sizeof (cm->min_valid_hop_limit_by_type));
   cm->min_valid_hop_limit_by_type[ICMP6_router_solicitation] = 255;
   cm->min_valid_hop_limit_by_type[ICMP6_router_advertisement] = 255;
   cm->min_valid_hop_limit_by_type[ICMP6_neighbor_solicitation] = 255;
   cm->min_valid_hop_limit_by_type[ICMP6_neighbor_advertisement] = 255;
   cm->min_valid_hop_limit_by_type[ICMP6_redirect] = 255;
 
-  memset (cm->min_valid_length_by_type, sizeof (icmp46_header_t),
-         sizeof (cm->min_valid_length_by_type));
+  clib_memset (cm->min_valid_length_by_type, sizeof (icmp46_header_t),
+              sizeof (cm->min_valid_length_by_type));
   cm->min_valid_length_by_type[ICMP6_router_solicitation] =
     sizeof (icmp6_neighbor_discovery_header_t);
   cm->min_valid_length_by_type[ICMP6_router_advertisement] =