espressif/esp-lwip
1
0
Fork 0
mirror of https://github.com/espressif/esp-lwip.git synced 2026-09-16 06:00:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

napt: Fix ip_portmap_add() to keep only one port mapping

Browse Source
This commit is contained in:
LiPeng
2023-09-22 23:42:08 +10:00
committed by Abhik Roy
parent 7033e26f3a
commit d65ad241a2
3 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/ipv4/dhcp.c
-3
View File
@@ -390,9 +390,6 @@ dhcp_check(struct netif *netif)
static void static void
dhcp_handle_offer(struct netif *netif, struct dhcp_msg *msg_in) dhcp_handle_offer(struct netif *netif, struct dhcp_msg *msg_in)
{ {
#if ESP_DHCP && !ESP_DHCP_DISABLE_VENDOR_CLASS_IDENTIFIER
u8_t n;
#endif /* ESP_DHCP && !ESP_DHCP_DISABLE_VENDOR_CLASS_IDENTIFIER */
struct dhcp *dhcp = netif_dhcp_data(netif); struct dhcp *dhcp = netif_dhcp_data(netif);
LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE, ("dhcp_handle_offer(netif=%p) %c%c%"U16_F"\n", LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE, ("dhcp_handle_offer(netif=%p) %c%c%"U16_F"\n",
src/core/ipv4/ip4_napt.c
+21 -4
View File
@@ -176,17 +176,17 @@ static void
ip_napt_deinit(void) ip_napt_deinit(void)
{ {
napt_list = NO_IDX; napt_list = NO_IDX;
ip_napt_max = 0; ip_napt_max = 0;
#if IP_NAPT_PORTMAP #if IP_NAPT_PORTMAP
ip_portmap_max = 0; ip_portmap_max = 0;
#endif #endif
mem_free(ip_napt_table); mem_free(ip_napt_table);
ip_napt_table = NULL; ip_napt_table = NULL;
#if IP_NAPT_PORTMAP #if IP_NAPT_PORTMAP
mem_free(ip_portmap_table); mem_free(ip_portmap_table);
ip_portmap_table = NULL; ip_portmap_table = NULL;
#endif #endif
sys_untimeout(ip_napt_tmr, NULL); sys_untimeout(ip_napt_tmr, NULL);
} }
/** /**
@@ -196,7 +196,11 @@ ip_napt_table = NULL;
* @param max_portmap max number of enties in the NAPT table (use IP_PORTMAP_MAX if in doubt) * @param max_portmap max number of enties in the NAPT table (use IP_PORTMAP_MAX if in doubt)
*/ */
static void static void
#if IP_NAPT_PORTMAP
ip_napt_init(uint16_t max_nat, uint8_t max_portmap) ip_napt_init(uint16_t max_nat, uint8_t max_portmap)
#else
ip_napt_init(uint16_t max_nat)
#endif
{ {
u16_t i; u16_t i;
@@ -210,7 +214,7 @@ ip_napt_init(uint16_t max_nat, uint8_t max_portmap)
ip_napt_table = (struct ip_napt_entry *) mem_calloc(max_nat, sizeof(*ip_napt_table)); ip_napt_table = (struct ip_napt_entry *) mem_calloc(max_nat, sizeof(*ip_napt_table));
#if IP_NAPT_PORTMAP #if IP_NAPT_PORTMAP
ip_portmap_table = (struct ip_portmap_entry *) mem_calloc(max_portmap, sizeof(*ip_portmap_table)); ip_portmap_table = (struct ip_portmap_entry *) mem_calloc(max_portmap, sizeof(*ip_portmap_table));
assert(ip_portmap_table != NULL && ip_napt_table != NULL); assert(ip_portmap_table != NULL && ip_napt_table != NULL);
#else #else
assert(ip_napt_table != NULL); assert(ip_napt_table != NULL);
@@ -238,7 +242,11 @@ ip_napt_enable(u32_t addr, int enable)
} }
} }
if (napt_in_any_netif) { if (napt_in_any_netif) {
#if IP_NAPT_PORTMAP
ip_napt_init(IP_NAPT_MAX, IP_PORTMAP_MAX); ip_napt_init(IP_NAPT_MAX, IP_PORTMAP_MAX);
#else
ip_napt_init(IP_NAPT_MAX);
#endif
} else { } else {
ip_napt_deinit(); ip_napt_deinit();
} }
@@ -252,7 +260,11 @@ ip_napt_enable_no(u8_t number, int enable)
if (netif->num == number) { if (netif->num == number) {
netif->napt = !!enable; netif->napt = !!enable;
if (enable) if (enable)
#if IP_NAPT_PORTMAP
ip_napt_init(IP_NAPT_MAX, IP_PORTMAP_MAX); ip_napt_init(IP_NAPT_MAX, IP_PORTMAP_MAX);
#else
ip_napt_init(IP_NAPT_MAX);
#endif
else else
ip_napt_deinit(); ip_napt_deinit();
break; break;
@@ -272,7 +284,11 @@ ip_napt_enable_netif(struct netif *netif, int enable)
if (!netif->napt && enable) { if (!netif->napt && enable) {
/* Enable napt */ /* Enable napt */
netif->napt = 1; netif->napt = 1;
#if IP_NAPT_PORTMAP
ip_napt_init(IP_NAPT_MAX, IP_PORTMAP_MAX); ip_napt_init(IP_NAPT_MAX, IP_PORTMAP_MAX);
#else
ip_napt_init(IP_NAPT_MAX);
#endif
} else if (netif->napt && !enable) { } else if (netif->napt && !enable) {
/* Disable napt */ /* Disable napt */
@@ -611,6 +627,7 @@ ip_portmap_add(u8_t proto, u32_t maddr, u16_t mport, u32_t daddr, u16_t dport)
if (p->valid && p->proto == proto && p->mport == mport) { if (p->valid && p->proto == proto && p->mport == mport) {
p->dport = dport; p->dport = dport;
p->daddr = daddr; p->daddr = daddr;
p->maddr = maddr;
} else if (!p->valid) { } else if (!p->valid) {
p->maddr = maddr; p->maddr = maddr;
p->daddr = daddr; p->daddr = daddr;
test/unit/core/test_ip4_route.c
-1
View File
@@ -474,7 +474,6 @@ END_TEST
START_TEST(test_ip4_route_netif_max_napt) START_TEST(test_ip4_route_netif_max_napt)
{ {
#define TCP_PORT 2222 #define TCP_PORT 2222
int i;
packet_type_t packet_type = PACKET_PBUF_RAM; packet_type_t packet_type = PACKET_PBUF_RAM;
ip4_addr_t addr, src_addr, sta_addr; ip4_addr_t addr, src_addr, sta_addr;
ip4_addr_t netmask; ip4_addr_t netmask;