alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-11 04:57:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://gitlab.espressif.cn:27227/idf/esp-idf into feature/btdm_bluedroid

Browse Source
This commit is contained in:
Tian Hao
2016-11-30 19:08:40 +08:00
parent a8dd1dfcf2 59f3684dee
commit ba96c0d2e9
3 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/esp32/lib

Submodule components/esp32/lib updated: b01f9683da...2559c73c2c

2
components/lwip/Kconfig
View File

@@ -19,7 +19,7 @@ config L2_TO_L3_COPY
config LWIP_MAX_SOCKETS config LWIP_MAX_SOCKETS
int "Max number of open sockets" int "Max number of open sockets"
range 1 16 range 1 16
default 4 default 10
help help
Sockets take up a certain amount of memory, and allowing fewer Sockets take up a certain amount of memory, and allowing fewer
sockets to be open at the same time conserves memory. Specify sockets to be open at the same time conserves memory. Specify

2
components/tcpip_adapter/tcpip_adapter_lwip.c
View File

@@ -393,6 +393,7 @@ esp_err_t tcpip_adapter_dhcps_option(tcpip_adapter_option_mode_t opt_op, tcpip_a
uint32_t end_ip = 0; uint32_t end_ip = 0;
dhcps_lease_t *poll = opt_val; dhcps_lease_t *poll = opt_val;
if (poll->enable){
memset(&info, 0x00, sizeof(tcpip_adapter_ip_info_t)); memset(&info, 0x00, sizeof(tcpip_adapter_ip_info_t));
tcpip_adapter_get_ip_info(WIFI_IF_AP, &info); tcpip_adapter_get_ip_info(WIFI_IF_AP, &info);
softap_ip = htonl(info.ip.addr); softap_ip = htonl(info.ip.addr);
@@ -413,6 +414,7 @@ esp_err_t tcpip_adapter_dhcps_option(tcpip_adapter_option_mode_t opt_op, tcpip_a
if (end_ip - start_ip > DHCPS_MAX_LEASE) { if (end_ip - start_ip > DHCPS_MAX_LEASE) {
return ESP_ERR_TCPIP_ADAPTER_INVALID_PARAMS; return ESP_ERR_TCPIP_ADAPTER_INVALID_PARAMS;
} }
}
memcpy(opt_info, opt_val, opt_len); memcpy(opt_info, opt_val, opt_len);
break; break;