Merge branch 'bugfix/fix_cplusplus_miss_in_dhcp_v4.2' into 'release/v4.2'

dhcpserver: support cplusplus (backport v4.2)

See merge request espressif/esp-idf!15447

components/lwip/include/apps/dhcpserver/dhcpserver.h

@@ -17,6 +17,10 @@
 #include "sdkconfig.h"
 #include "lwip/ip_addr.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef struct dhcps_state{
         s16_t state;
 } dhcps_state;
@@ -91,5 +95,8 @@ void dhcps_dns_setserver(const ip_addr_t *dnsserver);
 ip4_addr_t dhcps_dns_getserver(void);
 void dhcps_set_new_lease_cb(dhcps_cb_t cb);
 
+#ifdef __cplusplus
+}
 #endif
 
+#endif /* __DHCPS_H__ */

components/lwip/include/apps/dhcpserver/dhcpserver_options.h

@@ -13,6 +13,9 @@
 // limitations under the License.
 #pragma once
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 /** DHCP Options
 
     This macros are not part of the public dhcpserver.h interface.
@@ -132,3 +135,7 @@ typedef enum
     DOMAIN_SEARCH = 119,
     CLASSLESS_ROUTE = 121,
 } dhcp_msg_option;
+
+#ifdef __cplusplus
+}
+#endif

tools/ci/check_public_headers_exceptions.txt

@@ -26,9 +26,6 @@ components/esp32/include/esp32/cache_err_int.h
 components/driver/include/driver/sdmmc_defs.h
 components/driver/include/driver/sdmmc_types.h
 
-components/lwip/include/apps/dhcpserver/dhcpserver_options.h
-components/lwip/include/apps/dhcpserver/dhcpserver.h
-
 components/lwip/lwip/src/include/lwip/priv/memp_std.h
 components/lwip/port/esp32/include/arch/cc.h
 components/lwip/port/esp32/include/debug/lwip_debug.h