session tcp: add opaque data to show cli

[vpp.git] / src / vnet / session / transport.h

diff --git a/src/vnet/session/transport.h b/src/vnet/session/transport.h
index 058a9ae..df246a9 100644 (file)
--- a/src/vnet/session/transport.h
+++ b/src/vnet/session/transport.h
@@ -19,6 +19,10 @@
 #include <vnet/vnet.h>
 #include <vnet/session/transport_types.h>
 
+#define TRANSPORT_PACER_MIN_MSS        1460
+#define TRANSPORT_PACER_MIN_BURST      TRANSPORT_PACER_MIN_MSS
+#define TRANSPORT_PACER_MAX_BURST      (43 * TRANSPORT_PACER_MIN_MSS)
+
 typedef struct _transport_options_t
 {
   transport_tx_fn_type_t tx_type;
@@ -39,6 +43,7 @@ typedef struct _transport_proto_vft
   u32 (*stop_listen) (u32 conn_index);
   int (*connect) (transport_endpoint_cfg_t * rmt);
   void (*close) (u32 conn_index, u32 thread_index);
+  void (*reset) (u32 conn_index, u32 thread_index);
   void (*cleanup) (u32 conn_index, u32 thread_index);
   clib_error_t *(*enable) (vlib_main_t * vm, u8 is_en);
 
@@ -96,6 +101,7 @@ do {                                                         \
 
 int transport_connect (transport_proto_t tp, transport_endpoint_cfg_t * tep);
 void transport_close (transport_proto_t tp, u32 conn_index, u8 thread_index);
+void transport_reset (transport_proto_t tp, u32 conn_index, u8 thread_index);
 u32 transport_start_listen (transport_proto_t tp, u32 session_index,
                            transport_endpoint_t * tep);
 u32 transport_stop_listen (transport_proto_t tp, u32 conn_index);
@@ -146,7 +152,7 @@ void transport_register_protocol (transport_proto_t transport_proto,
                                  const transport_proto_vft_t * vft,
                                  fib_protocol_t fib_proto, u32 output_node);
 transport_proto_vft_t *transport_protocol_get_vft (transport_proto_t tp);
-void transport_update_time (f64 time_now, u8 thread_index);
+void transport_update_time (clib_time_type_t time_now, u8 thread_index);
 
 int transport_alloc_local_port (u8 proto, ip46_address_t * ip);
 int transport_alloc_local_endpoint (u8 proto, transport_endpoint_cfg_t * rmt,
@@ -167,8 +173,8 @@ transport_elog_track_index (transport_connection_t * tc)
 }
 
 void transport_connection_tx_pacer_reset (transport_connection_t * tc,
-                                         u32 rate_bytes_per_sec,
-                                         u32 initial_bucket, u64 time_now);
+                                         u64 rate_bytes_per_sec,
+                                         u32 initial_bucket);
 /**
  * Initialize tx pacer for connection
  *
@@ -177,7 +183,7 @@ void transport_connection_tx_pacer_reset (transport_connection_t * tc,
  * @param burst_bytes                  initial burst size in bytes
  */
 void transport_connection_tx_pacer_init (transport_connection_t * tc,
-                                        u32 rate_bytes_per_sec,
+                                        u64 rate_bytes_per_sec,
                                         u32 initial_bucket);
 
 /**
@@ -196,8 +202,7 @@ void transport_connection_tx_pacer_update (transport_connection_t * tc,
  * @param time_now     current cpu time as returned by @ref clib_cpu_time_now
  * @param mss          transport's mss
  */
-u32 transport_connection_snd_space (transport_connection_t * tc,
-                                   u64 time_now, u16 mss);
+u32 transport_connection_snd_space (transport_connection_t * tc, u16 mss);
 
 /**
  * Get tx pacer max burst
@@ -206,8 +211,7 @@ u32 transport_connection_snd_space (transport_connection_t * tc,
  * @param time_now     current cpu time
  * @return             max burst for connection
  */
-u32 transport_connection_tx_pacer_burst (transport_connection_t * tc,
-                                        u64 time_now);
+u32 transport_connection_tx_pacer_burst (transport_connection_t * tc);
 
 /**
  * Get tx pacer current rate
@@ -218,12 +222,12 @@ u32 transport_connection_tx_pacer_burst (transport_connection_t * tc,
 u64 transport_connection_tx_pacer_rate (transport_connection_t * tc);
 
 /**
- * Initialize period for tx pacers
+ * Reset tx pacer bucket
  *
- * Defines a unit of time with respect to number of cpu cycles that is to
- * be used by all tx pacers.
+ * @param tc           transport connection
+ * @param time_now     current cpu time
  */
-void transport_init_tx_pacers_period (void);
+void transport_connection_tx_pacer_reset_bucket (transport_connection_t * tc);
 
 /**
  * Check if transport connection is paced
@@ -237,16 +241,15 @@ transport_connection_is_tx_paced (transport_connection_t * tc)
 u8 *format_transport_pacer (u8 * s, va_list * args);
 
 /**
- * Update tx byte stats for transport connection
+ * Update tx bytes for paced transport connection
  *
- * If tx pacing is enabled, this also updates pacer bucket to account for the
+ * If tx pacing is enabled, this update pacer bucket to account for the
  * amount of bytes that have been sent.
  *
  * @param tc           transport connection
- * @param pkts         packets recently sent
  * @param bytes                bytes recently sent
  */
-void transport_connection_update_tx_stats (transport_connection_t * tc,
+void transport_connection_update_tx_bytes (transport_connection_t * tc,
                                           u32 bytes);
 
 void