From owner-freebsd-current@freebsd.org Fri Jun 23 01:22:02 2017 Return-Path: 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 94678D991D8 for ; Fri, 23 Jun 2017 01:22:02 +0000 (UTC) (envelope-from cy.schubert@komquats.com) Received: from mailman.ysv.freebsd.org (unknown [127.0.1.3]) by mx1.freebsd.org (Postfix) with ESMTP id 72832725BA for ; Fri, 23 Jun 2017 01:22:02 +0000 (UTC) (envelope-from cy.schubert@komquats.com) Received: by mailman.ysv.freebsd.org (Postfix) id 71AA7D991D7; Fri, 23 Jun 2017 01:22:02 +0000 (UTC) Delivered-To: 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 712CBD991D6 for ; Fri, 23 Jun 2017 01:22:02 +0000 (UTC) (envelope-from cy.schubert@komquats.com) Received: from smtp-out-no.shaw.ca (smtp-out-no.shaw.ca [64.59.134.9]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 2DFFE725B8; Fri, 23 Jun 2017 01:22:01 +0000 (UTC) (envelope-from cy.schubert@komquats.com) Received: from spqr.komquats.com ([96.50.22.10]) by shaw.ca with SMTP id ODILd8k8jM9gtODIMdrVeJ; Thu, 22 Jun 2017 19:22:00 -0600 X-Authority-Analysis: v=2.2 cv=a+JAzQaF c=1 sm=1 tr=0 a=jvE2nwUzI0ECrNeyr98KWA==:117 a=jvE2nwUzI0ECrNeyr98KWA==:17 a=LWSFodeU3zMA:10 a=XldT38RWNwACPDQzwzUA:9 a=5aufQkHnAAAA:8 a=CqyGHSk1Rq_vHws7gs0A:9 a=CjuIK1q_8ugA:10 a=rIO6M1_j7AogXox7yCAA:9 a=hquHOILUSkIA:10 a=YxBL1-UpAAAA:8 a=6I5d2MoRAAAA:8 a=ics_IjAVWSmO8OVX31YA:9 a=BOg4e644cxQA:10 a=5jWFXopkL0B9C0XP6NHj:22 a=Ia-lj3WSrqcvXOmTRaiG:22 a=IjZwj45LgO3ly-622nXo:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTPS id 11D036D2; Thu, 22 Jun 2017 18:21:54 -0700 (PDT) Received: from slippy (localhost [127.0.0.1]) by slippy.cwsent.com (8.15.2/8.15.2) with ESMTP id v5N1Kcjx061570; Thu, 22 Jun 2017 18:20:38 -0700 (PDT) (envelope-from Cy.Schubert@cschubert.com) Message-Id: <201706230120.v5N1Kcjx061570@slippy.cwsent.com> X-Mailer: exmh version 2.8.0 04/21/2012 with nmh-1.6 Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Mark Johnston cc: "Mikhail T." , Hans Petter Selasky , current@FreeBSD.org, cy@FreeBSD.org Subject: Re: ipfilter fails to compile WITHOUT_INET6 In-Reply-To: Message from Mark Johnston of "Thu, 22 Jun 2017 15:02:29 -0700." <20170622220229.GD56803@wkstn-mjohnston.west.isilon.com> Mime-Version: 1.0 Content-Type: multipart/mixed ; boundary="==_Exmh_1498180821_284940" Date: Thu, 22 Jun 2017 18:20:38 -0700 X-CMAE-Envelope: MS4wfFaUM+i2wKKBg/88Ygz5SJjLTi1X0ElDcGVRfgf2ygI1LeF9U9iMvoebS3l9+y+YHQttIjABsMAWNw3qhgRP4Iqq73KASMxKbL6uQwOAT8LvYFH04pi3 2StvUrkAe9grkvJSl9TodcwI/7tF3GIug34YkaLy//W+0QEqxJ4LuGDRK8Io277f687sxs9OYKdKuzr11OqUhSt+rLR9FxCsLIpjX05Ic7U3x+ubSMyynHs5 Q25EGcszciFpT+ps6MZ33xZKiUlQLP2rrodYNcZU5bGdDZ9kd6gGTwhRgqKNjVdk X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Jun 2017 01:22:02 -0000 This is a multipart MIME message. --==_Exmh_1498180821_284940 Content-Type: text/plain; charset=us-ascii In message <20170622220229.GD56803@wkstn-mjohnston.west.isilon.com>, Mark Johns ton writes: > On Thu, Jun 22, 2017 at 02:49:24PM -0400, Mikhail T. wrote: > > On 22.06.2017 10:28, Hans Petter Selasky wrote: > > > Usually you only need the kernel from drm-next. > > > > Maybe, the scope of the GH-project can/should be narrowed then? > > > > On 22.06.2017 12:54, Mark Johnston wrote: > > > I verified that the kernel compiles with IPFILTER enabled. > > I do not have IPFILTER in kernel -- indeed, kernel was compiling Ok > > before. It is the "world" that was not building... And still is not: > > Sorry, I missed that. I can reproduce the failure on stock FreeBSD by > building sbin/ipf with WITHOUT_INET6 set. CC'ed the ipf maintainer. > > > > > .../freebsd-base-graphics/contrib/ipfilter/lib/printhashnode.c:44:44: > > error: no member named 'in6' in 'union i6addr' > > str = inet_ntop(AF_INET6, &ipe.ipe_addr.in6, > > ~~~~~~~~~~~~ ^ > Hi Mikhai, Can you try the attached patch please? --==_Exmh_1498180821_284940 Content-Type: text/plain ; name="ipf_lib.diff"; charset=us-ascii Content-Description: ipf_lib.diff Content-Disposition: attachment; filename="ipf_lib.diff" Index: contrib/ipfilter/lib/familyname.c =================================================================== --- contrib/ipfilter/lib/familyname.c (revision 320221) +++ contrib/ipfilter/lib/familyname.c (working copy) @@ -4,7 +4,7 @@ { if (family == AF_INET) return "inet"; -#ifdef AF_INET6 +#ifdef USE_INET6 if (family == AF_INET6) return "inet6"; #endif Index: contrib/ipfilter/lib/printhashnode.c =================================================================== --- contrib/ipfilter/lib/printhashnode.c (revision 320221) +++ contrib/ipfilter/lib/printhashnode.c (working copy) @@ -35,7 +35,7 @@ } printf("\n"); } else if ((opts & OPT_DEBUG) != 0) { -#ifdef AF_INET6 +#ifdef USE_INET6 if (ipe.ipe_family == AF_INET6) { char buf[INET6_ADDRSTRLEN + 1]; const char *str; @@ -59,7 +59,7 @@ } else if (ipe.ipe_family == AF_INET) { #else if (ipe.ipe_family == AF_INET) { -#endif /* AF_INET6 */ +#endif /* USE_INET6 */ PRINTF("\t%d\tAddress: %s", hv, inet_ntoa(ipe.ipe_addr.in4)); printmask(ipe.ipe_family, (u_32_t *)&ipe.ipe_mask.in4_addr); Index: contrib/ipfilter/lib/printip.c =================================================================== --- contrib/ipfilter/lib/printip.c (revision 320221) +++ contrib/ipfilter/lib/printip.c (working copy) @@ -25,7 +25,7 @@ else PRINTF("%s", inet_ntoa(ipa)); } -#ifdef AF_INET6 +#ifdef USE_INET6 else if (family == AF_INET6) { char buf[INET6_ADDRSTRLEN + 1]; const char *str; Index: contrib/ipfilter/lib/printpoolnode.c =================================================================== --- contrib/ipfilter/lib/printpoolnode.c (revision 320221) +++ contrib/ipfilter/lib/printpoolnode.c (working copy) @@ -33,7 +33,7 @@ printmask(np->ipn_addr.adf_family, (u_32_t *)&np->ipn_mask.adf_addr); } else { -#ifdef AF_INET6 +#ifdef USE_INET6 if (np->ipn_addr.adf_family == AF_INET6) { char buf[INET6_ADDRSTRLEN + 1]; const char *str; @@ -54,9 +54,7 @@ } else { PRINTF("\tAddress: family: %d\n", np->ipn_addr.adf_family); -#ifdef AF_INET6 } -#endif printmask(np->ipn_addr.adf_family, (u_32_t *)&np->ipn_mask.adf_addr); #ifdef USE_QUAD_T --==_Exmh_1498180821_284940 Content-Type: text/plain; charset=us-ascii Cheers, Cy Schubert FreeBSD UNIX: Web: http://www.FreeBSD.org The need of the many outweighs the greed of the few. --==_Exmh_1498180821_284940--