ip: Replace Sematics for Interface IP addresses

[vpp.git] / src / plugins / map / ip6_map_t.c

diff --git a/src/plugins/map/ip6_map_t.c b/src/plugins/map/ip6_map_t.c
index 01bf0f9..874a14c 100644 (file)
--- a/src/plugins/map/ip6_map_t.c
+++ b/src/plugins/map/ip6_map_t.c
@@ -345,7 +345,7 @@ map_ip6_to_ip4_tcp_udp (vlib_main_t * vm, vlib_buffer_t * p,
 
   if (l4_protocol == IP_PROTOCOL_TCP)
     {
-      tcp_header_t *tcp = ip6_next_header (ip6);
+      tcp_header_t *tcp = (tcp_header_t *) u8_ptr_add (ip6, l4_offset);
       if (mm->tcp_mss > 0)
        {
          csum = tcp->checksum;
@@ -356,7 +356,7 @@ map_ip6_to_ip4_tcp_udp (vlib_main_t * vm, vlib_buffer_t * p,
     }
   else
     {
-      udp_header_t *udp = ip6_next_header (ip6);
+      udp_header_t *udp = (udp_header_t *) u8_ptr_add (ip6, l4_offset);
       checksum = &udp->checksum;
     }
 
@@ -544,6 +544,18 @@ ip6_map_t (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame)
            ip6_map_t_embedded_address (d0, &ip60->dst_address);
          vnet_buffer (p0)->map_t.mtu = d0->mtu ? d0->mtu : ~0;
 
+         map_port0 = -1;
+
+         if (PREDICT_FALSE (ip60->hop_limit == 1))
+           {
+             icmp6_error_set_vnet_buffer (p0, ICMP6_time_exceeded,
+                                          ICMP6_time_exceeded_ttl_exceeded_in_transit,
+                                          0);
+             p0->error = error_node->errors[MAP_ERROR_TIME_EXCEEDED];
+             next0 = IP6_MAPT_NEXT_ICMP;
+             goto trace;
+           }
+
          if (PREDICT_FALSE
              (ip6_parse (vm, p0, ip60, p0->current_length,
                          &(vnet_buffer (p0)->map_t.v6.l4_protocol),
@@ -554,7 +566,6 @@ ip6_map_t (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame)
                error0 == MAP_ERROR_NONE ? MAP_ERROR_MALFORMED : error0;
            }
 
-         map_port0 = -1;
          l4_len0 =
            (u32) clib_net_to_host_u16 (ip60->payload_length) +
            sizeof (*ip60) - vnet_buffer (p0)->map_t.v6.l4_offset;
@@ -603,12 +614,12 @@ ip6_map_t (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame)
              next0 = IP6_MAPT_NEXT_MAPT_ICMP;
              if (((icmp46_header_t *)
                   u8_ptr_add (ip60,
-                              vnet_buffer (p0)->map_t.v6.l4_offset))->code ==
+                              vnet_buffer (p0)->map_t.v6.l4_offset))->type ==
                  ICMP6_echo_reply
                  || ((icmp46_header_t *)
                      u8_ptr_add (ip60,
                                  vnet_buffer (p0)->map_t.v6.l4_offset))->
-                 code == ICMP6_echo_request)
+                 type == ICMP6_echo_request)
                map_port0 = l4_src_port;
            }
          else
@@ -659,6 +670,7 @@ ip6_map_t (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame)
            }
 
          p0->error = error_node->errors[error0];
+       trace:
          if (PREDICT_FALSE (p0->flags & VLIB_BUFFER_IS_TRACED))
            {
              map_add_trace (vm, node, p0,