fix(tcpip_adapter): fix local IP changed when Wi-Fi disconnect

donghengqaz · donghengqaz · commit ac15e4084a59 · 2020-04-21T17:12:47.000+08:00
diff --git a/components/tcpip_adapter/tcpip_adapter_lwip.c b/components/tcpip_adapter/tcpip_adapter_lwip.c
@@ -413,8 +413,7 @@ esp_err_t tcpip_adapter_up(tcpip_adapter_if_t tcpip_if)
         }
 
         /* use last obtained ip, or static ip */
-        netif_set_addr(esp_netif[tcpip_if], &esp_ip[tcpip_if].ip, &esp_ip[tcpip_if].netmask, &esp_ip[tcpip_if].gw);
-        netif_set_up(esp_netif[tcpip_if]);
+        esp_netif[tcpip_if]->flags |= NETIF_FLAG_UP;
     }
 
     tcpip_adapter_update_default_netif();
@@ -445,9 +444,7 @@ esp_err_t tcpip_adapter_down(tcpip_adapter_if_t tcpip_if)
             tcpip_adapter_reset_ip_info(tcpip_if);
         }
 
-        netif_set_addr(esp_netif[tcpip_if], IP4_ADDR_ANY4, IP4_ADDR_ANY4, IP4_ADDR_ANY4);
-        netif_set_down(esp_netif[tcpip_if]);
-        tcpip_adapter_start_ip_lost_timer(tcpip_if);
+        esp_netif[tcpip_if]->flags &= ~NETIF_FLAG_UP;
     }
 
     tcpip_adapter_update_default_netif();

Original file line number	Diff line number	Diff line change
`@@ -413,8 +413,7 @@ esp_err_t tcpip_adapter_up(tcpip_adapter_if_t tcpip_if)`
`413`	`413`	`}`
`414`	`414`
`415`	`415`	`/* use last obtained ip, or static ip */`
`416`		`- netif_set_addr(esp_netif[tcpip_if], &esp_ip[tcpip_if].ip, &esp_ip[tcpip_if].netmask, &esp_ip[tcpip_if].gw);`
`417`		`- netif_set_up(esp_netif[tcpip_if]);`
	`416`	`+ esp_netif[tcpip_if]->flags \|= NETIF_FLAG_UP;`
`418`	`417`	`}`
`419`	`418`
`420`	`419`	`tcpip_adapter_update_default_netif();`
`@@ -445,9 +444,7 @@ esp_err_t tcpip_adapter_down(tcpip_adapter_if_t tcpip_if)`
`445`	`444`	`tcpip_adapter_reset_ip_info(tcpip_if);`
`446`	`445`	`}`
`447`	`446`
`448`		`- netif_set_addr(esp_netif[tcpip_if], IP4_ADDR_ANY4, IP4_ADDR_ANY4, IP4_ADDR_ANY4);`
`449`		`- netif_set_down(esp_netif[tcpip_if]);`
`450`		`- tcpip_adapter_start_ip_lost_timer(tcpip_if);`
	`447`	`+ esp_netif[tcpip_if]->flags &= ~NETIF_FLAG_UP;`
`451`	`448`	`}`
`452`	`449`
`453`	`450`	`tcpip_adapter_update_default_netif();`