From: Peter Avalos Date: Mon, 6 Jul 2009 06:11:42 +0000 (-1000) Subject: Merge branch 'vendor/LIBPCAP' and updated build for new version. X-Git-Tag: v2.3.2~45^2~3 X-Git-Url: https://gitweb.dragonflybsd.org/~nant/dragonfly.git/commitdiff_plain/42bcdd13e82e8260710c310c068c4040a52a7f77 Merge branch 'vendor/LIBPCAP' and updated build for new version. --- 42bcdd13e82e8260710c310c068c4040a52a7f77 diff --cc contrib/libpcap/gencode.c index eb260b93ed,41057ba8cb..bd3822496d --- a/contrib/libpcap/gencode.c +++ b/contrib/libpcap/gencode.c @@@ -68,6 -68,7 +68,7 @@@ static const char rcsid[] _U_ #include "nlpid.h" #include "llc.h" #include "gencode.h" -#include "ieee80211.h" ++#include #include "atmuni31.h" #include "sunatmpos.h" #include "ppp.h" @@@ -88,11 -88,8 +89,10 @@@ #include /* for "struct addrinfo" */ #endif /* WIN32 */ #endif /*INET6*/ - #include + #include - #include +#include + #define ETHERMTU 1500 #ifndef IPPROTO_SCTP diff --cc contrib/libpcap/grammar.y index a8c81812ca,7076c87bc0..269871655c --- a/contrib/libpcap/grammar.y +++ b/contrib/libpcap/grammar.y @@@ -54,13 -54,11 +54,12 @@@ struct rtentry #include "gencode.h" #ifdef HAVE_NET_PFVAR_H #include -#include -#include +#include +#include +#include #endif - #include - -#include "ieee80211.h" +#include + #include #ifdef HAVE_OS_PROTO_H #include "os-proto.h" @@@ -70,9 -68,91 +69,91 @@@ (q).dir = (d),\ (q).addr = (a) - static const char *ieee80211_mgt_names[] = IEEE80211_MGT_SUBTYPE_NAMES; - static const char *ieee80211_ctl_names[] = IEEE80211_CTL_SUBTYPE_NAMES; - static const char *ieee80211_data_names[] = IEEE80211_DATA_SUBTYPE_NAMES; + struct tok { + int v; /* value */ + const char *s; /* string */ + }; + + static const struct tok ieee80211_types[] = { + { IEEE80211_FC0_TYPE_DATA, "data" }, + { IEEE80211_FC0_TYPE_MGT, "mgt" }, + { IEEE80211_FC0_TYPE_MGT, "management" }, + { IEEE80211_FC0_TYPE_CTL, "ctl" }, + { IEEE80211_FC0_TYPE_CTL, "control" }, + { 0, NULL } + }; + static const struct tok ieee80211_mgt_subtypes[] = { + { IEEE80211_FC0_SUBTYPE_ASSOC_REQ, "assocreq" }, + { IEEE80211_FC0_SUBTYPE_ASSOC_REQ, "assoc-req" }, + { IEEE80211_FC0_SUBTYPE_ASSOC_RESP, "assocresp" }, + { IEEE80211_FC0_SUBTYPE_ASSOC_RESP, "assoc-resp" }, + { IEEE80211_FC0_SUBTYPE_REASSOC_REQ, "reassocreq" }, + { IEEE80211_FC0_SUBTYPE_REASSOC_REQ, "reassoc-req" }, + { IEEE80211_FC0_SUBTYPE_REASSOC_RESP, "reassocresp" }, + { IEEE80211_FC0_SUBTYPE_REASSOC_RESP, "reassoc-resp" }, + { IEEE80211_FC0_SUBTYPE_PROBE_REQ, "probereq" }, + { IEEE80211_FC0_SUBTYPE_PROBE_REQ, "probe-req" }, + { IEEE80211_FC0_SUBTYPE_PROBE_RESP, "proberesp" }, + { IEEE80211_FC0_SUBTYPE_PROBE_RESP, "probe-resp" }, + { IEEE80211_FC0_SUBTYPE_BEACON, "beacon" }, + { IEEE80211_FC0_SUBTYPE_ATIM, "atim" }, + { IEEE80211_FC0_SUBTYPE_DISASSOC, "disassoc" }, + { IEEE80211_FC0_SUBTYPE_DISASSOC, "disassociation" }, + { IEEE80211_FC0_SUBTYPE_AUTH, "auth" }, + { IEEE80211_FC0_SUBTYPE_AUTH, "authentication" }, + { IEEE80211_FC0_SUBTYPE_DEAUTH, "deauth" }, + { IEEE80211_FC0_SUBTYPE_DEAUTH, "deauthentication" }, + { 0, NULL } + }; + static const struct tok ieee80211_ctl_subtypes[] = { + { IEEE80211_FC0_SUBTYPE_PS_POLL, "ps-poll" }, + { IEEE80211_FC0_SUBTYPE_RTS, "rts" }, + { IEEE80211_FC0_SUBTYPE_CTS, "cts" }, + { IEEE80211_FC0_SUBTYPE_ACK, "ack" }, + { IEEE80211_FC0_SUBTYPE_CF_END, "cf-end" }, + { IEEE80211_FC0_SUBTYPE_CF_END_ACK, "cf-end-ack" }, + { 0, NULL } + }; + static const struct tok ieee80211_data_subtypes[] = { + { IEEE80211_FC0_SUBTYPE_DATA, "data" }, + { IEEE80211_FC0_SUBTYPE_CF_ACK, "data-cf-ack" }, + { IEEE80211_FC0_SUBTYPE_CF_POLL, "data-cf-poll" }, + { IEEE80211_FC0_SUBTYPE_CF_ACPL, "data-cf-ack-poll" }, + { IEEE80211_FC0_SUBTYPE_NODATA, "null" }, - { IEEE80211_FC0_SUBTYPE_NODATA_CF_ACK, "cf-ack" }, - { IEEE80211_FC0_SUBTYPE_NODATA_CF_POLL, "cf-poll" }, - { IEEE80211_FC0_SUBTYPE_NODATA_CF_ACPL, "cf-ack-poll" }, ++ { IEEE80211_FC0_SUBTYPE_CFACK, "cf-ack" }, ++ { IEEE80211_FC0_SUBTYPE_CFPOLL, "cf-poll" }, ++ { IEEE80211_FC0_SUBTYPE_CF_ACK_CF_ACK, "cf-ack-poll" }, + { IEEE80211_FC0_SUBTYPE_QOS|IEEE80211_FC0_SUBTYPE_DATA, "qos-data" }, + { IEEE80211_FC0_SUBTYPE_QOS|IEEE80211_FC0_SUBTYPE_CF_ACK, "qos-data-cf-ack" }, + { IEEE80211_FC0_SUBTYPE_QOS|IEEE80211_FC0_SUBTYPE_CF_POLL, "qos-data-cf-poll" }, + { IEEE80211_FC0_SUBTYPE_QOS|IEEE80211_FC0_SUBTYPE_CF_ACPL, "qos-data-cf-ack-poll" }, + { IEEE80211_FC0_SUBTYPE_QOS|IEEE80211_FC0_SUBTYPE_NODATA, "qos" }, - { IEEE80211_FC0_SUBTYPE_QOS|IEEE80211_FC0_SUBTYPE_NODATA_CF_POLL, "qos-cf-poll" }, - { IEEE80211_FC0_SUBTYPE_QOS|IEEE80211_FC0_SUBTYPE_NODATA_CF_ACPL, "qos-cf-ack-poll" }, ++ { IEEE80211_FC0_SUBTYPE_QOS|IEEE80211_FC0_SUBTYPE_CFPOLL, "qos-cf-poll" }, ++ { IEEE80211_FC0_SUBTYPE_QOS|IEEE80211_FC0_SUBTYPE_CF_ACK_CF_ACK, "qos-cf-ack-poll" }, + { 0, NULL } + }; + struct type2tok { + int type; + const struct tok *tok; + }; + static const struct type2tok ieee80211_type_subtypes[] = { + { IEEE80211_FC0_TYPE_MGT, ieee80211_mgt_subtypes }, + { IEEE80211_FC0_TYPE_CTL, ieee80211_ctl_subtypes }, + { IEEE80211_FC0_TYPE_DATA, ieee80211_data_subtypes }, + { 0, NULL } + }; + + static int + str2tok(const char *str, const struct tok *toks) + { + int i; + + for (i = 0; toks[i].s != NULL; i++) { + if (pcap_strcasecmp(toks[i].s, str) == 0) + return (toks[i].v); + } + return (-1); + } int n_errors = 0; diff --cc contrib/libpcap/pcap/pcap.h index df0784f72e,ea18edcff5..4f6ac00f67 --- a/contrib/libpcap/pcap/pcap.h +++ b/contrib/libpcap/pcap/pcap.h @@@ -47,7 -47,9 +47,9 @@@ #include #endif /* WIN32/MSDOS/UN*X */ + #ifndef PCAP_DONT_INCLUDE_PCAP_BPF_H -#include +#include + #endif #include diff --cc etc/mtree/BSD.include.dist index 3715476b8f,0000000000..e9d8e575a5 mode 100644,000000..100644 --- a/etc/mtree/BSD.include.dist +++ b/etc/mtree/BSD.include.dist @@@ -1,265 -1,0 +1,267 @@@ +# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.32.2.14 2003/01/24 09:47:07 roam Exp $ +# $DragonFly: src/etc/mtree/BSD.include.dist,v 1.29 2008/11/24 10:27:25 hasso Exp $ +# +# Please see the file src/etc/mtree/README before making changes to this file. +# + +/set type=dir uname=root gname=wheel mode=0755 +. + arpa + .. + bus + cam + scsi + .. + .. + pccard + .. + usb + .. + pci + .. + ppbus + .. + isa + .. + .. + crypto + .. + dev + acpica + .. + misc + lpt + .. + ppi + .. + .. + netif + wi + .. + .. + raid + ciss + .. + .. + video + bktr + .. + meteor + .. + .. + .. + netproto + 802_11 + .. + atalk + .. + atm + ipatm + .. + sigpvc + .. + spans + .. + uni + .. + .. + ipsec + .. + ipx + .. + key + .. + mpls + .. + natm + .. + ncp + .. + ns + .. + smb + .. + .. + emulation + posix4 + .. + linux + .. + .. + vfs + hammer + .. + msdosfs + .. + nfs + .. + ntfs + .. + nwfs + .. + udf + .. + ufs + .. + mfs + .. + smbfs + .. + isofs + cd9660 + .. + .. + .. + c++ + 3.4 + backward + .. + bits + .. + debug + .. + ext + .. + .. + 4.1 + backward + .. + bits + .. + debug + .. + ext + .. + tr1 + .. + .. + .. + cpu + .. + isc + .. + libmilter + .. + machine + pc + .. + .. + i4b_machine + .. + net + altq + .. + vlan + .. + ipfw + .. + ip6fw + .. + pf + .. + ppp + .. + ppp_layer + .. + sl + .. + dummynet + .. + sppp + .. + ip_mroute + .. + bridge + .. + tap + .. + tun + .. + i4b + include + .. + .. + .. + netgraph + UI + .. + async + .. + bpf + .. + bridge + .. + cisco + .. + echo + .. + eiface + .. + etf + .. + ether + .. + fec + .. + frame_relay + .. + hole + .. + iface + .. + ksocket + .. + l2tp + .. + lmi + .. + mppc + .. + one2many + .. + ppp + .. + pppoe + .. + pptpgre + .. + rfc1490 + .. + socket + .. + tee + .. + tty + .. + vjc + .. + .. + kadm5 + .. + netbt + .. + netinet + .. + netinet6 + .. + objc + .. + openssl + .. ++ pcap ++ .. + protocols + .. + readline + .. + rpc + .. + rpcsvc + .. + security + .. + sys + .. + vm + .. +.. diff --cc lib/libpcap/Makefile index a8ab51a23e,0000000000..9e85fb97e2 mode 100644,000000..100644 --- a/lib/libpcap/Makefile +++ b/lib/libpcap/Makefile @@@ -1,46 -1,0 +1,138 @@@ +# Makefile for libpcap +# $FreeBSD: src/lib/libpcap/Makefile,v 1.24.2.4 2002/07/22 14:21:50 ru Exp $ +# $DragonFly: src/lib/libpcap/Makefile,v 1.12 2007/10/11 01:07:29 pavalos Exp $ + +SRCDIR= ${.CURDIR}/../../contrib/libpcap + +LIB= pcap +SRCS= grammar.y tokdefs.h pcap-bpf.c version.h \ + pcap.c inet.c fad-getad.c gencode.c optimize.c nametoaddr.c \ + etherent.c savefile.c bpf_filter.c bpf_image.c bpf_dump.c \ + scanner.l version.c ++ ++# Old compatibility headers +INCS= pcap.h pcap-namedb.h pcap-int.h - MAN= pcap.3 ++ ++PCAPINCS= pcap/pcap.h pcap/namedb.h ++PCAPINCSDIR= ${INCLUDEDIR}/pcap ++INCSGROUPS= INCS PCAPINCS ++ ++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 ++ +CLEANFILES=tokdefs.h version.c version.h ++CLEANFILES+=${MAN} +WARNS?= 2 + +CFLAGS+=-DHAVE_CONFIG_H -Dyylval=pcap_lval -I${.CURDIR} -I. +CFLAGS+=-D_U_="__attribute__((unused))" +CFLAGS+=-DHAVE_STRUCT_ETHER_ADDR -DHAVE_NET_PFVAR_H +.if !defined(NOINET6) +CFLAGS+=-DINET6 +.endif + +SHLIB_MAJOR=3 + +# +# Magic to grab sources out of src/contrib +# +PCAP_DISTDIR?=${SRCDIR} +CFLAGS+=-I${PCAP_DISTDIR} +.PATH: ${PCAP_DISTDIR} +.PATH: ${PCAP_DISTDIR}/bpf/net + +version.c: ${PCAP_DISTDIR}/VERSION + @rm -f $@ + sed 's/.*/char pcap_version[] = "&";/' ${PCAP_DISTDIR}/VERSION > $@ + +version.h: ${PCAP_DISTDIR}/VERSION + @rm -f $@ + sed 's/.*/static const char pcap_version_string[] = "libpcap version &";/' \ + ${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/3$/3pcap.in/} ]; then \ ++ F=${_page:S/3$/3pcap.in/}; \ ++ elif [ -f ${PCAP_DISTDIR}/${_page:S/5$/manfile/} ]; then \ ++ F=${_page:S/5$/manfile/}; \ ++ elif [ -f ${PCAP_DISTDIR}/${_page:S/5$/manfile.in/} ]; then \ ++ F=${_page:S/5$/manfile.in/}; \ ++ elif [ -f ${PCAP_DISTDIR}/${_page:S/7$/manmisc/} ]; then \ ++ F=${_page:S/7$/manmisc/}; \ ++ elif [ -f ${PCAP_DISTDIR}/${_page:S/7$/manmisc.in/} ]; then \ ++ F=${_page:S/7$/manmisc.in/}; \ ++ fi; \ ++ sed -e 's/3PCAP/3/g' -e 's/@MAN_FILE_FORMATS@/5/g' \ ++ -e 's/@MAN_MISC_INFO@/7/g' ${PCAP_DISTDIR}/$$F > ${_page} ++.endfor ++ +.include diff --cc lib/libpcap/config.h index e454c8d53e,0000000000..deb6248c4f mode 100644,000000..100644 --- a/lib/libpcap/config.h +++ b/lib/libpcap/config.h @@@ -1,200 -1,0 +1,253 @@@ - /* $DragonFly: src/lib/libpcap/config.h,v 1.6 2007/10/11 01:07:29 pavalos Exp $ */ +/* config.h. Generated from config.h.in by configure. */ +/* config.h.in. Generated from configure.in by autoheader. */ +/* Long story short: aclocal.m4 depends on autoconf 2.13 + * implementation details wrt "const"; newer versions + * have different implementation details so for now we + * put "const" here. This may cause duplicate definitions + * in config.h but that should be OK since they're the same. + */ +/* #undef const */ + +/* Enable optimizer debugging */ +/* #undef BDEBUG */ + +/* define if you have a cloning BPF device */ +/* #undef HAVE_CLONING_BPF */ + +/* define if you have the DAG API */ +/* #undef HAVE_DAG_API */ + +/* define if you have dag_get_erf_types() */ +/* #undef HAVE_DAG_GET_ERF_TYPES */ + ++/* define if you have dag_get_stream_erf_types() */ ++/* #undef HAVE_DAG_GET_STREAM_ERF_TYPES */ ++ +/* define if you have streams capable DAG API */ +/* #undef HAVE_DAG_STREAMS_API */ + +/* Define to 1 if you have the declaration of `ether_hostton', and to 0 if you + don't. */ +#define HAVE_DECL_ETHER_HOSTTON 1 + +/* define if you have a /dev/dlpi */ +/* #undef HAVE_DEV_DLPI */ + ++/* if passive_req_t primitive exists */ ++/* #undef HAVE_DLPI_PASSIVE */ ++ +/* 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 */ + +/* on HP-UX 9.x */ +/* #undef HAVE_HPUX9 */ + +/* if ppa_info_t_dl_module_id exists */ +/* #undef HAVE_HP_PPA_INFO_T_DL_MODULE_ID_1 */ + +/* 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 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_NETINET_ETHER_H */ + +/* 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. */ +/* #undef HAVE_NET_PFVAR_H */ + +/* if there's an os_proto.h */ +/* #undef HAVE_OS_PROTO_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_PATHS_H 1 + ++/* define if net/pfvar.h defines PF_NAT through PF_NORDR */ ++/* #undef HAVE_PF_NAT_THROUGH_PF_NORDR */ ++ +/* define if you have a /proc/net/dev */ +/* #undef HAVE_PROC_NET_DEV */ + +/* define if you have a Septel API */ +/* #undef HAVE_SEPTEL_API */ + +/* Define to 1 if you have the `snprintf' function. */ +#define HAVE_SNPRINTF 1 + +/* if struct sockaddr has sa_len */ +#define HAVE_SOCKADDR_SA_LEN 1 + +/* 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 */ + +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the `strerror' function. */ +#define HAVE_STRERROR 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the `strlcpy' function. */ +#define HAVE_STRLCPY 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_BUFMOD_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_DLPI_EXT_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_IOCCOM_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_SOCKIO_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* if if_packet.h has tpacket_stats defined */ +/* #undef HAVE_TPACKET_STATS */ + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* define if version.h is generated in the build procedure */ +#define HAVE_VERSION_H 1 + +/* Define to 1 if you have the `vsnprintf' function. */ +#define HAVE_VSNPRINTF 1 + ++/* define if the system supports zerocopy BPF */ ++/* #undef HAVE_ZEROCOPY_BPF */ ++ +/* define if your compiler has __attribute__ */ +#define HAVE___ATTRIBUTE__ 1 + +/* IPv6 */ +/* #undef INET6 */ + +/* 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 */ + +/* Define to 1 if netinet/if_ether.h declares `ether_hostton' */ +#define NETINET_IF_ETHER_H_DECLARES_ETHER_HOSTTON + +/* do not use protochain */ +/* #undef NO_PROTOCHAIN */ + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "" + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING "" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "" + +/* Define to the version of this package. */ +#define PACKAGE_VERSION "" + +/* /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 + +/* Enable parser debugging */ +/* #undef YYDEBUG */ + ++/* Number of bits in a file offset, on hosts where this is settable. */ ++/* #undef _FILE_OFFSET_BITS */ ++ +/* needed on HP-UX */ +/* #undef _HPUX_SOURCE */ + ++/* 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 */ + +/* Define as token for inline if inlining supported */ +#define inline inline + +/* on sinix */ +/* #undef sinix */ + +/* if we have u_int16_t */ +/* #undef u_int16_t */ + +/* 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 */ diff --cc share/man/man7/hier.7 index 0c2d43f9ef,0000000000..bdd8ba0382 mode 100644,000000..100644 --- a/share/man/man7/hier.7 +++ b/share/man/man7/hier.7 @@@ -1,758 -1,0 +1,762 @@@ +.\" Copyright (c) 1990, 1993 +.\" The Regents of the University of California. All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" 3. All advertising materials mentioning features or use of this software +.\" must display the following acknowledgement: +.\" This product includes software developed by the University of +.\" California, Berkeley and its contributors. +.\" 4. Neither the name of the University nor the names of its contributors +.\" may be used to endorse or promote products derived from this software +.\" without specific prior written permission. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.\" @(#)hier.7 8.1 (Berkeley) 6/5/93 +.\" $FreeBSD: src/share/man/man7/hier.7,v 1.29.2.17 2003/01/13 21:43:50 ceri Exp $ +.\" $DragonFly: src/share/man/man7/hier.7,v 1.26 2008/09/06 14:24:44 swildner Exp $ +.\" +.Dd September 2, 2008 +.Dt HIER 7 +.Os +.Sh NAME +.Nm hier +.Nd layout of filesystems +.Sh DESCRIPTION +A sketch of the filesystem hierarchy. +.Bl -tag -width ".Pa /modules/" +.It Pa / +root directory of the filesystem +.It Pa /bin/ +user utilities fundamental to both single-user and multi-user environments +.It Pa /boot/ +programs and configuration files used during operating system bootstrap +.Pp +.Bl -tag -width ".Pa defaults/" -compact +.It Pa defaults/ +default bootstrapping configuration files; see +.Xr loader.conf 5 +.It Pa kernel +pure kernel executable (the operating system loaded into memory +at boot time). +.It Pa modules/ +loadable kernel modules; +see +.Xr kldstat 8 +.El +.It Pa /dev/ +block and character device files +.Pp +.Bl -tag -width ".Pa MAKEDEV" -compact +.It Pa MAKEDEV +script for creating device files; +see +.Xr MAKEDEV 8 +.It Pa fd/ +file descriptor files; +see +.Xr \&fd 4 +.El +.It Pa /etc/ +system configuration files and scripts +.Pp +.Bl -tag -width ".Pa bluetooth/" -compact +.It Pa bluetooth/ +bluetooth configuration files +.It Pa defaults/ +default system configuration files; +see +.Xr rc 8 +.It Pa dma/ +.Xr dma 8 +configuration files +.It Pa firmware/ +Firmware image files; +see +.Xr firmware 9 +.It Pa isdn/ +isdn4bsd configuration files; +see +.Xr isdnd 8 +.It Pa localtime +local timezone information; +see +.Xr ctime 3 +.It Pa mail/ +Sendmail control files +.It Pa mtree/ +mtree configuration files; +see +.Xr mtree 8 +.It Pa namedb/ +named configuration files; +see +.Xr named 8 +.It Pa pam.d/ +configuration files for the Pluggable Authentication Modules (PAM) +library +.It Pa periodic/ +scripts that are run daily, weekly, and monthly, via +.Xr cron 8 ; +see +.Xr periodic 8 +.It Pa ppp/ +ppp configuration files; +see +.Xr ppp 8 +.It Pa rc.d/ +System and daemon startup/control scripts; +see +.Xr rc 8 +.It Pa ssh/ +OpenSSH configuration files; +see +.Xr ssh 1 +.It Pa ssl/ +OpenSSL configuration files +.It Pa upgrade/ +Files relevant to system upgrades +.It Pa uucp/ +uucp configuration files; +see +.Xr uucp 1 +.El +.It Pa /home/ +HOME directories of non-root users +.It Pa /mnt/ +empty directory commonly used by +system administrators as a temporary mount point +.It Pa /proc/ +process file system; +see +.Xr procfs 5 , +.Xr mount_procfs 8 +.It Pa /root/ +root's HOME directory +.It Pa /sbin/ +system programs and administration utilities +fundamental to both single-user and multi-user environments +.It Pa /sys/ +the kernel's source code (usually a symbolic link to +.Pa /usr/src/sys ) +.It Pa /tmp/ +temporary files that are not guaranteed to persist across system reboots +.It Pa /usr/ +contains the majority of user utilities and applications +.Pp +.Bl -tag -width ".Pa libdata/" -compact +.It Pa bin/ +common utilities, programming tools, and applications +.It Pa games/ +useful and semi-frivolous programs +.It Pa include/ +standard C include files +.Pp +.Bl -tag -width ".Pa libmilter/" -compact +.It Pa arpa/ +C include files for Internet service protocols +.It Pa c++/ +C++ include files +.It Pa cam/ +C include files for the Common Access Methods Layer +.Pp +.Bl -tag -width ".Pa scsi/" -compact +.It Pa scsi/ +The SCSI device on top of CAM +.El +.Pp +.It Pa dev/ +C include files for programming various +.Dx +devices +.It Pa emulation/ +Include Files for various emulation layers +.It Pa fs/ +.Pp +.Bl -tag -width ".Pa smbfs/" -compact +.It Pa smbfs/ +SMB/CIFS filesystem +.El +.Pp +.It Pa isc/ +ISC utility library libisc include files +.It Pa isofs/ +.Pp +.Bl -tag -width ".Pa cd9660/" -compact +.It Pa cd9660/ +iso9660 filesystem +.El +.Pp +.It Pa libmilter/ +C include files for libmilter, +the sendmail mail filter API +.It Pa machine/ +machine-specific C include files +.It Pa msdosfs/ +MS-DOS file system +.It Pa net/ +misc network C include files +.It Pa netatalk/ +Appletalk protocol +.It Pa netatm/ +ATM include files; +see +.Xr atm 8 +.It Pa netinet/ +C include files for Internet standard protocols; +see +.Xr inet 4 +.It Pa netinet6/ +C include files for Internet protocol version 6; +see +.Xr inet6 4 +.It Pa netipx/ +IPX/SPX protocol stacks +.It Pa netkey/ +kernel key-management service +.It Pa netnatm/ +NATM include files; +see +.Xr natm 4 +.It Pa netns/ +Xerox NS protocols +.It Pa netsmb/ +SMB/CIFS requester +.It Pa nfs/ +C include files for NFS (Network File System) +.It Pa objc/ +Objective C include files +.It Pa openssl/ +OpenSSL (Cryptography/SSL toolkit) headers ++.It Pa pcap/ ++Packet Capture (libpcap) headers; ++see ++.Xr pcap 3 +.It Pa pccard/ +PC-CARD controllers +.It Pa protocols/ +C include files for Berkeley service protocols +.It Pa readline/ +get a line from a user, with editing; +see +.Xr readline 3 +.It Pa rpc/ +remote procedure calls; +see +.Xr rpc 3 +.It Pa rpcsvc/ +definition of RPC service structures; see +.Xr rpc 3 +.It Pa security/ +PAM; see +.Xr pam 8 +.It Pa sys/ +system C include files (kernel data structures) +.It Pa ufs/ +C include files for UFS (The U-word File System) +.Pp +.Bl -tag -width ".Pa ffs/" -compact +.It Pa ffs/ +Fast filesystem +.It Pa mfs/ +memory file system; +see +.Xr mount_mfs 8 +.It Pa ufs/ +UFS filesystem +.El +.Pp +.It Pa vm/ +virtual memory; +see +.Xr vmstat 8 +.El +.Pp +.It Pa lib/ +archive libraries +.Pp +.Bl -tag -width ".Pa compat/" -compact +.It Pa aout/ +a.out archive libraries +.It Pa compat/ +shared libraries for compatibility +.Pp +.Bl -tag -width ".Pa aout/" -compact +.It Pa aout/ +a.out backward compatibility libraries +.El +.El +.Pp +.It Pa libdata/ +misc. utility data files +.Pp +.Bl -tag -width ".Pa stallion/" -compact +.It Pa doscmd/ +files used by doscmd (drivers, fonts, etc.); +see +.Xr doscmd 1 +.Pp +.Bl -tag -width ".Pa fonts/" -compact +.It Pa fonts/ +fonts used by doscmd +.El +.Pp +.It Pa lint/ +various prebuilt lint libraries; +see +.Xr lint 1 +.It Pa msdosfs/ +Character set conversion tables +.It Pa stallion/ +holds the download firmware images +.El +.Pp +.It Pa libexec/ +system daemons & system utilities (executed by other programs) +.Pp +.Bl -tag -width ".Pa binutils217/" -compact +.It Pa binutils217/ +.Pp +.Bl -tag -width ".Pa ldscripts/" -compact +.It Pa ldscripts/ +linker scripts; +see +.Xr ld 1 +.El +.Pp +.It Pa lpr/ +utilities and filters for LP print system; +see +.Xr lpr 1 +.It Pa sendmail/ +the sendmail binary; +see +.Xr mailwrapper 8 +and +.Xr sendmail 8 +.It Pa sm.bin/ +restricted shell for sendmail; +see +.Xr smrsh 8 +.It Pa uucp/ +uucp utilities; +see +.Xr uucp 1 +.El +.Pp +.It Pa local/ +local executables, libraries, etc. +Within +.Pa local/ , +the general layout sketched out by +.Xr hier 7 +for +.Pa /usr +should be used. +Exceptions are the +.Pa man/ +directory (directly under +.Pa local/ +rather than under +.Pa local/share/ ) , +documentation (in +.Pa share/doc// ) , +and +.Pa /usr/local/etc +.Pf ( mimics +.Pa /etc ) . +.It Pa obj/ +architecture-specific target tree produced by building the +.Pa /usr/src +tree +.It Pa pkg/ +default destination directory for the +.Xr pkgsrc 7 +collection. +Within +.Pa pkg/ , +the general layout sketched out by +.Xr hier 7 +for +.Pa /usr +should be used. +Exceptions are the +.Pa man/ +directory (directly under +.Pa pkg/ +rather than under +.Pa pkg/share/ ) , +documentation (in +.Pa share/doc// ) , +and +.Pa /usr/pkg/etc +.Pf ( mimics +.Pa /etc ) . +.It Pa pkgsrc/ +The +.Xr pkgsrc 7 +collection (optional). +.It Pa sbin/ +system daemons & system utilities (executed by users) +.It Pa share/ +architecture-independent files +.Pp +.Bl -tag -width ".Pa groff_font/" -compact +.It Pa calendar/ +a variety of pre-fab calendar files; +see +.Xr calendar 1 +.It Pa dict/ +word lists; +see +.Xr look 1 +.Pp +.Bl -tag -width ".Pa papers/" -compact +.It Pa web2 +words from Webster's 2nd International +.It Pa words +common words +.It Pa papers/ +reference databases; +see +.Xr refer 1 +.El +.Pp +.It Pa examples/ +various examples for users and programmers +.It Pa games/ +ASCII text files used by various games +.It Pa groff_font/ +device description file for device name +.It Pa i18n/ +internationalization databases; see +.Xr iconv 3 +.It Pa info/ +GNU Info hypertext system +.It Pa isdn/ +ISDN +.It Pa libg++/ +libg++'s genclass prototype/template class files +.It Pa locale/ +localization files; +see +.Xr setlocale 3 +.It Pa man/ +manual pages +.It Pa me/ +macros for use with the me macro package; +see +.Xr me 7 +.It Pa misc/ +misc system-wide ASCII text files +.Pp +.Bl -tag -width ".Pa termcap" -compact +.It Pa termcap +terminal characteristics database; +see +.Xr termcap 5 +.El +.Pp +.It Pa mk/ +templates for make; +see +.Xr make 1 +.It Pa nls/ +national language support files; +see +.Xr mklocale 1 +.It Pa openssl/ +.Pp +.Bl -tag -width ".Pa man/" -compact +.It Pa man/ +OpenSSL manual pages +.El +.Pp +.It Pa sendmail/ +sendmail configuration files; +see +.Xr sendmail 8 +.It Pa skel/ +example . (dot) files for new accounts +.It Pa syscons/ +files used by +.Xr syscons 4 +.Pp +.Bl -tag -width ".Pa scrnmaps/" -compact +.It Pa fonts/ +console fonts; +see +.Xr vidcontrol 1 +and +.Xr vidfont 1 +.It Pa keymaps/ +console keyboard maps; +see +.Xr kbdcontrol 1 +and +.Xr kbdmap 1 +.It Pa scrnmaps/ +console screen maps +.El +.Pp +.It Pa tabset/ +tab description files for a variety of terminals; used in +the termcap file; +see +.Xr termcap 5 +.It Pa tmac/ +text processing macros; +see +.Xr nroff 1 +and +.Xr troff 1 +.It Pa vi/ +localization support and utilities for +.Xr vi 1 +.It Pa zoneinfo/ +timezone configuration information; +see +.Xr tzfile 5 +.El +.Pp +.It Pa src/ +.Bx , +third-party, and/or local source files +.Pp +.Bl -tag -width ".Pa kerberos5/" -compact +.It Pa bin/ +source code for files in +.Pa /bin +.It Pa contrib/ +source code for contributed software +.It Pa crypto/ +source code for contributed cryptography software +.It Pa etc/ +source code for files in +.Pa /etc +.It Pa games/ +source code for files in +.Pa /usr/games +.It Pa gnu/ +Utilities covered by the GNU General Public License +.It Pa include/ +source code for files in +.Pa /usr/include +.It Pa kerberos5/ +source code for kerberos version 5 +.It Pa lib/ +source code for files in +.Pa /usr/lib +.It Pa libexec/ +source code for files in +.Pa /usr/libexec +.It Pa nrelease/ +files required to produce a +.Dx +release +.It Pa sbin/ +source code for files in +.Pa /sbin +.It Pa secure/ +build directory for files in +.Pa /usr/src/crypto +.It Pa share/ +source for files in +.Pa /usr/share +.It Pa sys/ +kernel source code +.It Pa tools/ +tools used for maintenance and testing of +.Dx +.It Pa usr.bin/ +source code for files in +.Pa /usr/bin +.It Pa usr.sbin/ +source code for files in +.Pa /usr/sbin +.El +.El +.It Pa /var/ +multi-purpose log, temporary, transient, and spool files +.Pp +.Bl -tag -width ".Pa preserve/" -compact +.It Pa account/ +system accounting files +.Pp +.Bl -tag -width ".Pa acct" -compact +.It Pa acct +execution accounting file; +see +.Xr acct 5 +.El +.Pp +.It Pa at/ +timed command scheduling files; +see +.Xr \&at 1 +.Pp +.Bl -tag -width ".Pa spool/" -compact +.It Pa jobs/ +directory containing job files +.It Pa spool/ +directory containing output spool files +.El +.Pp +.It Pa backups/ +misc. backup files +.It Pa crash/ +default directory to store kernel crash dumps; see +.Xr crash 8 +and +.Xr savecore 8 +.It Pa cron/ +files used by cron; +see +.Xr cron 8 +.Pp +.Bl -tag -width ".Pa tabs/" -compact +.It Pa tabs/ +crontab files; +see +.Xr crontab 5 +.El +.Pp +.It Pa db/ +misc. automatically generated system-specific database files +.It Pa empty/ +empty directory used by +.Xr sshd 8 +for privilege separation +.It Pa games/ +misc. game status and score files +.It Pa heimdal/ +kerberos server databases; see +.Xr kdc 8 +.It Pa log/ +misc. system log files +.Pp +.Bl -tag -width ".Pa wtmp" -compact +.It Pa wtmp +login/logout log; +see +.Xr wtmp 5 +.El +.Pp +.It Pa mail/ +user mailbox files +.It Pa msgs/ +system messages database; +see +.Xr msgs 1 +.It Pa preserve/ +temporary home of files preserved after an accidental death +of an editor; +see +.Xr \&ex 1 +.It Pa quotas/ +filesystem quota information files +.It Pa run/ +system information files describing various info about +system since it was booted +.Pp +.Bl -tag -width ".Pa ppp/" -compact +.It Pa ppp/ +writable by the +.Dq network +group for command connection sockets; see +.Xr ppp 8 +.It Pa utmp +database of current users; +see +.Xr utmp 5 +.El +.Pp +.It Pa rwho/ +rwho data files; +see +.Xr rwhod 8 , +.Xr rwho 1 , +and +.Xr ruptime 1 +.It Pa spool/ +misc. printer and mail system spooling directories +.Pp +.Bl -tag -width ".Pa clientmqueue/" -compact +.It Pa clientmqueue/ +undelivered submission mail queue; +see +.Xr sendmail 8 +.It Pa dma/ +undelivered mail queue; +see +.Xr dma 8 +.It Pa ftp/ +commonly +.Pa ~ftp ; +the anonymous ftp root directory +.It Pa mqueue/ +undelivered mail queue; +see +.Xr sendmail 8 +.It Pa output/ +line printer spooling directories +.It Pa uucp/ +uucp spool directory +.It Pa uucppublic/ +commonly +.Pa ~uucp ; +public uucp temporary directory +.El +.Pp +.It Pa tmp/ +temporary files that are kept between system reboots +.Pp +.Bl -tag -width ".Pa vi.recover/" -compact +.It Pa vi.recover/ +the directory where recovery files are stored +.El +.Pp +.It Pa yp/ +the NIS maps +.El +.El +.Sh NOTES +This manual page documents the default +.Dx +filesystem layout, but +the actual hierarchy on a given system is defined at the system +administrator's discretion. +A well-maintained installation will include a customized version of +this document. +.Sh SEE ALSO +.Xr apropos 1 , +.Xr find 1 , +.Xr finger 1 , +.Xr grep 1 , +.Xr ls 1 , +.Xr whatis 1 , +.Xr whereis 1 , +.Xr which 1 , +.Xr fsck 8 +.Sh HISTORY +A +.Nm +manual page appeared in +.At v7 .