Re: ipfilter fails to compile WITHOUT_INET6
In message <16738440-df50-0e33-2a50-340071212...@aldan.algebra.com>, "Mikhail T ." writes: > This is a multi-part message in MIME format. > --DC959F413BFB254449706900 > Content-Type: text/plain; charset=ISO-8859-1; format=flowed > Content-Transfer-Encoding: 7bit > > On 22.06.2017 21:20, Cy Schubert wrote: > > Can you try the attached patch please? > Yes, replacing: > > -#ifdef AF_INET6 > +#ifdef USE_INET6 > > lets the build succeed. Is it Ok to modify stuff under contrib/ though?.. Yes, I've already committed the patch and also to ipf_y.y in ../tools/. I'll be pushing these and a lot of other changes upline when I'm done. The work that has been done so far -- fixing bugs -- has also been shared with NetBSD. I've used some of NetBSD's ipfilter patches in our tree. -- Cheers, Cy Schubert FreeBSD UNIX: Web: http://www.FreeBSD.org The need of the many outweighs the greed of the few. ___ freebsd-current@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/freebsd-current To unsubscribe, send any mail to "freebsd-current-unsubscr...@freebsd.org"
Re: ipfilter fails to compile WITHOUT_INET6
On 22.06.2017 21:20, Cy Schubert wrote: Can you try the attached patch please? Yes, replacing: -#ifdef AF_INET6 +#ifdef USE_INET6 lets the build succeed. Is it Ok to modify stuff under contrib/ though?.. -mi ___ freebsd-current@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/freebsd-current To unsubscribe, send any mail to "freebsd-current-unsubscr...@freebsd.org"
Re: ipfilter fails to compile WITHOUT_INET6
In message <2017060229.gd56...@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?
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
Cheers,
Cy Schubert
FreeBSD UNIX: Web: http://www.FreeBSD.org
The need of the many outweighs the greed of the few.
___
freebsd-current@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/freebsd-current
To unsubscribe, send any mail to "freebsd-current-unsubscr...@freebsd.org"
Re: ipfilter fails to compile WITHOUT_INET6
In message , Hans Petter Selasky w rites: > On 06/22/17 15:51, Mikhail T. wrote: > > Trying to build 12.0-CURRENT (well, actually, the next-drm Git branch), > > I get: > > > > /contrib/ipfilter/lib/printpoolnode.c:42:53: error: no member named > > 'in6' in 'union i6addr' > > str = inet_ntop(AF_INET6, > > &np->ipn_addr.adf_addr.in6, > > > > The same error is raised by printhashnode.c . Yours, > > > > Hi, > > Possibly drm-next needs a sync. Usually you only need the kernel from > drm-next. Possibly. That code is in an ifdef only for inet6 and has been tinderbox built on a universe machine. I'm rebuilding locally to verify the report. Cheers, Cy Schubert FreeBSD UNIX: Web: http://www.FreeBSD.org The need of the many outweighs the greed of the few. ___ freebsd-current@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/freebsd-current To unsubscribe, send any mail to "freebsd-current-unsubscr...@freebsd.org"
Re: ipfilter fails to compile WITHOUT_INET6
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, > ^ ___ freebsd-current@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/freebsd-current To unsubscribe, send any mail to "freebsd-current-unsubscr...@freebsd.org"
Re: ipfilter fails to compile WITHOUT_INET6
On Thu, Jun 22, 2017 at 04:28:34PM +0200, Hans Petter Selasky wrote: > On 06/22/17 15:51, Mikhail T. wrote: > > Trying to build 12.0-CURRENT (well, actually, the next-drm Git branch), > > I get: > > > > /contrib/ipfilter/lib/printpoolnode.c:42:53: error: no member named > > 'in6' in 'union i6addr' > > str = inet_ntop(AF_INET6, > > &np->ipn_addr.adf_addr.in6, > > > > The same error is raised by printhashnode.c . Yours, > > > > Hi, > > Possibly drm-next needs a sync. Usually you only need the kernel from > drm-next. I've pushed an update which merges FreeBSD up to r320196. I verified that the kernel compiles with IPFILTER enabled. Please give it a try. ___ freebsd-current@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/freebsd-current To unsubscribe, send any mail to "freebsd-current-unsubscr...@freebsd.org"
Re: ipfilter fails to compile WITHOUT_INET6
On 06/22/17 15:51, Mikhail T. wrote: Trying to build 12.0-CURRENT (well, actually, the next-drm Git branch), I get: /contrib/ipfilter/lib/printpoolnode.c:42:53: error: no member named 'in6' in 'union i6addr' str = inet_ntop(AF_INET6, &np->ipn_addr.adf_addr.in6, The same error is raised by printhashnode.c . Yours, Hi, Possibly drm-next needs a sync. Usually you only need the kernel from drm-next. --HPS ___ freebsd-current@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/freebsd-current To unsubscribe, send any mail to "freebsd-current-unsubscr...@freebsd.org"
