Fix FIB initialization in UDP input

[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 bbfee57..e42f9fa 100644 (file)
--- a/src/vnet/udp/udp_input.c
+++ b/src/vnet/udp/udp_input.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Copyright (c) 2016-2019 Cisco and/or its affiliates.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at:
@@ -206,8 +206,9 @@ udp46_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
                  child0->c_lcl_port = udp0->dst_port;
                  child0->c_rmt_port = udp0->src_port;
                  child0->c_is_ip4 = is_ip4;
+                 child0->c_fib_index = tc0->fib_index;
 
-                 if (stream_session_accept (&child0->connection,
+                 if (session_stream_accept (&child0->connection,
                                             tc0->s_index, 1))
                    {
                      error0 = UDP_ERROR_CREATE_SESSION;
@@ -227,44 +228,30 @@ udp46_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
              goto trace0;
            }
 
-         if (!uc0->is_connected)
-           {
-             if (svm_fifo_max_enqueue (s0->rx_fifo)
-                 < b0->current_length + sizeof (session_dgram_hdr_t))
-               {
-                 error0 = UDP_ERROR_FIFO_FULL;
-                 goto trace0;
-               }
-             hdr0.data_length = b0->current_length;
-             hdr0.data_offset = 0;
-             ip_set (&hdr0.lcl_ip, lcl_addr, is_ip4);
-             ip_set (&hdr0.rmt_ip, rmt_addr, is_ip4);
-             hdr0.lcl_port = udp0->dst_port;
-             hdr0.rmt_port = udp0->src_port;
-             hdr0.is_ip4 = is_ip4;
-
-             clib_spinlock_lock (&uc0->rx_lock);
-             wrote0 = session_enqueue_dgram_connection (s0, &hdr0, b0,
-                                                        TRANSPORT_PROTO_UDP,
-                                                        1 /* queue evt */ );
-             clib_spinlock_unlock (&uc0->rx_lock);
-             ASSERT (wrote0 > 0);
-
-             if (s0->session_state != SESSION_STATE_LISTENING)
-               session_pool_remove_peeker (s0->thread_index);
-           }
-         else
+
+         if (svm_fifo_max_enqueue_prod (s0->rx_fifo)
+             < b0->current_length + sizeof (session_dgram_hdr_t))
            {
-             if (svm_fifo_max_enqueue (s0->rx_fifo) < b0->current_length)
-               {
-                 error0 = UDP_ERROR_FIFO_FULL;
-                 goto trace0;
-               }
-             wrote0 = session_enqueue_stream_connection (tc0, b0, 0,
-                                                         1 /* queue evt */ ,
-                                                         1 /* in order */ );
-             ASSERT (wrote0 > 0);
+             error0 = UDP_ERROR_FIFO_FULL;
+             goto trace0;
            }
+         hdr0.data_length = b0->current_length;
+         hdr0.data_offset = 0;
+         ip_set (&hdr0.lcl_ip, lcl_addr, is_ip4);
+         ip_set (&hdr0.rmt_ip, rmt_addr, is_ip4);
+         hdr0.lcl_port = udp0->dst_port;
+         hdr0.rmt_port = udp0->src_port;
+         hdr0.is_ip4 = is_ip4;
+
+         clib_spinlock_lock (&uc0->rx_lock);
+         wrote0 = session_enqueue_dgram_connection (s0, &hdr0, b0,
+                                                    TRANSPORT_PROTO_UDP,
+                                                    1 /* queue evt */ );
+         clib_spinlock_unlock (&uc0->rx_lock);
+         ASSERT (wrote0 > 0);
+
+         if (s0->session_state != SESSION_STATE_LISTENING)
+           session_pool_remove_peeker (s0->thread_index);
 
        trace0:
 
@@ -289,7 +276,7 @@ udp46_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
       vlib_put_next_frame (vm, node, next_index, n_left_to_next);
     }
 
-  errors = session_manager_flush_all_enqueue_events (TRANSPORT_PROTO_UDP);
+  errors = session_main_flush_all_enqueue_events (TRANSPORT_PROTO_UDP);
   udp_input_inc_counter (vm, is_ip4, UDP_ERROR_EVENT_FIFO_FULL, errors);
   return frame->n_vectors;
 }