Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-07 09:18:00 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

net/tcp: correct the port byte order

Browse Source 
1. correct the port byte order
2. Do not re-select the port if the local port has been bind()

Change-Id: Ia83f7d1aab5c2c0007eb4141fcdaa9ccaea3d319
Signed-off-by: chao.an <anchao@xiaomi.com>
This commit is contained in:
chao.an
2021-03-04 14:03:09 +08:00
committed by chao an
parent c2707b2886
commit 19947e0414
1 changed files with 40 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net/tcp/tcp_conn.c
+40 -32
View File
@@ -257,7 +257,8 @@ static FAR struct tcp_conn_s *
*
****************************************************************************/
static int tcp_selectport(uint8_t domain, FAR const union ip_addr_u *ipaddr,
static int tcp_selectport(uint8_t domain,
FAR const union ip_addr_u *ipaddr,
uint16_t portno)
{
static uint16_t g_last_tcp_port;
@@ -285,19 +286,19 @@ static int tcp_selectport(uint8_t domain, FAR const union ip_addr_u *ipaddr,
do
{
/* Guess that the next available port number will be the one after
* the last port number assigned.
* the last port number assigned. Make sure that the port number
* is within range.
*/
portno = ++g_last_tcp_port;
/* Make sure that the port number is within range */
if (g_last_tcp_port >= 32000)
if (++g_last_tcp_port >= 32000)
{
g_last_tcp_port = 4096;
}
portno = htons(g_last_tcp_port);
}
while (tcp_listener(domain, ipaddr, htons(g_last_tcp_port)));
while (tcp_listener(domain, ipaddr, portno));
}
else
{
@@ -1141,42 +1142,49 @@ int tcp_connect(FAR struct tcp_conn_s *conn, FAR const struct sockaddr *addr)
net_lock();
/* Check if the local port has been bind() */
port = conn->lport;
if (port == 0)
{
#ifdef CONFIG_NET_IPv4
#ifdef CONFIG_NET_IPv6
if (conn->domain == PF_INET)
if (conn->domain == PF_INET)
#endif
{
/* Select a port that is unique for this IPv4 local address (host
* order).
*/
{
/* Select a port that is unique for this IPv4 local address (host
* order).
*/
port = tcp_selectport(PF_INET,
(FAR const union ip_addr_u *)&conn->u.ipv4.laddr,
ntohs(conn->lport));
}
port = tcp_selectport(PF_INET,
(FAR const union ip_addr_u *)
&conn->u.ipv4.laddr, 0);
}
#endif /* CONFIG_NET_IPv4 */
#ifdef CONFIG_NET_IPv6
#ifdef CONFIG_NET_IPv4
else
else
#endif
{
/* Select a port that is unique for this IPv6 local address (host
* order).
*/
{
/* Select a port that is unique for this IPv6 local address (host
* order).
*/
port = tcp_selectport(PF_INET6,
(FAR const union ip_addr_u *)conn->u.ipv6.laddr,
ntohs(conn->lport));
}
port = tcp_selectport(PF_INET6,
(FAR const union ip_addr_u *)
conn->u.ipv6.laddr, 0);
}
#endif /* CONFIG_NET_IPv6 */
/* Did we have a port assignment? */
/* Did we have a port assignment? */
if (port < 0)
{
ret = port;
goto errout_with_lock;
if (port < 0)
{
ret = port;
goto errout_with_lock;
}
}
/* Set up the local address (laddr) and the remote address (raddr) that
@@ -1295,7 +1303,7 @@ int tcp_connect(FAR struct tcp_conn_s *conn, FAR const struct sockaddr *addr)
conn->rto = TCP_RTO;
conn->sa = 0;
conn->sv = 16; /* Initial value of the RTT variance. */
conn->lport = htons((uint16_t)port);
conn->lport = (uint16_t)port;
#ifdef CONFIG_NET_TCP_WRITE_BUFFERS
conn->expired = 0;
conn->isn = 0;