syslog -> notice/error/etc.

[ppp.git] / pppd / demand.c

diff --git a/pppd/demand.c b/pppd/demand.c
index f35c5319c638fad719e7d9cb6488efe8246b6e55..17a35ef3dda004649b8d28dedb8ab506cd38878d 100644 (file)
--- a/pppd/demand.c
+++ b/pppd/demand.c
@@ -18,7 +18,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: demand.c,v 1.4 1996/07/01 01:12:52 paulus Exp $";
+static char rcsid[] = "$Id: demand.c,v 1.8 1999/03/16 03:15:14 paulus Exp $";
 #endif
 
 #include <stdio.h>
@@ -26,7 +26,6 @@ static char rcsid[] = "$Id: demand.c,v 1.4 1996/07/01 01:12:52 paulus Exp $";
 #include <string.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <syslog.h>
 #include <netdb.h>
 #include <sys/param.h>
 #include <sys/types.h>
@@ -35,7 +34,11 @@ static char rcsid[] = "$Id: demand.c,v 1.4 1996/07/01 01:12:52 paulus Exp $";
 #include <sys/resource.h>
 #include <sys/stat.h>
 #include <sys/socket.h>
+#ifdef PPP_FILTER
 #include <net/if.h>
+#include <net/bpf.h>
+#include <pcap.h>
+#endif
 
 #include "pppd.h"
 #include "fsm.h"
@@ -85,7 +88,7 @@ demand_conf()
     ppp_send_config(0, PPP_MRU, (u_int32_t) 0, 0, 0);
     ppp_recv_config(0, PPP_MRU, (u_int32_t) 0, 0, 0);
 
-#if 0
+#ifdef PPP_FILTER
     set_filters(&pass_filter, &active_filter);
 #endif
 
@@ -246,6 +249,10 @@ loop_chars(p, n)
  * decide whether to bring up the link or not, and, if we want
  * to transmit this frame later, put it on the pending queue.
  * Return value is 1 if we need to bring up the link, 0 otherwise.
+ * We assume that the kernel driver has already applied the
+ * pass_filter, so we won't get packets it rejected.
+ * We apply the active_filter to see if we want this packet to
+ * bring up the link.
  */
 int
 loop_frame(frame, len)
@@ -254,6 +261,7 @@ loop_frame(frame, len)
 {
     struct packet *pkt;
 
+    /* dbglog("from loop: %P", frame, len); */
     if (len < PPP_HDRLEN)
        return 0;
     if ((PPP_PROTOCOL(frame) & 0x8000) != 0)
@@ -321,6 +329,11 @@ active_packet(p, len)
     if (len < PPP_HDRLEN)
        return 0;
     proto = PPP_PROTOCOL(p);
+#ifdef PPP_FILTER
+    if (active_filter.bf_len != 0
+       && bpf_filter(active_filter.bf_insns, frame, len, len) == 0)
+       return 0;
+#endif
     for (i = 0; (protp = protocols[i]) != NULL; ++i) {
        if (protp->protocol < 0xC000 && (protp->protocol & ~0x8000) == proto) {
            if (!protp->enabled_flag)