X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fnat%2Fnat44_hairpinning.c;h=21e2eee188b28c059dd4c5cb4d443b5f1bc00511;hb=17a8ab6857f023bc1436d84808acc58dd614203e;hp=331e7ca96bd9e9737ad71ec0941aff9781c4aa0b;hpb=22bb417e91c7bdf639b24b5edd321028f56ea04a;p=vpp.git

diff --git a/src/plugins/nat/nat44_hairpinning.c b/src/plugins/nat/nat44_hairpinning.c
index 331e7ca96bd..21e2eee188b 100644
--- a/src/plugins/nat/nat44_hairpinning.c
+++ b/src/plugins/nat/nat44_hairpinning.c
@@ -22,7 +22,6 @@
 #include <vnet/fib/ip4_fib.h>
 #include <nat/nat.h>
 #include <nat/nat_inlines.h>
-#include <nat/nat_reass.h>
 
 typedef enum
 {
@@ -57,6 +56,36 @@ static char *nat44_hairpin_error_strings[] = {
 #undef _
 };
 
+typedef struct
+{
+  ip4_address_t addr;
+  u16 port;
+  u32 fib_index;
+  u32 session_index;
+} nat_hairpin_trace_t;
+
+static u8 *
+format_nat_hairpin_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  nat_hairpin_trace_t *t = va_arg (*args, nat_hairpin_trace_t *);
+
+  s =
+    format (s, "new dst addr %U port %u fib-index %u", format_ip4_address,
+	    &t->addr, clib_net_to_host_u16 (t->port), t->fib_index);
+  if (~0 == t->session_index)
+    {
+      s = format (s, " is-static-mapping");
+    }
+  else
+    {
+      s = format (s, " session-index %u", t->session_index);
+    }
+
+  return s;
+}
+
 extern vnet_feature_arc_registration_t vnet_feat_arc_ip4_local;
 
 static_always_inline int
@@ -87,18 +116,17 @@ is_hairpinning (snat_main_t * sm, ip4_address_t * dst_addr)
 
 #ifndef CLIB_MARCH_VARIANT
 int
-snat_hairpinning (snat_main_t * sm,
-		  vlib_buffer_t * b0,
-		  ip4_header_t * ip0,
-		  udp_header_t * udp0,
-		  tcp_header_t * tcp0, u32 proto0, int is_ed)
+snat_hairpinning (vlib_main_t * vm, vlib_node_runtime_t * node,
+		  snat_main_t * sm, vlib_buffer_t * b0, ip4_header_t * ip0,
+		  udp_header_t * udp0, tcp_header_t * tcp0, u32 proto0,
+		  int is_ed, int do_trace)
 {
   snat_session_key_t key0, sm0;
   snat_session_t *s0;
   clib_bihash_kv_8_8_t kv0, value0;
   ip_csum_t sum0;
-  u32 new_dst_addr0 = 0, old_dst_addr0, ti = 0, si;
-  u16 new_dst_port0, old_dst_port0;
+  u32 new_dst_addr0 = 0, old_dst_addr0, ti = 0, si = ~0;
+  u16 new_dst_port0 = ~0, old_dst_port0;
   int rv;
 
   key0.addr = ip0->dst_address;
@@ -127,12 +155,12 @@ snat_hairpinning (snat_main_t * sm,
       if (is_ed)
 	{
 	  clib_bihash_kv_16_8_t ed_kv, ed_value;
-	  make_ed_kv (&ed_kv, &ip0->dst_address, &ip0->src_address,
+	  make_ed_kv (&ip0->dst_address, &ip0->src_address,
 		      ip0->protocol, sm->outside_fib_index, udp0->dst_port,
-		      udp0->src_port);
-	  rv = clib_bihash_search_16_8 (&sm->per_thread_data[ti].out2in_ed,
-					&ed_kv, &ed_value);
-	  si = ed_value.value;
+		      udp0->src_port, ~0, ~0, &ed_kv);
+	  rv = clib_bihash_search_16_8 (&sm->out2in_ed, &ed_kv, &ed_value);
+	  ASSERT (ti == ed_value_get_thread_index (&ed_value));
+	  si = ed_value_get_session_index (&ed_value);
 	}
       else
 	{
@@ -141,7 +169,10 @@ snat_hairpinning (snat_main_t * sm,
 	  si = value0.value;
 	}
       if (rv)
-	return 0;
+	{
+	  rv = 0;
+	  goto trace;
+	}
 
       s0 = pool_elt_at_index (sm->per_thread_data[ti].sessions, si);
       new_dst_addr0 = s0->in2out.addr.as_u32;
@@ -162,7 +193,7 @@ snat_hairpinning (snat_main_t * sm,
       old_dst_port0 = tcp0->dst;
       if (PREDICT_TRUE (new_dst_port0 != old_dst_port0))
 	{
-	  if (PREDICT_TRUE (proto0 == SNAT_PROTOCOL_TCP))
+	  if (PREDICT_TRUE (proto0 == NAT_PROTOCOL_TCP))
 	    {
 	      tcp0->dst = new_dst_port0;
 	      sum0 = tcp0->checksum;
@@ -180,7 +211,7 @@ snat_hairpinning (snat_main_t * sm,
 	}
       else
 	{
-	  if (PREDICT_TRUE (proto0 == SNAT_PROTOCOL_TCP))
+	  if (PREDICT_TRUE (proto0 == NAT_PROTOCOL_TCP))
 	    {
 	      sum0 = tcp0->checksum;
 	      sum0 = ip_csum_update (sum0, old_dst_addr0, new_dst_addr0,
@@ -188,9 +219,28 @@ snat_hairpinning (snat_main_t * sm,
 	      tcp0->checksum = ip_csum_fold (sum0);
 	    }
 	}
-      return 1;
+      rv = 1;
+      goto trace;
     }
-  return 0;
+  rv = 0;
+trace:
+  if (do_trace && PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)
+				 && (b0->flags & VLIB_BUFFER_IS_TRACED)))
+    {
+      nat_hairpin_trace_t *t = vlib_add_trace (vm, node, b0, sizeof (*t));
+      t->addr.as_u32 = new_dst_addr0;
+      t->port = new_dst_port0;
+      t->fib_index = vnet_buffer (b0)->sw_if_index[VLIB_TX];
+      if (s0)
+	{
+	  t->session_index = si;
+	}
+      else
+	{
+	  t->session_index = ~0;
+	}
+    }
+  return rv;
 }
 #endif
 
@@ -211,28 +261,30 @@ snat_icmp_hairpinning (snat_main_t * sm,
   snat_session_t *s0;
   snat_static_mapping_t *m0;
 
-  if (icmp_is_error_message (icmp0))
+  if (icmp_type_is_error_message
+      (vnet_buffer (b0)->ip.reass.icmp_type_or_tcp_flags))
     {
       ip4_header_t *inner_ip0 = 0;
       tcp_udp_header_t *l4_header = 0;
 
       inner_ip0 = (ip4_header_t *) ((icmp_echo_header_t *) (icmp0 + 1) + 1);
       l4_header = ip4_next_header (inner_ip0);
-      u32 protocol = ip_proto_to_snat_proto (inner_ip0->protocol);
+      u32 protocol = ip_proto_to_nat_proto (inner_ip0->protocol);
 
-      if (protocol != SNAT_PROTOCOL_TCP && protocol != SNAT_PROTOCOL_UDP)
+      if (protocol != NAT_PROTOCOL_TCP && protocol != NAT_PROTOCOL_UDP)
 	return 1;
 
       if (is_ed)
 	{
 	  clib_bihash_kv_16_8_t ed_kv, ed_value;
-	  make_ed_kv (&ed_kv, &ip0->dst_address, &ip0->src_address,
+	  make_ed_kv (&ip0->dst_address, &ip0->src_address,
 		      inner_ip0->protocol, sm->outside_fib_index,
-		      l4_header->src_port, l4_header->dst_port);
-	  if (clib_bihash_search_16_8 (&sm->per_thread_data[ti].out2in_ed,
-				       &ed_kv, &ed_value))
+		      l4_header->src_port, l4_header->dst_port, ~0, ~0,
+		      &ed_kv);
+	  if (clib_bihash_search_16_8 (&sm->out2in_ed, &ed_kv, &ed_value))
 	    return 1;
-	  si = ed_value.value;
+	  ASSERT (ti == ed_value_get_thread_index (&ed_value));
+	  si = ed_value_get_session_index (&ed_value);
 	}
       else
 	{
@@ -297,7 +349,7 @@ snat_icmp_hairpinning (snat_main_t * sm,
 	      u16 icmp_id0 = echo0->identifier;
 	      key0.addr = ip0->dst_address;
 	      key0.port = icmp_id0;
-	      key0.protocol = SNAT_PROTOCOL_ICMP;
+	      key0.protocol = NAT_PROTOCOL_ICMP;
 	      key0.fib_index = sm->outside_fib_index;
 	      kv0.key = key0.as_u64;
 	      if (sm->num_workers > 1)
@@ -388,18 +440,16 @@ nat44_ed_hairpinning_unknown_proto (snat_main_t * sm,
   snat_static_mapping_t *m;
   ip_csum_t sum;
   snat_session_t *s;
-  snat_main_per_thread_data_t *tsm;
 
   if (sm->num_workers > 1)
-    ti = sm->worker_out2in_cb (ip, sm->outside_fib_index, 0);
+    ti = sm->worker_out2in_cb (b, ip, sm->outside_fib_index, 0);
   else
     ti = sm->num_workers;
-  tsm = &sm->per_thread_data[ti];
 
   old_addr = ip->dst_address.as_u32;
-  make_ed_kv (&s_kv, &ip->dst_address, &ip->src_address, ip->protocol,
-	      sm->outside_fib_index, 0, 0);
-  if (clib_bihash_search_16_8 (&tsm->out2in_ed, &s_kv, &s_value))
+  make_ed_kv (&ip->dst_address, &ip->src_address, ip->protocol,
+	      sm->outside_fib_index, 0, 0, ~0, ~0, &s_kv);
+  if (clib_bihash_search_16_8 (&sm->out2in_ed, &s_kv, &s_value))
     {
       make_sm_kv (&kv, &ip->dst_address, 0, 0, 0);
       if (clib_bihash_search_8_8
@@ -413,7 +463,10 @@ nat44_ed_hairpinning_unknown_proto (snat_main_t * sm,
     }
   else
     {
-      s = pool_elt_at_index (sm->per_thread_data[ti].sessions, s_value.value);
+      ASSERT (ti == ed_value_get_thread_index (&s_value));
+      s =
+	pool_elt_at_index (sm->per_thread_data[ti].sessions,
+			   ed_value_get_session_index (&s_value));
       if (vnet_buffer (b)->sw_if_index[VLIB_TX] == ~0)
 	vnet_buffer (b)->sw_if_index[VLIB_TX] = s->in2out.fib_index;
       new_addr = ip->dst_address.as_u32 = s->in2out.addr.as_u32;
@@ -424,119 +477,6 @@ nat44_ed_hairpinning_unknown_proto (snat_main_t * sm,
 }
 #endif
 
-#ifndef CLIB_MARCH_VARIANT
-void
-nat44_reass_hairpinning (snat_main_t * sm,
-			 vlib_buffer_t * b0,
-			 ip4_header_t * ip0,
-			 u16 sport, u16 dport, u32 proto0, int is_ed)
-{
-  snat_session_key_t key0, sm0;
-  snat_session_t *s0;
-  clib_bihash_kv_8_8_t kv0, value0;
-  ip_csum_t sum0;
-  u32 new_dst_addr0 = 0, old_dst_addr0, ti = 0, si;
-  u16 new_dst_port0, old_dst_port0;
-  udp_header_t *udp0;
-  tcp_header_t *tcp0;
-  int rv;
-
-  key0.addr = ip0->dst_address;
-  key0.port = dport;
-  key0.protocol = proto0;
-  key0.fib_index = sm->outside_fib_index;
-  kv0.key = key0.as_u64;
-
-  udp0 = ip4_next_header (ip0);
-
-  /* Check if destination is static mappings */
-  if (!snat_static_mapping_match (sm, key0, &sm0, 1, 0, 0, 0, 0, 0))
-    {
-      new_dst_addr0 = sm0.addr.as_u32;
-      new_dst_port0 = sm0.port;
-      vnet_buffer (b0)->sw_if_index[VLIB_TX] = sm0.fib_index;
-    }
-  /* or active sessions */
-  else
-    {
-      if (sm->num_workers > 1)
-	ti =
-	  (clib_net_to_host_u16 (udp0->dst_port) -
-	   1024) / sm->port_per_thread;
-      else
-	ti = sm->num_workers;
-
-      if (is_ed)
-	{
-	  clib_bihash_kv_16_8_t ed_kv, ed_value;
-	  make_ed_kv (&ed_kv, &ip0->dst_address, &ip0->src_address,
-		      ip0->protocol, sm->outside_fib_index, udp0->dst_port,
-		      udp0->src_port);
-	  rv = clib_bihash_search_16_8 (&sm->per_thread_data[ti].out2in_ed,
-					&ed_kv, &ed_value);
-	  si = ed_value.value;
-	}
-      else
-	{
-	  rv = clib_bihash_search_8_8 (&sm->per_thread_data[ti].out2in, &kv0,
-				       &value0);
-	  si = value0.value;
-	}
-      if (!rv)
-	{
-	  s0 = pool_elt_at_index (sm->per_thread_data[ti].sessions, si);
-	  new_dst_addr0 = s0->in2out.addr.as_u32;
-	  new_dst_port0 = s0->in2out.port;
-	  vnet_buffer (b0)->sw_if_index[VLIB_TX] = s0->in2out.fib_index;
-	}
-    }
-
-  /* Destination is behind the same NAT, use internal address and port */
-  if (new_dst_addr0)
-    {
-      old_dst_addr0 = ip0->dst_address.as_u32;
-      ip0->dst_address.as_u32 = new_dst_addr0;
-      sum0 = ip0->checksum;
-      sum0 = ip_csum_update (sum0, old_dst_addr0, new_dst_addr0,
-			     ip4_header_t, dst_address);
-      ip0->checksum = ip_csum_fold (sum0);
-
-      old_dst_port0 = dport;
-      if (PREDICT_TRUE (new_dst_port0 != old_dst_port0 &&
-			ip4_is_first_fragment (ip0)))
-	{
-	  if (PREDICT_TRUE (proto0 == SNAT_PROTOCOL_TCP))
-	    {
-	      tcp0 = ip4_next_header (ip0);
-	      tcp0->dst = new_dst_port0;
-	      sum0 = tcp0->checksum;
-	      sum0 = ip_csum_update (sum0, old_dst_addr0, new_dst_addr0,
-				     ip4_header_t, dst_address);
-	      sum0 = ip_csum_update (sum0, old_dst_port0, new_dst_port0,
-				     ip4_header_t /* cheat */ , length);
-	      tcp0->checksum = ip_csum_fold (sum0);
-	    }
-	  else
-	    {
-	      udp0->dst_port = new_dst_port0;
-	      udp0->checksum = 0;
-	    }
-	}
-      else
-	{
-	  if (PREDICT_TRUE (proto0 == SNAT_PROTOCOL_TCP))
-	    {
-	      tcp0 = ip4_next_header (ip0);
-	      sum0 = tcp0->checksum;
-	      sum0 = ip_csum_update (sum0, old_dst_addr0, new_dst_addr0,
-				     ip4_header_t, dst_address);
-	      tcp0->checksum = ip_csum_fold (sum0);
-	    }
-	}
-    }
-}
-#endif
-
 static inline uword
 nat44_hairpinning_fn_inline (vlib_main_t * vm,
 			     vlib_node_runtime_t * node,
@@ -585,12 +525,14 @@ nat44_hairpinning_fn_inline (vlib_main_t * vm,
 	  udp0 = ip4_next_header (ip0);
 	  tcp0 = (tcp_header_t *) udp0;
 
-	  proto0 = ip_proto_to_snat_proto (ip0->protocol);
+	  proto0 = ip_proto_to_nat_proto (ip0->protocol);
 
 	  vnet_get_config_data (&cm->config_main, &b0->current_config_index,
 				&next0, 0);
 
-	  if (snat_hairpinning (sm, b0, ip0, udp0, tcp0, proto0, is_ed))
+	  if (snat_hairpinning
+	      (vm, node, sm, b0, ip0, udp0, tcp0, proto0, is_ed,
+	       1 /* do_trace */ ))
 	    next0 = NAT_HAIRPIN_NEXT_LOOKUP;
 
 	  pkts_processed += next0 != NAT_HAIRPIN_NEXT_DROP;
@@ -622,6 +564,7 @@ VLIB_REGISTER_NODE (nat44_hairpinning_node) = {
   .vector_size = sizeof (u32),
   .type = VLIB_NODE_TYPE_INTERNAL,
   .n_errors = ARRAY_LEN(nat44_hairpin_error_strings),
+  .format_trace = format_nat_hairpin_trace,
   .error_strings = nat44_hairpin_error_strings,
   .n_next_nodes = NAT_HAIRPIN_N_NEXT,
   .next_nodes = {
@@ -645,6 +588,7 @@ VLIB_REGISTER_NODE (nat44_ed_hairpinning_node) = {
   .type = VLIB_NODE_TYPE_INTERNAL,
   .n_errors = ARRAY_LEN(nat44_hairpin_error_strings),
   .error_strings = nat44_hairpin_error_strings,
+  .format_trace = format_nat_hairpin_trace,
   .n_next_nodes = NAT_HAIRPIN_N_NEXT,
   .next_nodes = {
     [NAT_HAIRPIN_NEXT_DROP] = "error-drop",
@@ -696,19 +640,20 @@ snat_hairpin_dst_fn_inline (vlib_main_t * vm,
 	  next0 = NAT_HAIRPIN_NEXT_LOOKUP;
 	  ip0 = vlib_buffer_get_current (b0);
 
-	  proto0 = ip_proto_to_snat_proto (ip0->protocol);
+	  proto0 = ip_proto_to_nat_proto (ip0->protocol);
 
 	  vnet_buffer (b0)->snat.flags = 0;
 	  if (PREDICT_FALSE (is_hairpinning (sm, &ip0->dst_address)))
 	    {
-	      if (proto0 == SNAT_PROTOCOL_TCP || proto0 == SNAT_PROTOCOL_UDP)
+	      if (proto0 == NAT_PROTOCOL_TCP || proto0 == NAT_PROTOCOL_UDP)
 		{
 		  udp_header_t *udp0 = ip4_next_header (ip0);
 		  tcp_header_t *tcp0 = (tcp_header_t *) udp0;
 
-		  snat_hairpinning (sm, b0, ip0, udp0, tcp0, proto0, is_ed);
+		  snat_hairpinning (vm, node, sm, b0, ip0, udp0, tcp0, proto0,
+				    is_ed, 1 /* do_trace */ );
 		}
-	      else if (proto0 == SNAT_PROTOCOL_ICMP)
+	      else if (proto0 == NAT_PROTOCOL_ICMP)
 		{
 		  icmp46_header_t *icmp0 = ip4_next_header (ip0);
 
@@ -754,6 +699,7 @@ VLIB_REGISTER_NODE (snat_hairpin_dst_node) = {
   .vector_size = sizeof (u32),
   .type = VLIB_NODE_TYPE_INTERNAL,
   .n_errors = ARRAY_LEN(nat44_hairpin_error_strings),
+  .format_trace = format_nat_hairpin_trace,
   .error_strings = nat44_hairpin_error_strings,
   .n_next_nodes = NAT_HAIRPIN_N_NEXT,
   .next_nodes = {
@@ -776,6 +722,7 @@ VLIB_REGISTER_NODE (nat44_ed_hairpin_dst_node) = {
   .vector_size = sizeof (u32),
   .type = VLIB_NODE_TYPE_INTERNAL,
   .n_errors = ARRAY_LEN(nat44_hairpin_error_strings),
+  .format_trace = format_nat_hairpin_trace,
   .error_strings = nat44_hairpin_error_strings,
   .n_next_nodes = NAT_HAIRPIN_N_NEXT,
   .next_nodes = {