From f454dc50d800652c517b62202a562f705d016ddf Mon Sep 17 00:00:00 2001 From: Max Laier Date: Tue, 16 Oct 2007 02:32:44 +0000 Subject: [PATCH] Update for tcpdump 3.9.8 --- usr.sbin/tcpdump/tcpdump/Makefile | 59 ++++++++++++++++------------- usr.sbin/tcpdump/tcpdump/config.h | 62 +++++++++++++++++++++---------- 2 files changed, 76 insertions(+), 45 deletions(-) diff --git a/usr.sbin/tcpdump/tcpdump/Makefile b/usr.sbin/tcpdump/tcpdump/Makefile index 3b8459c44471..9ea718abda6e 100644 --- a/usr.sbin/tcpdump/tcpdump/Makefile +++ b/usr.sbin/tcpdump/tcpdump/Makefile @@ -6,31 +6,32 @@ TCPDUMP_DISTDIR?= ${.CURDIR}/../../../contrib/tcpdump .PATH: ${TCPDUMP_DISTDIR} PROG= tcpdump -SRCS= addrtoname.c cpack.c gmpls.c gmt2local.c ipproto.c \ - machdep.c nlpid.c l2vpn.c oui.c parsenfsfh.c \ - print-802_11.c print-ah.c print-aodv.c print-ap1394.c \ - print-arcnet.c print-arp.c print-ascii.c print-atalk.c \ - print-atm.c print-bfd.c print-bgp.c \ - print-bootp.c print-beep.c print-cdp.c print-chdlc.c \ - print-cip.c print-cnfp.c print-dccp.c print-decnet.c print-domain.c \ - print-dvmrp.c print-eap.c print-egp.c print-eigrp.c \ - print-enc.c print-esp.c print-ether.c \ - print-fddi.c print-fr.c print-gre.c print-hsrp.c print-icmp.c \ - print-igmp.c print-igrp.c print-ip.c print-ipfc.c print-ipcomp.c \ + +SRCS = addrtoname.c af.c cpack.c gmpls.c oui.c gmt2local.c ipproto.c \ + nlpid.c l2vpn.c machdep.c parsenfsfh.c \ + print-802_11.c print-ap1394.c print-ah.c print-arcnet.c \ + print-aodv.c print-arp.c print-ascii.c print-atalk.c print-atm.c \ + print-beep.c print-bfd.c print-bgp.c print-bootp.c print-cdp.c \ + print-chdlc.c print-cip.c print-cnfp.c print-dccp.c print-decnet.c \ + print-domain.c print-dvmrp.c print-enc.c print-egp.c \ + print-eap.c print-eigrp.c\ + print-esp.c print-ether.c print-fddi.c print-fr.c \ + print-gre.c print-hsrp.c print-icmp.c print-igmp.c \ + print-igrp.c print-ip.c print-ipcomp.c print-ipfc.c \ print-ipx.c print-isakmp.c print-isoclns.c print-juniper.c print-krb.c \ print-l2tp.c print-lane.c print-ldp.c print-llc.c \ - print-lmp.c print-lspping.c \ - print-lwres.c print-msdp.c print-mobile.c print-mpls.c \ - print-netbios.c print-nfs.c print-ntp.c print-null.c \ - print-ospf.c print-pflog.c print-pgm.c print-pim.c \ - print-ppp.c print-pppoe.c print-pptp.c print-radius.c \ - print-raw.c print-rip.c print-rsvp.c print-rx.c print-sctp.c \ - print-sip.c print-sl.c print-sll.c print-slow.c print-smb.c \ - print-snmp.c print-stp.c print-sunatm.c print-sunrpc.c \ - print-symantec.c print-syslog.c print-tcp.c \ - print-telnet.c print-tftp.c print-timed.c print-token.c \ - print-udp.c print-vjc.c print-vrrp.c print-wb.c print-zephyr.c \ - setsignal.c smbutil.c tcpdump.c util.c version.c + print-lmp.c print-lspping.c \ + print-lwres.c print-mobile.c print-mpls.c print-msdp.c \ + print-nfs.c print-ntp.c print-null.c print-olsr.c print-ospf.c \ + print-pgm.c print-pim.c print-ppp.c print-pppoe.c \ + print-pptp.c print-radius.c print-raw.c print-rip.c \ + print-rsvp.c print-rx.c print-sctp.c print-sip.c print-sl.c print-sll.c \ + print-slow.c print-snmp.c print-stp.c print-sunatm.c print-sunrpc.c \ + print-symantec.c print-syslog.c print-tcp.c print-telnet.c print-tftp.c \ + print-timed.c print-token.c print-udp.c print-vjc.c print-vrrp.c \ + print-wb.c print-zephyr.c setsignal.c tcpdump.c util.c \ + print-smb.c smbutil.c \ + version.c CLEANFILES+= version.c CFLAGS+= -I${.CURDIR} -I${TCPDUMP_DISTDIR} @@ -38,8 +39,8 @@ CFLAGS+= -DHAVE_CONFIG_H CFLAGS+= -D_U_="__attribute__((unused))" .if ${MK_INET6_SUPPORT} != "no" -SRCS+= print-ip6.c print-ip6opts.c print-ripng.c print-icmp6.c \ - print-frag6.c print-rt6.c print-ospf6.c print-dhcp6.c print-mobility.c +SRCS+= print-ip6.c print-ip6opts.c print-mobility.c print-ripng.c \ + print-icmp6.c print-frag6.c print-rt6.c print-ospf6.c print-dhcp6.c CFLAGS+= -DINET6 .endif .if ${MACHINE_ARCH} != "i386" @@ -51,7 +52,13 @@ LDADD= -ll -lpcap .if ${MK_OPENSSL} != "no" && !defined(RELEASE_CRUNCH) DPADD+= ${LIBCRYPTO} LDADD+= -lcrypto -CFLAGS+= -I${DESTDIR}/usr/include/openssl -DHAVE_LIBCRYPTO -DHAVE_RC5_H -DHAVE_CAST_H -DHAVE_OPENSSL_EVP_H +CFLAGS+= -I${DESTDIR}/usr/include/openssl +CFLAGS+= -DHAVE_LIBCRYPTO -DHAVE_RC5_H -DHAVE_CAST_H -DHAVE_OPENSSL_EVP_H +.endif + +.if ${MK_PF} != "no" +SRCS+= print-pflog.c +CFLAGS+= -DHAVE_NET_PFVAR_H .endif version.c: ${TCPDUMP_DISTDIR}/VERSION diff --git a/usr.sbin/tcpdump/tcpdump/config.h b/usr.sbin/tcpdump/tcpdump/config.h index 303768e66ecf..b7b85a56e8b2 100644 --- a/usr.sbin/tcpdump/tcpdump/config.h +++ b/usr.sbin/tcpdump/tcpdump/config.h @@ -10,6 +10,7 @@ /* #undef HAVE_BUGGY_CAST128 */ /* Define if you enable IPv6 support */ +/* See Makefile */ /* #undef INET6 */ /* Define if you enable support for the libsmi. */ @@ -24,9 +25,6 @@ /* define if your struct __res_state has the nsort member */ /* #undef HAVE_NEW_RES_STATE */ -/* define if defines PRI[doxu]64 macros */ -#define INTTYPES_H_DEFINES_FORMATS 1 - /* * define if struct ether_header.ether_dhost is a struct with ether_addr_octet */ @@ -113,17 +111,6 @@ /* AIX hack. */ /* #undef _SUN */ -/* Workaround for missing sized types */ -/* XXX this should move to the more standard uint*_t */ -/* #undef int8_t */ -/* #undef int16_t */ -/* #undef int32_t */ -/* #undef int64_t */ -/* #undef u_int8_t */ -/* #undef u_int16_t */ -/* #undef u_int32_t */ -/* #undef u_int64_t */ - /* Workaround for missing 64-bit formats */ /* #undef PRId64 */ /* #undef PRIo64 */ @@ -179,6 +166,7 @@ #define HAVE_INTTYPES_H 1 /* Define to 1 if you have the `crypto' library (-lcrypto). */ +/* See Makefile */ /* #undef HAVE_LIBCRYPTO */ /* Define to 1 if you have the `rpc' library (-lrpc). */ @@ -199,7 +187,12 @@ /* Define to 1 if you have the header file. */ #define HAVE_NETINET_IF_ETHER_H 1 +/* Define to 1 if you have the header file. */ +/* See Makefile */ +/* #undef HAVE_NET_PFVAR_H */ + /* Define to 1 if you have the header file. */ +/* See Makefile */ /* #undef HAVE_OPENSSL_EVP_H 1 */ /* Define to 1 if you have the `pcap_breakloop' function. */ @@ -268,6 +261,12 @@ /* Define to 1 if you have the `strsep' function. */ #define HAVE_STRSEP 1 +/* Define to 1 if the system has the type `struct ether_addr'. */ +/* #undef HAVE_STRUCT_ETHER_ADDR */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_BITYPES_H */ + /* Define to 1 if you have the header file. */ #define HAVE_SYS_STAT_H 1 @@ -310,19 +309,20 @@ /* Define as the return type of signal handlers (`int' or `void'). */ #define RETSIGTYPE void -/* The size of a `char', as computed by sizeof. */ +/* The size of `char', as computed by sizeof. */ #define SIZEOF_CHAR 1 -/* The size of a `int', as computed by sizeof. */ +/* The size of `int', as computed by sizeof. */ #define SIZEOF_INT 4 -/* The size of a `long', as computed by sizeof. */ +/* The size of `long', as computed by sizeof. */ +/* XXX: This is wrong, but possibly unused */ #define SIZEOF_LONG 4 -/* The size of a `long long', as computed by sizeof. */ +/* The size of `long long', as computed by sizeof. */ #define SIZEOF_LONG_LONG 8 -/* The size of a `short', as computed by sizeof. */ +/* The size of `short', as computed by sizeof. */ #define SIZEOF_SHORT 2 /* Define to 1 if you have the ANSI C header files. */ @@ -333,3 +333,27 @@ /* Define as token for inline if inlining supported */ #define inline inline + +/* Define to `short' if int16_t not defined. */ +/* #undef int16_t */ + +/* Define to `int' if int32_t not defined. */ +/* #undef int32_t */ + +/* Define to `long long' if int64_t not defined. */ +/* #undef int64_t */ + +/* Define to `signed char' if int8_t not defined. */ +/* #undef int8_t */ + +/* Define to `unsigned short' if u_int16_t not defined. */ +/* #undef u_int16_t */ + +/* Define to `unsigned int' if u_int32_t not defined. */ +/* #undef u_int32_t */ + +/* Define to `unsigned long long' if u_int64_t not defined. */ +/* #undef u_int64_t */ + +/* Define to `unsigned char' if u_int8_t not defined. */ +/* #undef u_int8_t */