From f9d2d63e75cacb6a170f2674ab31ce626303439a Mon Sep 17 00:00:00 2001 From: liuhan Date: Tue, 29 Nov 2016 16:25:17 +0800 Subject: [PATCH 1/5] lwip: update open socket number. modify default number from 4 to 10 --- components/lwip/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/lwip/Kconfig b/components/lwip/Kconfig index bf7bff15b4..2e7e31a8a9 100644 --- a/components/lwip/Kconfig +++ b/components/lwip/Kconfig @@ -19,7 +19,7 @@ config L2_TO_L3_COPY config LWIP_MAX_SOCKETS int "Max number of open sockets" range 1 16 - default 4 + default 10 help Sockets take up a certain amount of memory, and allowing fewer sockets to be open at the same time conserves memory. Specify From d2c61cae8c8820a873a5f10d29a40c762b5c6a95 Mon Sep 17 00:00:00 2001 From: Liu Zhi Fu Date: Tue, 29 Nov 2016 15:30:31 +0800 Subject: [PATCH 2/5] esp32: update wifi lib 1. update phy to version 258 to fix wifi upgrade cause wifi connect fail issue 2. update fix_printf.sh 3. fb5a2b07 - default set ps type to WIFI_PS_NONE --- components/esp32/lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/esp32/lib b/components/esp32/lib index 8fd09dcc55..b01f9683da 160000 --- a/components/esp32/lib +++ b/components/esp32/lib @@ -1 +1 @@ -Subproject commit 8fd09dcc550f66385edaa19097df66d6048979b5 +Subproject commit b01f9683daa05bf6cc8ad382787000e4af87263b From 72453e3e6b0738e2ff1b393d4e97c81724745346 Mon Sep 17 00:00:00 2001 From: Liu Zhi Fu Date: Wed, 30 Nov 2016 14:20:05 +0800 Subject: [PATCH 3/5] esp32: update wifi lib to fix tw8868 In AP bridge mode, the length of the forwarded data is wrong, it's 26Btyes longer, thus cuase AP can't forward the data of which length is more than 1460. This modification is to make the data length right. --- components/esp32/lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/esp32/lib b/components/esp32/lib index b01f9683da..7912098045 160000 --- a/components/esp32/lib +++ b/components/esp32/lib @@ -1 +1 @@ -Subproject commit b01f9683daa05bf6cc8ad382787000e4af87263b +Subproject commit 7912098045cb1de0d7182d8290bd22a9de64ecdb From 7114f933bb04326ef46115e9159cd5c0dc9581ff Mon Sep 17 00:00:00 2001 From: liuhan Date: Wed, 30 Nov 2016 15:24:49 +0800 Subject: [PATCH 4/5] tcpip_adapter: fix bug 7462 modify the code execution condition --- components/tcpip_adapter/tcpip_adapter_lwip.c | 38 ++++++++++--------- 1 file changed, 20 insertions(+), 18 deletions(-) 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; + + 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); - 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 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; + } - /*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 (end_ip - start_ip > DHCPS_MAX_LEASE) { + return ESP_ERR_TCPIP_ADAPTER_INVALID_PARAMS; + } + } memcpy(opt_info, opt_val, opt_len); break; From 144a1567e3a8b218ed01ef006e56c1d75714cc95 Mon Sep 17 00:00:00 2001 From: Liu Zhi Fu Date: Wed, 30 Nov 2016 17:34:19 +0800 Subject: [PATCH 5/5] esp32: change wap2 enterprise encrypt type to 5 1. b332f3b5 - change wap2 enterprise encrypt type to 5 2. modify the print info of station state transmition --- components/esp32/lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/esp32/lib b/components/esp32/lib index 7912098045..2559c73c2c 160000 --- a/components/esp32/lib +++ b/components/esp32/lib @@ -1 +1 @@ -Subproject commit 7912098045cb1de0d7182d8290bd22a9de64ecdb +Subproject commit 2559c73c2c9c5794b08499f3a559b65b54707d7d