From f0dbba64064d55cbc244db4004650020eb7e2053 Mon Sep 17 00:00:00 2001 From: Sylvain Rochet Date: Sat, 2 Jul 2016 21:10:24 +0200 Subject: [PATCH] PPP, PPPoE, PPPoL2TP: enforce disabling of silent and passive modes PPP is just the upper protocol for PPPoE and PPPoL2TP, meaning it is only started once "E" or L2TP is established. Therefore waiting indefinitely for LCP packets on the PPP side does not make sense at all, if the lower level protocol is UP, PPP *MUST* comes up as well or we should restart from the beginning. --- src/netif/ppp/pppoe.c | 2 ++ src/netif/ppp/pppol2tp.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/netif/ppp/pppoe.c b/src/netif/ppp/pppoe.c index 0d974765..be75f007 100644 --- a/src/netif/ppp/pppoe.c +++ b/src/netif/ppp/pppoe.c @@ -932,6 +932,8 @@ pppoe_connect(ppp_pcb *ppp, void *ctx) lcp_wo->neg_asyncmap = 0; lcp_wo->neg_pcompression = 0; lcp_wo->neg_accompression = 0; + lcp_wo->passive = 0; + lcp_wo->silent = 0; lcp_ao = &ppp->lcp_allowoptions; lcp_ao->mru = sc->sc_ethif->mtu-PPPOE_HEADERLEN-2; /* two byte PPP protocol discriminator, then IP data */ diff --git a/src/netif/ppp/pppol2tp.c b/src/netif/ppp/pppol2tp.c index 8e433bb5..ae5be762 100644 --- a/src/netif/ppp/pppol2tp.c +++ b/src/netif/ppp/pppol2tp.c @@ -275,6 +275,8 @@ static err_t pppol2tp_connect(ppp_pcb *ppp, void *ctx) { lcp_wo->neg_asyncmap = 0; lcp_wo->neg_pcompression = 0; lcp_wo->neg_accompression = 0; + lcp_wo->passive = 0; + lcp_wo->silent = 0; lcp_ao = &ppp->lcp_allowoptions; lcp_ao->mru = PPPOL2TP_DEFMRU;