typo

[ppp.git] / pppd / demand.c

diff --git a/pppd/demand.c b/pppd/demand.c
index 6df5d3df39246347bbe12741179a1f297e2f84b2..bb6538cace93d9963459ede30e73b00b14f74e3e 100644 (file)
--- a/pppd/demand.c
+++ b/pppd/demand.c
@@ -1,5 +1,5 @@
 /*
- * auth.c - PPP authentication and phase control.
+ * demand.c - Support routines for demand-dialling.
  *
  * Copyright (c) 1993 The Australian National University.
  * All rights reserved.
@@ -17,16 +17,13 @@
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static char rcsid[] = "$Id: demand.c,v 1.2 1996/04/04 03:36:44 paulus Exp $";
-#endif
+#define RCSID  "$Id: demand.c,v 1.12 1999/08/13 06:46:12 paulus Exp $";
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <syslog.h>
 #include <netdb.h>
 #include <sys/param.h>
 #include <sys/types.h>
@@ -35,14 +32,18 @@ static char rcsid[] = "$Id: demand.c,v 1.2 1996/04/04 03:36:44 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"
 #include "ipcp.h"
 #include "lcp.h"
-#include "bpf_compile.h"
+
+static const char rcsid[] = RCSID;
 
 char *frame;
 int framelen;
@@ -60,6 +61,8 @@ struct packet {
 struct packet *pend_q;
 struct packet *pend_qtail;
 
+static int active_packet __P((unsigned char *, int));
+
 /*
  * demand_conf - configure the interface for doing dial-on-demand.
  */
@@ -85,7 +88,9 @@ 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);
 
+#ifdef PPP_FILTER
     set_filters(&pass_filter, &active_filter);
+#endif
 
     /*
      * Call the demand_conf procedure for each protocol that's got one.
@@ -256,12 +261,12 @@ 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)
        return 0;               /* shouldn't get any of these anyway */
-    if (active_filter.bf_len != 0
-       && bpf_filter(active_filter.bf_insns, frame, len, len) == 0)
+    if (!active_packet(frame, len))
        return 0;
 
     pkt = (struct packet *) malloc(sizeof(struct packet) + len);
@@ -308,3 +313,35 @@ demand_rexmit(proto)
     if (prev != NULL)
        prev->next = NULL;
 }
+
+/*
+ * Scan a packet to decide whether it is an "active" packet,
+ * that is, whether it is worth bringing up the link for.
+ */
+static int
+active_packet(p, len)
+    unsigned char *p;
+    int len;
+{
+    int proto, i;
+    struct protent *protp;
+
+    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)
+               return 0;
+           if (protp->active_pkt == NULL)
+               return 1;
+           return (*protp->active_pkt)(p, len);
+       }
+    }
+    return 0;                  /* not a supported protocol !!?? */
+}