abc/lwip
1
0
Fork 0
mirror of https://git.savannah.nongnu.org/git/lwip.git synced 2026-08-08 00:23:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

added PPPoE persist support (don't timeout sending PADI packets)

Browse Source
This commit is contained in:
Sylvain Rochet
2012-06-07 01:48:12 +02:00
parent 7ef99ee6f3
commit a9ac45c5f0
3 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -625,7 +625,7 @@ int ppp_over_ethernet_open(struct netif *ethif, const char *service_name, const
return PPPERR_OPEN;
}
pppoe_connect(pc->pppoe_sc);
pppoe_connect(pc->pppoe_sc, ppp_settings.persist);
}
return pd;
@@ -1866,7 +1866,7 @@ static void ppp_over_ethernet_link_status_cb(int pd, int state) {
if(ppp_settings.persist) {
if(pc->link_status_cb)
pc->link_status_cb(pc->link_status_ctx, pc->err_code ? pc->err_code : pppoe_err_code, NULL);
pppoe_connect(pc->pppoe_sc);
pppoe_connect(pc->pppoe_sc, ppp_settings.persist);
return;
}

14
src/netif/ppp/ppp_oe.c
View File

@@ -748,10 +748,14 @@ pppoe_timeout(void *arg)
*/
/* initialize for quick retry mode */
retry_wait = PPPOE_DISC_TIMEOUT * (1 + sc->sc_padi_retried);
retry_wait = LWIP_MIN(PPPOE_DISC_TIMEOUT * (1 + sc->sc_padi_retried), PPPOE_SLOW_RETRY);
sc->sc_padi_retried++;
if (sc->sc_padi_retried >= PPPOE_DISC_MAXPADI) {
/* prevent sc_padi_retried integer overflow << ~2^31/PPPOE_DISC_TIMEOUT
* FIXME: can be improved
*/
if(sc->sc_padi_retried < 100000)
sc->sc_padi_retried++;
if (!sc->persist && sc->sc_padi_retried >= PPPOE_DISC_MAXPADI) {
#if 0
if ((sc->sc_sppp.pp_if.if_flags & IFF_LINK1) == 0) {
/* slow retry mode */
@@ -798,7 +802,7 @@ pppoe_timeout(void *arg)
/* Start a connection (i.e. initiate discovery phase) */
int
pppoe_connect(struct pppoe_softc *sc)
pppoe_connect(struct pppoe_softc *sc, bool persist)
{
int err;
@@ -811,7 +815,7 @@ pppoe_connect(struct pppoe_softc *sc)
sc->sc_session = 0;
sc->sc_padi_retried = 0;
sc->sc_padr_retried = 0;
sc->persist = persist;
#ifdef PPPOE_SERVER
/* wait PADI if IFF_PASSIVE */
if ((sc->sc_sppp.pp_if.if_flags & IFF_PASSIVE)) {