Remove the unused 'create VRF if needed' API parameters

[vpp.git] / src / vnet / tcp / tcp_input.c

diff --git a/src/vnet/tcp/tcp_input.c b/src/vnet/tcp/tcp_input.c
index 916d7ea..702a94f 100644 (file)
--- a/src/vnet/tcp/tcp_input.c
+++ b/src/vnet/tcp/tcp_input.c
@@ -1870,6 +1870,10 @@ tcp_lookup_is_valid (tcp_connection_t * tc, tcp_header_t * hdr)
   if (!tc)
     return 1;
 
+  /* Proxy case */
+  if (tc->c_lcl_port == 0 && tc->state == TCP_STATE_LISTEN)
+    return 1;
+
   u8 is_valid = (tc->c_lcl_port == hdr->dst_port
                 && (tc->state == TCP_STATE_LISTEN
                     || tc->c_rmt_port == hdr->src_port));
@@ -1902,6 +1906,7 @@ tcp_lookup_connection (u32 fib_index, vlib_buffer_t * b, u8 thread_index,
   tcp_header_t *tcp;
   transport_connection_t *tconn;
   tcp_connection_t *tc;
+  u8 is_filtered = 0;
   if (is_ip4)
     {
       ip4_header_t *ip4;
@@ -1913,7 +1918,7 @@ tcp_lookup_connection (u32 fib_index, vlib_buffer_t * b, u8 thread_index,
                                             tcp->dst_port,
                                             tcp->src_port,
                                             TRANSPORT_PROTO_TCP,
-                                            thread_index);
+                                            thread_index, &is_filtered);
       tc = tcp_get_connection_from_transport (tconn);
       ASSERT (tcp_lookup_is_valid (tc, tcp));
     }
@@ -1928,7 +1933,7 @@ tcp_lookup_connection (u32 fib_index, vlib_buffer_t * b, u8 thread_index,
                                             tcp->dst_port,
                                             tcp->src_port,
                                             TRANSPORT_PROTO_TCP,
-                                            thread_index);
+                                            thread_index, &is_filtered);
       tc = tcp_get_connection_from_transport (tconn);
       ASSERT (tcp_lookup_is_valid (tc, tcp));
     }
@@ -2753,15 +2758,6 @@ tcp46_listen_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
                           sizeof (ip6_address_t));
            }
 
-         if (stream_session_accept (&child0->connection, lc0->c_s_index,
-                                    0 /* notify */ ))
-           {
-             clib_warning ("session accept fail");
-             tcp_connection_cleanup (child0);
-             error0 = TCP_ERROR_CREATE_SESSION_FAIL;
-             goto drop;
-           }
-
          if (tcp_options_parse (th0, &child0->rcv_opts))
            {
              clib_warning ("options parse fail");
@@ -2791,6 +2787,15 @@ tcp46_listen_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
          tcp_connection_init_vars (child0);
          TCP_EVT_DBG (TCP_EVT_SYN_RCVD, child0, 1);
 
+         if (stream_session_accept (&child0->connection, lc0->c_s_index,
+                                    0 /* notify */ ))
+           {
+             clib_warning ("session accept fail");
+             tcp_connection_cleanup (child0);
+             error0 = TCP_ERROR_CREATE_SESSION_FAIL;
+             goto drop;
+           }
+
          /* Reuse buffer to make syn-ack and send */
          tcp_make_synack (child0, b0);
          next0 = tcp_next_output (is_ip4);
@@ -2939,7 +2944,7 @@ tcp46_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
          ip4_header_t *ip40;
          ip6_header_t *ip60;
          u32 error0 = TCP_ERROR_NO_LISTENER, next0 = TCP_INPUT_NEXT_DROP;
-         u8 flags0;
+         u8 flags0, is_filtered = 0;
 
          bi0 = from[0];
          to_next[0] = bi0;
@@ -2968,9 +2973,8 @@ tcp46_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
                                                     tcp0->dst_port,
                                                     tcp0->src_port,
                                                     TRANSPORT_PROTO_TCP,
-                                                    my_thread_index);
-             tc0 = tcp_get_connection_from_transport (tconn);
-             ASSERT (tcp_lookup_is_valid (tc0, tcp0));
+                                                    my_thread_index,
+                                                    &is_filtered);
            }
          else
            {
@@ -2986,9 +2990,8 @@ tcp46_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
                                                     tcp0->dst_port,
                                                     tcp0->src_port,
                                                     TRANSPORT_PROTO_TCP,
-                                                    my_thread_index);
-             tc0 = tcp_get_connection_from_transport (tconn);
-             ASSERT (tcp_lookup_is_valid (tc0, tcp0));
+                                                    my_thread_index,
+                                                    &is_filtered);
            }
 
          /* Length check */
@@ -2998,9 +3001,15 @@ tcp46_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
              goto done;
            }
 
+         vnet_buffer (b0)->tcp.hdr_offset = (u8 *) tcp0
+           - (u8 *) vlib_buffer_get_current (b0);
+
          /* Session exists */
-         if (PREDICT_TRUE (0 != tc0))
+         if (PREDICT_TRUE (0 != tconn))
            {
+             tc0 = tcp_get_connection_from_transport (tconn);
+             ASSERT (tcp_lookup_is_valid (tc0, tcp0));
+
              /* Save connection index */
              vnet_buffer (b0)->tcp.connection_index = tc0->c_c_index;
              vnet_buffer (b0)->tcp.seq_number =
@@ -3008,8 +3017,6 @@ tcp46_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
              vnet_buffer (b0)->tcp.ack_number =
                clib_net_to_host_u32 (tcp0->ack_number);
 
-             vnet_buffer (b0)->tcp.hdr_offset = (u8 *) tcp0
-               - (u8 *) vlib_buffer_get_current (b0);
              vnet_buffer (b0)->tcp.data_offset = n_advance_bytes0;
              vnet_buffer (b0)->tcp.data_len = n_data_bytes0;
 
@@ -3032,8 +3039,13 @@ tcp46_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
            }
          else
            {
-             if ((is_ip4 && tm->punt_unknown4) ||
-                 (!is_ip4 && tm->punt_unknown6))
+             if (is_filtered)
+               {
+                 next0 = TCP_INPUT_NEXT_DROP;
+                 error0 = TCP_ERROR_FILTERED;
+               }
+             else if ((is_ip4 && tm->punt_unknown4) ||
+                      (!is_ip4 && tm->punt_unknown6))
                {
                  next0 = TCP_INPUT_NEXT_PUNT;
                  error0 = TCP_ERROR_PUNT;
@@ -3044,6 +3056,7 @@ tcp46_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
                  next0 = TCP_INPUT_NEXT_RESET;
                  error0 = TCP_ERROR_NO_LISTENER;
                }
+             tc0 = 0;
            }
 
        done:
@@ -3051,8 +3064,8 @@ tcp46_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
 
          if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
            {
-             tcp_rx_trace_t *t0 =
-               vlib_add_trace (vm, node, b0, sizeof (*t0));
+             tcp_rx_trace_t *t0;
+             t0 = vlib_add_trace (vm, node, b0, sizeof (*t0));
              tcp_set_rx_trace_data (t0, tc0, tcp0, b0, is_ip4);
            }
          vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next,