New user Process PPP based on iij-ppp0.94beta2.

   o Supporting SYNC SIO device (But need a device driver)
     - add "set speed sync"
   o Fixing bug for Predictor-1 function.
   o Add new parameter that re-sent interval for set timeout commands.
   o Improving RTT (Round Trip Time) and reducing processor time.
     - Previous Timer service was using polling, and now using
       SIGALRM ;-)
     - A 0.94beta2 will not work correctly....

   -- Follows are additinal feature not including 0.94beta2
   o Support Proxy ARP
     - add "enable/disable proxy" commands
   o Marging common routine in CHAP/PAP.
   o Enhancing LCP/IPCP log information.
   o Support local Authfication connection on port 300x and tty.
     - You can set up pair of your "hostname -s" and
       password in ppp.secret. if either ppp.secret file nor
       your hostname line don't exist, It will notify a message
       and working as same as previous version.(Backword compatibility)
     - If you did set up them, It's allow connection but nothing to do
       except help and passwd command.
     - add "passwd yourpasswd" commands
   o Support afilter - keep Alive filter that a packet can send/receiving
     according to ifilter/ofilter but doesn't count it as preventing idle
     timer expires.
     - Same syntax of other filters.
   o Fixing bugs reported by current user for previous one. Thanks !!

Reviewed by: Atsushi Murai (amurai@spec.co.jp)

1 files changed, 12 insertions, 4 deletions

diff --git a/usr.sbin/ppp/vjcomp.c b/usr.sbin/ppp/vjcomp.c
index 06f13ed..8c5df56 100644
--- a/usr.sbin/ppp/vjcomp.c
+++ b/usr.sbin/ppp/vjcomp.c
@@ -18,7 +18,7 @@
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
  * $Id:$
- *
+ * 
  *  TODO:
  */
 #include "fsm.h"
@@ -40,7 +40,7 @@ VjInit()
 }
 
 void
-SendPppFlame(pri, bp)
+SendPppFrame(pri, bp)
 int pri;
 struct mbuf *bp;
 {
@@ -49,10 +49,10 @@ struct mbuf *bp;
   int cproto = IpcpInfo.his_compproto >> 16;
 
 #ifdef DEBUG
-  logprintf("SendPppFlame: proto = %x\n", IpcpInfo.his_compproto);
+  logprintf("SendPppFrame: proto = %x\n", IpcpInfo.his_compproto);
 #endif
   if (cproto== PROTO_VJCOMP) {
-    type = sl_compress_tcp(bp, MBUF_CTOP(bp), &cslc, IpcpInfo.his_compproto & 0xff);
+    type = sl_compress_tcp(bp, (struct ip *)MBUF_CTOP(bp), &cslc, IpcpInfo.his_compproto & 0xff);
 
 #ifdef DEBUG
     logprintf("type = %x\n", type);
@@ -95,6 +95,10 @@ u_char type;
      */
     bufp = MBUF_CTOP(bp);
     len = sl_uncompress_tcp(&bufp, len, type, &cslc);
+    if (len <= 0) {
+      pfree(bp);
+      bp = NULLBUFF;
+    }
     return(bp);
   }
   /*
@@ -109,6 +113,10 @@ u_char type;
   bufp = work + MAX_HDR;
   bp = mbread(bp, bufp, rlen);
   len = sl_uncompress_tcp(&bufp, olen, type, &cslc);
+  if (len <= 0) {
+    pfree(bp);
+    return NULLBUFF;
+  }
   len -= olen;
   len += rlen;
   nbp = mballoc(len, MB_VJCOMP);