X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=pppd%2Fdemand.c;h=8bf96d02b7ff700b3ac0294c1e0ff0c4b22d7000;hp=6df5d3df39246347bbe12741179a1f297e2f84b2;hb=7977da267649fee17261d0d163a12863f3534b57;hpb=4ab5b043993cbc76dcb9cc343726321a527267c3 diff --git a/pppd/demand.c b/pppd/demand.c index 6df5d3d..8bf96d0 100644 --- a/pppd/demand.c +++ b/pppd/demand.c @@ -1,32 +1,40 @@ /* - * auth.c - PPP authentication and phase control. + * demand.c - Support routines for demand-dialling. * - * Copyright (c) 1993 The Australian National University. - * All rights reserved. + * Copyright (c) 1996-2002 Paul Mackerras. All rights reserved. * - * Redistribution and use in source and binary forms are permitted - * provided that the above copyright notice and this paragraph are - * duplicated in all such forms and that any documentation, - * advertising materials, and other materials related to such - * distribution and use acknowledge that the software was developed - * by the Australian National University. The name of the University - * may not be used to endorse or promote products derived from this - * software without specific prior written permission. - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED - * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. The name(s) of the authors of this software must not be used to + * endorse or promote products derived from this software without + * prior written permission. + * + * 3. Redistributions of any form whatsoever must retain the following + * acknowledgment: + * "This product includes software developed by Paul Mackerras + * ". + * + * THE AUTHORS OF THIS SOFTWARE DISCLAIM ALL WARRANTIES WITH REGARD TO + * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY + * AND FITNESS, IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN + * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING + * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#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.19 2004/11/04 10:02:26 paulus Exp $" #include #include #include #include #include -#include #include #include #include @@ -35,14 +43,16 @@ static char rcsid[] = "$Id: demand.c,v 1.2 1996/04/04 03:36:44 paulus Exp $"; #include #include #include -#include -#include +#ifdef PPP_FILTER +#include +#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 +70,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. */ @@ -82,10 +94,14 @@ demand_conf() flush_flag = 0; fcs = PPP_INITFCS; - ppp_send_config(0, PPP_MRU, (u_int32_t) 0, 0, 0); - ppp_recv_config(0, PPP_MRU, (u_int32_t) 0, 0, 0); + netif_set_mtu(0, MIN(lcp_allowoptions[0].mru, PPP_MRU)); + if (ppp_send_config(0, PPP_MRU, (u_int32_t) 0, 0, 0) < 0 + || ppp_recv_config(0, PPP_MRU, (u_int32_t) 0, 0, 0) < 0) + fatal("Couldn't set up demand-dialled PPP interface: %m"); +#ifdef PPP_FILTER set_filters(&pass_filter, &active_filter); +#endif /* * Call the demand_conf procedure for each protocol that's got one. @@ -211,7 +227,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; @@ -256,12 +272,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 +324,38 @@ 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 (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 !!?? */ +}