add /etc/ppp/peers

[ppp.git] / pppd / lcp.c

diff --git a/pppd/lcp.c b/pppd/lcp.c
index e92639c4332cdb699fb5569f88657ba3486649a4..d3c16b804bd64ef21a0dc6ac8ad38fb57ec9d04c 100644 (file)
--- a/pppd/lcp.c
+++ b/pppd/lcp.c
@@ -18,7 +18,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char rcsid[] = "$Id: lcp.c,v 1.23 1995/12/18 03:45:32 paulus Exp $";
+static char rcsid[] = "$Id: lcp.c,v 1.27 1996/07/01 01:15:19 paulus Exp $";

 #endif
 
 /*
 #endif
 
 /*


@@ -41,11 +41,6 @@ static char rcsid[] = "$Id: lcp.c,v 1.23 1995/12/18 03:45:32 paulus Exp $";
 #include "chap.h"
 #include "magic.h"
 
 #include "chap.h"
 #include "magic.h"
 

-#ifdef _linux_         /* Needs ppp ioctls */
-#include <net/if.h>
-#include <linux/if_ppp.h>
-#endif
-

 /* global vars */
 fsm lcp_fsm[NUM_PPP];                  /* LCP fsm structure (global)*/
 lcp_options lcp_wantoptions[NUM_PPP];  /* Options that we want to request */
 /* global vars */
 fsm lcp_fsm[NUM_PPP];                  /* LCP fsm structure (global)*/
 lcp_options lcp_wantoptions[NUM_PPP];  /* Options that we want to request */


@@ -60,11 +55,6 @@ static u_int32_t lcp_echo_timer_running = 0;  /* TRUE if a timer is running */
 
 static u_char nak_buffer[PPP_MRU];     /* where we construct a nak packet */
 
 
 static u_char nak_buffer[PPP_MRU];     /* where we construct a nak packet */
 

-#ifdef _linux_
-u_int32_t idle_timer_running = 0;
-extern int idle_time_limit;
-#endif
-

 /*
  * Callbacks for fsm code.  (CI = Configuration Information)
  */
 /*
  * Callbacks for fsm code.  (CI = Configuration Information)
  */


@@ -111,10 +101,33 @@ static fsm_callbacks lcp_callbacks = {    /* LCP callback routines */
     "LCP"                      /* String name of protocol */
 };
 
     "LCP"                      /* String name of protocol */
 };
 

+/*
+ * Protocol entry points.
+ * 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 *));
+

 struct protent lcp_protent = {
 struct protent lcp_protent = {

-    PPP_LCP, lcp_init, lcp_input, lcp_protrej,
-    lcp_lowerup, lcp_lowerdown, lcp_open, lcp_close,
-    lcp_printpkt, NULL, 1, "LCP"
+    PPP_LCP,
+    lcp_init,
+    lcp_input,
+    lcp_protrej,
+    lcp_lowerup,
+    lcp_lowerdown,
+    lcp_open,
+    lcp_close,
+    lcp_printpkt,
+    NULL,
+    1,
+    "LCP",
+    NULL,
+    NULL,
+    NULL

 };
 
 int lcp_loopbackfail = DEFLOOPBACKFAIL;
 };
 
 int lcp_loopbackfail = DEFLOOPBACKFAIL;


@@ -135,7 +148,7 @@ int lcp_loopbackfail = DEFLOOPBACKFAIL;
 /*
  * lcp_init - Initialize LCP.
  */
 /*
  * lcp_init - Initialize LCP.
  */

-void
+static void

 lcp_init(unit)
     int unit;
 {
 lcp_init(unit)
     int unit;
 {


@@ -211,11 +224,12 @@ lcp_close(unit, reason)
 {
     fsm *f = &lcp_fsm[unit];
 
 {
     fsm *f = &lcp_fsm[unit];
 

+    phase = PHASE_TERMINATE;

     if (f->state == STOPPED && f->flags & (OPT_PASSIVE|OPT_SILENT)) {
        /*
         * This action is not strictly according to the FSM in RFC1548,
         * but it does mean that the program terminates if you do a
     if (f->state == STOPPED && f->flags & (OPT_PASSIVE|OPT_SILENT)) {
        /*
         * This action is not strictly according to the FSM in RFC1548,
         * but it does mean that the program terminates if you do a

-        * lcp_close(0) in passive/silent mode when a connection hasn't
+        * lcp_close() in passive/silent mode when a connection hasn't

         * been established.
         */
        f->state = CLOSED;
         * been established.
         */
        f->state = CLOSED;


@@ -225,58 +239,6 @@ lcp_close(unit, reason)
        fsm_close(&lcp_fsm[unit], reason);
 }
 
        fsm_close(&lcp_fsm[unit], reason);
 }
 

-#ifdef _linux_
-static void IdleTimeCheck __P((caddr_t));
-
-/*
- * Timer expired for the LCP echo requests from this process.
- */
-
-static void
-RestartIdleTimer (f)
-    fsm *f;
-{
-    u_long             delta;
-    struct ppp_idle    ddinfo;
-/*
- * Read the time since the last packet was received.
- */
-    if (ioctl (fd, PPPIOCGIDLE, &ddinfo) < 0) {
-        syslog (LOG_ERR, "ioctl(PPPIOCGIDLE): %m");
-        die (1);
-    }
-/*
- * Compute the time since the last packet was received. If the timer
- *  has expired then disconnect the line.
- */
-    delta = idle_time_limit - (u_long) ddinfo.recv_idle;
-    if (((int) delta <= 0L) && (f->state == OPENED)) {
-        syslog (LOG_NOTICE, "No IP frames received within idle time limit");
-       lcp_close(f->unit, "Idle time limit expired");  /* Reset connection */
-       phase = PHASE_TERMINATE;        /* Mark it down */
-    } else {
-        if ((int) delta <= 0L)
-           delta = (u_long) idle_time_limit;
-        assert (idle_timer_running==0);
-        TIMEOUT (IdleTimeCheck, (caddr_t) f, delta);
-        idle_timer_running = 1;
-    }
-}
-
-/*
- * IdleTimeCheck - Timer expired on the IDLE detection for IP frames
- */
-
-static void
-IdleTimeCheck (arg)
-    caddr_t arg;
-{
-    if (idle_timer_running != 0) {
-        idle_timer_running = 0;
-        RestartIdleTimer ((fsm *) arg);
-    }
-}
-#endif

 
 /*
  * lcp_lowerup - The lower layer is up.
 
 /*
  * lcp_lowerup - The lower layer is up.


@@ -287,7 +249,6 @@ lcp_lowerup(unit)
 {
     lcp_options *wo = &lcp_wantoptions[unit];
 
 {
     lcp_options *wo = &lcp_wantoptions[unit];
 

-    sifdown(unit);

     /*
      * Don't use A/C or protocol compression on transmission,
      * but accept A/C and protocol compressed packets
     /*
      * Don't use A/C or protocol compression on transmission,
      * but accept A/C and protocol compressed packets


@@ -318,7 +279,7 @@ lcp_lowerdown(unit)
 /*
  * lcp_input - Input LCP packet.
  */
 /*
  * lcp_input - Input LCP packet.
  */

-void
+static void

 lcp_input(unit, p, len)
     int unit;
     u_char *p;
 lcp_input(unit, p, len)
     int unit;
     u_char *p;


@@ -427,7 +388,7 @@ lcp_rprotrej(f, inp, len)
  * lcp_protrej - A Protocol-Reject was received.
  */
 /*ARGSUSED*/
  * lcp_protrej - A Protocol-Reject was received.
  */
 /*ARGSUSED*/

-void
+static void

 lcp_protrej(unit)
     int unit;
 {
 lcp_protrej(unit)
     int unit;
 {


@@ -472,6 +433,7 @@ lcp_resetci(f)
     lcp_wantoptions[f->unit].numloops = 0;
     lcp_gotoptions[f->unit] = lcp_wantoptions[f->unit];
     peer_mru[f->unit] = PPP_MRU;
     lcp_wantoptions[f->unit].numloops = 0;
     lcp_gotoptions[f->unit] = lcp_wantoptions[f->unit];
     peer_mru[f->unit] = PPP_MRU;

+    auth_reset(f->unit);

 }
 
 
 }
 
 


@@ -800,19 +762,22 @@ lcp_nakci(f, p, len)
      */
     if ((go->neg_chap || go->neg_upap)
        && len >= CILEN_SHORT
      */
     if ((go->neg_chap || go->neg_upap)
        && len >= CILEN_SHORT

-       && p[0] == CI_AUTHTYPE && p[1] >= CILEN_SHORT) {
+       && p[0] == CI_AUTHTYPE && p[1] >= CILEN_SHORT && p[1] <= len) {

        cilen = p[1];
        cilen = p[1];

+       len -= cilen;
+       no.neg_chap = go->neg_chap;
+       no.neg_upap = go->neg_upap;

        INCPTR(2, p);
         GETSHORT(cishort, p);
        if (cishort == PPP_PAP && cilen == CILEN_SHORT) {
            /*
        INCPTR(2, p);
         GETSHORT(cishort, p);
        if (cishort == PPP_PAP && cilen == CILEN_SHORT) {
            /*

-            * If they are asking for PAP, then they don't want to do CHAP.
+            * If we were asking for CHAP, they obviously don't want to do it.

             * If we weren't asking for CHAP, then we were asking for PAP,
             * in which case this Nak is bad.
             */
            if (!go->neg_chap)
                goto bad;
             * If we weren't asking for CHAP, then we were asking for PAP,
             * in which case this Nak is bad.
             */
            if (!go->neg_chap)
                goto bad;

-           go->neg_chap = 0;
+           try.neg_chap = 0;

 
        } else if (cishort == PPP_CHAP && cilen == CILEN_CHAP) {
            GETCHAR(cichar, p);
 
        } else if (cishort == PPP_CHAP && cilen == CILEN_CHAP) {
            GETCHAR(cichar, p);


@@ -823,12 +788,12 @@ lcp_nakci(f, p, len)
                 * asking for CHAP.
                 */
                if (cichar != go->chap_mdtype)
                 * asking for CHAP.
                 */
                if (cichar != go->chap_mdtype)

-                   go->neg_chap = 0;
+                   try.neg_chap = 0;

            } else {
                /*
                 * Stop asking for PAP if we were asking for it.
                 */
            } else {
                /*
                 * Stop asking for PAP if we were asking for it.
                 */

-               go->neg_upap = 0;
+               try.neg_upap = 0;

            }
 
        } else {
            }
 
        } else {


@@ -837,24 +802,13 @@ lcp_nakci(f, p, len)
             * Stop asking for what we were asking for.
             */
            if (go->neg_chap)
             * Stop asking for what we were asking for.
             */
            if (go->neg_chap)

-               go->neg_chap = 0;
+               try.neg_chap = 0;

            else
            else

-               go->neg_upap = 0;
+               try.neg_upap = 0;

            p += cilen - CILEN_SHORT;
        }
     }
 
            p += cilen - CILEN_SHORT;
        }
     }
 

-    /*
-     * Peer shouldn't send Nak for protocol compression or
-     * address/control compression requests; they should send
-     * a Reject instead.  If they send a Nak, treat it as a Reject.
-     */
-    if (!go->neg_chap ){
-       NAKCISHORT(CI_AUTHTYPE, neg_upap,
-                  try.neg_upap = 0;
-                  );
-    }
-

     /*
      * If they can't cope with our link quality protocol, we'll have
      * to stop asking for LQR.  We haven't got any other protocol.
     /*
      * If they can't cope with our link quality protocol, we'll have
      * to stop asking for LQR.  We haven't got any other protocol.


@@ -875,6 +829,11 @@ lcp_nakci(f, p, len)
              looped_back = 1;
              );
 
              looped_back = 1;
              );
 

+    /*
+     * Peer shouldn't send Nak for protocol compression or
+     * address/control compression requests; they should send
+     * a Reject instead.  If they send a Nak, treat it as a Reject.
+     */

     NAKCIVOID(CI_PCOMPRESSION, neg_pcompression,
              try.neg_pcompression = 0;
              );
     NAKCIVOID(CI_PCOMPRESSION, neg_pcompression,
              try.neg_pcompression = 0;
              );


@@ -901,7 +860,7 @@ lcp_nakci(f, p, len)
     while (len > CILEN_VOID) {
        GETCHAR(citype, p);
        GETCHAR(cilen, p);
     while (len > CILEN_VOID) {
        GETCHAR(citype, p);
        GETCHAR(cilen, p);

-       if ((len -= cilen) < 0)
+       if (cilen < CILEN_VOID || (len -= cilen) < 0)

            goto bad;
        next = p + cilen - 2;
 
            goto bad;
        next = p + cilen - 2;
 


@@ -991,8 +950,6 @@ lcp_rejci(f, p, len)
     u_char cichar;
     u_short cishort;
     u_int32_t cilong;
     u_char cichar;
     u_short cishort;
     u_int32_t cilong;

-    u_char *start = p;
-    int plen = len;

     lcp_options try;           /* options to request next time */
 
     try = *go;
     lcp_options try;           /* options to request next time */
 
     try = *go;


@@ -1097,8 +1054,6 @@ lcp_rejci(f, p, len)
 
 bad:
     LCPDEBUG((LOG_WARNING, "lcp_rejci: received bad Reject!"));
 
 bad:
     LCPDEBUG((LOG_WARNING, "lcp_rejci: received bad Reject!"));

-    LCPDEBUG((LOG_WARNING, "lcp_rejci: plen %d len %d off %d",
-             plen, len, p - start));

     return 0;
 }
 
     return 0;
 }
 


@@ -1121,7 +1076,7 @@ lcp_reqci(f, inp, lenp, reject_if_disagree)
     lcp_options *ho = &lcp_hisoptions[f->unit];
     lcp_options *ao = &lcp_allowoptions[f->unit];
     u_char *cip, *next;                /* Pointer to current and next CIs */
     lcp_options *ho = &lcp_hisoptions[f->unit];
     lcp_options *ao = &lcp_allowoptions[f->unit];
     u_char *cip, *next;                /* Pointer to current and next CIs */

-    u_char cilen, citype, cichar;/* Parsed len, type, char value */
+    int cilen, citype, cichar; /* Parsed len, type, char value */

     u_short cishort;           /* Parsed short value */
     u_int32_t cilong;          /* Parse long value */
     int rc = CONFACK;          /* Final packet return code */
     u_short cishort;           /* Parsed short value */
     u_int32_t cilong;          /* Parse long value */
     int rc = CONFACK;          /* Final packet return code */


@@ -1152,6 +1107,7 @@ lcp_reqci(f, inp, lenp, reject_if_disagree)
            orc = CONFREJ;              /* Reject bad CI */
            cilen = l;                  /* Reject till end of packet */
            l = 0;                      /* Don't loop again */
            orc = CONFREJ;              /* Reject bad CI */
            cilen = l;                  /* Reject till end of packet */
            l = 0;                      /* Don't loop again */

+           citype = 0;

            goto endswitch;
        }
        GETCHAR(citype, p);             /* Parse CI type */
            goto endswitch;
        }
        GETCHAR(citype, p);             /* Parse CI type */


@@ -1270,7 +1226,11 @@ lcp_reqci(f, inp, lenp, reject_if_disagree)
                    break;
                }
                GETCHAR(cichar, p);     /* get digest type*/
                    break;
                }
                GETCHAR(cichar, p);     /* get digest type*/

-               if (cichar != ao->chap_mdtype) {
+               if (cichar != CHAP_DIGEST_MD5
+#ifdef CHAPMS
+                   && cichar != CHAP_MICROSOFT
+#endif
+                   ) {

                    orc = CONFNAK;
                    PUTCHAR(CI_AUTHTYPE, nakp);
                    PUTCHAR(CILEN_CHAP, nakp);
                    orc = CONFNAK;
                    PUTCHAR(CI_AUTHTYPE, nakp);
                    PUTCHAR(CILEN_CHAP, nakp);


@@ -1489,14 +1449,13 @@ lcp_down(f)
 
     lcp_echo_lowerdown(f->unit);
 
 
     lcp_echo_lowerdown(f->unit);
 

-    sifdown(f->unit);
+    link_down(f->unit);
+

     ppp_send_config(f->unit, PPP_MRU, 0xffffffff, 0, 0);
     ppp_recv_config(f->unit, PPP_MRU,
                    (go->neg_asyncmap? go->asyncmap: 0x00000000),
                    go->neg_pcompression, go->neg_accompression);
     peer_mru[f->unit] = PPP_MRU;
     ppp_send_config(f->unit, PPP_MRU, 0xffffffff, 0, 0);
     ppp_recv_config(f->unit, PPP_MRU,
                    (go->neg_asyncmap? go->asyncmap: 0x00000000),
                    go->neg_pcompression, go->neg_accompression);
     peer_mru[f->unit] = PPP_MRU;

-
-    link_down(f->unit);

 }
 
 
 }
 
 


@@ -1525,13 +1484,13 @@ lcp_finished(f)
 /*
  * lcp_printpkt - print the contents of an LCP packet.
  */
 /*
  * lcp_printpkt - print the contents of an LCP packet.
  */

-char *lcp_codenames[] = {
+static char *lcp_codenames[] = {

     "ConfReq", "ConfAck", "ConfNak", "ConfRej",
     "TermReq", "TermAck", "CodeRej", "ProtRej",
     "EchoReq", "EchoRep", "DiscReq"
 };
 
     "ConfReq", "ConfAck", "ConfNak", "ConfRej",
     "TermReq", "TermAck", "CodeRej", "ProtRej",
     "EchoReq", "EchoRep", "DiscReq"
 };
 

-int
+static int

 lcp_printpkt(p, plen, printer, arg)
     u_char *p;
     int plen;
 lcp_printpkt(p, plen, printer, arg)
     u_char *p;
     int plen;


@@ -1542,6 +1501,7 @@ lcp_printpkt(p, plen, printer, arg)
     u_char *pstart, *optend;
     u_short cishort;
     u_int32_t cilong;
     u_char *pstart, *optend;
     u_short cishort;
     u_int32_t cilong;

+    int fascii;

 
     if (plen < HEADERLEN)
        return 0;
 
     if (plen < HEADERLEN)
        return 0;


@@ -1647,6 +1607,27 @@ lcp_printpkt(p, plen, printer, arg)
            printer(arg, ">");
        }
        break;
            printer(arg, ">");
        }
        break;

+
+    case TERMACK:
+    case TERMREQ:
+       if (len > 0 && *p >= ' ' && *p < 0x7f) {
+           printer(arg, " ");
+           print_string(p, len, printer, arg);
+           p += len;
+           len = 0;
+       }
+       break;
+
+    case ECHOREQ:
+    case ECHOREP:
+    case DISCREQ:
+       if (len >= 4) {
+           GETLONG(cilong, p);
+           printer(arg, " magic=0x%x", cilong);
+           p += 4;
+           len -= 4;
+       }
+       break;

     }
 
     /* print the rest of the bytes in the packet */
     }
 
     /* print the rest of the bytes in the packet */


@@ -1667,9 +1648,9 @@ void LcpLinkFailure (f)
     fsm *f;
 {
     if (f->state == OPENED) {
     fsm *f;
 {
     if (f->state == OPENED) {

-        syslog (LOG_NOTICE, "Excessive lack of response to LCP echo frames.");
+       syslog(LOG_INFO, "No response to %d echo-requests", lcp_echos_pending);
+        syslog(LOG_NOTICE, "Serial link appears to be disconnected.");

         lcp_close(f->unit, "Peer not responding");
         lcp_close(f->unit, "Peer not responding");

-       phase = PHASE_TERMINATE;

     }
 }
 
     }
 }
 


@@ -1681,36 +1662,13 @@ static void
 LcpEchoCheck (f)
     fsm *f;
 {
 LcpEchoCheck (f)
     fsm *f;
 {

-    long int delta;
-#ifdef __linux__
-    struct ppp_idle    ddinfo;
-/*
- * Read the time since the last packet was received.
- */
-    if (ioctl (fd, PPPIOCGIDLE, &ddinfo) < 0) {
-        syslog (LOG_ERR, "ioctl(PPPIOCGIDLE): %m");
-        die (1);
-    }
-/*
- * Compute the time since the last packet was received. If the timer
- *  has expired then send the echo request and reset the timer to maximum.
- */
-    delta = (long int) lcp_echo_interval - (long int) ddinfo.recv_idle;
-    if (delta < 0L) {
-        LcpSendEchoRequest (f);
-        delta = (int) lcp_echo_interval;
-    }
-
-#else /* Other implementations do not have ability to find delta */

     LcpSendEchoRequest (f);
     LcpSendEchoRequest (f);

-    delta = (int) lcp_echo_interval;
-#endif

 
 

-/*
- * Start the timer for the next interval.
- */
+    /*
+     * Start the timer for the next interval.
+     */

     assert (lcp_echo_timer_running==0);
     assert (lcp_echo_timer_running==0);

-    TIMEOUT (LcpEchoTimeout, (caddr_t) f, (u_int32_t) delta);
+    TIMEOUT (LcpEchoTimeout, (caddr_t) f, lcp_echo_interval);

     lcp_echo_timer_running = 1;
 }
 
     lcp_echo_timer_running = 1;
 }
 


@@ -1766,25 +1724,24 @@ LcpSendEchoRequest (f)
     u_int32_t lcp_magic;
     u_char pkt[4], *pktp;
 
     u_int32_t lcp_magic;
     u_char pkt[4], *pktp;
 

-/*
- * Detect the failure of the peer at this point.
- */
+    /*
+     * Detect the failure of the peer at this point.
+     */

     if (lcp_echo_fails != 0) {
         if (lcp_echos_pending++ >= lcp_echo_fails) {
             LcpLinkFailure(f);
            lcp_echos_pending = 0;
        }
     }
     if (lcp_echo_fails != 0) {
         if (lcp_echos_pending++ >= lcp_echo_fails) {
             LcpLinkFailure(f);
            lcp_echos_pending = 0;
        }
     }

-/*
- * Make and send the echo request frame.
- */
+
+    /*
+     * Make and send the echo request frame.
+     */

     if (f->state == OPENED) {
         lcp_magic = lcp_gotoptions[f->unit].magicnumber;
        pktp = pkt;
        PUTLONG(lcp_magic, pktp);
     if (f->state == OPENED) {
         lcp_magic = lcp_gotoptions[f->unit].magicnumber;
        pktp = pkt;
        PUTLONG(lcp_magic, pktp);

-      
-        fsm_sdata(f, ECHOREQ,
-                 lcp_echo_number++ & 0xFF, pkt, pktp - pkt);
+        fsm_sdata(f, ECHOREQ, lcp_echo_number++ & 0xFF, pkt, pktp - pkt);

     }
 }
 
     }
 }
 


@@ -1806,11 +1763,6 @@ lcp_echo_lowerup (unit)
     /* If a timeout interval is specified then start the timer */
     if (lcp_echo_interval != 0)
         LcpEchoCheck (f);
     /* If a timeout interval is specified then start the timer */
     if (lcp_echo_interval != 0)
         LcpEchoCheck (f);

-#ifdef _linux_
-    /* If a idle time limit is given then start it */
-    if (idle_time_limit != 0)
-        RestartIdleTimer (f);
-#endif

 }
 
 /*
 }
 
 /*


@@ -1827,11 +1779,4 @@ lcp_echo_lowerdown (unit)
         UNTIMEOUT (LcpEchoTimeout, (caddr_t) f);
         lcp_echo_timer_running = 0;
     }
         UNTIMEOUT (LcpEchoTimeout, (caddr_t) f);
         lcp_echo_timer_running = 0;
     }

-#ifdef _linux_  
-    /* If a idle time limit is running then stop it */
-    if (idle_timer_running != 0) {
-        UNTIMEOUT (IdleTimeCheck, (caddr_t) f);
-        idle_timer_running = 0;
-    }
-#endif

 }
 }