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

PPP, PPPoE, improve reliability if we receive a PADT

Browse Source 
Don't disconnect when we receive a PADT, we let the LCP Echo/Reply find
the fact that PPP session is down. Asking the PPP stack to end the
session require strict checking about the PPP phase to prevent endless
disconnection loops.

Luckily it previously does nothing because PADT frames are rarely sent
with a hunique tag and we only set the sc pointer if we receive a
hunique tag.
This commit is contained in:
Sylvain Rochet 2015-03-02 00:16:25 +01:00
parent 9de1c71ff7
commit d28bb04a9c
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -121,7 +121,9 @@ static err_t pppoe_destroy(ppp_pcb *ppp, void *ctx);
/* management routines */ /* management routines */
static void pppoe_abort_connect(struct pppoe_softc *); static void pppoe_abort_connect(struct pppoe_softc *);
#if 0 /* UNUSED */
static void pppoe_clear_softc(struct pppoe_softc *, const char *); static void pppoe_clear_softc(struct pppoe_softc *, const char *);
#endif /* UNUSED */
/* internal timeout handling */ /* internal timeout handling */
static void pppoe_timeout(void *); static void pppoe_timeout(void *);
@ -634,10 +636,17 @@ breakbreak:;
ppp_start(sc->pcb); /* notify upper layers */ ppp_start(sc->pcb); /* notify upper layers */
break; break;
case PPPOE_CODE_PADT: case PPPOE_CODE_PADT:
if (sc == NULL) { /* Don't disconnect here, we let the LCP Echo/Reply find the fact
* that PPP session is down. Asking the PPP stack to end the session
* require strict checking about the PPP phase to prevent endless
* disconnection loops.
*/
#if 0 /* UNUSED */
if (sc == NULL) { /* PADT frames are rarely sent with a hunique tag, this is actually almost always true */
goto done; goto done;
} }
pppoe_clear_softc(sc, "received PADT"); pppoe_clear_softc(sc, "received PADT");
#endif /* UNUSED */
break; break;
default: default:
if(sc) { if(sc) {
@ -1238,6 +1247,7 @@ pppoe_ifattach_hook(void *arg, struct pbuf **mp, struct netif *ifp, int dir)
} }
#endif #endif
#if 0 /* UNUSED */
static void static void
pppoe_clear_softc(struct pppoe_softc *sc, const char *message) pppoe_clear_softc(struct pppoe_softc *sc, const char *message)
{ {
@ -1250,7 +1260,7 @@ pppoe_clear_softc(struct pppoe_softc *sc, const char *message)
sc->sc_state = PPPOE_STATE_INITIAL; sc->sc_state = PPPOE_STATE_INITIAL;
/* notify upper layers */ /* notify upper layers */
ppp_link_end(sc->pcb); ppp_link_end(sc->pcb); /* /!\ dangerous /!\ */
/* clean up softc */ /* clean up softc */
MEMCPY(&sc->sc_dest, ethbroadcast.addr, sizeof(sc->sc_dest)); MEMCPY(&sc->sc_dest, ethbroadcast.addr, sizeof(sc->sc_dest));
@ -1259,4 +1269,5 @@ pppoe_clear_softc(struct pppoe_softc *sc, const char *message)
sc->sc_padi_retried = 0; sc->sc_padi_retried = 0;
sc->sc_padr_retried = 0; sc->sc_padr_retried = 0;
} }
#endif /* UNUSED */
#endif /* PPP_SUPPORT && PPPOE_SUPPORT */ #endif /* PPP_SUPPORT && PPPOE_SUPPORT */