mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2025-04-10 15:45:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

moved listen_time global variable to ppp_settings

Browse Source
This commit is contained in:
Sylvain Rochet 2012-06-09 16:18:01 +02:00
parent ce5121e659
commit 7a57d28db4
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -526,9 +526,9 @@ lcp_lowerup(unit)
xmit_accm[unit][0])); xmit_accm[unit][0]));
#endif /* PPPOS_SUPPORT */ #endif /* PPPOS_SUPPORT */
if (listen_time != 0) { if (ppp_settings.listen_time != 0) {
f->flags |= DELAYED_UP; f->flags |= DELAYED_UP;
TIMEOUTMS(lcp_delayed_up, f, listen_time); TIMEOUTMS(lcp_delayed_up, f, ppp_settings.listen_time);
} else } else
fsm_lowerup(f); fsm_lowerup(f);
} }

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

@ -150,7 +150,6 @@
*/ */
/* FIXME: global variables per PPP session */ /* FIXME: global variables per PPP session */
/* FIXME: clean global variables */ /* FIXME: clean global variables */
int listen_time; /* time to listen first (ms) */
int status; /* exit status for pppd */ int status; /* exit status for pppd */
/* FIXME: outpacket_buf per PPP session */ /* FIXME: outpacket_buf per PPP session */
@ -294,7 +293,6 @@ int ppp_init(void) {
int i; int i;
struct protent *protp; struct protent *protp;
listen_time = 0;
status = EXIT_OK; status = EXIT_OK;
#if PPP_STATS_SUPPORT #if PPP_STATS_SUPPORT
link_stats_valid = 0; link_stats_valid = 0;

6
src/netif/ppp/ppp_impl.h
View File

@ -255,9 +255,7 @@ struct epdisc {
/* /*
* Global variables. * Global variables.
*/ */
extern int listen_time; /* time to listen first (ms) */
extern int status; /* exit status for pppd */ extern int status; /* exit status for pppd */
extern int need_holdoff; /* Need holdoff period after link terminates */
extern u_char outpacket_buf[]; /* Buffer for outgoing packets */ extern u_char outpacket_buf[]; /* Buffer for outgoing packets */
#ifdef HAVE_MULTILINK #ifdef HAVE_MULTILINK
@ -418,8 +416,10 @@ struct ppp_settings {
u_int usepeerdns : 1; /* Ask peer for DNS adds */ u_int usepeerdns : 1; /* Ask peer for DNS adds */
u_int persist : 1; /* Persist mode, always try to reopen the connection */ u_int persist : 1; /* Persist mode, always try to reopen the connection */
u16_t listen_time; /* time to listen first (ms) */
/* FIXME: make it a compile time option */ /* FIXME: make it a compile time option */
u_short idle_time_limit; /* Disconnect if idle for this many seconds */ u16_t idle_time_limit; /* Disconnect if idle for this many seconds */
int maxconnect; /* Maximum connect time (seconds) */ int maxconnect; /* Maximum connect time (seconds) */
char user [MAXNAMELEN + 1]; /* Username for PAP */ char user [MAXNAMELEN + 1]; /* Username for PAP */