X-Git-Url: https://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=pppd%2Flcp.c;h=ac5d5ce6488416afefde82633d969c7bc352a502;hp=625d2f75a20debb9bebe19768d49e7ba5cfcceef;hb=e712ba49ba8dd497958d415e988bf93008c8fbb4;hpb=d8e8d7a74b791743ad67e8bdba10508b0f901beb

diff --git a/pppd/lcp.c b/pppd/lcp.c
index 625d2f7..ac5d5ce 100644
--- a/pppd/lcp.c
+++ b/pppd/lcp.c
@@ -40,12 +40,6 @@
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#define RCSID	"$Id: lcp.c,v 1.76 2006/05/22 00:04:07 paulus Exp $"
-
-/*
- * TODO:
- */
-
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
@@ -65,22 +59,22 @@
 /* steal a bit in fsm flags word */
 #define DELAYED_UP	0x100
 
-static void lcp_delayed_up __P((void *));
+static void lcp_delayed_up(void *);
 
 /*
  * LCP-related command-line options.
  */
 int	lcp_echo_interval = 0; 	/* Interval between LCP echo-requests */
 int	lcp_echo_fails = 0;	/* Tolerance to unanswered echo-requests */
+bool	lcp_echo_adaptive = 0;	/* request echo only if the link was idle */
 bool	lax_recv = 0;		/* accept control chars in asyncmap */
 bool	noendpoint = 0;		/* don't send/accept endpoint discriminator */
 
-static int noopt __P((char **));
+static int noopt(char **);
 
 #ifdef HAVE_MULTILINK
-static int setendpoint __P((char **));
-static void printendpoint __P((option_t *, void (*)(void *, char *, ...),
-			       void *));
+static int setendpoint(char **);
+static void printendpoint(option_t *, void (*)(void *, char *, ...), void *);
 #endif /* HAVE_MULTILINK */
 
 static option_t lcp_option_list[] = {
@@ -150,6 +144,8 @@ static option_t lcp_option_list[] = {
       OPT_PRIO },
     { "lcp-echo-interval", o_int, &lcp_echo_interval,
       "Set time in seconds between LCP echo requests", OPT_PRIO },
+    { "lcp-echo-adaptive", o_bool, &lcp_echo_adaptive,
+      "Suppress LCP echo requests if traffic was received", 1 },
     { "lcp-restart", o_int, &lcp_fsm[0].timeouttime,
       "Set time in seconds between LCP retransmissions", OPT_PRIO },
     { "lcp-max-terminate", o_int, &lcp_fsm[0].maxtermtransmits,
@@ -201,31 +197,31 @@ static u_char nak_buffer[PPP_MRU];	/* where we construct a nak packet */
 /*
  * Callbacks for fsm code.  (CI = Configuration Information)
  */
-static void lcp_resetci __P((fsm *));	/* Reset our CI */
-static int  lcp_cilen __P((fsm *));		/* Return length of our CI */
-static void lcp_addci __P((fsm *, u_char *, int *)); /* Add our CI to pkt */
-static int  lcp_ackci __P((fsm *, u_char *, int)); /* Peer ack'd our CI */
-static int  lcp_nakci __P((fsm *, u_char *, int, int)); /* Peer nak'd our CI */
-static int  lcp_rejci __P((fsm *, u_char *, int)); /* Peer rej'd our CI */
-static int  lcp_reqci __P((fsm *, u_char *, int *, int)); /* Rcv peer CI */
-static void lcp_up __P((fsm *));		/* We're UP */
-static void lcp_down __P((fsm *));		/* We're DOWN */
-static void lcp_starting __P((fsm *));	/* We need lower layer up */
-static void lcp_finished __P((fsm *));	/* We need lower layer down */
-static int  lcp_extcode __P((fsm *, int, int, u_char *, int));
-static void lcp_rprotrej __P((fsm *, u_char *, int));
+static void lcp_resetci(fsm *);	/* Reset our CI */
+static int  lcp_cilen(fsm *);		/* Return length of our CI */
+static void lcp_addci(fsm *, u_char *, int *); /* Add our CI to pkt */
+static int  lcp_ackci(fsm *, u_char *, int); /* Peer ack'd our CI */
+static int  lcp_nakci(fsm *, u_char *, int, int); /* Peer nak'd our CI */
+static int  lcp_rejci(fsm *, u_char *, int); /* Peer rej'd our CI */
+static int  lcp_reqci(fsm *, u_char *, int *, int); /* Rcv peer CI */
+static void lcp_up(fsm *);		/* We're UP */
+static void lcp_down(fsm *);		/* We're DOWN */
+static void lcp_starting(fsm *);	/* We need lower layer up */
+static void lcp_finished(fsm *);	/* We need lower layer down */
+static int  lcp_extcode(fsm *, int, int, u_char *, int);
+static void lcp_rprotrej(fsm *, u_char *, int);
 
 /*
  * routines to send LCP echos to peer
  */
 
-static void lcp_echo_lowerup __P((int));
-static void lcp_echo_lowerdown __P((int));
-static void LcpEchoTimeout __P((void *));
-static void lcp_received_echo_reply __P((fsm *, int, u_char *, int));
-static void LcpSendEchoRequest __P((fsm *));
-static void LcpLinkFailure __P((fsm *));
-static void LcpEchoCheck __P((fsm *));
+static void lcp_echo_lowerup(int);
+static void lcp_echo_lowerdown(int);
+static void LcpEchoTimeout(void *);
+static void lcp_received_echo_reply(fsm *, int, u_char *, int);
+static void LcpSendEchoRequest(fsm *);
+static void LcpLinkFailure(fsm *);
+static void LcpEchoCheck(fsm *);
 
 static fsm_callbacks lcp_callbacks = {	/* LCP callback routines */
     lcp_resetci,		/* Reset our Configuration Information */
@@ -250,11 +246,10 @@ static fsm_callbacks lcp_callbacks = {	/* LCP callback routines */
  * Some of these are called directly.
  */
 
-static void lcp_init __P((int));
-static void lcp_input __P((int, u_char *, int));
-static void lcp_protrej __P((int));
-static int  lcp_printpkt __P((u_char *, int,
-			      void (*) __P((void *, char *, ...)), void *));
+static void lcp_init(int);
+static void lcp_input(int, u_char *, int);
+static void lcp_protrej(int);
+static int  lcp_printpkt(u_char *, int, void (*)(void *, char *, ...), void *);
 
 struct protent lcp_protent = {
     PPP_LCP,
@@ -296,8 +291,7 @@ int lcp_loopbackfail = DEFLOOPBACKFAIL;
  * noopt - Disable all options (why?).
  */
 static int
-noopt(argv)
-    char **argv;
+noopt(char **argv)
 {
     BZERO((char *) &lcp_wantoptions[0], sizeof (struct lcp_options));
     BZERO((char *) &lcp_allowoptions[0], sizeof (struct lcp_options));
@@ -307,8 +301,7 @@ noopt(argv)
 
 #ifdef HAVE_MULTILINK
 static int
-setendpoint(argv)
-    char **argv;
+setendpoint(char **argv)
 {
     if (str_to_epdisc(&lcp_wantoptions[0].endpoint, *argv)) {
 	lcp_wantoptions[0].neg_endpoint = 1;
@@ -319,10 +312,7 @@ setendpoint(argv)
 }
 
 static void
-printendpoint(opt, printer, arg)
-    option_t *opt;
-    void (*printer) __P((void *, char *, ...));
-    void *arg;
+printendpoint(option_t *opt, void (*printer)(void *, char *, ...), void *arg)
 {
 	printer(arg, "%s", epdisc_to_str(&lcp_wantoptions[0].endpoint));
 }
@@ -332,8 +322,7 @@ printendpoint(opt, printer, arg)
  * lcp_init - Initialize LCP.
  */
 static void
-lcp_init(unit)
-    int unit;
+lcp_init(int unit)
 {
     fsm *f = &lcp_fsm[unit];
     lcp_options *wo = &lcp_wantoptions[unit];
@@ -372,8 +361,7 @@ lcp_init(unit)
  * lcp_open - LCP is allowed to come up.
  */
 void
-lcp_open(unit)
-    int unit;
+lcp_open(int unit)
 {
     fsm *f = &lcp_fsm[unit];
     lcp_options *wo = &lcp_wantoptions[unit];
@@ -391,9 +379,7 @@ lcp_open(unit)
  * lcp_close - Take LCP down.
  */
 void
-lcp_close(unit, reason)
-    int unit;
-    char *reason;
+lcp_close(int unit, char *reason)
 {
     fsm *f = &lcp_fsm[unit];
     int oldstate;
@@ -426,8 +412,7 @@ lcp_close(unit, reason)
  * lcp_lowerup - The lower layer is up.
  */
 void
-lcp_lowerup(unit)
-    int unit;
+lcp_lowerup(int unit)
 {
     lcp_options *wo = &lcp_wantoptions[unit];
     fsm *f = &lcp_fsm[unit];
@@ -455,8 +440,7 @@ lcp_lowerup(unit)
  * lcp_lowerdown - The lower layer is down.
  */
 void
-lcp_lowerdown(unit)
-    int unit;
+lcp_lowerdown(int unit)
 {
     fsm *f = &lcp_fsm[unit];
 
@@ -472,8 +456,7 @@ lcp_lowerdown(unit)
  * lcp_delayed_up - Bring the lower layer up now.
  */
 static void
-lcp_delayed_up(arg)
-    void *arg;
+lcp_delayed_up(void *arg)
 {
     fsm *f = arg;
 
@@ -488,10 +471,7 @@ lcp_delayed_up(arg)
  * lcp_input - Input LCP packet.
  */
 static void
-lcp_input(unit, p, len)
-    int unit;
-    u_char *p;
-    int len;
+lcp_input(int unit, u_char *p, int len)
 {
     fsm *f = &lcp_fsm[unit];
 
@@ -507,11 +487,7 @@ lcp_input(unit, p, len)
  * lcp_extcode - Handle a LCP-specific code.
  */
 static int
-lcp_extcode(f, code, id, inp, len)
-    fsm *f;
-    int code, id;
-    u_char *inp;
-    int len;
+lcp_extcode(fsm *f, int code, int id, u_char *inp, int len)
 {
     u_char *magp;
 
@@ -550,10 +526,7 @@ lcp_extcode(f, code, id, inp, len)
  * Figure out which protocol is rejected and inform it.
  */
 static void
-lcp_rprotrej(f, inp, len)
-    fsm *f;
-    u_char *inp;
-    int len;
+lcp_rprotrej(fsm *f, u_char *inp, int len)
 {
     int i;
     struct protent *protp;
@@ -605,8 +578,7 @@ lcp_rprotrej(f, inp, len)
  */
 /*ARGSUSED*/
 static void
-lcp_protrej(unit)
-    int unit;
+lcp_protrej(int unit)
 {
     /*
      * Can't reject LCP!
@@ -620,10 +592,7 @@ lcp_protrej(unit)
  * lcp_sprotrej - Send a Protocol-Reject for some protocol.
  */
 void
-lcp_sprotrej(unit, p, len)
-    int unit;
-    u_char *p;
-    int len;
+lcp_sprotrej(int unit, u_char *p, int len)
 {
     /*
      * Send back the protocol and the information field of the
@@ -641,8 +610,7 @@ lcp_sprotrej(unit, p, len)
  * lcp_resetci - Reset our CI.
  */
 static void
-lcp_resetci(f)
-    fsm *f;
+lcp_resetci(fsm *f)
 {
     lcp_options *wo = &lcp_wantoptions[f->unit];
     lcp_options *go = &lcp_gotoptions[f->unit];
@@ -667,8 +635,7 @@ lcp_resetci(f)
  * lcp_cilen - Return length of our CI.
  */
 static int
-lcp_cilen(f)
-    fsm *f;
+lcp_cilen(fsm *f)
 {
     lcp_options *go = &lcp_gotoptions[f->unit];
 
@@ -703,10 +670,7 @@ lcp_cilen(f)
  * lcp_addci - Add our desired CIs to a packet.
  */
 static void
-lcp_addci(f, ucp, lenp)
-    fsm *f;
-    u_char *ucp;
-    int *lenp;
+lcp_addci(fsm *f, u_char *ucp, int *lenp)
 {
     lcp_options *go = &lcp_gotoptions[f->unit];
     u_char *start_ucp = ucp;
@@ -791,10 +755,7 @@ lcp_addci(f, ucp, lenp)
  *	1 - Ack was good.
  */
 static int
-lcp_ackci(f, p, len)
-    fsm *f;
-    u_char *p;
-    int len;
+lcp_ackci(fsm *f, u_char *p, int len)
 {
     lcp_options *go = &lcp_gotoptions[f->unit];
     u_char cilen, citype, cichar;
@@ -946,11 +907,7 @@ bad:
  *	1 - Nak was good.
  */
 static int
-lcp_nakci(f, p, len, treat_as_reject)
-    fsm *f;
-    u_char *p;
-    int len;
-    int treat_as_reject;
+lcp_nakci(fsm *f, u_char *p, int len, int treat_as_reject)
 {
     lcp_options *go = &lcp_gotoptions[f->unit];
     lcp_options *wo = &lcp_wantoptions[f->unit];
@@ -1340,10 +1297,7 @@ bad:
  *	1 - Reject was good.
  */
 static int
-lcp_rejci(f, p, len)
-    fsm *f;
-    u_char *p;
-    int len;
+lcp_rejci(fsm *f, u_char *p, int len)
 {
     lcp_options *go = &lcp_gotoptions[f->unit];
     u_char cichar;
@@ -1499,11 +1453,7 @@ bad:
  * CONFNAK; returns CONFREJ if it can't return CONFACK.
  */
 static int
-lcp_reqci(f, inp, lenp, reject_if_disagree)
-    fsm *f;
-    u_char *inp;		/* Requested CIs */
-    int *lenp;			/* Length of requested CIs */
-    int reject_if_disagree;
+lcp_reqci(fsm *f, u_char *inp, int *lenp, int reject_if_disagree)
 {
     lcp_options *go = &lcp_gotoptions[f->unit];
     lcp_options *ho = &lcp_hisoptions[f->unit];
@@ -1890,8 +1840,7 @@ endswitch:
  * lcp_up - LCP has come UP.
  */
 static void
-lcp_up(f)
-    fsm *f;
+lcp_up(fsm *f)
 {
     lcp_options *wo = &lcp_wantoptions[f->unit];
     lcp_options *ho = &lcp_hisoptions[f->unit];
@@ -1941,8 +1890,7 @@ lcp_up(f)
  * Alert other protocols.
  */
 static void
-lcp_down(f)
-    fsm *f;
+lcp_down(fsm *f)
 {
     lcp_options *go = &lcp_gotoptions[f->unit];
 
@@ -1962,8 +1910,7 @@ lcp_down(f)
  * lcp_starting - LCP needs the lower layer up.
  */
 static void
-lcp_starting(f)
-    fsm *f;
+lcp_starting(fsm *f)
 {
     link_required(f->unit);
 }
@@ -1973,8 +1920,7 @@ lcp_starting(f)
  * lcp_finished - LCP has finished with the lower layer.
  */
 static void
-lcp_finished(f)
-    fsm *f;
+lcp_finished(fsm *f)
 {
     link_terminated(f->unit);
 }
@@ -1991,11 +1937,7 @@ static char *lcp_codenames[] = {
 };
 
 static int
-lcp_printpkt(p, plen, printer, arg)
-    u_char *p;
-    int plen;
-    void (*printer) __P((void *, char *, ...));
-    void *arg;
+lcp_printpkt(u_char *p, int plen, void (*printer)(void *, char *, ...), void *arg)
 {
     int code, id, len, olen, i;
     u_char *pstart, *optend;
@@ -2234,8 +2176,7 @@ lcp_printpkt(p, plen, printer, arg)
  */
 
 static
-void LcpLinkFailure (f)
-    fsm *f;
+void LcpLinkFailure (fsm *f)
 {
     if (f->state == OPENED) {
 	info("No response to %d echo-requests", lcp_echos_pending);
@@ -2250,8 +2191,7 @@ void LcpLinkFailure (f)
  */
 
 static void
-LcpEchoCheck (f)
-    fsm *f;
+LcpEchoCheck (fsm *f)
 {
     LcpSendEchoRequest (f);
     if (f->state != OPENED)
@@ -2271,8 +2211,7 @@ LcpEchoCheck (f)
  */
 
 static void
-LcpEchoTimeout (arg)
-    void *arg;
+LcpEchoTimeout (void *arg)
 {
     if (lcp_echo_timer_running != 0) {
         lcp_echo_timer_running = 0;
@@ -2285,11 +2224,7 @@ LcpEchoTimeout (arg)
  */
 
 static void
-lcp_received_echo_reply (f, id, inp, len)
-    fsm *f;
-    int id;
-    u_char *inp;
-    int len;
+lcp_received_echo_reply (fsm *f, int id, u_char *inp, int len)
 {
     u_int32_t magic;
 
@@ -2314,8 +2249,7 @@ lcp_received_echo_reply (f, id, inp, len)
  */
 
 static void
-LcpSendEchoRequest (f)
-    fsm *f;
+LcpSendEchoRequest (fsm *f)
 {
     u_int32_t lcp_magic;
     u_char pkt[4], *pktp;
@@ -2330,6 +2264,20 @@ LcpSendEchoRequest (f)
 	}
     }
 
+    /*
+     * If adaptive echos have been enabled, only send the echo request if
+     * no traffic was received since the last one.
+     */
+    if (lcp_echo_adaptive) {
+	static unsigned int last_pkts_in = 0;
+	struct pppd_stats cur_stats;
+
+	if (get_ppp_stats(f->unit, &cur_stats) && cur_stats.pkts_in != last_pkts_in) {
+	    last_pkts_in = cur_stats.pkts_in;
+	    return;
+	}
+    }
+
     /*
      * Make and send the echo request frame.
      */
@@ -2347,8 +2295,7 @@ LcpSendEchoRequest (f)
  */
 
 static void
-lcp_echo_lowerup (unit)
-    int unit;
+lcp_echo_lowerup (int unit)
 {
     fsm *f = &lcp_fsm[unit];
 
@@ -2367,8 +2314,7 @@ lcp_echo_lowerup (unit)
  */
 
 static void
-lcp_echo_lowerdown (unit)
-    int unit;
+lcp_echo_lowerdown (int unit)
 {
     fsm *f = &lcp_fsm[unit];