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

Don't call stop_timer() from within the timer expiry callback; it's

Browse Source 
already stopped.

Don't call start_timer() when sending a dataless ACK.  This may or may
not be the right thing to do; I can't tell.

Back out broken "send ACK only if required to" logic temporarily.
This commit is contained in:
Michael Brown 2006-08-09 15:50:20 +00:00
parent 3aff701001
commit f0718d562f
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/net/tcp.c
View File

@ -384,7 +384,6 @@ void tcp_expired ( struct retry_timer *timer, int over ) {
case TCP_SYN_SENT: case TCP_SYN_SENT:
if ( over ) { if ( over ) {
tcp_trans ( conn, TCP_CLOSED ); tcp_trans ( conn, TCP_CLOSED );
stop_timer ( &conn->timer );
DBG ( "Timeout! Connection closed\n" ); DBG ( "Timeout! Connection closed\n" );
return; return;
} }
@ -392,7 +391,6 @@ void tcp_expired ( struct retry_timer *timer, int over ) {
case TCP_SYN_RCVD: case TCP_SYN_RCVD:
if ( over ) { if ( over ) {
tcp_trans ( conn, TCP_CLOSED ); tcp_trans ( conn, TCP_CLOSED );
stop_timer ( &conn->timer );
goto send_tcp_nomsg; goto send_tcp_nomsg;
} }
goto send_tcp_nomsg; goto send_tcp_nomsg;
@ -417,7 +415,6 @@ void tcp_expired ( struct retry_timer *timer, int over ) {
return; return;
case TCP_TIME_WAIT: case TCP_TIME_WAIT:
tcp_trans ( conn, TCP_CLOSED ); tcp_trans ( conn, TCP_CLOSED );
stop_timer ( &conn->timer );
return; return;
} }
/* Retransmit the data */ /* Retransmit the data */
@ -632,6 +629,10 @@ int tcp_senddata ( struct tcp_connection *conn ) {
/* Call the senddata() call back function */ /* Call the senddata() call back function */
conn->tcp_op->senddata ( conn, conn->tx_pkb->data, conn->tcp_op->senddata ( conn, conn->tx_pkb->data,
pkb_available ( conn->tx_pkb ) ); pkb_available ( conn->tx_pkb ) );
/* Send pure ACK if senddata() didn't call tcp_send() */
if ( conn->tx_pkb ) {
tcp_send ( conn, TCP_NOMSG, TCP_NOMSG_LEN );
}
return 0; return 0;
} }
@ -685,7 +686,8 @@ int tcp_send ( struct tcp_connection *conn, const void *data, size_t len ) {
/* Start the timer */ /* Start the timer */
if ( ( conn->tcp_state == TCP_ESTABLISHED && conn->tcp_lstate == TCP_SYN_SENT ) || if ( ( conn->tcp_state == TCP_ESTABLISHED && conn->tcp_lstate == TCP_SYN_SENT ) ||
( conn->tcp_state == TCP_LISTEN && conn->tcp_lstate == TCP_SYN_RCVD ) || ( conn->tcp_state == TCP_LISTEN && conn->tcp_lstate == TCP_SYN_RCVD ) ||
( conn->tcp_state == TCP_CLOSED && conn->tcp_lstate == TCP_SYN_RCVD ) ) { ( conn->tcp_state == TCP_CLOSED && conn->tcp_lstate == TCP_SYN_RCVD ) ||
( conn->tcp_state == TCP_ESTABLISHED && ( len == 0 ) ) ) {
// Don't start the timer // Don't start the timer
} else { } else {
start_timer ( &conn->timer ); start_timer ( &conn->timer );
@ -912,13 +914,10 @@ static int tcp_rx ( struct pk_buff *pkb,
ntohl ( tcphdr->seq ), conn->rcv_nxt ); ntohl ( tcphdr->seq ), conn->rcv_nxt );
} }
/* Send an ACK only if required to */ /* Acknowledge new data */
if ( conn->rcv_nxt <= ntohl ( tcphdr->seq ) ) { conn->tcp_flags |= TCP_ACK;
/* Acknowledge new data */ if ( !( tcphdr->flags & TCP_ACK ) ) {
conn->tcp_flags |= TCP_ACK; goto send_tcp_nomsg;
if ( !( tcphdr->flags & TCP_ACK ) ) {
goto send_tcp_nomsg;
}
} }
} }