Date: Thu, 9 Dec 2004 00:39:13 GMT From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 66708 for review Message-ID: <200412090039.iB90dDDa008990@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=66708 Change 66708 by peter@peter_daintree on 2004/12/09 00:38:47 IFC @66705 Affected files ... .. //depot/projects/hammer/Makefile#28 integrate .. //depot/projects/hammer/UPDATING#68 integrate .. //depot/projects/hammer/include/unistd.h#13 integrate .. //depot/projects/hammer/lib/libc/softfloat/bits32/softfloat.c#2 integrate .. //depot/projects/hammer/sbin/ifconfig/Makefile#4 integrate .. //depot/projects/hammer/sbin/ifconfig/af_atalk.c#1 branch .. //depot/projects/hammer/sbin/ifconfig/af_inet.c#1 branch .. //depot/projects/hammer/sbin/ifconfig/af_inet6.c#1 branch .. //depot/projects/hammer/sbin/ifconfig/af_ipx.c#1 branch .. //depot/projects/hammer/sbin/ifconfig/af_link.c#1 branch .. //depot/projects/hammer/sbin/ifconfig/ifclone.c#1 branch .. //depot/projects/hammer/sbin/ifconfig/ifconfig.8#19 integrate .. //depot/projects/hammer/sbin/ifconfig/ifconfig.c#21 integrate .. //depot/projects/hammer/sbin/ifconfig/ifconfig.h#6 integrate .. //depot/projects/hammer/sbin/ifconfig/ifieee80211.c#7 integrate .. //depot/projects/hammer/sbin/ifconfig/ifmac.c#2 integrate .. //depot/projects/hammer/sbin/ifconfig/ifmedia.c#6 integrate .. //depot/projects/hammer/sbin/ifconfig/ifvlan.c#2 integrate .. //depot/projects/hammer/sbin/mksnap_ffs/mksnap_ffs.c#5 integrate .. //depot/projects/hammer/share/man/man4/Makefile#59 integrate .. //depot/projects/hammer/share/man/man4/ath.4#18 integrate .. //depot/projects/hammer/share/man/man4/mac_portacl.4#6 integrate .. //depot/projects/hammer/share/man/man4/wlan.4#5 integrate .. //depot/projects/hammer/share/man/man4/wlan_acl.4#1 branch .. //depot/projects/hammer/share/man/man4/wlan_ccmp.4#1 branch .. //depot/projects/hammer/share/man/man4/wlan_tkip.4#1 branch .. //depot/projects/hammer/share/man/man4/wlan_wep.4#1 branch .. //depot/projects/hammer/share/man/man4/wlan_xauth.4#1 branch .. //depot/projects/hammer/share/man/man9/devclass_get_count.9#1 branch .. //depot/projects/hammer/share/man/man9/mbuf.9#18 integrate .. //depot/projects/hammer/sys/amd64/amd64/intr_machdep.c#32 integrate .. //depot/projects/hammer/sys/arm/arm/undefined.c#4 integrate .. //depot/projects/hammer/sys/conf/files#96 integrate .. //depot/projects/hammer/sys/conf/files.i386#46 integrate .. //depot/projects/hammer/sys/conf/kmod.mk#40 integrate .. //depot/projects/hammer/sys/conf/options#63 integrate .. //depot/projects/hammer/sys/contrib/dev/ath/COPYRIGHT#2 integrate .. //depot/projects/hammer/sys/contrib/dev/ath/README#3 integrate .. //depot/projects/hammer/sys/contrib/dev/ath/ah.h#6 integrate .. //depot/projects/hammer/sys/contrib/dev/ath/ah_desc.h#2 integrate .. //depot/projects/hammer/sys/contrib/dev/ath/ah_devid.h#3 integrate .. //depot/projects/hammer/sys/contrib/dev/ath/freebsd/ah_if.m#2 integrate .. //depot/projects/hammer/sys/contrib/dev/ath/freebsd/ah_osdep.c#5 integrate .. //depot/projects/hammer/sys/contrib/dev/ath/freebsd/ah_osdep.h#4 integrate .. //depot/projects/hammer/sys/contrib/dev/ath/freebsd/i386-elf.hal.o.uu#7 delete .. //depot/projects/hammer/sys/contrib/dev/ath/freebsd/opt_ah.h#2 delete .. //depot/projects/hammer/sys/contrib/dev/ath/public/arm9-le-thumb-elf.hal.o.uu#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/arm9-le-thumb-elf.inc#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/arm9-le-thumb-elf.opt_ah.h#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/armv4-be-elf.hal.o.uu#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/armv4-be-elf.inc#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/armv4-be-elf.opt_ah.h#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/armv4-le-elf.hal.o.uu#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/armv4-le-elf.inc#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/armv4-le-elf.opt_ah.h#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/i386-elf.hal.o.uu#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/i386-elf.inc#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/i386-elf.opt_ah.h#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/mips-be-elf.hal.o.uu#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/mips-be-elf.inc#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/mips-be-elf.opt_ah.h#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/mips-le-elf.hal.o.uu#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/mips-le-elf.inc#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/mips-le-elf.opt_ah.h#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/mips1-be-elf.hal.o.uu#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/mips1-be-elf.inc#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/mips1-be-elf.opt_ah.h#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/mips1-le-elf.hal.o.uu#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/mips1-le-elf.inc#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/mips1-le-elf.opt_ah.h#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/mipsisa32-be-elf.inc#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/mipsisa32-be-elf.opt_ah.h#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/mipsisa32-le-elf.hal.o.uu#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/mipsisa32-le-elf.inc#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/mipsisa32-le-elf.opt_ah.h#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/powerpc-be-eabi.hal.o.uu#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/powerpc-be-eabi.inc#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/powerpc-be-eabi.opt_ah.h#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/powerpc-le-eabi.hal.o.uu#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/powerpc-le-eabi.inc#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/powerpc-le-eabi.opt_ah.h#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/sh4-le-elf.hal.o.uu#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/sh4-le-elf.inc#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/sh4-le-elf.opt_ah.h#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/x86_64-elf.hal.o.uu#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/x86_64-elf.inc#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/x86_64-elf.opt_ah.h#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/xscale-be-elf.hal.o.uu#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/xscale-be-elf.inc#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/xscale-be-elf.opt_ah.h#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/xscale-le-elf.hal.o.uu#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/xscale-le-elf.inc#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/public/xscale-le-elf.opt_ah.h#1 branch .. //depot/projects/hammer/sys/contrib/dev/ath/version.h#6 integrate .. //depot/projects/hammer/sys/dev/advansys/adwcam.c#9 integrate .. //depot/projects/hammer/sys/dev/ata/ata-chipset.c#48 integrate .. //depot/projects/hammer/sys/dev/ata/ata-pci.c#27 integrate .. //depot/projects/hammer/sys/dev/ata/ata-pci.h#26 integrate .. //depot/projects/hammer/sys/dev/ata/ata-queue.c#21 integrate .. //depot/projects/hammer/sys/dev/ath/ath_rate/amrr/amrr.c#1 branch .. //depot/projects/hammer/sys/dev/ath/ath_rate/amrr/amrr.h#1 branch .. //depot/projects/hammer/sys/dev/ath/ath_rate/onoe/onoe.c#1 branch .. //depot/projects/hammer/sys/dev/ath/ath_rate/onoe/onoe.h#1 branch .. //depot/projects/hammer/sys/dev/ath/if_ath.c#22 integrate .. //depot/projects/hammer/sys/dev/ath/if_ath_pci.c#9 integrate .. //depot/projects/hammer/sys/dev/ath/if_athioctl.h#6 integrate .. //depot/projects/hammer/sys/dev/ath/if_athrate.h#1 branch .. //depot/projects/hammer/sys/dev/ath/if_athvar.h#10 integrate .. //depot/projects/hammer/sys/dev/awi/awi.c#13 integrate .. //depot/projects/hammer/sys/dev/awi/awivar.h#4 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndis.c#22 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndisvar.h#11 integrate .. //depot/projects/hammer/sys/dev/mii/mii.c#10 integrate .. //depot/projects/hammer/sys/dev/pci/pci.c#30 integrate .. //depot/projects/hammer/sys/dev/ray/if_ray.c#12 integrate .. //depot/projects/hammer/sys/dev/ray/if_rayvar.h#2 integrate .. //depot/projects/hammer/sys/dev/sound/isa/es1888.c#6 integrate .. //depot/projects/hammer/sys/dev/uart/uart_cpu_ia64.c#7 integrate .. //depot/projects/hammer/sys/dev/usb/FILES#3 integrate .. //depot/projects/hammer/sys/dev/usb/if_axe.c#17 integrate .. //depot/projects/hammer/sys/dev/usb/if_axereg.h#4 integrate .. //depot/projects/hammer/sys/dev/wi/if_wi.c#30 integrate .. //depot/projects/hammer/sys/dev/wi/if_wi_pci.c#10 integrate .. //depot/projects/hammer/sys/dev/wi/if_wivar.h#11 integrate .. //depot/projects/hammer/sys/fs/devfs/devfs_vnops.c#21 integrate .. //depot/projects/hammer/sys/i386/conf/NOTES#58 integrate .. //depot/projects/hammer/sys/i386/i386/apic_vector.s#11 integrate .. //depot/projects/hammer/sys/i386/i386/bios.c#17 integrate .. //depot/projects/hammer/sys/i386/i386/legacy.c#10 integrate .. //depot/projects/hammer/sys/i386/i386/mp_machdep.c#37 integrate .. //depot/projects/hammer/sys/i386/i386/pmap.c#64 integrate .. //depot/projects/hammer/sys/i386/i386/vm_machdep.c#36 integrate .. //depot/projects/hammer/sys/i386/include/apicvar.h#9 integrate .. //depot/projects/hammer/sys/i386/include/smp.h#7 integrate .. //depot/projects/hammer/sys/ia64/ia64/machdep.c#46 integrate .. //depot/projects/hammer/sys/ia64/include/md_var.h#11 integrate .. //depot/projects/hammer/sys/isa/isavar.h#5 integrate .. //depot/projects/hammer/sys/isofs/cd9660/cd9660_vfsops.c#23 integrate .. //depot/projects/hammer/sys/kern/init_main.c#32 integrate .. //depot/projects/hammer/sys/kern/kern_subr.c#19 integrate .. //depot/projects/hammer/sys/kern/sched_4bsd.c#32 integrate .. //depot/projects/hammer/sys/kern/subr_bus.c#31 integrate .. //depot/projects/hammer/sys/kern/uipc_mbuf.c#22 integrate .. //depot/projects/hammer/sys/kern/uipc_socket.c#45 integrate .. //depot/projects/hammer/sys/kern/vfs_init.c#13 integrate .. //depot/projects/hammer/sys/kern/vfs_mount.c#43 integrate .. //depot/projects/hammer/sys/kern/vfs_subr.c#65 integrate .. //depot/projects/hammer/sys/modules/Makefile#61 integrate .. //depot/projects/hammer/sys/modules/ath_hal/Makefile#3 integrate .. //depot/projects/hammer/sys/modules/ath_rate_amrr/Makefile#1 branch .. //depot/projects/hammer/sys/modules/ath_rate_onoe/Makefile#1 branch .. //depot/projects/hammer/sys/modules/wlan/Makefile#4 integrate .. //depot/projects/hammer/sys/modules/wlan_acl/Makefile#1 branch .. //depot/projects/hammer/sys/modules/wlan_ccmp/Makefile#1 branch .. //depot/projects/hammer/sys/modules/wlan_tkip/Makefile#1 branch .. //depot/projects/hammer/sys/modules/wlan_wep/Makefile#1 branch .. //depot/projects/hammer/sys/modules/wlan_xauth/Makefile#1 branch .. //depot/projects/hammer/sys/net/bpf.c#24 integrate .. //depot/projects/hammer/sys/net/if.c#37 integrate .. //depot/projects/hammer/sys/net/if_var.h#25 integrate .. //depot/projects/hammer/sys/net80211/_ieee80211.h#1 branch .. //depot/projects/hammer/sys/net80211/ieee80211.c#12 integrate .. //depot/projects/hammer/sys/net80211/ieee80211.h#6 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_acl.c#1 branch .. //depot/projects/hammer/sys/net80211/ieee80211_crypto.c#4 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_crypto.h#3 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_crypto_ccmp.c#1 branch .. //depot/projects/hammer/sys/net80211/ieee80211_crypto_none.c#1 branch .. //depot/projects/hammer/sys/net80211/ieee80211_crypto_tkip.c#1 branch .. //depot/projects/hammer/sys/net80211/ieee80211_crypto_wep.c#1 branch .. //depot/projects/hammer/sys/net80211/ieee80211_freebsd.c#1 branch .. //depot/projects/hammer/sys/net80211/ieee80211_freebsd.h#1 branch .. //depot/projects/hammer/sys/net80211/ieee80211_input.c#11 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_ioctl.c#12 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_ioctl.h#6 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_node.c#14 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_node.h#9 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_output.c#9 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_proto.c#10 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_proto.h#5 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_radiotap.h#4 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_var.h#12 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_xauth.c#1 branch .. //depot/projects/hammer/sys/netgraph/ng_pppoe.c#14 integrate .. //depot/projects/hammer/sys/netinet/if_ether.c#17 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_socket.c#21 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_vfsops.c#32 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_vnops.c#30 integrate .. //depot/projects/hammer/sys/security/mac_portacl/mac_portacl.c#6 integrate .. //depot/projects/hammer/sys/sparc64/isa/isa.c#11 integrate .. //depot/projects/hammer/sys/sys/bus.h#13 integrate .. //depot/projects/hammer/sys/sys/mbuf.h#35 integrate .. //depot/projects/hammer/sys/sys/mount.h#27 integrate .. //depot/projects/hammer/sys/sys/systm.h#28 integrate .. //depot/projects/hammer/sys/sys/uio.h#10 integrate .. //depot/projects/hammer/sys/sys/vnode.h#38 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_snapshot.c#27 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_vfsops.c#38 integrate .. //depot/projects/hammer/sys/vm/vm_object.c#45 integrate .. //depot/projects/hammer/sys/vm/vm_object.h#20 integrate .. //depot/projects/hammer/sys/vm/vnode_pager.c#26 integrate .. //depot/projects/hammer/tools/regression/net80211/ccmp/Makefile#1 branch .. //depot/projects/hammer/tools/regression/net80211/ccmp/test_ccmp.c#1 branch .. //depot/projects/hammer/tools/regression/net80211/tkip/Makefile#1 branch .. //depot/projects/hammer/tools/regression/net80211/tkip/test_tkip.c#1 branch .. //depot/projects/hammer/tools/regression/net80211/wep/Makefile#1 branch .. //depot/projects/hammer/tools/regression/net80211/wep/test_wep.c#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/Makefile#15 integrate .. //depot/projects/hammer/tools/tools/README#12 integrate .. //depot/projects/hammer/tools/tools/ath/80211debug.c#1 branch .. //depot/projects/hammer/tools/tools/ath/80211stats.c#3 integrate .. //depot/projects/hammer/tools/tools/ath/Makefile#5 integrate .. //depot/projects/hammer/tools/tools/ath/athdebug.c#1 branch .. //depot/projects/hammer/tools/tools/ath/athstats.c#5 integrate .. //depot/projects/hammer/usr.bin/make/Makefile#12 integrate .. //depot/projects/hammer/usr.bin/make/arch.c#8 integrate .. //depot/projects/hammer/usr.bin/make/compat.c#11 integrate .. //depot/projects/hammer/usr.bin/make/cond.c#11 integrate .. //depot/projects/hammer/usr.bin/make/dir.c#9 integrate .. //depot/projects/hammer/usr.bin/make/dir.h#5 integrate .. //depot/projects/hammer/usr.bin/make/for.c#9 integrate .. //depot/projects/hammer/usr.bin/make/job.c#16 integrate .. //depot/projects/hammer/usr.bin/make/job.h#11 integrate .. //depot/projects/hammer/usr.bin/make/lst.h#5 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstAppend.c#6 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstClose.c#5 delete .. //depot/projects/hammer/usr.bin/make/lst.lib/lstConcat.c#6 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstDeQueue.c#6 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstDestroy.c#6 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstDupl.c#6 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstFindFrom.c#6 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstForEachFrom.c#6 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstInit.c#5 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstInsert.c#6 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstIsAtEnd.c#6 delete .. //depot/projects/hammer/usr.bin/make/lst.lib/lstMember.c#5 integrate .. //depot/projects/hammer/usr.bin/make/lst.lib/lstNext.c#6 delete .. //depot/projects/hammer/usr.bin/make/lst.lib/lstOpen.c#6 delete .. //depot/projects/hammer/usr.bin/make/lst.lib/lstRemove.c#6 integrate .. //depot/projects/hammer/usr.bin/make/main.c#23 integrate .. //depot/projects/hammer/usr.bin/make/make.c#8 integrate .. //depot/projects/hammer/usr.bin/make/make.h#5 integrate .. //depot/projects/hammer/usr.bin/make/nonints.h#8 integrate .. //depot/projects/hammer/usr.bin/make/parse.c#18 integrate .. //depot/projects/hammer/usr.bin/make/str.c#8 integrate .. //depot/projects/hammer/usr.bin/make/suff.c#10 integrate .. //depot/projects/hammer/usr.bin/make/targ.c#8 integrate .. //depot/projects/hammer/usr.bin/make/var.c#14 integrate .. //depot/projects/hammer/usr.bin/make/var_modify.c#5 integrate Differences ... ==== //depot/projects/hammer/Makefile#28 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.310 2004/11/06 03:14:26 peter Exp $ +# $FreeBSD: src/Makefile,v 1.311 2004/12/07 14:41:16 harti Exp $ # # The user-driven targets are: # @@ -217,6 +217,7 @@ # upgrade_checks: @if ! (cd ${.CURDIR}/tools/regression/usr.bin/make && \ + PATH=${PATH} ${BINMAKE} obj >/dev/null 2>&1 && \ PATH=${PATH} ${BINMAKE} >/dev/null 2>&1); \ then \ (cd ${.CURDIR} && make make); \ ==== //depot/projects/hammer/UPDATING#68 (text+ko) ==== @@ -195,12 +195,10 @@ is installed. 20040817: - IPFW has been converted to use PFIL_HOOKS. This change is + IPFW has been converted to use pfil(9). This change is transparent to userland and preserves the ipfw ABI. The ipfw core packet inspection and filtering functions have not been - changed, only how ipfw is invoked is different. Note that - "option PFIL_HOOKS" is required to use IPFIREWALL compiled - into the kernel or as KLD. + changed, only how ipfw is invoked is different. 20040814: The RANDOM_IP_ID option has been replaced by the sysctl @@ -423,8 +421,7 @@ sure to run mergemaster -p before installworld to create required user account ("proxy"). If you do not want to build pf with your system you can use the NO_PF knob in make.conf. - Also note that pf requires "options PFIL_HOOKS" in the kernel. The - pf system consists of the following three devices: + The pf system consists of the following three devices: device pf # required device pflog # optional device pfsync # optional @@ -580,13 +577,6 @@ kiconv(3) has been added. mount_msdosfs(8), mount_ntfs(8) and mount_cd9660(8) need to be in sync with kernel. -20030925: - Configuring a system to use IPFILTER now requires that PFIL_HOOKS - also be explicitly configured. Previously this dependency was - magically handled through some cruft in net/pfil.h; but that has - been removed. Building a kernel with IPFILTER but not PFIL_HOOKS - will fail with obtuse errors in ip_fil.c. - 20030923: Fix a bug in arplookup(), whereby a hostile party on a locally attached network could exhaust kernel memory, and cause a system @@ -1973,4 +1963,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.379 2004/11/16 21:18:41 jhb Exp $ +$FreeBSD: src/UPDATING,v 1.380 2004/12/08 04:08:33 mlaier Exp $ ==== //depot/projects/hammer/include/unistd.h#13 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)unistd.h 8.12 (Berkeley) 4/27/95 - * $FreeBSD: src/include/unistd.h,v 1.73 2004/02/23 04:51:07 ache Exp $ + * $FreeBSD: src/include/unistd.h,v 1.74 2004/12/07 07:10:39 phk Exp $ */ #ifndef _UNISTD_H_ @@ -494,7 +494,6 @@ char *mktemp(char *); #define _MKTEMP_DECLARED #endif -int nfsclnt(int, void *); int nfssvc(int, void *); int profil(char *, size_t, vm_offset_t, int); int rcmd(char **, int, const char *, const char *, const char *, int *); ==== //depot/projects/hammer/lib/libc/softfloat/bits32/softfloat.c#2 (text+ko) ==== @@ -52,7 +52,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/softfloat/bits32/softfloat.c,v 1.1 2004/05/14 12:13:05 cognet Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/softfloat/bits32/softfloat.c,v 1.2 2004/12/08 18:41:42 cognet Exp $"); #ifdef SOFTFLOAT_FOR_GCC #include "softfloat-for-gcc.h" @@ -77,7 +77,7 @@ Floating-point rounding mode and exception flags. ------------------------------------------------------------------------------- */ -fp_rnd float_rounding_mode = float_round_nearest_even; +fp_rnd_t float_rounding_mode = float_round_nearest_even; fp_except float_exception_flags = 0; /* ==== //depot/projects/hammer/sbin/ifconfig/Makefile#4 (text+ko) ==== @@ -1,36 +1,37 @@ # From: @(#)Makefile 8.1 (Berkeley) 6/5/93 -# $FreeBSD: src/sbin/ifconfig/Makefile,v 1.25 2004/02/23 20:13:52 johan Exp $ +# $FreeBSD: src/sbin/ifconfig/Makefile,v 1.26 2004/12/08 19:18:07 sam Exp $ PROG= ifconfig -SRCS= ifconfig.c -#comment out to exclude SIOC[GS]IFMEDIA support -SRCS+= ifmedia.c -CFLAGS+=-DUSE_IF_MEDIA -CFLAGS+=-DINET6 +SRCS= ifconfig.c # base support -#comment out to exclude SIOC[GS]ETVLAN support -SRCS+= ifvlan.c -CFLAGS+=-DUSE_VLANS +# +# NB: The order here defines the order in which the constructors +# are called. This in turn defines the default order in which +# status is displayed. Probably should add a priority mechanism +# to the registration process so we don't depend on this aspect +# of the toolchain. +# +SRCS+= af_link.c # LLC support +SRCS+= af_inet.c # IPv4 support +SRCS+= af_inet6.c # IPv6 support +SRCS+= af_atalk.c # AppleTalk support -#comment out to exclude SIOC[GS]IEEE80211 support -SRCS+= ifieee80211.c -CFLAGS+=-DUSE_IEEE80211 +SRCS+= ifclone.c # clone device support +SRCS+= ifmac.c # MAC support +SRCS+= ifmedia.c # SIOC[GS]IFMEDIA support +SRCS+= ifvlan.c # SIOC[GS]ETVLAN support +SRCS+= ifieee80211.c # SIOC[GS]IEEE80211 support -#comment out to exclude MAC support -SRCS+= ifmac.c -CFLAGS+=-DUSE_MAC - -MAN= ifconfig.8 - -.if defined(RELEASE_CRUNCH) -CFLAGS+=-DNO_IPX -.else +.if !defined(RELEASE_CRUNCH) +SRCS+= af_ipx.c # IPX support DPADD= ${LIBIPX} LDADD= -lipx .endif -CFLAGS+=-DNS -Wall -Wmissing-prototypes -Wcast-qual -Wwrite-strings \ +MAN= ifconfig.8 + +CFLAGS+= -g -Wall -Wmissing-prototypes -Wcast-qual -Wwrite-strings \ -Wnested-externs -I.. WARNS?= 0 ==== //depot/projects/hammer/sbin/ifconfig/ifconfig.8#19 (text+ko) ==== @@ -26,9 +26,9 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)ifconfig.8 8.3 (Berkeley) 1/5/94 -.\" $FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.86 2004/11/06 13:38:45 ru Exp $ +.\" $FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.87 2004/12/08 19:18:07 sam Exp $ .\" -.Dd July 26, 2004 +.Dd Nov 2, 2004 .Dt IFCONFIG 8 .Os .Sh NAME @@ -55,6 +55,7 @@ .Op Fl d .Op Fl m .Op Fl u +.Op Fl v .Op Ar address_family .Nm .Fl l @@ -66,6 +67,7 @@ .Op Fl d .Op Fl m .Op Fl u +.Op Fl v .Op Fl C .Sh DESCRIPTION The @@ -596,64 +598,101 @@ It happens automatically when setting the first address on an interface. If the interface was reset when previously marked down, the hardware will be re-initialized. -.It Cm ssid Ar ssid -For IEEE 802.11 wireless interfaces, set the desired Service Set -Identifier (aka network name). -The SSID is a string up to 32 characters -in length and may be specified as either a normal string or in -hexadecimal when proceeded by -.Ql 0x . -Additionally, the SSID may be cleared by setting it to -.Ql - . -.It Cm nwid Ar ssid -Another name for the -.Cm ssid -parameter. -Included for -.Nx -compatibility. -.It Cm stationname Ar name -For IEEE 802.11 wireless interfaces, set the name of this station. -It appears that the station name is not really part of the IEEE 802.11 -protocol though all interfaces seem to support it. -As such it only -seems to be meaningful to identical or virtually identical equipment. -Setting the station name is identical in syntax to setting the SSID. -.It Cm station Ar name -Another name for the -.Cm stationname -parameter. -Included for -.Bsx -compatibility. -.It Cm channel Ar number -For IEEE 802.11 wireless interfaces, set the desired channel. -Channels range from 1 to 14, but the exact selection available -depends on the region your adaptor was manufactured for. -Setting -the channel to 0 will give you the default for your adaptor. -Many -adaptors ignore this setting unless you are in ad-hoc mode. +.El +.Pp +The following parameters are specific to IEEE 802.11 wireless interfaces: +.Bl -tag -width indent +.It Cm apbridge +When operating as an access point pass packets between +wireless clients directly (default). +To instead let them pass up through the +system and be forwarded using some other mechanism use +.Dq Li -apbridge. +Disabling the internal bridging +is useful when traffic is to be processed with +packet filtering. .It Cm authmode Ar mode -For IEEE 802.11 wireless interfaces, set the desired authentication mode -in infrastructure mode. +Set the desired authentication mode in infrastructure mode. Not all adaptors support all modes. The set of valid modes is .Dq Li none , .Dq Li open , +.Dq Li shared (shared key), +.Dq Li 8021x (IEEE 802.1x), +or +.Dq Li wpa (IEEE WPA/WPA2/802.11i). +The +.Dq Li 8021x and -.Dq Li shared . +.Dq Li wpa +modes are only useful when used an authentication service +(a supplicant for client operation or an authenticator when +operating as an access point). Modes are case insensitive. +.It Cm bssid Ar address +Specify the MAC address of the access point to use when operating +as a station in a BSS network. +This overrides any automatic selection done by the system. +To disable a previously selected access point supply +.Dq Li any , +.Dq Li none , +or +.Dq Li - +for the address. +This option is useful when more than one access points have the same SSID. +Another name for the +.Cm bssid +parameter is +.Cm ap . +.It Cm chanlist Ar channels +Set the desired channels to use when scanning for access +points, neighbors in an IBSS network, or looking for unoccupied +channels when operating as an access point. +The set of channels is specified as a comma-separated list with +each element in the list either a single channel number of a range +of the form +.Dq Li a-b . +Channel numbers must be in the range 1 to 255 and be permissible +according to the operating characteristics of the device. +.It Cm channel Ar number +Set a single desired channel. +Channels range from 1 to 255, but the exact selection available +depends on the region your adaptor was manufactured for. +Setting +the channel to +.Dq Li 0 , +.Dq Li any , +or +.Dq Li - +will give you the default for your adaptor. +Many +adaptors ignore this setting unless you are in ad-hoc mode. +Alternatively the frequency, in megahertz, may be specified +instead of the channel number. +.It Cm hidessid +When operating as an access point do not broadcast the SSID +in beacon frames. +By default the SSID is included in beacon frames. +To re-enable the broadcast of the SSID use +.Fl hidessid . .It Cm powersave -For IEEE 802.11 wireless interfaces, enable powersave mode. -.It Fl powersave -For IEEE 802.11 wireless interfaces, disable powersave mode. +Enable powersave operation. +When operating as a client the station will conserve power by +periodically turning off the radio and listening for +messages from the access point telling it there are packets waiting. +The station must then retrieve the packets. +When operating as an access point the station must honor power +save operation of associated clients. +Not all devices support power save operation, either as a client +or as an access point. +Use +.Fl powersave +to disable powersave operation. .It Cm powersavesleep Ar sleep -For IEEE 802.11 wireless interfaces, set the desired max powersave sleep -time in milliseconds. +Set the desired max powersave sleep time in milliseconds. .It Cm protmode Ar technique -For IEEE 802.11 wireless interfaces operating in 11g, use the specified +For interfaces operating in 802.11g, use the specified .Ar technique for protecting OFDM frames in a mixed 11b/11g network. The set of valid techniques is @@ -664,8 +703,25 @@ .Dq Li rtscts (RTS/CTS). Technique names are case insensitive. +.It Cm roaming Ar mode +When operating as a station, control how the system will +behave when communication with the current access point +is broken. +.I Mode +may be one of +.Dq Li device +(leave it to the hardware device to decide), +.Dq Li auto +(handle either in the device or the operating system--as appropriate), +.Dq Li manual +(do nothing until explicitly instructed). +By the default the device is left to handle this if it is +capable; otherwise the operating system will automatically +attempt to reestablish communication. +Manual mode is mostly useful when an application wants to +control the selection of an access point. .It Cm rtsthreshold Ar length -For IEEE 802.11 wireless interfaces, set the threshold for which +Set the threshold for which transmitted frames are preceded by transmission of an RTS control frame. @@ -674,8 +730,26 @@ argument is the frame size in bytes and must be in the range 1 to 2312. Not all adaptors support setting the RTS threshold. +.It Cm ssid Ar ssid +Set the desired Service Set Identifier (aka network name). +The SSID is a string up to 32 characters +in length and may be specified as either a normal string or in +hexadecimal when proceeded by +.Ql 0x . +Additionally, the SSID may be cleared by setting it to +.Ql - . +.It Cm scan +Display the current set of scanned neighbors and/or trigger a new scan. +Only the super-user can trigger a scan. +.It Cm stationname Ar name +Set the name of this station. +It appears that the station name is not really part of the IEEE 802.11 +protocol though all interfaces seem to support it. +As such it only +seems to be meaningful to identical or virtually identical equipment. +Setting the station name is identical in syntax to setting the SSID. .It Cm txpower Ar power -For IEEE 802.11 wireless interfaces, set the power used to transmit frames. +Set the power used to transmit frames. The .Ar power argument @@ -686,7 +760,7 @@ the driver will use the setting closest to the specified value. Not all adaptors support changing the transmit power. .It Cm wepmode Ar mode -For IEEE 802.11 wireless interfaces, set the desired WEP mode. +Set the desired WEP mode. Not all adaptors support all modes. The set of valid modes is .Dq Li off , @@ -706,10 +780,9 @@ .Dq Li mixed . Modes are case insensitive. .It Cm weptxkey Ar index -For IEEE 802.11 wireless interfaces, set the WEP key to be used for -transmission. +Set the WEP key to be used for transmission. .It Cm wepkey Ar key Ns | Ns Ar index : Ns Ar key -For IEEE 802.11 wireless interfaces, set the selected WEP key. +Set the selected WEP key. If an .Ar index is not given, key 1 is set. @@ -732,6 +805,31 @@ If that is the case, then the first four keys (1-4) will be the standard temporary keys and any others will be adaptor specific keys such as permanent keys stored in NVRAM. +.It Cm wme +Enable Wireless Media Extensions (WME) support, if available, +for the specified interface. +WME is a subset of the IEEE 802.11e standard to support the +efficient communication of realtime and multimedia data. +To disable WME support use +.Fl wme . +.El +.Pp +The following parameters are support for compatibility with other systems: +.Bl -tag -width indent +.It Cm nwid Ar ssid +Another name for the +.Cm ssid +parameter. +Included for +.Nx +compatibility. +.It Cm station Ar name +Another name for the +.Cm stationname +parameter. +Included for +.Bsx +compatibility. .It Cm wep Another way of saying .Cm wepmode on . @@ -746,9 +844,7 @@ compatibility. .It Cm nwkey key Another way of saying: -.Pp .Dq Li "wepmode on weptxkey 1 wepkey 1:key wepkey 2:- wepkey 3:- wepkey 4:-" . -.Pp Included for .Nx compatibility. @@ -758,16 +854,13 @@ .Sm on .Xc Another way of saying -.Pp .Dq Li "wepmode on weptxkey n wepkey 1:k1 wepkey 2:k2 wepkey 3:k3 wepkey 4:k4" . -.Pp Included for .Nx compatibility. .It Fl nwkey Another way of saying .Cm wepmode off . -.Pp Included for .Nx compatibility. @@ -820,6 +913,10 @@ (only list interfaces that are up). .Pp The +.Fl v +flag may be used to get more verbose status for an interface. +.Pp +The .Fl C flag may be used to list all of the interface cloners available on the system, with no additional information. ==== //depot/projects/hammer/sbin/ifconfig/ifconfig.c#21 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)ifconfig.c 8.2 (Berkeley) 2/16/94"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/ifconfig/ifconfig.c,v 1.107 2004/09/01 18:22:14 brooks Exp $"; + "$FreeBSD: src/sbin/ifconfig/ifconfig.c,v 1.108 2004/12/08 19:18:07 sam Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -62,21 +62,6 @@ #include <arpa/inet.h> #include <netdb.h> -#ifdef INET6 -#include <netinet6/nd6.h> /* Define ND6_INFINITE_LIFETIME */ -#endif - -#ifndef NO_IPX -/* IPX */ -#define IPXIP -#define IPTUNNEL -#include <netipx/ipx.h> -#include <netipx/ipx_if.h> -#endif - -/* Appletalk */ -#include <netatalk/at.h> - #include <ctype.h> #include <err.h> #include <errno.h> @@ -85,34 +70,15 @@ #include <stdlib.h> #include <string.h> #include <unistd.h> -#include <ifaddrs.h> #include "ifconfig.h" -/* wrapper for KAME-special getnameinfo() */ -#ifndef NI_WITHSCOPEID -#define NI_WITHSCOPEID 0 -#endif - /* * Since "struct ifreq" is composed of various union members, callers * should pay special attention to interprete the value. * (.e.g. little/big endian difference in the structure.) */ -struct ifreq ifr, ridreq; -struct ifaliasreq addreq; -#ifdef INET6 -struct in6_ifreq in6_ridreq; -struct in6_aliasreq in6_addreq = - { { 0 }, - { 0 }, - { 0 }, - { 0 }, - 0, - { 0, 0, ND6_INFINITE_LIFETIME, ND6_INFINITE_LIFETIME } }; -#endif -struct sockaddr_in netmask; -struct netrange at_nr; /* AppleTalk net range */ +struct ifreq ifr; char name[IFNAMSIZ]; int flags; @@ -122,327 +88,78 @@ int doalias; int clearaddr; int newaddr = 1; -#ifdef INET6 -static int ip6lifetime; -#endif +int verbose; -struct afswtch; +int supmedia = 0; +int printname = 0; /* Print the name of the created interface. */ -int supmedia = 0; -int listcloners = 0; -int printname = 0; /* Print the name of the created interface. */ - -#ifdef INET6 -char addr_buf[MAXHOSTNAMELEN *2 + 1]; /*for getnameinfo()*/ -#endif - -void Perror(const char *cmd); -void checkatrange(struct sockaddr_at *); -int ifconfig(int argc, char *const *argv, const struct afswtch *afp); -void notealias(const char *, int, int, const struct afswtch *afp); -void list_cloners(void); -void printb(const char *s, unsigned value, const char *bits); -void rt_xaddrs(caddr_t, caddr_t, struct rt_addrinfo *); -void status(const struct afswtch *afp, int addrcount, +static int ifconfig(int argc, char *const *argv, const struct afswtch *afp); +static void status(const struct afswtch *afp, int addrcount, struct sockaddr_dl *sdl, struct if_msghdr *ifm, struct ifa_msghdr *ifam); -void tunnel_status(int s); -void usage(void); -void ifmaybeload(char *name); +static void tunnel_status(int s); +static void usage(void); -#ifdef INET6 -void in6_fillscopeid(struct sockaddr_in6 *sin6); -int prefix(void *, int); -static char *sec2str(time_t); -int explicit_prefix = 0; -#endif +static struct afswtch *af_getbyname(const char *name); +static struct afswtch *af_getbyfamily(int af); +static void af_all_status(int, const struct rt_addrinfo *sdl); -typedef void c_func(const char *cmd, int arg, int s, const struct afswtch *afp); -typedef void c_func2(const char *arg, const char *arg2, int s, const struct afswtch *afp); -c_func setatphase, setatrange; -c_func setifaddr, setifbroadaddr, setifdstaddr, setifnetmask; -c_func2 settunnel; -c_func deletetunnel; -#ifdef INET6 -c_func setifprefixlen; -c_func setip6flags; -c_func setip6pltime; -c_func setip6vltime; -c_func2 setip6lifetime; -c_func setip6eui64; -#endif -c_func setifipdst; -c_func setifflags, setifmetric, setifmtu, setifcap; -c_func clone_destroy; -c_func setifname; - - -void clone_create(void); - - -#define NEXTARG 0xffffff -#define NEXTARG2 0xfffffe - -const -struct cmd { - const char *c_name; - int c_parameter; /* NEXTARG means next argv */ - void (*c_func)(const char *, int, int, const struct afswtch *afp); - void (*c_func2)(const char *, const char *, int, const struct afswtch *afp); -} cmds[] = { - { "up", IFF_UP, setifflags } , - { "down", -IFF_UP, setifflags }, - { "arp", -IFF_NOARP, setifflags }, - { "-arp", IFF_NOARP, setifflags }, - { "debug", IFF_DEBUG, setifflags }, - { "-debug", -IFF_DEBUG, setifflags }, - { "promisc", IFF_PPROMISC, setifflags }, - { "-promisc", -IFF_PPROMISC, setifflags }, - { "add", IFF_UP, notealias }, - { "alias", IFF_UP, notealias }, - { "-alias", -IFF_UP, notealias }, - { "delete", -IFF_UP, notealias }, - { "remove", -IFF_UP, notealias }, -#ifdef notdef -#define EN_SWABIPS 0x1000 - { "swabips", EN_SWABIPS, setifflags }, - { "-swabips", -EN_SWABIPS, setifflags }, -#endif - { "netmask", NEXTARG, setifnetmask }, -#ifdef INET6 - { "prefixlen", NEXTARG, setifprefixlen }, - { "anycast", IN6_IFF_ANYCAST, setip6flags }, - { "tentative", IN6_IFF_TENTATIVE, setip6flags }, - { "-tentative", -IN6_IFF_TENTATIVE, setip6flags }, - { "deprecated", IN6_IFF_DEPRECATED, setip6flags }, - { "-deprecated", -IN6_IFF_DEPRECATED, setip6flags }, - { "autoconf", IN6_IFF_AUTOCONF, setip6flags }, - { "-autoconf", -IN6_IFF_AUTOCONF, setip6flags }, - { "pltime", NEXTARG, setip6pltime }, - { "vltime", NEXTARG, setip6vltime }, - { "eui64", 0, setip6eui64 }, -#endif - { "range", NEXTARG, setatrange }, - { "phase", NEXTARG, setatphase }, - { "metric", NEXTARG, setifmetric }, - { "broadcast", NEXTARG, setifbroadaddr }, - { "ipdst", NEXTARG, setifipdst }, - { "tunnel", NEXTARG2, NULL, settunnel }, - { "deletetunnel", 0, deletetunnel }, - { "link0", IFF_LINK0, setifflags }, - { "-link0", -IFF_LINK0, setifflags }, - { "link1", IFF_LINK1, setifflags }, - { "-link1", -IFF_LINK1, setifflags }, - { "link2", IFF_LINK2, setifflags }, - { "-link2", -IFF_LINK2, setifflags }, - { "monitor", IFF_MONITOR, setifflags }, - { "-monitor", -IFF_MONITOR, setifflags }, - { "staticarp", IFF_STATICARP, setifflags }, - { "-staticarp", -IFF_STATICARP, setifflags }, -#ifdef USE_IF_MEDIA - { "media", NEXTARG, setmedia }, - { "mode", NEXTARG, setmediamode }, - { "mediaopt", NEXTARG, setmediaopt }, - { "-mediaopt", NEXTARG, unsetmediaopt }, -#endif -#ifdef USE_VLANS - { "vlan", NEXTARG, setvlantag }, - { "vlandev", NEXTARG, setvlandev }, - { "-vlandev", NEXTARG, unsetvlandev }, -#endif -#if 0 - /* XXX `create' special-cased below */ - {"create", 0, clone_create }, - {"plumb", 0, clone_create }, -#endif - {"destroy", 0, clone_destroy }, - {"unplumb", 0, clone_destroy }, -#ifdef USE_IEEE80211 - { "ssid", NEXTARG, set80211ssid }, - { "nwid", NEXTARG, set80211ssid }, - { "stationname", NEXTARG, set80211stationname }, - { "station", NEXTARG, set80211stationname }, /* BSD/OS */ - { "channel", NEXTARG, set80211channel }, - { "authmode", NEXTARG, set80211authmode }, - { "powersavemode", NEXTARG, set80211powersavemode }, - { "powersave", 1, set80211powersave }, - { "-powersave", 0, set80211powersave }, - { "powersavesleep", NEXTARG, set80211powersavesleep }, - { "wepmode", NEXTARG, set80211wepmode }, - { "wep", 1, set80211wep }, - { "-wep", 0, set80211wep }, - { "weptxkey", NEXTARG, set80211weptxkey }, - { "wepkey", NEXTARG, set80211wepkey }, - { "nwkey", NEXTARG, set80211nwkey }, /* NetBSD */ - { "-nwkey", 0, set80211wep }, /* NetBSD */ - { "rtsthreshold",NEXTARG, set80211rtsthreshold }, - { "protmode", NEXTARG, set80211protmode }, - { "txpower", NEXTARG, set80211txpower }, -#endif -#ifdef USE_MAC - { "maclabel", NEXTARG, setifmaclabel }, -#endif - { "rxcsum", IFCAP_RXCSUM, setifcap }, >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200412090039.iB90dDDa008990>