mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2024-09-17 20:24:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

don't destroy and create the PPP interface each time sifup() is called (it is actually called twice with IPv4 + IPv6 enabled)

Browse Source
This commit is contained in:
Sylvain Rochet 2012-06-21 22:28:52 +02:00
parent b6db4a0e2e
commit 8093b55e86
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/netif/ppp/ppp.c
View File

@ -251,6 +251,7 @@ ppp_pcb *ppp_new(void) {
#if PPP_DEBUG #if PPP_DEBUG
pcb->num = ppp_num++; pcb->num = ppp_num++;
#endif /* PPP_DEBUG */ #endif /* PPP_DEBUG */
IP4_ADDR(&pcb->addrs.netmask, 255,255,255,255);
pcb->lcp_loopbackfail = DEFLOOPBACKFAIL; pcb->lcp_loopbackfail = DEFLOOPBACKFAIL;
new_phase(pcb, PHASE_INITIALIZE); new_phase(pcb, PHASE_INITIALIZE);
@ -1906,16 +1907,22 @@ int cdns(ppp_pcb *pcb, u_int32_t ns1, u_int32_t ns2) {
*/ */
int sifup(ppp_pcb *pcb) { int sifup(ppp_pcb *pcb) {
netif_remove(&pcb->netif); if(!pcb->if_up) {
if (!netif_add(&pcb->netif, &pcb->addrs.our_ipaddr, &pcb->addrs.netmask, if(!netif_add(&pcb->netif, &pcb->addrs.our_ipaddr, &pcb->addrs.netmask,
&pcb->addrs.his_ipaddr, (void *)pcb, ppp_netif_init_cb, NULL)) { &pcb->addrs.his_ipaddr, (void *)pcb, ppp_netif_init_cb, NULL)) {
PPPDEBUG(LOG_ERR, ("sifup[%d]: netif_add failed\n", pcb->num)); PPPDEBUG(LOG_ERR, ("sifup[%d]: netif_add failed\n", pcb->num));
return 0; return 0;
}
} else {
netif_set_addr(&pcb->netif, &pcb->addrs.our_ipaddr, &pcb->addrs.netmask,
&pcb->addrs.his_ipaddr);
} }
#if PPP_IPV6_SUPPORT #if PPP_IPV6_SUPPORT
ip6_addr_copy(pcb->netif.ip6_addr[0], pcb->addrs.our6_ipaddr); ip6_addr_copy(pcb->netif.ip6_addr[0], pcb->addrs.our6_ipaddr);
netif_ip6_addr_set_state(&pcb->netif, 0, IP6_ADDR_PREFERRED); netif_ip6_addr_set_state(&pcb->netif, 0, IP6_ADDR_PREFERRED);
#endif /* PPP_IPV6_SUPPORT */ #endif /* PPP_IPV6_SUPPORT */
netif_set_up(&pcb->netif); netif_set_up(&pcb->netif);
pcb->if_up = 1; pcb->if_up = 1;
pcb->err_code = PPPERR_NONE; pcb->err_code = PPPERR_NONE;
@ -1934,6 +1941,9 @@ int sifup(ppp_pcb *pcb) {
*/ */
int sifdown(ppp_pcb *pcb) { int sifdown(ppp_pcb *pcb) {
if(!pcb->if_up)
return 1;
pcb->if_up = 0; pcb->if_up = 0;
/* make sure the netif status callback is called */ /* make sure the netif status callback is called */
netif_set_down(&pcb->netif); netif_set_down(&pcb->netif);