From owner-freebsd-stable@FreeBSD.ORG Wed Aug 16 08:53:59 2006 Return-Path: X-Original-To: freebsd-stable@freebsd.org Delivered-To: freebsd-stable@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2655716A4DA; Wed, 16 Aug 2006 08:53:59 +0000 (UTC) (envelope-from dwmalone@maths.tcd.ie) Received: from salmon.maths.tcd.ie (salmon.maths.tcd.ie [134.226.81.11]) by mx1.FreeBSD.org (Postfix) with SMTP id 191B743D46; Wed, 16 Aug 2006 08:53:56 +0000 (GMT) (envelope-from dwmalone@maths.tcd.ie) Received: from walton.maths.tcd.ie ([134.226.81.10] helo=walton.maths.tcd.ie) by salmon.maths.tcd.ie with SMTP id ; 16 Aug 2006 09:53:54 +0100 (BST) Date: Wed, 16 Aug 2006 09:53:53 +0100 From: David Malone To: Kees Plonsz Message-ID: <20060816085353.GA96738@walton.maths.tcd.ie> References: <200608160813.21109.kees@jeremino.homeunix.net> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200608160813.21109.kees@jeremino.homeunix.net> User-Agent: Mutt/1.5.6i Sender: dwmalone@maths.tcd.ie Cc: mlaier@freebsd.org, freebsd-stable@freebsd.org Subject: Re: identity crisis of 6-STABLE in ipfw ipv6 ? X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 08:53:59 -0000 On Wed, Aug 16, 2006 at 08:13:20AM +0200, Kees Plonsz wrote: > I just updated to 6-STABLE but my ipfw rules stopped working. > It seems that "me6" is vanished into thin air. > > # ipfw add 7000 allow ip from me6 to me6 > ipfw: hostname ``me6'' unknown I think it was broken by some missing brackets in this commit: http://www.freebsd.org/cgi/cvsweb.cgi/src/sbin/ipfw/ipfw2.c#rev1.88 Can you try the patch below? If it looks good, Max or I can commit the fix. David. Index: ipfw2.c =================================================================== RCS file: /FreeBSD/FreeBSD-CVS/src/sbin/ipfw/ipfw2.c,v retrieving revision 1.88 diff -u -r1.88 ipfw2.c --- ipfw2.c 14 May 2006 03:53:04 -0000 1.88 +++ ipfw2.c 16 Aug 2006 08:50:04 -0000 @@ -3707,10 +3707,10 @@ inet_pton(AF_INET6, host, &a)) ret = add_srcip6(cmd, av); /* XXX: should check for IPv4, not !IPv6 */ - if ((ret == NULL) && proto == IPPROTO_IP || strcmp(av, "me") == 0 || - !inet_pton(AF_INET6, host, &a)) + if ((ret == NULL) && (proto == IPPROTO_IP || strcmp(av, "me") == 0 || + !inet_pton(AF_INET6, host, &a))) ret = add_srcip(cmd, av); - if ((ret == NULL) && strcmp(av, "any") != 0) + if ((ret == NULL) && (strcmp(av, "any") != 0)) ret = cmd; free(host); @@ -3733,10 +3733,10 @@ inet_pton(AF_INET6, host, &a)) ret = add_dstip6(cmd, av); /* XXX: should check for IPv4, not !IPv6 */ - if ((ret == NULL) && proto == IPPROTO_IP || strcmp(av, "me") == 0 || - !inet_pton(AF_INET6, av, &a)) + if ((ret == NULL) && (proto == IPPROTO_IP || strcmp(av, "me") == 0 || + !inet_pton(AF_INET6, av, &a))) ret = add_dstip(cmd, av); - if ((ret == NULL) && strcmp(av, "any") != 0) + if ((ret == NULL) && (strcmp(av, "any") != 0)) ret = cmd; free(host);