ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tcp: handle ack advancement with no holes and reneging

Browse Source 
Type: fix

Signed-off-by: Florin Coras <fcoras@cisco.com>
Change-Id: I9afba8dc9e087b8c436fe568531c02614a577a7c
(cherry picked from commit c95eefb393)
This commit is contained in:
Florin Coras
2020-01-08 22:01:54 +00:00
committed by Dave Wallace
parent afb4d3ae90
commit 0cd8e2c59a
2 changed files with 36 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/plugins/unittest/tcp_test.c
View File

@ -262,11 +262,44 @@ tcp_test_sack_rx (vlib_main_t * vm, unformat_input_t * input)
sb->rxt_sacked);
/*
* Sack all up to 1000
* Sack remaining bytes [990 1000]
*/
tc->rcv_opts.sacks[0].start = 990;
tc->rcv_opts.sacks[0].end = 1000;
tcp_rcv_sacks (tc, 960);
TCP_TEST ((sb->is_reneging), "is reneging");
TCP_TEST ((sb->sacked_bytes == 40), "sacked bytes %d", sb->sacked_bytes);
TCP_TEST ((sb->last_sacked_bytes == 10),
"last sacked bytes %d", sb->last_sacked_bytes);
TCP_TEST ((sb->rxt_sacked == 0), "last rxt sacked bytes %d",
sb->rxt_sacked);
TCP_TEST (pool_elts (sb->holes) == 0, "no holes left");
/*
* Ack up to 970 no sack blocks
*/
vec_reset_length (tc->rcv_opts.sacks);
tc->rcv_opts.flags &= ~TCP_OPTS_FLAG_SACK;
tcp_rcv_sacks (tc, 970);
TCP_TEST ((sb->is_reneging), "is reneging");
TCP_TEST ((sb->sacked_bytes == 30), "sacked bytes %d", sb->sacked_bytes);
TCP_TEST ((sb->last_sacked_bytes == 0),
"last sacked bytes %d", sb->last_sacked_bytes);
TCP_TEST ((sb->rxt_sacked == 0), "last rxt sacked bytes %d",
sb->rxt_sacked);
/*
* Ack all up to 1000
*/
tc->snd_una = 970;
tcp_rcv_sacks (tc, 1000);
TCP_TEST ((sb->high_sacked == 1000), "max sacked byte %u", sb->high_sacked);
TCP_TEST ((sb->sacked_bytes == 0), "sacked bytes %d", sb->sacked_bytes);
TCP_TEST (sb->last_bytes_delivered == 30, "last bytes delivered %d",
sb->last_bytes_delivered);
TCP_TEST ((sb->last_sacked_bytes == 0),
"last sacked bytes %d", sb->last_sacked_bytes);
TCP_TEST ((sb->lost_bytes == 0), "lost bytes %u", sb->lost_bytes);
@ -276,6 +309,7 @@ tcp_test_sack_rx (vlib_main_t * vm, unformat_input_t * input)
* Add new block
*/
tc->flags = 0;
tc->rcv_opts.flags |= TCP_OPTS_FLAG_SACK;
vec_reset_length (tc->rcv_opts.sacks);
block.start = 1200;

2
src/vnet/tcp/tcp_input.c
View File

@ -1012,7 +1012,7 @@ tcp_rcv_sacks (tcp_connection_t * tc, u32 ack)
sb->last_bytes_delivered = 0;
sb->rxt_sacked = 0;
if (!tcp_opts_sack (&tc->rcv_opts)
if (!tcp_opts_sack (&tc->rcv_opts) && !sb->sacked_bytes
&& sb->head == TCP_INVALID_SACK_HOLE_INDEX)
return;