X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=pppd%2Fdemand.c;h=d46776692fa04f7158abcaac0fb4fd92af12fc22;hp=11eeee09655e98545fe86e1987ea1ad9c2a64073;hb=8832e3ba208085ae3f15c0d48c2bb7a02bc9ae79;hpb=ca3cca0c7b8125832841f9f8e3183002e411168b

diff --git a/pppd/demand.c b/pppd/demand.c
index 11eeee0..d467766 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.3 1996/05/28 00:37:53 paulus Exp $";
-#endif
+#define RCSID	"$Id: demand.c,v 1.15 2001/03/08 05:14:26 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,19 @@ static char rcsid[] = "$Id: demand.c,v 1.3 1996/05/28 00:37:53 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;
@@ -83,10 +85,11 @@ demand_conf()
     flush_flag = 0;
     fcs = PPP_INITFCS;
 
+    netif_set_mtu(0, MIN(lcp_allowoptions[0].mru, PPP_MRU));
     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
 
@@ -214,7 +217,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;
@@ -259,6 +262,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)
@@ -320,5 +324,28 @@ active_packet(p, len)
     unsigned char *p;
     int len;
 {
-    return 1;			/* for now */
+    int proto, i;
+    struct protent *protp;
+
+    if (len < PPP_HDRLEN)
+	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, p, 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 !!?? */
 }