This is an automated email from the ASF dual-hosted git repository. xiaoxiang pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 4eddf84a76715fb0585bd3fd2fc1aff09bba6f0d Author: Zhe Weng <[email protected]> AuthorDate: Thu Apr 11 18:28:00 2024 +0800 net/nat: Optimize port selection And fix possibly dead loop. Signed-off-by: Zhe Weng <[email protected]> --- net/nat/nat.c | 54 ++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 34 insertions(+), 20 deletions(-) diff --git a/net/nat/nat.c b/net/nat/nat.c index a44f91b37b..edf3bd88a0 100644 --- a/net/nat/nat.c +++ b/net/nat/nat.c @@ -35,6 +35,22 @@ #ifdef CONFIG_NET_NAT +/**************************************************************************** + * Pre-processor Definitions + ****************************************************************************/ + +#define NEXT_PORT(nport, hport) \ + do \ + { \ + ++(hport); \ + if ((hport) >= CONFIG_NET_DEFAULT_MAX_PORT || \ + (hport) < CONFIG_NET_DEFAULT_MIN_PORT) \ + { \ + (hport) = CONFIG_NET_DEFAULT_MIN_PORT; \ + } \ + (nport) = HTONS(hport); \ + } while (0) + /**************************************************************************** * Private Functions ****************************************************************************/ @@ -50,7 +66,7 @@ * domain - The domain of the packet. * protocol - The L4 protocol of the packet. * ip - The IP bind with the port (in network byte order). - * portno - The local port (in network byte order), as reference. + * local_port - The local port (in network byte order), as reference. * * Returned Value: * port number on success; 0 on failure @@ -64,19 +80,19 @@ static uint16_t nat_port_select_without_stack( uint8_t domain, uint8_t protocol, FAR const union ip_addr_u *ip, - uint16_t portno) + uint16_t local_port) { + uint16_t portno = local_port; uint16_t hport = NTOHS(portno); while (nat_port_inuse(domain, protocol, ip, portno)) { - ++hport; - if (hport >= CONFIG_NET_DEFAULT_MAX_PORT || - hport < CONFIG_NET_DEFAULT_MIN_PORT) + NEXT_PORT(portno, hport); + if (portno == local_port) { - hport = CONFIG_NET_DEFAULT_MIN_PORT; - } + /* We have looped back, failed. */ - portno = HTONS(hport); + return 0; + } } return portno; @@ -292,14 +308,13 @@ uint16_t nat_port_select(FAR struct net_driver_s *dev, while (icmp_findconn(dev, id) || nat_port_inuse(domain, IP_PROTO_ICMP, external_ip, id)) { - ++hid; - if (hid >= CONFIG_NET_DEFAULT_MAX_PORT || - hid < CONFIG_NET_DEFAULT_MIN_PORT) + NEXT_PORT(id, hid); + if (id == local_port) { - hid = CONFIG_NET_DEFAULT_MIN_PORT; - } + /* We have looped back, failed. */ - id = HTONS(hid); + return 0; + } } return id; @@ -319,14 +334,13 @@ uint16_t nat_port_select(FAR struct net_driver_s *dev, while (icmpv6_active(id) || nat_port_inuse(domain, IP_PROTO_ICMP6, external_ip, id)) { - ++hid; - if (hid >= CONFIG_NET_DEFAULT_MAX_PORT || - hid < CONFIG_NET_DEFAULT_MIN_PORT) + NEXT_PORT(id, hid); + if (id == local_port) { - hid = CONFIG_NET_DEFAULT_MIN_PORT; - } + /* We have looped back, failed. */ - id = HTONS(hid); + return 0; + } } return id;
