diff options
| author |   Florin Coras <fcoras@cisco.com> | 2018-12-27 11:53:11 -0800 |
|---|---|---|
| committer |   Florin Coras <florin.coras@gmail.com> | 2018-12-28 20:41:44 +0000 |
| commit | 5a2ec8fc41d14ffc5275ab88761c1fb7e0420a33 (patch) | |
| tree | 428fcbd4923da925981717fcfba87fdd55be494b /src/vnet/tcp/tcp.c | |
| parent | fa915f8180d620b5325789200e08fec674d390ba (diff) | |
session: free session after transport and app confirm
In addition to that, a bit of refactoring.
Change-Id: Iea1eabc2167bcdef185ec53bc09bae087c5398e6
Signed-off-by: Florin Coras <fcoras@cisco.com>
Diffstat (limited to 'src/vnet/tcp/tcp.c')
| -rw-r--r-- | src/vnet/tcp/tcp.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/vnet/tcp/tcp.c b/src/vnet/tcp/tcp.c index 4a63f3bc00c..564f200bc00 100644 --- a/src/vnet/tcp/tcp.c +++ b/src/vnet/tcp/tcp.c @@ -241,7 +241,7 @@ void 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); } @@ -279,7 +279,7 @@ tcp_connection_reset (tcp_connection_t * 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: @@ -291,7 +291,7 @@ tcp_connection_reset (tcp_connection_t * 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: @@ -303,7 +303,7 @@ tcp_connection_reset (tcp_connection_t * tc) 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: @@ -1224,7 +1224,7 @@ tcp_timer_establish_handler (u32 conn_index) 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); } @@ -1262,7 +1262,7 @@ tcp_timer_waitclose_handler (u32 conn_index) { 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)) { @@ -1296,7 +1296,7 @@ tcp_timer_waitclose_handler (u32 conn_index) rto = clib_max (tc->rto >> tc->rto_boff, 1); tcp_timer_set (tc, TCP_TIMER_WAITCLOSE, clib_min (rto * TCP_TO_TIMER_TICK, TCP_2MSL_TIME)); - session_stream_close_notify (&tc->connection); + session_transport_closed_notify (&tc->connection); } else { @@ -1311,7 +1311,7 @@ tcp_timer_waitclose_handler (u32 conn_index) 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); |