From owner-p4-projects@FreeBSD.ORG Sun Nov 28 00:39:57 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3932A16A4D1; Sun, 28 Nov 2004 00:39:57 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E796216A4CE for ; Sun, 28 Nov 2004 00:39:56 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 83E3F43D31 for ; Sun, 28 Nov 2004 00:39:56 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iAS0duKJ059107 for ; Sun, 28 Nov 2004 00:39:56 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iAS0dueD059104 for perforce@freebsd.org; Sun, 28 Nov 2004 00:39:56 GMT (envelope-from marcel@freebsd.org) Date: Sun, 28 Nov 2004 00:39:56 GMT Message-Id: <200411280039.iAS0dueD059104@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 65954 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Nov 2004 00:39:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=65954 Change 65954 by marcel@marcel_nfs on 2004/11/28 00:39:33 IFC @65953 Affected files ... .. //depot/projects/ia64/games/fortune/datfiles/fortunes#42 integrate .. //depot/projects/ia64/lib/libc/alpha/gen/divrem.m4#2 integrate .. //depot/projects/ia64/lib/libc_r/uthread/pthread_private.h#20 integrate .. //depot/projects/ia64/lib/libc_r/uthread/uthread_init.c#12 integrate .. //depot/projects/ia64/lib/libc_r/uthread/uthread_jmp.c#2 integrate .. //depot/projects/ia64/lib/libc_r/uthread/uthread_stack.c#4 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_init.c#14 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_private.h#18 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_stack.c#4 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#86 integrate .. //depot/projects/ia64/release/doc/share/misc/dev.archlist.txt#7 integrate .. //depot/projects/ia64/sbin/swapon/swapon.c#12 integrate .. //depot/projects/ia64/share/man/man4/Makefile#77 integrate .. //depot/projects/ia64/share/man/man4/snd_ich.4#1 branch .. //depot/projects/ia64/sys/alpha/alpha/db_trace.c#11 integrate .. //depot/projects/ia64/sys/alpha/alpha/divrem.m4#2 integrate .. //depot/projects/ia64/sys/alpha/alpha/fp_emulate.c#5 integrate .. //depot/projects/ia64/sys/alpha/alpha/machdep.c#46 integrate .. //depot/projects/ia64/sys/alpha/alpha/mp_machdep.c#20 integrate .. //depot/projects/ia64/sys/alpha/alpha/pmap.c#52 integrate .. //depot/projects/ia64/sys/alpha/alpha/prom.c#10 integrate .. //depot/projects/ia64/sys/alpha/alpha/sys_machdep.c#12 integrate .. //depot/projects/ia64/sys/alpha/alpha/trap.c#33 integrate .. //depot/projects/ia64/sys/alpha/alpha/vm_machdep.c#32 integrate .. //depot/projects/ia64/sys/alpha/linux/linux_machdep.c#14 integrate .. //depot/projects/ia64/sys/alpha/osf1/osf1_misc.c#24 integrate .. //depot/projects/ia64/sys/alpha/osf1/osf1_signal.c#19 integrate .. //depot/projects/ia64/sys/amd64/amd64/fpu.c#7 integrate .. //depot/projects/ia64/sys/amd64/amd64/machdep.c#27 integrate .. //depot/projects/ia64/sys/amd64/amd64/pmap.c#43 integrate .. //depot/projects/ia64/sys/amd64/amd64/vm_machdep.c#19 integrate .. //depot/projects/ia64/sys/amd64/linux32/linux32_sysvec.c#2 integrate .. //depot/projects/ia64/sys/arm/arm/db_trace.c#6 integrate .. //depot/projects/ia64/sys/arm/arm/trap.c#4 integrate .. //depot/projects/ia64/sys/arm/arm/undefined.c#3 integrate .. //depot/projects/ia64/sys/arm/arm/vm_machdep.c#5 integrate .. //depot/projects/ia64/sys/boot/efi/include/efilib.h#5 integrate .. //depot/projects/ia64/sys/boot/efi/libefi/Makefile#11 integrate .. //depot/projects/ia64/sys/boot/efi/libefi/copy.c#4 integrate .. //depot/projects/ia64/sys/boot/ia64/efi/Makefile#2 integrate .. //depot/projects/ia64/sys/boot/ia64/efi/efimd.c#1 branch .. //depot/projects/ia64/sys/compat/freebsd32/freebsd32_misc.c#11 integrate .. //depot/projects/ia64/sys/compat/pecoff/imgact_pecoff.c#20 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_misc.c#30 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_pci_link.c#20 integrate .. //depot/projects/ia64/sys/i386/i386/machdep.c#58 integrate .. //depot/projects/ia64/sys/i386/i386/pmap.c#82 integrate .. //depot/projects/ia64/sys/i386/i386/sys_machdep.c#25 integrate .. //depot/projects/ia64/sys/i386/i386/vm86.c#13 integrate .. //depot/projects/ia64/sys/i386/i386/vm_machdep.c#40 integrate .. //depot/projects/ia64/sys/i386/isa/npx.c#26 integrate .. //depot/projects/ia64/sys/i386/linux/linux_sysvec.c#32 integrate .. //depot/projects/ia64/sys/ia64/ia64/machdep.c#113 integrate .. //depot/projects/ia64/sys/ia64/ia64/trap.c#76 integrate .. //depot/projects/ia64/sys/ia64/ia64/vm_machdep.c#43 integrate .. //depot/projects/ia64/sys/kern/imgact_aout.c#21 integrate .. //depot/projects/ia64/sys/kern/init_main.c#46 integrate .. //depot/projects/ia64/sys/kern/kern_exec.c#69 integrate .. //depot/projects/ia64/sys/kern/kern_exit.c#59 integrate .. //depot/projects/ia64/sys/kern/kern_fork.c#56 integrate .. //depot/projects/ia64/sys/kern/kern_proc.c#58 integrate .. //depot/projects/ia64/sys/kern/kern_synch.c#57 integrate .. //depot/projects/ia64/sys/kern/sys_process.c#30 integrate .. //depot/projects/ia64/sys/netgraph/ng_ppp.c#15 integrate .. //depot/projects/ia64/sys/netinet/tcp.h#8 integrate .. //depot/projects/ia64/sys/netinet/tcp_usrreq.c#21 integrate .. //depot/projects/ia64/sys/pc98/i386/machdep.c#48 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/db_trace.c#7 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/fpu.c#5 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/machdep.c#40 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/mp_machdep.c#4 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/trap.c#29 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/vm_machdep.c#31 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/db_trace.c#14 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/machdep.c#55 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/rwindow.c#6 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/trap.c#35 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/vm_machdep.c#39 integrate .. //depot/projects/ia64/sys/sys/user.h#16 integrate .. //depot/projects/ia64/sys/vm/vm_glue.c#46 integrate .. //depot/projects/ia64/usr.bin/gcore/Makefile#4 integrate .. //depot/projects/ia64/usr.bin/gcore/aoutcore.c#4 delete .. //depot/projects/ia64/usr.bin/ktrace/subr.c#6 integrate .. //depot/projects/ia64/usr.sbin/pstat/pstat.c#17 integrate Differences ... ==== //depot/projects/ia64/games/fortune/datfiles/fortunes#42 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.146 2004/10/27 20:28:56 wilko Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.147 2004/11/27 08:28:58 dds Exp $ % -- Gifts for Children -- @@ -1063,6 +1063,10 @@ If you're wearing a shirt that's red. -- Doris Robin and Karen Trimble of The L.A. Filkharmonics % +The Ken Thompson school of thought on expert systems: +there's table lookup, fraud, and grand fraud. + -- Andrew Hume +% THE LESSER-KNOWN PROGRAMMING LANGUAGES #10: SIMPLE SIMPLE is an acronym for Sheer Idiot's Monopurpose Programming Language ==== //depot/projects/ia64/lib/libc/alpha/gen/divrem.m4#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: divrem.m4,v 1.7 1996/10/17 03:08:04 cgd Exp $ */ -/* $FreeBSD: src/lib/libc/alpha/gen/divrem.m4,v 1.3 2000/05/10 19:04:57 obrien Exp $ */ +/* $FreeBSD: src/lib/libc/alpha/gen/divrem.m4,v 1.4 2004/11/27 20:59:49 peadar Exp $ */ /* * Copyright (c) 1994, 1995 Carnegie-Mellon University. @@ -172,7 +172,7 @@ ifelse(S, `true', ` /* Check to see if we should negate it. */ - subqv zero, RESULT, T_0 + subq zero, RESULT, T_0 cmovlbs NEG, T_0, RESULT ') ==== //depot/projects/ia64/lib/libc_r/uthread/pthread_private.h#20 (text+ko) ==== @@ -31,7 +31,7 @@ * * Private thread definitions for the uthread kernel. * - * $FreeBSD: src/lib/libc_r/uthread/pthread_private.h,v 1.82 2004/01/22 19:15:08 deischen Exp $ + * $FreeBSD: src/lib/libc_r/uthread/pthread_private.h,v 1.83 2004/11/27 06:51:31 das Exp $ */ #ifndef _PTHREAD_PRIVATE_H @@ -52,6 +52,7 @@ #include #include #include +#include #include #include #include @@ -60,6 +61,10 @@ #include #include #include +#include +#include +#include +#include /* * Define machine dependent macros to get and set the stack pointer ==== //depot/projects/ia64/lib/libc_r/uthread/uthread_init.c#12 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc_r/uthread/uthread_init.c,v 1.46 2003/12/03 06:54:40 peter Exp $ + * $FreeBSD: src/lib/libc_r/uthread/uthread_init.c,v 1.47 2004/11/27 06:51:31 das Exp $ */ /* Allocate space for global thread variables here: */ @@ -49,7 +49,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/ia64/lib/libc_r/uthread/uthread_jmp.c#2 (text+ko) ==== @@ -28,13 +28,12 @@ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libc_r/uthread/uthread_jmp.c,v 1.9 2001/10/10 17:48:43 bde Exp $ + * $FreeBSD: src/lib/libc_r/uthread/uthread_jmp.c,v 1.10 2004/11/27 06:51:31 das Exp $ */ #include #include #include -#include #include #include #include "pthread_private.h" ==== //depot/projects/ia64/lib/libc_r/uthread/uthread_stack.c#4 (text+ko) ==== @@ -24,14 +24,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc_r/uthread/uthread_stack.c,v 1.5 2002/11/13 18:13:26 deischen Exp $ + * $FreeBSD: src/lib/libc_r/uthread/uthread_stack.c,v 1.6 2004/11/27 06:51:31 das Exp $ */ #include "namespace.h" #include #include #include #include -#include #include #include #include "un-namespace.h" ==== //depot/projects/ia64/lib/libthr/thread/thr_init.c#14 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/thread/thr_init.c,v 1.17 2004/06/27 10:01:35 mtm Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_init.c,v 1.18 2004/11/27 06:51:31 das Exp $ */ /* Allocate space for global thread variables here: */ @@ -49,7 +49,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/ia64/lib/libthr/thread/thr_private.h#18 (text+ko) ==== @@ -31,7 +31,7 @@ * * Private thread definitions for the uthread kernel. * - * $FreeBSD: src/lib/libthr/thread/thr_private.h,v 1.41 2004/09/16 13:55:46 mtm Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_private.h,v 1.42 2004/11/27 06:51:31 das Exp $ */ #ifndef _THR_PRIVATE_H @@ -54,6 +54,7 @@ #include #include #include +#include #include #include #include @@ -69,6 +70,10 @@ #include #include #include +#include +#include +#include +#include #if defined(_PTHREADS_INVARIANTS) /* ==== //depot/projects/ia64/lib/libthr/thread/thr_stack.c#4 (text+ko) ==== @@ -24,13 +24,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/thread/thr_stack.c,v 1.3 2003/05/26 00:37:07 mtm Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_stack.c,v 1.4 2004/11/27 06:51:31 das Exp $ */ #include #include #include #include -#include #include #include #include "thr_private.h" ==== //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#86 (text+ko) ==== @@ -29,7 +29,7 @@ - $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.262 2004/11/20 02:46:02 brueffer Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.263 2004/11/27 13:57:22 simon Exp $ Supported Devices @@ -804,6 +804,8 @@ &hwlist.snd.ds1; + &hwlist.snd.ich; + NEC PC-9801-73, 86 and compatibles (nss driver) ==== //depot/projects/ia64/release/doc/share/misc/dev.archlist.txt#7 (text+ko) ==== @@ -23,7 +23,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.45 2004/11/20 02:44:47 brueffer Exp $ +# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.46 2004/11/27 13:57:22 simon Exp $ # # @@ -105,6 +105,7 @@ snd_es137x i386,amd64 snd_ess i386,amd64 snd_gusc i386,amd64 +snd_ich i386,amd64 snd_solo i386,amd64 ste i386,pc98,alpha,amd64 stg i386,pc98 ==== //depot/projects/ia64/sbin/swapon/swapon.c#12 (text+ko) ==== @@ -39,12 +39,12 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/sbin/swapon/swapon.c,v 1.20 2004/04/09 19:58:39 markm Exp $"); +__FBSDID("$FreeBSD: src/sbin/swapon/swapon.c,v 1.21 2004/11/27 06:51:31 das Exp $"); #include #include -#include #include +#include #include #include ==== //depot/projects/ia64/share/man/man4/Makefile#77 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/18/93 -# $FreeBSD: src/share/man/man4/Makefile,v 1.294 2004/11/24 20:31:30 brueffer Exp $ +# $FreeBSD: src/share/man/man4/Makefile,v 1.295 2004/11/27 13:49:27 simon Exp $ MAN= aac.4 \ acpi.4 \ @@ -267,6 +267,7 @@ snd_es137x.4 \ snd_ess.4 \ snd_gusc.4 \ + snd_ich.4 \ snd_maestro3.4 \ snd_sbc.4 \ snd_solo.4 \ ==== //depot/projects/ia64/sys/alpha/alpha/db_trace.c#11 (text+ko) ==== @@ -42,17 +42,17 @@ #include /* RCS ID & Copyright macro defns */ /*__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.9 2000/12/13 03:16:36 mycroft Exp $");*/ -__FBSDID("$FreeBSD: src/sys/alpha/alpha/db_trace.c,v 1.22 2004/11/01 22:15:13 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/db_trace.c,v 1.23 2004/11/27 06:51:32 das Exp $"); #include #include #include #include -#include #include #include #include +#include #include #include ==== //depot/projects/ia64/sys/alpha/alpha/divrem.m4#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/divrem.m4,v 1.3 2000/05/01 20:17:45 peter Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/divrem.m4,v 1.4 2004/11/27 20:59:49 peadar Exp $ */ /* $NetBSD: divrem.m4,v 1.5 1996/10/17 04:26:25 cgd Exp $ */ /* @@ -172,7 +172,7 @@ ifelse(S, `true', ` /* Check to see if we should negate it. */ - subqv zero, RESULT, T_0 + subq zero, RESULT, T_0 cmovlbs NEG, T_0, RESULT ') ==== //depot/projects/ia64/sys/alpha/alpha/fp_emulate.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/fp_emulate.c,v 1.14 2004/05/06 09:35:57 das Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/fp_emulate.c,v 1.15 2004/11/27 06:51:32 das Exp $"); #include #include @@ -34,7 +34,6 @@ #include #include #include -#include #include #include @@ -47,6 +46,7 @@ #include #include #include +#include #include #include ==== //depot/projects/ia64/sys/alpha/alpha/machdep.c#46 (text+ko) ==== @@ -88,7 +88,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.225 2004/11/20 02:29:36 das Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.226 2004/11/27 06:51:32 das Exp $"); #include "opt_compat.h" #include "opt_ddb.h" @@ -132,7 +132,6 @@ #include #include #include -#include #include #include #include @@ -141,6 +140,7 @@ #include #include #include +#include #include #include #include ==== //depot/projects/ia64/sys/alpha/alpha/mp_machdep.c#20 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/mp_machdep.c,v 1.54 2004/11/20 02:29:36 das Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/mp_machdep.c,v 1.55 2004/11/27 06:51:32 das Exp $"); #include "opt_kstack_pages.h" @@ -42,7 +42,6 @@ #include #include #include -#include #include #include @@ -51,6 +50,7 @@ #include #include #include +#include #include #include #include ==== //depot/projects/ia64/sys/alpha/alpha/pmap.c#52 (text+ko) ==== @@ -148,7 +148,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.173 2004/10/03 00:16:42 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.174 2004/11/27 06:51:32 das Exp $"); #include #include @@ -173,9 +173,8 @@ #include #include -#include - #include +#include #include #ifndef PMAP_SHPGPERPROC ==== //depot/projects/ia64/sys/alpha/alpha/prom.c#10 (text+ko) ==== @@ -26,7 +26,7 @@ #include /* RCS ID & Copyright macro defns */ /* __KERNEL_RCSID(0, "$NetBSD: prom.c,v 1.22 1998/02/27 04:03:00 thorpej Exp $"); */ -__FBSDID("$FreeBSD: src/sys/alpha/alpha/prom.c,v 1.28 2003/08/17 06:42:07 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/prom.c,v 1.29 2004/11/27 06:51:32 das Exp $"); #include #include @@ -35,10 +35,10 @@ #include #include #include -#include #include #include +#include #include #include #include ==== //depot/projects/ia64/sys/alpha/alpha/sys_machdep.c#12 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/sys_machdep.c,v 1.27 2004/04/05 21:00:49 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/sys_machdep.c,v 1.28 2004/11/27 06:51:32 das Exp $"); #include "opt_mac.h" @@ -42,7 +42,6 @@ #include #include #include -#include #include #include @@ -50,6 +49,7 @@ #include #include +#include #include #include /* for kernel_map */ ==== //depot/projects/ia64/sys/alpha/alpha/trap.c#33 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/trap.c,v 1.120 2004/08/31 07:34:53 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/trap.c,v 1.121 2004/11/27 06:51:32 das Exp $"); /* #include "opt_fix_unaligned_vax_fp.h" */ #include "opt_ddb.h" @@ -55,12 +55,12 @@ #include #include #include -#include #include #include #include #include #include +#include #include #ifdef KTRACE ==== //depot/projects/ia64/sys/alpha/alpha/vm_machdep.c#32 (text+ko) ==== @@ -67,7 +67,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.104 2004/05/26 12:09:36 tmm Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.105 2004/11/27 06:51:32 das Exp $"); #include #include @@ -89,6 +89,7 @@ #include #include #include +#include #include #include @@ -99,8 +100,6 @@ #include #include -#include - /* * Finish a fork operation, with process p2 nearly set up. * Copy and update the pcb, set up the stack so that the child ==== //depot/projects/ia64/sys/alpha/linux/linux_machdep.c#14 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/linux/linux_machdep.c,v 1.34 2004/09/01 02:11:27 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/linux/linux_machdep.c,v 1.35 2004/11/27 06:51:32 das Exp $"); #include #include @@ -36,10 +36,13 @@ #include #include #include +#include +#include #include #include #include -#include + +#include #include #include ==== //depot/projects/ia64/sys/alpha/osf1/osf1_misc.c#24 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/osf1/osf1_misc.c,v 1.50 2004/10/14 10:43:47 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/osf1/osf1_misc.c,v 1.51 2004/11/27 06:51:32 das Exp $"); #include #include @@ -66,7 +66,6 @@ #include #include #include -#include #include #include #include @@ -82,6 +81,7 @@ #include #include #include +#include #include #include ==== //depot/projects/ia64/sys/alpha/osf1/osf1_signal.c#19 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/osf1/osf1_signal.c,v 1.36 2004/01/03 23:36:31 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/osf1/osf1_signal.c,v 1.37 2004/11/27 06:51:32 das Exp $"); #include "opt_compat.h" #ifndef COMPAT_43 @@ -66,7 +66,6 @@ #include #include #include -#include #include #include #include @@ -83,6 +82,7 @@ #include #include #include +#include #include #include ==== //depot/projects/ia64/sys/amd64/amd64/fpu.c#7 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/fpu.c,v 1.154 2004/06/18 04:01:54 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/fpu.c,v 1.155 2004/11/27 06:51:32 das Exp $"); #include #include @@ -47,7 +47,6 @@ #include #include #include -#include #include #include ==== //depot/projects/ia64/sys/amd64/amd64/machdep.c#27 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.623 2004/11/20 02:29:23 das Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.624 2004/11/27 06:51:32 das Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -82,6 +82,8 @@ #include #include +#include + #include #include #include @@ -91,7 +93,6 @@ #include #include -#include #include #include ==== //depot/projects/ia64/sys/amd64/amd64/pmap.c#43 (text+ko) ==== @@ -75,7 +75,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.508 2004/10/08 08:23:42 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.509 2004/11/27 06:51:33 das Exp $"); /* * Manages physical address maps. @@ -116,7 +116,6 @@ #include #include #include -#include #include #include #include @@ -138,6 +137,7 @@ #include #include #include +#include #include #ifdef SMP #include ==== //depot/projects/ia64/sys/amd64/amd64/vm_machdep.c#19 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.237 2004/08/16 22:57:13 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.238 2004/11/27 06:51:34 das Exp $"); #include "opt_isa.h" #include "opt_cpu.h" @@ -62,7 +62,6 @@ #include #include #include -#include #include #include ==== //depot/projects/ia64/sys/amd64/linux32/linux32_sysvec.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.3 2004/08/16 11:15:46 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.4 2004/11/27 06:51:34 das Exp $"); /* XXX we use functions that might not exist. */ #include "opt_compat.h" @@ -56,12 +56,12 @@ #include #include #include +#include #include #include #include #include #include -#include #include #include @@ -74,6 +74,7 @@ #include #include +#include #include #include ==== //depot/projects/ia64/sys/arm/arm/db_trace.c#6 (text+ko) ==== @@ -30,18 +30,18 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/db_trace.c,v 1.8 2004/11/21 19:41:27 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/db_trace.c,v 1.9 2004/11/27 06:51:34 das Exp $"); #include #include #include -#include #include #include #include #include #include +#include #include #include #include ==== //depot/projects/ia64/sys/arm/arm/trap.c#4 (text+ko) ==== @@ -82,14 +82,13 @@ #include "opt_ktrace.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/trap.c,v 1.4 2004/11/20 00:55:57 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/trap.c,v 1.5 2004/11/27 06:51:34 das Exp $"); #include #include #include #include -#include #include #include #include @@ -112,6 +111,7 @@ #include #include #include +#include #include #include #if !defined(DDB) ==== //depot/projects/ia64/sys/arm/arm/undefined.c#3 (text+ko) ==== @@ -48,7 +48,7 @@ #include "opt_ddb.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/undefined.c,v 1.3 2004/11/21 18:11:39 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/undefined.c,v 1.4 2004/11/27 06:51:34 das Exp $"); #include #include @@ -56,7 +56,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/ia64/sys/arm/arm/vm_machdep.c#5 (text+ko) ==== @@ -81,7 +81,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/vm_machdep.c,v 1.8 2004/11/20 16:51:32 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/vm_machdep.c,v 1.9 2004/11/27 06:51:34 das Exp $"); #include #include @@ -91,7 +91,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/ia64/sys/boot/efi/include/efilib.h#5 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/efi/include/efilib.h,v 1.3 2002/12/10 20:11:19 marcel Exp $ + * $FreeBSD: src/sys/boot/efi/include/efilib.h,v 1.4 2004/11/28 00:30:22 marcel Exp $ */ extern EFI_HANDLE IH; @@ -34,5 +34,7 @@ void *efi_get_table(EFI_GUID *tbl); void efi_main(EFI_HANDLE image_handle, EFI_SYSTEM_TABLE *system_table); +EFI_PHYSICAL_ADDRESS efimd_va2pa(EFI_VIRTUAL_ADDRESS); + EFI_STATUS main(int argc, CHAR16 *argv[]); void exit(EFI_STATUS status); ==== //depot/projects/ia64/sys/boot/efi/libefi/Makefile#11 (text+ko) ==== @@ -1,26 +1,26 @@ -# $FreeBSD: src/sys/boot/efi/libefi/Makefile,v 1.15 2004/10/24 15:32:49 ru Exp $ +# $FreeBSD: src/sys/boot/efi/libefi/Makefile,v 1.16 2004/11/28 00:30:22 marcel Exp $ .PATH: ${.CURDIR}/../../../${MACHINE_ARCH}/${MACHINE_ARCH} -LIB= efi +LIB= efi INTERNALLIB= -SRCS= libefi.c efi_console.c time.c copy.c devicename.c module.c -SRCS+= delay.c efifs.c efinet.c elf_freebsd.c bootinfo.c pal.S +SRCS= bootinfo.c copy.c delay.c devicename.c efi_console.c efifs.c efinet.c \ + elf_freebsd.c libefi.c module.c time.c .if ${MACHINE_ARCH} == "ia64" -SRCS+= efifpswa.c +SRCS+= efifpswa.c pal.S .endif -CFLAGS+= -I${.CURDIR}/../include -CFLAGS+= -I${.CURDIR}/../include/${MACHINE_ARCH} -CFLAGS+= -I${.CURDIR}/../../../../lib/libstand +CFLAGS+= -I${.CURDIR}/../include +CFLAGS+= -I${.CURDIR}/../include/${MACHINE_ARCH} +CFLAGS+= -I${.CURDIR}/../../../../lib/libstand # Pick up the bootstrap header for some interface items -CFLAGS+= -I${.CURDIR}/../../common +CFLAGS+= -I${.CURDIR}/../../common +# Make the disk code more talkative .if defined(BOOT_DISK_DEBUG) -# Make the disk code more talkative CFLAGS+= -DDISK_DEBUG .endif ==== //depot/projects/ia64/sys/boot/efi/libefi/copy.c#4 (text+ko) ==== @@ -25,44 +25,31 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/efi/libefi/copy.c,v 1.5 2003/04/03 21:36:29 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/efi/libefi/copy.c,v 1.6 2004/11/28 00:30:22 marcel Exp $"); -/* - * MD primitives supporting placement of module data - */ -#include >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Nov 28 02:11:56 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DCDDF16A4D0; Sun, 28 Nov 2004 02:11:55 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AA90616A4CE for ; Sun, 28 Nov 2004 02:11:55 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3CE2543D54 for ; Sun, 28 Nov 2004 02:11:55 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iAS2BtCY068403 for ; Sun, 28 Nov 2004 02:11:55 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iAS2BsFf068400 for perforce@freebsd.org; Sun, 28 Nov 2004 02:11:54 GMT (envelope-from peter@freebsd.org) Date: Sun, 28 Nov 2004 02:11:54 GMT Message-Id: <200411280211.iAS2BsFf068400@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 65959 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Nov 2004 02:11:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=65959 Change 65959 by peter@peter_overcee on 2004/11/28 02:11:48 IFC @65958 Affected files ... .. //depot/projects/hammer/Makefile.inc1#77 integrate .. //depot/projects/hammer/etc/defaults/periodic.conf#11 integrate .. //depot/projects/hammer/etc/defaults/rc.conf#43 integrate .. //depot/projects/hammer/etc/periodic/security/520.pfdenied#1 branch .. //depot/projects/hammer/etc/periodic/security/Makefile#3 integrate .. //depot/projects/hammer/etc/rc.d/jail#11 integrate .. //depot/projects/hammer/games/fortune/datfiles/fortunes#31 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/kgdb/kgdb.1#2 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/kgdb/main.c#3 integrate .. //depot/projects/hammer/lib/libc/alpha/gen/divrem.m4#2 integrate .. //depot/projects/hammer/lib/libc/regex/engine.c#4 integrate .. //depot/projects/hammer/lib/libc_r/uthread/pthread_private.h#12 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_init.c#7 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_jmp.c#2 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_stack.c#3 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_init.c#13 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_private.h#21 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_stack.c#3 integrate .. //depot/projects/hammer/libexec/ftpd/ftpd.c#22 integrate .. //depot/projects/hammer/libexec/rtld-elf/arm/rtld_machdep.h#3 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#67 integrate .. //depot/projects/hammer/release/doc/share/misc/dev.archlist.txt#17 integrate .. //depot/projects/hammer/sbin/gvinum/gvinum.c#3 integrate .. //depot/projects/hammer/sbin/ipfw/ipfw2.c#34 integrate .. //depot/projects/hammer/sbin/mount/getmntopts.c#5 integrate .. //depot/projects/hammer/sbin/mount/mntopts.h#4 integrate .. //depot/projects/hammer/sbin/mount_ufs/Makefile#1 branch .. //depot/projects/hammer/sbin/mount_ufs/mount_ufs.c#1 branch .. //depot/projects/hammer/sbin/swapon/swapon.c#6 integrate .. //depot/projects/hammer/share/man/man4/Makefile#57 integrate .. //depot/projects/hammer/share/man/man4/altq.4#4 integrate .. //depot/projects/hammer/share/man/man4/amr.4#8 integrate .. //depot/projects/hammer/share/man/man4/dc.4#14 integrate .. //depot/projects/hammer/share/man/man4/em.4#6 integrate .. //depot/projects/hammer/share/man/man4/fxp.4#9 integrate .. //depot/projects/hammer/share/man/man4/ixgb.4#7 integrate .. //depot/projects/hammer/share/man/man4/ng_one2many.4#9 integrate .. //depot/projects/hammer/share/man/man4/nge.4#5 integrate .. //depot/projects/hammer/share/man/man4/re.4#12 integrate .. //depot/projects/hammer/share/man/man4/rl.4#12 integrate .. //depot/projects/hammer/share/man/man4/sf.4#4 integrate .. //depot/projects/hammer/share/man/man4/sis.4#7 integrate .. //depot/projects/hammer/share/man/man4/snd_ich.4#1 branch .. //depot/projects/hammer/share/man/man4/ste.4#8 integrate .. //depot/projects/hammer/share/man/man4/vge.4#3 integrate .. //depot/projects/hammer/share/man/man4/vr.4#8 integrate .. //depot/projects/hammer/share/man/man4/witness.4#4 integrate .. //depot/projects/hammer/share/man/man5/core.5#3 integrate .. //depot/projects/hammer/share/man/man5/periodic.conf.5#9 integrate .. //depot/projects/hammer/share/man/man9/Makefile#44 integrate .. //depot/projects/hammer/share/man/man9/mbuf_tags.9#4 integrate .. //depot/projects/hammer/sys/alpha/alpha/db_trace.c#11 integrate .. //depot/projects/hammer/sys/alpha/alpha/divrem.m4#2 integrate .. //depot/projects/hammer/sys/alpha/alpha/fp_emulate.c#5 integrate .. //depot/projects/hammer/sys/alpha/alpha/interrupt.c#17 integrate .. //depot/projects/hammer/sys/alpha/alpha/machdep.c#28 integrate .. //depot/projects/hammer/sys/alpha/alpha/mp_machdep.c#14 integrate .. //depot/projects/hammer/sys/alpha/alpha/pmap.c#39 integrate .. //depot/projects/hammer/sys/alpha/alpha/prom.c#6 integrate .. //depot/projects/hammer/sys/alpha/alpha/sys_machdep.c#8 integrate .. //depot/projects/hammer/sys/alpha/alpha/trap.c#14 integrate .. //depot/projects/hammer/sys/alpha/alpha/vm_machdep.c#18 integrate .. //depot/projects/hammer/sys/alpha/linux/linux_machdep.c#10 integrate .. //depot/projects/hammer/sys/alpha/osf1/osf1_misc.c#13 integrate .. //depot/projects/hammer/sys/alpha/osf1/osf1_signal.c#13 integrate .. //depot/projects/hammer/sys/amd64/amd64/busdma_machdep.c#25 integrate .. //depot/projects/hammer/sys/amd64/amd64/fpu.c#22 integrate .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#108 integrate .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#117 integrate .. //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#53 integrate .. //depot/projects/hammer/sys/amd64/linux32/linux32_sysvec.c#2 integrate .. //depot/projects/hammer/sys/arm/arm/db_interface.c#3 integrate .. //depot/projects/hammer/sys/arm/arm/db_trace.c#8 integrate .. //depot/projects/hammer/sys/arm/arm/intr.c#5 integrate .. //depot/projects/hammer/sys/arm/arm/swtch.S#7 integrate .. //depot/projects/hammer/sys/arm/arm/trap.c#5 integrate .. //depot/projects/hammer/sys/arm/arm/undefined.c#3 integrate .. //depot/projects/hammer/sys/arm/arm/vm_machdep.c#8 integrate .. //depot/projects/hammer/sys/arm/include/db_machdep.h#4 integrate .. //depot/projects/hammer/sys/arm/include/kdb.h#2 integrate .. //depot/projects/hammer/sys/arm/xscale/i80321/uart_bus_i80321.c#2 integrate .. //depot/projects/hammer/sys/arm/xscale/i80321/uart_cpu_i80321.c#2 integrate .. //depot/projects/hammer/sys/boot/Makefile#14 integrate .. //depot/projects/hammer/sys/boot/efi/Makefile#2 integrate .. //depot/projects/hammer/sys/boot/efi/include/efilib.h#3 integrate .. //depot/projects/hammer/sys/boot/efi/libefi/Makefile#6 integrate .. //depot/projects/hammer/sys/boot/efi/libefi/arch/ia64/ldscript.ia64#4 delete .. //depot/projects/hammer/sys/boot/efi/libefi/arch/ia64/start.S#4 delete .. //depot/projects/hammer/sys/boot/efi/libefi/copy.c#3 integrate .. //depot/projects/hammer/sys/boot/efi/loader/Makefile#5 delete .. //depot/projects/hammer/sys/boot/efi/loader/conf.c#4 delete .. //depot/projects/hammer/sys/boot/efi/loader/main.c#7 delete .. //depot/projects/hammer/sys/boot/efi/loader/version#3 delete .. //depot/projects/hammer/sys/boot/i386/boot0/boot0.S#6 integrate .. //depot/projects/hammer/sys/boot/i386/btx/btx/btx.S#4 integrate .. //depot/projects/hammer/sys/boot/ia64/Makefile#3 integrate .. //depot/projects/hammer/sys/boot/ia64/efi/Makefile#1 branch .. //depot/projects/hammer/sys/boot/ia64/efi/conf.c#1 branch .. //depot/projects/hammer/sys/boot/ia64/efi/efimd.c#1 branch .. //depot/projects/hammer/sys/boot/ia64/efi/ldscript.ia64#1 branch .. //depot/projects/hammer/sys/boot/ia64/efi/main.c#1 branch .. //depot/projects/hammer/sys/boot/ia64/efi/start.S#1 branch .. //depot/projects/hammer/sys/boot/ia64/efi/version#1 branch .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_misc.c#19 integrate .. //depot/projects/hammer/sys/compat/linux/linux_file.c#11 integrate .. //depot/projects/hammer/sys/compat/pecoff/imgact_pecoff.c#10 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_misc.c#17 integrate .. //depot/projects/hammer/sys/conf/files#94 integrate .. //depot/projects/hammer/sys/conf/files.alpha#18 integrate .. //depot/projects/hammer/sys/conf/files.amd64#60 integrate .. //depot/projects/hammer/sys/conf/files.arm#2 integrate .. //depot/projects/hammer/sys/conf/files.i386#45 integrate .. //depot/projects/hammer/sys/conf/files.ia64#24 integrate .. //depot/projects/hammer/sys/conf/files.pc98#36 integrate .. //depot/projects/hammer/sys/contrib/pf/net/pf.c#16 integrate .. //depot/projects/hammer/sys/ddb/db_command.c#11 integrate .. //depot/projects/hammer/sys/ddb/db_run.c#4 integrate .. //depot/projects/hammer/sys/ddb/db_thread.c#3 integrate .. //depot/projects/hammer/sys/dev/aac/aac.c#27 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_pci_link.c#24 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_pcib.c#22 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_pcib_acpi.c#17 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_pcib_pci.c#8 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_pcibvar.h#4 integrate .. //depot/projects/hammer/sys/dev/ata/ata-all.c#42 integrate .. //depot/projects/hammer/sys/dev/ata/ata-lowlevel.c#22 integrate .. //depot/projects/hammer/sys/dev/bge/if_bge.c#39 integrate .. //depot/projects/hammer/sys/dev/ed/if_ed.c#22 integrate .. //depot/projects/hammer/sys/dev/fdc/fdc.c#24 integrate .. //depot/projects/hammer/sys/dev/hme/if_hme.c#15 integrate .. //depot/projects/hammer/sys/dev/hme/if_hme_pci.c#9 integrate .. //depot/projects/hammer/sys/dev/hme/if_hme_sbus.c#9 integrate .. //depot/projects/hammer/sys/dev/hme/if_hmevar.h#4 integrate .. //depot/projects/hammer/sys/dev/ic/ns16550.h#5 integrate .. //depot/projects/hammer/sys/dev/ic/sab82532.h#1 branch .. //depot/projects/hammer/sys/dev/ic/z8530.h#1 branch .. //depot/projects/hammer/sys/dev/mii/mii.c#9 integrate .. //depot/projects/hammer/sys/dev/mlx/mlx_disk.c#8 integrate .. //depot/projects/hammer/sys/dev/mlx/mlxreg.h#3 integrate .. //depot/projects/hammer/sys/dev/uart/uart_cpu_pc98.c#8 integrate .. //depot/projects/hammer/sys/dev/uart/uart_dev_i8251.c#4 delete .. //depot/projects/hammer/sys/dev/uart/uart_dev_i8251.h#2 delete .. //depot/projects/hammer/sys/dev/uart/uart_dev_ns8250.c#8 integrate .. //depot/projects/hammer/sys/dev/uart/uart_dev_ns8250.h#2 delete .. //depot/projects/hammer/sys/dev/uart/uart_dev_sab82532.c#7 integrate .. //depot/projects/hammer/sys/dev/uart/uart_dev_sab82532.h#2 delete .. //depot/projects/hammer/sys/dev/uart/uart_dev_z8530.c#7 integrate .. //depot/projects/hammer/sys/dev/uart/uart_dev_z8530.h#2 delete .. //depot/projects/hammer/sys/fs/devfs/devfs_vfsops.c#10 integrate .. //depot/projects/hammer/sys/fs/nullfs/null_vfsops.c#10 integrate .. //depot/projects/hammer/sys/fs/nullfs/null_vnops.c#9 integrate .. //depot/projects/hammer/sys/fs/nwfs/nwfs_vfsops.c#11 integrate .. //depot/projects/hammer/sys/fs/smbfs/smbfs_vfsops.c#13 integrate .. //depot/projects/hammer/sys/fs/umapfs/umap_vfsops.c#11 integrate .. //depot/projects/hammer/sys/geom/gate/g_gate.c#9 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum.c#10 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum.h#7 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum_init.c#6 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum_plex.c#10 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum_raid5.c#8 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum_raid5.h#5 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum_state.c#6 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum_var.h#6 integrate .. //depot/projects/hammer/sys/i386/i386/busdma_machdep.c#22 integrate .. //depot/projects/hammer/sys/i386/i386/machdep.c#44 integrate .. //depot/projects/hammer/sys/i386/i386/pmap.c#62 integrate .. //depot/projects/hammer/sys/i386/i386/sys_machdep.c#12 integrate .. //depot/projects/hammer/sys/i386/i386/vm86.c#7 integrate .. //depot/projects/hammer/sys/i386/i386/vm_machdep.c#34 integrate .. //depot/projects/hammer/sys/i386/isa/npx.c#22 integrate .. //depot/projects/hammer/sys/i386/linux/linux_sysvec.c#19 integrate .. //depot/projects/hammer/sys/ia64/ia64/machdep.c#45 integrate .. //depot/projects/hammer/sys/ia64/ia64/pmap.c#39 integrate .. //depot/projects/hammer/sys/ia64/ia64/trap.c#30 integrate .. //depot/projects/hammer/sys/ia64/ia64/vm_machdep.c#24 integrate .. //depot/projects/hammer/sys/ia64/include/pte.h#4 integrate .. //depot/projects/hammer/sys/kern/imgact_aout.c#11 integrate .. //depot/projects/hammer/sys/kern/init_main.c#31 integrate .. //depot/projects/hammer/sys/kern/init_sysent.c#37 integrate .. //depot/projects/hammer/sys/kern/kern_descrip.c#36 integrate .. //depot/projects/hammer/sys/kern/kern_exec.c#40 integrate .. //depot/projects/hammer/sys/kern/kern_exit.c#39 integrate .. //depot/projects/hammer/sys/kern/kern_fork.c#46 integrate .. //depot/projects/hammer/sys/kern/kern_kse.c#16 integrate .. //depot/projects/hammer/sys/kern/kern_proc.c#40 integrate .. //depot/projects/hammer/sys/kern/kern_switch.c#36 integrate .. //depot/projects/hammer/sys/kern/kern_synch.c#45 integrate .. //depot/projects/hammer/sys/kern/kern_thr.c#24 integrate .. //depot/projects/hammer/sys/kern/kern_thread.c#72 integrate .. //depot/projects/hammer/sys/kern/sys_pipe.c#25 integrate .. //depot/projects/hammer/sys/kern/sys_process.c#19 integrate .. //depot/projects/hammer/sys/kern/syscalls.c#36 integrate .. //depot/projects/hammer/sys/kern/syscalls.master#36 integrate .. //depot/projects/hammer/sys/kern/vfs_mount.c#40 integrate .. //depot/projects/hammer/sys/modules/if_gif/Makefile#3 integrate .. //depot/projects/hammer/sys/modules/sio/Makefile#4 integrate .. //depot/projects/hammer/sys/modules/uart/Makefile#8 integrate .. //depot/projects/hammer/sys/net/if.c#35 integrate .. //depot/projects/hammer/sys/netgraph/ng_cisco.c#7 integrate .. //depot/projects/hammer/sys/netgraph/ng_iface.c#13 integrate .. //depot/projects/hammer/sys/netgraph/ng_one2many.c#8 integrate .. //depot/projects/hammer/sys/netgraph/ng_one2many.h#3 integrate .. //depot/projects/hammer/sys/netgraph/ng_ppp.c#10 integrate .. //depot/projects/hammer/sys/netinet/tcp.h#10 integrate .. //depot/projects/hammer/sys/netinet/tcp_fsm.h#3 integrate .. //depot/projects/hammer/sys/netinet/tcp_input.c#40 integrate .. //depot/projects/hammer/sys/netinet/tcp_subr.c#33 integrate .. //depot/projects/hammer/sys/netinet/tcp_timer.c#12 integrate .. //depot/projects/hammer/sys/netinet/tcp_usrreq.c#22 integrate .. //depot/projects/hammer/sys/pc98/i386/machdep.c#38 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/db_trace.c#8 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/fpu.c#4 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/machdep.c#30 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/mp_machdep.c#4 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/trap.c#12 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/vm_machdep.c#20 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/db_trace.c#10 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/machdep.c#35 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/rwindow.c#4 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/trap.c#16 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/vm_machdep.c#19 integrate .. //depot/projects/hammer/sys/sys/jail.h#6 integrate .. //depot/projects/hammer/sys/sys/mount.h#25 integrate .. //depot/projects/hammer/sys/sys/user.h#16 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_vfsops.c#35 integrate .. //depot/projects/hammer/sys/ufs/ufs/ufs_extern.h#7 integrate .. //depot/projects/hammer/sys/ufs/ufs/ufs_vfsops.c#6 integrate .. //depot/projects/hammer/sys/vm/uma_int.h#12 integrate .. //depot/projects/hammer/sys/vm/vm_contig.c#23 integrate .. //depot/projects/hammer/sys/vm/vm_glue.c#37 integrate .. //depot/projects/hammer/tools/lib32/README#2 integrate .. //depot/projects/hammer/tools/lib32/build32.sh#7 delete .. //depot/projects/hammer/tools/regression/lib/libc/locale/Makefile#6 integrate .. //depot/projects/hammer/tools/regression/lib/libc/locale/test-sgetrune.c#3 delete .. //depot/projects/hammer/tools/regression/lib/libc/locale/test-sgetrune.t#2 delete .. //depot/projects/hammer/tools/regression/lib/libc/locale/test-sputrune.c#3 delete .. //depot/projects/hammer/tools/regression/lib/libc/locale/test-sputrune.t#2 delete .. //depot/projects/hammer/tools/regression/usr.bin/make/Makefile#11 integrate .. //depot/projects/hammer/tools/regression/usr.bin/make/regress.shell_2B.out#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/regress.shell_2j.out#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/shell_test#1 branch .. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.australia#5 integrate .. //depot/projects/hammer/usr.bin/gcore/Makefile#3 integrate .. //depot/projects/hammer/usr.bin/gcore/aoutcore.c#4 delete .. //depot/projects/hammer/usr.bin/ktrace/subr.c#3 integrate .. //depot/projects/hammer/usr.bin/make/Makefile#9 integrate .. //depot/projects/hammer/usr.bin/make/job.c#13 integrate .. //depot/projects/hammer/usr.bin/make/list.h#3 delete .. //depot/projects/hammer/usr.bin/make/lst.lib/lstAppend.c#3 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstAtEnd.c#3 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstAtFront.c#3 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstClose.c#3 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstConcat.c#3 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstDatum.c#3 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstDeQueue.c#3 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstDestroy.c#3 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstDupl.c#3 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstEnQueue.c#3 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstFind.c#3 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstFindFrom.c#3 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstFirst.c#3 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstForEach.c#3 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstForEachFrom.c#3 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstInit.c#3 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstInsert.c#3 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstIsAtEnd.c#3 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstIsEmpty.c#3 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstMember.c#3 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstNext.c#3 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstOpen.c#3 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstRemove.c#3 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstReplace.c#3 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstSucc.c#3 integrate .. //depot/projects/hammer/usr.bin/make/main.c#19 integrate .. //depot/projects/hammer/usr.bin/ncal/Makefile#3 integrate .. //depot/projects/hammer/usr.bin/ncal/ncal.1#4 integrate .. //depot/projects/hammer/usr.bin/ncal/ncal.c#3 integrate .. //depot/projects/hammer/usr.sbin/acpi/acpiconf/acpiconf.c#10 integrate .. //depot/projects/hammer/usr.sbin/ngctl/main.c#6 integrate .. //depot/projects/hammer/usr.sbin/pstat/pstat.c#11 integrate Differences ... ==== //depot/projects/hammer/Makefile.inc1#77 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.456 2004/11/15 05:59:10 peter Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.458 2004/11/23 09:09:47 ru Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -393,6 +393,12 @@ mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \ -p ${LIB32TMP}/usr/include >/dev/null ln -sf ${.CURDIR}/sys ${WORLDTMP} +.if !defined(NO_KERBEROS) && !defined(NOCRYPT) && !defined(NO_OPENSSL) +.for _t in obj depend all + cd ${.CURDIR}/kerberos5/tools; \ + MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} ${_t} +.endfor +.endif .for _t in obj includes cd ${.CURDIR}/include; \ ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t} @@ -413,12 +419,6 @@ cd ${.CURDIR}/${_dir}; \ MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} build-tools .endfor -.if !defined(NO_KERBEROS) && !defined(NOCRYPT) && !defined(NO_OPENSSL) -.for _t in obj depend all - cd ${.CURDIR}/kerberos5/tools; \ - MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} ${_t} -.endfor -.endif cd ${.CURDIR}; \ ${LIB32MAKE} -f Makefile.inc1 DESTDIR=${LIB32TMP} libraries .for _t in obj depend all @@ -684,7 +684,7 @@ # XXX - Gratuitously builds aicasm in the ``makeoptions NO_MODULES'' case. .if !defined(MODULES_WITH_WORLD) && !defined(NO_MODULES) && exists(${KERNSRCDIR}/modules) .for target in obj depend all - cd ${.CURDIR}/sys/modules/aic7xxx/aicasm; \ + cd ${KERNSRCDIR}/modules/aic7xxx/aicasm; \ MAKEOBJDIRPREFIX=${KRNLOBJDIR}/${_kernel}/modules \ ${MAKE} -DNO_CPU_CFLAGS ${target} .endfor ==== //depot/projects/hammer/etc/defaults/periodic.conf#11 (text+ko) ==== @@ -10,7 +10,7 @@ # values set in this file. This eases the upgrade path when defaults # are changed and new features are added. # -# $FreeBSD: src/etc/defaults/periodic.conf,v 1.30 2004/09/23 02:00:51 jkoshy Exp $ +# $FreeBSD: src/etc/defaults/periodic.conf,v 1.31 2004/11/24 18:41:53 mlaier Exp $ # # What files override these defaults ? @@ -150,6 +150,9 @@ # 510.ipfdenied daily_status_security_ipfdenied_enable="YES" +# 520.pfdenied +daily_status_security_pfdenied_enable="YES" + # 550.ipfwlimit daily_status_security_ipfwlimit_enable="YES" ==== //depot/projects/hammer/etc/defaults/rc.conf#43 (text+ko) ==== @@ -13,7 +13,7 @@ # # All arguments must be in double or single quotes. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.231 2004/11/09 21:33:18 keramida Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.232 2004/11/23 20:09:58 mux Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -497,7 +497,9 @@ #jail_example_devfs_enable="NO" # mount devfs in the jail #jail_example_fdescfs_enable="NO" # mount fdescfs in the jail #jail_example_procfs_enable="NO" # mount procfs in jail +#jail_example_mount_enable="NO" # mount/umount jail's fs #jail_example_devfs_ruleset="ruleset_name" # devfs ruleset to apply to jail +#jail_example_fstab="" # fstab(5) for mount/umount ############################################################## ### Define source_rc_confs, the mechanism used by /etc/rc.* ## ==== //depot/projects/hammer/etc/periodic/security/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/periodic/security/Makefile,v 1.3 2002/10/25 15:23:26 thomas Exp $ +# $FreeBSD: src/etc/periodic/security/Makefile,v 1.4 2004/11/24 18:41:53 mlaier Exp $ FILES= 100.chksetuid \ 200.chkmounts \ @@ -6,6 +6,7 @@ 400.passwdless \ 500.ipfwdenied \ 510.ipfdenied \ + 520.pfdenied \ 550.ipfwlimit \ 600.ip6fwdenied \ 650.ip6fwlimit \ ==== //depot/projects/hammer/etc/rc.d/jail#11 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/jail,v 1.17 2004/10/07 13:55:26 mtm Exp $ +# $FreeBSD: src/etc/rc.d/jail,v 1.19 2004/11/24 10:44:39 mux Exp $ # # PROVIDE: jail @@ -45,11 +45,18 @@ eval jail_procfs=\"\$jail_${_j}_procfs_enable\" [ -z "${jail_procfs}" ] && jail_procfs="NO" + eval jail_mount=\"\$jail_${_j}_mount_enable\" + [ -z "${jail_mount}" ] && jail_mount="NO" + # "/etc/fstab.${_j}" will be used for {,u}mount(8) if none is specified. + eval jail_fstab=\"\$jail_${_j}_fstab\" + [ -z "${jail_fstab}" ] && jail_fstab="/etc/fstab.${_j}" + # Debugging aid # debug "$_j devfs enable: $jail_devfs" debug "$_j fdescfs enable: $jail_fdescfs" debug "$_j procfs enable: $jail_procfs" + debug "$_j mount enable: $jail_mount" debug "$_j hostname: $jail_hostname" debug "$_j ip: $jail_ip" debug "$_j root: $jail_rootdir" @@ -57,6 +64,7 @@ debug "$_j fdescdir: $jail_fdescdir" debug "$_j procdir: $jail_procdir" debug "$_j ruleset: $jail_ruleset" + debug "$_j fstab: $jail_fstab" } # set_sysctl rc_knob mib msg @@ -108,6 +116,10 @@ umount -f ${jail_procdir} >/dev/null 2>&1 fi fi + if checkyesno jail_mount; then + [ -f "${jail_fstab}" ] || warn "${jail_fstab} does not exist" + umount -a -F "${jail_fstab}" >/dev/null 2>&1 + fi } jail_start() @@ -127,6 +139,13 @@ for _jail in ${jail_list} do init_variables $_jail + if checkyesno jail_mount; then + info "Mounting fstab for jail ${_jail} (${jail_fstab})" + if [ ! -f "${jail_fstab}" ]; then + err 3 "$name: ${jail_fstab} does not exist" + fi + mount -a -F "${jail_fstab}" + fi if checkyesno jail_devfs; then info "Mounting devfs on ${jail_devdir}" devfs_mount_jail "${jail_devdir}" ${jail_ruleset} ==== //depot/projects/hammer/games/fortune/datfiles/fortunes#31 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.146 2004/10/27 20:28:56 wilko Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.147 2004/11/27 08:28:58 dds Exp $ % -- Gifts for Children -- @@ -1063,6 +1063,10 @@ If you're wearing a shirt that's red. -- Doris Robin and Karen Trimble of The L.A. Filkharmonics % +The Ken Thompson school of thought on expert systems: +there's table lookup, fraud, and grand fraud. + -- Andrew Hume +% THE LESSER-KNOWN PROGRAMMING LANGUAGES #10: SIMPLE SIMPLE is an acronym for Sheer Idiot's Monopurpose Programming Language ==== //depot/projects/hammer/gnu/usr.bin/gdb/kgdb/kgdb.1#2 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/gnu/usr.bin/gdb/kgdb/kgdb.1,v 1.2 2004/08/15 02:39:20 marcel Exp $ +.\" $FreeBSD: src/gnu/usr.bin/gdb/kgdb/kgdb.1,v 1.4 2004/11/22 16:07:28 joerg Exp $ .Dd August 1, 2004 .Os .Dt KGDB 1 @@ -31,16 +31,83 @@ .Nd The kernel debugger .Sh SYNOPSIS .Nm -.Op Ar -v -.Op Ar -d crashdir -.Op Ar -c core | -n dumpnr | -r device -.Op Ar kernel [ Ar core ] +.Op Fl a +.Op Fl v +.Op Fl d Ar crashdir +.Op Fl c Ar core | Fl n Ar dumpnr | Fl r Ar device +.Op Ar kernel Op Ar core .Sh DESCRIPTION The .Nm utility is a debugger based on .Xr gdb 1 that allows debugging of kernel core files. +.Pp +The options are as follows: +.Bl -tag -width ".Fl d Ar crashdir" +.It Fl a +Increase the annotation level. +An annotation level of 1 features the historical +.Fl fullname +option of +.Xr gdb 1 . +This is useful when running +.Nm +in Emacs. +.Fl v +Increase verbosity. +.It Fl d Ar crashdir +Use +.Ar crashdir +instead of the default, +.Pa /var/crash +to locate kernel core dump files in. +The name +.Pa vmcore. +plus the dump number will be appended to determine +the actual dump file name. +.It Fl c Ar core +Explicitly use +.Ar core +as the core dump file. +.It Fl n Ar dumpnr +Use the kernel core dump file numbered +.Ar dumpnr +for debugging. +.It Fl r Ar device +Use +.Ar device +to connect +.Nm +to for a remote debugging session. +.El +.Pp +The +.Fl c , +.Fl n , +and +.Fl r +options are mutually exclusive. +.Pp +Optionally, the name of the kernel symbol file and +the name of the core dump file can be supplied on the +command-line as positional arguments. +If no kernel symbol file name has been given, the +symbol file of the currently running kernel will be +used. +If no core dump file has been specified through either +of the options or the last command-line argument, +.Pa /dev/mem +will be opened to allow debugging the currenlty running +kernel. +.Sh FILES +.Bl -tag -width "Pa /var/crash" +.It Pa /dev/mem +Default memory image to open if no core dump file +has been specified. +.It Pa /var/crash +Default directory to locate kernel core dump files. +.El .Sh SEE ALSO .Xr gdb 1 .Sh HISTORY ==== //depot/projects/hammer/gnu/usr.bin/gdb/kgdb/main.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/main.c,v 1.3 2004/09/03 07:11:42 brooks Exp $"); +__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/main.c,v 1.4 2004/11/22 16:08:19 joerg Exp $"); #include #include @@ -80,7 +80,7 @@ { fprintf(stderr, - "usage: %s [-v] [-d crashdir] [-c core | -n dumpnr | -r device]\n" + "usage: %s [-a] [-v] [-d crashdir] [-c core | -n dumpnr | -r device]\n" "\t[kernel [core]]\n", getprogname()); exit(1); } @@ -218,8 +218,11 @@ if (s != NULL) strlcpy(crashdir, s, sizeof(crashdir)); - while ((ch = getopt(argc, argv, "c:d:n:r:v")) != -1) { + while ((ch = getopt(argc, argv, "ac:d:n:r:v")) != -1) { switch (ch) { + case 'a': + annotation_level++; + break; case 'c': /* use given core file. */ if (vmcore != NULL) { warnx("option %c: can only be specified once", ==== //depot/projects/hammer/lib/libc/alpha/gen/divrem.m4#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: divrem.m4,v 1.7 1996/10/17 03:08:04 cgd Exp $ */ -/* $FreeBSD: src/lib/libc/alpha/gen/divrem.m4,v 1.3 2000/05/10 19:04:57 obrien Exp $ */ +/* $FreeBSD: src/lib/libc/alpha/gen/divrem.m4,v 1.4 2004/11/27 20:59:49 peadar Exp $ */ /* * Copyright (c) 1994, 1995 Carnegie-Mellon University. @@ -172,7 +172,7 @@ ifelse(S, `true', ` /* Check to see if we should negate it. */ - subqv zero, RESULT, T_0 + subq zero, RESULT, T_0 cmovlbs NEG, T_0, RESULT ') ==== //depot/projects/hammer/lib/libc/regex/engine.c#4 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/regex/engine.c,v 1.14 2004/07/12 07:35:59 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/regex/engine.c,v 1.15 2004/11/21 03:14:32 tjr Exp $"); /* * The matching engine and friends. This file is #included by regexec.c @@ -331,7 +331,7 @@ NOTE("false alarm"); /* recycle starting later */ start = m->coldp + XMBRTOWC(NULL, m->coldp, - m->endp - m->coldp, &m->mbs, 0); + stop - m->coldp, &m->mbs, 0); assert(start <= stop); } @@ -807,7 +807,7 @@ if (p == m->endp) c = OUT; else - clen = XMBRTOWC(&c, p, m->endp - p, &m->mbs, BADCHAR); + clen = XMBRTOWC(&c, p, stop - p, &m->mbs, BADCHAR); if (EQ(st, fresh)) coldp = p; @@ -861,7 +861,7 @@ assert(coldp != NULL); m->coldp = coldp; if (ISSET(st, stopst)) - return(p+XMBRTOWC(NULL, p, m->endp - p, &m->mbs, 0)); + return(p+XMBRTOWC(NULL, p, stop - p, &m->mbs, 0)); else return(NULL); } @@ -913,7 +913,7 @@ c = OUT; clen = 0; } else - clen = XMBRTOWC(&c, p, m->endp - p, &m->mbs, BADCHAR); + clen = XMBRTOWC(&c, p, stop - p, &m->mbs, BADCHAR); /* is there an EOL and/or BOL between lastc and c? */ flagch = '\0'; ==== //depot/projects/hammer/lib/libc_r/uthread/pthread_private.h#12 (text+ko) ==== @@ -31,7 +31,7 @@ * * Private thread definitions for the uthread kernel. * - * $FreeBSD: src/lib/libc_r/uthread/pthread_private.h,v 1.82 2004/01/22 19:15:08 deischen Exp $ + * $FreeBSD: src/lib/libc_r/uthread/pthread_private.h,v 1.83 2004/11/27 06:51:31 das Exp $ */ #ifndef _PTHREAD_PRIVATE_H @@ -52,6 +52,7 @@ #include #include #include +#include #include #include #include @@ -60,6 +61,10 @@ #include #include #include +#include +#include +#include +#include /* * Define machine dependent macros to get and set the stack pointer ==== //depot/projects/hammer/lib/libc_r/uthread/uthread_init.c#7 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc_r/uthread/uthread_init.c,v 1.46 2003/12/03 06:54:40 peter Exp $ + * $FreeBSD: src/lib/libc_r/uthread/uthread_init.c,v 1.47 2004/11/27 06:51:31 das Exp $ */ /* Allocate space for global thread variables here: */ @@ -49,7 +49,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/hammer/lib/libc_r/uthread/uthread_jmp.c#2 (text+ko) ==== @@ -28,13 +28,12 @@ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libc_r/uthread/uthread_jmp.c,v 1.9 2001/10/10 17:48:43 bde Exp $ + * $FreeBSD: src/lib/libc_r/uthread/uthread_jmp.c,v 1.10 2004/11/27 06:51:31 das Exp $ */ #include #include #include -#include #include #include #include "pthread_private.h" ==== //depot/projects/hammer/lib/libc_r/uthread/uthread_stack.c#3 (text+ko) ==== @@ -24,14 +24,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc_r/uthread/uthread_stack.c,v 1.5 2002/11/13 18:13:26 deischen Exp $ + * $FreeBSD: src/lib/libc_r/uthread/uthread_stack.c,v 1.6 2004/11/27 06:51:31 das Exp $ */ #include "namespace.h" #include #include #include #include -#include #include #include #include "un-namespace.h" ==== //depot/projects/hammer/lib/libthr/thread/thr_init.c#13 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/thread/thr_init.c,v 1.17 2004/06/27 10:01:35 mtm Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_init.c,v 1.18 2004/11/27 06:51:31 das Exp $ */ /* Allocate space for global thread variables here: */ @@ -49,7 +49,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/hammer/lib/libthr/thread/thr_private.h#21 (text+ko) ==== @@ -31,7 +31,7 @@ * * Private thread definitions for the uthread kernel. * - * $FreeBSD: src/lib/libthr/thread/thr_private.h,v 1.41 2004/09/16 13:55:46 mtm Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_private.h,v 1.42 2004/11/27 06:51:31 das Exp $ */ #ifndef _THR_PRIVATE_H @@ -54,6 +54,7 @@ #include #include #include +#include #include #include #include @@ -69,6 +70,10 @@ #include #include #include +#include +#include +#include +#include #if defined(_PTHREADS_INVARIANTS) /* ==== //depot/projects/hammer/lib/libthr/thread/thr_stack.c#3 (text+ko) ==== @@ -24,13 +24,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/thread/thr_stack.c,v 1.3 2003/05/26 00:37:07 mtm Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_stack.c,v 1.4 2004/11/27 06:51:31 das Exp $ */ #include #include #include #include -#include #include #include #include "thr_private.h" ==== //depot/projects/hammer/libexec/ftpd/ftpd.c#22 (text+ko) ==== @@ -46,7 +46,7 @@ #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/libexec/ftpd/ftpd.c,v 1.192 2004/11/18 14:15:32 yar Exp $"); +__FBSDID("$FreeBSD: src/libexec/ftpd/ftpd.c,v 1.197 2004/11/22 11:10:04 yar Exp $"); /* * FTP server. @@ -174,7 +174,7 @@ } *thishost, *firsthost; #endif -char remotehost[MAXHOSTNAMELEN]; +char remotehost[NI_MAXHOST]; char *ident = NULL; static char ttyline[20]; @@ -597,7 +597,8 @@ #ifndef VIRTUAL_HOSTING if ((hostname = malloc(MAXHOSTNAMELEN)) == NULL) fatalerror("Ran out of memory."); - (void) gethostname(hostname, MAXHOSTNAMELEN - 1); + if (gethostname(hostname, MAXHOSTNAMELEN - 1) < 0) + hostname[0] = '\0'; hostname[MAXHOSTNAMELEN - 1] = '\0'; #endif if (hostinfo) @@ -648,7 +649,7 @@ */ if ((hostname = malloc(MAXHOSTNAMELEN)) == NULL) fatalerror("Ran out of memory."); - if (gethostname(hostname, MAXHOSTNAMELEN) < 0) + if (gethostname(hostname, MAXHOSTNAMELEN - 1) < 0) hostname[0] = '\0'; hostname[MAXHOSTNAMELEN - 1] = '\0'; if ((hrp = malloc(sizeof(struct ftphost))) == NULL) @@ -865,7 +866,7 @@ for (hi = hrp->hostinfo; hi != NULL; hi = hi->ai_next) { if (memcmp(su, hi->ai_addr, hi->ai_addrlen) == 0) { thishost = hrp; - break; + goto found; } #ifdef INET6 /* XXX IPv4 mapped IPv6 addr consideraton */ @@ -874,12 +875,13 @@ &((struct sockaddr_in *)hi->ai_addr)->sin_addr, sizeof(struct in_addr)) == 0)) { thishost = hrp; - break; + goto found; } #endif } hrp = hrp->next; } +found: su->su_port = port; /* setup static variables as appropriate */ hostname = thishost->hostname; @@ -1296,13 +1298,9 @@ if (rval == 0) { e = pam_acct_mgmt(pamh, 0); - if (e == PAM_NEW_AUTHTOK_REQD) { - e = pam_chauthtok(pamh, PAM_CHANGE_EXPIRED_AUTHTOK); - if (e != PAM_SUCCESS) { - syslog(LOG_ERR, "pam_chauthtok: %s", pam_strerror(pamh, e)); - rval = 1; - } - } else if (e != PAM_SUCCESS) { + if (e != PAM_SUCCESS) { + syslog(LOG_ERR, "pam_acct_mgmt: %s", + pam_strerror(pamh, e)); rval = 1; } } @@ -1397,11 +1395,12 @@ (void) umask(defumask); #ifdef LOGIN_CAP if ((lc = login_getpwclass(pw)) != NULL) { - char remote_ip[MAXHOSTNAMELEN]; + char remote_ip[NI_MAXHOST]; - getnameinfo((struct sockaddr *)&his_addr, his_addr.su_len, + if (getnameinfo((struct sockaddr *)&his_addr, his_addr.su_len, remote_ip, sizeof(remote_ip) - 1, NULL, 0, - NI_NUMERICHOST); + NI_NUMERICHOST)) + *remote_ip = 0; remote_ip[sizeof(remote_ip) - 1] = 0; if (!auth_hostok(lc, remotehost, remote_ip)) { syslog(LOG_INFO|LOG_AUTH, @@ -1587,6 +1586,8 @@ syslog(LOG_INFO, "FTP LOGIN FROM %s as %s", remotehost, pw->pw_name); } + if (guest || dochroot) + syslog(LOG_INFO, "session root changed to %s", chrootdir); #ifdef LOGIN_CAP login_close(lc); #endif @@ -1931,11 +1932,16 @@ do { file = getdatasock(mode); if (file == NULL) { - char hostbuf[BUFSIZ], portbuf[BUFSIZ]; - getnameinfo((struct sockaddr *)&data_source, - data_source.su_len, hostbuf, sizeof(hostbuf) - 1, - portbuf, sizeof(portbuf), - NI_NUMERICHOST|NI_NUMERICSERV); + char hostbuf[NI_MAXHOST], portbuf[NI_MAXSERV]; + + if (getnameinfo((struct sockaddr *)&data_source, + data_source.su_len, + hostbuf, sizeof(hostbuf) - 1, + portbuf, sizeof(portbuf) - 1, + NI_NUMERICHOST|NI_NUMERICSERV)) + *hostbuf = *portbuf = 0; + hostbuf[sizeof(hostbuf) - 1] = 0; + portbuf[sizeof(portbuf) - 1] = 0; reply(425, "Can't create data socket (%s,%s): %s.", hostbuf, portbuf, strerror(errno)); return (NULL); @@ -2257,6 +2263,7 @@ printf(" Connected to %s", remotehost); if (!getnameinfo((struct sockaddr *)&his_addr, his_addr.su_len, hname, sizeof(hname) - 1, NULL, 0, NI_NUMERICHOST)) { + hname[sizeof(hname) - 1] = 0; if (strcmp(hname, remotehost) != 0) printf(" (%s)", hname); } @@ -2362,6 +2369,7 @@ if (!getnameinfo((struct sockaddr *)&tmp, tmp.su_len, hname, sizeof(hname) - 1, NULL, 0, NI_NUMERICHOST)) { + hname[sizeof(hname) - 1] = 0; printf(" %s |%d|%s|%d|\r\n", ispassive ? "EPSV" : "EPRT", af, hname, htons(tmp.su_port)); @@ -2568,9 +2576,14 @@ static void dolog(struct sockaddr *who) { - int error; + char who_name[NI_MAXHOST]; realhostname_sa(remotehost, sizeof(remotehost) - 1, who, who->sa_len); + remotehost[sizeof(remotehost) - 1] = 0; + if (getnameinfo(who, who->sa_len, + who_name, sizeof(who_name) - 1, NULL, 0, NI_NUMERICHOST)) + *who_name = 0; + who_name[sizeof(who_name) - 1] = 0; #ifdef SETPROCTITLE #ifdef VIRTUAL_HOSTING @@ -2587,19 +2600,12 @@ if (logging) { #ifdef VIRTUAL_HOSTING if (thishost != firsthost) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Nov 28 02:20:06 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9E8AB16A4D0; Sun, 28 Nov 2004 02:20:05 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7B72116A4CE for ; Sun, 28 Nov 2004 02:20:05 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6744A43D2D for ; Sun, 28 Nov 2004 02:20:05 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iAS2K5QM068650 for ; Sun, 28 Nov 2004 02:20:05 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iAS2K57U068647 for perforce@freebsd.org; Sun, 28 Nov 2004 02:20:05 GMT (envelope-from peter@freebsd.org) Date: Sun, 28 Nov 2004 02:20:05 GMT Message-Id: <200411280220.iAS2K57U068647@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 65960 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Nov 2004 02:20:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=65960 Change 65960 by peter@peter_overcee on 2004/11/28 02:19:54 integ i386_hammer branch, just a metadata sync. Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/busdma_machdep.c#26 integrate .. //depot/projects/hammer/sys/amd64/amd64/fpu.c#23 integrate .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#109 integrate .. //depot/projects/hammer/sys/amd64/amd64/sys_machdep.c#15 integrate .. //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#54 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/busdma_machdep.c#26 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/fpu.c#23 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#109 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/sys_machdep.c#15 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#54 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Sun Nov 28 04:07:21 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BF03216A4D1; Sun, 28 Nov 2004 04:07:16 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EEABC16A4CF for ; Sun, 28 Nov 2004 04:07:14 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6D84A43D45 for ; Sun, 28 Nov 2004 04:07:14 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iAS47EVN072084 for ; Sun, 28 Nov 2004 04:07:14 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iAS47E1j072081 for perforce@freebsd.org; Sun, 28 Nov 2004 04:07:14 GMT (envelope-from marcel@freebsd.org) Date: Sun, 28 Nov 2004 04:07:14 GMT Message-Id: <200411280407.iAS47E1j072081@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 65962 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Nov 2004 04:07:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=65962 Change 65962 by marcel@marcel_nfs on 2004/11/28 04:07:12 Add IA64_KERNELBASE. This is the virtual address at which the kernel is linked. Affected files ... .. //depot/projects/ia64/sys/ia64/include/vmparam.h#12 edit Differences ... ==== //depot/projects/ia64/sys/ia64/include/vmparam.h#12 (text+ko) ==== @@ -141,6 +141,7 @@ #define IA64_ID_PAGE_MASK (IA64_ID_PAGE_SIZE-1) #define IA64_BACKINGSTORE IA64_RR_BASE(4) +#define IA64_KERNELBASE 0xbffc000000000000 /* * Mach derived constants From owner-p4-projects@FreeBSD.ORG Sun Nov 28 04:10:20 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C031216A4D6; Sun, 28 Nov 2004 04:10:19 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BD1F916A4D0 for ; Sun, 28 Nov 2004 04:10:18 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9826643D5C for ; Sun, 28 Nov 2004 04:10:18 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iAS4AIgL072129 for ; Sun, 28 Nov 2004 04:10:18 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iAS4AIpo072126 for perforce@freebsd.org; Sun, 28 Nov 2004 04:10:18 GMT (envelope-from marcel@freebsd.org) Date: Sun, 28 Nov 2004 04:10:18 GMT Message-Id: <200411280410.iAS4AIpo072126@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 65963 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Nov 2004 04:10:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=65963 Change 65963 by marcel@marcel_nfs on 2004/11/28 04:09:25 Link the kernel at 0xbffc000000000000. This particular address because it's the lowest address above the virtual address gap when only 51 virtual address bits are implemented. Affected files ... .. //depot/projects/ia64/sys/conf/ldscript.ia64#12 edit Differences ... ==== //depot/projects/ia64/sys/conf/ldscript.ia64#12 (text+ko) ==== @@ -3,7 +3,7 @@ OUTPUT_ARCH(ia64) ENTRY(__start) SEARCH_DIR(/usr/lib); -kernel_text = 0xe000000004000000; +kernel_text = 0xbffc000000000000; SECTIONS { /* Read-only sections, merged into text segment: */ From owner-p4-projects@FreeBSD.ORG Sun Nov 28 04:12:23 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1761C16A4CF; Sun, 28 Nov 2004 04:12:22 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AFC4916A4CF for ; Sun, 28 Nov 2004 04:12:21 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8CF9D43D4C for ; Sun, 28 Nov 2004 04:12:21 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iAS4CLnk072232 for ; Sun, 28 Nov 2004 04:12:21 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iAS4CLR1072229 for perforce@freebsd.org; Sun, 28 Nov 2004 04:12:21 GMT (envelope-from marcel@freebsd.org) Date: Sun, 28 Nov 2004 04:12:21 GMT Message-Id: <200411280412.iAS4CLR1072229@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 65964 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Nov 2004 04:12:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=65964 Change 65964 by marcel@marcel_nfs on 2004/11/28 04:12:11 Load kernels linked at IA64_KERNELBASE. We don't need any fancy VA to PA mapping here, but we do need to build the page table that we need to pass on to the kernel. Affected files ... .. //depot/projects/ia64/sys/boot/ia64/ski/copy.c#2 edit Differences ... ==== //depot/projects/ia64/sys/boot/ia64/ski/copy.c#2 (text+ko) ==== @@ -1,58 +1,87 @@ -/*- - * Copyright (c) 1998 Michael Smith +/* + * Copyright (c) 2004 Marcel Moolenaar * 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. * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR 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. */ #include -__FBSDID("$FreeBSD: src/sys/boot/ia64/ski/copy.c,v 1.4 2004/09/24 03:53:50 marcel Exp $"); +__FBSDID("$FreeBSD$"); -/* - * MD primitives supporting placement of module data - * - * XXX should check load address/size against memory top. - */ #include -#include #include +#define PHYS_START (4L*1024*1024*1024) +#define PHYS_SIZE (64L*1024*1024 - 4L*1024) + +uint64_t *pgtbl = (uint64_t *)(PHYS_START + PHYS_SIZE); + +static void * +va2pa(uint64_t va) +{ + void *pa; + + /* Backward compatibility. */ + if (va > IA64_RR_BASE(7)) + return ((void *)IA64_RR_MASK(va)); + + if (va < IA64_KERNELBASE) { + printf("\n%s: %lx: invalid loader virtual address\n", + __func__, va); + exit(1); + } + + if (va >= IA64_KERNELBASE + PHYS_SIZE) { + printf("\n%s: %lx: loader virtual address out of bounds\n", + __func__, va); + exit(1); + } + + va -= IA64_KERNELBASE; + pa = (void *)(va + PHYS_START); + pgtbl[va >> 20] = (va & ~((1 << 20) - 1)) + PHYS_START; + return (pa); +} + int -ski_copyin(void *src, vm_offset_t dest, size_t len) +ski_copyin(void *src, vm_offset_t va, size_t len) { - bcopy(src, (void*) IA64_RR_MASK(dest), len); + + bcopy(src, va2pa(va), len); return (len); } int -ski_copyout(vm_offset_t src, void *dest, size_t len) +ski_copyout(vm_offset_t va, void *dst, size_t len) { - bcopy((void*) IA64_RR_MASK(src), dest, len); + + bcopy(va2pa(va), dst, len); return (len); } int -ski_readin(int fd, vm_offset_t dest, size_t len) +ski_readin(int fd, vm_offset_t va, size_t len) { - return (read(fd, (void*) IA64_RR_MASK(dest), len)); + + return (read(fd, va2pa(va), len)); } From owner-p4-projects@FreeBSD.ORG Sun Nov 28 04:37:54 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A48AB16A4D1; Sun, 28 Nov 2004 04:37:53 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4E58316A4CF for ; Sun, 28 Nov 2004 04:37:53 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1D5A243D2F for ; Sun, 28 Nov 2004 04:37:53 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iAS4braK073053 for ; Sun, 28 Nov 2004 04:37:53 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iAS4bqor073050 for perforce@freebsd.org; Sun, 28 Nov 2004 04:37:52 GMT (envelope-from marcel@freebsd.org) Date: Sun, 28 Nov 2004 04:37:52 GMT Message-Id: <200411280437.iAS4bqor073050@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 65966 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Nov 2004 04:37:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=65966 Change 65966 by marcel@marcel_nfs on 2004/11/28 04:37:15 IFC @65965 Affected files ... .. //depot/projects/ia64/sys/ia64/include/bootinfo.h#8 integrate Differences ... ==== //depot/projects/ia64/sys/ia64/include/bootinfo.h#8 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/ia64/include/bootinfo.h,v 1.6 2002/12/08 20:32:56 marcel Exp $ */ +/* $FreeBSD: src/sys/ia64/include/bootinfo.h,v 1.7 2004/11/28 04:34:17 marcel Exp $ */ /* * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University. * All rights reserved. @@ -26,40 +26,25 @@ * rights to redistribute these changes. */ -/* - * The boot program passes a pointer (in the boot environment virtual - * address address space; "BEVA") to a bootinfo to the kernel using - * the following convention: - * - * a0 contains first free page frame number - * a1 contains page number of current level 1 page table - * if a2 contains BOOTINFO_MAGIC and a4 is nonzero: - * a3 contains pointer (BEVA) to bootinfo - * a4 contains bootinfo version number - * if a2 contains BOOTINFO_MAGIC and a4 contains 0 (backward compat): - * a3 contains pointer (BEVA) to bootinfo version - * (u_long), then the bootinfo - */ - -#define BOOTINFO_MAGIC 0xdeadbeeffeedface - struct bootinfo { - u_int64_t bi_magic; /* BOOTINFO_MAGIC */ - u_int64_t bi_version; /* version 1 */ - u_int64_t bi_spare[6]; /* was: name of booted kernel */ - u_int64_t bi_hcdp; /* DIG64 HCDP table */ - u_int64_t bi_fpswa; /* FPSWA interface */ - u_int64_t bi_boothowto; /* value for boothowto */ - u_int64_t bi_systab; /* pa of EFI system table */ - u_int64_t bi_memmap; /* pa of EFI memory map */ - u_int64_t bi_memmap_size; /* size of EFI memory map */ - u_int64_t bi_memdesc_size; /* sizeof EFI memory desc */ - u_int32_t bi_memdesc_version; /* EFI memory desc version */ - u_int64_t bi_symtab; /* start of kernel sym table */ - u_int64_t bi_esymtab; /* end of kernel sym table */ - u_int64_t bi_kernend; /* end of kernel space */ - u_int64_t bi_envp; /* environment */ - u_int64_t bi_modulep; /* preloaded modules */ + uint64_t bi_magic; /* BOOTINFO_MAGIC */ +#define BOOTINFO_MAGIC 0xdeadbeeffeedface + uint64_t bi_version; /* version 1 */ + uint64_t bi_spare[6]; /* was: name of booted kernel */ + uint64_t bi_hcdp; /* DIG64 HCDP table */ + uint64_t bi_fpswa; /* FPSWA interface */ + uint64_t bi_boothowto; /* value for boothowto */ + uint64_t bi_systab; /* pa of EFI system table */ + uint64_t bi_memmap; /* pa of EFI memory map */ + uint64_t bi_memmap_size; /* size of EFI memory map */ + uint64_t bi_memdesc_size; /* sizeof EFI memory desc */ + uint32_t bi_memdesc_version; /* EFI memory desc version */ + uint32_t bi_spare2; + uint64_t bi_symtab; /* start of kernel sym table */ + uint64_t bi_esymtab; /* end of kernel sym table */ + uint64_t bi_kernend; /* end of kernel space */ + uint64_t bi_envp; /* environment */ + uint64_t bi_modulep; /* preloaded modules */ }; extern struct bootinfo bootinfo; From owner-p4-projects@FreeBSD.ORG Sun Nov 28 04:43:01 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 429B916A4D1; Sun, 28 Nov 2004 04:43:00 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C4BB916A4CF for ; Sun, 28 Nov 2004 04:42:59 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B228943D45 for ; Sun, 28 Nov 2004 04:42:59 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iAS4gx99073183 for ; Sun, 28 Nov 2004 04:42:59 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iAS4gxcB073180 for perforce@freebsd.org; Sun, 28 Nov 2004 04:42:59 GMT (envelope-from marcel@freebsd.org) Date: Sun, 28 Nov 2004 04:42:59 GMT Message-Id: <200411280442.iAS4gxcB073180@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 65967 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Nov 2004 04:43:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=65967 Change 65967 by marcel@marcel_nfs on 2004/11/28 04:42:32 Pass the physical address of the loader page table and its size in bytes to the kernel. Affected files ... .. //depot/projects/ia64/sys/ia64/include/bootinfo.h#9 edit Differences ... ==== //depot/projects/ia64/sys/ia64/include/bootinfo.h#9 (text+ko) ==== @@ -30,7 +30,8 @@ uint64_t bi_magic; /* BOOTINFO_MAGIC */ #define BOOTINFO_MAGIC 0xdeadbeeffeedface uint64_t bi_version; /* version 1 */ - uint64_t bi_spare[6]; /* was: name of booted kernel */ + uint64_t bi_spare[5]; /* was: name of kernel */ + uint64_t bi_pgtbl; /* PA of loader page table */ uint64_t bi_hcdp; /* DIG64 HCDP table */ uint64_t bi_fpswa; /* FPSWA interface */ uint64_t bi_boothowto; /* value for boothowto */ @@ -39,7 +40,7 @@ uint64_t bi_memmap_size; /* size of EFI memory map */ uint64_t bi_memdesc_size; /* sizeof EFI memory desc */ uint32_t bi_memdesc_version; /* EFI memory desc version */ - uint32_t bi_spare2; + uint32_t bi_pgtblsz; /* Size of loader page table */ uint64_t bi_symtab; /* start of kernel sym table */ uint64_t bi_esymtab; /* end of kernel sym table */ uint64_t bi_kernend; /* end of kernel space */ From owner-p4-projects@FreeBSD.ORG Sun Nov 28 05:38:07 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8B3D016A525; Sun, 28 Nov 2004 05:38:07 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 437A516A51E for ; Sun, 28 Nov 2004 05:38:07 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DD30D43D54 for ; Sun, 28 Nov 2004 05:38:06 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iAS5c638081479 for ; Sun, 28 Nov 2004 05:38:06 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iAS5c6uJ081476 for perforce@freebsd.org; Sun, 28 Nov 2004 05:38:06 GMT (envelope-from marcel@freebsd.org) Date: Sun, 28 Nov 2004 05:38:06 GMT Message-Id: <200411280538.iAS5c6uJ081476@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 65969 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Nov 2004 05:38:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=65969 Change 65969 by marcel@marcel_nfs on 2004/11/28 05:37:23 Initialize pgtbl to NULL and set it to the physical address only when we do have a kernel that's not direct mapped. This allows us to determine whether we loaded an old or a new kernel. Affected files ... .. //depot/projects/ia64/sys/boot/ia64/ski/copy.c#3 edit Differences ... ==== //depot/projects/ia64/sys/boot/ia64/ski/copy.c#3 (text+ko) ==== @@ -34,7 +34,7 @@ #define PHYS_START (4L*1024*1024*1024) #define PHYS_SIZE (64L*1024*1024 - 4L*1024) -uint64_t *pgtbl = (uint64_t *)(PHYS_START + PHYS_SIZE); +uint64_t *pgtbl = NULL; static void * va2pa(uint64_t va) @@ -45,6 +45,8 @@ if (va > IA64_RR_BASE(7)) return ((void *)IA64_RR_MASK(va)); + pgtbl = (uint64_t *)(PHYS_START + PHYS_SIZE); + if (va < IA64_KERNELBASE) { printf("\n%s: %lx: invalid loader virtual address\n", __func__, va); From owner-p4-projects@FreeBSD.ORG Sun Nov 28 05:40:10 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EFDCE16A4D0; Sun, 28 Nov 2004 05:40:09 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CBDBF16A4CE for ; Sun, 28 Nov 2004 05:40:09 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BAF6743D3F for ; Sun, 28 Nov 2004 05:40:09 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iAS5e9is081518 for ; Sun, 28 Nov 2004 05:40:09 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iAS5e915081515 for perforce@freebsd.org; Sun, 28 Nov 2004 05:40:09 GMT (envelope-from marcel@freebsd.org) Date: Sun, 28 Nov 2004 05:40:09 GMT Message-Id: <200411280540.iAS5e915081515@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 65970 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Nov 2004 05:40:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=65970 Change 65970 by marcel@marcel_nfs on 2004/11/28 05:39:31 If we have a page table, pass it on to the kernel. Affected files ... .. //depot/projects/ia64/sys/boot/ia64/ski/bootinfo.c#3 edit Differences ... ==== //depot/projects/ia64/sys/boot/ia64/ski/bootinfo.c#3 (text+ko) ==== @@ -58,6 +58,8 @@ {NULL, 0} }; +extern uint64_t *pgtbl; + extern char *ski_fmtdev(void *vdev); extern int ski_init_stubs(struct bootinfo *); @@ -315,5 +317,10 @@ /* all done copying stuff in, save end of loaded object space */ bi->bi_kernend = addr; + if (pgtbl != NULL) { + bi->bi_pgtbl = (uintptr_t)pgtbl; + bi->bi_pgtblsz = 4096; + } + return (ski_init_stubs(bi)); } From owner-p4-projects@FreeBSD.ORG Sun Nov 28 11:08:47 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5BEFB16A4D0; Sun, 28 Nov 2004 11:08:47 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 18F7216A4CE for ; Sun, 28 Nov 2004 11:08:47 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EE94343D5C for ; Sun, 28 Nov 2004 11:08:46 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iASB8kgY098233 for ; Sun, 28 Nov 2004 11:08:46 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iASB8kOU098230 for perforce@freebsd.org; Sun, 28 Nov 2004 11:08:46 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 28 Nov 2004 11:08:46 GMT Message-Id: <200411281108.iASB8kOU098230@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 65975 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Nov 2004 11:08:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=65975 Change 65975 by rwatson@rwatson_paprika on 2004/11/28 11:08:38 Remove IPSEC code fragment possibly merged in error from netperf+sockets. Affected files ... .. //depot/projects/netperf_socket/sys/netinet/ip_output.c#22 edit Differences ... ==== //depot/projects/netperf_socket/sys/netinet/ip_output.c#22 (text+ko) ==== @@ -145,12 +145,6 @@ M_ASSERTPKTHDR(m); -#ifdef IPSEC - /* XXXRW: so is not defined -- merge error from netperf+sockets? */ - so = ipsec_getsocket(m); - (void)ipsec_setsocket(m, NULL); -#endif /*IPSEC*/ - if (ro == NULL) { ro = &iproute; bzero(ro, sizeof (*ro)); From owner-p4-projects@FreeBSD.ORG Sun Nov 28 11:12:54 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AC15616A4D0; Sun, 28 Nov 2004 11:12:53 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7C66C16A4CE for ; Sun, 28 Nov 2004 11:12:53 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2F4CB43D39 for ; Sun, 28 Nov 2004 11:12:53 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iASBCqu5098408 for ; Sun, 28 Nov 2004 11:12:52 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iASBCqc5098405 for perforce@freebsd.org; Sun, 28 Nov 2004 11:12:52 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 28 Nov 2004 11:12:52 GMT Message-Id: <200411281112.iASBCqc5098405@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 65977 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Nov 2004 11:12:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=65977 Change 65977 by rwatson@rwatson_paprika on 2004/11/28 11:12:10 Integrate netperf_socket from FreeBSD CVS: Loop back some TCP lock assertions from rwatson_netperf. Affected files ... .. //depot/projects/netperf_socket/sys/alpha/alpha/divrem.m4#2 integrate .. //depot/projects/netperf_socket/sys/boot/efi/include/efilib.h#2 integrate .. //depot/projects/netperf_socket/sys/boot/efi/libefi/Makefile#4 integrate .. //depot/projects/netperf_socket/sys/boot/efi/libefi/copy.c#2 integrate .. //depot/projects/netperf_socket/sys/boot/ia64/efi/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/boot/ia64/efi/efimd.c#1 branch .. //depot/projects/netperf_socket/sys/ia64/include/bootinfo.h#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_ppp.c#7 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_input.c#24 integrate Differences ... ==== //depot/projects/netperf_socket/sys/alpha/alpha/divrem.m4#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/divrem.m4,v 1.3 2000/05/01 20:17:45 peter Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/divrem.m4,v 1.4 2004/11/27 20:59:49 peadar Exp $ */ /* $NetBSD: divrem.m4,v 1.5 1996/10/17 04:26:25 cgd Exp $ */ /* @@ -172,7 +172,7 @@ ifelse(S, `true', ` /* Check to see if we should negate it. */ - subqv zero, RESULT, T_0 + subq zero, RESULT, T_0 cmovlbs NEG, T_0, RESULT ') ==== //depot/projects/netperf_socket/sys/boot/efi/include/efilib.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/efi/include/efilib.h,v 1.3 2002/12/10 20:11:19 marcel Exp $ + * $FreeBSD: src/sys/boot/efi/include/efilib.h,v 1.4 2004/11/28 00:30:22 marcel Exp $ */ extern EFI_HANDLE IH; @@ -34,5 +34,7 @@ void *efi_get_table(EFI_GUID *tbl); void efi_main(EFI_HANDLE image_handle, EFI_SYSTEM_TABLE *system_table); +EFI_PHYSICAL_ADDRESS efimd_va2pa(EFI_VIRTUAL_ADDRESS); + EFI_STATUS main(int argc, CHAR16 *argv[]); void exit(EFI_STATUS status); ==== //depot/projects/netperf_socket/sys/boot/efi/libefi/Makefile#4 (text+ko) ==== @@ -1,26 +1,26 @@ -# $FreeBSD: src/sys/boot/efi/libefi/Makefile,v 1.15 2004/10/24 15:32:49 ru Exp $ +# $FreeBSD: src/sys/boot/efi/libefi/Makefile,v 1.16 2004/11/28 00:30:22 marcel Exp $ .PATH: ${.CURDIR}/../../../${MACHINE_ARCH}/${MACHINE_ARCH} -LIB= efi +LIB= efi INTERNALLIB= -SRCS= libefi.c efi_console.c time.c copy.c devicename.c module.c -SRCS+= delay.c efifs.c efinet.c elf_freebsd.c bootinfo.c pal.S +SRCS= bootinfo.c copy.c delay.c devicename.c efi_console.c efifs.c efinet.c \ + elf_freebsd.c libefi.c module.c time.c .if ${MACHINE_ARCH} == "ia64" -SRCS+= efifpswa.c +SRCS+= efifpswa.c pal.S .endif -CFLAGS+= -I${.CURDIR}/../include -CFLAGS+= -I${.CURDIR}/../include/${MACHINE_ARCH} -CFLAGS+= -I${.CURDIR}/../../../../lib/libstand +CFLAGS+= -I${.CURDIR}/../include +CFLAGS+= -I${.CURDIR}/../include/${MACHINE_ARCH} +CFLAGS+= -I${.CURDIR}/../../../../lib/libstand # Pick up the bootstrap header for some interface items -CFLAGS+= -I${.CURDIR}/../../common +CFLAGS+= -I${.CURDIR}/../../common +# Make the disk code more talkative .if defined(BOOT_DISK_DEBUG) -# Make the disk code more talkative CFLAGS+= -DDISK_DEBUG .endif ==== //depot/projects/netperf_socket/sys/boot/efi/libefi/copy.c#2 (text+ko) ==== @@ -25,44 +25,31 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/efi/libefi/copy.c,v 1.5 2003/04/03 21:36:29 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/efi/libefi/copy.c,v 1.6 2004/11/28 00:30:22 marcel Exp $"); -/* - * MD primitives supporting placement of module data - */ -#include - #include #include -#include -#include +#include int -efi_copyin(void *src, vm_offset_t dest, size_t len) +efi_copyin(void *src, vm_offset_t va, size_t len) { - EFI_PHYSICAL_ADDRESS p = IA64_RR_MASK(dest); -#if 0 - BS->AllocatePages(AllocateAddress, EfiRuntimeServicesData, - len >> 12, &p); -#endif - bcopy(src, (void*) p, len); + + bcopy(src, (void *)efimd_va2pa(va), len); return (len); } int -efi_copyout(vm_offset_t src, void *dest, size_t len) +efi_copyout(vm_offset_t va, void *dst, size_t len) { - bcopy((void*) IA64_RR_MASK(src), dest, len); + + bcopy((void *)efimd_va2pa(va), dst, len); return (len); } int -efi_readin(int fd, vm_offset_t dest, size_t len) +efi_readin(int fd, vm_offset_t va, size_t len) { - EFI_PHYSICAL_ADDRESS p = IA64_RR_MASK(dest); -#if 0 - BS->AllocatePages(AllocateAddress, EfiRuntimeServicesData, - len >> 12, &p); -#endif - return (read(fd, (void*) p, len)); + + return (read(fd, (void *)efimd_va2pa(va), len)); } ==== //depot/projects/netperf_socket/sys/boot/ia64/efi/Makefile#2 (text+ko) ==== @@ -1,8 +1,8 @@ -# $FreeBSD: src/sys/boot/ia64/efi/Makefile,v 1.23 2004/11/23 06:02:03 marcel Exp $ +# $FreeBSD: src/sys/boot/ia64/efi/Makefile,v 1.24 2004/11/28 00:26:11 marcel Exp $ PROG= loader.sym INTERNALPROG= -SRCS= conf.c dev_net.c main.c start.S vers.c +SRCS= conf.c dev_net.c efimd.c main.c start.S vers.c NOMAN= CFLAGS+= -DLOADER @@ -47,11 +47,16 @@ sh ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version ${NEWVERSWHAT} OBJCOPY?= objcopy +OBJDUMP?= objdump loader.efi: loader.sym + if [ `${OBJDUMP} -t ${.ALLSRC} | fgrep '*UND*' | wc -l` != 0 ]; then \ + ${OBJDUMP} -t ${.ALLSRC} | fgrep '*UND*'; \ + exit 1; \ + fi ${OBJCOPY} -j .data -j .dynamic -j .dynstr -j .dynsym -j .hash \ -j .rela.dyn -j .reloc -j .sdata -j .text \ - --target=efi-app-${MACHINE_ARCH} loader.sym loader.efi + --target=efi-app-${MACHINE_ARCH} ${.ALLSRC} ${.TARGET} loader.help: help.common cat ${.ALLSRC} | awk -f ${.CURDIR}/../../common/merge_help.awk \ ==== //depot/projects/netperf_socket/sys/ia64/include/bootinfo.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/ia64/include/bootinfo.h,v 1.6 2002/12/08 20:32:56 marcel Exp $ */ +/* $FreeBSD: src/sys/ia64/include/bootinfo.h,v 1.7 2004/11/28 04:34:17 marcel Exp $ */ /* * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University. * All rights reserved. @@ -26,40 +26,25 @@ * rights to redistribute these changes. */ -/* - * The boot program passes a pointer (in the boot environment virtual - * address address space; "BEVA") to a bootinfo to the kernel using - * the following convention: - * - * a0 contains first free page frame number - * a1 contains page number of current level 1 page table - * if a2 contains BOOTINFO_MAGIC and a4 is nonzero: - * a3 contains pointer (BEVA) to bootinfo - * a4 contains bootinfo version number - * if a2 contains BOOTINFO_MAGIC and a4 contains 0 (backward compat): - * a3 contains pointer (BEVA) to bootinfo version - * (u_long), then the bootinfo - */ - -#define BOOTINFO_MAGIC 0xdeadbeeffeedface - struct bootinfo { - u_int64_t bi_magic; /* BOOTINFO_MAGIC */ - u_int64_t bi_version; /* version 1 */ - u_int64_t bi_spare[6]; /* was: name of booted kernel */ - u_int64_t bi_hcdp; /* DIG64 HCDP table */ - u_int64_t bi_fpswa; /* FPSWA interface */ - u_int64_t bi_boothowto; /* value for boothowto */ - u_int64_t bi_systab; /* pa of EFI system table */ - u_int64_t bi_memmap; /* pa of EFI memory map */ - u_int64_t bi_memmap_size; /* size of EFI memory map */ - u_int64_t bi_memdesc_size; /* sizeof EFI memory desc */ - u_int32_t bi_memdesc_version; /* EFI memory desc version */ - u_int64_t bi_symtab; /* start of kernel sym table */ - u_int64_t bi_esymtab; /* end of kernel sym table */ - u_int64_t bi_kernend; /* end of kernel space */ - u_int64_t bi_envp; /* environment */ - u_int64_t bi_modulep; /* preloaded modules */ + uint64_t bi_magic; /* BOOTINFO_MAGIC */ +#define BOOTINFO_MAGIC 0xdeadbeeffeedface + uint64_t bi_version; /* version 1 */ + uint64_t bi_spare[6]; /* was: name of booted kernel */ + uint64_t bi_hcdp; /* DIG64 HCDP table */ + uint64_t bi_fpswa; /* FPSWA interface */ + uint64_t bi_boothowto; /* value for boothowto */ + uint64_t bi_systab; /* pa of EFI system table */ + uint64_t bi_memmap; /* pa of EFI memory map */ + uint64_t bi_memmap_size; /* size of EFI memory map */ + uint64_t bi_memdesc_size; /* sizeof EFI memory desc */ + uint32_t bi_memdesc_version; /* EFI memory desc version */ + uint32_t bi_spare2; + uint64_t bi_symtab; /* start of kernel sym table */ + uint64_t bi_esymtab; /* end of kernel sym table */ + uint64_t bi_kernend; /* end of kernel space */ + uint64_t bi_envp; /* environment */ + uint64_t bi_modulep; /* preloaded modules */ }; extern struct bootinfo bootinfo; ==== //depot/projects/netperf_socket/sys/netgraph/ng_ppp.c#7 (text+ko) ==== @@ -36,7 +36,7 @@ * * Author: Archie Cobbs * - * $FreeBSD: src/sys/netgraph/ng_ppp.c,v 1.51 2004/08/03 06:34:55 bz Exp $ + * $FreeBSD: src/sys/netgraph/ng_ppp.c,v 1.52 2004/11/27 20:29:00 archie Exp $ * $Whistle: ng_ppp.c,v 1.24 1999/11/01 09:24:52 julian Exp $ */ @@ -748,7 +748,7 @@ case HOOK_INDEX_VJC_VJIP: if (priv->conf.enableCompression && priv->hooks[HOOK_INDEX_COMPRESS] != NULL) { - if ((m = ng_ppp_addproto(m, proto, 1)) == NULL) { + if ((m = ng_ppp_addproto(m, proto, 0)) == NULL) { NGI_M(item) = NULL; NG_FREE_ITEM(item); return (ENOBUFS); ==== //depot/projects/netperf_socket/sys/netinet/tcp_input.c#24 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)tcp_input.c 8.12 (Berkeley) 5/24/95 - * $FreeBSD: src/sys/netinet/tcp_input.c,v 1.259 2004/11/25 19:04:20 silby Exp $ + * $FreeBSD: src/sys/netinet/tcp_input.c,v 1.260 2004/11/28 11:01:31 rwatson Exp $ */ #include "opt_ipfw.h" /* for ipfw_fwd */ @@ -2199,9 +2199,11 @@ * soreceive. It's hard to imagine someone * actually wanting to send this much urgent data. */ + SOCKBUF_LOCK(&so->so_rcv); if (th->th_urp + so->so_rcv.sb_cc > sb_max) { th->th_urp = 0; /* XXX */ thflags &= ~TH_URG; /* XXX */ + SOCKBUF_UNLOCK(&so->so_rcv); /* XXX */ goto dodata; /* XXX */ } /* @@ -2220,15 +2222,14 @@ */ if (SEQ_GT(th->th_seq+th->th_urp, tp->rcv_up)) { tp->rcv_up = th->th_seq + th->th_urp; - SOCKBUF_LOCK(&so->so_rcv); so->so_oobmark = so->so_rcv.sb_cc + (tp->rcv_up - tp->rcv_nxt) - 1; if (so->so_oobmark == 0) so->so_rcv.sb_state |= SBS_RCVATMARK; - SOCKBUF_UNLOCK(&so->so_rcv); sohasoutofband(so); tp->t_oobflags &= ~(TCPOOB_HAVEDATA | TCPOOB_HADDATA); } + SOCKBUF_UNLOCK(&so->so_rcv); /* * Remove out of band data so doesn't get presented to user. * This can happen independent of advancing the URG pointer, From owner-p4-projects@FreeBSD.ORG Mon Nov 29 16:06:02 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8D12916A4D0; Mon, 29 Nov 2004 16:06:02 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 46A6116A4CE for ; Mon, 29 Nov 2004 16:06:02 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 36CAF43D5D for ; Mon, 29 Nov 2004 16:06:02 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iATG62H4009002 for ; Mon, 29 Nov 2004 16:06:02 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iATG61uH008999 for perforce@freebsd.org; Mon, 29 Nov 2004 16:06:01 GMT (envelope-from sam@freebsd.org) Date: Mon, 29 Nov 2004 16:06:01 GMT Message-Id: <200411291606.iATG61uH008999@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66031 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Nov 2004 16:06:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=66031 Change 66031 by sam@sam_ebb on 2004/11/29 16:05:30 don't mark a station active because we sent it a management frame Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_output.c#13 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_output.c#13 (text+ko) ==== @@ -92,7 +92,6 @@ struct ieee80211_frame *wh; KASSERT(ni != NULL, ("null node")); - ni->ni_inact = ic->ic_inact_auth; /* * Yech, hack alert! We want to pass the node down to the @@ -196,7 +195,6 @@ IEEE80211_ADDR_COPY(wh->i_addr3, ic->ic_myaddr); m->m_len = m->m_pkthdr.len = sizeof(struct ieee80211_frame); - ni->ni_inact = ic->ic_inact_auth; IEEE80211_NODE_STAT(ni, tx_data); IF_ENQUEUE(&ic->ic_mgtq, m); /* cheat */ From owner-p4-projects@FreeBSD.ORG Mon Nov 29 16:09:07 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2439616A4D0; Mon, 29 Nov 2004 16:09:07 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DF3E416A4CE for ; Mon, 29 Nov 2004 16:09:06 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B29C043D39 for ; Mon, 29 Nov 2004 16:09:06 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iATG96Ku009049 for ; Mon, 29 Nov 2004 16:09:06 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iATG96K2009046 for perforce@freebsd.org; Mon, 29 Nov 2004 16:09:06 GMT (envelope-from sam@freebsd.org) Date: Mon, 29 Nov 2004 16:09:06 GMT Message-Id: <200411291609.iATG96K2009046@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66033 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Nov 2004 16:09:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=66033 Change 66033 by sam@sam_ebb on 2004/11/29 16:08:55 simplify the size calculations of management frames; force calculations that will always fit in an mbuf (i.e. not require a cluster) to be done at compile time and leave only those that might cause a cluster to be used to be done at runtime Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_output.c#14 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_output.c#14 (text+ko) ==== @@ -938,12 +938,12 @@ * [tlv] user-specified ie's */ m = ieee80211_getmgtframe(&frm, - 2 + ic->ic_des_esslen + 2 + IEEE80211_NWID_LEN + 2 + IEEE80211_RATE_SIZE + 2 + (IEEE80211_RATE_MAXSIZE - IEEE80211_RATE_SIZE) - + ((ic->ic_flags & IEEE80211_F_WME) ? - sizeof(struct ieee80211_wme_param) : 0) - + (ic->ic_opt_ie != NULL ? ic->ic_opt_ie_len : 0)); + + sizeof(struct ieee80211_wme_param) + + (ic->ic_opt_ie != NULL ? ic->ic_opt_ie_len : 0) + ); if (m == NULL) senderr(ENOMEM, is_tx_nobuf); @@ -978,13 +978,16 @@ * [tlv] WPA */ m = ieee80211_getmgtframe(&frm, - 8 + 2 + 2 + 2 - + 2 + ni->ni_esslen + 8 + + sizeof(u_int16_t) + + sizeof(u_int16_t) + + 2 + IEEE80211_NWID_LEN + 2 + IEEE80211_RATE_SIZE - + (ic->ic_phytype == IEEE80211_T_FH ? 7 : 3) + + 7 /* max(7,3) */ + 6 - + (ic->ic_curmode == IEEE80211_MODE_11G ? 3 : 0) + + 3 + 2 + (IEEE80211_RATE_MAXSIZE - IEEE80211_RATE_SIZE) + /* XXX !WPA1+WPA2 fits w/o a cluster */ + (ic->ic_flags & IEEE80211_F_WPA ? 2*sizeof(struct ieee80211_ie_wpa) : 0) ); @@ -1064,7 +1067,8 @@ m = ieee80211_getmgtframe(&frm, 3 * sizeof(u_int16_t) + (has_challenge && status == IEEE80211_STATUS_SUCCESS ? - sizeof(u_int16_t)+IEEE80211_CHALLENGE_LEN : 0)); + sizeof(u_int16_t)+IEEE80211_CHALLENGE_LEN : 0) + ); if (m == NULL) senderr(ENOMEM, is_tx_nobuf); @@ -1147,16 +1151,15 @@ * [tlv] user-specified ie's */ m = ieee80211_getmgtframe(&frm, - sizeof(capinfo) + sizeof(u_int16_t) + sizeof(u_int16_t) + IEEE80211_ADDR_LEN - + 2 + ni->ni_esslen + + 2 + IEEE80211_NWID_LEN + 2 + IEEE80211_RATE_SIZE + 2 + (IEEE80211_RATE_MAXSIZE - IEEE80211_RATE_SIZE) - + ((ic->ic_flags & IEEE80211_F_WME) && - ni->ni_wme_ie != NULL ? - sizeof(struct ieee80211_wme_info) : 0) - + (ic->ic_opt_ie != NULL ? ic->ic_opt_ie_len : 0)); + + sizeof(struct ieee80211_wme_info) + + (ic->ic_opt_ie != NULL ? ic->ic_opt_ie_len : 0) + ); if (m == NULL) senderr(ENOMEM, is_tx_nobuf); @@ -1214,14 +1217,13 @@ * [tlv] WME (if enabled and STA enabled) */ m = ieee80211_getmgtframe(&frm, - sizeof(capinfo) + sizeof(u_int16_t) + sizeof(u_int16_t) + sizeof(u_int16_t) + 2 + IEEE80211_RATE_SIZE + 2 + (IEEE80211_RATE_MAXSIZE - IEEE80211_RATE_SIZE) - + ((ic->ic_flags & IEEE80211_F_WME) && - ni->ni_wme_ie != NULL ? - sizeof(struct ieee80211_wme_param) : 0)); + + sizeof(struct ieee80211_wme_param) + ); if (m == NULL) senderr(ENOMEM, is_tx_nobuf); From owner-p4-projects@FreeBSD.ORG Mon Nov 29 16:10:32 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4F88C16A4D8; Mon, 29 Nov 2004 16:10:32 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0D4C616A4CF for ; Mon, 29 Nov 2004 16:10:31 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 708E543D5A for ; Mon, 29 Nov 2004 16:10:08 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iATGA8kP009076 for ; Mon, 29 Nov 2004 16:10:08 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iATGA8Qn009073 for perforce@freebsd.org; Mon, 29 Nov 2004 16:10:08 GMT (envelope-from sam@freebsd.org) Date: Mon, 29 Nov 2004 16:10:08 GMT Message-Id: <200411291610.iATGA8Qn009073@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66034 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Nov 2004 16:10:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=66034 Change 66034 by sam@sam_ebb on 2004/11/29 16:09:52 only set the tx timer when sending a probe request in station mode Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_output.c#15 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_output.c#15 (text+ko) ==== @@ -960,7 +960,8 @@ m->m_pkthdr.len = m->m_len = frm - mtod(m, u_int8_t *); IEEE80211_NODE_STAT(ni, tx_probereq); - timer = IEEE80211_TRANS_WAIT; + if (ic->ic_opmode == IEEE80211_M_STA) + timer = IEEE80211_TRANS_WAIT; break; case IEEE80211_FC0_SUBTYPE_PROBE_RESP: From owner-p4-projects@FreeBSD.ORG Mon Nov 29 16:11:10 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 639A116A4D0; Mon, 29 Nov 2004 16:11:10 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3FBCD16A4CE for ; Mon, 29 Nov 2004 16:11:10 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2F74C43D55 for ; Mon, 29 Nov 2004 16:11:10 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iATGBA4F009169 for ; Mon, 29 Nov 2004 16:11:10 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iATGB9S9009166 for perforce@freebsd.org; Mon, 29 Nov 2004 16:11:09 GMT (envelope-from sam@freebsd.org) Date: Mon, 29 Nov 2004 16:11:09 GMT Message-Id: <200411291611.iATGB9S9009166@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66035 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Nov 2004 16:11:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=66035 Change 66035 by sam@sam_ebb on 2004/11/29 16:11:06 o use MINCLSIZE instead of MHLEN o minor cleanup to assert o note we need to be careful when adding 4-address support Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_freebsd.c#5 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_freebsd.c#5 (text+ko) ==== @@ -157,10 +157,11 @@ * NB: we know the mbuf routines will align the data area * so we don't need to do anything special. */ + /* XXX 4-address frame? */ len = roundup(sizeof(struct ieee80211_frame) + pktlen, 4); - KASSERT(len <= MCLBYTES, ("802.11 packet too large: %u", len)); - if (len <= MHLEN) { - MGETHDR(m, M_NOWAIT, MT_HEADER); + KASSERT(len <= MCLBYTES, ("802.11 mgt frame too large: %u", len)); + if (len < MINCLSIZE) { + m = m_gethdr(M_NOWAIT, MT_HEADER); /* * Align the data in case additional headers are added. * This should only happen when a WEP header is added From owner-p4-projects@FreeBSD.ORG Mon Nov 29 16:13:13 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 980F616A4D0; Mon, 29 Nov 2004 16:13:13 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5AED816A4CE for ; Mon, 29 Nov 2004 16:13:13 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3D70243D5A for ; Mon, 29 Nov 2004 16:13:13 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iATGDDuu009224 for ; Mon, 29 Nov 2004 16:13:13 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iATGDDjB009221 for perforce@freebsd.org; Mon, 29 Nov 2004 16:13:13 GMT (envelope-from sam@freebsd.org) Date: Mon, 29 Nov 2004 16:13:13 GMT Message-Id: <200411291613.iATGDDjB009221@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66036 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Nov 2004 16:13:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=66036 Change 66036 by sam@sam_ebb on 2004/11/29 16:12:47 o handle probe response frames in other than station mode o handle probe request frames in station mode at any time Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_input.c#19 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_input.c#19 (text+ko) ==== @@ -1803,12 +1803,10 @@ * Be careful to ignore beacons received while doing a * background scan. We consider only 11g/WMM stuff right now. */ - if (ni->ni_associd != 0 && + if (ic->ic_opmode == IEEE80211_M_STA && + ni->ni_associd != 0 && ((ic->ic_flags & IEEE80211_F_SCAN) == 0 || IEEE80211_ADDR_EQ(wh->i_addr2, ni->ni_bssid))) { - KASSERT(ic->ic_opmode == IEEE80211_M_STA, - ("beacon in %u mode with associd 0x%x?", - ic->ic_opmode, ni->ni_associd)); if (ni->ni_erp != erp) { IEEE80211_DPRINTF(ic, IEEE80211_MSG_ASSOC, "erp change from %s: was 0x%x, now 0x%x\n", @@ -1921,14 +1919,16 @@ break; } - case IEEE80211_FC0_SUBTYPE_PROBE_REQ: { - u_int8_t rate; - - if (ic->ic_opmode == IEEE80211_M_STA || - ic->ic_state != IEEE80211_S_RUN) { + case IEEE80211_FC0_SUBTYPE_PROBE_REQ: + if (ic->ic_state != IEEE80211_S_RUN) { ic->ic_stats.is_rx_mgtdiscard++; return; } + if (IEEE80211_IS_MULTICAST(wh->i_addr2)) { + /* frame must be directed */ + ic->ic_stats.is_rx_mgtdiscard++; /* XXX stat */ + return; + } /* * prreq frame format @@ -1955,43 +1955,59 @@ IEEE80211_VERIFY_ELEMENT(ssid, IEEE80211_NWID_LEN); IEEE80211_VERIFY_SSID(ic->ic_bss, ssid, "probe"); - if (ni == ic->ic_bss) { - if (ic->ic_opmode == IEEE80211_M_IBSS) { - /* - * XXX Cannot tell if the sender is operating - * in ibss mode. But we need a new node to - * send the response so blindly add them to the - * neighbor table. - */ + allocbs = 0; + switch (ic->ic_opmode) { + case IEEE80211_M_IBSS: + case IEEE80211_M_AHDEMO: + /* + * XXX Cannot tell if the sender is operating + * in ibss mode. But we need a new node to + * send the response so blindly add them to the + * neighbor table. + */ + if (ni == ic->ic_bss) { ni = ieee80211_fakeup_adhoc_node(ic->ic_sta, - wh->i_addr2); - } else + wh->i_addr2); + if (ni == NULL) + return; + allocbs = 1; + } + break; + case IEEE80211_M_HOSTAP: + if (ni == ic->ic_bss) { ni = ieee80211_dup_bss(ic->ic_sta, wh->i_addr2); - if (ni == NULL) - return; - IEEE80211_DPRINTF(ic, IEEE80211_MSG_ASSOC, - "%s: new probe req from %s\n", - __func__, ether_sprintf(wh->i_addr2)); - allocbs = 1; - } else - allocbs = 0; + if (ni == NULL) + return; + allocbs = 1; + } + break; + default: /* silence compiler */ + break; + } + IEEE80211_DPRINTF(ic, IEEE80211_MSG_ASSOC, + "%s: %sprobe req from %s\n", __func__, + allocbs ? "new" : "", ether_sprintf(wh->i_addr2)); ni->ni_rssi = rssi; ni->ni_rstamp = rstamp; - rate = ieee80211_setup_rates(ic, ni, rates, xrates, - IEEE80211_F_DOSORT | IEEE80211_F_DOFRATE + if (ic->ic_opmode != IEEE80211_M_STA) { + u_int8_t rate; + /* + * Calculate rate set for response. + */ + rate = ieee80211_setup_rates(ic, ni, rates, xrates, + IEEE80211_F_DOSORT | IEEE80211_F_DOFRATE | IEEE80211_F_DONEGO | IEEE80211_F_DODEL); - if (rate & IEEE80211_RATE_BASIC) { - IEEE80211_DPRINTF(ic, IEEE80211_MSG_XRATE, - "%s: rate negotiation failed: %s\n", - __func__,ether_sprintf(wh->i_addr2)); - if (allocbs) /* reclaim immediately */ - ieee80211_free_node(ni); - } else { - IEEE80211_SEND_MGMT(ic, ni, - IEEE80211_FC0_SUBTYPE_PROBE_RESP, 0); + if (rate & IEEE80211_RATE_BASIC) { + IEEE80211_DPRINTF(ic, IEEE80211_MSG_XRATE, + "[%s] received rate set invalid\n", + ether_sprintf(wh->i_addr2)); + if (allocbs) /* reclaim immediately */ + ieee80211_free_node(ni); + } } + IEEE80211_SEND_MGMT(ic, ni, + IEEE80211_FC0_SUBTYPE_PROBE_RESP, 0); break; - } case IEEE80211_FC0_SUBTYPE_AUTH: { u_int16_t algo, seq, status; From owner-p4-projects@FreeBSD.ORG Mon Nov 29 20:59:11 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0E24516A4D0; Mon, 29 Nov 2004 20:59:11 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D7B5E16A4CE for ; Mon, 29 Nov 2004 20:59:10 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AC70143D49 for ; Mon, 29 Nov 2004 20:59:10 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iATKxAQT031693 for ; Mon, 29 Nov 2004 20:59:10 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iATKxAoL031690 for perforce@freebsd.org; Mon, 29 Nov 2004 20:59:10 GMT (envelope-from peter@freebsd.org) Date: Mon, 29 Nov 2004 20:59:10 GMT Message-Id: <200411292059.iATKxAoL031690@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 66056 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Nov 2004 20:59:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=66056 Change 66056 by peter@peter_daintree on 2004/11/29 20:58:09 finish off gdb_machdep.c based on my understanding to date. We can only get the scratch registers from the trapframe since we do not save them in the pcb at context switch. Note to self: the register numbers are defined in gdb/amd64-tdep.c Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/gdb_machdep.c#5 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/gdb_machdep.c#5 (text+ko) ==== @@ -54,39 +54,28 @@ if (kdb_thread == curthread) { switch (regnum) { case 0: return (&kdb_frame->tf_rax); - case 1: return (&kdb_frame->tf_rcx); - case 2: return (&kdb_frame->tf_rdx); + case 2: return (&kdb_frame->tf_rcx); + case 3: return (&kdb_frame->tf_rdx); + case 4: return (&kdb_frame->tf_rsi); + case 5: return (&kdb_frame->tf_rdi); + case 8: return (&kdb_frame->tf_r8); + case 9: return (&kdb_frame->tf_r9); + case 10: return (&kdb_frame->tf_r10); + case 11: return (&kdb_frame->tf_r11); + case 18: return (&kdb_frame->tf_cs); + case 19: return (&kdb_frame->tf_ss); } } switch (regnum) { -#if 0 - case 0: return (&kdb_thrctx->pcb_rax); -#endif case 1: return (&kdb_thrctx->pcb_rbx); -#if 0 - case 2: return (&kdb_thrctx->pcb_rcx); - case 3: return (&kdb_thrctx->pcb_rdx); - case 4: return (&kdb_thrctx->pcb_rsi); - case 5: return (&kdb_thrctx->pcb_rdi); -#endif case 6: return (&kdb_thrctx->pcb_rbp); case 7: return (&kdb_thrctx->pcb_rsp); -#if 0 - case 8: return (&kdb_thrctx->pcb_r8); - case 9: return (&kdb_thrctx->pcb_r9); - case 10: return (&kdb_thrctx->pcb_r10); - case 11: return (&kdb_thrctx->pcb_r11); -#endif case 12: return (&kdb_thrctx->pcb_r12); case 13: return (&kdb_thrctx->pcb_r13); case 14: return (&kdb_thrctx->pcb_r14); case 15: return (&kdb_thrctx->pcb_r15); case 16: return (&kdb_thrctx->pcb_rip); case 17: return (&kdb_thrctx->pcb_rflags); -#if 0 - case 18: return (&kdb_thrctx->pcb_cs); - case 19: return (&kdb_thrctx->pcb_ss); -#endif } return (NULL); } From owner-p4-projects@FreeBSD.ORG Mon Nov 29 21:05:19 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B673316A554; Mon, 29 Nov 2004 21:05:18 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8DF6A16A551 for ; Mon, 29 Nov 2004 21:05:18 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6787D43D1F for ; Mon, 29 Nov 2004 21:05:18 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iATL5IPY031926 for ; Mon, 29 Nov 2004 21:05:18 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iATL5IqE031923 for perforce@freebsd.org; Mon, 29 Nov 2004 21:05:18 GMT (envelope-from peter@freebsd.org) Date: Mon, 29 Nov 2004 21:05:18 GMT Message-Id: <200411292105.iATL5IqE031923@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 66057 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Nov 2004 21:05:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=66057 Change 66057 by peter@peter_daintree on 2004/11/29 21:04:23 try and get the logic right. Wow, I messed this up! Affected files ... .. //depot/projects/hammer/sys/kern/tty.c#35 edit Differences ... ==== //depot/projects/hammer/sys/kern/tty.c#35 (text+ko) ==== @@ -1861,7 +1861,7 @@ * is large (divide by `tick' and/or arrange to * use tvtohz() if hz is large). */ - if ((sizeof(u_long) <= 4) && hz < 169) + if ((sizeof(u_long) > 4) || hz < 169) slp = (long) (((u_long)slp * hz) + 999999) / 1000000; else { struct timeval tv; From owner-p4-projects@FreeBSD.ORG Mon Nov 29 21:26:45 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B6D2216A4D1; Mon, 29 Nov 2004 21:26:45 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 54FBF16A4CF for ; Mon, 29 Nov 2004 21:26:45 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 31B8F43D45 for ; Mon, 29 Nov 2004 21:26:45 +0000 (GMT) (envelope-from trhodes@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iATLQjlB033405 for ; Mon, 29 Nov 2004 21:26:45 GMT (envelope-from trhodes@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iATLQi3U033402 for perforce@freebsd.org; Mon, 29 Nov 2004 21:26:44 GMT (envelope-from trhodes@freebsd.org) Date: Mon, 29 Nov 2004 21:26:44 GMT Message-Id: <200411292126.iATLQi3U033402@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trhodes@freebsd.org using -f From: Tom Rhodes To: Perforce Change Reviews Subject: PERFORCE change 66059 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Nov 2004 21:26:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=66059 Change 66059 by trhodes@trhodes_local on 2004/11/29 21:26:42 Add an rcNG startup script for auditd, based on the Apple version. Affected files ... .. //depot/projects/trustedbsd/audit3/etc/rc.d/auditd#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Mon Nov 29 21:36:59 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8D2DC16A4D1; Mon, 29 Nov 2004 21:36:59 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 488E316A4CF for ; Mon, 29 Nov 2004 21:36:59 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 225D143D45 for ; Mon, 29 Nov 2004 21:36:59 +0000 (GMT) (envelope-from trhodes@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iATLawBi033808 for ; Mon, 29 Nov 2004 21:36:59 GMT (envelope-from trhodes@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iATLawDX033805 for perforce@freebsd.org; Mon, 29 Nov 2004 21:36:58 GMT (envelope-from trhodes@freebsd.org) Date: Mon, 29 Nov 2004 21:36:58 GMT Message-Id: <200411292136.iATLawDX033805@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trhodes@freebsd.org using -f From: Tom Rhodes To: Perforce Change Reviews Subject: PERFORCE change 66060 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Nov 2004 21:37:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=66060 Change 66060 by trhodes@trhodes_local on 2004/11/29 21:36:09 Add auditd script to the build. Affected files ... .. //depot/projects/trustedbsd/audit3/etc/rc.d/Makefile#4 edit Differences ... ==== //depot/projects/trustedbsd/audit3/etc/rc.d/Makefile#4 (text+ko) ==== @@ -3,7 +3,7 @@ FILES= DAEMON LOGIN NETWORKING SERVERS \ abi accounting addswap adjkerntz amd \ - apm apmd archdep atm1 atm2 atm3 \ + apm apmd archdep atm1 atm2 atm3 auditd \ bgfsck bootparams \ ccd cleanvar cleartmp cron \ devd devfs dhclient \ From owner-p4-projects@FreeBSD.ORG Mon Nov 29 22:00:54 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C111116A4DC; Mon, 29 Nov 2004 22:00:53 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8F4C516A4D6 for ; Mon, 29 Nov 2004 22:00:53 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B971643D48 for ; Mon, 29 Nov 2004 22:00:27 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iATM0REE035147 for ; Mon, 29 Nov 2004 22:00:27 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iATM0Rpd035144 for perforce@freebsd.org; Mon, 29 Nov 2004 22:00:27 GMT (envelope-from peter@freebsd.org) Date: Mon, 29 Nov 2004 22:00:27 GMT Message-Id: <200411292200.iATM0Rpd035144@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 66061 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Nov 2004 22:00:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=66061 Change 66061 by peter@peter_daintree on 2004/11/29 21:59:55 try and do the rounding properly. Affected files ... .. //depot/projects/hammer/sys/kern/tty.c#36 edit Differences ... ==== //depot/projects/hammer/sys/kern/tty.c#36 (text+ko) ==== @@ -1855,21 +1855,15 @@ /* * Rounding down may make us wake up just short * of the target, so we round up. - * The formula is ceiling(slp * hz/1000000). - * 32-bit arithmetic is enough for hz < 169. - * XXX see tvtohz() for how to avoid overflow if hz - * is large (divide by `tick' and/or arrange to - * use tvtohz() if hz is large). */ - if ((sizeof(u_long) > 4) || hz < 169) - slp = (long) (((u_long)slp * hz) + 999999) / 1000000; - else { - struct timeval tv; - - tv.tv_sec = slp; - tv.tv_usec = 0; - slp = tvtohz(&tv); - } + if (slp <= LONG_MAX / 1000000) + slp = (slp * 1000000 + (tick - 1)) / tick + 1; + else if (slp <= LONG_MAX / hz) + slp = slp * hz + 1; + else + slp = LONG_MAX; + if (slp > INT_MAX) + slp = INT_MAX; goto sleep; } if (qp->c_cc <= 0) { From owner-p4-projects@FreeBSD.ORG Mon Nov 29 23:08:52 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A080B16A4D0; Mon, 29 Nov 2004 23:08:52 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7A33216A4CE for ; Mon, 29 Nov 2004 23:08:52 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6A63C43D58 for ; Mon, 29 Nov 2004 23:08:52 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iATN8qB3037296 for ; Mon, 29 Nov 2004 23:08:52 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iATN8q46037293 for perforce@freebsd.org; Mon, 29 Nov 2004 23:08:52 GMT (envelope-from peter@freebsd.org) Date: Mon, 29 Nov 2004 23:08:52 GMT Message-Id: <200411292308.iATN8q46037293@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 66066 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Nov 2004 23:08:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=66066 Change 66066 by peter@peter_daintree on 2004/11/29 23:08:30 Really fix the timeout calculation. This should even be bde-proof. Affected files ... .. //depot/projects/hammer/sys/kern/tty.c#37 edit Differences ... ==== //depot/projects/hammer/sys/kern/tty.c#37 (text+ko) ==== @@ -1854,16 +1854,13 @@ #undef diff /* * Rounding down may make us wake up just short - * of the target, so we round up. + * of the target, so we round up. The 32 bit arithmetic is + * sufficient for the first calculation for hz < 169. */ - if (slp <= LONG_MAX / 1000000) - slp = (slp * 1000000 + (tick - 1)) / tick + 1; - else if (slp <= LONG_MAX / hz) - slp = slp * hz + 1; + if (sizeof(u_long) > 4 || slp <= ULONG_MAX / hz) + slp = slp = (((u_long)slp * hz) + 999999) / 1000000; else - slp = LONG_MAX; - if (slp > INT_MAX) - slp = INT_MAX; + slp = (slp + (tick - 1)) / tick; goto sleep; } if (qp->c_cc <= 0) { From owner-p4-projects@FreeBSD.ORG Tue Nov 30 00:44:09 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 271B316A4D1; Tue, 30 Nov 2004 00:44:09 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E948E16A4CE for ; Tue, 30 Nov 2004 00:44:08 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BC37D43D2F for ; Tue, 30 Nov 2004 00:44:08 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iAU0i8uN041656 for ; Tue, 30 Nov 2004 00:44:08 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iAU0i8Te041653 for perforce@freebsd.org; Tue, 30 Nov 2004 00:44:08 GMT (envelope-from peter@freebsd.org) Date: Tue, 30 Nov 2004 00:44:08 GMT Message-Id: <200411300044.iAU0i8Te041653@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 66072 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Nov 2004 00:44:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=66072 Change 66072 by peter@peter_daintree on 2004/11/30 00:43:28 aargh. I was looking at the math so much that I missed the obvious C errors. Affected files ... .. //depot/projects/hammer/sys/kern/tty.c#38 edit Differences ... ==== //depot/projects/hammer/sys/kern/tty.c#38 (text+ko) ==== @@ -1858,7 +1858,7 @@ * sufficient for the first calculation for hz < 169. */ if (sizeof(u_long) > 4 || slp <= ULONG_MAX / hz) - slp = slp = (((u_long)slp * hz) + 999999) / 1000000; + slp = (long) (((u_long)slp * hz) + 999999) / 1000000; else slp = (slp + (tick - 1)) / tick; goto sleep; From owner-p4-projects@FreeBSD.ORG Tue Nov 30 00:54:22 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D89B616A4D0; Tue, 30 Nov 2004 00:54:21 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AC34816A4CE for ; Tue, 30 Nov 2004 00:54:21 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8C84243D2F for ; Tue, 30 Nov 2004 00:54:21 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iAU0sLIQ048296 for ; Tue, 30 Nov 2004 00:54:21 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iAU0sLMC048293 for perforce@freebsd.org; Tue, 30 Nov 2004 00:54:21 GMT (envelope-from sam@freebsd.org) Date: Tue, 30 Nov 2004 00:54:21 GMT Message-Id: <200411300054.iAU0sLMC048293@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66073 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Nov 2004 00:54:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=66073 Change 66073 by sam@sam_ebb on 2004/11/30 00:54:17 o revert handling of probe request frames in station mode o improve power save debug msgs o remove new vs. existing in open auth debug msg Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_input.c#20 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_input.c#20 (text+ko) ==== @@ -838,7 +838,6 @@ struct ieee80211_node *ni, int rssi, u_int32_t rstamp, u_int16_t seq, u_int16_t status) { - int allocbs; switch (ic->ic_opmode) { case IEEE80211_M_IBSS: @@ -866,17 +865,14 @@ ni = ieee80211_dup_bss(ic->ic_sta, wh->i_addr2); if (ni == NULL) return; - allocbs = 1; - } else - allocbs = 0; + } ni->ni_rssi = rssi; ni->ni_rstamp = rstamp; IEEE80211_SEND_MGMT(ic, ni, IEEE80211_FC0_SUBTYPE_AUTH, seq + 1); IEEE80211_DPRINTF(ic, IEEE80211_MSG_DEBUG | IEEE80211_MSG_AUTH, - "station %s %s authenticated (open)\n", - ether_sprintf(ni->ni_macaddr), - (allocbs ? "newly" : "already")); + "station %s authenticated (open)\n", + ether_sprintf(ni->ni_macaddr)); break; case IEEE80211_M_STA: @@ -1919,8 +1915,11 @@ break; } - case IEEE80211_FC0_SUBTYPE_PROBE_REQ: - if (ic->ic_state != IEEE80211_S_RUN) { + case IEEE80211_FC0_SUBTYPE_PROBE_REQ: { + u_int8_t rate; + + if (ic->ic_opmode == IEEE80211_M_STA || + ic->ic_state != IEEE80211_S_RUN) { ic->ic_stats.is_rx_mgtdiscard++; return; } @@ -1955,59 +1954,43 @@ IEEE80211_VERIFY_ELEMENT(ssid, IEEE80211_NWID_LEN); IEEE80211_VERIFY_SSID(ic->ic_bss, ssid, "probe"); - allocbs = 0; - switch (ic->ic_opmode) { - case IEEE80211_M_IBSS: - case IEEE80211_M_AHDEMO: - /* - * XXX Cannot tell if the sender is operating - * in ibss mode. But we need a new node to - * send the response so blindly add them to the - * neighbor table. - */ - if (ni == ic->ic_bss) { + if (ni == ic->ic_bss) { + if (ic->ic_opmode == IEEE80211_M_IBSS) { + /* + * XXX Cannot tell if the sender is operating + * in ibss mode. But we need a new node to + * send the response so blindly add them to the + * neighbor table. + */ ni = ieee80211_fakeup_adhoc_node(ic->ic_sta, wh->i_addr2); - if (ni == NULL) - return; - allocbs = 1; - } - break; - case IEEE80211_M_HOSTAP: - if (ni == ic->ic_bss) { + } else ni = ieee80211_dup_bss(ic->ic_sta, wh->i_addr2); - if (ni == NULL) - return; - allocbs = 1; - } - break; - default: /* silence compiler */ - break; - } + if (ni == NULL) + return; + allocbs = 1; + } else + allocbs = 0; IEEE80211_DPRINTF(ic, IEEE80211_MSG_ASSOC, - "%s: %sprobe req from %s\n", __func__, - allocbs ? "new" : "", ether_sprintf(wh->i_addr2)); + "%s: probe req from %s\n", __func__, + ether_sprintf(wh->i_addr2)); ni->ni_rssi = rssi; ni->ni_rstamp = rstamp; - if (ic->ic_opmode != IEEE80211_M_STA) { - u_int8_t rate; - /* - * Calculate rate set for response. - */ - rate = ieee80211_setup_rates(ic, ni, rates, xrates, - IEEE80211_F_DOSORT | IEEE80211_F_DOFRATE - | IEEE80211_F_DONEGO | IEEE80211_F_DODEL); - if (rate & IEEE80211_RATE_BASIC) { - IEEE80211_DPRINTF(ic, IEEE80211_MSG_XRATE, - "[%s] received rate set invalid\n", - ether_sprintf(wh->i_addr2)); - if (allocbs) /* reclaim immediately */ - ieee80211_free_node(ni); - } + rate = ieee80211_setup_rates(ic, ni, rates, xrates, + IEEE80211_F_DOSORT | IEEE80211_F_DOFRATE + | IEEE80211_F_DONEGO | IEEE80211_F_DODEL); + if (rate & IEEE80211_RATE_BASIC) { + IEEE80211_DPRINTF(ic, IEEE80211_MSG_XRATE, + "[%s] received rate set invalid\n", + ether_sprintf(wh->i_addr2)); + if (allocbs) /* reclaim immediately */ + ieee80211_free_node(ni); + } else { + IEEE80211_SEND_MGMT(ic, ni, + IEEE80211_FC0_SUBTYPE_PROBE_RESP, 0); } - IEEE80211_SEND_MGMT(ic, ni, - IEEE80211_FC0_SUBTYPE_PROBE_RESP, 0); break; + } case IEEE80211_FC0_SUBTYPE_AUTH: { u_int16_t algo, seq, status; @@ -2590,14 +2573,18 @@ * in the packet dispatched to the station; otherwise * turn off the TIM bit. */ - IEEE80211_DPRINTF(ic, IEEE80211_MSG_POWER, - "[%s] got ps-poll, send packet, %u still queued\n", - ether_sprintf(ni->ni_macaddr), qlen); if (qlen != 0) { + IEEE80211_DPRINTF(ic, IEEE80211_MSG_POWER, + "[%s] got ps-poll, send packet, %u still queued\n", + ether_sprintf(ni->ni_macaddr), qlen); wh = mtod(m, struct ieee80211_frame_min *); wh->i_fc[1] |= IEEE80211_FC1_MORE_DATA; - } else + } else { + IEEE80211_DPRINTF(ic, IEEE80211_MSG_POWER, + "[%s] got ps-poll, send packet, queue empty\n", + ether_sprintf(ni->ni_macaddr)); ic->ic_set_tim(ic, ni, 0); + } m->m_flags |= M_PWR_SAV; /* bypass PS handling */ IF_ENQUEUE(&ic->ic_ifp->if_snd, m); } From owner-p4-projects@FreeBSD.ORG Tue Nov 30 00:56:25 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D2E0616A4D2; Tue, 30 Nov 2004 00:56:24 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 93DCD16A4CE for ; Tue, 30 Nov 2004 00:56:24 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7F9B043D1D for ; Tue, 30 Nov 2004 00:56:24 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iAU0uOCn048413 for ; Tue, 30 Nov 2004 00:56:24 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iAU0uOWl048410 for perforce@freebsd.org; Tue, 30 Nov 2004 00:56:24 GMT (envelope-from sam@freebsd.org) Date: Tue, 30 Nov 2004 00:56:24 GMT Message-Id: <200411300056.iAU0uOWl048410@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66074 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Nov 2004 00:56:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=66074 Change 66074 by sam@sam_ebb on 2004/11/30 00:55:43 o remove unused IEEE80211_PSCAN_WAIT o lengthen inactivity check interval to 15 seconds as we're going to start doing more significant work and we don't want to lock the station table so frequently (might want to make this much longer) Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_node.h#12 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_node.h#12 (text+ko) ==== @@ -43,7 +43,7 @@ * (waiting for a response to a management frame when operating * as a station), and node inactivity processing (when operating * as an AP). For inactivity processing each node has a timeout - * set in it's ni_intval field that is decremented on each timeout + * set in it's ni_inact field that is decremented on each timeout * and the node is reclaimed when the counter goes to zero. We * use different inactivity timeout values depending on whether * the node is associated and authorized (either by 802.1x or @@ -51,14 +51,14 @@ * authorized. The latter timeout is shorter to more aggressively * reclaim nodes that leave part way through the 802.1x exchange. */ -#define IEEE80211_PSCAN_WAIT 5 /* passive scan intvl (secs) */ -#define IEEE80211_TRANS_WAIT 5 /* transition interval (secs) */ -#define IEEE80211_INACT_WAIT 5 /* inactivity interval (secs) */ +#define IEEE80211_INACT_WAIT 15 /* inactivity interval (secs) */ #define IEEE80211_INACT_INIT (30/IEEE80211_INACT_WAIT) /* initial */ #define IEEE80211_INACT_AUTH (180/IEEE80211_INACT_WAIT) /* associated but not authorized */ #define IEEE80211_INACT_RUN (300/IEEE80211_INACT_WAIT) /* authorized */ #define IEEE80211_INACT_SCAN (300/IEEE80211_INACT_WAIT) /* scanned */ +#define IEEE80211_TRANS_WAIT 5 /* mgt frame tx timer (secs) */ + #define IEEE80211_NODE_HASHSIZE 32 /* simple hash is enough for variation of macaddr */ #define IEEE80211_NODE_HASH(addr) \ From owner-p4-projects@FreeBSD.ORG Tue Nov 30 00:59:29 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 414EC16A4D0; Tue, 30 Nov 2004 00:59:29 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 050E916A4CE for ; Tue, 30 Nov 2004 00:59:28 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A8D5243D58 for ; Tue, 30 Nov 2004 00:59:28 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iAU0xSR7048509 for ; Tue, 30 Nov 2004 00:59:28 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iAU0xSlQ048506 for perforce@freebsd.org; Tue, 30 Nov 2004 00:59:28 GMT (envelope-from sam@freebsd.org) Date: Tue, 30 Nov 2004 00:59:28 GMT Message-Id: <200411300059.iAU0xSlQ048506@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66075 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Nov 2004 00:59:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=66075 Change 66075 by sam@sam_ebb on 2004/11/30 00:59:11 add shadows of if_ipackets and if_opackets to the ath stats structure so apps get a consistent snapshot of state and so they don't need to drag in -lkvm Affected files ... .. //depot/projects/wifi/sys/dev/ath/if_athioctl.h#3 edit Differences ... ==== //depot/projects/wifi/sys/dev/ath/if_athioctl.h#3 (text+ko) ==== @@ -51,6 +51,7 @@ u_int32_t ast_txurn; /* tx underrun interrupts */ u_int32_t ast_mib; /* mib interrupts */ u_int32_t ast_intrcoal; /* interrupts coalesced */ + u_int32_t ast_tx_packets; /* packet sent on the interface */ u_int32_t ast_tx_mgmt; /* management frames transmitted */ u_int32_t ast_tx_discard; /* frames discarded prior to assoc */ u_int32_t ast_tx_qstop; /* output stopped 'cuz no buffer */ @@ -84,6 +85,7 @@ u_int32_t ast_rx_phy[32]; /* rx PHY error per-code counts */ u_int32_t ast_rx_tooshort;/* rx discarded 'cuz frame too short */ u_int32_t ast_rx_toobig; /* rx discarded 'cuz frame too large */ + u_int32_t ast_rx_packets; /* packet recv on the interface */ u_int32_t ast_rx_mgt; /* management frames received */ u_int32_t ast_rx_ctl; /* rx discarded 'cuz ctl frame */ int8_t ast_tx_rssi; /* tx rssi of last ack */ From owner-p4-projects@FreeBSD.ORG Tue Nov 30 01:07:39 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A06FE16A4D0; Tue, 30 Nov 2004 01:07:39 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7BC7816A4CE for ; Tue, 30 Nov 2004 01:07:39 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6702043D55 for ; Tue, 30 Nov 2004 01:07:39 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iAU17d5f048776 for ; Tue, 30 Nov 2004 01:07:39 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iAU17dJA048773 for perforce@freebsd.org; Tue, 30 Nov 2004 01:07:39 GMT (envelope-from peter@freebsd.org) Date: Tue, 30 Nov 2004 01:07:39 GMT Message-Id: <200411300107.iAU17dJA048773@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 66077 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Nov 2004 01:07:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=66077 Change 66077 by peter@peter_daintree on 2004/11/30 01:06:55 install includes for neither fun nor profit Affected files ... .. //depot/projects/hammer/Makefile.inc1#78 edit Differences ... ==== //depot/projects/hammer/Makefile.inc1#78 (text+ko) ==== @@ -228,7 +228,8 @@ LD="ld -m elf_i386_fbsd -Y P,${LIB32TMP}/usr/lib32" \ AS="as --32" \ LIBDIR=/usr/lib32 \ - SHLIBDIR=/usr/lib32 + SHLIBDIR=/usr/lib32 \ + INCLUDEDIR=/usr/include32 LIB32MAKE= ${LIB32MAKEENV} ${MAKE} -DNO_CPU_CFLAGS -DCOMPAT_32BIT \ -DNO_BIND -DNOMAN -DNODOC -DNOINFO -DNOHTML \ @@ -238,7 +239,8 @@ LD="ld -m elf_i386_fbsd -Y P,${LIB32TMP}/usr/lib32" \ AS="as --32" \ LIBDIR=/usr/lib32 \ - SHLIBDIR=/usr/lib32 + SHLIBDIR=/usr/lib32 \ + INCLUDEDIR=/usr/include32 .endif # install stage @@ -414,6 +416,8 @@ cd ${.CURDIR}/kerberos5/lib; \ ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t} .endif + cd ${.CURDIR}/gnu/usr.bin/gcc/cc/include; \ + ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t} .endfor .for _dir in lib/libncurses lib/libmagic cd ${.CURDIR}/${_dir}; \ @@ -428,11 +432,14 @@ install32: mkdir -p ${DESTDIR}/usr/lib32 # XXX add to mtree + mkdir -p ${DESTDIR}/usr/include32 + cd ${.CURDIR}/include; ${LIB32MAKE} install cd ${.CURDIR}/lib; ${LIB32MAKE} install cd ${.CURDIR}/gnu/lib; ${LIB32MAKE} install .if !defined(NOCRYPT) cd ${.CURDIR}/secure/lib; ${LIB32MAKE} install .endif + cd ${.CURDIR}/gnu/usr.bin/gcc/cc/include; ${LIB32MAKE} install cd ${.CURDIR}/libexec/rtld-elf; PROG=ld-elf32.so.1 ${LIB32MAKE} install .endif From owner-p4-projects@FreeBSD.ORG Tue Nov 30 01:09:43 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ECDF916A4D1; Tue, 30 Nov 2004 01:09:42 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9679516A4CE for ; Tue, 30 Nov 2004 01:09:42 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 77C6C43D31 for ; Tue, 30 Nov 2004 01:09:42 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iAU19giH048831 for ; Tue, 30 Nov 2004 01:09:42 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iAU19g9r048828 for perforce@freebsd.org; Tue, 30 Nov 2004 01:09:42 GMT (envelope-from sam@freebsd.org) Date: Tue, 30 Nov 2004 01:09:42 GMT Message-Id: <200411300109.iAU19g9r048828@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66078 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Nov 2004 01:09:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=66078 Change 66078 by sam@sam_ebb on 2004/11/30 01:09:19 o return copies of if_ipacket and if_opackets in ath stats o query the hal for the number of frames still pending on the h/w tx queue for cab q handling o add primitive stuck beacon detection and handling o don't intercept management frames for stations in power save mode; leave it to the 802.11 layer to DTRT Affected files ... .. //depot/projects/wifi/sys/dev/ath/if_ath.c#30 edit .. //depot/projects/wifi/sys/dev/ath/if_athvar.h#11 edit Differences ... ==== //depot/projects/wifi/sys/dev/ath/if_ath.c#30 (text+ko) ==== @@ -743,7 +743,10 @@ struct ath_softc *sc = arg; struct ifnet *ifp = &sc->sc_if; - if_printf(ifp, "hardware error; resetting\n"); + if (sc->sc_bmisscount != 0) + if_printf(ifp, "stuck beacon; resetting\n"); + else + if_printf(ifp, "hardware error; resetting\n"); ath_reset(ifp); } @@ -1120,12 +1123,6 @@ * to pass it along. */ ni = (struct ieee80211_node *) m->m_pkthdr.rcvif; - if ((ni->ni_flags & IEEE80211_NODE_PWR_MGT) && - (m->m_flags & M_PWR_SAV) == 0) { - ieee80211_pwrsave(ic, ni, m); - ni = NULL; /* keep reference */ - goto reclaim; - } m->m_pkthdr.rcvif = NULL; wh = mtod(m, struct ieee80211_frame *); @@ -1807,6 +1804,22 @@ __func__, ic->ic_flags, bf, bf ? bf->bf_m : NULL); return; } + if (ath_hal_numtxpending(ah, sc->sc_bhalq) != 0) { + sc->sc_bmisscount++; + DPRINTF(sc, ATH_DEBUG_BEACON_PROC, + "%s: missed %u consecutive beacons\n", + __func__, sc->sc_bmisscount); + /* XXX reset if too many? */ + if (sc->sc_bmisscount > 3) + taskqueue_enqueue(taskqueue_swi, &sc->sc_fataltask); + return; + } + if (sc->sc_bmisscount != 0) { + DPRINTF(sc, ATH_DEBUG_BEACON, + "%s: resume beacon xmit after %u misses\n", + __func__, sc->sc_bmisscount); + sc->sc_bmisscount = 0; + } /* * Update dynamic beacon contents. If this returns @@ -1815,7 +1828,7 @@ * (probably because of the TIM bitmap). */ m = bf->bf_m; - ncabq = sc->sc_cabq->axq_depth; /* XXX check h/w queue */ + ncabq = ath_hal_numtxpending(ah, sc->sc_cabq->axq_qnum); if (ieee80211_beacon_update(ic, bf->bf_node, &sc->sc_boff, m, ncabq)) { bus_dmamap_unload(sc->sc_dmat, bf->bf_dmamap); if (ath_beacon_setup(sc, bf, m) != 0) { @@ -1844,7 +1857,7 @@ DPRINTF(sc, ATH_DEBUG_ANY, "%s: beacon queue %u did not stop?\n", __func__, sc->sc_bhalq); - /* NB: the HAL still stops DMA, so proceed */ + /* XXX how to recover? reset? */ } bus_dmamap_sync(sc->sc_dmat, bf->bf_dmamap, BUS_DMASYNC_PREWRITE); @@ -1999,6 +2012,7 @@ sc->sc_imask |= HAL_INT_SWBA; /* beacon prepare */ } ath_hal_beaconinit(ah, nexttbtt, intval); + sc->sc_bmisscount = 0; ath_hal_intrset(ah, sc->sc_imask); /* * When using a self-linked beacon descriptor in @@ -4157,6 +4171,9 @@ ath_mode_init(sc); break; case SIOCGATHSTATS: + /* NB: embed these numbers to get a consistent view */ + sc->sc_stats.ast_tx_packets = ifp->if_opackets; + sc->sc_stats.ast_rx_packets = ifp->if_ipackets; sc->sc_stats.ast_rx_rssi = ieee80211_getrssi(ic); ATH_UNLOCK(sc); /* ==== //depot/projects/wifi/sys/dev/ath/if_athvar.h#11 (text+ko) ==== @@ -215,6 +215,7 @@ struct task sc_txtask; /* tx int processing */ u_int sc_bhalq; /* HAL q for outgoing beacons */ + u_int sc_bmisscount; /* missed beacon transmits */ struct ath_txq *sc_cabq; /* tx q for cab frames */ struct ath_buf *sc_bcbuf; /* beacon buffer */ struct ath_buf *sc_bufptr; /* allocated buffer ptr */ @@ -316,6 +317,8 @@ ((*(_ah)->ah_setTxDP)((_ah), (_q), (_bufaddr))) #define ath_hal_gettxbuf(_ah, _q) \ ((*(_ah)->ah_getTxDP)((_ah), (_q))) +#define ath_hal_numtxpending(_ah, _q) \ + ((*(_ah)->ah_numTxPending)((_ah), (_q))) #define ath_hal_getrxbuf(_ah) \ ((*(_ah)->ah_getRxDP)((_ah))) #define ath_hal_txstart(_ah, _q) \ From owner-p4-projects@FreeBSD.ORG Tue Nov 30 01:11:46 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E232F16A4D0; Tue, 30 Nov 2004 01:11:45 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A842C16A4CE for ; Tue, 30 Nov 2004 01:11:45 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 83BD443D46 for ; Tue, 30 Nov 2004 01:11:45 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iAU1BjS3048950 for ; Tue, 30 Nov 2004 01:11:45 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iAU1BjPa048947 for perforce@freebsd.org; Tue, 30 Nov 2004 01:11:45 GMT (envelope-from sam@freebsd.org) Date: Tue, 30 Nov 2004 01:11:45 GMT Message-Id: <200411300111.iAU1BjPa048947@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66079 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Nov 2004 01:11:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=66079 Change 66079 by sam@sam_ebb on 2004/11/30 01:10:49 now that SIOCGATHSTATS returns in+out packet counts there's no need to read kmem Affected files ... .. //depot/projects/wifi/tools/tools/ath/Makefile#4 edit .. //depot/projects/wifi/tools/tools/ath/athstats.c#4 edit Differences ... ==== //depot/projects/wifi/tools/tools/ath/Makefile#4 (text+ko) ==== @@ -31,7 +31,7 @@ all: ${ALL} athstats: athstats.c - ${CC} -o athstats athstats.c -lkvm + ${CC} -o athstats athstats.c athdebug: athdebug.c ${CC} -o athdebug athdebug.c 80211stats: 80211stats.c @@ -41,7 +41,7 @@ 80211debug: 80211debug.c ${CC} -o 80211debug 80211debug.c install: ${ALL} - install -g kmem -m 2755 athstats ${DESTDIR}${BINDIR} + install athstats ${DESTDIR}${BINDIR} install 80211stats ${DESTDIR}${BINDIR} install 80211watch ${DESTDIR}${BINDIR} install 80211debug ${DESTDIR}${BINDIR} ==== //depot/projects/wifi/tools/tools/ath/athstats.c#4 (text+ko) ==== @@ -55,8 +55,6 @@ #include #include -#include -#include #include "../../../sys/contrib/dev/ath/ah_desc.h" #include "../../../sys/net80211/ieee80211_ioctl.h" @@ -215,78 +213,6 @@ #undef N } -static kvm_t *kvmd; -static char *nlistf = NULL; -static char *memf = NULL; - -static struct nlist nl[] = { -#define N_IFNET 0 - { "_ifnet" }, -}; - -/* - * Read kernel memory, return 0 on success. - */ -static int -kread(u_long addr, void *buf, int size) -{ - if (kvmd == 0) { - /* - * XXX. - */ - kvmd = kvm_openfiles(nlistf, memf, NULL, O_RDONLY, buf); - setgid(getgid()); - if (kvmd != NULL) { - if (kvm_nlist(kvmd, nl) < 0) { - if(nlistf) - errx(1, "%s: kvm_nlist: %s", nlistf, - kvm_geterr(kvmd)); - else - errx(1, "kvm_nlist: %s", kvm_geterr(kvmd)); - } - - if (nl[0].n_type == 0) { - if(nlistf) - errx(1, "%s: no namelist", nlistf); - else - errx(1, "no namelist"); - } - } else { - warnx("kvm not available"); - return(-1); - } - } - if (!buf) - return (0); - if (kvm_read(kvmd, addr, buf, size) != size) { - warnx("%s", kvm_geterr(kvmd)); - return (-1); - } - return (0); -} - -static u_long -ifnetsetup(const char *interface, u_long off) -{ - struct ifnet ifnet; - u_long firstifnet; - struct ifnethead ifnethead; - - if (kread(off, (char *)&ifnethead, sizeof ifnethead)) - return; - firstifnet = (u_long)TAILQ_FIRST(&ifnethead); - for (off = firstifnet; off;) { - char name[IFNAMSIZ]; - - if (kread(off, (char *)&ifnet, sizeof ifnet)) - break; - if (interface && strcmp(ifnet.if_xname, interface) == 0) - return off; - off = (u_long)TAILQ_NEXT(&ifnet, if_link); - } - return 0; -} - static int signalled; static void @@ -316,14 +242,9 @@ strncpy(ifr.ifr_name, "ath0", sizeof (ifr.ifr_name)); if (argc > 1) { u_long interval = strtoul(argv[1], NULL, 0); - u_long off; int line, omask; u_int rate = getifrate(s, ifr.ifr_name); struct ath_stats cur, total; - struct ifnet ifcur, iftot; - - kread(0, 0, 0); - off = ifnetsetup(ifr.ifr_name, nl[N_IFNET].n_value); if (interval < 1) interval = 1; @@ -353,11 +274,9 @@ if (ioctl(s, SIOCGATHSTATS, &ifr) < 0) err(1, ifr.ifr_name); rate = getifrate(s, ifr.ifr_name); - if (kread(off, &ifcur, sizeof(ifcur))) - err(1, ifr.ifr_name); printf("%8u %8u %7u %7u %7u %6u %6u %5u %7u %4u %3uM\n" - , ifcur.if_ipackets - iftot.if_ipackets - , ifcur.if_opackets - iftot.if_opackets + , cur.ast_rx_packets - total.ast_rx_packets + , cur.ast_tx_packets - total.ast_tx_packets , cur.ast_tx_altrate - total.ast_tx_altrate , cur.ast_tx_shortretry - total.ast_tx_shortretry , cur.ast_tx_longretry - total.ast_tx_longretry @@ -369,17 +288,14 @@ , rate ); total = cur; - iftot = ifcur; } else { ifr.ifr_data = (caddr_t) &total; if (ioctl(s, SIOCGATHSTATS, &ifr) < 0) err(1, ifr.ifr_name); rate = getifrate(s, ifr.ifr_name); - if (kread(off, &iftot, sizeof(iftot))) - err(1, ifr.ifr_name); printf("%8u %8u %7u %7u %7u %6u %6u %5u %7u %4u %3uM\n" - , iftot.if_ipackets - , iftot.if_opackets + , total.ast_rx_packets + , total.ast_tx_packets , total.ast_tx_altrate , total.ast_tx_shortretry , total.ast_tx_longretry From owner-p4-projects@FreeBSD.ORG Tue Nov 30 01:12:47 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 972FA16A4D0; Tue, 30 Nov 2004 01:12:47 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 71B4416A4CE for ; Tue, 30 Nov 2004 01:12:47 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 446E643D39 for ; Tue, 30 Nov 2004 01:12:47 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iAU1Clfk048992 for ; Tue, 30 Nov 2004 01:12:47 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iAU1CkoB048989 for perforce@freebsd.org; Tue, 30 Nov 2004 01:12:46 GMT (envelope-from sam@freebsd.org) Date: Tue, 30 Nov 2004 01:12:46 GMT Message-Id: <200411300112.iAU1CkoB048989@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66080 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Nov 2004 01:12:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=66080 Change 66080 by sam@sam_ebb on 2004/11/30 01:12:35 save mbuf guard word hack Affected files ... .. //depot/projects/wifi/sys/conf/options#5 edit .. //depot/projects/wifi/sys/kern/kern_mbuf.c#2 edit .. //depot/projects/wifi/sys/sys/mbuf.h#3 edit Differences ... ==== //depot/projects/wifi/sys/conf/options#5 (text+ko) ==== @@ -491,6 +491,7 @@ INVARIANT_SUPPORT opt_global.h INVARIANTS opt_global.h LOOKUP_SHARED opt_global.h +MBUF_GUARD opt_global.h MCLSHIFT opt_global.h MUTEX_DEBUG opt_global.h MUTEX_NOINLINE opt_global.h ==== //depot/projects/wifi/sys/kern/kern_mbuf.c#2 (text+ko) ==== @@ -216,6 +216,9 @@ #endif } else m->m_data = m->m_dat; +#ifdef MBUF_GUARD + *(uint32_t *)(m+1) = MBUF_GUARDWORD; +#endif mbstat.m_mbufs += 1; /* XXX */ return (0); } @@ -229,6 +232,7 @@ struct mbuf *m; m = (struct mbuf *)mem; + MBUF_GUARDCHECK(m); if ((m->m_flags & M_PKTHDR) != 0) m_tag_delete_chain(m, NULL); mbstat.m_mbufs -= 1; /* XXX */ @@ -241,6 +245,7 @@ struct mbuf *m; m = (struct mbuf *)mem; + MBUF_GUARDCHECK(m); if ((m->m_flags & M_PKTHDR) != 0) m_tag_delete_chain(m, NULL); mbstat.m_mbufs -= 1; /* XXX */ @@ -354,6 +359,9 @@ return (error); #endif } +#ifdef MBUF_GUARD + *(uint32_t *)(m+1) = MBUF_GUARDWORD; +#endif mbstat.m_mbufs += 1; /* XXX */ mbstat.m_mclusts += 1; /* XXX */ return (0); ==== //depot/projects/wifi/sys/sys/mbuf.h#3 (text+ko) ==== @@ -52,7 +52,16 @@ * to allocate a separate buffer externally and attach it to the mbuf in * a way similar to that of mbuf clusters. */ +#ifdef MBUF_GUARD +#define MLEN (MSIZE - sizeof(struct m_hdr) - sizeof(uint32_t)) +#define MBUF_GUARDWORD 0x99118822 +#define MBUF_GUARDCHECK(m) do { \ + KASSERT(*(uint32_t *)(m+1) == MBUF_GUARDWORD, \ + ("mbuf guardword clobbered, found 0x%x", *(uint32_t *)(m+1))); \ +} while (0) +#else #define MLEN (MSIZE - sizeof(struct m_hdr)) /* normal data len */ +#endif #define MHLEN (MLEN - sizeof(struct pkthdr)) /* data len w/pkthdr */ #define MINCLSIZE (MHLEN + 1) /* smallest amount to put in cluster */ #define M_MAXCOMPRESS (MHLEN / 2) /* max amount to copy for compression */ From owner-p4-projects@FreeBSD.ORG Tue Nov 30 01:33:13 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AC8C316A4D0; Tue, 30 Nov 2004 01:33:12 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 62F5216A4CE for ; Tue, 30 Nov 2004 01:33:12 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2E20F43D4C for ; Tue, 30 Nov 2004 01:33:12 +0000 (GMT) (envelope-from trhodes@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iAU1XCD5049661 for ; Tue, 30 Nov 2004 01:33:12 GMT (envelope-from trhodes@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iAU1XBwN049658 for perforce@freebsd.org; Tue, 30 Nov 2004 01:33:11 GMT (envelope-from trhodes@freebsd.org) Date: Tue, 30 Nov 2004 01:33:11 GMT Message-Id: <200411300133.iAU1XBwN049658@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trhodes@freebsd.org using -f From: Tom Rhodes To: Perforce Change Reviews Subject: PERFORCE change 66081 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Nov 2004 01:33:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=66081 Change 66081 by trhodes@trhodes_local on 2004/11/30 01:32:51 Install the man pages from libbsm/man into section 5. Affected files ... .. //depot/projects/trustedbsd/audit3/lib/libbsm/Makefile#5 edit Differences ... ==== //depot/projects/trustedbsd/audit3/lib/libbsm/Makefile#5 (text+ko) ==== @@ -3,6 +3,7 @@ # BSMDIR= ${.CURDIR}/../../contrib/bsm +BSMMANDIR= ${.CURDIR}/../../contrib/bsm/man LIB= bsm SHLIB_MAJOR= 1 @@ -20,6 +21,9 @@ INCS= audit_uevents.h libbsm.h INCSDIR= ${INCLUDEDIR}/bsm -NOMAN= yes +MAN= ${BSMMANDIR}/audit_class.5 ${BSMMANDIR}/audit_control.5 \ + ${BSMMANDIR}/audit_event.5 ${BSMMANDIR}/audit_user.5 \ + ${BSMMANDIR}/audit_warn.5 ${BSMMANDIR}/auditreduce.1 \ + ${BSMMANDIR}/praudit.1 .include From owner-p4-projects@FreeBSD.ORG Tue Nov 30 03:31:35 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2685316A4D0; Tue, 30 Nov 2004 03:31:35 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DCD7D16A4CE for ; Tue, 30 Nov 2004 03:31:34 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AE71D43D49 for ; Tue, 30 Nov 2004 03:31:34 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iAU3VYHv053788 for ; Tue, 30 Nov 2004 03:31:34 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iAU3VYgh053785 for perforce@freebsd.org; Tue, 30 Nov 2004 03:31:34 GMT (envelope-from sam@freebsd.org) Date: Tue, 30 Nov 2004 03:31:34 GMT Message-Id: <200411300331.iAU3VYgh053785@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66083 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Nov 2004 03:31:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=66083 Change 66083 by sam@sam_ebb on 2004/11/30 03:31:17 cleanup stuck beacon handling a touch Affected files ... .. //depot/projects/wifi/sys/dev/ath/if_ath.c#31 edit .. //depot/projects/wifi/sys/dev/ath/if_athvar.h#12 edit Differences ... ==== //depot/projects/wifi/sys/dev/ath/if_ath.c#31 (text+ko) ==== @@ -120,6 +120,7 @@ static void ath_updateslot(struct ifnet *); static int ath_beacon_alloc(struct ath_softc *, struct ieee80211_node *); static void ath_beacon_proc(void *, int); +static void ath_beacon_stuck_proc(void *, int); static void ath_beacon_free(struct ath_softc *); static void ath_beacon_config(struct ath_softc *); static int ath_desc_alloc(struct ath_softc *); @@ -356,6 +357,7 @@ TASK_INIT(&sc->sc_rxorntask, 0, ath_rxorn_proc, sc); TASK_INIT(&sc->sc_fataltask, 0, ath_fatal_proc, sc); TASK_INIT(&sc->sc_bmisstask, 0, ath_bmiss_proc, sc); + TASK_INIT(&sc->sc_bstucktask, 0, ath_beacon_stuck_proc, sc); /* * Allocate hardware transmit queues: one queue for @@ -743,10 +745,7 @@ struct ath_softc *sc = arg; struct ifnet *ifp = &sc->sc_if; - if (sc->sc_bmisscount != 0) - if_printf(ifp, "stuck beacon; resetting\n"); - else - if_printf(ifp, "hardware error; resetting\n"); + if_printf(ifp, "hardware error; resetting\n"); ath_reset(ifp); } @@ -1811,7 +1810,7 @@ __func__, sc->sc_bmisscount); /* XXX reset if too many? */ if (sc->sc_bmisscount > 3) - taskqueue_enqueue(taskqueue_swi, &sc->sc_fataltask); + taskqueue_enqueue(taskqueue_swi, &sc->sc_bstucktask); return; } if (sc->sc_bmisscount != 0) { @@ -1857,7 +1856,7 @@ DPRINTF(sc, ATH_DEBUG_ANY, "%s: beacon queue %u did not stop?\n", __func__, sc->sc_bhalq); - /* XXX how to recover? reset? */ + /* NB: should never happen since we check above? */ } bus_dmamap_sync(sc->sc_dmat, bf->bf_dmamap, BUS_DMASYNC_PREWRITE); @@ -1874,6 +1873,17 @@ sc->sc_bhalq, (caddr_t)bf->bf_daddr, bf->bf_desc); } +static void +ath_beacon_stuck_proc(void *arg, int pending) +{ + struct ath_softc *sc = arg; + struct ifnet *ifp = &sc->sc_if; + + if_printf(ifp, "stuck beacon; resetting (bmiss count %u)\n", + sc->sc_bmisscount); + ath_reset(ifp); +} + /* * Reclaim beacon resources. */ ==== //depot/projects/wifi/sys/dev/ath/if_athvar.h#12 (text+ko) ==== @@ -221,6 +221,7 @@ struct ath_buf *sc_bufptr; /* allocated buffer ptr */ struct ieee80211_beacon_offsets sc_boff;/* dynamic update state */ struct task sc_bmisstask; /* bmiss int processing */ + struct task sc_bstucktask; /* stuck beacon processing */ enum { OK, /* no change needed */ UPDATE, /* update pending */ From owner-p4-projects@FreeBSD.ORG Tue Nov 30 03:34:40 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B0AB316A4D0; Tue, 30 Nov 2004 03:34:39 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 729E116A4CE for ; Tue, 30 Nov 2004 03:34:39 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0E59F43D2F for ; Tue, 30 Nov 2004 03:34:39 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iAU3YdXN053837 for ; Tue, 30 Nov 2004 03:34:39 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iAU3Yc2A053834 for perforce@freebsd.org; Tue, 30 Nov 2004 03:34:38 GMT (envelope-from peter@freebsd.org) Date: Tue, 30 Nov 2004 03:34:38 GMT Message-Id: <200411300334.iAU3Yc2A053834@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 66084 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Nov 2004 03:34:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=66084 Change 66084 by peter@peter_daintree on 2004/11/30 03:34:20 IFC @66082 (update to fresher dogfood) Affected files ... .. //depot/projects/hammer/bin/ps/ps.1#18 integrate .. //depot/projects/hammer/etc/devd.conf#16 integrate .. //depot/projects/hammer/etc/usbd.conf#4 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_format_pax.c#15 integrate .. //depot/projects/hammer/lib/libc/sys/mount.2#8 integrate .. //depot/projects/hammer/lib/libc/sys/statfs.2#6 integrate .. //depot/projects/hammer/sbin/devd/devd.8#10 integrate .. //depot/projects/hammer/sbin/mount/mntopts.h#5 integrate .. //depot/projects/hammer/sbin/mount/mount.8#13 integrate .. //depot/projects/hammer/sbin/mount/mount.c#15 integrate .. //depot/projects/hammer/sbin/mount_std/mount_std.8#6 integrate .. //depot/projects/hammer/sbin/sconfig/sconfig.8#6 integrate .. //depot/projects/hammer/share/man/man4/smp.4#7 integrate .. //depot/projects/hammer/share/man/man7/security.7#10 integrate .. //depot/projects/hammer/share/man/man9/vfs_mount.9#4 integrate .. //depot/projects/hammer/sys/amd64/amd64/busdma_machdep.c#27 integrate .. //depot/projects/hammer/sys/amd64/amd64/gdb_machdep.c#6 integrate .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#110 integrate .. //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#55 integrate .. //depot/projects/hammer/sys/boot/i386/loader/Makefile#9 integrate .. //depot/projects/hammer/sys/boot/i386/loader/loader.rc#3 delete .. //depot/projects/hammer/sys/boot/pc98/btx/btx/btx.S#5 integrate .. //depot/projects/hammer/sys/boot/pc98/loader/Makefile#7 integrate .. //depot/projects/hammer/sys/dev/acpi_support/acpi_sony.c#2 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_pci.c#18 integrate .. //depot/projects/hammer/sys/dev/uart/uart_cpu_sparc64.c#11 integrate .. //depot/projects/hammer/sys/dev/usb/umass.c#28 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs#52 integrate .. //depot/projects/hammer/sys/geom/geom_mbr.c#19 integrate .. //depot/projects/hammer/sys/i386/i386/busdma_machdep.c#23 integrate .. //depot/projects/hammer/sys/ia64/include/bootinfo.h#3 integrate .. //depot/projects/hammer/sys/kern/kern_descrip.c#37 integrate .. //depot/projects/hammer/sys/kern/kern_lock.c#13 integrate .. //depot/projects/hammer/sys/kern/subr_param.c#12 integrate .. //depot/projects/hammer/sys/kern/uipc_socket.c#44 integrate .. //depot/projects/hammer/sys/kern/vfs_export.c#8 integrate .. //depot/projects/hammer/sys/kern/vfs_mount.c#41 integrate .. //depot/projects/hammer/sys/netinet/tcp_input.c#41 integrate .. //depot/projects/hammer/sys/netinet/tcp_output.c#26 integrate .. //depot/projects/hammer/sys/netinet6/scope6.c#5 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_vnops.c#27 integrate .. //depot/projects/hammer/sys/sys/pioctl.h#2 integrate .. //depot/projects/hammer/sys/sys/socket.h#15 integrate .. //depot/projects/hammer/tools/tools/nanobsd/Customize/NET4801#1 branch .. //depot/projects/hammer/tools/tools/nanobsd/Customize/comconsole#1 branch .. //depot/projects/hammer/tools/tools/nanobsd/Customize/default#1 branch .. //depot/projects/hammer/tools/tools/nanobsd/Customize/nobeastie#1 branch .. //depot/projects/hammer/tools/tools/nanobsd/Makefile#6 integrate .. //depot/projects/hammer/tools/tools/nanobsd/customize.sh#2 integrate .. //depot/projects/hammer/tools/tools/nanobsd/i386.diskimage#8 integrate .. //depot/projects/hammer/tools/tools/nanobsd/make.conf#9 integrate .. //depot/projects/hammer/usr.bin/make/Makefile#10 integrate .. //depot/projects/hammer/usr.bin/make/arch.c#5 integrate .. //depot/projects/hammer/usr.bin/make/for.c#6 integrate .. //depot/projects/hammer/usr.bin/make/lst.h#3 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstAppend.c#4 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstAtEnd.c#4 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstAtFront.c#4 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstClose.c#4 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstConcat.c#4 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstDatum.c#4 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstDeQueue.c#4 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstDestroy.c#4 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstDupl.c#4 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstEnQueue.c#4 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstFind.c#4 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstFindFrom.c#4 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstFirst.c#4 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstForEach.c#4 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstForEachFrom.c#4 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstInit.c#4 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstInsert.c#4 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstInt.h#2 delete .. //depot/projects/hammer/usr.bin/make/lst.lib/lstIsAtEnd.c#4 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstIsEmpty.c#4 delete .. //depot/projects/hammer/usr.bin/make/lst.lib/lstLast.c#3 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstMember.c#4 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstNext.c#4 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstOpen.c#4 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstRemove.c#4 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstReplace.c#4 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstSucc.c#4 integrate .. //depot/projects/hammer/usr.bin/make/main.c#20 integrate .. //depot/projects/hammer/usr.bin/make/parse.c#15 integrate .. //depot/projects/hammer/usr.sbin/ppp/bundle.c#4 integrate .. //depot/projects/hammer/usr.sbin/ppp/bundle.h#5 integrate .. //depot/projects/hammer/usr.sbin/ppp/command.c#11 integrate .. //depot/projects/hammer/usr.sbin/ppp/main.c#4 integrate .. //depot/projects/hammer/usr.sbin/ppp/ppp.8.m4#13 integrate .. //depot/projects/hammer/usr.sbin/ppp/radius.c#12 integrate .. //depot/projects/hammer/usr.sbin/usbd/usbd.c#6 integrate Differences ... ==== //depot/projects/hammer/bin/ps/ps.1#18 (text+ko) ==== @@ -26,7 +26,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/ps/ps.1,v 1.79 2004/06/22 01:59:54 gad Exp $ +.\" $FreeBSD: src/bin/ps/ps.1,v 1.80 2004/11/29 12:00:24 rwatson Exp $ .\" .Dd March 27, 2004 .Dt PS 1 @@ -249,7 +249,9 @@ .Nm will use the one which was specified last. .It Fl Z -Add label to the list of keywords for which +Add +.Xr mac 4 +label to the list of keywords for which .Nm will display information. .El @@ -601,9 +603,6 @@ .El .Sh FILES .Bl -tag -width ".Pa /boot/kernel/kernel" -compact -.It Pa /dev/lomac -interface used to query the -.Xr lomac 4 KLD .It Pa /boot/kernel/kernel default system namelist @@ -618,7 +617,7 @@ .Xr w 1 , .Xr kvm 3 , .Xr strftime 3 , -.Xr lomac 4 , +.Xr mac 4 , .Xr procfs 5 , .Xr pstat 8 , .Xr sysctl 8 , ==== //depot/projects/hammer/etc/devd.conf#16 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/devd.conf,v 1.18 2004/11/08 20:24:51 ru Exp $ +# $FreeBSD: src/etc/devd.conf,v 1.19 2004/11/28 23:16:00 iedowse Exp $ # # Refer to devd.conf(5) and devd(8) man pages for the details on how to # run and configure devd. @@ -66,6 +66,13 @@ action "kbdcontrol -k /dev/kbd0 < /dev/console"; }; +# The entry below starts moused when a mouse is plugged in. Moused +# stops automatically (actually it bombs :) when the device disappears. +attach 100 { + device-name "ums[0-9]+"; + action "/etc/rc.d/moused start $device-name"; +}; + # # Rescan scsi device-names on attach, but not detach. # ==== //depot/projects/hammer/etc/usbd.conf#4 (text+ko) ==== @@ -2,7 +2,7 @@ # # See usbd.conf(5) for the description of the format of the file. # -# $FreeBSD: src/etc/usbd.conf,v 1.13 2004/11/01 18:05:40 mtm Exp $ +# $FreeBSD: src/etc/usbd.conf,v 1.15 2004/11/28 23:16:00 iedowse Exp $ # Firmware download into the ActiveWire board. After the firmware download is # done the device detaches and reappears as something new and shiny automatically. @@ -22,15 +22,6 @@ attach "if ! kldstat -n usio > /dev/null 2>&1 ; then kldload usio; fi" attach "/usr/sbin/ezdownload -v -f /usr/share/usb/firmware/1645.8001.0101 /dev/${DEVNAME}" -# The entry below starts and stops dhclient when an ethernet device is inserted -# Caveat: It does not support multiple interfaces (but neither does pccardd, -# it shouldn't be too big a deal :-) -# -device "USB ethernet" - devname "[ackr]ue[0-9]+" - attach "/etc/pccard_ether ${DEVNAME} start" - detach "/etc/pccard_ether ${DEVNAME} stop" - # This entry starts the ColdSync tool in daemon mode. Make sure you have an up # to date /usr/local/etc/palms. We override the 'listen' settings for port and # type in /usr/local/etc/coldsync.conf. @@ -41,13 +32,6 @@ release 0x0100 attach "/usr/local/bin/coldsync -md -p /dev/${DEVNAME} -t usb" -# The entry below starts moused when a mouse is plugged in. Moused -# stops automatically (actually it bombs :) when the device disappears. -# -device "Mouse" - devname "ums[0-9]+" - attach "/etc/rc.d/moused start ${DEVNAME}" - # The fallthrough entry: Nothing is specified, nothing is done. And it isn't # necessary at all :-). Just for pretty printing in debugging mode. # ==== //depot/projects/hammer/lib/libarchive/archive_write_set_format_pax.c#15 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_pax.c,v 1.21 2004/11/15 01:46:33 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_pax.c,v 1.23 2004/11/28 17:57:11 kientzle Exp $"); #include #include @@ -314,7 +314,8 @@ struct archive_entry *entry_main; const char *linkname, *p; const char *hardlink; - const wchar_t *wp, *wp2, *wname_start; + const wchar_t *wp, *wp2; + const char *suffix_start; int need_extension, r, ret; struct pax *pax; const struct stat *st_main, *st_original; @@ -368,11 +369,11 @@ */ wp = archive_entry_pathname_w(entry_main); p = archive_entry_pathname(entry_main); - if (wcslen(wp) <= 100) /* Short enough for just 'name' field */ - wname_start = wp; /* Record a zero-length prefix */ + if (strlen(p) <= 100) /* Short enough for just 'name' field */ + suffix_start = p; /* Record a zero-length prefix */ else /* Find the largest suffix that fits in 'name' field. */ - wname_start = wcschr(wp + wcslen(wp) - 100 - 1, '/'); + suffix_start = strchr(p + strlen(p) - 100 - 1, '/'); /* Find non-ASCII character, if any. */ wp2 = wp; @@ -383,8 +384,7 @@ * If name is too long, or has non-ASCII characters, add * 'path' to pax extended attrs. */ - if (wname_start == NULL || wname_start - wp > 155 || - *wp2 != L'\0') { + if (suffix_start == NULL || suffix_start - p > 155 || *wp2 != L'\0') { add_pax_attr_w(&(pax->pax_header), "path", wp); archive_entry_set_pathname(entry_main, build_ustar_entry_name(ustar_entry_name, p)); @@ -657,7 +657,7 @@ /* Note that the 'x' header shouldn't ever fail to format */ if (ret != 0) { - const char *msg = "archive_write_header_pax: " + const char *msg = "archive_write_pax_header: " "'x' header failed?! This can't happen.\n"; write(2, msg, strlen(msg)); exit(1); ==== //depot/projects/hammer/lib/libc/sys/mount.2#8 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)mount.2 8.3 (Berkeley) 5/24/95 -.\" $FreeBSD: src/lib/libc/sys/mount.2,v 1.40 2004/08/13 14:33:03 roam Exp $ +.\" $FreeBSD: src/lib/libc/sys/mount.2,v 1.41 2004/11/29 09:56:12 ru Exp $ .\" -.Dd August 13, 2004 +.Dd November 26, 2004 .Dt MOUNT 2 .Os .Sh NAME @@ -130,9 +130,6 @@ This flag is set automatically when the caller is not the super-user. .It Dv MNT_NOATIME Disable update of file access times. -.It Dv MNT_NODEV -Do not interpret special files on the file system. -This flag is set automatically when the caller is not the super-user. .It Dv MNT_SNAPSHOT Create a snapshot of the file system. This is currently only supported on UFS2 file systems, see ==== //depot/projects/hammer/lib/libc/sys/statfs.2#6 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)statfs.2 8.5 (Berkeley) 5/24/95 -.\" $FreeBSD: src/lib/libc/sys/statfs.2,v 1.25 2004/07/20 19:30:57 csjp Exp $ +.\" $FreeBSD: src/lib/libc/sys/statfs.2,v 1.26 2004/11/29 09:56:12 ru Exp $ .\" -.Dd November 16, 2003 +.Dd November 26, 2004 .Dt STATFS 2 .Os .Sh NAME @@ -108,8 +108,6 @@ Files may not be executed from the file system. .It Dv MNT_NOSUID Setuid and setgid bits on files are not honored when they are executed. -.It Dv MNT_NODEV -Special files in the file system may not be opened. .It Dv MNT_SYNCHRONOUS All I/O to the file system is done synchronously. .It Dv MNT_ASYNC ==== //depot/projects/hammer/sbin/devd/devd.8#10 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sbin/devd/devd.8,v 1.12 2004/07/07 19:57:14 ru Exp $ +.\" $FreeBSD: src/sbin/devd/devd.8,v 1.13 2004/11/28 17:44:22 ceri Exp $ .\" .Dd October 17, 2002 .Dt DEVD 8 @@ -103,7 +103,9 @@ .Ic options section, one can define multiple directories to search for config files. -All files in each of these directories are parsed. +All files in these directories whose names match the patten +.Pa *.conf +are parsed. These files are intended to be installed by third party vendors that wish to hook into the .Nm ==== //depot/projects/hammer/sbin/mount/mntopts.h#5 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)mntopts.h 8.7 (Berkeley) 3/29/95 - * $FreeBSD: src/sbin/mount/mntopts.h,v 1.22 2004/11/25 13:31:46 phk Exp $ + * $FreeBSD: src/sbin/mount/mntopts.h,v 1.23 2004/11/29 09:35:01 ru Exp $ */ struct mntopt { @@ -40,7 +40,6 @@ /* User-visible MNT_ flags. */ #define MOPT_ASYNC { "async", 0, MNT_ASYNC, 0 } #define MOPT_NOATIME { "atime", 1, MNT_NOATIME, 0 } -#define MOPT_NODEV { "dev", 1, MNT_NODEV, 0 } #define MOPT_NOEXEC { "exec", 1, MNT_NOEXEC, 0 } #define MOPT_NOSUID { "suid", 1, MNT_NOSUID, 0 } #define MOPT_NOSYMFOLLOW { "symfollow", 1, MNT_NOSYMFOLLOW, 0 } @@ -76,7 +75,6 @@ MOPT_GROUPQUOTA, \ MOPT_FSTAB_COMPAT, \ MOPT_NOATIME, \ - MOPT_NODEV, \ MOPT_NOEXEC, \ MOPT_SUIDDIR, /* must be before MOPT_NOSUID */ \ MOPT_NOSUID, \ ==== //depot/projects/hammer/sbin/mount/mount.8#13 (text+ko) ==== @@ -26,9 +26,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)mount.8 8.8 (Berkeley) 6/16/94 -.\" $FreeBSD: src/sbin/mount/mount.8,v 1.68 2004/05/17 08:35:42 ru Exp $ +.\" $FreeBSD: src/sbin/mount/mount.8,v 1.69 2004/11/29 09:35:01 ru Exp $ .\" -.Dd April 7, 2003 +.Dd November 26, 2004 .Dt MOUNT 8 .Os .Sh NAME @@ -177,12 +177,6 @@ Disable read clustering. .It Cm noclusterw Disable write clustering. -.It Cm nodev -Do not interpret character or block special devices on the file system. -This option is useful for a server that has file systems containing -special devices for architectures other than its own. -This option is set automatically when the user does not have super-user -privileges. .It Cm noexec Do not allow execution of any binaries on the mounted file system. This option is useful for a server that has file systems containing ==== //depot/projects/hammer/sbin/mount/mount.c#15 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)mount.c 8.25 (Berkeley) 5/8/95"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/mount/mount.c,v 1.66 2004/04/26 15:13:45 bmilekic Exp $"; + "$FreeBSD: src/sbin/mount/mount.c,v 1.67 2004/11/29 09:35:01 ru Exp $"; #endif /* not lint */ #include @@ -93,7 +93,6 @@ { MNT_EXPORTED, "NFS exported" }, { MNT_LOCAL, "local" }, { MNT_NOATIME, "noatime" }, - { MNT_NODEV, "nodev" }, { MNT_NOEXEC, "noexec" }, { MNT_NOSUID, "nosuid" }, { MNT_NOSYMFOLLOW, "nosymfollow" }, @@ -750,7 +749,6 @@ if (flags & MNT_SYNCHRONOUS) res = catopt(res, "sync"); if (flags & MNT_NOEXEC) res = catopt(res, "noexec"); if (flags & MNT_NOSUID) res = catopt(res, "nosuid"); - if (flags & MNT_NODEV) res = catopt(res, "nodev"); if (flags & MNT_UNION) res = catopt(res, "union"); if (flags & MNT_ASYNC) res = catopt(res, "async"); if (flags & MNT_NOATIME) res = catopt(res, "noatime"); ==== //depot/projects/hammer/sbin/mount_std/mount_std.8#6 (text+ko) ==== @@ -30,9 +30,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sbin/mount_std/mount_std.8,v 1.22 2004/07/02 21:45:04 ru Exp $ +.\" $FreeBSD: src/sbin/mount_std/mount_std.8,v 1.23 2004/11/29 09:35:01 ru Exp $ .\" -.Dd May 13, 1996 +.Dd November 26, 2004 .Dt MOUNT_STD 8 .Os .Sh NAME @@ -70,7 +70,6 @@ options .Dq ro , .Dq rw , -.Dq nodev , .Dq noexec , .Dq nosuid , and ==== //depot/projects/hammer/sbin/sconfig/sconfig.8#6 (text+ko) ==== @@ -10,7 +10,7 @@ .\" as long as this message is kept with the software, all derivative .\" works or modified versions. .\" -.\" $FreeBSD: src/sbin/sconfig/sconfig.8,v 1.5 2004/05/20 16:40:06 ru Exp $ +.\" $FreeBSD: src/sbin/sconfig/sconfig.8,v 1.6 2004/11/29 15:32:31 rik Exp $ .Dd May 19, 2004 .Dt SCONFIG 8 i386 .Os @@ -572,7 +572,7 @@ .Xr sppp 4 , .Xr ifconfig 8 , .Xr route 8 , -.Xr spppconrol 8 +.Xr spppcontrol 8 .\"-------------------------------------------------------------- .Sh HISTORY This utility is a replacement for the ==== //depot/projects/hammer/share/man/man4/smp.4#7 (text+ko) ==== @@ -21,7 +21,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/smp.4,v 1.19 2004/06/16 08:33:54 ru Exp $ +.\" $FreeBSD: src/share/man/man4/smp.4,v 1.20 2004/11/29 19:51:50 ceri Exp $ .\" .Dd December 5, 2002 .Dt SMP 4 @@ -39,7 +39,7 @@ Support for multi-processor systems is present for all Tier-1 architectures on .Fx . -Currently, this includes alpha, i386, ia64, and sparc64. +Currently, this includes alpha, amd64, i386, ia64, and sparc64. Support is enabled using .Cd options SMP . It is permissible to use the SMP kernel configuration on non-SMP equipped ==== //depot/projects/hammer/share/man/man7/security.7#10 (text+ko) ==== @@ -21,9 +21,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man7/security.7,v 1.39 2004/08/07 04:40:20 imp Exp $ +.\" $FreeBSD: src/share/man/man7/security.7,v 1.40 2004/11/29 09:56:12 ru Exp $ .\" -.Dd September 18, 1999 +.Dd November 29, 2004 .Dt SECURITY 7 .Os .Sh NAME @@ -630,16 +630,14 @@ If you have a huge amount of user disk space it may take too long to run through every file on those partitions. In this case, setting mount -flags to disallow SUID binaries and devices on those partitions is a good +flags to disallow SUID binaries on those partitions is a good idea. The -.Cm nodev -and .Cm nosuid -options +option (see .Xr mount 8 ) -are what you want to look into. +is what you want to look into. I would scan them anyway at least once a week, since the object of this layer is to detect a break-in whether or not the break-in is effective. ==== //depot/projects/hammer/share/man/man9/vfs_mount.9#4 (text+ko) ==== @@ -24,9 +24,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH .\" DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/vfs_mount.9,v 1.11 2003/10/23 06:17:12 hmp Exp $ +.\" $FreeBSD: src/share/man/man9/vfs_mount.9,v 1.12 2004/11/29 09:56:12 ru Exp $ .\" -.Dd July 8, 2001 +.Dd November 26, 2004 .Dt VFS_MOUNT 9 .Os .Sh NAME @@ -70,7 +70,7 @@ .Xr mount 2 for details. .Pp -.Dv MNT_EXPORTED , MNT_NOSUID , MNT_NODEV , MNT_UPDATE , MNT_RELOAD , +.Dv MNT_EXPORTED , MNT_NOSUID , MNT_UPDATE , MNT_RELOAD , .Dv MNT_FORCE , MNT_ASYNC , MNT_SYNCHRONOUS , MNT_UNION , MNT_NOATIME , .Dv MNT_SNAPSHOT , MNT_NOCLUSTERR , MNT_NOCLUSTERW , MNT_IGNORE , .Dv MNT_UNION , MNT_NOSYMFOLLOW ==== //depot/projects/hammer/sys/amd64/amd64/busdma_machdep.c#27 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.63 2004/11/21 06:28:09 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.64 2004/11/29 14:49:27 scottl Exp $"); #include #include @@ -277,7 +277,7 @@ } if (newtag->lowaddr < ptoa((vm_paddr_t)Maxmem) - || newtag->alignment > 1 || newtag->boundary > 0) + || newtag->alignment > 1) newtag->flags |= BUS_DMA_COULD_BOUNCE; if (((newtag->flags & BUS_DMA_COULD_BOUNCE) != 0) && ==== //depot/projects/hammer/sys/amd64/amd64/gdb_machdep.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/gdb_machdep.c,v 1.1 2004/07/10 17:47:20 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/gdb_machdep.c,v 1.2 2004/11/30 00:55:49 peter Exp $"); #include #include ==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#110 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.624 2004/11/27 06:51:32 das Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.625 2004/11/29 23:27:07 peter Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" ==== //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#55 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.238 2004/11/27 06:51:34 das Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.239 2004/11/29 23:25:56 peter Exp $"); #include "opt_isa.h" #include "opt_cpu.h" ==== //depot/projects/hammer/sys/boot/i386/loader/Makefile#9 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/i386/loader/Makefile,v 1.76 2004/02/27 14:10:09 ru Exp $ +# $FreeBSD: src/sys/boot/i386/loader/Makefile,v 1.78 2004/11/29 09:31:04 ru Exp $ PROG= loader.sym INTERNALPROG= @@ -73,13 +73,13 @@ .PATH: ${.CURDIR}/../../forth FILES= loader loader.help loader.4th support.4th loader.conf -FILES+= screen.4th frames.4th beastie.4th +FILES+= screen.4th frames.4th # XXX INSTALLFLAGS_loader= -b FILESMODE_loader= ${BINMODE} -b FILESDIR_loader.conf= /boot/defaults .if !exists(${DESTDIR}/boot/loader.rc) -FILES+= ${.CURDIR}/loader.rc +FILES+= loader.rc .endif # XXX crt0.o needs to be first for pxeboot(8) to work ==== //depot/projects/hammer/sys/boot/pc98/btx/btx/btx.S#5 (text+ko) ==== @@ -12,7 +12,7 @@ * warranties of merchantability and fitness for a particular * purpose. * - * $FreeBSD: src/sys/boot/pc98/btx/btx/btx.S,v 1.19 2004/05/20 20:30:59 markm Exp $ + * $FreeBSD: src/sys/boot/pc98/btx/btx/btx.S,v 1.20 2004/11/29 11:54:42 nyan Exp $ */ /* @@ -1081,8 +1081,9 @@ .set SIO_FMT,SIOFMT # 8N1 .set SIO_DIV,(115200/SIOSPD) # 115200 / SPD +/* * void sio_init(void) - + */ sio_init: movw $SIO_PRT+0x3,%dx # Data format reg movb $SIO_FMT|0x80,%al # Set format outb %al,(%dx) # and DLAB @@ -1098,15 +1099,17 @@ outb %al,(%dx) # DTR incl %edx # Line status reg +/* * void sio_flush(void) - + */ sio_flush.0: call sio_getc.1 # Get character sio_flush: call sio_ischar # Check for character jnz sio_flush.0 # Till none ret # To caller +/* * void sio_putc(int c) - + */ sio_putc: movw $SIO_PRT+0x5,%dx # Line status reg xor %ecx,%ecx # Timeout movb $0x40,%ch # counter @@ -1119,16 +1122,18 @@ outb %al,(%dx) # Write character sio_putc.2: ret $0x4 # To caller +/* * int sio_getc(void) - + */ sio_getc: call sio_ischar # Character available? jz sio_getc # No sio_getc.1: subb $0x5,%dl # Receiver buffer reg inb (%dx),%al # Read character ret # To caller +/* * int sio_ischar(void) - + */ sio_ischar: movw $SIO_PRT+0x5,%dx # Line status register xorl %eax,%eax # Zero inb (%dx),%al # Received data ==== //depot/projects/hammer/sys/boot/pc98/loader/Makefile#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/pc98/loader/Makefile,v 1.35 2004/03/14 09:41:57 nyan Exp $ +# $FreeBSD: src/sys/boot/pc98/loader/Makefile,v 1.36 2004/11/29 11:55:14 nyan Exp $ PROG= loader.sym INTERNALPROG= @@ -76,13 +76,13 @@ .PATH: ${.CURDIR}/../../forth FILES= loader loader.help loader.4th support.4th loader.conf -FILES+= screen.4th frames.4th beastie.4th +FILES+= screen.4th frames.4th # XXX INSTALLFLAGS_loader= -b FILESMODE_loader= ${BINMODE} -b FILESDIR_loader.conf= /boot/defaults .if !exists(${DESTDIR}/boot/loader.rc) -FILES+= ${.CURDIR}/../../i386/loader/loader.rc +FILES+= loader.rc .endif # XXX crt0.o needs to be first for pxeboot(8) to work ==== //depot/projects/hammer/sys/dev/acpi_support/acpi_sony.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpi_support/acpi_sony.c,v 1.5 2004/11/15 20:08:44 imp Exp $ + * $FreeBSD: src/sys/dev/acpi_support/acpi_sony.c,v 1.6 2004/11/29 16:40:30 imp Exp $ */ #include "opt_acpi.h" @@ -35,25 +35,25 @@ #include #include #include -#define ACPI_SNC_GET_BRIGHTNESS "GBRT" -#define ACPI_SNC_SET_BRIGHTNESS "SBRT" -#define ACPI_SNC_GET_PID "GPID" +#define ACPI_SONY_GET_BRIGHTNESS "GBRT" +#define ACPI_SONY_SET_BRIGHTNESS "SBRT" +#define ACPI_SONY_GET_PID "GPID" /* * SNY5001 * [GS]BRT [GS]PBR [GS]CTR [GS]PCR [GS]CMI [CDPW GCDP]? GWDP PWAK PWRN * */ -struct acpi_snc_softc { +struct acpi_sony_softc { int pid; }; -static struct acpi_snc_name_list +static struct acpi_sony_name_list { char *nodename; char *getmethod; char *setmethod; char *comment; -} acpi_snc_oids[] = { +} acpi_sony_oids[] = { { "brightness", "GBRT", "SBRT", "Display Brightness"}, { "ctr", "GCTR", "SCTR", "??"}, { "pcr", "GPCR", "SPCR", "???"}, @@ -65,37 +65,37 @@ {NULL, NULL,NULL} }; -static int acpi_snc_probe(device_t dev); -static int acpi_snc_attach(device_t dev); -static int acpi_snc_detach(device_t dev); -static int sysctl_acpi_snc_gen_handler(SYSCTL_HANDLER_ARGS); +static int acpi_sony_probe(device_t dev); +static int acpi_sony_attach(device_t dev); +static int acpi_sony_detach(device_t dev); +static int sysctl_acpi_sony_gen_handler(SYSCTL_HANDLER_ARGS); -static device_method_t acpi_snc_methods[] = { +static device_method_t acpi_sony_methods[] = { /* Device interface */ - DEVMETHOD(device_probe, acpi_snc_probe), - DEVMETHOD(device_attach, acpi_snc_attach), - DEVMETHOD(device_detach, acpi_snc_detach), + DEVMETHOD(device_probe, acpi_sony_probe), + DEVMETHOD(device_attach, acpi_sony_attach), + DEVMETHOD(device_detach, acpi_sony_detach), {0, 0} }; -static driver_t acpi_snc_driver = { - "acpi_snc", - acpi_snc_methods, - sizeof(struct acpi_snc_softc), +static driver_t acpi_sony_driver = { + "acpi_sony", + acpi_sony_methods, + sizeof(struct acpi_sony_softc), }; -static devclass_t acpi_snc_devclass; +static devclass_t acpi_sony_devclass; -DRIVER_MODULE(acpi_snc, acpi, acpi_snc_driver, acpi_snc_devclass, +DRIVER_MODULE(acpi_sony, acpi, acpi_sony_driver, acpi_sony_devclass, 0, 0); -MODULE_DEPEND(acpi_snc, acpi, 1, 1, 1); +MODULE_DEPEND(acpi_sony, acpi, 1, 1, 1); static char *sny_id[] = {"SNY5001", NULL}; static int -acpi_snc_probe(device_t dev) +acpi_sony_probe(device_t dev) { - struct acpi_snc_softc *sc; + struct acpi_sony_softc *sc; int ret = ENXIO; sc = device_get_softc(dev); @@ -108,59 +108,59 @@ } static int -acpi_snc_attach(device_t dev) +acpi_sony_attach(device_t dev) { - struct acpi_snc_softc *sc; + struct acpi_sony_softc *sc; int i; sc = device_get_softc(dev); - acpi_GetInteger(acpi_get_handle(dev), ACPI_SNC_GET_PID, &sc->pid); + acpi_GetInteger(acpi_get_handle(dev), ACPI_SONY_GET_PID, &sc->pid); device_printf(dev, "PID %x\n", sc->pid); - for (i = 0 ; acpi_snc_oids[i].nodename != NULL; i++){ + for (i = 0 ; acpi_sony_oids[i].nodename != NULL; i++){ SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev), SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), - i, acpi_snc_oids[i].nodename , CTLTYPE_INT | - ((acpi_snc_oids[i].setmethod)? CTLFLAG_RW: CTLFLAG_RD), - dev, i, sysctl_acpi_snc_gen_handler, "I", - acpi_snc_oids[i].comment); + i, acpi_sony_oids[i].nodename , CTLTYPE_INT | + ((acpi_sony_oids[i].setmethod)? CTLFLAG_RW: CTLFLAG_RD), + dev, i, sysctl_acpi_sony_gen_handler, "I", + acpi_sony_oids[i].comment); } return (0); } static int -acpi_snc_detach(device_t dev) +acpi_sony_detach(device_t dev) { return (0); } #if 0 static int -acpi_snc_suspend(device_t dev) +acpi_sony_suspend(device_t dev) { - struct acpi_snc_softc *sc = device_get_softc(dev); + struct acpi_sony_softc *sc = device_get_softc(dev); return (0); } static int -acpi_snc_resume(device_t dev) +acpi_sony_resume(device_t dev) { return (0); } #endif static int -sysctl_acpi_snc_gen_handler(SYSCTL_HANDLER_ARGS) +sysctl_acpi_sony_gen_handler(SYSCTL_HANDLER_ARGS) { device_t dev = arg1; int function = oidp->oid_arg2; int error = 0, val; acpi_GetInteger(acpi_get_handle(dev), - acpi_snc_oids[function].getmethod, &val); + acpi_sony_oids[function].getmethod, &val); error = sysctl_handle_int(oidp, &val, 0, req); - if (error || !req->newptr || !acpi_snc_oids[function].setmethod) + if (error || !req->newptr || !acpi_sony_oids[function].setmethod) return (error); acpi_SetInteger(acpi_get_handle(dev), - acpi_snc_oids[function].setmethod, val); + acpi_sony_oids[function].setmethod, val); return (0); } ==== //depot/projects/hammer/sys/dev/acpica/acpi_pci.c#18 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pci.c,v 1.24 2004/09/22 15:46:16 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pci.c,v 1.25 2004/11/29 18:48:51 njl Exp $"); #include #include @@ -59,6 +59,12 @@ ACPI_SERIAL_DECL(pci_powerstate, "ACPI PCI power methods"); +/* Be sure that ACPI and PCI power states are equivalent. */ +CTASSERT(ACPI_STATE_D0 == PCI_POWERSTATE_D0); +CTASSERT(ACPI_STATE_D1 == PCI_POWERSTATE_D1); +CTASSERT(ACPI_STATE_D2 == PCI_POWERSTATE_D2); +CTASSERT(ACPI_STATE_D3 == PCI_POWERSTATE_D3); + static int acpi_pci_attach(device_t dev); static int acpi_pci_child_location_str_method(device_t cbdev, device_t child, char *buf, size_t buflen); @@ -183,25 +189,11 @@ { ACPI_HANDLE h; ACPI_STATUS status; - int acpi_state, old_state, error; + int old_state, error; error = 0; - switch (state) { - case PCI_POWERSTATE_D0: - acpi_state = ACPI_STATE_D0; - break; - case PCI_POWERSTATE_D1: - acpi_state = ACPI_STATE_D1; - break; - case PCI_POWERSTATE_D2: - acpi_state = ACPI_STATE_D2; - break; - case PCI_POWERSTATE_D3: - acpi_state = ACPI_STATE_D3; - break; - default: + if (state < ACPI_STATE_D0 || state > ACPI_STATE_D3) return (EINVAL); - } /* * We set the state using PCI Power Management outside of setting @@ -220,11 +212,11 @@ goto out; } h = acpi_get_handle(child); - status = acpi_pwr_switch_consumer(h, acpi_state); + status = acpi_pwr_switch_consumer(h, state); if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) device_printf(dev, "Failed to set ACPI power state D%d on %s: %s\n", - acpi_state, acpi_name(h), AcpiFormatException(status)); + state, acpi_name(h), AcpiFormatException(status)); if (old_state > state) error = pci_set_powerstate_method(dev, child, state); ==== //depot/projects/hammer/sys/dev/uart/uart_cpu_sparc64.c#11 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/uart/uart_cpu_sparc64.c,v 1.14 2004/11/17 20:01:43 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_cpu_sparc64.c,v 1.15 2004/11/28 16:00:36 marius Exp $"); #include #include @@ -44,6 +44,14 @@ static struct bus_space_tag bst_store[3]; +/* + * Determine which channel of a SCC a device referenced by an alias is. + * The information present in the OF device tree only allows to do this + * for "ttyX" aliases. If a device is a channel of a SCC its property + * in the /aliases node looks like one of these: + * ttya: '/central/fhc/zs@0,902000:a' + * ttyc: '/pci@1f,0/pci@1,1/ebus@1/se@14,400000:a' + */ static int uart_cpu_channel(char *dev) { @@ -69,9 +77,9 @@ } /* - * Get the address of the UART that is selected as the console, if the - * console is an UART of course. Note that we enforce that both stdin and - * stdout are selected. + * Get the package handle of the UART that is selected as the console, if + * the console is an UART of course. Note that we enforce that both stdin + * and stdout are selected. * Note that the currently active console (i.e. /chosen/stdout and * /chosen/stdin) may not be the same as the device selected in the * environment (ie /options/output-device and /options/input-device) because @@ -115,8 +123,8 @@ } /* - * Get the address of the UART that's selected as the debug port. Since >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Nov 30 03:36:42 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4C0FD16A4D0; Tue, 30 Nov 2004 03:36:42 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 278BD16A4CE for ; Tue, 30 Nov 2004 03:36:42 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 03E1743D1F for ; Tue, 30 Nov 2004 03:36:42 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iAU3afIE053942 for ; Tue, 30 Nov 2004 03:36:41 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iAU3af5j053939 for perforce@freebsd.org; Tue, 30 Nov 2004 03:36:41 GMT (envelope-from peter@freebsd.org) Date: Tue, 30 Nov 2004 03:36:41 GMT Message-Id: <200411300336.iAU3af5j053939@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 66085 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Nov 2004 03:36:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=66085 Change 66085 by peter@peter_daintree on 2004/11/30 03:35:56 integ i386_hammer branch (nop, metadata sync) Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/busdma_machdep.c#28 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/busdma_machdep.c#28 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Tue Nov 30 14:56:25 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5328116A4D0; Tue, 30 Nov 2004 14:56:25 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0E42916A4CE for ; Tue, 30 Nov 2004 14:56:25 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DDC6343D60 for ; Tue, 30 Nov 2004 14:56:24 +0000 (GMT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iAUEuOxT097070 for ; Tue, 30 Nov 2004 14:56:24 GMT (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iAUEuOda097067 for perforce@freebsd.org; Tue, 30 Nov 2004 14:56:24 GMT (envelope-from areisse@nailabs.com) Date: Tue, 30 Nov 2004 14:56:24 GMT Message-Id: <200411301456.iAUEuOda097067@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Subject: PERFORCE change 66101 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Nov 2004 14:56:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=66101 Change 66101 by areisse@areisse_tislabs on 2004/11/30 14:56:18 Bring over an include file from libsepol. Affected files ... .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/checkpolicy/private.h#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Tue Nov 30 15:41:22 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A674416A4D0; Tue, 30 Nov 2004 15:41:21 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6637F16A4CE for ; Tue, 30 Nov 2004 15:41:21 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 286FB43D5F for ; Tue, 30 Nov 2004 15:41:21 +0000 (GMT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iAUFfLwP098828 for ; Tue, 30 Nov 2004 15:41:21 GMT (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iAUFfKGS098825 for perforce@freebsd.org; Tue, 30 Nov 2004 15:41:20 GMT (envelope-from areisse@nailabs.com) Date: Tue, 30 Nov 2004 15:41:20 GMT Message-Id: <200411301541.iAUFfKGS098825@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Subject: PERFORCE change 66104 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Nov 2004 15:41:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=66104 Change 66104 by areisse@areisse_tislabs on 2004/11/30 15:40:59 Import sources from libsepol. Affected files ... .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/avtab.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/conditional.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/constraint.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/context.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/ebitmap.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/flask.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/flask_types.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/hashtab.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/mls.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/mls_types.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/policydb.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/sepol.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/services.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/sidtab.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/symtab.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/Makefile#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/av_permissions.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/avtab.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/conditional.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/ebitmap.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/genbools.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/hashtab.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/libsepol.map#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/mls.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/policydb.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/private.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/services.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/sidtab.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/symtab.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/write.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/utils/genpolbools.c#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Tue Nov 30 15:50:33 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E95D116A4D0; Tue, 30 Nov 2004 15:50:32 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C51EC16A4CE for ; Tue, 30 Nov 2004 15:50:32 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A240643D48 for ; Tue, 30 Nov 2004 15:50:32 +0000 (GMT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iAUFoWnh099104 for ; Tue, 30 Nov 2004 15:50:32 GMT (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iAUFoWbC099101 for perforce@freebsd.org; Tue, 30 Nov 2004 15:50:32 GMT (envelope-from areisse@nailabs.com) Date: Tue, 30 Nov 2004 15:50:32 GMT Message-Id: <200411301550.iAUFoWbC099101@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Subject: PERFORCE change 66105 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Nov 2004 15:50:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=66105 Change 66105 by areisse@areisse_tislabs on 2004/11/30 15:49:38 Add a makefile for libsepol. Affected files ... .. //depot/projects/trustedbsd/sebsd/lib/libsepol/Makefile#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Tue Nov 30 16:30:21 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2ED3416A4D0; Tue, 30 Nov 2004 16:30:21 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 05C9316A4CE for ; Tue, 30 Nov 2004 16:30:21 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D709043D5A for ; Tue, 30 Nov 2004 16:30:20 +0000 (GMT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iAUGUKPi000837 for ; Tue, 30 Nov 2004 16:30:20 GMT (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iAUGUKei000834 for perforce@freebsd.org; Tue, 30 Nov 2004 16:30:20 GMT (envelope-from areisse@nailabs.com) Date: Tue, 30 Nov 2004 16:30:20 GMT Message-Id: <200411301630.iAUGUKei000834@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Subject: PERFORCE change 66106 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Nov 2004 16:30:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=66106 Change 66106 by areisse@areisse_tislabs on 2004/11/30 16:30:13 remove obsolete files from checkpolicy Affected files ... .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/checkpolicy/private.h#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Tue Nov 30 16:38:32 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 285BD16A4D0; Tue, 30 Nov 2004 16:38:32 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DCCF816A4CE for ; Tue, 30 Nov 2004 16:38:31 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B8E6C43D4C for ; Tue, 30 Nov 2004 16:38:31 +0000 (GMT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iAUGcVhQ001140 for ; Tue, 30 Nov 2004 16:38:31 GMT (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iAUGcVqL001137 for perforce@freebsd.org; Tue, 30 Nov 2004 16:38:31 GMT (envelope-from areisse@nailabs.com) Date: Tue, 30 Nov 2004 16:38:31 GMT Message-Id: <200411301638.iAUGcVqL001137@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Subject: PERFORCE change 66108 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Nov 2004 16:38:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=66108 Change 66108 by areisse@areisse_tislabs on 2004/11/30 16:37:43 libsepol changes: -Freebsd byte order swapping -64-bit access vectors Affected files ... .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/avtab.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/flask_types.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/avtab.c#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/private.h#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/write.c#2 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/avtab.h#2 (text+ko) ==== @@ -26,6 +26,7 @@ #include #include +#include typedef struct avtab_key { uint32_t source_type; /* source type */ @@ -44,7 +45,7 @@ #define AVTAB_TYPE (AVTAB_TRANSITION | AVTAB_MEMBER | AVTAB_CHANGE) #define AVTAB_ENABLED 0x80000000 /* reserved for used in cond_avtab */ uint32_t specified; /* what fields are specified */ - uint32_t data[3]; /* access vectors or types */ + access_vector_t data[3]; /* access vectors or types */ #define avtab_allowed(x) (x)->data[0] #define avtab_auditdeny(x) (x)->data[1] #define avtab_auditallow(x) (x)->data[2] ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/include/sepol/flask_types.h#2 (text+ko) ==== @@ -34,7 +34,7 @@ * for permissions are defined in the automatically generated * header file av_permissions.h. */ -typedef uint32_t access_vector_t; +typedef uint64_t access_vector_t; /* * Each object class is identified by a fixed-size value. ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/avtab.c#2 (text+ko) ==== @@ -362,12 +362,21 @@ return -1; } if (avdatum->specified & AVTAB_AV) { - if (avdatum->specified & AVTAB_ALLOWED) - avtab_allowed(avdatum) = le32_to_cpu(buf[items++]); - if (avdatum->specified & AVTAB_AUDITDENY) - avtab_auditdeny(avdatum) = le32_to_cpu(buf[items++]); - if (avdatum->specified & AVTAB_AUDITALLOW) - avtab_auditallow(avdatum) = le32_to_cpu(buf[items++]); + if (avdatum->specified & AVTAB_ALLOWED) { + uint32_t b1 = le32_to_cpu (buf[items++]); + uint32_t b2 = le32_to_cpu (buf[items++]); + avtab_allowed(avdatum) = (((uint64_t) b1) << 32) | b2; + } + if (avdatum->specified & AVTAB_AUDITDENY) { + uint32_t b1 = le32_to_cpu (buf[items++]); + uint32_t b2 = le32_to_cpu (buf[items++]); + avtab_auditdeny(avdatum) = (((uint64_t) b1) << 32) | b2; + } + if (avdatum->specified & AVTAB_AUDITALLOW) { + uint32_t b1 = le32_to_cpu (buf[items++]); + uint32_t b2 = le32_to_cpu (buf[items++]); + avtab_auditallow(avdatum) = (((uint64_t) b1) << 32) | b2; + } } else { if (avdatum->specified & AVTAB_TRANSITION) avtab_transition(avdatum) = le32_to_cpu(buf[items++]); ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/private.h#2 (text+ko) ==== @@ -2,20 +2,20 @@ /* Endian conversion for reading and writing binary policies */ -#include -#include +#include +#include -#if __BYTE_ORDER == __LITTLE_ENDIAN -#define cpu_to_le32(x) (x) -#define le32_to_cpu(x) (x) -#define cpu_to_le64(x) (x) -#define le64_to_cpu(x) (x) -#else -#define cpu_to_le32(x) bswap_32(x) -#define le32_to_cpu(x) bswap_32(x) -#define cpu_to_le64(x) bswap_64(x) -#define le64_to_cpu(x) bswap_64(x) -#endif +#if BYTE_ORDER == LITTLE_ENDIAN +#define cpu_to_le32(x) ((__uint32_t)(x)) +#define cpu_to_le64(x) ((__uint64_t)(x)) +#define le32_to_cpu(x) ((__uint32_t)(x)) +#define le64_to_cpu(x) ((__uint64_t)(x)) +#else /* BYTE_ORDER != LITTLE_ENDIAN */ +#define cpu_to_le32(x) bswap32((x)) +#define cpu_to_le64(x) bswap64((x)) +#define le32_to_cpu(x) bswap32((x)) +#define le64_to_cpu(x) bswap64((x)) +#endif /* BYTE_ORDER */ /* Policy compatibility information. */ struct policydb_compat_info { ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/libsepol/src/write.c#2 (text+ko) ==== @@ -107,12 +107,18 @@ return -1; } if (cur->datum.specified & AVTAB_AV) { - if (cur->datum.specified & AVTAB_ALLOWED) - buf[items++] = cpu_to_le32(avtab_allowed(&cur->datum)); - if (cur->datum.specified & AVTAB_AUDITDENY) - buf[items++] = cpu_to_le32(avtab_auditdeny(&cur->datum)); - if (cur->datum.specified & AVTAB_AUDITALLOW) - buf[items++] = cpu_to_le32(avtab_auditallow(&cur->datum)); + if (cur->datum.specified & AVTAB_ALLOWED) { + buf[items++] = cpu_to_le32(avtab_allowed(&cur->datum) >> 32); + buf[items++] = cpu_to_le32(avtab_allowed(&cur->datum) & 0xffffffff); + } + if (cur->datum.specified & AVTAB_AUDITDENY) { + buf[items++] = cpu_to_le32(avtab_auditdeny(&cur->datum) >> 32); + buf[items++] = cpu_to_le32(avtab_auditdeny(&cur->datum) & 0xffffffff); + } + if (cur->datum.specified & AVTAB_AUDITALLOW) { + buf[items++] = cpu_to_le32(avtab_auditallow(&cur->datum) >> 32); + buf[items++] = cpu_to_le32(avtab_auditallow(&cur->datum) & 0xffffffff); + } } else { if (cur->datum.specified & AVTAB_TRANSITION) buf[items++] = cpu_to_le32(avtab_transition(&cur->datum)); From owner-p4-projects@FreeBSD.ORG Tue Nov 30 16:40:35 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4B11716A4D0; Tue, 30 Nov 2004 16:40:35 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0B8B216A4CE for ; Tue, 30 Nov 2004 16:40:35 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C799243D46 for ; Tue, 30 Nov 2004 16:40:34 +0000 (GMT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iAUGeYUx001252 for ; Tue, 30 Nov 2004 16:40:34 GMT (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iAUGeYas001249 for perforce@freebsd.org; Tue, 30 Nov 2004 16:40:34 GMT (envelope-from areisse@nailabs.com) Date: Tue, 30 Nov 2004 16:40:34 GMT Message-Id: <200411301640.iAUGeYas001249@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Subject: PERFORCE change 66109 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Nov 2004 16:40:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=66109 Change 66109 by areisse@areisse_tislabs on 2004/11/30 16:40:09 Update sebsd_checkpolicy to use the new libsepol library, and other changes merged from selinux. Affected files ... .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/checkpolicy/checkpolicy.c#8 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/checkpolicy/checkpolicy.h#4 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/checkpolicy/policy_parse.y#5 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/checkpolicy/policy_scan.l#4 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/checkpolicy/queue.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/checkpolicy/queue.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/checkpolicy/write.c#3 delete Differences ... ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/checkpolicy/checkpolicy.c#8 (text+ko) ==== @@ -56,21 +56,24 @@ #include #include #include -#include "linux-compat.h" #else /* __FreeBSD__ */ #include #endif /* __FreeBSD__ */ -#include "global.h" -#include "policydb.h" -#include "services.h" +#include +#include +#include +#include + #include "queue.h" #include "checkpolicy.h" -#include "security.h" extern char *optarg; extern int optind; +static policydb_t policydb; +static sidtab_t sidtab; + extern policydb_t *policydbp; extern queue_t id_queue; extern unsigned int policydb_errors; @@ -87,12 +90,6 @@ char *binfile = "policy"; unsigned int policyvers = POLICYDB_VERSION_MAX; -int selinux_enforcing = 1; - -int avc_ss_reset(__u32 seqno) -{ - return 0; -} void usage(char *progname) { @@ -108,7 +105,7 @@ size_t scontext_len; int rc; - rc = security_sid_to_context(sid, &scontext, &scontext_len); + rc = sepol_sid_to_context(sid, &scontext, &scontext_len); if (rc) printf("sid %d -> error %d\n", sid, rc); else { @@ -452,6 +449,10 @@ void *filedata; struct stat sb; size_t filelen; + char *name; + int state; + int show_version = 0; + struct policy_file pf; while ((ch = getopt(argc, argv, "o:dbVc:")) != EOF) { switch (ch) { @@ -530,15 +531,15 @@ close(fd); exit(1); } - ret = security_load_policy(filedata, filelen); + ret = sepol_load_policy(filedata, filelen); switch (ret) { case 0: printf("\nsuccess\n"); break; - case -EINVAL: + case EINVAL: printf("\ninvalid policy\n"); break; - case -ENOMEM: + case ENOMEM: printf("\nout of memory\n"); break; default: @@ -588,12 +589,6 @@ if (policydb_errors) exit(1); - if (policyvers >= POLICYDB_VERSION_NLCLASS && - policydb.p_classes.nprim < SECCLASS_NETLINK_DNRT_SOCKET) { - fprintf(stderr, "%s: policy lacks new netlink classes, unable to generate policy version %d\n", argv[0], policyvers); - exit(1); - } - /* remove type attributes */ hashtab_map_remove_on_error(policydb.p_types.table, type_attr_remove, 0, 0); @@ -613,7 +608,12 @@ perror(outfile); exit(1); } - ret = policydb_write(&policydb, outfp); + + sepol_set_policyvers(policyvers); + + pf.type = PF_USE_STDIO; + pf.fp = outfp; + ret = policydb_write(&policydb, &pf); if (ret) { fprintf(stderr, "%s: error writing %s\n", argv[0], outfile); @@ -624,8 +624,6 @@ if (!debug) exit(0); - ss_initialized = 1; - menu: printf("\nSelect an option:\n"); printf("0) Call compute_access_vector\n"); @@ -688,7 +686,7 @@ printf("\nNo access vector definition for that class\n"); break; } - ret = security_compute_av(ssid, tsid, tclass, 0, &avd); + ret = sepol_compute_av(ssid, tsid, tclass, 0, &avd); allowed = avd.allowed; switch (ret) { case 0: @@ -721,7 +719,7 @@ printf("sid? "); fgets(ans, sizeof(ans), stdin); ssid = atoi(ans); - ret = security_sid_to_context(ssid, + ret = sepol_sid_to_context(ssid, &scontext, &scontext_len); switch (ret) { case 0: @@ -743,7 +741,7 @@ fgets(ans, sizeof(ans), stdin); scontext_len = strlen(ans); ans[scontext_len - 1] = 0; - ret = security_context_to_sid(ans, scontext_len, + ret = sepol_context_to_sid(ans, scontext_len, &ssid); switch (ret) { case 0: @@ -791,11 +789,11 @@ } if (ch == '3') - ret = security_transition_sid(ssid, tsid, tclass, &ssid); + ret = sepol_transition_sid(ssid, tsid, tclass, &ssid); else if (ch == '4') - ret = security_member_sid(ssid, tsid, tclass, &ssid); + ret = sepol_member_sid(ssid, tsid, tclass, &ssid); else - ret = security_change_sid(ssid, tsid, tclass, &ssid); + ret = sepol_change_sid(ssid, tsid, tclass, &ssid); switch (ret) { case 0: printf("\nsid %d\n", ssid); @@ -811,7 +809,7 @@ } break; case '6': - sidtab_map(&sidtab, print_sid, 0); + sepol_sidtab_map(&sidtab, print_sid, 0); break; case '7': printf("pathname? "); @@ -841,7 +839,7 @@ close(fd); break; } - ret = security_load_policy(filedata, filelen); + ret = sepol_load_policy(filedata, filelen); switch (ret) { case 0: printf("\nsuccess\n"); @@ -862,7 +860,7 @@ printf("fs kdevname? "); fgets(ans, sizeof(ans), stdin); ans[strlen(ans) - 1] = 0; - security_fs_sid(ans, &ssid, &tsid); + sepol_fs_sid(ans, &ssid, &tsid); printf("fs_sid %d default_file_sid %d\n", ssid, tsid); break; @@ -881,14 +879,14 @@ printf("port? "); fgets(ans, sizeof(ans), stdin); port = atoi(ans); - security_port_sid(0, 0, protocol, port, &ssid); + sepol_port_sid(0, 0, protocol, port, &ssid); printf("sid %d\n", ssid); break; case 'a': printf("netif name? "); fgets(ans, sizeof(ans), stdin); ans[strlen(ans) - 1] = 0; - security_netif_sid(ans, &ssid, &tsid); + sepol_netif_sid(ans, &ssid, &tsid); printf("if_sid %d default_msg_sid %d\n", ssid, tsid); break; @@ -929,7 +927,7 @@ sepol_node_sid(family, p, len, &ssid); addr = inet_addr(ans); - security_node_sid(AF_INET, &addr, sizeof addr, &ssid); + sepol_node_sid(AF_INET, &addr, sizeof addr, &ssid); printf("sid %d\n", ssid); break; } @@ -937,7 +935,7 @@ printf("fstype? "); fgets(ans, sizeof(ans), stdin); ans[strlen(ans) - 1] = 0; - security_fs_use(ans, &ret, &ssid); + sepol_fs_use(ans, &ret, &ssid); switch (ret) { case SECURITY_FS_USE_XATTR: printf("use extended attributes\n"); @@ -985,7 +983,7 @@ } tclass = cladatum->value; } - security_genfs_sid(fstype, path, tclass, &ssid); + sepol_genfs_sid(fstype, path, tclass, &ssid); printf("sid %d\n", ssid); free(fstype); free(path); @@ -1000,7 +998,7 @@ fgets(ans, sizeof(ans), stdin); ans[strlen(ans) - 1] = 0; - ret = security_get_user_sids(ssid, ans, &sids, &nel); + ret = sepol_get_user_sids(ssid, ans, &sids, &nel); switch (ret) { case 0: if (!nel) ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/checkpolicy/checkpolicy.h#4 (text+ko) ==== @@ -1,7 +1,7 @@ #ifndef _CHECKPOLICY_H_ #define _CHECKPOLICY_H_ -#include "ebitmap.h" +#include typedef struct te_assert { struct ebitmap stypes; @@ -15,39 +15,6 @@ te_assert_t *te_assertions; -typedef u_int64_t __u64; -typedef u_int32_t __u32; -typedef u_int16_t __u16; -typedef u_int8_t __u8; - -typedef struct ebitmap ebitmap_t; -typedef struct ebitmap_node ebitmap_node_t; -typedef struct avtab avtab_t; -typedef struct avtab_node *avtab_ptr_t; -typedef struct avtab_key avtab_key_t; -typedef struct avtab_datum avtab_datum_t; -typedef struct policydb policydb_t; -typedef struct role_datum role_datum_t; -typedef struct class_datum class_datum_t; -typedef struct common_datum common_datum_t; -typedef struct perm_datum perm_datum_t; -typedef struct type_datum type_datum_t; -typedef struct user_datum user_datum_t; -typedef struct constraint_expr constraint_expr_t; -typedef struct constraint_node constraint_node_t; -typedef struct context context_struct_t; -typedef struct context context_t; -typedef struct ocontext ocontext_t; -typedef struct genfs genfs_t; -typedef void *hashtab_key_t; -typedef void *hashtab_datum_t; - -#define HASHTAB_SUCCESS 0 -#define HASHTAB_OVERFLOW ENOMEM -#define HASHTAB_PRESENT EEXIST -#define HASHTAB_MISSING ENOENT - -#define TRUE 1 -#define FALSE 0 +extern unsigned int policyvers; #endif ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/checkpolicy/policy_parse.y#5 (text+ko) ==== @@ -21,14 +21,15 @@ #include #include #include -#include "linux-compat.h" +#include #endif /* __FreeBSD__ */ -#include "policydb.h" -#include "services.h" + +#include +#include +#include +#include #include "queue.h" #include "checkpolicy.h" -#include "flask.h" -#include "security.h" /* * We need the following so we have a valid error return code in yacc @@ -171,7 +172,7 @@ { if (pass == 1) { if (policydb_index_classes(policydbp)) return -1; } } opt_mls te_rbac users opt_constraints { if (pass == 1) { if (policydb_index_bools(policydbp)) return -1;} - if (pass == 2) { if (policydb_index_others(policydbp, 1)) return -1;} } + if (pass == 2) { if (policydb_index_others(policydbp, 1)) return -1;} } initial_sid_contexts opt_fs_contexts fs_uses opt_genfs_contexts net_contexts ; classes : class_def @@ -2581,16 +2582,7 @@ goto bad; } - if (policyvers < POLICYDB_VERSION_NLCLASS && - (cladatum->value >= SECCLASS_NETLINK_ROUTE_SOCKET && - cladatum->value <= SECCLASS_NETLINK_DNRT_SOCKET)) { - sprintf(errormsg, "remapping class %s to netlink_socket " - "for policy version %d", id, policyvers); - yywarn(errormsg); - classvalue = SECCLASS_NETLINK_SOCKET; - suppress = 1; - } else - classvalue = cladatum->value; + classvalue = cladatum->value; ebitmap_set_bit(&tclasses, classvalue - 1, TRUE); if (classvalue > hiclass) @@ -2759,16 +2751,7 @@ goto bad; } - if (policyvers < POLICYDB_VERSION_NLCLASS && - (cladatum->value >= SECCLASS_NETLINK_ROUTE_SOCKET && - cladatum->value <= SECCLASS_NETLINK_DNRT_SOCKET)) { - sprintf(errormsg, "remapping class %s to netlink_socket " - "for policy version %d", id, policyvers); - yywarn(errormsg); - classvalue = SECCLASS_NETLINK_SOCKET; - suppress = 1; - } else - classvalue = cladatum->value; + classvalue = cladatum->value; ebitmap_set_bit(&tclasses, classvalue - 1, TRUE); if (classvalue > hiclass) @@ -2819,7 +2802,7 @@ continue; } - avp[i] |= (((__u64)1) << (perdatum->value - 1)); + avp[i] |= (((uint64_t)1) << (perdatum->value - 1)); } free(id); @@ -4439,6 +4422,9 @@ return 0; } +/* Freebsd only exports these to the kernel */ +#define s6_addr32 __u6_addr.__u6_addr32 + static int define_ipv6_node_context(void) { char *id; @@ -4517,6 +4503,8 @@ return rc; } +#undef s6_addr32 + static int define_fs_use(int behavior) { ocontext_t *newc, *c, *head; ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/checkpolicy/policy_scan.l#4 (text+ko) ==== @@ -16,6 +16,7 @@ /* FLASK */ %{ +#include #include "policy_parse.h" static char linebuf[2][255]; From owner-p4-projects@FreeBSD.ORG Tue Nov 30 17:29:38 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 043ED16A4D0; Tue, 30 Nov 2004 17:29:38 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D4A3616A4CE for ; Tue, 30 Nov 2004 17:29:37 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B02B743D3F for ; Tue, 30 Nov 2004 17:29:37 +0000 (GMT) (envelope-from trhodes@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iAUHTbxD009425 for ; Tue, 30 Nov 2004 17:29:37 GMT (envelope-from trhodes@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iAUHTbC6009422 for perforce@freebsd.org; Tue, 30 Nov 2004 17:29:37 GMT (envelope-from trhodes@freebsd.org) Date: Tue, 30 Nov 2004 17:29:37 GMT Message-Id: <200411301729.iAUHTbC6009422@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trhodes@freebsd.org using -f From: Tom Rhodes To: Perforce Change Reviews Subject: PERFORCE change 66113 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Nov 2004 17:29:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=66113 Change 66113 by trhodes@trhodes_local on 2004/11/30 17:29:34 Add the marked up install guide, compliments of Wayne. Affected files ... .. //depot/projects/trustedbsd/audit3/share/doc/audit3/book.sgml#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Tue Nov 30 18:02:06 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5317E16A4D0; Tue, 30 Nov 2004 18:02:06 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2AD2316A4CE for ; Tue, 30 Nov 2004 18:02:06 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EA25443D45 for ; Tue, 30 Nov 2004 18:02:05 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iAUI254l010664 for ; Tue, 30 Nov 2004 18:02:05 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iAUI25Ur010661 for perforce@freebsd.org; Tue, 30 Nov 2004 18:02:05 GMT (envelope-from sam@freebsd.org) Date: Tue, 30 Nov 2004 18:02:05 GMT Message-Id: <200411301802.iAUI25Ur010661@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66116 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Nov 2004 18:02:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=66116 Change 66116 by sam@sam_ebb on 2004/11/30 18:01:27 more beacon cleanups: o move swba processing above tx+rx processing; it's the most time-critical so don't delay o reorg beacon xmit code so we construct the tx descriptor for each beacon o periodically switch antenna for beacon xmit o count beacon xmits and stuck conditions o rename beacon stuck task for consistency Affected files ... .. //depot/projects/wifi/sys/dev/ath/if_ath.c#32 edit .. //depot/projects/wifi/sys/dev/ath/if_athioctl.h#4 edit Differences ... ==== //depot/projects/wifi/sys/dev/ath/if_ath.c#32 (text+ko) ==== @@ -114,13 +114,12 @@ static void ath_key_update_begin(struct ieee80211com *); static void ath_key_update_end(struct ieee80211com *); static void ath_mode_init(struct ath_softc *); -static int ath_beacon_setup(struct ath_softc *, - struct ath_buf *, struct mbuf *); static void ath_setslottime(struct ath_softc *); static void ath_updateslot(struct ifnet *); static int ath_beacon_alloc(struct ath_softc *, struct ieee80211_node *); +static void ath_beacon_setup(struct ath_softc *, struct ath_buf *); static void ath_beacon_proc(void *, int); -static void ath_beacon_stuck_proc(void *, int); +static void ath_bstuck_proc(void *, int); static void ath_beacon_free(struct ath_softc *); static void ath_beacon_config(struct ath_softc *); static int ath_desc_alloc(struct ath_softc *); @@ -357,7 +356,7 @@ TASK_INIT(&sc->sc_rxorntask, 0, ath_rxorn_proc, sc); TASK_INIT(&sc->sc_fataltask, 0, ath_fatal_proc, sc); TASK_INIT(&sc->sc_bmisstask, 0, ath_bmiss_proc, sc); - TASK_INIT(&sc->sc_bstucktask, 0, ath_beacon_stuck_proc, sc); + TASK_INIT(&sc->sc_bstucktask, 0, ath_bstuck_proc, sc); /* * Allocate hardware transmit queues: one queue for @@ -690,6 +689,15 @@ ath_hal_intrset(ah, 0); /* disable intr's until reset */ taskqueue_enqueue(taskqueue_swi, &sc->sc_rxorntask); } else { + if (status & HAL_INT_SWBA) { + /* + * Software beacon alert--time to send a beacon. + * Handle beacon transmission directly; deferring + * this is too slow to meet timing constraints + * under load. + */ + ath_beacon_proc(sc, 0); + } if (status & HAL_INT_RXEOL) { /* * NB: the hardware should re-read the link when @@ -708,15 +716,6 @@ taskqueue_enqueue(taskqueue_swi, &sc->sc_rxtask); if (status & HAL_INT_TX) taskqueue_enqueue(taskqueue_swi, &sc->sc_txtask); - if (status & HAL_INT_SWBA) { - /* - * Software beacon alert--time to send a beacon. - * Handle beacon transmission directly; deferring - * this is too slow to meet timing constraints - * under load. - */ - ath_beacon_proc(sc, 0); - } if (status & HAL_INT_BMISS) { sc->sc_stats.ast_bmiss++; taskqueue_enqueue(taskqueue_swi, &sc->sc_bmisstask); @@ -1630,79 +1629,6 @@ } /* - * Setup the beacon frame. The frame is mapped for DMA - * and the transmit descriptor is filled in. - */ -static int -ath_beacon_setup(struct ath_softc *sc, struct ath_buf *bf, struct mbuf *m) -{ -#define USE_SHPREAMBLE(_ic) \ - (((_ic)->ic_flags & (IEEE80211_F_SHPREAMBLE | IEEE80211_F_USEBARKER))\ - == IEEE80211_F_SHPREAMBLE) - struct ieee80211com *ic = &sc->sc_ic; - struct ieee80211_node *ni = bf->bf_node; - struct ath_hal *ah = sc->sc_ah; - struct ath_node *an = ATH_NODE(ni); - struct ath_desc *ds; - u_int8_t rate; - int error, flags; - - DPRINTF(sc, ATH_DEBUG_BEACON, "%s: m %p len %u\n", - __func__, m, m->m_len); - - error = bus_dmamap_load_mbuf(sc->sc_dmat, bf->bf_dmamap, m, - ath_mbuf_load_cb, bf, - BUS_DMA_NOWAIT); - if (error != 0) { - m_freem(m); - return error; - } - KASSERT(bf->bf_nseg == 1, - ("%s: multi-segment packet; nseg %u", __func__, bf->bf_nseg)); - bf->bf_m = m; - - /* setup descriptors */ - ds = bf->bf_desc; - - flags = HAL_TXDESC_NOACK; - if (ic->ic_opmode == IEEE80211_M_IBSS && sc->sc_hasveol) { - ds->ds_link = bf->bf_daddr; /* self-linked */ - flags |= HAL_TXDESC_VEOL; - } else - ds->ds_link = 0; - ds->ds_data = bf->bf_segs[0].ds_addr; - /* - * Calculate rate code. - * XXX everything at min xmit rate - */ - if (USE_SHPREAMBLE(ic)) - rate = an->an_tx_mgtratesp; - else - rate = an->an_tx_mgtrate; - ath_hal_setuptxdesc(ah, ds - , m->m_len + IEEE80211_CRC_LEN /* frame length */ - , sizeof(struct ieee80211_frame)/* header length */ - , HAL_PKT_TYPE_BEACON /* Atheros packet type */ - , ni->ni_txpower /* txpower XXX */ - , rate, 1 /* series 0 rate/tries */ - , HAL_TXKEYIX_INVALID /* no encryption */ - , 0 /* antenna mode */ - , flags /* no ack, veol for beacons */ - , 0 /* rts/cts rate */ - , 0 /* rts/cts duration */ - ); - /* NB: beacon's BufLen must be a multiple of 4 bytes */ - ath_hal_filltxdesc(ah, ds - , roundup(m->m_len, 4) /* buffer length */ - , AH_TRUE /* first segment */ - , AH_TRUE /* last segment */ - , ds /* first descriptor */ - ); - return 0; -#undef USE_SHPREAMBLE -} - -/* * Set the slot time based on the current setting. */ static void @@ -1769,13 +1695,90 @@ sc->sc_stats.ast_be_nombuf++; return ENOMEM; } - bf->bf_node = ni; - error = ath_beacon_setup(sc, bf, m); - if (error == 0) + error = bus_dmamap_load_mbuf(sc->sc_dmat, bf->bf_dmamap, m, + ath_mbuf_load_cb, bf, + BUS_DMA_NOWAIT); + if (error == 0) { bf->bf_m = m; + bf->bf_node = ni; /* NB: no held reference */ + } else { + m_freem(m); + } + return error; +} + +/* + * Setup the beacon frame for transmit. + */ +static void +ath_beacon_setup(struct ath_softc *sc, struct ath_buf *bf) +{ +#define USE_SHPREAMBLE(_ic) \ + (((_ic)->ic_flags & (IEEE80211_F_SHPREAMBLE | IEEE80211_F_USEBARKER))\ + == IEEE80211_F_SHPREAMBLE) + struct ieee80211com *ic = &sc->sc_ic; + struct ieee80211_node *ni = bf->bf_node; + struct mbuf *m = bf->bf_m; + struct ath_hal *ah = sc->sc_ah; + struct ath_node *an = ATH_NODE(ni); + struct ath_desc *ds; + int flags, antenna; + u_int8_t rate; + + DPRINTF(sc, ATH_DEBUG_BEACON, "%s: m %p len %u\n", + __func__, m, m->m_len); + + /* setup descriptors */ + ds = bf->bf_desc; + + flags = HAL_TXDESC_NOACK; + if (ic->ic_opmode == IEEE80211_M_IBSS && sc->sc_hasveol) { + ds->ds_link = bf->bf_daddr; /* self-linked */ + flags |= HAL_TXDESC_VEOL; + /* + * Let hardware handle antenna switching. + */ + antenna = 0; + } else { + ds->ds_link = 0; + /* + * Switch antenna every 4 beacons. + * XXX assumes two antenna + */ + antenna = (sc->sc_stats.ast_be_xmit & 4 ? 2 : 1); + } + + KASSERT(bf->bf_nseg == 1, + ("multi-segment beacon frame; nseg %u", bf->bf_nseg)); + ds->ds_data = bf->bf_segs[0].ds_addr; + /* + * Calculate rate code. + * XXX everything at min xmit rate + */ + if (USE_SHPREAMBLE(ic)) + rate = an->an_tx_mgtratesp; else - m_free(m); - return error; + rate = an->an_tx_mgtrate; + ath_hal_setuptxdesc(ah, ds + , m->m_len + IEEE80211_CRC_LEN /* frame length */ + , sizeof(struct ieee80211_frame)/* header length */ + , HAL_PKT_TYPE_BEACON /* Atheros packet type */ + , ni->ni_txpower /* txpower XXX */ + , rate, 1 /* series 0 rate/tries */ + , HAL_TXKEYIX_INVALID /* no encryption */ + , antenna /* antenna mode */ + , flags /* no ack, veol for beacons */ + , 0 /* rts/cts rate */ + , 0 /* rts/cts duration */ + ); + /* NB: beacon's BufLen must be a multiple of 4 bytes */ + ath_hal_filltxdesc(ah, ds + , roundup(m->m_len, 4) /* buffer length */ + , AH_TRUE /* first segment */ + , AH_TRUE /* last segment */ + , ds /* first descriptor */ + ); +#undef USE_SHPREAMBLE } /* @@ -1791,7 +1794,7 @@ struct ath_buf *bf = sc->sc_bcbuf; struct ath_hal *ah = sc->sc_ah; struct mbuf *m; - int ncabq; + int ncabq, error; DPRINTF(sc, ATH_DEBUG_BEACON_PROC, "%s: pending %u\n", __func__, pending); @@ -1803,13 +1806,19 @@ __func__, ic->ic_flags, bf, bf ? bf->bf_m : NULL); return; } + /* + * Check if the previous beacon has gone out. If + * not don't don't try to post another, skip this + * period and wait for the next. Missed beacons + * indicate a problem and should not occur. If we + * miss too many consecutive beacons reset the device. + */ if (ath_hal_numtxpending(ah, sc->sc_bhalq) != 0) { sc->sc_bmisscount++; DPRINTF(sc, ATH_DEBUG_BEACON_PROC, "%s: missed %u consecutive beacons\n", __func__, sc->sc_bmisscount); - /* XXX reset if too many? */ - if (sc->sc_bmisscount > 3) + if (sc->sc_bmisscount > 3) /* NB: 3 is a guess */ taskqueue_enqueue(taskqueue_swi, &sc->sc_bstucktask); return; } @@ -1822,17 +1831,23 @@ /* * Update dynamic beacon contents. If this returns - * non-zero then we need to update the descriptor - * state because the beacon frame changed size - * (probably because of the TIM bitmap). + * non-zero then we need to remap the memory because + * the beacon frame changed size (probably because + * of the TIM bitmap). */ m = bf->bf_m; ncabq = ath_hal_numtxpending(ah, sc->sc_cabq->axq_qnum); if (ieee80211_beacon_update(ic, bf->bf_node, &sc->sc_boff, m, ncabq)) { + /* XXX too conservative? */ bus_dmamap_unload(sc->sc_dmat, bf->bf_dmamap); - if (ath_beacon_setup(sc, bf, m) != 0) { - /* XXX statistic */ - return; /* XXX help??? */ + error = bus_dmamap_load_mbuf(sc->sc_dmat, bf->bf_dmamap, m, + ath_mbuf_load_cb, bf, + BUS_DMA_NOWAIT); + if (error != 0) { + if_printf(ic->ic_ifp, + "%s: bus_dmamap_load_mbuf failed, error %u\n", + __func__, error); + return; } } @@ -1850,13 +1865,19 @@ ath_setslottime(sc); /* commit change to h/w */ /* + * Construct tx descriptor. + */ + ath_beacon_setup(sc, bf); + + /* * Stop any current dma and put the new frame on the queue. + * This should never fail since we check above that no frames + * are still pending on the queue. */ if (!ath_hal_stoptxdma(ah, sc->sc_bhalq)) { DPRINTF(sc, ATH_DEBUG_ANY, "%s: beacon queue %u did not stop?\n", __func__, sc->sc_bhalq); - /* NB: should never happen since we check above? */ } bus_dmamap_sync(sc->sc_dmat, bf->bf_dmamap, BUS_DMASYNC_PREWRITE); @@ -1871,10 +1892,15 @@ DPRINTF(sc, ATH_DEBUG_BEACON_PROC, "%s: TXDP[%u] = %p (%p)\n", __func__, sc->sc_bhalq, (caddr_t)bf->bf_daddr, bf->bf_desc); + + sc->sc_stats.ast_be_xmit++; } +/* + * Reset the hardware after detecting beacons have stopped. + */ static void -ath_beacon_stuck_proc(void *arg, int pending) +ath_bstuck_proc(void *arg, int pending) { struct ath_softc *sc = arg; struct ifnet *ifp = &sc->sc_if; ==== //depot/projects/wifi/sys/dev/ath/if_athioctl.h#4 (text+ko) ==== @@ -46,6 +46,7 @@ u_int32_t ast_watchdog; /* device reset by watchdog */ u_int32_t ast_hardware; /* fatal hardware error interrupts */ u_int32_t ast_bmiss; /* beacon miss interrupts */ + u_int32_t ast_bstuck; /* beacon stuck interrupts */ u_int32_t ast_rxorn; /* rx overrun interrupts */ u_int32_t ast_rxeol; /* rx eol interrupts */ u_int32_t ast_txurn; /* tx underrun interrupts */ @@ -90,6 +91,7 @@ u_int32_t ast_rx_ctl; /* rx discarded 'cuz ctl frame */ int8_t ast_tx_rssi; /* tx rssi of last ack */ int8_t ast_rx_rssi; /* rx rssi from histogram */ + u_int32_t ast_be_xmit; /* beacons transmitted */ u_int32_t ast_be_nombuf; /* beacon setup failed 'cuz no mbuf */ u_int32_t ast_per_cal; /* periodic calibration calls */ u_int32_t ast_per_calfail;/* periodic calibration failed */ From owner-p4-projects@FreeBSD.ORG Tue Nov 30 18:10:16 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 88DBF16A4D0; Tue, 30 Nov 2004 18:10:16 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 646ED16A4CE for ; Tue, 30 Nov 2004 18:10:16 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5249843D46 for ; Tue, 30 Nov 2004 18:10:16 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iAUIAG79010847 for ; Tue, 30 Nov 2004 18:10:16 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iAUIAGnW010844 for perforce@freebsd.org; Tue, 30 Nov 2004 18:10:16 GMT (envelope-from sam@freebsd.org) Date: Tue, 30 Nov 2004 18:10:16 GMT Message-Id: <200411301810.iAUIAGnW010844@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66117 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Nov 2004 18:10:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=66117 Change 66117 by sam@sam_ebb on 2004/11/30 18:09:36 expose ath_setdefantenna for use by external code Affected files ... .. //depot/projects/wifi/sys/dev/ath/if_ath.c#33 edit .. //depot/projects/wifi/sys/dev/ath/if_athvar.h#13 edit Differences ... ==== //depot/projects/wifi/sys/dev/ath/if_ath.c#33 (text+ko) ==== @@ -131,6 +131,7 @@ static void ath_recv_mgmt(struct ieee80211com *ic, struct mbuf *m, struct ieee80211_node *ni, int subtype, int rssi, u_int32_t rstamp); +static void ath_setdefantenna(struct ath_softc *, u_int); static void ath_rx_proc(void *, int); static struct ath_txq *ath_txq_setup(struct ath_softc*, int qtype, int subtype); static int ath_tx_setup(struct ath_softc *, int, int); @@ -421,6 +422,13 @@ break; } + /* + * Setup rate control. Some rate control modules + * call back to change the anntena state so expose + * the necessary entry points. + * XXX maybe belongs in struct ath_ratectrl? + */ + sc->sc_setdefantenna = ath_setdefantenna; sc->sc_rc = ath_rate_attach(sc); if (sc->sc_rc == NULL) { error = EIO; @@ -2389,6 +2397,9 @@ } } +/* + * Set the default antenna. + */ static void ath_setdefantenna(struct ath_softc *sc, u_int antenna) { ==== //depot/projects/wifi/sys/dev/ath/if_athvar.h#13 (text+ko) ==== @@ -151,6 +151,7 @@ struct mtx sc_mtx; /* master lock (recursive) */ struct ath_hal *sc_ah; /* Atheros HAL */ struct ath_ratectrl *sc_rc; /* tx rate control support */ + void (*sc_setdefantenna)(struct ath_softc *, u_int); unsigned int sc_invalid : 1,/* disable hardware accesses */ sc_mrretry : 1, /* multi-rate retry support */ sc_softled : 1, /* enable LED gpio status */ From owner-p4-projects@FreeBSD.ORG Tue Nov 30 18:12:19 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7E80E16A4D0; Tue, 30 Nov 2004 18:12:19 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3F15016A4CE for ; Tue, 30 Nov 2004 18:12:19 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2FB3543D4C for ; Tue, 30 Nov 2004 18:12:19 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iAUICJtR011050 for ; Tue, 30 Nov 2004 18:12:19 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iAUICItW011047 for perforce@freebsd.org; Tue, 30 Nov 2004 18:12:19 GMT (envelope-from sam@freebsd.org) Date: Tue, 30 Nov 2004 18:12:19 GMT Message-Id: <200411301812.iAUICItW011047@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66118 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Nov 2004 18:12:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=66118 Change 66118 by sam@sam_ebb on 2004/11/30 18:12:14 update for new beacon stats Affected files ... .. //depot/projects/wifi/tools/tools/ath/athstats.c#5 edit Differences ... ==== //depot/projects/wifi/tools/tools/ath/athstats.c#5 (text+ko) ==== @@ -97,6 +97,7 @@ STAT(watchdog, "watchdog timeouts"); STAT(hardware, "hardware error interrupts"); STAT(bmiss, "beacon miss interrupts"); + STAT(bstuck, "stuck beacon conditions"); STAT(rxorn, "recv overrun interrupts"); STAT(rxeol, "recv eol interrupts"); STAT(txurn, "txmit underrun interrupts"); @@ -154,6 +155,7 @@ } } STAT(be_nombuf, "beacon setup failed 'cuz no mbuf"); + STAT(be_xmit, "beacons transmitted"); STAT(per_cal, "periodic calibrations"); STAT(per_calfail, "periodic calibration failures"); STAT(per_rfgain, "rfgain value change"); From owner-p4-projects@FreeBSD.ORG Tue Nov 30 18:14:22 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 75ADB16A4D0; Tue, 30 Nov 2004 18:14:22 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5062516A4CE for ; Tue, 30 Nov 2004 18:14:22 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2397F43D41 for ; Tue, 30 Nov 2004 18:14:22 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iAUIEMZn011105 for ; Tue, 30 Nov 2004 18:14:22 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iAUIELeA011102 for perforce@freebsd.org; Tue, 30 Nov 2004 18:14:21 GMT (envelope-from sam@freebsd.org) Date: Tue, 30 Nov 2004 18:14:21 GMT Message-Id: <200411301814.iAUIELeA011102@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66119 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Nov 2004 18:14:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=66119 Change 66119 by sam@sam_ebb on 2004/11/30 18:14:17 add more power save portability shims Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_freebsd.h#7 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_freebsd.h#7 (text+ko) ==== @@ -64,17 +64,39 @@ mtx_destroy(&(_ni)->ni_savedq.ifq_mtx) #define IEEE80211_NODE_SAVEQ_QLEN(_ni) \ _IF_QLEN(&(_ni)->ni_savedq) +#define IEEE80211_NODE_SAVEQ_LOCK(_ni) do { \ + IF_LOCK(&(_ni)->ni_savedq); \ +} while (0) +#define IEEE80211_NODE_SAVEQ_UNLOCK(_ni) do { \ + IF_UNLOCK(&(_ni)->ni_savedq); \ +} while (0) #define IEEE80211_NODE_SAVEQ_DEQUEUE(_ni, _m, _qlen) do { \ - IF_LOCK(&(_ni)->ni_savedq); \ + IEEE80211_NODE_SAVEQ_LOCK(_ni); \ _IF_DEQUEUE(&(_ni)->ni_savedq, _m); \ - (_qlen) = _IF_QLEN(&(_ni)->ni_savedq); \ - IF_UNLOCK(&(_ni)->ni_savedq); \ + (_qlen) = IEEE80211_NODE_SAVEQ_QLEN(_ni); \ + IEEE80211_NODE_SAVEQ_UNLOCK(_ni); \ } while (0) #define IEEE80211_NODE_SAVEQ_DRAIN(_ni, _qlen) do { \ - IF_LOCK(&(_ni)->ni_savedq); \ - (_qlen) = _IF_QLEN(&(_ni)->ni_savedq); \ + IEEE80211_NODE_SAVEQ_LOCK(_ni); \ + (_qlen) = IEEE80211_NODE_SAVEQ_QLEN(_ni); \ _IF_DRAIN(&(_ni)->ni_savedq); \ - IF_UNLOCK(&(_ni)->ni_savedq); \ + IEEE80211_NODE_SAVEQ_UNLOCK(_ni); \ +} while (0) +/* XXX could be optimized */ +#define _IEEE80211_NODE_SAVEQ_DEQUEUE_HEAD(_ni, _m) do { \ + _IF_DEQUEUE(&(_ni)->ni_savedq, m); \ +} while (0) +#define _IEEE80211_NODE_SAVEQ_ENQUEUE(_ni, _m, _qlen, _age) do {\ + (_m)->m_nextpkt = NULL; \ + if ((_ni)->ni_savedq.ifq_tail != NULL) { \ + _age -= M_AGE_GET((_ni)->ni_savedq.ifq_tail); \ + (_ni)->ni_savedq.ifq_tail->m_nextpkt = (_m); \ + } else { \ + (_ni)->ni_savedq.ifq_head = (_m); \ + } \ + M_AGE_SET(_m, _age); \ + (_ni)->ni_savedq.ifq_tail = (_m); \ + (_qlen) = ++(_ni)->ni_savedq.ifq_len; \ } while (0) /* @@ -129,6 +151,15 @@ ((ac) << M_WME_AC_SHIFT)) #define M_WME_GETAC(m) (((m)->m_flags >> M_WME_AC_SHIFT) & 0x3) +/* + * Mbufs on the power save queue are tagged with an age and + * timed out. We reuse the hardware checksum field in the + * mbuf packet header to store this data. + */ +#define M_AGE_SET(m,v) (m->m_pkthdr.csum_data = v) +#define M_AGE_GET(m) (m->m_pkthdr.csum_data) +#define M_AGE_SUB(m,adj) (m->m_pkthdr.csum_data -= adj) + extern void get_random_bytes(void *, size_t); struct ieee80211com; From owner-p4-projects@FreeBSD.ORG Tue Nov 30 18:15:24 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2C99016A4D0; Tue, 30 Nov 2004 18:15:24 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E586216A4CE for ; Tue, 30 Nov 2004 18:15:23 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BFAE943D2D for ; Tue, 30 Nov 2004 18:15:23 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iAUIFNBt012027 for ; Tue, 30 Nov 2004 18:15:23 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iAUIFN7F012024 for perforce@freebsd.org; Tue, 30 Nov 2004 18:15:23 GMT (envelope-from sam@freebsd.org) Date: Tue, 30 Nov 2004 18:15:23 GMT Message-Id: <200411301815.iAUIFN7F012024@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66120 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Nov 2004 18:15:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=66120 Change 66120 by sam@sam_ebb on 2004/11/30 18:14:44 add stat for ps frames discarded due to age Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_ioctl.h#13 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_ioctl.h#13 (text+ko) ==== @@ -76,6 +76,8 @@ u_int32_t ns_tx_novlantag; /* tx discard 'cuz no tag */ u_int32_t ns_tx_vlanmismatch; /* tx discard 'cuz bad tag */ + u_int32_t ns_ps_discard; /* ps discard 'cuz of age */ + /* MIB-related state */ u_int32_t ns_tx_assoc; /* [re]associations */ u_int32_t ns_tx_assoc_fail; /* [re]association failures */ From owner-p4-projects@FreeBSD.ORG Tue Nov 30 18:17:27 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2AD4B16A4D0; Tue, 30 Nov 2004 18:17:27 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E189516A4CE for ; Tue, 30 Nov 2004 18:17:26 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B3C6A43D39 for ; Tue, 30 Nov 2004 18:17:26 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iAUIHQ3v012081 for ; Tue, 30 Nov 2004 18:17:26 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iAUIHQbx012078 for perforce@freebsd.org; Tue, 30 Nov 2004 18:17:26 GMT (envelope-from sam@freebsd.org) Date: Tue, 30 Nov 2004 18:17:26 GMT Message-Id: <200411301817.iAUIHQbx012078@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66121 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Nov 2004 18:17:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=66121 Change 66121 by sam@sam_ebb on 2004/11/30 18:16:45 o replace explicit ps queue manipulations with portability shims o no need to mark management frame with M_PWR_SAV any more; the driver no longer intercepts them o mark frames placed on the power save queue with an age so they can be reaped if they sit too long (need to recheck calc) Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_output.c#16 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_output.c#16 (text+ko) ==== @@ -1127,15 +1127,6 @@ IEEE80211_NODE_STAT_SET(ni, tx_deauth_code, arg); ieee80211_node_unauthorize(ic, ni); /* port closed */ - /* - * If station is in power-save state mark the frame - * so it goes out immediately. The station is likely - * to ignore it but the alternative is to defer reclaiming - * station state until it wakes up and polls for the - * frame which leads to possible DOS. - */ - if (ni->ni_flags & IEEE80211_NODE_PWR_MGT) - m->m_flags |= M_PWR_SAV; break; case IEEE80211_FC0_SUBTYPE_ASSOC_REQ: @@ -1537,8 +1528,8 @@ ic->ic_flags &= ~IEEE80211_F_TIMUPDATE; IEEE80211_DPRINTF(ic, IEEE80211_MSG_POWER, - "%s: TIM updated, off %u, len %u\n", - __func__, timoff, timlen); + "%s: TIM updated, pending %u, off %u, len %u\n", + __func__, ic->ic_ps_pending, timoff, timlen); } /* update TIM state regarding buffered multicast frames */ if (mcast) @@ -1560,12 +1551,12 @@ ieee80211_pwrsave(struct ieee80211com *ic, struct ieee80211_node *ni, struct mbuf *m) { - int qlen; + int qlen, age; - IF_LOCK(&ni->ni_savedq); + IEEE80211_NODE_SAVEQ_LOCK(ni); if (_IF_QFULL(&ni->ni_savedq)) { _IF_DROP(&ni->ni_savedq); - IF_UNLOCK(&ni->ni_savedq); + IEEE80211_NODE_SAVEQ_UNLOCK(ni); IEEE80211_DPRINTF(ic, IEEE80211_MSG_ANY, "[%s] pwr save q overflow, drops %d (size %d)\n", ether_sprintf(ni->ni_macaddr), @@ -1575,9 +1566,17 @@ m_freem(m); return; } - _IF_ENQUEUE(&ni->ni_savedq, m); - qlen = _IF_QLEN(&ni->ni_savedq); - IF_UNLOCK(&ni->ni_savedq); + /* + * Tag the frame with it's expiry time and insert + * it in the queue. The aging interval is 4 times + * the listen interval specified by the station. + * Frames that sit around too long are reclaimed + * using this information. + */ + /* XXX handle overflow? */ + age = ((ni->ni_intval * ic->ic_lintval) << 2) / 1024; /* TU -> secs */ + _IEEE80211_NODE_SAVEQ_ENQUEUE(ni, m, qlen, age); + IEEE80211_NODE_SAVEQ_UNLOCK(ni); IEEE80211_DPRINTF(ic, IEEE80211_MSG_POWER, "[%s] save frame, %u now queued\n", From owner-p4-projects@FreeBSD.ORG Tue Nov 30 20:07:46 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 869F316A507; Tue, 30 Nov 2004 20:07:45 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0B81716A53B for ; Tue, 30 Nov 2004 20:07:44 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EB76D43D3F for ; Tue, 30 Nov 2004 20:07:43 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iAUK7hVf016824 for ; Tue, 30 Nov 2004 20:07:43 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iAUK7he9016821 for perforce@freebsd.org; Tue, 30 Nov 2004 20:07:43 GMT (envelope-from sam@freebsd.org) Date: Tue, 30 Nov 2004 20:07:43 GMT Message-Id: <200411302007.iAUK7he9016821@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66129 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Nov 2004 20:07:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=66129 Change 66129 by sam@sam_ebb on 2004/11/30 20:07:09 send the "negotiated rate set" back in the probe response packet rather than the bss rate set; this keeps cranky 11b clients happy when operating in 11g (used to do this; not sure why I stopped) Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_output.c#17 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_output.c#17 (text+ko) ==== @@ -1015,7 +1015,7 @@ frm = ieee80211_add_ssid(frm, ic->ic_bss->ni_essid, ic->ic_bss->ni_esslen); - frm = ieee80211_add_rates(frm, &ic->ic_bss->ni_rates); + frm = ieee80211_add_rates(frm, &ni->ni_rates); if (ic->ic_phytype == IEEE80211_T_FH) { *frm++ = IEEE80211_ELEMID_FHPARMS; @@ -1042,7 +1042,7 @@ frm = ieee80211_add_wpa(frm, ic); if (ic->ic_curmode == IEEE80211_MODE_11G) frm = ieee80211_add_erp(frm, ic); - frm = ieee80211_add_xrates(frm, &ic->ic_bss->ni_rates); + frm = ieee80211_add_xrates(frm, &ni->ni_rates); m->m_pkthdr.len = m->m_len = frm - mtod(m, u_int8_t *); break; From owner-p4-projects@FreeBSD.ORG Tue Nov 30 23:16:46 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5D66F16A4D0; Tue, 30 Nov 2004 23:16:46 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 32D6616A4CE for ; Tue, 30 Nov 2004 23:16:46 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B959143D2F for ; Tue, 30 Nov 2004 23:16:45 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iAUNGjoJ030511 for ; Tue, 30 Nov 2004 23:16:45 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iAUNGjhf030508 for perforce@freebsd.org; Tue, 30 Nov 2004 23:16:45 GMT (envelope-from sam@freebsd.org) Date: Tue, 30 Nov 2004 23:16:45 GMT Message-Id: <200411302316.iAUNGjhf030508@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66149 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Nov 2004 23:16:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=66149 Change 66149 by sam@sam_ebb on 2004/11/30 23:15:57 IFC @ 66148 Affected files ... .. //depot/projects/wifi/MAINTAINERS#2 integrate .. //depot/projects/wifi/bin/ps/ps.1#2 integrate .. //depot/projects/wifi/etc/devd.conf#3 integrate .. //depot/projects/wifi/etc/usbd.conf#3 integrate .. //depot/projects/wifi/gnu/usr.bin/gdb/Makefile.inc#2 integrate .. //depot/projects/wifi/gnu/usr.bin/gdb/arch/alpha/Makefile#2 integrate .. //depot/projects/wifi/gnu/usr.bin/gdb/arch/amd64/Makefile#2 integrate .. //depot/projects/wifi/gnu/usr.bin/gdb/arch/i386/Makefile#3 integrate .. //depot/projects/wifi/gnu/usr.bin/gdb/arch/ia64/Makefile#2 integrate .. //depot/projects/wifi/gnu/usr.bin/gdb/arch/sparc64/Makefile#2 integrate .. //depot/projects/wifi/gnu/usr.bin/gdb/gdb/Makefile#2 integrate .. //depot/projects/wifi/gnu/usr.bin/gdb/gdbtui/Makefile#3 integrate .. //depot/projects/wifi/gnu/usr.bin/gdb/kgdb/Makefile#2 integrate .. //depot/projects/wifi/gnu/usr.bin/gdb/libgdb/Makefile#4 integrate .. //depot/projects/wifi/lib/libarchive/archive_write_set_format_pax.c#4 integrate .. //depot/projects/wifi/lib/libc/alpha/gen/divrem.m4#2 integrate .. //depot/projects/wifi/lib/libc/sys/mount.2#2 integrate .. //depot/projects/wifi/lib/libc/sys/statfs.2#2 integrate .. //depot/projects/wifi/sbin/devd/devd.8#2 integrate .. //depot/projects/wifi/sbin/mount/mntopts.h#3 integrate .. //depot/projects/wifi/sbin/mount/mount.8#2 integrate .. //depot/projects/wifi/sbin/mount/mount.c#2 integrate .. //depot/projects/wifi/sbin/mount_std/mount_std.8#2 integrate .. //depot/projects/wifi/sbin/sconfig/sconfig.8#2 integrate .. //depot/projects/wifi/share/man/man4/Makefile#7 integrate .. //depot/projects/wifi/share/man/man4/smp.4#2 integrate .. //depot/projects/wifi/share/man/man7/security.7#2 integrate .. //depot/projects/wifi/share/man/man9/vfs_mount.9#2 integrate .. //depot/projects/wifi/sys/alpha/alpha/divrem.m4#2 integrate .. //depot/projects/wifi/sys/amd64/amd64/busdma_machdep.c#5 integrate .. //depot/projects/wifi/sys/amd64/amd64/gdb_machdep.c#2 integrate .. //depot/projects/wifi/sys/amd64/amd64/machdep.c#5 integrate .. //depot/projects/wifi/sys/amd64/amd64/vm_machdep.c#3 integrate .. //depot/projects/wifi/sys/boot/efi/include/efilib.h#2 integrate .. //depot/projects/wifi/sys/boot/efi/libefi/Makefile#3 integrate .. //depot/projects/wifi/sys/boot/efi/libefi/copy.c#2 integrate .. //depot/projects/wifi/sys/boot/ficl/ficl.h#2 integrate .. //depot/projects/wifi/sys/boot/ficl/loader.c#2 integrate .. //depot/projects/wifi/sys/boot/i386/loader/Makefile#2 integrate .. //depot/projects/wifi/sys/boot/i386/loader/loader.rc#2 delete .. //depot/projects/wifi/sys/boot/ia64/efi/Makefile#2 integrate .. //depot/projects/wifi/sys/boot/ia64/efi/efimd.c#1 branch .. //depot/projects/wifi/sys/boot/pc98/btx/btx/btx.S#2 integrate .. //depot/projects/wifi/sys/boot/pc98/loader/Makefile#2 integrate .. //depot/projects/wifi/sys/dev/acpi_support/acpi_sony.c#2 integrate .. //depot/projects/wifi/sys/dev/acpica/acpi_pci.c#2 integrate .. //depot/projects/wifi/sys/dev/acpica/acpi_pci_link.c#4 integrate .. //depot/projects/wifi/sys/dev/uart/uart_cpu_sparc64.c#3 integrate .. //depot/projects/wifi/sys/dev/usb/umass.c#3 integrate .. //depot/projects/wifi/sys/dev/usb/usbdevs#4 integrate .. //depot/projects/wifi/sys/geom/geom_mbr.c#3 integrate .. //depot/projects/wifi/sys/geom/geom_pc98.c#2 integrate .. //depot/projects/wifi/sys/i386/i386/busdma_machdep.c#4 integrate .. //depot/projects/wifi/sys/i386/i386/vm_machdep.c#4 integrate .. //depot/projects/wifi/sys/ia64/include/bootinfo.h#2 integrate .. //depot/projects/wifi/sys/kern/kern_descrip.c#6 integrate .. //depot/projects/wifi/sys/kern/kern_lock.c#2 integrate .. //depot/projects/wifi/sys/kern/kern_shutdown.c#3 integrate .. //depot/projects/wifi/sys/kern/kern_umtx.c#2 integrate .. //depot/projects/wifi/sys/kern/subr_param.c#3 integrate .. //depot/projects/wifi/sys/kern/uipc_domain.c#4 integrate .. //depot/projects/wifi/sys/kern/uipc_socket.c#4 integrate .. //depot/projects/wifi/sys/kern/vfs_export.c#2 integrate .. //depot/projects/wifi/sys/kern/vfs_mount.c#5 integrate .. //depot/projects/wifi/sys/net/if.c#5 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_node.c#19 edit .. //depot/projects/wifi/sys/netgraph/bluetooth/socket/ng_btsocket.c#3 integrate .. //depot/projects/wifi/sys/netgraph/ng_ppp.c#2 integrate .. //depot/projects/wifi/sys/netgraph/ng_socket.c#3 integrate .. //depot/projects/wifi/sys/netinet/tcp.h#4 integrate .. //depot/projects/wifi/sys/netinet/tcp_input.c#6 integrate .. //depot/projects/wifi/sys/netinet/tcp_output.c#3 integrate .. //depot/projects/wifi/sys/netinet/tcp_usrreq.c#5 integrate .. //depot/projects/wifi/sys/netinet6/scope6.c#2 integrate .. //depot/projects/wifi/sys/nfsclient/nfs_vnops.c#3 integrate .. //depot/projects/wifi/sys/powerpc/include/psl.h#2 integrate .. //depot/projects/wifi/sys/sys/domain.h#2 integrate .. //depot/projects/wifi/sys/sys/pioctl.h#2 integrate .. //depot/projects/wifi/sys/sys/socket.h#2 integrate .. //depot/projects/wifi/tools/regression/usr.bin/make/Makefile#4 integrate .. //depot/projects/wifi/tools/tools/nanobsd/Customize/NET4801#1 branch .. //depot/projects/wifi/tools/tools/nanobsd/Customize/comconsole#1 branch .. //depot/projects/wifi/tools/tools/nanobsd/Customize/default#1 branch .. //depot/projects/wifi/tools/tools/nanobsd/Customize/nobeastie#1 branch .. //depot/projects/wifi/tools/tools/nanobsd/Makefile#2 integrate .. //depot/projects/wifi/tools/tools/nanobsd/customize.sh#2 integrate .. //depot/projects/wifi/tools/tools/nanobsd/i386.diskimage#2 integrate .. //depot/projects/wifi/tools/tools/nanobsd/make.conf#5 integrate .. //depot/projects/wifi/usr.bin/make/Makefile#3 integrate .. //depot/projects/wifi/usr.bin/make/arch.c#2 integrate .. //depot/projects/wifi/usr.bin/make/buf.c#2 integrate .. //depot/projects/wifi/usr.bin/make/buf.h#2 integrate .. //depot/projects/wifi/usr.bin/make/compat.c#3 integrate .. //depot/projects/wifi/usr.bin/make/cond.c#2 integrate .. //depot/projects/wifi/usr.bin/make/dir.c#2 integrate .. //depot/projects/wifi/usr.bin/make/dir.h#2 integrate .. //depot/projects/wifi/usr.bin/make/for.c#2 integrate .. //depot/projects/wifi/usr.bin/make/hash.c#2 integrate .. //depot/projects/wifi/usr.bin/make/hash.h#2 integrate .. //depot/projects/wifi/usr.bin/make/job.c#6 integrate .. //depot/projects/wifi/usr.bin/make/job.h#4 integrate .. //depot/projects/wifi/usr.bin/make/lst.h#2 integrate .. //depot/projects/wifi/usr.bin/make/lst.lib/lstAppend.c#3 integrate .. //depot/projects/wifi/usr.bin/make/lst.lib/lstAtEnd.c#3 delete .. //depot/projects/wifi/usr.bin/make/lst.lib/lstAtFront.c#3 delete .. //depot/projects/wifi/usr.bin/make/lst.lib/lstClose.c#3 integrate .. //depot/projects/wifi/usr.bin/make/lst.lib/lstConcat.c#3 integrate .. //depot/projects/wifi/usr.bin/make/lst.lib/lstDatum.c#3 delete .. //depot/projects/wifi/usr.bin/make/lst.lib/lstDeQueue.c#3 integrate .. //depot/projects/wifi/usr.bin/make/lst.lib/lstDestroy.c#3 integrate .. //depot/projects/wifi/usr.bin/make/lst.lib/lstDupl.c#3 integrate .. //depot/projects/wifi/usr.bin/make/lst.lib/lstEnQueue.c#3 delete .. //depot/projects/wifi/usr.bin/make/lst.lib/lstFind.c#3 delete .. //depot/projects/wifi/usr.bin/make/lst.lib/lstFindFrom.c#3 integrate .. //depot/projects/wifi/usr.bin/make/lst.lib/lstFirst.c#3 delete .. //depot/projects/wifi/usr.bin/make/lst.lib/lstForEach.c#3 delete .. //depot/projects/wifi/usr.bin/make/lst.lib/lstForEachFrom.c#3 integrate .. //depot/projects/wifi/usr.bin/make/lst.lib/lstInit.c#3 integrate .. //depot/projects/wifi/usr.bin/make/lst.lib/lstInsert.c#3 integrate .. //depot/projects/wifi/usr.bin/make/lst.lib/lstInt.h#2 delete .. //depot/projects/wifi/usr.bin/make/lst.lib/lstIsAtEnd.c#3 integrate .. //depot/projects/wifi/usr.bin/make/lst.lib/lstIsEmpty.c#3 delete .. //depot/projects/wifi/usr.bin/make/lst.lib/lstLast.c#2 delete .. //depot/projects/wifi/usr.bin/make/lst.lib/lstMember.c#3 integrate .. //depot/projects/wifi/usr.bin/make/lst.lib/lstNext.c#3 integrate .. //depot/projects/wifi/usr.bin/make/lst.lib/lstOpen.c#3 integrate .. //depot/projects/wifi/usr.bin/make/lst.lib/lstRemove.c#3 integrate .. //depot/projects/wifi/usr.bin/make/lst.lib/lstReplace.c#3 delete .. //depot/projects/wifi/usr.bin/make/lst.lib/lstSucc.c#3 delete .. //depot/projects/wifi/usr.bin/make/main.c#6 integrate .. //depot/projects/wifi/usr.bin/make/make.c#3 integrate .. //depot/projects/wifi/usr.bin/make/parse.c#3 integrate .. //depot/projects/wifi/usr.bin/make/str.c#2 integrate .. //depot/projects/wifi/usr.bin/make/suff.c#2 integrate .. //depot/projects/wifi/usr.bin/make/targ.c#2 integrate .. //depot/projects/wifi/usr.bin/make/util.c#2 integrate .. //depot/projects/wifi/usr.bin/make/var.c#2 integrate .. //depot/projects/wifi/usr.bin/make/var.h#2 integrate .. //depot/projects/wifi/usr.bin/make/var_modify.c#2 integrate .. //depot/projects/wifi/usr.bin/ncal/Makefile#3 integrate .. //depot/projects/wifi/usr.sbin/ppp/bundle.c#2 integrate .. //depot/projects/wifi/usr.sbin/ppp/bundle.h#2 integrate .. //depot/projects/wifi/usr.sbin/ppp/command.c#2 integrate .. //depot/projects/wifi/usr.sbin/ppp/main.c#2 integrate .. //depot/projects/wifi/usr.sbin/ppp/ppp.8.m4#3 integrate .. //depot/projects/wifi/usr.sbin/ppp/radius.c#2 integrate .. //depot/projects/wifi/usr.sbin/usbd/usbd.c#2 integrate Differences ... ==== //depot/projects/wifi/MAINTAINERS#2 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.100 2004/09/08 02:08:33 grog Exp $ +$FreeBSD: src/MAINTAINERS,v 1.101 2004/11/30 20:04:47 eik Exp $ subsystem login notes ----------------------------- @@ -102,6 +102,7 @@ rpc.lockd alfred Will be happy to review code, but not mandatory. truss alfred Will be happy to review code, but not mandatory. rpc alfred Pre-commit review requested. +pkg_install eik Pre-commit review or approval from portmgr@ requested. Following are the entries from the Makefiles, and a few other sources. Please remove stale entries from both their origin, and this file. ==== //depot/projects/wifi/bin/ps/ps.1#2 (text+ko) ==== @@ -26,7 +26,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/ps/ps.1,v 1.79 2004/06/22 01:59:54 gad Exp $ +.\" $FreeBSD: src/bin/ps/ps.1,v 1.80 2004/11/29 12:00:24 rwatson Exp $ .\" .Dd March 27, 2004 .Dt PS 1 @@ -249,7 +249,9 @@ .Nm will use the one which was specified last. .It Fl Z -Add label to the list of keywords for which +Add +.Xr mac 4 +label to the list of keywords for which .Nm will display information. .El @@ -601,9 +603,6 @@ .El .Sh FILES .Bl -tag -width ".Pa /boot/kernel/kernel" -compact -.It Pa /dev/lomac -interface used to query the -.Xr lomac 4 KLD .It Pa /boot/kernel/kernel default system namelist @@ -618,7 +617,7 @@ .Xr w 1 , .Xr kvm 3 , .Xr strftime 3 , -.Xr lomac 4 , +.Xr mac 4 , .Xr procfs 5 , .Xr pstat 8 , .Xr sysctl 8 , ==== //depot/projects/wifi/etc/devd.conf#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/devd.conf,v 1.18 2004/11/08 20:24:51 ru Exp $ +# $FreeBSD: src/etc/devd.conf,v 1.19 2004/11/28 23:16:00 iedowse Exp $ # # Refer to devd.conf(5) and devd(8) man pages for the details on how to # run and configure devd. @@ -66,6 +66,13 @@ action "kbdcontrol -k /dev/kbd0 < /dev/console"; }; +# The entry below starts moused when a mouse is plugged in. Moused +# stops automatically (actually it bombs :) when the device disappears. +attach 100 { + device-name "ums[0-9]+"; + action "/etc/rc.d/moused start $device-name"; +}; + # # Rescan scsi device-names on attach, but not detach. # ==== //depot/projects/wifi/etc/usbd.conf#3 (text+ko) ==== @@ -2,7 +2,7 @@ # # See usbd.conf(5) for the description of the format of the file. # -# $FreeBSD: src/etc/usbd.conf,v 1.13 2004/11/01 18:05:40 mtm Exp $ +# $FreeBSD: src/etc/usbd.conf,v 1.15 2004/11/28 23:16:00 iedowse Exp $ # Firmware download into the ActiveWire board. After the firmware download is # done the device detaches and reappears as something new and shiny automatically. @@ -22,15 +22,6 @@ attach "if ! kldstat -n usio > /dev/null 2>&1 ; then kldload usio; fi" attach "/usr/sbin/ezdownload -v -f /usr/share/usb/firmware/1645.8001.0101 /dev/${DEVNAME}" -# The entry below starts and stops dhclient when an ethernet device is inserted -# Caveat: It does not support multiple interfaces (but neither does pccardd, -# it shouldn't be too big a deal :-) -# -device "USB ethernet" - devname "[ackr]ue[0-9]+" - attach "/etc/pccard_ether ${DEVNAME} start" - detach "/etc/pccard_ether ${DEVNAME} stop" - # This entry starts the ColdSync tool in daemon mode. Make sure you have an up # to date /usr/local/etc/palms. We override the 'listen' settings for port and # type in /usr/local/etc/coldsync.conf. @@ -41,13 +32,6 @@ release 0x0100 attach "/usr/local/bin/coldsync -md -p /dev/${DEVNAME} -t usb" -# The entry below starts moused when a mouse is plugged in. Moused -# stops automatically (actually it bombs :) when the device disappears. -# -device "Mouse" - devname "ums[0-9]+" - attach "/etc/rc.d/moused start ${DEVNAME}" - # The fallthrough entry: Nothing is specified, nothing is done. And it isn't # necessary at all :-). Just for pretty printing in debugging mode. # ==== //depot/projects/wifi/gnu/usr.bin/gdb/Makefile.inc#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/gdb/Makefile.inc,v 1.10 2004/07/06 21:55:11 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/gdb/Makefile.inc,v 1.11 2004/11/30 05:12:35 marcel Exp $ VERSION= "6.1.1 [FreeBSD]" VENDOR= marcel @@ -36,6 +36,12 @@ GENSRCS+= nm.h tm.h +.if defined(GDB_CROSS_DEBUGGER) +CFLAGS+= -DCROSS_DEBUGGER +GDB_SUFFIX= -${TARGET_ARCH} +NOMAN= +.endif + .include "${TARGET_SUBDIR}/Makefile" SRCS+= ${GENSRCS} ==== //depot/projects/wifi/gnu/usr.bin/gdb/arch/alpha/Makefile#2 (text+ko) ==== @@ -1,8 +1,10 @@ -# $FreeBSD: src/gnu/usr.bin/gdb/arch/alpha/Makefile,v 1.1 2004/06/25 06:48:53 marcel Exp $ +# $FreeBSD: src/gnu/usr.bin/gdb/arch/alpha/Makefile,v 1.2 2004/11/30 05:12:35 marcel Exp $ +.if !defined(GDB_CROSS_DEBUGGER) LIBSRCS+= core-regset.c solib-legacy.c -LIBSRCS+= alpha-mdebug-tdep.c alpha-tdep.c alphabsd-nat.c alphabsd-tdep.c \ - alphafbsd-tdep.c +LIBSRCS+= alphabsd-nat.c +.endif +LIBSRCS+= alpha-mdebug-tdep.c alpha-tdep.c alphabsd-tdep.c alphafbsd-tdep.c nm.h: echo '#include "alpha/nm-fbsd.h"' > ${.TARGET} ==== //depot/projects/wifi/gnu/usr.bin/gdb/arch/amd64/Makefile#2 (text+ko) ==== @@ -1,10 +1,12 @@ -# $FreeBSD: src/gnu/usr.bin/gdb/arch/amd64/Makefile,v 1.1 2004/06/25 06:48:53 marcel Exp $ +# $FreeBSD: src/gnu/usr.bin/gdb/arch/amd64/Makefile,v 1.2 2004/11/30 05:12:36 marcel Exp $ GENSRCS+= xm.h -LIBSRCS+= fbsd-proc.c gcore.c -LIBSRCS+= amd64-nat.c amd64-tdep.c amd64bsd-nat.c amd64fbsd-nat.c \ - amd64fbsd-tdep.c i386-tdep.c i386bsd-tdep.c i386fbsd-tdep.c \ - i387-tdep.c +.if !defined(GDB_CROSS_DEBUGGER) +LIBSRCS+= fbsd-proc.c fbsd-threads.c gcore.c +LIBSRCS+= amd64-nat.c amd64bsd-nat.c amd64fbsd-nat.c +.endif +LIBSRCS+= amd64-tdep.c amd64fbsd-tdep.c i386-tdep.c i386bsd-tdep.c \ + i386fbsd-tdep.c i387-tdep.c nm.h: echo '#include "i386/nm-fbsd64.h"' > ${.TARGET} ==== //depot/projects/wifi/gnu/usr.bin/gdb/arch/i386/Makefile#3 (text+ko) ==== @@ -1,9 +1,11 @@ -# $FreeBSD: src/gnu/usr.bin/gdb/arch/i386/Makefile,v 1.2 2004/11/09 06:32:37 marcel Exp $ +# $FreeBSD: src/gnu/usr.bin/gdb/arch/i386/Makefile,v 1.3 2004/11/30 05:12:36 marcel Exp $ GENSRCS+= xm.h -LIBSRCS+= fbsd-proc.c gcore.c -LIBSRCS+= i386-nat.c i386-tdep.c i386bsd-nat.c i386bsd-tdep.c \ - i386fbsd-nat.c i386fbsd-tdep.c i387-tdep.c +.if !defined(GDB_CROSS_DEBUGGER) +LIBSRCS+= fbsd-proc.c fbsd-threads.c gcore.c +LIBSRCS+= i386-nat.c i386bsd-nat.c i386fbsd-nat.c +.endif +LIBSRCS+= i386-tdep.c i386bsd-tdep.c i386fbsd-tdep.c i387-tdep.c nm.h: echo '#include "i386/nm-fbsd.h"' > ${.TARGET} ==== //depot/projects/wifi/gnu/usr.bin/gdb/arch/ia64/Makefile#2 (text+ko) ==== @@ -1,7 +1,10 @@ -# $FreeBSD: src/gnu/usr.bin/gdb/arch/ia64/Makefile,v 1.1 2004/06/25 06:48:53 marcel Exp $ +# $FreeBSD: src/gnu/usr.bin/gdb/arch/ia64/Makefile,v 1.2 2004/11/30 05:12:36 marcel Exp $ +.if !defined(GDB_CROSS_DEBUGGER) LIBSRCS+= fbsd-proc.c gcore.c -LIBSRCS+= ia64-fbsd-nat.c ia64-fbsd-tdep.c ia64-tdep.c +LIBSRCS+= ia64-fbsd-nat.c +.endif +LIBSRCS+= ia64-fbsd-tdep.c ia64-tdep.c nm.h: echo '#include "ia64/nm-fbsd.h"' > ${.TARGET} ==== //depot/projects/wifi/gnu/usr.bin/gdb/arch/sparc64/Makefile#2 (text+ko) ==== @@ -1,8 +1,10 @@ -# $FreeBSD: src/gnu/usr.bin/gdb/arch/sparc64/Makefile,v 1.1 2004/06/25 06:48:54 marcel Exp $ +# $FreeBSD: src/gnu/usr.bin/gdb/arch/sparc64/Makefile,v 1.2 2004/11/30 05:12:36 marcel Exp $ +.if !defined(GDB_CROSS_DEBUGGER) LIBSRCS+= solib-legacy.c -LIBSRCS+= sparc-nat.c sparc-tdep.c sparc64-nat.c sparc64-tdep.c \ - sparc64fbsd-nat.c sparc64fbsd-tdep.c +LIBSRCS+= sparc-nat.c sparc64-nat.c sparc64fbsd-nat.c +.endif +LIBSRCS+= sparc-tdep.c sparc64-tdep.c sparc64fbsd-tdep.c nm.h: echo '#include "sparc/nm-fbsd.h"' > ${.TARGET} ==== //depot/projects/wifi/gnu/usr.bin/gdb/gdb/Makefile#2 (text+ko) ==== @@ -1,6 +1,6 @@ -# $FreeBSD: src/gnu/usr.bin/gdb/gdb/Makefile,v 1.42 2004/06/26 08:48:50 bde Exp $ +# $FreeBSD: src/gnu/usr.bin/gdb/gdb/Makefile,v 1.43 2004/11/30 05:12:36 marcel Exp $ -PROG= gdb +PROG= gdb${GDB_SUFFIX} SRCS= gdb.c BULIBS= ${OBJ_BU}/libbfd/libbfd.a ${OBJ_BU}/libopcodes/libopcodes.a \ ==== //depot/projects/wifi/gnu/usr.bin/gdb/gdbtui/Makefile#3 (text+ko) ==== @@ -1,6 +1,6 @@ -# $FreeBSD: src/gnu/usr.bin/gdb/gdbtui/Makefile,v 1.3 2004/10/24 15:32:28 ru Exp $ +# $FreeBSD: src/gnu/usr.bin/gdb/gdbtui/Makefile,v 1.4 2004/11/30 05:12:37 marcel Exp $ -PROG= gdbtui +PROG= gdbtui${GDB_SUFFIX} SRCS= tui-main.c NOMAN= ==== //depot/projects/wifi/gnu/usr.bin/gdb/kgdb/Makefile#2 (text+ko) ==== @@ -1,7 +1,7 @@ -# $FreeBSD: src/gnu/usr.bin/gdb/kgdb/Makefile,v 1.1 2004/07/25 05:29:15 marcel Exp $ +# $FreeBSD: src/gnu/usr.bin/gdb/kgdb/Makefile,v 1.3 2004/11/30 05:12:37 marcel Exp $ -PROG= kgdb -SRCS= kthr.c main.c trgt.c trgt_${MACHINE_ARCH}.c +PROG= kgdb${GDB_SUFFIX} +SRCS= kthr.c main.c trgt.c trgt_${TARGET_ARCH}.c WARNS?= 2 BULIBS= ${OBJ_BU}/libbfd/libbfd.a ${OBJ_BU}/libopcodes/libopcodes.a \ ==== //depot/projects/wifi/gnu/usr.bin/gdb/libgdb/Makefile#4 (text+ko) ==== @@ -1,4 +1,9 @@ -# $FreeBSD: src/gnu/usr.bin/gdb/libgdb/Makefile,v 1.5 2004/11/09 06:02:48 marcel Exp $ +# $FreeBSD: src/gnu/usr.bin/gdb/libgdb/Makefile,v 1.6 2004/11/30 05:12:37 marcel Exp $ + +TARGET_ARCH?= ${MACHINE_ARCH} +.if ${TARGET_ARCH} != ${MACHINE_ARCH} +GDB_CROSS_DEBUGGER= +.endif LIB= gdb INTERNALLIB= @@ -16,11 +21,11 @@ elfread.c environ.c eval.c event-loop.c event-top.c exec.c \ expprint.c \ f-exp.y f-lang.c f-typeprint.c f-valprint.c findvar.c \ - fork-child.c frame-base.c frame-unwind.c frame.c \ + ${_fork_child} frame-base.c frame-unwind.c frame.c \ gdb-events.c gdbarch.c gdbtypes.c gnu-v2-abi.c gnu-v3-abi.c \ hpacc-abi.c \ - inf-loop.c infcall.c infcmd.c inflow.c infptrace.c infrun.c \ - inftarg.c init.c interps.c \ + inf-loop.c infcall.c infcmd.c inflow.c ${_infptrace} infrun.c \ + ${_inftarg} init.c interps.c \ jv-exp.y jv-lang.c jv-typeprint.c jv-valprint.c \ kod-cisco.c kod.c \ language.c linespec.c \ @@ -47,12 +52,19 @@ valarith.c valops.c valprint.c values.c varobj.c \ wrapper.c ${LIBSRCS} -GENSRCS= version.c +TARGET_ARCH?= ${MACHINE_ARCH} +.if ${TARGET_ARCH} != ${MACHINE_ARCH} +GDB_CROSS_DEBUGGER= +.endif -.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" -LIBSRCS+= fbsd-threads.c +.if !defined(GDB_CROSS_DEBUGGER) +_fork_child= fork-child.c +_infptrace= infptrace.c +_inftarg= inftarg.c .endif +GENSRCS= version.c + version.c: echo '#include "version.h"' > ${.TARGET} echo 'const char version[] = ${VERSION};' >> ${.TARGET} ==== //depot/projects/wifi/lib/libarchive/archive_write_set_format_pax.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_pax.c,v 1.21 2004/11/15 01:46:33 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_pax.c,v 1.23 2004/11/28 17:57:11 kientzle Exp $"); #include #include @@ -314,7 +314,8 @@ struct archive_entry *entry_main; const char *linkname, *p; const char *hardlink; - const wchar_t *wp, *wp2, *wname_start; + const wchar_t *wp, *wp2; + const char *suffix_start; int need_extension, r, ret; struct pax *pax; const struct stat *st_main, *st_original; @@ -368,11 +369,11 @@ */ wp = archive_entry_pathname_w(entry_main); p = archive_entry_pathname(entry_main); - if (wcslen(wp) <= 100) /* Short enough for just 'name' field */ - wname_start = wp; /* Record a zero-length prefix */ + if (strlen(p) <= 100) /* Short enough for just 'name' field */ + suffix_start = p; /* Record a zero-length prefix */ else /* Find the largest suffix that fits in 'name' field. */ - wname_start = wcschr(wp + wcslen(wp) - 100 - 1, '/'); + suffix_start = strchr(p + strlen(p) - 100 - 1, '/'); /* Find non-ASCII character, if any. */ wp2 = wp; @@ -383,8 +384,7 @@ * If name is too long, or has non-ASCII characters, add * 'path' to pax extended attrs. */ - if (wname_start == NULL || wname_start - wp > 155 || - *wp2 != L'\0') { + if (suffix_start == NULL || suffix_start - p > 155 || *wp2 != L'\0') { add_pax_attr_w(&(pax->pax_header), "path", wp); archive_entry_set_pathname(entry_main, build_ustar_entry_name(ustar_entry_name, p)); @@ -657,7 +657,7 @@ /* Note that the 'x' header shouldn't ever fail to format */ if (ret != 0) { - const char *msg = "archive_write_header_pax: " + const char *msg = "archive_write_pax_header: " "'x' header failed?! This can't happen.\n"; write(2, msg, strlen(msg)); exit(1); ==== //depot/projects/wifi/lib/libc/alpha/gen/divrem.m4#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: divrem.m4,v 1.7 1996/10/17 03:08:04 cgd Exp $ */ -/* $FreeBSD: src/lib/libc/alpha/gen/divrem.m4,v 1.3 2000/05/10 19:04:57 obrien Exp $ */ +/* $FreeBSD: src/lib/libc/alpha/gen/divrem.m4,v 1.4 2004/11/27 20:59:49 peadar Exp $ */ /* * Copyright (c) 1994, 1995 Carnegie-Mellon University. @@ -172,7 +172,7 @@ ifelse(S, `true', ` /* Check to see if we should negate it. */ - subqv zero, RESULT, T_0 + subq zero, RESULT, T_0 cmovlbs NEG, T_0, RESULT ') ==== //depot/projects/wifi/lib/libc/sys/mount.2#2 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)mount.2 8.3 (Berkeley) 5/24/95 -.\" $FreeBSD: src/lib/libc/sys/mount.2,v 1.40 2004/08/13 14:33:03 roam Exp $ +.\" $FreeBSD: src/lib/libc/sys/mount.2,v 1.41 2004/11/29 09:56:12 ru Exp $ .\" -.Dd August 13, 2004 +.Dd November 26, 2004 .Dt MOUNT 2 .Os .Sh NAME @@ -130,9 +130,6 @@ This flag is set automatically when the caller is not the super-user. .It Dv MNT_NOATIME Disable update of file access times. -.It Dv MNT_NODEV -Do not interpret special files on the file system. -This flag is set automatically when the caller is not the super-user. .It Dv MNT_SNAPSHOT Create a snapshot of the file system. This is currently only supported on UFS2 file systems, see ==== //depot/projects/wifi/lib/libc/sys/statfs.2#2 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)statfs.2 8.5 (Berkeley) 5/24/95 -.\" $FreeBSD: src/lib/libc/sys/statfs.2,v 1.25 2004/07/20 19:30:57 csjp Exp $ +.\" $FreeBSD: src/lib/libc/sys/statfs.2,v 1.26 2004/11/29 09:56:12 ru Exp $ .\" -.Dd November 16, 2003 +.Dd November 26, 2004 .Dt STATFS 2 .Os .Sh NAME @@ -108,8 +108,6 @@ Files may not be executed from the file system. .It Dv MNT_NOSUID Setuid and setgid bits on files are not honored when they are executed. -.It Dv MNT_NODEV -Special files in the file system may not be opened. .It Dv MNT_SYNCHRONOUS All I/O to the file system is done synchronously. .It Dv MNT_ASYNC ==== //depot/projects/wifi/sbin/devd/devd.8#2 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sbin/devd/devd.8,v 1.12 2004/07/07 19:57:14 ru Exp $ +.\" $FreeBSD: src/sbin/devd/devd.8,v 1.13 2004/11/28 17:44:22 ceri Exp $ .\" .Dd October 17, 2002 .Dt DEVD 8 @@ -103,7 +103,9 @@ .Ic options section, one can define multiple directories to search for config files. -All files in each of these directories are parsed. +All files in these directories whose names match the patten +.Pa *.conf +are parsed. These files are intended to be installed by third party vendors that wish to hook into the .Nm ==== //depot/projects/wifi/sbin/mount/mntopts.h#3 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)mntopts.h 8.7 (Berkeley) 3/29/95 - * $FreeBSD: src/sbin/mount/mntopts.h,v 1.22 2004/11/25 13:31:46 phk Exp $ + * $FreeBSD: src/sbin/mount/mntopts.h,v 1.24 2004/11/30 19:36:40 ru Exp $ */ struct mntopt { ==== //depot/projects/wifi/sbin/mount/mount.8#2 (text+ko) ==== @@ -26,9 +26,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)mount.8 8.8 (Berkeley) 6/16/94 -.\" $FreeBSD: src/sbin/mount/mount.8,v 1.68 2004/05/17 08:35:42 ru Exp $ +.\" $FreeBSD: src/sbin/mount/mount.8,v 1.69 2004/11/29 09:35:01 ru Exp $ .\" -.Dd April 7, 2003 +.Dd November 26, 2004 .Dt MOUNT 8 .Os .Sh NAME @@ -177,12 +177,6 @@ Disable read clustering. .It Cm noclusterw Disable write clustering. -.It Cm nodev -Do not interpret character or block special devices on the file system. -This option is useful for a server that has file systems containing -special devices for architectures other than its own. -This option is set automatically when the user does not have super-user -privileges. .It Cm noexec Do not allow execution of any binaries on the mounted file system. This option is useful for a server that has file systems containing ==== //depot/projects/wifi/sbin/mount/mount.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)mount.c 8.25 (Berkeley) 5/8/95"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/mount/mount.c,v 1.66 2004/04/26 15:13:45 bmilekic Exp $"; + "$FreeBSD: src/sbin/mount/mount.c,v 1.67 2004/11/29 09:35:01 ru Exp $"; #endif /* not lint */ #include @@ -93,7 +93,6 @@ { MNT_EXPORTED, "NFS exported" }, { MNT_LOCAL, "local" }, { MNT_NOATIME, "noatime" }, - { MNT_NODEV, "nodev" }, { MNT_NOEXEC, "noexec" }, { MNT_NOSUID, "nosuid" }, { MNT_NOSYMFOLLOW, "nosymfollow" }, @@ -750,7 +749,6 @@ if (flags & MNT_SYNCHRONOUS) res = catopt(res, "sync"); if (flags & MNT_NOEXEC) res = catopt(res, "noexec"); if (flags & MNT_NOSUID) res = catopt(res, "nosuid"); - if (flags & MNT_NODEV) res = catopt(res, "nodev"); if (flags & MNT_UNION) res = catopt(res, "union"); if (flags & MNT_ASYNC) res = catopt(res, "async"); if (flags & MNT_NOATIME) res = catopt(res, "noatime"); ==== //depot/projects/wifi/sbin/mount_std/mount_std.8#2 (text+ko) ==== @@ -30,9 +30,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sbin/mount_std/mount_std.8,v 1.22 2004/07/02 21:45:04 ru Exp $ +.\" $FreeBSD: src/sbin/mount_std/mount_std.8,v 1.23 2004/11/29 09:35:01 ru Exp $ .\" -.Dd May 13, 1996 +.Dd November 26, 2004 .Dt MOUNT_STD 8 .Os .Sh NAME @@ -70,7 +70,6 @@ options .Dq ro , .Dq rw , -.Dq nodev , .Dq noexec , .Dq nosuid , and ==== //depot/projects/wifi/sbin/sconfig/sconfig.8#2 (text+ko) ==== @@ -10,7 +10,7 @@ .\" as long as this message is kept with the software, all derivative .\" works or modified versions. .\" -.\" $FreeBSD: src/sbin/sconfig/sconfig.8,v 1.5 2004/05/20 16:40:06 ru Exp $ +.\" $FreeBSD: src/sbin/sconfig/sconfig.8,v 1.6 2004/11/29 15:32:31 rik Exp $ .Dd May 19, 2004 .Dt SCONFIG 8 i386 .Os @@ -572,7 +572,7 @@ .Xr sppp 4 , .Xr ifconfig 8 , .Xr route 8 , -.Xr spppconrol 8 +.Xr spppcontrol 8 .\"-------------------------------------------------------------- .Sh HISTORY This utility is a replacement for the ==== //depot/projects/wifi/share/man/man4/Makefile#7 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/18/93 -# $FreeBSD: src/share/man/man4/Makefile,v 1.295 2004/11/27 13:49:27 simon Exp $ +# $FreeBSD: src/share/man/man4/Makefile,v 1.296 2004/11/30 16:16:34 brueffer Exp $ MAN= aac.4 \ acpi.4 \ @@ -361,6 +361,7 @@ MLINKS+=bge.4 if_bge.4 MLINKS+=bktr.4 brooktree.4 MLINKS+=cnw.4 if_cnw.4 +MLINKS+=crypto.4 cryptodev.4 MLINKS+=cue.4 if_cue.4 MLINKS+=dc.4 if_dc.4 MLINKS+=de.4 if_de.4 ==== //depot/projects/wifi/share/man/man4/smp.4#2 (text+ko) ==== @@ -21,7 +21,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/smp.4,v 1.19 2004/06/16 08:33:54 ru Exp $ +.\" $FreeBSD: src/share/man/man4/smp.4,v 1.20 2004/11/29 19:51:50 ceri Exp $ .\" .Dd December 5, 2002 .Dt SMP 4 @@ -39,7 +39,7 @@ Support for multi-processor systems is present for all Tier-1 architectures on .Fx . -Currently, this includes alpha, i386, ia64, and sparc64. +Currently, this includes alpha, amd64, i386, ia64, and sparc64. Support is enabled using .Cd options SMP . It is permissible to use the SMP kernel configuration on non-SMP equipped ==== //depot/projects/wifi/share/man/man7/security.7#2 (text+ko) ==== @@ -21,9 +21,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man7/security.7,v 1.39 2004/08/07 04:40:20 imp Exp $ +.\" $FreeBSD: src/share/man/man7/security.7,v 1.40 2004/11/29 09:56:12 ru Exp $ .\" -.Dd September 18, 1999 +.Dd November 29, 2004 .Dt SECURITY 7 .Os .Sh NAME @@ -630,16 +630,14 @@ If you have a huge amount of user disk space it may take too long to run through every file on those partitions. In this case, setting mount -flags to disallow SUID binaries and devices on those partitions is a good +flags to disallow SUID binaries on those partitions is a good idea. The -.Cm nodev -and .Cm nosuid -options +option (see .Xr mount 8 ) -are what you want to look into. +is what you want to look into. I would scan them anyway at least once a week, since the object of this layer is to detect a break-in whether or not the break-in is effective. ==== //depot/projects/wifi/share/man/man9/vfs_mount.9#2 (text+ko) ==== @@ -24,9 +24,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH .\" DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/vfs_mount.9,v 1.11 2003/10/23 06:17:12 hmp Exp $ +.\" $FreeBSD: src/share/man/man9/vfs_mount.9,v 1.12 2004/11/29 09:56:12 ru Exp $ .\" -.Dd July 8, 2001 +.Dd November 26, 2004 .Dt VFS_MOUNT 9 .Os .Sh NAME @@ -70,7 +70,7 @@ .Xr mount 2 for details. .Pp -.Dv MNT_EXPORTED , MNT_NOSUID , MNT_NODEV , MNT_UPDATE , MNT_RELOAD , +.Dv MNT_EXPORTED , MNT_NOSUID , MNT_UPDATE , MNT_RELOAD , .Dv MNT_FORCE , MNT_ASYNC , MNT_SYNCHRONOUS , MNT_UNION , MNT_NOATIME , .Dv MNT_SNAPSHOT , MNT_NOCLUSTERR , MNT_NOCLUSTERW , MNT_IGNORE , .Dv MNT_UNION , MNT_NOSYMFOLLOW ==== //depot/projects/wifi/sys/alpha/alpha/divrem.m4#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/divrem.m4,v 1.3 2000/05/01 20:17:45 peter Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/divrem.m4,v 1.4 2004/11/27 20:59:49 peadar Exp $ */ /* $NetBSD: divrem.m4,v 1.5 1996/10/17 04:26:25 cgd Exp $ */ /* @@ -172,7 +172,7 @@ ifelse(S, `true', ` /* Check to see if we should negate it. */ - subqv zero, RESULT, T_0 + subq zero, RESULT, T_0 cmovlbs NEG, T_0, RESULT ') ==== //depot/projects/wifi/sys/amd64/amd64/busdma_machdep.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.63 2004/11/21 06:28:09 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.64 2004/11/29 14:49:27 scottl Exp $"); #include #include @@ -277,7 +277,7 @@ } if (newtag->lowaddr < ptoa((vm_paddr_t)Maxmem) - || newtag->alignment > 1 || newtag->boundary > 0) + || newtag->alignment > 1) newtag->flags |= BUS_DMA_COULD_BOUNCE; if (((newtag->flags & BUS_DMA_COULD_BOUNCE) != 0) && ==== //depot/projects/wifi/sys/amd64/amd64/gdb_machdep.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/gdb_machdep.c,v 1.1 2004/07/10 17:47:20 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/gdb_machdep.c,v 1.2 2004/11/30 00:55:49 peter Exp $"); #include #include @@ -36,39 +36,46 @@ #include #include +#include #include #include #include +#include +#include #include void * gdb_cpu_getreg(int regnum, size_t *regsz) { - struct trapframe *tf = kdb_frame; *regsz = gdb_cpu_regsz(regnum); + + if (kdb_thread == curthread) { + switch (regnum) { + case 0: return (&kdb_frame->tf_rax); + case 2: return (&kdb_frame->tf_rcx); + case 3: return (&kdb_frame->tf_rdx); + case 4: return (&kdb_frame->tf_rsi); + case 5: return (&kdb_frame->tf_rdi); + case 8: return (&kdb_frame->tf_r8); + case 9: return (&kdb_frame->tf_r9); + case 10: return (&kdb_frame->tf_r10); + case 11: return (&kdb_frame->tf_r11); + case 18: return (&kdb_frame->tf_cs); + case 19: return (&kdb_frame->tf_ss); + } + } switch (regnum) { - case 0: return (&tf->tf_rax); - case 1: return (&tf->tf_rbx); - case 2: return (&tf->tf_rcx); - case 3: return (&tf->tf_rdx); - case 4: return (&tf->tf_rsi); - case 5: return (&tf->tf_rdi); - case 6: return (&tf->tf_rbp); - case 7: return (&tf->tf_rsp); - case 8: return (&tf->tf_r8); - case 9: return (&tf->tf_r9); - case 10: return (&tf->tf_r10); - case 11: return (&tf->tf_r11); - case 12: return (&tf->tf_r12); - case 13: return (&tf->tf_r13); - case 14: return (&tf->tf_r14); - case 15: return (&tf->tf_r15); - case 16: return (&tf->tf_rip); - case 17: return (&tf->tf_rflags); - case 18: return (&tf->tf_cs); - case 19: return (&tf->tf_ss); + case 1: return (&kdb_thrctx->pcb_rbx); + case 6: return (&kdb_thrctx->pcb_rbp); + case 7: return (&kdb_thrctx->pcb_rsp); + case 12: return (&kdb_thrctx->pcb_r12); + case 13: return (&kdb_thrctx->pcb_r13); + case 14: return (&kdb_thrctx->pcb_r14); + case 15: return (&kdb_thrctx->pcb_r15); + case 16: return (&kdb_thrctx->pcb_rip); + case 17: return (&kdb_thrctx->pcb_rflags); } return (NULL); } @@ -76,9 +83,12 @@ void gdb_cpu_setreg(int regnum, register_t val) { - struct trapframe *tf = kdb_frame; + val = __bswap64(val); switch (regnum) { - case GDB_REG_PC: tf->tf_rip = val; break; + case GDB_REG_PC: + kdb_thrctx->pcb_rip = val; + if (kdb_thread == curthread) + kdb_frame->tf_rip = val; } } ==== //depot/projects/wifi/sys/amd64/amd64/machdep.c#5 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.624 2004/11/27 06:51:32 das Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.625 2004/11/29 23:27:07 peter Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -589,8 +589,7 @@ * CR0_MP, CR0_NE and CR0_TS are also set by npx_probe() for the * BSP. See the comments there about why we set them. */ - cr0 |= CR0_MP | CR0_NE | CR0_TS; - cr0 |= CR0_WP | CR0_AM; + cr0 |= CR0_MP | CR0_NE | CR0_TS | CR0_WP | CR0_AM; load_cr0(cr0); } ==== //depot/projects/wifi/sys/amd64/amd64/vm_machdep.c#3 (text+ko) ==== @@ -41,7 +41,7 @@ */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Nov 30 23:31:03 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9CA8D16A4D0; Tue, 30 Nov 2004 23:31:03 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 74C9E16A4CE for ; Tue, 30 Nov 2004 23:31:03 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6203143D39 for ; Tue, 30 Nov 2004 23:31:03 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iAUNV3WX030908 for ; Tue, 30 Nov 2004 23:31:03 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iAUNV3vE030905 for perforce@freebsd.org; Tue, 30 Nov 2004 23:31:03 GMT (envelope-from sam@freebsd.org) Date: Tue, 30 Nov 2004 23:31:03 GMT Message-Id: <200411302331.iAUNV3vE030905@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66150 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Nov 2004 23:31:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=66150 Change 66150 by sam@sam_ebb on 2004/11/30 23:30:13 strip debug code no longer needed Affected files ... .. //depot/projects/wifi/sys/dev/ath/if_ath.c#34 edit Differences ... ==== //depot/projects/wifi/sys/dev/ath/if_ath.c#34 (text+ko) ==== @@ -3278,28 +3278,6 @@ return 0; } -#include -static void -checkbf(struct ath_buf *bf, const char *when, u_int d, u_int c) -{ - struct mbuf *m; - int i, j; - - for (m = bf->bf_m, i = 0; m != NULL; m = m->m_next, i++) - if (m != bf->bf_mshadow[i]) { - printf("%s: m %p != bf_mshadow[%u] %p, depth %u cur %u\n", - when, m, i, bf->bf_mshadow[i], d, c); - for (j = 0; j < i; j++) - printf("bf_mshadow[%u] %p\n", j, bf->bf_mshadow[j]); - kdb_enter(__func__); - } - if (i != bf->bf_nm) { - printf("%s: i %u != bf_nm %u depth %u cur %u\n", - when, i, bf->bf_nm, d, c); - kdb_enter(__func__); - } -} - /* * Process completed xmit descriptors from the specified queue. */ @@ -3314,9 +3292,7 @@ struct ath_node *an; int sr, lr, pri; HAL_STATUS status; -u_int depth = txq->axq_depth;/*XXX*/ -(void) depth; DPRINTF(sc, ATH_DEBUG_TX_PROC, "%s: tx queue %u head %p link %p\n", __func__, txq->axq_qnum, (caddr_t)(uintptr_t) ath_hal_gettxbuf(sc->sc_ah, txq->axq_qnum), @@ -3389,11 +3365,9 @@ */ ieee80211_free_node(ni); } -checkbf(bf, "before", depth, txq->axq_depth);/*XXX*/ bus_dmamap_sync(sc->sc_dmat, bf->bf_dmamap, BUS_DMASYNC_POSTWRITE); bus_dmamap_unload(sc->sc_dmat, bf->bf_dmamap); -checkbf(bf, "after", depth, txq->axq_depth);/*XXX*/ m_freem(bf->bf_m); bf->bf_m = NULL; bf->bf_node = NULL; From owner-p4-projects@FreeBSD.ORG Wed Dec 1 00:08:50 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F245316A4D0; Wed, 1 Dec 2004 00:08:49 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CAA3E16A4CE for ; Wed, 1 Dec 2004 00:08:49 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B659A43D45 for ; Wed, 1 Dec 2004 00:08:49 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iB108nJP032123 for ; Wed, 1 Dec 2004 00:08:49 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB108nPL032120 for perforce@freebsd.org; Wed, 1 Dec 2004 00:08:49 GMT (envelope-from sam@freebsd.org) Date: Wed, 1 Dec 2004 00:08:49 GMT Message-Id: <200412010008.iB108nPL032120@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66152 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Dec 2004 00:08:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=66152 Change 66152 by sam@sam_ebb on 2004/12/01 00:08:19 when operating as an ap set default antenna based on recent xmit stats in each beacon interval Affected files ... .. //depot/projects/wifi/sys/dev/ath/if_ath.c#35 edit .. //depot/projects/wifi/sys/dev/ath/if_athvar.h#14 edit Differences ... ==== //depot/projects/wifi/sys/dev/ath/if_ath.c#35 (text+ko) ==== @@ -1802,7 +1802,7 @@ struct ath_buf *bf = sc->sc_bcbuf; struct ath_hal *ah = sc->sc_ah; struct mbuf *m; - int ncabq, error; + int ncabq, error, otherant; DPRINTF(sc, ATH_DEBUG_BEACON_PROC, "%s: pending %u\n", __func__, pending); @@ -1873,6 +1873,17 @@ ath_setslottime(sc); /* commit change to h/w */ /* + * Check recent per-antenna transmit statistics and flip + * the default antenna if noticeably more frames went out + * on the non-default antenna. + * XXX assumes 2 anntenae + */ + otherant = sc->sc_defant & 1 ? 2 : 1; + if (sc->sc_ant_tx[otherant] > sc->sc_ant_tx[sc->sc_defant] + 2) + ath_setdefantenna(sc, otherant); + sc->sc_ant_tx[1] = sc->sc_ant_tx[2] = 0; + + /* * Construct tx descriptor. */ ath_beacon_setup(sc, bf); @@ -3330,7 +3341,9 @@ if (ni != NULL) { an = ATH_NODE(ni); if (ds->ds_txstat.ts_status == 0) { - sc->sc_stats.ast_ant_tx[ds->ds_txstat.ts_antenna]++; + u_int8_t txant = ds->ds_txstat.ts_antenna; + sc->sc_stats.ast_ant_tx[txant]++; + sc->sc_ant_tx[txant]++; if (ds->ds_txstat.ts_rate & HAL_TXSTAT_ALTRATE) sc->sc_stats.ast_tx_altrate++; sc->sc_stats.ast_tx_rssi = ==== //depot/projects/wifi/sys/dev/ath/if_athvar.h#14 (text+ko) ==== @@ -217,6 +217,7 @@ u_int sc_bhalq; /* HAL q for outgoing beacons */ u_int sc_bmisscount; /* missed beacon transmits */ + u_int32_t sc_ant_tx[8]; /* recent tx frames/antenna */ struct ath_txq *sc_cabq; /* tx q for cab frames */ struct ath_buf *sc_bcbuf; /* beacon buffer */ struct ath_buf *sc_bufptr; /* allocated buffer ptr */ From owner-p4-projects@FreeBSD.ORG Wed Dec 1 00:20:02 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3BF3B16A4D2; Wed, 1 Dec 2004 00:20:02 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C920816A4CE for ; Wed, 1 Dec 2004 00:20:01 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7861243D55 for ; Wed, 1 Dec 2004 00:20:01 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iB10K1Di032564 for ; Wed, 1 Dec 2004 00:20:01 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB10K131032561 for perforce@freebsd.org; Wed, 1 Dec 2004 00:20:01 GMT (envelope-from wsalamon@computer.org) Date: Wed, 1 Dec 2004 00:20:01 GMT Message-Id: <200412010020.iB10K131032561@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Subject: PERFORCE change 66153 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Dec 2004 00:20:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=66153 Change 66153 by wsalamon@rickenbacker on 2004/12/01 00:19:05 Add some more Linux compat audit events, mostly so I can test. Also change the core syscalls.master to use the AUE_O_CREAT event instead of AUE_CREAT (which doesn't exist). Affected files ... .. //depot/projects/trustedbsd/audit3/sys/i386/linux/linux_sysent.c#4 edit .. //depot/projects/trustedbsd/audit3/sys/i386/linux/syscalls.master#4 edit .. //depot/projects/trustedbsd/audit3/sys/kern/syscalls.master#9 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/i386/linux/linux_sysent.c#4 (text+ko) ==== @@ -26,14 +26,14 @@ { AS(linux_open_args), (sy_call_t *)linux_open, AUE_OPEN }, /* 5 = linux_open */ { SYF_MPSAFE | AS(close_args), (sy_call_t *)close, AUE_CLOSE }, /* 6 = close */ { SYF_MPSAFE | AS(linux_waitpid_args), (sy_call_t *)linux_waitpid, AUE_NULL }, /* 7 = linux_waitpid */ - { AS(linux_creat_args), (sy_call_t *)linux_creat, AUE_NULL }, /* 8 = linux_creat */ - { AS(linux_link_args), (sy_call_t *)linux_link, AUE_NULL }, /* 9 = linux_link */ - { AS(linux_unlink_args), (sy_call_t *)linux_unlink, AUE_NULL }, /* 10 = linux_unlink */ + { AS(linux_creat_args), (sy_call_t *)linux_creat, AUE_O_CREAT }, /* 8 = linux_creat */ + { AS(linux_link_args), (sy_call_t *)linux_link, AUE_LINK }, /* 9 = linux_link */ + { AS(linux_unlink_args), (sy_call_t *)linux_unlink, AUE_UNLINK }, /* 10 = linux_unlink */ { AS(linux_execve_args), (sy_call_t *)linux_execve, AUE_NULL }, /* 11 = linux_execve */ - { AS(linux_chdir_args), (sy_call_t *)linux_chdir, AUE_NULL }, /* 12 = linux_chdir */ + { AS(linux_chdir_args), (sy_call_t *)linux_chdir, AUE_CHDIR }, /* 12 = linux_chdir */ { AS(linux_time_args), (sy_call_t *)linux_time, AUE_NULL }, /* 13 = linux_time */ { AS(linux_mknod_args), (sy_call_t *)linux_mknod, AUE_NULL }, /* 14 = linux_mknod */ - { AS(linux_chmod_args), (sy_call_t *)linux_chmod, AUE_NULL }, /* 15 = linux_chmod */ + { AS(linux_chmod_args), (sy_call_t *)linux_chmod, AUE_CHMOD }, /* 15 = linux_chmod */ { AS(linux_lchown16_args), (sy_call_t *)linux_lchown16, AUE_NULL }, /* 16 = linux_lchown16 */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 17 = break */ { AS(linux_stat_args), (sy_call_t *)linux_stat, AUE_NULL }, /* 18 = linux_stat */ ==== //depot/projects/trustedbsd/audit3/sys/i386/linux/syscalls.master#4 (text+ko) ==== @@ -44,16 +44,16 @@ 6 MNOPROTO { int close(int fd); } AUE_CLOSE 7 MSTD { int linux_waitpid(l_pid_t pid, \ l_int *status, l_int options); } AUE_NULL -8 STD { int linux_creat(char *path, l_int mode); } AUE_NULL -9 STD { int linux_link(char *path, char *to); } AUE_NULL -10 STD { int linux_unlink(char *path); } AUE_NULL +8 STD { int linux_creat(char *path, l_int mode); } AUE_O_CREAT +9 STD { int linux_link(char *path, char *to); } AUE_LINK +10 STD { int linux_unlink(char *path); } AUE_UNLINK 11 STD { int linux_execve(char *path, char **argp, \ char **envp); } AUE_NULL -12 STD { int linux_chdir(char *path); } AUE_NULL +12 STD { int linux_chdir(char *path); } AUE_CHDIR 13 STD { int linux_time(l_time_t *tm); } AUE_NULL 14 STD { int linux_mknod(char *path, l_int mode, \ l_dev_t dev); } AUE_NULL -15 STD { int linux_chmod(char *path, l_mode_t mode); } AUE_NULL +15 STD { int linux_chmod(char *path, l_mode_t mode); } AUE_CHMOD 16 STD { int linux_lchown16(char *path, l_uid16_t uid, \ l_gid16_t gid); } AUE_NULL 17 UNIMPL break ==== //depot/projects/trustedbsd/audit3/sys/kern/syscalls.master#9 (text+ko) ==== @@ -63,7 +63,7 @@ 6 MSTD { int close(int fd); } AUE_CLOSE 7 MSTD { int wait4(int pid, int *status, int options, \ struct rusage *rusage); } AUE_NULL wait4 wait_args int -8 MCOMPAT { int creat(char *path, int mode); } AUE_CREAT +8 MCOMPAT { int creat(char *path, int mode); } AUE_O_CREAT 9 MSTD { int link(char *path, char *link); } AUE_LINK 10 MSTD { int unlink(char *path); } AUE_UNLINK 11 OBSOL execv From owner-p4-projects@FreeBSD.ORG Wed Dec 1 18:06:01 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 75A5516A4D0; Wed, 1 Dec 2004 18:06:01 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 398CE16A4CE for ; Wed, 1 Dec 2004 18:06:01 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2BD4043D2D for ; Wed, 1 Dec 2004 18:06:01 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iB1I61nK004248 for ; Wed, 1 Dec 2004 18:06:01 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB1I60TQ004245 for perforce@freebsd.org; Wed, 1 Dec 2004 18:06:00 GMT (envelope-from sam@freebsd.org) Date: Wed, 1 Dec 2004 18:06:00 GMT Message-Id: <200412011806.iB1I60TQ004245@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66193 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Dec 2004 18:06:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=66193 Change 66193 by sam@sam_ebb on 2004/12/01 18:05:56 correctly handling of multiple information elements Affected files ... .. //depot/projects/wifi/sbin/ifconfig/ifieee80211.c#20 edit Differences ... ==== //depot/projects/wifi/sbin/ifconfig/ifieee80211.c#20 (text+ko) ==== @@ -694,7 +694,7 @@ static void printies(const u_int8_t *vp, int ielen, int maxcols) { - for (; ielen > 0; ielen -= 2+vp[1]) + while (ielen > 0) { switch (vp[0]) { case IEEE80211_ELEMID_VENDOR: if (iswpaoui(vp)) @@ -711,6 +711,9 @@ printie(" ???", vp, 2+vp[1], maxcols); break; } + ielen -= 2+vp[1]; + vp += 2+vp[1]; + } } static void From owner-p4-projects@FreeBSD.ORG Wed Dec 1 18:46:51 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 45D0416A4D0; Wed, 1 Dec 2004 18:46:51 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 225DA16A4CE for ; Wed, 1 Dec 2004 18:46:51 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EFC8543D60 for ; Wed, 1 Dec 2004 18:46:50 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iB1Ikok7005550 for ; Wed, 1 Dec 2004 18:46:50 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB1Ikod5005547 for perforce@freebsd.org; Wed, 1 Dec 2004 18:46:50 GMT (envelope-from sam@freebsd.org) Date: Wed, 1 Dec 2004 18:46:50 GMT Message-Id: <200412011846.iB1Ikod5005547@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66195 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Dec 2004 18:46:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=66195 Change 66195 by sam@sam_ebb on 2004/12/01 18:46:11 print "roaming", not "roamingmode" to be consistent with the way you set the value (so c&p works) Affected files ... .. //depot/projects/wifi/sbin/ifconfig/ifieee80211.c#21 edit Differences ... ==== //depot/projects/wifi/sbin/ifconfig/ifieee80211.c#21 (text+ko) ==== @@ -1455,7 +1455,7 @@ } else { ireq.i_type = IEEE80211_IOC_ROAMING; if (ioctl(s, SIOCG80211, &ireq) != -1) { - printf("%croamingmode ", spacer); + printf("%croaming", spacer); switch (ireq.i_val) { case IEEE80211_ROAMING_DEVICE: printf("DEVICE"); From owner-p4-projects@FreeBSD.ORG Wed Dec 1 18:49:55 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 595CF16A4D0; Wed, 1 Dec 2004 18:49:55 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 36D7816A4CE for ; Wed, 1 Dec 2004 18:49:55 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2524D43D49 for ; Wed, 1 Dec 2004 18:49:55 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iB1Intxj005591 for ; Wed, 1 Dec 2004 18:49:55 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB1InsSY005588 for perforce@freebsd.org; Wed, 1 Dec 2004 18:49:54 GMT (envelope-from sam@freebsd.org) Date: Wed, 1 Dec 2004 18:49:54 GMT Message-Id: <200412011849.iB1InsSY005588@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66196 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Dec 2004 18:49:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=66196 Change 66196 by sam@sam_ebb on 2004/12/01 18:49:02 o implement "kick all" for setmlme deauth/disassoc o correct setmlme deauth/disassoc to send the correct mgmt frame based on the request Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#20 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#20 (text+ko) ==== @@ -1528,6 +1528,22 @@ return 0; } +static void +domlme(void *arg, struct ieee80211_node *ni) +{ + struct ieee80211com *ic = ni->ni_ic; + struct ieee80211req_mlme *mlme = arg; + + if (ni->ni_associd != 0) { + IEEE80211_SEND_MGMT(ic, ni, + mlme->im_op == IEEE80211_MLME_DEAUTH ? + IEEE80211_FC0_SUBTYPE_DEAUTH : + IEEE80211_FC0_SUBTYPE_DISASSOC, + mlme->im_reason); + } + ieee80211_node_leave(ic, ni); +} + static int ieee80211_ioctl_setmlme(struct ieee80211com *ic, struct ieee80211req *ireq) { @@ -1576,16 +1592,19 @@ mlme.im_reason); break; case IEEE80211_M_HOSTAP: - if (ic->ic_sta == NULL) - return EINVAL; - ni = ieee80211_find_node(ic->ic_sta, mlme.im_macaddr); - if (ni == NULL) - return EINVAL; - IEEE80211_SEND_MGMT(ic, ni, - IEEE80211_FC0_SUBTYPE_DEAUTH, - mlme.im_reason); - ieee80211_node_leave(ic, ni); - ieee80211_free_node(ni); + /* NB: the broadcast address means do 'em all */ + if (!IEEE80211_ADDR_EQ(mlme.im_macaddr, ic->ic_ifp->if_broadcastaddr)) { + if (ic->ic_sta == NULL || + (ni = ieee80211_find_node(ic->ic_sta, + mlme.im_macaddr)) == NULL) + return EINVAL; + domlme(&mlme, ni); + ieee80211_free_node(ni); + } else { + if (ic->ic_sta != NULL) + ieee80211_iterate_nodes(ic->ic_sta, + domlme, &mlme); + } break; default: return EINVAL; From owner-p4-projects@FreeBSD.ORG Wed Dec 1 19:57:20 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CD42A16A4D1; Wed, 1 Dec 2004 19:57:19 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9C18F16A4DD for ; Wed, 1 Dec 2004 19:57:19 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8773A43D41 for ; Wed, 1 Dec 2004 19:57:19 +0000 (GMT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iB1JvJfm008747 for ; Wed, 1 Dec 2004 19:57:19 GMT (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB1JvJau008743 for perforce@freebsd.org; Wed, 1 Dec 2004 19:57:19 GMT (envelope-from areisse@nailabs.com) Date: Wed, 1 Dec 2004 19:57:19 GMT Message-Id: <200412011957.iB1JvJau008743@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Subject: PERFORCE change 66203 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Dec 2004 19:57:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=66203 Change 66203 by areisse@areisse_tislabs on 2004/12/01 19:57:09 Install the header files from libsepol into /usr/include/sepol. Also build the library by default. Affected files ... .. //depot/projects/trustedbsd/sebsd/etc/mtree/BSD.include.dist#12 edit .. //depot/projects/trustedbsd/sebsd/lib/Makefile#14 edit .. //depot/projects/trustedbsd/sebsd/lib/libsepol/Makefile#2 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/etc/mtree/BSD.include.dist#12 (text+ko) ==== @@ -207,6 +207,8 @@ .. .. .. + sepol + .. sys .. ufs ==== //depot/projects/trustedbsd/sebsd/lib/Makefile#14 (text+ko) ==== @@ -33,7 +33,7 @@ ${_libpthread} ${_libsdp} ${_libsm} ${_libsmb} ${_libsmdb} \ ${_libsmutil} libstand libtelnet ${_libthr} ${_libthread_db} libufs \ libugidfw ${_libusbhid} ${_libvgl} libwrap libxpg4 liby libz ${_bind} \ - libsebsd + libsebsd libsepol .if exists(${.CURDIR}/csu/${MACHINE_ARCH}-elf) _csu=csu/${MACHINE_ARCH}-elf ==== //depot/projects/trustedbsd/sebsd/lib/libsepol/Makefile#2 (text+ko) ==== @@ -12,6 +12,8 @@ SRCS= avtab.c conditional.c ebitmap.c genbools.c hashtab.c mls.c policydb.c \ services.c sidtab.c symtab.c write.c +INCSDIR=${INCLUDEDIR}/sepol + INCS= sepol/avtab.h sepol/conditional.h sepol/constraint.h sepol/context.h \ sepol/ebitmap.h sepol/flask.h sepol/flask_types.h sepol/hashtab.h \ sepol/mls.h sepol/mls_types.h sepol/policydb.h sepol/services.h \ From owner-p4-projects@FreeBSD.ORG Wed Dec 1 19:58:21 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8856D16A4D0; Wed, 1 Dec 2004 19:58:21 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 63B6B16A4CE for ; Wed, 1 Dec 2004 19:58:21 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5013343D5D for ; Wed, 1 Dec 2004 19:58:21 +0000 (GMT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iB1JwLex008795 for ; Wed, 1 Dec 2004 19:58:21 GMT (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB1JwLvn008792 for perforce@freebsd.org; Wed, 1 Dec 2004 19:58:21 GMT (envelope-from areisse@nailabs.com) Date: Wed, 1 Dec 2004 19:58:21 GMT Message-Id: <200412011958.iB1JwLvn008792@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Subject: PERFORCE change 66204 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Dec 2004 19:58:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=66204 Change 66204 by areisse@areisse_tislabs on 2004/12/01 19:57:49 Change checkpolicy to use libsepol instead of linking in sebsd/ss from the kernel source tree. Affected files ... .. //depot/projects/trustedbsd/sebsd/sbin/sebsd_checkpolicy/Makefile#3 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sbin/sebsd_checkpolicy/Makefile#3 (text+ko) ==== @@ -1,20 +1,17 @@ # $FreeBSD: $ -.PATH: ${.CURDIR}/../../contrib/sebsd/checkpolicy ${.CURDIR}/../../sys/security/sebsd/ss +.PATH: ${.CURDIR}/../../contrib/sebsd/checkpolicy PROG= sebsd_checkpolicy MAN= -SRCS= policy_scan.l policy_parse.y checkpolicy.c avtab.c ebitmap.c \ - hashtab.c queue.c policydb.c services.c sidtab.c symtab.c write.c +SRCS= policy_scan.l policy_parse.y checkpolicy.c queue.c CFLAGS+=-I${.CURDIR}/../../contrib/sebsd/checkpolicy -CFLAGS+=-I${.CURDIR}/../../sys/security/sebsd/avc -CFLAGS+=-I${.CURDIR}/../../sys/security/sebsd/ss -CFLAGS+=-I${.CURDIR}/../../sys/security/sebsd +CFLAGS+=-I${.CURDIR}/../../contrib/sebsd/libsepol/include CFLAGS+=-I${.CURDIR}/../../sys CFLAGS+=-I${.OBJDIR} CFLAGS+=-g -LDADD+= -g -lfl +LDADD+= -g -lfl -lsepol WARNS= 0 From owner-p4-projects@FreeBSD.ORG Wed Dec 1 20:11:39 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C9EF416A4D0; Wed, 1 Dec 2004 20:11:38 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A6D6A16A4CE for ; Wed, 1 Dec 2004 20:11:38 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9823743D39 for ; Wed, 1 Dec 2004 20:11:38 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iB1KBcRx009295 for ; Wed, 1 Dec 2004 20:11:38 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB1KBcTU009292 for perforce@freebsd.org; Wed, 1 Dec 2004 20:11:38 GMT (envelope-from sam@freebsd.org) Date: Wed, 1 Dec 2004 20:11:38 GMT Message-Id: <200412012011.iB1KBcTU009292@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66207 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Dec 2004 20:11:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=66207 Change 66207 by sam@sam_ebb on 2004/12/01 20:11:25 o don't require the interface be up to do a SETIF ioctl o check IFF_UP on writes Affected files ... .. //depot/projects/wifi/sys/net/bpf.c#2 edit Differences ... ==== //depot/projects/wifi/sys/net/bpf.c#2 (text+ko) ==== @@ -564,6 +564,9 @@ ifp = d->bd_bif->bif_ifp; + if ((ifp->if_flags & IFF_UP) == 0) + return (ENETDOWN); + if (uio->uio_resid == 0) return (0); @@ -1006,14 +1009,10 @@ mtx_unlock(&bpf_mtx); /* * We found the requested interface. - * If it's not up, return an error. * Allocate the packet buffers if we need to. * If we're already attached to requested interface, * just flush the buffer. */ - if ((ifp->if_flags & IFF_UP) == 0) - return (ENETDOWN); - if (d->bd_sbuf == NULL) { error = bpf_allocbufs(d); if (error != 0) From owner-p4-projects@FreeBSD.ORG Wed Dec 1 20:13:42 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4AA9B16A4D0; Wed, 1 Dec 2004 20:13:42 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 102C316A4CE for ; Wed, 1 Dec 2004 20:13:42 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E977843D1D for ; Wed, 1 Dec 2004 20:13:41 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iB1KDfXq009413 for ; Wed, 1 Dec 2004 20:13:41 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB1KDfuF009410 for perforce@freebsd.org; Wed, 1 Dec 2004 20:13:41 GMT (envelope-from sam@freebsd.org) Date: Wed, 1 Dec 2004 20:13:41 GMT Message-Id: <200412012013.iB1KDfuF009410@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66208 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Dec 2004 20:13:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=66208 Change 66208 by sam@sam_ebb on 2004/12/01 20:13:14 add a mutex around nt_scangen so we can reuse it when doing arbitary node table scans Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_freebsd.h#8 edit .. //depot/projects/wifi/sys/net80211/ieee80211_node.c#20 edit .. //depot/projects/wifi/sys/net80211/ieee80211_node.h#13 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_freebsd.h#8 (text+ko) ==== @@ -54,6 +54,18 @@ mtx_assert(&(_nt)->nt_nodelock, MA_OWNED) /* + * Node table scangen locking definitions. + */ +typedef struct mtx ieee80211_scan_lock_t; +#define IEEE80211_SCAN_LOCK_INIT(_nt, _name) \ + mtx_init(&(_nt)->nt_scanlock, _name, "802.11 scangen", MTX_DEF) +#define IEEE80211_SCAN_LOCK_DESTROY(_nt) mtx_destroy(&(_nt)->nt_scanlock) +#define IEEE80211_SCAN_LOCK(_nt) mtx_lock(&(_nt)->nt_scanlock) +#define IEEE80211_SCAN_UNLOCK(_nt) mtx_unlock(&(_nt)->nt_scanlock) +#define IEEE80211_SCAN_LOCK_ASSERT(_nt) \ + mtx_assert(&(_nt)->nt_scanlock, MA_OWNED) + +/* * Per-node power-save queue definitions. */ #define IEEE80211_NODE_SAVEQ_INIT(_ni, _name) do { \ ==== //depot/projects/wifi/sys/net80211/ieee80211_node.c#20 (text+ko) ==== @@ -1324,7 +1324,8 @@ struct ieee80211_node *ni; u_int gen; - gen = nt->nt_scangen++; /* NB: ok 'cuz single-threaded*/ + IEEE80211_SCAN_LOCK(nt); + gen = nt->nt_scangen++; IEEE80211_DPRINTF(ic, IEEE80211_MSG_NODE, "%s: sta scangen %u\n", __func__, gen); restart: @@ -1416,18 +1417,38 @@ } IEEE80211_NODE_UNLOCK(nt); + IEEE80211_SCAN_UNLOCK(nt); + nt->nt_inact_timer = IEEE80211_INACT_WAIT; } void ieee80211_iterate_nodes(struct ieee80211_node_table *nt, ieee80211_iter_func *f, void *arg) { - struct ieee80211_node *ni, *tni; + struct ieee80211com *ic = nt->nt_ic; + struct ieee80211_node *ni; + u_int gen; + + IEEE80211_SCAN_LOCK(nt); + gen = nt->nt_scangen++; + IEEE80211_DPRINTF(ic, IEEE80211_MSG_NODE, + "%s: sta scangen %u\n", __func__, gen); +restart: IEEE80211_NODE_LOCK(nt); - TAILQ_FOREACH_SAFE(ni, &nt->nt_node, ni_list, tni) - (*f)(arg, ni); + TAILQ_FOREACH(ni, &nt->nt_node, ni_list) { + if (ni->ni_scangen != gen) { + ni->ni_scangen = gen; + (void) ieee80211_ref_node(ni); + IEEE80211_NODE_UNLOCK(nt); + (*f)(arg, ni); + ieee80211_free_node(ni); + goto restart; + } + } IEEE80211_NODE_UNLOCK(nt); + + IEEE80211_SCAN_UNLOCK(nt); } void @@ -1778,6 +1799,7 @@ nt->nt_ic = ic; /* XXX need unit */ IEEE80211_NODE_LOCK_INIT(nt, ic->ic_ifp->if_xname); + IEEE80211_SCAN_LOCK_INIT(nt, ic->ic_ifp->if_xname); TAILQ_INIT(&nt->nt_node); nt->nt_name = name; nt->nt_scangen = 1; @@ -1824,6 +1846,7 @@ "%s %s table\n", __func__, nt->nt_name); ieee80211_free_allnodes_locked(nt); + IEEE80211_SCAN_LOCK_DESTROY(nt); IEEE80211_NODE_LOCK_DESTROY(nt); } ==== //depot/projects/wifi/sys/net80211/ieee80211_node.h#13 (text+ko) ==== @@ -206,6 +206,7 @@ TAILQ_HEAD(, ieee80211_node) nt_node; /* information of all nodes */ LIST_HEAD(, ieee80211_node) nt_hash[IEEE80211_NODE_HASHSIZE]; const char *nt_name; /* for debugging */ + ieee80211_scan_lock_t nt_scanlock; /* on nt_scangen */ u_int nt_scangen; /* gen# for timeout scan */ int nt_inact_timer; /* inactivity timer */ int nt_inact_init; /* initial node inact setting */ From owner-p4-projects@FreeBSD.ORG Wed Dec 1 23:19:32 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3939416A4D0; Wed, 1 Dec 2004 23:19:32 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 14E3A16A4CE for ; Wed, 1 Dec 2004 23:19:32 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B97F643D46 for ; Wed, 1 Dec 2004 23:19:31 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iB1NJVo6024916 for ; Wed, 1 Dec 2004 23:19:31 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB1NJVwD024913 for perforce@freebsd.org; Wed, 1 Dec 2004 23:19:31 GMT (envelope-from peter@freebsd.org) Date: Wed, 1 Dec 2004 23:19:31 GMT Message-Id: <200412012319.iB1NJVwD024913@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 66222 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Dec 2004 23:19:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=66222 Change 66222 by peter@peter_daintree on 2004/12/01 23:18:54 Since we define INCLUDEDIR as overridable, use it. Affected files ... .. //depot/projects/hammer/etc/Makefile#34 edit .. //depot/projects/hammer/gnu/usr.bin/cvs/cvs/Makefile#8 edit .. //depot/projects/hammer/gnu/usr.bin/cvs/lib/Makefile#7 edit .. //depot/projects/hammer/gnu/usr.bin/cvs/libdiff/Makefile#5 edit .. //depot/projects/hammer/gnu/usr.bin/diff/Makefile#3 edit .. //depot/projects/hammer/gnu/usr.bin/grep/Makefile#6 edit .. //depot/projects/hammer/lib/libc/rpc/Makefile.inc#8 edit .. //depot/projects/hammer/lib/libc/yp/Makefile.inc#5 edit .. //depot/projects/hammer/lib/librpcsvc/Makefile#4 edit .. //depot/projects/hammer/usr.bin/kdump/Makefile#2 edit .. //depot/projects/hammer/usr.bin/truss/Makefile#6 edit .. //depot/projects/hammer/usr.sbin/amd/Makefile.inc#4 edit .. //depot/projects/hammer/usr.sbin/amd/amd/Makefile#4 edit .. //depot/projects/hammer/usr.sbin/amd/libamu/Makefile#3 edit .. //depot/projects/hammer/usr.sbin/bootparamd/bootparamd/Makefile#4 edit .. //depot/projects/hammer/usr.sbin/bootparamd/callbootd/Makefile#3 edit .. //depot/projects/hammer/usr.sbin/keyserv/Makefile#5 edit .. //depot/projects/hammer/usr.sbin/rpc.lockd/Makefile#4 edit .. //depot/projects/hammer/usr.sbin/rpc.statd/Makefile#4 edit .. //depot/projects/hammer/usr.sbin/rpc.yppasswdd/Makefile#4 edit .. //depot/projects/hammer/usr.sbin/rpc.ypupdated/Makefile#4 edit .. //depot/projects/hammer/usr.sbin/tcpdump/tcpdump/Makefile#6 edit Differences ... ==== //depot/projects/hammer/etc/Makefile#34 (text+ko) ==== @@ -191,11 +191,11 @@ mtree -eU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BSD.var.dist -p ${DESTDIR}/var mtree -eU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BSD.usr.dist -p ${DESTDIR}/usr mtree -eU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BSD.include.dist \ - -p ${DESTDIR}/usr/include + -p ${DESTDIR}${INCLUDEDIR} .if !defined(NO_BIND) .if defined(WITH_BIND_LIBS) mtree -deU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BIND.include.dist \ - -p ${DESTDIR}/usr/include + -p ${DESTDIR}/${INCLUDEDIR} .endif .if !defined(NO_BIND_MTREE) .if defined(NO_BIND_CHROOT) ==== //depot/projects/hammer/gnu/usr.bin/cvs/cvs/Makefile#8 (text+ko) ==== @@ -27,7 +27,7 @@ # gnu must be before lib to pick correct regex.h CFLAGS+= -I${.CURDIR} -I../lib -DHAVE_CONFIG_H -I${CVSDIR}/src \ - -I${DESTDIR}/usr/include/gnu \ + -I${DESTDIR}${INCLUDEDIR}/gnu \ -I${CVSDIR}/lib -I${CVSDIR}/diff -I. DPADD= ${LIBCVS} ${LIBDIFF} ${LIBGNUREGEX} ${LIBMD} ${LIBCRYPT} ${LIBZ} ==== //depot/projects/hammer/gnu/usr.bin/cvs/lib/Makefile#7 (text+ko) ==== @@ -12,7 +12,7 @@ INTERNALLIB= # gnu must be before lib to pick correct regex.h -CFLAGS+= -I. -I${CVSDIR}/src -I${DESTDIR}/usr/include/gnu \ +CFLAGS+= -I. -I${CVSDIR}/src -I${DESTDIR}${INCLUDEDIR}/gnu \ -I${CVSDIR}/lib CFLAGS+= -DHAVE_CONFIG_H YFLAGS= ==== //depot/projects/hammer/gnu/usr.bin/cvs/libdiff/Makefile#5 (text+ko) ==== @@ -10,7 +10,7 @@ INTERNALLIB= # gnu must be before lib to pick correct regex.h -CFLAGS+= -I../lib -I${DESTDIR}/usr/include/gnu \ +CFLAGS+= -I../lib -I${DESTDIR}${INCLUDEDIR}/gnu \ -I${CVSDIR}/lib -DHAVE_CONFIG_H SRCS = diff.c diff3.c analyze.c cmpbuf.c cmpbuf.h io.c context.c ed.c \ ==== //depot/projects/hammer/gnu/usr.bin/diff/Makefile#3 (text+ko) ==== @@ -10,7 +10,7 @@ CFLAGS+=-funsigned-char CFLAGS+=-I${.CURDIR}/../../../contrib/diff \ - -I${DESTDIR}/usr/include/gnu + -I${DESTDIR}${INCLUDEDIR}/gnu CFLAGS+=-DHAVE_CONFIG_H CFLAGS+=-DPR_PROGRAM=\"/usr/bin/pr\" ==== //depot/projects/hammer/gnu/usr.bin/grep/Makefile#6 (text+ko) ==== @@ -7,7 +7,7 @@ isdir.c kwset.c obstack.c quotearg.c savedir.c search.c xmalloc.c \ xstrtoumax.c -CFLAGS+=-I${.CURDIR} -I${DESTDIR}/usr/include/gnu -DHAVE_CONFIG_H +CFLAGS+=-I${.CURDIR} -I${DESTDIR}${INCLUDEDIR}/gnu -DHAVE_CONFIG_H LINKS+= ${BINDIR}/grep ${BINDIR}/egrep \ ${BINDIR}/grep ${BINDIR}/fgrep ==== //depot/projects/hammer/lib/libc/rpc/Makefile.inc#8 (text+ko) ==== @@ -30,7 +30,7 @@ CLEANFILES+= crypt_clnt.c crypt_xdr.c crypt.h -RPCDIR= ${DESTDIR}/usr/include/rpcsvc +RPCDIR= ${DESTDIR}${INCLUDEDIR}/rpcsvc RPCGEN= rpcgen -C crypt_clnt.c: ${RPCDIR}/crypt.x crypt.h ==== //depot/projects/hammer/lib/libc/yp/Makefile.inc#5 (text+ko) ==== @@ -7,7 +7,7 @@ SRCS+= xdryp.c yp.h yp_xdr.c yplib.c CLEANFILES+= yp.h yp_xdr.c -RPCSRC= ${DESTDIR}/usr/include/rpcsvc/yp.x +RPCSRC= ${DESTDIR}${INCLUDEDIR}/rpcsvc/yp.x RPCGEN= rpcgen -C yp_xdr.c: ${RPCSRC} ==== //depot/projects/hammer/lib/librpcsvc/Makefile#4 (text+ko) ==== @@ -1,7 +1,7 @@ # from: @(#)Makefile 5.10 (Berkeley) 6/24/90 # $FreeBSD: src/lib/librpcsvc/Makefile,v 1.18 2004/11/13 20:40:29 bz Exp $ -.PATH: ${DESTDIR}/usr/include/rpcsvc +.PATH: ${DESTDIR}${INCLUDEDIR}/rpcsvc LIB= rpcsvc @@ -18,7 +18,7 @@ RPCCOM = rpcgen -C -INCDIRS= -I${DESTDIR}/usr/include/rpcsvc +INCDIRS= -I${DESTDIR}${INCLUDEDIR}/rpcsvc CFLAGS+= -DYP ${INCDIRS} ==== //depot/projects/hammer/usr.bin/kdump/Makefile#2 (text+ko) ==== @@ -10,6 +10,6 @@ CLEANFILES= ioctl.c ioctl.c: mkioctls - sh ${.CURDIR}/mkioctls ${DESTDIR}/usr/include > ${.TARGET} + sh ${.CURDIR}/mkioctls ${DESTDIR}${INCLUDEDIR} > ${.TARGET} .include ==== //depot/projects/hammer/usr.bin/truss/Makefile#6 (text+ko) ==== @@ -29,6 +29,6 @@ ${.CURDIR}/i386.conf ioctl.c: ${.CURDIR}/../kdump/mkioctls - sh ${.CURDIR}/../kdump/mkioctls ${DESTDIR}/usr/include > ${.TARGET} + sh ${.CURDIR}/../kdump/mkioctls ${DESTDIR}${INCLUDEDIR} > ${.TARGET} .include ==== //depot/projects/hammer/usr.sbin/amd/Makefile.inc#4 (text+ko) ==== @@ -31,8 +31,8 @@ LIBAMU= ${LIBAMUDIR}/libamu.a RPCCOM= rpcgen -MOUNT_X= ${DESTDIR}/usr/include/rpcsvc/mount.x -NFS_PROT_X= ${DESTDIR}/usr/include/rpcsvc/nfs_prot.x +MOUNT_X= ${DESTDIR}${INCLUDEDIR}/rpcsvc/mount.x +NFS_PROT_X= ${DESTDIR}${INCLUDEDIR}/rpcsvc/nfs_prot.x .if exists(${.CURDIR}/../../Makefile.inc) .include "${.CURDIR}/../../Makefile.inc" ==== //depot/projects/hammer/usr.sbin/amd/amd/Makefile#4 (text+ko) ==== @@ -23,7 +23,7 @@ SRCS+= srvr_amfs_auto.c srvr_nfs.c CFLAGS+= -I${.CURDIR}/../../../contrib/amd/amd \ - -I${DESTDIR}/usr/include/rpcsvc + -I${DESTDIR}${INCLUDEDIR}/rpcsvc DPADD= ${LIBAMU} LDADD= ${LIBAMU} ==== //depot/projects/hammer/usr.sbin/amd/libamu/Makefile#3 (text+ko) ==== @@ -23,7 +23,7 @@ CLEANFILES+= nfs_prot_x.c CFLAGS+= -I${.CURDIR}/../../../contrib/amd/libamu \ - -I${DESTDIR}/usr/include/rpcsvc + -I${DESTDIR}${INCLUDEDIR}/rpcsvc nfs_prot_x.c: ${NFS_PROT_X} ${RPCCOM} -c -C -DWANT_NFS3 ${NFS_PROT_X} -o ${.TARGET} ==== //depot/projects/hammer/usr.sbin/bootparamd/bootparamd/Makefile#4 (text+ko) ==== @@ -13,7 +13,7 @@ CLEANFILES= ${GENSRCS} -RPCSRC= ${DESTDIR}/usr/include/rpcsvc/bootparam_prot.x +RPCSRC= ${DESTDIR}${INCLUDEDIR}/rpcsvc/bootparam_prot.x bootparam_prot_svc.c: ${RPCSRC} rpcgen -C -m -o ${.TARGET} ${RPCSRC} ==== //depot/projects/hammer/usr.sbin/bootparamd/callbootd/Makefile#3 (text+ko) ==== @@ -10,7 +10,7 @@ CLEANFILES= ${GENSRCS} -RPCSRC= ${DESTDIR}/usr/include/rpcsvc/bootparam_prot.x +RPCSRC= ${DESTDIR}${INCLUDEDIR}/rpcsvc/bootparam_prot.x bootparam_prot_clnt.c: ${RPCSRC} rpcgen -l -o ${.TARGET} ${RPCSRC} ==== //depot/projects/hammer/usr.sbin/keyserv/Makefile#5 (text+ko) ==== @@ -9,7 +9,7 @@ DPADD= ${LIBMP} ${LIBCRYPTO} ${LIBRPCSVC} LDADD= -lmp -lcrypto -lrpcsvc -RPCDIR= ${DESTDIR}/usr/include/rpcsvc +RPCDIR= ${DESTDIR}${INCLUDEDIR}/rpcsvc CLEANFILES= crypt_svc.c crypt.h ==== //depot/projects/hammer/usr.sbin/rpc.lockd/Makefile#4 (text+ko) ==== @@ -6,7 +6,7 @@ MLINKS= rpc.lockd.8 lockd.8 SRCS= kern.c nlm_prot_svc.c lockd.c lock_proc.c lockd_lock.c -CFLAGS+= -I. -I${DESTDIR}/usr/include/rpcsvc +CFLAGS+= -I. -I${DESTDIR}${INCLUDEDIR}/rpcsvc #WARNS?= 2 DPADD= ${LIBRPCSVC} ${LIBUTIL} @@ -14,7 +14,7 @@ CLEANFILES= nlm_prot_svc.c nlm_prot.h test -RPCSRC= ${DESTDIR}/usr/include/rpcsvc/nlm_prot.x +RPCSRC= ${DESTDIR}${INCLUDEDIR}/rpcsvc/nlm_prot.x RPCGEN= rpcgen -L -C nlm_prot_svc.c: ${RPCSRC} ==== //depot/projects/hammer/usr.sbin/rpc.statd/Makefile#4 (text+ko) ==== @@ -12,7 +12,7 @@ CLEANFILES= sm_inter_svc.c sm_inter.h -RPCSRC= ${DESTDIR}/usr/include/rpcsvc/sm_inter.x +RPCSRC= ${DESTDIR}${INCLUDEDIR}/rpcsvc/sm_inter.x RPCGEN= rpcgen -L -C sm_inter_svc.c: ${RPCSRC} ==== //depot/projects/hammer/usr.sbin/rpc.yppasswdd/Makefile#4 (text+ko) ==== @@ -1,6 +1,6 @@ # $FreeBSD: src/usr.sbin/rpc.yppasswdd/Makefile,v 1.21 2004/10/18 21:29:20 ru Exp $ -RPCDIR= ${DESTDIR}/usr/include/rpcsvc +RPCDIR= ${DESTDIR}${INCLUDEDIR}/rpcsvc .PATH: ${.CURDIR}/../../usr.sbin/ypserv ${.CURDIR}/../../usr.bin/chpass \ ${.CURDIR}/../../libexec/ypxfr ${RPCDIR} ==== //depot/projects/hammer/usr.sbin/rpc.ypupdated/Makefile#4 (text+ko) ==== @@ -16,7 +16,7 @@ CLEANFILES= ypupdate_prot_svc.c ypupdate_prot.h -RPCDIR= ${DESTDIR}/usr/include/rpcsvc +RPCDIR= ${DESTDIR}${INCLUDEDIR}/rpcsvc RPCGEN= rpcgen -I -C # We need to remove the 'static' keyword from _rpcsvcstate so that ==== //depot/projects/hammer/usr.sbin/tcpdump/tcpdump/Makefile#6 (text+ko) ==== @@ -45,7 +45,7 @@ .if !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH) DPADD+= ${LIBCRYPTO} LDADD+= -lcrypto -CFLAGS+= -I${DESTDIR}/usr/include/openssl -DHAVE_LIBCRYPTO -DHAVE_RC5_H -DHAVE_CAST_H -DHAVE_OPENSSL_EVP_H +CFLAGS+= -I${DESTDIR}${INCLUDEDIR}/openssl -DHAVE_LIBCRYPTO -DHAVE_RC5_H -DHAVE_CAST_H -DHAVE_OPENSSL_EVP_H .endif version.c: ${TCPDUMP_DISTDIR}/VERSION From owner-p4-projects@FreeBSD.ORG Wed Dec 1 23:32:49 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C860D16A4D0; Wed, 1 Dec 2004 23:32:48 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A581B16A4CE for ; Wed, 1 Dec 2004 23:32:48 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9494B43D46 for ; Wed, 1 Dec 2004 23:32:48 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iB1NWmWI025539 for ; Wed, 1 Dec 2004 23:32:48 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB1NWmnV025536 for perforce@freebsd.org; Wed, 1 Dec 2004 23:32:48 GMT (envelope-from peter@freebsd.org) Date: Wed, 1 Dec 2004 23:32:48 GMT Message-Id: <200412012332.iB1NWmnV025536@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 66224 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Dec 2004 23:32:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=66224 Change 66224 by peter@peter_overcee on 2004/12/01 23:32:17 fix a bad path Affected files ... .. //depot/projects/hammer/Makefile.inc1#79 edit Differences ... ==== //depot/projects/hammer/Makefile.inc1#79 (text+ko) ==== @@ -416,7 +416,7 @@ cd ${.CURDIR}/kerberos5/lib; \ ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t} .endif - cd ${.CURDIR}/gnu/usr.bin/gcc/cc/include; \ + cd ${.CURDIR}/gnu/usr.bin/cc/include; \ ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t} .endfor .for _dir in lib/libncurses lib/libmagic @@ -439,7 +439,7 @@ .if !defined(NOCRYPT) cd ${.CURDIR}/secure/lib; ${LIB32MAKE} install .endif - cd ${.CURDIR}/gnu/usr.bin/gcc/cc/include; ${LIB32MAKE} install + cd ${.CURDIR}/gnu/usr.bin/cc/include; ${LIB32MAKE} install cd ${.CURDIR}/libexec/rtld-elf; PROG=ld-elf32.so.1 ${LIB32MAKE} install .endif From owner-p4-projects@FreeBSD.ORG Wed Dec 1 23:36:56 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DA20816A4D0; Wed, 1 Dec 2004 23:36:55 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B2F3B16A4CE for ; Wed, 1 Dec 2004 23:36:55 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 42E7643D49 for ; Wed, 1 Dec 2004 23:36:55 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iB1Nataw025755 for ; Wed, 1 Dec 2004 23:36:55 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB1NasfC025752 for perforce@freebsd.org; Wed, 1 Dec 2004 23:36:54 GMT (envelope-from peter@freebsd.org) Date: Wed, 1 Dec 2004 23:36:54 GMT Message-Id: <200412012336.iB1NasfC025752@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 66226 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Dec 2004 23:36:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=66226 Change 66226 by peter@peter_overcee on 2004/12/01 23:36:27 IFC @66223 Affected files ... .. //depot/projects/hammer/MAINTAINERS#29 integrate .. //depot/projects/hammer/etc/defaults/rc.conf#44 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/Makefile.inc#4 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/arch/alpha/Makefile#2 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/arch/amd64/Makefile#2 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/arch/i386/Makefile#3 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/arch/ia64/Makefile#2 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/arch/sparc64/Makefile#2 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/gdb/Makefile#3 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/gdbtui/Makefile#4 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/kgdb/Makefile#2 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/libgdb/Makefile#6 integrate .. //depot/projects/hammer/release/i386/mkisoimages.sh#6 integrate .. //depot/projects/hammer/sbin/mount/mntopts.h#6 integrate .. //depot/projects/hammer/share/man/man4/Makefile#58 integrate .. //depot/projects/hammer/sys/alpha/alpha/gdb_machdep.c#2 integrate .. //depot/projects/hammer/sys/alpha/include/gdb_machdep.h#2 integrate .. //depot/projects/hammer/sys/amd64/amd64/gdb_machdep.c#7 integrate .. //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#56 integrate .. //depot/projects/hammer/sys/amd64/include/gdb_machdep.h#2 integrate .. //depot/projects/hammer/sys/boot/common/loader.8#17 integrate .. //depot/projects/hammer/sys/boot/efi/libefi/bootinfo.c#5 integrate .. //depot/projects/hammer/sys/boot/ficl/ficl.h#2 integrate .. //depot/projects/hammer/sys/boot/ficl/loader.c#5 integrate .. //depot/projects/hammer/sys/boot/forth/beastie.4th#8 integrate .. //depot/projects/hammer/sys/boot/forth/loader.conf#19 integrate .. //depot/projects/hammer/sys/boot/i386/libi386/bootinfo.c#8 integrate .. //depot/projects/hammer/sys/boot/i386/loader/help.i386#4 integrate .. //depot/projects/hammer/sys/boot/ia64/ski/bootinfo.c#4 integrate .. //depot/projects/hammer/sys/boot/pc98/boot2/boot.c#5 integrate .. //depot/projects/hammer/sys/boot/pc98/loader/help.pc98#3 integrate .. //depot/projects/hammer/sys/boot/powerpc/loader/metadata.c#8 integrate .. //depot/projects/hammer/sys/boot/sparc64/loader/metadata.c#11 integrate .. //depot/projects/hammer/sys/coda/coda_vnops.c#10 integrate .. //depot/projects/hammer/sys/coda/coda_vnops.h#4 integrate .. //depot/projects/hammer/sys/compat/linprocfs/linprocfs.c#24 integrate .. //depot/projects/hammer/sys/conf/kern.post.mk#28 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/CHANGES.txt#11 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acdebug.h#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acevents.h#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acexcep.h#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acglobal.h#12 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/achware.h#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acinterp.h#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/aclocal.h#11 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acmacros.h#11 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acobject.h#10 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acoutput.h#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/actbl2.h#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/actypes.h#11 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/amlcode.h#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/amlresrc.h#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/common/adisasm.c#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslanalyze.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslcodegen.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslcompiler.h#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslcompiler.l#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslcompiler.y#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslglobal.h#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslmain.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslmap.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslopcodes.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslopt.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/asltransform.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/asltypes.h#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dbexec.c#11 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dbinput.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dbutils.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dmwalk.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dsmethod.c#11 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dsmthdat.c#11 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dsutils.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dswexec.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dswload.c#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dswstate.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/evgpe.c#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/evgpeblk.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/evmisc.c#11 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/evregion.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/evrgnini.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/evxface.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exconfig.c#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exconvrt.c#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exdump.c#10 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exmisc.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exoparg1.c#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exoparg2.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exprep.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exregion.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exresolv.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exresop.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exstore.c#12 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exutils.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/hwgpe.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/hwtimer.c#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nsaccess.c#11 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nsalloc.c#11 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nsdump.c#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nsdumpdv.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nseval.c#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nsinit.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nsload.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nsnames.c#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nssearch.c#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nsutils.c#10 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nswalk.c#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/osunixxf.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/psopcode.c#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/psutils.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/rscalc.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/rsxface.c#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/tbconvrt.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/tbinstal.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/tbrsdt.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/tbxfroot.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utalloc.c#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utclib.c#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utcopy.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utdelete.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utmath.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utmisc.c#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utobject.c#7 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_pci_link.c#25 integrate .. //depot/projects/hammer/sys/dev/syscons/syscons.c#27 integrate .. //depot/projects/hammer/sys/fs/deadfs/dead_vnops.c#8 integrate .. //depot/projects/hammer/sys/fs/devfs/devfs_vnops.c#20 integrate .. //depot/projects/hammer/sys/fs/fdescfs/fdesc_vnops.c#11 integrate .. //depot/projects/hammer/sys/fs/fifofs/fifo.h#3 integrate .. //depot/projects/hammer/sys/fs/fifofs/fifo_vnops.c#25 integrate .. //depot/projects/hammer/sys/fs/hpfs/hpfs.h#5 integrate .. //depot/projects/hammer/sys/fs/hpfs/hpfs_vfsops.c#13 integrate .. //depot/projects/hammer/sys/fs/hpfs/hpfs_vnops.c#13 integrate .. //depot/projects/hammer/sys/fs/msdosfs/denode.h#6 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_denode.c#14 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_vnops.c#17 integrate .. //depot/projects/hammer/sys/fs/ntfs/ntfs.h#5 integrate .. //depot/projects/hammer/sys/fs/ntfs/ntfs_vfsops.c#16 integrate .. //depot/projects/hammer/sys/fs/ntfs/ntfs_vnops.c#11 integrate .. //depot/projects/hammer/sys/fs/nullfs/null.h#4 integrate .. //depot/projects/hammer/sys/fs/nullfs/null_subr.c#9 integrate .. //depot/projects/hammer/sys/fs/nullfs/null_vfsops.c#11 integrate .. //depot/projects/hammer/sys/fs/nullfs/null_vnops.c#10 integrate .. //depot/projects/hammer/sys/fs/nwfs/nwfs.h#3 integrate .. //depot/projects/hammer/sys/fs/nwfs/nwfs_node.c#7 integrate .. //depot/projects/hammer/sys/fs/nwfs/nwfs_vnops.c#7 integrate .. //depot/projects/hammer/sys/fs/portalfs/portal.h#3 integrate .. //depot/projects/hammer/sys/fs/portalfs/portal_vfsops.c#10 integrate .. //depot/projects/hammer/sys/fs/portalfs/portal_vnops.c#10 integrate .. //depot/projects/hammer/sys/fs/procfs/procfs_status.c#11 integrate .. //depot/projects/hammer/sys/fs/pseudofs/pseudofs_vncache.c#9 integrate .. //depot/projects/hammer/sys/fs/pseudofs/pseudofs_vnops.c#13 integrate .. //depot/projects/hammer/sys/fs/smbfs/smbfs_node.c#11 integrate .. //depot/projects/hammer/sys/fs/smbfs/smbfs_vnops.c#16 integrate .. //depot/projects/hammer/sys/fs/udf/udf_vnops.c#19 integrate .. //depot/projects/hammer/sys/fs/umapfs/umap.h#3 integrate .. //depot/projects/hammer/sys/fs/umapfs/umap_vnops.c#7 integrate .. //depot/projects/hammer/sys/fs/unionfs/union.h#6 integrate .. //depot/projects/hammer/sys/fs/unionfs/union_subr.c#13 integrate .. //depot/projects/hammer/sys/fs/unionfs/union_vnops.c#18 integrate .. //depot/projects/hammer/sys/gdb/gdb_main.c#3 integrate .. //depot/projects/hammer/sys/geom/geom_pc98.c#22 integrate .. //depot/projects/hammer/sys/gnu/ext2fs/ext2_extern.h#5 integrate .. //depot/projects/hammer/sys/gnu/ext2fs/ext2_vfsops.c#22 integrate .. //depot/projects/hammer/sys/gnu/ext2fs/ext2_vnops.c#16 integrate .. //depot/projects/hammer/sys/i386/i386/gdb_machdep.c#3 integrate .. //depot/projects/hammer/sys/i386/i386/vm_machdep.c#35 integrate .. //depot/projects/hammer/sys/i386/include/gdb_machdep.h#2 integrate .. //depot/projects/hammer/sys/ia64/ia64/gdb_machdep.c#3 integrate .. //depot/projects/hammer/sys/ia64/include/gdb_machdep.h#3 integrate .. //depot/projects/hammer/sys/isofs/cd9660/cd9660_vfsops.c#21 integrate .. //depot/projects/hammer/sys/isofs/cd9660/cd9660_vnops.c#16 integrate .. //depot/projects/hammer/sys/isofs/cd9660/iso.h#6 integrate .. //depot/projects/hammer/sys/kern/kern_descrip.c#38 integrate .. //depot/projects/hammer/sys/kern/kern_shutdown.c#33 integrate .. //depot/projects/hammer/sys/kern/kern_thr.c#25 integrate .. //depot/projects/hammer/sys/kern/kern_umtx.c#14 integrate .. //depot/projects/hammer/sys/kern/tty_cons.c#18 integrate .. //depot/projects/hammer/sys/kern/uipc_domain.c#11 integrate .. //depot/projects/hammer/sys/kern/uipc_usrreq.c#27 integrate .. //depot/projects/hammer/sys/kern/vfs_default.c#28 integrate .. //depot/projects/hammer/sys/kern/vfs_init.c#11 integrate .. //depot/projects/hammer/sys/kern/vfs_subr.c#63 integrate .. //depot/projects/hammer/sys/net/if.c#36 integrate .. //depot/projects/hammer/sys/netgraph/atm/sscop/ng_sscop_cust.h#4 integrate .. //depot/projects/hammer/sys/netgraph/atm/uni/ng_uni_cust.h#4 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/hci/ng_hci_misc.c#8 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c#8 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/socket/ng_btsocket.c#9 integrate .. //depot/projects/hammer/sys/netgraph/netgraph.h#13 integrate .. //depot/projects/hammer/sys/netgraph/ng_base.c#22 integrate .. //depot/projects/hammer/sys/netgraph/ng_cisco.c#8 integrate .. //depot/projects/hammer/sys/netgraph/ng_socket.c#11 integrate .. //depot/projects/hammer/sys/netgraph/ng_source.c#8 integrate .. //depot/projects/hammer/sys/nfs4client/nfs4_vfs_subs.c#2 integrate .. //depot/projects/hammer/sys/nfs4client/nfs4_vnops.c#12 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_node.c#12 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_subs.c#19 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_vfsops.c#30 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_vnops.c#28 integrate .. //depot/projects/hammer/sys/nfsclient/nfsnode.h#9 integrate .. //depot/projects/hammer/sys/posix4/posix4_mib.c#6 integrate .. //depot/projects/hammer/sys/powerpc/include/psl.h#2 integrate .. //depot/projects/hammer/sys/sparc64/include/gdb_machdep.h#2 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/gdb_machdep.c#2 integrate .. //depot/projects/hammer/sys/sys/domain.h#4 integrate .. //depot/projects/hammer/sys/sys/file.h#10 integrate .. //depot/projects/hammer/sys/sys/reboot.h#6 integrate .. //depot/projects/hammer/sys/sys/vnode.h#36 integrate .. //depot/projects/hammer/sys/tools/vnode_if.awk#7 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_extern.h#8 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_vfsops.c#36 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_vnops.c#28 integrate .. //depot/projects/hammer/sys/ufs/ufs/ufs_extern.h#8 integrate .. //depot/projects/hammer/sys/ufs/ufs/ufs_vnops.c#23 integrate .. //depot/projects/hammer/tools/regression/netinet/tcpfullwindowrst/Makefile#1 branch .. //depot/projects/hammer/tools/regression/netinet/tcpfullwindowrst/tcpfullwindowrst.t#1 branch .. //depot/projects/hammer/tools/regression/netinet/tcpfullwindowrst/tcpfullwindowrsttest.c#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/Makefile#12 integrate .. //depot/projects/hammer/usr.bin/make/Makefile#11 integrate .. //depot/projects/hammer/usr.bin/make/arch.c#6 integrate .. //depot/projects/hammer/usr.bin/make/buf.c#4 integrate .. //depot/projects/hammer/usr.bin/make/buf.h#3 integrate .. //depot/projects/hammer/usr.bin/make/compat.c#10 integrate .. //depot/projects/hammer/usr.bin/make/cond.c#9 integrate .. //depot/projects/hammer/usr.bin/make/dir.c#7 integrate .. //depot/projects/hammer/usr.bin/make/dir.h#3 integrate .. //depot/projects/hammer/usr.bin/make/for.c#7 integrate .. //depot/projects/hammer/usr.bin/make/hash.c#4 integrate .. //depot/projects/hammer/usr.bin/make/hash.h#3 integrate .. //depot/projects/hammer/usr.bin/make/job.c#14 integrate .. //depot/projects/hammer/usr.bin/make/job.h#10 integrate .. //depot/projects/hammer/usr.bin/make/lst.h#4 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstAppend.c#5 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstAtEnd.c#5 delete .. //depot/projects/hammer/usr.bin/make/lst.lib/lstAtFront.c#5 delete .. //depot/projects/hammer/usr.bin/make/lst.lib/lstConcat.c#5 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstDatum.c#5 delete .. //depot/projects/hammer/usr.bin/make/lst.lib/lstDeQueue.c#5 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstDestroy.c#5 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstDupl.c#5 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstEnQueue.c#5 delete .. //depot/projects/hammer/usr.bin/make/lst.lib/lstFind.c#5 delete .. //depot/projects/hammer/usr.bin/make/lst.lib/lstFindFrom.c#5 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstFirst.c#5 delete .. //depot/projects/hammer/usr.bin/make/lst.lib/lstForEach.c#5 delete .. //depot/projects/hammer/usr.bin/make/lst.lib/lstForEachFrom.c#5 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstInsert.c#5 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstIsAtEnd.c#5 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstLast.c#4 delete .. //depot/projects/hammer/usr.bin/make/lst.lib/lstNext.c#5 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstOpen.c#5 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstRemove.c#5 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstReplace.c#5 delete .. //depot/projects/hammer/usr.bin/make/lst.lib/lstSucc.c#5 delete .. //depot/projects/hammer/usr.bin/make/main.c#21 integrate .. //depot/projects/hammer/usr.bin/make/make.c#7 integrate .. //depot/projects/hammer/usr.bin/make/parse.c#16 integrate .. //depot/projects/hammer/usr.bin/make/str.c#7 integrate .. //depot/projects/hammer/usr.bin/make/suff.c#8 integrate .. //depot/projects/hammer/usr.bin/make/targ.c#7 integrate .. //depot/projects/hammer/usr.bin/make/util.c#2 integrate .. //depot/projects/hammer/usr.bin/make/var.c#12 integrate .. //depot/projects/hammer/usr.bin/make/var.h#2 integrate .. //depot/projects/hammer/usr.bin/make/var_modify.c#3 integrate .. //depot/projects/hammer/usr.bin/ncal/Makefile#4 integrate Differences ... ==== //depot/projects/hammer/MAINTAINERS#29 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.100 2004/09/08 02:08:33 grog Exp $ +$FreeBSD: src/MAINTAINERS,v 1.101 2004/11/30 20:04:47 eik Exp $ subsystem login notes ----------------------------- @@ -102,6 +102,7 @@ rpc.lockd alfred Will be happy to review code, but not mandatory. truss alfred Will be happy to review code, but not mandatory. rpc alfred Pre-commit review requested. +pkg_install eik Pre-commit review or approval from portmgr@ requested. Following are the entries from the Makefiles, and a few other sources. Please remove stale entries from both their origin, and this file. ==== //depot/projects/hammer/etc/defaults/rc.conf#44 (text+ko) ==== @@ -13,7 +13,7 @@ # # All arguments must be in double or single quotes. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.232 2004/11/23 20:09:58 mux Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.233 2004/12/01 22:05:50 rees Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -61,7 +61,7 @@ fsck_y_enable="NO" # Set to YES to do fsck -y if the initial preen fails. background_fsck="YES" # Attempt to run fsck in the background where possible. background_fsck_delay="60" # Time to wait (seconds) before starting the fsck. -netfs_types="nfs:NFS smbfs:SMB portalfs:PORTAL nwfs:NWFS" # Net filesystems. +netfs_types="nfs:NFS nfs4:NFS4 smbfs:SMB portalfs:PORTAL nwfs:NWFS" # Net filesystems. extra_netfs_types="NO" # List of network extra filesystem types for delayed # mount at startup (or NO). ==== //depot/projects/hammer/gnu/usr.bin/gdb/Makefile.inc#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/gdb/Makefile.inc,v 1.10 2004/07/06 21:55:11 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/gdb/Makefile.inc,v 1.11 2004/11/30 05:12:35 marcel Exp $ VERSION= "6.1.1 [FreeBSD]" VENDOR= marcel @@ -36,6 +36,12 @@ GENSRCS+= nm.h tm.h +.if defined(GDB_CROSS_DEBUGGER) +CFLAGS+= -DCROSS_DEBUGGER +GDB_SUFFIX= -${TARGET_ARCH} +NOMAN= +.endif + .include "${TARGET_SUBDIR}/Makefile" SRCS+= ${GENSRCS} ==== //depot/projects/hammer/gnu/usr.bin/gdb/arch/alpha/Makefile#2 (text+ko) ==== @@ -1,8 +1,10 @@ -# $FreeBSD: src/gnu/usr.bin/gdb/arch/alpha/Makefile,v 1.1 2004/06/25 06:48:53 marcel Exp $ +# $FreeBSD: src/gnu/usr.bin/gdb/arch/alpha/Makefile,v 1.2 2004/11/30 05:12:35 marcel Exp $ +.if !defined(GDB_CROSS_DEBUGGER) LIBSRCS+= core-regset.c solib-legacy.c -LIBSRCS+= alpha-mdebug-tdep.c alpha-tdep.c alphabsd-nat.c alphabsd-tdep.c \ - alphafbsd-tdep.c +LIBSRCS+= alphabsd-nat.c +.endif +LIBSRCS+= alpha-mdebug-tdep.c alpha-tdep.c alphabsd-tdep.c alphafbsd-tdep.c nm.h: echo '#include "alpha/nm-fbsd.h"' > ${.TARGET} ==== //depot/projects/hammer/gnu/usr.bin/gdb/arch/amd64/Makefile#2 (text+ko) ==== @@ -1,10 +1,12 @@ -# $FreeBSD: src/gnu/usr.bin/gdb/arch/amd64/Makefile,v 1.1 2004/06/25 06:48:53 marcel Exp $ +# $FreeBSD: src/gnu/usr.bin/gdb/arch/amd64/Makefile,v 1.2 2004/11/30 05:12:36 marcel Exp $ GENSRCS+= xm.h -LIBSRCS+= fbsd-proc.c gcore.c -LIBSRCS+= amd64-nat.c amd64-tdep.c amd64bsd-nat.c amd64fbsd-nat.c \ - amd64fbsd-tdep.c i386-tdep.c i386bsd-tdep.c i386fbsd-tdep.c \ - i387-tdep.c +.if !defined(GDB_CROSS_DEBUGGER) +LIBSRCS+= fbsd-proc.c fbsd-threads.c gcore.c +LIBSRCS+= amd64-nat.c amd64bsd-nat.c amd64fbsd-nat.c +.endif +LIBSRCS+= amd64-tdep.c amd64fbsd-tdep.c i386-tdep.c i386bsd-tdep.c \ + i386fbsd-tdep.c i387-tdep.c nm.h: echo '#include "i386/nm-fbsd64.h"' > ${.TARGET} ==== //depot/projects/hammer/gnu/usr.bin/gdb/arch/i386/Makefile#3 (text+ko) ==== @@ -1,9 +1,11 @@ -# $FreeBSD: src/gnu/usr.bin/gdb/arch/i386/Makefile,v 1.2 2004/11/09 06:32:37 marcel Exp $ +# $FreeBSD: src/gnu/usr.bin/gdb/arch/i386/Makefile,v 1.3 2004/11/30 05:12:36 marcel Exp $ GENSRCS+= xm.h -LIBSRCS+= fbsd-proc.c gcore.c -LIBSRCS+= i386-nat.c i386-tdep.c i386bsd-nat.c i386bsd-tdep.c \ - i386fbsd-nat.c i386fbsd-tdep.c i387-tdep.c +.if !defined(GDB_CROSS_DEBUGGER) +LIBSRCS+= fbsd-proc.c fbsd-threads.c gcore.c +LIBSRCS+= i386-nat.c i386bsd-nat.c i386fbsd-nat.c +.endif +LIBSRCS+= i386-tdep.c i386bsd-tdep.c i386fbsd-tdep.c i387-tdep.c nm.h: echo '#include "i386/nm-fbsd.h"' > ${.TARGET} ==== //depot/projects/hammer/gnu/usr.bin/gdb/arch/ia64/Makefile#2 (text+ko) ==== @@ -1,7 +1,10 @@ -# $FreeBSD: src/gnu/usr.bin/gdb/arch/ia64/Makefile,v 1.1 2004/06/25 06:48:53 marcel Exp $ +# $FreeBSD: src/gnu/usr.bin/gdb/arch/ia64/Makefile,v 1.2 2004/11/30 05:12:36 marcel Exp $ +.if !defined(GDB_CROSS_DEBUGGER) LIBSRCS+= fbsd-proc.c gcore.c -LIBSRCS+= ia64-fbsd-nat.c ia64-fbsd-tdep.c ia64-tdep.c +LIBSRCS+= ia64-fbsd-nat.c +.endif +LIBSRCS+= ia64-fbsd-tdep.c ia64-tdep.c nm.h: echo '#include "ia64/nm-fbsd.h"' > ${.TARGET} ==== //depot/projects/hammer/gnu/usr.bin/gdb/arch/sparc64/Makefile#2 (text+ko) ==== @@ -1,8 +1,10 @@ -# $FreeBSD: src/gnu/usr.bin/gdb/arch/sparc64/Makefile,v 1.1 2004/06/25 06:48:54 marcel Exp $ +# $FreeBSD: src/gnu/usr.bin/gdb/arch/sparc64/Makefile,v 1.2 2004/11/30 05:12:36 marcel Exp $ +.if !defined(GDB_CROSS_DEBUGGER) LIBSRCS+= solib-legacy.c -LIBSRCS+= sparc-nat.c sparc-tdep.c sparc64-nat.c sparc64-tdep.c \ - sparc64fbsd-nat.c sparc64fbsd-tdep.c +LIBSRCS+= sparc-nat.c sparc64-nat.c sparc64fbsd-nat.c +.endif +LIBSRCS+= sparc-tdep.c sparc64-tdep.c sparc64fbsd-tdep.c nm.h: echo '#include "sparc/nm-fbsd.h"' > ${.TARGET} ==== //depot/projects/hammer/gnu/usr.bin/gdb/gdb/Makefile#3 (text+ko) ==== @@ -1,6 +1,6 @@ -# $FreeBSD: src/gnu/usr.bin/gdb/gdb/Makefile,v 1.42 2004/06/26 08:48:50 bde Exp $ +# $FreeBSD: src/gnu/usr.bin/gdb/gdb/Makefile,v 1.43 2004/11/30 05:12:36 marcel Exp $ -PROG= gdb +PROG= gdb${GDB_SUFFIX} SRCS= gdb.c BULIBS= ${OBJ_BU}/libbfd/libbfd.a ${OBJ_BU}/libopcodes/libopcodes.a \ ==== //depot/projects/hammer/gnu/usr.bin/gdb/gdbtui/Makefile#4 (text+ko) ==== @@ -1,6 +1,6 @@ -# $FreeBSD: src/gnu/usr.bin/gdb/gdbtui/Makefile,v 1.3 2004/10/24 15:32:28 ru Exp $ +# $FreeBSD: src/gnu/usr.bin/gdb/gdbtui/Makefile,v 1.4 2004/11/30 05:12:37 marcel Exp $ -PROG= gdbtui +PROG= gdbtui${GDB_SUFFIX} SRCS= tui-main.c NOMAN= ==== //depot/projects/hammer/gnu/usr.bin/gdb/kgdb/Makefile#2 (text+ko) ==== @@ -1,7 +1,7 @@ -# $FreeBSD: src/gnu/usr.bin/gdb/kgdb/Makefile,v 1.1 2004/07/25 05:29:15 marcel Exp $ +# $FreeBSD: src/gnu/usr.bin/gdb/kgdb/Makefile,v 1.3 2004/11/30 05:12:37 marcel Exp $ -PROG= kgdb -SRCS= kthr.c main.c trgt.c trgt_${MACHINE_ARCH}.c +PROG= kgdb${GDB_SUFFIX} +SRCS= kthr.c main.c trgt.c trgt_${TARGET_ARCH}.c WARNS?= 2 BULIBS= ${OBJ_BU}/libbfd/libbfd.a ${OBJ_BU}/libopcodes/libopcodes.a \ ==== //depot/projects/hammer/gnu/usr.bin/gdb/libgdb/Makefile#6 (text+ko) ==== @@ -1,4 +1,9 @@ -# $FreeBSD: src/gnu/usr.bin/gdb/libgdb/Makefile,v 1.5 2004/11/09 06:02:48 marcel Exp $ +# $FreeBSD: src/gnu/usr.bin/gdb/libgdb/Makefile,v 1.6 2004/11/30 05:12:37 marcel Exp $ + +TARGET_ARCH?= ${MACHINE_ARCH} +.if ${TARGET_ARCH} != ${MACHINE_ARCH} +GDB_CROSS_DEBUGGER= +.endif LIB= gdb INTERNALLIB= @@ -16,11 +21,11 @@ elfread.c environ.c eval.c event-loop.c event-top.c exec.c \ expprint.c \ f-exp.y f-lang.c f-typeprint.c f-valprint.c findvar.c \ - fork-child.c frame-base.c frame-unwind.c frame.c \ + ${_fork_child} frame-base.c frame-unwind.c frame.c \ gdb-events.c gdbarch.c gdbtypes.c gnu-v2-abi.c gnu-v3-abi.c \ hpacc-abi.c \ - inf-loop.c infcall.c infcmd.c inflow.c infptrace.c infrun.c \ - inftarg.c init.c interps.c \ + inf-loop.c infcall.c infcmd.c inflow.c ${_infptrace} infrun.c \ + ${_inftarg} init.c interps.c \ jv-exp.y jv-lang.c jv-typeprint.c jv-valprint.c \ kod-cisco.c kod.c \ language.c linespec.c \ @@ -47,12 +52,19 @@ valarith.c valops.c valprint.c values.c varobj.c \ wrapper.c ${LIBSRCS} -GENSRCS= version.c +TARGET_ARCH?= ${MACHINE_ARCH} +.if ${TARGET_ARCH} != ${MACHINE_ARCH} +GDB_CROSS_DEBUGGER= +.endif -.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" -LIBSRCS+= fbsd-threads.c +.if !defined(GDB_CROSS_DEBUGGER) +_fork_child= fork-child.c +_infptrace= infptrace.c +_inftarg= inftarg.c .endif +GENSRCS= version.c + version.c: echo '#include "version.h"' > ${.TARGET} echo 'const char version[] = ${VERSION};' >> ${.TARGET} ==== //depot/projects/hammer/release/i386/mkisoimages.sh#6 (text+ko) ==== @@ -4,7 +4,7 @@ # Author: Jordan K Hubbard # Date: 22 June 2001 # -# $FreeBSD: src/release/i386/mkisoimages.sh,v 1.11 2004/07/15 09:28:03 murray Exp $ +# $FreeBSD: src/release/i386/mkisoimages.sh,v 1.12 2004/12/01 18:03:18 jhb Exp $ # # This script is used by release/Makefile to build the (optional) ISO images # for a FreeBSD release. It is considered architecture dependent since each @@ -14,9 +14,9 @@ # # Usage: # -# mkisoimages.sh [-[e]b] image-label image-name base-bits-dir [extra-bits-dir] +# mkisoimages.sh [-b] image-label image-name base-bits-dir [extra-bits-dir] # -# Where -[e]b is passed if the ISO image should be made "bootable" by +# Where -b is passed if the ISO image should be made "bootable" by # whatever standards this architecture supports (may be unsupported), # image-label is the ISO image label, image-name is the filename of the # resulting ISO image, base-bits-dir contains the image contents and @@ -28,9 +28,6 @@ if [ "x$1" = "x-b" ]; then bootable="-b boot/cdboot -no-emul-boot" shift -elif [ "x$1" = "x-eb" ]; then - bootable="-b floppies/boot.flp -c floppies/boot.catalog" - shift else bootable="" fi ==== //depot/projects/hammer/sbin/mount/mntopts.h#6 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)mntopts.h 8.7 (Berkeley) 3/29/95 - * $FreeBSD: src/sbin/mount/mntopts.h,v 1.23 2004/11/29 09:35:01 ru Exp $ + * $FreeBSD: src/sbin/mount/mntopts.h,v 1.24 2004/11/30 19:36:40 ru Exp $ */ struct mntopt { @@ -40,6 +40,7 @@ /* User-visible MNT_ flags. */ #define MOPT_ASYNC { "async", 0, MNT_ASYNC, 0 } #define MOPT_NOATIME { "atime", 1, MNT_NOATIME, 0 } +#define MOPT_NODEV { "dev", 1, MNT_NODEV, 0 } #define MOPT_NOEXEC { "exec", 1, MNT_NOEXEC, 0 } #define MOPT_NOSUID { "suid", 1, MNT_NOSUID, 0 } #define MOPT_NOSYMFOLLOW { "symfollow", 1, MNT_NOSYMFOLLOW, 0 } @@ -75,6 +76,7 @@ MOPT_GROUPQUOTA, \ MOPT_FSTAB_COMPAT, \ MOPT_NOATIME, \ + MOPT_NODEV, \ MOPT_NOEXEC, \ MOPT_SUIDDIR, /* must be before MOPT_NOSUID */ \ MOPT_NOSUID, \ ==== //depot/projects/hammer/share/man/man4/Makefile#58 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/18/93 -# $FreeBSD: src/share/man/man4/Makefile,v 1.295 2004/11/27 13:49:27 simon Exp $ +# $FreeBSD: src/share/man/man4/Makefile,v 1.296 2004/11/30 16:16:34 brueffer Exp $ MAN= aac.4 \ acpi.4 \ @@ -361,6 +361,7 @@ MLINKS+=bge.4 if_bge.4 MLINKS+=bktr.4 brooktree.4 MLINKS+=cnw.4 if_cnw.4 +MLINKS+=crypto.4 cryptodev.4 MLINKS+=cue.4 if_cue.4 MLINKS+=dc.4 if_dc.4 MLINKS+=de.4 if_de.4 ==== //depot/projects/hammer/sys/alpha/alpha/gdb_machdep.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/gdb_machdep.c,v 1.1 2004/07/10 17:47:20 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/gdb_machdep.c,v 1.2 2004/12/01 06:40:33 marcel Exp $"); #include #include @@ -59,7 +59,7 @@ } void -gdb_cpu_setreg(int regnum, register_t val) +gdb_cpu_setreg(int regnum, void *val) { switch (regnum) { } ==== //depot/projects/hammer/sys/alpha/include/gdb_machdep.h#2 (text+ko) ==== @@ -23,7 +23,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. * - * $FreeBSD: src/sys/alpha/include/gdb_machdep.h,v 1.1 2004/07/10 17:47:20 marcel Exp $ + * $FreeBSD: src/sys/alpha/include/gdb_machdep.h,v 1.2 2004/12/01 06:40:33 marcel Exp $ */ #ifndef _MACHINE_GDB_MACHDEP_H_ @@ -46,7 +46,7 @@ } void *gdb_cpu_getreg(int, size_t *); -void gdb_cpu_setreg(int, register_t); +void gdb_cpu_setreg(int, void *); int gdb_cpu_signal(int, int); #endif /* !_MACHINE_GDB_MACHDEP_H_ */ ==== //depot/projects/hammer/sys/amd64/amd64/gdb_machdep.c#7 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/gdb_machdep.c,v 1.2 2004/11/30 00:55:49 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/gdb_machdep.c,v 1.3 2004/12/01 06:40:33 marcel Exp $"); #include #include @@ -81,14 +81,13 @@ } void -gdb_cpu_setreg(int regnum, register_t val) +gdb_cpu_setreg(int regnum, void *val) { - val = __bswap64(val); switch (regnum) { case GDB_REG_PC: - kdb_thrctx->pcb_rip = val; + kdb_thrctx->pcb_rip = *(register_t *)val; if (kdb_thread == curthread) - kdb_frame->tf_rip = val; + kdb_frame->tf_rip = *(register_t *)val; } } ==== //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#56 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.239 2004/11/29 23:25:56 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.240 2004/11/30 20:25:46 peter Exp $"); #include "opt_isa.h" #include "opt_cpu.h" @@ -334,18 +334,14 @@ cpu_reset_real(); /* NOTREACHED */ } else { + u_int map; - u_int map; - int cnt; printf("cpu_reset called on cpu#%d\n", PCPU_GET(cpuid)); - map = PCPU_GET(other_cpus) & ~ stopped_cpus; - if (map != 0) { printf("cpu_reset: Stopping other CPUs\n"); stop_cpus(map); /* Stop all other CPUs */ } - DELAY(1000000); cpu_reset_real(); /* NOTREACHED */ ==== //depot/projects/hammer/sys/amd64/include/gdb_machdep.h#2 (text+ko) ==== @@ -23,7 +23,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. * - * $FreeBSD: src/sys/amd64/include/gdb_machdep.h,v 1.1 2004/07/10 17:47:21 marcel Exp $ + * $FreeBSD: src/sys/amd64/include/gdb_machdep.h,v 1.2 2004/12/01 06:40:34 marcel Exp $ */ #ifndef _MACHINE_GDB_MACHDEP_H_ @@ -52,6 +52,6 @@ } void *gdb_cpu_getreg(int, size_t *); -void gdb_cpu_setreg(int, register_t); +void gdb_cpu_setreg(int, void *); #endif /* !_MACHINE_GDB_MACHDEP_H_ */ ==== //depot/projects/hammer/sys/boot/common/loader.8#17 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sys/boot/common/loader.8,v 1.76 2004/10/15 06:44:13 ru Exp $ +.\" $FreeBSD: src/sys/boot/common/loader.8,v 1.77 2004/12/01 04:59:31 scottl Exp $ .\" .Dd October 15, 2004 .Dt LOADER 8 @@ -352,10 +352,6 @@ Prevents the kernel from initiating a multi-user startup; instead, a single-user mode will be entered when the kernel has finished device probing. -.It Va boot_userconfig -Requests that the kernel's interactive device configuration program -be run when the kernel is booted. -Currently a no-op. .It Va boot_verbose Setting this variable causes extra debugging information to be printed by the kernel during the boot phase. ==== //depot/projects/hammer/sys/boot/efi/libefi/bootinfo.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/efi/libefi/bootinfo.c,v 1.10 2004/01/04 23:28:16 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/efi/libefi/bootinfo.c,v 1.11 2004/12/01 04:59:31 scottl Exp $"); #include #include @@ -53,7 +53,6 @@ } howto_names[] = { {"boot_askname", RB_ASKNAME}, {"boot_cdrom", RB_CDROM}, - {"boot_userconfig", RB_CONFIG}, {"boot_ddb", RB_KDB}, {"boot_gdb", RB_GDB}, {"boot_single", RB_SINGLE}, @@ -86,9 +85,6 @@ case 'a': howto |= RB_ASKNAME; break; - case 'c': - howto |= RB_CONFIG; - break; case 'C': howto |= RB_CDROM; break; ==== //depot/projects/hammer/sys/boot/ficl/ficl.h#2 (text+ko) ==== @@ -41,7 +41,7 @@ ** SUCH DAMAGE. */ -/* $FreeBSD: src/sys/boot/ficl/ficl.h,v 1.20 2002/04/09 17:45:11 dcs Exp $ */ +/* $FreeBSD: src/sys/boot/ficl/ficl.h,v 1.21 2004/11/30 11:35:30 scottl Exp $ */ #if !defined (__FICL_H__) #define __FICL_H__ @@ -1114,7 +1114,6 @@ extern void ficlInb(FICL_VM *pVM); #endif -#if !defined(TESTMAIN) extern void ficlSetenv(FICL_VM *pVM); extern void ficlSetenvq(FICL_VM *pVM); extern void ficlGetenv(FICL_VM *pVM); @@ -1122,9 +1121,10 @@ extern void ficlCopyin(FICL_VM *pVM); extern void ficlCopyout(FICL_VM *pVM); extern void ficlFindfile(FICL_VM *pVM); +extern void ficlCcall(FICL_VM *pVM); +#if !defined(TESTMAIN) extern void ficlPnpdevices(FICL_VM *pVM); extern void ficlPnphandlers(FICL_VM *pVM); -extern void ficlCcall(FICL_VM *pVM); #endif /* ==== //depot/projects/hammer/sys/boot/ficl/loader.c#5 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/ficl/loader.c,v 1.10 2003/12/10 09:09:38 grehan Exp $ + * $FreeBSD: src/sys/boot/ficl/loader.c,v 1.11 2004/11/30 11:35:30 scottl Exp $ */ /******************************************************************* @@ -56,11 +56,13 @@ * .# ( value -- ) */ -#ifndef TESTMAIN void ficlSetenv(FICL_VM *pVM) { - char *namep, *valuep, *name, *value; +#ifndef TESTMAIN + char *name, *value; +#endif + char *namep, *valuep; int names, values; #if FICL_ROBUST > 1 @@ -71,6 +73,7 @@ values = stackPopINT(pVM->pStack); valuep = (char*) stackPopPtr(pVM->pStack); +#ifndef TESTMAIN name = (char*) ficlMalloc(names+1); if (!name) vmThrowErr(pVM, "Error: out of memory"); @@ -85,6 +88,7 @@ setenv(name, value, 1); ficlFree(name); ficlFree(value); +#endif return; } @@ -92,7 +96,10 @@ void ficlSetenvq(FICL_VM *pVM) { - char *namep, *valuep, *name, *value; +#ifndef TESTMAIN + char *name, *value; +#endif + char *namep, *valuep; int names, values, overwrite; #if FICL_ROBUST > 1 @@ -104,6 +111,7 @@ values = stackPopINT(pVM->pStack); valuep = (char*) stackPopPtr(pVM->pStack); +#ifndef TESTMAIN name = (char*) ficlMalloc(names+1); if (!name) vmThrowErr(pVM, "Error: out of memory"); @@ -118,6 +126,7 @@ setenv(name, value, overwrite); ficlFree(name); ficlFree(value); +#endif return; } @@ -125,7 +134,10 @@ void ficlGetenv(FICL_VM *pVM) { - char *namep, *name, *value; +#ifndef TESTMAIN + char *name; +#endif + char *namep, *value; int names; #if FICL_ROBUST > 1 @@ -134,6 +146,7 @@ names = stackPopINT(pVM->pStack); namep = (char*) stackPopPtr(pVM->pStack); +#ifndef TESTMAIN name = (char*) ficlMalloc(names+1); if (!name) vmThrowErr(pVM, "Error: out of memory"); @@ -147,6 +160,7 @@ stackPushPtr(pVM->pStack, value); stackPushINT(pVM->pStack, strlen(value)); } else +#endif stackPushINT(pVM->pStack, -1); return; @@ -155,7 +169,10 @@ void ficlUnsetenv(FICL_VM *pVM) { - char *namep, *name; +#ifndef TESTMAIN + char *name; +#endif + char *namep; int names; #if FICL_ROBUST > 1 @@ -164,6 +181,7 @@ names = stackPopINT(pVM->pStack); namep = (char*) stackPopPtr(pVM->pStack); +#ifndef TESTMAIN name = (char*) ficlMalloc(names+1); if (!name) vmThrowErr(pVM, "Error: out of memory"); @@ -172,6 +190,7 @@ unsetenv(name); ficlFree(name); +#endif return; } @@ -191,7 +210,9 @@ dest = stackPopINT(pVM->pStack); src = stackPopPtr(pVM->pStack); +#ifndef TESTMAIN archsw.arch_copyin(src, dest, len); +#endif return; } @@ -211,7 +232,9 @@ dest = stackPopPtr(pVM->pStack); src = stackPopINT(pVM->pStack); +#ifndef TESTMAIN archsw.arch_copyout(src, dest, len); +#endif return; } @@ -219,7 +242,10 @@ void ficlFindfile(FICL_VM *pVM) { - char *name, *type, *namep, *typep; +#ifndef TESTMAIN + char *name; +#endif + char *type, *namep, *typep; struct preloaded_file* fp; int names, types; @@ -231,6 +257,7 @@ typep = (char*) stackPopPtr(pVM->pStack); names = stackPopINT(pVM->pStack); namep = (char*) stackPopPtr(pVM->pStack); +#ifndef TESTMAIN name = (char*) ficlMalloc(names+1); if (!name) vmThrowErr(pVM, "Error: out of memory"); @@ -243,11 +270,15 @@ type[types] = '\0'; fp = file_findfile(name, type); +#else + fp = NULL; +#endif stackPushPtr(pVM->pStack, fp); return; } +#ifndef TESTMAIN #ifdef HAVE_PNP void @@ -637,11 +668,6 @@ dictAppendWord(dp, "dictthreshold", ficlDictThreshold, FW_DEFAULT); dictAppendWord(dp, "dictincrease", ficlDictIncrease, FW_DEFAULT); -#ifndef TESTMAIN -#ifdef __i386__ - dictAppendWord(dp, "outb", ficlOutb, FW_DEFAULT); - dictAppendWord(dp, "inb", ficlInb, FW_DEFAULT); -#endif dictAppendWord(dp, "setenv", ficlSetenv, FW_DEFAULT); dictAppendWord(dp, "setenv?", ficlSetenvq, FW_DEFAULT); dictAppendWord(dp, "getenv", ficlGetenv, FW_DEFAULT); @@ -649,11 +675,16 @@ dictAppendWord(dp, "copyin", ficlCopyin, FW_DEFAULT); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Dec 1 23:40:00 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5D2B516A4D0; Wed, 1 Dec 2004 23:40:00 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 389BA16A4CE for ; Wed, 1 Dec 2004 23:40:00 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F291C43D41 for ; Wed, 1 Dec 2004 23:39:59 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iB1NdxeN025872 for ; Wed, 1 Dec 2004 23:39:59 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB1Ndxk5025869 for perforce@freebsd.org; Wed, 1 Dec 2004 23:39:59 GMT (envelope-from peter@freebsd.org) Date: Wed, 1 Dec 2004 23:39:59 GMT Message-Id: <200412012339.iB1Ndxk5025869@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 66228 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Dec 2004 23:40:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=66228 Change 66228 by peter@peter_overcee on 2004/12/01 23:39:01 IFC @66227 (oops, this was the one I really wanted) Affected files ... .. //depot/projects/hammer/Makefile.inc1#80 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acconfig.h#13 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acenv.h#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acpiosxf.h#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acpixf.h#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acutils.h#11 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exfldio.c#12 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exsystem.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/psparse.c#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/tbget.c#9 integrate Differences ... ==== //depot/projects/hammer/Makefile.inc1#80 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.458 2004/11/23 09:09:47 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.459 2004/12/01 23:23:14 peter Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -419,6 +419,10 @@ cd ${.CURDIR}/gnu/usr.bin/cc/include; \ ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t} .endfor +.for _dir in usr.sbin/pcvt/keycap usr.bin/lex/lib + cd ${.CURDIR}/${_dir}; \ + ${LIB32MAKE} DESTDIR=${LIB32TMP} obj +.endfor .for _dir in lib/libncurses lib/libmagic cd ${.CURDIR}/${_dir}; \ MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} build-tools ==== //depot/projects/hammer/sys/contrib/dev/acpica/acconfig.h#13 (text+ko) ==== @@ -1,7 +1,7 @@ /****************************************************************************** * * Name: acconfig.h - Global configuration constants - * $Revision: 158 $ + * $Revision: 169 $ * *****************************************************************************/ @@ -137,12 +137,12 @@ /* Version string */ -#define ACPI_CA_VERSION 0x20040527 +#define ACPI_CA_VERSION 0x20041119 /* * OS name, used for the _OS object. The _OS object is essentially obsolete, * but there is a large base of ASL/AML code in existing machines that check - * for the string below. The use of this string usually guarantees that + * for the string below. The use of this string usually guarantees that * the ASL will execute down the most tested code path. Also, there is some * code that will not execute the _OSI method unless _OS matches the string * below. Therefore, change this string at your own risk. ==== //depot/projects/hammer/sys/contrib/dev/acpica/acenv.h#8 (text+ko) ==== @@ -1,7 +1,7 @@ /****************************************************************************** * * Name: acenv.h - Generation environment specific items - * $Revision: 107 $ + * $Revision: 109 $ * *****************************************************************************/ @@ -225,7 +225,7 @@ #define COMPILER_DEPENDENT_INT64 long long #define COMPILER_DEPENDENT_UINT64 unsigned long long -/* +/* * This macro is used to tag functions as "printf-like" because * some compilers can catch printf format string problems. MSVC * doesn't, so this is proprocessed away. @@ -305,6 +305,7 @@ #define ACPI_STRCAT(d,s) (void) strcat((d), (s)) #define ACPI_STRNCAT(d,s,n) strncat((d), (s), (ACPI_SIZE)(n)) #define ACPI_STRTOUL(d,s,n) strtoul((d), (s), (ACPI_SIZE)(n)) +#define ACPI_MEMCMP(s1,s2,n) memcmp((s1), (s2), (ACPI_SIZE)(n)) #define ACPI_MEMCPY(d,s,n) (void) memcpy((d), (s), (ACPI_SIZE)(n)) #define ACPI_MEMSET(d,s,n) (void) memset((d), (s), (ACPI_SIZE)(n)) @@ -368,6 +369,7 @@ #define ACPI_STRCAT(d,s) (void) AcpiUtStrcat ((d), (s)) #define ACPI_STRNCAT(d,s,n) AcpiUtStrncat ((d), (s), (ACPI_SIZE)(n)) #define ACPI_STRTOUL(d,s,n) AcpiUtStrtoul ((d), (s), (ACPI_SIZE)(n)) +#define ACPI_MEMCMP(s1,s2,n) AcpiUtMemcmp((s1), (s2), (ACPI_SIZE)(n)) #define ACPI_MEMCPY(d,s,n) (void) AcpiUtMemcpy ((d), (s), (ACPI_SIZE)(n)) #define ACPI_MEMSET(d,v,n) (void) AcpiUtMemset ((d), (v), (ACPI_SIZE)(n)) #define ACPI_TOUPPER AcpiUtToUpper ==== //depot/projects/hammer/sys/contrib/dev/acpica/acpiosxf.h#7 (text+ko) ==== @@ -263,13 +263,13 @@ ACPI_STATUS AcpiOsInstallInterruptHandler ( UINT32 InterruptNumber, - OSD_HANDLER ServiceRoutine, + ACPI_OSD_HANDLER ServiceRoutine, void *Context); ACPI_STATUS AcpiOsRemoveInterruptHandler ( UINT32 InterruptNumber, - OSD_HANDLER ServiceRoutine); + ACPI_OSD_HANDLER ServiceRoutine); /* @@ -283,13 +283,16 @@ ACPI_STATUS AcpiOsQueueForExecution ( UINT32 Priority, - OSD_EXECUTION_CALLBACK Function, + ACPI_OSD_EXEC_CALLBACK Function, + void *Context); + +void +AcpiOsWaitEventsComplete ( void *Context); void AcpiOsSleep ( - UINT32 Seconds, - UINT32 Milliseconds); + ACPI_INTEGER Milliseconds); void AcpiOsStall ( @@ -332,29 +335,32 @@ /* * Platform and hardware-independent PCI configuration space access + * Note: Can't use "Register" as a parameter, changed to "Reg" -- + * certain compilers complain. */ ACPI_STATUS AcpiOsReadPciConfiguration ( ACPI_PCI_ID *PciId, - UINT32 Register, + UINT32 Reg, void *Value, UINT32 Width); ACPI_STATUS AcpiOsWritePciConfiguration ( ACPI_PCI_ID *PciId, - UINT32 Register, + UINT32 Reg, ACPI_INTEGER Value, UINT32 Width); /* * Interim function needed for PCI IRQ routing */ + void AcpiOsDerivePciId( - ACPI_HANDLE rhandle, - ACPI_HANDLE chandle, + ACPI_HANDLE Rhandle, + ACPI_HANDLE Chandle, ACPI_PCI_ID **PciId); /* @@ -371,7 +377,7 @@ void *Pointer, ACPI_SIZE Length); -UINT32 +UINT64 AcpiOsGetTimer ( void); ==== //depot/projects/hammer/sys/contrib/dev/acpica/acpixf.h#7 (text+ko) ==== @@ -372,6 +372,15 @@ void *Context); ACPI_STATUS +AcpiInstallExceptionHandler ( + ACPI_EXCEPTION_HANDLER Handler); + + +/* + * Event interfaces + */ + +ACPI_STATUS AcpiAcquireGlobalLock ( UINT16 Timeout, UINT32 *Handle); ==== //depot/projects/hammer/sys/contrib/dev/acpica/acutils.h#11 (text+ko) ==== @@ -1,7 +1,7 @@ /****************************************************************************** * * Name: acutils.h -- prototypes for the common (subsystem-wide) procedures - * $Revision: 161 $ + * $Revision: 164 $ * *****************************************************************************/ @@ -252,6 +252,12 @@ ACPI_SIZE Count); int +AcpiUtMemcmp ( + const char *Buffer1, + const char *Buffer2, + ACPI_SIZE Count); + +int AcpiUtStrncmp ( const char *String1, const char *String2, @@ -651,6 +657,10 @@ AcpiUtCreateBufferObject ( ACPI_SIZE BufferSize); +ACPI_OPERAND_OBJECT * +AcpiUtCreateStringObject ( + ACPI_SIZE StringSize); + /* * UtRefCnt - Object reference count management @@ -764,14 +774,14 @@ ACPI_STATUS AcpiUtDivide ( - ACPI_INTEGER *InDividend, - ACPI_INTEGER *InDivisor, + ACPI_INTEGER InDividend, + ACPI_INTEGER InDivisor, ACPI_INTEGER *OutQuotient, ACPI_INTEGER *OutRemainder); ACPI_STATUS AcpiUtShortDivide ( - ACPI_INTEGER *InDividend, + ACPI_INTEGER InDividend, UINT32 Divisor, ACPI_INTEGER *OutQuotient, UINT32 *OutRemainder); @@ -790,6 +800,10 @@ UINT32 Base, ACPI_INTEGER *RetInteger); +/* Values for Base above (16=Hex, 10=Decimal) */ + +#define ACPI_ANY_BASE 0 + char * AcpiUtStrupr ( char *SrcString); ==== //depot/projects/hammer/sys/contrib/dev/acpica/exfldio.c#12 (text+ko) ==== @@ -1,7 +1,7 @@ /****************************************************************************** * * Module Name: exfldio - Aml Field I/O - * $Revision: 106 $ + * $Revision: 111 $ * *****************************************************************************/ @@ -212,6 +212,23 @@ + FieldDatumByteOffset + ObjDesc->CommonField.AccessByteWidth)) { + if (AcpiGbl_EnableInterpreterSlack) + { + /* + * Slack mode only: We will go ahead and allow access to this + * field if it is within the region length rounded up to the next + * access width boundary. + */ + if (ACPI_ROUND_UP (RgnDesc->Region.Length, + ObjDesc->CommonField.AccessByteWidth) >= + (ObjDesc->CommonField.BaseByteOffset + + (ACPI_NATIVE_UINT) ObjDesc->CommonField.AccessByteWidth + + FieldDatumByteOffset)) + { + return_ACPI_STATUS (AE_OK); + } + } + if (RgnDesc->Region.Length < ObjDesc->CommonField.AccessByteWidth) { /* @@ -237,25 +254,6 @@ FieldDatumByteOffset, ObjDesc->CommonField.AccessByteWidth, AcpiUtGetNodeName (RgnDesc->Region.Node), RgnDesc->Region.Length)); -#ifndef ACPICA_PEDANTIC - { - /* - * Allow access to the field if it is within the region size - * rounded up to a multiple of the access byte width. This - * overcomes "off-by-one" programming errors in the AML often - * found in Toshiba laptops. These errors were allowed by - * the Microsoft ASL compiler. - */ - UINT32 rounded_length = ACPI_ROUND_UP(RgnDesc->Region.Length, - ObjDesc->CommonField.AccessByteWidth); - - if (rounded_length >= (ObjDesc->CommonField.BaseByteOffset + - FieldDatumByteOffset + - ObjDesc->CommonField.AccessByteWidth)) { - return_ACPI_STATUS (AE_OK); - } - } -#endif return_ACPI_STATUS (AE_AML_REGION_LIMIT); } @@ -910,7 +908,7 @@ return_ACPI_STATUS (AE_BUFFER_OVERFLOW); } - /* + /* * Create "actual" field byte count (minimum number of bytes that * must be read), then convert to datum count (minimum number * of datum-sized units that must be read) ==== //depot/projects/hammer/sys/contrib/dev/acpica/exsystem.c#8 (text+ko) ==== @@ -2,7 +2,7 @@ /****************************************************************************** * * Module Name: exsystem - Interface to OS services - * $Revision: 80 $ + * $Revision: 81 $ * *****************************************************************************/ @@ -246,7 +246,7 @@ ACPI_STATUS AcpiExSystemDoSuspend ( - UINT32 HowLong) + ACPI_INTEGER HowLong) { ACPI_STATUS Status; @@ -258,8 +258,7 @@ AcpiExExitInterpreter (); - AcpiOsSleep ((UINT16) (HowLong / (UINT32) 1000), - (UINT16) (HowLong % (UINT32) 1000)); + AcpiOsSleep (HowLong); /* And now we must get the interpreter again */ ==== //depot/projects/hammer/sys/contrib/dev/acpica/psparse.c#9 (text+ko) ==== @@ -1,7 +1,7 @@ /****************************************************************************** * * Module Name: psparse - Parser top level AML parse routines - * $Revision: 144 $ + * $Revision: 146 $ * *****************************************************************************/ @@ -240,141 +240,143 @@ /* Delete this op and the subtree below it if asked to */ - if (((WalkState->ParseFlags & ACPI_PARSE_TREE_MASK) == ACPI_PARSE_DELETE_TREE) && - (WalkState->OpInfo->Class != AML_CLASS_ARGUMENT)) + if (((WalkState->ParseFlags & ACPI_PARSE_TREE_MASK) != ACPI_PARSE_DELETE_TREE) || + (WalkState->OpInfo->Class == AML_CLASS_ARGUMENT)) + { + return_VOID; + } + + /* Make sure that we only delete this subtree */ + + if (Op->Common.Parent) { - /* Make sure that we only delete this subtree */ + /* + * Check if we need to replace the operator and its subtree + * with a return value op (placeholder op) + */ + ParentInfo = AcpiPsGetOpcodeInfo (Op->Common.Parent->Common.AmlOpcode); - if (Op->Common.Parent) + switch (ParentInfo->Class) { + case AML_CLASS_CONTROL: + break; + + case AML_CLASS_CREATE: + /* - * Check if we need to replace the operator and its subtree - * with a return value op (placeholder op) + * These opcodes contain TermArg operands. The current + * op must be replaced by a placeholder return op */ - ParentInfo = AcpiPsGetOpcodeInfo (Op->Common.Parent->Common.AmlOpcode); - - switch (ParentInfo->Class) + ReplacementOp = AcpiPsAllocOp (AML_INT_RETURN_VALUE_OP); + if (!ReplacementOp) { - case AML_CLASS_CONTROL: - break; + goto Cleanup; + } + break; - case AML_CLASS_CREATE: + case AML_CLASS_NAMED_OBJECT: - /* - * These opcodes contain TermArg operands. The current - * op must be replaced by a placeholder return op - */ + /* + * These opcodes contain TermArg operands. The current + * op must be replaced by a placeholder return op + */ + if ((Op->Common.Parent->Common.AmlOpcode == AML_REGION_OP) || + (Op->Common.Parent->Common.AmlOpcode == AML_DATA_REGION_OP) || + (Op->Common.Parent->Common.AmlOpcode == AML_BUFFER_OP) || + (Op->Common.Parent->Common.AmlOpcode == AML_PACKAGE_OP) || + (Op->Common.Parent->Common.AmlOpcode == AML_VAR_PACKAGE_OP)) + { ReplacementOp = AcpiPsAllocOp (AML_INT_RETURN_VALUE_OP); if (!ReplacementOp) { - return_VOID; + goto Cleanup; } - break; + } - case AML_CLASS_NAMED_OBJECT: + if ((Op->Common.Parent->Common.AmlOpcode == AML_NAME_OP) && + (WalkState->DescendingCallback != AcpiDsExecBeginOp)) - /* - * These opcodes contain TermArg operands. The current - * op must be replaced by a placeholder return op - */ - if ((Op->Common.Parent->Common.AmlOpcode == AML_REGION_OP) || - (Op->Common.Parent->Common.AmlOpcode == AML_DATA_REGION_OP) || - (Op->Common.Parent->Common.AmlOpcode == AML_BUFFER_OP) || - (Op->Common.Parent->Common.AmlOpcode == AML_PACKAGE_OP) || - (Op->Common.Parent->Common.AmlOpcode == AML_VAR_PACKAGE_OP)) + { + if ((Op->Common.AmlOpcode == AML_BUFFER_OP) || + (Op->Common.AmlOpcode == AML_PACKAGE_OP) || + (Op->Common.AmlOpcode == AML_VAR_PACKAGE_OP)) { - ReplacementOp = AcpiPsAllocOp (AML_INT_RETURN_VALUE_OP); + ReplacementOp = AcpiPsAllocOp (Op->Common.AmlOpcode); if (!ReplacementOp) { - return_VOID; + goto Cleanup; } + + ReplacementOp->Named.Data = Op->Named.Data; + ReplacementOp->Named.Length = Op->Named.Length; } + } + break; - if ((Op->Common.Parent->Common.AmlOpcode == AML_NAME_OP) && - (WalkState->DescendingCallback != AcpiDsExecBeginOp)) + default: + ReplacementOp = AcpiPsAllocOp (AML_INT_RETURN_VALUE_OP); + if (!ReplacementOp) + { + goto Cleanup; + } + } - { - if ((Op->Common.AmlOpcode == AML_BUFFER_OP) || - (Op->Common.AmlOpcode == AML_PACKAGE_OP) || - (Op->Common.AmlOpcode == AML_VAR_PACKAGE_OP)) - { - ReplacementOp = AcpiPsAllocOp (Op->Common.AmlOpcode); - if (!ReplacementOp) - { - return_VOID; - } + /* We must unlink this op from the parent tree */ - ReplacementOp->Named.Data = Op->Named.Data; - ReplacementOp->Named.Length = Op->Named.Length; - } - } - break; + Prev = Op->Common.Parent->Common.Value.Arg; + if (Prev == Op) + { + /* This op is the first in the list */ - default: - ReplacementOp = AcpiPsAllocOp (AML_INT_RETURN_VALUE_OP); - if (!ReplacementOp) - { - return_VOID; - } + if (ReplacementOp) + { + ReplacementOp->Common.Parent = Op->Common.Parent; + ReplacementOp->Common.Value.Arg = NULL; + ReplacementOp->Common.Node = Op->Common.Node; + Op->Common.Parent->Common.Value.Arg = ReplacementOp; + ReplacementOp->Common.Next = Op->Common.Next; + } + else + { + Op->Common.Parent->Common.Value.Arg = Op->Common.Next; } + } + + /* Search the parent list */ - /* We must unlink this op from the parent tree */ + else while (Prev) + { + /* Traverse all siblings in the parent's argument list */ - Prev = Op->Common.Parent->Common.Value.Arg; - if (Prev == Op) + Next = Prev->Common.Next; + if (Next == Op) { - /* This op is the first in the list */ - if (ReplacementOp) { - ReplacementOp->Common.Parent = Op->Common.Parent; - ReplacementOp->Common.Value.Arg = NULL; - ReplacementOp->Common.Node = Op->Common.Node; - Op->Common.Parent->Common.Value.Arg = ReplacementOp; - ReplacementOp->Common.Next = Op->Common.Next; + ReplacementOp->Common.Parent = Op->Common.Parent; + ReplacementOp->Common.Value.Arg = NULL; + ReplacementOp->Common.Node = Op->Common.Node; + Prev->Common.Next = ReplacementOp; + ReplacementOp->Common.Next = Op->Common.Next; + Next = NULL; } else { - Op->Common.Parent->Common.Value.Arg = Op->Common.Next; + Prev->Common.Next = Op->Common.Next; + Next = NULL; } } - /* Search the parent list */ - - else while (Prev) - { - /* Traverse all siblings in the parent's argument list */ - - Next = Prev->Common.Next; - if (Next == Op) - { - if (ReplacementOp) - { - ReplacementOp->Common.Parent = Op->Common.Parent; - ReplacementOp->Common.Value.Arg = NULL; - ReplacementOp->Common.Node = Op->Common.Node; - Prev->Common.Next = ReplacementOp; - ReplacementOp->Common.Next = Op->Common.Next; - Next = NULL; - } - else - { - Prev->Common.Next = Op->Common.Next; - Next = NULL; - } - } - - Prev = Next; - } + Prev = Next; } + } - /* Now we can actually delete the subtree rooted at op */ - AcpiPsDeleteParseTree (Op); +Cleanup: - return_VOID; - } + /* Now we can actually delete the subtree rooted at op */ + AcpiPsDeleteParseTree (Op); return_VOID; } @@ -661,7 +663,8 @@ PreOp = AcpiPsAllocOp (WalkState->Opcode); if (!PreOp) { - return_ACPI_STATUS (AE_NO_MEMORY); + Status = AE_NO_MEMORY; + goto CloseThisOp; } } @@ -690,7 +693,8 @@ if (!GET_CURRENT_ARG_TYPE (WalkState->ArgTypes)) { - return_ACPI_STATUS (AE_AML_NO_OPERAND); + Status = AE_AML_NO_OPERAND; + goto CloseThisOp; } /* We know that this arg is a name, move to next arg */ @@ -757,7 +761,8 @@ Op = AcpiPsAllocOp (WalkState->Opcode); if (!Op) { - return_ACPI_STATUS (AE_NO_MEMORY); + Status = AE_NO_MEMORY; + goto CloseThisOp; } if (WalkState->OpInfo->Flags & AML_CREATE) @@ -936,7 +941,7 @@ WalkState->ArgTypes, WalkState->ArgCount); if (ACPI_FAILURE (Status)) { - return_ACPI_STATUS (Status); + goto CloseThisOp; } Op = NULL; continue; @@ -1227,10 +1232,6 @@ ACPI_THREAD_STATE *Thread; ACPI_THREAD_STATE *PrevWalkList = AcpiGbl_CurrentWalkList; ACPI_WALK_STATE *PreviousWalkState; -#ifndef ACPICA_PEDANTIC - ACPI_OPERAND_OBJECT **CallerReturnDesc = WalkState->CallerReturnDesc; - ACPI_OPERAND_OBJECT *EffectiveReturnDesc = NULL; -#endif ACPI_FUNCTION_TRACE ("PsParseAml"); @@ -1297,7 +1298,7 @@ { Status = AE_OK; } - else if (Status != AE_OK) + else if ((Status != AE_OK) && (WalkState->MethodDesc)) { ACPI_REPORT_METHOD_ERROR ("Method execution failed", WalkState->MethodNode, NULL, Status); @@ -1331,17 +1332,6 @@ WalkState = AcpiDsPopWalkState (Thread); -#ifndef ACPICA_PEDANTIC - /* Save the last effective return value */ - - if (CallerReturnDesc && WalkState->ReturnDesc) - { - AcpiUtRemoveReference (EffectiveReturnDesc); - EffectiveReturnDesc = WalkState->ReturnDesc; - AcpiUtAddReference (EffectiveReturnDesc); - } -#endif - /* Reset the current scope to the beginning of scope stack */ AcpiDsScopeStackClear (WalkState); @@ -1404,19 +1394,6 @@ */ else if (PreviousWalkState->CallerReturnDesc) { -#ifndef ACPICA_PEDANTIC - /* - * Some AML code expects a return value without a ReturnOp. - * Return the saved effective return value instead. - */ - - if (PreviousWalkState->ReturnDesc == NULL && EffectiveReturnDesc != NULL) - { - PreviousWalkState->ReturnDesc = EffectiveReturnDesc; - AcpiUtAddReference (PreviousWalkState->ReturnDesc); - } -#endif - *(PreviousWalkState->CallerReturnDesc) = PreviousWalkState->ReturnDesc; /* NULL if no return value */ } else if (PreviousWalkState->ReturnDesc) @@ -1431,9 +1408,6 @@ /* Normal exit */ -#ifndef ACPICA_PEDANTIC - AcpiUtRemoveReference (EffectiveReturnDesc); -#endif AcpiExReleaseAllMutexes (Thread); AcpiUtDeleteGenericState (ACPI_CAST_PTR (ACPI_GENERIC_STATE, Thread)); AcpiGbl_CurrentWalkList = PrevWalkList; ==== //depot/projects/hammer/sys/contrib/dev/acpica/tbget.c#9 (text+ko) ==== @@ -1,7 +1,7 @@ /****************************************************************************** * * Module Name: tbget - ACPI Table get* routines - * $Revision: 88 $ + * $Revision: 90 $ * *****************************************************************************/ @@ -245,6 +245,9 @@ return_ACPI_STATUS (AE_BAD_PARAMETER); } + ACPI_DEBUG_PRINT ((ACPI_DB_TABLES, "Table Signature: [%4.4s]\n", + ReturnHeader->Signature)); + return_ACPI_STATUS (AE_OK); } From owner-p4-projects@FreeBSD.ORG Thu Dec 2 03:01:04 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6845516A4D0; Thu, 2 Dec 2004 03:01:04 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 432D116A4CE for ; Thu, 2 Dec 2004 03:01:04 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1743143D54 for ; Thu, 2 Dec 2004 03:01:04 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iB2313h0039174 for ; Thu, 2 Dec 2004 03:01:03 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB2313Pw039171 for perforce@freebsd.org; Thu, 2 Dec 2004 03:01:03 GMT (envelope-from sam@freebsd.org) Date: Thu, 2 Dec 2004 03:01:03 GMT Message-Id: <200412020301.iB2313Pw039171@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66235 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Dec 2004 03:01:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=66235 Change 66235 by sam@sam_ebb on 2004/12/02 03:00:35 Be more careful about reseting state when transitioning to S_INIT; in particular clear ic_bss so any previous setup is wiped. Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_node.c#21 edit .. //depot/projects/wifi/sys/net80211/ieee80211_node.h#14 edit .. //depot/projects/wifi/sys/net80211/ieee80211_proto.c#10 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_node.c#21 (text+ko) ==== @@ -162,8 +162,7 @@ rsn->rsn_keymgmtset = WPA_ASE_8021X_UNSPEC | WPA_ASE_8021X_PSK; rsn->rsn_keymgmt = WPA_ASE_8021X_PSK; - ic->ic_bss = ni; - ieee80211_ref_node(ic->ic_bss); /* hold reference */ + ic->ic_bss = ieee80211_ref_node(ni); /* hold reference */ ic->ic_auth = ieee80211_authenticator_get(ni->ni_authmode); } @@ -432,6 +431,24 @@ ieee80211_new_state(ic, IEEE80211_S_RUN, -1); } +void +ieee80211_reset_bss(struct ieee80211com *ic) +{ + struct ieee80211_node *ni, *obss; + + ieee80211_node_table_reset(&ic->ic_scan); + ni = ieee80211_alloc_node(&ic->ic_scan, ic->ic_myaddr); + KASSERT(ni != NULL, ("unable to setup inital BSS node")); + obss = ic->ic_bss; + ic->ic_bss = ieee80211_ref_node(ni); + if (obss != NULL) + ieee80211_free_node(obss); + if (ic->ic_sta != NULL) { + ieee80211_node_table_free(ic->ic_sta); + ic->ic_sta = NULL; + } +} + static int ieee80211_match_bss(struct ieee80211com *ic, struct ieee80211_node *ni) { ==== //depot/projects/wifi/sys/net80211/ieee80211_node.h#14 (text+ko) ==== @@ -186,6 +186,7 @@ extern int ieee80211_next_scan(struct ieee80211com *); extern void ieee80211_create_ibss(struct ieee80211com*, struct ieee80211_channel *); +extern void ieee80211_reset_bss(struct ieee80211com *); extern void ieee80211_end_scan(struct ieee80211com *); extern int ieee80211_ibss_merge(struct ieee80211com *, struct ieee80211_node *); ==== //depot/projects/wifi/sys/net80211/ieee80211_proto.c#10 (text+ko) ==== @@ -883,12 +883,8 @@ case IEEE80211_S_SCAN: reset: ic->ic_mgt_timer = 0; - ieee80211_node_table_reset(&ic->ic_scan); IF_DRAIN(&ic->ic_mgtq); - if (ic->ic_sta != NULL) { - ieee80211_node_table_free(ic->ic_sta); - ic->ic_sta = NULL; - } + ieee80211_reset_bss(ic); break; } if (ic->ic_auth->ia_detach != NULL) From owner-p4-projects@FreeBSD.ORG Thu Dec 2 03:23:32 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ED95116A4D0; Thu, 2 Dec 2004 03:23:31 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C0ED816A4CE for ; Thu, 2 Dec 2004 03:23:31 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8BE1643D5F for ; Thu, 2 Dec 2004 03:23:31 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iB23NV8x040026 for ; Thu, 2 Dec 2004 03:23:31 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB23NVcF040023 for perforce@freebsd.org; Thu, 2 Dec 2004 03:23:31 GMT (envelope-from sam@freebsd.org) Date: Thu, 2 Dec 2004 03:23:31 GMT Message-Id: <200412020323.iB23NVcF040023@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66236 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Dec 2004 03:23:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=66236 Change 66236 by sam@sam_ebb on 2004/12/02 03:22:43 replace direct walking of the station/scan tables with ieee80211_iterate_nodes Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#21 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#21 (text+ko) ==== @@ -78,6 +78,110 @@ * with wicontrol(8). */ +struct wi_read_ap_args { + int i; /* result count */ + struct wi_apinfo *ap; /* current entry in result buffer */ + caddr_t max; /* result buffer bound */ +}; + +static void +wi_read_ap_result(void *arg, struct ieee80211_node *ni) +{ + struct ieee80211com *ic = ni->ni_ic; + struct wi_read_ap_args *sa = arg; + struct wi_apinfo *ap = sa->ap; + struct ieee80211_rateset *rs; + int j; + + if ((caddr_t)(ap + 1) > sa->max) + return; + memset(ap, 0, sizeof(struct wi_apinfo)); + if (ic->ic_opmode == IEEE80211_M_HOSTAP) { + IEEE80211_ADDR_COPY(ap->bssid, ni->ni_macaddr); + ap->namelen = ic->ic_des_esslen; + if (ic->ic_des_esslen) + memcpy(ap->name, ic->ic_des_essid, + ic->ic_des_esslen); + } else { + IEEE80211_ADDR_COPY(ap->bssid, ni->ni_bssid); + ap->namelen = ni->ni_esslen; + if (ni->ni_esslen) + memcpy(ap->name, ni->ni_essid, + ni->ni_esslen); + } + ap->channel = ieee80211_chan2ieee(ic, ni->ni_chan); + ap->signal = ic->ic_node_getrssi(ni); + ap->capinfo = ni->ni_capinfo; + ap->interval = ni->ni_intval; + rs = &ni->ni_rates; + for (j = 0; j < rs->rs_nrates; j++) { + if (rs->rs_rates[j] & IEEE80211_RATE_BASIC) { + ap->rate = (rs->rs_rates[j] & + IEEE80211_RATE_VAL) * 5; /* XXX */ + } + } + sa->i++; + sa->ap++; +} + +struct wi_read_prism2_args { + int i; /* result count */ + struct wi_scan_res *res;/* current entry in result buffer */ + caddr_t max; /* result buffer bound */ +}; + +static void +wi_read_prism2_result(void *arg, struct ieee80211_node *ni) +{ + struct ieee80211com *ic = ni->ni_ic; + struct wi_read_prism2_args *sa = arg; + struct wi_scan_res *res = sa->res; + + if ((caddr_t)(res + 1) > sa->max) + return; + res->wi_chan = ieee80211_chan2ieee(ic, ni->ni_chan); + res->wi_noise = 0; + res->wi_signal = ic->ic_node_getrssi(ni); + IEEE80211_ADDR_COPY(res->wi_bssid, ni->ni_bssid); + res->wi_interval = ni->ni_intval; + res->wi_capinfo = ni->ni_capinfo; + res->wi_ssid_len = ni->ni_esslen; + memcpy(res->wi_ssid, ni->ni_essid, IEEE80211_NWID_LEN); + /* NB: assumes wi_srates holds <= ni->ni_rates */ + memcpy(res->wi_srates, ni->ni_rates.rs_rates, + sizeof(res->wi_srates)); + if (ni->ni_rates.rs_nrates < 10) + res->wi_srates[ni->ni_rates.rs_nrates] = 0; + res->wi_rate = ni->ni_rates.rs_rates[ni->ni_txrate]; + res->wi_rsvd = 0; + + sa->i++; + sa->res++; +} + +struct wi_read_sigcache_args { + int i; /* result count */ + struct wi_sigcache *wsc;/* current entry in result buffer */ + caddr_t max; /* result buffer bound */ +}; + +static void +wi_read_sigcache(void *arg, struct ieee80211_node *ni) +{ + struct ieee80211com *ic = ni->ni_ic; + struct wi_read_sigcache_args *sa = arg; + struct wi_sigcache *wsc = sa->wsc; + + if ((caddr_t)(wsc + 1) > sa->max) + return; + memset(wsc, 0, sizeof(struct wi_sigcache)); + IEEE80211_ADDR_COPY(wsc->macsrc, ni->ni_macaddr); + wsc->signal = ic->ic_node_getrssi(ni); + + sa->wsc++; + sa->i++; +} + int ieee80211_cfgget(struct ieee80211com *ic, u_long cmd, caddr_t data) { @@ -86,13 +190,6 @@ struct ifreq *ifr = (struct ifreq *)data; struct wi_req wreq; struct wi_ltv_keys *keys; - struct wi_apinfo *ap; - struct ieee80211_node_table *nt; - struct ieee80211_node *ni; - struct ieee80211_rateset *rs; - struct wi_sigcache wsc; - struct wi_scan_p2_hdr *p2; - struct wi_scan_res *res; error = copyin(ifr->ifr_data, &wreq, sizeof(wreq)); if (error) @@ -270,107 +367,53 @@ /* * Don't return results until active scan completes. */ - if (ic->ic_state == IEEE80211_S_SCAN && - (ic->ic_flags & IEEE80211_F_ASCAN)) { + if ((ic->ic_flags & (IEEE80211_F_SCAN|IEEE80211_F_ASCAN)) == 0) { + struct wi_read_ap_args args; + + args.i = 0; + args.ap = (void *)((char *)wreq.wi_val + sizeof(i)); + args.max = (void *)(&wreq + 1); + ieee80211_iterate_nodes(&ic->ic_scan, + wi_read_ap_result, &args); + memcpy(wreq.wi_val, &args.i, sizeof(args.i)); + wreq.wi_len = (sizeof(int) + + sizeof(struct wi_apinfo) * args.i) / 2; + } else error = EINPROGRESS; - break; - } - i = 0; - ap = (void *)((char *)wreq.wi_val + sizeof(i)); - nt = &ic->ic_scan; - TAILQ_FOREACH(ni, &nt->nt_node, ni_list) { - if ((caddr_t)(ap + 1) > (caddr_t)(&wreq + 1)) - break; - memset(ap, 0, sizeof(*ap)); - if (ic->ic_opmode == IEEE80211_M_HOSTAP) { - IEEE80211_ADDR_COPY(ap->bssid, ni->ni_macaddr); - ap->namelen = ic->ic_des_esslen; - if (ic->ic_des_esslen) - memcpy(ap->name, ic->ic_des_essid, - ic->ic_des_esslen); - } else { - IEEE80211_ADDR_COPY(ap->bssid, ni->ni_bssid); - ap->namelen = ni->ni_esslen; - if (ni->ni_esslen) - memcpy(ap->name, ni->ni_essid, - ni->ni_esslen); - } - ap->channel = ieee80211_chan2ieee(ic, ni->ni_chan); - ap->signal = ic->ic_node_getrssi(ni); - ap->capinfo = ni->ni_capinfo; - ap->interval = ni->ni_intval; - rs = &ni->ni_rates; - for (j = 0; j < rs->rs_nrates; j++) { - if (rs->rs_rates[j] & IEEE80211_RATE_BASIC) { - ap->rate = (rs->rs_rates[j] & - IEEE80211_RATE_VAL) * 5; /* XXX */ - } - } - i++; - ap++; - } - memcpy(wreq.wi_val, &i, sizeof(i)); - wreq.wi_len = (sizeof(int) + sizeof(*ap) * i) / 2; break; case WI_RID_PRISM2: - wreq.wi_val[0] = 1; /* XXX lie so SCAN_RES can give rates */ + /* NB: we lie so WI_RID_SCAN_RES can include rates */ + wreq.wi_val[0] = 1; wreq.wi_len = sizeof(u_int16_t) / 2; break; case WI_RID_SCAN_RES: /* compatibility interface */ - if (ic->ic_state == IEEE80211_S_SCAN && - (ic->ic_flags & IEEE80211_F_ASCAN)) { + if ((ic->ic_flags & (IEEE80211_F_SCAN|IEEE80211_F_ASCAN)) == 0) { + struct wi_read_prism2_args args; + struct wi_scan_p2_hdr *p2; + + /* NB: use Prism2 format so we can include rate info */ + p2 = (struct wi_scan_p2_hdr *)wreq.wi_val; + args.i = 0; + args.res = (void *)&p2[1]; + args.max = (void *)(&wreq + 1); + ieee80211_iterate_nodes(&ic->ic_scan, + wi_read_prism2_result, &args); + p2->wi_rsvd = 0; + p2->wi_reason = args.i; + wreq.wi_len = (sizeof(*p2) + + sizeof(struct wi_scan_res) * args.i) / 2; + } else error = EINPROGRESS; - break; - } - /* NB: we use the Prism2 format so we can return rate info */ - p2 = (struct wi_scan_p2_hdr *)wreq.wi_val; - res = (void *)&p2[1]; - i = 0; - nt = &ic->ic_scan; - TAILQ_FOREACH(ni, &nt->nt_node, ni_list) { - if ((caddr_t)(res + 1) > (caddr_t)(&wreq + 1)) - break; - res->wi_chan = ieee80211_chan2ieee(ic, ni->ni_chan); - res->wi_noise = 0; - res->wi_signal = ic->ic_node_getrssi(ni); - IEEE80211_ADDR_COPY(res->wi_bssid, ni->ni_bssid); - res->wi_interval = ni->ni_intval; - res->wi_capinfo = ni->ni_capinfo; - res->wi_ssid_len = ni->ni_esslen; - memcpy(res->wi_ssid, ni->ni_essid, IEEE80211_NWID_LEN); - /* NB: assumes wi_srates holds <= ni->ni_rates */ - memcpy(res->wi_srates, ni->ni_rates.rs_rates, - sizeof(res->wi_srates)); - if (ni->ni_rates.rs_nrates < 10) - res->wi_srates[ni->ni_rates.rs_nrates] = 0; - res->wi_rate = ni->ni_rates.rs_rates[ni->ni_txrate]; - res->wi_rsvd = 0; - res++, i++; - } - p2->wi_rsvd = 0; - p2->wi_reason = i; - wreq.wi_len = (sizeof(*p2) + sizeof(*res) * i) / 2; break; - case WI_RID_READ_CACHE: - i = 0; - nt = &ic->ic_scan; - TAILQ_FOREACH(ni, &nt->nt_node, ni_list) { - if (i == (WI_MAX_DATALEN/sizeof(struct wi_sigcache))-1) - break; - IEEE80211_ADDR_COPY(wsc.macsrc, ni->ni_macaddr); - memset(&wsc.ipsrc, 0, sizeof(wsc.ipsrc)); - wsc.signal = ic->ic_node_getrssi(ni); - wsc.noise = 0; - wsc.quality = 0; - memcpy((caddr_t)wreq.wi_val + sizeof(wsc) * i, - &wsc, sizeof(wsc)); - i++; - } - wreq.wi_len = sizeof(wsc) * i / 2; + case WI_RID_READ_CACHE: { + struct wi_read_sigcache_args args; + args.i = 0; + args.wsc = (struct wi_sigcache *) wreq.wi_val; + args.max = (void *)(&wreq + 1); + ieee80211_iterate_nodes(&ic->ic_scan, wi_read_sigcache, &args); + wreq.wi_len = sizeof(struct wi_sigcache) * args.i / 2; break; - case WI_RID_SCAN_APS: - error = EINVAL; - break; + } default: error = EINVAL; break; @@ -1094,7 +1137,7 @@ int error, space; u_int8_t *p, *cp; - nt = ic->ic_sta; + nt = ic->ic_sta; if (nt == NULL) return EINVAL; p = ireq->i_data; From owner-p4-projects@FreeBSD.ORG Thu Dec 2 05:31:10 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4D99D16A4D0; Thu, 2 Dec 2004 05:31:10 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2427316A4CE for ; Thu, 2 Dec 2004 05:31:10 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E3D5C43D49 for ; Thu, 2 Dec 2004 05:31:09 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iB25V9BA050400 for ; Thu, 2 Dec 2004 05:31:09 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB25V97X050397 for perforce@freebsd.org; Thu, 2 Dec 2004 05:31:09 GMT (envelope-from sam@freebsd.org) Date: Thu, 2 Dec 2004 05:31:09 GMT Message-Id: <200412020531.iB25V97X050397@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66240 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Dec 2004 05:31:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=66240 Change 66240 by sam@sam_ebb on 2004/12/02 05:30:51 Revamp sta inactivity handling: o set a reload value in each node that's loaded into ni_inact on frame rx (rather than sprinkling reloads around) o have ath driver reload ni_inact on notice of frame ACK (need to update other drivers) o add an inactivity probe threshold, when it's hit we send a null data frame which should be ack'd and reset ni_inact o add mib variable for inact_probe This eliminates gratuitous station deauthentication which is important when authenticated with WPA/802.1x. Affected files ... .. //depot/projects/wifi/sys/dev/ath/if_ath.c#36 edit .. //depot/projects/wifi/sys/net80211/ieee80211_freebsd.c#6 edit .. //depot/projects/wifi/sys/net80211/ieee80211_input.c#21 edit .. //depot/projects/wifi/sys/net80211/ieee80211_node.c#22 edit .. //depot/projects/wifi/sys/net80211/ieee80211_node.h#15 edit .. //depot/projects/wifi/sys/net80211/ieee80211_output.c#18 edit .. //depot/projects/wifi/sys/net80211/ieee80211_var.h#14 edit Differences ... ==== //depot/projects/wifi/sys/dev/ath/if_ath.c#36 (text+ko) ==== @@ -3353,6 +3353,7 @@ pri = M_WME_GETAC(bf->bf_m); if (pri >= WME_AC_VO) ic->ic_wme.wme_hipri_traffic++; + ni->ni_inact = ni->ni_inact_reload; } else { if (ds->ds_txstat.ts_status & HAL_TXERR_XRETRY) sc->sc_stats.ast_tx_xretries++; ==== //depot/projects/wifi/sys/net80211/ieee80211_freebsd.c#6 (text+ko) ==== @@ -110,6 +110,10 @@ ieee80211_sysctl_inact, "I", "station inactivity timeout (sec)"); SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(oid), OID_AUTO, + "inact_probe", CTLTYPE_INT | CTLFLAG_RW, &ic->ic_inact_probe, 0, + ieee80211_sysctl_inact, "I", + "station inactivity probe timeout (sec)"); + SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(oid), OID_AUTO, "inact_auth", CTLTYPE_INT | CTLFLAG_RW, &ic->ic_inact_auth, 0, ieee80211_sysctl_inact, "I", "station authentication timeout (sec)"); ==== //depot/projects/wifi/sys/net80211/ieee80211_input.c#21 (text+ko) ==== @@ -119,6 +119,7 @@ u_int16_t rxseq; KASSERT(ni != NULL, ("null node")); + ni->ni_inact = ni->ni_inact_reload; /* trim CRC here so WEP can find its own CRC at the end of packet. */ if (m->m_flags & M_HASFCS) { @@ -458,7 +459,6 @@ IEEE80211_NODE_STAT(ni, rx_unauth); goto err; } - ni->ni_inact = ic->ic_inact_auth; } else { /* * When denying unencrypted frames, discard @@ -474,7 +474,6 @@ IEEE80211_NODE_STAT(ni, rx_unencrypted); goto out; } - ni->ni_inact = ic->ic_inact_run; } ifp->if_ipackets++; IEEE80211_NODE_STAT(ni, rx_data); @@ -866,8 +865,7 @@ if (ni == NULL) return; } - ni->ni_rssi = rssi; - ni->ni_rstamp = rstamp; + ni->ni_inact_reload = ic->ic_inact_auth; IEEE80211_SEND_MGMT(ic, ni, IEEE80211_FC0_SUBTYPE_AUTH, seq + 1); IEEE80211_DPRINTF(ic, IEEE80211_MSG_DEBUG | IEEE80211_MSG_AUTH, @@ -1049,6 +1047,7 @@ estatus = IEEE80211_STATUS_CHALLENGE; goto bad; } + ni->ni_inact_reload = ic->ic_inact_auth; IEEE80211_DPRINTF(ic, IEEE80211_MSG_DEBUG | IEEE80211_MSG_AUTH, "station %s authenticated (shared key)\n", @@ -1832,7 +1831,6 @@ } if (wme != NULL && ieee80211_parse_wmeparams(ic, wme)) ieee80211_wme_updateparams(ic); - ni->ni_inact = ic->ic_inact_run; /* NB: don't need the rest of this */ return; } @@ -1863,26 +1861,23 @@ ni->ni_esslen = ssid[1]; memset(ni->ni_essid, 0, sizeof(ni->ni_essid)); memcpy(ni->ni_essid, ssid + 2, ssid[1]); - } else { - ni->ni_inact = ic->ic_inact_run; /* XXX? */ - if (ssid[1] != 0 && - (ISPROBE(subtype) || ni->ni_esslen == 0)) { - /* - * Update ESSID at probe response to adopt - * hidden AP by Lucent/Cisco, which announces - * null ESSID in beacon. - */ + } else if (ssid[1] != 0 && + (ISPROBE(subtype) || ni->ni_esslen == 0)) { + /* + * Update ESSID at probe response to adopt + * hidden AP by Lucent/Cisco, which announces + * null ESSID in beacon. + */ #ifdef IEEE80211_DEBUG - if (ieee80211_msg_scan(ic) || - ieee80211_msg_debug(ic)) - dump_probe_beacon(subtype, 0, - wh->i_addr2, chan, bchan, capinfo, - bintval, erp, ssid, country); + if (ieee80211_msg_scan(ic) || + ieee80211_msg_debug(ic)) + dump_probe_beacon(subtype, 0, + wh->i_addr2, chan, bchan, capinfo, + bintval, erp, ssid, country); #endif - ni->ni_esslen = ssid[1]; - memset(ni->ni_essid, 0, sizeof(ni->ni_essid)); - memcpy(ni->ni_essid, ssid + 2, ssid[1]); - } + ni->ni_esslen = ssid[1]; + memset(ni->ni_essid, 0, sizeof(ni->ni_essid)); + memcpy(ni->ni_essid, ssid + 2, ssid[1]); } ni->ni_scangen = ic->ic_scan.nt_scangen; IEEE80211_ADDR_COPY(ni->ni_bssid, wh->i_addr3); @@ -2371,7 +2366,6 @@ ic->ic_flags&IEEE80211_F_USEPROT ? ", protection" : "", ni->ni_flags & IEEE80211_NODE_QOS ? ", QoS" : "" ); - ni->ni_inact = ic->ic_inact_run; ieee80211_new_state(ic, IEEE80211_S_RUN, subtype); break; } @@ -2393,7 +2387,6 @@ IEEE80211_NODE_STAT(ni, rx_deauth); switch (ic->ic_opmode) { case IEEE80211_M_STA: - ni->ni_inact = ic->ic_inact_run; ieee80211_new_state(ic, IEEE80211_S_AUTH, wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK); break; @@ -2431,7 +2424,6 @@ IEEE80211_NODE_STAT(ni, rx_disassoc); switch (ic->ic_opmode) { case IEEE80211_M_STA: - ni->ni_inact = ic->ic_inact_run; ieee80211_new_state(ic, IEEE80211_S_ASSOC, wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK); break; @@ -2555,7 +2547,6 @@ IEEE80211_REASON_NOT_ASSOCED); return; } - ni->ni_inact = ic->ic_inact_run; /* Okay, take the first queued packet and put it out... */ IEEE80211_NODE_SAVEQ_DEQUEUE(ni, m, qlen); ==== //depot/projects/wifi/sys/net80211/ieee80211_node.c#22 (text+ko) ==== @@ -92,6 +92,7 @@ ic->ic_inact_init = IEEE80211_INACT_INIT; ic->ic_inact_auth = IEEE80211_INACT_AUTH; ic->ic_inact_run = IEEE80211_INACT_RUN; + ic->ic_inact_probe = IEEE80211_INACT_PROBE; /* XXX defer */ if (ic->ic_max_aid == 0) @@ -906,7 +907,7 @@ ni->ni_authmode = IEEE80211_AUTH_OPEN; ni->ni_txpower = ic->ic_txpowlimit; /* max power */ ieee80211_crypto_resetkey(ic, &ni->ni_ucastkey, IEEE80211_KEYIX_NONE); - ni->ni_inact = nt->nt_inact_init; + ni->ni_inact = ni->ni_inact_reload = nt->nt_inact_init; IEEE80211_NODE_SAVEQ_INIT(ni, "unknown"); IEEE80211_NODE_LOCK(nt); @@ -1400,6 +1401,21 @@ ic->ic_set_tim(ic, ni, 0); } } + /* + * Probe the station before time it out. We + * send a null data frame which may not be + * universally supported by drivers (need it + * for ps-poll support so it should be...). + */ + if (ni->ni_inact == ic->ic_inact_probe) { + IEEE80211_DPRINTF(ic, IEEE80211_MSG_NODE, + "[%s] probe station due to inactivity\n", + ether_sprintf(ni->ni_macaddr)); + IEEE80211_NODE_UNLOCK(nt); + ieee80211_send_nulldata(ic, ni); + /* XXX stat? */ + goto restart; + } } if (ni->ni_inact <= 0) { IEEE80211_DPRINTF(ic, IEEE80211_MSG_NODE, @@ -1599,6 +1615,7 @@ /* give driver a chance to setup state like ni_txrate */ if (ic->ic_newassoc) ic->ic_newassoc(ic, ni, newassoc); + ni->ni_inact_reload = ic->ic_inact_run; IEEE80211_SEND_MGMT(ic, ni, resp, IEEE80211_STATUS_SUCCESS); /* tell the authenticator about new station */ if (ic->ic_auth->ia_node_join != NULL) @@ -1711,6 +1728,7 @@ */ ieee80211_sta_leave(ic, ni); done: + ni->ni_inact_reload = ic->ic_inact_init; /* just in case */ ieee80211_free_node(ni); } ==== //depot/projects/wifi/sys/net80211/ieee80211_node.h#15 (text+ko) ==== @@ -55,6 +55,7 @@ #define IEEE80211_INACT_INIT (30/IEEE80211_INACT_WAIT) /* initial */ #define IEEE80211_INACT_AUTH (180/IEEE80211_INACT_WAIT) /* associated but not authorized */ #define IEEE80211_INACT_RUN (300/IEEE80211_INACT_WAIT) /* authorized */ +#define IEEE80211_INACT_PROBE (30/IEEE80211_INACT_WAIT) /* probe */ #define IEEE80211_INACT_SCAN (300/IEEE80211_INACT_WAIT) /* scanned */ #define IEEE80211_TRANS_WAIT 5 /* mgt frame tx timer (secs) */ @@ -138,7 +139,8 @@ /* others */ int ni_fails; /* failure count to associate */ - int ni_inact; /* inactivity mark count */ + short ni_inact; /* inactivity mark count */ + short ni_inact_reload;/* inactivity reload value */ int ni_txrate; /* index to ni_rates[] */ struct ifqueue ni_savedq; /* ps-poll queue */ struct ieee80211_nodestats ni_stats; /* per-node statistics */ ==== //depot/projects/wifi/sys/net80211/ieee80211_output.c#18 (text+ko) ==== @@ -554,19 +554,6 @@ ni->ni_txseqs[0]++; } - if (eh.ether_type != htons(ETHERTYPE_PAE)) { - /* - * Reset the inactivity timer only for non-PAE traffic - * to avoid a problem where the station leaves w/o - * notice while we're requesting Identity. In this - * situation the 802.1x state machine will continue - * to retransmit the requests because it assumes the - * station will be timed out for inactivity, but our - * retransmits will reset the inactivity timer. - */ - ni->ni_inact = ic->ic_inact_run; - } - IEEE80211_NODE_STAT(ni, tx_data); IEEE80211_NODE_STAT_ADD(ni, tx_bytes, datalen); ==== //depot/projects/wifi/sys/net80211/ieee80211_var.h#14 (text+ko) ==== @@ -148,6 +148,7 @@ int ic_inact_init; /* initial setting */ int ic_inact_auth; /* auth but not assoc setting */ int ic_inact_run; /* authorized setting */ + int ic_inact_probe; /* inactive probe time */ /* * WME/WMM state. From owner-p4-projects@FreeBSD.ORG Thu Dec 2 07:09:08 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B298916A4D0; Thu, 2 Dec 2004 07:09:07 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 88FD616A4CE for ; Thu, 2 Dec 2004 07:09:07 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7531743D54 for ; Thu, 2 Dec 2004 07:09:07 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iB2797oK053216 for ; Thu, 2 Dec 2004 07:09:07 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB2797Q3053213 for perforce@freebsd.org; Thu, 2 Dec 2004 07:09:07 GMT (envelope-from sam@freebsd.org) Date: Thu, 2 Dec 2004 07:09:07 GMT Message-Id: <200412020709.iB2797Q3053213@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66241 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Dec 2004 07:09:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=66241 Change 66241 by sam@sam_ebb on 2004/12/02 07:08:51 remove isc dhclient Affected files ... .. //depot/projects/wifi/sbin/dhclient/Makefile#2 delete .. //depot/projects/wifi/sbin/dhclient/Makefile.inc#2 delete .. //depot/projects/wifi/sbin/dhclient/client/Makefile#2 delete .. //depot/projects/wifi/sbin/dhclient/common/Makefile#3 delete .. //depot/projects/wifi/sbin/dhclient/dhclient-script.sh#2 delete .. //depot/projects/wifi/sbin/dhclient/dhcpctl/Makefile#3 delete .. //depot/projects/wifi/sbin/dhclient/dst/Makefile#3 delete .. //depot/projects/wifi/sbin/dhclient/minires/Makefile#3 delete .. //depot/projects/wifi/sbin/dhclient/omapip/Makefile#3 delete .. //depot/projects/wifi/sbin/dhclient/omshell/Makefile#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Thu Dec 2 07:13:18 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 890D816A4D1; Thu, 2 Dec 2004 07:13:18 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5B5E916A4CE for ; Thu, 2 Dec 2004 07:13:18 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 216CB43D2D for ; Thu, 2 Dec 2004 07:13:18 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iB27DHVb053399 for ; Thu, 2 Dec 2004 07:13:17 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB27DHNJ053396 for perforce@freebsd.org; Thu, 2 Dec 2004 07:13:17 GMT (envelope-from sam@freebsd.org) Date: Thu, 2 Dec 2004 07:13:17 GMT Message-Id: <200412020713.iB27DHNJ053396@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66242 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Dec 2004 07:13:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=66242 Change 66242 by sam@sam_ebb on 2004/12/02 07:12:19 bring in openbsd dhclient Affected files ... .. //depot/projects/wifi/sbin/dhclient/Makefile#3 add .. //depot/projects/wifi/sbin/dhclient/alloc.c#1 add .. //depot/projects/wifi/sbin/dhclient/bpf.c#1 add .. //depot/projects/wifi/sbin/dhclient/clparse.c#1 add .. //depot/projects/wifi/sbin/dhclient/conflex.c#1 add .. //depot/projects/wifi/sbin/dhclient/convert.c#1 add .. //depot/projects/wifi/sbin/dhclient/dhclient-script#1 add .. //depot/projects/wifi/sbin/dhclient/dhclient-script.8#1 add .. //depot/projects/wifi/sbin/dhclient/dhclient.8#1 add .. //depot/projects/wifi/sbin/dhclient/dhclient.c#1 add .. //depot/projects/wifi/sbin/dhclient/dhclient.conf#1 add .. //depot/projects/wifi/sbin/dhclient/dhclient.conf.5#1 add .. //depot/projects/wifi/sbin/dhclient/dhclient.leases.5#1 add .. //depot/projects/wifi/sbin/dhclient/dhcp-options.5#1 add .. //depot/projects/wifi/sbin/dhclient/dhcp.h#1 add .. //depot/projects/wifi/sbin/dhclient/dhcpd.h#1 add .. //depot/projects/wifi/sbin/dhclient/dhctoken.h#1 add .. //depot/projects/wifi/sbin/dhclient/dispatch.c#1 add .. //depot/projects/wifi/sbin/dhclient/errwarn.c#1 add .. //depot/projects/wifi/sbin/dhclient/hash.c#1 add .. //depot/projects/wifi/sbin/dhclient/inet.c#1 add .. //depot/projects/wifi/sbin/dhclient/options.c#1 add .. //depot/projects/wifi/sbin/dhclient/packet.c#1 add .. //depot/projects/wifi/sbin/dhclient/parse.c#1 add .. //depot/projects/wifi/sbin/dhclient/privsep.c#1 add .. //depot/projects/wifi/sbin/dhclient/privsep.h#1 add .. //depot/projects/wifi/sbin/dhclient/tables.c#1 add .. //depot/projects/wifi/sbin/dhclient/tree.c#1 add .. //depot/projects/wifi/sbin/dhclient/tree.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Thu Dec 2 07:14:20 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4981C16A4D0; Thu, 2 Dec 2004 07:14:20 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0D55F16A4CE for ; Thu, 2 Dec 2004 07:14:20 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E325143D2D for ; Thu, 2 Dec 2004 07:14:19 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iB27EJWk053433 for ; Thu, 2 Dec 2004 07:14:19 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB27EJ8e053430 for perforce@freebsd.org; Thu, 2 Dec 2004 07:14:19 GMT (envelope-from sam@freebsd.org) Date: Thu, 2 Dec 2004 07:14:19 GMT Message-Id: <200412020714.iB27EJ8e053430@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66243 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Dec 2004 07:14:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=66243 Change 66243 by sam@sam_ebb on 2004/12/02 07:13:25 nuke some stuff that doesn't exist on freebsd and fix some warnings and it appears to work! Affected files ... .. //depot/projects/wifi/sbin/dhclient/bpf.c#2 edit .. //depot/projects/wifi/sbin/dhclient/dhclient.c#2 edit .. //depot/projects/wifi/sbin/dhclient/parse.c#2 edit Differences ... ==== //depot/projects/wifi/sbin/dhclient/bpf.c#2 (text+ko) ==== @@ -220,6 +220,7 @@ if (ioctl(info->rfdesc, BIOCSETF, &p) < 0) error("Can't install packet filter program: %m"); +#ifdef BIOCSETWF /* Set up the bpf write filter program structure. */ p.bf_len = dhcp_bpf_wfilter_len; p.bf_insns = dhcp_bpf_wfilter; @@ -232,6 +233,7 @@ if (ioctl(info->rfdesc, BIOCLOCK, NULL) < 0) error("Cannot lock bpf"); +#endif } ssize_t ==== //depot/projects/wifi/sbin/dhclient/dhclient.c#2 (text+ko) ==== @@ -56,6 +56,10 @@ #include "dhcpd.h" #include "privsep.h" +#ifndef _PATH_VAREMPTY +#define _PATH_VAREMPTY "/var/empty" +#endif + #define PERIOD 0x2e #define hyphenchar(c) ((c) == 0x2d) #define bslashchar(c) ((c) == 0x5c) ==== //depot/projects/wifi/sbin/dhclient/parse.c#2 (text+ko) ==== @@ -437,7 +437,7 @@ parse_warn("numeric day of week expected."); if (token != SEMI) skip_to_semi(cfile); - return (NULL); + return (0); } tm.tm_wday = atoi(val); @@ -447,7 +447,7 @@ parse_warn("numeric year expected."); if (token != SEMI) skip_to_semi(cfile); - return (NULL); + return (0); } tm.tm_year = atoi(val); if (tm.tm_year > 1900) @@ -459,7 +459,7 @@ parse_warn("expected slash separating year from month."); if (token != SEMI) skip_to_semi(cfile); - return (NULL); + return (0); } /* Month... */ @@ -468,7 +468,7 @@ parse_warn("numeric month expected."); if (token != SEMI) skip_to_semi(cfile); - return (NULL); + return (0); } tm.tm_mon = atoi(val) - 1; @@ -478,7 +478,7 @@ parse_warn("expected slash separating month from day."); if (token != SEMI) skip_to_semi(cfile); - return (NULL); + return (0); } /* Month... */ @@ -487,7 +487,7 @@ parse_warn("numeric day of month expected."); if (token != SEMI) skip_to_semi(cfile); - return (NULL); + return (0); } tm.tm_mday = atoi(val); @@ -497,7 +497,7 @@ parse_warn("numeric hour expected."); if (token != SEMI) skip_to_semi(cfile); - return (NULL); + return (0); } tm.tm_hour = atoi(val); @@ -507,7 +507,7 @@ parse_warn("expected colon separating hour from minute."); if (token != SEMI) skip_to_semi(cfile); - return (NULL); + return (0); } /* Minute... */ @@ -516,7 +516,7 @@ parse_warn("numeric minute expected."); if (token != SEMI) skip_to_semi(cfile); - return (NULL); + return (0); } tm.tm_min = atoi(val); @@ -526,7 +526,7 @@ parse_warn("expected colon separating hour from minute."); if (token != SEMI) skip_to_semi(cfile); - return (NULL); + return (0); } /* Minute... */ @@ -535,7 +535,7 @@ parse_warn("numeric minute expected."); if (token != SEMI) skip_to_semi(cfile); - return (NULL); + return (0); } tm.tm_sec = atoi(val); tm.tm_isdst = 0; @@ -548,7 +548,7 @@ if (token != SEMI) { parse_warn("semicolon expected."); skip_to_semi(cfile); - return (NULL); + return (0); } /* Guess the time value... */ From owner-p4-projects@FreeBSD.ORG Thu Dec 2 14:30:15 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7557016A4D0; Thu, 2 Dec 2004 14:30:15 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3919E16A4CE for ; Thu, 2 Dec 2004 14:30:15 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1C47D43D62 for ; Thu, 2 Dec 2004 14:30:15 +0000 (GMT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iB2EUEH2081243 for ; Thu, 2 Dec 2004 14:30:15 GMT (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB2EUEfY081240 for perforce@freebsd.org; Thu, 2 Dec 2004 14:30:14 GMT (envelope-from areisse@nailabs.com) Date: Thu, 2 Dec 2004 14:30:14 GMT Message-Id: <200412021430.iB2EUEfY081240@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Subject: PERFORCE change 66259 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Dec 2004 14:30:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=66259 Change 66259 by areisse@areisse_tislabs on 2004/12/02 14:29:46 Fix typedefs in ss/conditional.c, and add it to the kernel build. The sebsd branch also builds and runs now. Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/conf/files#16 edit .. //depot/projects/trustedbsd/sebsd/sys/modules/sebsd/Makefile#3 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/conditional.c#3 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/conf/files#16 (text+ko) ==== @@ -1695,6 +1695,7 @@ security/sebsd/ss/sidtab.c optional sebsd security/sebsd/ss/symtab.c optional sebsd security/sebsd/ss/fileutils.c optional sebsd +security/sebsd/ss/conditional.c optional sebsd ufs/ffs/ffs_alloc.c optional ffs ufs/ffs/ffs_balloc.c optional ffs ufs/ffs/ffs_inode.c optional ffs ==== //depot/projects/trustedbsd/sebsd/sys/modules/sebsd/Makefile#3 (text+ko) ==== @@ -18,6 +18,7 @@ services.c \ sidtab.c \ symtab.c \ - fileutils.c + fileutils.c \ + conditional.c .include ==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/conditional.c#3 (text+ko) ==== @@ -220,14 +220,14 @@ { char *key = NULL; struct cond_bool_datum *booldatum; - __u32 *buf, len; + u32 *buf, len; booldatum = kmalloc(sizeof(struct cond_bool_datum), GFP_KERNEL); if (!booldatum) return -1; memset(booldatum, 0, sizeof(struct cond_bool_datum)); - buf = next_entry(fp, sizeof(__u32) * 3); + buf = next_entry(fp, sizeof(u32) * 3); if (!buf) goto err; @@ -264,13 +264,13 @@ struct avtab_datum datum; struct avtab_node *node_ptr; int len, i; - __u32 *buf; - __u8 found; + u32 *buf; + u8 found; *ret_list = NULL; len = 0; - buf = next_entry(fp, sizeof(__u32)); + buf = next_entry(fp, sizeof(u32)); if (!buf) return -1; @@ -370,18 +370,18 @@ static int cond_read_node(struct policydb *p, struct cond_node *node, void *fp) { - __u32 *buf; + u32 *buf; int len, i; struct cond_expr *expr = NULL, *last = NULL; - buf = next_entry(fp, sizeof(__u32)); + buf = next_entry(fp, sizeof(u32)); if (!buf) return -1; node->cur_state = le32_to_cpu(buf[0]); len = 0; - buf = next_entry(fp, sizeof(__u32)); + buf = next_entry(fp, sizeof(u32)); if (!buf) return -1; @@ -389,7 +389,7 @@ len = le32_to_cpu(buf[0]); for (i = 0; i < len; i++ ) { - buf = next_entry(fp, sizeof(__u32) * 2); + buf = next_entry(fp, sizeof(u32) * 2); if (!buf) goto err; @@ -426,10 +426,10 @@ int cond_read_list(struct policydb *p, void *fp) { struct cond_node *node, *last = NULL; - __u32 *buf; + u32 *buf; int i, len; - buf = next_entry(fp, sizeof(__u32)); + buf = next_entry(fp, sizeof(u32)); if (!buf) return -1; @@ -469,10 +469,10 @@ for(node = avtab_search_node(ctab, key, AVTAB_AV); node != NULL; node = avtab_search_node_next(node, AVTAB_AV)) { - if ( (__u32) (AVTAB_ALLOWED|AVTAB_ENABLED) == + if ( (u32) (AVTAB_ALLOWED|AVTAB_ENABLED) == (node->datum.specified & (AVTAB_ALLOWED|AVTAB_ENABLED))) avd->allowed |= avtab_allowed(&node->datum); - if ( (__u32) (AVTAB_AUDITDENY|AVTAB_ENABLED) == + if ( (u32) (AVTAB_AUDITDENY|AVTAB_ENABLED) == (node->datum.specified & (AVTAB_AUDITDENY|AVTAB_ENABLED))) /* Since a '0' in an auditdeny mask represents a * permission we do NOT want to audit (dontaudit), we use @@ -480,7 +480,7 @@ * are retained (much unlike the allow and auditallow cases). */ avd->auditdeny &= avtab_auditdeny(&node->datum); - if ( (__u32) (AVTAB_AUDITALLOW|AVTAB_ENABLED) == + if ( (u32) (AVTAB_AUDITALLOW|AVTAB_ENABLED) == (node->datum.specified & (AVTAB_AUDITALLOW|AVTAB_ENABLED))) avd->auditallow |= avtab_auditallow(&node->datum); } From owner-p4-projects@FreeBSD.ORG Thu Dec 2 19:51:46 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AEB7016A4D0; Thu, 2 Dec 2004 19:51:45 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8419916A4CE for ; Thu, 2 Dec 2004 19:51:45 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7911243D54 for ; Thu, 2 Dec 2004 19:51:45 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iB2Jpja2098680 for ; Thu, 2 Dec 2004 19:51:45 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB2JpjMx098677 for perforce@freebsd.org; Thu, 2 Dec 2004 19:51:45 GMT (envelope-from sam@freebsd.org) Date: Thu, 2 Dec 2004 19:51:45 GMT Message-Id: <200412021951.iB2JpjMx098677@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66268 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Dec 2004 19:51:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=66268 Change 66268 by sam@sam_ebb on 2004/12/02 19:50:56 add _dhcp user for dhclient privsep operation Affected files ... .. //depot/projects/wifi/etc/master.passwd#2 edit Differences ... ==== //depot/projects/wifi/etc/master.passwd#2 (text+ko) ==== @@ -16,6 +16,7 @@ bind:*:53:53::0:0:Bind Sandbox:/:/usr/sbin/nologin proxy:*:62:62::0:0:Packet Filter pseudo-user:/nonexistent:/usr/sbin/nologin _pflogd:*:64:64::0:0:pflogd privsep user:/var/empty:/usr/sbin/nologin +_dhcp:*:77:77::0:0:DHCP programs:/var/empty:/sbin/nologin uucp:*:66:66::0:0:UUCP pseudo-user:/var/spool/uucppublic:/usr/local/libexec/uucp/uucico pop:*:68:6::0:0:Post Office Owner:/nonexistent:/usr/sbin/nologin www:*:80:80::0:0:World Wide Web Owner:/nonexistent:/usr/sbin/nologin From owner-p4-projects@FreeBSD.ORG Thu Dec 2 20:34:39 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ECAB916A4D0; Thu, 2 Dec 2004 20:34:38 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BEB8816A4CE for ; Thu, 2 Dec 2004 20:34:38 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 98D0C43D3F for ; Thu, 2 Dec 2004 20:34:38 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iB2KYcoQ000650 for ; Thu, 2 Dec 2004 20:34:38 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB2KYcZo000647 for perforce@freebsd.org; Thu, 2 Dec 2004 20:34:38 GMT (envelope-from sam@freebsd.org) Date: Thu, 2 Dec 2004 20:34:38 GMT Message-Id: <200412022034.iB2KYcZo000647@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66271 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Dec 2004 20:34:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=66271 Change 66271 by sam@sam_ebb on 2004/12/02 20:34:13 overhaul for new world order; needs more cleanup and testing Affected files ... .. //depot/projects/wifi/etc/pccard_ether#2 edit Differences ... ==== //depot/projects/wifi/etc/pccard_ether#2 (text+ko) ==== @@ -9,79 +9,17 @@ . /etc/network.subr -stop_dhcp() { - # If dhclient is already running, record - # its interfaces. - if [ -x /usr/bin/grep ]; then - eval _active_list=\"`/bin/ps -axwww | \ - /usr/bin/grep dhclient | \ - /usr/bin/grep -v grep | \ - /usr/bin/sed -e 's|^.*dhclient||' | \ - /usr/bin/awk '{for (i=1;i<=NF;i++) \ - { if ($i~/[a-zA-Z].[0-9]$/) \ - { printf(" %s",$i) } }}'` \ - \" - fi +# Suck in the configuration variables +# +if [ -r /etc/defaults/rc.conf ]; then + . /etc/defaults/rc.conf + source_rc_confs +elif [ -r /etc/rc.conf ]; then + . /etc/rc.conf +fi - # Get the rc.conf list of dhcp configured interfaces - static_dhcp_list="`list_net_interfaces dhcp`" - - # Get the current ifconfig list of interfaces - _aprefix= - _nlist= - for _if in ${_active_list} ; do - _test_if=`ifconfig ${_if} 2>&1` - case "$_test_if" in - "ifconfig: interface $_if does not exist") - ;; - ${interface}) - # Don't record the same device twice. - ;; - *) - # - # Catch devices which were specified before, - # but have not been part of the rc. We need - # them again for the restart. - # - for _cif in ${static_dhcp_list} ; do - case "$_cif" in - ${_if}) - # Nothing to add - ;; - *) - # Found interface beside rc.conf - _nlist="${_nlist}${_aprefix}${_if}" - ;; - esac - done - _dhcplist="${_dhcplist}${_aprefix}${_if}" - [ -z "$_aprefix" ] && _aprefix=' ' - ;; - esac - done - - if [ -s /var/run/dhclient.pid ]; then - pidfile="/var/run/dhclient.pid" - else - return - fi - /sbin/dhclient -r ${interface} - rm -f ${pidfile} - case ${startstop} in - [Ss][Tt][Oo][Pp]) - if [ -z "${_nlist}" ]; then - sh `/etc/rc.d/dhclient start` - else - start_dhcp_keep_current - fi - ;; - *) - ;; - esac -} - -start_dhcp() { - stop_dhcp +start_dhcp() +{ case ${pccard_ether_delay} in [Nn][Oo]) ;; @@ -89,37 +27,60 @@ sleep ${pccard_ether_delay} ;; esac + [ -n "$dhcp_program" ] && dhclient_program="$dhcp_program" [ -n "$dhcp_flags" ] && dhclient_flags="$dhcp_flags" if [ -x "${dhclient_program}" ]; then - interfaces=`echo $_dhcplist ${interface} | xargs -n 1 echo | sort -u` - ${dhclient_program} ${dhclient_flags} ${interfaces} + ${dhclient_program} ${dhclient_flags} ${interface} else echo "${dhclient_program}: DHCP client software not available" fi } -# Called after detaching a card, if dhclient has been -# used for more than one interface. -start_dhcp_keep_current() { - [ -n "$dhcp_program" ] && dhclient_program="$dhcp_program" - [ -n "$dhcp_flags" ] && dhclient_flags="$dhcp_flags" - if [ -x "${dhclient_program}" ]; then - ${dhclient_program} ${dhclient_flags} \ - ${_dhcplist} +ifn_isup() +{ + if [ -x /usr/bin/grep ]; then + ifconfig ${interface} | grep -s netmask > /dev/null 2>&1 + return # returns grep exit status else - echo "${dhclient_program}: DHCP client software not available" + return 0 # cannot tell fi } -# Suck in the configuration variables -# -if [ -r /etc/defaults/rc.conf ]; then - . /etc/defaults/rc.conf - source_rc_confs -elif [ -r /etc/rc.conf ]; then - . /etc/rc.conf -fi +# XXX these come from rc.d/netif; if they get moved to network.subr +# XXX we can delete our private copies + +ifn_start() +{ + local ifn cfg + ifn="$1" + cfg=1 + + [ -z "$ifn" ] && return 1 + + ifscript_up ${ifn} && cfg=0 + ifconfig_up ${ifn} && cfg=0 + ifalias_up ${ifn} && cfg=0 + ipx_up ${ifn} && cfg=0 + + return $cfg +} + +ifn_stop() +{ + local ifn cfg + ifn="$1" + cfg=1 + + [ -z "$ifn" ] && return 1 + + ipx_down ${ifn} && cfg=0 + ifalias_down ${ifn} && cfg=0 + ifconfig_down ${ifn} && cfg=0 + ifscript_down ${ifn} && cfg=0 + + return $cfg +} interface=$1 shift @@ -138,47 +99,21 @@ case ${startstop} in [Ss][Tt][Aa][Rr][Tt] | '') - if [ -x /usr/bin/grep ]; then - if ifconfig ${interface} | grep -s netmask > /dev/null 2>&1; then - # Interface is already up, so ignore it. - exit 0 - fi - fi + ifn_isup ${interface} && exit 0 # already configured - if [ -r /etc/start_if.${interface} ]; then - . /etc/start_if.${interface} - fi - eval ifconfig_args=\$ifconfig_${interface} case ${ifconfig_args} in [Nn][Oo] | '') ;; [Dd][Hh][Cc][Pp]) - # Start up the DHCP client program - start_dhcp + ifscript_up ${interface} # run any script + start_dhcp # start DHCP client program ;; *) - # Do the primary ifconfig if specified - ifconfig ${interface} ${ifconfig_args} $* + ifn_start ${interface} # static configuration - # Check to see if aliases need to be added - alias=0 - while : - do - eval ifx_args=\$ifconfig_${interface}_alias${alias} - if [ -n "${ifx_args}" ]; then - ifconfig ${interface} ${ifx_args} alias - alias=`expr ${alias} + 1` - else - break; - fi - done - - # Do ipx address if specified - eval ifx_args=\$ifconfig_${interface}_ipx - if [ -n "${ifx_args}" ]; then - ifconfig ${interface} ${ifx_args} - fi + # XXX this mimics what's in rc.d/routing and should + # XXX probably pulled up into network.subr # Add default route into $static_routes case ${defaultrouter} in @@ -209,26 +144,22 @@ # IPv6 setup case ${ipv6_enable} in [Yy][Ee][Ss]) - if [ -r /etc/network.subr ]; then - . /etc/network.subr - network6_interface_setup ${interface} - fi + network6_interface_setup ${interface} ;; esac ;; # Stop the interface *) - if [ -r /etc/stop_if.${interface} ]; then - . /etc/stop_if.${interface} - fi - eval ifconfig_args=\$ifconfig_${interface} case ${ifconfig_args} in [Nn][Oo] | '') ;; [Dd][Hh][Cc][Pp]) + ifscript_down ${interface} # run any script + # Stop the DHCP client for this interface - stop_dhcp + # nothing to do; any dhclient will note the interface + # go down and terminate ;; *) # Delete static route if specified @@ -240,33 +171,14 @@ done fi - # Delete aliases if exist - alias=0 - while : - do - eval ifx_args=\$ifconfig_${interface}_alias${alias} - if [ -n "${ifx_args}" ]; then - ifconfig ${interface} ${ifx_args} alias delete - alias=`expr ${alias} + 1` - else - break; - fi - done + ifn_down ${interface} ;; esac - # Remove the network interface and cleaning ARP table - ifconfig ${interface} delete + # + # Remove the network interface and cleanup ARP table + # XXX no way to limit arp flush to one interface + # + ifconfig ${interface} delete down arp -d -a - - # Clean the routing table - case ${removable_route_flush} in - [Nn][Oo]) - ;; - *) - # flush beforehand, just in case.... - route -n flush -inet - ;; - esac - ;; esac From owner-p4-projects@FreeBSD.ORG Thu Dec 2 20:35:41 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AFB0E16A4D0; Thu, 2 Dec 2004 20:35:40 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8C11916A4CE for ; Thu, 2 Dec 2004 20:35:40 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 63BEB43D54 for ; Thu, 2 Dec 2004 20:35:40 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iB2KZe8E000742 for ; Thu, 2 Dec 2004 20:35:40 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB2KZeJN000739 for perforce@freebsd.org; Thu, 2 Dec 2004 20:35:40 GMT (envelope-from sam@freebsd.org) Date: Thu, 2 Dec 2004 20:35:40 GMT Message-Id: <200412022035.iB2KZeJN000739@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66272 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Dec 2004 20:35:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=66272 Change 66272 by sam@sam_ebb on 2004/12/02 20:34:48 revamp for new world order Affected files ... .. //depot/projects/wifi/etc/rc.d/dhclient#2 edit Differences ... ==== //depot/projects/wifi/etc/rc.d/dhclient#2 (text+ko) ==== @@ -1,13 +1,13 @@ #!/bin/sh # # $NetBSD: dhclient,v 1.8 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/dhclient,v 1.17 2004/10/07 13:55:25 mtm Exp $ +# $FreeBSD: src/etc/rc.d/dhclient,v 1.16 2004/05/20 14:16:04 mtm Exp $ # # PROVIDE: dhclient # REQUIRE: netif ipfw ipfilter mountcritlocal # BEFORE: NETWORKING -# KEYWORD: nojail +# KEYWORD: FreeBSD nojail # # Note that there no syslog logging of dhclient messages at boot because # dhclient needs to start before services that syslog depends upon do. @@ -20,9 +20,8 @@ rcvar= pidfile="/var/run/${name}.pid" start_precmd="dhclient_prestart" -start_postcmd="dhclient_poststart" -stop_precmd="dhclient_prestop" -stop_postcmd="dhclient_poststop" +start_cmd="dhclient_start" +stop_cmd="dhclient_stop" dhclient_common() { @@ -47,67 +46,45 @@ if [ $dhclient_common_error -eq 1 ]; then return 1 fi - for ifn in ${_cooked_list}; do - ifscript_up ${ifn} - done if checkyesno background_dhclient; then - rc_flags="${rc_flags} -nw" + rc_flags="${rc_flags} -b" fi - rc_flags="${rc_flags} ${_cooked_list}" return 0 } -dhclient_poststart() +dhclient_start() { for ifn in ${_cooked_list}; do + ifscript_up ${ifn} + + ${dhclient_program} ${rc_flags} $ifn > /dev/null 2>&1 + ifalias_up ${ifn} ipx_up ${ifn} - ifconfig ${ifn} + + checkyesno background_dhclient || ifconfig ${ifn} done } -dhclient_prestop() +dhclient_stop() { if [ $dhclient_common_error -eq 1 ]; then return 1 fi for ifn in ${_cooked_list}; do + ifconfig $ifn down # signal dhclient + ipx_down ${ifn} ifalias_down ${ifn} - done - echo -n "Releasing DHCP leases:" - for ifn in $_cooked_list ; do - ${command} -r $ifn - if [ $? -eq 0 ]; then - echo -n " $ifn" - else - _fail="$_fail $ifn" - fi - done - echo '.' - debug "The following leases failed to release: $_fail" -} + ifconfig_down ${ifn} -dhclient_poststop() -{ - for ifn in ${_cooked_list}; do ifscript_down ${ifn} done } -if [ -n "$2" ]; then - _cmdifn="$2" - stop_cmd=":" -fi - load_rc_config $name dhclient_common_error=0 dhclient_common || dhclient_common_error=1; -if [ -n "$_cooked_list" ]; then - if [ -s $pidfile ]; then - stop_cmd=":" - fi -fi run_rc_command "$1" From owner-p4-projects@FreeBSD.ORG Thu Dec 2 20:36:42 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 59E1316A4D0; Thu, 2 Dec 2004 20:36:42 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 350A416A4CE for ; Thu, 2 Dec 2004 20:36:42 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 293D143D2F for ; Thu, 2 Dec 2004 20:36:42 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iB2Kag20000759 for ; Thu, 2 Dec 2004 20:36:42 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB2KafAv000756 for perforce@freebsd.org; Thu, 2 Dec 2004 20:36:41 GMT (envelope-from sam@freebsd.org) Date: Thu, 2 Dec 2004 20:36:41 GMT Message-Id: <200412022036.iB2KafAv000756@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66273 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Dec 2004 20:36:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=66273 Change 66273 by sam@sam_ebb on 2004/12/02 20:35:55 add -b (background) option to replace old -nw option; may need to change it to be backwards compatible but -nw isn't getopt friendly Affected files ... .. //depot/projects/wifi/sbin/dhclient/dhclient.c#3 edit Differences ... ==== //depot/projects/wifi/sbin/dhclient/dhclient.c#3 (text+ko) ==== @@ -259,14 +259,18 @@ extern char *__progname; int ch, fd, quiet = 0, i = 0; int pipe_fd[2]; + int immediate_daemon = 0; struct passwd *pw; /* Initially, log errors to stderr as well as to syslogd. */ openlog(__progname, LOG_PID | LOG_NDELAY, DHCPD_LOG_FACILITY); setlogmask(LOG_UPTO(LOG_INFO)); - while ((ch = getopt(argc, argv, "c:dl:qu")) != -1) + while ((ch = getopt(argc, argv, "bc:dl:nqu")) != -1) switch (ch) { + case 'b': + immediate_daemon = 1; + break; case 'c': path_dhclient_conf = optarg; break; @@ -379,6 +383,9 @@ setproctitle("%s", ifi->name); + if (immediate_daemon) + go_daemon(); + ifi->client->state = S_INIT; state_reboot(ifi); From owner-p4-projects@FreeBSD.ORG Thu Dec 2 20:43:51 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 919CA16A4D0; Thu, 2 Dec 2004 20:43:51 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 57CBC16A4CE for ; Thu, 2 Dec 2004 20:43:51 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 36EB843D45 for ; Thu, 2 Dec 2004 20:43:51 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iB2KhpiM000944 for ; Thu, 2 Dec 2004 20:43:51 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB2Khok4000941 for perforce@freebsd.org; Thu, 2 Dec 2004 20:43:50 GMT (envelope-from sam@freebsd.org) Date: Thu, 2 Dec 2004 20:43:50 GMT Message-Id: <200412022043.iB2Khok4000941@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66274 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Dec 2004 20:43:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=66274 Change 66274 by sam@sam_ebb on 2004/12/02 20:42:56 revert dreck that snuck through Affected files ... .. //depot/projects/wifi/etc/rc.d/dhclient#3 edit Differences ... ==== //depot/projects/wifi/etc/rc.d/dhclient#3 (text+ko) ==== @@ -7,7 +7,7 @@ # PROVIDE: dhclient # REQUIRE: netif ipfw ipfilter mountcritlocal # BEFORE: NETWORKING -# KEYWORD: FreeBSD nojail +# KEYWORD: nojail # # Note that there no syslog logging of dhclient messages at boot because # dhclient needs to start before services that syslog depends upon do. From owner-p4-projects@FreeBSD.ORG Thu Dec 2 21:22:39 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 240F516A4D0; Thu, 2 Dec 2004 21:22:39 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EE32B16A4CE for ; Thu, 2 Dec 2004 21:22:38 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DDC5543D5A for ; Thu, 2 Dec 2004 21:22:38 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iB2LMcVg008661 for ; Thu, 2 Dec 2004 21:22:38 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB2LMcVC008658 for perforce@freebsd.org; Thu, 2 Dec 2004 21:22:38 GMT (envelope-from sam@freebsd.org) Date: Thu, 2 Dec 2004 21:22:38 GMT Message-Id: <200412022122.iB2LMcVC008658@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66276 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Dec 2004 21:22:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=66276 Change 66276 by sam@sam_ebb on 2004/12/02 21:21:44 make things more like old script: o use logger for diagnostics o delete old_routers instead of assuming a single default route o check if default route is ours when clearing old_routers o selectively remove arp entries instead of flushing everything Affected files ... .. //depot/projects/wifi/sbin/dhclient/dhclient-script#2 edit Differences ... ==== //depot/projects/wifi/sbin/dhclient/dhclient-script#2 (text+ko) ==== @@ -18,6 +18,16 @@ # # +NETSTAT=/usr/bin/netstat +GREP=/usr/bin/grep +AWK=/usr/bin/awk + +if [ -x /usr/bin/logger ]; then + LOGGER="/usr/bin/logger -s -p user.notice -t dhclient" +else + LOGGER=echo +fi + # # Helper functions that implement common actions. # @@ -56,9 +66,11 @@ } delete_old_routes() { - # Delete existing default route. We only allow one, so no need to - # process $old_routers list. - route delete default >/dev/null 2>&1 + for router in $old_routers; do + if [ $if_defaultroute = x -o $if_defaultroute = $interface ]; then + route delete default $route >/dev/null 2>&1 + fi + done if [ -n "$old_static_routes" ]; then set $old_static_routes @@ -68,7 +80,8 @@ done fi - arp -dan + arp -an | sed -n -e 's/^.*(\(.*\)) at .*$/arp -d \1/p' | \ + sh >/dev/null 2>&1 } add_new_routes() { @@ -142,11 +155,17 @@ # if [ -n "$new_network_number" ]; then - echo "New Network Number: $new_network_number" + $LOGGER "New Network Number: $new_network_number" fi if [ -n "$new_broadcast_address" ]; then - echo "New Broadcast Address: $new_broadcast_address" + $LOGGER "New Broadcast Address: $new_broadcast_address" +fi + +if [ -x $NETSTAT ]; then + if_defaulroute=`$NETSTAT -rn | $GREP "^default" | $AWK '{print $6}'` +else + if_defaultroute="x" fi case $reason in From owner-p4-projects@FreeBSD.ORG Thu Dec 2 21:27:46 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CF59316A4D0; Thu, 2 Dec 2004 21:27:45 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 960A816A4CE for ; Thu, 2 Dec 2004 21:27:45 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 74B7F43D2D for ; Thu, 2 Dec 2004 21:27:45 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iB2LRj3T008825 for ; Thu, 2 Dec 2004 21:27:45 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB2LRjSC008822 for perforce@freebsd.org; Thu, 2 Dec 2004 21:27:45 GMT (envelope-from sam@freebsd.org) Date: Thu, 2 Dec 2004 21:27:45 GMT Message-Id: <200412022127.iB2LRjSC008822@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66277 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Dec 2004 21:27:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=66277 Change 66277 by sam@sam_ebb on 2004/12/02 21:27:12 correct selective arp flushing Affected files ... .. //depot/projects/wifi/sbin/dhclient/dhclient-script#3 edit Differences ... ==== //depot/projects/wifi/sbin/dhclient/dhclient-script#3 (text+ko) ==== @@ -80,7 +80,8 @@ done fi - arp -an | sed -n -e 's/^.*(\(.*\)) at .*$/arp -d \1/p' | \ + arp -an -i $interface | \ + sed -n -e 's/^.*(\(.*\)) at .*$/arp -d \1/p' | \ sh >/dev/null 2>&1 } From owner-p4-projects@FreeBSD.ORG Thu Dec 2 21:27:47 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9DC5616A4DD; Thu, 2 Dec 2004 21:27:46 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E534616A4DB for ; Thu, 2 Dec 2004 21:27:45 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C2D6043D41 for ; Thu, 2 Dec 2004 21:27:45 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iB2LRjbC008832 for ; Thu, 2 Dec 2004 21:27:45 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB2LRjND008828 for perforce@freebsd.org; Thu, 2 Dec 2004 21:27:45 GMT (envelope-from sam@freebsd.org) Date: Thu, 2 Dec 2004 21:27:45 GMT Message-Id: <200412022127.iB2LRjND008828@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66278 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Dec 2004 21:27:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=66278 Change 66278 by sam@sam_ebb on 2004/12/02 21:27:37 use selective arp cache flushing logic from dhclient-script Affected files ... .. //depot/projects/wifi/etc/pccard_ether#3 edit Differences ... ==== //depot/projects/wifi/etc/pccard_ether#3 (text+ko) ==== @@ -177,8 +177,8 @@ # # Remove the network interface and cleanup ARP table - # XXX no way to limit arp flush to one interface # ifconfig ${interface} delete down - arp -d -a + arp -an ${interface} | \ + sed -n -e 's/^.*(\(.*\)) at .*$/arp -d \1/p' | sh esac From owner-p4-projects@FreeBSD.ORG Thu Dec 2 22:19:49 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1FAFA16A4D0; Thu, 2 Dec 2004 22:19:49 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E89D816A4CE for ; Thu, 2 Dec 2004 22:19:48 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DC5C043D2D for ; Thu, 2 Dec 2004 22:19:48 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iB2MJmtb011900 for ; Thu, 2 Dec 2004 22:19:48 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB2MJmbr011897 for perforce@freebsd.org; Thu, 2 Dec 2004 22:19:48 GMT (envelope-from sam@freebsd.org) Date: Thu, 2 Dec 2004 22:19:48 GMT Message-Id: <200412022219.iB2MJmbr011897@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66279 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Dec 2004 22:19:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=66279 Change 66279 by sam@sam_ebb on 2004/12/02 22:19:08 process associate/deassociate events for 802.11 devices and do the right thing Affected files ... .. //depot/projects/wifi/sbin/dhclient/dhclient.c#4 edit Differences ... ==== //depot/projects/wifi/sbin/dhclient/dhclient.c#4 (text+ko) ==== @@ -56,6 +56,8 @@ #include "dhcpd.h" #include "privsep.h" +#include + #ifndef _PATH_VAREMPTY #define _PATH_VAREMPTY "/var/empty" #endif @@ -240,6 +242,29 @@ ifan->ifan_index == ifi->index) goto die; break; + case RTM_IEEE80211: + ifan = (struct if_announcemsghdr *)rtm; + if (ifan->ifan_index != ifi->index) + break; + switch (ifan->ifan_what) { + case RTM_IEEE80211_ASSOC: + state_reboot(ifi); + break; + case RTM_IEEE80211_DISASSOC: + /* + * Clear existing state; transition to the init + * state and then wait for either a link down + * notification or an associate event. + */ + script_init("FAIL", NULL); + if (ifi->client->alias) + script_write_params("alias_", + ifi->client->alias); + script_go(); + ifi->client->state = S_INIT; + break; + } + break; default: break; } From owner-p4-projects@FreeBSD.ORG Thu Dec 2 22:49:25 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1AC6116A4D0; Thu, 2 Dec 2004 22:49:25 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E5D2D16A4CE for ; Thu, 2 Dec 2004 22:49:24 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C53B343D53 for ; Thu, 2 Dec 2004 22:49:24 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iB2MnOrK012695 for ; Thu, 2 Dec 2004 22:49:24 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB2MnOul012692 for perforce@freebsd.org; Thu, 2 Dec 2004 22:49:24 GMT (envelope-from sam@freebsd.org) Date: Thu, 2 Dec 2004 22:49:24 GMT Message-Id: <200412022249.iB2MnOul012692@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66280 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Dec 2004 22:49:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=66280 Change 66280 by sam@sam_ebb on 2004/12/02 22:49:01 use EXPIRE instead of FAIL when handling deassocation Affected files ... .. //depot/projects/wifi/sbin/dhclient/dhclient.c#5 edit Differences ... ==== //depot/projects/wifi/sbin/dhclient/dhclient.c#5 (text+ko) ==== @@ -256,7 +256,7 @@ * state and then wait for either a link down * notification or an associate event. */ - script_init("FAIL", NULL); + script_init("EXPIRE", NULL); if (ifi->client->alias) script_write_params("alias_", ifi->client->alias); From owner-p4-projects@FreeBSD.ORG Thu Dec 2 22:50:26 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9E96916A4F8; Thu, 2 Dec 2004 22:50:26 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 78BA616A4F4 for ; Thu, 2 Dec 2004 22:50:26 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6C5D543D49 for ; Thu, 2 Dec 2004 22:50:26 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iB2MoQQC012731 for ; Thu, 2 Dec 2004 22:50:26 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB2MoQF1012728 for perforce@freebsd.org; Thu, 2 Dec 2004 22:50:26 GMT (envelope-from sam@freebsd.org) Date: Thu, 2 Dec 2004 22:50:26 GMT Message-Id: <200412022250.iB2MoQF1012728@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66281 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Dec 2004 22:50:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=66281 Change 66281 by sam@sam_ebb on 2004/12/02 22:49:59 more stuff from old script: o don't clobber default route when adding a new address; this maintains old behaviour o set hostname if we're supplied a name Affected files ... .. //depot/projects/wifi/sbin/dhclient/dhclient-script#4 edit Differences ... ==== //depot/projects/wifi/sbin/dhclient/dhclient-script#4 (text+ko) ==== @@ -32,6 +32,18 @@ # Helper functions that implement common actions. # +check_hostname() { + current_hostname=`$HOSTNAME` + if [ -z "$current_hostname" ]; then + $LOGGER "New Hostname: $new_host_name" + $HOSTNAME $new_host_name + elif [ "$current_hostname" = "$old_host_name" -a \ + "$new_host_name" != "$old_host_name" ]; then + $LOGGER "New Hostname: $new_host_name" + $HOSTNAME $new_host_name + fi +} + delete_old_address() { if [ -n "$old_ip_address" ]; then ifconfig $interface inet -alias $old_ip_address $medium @@ -86,7 +98,6 @@ } add_new_routes() { - route delete default >/dev/null 2>&1 for router in $new_routers; do if [ "$new_ip_address" = "$router" ]; then route add default -iface $router >/dev/null 2>&1 @@ -185,6 +196,7 @@ ;; BOUND|RENEW|REBIND|REBOOT) + check_hostname if [ -n "$old_ip_address" ]; then if [ "$old_ip_address" != "$alias_ip_address" ]; then delete_old_alias From owner-p4-projects@FreeBSD.ORG Thu Dec 2 23:36:23 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 53B2116A4D0; Thu, 2 Dec 2004 23:36:23 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 161C816A4CE for ; Thu, 2 Dec 2004 23:36:23 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E9A6343D2D for ; Thu, 2 Dec 2004 23:36:22 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iB2NaMYs014575 for ; Thu, 2 Dec 2004 23:36:22 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB2NaMjg014571 for perforce@freebsd.org; Thu, 2 Dec 2004 23:36:22 GMT (envelope-from sam@freebsd.org) Date: Thu, 2 Dec 2004 23:36:22 GMT Message-Id: <200412022336.iB2NaMjg014571@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66284 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Dec 2004 23:36:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=66284 Change 66284 by sam@sam_ebb on 2004/12/02 23:36:06 add missing set of old parameters before EXPIRE on client deassociate Affected files ... .. //depot/projects/wifi/sbin/dhclient/dhclient.c#6 edit Differences ... ==== //depot/projects/wifi/sbin/dhclient/dhclient.c#6 (text+ko) ==== @@ -257,6 +257,7 @@ * notification or an associate event. */ script_init("EXPIRE", NULL); + script_write_params("old_", ifi->client->active); if (ifi->client->alias) script_write_params("alias_", ifi->client->alias); From owner-p4-projects@FreeBSD.ORG Thu Dec 2 23:38:27 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EA10A16A4D0; Thu, 2 Dec 2004 23:38:26 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id ABE8C16A4CE for ; Thu, 2 Dec 2004 23:38:26 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9196543D4C for ; Thu, 2 Dec 2004 23:38:26 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iB2NcQlQ014647 for ; Thu, 2 Dec 2004 23:38:26 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB2NcQ7p014643 for perforce@freebsd.org; Thu, 2 Dec 2004 23:38:26 GMT (envelope-from sam@freebsd.org) Date: Thu, 2 Dec 2004 23:38:26 GMT Message-Id: <200412022338.iB2NcQ7p014643@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66286 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Dec 2004 23:38:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=66286 Change 66286 by sam@sam_ebb on 2004/12/02 23:37:30 o more cleanups to be compatible with old script o define common stuff with shell variables o announce settings per old script Affected files ... .. //depot/projects/wifi/sbin/dhclient/dhclient-script#5 edit Differences ... ==== //depot/projects/wifi/sbin/dhclient/dhclient-script#5 (text+ko) ==== @@ -21,6 +21,9 @@ NETSTAT=/usr/bin/netstat GREP=/usr/bin/grep AWK=/usr/bin/awk +HOSTNAME=/bin/hostname + +LOCALHOST=127.0.0.1 if [ -x /usr/bin/logger ]; then LOGGER="/usr/bin/logger -s -p user.notice -t dhclient" @@ -35,20 +38,23 @@ check_hostname() { current_hostname=`$HOSTNAME` if [ -z "$current_hostname" ]; then - $LOGGER "New Hostname: $new_host_name" + $LOGGER "New Hostname ($interface): $new_host_name" $HOSTNAME $new_host_name elif [ "$current_hostname" = "$old_host_name" -a \ "$new_host_name" != "$old_host_name" ]; then - $LOGGER "New Hostname: $new_host_name" + $LOGGER "New Hostname ($interface): $new_host_name" $HOSTNAME $new_host_name fi } +arp_flush() { + arp -an -i $interface | \ + sed -n -e 's/^.*(\(.*\)) at .*$/arp -d \1/p' | \ + sh >/dev/null 2>&1 +} + delete_old_address() { - if [ -n "$old_ip_address" ]; then - ifconfig $interface inet -alias $old_ip_address $medium - route delete "$old_ip_address" 127.0.0.1 >/dev/null 2>&1 - fi + ifconfig $interface inet -alias $old_ip_address $medium } add_new_address() { @@ -58,14 +64,16 @@ broadcast $new_broadcast_address \ $medium - # XXX Original TIMEOUT code did not do this unless $new_routers was set? - route add $new_ip_address 127.0.0.1 >/dev/null 2>&1 + $LOGGER "New IP Address ($interface): $new_ip_address" + $LOGGER "New Subnet Mask ($interface): $new_subnet_mask" + $LOGGER "New Broadcast Address ($interface): $new_broadcast_address" + $LOGGER "New Routers ($interface): $new_routers" } delete_old_alias() { if [ -n "$alias_ip_address" ]; then ifconfig $interface inet -alias $alias_ip_address > /dev/null 2>&1 - route delete $alias_ip_address 127.0.0.1 > /dev/null 2>&1 + route delete $alias_ip_address $LOCALHOST > /dev/null 2>&1 fi } @@ -73,11 +81,12 @@ if [ -n "$alias_ip_address" ]; then ifconfig $interface inet alias $alias_ip_address netmask \ $alias_subnet_mask - route add $alias_ip_address 127.0.0.1 + route add $alias_ip_address $LOCALHOST fi } delete_old_routes() { + route delete "$old_ip_address" $LOCALHOST >/dev/null 2>&1 for router in $old_routers; do if [ $if_defaultroute = x -o $if_defaultroute = $interface ]; then route delete default $route >/dev/null 2>&1 @@ -92,12 +101,11 @@ done fi - arp -an -i $interface | \ - sed -n -e 's/^.*(\(.*\)) at .*$/arp -d \1/p' | \ - sh >/dev/null 2>&1 + arp_flush } add_new_routes() { + route add $new_ip_address $LOCALHOST >/dev/null 2>&1 for router in $new_routers; do if [ "$new_ip_address" = "$router" ]; then route add default -iface $router >/dev/null 2>&1 @@ -110,6 +118,7 @@ done if [ -n "$new_static_routes" ]; then + $LOGGER "New Static Routes ($interface): $new_static_routes" set $new_static_routes while [ $# -gt 1 ]; do route add $1 $2 @@ -166,14 +175,6 @@ # Start of active code. # -if [ -n "$new_network_number" ]; then - $LOGGER "New Network Number: $new_network_number" -fi - -if [ -n "$new_broadcast_address" ]; then - $LOGGER "New Broadcast Address: $new_broadcast_address" -fi - if [ -x $NETSTAT ]; then if_defaulroute=`$NETSTAT -rn | $GREP "^default" | $AWK '{print $6}'` else @@ -237,6 +238,7 @@ add_new_address sleep 1 if [ -n "$new_routers" ]; then + $LOGGER "New Routers ($interface): $new_routers" set "$new_routers" if ping -q -c 1 -w 1 "$1"; then if [ "$new_ip_address" != "$alias_ip_address" ]; then @@ -249,8 +251,6 @@ fi fi ifconfig $interface inet -alias $new_ip_address $medium - # XXX Why not a delete_old_address as before all other invocations of - # delete_old_routes? delete_old_routes exit 1 ;; From owner-p4-projects@FreeBSD.ORG Fri Dec 3 00:41:44 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E82A916A4D0; Fri, 3 Dec 2004 00:41:43 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A6BB216A4CE for ; Fri, 3 Dec 2004 00:41:43 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7AE3A43D53 for ; Fri, 3 Dec 2004 00:41:43 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iB30fhtY016514 for ; Fri, 3 Dec 2004 00:41:43 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB30fhO1016511 for perforce@freebsd.org; Fri, 3 Dec 2004 00:41:43 GMT (envelope-from sam@freebsd.org) Date: Fri, 3 Dec 2004 00:41:43 GMT Message-Id: <200412030041.iB30fhO1016511@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66288 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Dec 2004 00:41:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=66288 Change 66288 by sam@sam_ebb on 2004/12/03 00:40:43 fix horrible braino Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_proto.c#11 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_proto.c#11 (text+ko) ==== @@ -40,6 +40,7 @@ #include "opt_inet.h" #include +#include #include #include @@ -84,26 +85,6 @@ "WME_UPSD", }; -#define IEEE80211_AUTH_MAX (IEEE80211_AUTH_WPA+1) -/* XXX well-known names */ -static const char *auth_modnames[IEEE80211_AUTH_MAX] = { - "wlan_internal", /* IEEE80211_AUTH_NONE */ - "wlan_internal", /* IEEE80211_AUTH_OPEN */ - "wlan_internal", /* IEEE80211_AUTH_SHARED */ - "wlan_xauth", /* IEEE80211_AUTH_8021X */ - "wlan_internal", /* IEEE80211_AUTH_AUTO */ - "wlan_xauth", /* IEEE80211_AUTH_WPA */ -}; -static const struct ieee80211_authenticator *authenticators[IEEE80211_AUTH_MAX]; - -static const struct ieee80211_authenticator auth_internal = { - .ia_name = "wlan_internal", - .ia_attach = NULL, - .ia_detach = NULL, - .ia_node_join = NULL, - .ia_node_leave = NULL, -}; - static int ieee80211_newstate(struct ieee80211com *, enum ieee80211_state, int); void @@ -135,10 +116,6 @@ /* initialize management frame handlers */ ic->ic_recv_mgmt = ieee80211_recv_mgmt; ic->ic_send_mgmt = ieee80211_send_mgmt; - - ieee80211_authenticator_register(IEEE80211_AUTH_OPEN, &auth_internal); - ieee80211_authenticator_register(IEEE80211_AUTH_SHARED, &auth_internal); - ieee80211_authenticator_register(IEEE80211_AUTH_AUTO, &auth_internal); } void @@ -156,10 +133,6 @@ IF_DRAIN(&ic->ic_mgtq); mtx_destroy(&ic->ic_mgtq.ifq_mtx); - ieee80211_authenticator_unregister(IEEE80211_AUTH_OPEN); - ieee80211_authenticator_unregister(IEEE80211_AUTH_SHARED); - ieee80211_authenticator_unregister(IEEE80211_AUTH_AUTO); - /* * Detach any ACL'ator. */ @@ -171,6 +144,38 @@ * Simple-minded authenticator module support. */ +#define IEEE80211_AUTH_MAX (IEEE80211_AUTH_WPA+1) +/* XXX well-known names */ +static const char *auth_modnames[IEEE80211_AUTH_MAX] = { + "wlan_internal", /* IEEE80211_AUTH_NONE */ + "wlan_internal", /* IEEE80211_AUTH_OPEN */ + "wlan_internal", /* IEEE80211_AUTH_SHARED */ + "wlan_xauth", /* IEEE80211_AUTH_8021X */ + "wlan_internal", /* IEEE80211_AUTH_AUTO */ + "wlan_xauth", /* IEEE80211_AUTH_WPA */ +}; +static const struct ieee80211_authenticator *authenticators[IEEE80211_AUTH_MAX]; + +static const struct ieee80211_authenticator auth_internal = { + .ia_name = "wlan_internal", + .ia_attach = NULL, + .ia_detach = NULL, + .ia_node_join = NULL, + .ia_node_leave = NULL, +}; + +/* + * Setup internal authenticators once; they are never unregistered. + */ +static void +ieee80211_auth_setup(void) +{ + ieee80211_authenticator_register(IEEE80211_AUTH_OPEN, &auth_internal); + ieee80211_authenticator_register(IEEE80211_AUTH_SHARED, &auth_internal); + ieee80211_authenticator_register(IEEE80211_AUTH_AUTO, &auth_internal); +} +SYSINIT(wlan_auth, SI_SUB_DRIVERS, SI_ORDER_FIRST, ieee80211_auth_setup, NULL); + const struct ieee80211_authenticator * ieee80211_authenticator_get(int auth) { From owner-p4-projects@FreeBSD.ORG Fri Dec 3 01:02:16 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E064B16A4D1; Fri, 3 Dec 2004 01:02:15 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B636416A4CF for ; Fri, 3 Dec 2004 01:02:15 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A667043D49 for ; Fri, 3 Dec 2004 01:02:15 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iB312Fij024493 for ; Fri, 3 Dec 2004 01:02:15 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB312FJR024490 for perforce@freebsd.org; Fri, 3 Dec 2004 01:02:15 GMT (envelope-from sam@freebsd.org) Date: Fri, 3 Dec 2004 01:02:15 GMT Message-Id: <200412030102.iB312FJR024490@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66290 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Dec 2004 01:02:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=66290 Change 66290 by sam@sam_ebb on 2004/12/03 01:02:08 hack: reorder the unicast cipher selectors in WPA/RSN ie's to match that used by hostapd; otherwise the supplicant may barf if it blindly compares the ie in the probe response to the ie in the PTK handshake Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_output.c#19 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_output.c#19 (text+ko) ==== @@ -683,14 +683,14 @@ /* unicast cipher list */ selcnt = frm; ADDSHORT(frm, 0); /* selector count */ + if (rsn->rsn_ucastcipherset & (1<rsn_ucastcipherset & (1<rsn_ucastcipherset & (1<rsn_ucastcipherset & (1<rsn_ucastcipherset & (1<rsn_ucastcipherset & (1<ic_flags & IEEE80211_F_WPA, ("no WPA/RSN!")); + if (ic->ic_flags & IEEE80211_F_WPA2) + frm = ieee80211_setup_rsn_ie(ic, frm); if (ic->ic_flags & IEEE80211_F_WPA1) frm = ieee80211_setup_wpa_ie(ic, frm); - if (ic->ic_flags & IEEE80211_F_WPA2) - frm = ieee80211_setup_rsn_ie(ic, frm); return frm; } From owner-p4-projects@FreeBSD.ORG Fri Dec 3 01:02:17 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1742F16A4E6; Fri, 3 Dec 2004 01:02:16 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A3B2616A4CE for ; Fri, 3 Dec 2004 01:02:15 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 56CC943D1D for ; Fri, 3 Dec 2004 01:02:15 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iB312FcC024487 for ; Fri, 3 Dec 2004 01:02:15 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB312EIX024484 for perforce@freebsd.org; Fri, 3 Dec 2004 01:02:14 GMT (envelope-from peter@freebsd.org) Date: Fri, 3 Dec 2004 01:02:14 GMT Message-Id: <200412030102.iB312EIX024484@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 66289 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Dec 2004 01:02:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=66289 Change 66289 by peter@peter_overcee on 2004/12/03 01:01:14 IFC @66287 (pick up acpi merges) Affected files ... .. //depot/projects/hammer/bin/sh/jobs.c#11 integrate .. //depot/projects/hammer/bin/sh/sh.1#12 integrate .. //depot/projects/hammer/sbin/dump/dump.h#8 integrate .. //depot/projects/hammer/sbin/dump/itime.c#4 integrate .. //depot/projects/hammer/share/man/man9/style.9#17 integrate .. //depot/projects/hammer/share/zoneinfo/europe#5 integrate .. //depot/projects/hammer/share/zoneinfo/northamerica#5 integrate .. //depot/projects/hammer/share/zoneinfo/southamerica#6 integrate .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#118 integrate .. //depot/projects/hammer/sys/arm/arm/trap.c#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dbcmds.c#13 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/hwregs.c#11 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/hwsleep.c#11 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/osunixxf.c#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/uteval.c#10 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utglobal.c#12 integrate .. //depot/projects/hammer/sys/dev/acpica/Osd/OsdInterrupt.c#8 integrate .. //depot/projects/hammer/sys/dev/acpica/Osd/OsdSchedule.c#10 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi.c#49 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_acad.c#16 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_cmbat.c#20 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_if.m#3 integrate .. //depot/projects/hammer/sys/dev/drm/drm_os_freebsd.h#14 integrate .. //depot/projects/hammer/sys/dev/pci/pci.c#28 integrate .. //depot/projects/hammer/sys/fs/msdosfs/denode.h#7 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_denode.c#15 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_vnops.c#18 integrate .. //depot/projects/hammer/sys/i386/i386/pmap.c#63 integrate .. //depot/projects/hammer/sys/kern/kern_descrip.c#39 integrate .. //depot/projects/hammer/sys/kern/uipc_domain.c#12 integrate .. //depot/projects/hammer/sys/sys/filedesc.h#12 integrate .. //depot/projects/hammer/tools/regression/usr.bin/make/Makefile#13 integrate .. //depot/projects/hammer/tools/regression/usr.bin/make/shell_test#2 delete .. //depot/projects/hammer/tools/regression/usr.bin/make/shell_test.sh#1 branch Differences ... ==== //depot/projects/hammer/bin/sh/jobs.c#11 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/jobs.c,v 1.67 2004/04/06 20:06:51 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/jobs.c,v 1.68 2004/12/02 13:12:43 maxim Exp $"); #include #include @@ -926,7 +926,8 @@ in_dowait--; if (breakwaitcmd != 0) { breakwaitcmd = 0; - return -1; + if (pid <= 0) + return -1; } if (pid <= 0) return pid; ==== //depot/projects/hammer/bin/sh/sh.1#12 (text+ko) ==== @@ -29,7 +29,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 -.\" $FreeBSD: src/bin/sh/sh.1,v 1.93 2004/11/01 19:05:04 alfred Exp $ +.\" $FreeBSD: src/bin/sh/sh.1,v 1.94 2004/12/02 13:13:27 maxim Exp $ .\" .Dd July 3, 2004 .Dt SH 1 @@ -269,7 +269,7 @@ If this option is not set, traps are executed after the child exits, as specified in -.St -p1003.2 +.St -p1003.2 . This nonstandard option is useful for putting guarding shells around children that block signals. The surrounding shell may kill the child ==== //depot/projects/hammer/sbin/dump/dump.h#8 (text+ko) ==== @@ -28,7 +28,7 @@ * * @(#)dump.h 8.2 (Berkeley) 4/28/95 * - * $FreeBSD: src/sbin/dump/dump.h,v 1.26 2004/04/13 02:58:06 green Exp $ + * $FreeBSD: src/sbin/dump/dump.h,v 1.27 2004/12/02 13:56:53 maxim Exp $ */ /* @@ -164,13 +164,13 @@ time_t dd_ddate; }; int nddates; /* number of records (might be zero) */ -int ddates_in; /* we have read the increment file */ struct dumpdates **ddatev; /* the arrayfied version */ void initdumptimes(void); void getdumptime(void); void putdumptime(void); #define ITITERATE(i, ddp) \ - for (ddp = ddatev[i = 0]; i < nddates; ddp = ddatev[++i]) + if (ddatev != NULL) \ + for (ddp = ddatev[i = 0]; i < nddates; ddp = ddatev[++i]) void sig(int signo); ==== //depot/projects/hammer/sbin/dump/itime.c#4 (text+ko) ==== @@ -32,7 +32,7 @@ static char sccsid[] = "@(#)itime.c 8.1 (Berkeley) 6/5/93"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/dump/itime.c,v 1.15 2004/04/09 19:58:27 markm Exp $"; + "$FreeBSD: src/sbin/dump/itime.c,v 1.16 2004/12/02 13:56:53 maxim Exp $"; #endif /* not lint */ #include @@ -60,7 +60,6 @@ SLIST_HEAD(dthead, dumptime) dthead = SLIST_HEAD_INITIALIZER(dthead); struct dumpdates **ddatev = 0; int nddates = 0; -int ddates_in = 0; static void dumprecout(FILE *, const struct dumpdates *); static int getrecord(FILE *, struct dumpdates *); @@ -113,7 +112,6 @@ SLIST_INSERT_HEAD(&dthead, dtwalk, dt_list); } - ddates_in = 1; /* * arrayify the list, leaving enough room for the additional * record that we may have to add to the ddate structure @@ -177,7 +175,6 @@ free((char *)ddatev); ddatev = 0; nddates = 0; - ddates_in = 0; readdumptimes(df); if (fseek(df, 0L, 0) < 0) quit("fseek: %s\n", strerror(errno)); ==== //depot/projects/hammer/share/man/man9/style.9#17 (text+ko) ==== @@ -43,7 +43,7 @@ * Style guide for FreeBSD. Based on the CSRG's KNF (Kernel Normal Form). * * @(#)style 1.14 (Berkeley) 4/28/95 - * $FreeBSD: src/share/man/man9/style.9,v 1.110 2004/07/03 18:29:24 ru Exp $ + * $FreeBSD: src/share/man/man9/style.9,v 1.111 2004/12/02 23:20:17 dds Exp $ */ /* @@ -86,7 +86,7 @@ #endif #include -__FBSDID("$FreeBSD: src/share/man/man9/style.9,v 1.110 2004/07/03 18:29:24 ru Exp $"); +__FBSDID("$FreeBSD: src/share/man/man9/style.9,v 1.111 2004/12/02 23:20:17 dds Exp $"); .Ed .Pp Leave another blank line before the header files. @@ -278,7 +278,7 @@ Separate these identifiers from asterisks using a single space. .Pp When declaring variables in structures, declare them sorted by use, then -by size, and then in alphabetical order. +by size (largest to smallest), and then in alphabetical order. The first category normally does not apply, but there are exceptions. Each one gets its own line. Try to make the structure ==== //depot/projects/hammer/share/zoneinfo/europe#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# @(#)europe 7.88 +# @(#)europe 7.90 # This data is by no means authoritative; if you think you know better, # go ahead and edit the file (and please send any changes to @@ -708,7 +708,7 @@ # see Serbia and Montenegro # Cyprus -# See the `asia' file. +# Please see the `asia' file for Asia/Nicosia. # Czech Republic # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S @@ -1055,6 +1055,11 @@ 1:00 Germany CE%sT 1980 1:00 EU CE%sT +# Georgia +# Please see the "asia" file for Asia/Tbilisi. +# Herodotus (Histories, IV.45) says Georgia north of the Phasis (now Rioni) +# is in Europe. Our reference location Tbilisi is in the Asian part. + # Gibraltar # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Europe/Gibraltar -0:21:24 - LMT 1880 Aug 2 @@ -1611,7 +1616,7 @@ # From Paul Eggert (2001-05-01): # # Actually, Jan Mayen was never occupied by Germany during World War II, -# so it must have diverged from Oslo time during the war, as Olso was +# so it must have diverged from Oslo time during the war, as Oslo was # keeping Berlin time. # # says that the meteorologists ==== //depot/projects/hammer/share/zoneinfo/northamerica#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# @(#)northamerica 7.69 +# @(#)northamerica 7.70 # also includes Central America and the Caribbean # This data is by no means authoritative; if you think you know better, @@ -1731,6 +1731,15 @@ # to DST--and one more hour on 1999-04-04--when the announcers will have # returned to Baltimore, which switches on that date.) +# From Evert van der Veer via Steffen Thorsen (2004-10-28): +# Cuba is not going back to standard time this year. +# From Paul Eggert (2004-10-28): +# http://www.granma.cu/ingles/2004/septiembre/juev30/41medid-i.html +# says that it's due to a problem at the Antonio Guiteras +# thermoelectric plant, and says "This October there will be no return +# to normal hours (after daylight saving time)". +# For now, let's assume that it's a one-year temporary measure. + # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Cuba 1928 only - Jun 10 0:00 1:00 D Rule Cuba 1928 only - Oct 10 0:00 0 S @@ -1759,8 +1768,9 @@ Rule Cuba 1996 only - Oct 6 0:00s 0 S Rule Cuba 1997 only - Oct 12 0:00s 0 S Rule Cuba 1998 1999 - Mar lastSun 0:00s 1:00 D -Rule Cuba 1998 max - Oct lastSun 0:00s 0 S +Rule Cuba 1998 2003 - Oct lastSun 0:00s 0 S Rule Cuba 2000 max - Apr Sun>=1 0:00s 1:00 D +Rule Cuba 2005 max - Oct lastSun 0:00s 0 S # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone America/Havana -5:29:28 - LMT 1890 ==== //depot/projects/hammer/share/zoneinfo/southamerica#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# @(#)southamerica 7.54 +# @(#)southamerica 7.55 # This data is by no means authoritative; if you think you know better, # go ahead and edit the file (and please send any changes to @@ -671,7 +671,7 @@ # Mato Grosso (MT) Zone America/Cuiaba -3:44:20 - LMT 1914 -4:00 Brazil AM%sT 2003 Sep 24 - -4:00 - AMT 2004 Oct 4 + -4:00 - AMT 2004 Oct 1 -4:00 Brazil AM%sT # # west Para (PA), Rondonia (RO) ==== //depot/projects/hammer/sys/amd64/amd64/pmap.c#118 (text+ko) ==== @@ -75,7 +75,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.509 2004/11/27 06:51:33 das Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.510 2004/12/02 04:06:40 alc Exp $"); /* * Manages physical address maps. @@ -318,18 +318,26 @@ /* Return a pointer to the PT slot that corresponds to a VA */ static __inline pt_entry_t * +pmap_pde_to_pte(pd_entry_t *pde, vm_offset_t va) +{ + pt_entry_t *pte; + + pte = (pt_entry_t *)PHYS_TO_DMAP(*pde & PG_FRAME); + return (&pte[pmap_pte_index(va)]); +} + +/* Return a pointer to the PT slot that corresponds to a VA */ +static __inline pt_entry_t * pmap_pte(pmap_t pmap, vm_offset_t va) { pd_entry_t *pde; - pt_entry_t *pte; pde = pmap_pde(pmap, va); if (pde == NULL || (*pde & PG_V) == 0) return NULL; if ((*pde & PG_PS) != 0) /* compat with i386 pmap_pte() */ return ((pt_entry_t *)pde); - pte = (pt_entry_t *)PHYS_TO_DMAP(*pde & PG_FRAME); - return (&pte[pmap_pte_index(va)]); + return (pmap_pde_to_pte(pde, va)); } @@ -337,7 +345,6 @@ pmap_pte_pde(pmap_t pmap, vm_offset_t va, pd_entry_t *ptepde) { pd_entry_t *pde; - pt_entry_t *pte; pde = pmap_pde(pmap, va); if (pde == NULL || (*pde & PG_V) == 0) @@ -345,8 +352,7 @@ *ptepde = *pde; if ((*pde & PG_PS) != 0) /* compat with i386 pmap_pte() */ return ((pt_entry_t *)pde); - pte = (pt_entry_t *)PHYS_TO_DMAP(*pde & PG_FRAME); - return (&pte[pmap_pte_index(va)]); + return (pmap_pde_to_pte(pde, va)); } @@ -1630,9 +1636,9 @@ if (va_next > eva) va_next = eva; - for (; sva != va_next; sva += PAGE_SIZE) { - pte = pmap_pte(pmap, sva); - if (pte == NULL || *pte == 0) + for (pte = pmap_pde_to_pte(pde, sva); sva != va_next; pte++, + sva += PAGE_SIZE) { + if (*pte == 0) continue; anyvalid = 1; if (pmap_remove_pte(pmap, pte, sva, ptpaddr)) @@ -1722,6 +1728,7 @@ pml4_entry_t *pml4e; pdp_entry_t *pdpe; pd_entry_t ptpaddr, *pde; + pt_entry_t *pte; int anychanged; if ((prot & VM_PROT_READ) == VM_PROT_NONE) { @@ -1777,14 +1784,11 @@ if (va_next > eva) va_next = eva; - for (; sva != va_next; sva += PAGE_SIZE) { + for (pte = pmap_pde_to_pte(pde, sva); sva != va_next; pte++, + sva += PAGE_SIZE) { pt_entry_t obits, pbits; - pt_entry_t *pte; vm_page_t m; - pte = pmap_pte(pmap, sva); - if (pte == NULL) - continue; retry: obits = pbits = *pte; if (pbits & PG_MANAGED) { ==== //depot/projects/hammer/sys/arm/arm/trap.c#6 (text+ko) ==== @@ -82,7 +82,7 @@ #include "opt_ktrace.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/trap.c,v 1.5 2004/11/27 06:51:34 das Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/trap.c,v 1.6 2004/12/02 23:31:48 cognet Exp $"); #include @@ -94,6 +94,7 @@ #include #include #include +#include #ifdef KTRACE #include #include ==== //depot/projects/hammer/sys/contrib/dev/acpica/dbcmds.c#13 (text+ko) ==== @@ -1,7 +1,7 @@ /******************************************************************************* * * Module Name: dbcmds - debug commands and output routines - * $Revision: 113 $ + * $Revision: 115 $ * ******************************************************************************/ @@ -124,6 +124,9 @@ #include "acresrc.h" #include "acdisasm.h" + +#include "acparser.h" + #ifdef ACPI_DEBUGGER #define _COMPONENT ACPI_CA_DEBUGGER @@ -157,6 +160,18 @@ }; +/******************************************************************************* + * + * FUNCTION: AcpiDbSleep + * + * PARAMETERS: ObjectArg - Desired sleep state (0-5) + * + * RETURN: Status + * + * DESCRIPTION: Simulate a sleep/wake sequence + * + ******************************************************************************/ + ACPI_STATUS AcpiDbSleep ( char *ObjectArg) @@ -507,6 +522,71 @@ /******************************************************************************* * + * FUNCTION: AcpiDbDisassembleMethod + * + * PARAMETERS: Method - Name of control method + * + * RETURN: None + * + * DESCRIPTION: Display disassembled AML (ASL) starting from Op for the number + * of statements specified. + * + ******************************************************************************/ + +ACPI_STATUS +AcpiDbDisassembleMethod ( + char *Name) +{ + ACPI_STATUS Status; + ACPI_PARSE_OBJECT *Op; + ACPI_WALK_STATE *WalkState; + ACPI_OPERAND_OBJECT *ObjDesc; + ACPI_NAMESPACE_NODE *Method; + + + Method = ACPI_CAST_PTR (ACPI_NAMESPACE_NODE, ACPI_STRTOUL (Name, NULL, 16)); + if (!Method) + { + return (AE_BAD_PARAMETER); + } + + ObjDesc = Method->Object; + + Op = AcpiPsCreateScopeOp (); + if (!Op) + { + return (AE_NO_MEMORY); + } + + /* Create and initialize a new walk state */ + + WalkState = AcpiDsCreateWalkState (0, Op, NULL, NULL); + if (!WalkState) + { + return (AE_NO_MEMORY); + } + + Status = AcpiDsInitAmlWalk (WalkState, Op, NULL, + ObjDesc->Method.AmlStart, + ObjDesc->Method.AmlLength, NULL, 1); + if (ACPI_FAILURE (Status)) + { + return (Status); + } + + /* Parse the AML */ + + WalkState->ParseFlags &= ~ACPI_PARSE_DELETE_TREE; + Status = AcpiPsParseAml (WalkState); + + AcpiDmDisassemble (NULL, Op, 0); + AcpiPsDeleteParseTree (Op); + return (AE_OK); +} + + +/******************************************************************************* + * * FUNCTION: AcpiDbDumpNamespace * * PARAMETERS: StartArg - Node to begin namespace dump @@ -838,6 +918,8 @@ if (ObjDesc) { + AcpiOsPrintf (" %p/%p", ObjHandle, ObjDesc); + switch (ACPI_GET_OBJECT_TYPE (ObjDesc)) { case ACPI_TYPE_METHOD: ==== //depot/projects/hammer/sys/contrib/dev/acpica/hwregs.c#11 (text+ko) ==== @@ -3,7 +3,7 @@ * * Module Name: hwregs - Read/write access functions for the various ACPI * control and status registers. - * $Revision: 156 $ + * $Revision: 162 $ * ******************************************************************************/ @@ -135,6 +135,7 @@ * RETURN: none * * DESCRIPTION: Clears all fixed and general purpose status bits + * THIS FUNCTION MUST BE CALLED WITH INTERRUPTS DISABLED * ******************************************************************************/ @@ -182,7 +183,7 @@ /* Clear the GPE Bits in all GPE registers in all GPE blocks */ - Status = AcpiEvWalkGpeList (AcpiHwClearGpeBlock); + Status = AcpiEvWalkGpeList (AcpiHwClearGpeBlock, ACPI_ISR); UnlockAndExit: if (Flags & ACPI_MTX_LOCK) @@ -337,8 +338,8 @@ * ReturnValue - Value that was read from the register * Flags - Lock the hardware or not * - * RETURN: Value is read from specified Register. Value returned is - * normalized to bit0 (is shifted all the way right) + * RETURN: Status and the value read from specified Register. Value + * returned is normalized to bit0 (is shifted all the way right) * * DESCRIPTION: ACPI BitRegister read function. * @@ -375,6 +376,8 @@ } } + /* Read from the register */ + Status = AcpiHwRegisterRead (ACPI_MTX_DO_NOT_LOCK, BitRegInfo->ParentRegister, &RegisterValue); @@ -406,10 +409,10 @@ * * PARAMETERS: RegisterId - ID of ACPI BitRegister to access * Value - (only used on write) value to write to the - * Register, NOT pre-normalized to the bit pos. + * Register, NOT pre-normalized to the bit pos * Flags - Lock the hardware or not * - * RETURN: None + * RETURN: Status * * DESCRIPTION: ACPI Bit Register write function. * @@ -562,10 +565,11 @@ * * FUNCTION: AcpiHwRegisterRead * - * PARAMETERS: UseLock - Mutex hw access. - * RegisterId - RegisterID + Offset. + * PARAMETERS: UseLock - Mutex hw access + * RegisterId - RegisterID + Offset + * ReturnValue - Value that was read from the register * - * RETURN: Value read or written. + * RETURN: Status and the value read. * * DESCRIPTION: Acpi register read function. Registers are read at the * given offset. @@ -681,10 +685,11 @@ * * FUNCTION: AcpiHwRegisterWrite * - * PARAMETERS: UseLock - Mutex hw access. - * RegisterId - RegisterID + Offset. + * PARAMETERS: UseLock - Mutex hw access + * RegisterId - RegisterID + Offset + * Value - The value to write * - * RETURN: Value read or written. + * RETURN: Status * * DESCRIPTION: Acpi register Write function. Registers are written at the * given offset. @@ -807,11 +812,11 @@ * * PARAMETERS: Width - 8, 16, or 32 * Value - Where the value is returned - * Register - GAS register structure + * Reg - GAS register structure * * RETURN: Status * - * DESCRIPTION: Read from either memory, IO, or PCI config space. + * DESCRIPTION: Read from either memory or IO space. * ******************************************************************************/ @@ -821,8 +826,7 @@ UINT32 *Value, ACPI_GENERIC_ADDRESS *Reg) { - ACPI_PCI_ID PciId; - UINT16 PciRegister; + UINT64 Address; ACPI_STATUS Status; @@ -834,47 +838,41 @@ * a non-zero address within. However, don't return an error * because the PM1A/B code must not fail if B isn't present. */ - if ((!Reg) || - (!ACPI_VALID_ADDRESS (Reg->Address))) + if (!Reg) + { + return (AE_OK); + } + + /* Get a local copy of the address. Handles possible alignment issues */ + + ACPI_MOVE_64_TO_64 (&Address, &Reg->Address); + if (!ACPI_VALID_ADDRESS (Address)) { return (AE_OK); } *Value = 0; /* - * Three address spaces supported: - * Memory, IO, or PCI_Config. + * Two address spaces supported: Memory or IO. + * PCI_Config is not supported here because the GAS struct is insufficient */ switch (Reg->AddressSpaceId) { case ACPI_ADR_SPACE_SYSTEM_MEMORY: Status = AcpiOsReadMemory ( - (ACPI_PHYSICAL_ADDRESS) ACPI_GET_ADDRESS (Reg->Address), + (ACPI_PHYSICAL_ADDRESS) ACPI_GET_ADDRESS (Address), Value, Width); break; case ACPI_ADR_SPACE_SYSTEM_IO: - Status = AcpiOsReadPort ((ACPI_IO_ADDRESS) ACPI_GET_ADDRESS (Reg->Address), + Status = AcpiOsReadPort ((ACPI_IO_ADDRESS) ACPI_GET_ADDRESS (Address), Value, Width); break; - case ACPI_ADR_SPACE_PCI_CONFIG: - - PciId.Segment = 0; - PciId.Bus = 0; - PciId.Device = ACPI_PCI_DEVICE (ACPI_GET_ADDRESS (Reg->Address)); - PciId.Function = ACPI_PCI_FUNCTION (ACPI_GET_ADDRESS (Reg->Address)); - PciRegister = (UINT16) ACPI_PCI_REGISTER (ACPI_GET_ADDRESS (Reg->Address)); - - Status = AcpiOsReadPciConfiguration (&PciId, PciRegister, - Value, Width); - break; - - default: ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Unsupported address space: %X\n", Reg->AddressSpaceId)); @@ -883,7 +881,7 @@ ACPI_DEBUG_PRINT ((ACPI_DB_IO, "Read: %8.8X width %2d from %8.8X%8.8X (%s)\n", *Value, Width, - ACPI_FORMAT_UINT64 (ACPI_GET_ADDRESS (Reg->Address)), + ACPI_FORMAT_UINT64 (ACPI_GET_ADDRESS (Address)), AcpiUtGetRegionName (Reg->AddressSpaceId))); return (Status); @@ -896,11 +894,11 @@ * * PARAMETERS: Width - 8, 16, or 32 * Value - To be written - * Register - GAS register structure + * Reg - GAS register structure * * RETURN: Status * - * DESCRIPTION: Write to either memory, IO, or PCI config space. + * DESCRIPTION: Write to either memory or IO space. * ******************************************************************************/ @@ -910,8 +908,7 @@ UINT32 Value, ACPI_GENERIC_ADDRESS *Reg) { - ACPI_PCI_ID PciId; - UINT16 PciRegister; + UINT64 Address; ACPI_STATUS Status; @@ -923,46 +920,40 @@ * a non-zero address within. However, don't return an error * because the PM1A/B code must not fail if B isn't present. */ - if ((!Reg) || - (!ACPI_VALID_ADDRESS (Reg->Address))) + if (!Reg) + { + return (AE_OK); + } + + /* Get a local copy of the address. Handles possible alignment issues */ + + ACPI_MOVE_64_TO_64 (&Address, &Reg->Address); + if (!ACPI_VALID_ADDRESS (Address)) { return (AE_OK); } /* - * Three address spaces supported: - * Memory, IO, or PCI_Config. + * Two address spaces supported: Memory or IO. + * PCI_Config is not supported here because the GAS struct is insufficient */ switch (Reg->AddressSpaceId) { case ACPI_ADR_SPACE_SYSTEM_MEMORY: Status = AcpiOsWriteMemory ( - (ACPI_PHYSICAL_ADDRESS) ACPI_GET_ADDRESS (Reg->Address), + (ACPI_PHYSICAL_ADDRESS) ACPI_GET_ADDRESS (Address), Value, Width); break; case ACPI_ADR_SPACE_SYSTEM_IO: - Status = AcpiOsWritePort ((ACPI_IO_ADDRESS) ACPI_GET_ADDRESS (Reg->Address), + Status = AcpiOsWritePort ((ACPI_IO_ADDRESS) ACPI_GET_ADDRESS (Address), Value, Width); break; - case ACPI_ADR_SPACE_PCI_CONFIG: - - PciId.Segment = 0; - PciId.Bus = 0; - PciId.Device = ACPI_PCI_DEVICE (ACPI_GET_ADDRESS (Reg->Address)); - PciId.Function = ACPI_PCI_FUNCTION (ACPI_GET_ADDRESS (Reg->Address)); - PciRegister = (UINT16) ACPI_PCI_REGISTER (ACPI_GET_ADDRESS (Reg->Address)); - - Status = AcpiOsWritePciConfiguration (&PciId, PciRegister, - (ACPI_INTEGER) Value, Width); - break; - - default: ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Unsupported address space: %X\n", Reg->AddressSpaceId)); @@ -971,7 +962,7 @@ ACPI_DEBUG_PRINT ((ACPI_DB_IO, "Wrote: %8.8X width %2d to %8.8X%8.8X (%s)\n", Value, Width, - ACPI_FORMAT_UINT64 (ACPI_GET_ADDRESS (Reg->Address)), + ACPI_FORMAT_UINT64 (ACPI_GET_ADDRESS (Address)), AcpiUtGetRegionName (Reg->AddressSpaceId))); return (Status); ==== //depot/projects/hammer/sys/contrib/dev/acpica/hwsleep.c#11 (text+ko) ==== @@ -2,7 +2,7 @@ /****************************************************************************** * * Name: hwsleep.c - ACPI Hardware Sleep/Wake Interface - * $Revision: 69 $ + * $Revision: 70 $ * *****************************************************************************/ @@ -381,14 +381,14 @@ * 1) Disable/Clear all GPEs * 2) Enable all wakeup GPEs */ - Status = AcpiHwDisableAllGpes (); + Status = AcpiHwDisableAllGpes (ACPI_ISR); if (ACPI_FAILURE (Status)) { return_ACPI_STATUS (Status); } AcpiGbl_SystemAwakeAndRunning = FALSE; - Status = AcpiHwEnableAllWakeupGpes (); + Status = AcpiHwEnableAllWakeupGpes (ACPI_ISR); if (ACPI_FAILURE (Status)) { return_ACPI_STATUS (Status); @@ -543,14 +543,14 @@ * 1) Disable/Clear all GPEs * 2) Enable all wakeup GPEs */ - Status = AcpiHwDisableAllGpes (); + Status = AcpiHwDisableAllGpes (ACPI_ISR); if (ACPI_FAILURE (Status)) { return_ACPI_STATUS (Status); } AcpiGbl_SystemAwakeAndRunning = FALSE; - Status = AcpiHwEnableAllWakeupGpes (); + Status = AcpiHwEnableAllWakeupGpes (ACPI_ISR); if (ACPI_FAILURE (Status)) { return_ACPI_STATUS (Status); @@ -582,6 +582,7 @@ * RETURN: Status * * DESCRIPTION: Perform OS-independent ACPI cleanup after a sleep + * Called with interrupts ENABLED. * ******************************************************************************/ @@ -677,14 +678,14 @@ * 1) Disable/Clear all GPEs * 2) Enable all runtime GPEs */ - Status = AcpiHwDisableAllGpes (); + Status = AcpiHwDisableAllGpes (ACPI_NOT_ISR); if (ACPI_FAILURE (Status)) { return_ACPI_STATUS (Status); } AcpiGbl_SystemAwakeAndRunning = TRUE; - Status = AcpiHwEnableAllRuntimeGpes (); + Status = AcpiHwEnableAllRuntimeGpes (ACPI_NOT_ISR); if (ACPI_FAILURE (Status)) { return_ACPI_STATUS (Status); ==== //depot/projects/hammer/sys/contrib/dev/acpica/osunixxf.c#5 (text+ko) ==== @@ -185,7 +185,15 @@ ACPI_POINTER *Address) { +#if 0 + /* The supporting code for this is not yet available. + * Return to the old situation for now. + */ return (AeLocalGetRootPointer(Flags, Address)); +#else + return (AE_OK); +#endif + } ==== //depot/projects/hammer/sys/contrib/dev/acpica/uteval.c#10 (text+ko) ==== @@ -771,7 +771,7 @@ { ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "%s on Device %4.4s, %s\n", - (char *) (uintptr_t)AcpiGbl_HighestDstateNames[i], + (char *) (uintptr_t) AcpiGbl_HighestDstateNames[i], AcpiUtGetNodeName (DeviceNode), AcpiFormatException (Status))); ==== //depot/projects/hammer/sys/contrib/dev/acpica/utglobal.c#12 (text+ko) ==== @@ -1,7 +1,7 @@ /****************************************************************************** * * Module Name: utglobal - Global variables for the ACPI subsystem - * $Revision: 201 $ + * $Revision: 202 $ * *****************************************************************************/ @@ -947,6 +947,7 @@ AcpiGbl_SystemNotify.Handler = NULL; AcpiGbl_DeviceNotify.Handler = NULL; + AcpiGbl_ExceptionHandler = NULL; AcpiGbl_InitHandler = NULL; /* Global "typed" ACPI table pointers */ ==== //depot/projects/hammer/sys/dev/acpica/Osd/OsdInterrupt.c#8 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/Osd/OsdInterrupt.c,v 1.18 2004/08/13 06:22:24 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/Osd/OsdInterrupt.c,v 1.19 2004/12/02 00:25:35 marks Exp $ */ /* @@ -48,7 +48,7 @@ ACPI_STATUS AcpiOsInstallInterruptHandler(UINT32 InterruptNumber, - OSD_HANDLER ServiceRoutine, void *Context) + ACPI_OSD_HANDLER ServiceRoutine, void *Context) { struct acpi_softc *sc; @@ -105,7 +105,7 @@ } ACPI_STATUS -AcpiOsRemoveInterruptHandler(UINT32 InterruptNumber, OSD_HANDLER ServiceRoutine) +AcpiOsRemoveInterruptHandler(UINT32 InterruptNumber, ACPI_OSD_HANDLER ServiceRoutine) { struct acpi_softc *sc; ==== //depot/projects/hammer/sys/dev/acpica/Osd/OsdSchedule.c#10 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/Osd/OsdSchedule.c,v 1.29 2004/08/13 06:22:26 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/Osd/OsdSchedule.c,v 1.30 2004/12/02 00:25:35 marks Exp $ */ /* @@ -60,7 +60,7 @@ struct acpi_task { struct task at_task; - OSD_EXECUTION_CALLBACK at_function; + ACPI_OSD_EXEC_CALLBACK at_function; void *at_context; }; @@ -98,7 +98,7 @@ acpi_task_thread(void *arg) { struct acpi_task_queue *atq; - OSD_EXECUTION_CALLBACK Function; + ACPI_OSD_EXEC_CALLBACK Function; void *Context; ACPI_LOCK(taskq); @@ -108,7 +108,7 @@ STAILQ_REMOVE_HEAD(&acpi_task_queue, at_q); ACPI_UNLOCK(taskq); - Function = (OSD_EXECUTION_CALLBACK)atq->at->at_function; + Function = (ACPI_OSD_EXEC_CALLBACK)atq->at->at_function; Context = atq->at->at_context; Function(Context); @@ -143,7 +143,7 @@ /* This function is called in interrupt context. */ ACPI_STATUS -AcpiOsQueueForExecution(UINT32 Priority, OSD_EXECUTION_CALLBACK Function, +AcpiOsQueueForExecution(UINT32 Priority, ACPI_OSD_EXEC_CALLBACK Function, void *Context) { struct acpi_task *at; @@ -188,7 +188,7 @@ AcpiOsExecuteQueue(void *arg, int pending) { struct acpi_task_queue *atq; - OSD_EXECUTION_CALLBACK Function; + ACPI_OSD_EXEC_CALLBACK Function; void *Context; ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Dec 3 01:56:25 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C4B8216A4D0; Fri, 3 Dec 2004 01:56:21 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6927B16A4CE for ; Fri, 3 Dec 2004 01:56:21 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5C1D543D3F for ; Fri, 3 Dec 2004 01:56:21 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iB31uLCR026211 for ; Fri, 3 Dec 2004 01:56:21 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB31uLT2026208 for perforce@freebsd.org; Fri, 3 Dec 2004 01:56:21 GMT (envelope-from sam@freebsd.org) Date: Fri, 3 Dec 2004 01:56:21 GMT Message-Id: <200412030156.iB31uLT2026208@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66292 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Dec 2004 01:56:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=66292 Change 66292 by sam@sam_ebb on 2004/12/03 01:55:58 add a way to check if a cipher is loaded/available Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_crypto.c#4 edit .. //depot/projects/wifi/sys/net80211/ieee80211_crypto.h#4 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_crypto.c#4 (text+ko) ==== @@ -190,6 +190,12 @@ ciphers[cip->ic_cipher] = NULL; } +int +ieee80211_crypto_available(u_int cipher) +{ + return cipher < IEEE80211_CIPHER_MAX && ciphers[cipher] != NULL; +} + /* XXX well-known names! */ static const char *cipher_modnames[] = { "wlan_wep", /* IEEE80211_CIPHER_WEP */ ==== //depot/projects/wifi/sys/net80211/ieee80211_crypto.h#4 (text+ko) ==== @@ -166,6 +166,7 @@ extern void ieee80211_crypto_register(const struct ieee80211_cipher *); extern void ieee80211_crypto_unregister(const struct ieee80211_cipher *); +extern int ieee80211_crypto_available(u_int cipher); extern struct ieee80211_key *ieee80211_crypto_encap(struct ieee80211com *, struct ieee80211_node *, struct mbuf *); From owner-p4-projects@FreeBSD.ORG Fri Dec 3 01:57:25 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 712D916A4D0; Fri, 3 Dec 2004 01:57:23 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2C1F916A4CE for ; Fri, 3 Dec 2004 01:57:23 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1C6B643D1D for ; Fri, 3 Dec 2004 01:57:23 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iB31vNpM026252 for ; Fri, 3 Dec 2004 01:57:23 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB31vMAX026249 for perforce@freebsd.org; Fri, 3 Dec 2004 01:57:22 GMT (envelope-from sam@freebsd.org) Date: Fri, 3 Dec 2004 01:57:22 GMT Message-Id: <200412030157.iB31vMAX026249@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66293 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Dec 2004 01:57:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=66293 Change 66293 by sam@sam_ebb on 2004/12/03 01:56:45 correct unicast cipher set setting and take into account available s/w ciphers when validated mcast and ucast cipher settings Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#22 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#22 (text+ko) ==== @@ -2148,8 +2148,8 @@ ic->ic_flags &= ~IEEE80211_F_NOBRIDGE; break; case IEEE80211_IOC_MCASTCIPHER: - /* XXX s/w implementations */ - if ((ic->ic_caps & cipher2cap(ireq->i_val)) == 0) + if ((ic->ic_caps & cipher2cap(ireq->i_val)) == 0 && + !ieee80211_crypto_available(ireq->i_val)) return EINVAL; rsn->rsn_mcastcipher = ireq->i_val; error = (ic->ic_flags & IEEE80211_F_WPA) ? ENETRESET : 0; @@ -2163,17 +2163,20 @@ break; case IEEE80211_IOC_UCASTCIPHERS: /* - * Convert cipher set to equivalent capabilities. + * Convert user-specified cipher set to the set + * we can support (via hardware or software). * NB: this logic intentionally ignores unknown and * unsupported ciphers so folks can specify 0xff or * similar and get all available ciphers. */ caps = 0; for (j = 1; j < 32; j++) /* NB: skip WEP */ - if (ireq->i_val & (1<ic_caps; /* restrict to supported ciphers */ + if ((ireq->i_val & (1<ic_caps & cipher2cap(j)) || + ieee80211_crypto_available(j))) + caps |= 1<rsn_ucastcipherset = caps; From owner-p4-projects@FreeBSD.ORG Fri Dec 3 02:08:38 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6194016A4D0; Fri, 3 Dec 2004 02:08:37 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 337D316A4CE for ; Fri, 3 Dec 2004 02:08:37 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0FF8E43D1F for ; Fri, 3 Dec 2004 02:08:37 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iB328abm026577 for ; Fri, 3 Dec 2004 02:08:36 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB328an4026574 for perforce@freebsd.org; Fri, 3 Dec 2004 02:08:36 GMT (envelope-from sam@freebsd.org) Date: Fri, 3 Dec 2004 02:08:36 GMT Message-Id: <200412030208.iB328an4026574@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66294 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Dec 2004 02:08:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=66294 Change 66294 by sam@sam_ebb on 2004/12/03 02:08:01 typo Affected files ... .. //depot/projects/wifi/sbin/ifconfig/ifieee80211.c#22 edit Differences ... ==== //depot/projects/wifi/sbin/ifconfig/ifieee80211.c#22 (text+ko) ==== @@ -1455,7 +1455,7 @@ } else { ireq.i_type = IEEE80211_IOC_ROAMING; if (ioctl(s, SIOCG80211, &ireq) != -1) { - printf("%croaming", spacer); + printf("%croaming ", spacer); switch (ireq.i_val) { case IEEE80211_ROAMING_DEVICE: printf("DEVICE"); From owner-p4-projects@FreeBSD.ORG Fri Dec 3 05:53:08 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5CD5C16A4D1; Fri, 3 Dec 2004 05:53:08 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C321D16A4CE for ; Fri, 3 Dec 2004 05:53:07 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B26F543D2D for ; Fri, 3 Dec 2004 05:53:07 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iB35r7tK039904 for ; Fri, 3 Dec 2004 05:53:07 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB35r7wN039901 for perforce@freebsd.org; Fri, 3 Dec 2004 05:53:07 GMT (envelope-from sam@freebsd.org) Date: Fri, 3 Dec 2004 05:53:07 GMT Message-Id: <200412030553.iB35r7wN039901@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66297 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Dec 2004 05:53:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=66297 Change 66297 by sam@sam_ebb on 2004/12/03 05:52:54 dtim period Affected files ... .. //depot/projects/wifi/sbin/ifconfig/ifieee80211.c#23 edit Differences ... ==== //depot/projects/wifi/sbin/ifconfig/ifieee80211.c#23 (text+ko) ==== @@ -559,6 +559,12 @@ getac(ac)|IEEE80211_WMEPARAM_BSS, NULL); } +static +DECL_CMD_FUNC(set80211dtimperiod, val, d) +{ + set80211(s, IEEE80211_IOC_DTIM_PERIOD, atoi(val), 0, NULL); +} + static int getmaxrate(uint8_t rates[15], uint8_t nrates) { @@ -1452,6 +1458,12 @@ spacer = ' '; } } + + ireq.i_type = IEEE80211_IOC_DTIM_PERIOD; + if (ioctl(s, SIOCG80211, &ireq) != -1) { + printf("%cdtimperiod %u", spacer, ireq.i_val); + spacer = ' '; + } } else { ireq.i_type = IEEE80211_IOC_ROAMING; if (ioctl(s, SIOCG80211, &ireq) != -1) { @@ -1673,6 +1685,7 @@ DEF_CMD_ARG2("bss:cwmax", set80211bsscwmax), DEF_CMD_ARG2("bss:aifs", set80211bssaifs), DEF_CMD_ARG2("bss:txoplimit", set80211bsstxoplimit), + DEF_CMD_ARG("dtimperiod", set80211dtimperiod), }; static struct afswtch af_ieee80211 = { .af_name = "ieee80211", From owner-p4-projects@FreeBSD.ORG Fri Dec 3 06:10:35 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0D4A416A4D0; Fri, 3 Dec 2004 06:10:35 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BC29116A4CE for ; Fri, 3 Dec 2004 06:10:34 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 91A0843D6A for ; Fri, 3 Dec 2004 06:10:34 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iB36ATil040355 for ; Fri, 3 Dec 2004 06:10:29 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB36ATVn040352 for perforce@freebsd.org; Fri, 3 Dec 2004 06:10:29 GMT (envelope-from sam@freebsd.org) Date: Fri, 3 Dec 2004 06:10:29 GMT Message-Id: <200412030610.iB36ATVn040352@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66299 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Dec 2004 06:10:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=66299 Change 66299 by sam@sam_ebb on 2004/12/03 06:09:57 support dtim period other than 1 Affected files ... .. //depot/projects/wifi/sys/dev/ath/if_ath.c#37 edit .. //depot/projects/wifi/sys/net80211/ieee80211.c#13 edit .. //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#23 edit .. //depot/projects/wifi/sys/net80211/ieee80211_ioctl.h#14 edit .. //depot/projects/wifi/sys/net80211/ieee80211_output.c#20 edit .. //depot/projects/wifi/sys/net80211/ieee80211_var.h#15 edit Differences ... ==== //depot/projects/wifi/sys/dev/ath/if_ath.c#37 (text+ko) ==== @@ -1904,7 +1904,7 @@ * Enable the CAB queue before the beacon queue to * insure cab frames are triggered by this beacon. */ - if (ncabq) + if (sc->sc_boff.bo_tim[4] & 1) /* NB: only at DTIM */ ath_hal_txstart(ah, sc->sc_cabq->axq_qnum); ath_hal_puttxbuf(ah, sc->sc_bhalq, bf->bf_daddr); ath_hal_txstart(ah, sc->sc_bhalq); ==== //depot/projects/wifi/sys/net80211/ieee80211.c#13 (text+ko) ==== @@ -170,6 +170,7 @@ if (ic->ic_lintval == 0) ic->ic_lintval = 100; /* default sleep */ ic->ic_bmisstimeout = 7*ic->ic_lintval; /* default 7 beacons */ + ic->ic_dtim_period = IEEE80211_DTIM_DEFAULT; IEEE80211_BEACON_LOCK_INIT(ic, "beacon"); ic->ic_txpowlimit = IEEE80211_TXPOWER_MAX; ==== //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#23 (text+ko) ==== @@ -1435,6 +1435,9 @@ case IEEE80211_IOC_WME_ACKPOLICY: /* WME: ACK policy (bss only) */ error = ieee80211_ioctl_getwmeparam(ic, ireq); break; + case IEEE80211_IOC_DTIM_PERIOD: + ireq->i_val = ic->ic_dtim_period; + break; default: error = EINVAL; break; @@ -2248,6 +2251,15 @@ case IEEE80211_IOC_WME_ACKPOLICY: /* WME: ACK policy (bss only) */ error = ieee80211_ioctl_setwmeparam(ic, ireq); break; + case IEEE80211_IOC_DTIM_PERIOD: + if (IEEE80211_DTIM_MIN < ireq->i_val && + ireq->i_val <= IEEE80211_DTIM_MAX) { + IEEE80211_BEACON_LOCK(ic); + ic->ic_dtim_period = ireq->i_val; + IEEE80211_BEACON_UNLOCK(ic); + } else + error = EINVAL; + break; default: error = EINVAL; break; ==== //depot/projects/wifi/sys/net80211/ieee80211_ioctl.h#14 (text+ko) ==== @@ -419,6 +419,7 @@ #define IEEE80211_IOC_WME_TXOPLIMIT 49 /* WME: txops limit */ #define IEEE80211_IOC_WME_ACM 50 /* WME: ACM (bss only) */ #define IEEE80211_IOC_WME_ACKPOLICY 51 /* WME: ACK policy (!bss only)*/ +#define IEEE80211_IOC_DTIM_PERIOD 52 /* DTIM period */ /* * Scan result data returned for IEEE80211_IOC_SCAN_RESULTS. ==== //depot/projects/wifi/sys/net80211/ieee80211_output.c#20 (text+ko) ==== @@ -1518,8 +1518,19 @@ "%s: TIM updated, pending %u, off %u, len %u\n", __func__, ic->ic_ps_pending, timoff, timlen); } + /* count down DTIM period */ + if (bo->bo_tim[2] == 0) { + /* + * NB: update both from ic_dtim_period + * so we automatically collect any + * new DTIM period. + */ + bo->bo_tim[2] = ic->ic_dtim_period - 1; + bo->bo_tim[3] = ic->ic_dtim_period; + } else + bo->bo_tim[2]--; /* update TIM state regarding buffered multicast frames */ - if (mcast) + if (mcast && (bo->bo_tim[2] == 1 || bo->bo_tim[3] == 1)) bo->bo_tim[4] |= 1; else bo->bo_tim[4] &= ~1; ==== //depot/projects/wifi/sys/net80211/ieee80211_var.h#15 (text+ko) ==== @@ -61,6 +61,10 @@ #define IEEE80211_TXPOWER_MAX 100 /* .5 dbM (XXX units?) */ #define IEEE80211_TXPOWER_MIN 0 /* kill radio */ +#define IEEE80211_DTIM_MAX 15 /* max DTIM period */ +#define IEEE80211_DTIM_MIN 1 /* min DTIM period */ +#define IEEE80211_DTIM_DEFAULT 8 /* default DTIM period */ + #define IEEE80211_PS_SLEEP 0x1 /* STA is in power saving mode */ #define IEEE80211_PS_MAX_QUEUE 50 /* maximum saved packets */ @@ -113,7 +117,8 @@ u_int16_t ic_ps_sta; /* stations in power save */ u_int16_t ic_ps_pending; /* ps sta's w/ pending frames */ u_int8_t *ic_tim_bitmap; /* power-save stations w/ data*/ - u_int ic_tim_len; /* ic_tim_bitmap size (bytes) */ + u_int16_t ic_tim_len; /* ic_tim_bitmap size (bytes) */ + u_int16_t ic_dtim_period; /* DTIM period */ struct ifmedia ic_media; /* interface media config */ struct bpf_if *ic_rawbpf; /* packet filter structure */ struct ieee80211_node *ic_bss; /* information for this node */ From owner-p4-projects@FreeBSD.ORG Fri Dec 3 06:15:36 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4BE5E16A4D0; Fri, 3 Dec 2004 06:15:36 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 23ADF16A4CE for ; Fri, 3 Dec 2004 06:15:36 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F260E43D5D for ; Fri, 3 Dec 2004 06:15:35 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iB36FZUd040617 for ; Fri, 3 Dec 2004 06:15:35 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB36FZv9040614 for perforce@freebsd.org; Fri, 3 Dec 2004 06:15:35 GMT (envelope-from sam@freebsd.org) Date: Fri, 3 Dec 2004 06:15:35 GMT Message-Id: <200412030615.iB36FZv9040614@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66300 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Dec 2004 06:15:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=66300 Change 66300 by sam@sam_ebb on 2004/12/03 06:15:19 correct range check on dtim period Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#24 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#24 (text+ko) ==== @@ -2252,7 +2252,7 @@ error = ieee80211_ioctl_setwmeparam(ic, ireq); break; case IEEE80211_IOC_DTIM_PERIOD: - if (IEEE80211_DTIM_MIN < ireq->i_val && + if (IEEE80211_DTIM_MIN <= ireq->i_val && ireq->i_val <= IEEE80211_DTIM_MAX) { IEEE80211_BEACON_LOCK(ic); ic->ic_dtim_period = ireq->i_val; From owner-p4-projects@FreeBSD.ORG Fri Dec 3 22:34:32 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6532416A4D0; Fri, 3 Dec 2004 22:34:32 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3E14216A4CE for ; Fri, 3 Dec 2004 22:34:32 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 04CB743D58 for ; Fri, 3 Dec 2004 22:34:32 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iB3MYVEv002975 for ; Fri, 3 Dec 2004 22:34:32 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB3MYVrT002972 for perforce@freebsd.org; Fri, 3 Dec 2004 22:34:31 GMT (envelope-from sam@freebsd.org) Date: Fri, 3 Dec 2004 22:34:31 GMT Message-Id: <200412032234.iB3MYVrT002972@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66366 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Dec 2004 22:34:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=66366 Change 66366 by sam@sam_ebb on 2004/12/03 22:34:02 overhaul debugging msgs for consistency and to shrink code size a bit Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_input.c#22 edit .. //depot/projects/wifi/sys/net80211/ieee80211_node.c#23 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_input.c#22 (text+ko) ==== @@ -51,14 +51,9 @@ #include -static struct mbuf *ieee80211_defrag(struct ieee80211com *, - struct ieee80211_node *, struct mbuf *); -static struct mbuf *ieee80211_decap(struct ieee80211com *, struct mbuf *); -static void ieee80211_node_pwrsave(struct ieee80211_node *, int enable); -static void ieee80211_recv_pspoll(struct ieee80211com *, - struct ieee80211_node *, struct mbuf *); +#ifdef IEEE80211_DEBUG +#include -#ifdef IEEE80211_DEBUG /* * Decide if a received management frame should be * printed when debugging is enabled. This filters some @@ -76,22 +71,47 @@ } return 1; } -#endif /* - * Return the bssid of a frame. + * Emit a debug message about discarding a frame or information + * element. One format is for extracting the mac address from + * the frame header; the other is for when a header is not + * available or otherwise appropriate. */ -static const u_int8_t * -ieee80211_getbssid(struct ieee80211com *ic, const struct ieee80211_frame *wh) -{ - if (ic->ic_opmode == IEEE80211_M_STA) - return wh->i_addr2; - if ((wh->i_fc[1] & IEEE80211_FC1_DIR_MASK) != IEEE80211_FC1_DIR_NODS) - return wh->i_addr1; - if ((wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK) == IEEE80211_FC0_SUBTYPE_PS_POLL) - return wh->i_addr1; - return wh->i_addr3; -} +#define IEEE80211_DISCARD(_ic, _m, _wh, _type, _fmt, ...) do { \ + if ((_ic)->ic_debug & (_m)) \ + ieee80211_discard_frame(_ic, _wh, _type, _fmt, __VA_ARGS__);\ +} while (0) +#define IEEE80211_DISCARD_IE(_ic, _m, _wh, _type, _fmt, ...) do { \ + if ((_ic)->ic_debug & (_m)) \ + ieee80211_discard_ie(_ic, _wh, _type, _fmt, __VA_ARGS__);\ +} while (0) +#define IEEE80211_DISCARD_MAC(_ic, _m, _mac, _type, _fmt, ...) do { \ + if ((_ic)->ic_debug & (_m)) \ + ieee80211_discard_mac(_ic, _mac, _type, _fmt, __VA_ARGS__);\ +} while (0) + +static const u_int8_t *ieee80211_getbssid(struct ieee80211com *, + const struct ieee80211_frame *); +static void ieee80211_discard_frame(struct ieee80211com *, + const struct ieee80211_frame *, const char *type, const char *fmt, ...); +static void ieee80211_discard_ie(struct ieee80211com *, + const struct ieee80211_frame *, const char *type, const char *fmt, ...); +static void ieee80211_discard_mac(struct ieee80211com *, + const u_int8_t mac[IEEE80211_ADDR_LEN], const char *type, + const char *fmt, ...); +#else +#define IEEE80211_DISCARD(_ic, _m, _wh, _type, _fmt, ...) +#define IEEE80211_DISCARD_IE(_ic, _m, _wh, _type, _fmt, ...) +#define IEEE80211_DISCARD_MAC(_ic, _m, _mac, _type, _fmt, ...) +#endif /* IEEE80211_DEBUG */ + +static struct mbuf *ieee80211_defrag(struct ieee80211com *, + struct ieee80211_node *, struct mbuf *); +static struct mbuf *ieee80211_decap(struct ieee80211com *, struct mbuf *); +static void ieee80211_node_pwrsave(struct ieee80211_node *, int enable); +static void ieee80211_recv_pspoll(struct ieee80211com *, + struct ieee80211_node *, struct mbuf *); /* * Process a received frame. The node associated with the sender @@ -137,9 +157,9 @@ goto out; if (m->m_pkthdr.len < sizeof(struct ieee80211_frame_min)) { - IEEE80211_DPRINTF(ic, IEEE80211_MSG_ANY, - "%s: frame too short, len %u\n", - __func__, m->m_pkthdr.len); + IEEE80211_DISCARD_MAC(ic, IEEE80211_MSG_ANY, + ni->ni_macaddr, NULL, + "too short (1): len %u", m->m_pkthdr.len); ic->ic_stats.is_rx_tooshort++; goto out; } @@ -153,8 +173,8 @@ if ((wh->i_fc[0] & IEEE80211_FC0_VERSION_MASK) != IEEE80211_FC0_VERSION_0) { - IEEE80211_DPRINTF(ic, IEEE80211_MSG_ANY, - "receive packet with wrong version: %x\n", wh->i_fc[0]); + IEEE80211_DISCARD_MAC(ic, IEEE80211_MSG_ANY, + ni->ni_macaddr, NULL, "wrong version %x", wh->i_fc[0]); ic->ic_stats.is_rx_badversion++; goto err; } @@ -168,9 +188,8 @@ bssid = wh->i_addr2; if (!IEEE80211_ADDR_EQ(bssid, ni->ni_bssid)) { /* not interested in */ - IEEE80211_DPRINTF(ic, IEEE80211_MSG_INPUT, - "[%s] discard frame not to bss\n", - ether_sprintf(bssid)); + IEEE80211_DISCARD_MAC(ic, IEEE80211_MSG_INPUT, + bssid, NULL, "%s", "not to bss"); ic->ic_stats.is_rx_wrongbss++; goto out; } @@ -184,9 +203,10 @@ bssid = wh->i_addr1; else { if (m->m_pkthdr.len < sizeof(struct ieee80211_frame)) { - IEEE80211_DPRINTF(ic, IEEE80211_MSG_ANY, - "%s: frame too short, len %u\n", - __func__, m->m_pkthdr.len); + IEEE80211_DISCARD_MAC(ic, + IEEE80211_MSG_ANY, ni->ni_macaddr, + NULL, "too short (2): len %u", + m->m_pkthdr.len); ic->ic_stats.is_rx_tooshort++; goto out; } @@ -200,9 +220,8 @@ if (!IEEE80211_ADDR_EQ(bssid, ic->ic_bss->ni_bssid) && !IEEE80211_ADDR_EQ(bssid, ifp->if_broadcastaddr)) { /* not interested in */ - IEEE80211_DPRINTF(ic, IEEE80211_MSG_INPUT, - "[%s] discard data frame not to bss\n", - ether_sprintf(bssid)); + IEEE80211_DISCARD_MAC(ic, IEEE80211_MSG_INPUT, + bssid, NULL, "%s", "not to bss"); ic->ic_stats.is_rx_wrongbss++; goto out; } @@ -244,18 +263,16 @@ if ((wh->i_fc[1] & IEEE80211_FC1_RETRY) && SEQ_LEQ(rxseq, ni->ni_rxseqs[tid])) { /* duplicate, discard */ - IEEE80211_DPRINTF(ic, IEEE80211_MSG_INPUT, - "[%s] discard duplicate frame, " - "seqno <%u,%u> fragno <%u,%u> tid %u\n" - , ether_sprintf(bssid) - , rxseq >> IEEE80211_SEQ_SEQ_SHIFT - , ni->ni_rxseqs[tid] >> - IEEE80211_SEQ_SEQ_SHIFT - , rxseq & IEEE80211_SEQ_FRAG_MASK - , ni->ni_rxseqs[tid] & - IEEE80211_SEQ_FRAG_MASK - , tid - ); + IEEE80211_DISCARD_MAC(ic, IEEE80211_MSG_INPUT, + bssid, "duplicate", + "seqno <%u,%u> fragno <%u,%u> tid %u", + rxseq >> IEEE80211_SEQ_SEQ_SHIFT, + ni->ni_rxseqs[tid] >> + IEEE80211_SEQ_SEQ_SHIFT, + rxseq & IEEE80211_SEQ_FRAG_MASK, + ni->ni_rxseqs[tid] & + IEEE80211_SEQ_FRAG_MASK, + tid); ic->ic_stats.is_rx_dup++; IEEE80211_NODE_STAT(ni, rx_dup); goto out; @@ -271,9 +288,8 @@ hdrsize = roundup(hdrsize, sizeof(u_int32_t)); if (m->m_len < hdrsize && (m = m_pullup(m, hdrsize)) == NULL) { - IEEE80211_DPRINTF(ic, IEEE80211_MSG_ANY, - "[%s] data frame too short, len %u, expecting %u\n", - ether_sprintf(ieee80211_getbssid(ic, wh)), + IEEE80211_DISCARD(ic, IEEE80211_MSG_ANY, + wh, "data", "too short: len %u, expecting %u", m->m_pkthdr.len, hdrsize); ic->ic_stats.is_rx_tooshort++; goto out; /* XXX */ @@ -309,8 +325,8 @@ * It should be silently discarded for * SIMPLEX interface. */ - IEEE80211_DPRINTF(ic, IEEE80211_MSG_INPUT, - "%s: discard multicast echo\n", __func__); + IEEE80211_DISCARD(ic, IEEE80211_MSG_INPUT, + wh, NULL, "%s", "multicast echo"); ic->ic_stats.is_rx_mcastecho++; goto out; } @@ -330,9 +346,8 @@ } /* check if source STA is associated */ if (ni == ic->ic_bss) { - IEEE80211_DPRINTF(ic, IEEE80211_MSG_INPUT, - "[%s] discard data from unknown src\n", - ether_sprintf(wh->i_addr2)); + IEEE80211_DISCARD(ic, IEEE80211_MSG_INPUT, + wh, "data", "%s", "unknown src"); /* NB: caller deals with reference */ ni = ieee80211_dup_bss(ic->ic_sta, wh->i_addr2); if (ni != NULL) { @@ -345,9 +360,8 @@ goto err; } if (ni->ni_associd == 0) { - IEEE80211_DPRINTF(ic, IEEE80211_MSG_INPUT, - "[%s] discard data from unassoc src\n", - ether_sprintf(wh->i_addr2)); + IEEE80211_DISCARD(ic, IEEE80211_MSG_INPUT, + wh, "data", "%s", "unassoc src"); IEEE80211_SEND_MGMT(ic, ni, IEEE80211_FC0_SUBTYPE_DISASSOC, IEEE80211_REASON_NOT_ASSOCED); @@ -381,9 +395,8 @@ /* * Discard encrypted frames when privacy is off. */ - IEEE80211_DPRINTF(ic, IEEE80211_MSG_INPUT, - "[%s] discard WEP frame 'cuz PRIVACY " - "off\n", ether_sprintf(wh->i_addr2)); + IEEE80211_DISCARD(ic, IEEE80211_MSG_INPUT, + wh, "WEP", "%s", "PRIVACY off"); ic->ic_stats.is_rx_noprivacy++; IEEE80211_NODE_STAT(ni, rx_noprivacy); goto out; @@ -415,8 +428,8 @@ * Next strip any MSDU crypto bits. */ if (key != NULL && !ieee80211_crypto_demic(ic, key, m)) { - IEEE80211_DPRINTF(ic, IEEE80211_MSG_INPUT, - "%s: discard frame on demic error\n", __func__); + IEEE80211_DISCARD_MAC(ic, IEEE80211_MSG_INPUT, + ni->ni_macaddr, "data", "%s", "demic error"); IEEE80211_NODE_STAT(ni, rx_demicfail); goto out; } @@ -433,8 +446,8 @@ /* don't count Null data frames as errors */ if (subtype == IEEE80211_FC0_SUBTYPE_NODATA) goto out; - IEEE80211_DPRINTF(ic, IEEE80211_MSG_INPUT, - "%s: decapsulation error\n", __func__); + IEEE80211_DISCARD_MAC(ic, IEEE80211_MSG_INPUT, + ni->ni_macaddr, "data", "%s", "decap error"); ic->ic_stats.is_rx_decap++; IEEE80211_NODE_STAT(ni, rx_decap); goto err; @@ -450,10 +463,9 @@ * authenticator until the handshake has completed. */ if (eh->ether_type != htons(ETHERTYPE_PAE)) { - IEEE80211_DPRINTF(ic, IEEE80211_MSG_INPUT, - "[%s] discard data (ether type 0x%x len %u)" - " on unauthorized port\n", - ether_sprintf(eh->ether_shost), + IEEE80211_DISCARD_MAC(ic, IEEE80211_MSG_INPUT, + eh->ether_shost, "data", + "unauthorized port: ether type 0x%x len %u", eh->ether_type, m->m_pkthdr.len); ic->ic_stats.is_rx_unauth++; IEEE80211_NODE_STAT(ni, rx_unauth); @@ -531,9 +543,9 @@ goto err; } if (m->m_pkthdr.len < sizeof(struct ieee80211_frame)) { - IEEE80211_DPRINTF(ic, IEEE80211_MSG_ANY, - "%s: mgt data frame too short, len %u\n", - __func__, m->m_pkthdr.len); + IEEE80211_DISCARD_MAC(ic, IEEE80211_MSG_ANY, + ni->ni_macaddr, "mgt", "too short: len %u", + m->m_pkthdr.len); ic->ic_stats.is_rx_tooshort++; goto out; } @@ -552,11 +564,10 @@ * Only shared key auth frames with a challenge * should be encrypted, discard all others. */ - IEEE80211_DPRINTF(ic, IEEE80211_MSG_INPUT, - "[%s] discard %s with WEP\n", - ether_sprintf(wh->i_addr2), - ieee80211_mgt_subtype_name[subtype >> - IEEE80211_FC0_SUBTYPE_SHIFT]); + IEEE80211_DISCARD(ic, IEEE80211_MSG_INPUT, + wh, ieee80211_mgt_subtype_name[subtype >> + IEEE80211_FC0_SUBTYPE_SHIFT], + "%s", "WEP set but not permitted"); ic->ic_stats.is_rx_mgtdiscard++; /* XXX */ goto out; } @@ -564,10 +575,8 @@ /* * Discard encrypted frames when privacy is off. */ - IEEE80211_DPRINTF(ic, IEEE80211_MSG_INPUT, - "[%s] discard WEP mgt frame 'cuz " - "PRIVACY off\n", - ether_sprintf(wh->i_addr2)); + IEEE80211_DISCARD(ic, IEEE80211_MSG_INPUT, + wh, "mgt", "%s", "WEP set but PRIVACY off"); ic->ic_stats.is_rx_noprivacy++; goto out; } @@ -595,8 +604,8 @@ } goto out; default: - IEEE80211_DPRINTF(ic, IEEE80211_MSG_ANY, - "%s: bad frame type %x\n", __func__, type); + IEEE80211_DISCARD(ic, IEEE80211_MSG_ANY, + wh, NULL, "bad frame type 0x%x", type); /* should not come here */ break; } @@ -737,8 +746,8 @@ break; case IEEE80211_FC1_DIR_DSTODS: /* not yet supported */ - IEEE80211_DPRINTF(ic, IEEE80211_MSG_ANY, - "%s: discard DS to DS frame\n", __func__); + IEEE80211_DISCARD(ic, IEEE80211_MSG_ANY, + &wh, "data", "%s", "DS to DS not supported"); m_freem(m); return NULL; } @@ -821,9 +830,9 @@ if (rs->rs_nrates + nxrates > IEEE80211_RATE_MAXSIZE) { nxrates = IEEE80211_RATE_MAXSIZE - rs->rs_nrates; IEEE80211_DPRINTF(ic, IEEE80211_MSG_XRATE, - "%s: extended rate set too large;" - " only using %u of %u rates\n", - __func__, nxrates, xrates[1]); + "[%s] extended rate set too large;" + " only using %u of %u rates\n", + ether_sprintf(ni->ni_macaddr), nxrates, xrates[1]); ic->ic_stats.is_rx_rstoobig++; } memcpy(rs->rs_rates + rs->rs_nrates, xrates+2, nxrates); @@ -869,8 +878,8 @@ IEEE80211_SEND_MGMT(ic, ni, IEEE80211_FC0_SUBTYPE_AUTH, seq + 1); IEEE80211_DPRINTF(ic, IEEE80211_MSG_DEBUG | IEEE80211_MSG_AUTH, - "station %s authenticated (open)\n", - ether_sprintf(ni->ni_macaddr)); + "[%s] station authenticated (open)\n", + ether_sprintf(ni->ni_macaddr)); break; case IEEE80211_M_STA: @@ -882,9 +891,8 @@ if (status != 0) { IEEE80211_DPRINTF(ic, IEEE80211_MSG_DEBUG | IEEE80211_MSG_AUTH, - "open authentication failed (reason %d) for %s\n", - status, - ether_sprintf(wh->i_addr3)); + "[%s] open authentication failed (reason %d)\n", + ether_sprintf(ni->ni_macaddr), status); /* XXX can this happen? */ if (ni != ic->ic_bss) ni->ni_fails++; @@ -907,7 +915,8 @@ M_DEVBUF, M_NOWAIT); if (ni->ni_challenge == NULL) { IEEE80211_DPRINTF(ic, IEEE80211_MSG_DEBUG | IEEE80211_MSG_AUTH, - "%s: challenge alloc failed\n", __func__); + "[%s] shared key challenge alloc failed\n", + ether_sprintf(ni->ni_macaddr)); /* XXX statistic */ } return (ni->ni_challenge != NULL); @@ -931,8 +940,9 @@ * for sanity/consistency. */ if ((ic->ic_flags & IEEE80211_F_PRIVACY) == 0) { - IEEE80211_DPRINTF(ic, IEEE80211_MSG_AUTH, - "%s: WEP is off\n", __func__); + IEEE80211_DISCARD_MAC(ic, IEEE80211_MSG_AUTH, + ni->ni_macaddr, "shared key auth", + "%s", " PRIVACY is disabled"); estatus = IEEE80211_STATUS_ALG; goto bad; } @@ -943,9 +953,9 @@ */ if (ni->ni_authmode != IEEE80211_AUTH_AUTO && ni->ni_authmode != IEEE80211_AUTH_SHARED) { - IEEE80211_DPRINTF(ic, IEEE80211_MSG_AUTH, - "%s: operating in %u mode, reject\n", - __func__, ni->ni_authmode); + IEEE80211_DISCARD_MAC(ic, IEEE80211_MSG_AUTH, + ni->ni_macaddr, "shared key auth", + "bad sta auth mode %u", ni->ni_authmode); ic->ic_stats.is_rx_bad_auth++; /* XXX maybe a unique error? */ estatus = IEEE80211_STATUS_ALG; goto bad; @@ -954,9 +964,10 @@ challenge = NULL; if (frm + 1 < efrm) { if ((frm[1] + 2) > (efrm - frm)) { - IEEE80211_DPRINTF(ic, IEEE80211_MSG_AUTH, - "%s: elt %d %d bytes too long\n", __func__, - frm[0], (frm[1] + 2) - (efrm - frm)); + IEEE80211_DISCARD_MAC(ic, IEEE80211_MSG_AUTH, + ni->ni_macaddr, "shared key auth", + "ie %d/%d too long", + frm[0], (frm[1] + 2) - (efrm - frm)); ic->ic_stats.is_rx_bad_auth++; estatus = IEEE80211_STATUS_CHALLENGE; goto bad; @@ -969,16 +980,17 @@ case IEEE80211_AUTH_SHARED_CHALLENGE: case IEEE80211_AUTH_SHARED_RESPONSE: if (challenge == NULL) { - IEEE80211_DPRINTF(ic, IEEE80211_MSG_AUTH, - "%s: no challenge sent\n", __func__); + IEEE80211_DISCARD_MAC(ic, IEEE80211_MSG_AUTH, + ni->ni_macaddr, "shared key auth", + "%s", "no challenge"); ic->ic_stats.is_rx_bad_auth++; estatus = IEEE80211_STATUS_CHALLENGE; goto bad; } if (challenge[1] != IEEE80211_CHALLENGE_LEN) { - IEEE80211_DPRINTF(ic, IEEE80211_MSG_AUTH, - "%s: bad challenge len %d\n", - __func__, challenge[1]); + IEEE80211_DISCARD_MAC(ic, IEEE80211_MSG_AUTH, + ni->ni_macaddr, "shared key auth", + "bad challenge len %d", challenge[1]); ic->ic_stats.is_rx_bad_auth++; estatus = IEEE80211_STATUS_CHALLENGE; goto bad; @@ -990,13 +1002,15 @@ case IEEE80211_M_MONITOR: case IEEE80211_M_AHDEMO: case IEEE80211_M_IBSS: - IEEE80211_DPRINTF(ic, IEEE80211_MSG_AUTH, - "%s: unexpected operating mode\n", __func__); + IEEE80211_DISCARD_MAC(ic, IEEE80211_MSG_AUTH, + ni->ni_macaddr, "shared key auth", + "bad operating mode %u", ic->ic_opmode); return; case IEEE80211_M_HOSTAP: if (ic->ic_state != IEEE80211_S_RUN) { - IEEE80211_DPRINTF(ic, IEEE80211_MSG_AUTH, - "%s: not running\n", __func__); + IEEE80211_DISCARD_MAC(ic, IEEE80211_MSG_AUTH, + ni->ni_macaddr, "shared key auth", + "bad state %u", ic->ic_state); estatus = IEEE80211_STATUS_ALG; /* XXX */ goto bad; } @@ -1021,42 +1035,45 @@ IEEE80211_CHALLENGE_LEN); IEEE80211_DPRINTF(ic, IEEE80211_MSG_DEBUG | IEEE80211_MSG_AUTH, - "shared key %sauth request from station %s\n", + "[%s] shared key %sauth request\n", ether_sprintf(ni->ni_macaddr), allocbs ? "" : "re"); break; case IEEE80211_AUTH_SHARED_RESPONSE: if (ni == ic->ic_bss) { - IEEE80211_DPRINTF(ic, IEEE80211_MSG_AUTH, - "%s: unknown STA\n", __func__); + IEEE80211_DISCARD_MAC(ic, IEEE80211_MSG_AUTH, + ni->ni_macaddr, "shared key response", + "%s", "unknown station"); /* NB: don't send a response */ return; } if (ni->ni_challenge == NULL) { - IEEE80211_DPRINTF(ic, IEEE80211_MSG_AUTH, - "%s: no challenge recorded\n", __func__); + IEEE80211_DISCARD_MAC(ic, IEEE80211_MSG_AUTH, + ni->ni_macaddr, "shared key response", + "%s", "no challenge recorded"); ic->ic_stats.is_rx_bad_auth++; estatus = IEEE80211_STATUS_CHALLENGE; goto bad; } if (memcmp(ni->ni_challenge, &challenge[2], challenge[1]) != 0) { - IEEE80211_DPRINTF(ic, IEEE80211_MSG_AUTH, - "%s: challenge mismatch\n", __func__); + IEEE80211_DISCARD_MAC(ic, IEEE80211_MSG_AUTH, + ni->ni_macaddr, "shared key response", + "%s", "challenge mismatch"); ic->ic_stats.is_rx_auth_fail++; estatus = IEEE80211_STATUS_CHALLENGE; goto bad; } ni->ni_inact_reload = ic->ic_inact_auth; IEEE80211_DPRINTF(ic, - IEEE80211_MSG_DEBUG | IEEE80211_MSG_AUTH, - "station %s authenticated (shared key)\n", - ether_sprintf(ni->ni_macaddr)); + IEEE80211_MSG_DEBUG | IEEE80211_MSG_AUTH, + "[%s] station authenticated (shared key)\n", + ether_sprintf(ni->ni_macaddr)); break; default: - IEEE80211_DPRINTF(ic, IEEE80211_MSG_AUTH, - "%s: bad shared key auth seq %d from %s\n", - __func__, seq, ether_sprintf(wh->i_addr2)); + IEEE80211_DISCARD_MAC(ic, IEEE80211_MSG_AUTH, + ni->ni_macaddr, "shared key auth", + "bad seq %d", seq); ic->ic_stats.is_rx_bad_auth++; estatus = IEEE80211_STATUS_SEQUENCE; goto bad; @@ -1077,9 +1094,9 @@ if (status != 0) { IEEE80211_DPRINTF(ic, IEEE80211_MSG_DEBUG | IEEE80211_MSG_AUTH, - "%s: auth failed (reason %d) for %s\n", - __func__, status, - ether_sprintf(wh->i_addr3)); + "[%s] shared key auth failed (reason %d)\n", + ether_sprintf(ieee80211_getbssid(ic, wh)), + status); /* XXX can this happen? */ if (ni != ic->ic_bss) ni->ni_fails++; @@ -1098,9 +1115,8 @@ IEEE80211_FC0_SUBTYPE_AUTH, seq + 1); break; default: - IEEE80211_DPRINTF(ic, IEEE80211_MSG_AUTH, - "%s: bad seq %d from %s\n", - __func__, seq, ether_sprintf(wh->i_addr2)); + IEEE80211_DISCARD(ic, IEEE80211_MSG_AUTH, + wh, "shared key auth", "bad seq %d", seq); ic->ic_stats.is_rx_bad_auth++; return; } @@ -1122,20 +1138,18 @@ /* Verify the existence and length of __elem or get out. */ #define IEEE80211_VERIFY_ELEMENT(__elem, __maxlen) do { \ if ((__elem) == NULL) { \ - IEEE80211_DPRINTF(ic, IEEE80211_MSG_ELEMID, \ - "%s: no " #__elem "in %s frame\n", \ - __func__, ieee80211_mgt_subtype_name[subtype >> \ - IEEE80211_FC0_SUBTYPE_SHIFT]); \ + IEEE80211_DISCARD(ic, IEEE80211_MSG_ELEMID, \ + wh, ieee80211_mgt_subtype_name[subtype >> \ + IEEE80211_FC0_SUBTYPE_SHIFT], \ + "%s", "no " #__elem ); \ ic->ic_stats.is_rx_elem_missing++; \ return; \ } \ if ((__elem)[1] > (__maxlen)) { \ - IEEE80211_DPRINTF(ic, IEEE80211_MSG_ELEMID, \ - "%s: bad " #__elem " len %d in %s frame from %s\n",\ - __func__, (__elem)[1], \ - ieee80211_mgt_subtype_name[subtype >> \ - IEEE80211_FC0_SUBTYPE_SHIFT], \ - ether_sprintf(wh->i_addr2)); \ + IEEE80211_DISCARD(ic, IEEE80211_MSG_ELEMID, \ + wh, ieee80211_mgt_subtype_name[subtype >> \ + IEEE80211_FC0_SUBTYPE_SHIFT], \ + "bad " #__elem " len %d", (__elem)[1]); \ ic->ic_stats.is_rx_elem_toobig++; \ return; \ } \ @@ -1143,12 +1157,10 @@ #define IEEE80211_VERIFY_LENGTH(_len, _minlen) do { \ if ((_len) < (_minlen)) { \ - IEEE80211_DPRINTF(ic, IEEE80211_MSG_ELEMID, \ - "%s: %s frame too short from %s\n", \ - __func__, \ - ieee80211_mgt_subtype_name[subtype >> \ - IEEE80211_FC0_SUBTYPE_SHIFT], \ - ether_sprintf(wh->i_addr2)); \ + IEEE80211_DISCARD(ic, IEEE80211_MSG_ELEMID, \ + wh, ieee80211_mgt_subtype_name[subtype >> \ + IEEE80211_FC0_SUBTYPE_SHIFT], \ + "%s", "ie too short"); \ ic->ic_stats.is_rx_elem_toosmall++; \ return; \ } \ @@ -1159,24 +1171,27 @@ ieee80211_ssid_mismatch(struct ieee80211com *ic, const char *tag, u_int8_t mac[IEEE80211_ADDR_LEN], u_int8_t *ssid) { - printf("[%s] %s req ssid mismatch: ", ether_sprintf(mac), tag); + printf("[%s] discard %s frame, ssid mismatch: ", + ether_sprintf(mac), tag); ieee80211_print_essid(ssid + 2, ssid[1]); printf("\n"); } -#define IEEE80211_VERIFY_SSID(_ni, _ssid, _packet_type) do { \ +#define IEEE80211_VERIFY_SSID(_ni, _ssid) do { \ if ((_ssid)[1] != 0 && \ ((_ssid)[1] != (_ni)->ni_esslen || \ memcmp((_ssid) + 2, (_ni)->ni_essid, (_ssid)[1]) != 0)) { \ if (ieee80211_msg_input(ic)) \ - ieee80211_ssid_mismatch(ic, _packet_type, \ + ieee80211_ssid_mismatch(ic, \ + ieee80211_mgt_subtype_name[subtype >> \ + IEEE80211_FC0_SUBTYPE_SHIFT], \ wh->i_addr2, _ssid); \ ic->ic_stats.is_rx_ssidmismatch++; \ return; \ } \ } while (0) #else /* !IEEE80211_DEBUG */ -#define IEEE80211_VERIFY_SSID(_ni, _ssid, _packet_type) do { \ +#define IEEE80211_VERIFY_SSID(_ni, _ssid) do { \ if ((_ssid)[1] != 0 && \ ((_ssid)[1] != (_ni)->ni_esslen || \ memcmp((_ssid) + 2, (_ni)->ni_essid, (_ssid)[1]) != 0)) { \ @@ -1289,7 +1304,8 @@ * configured for the system. */ static int -ieee80211_parse_wpa(struct ieee80211com *ic, u_int8_t *frm, struct ieee80211_rsnparms *rsn) +ieee80211_parse_wpa(struct ieee80211com *ic, u_int8_t *frm, + struct ieee80211_rsnparms *rsn, const struct ieee80211_frame *wh) { u_int8_t len = frm[1]; u_int32_t w; @@ -1303,16 +1319,18 @@ KASSERT(ic->ic_flags & IEEE80211_F_WPA1, ("not WPA, flags 0x%x", ic->ic_flags)); if (len < 14) { - IEEE80211_DPRINTF(ic, IEEE80211_MSG_ELEMID | IEEE80211_MSG_WPA, - "%s: length %u too short\n", __func__, len); + IEEE80211_DISCARD_IE(ic, + IEEE80211_MSG_ELEMID | IEEE80211_MSG_WPA, + wh, "WPA", "too short, len %u", len); return IEEE80211_REASON_IE_INVALID; } frm += 6, len -= 4; /* NB: len is payload only */ /* NB: iswapoui already validated the OUI and type */ w = LE_READ_2(frm); if (w != WPA_VERSION) { - IEEE80211_DPRINTF(ic, IEEE80211_MSG_ELEMID | IEEE80211_MSG_WPA, - "%s: bad version %u\n", __func__, w); + IEEE80211_DISCARD_IE(ic, + IEEE80211_MSG_ELEMID | IEEE80211_MSG_WPA, + wh, "WPA", "bad version %u", w); return IEEE80211_REASON_IE_INVALID; } frm += 2, len -= 2; @@ -1320,9 +1338,10 @@ /* multicast/group cipher */ w = wpa_cipher(frm, &rsn->rsn_mcastkeylen); if (w != rsn->rsn_mcastcipher) { - IEEE80211_DPRINTF(ic, IEEE80211_MSG_ELEMID | IEEE80211_MSG_WPA, - "%s: mcast cipher mismatch; got %u, expected %u\n", - __func__, w, rsn->rsn_mcastcipher); + IEEE80211_DISCARD_IE(ic, + IEEE80211_MSG_ELEMID | IEEE80211_MSG_WPA, + wh, "WPA", "mcast cipher mismatch; got %u, expected %u", + w, rsn->rsn_mcastcipher); return IEEE80211_REASON_IE_INVALID; } frm += 4, len -= 4; @@ -1331,9 +1350,10 @@ n = LE_READ_2(frm); frm += 2, len -= 2; if (len < n*4+2) { - IEEE80211_DPRINTF(ic, IEEE80211_MSG_ELEMID | IEEE80211_MSG_WPA, - "%s: not enough data for ucast ciphers; len %u, n %u\n", - __func__, len, n); + IEEE80211_DISCARD_IE(ic, + IEEE80211_MSG_ELEMID | IEEE80211_MSG_WPA, + wh, "WPA", "ucast cipher data too short; len %u, n %u", + len, n); return IEEE80211_REASON_IE_INVALID; } w = 0; @@ -1343,8 +1363,9 @@ } w &= rsn->rsn_ucastcipherset; if (w == 0) { - IEEE80211_DPRINTF(ic, IEEE80211_MSG_ELEMID | IEEE80211_MSG_WPA, - "%s: ucast cipher set empty\n", __func__); + IEEE80211_DISCARD_IE(ic, + IEEE80211_MSG_ELEMID | IEEE80211_MSG_WPA, + wh, "WPA", "%s", "ucast cipher set empty"); return IEEE80211_REASON_IE_INVALID; } if (w & (1<rsn_keymgmtset; if (w == 0) { - IEEE80211_DPRINTF(ic, IEEE80211_MSG_ELEMID | IEEE80211_MSG_WPA, - "%s: no acceptable key mgmt algorithms\n", __func__); + IEEE80211_DISCARD_IE(ic, + IEEE80211_MSG_ELEMID | IEEE80211_MSG_WPA, + wh, "WPA", "%s", "no acceptable key mgmt alg"); return IEEE80211_REASON_IE_INVALID; } if (w & WPA_ASE_8021X_UNSPEC) @@ -1444,7 +1467,8 @@ * configured for the system. */ static int -ieee80211_parse_rsn(struct ieee80211com *ic, u_int8_t *frm, struct ieee80211_rsnparms *rsn) +ieee80211_parse_rsn(struct ieee80211com *ic, u_int8_t *frm, + struct ieee80211_rsnparms *rsn, const struct ieee80211_frame *wh) { u_int8_t len = frm[1]; u_int32_t w; @@ -1458,14 +1482,16 @@ KASSERT(ic->ic_flags & IEEE80211_F_WPA2, ("not RSN, flags 0x%x", ic->ic_flags)); if (len < 10) { - IEEE80211_DPRINTF(ic, IEEE80211_MSG_ELEMID | IEEE80211_MSG_WPA, - "%s: length %u too short\n", __func__, len); + IEEE80211_DISCARD_IE(ic, + IEEE80211_MSG_ELEMID | IEEE80211_MSG_WPA, + wh, "RSN", "too short, len %u", len); return IEEE80211_REASON_IE_INVALID; } w = LE_READ_2(frm); if (w != RSN_VERSION) { - IEEE80211_DPRINTF(ic, IEEE80211_MSG_ELEMID | IEEE80211_MSG_WPA, - "%s: bad version %u\n", __func__, w); + IEEE80211_DISCARD_IE(ic, + IEEE80211_MSG_ELEMID | IEEE80211_MSG_WPA, + wh, "RSN", "bad version %u", w); return IEEE80211_REASON_IE_INVALID; } frm += 2, len -= 2; @@ -1473,9 +1499,10 @@ /* multicast/group cipher */ w = rsn_cipher(frm, &rsn->rsn_mcastkeylen); if (w != rsn->rsn_mcastcipher) { - IEEE80211_DPRINTF(ic, IEEE80211_MSG_ELEMID | IEEE80211_MSG_WPA, - "%s: mcast cipher mismatch; got %u, expected %u\n", - __func__, w, rsn->rsn_mcastcipher); + IEEE80211_DISCARD_IE(ic, + IEEE80211_MSG_ELEMID | IEEE80211_MSG_WPA, + wh, "RSN", "mcast cipher mismatch; got %u, expected %u", + w, rsn->rsn_mcastcipher); return IEEE80211_REASON_IE_INVALID; } frm += 4, len -= 4; @@ -1484,9 +1511,10 @@ n = LE_READ_2(frm); frm += 2, len -= 2; if (len < n*4+2) { - IEEE80211_DPRINTF(ic, IEEE80211_MSG_ELEMID | IEEE80211_MSG_WPA, - "%s: not enough data for ucast ciphers; len %u, n %u\n", - __func__, len, n); + IEEE80211_DISCARD_IE(ic, + IEEE80211_MSG_ELEMID | IEEE80211_MSG_WPA, + wh, "RSN", "ucast cipher data too short; len %u, n %u", + len, n); return IEEE80211_REASON_IE_INVALID; } w = 0; @@ -1496,8 +1524,9 @@ } w &= rsn->rsn_ucastcipherset; if (w == 0) { - IEEE80211_DPRINTF(ic, IEEE80211_MSG_ELEMID | IEEE80211_MSG_WPA, - "%s: ucast cipher set empty\n", __func__); + IEEE80211_DISCARD_IE(ic, + IEEE80211_MSG_ELEMID | IEEE80211_MSG_WPA, + wh, "RSN", "%s", "ucast cipher set empty"); return IEEE80211_REASON_IE_INVALID; } if (w & (1<rsn_keymgmtset; if (w == 0) { - IEEE80211_DPRINTF(ic, IEEE80211_MSG_ELEMID | IEEE80211_MSG_WPA, - "%s: no acceptable key mgmt algorithms\n", __func__); + IEEE80211_DISCARD_IE(ic, + IEEE80211_MSG_ELEMID | IEEE80211_MSG_WPA, + wh, "RSN", "%s", "no acceptable key mgmt alg"); return IEEE80211_REASON_IE_INVALID; } if (w & RSN_ASE_8021X_UNSPEC) @@ -1539,7 +1570,8 @@ } static int -ieee80211_parse_wmeparams(struct ieee80211com *ic, u_int8_t *frm) +ieee80211_parse_wmeparams(struct ieee80211com *ic, u_int8_t *frm, + const struct ieee80211_frame *wh) { #define MS(_v, _f) (((_v) & _f) >> _f##_S) struct ieee80211_wme_state *wme = &ic->ic_wme; @@ -1547,8 +1579,9 @@ int i; if (len < sizeof(struct ieee80211_wme_param)-2) { - IEEE80211_DPRINTF(ic, IEEE80211_MSG_ELEMID | IEEE80211_MSG_WME, - "%s: length %u too short\n", __func__, len); + IEEE80211_DISCARD_IE(ic, + IEEE80211_MSG_ELEMID | IEEE80211_MSG_WME, + wh, "WME", "too short, len %u", len); return 0; } qosinfo = frm[__offsetof(struct ieee80211_wme_param, param_qosInfo)]; @@ -1587,6 +1620,7 @@ } if (*iep != NULL) memcpy(*iep, ie, ielen); + /* XXX note failure */ } #ifdef IEEE80211_DEBUG @@ -1598,7 +1632,7 @@ { printf("[%s] %s%s on chan %u (bss chan %u) ", ether_sprintf(mac), isnew ? "new " : "", - (subtype == IEEE80211_FC0_SUBTYPE_PROBE_RESP) ? "probe response" : "beacon", + ieee80211_mgt_subtype_name[subtype >> IEEE80211_FC0_SUBTYPE_SHIFT], chan, bchan); ieee80211_print_essid(ssid + 2, ssid[1]); printf("\n"); @@ -1729,11 +1763,9 @@ break; case IEEE80211_ELEMID_ERP: if (frm[1] != 1) { - IEEE80211_DPRINTF(ic, - IEEE80211_MSG_ELEMID, - "%s: invalid ERP element; " - "length %u, expecting 1\n", - __func__, frm[1]); + IEEE80211_DISCARD_IE(ic, + IEEE80211_MSG_ELEMID, wh, "ERP", + "bad len %u", frm[1]); ic->ic_stats.is_rx_elem_toobig++; break; } @@ -1750,9 +1782,9 @@ /* XXX Atheros OUI support */ break; default: - IEEE80211_DPRINTF(ic, IEEE80211_MSG_ELEMID, - "%s: element id %u/len %u ignored\n", - __func__, *frm, frm[1]); + IEEE80211_DISCARD_IE(ic, IEEE80211_MSG_ELEMID, + wh, "unhandled", + "id %u, len %u", *frm, frm[1]); ic->ic_stats.is_rx_elem_unknown++; break; } @@ -1765,11 +1797,10 @@ chan > IEEE80211_CHAN_MAX || #endif isclr(ic->ic_chan_active, chan)) { - IEEE80211_DPRINTF(ic, IEEE80211_MSG_ELEMID, - "%s: ignore %s with invalid channel %u\n", - __func__, - ISPROBE(subtype) ? "probe response" : "beacon", - chan); + IEEE80211_DISCARD(ic, IEEE80211_MSG_ELEMID, + wh, ieee80211_mgt_subtype_name[subtype >> + IEEE80211_FC0_SUBTYPE_SHIFT], + "invalid channel %u", chan); ic->ic_stats.is_rx_badchan++; return; } @@ -1784,11 +1815,10 @@ * the rssi value should be correct even for * different hop pattern in FH. */ - IEEE80211_DPRINTF(ic, IEEE80211_MSG_ELEMID, - "%s: ignore %s on channel %u marked " - "for channel %u\n", __func__, - ISPROBE(subtype) ? "probe response" : "beacon", - bchan, chan); + IEEE80211_DISCARD(ic, IEEE80211_MSG_ELEMID, + wh, ieee80211_mgt_subtype_name[subtype >> + IEEE80211_FC0_SUBTYPE_SHIFT], + "for off-channel %u\n", chan); ic->ic_stats.is_rx_chanmismatch++; return; } @@ -1804,7 +1834,7 @@ IEEE80211_ADDR_EQ(wh->i_addr2, ni->ni_bssid))) { if (ni->ni_erp != erp) { IEEE80211_DPRINTF(ic, IEEE80211_MSG_ASSOC, - "erp change from %s: was 0x%x, now 0x%x\n", + "[%s] erp change: was 0x%x, now 0x%x\n", ether_sprintf(wh->i_addr2), ni->ni_erp, erp); if (erp & IEEE80211_ERP_USE_PROTECTION) @@ -1816,8 +1846,9 @@ } if ((ni->ni_capinfo ^ capinfo) & IEEE80211_CAPINFO_SHORT_SLOTTIME) { IEEE80211_DPRINTF(ic, IEEE80211_MSG_ASSOC, - "capabilities change from %s: before 0x%x," - " now 0x%x\n", ether_sprintf(wh->i_addr2), + "[%s] capabilities change: before 0x%x," + " now 0x%x\n", + ether_sprintf(wh->i_addr2), ni->ni_capinfo, capinfo); /* * NB: we assume short preamble doesn't @@ -1829,7 +1860,8 @@ ni->ni_capinfo = capinfo; /* XXX statistic */ } - if (wme != NULL && ieee80211_parse_wmeparams(ic, wme)) + if (wme != NULL && + ieee80211_parse_wmeparams(ic, wme, wh)) ieee80211_wme_updateparams(ic); /* NB: don't need the rest of this */ return; @@ -1947,7 +1979,7 @@ } IEEE80211_VERIFY_ELEMENT(rates, IEEE80211_RATE_MAXSIZE); IEEE80211_VERIFY_ELEMENT(ssid, IEEE80211_NWID_LEN); - IEEE80211_VERIFY_SSID(ic->ic_bss, ssid, "probe"); + IEEE80211_VERIFY_SSID(ic->ic_bss, ssid); if (ni == ic->ic_bss) { if (ic->ic_opmode == IEEE80211_M_IBSS) { @@ -1967,17 +1999,17 @@ } else allocbs = 0; IEEE80211_DPRINTF(ic, IEEE80211_MSG_ASSOC, - "%s: probe req from %s\n", __func__, - ether_sprintf(wh->i_addr2)); + "[%s] recv probe req\n", ether_sprintf(wh->i_addr2)); ni->ni_rssi = rssi; ni->ni_rstamp = rstamp; rate = ieee80211_setup_rates(ic, ni, rates, xrates, IEEE80211_F_DOSORT | IEEE80211_F_DOFRATE | IEEE80211_F_DONEGO | IEEE80211_F_DODEL); if (rate & IEEE80211_RATE_BASIC) { - IEEE80211_DPRINTF(ic, IEEE80211_MSG_XRATE, - "[%s] received rate set invalid\n", - ether_sprintf(wh->i_addr2)); + IEEE80211_DISCARD(ic, IEEE80211_MSG_XRATE, + wh, ieee80211_mgt_subtype_name[subtype >> + IEEE80211_FC0_SUBTYPE_SHIFT], + "%s", "recv'd rate set invalid"); if (allocbs) /* reclaim immediately */ ieee80211_free_node(ni); } else { @@ -2001,26 +2033,22 @@ seq = le16toh(*(u_int16_t *)(frm + 2)); status = le16toh(*(u_int16_t *)(frm + 4)); IEEE80211_DPRINTF(ic, IEEE80211_MSG_AUTH, - "%s: algorithm %d seq %d from %s\n", - __func__, algo, seq, ether_sprintf(wh->i_addr2)); + "[%s] recv auth frame with algorithm %d seq %d\n", + ether_sprintf(wh->i_addr2), algo, seq); /* * Consult the ACL policy module if setup. >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Dec 3 23:23:34 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1EA8C16A4D0; Fri, 3 Dec 2004 23:23:34 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id ED10B16A4CE for ; Fri, 3 Dec 2004 23:23:33 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BC2FD43D45 for ; Fri, 3 Dec 2004 23:23:33 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iB3NNXRD004666 for ; Fri, 3 Dec 2004 23:23:33 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB3NNXgJ004663 for perforce@freebsd.org; Fri, 3 Dec 2004 23:23:33 GMT (envelope-from sam@freebsd.org) Date: Fri, 3 Dec 2004 23:23:33 GMT Message-Id: <200412032323.iB3NNXgJ004663@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66371 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Dec 2004 23:23:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=66371 Change 66371 by sam@sam_ebb on 2004/12/03 23:22:44 give fake address family name a unique token so it's not matched against a command line parameter Affected files ... .. //depot/projects/wifi/sbin/ifconfig/ifclone.c#4 edit .. //depot/projects/wifi/sbin/ifconfig/ifieee80211.c#24 edit .. //depot/projects/wifi/sbin/ifconfig/ifmac.c#4 edit .. //depot/projects/wifi/sbin/ifconfig/ifmedia.c#4 edit .. //depot/projects/wifi/sbin/ifconfig/ifvlan.c#4 edit Differences ... ==== //depot/projects/wifi/sbin/ifconfig/ifclone.c#4 (text+ko) ==== @@ -55,7 +55,7 @@ s = socket(AF_INET, SOCK_DGRAM, 0); if (s == -1) - err(1, "socket"); + err(1, "socket(AF_INET,SOCK_DGRAM)"); memset(&ifcr, 0, sizeof(ifcr)); @@ -95,7 +95,7 @@ s = socket(AF_INET, SOCK_DGRAM, 0); if (s == -1) - err(1, "socket"); + err(1, "socket(AF_INET,SOCK_DGRAM)"); memset(&ifr, 0, sizeof(ifr)); (void) strlcpy(ifr.ifr_name, name, sizeof(ifr.ifr_name)); ==== //depot/projects/wifi/sbin/ifconfig/ifieee80211.c#24 (text+ko) ==== @@ -1688,7 +1688,7 @@ DEF_CMD_ARG("dtimperiod", set80211dtimperiod), }; static struct afswtch af_ieee80211 = { - .af_name = "ieee80211", + .af_name = "af_ieee80211", .af_af = AF_UNSPEC, .af_status = ieee80211_status, }; ==== //depot/projects/wifi/sbin/ifconfig/ifmac.c#4 (text+ko) ==== @@ -103,7 +103,7 @@ DEF_CMD_ARG("maclabel", setifmaclabel), }; static struct afswtch af_mac = { - .af_name = "maclabel", + .af_name = "af_maclabel", .af_af = AF_UNSPEC, .af_status = maclabel_status, }; ==== //depot/projects/wifi/sbin/ifconfig/ifmedia.c#4 (text+ko) ==== @@ -785,7 +785,7 @@ DEF_CMD_ARG("-mediaopt",unsetmediaopt), }; static struct afswtch af_media = { - .af_name = "media", + .af_name = "af_media", .af_af = AF_UNSPEC, .af_status = media_status, }; ==== //depot/projects/wifi/sbin/ifconfig/ifvlan.c#4 (text+ko) ==== @@ -155,7 +155,7 @@ DEF_CMD("-vlanhwtag", -IFCAP_VLAN_HWTAGGING, setifcap), }; static struct afswtch af_vlan = { - .af_name = "vlan", + .af_name = "af_vlan", .af_af = AF_UNSPEC, .af_status = vlan_status, }; From owner-p4-projects@FreeBSD.ORG Fri Dec 3 23:24:35 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9890816A4D0; Fri, 3 Dec 2004 23:24:35 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 767A016A4CE for ; Fri, 3 Dec 2004 23:24:35 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 66CF643D45 for ; Fri, 3 Dec 2004 23:24:35 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iB3NOZjW004686 for ; Fri, 3 Dec 2004 23:24:35 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB3NOZAF004683 for perforce@freebsd.org; Fri, 3 Dec 2004 23:24:35 GMT (envelope-from sam@freebsd.org) Date: Fri, 3 Dec 2004 23:24:35 GMT Message-Id: <200412032324.iB3NOZAF004683@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66372 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Dec 2004 23:24:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=66372 Change 66372 by sam@sam_ebb on 2004/12/03 23:23:41 replace perror with warn and identify the parameters on failure Affected files ... .. //depot/projects/wifi/sbin/ifconfig/af_inet6.c#4 edit Differences ... ==== //depot/projects/wifi/sbin/ifconfig/af_inet6.c#4 (text+ko) ==== @@ -203,12 +203,12 @@ strncpy(ifr6.ifr_name, ifr.ifr_name, sizeof(ifr.ifr_name)); if ((s6 = socket(AF_INET6, SOCK_DGRAM, 0)) < 0) { - perror("ifconfig: socket"); + warn("socket(AF_INET6,SOCK_DGRAM)"); return; } ifr6.ifr_addr = *sin; if (ioctl(s6, SIOCGIFAFLAG_IN6, &ifr6) < 0) { - perror("ifconfig: ioctl(SIOCGIFAFLAG_IN6)"); + warn("ioctl(SIOCGIFAFLAG_IN6)"); close(s6); return; } @@ -216,7 +216,7 @@ memset(&lifetime, 0, sizeof(lifetime)); ifr6.ifr_addr = *sin; if (ioctl(s6, SIOCGIFALIFETIME_IN6, &ifr6) < 0) { - perror("ifconfig: ioctl(SIOCGIFALIFETIME_IN6)"); + warn("ioctl(SIOCGIFALIFETIME_IN6)"); close(s6); return; } From owner-p4-projects@FreeBSD.ORG Fri Dec 3 23:24:36 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 62BA716A4CE; Fri, 3 Dec 2004 23:24:36 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C908616A4EB for ; Fri, 3 Dec 2004 23:24:35 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B5FBE43D45 for ; Fri, 3 Dec 2004 23:24:35 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iB3NOZT5004693 for ; Fri, 3 Dec 2004 23:24:35 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB3NOZld004689 for perforce@freebsd.org; Fri, 3 Dec 2004 23:24:35 GMT (envelope-from sam@freebsd.org) Date: Fri, 3 Dec 2004 23:24:35 GMT Message-Id: <200412032324.iB3NOZld004689@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66373 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Dec 2004 23:24:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=66373 Change 66373 by sam@sam_ebb on 2004/12/03 23:24:19 o identify parameters to socket when a call fails o check for AF_UNSPEC when defaulting the address family Affected files ... .. //depot/projects/wifi/sbin/ifconfig/ifconfig.c#5 edit Differences ... ==== //depot/projects/wifi/sbin/ifconfig/ifconfig.c#5 (text+ko) ==== @@ -461,11 +461,13 @@ if (afp == NULL) afp = af_getbyname("inet"); - ifr.ifr_addr.sa_family = afp->af_af == AF_LINK ? AF_INET : afp->af_af; + ifr.ifr_addr.sa_family = + afp->af_af == AF_LINK || afp->af_af == AF_UNSPEC ? + AF_INET : afp->af_af; strncpy(ifr.ifr_name, name, sizeof ifr.ifr_name); if ((s = socket(ifr.ifr_addr.sa_family, SOCK_DGRAM, 0)) < 0) - err(1, "socket"); + err(1, "socket(family %u,SOCK_DGRAM", ifr.ifr_addr.sa_family); while (argc > 0) { const struct cmd *p; @@ -805,7 +807,7 @@ s = socket(ifr.ifr_addr.sa_family, SOCK_DGRAM, 0); if (s < 0) - err(1, "socket"); + err(1, "socket(family %u,SOCK_DGRAM)", ifr.ifr_addr.sa_family); printf("%s: ", name); printb("flags", flags, IFFBITS); From owner-p4-projects@FreeBSD.ORG Fri Dec 3 23:27:40 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6068E16A4D0; Fri, 3 Dec 2004 23:27:40 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 25FB716A4CE for ; Fri, 3 Dec 2004 23:27:40 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id ED48343D49 for ; Fri, 3 Dec 2004 23:27:39 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iB3NRd5V004789 for ; Fri, 3 Dec 2004 23:27:39 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB3NRdbY004786 for perforce@freebsd.org; Fri, 3 Dec 2004 23:27:39 GMT (envelope-from sam@freebsd.org) Date: Fri, 3 Dec 2004 23:27:39 GMT Message-Id: <200412032327.iB3NRdbY004786@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66374 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Dec 2004 23:27:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=66374 Change 66374 by sam@sam_ebb on 2004/12/03 23:27:09 correct the handling of fixed xmit rate: don't apply it to the negotiated rate set; just require that a negotiated rate set include the fix rate then leave it to the drivers/rate control algorithm to use only the fixed rate when sending frames Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_proto.c#12 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_proto.c#12 (text+ko) ==== @@ -330,12 +330,18 @@ { #define RV(v) ((v) & IEEE80211_RATE_VAL) int i, j, ignore, error; - int okrate, badrate; + int okrate, badrate, fixedrate; struct ieee80211_rateset *srs, *nrs; u_int8_t r; + /* + * If the fixed rate check was requested but no + * fixed has been defined then just remove it. + */ + if ((flags & IEEE80211_F_DOFRATE) && ic->ic_fixed_rate < 0) + flags &= ~IEEE80211_F_DOFRATE; error = 0; - okrate = badrate = 0; + okrate = badrate = fixedrate = 0; srs = &ic->ic_sup_rates[ieee80211_chan2mode(ic, ni->ni_chan)]; nrs = &ni->ni_rates; for (i = 0; i < nrs->rs_nrates; ) { @@ -356,17 +362,10 @@ badrate = r; if (flags & IEEE80211_F_DOFRATE) { /* - * Apply fixed rate constraint. Note that we do - * not apply the constraint to basic rates as - * otherwise we may not be able to associate if - * the rate set we submit to the AP is invalid - * (e.g. fix rate at 36Mb/s which is not a basic - * rate for 11a operation). + * Check any fixed rate is included. */ - if ((nrs->rs_rates[i] & IEEE80211_RATE_BASIC) == 0 && - ic->ic_fixed_rate >= 0 && - r != RV(srs->rs_rates[ic->ic_fixed_rate])) - ignore++; + if (r == RV(srs->rs_rates[ic->ic_fixed_rate])) + fixedrate = r; } if (flags & IEEE80211_F_DONEGO) { /* @@ -416,7 +415,8 @@ okrate = nrs->rs_rates[i]; i++; } - if (okrate == 0 || error != 0) + if (okrate == 0 || error != 0 || + ((flags & IEEE80211_F_DOFRATE) && fixedrate == 0)) return badrate | IEEE80211_RATE_BASIC; else return RV(okrate); From owner-p4-projects@FreeBSD.ORG Fri Dec 3 23:46:03 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E84BA16A4D0; Fri, 3 Dec 2004 23:46:02 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C4FEA16A4CE for ; Fri, 3 Dec 2004 23:46:02 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A06D443D45 for ; Fri, 3 Dec 2004 23:46:02 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iB3Nk2vi005488 for ; Fri, 3 Dec 2004 23:46:02 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB3Nk2YY005484 for perforce@freebsd.org; Fri, 3 Dec 2004 23:46:02 GMT (envelope-from sam@freebsd.org) Date: Fri, 3 Dec 2004 23:46:02 GMT Message-Id: <200412032346.iB3Nk2YY005484@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66375 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Dec 2004 23:46:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=66375 Change 66375 by sam@sam_ebb on 2004/12/03 23:45:04 make default dtim period 1 Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_var.h#16 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_var.h#16 (text+ko) ==== @@ -63,7 +63,7 @@ #define IEEE80211_DTIM_MAX 15 /* max DTIM period */ #define IEEE80211_DTIM_MIN 1 /* min DTIM period */ -#define IEEE80211_DTIM_DEFAULT 8 /* default DTIM period */ +#define IEEE80211_DTIM_DEFAULT 1 /* default DTIM period */ #define IEEE80211_PS_SLEEP 0x1 /* STA is in power saving mode */ #define IEEE80211_PS_MAX_QUEUE 50 /* maximum saved packets */ From owner-p4-projects@FreeBSD.ORG Sat Dec 4 00:19:44 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5168E16A4D0; Sat, 4 Dec 2004 00:19:44 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2952616A4CE for ; Sat, 4 Dec 2004 00:19:44 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E861A43D31 for ; Sat, 4 Dec 2004 00:19:43 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iB40JheD006431 for ; Sat, 4 Dec 2004 00:19:43 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB40Jh7X006428 for perforce@freebsd.org; Sat, 4 Dec 2004 00:19:43 GMT (envelope-from sam@freebsd.org) Date: Sat, 4 Dec 2004 00:19:43 GMT Message-Id: <200412040019.iB40Jh7X006428@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66377 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Dec 2004 00:19:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=66377 Change 66377 by sam@sam_ebb on 2004/12/04 00:19:43 beacon interval Affected files ... .. //depot/projects/wifi/sbin/ifconfig/ifieee80211.c#25 edit Differences ... ==== //depot/projects/wifi/sbin/ifconfig/ifieee80211.c#25 (text+ko) ==== @@ -565,6 +565,12 @@ set80211(s, IEEE80211_IOC_DTIM_PERIOD, atoi(val), 0, NULL); } +static +DECL_CMD_FUNC(set80211bintval, val, d) +{ + set80211(s, IEEE80211_IOC_BEACON_INTERVAL, atoi(val), 0, NULL); +} + static int getmaxrate(uint8_t rates[15], uint8_t nrates) { @@ -1485,6 +1491,16 @@ spacer = ' '; } } + ireq.i_type = IEEE80211_IOC_BEACON_INTERVAL; + if (ioctl(s, SIOCG80211, &ireq) != -1) { + if (ireq.i_val) { + printf("%cbintval %u", spacer, ireq.i_val); + spacer = ' '; + } else if (verbose) { + printf("%cbintval %u", spacer, ireq.i_val); + spacer = ' '; + } + } if (spacer != '\t') printf("\n"); @@ -1686,6 +1702,7 @@ DEF_CMD_ARG2("bss:aifs", set80211bssaifs), DEF_CMD_ARG2("bss:txoplimit", set80211bsstxoplimit), DEF_CMD_ARG("dtimperiod", set80211dtimperiod), + DEF_CMD_ARG("bintval", set80211bintval), }; static struct afswtch af_ieee80211 = { .af_name = "af_ieee80211", From owner-p4-projects@FreeBSD.ORG Sat Dec 4 00:20:46 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6C80916A4D0; Sat, 4 Dec 2004 00:20:46 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DF5D316A4CE for ; Sat, 4 Dec 2004 00:20:45 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C377943D5E for ; Sat, 4 Dec 2004 00:20:45 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iB40KjYo006511 for ; Sat, 4 Dec 2004 00:20:45 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB40KjJp006508 for perforce@freebsd.org; Sat, 4 Dec 2004 00:20:45 GMT (envelope-from sam@freebsd.org) Date: Sat, 4 Dec 2004 00:20:45 GMT Message-Id: <200412040020.iB40KjJp006508@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66378 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Dec 2004 00:20:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=66378 Change 66378 by sam@sam_ebb on 2004/12/04 00:20:23 o get/set beacon interval o disallow dtim period set in other than ap + ibss modes Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211.c#14 edit .. //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#25 edit .. //depot/projects/wifi/sys/net80211/ieee80211_ioctl.h#15 edit .. //depot/projects/wifi/sys/net80211/ieee80211_var.h#17 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211.c#14 (text+ko) ==== @@ -168,7 +168,7 @@ (void) ieee80211_setmode(ic, ic->ic_curmode); if (ic->ic_lintval == 0) - ic->ic_lintval = 100; /* default sleep */ + ic->ic_lintval = IEEE80211_BINTVAL_DEFAULT; ic->ic_bmisstimeout = 7*ic->ic_lintval; /* default 7 beacons */ ic->ic_dtim_period = IEEE80211_DTIM_DEFAULT; IEEE80211_BEACON_LOCK_INIT(ic, "beacon"); ==== //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#25 (text+ko) ==== @@ -1438,6 +1438,10 @@ case IEEE80211_IOC_DTIM_PERIOD: ireq->i_val = ic->ic_dtim_period; break; + case IEEE80211_IOC_BEACON_INTERVAL: + /* NB: get from ic_bss for station mode */ + ireq->i_val = ic->ic_bss->ni_intval; + break; default: error = EINVAL; break; @@ -2231,7 +2235,7 @@ error = ieee80211_ioctl_setchanlist(ic, ireq); break; case IEEE80211_IOC_SCAN_REQ: - if (ic->ic_opmode == IEEE80211_M_HOSTAP) + if (ic->ic_opmode == IEEE80211_M_HOSTAP) /* XXX ignore */ break; error = ieee80211_setupscan(ic, ic->ic_chan_avail); if (error == 0) /* XXX background scan */ @@ -2252,6 +2256,9 @@ error = ieee80211_ioctl_setwmeparam(ic, ireq); break; case IEEE80211_IOC_DTIM_PERIOD: + if (ic->ic_opmode != IEEE80211_M_HOSTAP && + ic->ic_opmode != IEEE80211_M_IBSS) + return EINVAL; if (IEEE80211_DTIM_MIN <= ireq->i_val && ireq->i_val <= IEEE80211_DTIM_MAX) { IEEE80211_BEACON_LOCK(ic); @@ -2260,6 +2267,17 @@ } else error = EINVAL; break; + case IEEE80211_IOC_BEACON_INTERVAL: + if (ic->ic_opmode != IEEE80211_M_HOSTAP && + ic->ic_opmode != IEEE80211_M_IBSS) + return EINVAL; + if (IEEE80211_BINTVAL_MIN <= ireq->i_val && + ireq->i_val <= IEEE80211_BINTVAL_MAX) { + ic->ic_lintval = ireq->i_val; + error = ENETRESET; /* requires restart */ + } else + error = EINVAL; + break; default: error = EINVAL; break; ==== //depot/projects/wifi/sys/net80211/ieee80211_ioctl.h#15 (text+ko) ==== @@ -419,7 +419,8 @@ #define IEEE80211_IOC_WME_TXOPLIMIT 49 /* WME: txops limit */ #define IEEE80211_IOC_WME_ACM 50 /* WME: ACM (bss only) */ #define IEEE80211_IOC_WME_ACKPOLICY 51 /* WME: ACK policy (!bss only)*/ -#define IEEE80211_IOC_DTIM_PERIOD 52 /* DTIM period */ +#define IEEE80211_IOC_DTIM_PERIOD 52 /* DTIM period (beacons) */ +#define IEEE80211_IOC_BEACON_INTERVAL 53 /* beacon interval (ms) */ /* * Scan result data returned for IEEE80211_IOC_SCAN_RESULTS. ==== //depot/projects/wifi/sys/net80211/ieee80211_var.h#17 (text+ko) ==== @@ -65,6 +65,10 @@ #define IEEE80211_DTIM_MIN 1 /* min DTIM period */ #define IEEE80211_DTIM_DEFAULT 1 /* default DTIM period */ +#define IEEE80211_BINTVAL_MAX 500 /* max beacon interval (ms) */ +#define IEEE80211_BINTVAL_MIN 25 /* min beacon interval */ +#define IEEE80211_BINTVAL_DEFAULT 100 /* default beacon interval */ + #define IEEE80211_PS_SLEEP 0x1 /* STA is in power saving mode */ #define IEEE80211_PS_MAX_QUEUE 50 /* maximum saved packets */ From owner-p4-projects@FreeBSD.ORG Sat Dec 4 00:41:11 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F1B3C16A4D0; Sat, 4 Dec 2004 00:41:10 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CE40E16A4CE for ; Sat, 4 Dec 2004 00:41:10 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BB0DD43D5C for ; Sat, 4 Dec 2004 00:41:10 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iB40fADP007194 for ; Sat, 4 Dec 2004 00:41:10 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB40fAc9007191 for perforce@freebsd.org; Sat, 4 Dec 2004 00:41:10 GMT (envelope-from sam@freebsd.org) Date: Sat, 4 Dec 2004 00:41:10 GMT Message-Id: <200412040041.iB40fAc9007191@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66379 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Dec 2004 00:41:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=66379 Change 66379 by sam@sam_ebb on 2004/12/04 00:40:33 shorten some debug msgs Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_input.c#23 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_input.c#23 (text+ko) ==== @@ -891,7 +891,7 @@ if (status != 0) { IEEE80211_DPRINTF(ic, IEEE80211_MSG_DEBUG | IEEE80211_MSG_AUTH, - "[%s] open authentication failed (reason %d)\n", + "[%s] open auth failed (reason %d)\n", ether_sprintf(ni->ni_macaddr), status); /* XXX can this happen? */ if (ni != ic->ic_bss) @@ -2301,7 +2301,7 @@ frm += 2; if (status != 0) { IEEE80211_DPRINTF(ic, IEEE80211_MSG_ASSOC, - "[%s] %sassociation failed (reason %d)\n", + "[%s] %sassoc failed (reason %d)\n", ether_sprintf(wh->i_addr2), ISREASSOC(subtype) ? "re" : "", status); if (ni != ic->ic_bss) /* XXX never true? */ @@ -2336,7 +2336,7 @@ IEEE80211_F_DONEGO | IEEE80211_F_DODEL); if (ni->ni_rates.rs_nrates == 0) { IEEE80211_DPRINTF(ic, IEEE80211_MSG_ASSOC, - "[%s] %sassociation failed (rate set mismatch)\n", + "[%s] %sassoc failed (rate set mismatch)\n", ether_sprintf(wh->i_addr2), ISREASSOC(subtype) ? "re" : ""); if (ni != ic->ic_bss) /* XXX never true? */ @@ -2379,7 +2379,7 @@ else ic->ic_flags &= ~IEEE80211_F_USEPROT; IEEE80211_DPRINTF(ic, IEEE80211_MSG_ASSOC, - "[%s] %sassociation success: %s preamble, %s slot time%s%s\n", + "[%s] %sassoc success: %s preamble, %s slot time%s%s\n", ether_sprintf(wh->i_addr2), ISREASSOC(subtype) ? "re" : "", ic->ic_flags&IEEE80211_F_SHPREAMBLE ? "short" : "long", From owner-p4-projects@FreeBSD.ORG Sat Dec 4 00:57:31 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 32AAF16A4D0; Sat, 4 Dec 2004 00:57:31 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0EAF116A4CE for ; Sat, 4 Dec 2004 00:57:31 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E166543D41 for ; Sat, 4 Dec 2004 00:57:30 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iB40vUBm014147 for ; Sat, 4 Dec 2004 00:57:30 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB40vUi1014144 for perforce@freebsd.org; Sat, 4 Dec 2004 00:57:30 GMT (envelope-from sam@freebsd.org) Date: Sat, 4 Dec 2004 00:57:30 GMT Message-Id: <200412040057.iB40vUi1014144@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66380 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Dec 2004 00:57:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=66380 Change 66380 by sam@sam_ebb on 2004/12/04 00:57:02 suppress more meaningless status by default Affected files ... .. //depot/projects/wifi/sbin/ifconfig/ifieee80211.c#26 edit Differences ... ==== //depot/projects/wifi/sbin/ifconfig/ifieee80211.c#26 (text+ko) ==== @@ -1178,6 +1178,31 @@ return 0; } +static const struct ieee80211_channel * +getchaninfo(int s, int chan) +{ + struct ieee80211req ireq; + static struct ieee80211req_chaninfo chans; + static struct ieee80211_channel undef; + const struct ieee80211_channel *c; + int i, freq; + + (void) memset(&ireq, 0, sizeof(ireq)); + (void) strncpy(ireq.i_name, name, sizeof(ireq.i_name)); + ireq.i_type = IEEE80211_IOC_CHANINFO; + ireq.i_data = &chans; + ireq.i_len = sizeof(chans); + if (ioctl(s, SIOCG80211, &ireq) < 0) + errx(1, "unable to get channel information"); + freq = ieee80211_ieee2mhz(chan); + for (i = 0; i < chans.ic_nchans; i++) { + c = &chans.ic_chans[i]; + if (c->ic_freq == freq) + return c; + } + return &undef; +} + static void ieee80211_status(int s, const struct rt_addrinfo *info __unused) { @@ -1186,6 +1211,7 @@ int i, num, wpa, wme; struct ieee80211req ireq; u_int8_t data[32]; + const struct ieee80211_channel *c; char spacer; (void) memset(&ireq, 0, sizeof(ireq)); @@ -1219,10 +1245,11 @@ ireq.i_type = IEEE80211_IOC_CHANNEL; if (ioctl(s, SIOCG80211, &ireq) < 0) goto end; + c = getchaninfo(s, ireq.i_val); if (ireq.i_val != -1) { printf(" channel %d", ireq.i_val); if (verbose) - printf(" (%u)", ieee80211_ieee2mhz(ireq.i_val)); + printf(" (%u)", c->ic_freq); } else if (verbose) printf(" channel UNDEF"); @@ -1361,27 +1388,27 @@ ireq.i_type = IEEE80211_IOC_POWERSAVE; if (ioctl(s, SIOCG80211, &ireq) != -1 && ireq.i_val != IEEE80211_POWERSAVE_NOSUP ) { - printf("%cpowersavemode", spacer); - spacer = ' '; - switch (ireq.i_val) { - case IEEE80211_POWERSAVE_OFF: - printf(" OFF"); - break; - case IEEE80211_POWERSAVE_CAM: - printf(" CAM"); - break; - case IEEE80211_POWERSAVE_PSP: - printf(" PSP"); - break; - case IEEE80211_POWERSAVE_PSP_CAM: - printf(" PSP-CAM"); - break; - } - - ireq.i_type = IEEE80211_IOC_POWERSAVESLEEP; - if (ioctl(s, SIOCG80211, &ireq) != -1) { - if (ireq.i_val) + if (ireq.i_val != IEEE80211_POWERSAVE_OFF || verbose) { + printf("%cpowersavemode", spacer); + switch (ireq.i_val) { + case IEEE80211_POWERSAVE_OFF: + printf(" OFF"); + break; + case IEEE80211_POWERSAVE_CAM: + printf(" CAM"); + break; + case IEEE80211_POWERSAVE_PSP: + printf(" PSP"); + break; + case IEEE80211_POWERSAVE_PSP_CAM: + printf(" PSP-CAM"); + break; + } + ireq.i_type = IEEE80211_IOC_POWERSAVESLEEP; + if (ioctl(s, SIOCG80211, &ireq) != -1) { printf(" powersavesleep %d", ireq.i_val); + } + spacer = ' '; } } @@ -1409,24 +1436,26 @@ spacer = ' '; } - ireq.i_type = IEEE80211_IOC_PROTMODE; - if (ioctl(s, SIOCG80211, &ireq) != -1) { - printf("%cprotmode ", spacer); - switch (ireq.i_val) { - case IEEE80211_PROTMODE_OFF: - printf("OFF"); - break; - case IEEE80211_PROTMODE_CTS: - printf("CTS"); - break; - case IEEE80211_PROTMODE_RTSCTS: - printf("RTSCTS"); - break; - default: - printf("UNKNOWN (0x%x)", ireq.i_val); - break; + if (IEEE80211_IS_CHAN_G(c) || IEEE80211_IS_CHAN_PUREG(c) || verbose) { + ireq.i_type = IEEE80211_IOC_PROTMODE; + if (ioctl(s, SIOCG80211, &ireq) != -1) { + printf("%cprotmode ", spacer); + switch (ireq.i_val) { + case IEEE80211_PROTMODE_OFF: + printf("OFF"); + break; + case IEEE80211_PROTMODE_CTS: + printf("CTS"); + break; + case IEEE80211_PROTMODE_RTSCTS: + printf("RTSCTS"); + break; + default: + printf("UNKNOWN (0x%x)", ireq.i_val); + break; + } + spacer = ' '; } - spacer = ' '; } ireq.i_type = IEEE80211_IOC_WME; @@ -1473,22 +1502,24 @@ } else { ireq.i_type = IEEE80211_IOC_ROAMING; if (ioctl(s, SIOCG80211, &ireq) != -1) { - printf("%croaming ", spacer); - switch (ireq.i_val) { - case IEEE80211_ROAMING_DEVICE: - printf("DEVICE"); - break; - case IEEE80211_ROAMING_AUTO: - printf("AUTO"); - break; - case IEEE80211_ROAMING_MANUAL: - printf("MANUAL"); - break; - default: - printf("UNKNOWN (0x%x)", ireq.i_val); - break; + if (ireq.i_val != IEEE80211_ROAMING_AUTO || verbose) { + printf("%croaming ", spacer); + switch (ireq.i_val) { + case IEEE80211_ROAMING_DEVICE: + printf("DEVICE"); + break; + case IEEE80211_ROAMING_AUTO: + printf("AUTO"); + break; + case IEEE80211_ROAMING_MANUAL: + printf("MANUAL"); + break; + default: + printf("UNKNOWN (0x%x)", ireq.i_val); + break; + } + spacer = ' '; } - spacer = ' '; } } ireq.i_type = IEEE80211_IOC_BEACON_INTERVAL; From owner-p4-projects@FreeBSD.ORG Sat Dec 4 02:30:23 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1C3BC16A4D1; Sat, 4 Dec 2004 02:30:23 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DA6A216A4CF for ; Sat, 4 Dec 2004 02:30:22 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9F41643D46 for ; Sat, 4 Dec 2004 02:30:22 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iB42UMUO017589 for ; Sat, 4 Dec 2004 02:30:22 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB42UMUu017577 for perforce@freebsd.org; Sat, 4 Dec 2004 02:30:22 GMT (envelope-from sam@freebsd.org) Date: Sat, 4 Dec 2004 02:30:22 GMT Message-Id: <200412040230.iB42UMUu017577@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66381 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Dec 2004 02:30:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=66381 Change 66381 by sam@sam_ebb on 2004/12/04 02:30:04 There are too many parameters for 802.11 devices so stop trying to use a fixed format and just bin-pack the output with special consideration for keys. Not 100% happy with this; it'll likely need tweaking. Affected files ... .. //depot/projects/wifi/sbin/ifconfig/ifieee80211.c#27 edit Differences ... ==== //depot/projects/wifi/sbin/ifconfig/ifieee80211.c#27 (text+ko) ==== @@ -1079,6 +1079,31 @@ return IEEE80211_M_STA; } +static const struct ieee80211_channel * +getchaninfo(int s, int chan) +{ + struct ieee80211req ireq; + static struct ieee80211req_chaninfo chans; + static struct ieee80211_channel undef; + const struct ieee80211_channel *c; + int i, freq; + + (void) memset(&ireq, 0, sizeof(ireq)); + (void) strncpy(ireq.i_name, name, sizeof(ireq.i_name)); + ireq.i_type = IEEE80211_IOC_CHANINFO; + ireq.i_data = &chans; + ireq.i_len = sizeof(chans); + if (ioctl(s, SIOCG80211, &ireq) < 0) + errx(1, "unable to get channel information"); + freq = ieee80211_ieee2mhz(chan); + for (i = 0; i < chans.ic_nchans; i++) { + c = &chans.ic_chans[i]; + if (c->ic_freq == freq) + return c; + } + return &undef; +} + #if 0 static void printcipher(int s, struct ieee80211req *ireq, int keylenop) @@ -1115,42 +1140,73 @@ } #endif -static int +#define MAXCOL 78 +int col; +char spacer; + +#define LINE_BREAK() do { \ + if (spacer != '\t') { \ + printf("\n"); \ + spacer = '\t'; \ + } \ + col = 8; /* 8-col tab */ \ +} while (0) +#define LINE_CHECK(fmt, ...) do { \ + col += sizeof(fmt)-2; \ + if (col > MAXCOL) { \ + LINE_BREAK(); \ + col += sizeof(fmt)-2; \ + } \ + printf(fmt, __VA_ARGS__); \ + spacer = ' '; \ +} while (0) + +static void printkey(const struct ieee80211req_key *ik) { static const uint8_t zerodata[IEEE80211_KEYBUF_SIZE]; int keylen = ik->ik_keylen; + int printcontents; + printcontents = + (memcmp(ik->ik_keydata, zerodata, keylen) != 0 || verbose); + if (printcontents) + LINE_BREAK(); switch (ik->ik_type) { case IEEE80211_CIPHER_WEP: /* compatibility */ - printf("wepkey %u:%s", ik->ik_keyix+1, + LINE_CHECK("%cwepkey %u:%s", spacer, ik->ik_keyix+1, keylen <= 5 ? "40-bit" : keylen <= 13 ? "104-bit" : "128-bit"); break; case IEEE80211_CIPHER_TKIP: if (keylen > 128/8) keylen -= 128/8; /* ignore MIC for now */ - printf("TKIP %u:%u-bit", ik->ik_keyix+1, 8*keylen); + LINE_CHECK("%cTKIP %u:%u-bit", + spacer, ik->ik_keyix+1, 8*keylen); break; case IEEE80211_CIPHER_AES_OCB: - printf("AES-OCB %u:%u-bit", ik->ik_keyix+1, 8*keylen); + LINE_CHECK("%cAES-OCB %u:%u-bit", + spacer, ik->ik_keyix+1, 8*keylen); break; case IEEE80211_CIPHER_AES_CCM: - printf("AES-CCM %u:%u-bit", ik->ik_keyix+1, 8*keylen); + LINE_CHECK("%cAES-CCM %u:%u-bit", + spacer, ik->ik_keyix+1, 8*keylen); break; case IEEE80211_CIPHER_CKIP: - printf("CKIP %u:%u-bit", ik->ik_keyix+1, 8*keylen); + LINE_CHECK("%cCKIP %u:%u-bit", + spacer, ik->ik_keyix+1, 8*keylen); break; case IEEE80211_CIPHER_NONE: - printf("NULL %u:%u-bit", ik->ik_keyix+1, 8*keylen); + LINE_CHECK("%cNULL %u:%u-bit", + spacer, ik->ik_keyix+1, 8*keylen); break; default: - printf("UNKNOWN (0x%x) %u:%u-bit", ik->ik_type, - ik->ik_keyix+1, 8*keylen); + LINE_CHECK("%cUNKNOWN (0x%x) %u:%u-bit", spacer, + ik->ik_type, ik->ik_keyix+1, 8*keylen); break; } - if (memcmp(ik->ik_keydata, zerodata, keylen) != 0 || verbose) { + if (printcontents) { int i; printf(" <"); @@ -1173,36 +1229,10 @@ if (ik->ik_flags & IEEE80211_KEY_DEFAULT) printf("%sdef", sep), sep = "+"; } - return 1; /* tell caller to do line break */ + LINE_BREAK(); } - return 0; } -static const struct ieee80211_channel * -getchaninfo(int s, int chan) -{ - struct ieee80211req ireq; - static struct ieee80211req_chaninfo chans; - static struct ieee80211_channel undef; - const struct ieee80211_channel *c; - int i, freq; - - (void) memset(&ireq, 0, sizeof(ireq)); - (void) strncpy(ireq.i_name, name, sizeof(ireq.i_name)); - ireq.i_type = IEEE80211_IOC_CHANINFO; - ireq.i_data = &chans; - ireq.i_len = sizeof(chans); - if (ioctl(s, SIOCG80211, &ireq) < 0) - errx(1, "unable to get channel information"); - freq = ieee80211_ieee2mhz(chan); - for (i = 0; i < chans.ic_nchans; i++) { - c = &chans.ic_chans[i]; - if (c->ic_freq == freq) - return c; - } - return &undef; -} - static void ieee80211_status(int s, const struct rt_addrinfo *info __unused) { @@ -1212,7 +1242,6 @@ struct ieee80211req ireq; u_int8_t data[32]; const struct ieee80211_channel *c; - char spacer; (void) memset(&ireq, 0, sizeof(ireq)); (void) strncpy(ireq.i_name, name, sizeof(ireq.i_name)); @@ -1259,33 +1288,29 @@ memcmp(ireq.i_data, zerobssid, sizeof(zerobssid)) != 0) printf(" bssid %s", ether_ntoa(ireq.i_data)); - printf("\n"); - ireq.i_type = IEEE80211_IOC_STATIONNAME; if (ioctl(s, SIOCG80211, &ireq) != -1) { - printf("\tstationname "); + printf("\n\tstationname "); print_string(data, ireq.i_len); - printf("\n"); } - spacer = '\t'; + spacer = ' '; /* force first break */ + LINE_BREAK(); ireq.i_type = IEEE80211_IOC_AUTHMODE; if (ioctl(s, SIOCG80211, &ireq) != -1) { - printf("%cauthmode ", spacer); - spacer = ' '; switch (ireq.i_val) { case IEEE80211_AUTH_NONE: - printf("NONE"); + LINE_CHECK("%cauthmode NONE", spacer); break; case IEEE80211_AUTH_OPEN: - printf("OPEN"); + LINE_CHECK("%cauthmode OPEN", spacer); break; case IEEE80211_AUTH_SHARED: - printf("SHARED"); + LINE_CHECK("%cauthmode SHARED", spacer); break; case IEEE80211_AUTH_8021X: - printf("802.1x"); + LINE_CHECK("%cauthmode 802.1x", spacer); break; case IEEE80211_AUTH_WPA: ireq.i_type = IEEE80211_IOC_WPA; @@ -1295,21 +1320,24 @@ wpa = 1; /* default to WPA1 */ switch (wpa) { case 2: - printf("WPA2/802.11i"); + LINE_CHECK("%cauthmode WPA2/802.11i", + spacer); break; case 3: - printf("WPA1+WPA2/802.11i"); + LINE_CHECK("%cauthmode WPA1+WPA2/802.11i", + spacer); break; default: - printf("WPA"); + LINE_CHECK("%cauthmode WPA", spacer); break; } break; case IEEE80211_AUTH_AUTO: - printf("AUTO"); + LINE_CHECK("%cauthmode AUTO", spacer); break; default: - printf("UNKNOWN (0x%x)", ireq.i_val); + LINE_CHECK("%cauthmode UNKNOWN (0x%x)", + spacer, ireq.i_val); break; } } @@ -1317,19 +1345,21 @@ ireq.i_type = IEEE80211_IOC_WEP; if (ioctl(s, SIOCG80211, &ireq) != -1 && ireq.i_val != IEEE80211_WEP_NOSUP) { - printf("%cprivacy ", spacer); + int firstkey; + switch (ireq.i_val) { case IEEE80211_WEP_OFF: - printf("OFF"); + LINE_CHECK("%cprivacy OFF", spacer); break; case IEEE80211_WEP_ON: - printf("ON"); + LINE_CHECK("%cprivacy ON", spacer); break; case IEEE80211_WEP_MIXED: - printf("MIXED"); + LINE_CHECK("%cprivacy MIXED", spacer); break; default: - printf("UNKNOWN (0x%x)", ireq.i_val); + LINE_CHECK("%cprivacy UNKNOWN (0x%x)", + spacer, ireq.i_val); break; } @@ -1344,9 +1374,9 @@ goto end; } if (ireq.i_val != -1) - printf(" deftxkey %d", ireq.i_val+1); + LINE_CHECK("%cdeftxkey %d", spacer, ireq.i_val+1); else if (verbose) - printf(" deftxkey UNDEF"); + LINE_CHECK("%cdeftxkey UNDEF", spacer); ireq.i_type = IEEE80211_IOC_NUMWEPKEYS; if (ioctl(s, SIOCG80211, &ireq) < 0) { @@ -1355,9 +1385,7 @@ } num = ireq.i_val; - printf("\n"); - spacer = '\t'; - + firstkey = 1; for (i = 0; i < num; i++) { struct ieee80211req_key ik; @@ -1370,187 +1398,151 @@ warn("WEP support, but can get keys!"); goto end; } - if (ik.ik_keylen == 0) - continue; - printf("%c", spacer); - if (printkey(&ik)) { - printf("\n"); - spacer = '\t'; - } else - spacer = ' '; + if (ik.ik_keylen != 0) { + if (verbose) + LINE_BREAK(); + printkey(&ik); + firstkey = 0; + } } } - if (spacer != '\t') - printf("\n"); - spacer = '\t'; - ireq.i_type = IEEE80211_IOC_POWERSAVE; if (ioctl(s, SIOCG80211, &ireq) != -1 && ireq.i_val != IEEE80211_POWERSAVE_NOSUP ) { if (ireq.i_val != IEEE80211_POWERSAVE_OFF || verbose) { - printf("%cpowersavemode", spacer); switch (ireq.i_val) { case IEEE80211_POWERSAVE_OFF: - printf(" OFF"); + LINE_CHECK("%cpowersavemode OFF", + spacer); break; case IEEE80211_POWERSAVE_CAM: - printf(" CAM"); + LINE_CHECK("%cpowersavemode CAM", + spacer); break; case IEEE80211_POWERSAVE_PSP: - printf(" PSP"); + LINE_CHECK("%cpowersavemode PSP", + spacer); break; case IEEE80211_POWERSAVE_PSP_CAM: - printf(" PSP-CAM"); + LINE_CHECK("%cpowersavemode PSP-CAM", + spacer); break; } ireq.i_type = IEEE80211_IOC_POWERSAVESLEEP; - if (ioctl(s, SIOCG80211, &ireq) != -1) { - printf(" powersavesleep %d", ireq.i_val); - } - spacer = ' '; + if (ioctl(s, SIOCG80211, &ireq) != -1) + LINE_CHECK("%cpowersavesleep %d", + spacer, ireq.i_val); } } ireq.i_type = IEEE80211_IOC_TXPOWMAX; - if (ioctl(s, SIOCG80211, &ireq) != -1) { - printf("%ctxpowmax %d", spacer, ireq.i_val); - spacer = ' '; - } + if (ioctl(s, SIOCG80211, &ireq) != -1) + LINE_CHECK("%ctxpowmax %d", spacer, ireq.i_val); if (verbose) { ireq.i_type = IEEE80211_IOC_TXPOWER; - if (ioctl(s, SIOCG80211, &ireq) != -1) { - printf("%ctxpower %d", spacer, ireq.i_val); - spacer = ' '; - } + if (ioctl(s, SIOCG80211, &ireq) != -1) + LINE_CHECK("%ctxpower %d", spacer, ireq.i_val); } - if (spacer != '\t') - printf("\n"); - spacer = '\t'; - ireq.i_type = IEEE80211_IOC_RTSTHRESHOLD; - if (ioctl(s, SIOCG80211, &ireq) != -1) { - printf("%crtsthreshold %d", spacer, ireq.i_val); - spacer = ' '; - } + if (ioctl(s, SIOCG80211, &ireq) != -1) + LINE_CHECK("%crtsthreshold %d", spacer, ireq.i_val); if (IEEE80211_IS_CHAN_G(c) || IEEE80211_IS_CHAN_PUREG(c) || verbose) { ireq.i_type = IEEE80211_IOC_PROTMODE; if (ioctl(s, SIOCG80211, &ireq) != -1) { - printf("%cprotmode ", spacer); switch (ireq.i_val) { case IEEE80211_PROTMODE_OFF: - printf("OFF"); + LINE_CHECK("%cprotmode OFF", spacer); break; case IEEE80211_PROTMODE_CTS: - printf("CTS"); + LINE_CHECK("%cprotmode CTS", spacer); break; case IEEE80211_PROTMODE_RTSCTS: - printf("RTSCTS"); + LINE_CHECK("%cprotmode RTSCTS", spacer); break; default: - printf("UNKNOWN (0x%x)", ireq.i_val); + LINE_CHECK("%cprotmode UNKNOWN (0x%x)", + spacer, ireq.i_val); break; } - spacer = ' '; } } ireq.i_type = IEEE80211_IOC_WME; if (ioctl(s, SIOCG80211, &ireq) != -1) { wme = ireq.i_val; - if (wme) { - printf("%cwme", spacer); - spacer = ' '; - } else if (verbose) { - printf("%c-wme", spacer); - spacer = ' '; - } + if (wme) + LINE_CHECK("%cwme", spacer); + else if (verbose) + LINE_CHECK("%c-wme", spacer); } else wme = 0; if (opmode == IEEE80211_M_HOSTAP) { ireq.i_type = IEEE80211_IOC_HIDESSID; if (ioctl(s, SIOCG80211, &ireq) != -1) { - if (ireq.i_val) { - printf("%cssid HIDE", spacer); - spacer = ' '; - } else if (verbose) { - printf("%cssid SHOW", spacer); - spacer = ' '; - } + if (ireq.i_val) + LINE_CHECK("%cssid HIDE", spacer); + else if (verbose) + LINE_CHECK("%cssid SHOW", spacer); } ireq.i_type = IEEE80211_IOC_APBRIDGE; if (ioctl(s, SIOCG80211, &ireq) != -1) { - if (!ireq.i_val) { - printf("%c-apbridge", spacer); - spacer = ' '; - } else if (verbose) { - printf("%capbridge", spacer); - spacer = ' '; - } + if (!ireq.i_val) + LINE_CHECK("%c-apbridge", spacer); + else if (verbose) + LINE_CHECK("%capbridge", spacer); } ireq.i_type = IEEE80211_IOC_DTIM_PERIOD; - if (ioctl(s, SIOCG80211, &ireq) != -1) { - printf("%cdtimperiod %u", spacer, ireq.i_val); - spacer = ' '; - } + if (ioctl(s, SIOCG80211, &ireq) != -1) + LINE_CHECK("%cdtimperiod %u", spacer, ireq.i_val); } else { ireq.i_type = IEEE80211_IOC_ROAMING; if (ioctl(s, SIOCG80211, &ireq) != -1) { if (ireq.i_val != IEEE80211_ROAMING_AUTO || verbose) { - printf("%croaming ", spacer); switch (ireq.i_val) { case IEEE80211_ROAMING_DEVICE: - printf("DEVICE"); + LINE_CHECK("%croaming DEVICE", spacer); break; case IEEE80211_ROAMING_AUTO: - printf("AUTO"); + LINE_CHECK("%croaming AUTO", spacer); break; case IEEE80211_ROAMING_MANUAL: - printf("MANUAL"); + LINE_CHECK("%croaming MANUAL", spacer); break; default: - printf("UNKNOWN (0x%x)", ireq.i_val); + LINE_CHECK("%croaming UNKNOWN (0x%x)", + spacer, ireq.i_val); break; } - spacer = ' '; } } } ireq.i_type = IEEE80211_IOC_BEACON_INTERVAL; if (ioctl(s, SIOCG80211, &ireq) != -1) { - if (ireq.i_val) { - printf("%cbintval %u", spacer, ireq.i_val); - spacer = ' '; - } else if (verbose) { - printf("%cbintval %u", spacer, ireq.i_val); - spacer = ' '; - } + if (ireq.i_val) + LINE_CHECK("%cbintval %u", spacer, ireq.i_val); + else if (verbose) + LINE_CHECK("%cbintval %u", spacer, ireq.i_val); } - if (spacer != '\t') - printf("\n"); - spacer = '\t'; - - if (wme && verbose) + if (wme && verbose) { + LINE_BREAK(); list_wme(s); + } if (wpa) { - spacer = '\t'; ireq.i_type = IEEE80211_IOC_COUNTERMEASURES; if (ioctl(s, SIOCG80211, &ireq) != -1) { - if (ireq.i_val) { - printf("%ccountermeasures", spacer); - spacer = ' '; - } else if (verbose) { - printf("%c-countermeasures", spacer); - spacer = ' '; - } + if (ireq.i_val) + LINE_CHECK("%ccountermeasures", spacer); + else if (verbose) + LINE_CHECK("%c-countermeasures", spacer); } #if 0 /* XXX not interesting with WPA done in user space */ @@ -1583,9 +1575,9 @@ if (ioctl(s, SIOCG80211, &ireq) != -1) { } #endif - if (spacer != '\t') - printf("\n"); + LINE_BREAK(); } + LINE_BREAK(); end: return; From owner-p4-projects@FreeBSD.ORG Sat Dec 4 02:45:42 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A570816A4D0; Sat, 4 Dec 2004 02:45:41 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8073A16A4CE for ; Sat, 4 Dec 2004 02:45:41 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7118843D5A for ; Sat, 4 Dec 2004 02:45:41 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iB42jfZf018040 for ; Sat, 4 Dec 2004 02:45:41 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB42jfpY018037 for perforce@freebsd.org; Sat, 4 Dec 2004 02:45:41 GMT (envelope-from sam@freebsd.org) Date: Sat, 4 Dec 2004 02:45:41 GMT Message-Id: <200412040245.iB42jfpY018037@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66382 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Dec 2004 02:45:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=66382 Change 66382 by sam@sam_ebb on 2004/12/04 02:45:27 one more, supress rtsthreshold Affected files ... .. //depot/projects/wifi/sbin/ifconfig/ifieee80211.c#28 edit Differences ... ==== //depot/projects/wifi/sbin/ifconfig/ifieee80211.c#28 (text+ko) ==== @@ -1447,8 +1447,10 @@ } ireq.i_type = IEEE80211_IOC_RTSTHRESHOLD; - if (ioctl(s, SIOCG80211, &ireq) != -1) - LINE_CHECK("%crtsthreshold %d", spacer, ireq.i_val); + if (ioctl(s, SIOCG80211, &ireq) != -1) { + if (ireq.i_val != IEEE80211_RTS_MAX || verbose) + LINE_CHECK("%crtsthreshold %d", spacer, ireq.i_val); + } if (IEEE80211_IS_CHAN_G(c) || IEEE80211_IS_CHAN_PUREG(c) || verbose) { ireq.i_type = IEEE80211_IOC_PROTMODE; From owner-p4-projects@FreeBSD.ORG Sat Dec 4 02:48:46 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CEDF816A4D0; Sat, 4 Dec 2004 02:48:45 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id ABF5316A4CE for ; Sat, 4 Dec 2004 02:48:45 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9C7C543D58 for ; Sat, 4 Dec 2004 02:48:45 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iB42mjuC018076 for ; Sat, 4 Dec 2004 02:48:45 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB42mj9P018073 for perforce@freebsd.org; Sat, 4 Dec 2004 02:48:45 GMT (envelope-from sam@freebsd.org) Date: Sat, 4 Dec 2004 02:48:45 GMT Message-Id: <200412040248.iB42mj9P018073@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66383 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Dec 2004 02:48:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=66383 Change 66383 by sam@sam_ebb on 2004/12/04 02:48:01 o clear global crypto keys when going to init state o add hack to catch a bogus state transition Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_proto.c#13 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_proto.c#13 (text+ko) ==== @@ -849,6 +849,10 @@ break; case IEEE80211_M_HOSTAP: nt = ic->ic_sta; + if (nt == NULL) { /* XXX cannot happen */ + if_printf(ifp, "no sta table (run)\n"); + break; + } IEEE80211_NODE_LOCK(nt); TAILQ_FOREACH(ni, &nt->nt_node, ni_list) { if (ni->ni_associd == 0) @@ -872,6 +876,10 @@ break; case IEEE80211_M_HOSTAP: nt = ic->ic_sta; + if (nt == NULL) { /* XXX cannot happen */ + if_printf(ifp, "no sta table (assoc)\n"); + break; + } IEEE80211_NODE_LOCK(nt); TAILQ_FOREACH(ni, &nt->nt_node, ni_list) { IEEE80211_SEND_MGMT(ic, ni, @@ -890,6 +898,7 @@ ic->ic_mgt_timer = 0; IF_DRAIN(&ic->ic_mgtq); ieee80211_reset_bss(ic); + ieee80211_crypto_delglobalkeys(ic); break; } if (ic->ic_auth->ia_detach != NULL) From owner-p4-projects@FreeBSD.ORG Sat Dec 4 05:07:34 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3324F16A4D0; Sat, 4 Dec 2004 05:07:34 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DA0A816A4CE for ; Sat, 4 Dec 2004 05:07:33 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 594C043D2D for ; Sat, 4 Dec 2004 05:07:33 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iB457X38028892 for ; Sat, 4 Dec 2004 05:07:33 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB457W5r028889 for perforce@freebsd.org; Sat, 4 Dec 2004 05:07:32 GMT (envelope-from sam@freebsd.org) Date: Sat, 4 Dec 2004 05:07:32 GMT Message-Id: <200412040507.iB457W5r028889@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66385 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Dec 2004 05:07:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=66385 Change 66385 by sam@sam_ebb on 2004/12/04 05:07:09 IFC @ 66384 Affected files ... .. //depot/projects/wifi/Makefile.inc1#6 integrate .. //depot/projects/wifi/bin/sh/jobs.c#2 integrate .. //depot/projects/wifi/bin/sh/sh.1#3 integrate .. //depot/projects/wifi/etc/defaults/rc.conf#6 integrate .. //depot/projects/wifi/lib/libc/gen/getcontext.3#2 integrate .. //depot/projects/wifi/release/i386/mkisoimages.sh#2 integrate .. //depot/projects/wifi/sbin/dump/dump.h#2 integrate .. //depot/projects/wifi/sbin/dump/itime.c#2 integrate .. //depot/projects/wifi/share/man/man9/EVENTHANDLER.9#1 branch .. //depot/projects/wifi/share/man/man9/Makefile#3 integrate .. //depot/projects/wifi/share/man/man9/style.9#2 integrate .. //depot/projects/wifi/share/zoneinfo/europe#2 integrate .. //depot/projects/wifi/share/zoneinfo/northamerica#2 integrate .. //depot/projects/wifi/share/zoneinfo/southamerica#2 integrate .. //depot/projects/wifi/sys/alpha/alpha/gdb_machdep.c#2 integrate .. //depot/projects/wifi/sys/alpha/include/gdb_machdep.h#2 integrate .. //depot/projects/wifi/sys/amd64/amd64/gdb_machdep.c#3 integrate .. //depot/projects/wifi/sys/amd64/amd64/pmap.c#3 integrate .. //depot/projects/wifi/sys/amd64/include/gdb_machdep.h#2 integrate .. //depot/projects/wifi/sys/arm/arm/trap.c#5 integrate .. //depot/projects/wifi/sys/boot/common/loader.8#2 integrate .. //depot/projects/wifi/sys/boot/efi/libefi/bootinfo.c#2 integrate .. //depot/projects/wifi/sys/boot/forth/beastie.4th#3 integrate .. //depot/projects/wifi/sys/boot/forth/loader.conf#3 integrate .. //depot/projects/wifi/sys/boot/i386/libi386/bootinfo.c#2 integrate .. //depot/projects/wifi/sys/boot/i386/loader/help.i386#2 integrate .. //depot/projects/wifi/sys/boot/ia64/ski/bootinfo.c#2 integrate .. //depot/projects/wifi/sys/boot/pc98/boot2/boot.c#2 integrate .. //depot/projects/wifi/sys/boot/pc98/loader/help.pc98#2 integrate .. //depot/projects/wifi/sys/boot/powerpc/loader/metadata.c#2 integrate .. //depot/projects/wifi/sys/boot/sparc64/loader/metadata.c#2 integrate .. //depot/projects/wifi/sys/coda/coda_vnops.c#3 integrate .. //depot/projects/wifi/sys/coda/coda_vnops.h#2 integrate .. //depot/projects/wifi/sys/compat/linprocfs/linprocfs.c#3 integrate .. //depot/projects/wifi/sys/compat/linux/linux_file.c#3 integrate .. //depot/projects/wifi/sys/conf/kern.post.mk#3 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/CHANGES.txt#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/acconfig.h#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/acdebug.h#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/acenv.h#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/acevents.h#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/acexcep.h#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/acglobal.h#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/achware.h#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/acinterp.h#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/aclocal.h#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/acmacros.h#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/acobject.h#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/acoutput.h#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/acpiosxf.h#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/acpixf.h#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/actbl2.h#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/actypes.h#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/acutils.h#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/amlcode.h#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/amlresrc.h#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/common/adisasm.c#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/compiler/aslanalyze.c#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/compiler/aslcodegen.c#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/compiler/aslcompiler.h#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/compiler/aslcompiler.l#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/compiler/aslcompiler.y#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/compiler/aslglobal.h#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/compiler/aslmain.c#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/compiler/aslmap.c#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/compiler/aslopcodes.c#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/compiler/aslopt.c#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/compiler/asltransform.c#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/compiler/asltypes.h#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/dbcmds.c#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/dbexec.c#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/dbinput.c#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/dbutils.c#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/dmwalk.c#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/dsmethod.c#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/dsmthdat.c#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/dsutils.c#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/dswexec.c#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/dswload.c#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/dswstate.c#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/evgpe.c#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/evgpeblk.c#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/evmisc.c#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/evregion.c#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/evrgnini.c#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/evxface.c#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/exconfig.c#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/exconvrt.c#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/exdump.c#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/exfldio.c#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/exmisc.c#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/exoparg1.c#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/exoparg2.c#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/exprep.c#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/exregion.c#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/exresolv.c#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/exresop.c#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/exstore.c#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/exsystem.c#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/exutils.c#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/hwgpe.c#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/hwregs.c#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/hwsleep.c#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/hwtimer.c#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/nsaccess.c#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/nsalloc.c#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/nsdump.c#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/nsdumpdv.c#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/nseval.c#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/nsinit.c#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/nsload.c#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/nsnames.c#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/nssearch.c#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/nsutils.c#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/nswalk.c#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/osunixxf.c#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/psopcode.c#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/psparse.c#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/psutils.c#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/rscalc.c#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/rsxface.c#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/tbconvrt.c#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/tbget.c#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/tbinstal.c#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/tbrsdt.c#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/tbxfroot.c#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/utalloc.c#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/utclib.c#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/utcopy.c#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/utdelete.c#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/uteval.c#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/utglobal.c#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/utmath.c#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/utmisc.c#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/utobject.c#2 integrate .. //depot/projects/wifi/sys/dev/acpica/Osd/OsdInterrupt.c#2 integrate .. //depot/projects/wifi/sys/dev/acpica/Osd/OsdSchedule.c#2 integrate .. //depot/projects/wifi/sys/dev/acpica/acpi.c#2 integrate .. //depot/projects/wifi/sys/dev/acpica/acpi_acad.c#2 integrate .. //depot/projects/wifi/sys/dev/acpica/acpi_cmbat.c#2 integrate .. //depot/projects/wifi/sys/dev/acpica/acpi_if.m#2 integrate .. //depot/projects/wifi/sys/dev/acpica/acpi_pci_link.c#5 integrate .. //depot/projects/wifi/sys/dev/cp/if_cp.c#2 integrate .. //depot/projects/wifi/sys/dev/ctau/if_ct.c#2 integrate .. //depot/projects/wifi/sys/dev/cx/if_cx.c#2 integrate .. //depot/projects/wifi/sys/dev/drm/drm_os_freebsd.h#2 integrate .. //depot/projects/wifi/sys/dev/pci/pci.c#4 integrate .. //depot/projects/wifi/sys/dev/syscons/syscons.c#2 integrate .. //depot/projects/wifi/sys/fs/deadfs/dead_vnops.c#3 integrate .. //depot/projects/wifi/sys/fs/devfs/devfs_vnops.c#7 integrate .. //depot/projects/wifi/sys/fs/fdescfs/fdesc_vnops.c#3 integrate .. //depot/projects/wifi/sys/fs/fifofs/fifo.h#2 integrate .. //depot/projects/wifi/sys/fs/fifofs/fifo_vnops.c#5 integrate .. //depot/projects/wifi/sys/fs/hpfs/hpfs.h#3 integrate .. //depot/projects/wifi/sys/fs/hpfs/hpfs_vfsops.c#4 integrate .. //depot/projects/wifi/sys/fs/hpfs/hpfs_vnops.c#4 integrate .. //depot/projects/wifi/sys/fs/msdosfs/denode.h#2 integrate .. //depot/projects/wifi/sys/fs/msdosfs/msdosfs_denode.c#3 integrate .. //depot/projects/wifi/sys/fs/msdosfs/msdosfs_vnops.c#4 integrate .. //depot/projects/wifi/sys/fs/ntfs/ntfs.h#3 integrate .. //depot/projects/wifi/sys/fs/ntfs/ntfs_vfsops.c#5 integrate .. //depot/projects/wifi/sys/fs/ntfs/ntfs_vnops.c#4 integrate .. //depot/projects/wifi/sys/fs/nullfs/null.h#2 integrate .. //depot/projects/wifi/sys/fs/nullfs/null_subr.c#2 integrate .. //depot/projects/wifi/sys/fs/nullfs/null_vfsops.c#4 integrate .. //depot/projects/wifi/sys/fs/nullfs/null_vnops.c#3 integrate .. //depot/projects/wifi/sys/fs/nwfs/nwfs.h#2 integrate .. //depot/projects/wifi/sys/fs/nwfs/nwfs_node.c#2 integrate .. //depot/projects/wifi/sys/fs/nwfs/nwfs_vnops.c#2 integrate .. //depot/projects/wifi/sys/fs/portalfs/portal.h#2 integrate .. //depot/projects/wifi/sys/fs/portalfs/portal_vfsops.c#3 integrate .. //depot/projects/wifi/sys/fs/portalfs/portal_vnops.c#2 integrate .. //depot/projects/wifi/sys/fs/procfs/procfs_status.c#2 integrate .. //depot/projects/wifi/sys/fs/pseudofs/pseudofs_vncache.c#2 integrate .. //depot/projects/wifi/sys/fs/pseudofs/pseudofs_vnops.c#2 integrate .. //depot/projects/wifi/sys/fs/smbfs/smbfs_node.c#2 integrate .. //depot/projects/wifi/sys/fs/smbfs/smbfs_vnops.c#2 integrate .. //depot/projects/wifi/sys/fs/udf/udf_vnops.c#4 integrate .. //depot/projects/wifi/sys/fs/umapfs/umap.h#2 integrate .. //depot/projects/wifi/sys/fs/umapfs/umap_vnops.c#2 integrate .. //depot/projects/wifi/sys/fs/unionfs/union.h#2 integrate .. //depot/projects/wifi/sys/fs/unionfs/union_subr.c#3 integrate .. //depot/projects/wifi/sys/fs/unionfs/union_vnops.c#4 integrate .. //depot/projects/wifi/sys/gdb/gdb_main.c#2 integrate .. //depot/projects/wifi/sys/gnu/ext2fs/ext2_extern.h#2 integrate .. //depot/projects/wifi/sys/gnu/ext2fs/ext2_vfsops.c#5 integrate .. //depot/projects/wifi/sys/gnu/ext2fs/ext2_vnops.c#4 integrate .. //depot/projects/wifi/sys/i386/i386/gdb_machdep.c#2 integrate .. //depot/projects/wifi/sys/i386/i386/pmap.c#5 integrate .. //depot/projects/wifi/sys/i386/include/gdb_machdep.h#2 integrate .. //depot/projects/wifi/sys/ia64/ia64/gdb_machdep.c#2 integrate .. //depot/projects/wifi/sys/ia64/include/gdb_machdep.h#2 integrate .. //depot/projects/wifi/sys/isofs/cd9660/cd9660_vfsops.c#4 integrate .. //depot/projects/wifi/sys/isofs/cd9660/cd9660_vnops.c#3 integrate .. //depot/projects/wifi/sys/isofs/cd9660/iso.h#3 integrate .. //depot/projects/wifi/sys/kern/kern_descrip.c#7 integrate .. //depot/projects/wifi/sys/kern/kern_thr.c#3 integrate .. //depot/projects/wifi/sys/kern/tty_cons.c#2 integrate .. //depot/projects/wifi/sys/kern/uipc_domain.c#5 integrate .. //depot/projects/wifi/sys/kern/uipc_usrreq.c#3 integrate .. //depot/projects/wifi/sys/kern/vfs_default.c#7 integrate .. //depot/projects/wifi/sys/kern/vfs_init.c#2 integrate .. //depot/projects/wifi/sys/kern/vfs_lookup.c#2 integrate .. //depot/projects/wifi/sys/kern/vfs_mount.c#6 integrate .. //depot/projects/wifi/sys/kern/vfs_subr.c#6 integrate .. //depot/projects/wifi/sys/modules/if_gif/Makefile#3 integrate .. //depot/projects/wifi/sys/netgraph/atm/sscop/ng_sscop_cust.h#4 integrate .. //depot/projects/wifi/sys/netgraph/atm/uni/ng_uni_cust.h#3 integrate .. //depot/projects/wifi/sys/netgraph/bluetooth/hci/ng_hci_misc.c#3 integrate .. //depot/projects/wifi/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c#3 integrate .. //depot/projects/wifi/sys/netgraph/netgraph.h#3 integrate .. //depot/projects/wifi/sys/netgraph/ng_base.c#4 integrate .. //depot/projects/wifi/sys/netgraph/ng_cisco.c#4 integrate .. //depot/projects/wifi/sys/netgraph/ng_source.c#3 integrate .. //depot/projects/wifi/sys/nfs4client/nfs4_vfs_subs.c#2 integrate .. //depot/projects/wifi/sys/nfs4client/nfs4_vnops.c#4 integrate .. //depot/projects/wifi/sys/nfsclient/nfs_node.c#3 integrate .. //depot/projects/wifi/sys/nfsclient/nfs_subs.c#2 integrate .. //depot/projects/wifi/sys/nfsclient/nfs_vfsops.c#3 integrate .. //depot/projects/wifi/sys/nfsclient/nfs_vnops.c#4 integrate .. //depot/projects/wifi/sys/nfsclient/nfsnode.h#3 integrate .. //depot/projects/wifi/sys/pci/if_pcn.c#2 integrate .. //depot/projects/wifi/sys/pci/if_pcnreg.h#2 integrate .. //depot/projects/wifi/sys/posix4/posix4_mib.c#2 integrate .. //depot/projects/wifi/sys/sparc64/include/gdb_machdep.h#2 integrate .. //depot/projects/wifi/sys/sparc64/sparc64/gdb_machdep.c#2 integrate .. //depot/projects/wifi/sys/sys/file.h#3 integrate .. //depot/projects/wifi/sys/sys/filedesc.h#5 integrate .. //depot/projects/wifi/sys/sys/mount.h#4 integrate .. //depot/projects/wifi/sys/sys/reboot.h#2 integrate .. //depot/projects/wifi/sys/sys/vnode.h#5 integrate .. //depot/projects/wifi/sys/tools/vnode_if.awk#2 integrate .. //depot/projects/wifi/sys/ufs/ffs/ffs_extern.h#4 integrate .. //depot/projects/wifi/sys/ufs/ffs/ffs_vfsops.c#7 integrate .. //depot/projects/wifi/sys/ufs/ffs/ffs_vnops.c#5 integrate .. //depot/projects/wifi/sys/ufs/ufs/ufs_extern.h#3 integrate .. //depot/projects/wifi/sys/ufs/ufs/ufs_vnops.c#5 integrate .. //depot/projects/wifi/tools/regression/netinet/tcpfullwindowrst/Makefile#1 branch .. //depot/projects/wifi/tools/regression/netinet/tcpfullwindowrst/tcpfullwindowrst.t#1 branch .. //depot/projects/wifi/tools/regression/netinet/tcpfullwindowrst/tcpfullwindowrsttest.c#1 branch .. //depot/projects/wifi/tools/regression/usr.bin/make/Makefile#5 integrate .. //depot/projects/wifi/tools/regression/usr.bin/make/shell_test#2 delete .. //depot/projects/wifi/tools/regression/usr.bin/make/shell_test.sh#1 branch .. //depot/projects/wifi/usr.bin/calendar/calendars/calendar.freebsd#3 integrate .. //depot/projects/wifi/usr.bin/make/arch.c#3 integrate .. //depot/projects/wifi/usr.bin/make/buf.c#3 integrate .. //depot/projects/wifi/usr.bin/make/buf.h#3 integrate .. //depot/projects/wifi/usr.bin/make/compat.c#4 integrate .. //depot/projects/wifi/usr.bin/make/cond.c#3 integrate .. //depot/projects/wifi/usr.bin/make/dir.c#3 integrate .. //depot/projects/wifi/usr.bin/make/for.c#3 integrate .. //depot/projects/wifi/usr.bin/make/hash.c#3 integrate .. //depot/projects/wifi/usr.bin/make/hash.h#3 integrate .. //depot/projects/wifi/usr.bin/make/job.c#7 integrate .. //depot/projects/wifi/usr.bin/make/lst.lib/lstDestroy.c#4 integrate .. //depot/projects/wifi/usr.bin/make/main.c#7 integrate .. //depot/projects/wifi/usr.bin/make/make.1#2 integrate .. //depot/projects/wifi/usr.bin/make/make.c#4 integrate .. //depot/projects/wifi/usr.bin/make/nonints.h#2 integrate .. //depot/projects/wifi/usr.bin/make/parse.c#4 integrate .. //depot/projects/wifi/usr.bin/make/str.c#3 integrate .. //depot/projects/wifi/usr.bin/make/suff.c#3 integrate .. //depot/projects/wifi/usr.bin/make/targ.c#3 integrate .. //depot/projects/wifi/usr.bin/make/var.c#3 integrate .. //depot/projects/wifi/usr.bin/make/var.h#3 integrate .. //depot/projects/wifi/usr.bin/make/var_modify.c#3 integrate Differences ... ==== //depot/projects/wifi/Makefile.inc1#6 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.458 2004/11/23 09:09:47 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.459 2004/12/01 23:23:14 peter Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -415,6 +415,10 @@ ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t} .endif .endfor +.for _dir in usr.sbin/pcvt/keycap usr.bin/lex/lib + cd ${.CURDIR}/${_dir}; \ + ${LIB32MAKE} DESTDIR=${LIB32TMP} obj +.endfor .for _dir in lib/libncurses lib/libmagic cd ${.CURDIR}/${_dir}; \ MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} build-tools ==== //depot/projects/wifi/bin/sh/jobs.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/jobs.c,v 1.67 2004/04/06 20:06:51 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/jobs.c,v 1.68 2004/12/02 13:12:43 maxim Exp $"); #include #include @@ -926,7 +926,8 @@ in_dowait--; if (breakwaitcmd != 0) { breakwaitcmd = 0; - return -1; + if (pid <= 0) + return -1; } if (pid <= 0) return pid; ==== //depot/projects/wifi/bin/sh/sh.1#3 (text+ko) ==== @@ -29,7 +29,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 -.\" $FreeBSD: src/bin/sh/sh.1,v 1.93 2004/11/01 19:05:04 alfred Exp $ +.\" $FreeBSD: src/bin/sh/sh.1,v 1.94 2004/12/02 13:13:27 maxim Exp $ .\" .Dd July 3, 2004 .Dt SH 1 @@ -269,7 +269,7 @@ If this option is not set, traps are executed after the child exits, as specified in -.St -p1003.2 +.St -p1003.2 . This nonstandard option is useful for putting guarding shells around children that block signals. The surrounding shell may kill the child ==== //depot/projects/wifi/etc/defaults/rc.conf#6 (text+ko) ==== @@ -13,7 +13,7 @@ # # All arguments must be in double or single quotes. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.232 2004/11/23 20:09:58 mux Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.233 2004/12/01 22:05:50 rees Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -61,7 +61,7 @@ fsck_y_enable="NO" # Set to YES to do fsck -y if the initial preen fails. background_fsck="YES" # Attempt to run fsck in the background where possible. background_fsck_delay="60" # Time to wait (seconds) before starting the fsck. -netfs_types="nfs:NFS smbfs:SMB portalfs:PORTAL nwfs:NWFS" # Net filesystems. +netfs_types="nfs:NFS nfs4:NFS4 smbfs:SMB portalfs:PORTAL nwfs:NWFS" # Net filesystems. extra_netfs_types="NO" # List of network extra filesystem types for delayed # mount at startup (or NO). ==== //depot/projects/wifi/lib/libc/gen/getcontext.3#2 (text+ko) ==== @@ -33,7 +33,7 @@ .\" THE USE OF THIS SOFTWARE, EVEN IF PACKET DESIGN IS ADVISED OF .\" THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/gen/getcontext.3,v 1.2 2002/12/04 15:47:41 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/getcontext.3,v 1.3 2004/12/03 14:10:04 rse Exp $ .\" .Dd September 10, 2002 .Dt GETCONTEXT 3 @@ -68,7 +68,7 @@ Instead, execution continues in the context specified by .Fa ucp , which must have been previously initialized by a call to -.Fn setcontext , +.Fn getcontext , .Xr makecontext 3 , or by being passed as an argument to a signal handler (see .Xr sigaction 2 ) . ==== //depot/projects/wifi/release/i386/mkisoimages.sh#2 (text+ko) ==== @@ -4,7 +4,7 @@ # Author: Jordan K Hubbard # Date: 22 June 2001 # -# $FreeBSD: src/release/i386/mkisoimages.sh,v 1.11 2004/07/15 09:28:03 murray Exp $ +# $FreeBSD: src/release/i386/mkisoimages.sh,v 1.12 2004/12/01 18:03:18 jhb Exp $ # # This script is used by release/Makefile to build the (optional) ISO images # for a FreeBSD release. It is considered architecture dependent since each @@ -14,9 +14,9 @@ # # Usage: # -# mkisoimages.sh [-[e]b] image-label image-name base-bits-dir [extra-bits-dir] +# mkisoimages.sh [-b] image-label image-name base-bits-dir [extra-bits-dir] # -# Where -[e]b is passed if the ISO image should be made "bootable" by +# Where -b is passed if the ISO image should be made "bootable" by # whatever standards this architecture supports (may be unsupported), # image-label is the ISO image label, image-name is the filename of the # resulting ISO image, base-bits-dir contains the image contents and @@ -28,9 +28,6 @@ if [ "x$1" = "x-b" ]; then bootable="-b boot/cdboot -no-emul-boot" shift -elif [ "x$1" = "x-eb" ]; then - bootable="-b floppies/boot.flp -c floppies/boot.catalog" - shift else bootable="" fi ==== //depot/projects/wifi/sbin/dump/dump.h#2 (text+ko) ==== @@ -28,7 +28,7 @@ * * @(#)dump.h 8.2 (Berkeley) 4/28/95 * - * $FreeBSD: src/sbin/dump/dump.h,v 1.26 2004/04/13 02:58:06 green Exp $ + * $FreeBSD: src/sbin/dump/dump.h,v 1.27 2004/12/02 13:56:53 maxim Exp $ */ /* @@ -164,13 +164,13 @@ time_t dd_ddate; }; int nddates; /* number of records (might be zero) */ -int ddates_in; /* we have read the increment file */ struct dumpdates **ddatev; /* the arrayfied version */ void initdumptimes(void); void getdumptime(void); void putdumptime(void); #define ITITERATE(i, ddp) \ - for (ddp = ddatev[i = 0]; i < nddates; ddp = ddatev[++i]) + if (ddatev != NULL) \ + for (ddp = ddatev[i = 0]; i < nddates; ddp = ddatev[++i]) void sig(int signo); ==== //depot/projects/wifi/sbin/dump/itime.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ static char sccsid[] = "@(#)itime.c 8.1 (Berkeley) 6/5/93"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/dump/itime.c,v 1.15 2004/04/09 19:58:27 markm Exp $"; + "$FreeBSD: src/sbin/dump/itime.c,v 1.16 2004/12/02 13:56:53 maxim Exp $"; #endif /* not lint */ #include @@ -60,7 +60,6 @@ SLIST_HEAD(dthead, dumptime) dthead = SLIST_HEAD_INITIALIZER(dthead); struct dumpdates **ddatev = 0; int nddates = 0; -int ddates_in = 0; static void dumprecout(FILE *, const struct dumpdates *); static int getrecord(FILE *, struct dumpdates *); @@ -113,7 +112,6 @@ SLIST_INSERT_HEAD(&dthead, dtwalk, dt_list); } - ddates_in = 1; /* * arrayify the list, leaving enough room for the additional * record that we may have to add to the ddate structure @@ -177,7 +175,6 @@ free((char *)ddatev); ddatev = 0; nddates = 0; - ddates_in = 0; readdumptimes(df); if (fseek(df, 0L, 0) < 0) quit("fseek: %s\n", strerror(errno)); ==== //depot/projects/wifi/share/man/man9/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/man/man9/Makefile,v 1.247 2004/11/24 18:03:52 rwatson Exp $ +# $FreeBSD: src/share/man/man9/Makefile,v 1.248 2004/12/03 14:05:55 jkoshy Exp $ MAN= accept_filter.9 \ accf_data.9 \ @@ -88,6 +88,7 @@ domain.9 \ driver.9 \ DRIVER_MODULE.9 \ + EVENTHANDLER.9 \ extattr.9 \ fetch.9 \ g_access.9 \ @@ -448,6 +449,14 @@ domain.9 pffindproto.9 \ domain.9 pffindtype.9 MLINKS+=DRIVER_MODULE.9 MULTI_DRIVER_MODULE.9 +MLINKS+=EVENTHANDLER.9 EVENTHANDLER_DECLARE.9 \ + EVENTHANDLER.9 EVENTHANDLER_DEREGISTER.9 \ + EVENTHANDLER.9 eventhandler_deregister.9 \ + EVENTHANDLER.9 EVENTHANDLER_INVOKE.9 \ + EVENTHANDLER.9 EVENTHANDLER_REGISTER.9 \ + EVENTHANDLER.9 eventhandler_register.9 \ + EVENTHANDLER.9 eventhandler_find_list.9 \ + EVENTHANDLER.9 eventhandler_prune_list.9 MLINKS+=fetch.9 fubyte.9 \ fetch.9 fuswintr.9 \ fetch.9 fusword.9 \ ==== //depot/projects/wifi/share/man/man9/style.9#2 (text+ko) ==== @@ -43,7 +43,7 @@ * Style guide for FreeBSD. Based on the CSRG's KNF (Kernel Normal Form). * * @(#)style 1.14 (Berkeley) 4/28/95 - * $FreeBSD: src/share/man/man9/style.9,v 1.110 2004/07/03 18:29:24 ru Exp $ + * $FreeBSD: src/share/man/man9/style.9,v 1.111 2004/12/02 23:20:17 dds Exp $ */ /* @@ -86,7 +86,7 @@ #endif #include -__FBSDID("$FreeBSD: src/share/man/man9/style.9,v 1.110 2004/07/03 18:29:24 ru Exp $"); +__FBSDID("$FreeBSD: src/share/man/man9/style.9,v 1.111 2004/12/02 23:20:17 dds Exp $"); .Ed .Pp Leave another blank line before the header files. @@ -278,7 +278,7 @@ Separate these identifiers from asterisks using a single space. .Pp When declaring variables in structures, declare them sorted by use, then -by size, and then in alphabetical order. +by size (largest to smallest), and then in alphabetical order. The first category normally does not apply, but there are exceptions. Each one gets its own line. Try to make the structure ==== //depot/projects/wifi/share/zoneinfo/europe#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# @(#)europe 7.88 +# @(#)europe 7.90 # This data is by no means authoritative; if you think you know better, # go ahead and edit the file (and please send any changes to @@ -708,7 +708,7 @@ # see Serbia and Montenegro # Cyprus -# See the `asia' file. +# Please see the `asia' file for Asia/Nicosia. # Czech Republic # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S @@ -1055,6 +1055,11 @@ 1:00 Germany CE%sT 1980 1:00 EU CE%sT +# Georgia +# Please see the "asia" file for Asia/Tbilisi. +# Herodotus (Histories, IV.45) says Georgia north of the Phasis (now Rioni) +# is in Europe. Our reference location Tbilisi is in the Asian part. + # Gibraltar # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Europe/Gibraltar -0:21:24 - LMT 1880 Aug 2 @@ -1611,7 +1616,7 @@ # From Paul Eggert (2001-05-01): # # Actually, Jan Mayen was never occupied by Germany during World War II, -# so it must have diverged from Oslo time during the war, as Olso was +# so it must have diverged from Oslo time during the war, as Oslo was # keeping Berlin time. # # says that the meteorologists ==== //depot/projects/wifi/share/zoneinfo/northamerica#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# @(#)northamerica 7.69 +# @(#)northamerica 7.70 # also includes Central America and the Caribbean # This data is by no means authoritative; if you think you know better, @@ -1731,6 +1731,15 @@ # to DST--and one more hour on 1999-04-04--when the announcers will have # returned to Baltimore, which switches on that date.) +# From Evert van der Veer via Steffen Thorsen (2004-10-28): +# Cuba is not going back to standard time this year. +# From Paul Eggert (2004-10-28): +# http://www.granma.cu/ingles/2004/septiembre/juev30/41medid-i.html +# says that it's due to a problem at the Antonio Guiteras +# thermoelectric plant, and says "This October there will be no return +# to normal hours (after daylight saving time)". +# For now, let's assume that it's a one-year temporary measure. + # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Cuba 1928 only - Jun 10 0:00 1:00 D Rule Cuba 1928 only - Oct 10 0:00 0 S @@ -1759,8 +1768,9 @@ Rule Cuba 1996 only - Oct 6 0:00s 0 S Rule Cuba 1997 only - Oct 12 0:00s 0 S Rule Cuba 1998 1999 - Mar lastSun 0:00s 1:00 D -Rule Cuba 1998 max - Oct lastSun 0:00s 0 S +Rule Cuba 1998 2003 - Oct lastSun 0:00s 0 S Rule Cuba 2000 max - Apr Sun>=1 0:00s 1:00 D +Rule Cuba 2005 max - Oct lastSun 0:00s 0 S # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone America/Havana -5:29:28 - LMT 1890 ==== //depot/projects/wifi/share/zoneinfo/southamerica#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# @(#)southamerica 7.54 +# @(#)southamerica 7.55 # This data is by no means authoritative; if you think you know better, # go ahead and edit the file (and please send any changes to @@ -671,7 +671,7 @@ # Mato Grosso (MT) Zone America/Cuiaba -3:44:20 - LMT 1914 -4:00 Brazil AM%sT 2003 Sep 24 - -4:00 - AMT 2004 Oct 4 + -4:00 - AMT 2004 Oct 1 -4:00 Brazil AM%sT # # west Para (PA), Rondonia (RO) ==== //depot/projects/wifi/sys/alpha/alpha/gdb_machdep.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/gdb_machdep.c,v 1.1 2004/07/10 17:47:20 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/gdb_machdep.c,v 1.2 2004/12/01 06:40:33 marcel Exp $"); #include #include @@ -59,7 +59,7 @@ } void -gdb_cpu_setreg(int regnum, register_t val) +gdb_cpu_setreg(int regnum, void *val) { switch (regnum) { } ==== //depot/projects/wifi/sys/alpha/include/gdb_machdep.h#2 (text+ko) ==== @@ -23,7 +23,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. * - * $FreeBSD: src/sys/alpha/include/gdb_machdep.h,v 1.1 2004/07/10 17:47:20 marcel Exp $ + * $FreeBSD: src/sys/alpha/include/gdb_machdep.h,v 1.2 2004/12/01 06:40:33 marcel Exp $ */ #ifndef _MACHINE_GDB_MACHDEP_H_ @@ -46,7 +46,7 @@ } void *gdb_cpu_getreg(int, size_t *); -void gdb_cpu_setreg(int, register_t); +void gdb_cpu_setreg(int, void *); int gdb_cpu_signal(int, int); #endif /* !_MACHINE_GDB_MACHDEP_H_ */ ==== //depot/projects/wifi/sys/amd64/amd64/gdb_machdep.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/gdb_machdep.c,v 1.2 2004/11/30 00:55:49 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/gdb_machdep.c,v 1.3 2004/12/01 06:40:33 marcel Exp $"); #include #include @@ -81,14 +81,13 @@ } void -gdb_cpu_setreg(int regnum, register_t val) +gdb_cpu_setreg(int regnum, void *val) { - val = __bswap64(val); switch (regnum) { case GDB_REG_PC: - kdb_thrctx->pcb_rip = val; + kdb_thrctx->pcb_rip = *(register_t *)val; if (kdb_thread == curthread) - kdb_frame->tf_rip = val; + kdb_frame->tf_rip = *(register_t *)val; } } ==== //depot/projects/wifi/sys/amd64/amd64/pmap.c#3 (text+ko) ==== @@ -75,7 +75,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.509 2004/11/27 06:51:33 das Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.510 2004/12/02 04:06:40 alc Exp $"); /* * Manages physical address maps. @@ -318,18 +318,26 @@ /* Return a pointer to the PT slot that corresponds to a VA */ static __inline pt_entry_t * +pmap_pde_to_pte(pd_entry_t *pde, vm_offset_t va) +{ + pt_entry_t *pte; + + pte = (pt_entry_t *)PHYS_TO_DMAP(*pde & PG_FRAME); + return (&pte[pmap_pte_index(va)]); +} + +/* Return a pointer to the PT slot that corresponds to a VA */ +static __inline pt_entry_t * pmap_pte(pmap_t pmap, vm_offset_t va) { pd_entry_t *pde; - pt_entry_t *pte; pde = pmap_pde(pmap, va); if (pde == NULL || (*pde & PG_V) == 0) return NULL; if ((*pde & PG_PS) != 0) /* compat with i386 pmap_pte() */ return ((pt_entry_t *)pde); - pte = (pt_entry_t *)PHYS_TO_DMAP(*pde & PG_FRAME); - return (&pte[pmap_pte_index(va)]); + return (pmap_pde_to_pte(pde, va)); } @@ -337,7 +345,6 @@ pmap_pte_pde(pmap_t pmap, vm_offset_t va, pd_entry_t *ptepde) { pd_entry_t *pde; - pt_entry_t *pte; pde = pmap_pde(pmap, va); if (pde == NULL || (*pde & PG_V) == 0) @@ -345,8 +352,7 @@ *ptepde = *pde; if ((*pde & PG_PS) != 0) /* compat with i386 pmap_pte() */ return ((pt_entry_t *)pde); - pte = (pt_entry_t *)PHYS_TO_DMAP(*pde & PG_FRAME); - return (&pte[pmap_pte_index(va)]); + return (pmap_pde_to_pte(pde, va)); } @@ -1630,9 +1636,9 @@ if (va_next > eva) va_next = eva; - for (; sva != va_next; sva += PAGE_SIZE) { - pte = pmap_pte(pmap, sva); - if (pte == NULL || *pte == 0) + for (pte = pmap_pde_to_pte(pde, sva); sva != va_next; pte++, + sva += PAGE_SIZE) { + if (*pte == 0) continue; anyvalid = 1; if (pmap_remove_pte(pmap, pte, sva, ptpaddr)) @@ -1722,6 +1728,7 @@ pml4_entry_t *pml4e; pdp_entry_t *pdpe; pd_entry_t ptpaddr, *pde; + pt_entry_t *pte; int anychanged; if ((prot & VM_PROT_READ) == VM_PROT_NONE) { @@ -1777,14 +1784,11 @@ if (va_next > eva) va_next = eva; - for (; sva != va_next; sva += PAGE_SIZE) { + for (pte = pmap_pde_to_pte(pde, sva); sva != va_next; pte++, + sva += PAGE_SIZE) { pt_entry_t obits, pbits; - pt_entry_t *pte; vm_page_t m; - pte = pmap_pte(pmap, sva); - if (pte == NULL) - continue; retry: obits = pbits = *pte; if (pbits & PG_MANAGED) { ==== //depot/projects/wifi/sys/amd64/include/gdb_machdep.h#2 (text+ko) ==== @@ -23,7 +23,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. * - * $FreeBSD: src/sys/amd64/include/gdb_machdep.h,v 1.1 2004/07/10 17:47:21 marcel Exp $ + * $FreeBSD: src/sys/amd64/include/gdb_machdep.h,v 1.2 2004/12/01 06:40:34 marcel Exp $ */ #ifndef _MACHINE_GDB_MACHDEP_H_ @@ -52,6 +52,6 @@ } void *gdb_cpu_getreg(int, size_t *); -void gdb_cpu_setreg(int, register_t); +void gdb_cpu_setreg(int, void *); #endif /* !_MACHINE_GDB_MACHDEP_H_ */ ==== //depot/projects/wifi/sys/arm/arm/trap.c#5 (text+ko) ==== @@ -82,7 +82,7 @@ #include "opt_ktrace.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/trap.c,v 1.5 2004/11/27 06:51:34 das Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/trap.c,v 1.6 2004/12/02 23:31:48 cognet Exp $"); #include @@ -94,6 +94,7 @@ #include #include #include +#include #ifdef KTRACE #include #include ==== //depot/projects/wifi/sys/boot/common/loader.8#2 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sys/boot/common/loader.8,v 1.76 2004/10/15 06:44:13 ru Exp $ +.\" $FreeBSD: src/sys/boot/common/loader.8,v 1.77 2004/12/01 04:59:31 scottl Exp $ .\" .Dd October 15, 2004 .Dt LOADER 8 @@ -352,10 +352,6 @@ Prevents the kernel from initiating a multi-user startup; instead, a single-user mode will be entered when the kernel has finished device probing. -.It Va boot_userconfig -Requests that the kernel's interactive device configuration program -be run when the kernel is booted. -Currently a no-op. .It Va boot_verbose Setting this variable causes extra debugging information to be printed by the kernel during the boot phase. ==== //depot/projects/wifi/sys/boot/efi/libefi/bootinfo.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/efi/libefi/bootinfo.c,v 1.10 2004/01/04 23:28:16 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/efi/libefi/bootinfo.c,v 1.11 2004/12/01 04:59:31 scottl Exp $"); #include #include @@ -53,7 +53,6 @@ } howto_names[] = { {"boot_askname", RB_ASKNAME}, {"boot_cdrom", RB_CDROM}, - {"boot_userconfig", RB_CONFIG}, {"boot_ddb", RB_KDB}, {"boot_gdb", RB_GDB}, {"boot_single", RB_SINGLE}, @@ -86,9 +85,6 @@ case 'a': howto |= RB_ASKNAME; break; - case 'c': - howto |= RB_CONFIG; - break; case 'C': howto |= RB_CDROM; break; ==== //depot/projects/wifi/sys/boot/forth/beastie.4th#3 (text+ko) ==== @@ -23,7 +23,7 @@ \ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF \ SUCH DAMAGE. \ -\ $FreeBSD: src/sys/boot/forth/beastie.4th,v 1.9 2004/10/30 13:45:13 brooks Exp $ +\ $FreeBSD: src/sys/boot/forth/beastie.4th,v 1.10 2004/12/01 07:17:57 scottl Exp $ marker task-beastie.4th @@ -69,7 +69,7 @@ 2dup at-xy ." \ / /\" 1+ 2dup at-xy ." ______( (_ / \______/" 1+ 2dup at-xy ." ,' ,-----' |" 1+ -at-xy ." `--{__________) " 1+ +at-xy ." `--{__________) " ; : boring-beastie ( x y -- ) @@ -121,6 +121,8 @@ s" 0" compare 0<> if false exit then + else + drop then true ; @@ -147,6 +149,7 @@ 13 6 at-xy ." Welcome to FreeBSD!" printmenuitem ." Boot FreeBSD [default]" bootkey ! s" arch-i386" environment? if + drop printmenuitem ." Boot FreeBSD with ACPI " bootacpikey ! acpienabled? if ." disabled" @@ -161,9 +164,10 @@ printmenuitem ." Boot FreeBSD with verbose logging" bootverbosekey ! printmenuitem ." Escape to loader prompt" escapekey ! s" arch-i386" environment? if + drop printmenuitem ." Boot FreeBSD with USB keyboard" bootusbkey ! else - -2 bootacpikey ! + -2 bootusbkey ! then printmenuitem ." Reboot" rebootkey ! menuX @ 20 at-xy @@ -174,7 +178,6 @@ ; : tkey - dup seconds + begin 1 while over 0<> if @@ -202,6 +205,8 @@ s" YES" compare-insensitive 0= if exit then + else + drop then beastie-menu s" autoboot_delay" getenv @@ -211,7 +216,7 @@ else 0 0 2swap >number drop drop drop then - begin true while + begin dup tkey 0 25 at-xy dup 32 = if nip 0 swap then @@ -235,6 +240,7 @@ then dup bootsafekey @ = if s" arch-i386" environment? if + drop s" acpi_load" unsetenv s" 1" s" hint.acpi.0.disabled" setenv s" 1" s" loader.acpi_disabled_by_user" setenv @@ -260,7 +266,7 @@ exit then rebootkey @ = if 0 reboot then - repeat + again ; previous ==== //depot/projects/wifi/sys/boot/forth/loader.conf#3 (text+ko) ==== @@ -6,7 +6,7 @@ # # All arguments must be in double quotes. # -# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.92 2004/11/07 17:01:08 krion Exp $ +# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.93 2004/12/01 04:59:31 scottl Exp $ ############################################################## >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Dec 4 06:58:51 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0F14216A4D0; Sat, 4 Dec 2004 06:58:51 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C42CA16A4CE for ; Sat, 4 Dec 2004 06:58:50 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 905FC43D4C for ; Sat, 4 Dec 2004 06:58:50 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iB46wo3n032035 for ; Sat, 4 Dec 2004 06:58:50 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB46woxA032032 for perforce@freebsd.org; Sat, 4 Dec 2004 06:58:50 GMT (envelope-from sam@freebsd.org) Date: Sat, 4 Dec 2004 06:58:50 GMT Message-Id: <200412040658.iB46woxA032032@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 66387 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Dec 2004 06:58:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=66387 Change 66387 by sam@sam_ebb on 2004/12/04 06:58:30 fix building w/o IEEE80211_DEBUG Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_crypto_none.c#2 edit .. //depot/projects/wifi/sys/net80211/ieee80211_crypto_tkip.c#2 edit .. //depot/projects/wifi/sys/net80211/ieee80211_node.c#24 edit .. //depot/projects/wifi/sys/net80211/ieee80211_output.c#21 edit .. //depot/projects/wifi/sys/net80211/ieee80211_proto.c#14 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_crypto_none.c#2 (text+ko) ==== @@ -94,7 +94,9 @@ none_encap(struct ieee80211_key *k, struct mbuf *m, u_int8_t keyid) { struct ieee80211com *ic = k->wk_private; +#ifdef IEEE80211_DEBUG struct ieee80211_frame *wh = mtod(m, struct ieee80211_frame *); +#endif /* * The specified key is not setup; this can @@ -111,8 +113,10 @@ none_decap(struct ieee80211_key *k, struct mbuf *m) { struct ieee80211com *ic = k->wk_private; +#ifdef IEEE80211_DEBUG struct ieee80211_frame *wh = mtod(m, struct ieee80211_frame *); const u_int8_t *ivp = (const u_int8_t *)&wh[1]; +#endif /* * The specified key is not setup; this can ==== //depot/projects/wifi/sys/net80211/ieee80211_crypto_tkip.c#2 (text+ko) ==== @@ -158,7 +158,9 @@ * Handle TKIP counter measures requirement. */ if (ic->ic_flags & IEEE80211_F_COUNTERM) { +#ifdef IEEE80211_DEBUG struct ieee80211_frame *wh = mtod(m, struct ieee80211_frame *); +#endif IEEE80211_DPRINTF(ic, IEEE80211_MSG_CRYPTO, "[%s] Discard frame due to countermeasures (%s)\n", ==== //depot/projects/wifi/sys/net80211/ieee80211_node.c#24 (text+ko) ==== @@ -1458,14 +1458,13 @@ void ieee80211_iterate_nodes(struct ieee80211_node_table *nt, ieee80211_iter_func *f, void *arg) { - struct ieee80211com *ic = nt->nt_ic; struct ieee80211_node *ni; u_int gen; IEEE80211_SCAN_LOCK(nt); gen = nt->nt_scangen++; - IEEE80211_DPRINTF(ic, IEEE80211_MSG_NODE, + IEEE80211_DPRINTF(nt->nt_ic, IEEE80211_MSG_NODE, "%s: sta scangen %u\n", __func__, gen); restart: IEEE80211_NODE_LOCK(nt); ==== //depot/projects/wifi/sys/net80211/ieee80211_output.c#21 (text+ko) ==== @@ -1559,8 +1559,10 @@ "[%s] pwr save q overflow, drops %d (size %d)\n", ether_sprintf(ni->ni_macaddr), ni->ni_savedq.ifq_drops, IEEE80211_PS_MAX_QUEUE); +#ifdef IEEE80211_DEBUG if (ieee80211_msg_dumppkts(ic)) ieee80211_dump_pkt(mtod(m, caddr_t), m->m_len, -1, -1); +#endif m_freem(m); return; } ==== //depot/projects/wifi/sys/net80211/ieee80211_proto.c#14 (text+ko) ==== @@ -1029,6 +1029,7 @@ KASSERT(ni->ni_txrate < ni->ni_rates.rs_nrates, ("%s: bogus xmit rate %u setup\n", __func__, ni->ni_txrate)); +#ifdef IEEE80211_DEBUG if (ieee80211_msg_debug(ic)) { if (ic->ic_opmode == IEEE80211_M_STA) if_printf(ifp, "associated "); @@ -1042,6 +1043,7 @@ ieee80211_chan2ieee(ic, ni->ni_chan), IEEE80211_RATE2MBS(ni->ni_rates.rs_rates[ni->ni_txrate])); } +#endif ic->ic_mgt_timer = 0; if (ic->ic_opmode == IEEE80211_M_STA) ieee80211_notify_node_join(ic, ni, From owner-p4-projects@FreeBSD.ORG Sat Dec 4 16:46:48 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 89BC716A4D0; Sat, 4 Dec 2004 16:46:47 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5B51C16A4CE for ; Sat, 4 Dec 2004 16:46:47 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E179C43D2F for ; Sat, 4 Dec 2004 16:46:46 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iB4GkkCU064049 for ; Sat, 4 Dec 2004 16:46:46 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB4GkjMC064046 for perforce@freebsd.org; Sat, 4 Dec 2004 16:46:45 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 4 Dec 2004 16:46:45 GMT Message-Id: <200412041646.iB4GkjMC064046@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 66404 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Dec 2004 16:46:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=66404 Change 66404 by rwatson@rwatson_paprika on 2004/12/04 16:45:57 Integrate netperf_socket from FreeBSD CVS: - kgdb fixage for amd64 - shutdown on boot processor for amd64 - easier to test ficl stuff in userspace - Real structures and sparse initialization for vnode operation vector; vnode operation invocation much simplified - APCI upgrade - umtx bug fixes - cleanups to domain initialization on protocol attach - MSG_DONTWAIT added - MSG_SOCALLBCK added - ng_callout - TCP window length bugfix - scope6 locking cleanup - pcn driver work Affected files ... .. //depot/projects/netperf_socket/sys/alpha/alpha/gdb_machdep.c#2 integrate .. //depot/projects/netperf_socket/sys/alpha/include/gdb_machdep.h#2 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/busdma_machdep.c#9 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/gdb_machdep.c#2 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/machdep.c#22 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/pmap.c#31 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/vm_machdep.c#13 integrate .. //depot/projects/netperf_socket/sys/amd64/include/gdb_machdep.h#2 integrate .. //depot/projects/netperf_socket/sys/arm/arm/trap.c#6 integrate .. //depot/projects/netperf_socket/sys/boot/common/loader.8#10 integrate .. //depot/projects/netperf_socket/sys/boot/efi/libefi/bootinfo.c#2 integrate .. //depot/projects/netperf_socket/sys/boot/ficl/ficl.h#2 integrate .. //depot/projects/netperf_socket/sys/boot/ficl/loader.c#2 integrate .. //depot/projects/netperf_socket/sys/boot/forth/beastie.4th#3 integrate .. //depot/projects/netperf_socket/sys/boot/forth/loader.conf#14 integrate .. //depot/projects/netperf_socket/sys/boot/i386/libi386/bootinfo.c#2 integrate .. //depot/projects/netperf_socket/sys/boot/i386/loader/Makefile#3 integrate .. //depot/projects/netperf_socket/sys/boot/i386/loader/help.i386#3 integrate .. //depot/projects/netperf_socket/sys/boot/i386/loader/loader.rc#2 delete .. //depot/projects/netperf_socket/sys/boot/ia64/ski/bootinfo.c#2 integrate .. //depot/projects/netperf_socket/sys/boot/pc98/boot2/boot.c#2 integrate .. //depot/projects/netperf_socket/sys/boot/pc98/btx/btx/btx.S#4 integrate .. //depot/projects/netperf_socket/sys/boot/pc98/loader/Makefile#4 integrate .. //depot/projects/netperf_socket/sys/boot/pc98/loader/help.pc98#3 integrate .. //depot/projects/netperf_socket/sys/boot/powerpc/loader/metadata.c#2 integrate .. //depot/projects/netperf_socket/sys/boot/sparc64/loader/metadata.c#3 integrate .. //depot/projects/netperf_socket/sys/coda/coda_vnops.c#5 integrate .. //depot/projects/netperf_socket/sys/coda/coda_vnops.h#3 integrate .. //depot/projects/netperf_socket/sys/compat/linprocfs/linprocfs.c#6 integrate .. //depot/projects/netperf_socket/sys/compat/linux/linux_file.c#6 integrate .. //depot/projects/netperf_socket/sys/conf/kern.post.mk#12 integrate .. //depot/projects/netperf_socket/sys/conf/kmod.mk#19 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/CHANGES.txt#7 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acconfig.h#7 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acdebug.h#4 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acenv.h#4 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acevents.h#4 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acexcep.h#4 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acglobal.h#6 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/achware.h#5 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acinterp.h#5 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/aclocal.h#6 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acmacros.h#6 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acobject.h#5 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acoutput.h#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acpiosxf.h#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acpixf.h#4 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/actbl2.h#4 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/actypes.h#6 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acutils.h#5 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/amlcode.h#4 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/amlresrc.h#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/common/adisasm.c#5 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/compiler/aslanalyze.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/compiler/aslcodegen.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/compiler/aslcompiler.h#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/compiler/aslcompiler.l#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/compiler/aslcompiler.y#5 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/compiler/aslglobal.h#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/compiler/aslmain.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/compiler/aslmap.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/compiler/aslopcodes.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/compiler/aslopt.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/compiler/asltransform.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/compiler/asltypes.h#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/dbcmds.c#5 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/dbexec.c#5 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/dbinput.c#4 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/dbutils.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/dmwalk.c#5 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/dsmethod.c#5 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/dsmthdat.c#4 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/dsutils.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/dswexec.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/dswload.c#4 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/dswstate.c#4 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/evgpe.c#7 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/evgpeblk.c#6 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/evmisc.c#5 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/evregion.c#4 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/evrgnini.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/evxface.c#4 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/exconfig.c#5 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/exconvrt.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/exdump.c#4 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/exfldio.c#5 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/exmisc.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/exoparg1.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/exoparg2.c#4 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/exprep.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/exregion.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/exresolv.c#4 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/exresop.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/exstore.c#5 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/exsystem.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/exutils.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/hwgpe.c#5 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/hwregs.c#5 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/hwsleep.c#5 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/hwtimer.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/nsaccess.c#6 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/nsalloc.c#5 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/nsdump.c#4 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/nsdumpdv.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/nseval.c#6 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/nsinit.c#4 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/nsload.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/nsnames.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/nssearch.c#4 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/nsutils.c#4 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/nswalk.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/osunixxf.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/psopcode.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/psparse.c#4 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/psutils.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/rscalc.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/rsxface.c#4 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/tbconvrt.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/tbget.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/tbinstal.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/tbrsdt.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/tbxfroot.c#4 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/utalloc.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/utclib.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/utcopy.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/utdelete.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/uteval.c#6 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/utglobal.c#6 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/utmath.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/utmisc.c#4 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/utobject.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/acpi_support/acpi_sony.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/Osd/OsdInterrupt.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/Osd/OsdSchedule.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi.c#42 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_acad.c#11 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_cmbat.c#11 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_if.m#3 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_pci.c#17 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_pci_link.c#17 integrate .. //depot/projects/netperf_socket/sys/dev/cp/if_cp.c#10 integrate .. //depot/projects/netperf_socket/sys/dev/ctau/if_ct.c#12 integrate .. //depot/projects/netperf_socket/sys/dev/cx/if_cx.c#19 integrate .. //depot/projects/netperf_socket/sys/dev/drm/drm_os_freebsd.h#6 integrate .. //depot/projects/netperf_socket/sys/dev/pci/pci.c#14 integrate .. //depot/projects/netperf_socket/sys/dev/syscons/syscons.c#15 integrate .. //depot/projects/netperf_socket/sys/dev/uart/uart_cpu_sparc64.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/usb/umass.c#14 integrate .. //depot/projects/netperf_socket/sys/dev/usb/usbdevs#28 integrate .. //depot/projects/netperf_socket/sys/fs/deadfs/dead_vnops.c#4 integrate .. //depot/projects/netperf_socket/sys/fs/devfs/devfs_vnops.c#10 integrate .. //depot/projects/netperf_socket/sys/fs/fdescfs/fdesc_vnops.c#4 integrate .. //depot/projects/netperf_socket/sys/fs/fifofs/fifo.h#3 integrate .. //depot/projects/netperf_socket/sys/fs/fifofs/fifo_vnops.c#14 integrate .. //depot/projects/netperf_socket/sys/fs/hpfs/hpfs.h#4 integrate .. //depot/projects/netperf_socket/sys/fs/hpfs/hpfs_vfsops.c#7 integrate .. //depot/projects/netperf_socket/sys/fs/hpfs/hpfs_vnops.c#6 integrate .. //depot/projects/netperf_socket/sys/fs/msdosfs/denode.h#3 integrate .. //depot/projects/netperf_socket/sys/fs/msdosfs/msdosfs_denode.c#5 integrate .. //depot/projects/netperf_socket/sys/fs/msdosfs/msdosfs_vnops.c#7 integrate .. //depot/projects/netperf_socket/sys/fs/ntfs/ntfs.h#4 integrate .. //depot/projects/netperf_socket/sys/fs/ntfs/ntfs_vfsops.c#8 integrate .. //depot/projects/netperf_socket/sys/fs/ntfs/ntfs_vnops.c#5 integrate .. //depot/projects/netperf_socket/sys/fs/nullfs/null.h#3 integrate .. //depot/projects/netperf_socket/sys/fs/nullfs/null_subr.c#4 integrate .. //depot/projects/netperf_socket/sys/fs/nullfs/null_vfsops.c#8 integrate .. //depot/projects/netperf_socket/sys/fs/nullfs/null_vnops.c#4 integrate .. //depot/projects/netperf_socket/sys/fs/nwfs/nwfs.h#3 integrate .. //depot/projects/netperf_socket/sys/fs/nwfs/nwfs_node.c#2 integrate .. //depot/projects/netperf_socket/sys/fs/nwfs/nwfs_vnops.c#3 integrate .. //depot/projects/netperf_socket/sys/fs/portalfs/portal.h#3 integrate .. //depot/projects/netperf_socket/sys/fs/portalfs/portal_vfsops.c#7 integrate .. //depot/projects/netperf_socket/sys/fs/portalfs/portal_vnops.c#8 integrate .. //depot/projects/netperf_socket/sys/fs/procfs/procfs_status.c#5 integrate .. //depot/projects/netperf_socket/sys/fs/pseudofs/pseudofs_vncache.c#4 integrate .. //depot/projects/netperf_socket/sys/fs/pseudofs/pseudofs_vnops.c#6 integrate .. //depot/projects/netperf_socket/sys/fs/smbfs/smbfs_node.c#4 integrate .. //depot/projects/netperf_socket/sys/fs/smbfs/smbfs_vnops.c#5 integrate .. //depot/projects/netperf_socket/sys/fs/udf/udf_vnops.c#8 integrate .. //depot/projects/netperf_socket/sys/fs/umapfs/umap.h#3 integrate .. //depot/projects/netperf_socket/sys/fs/umapfs/umap_vnops.c#4 integrate .. //depot/projects/netperf_socket/sys/fs/unionfs/union.h#4 integrate .. //depot/projects/netperf_socket/sys/fs/unionfs/union_subr.c#5 integrate .. //depot/projects/netperf_socket/sys/fs/unionfs/union_vnops.c#7 integrate .. //depot/projects/netperf_socket/sys/gdb/gdb_main.c#3 integrate .. //depot/projects/netperf_socket/sys/geom/geom_mbr.c#6 integrate .. //depot/projects/netperf_socket/sys/geom/geom_pc98.c#5 integrate .. //depot/projects/netperf_socket/sys/gnu/ext2fs/ext2_extern.h#5 integrate .. //depot/projects/netperf_socket/sys/gnu/ext2fs/ext2_vfsops.c#12 integrate .. //depot/projects/netperf_socket/sys/gnu/ext2fs/ext2_vnops.c#10 integrate .. //depot/projects/netperf_socket/sys/i386/i386/busdma_machdep.c#9 integrate .. //depot/projects/netperf_socket/sys/i386/i386/gdb_machdep.c#3 integrate .. //depot/projects/netperf_socket/sys/i386/i386/pmap.c#33 integrate .. //depot/projects/netperf_socket/sys/i386/i386/vm_machdep.c#18 integrate .. //depot/projects/netperf_socket/sys/i386/include/gdb_machdep.h#2 integrate .. //depot/projects/netperf_socket/sys/ia64/ia64/gdb_machdep.c#3 integrate .. //depot/projects/netperf_socket/sys/ia64/include/gdb_machdep.h#3 integrate .. //depot/projects/netperf_socket/sys/isofs/cd9660/cd9660_vfsops.c#11 integrate .. //depot/projects/netperf_socket/sys/isofs/cd9660/cd9660_vnops.c#7 integrate .. //depot/projects/netperf_socket/sys/isofs/cd9660/iso.h#5 integrate .. //depot/projects/netperf_socket/sys/kern/kern_descrip.c#24 integrate .. //depot/projects/netperf_socket/sys/kern/kern_lock.c#7 integrate .. //depot/projects/netperf_socket/sys/kern/kern_shutdown.c#20 integrate .. //depot/projects/netperf_socket/sys/kern/kern_thr.c#16 integrate .. //depot/projects/netperf_socket/sys/kern/kern_umtx.c#5 integrate .. //depot/projects/netperf_socket/sys/kern/subr_param.c#8 integrate .. //depot/projects/netperf_socket/sys/kern/tty_cons.c#8 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_domain.c#9 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_socket.c#44 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_usrreq.c#29 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_default.c#10 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_export.c#5 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_init.c#8 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_lookup.c#5 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_mount.c#20 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_subr.c#29 integrate .. //depot/projects/netperf_socket/sys/modules/if_gif/Makefile#3 integrate .. //depot/projects/netperf_socket/sys/net/if.c#25 integrate .. //depot/projects/netperf_socket/sys/netgraph/atm/sscop/ng_sscop_cust.h#4 integrate .. //depot/projects/netperf_socket/sys/netgraph/atm/uni/ng_uni_cust.h#4 integrate .. //depot/projects/netperf_socket/sys/netgraph/bluetooth/hci/ng_hci_misc.c#5 integrate .. //depot/projects/netperf_socket/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c#5 integrate .. //depot/projects/netperf_socket/sys/netgraph/bluetooth/socket/ng_btsocket.c#5 integrate .. //depot/projects/netperf_socket/sys/netgraph/netgraph.h#10 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_base.c#14 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_cisco.c#6 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_socket.c#9 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_source.c#6 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_input.c#25 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_output.c#14 integrate .. //depot/projects/netperf_socket/sys/netinet6/scope6.c#2 integrate .. //depot/projects/netperf_socket/sys/nfs4client/nfs4_vfs_subs.c#2 integrate .. //depot/projects/netperf_socket/sys/nfs4client/nfs4_vnops.c#9 integrate .. //depot/projects/netperf_socket/sys/nfsclient/nfs_node.c#5 integrate .. //depot/projects/netperf_socket/sys/nfsclient/nfs_subs.c#12 integrate .. //depot/projects/netperf_socket/sys/nfsclient/nfs_vfsops.c#12 integrate .. //depot/projects/netperf_socket/sys/nfsclient/nfs_vnops.c#10 integrate .. //depot/projects/netperf_socket/sys/nfsclient/nfsnode.h#6 integrate .. //depot/projects/netperf_socket/sys/pci/if_pcn.c#10 integrate .. //depot/projects/netperf_socket/sys/pci/if_pcnreg.h#2 integrate .. //depot/projects/netperf_socket/sys/posix4/posix4_mib.c#2 integrate .. //depot/projects/netperf_socket/sys/powerpc/include/psl.h#2 integrate .. //depot/projects/netperf_socket/sys/sparc64/include/gdb_machdep.h#2 integrate .. //depot/projects/netperf_socket/sys/sparc64/sparc64/gdb_machdep.c#2 integrate .. //depot/projects/netperf_socket/sys/sys/domain.h#3 integrate .. //depot/projects/netperf_socket/sys/sys/file.h#5 integrate .. //depot/projects/netperf_socket/sys/sys/filedesc.h#7 integrate .. //depot/projects/netperf_socket/sys/sys/mount.h#16 integrate .. //depot/projects/netperf_socket/sys/sys/pioctl.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/reboot.h#3 integrate .. //depot/projects/netperf_socket/sys/sys/socket.h#10 integrate .. //depot/projects/netperf_socket/sys/sys/vnode.h#15 integrate .. //depot/projects/netperf_socket/sys/tools/vnode_if.awk#3 integrate .. //depot/projects/netperf_socket/sys/ufs/ffs/ffs_extern.h#6 integrate .. //depot/projects/netperf_socket/sys/ufs/ffs/ffs_vfsops.c#16 integrate .. //depot/projects/netperf_socket/sys/ufs/ffs/ffs_vnops.c#11 integrate .. //depot/projects/netperf_socket/sys/ufs/ufs/ufs_extern.h#6 integrate .. //depot/projects/netperf_socket/sys/ufs/ufs/ufs_vnops.c#12 integrate Differences ... ==== //depot/projects/netperf_socket/sys/alpha/alpha/gdb_machdep.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/gdb_machdep.c,v 1.1 2004/07/10 17:47:20 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/gdb_machdep.c,v 1.2 2004/12/01 06:40:33 marcel Exp $"); #include #include @@ -59,7 +59,7 @@ } void -gdb_cpu_setreg(int regnum, register_t val) +gdb_cpu_setreg(int regnum, void *val) { switch (regnum) { } ==== //depot/projects/netperf_socket/sys/alpha/include/gdb_machdep.h#2 (text+ko) ==== @@ -23,7 +23,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. * - * $FreeBSD: src/sys/alpha/include/gdb_machdep.h,v 1.1 2004/07/10 17:47:20 marcel Exp $ + * $FreeBSD: src/sys/alpha/include/gdb_machdep.h,v 1.2 2004/12/01 06:40:33 marcel Exp $ */ #ifndef _MACHINE_GDB_MACHDEP_H_ @@ -46,7 +46,7 @@ } void *gdb_cpu_getreg(int, size_t *); -void gdb_cpu_setreg(int, register_t); +void gdb_cpu_setreg(int, void *); int gdb_cpu_signal(int, int); #endif /* !_MACHINE_GDB_MACHDEP_H_ */ ==== //depot/projects/netperf_socket/sys/amd64/amd64/busdma_machdep.c#9 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.63 2004/11/21 06:28:09 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.64 2004/11/29 14:49:27 scottl Exp $"); #include #include @@ -277,7 +277,7 @@ } if (newtag->lowaddr < ptoa((vm_paddr_t)Maxmem) - || newtag->alignment > 1 || newtag->boundary > 0) + || newtag->alignment > 1) newtag->flags |= BUS_DMA_COULD_BOUNCE; if (((newtag->flags & BUS_DMA_COULD_BOUNCE) != 0) && ==== //depot/projects/netperf_socket/sys/amd64/amd64/gdb_machdep.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/gdb_machdep.c,v 1.1 2004/07/10 17:47:20 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/gdb_machdep.c,v 1.3 2004/12/01 06:40:33 marcel Exp $"); #include #include @@ -36,49 +36,58 @@ #include #include +#include #include #include #include +#include +#include #include void * gdb_cpu_getreg(int regnum, size_t *regsz) { - struct trapframe *tf = kdb_frame; *regsz = gdb_cpu_regsz(regnum); + + if (kdb_thread == curthread) { + switch (regnum) { + case 0: return (&kdb_frame->tf_rax); + case 2: return (&kdb_frame->tf_rcx); + case 3: return (&kdb_frame->tf_rdx); + case 4: return (&kdb_frame->tf_rsi); + case 5: return (&kdb_frame->tf_rdi); + case 8: return (&kdb_frame->tf_r8); + case 9: return (&kdb_frame->tf_r9); + case 10: return (&kdb_frame->tf_r10); + case 11: return (&kdb_frame->tf_r11); + case 18: return (&kdb_frame->tf_cs); + case 19: return (&kdb_frame->tf_ss); + } + } switch (regnum) { - case 0: return (&tf->tf_rax); - case 1: return (&tf->tf_rbx); - case 2: return (&tf->tf_rcx); - case 3: return (&tf->tf_rdx); - case 4: return (&tf->tf_rsi); - case 5: return (&tf->tf_rdi); - case 6: return (&tf->tf_rbp); - case 7: return (&tf->tf_rsp); - case 8: return (&tf->tf_r8); - case 9: return (&tf->tf_r9); - case 10: return (&tf->tf_r10); - case 11: return (&tf->tf_r11); - case 12: return (&tf->tf_r12); - case 13: return (&tf->tf_r13); - case 14: return (&tf->tf_r14); - case 15: return (&tf->tf_r15); - case 16: return (&tf->tf_rip); - case 17: return (&tf->tf_rflags); - case 18: return (&tf->tf_cs); - case 19: return (&tf->tf_ss); + case 1: return (&kdb_thrctx->pcb_rbx); + case 6: return (&kdb_thrctx->pcb_rbp); + case 7: return (&kdb_thrctx->pcb_rsp); + case 12: return (&kdb_thrctx->pcb_r12); + case 13: return (&kdb_thrctx->pcb_r13); + case 14: return (&kdb_thrctx->pcb_r14); + case 15: return (&kdb_thrctx->pcb_r15); + case 16: return (&kdb_thrctx->pcb_rip); + case 17: return (&kdb_thrctx->pcb_rflags); } return (NULL); } void -gdb_cpu_setreg(int regnum, register_t val) +gdb_cpu_setreg(int regnum, void *val) { - struct trapframe *tf = kdb_frame; switch (regnum) { - case GDB_REG_PC: tf->tf_rip = val; break; + case GDB_REG_PC: + kdb_thrctx->pcb_rip = *(register_t *)val; + if (kdb_thread == curthread) + kdb_frame->tf_rip = *(register_t *)val; } } ==== //depot/projects/netperf_socket/sys/amd64/amd64/machdep.c#22 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.624 2004/11/27 06:51:32 das Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.625 2004/11/29 23:27:07 peter Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -589,8 +589,7 @@ * CR0_MP, CR0_NE and CR0_TS are also set by npx_probe() for the * BSP. See the comments there about why we set them. */ - cr0 |= CR0_MP | CR0_NE | CR0_TS; - cr0 |= CR0_WP | CR0_AM; + cr0 |= CR0_MP | CR0_NE | CR0_TS | CR0_WP | CR0_AM; load_cr0(cr0); } ==== //depot/projects/netperf_socket/sys/amd64/amd64/pmap.c#31 (text+ko) ==== @@ -75,7 +75,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.509 2004/11/27 06:51:33 das Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.510 2004/12/02 04:06:40 alc Exp $"); /* * Manages physical address maps. @@ -318,18 +318,26 @@ /* Return a pointer to the PT slot that corresponds to a VA */ static __inline pt_entry_t * +pmap_pde_to_pte(pd_entry_t *pde, vm_offset_t va) +{ + pt_entry_t *pte; + + pte = (pt_entry_t *)PHYS_TO_DMAP(*pde & PG_FRAME); + return (&pte[pmap_pte_index(va)]); +} + +/* Return a pointer to the PT slot that corresponds to a VA */ +static __inline pt_entry_t * pmap_pte(pmap_t pmap, vm_offset_t va) { pd_entry_t *pde; - pt_entry_t *pte; pde = pmap_pde(pmap, va); if (pde == NULL || (*pde & PG_V) == 0) return NULL; if ((*pde & PG_PS) != 0) /* compat with i386 pmap_pte() */ return ((pt_entry_t *)pde); - pte = (pt_entry_t *)PHYS_TO_DMAP(*pde & PG_FRAME); - return (&pte[pmap_pte_index(va)]); + return (pmap_pde_to_pte(pde, va)); } @@ -337,7 +345,6 @@ pmap_pte_pde(pmap_t pmap, vm_offset_t va, pd_entry_t *ptepde) { pd_entry_t *pde; - pt_entry_t *pte; pde = pmap_pde(pmap, va); if (pde == NULL || (*pde & PG_V) == 0) @@ -345,8 +352,7 @@ *ptepde = *pde; if ((*pde & PG_PS) != 0) /* compat with i386 pmap_pte() */ return ((pt_entry_t *)pde); - pte = (pt_entry_t *)PHYS_TO_DMAP(*pde & PG_FRAME); - return (&pte[pmap_pte_index(va)]); + return (pmap_pde_to_pte(pde, va)); } @@ -1630,9 +1636,9 @@ if (va_next > eva) va_next = eva; - for (; sva != va_next; sva += PAGE_SIZE) { - pte = pmap_pte(pmap, sva); - if (pte == NULL || *pte == 0) + for (pte = pmap_pde_to_pte(pde, sva); sva != va_next; pte++, + sva += PAGE_SIZE) { + if (*pte == 0) continue; anyvalid = 1; if (pmap_remove_pte(pmap, pte, sva, ptpaddr)) @@ -1722,6 +1728,7 @@ pml4_entry_t *pml4e; pdp_entry_t *pdpe; pd_entry_t ptpaddr, *pde; + pt_entry_t *pte; int anychanged; if ((prot & VM_PROT_READ) == VM_PROT_NONE) { @@ -1777,14 +1784,11 @@ if (va_next > eva) va_next = eva; - for (; sva != va_next; sva += PAGE_SIZE) { + for (pte = pmap_pde_to_pte(pde, sva); sva != va_next; pte++, + sva += PAGE_SIZE) { pt_entry_t obits, pbits; - pt_entry_t *pte; vm_page_t m; - pte = pmap_pte(pmap, sva); - if (pte == NULL) - continue; retry: obits = pbits = *pte; if (pbits & PG_MANAGED) { ==== //depot/projects/netperf_socket/sys/amd64/amd64/vm_machdep.c#13 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.238 2004/11/27 06:51:34 das Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.240 2004/11/30 20:25:46 peter Exp $"); #include "opt_isa.h" #include "opt_cpu.h" @@ -79,11 +79,6 @@ #include static void cpu_reset_real(void); -#ifdef SMP -static void cpu_reset_proxy(void); -static u_int cpu_reset_proxyid; -static volatile u_int cpu_reset_proxy_active; -#endif /* * Finish a fork operation, with process p2 nearly set up. @@ -331,22 +326,6 @@ /* * Force reset the processor by invalidating the entire address space! */ - -#ifdef SMP -static void -cpu_reset_proxy() -{ - - cpu_reset_proxy_active = 1; - while (cpu_reset_proxy_active == 1) - ; /* Wait for other cpu to see that we've started */ - stop_cpus((1< -__FBSDID("$FreeBSD: src/sys/arm/arm/trap.c,v 1.5 2004/11/27 06:51:34 das Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/trap.c,v 1.6 2004/12/02 23:31:48 cognet Exp $"); #include @@ -94,6 +94,7 @@ #include #include #include +#include #ifdef KTRACE #include #include ==== //depot/projects/netperf_socket/sys/boot/common/loader.8#10 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sys/boot/common/loader.8,v 1.76 2004/10/15 06:44:13 ru Exp $ +.\" $FreeBSD: src/sys/boot/common/loader.8,v 1.77 2004/12/01 04:59:31 scottl Exp $ .\" .Dd October 15, 2004 .Dt LOADER 8 @@ -352,10 +352,6 @@ Prevents the kernel from initiating a multi-user startup; instead, a single-user mode will be entered when the kernel has finished device probing. -.It Va boot_userconfig -Requests that the kernel's interactive device configuration program -be run when the kernel is booted. -Currently a no-op. .It Va boot_verbose Setting this variable causes extra debugging information to be printed by the kernel during the boot phase. ==== //depot/projects/netperf_socket/sys/boot/efi/libefi/bootinfo.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/efi/libefi/bootinfo.c,v 1.10 2004/01/04 23:28:16 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/efi/libefi/bootinfo.c,v 1.11 2004/12/01 04:59:31 scottl Exp $"); #include #include @@ -53,7 +53,6 @@ } howto_names[] = { {"boot_askname", RB_ASKNAME}, {"boot_cdrom", RB_CDROM}, - {"boot_userconfig", RB_CONFIG}, {"boot_ddb", RB_KDB}, {"boot_gdb", RB_GDB}, {"boot_single", RB_SINGLE}, @@ -86,9 +85,6 @@ case 'a': howto |= RB_ASKNAME; break; - case 'c': - howto |= RB_CONFIG; - break; case 'C': howto |= RB_CDROM; break; ==== //depot/projects/netperf_socket/sys/boot/ficl/ficl.h#2 (text+ko) ==== @@ -41,7 +41,7 @@ ** SUCH DAMAGE. */ -/* $FreeBSD: src/sys/boot/ficl/ficl.h,v 1.20 2002/04/09 17:45:11 dcs Exp $ */ +/* $FreeBSD: src/sys/boot/ficl/ficl.h,v 1.21 2004/11/30 11:35:30 scottl Exp $ */ #if !defined (__FICL_H__) #define __FICL_H__ @@ -1114,7 +1114,6 @@ extern void ficlInb(FICL_VM *pVM); #endif -#if !defined(TESTMAIN) extern void ficlSetenv(FICL_VM *pVM); extern void ficlSetenvq(FICL_VM *pVM); extern void ficlGetenv(FICL_VM *pVM); @@ -1122,9 +1121,10 @@ extern void ficlCopyin(FICL_VM *pVM); extern void ficlCopyout(FICL_VM *pVM); extern void ficlFindfile(FICL_VM *pVM); +extern void ficlCcall(FICL_VM *pVM); +#if !defined(TESTMAIN) extern void ficlPnpdevices(FICL_VM *pVM); extern void ficlPnphandlers(FICL_VM *pVM); -extern void ficlCcall(FICL_VM *pVM); #endif /* ==== //depot/projects/netperf_socket/sys/boot/ficl/loader.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/ficl/loader.c,v 1.10 2003/12/10 09:09:38 grehan Exp $ + * $FreeBSD: src/sys/boot/ficl/loader.c,v 1.11 2004/11/30 11:35:30 scottl Exp $ */ /******************************************************************* @@ -56,11 +56,13 @@ * .# ( value -- ) */ -#ifndef TESTMAIN void ficlSetenv(FICL_VM *pVM) { - char *namep, *valuep, *name, *value; +#ifndef TESTMAIN + char *name, *value; +#endif + char *namep, *valuep; int names, values; #if FICL_ROBUST > 1 @@ -71,6 +73,7 @@ values = stackPopINT(pVM->pStack); valuep = (char*) stackPopPtr(pVM->pStack); +#ifndef TESTMAIN name = (char*) ficlMalloc(names+1); if (!name) vmThrowErr(pVM, "Error: out of memory"); @@ -85,6 +88,7 @@ setenv(name, value, 1); ficlFree(name); ficlFree(value); +#endif return; } @@ -92,7 +96,10 @@ void ficlSetenvq(FICL_VM *pVM) { - char *namep, *valuep, *name, *value; +#ifndef TESTMAIN + char *name, *value; +#endif + char *namep, *valuep; int names, values, overwrite; #if FICL_ROBUST > 1 @@ -104,6 +111,7 @@ values = stackPopINT(pVM->pStack); valuep = (char*) stackPopPtr(pVM->pStack); +#ifndef TESTMAIN name = (char*) ficlMalloc(names+1); if (!name) vmThrowErr(pVM, "Error: out of memory"); @@ -118,6 +126,7 @@ setenv(name, value, overwrite); ficlFree(name); ficlFree(value); +#endif return; } @@ -125,7 +134,10 @@ void ficlGetenv(FICL_VM *pVM) { - char *namep, *name, *value; +#ifndef TESTMAIN + char *name; +#endif + char *namep, *value; int names; #if FICL_ROBUST > 1 @@ -134,6 +146,7 @@ names = stackPopINT(pVM->pStack); namep = (char*) stackPopPtr(pVM->pStack); +#ifndef TESTMAIN name = (char*) ficlMalloc(names+1); if (!name) vmThrowErr(pVM, "Error: out of memory"); @@ -147,6 +160,7 @@ stackPushPtr(pVM->pStack, value); stackPushINT(pVM->pStack, strlen(value)); } else +#endif stackPushINT(pVM->pStack, -1); return; @@ -155,7 +169,10 @@ void ficlUnsetenv(FICL_VM *pVM) { - char *namep, *name; +#ifndef TESTMAIN + char *name; +#endif + char *namep; int names; #if FICL_ROBUST > 1 @@ -164,6 +181,7 @@ names = stackPopINT(pVM->pStack); namep = (char*) stackPopPtr(pVM->pStack); +#ifndef TESTMAIN name = (char*) ficlMalloc(names+1); if (!name) vmThrowErr(pVM, "Error: out of memory"); @@ -172,6 +190,7 @@ unsetenv(name); ficlFree(name); +#endif return; } @@ -191,7 +210,9 @@ dest = stackPopINT(pVM->pStack); src = stackPopPtr(pVM->pStack); +#ifndef TESTMAIN archsw.arch_copyin(src, dest, len); +#endif return; } @@ -211,7 +232,9 @@ dest = stackPopPtr(pVM->pStack); src = stackPopINT(pVM->pStack); +#ifndef TESTMAIN archsw.arch_copyout(src, dest, len); +#endif return; } @@ -219,7 +242,10 @@ void ficlFindfile(FICL_VM *pVM) { - char *name, *type, *namep, *typep; +#ifndef TESTMAIN + char *name; +#endif + char *type, *namep, *typep; struct preloaded_file* fp; int names, types; @@ -231,6 +257,7 @@ typep = (char*) stackPopPtr(pVM->pStack); names = stackPopINT(pVM->pStack); namep = (char*) stackPopPtr(pVM->pStack); +#ifndef TESTMAIN name = (char*) ficlMalloc(names+1); if (!name) vmThrowErr(pVM, "Error: out of memory"); @@ -243,11 +270,15 @@ type[types] = '\0'; fp = file_findfile(name, type); +#else + fp = NULL; +#endif stackPushPtr(pVM->pStack, fp); return; } +#ifndef TESTMAIN #ifdef HAVE_PNP void @@ -637,11 +668,6 @@ dictAppendWord(dp, "dictthreshold", ficlDictThreshold, FW_DEFAULT); dictAppendWord(dp, "dictincrease", ficlDictIncrease, FW_DEFAULT); -#ifndef TESTMAIN -#ifdef __i386__ - dictAppendWord(dp, "outb", ficlOutb, FW_DEFAULT); - dictAppendWord(dp, "inb", ficlInb, FW_DEFAULT); -#endif dictAppendWord(dp, "setenv", ficlSetenv, FW_DEFAULT); dictAppendWord(dp, "setenv?", ficlSetenvq, FW_DEFAULT); dictAppendWord(dp, "getenv", ficlGetenv, FW_DEFAULT); @@ -649,11 +675,16 @@ dictAppendWord(dp, "copyin", ficlCopyin, FW_DEFAULT); dictAppendWord(dp, "copyout", ficlCopyout, FW_DEFAULT); dictAppendWord(dp, "findfile", ficlFindfile, FW_DEFAULT); + dictAppendWord(dp, "ccall", ficlCcall, FW_DEFAULT); +#ifndef TESTMAIN +#ifdef __i386__ + dictAppendWord(dp, "outb", ficlOutb, FW_DEFAULT); + dictAppendWord(dp, "inb", ficlInb, FW_DEFAULT); +#endif #ifdef HAVE_PNP dictAppendWord(dp, "pnpdevices",ficlPnpdevices, FW_DEFAULT); dictAppendWord(dp, "pnphandlers",ficlPnphandlers, FW_DEFAULT); #endif - dictAppendWord(dp, "ccall", ficlCcall, FW_DEFAULT); #endif #if defined(PC98) ==== //depot/projects/netperf_socket/sys/boot/forth/beastie.4th#3 (text+ko) ==== @@ -23,7 +23,7 @@ \ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF \ SUCH DAMAGE. \ -\ $FreeBSD: src/sys/boot/forth/beastie.4th,v 1.9 2004/10/30 13:45:13 brooks Exp $ >>> TRUNCATED FOR MAIL (1000 lines) <<<