From owner-svn-src-all@FreeBSD.ORG Sat Mar 21 22:59:03 2009 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 391331065673; Sat, 21 Mar 2009 22:59:03 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 266A88FC17; Sat, 21 Mar 2009 22:59:03 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n2LMx3Ds049648; Sat, 21 Mar 2009 22:59:03 GMT (envelope-from rpaulo@svn.freebsd.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n2LMx2tJ049646; Sat, 21 Mar 2009 22:59:02 GMT (envelope-from rpaulo@svn.freebsd.org) Message-Id: <200903212259.n2LMx2tJ049646@svn.freebsd.org> From: Rui Paulo Date: Sat, 21 Mar 2009 22:59:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r190226 - head/lib/libpcap X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 21 Mar 2009 22:59:04 -0000 Author: rpaulo Date: Sat Mar 21 22:59:02 2009 New Revision: 190226 URL: http://svn.freebsd.org/changeset/base/190226 Log: Support files for new libpcap 1.0.0. Includes a shlib bump. Modified: head/lib/libpcap/Makefile head/lib/libpcap/config.h Modified: head/lib/libpcap/Makefile ============================================================================== --- head/lib/libpcap/Makefile Sat Mar 21 22:58:08 2009 (r190225) +++ head/lib/libpcap/Makefile Sat Mar 21 22:59:02 2009 (r190226) @@ -11,56 +11,72 @@ SRCS= grammar.y tokdefs.h version.h pcap etherent.c savefile.c bpf_filter.c bpf_image.c bpf_dump.c \ scanner.l version.c INCS= pcap.h pcap-int.h pcap-namedb.h pcap-bpf.h -MAN= pcap.3 -MLINKS= pcap.3 pcap_open_live.3 \ - pcap.3 pcap_open_dead.3 \ - pcap.3 pcap_open_offline.3 \ - pcap.3 pcap_fopen_offline.3 \ - pcap.3 pcap_dump_open.3 \ - pcap.3 pcap_dump_fopen.3 \ - pcap.3 pcap_setnonblock.3 \ - pcap.3 pcap_getnonblock.3 \ - pcap.3 pcap_findalldevs.3 \ - pcap.3 pcap_freealldevs.3 \ - pcap.3 pcap_lookupdev.3 \ - pcap.3 pcap_lookupnet.3 \ - pcap.3 pcap_dispatch.3 \ - pcap.3 pcap_loop.3 \ - pcap.3 pcap_dump.3 \ - pcap.3 pcap_compile.3 \ - pcap.3 pcap_setfilter.3 \ - pcap.3 pcap_freecode.3 \ - pcap.3 pcap_setdirection.3 \ - pcap.3 pcap_next.3 \ - pcap.3 pcap_next_ex.3 \ - pcap.3 pcap_breakloop.3 \ - pcap.3 pcap_inject.3 \ - pcap.3 pcap_sendpacket.3 \ - pcap.3 pcap_datalink.3 \ - pcap.3 pcap_list_datalinks.3 \ - pcap.3 pcap_set_datalink.3 \ - pcap.3 pcap_datalink_name_to_val.3 \ - pcap.3 pcap_datalink_val_to_name.3 \ - pcap.3 pcap_datalink_val_to_description.3 \ - pcap.3 pcap_snapshot.3 \ - pcap.3 pcap_is_swapped.3 \ - pcap.3 pcap_major_version.3 \ - pcap.3 pcap_minor_version.3 \ - pcap.3 pcap_stats.3 \ - pcap.3 pcap_file.3 \ - pcap.3 pcap_fileno.3 \ - pcap.3 pcap_get_selectable_fd.3 \ - pcap.3 pcap_perror.3 \ - pcap.3 pcap_geterr.3 \ - pcap.3 pcap_strerror.3 \ - pcap.3 pcap_lib_version.3 \ - pcap.3 pcap_close.3 \ - pcap.3 pcap_dump_flush.3 \ - pcap.3 pcap_dump_ftell.3 \ - pcap.3 pcap_dump_file.3 \ - pcap.3 pcap_dump_close.3 - -CLEANFILES=tokdefs.h version.h version.c +MAN= pcap.3 \ + pcap_activate.3 \ + pcap_breakloop.3 \ + pcap_can_set_rfmon.3 \ + pcap_close.3 \ + pcap_compile.3 \ + pcap_create.3 \ + pcap_datalink.3 \ + pcap_datalink_name_to_val.3 \ + pcap_datalink_val_to_name.3 \ + pcap_dump.3 \ + pcap_dump_close.3 \ + pcap_dump_file.3 \ + pcap_dump_flush.3 \ + pcap_dump_ftell.3 \ + pcap_dump_open.3 \ + pcap_file.3 \ + pcap_fileno.3 \ + pcap_findalldevs.3 \ + pcap_free_datalinks.3 \ + pcap_freealldevs.3 \ + pcap_freecode.3 \ + pcap_get_selectable_fd.3 \ + pcap_geterr.3 \ + pcap_inject.3 \ + pcap_is_swapped.3 \ + pcap_lib_version.3 \ + pcap_list_datalinks.3 \ + pcap_lookupdev.3 \ + pcap_lookupnet.3 \ + pcap_loop.3 \ + pcap_major_version.3 \ + pcap_next_ex.3 \ + pcap_offline_filter.3 \ + pcap_open_dead.3 \ + pcap_open_live.3 \ + pcap_open_offline.3 \ + pcap_set_buffer_size.3 \ + pcap_set_datalink.3 \ + pcap_set_promisc.3 \ + pcap_set_rfmon.3 \ + pcap_set_snaplen.3 \ + pcap_set_timeout.3 \ + pcap_setdirection.3 \ + pcap_setfilter.3 \ + pcap_setnonblock.3 \ + pcap_snapshot.3 \ + pcap_stats.3 \ + pcap_statustostr.3 \ + pcap_strerror.3 \ + pcap-savefile.5 \ + pcap-filter.7 \ + pcap-linktype.7 +MLINKS= pcap_datalink_val_to_name.3 pcap_datalink_val_to_description.3 \ + pcap_dump_open.3 pcap_dump_fopen.3 \ + pcap_geterr.3 pcap_perror.3 \ + pcap_inject.3 pcap_sendpacket.3 \ + pcap_loop.3 pcap_dispatch.3 \ + pcap_major_version.3 pcap_minor_version.3 \ + pcap_next_ex.3 pcap_next.3 \ + pcap_open_offline.3 pcap_fopen_offline.3 \ + pcap_setnonblock.3 pcap_getnonblock.3 + +# Our man pages are a special copy from the distdir. See bellow. +CLEANFILES+=${MAN} +CLEANFILES+=tokdefs.h version.h version.c YFLAGS+=-p pcapyy LFLAGS+=-Ppcapyy @@ -74,7 +90,7 @@ CFLAGS+=-DINET6 CFLAGS+=-DHAVE_NET_PFVAR_H .endif -SHLIB_MAJOR=5 +SHLIB_MAJOR=6 # # Magic to grab sources out of src/contrib @@ -95,4 +111,20 @@ version.h: ${PCAP_DISTDIR}/VERSION tokdefs.h: grammar.h ln -sf grammar.h tokdefs.h + +# +# Magic to convert the man pages to something non Solarish +# +.for _page in ${MAN} +${_page}: + if [ -f ${PCAP_DISTDIR}/${_page:S/3$/3pcap/} ]; then \ + F=${_page:S/3$/3pcap/}; \ + elif [ -f ${PCAP_DISTDIR}/${_page:S/5$/manfile/} ]; then \ + F=${_page:S/5$/manfile/}; \ + else \ + F=${_page:S/7$/manmisc/}; \ + fi; \ + sed -e 's/3PCAP/3/g' ${PCAP_DISTDIR}/$$F > ${_page} +.endfor + .include Modified: head/lib/libpcap/config.h ============================================================================== --- head/lib/libpcap/config.h Sat Mar 21 22:58:08 2009 (r190225) +++ head/lib/libpcap/config.h Sat Mar 21 22:59:02 2009 (r190226) @@ -17,6 +17,9 @@ /* define if you have a cloning BPF device */ #define HAVE_CLONING_BPF 1 +/* define if you have dag_get_stream_erf_types() */ +/* #undef HAVE_DAG_GET_STREAM_ERF_TYPES */ + /* define if you have the DAG API */ /* #undef HAVE_DAG_API */ @@ -30,12 +33,18 @@ don't. */ #define HAVE_DECL_ETHER_HOSTTON 1 +/* if passive_req_t primitive exists */ +/* #undef HAVE_DLPI_PASSIVE */ + /* define if you have a /dev/dlpi */ /* #undef HAVE_DEV_DLPI */ /* Define to 1 if you have the `ether_hostton' function. */ #define HAVE_ETHER_HOSTTON 1 +/* Define to 1 if fseeko (and presumably ftello) exists and is declared. */ +#define HAVE_FSEEKO 1 + /* on HP-UX 10.20 or later */ /* #undef HAVE_HPUX10_20_OR_LATER */ @@ -48,9 +57,18 @@ /* Define to 1 if you have the header file. */ #define HAVE_INTTYPES_H 1 +/* if libdlpi exists */ +/* #undef HAVE_LIBDLPI */ + /* Define to 1 if you have the header file. */ #define HAVE_LIMITS_H 1 +/* if tp_vlan_tci exists */ +/* #undef HAVE_LINUX_TPACKET_AUXDATA_TP_VLAN_TCI */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_LINUX_WIRELESS_H */ + /* Define to 1 if you have the header file. */ #define HAVE_MEMORY_H 1 @@ -60,6 +78,9 @@ /* 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. */ +#define HAVE_NET_IF_MEDIA_H 1 + /* Define to 1 if you have the header file. */ /* See Makefile */ /* #undef HAVE_NET_PFVAR_H */ @@ -84,6 +105,9 @@ /* if struct sockaddr_storage exists */ #define HAVE_SOCKADDR_STORAGE 1 + +/* define if socklen_t is defined */ +#define HAVE_SOCKLEN_T 1 /* On solaris */ /* #undef HAVE_SOLARIS */ @@ -139,6 +163,9 @@ /* Define to 1 if you have the `vsnprintf' function. */ #define HAVE_VSNPRINTF 1 +/* define if the system supports zerocopy BPF */ +#define HAVE_ZEROCOPY_BPF 1 + /* define if your compiler has __attribute__ */ #define HAVE___ATTRIBUTE__ 1 @@ -148,6 +175,9 @@ /* if unaligned access fails */ /* #undef LBL_ALIGN */ +/* path for device for USB sniffing */ +/* #undef LINUX_USB_MON_DEV */ + /* Define to 1 if netinet/ether.h declares `ether_hostton' */ /* #undef NETINET_ETHER_H_DECLARES_ETHER_HOSTTON */ @@ -175,6 +205,15 @@ /* /dev/dlpi directory */ /* #undef PCAP_DEV_PREFIX */ +/* target host supports Bluetooth sniffing */ +/* #undef PCAP_SUPPORT_BT */ + +/* target host supports USB sniffing */ +/* #undef PCAP_SUPPORT_USB */ + +/* include ACN support */ +/* #undef SITA */ + /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 @@ -184,6 +223,15 @@ /* needed on HP-UX */ /* #undef _HPUX_SOURCE */ +/* Number of bits in a file offset, on hosts where this is settable. */ +/* #undef _FILE_OFFSET_BITS */ + +/* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */ +/* #undef _LARGEFILE_SOURCE */ + +/* Define for large files, on AIX-style hosts. */ +/* #undef _LARGE_FILES */ + /* define on AIX to get certain functions */ /* #undef _SUN */ @@ -199,5 +247,8 @@ /* if we have u_int32_t */ /* #undef u_int32_t */ +/* if we have u_int64_t */ +/* #undef u_int64_t */ + /* if we have u_int8_t */ /* #undef u_int8_t */