srtp: basic implementation based on libsrtp2

[vpp.git] / src / vnet / session / session.c

diff --git a/src/vnet/session/session.c b/src/vnet/session/session.c
index 7aadb21..56a1fd7 100644 (file)
--- a/src/vnet/session/session.c
+++ b/src/vnet/session/session.c
@@ -318,20 +318,19 @@ session_cleanup_half_open (session_handle_t ho_handle)
       /* Migrated transports are no longer half-opens */
       transport_cleanup (session_get_transport_proto (ho),
                         ho->connection_index, ho->app_index /* overloaded */);
-      return;
     }
-  transport_cleanup_half_open (session_get_transport_proto (ho),
-                              ho->connection_index);
+  else
+    transport_cleanup_half_open (session_get_transport_proto (ho),
+                                ho->connection_index);
+  session_free (ho);
 }
 
 static void
-session_half_open_free (u32 ho_index)
+session_half_open_free (session_t *ho)
 {
   app_worker_t *app_wrk;
-  session_t *ho;
 
   ASSERT (vlib_get_thread_index () <= 1);
-  ho = ho_session_get (ho_index);
   app_wrk = app_worker_get (ho->app_wrk_index);
   app_worker_del_half_open (app_wrk, ho);
   session_free (ho);
@@ -340,16 +339,25 @@ session_half_open_free (u32 ho_index)
 static void
 session_half_open_free_rpc (void *args)
 {
-  session_half_open_free (pointer_to_uword (args));
+  session_t *ho = ho_session_get (pointer_to_uword (args));
+  session_half_open_free (ho);
 }
 
 void
 session_half_open_delete_notify (transport_connection_t *tc)
 {
-  void *args = uword_to_pointer ((uword) tc->s_index, void *);
-  u32 ctrl_thread = vlib_num_workers () ? 1 : 0;
-  session_send_rpc_evt_to_thread (ctrl_thread, session_half_open_free_rpc,
-                                 args);
+  /* Notification from ctrl thread accepted without rpc */
+  if (tc->thread_index <= 1)
+    {
+      session_half_open_free (ho_session_get (tc->s_index));
+    }
+  else
+    {
+      void *args = uword_to_pointer ((uword) tc->s_index, void *);
+      u32 ctrl_thread = vlib_num_workers () ? 1 : 0;
+      session_send_rpc_evt_to_thread (ctrl_thread, session_half_open_free_rpc,
+                                     args);
+    }
 }
 
 void
@@ -1810,9 +1818,11 @@ session_manager_main_enable (vlib_main_t * vm)
       wrk->ctrl_head = clib_llist_make_head (wrk->event_elts, evt_list);
       wrk->new_head = clib_llist_make_head (wrk->event_elts, evt_list);
       wrk->old_head = clib_llist_make_head (wrk->event_elts, evt_list);
+      wrk->pending_connects = clib_llist_make_head (wrk->event_elts, evt_list);
       wrk->vm = vlib_get_main_by_index (i);
       wrk->last_vlib_time = vlib_time_now (vm);
       wrk->last_vlib_us_time = wrk->last_vlib_time * CLIB_US_TIME_FREQ;
+      wrk->timerfd = -1;
       vec_validate (wrk->session_to_enqueue, smm->last_transport_proto_type);
 
       if (num_threads > 1)
@@ -1892,6 +1902,7 @@ session_node_enable_disable (u8 is_en)
          vlib_node_set_state (vm, session_queue_node.index, mstate);
          if (is_en)
            {
+             session_main_get_worker (0)->state = SESSION_WRK_INTERRUPT;
              vlib_node_set_state (vm, session_queue_process_node.index,
                                   state);
              n = vlib_get_node (vm, session_queue_process_node.index);
@@ -1955,7 +1966,7 @@ session_main_init (vlib_main_t * vm)
   smm->evt_qs_segment_size = 1 << 20;
 #endif
 
-  smm->last_transport_proto_type = TRANSPORT_PROTO_DTLS;
+  smm->last_transport_proto_type = TRANSPORT_PROTO_SRTP;
 
   return 0;
 }