From owner-freebsd-stable@FreeBSD.ORG Wed Aug 16 17:35:57 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 3A3CB16A6D9; Wed, 16 Aug 2006 17:35:57 +0000 (UTC) (envelope-from kees@jeremino.homeunix.net) Received: from jeremino.homeunix.net (jeremino.xs4all.nl [80.126.224.163]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9F88743D46; Wed, 16 Aug 2006 17:35:54 +0000 (GMT) (envelope-from kees@jeremino.homeunix.net) Received: from jeremina.homeunix.net ([10.0.0.5]) by jeremino.homeunix.net with esmtp (Exim 4.60 (FreeBSD)) (envelope-from ) id 1GDPJ3-0002WY-9Y; Wed, 16 Aug 2006 19:35:53 +0200 From: Kees Plonsz Organization: not organized To: freebsd-stable@freebsd.org Date: Wed, 16 Aug 2006 19:35:52 +0200 User-Agent: KMail/1.9.1 References: <200608160813.21109.kees@jeremino.homeunix.net> <20060816085353.GA96738@walton.maths.tcd.ie> In-Reply-To: <20060816085353.GA96738@walton.maths.tcd.ie> X-Face: CaO1,W}6nFAHBh)0w2(~^_CxY38(@5bf5B,[ILEWbA}Yt.SkfH=!fRAy-|)=?utf-8?q?X=26=3Fkn=3DPU=27b=27=0A=09O=2EF6e/=26Eh=27fZ=5BX=5FQ=3FG?=,48c,hQUfRp5Tn4r{/x2Ujs@-0iu:Yht8_; 0ys}RwtpHy%+k.TD(=?utf-8?q?=0A=09i=7EJ+5S?=,%,Qar+e!$}QT`\+$4SF8<4#@dCF6>A<#=$VD; LRwWWq>=?utf-8?q?dCB=3DyL/=26odewcmr=24o2=24=0A=09=24qUOA=5DkV=5D=3DzOnM=27i?="4ag2fvaJ,~4~h$-A\N]H%FJSPaT3FoZ; nS%o1[kA?U>=?utf-8?q?3T=7DFD+l4SJ=0A=09XId=3F?=,-D^1uDfURbfI+; 6oQ'D"VB|MJyRIw]Z%; |gX8A)#N<9j%6xAS< MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200608161935.53019.kees@jeremino.homeunix.net> X-recieved-from: 10.0.0.5 Cc: David Malone , mlaier@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 17:35:57 -0000 On Wednesday 16 August 2006 10:53, David Malone wrote: > 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. Your patch did not work on the ipfw2.c I did the patch by hand and it was o.k. after testing. Here is my diff: # diff -u ipfw2.c.orig ipfw2.c --- ipfw2.c.orig Mon Aug 7 21:32:57 2006 +++ ipfw2.c Wed Aug 16 19:11:21 2006 @@ -3793,10 +3793,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); @@ -3819,10 +3819,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);