PPP, cleaned persist and holdoff features

This commit is contained in:
Sylvain Rochet 2012-09-01 14:43:31 +02:00
parent a1c87f7c49
commit dbaefd6126
2 changed files with 2 additions and 6 deletions

View File

@ -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

View File

@ -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