Module Name: src
Committed By: christos
Date: Tue Dec 31 17:33:11 UTC 2013
Modified Files:
src/external/bsd/tcpdump/bin: Makefile
src/external/bsd/tcpdump/include: config.h
Log Message:
update for 4.5.1
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/tcpdump/bin/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/tcpdump/include/config.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/tcpdump/bin/Makefile
diff -u src/external/bsd/tcpdump/bin/Makefile:1.9 src/external/bsd/tcpdump/bin/Makefile:1.10
--- src/external/bsd/tcpdump/bin/Makefile:1.9 Sat Sep 21 18:28:12 2013
+++ src/external/bsd/tcpdump/bin/Makefile Tue Dec 31 12:33:11 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2013/09/21 22:28:12 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2013/12/31 17:33:11 christos Exp $
WARNS?= 1 # XXX: need to cleanup later
@@ -39,6 +39,7 @@ print-bfd.c \
print-bgp.c \
print-bootp.c \
print-bt.c \
+print-calm-fast.c \
print-carp.c \
print-cdp.c \
print-cfm.c \
@@ -60,6 +61,7 @@ print-fddi.c \
print-forces.c \
print-fr.c \
print-frag6.c \
+print-geonet.c \
print-gre.c \
print-hsrp.c \
print-icmp.c \
@@ -87,12 +89,18 @@ print-mobile.c \
print-mobility.c \
print-mpcp.c \
print-mpls.c \
+print-mptcp.c \
print-msdp.c \
+print-msnlb.c \
+print-nflog.c \
print-nfs.c \
print-ntp.c \
print-null.c \
print-olsr.c \
+print-openflow.c \
+print-openflow-1.0.c \
print-ospf.c \
+print-otv.c \
print-pflog.c \
print-pfsync.c \
print-pgm.c \
@@ -135,8 +143,10 @@ print-vjc.c \
print-vqp.c \
print-vrrp.c \
print-vtp.c \
+print-vxlan.c \
print-wb.c \
-print-zephyr.c
+print-zephyr.c \
+print-zeromq.c
version.c: VERSION
${_MKTARGET_CREATE}
Index: src/external/bsd/tcpdump/include/config.h
diff -u src/external/bsd/tcpdump/include/config.h:1.4 src/external/bsd/tcpdump/include/config.h:1.5
--- src/external/bsd/tcpdump/include/config.h:1.4 Sat Apr 6 15:33:11 2013
+++ src/external/bsd/tcpdump/include/config.h Tue Dec 31 12:33:11 2013
@@ -1,80 +1,9 @@
/* config.h. Generated from config.h.in by configure. */
/* config.h.in. Generated from configure.in by autoheader. */
-/* "generated automatically" means DO NOT MAKE CHANGES TO config.h.in --
- * make them to acconfig.h and rerun autoheader */
-/* Define if you enable IPv6 support */
-#define INET6 1
-
-/* Define if you enable support for the libsmi. */
-/* #undef LIBSMI */
-
-/* define if you have the addrinfo function. */
+/* define if you have the addrinfo function */
#define HAVE_ADDRINFO 1
-/* define if you need to include missing/addrinfoh.h. */
-/* #undef NEED_ADDRINFO_H */
-
-/* define ifyou have the h_errno variable. */
-#define HAVE_H_ERRNO 1
-
-/* define if you have struct sockaddr_storage */
-#define HAVE_SOCKADDR_STORAGE 1
-
-/* define if you have both getipnodebyname() and getipnodebyaddr() */
-/* #undef USE_GETIPNODEBY */
-
-/* define if you have ether_ntohost() and it works */
-#define USE_ETHER_NTOHOST 1
-
-/* define if libpcap has pcap_version */
-/* #undef HAVE_PCAP_VERSION */
-
-/* define if libpcap has pcap_debug */
-#define HAVE_PCAP_DEBUG 1
-
-/* define if libpcap has yydebug */
-/* #undef HAVE_YYDEBUG */
-
-/* define if libpcap has pcap_list_datalinks() */
-#define HAVE_PCAP_LIST_DATALINKS 1
-
-/* define if libpcap has pcap_set_datalink() */
-#define HAVE_PCAP_SET_DATALINK 1
-
-/* define if libpcap has pcap_datalink_name_to_val() */
-#define HAVE_PCAP_DATALINK_NAME_TO_VAL 1
-
-/* define if libpcap has pcap_datalink_val_to_description() */
-#define HAVE_PCAP_DATALINK_VAL_TO_DESCRIPTION 1
-
-/* define if libpcap has pcap_dump_ftell() */
-#define HAVE_PCAP_DUMP_FTELL 1
-
-/* define if you have getrpcbynumber() */
-#define HAVE_GETRPCBYNUMBER 1
-
-/* Workaround for missing 64-bit formats */
-/* #undef PRId64 */
-/* #undef PRIo64 */
-/* #undef PRIx64 */
-/* #undef PRIu64 */
-
-/* Whether or not to include the possibly-buggy SMB printer */
-#define TCPDUMP_DO_SMB 1
-
-/* Define if you have the dnet_htoa function. */
-/* #undef HAVE_DNET_HTOA */
-
-/* Define if you have a dnet_htoa declaration in <netdnet/dnetdb.h>. */
-/* #undef HAVE_NETDNET_DNETDB_H_DNET_HTOA */
-
-/* define if should drop privileges by default */
-/* #undef WITH_USER */
-
-/* define if should chroot when dropping privileges */
-/* #undef WITH_CHROOT */
-
/* Define to 1 if you have the `alarm' function. */
#define HAVE_ALARM 1
@@ -85,6 +14,9 @@
don't. */
#define HAVE_DECL_ETHER_NTOHOST 1
+/* define if you have the dnet_htoa function */
+/* #undef HAVE_DNET_HTOA */
+
/* Define to 1 if you have the `ether_ntohost' function. */
#define HAVE_ETHER_NTOHOST 1
@@ -97,6 +29,12 @@
/* Define to 1 if you have the `getnameinfo' function. */
#define HAVE_GETNAMEINFO 1
+/* define if you have getrpcbynumber() */
+#define HAVE_GETRPCBYNUMBER 1
+
+/* define if you have the h_errno variable */
+#define HAVE_H_ERRNO 1
+
/* Define to 1 if you have the <inttypes.h> header file. */
#define HAVE_INTTYPES_H 1
@@ -115,6 +53,9 @@
/* Define to 1 if you have the <netdnet/dnetdb.h> header file. */
/* #undef HAVE_NETDNET_DNETDB_H */
+/* define if you have a dnet_htoa declaration in <netdnet/dnetdb.h> */
+/* #undef HAVE_NETDNET_DNETDB_H_DNET_HTOA */
+
/* Define to 1 if you have the <netinet/ether.h> header file. */
/* #undef HAVE_NETINET_ETHER_H */
@@ -139,9 +80,21 @@
/* Define to 1 if you have the `pcap_create' function. */
#define HAVE_PCAP_CREATE 1
+/* define if libpcap has pcap_datalink_name_to_val() */
+#define HAVE_PCAP_DATALINK_NAME_TO_VAL 1
+
+/* define if libpcap has pcap_datalink_val_to_description() */
+#define HAVE_PCAP_DATALINK_VAL_TO_DESCRIPTION 1
+
+/* define if libpcap has pcap_debug */
+#define HAVE_PCAP_DEBUG 1
+
/* Define to 1 if you have the `pcap_dump_flush' function. */
#define HAVE_PCAP_DUMP_FLUSH 1
+/* define if libpcap has pcap_dump_ftell() */
+#define HAVE_PCAP_DUMP_FTELL 1
+
/* Define to 1 if you have the `pcap_findalldevs' function. */
#define HAVE_PCAP_FINDALLDEVS 1
@@ -151,12 +104,24 @@
/* Define to 1 if you have the `pcap_lib_version' function. */
#define HAVE_PCAP_LIB_VERSION 1
+/* define if libpcap has pcap_list_datalinks() */
+#define HAVE_PCAP_LIST_DATALINKS 1
+
+/* Define to 1 if you have the `pcap_setdirection' function. */
+#define HAVE_PCAP_SETDIRECTION 1
+
+/* define if libpcap has pcap_set_datalink() */
+#define HAVE_PCAP_SET_DATALINK 1
+
/* Define to 1 if you have the `pcap_set_tstamp_type' function. */
-/* #undef HAVE_PCAP_SET_TSTAMP_TYPE */
+#define HAVE_PCAP_SET_TSTAMP_TYPE 1
/* Define to 1 if you have the <pcap/usb.h> header file. */
/* #undef HAVE_PCAP_USB_H */
+/* define if libpcap has pcap_version */
+/* #undef HAVE_PCAP_VERSION */
+
/* Define to 1 if you have the `pfopen' function. */
/* #undef HAVE_PFOPEN */
@@ -184,6 +149,9 @@
/* if struct sockaddr has the sa_len member */
#define HAVE_SOCKADDR_SA_LEN 1
+/* define if you have struct sockaddr_storage */
+#define HAVE_SOCKADDR_STORAGE 1
+
/* Define to 1 if you have the <stdint.h> header file. */
#define HAVE_STDINT_H 1
@@ -238,17 +206,32 @@
/* Define to 1 if you have the `vsnprintf' function. */
#define HAVE_VSNPRINTF 1
+/* define if libpcap has yydebug */
+/* #undef HAVE_YYDEBUG */
+
/* define if your compiler has __attribute__ */
#define HAVE___ATTRIBUTE__ 1
+#ifndef __NetBSD__
+/* set by build */
+/* Define if you enable IPv6 support */
+#define INET6 1
+#endif
+
/* if unaligned access fails */
-/* #undef LBL_ALIGN */
+#define LBL_ALIGN 1
+
+/* Define if you enable support for libsmi */
+/* #undef LIBSMI */
+
+/* define if you need to include missing/addrinfo.h */
+/* #undef NEED_ADDRINFO_H */
/* Define to 1 if netinet/ether.h declares `ether_ntohost' */
/* #undef NETINET_ETHER_H_DECLARES_ETHER_NTOHOST */
/* Define to 1 if netinet/if_ether.h declares `ether_ntohost' */
-#define NETINET_IF_ETHER_H_DECLARES_ETHER_NTOHOST
+#define NETINET_IF_ETHER_H_DECLARES_ETHER_NTOHOST /**/
/* Define to the address where bug reports for this package should be sent. */
#define PACKAGE_BUGREPORT ""
@@ -262,50 +245,100 @@
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME ""
+/* Define to the home page for this package. */
+#define PACKAGE_URL ""
+
/* Define to the version of this package. */
#define PACKAGE_VERSION ""
+/* define if the platform doesn't define PRId64 */
+/* #undef PRId64 */
+
+/* define if the platform doesn't define PRIo64 */
+/* #undef PRIo64 */
+
+/* define if the platform doesn't define PRIx64 */
+/* #undef PRIu64 */
+
+/* define if the platform doesn't define PRIu64 */
+/* #undef PRIx64 */
+
/* Define as the return type of signal handlers (`int' or `void'). */
#define RETSIGTYPE void
/* return value of signal handlers */
-#define RETSIGVAL
+#define RETSIGVAL /**/
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
+/* define if you want to build the possibly-buggy SMB printer */
+#define TCPDUMP_DO_SMB 1
+
/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
#define TIME_WITH_SYS_TIME 1
+/* define if you have ether_ntohost() and it works */
+#define USE_ETHER_NTOHOST 1
+
+/* define if should chroot when dropping privileges */
+/* #undef WITH_CHROOT */
+
+/* define if should drop privileges by default */
+/* #undef WITH_USER */
+
/* get BSD semantics on Irix */
/* #undef _BSD_SIGNALS */
-/* needed on HP-UX */
-/* #undef _HPUX_SOURCE */
-
/* define on AIX to get certain functions */
/* #undef _SUN */
+/* Define for Solaris 2.5.1 so the uint32_t typedef from <sys/synch.h>,
+ <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
+ #define below would cause a syntax error. */
+/* #undef _UINT32_T */
+
+/* Define for Solaris 2.5.1 so the uint64_t typedef from <sys/synch.h>,
+ <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
+ #define below would cause a syntax error. */
+/* #undef _UINT64_T */
+
+/* Define for Solaris 2.5.1 so the uint8_t typedef from <sys/synch.h>,
+ <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
+ #define below would cause a syntax error. */
+/* #undef _UINT8_T */
+
+/* define if your compiler allows __attribute__((format)) without a warning */
+#define __ATTRIBUTE___FORMAT_OK 1
+
/* define if your compiler allows __attribute__((format)) to be applied to
function pointers */
#define __ATTRIBUTE___FORMAT_OK_FOR_FUNCTION_POINTERS 1
+/* define if your compiler allows __attribute__((noreturn)) to be applied to
+ function pointers */
+#define __ATTRIBUTE___NORETURN_OK_FOR_FUNCTION_POINTERS 1
+
/* to handle Ultrix compilers that don't support const in prototypes */
/* #undef const */
/* Define as token for inline if inlining supported */
#define inline inline
-/* Define to `short' if int16_t not defined. */
+/* Define to the type of a signed integer type of width exactly 16 bits if
+ such a type exists and the standard includes do not define it. */
/* #undef int16_t */
-/* Define to `int' if int32_t not defined. */
+/* Define to the type of a signed integer type of width exactly 32 bits if
+ such a type exists and the standard includes do not define it. */
/* #undef int32_t */
-/* Define to `long long' if int64_t not defined. */
+/* Define to the type of a signed integer type of width exactly 64 bits if
+ such a type exists and the standard includes do not define it. */
/* #undef int64_t */
-/* Define to `signed char' if int8_t not defined. */
+/* Define to the type of a signed integer type of width exactly 8 bits if such
+ a type exists and the standard includes do not define it. */
/* #undef int8_t */
/* Define to `unsigned short' if u_int16_t not defined. */
@@ -319,3 +352,19 @@
/* Define to `unsigned char' if u_int8_t not defined. */
/* #undef u_int8_t */
+
+/* Define to the type of an unsigned integer type of width exactly 16 bits if
+ such a type exists and the standard includes do not define it. */
+/* #undef uint16_t */
+
+/* Define to the type of an unsigned integer type of width exactly 32 bits if
+ such a type exists and the standard includes do not define it. */
+/* #undef uint32_t */
+
+/* Define to the type of an unsigned integer type of width exactly 64 bits if
+ such a type exists and the standard includes do not define it. */
+/* #undef uint64_t */
+
+/* Define to the type of an unsigned integer type of width exactly 8 bits if
+ such a type exists and the standard includes do not define it. */
+/* #undef uint8_t */
