X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fudp%2Fudp.h;h=736e3ce94f1b16dc594683b3970d8933641cbcd4;hb=refs%2Fchanges%2F69%2F26269%2F2;hp=03dbcdd5caced513b59a3ef59cef16394e751bd6;hpb=c5df8c71cc867d8120a25e4bd6d065aa63d9011c;p=vpp.git

diff --git a/src/vnet/udp/udp.h b/src/vnet/udp/udp.h
index 03dbcdd5cac..736e3ce94f1 100644
--- a/src/vnet/udp/udp.h
+++ b/src/vnet/udp/udp.h
@@ -34,13 +34,34 @@ typedef enum
   UDP_N_ERROR,
 } udp_error_t;
 
+#define foreach_udp_connection_flag					\
+  _(CONNECTED, "CONNECTED")	/**< connected mode */			\
+  _(OWNS_PORT, "OWNS_PORT")	/**< port belong to conn (UDPC) */	\
+  _(CLOSING, "CLOSING")		/**< conn closed with data */		\
+  _(LISTEN, "LISTEN")		/**< conn is listening */		\
+
+enum udp_conn_flags_bits
+{
+#define _(sym, str) UDP_CONN_F_BIT_##sym,
+  foreach_udp_connection_flag
+#undef _
+  UDP_CONN_N_FLAGS
+};
+
+typedef enum udp_conn_flags_
+{
+#define _(sym, str) UDP_CONN_F_##sym = 1 << UDP_CONN_F_BIT_##sym,
+  foreach_udp_connection_flag
+#undef _
+} udp_conn_flags_t;
+
 typedef struct
 {
   /** Required for pool_get_aligned */
   CLIB_CACHE_LINE_ALIGN_MARK (cacheline0);
   transport_connection_t connection;	/**< must be first */
   clib_spinlock_t rx_lock;		/**< rx fifo lock */
-  u8 is_connected;			/**< connected mode */
+  u8 flags;				/**< connection flags */
 } udp_connection_t;
 
 #define foreach_udp4_dst_port			\
@@ -99,7 +120,7 @@ typedef struct
   /* Name (a c string). */
   char *name;
 
-  /* GRE protocol type in host byte order. */
+  /* Port number in host byte order. */
   udp_dst_port_t dst_port;
 
   /* Node which handles this type. */
@@ -108,6 +129,9 @@ typedef struct
   /* Next index for this type. */
   u32 next_index;
 
+  /* UDP sessions refcount (not tunnels) */
+  u32 n_connections;
+
   /* Parser for packet generator edits for this protocol */
   unformat_function_t *unformat_pg_edit;
 } udp_dst_port_info_t;
@@ -134,6 +158,9 @@ typedef struct
   u8 punt_unknown4;
   u8 punt_unknown6;
 
+  /* Udp local to input arc index */
+  u32 local_to_input_edge[N_UDP_AF];
+
   /*
    * Per-worker thread udp connection pools used with session layer
    */
@@ -234,6 +261,7 @@ udp_connection_clone_safe (u32 connection_index, u32 thread_index)
   udp_pool_remove_peeker (thread_index);
   new_c->c_thread_index = current_thread_index;
   new_c->c_c_index = udp_connection_index (new_c);
+  new_c->c_fib_index = old_c->c_fib_index;
   return new_c;
 }
 
@@ -249,6 +277,8 @@ format_function_t format_udp_header;
 format_function_t format_udp_rx_trace;
 unformat_function_t unformat_udp_header;
 
+void udp_add_dst_port (udp_main_t * um, udp_dst_port_t dst_port,
+		       char *dst_port_name, u8 is_ip4);
 void udp_register_dst_port (vlib_main_t * vm,
 			    udp_dst_port_t dst_port,
 			    u32 node_index, u8 is_ip4);
@@ -256,6 +286,8 @@ void udp_unregister_dst_port (vlib_main_t * vm,
 			      udp_dst_port_t dst_port, u8 is_ip4);
 bool udp_is_valid_dst_port (udp_dst_port_t dst_port, u8 is_ip4);
 
+void udp_connection_share_port (u16 lcl_port, u8 is_ip4);
+
 void udp_punt_unknown (vlib_main_t * vm, u8 is_ip4, u8 is_add);
 
 always_inline void *