From owner-freebsd-current@freebsd.org  Sat Nov  7 22:39:31 2015
Return-Path: <owner-freebsd-current@freebsd.org>
Delivered-To: freebsd-current@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 98F6FA210C1
 for <freebsd-current@mailman.ysv.freebsd.org>;
 Sat,  7 Nov 2015 22:39:31 +0000 (UTC) (envelope-from tom@uffner.com)
Received: from eris.uffner.com (eris.uffner.com [71.162.143.94])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "eris.uffner.com", Issuer "Uffner.com CA" (not verified))
 by mx1.freebsd.org (Postfix) with ESMTPS id 609861313;
 Sat,  7 Nov 2015 22:39:31 +0000 (UTC) (envelope-from tom@uffner.com)
Received: from discordia.uffner.com (discordia.uffner.com [10.69.69.61])
 (authenticated bits=0)
 by eris.uffner.com (8.14.9/8.14.9) with ESMTP id tA7MdFwm051333
 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=FAIL);
 Sat, 7 Nov 2015 17:39:23 -0500 (EST) (envelope-from tom@uffner.com)
Message-ID: <563E7D93.3030204@uffner.com>
Date: Sat, 07 Nov 2015 17:39:15 -0500
From: Tom Uffner <tom@uffner.com>
User-Agent: Mozilla/5.0 (X11; FreeBSD amd64;
 rv:36.0) Gecko/20100101 Firefox/36.0 SeaMonkey/2.33.1
MIME-Version: 1.0
To: Kristof Provost <kp@FreeBSD.org>
CC: FreeBSD-Current <freebsd-current@FreeBSD.org>
Subject: Re: r289932 causes pf reversion - breaks rules with broadcast
 destination
References: <563AB177.6030809@uffner.com> <563B944A.50905@uffner.com>
 <20151106160610.GB2336@vega.codepro.be>
In-Reply-To: <20151106160610.GB2336@vega.codepro.be>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: Discussions about the use of FreeBSD-current
 <freebsd-current.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/freebsd-current>, 
 <mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current/>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/freebsd-current>, 
 <mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 07 Nov 2015 22:39:31 -0000

Kristof Provost wrote:
> Can you give this a quick test:
>
> diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c
> index 1dfc37d..762b82e 100644
> --- a/sys/netpfil/pf/pf.c
> +++ b/sys/netpfil/pf/pf.c
> @@ -1973,9 +1973,9 @@ pf_addr_wrap_neq(struct pf_addr_wrap *aw1, struct pf_addr_wrap *aw2)
>          switch (aw1->type) {
>          case PF_ADDR_ADDRMASK:
>          case PF_ADDR_RANGE:
> -               if (PF_ANEQ(&aw1->v.a.addr, &aw2->v.a.addr, 0))
> +               if (PF_ANEQ(&aw1->v.a.addr, &aw2->v.a.addr, AF_INET6))
>                          return (1);
> -               if (PF_ANEQ(&aw1->v.a.mask, &aw2->v.a.mask, 0))
> +               if (PF_ANEQ(&aw1->v.a.mask, &aw2->v.a.mask, AF_INET6))
>                          return (1);
>                  return (0);
>          case PF_ADDR_DYNIFTL:

Your patch appears to solve the problem. Thanks!

Also thank you for your quick response.

Sorry I took so long to reply, but I was getting bizarre results from
the "quick" test, and needed to fall back to a full kernel rebuild w/
a consistent set of sources to do a fair apples to apples comparison.

tom