X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fsession%2Fsession.c;h=ed940d593c5a3ec3765fcf7f1afbdff17fd82df8;hb=4fde4ae0363de45d867eb3472e43b89ae34d3bd1;hp=1274408675f9380b61dff4f011b802e7857f42b8;hpb=c74b43c80789f5e437dfe4cc491157b45a7f222e;p=vpp.git diff --git a/src/vnet/session/session.c b/src/vnet/session/session.c index 1274408675f..ed940d593c5 100644 --- a/src/vnet/session/session.c +++ b/src/vnet/session/session.c @@ -734,10 +734,9 @@ session_main_flush_all_enqueue_events (u8 transport_proto) return errors; } -static inline int -session_stream_connect_notify_inline (transport_connection_t * tc, - session_error_t err, - session_state_t opened_state) +int +session_stream_connect_notify (transport_connection_t * tc, + session_error_t err) { u32 opaque = 0, new_ti, new_si; app_worker_t *app_wrk; @@ -781,7 +780,7 @@ session_stream_connect_notify_inline (transport_connection_t * tc, } s = session_get (new_si, new_ti); - s->session_state = opened_state; + s->session_state = SESSION_STATE_READY; session_lookup_add_connection (tc, session_handle (s)); if (app_worker_connect_notify (app_wrk, s, SESSION_E_NONE, opaque)) @@ -794,20 +793,6 @@ session_stream_connect_notify_inline (transport_connection_t * tc, return 0; } -int -session_stream_connect_notify (transport_connection_t * tc, - session_error_t err) -{ - return session_stream_connect_notify_inline (tc, err, SESSION_STATE_READY); -} - -int -session_ho_stream_connect_notify (transport_connection_t * tc, - session_error_t err) -{ - return session_stream_connect_notify_inline (tc, err, SESSION_STATE_OPENED); -} - static void session_switch_pool_reply (void *arg) { @@ -1225,8 +1210,7 @@ session_open_vc (u32 app_wrk_index, session_endpoint_t * rmt, u32 opaque) * thing but better than allocating a separate half-open pool. */ tc->s_index = opaque; - if (transport_half_open_has_fifos (rmt->transport_proto)) - return session_ho_stream_connect_notify (tc, 0 /* is_fail */ ); + return 0; }