CVS commit: src/sys/sys
Module Name:src
Committed By: uebayasi
Date: Wed Nov 19 08:10:02 UTC 2014
Modified Files:
src/sys/sys: queue.h
Log Message:
Indent.
To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 src/sys/sys/queue.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/sys/queue.h
diff -u src/sys/sys/queue.h:1.67 src/sys/sys/queue.h:1.68
--- src/sys/sys/queue.h:1.67 Sat May 17 21:22:56 2014
+++ src/sys/sys/queue.h Wed Nov 19 08:10:01 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: queue.h,v 1.67 2014/05/17 21:22:56 rmind Exp $ */
+/* $NetBSD: queue.h,v 1.68 2014/11/19 08:10:01 uebayasi Exp $ */
/*
* Copyright (c) 1991, 1993
@@ -541,15 +541,15 @@ struct {\
QUEUEDEBUG_TAILQ_POSTREMOVE((elm), field); \
} while (/*CONSTCOND*/0)
-#define TAILQ_REPLACE(head, elm, elm2, field) do { \
+#define TAILQ_REPLACE(head, elm, elm2, field) do { \
if (((elm2)-field.tqe_next = (elm)-field.tqe_next) != \
TAILQ_END(head)) \
-(elm2)-field.tqe_next-field.tqe_prev =\
-(elm2)-field.tqe_next;\
-else\
-(head)-tqh_last = (elm2)-field.tqe_next; \
-(elm2)-field.tqe_prev = (elm)-field.tqe_prev; \
-*(elm2)-field.tqe_prev = (elm2); \
+(elm2)-field.tqe_next-field.tqe_prev = \
+(elm2)-field.tqe_next;\
+else\
+(head)-tqh_last = (elm2)-field.tqe_next; \
+(elm2)-field.tqe_prev = (elm)-field.tqe_prev; \
+*(elm2)-field.tqe_prev = (elm2);\
QUEUEDEBUG_TAILQ_POSTREMOVE((elm), field); \
} while (/*CONSTCOND*/0)
CVS commit: src/sys/arch/arm/arm32
Module Name:src Committed By: martin Date: Wed Nov 19 10:01:50 UTC 2014 Modified Files: src/sys/arch/arm/arm32: arm32_machdep.c Log Message: Add a machdep.unaligned_sigbus sysctl (just like alpha does), but on arm it is readonly (depends on architecture version). To generate a diff of this commit: cvs rdiff -u -r1.107 -r1.108 src/sys/arch/arm/arm32/arm32_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/arm32/arm32_machdep.c diff -u src/sys/arch/arm/arm32/arm32_machdep.c:1.107 src/sys/arch/arm/arm32/arm32_machdep.c:1.108 --- src/sys/arch/arm/arm32/arm32_machdep.c:1.107 Wed Oct 29 14:14:14 2014 +++ src/sys/arch/arm/arm32/arm32_machdep.c Wed Nov 19 10:01:50 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: arm32_machdep.c,v 1.107 2014/10/29 14:14:14 skrll Exp $ */ +/* $NetBSD: arm32_machdep.c,v 1.108 2014/11/19 10:01:50 martin Exp $ */ /* * Copyright (c) 1994-1998 Mark Brinicombe. @@ -42,7 +42,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: arm32_machdep.c,v 1.107 2014/10/29 14:14:14 skrll Exp $); +__KERNEL_RCSID(0, $NetBSD: arm32_machdep.c,v 1.108 2014/11/19 10:01:50 martin Exp $); #include opt_modular.h #include opt_md.h @@ -108,6 +108,7 @@ int cpu_simd_present; int cpu_simdex_present; int cpu_umull_present; int cpu_synchprim_present; +int cpu_unaligned_sigbus; const char *cpu_arch = ; int cpu_instruction_set_attributes[6]; @@ -504,6 +505,13 @@ SYSCTL_SETUP(sysctl_machdep_setup, sysc CTLTYPE_INT, printfataltraps, NULL, NULL, 0, cpu_printfataltraps, 0, CTL_MACHDEP, CTL_CREATE, CTL_EOL); + cpu_unaligned_sigbus = !CPU_IS_ARMV6_P() !CPU_IS_ARMV7_P(); + sysctl_createv(clog, 0, NULL, NULL, + CTLFLAG_PERMANENT|CTLFLAG_READONLY, + CTLTYPE_INT, unaligned_sigbus, + SYSCTL_DESCR(Do SIGBUS for fixed unaligned accesses), + NULL, 0, cpu_unaligned_sigbus, 0, + CTL_MACHDEP, CTL_CREATE, CTL_EOL); /*
CVS commit: src/tests/lib/libc/gen
Module Name:src
Committed By: martin
Date: Wed Nov 19 10:03:51 UTC 2014
Modified Files:
src/tests/lib/libc/gen: t_siginfo.c
Log Message:
Use machdep.unaligned_sigbus to skip the unaligned access test on arm
as well.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/tests/lib/libc/gen/t_siginfo.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libc/gen/t_siginfo.c
diff -u src/tests/lib/libc/gen/t_siginfo.c:1.24 src/tests/lib/libc/gen/t_siginfo.c:1.25
--- src/tests/lib/libc/gen/t_siginfo.c:1.24 Tue Nov 4 00:20:19 2014
+++ src/tests/lib/libc/gen/t_siginfo.c Wed Nov 19 10:03:51 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: t_siginfo.c,v 1.24 2014/11/04 00:20:19 justin Exp $ */
+/* $NetBSD: t_siginfo.c,v 1.25 2014/11/19 10:03:51 martin Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -448,13 +448,13 @@ ATF_TC_BODY(sigbus_adraln, tc)
{
struct sigaction sa;
-#if defined(__alpha__)
+#if defined(__alpha__) || defined(__arm__)
int rv, val;
size_t len = sizeof(val);
rv = sysctlbyname(machdep.unaligned_sigbus, val, len, NULL, 0);
ATF_REQUIRE(rv == 0);
if (val == 0)
- atf_tc_skip(SIGBUS signal not enabled for unaligned accesses);
+ atf_tc_skip(No SIGBUS signal for unaligned accesses);
#endif
sa.sa_flags = SA_SIGINFO;
CVS commit: src/tests/lib/libc/gen
Module Name:src
Committed By: martin
Date: Wed Nov 19 10:09:45 UTC 2014
Modified Files:
src/tests/lib/libc/gen: t_siginfo.c
Log Message:
Skip the SIGFPE test on arm when the FPU does not provide exception handling.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/tests/lib/libc/gen/t_siginfo.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libc/gen/t_siginfo.c
diff -u src/tests/lib/libc/gen/t_siginfo.c:1.25 src/tests/lib/libc/gen/t_siginfo.c:1.26
--- src/tests/lib/libc/gen/t_siginfo.c:1.25 Wed Nov 19 10:03:51 2014
+++ src/tests/lib/libc/gen/t_siginfo.c Wed Nov 19 10:09:45 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: t_siginfo.c,v 1.25 2014/11/19 10:03:51 martin Exp $ */
+/* $NetBSD: t_siginfo.c,v 1.26 2014/11/19 10:09:45 martin Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -310,6 +310,13 @@ ATF_TC_BODY(sigfpe_flt, tc)
atf_tc_skip(Test does not run correctly under QEMU);
#if defined(__powerpc__)
atf_tc_skip(Test not valid on powerpc);
+#elif defined(__arm__) !__SOFTFP__ /*
+ * Some NEON fpus do not implement IEEE exception handling,
+ * skip these tests if running on them and compiled for
+ * hard float.
+ */
+ if (0 == fpsetmask(fpsetmask(FP_X_INV)))
+ atf_tc_skip(FPU does not implement exception handling);
#endif
if (sigsetjmp(sigfpe_flt_env, 0) == 0) {
sa.sa_flags = SA_SIGINFO;
CVS commit: src/external/gpl2/lvm2/lib/libdevmapper
Module Name:src Committed By: wiz Date: Wed Nov 19 10:37:29 UTC 2014 Modified Files: src/external/gpl2/lvm2/lib/libdevmapper: libdm-netbsd.h Log Message: Close comment. From Henning Petersen in PR 49403. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl2/lvm2/lib/libdevmapper/libdm-netbsd.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/gpl2/lvm2/lib/libdevmapper/libdm-netbsd.h diff -u src/external/gpl2/lvm2/lib/libdevmapper/libdm-netbsd.h:1.3 src/external/gpl2/lvm2/lib/libdevmapper/libdm-netbsd.h:1.4 --- src/external/gpl2/lvm2/lib/libdevmapper/libdm-netbsd.h:1.3 Tue Feb 8 10:45:40 2011 +++ src/external/gpl2/lvm2/lib/libdevmapper/libdm-netbsd.h Wed Nov 19 10:37:29 2014 @@ -1,4 +1,4 @@ -/*$NetBSD: libdm-netbsd.h,v 1.3 2011/02/08 10:45:40 rmind Exp $ +/*$NetBSD: libdm-netbsd.h,v 1.4 2014/11/19 10:37:29 wiz Exp $ */ /* * Copyright (c) 2008 The NetBSD Foundation, Inc.
CVS commit: src/sys/kern
Module Name:src Committed By: christos Date: Wed Nov 19 14:25:01 UTC 2014 Modified Files: src/sys/kern: subr_cprng.c Log Message: Change debug to diagnostic so that more people see the lossage with bad random streams, so we can debug it. To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/sys/kern/subr_cprng.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/kern/subr_cprng.c diff -u src/sys/kern/subr_cprng.c:1.25 src/sys/kern/subr_cprng.c:1.26 --- src/sys/kern/subr_cprng.c:1.25 Thu Aug 14 12:28:30 2014 +++ src/sys/kern/subr_cprng.c Wed Nov 19 09:25:00 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: subr_cprng.c,v 1.25 2014/08/14 16:28:30 riastradh Exp $ */ +/* $NetBSD: subr_cprng.c,v 1.26 2014/11/19 14:25:00 christos Exp $ */ /*- * Copyright (c) 2011-2013 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: subr_cprng.c,v 1.25 2014/08/14 16:28:30 riastradh Exp $); +__KERNEL_RCSID(0, $NetBSD: subr_cprng.c,v 1.26 2014/11/19 14:25:00 christos Exp $); #include sys/param.h #include sys/types.h @@ -50,7 +50,7 @@ __KERNEL_RCSID(0, $NetBSD: subr_cprng.c #include sys/sysctl.h #include sys/rnd.h #include sys/rndsink.h -#if DEBUG +#if DIAGNOSTIC #include sys/rngtest.h #endif @@ -67,7 +67,7 @@ static void cprng_strong_generate(struct static void cprng_strong_reseed(struct cprng_strong *); static void cprng_strong_reseed_from(struct cprng_strong *, const void *, size_t, bool); -#if DEBUG +#if DIAGNOSTIC static void cprng_strong_rngtest(struct cprng_strong *); #endif @@ -447,12 +447,12 @@ cprng_strong_reseed_from(struct cprng_st /* XXX Fix nist_ctr_drbg API so this can't happen. */ panic(cprng %s: NIST CTR_DRBG reseed failed, cprng-cs_name); -#if DEBUG +#if DIAGNOSTIC cprng_strong_rngtest(cprng); #endif } -#if DEBUG +#if DIAGNOSTIC /* * Generate some output and apply a statistical RNG test to it. */
CVS commit: src/sys/ufs/ufs
Module Name:src
Committed By: manu
Date: Wed Nov 19 16:26:47 UTC 2014
Modified Files:
src/sys/ufs/ufs: ufs_extattr.c
Log Message:
Fix uninitialized mutex usage
We use extended attribute mount mutex before testing if it had been
initialized, and as reported by Christos, this caused panic with
LOCKDEBUG. Fix it by testing before using.
To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/sys/ufs/ufs/ufs_extattr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/ufs/ufs/ufs_extattr.c
diff -u src/sys/ufs/ufs/ufs_extattr.c:1.45 src/sys/ufs/ufs/ufs_extattr.c:1.46
--- src/sys/ufs/ufs/ufs_extattr.c:1.45 Sat Nov 15 05:03:55 2014
+++ src/sys/ufs/ufs/ufs_extattr.c Wed Nov 19 16:26:47 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ufs_extattr.c,v 1.45 2014/11/15 05:03:55 manu Exp $ */
+/* $NetBSD: ufs_extattr.c,v 1.46 2014/11/19 16:26:47 manu Exp $ */
/*-
* Copyright (c) 1999-2002 Robert N. M. Watson
@@ -48,7 +48,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ufs_extattr.c,v 1.45 2014/11/15 05:03:55 manu Exp $);
+__KERNEL_RCSID(0, $NetBSD: ufs_extattr.c,v 1.46 2014/11/19 16:26:47 manu Exp $);
#ifdef _KERNEL_OPT
#include opt_ffs.h
@@ -1103,6 +1103,9 @@ vop_getextattr {
struct ufsmount *ump = VFSTOUFS(mp);
int error;
+ if (!(ump-um_extattr.uepm_flags UFS_EXTATTR_UEPM_STARTED))
+ return (EOPNOTSUPP);
+
ufs_extattr_uepm_lock(ump);
error = ufs_extattr_get(ap-a_vp, ap-a_attrnamespace, ap-a_name,
@@ -1129,9 +1132,6 @@ ufs_extattr_get(struct vnode *vp, int at
size_t len, old_len;
int error = 0;
- if (!(ump-um_extattr.uepm_flags UFS_EXTATTR_UEPM_STARTED))
- return (EOPNOTSUPP);
-
if (strlen(name) == 0)
return (EINVAL);
@@ -1221,6 +1221,9 @@ vop_listextattr {
struct ufsmount *ump = VFSTOUFS(mp);
int error;
+ if (!(ump-um_extattr.uepm_flags UFS_EXTATTR_UEPM_STARTED))
+ return (EOPNOTSUPP);
+
ufs_extattr_uepm_lock(ump);
error = ufs_extattr_list(ap-a_vp, ap-a_attrnamespace,
@@ -1247,9 +1250,6 @@ ufs_extattr_list(struct vnode *vp, int a
size_t listsize = 0;
int error = 0;
- if (!(ump-um_extattr.uepm_flags UFS_EXTATTR_UEPM_STARTED))
- return (EOPNOTSUPP);
-
/*
* XXX: We can move this inside the loop and iterate on individual
* attributes.
@@ -1348,6 +1348,9 @@ vop_deleteextattr {
struct ufsmount *ump = VFSTOUFS(mp);
int error;
+ if (!(ump-um_extattr.uepm_flags UFS_EXTATTR_UEPM_STARTED))
+ return (EOPNOTSUPP);
+
ufs_extattr_uepm_lock(ump);
error = ufs_extattr_rm(ap-a_vp, ap-a_attrnamespace, ap-a_name,
@@ -1377,6 +1380,9 @@ vop_setextattr {
struct ufsmount *ump = VFSTOUFS(mp);
int error;
+ if (!(ump-um_extattr.uepm_flags UFS_EXTATTR_UEPM_STARTED))
+ return (EOPNOTSUPP);
+
ufs_extattr_uepm_lock(ump);
/*
@@ -1415,8 +1421,7 @@ ufs_extattr_set(struct vnode *vp, int at
if (vp-v_mount-mnt_flag MNT_RDONLY)
return (EROFS);
- if (!(ump-um_extattr.uepm_flags UFS_EXTATTR_UEPM_STARTED))
- return (EOPNOTSUPP);
+
if (!ufs_extattr_valid_attrname(attrnamespace, name))
return (EINVAL);
@@ -1535,8 +1540,7 @@ ufs_extattr_rm(struct vnode *vp, int att
if (vp-v_mount-mnt_flag MNT_RDONLY)
return (EROFS);
- if (!(ump-um_extattr.uepm_flags UFS_EXTATTR_UEPM_STARTED))
- return (EOPNOTSUPP);
+
if (!ufs_extattr_valid_attrname(attrnamespace, name))
return (EINVAL);
@@ -1609,12 +1613,10 @@ ufs_extattr_vnode_inactive(struct vnode
if (!(ump-um_extattr.uepm_flags UFS_EXTATTR_UEPM_INITIALIZED))
return;
- ufs_extattr_uepm_lock(ump);
-
- if (!(ump-um_extattr.uepm_flags UFS_EXTATTR_UEPM_STARTED)) {
- ufs_extattr_uepm_unlock(ump);
+ if (!(ump-um_extattr.uepm_flags UFS_EXTATTR_UEPM_STARTED))
return;
- }
+
+ ufs_extattr_uepm_lock(ump);
LIST_FOREACH(uele, ump-um_extattr.uepm_list, uele_entries)
ufs_extattr_rm(vp, uele-uele_attrnamespace,
CVS import: src/external/bsd/libpcap/dist
Module Name:src Committed By: christos Date: Wed Nov 19 18:04:57 UTC 2014 Update of /cvsroot/src/external/bsd/libpcap/dist In directory ivanova.netbsd.org:/tmp/cvs-serv3863 Log Message: import newest libpcap Status: Vendor Tag: TCPDUMP Release Tags: libpcap-1_6_2 C src/external/bsd/libpcap/dist/grammar.y U src/external/bsd/libpcap/dist/fad-glifc.c U src/external/bsd/libpcap/dist/llc.h U src/external/bsd/libpcap/dist/pcap_setnonblock.3pcap U src/external/bsd/libpcap/dist/sunatmpos.h C src/external/bsd/libpcap/dist/sf-pcap-ng.c U src/external/bsd/libpcap/dist/pcap-dbus.c U src/external/bsd/libpcap/dist/pcap_findalldevs.3pcap U src/external/bsd/libpcap/dist/Makefile-devel-adds U src/external/bsd/libpcap/dist/aclocal.m4 U src/external/bsd/libpcap/dist/pcap_list_tstamp_types.3pcap.in U src/external/bsd/libpcap/dist/pcap-bt-linux.h U src/external/bsd/libpcap/dist/README.sita U src/external/bsd/libpcap/dist/savefile.c U src/external/bsd/libpcap/dist/CHANGES U src/external/bsd/libpcap/dist/pcap_dump_ftell.3pcap U src/external/bsd/libpcap/dist/pcap-nit.c U src/external/bsd/libpcap/dist/pcap_can_set_rfmon.3pcap U src/external/bsd/libpcap/dist/README.tru64 U src/external/bsd/libpcap/dist/org.tcpdump.chmod_bpf.plist U src/external/bsd/libpcap/dist/pcap-netfilter-linux.c U src/external/bsd/libpcap/dist/pcap-tstamp.manmisc.in U src/external/bsd/libpcap/dist/README.hpux U src/external/bsd/libpcap/dist/pcap-linux.c U src/external/bsd/libpcap/dist/pcap-can-linux.c C src/external/bsd/libpcap/dist/pcap-bpf.c U src/external/bsd/libpcap/dist/pcap_datalink_name_to_val.3pcap C src/external/bsd/libpcap/dist/pcap_open_offline.3pcap.in U src/external/bsd/libpcap/dist/pcap_list_datalinks.3pcap.in U src/external/bsd/libpcap/dist/pcap-snoop.c U src/external/bsd/libpcap/dist/pcap_major_version.3pcap U src/external/bsd/libpcap/dist/pcap-filter.manmisc.in U src/external/bsd/libpcap/dist/pcap_activate.3pcap U src/external/bsd/libpcap/dist/pcap_fileno.3pcap U src/external/bsd/libpcap/dist/pcap-dbus.h U src/external/bsd/libpcap/dist/pcap_set_tstamp_type.3pcap.in U src/external/bsd/libpcap/dist/pcap-can-linux.h U src/external/bsd/libpcap/dist/pcap-snf.h U src/external/bsd/libpcap/dist/pcap_open_dead.3pcap.in U src/external/bsd/libpcap/dist/pcap_set_rfmon.3pcap U src/external/bsd/libpcap/dist/pcap-septel.h U src/external/bsd/libpcap/dist/README U src/external/bsd/libpcap/dist/pcap_set_immediate_mode.3pcap U src/external/bsd/libpcap/dist/pcap-config.in U src/external/bsd/libpcap/dist/pcap-libdlpi.c U src/external/bsd/libpcap/dist/pcap-win32.c U src/external/bsd/libpcap/dist/pcap_set_buffer_size.3pcap C src/external/bsd/libpcap/dist/pcap_dump_open.3pcap.in U src/external/bsd/libpcap/dist/pcap_lookupnet.3pcap U src/external/bsd/libpcap/dist/pcap-bpf.h U src/external/bsd/libpcap/dist/pcap_lookupdev.3pcap U src/external/bsd/libpcap/dist/pcap_dump_close.3pcap U src/external/bsd/libpcap/dist/pcap-sita.html U src/external/bsd/libpcap/dist/sf-pcap-ng.h U src/external/bsd/libpcap/dist/pcap_lib_version.3pcap U src/external/bsd/libpcap/dist/pcap-canusb-linux.h U src/external/bsd/libpcap/dist/Makefile.in U src/external/bsd/libpcap/dist/README.macosx U src/external/bsd/libpcap/dist/fad-win32.c U src/external/bsd/libpcap/dist/README.dag U src/external/bsd/libpcap/dist/runlex.sh U src/external/bsd/libpcap/dist/pcap_dump_file.3pcap U src/external/bsd/libpcap/dist/pcap_tstamp_type_val_to_name.3pcap U src/external/bsd/libpcap/dist/pcap_setdirection.3pcap U src/external/bsd/libpcap/dist/pcap_tstamp_type_name_to_val.3pcap U src/external/bsd/libpcap/dist/nlpid.h U src/external/bsd/libpcap/dist/pcap_inject.3pcap U src/external/bsd/libpcap/dist/pcap-enet.c U src/external/bsd/libpcap/dist/README.linux C src/external/bsd/libpcap/dist/pcap.h C src/external/bsd/libpcap/dist/pcap-config.1 N src/external/bsd/libpcap/dist/pcap-bt-monitor-linux.h U src/external/bsd/libpcap/dist/INSTALL.txt U src/external/bsd/libpcap/dist/pcap-dag.h U src/external/bsd/libpcap/dist/pcap_set_datalink.3pcap U src/external/bsd/libpcap/dist/config.h.in U src/external/bsd/libpcap/dist/pcap_stats.3pcap U src/external/bsd/libpcap/dist/bpf_dump.c C src/external/bsd/libpcap/dist/pcap.3pcap.in U src/external/bsd/libpcap/dist/pcap_snapshot.3pcap U src/external/bsd/libpcap/dist/pcap_geterr.3pcap U src/external/bsd/libpcap/dist/pcap-savefile.manfile.in U src/external/bsd/libpcap/dist/pcap_breakloop.3pcap C src/external/bsd/libpcap/dist/scanner.l U src/external/bsd/libpcap/dist/pcap_datalink.3pcap.in U src/external/bsd/libpcap/dist/pcap_strerror.3pcap U src/external/bsd/libpcap/dist/pcap_set_timeout.3pcap C src/external/bsd/libpcap/dist/pcap-namedb.h U src/external/bsd/libpcap/dist/install-sh U src/external/bsd/libpcap/dist/LICENSE U src/external/bsd/libpcap/dist/TODO U src/external/bsd/libpcap/dist/README.septel N src/external/bsd/libpcap/dist/pcap-bt-monitor-linux.c U src/external/bsd/libpcap/dist/pcap-common.h U src/external/bsd/libpcap/dist/pcap-dos.c U
CVS commit: src/external/bsd/libpcap
Module Name:src Committed By: christos Date: Wed Nov 19 19:33:31 UTC 2014 Modified Files: src/external/bsd/libpcap: libpcap2netbsd src/external/bsd/libpcap/dist: arcnet.h atmuni31.h bpf_dump.c bpf_image.c dlpisubs.c dlpisubs.h etherent.c ethertype.h fad-getad.c fad-gifc.c fad-glifc.c fad-null.c fad-sita.c fad-win32.c gencode.c gencode.h grammar.y ieee80211.h inet.c llc.h nametoaddr.c nlpid.h optimize.c pcap-bpf.c pcap-bpf.h pcap-bt-linux.c pcap-bt-linux.h pcap-bt-monitor-linux.c pcap-bt-monitor-linux.h pcap-can-linux.c pcap-can-linux.h pcap-canusb-linux.c pcap-canusb-linux.h pcap-common.c pcap-common.h pcap-config.1 pcap-dag.c pcap-dag.h pcap-dbus.c pcap-dbus.h pcap-dlpi.c pcap-dos.c pcap-dos.h pcap-enet.c pcap-int.h pcap-libdlpi.c pcap-linux.c pcap-namedb.h pcap-netfilter-linux.c pcap-netfilter-linux.h pcap-nit.c pcap-null.c pcap-pf.c pcap-septel.c pcap-septel.h pcap-sita.c pcap-sita.h pcap-snf.c pcap-snf.h pcap-snit.c pcap-snoop.c pcap-stdinc.h pcap-usb-linux.c pcap-usb-linux.h pcap-win32.c pcap.3pcap.in pcap.c pcap.h pcap_activate.3pcap pcap_breakloop.3pcap pcap_can_set_rfmon.3pcap pcap_close.3pcap pcap_create.3pcap pcap_datalink_name_to_val.3pcap pcap_datalink_val_to_name.3pcap pcap_dump.3pcap pcap_dump_close.3pcap pcap_dump_file.3pcap pcap_dump_flush.3pcap pcap_dump_ftell.3pcap pcap_dump_open.3pcap.in pcap_file.3pcap pcap_fileno.3pcap pcap_findalldevs.3pcap pcap_freecode.3pcap pcap_get_selectable_fd.3pcap pcap_geterr.3pcap pcap_inject.3pcap pcap_is_swapped.3pcap pcap_lib_version.3pcap pcap_lookupdev.3pcap pcap_lookupnet.3pcap pcap_loop.3pcap pcap_major_version.3pcap pcap_next_ex.3pcap pcap_offline_filter.3pcap pcap_open_live.3pcap pcap_open_offline.3pcap.in pcap_set_buffer_size.3pcap pcap_set_datalink.3pcap pcap_set_immediate_mode.3pcap pcap_set_promisc.3pcap pcap_set_rfmon.3pcap pcap_set_snaplen.3pcap pcap_set_timeout.3pcap pcap_setdirection.3pcap pcap_setfilter.3pcap pcap_setnonblock.3pcap pcap_snapshot.3pcap pcap_stats.3pcap pcap_statustostr.3pcap pcap_strerror.3pcap pcap_tstamp_type_name_to_val.3pcap pcap_tstamp_type_val_to_name.3pcap ppp.h savefile.c scanner.l sf-pcap-ng.c sf-pcap-ng.h sf-pcap.c sf-pcap.h sunatmpos.h src/external/bsd/libpcap/dist/bpf/net: bpf_filter.c src/external/bsd/libpcap/dist/lbl: os-aix4.h os-hpux11.h os-osf4.h os-osf5.h os-solaris2.h os-sunos4.h os-ultrix4.h src/external/bsd/libpcap/dist/pcap: bluetooth.h bpf.h ipnet.h namedb.h nflog.h pcap.h sll.h usb.h vlan.h src/external/bsd/libpcap/dist/tests: capturetest.c filtertest.c findalldevstest.c opentest.c reactivatetest.c selpolltest.c valgrindtest.c src/external/bsd/libpcap/include: config.h src/external/bsd/libpcap/lib: Makefile version.c version.h Removed Files: src/external/bsd/libpcap/dist/tests: nonblocktest.c Log Message: merge changes To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/bsd/libpcap/libpcap2netbsd cvs rdiff -u -r1.1.1.4 -r1.2 src/external/bsd/libpcap/dist/arcnet.h \ src/external/bsd/libpcap/dist/atmuni31.h \ src/external/bsd/libpcap/dist/bpf_dump.c \ src/external/bsd/libpcap/dist/etherent.c \ src/external/bsd/libpcap/dist/ethertype.h \ src/external/bsd/libpcap/dist/fad-sita.c \ src/external/bsd/libpcap/dist/inet.c src/external/bsd/libpcap/dist/llc.h \ src/external/bsd/libpcap/dist/nlpid.h \ src/external/bsd/libpcap/dist/pcap-bpf.h \ src/external/bsd/libpcap/dist/pcap-can-linux.c \ src/external/bsd/libpcap/dist/pcap-can-linux.h \ src/external/bsd/libpcap/dist/pcap-dos.h \ src/external/bsd/libpcap/dist/pcap-enet.c \ src/external/bsd/libpcap/dist/pcap-sita.c \ src/external/bsd/libpcap/dist/pcap-snf.c \ src/external/bsd/libpcap/dist/pcap-snf.h \ src/external/bsd/libpcap/dist/pcap-stdinc.h \ src/external/bsd/libpcap/dist/pcap_activate.3pcap \ src/external/bsd/libpcap/dist/pcap_can_set_rfmon.3pcap \ src/external/bsd/libpcap/dist/pcap_close.3pcap \ src/external/bsd/libpcap/dist/pcap_create.3pcap \ src/external/bsd/libpcap/dist/pcap_datalink_name_to_val.3pcap \ src/external/bsd/libpcap/dist/pcap_datalink_val_to_name.3pcap \ src/external/bsd/libpcap/dist/pcap_dump.3pcap \ src/external/bsd/libpcap/dist/pcap_dump_close.3pcap \ src/external/bsd/libpcap/dist/pcap_dump_file.3pcap \ src/external/bsd/libpcap/dist/pcap_dump_flush.3pcap \ src/external/bsd/libpcap/dist/pcap_dump_ftell.3pcap \ src/external/bsd/libpcap/dist/pcap_file.3pcap \
CVS commit: src/sys/net
Module Name:src
Committed By: christos
Date: Wed Nov 19 19:34:43 UTC 2014
Modified Files:
src/sys/net: bpfjit.c
Log Message:
Add BPF_MOD/BPF_XOR (untested, needs work)
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/net/bpfjit.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/bpfjit.c
diff -u src/sys/net/bpfjit.c:1.32 src/sys/net/bpfjit.c:1.33
--- src/sys/net/bpfjit.c:1.32 Sat Jul 26 07:23:46 2014
+++ src/sys/net/bpfjit.c Wed Nov 19 14:34:43 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: bpfjit.c,v 1.32 2014/07/26 11:23:46 alnsn Exp $ */
+/* $NetBSD: bpfjit.c,v 1.33 2014/11/19 19:34:43 christos Exp $ */
/*-
* Copyright (c) 2011-2014 Alexander Nasonov.
@@ -31,9 +31,9 @@
#include sys/cdefs.h
#ifdef _KERNEL
-__KERNEL_RCSID(0, $NetBSD: bpfjit.c,v 1.32 2014/07/26 11:23:46 alnsn Exp $);
+__KERNEL_RCSID(0, $NetBSD: bpfjit.c,v 1.33 2014/11/19 19:34:43 christos Exp $);
#else
-__RCSID($NetBSD: bpfjit.c,v 1.32 2014/07/26 11:23:46 alnsn Exp $);
+__RCSID($NetBSD: bpfjit.c,v 1.33 2014/11/19 19:34:43 christos Exp $);
#endif
#include sys/types.h
@@ -76,6 +76,11 @@ __RCSID($NetBSD: bpfjit.c,v 1.32 2014/0
#endif
/*
+ * XXX: Until we support SLJIT_UMOD properly
+ */
+#undef BPFJIT_USE_UDIV
+
+/*
* Arguments of generated bpfjit_func_t.
* The first argument is reassigned upon entry
* to a more frequently used buf argument.
@@ -1113,14 +1118,21 @@ divide(sljit_uw x, sljit_uw y)
return (uint32_t)x / (uint32_t)y;
}
+
+static sljit_uw
+modulus(sljit_uw x, sljit_uw y)
+{
+
+ return (uint32_t)x % (uint32_t)y;
+}
#endif
/*
- * Emit code for A = A / div.
+ * Emit code for A = A / div or A = A % div
* divt,divw are either SLJIT_IMM,pc-k or BJ_XREG,0.
*/
static int
-emit_division(struct sljit_compiler *compiler, int divt, sljit_sw divw)
+emit_moddiv(bool div, struct sljit_compiler *compiler, int divt, sljit_sw divw)
{
int status;
@@ -1161,7 +1173,8 @@ emit_division(struct sljit_compiler *com
#else
status = sljit_emit_ijump(compiler,
SLJIT_CALL2,
- SLJIT_IMM, SLJIT_FUNC_OFFSET(divide));
+ SLJIT_IMM, div ? SLJIT_FUNC_OFFSET(divide) :
+ SLJIT_FUNC_OFFSET(modulus));
#if BJ_AREG != SLJIT_RETURN_REG
status = sljit_emit_op1(compiler,
@@ -1560,6 +1573,7 @@ bpf_alu_to_sljit_op(const struct bpf_ins
case BPF_SUB: return SLJIT_SUB;
case BPF_MUL: return SLJIT_MUL|SLJIT_INT_OP;
case BPF_OR: return SLJIT_OR;
+ case BPF_XOR: return SLJIT_XOR;
case BPF_AND: return SLJIT_AND;
case BPF_LSH: return SLJIT_SHL;
case BPF_RSH: return SLJIT_LSHR|SLJIT_INT_OP;
@@ -1648,7 +1662,7 @@ generate_insn_code(struct sljit_compiler
size_t i;
int status;
int branching, negate;
- unsigned int rval, mode, src;
+ unsigned int rval, mode, src, op;
uint32_t jt, jf;
bool unconditional_ret;
@@ -1884,7 +1898,8 @@ generate_insn_code(struct sljit_compiler
continue;
}
- if (BPF_OP(pc-code) != BPF_DIV) {
+ op = BPF_OP(pc-code);
+ if (op != BPF_DIV op != BPF_MOD) {
status = sljit_emit_op2(compiler,
bpf_alu_to_sljit_op(pc),
BJ_AREG, 0,
@@ -1896,7 +1911,7 @@ generate_insn_code(struct sljit_compiler
continue;
}
- /* BPF_DIV */
+ /* BPF_DIV/BPF_MOD */
src = BPF_SRC(pc-code);
if (src != BPF_X src != BPF_K)
@@ -1923,13 +1938,15 @@ generate_insn_code(struct sljit_compiler
}
if (src == BPF_X) {
-status = emit_division(compiler, BJ_XREG, 0);
+status = emit_moddiv(op == BPF_DIV,
+compiler, BJ_XREG, 0);
if (status != SLJIT_SUCCESS)
goto fail;
} else if (pc-k != 0) {
-if (pc-k (pc-k - 1)) {
-status = emit_division(compiler,
-SLJIT_IMM, (uint32_t)pc-k);
+/* XXX: We can do better here for MOD */
+if ((pc-k (pc-k - 1)) || op == BPF_MOD) {
+status = emit_moddiv(op == BPF_DIV,
+ compiler, SLJIT_IMM, (uint32_t)pc-k);
} else {
status = emit_pow2_division(compiler,
(uint32_t)pc-k);
@@ -1941,7 +1958,8 @@ generate_insn_code(struct sljit_compiler
continue;
case BPF_JMP:
- if (BPF_OP(pc-code) == BPF_JA) {
+ op = BPF_OP(pc-code);
+ if (op == BPF_JA) {
jt = jf = pc-k;
} else {
jt = pc-jt;
@@ -1953,7 +1971,7 @@ generate_insn_code(struct sljit_compiler
jtf = insn_dat[i].u.jdata.jtf;
if (branching) {
-if (BPF_OP(pc-code) != BPF_JSET) {
+if (op != BPF_JSET) {
jump = sljit_emit_cmp(compiler,
bpf_jmp_to_sljit_cond(pc, negate),
BJ_AREG, 0,
CVS commit: src/sys/net
Module Name:src
Committed By: christos
Date: Wed Nov 19 19:35:21 UTC 2014
Modified Files:
src/sys/net: bpf.h bpf_filter.c dlt.h
Log Message:
Add BPF_MOD/BPF_XOR, sync DLT entries and document unused bpf instructions.
From libpcap-1.6.2
To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.66 src/sys/net/bpf.h
cvs rdiff -u -r1.67 -r1.68 src/sys/net/bpf_filter.c
cvs rdiff -u -r1.14 -r1.15 src/sys/net/dlt.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/bpf.h
diff -u src/sys/net/bpf.h:1.65 src/sys/net/bpf.h:1.66
--- src/sys/net/bpf.h:1.65 Tue Jun 24 18:19:36 2014
+++ src/sys/net/bpf.h Wed Nov 19 14:35:21 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: bpf.h,v 1.65 2014/06/24 22:19:36 rmind Exp $ */
+/* $NetBSD: bpf.h,v 1.66 2014/11/19 19:35:21 christos Exp $ */
/*
* Copyright (c) 1990, 1991, 1993
@@ -222,6 +222,7 @@ struct bpf_hdr32 {
#define BPF_W 0x00
#define BPF_H 0x08
#define BPF_B 0x10
+/*0x18 reserved; used by BSD/OS */
#define BPF_MODE(code) ((code) 0xe0)
#define BPF_IMM 0x00
#define BPF_ABS 0x20
@@ -229,6 +230,8 @@ struct bpf_hdr32 {
#define BPF_MEM 0x60
#define BPF_LEN 0x80
#define BPF_MSH 0xa0
+/*0xc0 reserved; used by BSD/OS */
+/*0xe0 reserved; used by BSD/OS */
/* alu/jmp fields */
#define BPF_OP(code) ((code) 0xf0)
@@ -241,11 +244,29 @@ struct bpf_hdr32 {
#define BPF_LSH 0x60
#define BPF_RSH 0x70
#define BPF_NEG 0x80
+#define BPF_MOD 0x90
+#define BPF_XOR 0xa0
+/*0xb0 reserved */
+/*0xc0 reserved */
+/*0xd0 reserved */
+/*0xe0 reserved */
+/*0xf0 reserved */
#define BPF_JA 0x00
#define BPF_JEQ 0x10
#define BPF_JGT 0x20
#define BPF_JGE 0x30
#define BPF_JSET 0x40
+/*0x50 reserved; used by BSD/OS */
+/*0x60 reserved */
+/*0x70 reserved */
+/*0x80 reserved */
+/*0x90 reserved */
+/*0xa0 reserved */
+/*0xb0 reserved */
+/*0xc0 reserved */
+/*0xd0 reserved */
+/*0xe0 reserved */
+/*0xf0 reserved */
#define BPF_SRC(code) ((code) 0x08)
#define BPF_K 0x00
#define BPF_X 0x08
@@ -253,13 +274,41 @@ struct bpf_hdr32 {
/* ret - BPF_K and BPF_X also apply */
#define BPF_RVAL(code) ((code) 0x18)
#define BPF_A 0x10
+/*0x18 reserved */
/* misc */
#define BPF_MISCOP(code) ((code) 0xf8)
#define BPF_TAX 0x00
+/*0x10 reserved */
+/*0x18 reserved */
#define BPF_COP 0x20
-#define BPF_COPX 0x40
+/*0x28 reserved */
+/*0x30 reserved */
+/*0x38 reserved */
+#define BPF_COPX 0x40 /* XXX: also used by BSD/OS */
+/*0x48 reserved */
+/*0x50 reserved */
+/*0x58 reserved */
+/*0x60 reserved */
+/*0x68 reserved */
+/*0x70 reserved */
+/*0x78 reserved */
#define BPF_TXA 0x80
+/*0x88 reserved */
+/*0x90 reserved */
+/*0x98 reserved */
+/*0xa0 reserved */
+/*0xa8 reserved */
+/*0xb0 reserved */
+/*0xb8 reserved */
+/*0xc0 reserved; used by BSD/OS */
+/*0xc8 reserved */
+/*0xd0 reserved */
+/*0xd8 reserved */
+/*0xe0 reserved */
+/*0xe8 reserved */
+/*0xf0 reserved */
+/*0xf8 reserved */
/*
* The instruction data structure.
Index: src/sys/net/bpf_filter.c
diff -u src/sys/net/bpf_filter.c:1.67 src/sys/net/bpf_filter.c:1.68
--- src/sys/net/bpf_filter.c:1.67 Mon Jul 7 15:56:03 2014
+++ src/sys/net/bpf_filter.c Wed Nov 19 14:35:21 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: bpf_filter.c,v 1.67 2014/07/07 19:56:03 alnsn Exp $ */
+/* $NetBSD: bpf_filter.c,v 1.68 2014/11/19 19:35:21 christos Exp $ */
/*-
* Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
@@ -37,7 +37,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: bpf_filter.c,v 1.67 2014/07/07 19:56:03 alnsn Exp $);
+__KERNEL_RCSID(0, $NetBSD: bpf_filter.c,v 1.68 2014/11/19 19:35:21 christos Exp $);
#if 0
#if !(defined(lint) || defined(KERNEL))
@@ -481,6 +481,12 @@ bpf_filter(const struct bpf_insn *pc, co
A /= X;
continue;
+ case BPF_ALU|BPF_MOD|BPF_X:
+ if (X == 0)
+return 0;
+ A %= X;
+ continue;
+
case BPF_ALU|BPF_AND|BPF_X:
A = X;
continue;
@@ -489,6 +495,10 @@ bpf_filter(const struct bpf_insn *pc, co
A |= X;
continue;
+ case BPF_ALU|BPF_XOR|BPF_X:
+ A ^= X;
+ continue;
+
case BPF_ALU|BPF_LSH|BPF_X:
A = X;
continue;
@@ -513,6 +523,10 @@ bpf_filter(const struct bpf_insn *pc, co
A /= pc-k;
continue;
+ case BPF_ALU|BPF_MOD|BPF_K:
+ A %= pc-k;
+ continue;
+
case BPF_ALU|BPF_AND|BPF_K:
A = pc-k;
continue;
@@ -521,6 +535,10 @@ bpf_filter(const struct bpf_insn *pc, co
A |= pc-k;
continue;
+ case BPF_ALU|BPF_XOR|BPF_K:
+ A ^= pc-k;
+ continue;
+
case BPF_ALU|BPF_LSH|BPF_K:
A = pc-k;
continue;
@@ -675,12 +693,14 @@ bpf_validate(const struct bpf_insn *f, i
case BPF_SUB:
case BPF_MUL:
case BPF_OR:
+ case BPF_XOR:
case BPF_AND:
case BPF_LSH:
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: christos Date: Wed Nov 19 19:38:40 UTC 2014 Modified Files: src/distrib/sets/lists/comp: mi Log Message: new man pages for libpcap. To generate a diff of this commit: cvs rdiff -u -r1.1923 -r1.1924 src/distrib/sets/lists/comp/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1923 src/distrib/sets/lists/comp/mi:1.1924 --- src/distrib/sets/lists/comp/mi:1.1923 Tue Nov 18 20:08:42 2014 +++ src/distrib/sets/lists/comp/mi Wed Nov 19 14:38:40 2014 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1923 2014/11/19 01:08:42 pooka Exp $ +# $NetBSD: mi,v 1.1924 2014/11/19 19:38:40 christos Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -8224,6 +8224,7 @@ ./usr/share/man/cat3/pcap_freealldevs.0 comp-obsolete obsolete ./usr/share/man/cat3/pcap_freecode.0 comp-c-catman .cat ./usr/share/man/cat3/pcap_get_selectable_fd.0 comp-c-catman .cat +./usr/share/man/cat3/pcap_get_tstamp_precision.0 comp-c-catman .cat ./usr/share/man/cat3/pcap_geterr.0 comp-c-catman .cat ./usr/share/man/cat3/pcap_inject.0 comp-c-catman .cat ./usr/share/man/cat3/pcap_is_swapped.0 comp-c-catman .cat @@ -8241,11 +8242,13 @@ ./usr/share/man/cat3/pcap_open_offline.0 comp-c-catman .cat ./usr/share/man/cat3/pcap_set_buffer_size.0 comp-c-catman .cat ./usr/share/man/cat3/pcap_set_datalink.0 comp-c-catman .cat +./usr/share/man/cat3/pcap_set_immediate_mode.0 comp-c-catman .cat ./usr/share/man/cat3/pcap_set_promisc.0 comp-c-catman .cat ./usr/share/man/cat3/pcap_set_rfmon.0 comp-c-catman .cat ./usr/share/man/cat3/pcap_set_snaplen.0 comp-c-catman .cat ./usr/share/man/cat3/pcap_set_timeout.0 comp-c-catman .cat -./usr/share/man/cat3/pcap_set_tstamp_type.0 comp-c-catman .cat +./usr/share/man/cat3/pcap_set_tstamp_precision.0 comp-c-catman .cat +./usr/share/man/cat3/pcap_set_tstamp_type.0 comp-c-catman .cat ./usr/share/man/cat3/pcap_setdirection.0 comp-c-catman .cat ./usr/share/man/cat3/pcap_setfilter.0 comp-c-catman .cat ./usr/share/man/cat3/pcap_setnonblock.0 comp-c-catman .cat @@ -15042,6 +15045,7 @@ ./usr/share/man/html3/pcap_freealldevs.html comp-obsolete obsolete ./usr/share/man/html3/pcap_freecode.html comp-c-htmlman html ./usr/share/man/html3/pcap_get_selectable_fd.html comp-c-htmlman html +./usr/share/man/html3/pcap_get_tstamp_precision.html comp-c-htmlman html ./usr/share/man/html3/pcap_geterr.html comp-c-htmlman html ./usr/share/man/html3/pcap_inject.html comp-c-htmlman html ./usr/share/man/html3/pcap_is_swapped.html comp-c-htmlman html @@ -15059,10 +15063,12 @@ ./usr/share/man/html3/pcap_open_offline.html comp-c-htmlman html ./usr/share/man/html3/pcap_set_buffer_size.html comp-c-htmlman html ./usr/share/man/html3/pcap_set_datalink.html comp-c-htmlman html +./usr/share/man/html3/pcap_set_immediate_mode.html comp-c-htmlman html ./usr/share/man/html3/pcap_set_promisc.html comp-c-htmlman html ./usr/share/man/html3/pcap_set_rfmon.html comp-c-htmlman html ./usr/share/man/html3/pcap_set_snaplen.html comp-c-htmlman html ./usr/share/man/html3/pcap_set_timeout.html comp-c-htmlman html +./usr/share/man/html3/pcap_set_tstamp_precision.html comp-c-htmlman html ./usr/share/man/html3/pcap_set_tstamp_type.html comp-c-htmlman html ./usr/share/man/html3/pcap_setdirection.html comp-c-htmlman html ./usr/share/man/html3/pcap_setfilter.html comp-c-htmlman html @@ -21852,6 +21858,7 @@ ./usr/share/man/man3/pcap_freealldevs.3 comp-obsolete obsolete ./usr/share/man/man3/pcap_freecode.3 comp-c-man .man ./usr/share/man/man3/pcap_get_selectable_fd.3 comp-c-man .man +./usr/share/man/man3/pcap_get_tstamp_precision.3 comp-c-man .man ./usr/share/man/man3/pcap_geterr.3 comp-c-man .man ./usr/share/man/man3/pcap_inject.3 comp-c-man .man ./usr/share/man/man3/pcap_is_swapped.3 comp-c-man .man @@ -21869,11 +21876,13 @@ ./usr/share/man/man3/pcap_open_offline.3 comp-c-man .man ./usr/share/man/man3/pcap_set_buffer_size.3 comp-c-man .man ./usr/share/man/man3/pcap_set_datalink.3 comp-c-man .man +./usr/share/man/man3/pcap_set_immediate_mode.3 comp-c-man .man ./usr/share/man/man3/pcap_set_promisc.3 comp-c-man .man ./usr/share/man/man3/pcap_set_rfmon.3 comp-c-man .man ./usr/share/man/man3/pcap_set_snaplen.3 comp-c-man .man ./usr/share/man/man3/pcap_set_timeout.3 comp-c-man .man -./usr/share/man/man3/pcap_set_tstamp_type.3 comp-c-man .man +./usr/share/man/man3/pcap_set_tstamp_precision.3 comp-c-man .man +./usr/share/man/man3/pcap_set_tstamp_type.3 comp-c-man .man ./usr/share/man/man3/pcap_setdirection.3 comp-c-man .man ./usr/share/man/man3/pcap_setfilter.3 comp-c-man .man ./usr/share/man/man3/pcap_setnonblock.3 comp-c-man .man
CVS commit: src/tests/lib/libbpfjit
Module Name:src
Committed By: alnsn
Date: Wed Nov 19 22:56:35 UTC 2014
Modified Files:
src/tests/lib/libbpfjit: t_bpfjit.c
Log Message:
Add BPF_XOR tests.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/tests/lib/libbpfjit/t_bpfjit.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libbpfjit/t_bpfjit.c
diff -u src/tests/lib/libbpfjit/t_bpfjit.c:1.6 src/tests/lib/libbpfjit/t_bpfjit.c:1.7
--- src/tests/lib/libbpfjit/t_bpfjit.c:1.6 Tue Jul 8 21:07:52 2014
+++ src/tests/lib/libbpfjit/t_bpfjit.c Wed Nov 19 22:56:35 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: t_bpfjit.c,v 1.6 2014/07/08 21:07:52 alnsn Exp $ */
+/* $NetBSD: t_bpfjit.c,v 1.7 2014/11/19 22:56:35 alnsn Exp $ */
/*-
* Copyright (c) 2011-2012, 2014 Alexander Nasonov.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: t_bpfjit.c,v 1.6 2014/07/08 21:07:52 alnsn Exp $);
+__RCSID($NetBSD: t_bpfjit.c,v 1.7 2014/11/19 22:56:35 alnsn Exp $);
#include atf-c.h
#include stdint.h
@@ -459,6 +459,36 @@ ATF_TC_BODY(libbpfjit_alu_or_k, tc)
bpfjit_free_code(code);
}
+ATF_TC(libbpfjit_alu_xor_k);
+ATF_TC_HEAD(libbpfjit_alu_xor_k, tc)
+{
+ atf_tc_set_md_var(tc, descr,
+ Test JIT compilation of BPF_ALU+BPF_XOR+BPF_K);
+}
+
+ATF_TC_BODY(libbpfjit_alu_xor_k, tc)
+{
+ static struct bpf_insn insns[] = {
+ BPF_STMT(BPF_LD+BPF_IMM, 0xdead0f0f),
+ BPF_STMT(BPF_ALU+BPF_XOR+BPF_K, 0xb1e0),
+ BPF_STMT(BPF_RET+BPF_A, 0)
+ };
+
+ bpfjit_func_t code;
+ uint8_t pkt[1]; /* the program doesn't read any data */
+
+ size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+ ATF_CHECK(bpf_validate(insns, insn_count));
+
+ code = bpfjit_generate_code(NULL, insns, insn_count);
+ ATF_REQUIRE(code != NULL);
+
+ ATF_CHECK(jitcall(code, pkt, 1, 1) == 0xdeadbeef);
+
+ bpfjit_free_code(code);
+}
+
ATF_TC(libbpfjit_alu_lsh_k);
ATF_TC_HEAD(libbpfjit_alu_lsh_k, tc)
{
@@ -1045,6 +1075,37 @@ ATF_TC_BODY(libbpfjit_alu_or_x, tc)
bpfjit_free_code(code);
}
+ATF_TC(libbpfjit_alu_xor_x);
+ATF_TC_HEAD(libbpfjit_alu_xor_x, tc)
+{
+ atf_tc_set_md_var(tc, descr,
+ Test JIT compilation of BPF_ALU+BPF_XOR+BPF_X);
+}
+
+ATF_TC_BODY(libbpfjit_alu_xor_x, tc)
+{
+ static struct bpf_insn insns[] = {
+ BPF_STMT(BPF_LD+BPF_IMM, 0xdead0f0f),
+ BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 0xb1e0),
+ BPF_STMT(BPF_ALU+BPF_XOR+BPF_X, 0),
+ BPF_STMT(BPF_RET+BPF_A, 0)
+ };
+
+ bpfjit_func_t code;
+ uint8_t pkt[1]; /* the program doesn't read any data */
+
+ size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+ ATF_CHECK(bpf_validate(insns, insn_count));
+
+ code = bpfjit_generate_code(NULL, insns, insn_count);
+ ATF_REQUIRE(code != NULL);
+
+ ATF_CHECK(jitcall(code, pkt, 1, 1) == 0xdeadbeef);
+
+ bpfjit_free_code(code);
+}
+
ATF_TC(libbpfjit_alu_lsh_x);
ATF_TC_HEAD(libbpfjit_alu_lsh_x, tc)
{
@@ -3896,6 +3957,7 @@ ATF_TP_ADD_TCS(tp)
ATF_TP_ADD_TC(tp, libbpfjit_alu_div8000_k);
ATF_TP_ADD_TC(tp, libbpfjit_alu_and_k);
ATF_TP_ADD_TC(tp, libbpfjit_alu_or_k);
+ ATF_TP_ADD_TC(tp, libbpfjit_alu_xor_k);
ATF_TP_ADD_TC(tp, libbpfjit_alu_lsh_k);
ATF_TP_ADD_TC(tp, libbpfjit_alu_lsh0_k);
ATF_TP_ADD_TC(tp, libbpfjit_alu_rsh_k);
@@ -3914,6 +3976,7 @@ ATF_TP_ADD_TCS(tp)
ATF_TP_ADD_TC(tp, libbpfjit_alu_div8000_x);
ATF_TP_ADD_TC(tp, libbpfjit_alu_and_x);
ATF_TP_ADD_TC(tp, libbpfjit_alu_or_x);
+ ATF_TP_ADD_TC(tp, libbpfjit_alu_xor_x);
ATF_TP_ADD_TC(tp, libbpfjit_alu_lsh_x);
ATF_TP_ADD_TC(tp, libbpfjit_alu_lsh0_x);
ATF_TP_ADD_TC(tp, libbpfjit_alu_rsh_x);
CVS commit: src/tests/net/bpfjit
Module Name:src
Committed By: alnsn
Date: Wed Nov 19 23:00:12 UTC 2014
Modified Files:
src/tests/net/bpfjit: t_bpfjit.c
Log Message:
Add BPF_XOR tests.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/net/bpfjit/t_bpfjit.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/net/bpfjit/t_bpfjit.c
diff -u src/tests/net/bpfjit/t_bpfjit.c:1.2 src/tests/net/bpfjit/t_bpfjit.c:1.3
--- src/tests/net/bpfjit/t_bpfjit.c:1.2 Tue Jul 8 21:44:26 2014
+++ src/tests/net/bpfjit/t_bpfjit.c Wed Nov 19 23:00:12 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: t_bpfjit.c,v 1.2 2014/07/08 21:44:26 alnsn Exp $ */
+/* $NetBSD: t_bpfjit.c,v 1.3 2014/11/19 23:00:12 alnsn Exp $ */
/*-
* Copyright (c) 2011-2012, 2014 Alexander Nasonov.
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: t_bpfjit.c,v 1.2 2014/07/08 21:44:26 alnsn Exp $);
+__RCSID($NetBSD: t_bpfjit.c,v 1.3 2014/11/19 23:00:12 alnsn Exp $);
#include sys/param.h
#include sys/mbuf.h
@@ -414,6 +414,31 @@ ATF_TC_BODY(bpfjit_alu_or_k, tc)
ATF_CHECK(exec_prog(insns, insn_count, pkt, 1) == 0xdeadbeef);
}
+ATF_TC(bpfjit_alu_xor_k);
+ATF_TC_HEAD(bpfjit_alu_xor_k, tc)
+{
+ atf_tc_set_md_var(tc, descr,
+ Test JIT compilation of BPF_ALU+BPF_XOR+BPF_K);
+}
+
+ATF_TC_BODY(bpfjit_alu_xor_k, tc)
+{
+ static struct bpf_insn insns[] = {
+ BPF_STMT(BPF_LD+BPF_IMM, 0xdead0f0f),
+ BPF_STMT(BPF_ALU+BPF_XOR+BPF_K, 0xb1e0),
+ BPF_STMT(BPF_RET+BPF_A, 0)
+ };
+
+ uint8_t pkt[1]; /* the program doesn't read any data */
+
+ size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+ RZ(rump_init());
+
+ ATF_CHECK(prog_validate(insns, insn_count));
+ ATF_CHECK(exec_prog(insns, insn_count, pkt, 1) == 0xdeadbeef);
+}
+
ATF_TC(bpfjit_alu_lsh_k);
ATF_TC_HEAD(bpfjit_alu_lsh_k, tc)
{
@@ -920,6 +945,32 @@ ATF_TC_BODY(bpfjit_alu_or_x, tc)
ATF_CHECK(exec_prog(insns, insn_count, pkt, 1) == 0xdeadbeef);
}
+ATF_TC(bpfjit_alu_xor_x);
+ATF_TC_HEAD(bpfjit_alu_xor_x, tc)
+{
+ atf_tc_set_md_var(tc, descr,
+ Test JIT compilation of BPF_ALU+BPF_XOR+BPF_X);
+}
+
+ATF_TC_BODY(bpfjit_alu_xor_x, tc)
+{
+ static struct bpf_insn insns[] = {
+ BPF_STMT(BPF_LD+BPF_IMM, 0xdead0f0f),
+ BPF_STMT(BPF_LDX+BPF_W+BPF_IMM, 0xb1e0),
+ BPF_STMT(BPF_ALU+BPF_XOR+BPF_X, 0),
+ BPF_STMT(BPF_RET+BPF_A, 0)
+ };
+
+ uint8_t pkt[1]; /* the program doesn't read any data */
+
+ size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+ RZ(rump_init());
+
+ ATF_CHECK(prog_validate(insns, insn_count));
+ ATF_CHECK(exec_prog(insns, insn_count, pkt, 1) == 0xdeadbeef);
+}
+
ATF_TC(bpfjit_alu_lsh_x);
ATF_TC_HEAD(bpfjit_alu_lsh_x, tc)
{
@@ -3900,6 +3951,7 @@ ATF_TP_ADD_TCS(tp)
ATF_TP_ADD_TC(tp, bpfjit_alu_div8000_k);
ATF_TP_ADD_TC(tp, bpfjit_alu_and_k);
ATF_TP_ADD_TC(tp, bpfjit_alu_or_k);
+ ATF_TP_ADD_TC(tp, bpfjit_alu_xor_k);
ATF_TP_ADD_TC(tp, bpfjit_alu_lsh_k);
ATF_TP_ADD_TC(tp, bpfjit_alu_lsh0_k);
ATF_TP_ADD_TC(tp, bpfjit_alu_rsh_k);
@@ -3918,6 +3970,7 @@ ATF_TP_ADD_TCS(tp)
ATF_TP_ADD_TC(tp, bpfjit_alu_div8000_x);
ATF_TP_ADD_TC(tp, bpfjit_alu_and_x);
ATF_TP_ADD_TC(tp, bpfjit_alu_or_x);
+ ATF_TP_ADD_TC(tp, bpfjit_alu_xor_x);
ATF_TP_ADD_TC(tp, bpfjit_alu_lsh_x);
ATF_TP_ADD_TC(tp, bpfjit_alu_lsh0_x);
ATF_TP_ADD_TC(tp, bpfjit_alu_rsh_x);
CVS import: src/external/bsd/tcpdump/dist
Module Name:src Committed By: christos Date: Thu Nov 20 01:30:58 UTC 2014 Update of /cvsroot/src/external/bsd/tcpdump/dist In directory ivanova.netbsd.org:/tmp/cvs-serv25197 Log Message: Import tcpdump 4.6.2 Status: Vendor Tag: TCPDUMP Release Tags: tcpdump-4_6_2 C src/external/bsd/tcpdump/dist/print-lwres.c U src/external/bsd/tcpdump/dist/nfsfh.h U src/external/bsd/tcpdump/dist/llc.h N src/external/bsd/tcpdump/dist/print-m3ua.c U src/external/bsd/tcpdump/dist/l2vpn.h C src/external/bsd/tcpdump/dist/gmt2local.c U src/external/bsd/tcpdump/dist/af.h U src/external/bsd/tcpdump/dist/Makefile-devel-adds U src/external/bsd/tcpdump/dist/print-calm-fast.c C src/external/bsd/tcpdump/dist/print-icmp6.c C src/external/bsd/tcpdump/dist/print-pppoe.c C src/external/bsd/tcpdump/dist/print-sunrpc.c C src/external/bsd/tcpdump/dist/udp.h C src/external/bsd/tcpdump/dist/print-radius.c C src/external/bsd/tcpdump/dist/print-ip.c U src/external/bsd/tcpdump/dist/print-otv.c N src/external/bsd/tcpdump/dist/rpl.h C src/external/bsd/tcpdump/dist/pcap_dump_ftell.c U src/external/bsd/tcpdump/dist/addrtoname.h U src/external/bsd/tcpdump/dist/aclocal.m4 C src/external/bsd/tcpdump/dist/print-ipx.c C src/external/bsd/tcpdump/dist/print-ascii.c C src/external/bsd/tcpdump/dist/print-atalk.c C src/external/bsd/tcpdump/dist/print-sl.c C src/external/bsd/tcpdump/dist/print-tcp.c U src/external/bsd/tcpdump/dist/print-vtp.c C src/external/bsd/tcpdump/dist/print-lspping.c C src/external/bsd/tcpdump/dist/print-cip.c C src/external/bsd/tcpdump/dist/print-802_11.c U src/external/bsd/tcpdump/dist/print-udld.c U src/external/bsd/tcpdump/dist/gmpls.h C src/external/bsd/tcpdump/dist/print-pflog.c C src/external/bsd/tcpdump/dist/nfs.h C src/external/bsd/tcpdump/dist/print-dhcp6.c C src/external/bsd/tcpdump/dist/print-slow.c C src/external/bsd/tcpdump/dist/util.c U src/external/bsd/tcpdump/dist/machdep.h U src/external/bsd/tcpdump/dist/CHANGES C src/external/bsd/tcpdump/dist/print-icmp.c C src/external/bsd/tcpdump/dist/print-arp.c C src/external/bsd/tcpdump/dist/print-sunatm.c C src/external/bsd/tcpdump/dist/print-ripng.c C src/external/bsd/tcpdump/dist/print-hsrp.c U src/external/bsd/tcpdump/dist/openflow.h C src/external/bsd/tcpdump/dist/print-bgp.c C src/external/bsd/tcpdump/dist/print-fr.c U src/external/bsd/tcpdump/dist/print-mptcp.c C src/external/bsd/tcpdump/dist/print-ospf.c C src/external/bsd/tcpdump/dist/print-aodv.c C src/external/bsd/tcpdump/dist/strcasecmp.c U src/external/bsd/tcpdump/dist/README.md C src/external/bsd/tcpdump/dist/print-fddi.c C src/external/bsd/tcpdump/dist/print-mobility.c U src/external/bsd/tcpdump/dist/print-openflow-1.0.c C src/external/bsd/tcpdump/dist/print-pim.c C src/external/bsd/tcpdump/dist/smbutil.c C src/external/bsd/tcpdump/dist/print-dvmrp.c C src/external/bsd/tcpdump/dist/print-gre.c C src/external/bsd/tcpdump/dist/extract.h C src/external/bsd/tcpdump/dist/machdep.c U src/external/bsd/tcpdump/dist/appletalk.h C src/external/bsd/tcpdump/dist/checksum.c C src/external/bsd/tcpdump/dist/print-msdp.c U src/external/bsd/tcpdump/dist/print-nflog.c C src/external/bsd/tcpdump/dist/print-eigrp.c C src/external/bsd/tcpdump/dist/print-vqp.c C src/external/bsd/tcpdump/dist/print-beep.c C src/external/bsd/tcpdump/dist/print-mpcp.c C src/external/bsd/tcpdump/dist/print-null.c U src/external/bsd/tcpdump/dist/packetdat.awk C src/external/bsd/tcpdump/dist/parsenfsfh.c U src/external/bsd/tcpdump/dist/Makefile.in U src/external/bsd/tcpdump/dist/print-dtp.c U src/external/bsd/tcpdump/dist/pcap-missing.h C src/external/bsd/tcpdump/dist/print-l2tp.c C src/external/bsd/tcpdump/dist/print-ospf6.c C src/external/bsd/tcpdump/dist/print-ipfc.c U src/external/bsd/tcpdump/dist/slcompress.h U src/external/bsd/tcpdump/dist/nlpid.h C src/external/bsd/tcpdump/dist/print-isoclns.c C src/external/bsd/tcpdump/dist/print-ap1394.c U src/external/bsd/tcpdump/dist/print-tipc.c U src/external/bsd/tcpdump/dist/print-openflow.c U src/external/bsd/tcpdump/dist/print-802_15_4.c C src/external/bsd/tcpdump/dist/print-mobile.c C src/external/bsd/tcpdump/dist/print-cdp.c U src/external/bsd/tcpdump/dist/print-msnlb.c C src/external/bsd/tcpdump/dist/ip6.h U src/external/bsd/tcpdump/dist/INSTALL.txt U src/external/bsd/tcpdump/dist/smb.h N src/external/bsd/tcpdump/dist/getopt_long.h U src/external/bsd/tcpdump/dist/rpc_auth.h U src/external/bsd/tcpdump/dist/ospf.h U src/external/bsd/tcpdump/dist/setsignal.h U src/external/bsd/tcpdump/dist/config.h.in C src/external/bsd/tcpdump/dist/print-lane.c C src/external/bsd/tcpdump/dist/bpf_dump.c U src/external/bsd/tcpdump/dist/tcpdump-stdinc.h N src/external/bsd/tcpdump/dist/print-aoe.c C src/external/bsd/tcpdump/dist/print-rip.c C src/external/bsd/tcpdump/dist/print-ip6.c C src/external/bsd/tcpdump/dist/tcpdump.c U src/external/bsd/tcpdump/dist/install-sh U src/external/bsd/tcpdump/dist/print-babel.c C src/external/bsd/tcpdump/dist/print-sip.c C
CVS commit: src/external/mit/xorg/lib/libXft
Module Name:src
Committed By: jmcneill
Date: Thu Nov 20 02:00:20 UTC 2014
Modified Files:
src/external/mit/xorg/lib/libXft: Makefile
Log Message:
compile xftrender.c to workaround a crash in XftGlyphSpecRender on earm with
gcc 4.8.4
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/lib/libXft/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/libXft/Makefile
diff -u src/external/mit/xorg/lib/libXft/Makefile:1.5 src/external/mit/xorg/lib/libXft/Makefile:1.6
--- src/external/mit/xorg/lib/libXft/Makefile:1.5 Thu Nov 6 22:28:26 2008
+++ src/external/mit/xorg/lib/libXft/Makefile Thu Nov 20 02:00:19 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2008/11/06 22:28:26 veego Exp $
+# $NetBSD: Makefile,v 1.6 2014/11/20 02:00:19 jmcneill Exp $
.include bsd.own.mk
@@ -20,6 +20,11 @@ CPPFLAGS+= ${X11FLAGS.THREADLIB}
CPPFLAGS+= -DFREETYPE2 -I${DESTDIR}${X11INCDIR}/freetype2 -DXFREE86_FT2
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/Xft
+.if !empty(MACHINE_ARCH:Mearm*)
+# Workaround a crash in XftGlyphSpecRender with GCC 4.8.4
+COPTS.xftrender.c+= -O0
+.endif
+
LIBDPLIBS= X11 ${.CURDIR}/../libX11/dynamic \
fontconfig ${.CURDIR}/../fontconfig/src \
freetype ${.CURDIR}/../freetype \
CVS commit: src/external/bsd/tcpdump
Module Name:src Committed By: christos Date: Thu Nov 20 03:05:04 UTC 2014 Modified Files: src/external/bsd/tcpdump/bin: Makefile src/external/bsd/tcpdump/dist: addrtoname.c af.c ah.h bpf_dump.c checksum.c configure configure.in cpack.c cpack.h ether.h extract.h gmpls.c gmt2local.c interface.h ip.h ip6.h ipproto.c ipproto.h l2vpn.c machdep.c nameser.h netdissect.h nfs.h nlpid.c oui.c parsenfsfh.c pcap_dump_ftell.c print-802_11.c print-ah.c print-ahcp.c print-aodv.c print-aoe.c print-ap1394.c print-arcnet.c print-arp.c print-ascii.c print-atalk.c print-atm.c print-beep.c print-bfd.c print-bgp.c print-bootp.c print-bt.c print-cdp.c print-cfm.c print-chdlc.c print-cip.c print-cnfp.c print-dccp.c print-decnet.c print-dhcp6.c print-domain.c print-dvmrp.c print-eap.c print-egp.c print-eigrp.c print-enc.c print-esp.c print-ether.c print-fddi.c print-forces.c print-fr.c print-frag6.c print-gre.c print-hsrp.c print-icmp.c print-icmp6.c print-igmp.c print-igrp.c print-ip.c print-ip6.c print-ip6opts.c print-ipcomp.c print-ipfc.c print-ipx.c print-isakmp.c print-isoclns.c print-juniper.c print-krb.c print-l2tp.c print-lane.c print-ldp.c print-llc.c print-lldp.c print-lmp.c print-loopback.c print-lspping.c print-lwapp.c print-lwres.c print-m3ua.c print-mobile.c print-mobility.c print-mpcp.c print-mpls.c print-msdp.c print-nfs.c print-ntp.c print-null.c print-ospf.c print-ospf6.c print-pflog.c print-pfsync.c print-pgm.c print-pim.c print-pktap.c print-ppp.c print-pppoe.c print-pptp.c print-radius.c print-raw.c print-rip.c print-ripng.c print-rrcp.c print-rsvp.c print-rt6.c print-rx.c print-sctp.c print-sflow.c print-sip.c print-sl.c print-sll.c print-slow.c print-smb.c print-snmp.c print-stp.c print-sunatm.c print-sunrpc.c print-symantec.c print-syslog.c print-tcp.c print-telnet.c print-tftp.c print-timed.c print-token.c print-udp.c print-vjc.c print-vqp.c print-vrrp.c print-wb.c print-zephyr.c setsignal.c signature.c smbutil.c strcasecmp.c tcp.h tcpdump.1.in tcpdump.c udp.h util.c vfprintf.c src/external/bsd/tcpdump/include: config.h Removed Files: src/external/bsd/tcpdump/dist: aodv.h arcnet.h bgp.h dccp.h decnet.h decode_prefix.h enc.h esp.h fddi.h icmp6.h ieee802_11.h ieee802_11_radio.h igrp.h ipfc.h ipnet.h ipsec_doi.h ipx.h isakmp.h l2tp.h lane.h mptcp.h netbios.h nflog.h ntp.h oakley.h ospf6.h pmap_prot.h ppi.h print-netbios.c route6d.h rx.h sctpConstants.h sctpHeader.h slip.h sll.h telnet.h tftp.h timed.h token.h src/external/bsd/tcpdump/dist/missing: sockstorage.h src/external/bsd/tcpdump/dist/tests: dio.out dio.pcap src/external/bsd/tcpdump/dist/win32/Include: bittypes.h errno.h getopt.h src/external/bsd/tcpdump/dist/win32/Src: getopt.c Log Message: merge conflicts To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/external/bsd/tcpdump/bin/Makefile cvs rdiff -u -r1.5 -r1.6 src/external/bsd/tcpdump/dist/addrtoname.c \ src/external/bsd/tcpdump/dist/print-esp.c \ src/external/bsd/tcpdump/dist/print-lmp.c \ src/external/bsd/tcpdump/dist/print-pgm.c \ src/external/bsd/tcpdump/dist/print-pim.c \ src/external/bsd/tcpdump/dist/print-rsvp.c \ src/external/bsd/tcpdump/dist/print-sctp.c cvs rdiff -u -r1.3 -r1.4 src/external/bsd/tcpdump/dist/af.c \ src/external/bsd/tcpdump/dist/bpf_dump.c \ src/external/bsd/tcpdump/dist/ether.h \ src/external/bsd/tcpdump/dist/gmpls.c \ src/external/bsd/tcpdump/dist/gmt2local.c \ src/external/bsd/tcpdump/dist/ip.h src/external/bsd/tcpdump/dist/ip6.h \ src/external/bsd/tcpdump/dist/ipproto.c \ src/external/bsd/tcpdump/dist/ipproto.h \ src/external/bsd/tcpdump/dist/l2vpn.c \ src/external/bsd/tcpdump/dist/nameser.h \ src/external/bsd/tcpdump/dist/nfs.h src/external/bsd/tcpdump/dist/oui.c \ src/external/bsd/tcpdump/dist/pcap_dump_ftell.c \ src/external/bsd/tcpdump/dist/print-ah.c \ src/external/bsd/tcpdump/dist/print-aodv.c \ src/external/bsd/tcpdump/dist/print-ap1394.c \ src/external/bsd/tcpdump/dist/print-ascii.c \ src/external/bsd/tcpdump/dist/print-beep.c \ src/external/bsd/tcpdump/dist/print-bfd.c \ src/external/bsd/tcpdump/dist/print-bt.c \ src/external/bsd/tcpdump/dist/print-cip.c \ src/external/bsd/tcpdump/dist/print-cnfp.c \ src/external/bsd/tcpdump/dist/print-dccp.c \ src/external/bsd/tcpdump/dist/print-dvmrp.c \ src/external/bsd/tcpdump/dist/print-eap.c \ src/external/bsd/tcpdump/dist/print-egp.c \ src/external/bsd/tcpdump/dist/print-enc.c
CVS commit: src/doc
Module Name:src Committed By: christos Date: Thu Nov 20 03:07:30 UTC 2014 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: new tcpdump and libpcap To generate a diff of this commit: cvs rdiff -u -r1.1174 -r1.1175 src/doc/3RDPARTY cvs rdiff -u -r1.2020 -r1.2021 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1174 src/doc/3RDPARTY:1.1175 --- src/doc/3RDPARTY:1.1174 Mon Nov 17 21:01:08 2014 +++ src/doc/3RDPARTY Wed Nov 19 22:07:30 2014 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1174 2014/11/18 02:01:08 christos Exp $ +# $NetBSD: 3RDPARTY,v 1.1175 2014/11/20 03:07:30 christos Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -718,8 +718,8 @@ We maintain our own version of libdevmap should test it before import. Talk to haad before importing new version. Package: libpcap -Version: 1.5.2 -Current Vers: 1.5.2 +Version: 1.6.2 +Current Vers: 1.6.2 Maintainer: tcpdump-work...@tcpdump.org Archive Site: http://www.tcpdump.org/release/ Home Page: http://www.tcpdump.org/ @@ -1232,8 +1232,8 @@ Notes: Run cleantags before inporting because sqlite3.c has an RCSID Package: tcpdump -Version: 4.5.1 -Current Vers: 4.5.1 +Version: 4.6.2 +Current Vers: 4.6.2 Maintainer: tcpdump-work...@lists.tcpdump.org Archive Site: http://www.tcpdump.org/release/ Home Page: http://www.tcpdump.org/ Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2020 src/doc/CHANGES:1.2021 --- src/doc/CHANGES:1.2020 Mon Nov 17 21:01:08 2014 +++ src/doc/CHANGES Wed Nov 19 22:07:30 2014 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.2020 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.2021 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -106,3 +106,5 @@ Changes from NetBSD 7.0 to NetBSD 8.0: [jmcneill 20141115] zoneinfo: Import tzdata2014j. [apb 20141116] libc: Update to tzcode2014j. [christos 20141117] + libpcap: Import 1.6.2. [christos 20141119] + tcpdump(8): Import 4.6.2. [christos 20141119]
CVS commit: src/external/bsd/tcpdump/dist
Module Name:src
Committed By: christos
Date: Thu Nov 20 04:51:18 UTC 2014
Modified Files:
src/external/bsd/tcpdump/dist: tcpdump-stdinc.h
Log Message:
l in ntohl is not long!
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.4 -r1.2 src/external/bsd/tcpdump/dist/tcpdump-stdinc.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/dist/tcpdump-stdinc.h
diff -u src/external/bsd/tcpdump/dist/tcpdump-stdinc.h:1.1.1.4 src/external/bsd/tcpdump/dist/tcpdump-stdinc.h:1.2
--- src/external/bsd/tcpdump/dist/tcpdump-stdinc.h:1.1.1.4 Wed Nov 19 20:30:53 2014
+++ src/external/bsd/tcpdump/dist/tcpdump-stdinc.h Wed Nov 19 23:51:18 2014
@@ -259,7 +259,7 @@ typedef char* caddr_t;
#undef htonl
#undef htons
- static __inline__ unsigned long __ntohl (unsigned long x);
+ static __inline__ unsigned int __ntohl (unsigned int x);
static __inline__ unsigned short __ntohs (unsigned short x);
#define ntohl(x) __ntohl(x)
@@ -267,7 +267,7 @@ typedef char* caddr_t;
#define htonl(x) __ntohl(x)
#define htons(x) __ntohs(x)
- static __inline__ unsigned long __ntohl (unsigned long x)
+ static __inline__ unsigned int __ntohl (unsigned int x)
{
__asm__ (xchgb %b0, %h0\n\t /* swap lower bytes */
rorl $16, %0\n\t/* swap words*/
CVS commit: src/common/lib/libc/arch/m68k/atomic
Module Name:src
Committed By: matt
Date: Thu Nov 20 07:07:13 UTC 2014
Modified Files:
src/common/lib/libc/arch/m68k/atomic: Makefile.inc
Log Message:
Add atomic_c11_compare_exchange_cas_{8,16,32}.c
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/common/lib/libc/arch/m68k/atomic/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/common/lib/libc/arch/m68k/atomic/Makefile.inc
diff -u src/common/lib/libc/arch/m68k/atomic/Makefile.inc:1.13 src/common/lib/libc/arch/m68k/atomic/Makefile.inc:1.14
--- src/common/lib/libc/arch/m68k/atomic/Makefile.inc:1.13 Sat Feb 22 14:51:34 2014
+++ src/common/lib/libc/arch/m68k/atomic/Makefile.inc Thu Nov 20 07:07:13 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.13 2014/02/22 14:51:34 martin Exp $
+# $NetBSD: Makefile.inc,v 1.14 2014/11/20 07:07:13 matt Exp $
#
# Note: The atomic operations here in these assembly files are atomic
@@ -33,6 +33,10 @@ SRCS+= atomic_add_16_cas.c atomic_add_8
atomic_or_32_cas.c atomic_or_16_cas.c atomic_or_8_cas.c \
atomic_cas_32_cas.c atomic_cas_16_cas.c atomic_cas_8_cas.c \
atomic_swap_32_cas.c atomic_swap_16_cas.c atomic_swap_8_cas.c
+
+SRCS+= atomic_c11_compare_exchange_cas_8.c \
+ atomic_c11_compare_exchange_cas_16.c \
+ atomic_c11_compare_exchange_cas_32.c
.endif
.endif
