david/ipxe
david
/
ipxe
Archived
1
0
Fork 0
Code

Define "connected" as 

"when SYN is ACKed and we have already received SYN", or
  "when SYN is received and we have already had SYN ACKed"

rather than just

  "when SYN is ACKed"

This avoids spuriously calling the connected() method when we receive
a RST,ACK in response to a SYN.
This commit is contained in:
Michael Brown 2007-01-09 05:01:22 +00:00
parent 70cc3a164a
commit 2eeb7c4fe7
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/net/tcp.c
View File

@ -492,6 +492,7 @@ static struct tcp_connection * tcp_demux ( uint16_t local_port ) {
* @ret rc Return status code
*/
static int tcp_rx_syn ( struct tcp_connection *conn, uint32_t seq ) {
struct tcp_application *app = conn->app;
/* Synchronise sequence numbers on first SYN */
if ( ! ( conn->tcp_state & TCP_STATE_RCVD ( TCP_SYN ) ) )
@ -508,6 +509,11 @@ static int tcp_rx_syn ( struct tcp_connection *conn, uint32_t seq ) {
/* Acknowledge SYN */
conn->rcv_ack++;
/* Notify application of established connection, if applicable */
if ( ( conn->tcp_state & TCP_STATE_ACKED ( TCP_SYN ) ) &&
app && app->tcp_op->connected )
app->tcp_op->connected ( app );
return 0;
}
@ -565,7 +571,9 @@ static int tcp_rx_ack ( struct tcp_connection *conn, uint32_t ack,
conn->tcp_state |= TCP_STATE_ACKED ( acked_flags );
/* Notify application of established connection, if applicable */
if ( ( acked_flags & TCP_SYN ) && app && app->tcp_op->connected )
if ( ( acked_flags & TCP_SYN ) &&
( conn->tcp_state & TCP_STATE_RCVD ( TCP_SYN ) ) &&
app && app->tcp_op->connected )
app->tcp_op->connected ( app );
return 0;