From owner-svn-src-projects@FreeBSD.ORG Sun Nov 2 00:06:02 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 86D249F7; Sun, 2 Nov 2014 00:06:02 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6CBD296F; Sun, 2 Nov 2014 00:06:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sA2062qj033422; Sun, 2 Nov 2014 00:06:02 GMT (envelope-from brd@FreeBSD.org) Received: (from brd@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sA205x3X033391; Sun, 2 Nov 2014 00:05:59 GMT (envelope-from brd@FreeBSD.org) Message-Id: <201411020005.sA205x3X033391@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: brd set sender to brd@FreeBSD.org using -f From: Brad Davis Date: Sun, 2 Nov 2014 00:05:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r273954 - in projects/zfsd/head: . bin/csh bin/dd bin/pkill/tests bin/ps bin/sh bin/sh/tests/builtins bin/sh/tests/expansion bin/sh/tests/parameters bin/sh/tests/parser bin/sleep bin/sl... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Nov 2014 00:06:02 -0000 Author: brd (doc committer) Date: Sun Nov 2 00:05:52 2014 New Revision: 273954 URL: https://svnweb.freebsd.org/changeset/base/273954 Log: IFC @r273953 Added: projects/zfsd/head/bin/sh/tests/builtins/eval7.0 - copied unchanged from r273953, head/bin/sh/tests/builtins/eval7.0 projects/zfsd/head/bin/sh/tests/builtins/eval8.7 - copied unchanged from r273953, head/bin/sh/tests/builtins/eval8.7 projects/zfsd/head/bin/sh/tests/builtins/getopts9.0 - copied unchanged from r273953, head/bin/sh/tests/builtins/getopts9.0 projects/zfsd/head/bin/sh/tests/builtins/getopts9.0.stdout - copied unchanged from r273953, head/bin/sh/tests/builtins/getopts9.0.stdout projects/zfsd/head/bin/sh/tests/builtins/lineno3.0 - copied unchanged from r273953, head/bin/sh/tests/builtins/lineno3.0 projects/zfsd/head/bin/sh/tests/builtins/lineno3.0.stdout - copied unchanged from r273953, head/bin/sh/tests/builtins/lineno3.0.stdout projects/zfsd/head/bin/sh/tests/expansion/redir1.0 - copied unchanged from r273953, head/bin/sh/tests/expansion/redir1.0 projects/zfsd/head/bin/sh/tests/parameters/positional6.0 - copied unchanged from r273953, head/bin/sh/tests/parameters/positional6.0 projects/zfsd/head/bin/sh/tests/parameters/positional7.0 - copied unchanged from r273953, head/bin/sh/tests/parameters/positional7.0 projects/zfsd/head/bin/sh/tests/parser/heredoc12.0 - copied unchanged from r273953, head/bin/sh/tests/parser/heredoc12.0 projects/zfsd/head/bin/sh/tests/parser/line-cont1.0 - copied unchanged from r273953, head/bin/sh/tests/parser/line-cont1.0 projects/zfsd/head/bin/sh/tests/parser/line-cont10.0 - copied unchanged from r273953, head/bin/sh/tests/parser/line-cont10.0 projects/zfsd/head/bin/sh/tests/parser/line-cont11.0 - copied unchanged from r273953, head/bin/sh/tests/parser/line-cont11.0 projects/zfsd/head/bin/sh/tests/parser/line-cont2.0 - copied unchanged from r273953, head/bin/sh/tests/parser/line-cont2.0 projects/zfsd/head/bin/sh/tests/parser/line-cont3.0 - copied unchanged from r273953, head/bin/sh/tests/parser/line-cont3.0 projects/zfsd/head/bin/sh/tests/parser/line-cont4.0 - copied unchanged from r273953, head/bin/sh/tests/parser/line-cont4.0 projects/zfsd/head/bin/sh/tests/parser/line-cont5.0 - copied unchanged from r273953, head/bin/sh/tests/parser/line-cont5.0 projects/zfsd/head/bin/sh/tests/parser/line-cont6.0 - copied unchanged from r273953, head/bin/sh/tests/parser/line-cont6.0 projects/zfsd/head/bin/sh/tests/parser/line-cont7.0 - copied unchanged from r273953, head/bin/sh/tests/parser/line-cont7.0 projects/zfsd/head/bin/sh/tests/parser/line-cont8.0 - copied unchanged from r273953, head/bin/sh/tests/parser/line-cont8.0 projects/zfsd/head/bin/sh/tests/parser/line-cont9.0 - copied unchanged from r273953, head/bin/sh/tests/parser/line-cont9.0 projects/zfsd/head/bin/sleep/tests/ - copied from r273953, head/bin/sleep/tests/ projects/zfsd/head/contrib/atf/atf-c++/atf-c++.3 - copied unchanged from r273953, head/contrib/atf/atf-c++/atf-c++.3 projects/zfsd/head/contrib/atf/atf-c/atf-c.3 - copied unchanged from r273953, head/contrib/atf/atf-c/atf-c.3 projects/zfsd/head/contrib/atf/atf-sh/atf-sh.3 - copied unchanged from r273953, head/contrib/atf/atf-sh/atf-sh.3 projects/zfsd/head/contrib/atf/config.h - copied unchanged from r273953, head/contrib/atf/config.h projects/zfsd/head/contrib/atf/doc/atf.7.in - copied unchanged from r273953, head/contrib/atf/doc/atf.7.in projects/zfsd/head/contrib/byacc/test/btyacc/btyacc_demo2.error - copied unchanged from r273953, head/contrib/byacc/test/btyacc/btyacc_demo2.error projects/zfsd/head/contrib/byacc/test/btyacc/btyacc_demo2.output - copied unchanged from r273953, head/contrib/byacc/test/btyacc/btyacc_demo2.output projects/zfsd/head/contrib/byacc/test/btyacc/btyacc_demo2.tab.c - copied unchanged from r273953, head/contrib/byacc/test/btyacc/btyacc_demo2.tab.c projects/zfsd/head/contrib/byacc/test/btyacc/btyacc_demo2.tab.h - copied unchanged from r273953, head/contrib/byacc/test/btyacc/btyacc_demo2.tab.h projects/zfsd/head/contrib/byacc/test/btyacc/btyacc_destroy1.error - copied unchanged from r273953, head/contrib/byacc/test/btyacc/btyacc_destroy1.error projects/zfsd/head/contrib/byacc/test/btyacc/btyacc_destroy1.output - copied unchanged from r273953, head/contrib/byacc/test/btyacc/btyacc_destroy1.output projects/zfsd/head/contrib/byacc/test/btyacc/btyacc_destroy1.tab.c - copied unchanged from r273953, head/contrib/byacc/test/btyacc/btyacc_destroy1.tab.c projects/zfsd/head/contrib/byacc/test/btyacc/btyacc_destroy1.tab.h - copied unchanged from r273953, head/contrib/byacc/test/btyacc/btyacc_destroy1.tab.h projects/zfsd/head/contrib/byacc/test/btyacc/btyacc_destroy2.error - copied unchanged from r273953, head/contrib/byacc/test/btyacc/btyacc_destroy2.error projects/zfsd/head/contrib/byacc/test/btyacc/btyacc_destroy2.output - copied unchanged from r273953, head/contrib/byacc/test/btyacc/btyacc_destroy2.output projects/zfsd/head/contrib/byacc/test/btyacc/btyacc_destroy2.tab.c - copied unchanged from r273953, head/contrib/byacc/test/btyacc/btyacc_destroy2.tab.c projects/zfsd/head/contrib/byacc/test/btyacc/btyacc_destroy2.tab.h - copied unchanged from r273953, head/contrib/byacc/test/btyacc/btyacc_destroy2.tab.h projects/zfsd/head/contrib/byacc/test/btyacc/btyacc_destroy3.error - copied unchanged from r273953, head/contrib/byacc/test/btyacc/btyacc_destroy3.error projects/zfsd/head/contrib/byacc/test/btyacc/btyacc_destroy3.output - copied unchanged from r273953, head/contrib/byacc/test/btyacc/btyacc_destroy3.output projects/zfsd/head/contrib/byacc/test/btyacc/btyacc_destroy3.tab.c - copied unchanged from r273953, head/contrib/byacc/test/btyacc/btyacc_destroy3.tab.c projects/zfsd/head/contrib/byacc/test/btyacc/btyacc_destroy3.tab.h - copied unchanged from r273953, head/contrib/byacc/test/btyacc/btyacc_destroy3.tab.h projects/zfsd/head/contrib/byacc/test/btyacc_destroy1.y - copied unchanged from r273953, head/contrib/byacc/test/btyacc_destroy1.y projects/zfsd/head/contrib/byacc/test/btyacc_destroy2.y - copied unchanged from r273953, head/contrib/byacc/test/btyacc_destroy2.y projects/zfsd/head/contrib/byacc/test/btyacc_destroy3.y - copied unchanged from r273953, head/contrib/byacc/test/btyacc_destroy3.y projects/zfsd/head/contrib/hyperv/ - copied from r273953, head/contrib/hyperv/ projects/zfsd/head/contrib/libxo/ - copied from r273953, head/contrib/libxo/ projects/zfsd/head/contrib/llvm/patches/patch-r269387-clang-arm-target-cpu.diff - copied unchanged from r273953, head/contrib/llvm/patches/patch-r269387-clang-arm-target-cpu.diff projects/zfsd/head/contrib/llvm/patches/patch-r271024-llvm-r216989-r216990-fix-movw-armv6.diff - copied unchanged from r273953, head/contrib/llvm/patches/patch-r271024-llvm-r216989-r216990-fix-movw-armv6.diff projects/zfsd/head/contrib/llvm/patches/patch-r271282-clang-r200797-r200798-r200805-debug-info-crash.diff - copied unchanged from r273953, head/contrib/llvm/patches/patch-r271282-clang-r200797-r200798-r200805-debug-info-crash.diff projects/zfsd/head/contrib/llvm/patches/patch-r271432-clang-r205331-debug-info-crash.diff - copied unchanged from r273953, head/contrib/llvm/patches/patch-r271432-clang-r205331-debug-info-crash.diff projects/zfsd/head/contrib/llvm/patches/patch-r271597-clang-r217410-i386-garbage-float.diff - copied unchanged from r273953, head/contrib/llvm/patches/patch-r271597-clang-r217410-i386-garbage-float.diff projects/zfsd/head/contrib/netbsd-tests/ - copied from r273953, head/contrib/netbsd-tests/ projects/zfsd/head/contrib/ofed/libcxgb4/ - copied from r273953, head/contrib/ofed/libcxgb4/ projects/zfsd/head/contrib/ofed/librdmacm/examples/build/ - copied from r273953, head/contrib/ofed/librdmacm/examples/build/ projects/zfsd/head/contrib/ofed/usr.lib/libcxgb4/ - copied from r273953, head/contrib/ofed/usr.lib/libcxgb4/ projects/zfsd/head/contrib/openpam/lib/libpam/openpam_strlset.c - copied unchanged from r273953, head/contrib/openpam/lib/libpam/openpam_strlset.c projects/zfsd/head/contrib/openpam/lib/libpam/openpam_strlset.h - copied unchanged from r273953, head/contrib/openpam/lib/libpam/openpam_strlset.h projects/zfsd/head/contrib/pjdfstest/ - copied from r273953, head/contrib/pjdfstest/ projects/zfsd/head/contrib/tzdata/zone1970.tab - copied unchanged from r273953, head/contrib/tzdata/zone1970.tab projects/zfsd/head/crypto/openssl/crypto/constant_time_locl.h - copied unchanged from r273953, head/crypto/openssl/crypto/constant_time_locl.h projects/zfsd/head/crypto/openssl/crypto/constant_time_test.c - copied unchanged from r273953, head/crypto/openssl/crypto/constant_time_test.c projects/zfsd/head/crypto/openssl/doc/apps/c_rehash.pod - copied unchanged from r273953, head/crypto/openssl/doc/apps/c_rehash.pod projects/zfsd/head/crypto/openssl/doc/crypto/CMS_add1_signer.pod - copied unchanged from r273953, head/crypto/openssl/doc/crypto/CMS_add1_signer.pod projects/zfsd/head/etc/devd/hyperv.conf - copied unchanged from r273953, head/etc/devd/hyperv.conf projects/zfsd/head/etc/devd/ulpt.conf - copied unchanged from r273953, head/etc/devd/ulpt.conf projects/zfsd/head/etc/rc.d/ipropd_master - copied unchanged from r273953, head/etc/rc.d/ipropd_master projects/zfsd/head/etc/rc.d/ipropd_slave - copied unchanged from r273953, head/etc/rc.d/ipropd_slave projects/zfsd/head/etc/rc.d/kdc - copied unchanged from r273953, head/etc/rc.d/kdc projects/zfsd/head/games/primes/spsp.c - copied unchanged from r273953, head/games/primes/spsp.c projects/zfsd/head/gnu/usr.bin/diff/tests/ - copied from r273953, head/gnu/usr.bin/diff/tests/ projects/zfsd/head/lib/libc/arm/Symbol_vfp.map - copied unchanged from r273953, head/lib/libc/arm/Symbol_vfp.map projects/zfsd/head/lib/libc/arm/aeabi/aeabi_asm_double.S - copied unchanged from r273953, head/lib/libc/arm/aeabi/aeabi_asm_double.S projects/zfsd/head/lib/libc/arm/aeabi/aeabi_asm_float.S - copied unchanged from r273953, head/lib/libc/arm/aeabi/aeabi_asm_float.S projects/zfsd/head/lib/libevent/ - copied from r273953, head/lib/libevent/ projects/zfsd/head/lib/libnetbsd/netinet/ - copied from r273953, head/lib/libnetbsd/netinet/ projects/zfsd/head/lib/libpcap/pcap-netmap.c - copied unchanged from r273953, head/lib/libpcap/pcap-netmap.c projects/zfsd/head/lib/libproc/tests/ - copied from r273953, head/lib/libproc/tests/ projects/zfsd/head/lib/libxo/ - copied from r273953, head/lib/libxo/ projects/zfsd/head/lib/msun/ld128/e_lgammal_r.c - copied unchanged from r273953, head/lib/msun/ld128/e_lgammal_r.c projects/zfsd/head/lib/msun/ld80/e_lgammal_r.c - copied unchanged from r273953, head/lib/msun/ld80/e_lgammal_r.c projects/zfsd/head/lib/msun/src/e_lgammal.c - copied unchanged from r273953, head/lib/msun/src/e_lgammal.c projects/zfsd/head/libexec/Makefile.amd64 - copied unchanged from r273953, head/libexec/Makefile.amd64 projects/zfsd/head/libexec/Makefile.i386 - copied unchanged from r273953, head/libexec/Makefile.i386 projects/zfsd/head/libexec/Makefile.pc98 - copied unchanged from r273953, head/libexec/Makefile.pc98 projects/zfsd/head/libexec/hyperv/ - copied from r273953, head/libexec/hyperv/ projects/zfsd/head/release/amd64/mk-azure.sh - copied unchanged from r273953, head/release/amd64/mk-azure.sh projects/zfsd/head/release/amd64/mk-vmimage.sh - copied unchanged from r273953, head/release/amd64/mk-vmimage.sh projects/zfsd/head/release/i386/mk-azure.sh - copied unchanged from r273953, head/release/i386/mk-azure.sh projects/zfsd/head/release/i386/mk-vmimage.sh - copied unchanged from r273953, head/release/i386/mk-vmimage.sh projects/zfsd/head/release/tools/azure.conf - copied unchanged from r273953, head/release/tools/azure.conf projects/zfsd/head/sbin/ifconfig/ifvxlan.c - copied unchanged from r273953, head/sbin/ifconfig/ifvxlan.c projects/zfsd/head/sbin/ipfw/tables.c - copied unchanged from r273953, head/sbin/ipfw/tables.c projects/zfsd/head/secure/lib/libcrypto/man/CMS_add1_signer.3 - copied unchanged from r273953, head/secure/lib/libcrypto/man/CMS_add1_signer.3 projects/zfsd/head/secure/usr.bin/openssl/man/c_rehash.1 - copied unchanged from r273953, head/secure/usr.bin/openssl/man/c_rehash.1 projects/zfsd/head/share/man/man4/ipheth.4 - copied unchanged from r273953, head/share/man/man4/ipheth.4 projects/zfsd/head/share/man/man4/iscsi.4 - copied unchanged from r273953, head/share/man/man4/iscsi.4 projects/zfsd/head/share/man/man4/man4.arm/cgem.4 - copied unchanged from r273953, head/share/man/man4/man4.arm/cgem.4 projects/zfsd/head/share/man/man4/smsc.4 - copied unchanged from r273953, head/share/man/man4/smsc.4 projects/zfsd/head/share/man/man4/uled.4 - copied unchanged from r273953, head/share/man/man4/uled.4 projects/zfsd/head/share/man/man4/virtio_console.4 - copied unchanged from r273953, head/share/man/man4/virtio_console.4 projects/zfsd/head/share/man/man4/vxlan.4 - copied unchanged from r273953, head/share/man/man4/vxlan.4 projects/zfsd/head/share/man/man8/uefi.8 - copied unchanged from r273953, head/share/man/man8/uefi.8 projects/zfsd/head/share/man/man9/casuword.9 - copied unchanged from r273953, head/share/man/man9/casuword.9 - copied unchanged from r273953, head/sys/amd64/vmm/amd/npt.c - copied unchanged from r273953, head/sys/amd64/vmm/amd/npt.h - copied unchanged from r273953, head/sys/amd64/vmm/amd/svm.c - copied unchanged from r273953, head/sys/amd64/vmm/amd/svm.h - copied unchanged from r273953, head/sys/amd64/vmm/amd/svm_genassym.c - copied unchanged from r273953, head/sys/amd64/vmm/amd/svm_msr.c - copied unchanged from r273953, head/sys/amd64/vmm/amd/svm_msr.h - copied unchanged from r273953, head/sys/amd64/vmm/amd/svm_softc.h - copied unchanged from r273953, head/sys/amd64/vmm/amd/svm_support.S - copied unchanged from r273953, head/sys/amd64/vmm/amd/vmcb.c - copied unchanged from r273953, head/sys/amd64/vmm/amd/vmcb.h projects/zfsd/head/sys/amd64/vmm/io/vpmtmr.c - copied unchanged from r273953, head/sys/amd64/vmm/io/vpmtmr.c projects/zfsd/head/sys/amd64/vmm/io/vpmtmr.h - copied unchanged from r273953, head/sys/amd64/vmm/io/vpmtmr.h projects/zfsd/head/sys/arm/altera/ - copied from r273953, head/sys/arm/altera/ projects/zfsd/head/sys/arm/arm/elf_note.S - copied unchanged from r273953, head/sys/arm/arm/elf_note.S projects/zfsd/head/sys/arm/arm/syscall.c - copied unchanged from r273953, head/sys/arm/arm/syscall.c projects/zfsd/head/sys/arm/conf/IMX53 - copied unchanged from r273953, head/sys/arm/conf/IMX53 projects/zfsd/head/sys/arm/conf/SOCKIT - copied unchanged from r273953, head/sys/arm/conf/SOCKIT projects/zfsd/head/sys/arm/conf/SOCKIT-BERI - copied unchanged from r273953, head/sys/arm/conf/SOCKIT-BERI projects/zfsd/head/sys/arm/freescale/imx/imx_iomux.c - copied unchanged from r273953, head/sys/arm/freescale/imx/imx_iomux.c projects/zfsd/head/sys/arm/freescale/imx/imx_iomuxvar.h - copied unchanged from r273953, head/sys/arm/freescale/imx/imx_iomuxvar.h projects/zfsd/head/sys/arm/include/sysreg.h - copied unchanged from r273953, head/sys/arm/include/sysreg.h projects/zfsd/head/sys/arm/samsung/s3c2xx0/ - copied from r273953, head/sys/arm/samsung/s3c2xx0/ projects/zfsd/head/sys/arm/ti/am335x/am335x_gpio.c - copied unchanged from r273953, head/sys/arm/ti/am335x/am335x_gpio.c projects/zfsd/head/sys/arm/ti/am335x/am335x_scm_padconf.h - copied unchanged from r273953, head/sys/arm/ti/am335x/am335x_scm_padconf.h projects/zfsd/head/sys/arm/ti/omap4/omap4_gpio.c - copied unchanged from r273953, head/sys/arm/ti/omap4/omap4_gpio.c projects/zfsd/head/sys/arm/ti/omap4/omap4_scm_padconf.h - copied unchanged from r273953, head/sys/arm/ti/omap4/omap4_scm_padconf.h projects/zfsd/head/sys/arm/ti/ti_gpio.h - copied unchanged from r273953, head/sys/arm/ti/ti_gpio.h projects/zfsd/head/sys/arm/ti/ti_gpio_if.m - copied unchanged from r273953, head/sys/arm/ti/ti_gpio_if.m projects/zfsd/head/sys/arm/ti/ti_wdt.c - copied unchanged from r273953, head/sys/arm/ti/ti_wdt.c projects/zfsd/head/sys/arm/ti/ti_wdt.h - copied unchanged from r273953, head/sys/arm/ti/ti_wdt.h projects/zfsd/head/sys/boot/common/zfsloader.8 - copied unchanged from r273953, head/sys/boot/common/zfsloader.8 projects/zfsd/head/sys/boot/efi/include/eficonsctl.h - copied unchanged from r273953, head/sys/boot/efi/include/eficonsctl.h projects/zfsd/head/sys/boot/fdt/dts/arm/socfpga-sockit-beri.dts - copied unchanged from r273953, head/sys/boot/fdt/dts/arm/socfpga-sockit-beri.dts projects/zfsd/head/sys/boot/fdt/dts/arm/socfpga-sockit.dts - copied unchanged from r273953, head/sys/boot/fdt/dts/arm/socfpga-sockit.dts projects/zfsd/head/sys/boot/fdt/dts/arm/socfpga.dtsi - copied unchanged from r273953, head/sys/boot/fdt/dts/arm/socfpga.dtsi projects/zfsd/head/sys/boot/fdt/fdt_platform.h - copied unchanged from r273953, head/sys/boot/fdt/fdt_platform.h projects/zfsd/head/sys/boot/forth/pcibios.4th - copied unchanged from r273953, head/sys/boot/forth/pcibios.4th projects/zfsd/head/sys/boot/i386/gptzfsboot/gptzfsboot.8 - copied unchanged from r273953, head/sys/boot/i386/gptzfsboot/gptzfsboot.8 projects/zfsd/head/sys/boot/i386/zfsboot/zfsboot.8 - copied unchanged from r273953, head/sys/boot/i386/zfsboot/zfsboot.8 projects/zfsd/head/sys/boot/uboot/fdt/ - copied from r273953, head/sys/boot/uboot/fdt/ projects/zfsd/head/sys/cddl/compat/opensolaris/kern/opensolaris_dtrace.c - copied unchanged from r273953, head/sys/cddl/compat/opensolaris/kern/opensolaris_dtrace.c projects/zfsd/head/sys/compat/linux/linux_timer.c - copied unchanged from r273953, head/sys/compat/linux/linux_timer.c projects/zfsd/head/sys/compat/linux/linux_timer.h - copied unchanged from r273953, head/sys/compat/linux/linux_timer.h projects/zfsd/head/sys/contrib/dev/acpica/common/acgetline.c - copied unchanged from r273953, head/sys/contrib/dev/acpica/common/acgetline.c projects/zfsd/head/sys/contrib/dev/acpica/common/ahids.c - copied unchanged from r273953, head/sys/contrib/dev/acpica/common/ahids.c projects/zfsd/head/sys/contrib/dev/acpica/common/ahuuids.c - copied unchanged from r273953, head/sys/contrib/dev/acpica/common/ahuuids.c projects/zfsd/head/sys/contrib/dev/acpica/common/cmfsize.c - copied unchanged from r273953, head/sys/contrib/dev/acpica/common/cmfsize.c projects/zfsd/head/sys/contrib/dev/acpica/compiler/aslascii.c - copied unchanged from r273953, head/sys/contrib/dev/acpica/compiler/aslascii.c projects/zfsd/head/sys/contrib/dev/acpica/compiler/aslmapenter.c - copied unchanged from r273953, head/sys/contrib/dev/acpica/compiler/aslmapenter.c projects/zfsd/head/sys/contrib/dev/acpica/compiler/aslmapoutput.c - copied unchanged from r273953, head/sys/contrib/dev/acpica/compiler/aslmapoutput.c projects/zfsd/head/sys/contrib/dev/acpica/compiler/aslmaputils.c - copied unchanged from r273953, head/sys/contrib/dev/acpica/compiler/aslmaputils.c projects/zfsd/head/sys/contrib/dev/acpica/compiler/aslmessages.c - copied unchanged from r273953, head/sys/contrib/dev/acpica/compiler/aslmessages.c projects/zfsd/head/sys/contrib/dev/acpica/compiler/aslparser.y - copied unchanged from r273953, head/sys/contrib/dev/acpica/compiler/aslparser.y projects/zfsd/head/sys/contrib/dev/acpica/compiler/aslrules.y - copied unchanged from r273953, head/sys/contrib/dev/acpica/compiler/aslrules.y projects/zfsd/head/sys/contrib/dev/acpica/compiler/aslsupport.y - copied unchanged from r273953, head/sys/contrib/dev/acpica/compiler/aslsupport.y projects/zfsd/head/sys/contrib/dev/acpica/compiler/asltokens.y - copied unchanged from r273953, head/sys/contrib/dev/acpica/compiler/asltokens.y projects/zfsd/head/sys/contrib/dev/acpica/compiler/asltypes.y - copied unchanged from r273953, head/sys/contrib/dev/acpica/compiler/asltypes.y projects/zfsd/head/sys/contrib/dev/acpica/components/debugger/dbtest.c - copied unchanged from r273953, head/sys/contrib/dev/acpica/components/debugger/dbtest.c projects/zfsd/head/sys/contrib/dev/acpica/components/tables/tbdata.c - copied unchanged from r273953, head/sys/contrib/dev/acpica/components/tables/tbdata.c projects/zfsd/head/sys/contrib/dev/acpica/components/utilities/utfileio.c - copied unchanged from r273953, head/sys/contrib/dev/acpica/components/utilities/utfileio.c projects/zfsd/head/sys/contrib/dev/acpica/components/utilities/uthex.c - copied unchanged from r273953, head/sys/contrib/dev/acpica/components/utilities/uthex.c projects/zfsd/head/sys/contrib/dev/acpica/components/utilities/utprint.c - copied unchanged from r273953, head/sys/contrib/dev/acpica/components/utilities/utprint.c projects/zfsd/head/sys/contrib/dev/acpica/components/utilities/utuuid.c - copied unchanged from r273953, head/sys/contrib/dev/acpica/components/utilities/utuuid.c projects/zfsd/head/sys/contrib/dev/acpica/include/platform/acenvex.h - copied unchanged from r273953, head/sys/contrib/dev/acpica/include/platform/acenvex.h projects/zfsd/head/sys/contrib/dev/acpica/os_specific/service_layers/oslibcfs.c - copied unchanged from r273953, head/sys/contrib/dev/acpica/os_specific/service_layers/oslibcfs.c projects/zfsd/head/sys/contrib/dev/iwn/iwlwifi-100-39.31.5.1.fw.uu - copied unchanged from r273953, head/sys/contrib/dev/iwn/iwlwifi-100-39.31.5.1.fw.uu projects/zfsd/head/sys/dev/ahci/ahci_pci.c - copied unchanged from r273953, head/sys/dev/ahci/ahci_pci.c projects/zfsd/head/sys/dev/alpm/ - copied from r273953, head/sys/dev/alpm/ projects/zfsd/head/sys/dev/amdpm/ - copied from r273953, head/sys/dev/amdpm/ projects/zfsd/head/sys/dev/amdsmb/ - copied from r273953, head/sys/dev/amdsmb/ projects/zfsd/head/sys/dev/ath/if_ath_pci_devlist.h - copied unchanged from r273953, head/sys/dev/ath/if_ath_pci_devlist.h projects/zfsd/head/sys/dev/beri/ - copied from r273953, head/sys/dev/beri/ projects/zfsd/head/sys/dev/drm2/i915/i915_gem_context.c - copied unchanged from r273953, head/sys/dev/drm2/i915/i915_gem_context.c projects/zfsd/head/sys/dev/dwc/ - copied from r273953, head/sys/dev/dwc/ projects/zfsd/head/sys/dev/fdc/fdc_cbus.c - copied unchanged from r273953, head/sys/dev/fdc/fdc_cbus.c projects/zfsd/head/sys/dev/fdt/fdt_clock.c - copied unchanged from r273953, head/sys/dev/fdt/fdt_clock.c projects/zfsd/head/sys/dev/fdt/fdt_clock.h - copied unchanged from r273953, head/sys/dev/fdt/fdt_clock.h projects/zfsd/head/sys/dev/fdt/fdt_clock_if.m - copied unchanged from r273953, head/sys/dev/fdt/fdt_clock_if.m projects/zfsd/head/sys/dev/fdt/fdt_pinctrl.c - copied unchanged from r273953, head/sys/dev/fdt/fdt_pinctrl.c projects/zfsd/head/sys/dev/fdt/fdt_pinctrl.h - copied unchanged from r273953, head/sys/dev/fdt/fdt_pinctrl.h projects/zfsd/head/sys/dev/fdt/fdt_pinctrl_if.m - copied unchanged from r273953, head/sys/dev/fdt/fdt_pinctrl_if.m projects/zfsd/head/sys/dev/hyperv/utilities/hv_kvp.c - copied unchanged from r273953, head/sys/dev/hyperv/utilities/hv_kvp.c projects/zfsd/head/sys/dev/hyperv/utilities/unicode.h - copied unchanged from r273953, head/sys/dev/hyperv/utilities/unicode.h projects/zfsd/head/sys/dev/iicbus/adm1030.c - copied unchanged from r273953, head/sys/dev/iicbus/adm1030.c projects/zfsd/head/sys/dev/intpm/ - copied from r273953, head/sys/dev/intpm/ projects/zfsd/head/sys/dev/ixl/ - copied from r273953, head/sys/dev/ixl/ projects/zfsd/head/sys/dev/mii/micphy.c - copied unchanged from r273953, head/sys/dev/mii/micphy.c projects/zfsd/head/sys/dev/mmc/host/ - copied from r273953, head/sys/dev/mmc/host/ projects/zfsd/head/sys/dev/mrsas/mrsas_linux.c - copied unchanged from r273953, head/sys/dev/mrsas/mrsas_linux.c projects/zfsd/head/sys/dev/ncr/ - copied from r273953, head/sys/dev/ncr/ projects/zfsd/head/sys/dev/nfsmb/ - copied from r273953, head/sys/dev/nfsmb/ projects/zfsd/head/sys/dev/random/build.sh - copied unchanged from r273953, head/sys/dev/random/build.sh projects/zfsd/head/sys/dev/random/fortuna.c - copied unchanged from r273953, head/sys/dev/random/fortuna.c projects/zfsd/head/sys/dev/random/fortuna.h - copied unchanged from r273953, head/sys/dev/random/fortuna.h projects/zfsd/head/sys/dev/random/uint128.h - copied unchanged from r273953, head/sys/dev/random/uint128.h projects/zfsd/head/sys/dev/random/unit_test.c - copied unchanged from r273953, head/sys/dev/random/unit_test.c projects/zfsd/head/sys/dev/random/unit_test.h - copied unchanged from r273953, head/sys/dev/random/unit_test.h projects/zfsd/head/sys/dev/rl/ - copied from r273953, head/sys/dev/rl/ projects/zfsd/head/sys/dev/smc/if_smc_fdt.c - copied unchanged from r273953, head/sys/dev/smc/if_smc_fdt.c projects/zfsd/head/sys/dev/uart/uart_dev_msm.c - copied unchanged from r273953, head/sys/dev/uart/uart_dev_msm.c projects/zfsd/head/sys/dev/uart/uart_dev_msm.h - copied unchanged from r273953, head/sys/dev/uart/uart_dev_msm.h projects/zfsd/head/sys/dev/usb/misc/uled.c - copied unchanged from r273953, head/sys/dev/usb/misc/uled.c projects/zfsd/head/sys/dev/usb/uled_ioctl.h - copied unchanged from r273953, head/sys/dev/usb/uled_ioctl.h projects/zfsd/head/sys/dev/viapm/ - copied from r273953, head/sys/dev/viapm/ projects/zfsd/head/sys/dev/virtio/console/ - copied from r273953, head/sys/dev/virtio/console/ projects/zfsd/head/sys/dev/xen/evtchn/ - copied from r273953, head/sys/dev/xen/evtchn/ projects/zfsd/head/sys/dev/xen/privcmd/ - copied from r273953, head/sys/dev/xen/privcmd/ projects/zfsd/head/sys/dev/xen/xenstore/ - copied from r273953, head/sys/dev/xen/xenstore/ projects/zfsd/head/sys/gnu/dts/include/dt-bindings/clk/ti-dra7-atl.h - copied unchanged from r273953, head/sys/gnu/dts/include/dt-bindings/clk/ti-dra7-atl.h projects/zfsd/head/sys/gnu/dts/include/dt-bindings/clock/at91.h - copied unchanged from r273953, head/sys/gnu/dts/include/dt-bindings/clock/at91.h projects/zfsd/head/sys/gnu/dts/include/dt-bindings/clock/bcm21664.h - copied unchanged from r273953, head/sys/gnu/dts/include/dt-bindings/clock/bcm21664.h projects/zfsd/head/sys/gnu/dts/include/dt-bindings/clock/bcm281xx.h - copied unchanged from r273953, head/sys/gnu/dts/include/dt-bindings/clock/bcm281xx.h projects/zfsd/head/sys/gnu/dts/include/dt-bindings/clock/berlin2.h - copied unchanged from r273953, head/sys/gnu/dts/include/dt-bindings/clock/berlin2.h projects/zfsd/head/sys/gnu/dts/include/dt-bindings/clock/berlin2q.h - copied unchanged from r273953, head/sys/gnu/dts/include/dt-bindings/clock/berlin2q.h projects/zfsd/head/sys/gnu/dts/include/dt-bindings/clock/clps711x-clock.h - copied unchanged from r273953, head/sys/gnu/dts/include/dt-bindings/clock/clps711x-clock.h projects/zfsd/head/sys/gnu/dts/include/dt-bindings/clock/exynos-audss-clk.h - copied unchanged from r273953, head/sys/gnu/dts/include/dt-bindings/clock/exynos-audss-clk.h projects/zfsd/head/sys/gnu/dts/include/dt-bindings/clock/exynos3250.h - copied unchanged from r273953, head/sys/gnu/dts/include/dt-bindings/clock/exynos3250.h projects/zfsd/head/sys/gnu/dts/include/dt-bindings/clock/exynos5260-clk.h - copied unchanged from r273953, head/sys/gnu/dts/include/dt-bindings/clock/exynos5260-clk.h projects/zfsd/head/sys/gnu/dts/include/dt-bindings/clock/exynos5410.h - copied unchanged from r273953, head/sys/gnu/dts/include/dt-bindings/clock/exynos5410.h projects/zfsd/head/sys/gnu/dts/include/dt-bindings/clock/hip04-clock.h - copied unchanged from r273953, head/sys/gnu/dts/include/dt-bindings/clock/hip04-clock.h projects/zfsd/head/sys/gnu/dts/include/dt-bindings/clock/hix5hd2-clock.h - copied unchanged from r273953, head/sys/gnu/dts/include/dt-bindings/clock/hix5hd2-clock.h projects/zfsd/head/sys/gnu/dts/include/dt-bindings/clock/imx1-clock.h - copied unchanged from r273953, head/sys/gnu/dts/include/dt-bindings/clock/imx1-clock.h projects/zfsd/head/sys/gnu/dts/include/dt-bindings/clock/imx21-clock.h - copied unchanged from r273953, head/sys/gnu/dts/include/dt-bindings/clock/imx21-clock.h projects/zfsd/head/sys/gnu/dts/include/dt-bindings/clock/imx27-clock.h - copied unchanged from r273953, head/sys/gnu/dts/include/dt-bindings/clock/imx27-clock.h projects/zfsd/head/sys/gnu/dts/include/dt-bindings/clock/imx6qdl-clock.h - copied unchanged from r273953, head/sys/gnu/dts/include/dt-bindings/clock/imx6qdl-clock.h projects/zfsd/head/sys/gnu/dts/include/dt-bindings/clock/imx6sx-clock.h - copied unchanged from r273953, head/sys/gnu/dts/include/dt-bindings/clock/imx6sx-clock.h projects/zfsd/head/sys/gnu/dts/include/dt-bindings/clock/lsi,axm5516-clks.h - copied unchanged from r273953, head/sys/gnu/dts/include/dt-bindings/clock/lsi,axm5516-clks.h projects/zfsd/head/sys/gnu/dts/include/dt-bindings/clock/qcom,gcc-apq8084.h - copied unchanged from r273953, head/sys/gnu/dts/include/dt-bindings/clock/qcom,gcc-apq8084.h projects/zfsd/head/sys/gnu/dts/include/dt-bindings/clock/qcom,gcc-ipq806x.h - copied unchanged from r273953, head/sys/gnu/dts/include/dt-bindings/clock/qcom,gcc-ipq806x.h projects/zfsd/head/sys/gnu/dts/include/dt-bindings/clock/qcom,mmcc-apq8084.h - copied unchanged from r273953, head/sys/gnu/dts/include/dt-bindings/clock/qcom,mmcc-apq8084.h projects/zfsd/head/sys/gnu/dts/include/dt-bindings/clock/r7s72100-clock.h - copied unchanged from r273953, head/sys/gnu/dts/include/dt-bindings/clock/r7s72100-clock.h projects/zfsd/head/sys/gnu/dts/include/dt-bindings/clock/r8a7779-clock.h - copied unchanged from r273953, head/sys/gnu/dts/include/dt-bindings/clock/r8a7779-clock.h projects/zfsd/head/sys/gnu/dts/include/dt-bindings/clock/rk3066a-cru.h - copied unchanged from r273953, head/sys/gnu/dts/include/dt-bindings/clock/rk3066a-cru.h projects/zfsd/head/sys/gnu/dts/include/dt-bindings/clock/rk3188-cru-common.h - copied unchanged from r273953, head/sys/gnu/dts/include/dt-bindings/clock/rk3188-cru-common.h projects/zfsd/head/sys/gnu/dts/include/dt-bindings/clock/rk3188-cru.h - copied unchanged from r273953, head/sys/gnu/dts/include/dt-bindings/clock/rk3188-cru.h projects/zfsd/head/sys/gnu/dts/include/dt-bindings/clock/rk3288-cru.h - copied unchanged from r273953, head/sys/gnu/dts/include/dt-bindings/clock/rk3288-cru.h projects/zfsd/head/sys/gnu/dts/include/dt-bindings/clock/s3c2410.h - copied unchanged from r273953, head/sys/gnu/dts/include/dt-bindings/clock/s3c2410.h projects/zfsd/head/sys/gnu/dts/include/dt-bindings/clock/s3c2412.h - copied unchanged from r273953, head/sys/gnu/dts/include/dt-bindings/clock/s3c2412.h projects/zfsd/head/sys/gnu/dts/include/dt-bindings/clock/s3c2443.h - copied unchanged from r273953, head/sys/gnu/dts/include/dt-bindings/clock/s3c2443.h projects/zfsd/head/sys/gnu/dts/include/dt-bindings/clock/s5pv210-audss.h - copied unchanged from r273953, head/sys/gnu/dts/include/dt-bindings/clock/s5pv210-audss.h projects/zfsd/head/sys/gnu/dts/include/dt-bindings/clock/s5pv210.h - copied unchanged from r273953, head/sys/gnu/dts/include/dt-bindings/clock/s5pv210.h projects/zfsd/head/sys/gnu/dts/include/dt-bindings/clock/stih415-clks.h - copied unchanged from r273953, head/sys/gnu/dts/include/dt-bindings/clock/stih415-clks.h projects/zfsd/head/sys/gnu/dts/include/dt-bindings/clock/stih416-clks.h - copied unchanged from r273953, head/sys/gnu/dts/include/dt-bindings/clock/stih416-clks.h projects/zfsd/head/sys/gnu/dts/include/dt-bindings/dma/nbpfaxi.h - copied unchanged from r273953, head/sys/gnu/dts/include/dt-bindings/dma/nbpfaxi.h projects/zfsd/head/sys/gnu/dts/include/dt-bindings/mfd/palmas.h - copied unchanged from r273953, head/sys/gnu/dts/include/dt-bindings/mfd/palmas.h projects/zfsd/head/sys/gnu/dts/include/dt-bindings/phy/ - copied from r273953, head/sys/gnu/dts/include/dt-bindings/phy/ projects/zfsd/head/sys/gnu/dts/include/dt-bindings/pinctrl/pinctrl-tegra-xusb.h - copied unchanged from r273953, head/sys/gnu/dts/include/dt-bindings/pinctrl/pinctrl-tegra-xusb.h projects/zfsd/head/sys/gnu/dts/include/dt-bindings/reset-controller/ - copied from r273953, head/sys/gnu/dts/include/dt-bindings/reset-controller/ projects/zfsd/head/sys/gnu/dts/include/dt-bindings/reset/altr,rst-mgr.h - copied unchanged from r273953, head/sys/gnu/dts/include/dt-bindings/reset/altr,rst-mgr.h projects/zfsd/head/sys/gnu/dts/include/dt-bindings/reset/qcom,gcc-apq8084.h - copied unchanged from r273953, head/sys/gnu/dts/include/dt-bindings/reset/qcom,gcc-apq8084.h projects/zfsd/head/sys/gnu/dts/include/dt-bindings/reset/qcom,gcc-ipq806x.h - copied unchanged from r273953, head/sys/gnu/dts/include/dt-bindings/reset/qcom,gcc-ipq806x.h projects/zfsd/head/sys/gnu/dts/include/dt-bindings/reset/qcom,mmcc-apq8084.h - copied unchanged from r273953, head/sys/gnu/dts/include/dt-bindings/reset/qcom,mmcc-apq8084.h projects/zfsd/head/sys/gnu/dts/include/dt-bindings/soc/ - copied from r273953, head/sys/gnu/dts/include/dt-bindings/soc/ projects/zfsd/head/sys/gnu/dts/include/dt-bindings/sound/tlv320aic31xx-micbias.h - copied unchanged from r273953, head/sys/gnu/dts/include/dt-bindings/sound/tlv320aic31xx-micbias.h projects/zfsd/head/sys/gnu/dts/include/dt-bindings/spmi/ - copied from r273953, head/sys/gnu/dts/include/dt-bindings/spmi/ projects/zfsd/head/sys/libkern/explicit_bzero.c - copied unchanged from r273953, head/sys/libkern/explicit_bzero.c projects/zfsd/head/sys/libkern/memmem.c - copied unchanged from r273953, head/sys/libkern/memmem.c projects/zfsd/head/sys/libkern/murmur3_32.c - copied unchanged from r273953, head/sys/libkern/murmur3_32.c projects/zfsd/head/sys/mips/conf/TP-MR3020 - copied unchanged from r273953, head/sys/mips/conf/TP-MR3020 projects/zfsd/head/sys/mips/conf/TP-MR3020.hints - copied unchanged from r273953, head/sys/mips/conf/TP-MR3020.hints projects/zfsd/head/sys/modules/if_vxlan/ - copied from r273953, head/sys/modules/if_vxlan/ projects/zfsd/head/sys/modules/iwnfw/iwn100/ - copied from r273953, head/sys/modules/iwnfw/iwn100/ projects/zfsd/head/sys/modules/ixl/ - copied from r273953, head/sys/modules/ixl/ projects/zfsd/head/sys/modules/ixlv/ - copied from r273953, head/sys/modules/ixlv/ projects/zfsd/head/sys/modules/mrsas/mrsas_linux/ - copied from r273953, head/sys/modules/mrsas/mrsas_linux/ projects/zfsd/head/sys/modules/ncr/ - copied from r273953, head/sys/modules/ncr/ projects/zfsd/head/sys/modules/padlock_rng/ - copied from r273953, head/sys/modules/padlock_rng/ projects/zfsd/head/sys/modules/rdrand_rng/ - copied from r273953, head/sys/modules/rdrand_rng/ projects/zfsd/head/sys/modules/usb/uled/ - copied from r273953, head/sys/modules/usb/uled/ projects/zfsd/head/sys/modules/virtio/console/ - copied from r273953, head/sys/modules/virtio/console/ projects/zfsd/head/sys/net/if_vxlan.c - copied unchanged from r273953, head/sys/net/if_vxlan.c projects/zfsd/head/sys/net/if_vxlan.h - copied unchanged from r273953, head/sys/net/if_vxlan.h projects/zfsd/head/sys/netinet/sctp_syscalls.c - copied unchanged from r273953, head/sys/netinet/sctp_syscalls.c projects/zfsd/head/sys/netpfil/ipfw/ip_fw_iface.c - copied unchanged from r273953, head/sys/netpfil/ipfw/ip_fw_iface.c projects/zfsd/head/sys/netpfil/ipfw/ip_fw_table.h - copied unchanged from r273953, head/sys/netpfil/ipfw/ip_fw_table.h projects/zfsd/head/sys/netpfil/ipfw/ip_fw_table_algo.c - copied unchanged from r273953, head/sys/netpfil/ipfw/ip_fw_table_algo.c projects/zfsd/head/sys/netpfil/ipfw/ip_fw_table_value.c - copied unchanged from r273953, head/sys/netpfil/ipfw/ip_fw_table_value.c projects/zfsd/head/sys/ofed/drivers/net/mlx4/mlx4_stats.h - copied unchanged from r273953, head/sys/ofed/drivers/net/mlx4/mlx4_stats.h projects/zfsd/head/sys/ofed/drivers/net/mlx4/utils.c - copied unchanged from r273953, head/sys/ofed/drivers/net/mlx4/utils.c projects/zfsd/head/sys/ofed/drivers/net/mlx4/utils.h - copied unchanged from r273953, head/sys/ofed/drivers/net/mlx4/utils.h projects/zfsd/head/sys/ofed/include/linux/cache.h - copied unchanged from r273953, head/sys/ofed/include/linux/cache.h projects/zfsd/head/sys/ofed/include/linux/etherdevice.h - copied unchanged from r273953, head/sys/ofed/include/linux/etherdevice.h projects/zfsd/head/sys/ofed/include/linux/kmod.h - copied unchanged from r273953, head/sys/ofed/include/linux/kmod.h projects/zfsd/head/sys/ofed/include/linux/ktime.h - copied unchanged from r273953, head/sys/ofed/include/linux/ktime.h projects/zfsd/head/sys/ofed/include/linux/math64.h - copied unchanged from r273953, head/sys/ofed/include/linux/math64.h projects/zfsd/head/sys/ofed/include/net/if_inet6.h - copied unchanged from r273953, head/sys/ofed/include/net/if_inet6.h projects/zfsd/head/sys/sys/seq.h - copied unchanged from r273953, head/sys/sys/seq.h projects/zfsd/head/sys/x86/include/vmware.h - copied unchanged from r273953, head/sys/x86/include/vmware.h projects/zfsd/head/sys/x86/x86/identcpu.c - copied unchanged from r273953, head/sys/x86/x86/identcpu.c projects/zfsd/head/sys/x86/xen/xen_msi.c - copied unchanged from r273953, head/sys/x86/xen/xen_msi.c projects/zfsd/head/sys/x86/xen/xen_pci.c - copied unchanged from r273953, head/sys/x86/xen/xen_pci.c projects/zfsd/head/sys/xen/error.h - copied unchanged from r273953, head/sys/xen/error.h projects/zfsd/head/sys/xen/privcmd.h - copied unchanged from r273953, head/sys/xen/privcmd.h projects/zfsd/head/sys/xen/xen_msi.h - copied unchanged from r273953, head/sys/xen/xen_msi.h projects/zfsd/head/tools/build/options/WITHOUT_HYPERV - copied unchanged from r273953, head/tools/build/options/WITHOUT_HYPERV projects/zfsd/head/tools/tools/bootparttest/stub.c - copied unchanged from r273953, head/tools/tools/bootparttest/stub.c projects/zfsd/head/tools/tools/perforce/ - copied from r273953, head/tools/tools/perforce/ projects/zfsd/head/tools/tools/tscdrift/ - copied from r273953, head/tools/tools/tscdrift/ projects/zfsd/head/usr.bin/basename/tests/ - copied from r273953, head/usr.bin/basename/tests/ projects/zfsd/head/usr.bin/cmp/tests/ - copied from r273953, head/usr.bin/cmp/tests/ projects/zfsd/head/usr.bin/cut/tests/ - copied from r273953, head/usr.bin/cut/tests/ projects/zfsd/head/usr.bin/dirname/tests/ - copied from r273953, head/usr.bin/dirname/tests/ projects/zfsd/head/usr.bin/grep/tests/ - copied from r273953, head/usr.bin/grep/tests/ projects/zfsd/head/usr.bin/gzip/tests/ - copied from r273953, head/usr.bin/gzip/tests/ projects/zfsd/head/usr.bin/mkimg/qcow.c - copied unchanged from r273953, head/usr.bin/mkimg/qcow.c projects/zfsd/head/usr.bin/mkimg/tests/ - copied from r273953, head/usr.bin/mkimg/tests/ projects/zfsd/head/usr.bin/timeout/tests/ - copied from r273953, head/usr.bin/timeout/tests/ projects/zfsd/head/usr.bin/xo/ - copied from r273953, head/usr.bin/xo/ projects/zfsd/head/usr.sbin/ctld/chap.c - copied unchanged from r273953, head/usr.sbin/ctld/chap.c projects/zfsd/head/usr.sbin/ctld/isns.c - copied unchanged from r273953, head/usr.sbin/ctld/isns.c projects/zfsd/head/usr.sbin/ctld/isns.h - copied unchanged from r273953, head/usr.sbin/ctld/isns.h projects/zfsd/head/usr.sbin/hyperv/ - copied from r273953, head/usr.sbin/hyperv/ projects/zfsd/head/usr.sbin/iscsid/chap.c - copied unchanged from r273953, head/usr.sbin/iscsid/chap.c projects/zfsd/head/usr.sbin/nmtree/tests/ - copied from r273953, head/usr.sbin/nmtree/tests/ projects/zfsd/head/usr.sbin/pw/tests/ - copied from r273953, head/usr.sbin/pw/tests/ Directory Properties: projects/zfsd/head/sys/amd64/vmm/amd/npt.c (props changed) projects/zfsd/head/sys/amd64/vmm/amd/npt.h (props changed) projects/zfsd/head/sys/amd64/vmm/amd/svm.c (props changed) projects/zfsd/head/sys/amd64/vmm/amd/svm.h (props changed) projects/zfsd/head/sys/amd64/vmm/amd/svm_genassym.c (props changed) projects/zfsd/head/sys/amd64/vmm/amd/svm_msr.c (props changed) projects/zfsd/head/sys/amd64/vmm/amd/svm_msr.h (props changed) projects/zfsd/head/sys/amd64/vmm/amd/svm_softc.h (props changed) projects/zfsd/head/sys/amd64/vmm/amd/svm_support.S (props changed) projects/zfsd/head/sys/amd64/vmm/amd/vmcb.c (props changed) projects/zfsd/head/sys/amd64/vmm/amd/vmcb.h (props changed) Replaced: - copied from r273953, head/sys/gnu/dts/arm/ Directory Properties: projects/zfsd/head/sys/gnu/dts/arm/ (props changed) Deleted: projects/zfsd/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/main.c projects/zfsd/head/contrib/atf/atf-c++/config.cpp projects/zfsd/head/contrib/atf/atf-c++/config.hpp projects/zfsd/head/contrib/atf/atf-c++/config_test.cpp projects/zfsd/head/contrib/atf/atf-c++/detail/sanity_test.cpp projects/zfsd/head/contrib/atf/atf-c/config.c projects/zfsd/head/contrib/atf/atf-c/config.h projects/zfsd/head/contrib/atf/atf-c/config_test.c projects/zfsd/head/contrib/atf/bconfig.h projects/zfsd/head/contrib/openpam/m4/ projects/zfsd/head/contrib/xz/po/ projects/zfsd/head/crypto/openssl/doc/crypto/CMS_sign_add1_signer.pod projects/zfsd/head/etc/rc.d/initrandom projects/zfsd/head/etc/rc.d/kerberos projects/zfsd/head/lib/libc/arm/Symbol_oabi.map projects/zfsd/head/lib/libproc/test/ projects/zfsd/head/secure/lib/libcrypto/man/CMS_sign_add1_signer.3 projects/zfsd/head/share/man/man8/hv_kvp_daemon.8 projects/zfsd/head/sys/amd64/amd64/identcpu.c projects/zfsd/head/sys/amd64/vmm/vmm_msr.c projects/zfsd/head/sys/amd64/vmm/vmm_msr.h projects/zfsd/head/sys/arm/freescale/imx/imx51_iomux.c projects/zfsd/head/sys/arm/freescale/imx/imx51_iomuxreg.h projects/zfsd/head/sys/arm/freescale/imx/imx51_iomuxvar.h projects/zfsd/head/sys/arm/s3c2xx0/ projects/zfsd/head/sys/arm/ti/am335x/files.beaglebone projects/zfsd/head/sys/arm/ti/am335x/std.beaglebone projects/zfsd/head/sys/arm/ti/omap3/ projects/zfsd/head/sys/arm/ti/ti_mmchs.c projects/zfsd/head/sys/arm/ti/ti_mmchs.h projects/zfsd/head/sys/arm/versatile/if_smc_fdt.c projects/zfsd/head/sys/contrib/dev/acpica/compiler/aslcompiler.y projects/zfsd/head/sys/dev/i40e/ projects/zfsd/head/sys/dev/random/harvest.c projects/zfsd/head/sys/dev/random/rwfile.c projects/zfsd/head/sys/dev/random/rwfile.h projects/zfsd/head/sys/i386/i386/identcpu.c projects/zfsd/head/sys/modules/acpi/acpi/ projects/zfsd/head/sys/modules/i40e/ projects/zfsd/head/sys/ofed/drivers/net/mlx4/en_frag.c projects/zfsd/head/sys/ofed/drivers/net/mlx4/en_params.c projects/zfsd/head/sys/ofed/drivers/net/mlx4/xrcd.c projects/zfsd/head/sys/ofed/include/asm/current.h projects/zfsd/head/sys/ofed/include/asm/page.h projects/zfsd/head/sys/ofed/include/asm/semaphore.h projects/zfsd/head/sys/ofed/include/asm/system.h projects/zfsd/head/sys/ofed/include/linux/atomic.h projects/zfsd/head/sys/ofed/include/linux/bitmap.h projects/zfsd/head/sys/ofed/include/linux/ctype.h projects/zfsd/head/sys/ofed/include/linux/ethtool.h projects/zfsd/head/sys/ofed/include/linux/inet.h projects/zfsd/head/sys/ofed/include/linux/init.h projects/zfsd/head/sys/ofed/include/linux/mount.h projects/zfsd/head/sys/ofed/include/linux/rtnetlink.h projects/zfsd/head/sys/ofed/include/linux/stddef.h projects/zfsd/head/sys/ofed/include/net/addrconf.h projects/zfsd/head/sys/ofed/include/net/arp.h projects/zfsd/head/sys/ofed/include/net/ip6_route.h projects/zfsd/head/sys/ofed/include/net/neighbour.h projects/zfsd/head/sys/pc98/cbus/fdc.c projects/zfsd/head/sys/pc98/cbus/fdc_cbus.c projects/zfsd/head/sys/pc98/cbus/fdcreg.h projects/zfsd/head/sys/pc98/cbus/fdcvar.h projects/zfsd/head/sys/pc98/pc98/machdep.c projects/zfsd/head/sys/pci/ projects/zfsd/head/sys/powerpc/powermac/windtunnel.c projects/zfsd/head/sys/xen/evtchn/evtchn_dev.c projects/zfsd/head/sys/xen/xenstore/xenstore.c projects/zfsd/head/sys/xen/xenstore/xenstore_dev.c projects/zfsd/head/tools/build/options/WITHOUT_ARM_EABI projects/zfsd/head/tools/regression/pjdfstest/ projects/zfsd/head/tools/tools/bootparttest/malloc.c projects/zfsd/head/usr.sbin/bhyve/pmtmr.c projects/zfsd/head/usr.sbin/ftp-proxy/Makefile.inc projects/zfsd/head/usr.sbin/ftp-proxy/ftp-proxy/ projects/zfsd/head/usr.sbin/ftp-proxy/libevent/ projects/zfsd/head/usr.sbin/pkg/elf_tables.h Modified: projects/zfsd/head/Makefile.inc1 projects/zfsd/head/ObsoleteFiles.inc projects/zfsd/head/UPDATING projects/zfsd/head/bin/csh/Makefile projects/zfsd/head/bin/dd/dd.1 projects/zfsd/head/bin/pkill/tests/pgrep-j_test.sh projects/zfsd/head/bin/pkill/tests/pkill-j_test.sh projects/zfsd/head/bin/ps/keyword.c projects/zfsd/head/bin/ps/ps.1 projects/zfsd/head/bin/sh/eval.c projects/zfsd/head/bin/sh/expand.c projects/zfsd/head/bin/sh/input.c projects/zfsd/head/bin/sh/input.h projects/zfsd/head/bin/sh/jobs.c projects/zfsd/head/bin/sh/options.c projects/zfsd/head/bin/sh/options.h projects/zfsd/head/bin/sh/parser.c projects/zfsd/head/bin/sh/redir.c projects/zfsd/head/bin/sh/sh.1 projects/zfsd/head/bin/sh/tests/builtins/Makefile projects/zfsd/head/bin/sh/tests/expansion/Makefile projects/zfsd/head/bin/sh/tests/parameters/Makefile projects/zfsd/head/bin/sh/tests/parser/Makefile projects/zfsd/head/bin/sh/trap.c projects/zfsd/head/bin/sleep/Makefile projects/zfsd/head/cddl/Makefile.inc projects/zfsd/head/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 projects/zfsd/head/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c projects/zfsd/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak2.c projects/zfsd/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/err.invalidtype.ksh projects/zfsd/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/err.invalidtype2.ksh projects/zfsd/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/err.user64mode.ksh projects/zfsd/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.aouttype.ksh projects/zfsd/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.chasestrings.ksh projects/zfsd/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.libtype.ksh projects/zfsd/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.pidprint.ksh projects/zfsd/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.pidprinttarg.ksh projects/zfsd/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.printtype.ksh projects/zfsd/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.printtypetarg.ksh projects/zfsd/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.userlandkey.ksh projects/zfsd/head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.userstrings.ksh projects/zfsd/head/cddl/contrib/opensolaris/cmd/lockstat/lockstat.1 projects/zfsd/head/cddl/contrib/opensolaris/cmd/zdb/zdb.c projects/zfsd/head/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7 projects/zfsd/head/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c projects/zfsd/head/cddl/contrib/opensolaris/cmd/zpool/zpool_vdev.c projects/zfsd/head/cddl/contrib/opensolaris/head/libintl.h projects/zfsd/head/cddl/contrib/opensolaris/head/nlist.h projects/zfsd/head/cddl/contrib/opensolaris/head/synch.h projects/zfsd/head/cddl/contrib/opensolaris/head/thread.h projects/zfsd/head/cddl/contrib/opensolaris/lib/libctf/common/ctf_lib.c projects/zfsd/head/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c projects/zfsd/head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_grammar.y projects/zfsd/head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h projects/zfsd/head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c projects/zfsd/head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c projects/zfsd/head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c projects/zfsd/head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pragma.c projects/zfsd/head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_print.c projects/zfsd/head/cddl/contrib/opensolaris/lib/libgen/common/gmatch.c projects/zfsd/head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c projects/zfsd/head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c projects/zfsd/head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c projects/zfsd/head/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c projects/zfsd/head/cddl/lib/libdtrace/libproc_compat.h projects/zfsd/head/cddl/lib/libdtrace/tcp.d projects/zfsd/head/cddl/lib/libzfs/Makefile projects/zfsd/head/cddl/lib/libzpool/Makefile projects/zfsd/head/cddl/usr.sbin/Makefile projects/zfsd/head/contrib/apr-util/CHANGES projects/zfsd/head/contrib/apr-util/NOTICE projects/zfsd/head/contrib/apr-util/apr-util.spec projects/zfsd/head/contrib/apr-util/configure projects/zfsd/head/contrib/apr-util/crypto/apr_crypto.c projects/zfsd/head/contrib/apr-util/crypto/apr_passwd.c projects/zfsd/head/contrib/apr-util/dbd/apr_dbd_mysql.c projects/zfsd/head/contrib/apr-util/dbd/apr_dbd_odbc.c projects/zfsd/head/contrib/apr-util/dbm/NWGNUmakefile projects/zfsd/head/contrib/apr-util/include/apu_version.h projects/zfsd/head/contrib/apr-util/test/Makefile.win projects/zfsd/head/contrib/atf/FREEBSD-Xlist projects/zfsd/head/contrib/atf/FREEBSD-upgrade projects/zfsd/head/contrib/atf/NEWS projects/zfsd/head/contrib/atf/atf-c++.hpp projects/zfsd/head/contrib/atf/atf-c++/Kyuafile projects/zfsd/head/contrib/atf/atf-c++/atf-c++-api.3 projects/zfsd/head/contrib/atf/atf-c++/atf_c++_test.cpp projects/zfsd/head/contrib/atf/atf-c++/build.cpp projects/zfsd/head/contrib/atf/atf-c++/build.hpp projects/zfsd/head/contrib/atf/atf-c++/build_test.cpp projects/zfsd/head/contrib/atf/atf-c++/check.cpp projects/zfsd/head/contrib/atf/atf-c++/check.hpp projects/zfsd/head/contrib/atf/atf-c++/check_test.cpp projects/zfsd/head/contrib/atf/atf-c++/detail/Kyuafile projects/zfsd/head/contrib/atf/atf-c++/detail/application.cpp projects/zfsd/head/contrib/atf/atf-c++/detail/application.hpp projects/zfsd/head/contrib/atf/atf-c++/detail/application_test.cpp projects/zfsd/head/contrib/atf/atf-c++/detail/auto_array.hpp projects/zfsd/head/contrib/atf/atf-c++/detail/auto_array_test.cpp projects/zfsd/head/contrib/atf/atf-c++/detail/env.cpp projects/zfsd/head/contrib/atf/atf-c++/detail/env.hpp projects/zfsd/head/contrib/atf/atf-c++/detail/env_test.cpp projects/zfsd/head/contrib/atf/atf-c++/detail/exceptions.cpp projects/zfsd/head/contrib/atf/atf-c++/detail/exceptions.hpp projects/zfsd/head/contrib/atf/atf-c++/detail/exceptions_test.cpp projects/zfsd/head/contrib/atf/atf-c++/detail/fs.cpp projects/zfsd/head/contrib/atf/atf-c++/detail/fs.hpp projects/zfsd/head/contrib/atf/atf-c++/detail/fs_test.cpp projects/zfsd/head/contrib/atf/atf-c++/detail/process.cpp projects/zfsd/head/contrib/atf/atf-c++/detail/process.hpp projects/zfsd/head/contrib/atf/atf-c++/detail/process_test.cpp projects/zfsd/head/contrib/atf/atf-c++/detail/sanity.hpp projects/zfsd/head/contrib/atf/atf-c++/detail/test_helpers.cpp projects/zfsd/head/contrib/atf/atf-c++/detail/test_helpers.hpp projects/zfsd/head/contrib/atf/atf-c++/detail/text.cpp projects/zfsd/head/contrib/atf/atf-c++/detail/text.hpp projects/zfsd/head/contrib/atf/atf-c++/detail/text_test.cpp projects/zfsd/head/contrib/atf/atf-c++/detail/version_helper.cpp projects/zfsd/head/contrib/atf/atf-c++/macros.hpp projects/zfsd/head/contrib/atf/atf-c++/macros_hpp_test.cpp projects/zfsd/head/contrib/atf/atf-c++/macros_test.cpp projects/zfsd/head/contrib/atf/atf-c++/pkg_config_test.sh projects/zfsd/head/contrib/atf/atf-c++/tests.cpp projects/zfsd/head/contrib/atf/atf-c++/tests.hpp projects/zfsd/head/contrib/atf/atf-c++/tests_test.cpp projects/zfsd/head/contrib/atf/atf-c++/unused_test.cpp projects/zfsd/head/contrib/atf/atf-c++/utils.cpp projects/zfsd/head/contrib/atf/atf-c++/utils.hpp projects/zfsd/head/contrib/atf/atf-c++/utils_test.cpp projects/zfsd/head/contrib/atf/atf-c.h projects/zfsd/head/contrib/atf/atf-c/Kyuafile projects/zfsd/head/contrib/atf/atf-c/atf-c-api.3 projects/zfsd/head/contrib/atf/atf-c/atf_c_test.c projects/zfsd/head/contrib/atf/atf-c/build.c projects/zfsd/head/contrib/atf/atf-c/build.h projects/zfsd/head/contrib/atf/atf-c/build_test.c projects/zfsd/head/contrib/atf/atf-c/check.c projects/zfsd/head/contrib/atf/atf-c/check.h projects/zfsd/head/contrib/atf/atf-c/check_test.c projects/zfsd/head/contrib/atf/atf-c/defs.h.in projects/zfsd/head/contrib/atf/atf-c/detail/dynstr.c projects/zfsd/head/contrib/atf/atf-c/detail/dynstr.h projects/zfsd/head/contrib/atf/atf-c/detail/dynstr_test.c projects/zfsd/head/contrib/atf/atf-c/detail/env.c projects/zfsd/head/contrib/atf/atf-c/detail/env.h projects/zfsd/head/contrib/atf/atf-c/detail/env_test.c projects/zfsd/head/contrib/atf/atf-c/detail/fs.c projects/zfsd/head/contrib/atf/atf-c/detail/fs.h projects/zfsd/head/contrib/atf/atf-c/detail/fs_test.c projects/zfsd/head/contrib/atf/atf-c/detail/list.c projects/zfsd/head/contrib/atf/atf-c/detail/list.h projects/zfsd/head/contrib/atf/atf-c/detail/list_test.c projects/zfsd/head/contrib/atf/atf-c/detail/map.c projects/zfsd/head/contrib/atf/atf-c/detail/map.h projects/zfsd/head/contrib/atf/atf-c/detail/map_test.c projects/zfsd/head/contrib/atf/atf-c/detail/process.c projects/zfsd/head/contrib/atf/atf-c/detail/process.h projects/zfsd/head/contrib/atf/atf-c/detail/process_helpers.c projects/zfsd/head/contrib/atf/atf-c/detail/process_test.c projects/zfsd/head/contrib/atf/atf-c/detail/sanity.c projects/zfsd/head/contrib/atf/atf-c/detail/sanity.h projects/zfsd/head/contrib/atf/atf-c/detail/sanity_test.c projects/zfsd/head/contrib/atf/atf-c/detail/test_helpers.c projects/zfsd/head/contrib/atf/atf-c/detail/test_helpers.h projects/zfsd/head/contrib/atf/atf-c/detail/text.c projects/zfsd/head/contrib/atf/atf-c/detail/text.h projects/zfsd/head/contrib/atf/atf-c/detail/text_test.c projects/zfsd/head/contrib/atf/atf-c/detail/tp_main.c projects/zfsd/head/contrib/atf/atf-c/detail/user.c projects/zfsd/head/contrib/atf/atf-c/detail/user.h projects/zfsd/head/contrib/atf/atf-c/detail/user_test.c projects/zfsd/head/contrib/atf/atf-c/detail/version_helper.c projects/zfsd/head/contrib/atf/atf-c/error.c projects/zfsd/head/contrib/atf/atf-c/error.h projects/zfsd/head/contrib/atf/atf-c/error_fwd.h projects/zfsd/head/contrib/atf/atf-c/error_test.c projects/zfsd/head/contrib/atf/atf-c/h_build.h projects/zfsd/head/contrib/atf/atf-c/macros.h projects/zfsd/head/contrib/atf/atf-c/macros_h_test.c projects/zfsd/head/contrib/atf/atf-c/macros_test.c projects/zfsd/head/contrib/atf/atf-c/pkg_config_test.sh projects/zfsd/head/contrib/atf/atf-c/tc.c projects/zfsd/head/contrib/atf/atf-c/tc.h projects/zfsd/head/contrib/atf/atf-c/tc_test.c projects/zfsd/head/contrib/atf/atf-c/tp.c projects/zfsd/head/contrib/atf/atf-c/tp.h projects/zfsd/head/contrib/atf/atf-c/tp_test.c projects/zfsd/head/contrib/atf/atf-c/unused_test.c projects/zfsd/head/contrib/atf/atf-c/utils.c projects/zfsd/head/contrib/atf/atf-c/utils.h projects/zfsd/head/contrib/atf/atf-c/utils_test.c projects/zfsd/head/contrib/atf/atf-sh/atf-check.1 projects/zfsd/head/contrib/atf/atf-sh/atf-check.cpp projects/zfsd/head/contrib/atf/atf-sh/atf-check_test.sh projects/zfsd/head/contrib/atf/atf-sh/atf-sh-api.3 projects/zfsd/head/contrib/atf/atf-sh/atf-sh.1 projects/zfsd/head/contrib/atf/atf-sh/atf-sh.cpp projects/zfsd/head/contrib/atf/atf-sh/atf_check_test.sh projects/zfsd/head/contrib/atf/atf-sh/config_test.sh projects/zfsd/head/contrib/atf/atf-sh/integration_test.sh projects/zfsd/head/contrib/atf/atf-sh/libatf-sh.subr projects/zfsd/head/contrib/atf/atf-sh/misc_helpers.sh projects/zfsd/head/contrib/atf/atf-sh/normalize_test.sh projects/zfsd/head/contrib/atf/atf-sh/tc_test.sh projects/zfsd/head/contrib/atf/atf-sh/tp_test.sh projects/zfsd/head/contrib/atf/doc/atf-test-case.4 projects/zfsd/head/contrib/atf/doc/atf-test-program.1 projects/zfsd/head/contrib/atf/test-programs/c_helpers.c projects/zfsd/head/contrib/atf/test-programs/common.sh projects/zfsd/head/contrib/atf/test-programs/config_test.sh projects/zfsd/head/contrib/atf/test-programs/cpp_helpers.cpp projects/zfsd/head/contrib/atf/test-programs/expect_test.sh projects/zfsd/head/contrib/atf/test-programs/meta_data_test.sh projects/zfsd/head/contrib/atf/test-programs/result_test.sh projects/zfsd/head/contrib/atf/test-programs/sh_helpers.sh projects/zfsd/head/contrib/atf/test-programs/srcdir_test.sh projects/zfsd/head/contrib/binutils/bfd/config.bfd projects/zfsd/head/contrib/binutils/bfd/elf32-arm.c projects/zfsd/head/contrib/binutils/bfd/elf32-ppc.c projects/zfsd/head/contrib/binutils/bfd/elf64-ppc.c projects/zfsd/head/contrib/binutils/gas/config/tc-arm.c projects/zfsd/head/contrib/binutils/gas/config/tc-ppc.c projects/zfsd/head/contrib/binutils/include/elf/arm.h projects/zfsd/head/contrib/binutils/ld/emulparams/elf32ppc_fbsd.sh projects/zfsd/head/contrib/binutils/ld/emulparams/elf64ppc_fbsd.sh projects/zfsd/head/contrib/binutils/ld/emultempl/elf32.em projects/zfsd/head/contrib/bsnmp/snmp_target/target_snmp.c projects/zfsd/head/contrib/byacc/CHANGES projects/zfsd/head/contrib/byacc/MANIFEST projects/zfsd/head/contrib/byacc/VERSION projects/zfsd/head/contrib/byacc/aclocal.m4 projects/zfsd/head/contrib/byacc/btyaccpar.c projects/zfsd/head/contrib/byacc/closure.c projects/zfsd/head/contrib/byacc/config.sub projects/zfsd/head/contrib/byacc/configure projects/zfsd/head/contrib/byacc/configure.in projects/zfsd/head/contrib/byacc/defs.h projects/zfsd/head/contrib/byacc/lalr.c projects/zfsd/head/contrib/byacc/main.c projects/zfsd/head/contrib/byacc/output.c projects/zfsd/head/contrib/byacc/package/byacc.spec projects/zfsd/head/contrib/byacc/package/debian/changelog projects/zfsd/head/contrib/byacc/package/debian/source/format projects/zfsd/head/contrib/byacc/package/mingw-byacc.spec projects/zfsd/head/contrib/byacc/package/pkgsrc/Makefile projects/zfsd/head/contrib/byacc/reader.c projects/zfsd/head/contrib/byacc/test/btyacc/btyacc_calc1.tab.c projects/zfsd/head/contrib/byacc/test/btyacc/btyacc_demo.tab.c projects/zfsd/head/contrib/byacc/test/btyacc/calc.tab.c projects/zfsd/head/contrib/byacc/test/btyacc/calc1.tab.c projects/zfsd/head/contrib/byacc/test/btyacc/calc2.tab.c projects/zfsd/head/contrib/byacc/test/btyacc/calc3.tab.c projects/zfsd/head/contrib/byacc/test/btyacc/code_calc.code.c projects/zfsd/head/contrib/byacc/test/btyacc/code_calc.tab.c projects/zfsd/head/contrib/byacc/test/btyacc/code_error.code.c projects/zfsd/head/contrib/byacc/test/btyacc/code_error.tab.c projects/zfsd/head/contrib/byacc/test/btyacc/empty.tab.c projects/zfsd/head/contrib/byacc/test/btyacc/err_inherit1.tab.c projects/zfsd/head/contrib/byacc/test/btyacc/err_inherit2.tab.c projects/zfsd/head/contrib/byacc/test/btyacc/err_inherit3.tab.c projects/zfsd/head/contrib/byacc/test/btyacc/err_inherit4.tab.c projects/zfsd/head/contrib/byacc/test/btyacc/err_inherit5.tab.c projects/zfsd/head/contrib/byacc/test/btyacc/err_syntax1.tab.c projects/zfsd/head/contrib/byacc/test/btyacc/err_syntax10.tab.c projects/zfsd/head/contrib/byacc/test/btyacc/err_syntax11.tab.c projects/zfsd/head/contrib/byacc/test/btyacc/err_syntax12.tab.c projects/zfsd/head/contrib/byacc/test/btyacc/err_syntax13.tab.c projects/zfsd/head/contrib/byacc/test/btyacc/err_syntax14.tab.c projects/zfsd/head/contrib/byacc/test/btyacc/err_syntax15.tab.c projects/zfsd/head/contrib/byacc/test/btyacc/err_syntax16.tab.c projects/zfsd/head/contrib/byacc/test/btyacc/err_syntax17.tab.c projects/zfsd/head/contrib/byacc/test/btyacc/err_syntax18.tab.c projects/zfsd/head/contrib/byacc/test/btyacc/err_syntax19.tab.c projects/zfsd/head/contrib/byacc/test/btyacc/err_syntax2.tab.c projects/zfsd/head/contrib/byacc/test/btyacc/err_syntax20.tab.c projects/zfsd/head/contrib/byacc/test/btyacc/err_syntax21.tab.c projects/zfsd/head/contrib/byacc/test/btyacc/err_syntax22.tab.c projects/zfsd/head/contrib/byacc/test/btyacc/err_syntax23.tab.c projects/zfsd/head/contrib/byacc/test/btyacc/err_syntax24.tab.c projects/zfsd/head/contrib/byacc/test/btyacc/err_syntax25.tab.c projects/zfsd/head/contrib/byacc/test/btyacc/err_syntax26.tab.c projects/zfsd/head/contrib/byacc/test/btyacc/err_syntax27.tab.c projects/zfsd/head/contrib/byacc/test/btyacc/err_syntax3.tab.c projects/zfsd/head/contrib/byacc/test/btyacc/err_syntax4.tab.c projects/zfsd/head/contrib/byacc/test/btyacc/err_syntax5.tab.c projects/zfsd/head/contrib/byacc/test/btyacc/err_syntax6.tab.c projects/zfsd/head/contrib/byacc/test/btyacc/err_syntax7.tab.c projects/zfsd/head/contrib/byacc/test/btyacc/err_syntax7a.tab.c projects/zfsd/head/contrib/byacc/test/btyacc/err_syntax7b.tab.c projects/zfsd/head/contrib/byacc/test/btyacc/err_syntax8.tab.c projects/zfsd/head/contrib/byacc/test/btyacc/err_syntax8a.tab.c projects/zfsd/head/contrib/byacc/test/btyacc/err_syntax9.tab.c projects/zfsd/head/contrib/byacc/test/btyacc/error.tab.c projects/zfsd/head/contrib/byacc/test/btyacc/grammar.tab.c projects/zfsd/head/contrib/byacc/test/btyacc/inherit0.tab.c projects/zfsd/head/contrib/byacc/test/btyacc/inherit1.tab.c projects/zfsd/head/contrib/byacc/test/btyacc/inherit2.tab.c projects/zfsd/head/contrib/byacc/test/btyacc/ok_syntax1.tab.c projects/zfsd/head/contrib/byacc/test/btyacc/pure_calc.tab.c projects/zfsd/head/contrib/byacc/test/btyacc/pure_error.tab.c projects/zfsd/head/contrib/byacc/test/btyacc/quote_calc-s.tab.c projects/zfsd/head/contrib/byacc/test/btyacc/quote_calc.tab.c projects/zfsd/head/contrib/byacc/test/btyacc/quote_calc2-s.tab.c projects/zfsd/head/contrib/byacc/test/btyacc/quote_calc2.tab.c projects/zfsd/head/contrib/byacc/test/btyacc/quote_calc3-s.tab.c projects/zfsd/head/contrib/byacc/test/btyacc/quote_calc3.tab.c projects/zfsd/head/contrib/byacc/test/btyacc/quote_calc4-s.tab.c projects/zfsd/head/contrib/byacc/test/btyacc/quote_calc4.tab.c projects/zfsd/head/contrib/byacc/test/btyacc/rename_debug.c projects/zfsd/head/contrib/byacc/test/btyacc/varsyntax_calc1.tab.c projects/zfsd/head/contrib/byacc/test/yacc/calc2.tab.c projects/zfsd/head/contrib/byacc/test/yacc/calc3.tab.c projects/zfsd/head/contrib/byacc/test/yacc/ok_syntax1.tab.c projects/zfsd/head/contrib/byacc/yacc.1 projects/zfsd/head/contrib/elftoolchain/libelf/libelf_align.c projects/zfsd/head/contrib/elftoolchain/libelf/libelf_convert.m4 projects/zfsd/head/contrib/file/magic/Magdir/filesystems projects/zfsd/head/contrib/ipfilter/lib/gethost.c projects/zfsd/head/contrib/ipfilter/lib/printnat.c projects/zfsd/head/contrib/ipfilter/tools/ipf_y.y projects/zfsd/head/contrib/ipfilter/tools/ipnat_y.y projects/zfsd/head/contrib/libarchive/tar/util.c projects/zfsd/head/contrib/libc++/include/__config projects/zfsd/head/contrib/libc++/include/type_traits projects/zfsd/head/contrib/libc++/src/new.cpp projects/zfsd/head/contrib/libc-vis/vis.c projects/zfsd/head/contrib/libcxxrt/auxhelper.cc projects/zfsd/head/contrib/libcxxrt/stdexcept.cc projects/zfsd/head/contrib/libcxxrt/stdexcept.h projects/zfsd/head/contrib/libpcap/inet.c projects/zfsd/head/contrib/libpcap/pcap.c projects/zfsd/head/contrib/llvm/lib/Target/ARM/ARMInstrInfo.td projects/zfsd/head/contrib/llvm/lib/Target/X86/X86ISelLowering.cpp projects/zfsd/head/contrib/llvm/patches/patch-r270147-llvm-r197824-r213427-r213960.diff projects/zfsd/head/contrib/llvm/tools/clang/lib/CodeGen/CGDebugInfo.cpp projects/zfsd/head/contrib/mtree/create.c projects/zfsd/head/contrib/mtree/extern.h projects/zfsd/head/contrib/mtree/getid.c projects/zfsd/head/contrib/mtree/mtree.c projects/zfsd/head/contrib/mtree/spec.c projects/zfsd/head/contrib/netcat/netcat.c projects/zfsd/head/contrib/ofed/libibverbs/examples/asyncwatch.c projects/zfsd/head/contrib/ofed/libibverbs/examples/device_list.c projects/zfsd/head/contrib/ofed/libibverbs/examples/devinfo.c projects/zfsd/head/contrib/ofed/libmlx4/src/mlx4-abi.h projects/zfsd/head/contrib/ofed/librdmacm/examples/rping.c projects/zfsd/head/contrib/ofed/usr.lib/Makefile projects/zfsd/head/contrib/ofed/usr.lib/Makefile.inc projects/zfsd/head/contrib/one-true-awk/awk.1 projects/zfsd/head/contrib/one-true-awk/main.c projects/zfsd/head/contrib/one-true-awk/run.c projects/zfsd/head/contrib/openbsm/bin/auditdistd/sender.c projects/zfsd/head/contrib/openbsm/bin/auditdistd/subr.c projects/zfsd/head/contrib/openpam/CREDITS (contents, props changed) projects/zfsd/head/contrib/openpam/HISTORY (contents, props changed) projects/zfsd/head/contrib/openpam/INSTALL (contents, props changed) projects/zfsd/head/contrib/openpam/LICENSE (contents, props changed) projects/zfsd/head/contrib/openpam/Makefile.am (contents, props changed) projects/zfsd/head/contrib/openpam/Makefile.in (contents, props changed) projects/zfsd/head/contrib/openpam/README (contents, props changed) projects/zfsd/head/contrib/openpam/RELNOTES (contents, props changed) projects/zfsd/head/contrib/openpam/TODO projects/zfsd/head/contrib/openpam/aclocal.m4 (contents, props changed) projects/zfsd/head/contrib/openpam/autogen.sh (contents, props changed) projects/zfsd/head/contrib/openpam/bin/Makefile.in (contents, props changed) projects/zfsd/head/contrib/openpam/bin/openpam_dump_policy/Makefile.in projects/zfsd/head/contrib/openpam/bin/openpam_dump_policy/openpam_dump_policy.c projects/zfsd/head/contrib/openpam/bin/pamtest/Makefile.in projects/zfsd/head/contrib/openpam/bin/pamtest/pamtest.1 projects/zfsd/head/contrib/openpam/bin/su/Makefile.in (contents, props changed) projects/zfsd/head/contrib/openpam/bin/su/su.1 projects/zfsd/head/contrib/openpam/config.h.in (contents, props changed) projects/zfsd/head/contrib/openpam/configure (contents, props changed) projects/zfsd/head/contrib/openpam/configure.ac (contents, props changed) projects/zfsd/head/contrib/openpam/doc/Makefile.in (contents, props changed) projects/zfsd/head/contrib/openpam/doc/man/Makefile.in (contents, props changed) projects/zfsd/head/contrib/openpam/doc/man/openpam.3 (contents, props changed) projects/zfsd/head/contrib/openpam/doc/man/openpam_borrow_cred.3 (contents, props changed) projects/zfsd/head/contrib/openpam/doc/man/openpam_free_data.3 (contents, props changed) projects/zfsd/head/contrib/openpam/doc/man/openpam_free_envlist.3 (contents, props changed) projects/zfsd/head/contrib/openpam/doc/man/openpam_get_feature.3 projects/zfsd/head/contrib/openpam/doc/man/openpam_get_option.3 (contents, props changed) projects/zfsd/head/contrib/openpam/doc/man/openpam_log.3 (contents, props changed) projects/zfsd/head/contrib/openpam/doc/man/openpam_nullconv.3 (contents, props changed) projects/zfsd/head/contrib/openpam/doc/man/openpam_readline.3 (contents, props changed) projects/zfsd/head/contrib/openpam/doc/man/openpam_readlinev.3 projects/zfsd/head/contrib/openpam/doc/man/openpam_readword.3 projects/zfsd/head/contrib/openpam/doc/man/openpam_restore_cred.3 (contents, props changed) projects/zfsd/head/contrib/openpam/doc/man/openpam_set_feature.3 projects/zfsd/head/contrib/openpam/doc/man/openpam_set_option.3 (contents, props changed) projects/zfsd/head/contrib/openpam/doc/man/openpam_straddch.3 projects/zfsd/head/contrib/openpam/doc/man/openpam_subst.3 projects/zfsd/head/contrib/openpam/doc/man/openpam_ttyconv.3 (contents, props changed) projects/zfsd/head/contrib/openpam/doc/man/pam.3 (contents, props changed) projects/zfsd/head/contrib/openpam/doc/man/pam.conf.5 (contents, props changed) projects/zfsd/head/contrib/openpam/doc/man/pam_acct_mgmt.3 (contents, props changed) projects/zfsd/head/contrib/openpam/doc/man/pam_authenticate.3 (contents, props changed) projects/zfsd/head/contrib/openpam/doc/man/pam_chauthtok.3 (contents, props changed) projects/zfsd/head/contrib/openpam/doc/man/pam_close_session.3 (contents, props changed) projects/zfsd/head/contrib/openpam/doc/man/pam_conv.3 (contents, props changed) projects/zfsd/head/contrib/openpam/doc/man/pam_end.3 (contents, props changed) projects/zfsd/head/contrib/openpam/doc/man/pam_error.3 (contents, props changed) projects/zfsd/head/contrib/openpam/doc/man/pam_get_authtok.3 (contents, props changed) projects/zfsd/head/contrib/openpam/doc/man/pam_get_data.3 (contents, props changed) projects/zfsd/head/contrib/openpam/doc/man/pam_get_item.3 (contents, props changed) projects/zfsd/head/contrib/openpam/doc/man/pam_get_user.3 (contents, props changed) projects/zfsd/head/contrib/openpam/doc/man/pam_getenv.3 (contents, props changed) projects/zfsd/head/contrib/openpam/doc/man/pam_getenvlist.3 (contents, props changed) projects/zfsd/head/contrib/openpam/doc/man/pam_info.3 (contents, props changed) projects/zfsd/head/contrib/openpam/doc/man/pam_open_session.3 (contents, props changed) projects/zfsd/head/contrib/openpam/doc/man/pam_prompt.3 (contents, props changed) projects/zfsd/head/contrib/openpam/doc/man/pam_putenv.3 (contents, props changed) projects/zfsd/head/contrib/openpam/doc/man/pam_set_data.3 (contents, props changed) projects/zfsd/head/contrib/openpam/doc/man/pam_set_item.3 (contents, props changed) projects/zfsd/head/contrib/openpam/doc/man/pam_setcred.3 (contents, props changed) projects/zfsd/head/contrib/openpam/doc/man/pam_setenv.3 (contents, props changed) projects/zfsd/head/contrib/openpam/doc/man/pam_sm_acct_mgmt.3 (contents, props changed) projects/zfsd/head/contrib/openpam/doc/man/pam_sm_authenticate.3 (contents, props changed) projects/zfsd/head/contrib/openpam/doc/man/pam_sm_chauthtok.3 (contents, props changed) projects/zfsd/head/contrib/openpam/doc/man/pam_sm_close_session.3 (contents, props changed) projects/zfsd/head/contrib/openpam/doc/man/pam_sm_open_session.3 (contents, props changed) projects/zfsd/head/contrib/openpam/doc/man/pam_sm_setcred.3 (contents, props changed) projects/zfsd/head/contrib/openpam/doc/man/pam_start.3 (contents, props changed) projects/zfsd/head/contrib/openpam/doc/man/pam_strerror.3 (contents, props changed) projects/zfsd/head/contrib/openpam/doc/man/pam_verror.3 (contents, props changed) projects/zfsd/head/contrib/openpam/doc/man/pam_vinfo.3 (contents, props changed) projects/zfsd/head/contrib/openpam/doc/man/pam_vprompt.3 (contents, props changed) projects/zfsd/head/contrib/openpam/include/Makefile.in (contents, props changed) projects/zfsd/head/contrib/openpam/include/security/Makefile.in (contents, props changed) projects/zfsd/head/contrib/openpam/include/security/openpam_version.h (contents, props changed) projects/zfsd/head/contrib/openpam/lib/Makefile.am projects/zfsd/head/contrib/openpam/lib/Makefile.in projects/zfsd/head/contrib/openpam/lib/libpam/Makefile.am projects/zfsd/head/contrib/openpam/lib/libpam/Makefile.in projects/zfsd/head/contrib/openpam/lib/libpam/openpam_configure.c projects/zfsd/head/contrib/openpam/lib/libpam/openpam_ctype.h projects/zfsd/head/contrib/openpam/lib/libpam/openpam_dispatch.c projects/zfsd/head/contrib/openpam/lib/libpam/openpam_readword.c projects/zfsd/head/contrib/openpam/lib/libpam/openpam_ttyconv.c projects/zfsd/head/contrib/openpam/lib/libpam/pam_get_authtok.c projects/zfsd/head/contrib/openpam/ltmain.sh (contents, props changed) projects/zfsd/head/contrib/openpam/mkpkgng.in projects/zfsd/head/contrib/openpam/modules/Makefile.in (contents, props changed) projects/zfsd/head/contrib/openpam/modules/pam_deny/Makefile.in (contents, props changed) projects/zfsd/head/contrib/openpam/modules/pam_permit/Makefile.in (contents, props changed) projects/zfsd/head/contrib/openpam/modules/pam_unix/Makefile.in (contents, props changed) projects/zfsd/head/contrib/openpam/pamgdb.in projects/zfsd/head/contrib/openpam/t/Makefile.am projects/zfsd/head/contrib/openpam/t/Makefile.in projects/zfsd/head/contrib/smbfs/lib/smb/ctx.c projects/zfsd/head/contrib/smbfs/mount_smbfs/mount_smbfs.c projects/zfsd/head/contrib/tcp_wrappers/inetcf.h projects/zfsd/head/contrib/tcp_wrappers/mystdarg.h projects/zfsd/head/contrib/tcp_wrappers/tcpd.h projects/zfsd/head/contrib/tcp_wrappers/tli-sequent.h projects/zfsd/head/contrib/tcpdump/tcpdump.c projects/zfsd/head/contrib/tzdata/africa projects/zfsd/head/contrib/tzdata/antarctica projects/zfsd/head/contrib/tzdata/asia projects/zfsd/head/contrib/tzdata/australasia projects/zfsd/head/contrib/tzdata/backward projects/zfsd/head/contrib/tzdata/etcetera projects/zfsd/head/contrib/tzdata/europe projects/zfsd/head/contrib/tzdata/factory projects/zfsd/head/contrib/tzdata/leap-seconds.list projects/zfsd/head/contrib/tzdata/northamerica projects/zfsd/head/contrib/tzdata/pacificnew projects/zfsd/head/contrib/tzdata/southamerica projects/zfsd/head/contrib/tzdata/systemv projects/zfsd/head/contrib/tzdata/yearistype.sh projects/zfsd/head/contrib/tzdata/zone.tab projects/zfsd/head/contrib/xz/ChangeLog projects/zfsd/head/contrib/xz/FREEBSD-Xlist projects/zfsd/head/contrib/xz/THANKS projects/zfsd/head/contrib/xz/TODO projects/zfsd/head/contrib/xz/src/liblzma/api/lzma/block.h projects/zfsd/head/contrib/xz/src/liblzma/api/lzma/version.h projects/zfsd/head/contrib/xz/src/liblzma/check/crc32_fast.c projects/zfsd/head/contrib/xz/src/liblzma/check/sha256.c projects/zfsd/head/contrib/xz/src/liblzma/lzma/lzma_encoder_presets.c projects/zfsd/head/contrib/xz/src/xz/coder.c projects/zfsd/head/contrib/xz/src/xz/signals.c projects/zfsd/head/contrib/xz/src/xz/suffix.c projects/zfsd/head/crypto/heimdal/tools/krb5-config.in projects/zfsd/head/crypto/openssl/CHANGES projects/zfsd/head/crypto/openssl/Configure projects/zfsd/head/crypto/openssl/Makefile projects/zfsd/head/crypto/openssl/NEWS projects/zfsd/head/crypto/openssl/README projects/zfsd/head/crypto/openssl/apps/s_client.c projects/zfsd/head/crypto/openssl/crypto/Makefile projects/zfsd/head/crypto/openssl/crypto/aes/asm/aesni-x86_64.pl projects/zfsd/head/crypto/openssl/crypto/asn1/a_strex.c projects/zfsd/head/crypto/openssl/crypto/bn/asm/x86_64-gcc.c projects/zfsd/head/crypto/openssl/crypto/bn/bn_exp.c projects/zfsd/head/crypto/openssl/crypto/bn/bn_nist.c projects/zfsd/head/crypto/openssl/crypto/bn/exptest.c projects/zfsd/head/crypto/openssl/crypto/dsa/dsa_ameth.c projects/zfsd/head/crypto/openssl/crypto/ebcdic.h projects/zfsd/head/crypto/openssl/crypto/ec/ec.h projects/zfsd/head/crypto/openssl/crypto/ec/ec2_smpl.c projects/zfsd/head/crypto/openssl/crypto/ec/ec_ameth.c projects/zfsd/head/crypto/openssl/crypto/ec/ec_asn1.c projects/zfsd/head/crypto/openssl/crypto/ec/ecp_mont.c projects/zfsd/head/crypto/openssl/crypto/ec/ecp_nist.c projects/zfsd/head/crypto/openssl/crypto/ec/ecp_smpl.c projects/zfsd/head/crypto/openssl/crypto/ec/ectest.c projects/zfsd/head/crypto/openssl/crypto/evp/Makefile projects/zfsd/head/crypto/openssl/crypto/evp/e_aes.c projects/zfsd/head/crypto/openssl/crypto/evp/evp_enc.c projects/zfsd/head/crypto/openssl/crypto/md5/asm/md5-x86_64.pl projects/zfsd/head/crypto/openssl/crypto/modes/modes.h projects/zfsd/head/crypto/openssl/crypto/ocsp/ocsp_vfy.c projects/zfsd/head/crypto/openssl/crypto/opensslconf.h projects/zfsd/head/crypto/openssl/crypto/opensslv.h projects/zfsd/head/crypto/openssl/crypto/ossl_typ.h projects/zfsd/head/crypto/openssl/crypto/pkcs7/pkcs7.h projects/zfsd/head/crypto/openssl/crypto/pqueue/pqueue.h projects/zfsd/head/crypto/openssl/crypto/rsa/Makefile projects/zfsd/head/crypto/openssl/crypto/rsa/rsa.h projects/zfsd/head/crypto/openssl/crypto/rsa/rsa_err.c projects/zfsd/head/crypto/openssl/crypto/rsa/rsa_oaep.c projects/zfsd/head/crypto/openssl/crypto/rsa/rsa_pk1.c projects/zfsd/head/crypto/openssl/crypto/rsa/rsa_sign.c projects/zfsd/head/crypto/openssl/crypto/stack/safestack.h projects/zfsd/head/crypto/openssl/doc/apps/dgst.pod projects/zfsd/head/crypto/openssl/doc/crypto/BIO_s_accept.pod projects/zfsd/head/crypto/openssl/doc/crypto/EVP_DigestInit.pod projects/zfsd/head/crypto/openssl/doc/crypto/EVP_DigestVerifyInit.pod projects/zfsd/head/crypto/openssl/doc/crypto/EVP_EncryptInit.pod projects/zfsd/head/crypto/openssl/doc/crypto/EVP_PKEY_set1_RSA.pod projects/zfsd/head/crypto/openssl/doc/crypto/EVP_PKEY_sign.pod projects/zfsd/head/crypto/openssl/doc/ssl/SSL_CTX_set_tmp_dh_callback.pod projects/zfsd/head/crypto/openssl/e_os.h projects/zfsd/head/crypto/openssl/ssl/Makefile projects/zfsd/head/crypto/openssl/ssl/d1_both.c projects/zfsd/head/crypto/openssl/ssl/d1_lib.c projects/zfsd/head/crypto/openssl/ssl/d1_srtp.c projects/zfsd/head/crypto/openssl/ssl/dtls1.h projects/zfsd/head/crypto/openssl/ssl/s23_clnt.c projects/zfsd/head/crypto/openssl/ssl/s23_srvr.c projects/zfsd/head/crypto/openssl/ssl/s2_lib.c projects/zfsd/head/crypto/openssl/ssl/s3_cbc.c projects/zfsd/head/crypto/openssl/ssl/s3_clnt.c projects/zfsd/head/crypto/openssl/ssl/s3_enc.c projects/zfsd/head/crypto/openssl/ssl/s3_lib.c projects/zfsd/head/crypto/openssl/ssl/s3_pkt.c projects/zfsd/head/crypto/openssl/ssl/s3_srvr.c projects/zfsd/head/crypto/openssl/ssl/srtp.h projects/zfsd/head/crypto/openssl/ssl/ssl.h projects/zfsd/head/crypto/openssl/ssl/ssl3.h projects/zfsd/head/crypto/openssl/ssl/ssl_err.c projects/zfsd/head/crypto/openssl/ssl/ssl_lib.c projects/zfsd/head/crypto/openssl/ssl/t1_enc.c projects/zfsd/head/crypto/openssl/ssl/t1_lib.c projects/zfsd/head/crypto/openssl/ssl/tls1.h projects/zfsd/head/crypto/openssl/util/mk1mf.pl projects/zfsd/head/crypto/openssl/util/mkdef.pl projects/zfsd/head/crypto/openssl/util/ssleay.num projects/zfsd/head/etc/auto_master projects/zfsd/head/etc/defaults/periodic.conf projects/zfsd/head/etc/defaults/rc.conf projects/zfsd/head/etc/devd/Makefile projects/zfsd/head/etc/devd/apple.conf projects/zfsd/head/etc/devd/usb.conf projects/zfsd/head/etc/mail/Makefile projects/zfsd/head/etc/motd projects/zfsd/head/etc/mtree/BSD.debug.dist projects/zfsd/head/etc/mtree/BSD.include.dist projects/zfsd/head/etc/mtree/BSD.root.dist projects/zfsd/head/etc/mtree/BSD.tests.dist projects/zfsd/head/etc/mtree/BSD.usr.dist projects/zfsd/head/etc/mtree/BSD.var.dist projects/zfsd/head/etc/network.subr projects/zfsd/head/etc/pam.d/README projects/zfsd/head/etc/periodic/daily/110.clean-tmps projects/zfsd/head/etc/rc.d/Makefile projects/zfsd/head/etc/rc.d/SERVERS projects/zfsd/head/etc/rc.d/bgfsck projects/zfsd/head/etc/rc.d/geli projects/zfsd/head/etc/rc.d/gssd projects/zfsd/head/etc/rc.d/ip6addrctl projects/zfsd/head/etc/rc.d/jail projects/zfsd/head/etc/rc.d/kadmind projects/zfsd/head/etc/rc.d/kfd projects/zfsd/head/etc/rc.d/kpasswdd projects/zfsd/head/etc/rc.d/netif projects/zfsd/head/etc/rc.d/postrandom projects/zfsd/head/etc/rc.d/random projects/zfsd/head/etc/rc.d/routing projects/zfsd/head/etc/rc.d/syscons projects/zfsd/head/etc/rc.firewall projects/zfsd/head/etc/rc.subr projects/zfsd/head/games/factor/factor.6 projects/zfsd/head/games/factor/factor.c projects/zfsd/head/games/primes/Makefile projects/zfsd/head/games/primes/primes.c projects/zfsd/head/games/primes/primes.h projects/zfsd/head/gnu/lib/csu/Makefile projects/zfsd/head/gnu/lib/libgcc/Makefile projects/zfsd/head/gnu/lib/libgcov/Makefile projects/zfsd/head/gnu/lib/libstdc++/Makefile projects/zfsd/head/gnu/lib/libsupc++/Makefile projects/zfsd/head/gnu/usr.bin/Makefile projects/zfsd/head/gnu/usr.bin/cc/Makefile.inc projects/zfsd/head/gnu/usr.bin/cc/cc_tools/Makefile projects/zfsd/head/gnu/usr.bin/diff/Makefile projects/zfsd/head/gnu/usr.bin/grep/Makefile projects/zfsd/head/include/Makefile projects/zfsd/head/include/pthread.h projects/zfsd/head/include/rpcsvc/nis.x projects/zfsd/head/include/semaphore.h projects/zfsd/head/include/stdlib.h projects/zfsd/head/include/strings.h projects/zfsd/head/include/unistd.h projects/zfsd/head/kerberos5/lib/libasn1/Makefile projects/zfsd/head/lib/Makefile projects/zfsd/head/lib/atf/Makefile.inc projects/zfsd/head/lib/atf/common.mk projects/zfsd/head/lib/atf/libatf-c++/Makefile projects/zfsd/head/lib/atf/libatf-c++/tests/Makefile projects/zfsd/head/lib/atf/libatf-c++/tests/detail/Makefile projects/zfsd/head/lib/atf/libatf-c/Makefile projects/zfsd/head/lib/atf/libatf-c/tests/Makefile projects/zfsd/head/lib/atf/libatf-c/tests/detail/Makefile projects/zfsd/head/lib/clang/clang.build.mk projects/zfsd/head/lib/libc++/Makefile projects/zfsd/head/lib/libc/Makefile projects/zfsd/head/lib/libc/arm/Makefile.inc projects/zfsd/head/lib/libc/arm/aeabi/Makefile.inc projects/zfsd/head/lib/libc/arm/aeabi/Symbol.map projects/zfsd/head/lib/libc/arm/aeabi/aeabi_double.c projects/zfsd/head/lib/libc/arm/aeabi/aeabi_float.c projects/zfsd/head/lib/libc/arm/aeabi/aeabi_vfp_double.S projects/zfsd/head/lib/libc/arm/aeabi/aeabi_vfp_float.S projects/zfsd/head/lib/libc/arm/gen/Makefile.inc projects/zfsd/head/lib/libc/arm/gen/__aeabi_read_tp.S projects/zfsd/head/lib/libc/arm/gen/_ctx_start.S projects/zfsd/head/lib/libc/arm/gen/_setjmp.S projects/zfsd/head/lib/libc/arm/gen/alloca.S projects/zfsd/head/lib/libc/arm/gen/divsi3.S projects/zfsd/head/lib/libc/arm/gen/setjmp.S projects/zfsd/head/lib/libc/arm/gen/sigsetjmp.S projects/zfsd/head/lib/libc/arm/string/ffs.S projects/zfsd/head/lib/libc/arm/string/memcmp.S projects/zfsd/head/lib/libc/arm/string/memcpy_arm.S projects/zfsd/head/lib/libc/arm/string/memcpy_xscale.S projects/zfsd/head/lib/libc/arm/string/memmove.S projects/zfsd/head/lib/libc/arm/string/memset.S projects/zfsd/head/lib/libc/arm/string/strcmp.S projects/zfsd/head/lib/libc/arm/string/strlen.S projects/zfsd/head/lib/libc/arm/string/strncmp.S projects/zfsd/head/lib/libc/arm/sys/Ovfork.S projects/zfsd/head/lib/libc/arm/sys/brk.S projects/zfsd/head/lib/libc/arm/sys/cerror.S projects/zfsd/head/lib/libc/arm/sys/pipe.S projects/zfsd/head/lib/libc/arm/sys/ptrace.S projects/zfsd/head/lib/libc/arm/sys/sbrk.S projects/zfsd/head/lib/libc/gen/dl_iterate_phdr.3 projects/zfsd/head/lib/libc/gen/getgrouplist.3 projects/zfsd/head/lib/libc/gen/initgroups.3 projects/zfsd/head/lib/libc/gen/nlist.c projects/zfsd/head/lib/libc/gen/rewinddir.c projects/zfsd/head/lib/libc/gen/sem_destroy.3 projects/zfsd/head/lib/libc/gen/sem_getvalue.3 projects/zfsd/head/lib/libc/gen/sem_init.3 projects/zfsd/head/lib/libc/gen/sem_new.c projects/zfsd/head/lib/libc/gen/sem_open.3 projects/zfsd/head/lib/libc/gen/sem_post.3 projects/zfsd/head/lib/libc/gen/sem_timedwait.3 projects/zfsd/head/lib/libc/gen/sem_wait.3 projects/zfsd/head/lib/libc/locale/lmonetary.c projects/zfsd/head/lib/libc/net/nsdispatch.c projects/zfsd/head/lib/libc/posix1e/acl.3 projects/zfsd/head/lib/libc/posix1e/acl_add_flag_np.3 projects/zfsd/head/lib/libc/posix1e/acl_clear_flags_np.3 projects/zfsd/head/lib/libc/posix1e/acl_delete_flag_np.3 projects/zfsd/head/lib/libc/posix1e/acl_get_flag_np.3 projects/zfsd/head/lib/libc/posix1e/acl_get_flagset_np.3 projects/zfsd/head/lib/libc/posix1e/acl_set_entry_type_np.3 projects/zfsd/head/lib/libc/posix1e/acl_set_flagset_np.3 projects/zfsd/head/lib/libc/powerpc/gen/_ctx_start.S projects/zfsd/head/lib/libc/powerpc/gen/_setjmp.S projects/zfsd/head/lib/libc/powerpc/gen/eabi.S projects/zfsd/head/lib/libc/powerpc/gen/fabs.S projects/zfsd/head/lib/libc/powerpc/gen/setjmp.S projects/zfsd/head/lib/libc/powerpc/gen/sigsetjmp.S projects/zfsd/head/lib/libc/powerpc/sys/brk.S projects/zfsd/head/lib/libc/powerpc/sys/exect.S projects/zfsd/head/lib/libc/powerpc/sys/pipe.S projects/zfsd/head/lib/libc/powerpc/sys/ptrace.S projects/zfsd/head/lib/libc/powerpc/sys/sbrk.S projects/zfsd/head/lib/libc/powerpc64/gen/_ctx_start.S projects/zfsd/head/lib/libc/powerpc64/gen/_setjmp.S projects/zfsd/head/lib/libc/powerpc64/gen/fabs.S projects/zfsd/head/lib/libc/powerpc64/gen/setjmp.S projects/zfsd/head/lib/libc/powerpc64/gen/sigsetjmp.S projects/zfsd/head/lib/libc/powerpc64/sys/brk.S projects/zfsd/head/lib/libc/powerpc64/sys/exect.S projects/zfsd/head/lib/libc/powerpc64/sys/pipe.S projects/zfsd/head/lib/libc/powerpc64/sys/ptrace.S projects/zfsd/head/lib/libc/powerpc64/sys/sbrk.S projects/zfsd/head/lib/libc/quad/Makefile.inc projects/zfsd/head/lib/libc/rpc/clnt_vc.c projects/zfsd/head/lib/libc/stdio/open_memstream.3 projects/zfsd/head/lib/libc/stdlib/Symbol.map projects/zfsd/head/lib/libc/stdlib/lsearch.c projects/zfsd/head/lib/libc/stdtime/strptime.3 projects/zfsd/head/lib/libc/stdtime/strptime.c projects/zfsd/head/lib/libc/string/Makefile.inc projects/zfsd/head/lib/libc/string/Symbol.map projects/zfsd/head/lib/libc/string/bzero.3 projects/zfsd/head/lib/libc/sys/accept.2 projects/zfsd/head/lib/libc/sys/access.2 projects/zfsd/head/lib/libc/sys/connect.2 projects/zfsd/head/lib/libc/sys/kqueue.2 projects/zfsd/head/lib/libc/sys/mmap.2 projects/zfsd/head/lib/libc/sys/mq_open.2 projects/zfsd/head/lib/libc/sys/recv.2 projects/zfsd/head/lib/libc/sys/utrace.2 projects/zfsd/head/lib/libcompiler_rt/Makefile projects/zfsd/head/lib/libcrypt/crypt.c projects/zfsd/head/lib/libcuse/cuse_lib.c projects/zfsd/head/lib/libcxxrt/Version.map projects/zfsd/head/lib/libfetch/common.c projects/zfsd/head/lib/libfetch/fetch.3 projects/zfsd/head/lib/libgeom/geom_getxml.c projects/zfsd/head/lib/libgeom/geom_stats.c projects/zfsd/head/lib/libkvm/kvm_arm.c projects/zfsd/head/lib/libkvm/kvm_proc.c projects/zfsd/head/lib/libnetbsd/sys/cdefs.h projects/zfsd/head/lib/libnv/Makefile projects/zfsd/head/lib/libnv/msgio.c projects/zfsd/head/lib/libnv/nv.3 projects/zfsd/head/lib/libnv/nv.h projects/zfsd/head/lib/libnv/nv_impl.h projects/zfsd/head/lib/libnv/nvlist.c projects/zfsd/head/lib/libnv/nvlist_impl.h projects/zfsd/head/lib/libnv/nvpair.c projects/zfsd/head/lib/libnv/nvpair_impl.h projects/zfsd/head/lib/libpam/libpam/Makefile projects/zfsd/head/lib/libpam/modules/pam_login_access/pam_login_access.c projects/zfsd/head/lib/libpcap/Makefile projects/zfsd/head/lib/libpcap/config.h projects/zfsd/head/lib/libproc/Makefile projects/zfsd/head/lib/libproc/libproc.h projects/zfsd/head/lib/libproc/proc_sym.c projects/zfsd/head/lib/librtld_db/rtld_db.c projects/zfsd/head/lib/libstand/Makefile projects/zfsd/head/lib/libstdthreads/threads.h projects/zfsd/head/lib/libthr/libthr.3 projects/zfsd/head/lib/libthr/thread/thr_cond.c projects/zfsd/head/lib/libthr/thread/thr_init.c projects/zfsd/head/lib/libunbound/Makefile projects/zfsd/head/lib/libusb/Makefile projects/zfsd/head/lib/libutil/gr_util.c projects/zfsd/head/lib/libutil/login_class.c projects/zfsd/head/lib/libz/Makefile projects/zfsd/head/lib/msun/Makefile projects/zfsd/head/lib/msun/Symbol.map projects/zfsd/head/lib/msun/man/lgamma.3 projects/zfsd/head/lib/msun/src/e_lgamma.c projects/zfsd/head/lib/msun/src/e_lgamma_r.c projects/zfsd/head/lib/msun/src/e_lgammaf_r.c projects/zfsd/head/lib/msun/src/imprecise.c projects/zfsd/head/lib/msun/src/math.h projects/zfsd/head/lib/msun/src/s_tanh.c projects/zfsd/head/lib/msun/src/s_tanhf.c projects/zfsd/head/libexec/Makefile projects/zfsd/head/libexec/atf/atf-check/Makefile projects/zfsd/head/libexec/atf/atf-sh/Makefile projects/zfsd/head/libexec/atf/atf-sh/tests/Makefile projects/zfsd/head/libexec/rtld-elf/Makefile projects/zfsd/head/libexec/rtld-elf/amd64/reloc.c projects/zfsd/head/libexec/rtld-elf/arm/reloc.c projects/zfsd/head/libexec/rtld-elf/i386/reloc.c projects/zfsd/head/libexec/rtld-elf/mips/reloc.c projects/zfsd/head/libexec/rtld-elf/powerpc/reloc.c projects/zfsd/head/libexec/rtld-elf/powerpc64/reloc.c projects/zfsd/head/libexec/rtld-elf/rtld.c projects/zfsd/head/libexec/rtld-elf/rtld.h projects/zfsd/head/libexec/rtld-elf/sparc64/reloc.c projects/zfsd/head/libexec/rtld-elf/tests/target/Makefile projects/zfsd/head/libexec/save-entropy/save-entropy.sh projects/zfsd/head/release/Makefile projects/zfsd/head/release/arm/BEAGLEBONE.conf projects/zfsd/head/release/arm/PANDABOARD.conf projects/zfsd/head/release/arm/RPI-B.conf projects/zfsd/head/release/arm/WANDBOARD-QUAD.conf projects/zfsd/head/release/arm/ZEDBOARD.conf projects/zfsd/head/release/arm/release.sh projects/zfsd/head/release/doc/en_US.ISO8859-1/hardware/article.xml projects/zfsd/head/release/doc/en_US.ISO8859-1/share/xml/release.xsl projects/zfsd/head/release/doc/share/mk/doc.relnotes.mk projects/zfsd/head/release/doc/share/xml/release.ent projects/zfsd/head/release/doc/share/xml/release.xsl projects/zfsd/head/release/picobsd/tinyware/simple_httpd/simple_httpd.c projects/zfsd/head/release/rc.local projects/zfsd/head/release/release.conf.sample projects/zfsd/head/release/release.sh projects/zfsd/head/release/scripts/pkg-stage.sh projects/zfsd/head/rescue/rescue/Makefile projects/zfsd/head/sbin/camcontrol/camcontrol.8 projects/zfsd/head/sbin/camcontrol/camcontrol.c projects/zfsd/head/sbin/conscontrol/conscontrol.8 projects/zfsd/head/sbin/dhclient/packet.c projects/zfsd/head/sbin/dump/traverse.c projects/zfsd/head/sbin/dumpon/dumpon.8 projects/zfsd/head/sbin/fdisk_pc98/Makefile projects/zfsd/head/sbin/fsck_msdosfs/boot.c projects/zfsd/head/sbin/fsck_msdosfs/dosfs.h projects/zfsd/head/sbin/gbde/gbde.8 projects/zfsd/head/sbin/hastd/Makefile projects/zfsd/head/sbin/hastd/primary.c projects/zfsd/head/sbin/hastd/synch.h projects/zfsd/head/sbin/ifconfig/Makefile projects/zfsd/head/sbin/ifconfig/af_inet6.c projects/zfsd/head/sbin/ifconfig/ifconfig.8 projects/zfsd/head/sbin/ifconfig/ifconfig.h projects/zfsd/head/sbin/ifconfig/iflagg.c projects/zfsd/head/sbin/ifconfig/sfp.c projects/zfsd/head/sbin/ipfw/Makefile projects/zfsd/head/sbin/ipfw/altq.c projects/zfsd/head/sbin/ipfw/dummynet.c projects/zfsd/head/sbin/ipfw/ipfw.8 projects/zfsd/head/sbin/ipfw/ipfw2.c projects/zfsd/head/sbin/ipfw/ipfw2.h projects/zfsd/head/sbin/ipfw/ipv6.c projects/zfsd/head/sbin/ipfw/main.c projects/zfsd/head/sbin/ipfw/nat.c projects/zfsd/head/sbin/iscontrol/iscontrol.8 projects/zfsd/head/sbin/mount_nfs/Makefile projects/zfsd/head/sbin/mount_nfs/mount_nfs.8 projects/zfsd/head/sbin/mount_nfs/mount_nfs.c projects/zfsd/head/sbin/ping/Makefile projects/zfsd/head/sbin/ping/ping.c projects/zfsd/head/sbin/ping6/Makefile projects/zfsd/head/sbin/ping6/ping6.8 projects/zfsd/head/sbin/ping6/ping6.c projects/zfsd/head/sbin/route/route.c projects/zfsd/head/sbin/routed/defs.h projects/zfsd/head/sbin/routed/input.c projects/zfsd/head/sbin/routed/main.c projects/zfsd/head/sbin/routed/output.c projects/zfsd/head/sbin/routed/routed.8 projects/zfsd/head/sbin/savecore/savecore.c projects/zfsd/head/sbin/swapon/swapon.c projects/zfsd/head/sbin/sysctl/sysctl.c projects/zfsd/head/secure/lib/libcrypto/Makefile.inc projects/zfsd/head/secure/lib/libcrypto/Makefile.man projects/zfsd/head/secure/lib/libcrypto/man/ASN1_OBJECT_new.3 projects/zfsd/head/secure/lib/libcrypto/man/ASN1_STRING_length.3 projects/zfsd/head/secure/lib/libcrypto/man/ASN1_STRING_new.3 projects/zfsd/head/secure/lib/libcrypto/man/ASN1_STRING_print_ex.3 projects/zfsd/head/secure/lib/libcrypto/man/ASN1_generate_nconf.3 projects/zfsd/head/secure/lib/libcrypto/man/BIO_ctrl.3 projects/zfsd/head/secure/lib/libcrypto/man/BIO_f_base64.3 projects/zfsd/head/secure/lib/libcrypto/man/BIO_f_buffer.3 projects/zfsd/head/secure/lib/libcrypto/man/BIO_f_cipher.3 projects/zfsd/head/secure/lib/libcrypto/man/BIO_f_md.3 projects/zfsd/head/secure/lib/libcrypto/man/BIO_f_null.3 projects/zfsd/head/secure/lib/libcrypto/man/BIO_f_ssl.3 projects/zfsd/head/secure/lib/libcrypto/man/BIO_find_type.3 projects/zfsd/head/secure/lib/libcrypto/man/BIO_new.3 projects/zfsd/head/secure/lib/libcrypto/man/BIO_new_CMS.3 projects/zfsd/head/secure/lib/libcrypto/man/BIO_push.3 projects/zfsd/head/secure/lib/libcrypto/man/BIO_read.3 projects/zfsd/head/secure/lib/libcrypto/man/BIO_s_accept.3 projects/zfsd/head/secure/lib/libcrypto/man/BIO_s_bio.3 projects/zfsd/head/secure/lib/libcrypto/man/BIO_s_connect.3 projects/zfsd/head/secure/lib/libcrypto/man/BIO_s_fd.3 projects/zfsd/head/secure/lib/libcrypto/man/BIO_s_file.3 projects/zfsd/head/secure/lib/libcrypto/man/BIO_s_mem.3 projects/zfsd/head/secure/lib/libcrypto/man/BIO_s_null.3 projects/zfsd/head/secure/lib/libcrypto/man/BIO_s_socket.3 projects/zfsd/head/secure/lib/libcrypto/man/BIO_set_callback.3 projects/zfsd/head/secure/lib/libcrypto/man/BIO_should_retry.3 projects/zfsd/head/secure/lib/libcrypto/man/BN_BLINDING_new.3 projects/zfsd/head/secure/lib/libcrypto/man/BN_CTX_new.3 projects/zfsd/head/secure/lib/libcrypto/man/BN_CTX_start.3 projects/zfsd/head/secure/lib/libcrypto/man/BN_add.3 projects/zfsd/head/secure/lib/libcrypto/man/BN_add_word.3 projects/zfsd/head/secure/lib/libcrypto/man/BN_bn2bin.3 projects/zfsd/head/secure/lib/libcrypto/man/BN_cmp.3 projects/zfsd/head/secure/lib/libcrypto/man/BN_copy.3 projects/zfsd/head/secure/lib/libcrypto/man/BN_generate_prime.3 projects/zfsd/head/secure/lib/libcrypto/man/BN_mod_inverse.3 projects/zfsd/head/secure/lib/libcrypto/man/BN_mod_mul_montgomery.3 projects/zfsd/head/secure/lib/libcrypto/man/BN_mod_mul_reciprocal.3 projects/zfsd/head/secure/lib/libcrypto/man/BN_new.3 projects/zfsd/head/secure/lib/libcrypto/man/BN_num_bytes.3 projects/zfsd/head/secure/lib/libcrypto/man/BN_rand.3 projects/zfsd/head/secure/lib/libcrypto/man/BN_set_bit.3 projects/zfsd/head/secure/lib/libcrypto/man/BN_swap.3 projects/zfsd/head/secure/lib/libcrypto/man/BN_zero.3 projects/zfsd/head/secure/lib/libcrypto/man/CMS_add0_cert.3 projects/zfsd/head/secure/lib/libcrypto/man/CMS_add1_recipient_cert.3 projects/zfsd/head/secure/lib/libcrypto/man/CMS_compress.3 projects/zfsd/head/secure/lib/libcrypto/man/CMS_decrypt.3 projects/zfsd/head/secure/lib/libcrypto/man/CMS_encrypt.3 projects/zfsd/head/secure/lib/libcrypto/man/CMS_final.3 projects/zfsd/head/secure/lib/libcrypto/man/CMS_get0_RecipientInfos.3 projects/zfsd/head/secure/lib/libcrypto/man/CMS_get0_SignerInfos.3 projects/zfsd/head/secure/lib/libcrypto/man/CMS_get0_type.3 projects/zfsd/head/secure/lib/libcrypto/man/CMS_get1_ReceiptRequest.3 projects/zfsd/head/secure/lib/libcrypto/man/CMS_sign.3 projects/zfsd/head/secure/lib/libcrypto/man/CMS_sign_receipt.3 projects/zfsd/head/secure/lib/libcrypto/man/CMS_uncompress.3 projects/zfsd/head/secure/lib/libcrypto/man/CMS_verify.3 projects/zfsd/head/secure/lib/libcrypto/man/CMS_verify_receipt.3 projects/zfsd/head/secure/lib/libcrypto/man/CONF_modules_free.3 projects/zfsd/head/secure/lib/libcrypto/man/CONF_modules_load_file.3 projects/zfsd/head/secure/lib/libcrypto/man/CRYPTO_set_ex_data.3 projects/zfsd/head/secure/lib/libcrypto/man/DH_generate_key.3 projects/zfsd/head/secure/lib/libcrypto/man/DH_generate_parameters.3 projects/zfsd/head/secure/lib/libcrypto/man/DH_get_ex_new_index.3 projects/zfsd/head/secure/lib/libcrypto/man/DH_new.3 projects/zfsd/head/secure/lib/libcrypto/man/DH_set_method.3 projects/zfsd/head/secure/lib/libcrypto/man/DH_size.3 projects/zfsd/head/secure/lib/libcrypto/man/DSA_SIG_new.3 projects/zfsd/head/secure/lib/libcrypto/man/DSA_do_sign.3 projects/zfsd/head/secure/lib/libcrypto/man/DSA_dup_DH.3 projects/zfsd/head/secure/lib/libcrypto/man/DSA_generate_key.3 projects/zfsd/head/secure/lib/libcrypto/man/DSA_generate_parameters.3 projects/zfsd/head/secure/lib/libcrypto/man/DSA_get_ex_new_index.3 projects/zfsd/head/secure/lib/libcrypto/man/DSA_new.3 projects/zfsd/head/secure/lib/libcrypto/man/DSA_set_method.3 projects/zfsd/head/secure/lib/libcrypto/man/DSA_sign.3 projects/zfsd/head/secure/lib/libcrypto/man/DSA_size.3 projects/zfsd/head/secure/lib/libcrypto/man/ERR_GET_LIB.3 projects/zfsd/head/secure/lib/libcrypto/man/ERR_clear_error.3 projects/zfsd/head/secure/lib/libcrypto/man/ERR_error_string.3 projects/zfsd/head/secure/lib/libcrypto/man/ERR_get_error.3 projects/zfsd/head/secure/lib/libcrypto/man/ERR_load_crypto_strings.3 projects/zfsd/head/secure/lib/libcrypto/man/ERR_load_strings.3 projects/zfsd/head/secure/lib/libcrypto/man/ERR_print_errors.3 projects/zfsd/head/secure/lib/libcrypto/man/ERR_put_error.3 projects/zfsd/head/secure/lib/libcrypto/man/ERR_remove_state.3 projects/zfsd/head/secure/lib/libcrypto/man/ERR_set_mark.3 projects/zfsd/head/secure/lib/libcrypto/man/EVP_BytesToKey.3 projects/zfsd/head/secure/lib/libcrypto/man/EVP_DigestInit.3 projects/zfsd/head/secure/lib/libcrypto/man/EVP_DigestSignInit.3 projects/zfsd/head/secure/lib/libcrypto/man/EVP_DigestVerifyInit.3 projects/zfsd/head/secure/lib/libcrypto/man/EVP_EncryptInit.3 projects/zfsd/head/secure/lib/libcrypto/man/EVP_OpenInit.3 projects/zfsd/head/secure/lib/libcrypto/man/EVP_PKEY_CTX_ctrl.3 projects/zfsd/head/secure/lib/libcrypto/man/EVP_PKEY_CTX_new.3 projects/zfsd/head/secure/lib/libcrypto/man/EVP_PKEY_cmp.3 projects/zfsd/head/secure/lib/libcrypto/man/EVP_PKEY_decrypt.3 projects/zfsd/head/secure/lib/libcrypto/man/EVP_PKEY_derive.3 projects/zfsd/head/secure/lib/libcrypto/man/EVP_PKEY_encrypt.3 projects/zfsd/head/secure/lib/libcrypto/man/EVP_PKEY_get_default_digest.3 projects/zfsd/head/secure/lib/libcrypto/man/EVP_PKEY_keygen.3 projects/zfsd/head/secure/lib/libcrypto/man/EVP_PKEY_new.3 projects/zfsd/head/secure/lib/libcrypto/man/EVP_PKEY_print_private.3 projects/zfsd/head/secure/lib/libcrypto/man/EVP_PKEY_set1_RSA.3 projects/zfsd/head/secure/lib/libcrypto/man/EVP_PKEY_sign.3 projects/zfsd/head/secure/lib/libcrypto/man/EVP_PKEY_verify.3 projects/zfsd/head/secure/lib/libcrypto/man/EVP_PKEY_verify_recover.3 projects/zfsd/head/secure/lib/libcrypto/man/EVP_SealInit.3 projects/zfsd/head/secure/lib/libcrypto/man/EVP_SignInit.3 projects/zfsd/head/secure/lib/libcrypto/man/EVP_VerifyInit.3 projects/zfsd/head/secure/lib/libcrypto/man/OBJ_nid2obj.3 projects/zfsd/head/secure/lib/libcrypto/man/OPENSSL_Applink.3 projects/zfsd/head/secure/lib/libcrypto/man/OPENSSL_VERSION_NUMBER.3 projects/zfsd/head/secure/lib/libcrypto/man/OPENSSL_config.3 projects/zfsd/head/secure/lib/libcrypto/man/OPENSSL_ia32cap.3 projects/zfsd/head/secure/lib/libcrypto/man/OPENSSL_load_builtin_modules.3 projects/zfsd/head/secure/lib/libcrypto/man/OpenSSL_add_all_algorithms.3 projects/zfsd/head/secure/lib/libcrypto/man/PEM_write_bio_CMS_stream.3 projects/zfsd/head/secure/lib/libcrypto/man/PEM_write_bio_PKCS7_stream.3 projects/zfsd/head/secure/lib/libcrypto/man/PKCS12_create.3 projects/zfsd/head/secure/lib/libcrypto/man/PKCS12_parse.3 projects/zfsd/head/secure/lib/libcrypto/man/PKCS7_decrypt.3 projects/zfsd/head/secure/lib/libcrypto/man/PKCS7_encrypt.3 projects/zfsd/head/secure/lib/libcrypto/man/PKCS7_sign.3 projects/zfsd/head/secure/lib/libcrypto/man/PKCS7_sign_add_signer.3 projects/zfsd/head/secure/lib/libcrypto/man/PKCS7_verify.3 projects/zfsd/head/secure/lib/libcrypto/man/RAND_add.3 projects/zfsd/head/secure/lib/libcrypto/man/RAND_bytes.3 projects/zfsd/head/secure/lib/libcrypto/man/RAND_cleanup.3 projects/zfsd/head/secure/lib/libcrypto/man/RAND_egd.3 projects/zfsd/head/secure/lib/libcrypto/man/RAND_load_file.3 projects/zfsd/head/secure/lib/libcrypto/man/RAND_set_rand_method.3 projects/zfsd/head/secure/lib/libcrypto/man/RSA_blinding_on.3 projects/zfsd/head/secure/lib/libcrypto/man/RSA_check_key.3 projects/zfsd/head/secure/lib/libcrypto/man/RSA_generate_key.3 projects/zfsd/head/secure/lib/libcrypto/man/RSA_get_ex_new_index.3 projects/zfsd/head/secure/lib/libcrypto/man/RSA_new.3 projects/zfsd/head/secure/lib/libcrypto/man/RSA_padding_add_PKCS1_type_1.3 projects/zfsd/head/secure/lib/libcrypto/man/RSA_print.3 projects/zfsd/head/secure/lib/libcrypto/man/RSA_private_encrypt.3 projects/zfsd/head/secure/lib/libcrypto/man/RSA_public_encrypt.3 projects/zfsd/head/secure/lib/libcrypto/man/RSA_set_method.3 projects/zfsd/head/secure/lib/libcrypto/man/RSA_sign.3 projects/zfsd/head/secure/lib/libcrypto/man/RSA_sign_ASN1_OCTET_STRING.3 projects/zfsd/head/secure/lib/libcrypto/man/RSA_size.3 projects/zfsd/head/secure/lib/libcrypto/man/SMIME_read_CMS.3 projects/zfsd/head/secure/lib/libcrypto/man/SMIME_read_PKCS7.3 projects/zfsd/head/secure/lib/libcrypto/man/SMIME_write_CMS.3 projects/zfsd/head/secure/lib/libcrypto/man/SMIME_write_PKCS7.3 projects/zfsd/head/secure/lib/libcrypto/man/X509_NAME_ENTRY_get_object.3 projects/zfsd/head/secure/lib/libcrypto/man/X509_NAME_add_entry_by_txt.3 projects/zfsd/head/secure/lib/libcrypto/man/X509_NAME_get_index_by_NID.3 projects/zfsd/head/secure/lib/libcrypto/man/X509_NAME_print_ex.3 projects/zfsd/head/secure/lib/libcrypto/man/X509_STORE_CTX_get_error.3 projects/zfsd/head/secure/lib/libcrypto/man/X509_STORE_CTX_get_ex_new_index.3 projects/zfsd/head/secure/lib/libcrypto/man/X509_STORE_CTX_new.3 projects/zfsd/head/secure/lib/libcrypto/man/X509_STORE_CTX_set_verify_cb.3 projects/zfsd/head/secure/lib/libcrypto/man/X509_STORE_set_verify_cb_func.3 projects/zfsd/head/secure/lib/libcrypto/man/X509_VERIFY_PARAM_set_flags.3 projects/zfsd/head/secure/lib/libcrypto/man/X509_new.3 projects/zfsd/head/secure/lib/libcrypto/man/X509_verify_cert.3 projects/zfsd/head/secure/lib/libcrypto/man/bio.3 projects/zfsd/head/secure/lib/libcrypto/man/blowfish.3 projects/zfsd/head/secure/lib/libcrypto/man/bn.3 projects/zfsd/head/secure/lib/libcrypto/man/bn_internal.3 projects/zfsd/head/secure/lib/libcrypto/man/buffer.3 projects/zfsd/head/secure/lib/libcrypto/man/crypto.3 projects/zfsd/head/secure/lib/libcrypto/man/d2i_ASN1_OBJECT.3 projects/zfsd/head/secure/lib/libcrypto/man/d2i_DHparams.3 projects/zfsd/head/secure/lib/libcrypto/man/d2i_DSAPublicKey.3 projects/zfsd/head/secure/lib/libcrypto/man/d2i_PKCS8PrivateKey.3 projects/zfsd/head/secure/lib/libcrypto/man/d2i_RSAPublicKey.3 projects/zfsd/head/secure/lib/libcrypto/man/d2i_X509.3 projects/zfsd/head/secure/lib/libcrypto/man/d2i_X509_ALGOR.3 projects/zfsd/head/secure/lib/libcrypto/man/d2i_X509_CRL.3 projects/zfsd/head/secure/lib/libcrypto/man/d2i_X509_NAME.3 projects/zfsd/head/secure/lib/libcrypto/man/d2i_X509_REQ.3 projects/zfsd/head/secure/lib/libcrypto/man/d2i_X509_SIG.3 projects/zfsd/head/secure/lib/libcrypto/man/des.3 projects/zfsd/head/secure/lib/libcrypto/man/dh.3 projects/zfsd/head/secure/lib/libcrypto/man/dsa.3 projects/zfsd/head/secure/lib/libcrypto/man/ecdsa.3 projects/zfsd/head/secure/lib/libcrypto/man/engine.3 projects/zfsd/head/secure/lib/libcrypto/man/err.3 projects/zfsd/head/secure/lib/libcrypto/man/evp.3 projects/zfsd/head/secure/lib/libcrypto/man/hmac.3 projects/zfsd/head/secure/lib/libcrypto/man/i2d_CMS_bio_stream.3 projects/zfsd/head/secure/lib/libcrypto/man/i2d_PKCS7_bio_stream.3 projects/zfsd/head/secure/lib/libcrypto/man/lh_stats.3 projects/zfsd/head/secure/lib/libcrypto/man/lhash.3 projects/zfsd/head/secure/lib/libcrypto/man/md5.3 projects/zfsd/head/secure/lib/libcrypto/man/mdc2.3 projects/zfsd/head/secure/lib/libcrypto/man/pem.3 projects/zfsd/head/secure/lib/libcrypto/man/rand.3 projects/zfsd/head/secure/lib/libcrypto/man/rc4.3 projects/zfsd/head/secure/lib/libcrypto/man/ripemd.3 projects/zfsd/head/secure/lib/libcrypto/man/rsa.3 projects/zfsd/head/secure/lib/libcrypto/man/sha.3 projects/zfsd/head/secure/lib/libcrypto/man/threads.3 projects/zfsd/head/secure/lib/libcrypto/man/ui.3 projects/zfsd/head/secure/lib/libcrypto/man/ui_compat.3 projects/zfsd/head/secure/lib/libcrypto/man/x509.3 projects/zfsd/head/secure/lib/libssl/man/SSL_CIPHER_get_name.3 projects/zfsd/head/secure/lib/libssl/man/SSL_COMP_add_compression_method.3 projects/zfsd/head/secure/lib/libssl/man/SSL_CTX_add_extra_chain_cert.3 projects/zfsd/head/secure/lib/libssl/man/SSL_CTX_add_session.3 projects/zfsd/head/secure/lib/libssl/man/SSL_CTX_ctrl.3 projects/zfsd/head/secure/lib/libssl/man/SSL_CTX_flush_sessions.3 projects/zfsd/head/secure/lib/libssl/man/SSL_CTX_free.3 projects/zfsd/head/secure/lib/libssl/man/SSL_CTX_get_ex_new_index.3 projects/zfsd/head/secure/lib/libssl/man/SSL_CTX_get_verify_mode.3 projects/zfsd/head/secure/lib/libssl/man/SSL_CTX_load_verify_locations.3 projects/zfsd/head/secure/lib/libssl/man/SSL_CTX_new.3 projects/zfsd/head/secure/lib/libssl/man/SSL_CTX_sess_number.3 projects/zfsd/head/secure/lib/libssl/man/SSL_CTX_sess_set_cache_size.3 projects/zfsd/head/secure/lib/libssl/man/SSL_CTX_sess_set_get_cb.3 projects/zfsd/head/secure/lib/libssl/man/SSL_CTX_sessions.3 projects/zfsd/head/secure/lib/libssl/man/SSL_CTX_set_cert_store.3 projects/zfsd/head/secure/lib/libssl/man/SSL_CTX_set_cert_verify_callback.3 projects/zfsd/head/secure/lib/libssl/man/SSL_CTX_set_cipher_list.3 projects/zfsd/head/secure/lib/libssl/man/SSL_CTX_set_client_CA_list.3 projects/zfsd/head/secure/lib/libssl/man/SSL_CTX_set_client_cert_cb.3 projects/zfsd/head/secure/lib/libssl/man/SSL_CTX_set_default_passwd_cb.3 projects/zfsd/head/secure/lib/libssl/man/SSL_CTX_set_generate_session_id.3 projects/zfsd/head/secure/lib/libssl/man/SSL_CTX_set_info_callback.3 projects/zfsd/head/secure/lib/libssl/man/SSL_CTX_set_max_cert_list.3 projects/zfsd/head/secure/lib/libssl/man/SSL_CTX_set_mode.3 projects/zfsd/head/secure/lib/libssl/man/SSL_CTX_set_msg_callback.3 projects/zfsd/head/secure/lib/libssl/man/SSL_CTX_set_options.3 projects/zfsd/head/secure/lib/libssl/man/SSL_CTX_set_psk_client_callback.3 projects/zfsd/head/secure/lib/libssl/man/SSL_CTX_set_quiet_shutdown.3 projects/zfsd/head/secure/lib/libssl/man/SSL_CTX_set_session_cache_mode.3 projects/zfsd/head/secure/lib/libssl/man/SSL_CTX_set_session_id_context.3 projects/zfsd/head/secure/lib/libssl/man/SSL_CTX_set_ssl_version.3 projects/zfsd/head/secure/lib/libssl/man/SSL_CTX_set_timeout.3 projects/zfsd/head/secure/lib/libssl/man/SSL_CTX_set_tlsext_ticket_key_cb.3 projects/zfsd/head/secure/lib/libssl/man/SSL_CTX_set_tmp_dh_callback.3 projects/zfsd/head/secure/lib/libssl/man/SSL_CTX_set_tmp_rsa_callback.3 projects/zfsd/head/secure/lib/libssl/man/SSL_CTX_set_verify.3 projects/zfsd/head/secure/lib/libssl/man/SSL_CTX_use_certificate.3 projects/zfsd/head/secure/lib/libssl/man/SSL_CTX_use_psk_identity_hint.3 projects/zfsd/head/secure/lib/libssl/man/SSL_SESSION_free.3 projects/zfsd/head/secure/lib/libssl/man/SSL_SESSION_get_ex_new_index.3 projects/zfsd/head/secure/lib/libssl/man/SSL_SESSION_get_time.3 projects/zfsd/head/secure/lib/libssl/man/SSL_accept.3 projects/zfsd/head/secure/lib/libssl/man/SSL_alert_type_string.3 projects/zfsd/head/secure/lib/libssl/man/SSL_clear.3 projects/zfsd/head/secure/lib/libssl/man/SSL_connect.3 projects/zfsd/head/secure/lib/libssl/man/SSL_do_handshake.3 projects/zfsd/head/secure/lib/libssl/man/SSL_free.3 projects/zfsd/head/secure/lib/libssl/man/SSL_get_SSL_CTX.3 projects/zfsd/head/secure/lib/libssl/man/SSL_get_ciphers.3 projects/zfsd/head/secure/lib/libssl/man/SSL_get_client_CA_list.3 projects/zfsd/head/secure/lib/libssl/man/SSL_get_current_cipher.3 projects/zfsd/head/secure/lib/libssl/man/SSL_get_default_timeout.3 projects/zfsd/head/secure/lib/libssl/man/SSL_get_error.3 projects/zfsd/head/secure/lib/libssl/man/SSL_get_ex_data_X509_STORE_CTX_idx.3 projects/zfsd/head/secure/lib/libssl/man/SSL_get_ex_new_index.3 projects/zfsd/head/secure/lib/libssl/man/SSL_get_fd.3 projects/zfsd/head/secure/lib/libssl/man/SSL_get_peer_cert_chain.3 projects/zfsd/head/secure/lib/libssl/man/SSL_get_peer_certificate.3 projects/zfsd/head/secure/lib/libssl/man/SSL_get_psk_identity.3 projects/zfsd/head/secure/lib/libssl/man/SSL_get_rbio.3 projects/zfsd/head/secure/lib/libssl/man/SSL_get_session.3 projects/zfsd/head/secure/lib/libssl/man/SSL_get_verify_result.3 projects/zfsd/head/secure/lib/libssl/man/SSL_get_version.3 projects/zfsd/head/secure/lib/libssl/man/SSL_library_init.3 projects/zfsd/head/secure/lib/libssl/man/SSL_load_client_CA_file.3 projects/zfsd/head/secure/lib/libssl/man/SSL_new.3 projects/zfsd/head/secure/lib/libssl/man/SSL_pending.3 projects/zfsd/head/secure/lib/libssl/man/SSL_read.3 projects/zfsd/head/secure/lib/libssl/man/SSL_rstate_string.3 projects/zfsd/head/secure/lib/libssl/man/SSL_session_reused.3 projects/zfsd/head/secure/lib/libssl/man/SSL_set_bio.3 projects/zfsd/head/secure/lib/libssl/man/SSL_set_connect_state.3 projects/zfsd/head/secure/lib/libssl/man/SSL_set_fd.3 projects/zfsd/head/secure/lib/libssl/man/SSL_set_session.3 projects/zfsd/head/secure/lib/libssl/man/SSL_set_shutdown.3 projects/zfsd/head/secure/lib/libssl/man/SSL_set_verify_result.3 projects/zfsd/head/secure/lib/libssl/man/SSL_shutdown.3 projects/zfsd/head/secure/lib/libssl/man/SSL_state_string.3 projects/zfsd/head/secure/lib/libssl/man/SSL_want.3 projects/zfsd/head/secure/lib/libssl/man/SSL_write.3 projects/zfsd/head/secure/lib/libssl/man/d2i_SSL_SESSION.3 projects/zfsd/head/secure/lib/libssl/man/ssl.3 projects/zfsd/head/secure/usr.bin/openssl/Makefile.man projects/zfsd/head/secure/usr.bin/openssl/man/CA.pl.1 projects/zfsd/head/secure/usr.bin/openssl/man/asn1parse.1 projects/zfsd/head/secure/usr.bin/openssl/man/ca.1 projects/zfsd/head/secure/usr.bin/openssl/man/ciphers.1 projects/zfsd/head/secure/usr.bin/openssl/man/cms.1 projects/zfsd/head/secure/usr.bin/openssl/man/crl.1 projects/zfsd/head/secure/usr.bin/openssl/man/crl2pkcs7.1 projects/zfsd/head/secure/usr.bin/openssl/man/dgst.1 projects/zfsd/head/secure/usr.bin/openssl/man/dhparam.1 projects/zfsd/head/secure/usr.bin/openssl/man/dsa.1 projects/zfsd/head/secure/usr.bin/openssl/man/dsaparam.1 projects/zfsd/head/secure/usr.bin/openssl/man/ec.1 projects/zfsd/head/secure/usr.bin/openssl/man/ecparam.1 projects/zfsd/head/secure/usr.bin/openssl/man/enc.1 projects/zfsd/head/secure/usr.bin/openssl/man/errstr.1 projects/zfsd/head/secure/usr.bin/openssl/man/gendsa.1 projects/zfsd/head/secure/usr.bin/openssl/man/genpkey.1 projects/zfsd/head/secure/usr.bin/openssl/man/genrsa.1 projects/zfsd/head/secure/usr.bin/openssl/man/nseq.1 projects/zfsd/head/secure/usr.bin/openssl/man/ocsp.1 projects/zfsd/head/secure/usr.bin/openssl/man/openssl.1 projects/zfsd/head/secure/usr.bin/openssl/man/passwd.1 projects/zfsd/head/secure/usr.bin/openssl/man/pkcs12.1 projects/zfsd/head/secure/usr.bin/openssl/man/pkcs7.1 projects/zfsd/head/secure/usr.bin/openssl/man/pkcs8.1 projects/zfsd/head/secure/usr.bin/openssl/man/pkey.1 projects/zfsd/head/secure/usr.bin/openssl/man/pkeyparam.1 projects/zfsd/head/secure/usr.bin/openssl/man/pkeyutl.1 projects/zfsd/head/secure/usr.bin/openssl/man/rand.1 projects/zfsd/head/secure/usr.bin/openssl/man/req.1 projects/zfsd/head/secure/usr.bin/openssl/man/rsa.1 projects/zfsd/head/secure/usr.bin/openssl/man/rsautl.1 projects/zfsd/head/secure/usr.bin/openssl/man/s_client.1 projects/zfsd/head/secure/usr.bin/openssl/man/s_server.1 projects/zfsd/head/secure/usr.bin/openssl/man/s_time.1 projects/zfsd/head/secure/usr.bin/openssl/man/sess_id.1 projects/zfsd/head/secure/usr.bin/openssl/man/smime.1 projects/zfsd/head/secure/usr.bin/openssl/man/speed.1 projects/zfsd/head/secure/usr.bin/openssl/man/spkac.1 projects/zfsd/head/secure/usr.bin/openssl/man/ts.1 projects/zfsd/head/secure/usr.bin/openssl/man/tsget.1 projects/zfsd/head/secure/usr.bin/openssl/man/verify.1 projects/zfsd/head/secure/usr.bin/openssl/man/version.1 projects/zfsd/head/secure/usr.bin/openssl/man/x509.1 projects/zfsd/head/secure/usr.bin/openssl/man/x509v3_config.1 projects/zfsd/head/share/examples/bhyve/vmrun.sh projects/zfsd/head/share/examples/kld/random_adaptor/random_adaptor_example.c projects/zfsd/head/share/man/man3/pthread_cleanup_pop.3 projects/zfsd/head/share/man/man3/pthread_cleanup_push.3 projects/zfsd/head/share/man/man4/Makefile projects/zfsd/head/share/man/man4/ada.4 projects/zfsd/head/share/man/man4/alc.4 projects/zfsd/head/share/man/man4/atkbd.4 projects/zfsd/head/share/man/man4/cdce.4 projects/zfsd/head/share/man/man4/ctl.4 projects/zfsd/head/share/man/man4/cxgbe.4 projects/zfsd/head/share/man/man4/da.4 projects/zfsd/head/share/man/man4/filemon.4 projects/zfsd/head/share/man/man4/gif.4 projects/zfsd/head/share/man/man4/icmp.4 projects/zfsd/head/share/man/man4/igb.4 projects/zfsd/head/share/man/man4/ip.4 projects/zfsd/head/share/man/man4/iscsi_initiator.4 projects/zfsd/head/share/man/man4/iwn.4 projects/zfsd/head/share/man/man4/iwnfw.4 projects/zfsd/head/share/man/man4/kbdmux.4 projects/zfsd/head/share/man/man4/lagg.4 projects/zfsd/head/share/man/man4/malo.4 projects/zfsd/head/share/man/man4/man4.arm/Makefile projects/zfsd/head/share/man/man4/miibus.4 projects/zfsd/head/share/man/man4/sfxge.4 projects/zfsd/head/share/man/man4/tcp.4 projects/zfsd/head/share/man/man4/ucom.4 projects/zfsd/head/share/man/man4/udplite.4 projects/zfsd/head/share/man/man4/ukbd.4 projects/zfsd/head/share/man/man4/urndis.4 projects/zfsd/head/share/man/man4/urtwn.4 projects/zfsd/head/share/man/man4/virtio.4 projects/zfsd/head/share/man/man4/vkbd.4 projects/zfsd/head/share/man/man4/vt.4 projects/zfsd/head/share/man/man5/autofs.5 projects/zfsd/head/share/man/man5/rc.conf.5 projects/zfsd/head/share/man/man5/src.conf.5 projects/zfsd/head/share/man/man7/Makefile projects/zfsd/head/share/man/man7/hier.7 projects/zfsd/head/share/man/man7/release.7 projects/zfsd/head/share/man/man8/Makefile projects/zfsd/head/share/man/man8/nanobsd.8 projects/zfsd/head/share/man/man8/rc.subr.8 projects/zfsd/head/share/man/man9/Makefile projects/zfsd/head/share/man/man9/SDT.9 projects/zfsd/head/share/man/man9/VOP_GETPAGES.9 projects/zfsd/head/share/man/man9/altq.9 projects/zfsd/head/share/man/man9/fetch.9 projects/zfsd/head/share/man/man9/fpu_kern.9 projects/zfsd/head/share/man/man9/hash.9 projects/zfsd/head/share/man/man9/ifnet.9 projects/zfsd/head/share/man/man9/mbuf.9 projects/zfsd/head/share/man/man9/sleepqueue.9 projects/zfsd/head/share/man/man9/store.9 projects/zfsd/head/share/man/man9/sysctl.9 projects/zfsd/head/share/man/man9/sysctl_add_oid.9 projects/zfsd/head/share/man/man9/timeout.9 projects/zfsd/head/share/misc/bsd-family-tree projects/zfsd/head/share/misc/committers-ports.dot projects/zfsd/head/share/misc/committers-src.dot projects/zfsd/head/share/misc/scsi_modes projects/zfsd/head/share/mk/atf.test.mk projects/zfsd/head/share/mk/bsd.compiler.mk projects/zfsd/head/share/mk/bsd.dep.mk projects/zfsd/head/share/mk/bsd.endian.mk projects/zfsd/head/share/mk/bsd.libnames.mk projects/zfsd/head/share/mk/bsd.mkopt.mk projects/zfsd/head/share/mk/bsd.port.mk projects/zfsd/head/share/mk/bsd.port.subdir.mk projects/zfsd/head/share/mk/bsd.prog.mk projects/zfsd/head/share/mk/bsd.progs.mk projects/zfsd/head/share/mk/bsd.sys.mk projects/zfsd/head/share/mk/bsd.test.mk projects/zfsd/head/share/mk/src.libnames.mk projects/zfsd/head/share/mk/src.opts.mk projects/zfsd/head/share/mk/sys.mk projects/zfsd/head/share/vt/keymaps/Makefile projects/zfsd/head/share/zoneinfo/Makefile projects/zfsd/head/sys/Makefile projects/zfsd/head/sys/amd64/amd64/cpu_switch.S projects/zfsd/head/sys/amd64/amd64/fpu.c projects/zfsd/head/sys/amd64/amd64/genassym.c projects/zfsd/head/sys/amd64/amd64/machdep.c projects/zfsd/head/sys/amd64/amd64/minidump_machdep.c projects/zfsd/head/sys/amd64/amd64/mp_machdep.c projects/zfsd/head/sys/amd64/amd64/pmap.c projects/zfsd/head/sys/amd64/amd64/support.S projects/zfsd/head/sys/amd64/amd64/trap.c projects/zfsd/head/sys/amd64/amd64/uio_machdep.c projects/zfsd/head/sys/amd64/conf/GENERIC projects/zfsd/head/sys/amd64/conf/NOTES projects/zfsd/head/sys/amd64/ia32/ia32_syscall.c projects/zfsd/head/sys/amd64/include/fpu.h projects/zfsd/head/sys/amd64/include/md_var.h projects/zfsd/head/sys/amd64/include/pc/bios.h projects/zfsd/head/sys/amd64/include/pcb.h projects/zfsd/head/sys/amd64/include/pmap.h projects/zfsd/head/sys/amd64/include/vmm.h (contents, props changed) projects/zfsd/head/sys/amd64/include/vmm_instruction_emul.h (contents, props changed) projects/zfsd/head/sys/amd64/include/vmparam.h projects/zfsd/head/sys/amd64/include/xen/hypercall.h projects/zfsd/head/sys/amd64/linux32/linux.h projects/zfsd/head/sys/amd64/linux32/linux32_dummy.c projects/zfsd/head/sys/amd64/linux32/linux32_proto.h projects/zfsd/head/sys/amd64/linux32/linux32_syscall.h projects/zfsd/head/sys/amd64/linux32/linux32_syscalls.c projects/zfsd/head/sys/amd64/linux32/linux32_sysent.c projects/zfsd/head/sys/amd64/linux32/linux32_systrace_args.c projects/zfsd/head/sys/amd64/linux32/syscalls.master projects/zfsd/head/sys/amd64/vmm/amd/amdv.c projects/zfsd/head/sys/amd64/vmm/intel/ept.c projects/zfsd/head/sys/amd64/vmm/intel/vmcs.h projects/zfsd/head/sys/amd64/vmm/intel/vmx.c projects/zfsd/head/sys/amd64/vmm/intel/vmx.h projects/zfsd/head/sys/amd64/vmm/intel/vmx_msr.c projects/zfsd/head/sys/amd64/vmm/intel/vmx_msr.h projects/zfsd/head/sys/amd64/vmm/intel/vmx_support.S projects/zfsd/head/sys/amd64/vmm/io/vatpic.c projects/zfsd/head/sys/amd64/vmm/io/vatpic.h projects/zfsd/head/sys/amd64/vmm/io/vatpit.c projects/zfsd/head/sys/amd64/vmm/io/vatpit.h projects/zfsd/head/sys/amd64/vmm/io/vlapic.c projects/zfsd/head/sys/amd64/vmm/vmm.c projects/zfsd/head/sys/amd64/vmm/vmm_instruction_emul.c projects/zfsd/head/sys/amd64/vmm/vmm_ioport.c projects/zfsd/head/sys/amd64/vmm/vmm_ioport.h projects/zfsd/head/sys/amd64/vmm/x86.c projects/zfsd/head/sys/arm/allwinner/a10_clk.c projects/zfsd/head/sys/arm/allwinner/a10_gpio.c projects/zfsd/head/sys/arm/allwinner/if_emac.c projects/zfsd/head/sys/arm/allwinner/timer.c projects/zfsd/head/sys/arm/arm/busdma_machdep-v6.c projects/zfsd/head/sys/arm/arm/busdma_machdep.c projects/zfsd/head/sys/arm/arm/cpufunc_asm_armv7.S projects/zfsd/head/sys/arm/arm/cpufunc_asm_sheeva.S projects/zfsd/head/sys/arm/arm/cpufunc_asm_xscale.S projects/zfsd/head/sys/arm/arm/cpufunc_asm_xscale_c3.S projects/zfsd/head/sys/arm/arm/db_trace.c projects/zfsd/head/sys/arm/arm/dump_machdep.c projects/zfsd/head/sys/arm/arm/exception.S projects/zfsd/head/sys/arm/arm/fiq.c projects/zfsd/head/sys/arm/arm/generic_timer.c projects/zfsd/head/sys/arm/arm/gic.c projects/zfsd/head/sys/arm/arm/locore.S projects/zfsd/head/sys/arm/arm/machdep.c projects/zfsd/head/sys/arm/arm/minidump_machdep.c projects/zfsd/head/sys/arm/arm/mp_machdep.c projects/zfsd/head/sys/arm/arm/mpcore_timer.c projects/zfsd/head/sys/arm/arm/nexus.c projects/zfsd/head/sys/arm/arm/physmem.c projects/zfsd/head/sys/arm/arm/pl310.c projects/zfsd/head/sys/arm/arm/pmap-v6.c projects/zfsd/head/sys/arm/arm/pmap.c projects/zfsd/head/sys/arm/arm/trap.c projects/zfsd/head/sys/arm/arm/undefined.c projects/zfsd/head/sys/arm/arm/vm_machdep.c projects/zfsd/head/sys/arm/at91/at91.c projects/zfsd/head/sys/arm/at91/at91_aic.c projects/zfsd/head/sys/arm/at91/at91_pinctrl.c projects/zfsd/head/sys/arm/at91/at91rm9200.c projects/zfsd/head/sys/arm/at91/at91rm92reg.h projects/zfsd/head/sys/arm/at91/at91sam9260reg.h projects/zfsd/head/sys/arm/at91/at91sam9g20reg.h projects/zfsd/head/sys/arm/at91/at91sam9g45reg.h projects/zfsd/head/sys/arm/at91/at91sam9x5reg.h projects/zfsd/head/sys/arm/at91/files.at91 projects/zfsd/head/sys/arm/at91/if_ate.c projects/zfsd/head/sys/arm/at91/if_macb.c projects/zfsd/head/sys/arm/at91/std.atmel projects/zfsd/head/sys/arm/broadcom/bcm2835/bcm2835_bsc.c projects/zfsd/head/sys/arm/broadcom/bcm2835/bcm2835_bscvar.h projects/zfsd/head/sys/arm/broadcom/bcm2835/bcm2835_gpio.c projects/zfsd/head/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c projects/zfsd/head/sys/arm/cavium/cns11xx/econa.c projects/zfsd/head/sys/arm/cavium/cns11xx/if_ece.c projects/zfsd/head/sys/arm/conf/ATMEL projects/zfsd/head/sys/arm/conf/BEAGLEBONE projects/zfsd/head/sys/arm/conf/CNS11XXNAS projects/zfsd/head/sys/arm/conf/CUBIEBOARD projects/zfsd/head/sys/arm/conf/CUBIEBOARD2 projects/zfsd/head/sys/arm/conf/DB-78XXX projects/zfsd/head/sys/arm/conf/DB-88F5XXX projects/zfsd/head/sys/arm/conf/DB-88F6XXX projects/zfsd/head/sys/arm/conf/DIGI-CCWMX53 projects/zfsd/head/sys/arm/conf/DOCKSTAR projects/zfsd/head/sys/arm/conf/DREAMPLUG-1001 projects/zfsd/head/sys/arm/conf/EA3250 projects/zfsd/head/sys/arm/conf/EB9200 projects/zfsd/head/sys/arm/conf/EFIKA_MX projects/zfsd/head/sys/arm/conf/EXYNOS5.common projects/zfsd/head/sys/arm/conf/HL200 projects/zfsd/head/sys/arm/conf/HL201 projects/zfsd/head/sys/arm/conf/IMX53-QSB projects/zfsd/head/sys/arm/conf/IMX6 projects/zfsd/head/sys/arm/conf/KB920X projects/zfsd/head/sys/arm/conf/LN2410SBC projects/zfsd/head/sys/arm/conf/NOTES projects/zfsd/head/sys/arm/conf/NSLU projects/zfsd/head/sys/arm/conf/PANDABOARD projects/zfsd/head/sys/arm/conf/QILA9G20 projects/zfsd/head/sys/arm/conf/RK3188 projects/zfsd/head/sys/arm/conf/SAM9G20EK projects/zfsd/head/sys/arm/conf/SAM9X25EK projects/zfsd/head/sys/arm/conf/SN9G45 projects/zfsd/head/sys/arm/conf/VYBRID projects/zfsd/head/sys/arm/conf/WANDBOARD-DUAL projects/zfsd/head/sys/arm/conf/WANDBOARD-QUAD projects/zfsd/head/sys/arm/conf/WANDBOARD-SOLO projects/zfsd/head/sys/arm/conf/ZEDBOARD projects/zfsd/head/sys/arm/freescale/fsl_ocotp.c projects/zfsd/head/sys/arm/freescale/imx/files.imx51 projects/zfsd/head/sys/arm/freescale/imx/files.imx53 projects/zfsd/head/sys/arm/freescale/imx/files.imx6 projects/zfsd/head/sys/arm/freescale/imx/imx51_ccm.c projects/zfsd/head/sys/arm/freescale/imx/imx6_anatop.c projects/zfsd/head/sys/arm/freescale/imx/imx6_ccm.c projects/zfsd/head/sys/arm/freescale/imx/imx6_machdep.c projects/zfsd/head/sys/arm/freescale/imx/imx_ccmvar.h projects/zfsd/head/sys/arm/freescale/imx/imx_gpio.c projects/zfsd/head/sys/arm/freescale/imx/imx_gpt.c projects/zfsd/head/sys/arm/freescale/imx/imx_sdhci.c projects/zfsd/head/sys/arm/freescale/imx/std.imx51 projects/zfsd/head/sys/arm/freescale/imx/std.imx53 projects/zfsd/head/sys/arm/freescale/imx/std.imx6 projects/zfsd/head/sys/arm/freescale/vybrid/vf_gpio.c projects/zfsd/head/sys/arm/freescale/vybrid/vf_sai.c projects/zfsd/head/sys/arm/include/armreg.h projects/zfsd/head/sys/arm/include/asm.h projects/zfsd/head/sys/arm/include/asmacros.h projects/zfsd/head/sys/arm/include/atomic.h projects/zfsd/head/sys/arm/include/cpuconf.h projects/zfsd/head/sys/arm/include/intr.h projects/zfsd/head/sys/arm/include/md_var.h projects/zfsd/head/sys/arm/include/param.h projects/zfsd/head/sys/arm/include/pmap.h projects/zfsd/head/sys/arm/lpc/if_lpe.c projects/zfsd/head/sys/arm/lpc/lpc_gpio.c projects/zfsd/head/sys/arm/mv/gpio.c projects/zfsd/head/sys/arm/rockchip/rk30xx_gpio.c projects/zfsd/head/sys/arm/samsung/exynos/exynos5_machdep.c projects/zfsd/head/sys/arm/samsung/exynos/exynos5_pad.c projects/zfsd/head/sys/arm/samsung/exynos/files.exynos5 projects/zfsd/head/sys/arm/ti/am335x/am335x_scm_padconf.c projects/zfsd/head/sys/arm/ti/am335x/files.am335x projects/zfsd/head/sys/arm/ti/cpsw/if_cpsw.c projects/zfsd/head/sys/arm/ti/files.ti projects/zfsd/head/sys/arm/ti/omap4/files.omap4 projects/zfsd/head/sys/arm/ti/omap4/omap4_scm_padconf.c projects/zfsd/head/sys/arm/ti/ti_cpuid.c projects/zfsd/head/sys/arm/ti/ti_cpuid.h projects/zfsd/head/sys/arm/ti/ti_gpio.c projects/zfsd/head/sys/arm/ti/ti_i2c.c projects/zfsd/head/sys/arm/ti/ti_scm.h projects/zfsd/head/sys/arm/ti/ti_sdhci.c projects/zfsd/head/sys/arm/versatile/files.versatile projects/zfsd/head/sys/arm/xilinx/files.zynq7 projects/zfsd/head/sys/arm/xilinx/zy7_gpio.c projects/zfsd/head/sys/arm/xscale/i80321/i80321_intr.h projects/zfsd/head/sys/arm/xscale/i80321/i80321_timer.c projects/zfsd/head/sys/arm/xscale/i80321/iq80321.c projects/zfsd/head/sys/arm/xscale/i8134x/i81342.c projects/zfsd/head/sys/arm/xscale/ixp425/avila_gpio.c projects/zfsd/head/sys/arm/xscale/ixp425/cambria_gpio.c projects/zfsd/head/sys/arm/xscale/ixp425/if_npe.c projects/zfsd/head/sys/arm/xscale/ixp425/ixp425.c projects/zfsd/head/sys/arm/xscale/ixp425/ixp425_pci.c projects/zfsd/head/sys/arm/xscale/ixp425/ixp425_timer.c projects/zfsd/head/sys/arm/xscale/pxa/pxa_icu.c projects/zfsd/head/sys/arm/xscale/pxa/pxa_timer.c projects/zfsd/head/sys/boot/Makefile.pc98 projects/zfsd/head/sys/boot/amd64/boot1.efi/boot1.c projects/zfsd/head/sys/boot/amd64/efi/bootinfo.c projects/zfsd/head/sys/boot/amd64/efi/conf.c projects/zfsd/head/sys/boot/arm/ixp425/boot2/Makefile projects/zfsd/head/sys/boot/arm/uboot/Makefile projects/zfsd/head/sys/boot/arm/uboot/help.uboot projects/zfsd/head/sys/boot/common/Makefile.inc projects/zfsd/head/sys/boot/common/disk.c projects/zfsd/head/sys/boot/common/disk.h projects/zfsd/head/sys/boot/common/install.c projects/zfsd/head/sys/boot/common/load_elf.c projects/zfsd/head/sys/boot/common/module.c projects/zfsd/head/sys/boot/common/part.c projects/zfsd/head/sys/boot/efi/libefi/Makefile projects/zfsd/head/sys/boot/efi/libefi/libefi.c projects/zfsd/head/sys/boot/fdt/Makefile projects/zfsd/head/sys/boot/fdt/dts/arm/am335x.dtsi projects/zfsd/head/sys/boot/fdt/dts/arm/cubieboard2.dts projects/zfsd/head/sys/boot/fdt/dts/arm/exynos5420-arndale-octa.dts projects/zfsd/head/sys/boot/fdt/dts/arm/exynos5420-peach-pit.dts projects/zfsd/head/sys/boot/fdt/dts/arm/exynos5420.dtsi projects/zfsd/head/sys/boot/fdt/dts/arm/imx6.dtsi projects/zfsd/head/sys/boot/fdt/dts/arm/sun4i-a10.dtsi projects/zfsd/head/sys/boot/fdt/dts/arm/sun7i-a20.dtsi projects/zfsd/head/sys/boot/fdt/dts/arm/wandboard-dual.dts projects/zfsd/head/sys/boot/fdt/dts/arm/wandboard-quad.dts projects/zfsd/head/sys/boot/fdt/dts/arm/wandboard-solo.dts projects/zfsd/head/sys/boot/fdt/fdt_loader_cmd.c projects/zfsd/head/sys/boot/ficl/loader.c projects/zfsd/head/sys/boot/i386/boot2/Makefile projects/zfsd/head/sys/boot/i386/gptboot/gptboot.c projects/zfsd/head/sys/boot/i386/gptzfsboot/Makefile projects/zfsd/head/sys/boot/i386/libfirewire/fwohcireg.h projects/zfsd/head/sys/boot/i386/libi386/biospci.c projects/zfsd/head/sys/boot/i386/libi386/comconsole.c projects/zfsd/head/sys/boot/i386/libi386/libi386.h projects/zfsd/head/sys/boot/i386/loader/Makefile projects/zfsd/head/sys/boot/i386/loader/main.c projects/zfsd/head/sys/boot/i386/zfsboot/Makefile projects/zfsd/head/sys/boot/libstand32/Makefile projects/zfsd/head/sys/boot/pc98/boot2/Makefile projects/zfsd/head/sys/boot/pc98/cdboot/cdboot.S projects/zfsd/head/sys/boot/pc98/libpc98/Makefile projects/zfsd/head/sys/boot/pc98/loader/Makefile projects/zfsd/head/sys/boot/powerpc/ofw/ldscript.powerpc projects/zfsd/head/sys/boot/powerpc/ps3/ldscript.powerpc projects/zfsd/head/sys/boot/powerpc/uboot/Makefile projects/zfsd/head/sys/boot/powerpc/uboot/ldscript.powerpc projects/zfsd/head/sys/boot/uboot/Makefile projects/zfsd/head/sys/boot/uboot/common/main.c projects/zfsd/head/sys/boot/uboot/common/metadata.c projects/zfsd/head/sys/boot/uboot/lib/Makefile projects/zfsd/head/sys/boot/uboot/lib/libuboot.h projects/zfsd/head/sys/boot/uboot/lib/module.c projects/zfsd/head/sys/cam/ata/ata_all.c projects/zfsd/head/sys/cam/ata/ata_da.c projects/zfsd/head/sys/cam/ata/ata_xpt.c projects/zfsd/head/sys/cam/cam_ccb.h projects/zfsd/head/sys/cam/cam_queue.c projects/zfsd/head/sys/cam/cam_queue.h projects/zfsd/head/sys/cam/cam_xpt.c projects/zfsd/head/sys/cam/ctl/ctl.c projects/zfsd/head/sys/cam/ctl/ctl.h projects/zfsd/head/sys/cam/ctl/ctl_backend.h projects/zfsd/head/sys/cam/ctl/ctl_backend_block.c projects/zfsd/head/sys/cam/ctl/ctl_backend_ramdisk.c projects/zfsd/head/sys/cam/ctl/ctl_cmd_table.c projects/zfsd/head/sys/cam/ctl/ctl_debug.h projects/zfsd/head/sys/cam/ctl/ctl_error.c projects/zfsd/head/sys/cam/ctl/ctl_error.h projects/zfsd/head/sys/cam/ctl/ctl_frontend.c projects/zfsd/head/sys/cam/ctl/ctl_frontend_cam_sim.c projects/zfsd/head/sys/cam/ctl/ctl_frontend_iscsi.c projects/zfsd/head/sys/cam/ctl/ctl_frontend_iscsi.h projects/zfsd/head/sys/cam/ctl/ctl_io.h projects/zfsd/head/sys/cam/ctl/ctl_ioctl.h projects/zfsd/head/sys/cam/ctl/ctl_private.h projects/zfsd/head/sys/cam/ctl/ctl_scsi_all.c projects/zfsd/head/sys/cam/ctl/ctl_ser_table.c projects/zfsd/head/sys/cam/ctl/ctl_tpc.c projects/zfsd/head/sys/cam/ctl/ctl_util.c projects/zfsd/head/sys/cam/ctl/ctl_util.h projects/zfsd/head/sys/cam/ctl/scsi_ctl.c projects/zfsd/head/sys/cam/scsi/scsi_all.c projects/zfsd/head/sys/cam/scsi/scsi_all.h projects/zfsd/head/sys/cam/scsi/scsi_da.c projects/zfsd/head/sys/cam/scsi/scsi_da.h projects/zfsd/head/sys/cam/scsi/scsi_sa.c projects/zfsd/head/sys/cam/scsi/scsi_xpt.c projects/zfsd/head/sys/cddl/boot/zfs/lz4.c projects/zfsd/head/sys/cddl/boot/zfs/zfsimpl.h projects/zfsd/head/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c projects/zfsd/head/sys/cddl/compat/opensolaris/kern/opensolaris_lookup.c projects/zfsd/head/sys/cddl/compat/opensolaris/sys/assfail.h projects/zfsd/head/sys/cddl/compat/opensolaris/sys/kmem.h projects/zfsd/head/sys/cddl/compat/opensolaris/sys/sdt.h projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bpobj.c projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/range_tree.c projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/space_map.h projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/sys/acl.h projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/sys/debug.h projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/sys/feature_tests.h projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/sys/gfs.h projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/sys/processor.h projects/zfsd/head/sys/cddl/dev/dtrace/dtrace_sysctl.c projects/zfsd/head/sys/cddl/dev/dtrace/powerpc/dtrace_isa.c projects/zfsd/head/sys/cddl/dev/fbt/fbt.c projects/zfsd/head/sys/cddl/dev/fbt/powerpc/fbt_isa.c projects/zfsd/head/sys/compat/freebsd32/freebsd32.h projects/zfsd/head/sys/compat/freebsd32/freebsd32_misc.c projects/zfsd/head/sys/compat/freebsd32/freebsd32_proto.h projects/zfsd/head/sys/compat/freebsd32/freebsd32_syscall.h projects/zfsd/head/sys/compat/freebsd32/freebsd32_syscalls.c projects/zfsd/head/sys/compat/freebsd32/freebsd32_sysent.c projects/zfsd/head/sys/compat/freebsd32/freebsd32_systrace_args.c projects/zfsd/head/sys/compat/freebsd32/freebsd32_util.h projects/zfsd/head/sys/compat/freebsd32/syscalls.master projects/zfsd/head/sys/compat/linprocfs/linprocfs.c projects/zfsd/head/sys/compat/linux/linux_ioctl.c projects/zfsd/head/sys/compat/linux/linux_mib.c projects/zfsd/head/sys/compat/ndis/kern_ndis.c projects/zfsd/head/sys/conf/Makefile.arm projects/zfsd/head/sys/conf/NOTES projects/zfsd/head/sys/conf/files projects/zfsd/head/sys/conf/files.amd64 projects/zfsd/head/sys/conf/files.arm projects/zfsd/head/sys/conf/files.i386 projects/zfsd/head/sys/conf/files.pc98 projects/zfsd/head/sys/conf/files.powerpc projects/zfsd/head/sys/conf/kern.mk projects/zfsd/head/sys/conf/kern.opts.mk projects/zfsd/head/sys/conf/kmod.mk projects/zfsd/head/sys/conf/ldscript.powerpc projects/zfsd/head/sys/conf/ldscript.powerpc64 projects/zfsd/head/sys/conf/newvers.sh projects/zfsd/head/sys/conf/options projects/zfsd/head/sys/conf/options.arm projects/zfsd/head/sys/conf/options.pc98 projects/zfsd/head/sys/contrib/altq/altq/if_altq.h projects/zfsd/head/sys/contrib/dev/acpica/acpica_prep.sh projects/zfsd/head/sys/contrib/dev/acpica/changes.txt (contents, props changed) projects/zfsd/head/sys/contrib/dev/acpica/common/adfile.c projects/zfsd/head/sys/contrib/dev/acpica/common/adisasm.c projects/zfsd/head/sys/contrib/dev/acpica/common/adwalk.c projects/zfsd/head/sys/contrib/dev/acpica/common/ahpredef.c projects/zfsd/head/sys/contrib/dev/acpica/common/dmextern.c projects/zfsd/head/sys/contrib/dev/acpica/common/dmrestag.c projects/zfsd/head/sys/contrib/dev/acpica/common/dmtable.c projects/zfsd/head/sys/contrib/dev/acpica/common/dmtbdump.c projects/zfsd/head/sys/contrib/dev/acpica/common/dmtbinfo.c projects/zfsd/head/sys/contrib/dev/acpica/common/getopt.c projects/zfsd/head/sys/contrib/dev/acpica/compiler/aslanalyze.c projects/zfsd/head/sys/contrib/dev/acpica/compiler/aslbtypes.c projects/zfsd/head/sys/contrib/dev/acpica/compiler/aslcodegen.c projects/zfsd/head/sys/contrib/dev/acpica/compiler/aslcompile.c projects/zfsd/head/sys/contrib/dev/acpica/compiler/aslcompiler.h projects/zfsd/head/sys/contrib/dev/acpica/compiler/aslcompiler.l projects/zfsd/head/sys/contrib/dev/acpica/compiler/asldefine.h projects/zfsd/head/sys/contrib/dev/acpica/compiler/aslerror.c projects/zfsd/head/sys/contrib/dev/acpica/compiler/aslfileio.c projects/zfsd/head/sys/contrib/dev/acpica/compiler/aslfiles.c projects/zfsd/head/sys/contrib/dev/acpica/compiler/aslfold.c projects/zfsd/head/sys/contrib/dev/acpica/compiler/aslglobal.h projects/zfsd/head/sys/contrib/dev/acpica/compiler/aslhex.c projects/zfsd/head/sys/contrib/dev/acpica/compiler/asllength.c projects/zfsd/head/sys/contrib/dev/acpica/compiler/asllisting.c projects/zfsd/head/sys/contrib/dev/acpica/compiler/asllistsup.c projects/zfsd/head/sys/contrib/dev/acpica/compiler/aslload.c projects/zfsd/head/sys/contrib/dev/acpica/compiler/asllookup.c projects/zfsd/head/sys/contrib/dev/acpica/compiler/aslmain.c projects/zfsd/head/sys/contrib/dev/acpica/compiler/aslmap.c projects/zfsd/head/sys/contrib/dev/acpica/compiler/aslmessages.h projects/zfsd/head/sys/contrib/dev/acpica/compiler/aslmethod.c projects/zfsd/head/sys/contrib/dev/acpica/compiler/aslnamesp.c projects/zfsd/head/sys/contrib/dev/acpica/compiler/asloffset.c projects/zfsd/head/sys/contrib/dev/acpica/compiler/aslopcodes.c projects/zfsd/head/sys/contrib/dev/acpica/compiler/asloperands.c projects/zfsd/head/sys/contrib/dev/acpica/compiler/aslopt.c projects/zfsd/head/sys/contrib/dev/acpica/compiler/asloptions.c projects/zfsd/head/sys/contrib/dev/acpica/compiler/aslpredef.c projects/zfsd/head/sys/contrib/dev/acpica/compiler/aslprepkg.c projects/zfsd/head/sys/contrib/dev/acpica/compiler/aslresource.c projects/zfsd/head/sys/contrib/dev/acpica/compiler/aslrestype1.c projects/zfsd/head/sys/contrib/dev/acpica/compiler/aslrestype1i.c projects/zfsd/head/sys/contrib/dev/acpica/compiler/aslrestype2.c projects/zfsd/head/sys/contrib/dev/acpica/compiler/aslrestype2d.c projects/zfsd/head/sys/contrib/dev/acpica/compiler/aslrestype2e.c projects/zfsd/head/sys/contrib/dev/acpica/compiler/aslrestype2q.c projects/zfsd/head/sys/contrib/dev/acpica/compiler/aslrestype2s.c projects/zfsd/head/sys/contrib/dev/acpica/compiler/aslrestype2w.c projects/zfsd/head/sys/contrib/dev/acpica/compiler/aslstartup.c projects/zfsd/head/sys/contrib/dev/acpica/compiler/aslstubs.c projects/zfsd/head/sys/contrib/dev/acpica/compiler/aslsupport.l projects/zfsd/head/sys/contrib/dev/acpica/compiler/asltransform.c projects/zfsd/head/sys/contrib/dev/acpica/compiler/asltree.c projects/zfsd/head/sys/contrib/dev/acpica/compiler/asltypes.h projects/zfsd/head/sys/contrib/dev/acpica/compiler/aslutils.c projects/zfsd/head/sys/contrib/dev/acpica/compiler/asluuid.c projects/zfsd/head/sys/contrib/dev/acpica/compiler/aslwalks.c projects/zfsd/head/sys/contrib/dev/acpica/compiler/aslxref.c projects/zfsd/head/sys/contrib/dev/acpica/compiler/dtcompile.c projects/zfsd/head/sys/contrib/dev/acpica/compiler/dtcompiler.h projects/zfsd/head/sys/contrib/dev/acpica/compiler/dtexpress.c projects/zfsd/head/sys/contrib/dev/acpica/compiler/dtfield.c projects/zfsd/head/sys/contrib/dev/acpica/compiler/dtio.c projects/zfsd/head/sys/contrib/dev/acpica/compiler/dtparser.l projects/zfsd/head/sys/contrib/dev/acpica/compiler/dtparser.y projects/zfsd/head/sys/contrib/dev/acpica/compiler/dtsubtable.c projects/zfsd/head/sys/contrib/dev/acpica/compiler/dttable.c projects/zfsd/head/sys/contrib/dev/acpica/compiler/dttemplate.c projects/zfsd/head/sys/contrib/dev/acpica/compiler/dttemplate.h projects/zfsd/head/sys/contrib/dev/acpica/compiler/dtutils.c projects/zfsd/head/sys/contrib/dev/acpica/compiler/preprocess.h projects/zfsd/head/sys/contrib/dev/acpica/compiler/prexpress.c projects/zfsd/head/sys/contrib/dev/acpica/compiler/prmacros.c projects/zfsd/head/sys/contrib/dev/acpica/compiler/prparser.l projects/zfsd/head/sys/contrib/dev/acpica/compiler/prparser.y projects/zfsd/head/sys/contrib/dev/acpica/compiler/prscan.c projects/zfsd/head/sys/contrib/dev/acpica/compiler/prutils.c projects/zfsd/head/sys/contrib/dev/acpica/components/debugger/dbcmds.c projects/zfsd/head/sys/contrib/dev/acpica/components/debugger/dbconvert.c projects/zfsd/head/sys/contrib/dev/acpica/components/debugger/dbdisply.c projects/zfsd/head/sys/contrib/dev/acpica/components/debugger/dbexec.c projects/zfsd/head/sys/contrib/dev/acpica/components/debugger/dbfileio.c projects/zfsd/head/sys/contrib/dev/acpica/components/debugger/dbhistry.c projects/zfsd/head/sys/contrib/dev/acpica/components/debugger/dbinput.c projects/zfsd/head/sys/contrib/dev/acpica/components/debugger/dbmethod.c projects/zfsd/head/sys/contrib/dev/acpica/components/debugger/dbnames.c projects/zfsd/head/sys/contrib/dev/acpica/components/debugger/dbstats.c projects/zfsd/head/sys/contrib/dev/acpica/components/debugger/dbutils.c projects/zfsd/head/sys/contrib/dev/acpica/components/debugger/dbxface.c projects/zfsd/head/sys/contrib/dev/acpica/components/disassembler/dmbuffer.c projects/zfsd/head/sys/contrib/dev/acpica/components/disassembler/dmdeferred.c projects/zfsd/head/sys/contrib/dev/acpica/components/disassembler/dmnames.c projects/zfsd/head/sys/contrib/dev/acpica/components/disassembler/dmobject.c projects/zfsd/head/sys/contrib/dev/acpica/components/disassembler/dmopcode.c projects/zfsd/head/sys/contrib/dev/acpica/components/disassembler/dmresrc.c projects/zfsd/head/sys/contrib/dev/acpica/components/disassembler/dmresrcl.c projects/zfsd/head/sys/contrib/dev/acpica/components/disassembler/dmresrcl2.c projects/zfsd/head/sys/contrib/dev/acpica/components/disassembler/dmresrcs.c projects/zfsd/head/sys/contrib/dev/acpica/components/disassembler/dmutils.c projects/zfsd/head/sys/contrib/dev/acpica/components/disassembler/dmwalk.c projects/zfsd/head/sys/contrib/dev/acpica/components/dispatcher/dsargs.c projects/zfsd/head/sys/contrib/dev/acpica/components/dispatcher/dscontrol.c projects/zfsd/head/sys/contrib/dev/acpica/components/dispatcher/dsfield.c projects/zfsd/head/sys/contrib/dev/acpica/components/dispatcher/dsinit.c projects/zfsd/head/sys/contrib/dev/acpica/components/dispatcher/dsmethod.c projects/zfsd/head/sys/contrib/dev/acpica/components/dispatcher/dsmthdat.c projects/zfsd/head/sys/contrib/dev/acpica/components/dispatcher/dsobject.c projects/zfsd/head/sys/contrib/dev/acpica/components/dispatcher/dsopcode.c projects/zfsd/head/sys/contrib/dev/acpica/components/dispatcher/dsutils.c projects/zfsd/head/sys/contrib/dev/acpica/components/dispatcher/dswexec.c projects/zfsd/head/sys/contrib/dev/acpica/components/dispatcher/dswload.c projects/zfsd/head/sys/contrib/dev/acpica/components/dispatcher/dswload2.c projects/zfsd/head/sys/contrib/dev/acpica/components/dispatcher/dswscope.c projects/zfsd/head/sys/contrib/dev/acpica/components/dispatcher/dswstate.c projects/zfsd/head/sys/contrib/dev/acpica/components/events/evevent.c projects/zfsd/head/sys/contrib/dev/acpica/components/events/evglock.c projects/zfsd/head/sys/contrib/dev/acpica/components/events/evgpe.c projects/zfsd/head/sys/contrib/dev/acpica/components/events/evgpeblk.c projects/zfsd/head/sys/contrib/dev/acpica/components/events/evgpeinit.c projects/zfsd/head/sys/contrib/dev/acpica/components/events/evgpeutil.c projects/zfsd/head/sys/contrib/dev/acpica/components/events/evhandler.c projects/zfsd/head/sys/contrib/dev/acpica/components/events/evmisc.c projects/zfsd/head/sys/contrib/dev/acpica/components/events/evregion.c projects/zfsd/head/sys/contrib/dev/acpica/components/events/evrgnini.c projects/zfsd/head/sys/contrib/dev/acpica/components/events/evsci.c projects/zfsd/head/sys/contrib/dev/acpica/components/events/evxface.c projects/zfsd/head/sys/contrib/dev/acpica/components/events/evxfevnt.c projects/zfsd/head/sys/contrib/dev/acpica/components/events/evxfgpe.c projects/zfsd/head/sys/contrib/dev/acpica/components/events/evxfregn.c projects/zfsd/head/sys/contrib/dev/acpica/components/executer/exconfig.c projects/zfsd/head/sys/contrib/dev/acpica/components/executer/exconvrt.c projects/zfsd/head/sys/contrib/dev/acpica/components/executer/excreate.c projects/zfsd/head/sys/contrib/dev/acpica/components/executer/exdebug.c projects/zfsd/head/sys/contrib/dev/acpica/components/executer/exdump.c projects/zfsd/head/sys/contrib/dev/acpica/components/executer/exfield.c projects/zfsd/head/sys/contrib/dev/acpica/components/executer/exfldio.c projects/zfsd/head/sys/contrib/dev/acpica/components/executer/exmisc.c projects/zfsd/head/sys/contrib/dev/acpica/components/executer/exmutex.c projects/zfsd/head/sys/contrib/dev/acpica/components/executer/exnames.c projects/zfsd/head/sys/contrib/dev/acpica/components/executer/exoparg1.c projects/zfsd/head/sys/contrib/dev/acpica/components/executer/exoparg2.c projects/zfsd/head/sys/contrib/dev/acpica/components/executer/exoparg3.c projects/zfsd/head/sys/contrib/dev/acpica/components/executer/exoparg6.c projects/zfsd/head/sys/contrib/dev/acpica/components/executer/exprep.c projects/zfsd/head/sys/contrib/dev/acpica/components/executer/exregion.c projects/zfsd/head/sys/contrib/dev/acpica/components/executer/exresnte.c projects/zfsd/head/sys/contrib/dev/acpica/components/executer/exresolv.c projects/zfsd/head/sys/contrib/dev/acpica/components/executer/exresop.c projects/zfsd/head/sys/contrib/dev/acpica/components/executer/exstore.c projects/zfsd/head/sys/contrib/dev/acpica/components/executer/exstoren.c projects/zfsd/head/sys/contrib/dev/acpica/components/executer/exstorob.c projects/zfsd/head/sys/contrib/dev/acpica/components/executer/exsystem.c projects/zfsd/head/sys/contrib/dev/acpica/components/executer/exutils.c projects/zfsd/head/sys/contrib/dev/acpica/components/hardware/hwacpi.c projects/zfsd/head/sys/contrib/dev/acpica/components/hardware/hwesleep.c projects/zfsd/head/sys/contrib/dev/acpica/components/hardware/hwgpe.c projects/zfsd/head/sys/contrib/dev/acpica/components/hardware/hwpci.c projects/zfsd/head/sys/contrib/dev/acpica/components/hardware/hwregs.c projects/zfsd/head/sys/contrib/dev/acpica/components/hardware/hwsleep.c projects/zfsd/head/sys/contrib/dev/acpica/components/hardware/hwtimer.c projects/zfsd/head/sys/contrib/dev/acpica/components/hardware/hwvalid.c projects/zfsd/head/sys/contrib/dev/acpica/components/hardware/hwxface.c projects/zfsd/head/sys/contrib/dev/acpica/components/hardware/hwxfsleep.c projects/zfsd/head/sys/contrib/dev/acpica/components/namespace/nsaccess.c projects/zfsd/head/sys/contrib/dev/acpica/components/namespace/nsalloc.c projects/zfsd/head/sys/contrib/dev/acpica/components/namespace/nsarguments.c projects/zfsd/head/sys/contrib/dev/acpica/components/namespace/nsconvert.c projects/zfsd/head/sys/contrib/dev/acpica/components/namespace/nsdump.c projects/zfsd/head/sys/contrib/dev/acpica/components/namespace/nsdumpdv.c projects/zfsd/head/sys/contrib/dev/acpica/components/namespace/nseval.c projects/zfsd/head/sys/contrib/dev/acpica/components/namespace/nsinit.c projects/zfsd/head/sys/contrib/dev/acpica/components/namespace/nsload.c projects/zfsd/head/sys/contrib/dev/acpica/components/namespace/nsnames.c projects/zfsd/head/sys/contrib/dev/acpica/components/namespace/nsobject.c projects/zfsd/head/sys/contrib/dev/acpica/components/namespace/nsparse.c projects/zfsd/head/sys/contrib/dev/acpica/components/namespace/nspredef.c projects/zfsd/head/sys/contrib/dev/acpica/components/namespace/nsprepkg.c projects/zfsd/head/sys/contrib/dev/acpica/components/namespace/nsrepair.c projects/zfsd/head/sys/contrib/dev/acpica/components/namespace/nsrepair2.c projects/zfsd/head/sys/contrib/dev/acpica/components/namespace/nssearch.c projects/zfsd/head/sys/contrib/dev/acpica/components/namespace/nsutils.c projects/zfsd/head/sys/contrib/dev/acpica/components/namespace/nswalk.c projects/zfsd/head/sys/contrib/dev/acpica/components/namespace/nsxfeval.c projects/zfsd/head/sys/contrib/dev/acpica/components/namespace/nsxfname.c projects/zfsd/head/sys/contrib/dev/acpica/components/namespace/nsxfobj.c projects/zfsd/head/sys/contrib/dev/acpica/components/parser/psargs.c projects/zfsd/head/sys/contrib/dev/acpica/components/parser/psloop.c projects/zfsd/head/sys/contrib/dev/acpica/components/parser/psobject.c projects/zfsd/head/sys/contrib/dev/acpica/components/parser/psopcode.c projects/zfsd/head/sys/contrib/dev/acpica/components/parser/psopinfo.c projects/zfsd/head/sys/contrib/dev/acpica/components/parser/psparse.c projects/zfsd/head/sys/contrib/dev/acpica/components/parser/psscope.c projects/zfsd/head/sys/contrib/dev/acpica/components/parser/pstree.c projects/zfsd/head/sys/contrib/dev/acpica/components/parser/psutils.c projects/zfsd/head/sys/contrib/dev/acpica/components/parser/pswalk.c projects/zfsd/head/sys/contrib/dev/acpica/components/parser/psxface.c projects/zfsd/head/sys/contrib/dev/acpica/components/resources/rsaddr.c projects/zfsd/head/sys/contrib/dev/acpica/components/resources/rscalc.c projects/zfsd/head/sys/contrib/dev/acpica/components/resources/rscreate.c projects/zfsd/head/sys/contrib/dev/acpica/components/resources/rsdump.c projects/zfsd/head/sys/contrib/dev/acpica/components/resources/rsdumpinfo.c projects/zfsd/head/sys/contrib/dev/acpica/components/resources/rsinfo.c projects/zfsd/head/sys/contrib/dev/acpica/components/resources/rsio.c projects/zfsd/head/sys/contrib/dev/acpica/components/resources/rsirq.c projects/zfsd/head/sys/contrib/dev/acpica/components/resources/rslist.c projects/zfsd/head/sys/contrib/dev/acpica/components/resources/rsmemory.c projects/zfsd/head/sys/contrib/dev/acpica/components/resources/rsmisc.c projects/zfsd/head/sys/contrib/dev/acpica/components/resources/rsserial.c projects/zfsd/head/sys/contrib/dev/acpica/components/resources/rsutils.c projects/zfsd/head/sys/contrib/dev/acpica/components/resources/rsxface.c projects/zfsd/head/sys/contrib/dev/acpica/components/tables/tbfadt.c projects/zfsd/head/sys/contrib/dev/acpica/components/tables/tbfind.c projects/zfsd/head/sys/contrib/dev/acpica/components/tables/tbinstal.c projects/zfsd/head/sys/contrib/dev/acpica/components/tables/tbprint.c projects/zfsd/head/sys/contrib/dev/acpica/components/tables/tbutils.c projects/zfsd/head/sys/contrib/dev/acpica/components/tables/tbxface.c projects/zfsd/head/sys/contrib/dev/acpica/components/tables/tbxfload.c projects/zfsd/head/sys/contrib/dev/acpica/components/tables/tbxfroot.c projects/zfsd/head/sys/contrib/dev/acpica/components/utilities/utaddress.c projects/zfsd/head/sys/contrib/dev/acpica/components/utilities/utalloc.c projects/zfsd/head/sys/contrib/dev/acpica/components/utilities/utbuffer.c projects/zfsd/head/sys/contrib/dev/acpica/components/utilities/utcache.c projects/zfsd/head/sys/contrib/dev/acpica/components/utilities/utcopy.c projects/zfsd/head/sys/contrib/dev/acpica/components/utilities/utdebug.c projects/zfsd/head/sys/contrib/dev/acpica/components/utilities/utdecode.c projects/zfsd/head/sys/contrib/dev/acpica/components/utilities/utdelete.c projects/zfsd/head/sys/contrib/dev/acpica/components/utilities/uterror.c projects/zfsd/head/sys/contrib/dev/acpica/components/utilities/uteval.c projects/zfsd/head/sys/contrib/dev/acpica/components/utilities/utexcep.c projects/zfsd/head/sys/contrib/dev/acpica/components/utilities/utglobal.c projects/zfsd/head/sys/contrib/dev/acpica/components/utilities/utids.c projects/zfsd/head/sys/contrib/dev/acpica/components/utilities/utinit.c projects/zfsd/head/sys/contrib/dev/acpica/components/utilities/utlock.c projects/zfsd/head/sys/contrib/dev/acpica/components/utilities/utmath.c projects/zfsd/head/sys/contrib/dev/acpica/components/utilities/utmisc.c projects/zfsd/head/sys/contrib/dev/acpica/components/utilities/utmutex.c projects/zfsd/head/sys/contrib/dev/acpica/components/utilities/utobject.c projects/zfsd/head/sys/contrib/dev/acpica/components/utilities/utosi.c projects/zfsd/head/sys/contrib/dev/acpica/components/utilities/utownerid.c projects/zfsd/head/sys/contrib/dev/acpica/components/utilities/utpredef.c projects/zfsd/head/sys/contrib/dev/acpica/components/utilities/utresrc.c projects/zfsd/head/sys/contrib/dev/acpica/components/utilities/utstate.c projects/zfsd/head/sys/contrib/dev/acpica/components/utilities/utstring.c projects/zfsd/head/sys/contrib/dev/acpica/components/utilities/uttrack.c projects/zfsd/head/sys/contrib/dev/acpica/components/utilities/utxface.c projects/zfsd/head/sys/contrib/dev/acpica/components/utilities/utxferror.c projects/zfsd/head/sys/contrib/dev/acpica/components/utilities/utxfinit.c projects/zfsd/head/sys/contrib/dev/acpica/components/utilities/utxfmutex.c projects/zfsd/head/sys/contrib/dev/acpica/include/acapps.h projects/zfsd/head/sys/contrib/dev/acpica/include/acbuffer.h projects/zfsd/head/sys/contrib/dev/acpica/include/accommon.h projects/zfsd/head/sys/contrib/dev/acpica/include/acconfig.h projects/zfsd/head/sys/contrib/dev/acpica/include/acdebug.h projects/zfsd/head/sys/contrib/dev/acpica/include/acdisasm.h projects/zfsd/head/sys/contrib/dev/acpica/include/acdispat.h projects/zfsd/head/sys/contrib/dev/acpica/include/acevents.h projects/zfsd/head/sys/contrib/dev/acpica/include/acexcep.h projects/zfsd/head/sys/contrib/dev/acpica/include/acglobal.h projects/zfsd/head/sys/contrib/dev/acpica/include/achware.h projects/zfsd/head/sys/contrib/dev/acpica/include/acinterp.h projects/zfsd/head/sys/contrib/dev/acpica/include/aclocal.h projects/zfsd/head/sys/contrib/dev/acpica/include/acmacros.h projects/zfsd/head/sys/contrib/dev/acpica/include/acnames.h projects/zfsd/head/sys/contrib/dev/acpica/include/acnamesp.h projects/zfsd/head/sys/contrib/dev/acpica/include/acobject.h projects/zfsd/head/sys/contrib/dev/acpica/include/acopcode.h projects/zfsd/head/sys/contrib/dev/acpica/include/acoutput.h projects/zfsd/head/sys/contrib/dev/acpica/include/acparser.h projects/zfsd/head/sys/contrib/dev/acpica/include/acpi.h projects/zfsd/head/sys/contrib/dev/acpica/include/acpiosxf.h projects/zfsd/head/sys/contrib/dev/acpica/include/acpixf.h projects/zfsd/head/sys/contrib/dev/acpica/include/acpredef.h projects/zfsd/head/sys/contrib/dev/acpica/include/acresrc.h projects/zfsd/head/sys/contrib/dev/acpica/include/acrestyp.h projects/zfsd/head/sys/contrib/dev/acpica/include/acstruct.h projects/zfsd/head/sys/contrib/dev/acpica/include/actables.h projects/zfsd/head/sys/contrib/dev/acpica/include/actbl.h projects/zfsd/head/sys/contrib/dev/acpica/include/actbl1.h projects/zfsd/head/sys/contrib/dev/acpica/include/actbl2.h projects/zfsd/head/sys/contrib/dev/acpica/include/actbl3.h projects/zfsd/head/sys/contrib/dev/acpica/include/actypes.h projects/zfsd/head/sys/contrib/dev/acpica/include/acutils.h projects/zfsd/head/sys/contrib/dev/acpica/include/amlcode.h projects/zfsd/head/sys/contrib/dev/acpica/include/amlresrc.h projects/zfsd/head/sys/contrib/dev/acpica/include/platform/acenv.h projects/zfsd/head/sys/contrib/dev/acpica/include/platform/acfreebsd.h projects/zfsd/head/sys/contrib/dev/acpica/include/platform/acgcc.h projects/zfsd/head/sys/contrib/dev/acpica/os_specific/service_layers/osunixxf.c projects/zfsd/head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300.h projects/zfsd/head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_attach.c projects/zfsd/head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_eeprom.c projects/zfsd/head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.c projects/zfsd/head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.h projects/zfsd/head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_reset.c projects/zfsd/head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_stub.c projects/zfsd/head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300desc.h projects/zfsd/head/sys/contrib/ipfilter/netinet/fil.c projects/zfsd/head/sys/contrib/ipfilter/netinet/ip_dns_pxy.c projects/zfsd/head/sys/contrib/ipfilter/netinet/ip_dstlist.c projects/zfsd/head/sys/contrib/ipfilter/netinet/ip_frag.c projects/zfsd/head/sys/contrib/ipfilter/netinet/ip_nat.c projects/zfsd/head/sys/contrib/rdma/krping/krping.c projects/zfsd/head/sys/ddb/db_access.c projects/zfsd/head/sys/ddb/db_break.c projects/zfsd/head/sys/ddb/db_command.c projects/zfsd/head/sys/ddb/db_examine.c projects/zfsd/head/sys/ddb/db_input.c projects/zfsd/head/sys/ddb/db_lex.c projects/zfsd/head/sys/ddb/db_main.c projects/zfsd/head/sys/ddb/db_output.c projects/zfsd/head/sys/ddb/db_output.h projects/zfsd/head/sys/ddb/db_print.c projects/zfsd/head/sys/ddb/db_ps.c projects/zfsd/head/sys/ddb/db_run.c projects/zfsd/head/sys/ddb/db_sym.c projects/zfsd/head/sys/ddb/db_sym.h projects/zfsd/head/sys/ddb/db_textdump.c projects/zfsd/head/sys/ddb/db_variables.h projects/zfsd/head/sys/ddb/db_watch.c projects/zfsd/head/sys/ddb/db_watch.h projects/zfsd/head/sys/ddb/db_write_cmd.c projects/zfsd/head/sys/ddb/ddb.h projects/zfsd/head/sys/dev/acpi_support/acpi_asus.c projects/zfsd/head/sys/dev/acpi_support/acpi_asus_wmi.c projects/zfsd/head/sys/dev/acpi_support/acpi_hp.c projects/zfsd/head/sys/dev/acpi_support/acpi_ibm.c projects/zfsd/head/sys/dev/acpi_support/acpi_rapidstart.c projects/zfsd/head/sys/dev/acpi_support/acpi_sony.c projects/zfsd/head/sys/dev/acpica/Osd/OsdSchedule.c projects/zfsd/head/sys/dev/acpica/Osd/OsdTable.c projects/zfsd/head/sys/dev/acpica/acpi.c projects/zfsd/head/sys/dev/acpica/acpi_hpet.c projects/zfsd/head/sys/dev/acpica/acpi_pci.c projects/zfsd/head/sys/dev/acpica/acpivar.h projects/zfsd/head/sys/dev/ae/if_ae.c projects/zfsd/head/sys/dev/age/if_age.c projects/zfsd/head/sys/dev/agp/agp.c projects/zfsd/head/sys/dev/agp/agpvar.h projects/zfsd/head/sys/dev/ahci/ahci.c projects/zfsd/head/sys/dev/ahci/ahci.h projects/zfsd/head/sys/dev/ahci/ahciem.c projects/zfsd/head/sys/dev/alc/if_alc.c projects/zfsd/head/sys/dev/alc/if_alcreg.h projects/zfsd/head/sys/dev/alc/if_alcvar.h projects/zfsd/head/sys/dev/ale/if_ale.c projects/zfsd/head/sys/dev/ale/if_alereg.h projects/zfsd/head/sys/dev/altera/atse/a_api.h projects/zfsd/head/sys/dev/altera/atse/if_atse.c projects/zfsd/head/sys/dev/amdtemp/amdtemp.c projects/zfsd/head/sys/dev/an/if_an.c projects/zfsd/head/sys/dev/asmc/asmc.c projects/zfsd/head/sys/dev/asmc/asmcvar.h projects/zfsd/head/sys/dev/ata/ata-pci.h projects/zfsd/head/sys/dev/ata/chipsets/ata-jmicron.c projects/zfsd/head/sys/dev/ath/ath_hal/ah.c projects/zfsd/head/sys/dev/ath/ath_hal/ah.h projects/zfsd/head/sys/dev/ath/ath_hal/ah_internal.h projects/zfsd/head/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c projects/zfsd/head/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c projects/zfsd/head/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c projects/zfsd/head/sys/dev/ath/ath_hal/ar5312/ar5312_attach.c projects/zfsd/head/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c projects/zfsd/head/sys/dev/ath/ath_hal/ar9001/ar9130_attach.c projects/zfsd/head/sys/dev/ath/ath_hal/ar9001/ar9160_attach.c projects/zfsd/head/sys/dev/ath/ath_hal/ar9002/ar9280_attach.c projects/zfsd/head/sys/dev/ath/ath_hal/ar9002/ar9285_attach.c projects/zfsd/head/sys/dev/ath/ath_hal/ar9002/ar9287_attach.c projects/zfsd/head/sys/dev/ath/if_ath.c projects/zfsd/head/sys/dev/ath/if_ath_beacon.c projects/zfsd/head/sys/dev/ath/if_ath_lna_div.c projects/zfsd/head/sys/dev/ath/if_ath_pci.c projects/zfsd/head/sys/dev/ath/if_ath_rx.c projects/zfsd/head/sys/dev/ath/if_ath_rx_edma.c projects/zfsd/head/sys/dev/ath/if_ath_tx.c projects/zfsd/head/sys/dev/ath/if_athvar.h projects/zfsd/head/sys/dev/atkbdc/atkbd.c projects/zfsd/head/sys/dev/bce/if_bce.c projects/zfsd/head/sys/dev/bce/if_bcereg.h projects/zfsd/head/sys/dev/bfe/if_bfe.c projects/zfsd/head/sys/dev/bge/if_bge.c projects/zfsd/head/sys/dev/bktr/CHANGELOG.TXT projects/zfsd/head/sys/dev/bm/if_bm.c projects/zfsd/head/sys/dev/bwi/if_bwi.c projects/zfsd/head/sys/dev/bwn/if_bwn.c projects/zfsd/head/sys/dev/bxe/bxe.c projects/zfsd/head/sys/dev/bxe/bxe_stats.c projects/zfsd/head/sys/dev/bxe/bxe_stats.h projects/zfsd/head/sys/dev/bxe/ecore_sp.h projects/zfsd/head/sys/dev/cadence/if_cgem.c projects/zfsd/head/sys/dev/cadence/if_cgem_hw.h projects/zfsd/head/sys/dev/cas/if_cas.c projects/zfsd/head/sys/dev/ce/if_ce.c projects/zfsd/head/sys/dev/cfe/cfe_env.c projects/zfsd/head/sys/dev/cfi/cfi_core.c projects/zfsd/head/sys/dev/cm/smc90cx6.c projects/zfsd/head/sys/dev/cp/if_cp.c projects/zfsd/head/sys/dev/cs/if_cs.c projects/zfsd/head/sys/dev/ctau/if_ct.c projects/zfsd/head/sys/dev/cx/if_cx.c projects/zfsd/head/sys/dev/cxgb/common/cxgb_ael1002.c projects/zfsd/head/sys/dev/cxgb/cxgb_adapter.h projects/zfsd/head/sys/dev/cxgb/cxgb_main.c projects/zfsd/head/sys/dev/cxgb/cxgb_osdep.h projects/zfsd/head/sys/dev/cxgb/cxgb_sge.c projects/zfsd/head/sys/dev/cxgbe/adapter.h projects/zfsd/head/sys/dev/cxgbe/common/t4_msg.h projects/zfsd/head/sys/dev/cxgbe/common/t4_regs.h projects/zfsd/head/sys/dev/cxgbe/firmware/t4fw_cfg.txt projects/zfsd/head/sys/dev/cxgbe/firmware/t5fw_cfg.txt projects/zfsd/head/sys/dev/cxgbe/iw_cxgbe/cm.c projects/zfsd/head/sys/dev/cxgbe/iw_cxgbe/iw_cxgbe.h projects/zfsd/head/sys/dev/cxgbe/iw_cxgbe/qp.c projects/zfsd/head/sys/dev/cxgbe/t4_main.c projects/zfsd/head/sys/dev/cxgbe/t4_netmap.c projects/zfsd/head/sys/dev/cxgbe/tom/t4_connect.c projects/zfsd/head/sys/dev/cxgbe/tom/t4_cpl_io.c projects/zfsd/head/sys/dev/cxgbe/tom/t4_listen.c projects/zfsd/head/sys/dev/cxgbe/tom/t4_tom.c projects/zfsd/head/sys/dev/cxgbe/tom/t4_tom.h projects/zfsd/head/sys/dev/cxgbe/tom/t4_tom_l2t.c projects/zfsd/head/sys/dev/dc/if_dc.c projects/zfsd/head/sys/dev/de/if_de.c projects/zfsd/head/sys/dev/digi/digi_isa.c projects/zfsd/head/sys/dev/drm/drm_sysctl.c projects/zfsd/head/sys/dev/drm2/drm_agpsupport.c projects/zfsd/head/sys/dev/drm2/drm_crtc_helper.c projects/zfsd/head/sys/dev/drm2/drm_fb_helper.c projects/zfsd/head/sys/dev/drm2/drm_gem_names.c projects/zfsd/head/sys/dev/drm2/drm_gem_names.h projects/zfsd/head/sys/dev/drm2/i915/i915_dma.c projects/zfsd/head/sys/dev/drm2/i915/i915_drm.h projects/zfsd/head/sys/dev/drm2/i915/i915_drv.c projects/zfsd/head/sys/dev/drm2/i915/i915_drv.h projects/zfsd/head/sys/dev/drm2/i915/i915_gem.c projects/zfsd/head/sys/dev/drm2/i915/i915_gem_execbuffer.c projects/zfsd/head/sys/dev/drm2/i915/i915_gem_gtt.c projects/zfsd/head/sys/dev/drm2/i915/i915_irq.c projects/zfsd/head/sys/dev/drm2/i915/i915_reg.h projects/zfsd/head/sys/dev/drm2/i915/intel_opregion.c projects/zfsd/head/sys/dev/drm2/i915/intel_ringbuffer.c projects/zfsd/head/sys/dev/drm2/i915/intel_ringbuffer.h projects/zfsd/head/sys/dev/drm2/radeon/radeon.h projects/zfsd/head/sys/dev/drm2/radeon/radeon_device.c projects/zfsd/head/sys/dev/drm2/radeon/radeon_fb.c projects/zfsd/head/sys/dev/drm2/radeon/radeon_ttm.c projects/zfsd/head/sys/dev/drm2/ttm/ttm_agp_backend.c projects/zfsd/head/sys/dev/drm2/ttm/ttm_bo_driver.h projects/zfsd/head/sys/dev/drm2/ttm/ttm_page_alloc.c projects/zfsd/head/sys/dev/e1000/if_em.c projects/zfsd/head/sys/dev/e1000/if_igb.c projects/zfsd/head/sys/dev/e1000/if_igb.h projects/zfsd/head/sys/dev/e1000/if_lem.c projects/zfsd/head/sys/dev/ed/if_ed.c projects/zfsd/head/sys/dev/en/midway.c projects/zfsd/head/sys/dev/ep/if_ep.c projects/zfsd/head/sys/dev/et/if_et.c projects/zfsd/head/sys/dev/ex/if_ex.c projects/zfsd/head/sys/dev/fatm/if_fatm.c projects/zfsd/head/sys/dev/fb/creator_vt.c projects/zfsd/head/sys/dev/fdc/fdc.c projects/zfsd/head/sys/dev/fdc/fdcvar.h projects/zfsd/head/sys/dev/fdt/fdt_common.c projects/zfsd/head/sys/dev/fdt/fdt_common.h projects/zfsd/head/sys/dev/fdt/simplebus.c projects/zfsd/head/sys/dev/fe/if_fe.c projects/zfsd/head/sys/dev/ffec/if_ffec.c projects/zfsd/head/sys/dev/firewire/firewire.c projects/zfsd/head/sys/dev/firewire/firewire.h projects/zfsd/head/sys/dev/firewire/firewire_phy.h projects/zfsd/head/sys/dev/firewire/firewirereg.h projects/zfsd/head/sys/dev/firewire/fwcrom.c projects/zfsd/head/sys/dev/firewire/fwdev.c projects/zfsd/head/sys/dev/firewire/fwdma.c projects/zfsd/head/sys/dev/firewire/fwdma.h projects/zfsd/head/sys/dev/firewire/fwmem.c projects/zfsd/head/sys/dev/firewire/fwohci.c projects/zfsd/head/sys/dev/firewire/fwohci_pci.c projects/zfsd/head/sys/dev/firewire/fwohcireg.h projects/zfsd/head/sys/dev/firewire/fwohcivar.h projects/zfsd/head/sys/dev/firewire/iec68113.h projects/zfsd/head/sys/dev/firewire/if_fwe.c projects/zfsd/head/sys/dev/firewire/if_fwip.c projects/zfsd/head/sys/dev/firewire/sbp.c projects/zfsd/head/sys/dev/firewire/sbp.h projects/zfsd/head/sys/dev/firewire/sbp_targ.c projects/zfsd/head/sys/dev/fxp/if_fxp.c projects/zfsd/head/sys/dev/gem/if_gem.c projects/zfsd/head/sys/dev/glxsb/glxsb.c projects/zfsd/head/sys/dev/gpio/gpiobus.c projects/zfsd/head/sys/dev/gpio/gpiobus_if.m projects/zfsd/head/sys/dev/gpio/gpiobusvar.h projects/zfsd/head/sys/dev/gpio/gpioiic.c projects/zfsd/head/sys/dev/gpio/gpioled.c projects/zfsd/head/sys/dev/gpio/ofw_gpiobus.c projects/zfsd/head/sys/dev/gxemul/ether/if_gx.c projects/zfsd/head/sys/dev/hatm/if_hatm.c projects/zfsd/head/sys/dev/hatm/if_hatm_rx.c projects/zfsd/head/sys/dev/hatm/if_hatm_tx.c projects/zfsd/head/sys/dev/hme/if_hme.c projects/zfsd/head/sys/dev/hptnr/README projects/zfsd/head/sys/dev/hptnr/amd64-elf.hptnr_lib.o.uu projects/zfsd/head/sys/dev/hptnr/hptnr_config.c projects/zfsd/head/sys/dev/hptnr/hptnr_os_bsd.c projects/zfsd/head/sys/dev/hptnr/hptnr_osm_bsd.c projects/zfsd/head/sys/dev/hptnr/i386-elf.hptnr_lib.o.uu projects/zfsd/head/sys/dev/hwpmc/hwpmc_core.c projects/zfsd/head/sys/dev/hwpmc/hwpmc_mod.c projects/zfsd/head/sys/dev/hwpmc/hwpmc_powerpc.c projects/zfsd/head/sys/dev/hyperv/include/hyperv.h projects/zfsd/head/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c projects/zfsd/head/sys/dev/hyperv/stordisengage/hv_ata_pci_disengage.c projects/zfsd/head/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c projects/zfsd/head/sys/dev/hyperv/utilities/hv_kvp.h projects/zfsd/head/sys/dev/hyperv/utilities/hv_util.c projects/zfsd/head/sys/dev/ie/if_ie.c projects/zfsd/head/sys/dev/if_ndis/if_ndis.c projects/zfsd/head/sys/dev/iicbus/if_ic.c projects/zfsd/head/sys/dev/iicbus/iicbus.h projects/zfsd/head/sys/dev/iicbus/iiconf.c projects/zfsd/head/sys/dev/iicbus/max6690.c projects/zfsd/head/sys/dev/ipw/if_ipw.c projects/zfsd/head/sys/dev/iscsi/icl.c projects/zfsd/head/sys/dev/iscsi/icl.h projects/zfsd/head/sys/dev/iscsi/iscsi.c projects/zfsd/head/sys/dev/iscsi_initiator/isc_cam.c projects/zfsd/head/sys/dev/isp/isp_freebsd.c projects/zfsd/head/sys/dev/isp/isp_freebsd.h projects/zfsd/head/sys/dev/isp/isp_library.c projects/zfsd/head/sys/dev/isp/ispmbox.h projects/zfsd/head/sys/dev/iwi/if_iwi.c projects/zfsd/head/sys/dev/iwn/if_iwn.c projects/zfsd/head/sys/dev/iwn/if_iwnreg.h projects/zfsd/head/sys/dev/iwn/if_iwnvar.h projects/zfsd/head/sys/dev/ixgb/if_ixgb.c projects/zfsd/head/sys/dev/ixgbe/ixgbe.c projects/zfsd/head/sys/dev/ixgbe/ixgbe.h projects/zfsd/head/sys/dev/ixgbe/ixv.c projects/zfsd/head/sys/dev/jme/if_jme.c projects/zfsd/head/sys/dev/le/am7990.c projects/zfsd/head/sys/dev/le/am79900.c projects/zfsd/head/sys/dev/le/lance.c projects/zfsd/head/sys/dev/lge/if_lge.c projects/zfsd/head/sys/dev/lmc/if_lmc.c projects/zfsd/head/sys/dev/lmc/if_lmc.h projects/zfsd/head/sys/dev/malo/if_malo.c projects/zfsd/head/sys/dev/mc146818/mc146818.c projects/zfsd/head/sys/dev/mge/if_mge.c projects/zfsd/head/sys/dev/mii/brgphy.c projects/zfsd/head/sys/dev/mii/e1000phy.c projects/zfsd/head/sys/dev/mii/mii.c projects/zfsd/head/sys/dev/mii/miidevs projects/zfsd/head/sys/dev/mii/rgephy.c projects/zfsd/head/sys/dev/mii/rlphy.c projects/zfsd/head/sys/dev/mii/rlswitch.c projects/zfsd/head/sys/dev/mmc/mmc.c projects/zfsd/head/sys/dev/mmc/mmcsd.c projects/zfsd/head/sys/dev/mpr/mpr.c projects/zfsd/head/sys/dev/mpr/mpr_sas.c projects/zfsd/head/sys/dev/mpr/mpr_table.c projects/zfsd/head/sys/dev/mps/mps.c projects/zfsd/head/sys/dev/mrsas/mrsas.c projects/zfsd/head/sys/dev/mrsas/mrsas.h projects/zfsd/head/sys/dev/mrsas/mrsas_cam.c projects/zfsd/head/sys/dev/mrsas/mrsas_fp.c projects/zfsd/head/sys/dev/mrsas/mrsas_ioctl.c projects/zfsd/head/sys/dev/mrsas/mrsas_ioctl.h projects/zfsd/head/sys/dev/mse/mse.c projects/zfsd/head/sys/dev/mse/mse_cbus.c projects/zfsd/head/sys/dev/mse/mse_isa.c projects/zfsd/head/sys/dev/mse/msevar.h projects/zfsd/head/sys/dev/msk/if_msk.c projects/zfsd/head/sys/dev/mvs/mvs.c projects/zfsd/head/sys/dev/mvs/mvs_pci.c projects/zfsd/head/sys/dev/mvs/mvs_soc.c projects/zfsd/head/sys/dev/mwl/if_mwl.c projects/zfsd/head/sys/dev/mxge/if_mxge.c projects/zfsd/head/sys/dev/my/if_my.c projects/zfsd/head/sys/dev/netfpga10g/nf10bmac/if_nf10bmac.c projects/zfsd/head/sys/dev/netmap/if_lem_netmap.h projects/zfsd/head/sys/dev/netmap/if_re_netmap.h projects/zfsd/head/sys/dev/netmap/netmap.c projects/zfsd/head/sys/dev/netmap/netmap_kern.h projects/zfsd/head/sys/dev/nfe/if_nfe.c projects/zfsd/head/sys/dev/nge/if_nge.c projects/zfsd/head/sys/dev/nmdm/nmdm.c projects/zfsd/head/sys/dev/nvram2env/nvram2env.c projects/zfsd/head/sys/dev/oce/oce_if.c projects/zfsd/head/sys/dev/oce/oce_if.h projects/zfsd/head/sys/dev/oce/oce_sysctl.c projects/zfsd/head/sys/dev/ofw/ofw_bus_subr.c projects/zfsd/head/sys/dev/ofw/ofw_bus_subr.h projects/zfsd/head/sys/dev/ofw/ofw_console.c projects/zfsd/head/sys/dev/ofw/ofw_fdt.c projects/zfsd/head/sys/dev/ofw/ofwbus.c projects/zfsd/head/sys/dev/ofw/openfirm.c projects/zfsd/head/sys/dev/ofw/openfirm.h projects/zfsd/head/sys/dev/patm/if_patm_attach.c projects/zfsd/head/sys/dev/patm/if_patm_rx.c projects/zfsd/head/sys/dev/patm/if_patm_tx.c projects/zfsd/head/sys/dev/pci/pci.c projects/zfsd/head/sys/dev/pci/pci_if.m projects/zfsd/head/sys/dev/pci/pci_pci.c projects/zfsd/head/sys/dev/pci/pci_private.h projects/zfsd/head/sys/dev/pci/pcivar.h projects/zfsd/head/sys/dev/pcn/if_pcn.c projects/zfsd/head/sys/dev/pdq/pdq_ifsubr.c projects/zfsd/head/sys/dev/ppbus/if_plip.c projects/zfsd/head/sys/dev/puc/pucdata.c projects/zfsd/head/sys/dev/qlxgb/qla_os.c projects/zfsd/head/sys/dev/qlxgbe/ql_hw.c projects/zfsd/head/sys/dev/qlxgbe/ql_isr.c projects/zfsd/head/sys/dev/qlxgbe/ql_os.c projects/zfsd/head/sys/dev/qlxge/qls_isr.c projects/zfsd/head/sys/dev/qlxge/qls_os.c projects/zfsd/head/sys/dev/ral/rt2560.c projects/zfsd/head/sys/dev/ral/rt2661.c projects/zfsd/head/sys/dev/ral/rt2860.c projects/zfsd/head/sys/dev/random/dummy_rng.c projects/zfsd/head/sys/dev/random/hash.c projects/zfsd/head/sys/dev/random/hash.h projects/zfsd/head/sys/dev/random/ivy.c projects/zfsd/head/sys/dev/random/live_entropy_sources.c projects/zfsd/head/sys/dev/random/live_entropy_sources.h projects/zfsd/head/sys/dev/random/nehemiah.c projects/zfsd/head/sys/dev/random/random_adaptors.c projects/zfsd/head/sys/dev/random/random_adaptors.h projects/zfsd/head/sys/dev/random/random_harvestq.c projects/zfsd/head/sys/dev/random/random_harvestq.h projects/zfsd/head/sys/dev/random/randomdev.c projects/zfsd/head/sys/dev/random/randomdev.h projects/zfsd/head/sys/dev/random/randomdev_soft.c projects/zfsd/head/sys/dev/random/randomdev_soft.h projects/zfsd/head/sys/dev/random/yarrow.c projects/zfsd/head/sys/dev/random/yarrow.h projects/zfsd/head/sys/dev/re/if_re.c projects/zfsd/head/sys/dev/rt/if_rt.c projects/zfsd/head/sys/dev/safe/safe.c projects/zfsd/head/sys/dev/sbni/if_sbni.c projects/zfsd/head/sys/dev/sdhci/sdhci.c projects/zfsd/head/sys/dev/sdhci/sdhci.h projects/zfsd/head/sys/dev/sdhci/sdhci_fdt.c projects/zfsd/head/sys/dev/sdhci/sdhci_if.m projects/zfsd/head/sys/dev/sdhci/sdhci_pci.c projects/zfsd/head/sys/dev/sf/if_sf.c projects/zfsd/head/sys/dev/sfxge/common/efsys.h projects/zfsd/head/sys/dev/sfxge/sfxge.c projects/zfsd/head/sys/dev/sfxge/sfxge.h projects/zfsd/head/sys/dev/sfxge/sfxge_dma.c projects/zfsd/head/sys/dev/sfxge/sfxge_ev.c projects/zfsd/head/sys/dev/sfxge/sfxge_intr.c projects/zfsd/head/sys/dev/sfxge/sfxge_port.c projects/zfsd/head/sys/dev/sfxge/sfxge_rx.c projects/zfsd/head/sys/dev/sfxge/sfxge_rx.h projects/zfsd/head/sys/dev/sfxge/sfxge_tx.c projects/zfsd/head/sys/dev/sfxge/sfxge_tx.h projects/zfsd/head/sys/dev/sge/if_sge.c projects/zfsd/head/sys/dev/siis/siis.c projects/zfsd/head/sys/dev/sis/if_sis.c projects/zfsd/head/sys/dev/sk/if_sk.c projects/zfsd/head/sys/dev/smc/if_smc.c projects/zfsd/head/sys/dev/sn/if_sn.c projects/zfsd/head/sys/dev/snc/dp83932.c projects/zfsd/head/sys/dev/sound/pci/hda/hdaa.c projects/zfsd/head/sys/dev/sound/usb/uaudio.c projects/zfsd/head/sys/dev/sound/usb/uaudioreg.h projects/zfsd/head/sys/dev/ste/if_ste.c projects/zfsd/head/sys/dev/stge/if_stge.c projects/zfsd/head/sys/dev/streams/streams.c projects/zfsd/head/sys/dev/ti/if_ti.c projects/zfsd/head/sys/dev/tl/if_tl.c projects/zfsd/head/sys/dev/tsec/if_tsec.c projects/zfsd/head/sys/dev/tsec/if_tsec_fdt.c projects/zfsd/head/sys/dev/tws/tws.c projects/zfsd/head/sys/dev/tws/tws.h projects/zfsd/head/sys/dev/tws/tws_cam.c projects/zfsd/head/sys/dev/tws/tws_hdm.c projects/zfsd/head/sys/dev/tws/tws_hdm.h projects/zfsd/head/sys/dev/tws/tws_services.c projects/zfsd/head/sys/dev/tx/if_tx.c projects/zfsd/head/sys/dev/txp/if_txp.c projects/zfsd/head/sys/dev/uart/uart.h projects/zfsd/head/sys/dev/uart/uart_bus_fdt.c projects/zfsd/head/sys/dev/uart/uart_dev_imx.c projects/zfsd/head/sys/dev/uart/uart_subr.c projects/zfsd/head/sys/dev/usb/controller/ehci_pci.c projects/zfsd/head/sys/dev/usb/controller/ohci_s3c24x0.c projects/zfsd/head/sys/dev/usb/controller/xhci.c projects/zfsd/head/sys/dev/usb/controller/xhci.h projects/zfsd/head/sys/dev/usb/controller/xhci_pci.c projects/zfsd/head/sys/dev/usb/net/if_aue.c projects/zfsd/head/sys/dev/usb/net/if_axe.c projects/zfsd/head/sys/dev/usb/net/if_axge.c projects/zfsd/head/sys/dev/usb/net/if_cdce.c projects/zfsd/head/sys/dev/usb/net/if_cue.c projects/zfsd/head/sys/dev/usb/net/if_ipheth.c projects/zfsd/head/sys/dev/usb/net/if_kue.c projects/zfsd/head/sys/dev/usb/net/if_mos.c projects/zfsd/head/sys/dev/usb/net/if_rue.c projects/zfsd/head/sys/dev/usb/net/if_smsc.c projects/zfsd/head/sys/dev/usb/net/if_udav.c projects/zfsd/head/sys/dev/usb/net/if_urndis.c projects/zfsd/head/sys/dev/usb/net/if_usie.c projects/zfsd/head/sys/dev/usb/net/uhso.c projects/zfsd/head/sys/dev/usb/net/usb_ethernet.c projects/zfsd/head/sys/dev/usb/quirk/usb_quirk.c projects/zfsd/head/sys/dev/usb/serial/u3g.c projects/zfsd/head/sys/dev/usb/serial/uftdi.c projects/zfsd/head/sys/dev/usb/usb.h projects/zfsd/head/sys/dev/usb/usb_dev.c projects/zfsd/head/sys/dev/usb/usb_freebsd.h projects/zfsd/head/sys/dev/usb/usb_freebsd_loader.h projects/zfsd/head/sys/dev/usb/usb_hub.c projects/zfsd/head/sys/dev/usb/usbdevs projects/zfsd/head/sys/dev/usb/wlan/if_rsu.c projects/zfsd/head/sys/dev/usb/wlan/if_rum.c projects/zfsd/head/sys/dev/usb/wlan/if_run.c projects/zfsd/head/sys/dev/usb/wlan/if_uath.c projects/zfsd/head/sys/dev/usb/wlan/if_upgt.c projects/zfsd/head/sys/dev/usb/wlan/if_ural.c projects/zfsd/head/sys/dev/usb/wlan/if_urtw.c projects/zfsd/head/sys/dev/usb/wlan/if_urtwn.c projects/zfsd/head/sys/dev/usb/wlan/if_zyd.c projects/zfsd/head/sys/dev/vge/if_vge.c projects/zfsd/head/sys/dev/virtio/network/if_vtnet.c projects/zfsd/head/sys/dev/vmware/vmxnet3/if_vmx.c projects/zfsd/head/sys/dev/vmware/vmxnet3/if_vmxvar.h projects/zfsd/head/sys/dev/vr/if_vr.c projects/zfsd/head/sys/dev/vt/hw/efifb/efifb.c projects/zfsd/head/sys/dev/vt/hw/fb/vt_early_fb.c projects/zfsd/head/sys/dev/vt/hw/fb/vt_fb.c projects/zfsd/head/sys/dev/vt/hw/fb/vt_fb.h projects/zfsd/head/sys/dev/vt/hw/ofwfb/ofwfb.c projects/zfsd/head/sys/dev/vt/hw/vga/vt_vga.c projects/zfsd/head/sys/dev/vt/logo/logo_freebsd.c projects/zfsd/head/sys/dev/vt/vt.h projects/zfsd/head/sys/dev/vt/vt_buf.c projects/zfsd/head/sys/dev/vt/vt_consolectl.c projects/zfsd/head/sys/dev/vt/vt_core.c projects/zfsd/head/sys/dev/vte/if_vte.c projects/zfsd/head/sys/dev/vx/if_vx.c projects/zfsd/head/sys/dev/vxge/vxge.c projects/zfsd/head/sys/dev/wb/if_wb.c projects/zfsd/head/sys/dev/wi/if_wi.c projects/zfsd/head/sys/dev/wl/if_wl.c projects/zfsd/head/sys/dev/wpi/if_wpi.c projects/zfsd/head/sys/dev/wtap/if_wtap.c projects/zfsd/head/sys/dev/xe/if_xe.c projects/zfsd/head/sys/dev/xen/balloon/balloon.c projects/zfsd/head/sys/dev/xen/blkback/blkback.c projects/zfsd/head/sys/dev/xen/blkfront/blkfront.c projects/zfsd/head/sys/dev/xen/netback/netback.c projects/zfsd/head/sys/dev/xen/netfront/netfront.c projects/zfsd/head/sys/dev/xl/if_xl.c projects/zfsd/head/sys/fs/autofs/autofs.c projects/zfsd/head/sys/fs/autofs/autofs.h projects/zfsd/head/sys/fs/autofs/autofs_ioctl.h projects/zfsd/head/sys/fs/autofs/autofs_vfsops.c projects/zfsd/head/sys/fs/autofs/autofs_vnops.c projects/zfsd/head/sys/fs/deadfs/dead_vnops.c projects/zfsd/head/sys/fs/devfs/devfs_devs.c projects/zfsd/head/sys/fs/devfs/devfs_vnops.c projects/zfsd/head/sys/fs/ext2fs/ext2_vnops.c projects/zfsd/head/sys/fs/fuse/fuse_main.c projects/zfsd/head/sys/fs/fuse/fuse_vfsops.c projects/zfsd/head/sys/fs/fuse/fuse_vnops.c projects/zfsd/head/sys/fs/msdosfs/msdosfs_vnops.c projects/zfsd/head/sys/fs/nfs/nfs_commonsubs.c projects/zfsd/head/sys/fs/nfs/nfs_var.h projects/zfsd/head/sys/fs/nfs/nfsm_subs.h projects/zfsd/head/sys/fs/nfs/nfsproto.h projects/zfsd/head/sys/fs/nfsclient/nfs_clbio.c projects/zfsd/head/sys/fs/nfsclient/nfs_clvfsops.c projects/zfsd/head/sys/fs/nfsserver/nfs_nfsdkrpc.c projects/zfsd/head/sys/fs/nfsserver/nfs_nfsdport.c projects/zfsd/head/sys/fs/nfsserver/nfs_nfsdserv.c projects/zfsd/head/sys/fs/nfsserver/nfs_nfsdstate.c projects/zfsd/head/sys/fs/nfsserver/nfs_nfsdsubs.c projects/zfsd/head/sys/fs/nullfs/null_vfsops.c projects/zfsd/head/sys/fs/smbfs/smbfs_io.c projects/zfsd/head/sys/fs/tmpfs/tmpfs_vfsops.c projects/zfsd/head/sys/fs/unionfs/union_vfsops.c projects/zfsd/head/sys/gdb/gdb_int.h projects/zfsd/head/sys/gdb/gdb_main.c projects/zfsd/head/sys/gdb/gdb_packet.c projects/zfsd/head/sys/geom/eli/g_eli.c projects/zfsd/head/sys/geom/eli/g_eli_crypto.c projects/zfsd/head/sys/geom/eli/g_eli_integrity.c projects/zfsd/head/sys/geom/eli/g_eli_privacy.c projects/zfsd/head/sys/geom/geom_dev.c projects/zfsd/head/sys/geom/geom_disk.c projects/zfsd/head/sys/geom/geom_dump.c projects/zfsd/head/sys/geom/geom_kern.c projects/zfsd/head/sys/geom/geom_map.c projects/zfsd/head/sys/geom/raid/g_raid.c projects/zfsd/head/sys/geom/sched/g_sched.c projects/zfsd/head/sys/gnu/dts/include/dt-bindings/clock/exynos4.h (contents, props changed) projects/zfsd/head/sys/gnu/dts/include/dt-bindings/clock/exynos5250.h (contents, props changed) projects/zfsd/head/sys/gnu/dts/include/dt-bindings/clock/exynos5420.h (contents, props changed) projects/zfsd/head/sys/gnu/dts/include/dt-bindings/clock/exynos5440.h (contents, props changed) projects/zfsd/head/sys/gnu/dts/include/dt-bindings/clock/hi3620-clock.h (contents, props changed) projects/zfsd/head/sys/gnu/dts/include/dt-bindings/clock/imx6sl-clock.h (contents, props changed) projects/zfsd/head/sys/gnu/dts/include/dt-bindings/clock/qcom,gcc-msm8960.h (contents, props changed) projects/zfsd/head/sys/gnu/dts/include/dt-bindings/clock/qcom,gcc-msm8974.h (contents, props changed) projects/zfsd/head/sys/gnu/dts/include/dt-bindings/clock/qcom,mmcc-msm8960.h (contents, props changed) projects/zfsd/head/sys/gnu/dts/include/dt-bindings/clock/r8a7790-clock.h (contents, props changed) projects/zfsd/head/sys/gnu/dts/include/dt-bindings/clock/r8a7791-clock.h (contents, props changed) projects/zfsd/head/sys/gnu/dts/include/dt-bindings/clock/tegra114-car.h (contents, props changed) projects/zfsd/head/sys/gnu/dts/include/dt-bindings/clock/tegra124-car.h (contents, props changed) projects/zfsd/head/sys/gnu/dts/include/dt-bindings/clock/vf610-clock.h (contents, props changed) projects/zfsd/head/sys/gnu/dts/include/dt-bindings/mfd/as3722.h (contents, props changed) projects/zfsd/head/sys/gnu/dts/include/dt-bindings/pinctrl/am43xx.h (contents, props changed) projects/zfsd/head/sys/gnu/dts/include/dt-bindings/pinctrl/dra.h (contents, props changed) projects/zfsd/head/sys/gnu/dts/include/dt-bindings/pinctrl/omap.h (contents, props changed) projects/zfsd/head/sys/gnu/dts/include/dt-bindings/reset/qcom,gcc-msm8960.h (contents, props changed) projects/zfsd/head/sys/gnu/dts/include/dt-bindings/reset/qcom,mmcc-msm8960.h (contents, props changed) projects/zfsd/head/sys/gnu/fs/reiserfs/reiserfs_fs_i.h projects/zfsd/head/sys/i386/conf/GENERIC projects/zfsd/head/sys/i386/conf/XEN projects/zfsd/head/sys/i386/i386/bios.c projects/zfsd/head/sys/i386/i386/db_disasm.c projects/zfsd/head/sys/i386/i386/initcpu.c projects/zfsd/head/sys/i386/i386/machdep.c projects/zfsd/head/sys/i386/i386/minidump_machdep.c projects/zfsd/head/sys/i386/i386/mp_machdep.c projects/zfsd/head/sys/i386/i386/pmap.c projects/zfsd/head/sys/i386/i386/support.s projects/zfsd/head/sys/i386/i386/swtch.s projects/zfsd/head/sys/i386/i386/trap.c projects/zfsd/head/sys/i386/i386/vm_machdep.c projects/zfsd/head/sys/i386/ibcs2/ibcs2_misc.c projects/zfsd/head/sys/i386/include/md_var.h projects/zfsd/head/sys/i386/include/npx.h projects/zfsd/head/sys/i386/include/pc/bios.h projects/zfsd/head/sys/i386/include/pcb.h projects/zfsd/head/sys/i386/include/pmap.h projects/zfsd/head/sys/i386/include/xen/hypercall.h projects/zfsd/head/sys/i386/isa/npx.c projects/zfsd/head/sys/i386/linux/linux.h projects/zfsd/head/sys/i386/linux/linux_machdep.c projects/zfsd/head/sys/i386/linux/linux_proto.h projects/zfsd/head/sys/i386/linux/linux_syscall.h projects/zfsd/head/sys/i386/linux/linux_syscalls.c projects/zfsd/head/sys/i386/linux/linux_sysent.c projects/zfsd/head/sys/i386/linux/linux_systrace_args.c projects/zfsd/head/sys/i386/linux/syscalls.master projects/zfsd/head/sys/i386/xen/mp_machdep.c projects/zfsd/head/sys/i386/xen/pmap.c projects/zfsd/head/sys/i386/xen/xen_machdep.c projects/zfsd/head/sys/kern/bus_if.m projects/zfsd/head/sys/kern/imgact_binmisc.c projects/zfsd/head/sys/kern/imgact_elf.c projects/zfsd/head/sys/kern/imgact_shell.c projects/zfsd/head/sys/kern/init_main.c projects/zfsd/head/sys/kern/init_sysent.c projects/zfsd/head/sys/kern/kern_cons.c projects/zfsd/head/sys/kern/kern_cpuset.c projects/zfsd/head/sys/kern/kern_descrip.c projects/zfsd/head/sys/kern/kern_environment.c projects/zfsd/head/sys/kern/kern_event.c projects/zfsd/head/sys/kern/kern_exec.c projects/zfsd/head/sys/kern/kern_exit.c projects/zfsd/head/sys/kern/kern_ffclock.c projects/zfsd/head/sys/kern/kern_intr.c projects/zfsd/head/sys/kern/kern_jail.c projects/zfsd/head/sys/kern/kern_linker.c projects/zfsd/head/sys/kern/kern_lock.c projects/zfsd/head/sys/kern/kern_loginclass.c projects/zfsd/head/sys/kern/kern_malloc.c projects/zfsd/head/sys/kern/kern_mbuf.c projects/zfsd/head/sys/kern/kern_mib.c projects/zfsd/head/sys/kern/kern_poll.c projects/zfsd/head/sys/kern/kern_proc.c projects/zfsd/head/sys/kern/kern_prot.c projects/zfsd/head/sys/kern/kern_racct.c projects/zfsd/head/sys/kern/kern_resource.c projects/zfsd/head/sys/kern/kern_sig.c projects/zfsd/head/sys/kern/kern_synch.c projects/zfsd/head/sys/kern/kern_syscalls.c projects/zfsd/head/sys/kern/kern_sysctl.c projects/zfsd/head/sys/kern/kern_thread.c projects/zfsd/head/sys/kern/kern_timeout.c projects/zfsd/head/sys/kern/kern_umtx.c projects/zfsd/head/sys/kern/link_elf.c projects/zfsd/head/sys/kern/link_elf_obj.c projects/zfsd/head/sys/kern/sched_4bsd.c projects/zfsd/head/sys/kern/sched_ule.c projects/zfsd/head/sys/kern/subr_bus.c projects/zfsd/head/sys/kern/subr_devstat.c projects/zfsd/head/sys/kern/subr_hints.c projects/zfsd/head/sys/kern/subr_kdb.c projects/zfsd/head/sys/kern/subr_param.c projects/zfsd/head/sys/kern/subr_prof.c projects/zfsd/head/sys/kern/subr_terminal.c projects/zfsd/head/sys/kern/subr_uio.c projects/zfsd/head/sys/kern/subr_witness.c projects/zfsd/head/sys/kern/sys_generic.c projects/zfsd/head/sys/kern/sys_pipe.c projects/zfsd/head/sys/kern/sys_procdesc.c projects/zfsd/head/sys/kern/sys_process.c projects/zfsd/head/sys/kern/sys_socket.c projects/zfsd/head/sys/kern/syscalls.c projects/zfsd/head/sys/kern/syscalls.master projects/zfsd/head/sys/kern/sysv_msg.c projects/zfsd/head/sys/kern/sysv_sem.c projects/zfsd/head/sys/kern/sysv_shm.c projects/zfsd/head/sys/kern/tty.c projects/zfsd/head/sys/kern/tty_pts.c projects/zfsd/head/sys/kern/uipc_mbuf.c projects/zfsd/head/sys/kern/uipc_mqueue.c projects/zfsd/head/sys/kern/uipc_sem.c projects/zfsd/head/sys/kern/uipc_shm.c projects/zfsd/head/sys/kern/uipc_sockbuf.c projects/zfsd/head/sys/kern/uipc_socket.c projects/zfsd/head/sys/kern/uipc_syscalls.c projects/zfsd/head/sys/kern/vfs_acl.c projects/zfsd/head/sys/kern/vfs_aio.c projects/zfsd/head/sys/kern/vfs_bio.c projects/zfsd/head/sys/kern/vfs_cache.c projects/zfsd/head/sys/kern/vfs_default.c projects/zfsd/head/sys/kern/vfs_init.c projects/zfsd/head/sys/kern/vfs_lookup.c projects/zfsd/head/sys/kern/vfs_mountroot.c projects/zfsd/head/sys/kern/vfs_subr.c projects/zfsd/head/sys/kern/vfs_syscalls.c projects/zfsd/head/sys/kern/vfs_vnops.c projects/zfsd/head/sys/kern/vnode_if.src projects/zfsd/head/sys/kgssapi/gss_impl.c projects/zfsd/head/sys/mips/adm5120/if_admsw.c projects/zfsd/head/sys/mips/atheros/ar71xx_gpio.c projects/zfsd/head/sys/mips/atheros/ar71xx_machdep.c projects/zfsd/head/sys/mips/atheros/ar724x_pci.c projects/zfsd/head/sys/mips/atheros/if_arge.c projects/zfsd/head/sys/mips/beri/beri_machdep.c projects/zfsd/head/sys/mips/beri/beri_simplebus.c projects/zfsd/head/sys/mips/cavium/ciu.c projects/zfsd/head/sys/mips/cavium/if_octm.c projects/zfsd/head/sys/mips/cavium/octe/ethernet-mdio.c projects/zfsd/head/sys/mips/cavium/octe/ethernet-rx.c projects/zfsd/head/sys/mips/cavium/octe/ethernet-tx.c projects/zfsd/head/sys/mips/cavium/octe/octe.c projects/zfsd/head/sys/mips/cavium/octeon_ds1337.c projects/zfsd/head/sys/mips/cavium/octeon_gpio.c projects/zfsd/head/sys/mips/conf/PICOSTATION_M2HP.hints projects/zfsd/head/sys/mips/conf/WZR-300HP projects/zfsd/head/sys/mips/conf/WZR-300HP.hints projects/zfsd/head/sys/mips/idt/if_kr.c projects/zfsd/head/sys/mips/include/md_var.h projects/zfsd/head/sys/mips/include/param.h projects/zfsd/head/sys/mips/include/sf_buf.h projects/zfsd/head/sys/mips/include/vmparam.h projects/zfsd/head/sys/mips/mips/busdma_machdep.c projects/zfsd/head/sys/mips/mips/dump_machdep.c projects/zfsd/head/sys/mips/mips/machdep.c projects/zfsd/head/sys/mips/mips/minidump_machdep.c projects/zfsd/head/sys/mips/nlm/dev/net/xlpge.c projects/zfsd/head/sys/mips/nlm/xlp_machdep.c projects/zfsd/head/sys/mips/rmi/dev/nlge/if_nlge.c projects/zfsd/head/sys/mips/rmi/dev/xlr/rge.c projects/zfsd/head/sys/mips/rmi/xlr_machdep.c projects/zfsd/head/sys/mips/rt305x/rt305x_gpio.c projects/zfsd/head/sys/mips/rt305x/rt305x_machdep.c projects/zfsd/head/sys/modules/Makefile projects/zfsd/head/sys/modules/ahci/Makefile projects/zfsd/head/sys/modules/bce/Makefile projects/zfsd/head/sys/modules/bxe/Makefile projects/zfsd/head/sys/modules/drm2/Makefile projects/zfsd/head/sys/modules/drm2/drm2/Makefile projects/zfsd/head/sys/modules/drm2/i915kms/Makefile projects/zfsd/head/sys/modules/dtrace/dtraceall/dtraceall.c projects/zfsd/head/sys/modules/fdc/Makefile projects/zfsd/head/sys/modules/hyperv/utilities/Makefile projects/zfsd/head/sys/modules/i2c/controllers/alpm/Makefile projects/zfsd/head/sys/modules/i2c/controllers/amdpm/Makefile projects/zfsd/head/sys/modules/i2c/controllers/amdsmb/Makefile projects/zfsd/head/sys/modules/i2c/controllers/intpm/Makefile projects/zfsd/head/sys/modules/i2c/controllers/nfsmb/Makefile projects/zfsd/head/sys/modules/i2c/controllers/viapm/Makefile projects/zfsd/head/sys/modules/if_gif/Makefile projects/zfsd/head/sys/modules/ipfw/Makefile projects/zfsd/head/sys/modules/iwnfw/Makefile projects/zfsd/head/sys/modules/ixgbe/Makefile projects/zfsd/head/sys/modules/linux/Makefile projects/zfsd/head/sys/modules/mlx4/Makefile projects/zfsd/head/sys/modules/mlx4ib/Makefile projects/zfsd/head/sys/modules/mlxen/Makefile projects/zfsd/head/sys/modules/mrsas/Makefile projects/zfsd/head/sys/modules/netmap/Makefile projects/zfsd/head/sys/modules/qlxgb/Makefile projects/zfsd/head/sys/modules/qlxgbe/Makefile projects/zfsd/head/sys/modules/qlxge/Makefile projects/zfsd/head/sys/modules/random/Makefile projects/zfsd/head/sys/modules/rl/Makefile projects/zfsd/head/sys/modules/usb/Makefile projects/zfsd/head/sys/modules/virtio/Makefile projects/zfsd/head/sys/modules/vmm/Makefile projects/zfsd/head/sys/modules/zfs/Makefile projects/zfsd/head/sys/net/bpf.c projects/zfsd/head/sys/net/ieee8023ad_lacp.c projects/zfsd/head/sys/net/ieee8023ad_lacp.h projects/zfsd/head/sys/net/if.c projects/zfsd/head/sys/net/if.h projects/zfsd/head/sys/net/if_arcsubr.c projects/zfsd/head/sys/net/if_atmsubr.c projects/zfsd/head/sys/net/if_bridge.c projects/zfsd/head/sys/net/if_debug.c projects/zfsd/head/sys/net/if_disc.c projects/zfsd/head/sys/net/if_edsc.c projects/zfsd/head/sys/net/if_enc.c projects/zfsd/head/sys/net/if_epair.c projects/zfsd/head/sys/net/if_ethersubr.c projects/zfsd/head/sys/net/if_faith.c projects/zfsd/head/sys/net/if_fddisubr.c projects/zfsd/head/sys/net/if_fwsubr.c projects/zfsd/head/sys/net/if_gif.c projects/zfsd/head/sys/net/if_gif.h projects/zfsd/head/sys/net/if_gre.c projects/zfsd/head/sys/net/if_gre.h projects/zfsd/head/sys/net/if_iso88025subr.c projects/zfsd/head/sys/net/if_lagg.c projects/zfsd/head/sys/net/if_lagg.h projects/zfsd/head/sys/net/if_loop.c projects/zfsd/head/sys/net/if_mib.c projects/zfsd/head/sys/net/if_spppfr.c projects/zfsd/head/sys/net/if_spppsubr.c projects/zfsd/head/sys/net/if_stf.c projects/zfsd/head/sys/net/if_tap.c projects/zfsd/head/sys/net/if_tun.c projects/zfsd/head/sys/net/if_var.h projects/zfsd/head/sys/net/if_vlan.c projects/zfsd/head/sys/net/ifq.h projects/zfsd/head/sys/net/netisr.h projects/zfsd/head/sys/net/radix.c projects/zfsd/head/sys/net/route.c projects/zfsd/head/sys/net/route.h projects/zfsd/head/sys/net/rtsock.c projects/zfsd/head/sys/net80211/ieee80211.c projects/zfsd/head/sys/net80211/ieee80211_adhoc.c projects/zfsd/head/sys/net80211/ieee80211_hostap.c projects/zfsd/head/sys/net80211/ieee80211_ht.c projects/zfsd/head/sys/net80211/ieee80211_hwmp.c projects/zfsd/head/sys/net80211/ieee80211_input.c projects/zfsd/head/sys/net80211/ieee80211_mesh.c projects/zfsd/head/sys/net80211/ieee80211_monitor.c projects/zfsd/head/sys/net80211/ieee80211_output.c projects/zfsd/head/sys/net80211/ieee80211_sta.c projects/zfsd/head/sys/net80211/ieee80211_superg.c projects/zfsd/head/sys/net80211/ieee80211_wds.c projects/zfsd/head/sys/netgraph/bluetooth/common/ng_bluetooth.c projects/zfsd/head/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c projects/zfsd/head/sys/netgraph/bluetooth/drivers/h4/ng_h4.c projects/zfsd/head/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h projects/zfsd/head/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h projects/zfsd/head/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c projects/zfsd/head/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c projects/zfsd/head/sys/netgraph/ng_base.c projects/zfsd/head/sys/netgraph/ng_device.c projects/zfsd/head/sys/netgraph/ng_eiface.c projects/zfsd/head/sys/netgraph/ng_frame_relay.c projects/zfsd/head/sys/netgraph/ng_iface.c projects/zfsd/head/sys/netgraph/ng_ipfw.c projects/zfsd/head/sys/netgraph/ng_ppp.c projects/zfsd/head/sys/netgraph/ng_socket.c projects/zfsd/head/sys/netgraph/ng_sppp.c projects/zfsd/head/sys/netgraph/ng_tty.c projects/zfsd/head/sys/netinet/cc/cc.c projects/zfsd/head/sys/netinet/cc/cc_chd.c projects/zfsd/head/sys/netinet/if_ether.c projects/zfsd/head/sys/netinet/igmp.c projects/zfsd/head/sys/netinet/in.c projects/zfsd/head/sys/netinet/in.h projects/zfsd/head/sys/netinet/in_gif.c projects/zfsd/head/sys/netinet/in_gif.h projects/zfsd/head/sys/netinet/in_mcast.c projects/zfsd/head/sys/netinet/in_pcb.c projects/zfsd/head/sys/netinet/in_pcb.h projects/zfsd/head/sys/netinet/in_pcbgroup.c projects/zfsd/head/sys/netinet/in_rmx.c projects/zfsd/head/sys/netinet/in_rss.c projects/zfsd/head/sys/netinet/in_rss.h projects/zfsd/head/sys/netinet/in_var.h projects/zfsd/head/sys/netinet/ip6.h projects/zfsd/head/sys/netinet/ip_divert.c projects/zfsd/head/sys/netinet/ip_fastfwd.c projects/zfsd/head/sys/netinet/ip_fw.h projects/zfsd/head/sys/netinet/ip_gre.c projects/zfsd/head/sys/netinet/ip_icmp.c projects/zfsd/head/sys/netinet/ip_input.c projects/zfsd/head/sys/netinet/ip_ipsec.c projects/zfsd/head/sys/netinet/ip_mroute.c projects/zfsd/head/sys/netinet/ip_options.c projects/zfsd/head/sys/netinet/ip_options.h projects/zfsd/head/sys/netinet/ip_output.c projects/zfsd/head/sys/netinet/ip_var.h projects/zfsd/head/sys/netinet/raw_ip.c projects/zfsd/head/sys/netinet/sctp_asconf.c projects/zfsd/head/sys/netinet/sctp_auth.c projects/zfsd/head/sys/netinet/sctp_auth.h projects/zfsd/head/sys/netinet/sctp_cc_functions.c projects/zfsd/head/sys/netinet/sctp_constants.h projects/zfsd/head/sys/netinet/sctp_header.h projects/zfsd/head/sys/netinet/sctp_input.c projects/zfsd/head/sys/netinet/sctp_input.h projects/zfsd/head/sys/netinet/sctp_os_bsd.h projects/zfsd/head/sys/netinet/sctp_output.c projects/zfsd/head/sys/netinet/sctp_output.h projects/zfsd/head/sys/netinet/sctp_pcb.c projects/zfsd/head/sys/netinet/sctp_structs.h projects/zfsd/head/sys/netinet/sctp_sysctl.c projects/zfsd/head/sys/netinet/sctp_sysctl.h projects/zfsd/head/sys/netinet/sctp_usrreq.c projects/zfsd/head/sys/netinet/sctputil.c projects/zfsd/head/sys/netinet/siftr.c projects/zfsd/head/sys/netinet/tcp_hostcache.c projects/zfsd/head/sys/netinet/tcp_hostcache.h projects/zfsd/head/sys/netinet/tcp_input.c projects/zfsd/head/sys/netinet/tcp_output.c projects/zfsd/head/sys/netinet/tcp_reass.c projects/zfsd/head/sys/netinet/tcp_subr.c projects/zfsd/head/sys/netinet/tcp_syncache.c projects/zfsd/head/sys/netinet/tcp_timer.c projects/zfsd/head/sys/netinet/tcp_timer.h projects/zfsd/head/sys/netinet/tcp_timewait.c projects/zfsd/head/sys/netinet/tcp_usrreq.c projects/zfsd/head/sys/netinet/tcp_var.h projects/zfsd/head/sys/netinet/toecore.c projects/zfsd/head/sys/netinet/udp_usrreq.c projects/zfsd/head/sys/netinet/udp_var.h projects/zfsd/head/sys/netinet6/icmp6.c projects/zfsd/head/sys/netinet6/in6.c projects/zfsd/head/sys/netinet6/in6.h projects/zfsd/head/sys/netinet6/in6_cksum.c projects/zfsd/head/sys/netinet6/in6_gif.c projects/zfsd/head/sys/netinet6/in6_gif.h projects/zfsd/head/sys/netinet6/in6_ifattach.c projects/zfsd/head/sys/netinet6/in6_mcast.c projects/zfsd/head/sys/netinet6/in6_pcb.c projects/zfsd/head/sys/netinet6/in6_pcb.h projects/zfsd/head/sys/netinet6/in6_rmx.c projects/zfsd/head/sys/netinet6/in6_src.c projects/zfsd/head/sys/netinet6/in6_var.h projects/zfsd/head/sys/netinet6/ip6_forward.c projects/zfsd/head/sys/netinet6/ip6_mroute.c projects/zfsd/head/sys/netinet6/ip6_output.c projects/zfsd/head/sys/netinet6/nd6.c projects/zfsd/head/sys/netinet6/scope6.c projects/zfsd/head/sys/netinet6/scope6_var.h projects/zfsd/head/sys/netinet6/sctp6_usrreq.c projects/zfsd/head/sys/netinet6/udp6_usrreq.c projects/zfsd/head/sys/netipsec/ipsec.h projects/zfsd/head/sys/netipsec/ipsec_input.c projects/zfsd/head/sys/netipsec/ipsec_output.c projects/zfsd/head/sys/netipsec/key.c projects/zfsd/head/sys/netipsec/key.h projects/zfsd/head/sys/netpfil/ipfw/ip_dn_io.c projects/zfsd/head/sys/netpfil/ipfw/ip_dummynet.c projects/zfsd/head/sys/netpfil/ipfw/ip_fw2.c projects/zfsd/head/sys/netpfil/ipfw/ip_fw_dynamic.c projects/zfsd/head/sys/netpfil/ipfw/ip_fw_log.c projects/zfsd/head/sys/netpfil/ipfw/ip_fw_nat.c projects/zfsd/head/sys/netpfil/ipfw/ip_fw_private.h projects/zfsd/head/sys/netpfil/ipfw/ip_fw_sockopt.c projects/zfsd/head/sys/netpfil/ipfw/ip_fw_table.c projects/zfsd/head/sys/netpfil/pf/if_pflog.c projects/zfsd/head/sys/netpfil/pf/if_pfsync.c projects/zfsd/head/sys/netpfil/pf/pf.c projects/zfsd/head/sys/netpfil/pf/pf_ioctl.c projects/zfsd/head/sys/netpfil/pf/pf_table.c projects/zfsd/head/sys/nfs/bootp_subr.c projects/zfsd/head/sys/nfs/nfs_diskless.c projects/zfsd/head/sys/nfs/nfs_nfssvc.c projects/zfsd/head/sys/nfsclient/nfs_bio.c projects/zfsd/head/sys/nfsclient/nfs_vfsops.c projects/zfsd/head/sys/nlm/nlm_prot_impl.c projects/zfsd/head/sys/ofed/drivers/infiniband/core/addr.c projects/zfsd/head/sys/ofed/drivers/infiniband/core/agent.c projects/zfsd/head/sys/ofed/drivers/infiniband/core/cm.c projects/zfsd/head/sys/ofed/drivers/infiniband/core/device.c projects/zfsd/head/sys/ofed/drivers/infiniband/core/iwcm.c projects/zfsd/head/sys/ofed/drivers/infiniband/core/sa_query.c projects/zfsd/head/sys/ofed/drivers/infiniband/core/sysfs.c projects/zfsd/head/sys/ofed/drivers/infiniband/core/ucm.c projects/zfsd/head/sys/ofed/drivers/infiniband/core/user_mad.c projects/zfsd/head/sys/ofed/drivers/infiniband/core/uverbs_cmd.c projects/zfsd/head/sys/ofed/drivers/infiniband/core/uverbs_main.c projects/zfsd/head/sys/ofed/drivers/infiniband/hw/mlx4/ah.c projects/zfsd/head/sys/ofed/drivers/infiniband/hw/mlx4/alias_GUID.c projects/zfsd/head/sys/ofed/drivers/infiniband/hw/mlx4/cm.c projects/zfsd/head/sys/ofed/drivers/infiniband/hw/mlx4/mad.c projects/zfsd/head/sys/ofed/drivers/infiniband/hw/mlx4/main.c projects/zfsd/head/sys/ofed/drivers/infiniband/hw/mlx4/mlx4_ib.h projects/zfsd/head/sys/ofed/drivers/infiniband/hw/mlx4/mr.c projects/zfsd/head/sys/ofed/drivers/infiniband/hw/mlx4/qp.c projects/zfsd/head/sys/ofed/drivers/infiniband/hw/mlx4/sysfs.c projects/zfsd/head/sys/ofed/drivers/infiniband/hw/mthca/mthca_allocator.c projects/zfsd/head/sys/ofed/drivers/infiniband/hw/mthca/mthca_config_reg.h projects/zfsd/head/sys/ofed/drivers/infiniband/hw/mthca/mthca_main.c projects/zfsd/head/sys/ofed/drivers/infiniband/hw/mthca/mthca_memfree.c projects/zfsd/head/sys/ofed/drivers/infiniband/hw/mthca/mthca_provider.c projects/zfsd/head/sys/ofed/drivers/infiniband/hw/mthca/mthca_reset.c projects/zfsd/head/sys/ofed/drivers/infiniband/hw/mthca/mthca_uar.c projects/zfsd/head/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_cm.c projects/zfsd/head/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_ethtool.c projects/zfsd/head/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_ib.c projects/zfsd/head/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c projects/zfsd/head/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_multicast.c projects/zfsd/head/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_verbs.c projects/zfsd/head/sys/ofed/drivers/infiniband/ulp/sdp/sdp.h projects/zfsd/head/sys/ofed/drivers/net/mlx4/Makefile projects/zfsd/head/sys/ofed/drivers/net/mlx4/alloc.c projects/zfsd/head/sys/ofed/drivers/net/mlx4/catas.c projects/zfsd/head/sys/ofed/drivers/net/mlx4/cmd.c projects/zfsd/head/sys/ofed/drivers/net/mlx4/cq.c projects/zfsd/head/sys/ofed/drivers/net/mlx4/en_cq.c projects/zfsd/head/sys/ofed/drivers/net/mlx4/en_ethtool.c projects/zfsd/head/sys/ofed/drivers/net/mlx4/en_main.c projects/zfsd/head/sys/ofed/drivers/net/mlx4/en_netdev.c projects/zfsd/head/sys/ofed/drivers/net/mlx4/en_port.c projects/zfsd/head/sys/ofed/drivers/net/mlx4/en_port.h projects/zfsd/head/sys/ofed/drivers/net/mlx4/en_resources.c projects/zfsd/head/sys/ofed/drivers/net/mlx4/en_rx.c projects/zfsd/head/sys/ofed/drivers/net/mlx4/en_selftest.c projects/zfsd/head/sys/ofed/drivers/net/mlx4/en_tx.c projects/zfsd/head/sys/ofed/drivers/net/mlx4/eq.c projects/zfsd/head/sys/ofed/drivers/net/mlx4/fw.c projects/zfsd/head/sys/ofed/drivers/net/mlx4/fw.h projects/zfsd/head/sys/ofed/drivers/net/mlx4/icm.c projects/zfsd/head/sys/ofed/drivers/net/mlx4/icm.h projects/zfsd/head/sys/ofed/drivers/net/mlx4/intf.c projects/zfsd/head/sys/ofed/drivers/net/mlx4/main.c projects/zfsd/head/sys/ofed/drivers/net/mlx4/mcg.c projects/zfsd/head/sys/ofed/drivers/net/mlx4/mlx4.h projects/zfsd/head/sys/ofed/drivers/net/mlx4/mlx4_en.h projects/zfsd/head/sys/ofed/drivers/net/mlx4/mr.c projects/zfsd/head/sys/ofed/drivers/net/mlx4/pd.c projects/zfsd/head/sys/ofed/drivers/net/mlx4/port.c projects/zfsd/head/sys/ofed/drivers/net/mlx4/profile.c projects/zfsd/head/sys/ofed/drivers/net/mlx4/qp.c projects/zfsd/head/sys/ofed/drivers/net/mlx4/reset.c projects/zfsd/head/sys/ofed/drivers/net/mlx4/resource_tracker.c projects/zfsd/head/sys/ofed/drivers/net/mlx4/sense.c projects/zfsd/head/sys/ofed/drivers/net/mlx4/srq.c projects/zfsd/head/sys/ofed/drivers/net/mlx4/sys_tune.c projects/zfsd/head/sys/ofed/include/asm/atomic-long.h projects/zfsd/head/sys/ofed/include/asm/atomic.h projects/zfsd/head/sys/ofed/include/asm/byteorder.h projects/zfsd/head/sys/ofed/include/asm/fcntl.h projects/zfsd/head/sys/ofed/include/asm/io.h projects/zfsd/head/sys/ofed/include/asm/pgtable.h projects/zfsd/head/sys/ofed/include/asm/types.h projects/zfsd/head/sys/ofed/include/asm/uaccess.h projects/zfsd/head/sys/ofed/include/linux/bitops.h projects/zfsd/head/sys/ofed/include/linux/cdev.h projects/zfsd/head/sys/ofed/include/linux/clocksource.h projects/zfsd/head/sys/ofed/include/linux/compat.h projects/zfsd/head/sys/ofed/include/linux/compiler.h projects/zfsd/head/sys/ofed/include/linux/completion.h projects/zfsd/head/sys/ofed/include/linux/delay.h projects/zfsd/head/sys/ofed/include/linux/device.h projects/zfsd/head/sys/ofed/include/linux/dma-attrs.h projects/zfsd/head/sys/ofed/include/linux/dma-mapping.h projects/zfsd/head/sys/ofed/include/linux/dmapool.h projects/zfsd/head/sys/ofed/include/linux/err.h projects/zfsd/head/sys/ofed/include/linux/errno.h projects/zfsd/head/sys/ofed/include/linux/file.h projects/zfsd/head/sys/ofed/include/linux/fs.h projects/zfsd/head/sys/ofed/include/linux/gfp.h projects/zfsd/head/sys/ofed/include/linux/hardirq.h projects/zfsd/head/sys/ofed/include/linux/idr.h projects/zfsd/head/sys/ofed/include/linux/if_arp.h projects/zfsd/head/sys/ofed/include/linux/if_ether.h projects/zfsd/head/sys/ofed/include/linux/if_vlan.h projects/zfsd/head/sys/ofed/include/linux/in.h projects/zfsd/head/sys/ofed/include/linux/in6.h projects/zfsd/head/sys/ofed/include/linux/inetdevice.h projects/zfsd/head/sys/ofed/include/linux/interrupt.h projects/zfsd/head/sys/ofed/include/linux/io-mapping.h projects/zfsd/head/sys/ofed/include/linux/io.h projects/zfsd/head/sys/ofed/include/linux/ioctl.h projects/zfsd/head/sys/ofed/include/linux/jiffies.h projects/zfsd/head/sys/ofed/include/linux/kdev_t.h projects/zfsd/head/sys/ofed/include/linux/kernel.h projects/zfsd/head/sys/ofed/include/linux/kobject.h projects/zfsd/head/sys/ofed/include/linux/kref.h projects/zfsd/head/sys/ofed/include/linux/kthread.h projects/zfsd/head/sys/ofed/include/linux/linux_compat.c projects/zfsd/head/sys/ofed/include/linux/linux_idr.c projects/zfsd/head/sys/ofed/include/linux/linux_radix.c projects/zfsd/head/sys/ofed/include/linux/list.h projects/zfsd/head/sys/ofed/include/linux/lockdep.h projects/zfsd/head/sys/ofed/include/linux/log2.h projects/zfsd/head/sys/ofed/include/linux/miscdevice.h projects/zfsd/head/sys/ofed/include/linux/mlx4/cmd.h projects/zfsd/head/sys/ofed/include/linux/mlx4/cq.h projects/zfsd/head/sys/ofed/include/linux/mlx4/device.h projects/zfsd/head/sys/ofed/include/linux/mlx4/driver.h projects/zfsd/head/sys/ofed/include/linux/mlx4/qp.h projects/zfsd/head/sys/ofed/include/linux/mlx4/srq.h projects/zfsd/head/sys/ofed/include/linux/mm.h projects/zfsd/head/sys/ofed/include/linux/module.h projects/zfsd/head/sys/ofed/include/linux/moduleparam.h projects/zfsd/head/sys/ofed/include/linux/mutex.h projects/zfsd/head/sys/ofed/include/linux/net.h projects/zfsd/head/sys/ofed/include/linux/netdevice.h projects/zfsd/head/sys/ofed/include/linux/notifier.h projects/zfsd/head/sys/ofed/include/linux/page.h projects/zfsd/head/sys/ofed/include/linux/pci.h projects/zfsd/head/sys/ofed/include/linux/poll.h projects/zfsd/head/sys/ofed/include/linux/radix-tree.h projects/zfsd/head/sys/ofed/include/linux/random.h projects/zfsd/head/sys/ofed/include/linux/rbtree.h projects/zfsd/head/sys/ofed/include/linux/rwlock.h projects/zfsd/head/sys/ofed/include/linux/rwsem.h projects/zfsd/head/sys/ofed/include/linux/scatterlist.h projects/zfsd/head/sys/ofed/include/linux/sched.h projects/zfsd/head/sys/ofed/include/linux/semaphore.h projects/zfsd/head/sys/ofed/include/linux/slab.h projects/zfsd/head/sys/ofed/include/linux/socket.h projects/zfsd/head/sys/ofed/include/linux/spinlock.h projects/zfsd/head/sys/ofed/include/linux/string.h projects/zfsd/head/sys/ofed/include/linux/sysfs.h projects/zfsd/head/sys/ofed/include/linux/timer.h projects/zfsd/head/sys/ofed/include/linux/types.h projects/zfsd/head/sys/ofed/include/linux/uaccess.h projects/zfsd/head/sys/ofed/include/linux/vmalloc.h projects/zfsd/head/sys/ofed/include/linux/wait.h projects/zfsd/head/sys/ofed/include/linux/workqueue.h projects/zfsd/head/sys/ofed/include/net/ip.h projects/zfsd/head/sys/ofed/include/net/ipv6.h projects/zfsd/head/sys/ofed/include/net/netevent.h projects/zfsd/head/sys/ofed/include/net/tcp.h projects/zfsd/head/sys/ofed/include/rdma/ib_addr.h projects/zfsd/head/sys/ofed/include/rdma/ib_smi.h projects/zfsd/head/sys/ofed/include/rdma/ib_umem.h projects/zfsd/head/sys/ofed/include/rdma/ib_user_cm.h projects/zfsd/head/sys/ofed/include/rdma/ib_verbs.h projects/zfsd/head/sys/opencrypto/cryptodev.c projects/zfsd/head/sys/pc98/cbus/olpt.c projects/zfsd/head/sys/pc98/cbus/pckbd.c projects/zfsd/head/sys/pc98/conf/GENERIC projects/zfsd/head/sys/powerpc/aim/locore64.S projects/zfsd/head/sys/powerpc/aim/machdep.c projects/zfsd/head/sys/powerpc/booke/machdep.c projects/zfsd/head/sys/powerpc/conf/GENERIC projects/zfsd/head/sys/powerpc/conf/GENERIC64 projects/zfsd/head/sys/powerpc/conf/NOTES projects/zfsd/head/sys/powerpc/ofw/ofw_pcibus.c projects/zfsd/head/sys/powerpc/powermac/fcu.c projects/zfsd/head/sys/powerpc/powermac/macio.c projects/zfsd/head/sys/powerpc/powermac/pmu.c projects/zfsd/head/sys/powerpc/powermac/smu.c projects/zfsd/head/sys/powerpc/powerpc/busdma_machdep.c projects/zfsd/head/sys/powerpc/powerpc/copyinout.c projects/zfsd/head/sys/powerpc/powerpc/cpu.c projects/zfsd/head/sys/powerpc/powerpc/intr_machdep.c projects/zfsd/head/sys/powerpc/ps3/if_glc.c projects/zfsd/head/sys/powerpc/ps3/ps3_syscons.c projects/zfsd/head/sys/powerpc/pseries/phyp_llan.c projects/zfsd/head/sys/powerpc/pseries/vdevice.c projects/zfsd/head/sys/powerpc/wii/wii_gpio.c projects/zfsd/head/sys/sparc64/conf/GENERIC projects/zfsd/head/sys/sparc64/include/param.h projects/zfsd/head/sys/sparc64/include/vmparam.h projects/zfsd/head/sys/sparc64/sparc64/intr_machdep.c projects/zfsd/head/sys/sparc64/sparc64/machdep.c projects/zfsd/head/sys/sparc64/sparc64/mem.c projects/zfsd/head/sys/sparc64/sparc64/support.S projects/zfsd/head/sys/sys/_umtx.h projects/zfsd/head/sys/sys/ata.h projects/zfsd/head/sys/sys/bitset.h projects/zfsd/head/sys/sys/buf_ring.h projects/zfsd/head/sys/sys/bus.h projects/zfsd/head/sys/sys/cdefs.h projects/zfsd/head/sys/sys/consio.h projects/zfsd/head/sys/sys/cpuset.h projects/zfsd/head/sys/sys/elf_common.h projects/zfsd/head/sys/sys/event.h projects/zfsd/head/sys/sys/fdcio.h projects/zfsd/head/sys/sys/file.h projects/zfsd/head/sys/sys/filedesc.h projects/zfsd/head/sys/sys/hash.h projects/zfsd/head/sys/sys/imgact.h projects/zfsd/head/sys/sys/interrupt.h projects/zfsd/head/sys/sys/ksem.h projects/zfsd/head/sys/sys/libkern.h projects/zfsd/head/sys/sys/linker.h projects/zfsd/head/sys/sys/lockmgr.h projects/zfsd/head/sys/sys/mbuf.h projects/zfsd/head/sys/sys/mman.h projects/zfsd/head/sys/sys/mount.h projects/zfsd/head/sys/sys/param.h projects/zfsd/head/sys/sys/priv.h projects/zfsd/head/sys/sys/proc.h projects/zfsd/head/sys/sys/racct.h projects/zfsd/head/sys/sys/random.h projects/zfsd/head/sys/sys/sdt.h projects/zfsd/head/sys/sys/sleepqueue.h projects/zfsd/head/sys/sys/sockbuf.h projects/zfsd/head/sys/sys/socketvar.h projects/zfsd/head/sys/sys/sockio.h projects/zfsd/head/sys/sys/syscall.h projects/zfsd/head/sys/sys/syscall.mk projects/zfsd/head/sys/sys/syscallsubr.h projects/zfsd/head/sys/sys/sysctl.h projects/zfsd/head/sys/sys/sysent.h projects/zfsd/head/sys/sys/sysproto.h projects/zfsd/head/sys/sys/systm.h projects/zfsd/head/sys/sys/terminal.h projects/zfsd/head/sys/sys/timex.h projects/zfsd/head/sys/sys/ucred.h projects/zfsd/head/sys/sys/umtx.h projects/zfsd/head/sys/sys/user.h projects/zfsd/head/sys/sys/vnode.h projects/zfsd/head/sys/tools/fdt/make_dtb.sh projects/zfsd/head/sys/ufs/ffs/ffs_vfsops.c projects/zfsd/head/sys/ufs/ffs/ffs_vnops.c projects/zfsd/head/sys/ufs/ufs/dir.h projects/zfsd/head/sys/ufs/ufs/ufs_dirhash.c projects/zfsd/head/sys/ufs/ufs/ufs_quota.c projects/zfsd/head/sys/vm/memguard.c projects/zfsd/head/sys/vm/uma_core.c projects/zfsd/head/sys/vm/vm_fault.c projects/zfsd/head/sys/vm/vm_glue.c projects/zfsd/head/sys/vm/vm_kern.c projects/zfsd/head/sys/vm/vm_map.c projects/zfsd/head/sys/vm/vm_map.h projects/zfsd/head/sys/vm/vm_mmap.c projects/zfsd/head/sys/vm/vm_object.h projects/zfsd/head/sys/vm/vm_page.c projects/zfsd/head/sys/vm/vm_pageout.c projects/zfsd/head/sys/vm/vm_pager.c projects/zfsd/head/sys/vm/vm_pager.h projects/zfsd/head/sys/vm/vm_reserv.c projects/zfsd/head/sys/vm/vnode_pager.c projects/zfsd/head/sys/vm/vnode_pager.h projects/zfsd/head/sys/x86/acpica/acpi_wakeup.c projects/zfsd/head/sys/x86/acpica/srat.c projects/zfsd/head/sys/x86/include/fpu.h projects/zfsd/head/sys/x86/include/init.h projects/zfsd/head/sys/x86/include/specialreg.h projects/zfsd/head/sys/x86/iommu/busdma_dmar.c projects/zfsd/head/sys/x86/isa/orm.c projects/zfsd/head/sys/x86/x86/busdma_bounce.c projects/zfsd/head/sys/x86/x86/dump_machdep.c projects/zfsd/head/sys/x86/x86/intr_machdep.c projects/zfsd/head/sys/x86/x86/local_apic.c projects/zfsd/head/sys/x86/x86/tsc.c projects/zfsd/head/sys/x86/xen/hvm.c projects/zfsd/head/sys/x86/xen/pv.c projects/zfsd/head/sys/x86/xen/xen_intr.c projects/zfsd/head/sys/x86/xen/xen_nexus.c projects/zfsd/head/sys/xen/interface/memory.h projects/zfsd/head/sys/xen/interface/physdev.h projects/zfsd/head/sys/xen/interface/xen.h projects/zfsd/head/sys/xen/xen_intr.h projects/zfsd/head/sys/xen/xenstore/xenstore_internal.h projects/zfsd/head/tests/sys/kern/unix_seqpacket_test.c projects/zfsd/head/tests/sys/netinet/fibs_test.sh projects/zfsd/head/tools/build/mk/OptionalObsoleteFiles.inc projects/zfsd/head/tools/build/options/WITHOUT_CLANG_BOOTSTRAP projects/zfsd/head/tools/build/options/WITHOUT_GCC_BOOTSTRAP projects/zfsd/head/tools/build/options/WITHOUT_GNU_GREP_COMPAT projects/zfsd/head/tools/build/options/WITHOUT_RCS projects/zfsd/head/tools/build/options/WITHOUT_TOOLCHAIN projects/zfsd/head/tools/make_libdeps.sh projects/zfsd/head/tools/regression/acltools/01.t projects/zfsd/head/tools/regression/acltools/03.t projects/zfsd/head/tools/regression/acltools/04.t projects/zfsd/head/tools/regression/lib/libc/nss/test-gethostby.c projects/zfsd/head/tools/regression/lib/msun/test-cexp.c projects/zfsd/head/tools/regression/lib/msun/test-conj.c projects/zfsd/head/tools/regression/lib/msun/test-csqrt.c projects/zfsd/head/tools/regression/lib/msun/test-invctrig.c projects/zfsd/head/tools/regression/zfs/misc.sh projects/zfsd/head/tools/regression/zfs/zpool/add/files.t projects/zfsd/head/tools/regression/zfs/zpool/add/option-f_size_mismatch.t projects/zfsd/head/tools/regression/zfs/zpool/add/option-f_type_mismatch.t projects/zfsd/head/tools/regression/zfs/zpool/create/files.t projects/zfsd/head/tools/sched/schedgraph.py projects/zfsd/head/tools/test/dtrace/Makefile projects/zfsd/head/tools/tools/ath/athaggrstats/Makefile projects/zfsd/head/tools/tools/ath/athalq/ar9300_ds.c projects/zfsd/head/tools/tools/bootparttest/Makefile projects/zfsd/head/tools/tools/bootparttest/bootparttest.c projects/zfsd/head/tools/tools/cxgbetool/cxgbetool.c projects/zfsd/head/tools/tools/net80211/wlanstats/Makefile projects/zfsd/head/tools/tools/netmap/pkt-gen.c projects/zfsd/head/tools/tools/vt/keymaps/KBDFILES.map projects/zfsd/head/tools/tools/vt/keymaps/convert-keymap.pl projects/zfsd/head/usr.bin/Makefile projects/zfsd/head/usr.bin/at/at.c projects/zfsd/head/usr.bin/basename/Makefile projects/zfsd/head/usr.bin/bc/Makefile projects/zfsd/head/usr.bin/bluetooth/rfcomm_sppd/Makefile projects/zfsd/head/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.1 projects/zfsd/head/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.c projects/zfsd/head/usr.bin/calendar/calendars/calendar.freebsd projects/zfsd/head/usr.bin/clang/lldb/Makefile projects/zfsd/head/usr.bin/cmp/Makefile projects/zfsd/head/usr.bin/col/col.c projects/zfsd/head/usr.bin/cut/Makefile projects/zfsd/head/usr.bin/dirname/Makefile projects/zfsd/head/usr.bin/elfdump/elfdump.1 projects/zfsd/head/usr.bin/find/function.c projects/zfsd/head/usr.bin/grep/Makefile projects/zfsd/head/usr.bin/grep/regex/tre-fastmatch.c projects/zfsd/head/usr.bin/gzip/Makefile projects/zfsd/head/usr.bin/gzip/gzip.1 projects/zfsd/head/usr.bin/gzip/gzip.c projects/zfsd/head/usr.bin/gzip/zmore projects/zfsd/head/usr.bin/gzip/zmore.1 projects/zfsd/head/usr.bin/hexdump/hexdump.1 projects/zfsd/head/usr.bin/host/Makefile projects/zfsd/head/usr.bin/iscsictl/Makefile projects/zfsd/head/usr.bin/iscsictl/iscsictl.8 projects/zfsd/head/usr.bin/iscsictl/iscsictl.c projects/zfsd/head/usr.bin/iscsictl/token.l projects/zfsd/head/usr.bin/kdump/kdump.c projects/zfsd/head/usr.bin/kdump/mksubr projects/zfsd/head/usr.bin/ktrace/ktrace.1 projects/zfsd/head/usr.bin/lock/lock.1 projects/zfsd/head/usr.bin/man/man.1 projects/zfsd/head/usr.bin/mkimg/Makefile projects/zfsd/head/usr.bin/mkimg/apm.c projects/zfsd/head/usr.bin/mkimg/bsd.c projects/zfsd/head/usr.bin/mkimg/ebr.c projects/zfsd/head/usr.bin/mkimg/gpt.c projects/zfsd/head/usr.bin/mkimg/image.c projects/zfsd/head/usr.bin/mkimg/mbr.c projects/zfsd/head/usr.bin/mkimg/mkimg.1 projects/zfsd/head/usr.bin/mkimg/mkimg.c projects/zfsd/head/usr.bin/mkimg/mkimg.h projects/zfsd/head/usr.bin/mkimg/pc98.c projects/zfsd/head/usr.bin/mkimg/scheme.c projects/zfsd/head/usr.bin/mkimg/scheme.h projects/zfsd/head/usr.bin/mkimg/vhd.c projects/zfsd/head/usr.bin/mkimg/vtoc8.c projects/zfsd/head/usr.bin/netstat/inet6.c projects/zfsd/head/usr.bin/rctl/rctl.8 projects/zfsd/head/usr.bin/sort/sort.c projects/zfsd/head/usr.bin/svn/svn/Makefile projects/zfsd/head/usr.bin/systat/ifstat.c projects/zfsd/head/usr.bin/talk/Makefile projects/zfsd/head/usr.bin/timeout/Makefile projects/zfsd/head/usr.bin/timeout/timeout.1 projects/zfsd/head/usr.bin/timeout/timeout.c projects/zfsd/head/usr.bin/top/machine.c projects/zfsd/head/usr.bin/truss/arm-fbsd.c projects/zfsd/head/usr.bin/truss/syscall.h projects/zfsd/head/usr.bin/truss/syscalls.c projects/zfsd/head/usr.bin/vmstat/vmstat.c projects/zfsd/head/usr.bin/w/w.c projects/zfsd/head/usr.bin/xinstall/xinstall.c projects/zfsd/head/usr.sbin/Makefile projects/zfsd/head/usr.sbin/Makefile.amd64 projects/zfsd/head/usr.sbin/Makefile.i386 projects/zfsd/head/usr.sbin/acpi/acpiconf/Makefile projects/zfsd/head/usr.sbin/acpi/acpidb/Makefile projects/zfsd/head/usr.sbin/acpi/acpidb/acpidb.c projects/zfsd/head/usr.sbin/acpi/acpidump/Makefile projects/zfsd/head/usr.sbin/acpi/acpidump/acpi.c projects/zfsd/head/usr.sbin/acpi/iasl/Makefile projects/zfsd/head/usr.sbin/auditdistd/Makefile projects/zfsd/head/usr.sbin/autofs/auto_master.5 projects/zfsd/head/usr.sbin/autofs/automountd.c projects/zfsd/head/usr.sbin/autofs/common.c projects/zfsd/head/usr.sbin/autofs/common.h projects/zfsd/head/usr.sbin/autofs/token.l projects/zfsd/head/usr.sbin/bhyve/Makefile projects/zfsd/head/usr.sbin/bhyve/acpi.c projects/zfsd/head/usr.sbin/bhyve/bhyve.8 projects/zfsd/head/usr.sbin/bhyve/bhyverun.c projects/zfsd/head/usr.sbin/bhyve/block_if.c projects/zfsd/head/usr.sbin/bhyve/pci_ahci.c projects/zfsd/head/usr.sbin/bhyve/pci_virtio_block.c projects/zfsd/head/usr.sbin/bhyve/pci_virtio_net.c projects/zfsd/head/usr.sbin/bhyve/pci_virtio_rnd.c projects/zfsd/head/usr.sbin/bhyve/rtc.c projects/zfsd/head/usr.sbin/bhyve/smbiostbl.c projects/zfsd/head/usr.sbin/bhyve/task_switch.c projects/zfsd/head/usr.sbin/bhyve/virtio.c projects/zfsd/head/usr.sbin/bhyve/virtio.h projects/zfsd/head/usr.sbin/bhyve/xmsr.c projects/zfsd/head/usr.sbin/bhyve/xmsr.h projects/zfsd/head/usr.sbin/bhyvectl/bhyvectl.c projects/zfsd/head/usr.sbin/bsdconfig/bsdconfig.8 projects/zfsd/head/usr.sbin/bsdconfig/includes/includes projects/zfsd/head/usr.sbin/bsdconfig/share/common.subr projects/zfsd/head/usr.sbin/bsdconfig/share/device.subr projects/zfsd/head/usr.sbin/bsdconfig/share/dialog.subr projects/zfsd/head/usr.sbin/bsdconfig/share/packages/index.subr projects/zfsd/head/usr.sbin/bsdinstall/bsdinstall.8 projects/zfsd/head/usr.sbin/bsdinstall/distextract/distextract.c projects/zfsd/head/usr.sbin/bsdinstall/distfetch/distfetch.c projects/zfsd/head/usr.sbin/bsdinstall/partedit/gpart_ops.c projects/zfsd/head/usr.sbin/bsdinstall/partedit/part_wizard.c projects/zfsd/head/usr.sbin/bsdinstall/partedit/partedit.c projects/zfsd/head/usr.sbin/bsdinstall/partedit/partedit.h projects/zfsd/head/usr.sbin/bsdinstall/partedit/partedit_generic.c projects/zfsd/head/usr.sbin/bsdinstall/partedit/partedit_pc98.c projects/zfsd/head/usr.sbin/bsdinstall/partedit/partedit_powerpc.c projects/zfsd/head/usr.sbin/bsdinstall/partedit/partedit_sparc64.c projects/zfsd/head/usr.sbin/bsdinstall/partedit/partedit_x86.c projects/zfsd/head/usr.sbin/bsdinstall/partedit/sade.8 projects/zfsd/head/usr.sbin/bsdinstall/partedit/scripted.c projects/zfsd/head/usr.sbin/bsdinstall/scripts/auto projects/zfsd/head/usr.sbin/bsdinstall/scripts/config projects/zfsd/head/usr.sbin/bsdinstall/scripts/services projects/zfsd/head/usr.sbin/bsdinstall/scripts/zfsboot projects/zfsd/head/usr.sbin/ctladm/Makefile projects/zfsd/head/usr.sbin/ctladm/ctladm.8 projects/zfsd/head/usr.sbin/ctladm/ctladm.c projects/zfsd/head/usr.sbin/ctld/Makefile projects/zfsd/head/usr.sbin/ctld/ctl.conf.5 projects/zfsd/head/usr.sbin/ctld/ctld.c projects/zfsd/head/usr.sbin/ctld/ctld.h projects/zfsd/head/usr.sbin/ctld/discovery.c projects/zfsd/head/usr.sbin/ctld/kernel.c projects/zfsd/head/usr.sbin/ctld/keys.c projects/zfsd/head/usr.sbin/ctld/login.c projects/zfsd/head/usr.sbin/ctld/parse.y projects/zfsd/head/usr.sbin/ctld/token.l projects/zfsd/head/usr.sbin/etcupdate/etcupdate.8 projects/zfsd/head/usr.sbin/fdread/fdutil.c projects/zfsd/head/usr.sbin/ftp-proxy/Makefile projects/zfsd/head/usr.sbin/gstat/Makefile projects/zfsd/head/usr.sbin/iscsid/Makefile projects/zfsd/head/usr.sbin/iscsid/iscsid.8 projects/zfsd/head/usr.sbin/iscsid/iscsid.h projects/zfsd/head/usr.sbin/iscsid/keys.c projects/zfsd/head/usr.sbin/iscsid/login.c projects/zfsd/head/usr.sbin/kbdcontrol/kbdcontrol.1 projects/zfsd/head/usr.sbin/kbdcontrol/kbdcontrol.c projects/zfsd/head/usr.sbin/kbdcontrol/kbdmap.5 projects/zfsd/head/usr.sbin/kbdmap/kbdmap.1 projects/zfsd/head/usr.sbin/lpr/lpd/printjob.c projects/zfsd/head/usr.sbin/mailwrapper/mailwrapper.8 projects/zfsd/head/usr.sbin/mailwrapper/mailwrapper.c projects/zfsd/head/usr.sbin/makefs/ffs.c projects/zfsd/head/usr.sbin/mfiutil/mfi_properties.c projects/zfsd/head/usr.sbin/mtree/Makefile projects/zfsd/head/usr.sbin/newsyslog/newsyslog.8 projects/zfsd/head/usr.sbin/newsyslog/newsyslog.c projects/zfsd/head/usr.sbin/nmtree/Makefile projects/zfsd/head/usr.sbin/nscd/query.c projects/zfsd/head/usr.sbin/pciconf/pciconf.c projects/zfsd/head/usr.sbin/pkg/Makefile projects/zfsd/head/usr.sbin/pkg/config.c projects/zfsd/head/usr.sbin/pmcstat/pmcstat.8 projects/zfsd/head/usr.sbin/pstat/pstat.8 projects/zfsd/head/usr.sbin/pw/Makefile projects/zfsd/head/usr.sbin/pw/pw_group.c projects/zfsd/head/usr.sbin/pw/pw_user.c projects/zfsd/head/usr.sbin/rtadvd/advcap.c projects/zfsd/head/usr.sbin/rtadvd/config.c projects/zfsd/head/usr.sbin/rtsold/rtsol.c projects/zfsd/head/usr.sbin/smbmsg/smbmsg.8 projects/zfsd/head/usr.sbin/traceroute/Makefile projects/zfsd/head/usr.sbin/unbound/local-setup/local-unbound-setup.sh projects/zfsd/head/usr.sbin/vidcontrol/vidcontrol.1 projects/zfsd/head/usr.sbin/vidcontrol/vidcontrol.c projects/zfsd/head/usr.sbin/watchdogd/watchdog.8 projects/zfsd/head/usr.sbin/watchdogd/watchdogd.8 projects/zfsd/head/usr.sbin/wlandebug/wlandebug.c Directory Properties: projects/zfsd/head/ (props changed) projects/zfsd/head/cddl/ (props changed) projects/zfsd/head/cddl/contrib/opensolaris/ (props changed) projects/zfsd/head/cddl/contrib/opensolaris/lib/libzfs/ (props changed) projects/zfsd/head/contrib/apr-util/ (props changed) projects/zfsd/head/contrib/atf/ (props changed) projects/zfsd/head/contrib/binutils/ (props changed) projects/zfsd/head/contrib/byacc/ (props changed) projects/zfsd/head/contrib/file/ (props changed) projects/zfsd/head/contrib/ipfilter/ (props changed) projects/zfsd/head/contrib/libarchive/ (props changed) projects/zfsd/head/contrib/libarchive/tar/ (props changed) projects/zfsd/head/contrib/libc++/ (props changed) projects/zfsd/head/contrib/libc-vis/ (props changed) projects/zfsd/head/contrib/libcxxrt/ (props changed) projects/zfsd/head/contrib/libpcap/ (props changed) projects/zfsd/head/contrib/llvm/ (props changed) projects/zfsd/head/contrib/llvm/tools/clang/ (props changed) projects/zfsd/head/contrib/mtree/ (props changed) projects/zfsd/head/contrib/netcat/ (props changed) projects/zfsd/head/contrib/one-true-awk/ (props changed) projects/zfsd/head/contrib/openbsm/ (props changed) projects/zfsd/head/contrib/openpam/ (props changed) projects/zfsd/head/contrib/openpam/bin/Makefile.am (props changed) projects/zfsd/head/contrib/openpam/bin/su/Makefile.am (props changed) projects/zfsd/head/contrib/openpam/bin/su/su.c (props changed) projects/zfsd/head/contrib/openpam/compile (props changed) projects/zfsd/head/contrib/openpam/config.guess (props changed) projects/zfsd/head/contrib/openpam/config.sub (props changed) projects/zfsd/head/contrib/openpam/depcomp (props changed) projects/zfsd/head/contrib/openpam/doc/Makefile.am (props changed) projects/zfsd/head/contrib/openpam/doc/man/Makefile.am (props changed) projects/zfsd/head/contrib/openpam/doc/man/openpam.man (props changed) projects/zfsd/head/contrib/openpam/doc/man/pam.man (props changed) projects/zfsd/head/contrib/openpam/include/Makefile.am (props changed) projects/zfsd/head/contrib/openpam/include/security/Makefile.am (props changed) projects/zfsd/head/contrib/openpam/include/security/openpam.h (props changed) projects/zfsd/head/contrib/openpam/include/security/openpam_attr.h (props changed) projects/zfsd/head/contrib/openpam/include/security/pam_appl.h (props changed) projects/zfsd/head/contrib/openpam/include/security/pam_constants.h (props changed) projects/zfsd/head/contrib/openpam/include/security/pam_modules.h (props changed) projects/zfsd/head/contrib/openpam/include/security/pam_types.h (props changed) projects/zfsd/head/contrib/openpam/install-sh (props changed) projects/zfsd/head/contrib/openpam/misc/gendoc.pl (props changed) projects/zfsd/head/contrib/openpam/missing (props changed) projects/zfsd/head/contrib/openpam/modules/Makefile.am (props changed) projects/zfsd/head/contrib/openpam/modules/pam_deny/Makefile.am (props changed) projects/zfsd/head/contrib/openpam/modules/pam_deny/pam_deny.c (props changed) projects/zfsd/head/contrib/openpam/modules/pam_permit/Makefile.am (props changed) projects/zfsd/head/contrib/openpam/modules/pam_permit/pam_permit.c (props changed) projects/zfsd/head/contrib/openpam/modules/pam_unix/Makefile.am (props changed) projects/zfsd/head/contrib/openpam/modules/pam_unix/pam_unix.c (props changed) projects/zfsd/head/contrib/tcpdump/ (props changed) projects/zfsd/head/contrib/tzdata/ (props changed) projects/zfsd/head/contrib/xz/ (props changed) projects/zfsd/head/crypto/heimdal/ (props changed) projects/zfsd/head/crypto/openssl/ (props changed) projects/zfsd/head/etc/ (props changed) projects/zfsd/head/gnu/lib/ (props changed) projects/zfsd/head/gnu/usr.bin/cc/cc_tools/ (props changed) projects/zfsd/head/include/ (props changed) projects/zfsd/head/lib/libc/ (props changed) projects/zfsd/head/lib/libc/stdtime/ (props changed) projects/zfsd/head/lib/libutil/ (props changed) projects/zfsd/head/lib/libz/ (props changed) projects/zfsd/head/sbin/ (props changed) projects/zfsd/head/sbin/dumpon/ (props changed) projects/zfsd/head/sbin/ipfw/ (props changed) projects/zfsd/head/share/ (props changed) projects/zfsd/head/share/man/man4/ (props changed) projects/zfsd/head/share/zoneinfo/ (props changed) projects/zfsd/head/sys/ (props changed) projects/zfsd/head/sys/amd64/include/xen/ (props changed) projects/zfsd/head/sys/amd64/vmm/ (props changed) projects/zfsd/head/sys/boot/ (props changed) projects/zfsd/head/sys/boot/powerpc/ofw/ (props changed) projects/zfsd/head/sys/cddl/contrib/opensolaris/ (props changed) projects/zfsd/head/sys/conf/ (props changed) projects/zfsd/head/sys/contrib/dev/acpica/ (props changed) projects/zfsd/head/sys/contrib/dev/acpica/common/ (props changed) projects/zfsd/head/sys/contrib/dev/acpica/compiler/ (props changed) projects/zfsd/head/sys/contrib/dev/acpica/components/debugger/ (props changed) projects/zfsd/head/sys/contrib/dev/acpica/components/disassembler/ (props changed) projects/zfsd/head/sys/contrib/dev/acpica/components/dispatcher/ (props changed) projects/zfsd/head/sys/contrib/dev/acpica/components/events/ (props changed) projects/zfsd/head/sys/contrib/dev/acpica/components/executer/ (props changed) projects/zfsd/head/sys/contrib/dev/acpica/components/hardware/ (props changed) projects/zfsd/head/sys/contrib/dev/acpica/components/namespace/ (props changed) projects/zfsd/head/sys/contrib/dev/acpica/components/parser/ (props changed) projects/zfsd/head/sys/contrib/dev/acpica/components/resources/ (props changed) projects/zfsd/head/sys/contrib/dev/acpica/components/tables/ (props changed) projects/zfsd/head/sys/contrib/dev/acpica/components/utilities/ (props changed) projects/zfsd/head/sys/contrib/dev/acpica/include/ (props changed) projects/zfsd/head/sys/contrib/dev/acpica/os_specific/ (props changed) projects/zfsd/head/sys/contrib/ipfilter/ (props changed) projects/zfsd/head/sys/dev/hyperv/ (props changed) projects/zfsd/head/sys/gnu/dts/ (props changed) projects/zfsd/head/sys/gnu/dts/include/ (props changed) projects/zfsd/head/sys/gnu/dts/include/dt-bindings/ (props changed) projects/zfsd/head/sys/gnu/dts/include/dt-bindings/clk/ (props changed) projects/zfsd/head/sys/gnu/dts/include/dt-bindings/clk/at91.h (props changed) projects/zfsd/head/sys/gnu/dts/include/dt-bindings/clk/exynos-audss-clk.h (props changed) projects/zfsd/head/sys/gnu/dts/include/dt-bindings/clock/ (props changed) projects/zfsd/head/sys/gnu/dts/include/dt-bindings/clock/efm32-cmu.h (props changed) projects/zfsd/head/sys/gnu/dts/include/dt-bindings/clock/imx5-clock.h (props changed) projects/zfsd/head/sys/gnu/dts/include/dt-bindings/clock/mpc512x-clock.h (props changed) projects/zfsd/head/sys/gnu/dts/include/dt-bindings/clock/qcom,gcc-msm8660.h (props changed) projects/zfsd/head/sys/gnu/dts/include/dt-bindings/clock/qcom,mmcc-msm8974.h (props changed) projects/zfsd/head/sys/gnu/dts/include/dt-bindings/clock/samsung,s3c64xx-clock.h (props changed) projects/zfsd/head/sys/gnu/dts/include/dt-bindings/clock/tegra20-car.h (props changed) projects/zfsd/head/sys/gnu/dts/include/dt-bindings/clock/tegra30-car.h (props changed) projects/zfsd/head/sys/gnu/dts/include/dt-bindings/dma/ (props changed) projects/zfsd/head/sys/gnu/dts/include/dt-bindings/dma/at91.h (props changed) projects/zfsd/head/sys/gnu/dts/include/dt-bindings/gpio/ (props changed) projects/zfsd/head/sys/gnu/dts/include/dt-bindings/gpio/gpio.h (props changed) projects/zfsd/head/sys/gnu/dts/include/dt-bindings/gpio/tegra-gpio.h (props changed) projects/zfsd/head/sys/gnu/dts/include/dt-bindings/input/ (props changed) projects/zfsd/head/sys/gnu/dts/include/dt-bindings/input/input.h (props changed) projects/zfsd/head/sys/gnu/dts/include/dt-bindings/interrupt-controller/ (props changed) projects/zfsd/head/sys/gnu/dts/include/dt-bindings/interrupt-controller/arm-gic.h (props changed) projects/zfsd/head/sys/gnu/dts/include/dt-bindings/interrupt-controller/irq.h (props changed) projects/zfsd/head/sys/gnu/dts/include/dt-bindings/mfd/ (props changed) projects/zfsd/head/sys/gnu/dts/include/dt-bindings/mfd/dbx500-prcmu.h (props changed) projects/zfsd/head/sys/gnu/dts/include/dt-bindings/pinctrl/ (props changed) projects/zfsd/head/sys/gnu/dts/include/dt-bindings/pinctrl/am33xx.h (props changed) projects/zfsd/head/sys/gnu/dts/include/dt-bindings/pinctrl/at91.h (props changed) projects/zfsd/head/sys/gnu/dts/include/dt-bindings/pinctrl/nomadik.h (props changed) projects/zfsd/head/sys/gnu/dts/include/dt-bindings/pinctrl/pinctrl-tegra.h (props changed) projects/zfsd/head/sys/gnu/dts/include/dt-bindings/pinctrl/rockchip.h (props changed) projects/zfsd/head/sys/gnu/dts/include/dt-bindings/pwm/ (props changed) projects/zfsd/head/sys/gnu/dts/include/dt-bindings/pwm/pwm.h (props changed) projects/zfsd/head/sys/gnu/dts/include/dt-bindings/reset/ (props changed) projects/zfsd/head/sys/gnu/dts/include/dt-bindings/reset/qcom,gcc-msm8660.h (props changed) projects/zfsd/head/sys/gnu/dts/include/dt-bindings/reset/qcom,gcc-msm8974.h (props changed) projects/zfsd/head/sys/gnu/dts/include/dt-bindings/reset/qcom,mmcc-msm8974.h (props changed) projects/zfsd/head/sys/gnu/dts/include/dt-bindings/sound/ (props changed) projects/zfsd/head/sys/gnu/dts/include/dt-bindings/sound/fsl-imx-audmux.h (props changed) projects/zfsd/head/sys/gnu/dts/include/dt-bindings/thermal/ (props changed) projects/zfsd/head/sys/gnu/dts/include/dt-bindings/thermal/thermal.h (props changed) projects/zfsd/head/sys/modules/hyperv/ (props changed) projects/zfsd/head/sys/modules/vmm/ (props changed) projects/zfsd/head/usr.bin/calendar/ (props changed) projects/zfsd/head/usr.bin/mkimg/ (props changed) projects/zfsd/head/usr.sbin/bhyve/ (props changed) projects/zfsd/head/usr.sbin/bhyvectl/ (props changed) projects/zfsd/head/usr.sbin/rtadvd/ (props changed) projects/zfsd/head/usr.sbin/rtsold/ (props changed) Modified: projects/zfsd/head/Makefile.inc1 ============================================================================== --- projects/zfsd/head/Makefile.inc1 Sat Nov 1 22:36:40 2014 (r273953) +++ projects/zfsd/head/Makefile.inc1 Sun Nov 2 00:05:52 2014 (r273954) @@ -299,6 +299,10 @@ HMAKE+= PATH=${TMPPATH} METALOG=${METAL WMAKEENV+= MK_CTF=no .endif +.if defined(CROSS_TOOLCHAIN) +LOCALBASE?= /usr/local +.include "${LOCALBASE}/share/toolchains/${CROSS_TOOLCHAIN}.mk" +.endif .if defined(CROSS_TOOLCHAIN_PREFIX) CROSS_COMPILER_PREFIX?=${CROSS_TOOLCHAIN_PREFIX} CROSS_BINUTILS_PREFIX?=${CROSS_TOOLCHAIN_PREFIX} @@ -311,7 +315,7 @@ X${COMPILER}?= ${CROSS_COMPILER_PREFIX}$ X${COMPILER}?= ${${COMPILER}} .endif .endfor -XBINUTILS= AS AR LD NM OBJDUMP RANLIB STRINGS +XBINUTILS= AS AR LD NM OBJCOPY OBJDUMP RANLIB SIZE STRINGS .for BINUTIL in ${XBINUTILS} .if defined(CROSS_BINUTILS_PREFIX) X${BINUTIL}?= ${CROSS_BINUTILS_PREFIX}${${BINUTIL}} @@ -319,10 +323,13 @@ X${BINUTIL}?= ${CROSS_BINUTILS_PREFIX}${ X${BINUTIL}?= ${${BINUTIL}} .endif .endfor -WMAKEENV+= CC="${XCC} ${XFLAGS}" CXX="${XCXX} ${XFLAGS}" \ - CPP="${XCPP} ${XFLAGS}" \ +WMAKEENV+= CC="${XCC} ${XCFLAGS}" CXX="${XCXX} ${XCFLAGS} ${XCXXFLAGS}" \ + DEPFLAGS="${DEPFLAGS}" \ + CPP="${XCPP} ${XCFLAGS}" \ AS="${XAS}" AR="${XAR}" LD="${XLD}" NM=${XNM} \ - OBJDUMP=${XOBJDUMP} RANLIB=${XRANLIB} STRINGS=${XSTRINGS} + OBJDUMP=${XOBJDUMP} OBJCOPY="${XOBJCOPY}" \ + RANLIB=${XRANLIB} STRINGS=${XSTRINGS} \ + SIZE="${XSIZE}" .if ${XCC:M/*} XFLAGS= --sysroot=${WORLDTMP} @@ -336,22 +343,29 @@ XFLAGS+= -B${CROSS_BINUTILS_PREFIX} .else XFLAGS+= -B${WORLDTMP}/usr/bin .endif -.if ${TARGET} == "arm" && ${MK_ARM_EABI} != "no" -.if ${TARGET_ARCH:M*eb*} == "" -TARGET_ABI= gnueabi -.elif ${TARGET_ARCH} == "armv6hf" +.if ${TARGET} == "arm" +.if ${TARGET_ARCH:M*hf*} != "" TARGET_ABI= gnueabihf +.else +TARGET_ABI= gnueabi .endif .endif +.if defined(X_COMPILER_TYPE) && ${X_COMPILER_TYPE} == gcc +XCFLAGS+= -isystem ${WORLDTMP}/usr/include -L${WORLDTMP}/usr/lib +XCXXFLAGS+= -I${WORLDTMP}/usr/include/c++/v1 -std=gnu++11 -L${WORLDTMP}/../lib/libc++ +DEPFLAGS+= -I${WORLDTMP}/usr/include/c++/v1 +.else TARGET_ABI?= unknown TARGET_TRIPLE?= ${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd11.0 -XFLAGS+= -target ${TARGET_TRIPLE} +XCFLAGS+= -target ${TARGET_TRIPLE} +.endif .endif WMAKE= ${WMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 DESTDIR=${WORLDTMP} .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64" # 32 bit world +LIB32_OBJTREE= ${OBJTREE}${.CURDIR}/world32 LIB32TMP= ${OBJTREE}${.CURDIR}/lib32 .if ${TARGET_ARCH} == "amd64" @@ -387,7 +401,7 @@ LIB32FLAGS+= --sysroot=${WORLDTMP} .endif # Yes, the flags are redundant. -LIB32WMAKEENV+= MAKEOBJDIRPREFIX=${OBJTREE}/lib32 \ +LIB32WMAKEENV+= MAKEOBJDIRPREFIX=${LIB32_OBJTREE} \ _SHLIBDIRPREFIX=${LIB32TMP} \ _LDSCRIPTROOT=${LIB32TMP} \ VERSION="${VERSION}" \ @@ -560,7 +574,7 @@ _libraries: @echo "--------------------------------------------------------------" ${_+_}cd ${.CURDIR}; \ ${WMAKE} -DNO_FSCHG MK_HTML=no MK_INFO=no -DNO_LINT MK_MAN=no \ - MK_PROFILE=no MK_TESTS=no libraries + MK_PROFILE=no MK_TESTS=no MK_TESTS_SUPPORT=${MK_TESTS} libraries _depend: @echo @echo "--------------------------------------------------------------" @@ -611,7 +625,7 @@ build32: cd ${.CURDIR}/${_dir}; \ WORLDTMP=${WORLDTMP} \ MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}" \ - MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} SSP_CFLAGS= DESTDIR= \ + MAKEOBJDIRPREFIX=${LIB32_OBJTREE} ${MAKE} SSP_CFLAGS= DESTDIR= \ DIRPRFX=${_dir}/ -DNO_LINT -DNO_CPU_CFLAGS MK_WARNS=no MK_CTF=no \ build-tools .endfor @@ -910,7 +924,7 @@ packageworld: # and do a 'make reinstall' on the *client* to install new binaries from the # most recent server build. # -reinstall: +reinstall: .MAKE @echo "--------------------------------------------------------------" @echo ">>> Making hierarchy" @echo "--------------------------------------------------------------" @@ -925,7 +939,7 @@ reinstall: ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install32 .endif -redistribute: +redistribute: .MAKE @echo "--------------------------------------------------------------" @echo ">>> Distributing everything" @echo "--------------------------------------------------------------" @@ -935,7 +949,7 @@ redistribute: DISTRIBUTION=lib32 .endif -distrib-dirs distribution: +distrib-dirs distribution: .MAKE cd ${.CURDIR}/etc; ${CROSSENV} PATH=${TMPPATH} ${MAKE} \ ${IMAKE_INSTALL} ${IMAKE_MTREE} METALOG=${METALOG} ${.TARGET} @@ -1463,7 +1477,7 @@ native-xtools: .MAKE # # hierarchy - ensure that all the needed directories are present # -hierarchy hier: +hierarchy hier: .MAKE cd ${.CURDIR}/etc && ${HMAKE} distrib-dirs # @@ -1521,7 +1535,6 @@ _prebuild_libs= ${_kerberos5_lib_libasn1 ${_kerberos5_lib_libhx509} ${_kerberos5_lib_libkrb5} \ ${_kerberos5_lib_libroken} \ ${_kerberos5_lib_libwind} \ - ${_lib_atf} \ lib/libbz2 ${_libcom_err} lib/libcrypt \ lib/libelf lib/libexpat \ ${_lib_libgssapi} \ @@ -1530,9 +1543,12 @@ _prebuild_libs= ${_kerberos5_lib_libasn1 lib/ncurses/ncurses lib/ncurses/ncursesw \ lib/libopie lib/libpam ${_lib_libthr} \ lib/libradius lib/libsbuf lib/libtacplus \ + lib/libgeom \ ${_cddl_lib_libumem} ${_cddl_lib_libnvpair} \ + ${_cddl_lib_libuutil} \ ${_cddl_lib_libavl} \ ${_cddl_lib_libzfs_core} \ + ${_cddl_lib_libctf} \ lib/libutil lib/libpjdlog ${_lib_libypclnt} lib/libz lib/msun \ ${_secure_lib_libcrypto} ${_lib_libldns} \ ${_secure_lib_libssh} ${_secure_lib_libssl} @@ -1542,14 +1558,7 @@ gnu/lib/libstdc++__L: lib/msun__L gnu/lib/libsupc++__L: gnu/lib/libstdc++__L .endif -.if defined(WITH_ATF) || ${MK_TESTS} != "no" -.if !defined(WITH_ATF) -# Ensure that the ATF libraries will be built during make libraries, even -# though they will have WITHOUT_TESTS -MAKE+= -DWITH_ATF -.endif -_lib_atf= lib/atf -.endif +lib/libgeom__L: lib/libexpat__L .if ${MK_LIBTHR} != "no" _lib_libthr= lib/libthr @@ -1579,9 +1588,13 @@ lib/libopie__L lib/libtacplus__L: lib/li _cddl_lib_libumem= cddl/lib/libumem _cddl_lib_libnvpair= cddl/lib/libnvpair _cddl_lib_libavl= cddl/lib/libavl +_cddl_lib_libuutil= cddl/lib/libuutil _cddl_lib_libzfs_core= cddl/lib/libzfs_core +_cddl_lib_libctf= cddl/lib/libctf _cddl_lib= cddl/lib cddl/lib/libzfs_core__L: cddl/lib/libnvpair__L +cddl/lib/libzfs__L: lib/libgeom__L +cddl/lib/libctf__L: lib/libz__L .endif .if ${MK_CRYPT} != "no" @@ -1868,7 +1881,8 @@ check-old: check-old-files check-old-lib # showconfig - show build configuration. # showconfig: - @${MAKE} -n -f src.opts.mk -V dummy -dg1 2>&1 | grep ^MK_ | sort + @(${MAKE} -n -f ${.CURDIR}/sys/conf/kern.opts.mk -V dummy -dg1; \ + ${MAKE} -n -f ${.CURDIR}/share/mk/src.opts.mk -V dummy -dg1) 2>&1 | grep ^MK_ | sort -u .if !empty(KRNLOBJDIR) && !empty(KERNCONF) DTBOUTPUTPATH= ${KRNLOBJDIR}/${KERNCONF}/ Modified: projects/zfsd/head/ObsoleteFiles.inc ============================================================================== --- projects/zfsd/head/ObsoleteFiles.inc Sat Nov 1 22:36:40 2014 (r273953) +++ projects/zfsd/head/ObsoleteFiles.inc Sun Nov 2 00:05:52 2014 (r273954) @@ -38,6 +38,24 @@ # xargs -n1 | sort | uniq -d; # done +# 20141031: initrandom obsoleted by new /dev/random code +OLD_FILES+=etc/rc.d/initrandom +# 20141028: debug files accidentally installed as directory name +OLD_FILES+=usr/lib/debug/usr/lib/i18n +OLD_FILES+=usr/lib/debug/usr/lib/private +OLD_FILES+=usr/lib/debug/usr/lib32/i18n +OLD_FILES+=usr/lib/debug/usr/lib32/private +# 20141015: OpenSSL 1.0.1j import +OLD_FILES+=usr/share/openssl/man/man3/CMS_sign_add1_signer.3.gz +# 20140922: sleepq_calc_signal_retval.9 and sleepq_catch_signals.9 removed +OLD_FILES+=usr/share/man/man9/sleepq_calc_signal_retval.9.gz +OLD_FILES+=usr/share/man/man9/sleepq_catch_signals.9.gz +# 20140917: hv_kvpd rc.d script removed in favor of devd configuration +OLD_FILES+=etc/rc.d/hv_kvpd +# 20140917: libnv was accidentally being installed to /usr/lib instead of /lib +OLD_LIBS+=usr/lib/libnv.so.0 +# 20140829: rc.d/kerberos removed +OLD_FILES+=etc/rc.d/kerberos # 20140814: libopie version bump OLD_LIBS+=usr/lib/libopie.so.7 OLD_LIBS+=usr/lib32/libopie.so.7 @@ -356,7 +374,6 @@ OLD_FILES+=usr/share/man/man1/atf-report OLD_FILES+=usr/share/man/man1/atf-run.1.gz OLD_FILES+=usr/share/man/man1/atf-version.1.gz OLD_FILES+=usr/share/man/man5/atf-formats.5.gz -OLD_FILES+=usr/share/man/man7/atf.7.gz OLD_FILES+=usr/share/xml/atf/tests-results.dtd OLD_FILES+=usr/share/xsl/atf/tests-results.xsl # 20131009: freebsd-version moved from /libexec to /bin @@ -1488,6 +1505,7 @@ OLD_LIBS+=usr/lib/libpanel.so.4 OLD_LIBS+=usr/lib/libpanelw.so.4 OLD_LIBS+=usr/lib/libpmc.so.4 OLD_LIBS+=usr/lib/libproc.so.1 +OLD_LIBS+=usr/lib/libproc.so.2 OLD_LIBS+=usr/lib/libradius.so.3 OLD_LIBS+=usr/lib/librpcsvc.so.4 OLD_LIBS+=usr/lib/libsdp.so.3 @@ -3205,6 +3223,202 @@ OLD_FILES+=lib/geom/geom_concat.so.1 OLD_FILES+=lib/geom/geom_label.so.1 OLD_FILES+=lib/geom/geom_nop.so.1 OLD_FILES+=lib/geom/geom_stripe.so.1 +# 20040728: GCC 3.4.2 +OLD_DIRS+=usr/include/c++/3.3 +OLD_FILES+=usr/include/c++/3.3/FlexLexer.h +OLD_FILES+=usr/include/c++/3.3/algorithm +OLD_FILES+=usr/include/c++/3.3/backward/algo.h +OLD_FILES+=usr/include/c++/3.3/backward/algobase.h +OLD_FILES+=usr/include/c++/3.3/backward/alloc.h +OLD_FILES+=usr/include/c++/3.3/backward/backward_warning.h +OLD_FILES+=usr/include/c++/3.3/backward/bvector.h +OLD_FILES+=usr/include/c++/3.3/backward/complex.h +OLD_FILES+=usr/include/c++/3.3/backward/defalloc.h +OLD_FILES+=usr/include/c++/3.3/backward/deque.h +OLD_FILES+=usr/include/c++/3.3/backward/fstream.h +OLD_FILES+=usr/include/c++/3.3/backward/function.h +OLD_FILES+=usr/include/c++/3.3/backward/hash_map.h +OLD_FILES+=usr/include/c++/3.3/backward/hash_set.h +OLD_FILES+=usr/include/c++/3.3/backward/hashtable.h +OLD_FILES+=usr/include/c++/3.3/backward/heap.h +OLD_FILES+=usr/include/c++/3.3/backward/iomanip.h +OLD_FILES+=usr/include/c++/3.3/backward/iostream.h +OLD_FILES+=usr/include/c++/3.3/backward/istream.h +OLD_FILES+=usr/include/c++/3.3/backward/iterator.h +OLD_FILES+=usr/include/c++/3.3/backward/list.h +OLD_FILES+=usr/include/c++/3.3/backward/map.h +OLD_FILES+=usr/include/c++/3.3/backward/multimap.h +OLD_FILES+=usr/include/c++/3.3/backward/multiset.h +OLD_FILES+=usr/include/c++/3.3/backward/new.h +OLD_FILES+=usr/include/c++/3.3/backward/ostream.h +OLD_FILES+=usr/include/c++/3.3/backward/pair.h +OLD_FILES+=usr/include/c++/3.3/backward/queue.h +OLD_FILES+=usr/include/c++/3.3/backward/rope.h +OLD_FILES+=usr/include/c++/3.3/backward/set.h +OLD_FILES+=usr/include/c++/3.3/backward/slist.h +OLD_FILES+=usr/include/c++/3.3/backward/stack.h +OLD_FILES+=usr/include/c++/3.3/backward/stream.h +OLD_FILES+=usr/include/c++/3.3/backward/streambuf.h +OLD_FILES+=usr/include/c++/3.3/backward/strstream +OLD_FILES+=usr/include/c++/3.3/backward/strstream.h +OLD_FILES+=usr/include/c++/3.3/backward/tempbuf.h +OLD_FILES+=usr/include/c++/3.3/backward/tree.h +OLD_FILES+=usr/include/c++/3.3/backward/vector.h +OLD_DIRS+=usr/include/c++/3.3/backward +OLD_FILES+=usr/include/c++/3.3/bits/atomicity.h +OLD_FILES+=usr/include/c++/3.3/bits/basic_file.h +OLD_FILES+=usr/include/c++/3.3/bits/basic_ios.h +OLD_FILES+=usr/include/c++/3.3/bits/basic_ios.tcc +OLD_FILES+=usr/include/c++/3.3/bits/basic_string.h +OLD_FILES+=usr/include/c++/3.3/bits/basic_string.tcc +OLD_FILES+=usr/include/c++/3.3/bits/boost_concept_check.h +OLD_FILES+=usr/include/c++/3.3/bits/c++config.h +OLD_FILES+=usr/include/c++/3.3/bits/c++io.h +OLD_FILES+=usr/include/c++/3.3/bits/c++locale.h +OLD_FILES+=usr/include/c++/3.3/bits/c++locale_internal.h +OLD_FILES+=usr/include/c++/3.3/bits/char_traits.h +OLD_FILES+=usr/include/c++/3.3/bits/cmath.tcc +OLD_FILES+=usr/include/c++/3.3/bits/codecvt.h +OLD_FILES+=usr/include/c++/3.3/bits/codecvt_specializations.h +OLD_FILES+=usr/include/c++/3.3/bits/concept_check.h +OLD_FILES+=usr/include/c++/3.3/bits/cpp_type_traits.h +OLD_FILES+=usr/include/c++/3.3/bits/ctype_base.h +OLD_FILES+=usr/include/c++/3.3/bits/ctype_inline.h +OLD_FILES+=usr/include/c++/3.3/bits/ctype_noninline.h +OLD_FILES+=usr/include/c++/3.3/bits/deque.tcc +OLD_FILES+=usr/include/c++/3.3/bits/fpos.h +OLD_FILES+=usr/include/c++/3.3/bits/fstream.tcc +OLD_FILES+=usr/include/c++/3.3/bits/functexcept.h +OLD_FILES+=usr/include/c++/3.3/bits/generic_shadow.h +OLD_FILES+=usr/include/c++/3.3/bits/gslice.h +OLD_FILES+=usr/include/c++/3.3/bits/gslice_array.h +OLD_FILES+=usr/include/c++/3.3/bits/gthr-default.h +OLD_FILES+=usr/include/c++/3.3/bits/gthr-posix.h +OLD_FILES+=usr/include/c++/3.3/bits/gthr-single.h +OLD_FILES+=usr/include/c++/3.3/bits/gthr.h +OLD_FILES+=usr/include/c++/3.3/bits/indirect_array.h +OLD_FILES+=usr/include/c++/3.3/bits/ios_base.h +OLD_FILES+=usr/include/c++/3.3/bits/istream.tcc +OLD_FILES+=usr/include/c++/3.3/bits/list.tcc +OLD_FILES+=usr/include/c++/3.3/bits/locale_classes.h +OLD_FILES+=usr/include/c++/3.3/bits/locale_facets.h +OLD_FILES+=usr/include/c++/3.3/bits/locale_facets.tcc +OLD_FILES+=usr/include/c++/3.3/bits/localefwd.h +OLD_FILES+=usr/include/c++/3.3/bits/mask_array.h +OLD_FILES+=usr/include/c++/3.3/bits/messages_members.h +OLD_FILES+=usr/include/c++/3.3/bits/os_defines.h +OLD_FILES+=usr/include/c++/3.3/bits/ostream.tcc +OLD_FILES+=usr/include/c++/3.3/bits/pthread_allocimpl.h +OLD_FILES+=usr/include/c++/3.3/bits/slice.h +OLD_FILES+=usr/include/c++/3.3/bits/slice_array.h +OLD_FILES+=usr/include/c++/3.3/bits/sstream.tcc +OLD_FILES+=usr/include/c++/3.3/bits/stl_algo.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_algobase.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_alloc.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_bvector.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_construct.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_deque.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_function.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_heap.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_iterator.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_iterator_base_funcs.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_iterator_base_types.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_list.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_map.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_multimap.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_multiset.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_numeric.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_pair.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_pthread_alloc.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_queue.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_raw_storage_iter.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_relops.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_set.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_stack.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_tempbuf.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_threads.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_tree.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_uninitialized.h +OLD_FILES+=usr/include/c++/3.3/bits/stl_vector.h +OLD_FILES+=usr/include/c++/3.3/bits/stream_iterator.h +OLD_FILES+=usr/include/c++/3.3/bits/streambuf.tcc +OLD_FILES+=usr/include/c++/3.3/bits/streambuf_iterator.h +OLD_FILES+=usr/include/c++/3.3/bits/stringfwd.h +OLD_FILES+=usr/include/c++/3.3/bits/time_members.h +OLD_FILES+=usr/include/c++/3.3/bits/type_traits.h +OLD_FILES+=usr/include/c++/3.3/bits/valarray_array.h +OLD_FILES+=usr/include/c++/3.3/bits/valarray_array.tcc +OLD_FILES+=usr/include/c++/3.3/bits/valarray_meta.h +OLD_FILES+=usr/include/c++/3.3/bits/vector.tcc +OLD_DIRS+=usr/include/c++/3.3/bits +OLD_FILES+=usr/include/c++/3.3/bitset +OLD_FILES+=usr/include/c++/3.3/cassert +OLD_FILES+=usr/include/c++/3.3/cctype +OLD_FILES+=usr/include/c++/3.3/cerrno +OLD_FILES+=usr/include/c++/3.3/cfloat +OLD_FILES+=usr/include/c++/3.3/ciso646 +OLD_FILES+=usr/include/c++/3.3/climits +OLD_FILES+=usr/include/c++/3.3/clocale +OLD_FILES+=usr/include/c++/3.3/cmath +OLD_FILES+=usr/include/c++/3.3/complex +OLD_FILES+=usr/include/c++/3.3/csetjmp +OLD_FILES+=usr/include/c++/3.3/csignal +OLD_FILES+=usr/include/c++/3.3/cstdarg +OLD_FILES+=usr/include/c++/3.3/cstddef +OLD_FILES+=usr/include/c++/3.3/cstdio +OLD_FILES+=usr/include/c++/3.3/cstdlib +OLD_FILES+=usr/include/c++/3.3/cstring +OLD_FILES+=usr/include/c++/3.3/ctime +OLD_FILES+=usr/include/c++/3.3/cwchar +OLD_FILES+=usr/include/c++/3.3/cwctype +OLD_FILES+=usr/include/c++/3.3/cxxabi.h +OLD_FILES+=usr/include/c++/3.3/deque +OLD_FILES+=usr/include/c++/3.3/exception +OLD_FILES+=usr/include/c++/3.3/exception_defines.h +OLD_FILES+=usr/include/c++/3.3/ext/algorithm +OLD_FILES+=usr/include/c++/3.3/ext/enc_filebuf.h +OLD_FILES+=usr/include/c++/3.3/ext/functional +OLD_FILES+=usr/include/c++/3.3/ext/hash_map +OLD_FILES+=usr/include/c++/3.3/ext/hash_set +OLD_FILES+=usr/include/c++/3.3/ext/iterator +OLD_FILES+=usr/include/c++/3.3/ext/memory +OLD_FILES+=usr/include/c++/3.3/ext/numeric +OLD_FILES+=usr/include/c++/3.3/ext/rb_tree +OLD_FILES+=usr/include/c++/3.3/ext/rope +OLD_FILES+=usr/include/c++/3.3/ext/ropeimpl.h +OLD_FILES+=usr/include/c++/3.3/ext/slist +OLD_FILES+=usr/include/c++/3.3/ext/stdio_filebuf.h +OLD_FILES+=usr/include/c++/3.3/ext/stl_hash_fun.h +OLD_FILES+=usr/include/c++/3.3/ext/stl_hashtable.h +OLD_FILES+=usr/include/c++/3.3/ext/stl_rope.h +OLD_DIRS+=usr/include/c++/3.3/ext +OLD_FILES+=usr/include/c++/3.3/fstream +OLD_FILES+=usr/include/c++/3.3/functional +OLD_FILES+=usr/include/c++/3.3/iomanip +OLD_FILES+=usr/include/c++/3.3/ios +OLD_FILES+=usr/include/c++/3.3/iosfwd +OLD_FILES+=usr/include/c++/3.3/iostream +OLD_FILES+=usr/include/c++/3.3/istream +OLD_FILES+=usr/include/c++/3.3/iterator +OLD_FILES+=usr/include/c++/3.3/limits +OLD_FILES+=usr/include/c++/3.3/list +OLD_FILES+=usr/include/c++/3.3/locale +OLD_FILES+=usr/include/c++/3.3/map +OLD_FILES+=usr/include/c++/3.3/memory +OLD_FILES+=usr/include/c++/3.3/new +OLD_FILES+=usr/include/c++/3.3/numeric +OLD_FILES+=usr/include/c++/3.3/ostream +OLD_FILES+=usr/include/c++/3.3/queue +OLD_FILES+=usr/include/c++/3.3/set +OLD_FILES+=usr/include/c++/3.3/sstream +OLD_FILES+=usr/include/c++/3.3/stack +OLD_FILES+=usr/include/c++/3.3/stdexcept +OLD_FILES+=usr/include/c++/3.3/streambuf +OLD_FILES+=usr/include/c++/3.3/string +OLD_FILES+=usr/include/c++/3.3/typeinfo +OLD_FILES+=usr/include/c++/3.3/utility +OLD_FILES+=usr/include/c++/3.3/valarray +OLD_FILES+=usr/include/c++/3.3/vector # 20040713: fla(4) removed. OLD_FILES+=usr/share/man/man4/fla.4.gz # 200407XX Modified: projects/zfsd/head/UPDATING ============================================================================== --- projects/zfsd/head/UPDATING Sat Nov 1 22:36:40 2014 (r273953) +++ projects/zfsd/head/UPDATING Sun Nov 2 00:05:52 2014 (r273954) @@ -31,6 +31,23 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20141009: + gperf has been removed from the base system for architectures + that use clang. Ports that require gperf will obtain it from the + devel/gperf port. + +20140923: + pjdfstest has been moved from tools/regression/pjdfstest to + contrib/pjdfstest . + +20140922: + At svn r271982, The default linux compat kernel ABI has been adjusted + to 2.6.18 in support of the linux-c6 compat ports infrastructure + update. If you wish to continue using the linux-f10 compat ports, + add compat.linux.osrelease=2.6.16 to your local sysctl.conf. Users are + encouraged to update their linux-compat packages to linux-c6 during + their next update cycle. + 20140729: The ofwfb driver, used to provide a graphics console on PowerPC when using vt(4), no longer allows mmap() of all of physical memory. This Modified: projects/zfsd/head/bin/csh/Makefile ============================================================================== --- projects/zfsd/head/bin/csh/Makefile Sat Nov 1 22:36:40 2014 (r273953) +++ projects/zfsd/head/bin/csh/Makefile Sun Nov 2 00:05:52 2014 (r273954) @@ -94,7 +94,7 @@ GENHDRS+= iconv.h SRCS+= iconv_stub.c iconv.h: ${.CURDIR}/iconv_stub.h - cp ${.CURDIR}/iconv_stub.h ${.TARGET} + cp -f ${.CURDIR}/iconv_stub.h ${.TARGET} .endif .endif Modified: projects/zfsd/head/bin/dd/dd.1 ============================================================================== --- projects/zfsd/head/bin/dd/dd.1 Sat Nov 1 22:36:40 2014 (r273953) +++ projects/zfsd/head/bin/dd/dd.1 Sun Nov 2 00:05:52 2014 (r273954) @@ -32,7 +32,7 @@ .\" @(#)dd.1 8.2 (Berkeley) 1/13/94 .\" $FreeBSD$ .\" -.Dd April 2, 2014 +.Dd August 28, 2014 .Dt DD 1 .Os .Sh NAME @@ -408,6 +408,11 @@ To create an image of a Mode-1 CD-ROM, w for data CD-ROM disks, use a block size of 2048 bytes: .Pp .Dl "dd if=/dev/acd0 of=filename.iso bs=2048" +.Pp +Write a filesystem image to a memory stick, padding the end with zeros, +if necessary, to a 1MiB boundary: +.Pp +.Dl "dd if=memstick.img of=/dev/da0 bs=1m conv=noerror,sync" .Sh SEE ALSO .Xr cp 1 , .Xr mt 1 , Modified: projects/zfsd/head/bin/pkill/tests/pgrep-j_test.sh ============================================================================== --- projects/zfsd/head/bin/pkill/tests/pgrep-j_test.sh Sat Nov 1 22:36:40 2014 (r273953) +++ projects/zfsd/head/bin/pkill/tests/pgrep-j_test.sh Sun Nov 2 00:05:52 2014 (r273954) @@ -1,7 +1,23 @@ #!/bin/sh # $FreeBSD$ -base=`basename $0` +jail_name_to_jid() +{ + local check_name="$1" + ( + line="$(jls -n 2> /dev/null | grep name=$check_name )" + for nv in $line; do + local name="${nv%=*}" + if [ "${name}" = "jid" ]; then + eval $nv + echo $jid + break + fi + done + ) +} + +base=pgrep_j_test echo "1..3" @@ -9,21 +25,25 @@ name="pgrep -j " if [ `id -u` -eq 0 ]; then sleep=$(pwd)/sleep.txt ln -sf /bin/sleep $sleep - jail / $base-1 127.0.0.1 $sleep 5 & - chpid=$! - jail / $base-2 127.0.0.1 $sleep 5 & - chpid2=$! - $sleep 5 & - chpid3=$! - sleep 0.5 - jid=`jls | awk "/127\\.0\\.0\\.1.*${base}-1/ {print \$1}"` - pid=`pgrep -f -j $jid $sleep` - if [ "$pid" = "$chpid" ]; then + jail -c path=/ name=${base}_1_1 ip4.addr=127.0.0.1 \ + command=daemon -p ${PWD}/${base}_1_1.pid $sleep 5 & + + jail -c path=/ name=${base}_1_2 ip4.addr=127.0.0.1 \ + command=daemon -p ${PWD}/${base}_1_2.pid $sleep 5 & + + jid1=$(jail_name_to_jid ${base}_1_1) + jid2=$(jail_name_to_jid ${base}_1_2) + jid="${jid1},${jid2}" + pid1="$(pgrep -f -x -j $jid "$sleep 5" | sort)" + pid2=$(printf "%s\n%s" "$(cat ${PWD}/${base}_1_1.pid)" \ + $(cat ${PWD}/${base}_1_2.pid) | sort) + if [ "$pid1" = "$pid2" ]; then echo "ok 1 - $name" else echo "not ok 1 - $name" fi - kill $chpid $chpid2 $chpid3 + [ -f ${PWD}/${base}_1_1.pid ] && kill $(cat ${PWD}/${base}_1_1.pid) + [ -f ${PWD}/${base}_1_2.pid ] && kill $(cat ${PWD}/${base}_1_2.pid) rm -f $sleep else echo "ok 1 - $name # skip Test needs uid 0." @@ -33,21 +53,23 @@ name="pgrep -j any" if [ `id -u` -eq 0 ]; then sleep=$(pwd)/sleep.txt ln -sf /bin/sleep $sleep - jail / $base-1 127.0.0.1 $sleep 5 & - chpid=$! - jail / $base-2 127.0.0.1 $sleep 5 & - chpid2=$! - $sleep 5 & - chpid3=$! - sleep 0.5 - pids=`pgrep -f -j any $sleep | sort` - refpids=`{ echo $chpid; echo $chpid2; } | sort` - if [ "$pids" = "$refpids" ]; then + jail -c path=/ name=${base}_2_1 ip4.addr=127.0.0.1 \ + command=daemon -p ${PWD}/${base}_2_1.pid $sleep 5 & + + jail -c path=/ name=${base}_2_2 ip4.addr=127.0.0.1 \ + command=daemon -p ${PWD}/${base}_2_2.pid $sleep 5 & + + sleep 2 + pid1="$(pgrep -f -x -j any "$sleep 5" | sort)" + pid2=$(printf "%s\n%s" "$(cat ${PWD}/${base}_2_1.pid)" \ + $(cat ${PWD}/${base}_2_2.pid) | sort) + if [ "$pid1" = "$pid2" ]; then echo "ok 2 - $name" else echo "not ok 2 - $name" fi - kill $chpid $chpid2 $chpid3 + [ -f ${PWD}/${base}_2_1.pid ] && kill $(cat ${PWD}/${base}_2_1.pid) + [ -f ${PWD}/${base}_2_2.pid ] && kill $(cat ${PWD}/${base}_2_2.pid) rm -f $sleep else echo "ok 2 - $name # skip Test needs uid 0." @@ -57,19 +79,19 @@ name="pgrep -j none" if [ `id -u` -eq 0 ]; then sleep=$(pwd)/sleep.txt ln -sf /bin/sleep $sleep - $sleep 5 & - chpid=$! - jail / $base 127.0.0.1 $sleep 5 & - chpid2=$! - sleep 0.5 - pid=`pgrep -f -j none $sleep` - if [ "$pid" = "$chpid" ]; then + daemon -p ${PWD}/${base}_3_1.pid $sleep 5 & + jail -c path=/ name=${base}_3_2 ip4.addr=127.0.0.1 \ + command=daemon -p ${PWD}/${base}_3_2.pid $sleep 5 & + sleep 2 + pid="$(pgrep -f -x -j none "$sleep 5")" + if [ "$pid" = "$(cat ${PWD}/${base}_3_1.pid)" ]; then echo "ok 3 - $name" else echo "not ok 3 - $name" fi - kill $chpid $chpid2 rm -f $sleep + [ -f ${PWD}/${base}_3_1.pid ] && kill $(cat $PWD/${base}_3_1.pid) + [ -f ${PWD}/${base}_3_2.pid ] && kill $(cat $PWD/${base}_3_2.pid) else echo "ok 3 - $name # skip Test needs uid 0." fi Modified: projects/zfsd/head/bin/pkill/tests/pkill-j_test.sh ============================================================================== --- projects/zfsd/head/bin/pkill/tests/pkill-j_test.sh Sat Nov 1 22:36:40 2014 (r273953) +++ projects/zfsd/head/bin/pkill/tests/pkill-j_test.sh Sun Nov 2 00:05:52 2014 (r273954) @@ -1,7 +1,23 @@ #!/bin/sh # $FreeBSD$ -base=`basename $0` +jail_name_to_jid() +{ + local check_name="$1" + ( + line="$(jls -n 2> /dev/null | grep name=$check_name )" + for nv in $line; do + local name="${nv%=*}" + if [ "${name}" = "jid" ]; then + eval $nv + echo $jid + break + fi + done + ) +} + +base=pkill_j_test echo "1..3" @@ -9,21 +25,28 @@ name="pkill -j " if [ `id -u` -eq 0 ]; then sleep=$(pwd)/sleep.txt ln -sf /bin/sleep $sleep - jail / $base-1 127.0.0.1 $sleep 5 & - chpid=$! - jail / $base-2 127.0.0.1 $sleep 5 & - chpid2=$! + jail -c path=/ name=${base}_1_1 ip4.addr=127.0.0.1 \ + command=daemon -p ${PWD}/${base}_1_1.pid $sleep 5 & + + jail -c path=/ name=${base}_1_2 ip4.addr=127.0.0.1 \ + command=daemon -p ${PWD}/${base}_1_2.pid $sleep 5 & + $sleep 5 & - chpid3=$! sleep 0.5 - jid=`jls | awk "/127\\.0\\.0\\.1.*${base}-1/ {print \$1}"` - if pkill -f -j $jid $sleep && sleep 0.5 && - ! kill $chpid && kill $chpid2 $chpid3; then + jid1=$(jail_name_to_jid ${base}_1_1) + jid2=$(jail_name_to_jid ${base}_1_2) + jid="${jid1},${jid2}" + if pkill -f -j "$jid" $sleep && sleep 0.5 && + ! -f ${PWD}/${base}_1_1.pid && + ! -f ${PWD}/${base}_1_2.pid ; then echo "ok 1 - $name" else echo "not ok 1 - $name" fi 2>/dev/null rm -f $sleep + [ -f ${PWD}/${base}_1_1.pid ] && kill $(cat ${PWD}/${base}_1_1.pid) + [ -f ${PWD}/${base}_1_2.pid ] && kill $(cat ${PWD}/${base}_1_2.pid) + wait else echo "ok 1 - $name # skip Test needs uid 0." fi @@ -32,20 +55,26 @@ name="pkill -j any" if [ `id -u` -eq 0 ]; then sleep=$(pwd)/sleep.txt ln -sf /bin/sleep $sleep - jail / $base-1 127.0.0.1 $sleep 5 & - chpid=$! - jail / $base-2 127.0.0.1 $sleep 5 & - chpid2=$! + jail -c path=/ name=${base}_2_1 ip4.addr=127.0.0.1 \ + command=daemon -p ${PWD}/${base}_2_1.pid $sleep 5 & + + jail -c path=/ name=${base}_2_2 ip4.addr=127.0.0.1 \ + command=daemon -p ${PWD}/${base}_2_2.pid $sleep 5 & + $sleep 5 & - chpid3=$! sleep 0.5 + chpid3=$! if pkill -f -j any $sleep && sleep 0.5 && - ! kill $chpid && ! kill $chpid2 && kill $chpid3; then + [ ! -f ${PWD}/${base}_2_1.pid -a + ! -f ${PWD}/${base}_2_2.pid ] && kill $chpid3; then echo "ok 2 - $name" else echo "not ok 2 - $name" fi 2>/dev/null rm -f $sleep + [ -f ${PWD}/${base}_2_1.pid ] && kill $(cat ${PWD}/${base}_2_1.pid) + [ -f ${PWD}/${base}_2_2.pid ] && kill $(cat ${PWD}/${base}_2_2.pid) + wait else echo "ok 2 - $name # skip Test needs uid 0." fi @@ -54,18 +83,20 @@ name="pkill -j none" if [ `id -u` -eq 0 ]; then sleep=$(pwd)/sleep.txt ln -sf /bin/sleep $sleep - $sleep 5 & - chpid=$! - jail / $base 127.0.0.1 $sleep 5 & - chpid2=$! - sleep 0.5 - if pkill -f -j none $sleep && sleep 0.5 && - ! kill $chpid && kill $chpid2; then + daemon -p ${PWD}/${base}_3_1.pid $sleep 5 + jail -c path=/ name=${base}_3_2 ip4.addr=127.0.0.1 \ + command=daemon -p ${PWD}/${base}_3_2.pid $sleep 5 & + sleep 1 + if pkill -f -j none "$sleep 5" && sleep 1 && + [ ! -f ${PWD}/${base}_3_1.pid -a -f ${PWD}/${base}_3_2.pid ] ; then echo "ok 3 - $name" else + ls ${PWD}/*.pid echo "not ok 3 - $name" fi 2>/dev/null rm -f $sleep + [ -f ${PWD}/${base}_3_1.pid ] && kill $(cat ${base}_3_1.pid) + [ -f ${PWD}/${base}_3_2.pid ] && kill $(cat ${base}_3_2.pid) else echo "ok 3 - $name # skip Test needs uid 0." fi Modified: projects/zfsd/head/bin/ps/keyword.c ============================================================================== --- projects/zfsd/head/bin/ps/keyword.c Sat Nov 1 22:36:40 2014 (r273953) +++ projects/zfsd/head/bin/ps/keyword.c Sun Nov 2 00:05:52 2014 (r273954) @@ -157,6 +157,7 @@ static VAR var[] = { {"tdnam", "TDNAM", NULL, LJUST, tdnam, 0, CHAR, NULL, 0}, {"time", "TIME", NULL, USER, cputime, 0, CHAR, NULL, 0}, {"tpgid", "TPGID", NULL, 0, kvar, KOFF(ki_tpgid), UINT, PIDFMT, 0}, + {"tracer", "TRACER", NULL, 0, kvar, KOFF(ki_tracer), UINT, PIDFMT, 0}, {"tsid", "TSID", NULL, 0, kvar, KOFF(ki_tsid), UINT, PIDFMT, 0}, {"tsiz", "TSIZ", NULL, 0, kvar, KOFF(ki_tsize), PGTOK, "ld", 0}, {"tt", "TT ", NULL, 0, tname, 0, CHAR, NULL, 0}, Modified: projects/zfsd/head/bin/ps/ps.1 ============================================================================== --- projects/zfsd/head/bin/ps/ps.1 Sat Nov 1 22:36:40 2014 (r273953) +++ projects/zfsd/head/bin/ps/ps.1 Sun Nov 2 00:05:52 2014 (r273954) @@ -29,7 +29,7 @@ .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 .\" $FreeBSD$ .\" -.Dd August 7, 2014 +.Dd August 27, 2014 .Dt PS 1 .Os .Sh NAME @@ -665,6 +665,8 @@ accumulated CPU time, user + system (ali .Cm cputime ) .It Cm tpgid control terminal process group ID +.It Cm tracer +tracer process ID .\".It Cm trss .\"text resident set size (in Kbytes) .It Cm tsid Modified: projects/zfsd/head/bin/sh/eval.c ============================================================================== --- projects/zfsd/head/bin/sh/eval.c Sat Nov 1 22:36:40 2014 (r273953) +++ projects/zfsd/head/bin/sh/eval.c Sun Nov 2 00:05:52 2014 (r273954) @@ -168,6 +168,8 @@ evalstring(char *s, int flags) else evaltree(n, flags); any = 1; + if (evalskip) + break; } popstackmark(&smark); setstackmark(&smark); @@ -316,9 +318,10 @@ evalloop(union node *n, int flags) loopnest++; status = 0; for (;;) { - evaltree(n->nbinary.ch1, EV_TESTED); + if (!evalskip) + evaltree(n->nbinary.ch1, EV_TESTED); if (evalskip) { -skipping: if (evalskip == SKIPCONT && --skipcount <= 0) { + if (evalskip == SKIPCONT && --skipcount <= 0) { evalskip = 0; continue; } @@ -337,8 +340,6 @@ skipping: if (evalskip == SKIPCONT && } evaltree(n->nbinary.ch2, flags); status = exitstatus; - if (evalskip) - goto skipping; } loopnest--; exitstatus = status; @@ -648,15 +649,15 @@ evalbackcmd(union node *n, struct backcm struct jmploc *savehandler; struct localvar *savelocalvars; - setstackmark(&smark); result->fd = -1; result->buf = NULL; result->nleft = 0; result->jp = NULL; if (n == NULL) { exitstatus = 0; - goto out; + return; } + setstackmark(&smark); exitstatus = oexitstatus; if (is_valid_fast_cmdsubst(n)) { savelocalvars = localvars; @@ -698,7 +699,6 @@ evalbackcmd(union node *n, struct backcm result->fd = pip[0]; result->jp = jp; } -out: popstackmark(&smark); TRACE(("evalbackcmd done: fd=%d buf=%p nleft=%d jp=%p\n", result->fd, result->buf, result->nleft, result->jp)); @@ -1039,6 +1039,7 @@ evalcommand(union node *cmd, int flags, shellparam.reset = 1; shellparam.nparam = argc - 1; shellparam.p = argv + 1; + shellparam.optp = NULL; shellparam.optnext = NULL; INTOFF; savelocalvars = localvars; Modified: projects/zfsd/head/bin/sh/expand.c ============================================================================== --- projects/zfsd/head/bin/sh/expand.c Sat Nov 1 22:36:40 2014 (r273953) +++ projects/zfsd/head/bin/sh/expand.c Sun Nov 2 00:05:52 2014 (r273954) @@ -328,24 +328,19 @@ exptilde(char *p, int flag) done: *p = '\0'; if (*(startp+1) == '\0') { - if ((home = lookupvar("HOME")) == NULL) - goto lose; + home = lookupvar("HOME"); } else { - if ((pw = getpwnam(startp+1)) == NULL) - goto lose; - home = pw->pw_dir; + pw = getpwnam(startp+1); + home = pw != NULL ? pw->pw_dir : NULL; } - if (*home == '\0') - goto lose; *p = c; + if (home == NULL || *home == '\0') + return (startp); if (quotes) STPUTS_QUOTES(home, SQSYNTAX, expdest); else STPUTS(home, expdest); return (p); -lose: - *p = c; - return (startp); } @@ -867,7 +862,7 @@ varisset(const char *name, int nulok) static void strtodest(const char *p, int flag, int subtype, int quoted) { - if (flag & (EXP_FULL | EXP_CASE) && subtype != VSLENGTH) + if (flag & (EXP_FULL | EXP_CASE | EXP_REDIR) && subtype != VSLENGTH) STPUTS_QUOTES(p, quoted ? DQSYNTAX : BASESYNTAX, expdest); else STPUTS(p, expdest); @@ -883,30 +878,28 @@ varvalue(const char *name, int quoted, i int num; char *p; int i; - char sep; + char sep[2]; char **ap; switch (*name) { case '$': num = rootpid; - goto numvar; + break; case '?': num = oexitstatus; - goto numvar; + break; case '#': num = shellparam.nparam; - goto numvar; + break; case '!': num = backgndpidval(); -numvar: - expdest = cvtnum(num, expdest); break; case '-': for (i = 0 ; i < NOPTS ; i++) { if (optlist[i].val) STPUTC(optlist[i].letter, expdest); } - break; + return; case '@': if (flag & EXP_FULL && quoted) { for (ap = shellparam.p ; (p = *ap++) != NULL ; ) { @@ -914,22 +907,25 @@ numvar: if (*ap) STPUTC('\0', expdest); } - break; + return; } /* FALLTHROUGH */ case '*': if (ifsset()) - sep = ifsval()[0]; + sep[0] = ifsval()[0]; else - sep = ' '; + sep[0] = ' '; + sep[1] = '\0'; for (ap = shellparam.p ; (p = *ap++) != NULL ; ) { strtodest(p, flag, subtype, quoted); if (!*ap) break; - if (sep || (flag & EXP_FULL && !quoted && **ap != '\0')) - STPUTC(sep, expdest); + if (sep[0]) + strtodest(sep, flag, subtype, quoted); + else if (flag & EXP_FULL && !quoted && **ap != '\0') + STPUTC('\0', expdest); } - break; + return; default: if (is_digit(*name)) { num = atoi(name); @@ -938,11 +934,12 @@ numvar: else if (num > 0 && num <= shellparam.nparam) p = shellparam.p[num - 1]; else - break; + return; strtodest(p, flag, subtype, quoted); } - break; + return; } + expdest = cvtnum(num, expdest); } @@ -1110,24 +1107,23 @@ expandmeta(struct strlist *str, int flag /* TODO - EXP_REDIR */ while (str) { - if (fflag) - goto nometa; - p = str->text; - for (;;) { /* fast check for meta chars */ - if ((c = *p++) == '\0') - goto nometa; - if (c == '*' || c == '?' || c == '[') - break; - } savelastp = exparg.lastp; - INTOFF; - expmeta(expdir, str->text); - INTON; + if (!fflag) { + p = str->text; + for (; (c = *p) != '\0'; p++) { + /* fast check for meta chars */ + if (c == '*' || c == '?' || c == '[') { + INTOFF; *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Sun Nov 2 21:36:43 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9BBDD2CC; Sun, 2 Nov 2014 21:36:43 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 85AA5911; Sun, 2 Nov 2014 21:36:43 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sA2LahoA049944; Sun, 2 Nov 2014 21:36:43 GMT (envelope-from brd@FreeBSD.org) Received: (from brd@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sA2LafWl049929; Sun, 2 Nov 2014 21:36:41 GMT (envelope-from brd@FreeBSD.org) Message-Id: <201411022136.sA2LafWl049929@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: brd set sender to brd@FreeBSD.org using -f From: Brad Davis Date: Sun, 2 Nov 2014 21:36:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r273990 - in projects/zfsd/head/tests/sys/cddl/zfs: include tests/cli_root/zfs_destroy tests/cli_root/zfs_set tests/cli_user/zfs_list tests/zfsd X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Nov 2014 21:36:43 -0000 Author: brd (doc committer) Date: Sun Nov 2 21:36:40 2014 New Revision: 273990 URL: https://svnweb.freebsd.org/changeset/base/273990 Log: Sync Alan Somers (asomers) work from SpectraBSD. tests/sys/cddl/zfs/include/logapi.kshlib Eliminate the unfortunate miscombination of functionality that is log_mustnot_expect. It verified that the supplied command failed and also printed the supplied message to stderr. It was only used in one test, and wasn't really necessary. tests/sys/cddl/zfs/tests/cli_root/zfs_destroy/zfs_destroy_007_neg.ksh Convert log_mustnot_expect to log_mustnot. Verifying the error message isn't necessary. MFSpectraBSD: 1088174 on 2014/09/02 tests/sys/cddl/zfs/tests/cli_root/zfs_destroy/zfs_destroy_001_pos.ksh Don't lookup the mountpoint of a zvol's snapshot, because it can't be done. Instead, use the mountpoint that was stored in a variable when the zvol was formatted and mounted. MFSpectraBSD: 1088197 on 2014/09/02 tests/sys/cddl/zfs/include/Makefile tests/sys/cddl/zfs/include/logapi.kshlib tests/sys/cddl/zfs/include/stf.kshlib tests/sys/cddl/zfs/include/stf.shlib Delete stf.kshlib. Nothing uses its contents MFSpectraBSD: 1088202 on 2014/09/02 tests/sys/cddl/zfs/tests/cli_user/zfs_list/zfs_list_003_pos.ksh Fix test when TMPDIR != /tmp. We must cd to /tmp regardless of TMPDIR so relative pathnames will be correct. MFSpectraBSD: 1088360 on 2014/09/03 tests/sys/cddl/zfs/tests/cli_root/zfs_set/zfs_set_common.kshlib Don't generate 0-length user property values. MFSpectraBSD: 1088368 on 2014/09/03 tests/sys/cddl/zfs/tests/zfsd/Makefile tests/sys/cddl/zfs/tests/zfsd/zfsd_hotspare_007_pos.ksh tests/sys/cddl/zfs/tests/zfsd/zfsd_test.sh Add a regression test for the as-yet-unresolved P3_28731: ZFSD will not replace a vdev that dissappears while power is off. MFSpectraBSD: 1091329 on 2014/09/17 Differential Revision: D1018 Reviewed by: asomers Added: projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_hotspare_007_pos.ksh Deleted: projects/zfsd/head/tests/sys/cddl/zfs/include/stf.kshlib Modified: projects/zfsd/head/tests/sys/cddl/zfs/include/Makefile projects/zfsd/head/tests/sys/cddl/zfs/include/logapi.kshlib projects/zfsd/head/tests/sys/cddl/zfs/include/stf.shlib projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_destroy/zfs_destroy_001_pos.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_destroy/zfs_destroy_007_neg.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_set/zfs_set_common.kshlib projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zfs_list/zfs_list_003_pos.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_test.sh Modified: projects/zfsd/head/tests/sys/cddl/zfs/include/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/include/Makefile Sun Nov 2 21:34:24 2014 (r273989) +++ projects/zfsd/head/tests/sys/cddl/zfs/include/Makefile Sun Nov 2 21:36:40 2014 (r273990) @@ -11,7 +11,6 @@ FILES+= libsas.kshlib FILES+= logapi.kshlib FILES+= libtest.kshlib FILES+= stf.shlib -FILES+= stf.kshlib FILES+= commands.cfg commands.cfg: translatecommands.awk commands.txt Modified: projects/zfsd/head/tests/sys/cddl/zfs/include/logapi.kshlib ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/include/logapi.kshlib Sun Nov 2 21:34:24 2014 (r273989) +++ projects/zfsd/head/tests/sys/cddl/zfs/include/logapi.kshlib Sun Nov 2 21:36:40 2014 (r273990) @@ -31,7 +31,7 @@ # other ksh scripts and not executed directly. # -. ${STF_SUITE}/include/stf.kshlib +. ${STF_SUITE}/include/stf.shlib # Output an assertion # @@ -51,18 +51,6 @@ function log_note _printline NOTE: "$@" } -# Execute and print command with status where success equals non-zero result -# -# $@ - command to execute -# -# return 0 if command fails, otherwise return 1 - -function log_neg -{ - log_neg_expect "" "$@" - return $? -} - # Execute a positive test and exit $STF_FAIL is test fails # # $@ - command to execute @@ -83,34 +71,24 @@ function log_mustnot (( $? != 0 )) && log_fail } -# Execute a negative test with keyword expected, and exit -# $STF_FAIL if test passes -# -# $1 - keyword expected -# $2-$@ - command to execute - -function log_mustnot_expect -{ - log_neg_expect "$@" - (( $? != 0 )) && log_fail -} - # Execute and print command with status where success equals non-zero result # or output includes expected keyword # -# $1 - keyword expected # $2-$@ - command to execute # +# Summary: execute $@. Return 1 if any of the following hold: +# 1) The command exited 0, 127, 138, or 139 +# 2) The command's stderr included "internal error" or +# "assertion failed" +# # return 0 if command fails, or the output contains the keyword expected, # return 1 otherwise -function log_neg_expect +function log_neg { typeset out="" typeset logfile="$TMPDIR/log.$$" typeset ret=1 - typeset expect=$1 - shift while [[ -e $logfile ]]; do logfile="$logfile.$$" @@ -144,14 +122,6 @@ function log_neg_expect print -u2 $($out) _printerror "$@" "internal error or assertion failure" \ " exited $status" - elif [[ -n $expect ]] ; then - $out | /usr/bin/grep -i "$expect" > /dev/null 2>&1 - if (( $? == 0 )); then - ret=0 - else - print -u2 $($out) - _printerror "$@" "unexpectedly exited $status" - fi else ret=0 fi @@ -169,6 +139,10 @@ function log_neg_expect # # $@ command to execute # +# Summary: run $@. return 1 if its exit status was nonzero or if it printed +# "internal error" or "assertion failed" to stderr. +# print stderr on failure or if LOGAPI_DEBUG is set. +# # return command exit status function log_pos @@ -323,6 +297,10 @@ function log_other # Perform cleanup and exit # +# Summary: Runs any cleanup routine registered with log_onexit. Prints a +# message and exits $1. Note: the _recursive_output does +# nothing, because the rest of this api guarantees that the +# logfile will not exist. # $1 - stf exit code # $2-$n - message text Modified: projects/zfsd/head/tests/sys/cddl/zfs/include/stf.shlib ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/include/stf.shlib Sun Nov 2 21:34:24 2014 (r273989) +++ projects/zfsd/head/tests/sys/cddl/zfs/include/stf.shlib Sun Nov 2 21:36:40 2014 (r273990) @@ -26,14 +26,6 @@ # ident "@(#)stf.shlib 1.2 07/04/12 SMI" # -# -# This file is for bourne shell functionality only. -# Any ksh functionality must go into stf.kshlib. -# stf.kshlib includes this file, so any code here must -# work for ksh also or the sharable code must be moved -# to a different (new) common file -# - STF_PASS=0 STF_FAIL=1 STF_UNRESOLVED=2 Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_destroy/zfs_destroy_001_pos.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_destroy/zfs_destroy_001_pos.ksh Sun Nov 2 21:34:24 2014 (r273989) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_destroy/zfs_destroy_001_pos.ksh Sun Nov 2 21:36:40 2014 (r273990) @@ -120,7 +120,7 @@ function test_n_check make_dir_unbusy $TESTDIR1 fi ;; - $FSSNAP|$VOLSNAP) + $FSSNAP) if [[ $opt == *f* ]]; then mpt_dir=$(snapshot_mountpoint $dtst) init_dir=$PWD @@ -130,6 +130,16 @@ function test_n_check make_dir_unbusy $mpt_dir fi ;; + $VOLSNAP) + if [[ $opt == *f* ]]; then + mpt_dir=$TESTDIR1 + init_dir=$PWD + make_dir_busy $mpt_dir + log_must $ZFS destroy -rR $dtst + log_must $ZFS snapshot $dtst + make_dir_unbusy $mpt_dir + fi + ;; *) log_fail "Unsupported dataset: '$dtst'." esac Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_destroy/zfs_destroy_007_neg.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_destroy/zfs_destroy_007_neg.ksh Sun Nov 2 21:34:24 2014 (r273989) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_destroy/zfs_destroy_007_neg.ksh Sun Nov 2 21:36:40 2014 (r273990) @@ -75,13 +75,10 @@ fssnap=$fs@snap clone=$fs/clone clonesnap=$fs/clone@snap -# Define key word for expected failure. -KEY_WORDS="filesystem has children" - log_must $ZFS snapshot $fssnap log_must $ZFS clone $fssnap $clone log_must $ZFS promote $clone -log_mustnot_expect "$KEY_WORDS" $ZFS destroy $fs -log_mustnot_expect "$KEY_WORDS" $ZFS destroy $clone +log_mustnot $ZFS destroy $fs +log_mustnot $ZFS destroy $clone log_pass "Destroy dataset which is namespace-parent of origin passed." Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_set/zfs_set_common.kshlib ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_set/zfs_set_common.kshlib Sun Nov 2 21:34:24 2014 (r273989) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_set/zfs_set_common.kshlib Sun Nov 2 21:36:40 2014 (r273990) @@ -218,6 +218,7 @@ function invalid_user_property function user_property_value { typeset -i len=${1:-100} + ((len < 1 )) && len=1 typeset value=$(random_string ALL_CHAR $len) Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zfs_list/zfs_list_003_pos.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zfs_list/zfs_list_003_pos.ksh Sun Nov 2 21:34:24 2014 (r273989) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zfs_list/zfs_list_003_pos.ksh Sun Nov 2 21:36:40 2014 (r273990) @@ -72,13 +72,14 @@ for fs in $DATASETS ; do children="$children $TESTPOOL/$TESTFS/$fs" done -cd $TMPDIR +cd /tmp for path in $TESTPOOL/$TESTFS $TESTDIR ./../$TESTDIR ; do $ZFS list -rH -o name $path > $tmpfile for fs in $children ; do - $GREP "^${fs}$" $tmpfile > /dev/null 2>&1 + $GREP -q "^${fs}$" $tmpfile if (( $? != 0 )); then + cat $tmpfile log_fail "$fs not shown in the output list." fi done Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/Makefile Sun Nov 2 21:34:24 2014 (r273989) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/Makefile Sun Nov 2 21:36:40 2014 (r273990) @@ -7,27 +7,28 @@ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= zfsd_test -FILES+= zfsd_hotspare_006_pos.ksh -FILES+= zfsd_hotspare_002_pos.ksh -FILES+= zfsd_fault_001_pos.ksh -FILES+= zfsd_autoreplace_001_neg.ksh +FILES+= cleanup.ksh FILES+= hotspare_cleanup.ksh FILES+= hotspare_setup.ksh -FILES+= zfsd_degrade_002_pos.ksh -FILES+= zfsd_hotspare_003_pos.ksh -FILES+= zfsd_import_001_pos.ksh -FILES+= zfsd_replace_001_pos.ksh +FILES+= setup.ksh +FILES+= zfsd.cfg FILES+= zfsd.kshlib -FILES+= zfsd_hotspare_005_pos.ksh +FILES+= zfsd_autoreplace_001_neg.ksh +FILES+= zfsd_autoreplace_002_pos.ksh FILES+= zfsd_autoreplace_003_pos.ksh +FILES+= zfsd_degrade_001_pos.ksh +FILES+= zfsd_degrade_002_pos.ksh +FILES+= zfsd_fault_001_pos.ksh FILES+= zfsd_hotspare_001_pos.ksh -FILES+= zfsd.cfg -FILES+= zfsd_replace_003_pos.ksh +FILES+= zfsd_hotspare_002_pos.ksh +FILES+= zfsd_hotspare_003_pos.ksh FILES+= zfsd_hotspare_004_pos.ksh -FILES+= zfsd_autoreplace_002_pos.ksh -FILES+= cleanup.ksh +FILES+= zfsd_hotspare_005_pos.ksh +FILES+= zfsd_hotspare_006_pos.ksh +FILES+= zfsd_hotspare_007_pos.ksh +FILES+= zfsd_import_001_pos.ksh +FILES+= zfsd_replace_001_pos.ksh FILES+= zfsd_replace_002_pos.ksh -FILES+= setup.ksh -FILES+= zfsd_degrade_001_pos.ksh +FILES+= zfsd_replace_003_pos.ksh .include Added: projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_hotspare_007_pos.ksh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_hotspare_007_pos.ksh Sun Nov 2 21:36:40 2014 (r273990) @@ -0,0 +1,159 @@ +#!/usr/local/bin/ksh93 -p +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright 2012 Spectra Logic. All rights reserved. +# Use is subject to license terms. +# +# ident "@(#)hotspare_replace_006_pos.ksh 1.0 12/08/10 SL" +# +. $STF_SUITE/tests/hotspare/hotspare.kshlib +. $STF_SUITE/include/libsas.kshlib + +################################################################################ +# +# __stc_assertion_start +# +# ID: zfs_hotspare_007_pos +# +# DESCRIPTION: +# If a vdev gets removed from a pool with a spare while zfsd is shut +# down, then the spare will be activated when zfsd restarts +# +# +# STRATEGY: +# 1. Create 1 storage pools with hot spares. Use disks instead of files +# because they can be removed. +# 2. Turn off zfsd +# 3. Remove one vdev by turning off its SAS phy. +# 4. Restart zfsd +# 5. Verify that the spare is in use. +# +# TESTABILITY: explicit +# +# TEST_AUTOMATION_LEVEL: automated +# +# CODING STATUS: COMPLETED (2014-09-17) +# +# __stc_assertion_end +# +############################################################################### + +verify_runnable "global" +verify_disk_count "$DISKS" 5 + +function cleanup +{ + poolexists $TESTPOOL && \ + destroy_pool $TESTPOOL + + # See if the phy has been disabled, and try to re-enable it if possible. + if [ ! -z "$REMOVAL_DISK" ]; then + camcontrol inquiry $REMOVAL_DISK > /dev/null + if [ $? != 0 ]; then + if [ ! -z "$EXPANDER" ] && [ ! -z "$PHY" ]; then + enable_sas_disk $EXPANDER $PHY + fi + fi + fi + + [[ -e $TESTDIR ]] && log_must $RM -rf $TESTDIR/* + + partition_cleanup +} + + +log_assert "zfsd will spare missing drives on startup" + +log_onexit cleanup + + +function verify_assertion # spare_dev +{ + typeset sdev=$1 + find_verify_sas_disk $REMOVAL_DISK + stop_zfsd + + log_note "Disabling \"$REMOVAL_DISK\" on expander $EXPANDER phy $PHY" + disable_sas_disk $EXPANDER $PHY + + #Check to make sure the disk is gone + camcontrol inquiry $REMOVAL_DISK > /dev/null 2>&1 + if [ $? = 0 ]; then + log_fail "Disk \"$REMOVAL_DISK\" was not removed" + fi + + # Check to make sure ZFS sees the disk as removed + for ((timeout=0; $timeout<20; timeout=$timeout+1)); do + check_state $TESTPOOL "$REMOVAL_DISK" "REMOVED" + is_removed=$? + if [[ $is_removed == 0 ]]; then + break + fi + $SLEEP 3 + done + log_must check_state $TESTPOOL "$REMOVAL_DISK" "REMOVED" + + restart_zfsd + + # Check that the spare was activated + for ((timeout=0; $timeout<20; timeout=$timeout+1)); do + check_state $TESTPOOL "$sdev" "INUSE" + spare_inuse=$? + if [[ $spare_inuse == 0 ]]; then + break + fi + $SLEEP 3 + done + log_must $ZPOOL status $TESTPOOL + log_must check_state $TESTPOOL "$sdev" "INUSE" + + # Reenable the missing disk + log_note "Reenabling phy on expander $EXPANDER phy $PHY" + enable_sas_disk $EXPANDER $PHY + + # Check that the disk has returned + for ((timeout=0; $timeout<20; timeout=$timeout+1)); do + find_disk_by_phy $EXPANDER $PHY + if [[ -n "$FOUNDDISK" ]]; then + break + fi + $SLEEP 3 + done + + if [[ -z "$FOUNDDISK" ]]; then + log_fail "Disk $REMOVAL_DISK never reappeared" + fi +} + + +typeset REMOVAL_DISK=$DISK0 +typeset SDEV=$DISK4 +typeset POOLDEVS="$DISK0 $DISK1 $DISK2 $DISK3" +set -A MY_KEYWORDS "mirror" "raidz1" "raidz2" +for keyword in "${MY_KEYWORDS[@]}" ; do + log_must create_pool $TESTPOOL $keyword $POOLDEVS spare $SDEV + log_must poolexists "$TESTPOOL" + iterate_over_hotspares verify_assertion $SDEV + + destroy_pool "$TESTPOOL" +done Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_test.sh Sun Nov 2 21:34:24 2014 (r273989) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_test.sh Sun Nov 2 21:36:40 2014 (r273990) @@ -315,6 +315,40 @@ zfsd_hotspare_006_pos_cleanup() ksh93 $(atf_get_srcdir)/hotspare_cleanup.ksh || atf_fail "Cleanup failed" } +atf_test_case zfsd_hotspare_007_pos cleanup +zfsd_hotspare_007_pos_head() +{ + atf_set "descr" "zfsd will swap failed drives at startup" + atf_set "require.config" rt_long + atf_set "require.config" at_least_5_disks + atf_set "require.progs" zpool camcontrol zfsd + atf_set "timeout" 3600 +} +zfsd_hotspare_007_pos_body() +{ + atf_expect_fail "P3_28731: ZFSD will not replace a vdev that dissappears while power is off" + export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") + . $(atf_get_srcdir)/../../include/default.cfg + . $(atf_get_srcdir)/../hotspare/hotspare.kshlib + . $(atf_get_srcdir)/../hotspare/hotspare.cfg + + ksh93 $(atf_get_srcdir)/hotspare_setup.ksh || atf_fail "Setup failed" + ksh93 $(atf_get_srcdir)/zfsd_hotspare_007_pos.ksh + if [[ $? != 0 ]]; then + save_artifacts + atf_fail "Testcase failed" + fi +} +zfsd_hotspare_007_pos_cleanup() +{ + export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") + . $(atf_get_srcdir)/../../include/default.cfg + . $(atf_get_srcdir)/../hotspare/hotspare.kshlib + . $(atf_get_srcdir)/../hotspare/hotspare.cfg + + ksh93 $(atf_get_srcdir)/hotspare_cleanup.ksh || atf_fail "Cleanup failed" +} + atf_test_case zfsd_autoreplace_001_neg cleanup zfsd_autoreplace_001_neg_head() { @@ -553,6 +587,7 @@ atf_init_test_cases() atf_add_test_case zfsd_hotspare_004_pos atf_add_test_case zfsd_hotspare_005_pos atf_add_test_case zfsd_hotspare_006_pos + atf_add_test_case zfsd_hotspare_007_pos atf_add_test_case zfsd_autoreplace_001_neg atf_add_test_case zfsd_autoreplace_002_pos atf_add_test_case zfsd_autoreplace_003_pos From owner-svn-src-projects@FreeBSD.ORG Sun Nov 2 22:42:20 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D011F2F9; Sun, 2 Nov 2014 22:42:20 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B13A8EAB; Sun, 2 Nov 2014 22:42:20 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sA2MgK2E082305; Sun, 2 Nov 2014 22:42:20 GMT (envelope-from brd@FreeBSD.org) Received: (from brd@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sA2MgK8k082302; Sun, 2 Nov 2014 22:42:20 GMT (envelope-from brd@FreeBSD.org) Message-Id: <201411022242.sA2MgK8k082302@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: brd set sender to brd@FreeBSD.org using -f From: Brad Davis Date: Sun, 2 Nov 2014 22:42:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r273994 - in projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root: zfs_destroy zfs_unmount zpool_expand X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Nov 2014 22:42:21 -0000 Author: brd (doc committer) Date: Sun Nov 2 22:42:19 2014 New Revision: 273994 URL: https://svnweb.freebsd.org/changeset/base/273994 Log: - Mark the tests that cause a panic as a failure Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_destroy/zfs_destroy_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_unmount/zfs_unmount_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_expand/zpool_expand_test.sh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_destroy/zfs_destroy_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_destroy/zfs_destroy_test.sh Sun Nov 2 22:41:55 2014 (r273993) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_destroy/zfs_destroy_test.sh Sun Nov 2 22:42:19 2014 (r273994) @@ -146,6 +146,7 @@ zfs_destroy_005_neg_head() } zfs_destroy_005_neg_body() { + atf_fail "This test causes a panic on FreeBSD" export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zfs_destroy_common.kshlib Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_unmount/zfs_unmount_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_unmount/zfs_unmount_test.sh Sun Nov 2 22:41:55 2014 (r273993) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_unmount/zfs_unmount_test.sh Sun Nov 2 22:42:19 2014 (r273994) @@ -248,6 +248,7 @@ zfs_unmount_009_pos_head() } zfs_unmount_009_pos_body() { + atf_fail "This test causes a panic on FreeBSD" export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zfs_unmount.kshlib Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_expand/zpool_expand_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_expand/zpool_expand_test.sh Sun Nov 2 22:41:55 2014 (r273993) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_expand/zpool_expand_test.sh Sun Nov 2 22:42:19 2014 (r273994) @@ -32,6 +32,7 @@ zpool_expand_001_pos_head() } zpool_expand_001_pos_body() { + atf_fail "This test causes a panic on FreeBSD" atf_expect_fail 'BUG26166 cannot create pools on zvols' export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg @@ -58,6 +59,7 @@ zpool_expand_002_pos_head() } zpool_expand_002_pos_body() { + atf_fail "This test causes a panic on FreeBSD" atf_expect_fail 'BUG26166 cannot create pools on zvols' export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg @@ -84,6 +86,7 @@ zpool_expand_003_neg_head() } zpool_expand_003_neg_body() { + atf_fail "This test causes a panic on FreeBSD" atf_expect_fail 'BUG26166 cannot create pools on zvols' export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg From owner-svn-src-projects@FreeBSD.ORG Mon Nov 3 23:47:01 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5708F92D; Mon, 3 Nov 2014 23:47:01 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 43EC6D49; Mon, 3 Nov 2014 23:47:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sA3Nl1sE099275; Mon, 3 Nov 2014 23:47:01 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sA3Nl1U7099273; Mon, 3 Nov 2014 23:47:01 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201411032347.sA3Nl1U7099273@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 3 Nov 2014 23:47:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274069 - projects/release-vmimage/release X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Nov 2014 23:47:01 -0000 Author: gjb Date: Mon Nov 3 23:47:00 2014 New Revision: 274069 URL: https://svnweb.freebsd.org/changeset/base/274069 Log: Add line continuation so OPENSTACKCONF is actually included in the env(1). Sponsored by: The FreeBSD Foundation Modified: projects/release-vmimage/release/Makefile.vm Modified: projects/release-vmimage/release/Makefile.vm ============================================================================== --- projects/release-vmimage/release/Makefile.vm Mon Nov 3 23:43:41 2014 (r274068) +++ projects/release-vmimage/release/Makefile.vm Mon Nov 3 23:47:00 2014 (r274069) @@ -71,7 +71,7 @@ vm-azure: vm-openstack: .if exists(${.CURDIR}/${TARGET}/mk-openstack.sh) env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ - OPENSTACKCONF=${OPENSTACKCONF} + OPENSTACKCONF=${OPENSTACKCONF} \ OPENSTACK_FORMAT=${OPENSTACK_FORMAT} \ ${.CURDIR}/${TARGET}/mk-openstack.sh ${.TARGET} openstack.img \ ${WORLDDIR} ${.TARGET} ${VMSIZE} ${OPENSTACKIMAGE} From owner-svn-src-projects@FreeBSD.ORG Mon Nov 3 23:59:54 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 64903AF6; Mon, 3 Nov 2014 23:59:54 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 514E9E39; Mon, 3 Nov 2014 23:59:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sA3NxsBB004313; Mon, 3 Nov 2014 23:59:54 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sA3NxsS6004312; Mon, 3 Nov 2014 23:59:54 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201411032359.sA3NxsS6004312@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 3 Nov 2014 23:59:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274070 - projects/release-vmimage/release X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Nov 2014 23:59:54 -0000 Author: gjb Date: Mon Nov 3 23:59:53 2014 New Revision: 274070 URL: https://svnweb.freebsd.org/changeset/base/274070 Log: Add a 'vm-cloudware' target, used to drive all targets in CLOUDTARGETS. Sponsored by: The FreeBSD Foundation Modified: projects/release-vmimage/release/Makefile.vm Modified: projects/release-vmimage/release/Makefile.vm ============================================================================== --- projects/release-vmimage/release/Makefile.vm Mon Nov 3 23:47:00 2014 (r274069) +++ projects/release-vmimage/release/Makefile.vm Mon Nov 3 23:59:53 2014 (r274070) @@ -59,6 +59,8 @@ vm-image: vm-base .endif touch ${.TARGET} +vm-cloudware: ${CLOUDTARGETS} + vm-azure: .if exists(${.CURDIR}/${TARGET}/mk-azure.sh) env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} AZURECONF=${AZURECONF} \ From owner-svn-src-projects@FreeBSD.ORG Tue Nov 4 00:02:25 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3700BC8F; Tue, 4 Nov 2014 00:02:25 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0A61DEEC; Tue, 4 Nov 2014 00:02:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sA402Of0008603; Tue, 4 Nov 2014 00:02:24 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sA402OHd008599; Tue, 4 Nov 2014 00:02:24 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201411040002.sA402OHd008599@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Tue, 4 Nov 2014 00:02:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274071 - projects/release-vmimage/release X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Nov 2014 00:02:25 -0000 Author: gjb Date: Tue Nov 4 00:02:23 2014 New Revision: 274071 URL: https://svnweb.freebsd.org/changeset/base/274071 Log: Add examples for WITH_CLOUDWARE to release.conf.sample. Add WITH_CLOUDWARE evaluation to RELEASE_RMAKEFLAGS. Sponsored by: The FreeBSD Foundation Modified: projects/release-vmimage/release/release.conf.sample projects/release-vmimage/release/release.sh Modified: projects/release-vmimage/release/release.conf.sample ============================================================================== --- projects/release-vmimage/release/release.conf.sample Mon Nov 3 23:59:53 2014 (r274070) +++ projects/release-vmimage/release/release.conf.sample Tue Nov 4 00:02:23 2014 (r274071) @@ -98,3 +98,11 @@ PORTBRANCH="ports/head@rHEAD" ## image formats to create. Valid values are listed in the mkimg(1) ## manual page, as well as 'mkimg --formats' output. #VMFORMATS="vhdf vmdk qcow2 raw" + +## Set to a non-empty value to build virtual machine images for various +## cloud providers as part of the release build. +#WITH_CLOUDWARE= + +## If WITH_CLOUDWARE is set to a non-empty value, this is a list of providers +## to create disk images. +#CLOUDWARE="AZURE OPENSTACK" Modified: projects/release-vmimage/release/release.sh ============================================================================== --- projects/release-vmimage/release/release.sh Mon Nov 3 23:59:53 2014 (r274070) +++ projects/release-vmimage/release/release.sh Tue Nov 4 00:02:23 2014 (r274071) @@ -94,6 +94,10 @@ WITH_COMPRESSED_IMAGES= WITH_VMIMAGES= WITH_COMPRESSED_VMIMAGES= +# Set to non-empty value to build virtual machine images for various +# cloud providers as part of the release. +WITH_CLOUDWARE= + usage() { echo "Usage: $0 [-c release.conf]" exit 1 @@ -174,7 +178,8 @@ CHROOT_DMAKEFLAGS="${CONF_FILES}" RELEASE_WMAKEFLAGS="${MAKE_FLAGS} ${WORLD_FLAGS} ${ARCH_FLAGS} ${CONF_FILES}" RELEASE_KMAKEFLAGS="${MAKE_FLAGS} ${KERNEL_FLAGS} KERNCONF=\"${KERNEL}\" ${ARCH_FLAGS} ${CONF_FILES}" RELEASE_RMAKEFLAGS="${ARCH_FLAGS} KERNCONF=\"${KERNEL}\" ${CONF_FILES} \ - ${DOCPORTS} WITH_DVD=${WITH_DVD} WITH_VMIMAGES=${WITH_VMIMAGES}" + ${DOCPORTS} WITH_DVD=${WITH_DVD} WITH_VMIMAGES=${WITH_VMIMAGES} \ + WITH_CLOUDWARE=${WITH_CLOUDWARE}" # Force src checkout if configured FORCE_SRC_KEY= From owner-svn-src-projects@FreeBSD.ORG Tue Nov 4 15:40:01 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 150D06BF; Tue, 4 Nov 2014 15:40:01 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id F3109324; Tue, 4 Nov 2014 15:40:00 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sA4Fe0CD046425; Tue, 4 Nov 2014 15:40:00 GMT (envelope-from melifaro@FreeBSD.org) Received: (from melifaro@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sA4Fdva7046350; Tue, 4 Nov 2014 15:39:57 GMT (envelope-from melifaro@FreeBSD.org) Message-Id: <201411041539.sA4Fdva7046350@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: melifaro set sender to melifaro@FreeBSD.org using -f From: "Alexander V. Chernikov" Date: Tue, 4 Nov 2014 15:39:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274089 - in projects/routing/sys: contrib/ipfilter/netinet dev/cxgbe/tom net netgraph netinet netinet6 netipsec netpfil/ipfw netpfil/pf X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Nov 2014 15:40:01 -0000 Author: melifaro Date: Tue Nov 4 15:39:56 2014 New Revision: 274089 URL: https://svnweb.freebsd.org/changeset/base/274089 Log: Convert netinet6/ to use new routing API. * Remove &ifpp from ip6_output() in favor of ri->ri_nh_info * Provide different wrappers to in6_selectsrc: Currently it is used by 2 differenct type of customers: - socket-based one, which all are unsure about provided address scope and - in-kernel ones (ND code mostly), which don't have any sockets, options, crededentials, etc. So, we provide two different wrappers to in6_selectsrc() returning select source. * Make different versions of selectroute(): Currenly selectroute() is used in two scenarios: - SAS, via in6_selecsrc() -> in6_selectif() -> selectroute() - output, via in6_output -> wrapper -> selectroute() Provide different versions for each customer: - fib6_lookup_nh_basic()-based in6_selectif() which is capable of returning interface only, without MTU/NHOP/L2 calculations - full-blown fib6_selectroute() with cached route/multipath/ MTU/L2 * Stop using routing table for link-local address lookups * Add in6_ifawithifp_lla() to make for-us check faster for link-local * Add in6_splitscope / in6_setllascope for faster embed/deembed scopes Modified: projects/routing/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c projects/routing/sys/dev/cxgbe/tom/t4_listen.c projects/routing/sys/net/rt_nhops.c projects/routing/sys/net/rt_nhops.h projects/routing/sys/netgraph/ng_ipfw.c projects/routing/sys/netinet/ip_carp.c projects/routing/sys/netinet/ip_divert.c projects/routing/sys/netinet/ip_output.c projects/routing/sys/netinet/sctp_os_bsd.h projects/routing/sys/netinet/tcp_offload.c projects/routing/sys/netinet/tcp_output.c projects/routing/sys/netinet/tcp_subr.c projects/routing/sys/netinet/tcp_syncache.c projects/routing/sys/netinet/tcp_timewait.c projects/routing/sys/netinet6/icmp6.c projects/routing/sys/netinet6/in6.c projects/routing/sys/netinet6/in6.h projects/routing/sys/netinet6/in6_gif.c projects/routing/sys/netinet6/in6_pcb.c projects/routing/sys/netinet6/in6_src.c projects/routing/sys/netinet6/ip6_mroute.c projects/routing/sys/netinet6/ip6_output.c projects/routing/sys/netinet6/ip6_var.h projects/routing/sys/netinet6/mld6.c projects/routing/sys/netinet6/nd6_nbr.c projects/routing/sys/netinet6/raw_ip6.c projects/routing/sys/netinet6/scope6.c projects/routing/sys/netinet6/scope6_var.h projects/routing/sys/netinet6/udp6_usrreq.c projects/routing/sys/netipsec/ipsec_output.c projects/routing/sys/netpfil/ipfw/ip_dn_io.c projects/routing/sys/netpfil/ipfw/ip_fw2.c projects/routing/sys/netpfil/ipfw/ip_fw_dynamic.c projects/routing/sys/netpfil/pf/pf.c Modified: projects/routing/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c ============================================================================== --- projects/routing/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Tue Nov 4 11:29:49 2014 (r274088) +++ projects/routing/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Tue Nov 4 15:39:56 2014 (r274089) @@ -750,7 +750,7 @@ ipf_fastroute(m0, mpp, fin, fdp) * currently "to " and "to :ip#" are not supported * for IPv6 */ - return ip6_output(m, NULL, NULL, 0, NULL, NULL, NULL); + return ip6_output(m, NULL, NULL, 0, NULL, NULL); } #endif Modified: projects/routing/sys/dev/cxgbe/tom/t4_listen.c ============================================================================== --- projects/routing/sys/dev/cxgbe/tom/t4_listen.c Tue Nov 4 11:29:49 2014 (r274088) +++ projects/routing/sys/dev/cxgbe/tom/t4_listen.c Tue Nov 4 15:39:56 2014 (r274089) @@ -1140,7 +1140,7 @@ get_l2te_for_nexthop(struct port_info *p } /* TODO: Multipath */ - if (fib6_lookup_nh_ext(inc->inc_fibnum, inc->inc6_faddr, + if (fib6_lookup_nh_ext(inc->inc_fibnum, &inc->inc6_faddr, 0, 0, 0, &nhu.u.nh6) != 0) return (NULL); ((struct sockaddr_in6 *)dst)->sin6_addr = nhu.u.nh6.nh_addr; Modified: projects/routing/sys/net/rt_nhops.c ============================================================================== --- projects/routing/sys/net/rt_nhops.c Tue Nov 4 11:29:49 2014 (r274088) +++ projects/routing/sys/net/rt_nhops.c Tue Nov 4 15:39:56 2014 (r274089) @@ -66,6 +66,10 @@ #include #include #include +#include +#include + +#include #include #include @@ -117,11 +121,20 @@ static void fib4_rte_to_nh_extended(stru static void fib4_rte_to_nh_basic(struct rtentry *rte, struct in_addr dst, struct nhop4_basic *pnh4); #endif -#ifdef INET -static void fib6_rte_to_nh_extended(struct rtentry *rte, struct in6_addr dst, +#ifdef INET6 +static void fib6_rte_to_nh_extended(struct rtentry *rte, struct in6_addr *dst, struct nhop6_extended *pnh6); -static void fib6_rte_to_nh_basic(struct rtentry *rte, struct in6_addr dst, +static void fib6_rte_to_nh_basic(struct rtentry *rte, struct in6_addr *dst, struct nhop6_basic *pnh6); +static int fib6_storelladdr(struct ifnet *ifp, struct in6_addr *dst, + int mm_flags, u_char *desten); +static uint16_t fib6_get_ifa(struct rtentry *rte); +static int fib6_lla_to_nh_basic(struct in6_addr *dst, uint32_t scopeid, + struct nhop6_basic *pnh6); +static int fib6_lla_to_nh_extended(struct in6_addr *dst, uint32_t scopeid, + struct nhop6_extended *pnh6); +static int fib6_lla_to_nh(struct in6_addr *dst, uint32_t scopeid, + struct nhop_prepend *nh, struct ifnet **lifp); #endif MALLOC_DEFINE(M_RTFIB, "rtfib", "routing fwd"); @@ -292,8 +305,11 @@ fib4_lookup_prepend(uint32_t fibnum, str * Currently all we have is rte ifp. * Simply use it. */ - lifp = rte->rt_ifp; + /* Save interface address ifp */ + lifp = rte->rt_ifa->ifa_ifp; + nh->aifp_idx = lifp->if_index; /* Save both logical and transmit interface indexes */ + lifp = rte->rt_ifp; nh->lifp_idx = lifp->if_index; nh->i.ifp_idx = nh->lifp_idx; @@ -407,6 +423,7 @@ fib4_rte_to_nh_basic(struct rtentry *rte gw = (struct sockaddr_in *)rt_key(rte); if (gw->sin_addr.s_addr == 0) pnh4->nh_flags |= NHF_DEFAULT; + /* XXX: Set RTF_BROADCAST if GW address is broadcast */ } static void @@ -428,6 +445,7 @@ fib4_rte_to_nh_extended(struct rtentry * gw = (struct sockaddr_in *)rt_key(rte); if (gw->sin_addr.s_addr == 0) pnh4->nh_flags |= NHF_DEFAULT; + /* XXX: Set RTF_BROADCAST if GW address is broadcast */ ia = ifatoia(rte->rt_ifa); pnh4->nh_src = IA_SIN(ia)->sin_addr; @@ -561,19 +579,335 @@ fib6_choose_prepend(uint32_t fibnum, str */ } +/* + * Temporary function to copy ethernet address from valid lle + */ +static int +fib6_storelladdr(struct ifnet *ifp, struct in6_addr *dst, int mm_flags, + u_char *desten) +{ + struct llentry *ln; + struct sockaddr_in6 dst_sa; + + if (mm_flags & M_MCAST) { + ETHER_MAP_IPV6_MULTICAST(&dst, desten); + return (0); + } + + memset(&dst_sa, 0, sizeof(dst_sa)); + dst_sa.sin6_family = AF_INET6; + dst_sa.sin6_len = sizeof(dst_sa); + dst_sa.sin6_addr = *dst; + dst_sa.sin6_scope_id = ifp->if_index; + + + /* + * the entry should have been created in nd6_store_lladdr + */ + IF_AFDATA_RLOCK(ifp); + ln = lla_lookup(LLTABLE6(ifp), 0, (struct sockaddr *)&dst_sa); + + /* + * Perform fast path for the following cases: + * 1) lle state is REACHABLE + * 2) lle state is DELAY (NS message sentNS message sent) + * + * Every other case involves lle modification, so we handle + * them separately. + */ + if (ln == NULL || (ln->ln_state != ND6_LLINFO_REACHABLE && + ln->ln_state != ND6_LLINFO_DELAY)) { + if (ln != NULL) + LLE_RUNLOCK(ln); + IF_AFDATA_RUNLOCK(ifp); + return (1); + } + bcopy(&ln->ll_addr, desten, ifp->if_addrlen); + LLE_RUNLOCK(ln); + IF_AFDATA_RUNLOCK(ifp); + + return (0); +} + +int +fib6_lookup_prepend(uint32_t fibnum, struct in6_addr *dst, uint32_t scopeid, + struct mbuf *m, struct nhop_prepend *nh, struct nhop6_extended *nh_ext) +{ + struct radix_node_head *rnh; + struct radix_node *rn; + struct sockaddr_in6 sin6, *gw_sa; + struct in6_addr gw6; + struct rtentry *rte; + struct ifnet *lifp; + struct ether_header *eh; + uint32_t flags; + int error; + + if (IN6_IS_SCOPE_LINKLOCAL(dst)) { + /* Do not lookup link-local addresses in rtable */ + error = fib6_lla_to_nh(dst, scopeid, nh, &lifp); + if (error != 0) + return (error); + /* */ + gw6 = *dst; + goto do_l2; + } + + + KASSERT((fibnum < rt_numfibs), ("fib6_lookup_prepend: bad fibnum")); + rnh = rt_tables_get_rnh(fibnum, AF_INET6); + if (rnh == NULL) + return (ENOENT); + + /* Prepare lookup key */ + memset(&sin6, 0, sizeof(sin6)); + sin6.sin6_len = sizeof(struct sockaddr_in6); + sin6.sin6_addr = *dst; + sin6.sin6_scope_id = scopeid; + sa6_embedscope(&sin6, 0); + + + RADIX_NODE_HEAD_RLOCK(rnh); + rn = rnh->rnh_matchaddr((void *)&sin6, rnh); + rte = RNTORT(rn); + if (rn == NULL || ((rn->rn_flags & RNF_ROOT) != 0) || + RT_LINK_IS_UP(rte->rt_ifp) == 0) { + RADIX_NODE_HEAD_RUNLOCK(rnh); + return (EHOSTUNREACH); + } + + /* Explicitly zero nexthop */ + memset(nh, 0, sizeof(*nh)); + flags = 0; + nh->nh_mtu = min(rte->rt_mtu, IN6_LINKMTU(rte->rt_ifp)); + if (rte->rt_flags & RTF_GATEWAY) { + gw_sa = (struct sockaddr_in6 *)rte->rt_gateway; + gw6 = gw_sa->sin6_addr; + in6_clearscope(&gw6); + } else + gw6 = *dst; + /* Set flags */ + flags = fib_rte_to_nh_flags(rte->rt_flags); + gw_sa = (struct sockaddr_in6 *)rt_key(rte); + if (IN6_IS_ADDR_UNSPECIFIED(&gw_sa->sin6_addr)) + flags |= NHF_DEFAULT; + + /* + * TODO: nh L2/L3 resolve. + * Currently all we have is rte ifp. + * Simply use it. + */ + /* Save interface address ifp */ + nh->aifp_idx = fib6_get_ifa(rte); + /* Save both logical and transmit interface indexes */ + lifp = rte->rt_ifp; + nh->lifp_idx = lifp->if_index; + nh->i.ifp_idx = nh->lifp_idx; + + RADIX_NODE_HEAD_RUNLOCK(rnh); + + nh->nh_flags = flags; +do_l2: + /* + * Try to lookup L2 info. + * Do this using separate LLE locks. + * TODO: move this under radix lock. + */ + if (lifp->if_type == IFT_ETHER) { + eh = (struct ether_header *)nh->d.data; + + /* + * Fill in ethernet header. + * It should be already presented if we're + * sending data via known gateway. + */ + error = fib6_storelladdr(lifp, &gw6, m ? m->m_flags : 0, + eh->ether_dhost); + if (error == 0) { + memcpy(&eh->ether_shost, IF_LLADDR(lifp), ETHER_ADDR_LEN); + eh->ether_type = htons(ETHERTYPE_IPV6); + nh->nh_count = ETHER_HDR_LEN; + return (0); + } + } + + /* Notify caller that no L2 info is linked */ + nh->nh_count = 0; + nh->nh_flags |= NHF_L2_INCOMPLETE; + /* ..And save gateway address */ + nh->d.gw6 = gw6; + return (0); +} + +int +fib6_sendmbuf(struct ifnet *ifp, struct ifnet *origifp, struct mbuf *m, + struct nhop_prepend *nh) +{ + int error; + + if (nh != NULL && (nh->nh_flags & NHF_L2_INCOMPLETE) == 0) { + + /* + * Fast path case. Most packets should + * be sent from here. + * TODO: Make special ifnet + * 'if_output_frame' handler for that. + */ + struct route_compat rc; + struct ether_header *eh; + rc.ro_flags = AF_INET6 << 8 | RT_NHOP; + rc.ro_nh = nh; + + M_PREPEND(m, nh->nh_count, M_NOWAIT); + if (m == NULL) + return (ENOBUFS); + eh = mtod(m, struct ether_header *); + memcpy(eh, nh->d.data, nh->nh_count); + error = (*ifp->if_output)(ifp, m, + NULL, (struct route *)&rc); + } else { + /* We need to perform ND lookup */ + struct sockaddr_in6 gw_out; + + memset(&gw_out, 0, sizeof(gw_out)); + gw_out.sin6_family = AF_INET6; + gw_out.sin6_len = sizeof(gw_out); + gw_out.sin6_addr = nh->d.gw6; + gw_out.sin6_scope_id = ifp->if_index; + sa6_embedscope(&gw_out, 0); + + error = nd6_output(ifp, origifp, m, &gw_out, NULL); + } + + return (error); +} + +static uint16_t +fib6_get_ifa(struct rtentry *rte) +{ + struct ifnet *ifp; + struct sockaddr_dl *sdl; + + ifp = rte->rt_ifp; + if ((ifp->if_flags & IFF_LOOPBACK) && + rte->rt_gateway->sa_family == AF_LINK) { + sdl = (struct sockaddr_dl *)rte->rt_gateway; + return (sdl->sdl_index); + } + + return (ifp->if_index); +#if 0 + /* IPv6 case */ + /* Alternative way to get interface address ifp */ + /* + * Adjust the "outgoing" interface. If we're going to loop + * the packet back to ourselves, the ifp would be the loopback + * interface. However, we'd rather know the interface associated + * to the destination address (which should probably be one of + * our own addresses.) + */ + if (rt) { + if ((rt->rt_ifp->if_flags & IFF_LOOPBACK) && + (rt->rt_gateway->sa_family == AF_LINK)) + *retifp = + ifnet_byindex(((struct sockaddr_dl *) + rt->rt_gateway)->sdl_index); + } + /* IPv4 case */ + //pnh6->nh_ifp = rte->rt_ifa->ifa_ifp; +#endif +} + +static int +fib6_lla_to_nh_basic(struct in6_addr *dst, uint32_t scopeid, + struct nhop6_basic *pnh6) +{ + struct ifnet *ifp; + + ifp = ifnet_byindex_locked(scopeid); + if (ifp == NULL) + return (ENOENT); + + /* Do explicit nexthop zero unless we're copying it */ + memset(pnh6, 0, sizeof(*pnh6)); + + pnh6->nh_ifp = ifp; + pnh6->nh_mtu = IN6_LINKMTU(ifp); + /* No flags set */ + pnh6->nh_addr = *dst; + + return (0); +} + +static int +fib6_lla_to_nh_extended(struct in6_addr *dst, uint32_t scopeid, + struct nhop6_extended *pnh6) +{ + struct ifnet *ifp; + + ifp = ifnet_byindex_locked(scopeid); + if (ifp == NULL) + return (ENOENT); + + /* Do explicit nexthop zero unless we're copying it */ + memset(pnh6, 0, sizeof(*pnh6)); + + pnh6->nh_ifp = ifp; + pnh6->nh_mtu = IN6_LINKMTU(ifp); + /* No flags set */ + pnh6->nh_addr = *dst; + + return (0); +} + +static int +fib6_lla_to_nh(struct in6_addr *dst, uint32_t scopeid, + struct nhop_prepend *nh, struct ifnet **lifp) +{ + struct ifnet *ifp; + + ifp = ifnet_byindex_locked(scopeid); + if (ifp == NULL) + return (ENOENT); + + /* Do explicit nexthop zero unless we're copying it */ + memset(nh, 0, sizeof(*nh)); + /* No flags set */ + nh->nh_mtu = IN6_LINKMTU(ifp); + + /* Save lifp */ + *lifp = ifp; + + nh->aifp_idx = scopeid; + nh->lifp_idx = scopeid; + /* Check id this is for-us address */ + if (in6_ifawithifp_lla(ifp, dst)) { + if ((ifp = V_loif) != NULL) + nh->lifp_idx = ifp->if_index; + } + + return (0); +} + + static void -fib6_rte_to_nh_basic(struct rtentry *rte, struct in6_addr dst, +fib6_rte_to_nh_basic(struct rtentry *rte, struct in6_addr *dst, struct nhop6_basic *pnh6) { struct sockaddr_in6 *gw; - pnh6->nh_ifp = rte->rt_ifa->ifa_ifp; - pnh6->nh_mtu = min(rte->rt_mtu, rte->rt_ifp->if_mtu); + /* Do explicit nexthop zero unless we're copying it */ + memset(pnh6, 0, sizeof(*pnh6)); + + pnh6->nh_ifp = ifnet_byindex(fib6_get_ifa(rte)); + + pnh6->nh_mtu = min(rte->rt_mtu, IN6_LINKMTU(rte->rt_ifp)); if (rte->rt_flags & RTF_GATEWAY) { gw = (struct sockaddr_in6 *)rte->rt_gateway; pnh6->nh_addr = gw->sin6_addr; + in6_clearscope(&pnh6->nh_addr); } else - pnh6->nh_addr = dst; + pnh6->nh_addr = *dst; /* Set flags */ pnh6->nh_flags = fib_rte_to_nh_flags(rte->rt_flags); gw = (struct sockaddr_in6 *)rt_key(rte); @@ -582,19 +916,23 @@ fib6_rte_to_nh_basic(struct rtentry *rte } static void -fib6_rte_to_nh_extended(struct rtentry *rte, struct in6_addr dst, +fib6_rte_to_nh_extended(struct rtentry *rte, struct in6_addr *dst, struct nhop6_extended *pnh6) { struct sockaddr_in6 *gw; struct in6_ifaddr *ia; - pnh6->nh_ifp = rte->rt_ifa->ifa_ifp; - pnh6->nh_mtu = min(rte->rt_mtu, rte->rt_ifp->if_mtu); + /* Do explicit nexthop zero unless we're copying it */ + memset(pnh6, 0, sizeof(*pnh6)); + + pnh6->nh_ifp = ifnet_byindex(fib6_get_ifa(rte)); + pnh6->nh_mtu = min(rte->rt_mtu, IN6_LINKMTU(rte->rt_ifp)); if (rte->rt_flags & RTF_GATEWAY) { gw = (struct sockaddr_in6 *)rte->rt_gateway; pnh6->nh_addr = gw->sin6_addr; + in6_clearscope(&pnh6->nh_addr); } else - pnh6->nh_addr = dst; + pnh6->nh_addr = *dst; /* Set flags */ pnh6->nh_flags = fib_rte_to_nh_flags(rte->rt_flags); gw = (struct sockaddr_in6 *)rt_key(rte); @@ -602,18 +940,22 @@ fib6_rte_to_nh_extended(struct rtentry * pnh6->nh_flags |= NHF_DEFAULT; ia = ifatoia6(rte->rt_ifa); - pnh6->nh_src = IA6_SIN6(ia)->sin6_addr; } int -fib6_lookup_nh_basic(uint32_t fibnum, struct in6_addr dst, uint32_t flowid, - struct nhop6_basic *pnh6) +fib6_lookup_nh_basic(uint32_t fibnum, struct in6_addr *dst, uint32_t scopeid, + uint32_t flowid, struct nhop6_basic *pnh6) { struct radix_node_head *rnh; struct radix_node *rn; struct sockaddr_in6 sin6; struct rtentry *rte; + if (IN6_IS_SCOPE_LINKLOCAL(dst)) { + /* Do not lookup link-local addresses in rtable */ + return (fib6_lla_to_nh_basic(dst, scopeid, pnh6)); + } + KASSERT((fibnum < rt_numfibs), ("fib6_lookup_nh_basic: bad fibnum")); rnh = rt_tables_get_rnh(fibnum, AF_INET6); if (rnh == NULL) @@ -621,7 +963,9 @@ fib6_lookup_nh_basic(uint32_t fibnum, st /* Prepare lookup key */ memset(&sin6, 0, sizeof(sin6)); - sin6.sin6_addr = dst; + sin6.sin6_addr = *dst; + sin6.sin6_scope_id = scopeid; + sa6_embedscope(&sin6, 0); RADIX_NODE_HEAD_RLOCK(rnh); rn = rnh->rnh_matchaddr((void *)&sin6, rnh); @@ -649,7 +993,7 @@ fib6_lookup_nh_basic(uint32_t fibnum, st * - mtu from logical transmit interface will be returned. */ int -fib6_lookup_nh_ext(uint32_t fibnum, struct in6_addr dst, uint32_t scopeid, +fib6_lookup_nh_ext(uint32_t fibnum, struct in6_addr *dst, uint32_t scopeid, uint32_t flowid, uint32_t flags, struct nhop6_extended *pnh6) { struct radix_node_head *rnh; @@ -657,6 +1001,12 @@ fib6_lookup_nh_ext(uint32_t fibnum, stru struct sockaddr_in6 sin6; struct rtentry *rte; + if (IN6_IS_SCOPE_LINKLOCAL(dst)) { + /* Do not lookup link-local addresses in rtable */ + /* XXX: Do lwref on egress ifp */ + return (fib6_lla_to_nh_extended(dst, scopeid, pnh6)); + } + KASSERT((fibnum < rt_numfibs), ("fib4_lookup_nh_ext: bad fibnum")); rnh = rt_tables_get_rnh(fibnum, AF_INET6); if (rnh == NULL) @@ -665,7 +1015,9 @@ fib6_lookup_nh_ext(uint32_t fibnum, stru /* Prepare lookup key */ memset(&sin6, 0, sizeof(sin6)); sin6.sin6_len = sizeof(struct sockaddr_in6); - sin6.sin6_addr = dst; + sin6.sin6_addr = *dst; + sin6.sin6_scope_id = scopeid; + sa6_embedscope(&sin6, 0); RADIX_NODE_HEAD_RLOCK(rnh); rn = rnh->rnh_matchaddr((void *)&sin6, rnh); Modified: projects/routing/sys/net/rt_nhops.h ============================================================================== --- projects/routing/sys/net/rt_nhops.h Tue Nov 4 11:29:49 2014 (r274088) +++ projects/routing/sys/net/rt_nhops.h Tue Nov 4 15:39:56 2014 (r274089) @@ -74,7 +74,8 @@ struct nhop_prepend { uint16_t ifp_idx; /* Transmit interface index */ uint16_t nhop_idx; /* L2 multipath nhop index */ } i; - uint16_t spare1[3]; + uint16_t aifp_idx; /* Interface address index */ + uint16_t spare1[2]; union { char data[MAX_PREPEND_LEN]; /* data to prepend */ #ifdef INET @@ -102,6 +103,7 @@ struct nhop_prepend { #define NH_LIFP(nh) ifnet_byindex_locked((nh)->lifp_idx) #define NH_TIFP(nh) ifnet_byindex_locked((nh)->i.ifp_idx) +#define NH_AIFP(nh) ifnet_byindex_locked((nh)->aifp_idx) /* L2/L3 recursive nexthop */ struct nhop_multi { @@ -173,7 +175,6 @@ struct nhop6_extended { uint16_t nh_flags; /* nhop flags */ uint8_t spare[4]; struct in6_addr nh_addr; /* GW/DST IPv6 address */ - struct in6_addr nh_src; /* default source IPv6 address */ uint64_t spare2[2]; }; @@ -186,9 +187,10 @@ struct nhopu_extended { struct route_info { struct nhop_prepend *ri_nh; /* Desired nexthop to use */ - struct nhop64_basic *ri_nh_info; /* Get selected route info */ - uint16_t ri_mtu; - uint16_t spare[3]; + struct nhopu_basic *ri_nh_info; /* Get selected route info */ + uint16_t ri_mtu; /* Get selected route MTU */ + uint16_t spare; + uint32_t scopeid; /* Desired scope id to use */ }; struct route_compat { @@ -206,9 +208,9 @@ void fib4_free_nh_ext(uint32_t fibnum, s #define NHOP_LOOKUP_REF 0x01 -int fib6_lookup_nh_basic(uint32_t fibnum, struct in6_addr dst, uint32_t flowid, - struct nhop6_basic *pnh6); -int fib6_lookup_nh_ext(uint32_t fibnum, struct in6_addr dst, +int fib6_lookup_nh_basic(uint32_t fibnum, struct in6_addr *dst, + uint32_t scopeid, uint32_t flowid, struct nhop6_basic *pnh6); +int fib6_lookup_nh_ext(uint32_t fibnum, struct in6_addr *dst, uint32_t scopeid, uint32_t flowid, uint32_t flags, struct nhop6_extended *pnh6); void fib6_free_nh_ext(uint32_t fibnum, struct nhop6_extended *pnh6); @@ -228,6 +230,11 @@ int fib4_sendmbuf(struct ifnet *ifp, str void fib6_free_nh_prepend(uint32_t fibnum, struct nhop_prepend *nh); void fib6_choose_prepend(uint32_t fibnum, struct nhop_prepend *nh_src, uint32_t flowid, struct nhop_prepend *nh, struct nhop6_extended *nh_ext); +int fib6_lookup_prepend(uint32_t fibnum, struct in6_addr *dst, uint32_t scopeid, + struct mbuf *m, struct nhop_prepend *nh, struct nhop6_extended *nh_ext); + +int fib6_sendmbuf(struct ifnet *ifp, struct ifnet *origifp, struct mbuf *m, + struct nhop_prepend *nh); #define FWD_INET 0 #define FWD_INET6 1 Modified: projects/routing/sys/netgraph/ng_ipfw.c ============================================================================== --- projects/routing/sys/netgraph/ng_ipfw.c Tue Nov 4 11:29:49 2014 (r274088) +++ projects/routing/sys/netgraph/ng_ipfw.c Tue Nov 4 15:39:56 2014 (r274089) @@ -271,8 +271,7 @@ ng_ipfw_rcvdata(hook_p hook, item_p item #endif #ifdef INET6 case IPV6_VERSION >> 4: - return (ip6_output(m, NULL, NULL, 0, NULL, - NULL, NULL)); + return (ip6_output(m, NULL, NULL, 0, NULL, NULL)); #endif } } Modified: projects/routing/sys/netinet/ip_carp.c ============================================================================== --- projects/routing/sys/netinet/ip_carp.c Tue Nov 4 11:29:49 2014 (r274088) +++ projects/routing/sys/netinet/ip_carp.c Tue Nov 4 15:39:56 2014 (r274089) @@ -930,7 +930,7 @@ carp_send_ad_locked(struct carp_softc *s CARPSTATS_INC(carps_opackets6); carp_send_ad_error(sc, ip6_output(m, NULL, NULL, 0, - &sc->sc_carpdev->if_carp->cif_im6o, NULL, NULL)); + &sc->sc_carpdev->if_carp->cif_im6o, NULL)); } #endif /* INET6 */ Modified: projects/routing/sys/netinet/ip_divert.c ============================================================================== --- projects/routing/sys/netinet/ip_divert.c Tue Nov 4 11:29:49 2014 (r274088) +++ projects/routing/sys/netinet/ip_divert.c Tue Nov 4 15:39:56 2014 (r274089) @@ -456,7 +456,7 @@ div_output(struct socket *so, struct mbu break; #ifdef INET6 case IPV6_VERSION >> 4: - error = ip6_output(m, NULL, NULL, 0, NULL, NULL, NULL); + error = ip6_output(m, NULL, NULL, 0, NULL, NULL); break; #endif } Modified: projects/routing/sys/netinet/ip_output.c ============================================================================== --- projects/routing/sys/netinet/ip_output.c Tue Nov 4 11:29:49 2014 (r274088) +++ projects/routing/sys/netinet/ip_output.c Tue Nov 4 15:39:56 2014 (r274089) @@ -110,9 +110,13 @@ extern struct protosw inetsw[]; * header (with len, off, ttl, proto, tos, src, dst). * The mbuf chain containing the packet will be freed. * The mbuf opt, if present, will not be freed. - * If route ro is present and has ro_rt initialized, route lookup would be - * skipped and ro->ro_rt would be used. If ro is present but ro->ro_rt is NULL, - * then result of route lookup is stored in ro->ro_rt. + * + * If @ri is present: + * - if ri->ri_nh is not null, route will be calculated using ri_nh. + * - if ri->ri_nh_info is set, nhop4_basic route info will be stored on + * successful transmit (error=0). + * - ri->ri_mtu will be set if packet fails to be transmitted due to MTU + * issues * * In the IP forwarding case, the packet will arrive with options already * inserted, so must have a NULL opt pointer. @@ -364,21 +368,12 @@ again: nh = &local_nh; ifp = NH_LIFP(nh); mtu = nh->nh_mtu; - if (nh->nh_flags & (RTF_HOST|RTF_GATEWAY)) { - /* XXX: Set RTF_BROADCAST if GW address is broadcast */ + if (nh->nh_flags & (RTF_HOST|RTF_GATEWAY)) isbroadcast = (nh->nh_flags & RTF_BROADCAST); - } else + else isbroadcast = in_broadcast(dst, ifp); } - /* - * XXX: Move somewhere to sendit - */ - if (ri != NULL) { - ri->ri_mtu = mtu; - } - - /* Catch a possible divide by zero later. */ KASSERT(mtu > 0, ("%s: mtu %d <= 0, rte=%p (rt_flags=0x%08x) ifp=%p", __func__, mtu, nh, (nh != NULL) ? nh->nh_flags : 0, ifp)); @@ -607,6 +602,20 @@ sendit: goto again; } + if (ri != NULL) { + ri->ri_mtu = mtu; + if (ri->ri_nh_info != NULL) { + struct nhop4_basic *pnh4; + + pnh4 = &ri->ri_nh_info->u.nh4; + pnh4->nh_ifp = ifp; + pnh4->nh_flags = nh ? nh->nh_flags : 0; + pnh4->nh_mtu = mtu; + /* XXX: This is not always correct. */ + pnh4->nh_addr = dst; + } + } + passout: /* 127/8 must not appear on wire - RFC1122. */ if ((ntohl(ip->ip_dst.s_addr) >> IN_CLASSA_NSHIFT) == IN_LOOPBACKNET || Modified: projects/routing/sys/netinet/sctp_os_bsd.h ============================================================================== --- projects/routing/sys/netinet/sctp_os_bsd.h Tue Nov 4 11:29:49 2014 (r274088) +++ projects/routing/sys/netinet/sctp_os_bsd.h Tue Nov 4 15:39:56 2014 (r274089) @@ -452,9 +452,9 @@ typedef struct rtentry sctp_rtentry_t; if (local_stcb && local_stcb->sctp_ep) \ result = ip6_output(o_pak, \ ((struct in6pcb *)(local_stcb->sctp_ep))->in6p_outputopts, \ - (ro), 0, 0, ifp, NULL); \ + NULL, 0, NULL, NULL); \ else \ - result = ip6_output(o_pak, NULL, (ro), 0, 0, ifp, NULL); \ + result = ip6_output(o_pak, NULL, NULL, 0, NULL, NULL); \ } struct mbuf * Modified: projects/routing/sys/netinet/tcp_offload.c ============================================================================== --- projects/routing/sys/netinet/tcp_offload.c Tue Nov 4 11:29:49 2014 (r274088) +++ projects/routing/sys/netinet/tcp_offload.c Tue Nov 4 15:39:56 2014 (r274089) @@ -48,6 +48,7 @@ __FBSDID("$FreeBSD$"); #define TCPOUTFLAGS #include #include +#include int registered_toedevs; @@ -86,11 +87,13 @@ tcp_offload_connect(struct socket *so, s goto done; } else if (af == AF_INET6) { struct sockaddr_in6 *sin6; + struct in6_addr dst; + uint32_t scopeid; sin6 = (struct sockaddr_in6 *)nam; + in6_splitscope(&sin6->sin6_addr, &dst, &scopeid); - if (fib6_lookup_nh_ext(fibnum, - sin6->sin6_addr, sin6->sin6_scope_id, + if (fib6_lookup_nh_ext(fibnum, &dst, scopeid, 0, NHOP_LOOKUP_REF, &nhu_ext.u.nh6) != 0) return (EHOSTUNREACH); Modified: projects/routing/sys/netinet/tcp_output.c ============================================================================== --- projects/routing/sys/netinet/tcp_output.c Tue Nov 4 11:29:49 2014 (r274088) +++ projects/routing/sys/netinet/tcp_output.c Tue Nov 4 15:39:56 2014 (r274089) @@ -1257,9 +1257,9 @@ send: */ #ifdef INET6 if (isipv6) { - struct route_in6 ro; + struct route_info ri; - bzero(&ro, sizeof(ro)); + bzero(&ri, sizeof(ri)); /* * we separately set hoplimit for every segment, since the * user might want to change the value via setsockopt. @@ -1281,13 +1281,12 @@ send: TCP_PROBE5(send, NULL, tp, ip6, tp, th); /* TODO: IPv6 IP6TOS_ECT bit on */ - error = ip6_output(m, tp->t_inpcb->in6p_outputopts, &ro, + error = ip6_output(m, tp->t_inpcb->in6p_outputopts, &ri, ((so->so_options & SO_DONTROUTE) ? IP_ROUTETOIF : 0), - NULL, NULL, tp->t_inpcb); + NULL, tp->t_inpcb); - if (error == EMSGSIZE && ro.ro_rt != NULL) - mtu = ro.ro_rt->rt_mtu; - RO_RTFREE(&ro); + if (error == EMSGSIZE) + mtu = ri.ri_mtu; } #endif /* INET6 */ #if defined(INET) && defined(INET6) @@ -1324,7 +1323,7 @@ send: TCP_PROBE5(send, NULL, tp, ip, tp, th); error = ip_output(m, tp->t_inpcb->inp_options, &ri, - ((so->so_options & SO_DONTROUTE) ? IP_ROUTETOIF : 0), 0, + ((so->so_options & SO_DONTROUTE) ? IP_ROUTETOIF : 0), NULL, tp->t_inpcb); if (error == EMSGSIZE) Modified: projects/routing/sys/netinet/tcp_subr.c ============================================================================== --- projects/routing/sys/netinet/tcp_subr.c Tue Nov 4 11:29:49 2014 (r274088) +++ projects/routing/sys/netinet/tcp_subr.c Tue Nov 4 15:39:56 2014 (r274089) @@ -725,7 +725,7 @@ tcp_respond(struct tcpcb *tp, void *ipge TCP_PROBE5(send, NULL, tp, mtod(m, const char *), tp, nth); #ifdef INET6 if (isipv6) - (void) ip6_output(m, NULL, NULL, ipflags, NULL, NULL, inp); + (void) ip6_output(m, NULL, NULL, ipflags, NULL, inp); #endif /* INET6 */ #if defined(INET) && defined(INET6) else Modified: projects/routing/sys/netinet/tcp_syncache.c ============================================================================== --- projects/routing/sys/netinet/tcp_syncache.c Tue Nov 4 11:29:49 2014 (r274088) +++ projects/routing/sys/netinet/tcp_syncache.c Tue Nov 4 15:39:56 2014 (r274089) @@ -1571,7 +1571,7 @@ syncache_respond(struct syncache *sc, st return (error); } #endif - error = ip6_output(m, NULL, NULL, 0, NULL, NULL, NULL); + error = ip6_output(m, NULL, NULL, 0, NULL, NULL); } #endif #if defined(INET6) && defined(INET) Modified: projects/routing/sys/netinet/tcp_timewait.c ============================================================================== --- projects/routing/sys/netinet/tcp_timewait.c Tue Nov 4 11:29:49 2014 (r274088) +++ projects/routing/sys/netinet/tcp_timewait.c Tue Nov 4 15:39:56 2014 (r274089) @@ -596,7 +596,7 @@ tcp_twrespond(struct tcptw *tw, int flag sizeof(struct tcphdr) + optlen, IPPROTO_TCP, 0); ip6->ip6_hlim = in6_selecthlim(inp, NULL); error = ip6_output(m, inp->in6p_outputopts, NULL, - (tw->tw_so_options & SO_DONTROUTE), NULL, NULL, inp); + (tw->tw_so_options & SO_DONTROUTE), NULL, inp); } #endif #if defined(INET6) && defined(INET) Modified: projects/routing/sys/netinet6/icmp6.c ============================================================================== --- projects/routing/sys/netinet6/icmp6.c Tue Nov 4 11:29:49 2014 (r274088) +++ projects/routing/sys/netinet6/icmp6.c Tue Nov 4 15:39:56 2014 (r274089) @@ -2142,7 +2142,12 @@ icmp6_reflect(struct mbuf *m, size_t off int plen; int type, code; struct ifnet *outif = NULL; - struct in6_addr origdst, src, *srcp = NULL; + struct in6_addr origdst, src, dst; + struct route_info ri; + struct nhop6_basic nh6; + uint32_t scopeid; + int e; + /* too short to reflect */ if (off < sizeof(struct ip6_hdr)) { @@ -2206,11 +2211,13 @@ icmp6_reflect(struct mbuf *m, size_t off * procedure of an outgoing packet of our own, in which case we need * to search in the ifaddr list. */ + memset(&src, 0, sizeof(src)); if (!IN6_IS_ADDR_MULTICAST(&origdst)) { if ((ia = ip6_getdstifaddr(m))) { if (!(ia->ia6_flags & (IN6_IFF_ANYCAST|IN6_IFF_NOTREADY))) - srcp = &ia->ia_addr.sin6_addr; + src = ia->ia_addr.sin6_addr; + ifa_free(&ia->ia_ifa); } else { struct sockaddr_in6 d; @@ -2223,54 +2230,53 @@ icmp6_reflect(struct mbuf *m, size_t off if (ia && !(ia->ia6_flags & (IN6_IFF_ANYCAST|IN6_IFF_NOTREADY))) { - srcp = &ia->ia_addr.sin6_addr; + src = ia->ia_addr.sin6_addr; + ifa_free(&ia->ia_ifa); } } } - if (srcp == NULL) { - int e; - struct sockaddr_in6 sin6; - struct route_in6 ro; + + ip6->ip6_src = src; + ip6->ip6_flow = 0; + ip6->ip6_vfc &= ~IPV6_VERSION_MASK; + ip6->ip6_vfc |= IPV6_VERSION; + ip6->ip6_nxt = IPPROTO_ICMPV6; + if (outif) + ip6->ip6_hlim = ND_IFINFO(outif)->chlim; + else if (m->m_pkthdr.rcvif) { + /* XXX: This may not be the outgoing interface */ + ip6->ip6_hlim = ND_IFINFO(m->m_pkthdr.rcvif)->chlim; + } else + ip6->ip6_hlim = V_ip6_defhlim; + + + /* + * Deembed scope + */ + in6_splitscope(&ip6->ip6_dst, &dst, &scopeid); + + if (IN6_IS_ADDR_UNSPECIFIED(&src)) { /* * This case matches to multicasts, our anycast, or unicasts * that we do not own. Select a source address based on the * source address of the erroneous packet. */ - bzero(&sin6, sizeof(sin6)); - sin6.sin6_family = AF_INET6; - sin6.sin6_len = sizeof(sin6); - sin6.sin6_addr = ip6->ip6_dst; /* zone ID should be embedded */ - - bzero(&ro, sizeof(ro)); - e = in6_selectsrc(&sin6, NULL, NULL, &ro, NULL, &outif, &src); - if (ro.ro_rt) - RTFREE(ro.ro_rt); /* XXX: we could use this */ + + e = in6_selectsrc_addr(M_GETFIB(m), &dst, scopeid, &src); if (e) { char ip6buf[INET6_ADDRSTRLEN]; nd6log((LOG_DEBUG, "icmp6_reflect: source can't be determined: " "dst=%s, error=%d\n", - ip6_sprintf(ip6buf, &sin6.sin6_addr), e)); + ip6_sprintf(ip6buf, &dst), e)); goto bad; } - srcp = &src; + ip6->ip6_src = src; } - ip6->ip6_src = *srcp; - ip6->ip6_flow = 0; - ip6->ip6_vfc &= ~IPV6_VERSION_MASK; - ip6->ip6_vfc |= IPV6_VERSION; - ip6->ip6_nxt = IPPROTO_ICMPV6; - if (outif) - ip6->ip6_hlim = ND_IFINFO(outif)->chlim; - else if (m->m_pkthdr.rcvif) { - /* XXX: This may not be the outgoing interface */ - ip6->ip6_hlim = ND_IFINFO(m->m_pkthdr.rcvif)->chlim; - } else - ip6->ip6_hlim = V_ip6_defhlim; - + /* finalize header */ icmp6->icmp6_cksum = 0; icmp6->icmp6_cksum = in6_cksum(m, IPPROTO_ICMPV6, sizeof(struct ip6_hdr), plen); @@ -2281,17 +2287,20 @@ icmp6_reflect(struct mbuf *m, size_t off m->m_flags &= ~(M_BCAST|M_MCAST); - ip6_output(m, NULL, NULL, 0, NULL, &outif, NULL); - if (outif) - icmp6_ifoutstat_inc(outif, type, code); + memset(&ri, 0, sizeof(ri)); + ri.ri_nh_info = (struct nhopu_basic *)&nh6; + ri.scopeid = scopeid; + + e = ip6_output(m, NULL, &ri, 0, NULL, NULL); + if (e == 0) { + /* XXX: Possible use after free */ + outif = nh6.nh_ifp; + //icmp6_ifoutstat_inc(outif, type, code); + } - if (ia != NULL) - ifa_free(&ia->ia_ifa); return; bad: - if (ia != NULL) - ifa_free(&ia->ia_ifa); m_freem(m); return; } @@ -2387,11 +2396,11 @@ icmp6_redirect_input(struct mbuf *m, int } { /* ip6->ip6_src must be equal to gw for icmp6->icmp6_reddst */ - struct nhop6_extended nh_ext; + struct nhop6_basic nh6; - if (fib6_lookup_nh_ext(RT_DEFAULT_FIB, reddst6, 0, 0, 0, &nh_ext) == 0){ + if (fib6_lookup_nh_basic(RT_DEFAULT_FIB, &reddst6, 0, 0, &nh6)==0) { /* XXX: Think about AF_LINK GW */ - if ((nh_ext.nh_flags & NHF_GATEWAY) == 0) { + if ((nh6.nh_flags & NHF_GATEWAY) == 0) { nd6log((LOG_ERR, "ICMP6 redirect rejected; no route " "with inet6 gateway found for redirect dst: %s\n", @@ -2399,12 +2408,12 @@ icmp6_redirect_input(struct mbuf *m, int goto bad; } - if (bcmp(&src6, &nh_ext.nh_addr, sizeof(struct in6_addr)) != 0){ + if (IN6_ARE_ADDR_EQUAL(&src6, &nh6.nh_addr) == 0) { nd6log((LOG_ERR, "ICMP6 redirect rejected; " "not equal to gw-for-src=%s (must be same): " "%s\n", - ip6_sprintf(ip6buf, &nh_ext.nh_addr), + ip6_sprintf(ip6buf, &nh6.nh_addr), icmp6_redirect_diag(&src6, &reddst6, &redtgt6))); goto bad; } @@ -2526,6 +2535,9 @@ icmp6_redirect_output(struct mbuf *m0, s u_char *p; struct ifnet *outif = NULL; struct sockaddr_in6 src_sa; + struct route_info ri; + struct nhop6_basic nh6; + int e; icmp6_errcount(ND_REDIRECT, 0); @@ -2784,9 +2796,14 @@ noredhdropt:; m_tag_prepend(m, mtag); } + memset(&ri, 0, sizeof(ri)); + memset(&nh6, 0, sizeof(nh6)); + ri.ri_nh_info = (struct nhopu_basic *)&nh6; + /* send the packet to outside... */ - ip6_output(m, NULL, NULL, 0, NULL, &outif, NULL); - if (outif) { + e = ip6_output(m, NULL, &ri, 0, NULL, NULL); + if (e == 0) { *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Tue Nov 4 17:01:41 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 595AF8AF; Tue, 4 Nov 2014 17:01:41 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2B6A1E05; Tue, 4 Nov 2014 17:01:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sA4H1f2v088579; Tue, 4 Nov 2014 17:01:41 GMT (envelope-from melifaro@FreeBSD.org) Received: (from melifaro@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sA4H1fNY088578; Tue, 4 Nov 2014 17:01:41 GMT (envelope-from melifaro@FreeBSD.org) Message-Id: <201411041701.sA4H1fNY088578@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: melifaro set sender to melifaro@FreeBSD.org using -f From: "Alexander V. Chernikov" Date: Tue, 4 Nov 2014 17:01:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274093 - projects/routing/sys/netinet X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Nov 2014 17:01:41 -0000 Author: melifaro Date: Tue Nov 4 17:01:40 2014 New Revision: 274093 URL: https://svnweb.freebsd.org/changeset/base/274093 Log: Convert tcp_maxmtu6() to use new routing api. Modified: projects/routing/sys/netinet/tcp_subr.c Modified: projects/routing/sys/netinet/tcp_subr.c ============================================================================== --- projects/routing/sys/netinet/tcp_subr.c Tue Nov 4 16:35:56 2014 (r274092) +++ projects/routing/sys/netinet/tcp_subr.c Tue Nov 4 17:01:40 2014 (r274093) @@ -1829,39 +1829,36 @@ tcp_maxmtu(struct in_conninfo *inc, stru u_long tcp_maxmtu6(struct in_conninfo *inc, struct tcp_ifcap *cap) { - struct route_in6 sro6; struct ifnet *ifp; + struct nhop6_extended nh_ext; + struct in6_addr dst; + uint32_t scopeid; + uint32_t fibnum; u_long maxmtu = 0; KASSERT(inc != NULL, ("tcp_maxmtu6 with NULL in_conninfo pointer")); - bzero(&sro6, sizeof(sro6)); - if (!IN6_IS_ADDR_UNSPECIFIED(&inc->inc6_faddr)) { - sro6.ro_dst.sin6_family = AF_INET6; - sro6.ro_dst.sin6_len = sizeof(struct sockaddr_in6); - sro6.ro_dst.sin6_addr = inc->inc6_faddr; - in6_rtalloc_ign(&sro6, 0, inc->inc_fibnum); - } - if (sro6.ro_rt != NULL) { - ifp = sro6.ro_rt->rt_ifp; - if (sro6.ro_rt->rt_mtu == 0) - maxmtu = IN6_LINKMTU(sro6.ro_rt->rt_ifp); - else - maxmtu = min(sro6.ro_rt->rt_mtu, - IN6_LINKMTU(sro6.ro_rt->rt_ifp)); - - /* Report additional interface capabilities. */ - if (cap != NULL) { - if (ifp->if_capenable & IFCAP_TSO6 && - ifp->if_hwassist & CSUM_TSO) { - cap->ifcap |= CSUM_TSO; - cap->tsomax = ifp->if_hw_tsomax; - cap->tsomaxsegcount = ifp->if_hw_tsomaxsegcount; - cap->tsomaxsegsize = ifp->if_hw_tsomaxsegsize; - } + in6_splitscope(&inc->inc6_faddr, &dst, &scopeid); + fibnum = inc->inc_fibnum; + + if (fib6_lookup_nh_ext(fibnum, &dst, scopeid, 0, + NHOP_LOOKUP_REF, &nh_ext) != 0) + return (0); + + maxmtu = nh_ext.nh_mtu; + ifp = nh_ext.nh_ifp; + + /* Report additional interface capabilities. */ + if (cap != NULL) { + if (ifp->if_capenable & IFCAP_TSO6 && + ifp->if_hwassist & CSUM_TSO) { + cap->ifcap |= CSUM_TSO; + cap->tsomax = ifp->if_hw_tsomax; + cap->tsomaxsegcount = ifp->if_hw_tsomaxsegcount; + cap->tsomaxsegsize = ifp->if_hw_tsomaxsegsize; } - RTFREE(sro6.ro_rt); } + fib6_free_nh_ext(fibnum, &nh_ext); return (maxmtu); } From owner-svn-src-projects@FreeBSD.ORG Tue Nov 4 17:05:26 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8CB49A94; Tue, 4 Nov 2014 17:05:26 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6EE30ECC; Tue, 4 Nov 2014 17:05:26 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sA4H5Q6G089078; Tue, 4 Nov 2014 17:05:26 GMT (envelope-from melifaro@FreeBSD.org) Received: (from melifaro@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sA4H5PhZ089073; Tue, 4 Nov 2014 17:05:25 GMT (envelope-from melifaro@FreeBSD.org) Message-Id: <201411041705.sA4H5PhZ089073@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: melifaro set sender to melifaro@FreeBSD.org using -f From: "Alexander V. Chernikov" Date: Tue, 4 Nov 2014 17:05:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274094 - in projects/routing/sys: net netinet6 X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Nov 2014 17:05:26 -0000 Author: melifaro Date: Tue Nov 4 17:05:24 2014 New Revision: 274094 URL: https://svnweb.freebsd.org/changeset/base/274094 Log: Convert in6p_lookup_mcast_ifp() to use new routing api. * Add special fib6_lookup_nh_ifp() to return rt_ifp instead of rt_ifa->ifa_ifp for that. Modified: projects/routing/sys/net/rt_nhops.c projects/routing/sys/net/rt_nhops.h projects/routing/sys/netinet6/in6_mcast.c projects/routing/sys/netinet6/scope6.c projects/routing/sys/netinet6/scope6_var.h Modified: projects/routing/sys/net/rt_nhops.c ============================================================================== --- projects/routing/sys/net/rt_nhops.c Tue Nov 4 17:01:40 2014 (r274093) +++ projects/routing/sys/net/rt_nhops.c Tue Nov 4 17:05:24 2014 (r274094) @@ -943,6 +943,48 @@ fib6_rte_to_nh_extended(struct rtentry * } int +fib6_lookup_nh_ifp(uint32_t fibnum, struct in6_addr *dst, uint32_t scopeid, + uint32_t flowid, struct nhop6_basic *pnh6) +{ + struct radix_node_head *rnh; + struct radix_node *rn; + struct sockaddr_in6 sin6; + struct rtentry *rte; + + if (IN6_IS_SCOPE_LINKLOCAL(dst)) { + /* Do not lookup link-local addresses in rtable */ + return (fib6_lla_to_nh_basic(dst, scopeid, pnh6)); + } + + KASSERT((fibnum < rt_numfibs), ("fib6_lookup_nh_basic: bad fibnum")); + rnh = rt_tables_get_rnh(fibnum, AF_INET6); + if (rnh == NULL) + return (ENOENT); + + /* Prepare lookup key */ + memset(&sin6, 0, sizeof(sin6)); + sin6.sin6_addr = *dst; + sin6.sin6_scope_id = scopeid; + sa6_embedscope(&sin6, 0); + + RADIX_NODE_HEAD_RLOCK(rnh); + rn = rnh->rnh_matchaddr((void *)&sin6, rnh); + if (rn != NULL && ((rn->rn_flags & RNF_ROOT) == 0)) { + rte = RNTORT(rn); + /* Ensure route & ifp is UP */ + if (RT_LINK_IS_UP(rte->rt_ifp)) { + fib6_rte_to_nh_basic(rte, dst, pnh6); + pnh6->nh_ifp = rte->rt_ifp; + RADIX_NODE_HEAD_RUNLOCK(rnh); + return (0); + } + } + RADIX_NODE_HEAD_RUNLOCK(rnh); + + return (ENOENT); +} + +int fib6_lookup_nh_basic(uint32_t fibnum, struct in6_addr *dst, uint32_t scopeid, uint32_t flowid, struct nhop6_basic *pnh6) { Modified: projects/routing/sys/net/rt_nhops.h ============================================================================== --- projects/routing/sys/net/rt_nhops.h Tue Nov 4 17:01:40 2014 (r274093) +++ projects/routing/sys/net/rt_nhops.h Tue Nov 4 17:05:24 2014 (r274094) @@ -208,6 +208,8 @@ void fib4_free_nh_ext(uint32_t fibnum, s #define NHOP_LOOKUP_REF 0x01 +int fib6_lookup_nh_ifp(uint32_t fibnum, struct in6_addr *dst, uint32_t scopeid, + uint32_t flowid, struct nhop6_basic *pnh6); int fib6_lookup_nh_basic(uint32_t fibnum, struct in6_addr *dst, uint32_t scopeid, uint32_t flowid, struct nhop6_basic *pnh6); int fib6_lookup_nh_ext(uint32_t fibnum, struct in6_addr *dst, Modified: projects/routing/sys/netinet6/in6_mcast.c ============================================================================== --- projects/routing/sys/netinet6/in6_mcast.c Tue Nov 4 17:01:40 2014 (r274093) +++ projects/routing/sys/netinet6/in6_mcast.c Tue Nov 4 17:05:24 2014 (r274094) @@ -69,6 +69,8 @@ __FBSDID("$FreeBSD$"); #include #include +#include + #ifndef KTR_MLD #define KTR_MLD KTR_INET6 #endif @@ -1770,26 +1772,22 @@ static struct ifnet * in6p_lookup_mcast_ifp(const struct inpcb *in6p, const struct sockaddr_in6 *gsin6) { - struct route_in6 ro6; - struct ifnet *ifp; + struct nhop6_basic nh6; + struct in6_addr dst; + uint32_t scopeid; + uint32_t fibnum; KASSERT(in6p->inp_vflag & INP_IPV6, ("%s: not INP_IPV6 inpcb", __func__)); KASSERT(gsin6->sin6_family == AF_INET6, ("%s: not AF_INET6 group", __func__)); - ifp = NULL; - memset(&ro6, 0, sizeof(struct route_in6)); - memcpy(&ro6.ro_dst, gsin6, sizeof(struct sockaddr_in6)); - rtalloc_ign_fib((struct route *)&ro6, 0, - in6p ? in6p->inp_inc.inc_fibnum : RT_DEFAULT_FIB); - if (ro6.ro_rt != NULL) { - ifp = ro6.ro_rt->rt_ifp; - KASSERT(ifp != NULL, ("%s: null ifp", __func__)); - RTFREE(ro6.ro_rt); - } + in6_splitscope(&gsin6->sin6_addr, &dst, &scopeid); + fibnum = in6p ? in6p->inp_inc.inc_fibnum : RT_DEFAULT_FIB; + if (fib6_lookup_nh_ifp(fibnum, &dst, scopeid, 0, &nh6) != 0) + return (NULL); - return (ifp); + return (nh6.nh_ifp); } /* Modified: projects/routing/sys/netinet6/scope6.c ============================================================================== --- projects/routing/sys/netinet6/scope6.c Tue Nov 4 17:01:40 2014 (r274093) +++ projects/routing/sys/netinet6/scope6.c Tue Nov 4 17:05:24 2014 (r274094) @@ -475,7 +475,8 @@ in6_getscope(struct in6_addr *in6) } void -in6_splitscope(struct in6_addr *src, struct in6_addr *dst, uint32_t *scopeid) +in6_splitscope(const struct in6_addr *src, struct in6_addr *dst, + uint32_t *scopeid) { uint32_t zoneid; Modified: projects/routing/sys/netinet6/scope6_var.h ============================================================================== --- projects/routing/sys/netinet6/scope6_var.h Tue Nov 4 17:01:40 2014 (r274093) +++ projects/routing/sys/netinet6/scope6_var.h Tue Nov 4 17:05:24 2014 (r274094) @@ -64,7 +64,7 @@ int in6_clearscope(struct in6_addr *); uint16_t in6_getscope(struct in6_addr *); uint32_t in6_getscopezone(const struct ifnet *, int); struct ifnet* in6_getlinkifnet(uint32_t); -void in6_splitscope(struct in6_addr *src, struct in6_addr *dst, +void in6_splitscope(const struct in6_addr *src, struct in6_addr *dst, uint32_t *scopeid); #endif /* _KERNEL */ From owner-svn-src-projects@FreeBSD.ORG Tue Nov 4 17:28:22 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3B28D421; Tue, 4 Nov 2014 17:28:22 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 250F41B5; Tue, 4 Nov 2014 17:28:22 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sA4HSMWf099102; Tue, 4 Nov 2014 17:28:22 GMT (envelope-from melifaro@FreeBSD.org) Received: (from melifaro@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sA4HSET4099060; Tue, 4 Nov 2014 17:28:14 GMT (envelope-from melifaro@FreeBSD.org) Message-Id: <201411041728.sA4HSET4099060@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: melifaro set sender to melifaro@FreeBSD.org using -f From: "Alexander V. Chernikov" Date: Tue, 4 Nov 2014 17:28:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274096 - in projects/routing/sys: fs/nfs net netgraph/netflow netinet netinet6 netpfil/ipfw X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Nov 2014 17:28:22 -0000 Author: melifaro Date: Tue Nov 4 17:28:13 2014 New Revision: 274096 URL: https://svnweb.freebsd.org/changeset/base/274096 Log: Hide 'struct rtentry' and all its macro inside new header: net/route_internal.h The goal is to make its opaque for all code except route/rtsock and proto domain _rmx. Added: projects/routing/sys/net/route_internal.h (contents, props changed) Modified: projects/routing/sys/fs/nfs/nfsport.h projects/routing/sys/net/if.c projects/routing/sys/net/if_disc.c projects/routing/sys/net/if_faith.c projects/routing/sys/net/if_gre.c projects/routing/sys/net/if_loop.c projects/routing/sys/net/if_stf.c projects/routing/sys/net/radix_mpath.c projects/routing/sys/net/route.c projects/routing/sys/net/route.h projects/routing/sys/net/rt_nhops.c projects/routing/sys/net/rtsock.c projects/routing/sys/netgraph/netflow/netflow.c projects/routing/sys/netinet/if_ether.c projects/routing/sys/netinet/in.c projects/routing/sys/netinet/in_gif.c projects/routing/sys/netinet/in_rmx.c projects/routing/sys/netinet/sctp_os_bsd.h projects/routing/sys/netinet6/icmp6.c projects/routing/sys/netinet6/in6.c projects/routing/sys/netinet6/in6_gif.c projects/routing/sys/netinet6/in6_ifattach.c projects/routing/sys/netinet6/in6_rmx.c projects/routing/sys/netinet6/ip6_forward.c projects/routing/sys/netinet6/ip6_input.c projects/routing/sys/netinet6/nd6.c projects/routing/sys/netinet6/nd6_nbr.c projects/routing/sys/netinet6/nd6_rtr.c projects/routing/sys/netpfil/ipfw/ip_fw_table_algo.c Modified: projects/routing/sys/fs/nfs/nfsport.h ============================================================================== --- projects/routing/sys/fs/nfs/nfsport.h Tue Nov 4 17:24:13 2014 (r274095) +++ projects/routing/sys/fs/nfs/nfsport.h Tue Nov 4 17:28:13 2014 (r274096) @@ -82,6 +82,7 @@ #include #include #include +#include #include #include #include Modified: projects/routing/sys/net/if.c ============================================================================== --- projects/routing/sys/net/if.c Tue Nov 4 17:24:13 2014 (r274095) +++ projects/routing/sys/net/if.c Tue Nov 4 17:28:13 2014 (r274096) @@ -75,6 +75,7 @@ #include #include #include +#include #include #if defined(INET) || defined(INET6) Modified: projects/routing/sys/net/if_disc.c ============================================================================== --- projects/routing/sys/net/if_disc.c Tue Nov 4 17:24:13 2014 (r274095) +++ projects/routing/sys/net/if_disc.c Tue Nov 4 17:28:13 2014 (r274096) @@ -49,6 +49,7 @@ #include #include #include +#include #include #include Modified: projects/routing/sys/net/if_faith.c ============================================================================== --- projects/routing/sys/net/if_faith.c Tue Nov 4 17:24:13 2014 (r274095) +++ projects/routing/sys/net/if_faith.c Tue Nov 4 17:28:13 2014 (r274096) @@ -61,6 +61,7 @@ #include #include #include +#include #include #include Modified: projects/routing/sys/net/if_gre.c ============================================================================== --- projects/routing/sys/net/if_gre.c Tue Nov 4 17:24:13 2014 (r274095) +++ projects/routing/sys/net/if_gre.c Tue Nov 4 17:28:13 2014 (r274096) @@ -65,6 +65,7 @@ #include #include #include +#include #include #ifdef INET Modified: projects/routing/sys/net/if_loop.c ============================================================================== --- projects/routing/sys/net/if_loop.c Tue Nov 4 17:24:13 2014 (r274095) +++ projects/routing/sys/net/if_loop.c Tue Nov 4 17:28:13 2014 (r274096) @@ -54,6 +54,7 @@ #include #include #include +#include #include #include Modified: projects/routing/sys/net/if_stf.c ============================================================================== --- projects/routing/sys/net/if_stf.c Tue Nov 4 17:24:13 2014 (r274095) +++ projects/routing/sys/net/if_stf.c Tue Nov 4 17:28:13 2014 (r274096) @@ -97,6 +97,7 @@ #include #include #include +#include #include #include #include Modified: projects/routing/sys/net/radix_mpath.c ============================================================================== --- projects/routing/sys/net/radix_mpath.c Tue Nov 4 17:24:13 2014 (r274095) +++ projects/routing/sys/net/radix_mpath.c Tue Nov 4 17:28:13 2014 (r274096) @@ -48,6 +48,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include Modified: projects/routing/sys/net/route.c ============================================================================== --- projects/routing/sys/net/route.c Tue Nov 4 17:24:13 2014 (r274095) +++ projects/routing/sys/net/route.c Tue Nov 4 17:28:13 2014 (r274096) @@ -58,6 +58,7 @@ #include #include #include +#include #include #include Modified: projects/routing/sys/net/route.h ============================================================================== --- projects/routing/sys/net/route.h Tue Nov 4 17:24:13 2014 (r274095) +++ projects/routing/sys/net/route.h Tue Nov 4 17:28:13 2014 (r274096) @@ -107,7 +107,9 @@ VNET_DECLARE(u_int, rt_add_addr_allfibs) #endif #endif -#if defined(_KERNEL) || defined(_WANT_RTENTRY) +struct rtentry; +#if !defined(_KERNEL) || defined(_WANT_RTENTRY) +/* This structure is kept for compatibility reasons only */ struct rtentry { struct radix_node rt_nodes[2]; /* tree glue, and other values */ /* @@ -126,11 +128,10 @@ struct rtentry { u_long rt_mtu; /* MTU for this path */ u_long rt_weight; /* absolute weight */ u_long rt_expire; /* lifetime for route, e.g. redirect */ -#define rt_endzero rt_pksent - counter_u64_t rt_pksent; /* packets sent using this route */ +#define rt_endzero rt_mtx struct mtx rt_mtx; /* mutex for routing entry */ }; -#endif /* _KERNEL || _WANT_RTENTRY */ +#endif /* !_KERNEL || _WANT_RTENTRY */ #define RTF_UP 0x1 /* route usable */ #define RTF_GATEWAY 0x2 /* destination is a gateway */ @@ -291,59 +292,6 @@ struct rt_addrinfo { #define RT_LINK_IS_UP(ifp) (!((ifp)->if_capabilities & IFCAP_LINKSTATE) \ || (ifp)->if_link_state == LINK_STATE_UP) -#define RT_LOCK_INIT(_rt) \ - mtx_init(&(_rt)->rt_mtx, "rtentry", NULL, MTX_DEF | MTX_DUPOK) -#define RT_LOCK(_rt) mtx_lock(&(_rt)->rt_mtx) -#define RT_UNLOCK(_rt) mtx_unlock(&(_rt)->rt_mtx) -#define RT_LOCK_DESTROY(_rt) mtx_destroy(&(_rt)->rt_mtx) -#define RT_LOCK_ASSERT(_rt) mtx_assert(&(_rt)->rt_mtx, MA_OWNED) -#define RT_UNLOCK_COND(_rt) do { \ - if (mtx_owned(&(_rt)->rt_mtx)) \ - mtx_unlock(&(_rt)->rt_mtx); \ -} while (0) - -#define RT_ADDREF(_rt) do { \ - RT_LOCK_ASSERT(_rt); \ - KASSERT((_rt)->rt_refcnt >= 0, \ - ("negative refcnt %d", (_rt)->rt_refcnt)); \ - (_rt)->rt_refcnt++; \ -} while (0) - -#define RT_REMREF(_rt) do { \ - RT_LOCK_ASSERT(_rt); \ - KASSERT((_rt)->rt_refcnt > 0, \ - ("bogus refcnt %d", (_rt)->rt_refcnt)); \ - (_rt)->rt_refcnt--; \ -} while (0) - -#define RTFREE_LOCKED(_rt) do { \ - if ((_rt)->rt_refcnt <= 1) \ - rtfree(_rt); \ - else { \ - RT_REMREF(_rt); \ - RT_UNLOCK(_rt); \ - } \ - /* guard against invalid refs */ \ - _rt = 0; \ -} while (0) - -#define RTFREE(_rt) do { \ - RT_LOCK(_rt); \ - RTFREE_LOCKED(_rt); \ -} while (0) - -#define RO_RTFREE(_ro) do { \ - if ((_ro)->ro_rt) { \ - if ((_ro)->ro_flags & RT_NORTREF) { \ - (_ro)->ro_flags &= ~RT_NORTREF; \ - (_ro)->ro_rt = NULL; \ - } else { \ - RT_LOCK((_ro)->ro_rt); \ - RTFREE_LOCKED((_ro)->ro_rt); \ - } \ - } \ -} while (0) - struct radix_node_head *rt_tables_get_rnh(int, int); struct ifmultiaddr; Added: projects/routing/sys/net/route_internal.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/routing/sys/net/route_internal.h Tue Nov 4 17:28:13 2014 (r274096) @@ -0,0 +1,113 @@ +/*- + * Copyright (c) 2014 + * Alexander V. Chernikov + * + * 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. + * 4. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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. + */ + +#ifndef _NET_ROUTE_INTERNAL_H_ +#define _NET_ROUTE_INTERNAL_H_ + +struct rtentry { + struct radix_node rt_nodes[2]; /* tree glue, and other values */ + /* + * XXX struct rtentry must begin with a struct radix_node (or two!) + * because the code does some casts of a 'struct radix_node *' + * to a 'struct rtentry *' + */ +#define rt_key(r) (*((struct sockaddr **)(&(r)->rt_nodes->rn_key))) +#define rt_mask(r) (*((struct sockaddr **)(&(r)->rt_nodes->rn_mask))) + struct sockaddr *rt_gateway; /* value */ + struct ifnet *rt_ifp; /* the answer: interface to use */ + struct ifaddr *rt_ifa; /* the answer: interface address to use */ + int rt_flags; /* up/down?, host/net */ + int rt_refcnt; /* # held references */ + u_int rt_fibnum; /* which FIB */ + u_long rt_mtu; /* MTU for this path */ + u_long rt_weight; /* absolute weight */ + u_long rt_expire; /* lifetime for route, e.g. redirect */ +#define rt_endzero rt_pksent + counter_u64_t rt_pksent; /* packets sent using this route */ + struct mtx rt_mtx; /* mutex for routing entry */ +}; + +#define RT_LOCK_INIT(_rt) \ + mtx_init(&(_rt)->rt_mtx, "rtentry", NULL, MTX_DEF | MTX_DUPOK) +#define RT_LOCK(_rt) mtx_lock(&(_rt)->rt_mtx) +#define RT_UNLOCK(_rt) mtx_unlock(&(_rt)->rt_mtx) +#define RT_LOCK_DESTROY(_rt) mtx_destroy(&(_rt)->rt_mtx) +#define RT_LOCK_ASSERT(_rt) mtx_assert(&(_rt)->rt_mtx, MA_OWNED) +#define RT_UNLOCK_COND(_rt) do { \ + if (mtx_owned(&(_rt)->rt_mtx)) \ + mtx_unlock(&(_rt)->rt_mtx); \ +} while (0) + +#define RT_ADDREF(_rt) do { \ + RT_LOCK_ASSERT(_rt); \ + KASSERT((_rt)->rt_refcnt >= 0, \ + ("negative refcnt %d", (_rt)->rt_refcnt)); \ + (_rt)->rt_refcnt++; \ +} while (0) + +#define RT_REMREF(_rt) do { \ + RT_LOCK_ASSERT(_rt); \ + KASSERT((_rt)->rt_refcnt > 0, \ + ("bogus refcnt %d", (_rt)->rt_refcnt)); \ + (_rt)->rt_refcnt--; \ +} while (0) + +#define RTFREE_LOCKED(_rt) do { \ + if ((_rt)->rt_refcnt <= 1) \ + rtfree(_rt); \ + else { \ + RT_REMREF(_rt); \ + RT_UNLOCK(_rt); \ + } \ + /* guard against invalid refs */ \ + _rt = 0; \ +} while (0) + +#define RTFREE(_rt) do { \ + RT_LOCK(_rt); \ + RTFREE_LOCKED(_rt); \ +} while (0) + +#define RO_RTFREE(_ro) do { \ + if ((_ro)->ro_rt) { \ + if ((_ro)->ro_flags & RT_NORTREF) { \ + (_ro)->ro_flags &= ~RT_NORTREF; \ + (_ro)->ro_rt = NULL; \ + } else { \ + RT_LOCK((_ro)->ro_rt); \ + RTFREE_LOCKED((_ro)->ro_rt); \ + } \ + } \ +} while (0) + + + +#endif + + Modified: projects/routing/sys/net/rt_nhops.c ============================================================================== --- projects/routing/sys/net/rt_nhops.c Tue Nov 4 17:24:13 2014 (r274095) +++ projects/routing/sys/net/rt_nhops.c Tue Nov 4 17:28:13 2014 (r274096) @@ -55,6 +55,7 @@ #include #include #include +#include #include #ifdef RADIX_MPATH Modified: projects/routing/sys/net/rtsock.c ============================================================================== --- projects/routing/sys/net/rtsock.c Tue Nov 4 17:24:13 2014 (r274095) +++ projects/routing/sys/net/rtsock.c Tue Nov 4 17:28:13 2014 (r274096) @@ -59,6 +59,7 @@ #include #include #include +#include #include #include Modified: projects/routing/sys/netgraph/netflow/netflow.c ============================================================================== --- projects/routing/sys/netgraph/netflow/netflow.c Tue Nov 4 17:24:13 2014 (r274095) +++ projects/routing/sys/netgraph/netflow/netflow.c Tue Nov 4 17:28:13 2014 (r274096) @@ -45,6 +45,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include Modified: projects/routing/sys/netinet/if_ether.c ============================================================================== --- projects/routing/sys/netinet/if_ether.c Tue Nov 4 17:24:13 2014 (r274095) +++ projects/routing/sys/netinet/if_ether.c Tue Nov 4 17:28:13 2014 (r274096) @@ -59,6 +59,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include Modified: projects/routing/sys/netinet/in.c ============================================================================== --- projects/routing/sys/netinet/in.c Tue Nov 4 17:24:13 2014 (r274095) +++ projects/routing/sys/netinet/in.c Tue Nov 4 17:28:13 2014 (r274096) @@ -56,6 +56,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include Modified: projects/routing/sys/netinet/in_gif.c ============================================================================== --- projects/routing/sys/netinet/in_gif.c Tue Nov 4 17:24:13 2014 (r274095) +++ projects/routing/sys/netinet/in_gif.c Tue Nov 4 17:28:13 2014 (r274096) @@ -50,6 +50,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include Modified: projects/routing/sys/netinet/in_rmx.c ============================================================================== --- projects/routing/sys/netinet/in_rmx.c Tue Nov 4 17:24:13 2014 (r274095) +++ projects/routing/sys/netinet/in_rmx.c Tue Nov 4 17:28:13 2014 (r274096) @@ -42,6 +42,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include Modified: projects/routing/sys/netinet/sctp_os_bsd.h ============================================================================== --- projects/routing/sys/netinet/sctp_os_bsd.h Tue Nov 4 17:24:13 2014 (r274095) +++ projects/routing/sys/netinet/sctp_os_bsd.h Tue Nov 4 17:28:13 2014 (r274096) @@ -71,6 +71,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include Modified: projects/routing/sys/netinet6/icmp6.c ============================================================================== --- projects/routing/sys/netinet6/icmp6.c Tue Nov 4 17:24:13 2014 (r274095) +++ projects/routing/sys/netinet6/icmp6.c Tue Nov 4 17:28:13 2014 (r274096) @@ -90,6 +90,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include Modified: projects/routing/sys/netinet6/in6.c ============================================================================== --- projects/routing/sys/netinet6/in6.c Tue Nov 4 17:24:13 2014 (r274095) +++ projects/routing/sys/netinet6/in6.c Tue Nov 4 17:28:13 2014 (r274096) @@ -86,6 +86,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include Modified: projects/routing/sys/netinet6/in6_gif.c ============================================================================== --- projects/routing/sys/netinet6/in6_gif.c Tue Nov 4 17:24:13 2014 (r274095) +++ projects/routing/sys/netinet6/in6_gif.c Tue Nov 4 17:28:13 2014 (r274096) @@ -51,6 +51,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include Modified: projects/routing/sys/netinet6/in6_ifattach.c ============================================================================== --- projects/routing/sys/netinet6/in6_ifattach.c Tue Nov 4 17:24:13 2014 (r274095) +++ projects/routing/sys/netinet6/in6_ifattach.c Tue Nov 4 17:28:13 2014 (r274096) @@ -48,6 +48,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include Modified: projects/routing/sys/netinet6/in6_rmx.c ============================================================================== --- projects/routing/sys/netinet6/in6_rmx.c Tue Nov 4 17:24:13 2014 (r274095) +++ projects/routing/sys/netinet6/in6_rmx.c Tue Nov 4 17:28:13 2014 (r274096) @@ -78,6 +78,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include Modified: projects/routing/sys/netinet6/ip6_forward.c ============================================================================== --- projects/routing/sys/netinet6/ip6_forward.c Tue Nov 4 17:24:13 2014 (r274095) +++ projects/routing/sys/netinet6/ip6_forward.c Tue Nov 4 17:28:13 2014 (r274096) @@ -54,6 +54,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include Modified: projects/routing/sys/netinet6/ip6_input.c ============================================================================== --- projects/routing/sys/netinet6/ip6_input.c Tue Nov 4 17:24:13 2014 (r274095) +++ projects/routing/sys/netinet6/ip6_input.c Tue Nov 4 17:28:13 2014 (r274096) @@ -89,6 +89,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include Modified: projects/routing/sys/netinet6/nd6.c ============================================================================== --- projects/routing/sys/netinet6/nd6.c Tue Nov 4 17:24:13 2014 (r274095) +++ projects/routing/sys/netinet6/nd6.c Tue Nov 4 17:28:13 2014 (r274096) @@ -61,6 +61,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include Modified: projects/routing/sys/netinet6/nd6_nbr.c ============================================================================== --- projects/routing/sys/netinet6/nd6_nbr.c Tue Nov 4 17:24:13 2014 (r274095) +++ projects/routing/sys/netinet6/nd6_nbr.c Tue Nov 4 17:28:13 2014 (r274096) @@ -57,6 +57,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #ifdef RADIX_MPATH #include #endif Modified: projects/routing/sys/netinet6/nd6_rtr.c ============================================================================== --- projects/routing/sys/netinet6/nd6_rtr.c Tue Nov 4 17:24:13 2014 (r274095) +++ projects/routing/sys/netinet6/nd6_rtr.c Tue Nov 4 17:28:13 2014 (r274096) @@ -54,6 +54,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include Modified: projects/routing/sys/netpfil/ipfw/ip_fw_table_algo.c ============================================================================== --- projects/routing/sys/netpfil/ipfw/ip_fw_table_algo.c Tue Nov 4 17:24:13 2014 (r274095) +++ projects/routing/sys/netpfil/ipfw/ip_fw_table_algo.c Tue Nov 4 17:28:13 2014 (r274096) @@ -51,6 +51,7 @@ __FBSDID("$FreeBSD$"); #include /* ip_fw.h requires IFNAMSIZ */ #include #include +#include #include #include /* struct ipfw_rule_ref */ From owner-svn-src-projects@FreeBSD.ORG Tue Nov 4 18:22:42 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7304F7B3; Tue, 4 Nov 2014 18:22:42 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 598829FB; Tue, 4 Nov 2014 18:22:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sA4IMgrE027416; Tue, 4 Nov 2014 18:22:42 GMT (envelope-from melifaro@FreeBSD.org) Received: (from melifaro@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sA4IMa7o027392; Tue, 4 Nov 2014 18:22:36 GMT (envelope-from melifaro@FreeBSD.org) Message-Id: <201411041822.sA4IMa7o027392@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: melifaro set sender to melifaro@FreeBSD.org using -f From: "Alexander V. Chernikov" Date: Tue, 4 Nov 2014 18:22:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274097 - in projects/routing: . bin/sh bin/sh/tests/builtins bin/sh/tests/expansion bin/sh/tests/parameters bin/sh/tests/parser cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Nov 2014 18:22:42 -0000 Author: melifaro Date: Tue Nov 4 18:22:33 2014 New Revision: 274097 URL: https://svnweb.freebsd.org/changeset/base/274097 Log: Sync to HEAD@r274095. Added: projects/routing/bin/sh/tests/builtins/eval7.0 - copied unchanged from r274096, head/bin/sh/tests/builtins/eval7.0 projects/routing/bin/sh/tests/builtins/eval8.7 - copied unchanged from r274096, head/bin/sh/tests/builtins/eval8.7 projects/routing/bin/sh/tests/builtins/getopts9.0 - copied unchanged from r274096, head/bin/sh/tests/builtins/getopts9.0 projects/routing/bin/sh/tests/builtins/getopts9.0.stdout - copied unchanged from r274096, head/bin/sh/tests/builtins/getopts9.0.stdout projects/routing/bin/sh/tests/expansion/redir1.0 - copied unchanged from r274096, head/bin/sh/tests/expansion/redir1.0 projects/routing/bin/sh/tests/parameters/positional6.0 - copied unchanged from r274096, head/bin/sh/tests/parameters/positional6.0 projects/routing/bin/sh/tests/parameters/positional7.0 - copied unchanged from r274096, head/bin/sh/tests/parameters/positional7.0 projects/routing/bin/sh/tests/parser/line-cont1.0 - copied unchanged from r274096, head/bin/sh/tests/parser/line-cont1.0 projects/routing/bin/sh/tests/parser/line-cont10.0 - copied unchanged from r274096, head/bin/sh/tests/parser/line-cont10.0 projects/routing/bin/sh/tests/parser/line-cont11.0 - copied unchanged from r274096, head/bin/sh/tests/parser/line-cont11.0 projects/routing/bin/sh/tests/parser/line-cont2.0 - copied unchanged from r274096, head/bin/sh/tests/parser/line-cont2.0 projects/routing/bin/sh/tests/parser/line-cont3.0 - copied unchanged from r274096, head/bin/sh/tests/parser/line-cont3.0 projects/routing/bin/sh/tests/parser/line-cont4.0 - copied unchanged from r274096, head/bin/sh/tests/parser/line-cont4.0 projects/routing/bin/sh/tests/parser/line-cont5.0 - copied unchanged from r274096, head/bin/sh/tests/parser/line-cont5.0 projects/routing/bin/sh/tests/parser/line-cont6.0 - copied unchanged from r274096, head/bin/sh/tests/parser/line-cont6.0 projects/routing/bin/sh/tests/parser/line-cont7.0 - copied unchanged from r274096, head/bin/sh/tests/parser/line-cont7.0 projects/routing/bin/sh/tests/parser/line-cont8.0 - copied unchanged from r274096, head/bin/sh/tests/parser/line-cont8.0 projects/routing/bin/sh/tests/parser/line-cont9.0 - copied unchanged from r274096, head/bin/sh/tests/parser/line-cont9.0 projects/routing/contrib/atf/atf-c++/atf-c++.3 - copied unchanged from r274096, head/contrib/atf/atf-c++/atf-c++.3 projects/routing/contrib/atf/atf-c/atf-c.3 - copied unchanged from r274096, head/contrib/atf/atf-c/atf-c.3 projects/routing/contrib/atf/atf-sh/atf-sh.3 - copied unchanged from r274096, head/contrib/atf/atf-sh/atf-sh.3 projects/routing/contrib/atf/config.h - copied unchanged from r274096, head/contrib/atf/config.h projects/routing/contrib/atf/doc/atf.7.in - copied unchanged from r274096, head/contrib/atf/doc/atf.7.in projects/routing/contrib/libxo/ - copied from r274096, head/contrib/libxo/ projects/routing/contrib/ofed/libcxgb4/ - copied from r274096, head/contrib/ofed/libcxgb4/ projects/routing/contrib/ofed/librdmacm/examples/build/ - copied from r274096, head/contrib/ofed/librdmacm/examples/build/ projects/routing/contrib/ofed/usr.lib/libcxgb4/ - copied from r274096, head/contrib/ofed/usr.lib/libcxgb4/ projects/routing/crypto/openssl/crypto/constant_time_locl.h - copied unchanged from r274096, head/crypto/openssl/crypto/constant_time_locl.h projects/routing/crypto/openssl/crypto/constant_time_test.c - copied unchanged from r274096, head/crypto/openssl/crypto/constant_time_test.c projects/routing/crypto/openssl/doc/apps/c_rehash.pod - copied unchanged from r274096, head/crypto/openssl/doc/apps/c_rehash.pod projects/routing/crypto/openssl/doc/crypto/CMS_add1_signer.pod - copied unchanged from r274096, head/crypto/openssl/doc/crypto/CMS_add1_signer.pod projects/routing/etc/rc.d/growfs - copied unchanged from r274096, head/etc/rc.d/growfs projects/routing/lib/libarchive/libarchive.pc - copied unchanged from r274096, head/lib/libarchive/libarchive.pc projects/routing/lib/libc/Makefile.amd64 - copied unchanged from r274096, head/lib/libc/Makefile.amd64 projects/routing/lib/libc/Makefile.i386 - copied unchanged from r274096, head/lib/libc/Makefile.i386 projects/routing/lib/libc/arm/aeabi/aeabi_asm_double.S - copied unchanged from r274096, head/lib/libc/arm/aeabi/aeabi_asm_double.S projects/routing/lib/libc/arm/aeabi/aeabi_asm_float.S - copied unchanged from r274096, head/lib/libc/arm/aeabi/aeabi_asm_float.S projects/routing/lib/libc/tests/ - copied from r274096, head/lib/libc/tests/ projects/routing/lib/libevent/ - copied from r274096, head/lib/libevent/ projects/routing/lib/libnetbsd/netinet/ - copied from r274096, head/lib/libnetbsd/netinet/ projects/routing/lib/libnetbsd/sys/time.h - copied unchanged from r274096, head/lib/libnetbsd/sys/time.h projects/routing/lib/libxo/ - copied from r274096, head/lib/libxo/ projects/routing/libexec/Makefile.amd64 - copied unchanged from r274096, head/libexec/Makefile.amd64 projects/routing/libexec/Makefile.i386 - copied unchanged from r274096, head/libexec/Makefile.i386 projects/routing/libexec/Makefile.pc98 - copied unchanged from r274096, head/libexec/Makefile.pc98 projects/routing/release/amd64/mk-azure.sh - copied unchanged from r274096, head/release/amd64/mk-azure.sh projects/routing/release/i386/mk-azure.sh - copied unchanged from r274096, head/release/i386/mk-azure.sh projects/routing/release/tools/azure.conf - copied unchanged from r274096, head/release/tools/azure.conf projects/routing/sbin/ifconfig/ifvxlan.c - copied unchanged from r274096, head/sbin/ifconfig/ifvxlan.c projects/routing/secure/lib/libcrypto/man/CMS_add1_signer.3 - copied unchanged from r274096, head/secure/lib/libcrypto/man/CMS_add1_signer.3 projects/routing/secure/usr.bin/openssl/man/c_rehash.1 - copied unchanged from r274096, head/secure/usr.bin/openssl/man/c_rehash.1 projects/routing/share/doc/pjdfstest/ - copied from r274096, head/share/doc/pjdfstest/ projects/routing/share/man/man4/virtio_console.4 - copied unchanged from r274096, head/share/man/man4/virtio_console.4 projects/routing/share/man/man4/vxlan.4 - copied unchanged from r274096, head/share/man/man4/vxlan.4 projects/routing/share/man/man7/growfs.7 - copied unchanged from r274096, head/share/man/man7/growfs.7 projects/routing/share/man/man8/uefi.8 - copied unchanged from r274096, head/share/man/man8/uefi.8 projects/routing/share/man/man9/casuword.9 - copied unchanged from r274096, head/share/man/man9/casuword.9 projects/routing/share/mk/netbsd-tests.test.mk - copied unchanged from r274096, head/share/mk/netbsd-tests.test.mk - copied unchanged from r274096, head/sys/amd64/vmm/amd/npt.c - copied unchanged from r274096, head/sys/amd64/vmm/amd/npt.h - copied unchanged from r274096, head/sys/amd64/vmm/amd/svm.c - copied unchanged from r274096, head/sys/amd64/vmm/amd/svm.h - copied unchanged from r274096, head/sys/amd64/vmm/amd/svm_genassym.c - copied unchanged from r274096, head/sys/amd64/vmm/amd/svm_msr.c - copied unchanged from r274096, head/sys/amd64/vmm/amd/svm_msr.h - copied unchanged from r274096, head/sys/amd64/vmm/amd/svm_softc.h - copied unchanged from r274096, head/sys/amd64/vmm/amd/svm_support.S - copied unchanged from r274096, head/sys/amd64/vmm/amd/vmcb.c - copied unchanged from r274096, head/sys/amd64/vmm/amd/vmcb.h projects/routing/sys/amd64/vmm/io/vpmtmr.c - copied unchanged from r274096, head/sys/amd64/vmm/io/vpmtmr.c projects/routing/sys/amd64/vmm/io/vpmtmr.h - copied unchanged from r274096, head/sys/amd64/vmm/io/vpmtmr.h projects/routing/sys/arm/arm/elf_note.S - copied unchanged from r274096, head/sys/arm/arm/elf_note.S projects/routing/sys/arm/conf/SOCKIT-BERI - copied unchanged from r274096, head/sys/arm/conf/SOCKIT-BERI projects/routing/sys/arm/ti/am335x/am335x_gpio.c - copied unchanged from r274096, head/sys/arm/ti/am335x/am335x_gpio.c projects/routing/sys/arm/ti/am335x/am335x_scm_padconf.h - copied unchanged from r274096, head/sys/arm/ti/am335x/am335x_scm_padconf.h projects/routing/sys/arm/ti/omap4/omap4_gpio.c - copied unchanged from r274096, head/sys/arm/ti/omap4/omap4_gpio.c projects/routing/sys/arm/ti/omap4/omap4_scm_padconf.h - copied unchanged from r274096, head/sys/arm/ti/omap4/omap4_scm_padconf.h projects/routing/sys/arm/ti/ti_gpio.h - copied unchanged from r274096, head/sys/arm/ti/ti_gpio.h projects/routing/sys/arm/ti/ti_gpio_if.m - copied unchanged from r274096, head/sys/arm/ti/ti_gpio_if.m projects/routing/sys/arm/ti/ti_wdt.c - copied unchanged from r274096, head/sys/arm/ti/ti_wdt.c projects/routing/sys/arm/ti/ti_wdt.h - copied unchanged from r274096, head/sys/arm/ti/ti_wdt.h projects/routing/sys/boot/fdt/dts/arm/socfpga-sockit-beri.dts - copied unchanged from r274096, head/sys/boot/fdt/dts/arm/socfpga-sockit-beri.dts projects/routing/sys/boot/fdt/fdt_platform.h - copied unchanged from r274096, head/sys/boot/fdt/fdt_platform.h projects/routing/sys/boot/uboot/fdt/ - copied from r274096, head/sys/boot/uboot/fdt/ projects/routing/sys/dev/beri/ - copied from r274096, head/sys/dev/beri/ projects/routing/sys/dev/iicbus/adm1030.c - copied unchanged from r274096, head/sys/dev/iicbus/adm1030.c projects/routing/sys/dev/mii/micphy.c - copied unchanged from r274096, head/sys/dev/mii/micphy.c projects/routing/sys/dev/random/build.sh - copied unchanged from r274096, head/sys/dev/random/build.sh projects/routing/sys/dev/random/fortuna.c - copied unchanged from r274096, head/sys/dev/random/fortuna.c projects/routing/sys/dev/random/fortuna.h - copied unchanged from r274096, head/sys/dev/random/fortuna.h projects/routing/sys/dev/random/uint128.h - copied unchanged from r274096, head/sys/dev/random/uint128.h projects/routing/sys/dev/random/unit_test.c - copied unchanged from r274096, head/sys/dev/random/unit_test.c projects/routing/sys/dev/random/unit_test.h - copied unchanged from r274096, head/sys/dev/random/unit_test.h projects/routing/sys/dev/virtio/console/ - copied from r274096, head/sys/dev/virtio/console/ projects/routing/sys/dev/xen/evtchn/ - copied from r274096, head/sys/dev/xen/evtchn/ projects/routing/sys/dev/xen/privcmd/ - copied from r274096, head/sys/dev/xen/privcmd/ projects/routing/sys/modules/if_vxlan/ - copied from r274096, head/sys/modules/if_vxlan/ projects/routing/sys/modules/padlock_rng/ - copied from r274096, head/sys/modules/padlock_rng/ projects/routing/sys/modules/rdrand_rng/ - copied from r274096, head/sys/modules/rdrand_rng/ projects/routing/sys/modules/virtio/console/ - copied from r274096, head/sys/modules/virtio/console/ projects/routing/sys/net/if_vxlan.c - copied, changed from r274096, head/sys/net/if_vxlan.c projects/routing/sys/net/if_vxlan.h - copied unchanged from r274096, head/sys/net/if_vxlan.h projects/routing/sys/x86/include/vmware.h - copied unchanged from r274096, head/sys/x86/include/vmware.h projects/routing/sys/xen/error.h - copied unchanged from r274096, head/sys/xen/error.h projects/routing/sys/xen/privcmd.h - copied unchanged from r274096, head/sys/xen/privcmd.h projects/routing/tests/sys/pjdfstest/ - copied from r274096, head/tests/sys/pjdfstest/ projects/routing/usr.bin/timeout/tests/ - copied from r274096, head/usr.bin/timeout/tests/ projects/routing/usr.bin/xo/ - copied from r274096, head/usr.bin/xo/ projects/routing/usr.sbin/ctld/chap.c - copied unchanged from r274096, head/usr.sbin/ctld/chap.c projects/routing/usr.sbin/ctld/isns.c - copied unchanged from r274096, head/usr.sbin/ctld/isns.c projects/routing/usr.sbin/ctld/isns.h - copied unchanged from r274096, head/usr.sbin/ctld/isns.h projects/routing/usr.sbin/iscsid/chap.c - copied unchanged from r274096, head/usr.sbin/iscsid/chap.c Directory Properties: projects/routing/sys/amd64/vmm/amd/npt.c (props changed) projects/routing/sys/amd64/vmm/amd/npt.h (props changed) projects/routing/sys/amd64/vmm/amd/svm.c (props changed) projects/routing/sys/amd64/vmm/amd/svm.h (props changed) projects/routing/sys/amd64/vmm/amd/svm_genassym.c (props changed) projects/routing/sys/amd64/vmm/amd/svm_msr.c (props changed) projects/routing/sys/amd64/vmm/amd/svm_msr.h (props changed) projects/routing/sys/amd64/vmm/amd/svm_softc.h (props changed) projects/routing/sys/amd64/vmm/amd/svm_support.S (props changed) projects/routing/sys/amd64/vmm/amd/vmcb.c (props changed) projects/routing/sys/amd64/vmm/amd/vmcb.h (props changed) Deleted: projects/routing/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/main.c projects/routing/contrib/atf/atf-c++/config.cpp projects/routing/contrib/atf/atf-c++/config.hpp projects/routing/contrib/atf/atf-c++/config_test.cpp projects/routing/contrib/atf/atf-c++/detail/sanity_test.cpp projects/routing/contrib/atf/atf-c/config.c projects/routing/contrib/atf/atf-c/config.h projects/routing/contrib/atf/atf-c/config_test.c projects/routing/contrib/atf/bconfig.h projects/routing/contrib/xz/po/ projects/routing/crypto/openssl/doc/crypto/CMS_sign_add1_signer.pod projects/routing/etc/rc.d/initrandom projects/routing/etc/rc.d/postrandom projects/routing/lib/libc/string/explicit_bzero.c projects/routing/secure/lib/libcrypto/man/CMS_sign_add1_signer.3 projects/routing/share/man/man8/hv_kvp_daemon.8 projects/routing/sys/arm/ti/am335x/files.beaglebone projects/routing/sys/arm/ti/am335x/std.beaglebone projects/routing/sys/arm/ti/omap3/ projects/routing/sys/arm/ti/ti_mmchs.c projects/routing/sys/arm/ti/ti_mmchs.h projects/routing/sys/dev/ixl/i40e_register_x710_int.h projects/routing/sys/dev/random/harvest.c projects/routing/sys/dev/random/rwfile.c projects/routing/sys/dev/random/rwfile.h projects/routing/sys/ofed/drivers/net/mlx4/en_frag.c projects/routing/sys/ofed/drivers/net/mlx4/en_params.c projects/routing/sys/ofed/drivers/net/mlx4/xrcd.c projects/routing/sys/ofed/include/asm/page.h projects/routing/sys/ofed/include/linux/ethtool.h projects/routing/sys/ofed/include/linux/inet.h projects/routing/sys/ofed/include/linux/mount.h projects/routing/sys/powerpc/powermac/windtunnel.c projects/routing/sys/xen/evtchn/evtchn_dev.c projects/routing/tests/lib/ projects/routing/tools/build/options/WITHOUT_ARM_EABI projects/routing/tools/build/options/WITH_HYPERV projects/routing/usr.sbin/bhyve/pmtmr.c projects/routing/usr.sbin/ftp-proxy/Makefile.inc projects/routing/usr.sbin/ftp-proxy/ftp-proxy/ projects/routing/usr.sbin/ftp-proxy/libevent/ projects/routing/usr.sbin/pkg/elf_tables.h Modified: projects/routing/MAINTAINERS (contents, props changed) projects/routing/Makefile.inc1 projects/routing/ObsoleteFiles.inc projects/routing/UPDATING projects/routing/bin/sh/eval.c projects/routing/bin/sh/expand.c projects/routing/bin/sh/jobs.c projects/routing/bin/sh/options.c projects/routing/bin/sh/options.h projects/routing/bin/sh/parser.c projects/routing/bin/sh/tests/builtins/Makefile projects/routing/bin/sh/tests/expansion/Makefile projects/routing/bin/sh/tests/parameters/Makefile projects/routing/bin/sh/tests/parser/Makefile projects/routing/cddl/lib/libdtrace/tcp.d projects/routing/contrib/atf/FREEBSD-Xlist projects/routing/contrib/atf/NEWS projects/routing/contrib/atf/atf-c++.hpp projects/routing/contrib/atf/atf-c++/Kyuafile projects/routing/contrib/atf/atf-c++/atf_c++_test.cpp projects/routing/contrib/atf/atf-c++/build.cpp projects/routing/contrib/atf/atf-c++/build.hpp projects/routing/contrib/atf/atf-c++/build_test.cpp projects/routing/contrib/atf/atf-c++/check.cpp projects/routing/contrib/atf/atf-c++/check.hpp projects/routing/contrib/atf/atf-c++/check_test.cpp projects/routing/contrib/atf/atf-c++/detail/Kyuafile projects/routing/contrib/atf/atf-c++/detail/application.cpp projects/routing/contrib/atf/atf-c++/detail/application.hpp projects/routing/contrib/atf/atf-c++/detail/application_test.cpp projects/routing/contrib/atf/atf-c++/detail/auto_array.hpp projects/routing/contrib/atf/atf-c++/detail/auto_array_test.cpp projects/routing/contrib/atf/atf-c++/detail/env.cpp projects/routing/contrib/atf/atf-c++/detail/env.hpp projects/routing/contrib/atf/atf-c++/detail/env_test.cpp projects/routing/contrib/atf/atf-c++/detail/exceptions.cpp projects/routing/contrib/atf/atf-c++/detail/exceptions.hpp projects/routing/contrib/atf/atf-c++/detail/exceptions_test.cpp projects/routing/contrib/atf/atf-c++/detail/fs.cpp projects/routing/contrib/atf/atf-c++/detail/fs.hpp projects/routing/contrib/atf/atf-c++/detail/fs_test.cpp projects/routing/contrib/atf/atf-c++/detail/process.cpp projects/routing/contrib/atf/atf-c++/detail/process.hpp projects/routing/contrib/atf/atf-c++/detail/process_test.cpp projects/routing/contrib/atf/atf-c++/detail/sanity.hpp projects/routing/contrib/atf/atf-c++/detail/test_helpers.cpp projects/routing/contrib/atf/atf-c++/detail/test_helpers.hpp projects/routing/contrib/atf/atf-c++/detail/text.cpp projects/routing/contrib/atf/atf-c++/detail/text.hpp projects/routing/contrib/atf/atf-c++/detail/text_test.cpp projects/routing/contrib/atf/atf-c++/detail/version_helper.cpp projects/routing/contrib/atf/atf-c++/macros.hpp projects/routing/contrib/atf/atf-c++/macros_hpp_test.cpp projects/routing/contrib/atf/atf-c++/macros_test.cpp projects/routing/contrib/atf/atf-c++/pkg_config_test.sh projects/routing/contrib/atf/atf-c++/tests.cpp projects/routing/contrib/atf/atf-c++/tests.hpp projects/routing/contrib/atf/atf-c++/tests_test.cpp projects/routing/contrib/atf/atf-c++/unused_test.cpp projects/routing/contrib/atf/atf-c++/utils.cpp projects/routing/contrib/atf/atf-c++/utils.hpp projects/routing/contrib/atf/atf-c++/utils_test.cpp projects/routing/contrib/atf/atf-c.h projects/routing/contrib/atf/atf-c/Kyuafile projects/routing/contrib/atf/atf-c/atf_c_test.c projects/routing/contrib/atf/atf-c/build.c projects/routing/contrib/atf/atf-c/build.h projects/routing/contrib/atf/atf-c/build_test.c projects/routing/contrib/atf/atf-c/check.c projects/routing/contrib/atf/atf-c/check.h projects/routing/contrib/atf/atf-c/check_test.c projects/routing/contrib/atf/atf-c/defs.h.in projects/routing/contrib/atf/atf-c/detail/dynstr.c projects/routing/contrib/atf/atf-c/detail/dynstr.h projects/routing/contrib/atf/atf-c/detail/dynstr_test.c projects/routing/contrib/atf/atf-c/detail/env.c projects/routing/contrib/atf/atf-c/detail/env.h projects/routing/contrib/atf/atf-c/detail/env_test.c projects/routing/contrib/atf/atf-c/detail/fs.c projects/routing/contrib/atf/atf-c/detail/fs.h projects/routing/contrib/atf/atf-c/detail/fs_test.c projects/routing/contrib/atf/atf-c/detail/list.c projects/routing/contrib/atf/atf-c/detail/list.h projects/routing/contrib/atf/atf-c/detail/list_test.c projects/routing/contrib/atf/atf-c/detail/map.c projects/routing/contrib/atf/atf-c/detail/map.h projects/routing/contrib/atf/atf-c/detail/map_test.c projects/routing/contrib/atf/atf-c/detail/process.c projects/routing/contrib/atf/atf-c/detail/process.h projects/routing/contrib/atf/atf-c/detail/process_helpers.c projects/routing/contrib/atf/atf-c/detail/process_test.c projects/routing/contrib/atf/atf-c/detail/sanity.c projects/routing/contrib/atf/atf-c/detail/sanity.h projects/routing/contrib/atf/atf-c/detail/sanity_test.c projects/routing/contrib/atf/atf-c/detail/test_helpers.c projects/routing/contrib/atf/atf-c/detail/test_helpers.h projects/routing/contrib/atf/atf-c/detail/text.c projects/routing/contrib/atf/atf-c/detail/text.h projects/routing/contrib/atf/atf-c/detail/text_test.c projects/routing/contrib/atf/atf-c/detail/tp_main.c projects/routing/contrib/atf/atf-c/detail/user.c projects/routing/contrib/atf/atf-c/detail/user.h projects/routing/contrib/atf/atf-c/detail/user_test.c projects/routing/contrib/atf/atf-c/detail/version_helper.c projects/routing/contrib/atf/atf-c/error.c projects/routing/contrib/atf/atf-c/error.h projects/routing/contrib/atf/atf-c/error_fwd.h projects/routing/contrib/atf/atf-c/error_test.c projects/routing/contrib/atf/atf-c/h_build.h projects/routing/contrib/atf/atf-c/macros.h projects/routing/contrib/atf/atf-c/macros_h_test.c projects/routing/contrib/atf/atf-c/macros_test.c projects/routing/contrib/atf/atf-c/pkg_config_test.sh projects/routing/contrib/atf/atf-c/tc.c projects/routing/contrib/atf/atf-c/tc.h projects/routing/contrib/atf/atf-c/tc_test.c projects/routing/contrib/atf/atf-c/tp.c projects/routing/contrib/atf/atf-c/tp.h projects/routing/contrib/atf/atf-c/tp_test.c projects/routing/contrib/atf/atf-c/unused_test.c projects/routing/contrib/atf/atf-c/utils.c projects/routing/contrib/atf/atf-c/utils.h projects/routing/contrib/atf/atf-c/utils_test.c projects/routing/contrib/atf/atf-sh/atf-check.1 projects/routing/contrib/atf/atf-sh/atf-check.cpp projects/routing/contrib/atf/atf-sh/atf-check_test.sh projects/routing/contrib/atf/atf-sh/atf-sh.1 projects/routing/contrib/atf/atf-sh/atf-sh.cpp projects/routing/contrib/atf/atf-sh/atf_check_test.sh projects/routing/contrib/atf/atf-sh/config_test.sh projects/routing/contrib/atf/atf-sh/integration_test.sh projects/routing/contrib/atf/atf-sh/libatf-sh.subr projects/routing/contrib/atf/atf-sh/misc_helpers.sh projects/routing/contrib/atf/atf-sh/normalize_test.sh projects/routing/contrib/atf/atf-sh/tc_test.sh projects/routing/contrib/atf/atf-sh/tp_test.sh projects/routing/contrib/atf/doc/atf-test-case.4 projects/routing/contrib/atf/doc/atf-test-program.1 projects/routing/contrib/atf/test-programs/c_helpers.c projects/routing/contrib/atf/test-programs/common.sh projects/routing/contrib/atf/test-programs/config_test.sh projects/routing/contrib/atf/test-programs/cpp_helpers.cpp projects/routing/contrib/atf/test-programs/expect_test.sh projects/routing/contrib/atf/test-programs/meta_data_test.sh projects/routing/contrib/atf/test-programs/result_test.sh projects/routing/contrib/atf/test-programs/sh_helpers.sh projects/routing/contrib/atf/test-programs/srcdir_test.sh projects/routing/contrib/elftoolchain/libelf/libelf_align.c projects/routing/contrib/elftoolchain/libelf/libelf_convert.m4 projects/routing/contrib/file/magic/Magdir/filesystems projects/routing/contrib/hyperv/tools/hv_kvp_daemon.8 projects/routing/contrib/libc++/include/__config projects/routing/contrib/libc++/src/new.cpp projects/routing/contrib/libcxxrt/auxhelper.cc projects/routing/contrib/libcxxrt/stdexcept.cc projects/routing/contrib/libcxxrt/stdexcept.h projects/routing/contrib/mtree/create.c projects/routing/contrib/mtree/extern.h projects/routing/contrib/mtree/getid.c projects/routing/contrib/mtree/mtree.c projects/routing/contrib/mtree/spec.c projects/routing/contrib/netbsd-tests/include/t_paths.c projects/routing/contrib/netbsd-tests/lib/libc/db/t_db.sh projects/routing/contrib/netbsd-tests/lib/libc/gen/t_floatunditf.c projects/routing/contrib/netbsd-tests/lib/libc/gen/t_fpsetmask.c projects/routing/contrib/netbsd-tests/lib/libc/gen/t_isnan.c projects/routing/contrib/netbsd-tests/lib/libc/gen/t_nice.c projects/routing/contrib/netbsd-tests/lib/libc/gen/t_sethostname.c projects/routing/contrib/netbsd-tests/lib/libc/gen/t_siginfo.c projects/routing/contrib/netbsd-tests/lib/libc/gen/t_sleep.c projects/routing/contrib/netbsd-tests/lib/libc/hash/h_hash.c projects/routing/contrib/netbsd-tests/lib/libc/hash/t_sha2.c projects/routing/contrib/netbsd-tests/lib/libc/inet/t_inet_network.c projects/routing/contrib/netbsd-tests/lib/libc/locale/t_io.c projects/routing/contrib/netbsd-tests/lib/libc/locale/t_mbrtowc.c projects/routing/contrib/netbsd-tests/lib/libc/locale/t_mbstowcs.c projects/routing/contrib/netbsd-tests/lib/libc/locale/t_mbtowc.c projects/routing/contrib/netbsd-tests/lib/libc/locale/t_wcstod.c projects/routing/contrib/netbsd-tests/lib/libc/locale/t_wctomb.c projects/routing/contrib/netbsd-tests/lib/libc/net/h_dns_server.c projects/routing/contrib/netbsd-tests/lib/libc/net/t_ether_aton.c projects/routing/contrib/netbsd-tests/lib/libc/net/t_servent.sh projects/routing/contrib/netbsd-tests/lib/libc/regex/debug.c projects/routing/contrib/netbsd-tests/lib/libc/regex/t_exhaust.c projects/routing/contrib/netbsd-tests/lib/libc/regex/t_regex_att.c projects/routing/contrib/netbsd-tests/lib/libc/rpc/t_rpc.c projects/routing/contrib/netbsd-tests/lib/libc/ssp/h_memset.c projects/routing/contrib/netbsd-tests/lib/libc/ssp/h_read.c projects/routing/contrib/netbsd-tests/lib/libc/ssp/h_readlink.c projects/routing/contrib/netbsd-tests/lib/libc/ssp/h_snprintf.c projects/routing/contrib/netbsd-tests/lib/libc/ssp/t_ssp.sh projects/routing/contrib/netbsd-tests/lib/libc/stdio/t_fflush.c projects/routing/contrib/netbsd-tests/lib/libc/stdio/t_fmemopen.c projects/routing/contrib/netbsd-tests/lib/libc/stdio/t_fopen.c projects/routing/contrib/netbsd-tests/lib/libc/stdio/t_printf.c projects/routing/contrib/netbsd-tests/lib/libc/stdio/t_scanf.c projects/routing/contrib/netbsd-tests/lib/libc/stdlib/h_atexit.c projects/routing/contrib/netbsd-tests/lib/libc/stdlib/h_getopt.c projects/routing/contrib/netbsd-tests/lib/libc/stdlib/h_getopt_long.c projects/routing/contrib/netbsd-tests/lib/libc/stdlib/t_strtod.c projects/routing/contrib/netbsd-tests/lib/libc/string/t_memcpy.c projects/routing/contrib/netbsd-tests/lib/libc/string/t_memmem.c projects/routing/contrib/netbsd-tests/lib/libc/string/t_strerror.c projects/routing/contrib/netbsd-tests/lib/libc/sys/t_access.c projects/routing/contrib/netbsd-tests/lib/libc/sys/t_chroot.c projects/routing/contrib/netbsd-tests/lib/libc/sys/t_clock_gettime.c projects/routing/contrib/netbsd-tests/lib/libc/sys/t_connect.c projects/routing/contrib/netbsd-tests/lib/libc/sys/t_dup.c projects/routing/contrib/netbsd-tests/lib/libc/sys/t_getgroups.c projects/routing/contrib/netbsd-tests/lib/libc/sys/t_getitimer.c projects/routing/contrib/netbsd-tests/lib/libc/sys/t_getrusage.c projects/routing/contrib/netbsd-tests/lib/libc/sys/t_kevent.c projects/routing/contrib/netbsd-tests/lib/libc/sys/t_link.c projects/routing/contrib/netbsd-tests/lib/libc/sys/t_listen.c projects/routing/contrib/netbsd-tests/lib/libc/sys/t_mincore.c projects/routing/contrib/netbsd-tests/lib/libc/sys/t_mknod.c projects/routing/contrib/netbsd-tests/lib/libc/sys/t_mlock.c projects/routing/contrib/netbsd-tests/lib/libc/sys/t_mmap.c projects/routing/contrib/netbsd-tests/lib/libc/sys/t_mprotect.c projects/routing/contrib/netbsd-tests/lib/libc/sys/t_msgctl.c projects/routing/contrib/netbsd-tests/lib/libc/sys/t_msgrcv.c projects/routing/contrib/netbsd-tests/lib/libc/sys/t_msgsnd.c projects/routing/contrib/netbsd-tests/lib/libc/sys/t_msync.c projects/routing/contrib/netbsd-tests/lib/libc/sys/t_nanosleep.c projects/routing/contrib/netbsd-tests/lib/libc/sys/t_pipe2.c projects/routing/contrib/netbsd-tests/lib/libc/sys/t_poll.c projects/routing/contrib/netbsd-tests/lib/libc/sys/t_revoke.c projects/routing/contrib/netbsd-tests/lib/libc/sys/t_select.c projects/routing/contrib/netbsd-tests/lib/libc/sys/t_setrlimit.c projects/routing/contrib/netbsd-tests/lib/libc/sys/t_sigaction.c projects/routing/contrib/netbsd-tests/lib/libc/sys/t_sigqueue.c projects/routing/contrib/netbsd-tests/lib/libc/sys/t_socketpair.c projects/routing/contrib/netbsd-tests/lib/libc/sys/t_stat.c projects/routing/contrib/netbsd-tests/lib/libc/sys/t_timer_create.c projects/routing/contrib/netbsd-tests/lib/libc/sys/t_truncate.c projects/routing/contrib/netbsd-tests/lib/libc/sys/t_unlink.c projects/routing/contrib/netbsd-tests/lib/libc/sys/t_write.c projects/routing/contrib/netbsd-tests/lib/libc/time/t_strptime.c projects/routing/contrib/netbsd-tests/lib/libc/tls/dso/h_tls_dlopen.c projects/routing/contrib/netbsd-tests/lib/libc/tls/t_tls_dlopen.c projects/routing/contrib/netbsd-tests/lib/libc/tls/t_tls_dynamic.c projects/routing/contrib/netbsd-tests/lib/libc/tls/t_tls_static.c projects/routing/contrib/netbsd-tests/lib/libc/tls/t_tls_static_helper.c projects/routing/contrib/netbsd-tests/lib/libc/tls_dso/h_tls_dynamic.c projects/routing/contrib/netbsd-tests/lib/libexecinfo/t_backtrace.c projects/routing/contrib/netbsd-tests/lib/libm/t_ldexp.c projects/routing/contrib/netbsd-tests/lib/libm/t_log.c projects/routing/contrib/netbsd-tests/lib/libm/t_precision.c projects/routing/contrib/netbsd-tests/lib/libpthread/t_mutex.c projects/routing/contrib/netbsd-tests/lib/libpthread/t_sem.c projects/routing/contrib/netbsd-tests/usr.sbin/mtree/t_mtree.sh projects/routing/contrib/netcat/netcat.c projects/routing/contrib/ofed/librdmacm/examples/rping.c projects/routing/contrib/ofed/usr.lib/Makefile projects/routing/contrib/ofed/usr.lib/Makefile.inc projects/routing/contrib/openpam/lib/libpam/openpam_readword.c projects/routing/contrib/tcp_wrappers/inetcf.h projects/routing/contrib/tcp_wrappers/mystdarg.h projects/routing/contrib/tcp_wrappers/tcpd.h projects/routing/contrib/tcp_wrappers/tli-sequent.h projects/routing/contrib/tzdata/africa projects/routing/contrib/tzdata/antarctica projects/routing/contrib/tzdata/asia projects/routing/contrib/tzdata/australasia projects/routing/contrib/tzdata/backward projects/routing/contrib/tzdata/europe projects/routing/contrib/tzdata/northamerica projects/routing/contrib/tzdata/southamerica projects/routing/contrib/tzdata/zone.tab projects/routing/contrib/tzdata/zone1970.tab projects/routing/contrib/xz/ChangeLog projects/routing/contrib/xz/FREEBSD-Xlist projects/routing/contrib/xz/THANKS projects/routing/contrib/xz/TODO projects/routing/contrib/xz/src/liblzma/api/lzma/block.h projects/routing/contrib/xz/src/liblzma/api/lzma/version.h projects/routing/contrib/xz/src/liblzma/check/crc32_fast.c projects/routing/contrib/xz/src/liblzma/check/sha256.c projects/routing/contrib/xz/src/liblzma/lzma/lzma_encoder_presets.c projects/routing/contrib/xz/src/xz/coder.c projects/routing/contrib/xz/src/xz/signals.c projects/routing/contrib/xz/src/xz/suffix.c projects/routing/crypto/openssl/CHANGES projects/routing/crypto/openssl/Configure projects/routing/crypto/openssl/Makefile projects/routing/crypto/openssl/NEWS projects/routing/crypto/openssl/README projects/routing/crypto/openssl/apps/s_client.c projects/routing/crypto/openssl/crypto/Makefile projects/routing/crypto/openssl/crypto/aes/asm/aesni-x86_64.pl projects/routing/crypto/openssl/crypto/asn1/a_strex.c projects/routing/crypto/openssl/crypto/bn/asm/x86_64-gcc.c projects/routing/crypto/openssl/crypto/bn/bn_exp.c projects/routing/crypto/openssl/crypto/bn/bn_nist.c projects/routing/crypto/openssl/crypto/bn/exptest.c projects/routing/crypto/openssl/crypto/dsa/dsa_ameth.c projects/routing/crypto/openssl/crypto/ebcdic.h projects/routing/crypto/openssl/crypto/ec/ec.h projects/routing/crypto/openssl/crypto/ec/ec2_smpl.c projects/routing/crypto/openssl/crypto/ec/ec_ameth.c projects/routing/crypto/openssl/crypto/ec/ec_asn1.c projects/routing/crypto/openssl/crypto/ec/ecp_mont.c projects/routing/crypto/openssl/crypto/ec/ecp_nist.c projects/routing/crypto/openssl/crypto/ec/ecp_smpl.c projects/routing/crypto/openssl/crypto/ec/ectest.c projects/routing/crypto/openssl/crypto/evp/Makefile projects/routing/crypto/openssl/crypto/evp/e_aes.c projects/routing/crypto/openssl/crypto/evp/evp_enc.c projects/routing/crypto/openssl/crypto/md5/asm/md5-x86_64.pl projects/routing/crypto/openssl/crypto/modes/modes.h projects/routing/crypto/openssl/crypto/ocsp/ocsp_vfy.c projects/routing/crypto/openssl/crypto/opensslconf.h projects/routing/crypto/openssl/crypto/opensslv.h projects/routing/crypto/openssl/crypto/ossl_typ.h projects/routing/crypto/openssl/crypto/pkcs7/pkcs7.h projects/routing/crypto/openssl/crypto/pqueue/pqueue.h projects/routing/crypto/openssl/crypto/rsa/Makefile projects/routing/crypto/openssl/crypto/rsa/rsa.h projects/routing/crypto/openssl/crypto/rsa/rsa_err.c projects/routing/crypto/openssl/crypto/rsa/rsa_oaep.c projects/routing/crypto/openssl/crypto/rsa/rsa_pk1.c projects/routing/crypto/openssl/crypto/rsa/rsa_sign.c projects/routing/crypto/openssl/crypto/stack/safestack.h projects/routing/crypto/openssl/doc/apps/dgst.pod projects/routing/crypto/openssl/doc/crypto/BIO_s_accept.pod projects/routing/crypto/openssl/doc/crypto/EVP_DigestInit.pod projects/routing/crypto/openssl/doc/crypto/EVP_DigestVerifyInit.pod projects/routing/crypto/openssl/doc/crypto/EVP_EncryptInit.pod projects/routing/crypto/openssl/doc/crypto/EVP_PKEY_set1_RSA.pod projects/routing/crypto/openssl/doc/crypto/EVP_PKEY_sign.pod projects/routing/crypto/openssl/doc/ssl/SSL_CTX_set_tmp_dh_callback.pod projects/routing/crypto/openssl/e_os.h projects/routing/crypto/openssl/ssl/Makefile projects/routing/crypto/openssl/ssl/d1_both.c projects/routing/crypto/openssl/ssl/d1_lib.c projects/routing/crypto/openssl/ssl/d1_srtp.c projects/routing/crypto/openssl/ssl/dtls1.h projects/routing/crypto/openssl/ssl/s23_clnt.c projects/routing/crypto/openssl/ssl/s23_srvr.c projects/routing/crypto/openssl/ssl/s2_lib.c projects/routing/crypto/openssl/ssl/s3_cbc.c projects/routing/crypto/openssl/ssl/s3_clnt.c projects/routing/crypto/openssl/ssl/s3_enc.c projects/routing/crypto/openssl/ssl/s3_lib.c projects/routing/crypto/openssl/ssl/s3_pkt.c projects/routing/crypto/openssl/ssl/s3_srvr.c projects/routing/crypto/openssl/ssl/srtp.h projects/routing/crypto/openssl/ssl/ssl.h projects/routing/crypto/openssl/ssl/ssl3.h projects/routing/crypto/openssl/ssl/ssl_err.c projects/routing/crypto/openssl/ssl/ssl_lib.c projects/routing/crypto/openssl/ssl/t1_enc.c projects/routing/crypto/openssl/ssl/t1_lib.c projects/routing/crypto/openssl/ssl/tls1.h projects/routing/crypto/openssl/util/mk1mf.pl projects/routing/crypto/openssl/util/mkdef.pl projects/routing/crypto/openssl/util/ssleay.num projects/routing/etc/defaults/rc.conf projects/routing/etc/devd/Makefile projects/routing/etc/devd/apple.conf projects/routing/etc/motd projects/routing/etc/mtree/BSD.debug.dist projects/routing/etc/mtree/BSD.include.dist projects/routing/etc/mtree/BSD.tests.dist projects/routing/etc/rc.d/Makefile projects/routing/etc/rc.d/adjkerntz projects/routing/etc/rc.d/bgfsck projects/routing/etc/rc.d/geli projects/routing/etc/rc.d/netif projects/routing/etc/rc.d/random projects/routing/etc/rc.d/syscons projects/routing/etc/rc.d/syslogd projects/routing/etc/rc.firewall projects/routing/etc/rc.subr projects/routing/include/Makefile projects/routing/include/semaphore.h projects/routing/lib/Makefile projects/routing/lib/atf/Makefile.inc projects/routing/lib/atf/common.mk projects/routing/lib/atf/libatf-c++/Makefile projects/routing/lib/atf/libatf-c++/tests/Makefile projects/routing/lib/atf/libatf-c++/tests/detail/Makefile projects/routing/lib/atf/libatf-c/Makefile projects/routing/lib/atf/libatf-c/tests/Makefile projects/routing/lib/atf/libatf-c/tests/detail/Makefile projects/routing/lib/libarchive/Makefile projects/routing/lib/libc++/Makefile projects/routing/lib/libc/Makefile projects/routing/lib/libc/arm/aeabi/Makefile.inc projects/routing/lib/libc/arm/aeabi/Symbol.map projects/routing/lib/libc/arm/aeabi/aeabi_double.c projects/routing/lib/libc/arm/aeabi/aeabi_float.c projects/routing/lib/libc/arm/aeabi/aeabi_vfp_double.S projects/routing/lib/libc/arm/aeabi/aeabi_vfp_float.S projects/routing/lib/libc/gen/getgrouplist.3 projects/routing/lib/libc/gen/initgroups.3 projects/routing/lib/libc/gen/sem_destroy.3 projects/routing/lib/libc/gen/sem_getvalue.3 projects/routing/lib/libc/gen/sem_init.3 projects/routing/lib/libc/gen/sem_new.c projects/routing/lib/libc/gen/sem_open.3 projects/routing/lib/libc/gen/sem_post.3 projects/routing/lib/libc/gen/sem_timedwait.3 projects/routing/lib/libc/gen/sem_wait.3 projects/routing/lib/libc/net/nsdispatch.c projects/routing/lib/libc/posix1e/acl.3 projects/routing/lib/libc/posix1e/acl_add_flag_np.3 projects/routing/lib/libc/posix1e/acl_clear_flags_np.3 projects/routing/lib/libc/posix1e/acl_delete_flag_np.3 projects/routing/lib/libc/posix1e/acl_get_flag_np.3 projects/routing/lib/libc/posix1e/acl_get_flagset_np.3 projects/routing/lib/libc/posix1e/acl_set_entry_type_np.3 projects/routing/lib/libc/posix1e/acl_set_flagset_np.3 projects/routing/lib/libc/rpc/clnt_vc.c projects/routing/lib/libc/stdio/open_memstream.3 projects/routing/lib/libc/stdlib/lsearch.c projects/routing/lib/libc/string/Makefile.inc projects/routing/lib/libc/sys/recv.2 projects/routing/lib/libc/sys/utrace.2 projects/routing/lib/libcuse/cuse_lib.c projects/routing/lib/libcxxrt/Version.map projects/routing/lib/libfetch/common.c projects/routing/lib/libfetch/fetch.3 projects/routing/lib/libkvm/kvm_arm.c projects/routing/lib/libkvm/kvm_proc.c projects/routing/lib/libnetbsd/sys/cdefs.h projects/routing/lib/libnv/Makefile projects/routing/lib/libusb/Makefile projects/routing/lib/libutil/gr_util.c projects/routing/lib/libutil/login_class.c projects/routing/lib/libz/Makefile projects/routing/libexec/Makefile projects/routing/libexec/atf/atf-check/Makefile projects/routing/libexec/atf/atf-sh/Makefile projects/routing/libexec/atf/atf-sh/tests/Makefile projects/routing/libexec/save-entropy/save-entropy.sh projects/routing/release/Makefile projects/routing/release/amd64/mk-vmimage.sh projects/routing/release/doc/en_US.ISO8859-1/hardware/article.xml projects/routing/release/i386/mk-vmimage.sh projects/routing/sbin/fsck_msdosfs/boot.c projects/routing/sbin/fsck_msdosfs/dosfs.h projects/routing/sbin/ifconfig/Makefile projects/routing/sbin/ifconfig/ifconfig.8 projects/routing/sbin/ifconfig/sfp.c projects/routing/sbin/ipfw/ipfw.8 projects/routing/sbin/ipfw/ipfw2.c projects/routing/sbin/ipfw/tables.c projects/routing/sbin/mount_nfs/Makefile projects/routing/sbin/mount_nfs/mount_nfs.8 projects/routing/sbin/mount_nfs/mount_nfs.c projects/routing/sbin/ping/Makefile projects/routing/sbin/ping/ping.c projects/routing/sbin/ping6/Makefile projects/routing/sbin/ping6/ping6.8 projects/routing/sbin/ping6/ping6.c projects/routing/sbin/route/route.c projects/routing/secure/lib/libcrypto/Makefile.inc projects/routing/secure/lib/libcrypto/Makefile.man projects/routing/secure/lib/libcrypto/man/ASN1_OBJECT_new.3 projects/routing/secure/lib/libcrypto/man/ASN1_STRING_length.3 projects/routing/secure/lib/libcrypto/man/ASN1_STRING_new.3 projects/routing/secure/lib/libcrypto/man/ASN1_STRING_print_ex.3 projects/routing/secure/lib/libcrypto/man/ASN1_generate_nconf.3 projects/routing/secure/lib/libcrypto/man/BIO_ctrl.3 projects/routing/secure/lib/libcrypto/man/BIO_f_base64.3 projects/routing/secure/lib/libcrypto/man/BIO_f_buffer.3 projects/routing/secure/lib/libcrypto/man/BIO_f_cipher.3 projects/routing/secure/lib/libcrypto/man/BIO_f_md.3 projects/routing/secure/lib/libcrypto/man/BIO_f_null.3 projects/routing/secure/lib/libcrypto/man/BIO_f_ssl.3 projects/routing/secure/lib/libcrypto/man/BIO_find_type.3 projects/routing/secure/lib/libcrypto/man/BIO_new.3 projects/routing/secure/lib/libcrypto/man/BIO_new_CMS.3 projects/routing/secure/lib/libcrypto/man/BIO_push.3 projects/routing/secure/lib/libcrypto/man/BIO_read.3 projects/routing/secure/lib/libcrypto/man/BIO_s_accept.3 projects/routing/secure/lib/libcrypto/man/BIO_s_bio.3 projects/routing/secure/lib/libcrypto/man/BIO_s_connect.3 projects/routing/secure/lib/libcrypto/man/BIO_s_fd.3 projects/routing/secure/lib/libcrypto/man/BIO_s_file.3 projects/routing/secure/lib/libcrypto/man/BIO_s_mem.3 projects/routing/secure/lib/libcrypto/man/BIO_s_null.3 projects/routing/secure/lib/libcrypto/man/BIO_s_socket.3 projects/routing/secure/lib/libcrypto/man/BIO_set_callback.3 projects/routing/secure/lib/libcrypto/man/BIO_should_retry.3 projects/routing/secure/lib/libcrypto/man/BN_BLINDING_new.3 projects/routing/secure/lib/libcrypto/man/BN_CTX_new.3 projects/routing/secure/lib/libcrypto/man/BN_CTX_start.3 projects/routing/secure/lib/libcrypto/man/BN_add.3 projects/routing/secure/lib/libcrypto/man/BN_add_word.3 projects/routing/secure/lib/libcrypto/man/BN_bn2bin.3 projects/routing/secure/lib/libcrypto/man/BN_cmp.3 projects/routing/secure/lib/libcrypto/man/BN_copy.3 projects/routing/secure/lib/libcrypto/man/BN_generate_prime.3 projects/routing/secure/lib/libcrypto/man/BN_mod_inverse.3 projects/routing/secure/lib/libcrypto/man/BN_mod_mul_montgomery.3 projects/routing/secure/lib/libcrypto/man/BN_mod_mul_reciprocal.3 projects/routing/secure/lib/libcrypto/man/BN_new.3 projects/routing/secure/lib/libcrypto/man/BN_num_bytes.3 projects/routing/secure/lib/libcrypto/man/BN_rand.3 projects/routing/secure/lib/libcrypto/man/BN_set_bit.3 projects/routing/secure/lib/libcrypto/man/BN_swap.3 projects/routing/secure/lib/libcrypto/man/BN_zero.3 projects/routing/secure/lib/libcrypto/man/CMS_add0_cert.3 projects/routing/secure/lib/libcrypto/man/CMS_add1_recipient_cert.3 projects/routing/secure/lib/libcrypto/man/CMS_compress.3 projects/routing/secure/lib/libcrypto/man/CMS_decrypt.3 projects/routing/secure/lib/libcrypto/man/CMS_encrypt.3 projects/routing/secure/lib/libcrypto/man/CMS_final.3 projects/routing/secure/lib/libcrypto/man/CMS_get0_RecipientInfos.3 projects/routing/secure/lib/libcrypto/man/CMS_get0_SignerInfos.3 projects/routing/secure/lib/libcrypto/man/CMS_get0_type.3 projects/routing/secure/lib/libcrypto/man/CMS_get1_ReceiptRequest.3 projects/routing/secure/lib/libcrypto/man/CMS_sign.3 projects/routing/secure/lib/libcrypto/man/CMS_sign_receipt.3 projects/routing/secure/lib/libcrypto/man/CMS_uncompress.3 projects/routing/secure/lib/libcrypto/man/CMS_verify.3 projects/routing/secure/lib/libcrypto/man/CMS_verify_receipt.3 projects/routing/secure/lib/libcrypto/man/CONF_modules_free.3 projects/routing/secure/lib/libcrypto/man/CONF_modules_load_file.3 projects/routing/secure/lib/libcrypto/man/CRYPTO_set_ex_data.3 projects/routing/secure/lib/libcrypto/man/DH_generate_key.3 projects/routing/secure/lib/libcrypto/man/DH_generate_parameters.3 projects/routing/secure/lib/libcrypto/man/DH_get_ex_new_index.3 projects/routing/secure/lib/libcrypto/man/DH_new.3 projects/routing/secure/lib/libcrypto/man/DH_set_method.3 projects/routing/secure/lib/libcrypto/man/DH_size.3 projects/routing/secure/lib/libcrypto/man/DSA_SIG_new.3 projects/routing/secure/lib/libcrypto/man/DSA_do_sign.3 projects/routing/secure/lib/libcrypto/man/DSA_dup_DH.3 projects/routing/secure/lib/libcrypto/man/DSA_generate_key.3 projects/routing/secure/lib/libcrypto/man/DSA_generate_parameters.3 projects/routing/secure/lib/libcrypto/man/DSA_get_ex_new_index.3 projects/routing/secure/lib/libcrypto/man/DSA_new.3 projects/routing/secure/lib/libcrypto/man/DSA_set_method.3 projects/routing/secure/lib/libcrypto/man/DSA_sign.3 projects/routing/secure/lib/libcrypto/man/DSA_size.3 projects/routing/secure/lib/libcrypto/man/ERR_GET_LIB.3 projects/routing/secure/lib/libcrypto/man/ERR_clear_error.3 projects/routing/secure/lib/libcrypto/man/ERR_error_string.3 projects/routing/secure/lib/libcrypto/man/ERR_get_error.3 projects/routing/secure/lib/libcrypto/man/ERR_load_crypto_strings.3 projects/routing/secure/lib/libcrypto/man/ERR_load_strings.3 projects/routing/secure/lib/libcrypto/man/ERR_print_errors.3 projects/routing/secure/lib/libcrypto/man/ERR_put_error.3 projects/routing/secure/lib/libcrypto/man/ERR_remove_state.3 projects/routing/secure/lib/libcrypto/man/ERR_set_mark.3 projects/routing/secure/lib/libcrypto/man/EVP_BytesToKey.3 projects/routing/secure/lib/libcrypto/man/EVP_DigestInit.3 projects/routing/secure/lib/libcrypto/man/EVP_DigestSignInit.3 projects/routing/secure/lib/libcrypto/man/EVP_DigestVerifyInit.3 projects/routing/secure/lib/libcrypto/man/EVP_EncryptInit.3 projects/routing/secure/lib/libcrypto/man/EVP_OpenInit.3 projects/routing/secure/lib/libcrypto/man/EVP_PKEY_CTX_ctrl.3 projects/routing/secure/lib/libcrypto/man/EVP_PKEY_CTX_new.3 projects/routing/secure/lib/libcrypto/man/EVP_PKEY_cmp.3 projects/routing/secure/lib/libcrypto/man/EVP_PKEY_decrypt.3 projects/routing/secure/lib/libcrypto/man/EVP_PKEY_derive.3 projects/routing/secure/lib/libcrypto/man/EVP_PKEY_encrypt.3 projects/routing/secure/lib/libcrypto/man/EVP_PKEY_get_default_digest.3 projects/routing/secure/lib/libcrypto/man/EVP_PKEY_keygen.3 projects/routing/secure/lib/libcrypto/man/EVP_PKEY_new.3 projects/routing/secure/lib/libcrypto/man/EVP_PKEY_print_private.3 projects/routing/secure/lib/libcrypto/man/EVP_PKEY_set1_RSA.3 projects/routing/secure/lib/libcrypto/man/EVP_PKEY_sign.3 projects/routing/secure/lib/libcrypto/man/EVP_PKEY_verify.3 projects/routing/secure/lib/libcrypto/man/EVP_PKEY_verify_recover.3 projects/routing/secure/lib/libcrypto/man/EVP_SealInit.3 projects/routing/secure/lib/libcrypto/man/EVP_SignInit.3 projects/routing/secure/lib/libcrypto/man/EVP_VerifyInit.3 projects/routing/secure/lib/libcrypto/man/OBJ_nid2obj.3 projects/routing/secure/lib/libcrypto/man/OPENSSL_Applink.3 projects/routing/secure/lib/libcrypto/man/OPENSSL_VERSION_NUMBER.3 projects/routing/secure/lib/libcrypto/man/OPENSSL_config.3 projects/routing/secure/lib/libcrypto/man/OPENSSL_ia32cap.3 projects/routing/secure/lib/libcrypto/man/OPENSSL_load_builtin_modules.3 projects/routing/secure/lib/libcrypto/man/OpenSSL_add_all_algorithms.3 projects/routing/secure/lib/libcrypto/man/PEM_write_bio_CMS_stream.3 projects/routing/secure/lib/libcrypto/man/PEM_write_bio_PKCS7_stream.3 projects/routing/secure/lib/libcrypto/man/PKCS12_create.3 projects/routing/secure/lib/libcrypto/man/PKCS12_parse.3 projects/routing/secure/lib/libcrypto/man/PKCS7_decrypt.3 projects/routing/secure/lib/libcrypto/man/PKCS7_encrypt.3 projects/routing/secure/lib/libcrypto/man/PKCS7_sign.3 projects/routing/secure/lib/libcrypto/man/PKCS7_sign_add_signer.3 projects/routing/secure/lib/libcrypto/man/PKCS7_verify.3 projects/routing/secure/lib/libcrypto/man/RAND_add.3 projects/routing/secure/lib/libcrypto/man/RAND_bytes.3 projects/routing/secure/lib/libcrypto/man/RAND_cleanup.3 projects/routing/secure/lib/libcrypto/man/RAND_egd.3 projects/routing/secure/lib/libcrypto/man/RAND_load_file.3 projects/routing/secure/lib/libcrypto/man/RAND_set_rand_method.3 projects/routing/secure/lib/libcrypto/man/RSA_blinding_on.3 projects/routing/secure/lib/libcrypto/man/RSA_check_key.3 projects/routing/secure/lib/libcrypto/man/RSA_generate_key.3 projects/routing/secure/lib/libcrypto/man/RSA_get_ex_new_index.3 projects/routing/secure/lib/libcrypto/man/RSA_new.3 projects/routing/secure/lib/libcrypto/man/RSA_padding_add_PKCS1_type_1.3 projects/routing/secure/lib/libcrypto/man/RSA_print.3 projects/routing/secure/lib/libcrypto/man/RSA_private_encrypt.3 projects/routing/secure/lib/libcrypto/man/RSA_public_encrypt.3 projects/routing/secure/lib/libcrypto/man/RSA_set_method.3 projects/routing/secure/lib/libcrypto/man/RSA_sign.3 projects/routing/secure/lib/libcrypto/man/RSA_sign_ASN1_OCTET_STRING.3 projects/routing/secure/lib/libcrypto/man/RSA_size.3 projects/routing/secure/lib/libcrypto/man/SMIME_read_CMS.3 projects/routing/secure/lib/libcrypto/man/SMIME_read_PKCS7.3 projects/routing/secure/lib/libcrypto/man/SMIME_write_CMS.3 projects/routing/secure/lib/libcrypto/man/SMIME_write_PKCS7.3 projects/routing/secure/lib/libcrypto/man/X509_NAME_ENTRY_get_object.3 projects/routing/secure/lib/libcrypto/man/X509_NAME_add_entry_by_txt.3 projects/routing/secure/lib/libcrypto/man/X509_NAME_get_index_by_NID.3 projects/routing/secure/lib/libcrypto/man/X509_NAME_print_ex.3 projects/routing/secure/lib/libcrypto/man/X509_STORE_CTX_get_error.3 projects/routing/secure/lib/libcrypto/man/X509_STORE_CTX_get_ex_new_index.3 projects/routing/secure/lib/libcrypto/man/X509_STORE_CTX_new.3 projects/routing/secure/lib/libcrypto/man/X509_STORE_CTX_set_verify_cb.3 projects/routing/secure/lib/libcrypto/man/X509_STORE_set_verify_cb_func.3 projects/routing/secure/lib/libcrypto/man/X509_VERIFY_PARAM_set_flags.3 projects/routing/secure/lib/libcrypto/man/X509_new.3 projects/routing/secure/lib/libcrypto/man/X509_verify_cert.3 projects/routing/secure/lib/libcrypto/man/bio.3 projects/routing/secure/lib/libcrypto/man/blowfish.3 projects/routing/secure/lib/libcrypto/man/bn.3 projects/routing/secure/lib/libcrypto/man/bn_internal.3 projects/routing/secure/lib/libcrypto/man/buffer.3 projects/routing/secure/lib/libcrypto/man/crypto.3 projects/routing/secure/lib/libcrypto/man/d2i_ASN1_OBJECT.3 projects/routing/secure/lib/libcrypto/man/d2i_DHparams.3 projects/routing/secure/lib/libcrypto/man/d2i_DSAPublicKey.3 projects/routing/secure/lib/libcrypto/man/d2i_PKCS8PrivateKey.3 projects/routing/secure/lib/libcrypto/man/d2i_RSAPublicKey.3 projects/routing/secure/lib/libcrypto/man/d2i_X509.3 projects/routing/secure/lib/libcrypto/man/d2i_X509_ALGOR.3 projects/routing/secure/lib/libcrypto/man/d2i_X509_CRL.3 projects/routing/secure/lib/libcrypto/man/d2i_X509_NAME.3 projects/routing/secure/lib/libcrypto/man/d2i_X509_REQ.3 projects/routing/secure/lib/libcrypto/man/d2i_X509_SIG.3 projects/routing/secure/lib/libcrypto/man/des.3 projects/routing/secure/lib/libcrypto/man/dh.3 projects/routing/secure/lib/libcrypto/man/dsa.3 projects/routing/secure/lib/libcrypto/man/ecdsa.3 projects/routing/secure/lib/libcrypto/man/engine.3 projects/routing/secure/lib/libcrypto/man/err.3 projects/routing/secure/lib/libcrypto/man/evp.3 projects/routing/secure/lib/libcrypto/man/hmac.3 projects/routing/secure/lib/libcrypto/man/i2d_CMS_bio_stream.3 projects/routing/secure/lib/libcrypto/man/i2d_PKCS7_bio_stream.3 projects/routing/secure/lib/libcrypto/man/lh_stats.3 projects/routing/secure/lib/libcrypto/man/lhash.3 projects/routing/secure/lib/libcrypto/man/md5.3 projects/routing/secure/lib/libcrypto/man/mdc2.3 projects/routing/secure/lib/libcrypto/man/pem.3 projects/routing/secure/lib/libcrypto/man/rand.3 projects/routing/secure/lib/libcrypto/man/rc4.3 projects/routing/secure/lib/libcrypto/man/ripemd.3 projects/routing/secure/lib/libcrypto/man/rsa.3 projects/routing/secure/lib/libcrypto/man/sha.3 projects/routing/secure/lib/libcrypto/man/threads.3 projects/routing/secure/lib/libcrypto/man/ui.3 projects/routing/secure/lib/libcrypto/man/ui_compat.3 projects/routing/secure/lib/libcrypto/man/x509.3 projects/routing/secure/lib/libssl/man/SSL_CIPHER_get_name.3 projects/routing/secure/lib/libssl/man/SSL_COMP_add_compression_method.3 projects/routing/secure/lib/libssl/man/SSL_CTX_add_extra_chain_cert.3 projects/routing/secure/lib/libssl/man/SSL_CTX_add_session.3 projects/routing/secure/lib/libssl/man/SSL_CTX_ctrl.3 projects/routing/secure/lib/libssl/man/SSL_CTX_flush_sessions.3 projects/routing/secure/lib/libssl/man/SSL_CTX_free.3 projects/routing/secure/lib/libssl/man/SSL_CTX_get_ex_new_index.3 projects/routing/secure/lib/libssl/man/SSL_CTX_get_verify_mode.3 projects/routing/secure/lib/libssl/man/SSL_CTX_load_verify_locations.3 projects/routing/secure/lib/libssl/man/SSL_CTX_new.3 projects/routing/secure/lib/libssl/man/SSL_CTX_sess_number.3 projects/routing/secure/lib/libssl/man/SSL_CTX_sess_set_cache_size.3 projects/routing/secure/lib/libssl/man/SSL_CTX_sess_set_get_cb.3 projects/routing/secure/lib/libssl/man/SSL_CTX_sessions.3 projects/routing/secure/lib/libssl/man/SSL_CTX_set_cert_store.3 projects/routing/secure/lib/libssl/man/SSL_CTX_set_cert_verify_callback.3 projects/routing/secure/lib/libssl/man/SSL_CTX_set_cipher_list.3 projects/routing/secure/lib/libssl/man/SSL_CTX_set_client_CA_list.3 projects/routing/secure/lib/libssl/man/SSL_CTX_set_client_cert_cb.3 projects/routing/secure/lib/libssl/man/SSL_CTX_set_default_passwd_cb.3 projects/routing/secure/lib/libssl/man/SSL_CTX_set_generate_session_id.3 projects/routing/secure/lib/libssl/man/SSL_CTX_set_info_callback.3 projects/routing/secure/lib/libssl/man/SSL_CTX_set_max_cert_list.3 projects/routing/secure/lib/libssl/man/SSL_CTX_set_mode.3 projects/routing/secure/lib/libssl/man/SSL_CTX_set_msg_callback.3 projects/routing/secure/lib/libssl/man/SSL_CTX_set_options.3 projects/routing/secure/lib/libssl/man/SSL_CTX_set_psk_client_callback.3 projects/routing/secure/lib/libssl/man/SSL_CTX_set_quiet_shutdown.3 projects/routing/secure/lib/libssl/man/SSL_CTX_set_session_cache_mode.3 projects/routing/secure/lib/libssl/man/SSL_CTX_set_session_id_context.3 projects/routing/secure/lib/libssl/man/SSL_CTX_set_ssl_version.3 projects/routing/secure/lib/libssl/man/SSL_CTX_set_timeout.3 projects/routing/secure/lib/libssl/man/SSL_CTX_set_tlsext_ticket_key_cb.3 projects/routing/secure/lib/libssl/man/SSL_CTX_set_tmp_dh_callback.3 projects/routing/secure/lib/libssl/man/SSL_CTX_set_tmp_rsa_callback.3 projects/routing/secure/lib/libssl/man/SSL_CTX_set_verify.3 projects/routing/secure/lib/libssl/man/SSL_CTX_use_certificate.3 projects/routing/secure/lib/libssl/man/SSL_CTX_use_psk_identity_hint.3 projects/routing/secure/lib/libssl/man/SSL_SESSION_free.3 projects/routing/secure/lib/libssl/man/SSL_SESSION_get_ex_new_index.3 projects/routing/secure/lib/libssl/man/SSL_SESSION_get_time.3 projects/routing/secure/lib/libssl/man/SSL_accept.3 projects/routing/secure/lib/libssl/man/SSL_alert_type_string.3 projects/routing/secure/lib/libssl/man/SSL_clear.3 projects/routing/secure/lib/libssl/man/SSL_connect.3 projects/routing/secure/lib/libssl/man/SSL_do_handshake.3 projects/routing/secure/lib/libssl/man/SSL_free.3 projects/routing/secure/lib/libssl/man/SSL_get_SSL_CTX.3 projects/routing/secure/lib/libssl/man/SSL_get_ciphers.3 projects/routing/secure/lib/libssl/man/SSL_get_client_CA_list.3 projects/routing/secure/lib/libssl/man/SSL_get_current_cipher.3 projects/routing/secure/lib/libssl/man/SSL_get_default_timeout.3 projects/routing/secure/lib/libssl/man/SSL_get_error.3 projects/routing/secure/lib/libssl/man/SSL_get_ex_data_X509_STORE_CTX_idx.3 projects/routing/secure/lib/libssl/man/SSL_get_ex_new_index.3 projects/routing/secure/lib/libssl/man/SSL_get_fd.3 projects/routing/secure/lib/libssl/man/SSL_get_peer_cert_chain.3 projects/routing/secure/lib/libssl/man/SSL_get_peer_certificate.3 projects/routing/secure/lib/libssl/man/SSL_get_psk_identity.3 projects/routing/secure/lib/libssl/man/SSL_get_rbio.3 projects/routing/secure/lib/libssl/man/SSL_get_session.3 projects/routing/secure/lib/libssl/man/SSL_get_verify_result.3 projects/routing/secure/lib/libssl/man/SSL_get_version.3 projects/routing/secure/lib/libssl/man/SSL_library_init.3 projects/routing/secure/lib/libssl/man/SSL_load_client_CA_file.3 projects/routing/secure/lib/libssl/man/SSL_new.3 projects/routing/secure/lib/libssl/man/SSL_pending.3 projects/routing/secure/lib/libssl/man/SSL_read.3 projects/routing/secure/lib/libssl/man/SSL_rstate_string.3 projects/routing/secure/lib/libssl/man/SSL_session_reused.3 projects/routing/secure/lib/libssl/man/SSL_set_bio.3 projects/routing/secure/lib/libssl/man/SSL_set_connect_state.3 projects/routing/secure/lib/libssl/man/SSL_set_fd.3 projects/routing/secure/lib/libssl/man/SSL_set_session.3 projects/routing/secure/lib/libssl/man/SSL_set_shutdown.3 projects/routing/secure/lib/libssl/man/SSL_set_verify_result.3 projects/routing/secure/lib/libssl/man/SSL_shutdown.3 projects/routing/secure/lib/libssl/man/SSL_state_string.3 projects/routing/secure/lib/libssl/man/SSL_want.3 projects/routing/secure/lib/libssl/man/SSL_write.3 projects/routing/secure/lib/libssl/man/d2i_SSL_SESSION.3 projects/routing/secure/lib/libssl/man/ssl.3 projects/routing/secure/usr.bin/openssl/Makefile.man projects/routing/secure/usr.bin/openssl/man/CA.pl.1 projects/routing/secure/usr.bin/openssl/man/asn1parse.1 projects/routing/secure/usr.bin/openssl/man/ca.1 projects/routing/secure/usr.bin/openssl/man/ciphers.1 projects/routing/secure/usr.bin/openssl/man/cms.1 projects/routing/secure/usr.bin/openssl/man/crl.1 projects/routing/secure/usr.bin/openssl/man/crl2pkcs7.1 projects/routing/secure/usr.bin/openssl/man/dgst.1 projects/routing/secure/usr.bin/openssl/man/dhparam.1 projects/routing/secure/usr.bin/openssl/man/dsa.1 projects/routing/secure/usr.bin/openssl/man/dsaparam.1 projects/routing/secure/usr.bin/openssl/man/ec.1 projects/routing/secure/usr.bin/openssl/man/ecparam.1 projects/routing/secure/usr.bin/openssl/man/enc.1 projects/routing/secure/usr.bin/openssl/man/errstr.1 projects/routing/secure/usr.bin/openssl/man/gendsa.1 projects/routing/secure/usr.bin/openssl/man/genpkey.1 projects/routing/secure/usr.bin/openssl/man/genrsa.1 projects/routing/secure/usr.bin/openssl/man/nseq.1 projects/routing/secure/usr.bin/openssl/man/ocsp.1 projects/routing/secure/usr.bin/openssl/man/openssl.1 projects/routing/secure/usr.bin/openssl/man/passwd.1 projects/routing/secure/usr.bin/openssl/man/pkcs12.1 projects/routing/secure/usr.bin/openssl/man/pkcs7.1 projects/routing/secure/usr.bin/openssl/man/pkcs8.1 projects/routing/secure/usr.bin/openssl/man/pkey.1 projects/routing/secure/usr.bin/openssl/man/pkeyparam.1 projects/routing/secure/usr.bin/openssl/man/pkeyutl.1 projects/routing/secure/usr.bin/openssl/man/rand.1 projects/routing/secure/usr.bin/openssl/man/req.1 projects/routing/secure/usr.bin/openssl/man/rsa.1 projects/routing/secure/usr.bin/openssl/man/rsautl.1 projects/routing/secure/usr.bin/openssl/man/s_client.1 projects/routing/secure/usr.bin/openssl/man/s_server.1 projects/routing/secure/usr.bin/openssl/man/s_time.1 projects/routing/secure/usr.bin/openssl/man/sess_id.1 projects/routing/secure/usr.bin/openssl/man/smime.1 projects/routing/secure/usr.bin/openssl/man/speed.1 projects/routing/secure/usr.bin/openssl/man/spkac.1 projects/routing/secure/usr.bin/openssl/man/ts.1 projects/routing/secure/usr.bin/openssl/man/tsget.1 projects/routing/secure/usr.bin/openssl/man/verify.1 projects/routing/secure/usr.bin/openssl/man/version.1 projects/routing/secure/usr.bin/openssl/man/x509.1 projects/routing/secure/usr.bin/openssl/man/x509v3_config.1 projects/routing/share/doc/Makefile projects/routing/share/examples/bhyve/vmrun.sh projects/routing/share/examples/kld/random_adaptor/random_adaptor_example.c (contents, props changed) projects/routing/share/man/man3/pthread_cleanup_pop.3 projects/routing/share/man/man3/pthread_cleanup_push.3 projects/routing/share/man/man4/Makefile projects/routing/share/man/man4/ada.4 projects/routing/share/man/man4/ctl.4 projects/routing/share/man/man4/da.4 projects/routing/share/man/man4/gif.4 projects/routing/share/man/man4/igb.4 projects/routing/share/man/man4/tap.4 projects/routing/share/man/man4/tcp.4 projects/routing/share/man/man4/urtwn.4 projects/routing/share/man/man4/virtio.4 projects/routing/share/man/man4/vt.4 projects/routing/share/man/man5/src.conf.5 projects/routing/share/man/man7/Makefile projects/routing/share/man/man8/Makefile projects/routing/share/man/man8/rc.subr.8 projects/routing/share/man/man9/Makefile projects/routing/share/man/man9/fetch.9 projects/routing/share/man/man9/fpu_kern.9 projects/routing/share/man/man9/hash.9 projects/routing/share/man/man9/lock.9 projects/routing/share/man/man9/mbuf.9 projects/routing/share/man/man9/store.9 projects/routing/share/man/man9/sysctl.9 projects/routing/share/misc/bsd-family-tree projects/routing/share/misc/scsi_modes projects/routing/share/mk/atf.test.mk projects/routing/share/mk/bsd.compiler.mk projects/routing/share/mk/bsd.dep.mk projects/routing/share/mk/bsd.mkopt.mk projects/routing/share/mk/bsd.progs.mk projects/routing/share/mk/bsd.test.mk projects/routing/share/mk/plain.test.mk projects/routing/share/mk/src.libnames.mk projects/routing/share/mk/src.opts.mk projects/routing/share/mk/tap.test.mk projects/routing/sys/amd64/amd64/fpu.c projects/routing/sys/amd64/amd64/genassym.c projects/routing/sys/amd64/amd64/machdep.c projects/routing/sys/amd64/amd64/pmap.c projects/routing/sys/amd64/amd64/support.S projects/routing/sys/amd64/amd64/sys_machdep.c projects/routing/sys/amd64/amd64/uio_machdep.c projects/routing/sys/amd64/amd64/vm_machdep.c projects/routing/sys/amd64/conf/GENERIC projects/routing/sys/amd64/conf/NOTES projects/routing/sys/amd64/ia32/ia32_syscall.c projects/routing/sys/amd64/include/md_var.h projects/routing/sys/amd64/include/pmap.h projects/routing/sys/amd64/include/vmm.h (contents, props changed) projects/routing/sys/amd64/include/vmm_instruction_emul.h (contents, props changed) projects/routing/sys/amd64/include/vmparam.h projects/routing/sys/amd64/include/xen/hypercall.h projects/routing/sys/amd64/vmm/amd/amdv.c projects/routing/sys/amd64/vmm/intel/vmx.c projects/routing/sys/amd64/vmm/intel/vmx_support.S projects/routing/sys/amd64/vmm/io/vatpic.c projects/routing/sys/amd64/vmm/io/vatpic.h projects/routing/sys/amd64/vmm/io/vatpit.c projects/routing/sys/amd64/vmm/io/vatpit.h projects/routing/sys/amd64/vmm/io/vlapic.c projects/routing/sys/amd64/vmm/vmm.c projects/routing/sys/amd64/vmm/vmm_instruction_emul.c projects/routing/sys/amd64/vmm/vmm_ioport.c projects/routing/sys/amd64/vmm/vmm_ioport.h projects/routing/sys/amd64/vmm/x86.c projects/routing/sys/arm/allwinner/a10_gpio.c projects/routing/sys/arm/altera/socfpga/files.socfpga projects/routing/sys/arm/arm/busdma_machdep-v6.c projects/routing/sys/arm/arm/busdma_machdep.c projects/routing/sys/arm/arm/db_trace.c projects/routing/sys/arm/arm/dump_machdep.c projects/routing/sys/arm/arm/locore.S projects/routing/sys/arm/arm/machdep.c projects/routing/sys/arm/arm/nexus.c projects/routing/sys/arm/arm/pl310.c projects/routing/sys/arm/arm/pmap-v6.c projects/routing/sys/arm/at91/std.atmel projects/routing/sys/arm/broadcom/bcm2835/bcm2835_bsc.c projects/routing/sys/arm/broadcom/bcm2835/bcm2835_bscvar.h projects/routing/sys/arm/broadcom/bcm2835/bcm2835_gpio.c projects/routing/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c projects/routing/sys/arm/conf/ATMEL projects/routing/sys/arm/conf/BEAGLEBONE projects/routing/sys/arm/conf/PANDABOARD projects/routing/sys/arm/conf/SOCKIT projects/routing/sys/arm/freescale/imx/imx6_anatop.c projects/routing/sys/arm/freescale/imx/imx6_ccm.c projects/routing/sys/arm/freescale/imx/imx6_machdep.c projects/routing/sys/arm/freescale/imx/imx_gpio.c projects/routing/sys/arm/freescale/imx/imx_gpt.c projects/routing/sys/arm/freescale/vybrid/vf_gpio.c projects/routing/sys/arm/include/asmacros.h projects/routing/sys/arm/include/param.h projects/routing/sys/arm/lpc/lpc_gpio.c projects/routing/sys/arm/rockchip/rk30xx_gpio.c projects/routing/sys/arm/samsung/exynos/exynos5_pad.c projects/routing/sys/arm/ti/am335x/am335x_scm_padconf.c projects/routing/sys/arm/ti/am335x/files.am335x projects/routing/sys/arm/ti/cpsw/if_cpsw.c projects/routing/sys/arm/ti/files.ti projects/routing/sys/arm/ti/omap4/files.omap4 projects/routing/sys/arm/ti/omap4/omap4_scm_padconf.c projects/routing/sys/arm/ti/ti_cpuid.c projects/routing/sys/arm/ti/ti_cpuid.h projects/routing/sys/arm/ti/ti_gpio.c projects/routing/sys/arm/ti/ti_i2c.c projects/routing/sys/arm/ti/ti_scm.h projects/routing/sys/arm/ti/ti_sdhci.c projects/routing/sys/arm/xilinx/zy7_gpio.c projects/routing/sys/arm/xscale/ixp425/avila_gpio.c projects/routing/sys/arm/xscale/ixp425/cambria_gpio.c projects/routing/sys/boot/amd64/boot1.efi/boot1.c projects/routing/sys/boot/arm/uboot/Makefile projects/routing/sys/boot/common/install.c projects/routing/sys/boot/common/load_elf.c projects/routing/sys/boot/fdt/Makefile projects/routing/sys/boot/fdt/dts/arm/am335x.dtsi projects/routing/sys/boot/fdt/dts/arm/socfpga-sockit.dts projects/routing/sys/boot/fdt/fdt_loader_cmd.c projects/routing/sys/boot/i386/gptzfsboot/gptzfsboot.8 projects/routing/sys/boot/powerpc/uboot/Makefile projects/routing/sys/boot/uboot/Makefile projects/routing/sys/boot/uboot/common/metadata.c projects/routing/sys/boot/uboot/lib/Makefile projects/routing/sys/boot/uboot/lib/libuboot.h projects/routing/sys/boot/uboot/lib/module.c projects/routing/sys/cam/ata/ata_da.c projects/routing/sys/cam/ctl/ctl.c projects/routing/sys/cam/ctl/ctl.h projects/routing/sys/cam/ctl/ctl_backend.h projects/routing/sys/cam/ctl/ctl_backend_block.c projects/routing/sys/cam/ctl/ctl_cmd_table.c projects/routing/sys/cam/ctl/ctl_debug.h projects/routing/sys/cam/ctl/ctl_error.c projects/routing/sys/cam/ctl/ctl_error.h projects/routing/sys/cam/ctl/ctl_frontend_iscsi.c projects/routing/sys/cam/ctl/ctl_frontend_iscsi.h projects/routing/sys/cam/ctl/ctl_io.h projects/routing/sys/cam/ctl/ctl_private.h projects/routing/sys/cam/ctl/ctl_scsi_all.c projects/routing/sys/cam/ctl/ctl_util.c projects/routing/sys/cam/ctl/ctl_util.h projects/routing/sys/cam/ctl/scsi_ctl.c projects/routing/sys/cam/scsi/scsi_all.c projects/routing/sys/cam/scsi/scsi_all.h projects/routing/sys/cam/scsi/scsi_da.c projects/routing/sys/cam/scsi/scsi_da.h projects/routing/sys/cam/scsi/scsi_sa.c projects/routing/sys/cddl/compat/opensolaris/kern/opensolaris_lookup.c projects/routing/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c projects/routing/sys/cddl/contrib/opensolaris/uts/common/sys/gfs.h projects/routing/sys/cddl/dev/dtrace/dtrace_sysctl.c projects/routing/sys/cddl/dev/fbt/powerpc/fbt_isa.c projects/routing/sys/compat/freebsd32/freebsd32.h projects/routing/sys/compat/freebsd32/freebsd32_misc.c projects/routing/sys/compat/freebsd32/freebsd32_util.h projects/routing/sys/compat/ndis/kern_ndis.c projects/routing/sys/conf/Makefile.arm projects/routing/sys/conf/NOTES projects/routing/sys/conf/files projects/routing/sys/conf/files.amd64 projects/routing/sys/conf/files.arm projects/routing/sys/conf/files.i386 projects/routing/sys/conf/files.powerpc projects/routing/sys/conf/kmod.mk projects/routing/sys/conf/options projects/routing/sys/conf/options.arm projects/routing/sys/contrib/dev/ath/ath_hal/ar9300/ar9300desc.h projects/routing/sys/contrib/rdma/krping/krping.c projects/routing/sys/ddb/db_access.c projects/routing/sys/ddb/db_break.c projects/routing/sys/ddb/db_command.c projects/routing/sys/ddb/db_examine.c projects/routing/sys/ddb/db_input.c projects/routing/sys/ddb/db_lex.c projects/routing/sys/ddb/db_output.c projects/routing/sys/ddb/db_output.h projects/routing/sys/ddb/db_print.c projects/routing/sys/ddb/db_ps.c projects/routing/sys/ddb/db_run.c projects/routing/sys/ddb/db_sym.c projects/routing/sys/ddb/db_sym.h projects/routing/sys/ddb/db_textdump.c projects/routing/sys/ddb/db_variables.h projects/routing/sys/ddb/db_watch.c projects/routing/sys/ddb/db_watch.h projects/routing/sys/ddb/db_write_cmd.c projects/routing/sys/dev/acpi_support/acpi_asus.c projects/routing/sys/dev/acpi_support/acpi_asus_wmi.c projects/routing/sys/dev/acpi_support/acpi_hp.c projects/routing/sys/dev/acpi_support/acpi_ibm.c projects/routing/sys/dev/acpi_support/acpi_rapidstart.c projects/routing/sys/dev/acpi_support/acpi_sony.c projects/routing/sys/dev/acpica/acpi.c projects/routing/sys/dev/acpica/acpi_hpet.c projects/routing/sys/dev/agp/agp.c projects/routing/sys/dev/agp/agp_amd.c projects/routing/sys/dev/agp/agp_amd64.c projects/routing/sys/dev/agp/agp_apple.c projects/routing/sys/dev/agp/agp_ati.c projects/routing/sys/dev/agp/agp_i810.c projects/routing/sys/dev/agp/agppriv.h projects/routing/sys/dev/agp/agpvar.h projects/routing/sys/dev/alc/if_alc.c projects/routing/sys/dev/amdtemp/amdtemp.c projects/routing/sys/dev/asmc/asmc.c projects/routing/sys/dev/ata/ata-pci.h projects/routing/sys/dev/ata/chipsets/ata-jmicron.c projects/routing/sys/dev/bxe/bxe.c projects/routing/sys/dev/cfe/cfe_env.c projects/routing/sys/dev/cfi/cfi_core.c projects/routing/sys/dev/cxgb/common/cxgb_ael1002.c projects/routing/sys/dev/cxgb/cxgb_sge.c projects/routing/sys/dev/cxgbe/firmware/t4fw_cfg.txt projects/routing/sys/dev/cxgbe/firmware/t5fw_cfg.txt projects/routing/sys/dev/cxgbe/iw_cxgbe/cm.c projects/routing/sys/dev/cxgbe/iw_cxgbe/iw_cxgbe.h projects/routing/sys/dev/cxgbe/iw_cxgbe/qp.c projects/routing/sys/dev/cxgbe/t4_main.c projects/routing/sys/dev/cxgbe/tom/t4_cpl_io.c projects/routing/sys/dev/drm2/drm_agpsupport.c projects/routing/sys/dev/drm2/drm_crtc_helper.c projects/routing/sys/dev/drm2/drm_edid.c projects/routing/sys/dev/drm2/drm_fb_helper.c projects/routing/sys/dev/drm2/drm_fb_helper.h projects/routing/sys/dev/drm2/radeon/radeon.h projects/routing/sys/dev/drm2/radeon/radeon_connectors.c projects/routing/sys/dev/drm2/radeon/radeon_device.c projects/routing/sys/dev/drm2/radeon/radeon_ttm.c projects/routing/sys/dev/drm2/ttm/ttm_agp_backend.c projects/routing/sys/dev/drm2/ttm/ttm_bo_driver.h projects/routing/sys/dev/drm2/ttm/ttm_bo_util.c projects/routing/sys/dev/drm2/ttm/ttm_page_alloc.c projects/routing/sys/dev/e1000/if_em.c projects/routing/sys/dev/e1000/if_igb.c projects/routing/sys/dev/e1000/if_lem.c projects/routing/sys/dev/fdt/simplebus.c projects/routing/sys/dev/glxsb/glxsb.c projects/routing/sys/dev/gpio/gpiobus.c projects/routing/sys/dev/gpio/gpiobus_if.m projects/routing/sys/dev/gpio/gpiobusvar.h projects/routing/sys/dev/gpio/gpioiic.c projects/routing/sys/dev/gpio/gpioled.c projects/routing/sys/dev/gpio/ofw_gpiobus.c projects/routing/sys/dev/hatm/if_hatm.c projects/routing/sys/dev/hwpmc/hwpmc_mod.c projects/routing/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c projects/routing/sys/dev/hyperv/stordisengage/hv_ata_pci_disengage.c projects/routing/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c projects/routing/sys/dev/hyperv/utilities/hv_util.c projects/routing/sys/dev/iicbus/iicbus.h projects/routing/sys/dev/iicbus/iiconf.c projects/routing/sys/dev/iicbus/max6690.c projects/routing/sys/dev/iscsi/icl.c projects/routing/sys/dev/iscsi/icl.h projects/routing/sys/dev/iscsi/iscsi.c projects/routing/sys/dev/isp/ispmbox.h projects/routing/sys/dev/ixgbe/ixgbe.c projects/routing/sys/dev/ixgbe/ixv.c projects/routing/sys/dev/ixl/if_ixl.c projects/routing/sys/dev/mii/brgphy.c projects/routing/sys/dev/mii/miidevs projects/routing/sys/dev/mmc/mmcsd.c projects/routing/sys/dev/mpr/mpr.c projects/routing/sys/dev/mps/mps.c projects/routing/sys/dev/mrsas/mrsas.c projects/routing/sys/dev/mrsas/mrsas.h projects/routing/sys/dev/mrsas/mrsas_cam.c projects/routing/sys/dev/mrsas/mrsas_fp.c projects/routing/sys/dev/mse/mse.c projects/routing/sys/dev/mse/mse_cbus.c projects/routing/sys/dev/mse/mse_isa.c projects/routing/sys/dev/mse/msevar.h projects/routing/sys/dev/msk/if_msk.c projects/routing/sys/dev/mxge/if_mxge.c projects/routing/sys/dev/nfe/if_nfe.c projects/routing/sys/dev/nvram2env/nvram2env.c projects/routing/sys/dev/oce/oce_sysctl.c projects/routing/sys/dev/patm/if_patm_attach.c projects/routing/sys/dev/pci/pci.c projects/routing/sys/dev/pci/pci_pci.c projects/routing/sys/dev/puc/pucdata.c projects/routing/sys/dev/qlxgb/qla_os.c projects/routing/sys/dev/qlxgbe/ql_os.c projects/routing/sys/dev/random/dummy_rng.c projects/routing/sys/dev/random/hash.c projects/routing/sys/dev/random/hash.h projects/routing/sys/dev/random/ivy.c projects/routing/sys/dev/random/live_entropy_sources.c projects/routing/sys/dev/random/live_entropy_sources.h projects/routing/sys/dev/random/nehemiah.c projects/routing/sys/dev/random/random_adaptors.c projects/routing/sys/dev/random/random_adaptors.h projects/routing/sys/dev/random/random_harvestq.c projects/routing/sys/dev/random/random_harvestq.h projects/routing/sys/dev/random/randomdev.c projects/routing/sys/dev/random/randomdev.h projects/routing/sys/dev/random/randomdev_soft.c projects/routing/sys/dev/random/randomdev_soft.h projects/routing/sys/dev/random/yarrow.c projects/routing/sys/dev/random/yarrow.h projects/routing/sys/dev/re/if_re.c projects/routing/sys/dev/rt/if_rt.c projects/routing/sys/dev/safe/safe.c projects/routing/sys/dev/sdhci/sdhci_pci.c projects/routing/sys/dev/sk/if_sk.c projects/routing/sys/dev/sound/isa/gusc.c projects/routing/sys/dev/sound/isa/sb16.c projects/routing/sys/dev/sound/isa/sbc.c projects/routing/sys/dev/sound/midi/sequencer.c projects/routing/sys/dev/sound/pci/als4000.c projects/routing/sys/dev/sound/pci/cs4281.c projects/routing/sys/dev/sound/pci/csa.c projects/routing/sys/dev/sound/pci/emu10kx.c projects/routing/sys/dev/sound/pci/envy24.c projects/routing/sys/dev/sound/pci/envy24ht.c projects/routing/sys/dev/sound/pci/hda/hdaa.c projects/routing/sys/dev/sound/pci/maestro.c projects/routing/sys/dev/sound/pci/vibes.c projects/routing/sys/dev/sound/pcm/dsp.c projects/routing/sys/dev/sound/pcm/mixer.c projects/routing/sys/dev/sound/pcm/sound.c projects/routing/sys/dev/sound/pcm/sound.h projects/routing/sys/dev/uart/uart_dev_imx.c projects/routing/sys/dev/uart/uart_subr.c projects/routing/sys/dev/usb/controller/ehci_pci.c projects/routing/sys/dev/usb/controller/xhci_pci.c projects/routing/sys/dev/usb/net/if_smsc.c projects/routing/sys/dev/usb/serial/u3g.c projects/routing/sys/dev/usb/serial/uftdi.c projects/routing/sys/dev/usb/usb.h projects/routing/sys/dev/usb/usb_hub.c projects/routing/sys/dev/usb/usbdevs projects/routing/sys/dev/usb/wlan/if_run.c projects/routing/sys/dev/usb/wlan/if_urtwn.c projects/routing/sys/dev/vt/vt_buf.c projects/routing/sys/dev/vt/vt_core.c projects/routing/sys/dev/vxge/vxge.c projects/routing/sys/dev/xen/netback/netback.c projects/routing/sys/dev/xen/netfront/netfront.c projects/routing/sys/fs/autofs/autofs.c projects/routing/sys/fs/autofs/autofs.h projects/routing/sys/fs/autofs/autofs_ioctl.h projects/routing/sys/fs/deadfs/dead_vnops.c projects/routing/sys/fs/devfs/devfs_devs.c projects/routing/sys/fs/devfs/devfs_vnops.c projects/routing/sys/fs/ext2fs/ext2_vnops.c projects/routing/sys/fs/fuse/fuse_main.c projects/routing/sys/fs/fuse/fuse_vfsops.c projects/routing/sys/fs/msdosfs/msdosfs_vnops.c projects/routing/sys/fs/nfsclient/nfs_clvfsops.c projects/routing/sys/fs/nfsserver/nfs_nfsdkrpc.c projects/routing/sys/fs/nfsserver/nfs_nfsdsubs.c projects/routing/sys/fs/nullfs/null_vfsops.c projects/routing/sys/fs/tmpfs/tmpfs_vfsops.c projects/routing/sys/fs/unionfs/union_vfsops.c projects/routing/sys/geom/eli/g_eli.c projects/routing/sys/geom/geom_dev.c projects/routing/sys/geom/geom_disk.c projects/routing/sys/geom/geom_dump.c projects/routing/sys/geom/geom_kern.c projects/routing/sys/geom/raid/g_raid.c projects/routing/sys/geom/sched/g_sched.c projects/routing/sys/i386/conf/GENERIC projects/routing/sys/i386/conf/NOTES projects/routing/sys/i386/conf/XEN projects/routing/sys/i386/i386/bios.c projects/routing/sys/i386/i386/genassym.c projects/routing/sys/i386/i386/initcpu.c projects/routing/sys/i386/i386/locore.s projects/routing/sys/i386/i386/machdep.c projects/routing/sys/i386/i386/mp_machdep.c projects/routing/sys/i386/i386/pmap.c projects/routing/sys/i386/i386/ptrace_machdep.c projects/routing/sys/i386/i386/support.s projects/routing/sys/i386/i386/sys_machdep.c projects/routing/sys/i386/i386/trap.c projects/routing/sys/i386/i386/vm86bios.s projects/routing/sys/i386/i386/vm_machdep.c projects/routing/sys/i386/ibcs2/ibcs2_misc.c projects/routing/sys/i386/include/cpufunc.h projects/routing/sys/i386/include/md_var.h projects/routing/sys/i386/include/npx.h projects/routing/sys/i386/include/pcb.h projects/routing/sys/i386/include/xen/hypercall.h projects/routing/sys/i386/isa/npx.c projects/routing/sys/i386/linux/linux_ptrace.c projects/routing/sys/i386/linux/linux_sysvec.c projects/routing/sys/i386/svr4/svr4_machdep.c projects/routing/sys/i386/xen/mp_machdep.c projects/routing/sys/i386/xen/xen_machdep.c projects/routing/sys/kern/init_main.c projects/routing/sys/kern/kern_cons.c projects/routing/sys/kern/kern_cpuset.c projects/routing/sys/kern/kern_descrip.c projects/routing/sys/kern/kern_environment.c projects/routing/sys/kern/kern_exec.c projects/routing/sys/kern/kern_ffclock.c projects/routing/sys/kern/kern_intr.c projects/routing/sys/kern/kern_linker.c projects/routing/sys/kern/kern_lock.c projects/routing/sys/kern/kern_loginclass.c projects/routing/sys/kern/kern_mib.c projects/routing/sys/kern/kern_mutex.c projects/routing/sys/kern/kern_proc.c projects/routing/sys/kern/kern_prot.c projects/routing/sys/kern/kern_resource.c projects/routing/sys/kern/kern_rwlock.c projects/routing/sys/kern/kern_sx.c projects/routing/sys/kern/kern_synch.c projects/routing/sys/kern/kern_syscalls.c projects/routing/sys/kern/kern_sysctl.c projects/routing/sys/kern/kern_thr.c projects/routing/sys/kern/kern_umtx.c projects/routing/sys/kern/link_elf.c projects/routing/sys/kern/link_elf_obj.c projects/routing/sys/kern/sched_ule.c projects/routing/sys/kern/subr_bus.c projects/routing/sys/kern/subr_devstat.c projects/routing/sys/kern/subr_hints.c projects/routing/sys/kern/subr_kdb.c projects/routing/sys/kern/subr_param.c projects/routing/sys/kern/subr_prof.c projects/routing/sys/kern/subr_terminal.c projects/routing/sys/kern/subr_uio.c projects/routing/sys/kern/subr_witness.c projects/routing/sys/kern/sys_generic.c projects/routing/sys/kern/sys_pipe.c projects/routing/sys/kern/sys_process.c projects/routing/sys/kern/sysv_msg.c projects/routing/sys/kern/sysv_sem.c projects/routing/sys/kern/sysv_shm.c projects/routing/sys/kern/tty_pts.c projects/routing/sys/kern/uipc_mqueue.c projects/routing/sys/kern/uipc_sem.c projects/routing/sys/kern/vfs_acl.c projects/routing/sys/kern/vfs_aio.c projects/routing/sys/kern/vfs_cache.c projects/routing/sys/kern/vfs_init.c projects/routing/sys/kern/vfs_lookup.c projects/routing/sys/kern/vfs_mountroot.c projects/routing/sys/kern/vfs_subr.c projects/routing/sys/kern/vfs_syscalls.c projects/routing/sys/kern/vfs_vnops.c projects/routing/sys/kgssapi/gss_impl.c projects/routing/sys/libkern/explicit_bzero.c projects/routing/sys/libkern/murmur3_32.c projects/routing/sys/mips/atheros/ar71xx_gpio.c projects/routing/sys/mips/atheros/ar71xx_machdep.c projects/routing/sys/mips/beri/beri_machdep.c projects/routing/sys/mips/cavium/octeon_gpio.c projects/routing/sys/mips/conf/PICOSTATION_M2HP.hints projects/routing/sys/mips/include/param.h projects/routing/sys/mips/mips/busdma_machdep.c projects/routing/sys/mips/nlm/xlp_machdep.c projects/routing/sys/mips/rmi/xlr_machdep.c projects/routing/sys/mips/rt305x/rt305x_gpio.c projects/routing/sys/mips/rt305x/rt305x_machdep.c projects/routing/sys/modules/Makefile projects/routing/sys/modules/drm2/drm2/Makefile projects/routing/sys/modules/dtrace/dtraceall/dtraceall.c projects/routing/sys/modules/if_gif/Makefile projects/routing/sys/modules/linux/Makefile projects/routing/sys/modules/qlxgb/Makefile projects/routing/sys/modules/qlxgbe/Makefile projects/routing/sys/modules/qlxge/Makefile projects/routing/sys/modules/random/Makefile projects/routing/sys/modules/virtio/Makefile projects/routing/sys/modules/vmm/Makefile projects/routing/sys/net/bpf.c projects/routing/sys/net/if.c projects/routing/sys/net/if_ethersubr.c projects/routing/sys/net/if_gif.c projects/routing/sys/net/if_gif.h projects/routing/sys/net/if_lagg.c projects/routing/sys/net/if_spppsubr.c projects/routing/sys/net/if_stf.c projects/routing/sys/net/if_tun.c projects/routing/sys/net/if_var.h projects/routing/sys/net/radix.c projects/routing/sys/net80211/ieee80211_ht.c projects/routing/sys/net80211/ieee80211_hwmp.c projects/routing/sys/net80211/ieee80211_mesh.c projects/routing/sys/net80211/ieee80211_superg.c projects/routing/sys/netgraph/bluetooth/common/ng_bluetooth.c projects/routing/sys/netgraph/ng_base.c projects/routing/sys/netgraph/ng_bridge.c projects/routing/sys/netgraph/ng_frame_relay.c projects/routing/sys/netgraph/ng_iface.c projects/routing/sys/netgraph/ng_socket.c projects/routing/sys/netinet/cc/cc.c projects/routing/sys/netinet/cc/cc_chd.c projects/routing/sys/netinet/igmp.c projects/routing/sys/netinet/in_gif.c projects/routing/sys/netinet/in_gif.h projects/routing/sys/netinet/ip_fw.h projects/routing/sys/netinet/ip_mroute.c projects/routing/sys/netinet/ip_output.c projects/routing/sys/netinet/sctp_header.h projects/routing/sys/netinet/sctp_input.c projects/routing/sys/netinet/sctp_input.h projects/routing/sys/netinet/sctp_output.c projects/routing/sys/netinet/sctp_syscalls.c projects/routing/sys/netinet/sctp_sysctl.c projects/routing/sys/netinet/siftr.c projects/routing/sys/netinet/tcp_output.c projects/routing/sys/netinet/tcp_syncache.c projects/routing/sys/netinet/tcp_timer.c projects/routing/sys/netinet/tcp_timer.h projects/routing/sys/netinet/tcp_timewait.c projects/routing/sys/netinet/tcp_usrreq.c projects/routing/sys/netinet/tcp_var.h projects/routing/sys/netinet6/icmp6.c projects/routing/sys/netinet6/in6.c projects/routing/sys/netinet6/in6_gif.c projects/routing/sys/netinet6/in6_gif.h projects/routing/sys/netinet6/in6_ifattach.c projects/routing/sys/netinet6/in6_mcast.c projects/routing/sys/netinet6/in6_var.h projects/routing/sys/netinet6/ip6_mroute.c projects/routing/sys/netinet6/ip6_output.c projects/routing/sys/netipsec/ipsec.h projects/routing/sys/netipsec/key.c projects/routing/sys/netipsec/key.h projects/routing/sys/netpfil/ipfw/ip_dn_io.c projects/routing/sys/netpfil/ipfw/ip_fw_dynamic.c projects/routing/sys/netpfil/ipfw/ip_fw_private.h projects/routing/sys/netpfil/ipfw/ip_fw_sockopt.c projects/routing/sys/netpfil/ipfw/ip_fw_table.c projects/routing/sys/netpfil/ipfw/ip_fw_table_algo.c projects/routing/sys/netpfil/pf/pf.c projects/routing/sys/nfs/bootp_subr.c projects/routing/sys/nfs/nfs_diskless.c projects/routing/sys/nfs/nfs_nfssvc.c projects/routing/sys/nfsclient/nfs_vfsops.c projects/routing/sys/nlm/nlm_prot_impl.c projects/routing/sys/ofed/drivers/infiniband/core/addr.c projects/routing/sys/ofed/drivers/infiniband/core/agent.c projects/routing/sys/ofed/drivers/infiniband/core/ucm.c projects/routing/sys/ofed/drivers/infiniband/core/uverbs_main.c projects/routing/sys/ofed/drivers/infiniband/hw/mlx4/ah.c projects/routing/sys/ofed/drivers/infiniband/hw/mthca/mthca_config_reg.h projects/routing/sys/ofed/drivers/infiniband/hw/mthca/mthca_memfree.c projects/routing/sys/ofed/drivers/infiniband/hw/mthca/mthca_uar.c projects/routing/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_ethtool.c projects/routing/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_verbs.c projects/routing/sys/ofed/drivers/net/mlx4/Makefile projects/routing/sys/ofed/drivers/net/mlx4/en_ethtool.c projects/routing/sys/ofed/drivers/net/mlx4/en_netdev.c projects/routing/sys/ofed/drivers/net/mlx4/en_selftest.c projects/routing/sys/ofed/drivers/net/mlx4/en_tx.c projects/routing/sys/ofed/drivers/net/mlx4/mcg.c projects/routing/sys/ofed/drivers/net/mlx4/mlx4_en.h projects/routing/sys/ofed/drivers/net/mlx4/pd.c projects/routing/sys/ofed/include/linux/completion.h projects/routing/sys/ofed/include/linux/etherdevice.h projects/routing/sys/ofed/include/linux/linux_compat.c projects/routing/sys/ofed/include/linux/mlx4/device.h projects/routing/sys/ofed/include/linux/mlx4/driver.h projects/routing/sys/ofed/include/linux/netdevice.h projects/routing/sys/ofed/include/linux/scatterlist.h projects/routing/sys/ofed/include/linux/vmalloc.h projects/routing/sys/ofed/include/rdma/ib_addr.h projects/routing/sys/ofed/include/rdma/ib_smi.h projects/routing/sys/ofed/include/rdma/ib_user_cm.h projects/routing/sys/pc98/conf/GENERIC projects/routing/sys/powerpc/aim/machdep.c projects/routing/sys/powerpc/conf/GENERIC projects/routing/sys/powerpc/conf/GENERIC64 projects/routing/sys/powerpc/conf/NOTES projects/routing/sys/powerpc/powermac/fcu.c projects/routing/sys/powerpc/powermac/pmu.c projects/routing/sys/powerpc/powermac/smu.c projects/routing/sys/powerpc/powerpc/busdma_machdep.c projects/routing/sys/powerpc/powerpc/copyinout.c projects/routing/sys/powerpc/powerpc/cpu.c projects/routing/sys/powerpc/wii/wii_gpio.c projects/routing/sys/sparc64/conf/GENERIC projects/routing/sys/sparc64/include/param.h projects/routing/sys/sparc64/sparc64/machdep.c projects/routing/sys/sparc64/sparc64/mem.c projects/routing/sys/sys/_umtx.h projects/routing/sys/sys/ata.h projects/routing/sys/sys/bitset.h projects/routing/sys/sys/buf_ring.h projects/routing/sys/sys/consio.h projects/routing/sys/sys/cpuset.h projects/routing/sys/sys/elf_common.h projects/routing/sys/sys/filedesc.h projects/routing/sys/sys/hash.h projects/routing/sys/sys/linker.h projects/routing/sys/sys/lockmgr.h projects/routing/sys/sys/mbuf.h projects/routing/sys/sys/mman.h projects/routing/sys/sys/mount.h projects/routing/sys/sys/param.h projects/routing/sys/sys/priv.h projects/routing/sys/sys/proc.h projects/routing/sys/sys/random.h projects/routing/sys/sys/seq.h projects/routing/sys/sys/syscallsubr.h projects/routing/sys/sys/sysctl.h projects/routing/sys/sys/sysent.h projects/routing/sys/sys/systm.h projects/routing/sys/sys/terminal.h projects/routing/sys/sys/umtx.h projects/routing/sys/sys/user.h projects/routing/sys/sys/vnode.h projects/routing/sys/ufs/ffs/ffs_softdep.c projects/routing/sys/ufs/ffs/ffs_vfsops.c projects/routing/sys/ufs/ffs/ffs_vnops.c projects/routing/sys/ufs/ufs/ufs_quota.c projects/routing/sys/vm/memguard.c projects/routing/sys/vm/uma_core.c projects/routing/sys/vm/vm_kern.c projects/routing/sys/vm/vm_mmap.c projects/routing/sys/vm/vm_page.c projects/routing/sys/x86/acpica/acpi_wakeup.c projects/routing/sys/x86/include/specialreg.h projects/routing/sys/x86/iommu/busdma_dmar.c projects/routing/sys/x86/isa/orm.c projects/routing/sys/x86/x86/busdma_bounce.c projects/routing/sys/x86/x86/identcpu.c projects/routing/sys/x86/x86/tsc.c projects/routing/sys/x86/xen/hvm.c projects/routing/sys/x86/xen/pv.c projects/routing/sys/x86/xen/xen_intr.c projects/routing/sys/xen/interface/memory.h projects/routing/sys/xen/interface/xen.h projects/routing/sys/xen/xen_intr.h projects/routing/tests/sys/Makefile projects/routing/tools/build/mk/OptionalObsoleteFiles.inc projects/routing/tools/build/options/WITHOUT_CLANG_BOOTSTRAP projects/routing/tools/build/options/WITHOUT_GCC_BOOTSTRAP projects/routing/tools/build/options/WITHOUT_GNU_GREP_COMPAT projects/routing/tools/build/options/WITHOUT_TOOLCHAIN projects/routing/tools/regression/lib/libc/nss/test-gethostby.c projects/routing/tools/regression/zfs/misc.sh projects/routing/tools/regression/zfs/zpool/add/files.t projects/routing/tools/regression/zfs/zpool/add/option-f_size_mismatch.t projects/routing/tools/regression/zfs/zpool/add/option-f_type_mismatch.t projects/routing/tools/regression/zfs/zpool/create/files.t projects/routing/tools/sched/schedgraph.py projects/routing/tools/tools/cxgbetool/cxgbetool.c projects/routing/tools/tools/netmap/pkt-gen.c projects/routing/usr.bin/Makefile projects/routing/usr.bin/bluetooth/rfcomm_sppd/Makefile projects/routing/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.1 projects/routing/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.c projects/routing/usr.bin/col/col.c projects/routing/usr.bin/gzip/Makefile projects/routing/usr.bin/gzip/gzip.1 projects/routing/usr.bin/gzip/gzip.c projects/routing/usr.bin/gzip/zmore projects/routing/usr.bin/gzip/zmore.1 projects/routing/usr.bin/hexdump/hexdump.1 projects/routing/usr.bin/iscsictl/Makefile projects/routing/usr.bin/iscsictl/iscsictl.c projects/routing/usr.bin/iscsictl/token.l projects/routing/usr.bin/kdump/kdump.c projects/routing/usr.bin/kdump/mksubr projects/routing/usr.bin/timeout/Makefile projects/routing/usr.bin/timeout/timeout.1 projects/routing/usr.bin/timeout/timeout.c projects/routing/usr.bin/top/machine.c projects/routing/usr.bin/truss/syscall.h projects/routing/usr.bin/truss/syscalls.c projects/routing/usr.bin/vmstat/vmstat.c projects/routing/usr.sbin/Makefile.i386 projects/routing/usr.sbin/autofs/automountd.c projects/routing/usr.sbin/autofs/common.c projects/routing/usr.sbin/autofs/common.h projects/routing/usr.sbin/autofs/token.l projects/routing/usr.sbin/bhyve/Makefile projects/routing/usr.sbin/bhyve/bhyverun.c projects/routing/usr.sbin/bhyve/block_if.c projects/routing/usr.sbin/bhyve/pci_ahci.c projects/routing/usr.sbin/bhyve/rtc.c projects/routing/usr.sbin/bhyve/xmsr.c projects/routing/usr.sbin/bhyvectl/bhyvectl.c projects/routing/usr.sbin/bsdconfig/Makefile projects/routing/usr.sbin/bsdconfig/console/Makefile projects/routing/usr.sbin/bsdconfig/console/include/Makefile projects/routing/usr.sbin/bsdconfig/diskmgmt/Makefile projects/routing/usr.sbin/bsdconfig/diskmgmt/include/Makefile projects/routing/usr.sbin/bsdconfig/docsinstall/Makefile projects/routing/usr.sbin/bsdconfig/docsinstall/include/Makefile projects/routing/usr.sbin/bsdconfig/dot/Makefile projects/routing/usr.sbin/bsdconfig/dot/include/Makefile projects/routing/usr.sbin/bsdconfig/examples/Makefile projects/routing/usr.sbin/bsdconfig/include/Makefile projects/routing/usr.sbin/bsdconfig/includes/Makefile projects/routing/usr.sbin/bsdconfig/includes/include/Makefile projects/routing/usr.sbin/bsdconfig/includes/includes projects/routing/usr.sbin/bsdconfig/mouse/Makefile projects/routing/usr.sbin/bsdconfig/mouse/include/Makefile projects/routing/usr.sbin/bsdconfig/networking/Makefile projects/routing/usr.sbin/bsdconfig/networking/include/Makefile projects/routing/usr.sbin/bsdconfig/networking/share/Makefile projects/routing/usr.sbin/bsdconfig/packages/Makefile projects/routing/usr.sbin/bsdconfig/packages/include/Makefile projects/routing/usr.sbin/bsdconfig/password/Makefile projects/routing/usr.sbin/bsdconfig/password/include/Makefile projects/routing/usr.sbin/bsdconfig/password/share/Makefile projects/routing/usr.sbin/bsdconfig/security/Makefile projects/routing/usr.sbin/bsdconfig/security/include/Makefile projects/routing/usr.sbin/bsdconfig/share/Makefile projects/routing/usr.sbin/bsdconfig/share/device.subr projects/routing/usr.sbin/bsdconfig/share/media/Makefile projects/routing/usr.sbin/bsdconfig/share/packages/Makefile projects/routing/usr.sbin/bsdconfig/share/packages/index.subr projects/routing/usr.sbin/bsdconfig/startup/Makefile projects/routing/usr.sbin/bsdconfig/startup/include/Makefile projects/routing/usr.sbin/bsdconfig/startup/share/Makefile projects/routing/usr.sbin/bsdconfig/timezone/Makefile projects/routing/usr.sbin/bsdconfig/timezone/include/Makefile projects/routing/usr.sbin/bsdconfig/timezone/share/Makefile projects/routing/usr.sbin/bsdconfig/ttys/Makefile projects/routing/usr.sbin/bsdconfig/ttys/include/Makefile projects/routing/usr.sbin/bsdconfig/usermgmt/Makefile projects/routing/usr.sbin/bsdconfig/usermgmt/include/Makefile projects/routing/usr.sbin/bsdconfig/usermgmt/share/Makefile projects/routing/usr.sbin/bsdinstall/bsdinstall.8 projects/routing/usr.sbin/bsdinstall/partedit/partedit_x86.c projects/routing/usr.sbin/ctladm/Makefile projects/routing/usr.sbin/ctladm/ctladm.8 projects/routing/usr.sbin/ctladm/ctladm.c projects/routing/usr.sbin/ctld/Makefile projects/routing/usr.sbin/ctld/ctl.conf.5 projects/routing/usr.sbin/ctld/ctld.c projects/routing/usr.sbin/ctld/ctld.h projects/routing/usr.sbin/ctld/discovery.c projects/routing/usr.sbin/ctld/kernel.c projects/routing/usr.sbin/ctld/keys.c projects/routing/usr.sbin/ctld/login.c projects/routing/usr.sbin/ctld/parse.y projects/routing/usr.sbin/ctld/token.l projects/routing/usr.sbin/etcupdate/etcupdate.8 projects/routing/usr.sbin/ftp-proxy/Makefile projects/routing/usr.sbin/iscsid/Makefile projects/routing/usr.sbin/iscsid/iscsid.h projects/routing/usr.sbin/iscsid/keys.c projects/routing/usr.sbin/iscsid/login.c projects/routing/usr.sbin/pciconf/pciconf.c projects/routing/usr.sbin/pkg/Makefile projects/routing/usr.sbin/pkg/config.c projects/routing/usr.sbin/pmcstat/pmcstat.8 projects/routing/usr.sbin/pstat/pstat.8 projects/routing/usr.sbin/pw/pw_group.c projects/routing/usr.sbin/pw/pw_user.c projects/routing/usr.sbin/pw/tests/Makefile projects/routing/usr.sbin/pw/tests/pw_delete.sh projects/routing/usr.sbin/pw/tests/pw_modify.sh projects/routing/usr.sbin/rtadvd/advcap.c projects/routing/usr.sbin/rtadvd/config.c projects/routing/usr.sbin/rtsold/rtsol.c projects/routing/usr.sbin/sysrc/sysrc projects/routing/usr.sbin/sysrc/sysrc.8 projects/routing/usr.sbin/vidcontrol/vidcontrol.1 projects/routing/usr.sbin/vidcontrol/vidcontrol.c projects/routing/usr.sbin/watchdogd/watchdog.8 projects/routing/usr.sbin/watchdogd/watchdogd.8 Directory Properties: projects/routing/ (props changed) projects/routing/cddl/ (props changed) projects/routing/cddl/contrib/opensolaris/ (props changed) projects/routing/contrib/atf/ (props changed) projects/routing/contrib/file/ (props changed) projects/routing/contrib/libc++/ (props changed) projects/routing/contrib/libcxxrt/ (props changed) projects/routing/contrib/mtree/ (props changed) projects/routing/contrib/netcat/ (props changed) projects/routing/contrib/openpam/ (props changed) projects/routing/contrib/tzdata/ (props changed) projects/routing/contrib/xz/ (props changed) projects/routing/crypto/openssl/ (props changed) projects/routing/etc/ (props changed) projects/routing/include/ (props changed) projects/routing/lib/libc/ (props changed) projects/routing/lib/libutil/ (props changed) projects/routing/lib/libz/ (props changed) projects/routing/sbin/ (props changed) projects/routing/sbin/ipfw/ (props changed) projects/routing/share/ (props changed) projects/routing/share/man/man4/ (props changed) projects/routing/sys/ (props changed) projects/routing/sys/amd64/include/xen/ (props changed) projects/routing/sys/amd64/vmm/ (props changed) projects/routing/sys/boot/ (props changed) projects/routing/sys/cddl/contrib/opensolaris/ (props changed) projects/routing/sys/conf/ (props changed) projects/routing/sys/dev/hyperv/ (props changed) projects/routing/sys/modules/vmm/ (props changed) projects/routing/usr.sbin/bhyve/ (props changed) projects/routing/usr.sbin/bhyvectl/ (props changed) projects/routing/usr.sbin/rtadvd/ (props changed) projects/routing/usr.sbin/rtsold/ (props changed) Modified: projects/routing/MAINTAINERS ============================================================================== --- projects/routing/MAINTAINERS Tue Nov 4 17:28:13 2014 (r274096) +++ projects/routing/MAINTAINERS Tue Nov 4 18:22:33 2014 (r274097) @@ -78,7 +78,6 @@ inetd dwmalone Recommends pre-commit re contrib/smbfs bp Open for in-tree committs. In case of functional changes pre-commit review requested. contrib/pf glebius Pre-commit review recommended. -binutils obrien Insists on BU blocked from unapproved commits file obrien Insists to keep file blocked from other's unapproved commits contrib/bzip2 obrien Pre-commit review required. Modified: projects/routing/Makefile.inc1 ============================================================================== --- projects/routing/Makefile.inc1 Tue Nov 4 17:28:13 2014 (r274096) +++ projects/routing/Makefile.inc1 Tue Nov 4 18:22:33 2014 (r274097) @@ -323,8 +323,9 @@ X${BINUTIL}?= ${CROSS_BINUTILS_PREFIX}${ X${BINUTIL}?= ${${BINUTIL}} .endif .endfor -WMAKEENV+= CC="${XCC} ${XFLAGS}" CXX="${XCXX} ${XFLAGS}" \ - CPP="${XCPP} ${XFLAGS}" \ +WMAKEENV+= CC="${XCC} ${XCFLAGS}" CXX="${XCXX} ${XCFLAGS} ${XCXXFLAGS}" \ + DEPFLAGS="${DEPFLAGS}" \ + CPP="${XCPP} ${XCFLAGS}" \ AS="${XAS}" AR="${XAR}" LD="${XLD}" NM=${XNM} \ OBJDUMP=${XOBJDUMP} OBJCOPY="${XOBJCOPY}" \ RANLIB=${XRANLIB} STRINGS=${XSTRINGS} \ @@ -350,11 +351,13 @@ TARGET_ABI= gnueabi .endif .endif .if defined(X_COMPILER_TYPE) && ${X_COMPILER_TYPE} == gcc -XFLAGS+= -isystem ${WORLDTMP}/usr/include -L${WORLDTMP}/usr/lib +XCFLAGS+= -isystem ${WORLDTMP}/usr/include -L${WORLDTMP}/usr/lib +XCXXFLAGS+= -I${WORLDTMP}/usr/include/c++/v1 -std=gnu++11 -L${WORLDTMP}/../lib/libc++ +DEPFLAGS+= -I${WORLDTMP}/usr/include/c++/v1 .else TARGET_ABI?= unknown TARGET_TRIPLE?= ${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd11.0 -XFLAGS+= -target ${TARGET_TRIPLE} +XCFLAGS+= -target ${TARGET_TRIPLE} .endif .endif @@ -571,7 +574,7 @@ _libraries: @echo "--------------------------------------------------------------" ${_+_}cd ${.CURDIR}; \ ${WMAKE} -DNO_FSCHG MK_HTML=no MK_INFO=no -DNO_LINT MK_MAN=no \ - MK_PROFILE=no MK_TESTS=no libraries + MK_PROFILE=no MK_TESTS=no MK_TESTS_SUPPORT=${MK_TESTS} libraries _depend: @echo @echo "--------------------------------------------------------------" @@ -1532,7 +1535,6 @@ _prebuild_libs= ${_kerberos5_lib_libasn1 ${_kerberos5_lib_libhx509} ${_kerberos5_lib_libkrb5} \ ${_kerberos5_lib_libroken} \ ${_kerberos5_lib_libwind} \ - ${_lib_atf} \ lib/libbz2 ${_libcom_err} lib/libcrypt \ lib/libelf lib/libexpat \ ${_lib_libgssapi} \ @@ -1558,15 +1560,6 @@ gnu/lib/libsupc++__L: gnu/lib/libstdc++_ lib/libgeom__L: lib/libexpat__L -.if defined(WITH_ATF) || ${MK_TESTS} != "no" -.if !defined(WITH_ATF) -# Ensure that the ATF libraries will be built during make libraries, even -# though they will have WITHOUT_TESTS -MAKE+= -DWITH_ATF -.endif -_lib_atf= lib/atf -.endif - .if ${MK_LIBTHR} != "no" _lib_libthr= lib/libthr .endif @@ -1888,7 +1881,8 @@ check-old: check-old-files check-old-lib # showconfig - show build configuration. # showconfig: - @${MAKE} -n -f src.opts.mk -V dummy -dg1 2>&1 | grep ^MK_ | sort + @(${MAKE} -n -f ${.CURDIR}/sys/conf/kern.opts.mk -V dummy -dg1; \ + ${MAKE} -n -f ${.CURDIR}/share/mk/src.opts.mk -V dummy -dg1) 2>&1 | grep ^MK_ | sort -u .if !empty(KRNLOBJDIR) && !empty(KERNCONF) DTBOUTPUTPATH= ${KRNLOBJDIR}/${KERNCONF}/ Modified: projects/routing/ObsoleteFiles.inc ============================================================================== --- projects/routing/ObsoleteFiles.inc Tue Nov 4 17:28:13 2014 (r274096) +++ projects/routing/ObsoleteFiles.inc Tue Nov 4 18:22:33 2014 (r274097) @@ -38,14 +38,26 @@ # xargs -n1 | sort | uniq -d; # done +# 20141102: postrandom obsoleted by new /dev/random code +OLD_FILES+=etc/rc.d/postrandom +# 20141031: initrandom obsoleted by new /dev/random code +OLD_FILES+=etc/rc.d/initrandom +# 20141028: debug files accidentally installed as directory name +OLD_FILES+=usr/lib/debug/usr/lib/i18n +OLD_FILES+=usr/lib/debug/usr/lib/private +OLD_FILES+=usr/lib/debug/usr/lib32/i18n +OLD_FILES+=usr/lib/debug/usr/lib32/private +# 20141015: OpenSSL 1.0.1j import +OLD_FILES+=usr/share/openssl/man/man3/CMS_sign_add1_signer.3.gz # 20140922: sleepq_calc_signal_retval.9 and sleepq_catch_signals.9 removed OLD_FILES+=usr/share/man/man9/sleepq_calc_signal_retval.9.gz OLD_FILES+=usr/share/man/man9/sleepq_catch_signals.9.gz # 20140917: hv_kvpd rc.d script removed in favor of devd configuration OLD_FILES+=etc/rc.d/hv_kvpd # 20140917: libnv was accidentally being installed to /usr/lib instead of /lib -OLD_LIBS+=usr/lib/libnv.a OLD_LIBS+=usr/lib/libnv.so.0 +# 20140829: rc.d/kerberos removed +OLD_FILES+=etc/rc.d/kerberos # 20140814: libopie version bump OLD_LIBS+=usr/lib/libopie.so.7 OLD_LIBS+=usr/lib32/libopie.so.7 @@ -364,7 +376,6 @@ OLD_FILES+=usr/share/man/man1/atf-report OLD_FILES+=usr/share/man/man1/atf-run.1.gz OLD_FILES+=usr/share/man/man1/atf-version.1.gz OLD_FILES+=usr/share/man/man5/atf-formats.5.gz -OLD_FILES+=usr/share/man/man7/atf.7.gz OLD_FILES+=usr/share/xml/atf/tests-results.dtd OLD_FILES+=usr/share/xsl/atf/tests-results.xsl # 20131009: freebsd-version moved from /libexec to /bin Modified: projects/routing/UPDATING ============================================================================== --- projects/routing/UPDATING Tue Nov 4 17:28:13 2014 (r274096) +++ projects/routing/UPDATING Tue Nov 4 18:22:33 2014 (r274097) @@ -31,6 +31,29 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20141104: + vt(4), the new console driver, is enabled by default. It brings + support for Unicode and double-width characters, as well as + support for UEFI and integration with the KMS kernel video + drivers. + + You may need to update your console settings in /etc/rc.conf, + most probably the keymap. During boot, /etc/rc.d/syscons will + indicate what you need to do. + + vt(4) still has issues and lacks some features compared to + syscons(4). See the wiki for up-to-date information: + https://wiki.freebsd.org/Newcons + + If you want to keep using syscons(4), you can do so by adding + the following line to /boot/loader.conf: + kern.vty=sc + +20141102: + pjdfstest has been integrated into kyua as an opt-in test suite. + Please see share/doc/pjdfstest/README for a more details on how to + execute it. + 20141009: gperf has been removed from the base system for architectures that use clang. Ports that require gperf will obtain it from the Modified: projects/routing/bin/sh/eval.c ============================================================================== --- projects/routing/bin/sh/eval.c Tue Nov 4 17:28:13 2014 (r274096) +++ projects/routing/bin/sh/eval.c Tue Nov 4 18:22:33 2014 (r274097) @@ -168,6 +168,8 @@ evalstring(char *s, int flags) else evaltree(n, flags); any = 1; + if (evalskip) + break; } popstackmark(&smark); setstackmark(&smark); @@ -1037,6 +1039,7 @@ evalcommand(union node *cmd, int flags, shellparam.reset = 1; shellparam.nparam = argc - 1; shellparam.p = argv + 1; + shellparam.optp = NULL; shellparam.optnext = NULL; INTOFF; savelocalvars = localvars; Modified: projects/routing/bin/sh/expand.c ============================================================================== --- projects/routing/bin/sh/expand.c Tue Nov 4 17:28:13 2014 (r274096) +++ projects/routing/bin/sh/expand.c Tue Nov 4 18:22:33 2014 (r274097) @@ -862,7 +862,7 @@ varisset(const char *name, int nulok) static void strtodest(const char *p, int flag, int subtype, int quoted) { - if (flag & (EXP_FULL | EXP_CASE) && subtype != VSLENGTH) + if (flag & (EXP_FULL | EXP_CASE | EXP_REDIR) && subtype != VSLENGTH) STPUTS_QUOTES(p, quoted ? DQSYNTAX : BASESYNTAX, expdest); else STPUTS(p, expdest); @@ -878,30 +878,28 @@ varvalue(const char *name, int quoted, i int num; char *p; int i; - char sep; + char sep[2]; char **ap; switch (*name) { case '$': num = rootpid; - goto numvar; + break; case '?': num = oexitstatus; - goto numvar; + break; case '#': num = shellparam.nparam; - goto numvar; + break; case '!': num = backgndpidval(); -numvar: - expdest = cvtnum(num, expdest); break; case '-': for (i = 0 ; i < NOPTS ; i++) { if (optlist[i].val) STPUTC(optlist[i].letter, expdest); } - break; + return; case '@': if (flag & EXP_FULL && quoted) { for (ap = shellparam.p ; (p = *ap++) != NULL ; ) { @@ -909,22 +907,25 @@ numvar: if (*ap) STPUTC('\0', expdest); } - break; + return; } /* FALLTHROUGH */ case '*': if (ifsset()) - sep = ifsval()[0]; + sep[0] = ifsval()[0]; else - sep = ' '; + sep[0] = ' '; + sep[1] = '\0'; for (ap = shellparam.p ; (p = *ap++) != NULL ; ) { strtodest(p, flag, subtype, quoted); if (!*ap) break; - if (sep || (flag & EXP_FULL && !quoted && **ap != '\0')) - STPUTC(sep, expdest); + if (sep[0]) + strtodest(sep, flag, subtype, quoted); + else if (flag & EXP_FULL && !quoted && **ap != '\0') + STPUTC('\0', expdest); } - break; + return; default: if (is_digit(*name)) { num = atoi(name); @@ -933,11 +934,12 @@ numvar: else if (num > 0 && num <= shellparam.nparam) p = shellparam.p[num - 1]; else - break; + return; strtodest(p, flag, subtype, quoted); } - break; + return; } + expdest = cvtnum(num, expdest); } @@ -1105,24 +1107,23 @@ expandmeta(struct strlist *str, int flag /* TODO - EXP_REDIR */ while (str) { - if (fflag) - goto nometa; - p = str->text; - for (;;) { /* fast check for meta chars */ - if ((c = *p++) == '\0') - goto nometa; - if (c == '*' || c == '?' || c == '[') - break; - } savelastp = exparg.lastp; - INTOFF; - expmeta(expdir, str->text); - INTON; + if (!fflag) { + p = str->text; + for (; (c = *p) != '\0'; p++) { + /* fast check for meta chars */ + if (c == '*' || c == '?' || c == '[') { + INTOFF; + expmeta(expdir, str->text); + INTON; + break; + } + } + } if (exparg.lastp == savelastp) { /* * no matches */ -nometa: *exparg.lastp = str; rmescapes(str->text); exparg.lastp = &str->next; Modified: projects/routing/bin/sh/jobs.c ============================================================================== --- projects/routing/bin/sh/jobs.c Tue Nov 4 17:28:13 2014 (r274096) +++ projects/routing/bin/sh/jobs.c Tue Nov 4 18:22:33 2014 (r274097) @@ -592,23 +592,23 @@ getjob_nonotfound(const char *name) if (name == NULL) { #if JOBS -currentjob: if ((jp = getcurjob(NULL)) == NULL) - error("No current job"); - return (jp); + name = "%+"; #else error("No current job"); #endif - } else if (name[0] == '%') { + } + if (name[0] == '%') { if (is_digit(name[1])) { jobno = number(name + 1); if (jobno > 0 && jobno <= njobs && jobtab[jobno - 1].used != 0) return &jobtab[jobno - 1]; #if JOBS - } else if (name[1] == '%' && name[2] == '\0') { - goto currentjob; - } else if (name[1] == '+' && name[2] == '\0') { - goto currentjob; + } else if ((name[1] == '%' || name[1] == '+') && + name[2] == '\0') { + if ((jp = getcurjob(NULL)) == NULL) + error("No current job"); + return (jp); } else if (name[1] == '-' && name[2] == '\0') { if ((jp = getcurjob(NULL)) == NULL || (jp = getcurjob(jp)) == NULL) @@ -1288,13 +1288,43 @@ commandtext(union node *n) static void +cmdtxtdogroup(union node *n) +{ + cmdputs("; do "); + cmdtxt(n); + cmdputs("; done"); +} + + +static void +cmdtxtredir(union node *n, const char *op, int deffd) +{ + char s[2]; + + if (n->nfile.fd != deffd) { + s[0] = n->nfile.fd + '0'; + s[1] = '\0'; + cmdputs(s); + } + cmdputs(op); + if (n->type == NTOFD || n->type == NFROMFD) { + if (n->ndup.dupfd >= 0) + s[0] = n->ndup.dupfd + '0'; + else + s[0] = '-'; + s[1] = '\0'; + cmdputs(s); + } else { + cmdtxt(n->nfile.fname); + } +} + + +static void cmdtxt(union node *n) { union node *np; struct nodelist *lp; - const char *p; - int i; - char s[2]; if (n == NULL) return; @@ -1339,14 +1369,13 @@ cmdtxt(union node *n) break; case NWHILE: cmdputs("while "); - goto until; + cmdtxt(n->nbinary.ch1); + cmdtxtdogroup(n->nbinary.ch2); + break; case NUNTIL: cmdputs("until "); -until: cmdtxt(n->nbinary.ch1); - cmdputs("; do "); - cmdtxt(n->nbinary.ch2); - cmdputs("; done"); + cmdtxtdogroup(n->nbinary.ch2); break; case NFOR: cmdputs("for "); @@ -1381,36 +1410,25 @@ until: cmdputs(n->narg.text); break; case NTO: - p = ">"; i = 1; goto redir; + cmdtxtredir(n, ">", 1); + break; case NAPPEND: - p = ">>"; i = 1; goto redir; + cmdtxtredir(n, ">>", 1); + break; case NTOFD: - p = ">&"; i = 1; goto redir; + cmdtxtredir(n, ">&", 1); + break; case NCLOBBER: - p = ">|"; i = 1; goto redir; + cmdtxtredir(n, ">|", 1); + break; case NFROM: - p = "<"; i = 0; goto redir; + cmdtxtredir(n, "<", 0); + break; case NFROMTO: - p = "<>"; i = 0; goto redir; + cmdtxtredir(n, "<>", 0); + break; case NFROMFD: - p = "<&"; i = 0; goto redir; -redir: - if (n->nfile.fd != i) { - s[0] = n->nfile.fd + '0'; - s[1] = '\0'; - cmdputs(s); - } - cmdputs(p); - if (n->type == NTOFD || n->type == NFROMFD) { - if (n->ndup.dupfd >= 0) - s[0] = n->ndup.dupfd + '0'; - else - s[0] = '-'; - s[1] = '\0'; - cmdputs(s); - } else { - cmdtxt(n->nfile.fname); - } + cmdtxtredir(n, "<&", 0); break; case NHERE: case NXHERE: Modified: projects/routing/bin/sh/options.c ============================================================================== --- projects/routing/bin/sh/options.c Tue Nov 4 17:28:13 2014 (r274096) +++ projects/routing/bin/sh/options.c Tue Nov 4 18:22:33 2014 (r274097) @@ -325,6 +325,7 @@ setparam(char **argv) shellparam.malloc = 1; shellparam.nparam = nparam; shellparam.p = newparam; + shellparam.optp = NULL; shellparam.reset = 1; shellparam.optnext = NULL; } @@ -344,6 +345,11 @@ freeparam(struct shparam *param) ckfree(*ap); ckfree(param->p); } + if (param->optp) { + for (ap = param->optp ; *ap ; ap++) + ckfree(*ap); + ckfree(param->optp); + } } @@ -417,20 +423,33 @@ getoptsreset(const char *value) int getoptscmd(int argc, char **argv) { - char **optbase = NULL; + char **optbase = NULL, **ap; + int i; if (argc < 3) error("usage: getopts optstring var [arg]"); - else if (argc == 3) - optbase = shellparam.p; - else - optbase = &argv[3]; if (shellparam.reset == 1) { + INTOFF; + if (shellparam.optp) { + for (ap = shellparam.optp ; *ap ; ap++) + ckfree(*ap); + ckfree(shellparam.optp); + shellparam.optp = NULL; + } + if (argc > 3) { + shellparam.optp = ckmalloc((argc - 2) * sizeof *ap); + memset(shellparam.optp, '\0', (argc - 2) * sizeof *ap); + for (i = 0; i < argc - 3; i++) + shellparam.optp[i] = savestr(argv[i + 3]); + } + INTON; + optbase = argc == 3 ? shellparam.p : shellparam.optp; shellparam.optnext = optbase; shellparam.optptr = NULL; shellparam.reset = 0; - } + } else + optbase = shellparam.optp ? shellparam.optp : shellparam.p; return getopts(argv[1], argv[2], optbase, &shellparam.optnext, &shellparam.optptr); Modified: projects/routing/bin/sh/options.h ============================================================================== --- projects/routing/bin/sh/options.h Tue Nov 4 17:28:13 2014 (r274096) +++ projects/routing/bin/sh/options.h Tue Nov 4 18:22:33 2014 (r274097) @@ -38,6 +38,7 @@ struct shparam { unsigned char malloc; /* if parameter list dynamically allocated */ unsigned char reset; /* if getopts has been reset */ char **p; /* parameter list */ + char **optp; /* parameter list for getopts */ char **optnext; /* next parameter to be processed by getopts */ char *optptr; /* used by getopts */ }; Modified: projects/routing/bin/sh/parser.c ============================================================================== --- projects/routing/bin/sh/parser.c Tue Nov 4 17:28:13 2014 (r274096) +++ projects/routing/bin/sh/parser.c Tue Nov 4 18:22:33 2014 (r274097) @@ -125,6 +125,7 @@ static void consumetoken(int); static void synexpect(int) __dead2; static void synerror(const char *) __dead2; static void setprompt(int); +static int pgetc_linecont(void); static void * @@ -889,7 +890,9 @@ xxreadtoken(void) continue; } pungetc(); - goto breakloop; + /* FALLTHROUGH */ + default: + return readtoken1(c, BASESYNTAX, (char *)NULL, 0); case '\n': plinno++; needprompt = doprompt; @@ -897,17 +900,17 @@ xxreadtoken(void) case PEOF: RETURN(TEOF); case '&': - if (pgetc() == '&') + if (pgetc_linecont() == '&') RETURN(TAND); pungetc(); RETURN(TBACKGND); case '|': - if (pgetc() == '|') + if (pgetc_linecont() == '|') RETURN(TOR); pungetc(); RETURN(TPIPE); case ';': - c = pgetc(); + c = pgetc_linecont(); if (c == ';') RETURN(TENDCASE); else if (c == '&') @@ -918,12 +921,8 @@ xxreadtoken(void) RETURN(TLP); case ')': RETURN(TRP); - default: - goto breakloop; } } -breakloop: - return readtoken1(c, BASESYNTAX, (char *)NULL, 0); #undef RETURN } @@ -979,6 +978,63 @@ checkend(int c, const char *eofmark, int /* + * Parse a redirection operator. The variable "out" points to a string + * specifying the fd to be redirected. The variable "c" contains the + * first character of the redirection operator. + */ + +static void +parseredir(char *out, int c) +{ + char fd = *out; + union node *np; + + np = (union node *)stalloc(sizeof (struct nfile)); + if (c == '>') { + np->nfile.fd = 1; + c = pgetc_linecont(); + if (c == '>') + np->type = NAPPEND; + else if (c == '&') + np->type = NTOFD; + else if (c == '|') + np->type = NCLOBBER; + else { + np->type = NTO; + pungetc(); + } + } else { /* c == '<' */ + np->nfile.fd = 0; + c = pgetc_linecont(); + if (c == '<') { + if (sizeof (struct nfile) != sizeof (struct nhere)) { + np = (union node *)stalloc(sizeof (struct nhere)); + np->nfile.fd = 0; + } + np->type = NHERE; + heredoc = (struct heredoc *)stalloc(sizeof (struct heredoc)); + heredoc->here = np; + if ((c = pgetc_linecont()) == '-') { + heredoc->striptabs = 1; + } else { + heredoc->striptabs = 0; + pungetc(); + } + } else if (c == '&') + np->type = NFROMFD; + else if (c == '>') + np->type = NFROMTO; + else { + np->type = NFROM; + pungetc(); + } + } + if (fd != '\0') + np->nfile.fd = digit_val(fd); + redirnode = np; +} + +/* * Called to parse command substitutions. */ @@ -1039,25 +1095,12 @@ parsebackq(char *out, struct nodelist ** needprompt = 0; } CHECKSTRSPACE(2, oout); - switch (c = pgetc()) { - case '`': - goto done; - + c = pgetc_linecont(); + if (c == '`') + break; + switch (c) { case '\\': - if ((c = pgetc()) == '\n') { - plinno++; - if (doprompt) - setprompt(2); - else - setprompt(0); - /* - * If eating a newline, avoid putting - * the newline into the new character - * stream (via the USTPUTC after the - * switch). - */ - continue; - } + c = pgetc(); if (c != '\\' && c != '`' && c != '$' && (!dblquote || c != '"')) USTPUTC('\\', oout); @@ -1078,7 +1121,6 @@ parsebackq(char *out, struct nodelist ** } USTPUTC(c, oout); } -done: USTPUTC('\0', oout); olen = oout - stackblock(); INTOFF; @@ -1309,7 +1351,6 @@ readcstyleesc(char *out) * will run code that appears at the end of readtoken1. */ -#define PARSEREDIR() {goto parseredir; parseredir_return:;} #define PARSESUB() {goto parsesub; parsesub_return:;} #define PARSEARITH() {goto parsearith; parsearith_return:;} @@ -1454,7 +1495,7 @@ readtoken1(int firstc, char const *initi USTPUTC(c, out); --state[level].parenlevel; } else { - if (pgetc() == ')') { + if (pgetc_linecont() == ')') { if (level > 0 && state[level].category == TSTATE_ARITH) { level--; @@ -1509,7 +1550,7 @@ endword: && quotef == 0 && len <= 2 && (*out == '\0' || is_digit(*out))) { - PARSEREDIR(); + parseredir(out, c); return lasttoken = TREDIR; } else { pungetc(); @@ -1524,63 +1565,6 @@ endword: /* - * Parse a redirection operator. The variable "out" points to a string - * specifying the fd to be redirected. The variable "c" contains the - * first character of the redirection operator. - */ - -parseredir: { - char fd = *out; - union node *np; - - np = (union node *)stalloc(sizeof (struct nfile)); - if (c == '>') { - np->nfile.fd = 1; - c = pgetc(); - if (c == '>') - np->type = NAPPEND; - else if (c == '&') - np->type = NTOFD; - else if (c == '|') - np->type = NCLOBBER; - else { - np->type = NTO; - pungetc(); - } - } else { /* c == '<' */ - np->nfile.fd = 0; - c = pgetc(); - if (c == '<') { - if (sizeof (struct nfile) != sizeof (struct nhere)) { - np = (union node *)stalloc(sizeof (struct nhere)); - np->nfile.fd = 0; - } - np->type = NHERE; - heredoc = (struct heredoc *)stalloc(sizeof (struct heredoc)); - heredoc->here = np; - if ((c = pgetc()) == '-') { - heredoc->striptabs = 1; - } else { - heredoc->striptabs = 0; - pungetc(); - } - } else if (c == '&') - np->type = NFROMFD; - else if (c == '>') - np->type = NFROMTO; - else { - np->type = NFROM; - pungetc(); - } - } - if (fd != '\0') - np->nfile.fd = digit_val(fd); - redirnode = np; - goto parseredir_return; -} - - -/* * Parse a substitution. At this point, we have read the dollar sign * and nothing else. */ @@ -1597,9 +1581,9 @@ parsesub: { int length; int c1; - c = pgetc(); + c = pgetc_linecont(); if (c == '(') { /* $(command) or $((arith)) */ - if (pgetc() == '(') { + if (pgetc_linecont() == '(') { PARSEARITH(); } else { pungetc(); @@ -1617,7 +1601,7 @@ parsesub: { flags = 0; if (c == '{') { bracketed_name = 1; - c = pgetc(); + c = pgetc_linecont(); subtype = 0; } varname: @@ -1625,7 +1609,7 @@ varname: length = 0; do { STPUTC(c, out); - c = pgetc(); + c = pgetc_linecont(); length++; } while (!is_eof(c) && is_in_name(c)); if (length == 6 && @@ -1644,22 +1628,22 @@ varname: if (bracketed_name) { do { STPUTC(c, out); - c = pgetc(); + c = pgetc_linecont(); } while (is_digit(c)); } else { STPUTC(c, out); - c = pgetc(); + c = pgetc_linecont(); } } else if (is_special(c)) { c1 = c; - c = pgetc(); + c = pgetc_linecont(); if (subtype == 0 && c1 == '#') { subtype = VSLENGTH; if (strchr(types, c) == NULL && c != ':' && c != '#' && c != '%') goto varname; c1 = c; - c = pgetc(); + c = pgetc_linecont(); if (c1 != '}' && c == '}') { pungetc(); c = c1; @@ -1684,7 +1668,7 @@ varname: switch (c) { case ':': flags |= VSNUL; - c = pgetc(); + c = pgetc_linecont(); /*FALLTHROUGH*/ default: p = strchr(types, c); @@ -1704,7 +1688,7 @@ varname: int cc = c; subtype = c == '#' ? VSTRIMLEFT : VSTRIMRIGHT; - c = pgetc(); + c = pgetc_linecont(); if (c == cc) subtype++; else @@ -1913,6 +1897,29 @@ setprompt(int which) } } +static int +pgetc_linecont(void) +{ + int c; + + while ((c = pgetc_macro()) == '\\') { + c = pgetc(); + if (c == '\n') { + plinno++; + if (doprompt) + setprompt(2); + else + setprompt(0); + } else { + pungetc(); + /* Allow the backslash to be pushed back. */ + pushstring("\\", 1, NULL); + return (pgetc()); + } + } + return (c); +} + /* * called by editline -- any expansions to the prompt * should be added here. Modified: projects/routing/bin/sh/tests/builtins/Makefile ============================================================================== --- projects/routing/bin/sh/tests/builtins/Makefile Tue Nov 4 17:28:13 2014 (r274096) +++ projects/routing/bin/sh/tests/builtins/Makefile Tue Nov 4 18:22:33 2014 (r274097) @@ -72,6 +72,8 @@ FILES+= eval3.0 FILES+= eval4.0 FILES+= eval5.0 FILES+= eval6.0 +FILES+= eval7.0 +FILES+= eval8.7 FILES+= exec1.0 FILES+= exec2.0 FILES+= exit1.0 Copied: projects/routing/bin/sh/tests/builtins/eval7.0 (from r274096, head/bin/sh/tests/builtins/eval7.0) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/routing/bin/sh/tests/builtins/eval7.0 Tue Nov 4 18:22:33 2014 (r274097, copy of r274096, head/bin/sh/tests/builtins/eval7.0) @@ -0,0 +1,9 @@ +# $FreeBSD$ +# Assumes that break can break out of a loop outside eval. + +while :; do + eval "break +echo bad1" + echo bad2 + exit 3 +done Copied: projects/routing/bin/sh/tests/builtins/eval8.7 (from r274096, head/bin/sh/tests/builtins/eval8.7) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/routing/bin/sh/tests/builtins/eval8.7 Tue Nov 4 18:22:33 2014 (r274097, copy of r274096, head/bin/sh/tests/builtins/eval8.7) @@ -0,0 +1,7 @@ +# $FreeBSD$ + +f() { + eval "return 7 +echo bad2" +} +f Copied: projects/routing/bin/sh/tests/builtins/getopts9.0 (from r274096, head/bin/sh/tests/builtins/getopts9.0) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/routing/bin/sh/tests/builtins/getopts9.0 Tue Nov 4 18:22:33 2014 (r274097, copy of r274096, head/bin/sh/tests/builtins/getopts9.0) @@ -0,0 +1,9 @@ +# $FreeBSD$ + +args='-ab' +getopts ab opt $args +echo $?:$opt:$OPTARG +for dummy in dummy1 dummy2; do + getopts ab opt $args + echo $?:$opt:$OPTARG +done Copied: projects/routing/bin/sh/tests/builtins/getopts9.0.stdout (from r274096, head/bin/sh/tests/builtins/getopts9.0.stdout) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/routing/bin/sh/tests/builtins/getopts9.0.stdout Tue Nov 4 18:22:33 2014 (r274097, copy of r274096, head/bin/sh/tests/builtins/getopts9.0.stdout) @@ -0,0 +1,3 @@ +0:a: +0:b: +1:?: Modified: projects/routing/bin/sh/tests/expansion/Makefile ============================================================================== --- projects/routing/bin/sh/tests/expansion/Makefile Tue Nov 4 17:28:13 2014 (r274096) +++ projects/routing/bin/sh/tests/expansion/Makefile Tue Nov 4 18:22:33 2014 (r274097) @@ -72,6 +72,7 @@ FILES+= plus-minus7.0 FILES+= plus-minus8.0 FILES+= question1.0 FILES+= readonly1.0 +FILES+= redir1.0 FILES+= set-u1.0 FILES+= set-u2.0 FILES+= set-u3.0 Copied: projects/routing/bin/sh/tests/expansion/redir1.0 (from r274096, head/bin/sh/tests/expansion/redir1.0) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/routing/bin/sh/tests/expansion/redir1.0 Tue Nov 4 18:22:33 2014 (r274097, copy of r274096, head/bin/sh/tests/expansion/redir1.0) @@ -0,0 +1,26 @@ +# $FreeBSD$ + +bad=0 +for i in 0 1 2 3; do + for j in 0 1 2 3 4 5 6 7; do + for k in 0 1 2 3 4 5 6 7; do + case $i$j$k in + 000) continue ;; + esac + set -- "$(printf \\$i$j$k@)" + set -- "${1%@}" + ff= + for f in /dev/null /dev/zero /; do + if [ -e "$f" ] && [ ! -e "$f$1" ]; then + ff=$f + fi + done + [ -n "$ff" ] || continue + if { true <$ff$1; } 2>/dev/null; then + echo "Bad: $i$j$k ($ff)" >&2 + : $((bad += 1)) + fi + done + done +done +exit $((bad ? 2 : 0)) Modified: projects/routing/bin/sh/tests/parameters/Makefile ============================================================================== --- projects/routing/bin/sh/tests/parameters/Makefile Tue Nov 4 17:28:13 2014 (r274096) +++ projects/routing/bin/sh/tests/parameters/Makefile Tue Nov 4 18:22:33 2014 (r274097) @@ -18,6 +18,8 @@ FILES+= positional2.0 FILES+= positional3.0 FILES+= positional4.0 FILES+= positional5.0 +FILES+= positional6.0 +FILES+= positional7.0 FILES+= pwd1.0 FILES+= pwd2.0 Copied: projects/routing/bin/sh/tests/parameters/positional6.0 (from r274096, head/bin/sh/tests/parameters/positional6.0) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/routing/bin/sh/tests/parameters/positional6.0 Tue Nov 4 18:22:33 2014 (r274097, copy of r274096, head/bin/sh/tests/parameters/positional6.0) @@ -0,0 +1,7 @@ +# $FreeBSD$ + +IFS=? +set p r +v=pqrs +r=${v#"$*"} +[ "$r" = pqrs ] Copied: projects/routing/bin/sh/tests/parameters/positional7.0 (from r274096, head/bin/sh/tests/parameters/positional7.0) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/routing/bin/sh/tests/parameters/positional7.0 Tue Nov 4 18:22:33 2014 (r274097, copy of r274096, head/bin/sh/tests/parameters/positional7.0) @@ -0,0 +1,8 @@ +# $FreeBSD$ + +set -- / '' +IFS=* +set -- "$*" +IFS=: +args="$*" +[ "$#:$args" = "1:/*" ] *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Tue Nov 4 18:48:14 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 87BAEC3; Tue, 4 Nov 2014 18:48:14 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 68D22C2A; Tue, 4 Nov 2014 18:48:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sA4ImEqt038688; Tue, 4 Nov 2014 18:48:14 GMT (envelope-from melifaro@FreeBSD.org) Received: (from melifaro@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sA4ImDG0038682; Tue, 4 Nov 2014 18:48:13 GMT (envelope-from melifaro@FreeBSD.org) Message-Id: <201411041848.sA4ImDG0038682@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: melifaro set sender to melifaro@FreeBSD.org using -f From: "Alexander V. Chernikov" Date: Tue, 4 Nov 2014 18:48:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274098 - in projects/routing/sys: net netinet netinet6 X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Nov 2014 18:48:14 -0000 Author: melifaro Date: Tue Nov 4 18:48:13 2014 New Revision: 274098 URL: https://svnweb.freebsd.org/changeset/base/274098 Log: Convert gif and stf to use new routing api. Modified: projects/routing/sys/net/if_stf.c projects/routing/sys/netinet/in_gif.c projects/routing/sys/netinet6/in6_gif.c Modified: projects/routing/sys/net/if_stf.c ============================================================================== --- projects/routing/sys/net/if_stf.c Tue Nov 4 18:22:33 2014 (r274097) +++ projects/routing/sys/net/if_stf.c Tue Nov 4 18:48:13 2014 (r274098) @@ -116,6 +116,8 @@ #include +#include + #include #include @@ -572,26 +574,12 @@ stf_checkaddr4(sc, in, inifp) * perform ingress filter */ if (sc && (STF2IFP(sc)->if_flags & IFF_LINK2) == 0 && inifp) { - struct sockaddr_in sin; - struct rtentry *rt; + struct nhop4_basic nh4; - bzero(&sin, sizeof(sin)); - sin.sin_family = AF_INET; - sin.sin_len = sizeof(struct sockaddr_in); - sin.sin_addr = *in; - rt = rtalloc1_fib((struct sockaddr *)&sin, 0, - 0UL, sc->sc_fibnum); - if (!rt || rt->rt_ifp != inifp) { -#if 0 - log(LOG_WARNING, "%s: packet from 0x%x dropped " - "due to ingress filter\n", if_name(STF2IFP(sc)), - (u_int32_t)ntohl(sin.sin_addr.s_addr)); -#endif - if (rt) - RTFREE_LOCKED(rt); - return -1; - } - RTFREE_LOCKED(rt); + if (fib4_lookup_nh_basic(sc->sc_fibnum, *in, 0, &nh4) != 0) + return (-1); + if (nh4.nh_ifp != inifp) + return (-1); } return 0; Modified: projects/routing/sys/netinet/in_gif.c ============================================================================== --- projects/routing/sys/netinet/in_gif.c Tue Nov 4 18:22:33 2014 (r274097) +++ projects/routing/sys/netinet/in_gif.c Tue Nov 4 18:48:13 2014 (r274098) @@ -51,7 +51,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include @@ -68,6 +67,7 @@ __FBSDID("$FreeBSD$"); #endif #include +#include static int gif_validate4(const struct ip *, struct gif_softc *, struct ifnet *); @@ -188,22 +188,15 @@ gif_validate4(const struct ip *ip, struc /* ingress filters on outer source */ if ((GIF2IFP(sc)->if_flags & IFF_LINK2) == 0 && ifp) { - struct sockaddr_in sin; - struct rtentry *rt; + struct nhop4_basic nh4; + uint32_t fibnum; - bzero(&sin, sizeof(sin)); - sin.sin_family = AF_INET; - sin.sin_len = sizeof(struct sockaddr_in); - sin.sin_addr = ip->ip_src; - /* XXX MRT check for the interface we would use on output */ - rt = in_rtalloc1((struct sockaddr *)&sin, 0, - 0UL, sc->gif_fibnum); - if (!rt || rt->rt_ifp != ifp) { - if (rt) - RTFREE_LOCKED(rt); + fibnum = sc->gif_fibnum; + + if (fib4_lookup_nh_basic(fibnum, ip->ip_src, 0, &nh4) != 0) + return (0); + if (nh4.nh_ifp != ifp) return (0); - } - RTFREE_LOCKED(rt); } return (32 * 2); } Modified: projects/routing/sys/netinet6/in6_gif.c ============================================================================== --- projects/routing/sys/netinet6/in6_gif.c Tue Nov 4 18:22:33 2014 (r274097) +++ projects/routing/sys/netinet6/in6_gif.c Tue Nov 4 18:48:13 2014 (r274098) @@ -53,7 +53,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include @@ -67,6 +66,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #endif #include #ifdef INET6 @@ -74,6 +74,7 @@ __FBSDID("$FreeBSD$"); #endif #include +#include VNET_DEFINE(int, ip6_gif_hlim) = GIF_HLIM; #define V_ip6_gif_hlim VNET(ip6_gif_hlim) @@ -195,23 +196,17 @@ gif_validate6(const struct ip6_hdr *ip6, /* ingress filters on outer source */ if ((GIF2IFP(sc)->if_flags & IFF_LINK2) == 0 && ifp) { - struct sockaddr_in6 sin6; - struct rtentry *rt; + struct nhop6_basic nh6; + struct in6_addr src; + uint32_t fibnum, scopeid; - bzero(&sin6, sizeof(sin6)); - sin6.sin6_family = AF_INET6; - sin6.sin6_len = sizeof(struct sockaddr_in6); - sin6.sin6_addr = ip6->ip6_src; - sin6.sin6_scope_id = 0; /* XXX */ - - rt = in6_rtalloc1((struct sockaddr *)&sin6, 0, 0UL, - sc->gif_fibnum); - if (!rt || rt->rt_ifp != ifp) { - if (rt) - RTFREE_LOCKED(rt); + fibnum = sc->gif_fibnum; + in6_splitscope(&ip6->ip6_src, &src, &scopeid); + + if (fib6_lookup_nh_basic(fibnum, &src, scopeid, 0, &nh6) != 0) + return (0); + if (nh6.nh_ifp != ifp) return (0); - } - RTFREE_LOCKED(rt); } return (128 * 2); From owner-svn-src-projects@FreeBSD.ORG Wed Nov 5 08:10:58 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D959776D; Wed, 5 Nov 2014 08:10:58 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id AD9B6C1; Wed, 5 Nov 2014 08:10:58 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sA58AwIZ021181; Wed, 5 Nov 2014 08:10:58 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sA58AwTl021180; Wed, 5 Nov 2014 08:10:58 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201411050810.sA58AwTl021180@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Wed, 5 Nov 2014 08:10:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274131 - projects/release-pkg X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Nov 2014 08:10:58 -0000 Author: gjb Date: Wed Nov 5 08:10:58 2014 New Revision: 274131 URL: https://svnweb.freebsd.org/changeset/base/274131 Log: Copy head@r274130 to projects/release-pkg. This is the initial commit to begin work packaging the FreeBSD base system as part of the release process. Sponsored by: The FreeBSD Foundation Added: projects/release-pkg/ - copied from r274130, head/ From owner-svn-src-projects@FreeBSD.ORG Wed Nov 5 13:22:20 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D639AC18; Wed, 5 Nov 2014 13:22:20 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C15B0916; Wed, 5 Nov 2014 13:22:20 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sA5DMKZS073749; Wed, 5 Nov 2014 13:22:20 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sA5DMJHE073744; Wed, 5 Nov 2014 13:22:19 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201411051322.sA5DMJHE073744@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Wed, 5 Nov 2014 13:22:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274134 - in projects/release-vmimage/release: . amd64 i386 scripts tools X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Nov 2014 13:22:20 -0000 Author: gjb Date: Wed Nov 5 13:22:19 2014 New Revision: 274134 URL: https://svnweb.freebsd.org/changeset/base/274134 Log: Initial rewrite to consolidate VM image build scripts into one. There may be some very sharp edges here while refactoring. - Move amd64/mk-vmimage.sh -> scripts/mk-vmimage.sh. - Remove vm-base target from Makefile.vm. - In vm-image target, use getopts flags for argument passing. - Create tools/vmimage.subr, containing default and prototype for the following functions that are used to drive the build, run in this order: vm_install_base() vm_extra_install_base() vm_extra_install_packages() vm_extra_install_ports() vm_extra_enable_services() vm_extra_pre_umount() vm_create_disk() vm_extra_create_disk() - In tools/azure.conf, override: vm_extra_install_base() vm_extra_pre_umount() vm_extra_create_disk() - In tools/openstack.conf, override: vm_extra_install_base() vm_extra_pre_umount() Sponsored by: The FreeBSD Foundation Added: projects/release-vmimage/release/scripts/mk-vmimage.sh - copied, changed from r274130, projects/release-vmimage/release/amd64/mk-vmimage.sh projects/release-vmimage/release/tools/vmimage.subr Deleted: projects/release-vmimage/release/amd64/mk-openstack.sh projects/release-vmimage/release/amd64/mk-vmimage.sh projects/release-vmimage/release/i386/mk-azure.sh projects/release-vmimage/release/i386/mk-openstack.sh projects/release-vmimage/release/i386/mk-vmimage.sh Modified: projects/release-vmimage/release/Makefile.vm projects/release-vmimage/release/tools/azure.conf projects/release-vmimage/release/tools/openstack.conf Modified: projects/release-vmimage/release/Makefile.vm ============================================================================== --- projects/release-vmimage/release/Makefile.vm Wed Nov 5 09:33:02 2014 (r274133) +++ projects/release-vmimage/release/Makefile.vm Wed Nov 5 13:22:19 2014 (r274134) @@ -5,7 +5,7 @@ # Makefile for building virtual machine and cloud provider disk images. # -VMTARGETS= vm-base vm-image +VMTARGETS= vm-image VMFORMATS?= vhd vmdk qcow2 raw VMSIZE?= 20G VMBASE?= vm @@ -37,23 +37,17 @@ CLEANFILES+= ${VMBASE}.${FORMAT} . endfor .endif -vm-base: -.if defined(WITH_VMIMAGES) && !empty(WITH_VMIMAGES) -. if exists(${.CURDIR}/${TARGET}/mk-vmimage.sh) - env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ - ${.CURDIR}/${TARGET}/mk-vmimage.sh ${.TARGET} \ - ${VMBASE}.img ${WORLDDIR} ${.OBJDIR}/${.TARGET} ${VMSIZE} -. endif -.endif - touch ${.TARGET} +vm-base: vm-image -vm-image: vm-base +vm-image: .if defined(WITH_VMIMAGES) && !empty(WITH_VMIMAGES) . if exists(${.CURDIR}/${TARGET}/mk-vmimage.sh) . for FORMAT in ${VMFORMATS} env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ - ${.CURDIR}/${TARGET}/mk-vmimage.sh ${.TARGET} \ - ${VMBASE}.img ${FORMAT} ${VMBASE}.${FORMAT} + ${.CURDIR}/${TARGET}/mk-vmimage.sh \ + -C ${.CURDIR}/tools/vmimage.subr -d ${.TARGET} \ + -i ${VMBASE}.img -s ${VMSIZE} -f ${FORMAT} \ + -S ${WORLDDIR} -o ${VMBASE}.${FORMAT} . endfor . endif .endif @@ -62,20 +56,21 @@ vm-image: vm-base vm-cloudware: ${CLOUDTARGETS} vm-azure: -.if exists(${.CURDIR}/${TARGET}/mk-azure.sh) - env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} AZURECONF=${AZURECONF} \ - AZURE_FORMAT=${AZURE_FORMAT} \ - ${.CURDIR}/${TARGET}/mk-azure.sh ${.TARGET} azure.img \ - ${WORLDDIR} ${.TARGET} ${VMSIZE} ${AZUREIMAGE} +.if exists(${.CURDIR}/${TARGET}/mk-vmimage.sh) + env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ + ${.CURDIR}/${TARGET}/mk-vmimage.sh \ + -C ${.CURDIR}/tools/vmimage.subr -d ${.TARGET} \ + -i azure.img -s ${VMSIZE} -f ${AZURE_FORMAT} \ + -S ${WORLDDIR} -o ${AZUREIMAGE} -c ${AZURECONF} .endif touch ${.TARGET} vm-openstack: -.if exists(${.CURDIR}/${TARGET}/mk-openstack.sh) +.if exists(${.CURDIR}/${TARGET}/mk-vmimage.sh) env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ - OPENSTACKCONF=${OPENSTACKCONF} \ - OPENSTACK_FORMAT=${OPENSTACK_FORMAT} \ - ${.CURDIR}/${TARGET}/mk-openstack.sh ${.TARGET} openstack.img \ - ${WORLDDIR} ${.TARGET} ${VMSIZE} ${OPENSTACKIMAGE} + ${.CURDIR}/${TARGET}/mk-vmimage.sh \ + -C ${.CURDIR}/tools/vmimage.subr -d ${.TARGET} \ + -i openstack.img -s ${VMSIZE} -f ${OPENSTACK_FORMAT} \ + -S ${WORLDDIR} -o ${OPENSTACKIMAGE} -c ${OPENSTACKCONF} .endif touch ${.TARGET} Copied and modified: projects/release-vmimage/release/scripts/mk-vmimage.sh (from r274130, projects/release-vmimage/release/amd64/mk-vmimage.sh) ============================================================================== --- projects/release-vmimage/release/amd64/mk-vmimage.sh Wed Nov 5 06:42:07 2014 (r274130, copy source) +++ projects/release-vmimage/release/scripts/mk-vmimage.sh Wed Nov 5 13:22:19 2014 (r274134) @@ -32,164 +32,69 @@ # $FreeBSD$ # -PATH="/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin" -export PATH - -usage_vm_base() { - echo -n "$(basename ${0}) vm-base " - echo " " - return 0 -} - -usage_vm_image() { - echo -n "$(basename ${0}) vm-image " - echo " " - return 0 -} - -usage() { - echo "Usage:" - echo "$(basename ${0}) [vm-base|vm-image] [...]" - echo - usage_vm_base - echo - usage_vm_image - exit 1 -} - -panic() { - msg="${@}" - printf "${msg}\n" - if [ ! -z "${mddev}" ]; then - mdconfig -d -u ${mddev} - fi - case ${cmd} in - vm-base) - # If the vm-base target fails, the vm-image target - # cannot possibly succeed. Touch the .TARGET file - # so it is not attempted. - touch vm-image - ;; - *) - # FALLTHROUGH - ;; - esac - # Do not allow one failure case to chain through any remaining image - # builds. - return 1 -} - -vm_create_baseimage() { - # Creates the UFS root filesystem for the virtual machine disk, - # written to the formatted disk image with mkimg(1). - # - # Arguments: - # vm-base - - VMBASE="${1}" - WORLDDIR="${2}" - DESTDIR="${3}" - VMSIZE="${4}" - - if [ -z "${VMBASE}" -o -z "${WORLDDIR}" -o -z "${DESTDIR}" \ - -o -z "${VMSIZE}" ]; then - usage - fi - - i=0 - mkdir -p ${DESTDIR} - truncate -s ${VMSIZE} ${VMBASE} - mddev=$(mdconfig -f ${VMBASE}) - newfs -j /dev/${mddev} - mount /dev/${mddev} ${DESTDIR} - cd ${WORLDDIR} && \ - make DESTDIR=${DESTDIR} \ - installworld installkernel distribution || \ - panic "\n\nCannot install the base system to ${DESTDIR}." - chroot ${DESTDIR} /usr/bin/newaliases - echo '# Custom /etc/fstab for FreeBSD VM images' \ - > ${DESTDIR}/etc/fstab - echo '/dev/gpt/rootfs / ufs rw 2 2' \ - >> ${DESTDIR}/etc/fstab - echo '/dev/gpt/swapfs none swap sw 0 0' \ - >> ${DESTDIR}/etc/fstab - sync - while ! umount ${DESTDIR}; do - i=$(( $i + 1 )) - if [ $i -ge 10 ]; then - # This should never happen. But, it has happened. - msg="Cannot umount(8) ${DESTDIR}\n" - msg="${msg}Something has gone horribly wrong." - panic "${msg}" - fi - sleep 1 +main() { + local arg + while getopts "C:c:d:f:i:o:s:S:" arg; do + case "${arg}" in + C) + VMBUILDCONF="${OPTARG}" + ;; + c) + VMCONFIG="${OPTARG}" + ;; + d) + DESTDIR="${OPTARG}" + ;; + f) + VMFORMAT="${OPTARG}" + ;; + i) + VMBASE="${VMBASE}" + ;; + o) + VMIMAGE="${OPTARG}" + ;; + s) + VMSIZE="${OPTARG}" + ;; + S) + WORLDDIR="${OPTARG}" + ;; + *) + ;; + esac done + shift $(( ${OPTIND} - 1)) - return 0 -} - -vm_create_vmdisk() { - # Creates the virtual machine disk image from the raw disk image. - # - # Arguments: - # vm-image " - - VMBASE="${1}" - FORMAT="${2}" - VMIMAGE="${3}" - - if [ -z "${VMBASE}" -o -z "${FORMAT}" -o -z "${VMIMAGE}" ]; then + if [ -z "${VMBASE}" -o \ + -z "${WORLDDIR}" -o \ + -z "${DESTDIR}" -o \ + -z "${VMSIZE}" -o \ + -z "${VMIMAGE}" -o \ + -z "${VMCONFIG}" ]; + then usage fi - mkimg_version=$(mkimg --version 2>/dev/null | awk '{print $2}') - - # We need mkimg(1) '--version' output, at minimum, to be able to - # tell what virtual machine disk image formats are available. - # Bail if mkimg(1) reports an empty '--version' value. - if [ -z "${mkimg_version}" ]; then - msg="Cannot determine mkimg(1) version.\n" - msg="${msg}Cannot continue without a known mkimg(1) version." - panic "${msg}" + if [ -z "${VMBUILDCONF}" ] || [ ! -e "${VMBUILDCONF}" ]; then + echo "Must provide the path to vmimage.subr." + return 1 fi - if ! mkimg --formats 2>/dev/null | grep -q ${FORMAT}; then - panic "'${FORMAT}' is not supported by this mkimg(1).\n" - fi + . "${VMBUILDCONF}" - case ${FORMAT} in - vhd) - mkimg_format=vhdf - ;; - *) - mkimg_format=${FORMAT} - ;; - esac - - mkimg -f ${mkimg_format} -s gpt \ - -b /boot/pmbr -p freebsd-boot/bootfs:=/boot/gptboot \ - -p freebsd-swap/swapfs::1G \ - -p freebsd-ufs/rootfs:=${VMBASE} \ - -o ${VMIMAGE} - - return 0 -} - -main() { - cmd="${1}" - shift 1 + if [ ! -z "${VMCONFIG}" ] && [ -e "${VMCONFIG}" ]; then + . "${VMCONFIG}" + fi - case ${cmd} in - vm-base) - eval vm_create_baseimage "$@" || return 0 - ;; - vm-image) - eval vm_create_vmdisk "$@" || return 0 - ;; - *|\?) - usage - ;; - esac + vm_install_base + vm_extra_install_base + vm_extra_install_packages + vm_extra_install_ports + vm_extra_enable_services + vm_extra_pre_umount + vm_create_disk + vm_extra_create_disk return 0 } Modified: projects/release-vmimage/release/tools/azure.conf ============================================================================== --- projects/release-vmimage/release/tools/azure.conf Wed Nov 5 09:33:02 2014 (r274133) +++ projects/release-vmimage/release/tools/azure.conf Wed Nov 5 13:22:19 2014 (r274134) @@ -12,3 +12,40 @@ export VM_EXTRA_PACKAGES= # Example: #export VM_RC_LIST="apache24" export VM_RC_LIST= + +vm_extra_install_base() { + fetch -o ${DESTDIR}/usr/sbin/waagent \ + http://people.freebsd.org/~gjb/waagent + chmod +x ${DESTDIR}/usr/sbin/waagent + rm -f ${DESTDIR}/etc/resolv.conf + + return 0 +} + +vm_extra_pre_umount() { + chroot ${DESTDIR} env ASSUME_ALWAYS_YES=yes /usr/sbin/pkg install -y \ + python python2 python27 py27-asn1 sudo bash + chroot ${DESTDIR} /usr/sbin/waagent -verbose -install + yes | chroot ${DESTDIR} /usr/sbin/waagent -deprovision + echo 'sshd_enable="YES"' >> ${DESTDIR}/etc/rc.conf + echo 'ifconfig_hn0="SYNCDHCP"' >> ${DESTDIR}/etc/rc.conf + echo 'waagent_enable="YES"' >> ${DESTDIR}/etc/rc.conf + echo 'console="comconsole vidconsole"' >> ${DESTDIR}/boot/loader.conf + echo 'comconsole_speed="115200"' >> ${DESTDIR}/boot/loader.conf + + return 0 +} + +vm_extra_create_disk() { + if [ ! -x "/usr/local/bin/qemu-img" ]; then + env ASSUME_ALWAYS_YES=yes pkg install -y emulators/qemu-devel + fi + + mv ${VMIMAGE} ${VMIMAGE}.raw + size=$(qemu-img info -f raw --output json ${VMIMAGE}.raw | awk '/virtual-size/ {print $2}' | tr -d ',') + size=$(( ( ${size} / ( 1024 * 1024 ) + 1 ) * ( 1024 * 1024 ) )) + qemu-img resize ${VMIMAGE}.raw ${size} + qemu-img convert -f raw -o subformat=fixed -O vpc ${VMIMAGE}.raw ${VMIMAGE} + + return 0 +} Modified: projects/release-vmimage/release/tools/openstack.conf ============================================================================== --- projects/release-vmimage/release/tools/openstack.conf Wed Nov 5 09:33:02 2014 (r274133) +++ projects/release-vmimage/release/tools/openstack.conf Wed Nov 5 13:22:19 2014 (r274134) @@ -8,3 +8,19 @@ export VM_EXTRA_PACKAGES="net/cloud-init # Set to a list of third-party software to enable in rc.conf(5). export VM_RC_LIST="cloudinit" + +vm_extra_install_base() { + fetch -o ${DESTDIR}/usr/sbin/waagent \ + http://people.freebsd.org/~gjb/waagent + chmod +x ${DESTDIR}/usr/sbin/waagent + rm -f ${DESTDIR}/etc/resolv.conf + + return 0 +} + +vm_extra_pre_umount() { + echo 'sshd_enable="YES"' >> ${DESTDIR}/etc/rc.conf + echo 'ifconfig_DEFAULT="SYNCDHCP"' >> ${DESTDIR}/etc/rc.conf + + return 0 +} Added: projects/release-vmimage/release/tools/vmimage.subr ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/release-vmimage/release/tools/vmimage.subr Wed Nov 5 13:22:19 2014 (r274134) @@ -0,0 +1,150 @@ +#!/bin/sh +# +# $FreeBSD$ +# +# +# Common functions for virtual machine image build scripts. +# + +export PATH="/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin" +trap "cleanup" INT QUIT TRAP ABRT TERM + +mkimg_bootcode="/boot/pmbr" +mkimg_partitions="-p freebsd-boot/bootfs:=/boot/gptboot" +mkimg_partitions="${mkimg_partitions} -p freebsd-swap/swapfs::1G" +mkimg_partitions="${mkimg_partitions} freebsd-ufs/rootfs:=${VMBASE}" + +usage() { + echo "${0} usage:" + echo "${@}" + return 1 +} + +err() { + printf "${@}\n" + cleanup + return 1 +} + +cleanup() { + if [ ! -z "${mddev}" ]; then + mdconfig -d -u ${mddev} + fi + umount ${DESTDIR}/dev + umount ${DESTDIR} + + return 0 +} + +vm_create_base() { + # Creates the UFS root filesystem for the virtual machine disk, + # written to the formatted disk image with mkimg(1). + + mkdir -p ${DESTDIR} + truncate -s ${VMSIZE} ${VMBASE} + mddev=$(mdconfig -f ${VMBASE}) + newfs -j /dev/${mddev} + mount /dev/${mddev} ${DESTDIR} + + return 0 +} + +vm_install_base() { + # Installs the FreeBSD userland/kernel to the virtual machine disk. + + cd ${WORLDDIR} && \ + make DESTDIR=${DESTDIR} \ + installworld installkernel distribution || \ + err "\n\nCannot install the base system to ${DESTDIR}." + + echo '# Custom /etc/fstab for FreeBSD VM images' \ + > ${DESTDIR}/etc/fstab + echo '/dev/gpt/rootfs / ufs rw 1 1' \ + >> ${DESTDIR}/etc/fstab + echo '/dev/gpt/swapfs none swap sw 0 0' \ + >> ${DESTDIR}/etc/fstab + + chroot ${DESTDIR} /usr/bin/newaliases + chroot ${DESTDIR} /etc/rc.d/ldconfig forcestart + + return 0 +} + +vm_extra_install_base() { + # Prototype. When overridden, runs extra post-installworld commands + # as needed, based on the target virtual machine image or cloud + # provider image target. + + return 0 +} + +vm_extra_enable_services() { + if [ ! -z "${VM_RC_LIST}" ]; then + for _rcvar in ${VM_RC_LIST}; do + echo ${_rcvar}_enable="YES" >> ${DESTDIR}/etc/rc.conf + done + fi + + return 0 +} + +vm_extra_install_packages() { + chroot ${DESTDIR} env ASSUME_ALWAYS_YES=yes \ + /usr/sbin/pkg bootstrap -y + if [ ! -z "${VM_EXTRA_PACKAGES}" ]; then + chroot ${DESTDIR} env ASSUME_ALWAYS_YES=yes \ + /usr/sbin/pkg install -y ${VM_EXTRA_PACKAGES} + fi + + return 0 +} + +vm_extra_install_ports() { + # Prototype. When overridden, installs additional ports within the + # virtual machine environment. + + return 0 +} + +vm_umount_base() { + i=0 + sync + while ! umount ${DESTDIR}/dev ${DESTDIR}; do + i=$(( $i + 1 )) + if [ $i -ge 10 ]; then + # This should never happen. But, it has happened. + msg="Cannot umount(8) ${DESTDIR}\n" + msg="${msg}Something has gone horribly wrong." + err "${msg}" + fi + sleep 1 + done + + return 0 +} + +vm_create_disk() { + if [ -z "${mkimg_paritions}" ]; then + err "No partition types specified. Skipping." + return 1 + fi + echo "Creating image... Please wait." + echo + mkimg -f ${mkimg_format} -s ${mkimg_scheme} \ + ${mkimg_bootcode} \ + ${mkimg_partitions} \ + ${mkimg_outfile} + + mkimg -b /boot/pmbr -p freebsd-boot/bootfs:=/boot/gptboot \ + -p freebsd-swap/swapfs::1G \ + -p freebsd-ufs/rootfs:=${VMBASE} \ + -o ${VMIMAGE}.raw + + return 0 +} + +vm_extra_create_disk() { + + return 0 +} + From owner-svn-src-projects@FreeBSD.ORG Thu Nov 6 23:35:23 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C93E6177; Thu, 6 Nov 2014 23:35:23 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B49ADECE; Thu, 6 Nov 2014 23:35:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sA6NZNEs042418; Thu, 6 Nov 2014 23:35:23 GMT (envelope-from melifaro@FreeBSD.org) Received: (from melifaro@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sA6NZMfk042414; Thu, 6 Nov 2014 23:35:22 GMT (envelope-from melifaro@FreeBSD.org) Message-Id: <201411062335.sA6NZMfk042414@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: melifaro set sender to melifaro@FreeBSD.org using -f From: "Alexander V. Chernikov" Date: Thu, 6 Nov 2014 23:35:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274204 - in projects/routing/sys: net netinet netinet6 X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Nov 2014 23:35:24 -0000 Author: melifaro Date: Thu Nov 6 23:35:22 2014 New Revision: 274204 URL: https://svnweb.freebsd.org/changeset/base/274204 Log: Convert lle rtchecks to use new routing API. For inet/ case, this involves reverting r225947 which seem to be pretty strange commit and should be reverted in HEAD ad well. Modified: projects/routing/sys/net/rt_nhops.c projects/routing/sys/net/rt_nhops.h projects/routing/sys/netinet/in.c projects/routing/sys/netinet6/in6.c Modified: projects/routing/sys/net/rt_nhops.c ============================================================================== --- projects/routing/sys/net/rt_nhops.c Thu Nov 6 22:53:50 2014 (r274203) +++ projects/routing/sys/net/rt_nhops.c Thu Nov 6 23:35:22 2014 (r274204) @@ -498,6 +498,42 @@ fib4_lookup_nh_basic(uint32_t fibnum, st return (ENOENT); } +int +fib4_lookup_nh_ifp(uint32_t fibnum, struct in_addr dst, uint32_t flowid, + struct nhop4_basic *pnh4) +{ + struct radix_node_head *rnh; + struct radix_node *rn; + struct sockaddr_in sin; + struct rtentry *rte; + + KASSERT((fibnum < rt_numfibs), ("fib4_lookup_nh_ifp: bad fibnum")); + rnh = rt_tables_get_rnh(fibnum, AF_INET); + if (rnh == NULL) + return (ENOENT); + + /* Prepare lookup key */ + memset(&sin, 0, sizeof(sin)); + sin.sin_len = sizeof(struct sockaddr_in); + sin.sin_addr = dst; + + RADIX_NODE_HEAD_RLOCK(rnh); + rn = rnh->rnh_matchaddr((void *)&sin, rnh); + if (rn != NULL && ((rn->rn_flags & RNF_ROOT) == 0)) { + rte = RNTORT(rn); + /* Ensure route & ifp is UP */ + if (RT_LINK_IS_UP(rte->rt_ifp)) { + fib4_rte_to_nh_basic(rte, dst, pnh4); + RADIX_NODE_HEAD_RUNLOCK(rnh); + pnh4->nh_ifp = rte->rt_ifp; + return (0); + } + } + RADIX_NODE_HEAD_RUNLOCK(rnh); + + return (ENOENT); +} + /* * Performs IPv4 route table lookup on @dst. Returns 0 on success. * Stores extende nexthop info provided @pnh4 structure. Modified: projects/routing/sys/net/rt_nhops.h ============================================================================== --- projects/routing/sys/net/rt_nhops.h Thu Nov 6 22:53:50 2014 (r274203) +++ projects/routing/sys/net/rt_nhops.h Thu Nov 6 23:35:22 2014 (r274204) @@ -169,6 +169,7 @@ struct nhop4_extended { uint64_t spare2[2]; }; +/* Does not differ from nhop6_basic */ struct nhop6_extended { struct ifnet *nh_ifp; /* Logical egress interface */ uint16_t nh_mtu; /* nexthop mtu */ @@ -178,6 +179,27 @@ struct nhop6_extended { uint64_t spare2[2]; }; +/* route info used for control plane purposes */ +struct rt4_basic { + struct in_addr rt_addr; /* route prefix */ + struct in_addr rt_gateway; /* GW used */ + int rt_flags; /* Copy of rte flags */ + uint16_t rt_mtu; + uint16_t rt_nhop; /* nexthop id (might bi mpath) */ + struct in_addr rt_mask; /* route mask */ + uint16_t spare[2]; +}; + +struct rt6_basic { + struct in6_addr rt_addr; + struct in6_addr rt_gateway; + int rt_flags; + uint16_t rt_mtu; + uint16_t rt_nhop; + uint8_t rt_mask; + uint8_t spare[7]; +}; + struct nhopu_extended { union { struct nhop4_extended nh4; @@ -200,6 +222,8 @@ struct route_compat { int ro_flags; }; +int fib4_lookup_nh_ifp(uint32_t fibnum, struct in_addr dst, uint32_t flowid, + struct nhop4_basic *pnh4); int fib4_lookup_nh_basic(uint32_t fibnum, struct in_addr dst, uint32_t flowid, struct nhop4_basic *pnh4); int fib4_lookup_nh_ext(uint32_t fibnum, struct in_addr dst, Modified: projects/routing/sys/netinet/in.c ============================================================================== --- projects/routing/sys/netinet/in.c Thu Nov 6 22:53:50 2014 (r274203) +++ projects/routing/sys/netinet/in.c Thu Nov 6 23:35:22 2014 (r274204) @@ -56,7 +56,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include @@ -69,6 +68,8 @@ __FBSDID("$FreeBSD$"); #include #include +#include + static int in_aifaddr_ioctl(u_long, caddr_t, struct ifnet *, struct thread *); static int in_difaddr_ioctl(caddr_t, struct ifnet *, struct thread *); @@ -1007,16 +1008,14 @@ in_lltable_prefix_free(struct lltable *l static int in_lltable_rtcheck(struct ifnet *ifp, u_int flags, const struct sockaddr *l3addr) { - struct rtentry *rt; + struct nhop4_basic nh4; + struct in_addr dst; KASSERT(l3addr->sa_family == AF_INET, ("sin_family %d", l3addr->sa_family)); - /* XXX rtalloc1_fib should take a const param */ - rt = rtalloc1_fib(__DECONST(struct sockaddr *, l3addr), 0, 0, - ifp->if_fib); - - if (rt == NULL) + dst = ((struct sockaddr_in *)l3addr)->sin_addr; + if (fib4_lookup_nh_ifp(ifp->if_fib, dst, 0, &nh4) != 0) return (EINVAL); /* @@ -1024,57 +1023,26 @@ in_lltable_rtcheck(struct ifnet *ifp, u_ * address, which is a special route inserted by some implementation * such as MANET, and the interface is of the correct type, then * allow for ARP to proceed. + * XXX: !RTF_HOST condition (temporarily) skipped. */ - if (rt->rt_flags & RTF_GATEWAY) { - if (!(rt->rt_flags & RTF_HOST) || !rt->rt_ifp || - rt->rt_ifp->if_type != IFT_ETHER || - (rt->rt_ifp->if_flags & (IFF_NOARP | IFF_STATICARP)) != 0 || - memcmp(rt->rt_gateway->sa_data, l3addr->sa_data, - sizeof(in_addr_t)) != 0) { - RTFREE_LOCKED(rt); - return (EINVAL); - } - } - - /* - * Make sure that at least the destination address is covered - * by the route. This is for handling the case where 2 or more - * interfaces have the same prefix. An incoming packet arrives - * on one interface and the corresponding outgoing packet leaves - * another interface. - */ - if (!(rt->rt_flags & RTF_HOST) && rt->rt_ifp != ifp) { - const char *sa, *mask, *addr, *lim; - int len; - - mask = (const char *)rt_mask(rt); - /* - * Just being extra cautious to avoid some custom - * code getting into trouble. - */ - if (mask == NULL) { - RTFREE_LOCKED(rt); + if (nh4.nh_flags & NHF_GATEWAY) { + if (nh4.nh_ifp->if_type != IFT_ETHER || + (nh4.nh_ifp->if_flags & (IFF_NOARP | IFF_STATICARP)) != 0 || + nh4.nh_addr.s_addr != dst.s_addr) { return (EINVAL); } - sa = (const char *)rt_key(rt); - addr = (const char *)l3addr; - len = ((const struct sockaddr_in *)l3addr)->sin_len; - lim = addr + len; + return (0); + } - for ( ; addr < lim; sa++, mask++, addr++) { - if ((*sa ^ *addr) & *mask) { + if (((nh4.nh_flags & NHF_GATEWAY) != 0) || nh4.nh_ifp != ifp) { #ifdef DIAGNOSTIC - log(LOG_INFO, "IPv4 address: \"%s\" is not on the network\n", - inet_ntoa(((const struct sockaddr_in *)l3addr)->sin_addr)); + log(LOG_INFO, "IPv4 address: \"%s\" is not on the network\n", + inet_ntoa(dst)); #endif - RTFREE_LOCKED(rt); - return (EINVAL); - } - } + return (EINVAL); } - RTFREE_LOCKED(rt); return (0); } Modified: projects/routing/sys/netinet6/in6.c ============================================================================== --- projects/routing/sys/netinet6/in6.c Thu Nov 6 22:53:50 2014 (r274203) +++ projects/routing/sys/netinet6/in6.c Thu Nov 6 23:35:22 2014 (r274204) @@ -108,6 +108,8 @@ __FBSDID("$FreeBSD$"); #include #include +#include + VNET_DECLARE(int, icmp6_nodeinfo_oldmcprefix); #define V_icmp6_nodeinfo_oldmcprefix VNET(icmp6_nodeinfo_oldmcprefix) @@ -2166,17 +2168,20 @@ in6_lltable_rtcheck(struct ifnet *ifp, u_int flags, const struct sockaddr *l3addr) { - struct rtentry *rt; + struct nhop6_basic nh6; + struct in6_addr dst; + uint32_t scopeid; + int error; char ip6buf[INET6_ADDRSTRLEN]; KASSERT(l3addr->sa_family == AF_INET6, ("sin_family %d", l3addr->sa_family)); /* Our local addresses are always only installed on the default FIB. */ - /* XXX rtalloc1 should take a const param */ - rt = in6_rtalloc1(__DECONST(struct sockaddr *, l3addr), 0, 0, - RT_DEFAULT_FIB); - if (rt == NULL || (rt->rt_flags & RTF_GATEWAY) || rt->rt_ifp != ifp) { + + in6_splitscope(&((struct sockaddr_in6 *)l3addr)->sin6_addr, &dst, &scopeid); + error = fib6_lookup_nh_ifp(RT_DEFAULT_FIB, &dst, scopeid, 0, &nh6); + if (error != 0 || ((nh6.nh_flags & NHF_GATEWAY) != 0) || nh6.nh_ifp != ifp) { struct ifaddr *ifa; /* * Create an ND6 cache for an IPv6 neighbor @@ -2186,17 +2191,12 @@ in6_lltable_rtcheck(struct ifnet *ifp, ifa = ifaof_ifpforaddr(__DECONST(struct sockaddr *, l3addr), ifp); if (ifa != NULL) { ifa_free(ifa); - if (rt != NULL) - RTFREE_LOCKED(rt); return 0; } log(LOG_INFO, "IPv6 address: \"%s\" is not on the network\n", ip6_sprintf(ip6buf, &((const struct sockaddr_in6 *)l3addr)->sin6_addr)); - if (rt != NULL) - RTFREE_LOCKED(rt); return EINVAL; } - RTFREE_LOCKED(rt); return 0; } From owner-svn-src-projects@FreeBSD.ORG Fri Nov 7 00:28:07 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 305CA629; Fri, 7 Nov 2014 00:28:07 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1C5708C9; Fri, 7 Nov 2014 00:28:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sA70S6Mn067431; Fri, 7 Nov 2014 00:28:06 GMT (envelope-from melifaro@FreeBSD.org) Received: (from melifaro@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sA70S63H067429; Fri, 7 Nov 2014 00:28:06 GMT (envelope-from melifaro@FreeBSD.org) Message-Id: <201411070028.sA70S63H067429@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: melifaro set sender to melifaro@FreeBSD.org using -f From: "Alexander V. Chernikov" Date: Fri, 7 Nov 2014 00:28:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274207 - in projects/routing/sys/fs: nfs nfsclient X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Nov 2014 00:28:07 -0000 Author: melifaro Date: Fri Nov 7 00:28:06 2014 New Revision: 274207 URL: https://svnweb.freebsd.org/changeset/base/274207 Log: Convert nfsclient SAS to use new routing API. Btw original code should be rewritten not to use static variables. Modified: projects/routing/sys/fs/nfs/nfsport.h projects/routing/sys/fs/nfsclient/nfs_clport.c Modified: projects/routing/sys/fs/nfs/nfsport.h ============================================================================== --- projects/routing/sys/fs/nfs/nfsport.h Fri Nov 7 00:10:07 2014 (r274206) +++ projects/routing/sys/fs/nfs/nfsport.h Fri Nov 7 00:28:06 2014 (r274207) @@ -80,9 +80,7 @@ #include #include #include -#include #include -#include #include #include #include Modified: projects/routing/sys/fs/nfsclient/nfs_clport.c ============================================================================== --- projects/routing/sys/fs/nfsclient/nfs_clport.c Fri Nov 7 00:10:07 2014 (r274206) +++ projects/routing/sys/fs/nfsclient/nfs_clport.c Fri Nov 7 00:28:06 2014 (r274207) @@ -45,7 +45,10 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include +#include #include +#include #include @@ -969,8 +972,6 @@ nfscl_loadfsinfo(struct nfsmount *nmp, s u_int8_t * nfscl_getmyip(struct nfsmount *nmp, int *isinet6p) { - struct sockaddr_in sad, *sin; - struct rtentry *rt; u_int8_t *retp = NULL; static struct in_addr laddr; @@ -979,52 +980,30 @@ nfscl_getmyip(struct nfsmount *nmp, int * Loop up a route for the destination address. */ if (nmp->nm_nam->sa_family == AF_INET) { - bzero(&sad, sizeof (sad)); - sin = (struct sockaddr_in *)nmp->nm_nam; - sad.sin_family = AF_INET; - sad.sin_len = sizeof (struct sockaddr_in); - sad.sin_addr.s_addr = sin->sin_addr.s_addr; + struct in_addr dst; + struct nhop4_extended nh4; + dst = ((struct sockaddr_in *)nmp->nm_nam)->sin_addr; + CURVNET_SET(CRED_TO_VNET(nmp->nm_sockreq.nr_cred)); - rt = rtalloc1_fib((struct sockaddr *)&sad, 0, 0UL, - curthread->td_proc->p_fibnum); - if (rt != NULL) { - if (rt->rt_ifp != NULL && - rt->rt_ifa != NULL && - ((rt->rt_ifp->if_flags & IFF_LOOPBACK) == 0) && - rt->rt_ifa->ifa_addr->sa_family == AF_INET) { - sin = (struct sockaddr_in *) - rt->rt_ifa->ifa_addr; - laddr.s_addr = sin->sin_addr.s_addr; - retp = (u_int8_t *)&laddr; - } - RTFREE_LOCKED(rt); + if (fib4_lookup_nh_ext(curthread->td_proc->p_fibnum, + dst, 0, 0, &nh4) == 0) { + laddr = nh4.nh_src; + retp = (u_int8_t *)&laddr; } CURVNET_RESTORE(); #ifdef INET6 } else if (nmp->nm_nam->sa_family == AF_INET6) { - struct sockaddr_in6 sad6, *sin6; static struct in6_addr laddr6; + struct in6_addr dst; + uint32_t scopeid; - bzero(&sad6, sizeof (sad6)); - sin6 = (struct sockaddr_in6 *)nmp->nm_nam; - sad6.sin6_family = AF_INET6; - sad6.sin6_len = sizeof (struct sockaddr_in6); - sad6.sin6_addr = sin6->sin6_addr; CURVNET_SET(CRED_TO_VNET(nmp->nm_sockreq.nr_cred)); - rt = rtalloc1_fib((struct sockaddr *)&sad6, 0, 0UL, - curthread->td_proc->p_fibnum); - if (rt != NULL) { - if (rt->rt_ifp != NULL && - rt->rt_ifa != NULL && - ((rt->rt_ifp->if_flags & IFF_LOOPBACK) == 0) && - rt->rt_ifa->ifa_addr->sa_family == AF_INET6) { - sin6 = (struct sockaddr_in6 *) - rt->rt_ifa->ifa_addr; - laddr6 = sin6->sin6_addr; - retp = (u_int8_t *)&laddr6; - *isinet6p = 1; - } - RTFREE_LOCKED(rt); + in6_splitscope(&((struct sockaddr_in6 *)nmp->nm_nam)->sin6_addr, + &dst, &scopeid); + if (in6_selectsrc_addr(curthread->td_proc->p_fibnum, + &dst, scopeid, &laddr6) == 0) { + retp = (u_int8_t *)&laddr6; + *isinet6p = 1; } CURVNET_RESTORE(); #endif From owner-svn-src-projects@FreeBSD.ORG Fri Nov 7 00:29:02 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 040E8716; Fri, 7 Nov 2014 00:29:02 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CBECC8D1; Fri, 7 Nov 2014 00:29:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sA70T1qD067597; Fri, 7 Nov 2014 00:29:01 GMT (envelope-from melifaro@FreeBSD.org) Received: (from melifaro@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sA70T1C5067593; Fri, 7 Nov 2014 00:29:01 GMT (envelope-from melifaro@FreeBSD.org) Message-Id: <201411070029.sA70T1C5067593@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: melifaro set sender to melifaro@FreeBSD.org using -f From: "Alexander V. Chernikov" Date: Fri, 7 Nov 2014 00:29:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274208 - projects/routing/sys/netinet X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Nov 2014 00:29:02 -0000 Author: melifaro Date: Fri Nov 7 00:29:00 2014 New Revision: 274208 URL: https://svnweb.freebsd.org/changeset/base/274208 Log: Remove legacy inet lookup functions. Modified: projects/routing/sys/netinet/in_rmx.c projects/routing/sys/netinet/in_var.h Modified: projects/routing/sys/netinet/in_rmx.c ============================================================================== --- projects/routing/sys/netinet/in_rmx.c Fri Nov 7 00:28:06 2014 (r274207) +++ projects/routing/sys/netinet/in_rmx.c Fri Nov 7 00:29:00 2014 (r274208) @@ -459,12 +459,6 @@ in_ifadown(struct ifaddr *ifa, int delet * for now will just reference the _fib variants. * eventually this order will be reversed, */ -void -in_rtalloc_ign(struct route *ro, u_long ignflags, u_int fibnum) -{ - rtalloc_ign_fib(ro, ignflags, fibnum); -} - int in_rtrequest( int req, struct sockaddr *dst, @@ -478,12 +472,6 @@ in_rtrequest( int req, flags, ret_nrt, fibnum)); } -struct rtentry * -in_rtalloc1(struct sockaddr *dst, int report, u_long ignflags, u_int fibnum) -{ - return (rtalloc1_fib(dst, report, ignflags, fibnum)); -} - void in_rtredirect(struct sockaddr *dst, struct sockaddr *gateway, @@ -495,12 +483,6 @@ in_rtredirect(struct sockaddr *dst, rtredirect_fib(dst, gateway, netmask, flags, src, fibnum); } -void -in_rtalloc(struct route *ro, u_int fibnum) -{ - rtalloc_ign_fib(ro, 0UL, fibnum); -} - #if 0 int in_rt_getifa(struct rt_addrinfo *, u_int fibnum); int in_rtioctl(u_long, caddr_t, u_int); Modified: projects/routing/sys/netinet/in_var.h ============================================================================== --- projects/routing/sys/netinet/in_var.h Fri Nov 7 00:28:06 2014 (r274207) +++ projects/routing/sys/netinet/in_var.h Fri Nov 7 00:29:00 2014 (r274208) @@ -381,7 +381,6 @@ inm_acquire_locked(struct in_multi *inm) #define MCAST_MUTED 3 /* [deprecated] */ struct rtentry; -struct route; struct ip_moptions; struct radix_node_head; @@ -419,9 +418,6 @@ void in_domifdetach(struct ifnet *, void /* XXX */ -void in_rtalloc_ign(struct route *ro, u_long ignflags, u_int fibnum); -void in_rtalloc(struct route *ro, u_int fibnum); -struct rtentry *in_rtalloc1(struct sockaddr *, int, u_long, u_int); void in_rtredirect(struct sockaddr *, struct sockaddr *, struct sockaddr *, int, struct sockaddr *, u_int); int in_rtrequest(int, struct sockaddr *, From owner-svn-src-projects@FreeBSD.ORG Fri Nov 7 01:48:13 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B125DB5; Fri, 7 Nov 2014 01:48:13 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 841161F3; Fri, 7 Nov 2014 01:48:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sA71mDcu005190; Fri, 7 Nov 2014 01:48:13 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sA71mDfT005189; Fri, 7 Nov 2014 01:48:13 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201411070148.sA71mDfT005189@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Fri, 7 Nov 2014 01:48:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274211 - projects/release-vmimage/release/tools X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Nov 2014 01:48:13 -0000 Author: gjb Date: Fri Nov 7 01:48:12 2014 New Revision: 274211 URL: https://svnweb.freebsd.org/changeset/base/274211 Log: Add write_partition_layout() used to populate the final image. Fix duplicated mkimg(1) call in vm_create_disk(). Add primitive (untested) PowerPC/PowerPC64 VM image support. Note: As it is currently written, the /boot/pmbr and /boot/{gptboot,boot1.hfs} use the build host and not the target build. Fixing this is likely going to be a hack in itself. Sponsored by: The FreeBSD Foundation Modified: projects/release-vmimage/release/tools/vmimage.subr Modified: projects/release-vmimage/release/tools/vmimage.subr ============================================================================== --- projects/release-vmimage/release/tools/vmimage.subr Fri Nov 7 01:36:20 2014 (r274210) +++ projects/release-vmimage/release/tools/vmimage.subr Fri Nov 7 01:48:12 2014 (r274211) @@ -9,10 +9,31 @@ export PATH="/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin" trap "cleanup" INT QUIT TRAP ABRT TERM -mkimg_bootcode="/boot/pmbr" -mkimg_partitions="-p freebsd-boot/bootfs:=/boot/gptboot" -mkimg_partitions="${mkimg_partitions} -p freebsd-swap/swapfs::1G" -mkimg_partitions="${mkimg_partitions} freebsd-ufs/rootfs:=${VMBASE}" +write_partition_layout() { + + case "${TARGET}:${TARGET_ARCH}" in + amd64:amd64 | i386:i386) + mkimg -f gpt -b /boot/pmbr \ + -p freebsd-boot/bootfs:=/boot/gptboot \ + -p freebsd-swap/swapfs::1G \ + -p freebsd-ufs/rootfs:=${VMBASE} + -o ${VMIMAGE} + ;; + powerpc:powerpc*) + mkimg -f apm \ + -p freebsd-boot/bootfs:=/boot/boot1.hfs \ + -p freebsd-swap/swapfs::1G \ + -p freebsd-ufs/rootfs:=${VMBASE} + -o ${VMIMAGE} + ;; + *) + # ENOTSUPP + return 1 + ;; + esac + + return 0 +} usage() { echo "${0} usage:" @@ -130,15 +151,8 @@ vm_create_disk() { fi echo "Creating image... Please wait." echo - mkimg -f ${mkimg_format} -s ${mkimg_scheme} \ - ${mkimg_bootcode} \ - ${mkimg_partitions} \ - ${mkimg_outfile} - - mkimg -b /boot/pmbr -p freebsd-boot/bootfs:=/boot/gptboot \ - -p freebsd-swap/swapfs::1G \ - -p freebsd-ufs/rootfs:=${VMBASE} \ - -o ${VMIMAGE}.raw + + write_partition_layout || return 1 return 0 } From owner-svn-src-projects@FreeBSD.ORG Fri Nov 7 02:04:49 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6918144E; Fri, 7 Nov 2014 02:04:49 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 54EB63EF; Fri, 7 Nov 2014 02:04:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sA724nkD014118; Fri, 7 Nov 2014 02:04:49 GMT (envelope-from melifaro@FreeBSD.org) Received: (from melifaro@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sA724mGK014115; Fri, 7 Nov 2014 02:04:48 GMT (envelope-from melifaro@FreeBSD.org) Message-Id: <201411070204.sA724mGK014115@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: melifaro set sender to melifaro@FreeBSD.org using -f From: "Alexander V. Chernikov" Date: Fri, 7 Nov 2014 02:04:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274212 - in projects/routing/sys: net netgraph/netflow X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Nov 2014 02:04:49 -0000 Author: melifaro Date: Fri Nov 7 02:04:48 2014 New Revision: 274212 URL: https://svnweb.freebsd.org/changeset/base/274212 Log: Add new rib4/rib6 series of functions returning per-rte info packed on stack. Convert ng_netflow to use new routing API. Modified: projects/routing/sys/net/rt_nhops.c projects/routing/sys/net/rt_nhops.h projects/routing/sys/netgraph/netflow/netflow.c Modified: projects/routing/sys/net/rt_nhops.c ============================================================================== --- projects/routing/sys/net/rt_nhops.c Fri Nov 7 01:48:12 2014 (r274211) +++ projects/routing/sys/net/rt_nhops.c Fri Nov 7 02:04:48 2014 (r274212) @@ -117,6 +117,8 @@ int fwd_destroy_fib(struct fwd_module *f static inline uint16_t fib_rte_to_nh_flags(int rt_flags); #ifdef INET +static void rib4_rte_to_nh_extended(struct rtentry *rte, struct in_addr dst, + struct rt4_extended *prt4); static void fib4_rte_to_nh_extended(struct rtentry *rte, struct in_addr dst, struct nhop4_extended *pnh4); static void fib4_rte_to_nh_basic(struct rtentry *rte, struct in_addr dst, @@ -452,6 +454,39 @@ fib4_rte_to_nh_extended(struct rtentry * pnh4->nh_src = IA_SIN(ia)->sin_addr; } +static void +rib4_rte_to_nh_extended(struct rtentry *rte, struct in_addr dst, + struct rt4_extended *prt4) +{ + struct sockaddr_in *gw; + struct in_ifaddr *ia; + + /* Do explicit nexthop zero unless we're copying it */ + memset(prt4, 0, sizeof(*prt4)); + + gw = ((struct sockaddr_in *)rt_key(rte)); + prt4->rt_addr = gw->sin_addr; + gw = ((struct sockaddr_in *)rt_mask(rte)); + prt4->rt_mask.s_addr = (gw != NULL) ? + gw->sin_addr.s_addr : INADDR_BROADCAST; + + if (rte->rt_flags & RTF_GATEWAY) { + gw = (struct sockaddr_in *)rte->rt_gateway; + prt4->rt_gateway = gw->sin_addr; + } else + prt4->rt_gateway = dst; + + prt4->rt_lifp = rte->rt_ifp; + prt4->rt_aifp = rte->rt_ifa->ifa_ifp; + prt4->rt_flags = rte->rt_flags; + prt4->rt_mtu = min(rte->rt_mtu, rte->rt_ifp->if_mtu); + + prt4->rt_nhop = 0; /* XXX: fill real nexthop */ + + ia = ifatoia(rte->rt_ifa); + prt4->rt_src = IA_SIN(ia)->sin_addr; +} + /* * Performs IPv4 route table lookup on @dst. Returns 0 on success. * Stores nexthop info provided @pnh4 structure. @@ -588,6 +623,50 @@ fib4_free_nh_ext(uint32_t fibnum, struct } +int +rib4_lookup_nh_ext(uint32_t fibnum, struct in_addr dst, uint32_t flowid, + uint32_t flags, struct rt4_extended *prt4) +{ + struct radix_node_head *rnh; + struct radix_node *rn; + struct sockaddr_in sin; + struct rtentry *rte; + + KASSERT((fibnum < rt_numfibs), ("rib4_lookup_nh_ext: bad fibnum")); + rnh = rt_tables_get_rnh(fibnum, AF_INET); + if (rnh == NULL) + return (ENOENT); + + /* Prepare lookup key */ + memset(&sin, 0, sizeof(sin)); + sin.sin_len = sizeof(struct sockaddr_in); + sin.sin_addr = dst; + + RADIX_NODE_HEAD_RLOCK(rnh); + rn = rnh->rnh_matchaddr((void *)&sin, rnh); + if (rn != NULL && ((rn->rn_flags & RNF_ROOT) == 0)) { + rte = RNTORT(rn); + /* Ensure route & ifp is UP */ + if (RT_LINK_IS_UP(rte->rt_ifp)) { + rib4_rte_to_nh_extended(rte, dst, prt4); + if ((flags & NHOP_LOOKUP_REF) != 0) { + /* TODO: Do lwref on egress ifp's */ + } + RADIX_NODE_HEAD_RUNLOCK(rnh); + return (0); + } + } + RADIX_NODE_HEAD_RUNLOCK(rnh); + + return (ENOENT); +} + +void +rib4_free_nh_ext(uint32_t fibnum, struct rt4_extended *prt4) +{ + +} + #endif #ifdef INET6 @@ -898,6 +977,36 @@ fib6_lla_to_nh_extended(struct in6_addr } static int +rib6_lla_to_nh_extended(struct in6_addr *dst, uint32_t scopeid, + struct rt6_extended *prt6) +{ + struct ifnet *ifp; + + ifp = ifnet_byindex_locked(scopeid); + if (ifp == NULL) + return (ENOENT); + + /* Do explicit nexthop zero unless we're copying it */ + memset(prt6, 0, sizeof(*prt6)); + + prt6->rt_addr.s6_addr16[0] = htons(0xFE80); + prt6->rt_mask = 64; /* XXX check RFC */ + + prt6->rt_aifp = ifp; + prt6->rt_lifp = ifp; + /* Check id this is for-us address */ + if (in6_ifawithifp_lla(ifp, dst)) { + if ((ifp = V_loif) != NULL) + prt6->rt_lifp = ifp; + } + + prt6->rt_mtu = IN6_LINKMTU(ifp); + /* No flags set */ + + return (0); +} + +static int fib6_lla_to_nh(struct in6_addr *dst, uint32_t scopeid, struct nhop_prepend *nh, struct ifnet **lifp) { @@ -979,6 +1088,37 @@ fib6_rte_to_nh_extended(struct rtentry * ia = ifatoia6(rte->rt_ifa); } +#define ipv6_masklen(x) bitcount32((x).__u6_addr.__u6_addr32[0]) + \ + bitcount32((x).__u6_addr.__u6_addr32[1]) + \ + bitcount32((x).__u6_addr.__u6_addr32[2]) + \ + bitcount32((x).__u6_addr.__u6_addr32[3]) +static void +rib6_rte_to_nh_extended(struct rtentry *rte, struct in6_addr *dst, + struct rt6_extended *prt6) +{ + struct sockaddr_in6 *gw; + + /* Do explicit nexthop zero unless we're copying it */ + memset(prt6, 0, sizeof(*prt6)); + + gw = ((struct sockaddr_in6 *)rt_key(rte)); + prt6->rt_addr = gw->sin6_addr; + gw = ((struct sockaddr_in6 *)rt_mask(rte)); + prt6->rt_mask = (gw != NULL) ? ipv6_masklen(gw->sin6_addr) : 128; + + if (rte->rt_flags & RTF_GATEWAY) { + gw = (struct sockaddr_in6 *)rte->rt_gateway; + prt6->rt_gateway = gw->sin6_addr; + in6_clearscope(&prt6->rt_gateway); + } else + prt6->rt_gateway = *dst; + + prt6->rt_lifp = rte->rt_ifp; + prt6->rt_aifp = ifnet_byindex(fib6_get_ifa(rte)); + prt6->rt_flags = fib_rte_to_nh_flags(rte->rt_flags); + prt6->rt_mtu = min(rte->rt_mtu, IN6_LINKMTU(rte->rt_ifp)); +} + int fib6_lookup_nh_ifp(uint32_t fibnum, struct in6_addr *dst, uint32_t scopeid, uint32_t flowid, struct nhop6_basic *pnh6) @@ -990,6 +1130,7 @@ fib6_lookup_nh_ifp(uint32_t fibnum, stru if (IN6_IS_SCOPE_LINKLOCAL(dst)) { /* Do not lookup link-local addresses in rtable */ + /* XXX: Check if dst is local */ return (fib6_lla_to_nh_basic(dst, scopeid, pnh6)); } @@ -1124,6 +1265,59 @@ fib6_free_nh_ext(uint32_t fibnum, struct } +int +rib6_lookup_nh_ext(uint32_t fibnum, struct in6_addr *dst, uint32_t scopeid, + uint32_t flowid, uint32_t flags, struct rt6_extended *prt6) +{ + struct radix_node_head *rnh; + struct radix_node *rn; + struct sockaddr_in6 sin6; + struct rtentry *rte; + + if (IN6_IS_SCOPE_LINKLOCAL(dst)) { + /* Do not lookup link-local addresses in rtable */ + /* XXX: Do lwref on egress ifp */ + return (rib6_lla_to_nh_extended(dst, scopeid, prt6)); + } + + KASSERT((fibnum < rt_numfibs), ("rib6_lookup_nh_ext: bad fibnum")); + rnh = rt_tables_get_rnh(fibnum, AF_INET6); + if (rnh == NULL) + return (ENOENT); + + /* Prepare lookup key */ + memset(&sin6, 0, sizeof(sin6)); + sin6.sin6_len = sizeof(struct sockaddr_in6); + sin6.sin6_addr = *dst; + sin6.sin6_scope_id = scopeid; + sa6_embedscope(&sin6, 0); + + RADIX_NODE_HEAD_RLOCK(rnh); + rn = rnh->rnh_matchaddr((void *)&sin6, rnh); + if (rn != NULL && ((rn->rn_flags & RNF_ROOT) == 0)) { + rte = RNTORT(rn); + /* Ensure route & ifp is UP */ + if (RT_LINK_IS_UP(rte->rt_ifp)) { + rib6_rte_to_nh_extended(rte, dst, prt6); + if ((flags & NHOP_LOOKUP_REF) != 0) { + /* TODO: Do lwref on egress ifp's */ + } + RADIX_NODE_HEAD_RUNLOCK(rnh); + + return (0); + } + } + RADIX_NODE_HEAD_RUNLOCK(rnh); + + return (ENOENT); +} + +void +rib6_free_nh_ext(uint32_t fibnum, struct nhop6_extended *prt6) +{ + +} + #endif void Modified: projects/routing/sys/net/rt_nhops.h ============================================================================== --- projects/routing/sys/net/rt_nhops.h Fri Nov 7 01:48:12 2014 (r274211) +++ projects/routing/sys/net/rt_nhops.h Fri Nov 7 02:04:48 2014 (r274212) @@ -180,23 +180,28 @@ struct nhop6_extended { }; /* route info used for control plane purposes */ -struct rt4_basic { +struct rt4_extended { struct in_addr rt_addr; /* route prefix */ struct in_addr rt_gateway; /* GW used */ + struct ifnet *rt_lifp; /* logical interface */ + struct ifnet *rt_aifp; /* address interface */ int rt_flags; /* Copy of rte flags */ uint16_t rt_mtu; uint16_t rt_nhop; /* nexthop id (might bi mpath) */ struct in_addr rt_mask; /* route mask */ + struct in_addr rt_src; uint16_t spare[2]; }; -struct rt6_basic { +struct rt6_extended { struct in6_addr rt_addr; struct in6_addr rt_gateway; + struct ifnet *rt_lifp; /* logical interface */ + struct ifnet *rt_aifp; /* address interface */ int rt_flags; uint16_t rt_mtu; uint16_t rt_nhop; - uint8_t rt_mask; + uint8_t rt_mask; /*Hopefully, no more non-config masks */ uint8_t spare[7]; }; @@ -230,6 +235,9 @@ int fib4_lookup_nh_ext(uint32_t fibnum, uint32_t flowid, uint32_t flags, struct nhop4_extended *pnh4); void fib4_free_nh_ext(uint32_t fibnum, struct nhop4_extended *pnh4); #define NHOP_LOOKUP_REF 0x01 +int rib4_lookup_nh_ext(uint32_t fibnum, struct in_addr dst, uint32_t flowid, + uint32_t flags, struct rt4_extended *prt4); +void rib4_free_nh_ext(uint32_t fibnum, struct rt4_extended *prt4); int fib6_lookup_nh_ifp(uint32_t fibnum, struct in6_addr *dst, uint32_t scopeid, @@ -240,6 +248,9 @@ int fib6_lookup_nh_ext(uint32_t fibnum, uint32_t scopeid, uint32_t flowid, uint32_t flags, struct nhop6_extended *pnh6); void fib6_free_nh_ext(uint32_t fibnum, struct nhop6_extended *pnh6); +int rib6_lookup_nh_ext(uint32_t fibnum, struct in6_addr *dst, uint32_t scopeid, + uint32_t flowid, uint32_t flags, struct rt6_extended *prt6); +void rib6_free_nh_ext(uint32_t fibnum, struct nhop6_extended *prt6); void fib_free_nh_ext(uint32_t fibnum, struct nhopu_extended *pnhu); Modified: projects/routing/sys/netgraph/netflow/netflow.c ============================================================================== --- projects/routing/sys/netgraph/netflow/netflow.c Fri Nov 7 01:48:12 2014 (r274211) +++ projects/routing/sys/netgraph/netflow/netflow.c Fri Nov 7 02:04:48 2014 (r274212) @@ -45,7 +45,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include #include @@ -53,6 +52,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include @@ -307,8 +307,7 @@ hash_insert(priv_p priv, struct flow_has int plen, uint8_t flags, uint8_t tcp_flags) { struct flow_entry *fle; - struct sockaddr_in sin; - struct rtentry *rt; + struct rt4_extended rt4; mtx_assert(&hsh->mtx, MA_OWNED); @@ -335,46 +334,20 @@ hash_insert(priv_p priv, struct flow_has * fill in out_ifx, dst_mask, nexthop, and dst_as in future releases. */ if ((flags & NG_NETFLOW_CONF_NODSTLOOKUP) == 0) { - bzero(&sin, sizeof(sin)); - sin.sin_len = sizeof(struct sockaddr_in); - sin.sin_family = AF_INET; - sin.sin_addr = fle->f.r.r_dst; - rt = rtalloc1_fib((struct sockaddr *)&sin, 0, 0, r->fib); - if (rt != NULL) { - fle->f.fle_o_ifx = rt->rt_ifp->if_index; - - if (rt->rt_flags & RTF_GATEWAY && - rt->rt_gateway->sa_family == AF_INET) - fle->f.next_hop = - ((struct sockaddr_in *)(rt->rt_gateway))->sin_addr; - - if (rt_mask(rt)) - fle->f.dst_mask = - bitcount32(((struct sockaddr_in *)rt_mask(rt))->sin_addr.s_addr); - else if (rt->rt_flags & RTF_HOST) - /* Give up. We can't determine mask :( */ - fle->f.dst_mask = 32; - - RTFREE_LOCKED(rt); + if (rib4_lookup_nh_ext(r->fib, fle->f.r.r_dst, 0, 0, &rt4) != 0) { + fle->f.fle_o_ifx = rt4.rt_lifp->if_index; + if (rt4.rt_flags & RTF_GATEWAY) + fle->f.next_hop = rt4.rt_gateway; + fle->f.dst_mask = bitcount32(rt4.rt_mask.s_addr); } } /* Do route lookup on source address, to fill in src_mask. */ if ((flags & NG_NETFLOW_CONF_NOSRCLOOKUP) == 0) { - bzero(&sin, sizeof(sin)); - sin.sin_len = sizeof(struct sockaddr_in); - sin.sin_family = AF_INET; - sin.sin_addr = fle->f.r.r_src; - rt = rtalloc1_fib((struct sockaddr *)&sin, 0, 0, r->fib); - if (rt != NULL) { - if (rt_mask(rt)) - fle->f.src_mask = - bitcount32(((struct sockaddr_in *)rt_mask(rt))->sin_addr.s_addr); - else if (rt->rt_flags & RTF_HOST) - /* Give up. We can't determine mask :( */ - fle->f.src_mask = 32; - - RTFREE_LOCKED(rt); + if (rib4_lookup_nh_ext(r->fib, fle->f.r.r_src, 0, 0, &rt4) != 0) { + if (rt4.rt_flags & RTF_GATEWAY) + fle->f.next_hop = rt4.rt_gateway; + fle->f.src_mask = bitcount32(rt4.rt_mask.s_addr); } } @@ -396,9 +369,7 @@ hash6_insert(priv_p priv, struct flow_ha int plen, uint8_t flags, uint8_t tcp_flags) { struct flow6_entry *fle6; - struct sockaddr_in6 *src, *dst; - struct rtentry *rt; - struct route_in6 rin6; + struct rt6_extended rt6; mtx_assert(&hsh6->mtx, MA_OWNED); @@ -426,51 +397,18 @@ hash6_insert(priv_p priv, struct flow_ha * fill in out_ifx, dst_mask, nexthop, and dst_as in future releases. */ if ((flags & NG_NETFLOW_CONF_NODSTLOOKUP) == 0) { - bzero(&rin6, sizeof(struct route_in6)); - dst = (struct sockaddr_in6 *)&rin6.ro_dst; - dst->sin6_len = sizeof(struct sockaddr_in6); - dst->sin6_family = AF_INET6; - dst->sin6_addr = r->dst.r_dst6; - - rin6.ro_rt = rtalloc1_fib((struct sockaddr *)dst, 0, 0, r->fib); - - if (rin6.ro_rt != NULL) { - rt = rin6.ro_rt; - fle6->f.fle_o_ifx = rt->rt_ifp->if_index; - - if (rt->rt_flags & RTF_GATEWAY && - rt->rt_gateway->sa_family == AF_INET6) - fle6->f.n.next_hop6 = - ((struct sockaddr_in6 *)(rt->rt_gateway))->sin6_addr; - - if (rt_mask(rt)) - fle6->f.dst_mask = RT_MASK6(rt); - else - fle6->f.dst_mask = 128; - - RTFREE_LOCKED(rt); + if (rib6_lookup_nh_ext(r->fib, &r->dst.r_dst6, 0, 0, 0, &rt6) == 0) { + fle6->f.fle_o_ifx = rt6.rt_lifp->if_index; + if ((rt6.rt_flags & RTF_GATEWAY) != 0) + fle6->f.n.next_hop6 = rt6.rt_gateway; + fle6->f.dst_mask = rt6.rt_mask; } } if ((flags & NG_NETFLOW_CONF_NODSTLOOKUP) == 0) { /* Do route lookup on source address, to fill in src_mask. */ - bzero(&rin6, sizeof(struct route_in6)); - src = (struct sockaddr_in6 *)&rin6.ro_dst; - src->sin6_len = sizeof(struct sockaddr_in6); - src->sin6_family = AF_INET6; - src->sin6_addr = r->src.r_src6; - - rin6.ro_rt = rtalloc1_fib((struct sockaddr *)src, 0, 0, r->fib); - - if (rin6.ro_rt != NULL) { - rt = rin6.ro_rt; - - if (rt_mask(rt)) - fle6->f.src_mask = RT_MASK6(rt); - else - fle6->f.src_mask = 128; - - RTFREE_LOCKED(rt); + if (rib6_lookup_nh_ext(r->fib, &r->src.r_src6, 0, 0, 0, &rt6) == 0) { + fle6->f.dst_mask = rt6.rt_mask; } } From owner-svn-src-projects@FreeBSD.ORG Fri Nov 7 12:00:37 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B171E284; Fri, 7 Nov 2014 12:00:37 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 97D2180C; Fri, 7 Nov 2014 12:00:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sA7C0beW091461; Fri, 7 Nov 2014 12:00:37 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sA7C0Xmi091443; Fri, 7 Nov 2014 12:00:33 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201411071200.sA7C0Xmi091443@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Fri, 7 Nov 2014 12:00:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274229 - in projects/ifnet: . bin/df bin/sh bin/sh/tests/expansion contrib/atf contrib/atf/atf-c contrib/atf/atf-c++ contrib/atf/atf-c++/detail contrib/atf/atf-c/detail contrib/atf/atf... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Nov 2014 12:00:37 -0000 Author: glebius Date: Fri Nov 7 12:00:32 2014 New Revision: 274229 URL: https://svnweb.freebsd.org/changeset/base/274229 Log: Merge head r256150 through r274228. Added: projects/ifnet/bin/sh/tests/expansion/redir1.0 - copied unchanged from r274228, head/bin/sh/tests/expansion/redir1.0 projects/ifnet/contrib/atf/atf-c++/atf-c++.3 - copied unchanged from r274228, head/contrib/atf/atf-c++/atf-c++.3 projects/ifnet/contrib/atf/atf-c/atf-c.3 - copied unchanged from r274228, head/contrib/atf/atf-c/atf-c.3 projects/ifnet/contrib/atf/atf-sh/atf-sh.3 - copied unchanged from r274228, head/contrib/atf/atf-sh/atf-sh.3 projects/ifnet/contrib/atf/config.h - copied unchanged from r274228, head/contrib/atf/config.h projects/ifnet/contrib/atf/doc/atf.7.in - copied unchanged from r274228, head/contrib/atf/doc/atf.7.in projects/ifnet/etc/rc.d/growfs - copied unchanged from r274228, head/etc/rc.d/growfs projects/ifnet/lib/libarchive/libarchive.pc - copied unchanged from r274228, head/lib/libarchive/libarchive.pc projects/ifnet/lib/libc/Makefile.amd64 - copied unchanged from r274228, head/lib/libc/Makefile.amd64 projects/ifnet/lib/libc/Makefile.i386 - copied unchanged from r274228, head/lib/libc/Makefile.i386 projects/ifnet/lib/libc/tests/ - copied from r274228, head/lib/libc/tests/ projects/ifnet/lib/libdpv/ - copied from r274228, head/lib/libdpv/ projects/ifnet/lib/libfigpar/ - copied from r274228, head/lib/libfigpar/ projects/ifnet/lib/libnetbsd/sys/time.h - copied unchanged from r274228, head/lib/libnetbsd/sys/time.h projects/ifnet/lib/libpam/libpam/tests/ - copied from r274228, head/lib/libpam/libpam/tests/ projects/ifnet/share/doc/pjdfstest/ - copied from r274228, head/share/doc/pjdfstest/ projects/ifnet/share/man/man7/growfs.7 - copied unchanged from r274228, head/share/man/man7/growfs.7 projects/ifnet/share/mk/netbsd-tests.test.mk - copied unchanged from r274228, head/share/mk/netbsd-tests.test.mk projects/ifnet/sys/boot/fdt/fdt_platform.h - copied unchanged from r274228, head/sys/boot/fdt/fdt_platform.h projects/ifnet/sys/boot/uboot/fdt/ - copied from r274228, head/sys/boot/uboot/fdt/ projects/ifnet/sys/compat/svr4/README - copied unchanged from r274228, head/sys/compat/svr4/README projects/ifnet/sys/compat/svr4/TO-DO - copied unchanged from r274228, head/sys/compat/svr4/TO-DO projects/ifnet/sys/dev/ixl/ixlv_vc_mgr.h - copied unchanged from r274228, head/sys/dev/ixl/ixlv_vc_mgr.h projects/ifnet/tests/sys/pjdfstest/ - copied from r274228, head/tests/sys/pjdfstest/ projects/ifnet/tools/build/check-links.sh - copied unchanged from r274228, head/tools/build/check-links.sh projects/ifnet/usr.bin/dpv/ - copied from r274228, head/usr.bin/dpv/ Deleted: projects/ifnet/contrib/atf/atf-c++/config.cpp projects/ifnet/contrib/atf/atf-c++/config.hpp projects/ifnet/contrib/atf/atf-c++/config_test.cpp projects/ifnet/contrib/atf/atf-c++/detail/sanity_test.cpp projects/ifnet/contrib/atf/atf-c/config.c projects/ifnet/contrib/atf/atf-c/config.h projects/ifnet/contrib/atf/atf-c/config_test.c projects/ifnet/contrib/atf/bconfig.h projects/ifnet/etc/rc.d/postrandom projects/ifnet/sys/modules/svr4/README projects/ifnet/sys/modules/svr4/TO-DO projects/ifnet/tests/lib/ Modified: projects/ifnet/MAINTAINERS (contents, props changed) projects/ifnet/Makefile.inc1 projects/ifnet/ObsoleteFiles.inc projects/ifnet/UPDATING projects/ifnet/bin/df/Makefile projects/ifnet/bin/df/df.1 projects/ifnet/bin/df/df.c projects/ifnet/bin/sh/expand.c projects/ifnet/bin/sh/tests/expansion/Makefile projects/ifnet/contrib/atf/FREEBSD-Xlist projects/ifnet/contrib/atf/NEWS projects/ifnet/contrib/atf/atf-c++.hpp projects/ifnet/contrib/atf/atf-c++/Kyuafile projects/ifnet/contrib/atf/atf-c++/atf_c++_test.cpp projects/ifnet/contrib/atf/atf-c++/build.cpp projects/ifnet/contrib/atf/atf-c++/build.hpp projects/ifnet/contrib/atf/atf-c++/build_test.cpp projects/ifnet/contrib/atf/atf-c++/check.cpp projects/ifnet/contrib/atf/atf-c++/check.hpp projects/ifnet/contrib/atf/atf-c++/check_test.cpp projects/ifnet/contrib/atf/atf-c++/detail/Kyuafile projects/ifnet/contrib/atf/atf-c++/detail/application.cpp projects/ifnet/contrib/atf/atf-c++/detail/application.hpp projects/ifnet/contrib/atf/atf-c++/detail/application_test.cpp projects/ifnet/contrib/atf/atf-c++/detail/auto_array.hpp projects/ifnet/contrib/atf/atf-c++/detail/auto_array_test.cpp projects/ifnet/contrib/atf/atf-c++/detail/env.cpp projects/ifnet/contrib/atf/atf-c++/detail/env.hpp projects/ifnet/contrib/atf/atf-c++/detail/env_test.cpp projects/ifnet/contrib/atf/atf-c++/detail/exceptions.cpp projects/ifnet/contrib/atf/atf-c++/detail/exceptions.hpp projects/ifnet/contrib/atf/atf-c++/detail/exceptions_test.cpp projects/ifnet/contrib/atf/atf-c++/detail/fs.cpp projects/ifnet/contrib/atf/atf-c++/detail/fs.hpp projects/ifnet/contrib/atf/atf-c++/detail/fs_test.cpp projects/ifnet/contrib/atf/atf-c++/detail/process.cpp projects/ifnet/contrib/atf/atf-c++/detail/process.hpp projects/ifnet/contrib/atf/atf-c++/detail/process_test.cpp projects/ifnet/contrib/atf/atf-c++/detail/sanity.hpp projects/ifnet/contrib/atf/atf-c++/detail/test_helpers.cpp projects/ifnet/contrib/atf/atf-c++/detail/test_helpers.hpp projects/ifnet/contrib/atf/atf-c++/detail/text.cpp projects/ifnet/contrib/atf/atf-c++/detail/text.hpp projects/ifnet/contrib/atf/atf-c++/detail/text_test.cpp projects/ifnet/contrib/atf/atf-c++/detail/version_helper.cpp projects/ifnet/contrib/atf/atf-c++/macros.hpp projects/ifnet/contrib/atf/atf-c++/macros_hpp_test.cpp projects/ifnet/contrib/atf/atf-c++/macros_test.cpp projects/ifnet/contrib/atf/atf-c++/pkg_config_test.sh projects/ifnet/contrib/atf/atf-c++/tests.cpp projects/ifnet/contrib/atf/atf-c++/tests.hpp projects/ifnet/contrib/atf/atf-c++/tests_test.cpp projects/ifnet/contrib/atf/atf-c++/unused_test.cpp projects/ifnet/contrib/atf/atf-c++/utils.cpp projects/ifnet/contrib/atf/atf-c++/utils.hpp projects/ifnet/contrib/atf/atf-c++/utils_test.cpp projects/ifnet/contrib/atf/atf-c.h projects/ifnet/contrib/atf/atf-c/Kyuafile projects/ifnet/contrib/atf/atf-c/atf_c_test.c projects/ifnet/contrib/atf/atf-c/build.c projects/ifnet/contrib/atf/atf-c/build.h projects/ifnet/contrib/atf/atf-c/build_test.c projects/ifnet/contrib/atf/atf-c/check.c projects/ifnet/contrib/atf/atf-c/check.h projects/ifnet/contrib/atf/atf-c/check_test.c projects/ifnet/contrib/atf/atf-c/defs.h.in projects/ifnet/contrib/atf/atf-c/detail/dynstr.c projects/ifnet/contrib/atf/atf-c/detail/dynstr.h projects/ifnet/contrib/atf/atf-c/detail/dynstr_test.c projects/ifnet/contrib/atf/atf-c/detail/env.c projects/ifnet/contrib/atf/atf-c/detail/env.h projects/ifnet/contrib/atf/atf-c/detail/env_test.c projects/ifnet/contrib/atf/atf-c/detail/fs.c projects/ifnet/contrib/atf/atf-c/detail/fs.h projects/ifnet/contrib/atf/atf-c/detail/fs_test.c projects/ifnet/contrib/atf/atf-c/detail/list.c projects/ifnet/contrib/atf/atf-c/detail/list.h projects/ifnet/contrib/atf/atf-c/detail/list_test.c projects/ifnet/contrib/atf/atf-c/detail/map.c projects/ifnet/contrib/atf/atf-c/detail/map.h projects/ifnet/contrib/atf/atf-c/detail/map_test.c projects/ifnet/contrib/atf/atf-c/detail/process.c projects/ifnet/contrib/atf/atf-c/detail/process.h projects/ifnet/contrib/atf/atf-c/detail/process_helpers.c projects/ifnet/contrib/atf/atf-c/detail/process_test.c projects/ifnet/contrib/atf/atf-c/detail/sanity.c projects/ifnet/contrib/atf/atf-c/detail/sanity.h projects/ifnet/contrib/atf/atf-c/detail/sanity_test.c projects/ifnet/contrib/atf/atf-c/detail/test_helpers.c projects/ifnet/contrib/atf/atf-c/detail/test_helpers.h projects/ifnet/contrib/atf/atf-c/detail/text.c projects/ifnet/contrib/atf/atf-c/detail/text.h projects/ifnet/contrib/atf/atf-c/detail/text_test.c projects/ifnet/contrib/atf/atf-c/detail/tp_main.c projects/ifnet/contrib/atf/atf-c/detail/user.c projects/ifnet/contrib/atf/atf-c/detail/user.h projects/ifnet/contrib/atf/atf-c/detail/user_test.c projects/ifnet/contrib/atf/atf-c/detail/version_helper.c projects/ifnet/contrib/atf/atf-c/error.c projects/ifnet/contrib/atf/atf-c/error.h projects/ifnet/contrib/atf/atf-c/error_fwd.h projects/ifnet/contrib/atf/atf-c/error_test.c projects/ifnet/contrib/atf/atf-c/h_build.h projects/ifnet/contrib/atf/atf-c/macros.h projects/ifnet/contrib/atf/atf-c/macros_h_test.c projects/ifnet/contrib/atf/atf-c/macros_test.c projects/ifnet/contrib/atf/atf-c/pkg_config_test.sh projects/ifnet/contrib/atf/atf-c/tc.c projects/ifnet/contrib/atf/atf-c/tc.h projects/ifnet/contrib/atf/atf-c/tc_test.c projects/ifnet/contrib/atf/atf-c/tp.c projects/ifnet/contrib/atf/atf-c/tp.h projects/ifnet/contrib/atf/atf-c/tp_test.c projects/ifnet/contrib/atf/atf-c/unused_test.c projects/ifnet/contrib/atf/atf-c/utils.c projects/ifnet/contrib/atf/atf-c/utils.h projects/ifnet/contrib/atf/atf-c/utils_test.c projects/ifnet/contrib/atf/atf-sh/atf-check.1 projects/ifnet/contrib/atf/atf-sh/atf-check.cpp projects/ifnet/contrib/atf/atf-sh/atf-check_test.sh projects/ifnet/contrib/atf/atf-sh/atf-sh.1 projects/ifnet/contrib/atf/atf-sh/atf-sh.cpp projects/ifnet/contrib/atf/atf-sh/atf_check_test.sh projects/ifnet/contrib/atf/atf-sh/config_test.sh projects/ifnet/contrib/atf/atf-sh/integration_test.sh projects/ifnet/contrib/atf/atf-sh/libatf-sh.subr projects/ifnet/contrib/atf/atf-sh/misc_helpers.sh projects/ifnet/contrib/atf/atf-sh/normalize_test.sh projects/ifnet/contrib/atf/atf-sh/tc_test.sh projects/ifnet/contrib/atf/atf-sh/tp_test.sh projects/ifnet/contrib/atf/doc/atf-test-case.4 projects/ifnet/contrib/atf/doc/atf-test-program.1 projects/ifnet/contrib/atf/test-programs/c_helpers.c projects/ifnet/contrib/atf/test-programs/common.sh projects/ifnet/contrib/atf/test-programs/config_test.sh projects/ifnet/contrib/atf/test-programs/cpp_helpers.cpp projects/ifnet/contrib/atf/test-programs/expect_test.sh projects/ifnet/contrib/atf/test-programs/meta_data_test.sh projects/ifnet/contrib/atf/test-programs/result_test.sh projects/ifnet/contrib/atf/test-programs/sh_helpers.sh projects/ifnet/contrib/atf/test-programs/srcdir_test.sh projects/ifnet/contrib/netbsd-tests/include/t_paths.c projects/ifnet/contrib/netbsd-tests/lib/libc/db/t_db.sh projects/ifnet/contrib/netbsd-tests/lib/libc/gen/t_floatunditf.c projects/ifnet/contrib/netbsd-tests/lib/libc/gen/t_fpsetmask.c projects/ifnet/contrib/netbsd-tests/lib/libc/gen/t_isnan.c projects/ifnet/contrib/netbsd-tests/lib/libc/gen/t_sethostname.c projects/ifnet/contrib/netbsd-tests/lib/libc/gen/t_siginfo.c projects/ifnet/contrib/netbsd-tests/lib/libc/hash/h_hash.c projects/ifnet/contrib/netbsd-tests/lib/libc/hash/t_sha2.c projects/ifnet/contrib/netbsd-tests/lib/libc/inet/t_inet_network.c projects/ifnet/contrib/netbsd-tests/lib/libc/locale/t_io.c projects/ifnet/contrib/netbsd-tests/lib/libc/net/h_dns_server.c projects/ifnet/contrib/netbsd-tests/lib/libc/net/t_ether_aton.c projects/ifnet/contrib/netbsd-tests/lib/libc/net/t_servent.sh projects/ifnet/contrib/netbsd-tests/lib/libc/rpc/t_rpc.c projects/ifnet/contrib/netbsd-tests/lib/libc/ssp/h_memset.c projects/ifnet/contrib/netbsd-tests/lib/libc/ssp/h_read.c projects/ifnet/contrib/netbsd-tests/lib/libc/ssp/h_readlink.c projects/ifnet/contrib/netbsd-tests/lib/libc/ssp/h_snprintf.c projects/ifnet/contrib/netbsd-tests/lib/libc/ssp/t_ssp.sh projects/ifnet/contrib/netbsd-tests/lib/libc/stdio/t_fflush.c projects/ifnet/contrib/netbsd-tests/lib/libc/stdio/t_fmemopen.c projects/ifnet/contrib/netbsd-tests/lib/libc/stdio/t_fopen.c projects/ifnet/contrib/netbsd-tests/lib/libc/stdio/t_printf.c projects/ifnet/contrib/netbsd-tests/lib/libc/stdio/t_scanf.c projects/ifnet/contrib/netbsd-tests/lib/libc/stdlib/h_atexit.c projects/ifnet/contrib/netbsd-tests/lib/libc/stdlib/t_strtod.c projects/ifnet/contrib/netbsd-tests/lib/libc/sys/t_dup.c projects/ifnet/contrib/netbsd-tests/lib/libc/sys/t_getcontext.c projects/ifnet/contrib/netbsd-tests/lib/libc/sys/t_getitimer.c projects/ifnet/contrib/netbsd-tests/lib/libc/sys/t_kevent.c projects/ifnet/contrib/netbsd-tests/lib/libc/sys/t_mincore.c projects/ifnet/contrib/netbsd-tests/lib/libc/sys/t_sigaction.c projects/ifnet/contrib/netbsd-tests/lib/libc/time/t_mktime.c projects/ifnet/contrib/netbsd-tests/lib/libexecinfo/t_backtrace.c projects/ifnet/contrib/netbsd-tests/lib/libm/t_ldexp.c projects/ifnet/contrib/netbsd-tests/lib/libm/t_log.c projects/ifnet/contrib/netbsd-tests/lib/libm/t_precision.c projects/ifnet/contrib/netbsd-tests/lib/libpthread/t_mutex.c projects/ifnet/contrib/netbsd-tests/lib/libpthread/t_sem.c projects/ifnet/contrib/netbsd-tests/usr.sbin/mtree/t_mtree.sh projects/ifnet/contrib/openpam/t/t_openpam_ctype.c projects/ifnet/contrib/openpam/t/t_openpam_readlinev.c projects/ifnet/contrib/openpam/t/t_openpam_readword.c projects/ifnet/contrib/tnftp/src/fetch.c projects/ifnet/etc/motd projects/ifnet/etc/mtree/BSD.tests.dist projects/ifnet/etc/periodic/security/Makefile projects/ifnet/etc/rc.d/Makefile projects/ifnet/etc/rc.d/adjkerntz projects/ifnet/etc/rc.d/geli projects/ifnet/etc/rc.d/random projects/ifnet/etc/rc.d/syscons projects/ifnet/etc/rc.d/syslogd projects/ifnet/gnu/lib/libdialog/Makefile projects/ifnet/lib/Makefile projects/ifnet/lib/atf/Makefile.inc projects/ifnet/lib/atf/common.mk projects/ifnet/lib/atf/libatf-c++/Makefile projects/ifnet/lib/atf/libatf-c++/tests/Makefile projects/ifnet/lib/atf/libatf-c++/tests/detail/Makefile projects/ifnet/lib/atf/libatf-c/Makefile projects/ifnet/lib/atf/libatf-c/tests/Makefile projects/ifnet/lib/atf/libatf-c/tests/detail/Makefile projects/ifnet/lib/libarchive/Makefile projects/ifnet/lib/libc/Makefile projects/ifnet/lib/libc/sys/utrace.2 projects/ifnet/lib/libpam/libpam/Makefile projects/ifnet/libexec/atf/atf-check/Makefile projects/ifnet/libexec/atf/atf-sh/Makefile projects/ifnet/libexec/atf/atf-sh/tests/Makefile projects/ifnet/release/Makefile projects/ifnet/release/doc/en_US.ISO8859-1/hardware/article.xml projects/ifnet/rescue/rescue/Makefile projects/ifnet/sbin/fsirand/Makefile projects/ifnet/sbin/route/route.c projects/ifnet/share/doc/Makefile projects/ifnet/share/man/man4/tap.4 projects/ifnet/share/man/man4/vt.4 projects/ifnet/share/man/man7/Makefile projects/ifnet/share/man/man9/domain.9 projects/ifnet/share/man/man9/fetch.9 projects/ifnet/share/man/man9/lock.9 projects/ifnet/share/man/man9/store.9 projects/ifnet/share/mk/atf.test.mk projects/ifnet/share/mk/bsd.lib.mk projects/ifnet/share/mk/bsd.libnames.mk projects/ifnet/share/mk/bsd.obj.mk projects/ifnet/share/mk/bsd.own.mk projects/ifnet/share/mk/bsd.prog.mk projects/ifnet/share/mk/bsd.progs.mk projects/ifnet/share/mk/plain.test.mk projects/ifnet/share/mk/tap.test.mk projects/ifnet/sys/amd64/amd64/genassym.c projects/ifnet/sys/amd64/amd64/sys_machdep.c projects/ifnet/sys/amd64/amd64/vm_machdep.c projects/ifnet/sys/amd64/conf/GENERIC projects/ifnet/sys/amd64/conf/NOTES projects/ifnet/sys/arm/arm/busdma_machdep-v6.c projects/ifnet/sys/arm/arm/machdep.c projects/ifnet/sys/boot/arm/uboot/Makefile projects/ifnet/sys/boot/common/install.c projects/ifnet/sys/boot/common/misc.c projects/ifnet/sys/boot/fdt/Makefile projects/ifnet/sys/boot/fdt/fdt_loader_cmd.c projects/ifnet/sys/boot/powerpc/uboot/Makefile projects/ifnet/sys/boot/uboot/Makefile projects/ifnet/sys/boot/uboot/common/metadata.c projects/ifnet/sys/boot/uboot/lib/Makefile projects/ifnet/sys/boot/uboot/lib/libuboot.h projects/ifnet/sys/boot/uboot/lib/module.c projects/ifnet/sys/cam/ctl/ctl.c projects/ifnet/sys/cam/ctl/ctl.h projects/ifnet/sys/cam/ctl/ctl_backend.h projects/ifnet/sys/cam/ctl/ctl_backend_block.c projects/ifnet/sys/cam/ctl/ctl_error.c projects/ifnet/sys/cam/ctl/ctl_frontend_iscsi.c projects/ifnet/sys/cam/ctl/ctl_private.h projects/ifnet/sys/cam/ctl/scsi_ctl.c projects/ifnet/sys/cam/scsi/scsi_all.h projects/ifnet/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c projects/ifnet/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c projects/ifnet/sys/conf/files.amd64 projects/ifnet/sys/conf/files.i386 projects/ifnet/sys/conf/kmod.mk projects/ifnet/sys/dev/agp/agp.c projects/ifnet/sys/dev/agp/agp_amd.c projects/ifnet/sys/dev/agp/agp_amd64.c projects/ifnet/sys/dev/agp/agp_apple.c projects/ifnet/sys/dev/agp/agp_ati.c projects/ifnet/sys/dev/agp/agp_i810.c projects/ifnet/sys/dev/agp/agppriv.h projects/ifnet/sys/dev/ahci/ahci.c projects/ifnet/sys/dev/drm2/drm_edid.c projects/ifnet/sys/dev/drm2/drm_fb_helper.c projects/ifnet/sys/dev/drm2/drm_fb_helper.h projects/ifnet/sys/dev/drm2/radeon/radeon_connectors.c projects/ifnet/sys/dev/drm2/ttm/ttm_bo_util.c projects/ifnet/sys/dev/gpio/gpiobus.c projects/ifnet/sys/dev/gpio/gpiobus_if.m projects/ifnet/sys/dev/gpio/gpiobusvar.h projects/ifnet/sys/dev/gpio/gpioiic.c projects/ifnet/sys/dev/gpio/gpioled.c projects/ifnet/sys/dev/hwpmc/hwpmc_mod.c projects/ifnet/sys/dev/ida/ida_eisa.c projects/ifnet/sys/dev/iscsi/icl.c projects/ifnet/sys/dev/iscsi/icl.h projects/ifnet/sys/dev/iscsi/iscsi.c projects/ifnet/sys/dev/ixl/i40e_osdep.c projects/ifnet/sys/dev/ixl/i40e_osdep.h projects/ifnet/sys/dev/ixl/if_ixl.c projects/ifnet/sys/dev/ixl/if_ixlv.c projects/ifnet/sys/dev/ixl/ixl.h projects/ifnet/sys/dev/ixl/ixl_txrx.c projects/ifnet/sys/dev/ixl/ixlv.h projects/ifnet/sys/dev/ixl/ixlvc.c projects/ifnet/sys/dev/random/fortuna.c projects/ifnet/sys/dev/random/random_adaptors.c projects/ifnet/sys/dev/random/yarrow.c projects/ifnet/sys/dev/sound/isa/gusc.c projects/ifnet/sys/dev/sound/isa/sb16.c projects/ifnet/sys/dev/sound/isa/sbc.c projects/ifnet/sys/dev/sound/midi/sequencer.c projects/ifnet/sys/dev/sound/pci/als4000.c projects/ifnet/sys/dev/sound/pci/cs4281.c projects/ifnet/sys/dev/sound/pci/csa.c projects/ifnet/sys/dev/sound/pci/emu10kx.c projects/ifnet/sys/dev/sound/pci/envy24.c projects/ifnet/sys/dev/sound/pci/envy24ht.c projects/ifnet/sys/dev/sound/pci/maestro.c projects/ifnet/sys/dev/sound/pci/spicds.c projects/ifnet/sys/dev/sound/pci/vibes.c projects/ifnet/sys/dev/sound/pcm/dsp.c projects/ifnet/sys/dev/sound/pcm/mixer.c projects/ifnet/sys/dev/sound/pcm/sound.c projects/ifnet/sys/dev/sound/pcm/sound.h projects/ifnet/sys/dev/usb/serial/u3g.c projects/ifnet/sys/dev/usb/usb_hub.c projects/ifnet/sys/dev/usb/usbdevs projects/ifnet/sys/dev/virtio/console/virtio_console.c projects/ifnet/sys/dev/vt/vt.h projects/ifnet/sys/dev/vt/vt_buf.c projects/ifnet/sys/dev/vt/vt_core.c projects/ifnet/sys/fs/devfs/devfs_vnops.c projects/ifnet/sys/geom/geom_dev.c projects/ifnet/sys/i386/conf/NOTES projects/ifnet/sys/i386/i386/genassym.c projects/ifnet/sys/i386/i386/initcpu.c projects/ifnet/sys/i386/i386/locore.s projects/ifnet/sys/i386/i386/machdep.c projects/ifnet/sys/i386/i386/mp_machdep.c projects/ifnet/sys/i386/i386/ptrace_machdep.c projects/ifnet/sys/i386/i386/sys_machdep.c projects/ifnet/sys/i386/i386/trap.c projects/ifnet/sys/i386/i386/vm86bios.s projects/ifnet/sys/i386/i386/vm_machdep.c projects/ifnet/sys/i386/include/cpufunc.h projects/ifnet/sys/i386/include/md_var.h projects/ifnet/sys/i386/include/npx.h projects/ifnet/sys/i386/include/pcb.h projects/ifnet/sys/i386/isa/npx.c projects/ifnet/sys/i386/linux/linux_ptrace.c projects/ifnet/sys/i386/linux/linux_sysvec.c projects/ifnet/sys/i386/svr4/svr4_machdep.c projects/ifnet/sys/i386/xen/mp_machdep.c projects/ifnet/sys/kern/kern_cons.c projects/ifnet/sys/kern/kern_descrip.c projects/ifnet/sys/kern/kern_lock.c projects/ifnet/sys/kern/kern_mutex.c projects/ifnet/sys/kern/kern_prot.c projects/ifnet/sys/kern/kern_rwlock.c projects/ifnet/sys/kern/kern_sx.c projects/ifnet/sys/kern/kern_syscalls.c projects/ifnet/sys/kern/kern_thr.c projects/ifnet/sys/kern/kern_umtx.c projects/ifnet/sys/kern/subr_terminal.c projects/ifnet/sys/kern/subr_uio.c projects/ifnet/sys/kern/sys_generic.c projects/ifnet/sys/kern/sys_pipe.c projects/ifnet/sys/kern/uipc_debug.c projects/ifnet/sys/kern/vfs_export.c projects/ifnet/sys/kern/vfs_lookup.c projects/ifnet/sys/modules/Makefile projects/ifnet/sys/modules/drm2/drm2/Makefile projects/ifnet/sys/modules/ixlv/Makefile projects/ifnet/sys/modules/linux/Makefile projects/ifnet/sys/modules/mrsas/Makefile projects/ifnet/sys/modules/sound/sound/Makefile projects/ifnet/sys/modules/svr4/Makefile projects/ifnet/sys/modules/vmm/Makefile projects/ifnet/sys/net/bpf.c projects/ifnet/sys/net/flowtable.c projects/ifnet/sys/net/if.c projects/ifnet/sys/net/if_bridge.c projects/ifnet/sys/net/if_disc.c projects/ifnet/sys/net/if_faith.c projects/ifnet/sys/net/if_gif.c projects/ifnet/sys/net/if_loop.c projects/ifnet/sys/net/if_mib.c projects/ifnet/sys/net/if_stf.c projects/ifnet/sys/net/if_var.h projects/ifnet/sys/net/route.c projects/ifnet/sys/net/vnet.h projects/ifnet/sys/netgraph/ng_bridge.c projects/ifnet/sys/netgraph/ng_frame_relay.c projects/ifnet/sys/netinet/cc/cc.c projects/ifnet/sys/netinet/cc/cc_cdg.c projects/ifnet/sys/netinet/cc/cc_chd.c projects/ifnet/sys/netinet/cc/cc_hd.c projects/ifnet/sys/netinet/cc/cc_htcp.c projects/ifnet/sys/netinet/cc/cc_vegas.c projects/ifnet/sys/netinet/if_ether.c projects/ifnet/sys/netinet/igmp.c projects/ifnet/sys/netinet/in.c projects/ifnet/sys/netinet/in_gif.c projects/ifnet/sys/netinet/in_pcb.c projects/ifnet/sys/netinet/in_proto.c projects/ifnet/sys/netinet/in_rmx.c projects/ifnet/sys/netinet/ip_carp.c projects/ifnet/sys/netinet/ip_fastfwd.c projects/ifnet/sys/netinet/ip_icmp.c projects/ifnet/sys/netinet/ip_input.c projects/ifnet/sys/netinet/ip_ipsec.c projects/ifnet/sys/netinet/ip_mroute.c projects/ifnet/sys/netinet/raw_ip.c projects/ifnet/sys/netinet/sctp_sysctl.c projects/ifnet/sys/netinet/tcp_hostcache.c projects/ifnet/sys/netinet/tcp_input.c projects/ifnet/sys/netinet/tcp_output.c projects/ifnet/sys/netinet/tcp_sack.c projects/ifnet/sys/netinet/tcp_subr.c projects/ifnet/sys/netinet/tcp_syncache.c projects/ifnet/sys/netinet/tcp_timewait.c projects/ifnet/sys/netinet/tcp_var.h projects/ifnet/sys/netinet/udp_usrreq.c projects/ifnet/sys/netinet6/in6.c projects/ifnet/sys/netinet6/in6_gif.c projects/ifnet/sys/netinet6/in6_proto.c projects/ifnet/sys/netinet6/in6_rmx.c projects/ifnet/sys/netinet6/in6_var.h projects/ifnet/sys/netinet6/ip6_ipsec.c projects/ifnet/sys/netinet6/mld6.c projects/ifnet/sys/netinet6/nd6.c projects/ifnet/sys/netinet6/scope6.c projects/ifnet/sys/netipsec/ipsec.c projects/ifnet/sys/netipsec/ipsec_input.c projects/ifnet/sys/netipsec/key.c projects/ifnet/sys/netipsec/xform_ah.c projects/ifnet/sys/netipsec/xform_esp.c projects/ifnet/sys/netipsec/xform_ipcomp.c projects/ifnet/sys/netipsec/xform_ipip.c projects/ifnet/sys/netpfil/ipfw/ip_fw2.c projects/ifnet/sys/netpfil/ipfw/ip_fw_dynamic.c projects/ifnet/sys/netpfil/ipfw/ip_fw_pfil.c projects/ifnet/sys/netpfil/ipfw/ip_fw_table.c projects/ifnet/sys/netpfil/pf/if_pfsync.c projects/ifnet/sys/powerpc/powerpc/copyinout.c projects/ifnet/sys/sys/disk.h projects/ifnet/sys/sys/domain.h projects/ifnet/sys/sys/lockmgr.h projects/ifnet/sys/sys/param.h projects/ifnet/sys/sys/seq.h projects/ifnet/sys/sys/sysctl.h projects/ifnet/sys/sys/sysent.h projects/ifnet/sys/sys/systm.h projects/ifnet/sys/sys/terminal.h projects/ifnet/sys/sys/ucred.h projects/ifnet/sys/sys/user.h projects/ifnet/sys/ufs/ffs/ffs_softdep.c projects/ifnet/sys/vm/default_pager.c projects/ifnet/sys/vm/swap_pager.c projects/ifnet/sys/vm/vm_page.c projects/ifnet/sys/x86/acpica/acpi_wakeup.c projects/ifnet/tests/sys/Makefile projects/ifnet/tools/build/mk/OptionalObsoleteFiles.inc projects/ifnet/tools/sched/schedgraph.py projects/ifnet/usr.bin/Makefile projects/ifnet/usr.bin/ftp/Makefile projects/ifnet/usr.bin/iconv/Makefile projects/ifnet/usr.bin/id/Makefile projects/ifnet/usr.bin/w/Makefile projects/ifnet/usr.bin/w/pr_time.c projects/ifnet/usr.bin/w/w.1 projects/ifnet/usr.bin/w/w.c projects/ifnet/usr.bin/wc/Makefile projects/ifnet/usr.bin/wc/wc.1 projects/ifnet/usr.bin/wc/wc.c projects/ifnet/usr.sbin/bhyve/block_if.c projects/ifnet/usr.sbin/bhyve/pci_ahci.c projects/ifnet/usr.sbin/bsdconfig/Makefile projects/ifnet/usr.sbin/bsdconfig/console/Makefile projects/ifnet/usr.sbin/bsdconfig/console/include/Makefile projects/ifnet/usr.sbin/bsdconfig/diskmgmt/Makefile projects/ifnet/usr.sbin/bsdconfig/diskmgmt/include/Makefile projects/ifnet/usr.sbin/bsdconfig/docsinstall/Makefile projects/ifnet/usr.sbin/bsdconfig/docsinstall/include/Makefile projects/ifnet/usr.sbin/bsdconfig/dot/Makefile projects/ifnet/usr.sbin/bsdconfig/dot/include/Makefile projects/ifnet/usr.sbin/bsdconfig/examples/Makefile projects/ifnet/usr.sbin/bsdconfig/include/Makefile projects/ifnet/usr.sbin/bsdconfig/includes/Makefile projects/ifnet/usr.sbin/bsdconfig/includes/include/Makefile projects/ifnet/usr.sbin/bsdconfig/mouse/Makefile projects/ifnet/usr.sbin/bsdconfig/mouse/include/Makefile projects/ifnet/usr.sbin/bsdconfig/networking/Makefile projects/ifnet/usr.sbin/bsdconfig/networking/include/Makefile projects/ifnet/usr.sbin/bsdconfig/networking/share/Makefile projects/ifnet/usr.sbin/bsdconfig/packages/Makefile projects/ifnet/usr.sbin/bsdconfig/packages/include/Makefile projects/ifnet/usr.sbin/bsdconfig/password/Makefile projects/ifnet/usr.sbin/bsdconfig/password/include/Makefile projects/ifnet/usr.sbin/bsdconfig/password/share/Makefile projects/ifnet/usr.sbin/bsdconfig/security/Makefile projects/ifnet/usr.sbin/bsdconfig/security/include/Makefile projects/ifnet/usr.sbin/bsdconfig/share/Makefile projects/ifnet/usr.sbin/bsdconfig/share/media/Makefile projects/ifnet/usr.sbin/bsdconfig/share/packages/Makefile projects/ifnet/usr.sbin/bsdconfig/startup/Makefile projects/ifnet/usr.sbin/bsdconfig/startup/include/Makefile projects/ifnet/usr.sbin/bsdconfig/startup/share/Makefile projects/ifnet/usr.sbin/bsdconfig/timezone/Makefile projects/ifnet/usr.sbin/bsdconfig/timezone/include/Makefile projects/ifnet/usr.sbin/bsdconfig/timezone/share/Makefile projects/ifnet/usr.sbin/bsdconfig/ttys/Makefile projects/ifnet/usr.sbin/bsdconfig/ttys/include/Makefile projects/ifnet/usr.sbin/bsdconfig/usermgmt/Makefile projects/ifnet/usr.sbin/bsdconfig/usermgmt/include/Makefile projects/ifnet/usr.sbin/bsdconfig/usermgmt/share/Makefile projects/ifnet/usr.sbin/bsdinstall/bsdinstall.8 projects/ifnet/usr.sbin/ctladm/ctladm.8 projects/ifnet/usr.sbin/fifolog/fifolog_reader/Makefile projects/ifnet/usr.sbin/fifolog/fifolog_writer/Makefile projects/ifnet/usr.sbin/iscsid/Makefile projects/ifnet/usr.sbin/pw/tests/Makefile projects/ifnet/usr.sbin/rpcbind/Makefile projects/ifnet/usr.sbin/sysrc/sysrc projects/ifnet/usr.sbin/sysrc/sysrc.8 Directory Properties: projects/ifnet/ (props changed) projects/ifnet/contrib/atf/ (props changed) projects/ifnet/contrib/openpam/ (props changed) projects/ifnet/contrib/tnftp/ (props changed) projects/ifnet/etc/ (props changed) projects/ifnet/gnu/lib/ (props changed) projects/ifnet/lib/libc/ (props changed) projects/ifnet/sbin/ (props changed) projects/ifnet/share/ (props changed) projects/ifnet/share/man/man4/ (props changed) projects/ifnet/sys/ (props changed) projects/ifnet/sys/boot/ (props changed) projects/ifnet/sys/cddl/contrib/opensolaris/ (props changed) projects/ifnet/sys/conf/ (props changed) projects/ifnet/sys/modules/vmm/ (props changed) projects/ifnet/usr.sbin/bhyve/ (props changed) Modified: projects/ifnet/MAINTAINERS ============================================================================== --- projects/ifnet/MAINTAINERS Fri Nov 7 11:34:06 2014 (r274228) +++ projects/ifnet/MAINTAINERS Fri Nov 7 12:00:32 2014 (r274229) @@ -78,7 +78,6 @@ inetd dwmalone Recommends pre-commit re contrib/smbfs bp Open for in-tree committs. In case of functional changes pre-commit review requested. contrib/pf glebius Pre-commit review recommended. -binutils obrien Insists on BU blocked from unapproved commits file obrien Insists to keep file blocked from other's unapproved commits contrib/bzip2 obrien Pre-commit review required. Modified: projects/ifnet/Makefile.inc1 ============================================================================== --- projects/ifnet/Makefile.inc1 Fri Nov 7 11:34:06 2014 (r274228) +++ projects/ifnet/Makefile.inc1 Fri Nov 7 12:00:32 2014 (r274229) @@ -1537,6 +1537,7 @@ _prebuild_libs= ${_kerberos5_lib_libasn1 ${_kerberos5_lib_libwind} \ lib/libbz2 ${_libcom_err} lib/libcrypt \ lib/libelf lib/libexpat \ + lib/libfigpar \ ${_lib_libgssapi} \ lib/libkiconv lib/libkvm lib/liblzma lib/libmd lib/libnv \ ${_lib_libcapsicum} \ @@ -1551,7 +1552,8 @@ _prebuild_libs= ${_kerberos5_lib_libasn1 ${_cddl_lib_libctf} \ lib/libutil lib/libpjdlog ${_lib_libypclnt} lib/libz lib/msun \ ${_secure_lib_libcrypto} ${_lib_libldns} \ - ${_secure_lib_libssh} ${_secure_lib_libssl} + ${_secure_lib_libssh} ${_secure_lib_libssl} \ + gnu/lib/libdialog .if ${MK_GNUCXX} != "no" _prebuild_libs+= gnu/lib/libstdc++ gnu/lib/libsupc++ gnu/lib/libstdc++__L: lib/msun__L @@ -1669,6 +1671,8 @@ _lib_libypclnt= lib/libypclnt lib/libradius__L: lib/libmd__L .endif +gnu/lib/libdialog__L: lib/ncurses/ncursesw__L + .for _lib in ${_prereq_libs} ${_lib}__PL: .PHONY .MAKE .if exists(${.CURDIR}/${_lib}) Modified: projects/ifnet/ObsoleteFiles.inc ============================================================================== --- projects/ifnet/ObsoleteFiles.inc Fri Nov 7 11:34:06 2014 (r274228) +++ projects/ifnet/ObsoleteFiles.inc Fri Nov 7 12:00:32 2014 (r274229) @@ -38,6 +38,10 @@ # xargs -n1 | sort | uniq -d; # done +# 20141102: postrandom obsoleted by new /dev/random code +OLD_FILES+=etc/rc.d/postrandom +# 20141031: initrandom obsoleted by new /dev/random code +OLD_FILES+=etc/rc.d/initrandom # 20141028: debug files accidentally installed as directory name OLD_FILES+=usr/lib/debug/usr/lib/i18n OLD_FILES+=usr/lib/debug/usr/lib/private @@ -372,7 +376,6 @@ OLD_FILES+=usr/share/man/man1/atf-report OLD_FILES+=usr/share/man/man1/atf-run.1.gz OLD_FILES+=usr/share/man/man1/atf-version.1.gz OLD_FILES+=usr/share/man/man5/atf-formats.5.gz -OLD_FILES+=usr/share/man/man7/atf.7.gz OLD_FILES+=usr/share/xml/atf/tests-results.dtd OLD_FILES+=usr/share/xsl/atf/tests-results.xsl # 20131009: freebsd-version moved from /libexec to /bin Modified: projects/ifnet/UPDATING ============================================================================== --- projects/ifnet/UPDATING Fri Nov 7 11:34:06 2014 (r274228) +++ projects/ifnet/UPDATING Fri Nov 7 12:00:32 2014 (r274229) @@ -31,6 +31,29 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20141104: + vt(4), the new console driver, is enabled by default. It brings + support for Unicode and double-width characters, as well as + support for UEFI and integration with the KMS kernel video + drivers. + + You may need to update your console settings in /etc/rc.conf, + most probably the keymap. During boot, /etc/rc.d/syscons will + indicate what you need to do. + + vt(4) still has issues and lacks some features compared to + syscons(4). See the wiki for up-to-date information: + https://wiki.freebsd.org/Newcons + + If you want to keep using syscons(4), you can do so by adding + the following line to /boot/loader.conf: + kern.vty=sc + +20141102: + pjdfstest has been integrated into kyua as an opt-in test suite. + Please see share/doc/pjdfstest/README for a more details on how to + execute it. + 20141009: gperf has been removed from the base system for architectures that use clang. Ports that require gperf will obtain it from the Modified: projects/ifnet/bin/df/Makefile ============================================================================== --- projects/ifnet/bin/df/Makefile Fri Nov 7 11:34:06 2014 (r274228) +++ projects/ifnet/bin/df/Makefile Fri Nov 7 12:00:32 2014 (r274229) @@ -9,7 +9,7 @@ SRCS= df.c vfslist.c CFLAGS+= -I${MOUNT} -DPADD= ${LIBUTIL} -LDADD= -lutil +DPADD= ${LIBUTIL} ${LIBXO} +LDADD= -lutil -lxo .include Modified: projects/ifnet/bin/df/df.1 ============================================================================== --- projects/ifnet/bin/df/df.1 Fri Nov 7 11:34:06 2014 (r274228) +++ projects/ifnet/bin/df/df.1 Fri Nov 7 12:00:32 2014 (r274229) @@ -29,7 +29,7 @@ .\" @(#)df.1 8.3 (Berkeley) 5/8/95 .\" $FreeBSD$ .\" -.Dd January 16, 2014 +.Dd November 6, 2014 .Dt DF 1 .Os .Sh NAME @@ -37,6 +37,7 @@ .Nd display free disk space .Sh SYNOPSIS .Nm +.Op Fl -libxo .Op Fl b | g | H | h | k | m | P .Op Fl acilnT .Op Fl \&, @@ -193,7 +194,9 @@ If the value is outside, it will be set .Xr statfs 2 , .Xr getbsize 3 , .Xr getmntinfo 3 , +.Xr libxo 3 , .Xr localeconv 3 , +.Xr xo_parse_args 3 , .Xr fstab 5 , .Xr mount 8 , .Xr pstat 8 , Modified: projects/ifnet/bin/df/df.c ============================================================================== --- projects/ifnet/bin/df/df.c Fri Nov 7 11:34:06 2014 (r274228) +++ projects/ifnet/bin/df/df.c Fri Nov 7 12:00:32 2014 (r274229) @@ -60,6 +60,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include "extern.h" @@ -82,7 +83,7 @@ static char *getmntpt(const char *); static int int64width(int64_t); static char *makenetvfslist(void); static void prthuman(const struct statfs *, int64_t); -static void prthumanval(int64_t); +static void prthumanval(const char *, int64_t); static intmax_t fsbtoblk(int64_t, uint64_t, u_long); static void prtstat(struct statfs *, struct maxwidths *); static size_t regetmntinfo(struct statfs **, long, const char **); @@ -119,6 +120,11 @@ main(int argc, char *argv[]) totalbuf.f_bsize = DEV_BSIZE; strlcpy(totalbuf.f_mntfromname, "total", MNAMELEN); vfslist = NULL; + + argc = xo_parse_args(argc, argv); + if (argc < 0) + exit(1); + while ((ch = getopt(argc, argv, "abcgHhiklmnPt:T,")) != -1) switch (ch) { case 'a': @@ -161,7 +167,7 @@ main(int argc, char *argv[]) break; case 'l': if (vfslist != NULL) - errx(1, "-l and -t are mutually exclusive."); + xo_errx(1, "-l and -t are mutually exclusive."); vfslist = makevfslist(makenetvfslist()); lflag = 1; break; @@ -174,9 +180,9 @@ main(int argc, char *argv[]) break; case 't': if (lflag) - errx(1, "-l and -t are mutually exclusive."); + xo_errx(1, "-l and -t are mutually exclusive."); if (vfslist != NULL) - errx(1, "only one -t option may be specified"); + xo_errx(1, "only one -t option may be specified"); fstype = optarg; vfslist = makevfslist(optarg); break; @@ -202,16 +208,19 @@ main(int argc, char *argv[]) /* just the filesystems specified on the command line */ mntbuf = malloc(argc * sizeof(*mntbuf)); if (mntbuf == NULL) - err(1, "malloc()"); + xo_err(1, "malloc()"); mntsize = 0; /* continued in for loop below */ } + xo_open_container("storage-system-information"); + xo_open_list("filesystem"); + /* iterate through specified filesystems */ for (; *argv; argv++) { if (stat(*argv, &stbuf) < 0) { if ((mntpt = getmntpt(*argv)) == NULL) { - warn("%s", *argv); + xo_warn("%s", *argv); rv = 1; continue; } @@ -220,20 +229,20 @@ main(int argc, char *argv[]) mdev.fspec = *argv; mntpath = strdup("/tmp/df.XXXXXX"); if (mntpath == NULL) { - warn("strdup failed"); + xo_warn("strdup failed"); rv = 1; continue; } mntpt = mkdtemp(mntpath); if (mntpt == NULL) { - warn("mkdtemp(\"%s\") failed", mntpath); + xo_warn("mkdtemp(\"%s\") failed", mntpath); rv = 1; free(mntpath); continue; } if (mount(fstype, mntpt, MNT_RDONLY, &mdev) != 0) { - warn("%s", *argv); + xo_warn("%s", *argv); rv = 1; (void)rmdir(mntpt); free(mntpath); @@ -244,7 +253,7 @@ main(int argc, char *argv[]) if (cflag) addstat(&totalbuf, &statfsbuf); } else { - warn("%s", *argv); + xo_warn("%s", *argv); rv = 1; } (void)unmount(mntpt, 0); @@ -260,7 +269,7 @@ main(int argc, char *argv[]) * implement nflag here. */ if (statfs(mntpt, &statfsbuf) < 0) { - warn("%s", mntpt); + xo_warn("%s", mntpt); rv = 1; continue; } @@ -294,8 +303,14 @@ main(int argc, char *argv[]) for (i = 0; i < mntsize; i++) if (aflag || (mntbuf[i].f_flags & MNT_IGNORE) == 0) prtstat(&mntbuf[i], &maxwidths); + + xo_close_list("filesystem"); + if (cflag) prtstat(&totalbuf, &maxwidths); + + xo_close_container("storage-system-information"); + xo_finish(); return (rv); } @@ -341,7 +356,7 @@ regetmntinfo(struct statfs **mntbufp, lo if (nflag || error < 0) if (i != j) { if (error < 0) - warnx("%s stats possibly stale", + xo_warnx("%s stats possibly stale", mntbuf[i].f_mntonname); mntbuf[j] = mntbuf[i]; } @@ -354,13 +369,13 @@ static void prthuman(const struct statfs *sfsp, int64_t used) { - prthumanval(sfsp->f_blocks * sfsp->f_bsize); - prthumanval(used * sfsp->f_bsize); - prthumanval(sfsp->f_bavail * sfsp->f_bsize); + prthumanval(" {:blocks/%6s}", sfsp->f_blocks * sfsp->f_bsize); + prthumanval(" {:used/%6s}", used * sfsp->f_bsize); + prthumanval(" {:available/%6s}", sfsp->f_bavail * sfsp->f_bsize); } static void -prthumanval(int64_t bytes) +prthumanval(const char *fmt, int64_t bytes) { char buf[6]; int flags; @@ -372,14 +387,15 @@ prthumanval(int64_t bytes) humanize_number(buf, sizeof(buf) - (bytes < 0 ? 0 : 1), bytes, "", HN_AUTOSCALE, flags); - (void)printf(" %6s", buf); + xo_attr("value", "%lld", (long long) bytes); + xo_emit(fmt, buf); } /* * Print an inode count in "human-readable" format. */ static void -prthumanvalinode(int64_t bytes) +prthumanvalinode(const char *fmt, int64_t bytes) { char buf[6]; int flags; @@ -389,7 +405,8 @@ prthumanvalinode(int64_t bytes) humanize_number(buf, sizeof(buf) - (bytes < 0 ? 0 : 1), bytes, "", HN_AUTOSCALE, flags); - (void)printf(" %5s", buf); + xo_attr("value", "%lld", (long long) bytes); + xo_emit(fmt, buf); } /* @@ -434,70 +451,77 @@ prtstat(struct statfs *sfsp, struct maxw mwp->used = imax(mwp->used, (int)strlen("Used")); mwp->avail = imax(mwp->avail, (int)strlen("Avail")); - (void)printf("%-*s", mwp->mntfrom, "Filesystem"); + xo_emit("{T:/%-*s}", mwp->mntfrom, "Filesystem"); if (Tflag) - (void)printf(" %-*s", mwp->fstype, "Type"); - (void)printf(" %*s %*s %*s Capacity", mwp->total, header, - mwp->used, "Used", mwp->avail, "Avail"); + xo_emit(" {T:/%-*s}", mwp->fstype, "Type"); + xo_emit(" {T:/%*s} {T:/%*s} {T:/%*s} Capacity", + mwp->total, header, + mwp->used, "Used", mwp->avail, "Avail"); if (iflag) { mwp->iused = imax(hflag ? 0 : mwp->iused, (int)strlen(" iused")); mwp->ifree = imax(hflag ? 0 : mwp->ifree, (int)strlen("ifree")); - (void)printf(" %*s %*s %%iused", + xo_emit(" {T:/%*s} {T:/%*s} {T:\%iused}", mwp->iused - 2, "iused", mwp->ifree, "ifree"); } - (void)printf(" Mounted on\n"); + xo_emit(" {T:Mounted on}\n"); } + + xo_open_instance("filesystem"); /* Check for 0 block size. Can this happen? */ if (sfsp->f_bsize == 0) { - warnx ("File system %s does not have a block size, assuming 512.", + xo_warnx ("File system %s does not have a block size, assuming 512.", sfsp->f_mntonname); sfsp->f_bsize = 512; } - (void)printf("%-*s", mwp->mntfrom, sfsp->f_mntfromname); + xo_emit("{tk:name/%-*s}", mwp->mntfrom, sfsp->f_mntfromname); if (Tflag) - (void)printf(" %-*s", mwp->fstype, sfsp->f_fstypename); + xo_emit(" {:type/%-*s}", mwp->fstype, sfsp->f_fstypename); used = sfsp->f_blocks - sfsp->f_bfree; availblks = sfsp->f_bavail + used; if (hflag) { prthuman(sfsp, used); } else { if (thousands) - format = " %*j'd %*j'd %*j'd"; + format = " {t:total-blocks/%*j'd} {t:used-blocks/%*j'd} " + "{t:available-blocks/%*j'd}"; else - format = " %*jd %*jd %*jd"; - (void)printf(format, + format = " {t:total-blocks/%*jd} {t:used-blocks/%*jd} " + "{t:available-blocks/%*jd}"; + xo_emit(format, mwp->total, fsbtoblk(sfsp->f_blocks, sfsp->f_bsize, blocksize), mwp->used, fsbtoblk(used, sfsp->f_bsize, blocksize), mwp->avail, fsbtoblk(sfsp->f_bavail, sfsp->f_bsize, blocksize)); } - (void)printf(" %5.0f%%", + xo_emit(" {:used-percent/%5.0f}{U:%%}", availblks == 0 ? 100.0 : (double)used / (double)availblks * 100.0); if (iflag) { inodes = sfsp->f_files; used = inodes - sfsp->f_ffree; if (hflag) { - (void)printf(" "); - prthumanvalinode(used); - prthumanvalinode(sfsp->f_ffree); + xo_emit(" "); + prthumanvalinode(" {:inodes-used/%5s}", used); + prthumanvalinode(" {:inodes-free/%5s}", sfsp->f_ffree); } else { if (thousands) - format = " %*j'd %*j'd"; + format = " {:inodes-used/%*j'd} {:inodes-free/%*j'd}"; else - format = " %*jd %*jd"; - (void)printf(format, mwp->iused, (intmax_t)used, + format = " {:inodes-used/%*jd} {:inodes-free/%*jd}"; + xo_emit(format, mwp->iused, (intmax_t)used, mwp->ifree, (intmax_t)sfsp->f_ffree); } - (void)printf(" %4.0f%% ", inodes == 0 ? 100.0 : - (double)used / (double)inodes * 100.0); + xo_emit(" {:inodes-used-percent/%4.0f}{U:%%} ", + inodes == 0 ? 100.0 : + (double)used / (double)inodes * 100.0); } else - (void)printf(" "); + xo_emit(" "); if (strncmp(sfsp->f_mntfromname, "total", MNAMELEN) != 0) - (void)printf(" %s", sfsp->f_mntonname); - (void)printf("\n"); + xo_emit(" {:mounted-on}", sfsp->f_mntonname); + xo_emit("\n"); + xo_close_instance("filesystem"); } static void @@ -564,7 +588,7 @@ static void usage(void) { - (void)fprintf(stderr, + xo_error( "usage: df [-b | -g | -H | -h | -k | -m | -P] [-acilnT] [-t type] [-,]\n" " [file | filesystem ...]\n"); exit(EX_USAGE); @@ -579,24 +603,24 @@ makenetvfslist(void) int cnt, i, maxvfsconf; if (sysctlbyname("vfs.conflist", NULL, &buflen, NULL, 0) < 0) { - warn("sysctl(vfs.conflist)"); + xo_warn("sysctl(vfs.conflist)"); return (NULL); } xvfsp = malloc(buflen); if (xvfsp == NULL) { - warnx("malloc failed"); + xo_warnx("malloc failed"); return (NULL); } keep_xvfsp = xvfsp; if (sysctlbyname("vfs.conflist", xvfsp, &buflen, NULL, 0) < 0) { - warn("sysctl(vfs.conflist)"); + xo_warn("sysctl(vfs.conflist)"); free(keep_xvfsp); return (NULL); } maxvfsconf = buflen / sizeof(struct xvfsconf); if ((listptr = malloc(sizeof(char*) * maxvfsconf)) == NULL) { - warnx("malloc failed"); + xo_warnx("malloc failed"); free(keep_xvfsp); return (NULL); } @@ -605,7 +629,7 @@ makenetvfslist(void) if (xvfsp->vfc_flags & VFCF_NETWORK) { listptr[cnt++] = strdup(xvfsp->vfc_name); if (listptr[cnt-1] == NULL) { - warnx("malloc failed"); + xo_warnx("malloc failed"); free(listptr); free(keep_xvfsp); return (NULL); @@ -617,7 +641,7 @@ makenetvfslist(void) if (cnt == 0 || (str = malloc(sizeof(char) * (32 * cnt + cnt + 2))) == NULL) { if (cnt > 0) - warnx("malloc failed"); + xo_warnx("malloc failed"); free(listptr); free(keep_xvfsp); return (NULL); Modified: projects/ifnet/bin/sh/expand.c ============================================================================== --- projects/ifnet/bin/sh/expand.c Fri Nov 7 11:34:06 2014 (r274228) +++ projects/ifnet/bin/sh/expand.c Fri Nov 7 12:00:32 2014 (r274229) @@ -862,7 +862,7 @@ varisset(const char *name, int nulok) static void strtodest(const char *p, int flag, int subtype, int quoted) { - if (flag & (EXP_FULL | EXP_CASE) && subtype != VSLENGTH) + if (flag & (EXP_FULL | EXP_CASE | EXP_REDIR) && subtype != VSLENGTH) STPUTS_QUOTES(p, quoted ? DQSYNTAX : BASESYNTAX, expdest); else STPUTS(p, expdest); Modified: projects/ifnet/bin/sh/tests/expansion/Makefile ============================================================================== --- projects/ifnet/bin/sh/tests/expansion/Makefile Fri Nov 7 11:34:06 2014 (r274228) +++ projects/ifnet/bin/sh/tests/expansion/Makefile Fri Nov 7 12:00:32 2014 (r274229) @@ -72,6 +72,7 @@ FILES+= plus-minus7.0 FILES+= plus-minus8.0 FILES+= question1.0 FILES+= readonly1.0 +FILES+= redir1.0 FILES+= set-u1.0 FILES+= set-u2.0 FILES+= set-u3.0 Copied: projects/ifnet/bin/sh/tests/expansion/redir1.0 (from r274228, head/bin/sh/tests/expansion/redir1.0) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/ifnet/bin/sh/tests/expansion/redir1.0 Fri Nov 7 12:00:32 2014 (r274229, copy of r274228, head/bin/sh/tests/expansion/redir1.0) @@ -0,0 +1,26 @@ +# $FreeBSD$ + +bad=0 +for i in 0 1 2 3; do + for j in 0 1 2 3 4 5 6 7; do + for k in 0 1 2 3 4 5 6 7; do + case $i$j$k in + 000) continue ;; + esac + set -- "$(printf \\$i$j$k@)" + set -- "${1%@}" + ff= + for f in /dev/null /dev/zero /; do + if [ -e "$f" ] && [ ! -e "$f$1" ]; then + ff=$f + fi + done + [ -n "$ff" ] || continue + if { true <$ff$1; } 2>/dev/null; then + echo "Bad: $i$j$k ($ff)" >&2 + : $((bad += 1)) + fi + done + done +done +exit $((bad ? 2 : 0)) Modified: projects/ifnet/contrib/atf/FREEBSD-Xlist ============================================================================== --- projects/ifnet/contrib/atf/FREEBSD-Xlist Fri Nov 7 11:34:06 2014 (r274228) +++ projects/ifnet/contrib/atf/FREEBSD-Xlist Fri Nov 7 12:00:32 2014 (r274229) @@ -1,22 +1,12 @@ -*/*/Atffile */*/Makefile* -*/Atffile */Makefile* */*.m4 */*.pc.in -Atffile INSTALL Makefile* aclocal.m4 admin/ -atf-config/ -atf-report/ -atf-run/ -atf-version/ -bconfig.h.in +config.h.in bootstrap/ configure* -doc/atf-formats.5 -doc/atf.7.in m4/ -tools/ Modified: projects/ifnet/contrib/atf/NEWS ============================================================================== --- projects/ifnet/contrib/atf/NEWS Fri Nov 7 11:34:06 2014 (r274228) +++ projects/ifnet/contrib/atf/NEWS Fri Nov 7 12:00:32 2014 (r274229) @@ -1,6 +1,62 @@ Major changes between releases Automated Testing Framework =========================================================================== +Changes in version 0.21 +*********************** + +Released on October 23rd, 2014. + +* Restored the atf(7) manual page to serve as a reference to all the other + manual pages shipped by ATF. + +* Added the -s flag to atf-sh to support specifying the shell interpreter + to be used. + +* Removed ATF_WORKDIR. The only remaining consumers have been converted to + use the standard TMPDIR environment variable. As a benefit, and because + Kyua forces the TMPDIR to live within the test case's work directory, + any stale files left behind by ATF will be automatically cleaned up. + +* Documented the environment variables recognized by each component in the + relevant manual pages. This information was lost with the atf-config(1) + removal. + +* Added a new "require.diskspace" metadata property to test cases so that + they can specify the minimum amount of disk space required for the test + to run. + +* Renamed the atf-{c,c++,sh}-api(3) manual pages to atf-{c,c++,sh}(3) for + discoverability purposes. Symbolic links are provided for the time + being to still make the old names visible. + +* Issue #5: Recommend the (expected, actual) idiom for calls to the test + macros in the manual pages. + +* Issue #7: Stopped catching unhandled exceptions in atf-c++ tests. This + propagates the crash to the caller, which in turn allows it to obtain + proper debugging information. In particular, Kyua should now be able to + extract a stacktrace pinpointing the problem. + +* Issue #8: Fixed atf-c/macros_test:use test failures spotted by the clang + that ships with FreeBSD 11.0-CURRENT. + +* Issue #12: Improved documentation of atf-sh(3) and atf-check(1) by better + explaining how they relate to each other. + +* Issue #14: Stopped setting 'set -e' in atf-sh. This setting was + initially added as a way to enable a "strict" mode in the library and to + make test cases fail fast when they run unprotected commands. However, + doing so in the library is surprising as the responsibility of enabling + 'set -e' should be on the user's code. Also, 'set -e' introduces + inconsistent behavior on subshells and users do not expect that. + +* Issue #15: Fixed atf_utils_{fork,wait} to support nested calls. + +* Issue #16: Fixed test failures (by removing a long-standing hack) on + systems that lack \e support in printf(1). + +* Issue #19: Removed stale references to atf-config and atf-run. + Changes in version 0.20 *********************** Modified: projects/ifnet/contrib/atf/atf-c++.hpp ============================================================================== --- projects/ifnet/contrib/atf/atf-c++.hpp Fri Nov 7 11:34:06 2014 (r274228) +++ projects/ifnet/contrib/atf/atf-c++.hpp Fri Nov 7 12:00:32 2014 (r274229) @@ -1,6 +1,3 @@ -// -// Automated Testing Framework (atf) -// // Copyright (c) 2007 The NetBSD Foundation, Inc. // All rights reserved. // @@ -25,12 +22,11 @@ // 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. -// -#if !defined(_ATF_CXX_HPP_) -#define _ATF_CXX_HPP_ +#if !defined(ATF_CXX_HPP) +#define ATF_CXX_HPP #include #include -#endif // !defined(_ATF_CXX_HPP_) +#endif // !defined(ATF_CXX_HPP) Modified: projects/ifnet/contrib/atf/atf-c++/Kyuafile ============================================================================== --- projects/ifnet/contrib/atf/atf-c++/Kyuafile Fri Nov 7 11:34:06 2014 (r274228) +++ projects/ifnet/contrib/atf/atf-c++/Kyuafile Fri Nov 7 12:00:32 2014 (r274229) @@ -5,7 +5,6 @@ test_suite("atf") atf_test_program{name="atf_c++_test"} atf_test_program{name="build_test"} atf_test_program{name="check_test"} -atf_test_program{name="config_test"} atf_test_program{name="macros_test"} atf_test_program{name="pkg_config_test"} atf_test_program{name="tests_test"} Copied: projects/ifnet/contrib/atf/atf-c++/atf-c++.3 (from r274228, head/contrib/atf/atf-c++/atf-c++.3) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/ifnet/contrib/atf/atf-c++/atf-c++.3 Fri Nov 7 12:00:32 2014 (r274229, copy of r274228, head/contrib/atf/atf-c++/atf-c++.3) @@ -0,0 +1,649 @@ +.\" Copyright (c) 2008 The NetBSD Foundation, Inc. +.\" All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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. +.Dd October 13, 2014 +.Dt ATF-C++ 3 +.Os +.Sh NAME +.Nm atf-c++ , +.Nm ATF_ADD_TEST_CASE , +.Nm ATF_CHECK_ERRNO , +.Nm ATF_FAIL , +.Nm ATF_INIT_TEST_CASES , +.Nm ATF_PASS , +.Nm ATF_REQUIRE , +.Nm ATF_REQUIRE_EQ , +.Nm ATF_REQUIRE_ERRNO , +.Nm ATF_REQUIRE_IN , +.Nm ATF_REQUIRE_MATCH , +.Nm ATF_REQUIRE_NOT_IN , +.Nm ATF_REQUIRE_THROW , +.Nm ATF_REQUIRE_THROW_RE , +.Nm ATF_SKIP , +.Nm ATF_TEST_CASE , +.Nm ATF_TEST_CASE_BODY , +.Nm ATF_TEST_CASE_CLEANUP , +.Nm ATF_TEST_CASE_HEAD , +.Nm ATF_TEST_CASE_NAME , +.Nm ATF_TEST_CASE_USE , +.Nm ATF_TEST_CASE_WITH_CLEANUP , +.Nm ATF_TEST_CASE_WITHOUT_HEAD , +.Nm atf::utils::cat_file , +.Nm atf::utils::compare_file , +.Nm atf::utils::copy_file , +.Nm atf::utils::create_file , +.Nm atf::utils::file_exists , +.Nm atf::utils::fork , +.Nm atf::utils::grep_collection , +.Nm atf::utils::grep_file , +.Nm atf::utils::grep_string , +.Nm atf::utils::redirect , +.Nm atf::utils::wait +.Nd C++ API to write ATF-based test programs +.Sh SYNOPSIS +.In atf-c++.hpp +.Fn ATF_ADD_TEST_CASE "tcs" "name" +.Fn ATF_CHECK_ERRNO "expected_errno" "bool_expression" +.Fn ATF_FAIL "reason" +.Fn ATF_INIT_TEST_CASES "tcs" +.Fn ATF_PASS +.Fn ATF_REQUIRE "expression" +.Fn ATF_REQUIRE_EQ "expected_expression" "actual_expression" +.Fn ATF_REQUIRE_ERRNO "expected_errno" "bool_expression" +.Fn ATF_REQUIRE_IN "element" "collection" +.Fn ATF_REQUIRE_MATCH "regexp" "string_expression" +.Fn ATF_REQUIRE_NOT_IN "element" "collection" +.Fn ATF_REQUIRE_THROW "expected_exception" "statement" +.Fn ATF_REQUIRE_THROW_RE "expected_exception" "regexp" "statement" +.Fn ATF_SKIP "reason" +.Fn ATF_TEST_CASE "name" +.Fn ATF_TEST_CASE_BODY "name" +.Fn ATF_TEST_CASE_CLEANUP "name" +.Fn ATF_TEST_CASE_HEAD "name" +.Fn ATF_TEST_CASE_NAME "name" +.Fn ATF_TEST_CASE_USE "name" +.Fn ATF_TEST_CASE_WITH_CLEANUP "name" +.Fn ATF_TEST_CASE_WITHOUT_HEAD "name" +.Ft void +.Fo atf::utils::cat_file +.Fa "const std::string& path" +.Fa "const std::string& prefix" +.Fc +.Ft bool +.Fo atf::utils::compare_file +.Fa "const std::string& path" +.Fa "const std::string& contents" +.Fc +.Ft void +.Fo atf::utils::copy_file +.Fa "const std::string& source" +.Fa "const std::string& destination" +.Fc +.Ft void +.Fo atf::utils::create_file +.Fa "const std::string& path" +.Fa "const std::string& contents" +.Fc +.Ft void +.Fo atf::utils::file_exists +.Fa "const std::string& path" +.Fc +.Ft pid_t +.Fo atf::utils::fork +.Fa "void" +.Fc +.Ft bool +.Fo atf::utils::grep_collection +.Fa "const std::string& regexp" +.Fa "const Collection& collection" +.Fc +.Ft bool +.Fo atf::utils::grep_file +.Fa "const std::string& regexp" +.Fa "const std::string& path" +.Fc +.Ft bool +.Fo atf::utils::grep_string +.Fa "const std::string& regexp" +.Fa "const std::string& path" +.Fc +.Ft void +.Fo atf::utils::redirect +.Fa "const int fd" +.Fa "const std::string& path" +.Fc +.Ft void +.Fo atf::utils::wait +.Fa "const pid_t pid" +.Fa "const int expected_exit_status" +.Fa "const std::string& expected_stdout" +.Fa "const std::string& expected_stderr" +.Fc +.Sh DESCRIPTION +ATF provides a C++ programming interface to implement test programs. +C++-based test programs follow this template: +.Bd -literal -offset indent +extern "C" { +.Ns ... C-specific includes go here ... +} + +.Ns ... C++-specific includes go here ... + +#include + +ATF_TEST_CASE(tc1); +ATF_TEST_CASE_HEAD(tc1) +{ + ... first test case's header ... +} +ATF_TEST_CASE_BODY(tc1) +{ + ... first test case's body ... +} + +ATF_TEST_CASE_WITH_CLEANUP(tc2); +ATF_TEST_CASE_HEAD(tc2) +{ + ... second test case's header ... +} +ATF_TEST_CASE_BODY(tc2) +{ + ... second test case's body ... +} +ATF_TEST_CASE_CLEANUP(tc2) +{ + ... second test case's cleanup ... +} + +ATF_TEST_CASE(tc3); +ATF_TEST_CASE_BODY(tc3) +{ + ... third test case's body ... +} + +.Ns ... additional test cases ... + +ATF_INIT_TEST_CASES(tcs) +{ + ATF_ADD_TEST_CASE(tcs, tc1); + ATF_ADD_TEST_CASE(tcs, tc2); + ATF_ADD_TEST_CASE(tcs, tc3); + ... add additional test cases ... +} +.Ed +.Ss Definition of test cases +Test cases have an identifier and are composed of three different parts: +the header, the body and an optional cleanup routine, all of which are +described in +.Xr atf-test-case 4 . +To define test cases, one can use the +.Fn ATF_TEST_CASE , +.Fn ATF_TEST_CASE_WITH_CLEANUP +or the +.Fn ATF_TEST_CASE_WITHOUT_HEAD +macros, which take a single parameter specifiying the test case's +name. +.Fn ATF_TEST_CASE , +requires to define a head and a body for the test case, +.Fn ATF_TEST_CASE_WITH_CLEANUP +requires to define a head, a body and a cleanup for the test case and +.Fn ATF_TEST_CASE_WITHOUT_HEAD +requires only a body for the test case. +It is important to note that these +.Em do not +set the test case up for execution when the program is run. +In order to do so, a later registration is needed through the +.Fn ATF_ADD_TEST_CASE +macro detailed in +.Sx Program initialization . +.Pp +Later on, one must define the three parts of the body by means of three +functions. +Their headers are given by the +.Fn ATF_TEST_CASE_HEAD , +.Fn ATF_TEST_CASE_BODY +and +.Fn ATF_TEST_CASE_CLEANUP +macros, all of which take the test case's name. +Following each of these, a block of code is expected, surrounded by the +opening and closing brackets. +.Pp +Additionally, the +.Fn ATF_TEST_CASE_NAME +macro can be used to obtain the name of the class corresponding to a +particular test case, as the name is internally manged by the library to +prevent clashes with other user identifiers. +Similarly, the +.Fn ATF_TEST_CASE_USE +macro can be executed on a particular test case to mark it as "used" and +thus prevent compiler warnings regarding unused symbols. +Note that +.Em you should never have to use these macros during regular operation. +.Ss Program initialization +The library provides a way to easily define the test program's +.Fn main +function. +You should never define one on your own, but rely on the +library to do it for you. +This is done by using the +.Fn ATF_INIT_TEST_CASES +macro, which is passed the name of the list that will hold the test cases. +This name can be whatever you want as long as it is a valid variable value. +.Pp +After the macro, you are supposed to provide the body of a function, which +should only use the +.Fn ATF_ADD_TEST_CASE +macro to register the test cases the test program will execute. +The first parameter of this macro matches the name you provided in the +former call. +.Ss Header definitions +The test case's header can define the meta-data by using the +.Fn set_md_var +method, which takes two parameters: the first one specifies the +meta-data variable to be set and the second one specifies its value. +Both of them are strings. +.Ss Configuration variables +The test case has read-only access to the current configuration variables +by means of the +.Ft bool +.Fn has_config_var +and the +.Ft std::string +.Fn get_config_var +methods, which can be called in any of the three parts of a test case. +.Ss Access to the source directory +It is possible to get the path to the test case's source directory from any +of its three components by querying the +.Sq srcdir +configuration variable. +.Ss Requiring programs +Aside from the +.Va require.progs +meta-data variable available in the header only, one can also check for +additional programs in the test case's body by using the +.Fn require_prog +function, which takes the base name or full path of a single binary. +Relative paths are forbidden. +If it is not found, the test case will be automatically skipped. +.Ss Test case finalization +The test case finalizes either when the body reaches its end, at which +point the test is assumed to have +.Em passed , +or at any explicit call to +.Fn ATF_PASS , +.Fn ATF_FAIL +or +.Fn ATF_SKIP . +These three macros terminate the execution of the test case immediately. +The cleanup routine will be processed afterwards in a completely automated +way, regardless of the test case's termination reason. +.Pp +.Fn ATF_PASS +does not take any parameters. +.Fn ATF_FAIL +and +.Fn ATF_SKIP +take a single string that describes why the test case failed or +was skipped, respectively. +It is very important to provide a clear error message in both cases so that +the user can quickly know why the test did not pass. +.Ss Expectations +Everything explained in the previous section changes when the test case +expectations are redefined by the programmer. +.Pp +Each test case has an internal state called +.Sq expect +that describes what the test case expectations are at any point in time. +The value of this property can change during execution by any of: +.Bl -tag -width indent +.It Fn expect_death "reason" +Expects the test case to exit prematurely regardless of the nature of the +exit. +.It Fn expect_exit "exitcode" "reason" +Expects the test case to exit cleanly. +If +.Va exitcode +is not +.Sq -1 , +the runtime engine will validate that the exit code of the test case +matches the one provided in this call. +Otherwise, the exact value will be ignored. +.It Fn expect_fail "reason" +Any failure (be it fatal or non-fatal) raised in this mode is recorded. +However, such failures do not report the test case as failed; instead, the +test case finalizes cleanly and is reported as +.Sq expected failure ; +this report includes the provided +.Fa reason +as part of it. +If no error is raised while running in this mode, then the test case is +reported as +.Sq failed . +.Pp +This mode is useful to reproduce actual known bugs in tests. *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Fri Nov 7 22:02:45 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C9B08886; Fri, 7 Nov 2014 22:02:45 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id AAA4D298; Fri, 7 Nov 2014 22:02:45 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sA7M2jQi081606; Fri, 7 Nov 2014 22:02:45 GMT (envelope-from melifaro@FreeBSD.org) Received: (from melifaro@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sA7M2jll081605; Fri, 7 Nov 2014 22:02:45 GMT (envelope-from melifaro@FreeBSD.org) Message-Id: <201411072202.sA7M2jll081605@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: melifaro set sender to melifaro@FreeBSD.org using -f From: "Alexander V. Chernikov" Date: Fri, 7 Nov 2014 22:02:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274255 - projects/routing/sys/net X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Nov 2014 22:02:46 -0000 Author: melifaro Date: Fri Nov 7 22:02:44 2014 New Revision: 274255 URL: https://svnweb.freebsd.org/changeset/base/274255 Log: Provide typedefs for radix functions. Modified: projects/routing/sys/net/radix.h Modified: projects/routing/sys/net/radix.h ============================================================================== --- projects/routing/sys/net/radix.h Fri Nov 7 21:30:16 2014 (r274254) +++ projects/routing/sys/net/radix.h Fri Nov 7 22:02:44 2014 (r274255) @@ -101,30 +101,37 @@ struct radix_mask { #define rm_mask rm_rmu.rmu_mask #define rm_leaf rm_rmu.rmu_leaf /* extra field would make 32 bytes */ +struct radix_node_head; + typedef int walktree_f_t(struct radix_node *, void *); +typedef struct radix_node *rn_matchaddr_f_t(void *v, + struct radix_node_head *head); +typedef struct radix_node *rn_addaddr_f_t(void *v, void *mask, + struct radix_node_head *head, struct radix_node nodes[]); +typedef struct radix_node *rn_deladdr_f_t(void *v, void *mask, + struct radix_node_head *head); +typedef struct radix_node *rn_lookup_f_t(void *v, void *mask, + struct radix_node_head *head); +typedef int rn_walktree_t(struct radix_node_head *head, walktree_f_t *f, + void *w); +typedef int rn_walktree_from_t(struct radix_node_head *head, + void *a, void *m, walktree_f_t *f, void *w); +typedef void rn_close_t(struct radix_node *rn, struct radix_node_head *head); + struct radix_node_head { struct radix_node *rnh_treetop; + struct radix_node_head *rnh_masks; /* Storage for our masks */ u_int rnh_gen; /* generation counter */ int rnh_multipath; /* multipath capable ? */ - struct radix_node *(*rnh_addaddr) /* add based on sockaddr */ - (void *v, void *mask, - struct radix_node_head *head, struct radix_node nodes[]); - struct radix_node *(*rnh_deladdr) /* remove based on sockaddr */ - (void *v, void *mask, struct radix_node_head *head); - struct radix_node *(*rnh_matchaddr) /* longest match for sockaddr */ - (void *v, struct radix_node_head *head); - struct radix_node *(*rnh_lookup) /*exact match for sockaddr*/ - (void *v, void *mask, struct radix_node_head *head); - int (*rnh_walktree) /* traverse tree */ - (struct radix_node_head *head, walktree_f_t *f, void *w); - int (*rnh_walktree_from) /* traverse tree below a */ - (struct radix_node_head *head, void *a, void *m, - walktree_f_t *f, void *w); - void (*rnh_close) /* do something when the last ref drops */ - (struct radix_node *rn, struct radix_node_head *head); + rn_matchaddr_f_t *rnh_matchaddr; /* longest match for sockaddr */ + rn_addaddr_f_t *rnh_addaddr; /* add based on sockaddr*/ + rn_deladdr_f_t *rnh_deladdr; /* remove based on sockaddr */ + rn_lookup_f_t *rnh_lookup; /* exact match for sockaddr */ + rn_walktree_t *rnh_walktree; /* traverse tree */ + rn_walktree_from_t *rnh_walktree_from; /* traverse tree below a */ + rn_close_t *rnh_close; /*do something when the last ref drops*/ struct radix_node rnh_nodes[3]; /* empty tree for common case */ - struct radix_node_head *rnh_masks; /* Storage for our masks */ #ifdef _KERNEL struct rwlock rnh_lock; /* locks entire radix tree */ #endif From owner-svn-src-projects@FreeBSD.ORG Fri Nov 7 22:52:04 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E4C0F261; Fri, 7 Nov 2014 22:52:04 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C587094C; Fri, 7 Nov 2014 22:52:04 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sA7Mq4N2006594; Fri, 7 Nov 2014 22:52:04 GMT (envelope-from melifaro@FreeBSD.org) Received: (from melifaro@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sA7Mq3u6006585; Fri, 7 Nov 2014 22:52:03 GMT (envelope-from melifaro@FreeBSD.org) Message-Id: <201411072252.sA7Mq3u6006585@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: melifaro set sender to melifaro@FreeBSD.org using -f From: "Alexander V. Chernikov" Date: Fri, 7 Nov 2014 22:52:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274256 - in projects/routing/sys: net netinet netinet6 netpfil/pf X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Nov 2014 22:52:05 -0000 Author: melifaro Date: Fri Nov 7 22:52:02 2014 New Revision: 274256 URL: https://svnweb.freebsd.org/changeset/base/274256 Log: Split radix implementation and system route table structure: use new 'struct radix_head' for radix. Modified: projects/routing/sys/net/radix.c projects/routing/sys/net/radix.h projects/routing/sys/netinet/in_rmx.c projects/routing/sys/netinet6/in6_rmx.c projects/routing/sys/netpfil/pf/pf_table.c Modified: projects/routing/sys/net/radix.c ============================================================================== --- projects/routing/sys/net/radix.c Fri Nov 7 22:02:44 2014 (r274255) +++ projects/routing/sys/net/radix.c Fri Nov 7 22:52:02 2014 (r274256) @@ -56,15 +56,16 @@ #include #endif /* !_KERNEL */ -static int rn_walktree_from(struct radix_node_head *h, void *a, void *m, +static int rn_walktree_from(struct radix_head *h, void *a, void *m, walktree_f_t *f, void *w); -static int rn_walktree(struct radix_node_head *, walktree_f_t *, void *); +static int rn_walktree(struct radix_head *, walktree_f_t *, void *); static struct radix_node - *rn_insert(void *, struct radix_node_head *, int *, + *rn_insert(void *, struct radix_head *, int *, struct radix_node [2]), *rn_newpair(void *, int, struct radix_node[2]), *rn_search(void *, struct radix_node *), *rn_search_m(void *, struct radix_node *, void *); +static struct radix_node *rn_addmask(void *, struct radix_head *, int, int); static void rn_detachhead_internal(void **head); static int rn_inithead_internal(void **head, int off); @@ -215,7 +216,7 @@ rn_refines(void *m_arg, void *n_arg) * from host routes. */ struct radix_node * -rn_lookup(void *v_arg, void *m_arg, struct radix_node_head *head) +rn_lookup(void *v_arg, void *m_arg, struct radix_head *head) { struct radix_node *x; caddr_t netmask; @@ -277,7 +278,7 @@ rn_satisfies_leaf(char *trial, struct ra * Search for longest-prefix match in given @head */ struct radix_node * -rn_match(void *v_arg, struct radix_node_head *head) +rn_match(void *v_arg, struct radix_head *head) { caddr_t v = v_arg; struct radix_node *t = head->rnh_treetop, *x; @@ -426,7 +427,7 @@ rn_newpair(void *v, int b, struct radix_ } static struct radix_node * -rn_insert(void *v_arg, struct radix_node_head *head, int *dupentry, +rn_insert(void *v_arg, struct radix_head *head, int *dupentry, struct radix_node nodes[2]) { caddr_t v = v_arg; @@ -489,8 +490,9 @@ on1: return (tt); } +/* XXX: Convert mask tree to hash */ struct radix_node * -rn_addmask(void *n_arg, struct radix_node_head *maskhead, int search, int skip) +rn_addmask(void *n_arg, struct radix_head *maskhead, int search, int skip) { unsigned char *netmask = n_arg; unsigned char *cp, *cplim; @@ -505,7 +507,7 @@ rn_addmask(void *n_arg, struct radix_nod if (skip == 0) skip = 1; if (mlen <= skip) - return (maskhead->rnh_nodes); + return (((struct radix_node_head *)maskhead)->rnh_nodes); bzero(addmask_key, RADIX_MAX_KEY_LEN); if (skip > 1) @@ -518,7 +520,7 @@ rn_addmask(void *n_arg, struct radix_nod cp--; mlen = cp - addmask_key; if (mlen <= skip) - return (maskhead->rnh_nodes); + return (((struct radix_node_head *)maskhead)->rnh_nodes); *addmask_key = mlen; x = rn_search(addmask_key, maskhead->rnh_treetop); if (bcmp(addmask_key, x->rn_key, mlen) != 0) @@ -598,7 +600,7 @@ rn_new_radix_mask(struct radix_node *tt, } struct radix_node * -rn_addroute(void *v_arg, void *n_arg, struct radix_node_head *head, +rn_addroute(void *v_arg, void *n_arg, struct radix_head *head, struct radix_node treenodes[2]) { caddr_t v = (caddr_t)v_arg, netmask = (caddr_t)n_arg; @@ -772,7 +774,7 @@ on2: } struct radix_node * -rn_delete(void *v_arg, void *netmask_arg, struct radix_node_head *head) +rn_delete(void *v_arg, void *netmask_arg, struct radix_head *head) { struct radix_node *t, *p, *x, *tt; struct radix_mask *m, *saved_m, **mp; @@ -960,7 +962,7 @@ out: * exit. */ static int -rn_walktree_from(struct radix_node_head *h, void *a, void *m, +rn_walktree_from(struct radix_head *h, void *a, void *m, walktree_f_t *f, void *w) { int error; @@ -1066,7 +1068,7 @@ rn_walktree_from(struct radix_node_head } static int -rn_walktree(struct radix_node_head *h, walktree_f_t *f, void *w) +rn_walktree(struct radix_head *h, walktree_f_t *f, void *w) { int error; struct radix_node *base, *next; @@ -1132,13 +1134,13 @@ rn_inithead_internal(void **head, int of tt->rn_bit = -1 - off; *ttt = *tt; ttt->rn_key = rn_ones; - rnh->rnh_addaddr = rn_addroute; - rnh->rnh_deladdr = rn_delete; - rnh->rnh_matchaddr = rn_match; - rnh->rnh_lookup = rn_lookup; - rnh->rnh_walktree = rn_walktree; - rnh->rnh_walktree_from = rn_walktree_from; - rnh->rnh_treetop = t; + rnh->rnh_addaddr = (rn_addaddr_f_t *)rn_addroute; + rnh->rnh_deladdr = (rn_deladdr_f_t *)rn_delete; + rnh->rnh_matchaddr = (rn_matchaddr_f_t *)rn_match; + rnh->rnh_lookup = (rn_lookup_f_t *)rn_lookup; + rnh->rnh_walktree = (rn_walktree_t *)rn_walktree; + rnh->rnh_walktree_from = (rn_walktree_from_t *)rn_walktree_from; + rnh->rh.rnh_treetop = t; return (1); } @@ -1170,7 +1172,7 @@ rn_inithead(void **head, int off) rnh = (struct radix_node_head *)(*head); - if (rn_inithead_internal((void **)&rnh->rnh_masks, 0) == 0) { + if (rn_inithead_internal((void **)&rnh->rh.rnh_masks, 0) == 0) { rn_detachhead_internal(head); return (0); } @@ -1181,7 +1183,7 @@ rn_inithead(void **head, int off) static int rn_freeentry(struct radix_node *rn, void *arg) { - struct radix_node_head * const rnh = arg; + struct radix_head * const rnh = arg; struct radix_node *x; x = (struct radix_node *)rn_delete(rn + 2, NULL, rnh); @@ -1200,8 +1202,8 @@ rn_detachhead(void **head) rnh = *head; - rn_walktree(rnh->rnh_masks, rn_freeentry, rnh->rnh_masks); - rn_detachhead_internal((void **)&rnh->rnh_masks); + rn_walktree(rnh->rh.rnh_masks, rn_freeentry, rnh->rh.rnh_masks); + rn_detachhead_internal((void **)&rnh->rh.rnh_masks); rn_detachhead_internal(head); return (1); } Modified: projects/routing/sys/net/radix.h ============================================================================== --- projects/routing/sys/net/radix.h Fri Nov 7 22:02:44 2014 (r274255) +++ projects/routing/sys/net/radix.h Fri Nov 7 22:52:02 2014 (r274256) @@ -118,10 +118,13 @@ typedef int rn_walktree_from_t(struct ra void *a, void *m, walktree_f_t *f, void *w); typedef void rn_close_t(struct radix_node *rn, struct radix_node_head *head); +struct radix_head { + struct radix_node *rnh_treetop; + struct radix_head *rnh_masks; /* Storage for our masks */ +}; struct radix_node_head { - struct radix_node *rnh_treetop; - struct radix_node_head *rnh_masks; /* Storage for our masks */ + struct radix_head rh; u_int rnh_gen; /* generation counter */ int rnh_multipath; /* multipath capable ? */ rn_matchaddr_f_t *rnh_matchaddr; /* longest match for sockaddr */ @@ -163,13 +166,11 @@ struct radix_node_head { int rn_inithead(void **, int); int rn_detachhead(void **); int rn_refines(void *, void *); -struct radix_node - *rn_addmask(void *, struct radix_node_head *, int, int), - *rn_addroute (void *, void *, struct radix_node_head *, - struct radix_node [2]), - *rn_delete(void *, void *, struct radix_node_head *), - *rn_lookup (void *v_arg, void *m_arg, - struct radix_node_head *head), - *rn_match(void *, struct radix_node_head *); +struct radix_node *rn_addroute (void *, void *, struct radix_head *, + struct radix_node [2]); +struct radix_node *rn_delete(void *, void *, struct radix_head *); +struct radix_node *rn_lookup (void *v_arg, void *m_arg, + struct radix_head *head); +struct radix_node *rn_match(void *, struct radix_head *); #endif /* _RADIX_H_ */ Modified: projects/routing/sys/netinet/in_rmx.c ============================================================================== --- projects/routing/sys/netinet/in_rmx.c Fri Nov 7 22:02:44 2014 (r274255) +++ projects/routing/sys/netinet/in_rmx.c Fri Nov 7 22:52:02 2014 (r274256) @@ -98,7 +98,7 @@ in_addroute(void *v_arg, void *n_arg, st if (rt->rt_mtu == 0 && rt->rt_ifp != NULL) rt->rt_mtu = rt->rt_ifp->if_mtu; - return (rn_addroute(v_arg, n_arg, head, treenodes)); + return (rn_addroute(v_arg, n_arg, &head->rh, treenodes)); } /* @@ -109,7 +109,7 @@ in_addroute(void *v_arg, void *n_arg, st static struct radix_node * in_matroute(void *v_arg, struct radix_node_head *head) { - struct radix_node *rn = rn_match(v_arg, head); + struct radix_node *rn = rn_match(v_arg, &head->rh); struct rtentry *rt = (struct rtentry *)rn; if (rt) { @@ -330,7 +330,8 @@ void in_setmatchfunc(struct radix_node_head *rnh, int val) { - rnh->rnh_matchaddr = (val != 0) ? rn_match : in_matroute; + rnh->rnh_matchaddr = (val != 0) ? + (rn_matchaddr_f_t *)rn_match : in_matroute; } static int _in_rt_was_here; Modified: projects/routing/sys/netinet6/in6_rmx.c ============================================================================== --- projects/routing/sys/netinet6/in6_rmx.c Fri Nov 7 22:02:44 2014 (r274255) +++ projects/routing/sys/netinet6/in6_rmx.c Fri Nov 7 22:52:02 2014 (r274256) @@ -140,7 +140,7 @@ in6_addroute(void *v_arg, void *n_arg, s if (!rt->rt_mtu && rt->rt_ifp) rt->rt_mtu = IN6_LINKMTU(rt->rt_ifp); - ret = rn_addroute(v_arg, n_arg, head, treenodes); + ret = rn_addroute(v_arg, n_arg, &head->rh, treenodes); if (ret == NULL) { struct rtentry *rt2; /* Modified: projects/routing/sys/netpfil/pf/pf_table.c ============================================================================== --- projects/routing/sys/netpfil/pf/pf_table.c Fri Nov 7 22:02:44 2014 (r274255) +++ projects/routing/sys/netpfil/pf/pf_table.c Fri Nov 7 22:52:02 2014 (r274256) @@ -739,7 +739,7 @@ static struct pfr_kentry * pfr_lookup_addr(struct pfr_ktable *kt, struct pfr_addr *ad, int exact) { union sockaddr_union sa, mask; - struct radix_node_head *head = NULL; + struct radix_head *head = NULL; struct pfr_kentry *ke; PF_RULES_ASSERT(); @@ -747,10 +747,10 @@ pfr_lookup_addr(struct pfr_ktable *kt, s bzero(&sa, sizeof(sa)); if (ad->pfra_af == AF_INET) { FILLIN_SIN(sa.sin, ad->pfra_ip4addr); - head = kt->pfrkt_ip4; + head = &kt->pfrkt_ip4->rh; } else if ( ad->pfra_af == AF_INET6 ) { FILLIN_SIN6(sa.sin6, ad->pfra_ip6addr); - head = kt->pfrkt_ip6; + head = &kt->pfrkt_ip6->rh; } if (ADDR_NETWORK(ad)) { pfr_prepare_network(&mask, ad->pfra_af, ad->pfra_net); @@ -929,15 +929,15 @@ pfr_route_kentry(struct pfr_ktable *kt, { union sockaddr_union mask; struct radix_node *rn; - struct radix_node_head *head = NULL; + struct radix_head *head = NULL; PF_RULES_WASSERT(); bzero(ke->pfrke_node, sizeof(ke->pfrke_node)); if (ke->pfrke_af == AF_INET) - head = kt->pfrkt_ip4; + head = &kt->pfrkt_ip4->rh; else if (ke->pfrke_af == AF_INET6) - head = kt->pfrkt_ip6; + head = &kt->pfrkt_ip6->rh; if (KENTRY_NETWORK(ke)) { pfr_prepare_network(&mask, ke->pfrke_af, ke->pfrke_net); @@ -953,12 +953,12 @@ pfr_unroute_kentry(struct pfr_ktable *kt { union sockaddr_union mask; struct radix_node *rn; - struct radix_node_head *head = NULL; + struct radix_head *head = NULL; if (ke->pfrke_af == AF_INET) - head = kt->pfrkt_ip4; + head = &kt->pfrkt_ip4->rh; else if (ke->pfrke_af == AF_INET6) - head = kt->pfrkt_ip6; + head = &kt->pfrkt_ip6->rh; if (KENTRY_NETWORK(ke)) { pfr_prepare_network(&mask, ke->pfrke_af, ke->pfrke_net); @@ -1907,7 +1907,7 @@ pfr_match_addr(struct pfr_ktable *kt, st sin.sin_len = sizeof(sin); sin.sin_family = AF_INET; sin.sin_addr.s_addr = a->addr32[0]; - ke = (struct pfr_kentry *)rn_match(&sin, kt->pfrkt_ip4); + ke = (struct pfr_kentry *)rn_match(&sin, &kt->pfrkt_ip4->rh); if (ke && KENTRY_RNF_ROOT(ke)) ke = NULL; break; @@ -1922,7 +1922,7 @@ pfr_match_addr(struct pfr_ktable *kt, st sin6.sin6_len = sizeof(sin6); sin6.sin6_family = AF_INET6; bcopy(a, &sin6.sin6_addr, sizeof(sin6.sin6_addr)); - ke = (struct pfr_kentry *)rn_match(&sin6, kt->pfrkt_ip6); + ke = (struct pfr_kentry *)rn_match(&sin6, &kt->pfrkt_ip6->rh); if (ke && KENTRY_RNF_ROOT(ke)) ke = NULL; break; @@ -1958,7 +1958,7 @@ pfr_update_stats(struct pfr_ktable *kt, sin.sin_len = sizeof(sin); sin.sin_family = AF_INET; sin.sin_addr.s_addr = a->addr32[0]; - ke = (struct pfr_kentry *)rn_match(&sin, kt->pfrkt_ip4); + ke = (struct pfr_kentry *)rn_match(&sin, &kt->pfrkt_ip4->rh); if (ke && KENTRY_RNF_ROOT(ke)) ke = NULL; break; @@ -1973,7 +1973,7 @@ pfr_update_stats(struct pfr_ktable *kt, sin6.sin6_len = sizeof(sin6); sin6.sin6_family = AF_INET6; bcopy(a, &sin6.sin6_addr, sizeof(sin6.sin6_addr)); - ke = (struct pfr_kentry *)rn_match(&sin6, kt->pfrkt_ip6); + ke = (struct pfr_kentry *)rn_match(&sin6, &kt->pfrkt_ip6->rh); if (ke && KENTRY_RNF_ROOT(ke)) ke = NULL; break; @@ -2120,11 +2120,11 @@ _next_block: switch (af) { case AF_INET: ke2 = (struct pfr_kentry *)rn_match(&uaddr, - kt->pfrkt_ip4); + &kt->pfrkt_ip4->rh); break; case AF_INET6: ke2 = (struct pfr_kentry *)rn_match(&uaddr, - kt->pfrkt_ip6); + &kt->pfrkt_ip6->rh); break; } /* no need to check KENTRY_RNF_ROOT() here */ From owner-svn-src-projects@FreeBSD.ORG Fri Nov 7 23:50:05 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C4990FFC; Fri, 7 Nov 2014 23:50:05 +0000 (UTC) Received: from mail107.syd.optusnet.com.au (mail107.syd.optusnet.com.au [211.29.132.53]) by mx1.freebsd.org (Postfix) with ESMTP id 88FE6DDD; Fri, 7 Nov 2014 23:50:05 +0000 (UTC) Received: from c122-106-147-133.carlnfd1.nsw.optusnet.com.au (c122-106-147-133.carlnfd1.nsw.optusnet.com.au [122.106.147.133]) by mail107.syd.optusnet.com.au (Postfix) with ESMTPS id 32DAFD46C92; Sat, 8 Nov 2014 10:49:58 +1100 (AEDT) Date: Sat, 8 Nov 2014 10:49:54 +1100 (EST) From: Bruce Evans X-X-Sender: bde@besplex.bde.org To: "Alexander V. Chernikov" Subject: Re: svn commit: r274256 - in projects/routing/sys: net netinet netinet6 netpfil/pf In-Reply-To: <201411072252.sA7Mq3u6006585@svn.freebsd.org> Message-ID: <20141108104426.X2034@besplex.bde.org> References: <201411072252.sA7Mq3u6006585@svn.freebsd.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed X-Optus-CM-Score: 0 X-Optus-CM-Analysis: v=2.1 cv=dMCfxopb c=1 sm=1 tr=0 a=7NqvjVvQucbO2RlWB8PEog==:117 a=PO7r1zJSAAAA:8 a=kj9zAlcOel0A:10 a=JzwRw_2MAAAA:8 a=h8u5PeLbQoWTW2kpvDcA:9 a=CjuIK1q_8ugA:10 Cc: svn-src-projects@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Nov 2014 23:50:05 -0000 On Fri, 7 Nov 2014, Alexander V. Chernikov wrote: > Log: > Split radix implementation and system route table structure: > use new 'struct radix_head' for radix. > Modified: projects/routing/sys/net/radix.c > ============================================================================== > --- projects/routing/sys/net/radix.c Fri Nov 7 22:02:44 2014 (r274255) > +++ projects/routing/sys/net/radix.c Fri Nov 7 22:52:02 2014 (r274256) > ... > @@ -1132,13 +1134,13 @@ rn_inithead_internal(void **head, int of > tt->rn_bit = -1 - off; > *ttt = *tt; > ttt->rn_key = rn_ones; > - rnh->rnh_addaddr = rn_addroute; > - rnh->rnh_deladdr = rn_delete; > - rnh->rnh_matchaddr = rn_match; > - rnh->rnh_lookup = rn_lookup; > - rnh->rnh_walktree = rn_walktree; > - rnh->rnh_walktree_from = rn_walktree_from; > - rnh->rnh_treetop = t; > + rnh->rnh_addaddr = (rn_addaddr_f_t *)rn_addroute; > + rnh->rnh_deladdr = (rn_deladdr_f_t *)rn_delete; > + rnh->rnh_matchaddr = (rn_matchaddr_f_t *)rn_match; > + rnh->rnh_lookup = (rn_lookup_f_t *)rn_lookup; > + rnh->rnh_walktree = (rn_walktree_t *)rn_walktree; > + rnh->rnh_walktree_from = (rn_walktree_from_t *)rn_walktree_from; > + rnh->rh.rnh_treetop = t; > return (1); > } > A previous commit added lots of function typedefs. As I feared, most uses of these are to give undefined behaviour by bogusly casting using the typedefs. Unless the function types are actually the same. Then the bogus casts have no effect. These typedefs don't seem to be used to obfuscate function definitions yet. Bruce From owner-svn-src-projects@FreeBSD.ORG Sat Nov 8 00:09:13 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 62A2C32C; Sat, 8 Nov 2014 00:09:13 +0000 (UTC) Received: from mail.ipfw.ru (mail.ipfw.ru [IPv6:2a01:4f8:120:6141::2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 23DB6F84; Sat, 8 Nov 2014 00:09:12 +0000 (UTC) Received: from secured.by.ipfw.ru ([95.143.220.47] helo=[10.0.0.120]) by mail.ipfw.ru with esmtpsa (TLSv1:DHE-RSA-AES256-SHA:256) (Exim 4.82 (FreeBSD)) (envelope-from ) id 1XmpZv-00099H-BR; Fri, 07 Nov 2014 23:52:15 +0400 Content-Type: text/plain; charset=utf-8 Mime-Version: 1.0 (Mac OS X Mail 8.0 \(1990.1\)) Subject: Re: svn commit: r274256 - in projects/routing/sys: net netinet netinet6 netpfil/pf From: "Alexander V. Chernikov" In-Reply-To: <20141108104426.X2034@besplex.bde.org> Date: Sat, 8 Nov 2014 03:09:07 +0300 Content-Transfer-Encoding: quoted-printable Message-Id: References: <201411072252.sA7Mq3u6006585@svn.freebsd.org> <20141108104426.X2034@besplex.bde.org> To: Bruce Evans X-Mailer: Apple Mail (2.1990.1) Cc: svn-src-projects@freebsd.org, src-committers@freebsd.org, "Alexander V. Chernikov" X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Nov 2014 00:09:13 -0000 > On 08 Nov 2014, at 02:49, Bruce Evans wrote: >=20 > On Fri, 7 Nov 2014, Alexander V. Chernikov wrote: >=20 >> Log: >> Split radix implementation and system route table structure: >> use new 'struct radix_head' for radix. >=20 >> Modified: projects/routing/sys/net/radix.c >> = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D >> --- projects/routing/sys/net/radix.c Fri Nov 7 22:02:44 2014 = (r274255) >> +++ projects/routing/sys/net/radix.c Fri Nov 7 22:52:02 2014 = (r274256) >> ... >> @@ -1132,13 +1134,13 @@ rn_inithead_internal(void **head, int of >> tt->rn_bit =3D -1 - off; >> *ttt =3D *tt; >> ttt->rn_key =3D rn_ones; >> - rnh->rnh_addaddr =3D rn_addroute; >> - rnh->rnh_deladdr =3D rn_delete; >> - rnh->rnh_matchaddr =3D rn_match; >> - rnh->rnh_lookup =3D rn_lookup; >> - rnh->rnh_walktree =3D rn_walktree; >> - rnh->rnh_walktree_from =3D rn_walktree_from; >> - rnh->rnh_treetop =3D t; >> + rnh->rnh_addaddr =3D (rn_addaddr_f_t *)rn_addroute; >> + rnh->rnh_deladdr =3D (rn_deladdr_f_t *)rn_delete; >> + rnh->rnh_matchaddr =3D (rn_matchaddr_f_t *)rn_match; >> + rnh->rnh_lookup =3D (rn_lookup_f_t *)rn_lookup; >> + rnh->rnh_walktree =3D (rn_walktree_t *)rn_walktree; >> + rnh->rnh_walktree_from =3D (rn_walktree_from_t = *)rn_walktree_from; >> + rnh->rh.rnh_treetop =3D t; >> return (1); >> } >>=20 >=20 > A previous commit added lots of function typedefs. As I feared, most = uses > of these are to give undefined behaviour by bogusly casting using the > typedefs. Unless the function types are actually the same. Then the > bogus casts have no effect. Yes, these changes are not final. Currently we use radix for the following: 1) main routing table (where we have =E2=80=9Croute entries=E2=80=9D, = =E2=80=9Cmultipath=E2=80=9D and other routing-specific stuff). We also = need to redefine some of callbacks for different address families. 2) prefix lists in NFS server, pf and ipfw firewall (and some other = places). Here we don=E2=80=99t need callback re-definition, embedded = locking and other stuff.=20 My goal is to significantly change structure/binding of radix to routing = table (change locking model, change callbacks and so on) so I=E2=80=99m = trying to decouple radix code from current routing-specific table structures as much as I = can. >=20 > These typedefs don't seem to be used to obfuscate function definitions = yet. >=20 > Bruce >=20 From owner-svn-src-projects@FreeBSD.ORG Sat Nov 8 07:26:46 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 995212F2; Sat, 8 Nov 2014 07:26:46 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 81F76C4B; Sat, 8 Nov 2014 07:26:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sA87QkoJ047351; Sat, 8 Nov 2014 07:26:46 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sA87QeFR047299; Sat, 8 Nov 2014 07:26:40 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201411080726.sA87QeFR047299@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Sat, 8 Nov 2014 07:26:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274275 - in projects/ifnet: . bin/sh sbin/ifconfig share/man/man4 sys/cam/ctl sys/conf sys/dev/hyperv/netvsc sys/dev/ofw sys/dev/random sys/modules sys/modules/if_gre sys/modules/if_me... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Nov 2014 07:26:46 -0000 Author: glebius Date: Sat Nov 8 07:26:39 2014 New Revision: 274275 URL: https://svnweb.freebsd.org/changeset/base/274275 Log: Merge head r256150 through r274274. Added: projects/ifnet/share/man/man4/me.4 - copied unchanged from r274274, head/share/man/man4/me.4 projects/ifnet/sys/modules/if_me/ - copied from r274274, head/sys/modules/if_me/ projects/ifnet/sys/net/if_me.c - copied unchanged from r274274, head/sys/net/if_me.c projects/ifnet/sys/netinet6/ip6_gre.c - copied unchanged from r274274, head/sys/netinet6/ip6_gre.c Deleted: projects/ifnet/sys/netinet/ip_gre.h Modified: projects/ifnet/Makefile.inc1 projects/ifnet/bin/sh/sh.1 projects/ifnet/sbin/ifconfig/ifgre.c projects/ifnet/share/man/man4/Makefile projects/ifnet/share/man/man4/gre.4 projects/ifnet/sys/cam/ctl/ctl_backend_block.c projects/ifnet/sys/conf/NOTES projects/ifnet/sys/conf/files projects/ifnet/sys/dev/hyperv/netvsc/hv_net_vsc.c projects/ifnet/sys/dev/hyperv/netvsc/hv_net_vsc.h projects/ifnet/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c projects/ifnet/sys/dev/ofw/ofwbus.c projects/ifnet/sys/dev/random/ivy.c projects/ifnet/sys/dev/random/nehemiah.c projects/ifnet/sys/dev/random/randomdev.c projects/ifnet/sys/dev/random/randomdev_soft.c projects/ifnet/sys/modules/Makefile projects/ifnet/sys/modules/if_gre/Makefile projects/ifnet/sys/modules/random/Makefile projects/ifnet/sys/net/if.c projects/ifnet/sys/net/if_arp.h projects/ifnet/sys/net/if_bridge.c projects/ifnet/sys/net/if_ethersubr.c projects/ifnet/sys/net/if_fddisubr.c projects/ifnet/sys/net/if_gre.c projects/ifnet/sys/net/if_gre.h projects/ifnet/sys/net/if_iso88025subr.c projects/ifnet/sys/netgraph/ng_ether.c projects/ifnet/sys/netinet/ip_gre.c projects/ifnet/sys/netinet6/in6_proto.c projects/ifnet/sys/netipsec/ipsec_input.c projects/ifnet/sys/sys/conf.h projects/ifnet/tests/sys/netinet/Makefile projects/ifnet/usr.sbin/ctld/ctld.c Directory Properties: projects/ifnet/ (props changed) projects/ifnet/sbin/ (props changed) projects/ifnet/share/ (props changed) projects/ifnet/share/man/man4/ (props changed) projects/ifnet/sys/ (props changed) projects/ifnet/sys/conf/ (props changed) projects/ifnet/sys/dev/hyperv/ (props changed) Modified: projects/ifnet/Makefile.inc1 ============================================================================== --- projects/ifnet/Makefile.inc1 Sat Nov 8 07:23:01 2014 (r274274) +++ projects/ifnet/Makefile.inc1 Sat Nov 8 07:26:39 2014 (r274275) @@ -1671,7 +1671,7 @@ _lib_libypclnt= lib/libypclnt lib/libradius__L: lib/libmd__L .endif -gnu/lib/libdialog__L: lib/ncurses/ncursesw__L +gnu/lib/libdialog__L: lib/msun__L lib/ncurses/ncursesw__L .for _lib in ${_prereq_libs} ${_lib}__PL: .PHONY .MAKE Modified: projects/ifnet/bin/sh/sh.1 ============================================================================== --- projects/ifnet/bin/sh/sh.1 Sat Nov 8 07:23:01 2014 (r274274) +++ projects/ifnet/bin/sh/sh.1 Sat Nov 8 07:26:39 2014 (r274275) @@ -32,7 +32,7 @@ .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 .\" $FreeBSD$ .\" -.Dd September 21, 2014 +.Dd November 7, 2014 .Dt SH 1 .Os .Sh NAME @@ -2522,7 +2522,8 @@ and so on, decreasing the value of .Li $# by one. -If there are zero positional parameters, shifting does not do anything. +For portability, shifting if there are zero positional parameters +should be avoided, since the shell may abort. .It Ic test A built-in equivalent of .Xr test 1 . Modified: projects/ifnet/sbin/ifconfig/ifgre.c ============================================================================== --- projects/ifnet/sbin/ifconfig/ifgre.c Sat Nov 8 07:23:01 2014 (r274274) +++ projects/ifnet/sbin/ifconfig/ifgre.c Sat Nov 8 07:26:39 2014 (r274275) @@ -23,52 +23,50 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif +#include +__FBSDID("$FreeBSD$"); #include #include #include #include - -#include -#include - -#include #include #include -#include #include +#include #include -#include #include -#include +#include #include -#include #include "ifconfig.h" +#define GREBITS "\020\01ENABLE_CSUM\02ENABLE_SEQ" + static void gre_status(int s); static void gre_status(int s) { - int grekey = 0; + uint32_t opts = 0; - ifr.ifr_data = (caddr_t)&grekey; + ifr.ifr_data = (caddr_t)&opts; if (ioctl(s, GREGKEY, &ifr) == 0) - if (grekey != 0) - printf("\tgrekey: %d\n", grekey); + if (opts != 0) + printf("\tgrekey: 0x%x (%u)\n", opts, opts); + opts = 0; + if (ioctl(s, GREGOPTS, &ifr) != 0 || opts == 0) + return; + printb("\toptions", opts, GREBITS); + putchar('\n'); } static void setifgrekey(const char *val, int dummy __unused, int s, const struct afswtch *afp) { - uint32_t grekey = atol(val); + uint32_t grekey = strtol(val, NULL, 0); strncpy(ifr.ifr_name, name, sizeof (ifr.ifr_name)); ifr.ifr_data = (caddr_t)&grekey; @@ -76,8 +74,35 @@ setifgrekey(const char *val, int dummy _ warn("ioctl (set grekey)"); } +static void +setifgreopts(const char *val, int d, int s, const struct afswtch *afp) +{ + uint32_t opts; + + ifr.ifr_data = (caddr_t)&opts; + if (ioctl(s, GREGOPTS, &ifr) == -1) { + warn("ioctl(GREGOPTS)"); + return; + } + + if (d < 0) + opts &= ~(-d); + else + opts |= d; + + if (ioctl(s, GRESOPTS, &ifr) == -1) { + warn("ioctl(GIFSOPTS)"); + return; + } +} + + static struct cmd gre_cmds[] = { DEF_CMD_ARG("grekey", setifgrekey), + DEF_CMD("enable_csum", GRE_ENABLE_CSUM, setifgreopts), + DEF_CMD("-enable_csum",-GRE_ENABLE_CSUM,setifgreopts), + DEF_CMD("enable_seq", GRE_ENABLE_SEQ, setifgreopts), + DEF_CMD("-enable_seq",-GRE_ENABLE_SEQ, setifgreopts), }; static struct afswtch af_gre = { .af_name = "af_gre", Modified: projects/ifnet/share/man/man4/Makefile ============================================================================== --- projects/ifnet/share/man/man4/Makefile Sat Nov 8 07:23:01 2014 (r274274) +++ projects/ifnet/share/man/man4/Makefile Sat Nov 8 07:26:39 2014 (r274275) @@ -252,6 +252,7 @@ MAN= aac.4 \ malo.4 \ mcd.4 \ md.4 \ + me.4 \ mem.4 \ meteor.4 \ mfi.4 \ Modified: projects/ifnet/share/man/man4/gre.4 ============================================================================== --- projects/ifnet/share/man/man4/gre.4 Sat Nov 8 07:23:01 2014 (r274274) +++ projects/ifnet/share/man/man4/gre.4 Sat Nov 8 07:26:39 2014 (r274275) @@ -29,7 +29,7 @@ .\" .\" $FreeBSD$ .\" -.Dd June 20, 2008 +.Dd November 7, 2014 .Dt GRE 4 .Os .Sh NAME @@ -68,162 +68,30 @@ and .Cm destroy subcommands. .Pp -This driver currently supports the following modes of operation: -.Bl -tag -width indent -.It "GRE encapsulation (IP protocol number 47)" -Encapsulated datagrams are -prepended an outer datagram and a GRE header. +This driver corresponds to RFC 2784. +Encapsulated datagrams are prepended an outer datagram and a GRE header. The GRE header specifies the type of the encapsulated datagram and thus allows for tunneling other protocols than IP. GRE mode is also the default tunnel mode on Cisco routers. -This is also the default mode of operation of the -.Nm -interfaces. -As part of the GRE mode, .Nm also supports Cisco WCCP protocol, both version 1 and version 2. -Since there is no reliable way to distinguish between WCCP versions, it -should be configured manually using the -.Cm link2 -flag. -If the -.Cm link2 -flag is not set (default), then WCCP version 1 is selected. -.It "MOBILE encapsulation (IP protocol number 55)" -Datagrams are -encapsulated into IP, but with a shorter encapsulation. -The original -IP header is modified and the modifications are inserted between the -so modified header and the original payload. -Like -.Xr gif 4 , -only for IP-in-IP encapsulation. -.El .Pp The .Nm -interfaces support a number of -.Xr ioctl 2 Ns s , -such as: -.Bl -tag -width ".Dv GRESADDRS" -.It Dv GRESADDRS -Set the IP address of the local tunnel end. -This is the source address -set by or displayed by -.Xr ifconfig 8 -for the -.Nm -interface. -.It Dv GRESADDRD -Set the IP address of the remote tunnel end. -This is the destination address -set by or displayed by -.Xr ifconfig 8 -for the -.Nm -interface. -.It Dv GREGADDRS -Query the IP address that is set for the local tunnel end. -This is the -address the encapsulation header carries as local address (i.e., the real -address of the tunnel start point). -.It Dv GREGADDRD -Query the IP address that is set for the remote tunnel end. -This is the -address the encapsulated packets are sent to (i.e., the real address of -the remote tunnel endpoint). -.It Dv GRESPROTO -Set the operation mode to the specified IP protocol value. -The -protocol is passed to the interface in -.Po Vt "struct ifreq" Pc Ns Li -> Ns Va ifr_flags . -The operation mode can also be given as -.Pp -.Bl -tag -width ".Cm -link0" -compact -.It Cm link0 -.Dv IPPROTO_GRE -.It Cm -link0 -.Dv IPPROTO_MOBILE -.El -.Pp -to -.Xr ifconfig 8 . -.Pp -The -.Cm link1 -flag is not used to choose encapsulation, but to modify the -internal route search for the remote tunnel endpoint, see the -.Sx BUGS -section below. -.It Dv GREGPROTO -Query operation mode. -.It Dv GRESKEY +interfaces support a number of additional parameters to the +.Xr ifconfig 8 : +.Bl -tag -width "enable_csum" +.It Ar grekey Set the GRE key used for outgoing packets. A value of 0 disables the key option. -.It Dv GREGKEY -Get the GRE key currently used for outgoing packets. -0 means no outgoing key. +.It Ar enable_csum +Enables checksum calculation for outgoing packets. +.It Ar enable_seq +Enables use of sequence number field in the GRE header for outgoing packets. .El -.Pp -Note that the IP addresses of the tunnel endpoints may be the same as the -ones defined with -.Xr ifconfig 8 -for the interface (as if IP is encapsulated), but need not be. .Sh EXAMPLES -Configuration example: -.Bd -literal -Host X-- Host A ----------------tunnel---------- Cisco D------Host E - \\ | - \\ / - +------Host B----------Host C----------+ -.Ed .Pp -On host A -.Pq Fx : -.Bd -literal -offset indent -route add default B -ifconfig greN create -ifconfig greN A D netmask 0xffffffff linkX up -ifconfig greN tunnel A D -route add E D -.Ed -.Pp -On Host D (Cisco): -.Bd -literal -offset indent -Interface TunnelX - ip unnumbered D ! e.g. address from Ethernet interface - tunnel source D ! e.g. address from Ethernet interface - tunnel destination A -ip route C -ip route A mask C -ip route X mask tunnelX -.Ed -.Pp -OR -.Pp -On Host D -.Pq Fx : -.Bd -literal -offset indent -route add default C -ifconfig greN create -ifconfig greN D A -ifconfig greN tunnel D A -.Ed -.Pp -If all goes well, you should see packets flowing ;-) -.Pp -If you want to reach Host A over the tunnel (from Host D (Cisco)), then -you have to have an alias on Host A for e.g.\& the Ethernet interface like: -.Pp -.Dl "ifconfig alias Y" -.Pp -and on the Cisco: -.Pp -.Dl "ip route Y mask tunnelX" -.Pp -A similar setup can be used to create a link between two private networks -(for example in the 192.168 subnet) over the Internet: .Bd -literal 192.168.1.* --- Router A -------tunnel-------- Router B --- 192.168.2.* \\ / @@ -238,29 +106,22 @@ Assuming router A has the (external) IP On router A: .Bd -literal -offset indent ifconfig greN create -ifconfig greN 192.168.1.1 192.168.2.1 link1 -ifconfig greN tunnel A B +ifconfig greN inet 192.168.1.1 192.168.2.1 +ifconfig greN inet tunnel A B route add -net 192.168.2 -netmask 255.255.255.0 192.168.2.1 .Ed .Pp On router B: .Bd -literal -offset indent ifconfig greN create -ifconfig greN 192.168.2.1 192.168.1.1 link1 -ifconfig greN tunnel B A +ifconfig greN inet 192.168.2.1 192.168.1.1 +ifconfig greN inet tunnel B A route add -net 192.168.1 -netmask 255.255.255.0 192.168.1.1 .Ed -.Pp -Note that this is a safe situation where the -.Cm link1 -flag (as discussed in the -.Sx BUGS -section below) may (and probably should) be set. .Sh NOTES The MTU of .Nm interfaces is set to 1476 by default, to match the value used by Cisco routers. -If grekey is set this is lowered to 1472. This may not be an optimal value, depending on the link between the two tunnel endpoints. It can be adjusted via @@ -268,25 +129,8 @@ It can be adjusted via .Pp For correct operation, the .Nm -device needs a route to the destination that is less specific than the -one over the tunnel. -(Basically, there needs to be a route to the decapsulating host that -does not run over the tunnel, as this would be a loop.) -If the addresses are ambiguous, doing the -.Nm ifconfig Cm tunnel -step before the -.Xr ifconfig 8 -call to set the -.Nm -IP addresses will help to find a route outside the tunnel. -.Pp -In order to tell -.Xr ifconfig 8 -to actually mark the interface as -.Dq up , -the keyword -.Cm up -must be given last on its command line. +device needs a route to the decapsulating host that does not run over the tunnel, +as this would be a loop. .Pp The kernel must be set to forward datagrams by setting the .Va net.inet.ip.forwarding @@ -296,41 +140,20 @@ variable to non-zero. .Xr gif 4 , .Xr inet 4 , .Xr ip 4 , +.Xr me 4 , .Xr netintro 4 , -.\" Xr options 4 , .Xr protocols 5 , .Xr ifconfig 8 , .Xr sysctl 8 .Pp -A description of GRE encapsulation can be found in RFC 1701 and RFC 1702. -.Pp -A description of MOBILE encapsulation can be found in RFC 2004. +A description of GRE encapsulation can be found in RFC 2784 and RFC 2890. .Sh AUTHORS +.An Andrey V. Elsukov Aq Mt ae@FreeBSD.org .An Heiko W.Rupp Aq Mt hwr@pilhuhn.de .Sh BUGS -The -.Fn compute_route -code in -.Pa if_gre.c -toggles the last bit of the -IP-address to provoke the search for a less specific route than the -one directly over the tunnel to prevent loops. -This is possibly not the best solution. -.Pp -To avoid the address munging described above, turn on the -.Cm link1 -flag on the -.Xr ifconfig 8 -command line. -This implies that the GRE packet destination and the ifconfig remote host -are not the same IP addresses, and that the GRE destination does not route -over the -.Nm -interface itself. .Pp The current implementation uses the key only for outgoing packets. Incoming packets with a different key or without a key will be treated as if they would belong to this interface. .Pp -RFC1701 is not fully supported, however all unsupported features have been -deprecated in RFC2784. +The sequence number field also used only for outgoing packets. Copied: projects/ifnet/share/man/man4/me.4 (from r274274, head/share/man/man4/me.4) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/ifnet/share/man/man4/me.4 Sat Nov 8 07:26:39 2014 (r274275, copy of r274274, head/share/man/man4/me.4) @@ -0,0 +1,85 @@ +.\" Copyright (c) Andrey V. Elsukov +.\" 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 AUTHORS 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 AUTHORS 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. +.\" +.\" $FreeBSD$ +.\" +.Dd November 7, 2014 +.Dt ME 4 +.Os +.Sh NAME +.Nm me +.Nd encapsulating network device +.Sh SYNOPSIS +To compile the +driver into the kernel, place the following line in the kernel +configuration file: +.Bd -ragged -offset indent +.Cd "device me" +.Ed +.Pp +Alternatively, to load the +driver as a module at boot time, place the following line in +.Xr loader.conf 5 : +.Bd -literal -offset indent +if_me_load="YES" +.Ed +.Sh DESCRIPTION +The +.Nm +network interface pseudo device encapsulates datagrams +into IP. +These encapsulated datagrams are routed to a destination host, +where they are decapsulated and further routed to their final destination. +.Pp +.Nm +interfaces are dynamically created and destroyed with the +.Xr ifconfig 8 +.Cm create +and +.Cm destroy +subcommands. +.Pp +This driver corresponds to RFC 2004. +Datagrams are encapsulated into IP with a shorter encapsulation. +The original +IP header is modified and the modifications are inserted between the +so modified header and the original payload. +The protocol number 55 is used for outer header. +.Sh NOTES +.Pp +For correct operation, the +.Nm +device needs a route to the decapsulating host that does not run over the tunnel, +as this would be a loop. +.Sh SEE ALSO +.Xr gif 4 , +.Xr gre 4 , +.Xr inet 4 , +.Xr ip 4 , +.Xr netintro 4 , +.Xr protocols 5 , +.Xr ifconfig 8 , +.Xr sysctl 8 +.Sh AUTHORS +.An Andrey V. Elsukov Aq Mt ae@FreeBSD.org Modified: projects/ifnet/sys/cam/ctl/ctl_backend_block.c ============================================================================== --- projects/ifnet/sys/cam/ctl/ctl_backend_block.c Sat Nov 8 07:23:01 2014 (r274274) +++ projects/ifnet/sys/cam/ctl/ctl_backend_block.c Sat Nov 8 07:26:39 2014 (r274275) @@ -2392,7 +2392,7 @@ ctl_be_block_modify(struct ctl_be_block_ be_lun->params.lun_size_bytes = params->lun_size_bytes; - oldsize = be_lun->size_blocks; + oldsize = be_lun->size_bytes; if (be_lun->vn == NULL) error = ctl_be_block_open(softc, be_lun, req); else if (be_lun->vn->v_type == VREG) @@ -2400,7 +2400,7 @@ ctl_be_block_modify(struct ctl_be_block_ else error = ctl_be_block_modify_dev(be_lun, req); - if (error == 0 && be_lun->size_blocks != oldsize) { + if (error == 0 && be_lun->size_bytes != oldsize) { be_lun->size_blocks = be_lun->size_bytes >> be_lun->blocksize_shift; Modified: projects/ifnet/sys/conf/NOTES ============================================================================== --- projects/ifnet/sys/conf/NOTES Sat Nov 8 07:23:01 2014 (r274274) +++ projects/ifnet/sys/conf/NOTES Sat Nov 8 07:26:39 2014 (r274275) @@ -879,12 +879,15 @@ device tun # The `gif' device implements IPv6 over IP4 tunneling, # IPv4 over IPv6 tunneling, IPv4 over IPv4 tunneling and # IPv6 over IPv6 tunneling. -# The `gre' device implements two types of IP4 over IP4 tunneling: -# GRE and MOBILE, as specified in the RFC1701 and RFC2004. +# The `gre' device implements GRE (Generic Routing Encapsulation) tunneling, +# as specified in the RFC 2784 and RFC 2890. +# The `me' device implements Minimal Encapsulation within IPv4 as +# specified in the RFC 2004. # The XBONEHACK option allows the same pair of addresses to be configured on # multiple gif interfaces. device gif device gre +device me options XBONEHACK # The `faith' device captures packets sent to it and diverts them Modified: projects/ifnet/sys/conf/files ============================================================================== --- projects/ifnet/sys/conf/files Sat Nov 8 07:23:01 2014 (r274274) +++ projects/ifnet/sys/conf/files Sat Nov 8 07:26:39 2014 (r274275) @@ -3234,11 +3234,12 @@ net/if_fddisubr.c optional fddi net/if_fwsubr.c optional fwip net/if_gif.c optional gif inet | gif inet6 | \ netgraph_gif inet | netgraph_gif inet6 -net/if_gre.c optional gre inet +net/if_gre.c optional gre inet | gre inet6 net/if_iso88025subr.c optional token net/if_lagg.c optional lagg net/if_loop.c optional loop net/if_llatbl.c standard +net/if_me.c optional me inet net/if_media.c standard net/if_mib.c standard net/if_spppfr.c optional sppp | netgraph_sppp @@ -3473,6 +3474,7 @@ netinet6/in6_proto.c optional inet6 netinet6/in6_rmx.c optional inet6 netinet6/in6_src.c optional inet6 netinet6/ip6_forward.c optional inet6 +netinet6/ip6_gre.c optional gre inet6 netinet6/ip6_id.c optional inet6 netinet6/ip6_input.c optional inet6 netinet6/ip6_mroute.c optional mrouting inet6 Modified: projects/ifnet/sys/dev/hyperv/netvsc/hv_net_vsc.c ============================================================================== --- projects/ifnet/sys/dev/hyperv/netvsc/hv_net_vsc.c Sat Nov 8 07:23:01 2014 (r274274) +++ projects/ifnet/sys/dev/hyperv/netvsc/hv_net_vsc.c Sat Nov 8 07:26:39 2014 (r274275) @@ -529,7 +529,7 @@ hv_nv_connect_to_vsp(struct hv_device *d int ret = 0; device_t dev = device->device; hn_softc_t *sc = device_get_softc(dev); - struct ifnet *ifp = sc->arpcom.ac_ifp; + struct ifnet *ifp = sc->hn_ifp; net_dev = hv_nv_get_outbound_net_device(device); if (!net_dev) { Modified: projects/ifnet/sys/dev/hyperv/netvsc/hv_net_vsc.h ============================================================================== --- projects/ifnet/sys/dev/hyperv/netvsc/hv_net_vsc.h Sat Nov 8 07:23:01 2014 (r274274) +++ projects/ifnet/sys/dev/hyperv/netvsc/hv_net_vsc.h Sat Nov 8 07:26:39 2014 (r274275) @@ -965,7 +965,6 @@ typedef struct { */ typedef struct hn_softc { struct ifnet *hn_ifp; - struct arpcom arpcom; device_t hn_dev; uint8_t hn_unit; int hn_carrier; Modified: projects/ifnet/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c ============================================================================== --- projects/ifnet/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c Sat Nov 8 07:23:01 2014 (r274274) +++ projects/ifnet/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c Sat Nov 8 07:26:39 2014 (r274275) @@ -255,7 +255,7 @@ netvsc_attach(device_t dev) sc->hn_dev_obj = device_ctx; - ifp = sc->hn_ifp = sc->arpcom.ac_ifp = if_alloc(IFT_ETHER); + ifp = sc->hn_ifp = if_alloc(IFT_ETHER); ifp->if_softc = sc; if_initname(ifp, device_get_name(dev), device_get_unit(dev)); @@ -634,8 +634,6 @@ netvsc_recv(struct hv_device *device_ctx } ifp = sc->hn_ifp; - - ifp = sc->arpcom.ac_ifp; if (!(ifp->if_drv_flags & IFF_DRV_RUNNING)) { return (0); Modified: projects/ifnet/sys/dev/ofw/ofwbus.c ============================================================================== --- projects/ifnet/sys/dev/ofw/ofwbus.c Sat Nov 8 07:23:01 2014 (r274274) +++ projects/ifnet/sys/dev/ofw/ofwbus.c Sat Nov 8 07:26:39 2014 (r274275) @@ -399,11 +399,17 @@ ofwbus_adjust_resource(device_t bus, dev } static int -ofwbus_release_resource(device_t bus __unused, device_t child, int type, +ofwbus_release_resource(device_t bus, device_t child, int type, int rid, struct resource *r) { + struct resource_list_entry *rle; int error; + /* Clean resource list entry */ + rle = resource_list_find(BUS_GET_RESOURCE_LIST(bus, child), type, rid); + if (rle != NULL) + rle->res = NULL; + if ((rman_get_flags(r) & RF_ACTIVE) != 0) { error = bus_deactivate_resource(child, type, rid, r); if (error) Modified: projects/ifnet/sys/dev/random/ivy.c ============================================================================== --- projects/ifnet/sys/dev/random/ivy.c Sat Nov 8 07:23:01 2014 (r274274) +++ projects/ifnet/sys/dev/random/ivy.c Sat Nov 8 07:26:39 2014 (r274275) @@ -61,42 +61,41 @@ static struct live_entropy_source random }; static inline int -ivy_rng_store(long *buf) +ivy_rng_store(u_long *buf) { #ifdef __GNUCLIKE_ASM - long tmp; + u_long rndval; int retry; retry = RETRY_COUNT; __asm __volatile( "1:\n\t" - "rdrand %2\n\t" /* read randomness into tmp */ - "jb 2f\n\t" /* CF is set on success, exit retry loop */ + "rdrand %1\n\t" /* read randomness into tmp */ + "jc 2f\n\t" /* CF is set on success, exit retry loop */ "dec %0\n\t" /* otherwise, retry-- */ "jne 1b\n\t" /* and loop if retries are not exhausted */ - "jmp 3f\n" /* failure, retry is 0, used as return value */ - "2:\n\t" - "mov %2,%1\n\t" /* *buf = tmp */ - "3:" - : "+q" (retry), "=m" (*buf), "+q" (tmp) : : "cc"); + "2:" + : "+r" (retry), "=r" (rndval) : : "cc"); + *buf = rndval; return (retry); #else /* __GNUCLIKE_ASM */ return (0); #endif } -/* It is specifically allowed that buf is a multiple of sizeof(long) */ +/* It is required that buf length is a multiple of sizeof(u_long). */ static u_int random_ivy_read(void *buf, u_int c) { - long *b; + u_long *b, rndval; u_int count; KASSERT(c % sizeof(*b) == 0, ("partial read %d", c)); b = buf; for (count = c; count > 0; count -= sizeof(*b)) { - if (ivy_rng_store(b++) == 0) + if (ivy_rng_store(&rndval) == 0) break; + *b++ = rndval; } return (c - count); } @@ -133,4 +132,4 @@ rdrand_modevent(module_t mod, int type, DEV_MODULE(rdrand, rdrand_modevent, NULL); MODULE_VERSION(rdrand, 1); -MODULE_DEPEND(rdrand, random_adaptors, 1, 1, 1); +MODULE_DEPEND(rdrand, randomdev, 1, 1, 1); Modified: projects/ifnet/sys/dev/random/nehemiah.c ============================================================================== --- projects/ifnet/sys/dev/random/nehemiah.c Sat Nov 8 07:23:01 2014 (r274274) +++ projects/ifnet/sys/dev/random/nehemiah.c Sat Nov 8 07:26:39 2014 (r274275) @@ -157,4 +157,4 @@ nehemiah_modevent(module_t mod, int type DEV_MODULE(nehemiah, nehemiah_modevent, NULL); MODULE_VERSION(nehemiah, 1); -MODULE_DEPEND(nehemiah, random_adaptors, 1, 1, 1); +MODULE_DEPEND(nehemiah, randomdev, 1, 1, 1); Modified: projects/ifnet/sys/dev/random/randomdev.c ============================================================================== --- projects/ifnet/sys/dev/random/randomdev.c Sat Nov 8 07:23:01 2014 (r274274) +++ projects/ifnet/sys/dev/random/randomdev.c Sat Nov 8 07:26:39 2014 (r274275) @@ -159,15 +159,7 @@ randomdev_modevent(module_t mod __unused return (error); } -#define EARLY_2_DEV_MODULE(name, evh, arg) \ -static moduledata_t name##_mod = { \ - #name, \ - evh, \ - arg \ -}; \ -DECLARE_MODULE(name, name##_mod, SI_SUB_DRIVERS, SI_ORDER_SECOND) - -EARLY_2_DEV_MODULE(randomdev, randomdev_modevent, NULL); +DEV_MODULE_ORDERED(randomdev, randomdev_modevent, NULL, SI_ORDER_SECOND); MODULE_VERSION(randomdev, 1); /* ================ Modified: projects/ifnet/sys/dev/random/randomdev_soft.c ============================================================================== --- projects/ifnet/sys/dev/random/randomdev_soft.c Sat Nov 8 07:23:01 2014 (r274274) +++ projects/ifnet/sys/dev/random/randomdev_soft.c Sat Nov 8 07:26:39 2014 (r274275) @@ -153,21 +153,13 @@ randomdev_soft_modevent(module_t mod __u return (error); } -#define MID_DEV_MODULE(name, evh, arg) \ -static moduledata_t name##_mod = { \ - #name, \ - evh, \ - arg \ -}; \ -DECLARE_MODULE(name, name##_mod, SI_SUB_DRIVERS, SI_ORDER_MIDDLE) - #if defined(RANDOM_YARROW) -MID_DEV_MODULE(yarrow, randomdev_soft_modevent, NULL); +DEV_MODULE(yarrow, randomdev_soft_modevent, NULL); MODULE_VERSION(yarrow, 1); -MODULE_DEPEND(yarrow, random_adaptors, 1, 1, 1); +MODULE_DEPEND(yarrow, randomdev, 1, 1, 1); #endif #if defined(RANDOM_FORTUNA) -MID_DEV_MODULE(fortuna, randomdev_soft_modevent, NULL); +DEV_MODULE(fortuna, randomdev_soft_modevent, NULL); MODULE_VERSION(fortuna, 1); -MODULE_DEPEND(fortuna, random_adaptors, 1, 1, 1); +MODULE_DEPEND(fortuna, randomdev, 1, 1, 1); #endif Modified: projects/ifnet/sys/modules/Makefile ============================================================================== --- projects/ifnet/sys/modules/Makefile Sat Nov 8 07:23:01 2014 (r274274) +++ projects/ifnet/sys/modules/Makefile Sat Nov 8 07:26:39 2014 (r274275) @@ -146,8 +146,9 @@ SUBDIR= \ if_edsc \ if_epair \ if_faith \ - if_gif \ + ${_if_gif} \ ${_if_gre} \ + ${_if_me} \ if_lagg \ ${_if_ndis} \ if_stf \ @@ -403,10 +404,12 @@ _random= random defined(ALL_MODULES) _carp= carp _toecore= toecore +_if_gif= if_gif +_if_gre= if_gre .endif .if ${MK_INET_SUPPORT} != "no" || defined(ALL_MODULES) -_if_gre= if_gre +_if_me= if_me _ipdivert= ipdivert _ipfw= ipfw .endif Modified: projects/ifnet/sys/modules/if_gre/Makefile ============================================================================== --- projects/ifnet/sys/modules/if_gre/Makefile Sat Nov 8 07:23:01 2014 (r274274) +++ projects/ifnet/sys/modules/if_gre/Makefile Sat Nov 8 07:26:39 2014 (r274275) @@ -1,8 +1,17 @@ # $FreeBSD$ .PATH: ${.CURDIR}/../../net ${.CURDIR}/../../netinet ${.CURDIR}/../../netinet6 +.include "${.CURDIR}/../../conf/kern.opts.mk" KMOD= if_gre -SRCS= if_gre.c ip_gre.c opt_inet.h opt_inet6.h +SRCS= if_gre.c opt_inet.h opt_inet6.h + +.if ${MK_INET_SUPPORT} != "no" +SRCS+= ip_gre.c +.endif + +.if ${MK_INET6_SUPPORT} != "no" +SRCS+= ip6_gre.c +.endif .include Modified: projects/ifnet/sys/modules/random/Makefile ============================================================================== --- projects/ifnet/sys/modules/random/Makefile Sat Nov 8 07:23:01 2014 (r274274) +++ projects/ifnet/sys/modules/random/Makefile Sat Nov 8 07:26:39 2014 (r274275) @@ -6,8 +6,7 @@ KMOD= random SRCS= randomdev_soft.c -SRCS+= yarrow.c hash.c -SRCS+= random_harvestq.c live_entropy_sources.c +SRCS+= yarrow.c fortuna.c hash.c SRCS+= rijndael-alg-fst.c rijndael-api-fst.c sha2.c sha256c.c SRCS+= bus_if.h device_if.h vnode_if.h opt_cpu.h opt_random.h Modified: projects/ifnet/sys/net/if.c ============================================================================== --- projects/ifnet/sys/net/if.c Sat Nov 8 07:23:01 2014 (r274274) +++ projects/ifnet/sys/net/if.c Sat Nov 8 07:26:39 2014 (r274275) @@ -265,13 +265,12 @@ ifnet_byindex_ref(u_short idx) * Allocate an ifindex array entry; return 0 on success or an error on * failure. */ -static int -ifindex_alloc_locked(u_short *idxp) +static u_short +ifindex_alloc(void) { u_short idx; IFNET_WLOCK_ASSERT(); - retry: /* * Try to find an empty slot below V_if_index. If we fail, take the @@ -289,8 +288,7 @@ retry: } if (idx > V_if_index) V_if_index = idx; - *idxp = idx; - return (0); + return (idx); } static void @@ -431,11 +429,7 @@ if_alloc(u_char type) ifp = malloc(sizeof(struct ifnet), M_IFNET, M_WAITOK|M_ZERO); IFNET_WLOCK(); - if (ifindex_alloc_locked(&idx) != 0) { - IFNET_WUNLOCK(); - free(ifp, M_IFNET); - return (NULL); - } + idx = ifindex_alloc(); ifnet_setbyindex_locked(idx, IFNET_HOLD); IFNET_WUNLOCK(); ifp->if_index = idx; @@ -1022,7 +1016,6 @@ if_detach_internal(struct ifnet *ifp, in void if_vmove(struct ifnet *ifp, struct vnet *new_vnet) { - u_short idx; /* * Detach from current vnet, but preserve LLADDR info, do not @@ -1054,11 +1047,7 @@ if_vmove(struct ifnet *ifp, struct vnet CURVNET_SET_QUIET(new_vnet); IFNET_WLOCK(); - if (ifindex_alloc_locked(&idx) != 0) { - IFNET_WUNLOCK(); - panic("if_index overflow"); - } - ifp->if_index = idx; + ifp->if_index = ifindex_alloc(); ifnet_setbyindex_locked(ifp->if_index, ifp); IFNET_WUNLOCK(); @@ -2136,7 +2125,7 @@ do_link_state_change(void *arg, int pend (*vlan_link_state_p)(ifp); if ((ifp->if_type == IFT_ETHER || ifp->if_type == IFT_L2VLAN) && - IFP2AC(ifp)->ac_netgraph != NULL) + ifp->if_l2com != NULL) (*ng_ether_link_state_p)(ifp, link_state); if (ifp->if_carp) (*carp_linkstate_p)(ifp); Modified: projects/ifnet/sys/net/if_arp.h ============================================================================== --- projects/ifnet/sys/net/if_arp.h Sat Nov 8 07:23:01 2014 (r274274) +++ projects/ifnet/sys/net/if_arp.h Sat Nov 8 07:26:39 2014 (r274275) @@ -97,20 +97,6 @@ struct arpreq { #define ATF_PUBL 0x08 /* publish entry (respond for other host) */ #define ATF_USETRAILERS 0x10 /* has requested trailers */ -#ifdef _KERNEL -/* - * Structure shared between the ethernet driver modules and - * the address resolution code. - */ -struct arpcom { - struct ifnet *ac_ifp; /* network-visible interface */ - void *ac_netgraph; /* ng_ether(4) netgraph node info */ -}; -#define IFP2AC(ifp) ((struct arpcom *)(ifp->if_l2com)) -#define AC2IFP(ac) ((ac)->ac_ifp) - -#endif /* _KERNEL */ - struct arpstat { /* Normal things that happen: */ uint64_t txrequests; /* # of ARP requests sent by this host. */ Modified: projects/ifnet/sys/net/if_bridge.c ============================================================================== --- projects/ifnet/sys/net/if_bridge.c Sat Nov 8 07:23:01 2014 (r274274) +++ projects/ifnet/sys/net/if_bridge.c Sat Nov 8 07:26:39 2014 (r274275) @@ -111,7 +111,7 @@ __FBSDID("$FreeBSD$"); #include #include -#include /* for struct arpcom */ +#include #include #include #include @@ -125,7 +125,7 @@ __FBSDID("$FreeBSD$"); #include #endif #include -#include /* for struct arpcom */ +#include #include #include #include Modified: projects/ifnet/sys/net/if_ethersubr.c ============================================================================== --- projects/ifnet/sys/net/if_ethersubr.c Sat Nov 8 07:23:01 2014 (r274274) +++ projects/ifnet/sys/net/if_ethersubr.c Sat Nov 8 07:26:39 2014 (r274275) @@ -119,9 +119,6 @@ static int ether_resolvemulti(struct ifn static void ether_reassign(struct ifnet *, struct vnet *, char *); #endif -/* XXX: should be in an arp support file, not here */ -static MALLOC_DEFINE(M_ARPCOM, "arpcom", "802.* interface internals"); - #define ETHER_IS_BROADCAST(addr) \ (bcmp(etherbroadcastaddr, (addr), ETHER_ADDR_LEN) == 0) @@ -330,7 +327,7 @@ ether_output(struct ifnet *ifp, struct m #endif /* Handle ng_ether(4) processing, if any */ - if (IFP2AC(ifp)->ac_netgraph != NULL) { + if (ifp->if_l2com != NULL) { KASSERT(ng_ether_output_p != NULL, ("ng_ether_output_p is NULL")); if ((error = (*ng_ether_output_p)(ifp, &m)) != 0) { @@ -521,7 +518,7 @@ ether_input_internal(struct ifnet *ifp, M_SETFIB(m, ifp->if_fib); /* Allow ng_ether(4) to claim this frame. */ - if (IFP2AC(ifp)->ac_netgraph != NULL) { + if (ifp->if_l2com != NULL) { KASSERT(ng_ether_input_p != NULL, ("%s: ng_ether_input_p is NULL", __func__)); m->m_flags &= ~M_PROMISC; @@ -780,7 +777,7 @@ discard: * hand the packet to it for last chance processing; * otherwise dispose of it. */ - if (IFP2AC(ifp)->ac_netgraph != NULL) { + if (ifp->if_l2com != NULL) { KASSERT(ng_ether_input_orphan_p != NULL, ("ng_ether_input_orphan_p is NULL")); /* @@ -866,7 +863,7 @@ ether_ifdetach(struct ifnet *ifp) sdl = (struct sockaddr_dl *)(ifp->if_addr->ifa_addr); uuid_ether_del(LLADDR(sdl)); - if (IFP2AC(ifp)->ac_netgraph != NULL) { + if (ifp->if_l2com != NULL) { KASSERT(ng_ether_detach_p != NULL, ("ng_ether_detach_p is NULL")); (*ng_ether_detach_p)(ifp); @@ -881,7 +878,7 @@ void ether_reassign(struct ifnet *ifp, struct vnet *new_vnet, char *unused __unused) { - if (IFP2AC(ifp)->ac_netgraph != NULL) { + if (ifp->if_l2com != NULL) { *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Sat Nov 8 12:23:51 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8F296AE3; Sat, 8 Nov 2014 12:23:51 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7C6BAA74; Sat, 8 Nov 2014 12:23:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sA8CNpdc087133; Sat, 8 Nov 2014 12:23:51 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sA8CNpBO087132; Sat, 8 Nov 2014 12:23:51 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201411081223.sA8CNpBO087132@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Sat, 8 Nov 2014 12:23:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274280 - projects/release-vmimage/release/scripts X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Nov 2014 12:23:51 -0000 Author: gjb Date: Sat Nov 8 12:23:50 2014 New Revision: 274280 URL: https://svnweb.freebsd.org/changeset/base/274280 Log: Return if vm_create_disk() is unsuccessful. Sponsored by: The FreeBSD Foundation Modified: projects/release-vmimage/release/scripts/mk-vmimage.sh Modified: projects/release-vmimage/release/scripts/mk-vmimage.sh ============================================================================== --- projects/release-vmimage/release/scripts/mk-vmimage.sh Sat Nov 8 11:56:26 2014 (r274279) +++ projects/release-vmimage/release/scripts/mk-vmimage.sh Sat Nov 8 12:23:50 2014 (r274280) @@ -93,7 +93,7 @@ main() { vm_extra_install_ports vm_extra_enable_services vm_extra_pre_umount - vm_create_disk + vm_create_disk || return 0 vm_extra_create_disk return 0 From owner-svn-src-projects@FreeBSD.ORG Sat Nov 8 12:40:59 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BE71DDE5; Sat, 8 Nov 2014 12:40:59 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id ABBC0B78; Sat, 8 Nov 2014 12:40:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sA8CexuB093526; Sat, 8 Nov 2014 12:40:59 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sA8Cex7o093525; Sat, 8 Nov 2014 12:40:59 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201411081240.sA8Cex7o093525@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Sat, 8 Nov 2014 12:40:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274281 - projects/release-vmimage/release X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Nov 2014 12:40:59 -0000 Author: gjb Date: Sat Nov 8 12:40:59 2014 New Revision: 274281 URL: https://svnweb.freebsd.org/changeset/base/274281 Log: Add CLEANFILES entry for VM targets Sponsored by: The FreeBSD Foundation Modified: projects/release-vmimage/release/Makefile.vm Modified: projects/release-vmimage/release/Makefile.vm ============================================================================== --- projects/release-vmimage/release/Makefile.vm Sat Nov 8 12:23:50 2014 (r274280) +++ projects/release-vmimage/release/Makefile.vm Sat Nov 8 12:40:59 2014 (r274281) @@ -20,6 +20,7 @@ OPENSTACK_FORMAT=qcow2 CLOUDTARGETS+= vm-${_CW:tl} CLEANDIRS+= vm-${_CW:tl} CLEANFILES+= ${_CW:tl}.img \ + vm-${_CW:tl} \ ${_CW:tl}.${${_CW:tu}_FORMAT} \ ${_CW:tl}.${${_CW:tu}_FORMAT}.raw ${_CW:tu}IMAGE= ${_CW:tl}.${${_CW:tu}_FORMAT} From owner-svn-src-projects@FreeBSD.ORG Sat Nov 8 12:45:02 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id F022B21A; Sat, 8 Nov 2014 12:45:02 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DD8FDC26; Sat, 8 Nov 2014 12:45:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sA8Cj2sV097333; Sat, 8 Nov 2014 12:45:02 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sA8Cj2iR097332; Sat, 8 Nov 2014 12:45:02 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201411081245.sA8Cj2iR097332@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Sat, 8 Nov 2014 12:45:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274282 - projects/release-vmimage/release/tools X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Nov 2014 12:45:03 -0000 Author: gjb Date: Sat Nov 8 12:45:02 2014 New Revision: 274282 URL: https://svnweb.freebsd.org/changeset/base/274282 Log: Add vm_extra_pre_umount() prototype to vmimage.subr. Sponsored by: The FreeBSD Foundation Modified: projects/release-vmimage/release/tools/vmimage.subr Modified: projects/release-vmimage/release/tools/vmimage.subr ============================================================================== --- projects/release-vmimage/release/tools/vmimage.subr Sat Nov 8 12:40:59 2014 (r274281) +++ projects/release-vmimage/release/tools/vmimage.subr Sat Nov 8 12:45:02 2014 (r274282) @@ -127,6 +127,13 @@ vm_extra_install_ports() { return 0 } +vm_extra_pre_umount() { + # Prototype. When overridden, installs additional ports within the + # virtual machine environment. + + return 0 +} + vm_umount_base() { i=0 sync From owner-svn-src-projects@FreeBSD.ORG Sat Nov 8 12:45:36 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 68353302; Sat, 8 Nov 2014 12:45:36 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3C39CC29; Sat, 8 Nov 2014 12:45:36 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sA8Cja95097455; Sat, 8 Nov 2014 12:45:36 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sA8CjakI097454; Sat, 8 Nov 2014 12:45:36 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201411081245.sA8CjakI097454@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Sat, 8 Nov 2014 12:45:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274283 - projects/release-vmimage/release X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Nov 2014 12:45:36 -0000 Author: gjb Date: Sat Nov 8 12:45:35 2014 New Revision: 274283 URL: https://svnweb.freebsd.org/changeset/base/274283 Log: Fix DESTDIR for installworld, and make sure it is created before use. Sponsored by: The FreeBSD Foundation Modified: projects/release-vmimage/release/Makefile.vm Modified: projects/release-vmimage/release/Makefile.vm ============================================================================== --- projects/release-vmimage/release/Makefile.vm Sat Nov 8 12:45:02 2014 (r274282) +++ projects/release-vmimage/release/Makefile.vm Sat Nov 8 12:45:35 2014 (r274283) @@ -44,9 +44,10 @@ vm-image: .if defined(WITH_VMIMAGES) && !empty(WITH_VMIMAGES) . if exists(${.CURDIR}/${TARGET}/mk-vmimage.sh) . for FORMAT in ${VMFORMATS} + mkdir -p ${.OBJDIR}/${.TARGET} env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ ${.CURDIR}/${TARGET}/mk-vmimage.sh \ - -C ${.CURDIR}/tools/vmimage.subr -d ${.TARGET} \ + -C ${.CURDIR}/tools/vmimage.subr -d ${.OBJDIR}/${.TARGET} \ -i ${VMBASE}.img -s ${VMSIZE} -f ${FORMAT} \ -S ${WORLDDIR} -o ${VMBASE}.${FORMAT} . endfor @@ -58,9 +59,10 @@ vm-cloudware: ${CLOUDTARGETS} vm-azure: .if exists(${.CURDIR}/${TARGET}/mk-vmimage.sh) + mkdir -p ${.OBJDIR}/${.TARGET} env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ ${.CURDIR}/${TARGET}/mk-vmimage.sh \ - -C ${.CURDIR}/tools/vmimage.subr -d ${.TARGET} \ + -C ${.CURDIR}/tools/vmimage.subr -d ${.OBJDIR}/${.TARGET} \ -i azure.img -s ${VMSIZE} -f ${AZURE_FORMAT} \ -S ${WORLDDIR} -o ${AZUREIMAGE} -c ${AZURECONF} .endif @@ -68,9 +70,10 @@ vm-azure: vm-openstack: .if exists(${.CURDIR}/${TARGET}/mk-vmimage.sh) + mkdir -p ${.OBJDIR}/${.TARGET} env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ ${.CURDIR}/${TARGET}/mk-vmimage.sh \ - -C ${.CURDIR}/tools/vmimage.subr -d ${.TARGET} \ + -C ${.CURDIR}/tools/vmimage.subr -d ${.OBJDIR}/${.TARGET} \ -i openstack.img -s ${VMSIZE} -f ${OPENSTACK_FORMAT} \ -S ${WORLDDIR} -o ${OPENSTACKIMAGE} -c ${OPENSTACKCONF} .endif From owner-svn-src-projects@FreeBSD.ORG Sat Nov 8 12:47:23 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 15CC43F5; Sat, 8 Nov 2014 12:47:23 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 02FB8C32; Sat, 8 Nov 2014 12:47:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sA8ClMtJ097725; Sat, 8 Nov 2014 12:47:22 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sA8ClMSs097722; Sat, 8 Nov 2014 12:47:22 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201411081247.sA8ClMSs097722@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Sat, 8 Nov 2014 12:47:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274284 - in projects/release-vmimage/release: scripts tools X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Nov 2014 12:47:23 -0000 Author: gjb Date: Sat Nov 8 12:47:21 2014 New Revision: 274284 URL: https://svnweb.freebsd.org/changeset/base/274284 Log: Move usage() from vmimage.subr to mk-vmimage.sh, in case vmimage.subr has not been sourced. Sponsored by: The FreeBSD Foundation Modified: projects/release-vmimage/release/scripts/mk-vmimage.sh projects/release-vmimage/release/tools/vmimage.subr Modified: projects/release-vmimage/release/scripts/mk-vmimage.sh ============================================================================== --- projects/release-vmimage/release/scripts/mk-vmimage.sh Sat Nov 8 12:45:35 2014 (r274283) +++ projects/release-vmimage/release/scripts/mk-vmimage.sh Sat Nov 8 12:47:21 2014 (r274284) @@ -32,6 +32,12 @@ # $FreeBSD$ # +usage() { + echo "${0} usage:" + echo "${@}" + return 1 +} + main() { local arg while getopts "C:c:d:f:i:o:s:S:" arg; do Modified: projects/release-vmimage/release/tools/vmimage.subr ============================================================================== --- projects/release-vmimage/release/tools/vmimage.subr Sat Nov 8 12:45:35 2014 (r274283) +++ projects/release-vmimage/release/tools/vmimage.subr Sat Nov 8 12:47:21 2014 (r274284) @@ -35,12 +35,6 @@ write_partition_layout() { return 0 } -usage() { - echo "${0} usage:" - echo "${@}" - return 1 -} - err() { printf "${@}\n" cleanup From owner-svn-src-projects@FreeBSD.ORG Sat Nov 8 12:59:33 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 31B1F57C; Sat, 8 Nov 2014 12:59:33 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1F4FFCE5; Sat, 8 Nov 2014 12:59:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sA8CxWxC002808; Sat, 8 Nov 2014 12:59:32 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sA8CxWHs002807; Sat, 8 Nov 2014 12:59:32 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201411081259.sA8CxWHs002807@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Sat, 8 Nov 2014 12:59:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274285 - projects/release-vmimage/release/scripts X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Nov 2014 12:59:33 -0000 Author: gjb Date: Sat Nov 8 12:59:32 2014 New Revision: 274285 URL: https://svnweb.freebsd.org/changeset/base/274285 Log: Spell 'OPTARG' correctly. Actually call vm_create_base(). Sponsored by: The FreeBSD Foundation Modified: projects/release-vmimage/release/scripts/mk-vmimage.sh Modified: projects/release-vmimage/release/scripts/mk-vmimage.sh ============================================================================== --- projects/release-vmimage/release/scripts/mk-vmimage.sh Sat Nov 8 12:47:21 2014 (r274284) +++ projects/release-vmimage/release/scripts/mk-vmimage.sh Sat Nov 8 12:59:32 2014 (r274285) @@ -55,7 +55,7 @@ main() { VMFORMAT="${OPTARG}" ;; i) - VMBASE="${VMBASE}" + VMBASE="${OPTARG}" ;; o) VMIMAGE="${OPTARG}" @@ -93,6 +93,7 @@ main() { . "${VMCONFIG}" fi + vm_create_base vm_install_base vm_extra_install_base vm_extra_install_packages From owner-svn-src-projects@FreeBSD.ORG Sat Nov 8 13:49:19 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 44664EDB; Sat, 8 Nov 2014 13:49:19 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 31215168; Sat, 8 Nov 2014 13:49:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sA8DnJXY026237; Sat, 8 Nov 2014 13:49:19 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sA8DnJVB026236; Sat, 8 Nov 2014 13:49:19 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201411081349.sA8DnJVB026236@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Sat, 8 Nov 2014 13:49:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274287 - projects/release-vmimage/release/tools X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Nov 2014 13:49:19 -0000 Author: gjb Date: Sat Nov 8 13:49:18 2014 New Revision: 274287 URL: https://svnweb.freebsd.org/changeset/base/274287 Log: Fix line continuation in write_partition_layout(). Remove variable test that is no longer needed. Sponsored by: The FreeBSD Foundation Modified: projects/release-vmimage/release/tools/vmimage.subr Modified: projects/release-vmimage/release/tools/vmimage.subr ============================================================================== --- projects/release-vmimage/release/tools/vmimage.subr Sat Nov 8 13:19:48 2014 (r274286) +++ projects/release-vmimage/release/tools/vmimage.subr Sat Nov 8 13:49:18 2014 (r274287) @@ -16,14 +16,14 @@ write_partition_layout() { mkimg -f gpt -b /boot/pmbr \ -p freebsd-boot/bootfs:=/boot/gptboot \ -p freebsd-swap/swapfs::1G \ - -p freebsd-ufs/rootfs:=${VMBASE} + -p freebsd-ufs/rootfs:=${VMBASE} \ -o ${VMIMAGE} ;; powerpc:powerpc*) mkimg -f apm \ -p freebsd-boot/bootfs:=/boot/boot1.hfs \ -p freebsd-swap/swapfs::1G \ - -p freebsd-ufs/rootfs:=${VMBASE} + -p freebsd-ufs/rootfs:=${VMBASE} \ -o ${VMIMAGE} ;; *) @@ -146,10 +146,6 @@ vm_umount_base() { } vm_create_disk() { - if [ -z "${mkimg_paritions}" ]; then - err "No partition types specified. Skipping." - return 1 - fi echo "Creating image... Please wait." echo From owner-svn-src-projects@FreeBSD.ORG Sat Nov 8 13:49:59 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id EBD62FBE; Sat, 8 Nov 2014 13:49:59 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D937C16A; Sat, 8 Nov 2014 13:49:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sA8DnxcD026351; Sat, 8 Nov 2014 13:49:59 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sA8Dnx6H026350; Sat, 8 Nov 2014 13:49:59 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201411081349.sA8Dnx6H026350@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Sat, 8 Nov 2014 13:49:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274288 - projects/release-vmimage/release/tools X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Nov 2014 13:50:00 -0000 Author: gjb Date: Sat Nov 8 13:49:59 2014 New Revision: 274288 URL: https://svnweb.freebsd.org/changeset/base/274288 Log: Fix scheme flag to mkimg(1). Sponsored by: The FreeBSD Foundation Modified: projects/release-vmimage/release/tools/vmimage.subr Modified: projects/release-vmimage/release/tools/vmimage.subr ============================================================================== --- projects/release-vmimage/release/tools/vmimage.subr Sat Nov 8 13:49:18 2014 (r274287) +++ projects/release-vmimage/release/tools/vmimage.subr Sat Nov 8 13:49:59 2014 (r274288) @@ -13,14 +13,14 @@ write_partition_layout() { case "${TARGET}:${TARGET_ARCH}" in amd64:amd64 | i386:i386) - mkimg -f gpt -b /boot/pmbr \ + mkimg -s gpt -b /boot/pmbr \ -p freebsd-boot/bootfs:=/boot/gptboot \ -p freebsd-swap/swapfs::1G \ -p freebsd-ufs/rootfs:=${VMBASE} \ -o ${VMIMAGE} ;; powerpc:powerpc*) - mkimg -f apm \ + mkimg -s apm \ -p freebsd-boot/bootfs:=/boot/boot1.hfs \ -p freebsd-swap/swapfs::1G \ -p freebsd-ufs/rootfs:=${VMBASE} \ From owner-svn-src-projects@FreeBSD.ORG Sat Nov 8 15:39:33 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E8C01FAF; Sat, 8 Nov 2014 15:39:32 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CA513C43; Sat, 8 Nov 2014 15:39:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sA8FdWjx077770; Sat, 8 Nov 2014 15:39:32 GMT (envelope-from melifaro@FreeBSD.org) Received: (from melifaro@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sA8FdWAU077769; Sat, 8 Nov 2014 15:39:32 GMT (envelope-from melifaro@FreeBSD.org) Message-Id: <201411081539.sA8FdWAU077769@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: melifaro set sender to melifaro@FreeBSD.org using -f From: "Alexander V. Chernikov" Date: Sat, 8 Nov 2014 15:39:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274290 - projects/routing/sys/netinet X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Nov 2014 15:39:33 -0000 Author: melifaro Date: Sat Nov 8 15:39:32 2014 New Revision: 274290 URL: https://svnweb.freebsd.org/changeset/base/274290 Log: Retire rtq_timeout altering code. This code was initially introduced by r6399 to enhance expiring large number of host cache routes. Since we don't have route cloning anymore and no one altered V_rtq_toomany default (which is 128) in nearly 20 years, I assume this can be safely deleted. Modified: projects/routing/sys/netinet/in_rmx.c Modified: projects/routing/sys/netinet/in_rmx.c ============================================================================== --- projects/routing/sys/netinet/in_rmx.c Sat Nov 8 14:41:32 2014 (r274289) +++ projects/routing/sys/netinet/in_rmx.c Sat Nov 8 15:39:32 2014 (r274290) @@ -129,20 +129,6 @@ SYSCTL_VNET_INT(_net_inet_ip, IPCTL_RTEX &VNET_NAME(rtq_reallyold), 0, "Default expiration time on dynamically learned routes"); -/* never automatically crank down to less */ -static VNET_DEFINE(int, rtq_minreallyold) = 10; -#define V_rtq_minreallyold VNET(rtq_minreallyold) -SYSCTL_VNET_INT(_net_inet_ip, IPCTL_RTMINEXPIRE, rtminexpire, CTLFLAG_RW, - &VNET_NAME(rtq_minreallyold), 0, - "Minimum time to attempt to hold onto dynamically learned routes"); - -/* 128 cached routes is "too many" */ -static VNET_DEFINE(int, rtq_toomany) = 128; -#define V_rtq_toomany VNET(rtq_toomany) -SYSCTL_VNET_INT(_net_inet_ip, IPCTL_RTMAXCACHE, rtmaxcache, CTLFLAG_RW, - &VNET_NAME(rtq_toomany), 0, - "Upper limit on dynamically learned routes"); - /* * On last reference drop, mark the route as belong to us so that it can be * timed out. @@ -258,7 +244,6 @@ in_rtqtimo_one(void *rock) { struct radix_node_head *rnh = rock; struct rtqk_arg arg; - static time_t last_adjusted_timeout = 0; arg.found = arg.killed = 0; arg.rnh = rnh; @@ -267,35 +252,6 @@ in_rtqtimo_one(void *rock) RADIX_NODE_HEAD_LOCK(rnh); rnh->rnh_walktree(rnh, in_rtqkill, &arg); RADIX_NODE_HEAD_UNLOCK(rnh); - - /* - * Attempt to be somewhat dynamic about this: - * If there are ``too many'' routes sitting around taking up space, - * then crank down the timeout, and see if we can't make some more - * go away. However, we make sure that we will never adjust more - * than once in rtq_timeout seconds, to keep from cranking down too - * hard. - */ - if ((arg.found - arg.killed > V_rtq_toomany) && - (time_uptime - last_adjusted_timeout >= V_rtq_timeout) && - V_rtq_reallyold > V_rtq_minreallyold) { - V_rtq_reallyold = 2 * V_rtq_reallyold / 3; - if (V_rtq_reallyold < V_rtq_minreallyold) { - V_rtq_reallyold = V_rtq_minreallyold; - } - - last_adjusted_timeout = time_uptime; -#ifdef DIAGNOSTIC - log(LOG_DEBUG, "in_rtqtimo: adjusted rtq_reallyold to %d\n", - V_rtq_reallyold); -#endif - arg.found = arg.killed = 0; - arg.updating = 1; - RADIX_NODE_HEAD_LOCK(rnh); - rnh->rnh_walktree(rnh, in_rtqkill, &arg); - RADIX_NODE_HEAD_UNLOCK(rnh); - } - } void From owner-svn-src-projects@FreeBSD.ORG Sat Nov 8 15:58:18 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 231C8350; Sat, 8 Nov 2014 15:58:18 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E993FDC1; Sat, 8 Nov 2014 15:58:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sA8FwHJ3086954; Sat, 8 Nov 2014 15:58:17 GMT (envelope-from melifaro@FreeBSD.org) Received: (from melifaro@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sA8FwHq6086953; Sat, 8 Nov 2014 15:58:17 GMT (envelope-from melifaro@FreeBSD.org) Message-Id: <201411081558.sA8FwHq6086953@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: melifaro set sender to melifaro@FreeBSD.org using -f From: "Alexander V. Chernikov" Date: Sat, 8 Nov 2014 15:58:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274291 - projects/routing/sys/netinet X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Nov 2014 15:58:18 -0000 Author: melifaro Date: Sat Nov 8 15:58:17 2014 New Revision: 274291 URL: https://svnweb.freebsd.org/changeset/base/274291 Log: Finish r274290: arg.nextstop / arg.updating are not used anymore. Modified: projects/routing/sys/netinet/in_rmx.c Modified: projects/routing/sys/netinet/in_rmx.c ============================================================================== --- projects/routing/sys/netinet/in_rmx.c Sat Nov 8 15:39:32 2014 (r274290) +++ projects/routing/sys/netinet/in_rmx.c Sat Nov 8 15:58:17 2014 (r274291) @@ -165,14 +165,11 @@ struct rtqk_arg { int draining; int killed; int found; - int updating; - time_t nextstop; }; /* * Get rid of old routes. When draining, this deletes everything, even when - * the timeout is not expired yet. When updating, this makes sure that - * nothing has a timeout longer than the current value of rtq_reallyold. + * the timeout is not expired yet. */ static int in_rtqkill(struct radix_node *rn, void *rock) @@ -195,16 +192,10 @@ in_rtqkill(struct radix_node *rn, void * rt->rt_gateway, rt_mask(rt), rt->rt_flags | RTF_RNH_LOCKED, 0, rt->rt_fibnum); - if (err) { + if (err != 0) { log(LOG_WARNING, "in_rtqkill: error %d\n", err); - } else { + } else ap->killed++; - } - } else { - if (ap->updating && - (rt->rt_expire - time_uptime > V_rtq_reallyold)) - rt->rt_expire = time_uptime + V_rtq_reallyold; - ap->nextstop = lmin(ap->nextstop, rt->rt_expire); } } @@ -247,8 +238,7 @@ in_rtqtimo_one(void *rock) arg.found = arg.killed = 0; arg.rnh = rnh; - arg.nextstop = time_uptime + V_rtq_timeout; - arg.draining = arg.updating = 0; + arg.draining = 0; RADIX_NODE_HEAD_LOCK(rnh); rnh->rnh_walktree(rnh, in_rtqkill, &arg); RADIX_NODE_HEAD_UNLOCK(rnh); @@ -270,9 +260,7 @@ in_rtqdrain(void) rnh = rt_tables_get_rnh(fibnum, AF_INET); arg.found = arg.killed = 0; arg.rnh = rnh; - arg.nextstop = 0; arg.draining = 1; - arg.updating = 0; RADIX_NODE_HEAD_LOCK(rnh); rnh->rnh_walktree(rnh, in_rtqkill, &arg); RADIX_NODE_HEAD_UNLOCK(rnh); From owner-svn-src-projects@FreeBSD.ORG Sat Nov 8 16:26:18 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B6F8AA2B; Sat, 8 Nov 2014 16:26:18 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A3C8AFFC; Sat, 8 Nov 2014 16:26:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sA8GQIGU000954; Sat, 8 Nov 2014 16:26:18 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sA8GQIuG000953; Sat, 8 Nov 2014 16:26:18 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201411081626.sA8GQIuG000953@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Sat, 8 Nov 2014 16:26:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274292 - projects/release-vmimage/release/tools X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Nov 2014 16:26:18 -0000 Author: gjb Date: Sat Nov 8 16:26:17 2014 New Revision: 274292 URL: https://svnweb.freebsd.org/changeset/base/274292 Log: mount(8) and umount(8) devfs(5) as needed. Sponsored by: The FreeBSD Foundation Modified: projects/release-vmimage/release/tools/vmimage.subr Modified: projects/release-vmimage/release/tools/vmimage.subr ============================================================================== --- projects/release-vmimage/release/tools/vmimage.subr Sat Nov 8 15:58:17 2014 (r274291) +++ projects/release-vmimage/release/tools/vmimage.subr Sat Nov 8 16:26:17 2014 (r274292) @@ -79,8 +79,11 @@ vm_install_base() { echo '/dev/gpt/swapfs none swap sw 0 0' \ >> ${DESTDIR}/etc/fstab + mkdir -p ${DESTDIR}/dev + mount -t devfs devfs ${DESTDIR}/dev chroot ${DESTDIR} /usr/bin/newaliases chroot ${DESTDIR} /etc/rc.d/ldconfig forcestart + umount ${DESTDIR}/dev return 0 } @@ -104,12 +107,15 @@ vm_extra_enable_services() { } vm_extra_install_packages() { + mkdir -p ${DESTDIR}/dev + mount -t devfs devfs ${DESTDIR}/dev chroot ${DESTDIR} env ASSUME_ALWAYS_YES=yes \ /usr/sbin/pkg bootstrap -y if [ ! -z "${VM_EXTRA_PACKAGES}" ]; then chroot ${DESTDIR} env ASSUME_ALWAYS_YES=yes \ /usr/sbin/pkg install -y ${VM_EXTRA_PACKAGES} fi + umount ${DESTDIR}/dev return 0 } From owner-svn-src-projects@FreeBSD.ORG Sat Nov 8 16:31:12 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1F232B20; Sat, 8 Nov 2014 16:31:12 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E6847119; Sat, 8 Nov 2014 16:31:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sA8GVBTH004443; Sat, 8 Nov 2014 16:31:11 GMT (envelope-from melifaro@FreeBSD.org) Received: (from melifaro@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sA8GVB0I004442; Sat, 8 Nov 2014 16:31:11 GMT (envelope-from melifaro@FreeBSD.org) Message-Id: <201411081631.sA8GVB0I004442@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: melifaro set sender to melifaro@FreeBSD.org using -f From: "Alexander V. Chernikov" Date: Sat, 8 Nov 2014 16:31:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274293 - projects/routing/sys/netinet6 X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Nov 2014 16:31:12 -0000 Author: melifaro Date: Sat Nov 8 16:31:11 2014 New Revision: 274293 URL: https://svnweb.freebsd.org/changeset/base/274293 Log: Finish r274290#2: remove unused IPv6 code. Modified: projects/routing/sys/netinet6/in6_rmx.c Modified: projects/routing/sys/netinet6/in6_rmx.c ============================================================================== --- projects/routing/sys/netinet6/in6_rmx.c Sat Nov 8 16:26:17 2014 (r274292) +++ projects/routing/sys/netinet6/in6_rmx.c Sat Nov 8 16:31:11 2014 (r274293) @@ -170,22 +170,12 @@ in6_addroute(void *v_arg, void *n_arg, s return (ret); } -SYSCTL_DECL(_net_inet6_ip6); - -static VNET_DEFINE(int, rtq_toomany6) = 128; - /* 128 cached routes is ``too many'' */ -#define V_rtq_toomany6 VNET(rtq_toomany6) -SYSCTL_VNET_INT(_net_inet6_ip6, IPV6CTL_RTMAXCACHE, rtmaxcache, CTLFLAG_RW, - &VNET_NAME(rtq_toomany6) , 0, ""); - struct rtqk_arg { struct radix_node_head *rnh; int mode; - int updating; int draining; int killed; int found; - time_t nextstop; }; /* @@ -193,7 +183,6 @@ struct rtqk_arg { */ struct mtuex_arg { struct radix_node_head *rnh; - time_t nextstop; }; static VNET_DEFINE(struct callout, rtq_mtutimer); #define V_rtq_mtutimer VNET(rtq_mtutimer) @@ -202,7 +191,6 @@ static int in6_mtuexpire(struct radix_node *rn, void *rock) { struct rtentry *rt = (struct rtentry *)rn; - struct mtuex_arg *ap = rock; /* sanity */ if (!rt) @@ -211,8 +199,6 @@ in6_mtuexpire(struct radix_node *rn, voi if (rt->rt_expire && !(rt->rt_flags & RTF_PROBEMTU)) { if (rt->rt_expire <= time_uptime) { rt->rt_flags |= RTF_PROBEMTU; - } else { - ap->nextstop = lmin(ap->nextstop, rt->rt_expire); } } @@ -227,7 +213,6 @@ in6_mtutimo_one(struct radix_node_head * struct mtuex_arg arg; arg.rnh = rnh; - arg.nextstop = time_uptime + MTUTIMO_DEFAULT; RADIX_NODE_HEAD_LOCK(rnh); rnh->rnh_walktree(rnh, in6_mtuexpire, &arg); RADIX_NODE_HEAD_UNLOCK(rnh); From owner-svn-src-projects@FreeBSD.ORG Sat Nov 8 16:38:17 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4B307DA7; Sat, 8 Nov 2014 16:38:17 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3650A156; Sat, 8 Nov 2014 16:38:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sA8GcHMC006039; Sat, 8 Nov 2014 16:38:17 GMT (envelope-from melifaro@FreeBSD.org) Received: (from melifaro@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sA8GcFsq006029; Sat, 8 Nov 2014 16:38:15 GMT (envelope-from melifaro@FreeBSD.org) Message-Id: <201411081638.sA8GcFsq006029@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: melifaro set sender to melifaro@FreeBSD.org using -f From: "Alexander V. Chernikov" Date: Sat, 8 Nov 2014 16:38:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274295 - in projects/routing/sys: net netinet netinet6 X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Nov 2014 16:38:17 -0000 Author: melifaro Date: Sat Nov 8 16:38:15 2014 New Revision: 274295 URL: https://svnweb.freebsd.org/changeset/base/274295 Log: Convert most of "for (fibnum = 0; fibnum < rt_numfibs; fibnum++)" users to use new rt_foreach_fib() instead of hand-rolling cycles. Modified: projects/routing/sys/net/if.c projects/routing/sys/net/route.c projects/routing/sys/net/route.h projects/routing/sys/netinet/in_rmx.c projects/routing/sys/netinet6/in6_rmx.c projects/routing/sys/netinet6/nd6_rtr.c Modified: projects/routing/sys/net/if.c ============================================================================== --- projects/routing/sys/net/if.c Sat Nov 8 16:37:59 2014 (r274294) +++ projects/routing/sys/net/if.c Sat Nov 8 16:38:15 2014 (r274295) @@ -171,7 +171,6 @@ static int if_setflag(struct ifnet *, in static int if_transmit(struct ifnet *ifp, struct mbuf *m); static void if_unroute(struct ifnet *, int flag, int fam); static void link_rtrequest(int, struct rtentry *, struct rt_addrinfo *); -static int if_rtdel(struct radix_node *, void *); static int ifhwioctl(u_long, struct ifnet *, caddr_t, struct thread *); static int if_delmulti_locked(struct ifnet *, struct ifmultiaddr *, int); static void do_link_state_change(void *, int); @@ -896,8 +895,7 @@ static void if_detach_internal(struct ifnet *ifp, int vmove) { struct ifaddr *ifa; - struct radix_node_head *rnh; - int i, j; + int i; struct domain *dp; struct ifnet *iter; int found = 0; @@ -981,23 +979,7 @@ if_detach_internal(struct ifnet *ifp, in } } - /* - * Delete all remaining routes using this interface - * Unfortuneatly the only way to do this is to slog through - * the entire routing table looking for routes which point - * to this interface...oh well... - */ - for (i = 1; i <= AF_MAX; i++) { - for (j = 0; j < rt_numfibs; j++) { - rnh = rt_tables_get_rnh(j, i); - if (rnh == NULL) - continue; - RADIX_NODE_HEAD_LOCK(rnh); - (void) rnh->rnh_walktree(rnh, if_rtdel, ifp); - RADIX_NODE_HEAD_UNLOCK(rnh); - } - } - + rt_flushifroutes(ifp); if_delgroups(ifp); /* @@ -1422,49 +1404,6 @@ if_getgroupmembers(struct ifgroupreq *da } /* - * Delete Routes for a Network Interface - * - * Called for each routing entry via the rnh->rnh_walktree() call above - * to delete all route entries referencing a detaching network interface. - * - * Arguments: - * rn pointer to node in the routing table - * arg argument passed to rnh->rnh_walktree() - detaching interface - * - * Returns: - * 0 successful - * errno failed - reason indicated - * - */ -static int -if_rtdel(struct radix_node *rn, void *arg) -{ - struct rtentry *rt = (struct rtentry *)rn; - struct ifnet *ifp = arg; - int err; - - if (rt->rt_ifp == ifp) { - - /* - * Protect (sorta) against walktree recursion problems - * with cloned routes - */ - if ((rt->rt_flags & RTF_UP) == 0) - return (0); - - err = rtrequest_fib(RTM_DELETE, rt_key(rt), rt->rt_gateway, - rt_mask(rt), - rt->rt_flags|RTF_RNH_LOCKED|RTF_PINNED, - (struct rtentry **) NULL, rt->rt_fibnum); - if (err) { - log(LOG_WARNING, "if_rtdel: error %d\n", err); - } - } - - return (0); -} - -/* * Return counter values from counter(9)s stored in ifnet. */ uint64_t Modified: projects/routing/sys/net/route.c ============================================================================== --- projects/routing/sys/net/route.c Sat Nov 8 16:37:59 2014 (r274294) +++ projects/routing/sys/net/route.c Sat Nov 8 16:38:15 2014 (r274295) @@ -141,6 +141,7 @@ static VNET_DEFINE(uma_zone_t, rtzone); static int rtrequest1_fib_change(struct radix_node_head *, struct rt_addrinfo *, struct rtentry **, u_int); static void rt_setmetrics(const struct rt_addrinfo *, struct rtentry *); +static int rt_ifdelroute(struct rtentry *rt, void *arg); /* * handler for net.my_fibnum @@ -810,6 +811,96 @@ rtrequest_fib(int req, return rtrequest1_fib(req, &info, ret_nrt, fibnum); } + +void +rt_foreach_fib(int af, rt_setwarg_t *setwa_f, rt_walktree_f_t *wa_f, void *arg) +{ + struct radix_node_head *rnh; + uint32_t fibnum; + int i; + + for (fibnum = 0; fibnum < rt_numfibs; fibnum++) { + /* Do we want some specific family? */ + if (af != AF_UNSPEC) { + rnh = rt_tables_get_rnh(fibnum, af); + if (rnh == NULL) + continue; + if (setwa_f != NULL) + setwa_f(rnh, fibnum, i, arg); + + RADIX_NODE_HEAD_LOCK(rnh); + rnh->rnh_walktree(rnh, (walktree_f_t *)wa_f, arg); + RADIX_NODE_HEAD_UNLOCK(rnh); + continue; + } + + for (i = 1; i <= AF_MAX; i++) { + rnh = rt_tables_get_rnh(fibnum, i); + if (rnh == NULL) + continue; + if (setwa_f != NULL) + setwa_f(rnh, fibnum, i, arg); + + RADIX_NODE_HEAD_LOCK(rnh); + rnh->rnh_walktree(rnh, (walktree_f_t *)wa_f, arg); + RADIX_NODE_HEAD_UNLOCK(rnh); + } + } +} + +/* + * Delete Routes for a Network Interface + * + * Called for each routing entry via the rnh->rnh_walktree() call above + * to delete all route entries referencing a detaching network interface. + * + * Arguments: + * rt pointer to rtentry + * arg argument passed to rnh->rnh_walktree() - detaching interface + * + * Returns: + * 0 successful + * errno failed - reason indicated + */ +static int +rt_ifdelroute(struct rtentry *rt, void *arg) +{ + struct ifnet *ifp = arg; + int err; + + if (rt->rt_ifp != ifp) + return (0); + + /* + * Protect (sorta) against walktree recursion problems + * with cloned routes + */ + if ((rt->rt_flags & RTF_UP) == 0) + return (0); + + err = rtrequest_fib(RTM_DELETE, rt_key(rt), rt->rt_gateway, + rt_mask(rt), + rt->rt_flags | RTF_RNH_LOCKED | RTF_PINNED, + (struct rtentry **) NULL, rt->rt_fibnum); + if (err != 0) + log(LOG_WARNING, "rt_ifdelroute: error %d\n", err); + + return (0); +} + +/* + * Delete all remaining routes using this interface + * Unfortuneatly the only way to do this is to slog through + * the entire routing table looking for routes which point + * to this interface...oh well... + */ +void +rt_flushifroutes(struct ifnet *ifp) +{ + + rt_foreach_fib(AF_UNSPEC, NULL, rt_ifdelroute, ifp); +} + /* * These (questionable) definitions of apparent local variables apply * to the next two functions. XXXXXX!!! Modified: projects/routing/sys/net/route.h ============================================================================== --- projects/routing/sys/net/route.h Sat Nov 8 16:37:59 2014 (r274294) +++ projects/routing/sys/net/route.h Sat Nov 8 16:38:15 2014 (r274295) @@ -328,6 +328,11 @@ int rt_expunge(struct radix_node_head * void rtfree(struct rtentry *); int rt_check(struct rtentry **, struct rtentry **, struct sockaddr *); +typedef int rt_walktree_f_t(struct rtentry *, void *); +typedef void rt_setwarg_t(struct radix_node_head *, uint32_t, int, void *); +void rt_foreach_fib(int af, rt_setwarg_t *, rt_walktree_f_t *, void *); +void rt_flushifroutes(struct ifnet *ifp); + /* XXX MRT COMPAT VERSIONS THAT SET UNIVERSE to 0 */ /* Thes are used by old code not yet converted to use multiple FIBS */ int rt_getifa(struct rt_addrinfo *); Modified: projects/routing/sys/netinet/in_rmx.c ============================================================================== --- projects/routing/sys/netinet/in_rmx.c Sat Nov 8 16:37:59 2014 (r274294) +++ projects/routing/sys/netinet/in_rmx.c Sat Nov 8 16:38:15 2014 (r274295) @@ -56,6 +56,11 @@ extern int in_inithead(void **head, int extern int in_detachhead(void **head, int off); #endif +static void in_setifarnh(struct radix_node_head *rnh, uint32_t fibnum, + int af, void *_arg); +static void in_rtqtimo_setrnh(struct radix_node_head *rnh, uint32_t fibnum, + int af, void *_arg); + #define RTPRF_OURS RTF_PROTO3 /* set on routes we manage */ /* @@ -172,10 +177,9 @@ struct rtqk_arg { * the timeout is not expired yet. */ static int -in_rtqkill(struct radix_node *rn, void *rock) +in_rtqkill(struct rtentry *rt, void *rock) { struct rtqk_arg *ap = rock; - struct rtentry *rt = (struct rtentry *)rn; int err; RADIX_NODE_HEAD_WLOCK_ASSERT(ap->rnh); @@ -209,62 +213,52 @@ static VNET_DEFINE(struct callout, rtq_t #define V_rtq_timeout VNET(rtq_timeout) #define V_rtq_timer VNET(rtq_timer) -static void in_rtqtimo_one(void *rock); +static void +in_rtqtimo_setrnh(struct radix_node_head *rnh, uint32_t fibnum, int af, + void *_arg) +{ + struct rtqk_arg *arg; + int draining; + + arg = (struct rtqk_arg *)_arg; + + draining = arg->draining; + memset(arg, 0, sizeof(*arg)); + arg->rnh = rnh; + arg->draining = arg->draining; +} static void in_rtqtimo(void *rock) { CURVNET_SET((struct vnet *) rock); - int fibnum; - void *newrock; + struct rtqk_arg arg; struct timeval atv; - for (fibnum = 0; fibnum < rt_numfibs; fibnum++) { - newrock = rt_tables_get_rnh(fibnum, AF_INET); - if (newrock != NULL) - in_rtqtimo_one(newrock); - } + memset(&arg, 0, sizeof(arg)); + rt_foreach_fib(AF_INET, in_rtqtimo_setrnh, in_rtqkill, &arg); + atv.tv_usec = 0; atv.tv_sec = V_rtq_timeout; callout_reset(&V_rtq_timer, tvtohz(&atv), in_rtqtimo, rock); CURVNET_RESTORE(); } -static void -in_rtqtimo_one(void *rock) -{ - struct radix_node_head *rnh = rock; - struct rtqk_arg arg; - - arg.found = arg.killed = 0; - arg.rnh = rnh; - arg.draining = 0; - RADIX_NODE_HEAD_LOCK(rnh); - rnh->rnh_walktree(rnh, in_rtqkill, &arg); - RADIX_NODE_HEAD_UNLOCK(rnh); -} - void in_rtqdrain(void) { VNET_ITERATOR_DECL(vnet_iter); - struct radix_node_head *rnh; struct rtqk_arg arg; - int fibnum; + + memset(&arg, 0, sizeof(arg)); + arg.draining = 1; VNET_LIST_RLOCK_NOSLEEP(); VNET_FOREACH(vnet_iter) { CURVNET_SET(vnet_iter); - for ( fibnum = 0; fibnum < rt_numfibs; fibnum++) { - rnh = rt_tables_get_rnh(fibnum, AF_INET); - arg.found = arg.killed = 0; - arg.rnh = rnh; - arg.draining = 1; - RADIX_NODE_HEAD_LOCK(rnh); - rnh->rnh_walktree(rnh, in_rtqkill, &arg); - RADIX_NODE_HEAD_UNLOCK(rnh); - } + rt_foreach_fib(AF_INET, in_rtqtimo_setrnh, in_rtqkill, &arg); + CURVNET_RESTORE(); } VNET_LIST_RUNLOCK_NOSLEEP(); @@ -341,10 +335,9 @@ struct in_ifadown_arg { }; static int -in_ifadownkill(struct radix_node *rn, void *xap) +in_ifadownkill(struct rtentry *rt, void *xap) { struct in_ifadown_arg *ap = xap; - struct rtentry *rt = (struct rtentry *)rn; RT_LOCK(rt); if (rt->rt_ifa == ap->ifa && @@ -377,26 +370,30 @@ in_ifadownkill(struct radix_node *rn, vo return 0; } +static void +in_setifarnh(struct radix_node_head *rnh, uint32_t fibnum, int af, + void *_arg) +{ + struct in_ifadown_arg *arg; + + arg = (struct in_ifadown_arg *)_arg; + + arg->rnh = rnh; +} + void in_ifadown(struct ifaddr *ifa, int delete) { struct in_ifadown_arg arg; - struct radix_node_head *rnh; - int fibnum; KASSERT(ifa->ifa_addr->sa_family == AF_INET, ("%s: wrong family", __func__)); - for ( fibnum = 0; fibnum < rt_numfibs; fibnum++) { - rnh = rt_tables_get_rnh(fibnum, AF_INET); - arg.rnh = rnh; - arg.ifa = ifa; - arg.del = delete; - RADIX_NODE_HEAD_LOCK(rnh); - rnh->rnh_walktree(rnh, in_ifadownkill, &arg); - RADIX_NODE_HEAD_UNLOCK(rnh); - ifa->ifa_flags &= ~IFA_ROUTE; /* XXXlocking? */ - } + arg.ifa = ifa; + arg.del = delete; + + rt_foreach_fib(AF_INET, in_setifarnh, in_ifadownkill, &arg); + ifa->ifa_flags &= ~IFA_ROUTE; /* XXXlocking? */ } /* Modified: projects/routing/sys/netinet6/in6_rmx.c ============================================================================== --- projects/routing/sys/netinet6/in6_rmx.c Sat Nov 8 16:37:59 2014 (r274294) +++ projects/routing/sys/netinet6/in6_rmx.c Sat Nov 8 16:38:15 2014 (r274295) @@ -188,13 +188,8 @@ static VNET_DEFINE(struct callout, rtq_m #define V_rtq_mtutimer VNET(rtq_mtutimer) static int -in6_mtuexpire(struct radix_node *rn, void *rock) +in6_mtuexpire(struct rtentry *rt, void *rock) { - struct rtentry *rt = (struct rtentry *)rn; - - /* sanity */ - if (!rt) - panic("rt == NULL in in6_mtuexpire"); if (rt->rt_expire && !(rt->rt_flags & RTF_PROBEMTU)) { if (rt->rt_expire <= time_uptime) { @@ -202,35 +197,29 @@ in6_mtuexpire(struct radix_node *rn, voi } } - return 0; + return (0); } #define MTUTIMO_DEFAULT (60*1) static void -in6_mtutimo_one(struct radix_node_head *rnh) +in6_mtutimo_setwa(struct radix_node_head *rnh, uint32_t fibum, int af, void *_arg) { - struct mtuex_arg arg; + struct mtuex_arg *arg; + + arg = (struct mtuex_arg *)_arg; - arg.rnh = rnh; - RADIX_NODE_HEAD_LOCK(rnh); - rnh->rnh_walktree(rnh, in6_mtuexpire, &arg); - RADIX_NODE_HEAD_UNLOCK(rnh); + arg->rnh = rnh; } static void in6_mtutimo(void *rock) { CURVNET_SET_QUIET((struct vnet *) rock); - struct radix_node_head *rnh; struct timeval atv; - u_int fibnum; + struct mtuex_arg arg; - for (fibnum = 0; fibnum < rt_numfibs; fibnum++) { - rnh = rt_tables_get_rnh(fibnum, AF_INET6); - if (rnh != NULL) - in6_mtutimo_one(rnh); - } + rt_foreach_fib(AF_INET6, in6_mtutimo_setwa, in6_mtuexpire, &arg); atv.tv_sec = MTUTIMO_DEFAULT; atv.tv_usec = 0; Modified: projects/routing/sys/netinet6/nd6_rtr.c ============================================================================== --- projects/routing/sys/netinet6/nd6_rtr.c Sat Nov 8 16:37:59 2014 (r274294) +++ projects/routing/sys/netinet6/nd6_rtr.c Sat Nov 8 16:38:15 2014 (r274295) @@ -89,7 +89,7 @@ static void in6_init_address_ltimes(stru static int nd6_prefix_onlink(struct nd_prefix *); static int nd6_prefix_offlink(struct nd_prefix *); -static int rt6_deleteroute(struct radix_node *, void *); +static int rt6_deleteroute(struct rtentry *, void *); VNET_DECLARE(int, nd6_recalc_reachtm_interval); #define V_nd6_recalc_reachtm_interval VNET(nd6_recalc_reachtm_interval) @@ -2060,30 +2060,19 @@ in6_init_address_ltimes(struct nd_prefix void rt6_flush(struct in6_addr *gateway, struct ifnet *ifp) { - struct radix_node_head *rnh; - u_int fibnum; /* We'll care only link-local addresses */ if (!IN6_IS_ADDR_LINKLOCAL(gateway)) return; /* XXX Do we really need to walk any but the default FIB? */ - for (fibnum = 0; fibnum < rt_numfibs; fibnum++) { - rnh = rt_tables_get_rnh(fibnum, AF_INET6); - if (rnh == NULL) - continue; - - RADIX_NODE_HEAD_LOCK(rnh); - rnh->rnh_walktree(rnh, rt6_deleteroute, (void *)gateway); - RADIX_NODE_HEAD_UNLOCK(rnh); - } + rt_foreach_fib(AF_INET6, NULL, rt6_deleteroute, (void *)gateway); } static int -rt6_deleteroute(struct radix_node *rn, void *arg) +rt6_deleteroute(struct rtentry *rt, void *arg) { #define SIN6(s) ((struct sockaddr_in6 *)s) - struct rtentry *rt = (struct rtentry *)rn; struct in6_addr *gate = (struct in6_addr *)arg; if (rt->rt_gateway == NULL || rt->rt_gateway->sa_family != AF_INET6) From owner-svn-src-projects@FreeBSD.ORG Sat Nov 8 16:44:46 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CB95DEC5; Sat, 8 Nov 2014 16:44:46 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9DAFD200; Sat, 8 Nov 2014 16:44:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sA8GikjO010248; Sat, 8 Nov 2014 16:44:46 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sA8Giko9010247; Sat, 8 Nov 2014 16:44:46 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201411081644.sA8Giko9010247@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Sat, 8 Nov 2014 16:44:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274296 - projects/release-vmimage/release X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Nov 2014 16:44:46 -0000 Author: gjb Date: Sat Nov 8 16:44:45 2014 New Revision: 274296 URL: https://svnweb.freebsd.org/changeset/base/274296 Log: Change path for mk-vmimage.sh from ${TARGET}/ to scripts/ now that it is consolidated into one file. Fix paths for the base image and output disk image files. Sponsored by: The FreeBSD Foundation Modified: projects/release-vmimage/release/Makefile.vm Modified: projects/release-vmimage/release/Makefile.vm ============================================================================== --- projects/release-vmimage/release/Makefile.vm Sat Nov 8 16:38:15 2014 (r274295) +++ projects/release-vmimage/release/Makefile.vm Sat Nov 8 16:44:45 2014 (r274296) @@ -42,39 +42,33 @@ vm-base: vm-image vm-image: .if defined(WITH_VMIMAGES) && !empty(WITH_VMIMAGES) -. if exists(${.CURDIR}/${TARGET}/mk-vmimage.sh) -. for FORMAT in ${VMFORMATS} +. for FORMAT in ${VMFORMATS} mkdir -p ${.OBJDIR}/${.TARGET} env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ - ${.CURDIR}/${TARGET}/mk-vmimage.sh \ + ${.CURDIR}/scripts/mk-vmimage.sh \ -C ${.CURDIR}/tools/vmimage.subr -d ${.OBJDIR}/${.TARGET} \ - -i ${VMBASE}.img -s ${VMSIZE} -f ${FORMAT} \ - -S ${WORLDDIR} -o ${VMBASE}.${FORMAT} -. endfor -. endif + -i ${.OBJDIR}/${VMBASE}.img -s ${VMSIZE} -f ${FORMAT} \ + -S ${WORLDDIR} -o ${.OBJDIR}/${VMBASE}.${FORMAT} +. endfor .endif touch ${.TARGET} vm-cloudware: ${CLOUDTARGETS} vm-azure: -.if exists(${.CURDIR}/${TARGET}/mk-vmimage.sh) mkdir -p ${.OBJDIR}/${.TARGET} env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ - ${.CURDIR}/${TARGET}/mk-vmimage.sh \ + ${.CURDIR}/scripts/mk-vmimage.sh \ -C ${.CURDIR}/tools/vmimage.subr -d ${.OBJDIR}/${.TARGET} \ - -i azure.img -s ${VMSIZE} -f ${AZURE_FORMAT} \ - -S ${WORLDDIR} -o ${AZUREIMAGE} -c ${AZURECONF} -.endif + -i ${.OBJDIR}/azure.img -s ${VMSIZE} -f ${AZURE_FORMAT} \ + -S ${WORLDDIR} -o ${.OBJDIR}/${AZUREIMAGE} -c ${AZURECONF} touch ${.TARGET} vm-openstack: -.if exists(${.CURDIR}/${TARGET}/mk-vmimage.sh) mkdir -p ${.OBJDIR}/${.TARGET} env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ - ${.CURDIR}/${TARGET}/mk-vmimage.sh \ + ${.CURDIR}/scripts/mk-vmimage.sh \ -C ${.CURDIR}/tools/vmimage.subr -d ${.OBJDIR}/${.TARGET} \ - -i openstack.img -s ${VMSIZE} -f ${OPENSTACK_FORMAT} \ - -S ${WORLDDIR} -o ${OPENSTACKIMAGE} -c ${OPENSTACKCONF} -.endif + -i ${.OBJDIR}/openstack.img -s ${VMSIZE} -f ${OPENSTACK_FORMAT} \ + -S ${WORLDDIR} -o ${.OBJDIR}/${OPENSTACKIMAGE} -c ${OPENSTACKCONF} touch ${.TARGET} From owner-svn-src-projects@FreeBSD.ORG Sat Nov 8 16:52:07 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CFB962A2; Sat, 8 Nov 2014 16:52:07 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BC86B2F7; Sat, 8 Nov 2014 16:52:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sA8Gq7xK014613; Sat, 8 Nov 2014 16:52:07 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sA8Gq7G9014612; Sat, 8 Nov 2014 16:52:07 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201411081652.sA8Gq7G9014612@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Sat, 8 Nov 2014 16:52:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274297 - projects/release-vmimage/release/scripts X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Nov 2014 16:52:07 -0000 Author: gjb Date: Sat Nov 8 16:52:07 2014 New Revision: 274297 URL: https://svnweb.freebsd.org/changeset/base/274297 Log: Call cleanup() after everything is done. Sponsored by: The FreeBSD Foundation Modified: projects/release-vmimage/release/scripts/mk-vmimage.sh Modified: projects/release-vmimage/release/scripts/mk-vmimage.sh ============================================================================== --- projects/release-vmimage/release/scripts/mk-vmimage.sh Sat Nov 8 16:44:45 2014 (r274296) +++ projects/release-vmimage/release/scripts/mk-vmimage.sh Sat Nov 8 16:52:07 2014 (r274297) @@ -102,6 +102,7 @@ main() { vm_extra_pre_umount vm_create_disk || return 0 vm_extra_create_disk + cleanup return 0 } From owner-svn-src-projects@FreeBSD.ORG Sat Nov 8 18:13:43 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 29E57AF6; Sat, 8 Nov 2014 18:13:43 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 11A21B92; Sat, 8 Nov 2014 18:13:43 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sA8IDgnA052061; Sat, 8 Nov 2014 18:13:42 GMT (envelope-from melifaro@FreeBSD.org) Received: (from melifaro@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sA8IDaFc052026; Sat, 8 Nov 2014 18:13:36 GMT (envelope-from melifaro@FreeBSD.org) Message-Id: <201411081813.sA8IDaFc052026@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: melifaro set sender to melifaro@FreeBSD.org using -f From: "Alexander V. Chernikov" Date: Sat, 8 Nov 2014 18:13:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274298 - in projects/routing: . bin/df bin/sh cddl/contrib/opensolaris/cmd/zdb contrib/llvm/lib/MC/MCParser contrib/llvm/patches contrib/netbsd-tests/lib/libc/sys contrib/openpam/t con... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Nov 2014 18:13:43 -0000 Author: melifaro Date: Sat Nov 8 18:13:35 2014 New Revision: 274298 URL: https://svnweb.freebsd.org/changeset/base/274298 Log: Sync to HEAD@r274297. Added: projects/routing/contrib/llvm/patches/patch-r274286-llvm-r201784-asm-dollar.diff - copied unchanged from r274297, head/contrib/llvm/patches/patch-r274286-llvm-r201784-asm-dollar.diff projects/routing/lib/libdpv/ - copied from r274297, head/lib/libdpv/ projects/routing/lib/libfigpar/ - copied from r274297, head/lib/libfigpar/ projects/routing/lib/libpam/libpam/tests/ - copied from r274297, head/lib/libpam/libpam/tests/ projects/routing/share/man/man4/me.4 - copied unchanged from r274297, head/share/man/man4/me.4 projects/routing/sys/compat/svr4/README - copied unchanged from r274297, head/sys/compat/svr4/README projects/routing/sys/compat/svr4/TO-DO - copied unchanged from r274297, head/sys/compat/svr4/TO-DO projects/routing/sys/dev/ixl/ixlv_vc_mgr.h - copied unchanged from r274297, head/sys/dev/ixl/ixlv_vc_mgr.h projects/routing/sys/modules/if_me/ - copied from r274297, head/sys/modules/if_me/ projects/routing/sys/net/if_me.c - copied unchanged from r274297, head/sys/net/if_me.c projects/routing/sys/netinet6/ip6_gre.c - copied, changed from r274297, head/sys/netinet6/ip6_gre.c projects/routing/tools/build/check-links.sh - copied unchanged from r274297, head/tools/build/check-links.sh projects/routing/usr.bin/dpv/ - copied from r274297, head/usr.bin/dpv/ Deleted: projects/routing/sys/modules/svr4/README projects/routing/sys/modules/svr4/TO-DO projects/routing/sys/netinet/ip_gre.h Modified: projects/routing/Makefile.inc1 projects/routing/bin/df/Makefile projects/routing/bin/df/df.1 projects/routing/bin/df/df.c projects/routing/bin/sh/sh.1 projects/routing/cddl/contrib/opensolaris/cmd/zdb/zdb.c projects/routing/contrib/llvm/lib/MC/MCParser/AsmParser.cpp projects/routing/contrib/netbsd-tests/lib/libc/sys/t_getcontext.c projects/routing/contrib/netbsd-tests/lib/libc/sys/t_mincore.c projects/routing/contrib/openpam/t/t_openpam_ctype.c projects/routing/contrib/openpam/t/t_openpam_readlinev.c projects/routing/contrib/openpam/t/t_openpam_readword.c projects/routing/contrib/tnftp/src/fetch.c projects/routing/etc/mtree/BSD.tests.dist projects/routing/etc/periodic/security/Makefile projects/routing/etc/rc.d/growfs projects/routing/gnu/lib/libdialog/Makefile projects/routing/lib/Makefile projects/routing/lib/libpam/libpam/Makefile projects/routing/rescue/rescue/Makefile projects/routing/sbin/fsirand/Makefile projects/routing/sbin/ifconfig/ifgre.c projects/routing/share/man/man4/Makefile projects/routing/share/man/man4/gre.4 projects/routing/share/man/man9/domain.9 projects/routing/share/mk/bsd.lib.mk projects/routing/share/mk/bsd.libnames.mk projects/routing/share/mk/bsd.obj.mk projects/routing/share/mk/bsd.own.mk projects/routing/share/mk/bsd.prog.mk projects/routing/sys/amd64/amd64/support.S projects/routing/sys/amd64/conf/GENERIC projects/routing/sys/arm/arm/busdma_machdep-v6.c projects/routing/sys/boot/common/misc.c projects/routing/sys/cam/ctl/ctl.c projects/routing/sys/cam/ctl/ctl.h projects/routing/sys/cam/ctl/ctl_backend.h projects/routing/sys/cam/ctl/ctl_backend_block.c projects/routing/sys/cam/ctl/ctl_error.c projects/routing/sys/cam/ctl/ctl_private.h projects/routing/sys/cam/scsi/scsi_all.h projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c projects/routing/sys/conf/NOTES projects/routing/sys/conf/files projects/routing/sys/conf/kmod.mk projects/routing/sys/dev/ahci/ahci.c projects/routing/sys/dev/hyperv/netvsc/hv_net_vsc.c projects/routing/sys/dev/hyperv/netvsc/hv_net_vsc.h projects/routing/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c projects/routing/sys/dev/ida/ida_eisa.c projects/routing/sys/dev/ixl/i40e_osdep.c projects/routing/sys/dev/ixl/i40e_osdep.h projects/routing/sys/dev/ixl/if_ixl.c projects/routing/sys/dev/ixl/if_ixlv.c projects/routing/sys/dev/ixl/ixl.h projects/routing/sys/dev/ixl/ixl_txrx.c projects/routing/sys/dev/ixl/ixlv.h projects/routing/sys/dev/ixl/ixlvc.c projects/routing/sys/dev/ofw/ofwbus.c projects/routing/sys/dev/random/fortuna.c projects/routing/sys/dev/random/ivy.c projects/routing/sys/dev/random/nehemiah.c projects/routing/sys/dev/random/randomdev.c projects/routing/sys/dev/random/randomdev_soft.c projects/routing/sys/dev/sound/pci/spicds.c projects/routing/sys/dev/usb/serial/u3g.c projects/routing/sys/dev/usb/usbdevs projects/routing/sys/dev/virtio/console/virtio_console.c projects/routing/sys/dev/vt/vt.h projects/routing/sys/geom/geom_dev.c projects/routing/sys/kern/kern_descrip.c projects/routing/sys/kern/kern_prot.c projects/routing/sys/kern/uipc_debug.c projects/routing/sys/kern/vfs_export.c projects/routing/sys/modules/Makefile projects/routing/sys/modules/if_gre/Makefile projects/routing/sys/modules/ixlv/Makefile projects/routing/sys/modules/linux/Makefile projects/routing/sys/modules/mrsas/Makefile projects/routing/sys/modules/random/Makefile projects/routing/sys/modules/sound/sound/Makefile projects/routing/sys/modules/svr4/Makefile projects/routing/sys/modules/vmm/Makefile projects/routing/sys/net/bpf.c projects/routing/sys/net/flowtable.c projects/routing/sys/net/if.c projects/routing/sys/net/if_arp.h projects/routing/sys/net/if_bridge.c projects/routing/sys/net/if_disc.c projects/routing/sys/net/if_ethersubr.c projects/routing/sys/net/if_faith.c projects/routing/sys/net/if_fddisubr.c projects/routing/sys/net/if_gif.c projects/routing/sys/net/if_gre.c projects/routing/sys/net/if_gre.h projects/routing/sys/net/if_iso88025subr.c projects/routing/sys/net/if_loop.c projects/routing/sys/net/if_mib.c projects/routing/sys/net/if_stf.c projects/routing/sys/net/if_var.h projects/routing/sys/net/route.c projects/routing/sys/net/vnet.h projects/routing/sys/netgraph/ng_ether.c projects/routing/sys/netinet/cc/cc.c projects/routing/sys/netinet/cc/cc_cdg.c projects/routing/sys/netinet/cc/cc_chd.c projects/routing/sys/netinet/cc/cc_hd.c projects/routing/sys/netinet/cc/cc_htcp.c projects/routing/sys/netinet/cc/cc_vegas.c projects/routing/sys/netinet/if_ether.c projects/routing/sys/netinet/igmp.c projects/routing/sys/netinet/in.c projects/routing/sys/netinet/in_gif.c projects/routing/sys/netinet/in_pcb.c projects/routing/sys/netinet/in_proto.c projects/routing/sys/netinet/in_rmx.c projects/routing/sys/netinet/ip_carp.c projects/routing/sys/netinet/ip_fastfwd.c projects/routing/sys/netinet/ip_gre.c projects/routing/sys/netinet/ip_icmp.c projects/routing/sys/netinet/ip_input.c projects/routing/sys/netinet/ip_ipsec.c projects/routing/sys/netinet/ip_mroute.c projects/routing/sys/netinet/raw_ip.c projects/routing/sys/netinet/tcp_hostcache.c projects/routing/sys/netinet/tcp_input.c projects/routing/sys/netinet/tcp_output.c projects/routing/sys/netinet/tcp_sack.c projects/routing/sys/netinet/tcp_subr.c projects/routing/sys/netinet/tcp_syncache.c projects/routing/sys/netinet/tcp_timewait.c projects/routing/sys/netinet/udp_usrreq.c projects/routing/sys/netinet6/in6.c projects/routing/sys/netinet6/in6_gif.c projects/routing/sys/netinet6/in6_proto.c projects/routing/sys/netinet6/in6_rmx.c projects/routing/sys/netinet6/in6_var.h projects/routing/sys/netinet6/ip6_ipsec.c projects/routing/sys/netinet6/mld6.c projects/routing/sys/netinet6/nd6.c projects/routing/sys/netinet6/scope6.c projects/routing/sys/netipsec/ipsec.c projects/routing/sys/netipsec/ipsec_input.c projects/routing/sys/netipsec/key.c projects/routing/sys/netipsec/xform_ah.c projects/routing/sys/netipsec/xform_esp.c projects/routing/sys/netipsec/xform_ipcomp.c projects/routing/sys/netipsec/xform_ipip.c projects/routing/sys/netpfil/ipfw/ip_fw2.c projects/routing/sys/netpfil/ipfw/ip_fw_dynamic.c projects/routing/sys/netpfil/ipfw/ip_fw_pfil.c projects/routing/sys/netpfil/pf/if_pfsync.c projects/routing/sys/sys/conf.h projects/routing/sys/sys/disk.h projects/routing/sys/sys/domain.h projects/routing/sys/sys/param.h projects/routing/sys/sys/sysctl.h projects/routing/sys/sys/ucred.h projects/routing/sys/sys/user.h projects/routing/sys/vm/default_pager.c projects/routing/sys/vm/swap_pager.c projects/routing/sys/vm/vm_page.c projects/routing/tests/sys/netinet/Makefile projects/routing/usr.bin/Makefile projects/routing/usr.bin/ftp/Makefile projects/routing/usr.bin/iconv/Makefile projects/routing/usr.bin/id/Makefile projects/routing/usr.bin/w/Makefile projects/routing/usr.bin/w/pr_time.c projects/routing/usr.bin/w/w.1 projects/routing/usr.bin/w/w.c projects/routing/usr.bin/wc/Makefile projects/routing/usr.bin/wc/wc.1 projects/routing/usr.bin/wc/wc.c projects/routing/usr.sbin/ctladm/ctladm.8 projects/routing/usr.sbin/ctld/Makefile projects/routing/usr.sbin/ctld/ctl.conf.5 projects/routing/usr.sbin/ctld/ctld.c projects/routing/usr.sbin/fifolog/fifolog_reader/Makefile projects/routing/usr.sbin/fifolog/fifolog_writer/Makefile projects/routing/usr.sbin/iscsid/Makefile projects/routing/usr.sbin/rpcbind/Makefile projects/routing/usr.sbin/sysrc/sysrc.8 Directory Properties: projects/routing/ (props changed) projects/routing/cddl/ (props changed) projects/routing/cddl/contrib/opensolaris/ (props changed) projects/routing/contrib/llvm/ (props changed) projects/routing/contrib/openpam/ (props changed) projects/routing/contrib/tnftp/ (props changed) projects/routing/etc/ (props changed) projects/routing/gnu/lib/ (props changed) projects/routing/sbin/ (props changed) projects/routing/share/ (props changed) projects/routing/share/man/man4/ (props changed) projects/routing/sys/ (props changed) projects/routing/sys/boot/ (props changed) projects/routing/sys/cddl/contrib/opensolaris/ (props changed) projects/routing/sys/conf/ (props changed) projects/routing/sys/dev/hyperv/ (props changed) projects/routing/sys/modules/vmm/ (props changed) Modified: projects/routing/Makefile.inc1 ============================================================================== --- projects/routing/Makefile.inc1 Sat Nov 8 16:52:07 2014 (r274297) +++ projects/routing/Makefile.inc1 Sat Nov 8 18:13:35 2014 (r274298) @@ -1537,6 +1537,7 @@ _prebuild_libs= ${_kerberos5_lib_libasn1 ${_kerberos5_lib_libwind} \ lib/libbz2 ${_libcom_err} lib/libcrypt \ lib/libelf lib/libexpat \ + lib/libfigpar \ ${_lib_libgssapi} \ lib/libkiconv lib/libkvm lib/liblzma lib/libmd lib/libnv \ ${_lib_libcapsicum} \ @@ -1551,7 +1552,8 @@ _prebuild_libs= ${_kerberos5_lib_libasn1 ${_cddl_lib_libctf} \ lib/libutil lib/libpjdlog ${_lib_libypclnt} lib/libz lib/msun \ ${_secure_lib_libcrypto} ${_lib_libldns} \ - ${_secure_lib_libssh} ${_secure_lib_libssl} + ${_secure_lib_libssh} ${_secure_lib_libssl} \ + gnu/lib/libdialog .if ${MK_GNUCXX} != "no" _prebuild_libs+= gnu/lib/libstdc++ gnu/lib/libsupc++ gnu/lib/libstdc++__L: lib/msun__L @@ -1669,6 +1671,8 @@ _lib_libypclnt= lib/libypclnt lib/libradius__L: lib/libmd__L .endif +gnu/lib/libdialog__L: lib/msun__L lib/ncurses/ncursesw__L + .for _lib in ${_prereq_libs} ${_lib}__PL: .PHONY .MAKE .if exists(${.CURDIR}/${_lib}) Modified: projects/routing/bin/df/Makefile ============================================================================== --- projects/routing/bin/df/Makefile Sat Nov 8 16:52:07 2014 (r274297) +++ projects/routing/bin/df/Makefile Sat Nov 8 18:13:35 2014 (r274298) @@ -9,7 +9,7 @@ SRCS= df.c vfslist.c CFLAGS+= -I${MOUNT} -DPADD= ${LIBUTIL} -LDADD= -lutil +DPADD= ${LIBUTIL} ${LIBXO} +LDADD= -lutil -lxo .include Modified: projects/routing/bin/df/df.1 ============================================================================== --- projects/routing/bin/df/df.1 Sat Nov 8 16:52:07 2014 (r274297) +++ projects/routing/bin/df/df.1 Sat Nov 8 18:13:35 2014 (r274298) @@ -29,7 +29,7 @@ .\" @(#)df.1 8.3 (Berkeley) 5/8/95 .\" $FreeBSD$ .\" -.Dd January 16, 2014 +.Dd November 6, 2014 .Dt DF 1 .Os .Sh NAME @@ -37,6 +37,7 @@ .Nd display free disk space .Sh SYNOPSIS .Nm +.Op Fl -libxo .Op Fl b | g | H | h | k | m | P .Op Fl acilnT .Op Fl \&, @@ -193,7 +194,9 @@ If the value is outside, it will be set .Xr statfs 2 , .Xr getbsize 3 , .Xr getmntinfo 3 , +.Xr libxo 3 , .Xr localeconv 3 , +.Xr xo_parse_args 3 , .Xr fstab 5 , .Xr mount 8 , .Xr pstat 8 , Modified: projects/routing/bin/df/df.c ============================================================================== --- projects/routing/bin/df/df.c Sat Nov 8 16:52:07 2014 (r274297) +++ projects/routing/bin/df/df.c Sat Nov 8 18:13:35 2014 (r274298) @@ -60,6 +60,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include "extern.h" @@ -82,7 +83,7 @@ static char *getmntpt(const char *); static int int64width(int64_t); static char *makenetvfslist(void); static void prthuman(const struct statfs *, int64_t); -static void prthumanval(int64_t); +static void prthumanval(const char *, int64_t); static intmax_t fsbtoblk(int64_t, uint64_t, u_long); static void prtstat(struct statfs *, struct maxwidths *); static size_t regetmntinfo(struct statfs **, long, const char **); @@ -119,6 +120,11 @@ main(int argc, char *argv[]) totalbuf.f_bsize = DEV_BSIZE; strlcpy(totalbuf.f_mntfromname, "total", MNAMELEN); vfslist = NULL; + + argc = xo_parse_args(argc, argv); + if (argc < 0) + exit(1); + while ((ch = getopt(argc, argv, "abcgHhiklmnPt:T,")) != -1) switch (ch) { case 'a': @@ -161,7 +167,7 @@ main(int argc, char *argv[]) break; case 'l': if (vfslist != NULL) - errx(1, "-l and -t are mutually exclusive."); + xo_errx(1, "-l and -t are mutually exclusive."); vfslist = makevfslist(makenetvfslist()); lflag = 1; break; @@ -174,9 +180,9 @@ main(int argc, char *argv[]) break; case 't': if (lflag) - errx(1, "-l and -t are mutually exclusive."); + xo_errx(1, "-l and -t are mutually exclusive."); if (vfslist != NULL) - errx(1, "only one -t option may be specified"); + xo_errx(1, "only one -t option may be specified"); fstype = optarg; vfslist = makevfslist(optarg); break; @@ -202,16 +208,19 @@ main(int argc, char *argv[]) /* just the filesystems specified on the command line */ mntbuf = malloc(argc * sizeof(*mntbuf)); if (mntbuf == NULL) - err(1, "malloc()"); + xo_err(1, "malloc()"); mntsize = 0; /* continued in for loop below */ } + xo_open_container("storage-system-information"); + xo_open_list("filesystem"); + /* iterate through specified filesystems */ for (; *argv; argv++) { if (stat(*argv, &stbuf) < 0) { if ((mntpt = getmntpt(*argv)) == NULL) { - warn("%s", *argv); + xo_warn("%s", *argv); rv = 1; continue; } @@ -220,20 +229,20 @@ main(int argc, char *argv[]) mdev.fspec = *argv; mntpath = strdup("/tmp/df.XXXXXX"); if (mntpath == NULL) { - warn("strdup failed"); + xo_warn("strdup failed"); rv = 1; continue; } mntpt = mkdtemp(mntpath); if (mntpt == NULL) { - warn("mkdtemp(\"%s\") failed", mntpath); + xo_warn("mkdtemp(\"%s\") failed", mntpath); rv = 1; free(mntpath); continue; } if (mount(fstype, mntpt, MNT_RDONLY, &mdev) != 0) { - warn("%s", *argv); + xo_warn("%s", *argv); rv = 1; (void)rmdir(mntpt); free(mntpath); @@ -244,7 +253,7 @@ main(int argc, char *argv[]) if (cflag) addstat(&totalbuf, &statfsbuf); } else { - warn("%s", *argv); + xo_warn("%s", *argv); rv = 1; } (void)unmount(mntpt, 0); @@ -260,7 +269,7 @@ main(int argc, char *argv[]) * implement nflag here. */ if (statfs(mntpt, &statfsbuf) < 0) { - warn("%s", mntpt); + xo_warn("%s", mntpt); rv = 1; continue; } @@ -294,8 +303,14 @@ main(int argc, char *argv[]) for (i = 0; i < mntsize; i++) if (aflag || (mntbuf[i].f_flags & MNT_IGNORE) == 0) prtstat(&mntbuf[i], &maxwidths); + + xo_close_list("filesystem"); + if (cflag) prtstat(&totalbuf, &maxwidths); + + xo_close_container("storage-system-information"); + xo_finish(); return (rv); } @@ -341,7 +356,7 @@ regetmntinfo(struct statfs **mntbufp, lo if (nflag || error < 0) if (i != j) { if (error < 0) - warnx("%s stats possibly stale", + xo_warnx("%s stats possibly stale", mntbuf[i].f_mntonname); mntbuf[j] = mntbuf[i]; } @@ -354,13 +369,13 @@ static void prthuman(const struct statfs *sfsp, int64_t used) { - prthumanval(sfsp->f_blocks * sfsp->f_bsize); - prthumanval(used * sfsp->f_bsize); - prthumanval(sfsp->f_bavail * sfsp->f_bsize); + prthumanval(" {:blocks/%6s}", sfsp->f_blocks * sfsp->f_bsize); + prthumanval(" {:used/%6s}", used * sfsp->f_bsize); + prthumanval(" {:available/%6s}", sfsp->f_bavail * sfsp->f_bsize); } static void -prthumanval(int64_t bytes) +prthumanval(const char *fmt, int64_t bytes) { char buf[6]; int flags; @@ -372,14 +387,15 @@ prthumanval(int64_t bytes) humanize_number(buf, sizeof(buf) - (bytes < 0 ? 0 : 1), bytes, "", HN_AUTOSCALE, flags); - (void)printf(" %6s", buf); + xo_attr("value", "%lld", (long long) bytes); + xo_emit(fmt, buf); } /* * Print an inode count in "human-readable" format. */ static void -prthumanvalinode(int64_t bytes) +prthumanvalinode(const char *fmt, int64_t bytes) { char buf[6]; int flags; @@ -389,7 +405,8 @@ prthumanvalinode(int64_t bytes) humanize_number(buf, sizeof(buf) - (bytes < 0 ? 0 : 1), bytes, "", HN_AUTOSCALE, flags); - (void)printf(" %5s", buf); + xo_attr("value", "%lld", (long long) bytes); + xo_emit(fmt, buf); } /* @@ -434,70 +451,77 @@ prtstat(struct statfs *sfsp, struct maxw mwp->used = imax(mwp->used, (int)strlen("Used")); mwp->avail = imax(mwp->avail, (int)strlen("Avail")); - (void)printf("%-*s", mwp->mntfrom, "Filesystem"); + xo_emit("{T:/%-*s}", mwp->mntfrom, "Filesystem"); if (Tflag) - (void)printf(" %-*s", mwp->fstype, "Type"); - (void)printf(" %*s %*s %*s Capacity", mwp->total, header, - mwp->used, "Used", mwp->avail, "Avail"); + xo_emit(" {T:/%-*s}", mwp->fstype, "Type"); + xo_emit(" {T:/%*s} {T:/%*s} {T:/%*s} Capacity", + mwp->total, header, + mwp->used, "Used", mwp->avail, "Avail"); if (iflag) { mwp->iused = imax(hflag ? 0 : mwp->iused, (int)strlen(" iused")); mwp->ifree = imax(hflag ? 0 : mwp->ifree, (int)strlen("ifree")); - (void)printf(" %*s %*s %%iused", + xo_emit(" {T:/%*s} {T:/%*s} {T:\%iused}", mwp->iused - 2, "iused", mwp->ifree, "ifree"); } - (void)printf(" Mounted on\n"); + xo_emit(" {T:Mounted on}\n"); } + + xo_open_instance("filesystem"); /* Check for 0 block size. Can this happen? */ if (sfsp->f_bsize == 0) { - warnx ("File system %s does not have a block size, assuming 512.", + xo_warnx ("File system %s does not have a block size, assuming 512.", sfsp->f_mntonname); sfsp->f_bsize = 512; } - (void)printf("%-*s", mwp->mntfrom, sfsp->f_mntfromname); + xo_emit("{tk:name/%-*s}", mwp->mntfrom, sfsp->f_mntfromname); if (Tflag) - (void)printf(" %-*s", mwp->fstype, sfsp->f_fstypename); + xo_emit(" {:type/%-*s}", mwp->fstype, sfsp->f_fstypename); used = sfsp->f_blocks - sfsp->f_bfree; availblks = sfsp->f_bavail + used; if (hflag) { prthuman(sfsp, used); } else { if (thousands) - format = " %*j'd %*j'd %*j'd"; + format = " {t:total-blocks/%*j'd} {t:used-blocks/%*j'd} " + "{t:available-blocks/%*j'd}"; else - format = " %*jd %*jd %*jd"; - (void)printf(format, + format = " {t:total-blocks/%*jd} {t:used-blocks/%*jd} " + "{t:available-blocks/%*jd}"; + xo_emit(format, mwp->total, fsbtoblk(sfsp->f_blocks, sfsp->f_bsize, blocksize), mwp->used, fsbtoblk(used, sfsp->f_bsize, blocksize), mwp->avail, fsbtoblk(sfsp->f_bavail, sfsp->f_bsize, blocksize)); } - (void)printf(" %5.0f%%", + xo_emit(" {:used-percent/%5.0f}{U:%%}", availblks == 0 ? 100.0 : (double)used / (double)availblks * 100.0); if (iflag) { inodes = sfsp->f_files; used = inodes - sfsp->f_ffree; if (hflag) { - (void)printf(" "); - prthumanvalinode(used); - prthumanvalinode(sfsp->f_ffree); + xo_emit(" "); + prthumanvalinode(" {:inodes-used/%5s}", used); + prthumanvalinode(" {:inodes-free/%5s}", sfsp->f_ffree); } else { if (thousands) - format = " %*j'd %*j'd"; + format = " {:inodes-used/%*j'd} {:inodes-free/%*j'd}"; else - format = " %*jd %*jd"; - (void)printf(format, mwp->iused, (intmax_t)used, + format = " {:inodes-used/%*jd} {:inodes-free/%*jd}"; + xo_emit(format, mwp->iused, (intmax_t)used, mwp->ifree, (intmax_t)sfsp->f_ffree); } - (void)printf(" %4.0f%% ", inodes == 0 ? 100.0 : - (double)used / (double)inodes * 100.0); + xo_emit(" {:inodes-used-percent/%4.0f}{U:%%} ", + inodes == 0 ? 100.0 : + (double)used / (double)inodes * 100.0); } else - (void)printf(" "); + xo_emit(" "); if (strncmp(sfsp->f_mntfromname, "total", MNAMELEN) != 0) - (void)printf(" %s", sfsp->f_mntonname); - (void)printf("\n"); + xo_emit(" {:mounted-on}", sfsp->f_mntonname); + xo_emit("\n"); + xo_close_instance("filesystem"); } static void @@ -564,7 +588,7 @@ static void usage(void) { - (void)fprintf(stderr, + xo_error( "usage: df [-b | -g | -H | -h | -k | -m | -P] [-acilnT] [-t type] [-,]\n" " [file | filesystem ...]\n"); exit(EX_USAGE); @@ -579,24 +603,24 @@ makenetvfslist(void) int cnt, i, maxvfsconf; if (sysctlbyname("vfs.conflist", NULL, &buflen, NULL, 0) < 0) { - warn("sysctl(vfs.conflist)"); + xo_warn("sysctl(vfs.conflist)"); return (NULL); } xvfsp = malloc(buflen); if (xvfsp == NULL) { - warnx("malloc failed"); + xo_warnx("malloc failed"); return (NULL); } keep_xvfsp = xvfsp; if (sysctlbyname("vfs.conflist", xvfsp, &buflen, NULL, 0) < 0) { - warn("sysctl(vfs.conflist)"); + xo_warn("sysctl(vfs.conflist)"); free(keep_xvfsp); return (NULL); } maxvfsconf = buflen / sizeof(struct xvfsconf); if ((listptr = malloc(sizeof(char*) * maxvfsconf)) == NULL) { - warnx("malloc failed"); + xo_warnx("malloc failed"); free(keep_xvfsp); return (NULL); } @@ -605,7 +629,7 @@ makenetvfslist(void) if (xvfsp->vfc_flags & VFCF_NETWORK) { listptr[cnt++] = strdup(xvfsp->vfc_name); if (listptr[cnt-1] == NULL) { - warnx("malloc failed"); + xo_warnx("malloc failed"); free(listptr); free(keep_xvfsp); return (NULL); @@ -617,7 +641,7 @@ makenetvfslist(void) if (cnt == 0 || (str = malloc(sizeof(char) * (32 * cnt + cnt + 2))) == NULL) { if (cnt > 0) - warnx("malloc failed"); + xo_warnx("malloc failed"); free(listptr); free(keep_xvfsp); return (NULL); Modified: projects/routing/bin/sh/sh.1 ============================================================================== --- projects/routing/bin/sh/sh.1 Sat Nov 8 16:52:07 2014 (r274297) +++ projects/routing/bin/sh/sh.1 Sat Nov 8 18:13:35 2014 (r274298) @@ -32,7 +32,7 @@ .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 .\" $FreeBSD$ .\" -.Dd September 21, 2014 +.Dd November 7, 2014 .Dt SH 1 .Os .Sh NAME @@ -2522,7 +2522,8 @@ and so on, decreasing the value of .Li $# by one. -If there are zero positional parameters, shifting does not do anything. +For portability, shifting if there are zero positional parameters +should be avoided, since the shell may abort. .It Ic test A built-in equivalent of .Xr test 1 . Modified: projects/routing/cddl/contrib/opensolaris/cmd/zdb/zdb.c ============================================================================== --- projects/routing/cddl/contrib/opensolaris/cmd/zdb/zdb.c Sat Nov 8 16:52:07 2014 (r274297) +++ projects/routing/cddl/contrib/opensolaris/cmd/zdb/zdb.c Sat Nov 8 18:13:35 2014 (r274298) @@ -77,9 +77,11 @@ #ifndef lint extern boolean_t zfs_recover; extern uint64_t zfs_arc_max, zfs_arc_meta_limit; +extern int zfs_vdev_async_read_max_active; #else boolean_t zfs_recover; uint64_t zfs_arc_max, zfs_arc_meta_limit; +int zfs_vdev_async_read_max_active; #endif const char cmdname[] = "zdb"; @@ -2384,8 +2386,14 @@ zdb_blkptr_cb(spa_t *spa, zilog_t *zilog zcb->zcb_readfails = 0; - if (dump_opt['b'] < 5 && - gethrtime() > zcb->zcb_lastprint + NANOSEC) { + /* only call gethrtime() every 100 blocks */ + static int iters; + if (++iters > 100) + iters = 0; + else + return (0); + + if (dump_opt['b'] < 5 && gethrtime() > zcb->zcb_lastprint + NANOSEC) { uint64_t now = gethrtime(); char buf[10]; uint64_t bytes = zcb->zcb_type[ZB_TOTAL][ZDB_OT_TOTAL].zb_asize; @@ -2494,6 +2502,14 @@ zdb_leak_init(spa_t *spa, zdb_cb_t *zcb) (longlong_t)vd->vdev_ms_count); msp->ms_ops = &zdb_metaslab_ops; + + /* + * We don't want to spend the CPU + * manipulating the size-ordered + * tree, so clear the range_tree + * ops. + */ + msp->ms_tree->rt_ops = NULL; VERIFY0(space_map_load(msp->ms_sm, msp->ms_tree, SM_ALLOC)); msp->ms_loaded = B_TRUE; @@ -3508,6 +3524,13 @@ main(int argc, char **argv) */ zfs_arc_max = zfs_arc_meta_limit = 256 * 1024 * 1024; + /* + * "zdb -c" uses checksum-verifying scrub i/os which are async reads. + * "zdb -b" uses traversal prefetch which uses async reads. + * For good performance, let several of them be active at once. + */ + zfs_vdev_async_read_max_active = 10; + kernel_init(FREAD); g_zfs = libzfs_init(); ASSERT(g_zfs != NULL); Modified: projects/routing/contrib/llvm/lib/MC/MCParser/AsmParser.cpp ============================================================================== --- projects/routing/contrib/llvm/lib/MC/MCParser/AsmParser.cpp Sat Nov 8 16:52:07 2014 (r274297) +++ projects/routing/contrib/llvm/lib/MC/MCParser/AsmParser.cpp Sat Nov 8 18:13:35 2014 (r274298) @@ -1695,7 +1695,7 @@ bool AsmParser::expandMacro(raw_svector_ const MCAsmMacroParameters &Parameters, const MCAsmMacroArguments &A, const SMLoc &L) { unsigned NParameters = Parameters.size(); - if (NParameters != 0 && NParameters != A.size()) + if ((!IsDarwin || NParameters != 0) && NParameters != A.size()) return Error(L, "Wrong number of arguments"); // A macro without parameters is handled differently on Darwin: @@ -1705,7 +1705,7 @@ bool AsmParser::expandMacro(raw_svector_ std::size_t End = Body.size(), Pos = 0; for (; Pos != End; ++Pos) { // Check for a substitution or escape. - if (!NParameters) { + if (IsDarwin && !NParameters) { // This macro has no parameters, look for $0, $1, etc. if (Body[Pos] != '$' || Pos + 1 == End) continue; @@ -1728,7 +1728,7 @@ bool AsmParser::expandMacro(raw_svector_ if (Pos == End) break; - if (!NParameters) { + if (IsDarwin && !NParameters) { switch (Body[Pos + 1]) { // $$ => $ case '$': Copied: projects/routing/contrib/llvm/patches/patch-r274286-llvm-r201784-asm-dollar.diff (from r274297, head/contrib/llvm/patches/patch-r274286-llvm-r201784-asm-dollar.diff) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/routing/contrib/llvm/patches/patch-r274286-llvm-r201784-asm-dollar.diff Sat Nov 8 18:13:35 2014 (r274298, copy of r274297, head/contrib/llvm/patches/patch-r274286-llvm-r201784-asm-dollar.diff) @@ -0,0 +1,55 @@ +Pull in r201784 from upstream llvm trunk (by Benjamin Kramer): + + AsmParser: Disable Darwin-style macro argument expansion on non-darwin targets. + + There is code in the wild that relies on $0 not being expanded. + +This fixes some cases of using $ signs in literals being incorrectly +assembled. + +Reported by: Richard Henderson +Upstream PR: http://llvm.org/PR21500 + +Introduced here: http://svnweb.freebsd.org/changeset/base/274286 + +Index: lib/MC/MCParser/AsmParser.cpp +=================================================================== +--- lib/MC/MCParser/AsmParser.cpp ++++ lib/MC/MCParser/AsmParser.cpp +@@ -1695,7 +1695,7 @@ bool AsmParser::expandMacro(raw_svector_ostream &O + const MCAsmMacroParameters &Parameters, + const MCAsmMacroArguments &A, const SMLoc &L) { + unsigned NParameters = Parameters.size(); +- if (NParameters != 0 && NParameters != A.size()) ++ if ((!IsDarwin || NParameters != 0) && NParameters != A.size()) + return Error(L, "Wrong number of arguments"); + + // A macro without parameters is handled differently on Darwin: +@@ -1705,7 +1705,7 @@ bool AsmParser::expandMacro(raw_svector_ostream &O + std::size_t End = Body.size(), Pos = 0; + for (; Pos != End; ++Pos) { + // Check for a substitution or escape. +- if (!NParameters) { ++ if (IsDarwin && !NParameters) { + // This macro has no parameters, look for $0, $1, etc. + if (Body[Pos] != '$' || Pos + 1 == End) + continue; +@@ -1728,7 +1728,7 @@ bool AsmParser::expandMacro(raw_svector_ostream &O + if (Pos == End) + break; + +- if (!NParameters) { ++ if (IsDarwin && !NParameters) { + switch (Body[Pos + 1]) { + // $$ => $ + case '$': +Index: test/MC/AsmParser/exprs.s +=================================================================== +--- test/MC/AsmParser/exprs.s ++++ test/MC/AsmParser/exprs.s +@@ -1,4 +1,4 @@ +-// RUN: llvm-mc -triple i386-unknown-unknown %s > %t ++// RUN: llvm-mc -triple i386-apple-darwin %s + + .macro check_expr + .if ($0) != ($1) Modified: projects/routing/contrib/netbsd-tests/lib/libc/sys/t_getcontext.c ============================================================================== --- projects/routing/contrib/netbsd-tests/lib/libc/sys/t_getcontext.c Sat Nov 8 16:52:07 2014 (r274297) +++ projects/routing/contrib/netbsd-tests/lib/libc/sys/t_getcontext.c Sat Nov 8 18:13:35 2014 (r274298) @@ -101,6 +101,13 @@ ATF_TC_BODY(setcontext_link, tc) ucontext_t save; volatile int i = 0; /* avoid longjmp clobbering */ +#ifdef __FreeBSD__ +#ifdef __amd64__ + atf_tc_expect_fail("setcontext in this testcase fails on " + "FreeBSD/amd64 with rc == -1/errno == EINVAL; see PR # 194828"); +#endif +#endif + for (i = 0; i < DEPTH; ++i) { ATF_REQUIRE_EQ(getcontext(&uc[i]), 0); @@ -114,8 +121,15 @@ ATF_TC_BODY(setcontext_link, tc) ATF_REQUIRE_EQ(getcontext(&save), 0); +#ifdef __FreeBSD__ + if (calls == 0) { + int rc = setcontext(&uc[DEPTH-1]); + ATF_REQUIRE_EQ_MSG(rc, 0, "%d != 0; (errno = %d)", rc, errno); + } +#else if (calls == 0) ATF_REQUIRE_EQ(setcontext(&uc[DEPTH-1]), 0); +#endif } ATF_TP_ADD_TCS(tp) Modified: projects/routing/contrib/netbsd-tests/lib/libc/sys/t_mincore.c ============================================================================== --- projects/routing/contrib/netbsd-tests/lib/libc/sys/t_mincore.c Sat Nov 8 16:52:07 2014 (r274297) +++ projects/routing/contrib/netbsd-tests/lib/libc/sys/t_mincore.c Sat Nov 8 18:13:35 2014 (r274298) @@ -206,9 +206,6 @@ ATF_TC_BODY(mincore_resid, tc) "might be low on memory"); #ifdef __FreeBSD__ - atf_tc_expect_fail("the following calls fail; this seems to be a new " - "issue (didn't occur in 07/2014)"); - ATF_REQUIRE(mlock(addr, npgs * page) == 0); #endif ATF_REQUIRE(check_residency(addr, npgs) == npgs); Modified: projects/routing/contrib/openpam/t/t_openpam_ctype.c ============================================================================== --- projects/routing/contrib/openpam/t/t_openpam_ctype.c Sat Nov 8 16:52:07 2014 (r274297) +++ projects/routing/contrib/openpam/t/t_openpam_ctype.c Sat Nov 8 18:13:35 2014 (r274298) @@ -94,7 +94,7 @@ T_OC(pfcs) * Boilerplate */ -const struct t_test *t_plan[] = { +static const struct t_test *t_plan[] = { T(t_oc_digit), T(t_oc_xdigit), T(t_oc_upper), Modified: projects/routing/contrib/openpam/t/t_openpam_readlinev.c ============================================================================== --- projects/routing/contrib/openpam/t/t_openpam_readlinev.c Sat Nov 8 16:52:07 2014 (r274297) +++ projects/routing/contrib/openpam/t/t_openpam_readlinev.c Sat Nov 8 18:13:35 2014 (r274298) @@ -255,7 +255,7 @@ T_FUNC(unterminated_line, "unterminated * Boilerplate */ -const struct t_test *t_plan[] = { +static const struct t_test *t_plan[] = { T(empty_input), T(empty_line), T(unterminated_empty_line), Modified: projects/routing/contrib/openpam/t/t_openpam_readword.c ============================================================================== --- projects/routing/contrib/openpam/t/t_openpam_readword.c Sat Nov 8 16:52:07 2014 (r274297) +++ projects/routing/contrib/openpam/t/t_openpam_readword.c Sat Nov 8 18:13:35 2014 (r274298) @@ -823,7 +823,7 @@ T_FUNC(escaped_double_quote_within_doubl * Boilerplate */ -const struct t_test *t_plan[] = { +static const struct t_test *t_plan[] = { T(empty_input), T(empty_line), T(single_whitespace), Modified: projects/routing/contrib/tnftp/src/fetch.c ============================================================================== --- projects/routing/contrib/tnftp/src/fetch.c Sat Nov 8 16:52:07 2014 (r274297) +++ projects/routing/contrib/tnftp/src/fetch.c Sat Nov 8 18:13:35 2014 (r274298) @@ -547,7 +547,7 @@ fetch_url(const char *url, const char *p url_decode(decodedpath); if (outfile) - savefile = ftp_strdup(outfile); + savefile = outfile; else { cp = strrchr(decodedpath, '/'); /* find savefile */ if (cp != NULL) @@ -571,8 +571,7 @@ fetch_url(const char *url, const char *p rangestart = rangeend = entitylen = -1; mtime = -1; if (restartautofetch) { - if (strcmp(savefile, "-") != 0 && *savefile != '|' && - stat(savefile, &sb) == 0) + if (stat(savefile, &sb) == 0) restart_point = sb.st_size; } if (urltype == FILE_URL_T) { /* file:// URLs */ @@ -1098,17 +1097,25 @@ fetch_url(const char *url, const char *p } /* end of ftp:// or http:// specific setup */ /* Open the output file. */ - if (strcmp(savefile, "-") == 0) { - fout = stdout; - } else if (*savefile == '|') { - oldintp = xsignal(SIGPIPE, SIG_IGN); - fout = popen(savefile + 1, "w"); - if (fout == NULL) { - warn("Can't execute `%s'", savefile + 1); - goto cleanup_fetch_url; + + /* + * Only trust filenames with special meaning if they came from + * the command line + */ + if (outfile == savefile) { + if (strcmp(savefile, "-") == 0) { + fout = stdout; + } else if (*savefile == '|') { + oldintp = xsignal(SIGPIPE, SIG_IGN); + fout = popen(savefile + 1, "w"); + if (fout == NULL) { + warn("Can't execute `%s'", savefile + 1); + goto cleanup_fetch_url; + } + closefunc = pclose; } - closefunc = pclose; - } else { + } + if (fout == NULL) { if ((rangeend != -1 && rangeend <= restart_point) || (rangestart == -1 && filesize != -1 && filesize <= restart_point)) { /* already done */ @@ -1318,7 +1325,8 @@ fetch_url(const char *url, const char *p (*closefunc)(fout); if (res0) freeaddrinfo(res0); - FREEPTR(savefile); + if (savefile != outfile) + FREEPTR(savefile); FREEPTR(uuser); if (pass != NULL) memset(pass, 0, strlen(pass)); Modified: projects/routing/etc/mtree/BSD.tests.dist ============================================================================== --- projects/routing/etc/mtree/BSD.tests.dist Sat Nov 8 16:52:07 2014 (r274297) +++ projects/routing/etc/mtree/BSD.tests.dist Sat Nov 8 18:13:35 2014 (r274298) @@ -145,6 +145,8 @@ .. libnv .. + libpam + .. libproc .. libutil Modified: projects/routing/etc/periodic/security/Makefile ============================================================================== --- projects/routing/etc/periodic/security/Makefile Sat Nov 8 16:52:07 2014 (r274297) +++ projects/routing/etc/periodic/security/Makefile Sat Nov 8 18:13:35 2014 (r274298) @@ -2,6 +2,8 @@ .include +FILESGROUPS= FILES DATA + FILES= 100.chksetuid \ 110.neggrpperm \ 200.chkmounts \ @@ -10,8 +12,8 @@ FILES= 100.chksetuid \ 410.logincheck \ 700.kernelmsg \ 800.loginfail \ - 900.tcpwrap \ - security.functions + 900.tcpwrap +DATA= security.functions # NB: keep these sorted by MK_* knobs Modified: projects/routing/etc/rc.d/growfs ============================================================================== --- projects/routing/etc/rc.d/growfs Sat Nov 8 16:52:07 2014 (r274297) +++ projects/routing/etc/rc.d/growfs Sat Nov 8 18:13:35 2014 (r274298) @@ -35,9 +35,7 @@ # and have it work on essentially any size drive. # # TODO: Figure out where this should really be ordered. -# I suspect it should go just after fsck but before mountcritlocal -# but it's hard to tell for sure because of the bug described -# below. +# I suspect it should go just after fsck but before mountcritlocal. # . /etc/rc.subr Modified: projects/routing/gnu/lib/libdialog/Makefile ============================================================================== --- projects/routing/gnu/lib/libdialog/Makefile Sat Nov 8 16:52:07 2014 (r274297) +++ projects/routing/gnu/lib/libdialog/Makefile Sat Nov 8 18:13:35 2014 (r274298) @@ -13,6 +13,9 @@ SRCS= argv.c arrows.c buildlist.c butto INCS= dialog.h dlg_colors.h dlg_config.h dlg_keys.h MAN= dialog.3 +DPADD= ${LIBNCURSESW} ${LIBM} +LDADD= -lncursesw -lm + CFLAGS+= -I${.CURDIR} -I${DIALOG} -D_XOPEN_SOURCE_EXTENDED -DGCC_UNUSED=__unused .PATH: ${DIALOG} WARNS?= 1 Modified: projects/routing/lib/Makefile ============================================================================== --- projects/routing/lib/Makefile Sat Nov 8 16:52:07 2014 (r274297) +++ projects/routing/lib/Makefile Sat Nov 8 18:13:35 2014 (r274298) @@ -42,12 +42,14 @@ SUBDIR= ${SUBDIR_ORDERED} \ libcrypt \ libdevinfo \ libdevstat \ + libdpv \ libdwarf \ libedit \ ${_libevent} \ libexecinfo \ libexpat \ libfetch \ + libfigpar \ libgeom \ ${_libgpib} \ ${_libgssapi} \ @@ -129,7 +131,7 @@ SUBDIR_DEPEND_libcam= libsbuf SUBDIR_DEPEND_libcapsicum= libnv SUBDIR_DEPEND_libcasper= libcapsicum libnv libpjdlog SUBDIR_DEPEND_libdevstat= libkvm -SUBDIR_DEPEND_libdiaglog= ncurses +SUBDIR_DEPEND_libdpv= libfigpar ncurses libutil SUBDIR_DEPEND_libedit= ncurses SUBDIR_DEPEND_libg++= msun SUBDIR_DEPEND_libgeom= libexpat libsbuf Modified: projects/routing/lib/libpam/libpam/Makefile ============================================================================== --- projects/routing/lib/libpam/libpam/Makefile Sat Nov 8 16:52:07 2014 (r274297) +++ projects/routing/lib/libpam/libpam/Makefile Sat Nov 8 18:13:35 2014 (r274298) @@ -199,4 +199,8 @@ DPSRCS= openpam_static.c INCS= ${HEADERS} ${ADD_HEADERS} INCSDIR= ${INCLUDEDIR}/security +.if ${MK_TESTS} != "no" +SUBDIR+= tests +.endif + .include Modified: projects/routing/rescue/rescue/Makefile ============================================================================== --- projects/routing/rescue/rescue/Makefile Sat Nov 8 16:52:07 2014 (r274297) +++ projects/routing/rescue/rescue/Makefile Sat Nov 8 18:13:35 2014 (r274298) @@ -52,7 +52,7 @@ CRUNCH_SRCDIRS+= bin CRUNCH_PROGS_bin= cat chflags chio chmod cp date dd df echo \ ed expr getfacl hostname kenv kill ln ls mkdir mv \ pkill ps pwd realpath rm rmdir setfacl sh stty sync test -CRUNCH_LIBS+= -lcrypt -ledit -ljail -lkvm -ll -ltermcapw -lutil +CRUNCH_LIBS+= -lcrypt -ledit -ljail -lkvm -ll -ltermcapw -lutil -lxo CRUNCH_BUILDTOOLS+= bin/sh # Additional options for specific programs Modified: projects/routing/sbin/fsirand/Makefile ============================================================================== --- projects/routing/sbin/fsirand/Makefile Sat Nov 8 16:52:07 2014 (r274297) +++ projects/routing/sbin/fsirand/Makefile Sat Nov 8 18:13:35 2014 (r274298) @@ -4,7 +4,5 @@ PROG= fsirand MAN= fsirand.8 WARNS?= 3 -DPADD= ${LIBUTIL} -LDADD= -lutil .include Modified: projects/routing/sbin/ifconfig/ifgre.c ============================================================================== --- projects/routing/sbin/ifconfig/ifgre.c Sat Nov 8 16:52:07 2014 (r274297) +++ projects/routing/sbin/ifconfig/ifgre.c Sat Nov 8 18:13:35 2014 (r274298) @@ -23,52 +23,50 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif +#include +__FBSDID("$FreeBSD$"); #include #include #include #include - -#include -#include - -#include #include #include -#include #include +#include #include -#include #include -#include +#include #include -#include #include "ifconfig.h" +#define GREBITS "\020\01ENABLE_CSUM\02ENABLE_SEQ" + static void gre_status(int s); static void gre_status(int s) { - int grekey = 0; + uint32_t opts = 0; - ifr.ifr_data = (caddr_t)&grekey; + ifr.ifr_data = (caddr_t)&opts; if (ioctl(s, GREGKEY, &ifr) == 0) - if (grekey != 0) - printf("\tgrekey: %d\n", grekey); + if (opts != 0) + printf("\tgrekey: 0x%x (%u)\n", opts, opts); + opts = 0; + if (ioctl(s, GREGOPTS, &ifr) != 0 || opts == 0) + return; + printb("\toptions", opts, GREBITS); + putchar('\n'); } static void setifgrekey(const char *val, int dummy __unused, int s, const struct afswtch *afp) { - uint32_t grekey = atol(val); + uint32_t grekey = strtol(val, NULL, 0); strncpy(ifr.ifr_name, name, sizeof (ifr.ifr_name)); ifr.ifr_data = (caddr_t)&grekey; @@ -76,8 +74,35 @@ setifgrekey(const char *val, int dummy _ warn("ioctl (set grekey)"); } +static void +setifgreopts(const char *val, int d, int s, const struct afswtch *afp) +{ + uint32_t opts; + + ifr.ifr_data = (caddr_t)&opts; + if (ioctl(s, GREGOPTS, &ifr) == -1) { + warn("ioctl(GREGOPTS)"); + return; + } + + if (d < 0) + opts &= ~(-d); + else + opts |= d; + + if (ioctl(s, GRESOPTS, &ifr) == -1) { + warn("ioctl(GIFSOPTS)"); + return; + } +} + + static struct cmd gre_cmds[] = { DEF_CMD_ARG("grekey", setifgrekey), + DEF_CMD("enable_csum", GRE_ENABLE_CSUM, setifgreopts), + DEF_CMD("-enable_csum",-GRE_ENABLE_CSUM,setifgreopts), + DEF_CMD("enable_seq", GRE_ENABLE_SEQ, setifgreopts), + DEF_CMD("-enable_seq",-GRE_ENABLE_SEQ, setifgreopts), }; static struct afswtch af_gre = { .af_name = "af_gre", Modified: projects/routing/share/man/man4/Makefile ============================================================================== --- projects/routing/share/man/man4/Makefile Sat Nov 8 16:52:07 2014 (r274297) +++ projects/routing/share/man/man4/Makefile Sat Nov 8 18:13:35 2014 (r274298) @@ -252,6 +252,7 @@ MAN= aac.4 \ malo.4 \ mcd.4 \ md.4 \ + me.4 \ mem.4 \ meteor.4 \ mfi.4 \ Modified: projects/routing/share/man/man4/gre.4 ============================================================================== --- projects/routing/share/man/man4/gre.4 Sat Nov 8 16:52:07 2014 (r274297) +++ projects/routing/share/man/man4/gre.4 Sat Nov 8 18:13:35 2014 (r274298) @@ -29,7 +29,7 @@ .\" .\" $FreeBSD$ .\" -.Dd June 20, 2008 +.Dd November 7, 2014 .Dt GRE 4 .Os .Sh NAME @@ -68,162 +68,30 @@ and .Cm destroy subcommands. .Pp -This driver currently supports the following modes of operation: -.Bl -tag -width indent -.It "GRE encapsulation (IP protocol number 47)" -Encapsulated datagrams are -prepended an outer datagram and a GRE header. +This driver corresponds to RFC 2784. +Encapsulated datagrams are prepended an outer datagram and a GRE header. The GRE header specifies the type of the encapsulated datagram and thus allows for tunneling other protocols than IP. GRE mode is also the default tunnel mode on Cisco routers. -This is also the default mode of operation of the -.Nm -interfaces. -As part of the GRE mode, .Nm also supports Cisco WCCP protocol, both version 1 and version 2. -Since there is no reliable way to distinguish between WCCP versions, it -should be configured manually using the -.Cm link2 -flag. -If the -.Cm link2 -flag is not set (default), then WCCP version 1 is selected. -.It "MOBILE encapsulation (IP protocol number 55)" -Datagrams are *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***