MTU: Setting of MTU on software interface (instead of hardware interface)

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

diff --git a/src/vnet/ip/icmp4.c b/src/vnet/ip/icmp4.c
index c3afff7..a4808f2 100644 (file)
--- a/src/vnet/ip/icmp4.c
+++ b/src/vnet/ip/icmp4.c
@@ -219,7 +219,7 @@ VLIB_REGISTER_NODE (ip4_icmp_input_node,static) = {
 
   .n_next_nodes = 1,
   .next_nodes = {
-    [ICMP_INPUT_NEXT_ERROR] = "error-punt",
+    [ICMP_INPUT_NEXT_ERROR] = "ip4-punt",
   },
 };
 /* *INDENT-ON* */
@@ -336,8 +336,8 @@ ip4_icmp_echo_request (vlib_main_t * vm,
          ASSERT (ip0->checksum == ip4_header_checksum (ip0));
          ASSERT (ip1->checksum == ip4_header_checksum (ip1));
 
-         p0->flags |= VNET_BUFFER_LOCALLY_ORIGINATED;
-         p1->flags |= VNET_BUFFER_LOCALLY_ORIGINATED;
+         p0->flags |= VNET_BUFFER_F_LOCALLY_ORIGINATED;
+         p1->flags |= VNET_BUFFER_F_LOCALLY_ORIGINATED;
        }
 
       while (n_left_from > 0 && n_left_to_next > 0)
@@ -392,7 +392,7 @@ ip4_icmp_echo_request (vlib_main_t * vm,
 
          ASSERT (ip0->checksum == ip4_header_checksum (ip0));
 
-         p0->flags |= VNET_BUFFER_LOCALLY_ORIGINATED;
+         p0->flags |= VNET_BUFFER_F_LOCALLY_ORIGINATED;
        }
 
       vlib_put_next_frame (vm, node, next, n_left_to_next);
@@ -513,13 +513,15 @@ ip4_icmp_error (vlib_main_t * vm,
                  b->current_length = 0;
                }
            }
-         p0->current_length =
-           p0->current_length > 576 ? 576 : p0->current_length;
 
          /* Add IP header and ICMPv4 header including a 4 byte data field */
          vlib_buffer_advance (p0,
                               -sizeof (ip4_header_t) -
                               sizeof (icmp46_header_t) - 4);
+
+         p0->current_length =
+           p0->current_length > 576 ? 576 : p0->current_length;
+
          out_ip0 = vlib_buffer_get_current (p0);
          icmp0 = (icmp46_header_t *) & out_ip0[1];
 
@@ -592,7 +594,7 @@ VLIB_REGISTER_NODE (ip4_icmp_error_node) = {
 
   .n_next_nodes = IP4_ICMP_ERROR_N_NEXT,
   .next_nodes = {
-    [IP4_ICMP_ERROR_NEXT_DROP] = "error-drop",
+    [IP4_ICMP_ERROR_NEXT_DROP] = "ip4-drop",
     [IP4_ICMP_ERROR_NEXT_LOOKUP] = "ip4-lookup",
   },