Overhaul ppp:

  o Use syslog
  o Remove references to stdout/stderr (incl perror())
  o Introduce VarTerm - the interactive terminal or zero
  o Allow "set timeout" to affect current session
  o Change "set debug" to "set log"
  o Allow "set log [+|-]flag"
  o Make MSEXT and PASSWDAUTH stuff the default
  o Move all #ifdef DEBUG stuff into the code - this
    shouldn't be too much overhead.  It's now controlled
    with "set log +debug"
  o Add "set log command, debug, tun, warn, error, alert"
  o Remove cdefs.h, and assume an ansi compiler.
  o Improve all diagnostic output
  o Don't trap SIGSEGV
  o SIGHUP now terminates again (log files are controlled
    by syslog)
  o Call CloseModem() when changing devices
  o Fix parsing of third arg of "delete"

I think this fixes the "magic is same" problems that some
people have been experiencing.
The man page is being rewritten.  It'll follow soon.

1 files changed, 7 insertions, 13 deletions

diff --git a/usr.sbin/ppp/vjcomp.c b/usr.sbin/ppp/vjcomp.c
index ec1e585..3e02623 100644
--- a/usr.sbin/ppp/vjcomp.c
+++ b/usr.sbin/ppp/vjcomp.c
@@ -17,7 +17,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: vjcomp.c,v 1.6 1997/02/22 16:11:05 peter Exp $
+ * $Id: vjcomp.c,v 1.7 1997/05/07 23:30:50 brian Exp $
  *
  *  TODO:
  */
@@ -47,16 +47,12 @@ struct mbuf *bp;
   int proto;
   int cproto = IpcpInfo.his_compproto >> 16;
 
-#ifdef DEBUG
-  logprintf("SendPppFrame: proto = %x\n", IpcpInfo.his_compproto);
-#endif
+  LogPrintf(LogDEBUG, "SendPppFrame: proto = %x\n", IpcpInfo.his_compproto);
   if (((struct ip *)MBUF_CTOP(bp))->ip_p == IPPROTO_TCP
       && cproto== PROTO_VJCOMP) {
     type = sl_compress_tcp(bp, (struct ip *)MBUF_CTOP(bp), &cslc, IpcpInfo.his_compproto & 0xff);
 
-#ifdef DEBUG
-    logprintf("type = %x\n", type);
-#endif
+    LogPrintf(LogDEBUG, "SendPppFrame: type = %x\n", type);
     switch (type) {
     case TYPE_IP:
       proto = PROTO_IP;
@@ -68,7 +64,7 @@ struct mbuf *bp;
       proto = PROTO_VJCOMP;
       break;
     default:
-      logprintf("unknown type %x\n", type);
+      LogPrintf(LogERROR, "Unknown frame type %x\n", type);
       pfree(bp);
       return;
     }
@@ -132,10 +128,8 @@ int proto;
 {
   u_char type;
 
-#ifdef DEBUG
-  logprintf("VjCompInput (%02x):\n", proto);
-  DumpBp(bp);
-#endif
+  LogPrintf(LogDEBUG, "VjCompInput: proto %02x\n", proto);
+  LogDumpBp(LogDEBUG, "Raw packet info:", bp);
 
   switch (proto) {
   case PROTO_VJCOMP:
@@ -145,7 +139,7 @@ int proto;
     type = TYPE_UNCOMPRESSED_TCP;
     break;
   default:
-    logprintf("???\n");
+    LogPrintf(LogERROR, "VjCompInput...???\n");
     return(bp);
   }
   bp = VjUncompressTcp(bp, type);