svn commit: r244315 - in projects/calloutng: contrib/binutils/gas/config contrib/gcc contrib/gcc/config/arm contrib/openbsm contrib/openbsm/bin/auditdistd contrib/openbsm/config contrib/openbsm/etc...
Alexander Motin
mav at FreeBSD.org
Sun Dec 16 22:06:34 UTC 2012
Author: mav
Date: Sun Dec 16 22:06:28 2012
New Revision: 244315
URL: http://svnweb.freebsd.org/changeset/base/244315
Log:
MFC @ r244314
Added:
projects/calloutng/sys/security/audit/bsm_domain.c
- copied unchanged from r244314, head/sys/security/audit/bsm_domain.c
projects/calloutng/sys/security/audit/bsm_errno.c
- copied unchanged from r244314, head/sys/security/audit/bsm_errno.c
projects/calloutng/sys/security/audit/bsm_fcntl.c
- copied unchanged from r244314, head/sys/security/audit/bsm_fcntl.c
projects/calloutng/sys/security/audit/bsm_socket_type.c
- copied unchanged from r244314, head/sys/security/audit/bsm_socket_type.c
projects/calloutng/sys/security/audit/bsm_token.c
- copied unchanged from r244314, head/sys/security/audit/bsm_token.c
Deleted:
projects/calloutng/sys/security/audit/audit_bsm_domain.c
projects/calloutng/sys/security/audit/audit_bsm_errno.c
projects/calloutng/sys/security/audit/audit_bsm_fcntl.c
projects/calloutng/sys/security/audit/audit_bsm_socket_type.c
projects/calloutng/sys/security/audit/audit_bsm_token.c
Modified:
projects/calloutng/contrib/binutils/gas/config/tc-arm.c
projects/calloutng/contrib/gcc/config/arm/arm.h
projects/calloutng/contrib/gcc/longlong.h
projects/calloutng/contrib/openbsm/INSTALL
projects/calloutng/contrib/openbsm/NEWS
projects/calloutng/contrib/openbsm/VERSION
projects/calloutng/contrib/openbsm/bin/auditdistd/auditdistd.conf.5
projects/calloutng/contrib/openbsm/config/config.h
projects/calloutng/contrib/openbsm/configure
projects/calloutng/contrib/openbsm/configure.ac
projects/calloutng/contrib/openbsm/etc/audit_event
projects/calloutng/contrib/openbsm/sys/bsm/audit_kevents.h
projects/calloutng/contrib/openbsm/sys/bsm/audit_record.h
projects/calloutng/gnu/usr.bin/binutils/as/Makefile
projects/calloutng/lib/libdevstat/devstat.3
projects/calloutng/lib/libdevstat/devstat.c
projects/calloutng/lib/libdevstat/devstat.h
projects/calloutng/sbin/growfs/growfs.c
projects/calloutng/sys/arm/conf/VERSATILEPB
projects/calloutng/sys/boot/arm/uboot/Makefile
projects/calloutng/sys/boot/sparc64/boot1/boot1.c
projects/calloutng/sys/conf/files
projects/calloutng/sys/dev/wbwd/wbwd.c
projects/calloutng/sys/kern/kern_sig.c
projects/calloutng/sys/netinet6/in6.c
projects/calloutng/sys/netinet6/in6_var.h
projects/calloutng/sys/netinet6/ip6_input.c
projects/calloutng/sys/netpfil/pf/pf_ioctl.c
projects/calloutng/sys/sparc64/conf/GENERIC
projects/calloutng/tools/tools/sysbuild/sysbuild.sh
projects/calloutng/usr.sbin/iostat/iostat.8
projects/calloutng/usr.sbin/iostat/iostat.c
Directory Properties:
projects/calloutng/ (props changed)
projects/calloutng/contrib/binutils/ (props changed)
projects/calloutng/contrib/gcc/ (props changed)
projects/calloutng/contrib/openbsm/ (props changed)
projects/calloutng/gnu/usr.bin/binutils/ (props changed)
projects/calloutng/sbin/ (props changed)
projects/calloutng/sys/ (props changed)
projects/calloutng/sys/boot/ (props changed)
projects/calloutng/sys/conf/ (props changed)
Modified: projects/calloutng/contrib/binutils/gas/config/tc-arm.c
==============================================================================
--- projects/calloutng/contrib/binutils/gas/config/tc-arm.c Sun Dec 16 21:13:40 2012 (r244314)
+++ projects/calloutng/contrib/binutils/gas/config/tc-arm.c Sun Dec 16 22:06:28 2012 (r244315)
@@ -20107,6 +20107,7 @@ static const struct arm_option_cpu_value
{"softvfp", FPU_ARCH_VFP},
{"softvfp+vfp", FPU_ARCH_VFP_V2},
{"vfp", FPU_ARCH_VFP_V2},
+ {"vfpv2", FPU_ARCH_VFP_V2},
{"vfp9", FPU_ARCH_VFP_V2},
{"vfp3", FPU_ARCH_VFP_V3},
{"vfpv3", FPU_ARCH_VFP_V3},
Modified: projects/calloutng/contrib/gcc/config/arm/arm.h
==============================================================================
--- projects/calloutng/contrib/gcc/config/arm/arm.h Sun Dec 16 21:13:40 2012 (r244314)
+++ projects/calloutng/contrib/gcc/config/arm/arm.h Sun Dec 16 22:06:28 2012 (r244315)
@@ -1866,8 +1866,10 @@ typedef struct
# define DTOR_LIST_BEGIN asm (ARM_EABI_DTORS_SECTION_OP)
# define DTOR_LIST_END /* empty */
# else /* !defined (__ARM_EABI__) */
+# ifndef __clang__
# define CTORS_SECTION_ASM_OP ARM_CTORS_SECTION_OP
# define DTORS_SECTION_ASM_OP ARM_DTORS_SECTION_OP
+# endif
# endif /* !defined (__ARM_EABI__) */
#endif /* !defined (IN_LIBCC2) */
Modified: projects/calloutng/contrib/gcc/longlong.h
==============================================================================
--- projects/calloutng/contrib/gcc/longlong.h Sun Dec 16 21:13:40 2012 (r244314)
+++ projects/calloutng/contrib/gcc/longlong.h Sun Dec 16 22:06:28 2012 (r244315)
@@ -205,7 +205,7 @@ UDItype __umulsidi3 (USItype, USItype);
"rI" ((USItype) (bl)) __CLOBBER_CC)
#define umul_ppmm(xh, xl, a, b) \
{register USItype __t0, __t1, __t2; \
- __asm__ ("%@ Inlined umul_ppmm\n" \
+ __asm__ ("/* Inlined umul_ppmm */\n" \
" mov %2, %5, lsr #16\n" \
" mov %0, %6, lsr #16\n" \
" bic %3, %5, %2, lsl #16\n" \
Modified: projects/calloutng/contrib/openbsm/INSTALL
==============================================================================
--- projects/calloutng/contrib/openbsm/INSTALL Sun Dec 16 21:13:40 2012 (r244314)
+++ projects/calloutng/contrib/openbsm/INSTALL Sun Dec 16 22:06:28 2012 (r244315)
@@ -9,8 +9,8 @@ suppport is found. Typical builds will
make
If doing development work on OpenBSM with gcc, the following invocation of
-configure may be preferred in order to generate full compiler warnings and
-force the compile to fail if a warning is found:
+configure is preferred in order to generate full compiler warnings and force
+the compile to fail if a warning is found:
CFLAGS="-Wall -Werror" ./configure
Modified: projects/calloutng/contrib/openbsm/NEWS
==============================================================================
--- projects/calloutng/contrib/openbsm/NEWS Sun Dec 16 21:13:40 2012 (r244314)
+++ projects/calloutng/contrib/openbsm/NEWS Sun Dec 16 22:06:28 2012 (r244315)
@@ -1,5 +1,11 @@
OpenBSM Version History
+OpenBSM 1.2 alpha 3
+
+- Various minor tweaks to the auditdistd build to make it fit the FreeBSD
+ build environment better.
+- AUE_WAIT6 merged from FreeBSD 9.
+
OpenBSM 1.2 alpha 2
- auditdistd, a distributed audit trail management daemon, has now been
@@ -489,4 +495,4 @@ OpenBSM 1.0 alpha 1
to support reloading of kernel event table.
- Allow comments in /etc/security configuration files.
-$P4: //depot/projects/trustedbsd/openbsm/NEWS#53 $
+$P4: //depot/projects/trustedbsd/openbsm/NEWS#55 $
Modified: projects/calloutng/contrib/openbsm/VERSION
==============================================================================
--- projects/calloutng/contrib/openbsm/VERSION Sun Dec 16 21:13:40 2012 (r244314)
+++ projects/calloutng/contrib/openbsm/VERSION Sun Dec 16 22:06:28 2012 (r244315)
@@ -1 +1 @@
-OPENBSM_1_2alpha2
+OPENBSM_1_2_alpha3
Modified: projects/calloutng/contrib/openbsm/bin/auditdistd/auditdistd.conf.5
==============================================================================
--- projects/calloutng/contrib/openbsm/bin/auditdistd/auditdistd.conf.5 Sun Dec 16 21:13:40 2012 (r244314)
+++ projects/calloutng/contrib/openbsm/bin/auditdistd/auditdistd.conf.5 Sun Dec 16 22:06:28 2012 (r244315)
@@ -355,7 +355,7 @@ receiver {
.Xr auditdistd 8 .
.Sh AUTHORS
The
-.Nm
-was written by
+.Nm auditdistd
+was developed by
.An Pawel Jakub Dawidek Aq pawel at dawidek.net
under sponsorship of the FreeBSD Foundation.
Modified: projects/calloutng/contrib/openbsm/config/config.h
==============================================================================
--- projects/calloutng/contrib/openbsm/config/config.h Sun Dec 16 21:13:40 2012 (r244314)
+++ projects/calloutng/contrib/openbsm/config/config.h Sun Dec 16 22:06:28 2012 (r244315)
@@ -235,7 +235,7 @@
#define PACKAGE_NAME "OpenBSM"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "OpenBSM 1.2alpha2"
+#define PACKAGE_STRING "OpenBSM 1.2-alpha3"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "openbsm"
@@ -244,7 +244,7 @@
#define PACKAGE_URL ""
/* Define to the version of this package. */
-#define PACKAGE_VERSION "1.2alpha2"
+#define PACKAGE_VERSION "1.2-alpha3"
/* Define as the return type of signal handlers (`int' or `void'). */
#define RETSIGTYPE void
@@ -280,7 +280,7 @@
#define USE_SYS_ENDIAN_H /**/
/* Version number of package */
-#define VERSION "1.2alpha2"
+#define VERSION "1.2-alpha3"
/* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a
`char[]'. */
Modified: projects/calloutng/contrib/openbsm/configure
==============================================================================
--- projects/calloutng/contrib/openbsm/configure Sun Dec 16 21:13:40 2012 (r244314)
+++ projects/calloutng/contrib/openbsm/configure Sun Dec 16 22:06:28 2012 (r244315)
@@ -1,7 +1,7 @@
#! /bin/sh
-# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#62 .
+# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#65 .
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for OpenBSM 1.2alpha2.
+# Generated by GNU Autoconf 2.69 for OpenBSM 1.2-alpha3.
#
# Report bugs to <trustedbsd-audit at TrustesdBSD.org>.
#
@@ -591,8 +591,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='OpenBSM'
PACKAGE_TARNAME='openbsm'
-PACKAGE_VERSION='1.2alpha2'
-PACKAGE_STRING='OpenBSM 1.2alpha2'
+PACKAGE_VERSION='1.2-alpha3'
+PACKAGE_STRING='OpenBSM 1.2-alpha3'
PACKAGE_BUGREPORT='trustedbsd-audit at TrustesdBSD.org'
PACKAGE_URL=''
@@ -1327,7 +1327,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures OpenBSM 1.2alpha2 to adapt to many kinds of systems.
+\`configure' configures OpenBSM 1.2-alpha3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1397,7 +1397,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of OpenBSM 1.2alpha2:";;
+ short | recursive ) echo "Configuration of OpenBSM 1.2-alpha3:";;
esac
cat <<\_ACEOF
@@ -1511,7 +1511,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-OpenBSM configure 1.2alpha2
+OpenBSM configure 1.2-alpha3
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1991,7 +1991,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by OpenBSM $as_me 1.2alpha2, which was
+It was created by OpenBSM $as_me 1.2-alpha3, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -11552,7 +11552,7 @@ fi
# Define the identity of the package.
PACKAGE=OpenBSM
- VERSION=1.2alpha2
+ VERSION=1.2-alpha3
cat >>confdefs.h <<_ACEOF
@@ -13559,12 +13559,14 @@ int
main ()
{
- bswap16(0);
- bswap32(0);
- bswap64(0);
+ int i;
+
+ i = bswap16(0);
+ i = bswap32(0);
+ i = bswap64(0);
be32enc(NULL, 0);
- htole64(0);
- le64toh(0);
+ i = htole64(0);
+ i = le64toh(0);
;
return 0;
@@ -14172,7 +14174,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by OpenBSM $as_me 1.2alpha2, which was
+This file was extended by OpenBSM $as_me 1.2-alpha3, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -14238,7 +14240,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-OpenBSM config.status 1.2alpha2
+OpenBSM config.status 1.2-alpha3
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
Modified: projects/calloutng/contrib/openbsm/configure.ac
==============================================================================
--- projects/calloutng/contrib/openbsm/configure.ac Sun Dec 16 21:13:40 2012 (r244314)
+++ projects/calloutng/contrib/openbsm/configure.ac Sun Dec 16 22:06:28 2012 (r244315)
@@ -2,8 +2,8 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
-AC_INIT([OpenBSM], [1.2alpha2], [trustedbsd-audit at TrustesdBSD.org],[openbsm])
-AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#63 $])
+AC_INIT([OpenBSM], [1.2-alpha3], [trustedbsd-audit at TrustesdBSD.org],[openbsm])
+AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#66 $])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c])
AC_CONFIG_AUX_DIR(config)
@@ -217,12 +217,14 @@ AC_TRY_LINK([
#endif
#include <stdlib.h>
], [
- bswap16(0);
- bswap32(0);
- bswap64(0);
+ int i;
+
+ i = bswap16(0);
+ i = bswap32(0);
+ i = bswap64(0);
be32enc(NULL, 0);
- htole64(0);
- le64toh(0);
+ i = htole64(0);
+ i = le64toh(0);
], [], [
AC_DEFINE(USE_COMPAT_ENDIAN_ENC_H,, Define if compat/endian_enc.h is required)
AC_MSG_RESULT([using compat/endian_enc.h])
Modified: projects/calloutng/contrib/openbsm/etc/audit_event
==============================================================================
--- projects/calloutng/contrib/openbsm/etc/audit_event Sun Dec 16 21:13:40 2012 (r244314)
+++ projects/calloutng/contrib/openbsm/etc/audit_event Sun Dec 16 22:06:28 2012 (r244315)
@@ -1,5 +1,5 @@
#
-# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_event#42 $
+# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_event#43 $
# $FreeBSD$
#
# The mapping between event identifiers and values is also hard-coded in
@@ -562,6 +562,7 @@
43198:AUE_PDKILL:pdkill(2):pc
43199:AUE_PDGETPID:pdgetpid(2):pc
43200:AUE_PDWAIT:pdwait(2):pc
+43201:AUE_WAIT6:wait6(2):pc
#
# Solaris userspace events.
#
Modified: projects/calloutng/contrib/openbsm/sys/bsm/audit_kevents.h
==============================================================================
--- projects/calloutng/contrib/openbsm/sys/bsm/audit_kevents.h Sun Dec 16 21:13:40 2012 (r244314)
+++ projects/calloutng/contrib/openbsm/sys/bsm/audit_kevents.h Sun Dec 16 22:06:28 2012 (r244315)
@@ -26,7 +26,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_kevents.h#9 $
+ * $P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_kevents.h#10 $
*/
#ifndef _BSM_AUDIT_KEVENTS_H_
@@ -601,6 +601,7 @@
#define AUE_PDKILL 43198 /* FreeBSD. */
#define AUE_PDGETPID 43199 /* FreeBSD. */
#define AUE_PDWAIT 43200 /* FreeBSD. */
+#define AUE_WAIT6 43201 /* FreeBSD. */
/*
* Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the
Modified: projects/calloutng/contrib/openbsm/sys/bsm/audit_record.h
==============================================================================
--- projects/calloutng/contrib/openbsm/sys/bsm/audit_record.h Sun Dec 16 21:13:40 2012 (r244314)
+++ projects/calloutng/contrib/openbsm/sys/bsm/audit_record.h Sun Dec 16 22:06:28 2012 (r244315)
@@ -26,7 +26,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_record.h#10 $
+ * $P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_record.h#12 $
*/
#ifndef _BSM_AUDIT_RECORD_H_
@@ -233,6 +233,7 @@ token_t *au_to_ipc_perm(struct ipc_perm
token_t *au_to_iport(uint16_t iport);
token_t *au_to_opaque(const char *data, uint16_t bytes);
token_t *au_to_path(const char *path);
+token_t *au_to_privset(char *privtypestr, char *privstr);
token_t *au_to_process(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid,
gid_t rgid, pid_t pid, au_asid_t sid, au_tid_t *tid);
token_t *au_to_process32(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid,
@@ -278,6 +279,7 @@ token_t *au_to_exec_env(char **envp);
token_t *au_to_text(const char *text);
token_t *au_to_kevent(struct kevent *kev);
token_t *au_to_trailer(int rec_size);
+token_t *au_to_upriv(char sorf, char *priv);
token_t *au_to_zonename(const char *zonename);
/*
Modified: projects/calloutng/gnu/usr.bin/binutils/as/Makefile
==============================================================================
--- projects/calloutng/gnu/usr.bin/binutils/as/Makefile Sun Dec 16 21:13:40 2012 (r244314)
+++ projects/calloutng/gnu/usr.bin/binutils/as/Makefile Sun Dec 16 22:06:28 2012 (r244315)
@@ -8,7 +8,7 @@
.PATH: ${SRCDIR}/gas ${SRCDIR}/gas/config
-.if ${TARGET_ARCH} == "powerpc64"
+.if ${TARGET} == "arm" || ${TARGET_ARCH} == "powerpc64"
NO_WERROR.clang=
.endif
Modified: projects/calloutng/lib/libdevstat/devstat.3
==============================================================================
--- projects/calloutng/lib/libdevstat/devstat.3 Sun Dec 16 21:13:40 2012 (r244314)
+++ projects/calloutng/lib/libdevstat/devstat.3 Sun Dec 16 22:06:28 2012 (r244315)
@@ -27,7 +27,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd March 18, 2003
+.Dd December 15, 2012
.Dt DEVSTAT 3
.Os
.Sh NAME
@@ -526,6 +526,35 @@ the acquisition of
.Fa previous
and
.Fa current .
+.It Dv DSM_TOTAL_DURATION
+type:
+.Vt "long double *"
+.Pp
+The total duration of transactions, in seconds, between the acquisition of
+.Fa previous
+and
+.Fa current .
+.It Dv DSM_TOTAL_DURATION_OTHER
+.It Dv DSM_TOTAL_DURATION_READ
+.It Dv DSM_TOTAL_DURATION_WRITE
+.It Dv DSM_TOTAL_DURATION_FREE
+type:
+.Vt "long double *"
+.Pp
+The total duration of transactions of the specified type between
+the acquisition of
+.Fa previous
+and
+.Fa current .
+.It Dv DSM_TOTAL_BUSY_TIME
+type:
+.Vt "long double *"
+.Pp
+Total time the device had one or more transactions outstanding
+between the acquisition of
+.Fa previous
+and
+.Fa current .
.It Dv DSM_TOTAL_BLOCKS
type:
.Vt "uint64_t *"
Modified: projects/calloutng/lib/libdevstat/devstat.c
==============================================================================
--- projects/calloutng/lib/libdevstat/devstat.c Sun Dec 16 21:13:40 2012 (r244314)
+++ projects/calloutng/lib/libdevstat/devstat.c Sun Dec 16 22:06:28 2012 (r244315)
@@ -133,6 +133,12 @@ struct devstat_args {
{ DSM_MS_PER_TRANSACTION_FREE, DEVSTAT_ARG_LD },
{ DSM_BUSY_PCT, DEVSTAT_ARG_LD },
{ DSM_QUEUE_LENGTH, DEVSTAT_ARG_UINT64 },
+ { DSM_TOTAL_DURATION, DEVSTAT_ARG_LD },
+ { DSM_TOTAL_DURATION_READ, DEVSTAT_ARG_LD },
+ { DSM_TOTAL_DURATION_WRITE, DEVSTAT_ARG_LD },
+ { DSM_TOTAL_DURATION_FREE, DEVSTAT_ARG_LD },
+ { DSM_TOTAL_DURATION_OTHER, DEVSTAT_ARG_LD },
+ { DSM_TOTAL_BUSY_TIME, DEVSTAT_ARG_LD },
};
static const char *namelist[] = {
@@ -1217,11 +1223,13 @@ devstat_compute_statistics(struct devsta
u_int64_t totaltransfers, totaltransfersread, totaltransferswrite;
u_int64_t totaltransfersother, totalblocks, totalblocksread;
u_int64_t totalblockswrite, totaltransfersfree, totalblocksfree;
+ long double totalduration, totaldurationread, totaldurationwrite;
+ long double totaldurationfree, totaldurationother;
va_list ap;
devstat_metric metric;
u_int64_t *destu64;
long double *destld;
- int retval, i;
+ int retval;
retval = 0;
@@ -1263,6 +1271,13 @@ devstat_compute_statistics(struct devsta
totalblocksfree /= 512;
}
+ totaldurationread = DELTA_T(duration[DEVSTAT_READ]);
+ totaldurationwrite = DELTA_T(duration[DEVSTAT_WRITE]);
+ totaldurationfree = DELTA_T(duration[DEVSTAT_FREE]);
+ totaldurationother = DELTA_T(duration[DEVSTAT_NO_DATA]);
+ totalduration = totaldurationread + totaldurationwrite +
+ totaldurationfree + totaldurationother;
+
va_start(ap, etime);
while ((metric = (devstat_metric)va_arg(ap, devstat_metric)) != 0) {
@@ -1484,9 +1499,7 @@ devstat_compute_statistics(struct devsta
*/
case DSM_MS_PER_TRANSACTION:
if (totaltransfers > 0) {
- *destld = 0;
- for (i = 0; i < DEVSTAT_N_TRANS_FLAGS; i++)
- *destld += DELTA_T(duration[i]);
+ *destld = totalduration;
*destld /= totaltransfers;
*destld *= 1000;
} else
@@ -1499,7 +1512,7 @@ devstat_compute_statistics(struct devsta
*/
case DSM_MS_PER_TRANSACTION_READ:
if (totaltransfersread > 0) {
- *destld = DELTA_T(duration[DEVSTAT_READ]);
+ *destld = totaldurationread;
*destld /= totaltransfersread;
*destld *= 1000;
} else
@@ -1507,7 +1520,7 @@ devstat_compute_statistics(struct devsta
break;
case DSM_MS_PER_TRANSACTION_WRITE:
if (totaltransferswrite > 0) {
- *destld = DELTA_T(duration[DEVSTAT_WRITE]);
+ *destld = totaldurationwrite;
*destld /= totaltransferswrite;
*destld *= 1000;
} else
@@ -1515,7 +1528,7 @@ devstat_compute_statistics(struct devsta
break;
case DSM_MS_PER_TRANSACTION_FREE:
if (totaltransfersfree > 0) {
- *destld = DELTA_T(duration[DEVSTAT_FREE]);
+ *destld = totaldurationfree;
*destld /= totaltransfersfree;
*destld *= 1000;
} else
@@ -1523,7 +1536,7 @@ devstat_compute_statistics(struct devsta
break;
case DSM_MS_PER_TRANSACTION_OTHER:
if (totaltransfersother > 0) {
- *destld = DELTA_T(duration[DEVSTAT_NO_DATA]);
+ *destld = totaldurationother;
*destld /= totaltransfersother;
*destld *= 1000;
} else
@@ -1541,6 +1554,24 @@ devstat_compute_statistics(struct devsta
case DSM_QUEUE_LENGTH:
*destu64 = current->start_count - current->end_count;
break;
+ case DSM_TOTAL_DURATION:
+ *destld = totalduration;
+ break;
+ case DSM_TOTAL_DURATION_READ:
+ *destld = totaldurationread;
+ break;
+ case DSM_TOTAL_DURATION_WRITE:
+ *destld = totaldurationwrite;
+ break;
+ case DSM_TOTAL_DURATION_FREE:
+ *destld = totaldurationfree;
+ break;
+ case DSM_TOTAL_DURATION_OTHER:
+ *destld = totaldurationother;
+ break;
+ case DSM_TOTAL_BUSY_TIME:
+ *destld = DELTA_T(busy_time);
+ break;
/*
* XXX: comment out the default block to see if any case's are missing.
*/
Modified: projects/calloutng/lib/libdevstat/devstat.h
==============================================================================
--- projects/calloutng/lib/libdevstat/devstat.h Sun Dec 16 21:13:40 2012 (r244314)
+++ projects/calloutng/lib/libdevstat/devstat.h Sun Dec 16 22:06:28 2012 (r244315)
@@ -97,6 +97,12 @@ typedef enum {
DSM_MS_PER_TRANSACTION_FREE,
DSM_BUSY_PCT,
DSM_QUEUE_LENGTH,
+ DSM_TOTAL_DURATION,
+ DSM_TOTAL_DURATION_READ,
+ DSM_TOTAL_DURATION_WRITE,
+ DSM_TOTAL_DURATION_FREE,
+ DSM_TOTAL_DURATION_OTHER,
+ DSM_TOTAL_BUSY_TIME,
DSM_MAX
} devstat_metric;
Modified: projects/calloutng/sbin/growfs/growfs.c
==============================================================================
--- projects/calloutng/sbin/growfs/growfs.c Sun Dec 16 21:13:40 2012 (r244314)
+++ projects/calloutng/sbin/growfs/growfs.c Sun Dec 16 22:06:28 2012 (r244315)
@@ -1611,17 +1611,20 @@ main(int argc, char **argv)
}
sblock.fs_ncg = howmany(sblock.fs_size, sblock.fs_fpg);
+ /*
+ * Allocate last cylinder group only if there is enough room
+ * for at least one data block.
+ */
if (sblock.fs_size % sblock.fs_fpg != 0 &&
- sblock.fs_size % sblock.fs_fpg < cgdmin(&sblock, sblock.fs_ncg)) {
- /*
- * The space in the new last cylinder group is too small,
- * so revert back.
- */
+ sblock.fs_size <= cgdmin(&sblock, sblock.fs_ncg - 1)) {
+ humanize_number(oldsizebuf, sizeof(oldsizebuf),
+ (sblock.fs_size % sblock.fs_fpg) * sblock.fs_fsize,
+ "B", HN_AUTOSCALE, HN_B | HN_NOSPACE | HN_DECIMAL);
+ warnx("no room to allocate last cylinder group; "
+ "leaving %s unused", oldsizebuf);
sblock.fs_ncg--;
if (sblock.fs_magic == FS_UFS1_MAGIC)
sblock.fs_old_ncyl = sblock.fs_ncg * sblock.fs_old_cpg;
- printf("Warning: %jd sector(s) cannot be allocated.\n",
- (intmax_t)fsbtodb(&sblock, sblock.fs_size % sblock.fs_fpg));
sblock.fs_size = sblock.fs_ncg * sblock.fs_fpg;
}
Modified: projects/calloutng/sys/arm/conf/VERSATILEPB
==============================================================================
--- projects/calloutng/sys/arm/conf/VERSATILEPB Sun Dec 16 21:13:40 2012 (r244314)
+++ projects/calloutng/sys/arm/conf/VERSATILEPB Sun Dec 16 22:06:28 2012 (r244315)
@@ -1,4 +1,4 @@
-# RPI-B -- Custom configuration for the Raspberry Pi
+# VERSATILEPB - Configuration for QEMU version of Versatile Platform Board
#
# For more information on this file, please read the handbook section on
# Kernel Configuration Files:
Modified: projects/calloutng/sys/boot/arm/uboot/Makefile
==============================================================================
--- projects/calloutng/sys/boot/arm/uboot/Makefile Sun Dec 16 21:13:40 2012 (r244314)
+++ projects/calloutng/sys/boot/arm/uboot/Makefile Sun Dec 16 22:06:28 2012 (r244315)
@@ -109,6 +109,9 @@ CFLAGS+= -I${.OBJDIR}/../../uboot/lib
# where to get libstand from
CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/
+# clang doesn't understand %D as a specifier to printf
+NO_WERROR.clang=
+
DPADD= ${LIBFICL} ${LIBUBOOT} ${LIBFDT} ${LIBSTAND}
LDADD= ${LIBFICL} ${LIBUBOOT} ${LIBFDT} -lstand
Modified: projects/calloutng/sys/boot/sparc64/boot1/boot1.c
==============================================================================
--- projects/calloutng/sys/boot/sparc64/boot1/boot1.c Sun Dec 16 21:13:40 2012 (r244314)
+++ projects/calloutng/sys/boot/sparc64/boot1/boot1.c Sun Dec 16 22:06:28 2012 (r244315)
@@ -340,11 +340,11 @@ main(int ac, char **av)
}
#ifdef ZFSBOOT
- printf(" \n>> FreeBSD/sparc64 ZFS boot block\n Boot path: %s\n",
+ printf(" \n>> FreeBSD/sparc64 ZFS boot block\n Boot path: %s\n",
bootpath);
#else
- printf(" \n>> FreeBSD/sparc64 boot block\n Boot path: %s\n"
- " Boot loader: %s\n", "", bootpath, path);
+ printf(" \n>> FreeBSD/sparc64 boot block\n Boot path: %s\n"
+ " Boot loader: %s\n", bootpath, path);
#endif
if (domount(bootpath) == -1)
Modified: projects/calloutng/sys/conf/files
==============================================================================
--- projects/calloutng/sys/conf/files Sun Dec 16 21:13:40 2012 (r244314)
+++ projects/calloutng/sys/conf/files Sun Dec 16 22:06:28 2012 (r244315)
@@ -3531,16 +3531,16 @@ rpc/rpcsec_gss/svc_rpcsec_gss.c optional
security/audit/audit.c optional audit
security/audit/audit_arg.c optional audit
security/audit/audit_bsm.c optional audit
-security/audit/audit_bsm_domain.c optional audit
-security/audit/audit_bsm_errno.c optional audit
-security/audit/audit_bsm_fcntl.c optional audit
security/audit/audit_bsm_klib.c optional audit
-security/audit/audit_bsm_socket_type.c optional audit
-security/audit/audit_bsm_token.c optional audit
security/audit/audit_pipe.c optional audit
security/audit/audit_syscalls.c standard
security/audit/audit_trigger.c optional audit
security/audit/audit_worker.c optional audit
+security/audit/bsm_domain.c optional audit
+security/audit/bsm_errno.c optional audit
+security/audit/bsm_fcntl.c optional audit
+security/audit/bsm_socket_type.c optional audit
+security/audit/bsm_token.c optional audit
security/mac/mac_atalk.c optional mac netatalk
security/mac/mac_audit.c optional mac audit
security/mac/mac_cred.c optional mac
Modified: projects/calloutng/sys/dev/wbwd/wbwd.c
==============================================================================
--- projects/calloutng/sys/dev/wbwd/wbwd.c Sun Dec 16 21:13:40 2012 (r244314)
+++ projects/calloutng/sys/dev/wbwd/wbwd.c Sun Dec 16 22:06:28 2012 (r244315)
@@ -208,9 +208,8 @@ sysctl_wb_debug(SYSCTL_HANDLER_ARGS)
sbuf_printf(&sb, "LDN8 (GPIO2, Watchdog): ");
sbuf_printf(&sb, "CRF5 0x%02x ", sc->reg_1);
sbuf_printf(&sb, "CRF6 0x%02x ", sc->reg_timeout);
- sbuf_printf(&sb, "CRF7 0x%02x ", sc->reg_2);
+ sbuf_printf(&sb, "CRF7 0x%02x", sc->reg_2);
- sbuf_trim(&sb);
error = sbuf_finish(&sb);
sbuf_delete(&sb);
return (error);
Modified: projects/calloutng/sys/kern/kern_sig.c
==============================================================================
--- projects/calloutng/sys/kern/kern_sig.c Sun Dec 16 21:13:40 2012 (r244314)
+++ projects/calloutng/sys/kern/kern_sig.c Sun Dec 16 22:06:28 2012 (r244315)
@@ -3210,22 +3210,8 @@ coredump(struct thread *td)
MPASS((p->p_flag & P_HADTHREADS) == 0 || p->p_singlethread == td);
_STOPEVENT(p, S_CORE, 0);
- name = expand_name(p->p_comm, td->td_ucred->cr_uid, p->p_pid, td,
- compress);
- if (name == NULL) {
+ if (!do_coredump || (!sugid_coredump && (p->p_flag & P_SUGID) != 0)) {
PROC_UNLOCK(p);
-#ifdef AUDIT
- audit_proc_coredump(td, NULL, EINVAL);
-#endif
- return (EINVAL);
- }
- if (((sugid_coredump == 0) && p->p_flag & P_SUGID) ||
- do_coredump == 0) {
- PROC_UNLOCK(p);
-#ifdef AUDIT
- audit_proc_coredump(td, name, EFAULT);
-#endif
- free(name, M_TEMP);
return (EFAULT);
}
@@ -3240,14 +3226,14 @@ coredump(struct thread *td)
limit = (off_t)lim_cur(p, RLIMIT_CORE);
if (limit == 0 || racct_get_available(p, RACCT_CORE) == 0) {
PROC_UNLOCK(p);
-#ifdef AUDIT
- audit_proc_coredump(td, name, EFBIG);
-#endif
- free(name, M_TEMP);
return (EFBIG);
}
PROC_UNLOCK(p);
+ name = expand_name(p->p_comm, cred->cr_uid, p->p_pid, td, compress);
+ if (name == NULL)
+ return (EINVAL);
+
restart:
NDINIT(&nd, LOOKUP, NOFOLLOW, UIO_SYSSPACE, name, td);
flags = O_CREAT | FWRITE | O_NOFOLLOW;
Modified: projects/calloutng/sys/netinet6/in6.c
==============================================================================
--- projects/calloutng/sys/netinet6/in6.c Sun Dec 16 21:13:40 2012 (r244314)
+++ projects/calloutng/sys/netinet6/in6.c Sun Dec 16 22:06:28 2012 (r244315)
@@ -1149,6 +1149,8 @@ in6_update_ifa(struct ifnet *ifp, struct
ifa_ref(&ia->ia_ifa); /* in6_ifaddrhead */
IN6_IFADDR_WLOCK();
TAILQ_INSERT_TAIL(&V_in6_ifaddrhead, ia, ia_link);
+ LIST_INSERT_HEAD(IN6ADDR_HASH(&ifra->ifra_addr.sin6_addr),
+ ia, ia6_hash);
IN6_IFADDR_WUNLOCK();
}
@@ -1534,6 +1536,7 @@ in6_unlink_ifa(struct in6_ifaddr *ia, st
*/
IN6_IFADDR_WLOCK();
TAILQ_REMOVE(&V_in6_ifaddrhead, ia, ia_link);
+ LIST_REMOVE(ia, ia6_hash);
IN6_IFADDR_WUNLOCK();
/*
@@ -2083,7 +2086,7 @@ in6_localip(struct in6_addr *in6)
struct in6_ifaddr *ia;
IN6_IFADDR_RLOCK();
- TAILQ_FOREACH(ia, &V_in6_ifaddrhead, ia_link) {
+ LIST_FOREACH(ia, IN6ADDR_HASH(in6), ia6_hash) {
if (IN6_ARE_ADDR_EQUAL(in6, &ia->ia_addr.sin6_addr)) {
IN6_IFADDR_RUNLOCK();
return (1);
@@ -2093,22 +2096,20 @@ in6_localip(struct in6_addr *in6)
return (0);
}
-
int
in6_is_addr_deprecated(struct sockaddr_in6 *sa6)
{
struct in6_ifaddr *ia;
IN6_IFADDR_RLOCK();
- TAILQ_FOREACH(ia, &V_in6_ifaddrhead, ia_link) {
- if (IN6_ARE_ADDR_EQUAL(&ia->ia_addr.sin6_addr,
- &sa6->sin6_addr) &&
- (ia->ia6_flags & IN6_IFF_DEPRECATED) != 0) {
- IN6_IFADDR_RUNLOCK();
- return (1); /* true */
+ LIST_FOREACH(ia, IN6ADDR_HASH(&sa6->sin6_addr), ia6_hash) {
+ if (IN6_ARE_ADDR_EQUAL(IA6_IN6(ia), &sa6->sin6_addr)) {
+ if (ia->ia6_flags & IN6_IFF_DEPRECATED) {
+ IN6_IFADDR_RUNLOCK();
+ return (1); /* true */
+ }
+ break;
}
-
- /* XXX: do we still have to go thru the rest of the list? */
}
IN6_IFADDR_RUNLOCK();
Modified: projects/calloutng/sys/netinet6/in6_var.h
==============================================================================
--- projects/calloutng/sys/netinet6/in6_var.h Sun Dec 16 21:13:40 2012 (r244314)
+++ projects/calloutng/sys/netinet6/in6_var.h Sun Dec 16 22:06:28 2012 (r244315)
@@ -67,6 +67,7 @@
#include <sys/tree.h>
#ifdef _KERNEL
+#include <sys/fnv_hash.h>
#include <sys/libkern.h>
#endif
@@ -131,10 +132,13 @@ struct in6_ifaddr {
/* multicast addresses joined from the kernel */
LIST_HEAD(, in6_multi_mship) ia6_memberships;
+ /* entry in bucket of inet6 addresses */
+ LIST_ENTRY(in6_ifaddr) ia6_hash;
};
/* List of in6_ifaddr's. */
TAILQ_HEAD(in6_ifaddrhead, in6_ifaddr);
+LIST_HEAD(in6_ifaddrlisthead, in6_ifaddr);
/* control structure to manage address selection policy */
struct in6_addrpolicy {
@@ -499,7 +503,27 @@ struct in6_rrenumreq {
#ifdef _KERNEL
VNET_DECLARE(struct in6_ifaddrhead, in6_ifaddrhead);
+VNET_DECLARE(struct in6_ifaddrlisthead *, in6_ifaddrhashtbl);
+VNET_DECLARE(u_long, in6_ifaddrhmask);
#define V_in6_ifaddrhead VNET(in6_ifaddrhead)
+#define V_in6_ifaddrhashtbl VNET(in6_ifaddrhashtbl)
+#define V_in6_ifaddrhmask VNET(in6_ifaddrhmask)
+
+#define IN6ADDR_NHASH_LOG2 8
+#define IN6ADDR_NHASH (1 << IN6ADDR_NHASH_LOG2)
+#define IN6ADDR_HASHVAL(x) (in6_addrhash(x))
+#define IN6ADDR_HASH(x) \
+ (&V_in6_ifaddrhashtbl[IN6ADDR_HASHVAL(x) & V_in6_ifaddrhmask])
+
+static __inline uint32_t
+in6_addrhash(struct in6_addr *in6)
+{
+ uint32_t x;
+
+ x = in6->s6_addr32[0] ^ in6->s6_addr32[1] ^ in6->s6_addr32[2] ^
+ in6->s6_addr32[3];
+ return (fnv_32_buf(&x, sizeof(x), FNV1_32_INIT));
+}
extern struct rwlock in6_ifaddr_lock;
#define IN6_IFADDR_LOCK_ASSERT( ) rw_assert(&in6_ifaddr_lock, RA_LOCKED)
Modified: projects/calloutng/sys/netinet6/ip6_input.c
==============================================================================
--- projects/calloutng/sys/netinet6/ip6_input.c Sun Dec 16 21:13:40 2012 (r244314)
+++ projects/calloutng/sys/netinet6/ip6_input.c Sun Dec 16 22:06:28 2012 (r244315)
@@ -126,6 +126,8 @@ extern struct domain inet6domain;
u_char ip6_protox[IPPROTO_MAX];
VNET_DEFINE(struct in6_ifaddrhead, in6_ifaddrhead);
+VNET_DEFINE(struct in6_ifaddrlisthead *, in6_ifaddrhashtbl);
+VNET_DEFINE(u_long, in6_ifaddrhmask);
static struct netisr_handler ip6_nh = {
.nh_name = "ip6",
@@ -170,6 +172,8 @@ ip6_init(void)
TUNABLE_INT_FETCH("net.inet6.ip6.no_radr", &V_ip6_no_radr);
TAILQ_INIT(&V_in6_ifaddrhead);
+ V_in6_ifaddrhashtbl = hashinit(IN6ADDR_NHASH, M_IFADDR,
+ &V_in6_ifaddrhmask);
/* Initialize packet filter hooks. */
V_inet6_pfil_hook.ph_type = PFIL_TYPE_AF;
@@ -297,6 +301,7 @@ void
ip6_destroy()
{
+ hashdestroy(V_in6_ifaddrhashtbl, M_IFADDR, V_in6_ifaddrhmask);
nd6_destroy();
callout_drain(&V_in6_tmpaddrtimer_ch);
}
Modified: projects/calloutng/sys/netpfil/pf/pf_ioctl.c
==============================================================================
--- projects/calloutng/sys/netpfil/pf/pf_ioctl.c Sun Dec 16 21:13:40 2012 (r244314)
+++ projects/calloutng/sys/netpfil/pf/pf_ioctl.c Sun Dec 16 22:06:28 2012 (r244315)
@@ -963,8 +963,6 @@ pfioctl(struct cdev *dev, u_long cmd, ca
{
int error = 0;
- CURVNET_SET(TD_TO_VNET(td));
-
/* XXX keep in sync with switch() below */
if (securelevel_gt(td->td_ucred, 2))
switch (cmd) {
@@ -1068,6 +1066,8 @@ pfioctl(struct cdev *dev, u_long cmd, ca
return (EACCES);
}
+ CURVNET_SET(TD_TO_VNET(td));
+
switch (cmd) {
case DIOCSTART:
PF_RULES_WLOCK();
Copied: projects/calloutng/sys/security/audit/bsm_domain.c (from r244314, head/sys/security/audit/bsm_domain.c)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/calloutng/sys/security/audit/bsm_domain.c Sun Dec 16 22:06:28 2012 (r244315, copy of r244314, head/sys/security/audit/bsm_domain.c)
@@ -0,0 +1,495 @@
+/*-
+ * Copyright (c) 2008 Apple Inc.
+ * 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. Neither the name of Apple Inc. ("Apple") 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 APPLE AND ITS 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 APPLE OR ITS 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.
+ *
+ * P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_domain.c#3
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/param.h>
+#include <sys/socket.h>
+
+#include <security/audit/audit.h>
+
+#include <bsm/audit_domain.h>
+#include <bsm/audit_record.h>
+
+struct bsm_domain {
+ u_short bd_bsm_domain;
+ int bd_local_domain;
+};
+
+#define PF_NO_LOCAL_MAPPING -600
+
+static const struct bsm_domain bsm_domains[] = {
+ { BSM_PF_UNSPEC, PF_UNSPEC },
+ { BSM_PF_LOCAL, PF_LOCAL },
+ { BSM_PF_INET, PF_INET },
+ { BSM_PF_IMPLINK,
+#ifdef PF_IMPLINK
+ PF_IMPLINK
+#else
+ PF_NO_LOCAL_MAPPING
+#endif
+ },
+ { BSM_PF_PUP,
+#ifdef PF_PUP
+ PF_PUP
+#else
+ PF_NO_LOCAL_MAPPING
+#endif
+ },
+ { BSM_PF_CHAOS,
+#ifdef PF_CHAOS
+ PF_CHAOS
+#else
+ PF_NO_LOCAL_MAPPING
+#endif
+ },
+ { BSM_PF_NS,
+#ifdef PF_NS
+ PF_NS
+#else
+ PF_NO_LOCAL_MAPPING
+#endif
+ },
+ { BSM_PF_NBS,
+#ifdef PF_NBS
+ PF_NBS
+#else
+ PF_NO_LOCAL_MAPPING
+#endif
+ },
+ { BSM_PF_ECMA,
+#ifdef PF_ECMA
+ PF_ECMA
+#else
+ PF_NO_LOCAL_MAPPING
+#endif
+ },
+ { BSM_PF_DATAKIT,
+#ifdef PF_DATAKIT
+ PF_DATAKIT
+#else
+ PF_NO_LOCAL_MAPPING
+#endif
+ },
+ { BSM_PF_CCITT,
+#ifdef PF_CCITT
+ PF_CCITT
+#else
+ PF_NO_LOCAL_MAPPING
+#endif
+ },
+ { BSM_PF_SNA, PF_SNA },
+ { BSM_PF_DECnet, PF_DECnet },
+ { BSM_PF_DLI,
+#ifdef PF_DLI
+ PF_DLI
+#else
+ PF_NO_LOCAL_MAPPING
+#endif
+ },
+ { BSM_PF_LAT,
+#ifdef PF_LAT
+ PF_LAT
+#else
+ PF_NO_LOCAL_MAPPING
+#endif
+ },
+ { BSM_PF_HYLINK,
+#ifdef PF_HYLINK
+ PF_HYLINK
+#else
+ PF_NO_LOCAL_MAPPING
+#endif
+ },
+ { BSM_PF_APPLETALK, PF_APPLETALK },
+ { BSM_PF_NIT,
+#ifdef PF_NIT
+ PF_NIT
+#else
+ PF_NO_LOCAL_MAPPING
+#endif
+ },
+ { BSM_PF_802,
+#ifdef PF_802
+ PF_802
+#else
+ PF_NO_LOCAL_MAPPING
+#endif
+ },
+ { BSM_PF_OSI,
+#ifdef PF_OSI
+ PF_OSI
+#else
+ PF_NO_LOCAL_MAPPING
+#endif
+ },
+ { BSM_PF_X25,
+#ifdef PF_X25
+ PF_X25
+#else
+ PF_NO_LOCAL_MAPPING
+#endif
+ },
+ { BSM_PF_OSINET,
+#ifdef PF_OSINET
+ PF_OSINET
+#else
+ PF_NO_LOCAL_MAPPING
+#endif
+ },
+ { BSM_PF_GOSIP,
+#ifdef PF_GOSIP
+ PF_GOSIP
+#else
+ PF_NO_LOCAL_MAPPING
+#endif
+ },
+ { BSM_PF_IPX, PF_IPX },
+ { BSM_PF_ROUTE, PF_ROUTE },
+ { BSM_PF_LINK,
+#ifdef PF_LINK
+ PF_LINK
+#else
+ PF_NO_LOCAL_MAPPING
+#endif
+ },
+ { BSM_PF_INET6, PF_INET6 },
+ { BSM_PF_KEY, PF_KEY },
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-projects
mailing list