Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
session: improve cli
[vpp.git]
/
src
/
vnet
/
tcp
/
tcp.c
diff --git
a/src/vnet/tcp/tcp.c
b/src/vnet/tcp/tcp.c
index
cd7b9e8
..
5090b7d
100644
(file)
--- a/
src/vnet/tcp/tcp.c
+++ b/
src/vnet/tcp/tcp.c
@@
-1165,6
+1165,8
@@
static transport_connection_t *
tcp_session_get_transport (u32 conn_index, u32 thread_index)
{
tcp_connection_t *tc = tcp_connection_get (conn_index, thread_index);
tcp_session_get_transport (u32 conn_index, u32 thread_index)
{
tcp_connection_t *tc = tcp_connection_get (conn_index, thread_index);
+ if (PREDICT_FALSE (!tc))
+ return 0;
return &tc->connection;
}
return &tc->connection;
}
@@
-1587,6
+1589,7
@@
tcp_configuration_init (void)
tcp_cfg.initial_cwnd_multiplier = 0;
tcp_cfg.enable_tx_pacing = 1;
tcp_cfg.cc_algo = TCP_CC_NEWRENO;
tcp_cfg.initial_cwnd_multiplier = 0;
tcp_cfg.enable_tx_pacing = 1;
tcp_cfg.cc_algo = TCP_CC_NEWRENO;
+ tcp_cfg.rwnd_min_update_ack = 1;
/* Time constants defined as timer tick (100ms) multiples */
tcp_cfg.delack_time = 1; /* 0.1s */
/* Time constants defined as timer tick (100ms) multiples */
tcp_cfg.delack_time = 1; /* 0.1s */
@@
-1678,6
+1681,7
@@
unformat_tcp_cc_algo_cfg (unformat_input_t * input, va_list * va)
static clib_error_t *
tcp_config_fn (vlib_main_t * vm, unformat_input_t * input)
{
static clib_error_t *
tcp_config_fn (vlib_main_t * vm, unformat_input_t * input)
{
+ uword memory_size;
while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
{
if (unformat (input, "preallocated-connections %d",
while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
{
if (unformat (input, "preallocated-connections %d",
@@
-1690,14
+1694,17
@@
tcp_config_fn (vlib_main_t * vm, unformat_input_t * input)
&tcp_cfg.buffer_fail_fraction))
;
else if (unformat (input, "max-rx-fifo %U", unformat_memory_size,
&tcp_cfg.buffer_fail_fraction))
;
else if (unformat (input, "max-rx-fifo %U", unformat_memory_size,
- &
tcp_cfg.max_rx_fifo
))
- ;
+ &
memory_size
))
+
tcp_cfg.max_rx_fifo = memory_size
;
else if (unformat (input, "min-rx-fifo %U", unformat_memory_size,
else if (unformat (input, "min-rx-fifo %U", unformat_memory_size,
- &tcp_cfg.min_rx_fifo))
+ &memory_size))
+ tcp_cfg.min_rx_fifo = memory_size;
+ else if (unformat (input, "mtu %u", &tcp_cfg.default_mtu))
;
;
- else if (unformat (input, "mtu %d", &tcp_cfg.default_mtu))
+ else if (unformat (input, "rwnd-min-update-ack %d",
+ &tcp_cfg.rwnd_min_update_ack))
;
;
- else if (unformat (input, "initial-cwnd-multiplier %
d
",
+ else if (unformat (input, "initial-cwnd-multiplier %
u
",
&tcp_cfg.initial_cwnd_multiplier))
;
else if (unformat (input, "no-tx-pacing"))
&tcp_cfg.initial_cwnd_multiplier))
;
else if (unformat (input, "no-tx-pacing"))
@@
-1707,19
+1714,19
@@
tcp_config_fn (vlib_main_t * vm, unformat_input_t * input)
;
else if (unformat (input, "%U", unformat_tcp_cc_algo_cfg))
;
;
else if (unformat (input, "%U", unformat_tcp_cc_algo_cfg))
;
- else if (unformat (input, "closewait-time %
d
", &tcp_cfg.closewait_time))
+ else if (unformat (input, "closewait-time %
u
", &tcp_cfg.closewait_time))
tcp_cfg.closewait_time /= TCP_TIMER_TICK;
tcp_cfg.closewait_time /= TCP_TIMER_TICK;
- else if (unformat (input, "timewait-time %
d
", &tcp_cfg.timewait_time))
+ else if (unformat (input, "timewait-time %
u
", &tcp_cfg.timewait_time))
tcp_cfg.timewait_time /= TCP_TIMER_TICK;
tcp_cfg.timewait_time /= TCP_TIMER_TICK;
- else if (unformat (input, "finwait1-time %
d
", &tcp_cfg.finwait1_time))
+ else if (unformat (input, "finwait1-time %
u
", &tcp_cfg.finwait1_time))
tcp_cfg.finwait1_time /= TCP_TIMER_TICK;
tcp_cfg.finwait1_time /= TCP_TIMER_TICK;
- else if (unformat (input, "finwait2-time %
d
", &tcp_cfg.finwait2_time))
+ else if (unformat (input, "finwait2-time %
u
", &tcp_cfg.finwait2_time))
tcp_cfg.finwait2_time /= TCP_TIMER_TICK;
tcp_cfg.finwait2_time /= TCP_TIMER_TICK;
- else if (unformat (input, "lastack-time %
d
", &tcp_cfg.lastack_time))
+ else if (unformat (input, "lastack-time %
u
", &tcp_cfg.lastack_time))
tcp_cfg.lastack_time /= TCP_TIMER_TICK;
tcp_cfg.lastack_time /= TCP_TIMER_TICK;
- else if (unformat (input, "closing-time %
d
", &tcp_cfg.closing_time))
+ else if (unformat (input, "closing-time %
u
", &tcp_cfg.closing_time))
tcp_cfg.closing_time /= TCP_TIMER_TICK;
tcp_cfg.closing_time /= TCP_TIMER_TICK;
- else if (unformat (input, "cleanup-time %
d
", &tcp_cfg.cleanup_time))
+ else if (unformat (input, "cleanup-time %
u
", &tcp_cfg.cleanup_time))
tcp_cfg.cleanup_time /= TCP_TIMER_TICK;
else
return clib_error_return (0, "unknown input `%U'",
tcp_cfg.cleanup_time /= TCP_TIMER_TICK;
else
return clib_error_return (0, "unknown input `%U'",