lkml.org 
[lkml]   [2004]   [Aug]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] Restore PPP filtering
On Sat, Aug 07, 2004 at 10:41:05PM +1000, Paul Mackerras wrote:
> Karsten Keil's patch entitled "[ISDN]: Fix kernel PPP/IPPP
> active/passiv filter code" that went in back in April was an attempt
> to solve a real problem - namely that the libpcap maintainers have
> removed useful functionality that pppd was using - but his fix broke
> existing pppd binaries and IMO didn't end up actually solving the
> problem.
>
> This patch reverts the change to ppp_generic.c so that existing pppd
> binaries work again. I am going to have to work out a proper fix,
> which may involve further changes to ppp_generic.c, but I will make
> sure existing pppd binaries still work.
>
> Please apply.

I agree with Paul.

>
> Signed-off-by: Paul Mackerras <paulus@samba.org>
>
> diff -urN linux-2.5/drivers/net/ppp_generic.c pmac-2.5/drivers/net/ppp_generic.c
> --- linux-2.5/drivers/net/ppp_generic.c 2004-07-28 01:06:02.000000000 +1000
> +++ pmac-2.5/drivers/net/ppp_generic.c 2004-08-07 21:07:09.018980776 +1000
> @@ -1026,11 +1026,7 @@
> /* check if we should pass this packet */
> /* the filter instructions are constructed assuming
> a four-byte PPP header on each packet */
> - {
> - u_int16_t *p = (u_int16_t *) skb_push(skb, 2);
> -
> - *p = htons(4); /* indicate outbound in DLT_LINUX_SLL */;
> - }
> + *skb_push(skb, 2) = 1;
> if (ppp->pass_filter
> && sk_run_filter(skb, ppp->pass_filter,
> ppp->pass_len) == 0) {
> @@ -1573,11 +1569,7 @@
> /* check if the packet passes the pass and active filters */
> /* the filter instructions are constructed assuming
> a four-byte PPP header on each packet */
> - {
> - u_int16_t *p = (u_int16_t *) skb_push(skb, 2);
> -
> - *p = 0; /* indicate inbound in DLT_LINUX_SLL */
> - }
> + *skb_push(skb, 2) = 0;
> if (ppp->pass_filter
> && sk_run_filter(skb, ppp->pass_filter,
> ppp->pass_len) == 0) {

--
Karsten Keil
SuSE Labs
ISDN development
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2005-03-22 14:05    [W:0.049 / U:6.500 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site