From 0a1282bd246da5944286c690bd3b2a4340695973 Mon Sep 17 00:00:00 2001 From: xueyunfei Date: Tue, 21 Nov 2023 11:18:43 +0800 Subject: [PATCH 1/2] fix(dhcp server):fix set dhcp server poll fail issue --- components/esp_netif/lwip/esp_netif_lwip.c | 26 ++++++++++++++------ components/lwip/apps/dhcpserver/dhcpserver.c | 3 ++- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/components/esp_netif/lwip/esp_netif_lwip.c b/components/esp_netif/lwip/esp_netif_lwip.c index 825b4368d2..7f13e804a8 100644 --- a/components/esp_netif/lwip/esp_netif_lwip.c +++ b/components/esp_netif/lwip/esp_netif_lwip.c @@ -1936,32 +1936,42 @@ esp_err_t esp_netif_dhcps_option_api(esp_netif_api_msg_t *msg) } case REQUESTED_IP_ADDRESS: { esp_netif_ip_info_t info; - uint32_t softap_ip = 0; + uint32_t server_ip = 0; uint32_t start_ip = 0; uint32_t end_ip = 0; - dhcps_lease_t *poll = opt->val; + uint32_t range_start_ip = 0; + uint32_t range_end_ip = 0; + dhcps_lease_t *poll = opt_val; if (poll->enable) { memset(&info, 0x00, sizeof(esp_netif_ip_info_t)); esp_netif_get_ip_info(esp_netif, &info); - softap_ip = htonl(info.ip.addr); + server_ip = htonl(info.ip.addr); + range_start_ip = server_ip & htonl(info.netmask.addr); + range_end_ip = range_start_ip | ~htonl(info.netmask.addr); + if (server_ip == range_start_ip || server_ip == range_end_ip) { + return ESP_ERR_ESP_NETIF_INVALID_PARAMS; + } start_ip = htonl(poll->start_ip.addr); end_ip = htonl(poll->end_ip.addr); /*config ip information can't contain local ip*/ - if ((start_ip <= softap_ip) && (softap_ip <= end_ip)) { + if ((server_ip >= start_ip) && (server_ip <= end_ip)) { return ESP_ERR_ESP_NETIF_INVALID_PARAMS; } /*config ip information must be in the same segment as the local ip*/ - softap_ip >>= 8; - if ((start_ip >> 8 != softap_ip) - || (end_ip >> 8 != softap_ip)) { + if (start_ip <= range_start_ip || start_ip >= range_end_ip) { return ESP_ERR_ESP_NETIF_INVALID_PARAMS; } - if (end_ip - start_ip > DHCPS_MAX_LEASE) { + if (end_ip <= range_start_ip || end_ip >= range_end_ip) { + return ESP_ERR_ESP_NETIF_INVALID_PARAMS; + } + + /*The number of configured ip is less than DHCPS_MAX_LEASE*/ + if ((end_ip - start_ip + 1 > DHCPS_MAX_LEASE) || (start_ip >= end_ip)) { return ESP_ERR_ESP_NETIF_INVALID_PARAMS; } } diff --git a/components/lwip/apps/dhcpserver/dhcpserver.c b/components/lwip/apps/dhcpserver/dhcpserver.c index bb64992ea5..a7ff7fcfaa 100644 --- a/components/lwip/apps/dhcpserver/dhcpserver.c +++ b/components/lwip/apps/dhcpserver/dhcpserver.c @@ -1116,7 +1116,7 @@ static void dhcps_poll_set(u32_t ip) end_ip = htonl(dhcps_poll.end_ip.addr); /*config ip information can't contain local ip*/ - if ((start_ip <= server_ip) && (server_ip <= end_ip)) { + if ((server_ip >= start_ip) && (server_ip <= end_ip)) { dhcps_poll.enable = false; } else { /*config ip information must be in the same segment as the local ip*/ @@ -1148,6 +1148,7 @@ static void dhcps_poll_set(u32_t ip) dhcps_poll.end_ip.addr = range_end_ip; dhcps_poll.start_ip.addr = htonl(dhcps_poll.start_ip.addr); dhcps_poll.end_ip.addr = htonl(dhcps_poll.end_ip.addr); + dhcps_poll.enable = true; } } From 1ac20fb4ac7673591665bccc2d285f93ee2e98c7 Mon Sep 17 00:00:00 2001 From: xueyunfei Date: Fri, 10 Nov 2023 11:19:41 +0800 Subject: [PATCH 2/2] Fix(dhcps):fix dhcp subnet option api dos not work issue --- components/esp_netif/lwip/esp_netif_lwip.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/components/esp_netif/lwip/esp_netif_lwip.c b/components/esp_netif/lwip/esp_netif_lwip.c index 7f13e804a8..d125eb98ae 100644 --- a/components/esp_netif/lwip/esp_netif_lwip.c +++ b/components/esp_netif/lwip/esp_netif_lwip.c @@ -1931,6 +1931,23 @@ esp_err_t esp_netif_dhcps_option_api(esp_netif_api_msg_t *msg) break; } case ESP_NETIF_SUBNET_MASK: { + esp_netif_ip_info_t *default_ip = esp_netif->ip_info; + ip4_addr_t *config_netmask = (ip4_addr_t *)opt->val; + if (!memcmp(&default_ip->netmask, config_netmask, sizeof(struct ip4_addr))) { + ESP_LOGE(TAG, "Please use esp_netif_set_ip_info interface to configure subnet mask"); + /* + * This API directly changes the subnet mask of dhcp server + * but the subnet mask of the network interface has not changed + * If you need to change the subnet mask of dhcp server + * you need to change the subnet mask of the network interface first. + * If the subnet mask of dhcp server is changed + * and the subnet mask of network interface is inconsistent + * with the subnet mask of dhcp sever, it may lead to the failure of sending packets. + * If want to configure the subnet mask of dhcp server + * please use esp_netif_set_ip_info to change the subnet mask of network interface first. + */ + return ESP_ERR_ESP_NETIF_INVALID_PARAMS; + } memcpy(opt_info, opt->val, opt->len); break; } @@ -1941,7 +1958,7 @@ esp_err_t esp_netif_dhcps_option_api(esp_netif_api_msg_t *msg) uint32_t end_ip = 0; uint32_t range_start_ip = 0; uint32_t range_end_ip = 0; - dhcps_lease_t *poll = opt_val; + dhcps_lease_t *poll = opt->val; if (poll->enable) { memset(&info, 0x00, sizeof(esp_netif_ip_info_t));