Large patch from Frank Cusack <fcusack@fcusack.com> to add proper

[ppp.git] / pppd / demand.c

diff --git a/pppd/demand.c b/pppd/demand.c
index 86f286b28e2e207473c74b655cc3b0de01aee42d..d46776692fa04f7158abcaac0fb4fd92af12fc22 100644 (file)
--- a/pppd/demand.c
+++ b/pppd/demand.c
@@ -17,9 +17,7 @@
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] = "$Id: demand.c,v 1.11 1999/08/12 04:25:20 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>
@@ -45,6 +43,8 @@ static const char rcsid[] = "$Id: demand.c,v 1.11 1999/08/12 04:25:20 paulus Exp
 #include "ipcp.h"
 #include "lcp.h"
 
+static const char rcsid[] = RCSID;
+
 char *frame;
 int framelen;
 int framemax;
@@ -85,6 +85,7 @@ 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);
 
@@ -216,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;
@@ -330,8 +331,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) {