From dbaefd6126651f44d5a97159cb9a7514264b3cbf Mon Sep 17 00:00:00 2001 From: Sylvain Rochet Date: Sat, 1 Sep 2012 14:43:31 +0200 Subject: [PATCH] PPP, cleaned persist and holdoff features --- src/include/netif/ppp/ppp.h | 6 ++---- src/netif/ppp/ppp.c | 2 -- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/include/netif/ppp/ppp.h b/src/include/netif/ppp/ppp.h index 1bbf4a7e..93384e76 100644 --- a/src/include/netif/ppp/ppp.h +++ b/src/include/netif/ppp/ppp.h @@ -206,8 +206,6 @@ typedef struct ppp_settings_s { u16_t listen_time; /* time to listen first (ms), waiting for peer to send LCP packet */ - u16_t holdoff; /* time to wait (s) before re-initiating the link after it terminates */ - #if PPP_IDLETIMELIMIT u16_t idle_time_limit; /* Disconnect if idle for this many seconds */ #endif /* PPP_IDLETIMELIMIT */ @@ -293,7 +291,7 @@ typedef struct ppp_pcb_rx_s { * PPP interface control block. */ struct ppp_pcb_s { - /* -- below are data that will NOT be cleared between two sessions if persist mode is enabled */ + /* -- below are data that will NOT be cleared between two sessions */ #if PPP_DEBUG u8_t num; /* Interface number - only useful for debugging */ #endif /* PPP_DEBUG */ @@ -312,7 +310,7 @@ struct ppp_pcb_s { void *link_status_ctx; /* Status change callback optional pointer */ struct netif netif; /* PPP interface */ - /* -- below are data that will be cleared between two sessions if persist mode is enabled */ + /* -- below are data that will be cleared between two sessions */ /* * phase must be the first member of cleared members, because it is used to know diff --git a/src/netif/ppp/ppp.c b/src/netif/ppp/ppp.c index 8b4ccbf7..0e54d389 100644 --- a/src/netif/ppp/ppp.c +++ b/src/netif/ppp/ppp.c @@ -258,7 +258,6 @@ ppp_pcb *ppp_new(void) { /* default configuration */ pcb->settings.usepeerdns = 1; pcb->settings.persist = 1; - pcb->settings.holdoff = 30; #if CHAP_SUPPORT pcb->settings.chap_timeout_time = 3; pcb->settings.chap_max_transmits = 10; @@ -526,7 +525,6 @@ ppp_close(ppp_pcb *pcb) } PPPDEBUG(LOG_DEBUG, ("ppp_close() called\n")); - pcb->settings.persist = 0; /* FIXME: not necessary anymore since persistence is done through link status callback */ /* Disconnect */ #if PPPOE_SUPPORT