From: liuhan <liuhan@espressif.com>
Date: Wed, 30 Nov 2016 07:24:49 +0000 (+0800)
Subject: tcpip_adapter: fix bug 7462
X-Git-Tag: v1.0~9^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7114f933bb04326ef46115e9159cd5c0dc9581ff;p=esp-idf

tcpip_adapter: fix bug 7462

modify the code execution condition
---

diff --git a/components/tcpip_adapter/tcpip_adapter_lwip.c b/components/tcpip_adapter/tcpip_adapter_lwip.c
index 25c801bd01..d9fda81d84 100644
--- a/components/tcpip_adapter/tcpip_adapter_lwip.c
+++ b/components/tcpip_adapter/tcpip_adapter_lwip.c
@@ -392,27 +392,29 @@ esp_err_t tcpip_adapter_dhcps_option(tcpip_adapter_option_mode_t opt_op, tcpip_a
                 uint32_t start_ip = 0;
                 uint32_t end_ip = 0;
                 dhcps_lease_t *poll = opt_val;
-
-                memset(&info, 0x00, sizeof(tcpip_adapter_ip_info_t));
-                tcpip_adapter_get_ip_info(WIFI_IF_AP, &info);
-                softap_ip = htonl(info.ip.addr);
-                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))
-                       return ESP_ERR_TCPIP_ADAPTER_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)) {
-                       return ESP_ERR_TCPIP_ADAPTER_INVALID_PARAMS;
-                }
-
-                if (end_ip - start_ip > DHCPS_MAX_LEASE) {
-                       return ESP_ERR_TCPIP_ADAPTER_INVALID_PARAMS;
-                }
+                
+		if (poll->enable){
+                    memset(&info, 0x00, sizeof(tcpip_adapter_ip_info_t));
+                    tcpip_adapter_get_ip_info(WIFI_IF_AP, &info);
+                    softap_ip = htonl(info.ip.addr);
+                    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))
+                        return ESP_ERR_TCPIP_ADAPTER_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)) {
+                           return ESP_ERR_TCPIP_ADAPTER_INVALID_PARAMS;
+                    }
+
+                    if (end_ip - start_ip > DHCPS_MAX_LEASE) {
+                        return ESP_ERR_TCPIP_ADAPTER_INVALID_PARAMS;
+                    }
+		}
 
                 memcpy(opt_info, opt_val, opt_len);
                 break;