Date: Tue, 3 Jul 2007 15:24:58 +0200 From: Max Laier <max@love2party.net> To: freebsd-current@freebsd.org Cc: freebsd-pf@freebsd.org Subject: Re: HEADSUP: pf 4.1 import Message-ID: <200707031525.17385.max@love2party.net> In-Reply-To: <200707031226.18399.max@love2party.net> References: <200707031226.18399.max@love2party.net>
next in thread | previous in thread | raw e-mail | index | archive | help
--nextPart1220379.Y0FbH8A0d7 Content-Type: multipart/mixed; boundary="Boundary-01=_w4kiG1lSY2K0P6k" Content-Transfer-Encoding: 7bit Content-Disposition: inline --Boundary-01=_w4kiG1lSY2K0P6k Content-Type: text/plain; charset="iso-8859-6" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline On Tuesday 03 July 2007, Max Laier wrote: > Users of pf should hold off a bit as I plan to commit a tiny ABI break > after the update is finished in order to be able to add netgraph > support in the future. After that a full "buildworld buildkernel > installkernel installworld mergemaster"-run is advised. > > Will send an all clear when done. this is it. Though my post commit build is still running, things should=20 be alright again. Users of pf please note that tcpdump and libpcap need additional patches=20 that need to go through the vendor first. I'm trying to get things=20 moving there, but for the time being, please use the attached patch to=20 understand the new pflog format. Anyone with hands at tcpdump.org? Help appreciated! =2D-=20 =46reeBSD Status reports due: 07/07/07 :-) /"\ Best regards, | mlaier@freebsd.org \ / Max Laier | ICQ #67774661 X http://pf4freebsd.love2party.net/ | mlaier@EFnet / \ ASCII Ribbon Campaign | Against HTML Mail and News --Boundary-01=_w4kiG1lSY2K0P6k Content-Type: text/x-diff; charset="iso-8859-6"; name="pf.41.tcpdump_local.diff" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="pf.41.tcpdump_local.diff" Index: contrib/libpcap/gencode.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /usr/store/mlaier/fcvs/src/contrib/libpcap/gencode.c,v retrieving revision 1.16 diff -u -r1.16 gencode.c =2D-- contrib/libpcap/gencode.c 4 Sep 2006 19:54:21 -0000 1.16 +++ contrib/libpcap/gencode.c 30 Jun 2007 17:01:13 -0000 @@ -75,7 +75,14 @@ #include "ppp.h" #include "sll.h" #include "arcnet.h" +#ifdef HAVE_NET_PFVAR_H +#include <sys/socket.h> +#include <net/if.h> +#include <net/pfvar.h> +#include <net/if_pflog.h> +#else #include "pf.h" +#endif #ifndef offsetof #define offsetof(s, e) ((size_t)&((s *)0)->e) #endif Index: contrib/libpcap/grammar.y =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /usr/store/mlaier/fcvs/src/contrib/libpcap/grammar.y,v retrieving revision 1.11 diff -u -r1.11 grammar.y =2D-- contrib/libpcap/grammar.y 4 Sep 2006 19:54:21 -0000 1.11 +++ contrib/libpcap/grammar.y 30 Jun 2007 17:02:55 -0000 @@ -53,7 +53,13 @@ #include "pcap-int.h" =20 #include "gencode.h" +#ifdef HAVE_NET_PFVAR_H +#include <net/if.h> +#include <net/pfvar.h> +#include <net/if_pflog.h> +#else #include "pf.h" +#endif #include <pcap-namedb.h> =20 #ifdef HAVE_OS_PROTO_H Index: contrib/tcpdump/print-pflog.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /usr/store/mlaier/fcvs/src/contrib/tcpdump/print-pflog.c,v retrieving revision 1.1.1.3 diff -u -r1.1.1.3 print-pflog.c =2D-- contrib/tcpdump/print-pflog.c 4 Sep 2006 20:04:14 -0000 1.1.1.3 +++ contrib/tcpdump/print-pflog.c 30 Jun 2007 17:03:26 -0000 @@ -28,6 +28,16 @@ #include "config.h" #endif =20 +#ifdef HAVE_NET_PFVAR_H +#include <sys/types.h> +#include <sys/socket.h> +#include <net/if.h> +#include <net/pfvar.h> +#include <net/if_pflog.h> +#else +#include "pf.h" +#endif + #include <tcpdump-stdinc.h> =20 #include <stdio.h> @@ -35,7 +45,6 @@ =20 #include "interface.h" #include "addrtoname.h" =2D#include "pf.h" =20 static struct tok pf_reasons[] =3D { { 0, "0(match)" }, Index: lib/libpcap/config.h =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /usr/store/mlaier/fcvs/src/lib/libpcap/config.h,v retrieving revision 1.5 diff -u -r1.5 config.h =2D-- lib/libpcap/config.h 29 May 2005 18:12:46 -0000 1.5 +++ lib/libpcap/config.h 30 Jun 2007 17:05:20 -0000 @@ -45,6 +45,9 @@ /* Define to 1 if you have the <memory.h> header file. */ #define HAVE_MEMORY_H 1 =20 +/* Define to 1 if you have the <net/pfvar.h> header file. */ +#define HAVE_NET_PFVAR_H 1 + /* Define to 1 if you have the <netinet/ether.h> header file. */ /* #undef HAVE_NETINET_ETHER_H */ =20 Index: usr.sbin/tcpdump/tcpdump/config.h =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /usr/store/mlaier/fcvs/src/usr.sbin/tcpdump/tcpdump/config.h,v retrieving revision 1.7 diff -u -r1.7 config.h =2D-- usr.sbin/tcpdump/tcpdump/config.h 11 Jul 2005 04:14:42 -0000 1.7 +++ usr.sbin/tcpdump/tcpdump/config.h 30 Jun 2007 17:06:34 -0000 @@ -193,6 +193,9 @@ /* Define to 1 if you have the <netdnet/dnetdb.h> header file. */ /* #undef HAVE_NETDNET_DNETDB_H */ =20 +/* Define to 1 if you have the <net/pfvar.h> header file. */ +#define HAVE_NET_PFVAR_H 1 + /* Define to 1 if you have the <netinet/ether.h> header file. */ /* #undef HAVE_NETINET_ETHER_H */ =20 --Boundary-01=_w4kiG1lSY2K0P6k-- --nextPart1220379.Y0FbH8A0d7 Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.3 (FreeBSD) iD8DBQBGik49XyyEoT62BG0RArLMAJ4nvRw9pOxA8PeCx17SnlJbsxEMuQCeINhe myLG2kFI6GqhO8ZkEDAn52A= =dWon -----END PGP SIGNATURE----- --nextPart1220379.Y0FbH8A0d7--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200707031525.17385.max>