On 27 June 2013 17:58, Glen Barber <g...@freebsd.org> wrote: > On Thu, Jun 27, 2013 at 12:38:00AM +0000, Xin LI wrote: >> Author: delphij >> Date: Thu Jun 27 00:37:59 2013 >> New Revision: 252283 >> URL: http://svnweb.freebsd.org/changeset/base/252283 >> >> Log: >> MFC: tcpdump 4.4.0. >> > > I think this breaks the build. > > cc -O -pipe -G0 -I/src/usr.sbin/tcpdump/tcpdump > -I/src/usr.sbin/tcpdump/tcpdump/../../../contrib/tcpdump -DHAVE_CONFIG_H > -D_U_="__attribute__((unused))" -DINET6 -DLBL_ALIGN > -I/obj/mips.mipsel/src/tmp/usr/include/openssl -DHAVE_LIBCRYPTO > -DHAVE_OPENSSL_EVP_H > -DHAVE_NET_PFVAR_H -std=gnu99 -Wsystem-headers -Werror -Wall -Wno-format-y2k > -W > -Wno-unused-parameter -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith > -Wno-uninitialized -Wno-pointer-sign -c > /src/usr.sbin/tcpdump/tcpdump/../../../contrib/tcpdump/print-pfsync.c > /src/usr.sbin/tcpdump/tcpdump/../../../contrib/tcpdump/print-pfsync.c: In > function > 'print_src_dst': > /src/usr.sbin/tcpdump/tcpdump/../../../contrib/tcpdump/print-pfsync.c:330: > error: 'tcpstates' > undeclared (first use in this function) > /src/usr.sbin/tcpdump/tcpdump/../../../contrib/tcpdump/print-pfsync.c:330: > error: (Each > undeclared identifier is reported only once > /src/usr.sbin/tcpdump/tcpdump/../../../contrib/tcpdump/print-pfsync.c:330: > error: for each > function it appears in.)
It is broken in stable/9 due to contrib/pf include spaghetti. This does work in head thanks to glebius. This change tries to fix the build on stable/9. Merge r240136 partially from projects/pf via head. This is a direct change due to significant divergence in code. Index: sys/contrib/pf/net/if_pfsync.c =================================================================== --- sys/contrib/pf/net/if_pfsync.c (revision 252306) +++ sys/contrib/pf/net/if_pfsync.c (working copy) @@ -114,6 +114,7 @@ #include <netinet/in.h> #include <netinet/if_ether.h> #include <netinet/tcp.h> +#include <netinet/tcp_fsm.h> #include <netinet/tcp_seq.h> #ifdef INET Index: sys/contrib/pf/net/pf.c =================================================================== --- sys/contrib/pf/net/pf.c (revision 252306) +++ sys/contrib/pf/net/pf.c (working copy) @@ -111,6 +111,7 @@ #include <netinet/ip.h> #include <netinet/ip_var.h> #include <netinet/tcp.h> +#include <netinet/tcp_fsm.h> #include <netinet/tcp_seq.h> #include <netinet/udp.h> #include <netinet/ip_icmp.h> Index: sys/contrib/pf/net/pf_norm.c =================================================================== --- sys/contrib/pf/net/pf_norm.c (revision 252306) +++ sys/contrib/pf/net/pf_norm.c (working copy) @@ -67,6 +67,7 @@ #include <netinet/ip.h> #include <netinet/ip_var.h> #include <netinet/tcp.h> +#include <netinet/tcp_fsm.h> #include <netinet/tcp_seq.h> #include <netinet/udp.h> #include <netinet/ip_icmp.h> Index: sys/contrib/pf/net/pfvar.h =================================================================== --- sys/contrib/pf/net/pfvar.h (revision 252306) +++ sys/contrib/pf/net/pfvar.h (working copy) @@ -58,8 +58,6 @@ #include <netinet/in.h> #endif -#include <netinet/tcp_fsm.h> - struct ip; struct ip6_hdr; #ifdef __FreeBSD__ -- wbr, pluknet _______________________________________________ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
