narenas
/
opengnsys_ipxe
mirror of https://github.com/ipxe/ipxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Adjust received length to take into account any already-received data 

in tcp_rx_data().

Clarify comments on discarding duplicate or out-of-order data.
pull/1/head
Michael Brown 2007-07-13 11:31:58 +01:00
parent d5735c631c
commit eb530845d4
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/net/tcp.c
View File

@ -689,7 +689,7 @@ static int tcp_rx_data ( struct tcp_connection *tcp, uint32_t seq,
size_t len; size_t len;
int rc; int rc;
/* Ignore duplicate data */ /* Ignore duplicate or out-of-order data */
already_rcvd = ( tcp->rcv_ack - seq ); already_rcvd = ( tcp->rcv_ack - seq );
len = iob_len ( iobuf ); len = iob_len ( iobuf );
if ( already_rcvd >= len ) { if ( already_rcvd >= len ) {
@ -697,6 +697,7 @@ static int tcp_rx_data ( struct tcp_connection *tcp, uint32_t seq,
return 0; return 0;
} }
iob_pull ( iobuf, already_rcvd ); iob_pull ( iobuf, already_rcvd );
len -= already_rcvd;
/* Deliver data to application */ /* Deliver data to application */
if ( ( rc = xfer_deliver_iob ( &tcp->xfer, iobuf ) ) != 0 ) if ( ( rc = xfer_deliver_iob ( &tcp->xfer, iobuf ) ) != 0 )
@ -716,7 +717,7 @@ static int tcp_rx_data ( struct tcp_connection *tcp, uint32_t seq,
*/ */
static int tcp_rx_fin ( struct tcp_connection *tcp, uint32_t seq ) { static int tcp_rx_fin ( struct tcp_connection *tcp, uint32_t seq ) {
/* Ignore duplicate FIN */ /* Ignore duplicate or out-of-order FIN */
if ( ( tcp->rcv_ack - seq ) > 0 ) if ( ( tcp->rcv_ack - seq ) > 0 )
return 0; return 0;