Merge branch 'lwip/napt_portmap_seperation' into 'master'

lwip/napt: Added option to enable or disable Port mapping in NAPT. See merge request espressif/esp-idf!21643
espressif · Sep 20, 2023 · d057bac · d057bac
2 parents 5e4755a + 4940cfa
commit d057bac
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/components/lwip/Kconfig b/components/lwip/Kconfig
@@ -227,6 +227,13 @@ menu "LWIP"
         help
             Enabling this option allows Network Address and Port Translation.
 
+    config LWIP_IPV4_NAPT_PORTMAP
+        bool "Enable NAT Port Mapping (new/experimental)"
+        depends on LWIP_IPV4_NAPT
+        default y
+        help
+            Enabling this option allows Port Forwarding or Port mapping.
+
     config LWIP_STATS
         bool "Enable LWIP statistics"
         default n

diff --git a/components/lwip/lwip b/components/lwip/lwip
diff --git a/components/lwip/port/include/lwipopts.h b/components/lwip/port/include/lwipopts.h
@@ -216,6 +216,13 @@ extern "C" {
  */
 #ifdef CONFIG_LWIP_IPV4_NAPT
 #define IP_NAPT                         1
+
+#ifdef CONFIG_LWIP_IPV4_NAPT_PORTMAP
+#define IP_NAPT_PORTMAP                 1
+#else
+#define IP_NAPT_PORTMAP                 0
+#endif
+
 #else
 #define IP_NAPT                         0
 #endif
+37 −3		src/core/ipv4/ip4_napt.c
+1 −0		src/include/lwip/lwip_napt.h
+1 −0		test/unit/lwipopts.h