X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=pppd%2Fdemand.c;h=bb6538cace93d9963459ede30e73b00b14f74e3e;hp=21a1f07c0b320156f693a8d6783a5fbdf026a740;hb=31b4bba68d46b38119fd8620ee09ff7f8831f4b5;hpb=a70f63bce70443ea411421f41cb27abfc62a8981

diff --git a/pppd/demand.c b/pppd/demand.c
index 21a1f07..bb6538c 100644
--- 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.1 1996/01/01 23:10:09 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,13 +32,19 @@ static char rcsid[] = "$Id: demand.c,v 1.1 1996/01/01 23:10:09 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"
 
+static const char rcsid[] = RCSID;
+
 char *frame;
 int framelen;
 int framemax;
@@ -58,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.
  */
@@ -83,6 +88,10 @@ 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.
      */
@@ -104,7 +113,7 @@ demand_block()
 
     for (i = 0; (protp = protocols[i]) != NULL; ++i)
 	if (protp->enabled_flag && protp->demand_conf != NULL)
-	    sifnpmode(0, protp->protocol, NPMODE_QUEUE);
+	    sifnpmode(0, protp->protocol & ~0x8000, NPMODE_QUEUE);
     get_loop_output();
 }
 
@@ -121,7 +130,7 @@ demand_discard()
 
     for (i = 0; (protp = protocols[i]) != NULL; ++i)
 	if (protp->enabled_flag && protp->demand_conf != NULL)
-	    sifnpmode(0, protp->protocol, NPMODE_ERROR);
+	    sifnpmode(0, protp->protocol & ~0x8000, NPMODE_ERROR);
     get_loop_output();
 
     /* discard all saved packets */
@@ -147,7 +156,7 @@ demand_unblock()
 
     for (i = 0; (protp = protocols[i]) != NULL; ++i)
 	if (protp->enabled_flag && protp->demand_conf != NULL)
-	    sifnpmode(0, protp->protocol, NPMODE_PASS);
+	    sifnpmode(0, protp->protocol & ~0x8000, NPMODE_PASS);
 }
 
 /*
@@ -240,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)
@@ -248,10 +261,14 @@ loop_frame(frame, len)
 {
     struct packet *pkt;
 
+    /* dbglog("from loop: %P", frame, len); */
     if (len < PPP_HDRLEN)
 	return 0;
-    if (PPP_PROTOCOL(frame) != PPP_IP)
+    if ((PPP_PROTOCOL(frame) & 0x8000) != 0)
+	return 0;		/* shouldn't get any of these anyway */
+    if (!active_packet(frame, len))
 	return 0;
+
     pkt = (struct packet *) malloc(sizeof(struct packet) + len);
     if (pkt != NULL) {
 	pkt->length = len;
@@ -280,9 +297,9 @@ demand_rexmit(proto)
     pkt = pend_q;
     pend_q = NULL;
     for (; pkt != NULL; pkt = nextpkt) {
+	nextpkt = pkt->next;
 	if (PPP_PROTOCOL(pkt->data) == proto) {
 	    output(0, pkt->data, pkt->length);
-	    nextpkt = pkt->next;
 	    free(pkt);
 	} else {
 	    if (prev == NULL)
@@ -293,4 +310,38 @@ demand_rexmit(proto)
 	}
     }
     pend_qtail = prev;
+    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 !!?? */
 }