espressif/ESP8266_RTOS_SDK
1
0
Fork 0
mirror of https://github.com/espressif/ESP8266_RTOS_SDK.git synced 2025-07-15 08:32:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/modify_tcpip_adapter_accordiing_to_lwip_2_0_3' into 'feature/update_lwip'

Browse Source 
feat(tcpip_adapter): Change ip_addr/ip_addr_t to ip4_addr/ip4_addr_t

See merge request sdk/ESP8266_RTOS_SDK!106
This commit is contained in:
Wu Jian Gang
2018-05-02 16:47:20 +08:00
parent a5146ec3a2 71a216dbc4
commit 0c5ad1c701
1 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
components/tcpip_adapter/tcpip_adapter_wifi.c
View File

@ -15,6 +15,8 @@
#include "lwip/netif.h" #include "lwip/netif.h"
#include "lwip/tcpip.h" #include "lwip/tcpip.h"
#include "lwip/dhcp.h" #include "lwip/dhcp.h"
#include "lwip/errno.h"
#include "lwip/prot/dhcp.h"
#include "netif/etharp.h" #include "netif/etharp.h"
#include "esp_wifi.h" #include "esp_wifi.h"
#include "esp_timer.h" #include "esp_timer.h"
@ -32,10 +34,11 @@ struct tcpip_adapter_pbuf {
struct netif *netif; struct netif *netif;
}; };
u32_t LwipTimOutLim = 0; // For light sleep. time out. limit is 3000ms
/* Avoid warning. No header file has include these function */ /* Avoid warning. No header file has include these function */
err_t ethernetif_init(struct netif* netif); err_t ethernetif_init(struct netif* netif);
void system_station_got_ip_set(); void system_station_got_ip_set();
void netif_create_ip4_linklocal_address(struct netif* netif);
static os_timer_t* get_ip_timer; static os_timer_t* get_ip_timer;
static uint8_t dhcp_fail_time; static uint8_t dhcp_fail_time;
@ -57,20 +60,22 @@ void esp_wifi_station_dhcpc_event(uint8_t netif_index)
static void tcpip_adapter_dhcpc_done() static void tcpip_adapter_dhcpc_done()
{ {
#define DHCP_BOUND 10 struct dhcp *clientdhcp = netif_dhcp_data(esp_netif[TCPIP_ADAPTER_IF_STA]) ;
os_timer_disarm(get_ip_timer); os_timer_disarm(get_ip_timer);
if (esp_netif[TCPIP_ADAPTER_IF_STA]->dhcp->state == DHCP_BOUND) { if (clientdhcp->state == DHCP_STATE_BOUND) {
/*send event here*/ /*send event here*/
system_station_got_ip_set(); system_station_got_ip_set();
printf("ip:" IPSTR ",mask:" IPSTR ",gw:" IPSTR "\n", IP2STR(&(esp_netif[0]->ip_addr)), printf("ip:" IPSTR ",mask:" IPSTR ",gw:" IPSTR "\n", IP2STR(&(esp_netif[0]->ip_addr.u_addr.ip4)),
IP2STR(&(esp_netif[0]->netmask)), IP2STR(&(esp_netif[0]->gw))); IP2STR(&(esp_netif[0]->netmask.u_addr.ip4)), IP2STR(&(esp_netif[0]->gw.u_addr.ip4)));
} else if (dhcp_fail_time < 30) { } else if (dhcp_fail_time < 100) {
TCPIP_ATAPTER_LOG("dhcpc time(ms): %d\n", dhcp_fail_time * 200); TCPIP_ATAPTER_LOG("dhcpc time(ms): %d\n", dhcp_fail_time * 200);
dhcp_fail_time ++; dhcp_fail_time ++;
os_timer_setfn(get_ip_timer, tcpip_adapter_dhcpc_done, NULL); os_timer_setfn(get_ip_timer, tcpip_adapter_dhcpc_done, NULL);
os_timer_arm(get_ip_timer, 200, 1); os_timer_arm(get_ip_timer, 200, 1);
} else { } else {
wifi_station_dhcpc_event();
TCPIP_ATAPTER_LOG("ERROR dhcp get ip error\n"); TCPIP_ATAPTER_LOG("ERROR dhcp get ip error\n");
free(get_ip_timer); free(get_ip_timer);
} }
@ -208,7 +213,6 @@ void tcpip_adapter_start(uint8_t netif_index, bool authed)
netif_add(esp_netif[netif_index], NULL, NULL, NULL, (void *)s, ethernetif_init, tcpip_input); netif_add(esp_netif[netif_index], NULL, NULL, NULL, (void *)s, ethernetif_init, tcpip_input);
} }
} else { } else {
if ((esp_netif[netif_index]->flags & NETIF_FLAG_DHCP) == 0) {
if (dhcpc_flag) { if (dhcpc_flag) {
printf("dhcp client start...\n"); printf("dhcp client start...\n");
tcpip_adapter_station_dhcp_start(); tcpip_adapter_station_dhcp_start();
@ -223,9 +227,6 @@ void tcpip_adapter_start(uint8_t netif_index, bool authed)
printf("check your static ip\n"); printf("check your static ip\n");
} }
} }
}
} }
} else if (netif_index == TCPIP_ADAPTER_IF_AP) { } else if (netif_index == TCPIP_ADAPTER_IF_AP) {
if (dhcps_flag) { if (dhcps_flag) {
@ -254,8 +255,8 @@ void tcpip_adapter_start(uint8_t netif_index, bool authed)
if (dhcps_flag) { if (dhcps_flag) {
dhcps_start(&esp_ip[TCPIP_ADAPTER_IF_AP]); dhcps_start(&esp_ip[TCPIP_ADAPTER_IF_AP]);
printf("dhcp server start:("); printf("dhcp server start:(");
printf("ip:" IPSTR ",mask:" IPSTR ",gw:" IPSTR, IP2STR(&(esp_netif[TCPIP_ADAPTER_IF_AP]->ip_addr)), printf("ip:" IPSTR ",mask:" IPSTR ",gw:" IPSTR, IP2STR(&(esp_netif[TCPIP_ADAPTER_IF_AP]->ip_addr.u_addr.ip4)),
IP2STR(&(esp_netif[TCPIP_ADAPTER_IF_AP]->netmask)), IP2STR(&(esp_netif[TCPIP_ADAPTER_IF_AP]->gw))); IP2STR(&(esp_netif[TCPIP_ADAPTER_IF_AP]->netmask.u_addr.ip4)), IP2STR(&(esp_netif[TCPIP_ADAPTER_IF_AP]->gw.u_addr.ip4)));
printf(")\n"); printf(")\n");
} }
@ -318,9 +319,9 @@ bool wifi_get_ip_info(WIFI_INTERFACE netif_index, struct ip_info* if_ip)
} }
TCPIP_ATAPTER_LOG("Get netif[%d] ip info\n", netif_index); TCPIP_ATAPTER_LOG("Get netif[%d] ip info\n", netif_index);
if_ip->ip = esp_netif[netif_index]->ip_addr; if_ip->ip = esp_netif[netif_index]->ip_addr.u_addr.ip4;
if_ip->netmask = esp_netif[netif_index]->netmask; if_ip->netmask = esp_netif[netif_index]->netmask.u_addr.ip4;
if_ip->gw = esp_netif[netif_index]->gw; if_ip->gw = esp_netif[netif_index]->gw.u_addr.ip4;
return true; return true;
} }
@ -331,14 +332,14 @@ bool wifi_create_linklocal_ip(uint8_t netif_index, bool ipv6)
return false; return false;
} }
netif_create_ip4_linklocal_address(esp_netif[netif_index]); netif_create_ip6_linklocal_address(esp_netif[netif_index], ipv6);
return true; return true;
} }
bool wifi_get_linklocal_ip(uint8_t netif_index, ipX_addr_t* linklocal) bool wifi_get_linklocal_ip(uint8_t netif_index, ip6_addr_t* linklocal)
{ {
if (TCPIP_ADAPTER_IF_VALID(netif_index)) { if (TCPIP_ADAPTER_IF_VALID(netif_index)) {
memcpy(linklocal, &esp_netif[netif_index]->link_local_addr, sizeof(*linklocal)); memcpy(linklocal, ip_2_ip6(&esp_netif[netif_index]->ip6_addr[0]), sizeof(*linklocal));
} else { } else {
TCPIP_ATAPTER_LOG("ERROR bad netif index:%d\n", netif_index); TCPIP_ATAPTER_LOG("ERROR bad netif index:%d\n", netif_index);
return false; return false;
@ -347,7 +348,7 @@ bool wifi_get_linklocal_ip(uint8_t netif_index, ipX_addr_t* linklocal)
return true; return true;
} }
bool wifi_get_ipinfo_v6(uint8_t netif_index, uint8_t ip_index, ipX_addr_t* ipv6) bool wifi_get_ipinfo_v6(uint8_t netif_index, uint8_t ip_index, ip6_addr_t* ipv6)
{ {
#if LWIP_IPV6 #if LWIP_IPV6
@ -402,7 +403,7 @@ void tcpip_adapter_sta_leave()
netif_set_down(esp_netif[TCPIP_ADAPTER_IF_STA]); netif_set_down(esp_netif[TCPIP_ADAPTER_IF_STA]);
if (esp_netif[TCPIP_ADAPTER_IF_STA]->flags & NETIF_FLAG_DHCP) { if (dhcpc_flag) {
dhcp_release(esp_netif[TCPIP_ADAPTER_IF_STA]); dhcp_release(esp_netif[TCPIP_ADAPTER_IF_STA]);
dhcp_stop(esp_netif[TCPIP_ADAPTER_IF_STA]); dhcp_stop(esp_netif[TCPIP_ADAPTER_IF_STA]);
dhcp_cleanup(esp_netif[TCPIP_ADAPTER_IF_STA]); dhcp_cleanup(esp_netif[TCPIP_ADAPTER_IF_STA]);
@ -506,7 +507,6 @@ enum dhcp_status wifi_station_dhcpc_status()
bool wifi_station_dhcpc_set_maxtry(uint8_t num) bool wifi_station_dhcpc_set_maxtry(uint8_t num)
{ {
DHCP_MAXRTX = num;
return true; return true;
} }