Re: pf match on route labels

[Daniel Hartmeier <daniel_(_at_)_benzedrine_(_dot_)_cx>]

On Tue, Nov 23, 2004 at 02:36:04PM +0100, Henning Brauer wrote:

> Index: sys/net/pfvar.h
> ===================================================================
> RCS file: /cvs/src/sys/net/pfvar.h,v
> retrieving revision 1.204
> diff -u -p -r1.204 pfvar.h
> --- sys/net/pfvar.h	16 Nov 2004 20:07:57 -0000	1.204
> +++ sys/net/pfvar.h	23 Nov 2004 13:33:27 -0000

> @@ -279,6 +282,9 @@ struct pfi_dynaddr {
>  	(							\
>  		(((aw)->type == PF_ADDR_NOROUTE &&		\
>  		    pf_routable((x), (af))) ||			\
> +		((aw)->type == PF_ADDR_RTLABEL &&		\
> +		    pf_rtlabel_match((x), (af), (aw))) !=	\
> +		    (neg) ||					\
>  		((aw)->type == PF_ADDR_TABLE &&			\
>  		    !pfr_match_addr((aw)->p.tbl, (x), (af))) ||	\
>  		((aw)->type == PF_ADDR_DYNIFTL &&		\

I think the '!= (neg)' here is wrong. That's covered by the existing
comparison at the end of the expression already. Take a look at

  http://marc.theaimsgroup.com/?l=openbsd-bugs&m=110164418713592

and you'll see the effect :)

Daniel