mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2024-12-26 03:16:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

PPP, move various connect cleanup from ppp_clear to ppp_start

Browse Source 
What we really need here is to cleanup the PPP environment before
starting LCP, we don't care about the PPP state before LCP is
started. Move cleanups from ppp_clear to ppp_start to clean them
just before we need them cleaned.
This commit is contained in:
Sylvain Rochet 2016-06-20 00:25:59 +02:00
parent 42d50eba4e
commit 1d108b400f
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -703,6 +703,12 @@ ppp_pcb *ppp_new(struct netif *pppif, const struct link_callbacks *callbacks, vo
/* Set a PPP PCB to its initial state */ /* Set a PPP PCB to its initial state */
void ppp_clear(ppp_pcb *pcb) { void ppp_clear(ppp_pcb *pcb) {
LWIP_ASSERT("pcb->phase == PPP_PHASE_DEAD || pcb->phase == PPP_PHASE_HOLDOFF", pcb->phase == PPP_PHASE_DEAD || pcb->phase == PPP_PHASE_HOLDOFF); LWIP_ASSERT("pcb->phase == PPP_PHASE_DEAD || pcb->phase == PPP_PHASE_HOLDOFF", pcb->phase == PPP_PHASE_DEAD || pcb->phase == PPP_PHASE_HOLDOFF);
new_phase(pcb, PPP_PHASE_INITIALIZE);
}
/** Initiate LCP open request */
void ppp_start(ppp_pcb *pcb) {
PPPDEBUG(LOG_DEBUG, ("ppp_start[%d]\n", pcb->netif->num));
/* Clean data not taken care by anything else, mostly shared data. */ /* Clean data not taken care by anything else, mostly shared data. */
#if PPP_STATS_SUPPORT #if PPP_STATS_SUPPORT
@ -717,13 +723,8 @@ void ppp_clear(ppp_pcb *pcb) {
vj_compress_init(&pcb->vj_comp); vj_compress_init(&pcb->vj_comp);
#endif /* VJ_SUPPORT && LWIP_TCP */ #endif /* VJ_SUPPORT && LWIP_TCP */
new_phase(pcb, PPP_PHASE_INITIALIZE); /* Start protocol */
} lcp_open(pcb);
/** Initiate LCP open request */
void ppp_start(ppp_pcb *pcb) {
PPPDEBUG(LOG_DEBUG, ("ppp_start[%d]\n", pcb->netif->num));
lcp_open(pcb); /* Start protocol */
lcp_lowerup(pcb); lcp_lowerup(pcb);
PPPDEBUG(LOG_DEBUG, ("ppp_start[%d]: finished\n", pcb->netif->num)); PPPDEBUG(LOG_DEBUG, ("ppp_start[%d]: finished\n", pcb->netif->num));
} }