Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'bugfix/tw16581_dhcps_default_behaviour_changed' into 'master'

Browse source 
fix the dhcps default behaviour chenged by dns

See merge request !1612
This commit is contained in:
Jiang Jiang Jian 2017-12-01 19:21:26 +08:00
parent 7ec7352534 e315d7ca08
commit aece22f763
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
components/lwip/apps/dhcpserver.c
View file

@ -94,7 +94,7 @@ static bool renew = false;
static dhcps_lease_t dhcps_poll;
static dhcps_time_t dhcps_lease_time = DHCPS_LEASE_TIME_DEF; //minute
static dhcps_offer_t dhcps_offer = 0xFF;
static dhcps_offer_t dhcps_dns = 0xFF;
static dhcps_offer_t dhcps_dns = 0x00;
/******************************************************************************
* FunctionName : dhcps_option_info

2
components/tcpip_adapter/tcpip_adapter_lwip.c
View file

@ -408,7 +408,7 @@ esp_err_t tcpip_adapter_set_ip_info(tcpip_adapter_if_t tcpip_if, tcpip_adapter_i
if (p_netif != NULL && netif_is_up(p_netif)) {
netif_set_addr(p_netif, &ip_info->ip, &ip_info->netmask, &ip_info->gw);
if (!(ip4_addr_isany_val(ip_info->ip) || ip4_addr_isany_val(ip_info->ip) || ip4_addr_isany_val(ip_info->ip))) {
if (!(ip4_addr_isany_val(ip_info->ip) || ip4_addr_isany_val(ip_info->netmask) || ip4_addr_isany_val(ip_info->gw))) {
system_event_t evt;
evt.event_id = SYSTEM_EVENT_STA_GOT_IP;
evt.event_info.got_ip.ip_changed = false;