session: add support for application namespacing

[vpp.git] / src / vnet / udp / udp_input.c

diff --git a/src/vnet/udp/udp_input.c b/src/vnet/udp/udp_input.c
index 810278e..5d3a185 100644 (file)
--- a/src/vnet/udp/udp_input.c
+++ b/src/vnet/udp/udp_input.c
@@ -121,9 +121,9 @@ udp4_uri_input_node_fn (vlib_main_t * vm,
          s0 = 0;
 
          /* lookup session */
-         s0 = stream_session_lookup4 (&ip0->dst_address, &ip0->src_address,
-                                      udp0->dst_port, udp0->src_port,
-                                      SESSION_TYPE_IP4_UDP, my_thread_index);
+         s0 = session_lookup4 (0, &ip0->dst_address, &ip0->src_address,
+                               udp0->dst_port, udp0->src_port,
+                               TRANSPORT_PROTO_UDP);
 
          /* no listener */
          if (PREDICT_FALSE (s0 == 0))
@@ -145,8 +145,7 @@ udp4_uri_input_node_fn (vlib_main_t * vm,
                  goto trace0;
                }
 
-             svm_fifo_enqueue_nowait (f0, 0 /* pid */ ,
-                                      udp_len0 - sizeof (*udp0),
+             svm_fifo_enqueue_nowait (f0, udp_len0 - sizeof (*udp0),
                                       (u8 *) (udp0 + 1));
 
              b0->error = node->errors[SESSION_ERROR_ENQUEUED];
@@ -180,14 +179,13 @@ udp4_uri_input_node_fn (vlib_main_t * vm,
              us->c_rmt_ip4.as_u32 = ip0->src_address.as_u32;
              us->c_lcl_port = udp0->dst_port;
              us->c_rmt_port = udp0->src_port;
-             us->c_proto = SESSION_TYPE_IP4_UDP;
+             us->c_transport_proto = TRANSPORT_PROTO_UDP;
              us->c_c_index = us - um->udp_sessions[my_thread_index];
 
              /*
               * create stream session and attach the udp session to it
               */
              rv = stream_session_accept (&us->connection, s0->session_index,
-                                         SESSION_TYPE_IP4_UDP,
                                          1 /*notify */ );
              if (rv)
                error0 = rv;
@@ -255,7 +253,7 @@ udp4_uri_input_node_fn (vlib_main_t * vm,
        {
          /* Fabricate event */
          evt.fifo = s0->server_rx_fifo;
-         evt.event_type = FIFO_EVENT_SERVER_RX;
+         evt.event_type = FIFO_EVENT_APP_RX;
          evt.event_id = serial_number++;
 
          /* Add event to server's event queue */