Mirrors/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-10-02 03:00:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

feat(lwip): Remove deprecated LWIP_DHCPS_ADD_DNS Kconfig option

Browse Source
This commit is contained in:
Abhik Roy
2025-09-29 21:26:01 +08:00
parent f3dedf6f62
commit d574382d7b
4 changed files with 67 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/lwip/apps/dhcpserver/dhcpserver.c
+11 -6
View File
@@ -468,27 +468,32 @@ static u8_t *add_offer_options(dhcps_t *dhcps, u8_t *optptr)
}
}
// In order of preference
if (dhcps_dns_enabled(dhcps->dhcps_dns)) {
uint8_t size = 4;
// Add DNS option if either main or backup DNS is set
if (dhcps_dns_enabled(dhcps->dhcps_dns) &&
(dhcps->dns_server[DNS_TYPE_MAIN].addr || dhcps->dns_server[DNS_TYPE_BACKUP].addr)) {
uint8_t size = 0;
if (dhcps->dns_server[DNS_TYPE_MAIN].addr) {
size += 4;
}
if (dhcps->dns_server[DNS_TYPE_BACKUP].addr) {
size += 4;
}
*optptr++ = DHCP_OPTION_DNS_SERVER;
*optptr++ = size;
optptr = dhcps_option_ip(optptr, &dhcps->dns_server[DNS_TYPE_MAIN]);
if (dhcps->dns_server[DNS_TYPE_MAIN].addr) {
optptr = dhcps_option_ip(optptr, &dhcps->dns_server[DNS_TYPE_MAIN]);
}
if (dhcps->dns_server[DNS_TYPE_BACKUP].addr) {
optptr = dhcps_option_ip(optptr, &dhcps->dns_server[DNS_TYPE_BACKUP]);
}
#ifdef CONFIG_LWIP_DHCPS_ADD_DNS
} else {
*optptr++ = DHCP_OPTION_DNS_SERVER;
*optptr++ = 4;
optptr = dhcps_option_ip(optptr, &ipadd);
#endif /* CONFIG_LWIP_DHCPS_ADD_DNS */
}
ip4_addr_t broadcast_addr = { .addr = (ipadd.addr & dhcps->dhcps_mask.addr) | ~dhcps->dhcps_mask.addr };