added buflen arg to vj_uncompress_uncomp

diff --git a/include/net/vjcompress.h b/include/net/vjcompress.h
index 9abe488c4f764b9dfdd56232df3ad0c19de59d8f..03a33bf79c9b3f975c941d869d0a6f9ab4a69df7 100644 (file)
--- a/include/net/vjcompress.h
+++ b/include/net/vjcompress.h
@@ -1,7 +1,7 @@
 /*
  * Definitions for tcp compression routines.
  *
 /*
  * Definitions for tcp compression routines.
  *

- * $Id: vjcompress.h,v 1.2 1994/09/19 04:20:28 paulus Exp $
+ * $Id: vjcompress.h,v 1.3 1996/05/28 00:55:33 paulus Exp $

  *
  * Copyright (c) 1989 Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1989 Regents of the University of California.
  * All rights reserved.


@@ -132,12 +132,13 @@ struct vjcompress {
 
 extern void  vj_compress_init __P((struct vjcompress *comp, int max_state));
 extern u_int vj_compress_tcp __P((struct ip *ip, u_int mlen,
 
 extern void  vj_compress_init __P((struct vjcompress *comp, int max_state));
 extern u_int vj_compress_tcp __P((struct ip *ip, u_int mlen,

-                                 struct vjcompress *comp,
-                                 int compress_cid_flag, u_char **vjhdrp));
+                               struct vjcompress *comp, int compress_cid_flag,
+                               u_char **vjhdrp));

 extern void  vj_uncompress_err __P((struct vjcompress *comp));
 extern void  vj_uncompress_err __P((struct vjcompress *comp));

-extern int   vj_uncompress_uncomp __P((u_char *buf, struct vjcompress *comp));
+extern int   vj_uncompress_uncomp __P((u_char *buf, int buflen,
+                               struct vjcompress *comp));

 extern int   vj_uncompress_tcp __P((u_char *buf, int buflen, int total_len,
 extern int   vj_uncompress_tcp __P((u_char *buf, int buflen, int total_len,

-                                   struct vjcompress *comp, u_char **hdrp,
-                                   u_int *hlenp));
+                               struct vjcompress *comp, u_char **hdrp,
+                               u_int *hlenp));

 
 #endif /* _VJCOMPRESS_H_ */
 
 #endif /* _VJCOMPRESS_H_ */

diff --git a/modules/ppp_comp.c b/modules/ppp_comp.c
index 215830eeaa7166dbf048ece6d0c7d048e2d8428a..9e20afdf73f85b9db96d806ce764fdbc6e01e7f0 100644 (file)
--- a/modules/ppp_comp.c
+++ b/modules/ppp_comp.c
@@ -24,7 +24,7 @@
  * OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS,
  * OR MODIFICATIONS.
  *
  * OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS,
  * OR MODIFICATIONS.
  *

- * $Id: ppp_comp.c,v 1.2 1996/01/18 03:18:07 paulus Exp $
+ * $Id: ppp_comp.c,v 1.3 1996/05/28 00:55:44 paulus Exp $

  */
 
 /*
  */
 
 /*


@@ -736,7 +736,7 @@ ppp_comp_rsrv(q)
                /*
                 * "Decompress" a VJ-uncompressed packet.
                 */
                /*
                 * "Decompress" a VJ-uncompressed packet.
                 */

-               if (!vj_uncompress_uncomp(dp, &cp->vj_comp))
+               if (!vj_uncompress_uncomp(dp, hlen, &cp->vj_comp))

                    goto bad;
                mp->b_rptr[3] = PPP_IP; /* fix up the PPP protocol field */
            }
                    goto bad;
                mp->b_rptr[3] = PPP_IP; /* fix up the PPP protocol field */
            }