Because of a bug in zlib, restrict deflate parameter to 9..15 for now.

[ppp.git] / pppd / demand.c

diff --git a/pppd/demand.c b/pppd/demand.c
index bb6538cace93d9963459ede30e73b00b14f74e3e..957b84a97d3d5c481c7af26015c48c88fe5d2f98 100644 (file)
--- a/pppd/demand.c
+++ b/pppd/demand.c
@@ -17,7 +17,7 @@
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#define RCSID  "$Id: demand.c,v 1.12 1999/08/13 06:46:12 paulus Exp $";
+#define RCSID  "$Id: demand.c,v 1.14 2000/12/27 23:27:29 paulus Exp $"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -216,7 +216,7 @@ loop_chars(p, n)
            if (!escape_flag && !flush_flag
                && framelen > 2 && fcs == PPP_GOODFCS) {
                framelen -= 2;
-               if (loop_frame(frame, framelen))
+               if (loop_frame((unsigned char *)frame, framelen))
                    rv = 1;
            }
            framelen = 0;
@@ -330,8 +330,11 @@ active_packet(p, len)
        return 0;
     proto = PPP_PROTOCOL(p);
 #ifdef PPP_FILTER
+    if (pass_filter.bf_len != 0
+       && bpf_filter(pass_filter.bf_insns, p, len, len) == 0)
+       return 0;
     if (active_filter.bf_len != 0
-       && bpf_filter(active_filter.bf_insns, frame, len, len) == 0)
+       && bpf_filter(active_filter.bf_insns, p, len, len) == 0)
        return 0;
 #endif
     for (i = 0; (protp = protocols[i]) != NULL; ++i) {