now using maxconnect from ppp_settings

This commit is contained in:
Sylvain Rochet 2012-06-07 23:34:06 +02:00
parent 2e6fa7f8a3
commit d27da93c33
3 changed files with 3 additions and 6 deletions

View File

@ -1227,8 +1227,8 @@ np_up(unit, proto)
* Set a timeout to close the connection once the maximum * Set a timeout to close the connection once the maximum
* connect time has expired. * connect time has expired.
*/ */
if (maxconnect > 0) if (ppp_settings.maxconnect > 0)
TIMEOUT(connect_time_expired, 0, maxconnect); TIMEOUT(connect_time_expired, 0, ppp_settings.maxconnect);
#ifdef MAXOCTETS #ifdef MAXOCTETS
if (maxoctets > 0) if (maxoctets > 0)

View File

@ -98,8 +98,8 @@ char devnam[MAXPATHLEN]; /* Device name */
#endif #endif
bool nodetach = 0; /* Don't detach from controlling tty */ bool nodetach = 0; /* Don't detach from controlling tty */
bool updetach = 0; /* Detach once link is up */ bool updetach = 0; /* Detach once link is up */
int maxconnect = 0; /* Maximum connect time */
#if 0 #if 0
int maxconnect = 0; /* Maximum connect time */
char user[MAXNAMELEN]; /* Username for PAP */ char user[MAXNAMELEN]; /* Username for PAP */
char passwd[MAXSECRETLEN]; /* Password for PAP */ char passwd[MAXSECRETLEN]; /* Password for PAP */
#endif #endif

View File

@ -279,9 +279,6 @@ extern u_char outpacket_buf[]; /* Buffer for outgoing packets */
/* FIXME: add more HAVE_MULTILINK */ /* FIXME: add more HAVE_MULTILINK */
extern bool multilink; /* enable multilink operation */ extern bool multilink; /* enable multilink operation */
/* FIXME: it is really necessary ? */
extern int maxconnect; /* Maximum connect time (seconds) */
#ifdef HAVE_MULTILINK #ifdef HAVE_MULTILINK
extern bool doing_multilink; extern bool doing_multilink;
extern bool multilink_master; extern bool multilink_master;