X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fsession%2Fsession_lookup.h;h=20cbaf2acd6ba7a0adc8c9fbcf1fc5e584c01b9d;hb=refs%2Fchanges%2F11%2F8611%2F22;hp=cf1dc01356e72ca471eaa9b859db95a1ad12be91;hpb=1f36a93d3d68f5ba6dcda08809394ce757cefd72;p=vpp.git

diff --git a/src/vnet/session/session_lookup.h b/src/vnet/session/session_lookup.h
index cf1dc01356e..20cbaf2acd6 100644
--- a/src/vnet/session/session_lookup.h
+++ b/src/vnet/session/session_lookup.h
@@ -16,77 +16,73 @@
 #ifndef SRC_VNET_SESSION_SESSION_LOOKUP_H_
 #define SRC_VNET_SESSION_SESSION_LOOKUP_H_
 
+#include <vnet/session/session_table.h>
 #include <vnet/session/stream_session.h>
 #include <vnet/session/transport.h>
 
-typedef struct _session_lookup
-{
-  /** Lookup tables for established sessions and listeners */
-  clib_bihash_16_8_t v4_session_hash;
-  clib_bihash_48_8_t v6_session_hash;
-
-  /** Lookup tables for half-open sessions */
-  clib_bihash_16_8_t v4_half_open_hash;
-  clib_bihash_48_8_t v6_half_open_hash;
-} session_lookup_t;
-
-stream_session_t *stream_session_lookup_listener4 (ip4_address_t * lcl,
-						   u16 lcl_port, u8 proto);
-stream_session_t *stream_session_lookup4 (ip4_address_t * lcl,
-					  ip4_address_t * rmt, u16 lcl_port,
-					  u16 rmt_port, u8 proto);
-stream_session_t *stream_session_lookup_listener6 (ip6_address_t * lcl,
-						   u16 lcl_port, u8 proto);
-stream_session_t *stream_session_lookup6 (ip6_address_t * lcl,
-					  ip6_address_t * rmt, u16 lcl_port,
-					  u16 rmt_port, u8 proto);
-transport_connection_t *stream_session_lookup_transport_wt4 (ip4_address_t *
-							     lcl,
-							     ip4_address_t *
-							     rmt,
-							     u16 lcl_port,
-							     u16 rmt_port,
-							     u8 proto,
-							     u32
-							     thread_index);
-transport_connection_t *stream_session_lookup_transport4 (ip4_address_t * lcl,
-							  ip4_address_t * rmt,
-							  u16 lcl_port,
-							  u16 rmt_port,
-							  u8 proto);
-transport_connection_t *stream_session_lookup_transport_wt6 (ip6_address_t *
-							     lcl,
-							     ip6_address_t *
-							     rmt,
-							     u16 lcl_port,
-							     u16 rmt_port,
+stream_session_t *session_lookup4 (u32 fib_index, ip4_address_t * lcl,
+				   ip4_address_t * rmt, u16 lcl_port,
+				   u16 rmt_port, u8 proto);
+stream_session_t *session_lookup6 (u32 fib_index, ip6_address_t * lcl,
+				   ip6_address_t * rmt, u16 lcl_port,
+				   u16 rmt_port, u8 proto);
+transport_connection_t *session_lookup_connection_wt4 (u32 fib_index,
+						       ip4_address_t * lcl,
+						       ip4_address_t * rmt,
+						       u16 lcl_port,
+						       u16 rmt_port, u8 proto,
+						       u32 thread_index);
+transport_connection_t *session_lookup_connection4 (u32 fib_index,
+						    ip4_address_t * lcl,
+						    ip4_address_t * rmt,
+						    u16 lcl_port,
+						    u16 rmt_port, u8 proto);
+transport_connection_t *session_lookup_connection_wt6 (u32 fib_index,
+						       ip6_address_t * lcl,
+						       ip6_address_t * rmt,
+						       u16 lcl_port,
+						       u16 rmt_port, u8 proto,
+						       u32 thread_index);
+transport_connection_t *session_lookup_connection6 (u32 fib_index,
+						    ip6_address_t * lcl,
+						    ip6_address_t * rmt,
+						    u16 lcl_port,
+						    u16 rmt_port, u8 proto);
+stream_session_t *session_lookup_listener4 (u32 fib_index,
+					    ip4_address_t * lcl, u16 lcl_port,
+					    u8 proto);
+stream_session_t *session_lookup_listener6 (u32 fib_index,
+					    ip6_address_t * lcl, u16 lcl_port,
+					    u8 proto);
+stream_session_t *session_lookup_listener (u32 table_index,
+					   session_endpoint_t * sep);
+int session_lookup_add_connection (transport_connection_t * tc, u64 value);
+int session_lookup_del_connection (transport_connection_t * tc);
+u32 session_lookup_session_endpoint (u32 table_index,
+				     session_endpoint_t * sep);
+u32 session_lookup_local_session_endpoint (u32 table_index,
+					   session_endpoint_t * sep);
+int session_lookup_add_session_endpoint (u32 table_index,
+					 session_endpoint_t * sep, u64 value);
+int session_lookup_del_session_endpoint (u32 table_index,
+					 session_endpoint_t * sep);
+int session_lookup_del_session (stream_session_t * s);
+int session_lookup_del_half_open (transport_connection_t * tc);
+int session_lookup_add_half_open (transport_connection_t * tc, u64 value);
+u64 session_lookup_half_open_handle (transport_connection_t * tc);
+transport_connection_t *session_lookup_half_open_connection (u64 handle,
 							     u8 proto,
-							     u32
-							     thread_index);
-transport_connection_t *stream_session_lookup_transport6 (ip6_address_t * lcl,
-							  ip6_address_t * rmt,
-							  u16 lcl_port,
-							  u16 rmt_port,
-							  u8 proto);
+							     u8 is_ip4);
+u32 session_lookup_get_index_for_fib (u32 fib_proto, u32 fib_index);
 
-stream_session_t *stream_session_lookup_listener (ip46_address_t * lcl,
-						  u16 lcl_port, u8 proto);
-u64 stream_session_half_open_lookup_handle (ip46_address_t * lcl,
-					    ip46_address_t * rmt,
-					    u16 lcl_port,
-					    u16 rmt_port, u8 proto);
-transport_connection_t *stream_session_half_open_lookup (ip46_address_t * lcl,
-							 ip46_address_t * rmt,
-							 u16 lcl_port,
-							 u16 rmt_port,
-							 u8 proto);
-void stream_session_table_add_for_tc (transport_connection_t * tc, u64 value);
-int stream_session_table_del_for_tc (transport_connection_t * tc);
-int stream_session_table_del (stream_session_t * s);
-void stream_session_half_open_table_del (transport_connection_t * tc);
-void stream_session_half_open_table_add (transport_connection_t * tc,
-					 u64 value);
+u64 session_lookup_local_listener_make_handle (session_endpoint_t * sep);
+u8 session_lookup_local_is_handle (u64 handle);
+int session_lookup_local_listener_parse_handle (u64 handle,
+						session_endpoint_t * sep);
 
+void session_lookup_show_table_entries (vlib_main_t * vm,
+					session_table_t * table, u8 type,
+					u8 is_local);
 void session_lookup_init (void);
 
 #endif /* SRC_VNET_SESSION_SESSION_LOOKUP_H_ */