session: generalize handling of network transports

[vpp.git] / src / vnet / tcp / tcp.h

diff --git a/src/vnet/tcp/tcp.h b/src/vnet/tcp/tcp.h
index 2a65dfa..9606a0e 100644 (file)
--- a/src/vnet/tcp/tcp.h
+++ b/src/vnet/tcp/tcp.h
@@ -385,13 +385,6 @@ typedef struct _tcp_main
   tcp_connection_t *half_open_connections;
   clib_spinlock_t half_open_lock;
 
-  /* Pool of local TCP endpoints */
-  transport_endpoint_t *local_endpoints;
-
-  /* Local endpoints lookup table */
-  transport_endpoint_table_t local_endpoints_table;
-  clib_spinlock_t local_endpoints_lock;
-
   /* Congestion control algorithms registered */
   tcp_cc_algorithm_t *cc_algos;
 
@@ -402,24 +395,20 @@ typedef struct _tcp_main
   u32 preallocated_connections;
   u32 preallocated_half_open_connections;
 
-  /** Transport table (preallocation) size parameters */
-  u32 local_endpoints_table_memory;
-  u32 local_endpoints_table_buckets;
-
   /** Vectors of src addresses. Optional unless one needs > 63K active-opens */
   ip4_address_t *ip4_src_addresses;
   u32 last_v4_address_rotor;
   u32 last_v6_address_rotor;
   ip6_address_t *ip6_src_addresses;
 
-  /** Port allocator random number generator seed */
-  u32 port_allocator_seed;
-
   /** vlib buffer size */
   u32 bytes_per_buffer;
 
   u8 punt_unknown4;
   u8 punt_unknown6;
+
+  /** fault-injection */
+  f64 buffer_fail_fraction;
 } tcp_main_t;
 
 extern tcp_main_t tcp_main;
@@ -442,6 +431,15 @@ tcp_buffer_hdr (vlib_buffer_t * b)
                           + vnet_buffer (b)->tcp.hdr_offset);
 }
 
+#if (VLIB_BUFFER_TRACE_TRAJECTORY)
+#define tcp_trajectory_add_start(b, start)                     \
+{                                                              \
+    (*vlib_buffer_trace_trajectory_cb) (b, start);             \
+}
+#else
+#define tcp_trajectory_add_start(b, start)
+#endif
+
 clib_error_t *vnet_tcp_enable_disable (vlib_main_t * vm, u8 is_en);
 
 void tcp_punt_unknown (vlib_main_t * vm, u8 is_ip4, u8 is_add);
@@ -667,15 +665,6 @@ tcp_set_time_now (u32 thread_index)
   return tcp_main.time_now[thread_index];
 }
 
-always_inline void
-tcp_update_time (f64 now, u32 thread_index)
-{
-  tcp_set_time_now (thread_index);
-  tw_timer_expire_timers_16t_2w_512sl (&tcp_main.timer_wheels[thread_index],
-                                      now);
-  tcp_flush_frames_to_output (thread_index);
-}
-
 u32 tcp_push_header (transport_connection_t * tconn, vlib_buffer_t * b);
 
 u32