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

[tcp] Store local port in host byte order 

Every other scalar integer value in struct tcp_connection is in host
byte order; change the definition of local_port to match.

Signed-off-by: Michael Brown <mcb30@ipxe.org>
This commit is contained in:
Michael Brown 2010-07-13 17:15:57 +01:00
parent fd312fcc78
commit 43450342a9
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/net/tcp.c
View File

@ -37,7 +37,7 @@ struct tcp_connection {
/** Remote socket address */ /** Remote socket address */
struct sockaddr_tcpip peer; struct sockaddr_tcpip peer;
/** Local port, in network byte order */ /** Local port */
unsigned int local_port; unsigned int local_port;
/** Current TCP state */ /** Current TCP state */
@ -166,7 +166,7 @@ tcp_dump_flags ( struct tcp_connection *tcp, unsigned int flags ) {
* Bind TCP connection to local port * Bind TCP connection to local port
* *
* @v tcp TCP connection * @v tcp TCP connection
* @v port Local port number, in network-endian order * @v port Local port number
* @ret rc Return status code * @ret rc Return status code
* *
* If the port is 0, the connection is assigned an available port * If the port is 0, the connection is assigned an available port
@ -182,7 +182,7 @@ static int tcp_bind ( struct tcp_connection *tcp, unsigned int port ) {
try_port++; try_port++;
if ( try_port < 1024 ) if ( try_port < 1024 )
continue; continue;
if ( tcp_bind ( tcp, htons ( try_port ) ) == 0 ) if ( tcp_bind ( tcp, try_port ) == 0 )
return 0; return 0;
} }
DBGC ( tcp, "TCP %p could not bind: no free ports\n", tcp ); DBGC ( tcp, "TCP %p could not bind: no free ports\n", tcp );
@ -193,13 +193,13 @@ static int tcp_bind ( struct tcp_connection *tcp, unsigned int port ) {
list_for_each_entry ( existing, &tcp_conns, list ) { list_for_each_entry ( existing, &tcp_conns, list ) {
if ( existing->local_port == port ) { if ( existing->local_port == port ) {
DBGC ( tcp, "TCP %p could not bind: port %d in use\n", DBGC ( tcp, "TCP %p could not bind: port %d in use\n",
tcp, ntohs ( port ) ); tcp, port );
return -EADDRINUSE; return -EADDRINUSE;
} }
} }
tcp->local_port = port; tcp->local_port = port;
DBGC ( tcp, "TCP %p bound to port %d\n", tcp, ntohs ( port ) ); DBGC ( tcp, "TCP %p bound to port %d\n", tcp, port );
return 0; return 0;
} }
@ -235,7 +235,7 @@ static int tcp_open ( struct interface *xfer, struct sockaddr *peer,
memcpy ( &tcp->peer, st_peer, sizeof ( tcp->peer ) ); memcpy ( &tcp->peer, st_peer, sizeof ( tcp->peer ) );
/* Bind to local port */ /* Bind to local port */
bind_port = ( st_local ? st_local->st_port : 0 ); bind_port = ( st_local ? ntohs ( st_local->st_port ) : 0 );
if ( ( rc = tcp_bind ( tcp, bind_port ) ) != 0 ) if ( ( rc = tcp_bind ( tcp, bind_port ) ) != 0 )
goto err; goto err;
@ -480,7 +480,7 @@ static int tcp_xmit ( struct tcp_connection *tcp, int force_send ) {
flags |= TCP_PSH; flags |= TCP_PSH;
tcphdr = iob_push ( iobuf, sizeof ( *tcphdr ) ); tcphdr = iob_push ( iobuf, sizeof ( *tcphdr ) );
memset ( tcphdr, 0, sizeof ( *tcphdr ) ); memset ( tcphdr, 0, sizeof ( *tcphdr ) );
tcphdr->src = tcp->local_port; tcphdr->src = htons ( tcp->local_port );
tcphdr->dest = tcp->peer.st_port; tcphdr->dest = tcp->peer.st_port;
tcphdr->seq = htonl ( tcp->snd_seq ); tcphdr->seq = htonl ( tcp->snd_seq );
tcphdr->ack = htonl ( tcp->rcv_ack ); tcphdr->ack = htonl ( tcp->rcv_ack );
@ -612,7 +612,7 @@ static int tcp_xmit_reset ( struct tcp_connection *tcp,
/** /**
* Identify TCP connection by local port number * Identify TCP connection by local port number
* *
* @v local_port Local port (in network-endian order) * @v local_port Local port
* @ret tcp TCP connection, or NULL * @ret tcp TCP connection, or NULL
*/ */
static struct tcp_connection * tcp_demux ( unsigned int local_port ) { static struct tcp_connection * tcp_demux ( unsigned int local_port ) {
@ -935,7 +935,7 @@ static int tcp_rx ( struct io_buffer *iobuf,
} }
/* Parse parameters from header and strip header */ /* Parse parameters from header and strip header */
tcp = tcp_demux ( tcphdr->dest ); tcp = tcp_demux ( ntohs ( tcphdr->dest ) );
start_seq = seq = ntohl ( tcphdr->seq ); start_seq = seq = ntohl ( tcphdr->seq );
ack = ntohl ( tcphdr->ack ); ack = ntohl ( tcphdr->ack );
win = ntohs ( tcphdr->win ); win = ntohs ( tcphdr->win );