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

[tcp] Merge boolean flags into a single "flags" field 

Signed-off-by: Michael Brown <mcb30@ipxe.org>
This commit is contained in:
Michael Brown 2010-07-15 19:15:36 +01:00
parent c57e26381c
commit 75505942ac
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/net/tcp.c
View File

@ -30,10 +30,11 @@ struct tcp_connection {
/** List of TCP connections */ /** List of TCP connections */
struct list_head list; struct list_head list;
/** Flags */
unsigned int flags;
/** Data transfer interface */ /** Data transfer interface */
struct interface xfer; struct interface xfer;
/** Data transfer interface closed flag */
int xfer_closed;
/** Remote socket address */ /** Remote socket address */
struct sockaddr_tcpip peer; struct sockaddr_tcpip peer;
@ -77,8 +78,6 @@ struct tcp_connection {
* Equivalent to TS.Recent in RFC 1323 terminology. * Equivalent to TS.Recent in RFC 1323 terminology.
*/ */
uint32_t ts_recent; uint32_t ts_recent;
/** Timestamps enabled */
int timestamps;
/** Transmit queue */ /** Transmit queue */
struct list_head queue; struct list_head queue;
@ -88,6 +87,14 @@ struct tcp_connection {
struct retry_timer wait; struct retry_timer wait;
}; };
/** TCP flags */
enum tcp_flags {
/** TCP data transfer interface has been closed */
TCP_XFER_CLOSED = 0x0001,
/** TCP timestamps are enabled */
TCP_TS_ENABLED = 0x0002,
};
/** /**
* List of registered TCP connections * List of registered TCP connections
*/ */
@ -275,7 +282,7 @@ static void tcp_close ( struct tcp_connection *tcp, int rc ) {
/* Close data transfer interface */ /* Close data transfer interface */
intf_shutdown ( &tcp->xfer, rc ); intf_shutdown ( &tcp->xfer, rc );
tcp->xfer_closed = 1; tcp->flags |= TCP_XFER_CLOSED;
/* If we are in CLOSED, or have otherwise not yet received a /* If we are in CLOSED, or have otherwise not yet received a
* SYN (i.e. we are in LISTEN or SYN_SENT), just delete the * SYN (i.e. we are in LISTEN or SYN_SENT), just delete the
@ -474,7 +481,7 @@ static int tcp_xmit ( struct tcp_connection *tcp, int force_send ) {
mssopt->length = sizeof ( *mssopt ); mssopt->length = sizeof ( *mssopt );
mssopt->mss = htons ( TCP_MSS ); mssopt->mss = htons ( TCP_MSS );
} }
if ( ( flags & TCP_SYN ) || tcp->timestamps ) { if ( ( flags & TCP_SYN ) || ( tcp->flags & TCP_TS_ENABLED ) ) {
tsopt = iob_push ( iobuf, sizeof ( *tsopt ) ); tsopt = iob_push ( iobuf, sizeof ( *tsopt ) );
memset ( tsopt->nop, TCP_OPTION_NOP, sizeof ( tsopt->nop ) ); memset ( tsopt->nop, TCP_OPTION_NOP, sizeof ( tsopt->nop ) );
tsopt->tsopt.kind = TCP_OPTION_TS; tsopt->tsopt.kind = TCP_OPTION_TS;
@ -719,7 +726,7 @@ static int tcp_rx_syn ( struct tcp_connection *tcp, uint32_t seq,
if ( ! ( tcp->tcp_state & TCP_STATE_RCVD ( TCP_SYN ) ) ) { if ( ! ( tcp->tcp_state & TCP_STATE_RCVD ( TCP_SYN ) ) ) {
tcp->rcv_ack = seq; tcp->rcv_ack = seq;
if ( options->tsopt ) if ( options->tsopt )
tcp->timestamps = 1; tcp->flags |= TCP_TS_ENABLED;
} }
/* Ignore duplicate SYN */ /* Ignore duplicate SYN */
@ -801,7 +808,7 @@ static int tcp_rx_ack ( struct tcp_connection *tcp, uint32_t ack,
tcp->tcp_state |= TCP_STATE_ACKED ( acked_flags ); tcp->tcp_state |= TCP_STATE_ACKED ( acked_flags );
/* Start sending FIN if we've had all possible data ACKed */ /* Start sending FIN if we've had all possible data ACKed */
if ( list_empty ( &tcp->queue ) && tcp->xfer_closed ) if ( list_empty ( &tcp->queue ) && ( tcp->flags & TCP_XFER_CLOSED ) )
tcp->tcp_state |= TCP_STATE_SENT ( TCP_FIN ); tcp->tcp_state |= TCP_STATE_SENT ( TCP_FIN );
return 0; return 0;