X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fudp%2Fudp_input.c;h=db634cb2ddb42bc286ff5b8d7b67c378989f7f57;hb=c5df8c71c;hp=ad469f696672e0aa4f984aad8c5c08c2144dfad7;hpb=7fb0fe1f6972a7a35146fa9115b866ba29a6fbb7;p=vpp.git

diff --git a/src/vnet/udp/udp_input.c b/src/vnet/udp/udp_input.c
index ad469f69667..db634cb2ddb 100644
--- 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:
@@ -104,7 +104,7 @@ udp46_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
 	  ip4_header_t *ip40;
 	  ip6_header_t *ip60;
 	  u8 *data0;
-	  stream_session_t *s0;
+	  session_t *s0;
 	  udp_connection_t *uc0, *child0, *new_uc0;
 	  transport_connection_t *tc0;
 	  int wrote0;
@@ -207,7 +207,7 @@ udp46_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
 		  child0->c_rmt_port = udp0->src_port;
 		  child0->c_is_ip4 = is_ip4;
 
-		  if (stream_session_accept (&child0->connection,
+		  if (session_stream_accept (&child0->connection,
 					     tc0->s_index, 1))
 		    {
 		      error0 = UDP_ERROR_CREATE_SESSION;
@@ -229,7 +229,7 @@ udp46_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
 
 	  if (!uc0->is_connected)
 	    {
-	      if (svm_fifo_max_enqueue (s0->server_rx_fifo)
+	      if (svm_fifo_max_enqueue (s0->rx_fifo)
 		  < b0->current_length + sizeof (session_dgram_hdr_t))
 		{
 		  error0 = UDP_ERROR_FIFO_FULL;
@@ -255,8 +255,7 @@ udp46_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
 	    }
 	  else
 	    {
-	      if (svm_fifo_max_enqueue (s0->server_rx_fifo)
-		  < b0->current_length)
+	      if (svm_fifo_max_enqueue (s0->rx_fifo) < b0->current_length)
 		{
 		  error0 = UDP_ERROR_FIFO_FULL;
 		  goto trace0;
@@ -290,7 +289,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;
 }