Date: Wed, 27 Jul 2005 05:20:44 GMT From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 81032 for review Message-ID: <200507270520.j6R5Kiq3004745@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=81032 Change 81032 by peter@peter_daintree on 2005/07/27 05:20:38 IFC @81031 Affected files ... .. //depot/projects/hammer/Makefile.inc1#100 integrate .. //depot/projects/hammer/ObsoleteFiles.inc#2 integrate .. //depot/projects/hammer/contrib/bind9/FREEBSD-Upgrade#5 integrate .. //depot/projects/hammer/etc/rc.d/dhclient#16 integrate .. //depot/projects/hammer/lib/bind/bind/config.h#2 integrate .. //depot/projects/hammer/lib/bind/config.h#3 integrate .. //depot/projects/hammer/lib/bind/config.mk#7 integrate .. //depot/projects/hammer/lib/bind/isc/Makefile#4 integrate .. //depot/projects/hammer/lib/bind/isc/isc/platform.h#2 integrate .. //depot/projects/hammer/lib/libc/gen/getttyent.c#2 integrate .. //depot/projects/hammer/lib/libmemstat/memstat_uma.c#4 integrate .. //depot/projects/hammer/sbin/dhclient/dhclient-script#2 integrate .. //depot/projects/hammer/sbin/dhclient/dhclient.c#4 integrate .. //depot/projects/hammer/sbin/dhclient/tables.c#2 integrate .. //depot/projects/hammer/sbin/ifconfig/ifieee80211.c#14 integrate .. //depot/projects/hammer/share/doc/IPv6/IMPLEMENTATION#5 integrate .. //depot/projects/hammer/share/man/man4/gif.4#7 integrate .. //depot/projects/hammer/share/man/man9/Makefile#55 integrate .. //depot/projects/hammer/share/man/man9/VFS.9#5 integrate .. //depot/projects/hammer/share/man/man9/VFS_START.9#7 delete .. //depot/projects/hammer/sys/amd64/conf/GENERIC#77 integrate .. //depot/projects/hammer/sys/boot/common/help.common#13 integrate .. //depot/projects/hammer/sys/conf/NOTES#95 integrate .. //depot/projects/hammer/sys/conf/files#120 integrate .. //depot/projects/hammer/sys/conf/options#82 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_battery.c#10 integrate .. //depot/projects/hammer/sys/dev/gem/if_gem.c#17 integrate .. //depot/projects/hammer/sys/dev/gem/if_gem_pci.c#13 integrate .. //depot/projects/hammer/sys/dev/gem/if_gemvar.h#6 integrate .. //depot/projects/hammer/sys/dev/nve/if_nve.c#7 integrate .. //depot/projects/hammer/sys/geom/geom_io.c#31 integrate .. //depot/projects/hammer/sys/geom/zero/g_zero.c#1 branch .. //depot/projects/hammer/sys/kern/sched_ule.c#62 integrate .. //depot/projects/hammer/sys/modules/geom/Makefile#11 integrate .. //depot/projects/hammer/sys/modules/geom/geom_zero/Makefile#1 branch .. //depot/projects/hammer/sys/net/bpf.c#36 integrate .. //depot/projects/hammer/sys/net/if_bridge.c#8 integrate .. //depot/projects/hammer/sys/net/if_gif.c#20 integrate .. //depot/projects/hammer/sys/net/if_spppsubr.c#21 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_input.c#22 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_node.c#24 integrate .. //depot/projects/hammer/sys/netinet/icmp6.h#9 integrate .. //depot/projects/hammer/sys/netinet/ip_carp.c#10 integrate .. //depot/projects/hammer/sys/netinet/ip_fw2.c#61 integrate .. //depot/projects/hammer/sys/netinet/tcp_subr.c#47 integrate .. //depot/projects/hammer/sys/netinet/tcp_usrreq.c#32 integrate .. //depot/projects/hammer/sys/netinet6/ah_core.c#10 integrate .. //depot/projects/hammer/sys/netinet6/icmp6.c#21 integrate .. //depot/projects/hammer/sys/netinet6/in6.c#16 integrate .. //depot/projects/hammer/sys/netinet6/in6.h#10 integrate .. //depot/projects/hammer/sys/netinet6/in6_cksum.c#8 integrate .. //depot/projects/hammer/sys/netinet6/in6_ifattach.c#12 integrate .. //depot/projects/hammer/sys/netinet6/in6_pcb.c#20 integrate .. //depot/projects/hammer/sys/netinet6/in6_proto.c#11 integrate .. //depot/projects/hammer/sys/netinet6/in6_src.c#13 integrate .. //depot/projects/hammer/sys/netinet6/in6_var.h#9 integrate .. //depot/projects/hammer/sys/netinet6/ip6_forward.c#13 integrate .. //depot/projects/hammer/sys/netinet6/ip6_input.c#23 integrate .. //depot/projects/hammer/sys/netinet6/ip6_mroute.c#12 integrate .. //depot/projects/hammer/sys/netinet6/ip6_output.c#33 integrate .. //depot/projects/hammer/sys/netinet6/ip6_var.h#14 integrate .. //depot/projects/hammer/sys/netinet6/ipsec.c#17 integrate .. //depot/projects/hammer/sys/netinet6/mld6.c#12 integrate .. //depot/projects/hammer/sys/netinet6/nd6.c#19 integrate .. //depot/projects/hammer/sys/netinet6/nd6_nbr.c#14 integrate .. //depot/projects/hammer/sys/netinet6/nd6_rtr.c#10 integrate .. //depot/projects/hammer/sys/netinet6/raw_ip6.c#20 integrate .. //depot/projects/hammer/sys/netinet6/route6.c#6 integrate .. //depot/projects/hammer/sys/netinet6/scope6.c#7 integrate .. //depot/projects/hammer/sys/netinet6/scope6_var.h#5 integrate .. //depot/projects/hammer/sys/netinet6/udp6_output.c#13 integrate .. //depot/projects/hammer/sys/netinet6/udp6_usrreq.c#19 integrate .. //depot/projects/hammer/sys/netkey/key.c#21 integrate .. //depot/projects/hammer/sys/vm/uma.h#13 integrate .. //depot/projects/hammer/sys/vm/uma_core.c#42 integrate .. //depot/projects/hammer/tools/tools/README#16 integrate .. //depot/projects/hammer/tools/tools/bpfstat/Makefile#1 branch .. //depot/projects/hammer/tools/tools/bpfstat/bpfstat.8#1 branch .. //depot/projects/hammer/tools/tools/bpfstat/bpfstat.c#1 branch .. //depot/projects/hammer/tools/tools/bpfstat/bpfstat.h#1 branch .. //depot/projects/hammer/tools/tools/nanobsd/Files/root/change_password#2 integrate .. //depot/projects/hammer/tools/tools/nanobsd/Files/root/save_sshkeys#2 integrate .. //depot/projects/hammer/tools/tools/nanobsd/Files/root/updatep#1 branch .. //depot/projects/hammer/tools/tools/nanobsd/i386.diskimage#14 integrate .. //depot/projects/hammer/tools/tools/nanobsd/make.conf#15 integrate .. //depot/projects/hammer/tools/tools/nanobsd/nanobsd.sh#1 branch .. //depot/projects/hammer/usr.bin/dig/Makefile#5 integrate .. //depot/projects/hammer/usr.bin/host/Makefile#5 integrate .. //depot/projects/hammer/usr.bin/nslookup/Makefile#4 integrate .. //depot/projects/hammer/usr.bin/nsupdate/Makefile#4 integrate .. //depot/projects/hammer/usr.bin/vmstat/Makefile#4 integrate .. //depot/projects/hammer/usr.bin/vmstat/vmstat.c#19 integrate .. //depot/projects/hammer/usr.sbin/dnssec-keygen/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/dnssec-signzone/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/jail/jail.8#25 integrate .. //depot/projects/hammer/usr.sbin/named-checkconf/Makefile#4 integrate .. //depot/projects/hammer/usr.sbin/named-checkzone/Makefile#4 integrate .. //depot/projects/hammer/usr.sbin/named/Makefile#7 integrate .. //depot/projects/hammer/usr.sbin/powerd/powerd.c#4 integrate .. //depot/projects/hammer/usr.sbin/rndc-confgen/Makefile#4 integrate .. //depot/projects/hammer/usr.sbin/rndc/Makefile#4 integrate Differences ... ==== //depot/projects/hammer/Makefile.inc1#100 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.501 2005/07/23 14:23:30 netchild Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.502 2005/07/25 14:44:09 des Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -985,14 +985,6 @@ lib/libopie__L lib/libtacplus__L: lib/libmd__L -.if !defined(NO_BIND) -.if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "sparc64" -_prebuild_libs+= lib/libc_r -.else -_prebuild_libs+= lib/libpthread -.endif -.endif - _generic_libs+= lib .if !defined(NO_CRYPT) ==== //depot/projects/hammer/ObsoleteFiles.inc#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.3 2005/07/23 23:55:27 dougb Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.4 2005/07/26 19:21:10 dougb Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -20,6 +20,8 @@ OLD_FILES+=usr/libexec/rexecd # 20050324: updated release infrastructure OLD_FILES+=usr/share/man/man5/drivers.conf.5.gz +# 20050317: removed from BIND 9 distribution +OLD_FILES+=usr/share/doc/bind9/KNOWN_DEFECTS # 2005XXXX: OLD_FILES+=sbin/mount_autofs OLD_FILES+=usr/lib/libautofs.a ==== //depot/projects/hammer/contrib/bind9/FREEBSD-Upgrade#5 (text+ko) ==== @@ -43,11 +43,12 @@ 7) Generate and run configure: - $ autoconf253 - $ autoheader253 + $ aclocal + $ autoheader + $ autoconf $ ./configure --prefix=/usr \ --infodir=/usr/share/info --mandir=/usr/share/man \ - --enable-threads --enable-libbind --disable-ipv6 \ + --disable-threads --enable-libbind --disable-ipv6 \ --enable-getifaddrs --disable-linux-caps \ --with-openssl=/usr --with-randomdev=/dev/random @@ -55,9 +56,20 @@ command line; src/lib/bind/config.mk will re-enable it at compile time if NO_INET6 is not defined. -8) Copy the resulting config.h to src/lib/bind, add an RCS id tag and - commit it. Do not commit any other file that was modified or - created in steps 6) or 7). +8) Copy the following generated files to src/lib/bind and commit them: + + Path in src/contrib/bind9 Path in src/lib/bind + ------------------------------------------------------------ + config.h config.h + lib/bind/config.h bind/config.h + lib/bind/port_after.h bind/port_after.h + lib/bind/port_before.h bind/port_before.h + lib/isc/include/isc/platform.h isc/isc/platform.h + lib/lwres/include/lwres/netdb.h lwres/lwres/netdb.h + lib/lwres/include/lwres/platform.h lwres/lwres/platform.h + + Do not commit any other file that was modified or created in + steps 6) or 7). 9) cd src/lib/bind/dns && make -DMAINTAINER_MODE generate && rm gen Commit the new versions of the files generated. @@ -102,4 +114,4 @@ -- des@FreeBSD.org -- dougb@FreeBSD.org -$FreeBSD: src/contrib/bind9/FREEBSD-Upgrade,v 1.4 2005/03/17 08:40:41 dougb Exp $ +$FreeBSD: src/contrib/bind9/FREEBSD-Upgrade,v 1.5 2005/07/25 17:14:00 des Exp $ ==== //depot/projects/hammer/etc/rc.d/dhclient#16 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: dhclient,v 1.8 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/dhclient,v 1.20 2005/06/30 17:50:34 brooks Exp $ +# $FreeBSD: src/etc/rc.d/dhclient,v 1.21 2005/07/26 00:37:19 brooks Exp $ # # PROVIDE: dhclient @@ -23,7 +23,6 @@ if [ -x /usr/bin/pgrep ]; then pids=`/usr/bin/pgrep -f "dhclient: $ifn(\$| .*)"` if [ -n "$pids" ]; then - echo "${name} ${ifn}: already running?" exit 0 fi fi ==== //depot/projects/hammer/lib/bind/bind/config.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/bind/bind/config.h,v 1.1 2004/09/21 19:01:42 des Exp $ */ +/* $FreeBSD: src/lib/bind/bind/config.h,v 1.2 2005/07/25 14:44:09 des Exp $ */ /* config.h. Generated by configure. */ /* #undef _SOCKADDR_LEN */ @@ -46,3 +46,11 @@ #endif /* #undef BROKEN_IN6ADDR_INIT_MACROS */ #define HAVE_STRLCAT 1 +/* Shut up warnings about missing braces */ +/* #undef SHUTUP_MUTEX_INITIALIZER */ +#ifdef SHUTUP_MUTEX_INITIALIZER +#define LIBBIND_MUTEX_INITIALIZER { PTHREAD_MUTEX_INITIALIZER } +#else +#define LIBBIND_MUTEX_INITIALIZER PTHREAD_MUTEX_INITIALIZER +#endif + ==== //depot/projects/hammer/lib/bind/config.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/bind/config.h,v 1.2 2005/03/17 08:37:32 dougb Exp $ */ +/* $FreeBSD: src/lib/bind/config.h,v 1.3 2005/07/25 14:44:09 des Exp $ */ /* config.h. Generated by configure. */ /* config.h.in. Generated from configure.in by autoheader. */ @@ -36,7 +36,7 @@ /* #undef NEED_PTHREAD_INIT */ /* define if your system has sigwait() */ -#define HAVE_SIGWAIT 1 +/* #undef HAVE_SIGWAIT */ /* define if sigwait() is the UnixWare flavor */ /* #undef HAVE_UNIXWARE_SIGWAIT */ @@ -48,7 +48,7 @@ /* #undef HAVE_LINUXTHREADS */ /* define if sysconf() is available */ -#define HAVE_SYSCONF 1 +/* #undef HAVE_SYSCONF */ /* define if sysctlbyname() is available */ #define HAVE_SYSCTLBYNAME 1 @@ -129,10 +129,10 @@ #define PATH_RANDOMDEV "/dev/random" /* define if pthread_attr_getstacksize() is available */ -#define HAVE_PTHREAD_ATTR_GETSTACKSIZE 1 +/* #undef HAVE_PTHREAD_ATTR_GETSTACKSIZE */ /* define if pthread_attr_setstacksize() is available */ -#define HAVE_PTHREAD_ATTR_SETSTACKSIZE 1 +/* #undef HAVE_PTHREAD_ATTR_SETSTACKSIZE */ /* define if you have strerror in the C library. */ #define HAVE_STRERROR 1 @@ -149,6 +149,9 @@ /* Define if threads need PTHREAD_SCOPE_SYSTEM */ /* #undef NEED_PTHREAD_SCOPE_SYSTEM */ +/* Define to 1 if you have the <dlfcn.h> header file. */ +/* #undef HAVE_DLFCN_H */ + /* Define to 1 if you have the <fcntl.h> header file. */ #define HAVE_FCNTL_H 1 @@ -165,7 +168,7 @@ /* #undef HAVE_LIBNSL */ /* Define to 1 if you have the `pthread' library (-lpthread). */ -#define HAVE_LIBPTHREAD 1 +/* #undef HAVE_LIBPTHREAD */ /* Define to 1 if you have the `scf' library (-lscf). */ /* #undef HAVE_LIBSCF */ @@ -252,9 +255,11 @@ /* Define to empty if `const' does not conform to ANSI C. */ /* #undef const */ -/* Define as `__inline' if that's what the C compiler calls it, or to nothing - if it is not supported. */ +/* Define to `__inline__' or `__inline' if that's what the C compiler + calls it, or to nothing if 'inline' is not supported under any name. */ +#ifndef __cplusplus /* #undef inline */ +#endif /* Define to `unsigned' if <sys/types.h> does not define. */ /* #undef size_t */ ==== //depot/projects/hammer/lib/bind/config.mk#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/bind/config.mk,v 1.14 2005/03/17 08:35:21 dougb Exp $ +# $FreeBSD: src/lib/bind/config.mk,v 1.15 2005/07/25 14:44:09 des Exp $ # BIND version number .if defined(BIND_DIR) && exists(${BIND_DIR}/version) @@ -74,7 +74,7 @@ CFLAGS+= -I${BIND_DIR}/lib/isccfg/include LIBISC= ${LIB_BIND_REL}/isc/libisc.a CFLAGS+= -I${BIND_DIR}/lib/isc/unix/include \ - -I${BIND_DIR}/lib/isc/pthreads/include \ + -I${BIND_DIR}/lib/isc/nothreads/include \ -I${BIND_DIR}/lib/isc/include \ -I${LIB_BIND_DIR}/isc LIBLWRES= ${LIB_BIND_REL}/lwres/liblwres.a @@ -95,17 +95,3 @@ CRYPTO_DPADD= ${LIBCRYPTO} CRYPTO_LDADD= -lcrypto .endif - -# Link against POSIX threads library -.if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "sparc64" -.if defined(NO_LIBC_R) -.error "BIND requires libpthread - define NO_BIND, or undefine NO_LIBC_R" -.endif -.else -.if defined(NO_LIBPTHREAD) -.error "BIND requires libpthread - define NO_BIND, or undefine NO_LIBPTHREAD" -.endif -.endif - -PTHREAD_DPADD= ${LIBPTHREAD} -PTHREAD_LDADD= -lpthread ==== //depot/projects/hammer/lib/bind/isc/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/bind/isc/Makefile,v 1.4 2004/09/24 18:42:04 dougb Exp $ +# $FreeBSD: src/lib/bind/isc/Makefile,v 1.5 2005/07/25 14:44:09 des Exp $ BIND_DIR= ${.CURDIR}/../../../contrib/bind9 LIB_BIND_REL= .. @@ -19,7 +19,7 @@ .PATH: ${SRCDIR}/nls SRCS+= msgcat.c \ -.PATH: ${SRCDIR}/pthreads +.PATH: ${SRCDIR}/nothreads SRCS+= condition.c mutex.c \ thread.c @@ -35,7 +35,7 @@ serial.c sha1.c sockaddr.c string.c strtoul.c \ symtab.c task.c taskpool.c timer.c version.c -CFLAGS+= -I${SRCDIR}/unix/include -I${SRCDIR}/pthreads/include +CFLAGS+= -I${SRCDIR}/unix/include -I${SRCDIR}/nothreads/include CFLAGS+= -I${SRCDIR}/include -I${.CURDIR} DPADD= ${PTHREAD_DPADD} @@ -104,10 +104,10 @@ ${SRCDIR}/include/isc/types.h \ ${SRCDIR}/include/isc/util.h \ ${SRCDIR}/include/isc/version.h \ - ${SRCDIR}/pthreads/include/isc/condition.h \ - ${SRCDIR}/pthreads/include/isc/mutex.h \ - ${SRCDIR}/pthreads/include/isc/once.h \ - ${SRCDIR}/pthreads/include/isc/thread.h \ + ${SRCDIR}/nothreads/include/isc/condition.h \ + ${SRCDIR}/nothreads/include/isc/mutex.h \ + ${SRCDIR}/nothreads/include/isc/once.h \ + ${SRCDIR}/nothreads/include/isc/thread.h \ ${SRCDIR}/unix/include/isc/dir.h \ ${SRCDIR}/unix/include/isc/int.h \ ${SRCDIR}/unix/include/isc/keyboard.h \ ==== //depot/projects/hammer/lib/bind/isc/isc/platform.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/bind/isc/isc/platform.h,v 1.1 2004/09/21 19:01:43 des Exp $ */ +/* $FreeBSD: src/lib/bind/isc/isc/platform.h,v 1.2 2005/07/25 14:44:09 des Exp $ */ /* * Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC") @@ -158,7 +158,7 @@ /* * Defined if we are using threads. */ -#define ISC_PLATFORM_USETHREADS 1 +#undef ISC_PLATFORM_USETHREADS /* * Defined if unistd.h does not cause fd_set to be delared. ==== //depot/projects/hammer/lib/libc/gen/getttyent.c#2 (text+ko) ==== @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)getttyent.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/gen/getttyent.c,v 1.12 2002/02/01 01:32:19 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/getttyent.c,v 1.13 2005/07/25 17:57:15 mdodd Exp $"); #include <ttyent.h> #include <stdio.h> @@ -105,6 +105,10 @@ zapchar = 0; tty.ty_name = p; + tty.ty_status = 0; + tty.ty_window = NULL; + tty.ty_group = _TTYS_NOGROUP; + p = skip(p); if (!*(tty.ty_getty = p)) tty.ty_getty = tty.ty_type = NULL; @@ -121,9 +125,6 @@ p = skip(p); } } - tty.ty_status = 0; - tty.ty_window = NULL; - tty.ty_group = _TTYS_NOGROUP; for (; *p; p = skip(p)) { if (scmp(_TTYS_OFF)) ==== //depot/projects/hammer/lib/libmemstat/memstat_uma.c#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libmemstat/memstat_uma.c,v 1.7 2005/07/24 01:28:54 rwatson Exp $ + * $FreeBSD: src/lib/libmemstat/memstat_uma.c,v 1.8 2005/07/25 09:52:59 rwatson Exp $ */ #include <sys/param.h> @@ -211,7 +211,16 @@ mtp->mt_count = mtp->mt_numallocs - mtp->mt_numfrees; mtp->mt_zonefree = uthp->uth_zone_free; - mtp->mt_kegfree = uthp->uth_keg_free; + + /* + * UMA secondary zones share a keg with the primary zone. To + * avoid double-reporting of free items, report keg free + * items only in the primary zone. + */ + if (!(uthp->uth_zone_flags & UTH_ZONE_SECONDARY)) { + mtp->mt_free += mtp->mt_kegfree; + mtp->mt_kegfree = uthp->uth_keg_free; + } mtp->mt_free += mtp->mt_zonefree; } ==== //depot/projects/hammer/sbin/dhclient/dhclient-script#2 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $OpenBSD: dhclient-script,v 1.6 2004/05/06 18:22:41 claudio Exp $ -# $FreeBSD: src/sbin/dhclient/dhclient-script,v 1.4 2005/06/10 03:41:18 brooks Exp $ +# $FreeBSD: src/sbin/dhclient/dhclient-script,v 1.5 2005/07/26 18:27:37 brooks Exp $ # # Copyright (c) 2003 Kenneth R Westerback <krw@openbsd.org> # @@ -198,7 +198,7 @@ fi if [ -x $NETSTAT ]; then - if_defaulroute=`$NETSTAT -rn | $GREP "^default" | $AWK '{print $6}'` + if_defaultroute=`$NETSTAT -rn | $GREP "^default" | $AWK '{print $6}'` else if_defaultroute="x" fi ==== //depot/projects/hammer/sbin/dhclient/dhclient.c#4 (text+ko) ==== @@ -1,5 +1,5 @@ /* $OpenBSD: dhclient.c,v 1.63 2005/02/06 17:10:13 krw Exp $ */ -/* $FreeBSD: src/sbin/dhclient/dhclient.c,v 1.6 2005/06/30 05:50:52 brooks Exp $ */ +/* $FreeBSD: src/sbin/dhclient/dhclient.c,v 1.7 2005/07/25 04:32:40 sam Exp $ */ /* * Copyright 2004 Henning Brauer <henning@openbsd.org> @@ -249,6 +249,7 @@ break; switch (ifan->ifan_what) { case RTM_IEEE80211_ASSOC: + case RTM_IEEE80211_REASSOC: state_reboot(ifi); break; case RTM_IEEE80211_DISASSOC: ==== //depot/projects/hammer/sbin/dhclient/tables.c#2 (text+ko) ==== @@ -1,4 +1,5 @@ /* $OpenBSD: tables.c,v 1.4 2004/05/04 20:28:40 deraadt Exp $ */ +/* $FreeBSD: src/sbin/dhclient/tables.c,v 1.2 2005/07/25 22:19:09 brooks Exp $ */ /* Tables of information... */ @@ -74,7 +75,7 @@ { "lpr-servers", "IA", &dhcp_universe, 9 }, { "impress-servers", "IA", &dhcp_universe, 10 }, { "resource-location-servers", "IA", &dhcp_universe, 11 }, - { "host-name", "X", &dhcp_universe, 12 }, + { "host-name", "t", &dhcp_universe, 12 }, { "boot-size", "S", &dhcp_universe, 13 }, { "merit-dump", "t", &dhcp_universe, 14 }, { "domain-name", "t", &dhcp_universe, 15 }, ==== //depot/projects/hammer/sbin/ifconfig/ifieee80211.c#14 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sbin/ifconfig/ifieee80211.c,v 1.19 2005/07/14 18:33:21 rwatson Exp $ + * $FreeBSD: src/sbin/ifconfig/ifieee80211.c,v 1.20 2005/07/26 06:00:33 sam Exp $ */ /*- @@ -344,7 +344,8 @@ static void set80211rtsthreshold(const char *val, int d, int s, const struct afswtch *rafp) { - set80211(s, IEEE80211_IOC_RTSTHRESHOLD, atoi(val), 0, NULL); + set80211(s, IEEE80211_IOC_RTSTHRESHOLD, + isundefarg(val) ? IEEE80211_RTS_MAX : atoi(val), 0, NULL); } static void @@ -624,6 +625,13 @@ set80211(s, IEEE80211_IOC_PUREG, d, 0, NULL); } +static +DECL_CMD_FUNC(set80211fragthreshold, val, d) +{ + set80211(s, IEEE80211_IOC_FRAGTHRESHOLD, + isundefarg(val) ? IEEE80211_FRAG_MAX : atoi(val), 0, NULL); +} + static int getmaxrate(uint8_t rates[15], uint8_t nrates) { @@ -1509,6 +1517,12 @@ LINE_CHECK("%crtsthreshold %d", spacer, ireq.i_val); } + ireq.i_type = IEEE80211_IOC_FRAGTHRESHOLD; + if (ioctl(s, SIOCG80211, &ireq) != -1) { + if (ireq.i_val != IEEE80211_FRAG_MAX || verbose) + LINE_CHECK("%cfragthreshold %d", spacer, ireq.i_val); + } + if (IEEE80211_IS_CHAN_G(c) || IEEE80211_IS_CHAN_PUREG(c) || verbose) { ireq.i_type = IEEE80211_IOC_PUREG; if (ioctl(s, SIOCG80211, &ireq) != -1) { @@ -1805,6 +1819,7 @@ #endif DEF_CMD("pureg", 1, set80211pureg), DEF_CMD("-pureg", 0, set80211pureg), + DEF_CMD_ARG("fragthreshold", set80211fragthreshold), }; static struct afswtch af_ieee80211 = { .af_name = "af_ieee80211", ==== //depot/projects/hammer/share/doc/IPv6/IMPLEMENTATION#5 (text+ko) ==== @@ -3,7 +3,7 @@ KAME Project http://www.kame.net/ $KAME: IMPLEMENTATION,v 1.216 2001/05/25 07:43:01 jinmei Exp $ - $FreeBSD: src/share/doc/IPv6/IMPLEMENTATION,v 1.7 2003/11/05 12:00:32 ume Exp $ + $FreeBSD: src/share/doc/IPv6/IMPLEMENTATION,v 1.8 2005/07/25 16:26:47 ume Exp $ NOTE: The document tries to describe behaviors/implementation choices of the latest KAME/*BSD stack (like KAME/NetBSD 1.5.1). The description @@ -164,8 +164,6 @@ RFC2732: Format for Literal IPv6 Addresses in URL's * The spec is implemented in programs that handle URLs (like freebsd ftpio(3) and fetch(1), or netbsd ftp(1)) -RFC2766: Network Address Translation - Protocol Translation (NAT-PT) - * Section 4.2 is implemented by totd (see ports/totd, or pkgsrc/net/totd). RFC2874: DNS Extensions to Support IPv6 Address Aggregation and Renumbering * KAME/bsdi4 supports A6, DNAME and binary label to some extent. * KAME apps/bind8 repository has resolver library with partial A6, DNAME @@ -183,6 +181,9 @@ * "stf" interface implements it. Be sure to read draft-itojun-ipv6-transition-abuse-01.txt below before configuring it, there can be security issues. +RFC3142: An IPv6-to-IPv4 transport relay translator + * FAITH tcp relay translator (faithd) implements this. See 3.1 for more + details. RFC3152: Delegation of IP6.ARPA * libinet6 resolvers contained in the KAME snaps support to use the ip6.arpa domain (with the nibble format) for IPv6 reverse @@ -198,6 +199,7 @@ - supported but turned off by default on KAME/NetBSD and KAME/FreeBSD5, - not supported on KAME/FreeBSD228, KAME/OpenBSD and KAME/BSDI3. see 1.12 in this document for details. + * The AI_ALL and AI_V4MAPPED flags are not supported. RFC3542: Advanced Sockets API for IPv6 (revised) * For supported library functions/kernel APIs, see sys/netinet6/ADVAPI. * Some of the updates in the draft are not implemented yet. See @@ -289,9 +291,9 @@ To avoid possible DoS attacks and infinite loops, KAME stack will accept only 10 options on ND packet. Therefore, if you have 20 prefix options attached to RA, only the first 10 prefixes will be recognized. -If this troubles you, please contact KAME team and/or modify +If this troubles you, please contact the KAME team and/or modify nd6_maxndopt in sys/netinet6/nd6.c. If there are high demands we may -provide sysctl knob for the variable. +provide a sysctl knob for the variable. Proxy Neighbor Advertisement support is implemented in the kernel. For instance, you can configure it by using the following command: @@ -345,7 +347,7 @@ net.inet6.icmp6.nd6_debug. nd6_debug can be turned on at bootstrap time, by defining ND6_DEBUG kernel compilation option (so you can debug behavior during bootstrap). nd6_debug configuration should -only be used for test/debug purposes - for production environment, +only be used for test/debug purposes - for a production environment, nd6_debug must be set to 0. If you leave it to 1, malicious parties can inject broken packet and fill up /var/log partition. @@ -355,29 +357,29 @@ specify the scope zone index (link index for a link-local address, or site index for a site-local address) with an IPv6 address. Without a zone index, a scoped IPv6 address is ambiguous to the kernel, and -the kernel would not be able to determine the outbound link for a +the kernel would not be able to determine the outbound zone for a packet to the scoped address. KAME code tries to address the issue in several ways. -The entire architecture of scoped addresses is documented in -draft-ietf-ipngwg-scoping-arch-xx.txt. One non-trivial point of the -architecture is that the link scope is (theoretically) larger than the -interface scope. That is, two different interfaces can belong to a -same single link. However, in a normal operation, we can assume that -there is 1-to-1 relationship between links and interfaces. In -other words, we can usually put links and interfaces in the same scope -type. The current KAME implementation assumes the 1-to-1 -relationship. In particular, we use interface names such as "ne1" as -unique link identifiers. This would be much more human-readable and -intuitive than numeric identifiers, but please keep your mind on the -theoretical difference between links and interfaces. +The entire architecture of scoped addresses is documented in RFC4007. +One non-trivial point of the architecture is that the link scope is +(theoretically) larger than the interface scope. That is, two +different interfaces can belong to a same single link. However, in a +normal operation, we can assume that there is 1-to-1 relationship +between links and interfaces. In other words, we can usually put +links and interfaces in the same scope type. The current KAME +implementation assumes the 1-to-1 relationship. In particular, we use +interface names such as "ne1" as unique link identifiers. This would +be much more human-readable and intuitive than numeric identifiers, +but please keep your mind on the theoretical difference between links +and interfaces. Site-local addresses are very vaguely defined in the specs, and both the specification and the KAME code need tons of improvements to enable its actual use. For example, it is still very unclear how we define a site, or how we resolve host names in a site. There is work underway to define behavior of routers at site border, but, we have -almost no code for site boundary node support (both forwarding nor +almost no code for site boundary node support (neither forwarding nor routing) and we bet almost noone has. We recommend, at this moment, you to use global addresses for experiments - there are way too many pitfalls if you use site-local addresses. @@ -397,6 +399,127 @@ link-local addresses over multiple links effectively and with only a little code change. +The use of the internal format must be limited inside the kernel. In +particular, addresses sent by an application should not contain the +embedded index (except via some very special APIs such as routing +sockets). Instead, the index should be specified in the sin6_scope_id +field of a sockaddr_in6 structure. Obviously, packets sent to or +received from must not contain the embedded index either, since the +index is meaningful only within the sending/receiving node. + +In order to deal with the differences, several kernel routines are +provided. These are available by including <netinet6/scope_var.h>. +Typically, the following functions will be most generally used: + +- int sa6_embedscope(struct sockaddr_in6 *sa6, int defaultok); + Embed sa6->sin6_scope_id into sa6->sin6_addr. If sin6_scope_id is + 0, defaultok is non-0, and the default zone ID (see RFC4007) is + configured, the default ID will be used instead of the value of the + sin6_scope_id field. On success, sa6->sin6_scope_id will be reset + to 0. + + This function returns 0 on success, or a non-0 error code otherwise. + +- int sa6_recoverscope(struct sockaddr_in6 *sa6); + Extract embedded zone ID in sa6->sin6_addr and set + sa6->sin6_scope_id to that ID. The embedded ID will be cleared with + 0. + + This function returns 0 on success, or a non-0 error code otherwise. + +- int in6_clearscope(struct in6_addr *in6); + Reset the embedded zone ID in 'in6' to 0. This function never fails, and + returns 0 if the original address is intact or non 0 if the address is + modified. The return value doesn't matter in most cases; currently, the + only point where we care about the return value is ip6_input() for checking + whether the source or destination addresses of the incoming packet is in + the embedded form. + +- int in6_setscope(struct in6_addr *in6, struct ifnet *ifp, + u_int32_t *zoneidp); + Embed zone ID determined by the address scope type for 'in6' and the + interface 'ifp' into 'in6'. If zoneidp is non NULL, *zoneidp will + also have the zone ID. + + This function returns 0 on success, or a non-0 error code otherwise. + +The typical usage of these functions is as follows: + +sa6_embedscope() will be used at the socket or transport layer to +convert a sockaddr_in6 structure passed by an application into the +kernel-internal form. In this usage, the second argument is often the +'ip6_use_defzone' global variable. + +sa6_recoverscope() will also be used at the socket or transport layer +to convert an in6_addr structure with the embedded zone ID into a +sockaddr_in6 structure with the corresponding ID in the sin6_scope_id +field (and without the embedded ID in sin6_addr). + +in6_clearscope() will be used just before sending a packet to the wire +to remove the embedded ID. In general, this must be done at the last +stage of an output path, since otherwise the address would lose the ID +and could be ambiguous with regard to scope. + +in6_setscope() will be used when the kernel receives a packet from the +wire to construct the kernel internal form for each address field in +the packet (typical examples are the source and destination addresses +of the packet). In the typical usage, the third argument 'zoneidp' +will be NULL. A non-NULL value will be used when the validity of the +zone ID must be checked, e.g., when forwarding a packet to another +link (see ip6_forward() for this usage). + +An application, when sending a packet, is basically assumed to specify +the appropriate scope zone of the destination address by the +sin6_scope_id field (this might be done transparently from the +application with getaddrinfo() and the extended textual format - see +below), or at least the default scope zone(s) must be configured as a +last resort. In some cases, however, an application could specify an +ambiguous address with regard to scope, expecting it is disambiguated +in the kernel by some other means. A typical usage is to specify the +outgoing interface through another API, which can disambiguate the +unspecified scope zone. Such a usage is not recommended, but the +kernel implements some trick to deal with even this case. + +A rough sketch of the trick can be summarized as the following +sequence. + + sa6_embedscope(dst, ip6_use_defzone); + in6_selectsrc(dst, ..., &ifp, ...); + in6_setscope(&dst->sin6_addr, ifp, NULL); + +sa6_embedscope() first tries to convert sin6_scope_id (or the default +zone ID) into the kernel-internal form. This can fail with an +ambiguous destination, but it still tries to get the outgoing +interface (ifp) in the attempt of determining the source address of +the outgoing packet using in6_selectsrc(). If the interface is +detected, and the scope zone was originally ambiguous, in6_setscope() +can finally determine the appropriate ID with the address itself and +the interface, and construct the kernel-internal form. See, for +example, comments in udp6_output() for more concrete example. + +In any case, kernel routines except ones in netinet6/scope6.c MUST NOT +directly refer to the embedded form. They MUST use the above +interface functions. In particular, kernel routines MUST NOT have the +following code fragment: + + /* This is a bad practice. Don't do this */ + if (IN6_IS_ADDR_LINKLOCAL(&sin6->sin6_addr)) + sin6->sin6_addr.s6_addr16[1] = htons(ifp->if_index); + +This is bad for several reasons. First, address ambiguity is not +specific to link-local addresses (any non-global multicast addresses +are inherently ambiguous, and this is particularly true for +interface-local addresses). Secondly, this is vulnerable to future +changes of the embedded form (the embedded position may change, or the +zone ID may not actually be the interface index). Only scope6.c +routines should know the details. + +The above code fragment should thus actually be as follows: + + /* This is correct. */ + in6_setscope(&sin6->sin6_addr, ifp, NULL); + (and catch errors if possible and necessary) + 1.3.2 Interaction with API There are several candidates of API to deal with scoped addresses @@ -461,11 +584,11 @@ anyway. getaddrinfo(3) and getnameinfo(3) support an extended numeric IPv6 -syntax, as documented in draft-ietf-ipv6-scoping-arch-xx.txt. You can -specify the outgoing link, by using the name of the outgoing interface -as the link, like "fe80::1%ne0" (again, note that we assume there is -1-to-1 relationship between links and interfaces.) This way you will -be able to specify a link-local scoped address without much trouble. +syntax, as documented in RFC4007. You can specify the outgoing link, +by using the name of the outgoing interface as the link, like +"fe80::1%ne0" (again, note that we assume there is 1-to-1 relationship +between links and interfaces.) This way you will be able to specify a +link-local scoped address without much trouble. Other APIs like inet_pton(3) and inet_ntop(3) are inherently unfriendly with scoped addresses, since they are unable to annotate @@ -550,7 +673,7 @@ node is a router or a host (router if it is 1, host if it is 0). It is NOT recommended to change net.inet6.ip6.forwarding while the node -is in operation. IPv6 specification defines behavior for "host" and "router" +is in operation. IPv6 specification defines behavior for "host" and "router" quite differently, and switching from one to another can cause serious troubles. It is recommended to configure the variable at bootstrap time only. @@ -737,7 +860,7 @@ the packet and compares it to the length specified in the payload length field of the IPv6 header or in the value of the Jumbo Payload option, if any. If the former is shorter than the latter, KAME kernel -discards the packet and increments the statistics. You can see the +discards the packet and increments the statistics. You can see the statistics as output of netstat command with `-s -p ip6' option: % netstat -s -p ip6 ip6: @@ -789,7 +912,7 @@ (including the IPv6 header) in each incoming packet, in order to prevent a DoS attack that tries to send packets with a massive number of extension headers. The upper limit can be configured by the sysctl -value net.inet6.ip6.hdrnestlimit. In particular, if the value is 0, +value net.inet6.ip6.hdrnestlimit. In particular, if the value is 0, the node will allow an arbitrary number of headers. As of writing this document, the default value is 50. @@ -822,7 +945,7 @@ 1.10 Applications For userland programming, we support IPv6 socket API as specified in -RFC2553, RFC2292 and upcoming internet drafts. +RFC2553/3493, RFC3542 and upcoming internet drafts. TCP/UDP over IPv6 is available and quite stable. You can enjoy "telnet", "ftp", "rlogin", "rsh", "ssh", etc. These applications are protocol @@ -922,7 +1045,7 @@ KAME/FreeBSD4x configurable supported default: enabled KAME/NetBSD configurable supported - default: disabled + default: disabled KAME/BSDI4 enabled supported KAME/OpenBSD not supported not supported ==== //depot/projects/hammer/share/man/man4/gif.4#7 (text+ko) ==== @@ -27,7 +27,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/gif.4,v 1.25 2005/06/08 01:53:25 grog Exp $ +.\" $FreeBSD: src/share/man/man4/gif.4,v 1.26 2005/07/26 18:14:22 trhodes Exp $ .\" .Dd April 10, 1999 .Dt GIF 4 @@ -63,7 +63,7 @@ most easily done with the .Dq Nm ifconfig Cm create command or using the -.Va gifconfig_ Ns Aq Ar interface +.Va ifconfig_ Ns Aq Ar interface variable in .Xr rc.conf 5 . .Pp ==== //depot/projects/hammer/share/man/man9/Makefile#55 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/man/man9/Makefile,v 1.260 2005/06/14 03:40:01 imp Exp $ +# $FreeBSD: src/share/man/man9/Makefile,v 1.261 2005/07/27 02:08:21 scottl Exp $ MAN= accept_filter.9 \ accf_data.9 \ @@ -238,7 +238,6 @@ VFS_ROOT.9 \ vfs_rootmountalloc.9 \ VFS_SET.9 \ - VFS_START.9 \ VFS_STATFS.9 \ vfs_suser.9 \ VFS_SYNC.9 \ ==== //depot/projects/hammer/share/man/man9/VFS.9#5 (text+ko) ==== @@ -26,7 +26,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/VFS.9,v 1.11 2005/02/13 22:25:19 ru Exp $ +.\" $FreeBSD: src/share/man/man9/VFS.9,v 1.12 2005/07/27 02:08:59 scottl Exp $ .\" .Dd July 24, 1996 .Os @@ -49,7 +49,6 @@ .Xr VFS_INIT 9 , .Xr VFS_MOUNT 9 , .Xr VFS_QUOTACTL 9 , -.Xr VFS_START 9 , .Xr VFS_STATFS 9 , .Xr VFS_SYNC 9 , .Xr VFS_UNMOUNT 9 , ==== //depot/projects/hammer/sys/amd64/conf/GENERIC#77 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.440 2005/07/14 15:39:04 kensmith Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.441 2005/07/24 17:55:57 mux Exp $ machine amd64 cpu HAMMER @@ -215,8 +215,7 @@ # ISA Ethernet NICs. pccard NICs included. device cs # Crystal Semiconductor CS89x0 NIC # 'device ed' requires 'device miibus' -# XXX kvtop brokenness, pointer/int warnings -#device ed # NE[12]000, SMC Ultra, 3c503, DS8390 cards +device ed # NE[12]000, SMC Ultra, 3c503, DS8390 cards device ex # Intel EtherExpress Pro/10 and Pro/10+ device ep # Etherlink III based cards device fe # Fujitsu MB8696x based cards ==== //depot/projects/hammer/sys/boot/common/help.common#13 (text+ko) ==== @@ -223,7 +223,7 @@ set currdev=<device> - Selects the default device. Syntax for devices is odd. + Selects the default device. See lsdev for available devices. ################################################################################ # Tset Sinit_path DSet the list of init candidates ==== //depot/projects/hammer/sys/conf/NOTES#95 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1326 2005/07/14 15:57:00 takawata Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1327 2005/07/25 10:49:04 pjd Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -145,6 +145,7 @@ options GEOM_SUNLABEL # Sun/Solaris partitioning options GEOM_UZIP # Read-only compressed disks options GEOM_VOL # Volume names from UFS superblock +options GEOM_ZERO # Peformance testing helper. # # The root device and filesystem type can be compiled in; ==== //depot/projects/hammer/sys/conf/files#120 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1036 2005/07/20 21:10:56 anholt Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1037 2005/07/25 10:49:04 pjd Exp $ # # The long compile-with and dependency lines are required because of >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200507270520.j6R5Kiq3004745>