X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fsession%2Fsession.c;h=ed940d593c5a3ec3765fcf7f1afbdff17fd82df8;hb=4fde4ae0363de45d867eb3472e43b89ae34d3bd1;hp=caa362e1f1d091f74a543d88be8e9468626dd4c8;hpb=7357043d2abc8d3811362f256e7c9086e7b0d378;p=vpp.git

diff --git a/src/vnet/session/session.c b/src/vnet/session/session.c
index caa362e1f1d..ed940d593c5 100644
--- a/src/vnet/session/session.c
+++ b/src/vnet/session/session.c
@@ -18,17 +18,12 @@
  */
 
 #include <vnet/session/session.h>
-#include <vnet/session/session_debug.h>
 #include <vnet/session/application.h>
 #include <vnet/dpo/load_balance.h>
 #include <vnet/fib/ip4_fib.h>
 
 session_main_t session_main;
 
-#if SESSION_DEBUG
-session_dbg_main_t session_dbg_main;
-#endif
-
 static inline int
 session_send_evt_to_thread (void *data, void *args, u32 thread_index,
 			    session_evt_type_t evt_type)
@@ -739,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;
@@ -786,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))
@@ -799,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)
 {
@@ -1230,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;
 }
 
@@ -1709,16 +1688,7 @@ session_manager_main_enable (vlib_main_t * vm)
 
   /* Enable transports */
   transport_enable_disable (vm, 1);
-
-#if SESSION_DEBUG
-  session_dbg_main_t *sdm = &session_dbg_main;
-  vec_validate_aligned (sdm->wrk, num_threads - 1, CLIB_CACHE_LINE_BYTES);
-  int thread;
-  for (thread = 0; thread < num_threads; thread++)
-    {
-      clib_memset (&sdm->wrk[thread], 0, sizeof (session_dbg_evts_t));
-    }
-#endif /* SESSION_DEBUG */
+  session_debug_init ();
 
   return 0;
 }