alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2025-09-25 01:37:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(dhcps): Fixed DNS server handling for previous breaking changes

Browse Source
This commit is contained in:
Abhik Roy
2025-01-14 21:16:33 +11:00
committed by BOT
parent a5e37f8cdf
commit b25ea94c45
4 changed files with 174 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

106
components/lwip/apps/dhcpserver/dhcpserver.c
View File

@@ -196,6 +196,18 @@ static void get_ip_info(struct netif * netif, ip_info_t *ip_info)
}
}
static inline u8_t* dhcps_option_ip(u8_t *optptr, const ip4_addr_t *ip)
{
LWIP_ASSERT("dhcps_option_ip: optptr must not be NULL", (optptr != NULL));
LWIP_ASSERT("dhcps_option_ip: ip must not be NULL", (ip != NULL));
*optptr++ = ip4_addr1(ip);
*optptr++ = ip4_addr2(ip);
*optptr++ = ip4_addr3(ip);
*optptr++ = ip4_addr4(ip);
return optptr;
}
/******************************************************************************
* FunctionName : dhcps_option_info
* Description : get the DHCP message option info
@@ -411,10 +423,7 @@ static u8_t *add_offer_options(dhcps_t *dhcps, u8_t *optptr)
*optptr++ = DHCP_OPTION_SUBNET_MASK;
*optptr++ = 4;
*optptr++ = ip4_addr1(&dhcps->dhcps_mask);
*optptr++ = ip4_addr2(&dhcps->dhcps_mask);
*optptr++ = ip4_addr3(&dhcps->dhcps_mask);
*optptr++ = ip4_addr4(&dhcps->dhcps_mask);
optptr = dhcps_option_ip(optptr, &dhcps->dhcps_mask);
*optptr++ = DHCP_OPTION_LEASE_TIME;
*optptr++ = 4;
@@ -425,10 +434,7 @@ static u8_t *add_offer_options(dhcps_t *dhcps, u8_t *optptr)
*optptr++ = DHCP_OPTION_SERVER_ID;
*optptr++ = 4;
*optptr++ = ip4_addr1(&ipadd);
*optptr++ = ip4_addr2(&ipadd);
*optptr++ = ip4_addr3(&ipadd);
*optptr++ = ip4_addr4(&ipadd);
optptr = dhcps_option_ip(optptr, &ipadd);
if (dhcps_router_enabled(dhcps->dhcps_offer)) {
ip_info_t if_ip = { 0 };
@@ -439,10 +445,7 @@ static u8_t *add_offer_options(dhcps_t *dhcps, u8_t *optptr)
if (!ip4_addr_isany_val(*gw_ip)) {
*optptr++ = DHCP_OPTION_ROUTER;
*optptr++ = 4;
*optptr++ = ip4_addr1(gw_ip);
*optptr++ = ip4_addr2(gw_ip);
*optptr++ = ip4_addr3(gw_ip);
*optptr++ = ip4_addr4(gw_ip);
optptr = dhcps_option_ip(optptr, gw_ip);
}
}
@@ -456,35 +459,23 @@ static u8_t *add_offer_options(dhcps_t *dhcps, u8_t *optptr)
*optptr++ = DHCP_OPTION_DNS_SERVER;
*optptr++ = size;
*optptr++ = ip4_addr1(&dhcps->dns_server[DNS_TYPE_MAIN]);
*optptr++ = ip4_addr2(&dhcps->dns_server[DNS_TYPE_MAIN]);
*optptr++ = ip4_addr3(&dhcps->dns_server[DNS_TYPE_MAIN]);
*optptr++ = ip4_addr4(&dhcps->dns_server[DNS_TYPE_MAIN]);
optptr = dhcps_option_ip(optptr, &dhcps->dns_server[DNS_TYPE_MAIN]);
if (dhcps->dns_server[DNS_TYPE_BACKUP].addr) {
*optptr++ = ip4_addr1(&dhcps->dns_server[DNS_TYPE_BACKUP]);
*optptr++ = ip4_addr2(&dhcps->dns_server[DNS_TYPE_BACKUP]);
*optptr++ = ip4_addr3(&dhcps->dns_server[DNS_TYPE_BACKUP]);
*optptr++ = ip4_addr4(&dhcps->dns_server[DNS_TYPE_BACKUP]);
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++ = ip4_addr1(&ipadd);
*optptr++ = ip4_addr2(&ipadd);
*optptr++ = ip4_addr3(&ipadd);
*optptr++ = ip4_addr4(&ipadd);
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 };
*optptr++ = DHCP_OPTION_BROADCAST_ADDRESS;
*optptr++ = 4;
*optptr++ = ip4_addr1(&broadcast_addr);
*optptr++ = ip4_addr2(&broadcast_addr);
*optptr++ = ip4_addr3(&broadcast_addr);
*optptr++ = ip4_addr4(&broadcast_addr);
optptr = dhcps_option_ip(optptr, &broadcast_addr);
*optptr++ = DHCP_OPTION_INTERFACE_MTU;
*optptr++ = 2;
@@ -1537,17 +1528,22 @@ bool dhcp_search_ip_on_mac(dhcps_t *dhcps, u8_t *mac, ip4_addr_t *ip)
}
/******************************************************************************
* FunctionName : dhcps_dns_setserver
* Description : set DNS server address for dhcpserver
* FunctionName : dhcps_dns_setserver_by_type
* Description : Set the DNS server address for dhcpserver with a specific type
* Parameters : dnsserver -- The DNS server address
* type -- The DNS type
* Returns : ERR_ARG if invalid handle, ERR_OK on success
* Returns : ERR_ARG if invalid handle, ERR_VAL if invalid type, ERR_OK on success
*******************************************************************************/
err_t dhcps_dns_setserver(dhcps_t *dhcps, const ip_addr_t *dnsserver, dns_type_t type)
err_t dhcps_dns_setserver_by_type(dhcps_t *dhcps, const ip_addr_t *dnsserver, dns_type_t type)
{
if (dhcps == NULL) {
return ERR_ARG;
}
if (type >= DNS_TYPE_MAX) {
return ERR_VAL;
}
if (dnsserver != NULL) {
dhcps->dns_server[type] = *(ip_2_ip4(dnsserver));
} else {
@@ -1557,18 +1553,46 @@ err_t dhcps_dns_setserver(dhcps_t *dhcps, const ip_addr_t *dnsserver, dns_type_t
}
/******************************************************************************
* FunctionName : dhcps_dns_getserver
* Description : get DNS server address for dhcpserver
* FunctionName : dhcps_dns_setserver
* Description : Set the main DNS server address for dhcpserver
* Parameters : dnsserver -- The DNS server address
* Returns : ERR_ARG if invalid handle, ERR_VAL if invalid type, ERR_OK on success
*******************************************************************************/
err_t dhcps_dns_setserver(dhcps_t *dhcps, const ip_addr_t *dnsserver)
{
return dhcps_dns_setserver_by_type(dhcps, dnsserver, DNS_TYPE_MAIN);
}
/******************************************************************************
* FunctionName : dhcps_dns_getserver_by_type
* Description : Get the DNS server address for dhcpserver
* Parameters : dnsserver -- The DNS server address
* type -- The DNS type
* Returns : ERR_ARG if invalid handle, ERR_OK on success
* Returns : ERR_ARG if invalid handle, ERR_VAL if invalid type, ERR_OK on success
*******************************************************************************/
err_t dhcps_dns_getserver(dhcps_t *dhcps, ip4_addr_t *dnsserver, dns_type_t type)
err_t dhcps_dns_getserver_by_type(dhcps_t *dhcps, ip4_addr_t *dnsserver, dns_type_t type)
{
if (dhcps) {
*dnsserver = dhcps->dns_server[type];
return ERR_OK;
if ((dhcps == NULL) || (dnsserver == NULL)) {
return ERR_ARG;
}
return ERR_ARG;
if (type >= DNS_TYPE_MAX) {
return ERR_VAL;
}
*dnsserver = dhcps->dns_server[type];
return ERR_OK;
}
/******************************************************************************
* FunctionName : dhcps_dns_getserver_by_type
* Description : Get the main DNS server address for dhcpserver
* Parameters : dnsserver -- The DNS server address
* Returns : ERR_ARG if invalid handle, ERR_VAL if invalid type, ERR_OK on success
*******************************************************************************/
err_t dhcps_dns_getserver(dhcps_t *dhcps, ip4_addr_t *dnsserver)
{
return dhcps_dns_getserver_by_type(dhcps, dnsserver, DNS_TYPE_MAIN);
}
#endif // ESP_DHCPS