diff options
| author |   Florin Coras <fcoras@cisco.com> | 2017-11-29 00:07:11 -0500 |
|---|---|---|
| committer |   Damjan Marion <dmarion.lists@gmail.com> | 2017-11-29 11:59:46 +0000 |
| commit | 93e658058033e251b98d18a1f0717a07a85adfc2 (patch) | |
| tree | 469bda92e663851b7925aa60fd8677d38a5e6a86 /src/vnet/tcp | |
| parent | c6fb36fc2eb43c6158b390918d295f2c8eba737b (diff) | |
session: fix preallocation of local endpoint table
Change-Id: I67a73e31bda9e497859297fcc1765e880572884a
Signed-off-by: Florin Coras <fcoras@cisco.com>
Diffstat (limited to 'src/vnet/tcp')
| -rw-r--r-- | src/vnet/tcp/tcp.c | 13 | ||||
| -rw-r--r-- | src/vnet/tcp/tcp.h | 4 | ||||
| -rw-r--r-- | src/vnet/tcp/tcp_output.c | 4 |
3 files changed, 1 insertions, 20 deletions
diff --git a/src/vnet/tcp/tcp.c b/src/vnet/tcp/tcp.c index b16b2a7dfb2..aee18d997e0 100644 --- a/src/vnet/tcp/tcp.c +++ b/src/vnet/tcp/tcp.c @@ -1297,7 +1297,6 @@ static clib_error_t * tcp_config_fn (vlib_main_t * vm, unformat_input_t * input) { tcp_main_t *tm = vnet_get_tcp_main (); - u64 tmp; while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) { @@ -1308,18 +1307,6 @@ tcp_config_fn (vlib_main_t * vm, unformat_input_t * input) else if (unformat (input, "preallocated-half-open-connections %d", &tm->preallocated_half_open_connections)) ; - else if (unformat (input, "local-endpoints-table-memory %U", - unformat_memory_size, &tmp)) - { - if (tmp >= 0x100000000) - return clib_error_return (0, "memory size %llx (%lld) too large", - tmp, tmp); - tm->local_endpoints_table_memory = tmp; - } - else if (unformat (input, "local-endpoints-table-buckets %d", - &tm->local_endpoints_table_buckets)) - ; - else if (unformat (input, "buffer-fail-fraction %f", &tm->buffer_fail_fraction)) ; diff --git a/src/vnet/tcp/tcp.h b/src/vnet/tcp/tcp.h index 1ddfac0ce96..a7ae74e06ed 100644 --- a/src/vnet/tcp/tcp.h +++ b/src/vnet/tcp/tcp.h @@ -395,10 +395,6 @@ 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; diff --git a/src/vnet/tcp/tcp_output.c b/src/vnet/tcp/tcp_output.c index f377c912073..dd5b384b0c9 100644 --- a/src/vnet/tcp/tcp_output.c +++ b/src/vnet/tcp/tcp_output.c @@ -1376,7 +1376,7 @@ tcp_timer_retransmit_handler_i (u32 index, u8 is_syn) if (tc->state >= TCP_STATE_ESTABLISHED) { /* Lost FIN, retransmit and return */ - if (tc->state == TCP_STATE_FIN_WAIT_1) + if (tcp_is_lost_fin (tc)) { tcp_send_fin (tc); tc->rto_boff += 1; @@ -1495,8 +1495,6 @@ tcp_timer_retransmit_handler_i (u32 index, u8 is_syn) else { ASSERT (tc->state == TCP_STATE_CLOSED); - if (CLIB_DEBUG) - TCP_DBG ("connection state: %U", format_tcp_connection, tc, 2); return; } } |