diff -urN isdn4k-utils-clean/ipppd/ipppd.h isdn4k-utils_ippp-filter/ipppd/ipppd.h --- isdn4k-utils-clean/ipppd/ipppd.h 2002-07-06 02:34:08.000000000 +0200 +++ isdn4k-utils_ippp-filter/ipppd/ipppd.h 2003-01-27 12:56:54.000000000 +0100 @@ -215,6 +215,11 @@ #ifdef __linux__ extern int hostroute; /* Add a route to the host at the other end? */ #endif +#ifdef IPPP_FILTER +#include +extern struct bpf_program pass_filter; /* Filter for pkts to pass */ +extern struct bpf_program active_filter; /* Filter for link-active pkts */ +#endif /* IPPP_FILTER */ /* * Values for phase. @@ -288,6 +293,9 @@ void link_terminated(int); void link_down(int); void link_established(int unit); +#ifdef IPPP_FILTER +int set_filters(int, struct bpf_program *, struct bpf_program *); +#endif /* IPPP_FILTER */ int device_script(char *program,int in,int out); void check_auth_options(void); void setipdefault(void); diff -urN isdn4k-utils-clean/ipppd/ippp-filter-compat.h isdn4k-utils_ippp-filter/ipppd/ippp-filter-compat.h --- isdn4k-utils-clean/ipppd/ippp-filter-compat.h 1970-01-01 01:00:00.000000000 +0100 +++ isdn4k-utils_ippp-filter/ipppd/ippp-filter-compat.h 2003-02-10 06:00:05.000000000 +0100 @@ -0,0 +1,11 @@ +#ifndef _IPPP_FILTER_COMPAT_H +#define _IPPP_FILTER_COMPAT_T + +#ifndef PPPIOCSPASS +#define PPPIOCSPASS _IOW('t', 71, struct sock_fprog) /* set pass filter */ +#endif +#ifndef PPPIOCSACTIVE +#define PPPIOCSACTIVE _IOW('t', 70, struct sock_fprog) /* set active filter */ +#endif + +#endif /* _IPPP_FILTER_COMPAT_T */ diff -urN isdn4k-utils-clean/ipppd/main.c isdn4k-utils_ippp-filter/ipppd/main.c --- isdn4k-utils-clean/ipppd/main.c 2002-07-18 02:06:21.000000000 +0200 +++ isdn4k-utils_ippp-filter/ipppd/main.c 2003-01-27 12:56:54.000000000 +0100 @@ -564,6 +564,9 @@ lns[linkunit].upap_unit = lns[linkunit].chap_unit = lns[linkunit].lcp_unit; upap[lns[linkunit].upap_unit].us_unit = chap[lns[linkunit].chap_unit].unit = linkunit; lcp_lowerup(lns[linkunit].lcp_unit); +#ifdef IPPP_FILTER + set_filters(linkunit, &pass_filter, &active_filter); +#endif /* IPPP_FILTER */ return 0; } diff -urN isdn4k-utils-clean/ipppd/options.c isdn4k-utils_ippp-filter/ipppd/options.c --- isdn4k-utils-clean/ipppd/options.c 2002-07-06 02:34:08.000000000 +0200 +++ isdn4k-utils_ippp-filter/ipppd/options.c 2003-02-10 06:06:03.000000000 +0100 @@ -39,6 +39,10 @@ #include #endif +#ifdef IPPP_FILTER +#include +#endif /* IPPP_FILTER */ + #include "fsm.h" #include "ipppd.h" #include "pathnames.h" @@ -140,6 +144,10 @@ struct option_info auth_req_info; struct option_info devnam_info; +#ifdef IPPP_FILTER +struct bpf_program pass_filter;/* Filter program for packets to pass */ +struct bpf_program active_filter; /* Filter program for link-active pkts */ +#endif /* IPPP_FILTER */ /* * Prototypes @@ -292,6 +300,11 @@ int __P (radius_init ( void )); #endif +#ifdef IPPP_FILTER +static int setpassfilter __P((int,char **)); +static int setactivefilter __P((int,char **)); +#endif /* IPPP_FILTER */ + /* * Valid arguments. */ @@ -470,7 +483,10 @@ {"nohostroute", 0, setnohostroute}, /* Don't add host route */ #endif {"+force-driver",0,setforcedriver}, - +#ifdef IPPP_FILTER + { "pass-filter", 1, setpassfilter}, /* pass filter */ + { "active-filter", 1, setactivefilter}, /* link-active filter */ +#endif /* IPPP_FILTER */ {NULL, 0, NULL} }; @@ -2615,3 +2631,33 @@ force_driver = 1; return 1; } + +#ifdef IPPP_FILTER +/* + * setpassfilter - Set the pass filter for packets + */ +static int +setpassfilter(argc, argv) + int argc; + char **argv; +{ + if (pcap_compile_nopcap(PPP_HDRLEN, DLT_PPP, &pass_filter, *argv, 1, netmask) == 0) + return 1; + option_error("error in pass-filter expression.\n"); + return 0; +} + +/* + * setactivefilter - Set the active filter for packets + */ +static int +setactivefilter(argc, argv) + int argc; + char **argv; +{ + if (pcap_compile_nopcap(PPP_HDRLEN, DLT_PPP, &active_filter, *argv, 1, netmask) == 0) + return 1; + option_error("error in active-filter expression.\n"); + return 0; +} +#endif /* IPPP_FILTER */ diff -urN isdn4k-utils-clean/ipppd/sys-linux.c isdn4k-utils_ippp-filter/ipppd/sys-linux.c --- isdn4k-utils-clean/ipppd/sys-linux.c 2000-10-05 22:45:25.000000000 +0200 +++ isdn4k-utils_ippp-filter/ipppd/sys-linux.c 2003-02-10 06:00:35.000000000 +0100 @@ -57,6 +57,7 @@ #if defined __GLIBC__ && __GLIBC__ >= 2 # include # include +# include "ippp-filter-compat.h" # include # include "route.h" #else @@ -70,6 +71,11 @@ # include #endif +#ifdef IPPP_FILTER +#include +#include +#endif /* IPPP_FILTER */ + #include "fsm.h" #include "ipppd.h" #include "ipcp.h" @@ -515,6 +521,40 @@ return 1; } +#ifdef IPPP_FILTER +/* + * set_filters - set the active and pass filters in the kernel driver. + */ +int set_filters(int u, struct bpf_program *pass, struct bpf_program *active) +{ + struct sock_fprog fp; + + /* + * unfortunately there is no way of checking for kernel support. the + * driver just returns 0 for unsupported ioctls, which means without + * kernel support we won't even notice the error. + */ + + if (pass) { + fp.len = pass->bf_len; + fp.filter = (struct sock_filter *) pass->bf_insns; + if (ioctl(lns[u].fd, PPPIOCSPASS, &fp) < 0) { + syslog(LOG_ERR, "Couldn't set pass-filter in kernel."); + return 0; + } + } + if (active) { + fp.len = active->bf_len; + fp.filter = (struct sock_filter *) active->bf_insns; + if (ioctl(lns[u].fd, PPPIOCSACTIVE, &fp) < 0) { + syslog(LOG_ERR, "Couldn't set active-filter in kernel."); + return 0; + } + } + return 1; +} +#endif /* IPPP_FILTER */ + /* * sifup - Config the interface up and enable IP packets to pass. */