o Move the accept/deny/disable/enable globals either to the

  bundle (non-negotiated vars) or to their respective IPCP,
  LCP or CCP.
o Enable rolling throughput statistics by default.
o Remove the `display' command.  These values now appear in
  `show bundle', `show ipcp', `show ccp' and `show lcp'.
o Initialise auth name & key at bundle create time (oops).
o Rename pppd-deflate (the id-24 hack) to deflate24.
o Don't send both a REJ and a NAK to an IPCP or LCP REQ.
  Favour the REJ (already done at the CCP level).
o Recurse in datalink_UpdateSet() when we change state, otherwise
  we end up setting no descriptors and getting jammed in the
  imminent select() instead of doing the dial/login/hangup.
o Display our CHAP encryption method despite being built with DES.
o Display VJ as not negotiated in ``show ipcp'' when necessary.

1 files changed, 8 insertions, 7 deletions

diff --git a/usr.sbin/ppp/modem.c b/usr.sbin/ppp/modem.c
index a447ab973172..b31c061672ca 100644
--- a/usr.sbin/ppp/modem.c
+++ b/usr.sbin/ppp/modem.c
@@ -17,7 +17,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: modem.c,v 1.77.2.48 1998/04/10 14:55:11 brian Exp $
+ * $Id: modem.c,v 1.77.2.49 1998/04/10 23:51:30 brian Exp $
  *
  *  TODO:
  */
@@ -478,9 +478,10 @@ modem_Unlock(struct physical *modem)
 }
 
 static void
-modem_Found(struct physical *modem)
+modem_Found(struct physical *modem, struct bundle *bundle)
 {
-  throughput_start(&modem->link.throughput, "modem throughput");
+  throughput_start(&modem->link.throughput, "modem throughput",
+                   Enabled(bundle, OPT_THROUGHPUT));
   modem->connect_count++;
   LogPrintf(LogPHASE, "Connected!\n");
 }
@@ -507,12 +508,12 @@ modem_Open(struct physical *modem, struct bundle *bundle)
         return -1;
       }
       modem->fd = STDIN_FILENO;
-      modem_Found(modem);
+      modem_Found(modem, bundle);
     } else {
       LogPrintf(LogDEBUG, "modem_Open(direct): Modem is not a tty\n");
       modem_SetDevice(modem, "");
       /* We don't call modem_Timeout() with this type of connection */
-      modem_Found(modem);
+      modem_Found(modem, bundle);
       return modem->fd = STDIN_FILENO;
     }
   } else {
@@ -535,7 +536,7 @@ modem_Open(struct physical *modem, struct bundle *bundle)
 	    modem->fd = -1;
 	  }
 	  else {
-	    modem_Found(modem);
+	    modem_Found(modem, bundle);
 	    LogPrintf(LogDEBUG, "modem_Open: Modem is %s\n", modem->name.full);
 	  }
 	}
@@ -555,7 +556,7 @@ modem_Open(struct physical *modem, struct bundle *bundle)
 	    *cp = ':';		/* Don't destroy name.full */
 	    if (modem->fd < 0)
 	      return (-1);
-	    modem_Found(modem);
+	    modem_Found(modem, bundle);
 	    LogPrintf(LogDEBUG, "modem_Open: Modem is socket %s\n",
                       modem->name.full);
 	  } else {