summaryrefslogtreecommitdiffstats
path: root/src/vnet/tcp
diff options
context:
space:
mode:
Diffstat (limited to 'src/vnet/tcp')
-rw-r--r--src/vnet/tcp/builtin_client.c10
-rw-r--r--src/vnet/tcp/builtin_http_server.c5
-rw-r--r--src/vnet/tcp/builtin_proxy.c17
-rw-r--r--src/vnet/tcp/builtin_server.c5
-rw-r--r--src/vnet/tcp/tcp.c277
-rw-r--r--src/vnet/tcp/tcp.h10
-rw-r--r--src/vnet/tcp/tcp_input.c92
-rw-r--r--src/vnet/tcp/tcp_test.c14
8 files changed, 126 insertions, 304 deletions
diff --git a/src/vnet/tcp/builtin_client.c b/src/vnet/tcp/builtin_client.c
index 7a0d2ea1744..4258fc43010 100644
--- a/src/vnet/tcp/builtin_client.c
+++ b/src/vnet/tcp/builtin_client.c
@@ -50,7 +50,6 @@ send_test_chunk (tclient_main_t * tm, session_t * s)
int test_buf_offset;
u32 bytes_this_chunk;
session_fifo_event_t evt;
- static int serial_number = 0;
svm_fifo_t *txf;
int rv;
@@ -98,7 +97,6 @@ send_test_chunk (tclient_main_t * tm, session_t * s)
/* Fabricate TX event, send to vpp */
evt.fifo = txf;
evt.event_type = FIFO_EVENT_APP_TX;
- evt.event_id = serial_number++;
if (unix_shared_memory_queue_add
(tm->vpp_event_queue[txf->master_thread_index], (u8 *) & evt,
@@ -248,12 +246,12 @@ builtin_client_node_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
session_parse_handle (sp->vpp_session_handle,
&index, &thread_index);
- s = stream_session_get_if_valid (index, thread_index);
+ s = session_get_if_valid (index, thread_index);
if (s)
{
vnet_disconnect_args_t _a, *a = &_a;
- a->handle = stream_session_handle (s);
+ a->handle = session_handle (s);
a->app_index = tm->app_index;
vnet_disconnect_session (a);
@@ -369,7 +367,7 @@ builtin_session_connected_callback (u32 app_index, u32 api_context,
session->server_rx_fifo->client_session_index = session_index;
session->server_tx_fifo = s->server_tx_fifo;
session->server_tx_fifo->client_session_index = session_index;
- session->vpp_session_handle = stream_session_handle (s);
+ session->vpp_session_handle = session_handle (s);
vec_add1 (tm->connection_index_by_thread[thread_index], session_index);
__sync_fetch_and_add (&tm->ready_connections, 1);
@@ -403,7 +401,7 @@ builtin_session_disconnect_callback (stream_session_t * s)
{
tclient_main_t *tm = &tclient_main;
vnet_disconnect_args_t _a, *a = &_a;
- a->handle = stream_session_handle (s);
+ a->handle = session_handle (s);
a->app_index = tm->app_index;
vnet_disconnect_session (a);
return;
diff --git a/src/vnet/tcp/builtin_http_server.c b/src/vnet/tcp/builtin_http_server.c
index f808400d63d..f307880bcfd 100644
--- a/src/vnet/tcp/builtin_http_server.c
+++ b/src/vnet/tcp/builtin_http_server.c
@@ -166,7 +166,6 @@ send_data (builtin_http_server_args * args, u8 * data)
/* Fabricate TX event, send to vpp */
evt.fifo = s->server_tx_fifo;
evt.event_type = FIFO_EVENT_APP_TX;
- evt.event_id = 0;
unix_shared_memory_queue_add (hsm->vpp_queue[s->thread_index],
(u8 *) & evt,
@@ -346,7 +345,7 @@ http_server_rx_callback (stream_session_t * s)
/* send the command to a new/recycled vlib process */
args = clib_mem_alloc (sizeof (*args));
args->data = vec_dup (hsm->rx_buf);
- args->session_handle = stream_session_handle (s);
+ args->session_handle = session_handle (s);
/* Send an RPC request via the thread-0 input node */
if (vlib_get_thread_index () != 0)
@@ -382,7 +381,7 @@ builtin_session_disconnect_callback (stream_session_t * s)
http_server_main_t *bsm = &http_server_main;
vnet_disconnect_args_t _a, *a = &_a;
- a->handle = stream_session_handle (s);
+ a->handle = session_handle (s);
a->app_index = bsm->app_index;
vnet_disconnect_session (a);
}
diff --git a/src/vnet/tcp/builtin_proxy.c b/src/vnet/tcp/builtin_proxy.c
index a51a812ca16..e1e0198e695 100644
--- a/src/vnet/tcp/builtin_proxy.c
+++ b/src/vnet/tcp/builtin_proxy.c
@@ -32,7 +32,7 @@ delete_proxy_session (stream_session_t * s, int is_active_open)
uword *p;
u64 handle;
- handle = stream_session_handle (s);
+ handle = session_handle (s);
clib_spinlock_lock_if_init (&bpm->sessions_lock);
if (is_active_open)
@@ -88,19 +88,19 @@ delete_proxy_session (stream_session_t * s, int is_active_open)
if (active_open_session)
{
- a->handle = stream_session_handle (active_open_session);
+ a->handle = session_handle (active_open_session);
a->app_index = bpm->active_open_app_index;
hash_unset (bpm->proxy_session_by_active_open_handle,
- stream_session_handle (active_open_session));
+ session_handle (active_open_session));
vnet_disconnect_session (a);
}
if (server_session)
{
- a->handle = stream_session_handle (server_session);
+ a->handle = session_handle (server_session);
a->app_index = bpm->server_app_index;
hash_unset (bpm->proxy_session_by_server_handle,
- stream_session_handle (server_session));
+ session_handle (server_session));
vnet_disconnect_session (a);
}
}
@@ -171,8 +171,7 @@ server_rx_callback (stream_session_t * s)
ASSERT (s->thread_index == thread_index);
clib_spinlock_lock_if_init (&bpm->sessions_lock);
- p =
- hash_get (bpm->proxy_session_by_server_handle, stream_session_handle (s));
+ p = hash_get (bpm->proxy_session_by_server_handle, session_handle (s));
if (PREDICT_TRUE (p != 0))
{
@@ -218,7 +217,7 @@ server_rx_callback (stream_session_t * s)
memset (ps, 0, sizeof (*ps));
ps->server_rx_fifo = rx_fifo;
ps->server_tx_fifo = tx_fifo;
- ps->vpp_server_handle = stream_session_handle (s);
+ ps->vpp_server_handle = session_handle (s);
proxy_index = ps - bpm->sessions;
@@ -268,7 +267,7 @@ active_open_connected_callback (u32 app_index, u32 opaque,
clib_spinlock_lock_if_init (&bpm->sessions_lock);
ps = pool_elt_at_index (bpm->sessions, opaque);
- ps->vpp_active_open_handle = stream_session_handle (s);
+ ps->vpp_active_open_handle = session_handle (s);
s->server_tx_fifo = ps->server_rx_fifo;
s->server_rx_fifo = ps->server_tx_fifo;
diff --git a/src/vnet/tcp/builtin_server.c b/src/vnet/tcp/builtin_server.c
index b4a52c67fcd..27c4370389f 100644
--- a/src/vnet/tcp/builtin_server.c
+++ b/src/vnet/tcp/builtin_server.c
@@ -73,7 +73,7 @@ builtin_session_disconnect_callback (stream_session_t * s)
builtin_server_main_t *bsm = &builtin_server_main;
vnet_disconnect_args_t _a, *a = &_a;
- a->handle = stream_session_handle (s);
+ a->handle = session_handle (s);
a->app_index = bsm->app_index;
vnet_disconnect_session (a);
}
@@ -158,7 +158,6 @@ builtin_server_rx_callback (stream_session_t * s)
svm_fifo_t *tx_fifo, *rx_fifo;
builtin_server_main_t *bsm = &builtin_server_main;
session_fifo_event_t evt;
- static int serial_number = 0;
u32 thread_index = vlib_get_thread_index ();
ASSERT (s->thread_index == thread_index);
@@ -190,7 +189,6 @@ builtin_server_rx_callback (stream_session_t * s)
unix_shared_memory_queue_t *q;
evt.fifo = rx_fifo;
evt.event_type = FIFO_EVENT_BUILTIN_RX;
- evt.event_id = 0;
q = bsm->vpp_queue[thread_index];
if (PREDICT_FALSE (q->cursize == q->maxsize))
@@ -232,7 +230,6 @@ builtin_server_rx_callback (stream_session_t * s)
/* Fabricate TX event, send to vpp */
evt.fifo = tx_fifo;
evt.event_type = FIFO_EVENT_APP_TX;
- evt.event_id = serial_number++;
if (unix_shared_memory_queue_add (bsm->vpp_queue[s->thread_index],
(u8 *) & evt,
diff --git a/src/vnet/tcp/tcp.c b/src/vnet/tcp/tcp.c
index 34c901eb1df..1c44ef04f85 100644
--- a/src/vnet/tcp/tcp.c
+++ b/src/vnet/tcp/tcp.c
@@ -28,39 +28,6 @@
tcp_main_t tcp_main;
-void *
-ip_interface_get_first_ip (u32 sw_if_index, u8 is_ip4)
-{
- ip_lookup_main_t *lm4 = &ip4_main.lookup_main;
- ip_lookup_main_t *lm6 = &ip6_main.lookup_main;
- ip_interface_address_t *ia = 0;
-
- if (is_ip4)
- {
- /* *INDENT-OFF* */
- foreach_ip_interface_address (lm4, ia, sw_if_index, 1 /* unnumbered */ ,
- ({
- return ip_interface_address_get_address (lm4, ia);
- }));
- /* *INDENT-ON* */
- }
- else
- {
- /* *INDENT-OFF* */
- foreach_ip_interface_address (lm6, ia, sw_if_index, 1 /* unnumbered */ ,
- ({
- ip6_address_t *rv;
- rv = ip_interface_address_get_address (lm6, ia);
- /* Trying to use a link-local ip6 src address is a fool's errand */
- if (!ip6_address_is_link_local_unicast (rv))
- return rv;
- }));
- /* *INDENT-ON* */
- }
-
- return 0;
-}
-
static u32
tcp_connection_bind (u32 session_index, transport_endpoint_t * lcl)
{
@@ -83,7 +50,7 @@ tcp_connection_bind (u32 session_index, transport_endpoint_t * lcl)
}
ip_copy (&listener->c_lcl_ip, &lcl->ip, lcl->is_ip4);
listener->c_is_ip4 = lcl->is_ip4;
- listener->c_transport_proto = TRANSPORT_PROTO_TCP;
+ listener->c_proto = TRANSPORT_PROTO_TCP;
listener->c_s_index = session_index;
listener->c_fib_index = lcl->fib_index;
listener->state = TCP_STATE_LISTEN;
@@ -134,24 +101,6 @@ tcp_session_get_listener (u32 listener_index)
return &tc->connection;
}
-always_inline void
-transport_endpoint_del (u32 tepi)
-{
- tcp_main_t *tm = vnet_get_tcp_main ();
- clib_spinlock_lock_if_init (&tm->local_endpoints_lock);
- pool_put_index (tm->local_endpoints, tepi);
- clib_spinlock_unlock_if_init (&tm->local_endpoints_lock);
-}
-
-always_inline transport_endpoint_t *
-transport_endpoint_new (void)
-{
- tcp_main_t *tm = vnet_get_tcp_main ();
- transport_endpoint_t *tep;
- pool_get (tm->local_endpoints, tep);
- return tep;
-}
-
/**
* Cleanup half-open connection
*
@@ -209,18 +158,10 @@ void
tcp_connection_cleanup (tcp_connection_t * tc)
{
tcp_main_t *tm = &tcp_main;
- u32 tepi;
- transport_endpoint_t *tep;
/* Cleanup local endpoint if this was an active connect */
- tepi = transport_endpoint_lookup (&tm->local_endpoints_table, &tc->c_lcl_ip,
- clib_net_to_host_u16 (tc->c_lcl_port));
- if (tepi != TRANSPORT_ENDPOINT_INVALID_INDEX)
- {
- tep = pool_elt_at_index (tm->local_endpoints, tepi);
- transport_endpoint_table_del (&tm->local_endpoints_table, tep);
- transport_endpoint_del (tepi);
- }
+ transport_endpoint_cleanup (TRANSPORT_PROTO_TCP, &tc->c_lcl_ip,
+ tc->c_lcl_port);
/* Check if connection is not yet fully established */
if (tc->state == TCP_STATE_SYN_SENT)
@@ -288,7 +229,7 @@ tcp_connection_reset (tcp_connection_t * tc)
tcp_connection_cleanup (tc);
break;
case TCP_STATE_SYN_SENT:
- stream_session_connect_notify (&tc->connection, 1 /* fail */ );
+ session_stream_connect_notify (&tc->connection, 1 /* fail */ );
tcp_connection_cleanup (tc);
break;
case TCP_STATE_ESTABLISHED:
@@ -388,57 +329,6 @@ tcp_session_cleanup (u32 conn_index, u32 thread_index)
tcp_timer_update (tc, TCP_TIMER_WAITCLOSE, TCP_CLEANUP_TIME);
}
-#define PORT_MASK ((1 << 16)- 1)
-/**
- * Allocate local port and add if successful add entry to local endpoint
- * table to mark the pair as used.
- */
-int
-tcp_allocate_local_port (ip46_address_t * ip)
-{
- tcp_main_t *tm = vnet_get_tcp_main ();
- transport_endpoint_t *tep;
- u32 tei;
- u16 min = 1024, max = 65535; /* XXX configurable ? */
- int tries, limit;
-
- limit = max - min;
-
- /* Only support active opens from thread 0 */
- ASSERT (vlib_get_thread_index () == 0);
-
- /* Search for first free slot */
- for (tries = 0; tries < limit; tries++)
- {
- u16 port = 0;
-
- /* Find a port in the specified range */
- while (1)
- {
- port = random_u32 (&tm->port_allocator_seed) & PORT_MASK;
- if (PREDICT_TRUE (port >= min && port < max))
- break;
- }
-
- /* Look it up */
- tei = transport_endpoint_lookup (&tm->local_endpoints_table, ip, port);
- /* If not found, we're done */
- if (tei == TRANSPORT_ENDPOINT_INVALID_INDEX)
- {
- clib_spinlock_lock_if_init (&tm->local_endpoints_lock);
- tep = transport_endpoint_new ();
- clib_memcpy (&tep->ip, ip, sizeof (*ip));
- tep->port = port;
- transport_endpoint_table_add (&tm->local_endpoints_table, tep,
- tep - tm->local_endpoints);
- clib_spinlock_unlock_if_init (&tm->local_endpoints_lock);
-
- return tep->port;
- }
- }
- return -1;
-}
-
/**
* Initialize all connection timers as invalid
*/
@@ -574,9 +464,15 @@ tcp_init_snd_vars (tcp_connection_t * tc)
{
u32 time_now;
- /* Set random initial sequence */
- tcp_set_time_now (0);
+ /*
+ * We use the time to randomize iss and for setting up the initial
+ * timestamp. Make sure it's updated otherwise syn and ack in the
+ * handshake may make it look as if time has flown in the opposite
+ * direction for us.
+ */
+ tcp_set_time_now (vlib_get_thread_index ());
time_now = tcp_time_now ();
+
tc->iss = random_u32 (&time_now);
tc->snd_una = tc->iss;
tc->snd_nxt = tc->iss + 1;
@@ -600,112 +496,70 @@ tcp_connection_init_vars (tcp_connection_t * tc)
// tcp_connection_fib_attach (tc);
}
+static int
+tcp_alloc_custom_local_endpoint (tcp_main_t * tm, ip46_address_t * lcl_addr,
+ u16 * lcl_port, u8 is_ip4)
+{
+ int index, port;
+ if (is_ip4)
+ {
+ index = tm->last_v4_address_rotor++;
+ if (tm->last_v4_address_rotor >= vec_len (tm->ip4_src_addresses))
+ tm->last_v4_address_rotor = 0;
+ lcl_addr->ip4.as_u32 = tm->ip4_src_addresses[index].as_u32;
+ }
+ else
+ {
+ index = tm->last_v6_address_rotor++;
+ if (tm->last_v6_address_rotor >= vec_len (tm->ip6_src_addresses))
+ tm->last_v6_address_rotor = 0;
+ clib_memcpy (&lcl_addr->ip6, &tm->ip6_src_addresses[index],
+ sizeof (ip6_address_t));
+ }
+ port = transport_alloc_local_port (TRANSPORT_PROTO_TCP, lcl_addr);
+ if (port < 1)
+ {
+ clib_warning ("Failed to allocate src port");
+ return -1;
+ }
+ *lcl_port = port;
+ return 0;
+}
+
int
tcp_connection_open (transport_endpoint_t * rmt)
{
tcp_main_t *tm = vnet_get_tcp_main ();
tcp_connection_t *tc;
- fib_prefix_t prefix;
- fib_node_index_t fei;
- u32 sw_if_index;
ip46_address_t lcl_addr;
- int lcl_port;
+ u16 lcl_port;
+ int rv;
/*
- * Find the local address and allocate port
+ * Allocate local endpoint
*/
- memset (&lcl_addr, 0, sizeof (lcl_addr));
-
- /* Find a FIB path to the destination */
- clib_memcpy (&prefix.fp_addr, &rmt->ip, sizeof (rmt->ip));
- prefix.fp_proto = rmt->is_ip4 ? FIB_PROTOCOL_IP4 : FIB_PROTOCOL_IP6;
- prefix.fp_len = rmt->is_ip4 ? 32 : 128;
-
- ASSERT (rmt->fib_index != ENDPOINT_INVALID_INDEX);
- fei = fib_table_lookup (rmt->fib_index, &prefix);
-
- /* Couldn't find route to destination. Bail out. */
- if (fei == FIB_NODE_INDEX_INVALID)
- {
- clib_warning ("no route to destination");
- return -1;
- }
-
- sw_if_index = rmt->sw_if_index;
- if (sw_if_index == ENDPOINT_INVALID_INDEX)
- sw_if_index = fib_entry_get_resolving_interface (fei);
-
- if (sw_if_index == ENDPOINT_INVALID_INDEX)
- {
- clib_warning ("no resolving interface for %U", format_ip46_address,
- &rmt->ip, (rmt->is_ip4 == 0) + 1);
- return -1;
- }
-
- if (rmt->is_ip4)
- {
- ip4_address_t *ip4;
- int index;
- if (vec_len (tm->ip4_src_addresses))
- {
- index = tm->last_v4_address_rotor++;
- if (tm->last_v4_address_rotor >= vec_len (tm->ip4_src_addresses))
- tm->last_v4_address_rotor = 0;
- lcl_addr.ip4.as_u32 = tm->ip4_src_addresses[index].as_u32;
- }
- else
- {
- ip4 = ip_interface_get_first_ip (sw_if_index, 1);
- lcl_addr.ip4.as_u32 = ip4->as_u32;
- }
- }
+ if ((rmt->is_ip4 && vec_len (tm->ip4_src_addresses))
+ || (!rmt->is_ip4 && vec_len (tm->ip6_src_addresses)))
+ rv = tcp_alloc_custom_local_endpoint (tm, &lcl_addr, &lcl_port,
+ rmt->is_ip4);
else
- {
- ip6_address_t *ip6;
- int index;
-
- if (vec_len (tm->ip6_src_addresses))
- {
- index = tm->last_v6_address_rotor++;
- if (tm->last_v6_address_rotor >= vec_len (tm->ip6_src_addresses))
- tm->last_v6_address_rotor = 0;
- clib_memcpy (&lcl_addr.ip6, &tm->ip6_src_addresses[index],
- sizeof (*ip6));
- }
- else
- {
- ip6 = ip_interface_get_first_ip (sw_if_index, 0);
- if (ip6 == 0)
- {
- clib_warning ("no routable ip6 addresses on %U",
- format_vnet_sw_if_index_name, vnet_get_main (),
- sw_if_index);
- return -1;
- }
-
- clib_memcpy (&lcl_addr.ip6, ip6, sizeof (*ip6));
- }
- }
+ rv = transport_alloc_local_endpoint (TRANSPORT_PROTO_TCP,
+ rmt, &lcl_addr, &lcl_port);
- /* Allocate source port */
- lcl_port = tcp_allocate_local_port (&lcl_addr);
- if (lcl_port < 1)
- {
- clib_warning ("Failed to allocate src port");
- return -1;
- }
+ if (rv)
+ return -1;
/*
* Create connection and send SYN
*/
clib_spinlock_lock_if_init (&tm->half_open_lock);
tc = tcp_half_open_connection_new ();
- clib_memcpy (&tc->c_rmt_ip, &rmt->ip, sizeof (ip46_address_t));
- clib_memcpy (&tc->c_lcl_ip, &lcl_addr, sizeof (ip46_address_t));
+ ip_copy (&tc->c_rmt_ip, &rmt->ip, rmt->is_ip4);
+ ip_copy (&tc->c_lcl_ip, &lcl_addr, rmt->is_ip4);
tc->c_rmt_port = rmt->port;
tc->c_lcl_port = clib_host_to_net_u16 (lcl_port);
tc->c_is_ip4 = rmt->is_ip4;
- tc->c_transport_proto = TRANSPORT_PROTO_TCP;
+ tc->c_proto = TRANSPORT_PROTO_TCP;
tc->c_fib_index = rmt->fib_index;
/* The other connection vars will be initialized after SYN ACK */
tcp_connection_timers_init (tc);
@@ -1195,7 +1049,7 @@ tcp_timer_establish_handler (u32 conn_index)
if (tc)
{
ASSERT (tc->state == TCP_STATE_SYN_SENT);
- stream_session_connect_notify (&tc->connection, 1 /* fail */ );
+ session_stream_connect_notify (&tc->connection, 1 /* fail */ );
TCP_DBG ("establish pop: %U", format_tcp_connection, tc, 2);
}
else
@@ -1328,8 +1182,8 @@ tcp_main_enable (vlib_main_t * vm)
ip6_register_protocol (IP_PROTOCOL_TCP, tcp6_input_node.index);
/* Register as transport with session layer */
- session_register_transport (TRANSPORT_PROTO_TCP, 1, &tcp_proto);
- session_register_transport (TRANSPORT_PROTO_TCP, 0, &tcp_proto);
+ transport_register_protocol (TRANSPORT_PROTO_TCP, 1, &tcp_proto);
+ transport_register_protocol (TRANSPORT_PROTO_TCP, 0, &tcp_proto);
/*
* Initialize data structures
@@ -1379,22 +1233,9 @@ tcp_main_enable (vlib_main_t * vm)
tm->tstamp_ticks_per_clock = vm->clib_time.seconds_per_clock
/ TCP_TSTAMP_RESOLUTION;
- if (tm->local_endpoints_table_buckets == 0)
- tm->local_endpoints_table_buckets = 250000;
- if (tm->local_endpoints_table_memory == 0)
- tm->local_endpoints_table_memory = 512 << 20;
-
- clib_bihash_init_24_8 (&tm->local_endpoints_table, "local endpoint table",
- tm->local_endpoints_table_buckets,
- tm->local_endpoints_table_memory);
-
- /* Initialize [port-allocator] random number seed */
- tm->port_allocator_seed = (u32) clib_cpu_time_now ();
-
if (num_threads > 1)
{
clib_spinlock_init (&tm->half_open_lock);
- clib_spinlock_init (&tm->local_endpoints_lock);
}
vec_validate (tm->tx_frames[0], num_threads - 1);
diff --git a/src/vnet/tcp/tcp.h b/src/vnet/tcp/tcp.h
index 2a65dfae784..b057b883fd8 100644
--- a/src/vnet/tcp/tcp.h
+++ b/src/vnet/tcp/tcp.h
@@ -385,13 +385,6 @@ typedef struct _tcp_main
tcp_connection_t *half_open_connections;
clib_spinlock_t half_open_lock;
- /* Pool of local TCP endpoints */
- transport_endpoint_t *local_endpoints;
-
- /* Local endpoints lookup table */
- transport_endpoint_table_t local_endpoints_table;
- clib_spinlock_t local_endpoints_lock;
-
/* Congestion control algorithms registered */
tcp_cc_algorithm_t *cc_algos;
@@ -412,9 +405,6 @@ typedef struct _tcp_main
u32 last_v6_address_rotor;
ip6_address_t *ip6_src_addresses;
- /** Port allocator random number generator seed */
- u32 port_allocator_seed;
-
/** vlib buffer size */
u32 bytes_per_buffer;
diff --git a/src/vnet/tcp/tcp_input.c b/src/vnet/tcp/tcp_input.c
index 3a32e62d243..73642df8ca9 100644
--- a/src/vnet/tcp/tcp_input.c
+++ b/src/vnet/tcp/tcp_input.c
@@ -1388,8 +1388,8 @@ tcp_session_enqueue_data (tcp_connection_t * tc, vlib_buffer_t * b,
return TCP_ERROR_PURE_ACK;
}
- written = stream_session_enqueue_data (&tc->connection, b, 0,
- 1 /* queue event */ , 1);
+ written = session_enqueue_stream_connection (&tc->connection, b, 0,
+ 1 /* queue event */ , 1);
TCP_EVT_DBG (TCP_EVT_INPUT, tc, 0, data_len, written);
@@ -1450,9 +1450,10 @@ tcp_session_enqueue_ooo (tcp_connection_t * tc, vlib_buffer_t * b,
}
/* Enqueue out-of-order data with relative offset */
- rv = stream_session_enqueue_data (&tc->connection, b,
- vnet_buffer (b)->tcp.seq_number -
- tc->rcv_nxt, 0 /* queue event */ , 0);
+ rv = session_enqueue_stream_connection (&tc->connection, b,
+ vnet_buffer (b)->tcp.seq_number -
+ tc->rcv_nxt, 0 /* queue event */ ,
+ 0);
/* Nothing written */
if (rv)
@@ -1669,15 +1670,16 @@ tcp_set_rx_trace_data (tcp_rx_trace_t * t0, tcp_connection_t * tc0,
}
always_inline void
-tcp_established_inc_counter (vlib_main_t * vm, u8 is_ip4, u8 evt, u8 val)
+tcp_node_inc_counter (vlib_main_t * vm, u32 tcp4_node, u32 tcp6_node,
+ u8 is_ip4, u8 evt, u8 val)
{
if (PREDICT_TRUE (!val))
return;
if (is_ip4)
- vlib_node_increment_counter (vm, tcp4_established_node.index, evt, val);
+ vlib_node_increment_counter (vm, tcp4_node, evt, val);
else
- vlib_node_increment_counter (vm, tcp6_established_node.index, evt, val);
+ vlib_node_increment_counter (vm, tcp6_node, evt, val);
}
always_inline uword
@@ -1787,8 +1789,11 @@ tcp46_established_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
vlib_put_next_frame (vm, node, next_index, n_left_to_next);
}
- errors = session_manager_flush_enqueue_events (my_thread_index);
- tcp_established_inc_counter (vm, is_ip4, TCP_ERROR_EVENT_FIFO_FULL, errors);
+ errors = session_manager_flush_enqueue_events (TRANSPORT_PROTO_TCP,
+ my_thread_index);
+ tcp_node_inc_counter (vm, is_ip4, tcp4_established_node.index,
+ tcp6_established_node.index,
+ TCP_ERROR_EVENT_FIFO_FULL, errors);
tcp_flush_frame_to_output (vm, my_thread_index, is_ip4);
return from_frame->n_vectors;
@@ -1873,8 +1878,7 @@ tcp_lookup_is_valid (tcp_connection_t * tc, tcp_header_t * hdr)
{
handle = session_lookup_half_open_handle (&tc->connection);
tmp = session_lookup_half_open_connection (handle & 0xFFFFFFFF,
- tc->c_transport_proto,
- tc->c_is_ip4);
+ tc->c_proto, tc->c_is_ip4);
if (tmp)
{
@@ -2117,7 +2121,7 @@ tcp46_syn_sent_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
/* Notify app that we have connection. If session layer can't
* allocate session send reset */
- if (stream_session_connect_notify (&new_tc0->connection, 0))
+ if (session_stream_connect_notify (&new_tc0->connection, 0))
{
clib_warning ("connect notify fail");
tcp_send_reset_w_pkt (new_tc0, b0, is_ip4);
@@ -2138,7 +2142,7 @@ tcp46_syn_sent_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
new_tc0->state = TCP_STATE_SYN_RCVD;
/* Notify app that we have connection */
- if (stream_session_connect_notify (&new_tc0->connection, 0))
+ if (session_stream_connect_notify (&new_tc0->connection, 0))
{
tcp_connection_cleanup (new_tc0);
tcp_send_reset_w_pkt (tc0, b0, is_ip4);
@@ -2187,17 +2191,11 @@ tcp46_syn_sent_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
vlib_put_next_frame (vm, node, next_index, n_left_to_next);
}
- errors = session_manager_flush_enqueue_events (my_thread_index);
- if (errors)
- {
- if (is_ip4)
- vlib_node_increment_counter (vm, tcp4_established_node.index,
- TCP_ERROR_EVENT_FIFO_FULL, errors);
- else
- vlib_node_increment_counter (vm, tcp6_established_node.index,
- TCP_ERROR_EVENT_FIFO_FULL, errors);
- }
-
+ errors = session_manager_flush_enqueue_events (TRANSPORT_PROTO_TCP,
+ my_thread_index);
+ tcp_node_inc_counter (vm, is_ip4, tcp4_syn_sent_node.index,
+ tcp6_syn_sent_node.index,
+ TCP_ERROR_EVENT_FIFO_FULL, errors);
return from_frame->n_vectors;
}
@@ -2259,6 +2257,9 @@ VLIB_REGISTER_NODE (tcp6_syn_sent_node) =
VLIB_NODE_FUNCTION_MULTIARCH (tcp6_syn_sent_node, tcp6_syn_sent_rcv);
+vlib_node_registration_t tcp4_rcv_process_node;
+vlib_node_registration_t tcp6_rcv_process_node;
+
/**
* Handles reception for all states except LISTEN, SYN-SENT and ESTABLISHED
* as per RFC793 p. 64
@@ -2583,16 +2584,11 @@ tcp46_rcv_process_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
vlib_put_next_frame (vm, node, next_index, n_left_to_next);
}
- errors = session_manager_flush_enqueue_events (my_thread_index);
- if (errors)
- {
- if (is_ip4)
- vlib_node_increment_counter (vm, tcp4_established_node.index,
- TCP_ERROR_EVENT_FIFO_FULL, errors);
- else
- vlib_node_increment_counter (vm, tcp6_established_node.index,
- TCP_ERROR_EVENT_FIFO_FULL, errors);
- }
+ errors = session_manager_flush_enqueue_events (TRANSPORT_PROTO_TCP,
+ my_thread_index);
+ tcp_node_inc_counter (vm, is_ip4, tcp4_rcv_process_node.index,
+ tcp6_rcv_process_node.index,
+ TCP_ERROR_EVENT_FIFO_FULL, errors);
return from_frame->n_vectors;
}
@@ -2966,12 +2962,13 @@ tcp46_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
+ tcp_header_bytes (tcp0));
n_data_bytes0 = clib_net_to_host_u16 (ip40->length)
- n_advance_bytes0;
- tconn =
- session_lookup_connection_wt4 (fib_index0, &ip40->dst_address,
- &ip40->src_address,
- tcp0->dst_port, tcp0->src_port,
- TRANSPORT_PROTO_TCP,
- my_thread_index);
+ tconn = session_lookup_connection_wt4 (fib_index0,
+ &ip40->dst_address,
+ &ip40->src_address,
+ 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));
}
@@ -2983,12 +2980,13 @@ tcp46_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
n_data_bytes0 = clib_net_to_host_u16 (ip60->payload_length)
- n_advance_bytes0;
n_advance_bytes0 += sizeof (ip60[0]);
- tconn =
- session_lookup_connection_wt6 (fib_index0, &ip60->dst_address,
- &ip60->src_address,
- tcp0->dst_port, tcp0->src_port,
- TRANSPORT_PROTO_TCP,
- my_thread_index);
+ tconn = session_lookup_connection_wt6 (fib_index0,
+ &ip60->dst_address,
+ &ip60->src_address,
+ 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));
}
diff --git a/src/vnet/tcp/tcp_test.c b/src/vnet/tcp/tcp_test.c
index 2018855840f..021f416cb76 100644
--- a/src/vnet/tcp/tcp_test.c
+++ b/src/vnet/tcp/tcp_test.c
@@ -1574,7 +1574,7 @@ tcp_test_lookup (vlib_main_t * vm, unformat_input_t * input)
tc->connection.rmt_ip.ip4.as_u32 = clib_host_to_net_u32 (0x06000103);
tc->connection.lcl_port = 35051;
tc->connection.rmt_port = 53764;
- tc->connection.transport_proto = 0;
+ tc->connection.proto = 0;
clib_memcpy (tc1, &tc->connection, sizeof (*tc1));
pool_get (session_manager_main.sessions[0], s);
@@ -1590,7 +1590,7 @@ tcp_test_lookup (vlib_main_t * vm, unformat_input_t * input)
tc->connection.rmt_ip.ip4.as_u32 = clib_host_to_net_u32 (0x06000102);
tc->connection.lcl_port = 38225;
tc->connection.rmt_port = 53764;
- tc->connection.transport_proto = 0;
+ tc->connection.proto = 0;
clib_memcpy (tc2, &tc->connection, sizeof (*tc2));
/*
@@ -1601,7 +1601,7 @@ tcp_test_lookup (vlib_main_t * vm, unformat_input_t * input)
tconn = session_lookup_connection_wt4 (0, &tc1->lcl_ip.ip4,
&tc1->rmt_ip.ip4,
tc1->lcl_port, tc1->rmt_port,
- tc1->transport_proto, 0);
+ tc1->proto, 0);
cmp = (memcmp (&tconn->rmt_ip, &tc1->rmt_ip, sizeof (tc1->rmt_ip)) == 0);
TCP_TEST ((cmp), "rmt ip is identical %d", cmp);
TCP_TEST ((tconn->lcl_port == tc1->lcl_port),
@@ -1614,7 +1614,7 @@ tcp_test_lookup (vlib_main_t * vm, unformat_input_t * input)
tconn = session_lookup_connection_wt4 (0, &tc2->lcl_ip.ip4,
&tc2->rmt_ip.ip4,
tc2->lcl_port, tc2->rmt_port,
- tc2->transport_proto, 0);
+ tc2->proto, 0);
TCP_TEST ((tconn == 0), "lookup result should be null");
/*
@@ -1624,12 +1624,12 @@ tcp_test_lookup (vlib_main_t * vm, unformat_input_t * input)
tconn = session_lookup_connection_wt4 (0, &tc1->lcl_ip.ip4,
&tc1->rmt_ip.ip4,
tc1->lcl_port, tc1->rmt_port,
- tc1->transport_proto, 0);
+ tc1->proto, 0);
TCP_TEST ((tconn == 0), "lookup result should be null");
tconn = session_lookup_connection_wt4 (0, &tc2->lcl_ip.ip4,
&tc2->rmt_ip.ip4,
tc2->lcl_port, tc2->rmt_port,
- tc2->transport_proto, 0);
+ tc2->proto, 0);
TCP_TEST ((tconn == 0), "lookup result should be null");
/*
@@ -1639,7 +1639,7 @@ tcp_test_lookup (vlib_main_t * vm, unformat_input_t * input)
tconn = session_lookup_connection_wt4 (0, &tc2->lcl_ip.ip4,
&tc2->rmt_ip.ip4,
tc2->lcl_port, tc2->rmt_port,
- tc2->transport_proto, 0);
+ tc2->proto, 0);
TCP_TEST ((tconn == 0), "lookup result should be null");
return 0;