Merge in 1.3 and post 1.3 fixes; some of them might be applicable to

[ppp.git] / pppd / lcp.c

diff --git a/pppd/lcp.c b/pppd/lcp.c
index 6d896a4ab1f3ab3208a9cd1f08eefe39489bab25..fef4da6b05047dec2eec081d3aedd2d610f5167c 100644 (file)
--- a/pppd/lcp.c
+++ b/pppd/lcp.c
@@ -18,7 +18,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: lcp.c,v 1.28 1996/10/08 04:35:02 paulus Exp $";
+static char rcsid[] = "$Id: lcp.c,v 1.32 1998/05/13 05:49:19 paulus Exp $";
 #endif
 
 /*
@@ -78,10 +78,11 @@ static void lcp_rprotrej __P((fsm *, u_char *, int));
 
 static void lcp_echo_lowerup __P((int));
 static void lcp_echo_lowerdown __P((int));
-static void LcpEchoTimeout __P((caddr_t));
+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 fsm_callbacks lcp_callbacks = { /* LCP callback routines */
     lcp_resetci,               /* Reset our Configuration Information */
@@ -232,7 +233,8 @@ lcp_close(unit, reason)
 {
     fsm *f = &lcp_fsm[unit];
 
-    phase = PHASE_TERMINATE;
+    if (phase != PHASE_DEAD)
+       phase = PHASE_TERMINATE;
     if (f->state == STOPPED && f->flags & (OPT_PASSIVE|OPT_SILENT)) {
        /*
         * This action is not strictly according to the FSM in RFC1548,
@@ -264,7 +266,7 @@ lcp_lowerup(unit)
      */
     ppp_set_xaccm(unit, xmit_accm[unit]);
     ppp_send_config(unit, PPP_MRU, 0xffffffff, 0, 0);
-    ppp_recv_config(unit, PPP_MRU, 0x00000000,
+    ppp_recv_config(unit, PPP_MRU, 0xffffffff,
                    wo->neg_pcompression, wo->neg_accompression);
     peer_mru[unit] = PPP_MRU;
     lcp_allowoptions[unit].asyncmap = xmit_accm[unit][0];
@@ -783,7 +785,7 @@ lcp_nakci(f, p, len)
      */
     if (go->neg_mru && go->mru != DEFMRU) {
        NAKCISHORT(CI_MRU, neg_mru,
-                  if (cishort <= wo->mru || cishort < DEFMRU)
+                  if (cishort <= wo->mru || cishort <= DEFMRU)
                       try.mru = cishort;
                   );
     }
@@ -915,7 +917,7 @@ lcp_nakci(f, p, len)
 
        switch (citype) {
        case CI_MRU:
-           if (go->neg_mru && go->mru != DEFMRU
+           if ((go->neg_mru && go->mru != DEFMRU)
                || no.neg_mru || cilen != CILEN_SHORT)
                goto bad;
            GETSHORT(cishort, p);
@@ -923,7 +925,7 @@ lcp_nakci(f, p, len)
                try.mru = cishort;
            break;
        case CI_ASYNCMAP:
-           if (go->neg_asyncmap && go->asyncmap != 0xFFFFFFFF
+           if ((go->neg_asyncmap && go->asyncmap != 0xFFFFFFFF)
                || no.neg_asyncmap || cilen != CILEN_LONG)
                goto bad;
            break;
@@ -1482,13 +1484,8 @@ lcp_up(f)
     ppp_send_config(f->unit, MIN(ao->mru, (ho->neg_mru? ho->mru: PPP_MRU)),
                    (ho->neg_asyncmap? ho->asyncmap: 0xffffffff),
                    ho->neg_pcompression, ho->neg_accompression);
-    /*
-     * If the asyncmap hasn't been negotiated, we really should
-     * set the receive asyncmap to ffffffff, but we set it to 0
-     * for backwards contemptibility.
-     */
     ppp_recv_config(f->unit, (go->neg_mru? MAX(wo->mru, go->mru): PPP_MRU),
-                   (go->neg_asyncmap? go->asyncmap: 0x00000000),
+                   (go->neg_asyncmap? go->asyncmap: 0xffffffff),
                    go->neg_pcompression, go->neg_accompression);
 
     if (ho->neg_mru)
@@ -1517,7 +1514,7 @@ lcp_down(f)
 
     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_asyncmap? go->asyncmap: 0xffffffff),
                    go->neg_pcompression, go->neg_accompression);
     peer_mru[f->unit] = PPP_MRU;
 }
@@ -1565,7 +1562,6 @@ lcp_printpkt(p, plen, printer, arg)
     u_char *pstart, *optend;
     u_short cishort;
     u_int32_t cilong;
-    int fascii;
 
     if (plen < HEADERLEN)
        return 0;
@@ -1624,6 +1620,20 @@ lcp_printpkt(p, plen, printer, arg)
                        break;
                    case PPP_CHAP:
                        printer(arg, "chap");
+                       if (p < optend) {
+                           switch (*p) {
+                           case CHAP_DIGEST_MD5:
+                               printer(arg, " MD5");
+                               ++p;
+                               break;
+#ifdef CHAPMS
+                           case CHAP_MICROSOFT:
+                               printer(arg, " m$oft");
+                               ++p;
+                               break;
+#endif
+                           }
+                       }
                        break;
                    default:
                        printer(arg, "0x%x", cishort);
@@ -1746,7 +1756,7 @@ LcpEchoCheck (f)
      * Start the timer for the next interval.
      */
     assert (lcp_echo_timer_running==0);
-    TIMEOUT (LcpEchoTimeout, (caddr_t) f, lcp_echo_interval);
+    TIMEOUT (LcpEchoTimeout, f, lcp_echo_interval);
     lcp_echo_timer_running = 1;
 }
 
@@ -1756,7 +1766,7 @@ LcpEchoCheck (f)
 
 static void
 LcpEchoTimeout (arg)
-    caddr_t arg;
+    void *arg;
 {
     if (lcp_echo_timer_running != 0) {
         lcp_echo_timer_running = 0;
@@ -1806,7 +1816,7 @@ LcpSendEchoRequest (f)
      * Detect the failure of the peer at this point.
      */
     if (lcp_echo_fails != 0) {
-        if (lcp_echos_pending++ >= lcp_echo_fails) {
+        if (lcp_echos_pending >= lcp_echo_fails) {
             LcpLinkFailure(f);
            lcp_echos_pending = 0;
        }
@@ -1820,6 +1830,7 @@ LcpSendEchoRequest (f)
        pktp = pkt;
        PUTLONG(lcp_magic, pktp);
         fsm_sdata(f, ECHOREQ, lcp_echo_number++ & 0xFF, pkt, pktp - pkt);
+       ++lcp_echos_pending;
     }
 }
 
@@ -1854,7 +1865,7 @@ lcp_echo_lowerdown (unit)
     fsm *f = &lcp_fsm[unit];
 
     if (lcp_echo_timer_running != 0) {
-        UNTIMEOUT (LcpEchoTimeout, (caddr_t) f);
+        UNTIMEOUT (LcpEchoTimeout, f);
         lcp_echo_timer_running = 0;
     }
 }