tcp_connection_del (tcp_connection_t * tc)
{
TCP_EVT_DBG (TCP_EVT_DELETE, tc);
- stream_session_delete_notify (&tc->connection);
+ session_transport_delete_notify (&tc->connection);
tcp_connection_cleanup (tc);
}
{
case TCP_STATE_SYN_RCVD:
/* Cleanup everything. App wasn't notified yet */
- stream_session_delete_notify (&tc->connection);
+ session_transport_delete_notify (&tc->connection);
tcp_connection_cleanup (tc);
break;
case TCP_STATE_SYN_SENT:
session_stream_connect_notify (&tc->connection, 1 /* fail */ );
- tcp_connection_cleanup (tc);
+ tcp_connection_set_state (tc, TCP_STATE_CLOSED);
+ tcp_timer_set (tc, TCP_TIMER_WAITCLOSE, TCP_CLEANUP_TIME);
break;
case TCP_STATE_ESTABLISHED:
tcp_connection_timers_reset (tc);
/* Set the cleanup timer, in case the session layer/app don't
* cleanly close the connection */
tcp_timer_set (tc, TCP_TIMER_WAITCLOSE, TCP_CLOSEWAIT_TIME);
- stream_session_reset_notify (&tc->connection);
+ session_transport_reset_notify (&tc->connection);
tcp_connection_set_state (tc, TCP_STATE_CLOSED);
break;
case TCP_STATE_CLOSE_WAIT:
tcp_timer_set (tc, TCP_TIMER_WAITCLOSE, TCP_CLOSEWAIT_TIME);
/* Make sure we mark the session as closed. In some states we may
* be still trying to send data */
- session_stream_close_notify (&tc->connection);
+ session_transport_closed_notify (&tc->connection);
tcp_connection_set_state (tc, TCP_STATE_CLOSED);
break;
case TCP_STATE_CLOSED:
+ case TCP_STATE_TIME_WAIT:
break;
default:
TCP_DBG ("reset state: %u", tc->state);
return &tm->cc_algos[type];
}
+/**
+ * Generate random iss as per rfc6528
+ */
+static u32
+tcp_generate_random_iss (tcp_connection_t * tc)
+{
+ tcp_main_t *tm = &tcp_main;
+ u64 tmp;
+
+ if (tc->c_is_ip4)
+ tmp = (u64) tc->c_lcl_ip.ip4.as_u32 << 32 | (u64) tc->c_rmt_ip.ip4.as_u32;
+ else
+ tmp = tc->c_lcl_ip.ip6.as_u64[0] ^ tc->c_lcl_ip.ip6.as_u64[1]
+ ^ tc->c_rmt_ip.ip6.as_u64[0] ^ tc->c_rmt_ip.ip6.as_u64[1];
+
+ tmp ^= tm->iss_seed.first | ((u64) tc->c_lcl_port << 16 | tc->c_rmt_port);
+ tmp ^= tm->iss_seed.second;
+ tmp = clib_xxhash (tmp) + clib_cpu_time_now ();
+ return ((tmp >> 32) ^ (tmp & 0xffffffff));
+}
/**
* Initialize connection send variables.
void
tcp_init_snd_vars (tcp_connection_t * tc)
{
- u32 time_now;
-
/*
* 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
* direction for us.
*/
tcp_set_time_now (tcp_get_worker (vlib_get_thread_index ()));
- time_now = tcp_time_now ();
- tc->iss = random_u32 (&time_now);
+ tc->iss = tcp_generate_random_iss (tc);
tc->snd_una = tc->iss;
tc->snd_nxt = tc->iss + 1;
tc->snd_una_max = tc->snd_nxt;
ASSERT (tc->state == TCP_STATE_SYN_RCVD);
/* Start cleanup. App wasn't notified yet so use delete notify as
* opposed to delete to cleanup session layer state. */
- stream_session_delete_notify (&tc->connection);
+ session_transport_delete_notify (&tc->connection);
tc->timers[TCP_TIMER_ESTABLISH] = TCP_TIMER_HANDLE_INVALID;
tcp_connection_cleanup (tc);
}
{
case TCP_STATE_CLOSE_WAIT:
tcp_connection_timers_reset (tc);
- session_stream_close_notify (&tc->connection);
+ session_transport_closed_notify (&tc->connection);
if (!(tc->flags & TCP_CONN_FINPNDG))
{
* is closed. We haven't sent everything but we did try. */
tcp_cong_recovery_off (tc);
tcp_send_fin (tc);
- rto = clib_max (tc->rto >> tc->rto_boff, 1);
+ rto = clib_max ((tc->rto >> tc->rto_boff) * TCP_TO_TIMER_TICK, 1);
tcp_timer_set (tc, TCP_TIMER_WAITCLOSE,
- clib_min (rto * TCP_TO_TIMER_TICK, TCP_2MSL_TIME));
- session_stream_close_notify (&tc->connection);
+ clib_min (rto, TCP_2MSL_TIME));
+ session_transport_closed_notify (&tc->connection);
}
else
{
tcp_connection_timers_reset (tc);
tcp_connection_set_state (tc, TCP_STATE_CLOSED);
tcp_timer_set (tc, TCP_TIMER_WAITCLOSE, TCP_CLEANUP_TIME);
- session_stream_close_notify (&tc->connection);
+ session_transport_closed_notify (&tc->connection);
break;
default:
tcp_connection_del (tc);
/* *INDENT-ON* */
}
+static void
+tcp_initialize_iss_seed (tcp_main_t * tm)
+{
+ u32 default_seed = random_default_seed ();
+ u64 time_now = clib_cpu_time_now ();
+
+ tm->iss_seed.first = (u64) random_u32 (&default_seed) << 32;
+ tm->iss_seed.second = random_u64 (&time_now);
+}
+
static clib_error_t *
tcp_main_enable (vlib_main_t * vm)
{
}
tcp_initialize_timer_wheels (tm);
+ tcp_initialize_iss_seed (tm);
- tm->bytes_per_buffer = vlib_buffer_free_list_buffer_size
- (vm, VLIB_BUFFER_DEFAULT_FREE_LIST_INDEX);
+ tm->bytes_per_buffer = VLIB_BUFFER_DATA_SIZE;
return error;
}