X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=pppd%2Fdemand.c;h=957b84a97d3d5c481c7af26015c48c88fe5d2f98;hb=6c85691696e798a46158b459436a78fba3dcc46f;hp=86c176e607f89965f91f889ef9266a4a6405ca61;hpb=245edcbc083b72db45d78ef4880a4a0f5e3d3e16;p=ppp.git

diff --git a/pppd/demand.c b/pppd/demand.c
index 86c176e..957b84a 100644
--- a/pppd/demand.c
+++ b/pppd/demand.c
@@ -17,9 +17,7 @@
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static char rcsid[] = "$Id: demand.c,v 1.9 1999/03/19 01:21:28 paulus Exp $";
-#endif
+#define RCSID	"$Id: demand.c,v 1.14 2000/12/27 23:27:29 paulus Exp $"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -45,6 +43,8 @@ static char rcsid[] = "$Id: demand.c,v 1.9 1999/03/19 01:21:28 paulus Exp $";
 #include "ipcp.h"
 #include "lcp.h"
 
+static const char rcsid[] = RCSID;
+
 char *frame;
 int framelen;
 int framemax;
@@ -62,7 +62,6 @@ struct packet *pend_q;
 struct packet *pend_qtail;
 
 static int active_packet __P((unsigned char *, int));
-static int loop_frame __P((unsigned char *, int));
 
 /*
  * demand_conf - configure the interface for doing dial-on-demand.
@@ -217,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;
@@ -255,7 +254,7 @@ loop_chars(p, n)
  * We apply the active_filter to see if we want this packet to
  * bring up the link.
  */
-static int
+int
 loop_frame(frame, len)
     unsigned char *frame;
     int len;
@@ -331,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) {