X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fmap%2Fip6_map_t.c;h=861c049b0f4fd487bafd7d926a348b9163b12c85;hb=d60b432b138eee36606c4f400ee7e3aa3fd5b207;hp=7d0cd42ff0c4aa9c6ba4623a6fa8050cd2eb00af;hpb=7d4cd0cf6f1a94953ef97ab885752424dea6948c;p=vpp.git

diff --git a/src/plugins/map/ip6_map_t.c b/src/plugins/map/ip6_map_t.c
index 7d0cd42ff0c..861c049b0f4 100644
--- a/src/plugins/map/ip6_map_t.c
+++ b/src/plugins/map/ip6_map_t.c
@@ -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,
@@ -675,12 +687,6 @@ ip6_map_t (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame)
   return frame->n_vectors;
 }
 
-static char *map_t_error_strings[] = {
-#define _(sym, string) string,
-  foreach_map_error
-#undef _
-};
-
 /* *INDENT-OFF* */
 VLIB_REGISTER_NODE(ip6_map_t_fragmented_node) = {
   .function = ip6_map_t_fragmented,
@@ -690,7 +696,7 @@ VLIB_REGISTER_NODE(ip6_map_t_fragmented_node) = {
   .type = VLIB_NODE_TYPE_INTERNAL,
 
   .n_errors = MAP_N_ERROR,
-  .error_strings = map_t_error_strings,
+  .error_counters = map_error_counters,
 
   .n_next_nodes = IP6_MAPT_FRAGMENTED_N_NEXT,
   .next_nodes =
@@ -712,7 +718,7 @@ VLIB_REGISTER_NODE(ip6_map_t_icmp_node) = {
   .type = VLIB_NODE_TYPE_INTERNAL,
 
   .n_errors = MAP_N_ERROR,
-  .error_strings = map_t_error_strings,
+  .error_counters = map_error_counters,
 
   .n_next_nodes = IP6_MAPT_ICMP_N_NEXT,
   .next_nodes =
@@ -734,7 +740,7 @@ VLIB_REGISTER_NODE(ip6_map_t_tcp_udp_node) = {
   .type = VLIB_NODE_TYPE_INTERNAL,
 
   .n_errors = MAP_N_ERROR,
-  .error_strings = map_t_error_strings,
+  .error_counters = map_error_counters,
 
   .n_next_nodes = IP6_MAPT_TCP_UDP_N_NEXT,
   .next_nodes =
@@ -763,7 +769,7 @@ VLIB_REGISTER_NODE(ip6_map_t_node) = {
   .type = VLIB_NODE_TYPE_INTERNAL,
 
   .n_errors = MAP_N_ERROR,
-  .error_strings = map_t_error_strings,
+  .error_counters = map_error_counters,
 
   .n_next_nodes = IP6_MAPT_N_NEXT,
   .next_nodes =