From owner-p4-projects@FreeBSD.ORG Sun Jun 15 07:29:30 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1D8441065671; Sun, 15 Jun 2008 07:29:30 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D3868106567F for ; Sun, 15 Jun 2008 07:29:29 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C37C78FC0C for ; Sun, 15 Jun 2008 07:29:29 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5F7TTrU062316 for ; Sun, 15 Jun 2008 07:29:29 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5F7TTkl062314 for perforce@freebsd.org; Sun, 15 Jun 2008 07:29:29 GMT (envelope-from julian@freebsd.org) Date: Sun, 15 Jun 2008 07:29:29 GMT Message-Id: <200806150729.m5F7TTkl062314@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 143485 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Jun 2008 07:29:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=143485 Change 143485 by julian@julian_trafmon1 on 2008/06/15 07:28:35 Files that need to include vimage.h Affected files ... .. //depot/projects/vimage-commit2/src/sys/arm/arm/genassym.c#2 edit .. //depot/projects/vimage-commit2/src/sys/security/mac/mac_inet.c#4 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/arm/arm/genassym.c#2 (text+ko) ==== @@ -32,6 +32,7 @@ #include #include #include +#include #include #include #include ==== //depot/projects/vimage-commit2/src/sys/security/mac/mac_inet.c#4 (text+ko) ==== @@ -57,6 +57,7 @@ #include #include #include +#include #include #include From owner-p4-projects@FreeBSD.ORG Sun Jun 15 07:40:47 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 45B1B1065676; Sun, 15 Jun 2008 07:40:47 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 05E94106564A for ; Sun, 15 Jun 2008 07:40:47 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E89608FC15 for ; Sun, 15 Jun 2008 07:40:46 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5F7ejUl063313 for ; Sun, 15 Jun 2008 07:40:45 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5F7eegY063308 for perforce@freebsd.org; Sun, 15 Jun 2008 07:40:40 GMT (envelope-from julian@freebsd.org) Date: Sun, 15 Jun 2008 07:40:40 GMT Message-Id: <200806150740.m5F7eegY063308@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 143486 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Jun 2008 07:40:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=143486 Change 143486 by julian@julian_trafmon1 on 2008/06/15 07:39:48 Merge in new sctp code Affected files ... .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/pmap.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/arm/xscale/i8134x/i81342_pci.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/conf/files#3 integrate .. //depot/projects/vimage-commit2/src/sys/conf/files.i386#2 integrate .. //depot/projects/vimage-commit2/src/sys/conf/files.pc98#2 integrate .. //depot/projects/vimage-commit2/src/sys/conf/options.i386#2 integrate .. //depot/projects/vimage-commit2/src/sys/conf/options.pc98#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/bce/if_bce.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/bce/if_bcefw.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/bce/if_bcereg.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ex/if_ex.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ex/if_ex_isa.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ex/if_ex_pccard.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ex/if_exvar.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/mii/brgphy.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/smc/if_smc.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/smc/if_smcvar.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/if_rum.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usbdevs#2 integrate .. //depot/projects/vimage-commit2/src/sys/geom/part/g_part_apm.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/geom/part/g_part_bsd.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/geom/part/g_part_gpt.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/geom/part/g_part_mbr.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/geom/part/g_part_pc98.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/geom/part/g_part_vtoc8.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/conf/NOTES#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/include/pecoff_machdep.h#2 delete .. //depot/projects/vimage-commit2/src/sys/kern/kern_conf.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/modules/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_asconf.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_auth.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_bsd_addr.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_bsd_addr.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_cc_functions.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_header.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_indata.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_input.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_lock_bsd.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_os_bsd.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_output.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_pcb.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_pcb.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_peeloff.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_sysctl.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_sysctl.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_timer.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_uio.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_usrreq.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_var.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctputil.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/sctp6_usrreq.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/pc98/conf/NOTES#2 integrate .. //depot/projects/vimage-commit2/src/sys/pc98/include/pecoff_machdep.h#2 delete .. //depot/projects/vimage-commit2/src/sys/powerpc/powermac/grackle.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/powermac/macio.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/powermac/uninorth.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac/mac_framework.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac/mac_inet.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac/mac_policy.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac_biba/mac_biba.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac_lomac/mac_lomac.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac_mls/mac_mls.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac_stub/mac_stub.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac_test/mac_test.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/sys/apm.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sys/conf.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/sys/ioctl.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sys/ioctl_compat.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sys/param.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sys/systm.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sys/ttychars.h#2 delete .. //depot/projects/vimage-commit2/src/sys/sys/ttydev.h#2 delete .. //depot/projects/vimage-commit2/src/sys/vm/vnode_pager.c#2 integrate Differences ... ==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/pmap.c#2 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.619 2008/06/01 07:36:59 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.621 2008/06/13 19:33:56 alc Exp $"); /* * Manages physical address maps. @@ -2759,8 +2759,8 @@ /* * Tries to promote the 512, contiguous 4KB page mappings that are within a - * single page table page to a single 2MB page mapping. For promotion to - * occur, two conditions must be met: (1) the 4KB page mappings must map + * single page table page (PTP) to a single 2MB page mapping. For promotion + * to occur, two conditions must be met: (1) the 4KB page mappings must map * aligned, contiguous physical memory and (2) the 4KB page mappings must have * identical characteristics. */ @@ -2768,31 +2768,46 @@ pmap_promote_pde(pmap_t pmap, pd_entry_t *pde, vm_offset_t va) { pd_entry_t newpde; - pt_entry_t *firstpte, oldpte, *pte; + pt_entry_t *firstpte, oldpte, pa, *pte; vm_offset_t oldpteva; - vm_paddr_t pa; vm_page_t mpte; PMAP_LOCK_ASSERT(pmap, MA_OWNED); + + /* + * Examine the first PTE in the specified PTP. Abort if this PTE is + * either invalid, unused, or does not map the first 4KB physical page + * within a 2MB page. + */ firstpte = (pt_entry_t *)PHYS_TO_DMAP(*pde & PG_FRAME); +setpde: newpde = *firstpte; - if ((newpde & (PG_A | PG_V)) != (PG_A | PG_V)) { + if ((newpde & ((PG_FRAME & PDRMASK) | PG_A | PG_V)) != (PG_A | PG_V)) { pmap_pde_p_failures++; CTR2(KTR_PMAP, "pmap_promote_pde: failure for va %#lx" " in pmap %p", va, pmap); return; } - if ((newpde & (PG_M | PG_RW)) == PG_RW) + if ((newpde & (PG_M | PG_RW)) == PG_RW) { + /* + * When PG_M is already clear, PG_RW can be cleared without + * a TLB invalidation. + */ + if (!atomic_cmpset_long(firstpte, newpde, newpde & ~PG_RW)) + goto setpde; newpde &= ~PG_RW; + } - /* - * Check all the ptes before promotion + /* + * Examine each of the other PTEs in the specified PTP. Abort if this + * PTE maps an unexpected 4KB physical page or does not have identical + * characteristics to the first PTE. */ - pa = newpde & PG_PS_FRAME; - for (pte = firstpte; pte < firstpte + NPTEPG; pte++) { -retry: + pa = (newpde & (PG_PS_FRAME | PG_A | PG_V)) + NBPDR - PAGE_SIZE; + for (pte = firstpte + NPTEPG - 1; pte > firstpte; pte--) { +setpte: oldpte = *pte; - if ((oldpte & PG_FRAME) != pa) { + if ((oldpte & (PG_FRAME | PG_A | PG_V)) != pa) { pmap_pde_p_failures++; CTR2(KTR_PMAP, "pmap_promote_pde: failure for va %#lx" " in pmap %p", va, pmap); @@ -2804,7 +2819,7 @@ * without a TLB invalidation. */ if (!atomic_cmpset_long(pte, oldpte, oldpte & ~PG_RW)) - goto retry; + goto setpte; oldpte &= ~PG_RW; oldpteva = (oldpte & PG_FRAME & PDRMASK) | (va & ~PDRMASK); @@ -2817,7 +2832,7 @@ " in pmap %p", va, pmap); return; } - pa += PAGE_SIZE; + pa -= PAGE_SIZE; } /* ==== //depot/projects/vimage-commit2/src/sys/arm/xscale/i8134x/i81342_pci.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/i8134x/i81342_pci.c,v 1.2 2007/09/30 11:05:14 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/i8134x/i81342_pci.c,v 1.3 2008/06/12 01:46:06 kevlo Exp $"); #include #include @@ -185,7 +185,7 @@ IOP34X_PCIE_OIOBAR_VADDR, (sc->sc_is_atux ? IOP34X_PCIX_OIOBAR_VADDR : IOP34X_PCIE_OIOBAR_VADDR) + IOP34X_OIOBAR_SIZE) != 0) { - panic("i80321_pci_probe: failed to set up I/O rman"); + panic("i81342_pci_probe: failed to set up I/O rman"); } sc->sc_mem_rman.rm_type = RMAN_ARRAY; sc->sc_mem_rman.rm_descr = "I81342 PCI Memory"; ==== //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#2 (text+ko) ==== @@ -279,12 +279,6 @@ #ifndef MAXMIN64 #define MAXMIN64 0xffffffffUL #endif -#ifndef major -#define major(x) ((int)(((u_int)(x) >> 8)&0xff)) /* major number */ -#endif -#ifndef minor -#define minor(x) ((int)((x)&0xffff00ff)) /* minor number */ -#endif /* * Create special expldev for ZFS private use. @@ -297,7 +291,7 @@ static uint64_t zfs_expldev(dev_t dev) { - return (((uint64_t)major(dev) << NBITSMINOR64) | minor(dev)); + return (((uint64_t)umajor(dev) << NBITSMINOR64) | uminor(dev)); } /* * Special cmpldev for ZFS private use. ==== //depot/projects/vimage-commit2/src/sys/conf/files#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1308 2008/06/11 22:10:10 jfv Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1309 2008/06/14 15:17:02 rwatson Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1817,7 +1817,7 @@ netatalk/aarp.c optional netatalk netatalk/at_control.c optional netatalk netatalk/at_proto.c optional netatalk -netatalk/at_rmx.c optional netatalkdebug +netatalk/at_rmx.c optional netatalk netatalk/ddp_input.c optional netatalk netatalk/ddp_output.c optional netatalk netatalk/ddp_pcb.c optional netatalk ==== //depot/projects/vimage-commit2/src/sys/conf/files.i386#2 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.i386,v 1.596 2008/05/26 10:39:52 bz Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.597 2008/06/14 12:51:44 wkoszek Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -107,7 +107,6 @@ compat/ndis/subr_pe.c optional ndisapi pci compat/ndis/subr_usbd.c optional ndisapi pci compat/ndis/winx32_wrap.S optional ndisapi pci -compat/pecoff/imgact_pecoff.c optional pecoff_support compat/svr4/imgact_svr4.c optional compat_svr4 compat/svr4/svr4_fcntl.c optional compat_svr4 compat/svr4/svr4_filio.c optional compat_svr4 ==== //depot/projects/vimage-commit2/src/sys/conf/files.pc98#2 (text+ko) ==== @@ -3,7 +3,7 @@ # # modified for PC-9801/PC-9821 # -# $FreeBSD: src/sys/conf/files.pc98,v 1.363 2008/05/26 10:39:52 bz Exp $ +# $FreeBSD: src/sys/conf/files.pc98,v 1.364 2008/06/14 12:51:44 wkoszek Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -70,7 +70,6 @@ compat/linux/linux_time.c optional compat_linux compat/linux/linux_uid16.c optional compat_linux compat/linux/linux_util.c optional compat_linux -compat/pecoff/imgact_pecoff.c optional pecoff_support compat/svr4/imgact_svr4.c optional compat_svr4 compat/svr4/svr4_fcntl.c optional compat_svr4 compat/svr4/svr4_filio.c optional compat_svr4 ==== //depot/projects/vimage-commit2/src/sys/conf/options.i386#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options.i386,v 1.241 2008/05/26 10:39:52 bz Exp $ +# $FreeBSD: src/sys/conf/options.i386,v 1.242 2008/06/14 12:51:44 wkoszek Exp $ # Options specific to the i386 platform kernels AUTO_EOI_1 opt_auto_eoi.h @@ -27,8 +27,6 @@ LINPROCFS opt_dontuse.h LINSYSFS opt_dontuse.h NDISAPI opt_dontuse.h -PECOFF_DEBUG opt_pecoff.h -PECOFF_SUPPORT opt_dontuse.h # Change KVM size. Changes things all over the kernel. KVA_PAGES opt_global.h ==== //depot/projects/vimage-commit2/src/sys/conf/options.pc98#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options.pc98,v 1.203 2008/05/26 10:39:52 bz Exp $ +# $FreeBSD: src/sys/conf/options.pc98,v 1.204 2008/06/14 12:51:44 wkoszek Exp $ # Options specific to the pc98 platform kernels AUTO_EOI_1 opt_auto_eoi.h @@ -25,8 +25,6 @@ DEBUG_SVR4 opt_svr4.h LINPROCFS opt_dontuse.h LINSYSFS opt_dontuse.h -PECOFF_DEBUG opt_pecoff.h -PECOFF_SUPPORT opt_dontuse.h # Change KVM size. Changes things all over the kernel. KVA_PAGES opt_global.h ==== //depot/projects/vimage-commit2/src/sys/dev/bce/if_bce.c#2 (text) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/bce/if_bce.c,v 1.41 2008/06/10 02:19:11 davidch Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bce/if_bce.c,v 1.42 2008/06/13 01:16:37 davidch Exp $"); /* * The following controllers are supported by this driver: @@ -37,12 +37,16 @@ * BCM5706S A2, A3 * BCM5708C B1, B2 * BCM5708S B1, B2 + * BCM5709C A1, C0 + * BCM5716 C0 * * The following controllers are not supported by this driver: * BCM5706C A0, A1 (pre-production) * BCM5706S A0, A1 (pre-production) * BCM5708C A0, B0 (pre-production) * BCM5708S A0, B0 (pre-production) + * BCM5709C A0 B0, B1, B2 (pre-production) + * BCM5709S A0, A1, B0, B1, B2, C0 (pre-production) */ #include "opt_bce.h" @@ -85,8 +89,9 @@ /****************************************************************************/ /* BCE Build Time Options */ /****************************************************************************/ -#define BCE_USE_SPLIT_HEADER 1 +#define BCE_USE_SPLIT_HEADER 1 /* #define BCE_NVRAM_WRITE_SUPPORT 1 */ + /****************************************************************************/ /* PCI Device ID Table */ @@ -117,6 +122,19 @@ /* BCM5708S controllers and OEM boards. */ { BRCM_VENDORID, BRCM_DEVICEID_BCM5708S, PCI_ANY_ID, PCI_ANY_ID, "Broadcom NetXtreme II BCM5708 1000Base-SX" }, + + /* BCM5709C controllers and OEM boards. */ + { BRCM_VENDORID, BRCM_DEVICEID_BCM5709, PCI_ANY_ID, PCI_ANY_ID, + "Broadcom NetXtreme II BCM5709 1000Base-T" }, + + /* BCM5709S controllers and OEM boards. */ + { BRCM_VENDORID, BRCM_DEVICEID_BCM5709S, PCI_ANY_ID, PCI_ANY_ID, + "Broadcom NetXtreme II BCM5709 1000Base-SX" }, + + /* BCM5716 controllers and OEM boards. */ + { BRCM_VENDORID, BRCM_DEVICEID_BCM5716, PCI_ANY_ID, PCI_ANY_ID, + "Broadcom NetXtreme II BCM5716 1000Base-T" }, + { 0, 0, 0, 0, NULL } }; @@ -126,91 +144,110 @@ /****************************************************************************/ static struct flash_spec flash_table[] = { +#define BUFFERED_FLAGS (BCE_NV_BUFFERED | BCE_NV_TRANSLATE) +#define NONBUFFERED_FLAGS (BCE_NV_WREN) + /* Slow EEPROM */ {0x00000000, 0x40830380, 0x009f0081, 0xa184a053, 0xaf000400, - 1, SEEPROM_PAGE_BITS, SEEPROM_PAGE_SIZE, + BUFFERED_FLAGS, SEEPROM_PAGE_BITS, SEEPROM_PAGE_SIZE, SEEPROM_BYTE_ADDR_MASK, SEEPROM_TOTAL_SIZE, "EEPROM - slow"}, /* Expansion entry 0001 */ {0x08000002, 0x4b808201, 0x00050081, 0x03840253, 0xaf020406, - 0, SAIFUN_FLASH_PAGE_BITS, SAIFUN_FLASH_PAGE_SIZE, + NONBUFFERED_FLAGS, SAIFUN_FLASH_PAGE_BITS, SAIFUN_FLASH_PAGE_SIZE, SAIFUN_FLASH_BYTE_ADDR_MASK, 0, "Entry 0001"}, /* Saifun SA25F010 (non-buffered flash) */ /* strap, cfg1, & write1 need updates */ {0x04000001, 0x47808201, 0x00050081, 0x03840253, 0xaf020406, - 0, SAIFUN_FLASH_PAGE_BITS, SAIFUN_FLASH_PAGE_SIZE, + NONBUFFERED_FLAGS, SAIFUN_FLASH_PAGE_BITS, SAIFUN_FLASH_PAGE_SIZE, SAIFUN_FLASH_BYTE_ADDR_MASK, SAIFUN_FLASH_BASE_TOTAL_SIZE*2, "Non-buffered flash (128kB)"}, /* Saifun SA25F020 (non-buffered flash) */ /* strap, cfg1, & write1 need updates */ {0x0c000003, 0x4f808201, 0x00050081, 0x03840253, 0xaf020406, - 0, SAIFUN_FLASH_PAGE_BITS, SAIFUN_FLASH_PAGE_SIZE, + NONBUFFERED_FLAGS, SAIFUN_FLASH_PAGE_BITS, SAIFUN_FLASH_PAGE_SIZE, SAIFUN_FLASH_BYTE_ADDR_MASK, SAIFUN_FLASH_BASE_TOTAL_SIZE*4, "Non-buffered flash (256kB)"}, /* Expansion entry 0100 */ {0x11000000, 0x53808201, 0x00050081, 0x03840253, 0xaf020406, - 0, SAIFUN_FLASH_PAGE_BITS, SAIFUN_FLASH_PAGE_SIZE, + NONBUFFERED_FLAGS, SAIFUN_FLASH_PAGE_BITS, SAIFUN_FLASH_PAGE_SIZE, SAIFUN_FLASH_BYTE_ADDR_MASK, 0, "Entry 0100"}, /* Entry 0101: ST M45PE10 (non-buffered flash, TetonII B0) */ {0x19000002, 0x5b808201, 0x000500db, 0x03840253, 0xaf020406, - 0, ST_MICRO_FLASH_PAGE_BITS, ST_MICRO_FLASH_PAGE_SIZE, + NONBUFFERED_FLAGS, ST_MICRO_FLASH_PAGE_BITS, ST_MICRO_FLASH_PAGE_SIZE, ST_MICRO_FLASH_BYTE_ADDR_MASK, ST_MICRO_FLASH_BASE_TOTAL_SIZE*2, "Entry 0101: ST M45PE10 (128kB non-bufferred)"}, /* Entry 0110: ST M45PE20 (non-buffered flash)*/ {0x15000001, 0x57808201, 0x000500db, 0x03840253, 0xaf020406, - 0, ST_MICRO_FLASH_PAGE_BITS, ST_MICRO_FLASH_PAGE_SIZE, + NONBUFFERED_FLAGS, ST_MICRO_FLASH_PAGE_BITS, ST_MICRO_FLASH_PAGE_SIZE, ST_MICRO_FLASH_BYTE_ADDR_MASK, ST_MICRO_FLASH_BASE_TOTAL_SIZE*4, "Entry 0110: ST M45PE20 (256kB non-bufferred)"}, /* Saifun SA25F005 (non-buffered flash) */ /* strap, cfg1, & write1 need updates */ {0x1d000003, 0x5f808201, 0x00050081, 0x03840253, 0xaf020406, - 0, SAIFUN_FLASH_PAGE_BITS, SAIFUN_FLASH_PAGE_SIZE, + NONBUFFERED_FLAGS, SAIFUN_FLASH_PAGE_BITS, SAIFUN_FLASH_PAGE_SIZE, SAIFUN_FLASH_BYTE_ADDR_MASK, SAIFUN_FLASH_BASE_TOTAL_SIZE, "Non-buffered flash (64kB)"}, /* Fast EEPROM */ {0x22000000, 0x62808380, 0x009f0081, 0xa184a053, 0xaf000400, - 1, SEEPROM_PAGE_BITS, SEEPROM_PAGE_SIZE, + BUFFERED_FLAGS, SEEPROM_PAGE_BITS, SEEPROM_PAGE_SIZE, SEEPROM_BYTE_ADDR_MASK, SEEPROM_TOTAL_SIZE, "EEPROM - fast"}, /* Expansion entry 1001 */ {0x2a000002, 0x6b808201, 0x00050081, 0x03840253, 0xaf020406, - 0, SAIFUN_FLASH_PAGE_BITS, SAIFUN_FLASH_PAGE_SIZE, + NONBUFFERED_FLAGS, SAIFUN_FLASH_PAGE_BITS, SAIFUN_FLASH_PAGE_SIZE, SAIFUN_FLASH_BYTE_ADDR_MASK, 0, "Entry 1001"}, /* Expansion entry 1010 */ {0x26000001, 0x67808201, 0x00050081, 0x03840253, 0xaf020406, - 0, SAIFUN_FLASH_PAGE_BITS, SAIFUN_FLASH_PAGE_SIZE, + NONBUFFERED_FLAGS, SAIFUN_FLASH_PAGE_BITS, SAIFUN_FLASH_PAGE_SIZE, SAIFUN_FLASH_BYTE_ADDR_MASK, 0, "Entry 1010"}, /* ATMEL AT45DB011B (buffered flash) */ {0x2e000003, 0x6e808273, 0x00570081, 0x68848353, 0xaf000400, - 1, BUFFERED_FLASH_PAGE_BITS, BUFFERED_FLASH_PAGE_SIZE, + BUFFERED_FLAGS, BUFFERED_FLASH_PAGE_BITS, BUFFERED_FLASH_PAGE_SIZE, BUFFERED_FLASH_BYTE_ADDR_MASK, BUFFERED_FLASH_TOTAL_SIZE, "Buffered flash (128kB)"}, /* Expansion entry 1100 */ {0x33000000, 0x73808201, 0x00050081, 0x03840253, 0xaf020406, - 0, SAIFUN_FLASH_PAGE_BITS, SAIFUN_FLASH_PAGE_SIZE, + NONBUFFERED_FLAGS, SAIFUN_FLASH_PAGE_BITS, SAIFUN_FLASH_PAGE_SIZE, SAIFUN_FLASH_BYTE_ADDR_MASK, 0, "Entry 1100"}, /* Expansion entry 1101 */ {0x3b000002, 0x7b808201, 0x00050081, 0x03840253, 0xaf020406, - 0, SAIFUN_FLASH_PAGE_BITS, SAIFUN_FLASH_PAGE_SIZE, + NONBUFFERED_FLAGS, SAIFUN_FLASH_PAGE_BITS, SAIFUN_FLASH_PAGE_SIZE, SAIFUN_FLASH_BYTE_ADDR_MASK, 0, "Entry 1101"}, /* Ateml Expansion entry 1110 */ {0x37000001, 0x76808273, 0x00570081, 0x68848353, 0xaf000400, - 1, BUFFERED_FLASH_PAGE_BITS, BUFFERED_FLASH_PAGE_SIZE, + BUFFERED_FLAGS, BUFFERED_FLASH_PAGE_BITS, BUFFERED_FLASH_PAGE_SIZE, BUFFERED_FLASH_BYTE_ADDR_MASK, 0, "Entry 1110 (Atmel)"}, /* ATMEL AT45DB021B (buffered flash) */ {0x3f000003, 0x7e808273, 0x00570081, 0x68848353, 0xaf000400, - 1, BUFFERED_FLASH_PAGE_BITS, BUFFERED_FLASH_PAGE_SIZE, + BUFFERED_FLAGS, BUFFERED_FLASH_PAGE_BITS, BUFFERED_FLASH_PAGE_SIZE, BUFFERED_FLASH_BYTE_ADDR_MASK, BUFFERED_FLASH_TOTAL_SIZE*2, "Buffered flash (256kB)"}, }; +/* + * The BCM5709 controllers transparently handle the + * differences between Atmel 264 byte pages and all + * flash devices which use 256 byte pages, so no + * logical-to-physical mapping is required in the + * driver. + */ +static struct flash_spec flash_5709 = { + .flags = BCE_NV_BUFFERED, + .page_bits = BCM5709_FLASH_PAGE_BITS, + .page_size = BCM5709_FLASH_PAGE_SIZE, + .addr_mask = BCM5709_FLASH_BYTE_ADDR_MASK, + .total_size = BUFFERED_FLASH_TOTAL_SIZE * 2, + .name = "5709 buffered flash (256kB)", +}; + /****************************************************************************/ /* FreeBSD device entry points. */ @@ -225,31 +262,40 @@ /* BCE Debug Data Structure Dump Routines */ /****************************************************************************/ #ifdef BCE_DEBUG +static u32 bce_reg_rd (struct bce_softc *, u32); +static void bce_reg_wr (struct bce_softc *, u32, u32); +static void bce_reg_wr16 (struct bce_softc *, u32, u16); static u32 bce_ctx_rd (struct bce_softc *, u32, u32); static void bce_dump_mbuf (struct bce_softc *, struct mbuf *); static void bce_dump_tx_mbuf_chain (struct bce_softc *, u16, int); static void bce_dump_rx_mbuf_chain (struct bce_softc *, u16, int); -#ifdef BCE_USE_SPLIT_HEADER -static void bce_dump_pg_mbuf_chain (struct bce_softc *, u16, int); +#ifdef BCE_USE_SPLIT_HEADER +static void bce_dump_pg_mbuf_chain (struct bce_softc *, u16, int); #endif static void bce_dump_txbd (struct bce_softc *, int, struct tx_bd *); static void bce_dump_rxbd (struct bce_softc *, int, struct rx_bd *); -#ifdef BCE_USE_SPLIT_HEADER -static void bce_dump_pgbd (struct bce_softc *, int, struct rx_bd *); +#ifdef BCE_USE_SPLIT_HEADER +static void bce_dump_pgbd (struct bce_softc *, int, struct rx_bd *); #endif static void bce_dump_l2fhdr (struct bce_softc *, int, struct l2_fhdr *); static void bce_dump_ctx (struct bce_softc *, u16); static void bce_dump_ftqs (struct bce_softc *); static void bce_dump_tx_chain (struct bce_softc *, u16, int); static void bce_dump_rx_chain (struct bce_softc *, u16, int); -#ifdef BCE_USE_SPLIT_HEADER -static void bce_dump_pg_chain (struct bce_softc *, u16, int); +#ifdef BCE_USE_SPLIT_HEADER +static void bce_dump_pg_chain (struct bce_softc *, u16, int); #endif static void bce_dump_status_block (struct bce_softc *); static void bce_dump_stats_block (struct bce_softc *); static void bce_dump_driver_state (struct bce_softc *); static void bce_dump_hw_state (struct bce_softc *); +static void bce_dump_mq_regs (struct bce_softc *); static void bce_dump_bc_state (struct bce_softc *); +static void bce_dump_txp_state (struct bce_softc *, int); +static void bce_dump_rxp_state (struct bce_softc *, int); +static void bce_dump_tpat_state (struct bce_softc *, int); +static void bce_dump_cp_state (struct bce_softc *, int); +static void bce_dump_com_state (struct bce_softc *, int); static void bce_breakpoint (struct bce_softc *); #endif @@ -287,6 +333,7 @@ /****************************************************************************/ /* */ /****************************************************************************/ +static void bce_get_media (struct bce_softc *); static void bce_dma_map_addr (void *, bus_dma_segment_t *, int, int); static int bce_dma_alloc (device_t); static void bce_dma_free (struct bce_softc *); @@ -298,28 +345,33 @@ static int bce_fw_sync (struct bce_softc *, u32); static void bce_load_rv2p_fw (struct bce_softc *, u32 *, u32, u32); static void bce_load_cpu_fw (struct bce_softc *, struct cpu_reg *, struct fw_info *); +static void bce_init_rxp_cpu (struct bce_softc *); +static void bce_init_txp_cpu (struct bce_softc *); +static void bce_init_tpat_cpu (struct bce_softc *); +static void bce_init_cp_cpu (struct bce_softc *); +static void bce_init_com_cpu (struct bce_softc *); static void bce_init_cpus (struct bce_softc *); +static void bce_print_adapter_info (struct bce_softc *); +static void bce_probe_pci_caps (device_t, struct bce_softc *); static void bce_stop (struct bce_softc *); static int bce_reset (struct bce_softc *, u32); static int bce_chipinit (struct bce_softc *); static int bce_blockinit (struct bce_softc *); -static int bce_get_rx_buf (struct bce_softc *, struct mbuf *, u16 *, u16 *, u32 *); -#ifdef BCE_USE_SPLIT_HEADER -static int bce_get_pg_buf (struct bce_softc *, struct mbuf *, u16 *, u16 *); -#endif static int bce_init_tx_chain (struct bce_softc *); static void bce_free_tx_chain (struct bce_softc *); +static int bce_get_rx_buf (struct bce_softc *, struct mbuf *, u16 *, u16 *, u32 *); static int bce_init_rx_chain (struct bce_softc *); static void bce_fill_rx_chain (struct bce_softc *); static void bce_free_rx_chain (struct bce_softc *); - + #ifdef BCE_USE_SPLIT_HEADER +static int bce_get_pg_buf (struct bce_softc *, struct mbuf *, u16 *, u16 *); static int bce_init_pg_chain (struct bce_softc *); static void bce_fill_pg_chain (struct bce_softc *); -static void bce_free_pg_chain (struct bce_softc *); +static void bce_free_pg_chain (struct bce_softc *); #endif static int bce_tx_encap (struct bce_softc *, struct mbuf **); @@ -342,7 +394,8 @@ static void bce_rx_intr (struct bce_softc *); static void bce_tx_intr (struct bce_softc *); static void bce_disable_intr (struct bce_softc *); -static void bce_enable_intr (struct bce_softc *); +static void bce_enable_intr (struct bce_softc *, int); + static void bce_intr (void *); static void bce_set_rx_mode (struct bce_softc *); static void bce_stats_update (struct bce_softc *); @@ -400,26 +453,27 @@ /****************************************************************************/ /* Tunable device values */ /****************************************************************************/ -static int bce_tso_enable = TRUE; -static int bce_msi_enable = 1; - SYSCTL_NODE(_hw, OID_AUTO, bce, CTLFLAG_RD, 0, "bce driver parameters"); /* Allowable values are TRUE or FALSE */ +static int bce_tso_enable = TRUE; TUNABLE_INT("hw.bce.tso_enable", &bce_tso_enable); SYSCTL_UINT(_hw_bce, OID_AUTO, tso_enable, CTLFLAG_RDTUN, &bce_tso_enable, 0, "TSO Enable/Disable"); -/* Allowable values are 0 (IRQ only) and 1 (IRQ or MSI) */ +/* Allowable values are 0 (IRQ), 1 (MSI/IRQ), and 2 (MSI-X/MSI/IRQ) */ +/* ToDo: Add MSI-X support. */ +static int bce_msi_enable = 1; TUNABLE_INT("hw.bce.msi_enable", &bce_msi_enable); SYSCTL_UINT(_hw_bce, OID_AUTO, msi_enable, CTLFLAG_RDTUN, &bce_msi_enable, 0, -"MSI | INTx selector"); +"MSI-X|MSI|INTx selector"); /* ToDo: Add tunable to enable/disable strict MTU handling. */ /* Currently allows "loose" RX MTU checking (i.e. sets the */ /* h/w RX MTU to the size of the largest receive buffer, or */ /* 2048 bytes). */ + /****************************************************************************/ /* Device probe function. */ /* */ @@ -450,14 +504,14 @@ svid = pci_get_subvendor(dev); sdid = pci_get_subdevice(dev); - DBPRINT(sc, BCE_VERBOSE_LOAD, + DBPRINT(sc, BCE_EXTREME_LOAD, "%s(); VID = 0x%04X, DID = 0x%04X, SVID = 0x%04X, " "SDID = 0x%04X\n", __FUNCTION__, vid, did, svid, sdid); /* Look through the list of known devices for a match. */ while(t->bce_name != NULL) { - if ((vid == t->bce_vid) && (did == t->bce_did) && + if ((vid == t->bce_vid) && (did == t->bce_did) && ((svid == t->bce_svid) || (t->bce_svid == PCI_ANY_ID)) && ((sdid == t->bce_sdid) || (t->bce_sdid == PCI_ANY_ID))) { @@ -467,7 +521,7 @@ return(ENOMEM); /* Print out the device identity. */ - snprintf(descbuf, BCE_DEVDESC_MAX, "%s (%c%d)", + snprintf(descbuf, BCE_DEVDESC_MAX, "%s (%c%d)", t->bce_name, (((pci_read_config(dev, PCIR_REVID, 4) & 0xf0) >> 4) + 'A'), (pci_read_config(dev, PCIR_REVID, 4) & 0xf)); @@ -484,6 +538,109 @@ /****************************************************************************/ +/* PCI Capabilities Probe Function. */ +/* */ +/* Walks the PCI capabiites list for the device to find what features are */ +/* supported. */ +/* */ +/* Returns: */ +/* None. */ +/****************************************************************************/ +static void +bce_print_adapter_info(struct bce_softc *sc) +{ + DBENTER(BCE_VERBOSE_LOAD); + + BCE_PRINTF("ASIC (0x%08X); ", sc->bce_chipid); + printf("Rev (%c%d); ", ((BCE_CHIP_ID(sc) & 0xf000) >> 12) + 'A', + ((BCE_CHIP_ID(sc) & 0x0ff0) >> 4)); + + /* Bus info. */ + if (sc->bce_flags & BCE_PCIE_FLAG) { + printf("Bus (PCIe x%d, ", sc->link_width); + switch (sc->link_speed) { + case 1: printf("2.5Gbps); "); break; + case 2: printf("5Gbps); "); break; + default: printf("Unknown link speed); "); + } + } else { + printf("Bus (PCI%s, %s, %dMHz); ", + ((sc->bce_flags & BCE_PCIX_FLAG) ? "-X" : ""), + ((sc->bce_flags & BCE_PCI_32BIT_FLAG) ? "32-bit" : "64-bit"), + sc->bus_speed_mhz); + } + + /* Firmware version and device features. */ + printf("F/W (0x%08X); Flags( ", sc->bce_fw_ver); +#ifdef BCE_USE_SPLIT_HEADER + printf("SPLT "); +#endif + if (sc->bce_flags & BCE_MFW_ENABLE_FLAG) + printf("MFW "); + if (sc->bce_flags & BCE_USING_MSI_FLAG) + printf("MSI "); + if (sc->bce_flags & BCE_USING_MSIX_FLAG) + printf("MSI-X "); + if (sc->bce_phy_flags & BCE_PHY_2_5G_CAPABLE_FLAG) + printf("2.5G "); + printf(")\n"); + + DBEXIT(BCE_VERBOSE_LOAD); +} + + +/****************************************************************************/ +/* PCI Capabilities Probe Function. */ +/* */ +/* Walks the PCI capabiites list for the device to find what features are */ +/* supported. */ +/* */ +/* Returns: */ +/* None. */ +/****************************************************************************/ +static void +bce_probe_pci_caps(device_t dev, struct bce_softc *sc) +{ + u32 reg; + + DBENTER(BCE_VERBOSE_LOAD); + + /* Check if PCI-X capability is enabled. */ + if (pci_find_extcap(dev, PCIY_PCIX, ®) == 0) { + if (reg != 0) + sc->bce_cap_flags |= BCE_PCIX_CAPABLE_FLAG; + } + + /* Check if PCIe capability is enabled. */ + if (pci_find_extcap(dev, PCIY_EXPRESS, ®) == 0) { + if (reg != 0) { + u16 link_status = pci_read_config(dev, reg + 0x12, 2); + DBPRINT(sc, BCE_INFO_LOAD, "PCIe link_status = 0x%08X\n", + link_status); + sc->link_speed = link_status & 0xf; + sc->link_width = (link_status >> 4) & 0x3f; + sc->bce_cap_flags |= BCE_PCIE_CAPABLE_FLAG; + sc->bce_flags |= BCE_PCIE_FLAG; + } + } + + /* Check if MSI capability is enabled. */ + if (pci_find_extcap(dev, PCIY_MSI, ®) == 0) { + if (reg != 0) + sc->bce_cap_flags |= BCE_MSI_CAPABLE_FLAG; + } + + /* Check if MSI-X capability is enabled. */ + if (pci_find_extcap(dev, PCIY_MSIX, ®) == 0) { + if (reg != 0) + sc->bce_cap_flags |= BCE_MSIX_CAPABLE_FLAG; + } + + DBEXIT(BCE_VERBOSE_LOAD); +} + + +/****************************************************************************/ /* Device attach function. */ /* */ /* Allocates device resources, performs secondary chip identification, */ @@ -499,12 +656,12 @@ struct bce_softc *sc; struct ifnet *ifp; u32 val; - int count, rid, rc = 0; + int error, rid, rc = 0; sc = device_get_softc(dev); sc->bce_dev = dev; - DBPRINT(sc, BCE_VERBOSE_RESET, "Entering %s()\n", __FUNCTION__); + DBENTER(BCE_VERBOSE_LOAD | BCE_VERBOSE_RESET); sc->bce_unit = device_get_unit(dev); @@ -520,7 +677,7 @@ &rid, RF_ACTIVE); if (sc->bce_res_mem == NULL) { - BCE_PRINTF("%s(%d): PCI memory allocation failed\n", + BCE_PRINTF("%s(%d): PCI memory allocation failed\n", __FILE__, __LINE__); rc = ENXIO; goto bce_attach_fail; @@ -531,25 +688,73 @@ sc->bce_bhandle = rman_get_bushandle(sc->bce_res_mem); sc->bce_vhandle = (vm_offset_t) rman_get_virtual(sc->bce_res_mem); - /* If MSI is enabled in the driver, get the vector count. */ - count = bce_msi_enable ? pci_msi_count(dev) : 0; + bce_probe_pci_caps(dev, sc); + + rid = 1; +#if 0 + /* Try allocating MSI-X interrupts. */ + if ((sc->bce_cap_flags & BCE_MSIX_CAPABLE_FLAG) && + (bce_msi_enable >= 2) && + ((sc->bce_res_irq = bus_alloc_resource_any(dev, SYS_RES_MEMORY, + &rid, RF_ACTIVE)) != NULL)) { + + msi_needed = sc->bce_msi_count = 1; + + if (((error = pci_alloc_msix(dev, &sc->bce_msi_count)) != 0) || + (sc->bce_msi_count != msi_needed)) { + BCE_PRINTF("%s(%d): MSI-X allocation failed! Requested = %d," + "Received = %d, error = %d\n", __FILE__, __LINE__, + msi_needed, sc->bce_msi_count, error); + sc->bce_msi_count = 0; + pci_release_msi(dev); + bus_release_resource(dev, SYS_RES_MEMORY, rid, + sc->bce_res_irq); + sc->bce_res_irq = NULL; + } else { + DBPRINT(sc, BCE_INFO_LOAD, "%s(): Using MSI-X interrupt.\n", + __FUNCTION__); + sc->bce_flags |= BCE_USING_MSIX_FLAG; + sc->bce_intr = bce_intr; + } + } +#endif + + /* Try allocating a MSI interrupt. */ + if ((sc->bce_cap_flags & BCE_MSI_CAPABLE_FLAG) && + (bce_msi_enable >= 1) && (sc->bce_msi_count == 0)) { + sc->bce_msi_count = 1; + if ((error = pci_alloc_msi(dev, &sc->bce_msi_count)) != 0) { + BCE_PRINTF("%s(%d): MSI allocation failed! error = %d\n", + __FILE__, __LINE__, error); + sc->bce_msi_count = 0; + pci_release_msi(dev); + } else { + DBPRINT(sc, BCE_INFO_LOAD, "%s(): Using MSI interrupt.\n", + __FUNCTION__); + sc->bce_flags |= BCE_USING_MSI_FLAG; + if (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) + sc->bce_flags |= BCE_ONE_SHOT_MSI_FLAG; + sc->bce_irq_rid = 1; + sc->bce_intr = bce_intr; + } + } - /* Allocate PCI IRQ resources. */ - if (count == 1 && pci_alloc_msi(dev, &count) == 0 && count == 1) { - rid = 1; - sc->bce_flags |= BCE_USING_MSI_FLAG; - DBPRINT(sc, BCE_VERBOSE_LOAD, - "Allocating %d MSI interrupt(s)\n", count); - } else { + /* Try allocating a legacy interrupt. */ + if (sc->bce_msi_count == 0) { + DBPRINT(sc, BCE_INFO_LOAD, "%s(): Using INTx interrupt.\n", + __FUNCTION__); rid = 0; - DBPRINT(sc, BCE_VERBOSE_LOAD, "Allocating IRQ interrupt\n"); + sc->bce_intr = bce_intr; } - sc->bce_res_irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, - RF_SHAREABLE | RF_ACTIVE); + sc->bce_res_irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, + &rid, RF_SHAREABLE | RF_ACTIVE); + + sc->bce_irq_rid = rid; + /* Report any IRQ allocation errors. */ if (sc->bce_res_irq == NULL) { - BCE_PRINTF("%s(%d): PCI map interrupt failed!\n", + BCE_PRINTF("%s(%d): PCI map interrupt failed!\n", __FILE__, __LINE__); rc = ENXIO; goto bce_attach_fail; @@ -577,18 +782,22 @@ case BCE_CHIP_ID_5706_A1: case BCE_CHIP_ID_5708_A0: case BCE_CHIP_ID_5708_B0: + case BCE_CHIP_ID_5709_A0: + case BCE_CHIP_ID_5709_B0: + case BCE_CHIP_ID_5709_B1: + case BCE_CHIP_ID_5709_B2: BCE_PRINTF("%s(%d): Unsupported controller revision (%c%d)!\n", - __FILE__, __LINE__, + __FILE__, __LINE__, (((pci_read_config(dev, PCIR_REVID, 4) & 0xf0) >> 4) + 'A'), (pci_read_config(dev, PCIR_REVID, 4) & 0xf)); rc = ENODEV; goto bce_attach_fail; } - /* - * The embedded PCIe to PCI-X bridge (EPB) - * in the 5708 cannot address memory above - * 40 bits (E7_5708CB1_23043 & E6_5708SB1_23043). + /* + * The embedded PCIe to PCI-X bridge (EPB) + * in the 5708 cannot address memory above + * 40 bits (E7_5708CB1_23043 & E6_5708SB1_23043). */ if (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5708) sc->max_bus_addr = BCE_BUS_SPACE_MAXADDR; @@ -602,15 +811,17 @@ */ val = REG_RD_IND(sc, BCE_SHM_HDR_SIGNATURE); if ((val & BCE_SHM_HDR_SIGNATURE_SIG_MASK) == BCE_SHM_HDR_SIGNATURE_SIG) - sc->bce_shmem_base = REG_RD_IND(sc, BCE_SHM_HDR_ADDR_0); + /* Multi-port devices use different offsets in shared memory. */ + sc->bce_shmem_base = REG_RD_IND(sc, BCE_SHM_HDR_ADDR_0 + + (pci_get_function(sc->bce_dev) << 2)); else sc->bce_shmem_base = HOST_VIEW_SHMEM_BASE; - DBPRINT(sc, BCE_VERBOSE_FIRMWARE, "%s(): bce_shmem_base = 0x%08X\n", + DBPRINT(sc, BCE_VERBOSE_FIRMWARE, "%s(): bce_shmem_base = 0x%08X\n", __FUNCTION__, sc->bce_shmem_base); /* Fetch the bootcode revision. */ - sc->bce_fw_ver = REG_RD_IND(sc, sc->bce_shmem_base + + sc->bce_fw_ver = REG_RD_IND(sc, sc->bce_shmem_base + BCE_DEV_INFO_BC_REV); /* Check if any management firmware is running. */ @@ -665,7 +876,7 @@ /* Reset the controller and announce to bootcode that driver is present. */ if (bce_reset(sc, BCE_DRV_MSG_CODE_RESET)) { - BCE_PRINTF("%s(%d): Controller reset failed!\n", + BCE_PRINTF("%s(%d): Controller reset failed!\n", __FILE__, __LINE__); rc = ENXIO; goto bce_attach_fail; @@ -695,7 +906,7 @@ * should be ready before generating an * interrupt while ticks control how long * a BD can sit in the chain before - * generating an interrupt. Set the default + * generating an interrupt. Set the default * values for the RX and TX chains. */ @@ -726,33 +937,14 @@ /* Update statistics once every second. */ sc->bce_stats_ticks = 1000000 & 0xffff00; - /* - * The SerDes based NetXtreme II controllers - * that support 2.5Gb operation (currently - * 5708S) use a PHY at address 2, otherwise - * the PHY is present at address 1. - */ - sc->bce_phy_addr = 1; + /* Find the media type for the adapter. */ + bce_get_media(sc); - if (BCE_CHIP_BOND_ID(sc) & BCE_CHIP_BOND_ID_SERDES_BIT) { - sc->bce_phy_flags |= BCE_PHY_SERDES_FLAG; - sc->bce_flags |= BCE_NO_WOL_FLAG; - if (BCE_CHIP_NUM(sc) != BCE_CHIP_NUM_5706) { - sc->bce_phy_addr = 2; - val = REG_RD_IND(sc, sc->bce_shmem_base + - BCE_SHARED_HW_CFG_CONFIG); - if (val & BCE_SHARED_HW_CFG_PHY_2_5G) { - sc->bce_phy_flags |= BCE_PHY_2_5G_CAPABLE_FLAG; - DBPRINT(sc, BCE_INFO_LOAD, "Found 2.5Gb capable adapter\n"); - } - } - } - /* Store data needed by PHY driver for backplane applications */ sc->bce_shared_hw_cfg = REG_RD_IND(sc, sc->bce_shmem_base + BCE_SHARED_HW_CFG_CONFIG); sc->bce_port_hw_cfg = REG_RD_IND(sc, sc->bce_shmem_base + - BCE_SHARED_HW_CFG_CONFIG); + BCE_PORT_HW_CFG_CONFIG); /* Allocate DMA memory resources. */ if (bce_dma_alloc(dev)) { @@ -765,7 +957,7 @@ /* Allocate an ifnet structure. */ ifp = sc->bce_ifp = if_alloc(IFT_ETHER); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jun 15 07:41:48 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 836431065676; Sun, 15 Jun 2008 07:41:48 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 45D5C106564A for ; Sun, 15 Jun 2008 07:41:48 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1D7D68FC23 for ; Sun, 15 Jun 2008 07:41:48 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5F7flJI063399 for ; Sun, 15 Jun 2008 07:41:48 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5F7flXq063397 for perforce@freebsd.org; Sun, 15 Jun 2008 07:41:47 GMT (envelope-from julian@freebsd.org) Date: Sun, 15 Jun 2008 07:41:47 GMT Message-Id: <200806150741.m5F7flXq063397@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 143487 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Jun 2008 07:41:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=143487 Change 143487 by julian@julian_trafmon1 on 2008/06/15 07:41:15 Include vimage.h from a common point Affected files ... .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_os_bsd.h#3 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/netinet/sctp_os_bsd.h#3 (text+ko) ==== @@ -60,6 +60,7 @@ #include #include #include +#include #include #include From owner-p4-projects@FreeBSD.ORG Sun Jun 15 07:49:57 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2D5F61065672; Sun, 15 Jun 2008 07:49:57 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CAE9C1065670 for ; Sun, 15 Jun 2008 07:49:56 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BAEAE8FC26 for ; Sun, 15 Jun 2008 07:49:56 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5F7nue9063981 for ; Sun, 15 Jun 2008 07:49:56 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5F7nuFD063979 for perforce@freebsd.org; Sun, 15 Jun 2008 07:49:56 GMT (envelope-from julian@freebsd.org) Date: Sun, 15 Jun 2008 07:49:56 GMT Message-Id: <200806150749.m5F7nuFD063979@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 143489 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Jun 2008 07:49:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=143489 Change 143489 by julian@julian_trafmon1 on 2008/06/15 07:49:42 Don't need to include vimage.h individually if it's in sctp_os_bsd.h Affected files ... .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_auth.c#4 edit .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_bsd_addr.c#4 edit .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_cc_functions.c#4 edit .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_crc32.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_indata.c#4 edit .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_output.c#5 edit .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_pcb.c#4 edit .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_sysctl.c#4 edit .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_usrreq.c#4 edit .. //depot/projects/vimage-commit2/src/sys/netinet/sctputil.c#4 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/sctp6_usrreq.c#4 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/netinet/sctp_auth.c#4 (text+ko) ==== @@ -31,8 +31,6 @@ #include __FBSDID("$FreeBSD: src/sys/netinet/sctp_auth.c,v 1.20 2008/06/14 07:58:05 rrs Exp $"); -#include - #include #include #include ==== //depot/projects/vimage-commit2/src/sys/netinet/sctp_bsd_addr.c#4 (text+ko) ==== @@ -33,8 +33,6 @@ #include __FBSDID("$FreeBSD: src/sys/netinet/sctp_bsd_addr.c,v 1.19 2008/06/14 07:58:05 rrs Exp $"); -#include - #include #include #include ==== //depot/projects/vimage-commit2/src/sys/netinet/sctp_cc_functions.c#4 (text+ko) ==== @@ -28,8 +28,6 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#include - #include #include #include ==== //depot/projects/vimage-commit2/src/sys/netinet/sctp_crc32.c#3 (text+ko) ==== @@ -34,8 +34,6 @@ #include __FBSDID("$FreeBSD: src/sys/netinet/sctp_crc32.c,v 1.8 2007/05/08 17:01:10 rrs Exp $"); -#include - #include #include ==== //depot/projects/vimage-commit2/src/sys/netinet/sctp_indata.c#4 (text+ko) ==== @@ -33,8 +33,6 @@ #include __FBSDID("$FreeBSD: src/sys/netinet/sctp_indata.c,v 1.51 2008/06/14 07:58:05 rrs Exp $"); -#include - #include #include #include ==== //depot/projects/vimage-commit2/src/sys/netinet/sctp_output.c#5 (text+ko) ==== @@ -33,7 +33,6 @@ #include __FBSDID("$FreeBSD: src/sys/netinet/sctp_output.c,v 1.72 2008/06/14 07:58:05 rrs Exp $"); -#include #include #include #include ==== //depot/projects/vimage-commit2/src/sys/netinet/sctp_pcb.c#4 (text+ko) ==== @@ -33,7 +33,6 @@ #include __FBSDID("$FreeBSD: src/sys/netinet/sctp_pcb.c,v 1.69 2008/06/14 07:58:05 rrs Exp $"); -#include #include #include #include ==== //depot/projects/vimage-commit2/src/sys/netinet/sctp_sysctl.c#4 (text+ko) ==== @@ -31,7 +31,6 @@ #include __FBSDID("$FreeBSD: src/sys/netinet/sctp_sysctl.c,v 1.19 2008/06/14 07:58:05 rrs Exp $"); -#include #include #include #include ==== //depot/projects/vimage-commit2/src/sys/netinet/sctp_usrreq.c#4 (text+ko) ==== ==== //depot/projects/vimage-commit2/src/sys/netinet/sctputil.c#4 (text+ko) ==== @@ -33,7 +33,6 @@ #include __FBSDID("$FreeBSD: src/sys/netinet/sctputil.c,v 1.78 2008/06/14 07:58:05 rrs Exp $"); -#include #include #include #include ==== //depot/projects/vimage-commit2/src/sys/netinet6/sctp6_usrreq.c#4 (text+ko) ==== @@ -32,7 +32,6 @@ #include __FBSDID("$FreeBSD: src/sys/netinet6/sctp6_usrreq.c,v 1.45 2008/06/14 07:58:05 rrs Exp $"); -#include #include #include #include From owner-p4-projects@FreeBSD.ORG Sun Jun 15 07:55:04 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B2BAA1065675; Sun, 15 Jun 2008 07:55:04 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 746841065673 for ; Sun, 15 Jun 2008 07:55:04 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 636FA8FC18 for ; Sun, 15 Jun 2008 07:55:04 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5F7t4Rv064405 for ; Sun, 15 Jun 2008 07:55:04 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5F7t15W064376 for perforce@freebsd.org; Sun, 15 Jun 2008 07:55:01 GMT (envelope-from julian@freebsd.org) Date: Sun, 15 Jun 2008 07:55:01 GMT Message-Id: <200806150755.m5F7t15W064376@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 143490 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Jun 2008 07:55:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=143490 Change 143490 by julian@julian_trafmon1 on 2008/06/15 07:54:28 IFC@143481 Affected files ... .. //depot/projects/vimage/src/sys/amd64/amd64/pmap.c#16 integrate .. //depot/projects/vimage/src/sys/arm/xscale/i8134x/i81342_pci.c#3 integrate .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#2 integrate .. //depot/projects/vimage/src/sys/conf/files#28 integrate .. //depot/projects/vimage/src/sys/conf/files.i386#13 integrate .. //depot/projects/vimage/src/sys/conf/files.pc98#10 integrate .. //depot/projects/vimage/src/sys/conf/options.i386#6 integrate .. //depot/projects/vimage/src/sys/conf/options.pc98#5 integrate .. //depot/projects/vimage/src/sys/dev/bce/if_bce.c#15 integrate .. //depot/projects/vimage/src/sys/dev/bce/if_bcefw.h#7 integrate .. //depot/projects/vimage/src/sys/dev/bce/if_bcereg.h#10 integrate .. //depot/projects/vimage/src/sys/dev/ex/if_ex.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ex/if_ex_isa.c#3 integrate .. //depot/projects/vimage/src/sys/dev/ex/if_ex_pccard.c#3 integrate .. //depot/projects/vimage/src/sys/dev/ex/if_exvar.h#3 integrate .. //depot/projects/vimage/src/sys/dev/mii/brgphy.c#12 integrate .. //depot/projects/vimage/src/sys/dev/smc/if_smc.c#4 integrate .. //depot/projects/vimage/src/sys/dev/smc/if_smcvar.h#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/if_rum.c#11 integrate .. //depot/projects/vimage/src/sys/dev/usb/usbdevs#22 integrate .. //depot/projects/vimage/src/sys/geom/part/g_part_apm.c#6 integrate .. //depot/projects/vimage/src/sys/geom/part/g_part_bsd.c#3 integrate .. //depot/projects/vimage/src/sys/geom/part/g_part_gpt.c#6 integrate .. //depot/projects/vimage/src/sys/geom/part/g_part_mbr.c#3 integrate .. //depot/projects/vimage/src/sys/geom/part/g_part_pc98.c#2 integrate .. //depot/projects/vimage/src/sys/geom/part/g_part_vtoc8.c#2 integrate .. //depot/projects/vimage/src/sys/i386/conf/NOTES#17 integrate .. //depot/projects/vimage/src/sys/i386/include/pecoff_machdep.h#2 delete .. //depot/projects/vimage/src/sys/kern/kern_conf.c#12 integrate .. //depot/projects/vimage/src/sys/modules/Makefile#20 integrate .. //depot/projects/vimage/src/sys/netinet/sctp.h#13 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_asconf.c#18 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_auth.c#12 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_bsd_addr.c#14 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_bsd_addr.h#7 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_cc_functions.c#5 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_header.h#7 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_indata.c#25 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_input.c#25 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_lock_bsd.h#10 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_os_bsd.h#18 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_output.c#26 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_pcb.c#25 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_pcb.h#17 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_peeloff.c#13 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_sysctl.c#10 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_sysctl.h#8 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_timer.c#18 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_uio.h#15 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_usrreq.c#26 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_var.h#17 integrate .. //depot/projects/vimage/src/sys/netinet/sctputil.c#27 integrate .. //depot/projects/vimage/src/sys/netinet6/sctp6_usrreq.c#23 integrate .. //depot/projects/vimage/src/sys/pc98/conf/NOTES#5 integrate .. //depot/projects/vimage/src/sys/pc98/include/pecoff_machdep.h#2 delete .. //depot/projects/vimage/src/sys/powerpc/powermac/grackle.c#4 integrate .. //depot/projects/vimage/src/sys/powerpc/powermac/macio.c#4 integrate .. //depot/projects/vimage/src/sys/powerpc/powermac/uninorth.c#5 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_framework.h#10 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_inet.c#9 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_policy.h#11 integrate .. //depot/projects/vimage/src/sys/security/mac_biba/mac_biba.c#7 integrate .. //depot/projects/vimage/src/sys/security/mac_lomac/mac_lomac.c#8 integrate .. //depot/projects/vimage/src/sys/security/mac_mls/mac_mls.c#9 integrate .. //depot/projects/vimage/src/sys/security/mac_stub/mac_stub.c#10 integrate .. //depot/projects/vimage/src/sys/security/mac_test/mac_test.c#10 integrate .. //depot/projects/vimage/src/sys/sys/apm.h#3 integrate .. //depot/projects/vimage/src/sys/sys/conf.h#9 integrate .. //depot/projects/vimage/src/sys/sys/ioctl.h#2 integrate .. //depot/projects/vimage/src/sys/sys/ioctl_compat.h#3 integrate .. //depot/projects/vimage/src/sys/sys/param.h#19 integrate .. //depot/projects/vimage/src/sys/sys/systm.h#12 integrate .. //depot/projects/vimage/src/sys/sys/ttychars.h#2 delete .. //depot/projects/vimage/src/sys/sys/ttydev.h#2 delete .. //depot/projects/vimage/src/sys/vm/vnode_pager.c#8 integrate Differences ... ==== //depot/projects/vimage/src/sys/amd64/amd64/pmap.c#16 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.619 2008/06/01 07:36:59 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.621 2008/06/13 19:33:56 alc Exp $"); /* * Manages physical address maps. @@ -2759,8 +2759,8 @@ /* * Tries to promote the 512, contiguous 4KB page mappings that are within a - * single page table page to a single 2MB page mapping. For promotion to - * occur, two conditions must be met: (1) the 4KB page mappings must map + * single page table page (PTP) to a single 2MB page mapping. For promotion + * to occur, two conditions must be met: (1) the 4KB page mappings must map * aligned, contiguous physical memory and (2) the 4KB page mappings must have * identical characteristics. */ @@ -2768,31 +2768,46 @@ pmap_promote_pde(pmap_t pmap, pd_entry_t *pde, vm_offset_t va) { pd_entry_t newpde; - pt_entry_t *firstpte, oldpte, *pte; + pt_entry_t *firstpte, oldpte, pa, *pte; vm_offset_t oldpteva; - vm_paddr_t pa; vm_page_t mpte; PMAP_LOCK_ASSERT(pmap, MA_OWNED); + + /* + * Examine the first PTE in the specified PTP. Abort if this PTE is + * either invalid, unused, or does not map the first 4KB physical page + * within a 2MB page. + */ firstpte = (pt_entry_t *)PHYS_TO_DMAP(*pde & PG_FRAME); +setpde: newpde = *firstpte; - if ((newpde & (PG_A | PG_V)) != (PG_A | PG_V)) { + if ((newpde & ((PG_FRAME & PDRMASK) | PG_A | PG_V)) != (PG_A | PG_V)) { pmap_pde_p_failures++; CTR2(KTR_PMAP, "pmap_promote_pde: failure for va %#lx" " in pmap %p", va, pmap); return; } - if ((newpde & (PG_M | PG_RW)) == PG_RW) + if ((newpde & (PG_M | PG_RW)) == PG_RW) { + /* + * When PG_M is already clear, PG_RW can be cleared without + * a TLB invalidation. + */ + if (!atomic_cmpset_long(firstpte, newpde, newpde & ~PG_RW)) + goto setpde; newpde &= ~PG_RW; + } - /* - * Check all the ptes before promotion + /* + * Examine each of the other PTEs in the specified PTP. Abort if this + * PTE maps an unexpected 4KB physical page or does not have identical + * characteristics to the first PTE. */ - pa = newpde & PG_PS_FRAME; - for (pte = firstpte; pte < firstpte + NPTEPG; pte++) { -retry: + pa = (newpde & (PG_PS_FRAME | PG_A | PG_V)) + NBPDR - PAGE_SIZE; + for (pte = firstpte + NPTEPG - 1; pte > firstpte; pte--) { +setpte: oldpte = *pte; - if ((oldpte & PG_FRAME) != pa) { + if ((oldpte & (PG_FRAME | PG_A | PG_V)) != pa) { pmap_pde_p_failures++; CTR2(KTR_PMAP, "pmap_promote_pde: failure for va %#lx" " in pmap %p", va, pmap); @@ -2804,7 +2819,7 @@ * without a TLB invalidation. */ if (!atomic_cmpset_long(pte, oldpte, oldpte & ~PG_RW)) - goto retry; + goto setpte; oldpte &= ~PG_RW; oldpteva = (oldpte & PG_FRAME & PDRMASK) | (va & ~PDRMASK); @@ -2817,7 +2832,7 @@ " in pmap %p", va, pmap); return; } - pa += PAGE_SIZE; + pa -= PAGE_SIZE; } /* ==== //depot/projects/vimage/src/sys/arm/xscale/i8134x/i81342_pci.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/i8134x/i81342_pci.c,v 1.2 2007/09/30 11:05:14 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/i8134x/i81342_pci.c,v 1.3 2008/06/12 01:46:06 kevlo Exp $"); #include #include @@ -185,7 +185,7 @@ IOP34X_PCIE_OIOBAR_VADDR, (sc->sc_is_atux ? IOP34X_PCIX_OIOBAR_VADDR : IOP34X_PCIE_OIOBAR_VADDR) + IOP34X_OIOBAR_SIZE) != 0) { - panic("i80321_pci_probe: failed to set up I/O rman"); + panic("i81342_pci_probe: failed to set up I/O rman"); } sc->sc_mem_rman.rm_type = RMAN_ARRAY; sc->sc_mem_rman.rm_descr = "I81342 PCI Memory"; ==== //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#2 (text+ko) ==== @@ -279,12 +279,6 @@ #ifndef MAXMIN64 #define MAXMIN64 0xffffffffUL #endif -#ifndef major -#define major(x) ((int)(((u_int)(x) >> 8)&0xff)) /* major number */ -#endif -#ifndef minor -#define minor(x) ((int)((x)&0xffff00ff)) /* minor number */ -#endif /* * Create special expldev for ZFS private use. @@ -297,7 +291,7 @@ static uint64_t zfs_expldev(dev_t dev) { - return (((uint64_t)major(dev) << NBITSMINOR64) | minor(dev)); + return (((uint64_t)umajor(dev) << NBITSMINOR64) | uminor(dev)); } /* * Special cmpldev for ZFS private use. ==== //depot/projects/vimage/src/sys/conf/files#28 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1308 2008/06/11 22:10:10 jfv Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1309 2008/06/14 15:17:02 rwatson Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1818,7 +1818,7 @@ netatalk/aarp.c optional netatalk netatalk/at_control.c optional netatalk netatalk/at_proto.c optional netatalk -netatalk/at_rmx.c optional netatalkdebug +netatalk/at_rmx.c optional netatalk netatalk/ddp_input.c optional netatalk netatalk/ddp_output.c optional netatalk netatalk/ddp_pcb.c optional netatalk ==== //depot/projects/vimage/src/sys/conf/files.i386#13 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.i386,v 1.596 2008/05/26 10:39:52 bz Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.597 2008/06/14 12:51:44 wkoszek Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -107,7 +107,6 @@ compat/ndis/subr_pe.c optional ndisapi pci compat/ndis/subr_usbd.c optional ndisapi pci compat/ndis/winx32_wrap.S optional ndisapi pci -compat/pecoff/imgact_pecoff.c optional pecoff_support compat/svr4/imgact_svr4.c optional compat_svr4 compat/svr4/svr4_fcntl.c optional compat_svr4 compat/svr4/svr4_filio.c optional compat_svr4 ==== //depot/projects/vimage/src/sys/conf/files.pc98#10 (text+ko) ==== @@ -3,7 +3,7 @@ # # modified for PC-9801/PC-9821 # -# $FreeBSD: src/sys/conf/files.pc98,v 1.363 2008/05/26 10:39:52 bz Exp $ +# $FreeBSD: src/sys/conf/files.pc98,v 1.364 2008/06/14 12:51:44 wkoszek Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -70,7 +70,6 @@ compat/linux/linux_time.c optional compat_linux compat/linux/linux_uid16.c optional compat_linux compat/linux/linux_util.c optional compat_linux -compat/pecoff/imgact_pecoff.c optional pecoff_support compat/svr4/imgact_svr4.c optional compat_svr4 compat/svr4/svr4_fcntl.c optional compat_svr4 compat/svr4/svr4_filio.c optional compat_svr4 ==== //depot/projects/vimage/src/sys/conf/options.i386#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options.i386,v 1.241 2008/05/26 10:39:52 bz Exp $ +# $FreeBSD: src/sys/conf/options.i386,v 1.242 2008/06/14 12:51:44 wkoszek Exp $ # Options specific to the i386 platform kernels AUTO_EOI_1 opt_auto_eoi.h @@ -27,8 +27,6 @@ LINPROCFS opt_dontuse.h LINSYSFS opt_dontuse.h NDISAPI opt_dontuse.h -PECOFF_DEBUG opt_pecoff.h -PECOFF_SUPPORT opt_dontuse.h # Change KVM size. Changes things all over the kernel. KVA_PAGES opt_global.h ==== //depot/projects/vimage/src/sys/conf/options.pc98#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options.pc98,v 1.203 2008/05/26 10:39:52 bz Exp $ +# $FreeBSD: src/sys/conf/options.pc98,v 1.204 2008/06/14 12:51:44 wkoszek Exp $ # Options specific to the pc98 platform kernels AUTO_EOI_1 opt_auto_eoi.h @@ -25,8 +25,6 @@ DEBUG_SVR4 opt_svr4.h LINPROCFS opt_dontuse.h LINSYSFS opt_dontuse.h -PECOFF_DEBUG opt_pecoff.h -PECOFF_SUPPORT opt_dontuse.h # Change KVM size. Changes things all over the kernel. KVA_PAGES opt_global.h ==== //depot/projects/vimage/src/sys/dev/bce/if_bce.c#15 (text) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/bce/if_bce.c,v 1.41 2008/06/10 02:19:11 davidch Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bce/if_bce.c,v 1.42 2008/06/13 01:16:37 davidch Exp $"); /* * The following controllers are supported by this driver: @@ -37,12 +37,16 @@ * BCM5706S A2, A3 * BCM5708C B1, B2 * BCM5708S B1, B2 + * BCM5709C A1, C0 + * BCM5716 C0 * * The following controllers are not supported by this driver: * BCM5706C A0, A1 (pre-production) * BCM5706S A0, A1 (pre-production) * BCM5708C A0, B0 (pre-production) * BCM5708S A0, B0 (pre-production) + * BCM5709C A0 B0, B1, B2 (pre-production) + * BCM5709S A0, A1, B0, B1, B2, C0 (pre-production) */ #include "opt_bce.h" @@ -85,8 +89,9 @@ /****************************************************************************/ /* BCE Build Time Options */ /****************************************************************************/ -#define BCE_USE_SPLIT_HEADER 1 +#define BCE_USE_SPLIT_HEADER 1 /* #define BCE_NVRAM_WRITE_SUPPORT 1 */ + /****************************************************************************/ /* PCI Device ID Table */ @@ -117,6 +122,19 @@ /* BCM5708S controllers and OEM boards. */ { BRCM_VENDORID, BRCM_DEVICEID_BCM5708S, PCI_ANY_ID, PCI_ANY_ID, "Broadcom NetXtreme II BCM5708 1000Base-SX" }, + + /* BCM5709C controllers and OEM boards. */ + { BRCM_VENDORID, BRCM_DEVICEID_BCM5709, PCI_ANY_ID, PCI_ANY_ID, + "Broadcom NetXtreme II BCM5709 1000Base-T" }, + + /* BCM5709S controllers and OEM boards. */ + { BRCM_VENDORID, BRCM_DEVICEID_BCM5709S, PCI_ANY_ID, PCI_ANY_ID, + "Broadcom NetXtreme II BCM5709 1000Base-SX" }, + + /* BCM5716 controllers and OEM boards. */ + { BRCM_VENDORID, BRCM_DEVICEID_BCM5716, PCI_ANY_ID, PCI_ANY_ID, + "Broadcom NetXtreme II BCM5716 1000Base-T" }, + { 0, 0, 0, 0, NULL } }; @@ -126,91 +144,110 @@ /****************************************************************************/ static struct flash_spec flash_table[] = { +#define BUFFERED_FLAGS (BCE_NV_BUFFERED | BCE_NV_TRANSLATE) +#define NONBUFFERED_FLAGS (BCE_NV_WREN) + /* Slow EEPROM */ {0x00000000, 0x40830380, 0x009f0081, 0xa184a053, 0xaf000400, - 1, SEEPROM_PAGE_BITS, SEEPROM_PAGE_SIZE, + BUFFERED_FLAGS, SEEPROM_PAGE_BITS, SEEPROM_PAGE_SIZE, SEEPROM_BYTE_ADDR_MASK, SEEPROM_TOTAL_SIZE, "EEPROM - slow"}, /* Expansion entry 0001 */ {0x08000002, 0x4b808201, 0x00050081, 0x03840253, 0xaf020406, - 0, SAIFUN_FLASH_PAGE_BITS, SAIFUN_FLASH_PAGE_SIZE, + NONBUFFERED_FLAGS, SAIFUN_FLASH_PAGE_BITS, SAIFUN_FLASH_PAGE_SIZE, SAIFUN_FLASH_BYTE_ADDR_MASK, 0, "Entry 0001"}, /* Saifun SA25F010 (non-buffered flash) */ /* strap, cfg1, & write1 need updates */ {0x04000001, 0x47808201, 0x00050081, 0x03840253, 0xaf020406, - 0, SAIFUN_FLASH_PAGE_BITS, SAIFUN_FLASH_PAGE_SIZE, + NONBUFFERED_FLAGS, SAIFUN_FLASH_PAGE_BITS, SAIFUN_FLASH_PAGE_SIZE, SAIFUN_FLASH_BYTE_ADDR_MASK, SAIFUN_FLASH_BASE_TOTAL_SIZE*2, "Non-buffered flash (128kB)"}, /* Saifun SA25F020 (non-buffered flash) */ /* strap, cfg1, & write1 need updates */ {0x0c000003, 0x4f808201, 0x00050081, 0x03840253, 0xaf020406, - 0, SAIFUN_FLASH_PAGE_BITS, SAIFUN_FLASH_PAGE_SIZE, + NONBUFFERED_FLAGS, SAIFUN_FLASH_PAGE_BITS, SAIFUN_FLASH_PAGE_SIZE, SAIFUN_FLASH_BYTE_ADDR_MASK, SAIFUN_FLASH_BASE_TOTAL_SIZE*4, "Non-buffered flash (256kB)"}, /* Expansion entry 0100 */ {0x11000000, 0x53808201, 0x00050081, 0x03840253, 0xaf020406, - 0, SAIFUN_FLASH_PAGE_BITS, SAIFUN_FLASH_PAGE_SIZE, + NONBUFFERED_FLAGS, SAIFUN_FLASH_PAGE_BITS, SAIFUN_FLASH_PAGE_SIZE, SAIFUN_FLASH_BYTE_ADDR_MASK, 0, "Entry 0100"}, /* Entry 0101: ST M45PE10 (non-buffered flash, TetonII B0) */ {0x19000002, 0x5b808201, 0x000500db, 0x03840253, 0xaf020406, - 0, ST_MICRO_FLASH_PAGE_BITS, ST_MICRO_FLASH_PAGE_SIZE, + NONBUFFERED_FLAGS, ST_MICRO_FLASH_PAGE_BITS, ST_MICRO_FLASH_PAGE_SIZE, ST_MICRO_FLASH_BYTE_ADDR_MASK, ST_MICRO_FLASH_BASE_TOTAL_SIZE*2, "Entry 0101: ST M45PE10 (128kB non-bufferred)"}, /* Entry 0110: ST M45PE20 (non-buffered flash)*/ {0x15000001, 0x57808201, 0x000500db, 0x03840253, 0xaf020406, - 0, ST_MICRO_FLASH_PAGE_BITS, ST_MICRO_FLASH_PAGE_SIZE, + NONBUFFERED_FLAGS, ST_MICRO_FLASH_PAGE_BITS, ST_MICRO_FLASH_PAGE_SIZE, ST_MICRO_FLASH_BYTE_ADDR_MASK, ST_MICRO_FLASH_BASE_TOTAL_SIZE*4, "Entry 0110: ST M45PE20 (256kB non-bufferred)"}, /* Saifun SA25F005 (non-buffered flash) */ /* strap, cfg1, & write1 need updates */ {0x1d000003, 0x5f808201, 0x00050081, 0x03840253, 0xaf020406, - 0, SAIFUN_FLASH_PAGE_BITS, SAIFUN_FLASH_PAGE_SIZE, + NONBUFFERED_FLAGS, SAIFUN_FLASH_PAGE_BITS, SAIFUN_FLASH_PAGE_SIZE, SAIFUN_FLASH_BYTE_ADDR_MASK, SAIFUN_FLASH_BASE_TOTAL_SIZE, "Non-buffered flash (64kB)"}, /* Fast EEPROM */ {0x22000000, 0x62808380, 0x009f0081, 0xa184a053, 0xaf000400, - 1, SEEPROM_PAGE_BITS, SEEPROM_PAGE_SIZE, + BUFFERED_FLAGS, SEEPROM_PAGE_BITS, SEEPROM_PAGE_SIZE, SEEPROM_BYTE_ADDR_MASK, SEEPROM_TOTAL_SIZE, "EEPROM - fast"}, /* Expansion entry 1001 */ {0x2a000002, 0x6b808201, 0x00050081, 0x03840253, 0xaf020406, - 0, SAIFUN_FLASH_PAGE_BITS, SAIFUN_FLASH_PAGE_SIZE, + NONBUFFERED_FLAGS, SAIFUN_FLASH_PAGE_BITS, SAIFUN_FLASH_PAGE_SIZE, SAIFUN_FLASH_BYTE_ADDR_MASK, 0, "Entry 1001"}, /* Expansion entry 1010 */ {0x26000001, 0x67808201, 0x00050081, 0x03840253, 0xaf020406, - 0, SAIFUN_FLASH_PAGE_BITS, SAIFUN_FLASH_PAGE_SIZE, + NONBUFFERED_FLAGS, SAIFUN_FLASH_PAGE_BITS, SAIFUN_FLASH_PAGE_SIZE, SAIFUN_FLASH_BYTE_ADDR_MASK, 0, "Entry 1010"}, /* ATMEL AT45DB011B (buffered flash) */ {0x2e000003, 0x6e808273, 0x00570081, 0x68848353, 0xaf000400, - 1, BUFFERED_FLASH_PAGE_BITS, BUFFERED_FLASH_PAGE_SIZE, + BUFFERED_FLAGS, BUFFERED_FLASH_PAGE_BITS, BUFFERED_FLASH_PAGE_SIZE, BUFFERED_FLASH_BYTE_ADDR_MASK, BUFFERED_FLASH_TOTAL_SIZE, "Buffered flash (128kB)"}, /* Expansion entry 1100 */ {0x33000000, 0x73808201, 0x00050081, 0x03840253, 0xaf020406, - 0, SAIFUN_FLASH_PAGE_BITS, SAIFUN_FLASH_PAGE_SIZE, + NONBUFFERED_FLAGS, SAIFUN_FLASH_PAGE_BITS, SAIFUN_FLASH_PAGE_SIZE, SAIFUN_FLASH_BYTE_ADDR_MASK, 0, "Entry 1100"}, /* Expansion entry 1101 */ {0x3b000002, 0x7b808201, 0x00050081, 0x03840253, 0xaf020406, - 0, SAIFUN_FLASH_PAGE_BITS, SAIFUN_FLASH_PAGE_SIZE, + NONBUFFERED_FLAGS, SAIFUN_FLASH_PAGE_BITS, SAIFUN_FLASH_PAGE_SIZE, SAIFUN_FLASH_BYTE_ADDR_MASK, 0, "Entry 1101"}, /* Ateml Expansion entry 1110 */ {0x37000001, 0x76808273, 0x00570081, 0x68848353, 0xaf000400, - 1, BUFFERED_FLASH_PAGE_BITS, BUFFERED_FLASH_PAGE_SIZE, + BUFFERED_FLAGS, BUFFERED_FLASH_PAGE_BITS, BUFFERED_FLASH_PAGE_SIZE, BUFFERED_FLASH_BYTE_ADDR_MASK, 0, "Entry 1110 (Atmel)"}, /* ATMEL AT45DB021B (buffered flash) */ {0x3f000003, 0x7e808273, 0x00570081, 0x68848353, 0xaf000400, - 1, BUFFERED_FLASH_PAGE_BITS, BUFFERED_FLASH_PAGE_SIZE, + BUFFERED_FLAGS, BUFFERED_FLASH_PAGE_BITS, BUFFERED_FLASH_PAGE_SIZE, BUFFERED_FLASH_BYTE_ADDR_MASK, BUFFERED_FLASH_TOTAL_SIZE*2, "Buffered flash (256kB)"}, }; +/* + * The BCM5709 controllers transparently handle the + * differences between Atmel 264 byte pages and all + * flash devices which use 256 byte pages, so no + * logical-to-physical mapping is required in the + * driver. + */ +static struct flash_spec flash_5709 = { + .flags = BCE_NV_BUFFERED, + .page_bits = BCM5709_FLASH_PAGE_BITS, + .page_size = BCM5709_FLASH_PAGE_SIZE, + .addr_mask = BCM5709_FLASH_BYTE_ADDR_MASK, + .total_size = BUFFERED_FLASH_TOTAL_SIZE * 2, + .name = "5709 buffered flash (256kB)", +}; + /****************************************************************************/ /* FreeBSD device entry points. */ @@ -225,31 +262,40 @@ /* BCE Debug Data Structure Dump Routines */ /****************************************************************************/ #ifdef BCE_DEBUG +static u32 bce_reg_rd (struct bce_softc *, u32); +static void bce_reg_wr (struct bce_softc *, u32, u32); +static void bce_reg_wr16 (struct bce_softc *, u32, u16); static u32 bce_ctx_rd (struct bce_softc *, u32, u32); static void bce_dump_mbuf (struct bce_softc *, struct mbuf *); static void bce_dump_tx_mbuf_chain (struct bce_softc *, u16, int); static void bce_dump_rx_mbuf_chain (struct bce_softc *, u16, int); -#ifdef BCE_USE_SPLIT_HEADER -static void bce_dump_pg_mbuf_chain (struct bce_softc *, u16, int); +#ifdef BCE_USE_SPLIT_HEADER +static void bce_dump_pg_mbuf_chain (struct bce_softc *, u16, int); #endif static void bce_dump_txbd (struct bce_softc *, int, struct tx_bd *); static void bce_dump_rxbd (struct bce_softc *, int, struct rx_bd *); -#ifdef BCE_USE_SPLIT_HEADER -static void bce_dump_pgbd (struct bce_softc *, int, struct rx_bd *); +#ifdef BCE_USE_SPLIT_HEADER +static void bce_dump_pgbd (struct bce_softc *, int, struct rx_bd *); #endif static void bce_dump_l2fhdr (struct bce_softc *, int, struct l2_fhdr *); static void bce_dump_ctx (struct bce_softc *, u16); static void bce_dump_ftqs (struct bce_softc *); static void bce_dump_tx_chain (struct bce_softc *, u16, int); static void bce_dump_rx_chain (struct bce_softc *, u16, int); -#ifdef BCE_USE_SPLIT_HEADER -static void bce_dump_pg_chain (struct bce_softc *, u16, int); +#ifdef BCE_USE_SPLIT_HEADER +static void bce_dump_pg_chain (struct bce_softc *, u16, int); #endif static void bce_dump_status_block (struct bce_softc *); static void bce_dump_stats_block (struct bce_softc *); static void bce_dump_driver_state (struct bce_softc *); static void bce_dump_hw_state (struct bce_softc *); +static void bce_dump_mq_regs (struct bce_softc *); static void bce_dump_bc_state (struct bce_softc *); +static void bce_dump_txp_state (struct bce_softc *, int); +static void bce_dump_rxp_state (struct bce_softc *, int); +static void bce_dump_tpat_state (struct bce_softc *, int); +static void bce_dump_cp_state (struct bce_softc *, int); +static void bce_dump_com_state (struct bce_softc *, int); static void bce_breakpoint (struct bce_softc *); #endif @@ -287,6 +333,7 @@ /****************************************************************************/ /* */ /****************************************************************************/ +static void bce_get_media (struct bce_softc *); static void bce_dma_map_addr (void *, bus_dma_segment_t *, int, int); static int bce_dma_alloc (device_t); static void bce_dma_free (struct bce_softc *); @@ -298,28 +345,33 @@ static int bce_fw_sync (struct bce_softc *, u32); static void bce_load_rv2p_fw (struct bce_softc *, u32 *, u32, u32); static void bce_load_cpu_fw (struct bce_softc *, struct cpu_reg *, struct fw_info *); +static void bce_init_rxp_cpu (struct bce_softc *); +static void bce_init_txp_cpu (struct bce_softc *); +static void bce_init_tpat_cpu (struct bce_softc *); +static void bce_init_cp_cpu (struct bce_softc *); +static void bce_init_com_cpu (struct bce_softc *); static void bce_init_cpus (struct bce_softc *); +static void bce_print_adapter_info (struct bce_softc *); +static void bce_probe_pci_caps (device_t, struct bce_softc *); static void bce_stop (struct bce_softc *); static int bce_reset (struct bce_softc *, u32); static int bce_chipinit (struct bce_softc *); static int bce_blockinit (struct bce_softc *); -static int bce_get_rx_buf (struct bce_softc *, struct mbuf *, u16 *, u16 *, u32 *); -#ifdef BCE_USE_SPLIT_HEADER -static int bce_get_pg_buf (struct bce_softc *, struct mbuf *, u16 *, u16 *); -#endif static int bce_init_tx_chain (struct bce_softc *); static void bce_free_tx_chain (struct bce_softc *); +static int bce_get_rx_buf (struct bce_softc *, struct mbuf *, u16 *, u16 *, u32 *); static int bce_init_rx_chain (struct bce_softc *); static void bce_fill_rx_chain (struct bce_softc *); static void bce_free_rx_chain (struct bce_softc *); - + #ifdef BCE_USE_SPLIT_HEADER +static int bce_get_pg_buf (struct bce_softc *, struct mbuf *, u16 *, u16 *); static int bce_init_pg_chain (struct bce_softc *); static void bce_fill_pg_chain (struct bce_softc *); -static void bce_free_pg_chain (struct bce_softc *); +static void bce_free_pg_chain (struct bce_softc *); #endif static int bce_tx_encap (struct bce_softc *, struct mbuf **); @@ -342,7 +394,8 @@ static void bce_rx_intr (struct bce_softc *); static void bce_tx_intr (struct bce_softc *); static void bce_disable_intr (struct bce_softc *); -static void bce_enable_intr (struct bce_softc *); +static void bce_enable_intr (struct bce_softc *, int); + static void bce_intr (void *); static void bce_set_rx_mode (struct bce_softc *); static void bce_stats_update (struct bce_softc *); @@ -400,26 +453,27 @@ /****************************************************************************/ /* Tunable device values */ /****************************************************************************/ -static int bce_tso_enable = TRUE; -static int bce_msi_enable = 1; - SYSCTL_NODE(_hw, OID_AUTO, bce, CTLFLAG_RD, 0, "bce driver parameters"); /* Allowable values are TRUE or FALSE */ +static int bce_tso_enable = TRUE; TUNABLE_INT("hw.bce.tso_enable", &bce_tso_enable); SYSCTL_UINT(_hw_bce, OID_AUTO, tso_enable, CTLFLAG_RDTUN, &bce_tso_enable, 0, "TSO Enable/Disable"); -/* Allowable values are 0 (IRQ only) and 1 (IRQ or MSI) */ +/* Allowable values are 0 (IRQ), 1 (MSI/IRQ), and 2 (MSI-X/MSI/IRQ) */ +/* ToDo: Add MSI-X support. */ +static int bce_msi_enable = 1; TUNABLE_INT("hw.bce.msi_enable", &bce_msi_enable); SYSCTL_UINT(_hw_bce, OID_AUTO, msi_enable, CTLFLAG_RDTUN, &bce_msi_enable, 0, -"MSI | INTx selector"); +"MSI-X|MSI|INTx selector"); /* ToDo: Add tunable to enable/disable strict MTU handling. */ /* Currently allows "loose" RX MTU checking (i.e. sets the */ /* h/w RX MTU to the size of the largest receive buffer, or */ /* 2048 bytes). */ + /****************************************************************************/ /* Device probe function. */ /* */ @@ -450,14 +504,14 @@ svid = pci_get_subvendor(dev); sdid = pci_get_subdevice(dev); - DBPRINT(sc, BCE_VERBOSE_LOAD, + DBPRINT(sc, BCE_EXTREME_LOAD, "%s(); VID = 0x%04X, DID = 0x%04X, SVID = 0x%04X, " "SDID = 0x%04X\n", __FUNCTION__, vid, did, svid, sdid); /* Look through the list of known devices for a match. */ while(t->bce_name != NULL) { - if ((vid == t->bce_vid) && (did == t->bce_did) && + if ((vid == t->bce_vid) && (did == t->bce_did) && ((svid == t->bce_svid) || (t->bce_svid == PCI_ANY_ID)) && ((sdid == t->bce_sdid) || (t->bce_sdid == PCI_ANY_ID))) { @@ -467,7 +521,7 @@ return(ENOMEM); /* Print out the device identity. */ - snprintf(descbuf, BCE_DEVDESC_MAX, "%s (%c%d)", + snprintf(descbuf, BCE_DEVDESC_MAX, "%s (%c%d)", t->bce_name, (((pci_read_config(dev, PCIR_REVID, 4) & 0xf0) >> 4) + 'A'), (pci_read_config(dev, PCIR_REVID, 4) & 0xf)); @@ -484,6 +538,109 @@ /****************************************************************************/ +/* PCI Capabilities Probe Function. */ +/* */ +/* Walks the PCI capabiites list for the device to find what features are */ +/* supported. */ +/* */ +/* Returns: */ +/* None. */ +/****************************************************************************/ +static void +bce_print_adapter_info(struct bce_softc *sc) +{ + DBENTER(BCE_VERBOSE_LOAD); + + BCE_PRINTF("ASIC (0x%08X); ", sc->bce_chipid); + printf("Rev (%c%d); ", ((BCE_CHIP_ID(sc) & 0xf000) >> 12) + 'A', + ((BCE_CHIP_ID(sc) & 0x0ff0) >> 4)); + + /* Bus info. */ + if (sc->bce_flags & BCE_PCIE_FLAG) { + printf("Bus (PCIe x%d, ", sc->link_width); + switch (sc->link_speed) { + case 1: printf("2.5Gbps); "); break; + case 2: printf("5Gbps); "); break; + default: printf("Unknown link speed); "); + } + } else { + printf("Bus (PCI%s, %s, %dMHz); ", + ((sc->bce_flags & BCE_PCIX_FLAG) ? "-X" : ""), + ((sc->bce_flags & BCE_PCI_32BIT_FLAG) ? "32-bit" : "64-bit"), + sc->bus_speed_mhz); + } + + /* Firmware version and device features. */ + printf("F/W (0x%08X); Flags( ", sc->bce_fw_ver); +#ifdef BCE_USE_SPLIT_HEADER + printf("SPLT "); +#endif + if (sc->bce_flags & BCE_MFW_ENABLE_FLAG) + printf("MFW "); + if (sc->bce_flags & BCE_USING_MSI_FLAG) + printf("MSI "); + if (sc->bce_flags & BCE_USING_MSIX_FLAG) + printf("MSI-X "); + if (sc->bce_phy_flags & BCE_PHY_2_5G_CAPABLE_FLAG) + printf("2.5G "); + printf(")\n"); + + DBEXIT(BCE_VERBOSE_LOAD); +} + + +/****************************************************************************/ +/* PCI Capabilities Probe Function. */ +/* */ +/* Walks the PCI capabiites list for the device to find what features are */ +/* supported. */ +/* */ +/* Returns: */ +/* None. */ +/****************************************************************************/ +static void +bce_probe_pci_caps(device_t dev, struct bce_softc *sc) +{ + u32 reg; + + DBENTER(BCE_VERBOSE_LOAD); + + /* Check if PCI-X capability is enabled. */ + if (pci_find_extcap(dev, PCIY_PCIX, ®) == 0) { + if (reg != 0) + sc->bce_cap_flags |= BCE_PCIX_CAPABLE_FLAG; + } + + /* Check if PCIe capability is enabled. */ + if (pci_find_extcap(dev, PCIY_EXPRESS, ®) == 0) { + if (reg != 0) { + u16 link_status = pci_read_config(dev, reg + 0x12, 2); + DBPRINT(sc, BCE_INFO_LOAD, "PCIe link_status = 0x%08X\n", + link_status); + sc->link_speed = link_status & 0xf; + sc->link_width = (link_status >> 4) & 0x3f; + sc->bce_cap_flags |= BCE_PCIE_CAPABLE_FLAG; + sc->bce_flags |= BCE_PCIE_FLAG; + } + } + + /* Check if MSI capability is enabled. */ + if (pci_find_extcap(dev, PCIY_MSI, ®) == 0) { + if (reg != 0) + sc->bce_cap_flags |= BCE_MSI_CAPABLE_FLAG; + } + + /* Check if MSI-X capability is enabled. */ + if (pci_find_extcap(dev, PCIY_MSIX, ®) == 0) { + if (reg != 0) + sc->bce_cap_flags |= BCE_MSIX_CAPABLE_FLAG; + } + + DBEXIT(BCE_VERBOSE_LOAD); +} + + +/****************************************************************************/ /* Device attach function. */ /* */ /* Allocates device resources, performs secondary chip identification, */ @@ -499,12 +656,12 @@ struct bce_softc *sc; struct ifnet *ifp; u32 val; - int count, rid, rc = 0; + int error, rid, rc = 0; sc = device_get_softc(dev); sc->bce_dev = dev; - DBPRINT(sc, BCE_VERBOSE_RESET, "Entering %s()\n", __FUNCTION__); + DBENTER(BCE_VERBOSE_LOAD | BCE_VERBOSE_RESET); sc->bce_unit = device_get_unit(dev); @@ -520,7 +677,7 @@ &rid, RF_ACTIVE); if (sc->bce_res_mem == NULL) { - BCE_PRINTF("%s(%d): PCI memory allocation failed\n", + BCE_PRINTF("%s(%d): PCI memory allocation failed\n", __FILE__, __LINE__); rc = ENXIO; goto bce_attach_fail; @@ -531,25 +688,73 @@ sc->bce_bhandle = rman_get_bushandle(sc->bce_res_mem); sc->bce_vhandle = (vm_offset_t) rman_get_virtual(sc->bce_res_mem); - /* If MSI is enabled in the driver, get the vector count. */ - count = bce_msi_enable ? pci_msi_count(dev) : 0; + bce_probe_pci_caps(dev, sc); + + rid = 1; +#if 0 + /* Try allocating MSI-X interrupts. */ + if ((sc->bce_cap_flags & BCE_MSIX_CAPABLE_FLAG) && + (bce_msi_enable >= 2) && + ((sc->bce_res_irq = bus_alloc_resource_any(dev, SYS_RES_MEMORY, + &rid, RF_ACTIVE)) != NULL)) { + + msi_needed = sc->bce_msi_count = 1; + + if (((error = pci_alloc_msix(dev, &sc->bce_msi_count)) != 0) || + (sc->bce_msi_count != msi_needed)) { + BCE_PRINTF("%s(%d): MSI-X allocation failed! Requested = %d," + "Received = %d, error = %d\n", __FILE__, __LINE__, + msi_needed, sc->bce_msi_count, error); + sc->bce_msi_count = 0; + pci_release_msi(dev); + bus_release_resource(dev, SYS_RES_MEMORY, rid, + sc->bce_res_irq); + sc->bce_res_irq = NULL; + } else { + DBPRINT(sc, BCE_INFO_LOAD, "%s(): Using MSI-X interrupt.\n", + __FUNCTION__); + sc->bce_flags |= BCE_USING_MSIX_FLAG; + sc->bce_intr = bce_intr; + } + } +#endif + + /* Try allocating a MSI interrupt. */ + if ((sc->bce_cap_flags & BCE_MSI_CAPABLE_FLAG) && + (bce_msi_enable >= 1) && (sc->bce_msi_count == 0)) { + sc->bce_msi_count = 1; + if ((error = pci_alloc_msi(dev, &sc->bce_msi_count)) != 0) { + BCE_PRINTF("%s(%d): MSI allocation failed! error = %d\n", + __FILE__, __LINE__, error); + sc->bce_msi_count = 0; + pci_release_msi(dev); + } else { + DBPRINT(sc, BCE_INFO_LOAD, "%s(): Using MSI interrupt.\n", + __FUNCTION__); + sc->bce_flags |= BCE_USING_MSI_FLAG; + if (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) + sc->bce_flags |= BCE_ONE_SHOT_MSI_FLAG; + sc->bce_irq_rid = 1; + sc->bce_intr = bce_intr; + } + } - /* Allocate PCI IRQ resources. */ - if (count == 1 && pci_alloc_msi(dev, &count) == 0 && count == 1) { - rid = 1; - sc->bce_flags |= BCE_USING_MSI_FLAG; - DBPRINT(sc, BCE_VERBOSE_LOAD, - "Allocating %d MSI interrupt(s)\n", count); - } else { + /* Try allocating a legacy interrupt. */ + if (sc->bce_msi_count == 0) { + DBPRINT(sc, BCE_INFO_LOAD, "%s(): Using INTx interrupt.\n", + __FUNCTION__); rid = 0; - DBPRINT(sc, BCE_VERBOSE_LOAD, "Allocating IRQ interrupt\n"); + sc->bce_intr = bce_intr; } - sc->bce_res_irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, - RF_SHAREABLE | RF_ACTIVE); + sc->bce_res_irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, + &rid, RF_SHAREABLE | RF_ACTIVE); + + sc->bce_irq_rid = rid; + /* Report any IRQ allocation errors. */ if (sc->bce_res_irq == NULL) { - BCE_PRINTF("%s(%d): PCI map interrupt failed!\n", + BCE_PRINTF("%s(%d): PCI map interrupt failed!\n", __FILE__, __LINE__); rc = ENXIO; goto bce_attach_fail; @@ -577,18 +782,22 @@ case BCE_CHIP_ID_5706_A1: case BCE_CHIP_ID_5708_A0: case BCE_CHIP_ID_5708_B0: + case BCE_CHIP_ID_5709_A0: + case BCE_CHIP_ID_5709_B0: + case BCE_CHIP_ID_5709_B1: + case BCE_CHIP_ID_5709_B2: BCE_PRINTF("%s(%d): Unsupported controller revision (%c%d)!\n", - __FILE__, __LINE__, + __FILE__, __LINE__, (((pci_read_config(dev, PCIR_REVID, 4) & 0xf0) >> 4) + 'A'), (pci_read_config(dev, PCIR_REVID, 4) & 0xf)); rc = ENODEV; goto bce_attach_fail; } - /* - * The embedded PCIe to PCI-X bridge (EPB) - * in the 5708 cannot address memory above - * 40 bits (E7_5708CB1_23043 & E6_5708SB1_23043). + /* + * The embedded PCIe to PCI-X bridge (EPB) + * in the 5708 cannot address memory above + * 40 bits (E7_5708CB1_23043 & E6_5708SB1_23043). */ if (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5708) sc->max_bus_addr = BCE_BUS_SPACE_MAXADDR; @@ -602,15 +811,17 @@ */ val = REG_RD_IND(sc, BCE_SHM_HDR_SIGNATURE); if ((val & BCE_SHM_HDR_SIGNATURE_SIG_MASK) == BCE_SHM_HDR_SIGNATURE_SIG) - sc->bce_shmem_base = REG_RD_IND(sc, BCE_SHM_HDR_ADDR_0); + /* Multi-port devices use different offsets in shared memory. */ + sc->bce_shmem_base = REG_RD_IND(sc, BCE_SHM_HDR_ADDR_0 + + (pci_get_function(sc->bce_dev) << 2)); else sc->bce_shmem_base = HOST_VIEW_SHMEM_BASE; - DBPRINT(sc, BCE_VERBOSE_FIRMWARE, "%s(): bce_shmem_base = 0x%08X\n", + DBPRINT(sc, BCE_VERBOSE_FIRMWARE, "%s(): bce_shmem_base = 0x%08X\n", __FUNCTION__, sc->bce_shmem_base); /* Fetch the bootcode revision. */ - sc->bce_fw_ver = REG_RD_IND(sc, sc->bce_shmem_base + + sc->bce_fw_ver = REG_RD_IND(sc, sc->bce_shmem_base + BCE_DEV_INFO_BC_REV); /* Check if any management firmware is running. */ @@ -665,7 +876,7 @@ /* Reset the controller and announce to bootcode that driver is present. */ if (bce_reset(sc, BCE_DRV_MSG_CODE_RESET)) { - BCE_PRINTF("%s(%d): Controller reset failed!\n", + BCE_PRINTF("%s(%d): Controller reset failed!\n", __FILE__, __LINE__); rc = ENXIO; goto bce_attach_fail; @@ -695,7 +906,7 @@ * should be ready before generating an * interrupt while ticks control how long * a BD can sit in the chain before - * generating an interrupt. Set the default + * generating an interrupt. Set the default * values for the RX and TX chains. */ @@ -726,33 +937,14 @@ /* Update statistics once every second. */ sc->bce_stats_ticks = 1000000 & 0xffff00; - /* - * The SerDes based NetXtreme II controllers - * that support 2.5Gb operation (currently - * 5708S) use a PHY at address 2, otherwise - * the PHY is present at address 1. - */ - sc->bce_phy_addr = 1; + /* Find the media type for the adapter. */ + bce_get_media(sc); - if (BCE_CHIP_BOND_ID(sc) & BCE_CHIP_BOND_ID_SERDES_BIT) { - sc->bce_phy_flags |= BCE_PHY_SERDES_FLAG; - sc->bce_flags |= BCE_NO_WOL_FLAG; - if (BCE_CHIP_NUM(sc) != BCE_CHIP_NUM_5706) { - sc->bce_phy_addr = 2; - val = REG_RD_IND(sc, sc->bce_shmem_base + - BCE_SHARED_HW_CFG_CONFIG); - if (val & BCE_SHARED_HW_CFG_PHY_2_5G) { - sc->bce_phy_flags |= BCE_PHY_2_5G_CAPABLE_FLAG; - DBPRINT(sc, BCE_INFO_LOAD, "Found 2.5Gb capable adapter\n"); - } - } - } - /* Store data needed by PHY driver for backplane applications */ sc->bce_shared_hw_cfg = REG_RD_IND(sc, sc->bce_shmem_base + BCE_SHARED_HW_CFG_CONFIG); sc->bce_port_hw_cfg = REG_RD_IND(sc, sc->bce_shmem_base + - BCE_SHARED_HW_CFG_CONFIG); + BCE_PORT_HW_CFG_CONFIG); /* Allocate DMA memory resources. */ if (bce_dma_alloc(dev)) { @@ -765,7 +957,7 @@ /* Allocate an ifnet structure. */ ifp = sc->bce_ifp = if_alloc(IFT_ETHER); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jun 15 07:56:08 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 42CA21065674; Sun, 15 Jun 2008 07:56:08 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DF6CB1065670 for ; Sun, 15 Jun 2008 07:56:07 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CEA9C8FC13 for ; Sun, 15 Jun 2008 07:56:07 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5F7u7V6064510 for ; Sun, 15 Jun 2008 07:56:07 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5F7u5nu064504 for perforce@freebsd.org; Sun, 15 Jun 2008 07:56:05 GMT (envelope-from julian@freebsd.org) Date: Sun, 15 Jun 2008 07:56:05 GMT Message-Id: <200806150756.m5F7u5nu064504@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 143491 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Jun 2008 07:56:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=143491 Change 143491 by julian@julian_trafmon1 on 2008/06/15 07:55:47 IFC@143481 Affected files ... .. //depot/projects/vimage-commit/src/sys/amd64/amd64/pmap.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/i8134x/i81342_pci.c#2 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#2 integrate .. //depot/projects/vimage-commit/src/sys/conf/files#4 integrate .. //depot/projects/vimage-commit/src/sys/conf/files.i386#2 integrate .. //depot/projects/vimage-commit/src/sys/conf/files.pc98#2 integrate .. //depot/projects/vimage-commit/src/sys/conf/options.i386#2 integrate .. //depot/projects/vimage-commit/src/sys/conf/options.pc98#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/bce/if_bce.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/bce/if_bcefw.h#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/bce/if_bcereg.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ex/if_ex.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/ex/if_ex_isa.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/ex/if_ex_pccard.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/ex/if_exvar.h#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/mii/brgphy.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/smc/if_smc.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/smc/if_smcvar.h#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/if_rum.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usbdevs#3 integrate .. //depot/projects/vimage-commit/src/sys/geom/part/g_part_apm.c#2 integrate .. //depot/projects/vimage-commit/src/sys/geom/part/g_part_bsd.c#2 integrate .. //depot/projects/vimage-commit/src/sys/geom/part/g_part_gpt.c#2 integrate .. //depot/projects/vimage-commit/src/sys/geom/part/g_part_mbr.c#2 integrate .. //depot/projects/vimage-commit/src/sys/geom/part/g_part_pc98.c#2 integrate .. //depot/projects/vimage-commit/src/sys/geom/part/g_part_vtoc8.c#2 integrate .. //depot/projects/vimage-commit/src/sys/i386/conf/NOTES#3 integrate .. //depot/projects/vimage-commit/src/sys/i386/include/pecoff_machdep.h#2 delete .. //depot/projects/vimage-commit/src/sys/kern/kern_conf.c#3 integrate .. //depot/projects/vimage-commit/src/sys/modules/Makefile#3 integrate .. //depot/projects/vimage-commit/src/sys/netinet/sctp.h#2 integrate .. //depot/projects/vimage-commit/src/sys/netinet/sctp_asconf.c#2 integrate .. //depot/projects/vimage-commit/src/sys/netinet/sctp_auth.c#2 integrate .. //depot/projects/vimage-commit/src/sys/netinet/sctp_bsd_addr.c#2 integrate .. //depot/projects/vimage-commit/src/sys/netinet/sctp_bsd_addr.h#2 integrate .. //depot/projects/vimage-commit/src/sys/netinet/sctp_cc_functions.c#2 integrate .. //depot/projects/vimage-commit/src/sys/netinet/sctp_header.h#2 integrate .. //depot/projects/vimage-commit/src/sys/netinet/sctp_indata.c#2 integrate .. //depot/projects/vimage-commit/src/sys/netinet/sctp_input.c#2 integrate .. //depot/projects/vimage-commit/src/sys/netinet/sctp_lock_bsd.h#2 integrate .. //depot/projects/vimage-commit/src/sys/netinet/sctp_os_bsd.h#2 integrate .. //depot/projects/vimage-commit/src/sys/netinet/sctp_output.c#2 integrate .. //depot/projects/vimage-commit/src/sys/netinet/sctp_pcb.c#2 integrate .. //depot/projects/vimage-commit/src/sys/netinet/sctp_pcb.h#2 integrate .. //depot/projects/vimage-commit/src/sys/netinet/sctp_peeloff.c#2 integrate .. //depot/projects/vimage-commit/src/sys/netinet/sctp_sysctl.c#2 integrate .. //depot/projects/vimage-commit/src/sys/netinet/sctp_sysctl.h#2 integrate .. //depot/projects/vimage-commit/src/sys/netinet/sctp_timer.c#2 integrate .. //depot/projects/vimage-commit/src/sys/netinet/sctp_uio.h#2 integrate .. //depot/projects/vimage-commit/src/sys/netinet/sctp_usrreq.c#2 integrate .. //depot/projects/vimage-commit/src/sys/netinet/sctp_var.h#2 integrate .. //depot/projects/vimage-commit/src/sys/netinet/sctputil.c#2 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/sctp6_usrreq.c#3 integrate .. //depot/projects/vimage-commit/src/sys/pc98/conf/NOTES#2 integrate .. //depot/projects/vimage-commit/src/sys/pc98/include/pecoff_machdep.h#2 delete .. //depot/projects/vimage-commit/src/sys/powerpc/powermac/grackle.c#2 integrate .. //depot/projects/vimage-commit/src/sys/powerpc/powermac/macio.c#2 integrate .. //depot/projects/vimage-commit/src/sys/powerpc/powermac/uninorth.c#2 integrate .. //depot/projects/vimage-commit/src/sys/security/mac/mac_framework.h#2 integrate .. //depot/projects/vimage-commit/src/sys/security/mac/mac_inet.c#2 integrate .. //depot/projects/vimage-commit/src/sys/security/mac/mac_policy.h#2 integrate .. //depot/projects/vimage-commit/src/sys/security/mac_biba/mac_biba.c#2 integrate .. //depot/projects/vimage-commit/src/sys/security/mac_lomac/mac_lomac.c#2 integrate .. //depot/projects/vimage-commit/src/sys/security/mac_mls/mac_mls.c#2 integrate .. //depot/projects/vimage-commit/src/sys/security/mac_stub/mac_stub.c#2 integrate .. //depot/projects/vimage-commit/src/sys/security/mac_test/mac_test.c#2 integrate .. //depot/projects/vimage-commit/src/sys/sys/apm.h#2 integrate .. //depot/projects/vimage-commit/src/sys/sys/conf.h#3 integrate .. //depot/projects/vimage-commit/src/sys/sys/ioctl.h#2 integrate .. //depot/projects/vimage-commit/src/sys/sys/ioctl_compat.h#2 integrate .. //depot/projects/vimage-commit/src/sys/sys/param.h#2 integrate .. //depot/projects/vimage-commit/src/sys/sys/systm.h#2 integrate .. //depot/projects/vimage-commit/src/sys/sys/ttychars.h#2 delete .. //depot/projects/vimage-commit/src/sys/sys/ttydev.h#2 delete .. //depot/projects/vimage-commit/src/sys/vm/vnode_pager.c#2 integrate Differences ... ==== //depot/projects/vimage-commit/src/sys/amd64/amd64/pmap.c#2 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.619 2008/06/01 07:36:59 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.621 2008/06/13 19:33:56 alc Exp $"); /* * Manages physical address maps. @@ -2759,8 +2759,8 @@ /* * Tries to promote the 512, contiguous 4KB page mappings that are within a - * single page table page to a single 2MB page mapping. For promotion to - * occur, two conditions must be met: (1) the 4KB page mappings must map + * single page table page (PTP) to a single 2MB page mapping. For promotion + * to occur, two conditions must be met: (1) the 4KB page mappings must map * aligned, contiguous physical memory and (2) the 4KB page mappings must have * identical characteristics. */ @@ -2768,31 +2768,46 @@ pmap_promote_pde(pmap_t pmap, pd_entry_t *pde, vm_offset_t va) { pd_entry_t newpde; - pt_entry_t *firstpte, oldpte, *pte; + pt_entry_t *firstpte, oldpte, pa, *pte; vm_offset_t oldpteva; - vm_paddr_t pa; vm_page_t mpte; PMAP_LOCK_ASSERT(pmap, MA_OWNED); + + /* + * Examine the first PTE in the specified PTP. Abort if this PTE is + * either invalid, unused, or does not map the first 4KB physical page + * within a 2MB page. + */ firstpte = (pt_entry_t *)PHYS_TO_DMAP(*pde & PG_FRAME); +setpde: newpde = *firstpte; - if ((newpde & (PG_A | PG_V)) != (PG_A | PG_V)) { + if ((newpde & ((PG_FRAME & PDRMASK) | PG_A | PG_V)) != (PG_A | PG_V)) { pmap_pde_p_failures++; CTR2(KTR_PMAP, "pmap_promote_pde: failure for va %#lx" " in pmap %p", va, pmap); return; } - if ((newpde & (PG_M | PG_RW)) == PG_RW) + if ((newpde & (PG_M | PG_RW)) == PG_RW) { + /* + * When PG_M is already clear, PG_RW can be cleared without + * a TLB invalidation. + */ + if (!atomic_cmpset_long(firstpte, newpde, newpde & ~PG_RW)) + goto setpde; newpde &= ~PG_RW; + } - /* - * Check all the ptes before promotion + /* + * Examine each of the other PTEs in the specified PTP. Abort if this + * PTE maps an unexpected 4KB physical page or does not have identical + * characteristics to the first PTE. */ - pa = newpde & PG_PS_FRAME; - for (pte = firstpte; pte < firstpte + NPTEPG; pte++) { -retry: + pa = (newpde & (PG_PS_FRAME | PG_A | PG_V)) + NBPDR - PAGE_SIZE; + for (pte = firstpte + NPTEPG - 1; pte > firstpte; pte--) { +setpte: oldpte = *pte; - if ((oldpte & PG_FRAME) != pa) { + if ((oldpte & (PG_FRAME | PG_A | PG_V)) != pa) { pmap_pde_p_failures++; CTR2(KTR_PMAP, "pmap_promote_pde: failure for va %#lx" " in pmap %p", va, pmap); @@ -2804,7 +2819,7 @@ * without a TLB invalidation. */ if (!atomic_cmpset_long(pte, oldpte, oldpte & ~PG_RW)) - goto retry; + goto setpte; oldpte &= ~PG_RW; oldpteva = (oldpte & PG_FRAME & PDRMASK) | (va & ~PDRMASK); @@ -2817,7 +2832,7 @@ " in pmap %p", va, pmap); return; } - pa += PAGE_SIZE; + pa -= PAGE_SIZE; } /* ==== //depot/projects/vimage-commit/src/sys/arm/xscale/i8134x/i81342_pci.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/i8134x/i81342_pci.c,v 1.2 2007/09/30 11:05:14 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/i8134x/i81342_pci.c,v 1.3 2008/06/12 01:46:06 kevlo Exp $"); #include #include @@ -185,7 +185,7 @@ IOP34X_PCIE_OIOBAR_VADDR, (sc->sc_is_atux ? IOP34X_PCIX_OIOBAR_VADDR : IOP34X_PCIE_OIOBAR_VADDR) + IOP34X_OIOBAR_SIZE) != 0) { - panic("i80321_pci_probe: failed to set up I/O rman"); + panic("i81342_pci_probe: failed to set up I/O rman"); } sc->sc_mem_rman.rm_type = RMAN_ARRAY; sc->sc_mem_rman.rm_descr = "I81342 PCI Memory"; ==== //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#2 (text+ko) ==== @@ -279,12 +279,6 @@ #ifndef MAXMIN64 #define MAXMIN64 0xffffffffUL #endif -#ifndef major -#define major(x) ((int)(((u_int)(x) >> 8)&0xff)) /* major number */ -#endif -#ifndef minor -#define minor(x) ((int)((x)&0xffff00ff)) /* minor number */ -#endif /* * Create special expldev for ZFS private use. @@ -297,7 +291,7 @@ static uint64_t zfs_expldev(dev_t dev) { - return (((uint64_t)major(dev) << NBITSMINOR64) | minor(dev)); + return (((uint64_t)umajor(dev) << NBITSMINOR64) | uminor(dev)); } /* * Special cmpldev for ZFS private use. ==== //depot/projects/vimage-commit/src/sys/conf/files#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1308 2008/06/11 22:10:10 jfv Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1309 2008/06/14 15:17:02 rwatson Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1817,7 +1817,7 @@ netatalk/aarp.c optional netatalk netatalk/at_control.c optional netatalk netatalk/at_proto.c optional netatalk -netatalk/at_rmx.c optional netatalkdebug +netatalk/at_rmx.c optional netatalk netatalk/ddp_input.c optional netatalk netatalk/ddp_output.c optional netatalk netatalk/ddp_pcb.c optional netatalk ==== //depot/projects/vimage-commit/src/sys/conf/files.i386#2 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.i386,v 1.596 2008/05/26 10:39:52 bz Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.597 2008/06/14 12:51:44 wkoszek Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -107,7 +107,6 @@ compat/ndis/subr_pe.c optional ndisapi pci compat/ndis/subr_usbd.c optional ndisapi pci compat/ndis/winx32_wrap.S optional ndisapi pci -compat/pecoff/imgact_pecoff.c optional pecoff_support compat/svr4/imgact_svr4.c optional compat_svr4 compat/svr4/svr4_fcntl.c optional compat_svr4 compat/svr4/svr4_filio.c optional compat_svr4 ==== //depot/projects/vimage-commit/src/sys/conf/files.pc98#2 (text+ko) ==== @@ -3,7 +3,7 @@ # # modified for PC-9801/PC-9821 # -# $FreeBSD: src/sys/conf/files.pc98,v 1.363 2008/05/26 10:39:52 bz Exp $ +# $FreeBSD: src/sys/conf/files.pc98,v 1.364 2008/06/14 12:51:44 wkoszek Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -70,7 +70,6 @@ compat/linux/linux_time.c optional compat_linux compat/linux/linux_uid16.c optional compat_linux compat/linux/linux_util.c optional compat_linux -compat/pecoff/imgact_pecoff.c optional pecoff_support compat/svr4/imgact_svr4.c optional compat_svr4 compat/svr4/svr4_fcntl.c optional compat_svr4 compat/svr4/svr4_filio.c optional compat_svr4 ==== //depot/projects/vimage-commit/src/sys/conf/options.i386#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options.i386,v 1.241 2008/05/26 10:39:52 bz Exp $ +# $FreeBSD: src/sys/conf/options.i386,v 1.242 2008/06/14 12:51:44 wkoszek Exp $ # Options specific to the i386 platform kernels AUTO_EOI_1 opt_auto_eoi.h @@ -27,8 +27,6 @@ LINPROCFS opt_dontuse.h LINSYSFS opt_dontuse.h NDISAPI opt_dontuse.h -PECOFF_DEBUG opt_pecoff.h -PECOFF_SUPPORT opt_dontuse.h # Change KVM size. Changes things all over the kernel. KVA_PAGES opt_global.h ==== //depot/projects/vimage-commit/src/sys/conf/options.pc98#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options.pc98,v 1.203 2008/05/26 10:39:52 bz Exp $ +# $FreeBSD: src/sys/conf/options.pc98,v 1.204 2008/06/14 12:51:44 wkoszek Exp $ # Options specific to the pc98 platform kernels AUTO_EOI_1 opt_auto_eoi.h @@ -25,8 +25,6 @@ DEBUG_SVR4 opt_svr4.h LINPROCFS opt_dontuse.h LINSYSFS opt_dontuse.h -PECOFF_DEBUG opt_pecoff.h -PECOFF_SUPPORT opt_dontuse.h # Change KVM size. Changes things all over the kernel. KVA_PAGES opt_global.h ==== //depot/projects/vimage-commit/src/sys/dev/bce/if_bce.c#3 (text) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/bce/if_bce.c,v 1.41 2008/06/10 02:19:11 davidch Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bce/if_bce.c,v 1.42 2008/06/13 01:16:37 davidch Exp $"); /* * The following controllers are supported by this driver: @@ -37,12 +37,16 @@ * BCM5706S A2, A3 * BCM5708C B1, B2 * BCM5708S B1, B2 + * BCM5709C A1, C0 + * BCM5716 C0 * * The following controllers are not supported by this driver: * BCM5706C A0, A1 (pre-production) * BCM5706S A0, A1 (pre-production) * BCM5708C A0, B0 (pre-production) * BCM5708S A0, B0 (pre-production) + * BCM5709C A0 B0, B1, B2 (pre-production) + * BCM5709S A0, A1, B0, B1, B2, C0 (pre-production) */ #include "opt_bce.h" @@ -85,8 +89,9 @@ /****************************************************************************/ /* BCE Build Time Options */ /****************************************************************************/ -#define BCE_USE_SPLIT_HEADER 1 +#define BCE_USE_SPLIT_HEADER 1 /* #define BCE_NVRAM_WRITE_SUPPORT 1 */ + /****************************************************************************/ /* PCI Device ID Table */ @@ -117,6 +122,19 @@ /* BCM5708S controllers and OEM boards. */ { BRCM_VENDORID, BRCM_DEVICEID_BCM5708S, PCI_ANY_ID, PCI_ANY_ID, "Broadcom NetXtreme II BCM5708 1000Base-SX" }, + + /* BCM5709C controllers and OEM boards. */ + { BRCM_VENDORID, BRCM_DEVICEID_BCM5709, PCI_ANY_ID, PCI_ANY_ID, + "Broadcom NetXtreme II BCM5709 1000Base-T" }, + + /* BCM5709S controllers and OEM boards. */ + { BRCM_VENDORID, BRCM_DEVICEID_BCM5709S, PCI_ANY_ID, PCI_ANY_ID, + "Broadcom NetXtreme II BCM5709 1000Base-SX" }, + + /* BCM5716 controllers and OEM boards. */ + { BRCM_VENDORID, BRCM_DEVICEID_BCM5716, PCI_ANY_ID, PCI_ANY_ID, + "Broadcom NetXtreme II BCM5716 1000Base-T" }, + { 0, 0, 0, 0, NULL } }; @@ -126,91 +144,110 @@ /****************************************************************************/ static struct flash_spec flash_table[] = { +#define BUFFERED_FLAGS (BCE_NV_BUFFERED | BCE_NV_TRANSLATE) +#define NONBUFFERED_FLAGS (BCE_NV_WREN) + /* Slow EEPROM */ {0x00000000, 0x40830380, 0x009f0081, 0xa184a053, 0xaf000400, - 1, SEEPROM_PAGE_BITS, SEEPROM_PAGE_SIZE, + BUFFERED_FLAGS, SEEPROM_PAGE_BITS, SEEPROM_PAGE_SIZE, SEEPROM_BYTE_ADDR_MASK, SEEPROM_TOTAL_SIZE, "EEPROM - slow"}, /* Expansion entry 0001 */ {0x08000002, 0x4b808201, 0x00050081, 0x03840253, 0xaf020406, - 0, SAIFUN_FLASH_PAGE_BITS, SAIFUN_FLASH_PAGE_SIZE, + NONBUFFERED_FLAGS, SAIFUN_FLASH_PAGE_BITS, SAIFUN_FLASH_PAGE_SIZE, SAIFUN_FLASH_BYTE_ADDR_MASK, 0, "Entry 0001"}, /* Saifun SA25F010 (non-buffered flash) */ /* strap, cfg1, & write1 need updates */ {0x04000001, 0x47808201, 0x00050081, 0x03840253, 0xaf020406, - 0, SAIFUN_FLASH_PAGE_BITS, SAIFUN_FLASH_PAGE_SIZE, + NONBUFFERED_FLAGS, SAIFUN_FLASH_PAGE_BITS, SAIFUN_FLASH_PAGE_SIZE, SAIFUN_FLASH_BYTE_ADDR_MASK, SAIFUN_FLASH_BASE_TOTAL_SIZE*2, "Non-buffered flash (128kB)"}, /* Saifun SA25F020 (non-buffered flash) */ /* strap, cfg1, & write1 need updates */ {0x0c000003, 0x4f808201, 0x00050081, 0x03840253, 0xaf020406, - 0, SAIFUN_FLASH_PAGE_BITS, SAIFUN_FLASH_PAGE_SIZE, + NONBUFFERED_FLAGS, SAIFUN_FLASH_PAGE_BITS, SAIFUN_FLASH_PAGE_SIZE, SAIFUN_FLASH_BYTE_ADDR_MASK, SAIFUN_FLASH_BASE_TOTAL_SIZE*4, "Non-buffered flash (256kB)"}, /* Expansion entry 0100 */ {0x11000000, 0x53808201, 0x00050081, 0x03840253, 0xaf020406, - 0, SAIFUN_FLASH_PAGE_BITS, SAIFUN_FLASH_PAGE_SIZE, + NONBUFFERED_FLAGS, SAIFUN_FLASH_PAGE_BITS, SAIFUN_FLASH_PAGE_SIZE, SAIFUN_FLASH_BYTE_ADDR_MASK, 0, "Entry 0100"}, /* Entry 0101: ST M45PE10 (non-buffered flash, TetonII B0) */ {0x19000002, 0x5b808201, 0x000500db, 0x03840253, 0xaf020406, - 0, ST_MICRO_FLASH_PAGE_BITS, ST_MICRO_FLASH_PAGE_SIZE, + NONBUFFERED_FLAGS, ST_MICRO_FLASH_PAGE_BITS, ST_MICRO_FLASH_PAGE_SIZE, ST_MICRO_FLASH_BYTE_ADDR_MASK, ST_MICRO_FLASH_BASE_TOTAL_SIZE*2, "Entry 0101: ST M45PE10 (128kB non-bufferred)"}, /* Entry 0110: ST M45PE20 (non-buffered flash)*/ {0x15000001, 0x57808201, 0x000500db, 0x03840253, 0xaf020406, - 0, ST_MICRO_FLASH_PAGE_BITS, ST_MICRO_FLASH_PAGE_SIZE, + NONBUFFERED_FLAGS, ST_MICRO_FLASH_PAGE_BITS, ST_MICRO_FLASH_PAGE_SIZE, ST_MICRO_FLASH_BYTE_ADDR_MASK, ST_MICRO_FLASH_BASE_TOTAL_SIZE*4, "Entry 0110: ST M45PE20 (256kB non-bufferred)"}, /* Saifun SA25F005 (non-buffered flash) */ /* strap, cfg1, & write1 need updates */ {0x1d000003, 0x5f808201, 0x00050081, 0x03840253, 0xaf020406, - 0, SAIFUN_FLASH_PAGE_BITS, SAIFUN_FLASH_PAGE_SIZE, + NONBUFFERED_FLAGS, SAIFUN_FLASH_PAGE_BITS, SAIFUN_FLASH_PAGE_SIZE, SAIFUN_FLASH_BYTE_ADDR_MASK, SAIFUN_FLASH_BASE_TOTAL_SIZE, "Non-buffered flash (64kB)"}, /* Fast EEPROM */ {0x22000000, 0x62808380, 0x009f0081, 0xa184a053, 0xaf000400, - 1, SEEPROM_PAGE_BITS, SEEPROM_PAGE_SIZE, + BUFFERED_FLAGS, SEEPROM_PAGE_BITS, SEEPROM_PAGE_SIZE, SEEPROM_BYTE_ADDR_MASK, SEEPROM_TOTAL_SIZE, "EEPROM - fast"}, /* Expansion entry 1001 */ {0x2a000002, 0x6b808201, 0x00050081, 0x03840253, 0xaf020406, - 0, SAIFUN_FLASH_PAGE_BITS, SAIFUN_FLASH_PAGE_SIZE, + NONBUFFERED_FLAGS, SAIFUN_FLASH_PAGE_BITS, SAIFUN_FLASH_PAGE_SIZE, SAIFUN_FLASH_BYTE_ADDR_MASK, 0, "Entry 1001"}, /* Expansion entry 1010 */ {0x26000001, 0x67808201, 0x00050081, 0x03840253, 0xaf020406, - 0, SAIFUN_FLASH_PAGE_BITS, SAIFUN_FLASH_PAGE_SIZE, + NONBUFFERED_FLAGS, SAIFUN_FLASH_PAGE_BITS, SAIFUN_FLASH_PAGE_SIZE, SAIFUN_FLASH_BYTE_ADDR_MASK, 0, "Entry 1010"}, /* ATMEL AT45DB011B (buffered flash) */ {0x2e000003, 0x6e808273, 0x00570081, 0x68848353, 0xaf000400, - 1, BUFFERED_FLASH_PAGE_BITS, BUFFERED_FLASH_PAGE_SIZE, + BUFFERED_FLAGS, BUFFERED_FLASH_PAGE_BITS, BUFFERED_FLASH_PAGE_SIZE, BUFFERED_FLASH_BYTE_ADDR_MASK, BUFFERED_FLASH_TOTAL_SIZE, "Buffered flash (128kB)"}, /* Expansion entry 1100 */ {0x33000000, 0x73808201, 0x00050081, 0x03840253, 0xaf020406, - 0, SAIFUN_FLASH_PAGE_BITS, SAIFUN_FLASH_PAGE_SIZE, + NONBUFFERED_FLAGS, SAIFUN_FLASH_PAGE_BITS, SAIFUN_FLASH_PAGE_SIZE, SAIFUN_FLASH_BYTE_ADDR_MASK, 0, "Entry 1100"}, /* Expansion entry 1101 */ {0x3b000002, 0x7b808201, 0x00050081, 0x03840253, 0xaf020406, - 0, SAIFUN_FLASH_PAGE_BITS, SAIFUN_FLASH_PAGE_SIZE, + NONBUFFERED_FLAGS, SAIFUN_FLASH_PAGE_BITS, SAIFUN_FLASH_PAGE_SIZE, SAIFUN_FLASH_BYTE_ADDR_MASK, 0, "Entry 1101"}, /* Ateml Expansion entry 1110 */ {0x37000001, 0x76808273, 0x00570081, 0x68848353, 0xaf000400, - 1, BUFFERED_FLASH_PAGE_BITS, BUFFERED_FLASH_PAGE_SIZE, + BUFFERED_FLAGS, BUFFERED_FLASH_PAGE_BITS, BUFFERED_FLASH_PAGE_SIZE, BUFFERED_FLASH_BYTE_ADDR_MASK, 0, "Entry 1110 (Atmel)"}, /* ATMEL AT45DB021B (buffered flash) */ {0x3f000003, 0x7e808273, 0x00570081, 0x68848353, 0xaf000400, - 1, BUFFERED_FLASH_PAGE_BITS, BUFFERED_FLASH_PAGE_SIZE, + BUFFERED_FLAGS, BUFFERED_FLASH_PAGE_BITS, BUFFERED_FLASH_PAGE_SIZE, BUFFERED_FLASH_BYTE_ADDR_MASK, BUFFERED_FLASH_TOTAL_SIZE*2, "Buffered flash (256kB)"}, }; +/* + * The BCM5709 controllers transparently handle the + * differences between Atmel 264 byte pages and all + * flash devices which use 256 byte pages, so no + * logical-to-physical mapping is required in the + * driver. + */ +static struct flash_spec flash_5709 = { + .flags = BCE_NV_BUFFERED, + .page_bits = BCM5709_FLASH_PAGE_BITS, + .page_size = BCM5709_FLASH_PAGE_SIZE, + .addr_mask = BCM5709_FLASH_BYTE_ADDR_MASK, + .total_size = BUFFERED_FLASH_TOTAL_SIZE * 2, + .name = "5709 buffered flash (256kB)", +}; + /****************************************************************************/ /* FreeBSD device entry points. */ @@ -225,31 +262,40 @@ /* BCE Debug Data Structure Dump Routines */ /****************************************************************************/ #ifdef BCE_DEBUG +static u32 bce_reg_rd (struct bce_softc *, u32); +static void bce_reg_wr (struct bce_softc *, u32, u32); +static void bce_reg_wr16 (struct bce_softc *, u32, u16); static u32 bce_ctx_rd (struct bce_softc *, u32, u32); static void bce_dump_mbuf (struct bce_softc *, struct mbuf *); static void bce_dump_tx_mbuf_chain (struct bce_softc *, u16, int); static void bce_dump_rx_mbuf_chain (struct bce_softc *, u16, int); -#ifdef BCE_USE_SPLIT_HEADER -static void bce_dump_pg_mbuf_chain (struct bce_softc *, u16, int); +#ifdef BCE_USE_SPLIT_HEADER +static void bce_dump_pg_mbuf_chain (struct bce_softc *, u16, int); #endif static void bce_dump_txbd (struct bce_softc *, int, struct tx_bd *); static void bce_dump_rxbd (struct bce_softc *, int, struct rx_bd *); -#ifdef BCE_USE_SPLIT_HEADER -static void bce_dump_pgbd (struct bce_softc *, int, struct rx_bd *); +#ifdef BCE_USE_SPLIT_HEADER +static void bce_dump_pgbd (struct bce_softc *, int, struct rx_bd *); #endif static void bce_dump_l2fhdr (struct bce_softc *, int, struct l2_fhdr *); static void bce_dump_ctx (struct bce_softc *, u16); static void bce_dump_ftqs (struct bce_softc *); static void bce_dump_tx_chain (struct bce_softc *, u16, int); static void bce_dump_rx_chain (struct bce_softc *, u16, int); -#ifdef BCE_USE_SPLIT_HEADER -static void bce_dump_pg_chain (struct bce_softc *, u16, int); +#ifdef BCE_USE_SPLIT_HEADER +static void bce_dump_pg_chain (struct bce_softc *, u16, int); #endif static void bce_dump_status_block (struct bce_softc *); static void bce_dump_stats_block (struct bce_softc *); static void bce_dump_driver_state (struct bce_softc *); static void bce_dump_hw_state (struct bce_softc *); +static void bce_dump_mq_regs (struct bce_softc *); static void bce_dump_bc_state (struct bce_softc *); +static void bce_dump_txp_state (struct bce_softc *, int); +static void bce_dump_rxp_state (struct bce_softc *, int); +static void bce_dump_tpat_state (struct bce_softc *, int); +static void bce_dump_cp_state (struct bce_softc *, int); +static void bce_dump_com_state (struct bce_softc *, int); static void bce_breakpoint (struct bce_softc *); #endif @@ -287,6 +333,7 @@ /****************************************************************************/ /* */ /****************************************************************************/ +static void bce_get_media (struct bce_softc *); static void bce_dma_map_addr (void *, bus_dma_segment_t *, int, int); static int bce_dma_alloc (device_t); static void bce_dma_free (struct bce_softc *); @@ -298,28 +345,33 @@ static int bce_fw_sync (struct bce_softc *, u32); static void bce_load_rv2p_fw (struct bce_softc *, u32 *, u32, u32); static void bce_load_cpu_fw (struct bce_softc *, struct cpu_reg *, struct fw_info *); +static void bce_init_rxp_cpu (struct bce_softc *); +static void bce_init_txp_cpu (struct bce_softc *); +static void bce_init_tpat_cpu (struct bce_softc *); +static void bce_init_cp_cpu (struct bce_softc *); +static void bce_init_com_cpu (struct bce_softc *); static void bce_init_cpus (struct bce_softc *); +static void bce_print_adapter_info (struct bce_softc *); +static void bce_probe_pci_caps (device_t, struct bce_softc *); static void bce_stop (struct bce_softc *); static int bce_reset (struct bce_softc *, u32); static int bce_chipinit (struct bce_softc *); static int bce_blockinit (struct bce_softc *); -static int bce_get_rx_buf (struct bce_softc *, struct mbuf *, u16 *, u16 *, u32 *); -#ifdef BCE_USE_SPLIT_HEADER -static int bce_get_pg_buf (struct bce_softc *, struct mbuf *, u16 *, u16 *); -#endif static int bce_init_tx_chain (struct bce_softc *); static void bce_free_tx_chain (struct bce_softc *); +static int bce_get_rx_buf (struct bce_softc *, struct mbuf *, u16 *, u16 *, u32 *); static int bce_init_rx_chain (struct bce_softc *); static void bce_fill_rx_chain (struct bce_softc *); static void bce_free_rx_chain (struct bce_softc *); - + #ifdef BCE_USE_SPLIT_HEADER +static int bce_get_pg_buf (struct bce_softc *, struct mbuf *, u16 *, u16 *); static int bce_init_pg_chain (struct bce_softc *); static void bce_fill_pg_chain (struct bce_softc *); -static void bce_free_pg_chain (struct bce_softc *); +static void bce_free_pg_chain (struct bce_softc *); #endif static int bce_tx_encap (struct bce_softc *, struct mbuf **); @@ -342,7 +394,8 @@ static void bce_rx_intr (struct bce_softc *); static void bce_tx_intr (struct bce_softc *); static void bce_disable_intr (struct bce_softc *); -static void bce_enable_intr (struct bce_softc *); +static void bce_enable_intr (struct bce_softc *, int); + static void bce_intr (void *); static void bce_set_rx_mode (struct bce_softc *); static void bce_stats_update (struct bce_softc *); @@ -400,26 +453,27 @@ /****************************************************************************/ /* Tunable device values */ /****************************************************************************/ -static int bce_tso_enable = TRUE; -static int bce_msi_enable = 1; - SYSCTL_NODE(_hw, OID_AUTO, bce, CTLFLAG_RD, 0, "bce driver parameters"); /* Allowable values are TRUE or FALSE */ +static int bce_tso_enable = TRUE; TUNABLE_INT("hw.bce.tso_enable", &bce_tso_enable); SYSCTL_UINT(_hw_bce, OID_AUTO, tso_enable, CTLFLAG_RDTUN, &bce_tso_enable, 0, "TSO Enable/Disable"); -/* Allowable values are 0 (IRQ only) and 1 (IRQ or MSI) */ +/* Allowable values are 0 (IRQ), 1 (MSI/IRQ), and 2 (MSI-X/MSI/IRQ) */ +/* ToDo: Add MSI-X support. */ +static int bce_msi_enable = 1; TUNABLE_INT("hw.bce.msi_enable", &bce_msi_enable); SYSCTL_UINT(_hw_bce, OID_AUTO, msi_enable, CTLFLAG_RDTUN, &bce_msi_enable, 0, -"MSI | INTx selector"); +"MSI-X|MSI|INTx selector"); /* ToDo: Add tunable to enable/disable strict MTU handling. */ /* Currently allows "loose" RX MTU checking (i.e. sets the */ /* h/w RX MTU to the size of the largest receive buffer, or */ /* 2048 bytes). */ + /****************************************************************************/ /* Device probe function. */ /* */ @@ -450,14 +504,14 @@ svid = pci_get_subvendor(dev); sdid = pci_get_subdevice(dev); - DBPRINT(sc, BCE_VERBOSE_LOAD, + DBPRINT(sc, BCE_EXTREME_LOAD, "%s(); VID = 0x%04X, DID = 0x%04X, SVID = 0x%04X, " "SDID = 0x%04X\n", __FUNCTION__, vid, did, svid, sdid); /* Look through the list of known devices for a match. */ while(t->bce_name != NULL) { - if ((vid == t->bce_vid) && (did == t->bce_did) && + if ((vid == t->bce_vid) && (did == t->bce_did) && ((svid == t->bce_svid) || (t->bce_svid == PCI_ANY_ID)) && ((sdid == t->bce_sdid) || (t->bce_sdid == PCI_ANY_ID))) { @@ -467,7 +521,7 @@ return(ENOMEM); /* Print out the device identity. */ - snprintf(descbuf, BCE_DEVDESC_MAX, "%s (%c%d)", + snprintf(descbuf, BCE_DEVDESC_MAX, "%s (%c%d)", t->bce_name, (((pci_read_config(dev, PCIR_REVID, 4) & 0xf0) >> 4) + 'A'), (pci_read_config(dev, PCIR_REVID, 4) & 0xf)); @@ -484,6 +538,109 @@ /****************************************************************************/ +/* PCI Capabilities Probe Function. */ +/* */ +/* Walks the PCI capabiites list for the device to find what features are */ +/* supported. */ +/* */ +/* Returns: */ +/* None. */ +/****************************************************************************/ +static void +bce_print_adapter_info(struct bce_softc *sc) +{ + DBENTER(BCE_VERBOSE_LOAD); + + BCE_PRINTF("ASIC (0x%08X); ", sc->bce_chipid); + printf("Rev (%c%d); ", ((BCE_CHIP_ID(sc) & 0xf000) >> 12) + 'A', + ((BCE_CHIP_ID(sc) & 0x0ff0) >> 4)); + + /* Bus info. */ + if (sc->bce_flags & BCE_PCIE_FLAG) { + printf("Bus (PCIe x%d, ", sc->link_width); + switch (sc->link_speed) { + case 1: printf("2.5Gbps); "); break; + case 2: printf("5Gbps); "); break; + default: printf("Unknown link speed); "); + } + } else { + printf("Bus (PCI%s, %s, %dMHz); ", + ((sc->bce_flags & BCE_PCIX_FLAG) ? "-X" : ""), + ((sc->bce_flags & BCE_PCI_32BIT_FLAG) ? "32-bit" : "64-bit"), + sc->bus_speed_mhz); + } + + /* Firmware version and device features. */ + printf("F/W (0x%08X); Flags( ", sc->bce_fw_ver); +#ifdef BCE_USE_SPLIT_HEADER + printf("SPLT "); +#endif + if (sc->bce_flags & BCE_MFW_ENABLE_FLAG) + printf("MFW "); + if (sc->bce_flags & BCE_USING_MSI_FLAG) + printf("MSI "); + if (sc->bce_flags & BCE_USING_MSIX_FLAG) + printf("MSI-X "); + if (sc->bce_phy_flags & BCE_PHY_2_5G_CAPABLE_FLAG) + printf("2.5G "); + printf(")\n"); + + DBEXIT(BCE_VERBOSE_LOAD); +} + + +/****************************************************************************/ +/* PCI Capabilities Probe Function. */ +/* */ +/* Walks the PCI capabiites list for the device to find what features are */ +/* supported. */ +/* */ +/* Returns: */ +/* None. */ +/****************************************************************************/ +static void +bce_probe_pci_caps(device_t dev, struct bce_softc *sc) +{ + u32 reg; + + DBENTER(BCE_VERBOSE_LOAD); + + /* Check if PCI-X capability is enabled. */ + if (pci_find_extcap(dev, PCIY_PCIX, ®) == 0) { + if (reg != 0) + sc->bce_cap_flags |= BCE_PCIX_CAPABLE_FLAG; + } + + /* Check if PCIe capability is enabled. */ + if (pci_find_extcap(dev, PCIY_EXPRESS, ®) == 0) { + if (reg != 0) { + u16 link_status = pci_read_config(dev, reg + 0x12, 2); + DBPRINT(sc, BCE_INFO_LOAD, "PCIe link_status = 0x%08X\n", + link_status); + sc->link_speed = link_status & 0xf; + sc->link_width = (link_status >> 4) & 0x3f; + sc->bce_cap_flags |= BCE_PCIE_CAPABLE_FLAG; + sc->bce_flags |= BCE_PCIE_FLAG; + } + } + + /* Check if MSI capability is enabled. */ + if (pci_find_extcap(dev, PCIY_MSI, ®) == 0) { + if (reg != 0) + sc->bce_cap_flags |= BCE_MSI_CAPABLE_FLAG; + } + + /* Check if MSI-X capability is enabled. */ + if (pci_find_extcap(dev, PCIY_MSIX, ®) == 0) { + if (reg != 0) + sc->bce_cap_flags |= BCE_MSIX_CAPABLE_FLAG; + } + + DBEXIT(BCE_VERBOSE_LOAD); +} + + +/****************************************************************************/ /* Device attach function. */ /* */ /* Allocates device resources, performs secondary chip identification, */ @@ -499,12 +656,12 @@ struct bce_softc *sc; struct ifnet *ifp; u32 val; - int count, rid, rc = 0; + int error, rid, rc = 0; sc = device_get_softc(dev); sc->bce_dev = dev; - DBPRINT(sc, BCE_VERBOSE_RESET, "Entering %s()\n", __FUNCTION__); + DBENTER(BCE_VERBOSE_LOAD | BCE_VERBOSE_RESET); sc->bce_unit = device_get_unit(dev); @@ -520,7 +677,7 @@ &rid, RF_ACTIVE); if (sc->bce_res_mem == NULL) { - BCE_PRINTF("%s(%d): PCI memory allocation failed\n", + BCE_PRINTF("%s(%d): PCI memory allocation failed\n", __FILE__, __LINE__); rc = ENXIO; goto bce_attach_fail; @@ -531,25 +688,73 @@ sc->bce_bhandle = rman_get_bushandle(sc->bce_res_mem); sc->bce_vhandle = (vm_offset_t) rman_get_virtual(sc->bce_res_mem); - /* If MSI is enabled in the driver, get the vector count. */ - count = bce_msi_enable ? pci_msi_count(dev) : 0; + bce_probe_pci_caps(dev, sc); + + rid = 1; +#if 0 + /* Try allocating MSI-X interrupts. */ + if ((sc->bce_cap_flags & BCE_MSIX_CAPABLE_FLAG) && + (bce_msi_enable >= 2) && + ((sc->bce_res_irq = bus_alloc_resource_any(dev, SYS_RES_MEMORY, + &rid, RF_ACTIVE)) != NULL)) { + + msi_needed = sc->bce_msi_count = 1; + + if (((error = pci_alloc_msix(dev, &sc->bce_msi_count)) != 0) || + (sc->bce_msi_count != msi_needed)) { + BCE_PRINTF("%s(%d): MSI-X allocation failed! Requested = %d," + "Received = %d, error = %d\n", __FILE__, __LINE__, + msi_needed, sc->bce_msi_count, error); + sc->bce_msi_count = 0; + pci_release_msi(dev); + bus_release_resource(dev, SYS_RES_MEMORY, rid, + sc->bce_res_irq); + sc->bce_res_irq = NULL; + } else { + DBPRINT(sc, BCE_INFO_LOAD, "%s(): Using MSI-X interrupt.\n", + __FUNCTION__); + sc->bce_flags |= BCE_USING_MSIX_FLAG; + sc->bce_intr = bce_intr; + } + } +#endif + + /* Try allocating a MSI interrupt. */ + if ((sc->bce_cap_flags & BCE_MSI_CAPABLE_FLAG) && + (bce_msi_enable >= 1) && (sc->bce_msi_count == 0)) { + sc->bce_msi_count = 1; + if ((error = pci_alloc_msi(dev, &sc->bce_msi_count)) != 0) { + BCE_PRINTF("%s(%d): MSI allocation failed! error = %d\n", + __FILE__, __LINE__, error); + sc->bce_msi_count = 0; + pci_release_msi(dev); + } else { + DBPRINT(sc, BCE_INFO_LOAD, "%s(): Using MSI interrupt.\n", + __FUNCTION__); + sc->bce_flags |= BCE_USING_MSI_FLAG; + if (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) + sc->bce_flags |= BCE_ONE_SHOT_MSI_FLAG; + sc->bce_irq_rid = 1; + sc->bce_intr = bce_intr; + } + } - /* Allocate PCI IRQ resources. */ - if (count == 1 && pci_alloc_msi(dev, &count) == 0 && count == 1) { - rid = 1; - sc->bce_flags |= BCE_USING_MSI_FLAG; - DBPRINT(sc, BCE_VERBOSE_LOAD, - "Allocating %d MSI interrupt(s)\n", count); - } else { + /* Try allocating a legacy interrupt. */ + if (sc->bce_msi_count == 0) { + DBPRINT(sc, BCE_INFO_LOAD, "%s(): Using INTx interrupt.\n", + __FUNCTION__); rid = 0; - DBPRINT(sc, BCE_VERBOSE_LOAD, "Allocating IRQ interrupt\n"); + sc->bce_intr = bce_intr; } - sc->bce_res_irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, - RF_SHAREABLE | RF_ACTIVE); + sc->bce_res_irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, + &rid, RF_SHAREABLE | RF_ACTIVE); + + sc->bce_irq_rid = rid; + /* Report any IRQ allocation errors. */ if (sc->bce_res_irq == NULL) { - BCE_PRINTF("%s(%d): PCI map interrupt failed!\n", + BCE_PRINTF("%s(%d): PCI map interrupt failed!\n", __FILE__, __LINE__); rc = ENXIO; goto bce_attach_fail; @@ -577,18 +782,22 @@ case BCE_CHIP_ID_5706_A1: case BCE_CHIP_ID_5708_A0: case BCE_CHIP_ID_5708_B0: + case BCE_CHIP_ID_5709_A0: + case BCE_CHIP_ID_5709_B0: + case BCE_CHIP_ID_5709_B1: + case BCE_CHIP_ID_5709_B2: BCE_PRINTF("%s(%d): Unsupported controller revision (%c%d)!\n", - __FILE__, __LINE__, + __FILE__, __LINE__, (((pci_read_config(dev, PCIR_REVID, 4) & 0xf0) >> 4) + 'A'), (pci_read_config(dev, PCIR_REVID, 4) & 0xf)); rc = ENODEV; goto bce_attach_fail; } - /* - * The embedded PCIe to PCI-X bridge (EPB) - * in the 5708 cannot address memory above - * 40 bits (E7_5708CB1_23043 & E6_5708SB1_23043). + /* + * The embedded PCIe to PCI-X bridge (EPB) + * in the 5708 cannot address memory above + * 40 bits (E7_5708CB1_23043 & E6_5708SB1_23043). */ if (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5708) sc->max_bus_addr = BCE_BUS_SPACE_MAXADDR; @@ -602,15 +811,17 @@ */ val = REG_RD_IND(sc, BCE_SHM_HDR_SIGNATURE); if ((val & BCE_SHM_HDR_SIGNATURE_SIG_MASK) == BCE_SHM_HDR_SIGNATURE_SIG) - sc->bce_shmem_base = REG_RD_IND(sc, BCE_SHM_HDR_ADDR_0); + /* Multi-port devices use different offsets in shared memory. */ + sc->bce_shmem_base = REG_RD_IND(sc, BCE_SHM_HDR_ADDR_0 + + (pci_get_function(sc->bce_dev) << 2)); else sc->bce_shmem_base = HOST_VIEW_SHMEM_BASE; - DBPRINT(sc, BCE_VERBOSE_FIRMWARE, "%s(): bce_shmem_base = 0x%08X\n", + DBPRINT(sc, BCE_VERBOSE_FIRMWARE, "%s(): bce_shmem_base = 0x%08X\n", __FUNCTION__, sc->bce_shmem_base); /* Fetch the bootcode revision. */ - sc->bce_fw_ver = REG_RD_IND(sc, sc->bce_shmem_base + + sc->bce_fw_ver = REG_RD_IND(sc, sc->bce_shmem_base + BCE_DEV_INFO_BC_REV); /* Check if any management firmware is running. */ @@ -665,7 +876,7 @@ /* Reset the controller and announce to bootcode that driver is present. */ if (bce_reset(sc, BCE_DRV_MSG_CODE_RESET)) { - BCE_PRINTF("%s(%d): Controller reset failed!\n", + BCE_PRINTF("%s(%d): Controller reset failed!\n", __FILE__, __LINE__); rc = ENXIO; goto bce_attach_fail; @@ -695,7 +906,7 @@ * should be ready before generating an * interrupt while ticks control how long * a BD can sit in the chain before - * generating an interrupt. Set the default + * generating an interrupt. Set the default * values for the RX and TX chains. */ @@ -726,33 +937,14 @@ /* Update statistics once every second. */ sc->bce_stats_ticks = 1000000 & 0xffff00; - /* - * The SerDes based NetXtreme II controllers - * that support 2.5Gb operation (currently - * 5708S) use a PHY at address 2, otherwise - * the PHY is present at address 1. - */ - sc->bce_phy_addr = 1; + /* Find the media type for the adapter. */ + bce_get_media(sc); - if (BCE_CHIP_BOND_ID(sc) & BCE_CHIP_BOND_ID_SERDES_BIT) { - sc->bce_phy_flags |= BCE_PHY_SERDES_FLAG; - sc->bce_flags |= BCE_NO_WOL_FLAG; - if (BCE_CHIP_NUM(sc) != BCE_CHIP_NUM_5706) { - sc->bce_phy_addr = 2; - val = REG_RD_IND(sc, sc->bce_shmem_base + - BCE_SHARED_HW_CFG_CONFIG); - if (val & BCE_SHARED_HW_CFG_PHY_2_5G) { - sc->bce_phy_flags |= BCE_PHY_2_5G_CAPABLE_FLAG; - DBPRINT(sc, BCE_INFO_LOAD, "Found 2.5Gb capable adapter\n"); - } - } - } - /* Store data needed by PHY driver for backplane applications */ sc->bce_shared_hw_cfg = REG_RD_IND(sc, sc->bce_shmem_base + BCE_SHARED_HW_CFG_CONFIG); sc->bce_port_hw_cfg = REG_RD_IND(sc, sc->bce_shmem_base + - BCE_SHARED_HW_CFG_CONFIG); + BCE_PORT_HW_CFG_CONFIG); /* Allocate DMA memory resources. */ if (bce_dma_alloc(dev)) { @@ -765,7 +957,7 @@ /* Allocate an ifnet structure. */ ifp = sc->bce_ifp = if_alloc(IFT_ETHER); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jun 15 07:58:13 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 061EB1065677; Sun, 15 Jun 2008 07:58:13 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A2EF4106566B for ; Sun, 15 Jun 2008 07:58:12 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9218B8FC0A for ; Sun, 15 Jun 2008 07:58:12 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5F7wC7p064645 for ; Sun, 15 Jun 2008 07:58:12 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5F7w90p064639 for perforce@freebsd.org; Sun, 15 Jun 2008 07:58:09 GMT (envelope-from julian@freebsd.org) Date: Sun, 15 Jun 2008 07:58:09 GMT Message-Id: <200806150758.m5F7w90p064639@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 143492 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Jun 2008 07:58:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=143492 Change 143492 by julian@julian_trafmon1 on 2008/06/15 07:57:41 IFC@143481 Affected files ... .. //depot/projects/vimage-devel/src/sys/amd64/amd64/pmap.c#2 integrate .. //depot/projects/vimage-devel/src/sys/arm/xscale/i8134x/i81342_pci.c#2 integrate .. //depot/projects/vimage-devel/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#2 integrate .. //depot/projects/vimage-devel/src/sys/conf/files#3 integrate .. //depot/projects/vimage-devel/src/sys/conf/files.i386#2 integrate .. //depot/projects/vimage-devel/src/sys/conf/files.pc98#2 integrate .. //depot/projects/vimage-devel/src/sys/conf/options.i386#2 integrate .. //depot/projects/vimage-devel/src/sys/conf/options.pc98#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/bce/if_bce.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/bce/if_bcefw.h#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/bce/if_bcereg.h#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/ex/if_ex.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/ex/if_ex_isa.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/ex/if_ex_pccard.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/ex/if_exvar.h#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/mii/brgphy.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/smc/if_smc.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/smc/if_smcvar.h#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/usb/if_rum.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/usb/usbdevs#2 integrate .. //depot/projects/vimage-devel/src/sys/geom/part/g_part_apm.c#2 integrate .. //depot/projects/vimage-devel/src/sys/geom/part/g_part_bsd.c#2 integrate .. //depot/projects/vimage-devel/src/sys/geom/part/g_part_gpt.c#2 integrate .. //depot/projects/vimage-devel/src/sys/geom/part/g_part_mbr.c#2 integrate .. //depot/projects/vimage-devel/src/sys/geom/part/g_part_pc98.c#2 integrate .. //depot/projects/vimage-devel/src/sys/geom/part/g_part_vtoc8.c#2 integrate .. //depot/projects/vimage-devel/src/sys/i386/conf/NOTES#3 integrate .. //depot/projects/vimage-devel/src/sys/i386/include/pecoff_machdep.h#2 delete .. //depot/projects/vimage-devel/src/sys/kern/kern_conf.c#2 integrate .. //depot/projects/vimage-devel/src/sys/modules/Makefile#2 integrate .. //depot/projects/vimage-devel/src/sys/netinet/sctp.h#2 integrate .. //depot/projects/vimage-devel/src/sys/netinet/sctp_asconf.c#2 integrate .. //depot/projects/vimage-devel/src/sys/netinet/sctp_auth.c#2 integrate .. //depot/projects/vimage-devel/src/sys/netinet/sctp_bsd_addr.c#2 integrate .. //depot/projects/vimage-devel/src/sys/netinet/sctp_bsd_addr.h#2 integrate .. //depot/projects/vimage-devel/src/sys/netinet/sctp_cc_functions.c#2 integrate .. //depot/projects/vimage-devel/src/sys/netinet/sctp_header.h#2 integrate .. //depot/projects/vimage-devel/src/sys/netinet/sctp_indata.c#2 integrate .. //depot/projects/vimage-devel/src/sys/netinet/sctp_input.c#2 integrate .. //depot/projects/vimage-devel/src/sys/netinet/sctp_lock_bsd.h#2 integrate .. //depot/projects/vimage-devel/src/sys/netinet/sctp_os_bsd.h#2 integrate .. //depot/projects/vimage-devel/src/sys/netinet/sctp_output.c#3 integrate .. //depot/projects/vimage-devel/src/sys/netinet/sctp_pcb.c#2 integrate .. //depot/projects/vimage-devel/src/sys/netinet/sctp_pcb.h#2 integrate .. //depot/projects/vimage-devel/src/sys/netinet/sctp_peeloff.c#2 integrate .. //depot/projects/vimage-devel/src/sys/netinet/sctp_sysctl.c#2 integrate .. //depot/projects/vimage-devel/src/sys/netinet/sctp_sysctl.h#2 integrate .. //depot/projects/vimage-devel/src/sys/netinet/sctp_timer.c#2 integrate .. //depot/projects/vimage-devel/src/sys/netinet/sctp_uio.h#2 integrate .. //depot/projects/vimage-devel/src/sys/netinet/sctp_usrreq.c#2 integrate .. //depot/projects/vimage-devel/src/sys/netinet/sctp_var.h#2 integrate .. //depot/projects/vimage-devel/src/sys/netinet/sctputil.c#2 integrate .. //depot/projects/vimage-devel/src/sys/netinet6/sctp6_usrreq.c#3 integrate .. //depot/projects/vimage-devel/src/sys/pc98/conf/NOTES#2 integrate .. //depot/projects/vimage-devel/src/sys/pc98/include/pecoff_machdep.h#2 delete .. //depot/projects/vimage-devel/src/sys/powerpc/powermac/grackle.c#2 integrate .. //depot/projects/vimage-devel/src/sys/powerpc/powermac/macio.c#2 integrate .. //depot/projects/vimage-devel/src/sys/powerpc/powermac/uninorth.c#2 integrate .. //depot/projects/vimage-devel/src/sys/security/mac/mac_framework.h#2 integrate .. //depot/projects/vimage-devel/src/sys/security/mac/mac_inet.c#2 integrate .. //depot/projects/vimage-devel/src/sys/security/mac/mac_policy.h#2 integrate .. //depot/projects/vimage-devel/src/sys/security/mac_biba/mac_biba.c#2 integrate .. //depot/projects/vimage-devel/src/sys/security/mac_lomac/mac_lomac.c#2 integrate .. //depot/projects/vimage-devel/src/sys/security/mac_mls/mac_mls.c#2 integrate .. //depot/projects/vimage-devel/src/sys/security/mac_stub/mac_stub.c#2 integrate .. //depot/projects/vimage-devel/src/sys/security/mac_test/mac_test.c#2 integrate .. //depot/projects/vimage-devel/src/sys/sys/apm.h#2 integrate .. //depot/projects/vimage-devel/src/sys/sys/conf.h#2 integrate .. //depot/projects/vimage-devel/src/sys/sys/ioctl.h#2 integrate .. //depot/projects/vimage-devel/src/sys/sys/ioctl_compat.h#2 integrate .. //depot/projects/vimage-devel/src/sys/sys/param.h#2 integrate .. //depot/projects/vimage-devel/src/sys/sys/systm.h#2 integrate .. //depot/projects/vimage-devel/src/sys/sys/ttychars.h#2 delete .. //depot/projects/vimage-devel/src/sys/sys/ttydev.h#2 delete .. //depot/projects/vimage-devel/src/sys/vm/vnode_pager.c#2 integrate Differences ... ==== //depot/projects/vimage-devel/src/sys/amd64/amd64/pmap.c#2 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.619 2008/06/01 07:36:59 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.621 2008/06/13 19:33:56 alc Exp $"); /* * Manages physical address maps. @@ -2759,8 +2759,8 @@ /* * Tries to promote the 512, contiguous 4KB page mappings that are within a - * single page table page to a single 2MB page mapping. For promotion to - * occur, two conditions must be met: (1) the 4KB page mappings must map + * single page table page (PTP) to a single 2MB page mapping. For promotion + * to occur, two conditions must be met: (1) the 4KB page mappings must map * aligned, contiguous physical memory and (2) the 4KB page mappings must have * identical characteristics. */ @@ -2768,31 +2768,46 @@ pmap_promote_pde(pmap_t pmap, pd_entry_t *pde, vm_offset_t va) { pd_entry_t newpde; - pt_entry_t *firstpte, oldpte, *pte; + pt_entry_t *firstpte, oldpte, pa, *pte; vm_offset_t oldpteva; - vm_paddr_t pa; vm_page_t mpte; PMAP_LOCK_ASSERT(pmap, MA_OWNED); + + /* + * Examine the first PTE in the specified PTP. Abort if this PTE is + * either invalid, unused, or does not map the first 4KB physical page + * within a 2MB page. + */ firstpte = (pt_entry_t *)PHYS_TO_DMAP(*pde & PG_FRAME); +setpde: newpde = *firstpte; - if ((newpde & (PG_A | PG_V)) != (PG_A | PG_V)) { + if ((newpde & ((PG_FRAME & PDRMASK) | PG_A | PG_V)) != (PG_A | PG_V)) { pmap_pde_p_failures++; CTR2(KTR_PMAP, "pmap_promote_pde: failure for va %#lx" " in pmap %p", va, pmap); return; } - if ((newpde & (PG_M | PG_RW)) == PG_RW) + if ((newpde & (PG_M | PG_RW)) == PG_RW) { + /* + * When PG_M is already clear, PG_RW can be cleared without + * a TLB invalidation. + */ + if (!atomic_cmpset_long(firstpte, newpde, newpde & ~PG_RW)) + goto setpde; newpde &= ~PG_RW; + } - /* - * Check all the ptes before promotion + /* + * Examine each of the other PTEs in the specified PTP. Abort if this + * PTE maps an unexpected 4KB physical page or does not have identical + * characteristics to the first PTE. */ - pa = newpde & PG_PS_FRAME; - for (pte = firstpte; pte < firstpte + NPTEPG; pte++) { -retry: + pa = (newpde & (PG_PS_FRAME | PG_A | PG_V)) + NBPDR - PAGE_SIZE; + for (pte = firstpte + NPTEPG - 1; pte > firstpte; pte--) { +setpte: oldpte = *pte; - if ((oldpte & PG_FRAME) != pa) { + if ((oldpte & (PG_FRAME | PG_A | PG_V)) != pa) { pmap_pde_p_failures++; CTR2(KTR_PMAP, "pmap_promote_pde: failure for va %#lx" " in pmap %p", va, pmap); @@ -2804,7 +2819,7 @@ * without a TLB invalidation. */ if (!atomic_cmpset_long(pte, oldpte, oldpte & ~PG_RW)) - goto retry; + goto setpte; oldpte &= ~PG_RW; oldpteva = (oldpte & PG_FRAME & PDRMASK) | (va & ~PDRMASK); @@ -2817,7 +2832,7 @@ " in pmap %p", va, pmap); return; } - pa += PAGE_SIZE; + pa -= PAGE_SIZE; } /* ==== //depot/projects/vimage-devel/src/sys/arm/xscale/i8134x/i81342_pci.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/i8134x/i81342_pci.c,v 1.2 2007/09/30 11:05:14 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/i8134x/i81342_pci.c,v 1.3 2008/06/12 01:46:06 kevlo Exp $"); #include #include @@ -185,7 +185,7 @@ IOP34X_PCIE_OIOBAR_VADDR, (sc->sc_is_atux ? IOP34X_PCIX_OIOBAR_VADDR : IOP34X_PCIE_OIOBAR_VADDR) + IOP34X_OIOBAR_SIZE) != 0) { - panic("i80321_pci_probe: failed to set up I/O rman"); + panic("i81342_pci_probe: failed to set up I/O rman"); } sc->sc_mem_rman.rm_type = RMAN_ARRAY; sc->sc_mem_rman.rm_descr = "I81342 PCI Memory"; ==== //depot/projects/vimage-devel/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#2 (text+ko) ==== @@ -279,12 +279,6 @@ #ifndef MAXMIN64 #define MAXMIN64 0xffffffffUL #endif -#ifndef major -#define major(x) ((int)(((u_int)(x) >> 8)&0xff)) /* major number */ -#endif -#ifndef minor -#define minor(x) ((int)((x)&0xffff00ff)) /* minor number */ -#endif /* * Create special expldev for ZFS private use. @@ -297,7 +291,7 @@ static uint64_t zfs_expldev(dev_t dev) { - return (((uint64_t)major(dev) << NBITSMINOR64) | minor(dev)); + return (((uint64_t)umajor(dev) << NBITSMINOR64) | uminor(dev)); } /* * Special cmpldev for ZFS private use. ==== //depot/projects/vimage-devel/src/sys/conf/files#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1308 2008/06/11 22:10:10 jfv Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1309 2008/06/14 15:17:02 rwatson Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1818,7 +1818,7 @@ netatalk/aarp.c optional netatalk netatalk/at_control.c optional netatalk netatalk/at_proto.c optional netatalk -netatalk/at_rmx.c optional netatalkdebug +netatalk/at_rmx.c optional netatalk netatalk/ddp_input.c optional netatalk netatalk/ddp_output.c optional netatalk netatalk/ddp_pcb.c optional netatalk ==== //depot/projects/vimage-devel/src/sys/conf/files.i386#2 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.i386,v 1.596 2008/05/26 10:39:52 bz Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.597 2008/06/14 12:51:44 wkoszek Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -107,7 +107,6 @@ compat/ndis/subr_pe.c optional ndisapi pci compat/ndis/subr_usbd.c optional ndisapi pci compat/ndis/winx32_wrap.S optional ndisapi pci -compat/pecoff/imgact_pecoff.c optional pecoff_support compat/svr4/imgact_svr4.c optional compat_svr4 compat/svr4/svr4_fcntl.c optional compat_svr4 compat/svr4/svr4_filio.c optional compat_svr4 ==== //depot/projects/vimage-devel/src/sys/conf/files.pc98#2 (text+ko) ==== @@ -3,7 +3,7 @@ # # modified for PC-9801/PC-9821 # -# $FreeBSD: src/sys/conf/files.pc98,v 1.363 2008/05/26 10:39:52 bz Exp $ +# $FreeBSD: src/sys/conf/files.pc98,v 1.364 2008/06/14 12:51:44 wkoszek Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -70,7 +70,6 @@ compat/linux/linux_time.c optional compat_linux compat/linux/linux_uid16.c optional compat_linux compat/linux/linux_util.c optional compat_linux -compat/pecoff/imgact_pecoff.c optional pecoff_support compat/svr4/imgact_svr4.c optional compat_svr4 compat/svr4/svr4_fcntl.c optional compat_svr4 compat/svr4/svr4_filio.c optional compat_svr4 ==== //depot/projects/vimage-devel/src/sys/conf/options.i386#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options.i386,v 1.241 2008/05/26 10:39:52 bz Exp $ +# $FreeBSD: src/sys/conf/options.i386,v 1.242 2008/06/14 12:51:44 wkoszek Exp $ # Options specific to the i386 platform kernels AUTO_EOI_1 opt_auto_eoi.h @@ -27,8 +27,6 @@ LINPROCFS opt_dontuse.h LINSYSFS opt_dontuse.h NDISAPI opt_dontuse.h -PECOFF_DEBUG opt_pecoff.h -PECOFF_SUPPORT opt_dontuse.h # Change KVM size. Changes things all over the kernel. KVA_PAGES opt_global.h ==== //depot/projects/vimage-devel/src/sys/conf/options.pc98#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options.pc98,v 1.203 2008/05/26 10:39:52 bz Exp $ +# $FreeBSD: src/sys/conf/options.pc98,v 1.204 2008/06/14 12:51:44 wkoszek Exp $ # Options specific to the pc98 platform kernels AUTO_EOI_1 opt_auto_eoi.h @@ -25,8 +25,6 @@ DEBUG_SVR4 opt_svr4.h LINPROCFS opt_dontuse.h LINSYSFS opt_dontuse.h -PECOFF_DEBUG opt_pecoff.h -PECOFF_SUPPORT opt_dontuse.h # Change KVM size. Changes things all over the kernel. KVA_PAGES opt_global.h ==== //depot/projects/vimage-devel/src/sys/dev/bce/if_bce.c#2 (text) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/bce/if_bce.c,v 1.41 2008/06/10 02:19:11 davidch Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bce/if_bce.c,v 1.42 2008/06/13 01:16:37 davidch Exp $"); /* * The following controllers are supported by this driver: @@ -37,12 +37,16 @@ * BCM5706S A2, A3 * BCM5708C B1, B2 * BCM5708S B1, B2 + * BCM5709C A1, C0 + * BCM5716 C0 * * The following controllers are not supported by this driver: * BCM5706C A0, A1 (pre-production) * BCM5706S A0, A1 (pre-production) * BCM5708C A0, B0 (pre-production) * BCM5708S A0, B0 (pre-production) + * BCM5709C A0 B0, B1, B2 (pre-production) + * BCM5709S A0, A1, B0, B1, B2, C0 (pre-production) */ #include "opt_bce.h" @@ -85,8 +89,9 @@ /****************************************************************************/ /* BCE Build Time Options */ /****************************************************************************/ -#define BCE_USE_SPLIT_HEADER 1 +#define BCE_USE_SPLIT_HEADER 1 /* #define BCE_NVRAM_WRITE_SUPPORT 1 */ + /****************************************************************************/ /* PCI Device ID Table */ @@ -117,6 +122,19 @@ /* BCM5708S controllers and OEM boards. */ { BRCM_VENDORID, BRCM_DEVICEID_BCM5708S, PCI_ANY_ID, PCI_ANY_ID, "Broadcom NetXtreme II BCM5708 1000Base-SX" }, + + /* BCM5709C controllers and OEM boards. */ + { BRCM_VENDORID, BRCM_DEVICEID_BCM5709, PCI_ANY_ID, PCI_ANY_ID, + "Broadcom NetXtreme II BCM5709 1000Base-T" }, + + /* BCM5709S controllers and OEM boards. */ + { BRCM_VENDORID, BRCM_DEVICEID_BCM5709S, PCI_ANY_ID, PCI_ANY_ID, + "Broadcom NetXtreme II BCM5709 1000Base-SX" }, + + /* BCM5716 controllers and OEM boards. */ + { BRCM_VENDORID, BRCM_DEVICEID_BCM5716, PCI_ANY_ID, PCI_ANY_ID, + "Broadcom NetXtreme II BCM5716 1000Base-T" }, + { 0, 0, 0, 0, NULL } }; @@ -126,91 +144,110 @@ /****************************************************************************/ static struct flash_spec flash_table[] = { +#define BUFFERED_FLAGS (BCE_NV_BUFFERED | BCE_NV_TRANSLATE) +#define NONBUFFERED_FLAGS (BCE_NV_WREN) + /* Slow EEPROM */ {0x00000000, 0x40830380, 0x009f0081, 0xa184a053, 0xaf000400, - 1, SEEPROM_PAGE_BITS, SEEPROM_PAGE_SIZE, + BUFFERED_FLAGS, SEEPROM_PAGE_BITS, SEEPROM_PAGE_SIZE, SEEPROM_BYTE_ADDR_MASK, SEEPROM_TOTAL_SIZE, "EEPROM - slow"}, /* Expansion entry 0001 */ {0x08000002, 0x4b808201, 0x00050081, 0x03840253, 0xaf020406, - 0, SAIFUN_FLASH_PAGE_BITS, SAIFUN_FLASH_PAGE_SIZE, + NONBUFFERED_FLAGS, SAIFUN_FLASH_PAGE_BITS, SAIFUN_FLASH_PAGE_SIZE, SAIFUN_FLASH_BYTE_ADDR_MASK, 0, "Entry 0001"}, /* Saifun SA25F010 (non-buffered flash) */ /* strap, cfg1, & write1 need updates */ {0x04000001, 0x47808201, 0x00050081, 0x03840253, 0xaf020406, - 0, SAIFUN_FLASH_PAGE_BITS, SAIFUN_FLASH_PAGE_SIZE, + NONBUFFERED_FLAGS, SAIFUN_FLASH_PAGE_BITS, SAIFUN_FLASH_PAGE_SIZE, SAIFUN_FLASH_BYTE_ADDR_MASK, SAIFUN_FLASH_BASE_TOTAL_SIZE*2, "Non-buffered flash (128kB)"}, /* Saifun SA25F020 (non-buffered flash) */ /* strap, cfg1, & write1 need updates */ {0x0c000003, 0x4f808201, 0x00050081, 0x03840253, 0xaf020406, - 0, SAIFUN_FLASH_PAGE_BITS, SAIFUN_FLASH_PAGE_SIZE, + NONBUFFERED_FLAGS, SAIFUN_FLASH_PAGE_BITS, SAIFUN_FLASH_PAGE_SIZE, SAIFUN_FLASH_BYTE_ADDR_MASK, SAIFUN_FLASH_BASE_TOTAL_SIZE*4, "Non-buffered flash (256kB)"}, /* Expansion entry 0100 */ {0x11000000, 0x53808201, 0x00050081, 0x03840253, 0xaf020406, - 0, SAIFUN_FLASH_PAGE_BITS, SAIFUN_FLASH_PAGE_SIZE, + NONBUFFERED_FLAGS, SAIFUN_FLASH_PAGE_BITS, SAIFUN_FLASH_PAGE_SIZE, SAIFUN_FLASH_BYTE_ADDR_MASK, 0, "Entry 0100"}, /* Entry 0101: ST M45PE10 (non-buffered flash, TetonII B0) */ {0x19000002, 0x5b808201, 0x000500db, 0x03840253, 0xaf020406, - 0, ST_MICRO_FLASH_PAGE_BITS, ST_MICRO_FLASH_PAGE_SIZE, + NONBUFFERED_FLAGS, ST_MICRO_FLASH_PAGE_BITS, ST_MICRO_FLASH_PAGE_SIZE, ST_MICRO_FLASH_BYTE_ADDR_MASK, ST_MICRO_FLASH_BASE_TOTAL_SIZE*2, "Entry 0101: ST M45PE10 (128kB non-bufferred)"}, /* Entry 0110: ST M45PE20 (non-buffered flash)*/ {0x15000001, 0x57808201, 0x000500db, 0x03840253, 0xaf020406, - 0, ST_MICRO_FLASH_PAGE_BITS, ST_MICRO_FLASH_PAGE_SIZE, + NONBUFFERED_FLAGS, ST_MICRO_FLASH_PAGE_BITS, ST_MICRO_FLASH_PAGE_SIZE, ST_MICRO_FLASH_BYTE_ADDR_MASK, ST_MICRO_FLASH_BASE_TOTAL_SIZE*4, "Entry 0110: ST M45PE20 (256kB non-bufferred)"}, /* Saifun SA25F005 (non-buffered flash) */ /* strap, cfg1, & write1 need updates */ {0x1d000003, 0x5f808201, 0x00050081, 0x03840253, 0xaf020406, - 0, SAIFUN_FLASH_PAGE_BITS, SAIFUN_FLASH_PAGE_SIZE, + NONBUFFERED_FLAGS, SAIFUN_FLASH_PAGE_BITS, SAIFUN_FLASH_PAGE_SIZE, SAIFUN_FLASH_BYTE_ADDR_MASK, SAIFUN_FLASH_BASE_TOTAL_SIZE, "Non-buffered flash (64kB)"}, /* Fast EEPROM */ {0x22000000, 0x62808380, 0x009f0081, 0xa184a053, 0xaf000400, - 1, SEEPROM_PAGE_BITS, SEEPROM_PAGE_SIZE, + BUFFERED_FLAGS, SEEPROM_PAGE_BITS, SEEPROM_PAGE_SIZE, SEEPROM_BYTE_ADDR_MASK, SEEPROM_TOTAL_SIZE, "EEPROM - fast"}, /* Expansion entry 1001 */ {0x2a000002, 0x6b808201, 0x00050081, 0x03840253, 0xaf020406, - 0, SAIFUN_FLASH_PAGE_BITS, SAIFUN_FLASH_PAGE_SIZE, + NONBUFFERED_FLAGS, SAIFUN_FLASH_PAGE_BITS, SAIFUN_FLASH_PAGE_SIZE, SAIFUN_FLASH_BYTE_ADDR_MASK, 0, "Entry 1001"}, /* Expansion entry 1010 */ {0x26000001, 0x67808201, 0x00050081, 0x03840253, 0xaf020406, - 0, SAIFUN_FLASH_PAGE_BITS, SAIFUN_FLASH_PAGE_SIZE, + NONBUFFERED_FLAGS, SAIFUN_FLASH_PAGE_BITS, SAIFUN_FLASH_PAGE_SIZE, SAIFUN_FLASH_BYTE_ADDR_MASK, 0, "Entry 1010"}, /* ATMEL AT45DB011B (buffered flash) */ {0x2e000003, 0x6e808273, 0x00570081, 0x68848353, 0xaf000400, - 1, BUFFERED_FLASH_PAGE_BITS, BUFFERED_FLASH_PAGE_SIZE, + BUFFERED_FLAGS, BUFFERED_FLASH_PAGE_BITS, BUFFERED_FLASH_PAGE_SIZE, BUFFERED_FLASH_BYTE_ADDR_MASK, BUFFERED_FLASH_TOTAL_SIZE, "Buffered flash (128kB)"}, /* Expansion entry 1100 */ {0x33000000, 0x73808201, 0x00050081, 0x03840253, 0xaf020406, - 0, SAIFUN_FLASH_PAGE_BITS, SAIFUN_FLASH_PAGE_SIZE, + NONBUFFERED_FLAGS, SAIFUN_FLASH_PAGE_BITS, SAIFUN_FLASH_PAGE_SIZE, SAIFUN_FLASH_BYTE_ADDR_MASK, 0, "Entry 1100"}, /* Expansion entry 1101 */ {0x3b000002, 0x7b808201, 0x00050081, 0x03840253, 0xaf020406, - 0, SAIFUN_FLASH_PAGE_BITS, SAIFUN_FLASH_PAGE_SIZE, + NONBUFFERED_FLAGS, SAIFUN_FLASH_PAGE_BITS, SAIFUN_FLASH_PAGE_SIZE, SAIFUN_FLASH_BYTE_ADDR_MASK, 0, "Entry 1101"}, /* Ateml Expansion entry 1110 */ {0x37000001, 0x76808273, 0x00570081, 0x68848353, 0xaf000400, - 1, BUFFERED_FLASH_PAGE_BITS, BUFFERED_FLASH_PAGE_SIZE, + BUFFERED_FLAGS, BUFFERED_FLASH_PAGE_BITS, BUFFERED_FLASH_PAGE_SIZE, BUFFERED_FLASH_BYTE_ADDR_MASK, 0, "Entry 1110 (Atmel)"}, /* ATMEL AT45DB021B (buffered flash) */ {0x3f000003, 0x7e808273, 0x00570081, 0x68848353, 0xaf000400, - 1, BUFFERED_FLASH_PAGE_BITS, BUFFERED_FLASH_PAGE_SIZE, + BUFFERED_FLAGS, BUFFERED_FLASH_PAGE_BITS, BUFFERED_FLASH_PAGE_SIZE, BUFFERED_FLASH_BYTE_ADDR_MASK, BUFFERED_FLASH_TOTAL_SIZE*2, "Buffered flash (256kB)"}, }; +/* + * The BCM5709 controllers transparently handle the + * differences between Atmel 264 byte pages and all + * flash devices which use 256 byte pages, so no + * logical-to-physical mapping is required in the + * driver. + */ +static struct flash_spec flash_5709 = { + .flags = BCE_NV_BUFFERED, + .page_bits = BCM5709_FLASH_PAGE_BITS, + .page_size = BCM5709_FLASH_PAGE_SIZE, + .addr_mask = BCM5709_FLASH_BYTE_ADDR_MASK, + .total_size = BUFFERED_FLASH_TOTAL_SIZE * 2, + .name = "5709 buffered flash (256kB)", +}; + /****************************************************************************/ /* FreeBSD device entry points. */ @@ -225,31 +262,40 @@ /* BCE Debug Data Structure Dump Routines */ /****************************************************************************/ #ifdef BCE_DEBUG +static u32 bce_reg_rd (struct bce_softc *, u32); +static void bce_reg_wr (struct bce_softc *, u32, u32); +static void bce_reg_wr16 (struct bce_softc *, u32, u16); static u32 bce_ctx_rd (struct bce_softc *, u32, u32); static void bce_dump_mbuf (struct bce_softc *, struct mbuf *); static void bce_dump_tx_mbuf_chain (struct bce_softc *, u16, int); static void bce_dump_rx_mbuf_chain (struct bce_softc *, u16, int); -#ifdef BCE_USE_SPLIT_HEADER -static void bce_dump_pg_mbuf_chain (struct bce_softc *, u16, int); +#ifdef BCE_USE_SPLIT_HEADER +static void bce_dump_pg_mbuf_chain (struct bce_softc *, u16, int); #endif static void bce_dump_txbd (struct bce_softc *, int, struct tx_bd *); static void bce_dump_rxbd (struct bce_softc *, int, struct rx_bd *); -#ifdef BCE_USE_SPLIT_HEADER -static void bce_dump_pgbd (struct bce_softc *, int, struct rx_bd *); +#ifdef BCE_USE_SPLIT_HEADER +static void bce_dump_pgbd (struct bce_softc *, int, struct rx_bd *); #endif static void bce_dump_l2fhdr (struct bce_softc *, int, struct l2_fhdr *); static void bce_dump_ctx (struct bce_softc *, u16); static void bce_dump_ftqs (struct bce_softc *); static void bce_dump_tx_chain (struct bce_softc *, u16, int); static void bce_dump_rx_chain (struct bce_softc *, u16, int); -#ifdef BCE_USE_SPLIT_HEADER -static void bce_dump_pg_chain (struct bce_softc *, u16, int); +#ifdef BCE_USE_SPLIT_HEADER +static void bce_dump_pg_chain (struct bce_softc *, u16, int); #endif static void bce_dump_status_block (struct bce_softc *); static void bce_dump_stats_block (struct bce_softc *); static void bce_dump_driver_state (struct bce_softc *); static void bce_dump_hw_state (struct bce_softc *); +static void bce_dump_mq_regs (struct bce_softc *); static void bce_dump_bc_state (struct bce_softc *); +static void bce_dump_txp_state (struct bce_softc *, int); +static void bce_dump_rxp_state (struct bce_softc *, int); +static void bce_dump_tpat_state (struct bce_softc *, int); +static void bce_dump_cp_state (struct bce_softc *, int); +static void bce_dump_com_state (struct bce_softc *, int); static void bce_breakpoint (struct bce_softc *); #endif @@ -287,6 +333,7 @@ /****************************************************************************/ /* */ /****************************************************************************/ +static void bce_get_media (struct bce_softc *); static void bce_dma_map_addr (void *, bus_dma_segment_t *, int, int); static int bce_dma_alloc (device_t); static void bce_dma_free (struct bce_softc *); @@ -298,28 +345,33 @@ static int bce_fw_sync (struct bce_softc *, u32); static void bce_load_rv2p_fw (struct bce_softc *, u32 *, u32, u32); static void bce_load_cpu_fw (struct bce_softc *, struct cpu_reg *, struct fw_info *); +static void bce_init_rxp_cpu (struct bce_softc *); +static void bce_init_txp_cpu (struct bce_softc *); +static void bce_init_tpat_cpu (struct bce_softc *); +static void bce_init_cp_cpu (struct bce_softc *); +static void bce_init_com_cpu (struct bce_softc *); static void bce_init_cpus (struct bce_softc *); +static void bce_print_adapter_info (struct bce_softc *); +static void bce_probe_pci_caps (device_t, struct bce_softc *); static void bce_stop (struct bce_softc *); static int bce_reset (struct bce_softc *, u32); static int bce_chipinit (struct bce_softc *); static int bce_blockinit (struct bce_softc *); -static int bce_get_rx_buf (struct bce_softc *, struct mbuf *, u16 *, u16 *, u32 *); -#ifdef BCE_USE_SPLIT_HEADER -static int bce_get_pg_buf (struct bce_softc *, struct mbuf *, u16 *, u16 *); -#endif static int bce_init_tx_chain (struct bce_softc *); static void bce_free_tx_chain (struct bce_softc *); +static int bce_get_rx_buf (struct bce_softc *, struct mbuf *, u16 *, u16 *, u32 *); static int bce_init_rx_chain (struct bce_softc *); static void bce_fill_rx_chain (struct bce_softc *); static void bce_free_rx_chain (struct bce_softc *); - + #ifdef BCE_USE_SPLIT_HEADER +static int bce_get_pg_buf (struct bce_softc *, struct mbuf *, u16 *, u16 *); static int bce_init_pg_chain (struct bce_softc *); static void bce_fill_pg_chain (struct bce_softc *); -static void bce_free_pg_chain (struct bce_softc *); +static void bce_free_pg_chain (struct bce_softc *); #endif static int bce_tx_encap (struct bce_softc *, struct mbuf **); @@ -342,7 +394,8 @@ static void bce_rx_intr (struct bce_softc *); static void bce_tx_intr (struct bce_softc *); static void bce_disable_intr (struct bce_softc *); -static void bce_enable_intr (struct bce_softc *); +static void bce_enable_intr (struct bce_softc *, int); + static void bce_intr (void *); static void bce_set_rx_mode (struct bce_softc *); static void bce_stats_update (struct bce_softc *); @@ -400,26 +453,27 @@ /****************************************************************************/ /* Tunable device values */ /****************************************************************************/ -static int bce_tso_enable = TRUE; -static int bce_msi_enable = 1; - SYSCTL_NODE(_hw, OID_AUTO, bce, CTLFLAG_RD, 0, "bce driver parameters"); /* Allowable values are TRUE or FALSE */ +static int bce_tso_enable = TRUE; TUNABLE_INT("hw.bce.tso_enable", &bce_tso_enable); SYSCTL_UINT(_hw_bce, OID_AUTO, tso_enable, CTLFLAG_RDTUN, &bce_tso_enable, 0, "TSO Enable/Disable"); -/* Allowable values are 0 (IRQ only) and 1 (IRQ or MSI) */ +/* Allowable values are 0 (IRQ), 1 (MSI/IRQ), and 2 (MSI-X/MSI/IRQ) */ +/* ToDo: Add MSI-X support. */ +static int bce_msi_enable = 1; TUNABLE_INT("hw.bce.msi_enable", &bce_msi_enable); SYSCTL_UINT(_hw_bce, OID_AUTO, msi_enable, CTLFLAG_RDTUN, &bce_msi_enable, 0, -"MSI | INTx selector"); +"MSI-X|MSI|INTx selector"); /* ToDo: Add tunable to enable/disable strict MTU handling. */ /* Currently allows "loose" RX MTU checking (i.e. sets the */ /* h/w RX MTU to the size of the largest receive buffer, or */ /* 2048 bytes). */ + /****************************************************************************/ /* Device probe function. */ /* */ @@ -450,14 +504,14 @@ svid = pci_get_subvendor(dev); sdid = pci_get_subdevice(dev); - DBPRINT(sc, BCE_VERBOSE_LOAD, + DBPRINT(sc, BCE_EXTREME_LOAD, "%s(); VID = 0x%04X, DID = 0x%04X, SVID = 0x%04X, " "SDID = 0x%04X\n", __FUNCTION__, vid, did, svid, sdid); /* Look through the list of known devices for a match. */ while(t->bce_name != NULL) { - if ((vid == t->bce_vid) && (did == t->bce_did) && + if ((vid == t->bce_vid) && (did == t->bce_did) && ((svid == t->bce_svid) || (t->bce_svid == PCI_ANY_ID)) && ((sdid == t->bce_sdid) || (t->bce_sdid == PCI_ANY_ID))) { @@ -467,7 +521,7 @@ return(ENOMEM); /* Print out the device identity. */ - snprintf(descbuf, BCE_DEVDESC_MAX, "%s (%c%d)", + snprintf(descbuf, BCE_DEVDESC_MAX, "%s (%c%d)", t->bce_name, (((pci_read_config(dev, PCIR_REVID, 4) & 0xf0) >> 4) + 'A'), (pci_read_config(dev, PCIR_REVID, 4) & 0xf)); @@ -484,6 +538,109 @@ /****************************************************************************/ +/* PCI Capabilities Probe Function. */ +/* */ +/* Walks the PCI capabiites list for the device to find what features are */ +/* supported. */ +/* */ +/* Returns: */ +/* None. */ +/****************************************************************************/ +static void +bce_print_adapter_info(struct bce_softc *sc) +{ + DBENTER(BCE_VERBOSE_LOAD); + + BCE_PRINTF("ASIC (0x%08X); ", sc->bce_chipid); + printf("Rev (%c%d); ", ((BCE_CHIP_ID(sc) & 0xf000) >> 12) + 'A', + ((BCE_CHIP_ID(sc) & 0x0ff0) >> 4)); + + /* Bus info. */ + if (sc->bce_flags & BCE_PCIE_FLAG) { + printf("Bus (PCIe x%d, ", sc->link_width); + switch (sc->link_speed) { + case 1: printf("2.5Gbps); "); break; + case 2: printf("5Gbps); "); break; + default: printf("Unknown link speed); "); + } + } else { + printf("Bus (PCI%s, %s, %dMHz); ", + ((sc->bce_flags & BCE_PCIX_FLAG) ? "-X" : ""), + ((sc->bce_flags & BCE_PCI_32BIT_FLAG) ? "32-bit" : "64-bit"), + sc->bus_speed_mhz); + } + + /* Firmware version and device features. */ + printf("F/W (0x%08X); Flags( ", sc->bce_fw_ver); +#ifdef BCE_USE_SPLIT_HEADER + printf("SPLT "); +#endif + if (sc->bce_flags & BCE_MFW_ENABLE_FLAG) + printf("MFW "); + if (sc->bce_flags & BCE_USING_MSI_FLAG) + printf("MSI "); + if (sc->bce_flags & BCE_USING_MSIX_FLAG) + printf("MSI-X "); + if (sc->bce_phy_flags & BCE_PHY_2_5G_CAPABLE_FLAG) + printf("2.5G "); + printf(")\n"); + + DBEXIT(BCE_VERBOSE_LOAD); +} + + +/****************************************************************************/ +/* PCI Capabilities Probe Function. */ +/* */ +/* Walks the PCI capabiites list for the device to find what features are */ +/* supported. */ +/* */ +/* Returns: */ +/* None. */ +/****************************************************************************/ +static void +bce_probe_pci_caps(device_t dev, struct bce_softc *sc) +{ + u32 reg; + + DBENTER(BCE_VERBOSE_LOAD); + + /* Check if PCI-X capability is enabled. */ + if (pci_find_extcap(dev, PCIY_PCIX, ®) == 0) { + if (reg != 0) + sc->bce_cap_flags |= BCE_PCIX_CAPABLE_FLAG; + } + + /* Check if PCIe capability is enabled. */ + if (pci_find_extcap(dev, PCIY_EXPRESS, ®) == 0) { + if (reg != 0) { + u16 link_status = pci_read_config(dev, reg + 0x12, 2); + DBPRINT(sc, BCE_INFO_LOAD, "PCIe link_status = 0x%08X\n", + link_status); + sc->link_speed = link_status & 0xf; + sc->link_width = (link_status >> 4) & 0x3f; + sc->bce_cap_flags |= BCE_PCIE_CAPABLE_FLAG; + sc->bce_flags |= BCE_PCIE_FLAG; + } + } + + /* Check if MSI capability is enabled. */ + if (pci_find_extcap(dev, PCIY_MSI, ®) == 0) { + if (reg != 0) + sc->bce_cap_flags |= BCE_MSI_CAPABLE_FLAG; + } + + /* Check if MSI-X capability is enabled. */ + if (pci_find_extcap(dev, PCIY_MSIX, ®) == 0) { + if (reg != 0) + sc->bce_cap_flags |= BCE_MSIX_CAPABLE_FLAG; + } + + DBEXIT(BCE_VERBOSE_LOAD); +} + + +/****************************************************************************/ /* Device attach function. */ /* */ /* Allocates device resources, performs secondary chip identification, */ @@ -499,12 +656,12 @@ struct bce_softc *sc; struct ifnet *ifp; u32 val; - int count, rid, rc = 0; + int error, rid, rc = 0; sc = device_get_softc(dev); sc->bce_dev = dev; - DBPRINT(sc, BCE_VERBOSE_RESET, "Entering %s()\n", __FUNCTION__); + DBENTER(BCE_VERBOSE_LOAD | BCE_VERBOSE_RESET); sc->bce_unit = device_get_unit(dev); @@ -520,7 +677,7 @@ &rid, RF_ACTIVE); if (sc->bce_res_mem == NULL) { - BCE_PRINTF("%s(%d): PCI memory allocation failed\n", + BCE_PRINTF("%s(%d): PCI memory allocation failed\n", __FILE__, __LINE__); rc = ENXIO; goto bce_attach_fail; @@ -531,25 +688,73 @@ sc->bce_bhandle = rman_get_bushandle(sc->bce_res_mem); sc->bce_vhandle = (vm_offset_t) rman_get_virtual(sc->bce_res_mem); - /* If MSI is enabled in the driver, get the vector count. */ - count = bce_msi_enable ? pci_msi_count(dev) : 0; + bce_probe_pci_caps(dev, sc); + + rid = 1; +#if 0 + /* Try allocating MSI-X interrupts. */ + if ((sc->bce_cap_flags & BCE_MSIX_CAPABLE_FLAG) && + (bce_msi_enable >= 2) && + ((sc->bce_res_irq = bus_alloc_resource_any(dev, SYS_RES_MEMORY, + &rid, RF_ACTIVE)) != NULL)) { + + msi_needed = sc->bce_msi_count = 1; + + if (((error = pci_alloc_msix(dev, &sc->bce_msi_count)) != 0) || + (sc->bce_msi_count != msi_needed)) { + BCE_PRINTF("%s(%d): MSI-X allocation failed! Requested = %d," + "Received = %d, error = %d\n", __FILE__, __LINE__, + msi_needed, sc->bce_msi_count, error); + sc->bce_msi_count = 0; + pci_release_msi(dev); + bus_release_resource(dev, SYS_RES_MEMORY, rid, + sc->bce_res_irq); + sc->bce_res_irq = NULL; + } else { + DBPRINT(sc, BCE_INFO_LOAD, "%s(): Using MSI-X interrupt.\n", + __FUNCTION__); + sc->bce_flags |= BCE_USING_MSIX_FLAG; + sc->bce_intr = bce_intr; + } + } +#endif + + /* Try allocating a MSI interrupt. */ + if ((sc->bce_cap_flags & BCE_MSI_CAPABLE_FLAG) && + (bce_msi_enable >= 1) && (sc->bce_msi_count == 0)) { + sc->bce_msi_count = 1; + if ((error = pci_alloc_msi(dev, &sc->bce_msi_count)) != 0) { + BCE_PRINTF("%s(%d): MSI allocation failed! error = %d\n", + __FILE__, __LINE__, error); + sc->bce_msi_count = 0; + pci_release_msi(dev); + } else { + DBPRINT(sc, BCE_INFO_LOAD, "%s(): Using MSI interrupt.\n", + __FUNCTION__); + sc->bce_flags |= BCE_USING_MSI_FLAG; + if (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) + sc->bce_flags |= BCE_ONE_SHOT_MSI_FLAG; + sc->bce_irq_rid = 1; + sc->bce_intr = bce_intr; + } + } - /* Allocate PCI IRQ resources. */ - if (count == 1 && pci_alloc_msi(dev, &count) == 0 && count == 1) { - rid = 1; - sc->bce_flags |= BCE_USING_MSI_FLAG; - DBPRINT(sc, BCE_VERBOSE_LOAD, - "Allocating %d MSI interrupt(s)\n", count); - } else { + /* Try allocating a legacy interrupt. */ + if (sc->bce_msi_count == 0) { + DBPRINT(sc, BCE_INFO_LOAD, "%s(): Using INTx interrupt.\n", + __FUNCTION__); rid = 0; - DBPRINT(sc, BCE_VERBOSE_LOAD, "Allocating IRQ interrupt\n"); + sc->bce_intr = bce_intr; } - sc->bce_res_irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, - RF_SHAREABLE | RF_ACTIVE); + sc->bce_res_irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, + &rid, RF_SHAREABLE | RF_ACTIVE); + + sc->bce_irq_rid = rid; + /* Report any IRQ allocation errors. */ if (sc->bce_res_irq == NULL) { - BCE_PRINTF("%s(%d): PCI map interrupt failed!\n", + BCE_PRINTF("%s(%d): PCI map interrupt failed!\n", __FILE__, __LINE__); rc = ENXIO; goto bce_attach_fail; @@ -577,18 +782,22 @@ case BCE_CHIP_ID_5706_A1: case BCE_CHIP_ID_5708_A0: case BCE_CHIP_ID_5708_B0: + case BCE_CHIP_ID_5709_A0: + case BCE_CHIP_ID_5709_B0: + case BCE_CHIP_ID_5709_B1: + case BCE_CHIP_ID_5709_B2: BCE_PRINTF("%s(%d): Unsupported controller revision (%c%d)!\n", - __FILE__, __LINE__, + __FILE__, __LINE__, (((pci_read_config(dev, PCIR_REVID, 4) & 0xf0) >> 4) + 'A'), (pci_read_config(dev, PCIR_REVID, 4) & 0xf)); rc = ENODEV; goto bce_attach_fail; } - /* - * The embedded PCIe to PCI-X bridge (EPB) - * in the 5708 cannot address memory above - * 40 bits (E7_5708CB1_23043 & E6_5708SB1_23043). + /* + * The embedded PCIe to PCI-X bridge (EPB) + * in the 5708 cannot address memory above + * 40 bits (E7_5708CB1_23043 & E6_5708SB1_23043). */ if (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5708) sc->max_bus_addr = BCE_BUS_SPACE_MAXADDR; @@ -602,15 +811,17 @@ */ val = REG_RD_IND(sc, BCE_SHM_HDR_SIGNATURE); if ((val & BCE_SHM_HDR_SIGNATURE_SIG_MASK) == BCE_SHM_HDR_SIGNATURE_SIG) - sc->bce_shmem_base = REG_RD_IND(sc, BCE_SHM_HDR_ADDR_0); + /* Multi-port devices use different offsets in shared memory. */ + sc->bce_shmem_base = REG_RD_IND(sc, BCE_SHM_HDR_ADDR_0 + + (pci_get_function(sc->bce_dev) << 2)); else sc->bce_shmem_base = HOST_VIEW_SHMEM_BASE; - DBPRINT(sc, BCE_VERBOSE_FIRMWARE, "%s(): bce_shmem_base = 0x%08X\n", + DBPRINT(sc, BCE_VERBOSE_FIRMWARE, "%s(): bce_shmem_base = 0x%08X\n", __FUNCTION__, sc->bce_shmem_base); /* Fetch the bootcode revision. */ - sc->bce_fw_ver = REG_RD_IND(sc, sc->bce_shmem_base + + sc->bce_fw_ver = REG_RD_IND(sc, sc->bce_shmem_base + BCE_DEV_INFO_BC_REV); /* Check if any management firmware is running. */ @@ -665,7 +876,7 @@ /* Reset the controller and announce to bootcode that driver is present. */ if (bce_reset(sc, BCE_DRV_MSG_CODE_RESET)) { - BCE_PRINTF("%s(%d): Controller reset failed!\n", + BCE_PRINTF("%s(%d): Controller reset failed!\n", __FILE__, __LINE__); rc = ENXIO; goto bce_attach_fail; @@ -695,7 +906,7 @@ * should be ready before generating an * interrupt while ticks control how long * a BD can sit in the chain before - * generating an interrupt. Set the default + * generating an interrupt. Set the default * values for the RX and TX chains. */ @@ -726,33 +937,14 @@ /* Update statistics once every second. */ sc->bce_stats_ticks = 1000000 & 0xffff00; - /* - * The SerDes based NetXtreme II controllers - * that support 2.5Gb operation (currently - * 5708S) use a PHY at address 2, otherwise - * the PHY is present at address 1. - */ - sc->bce_phy_addr = 1; + /* Find the media type for the adapter. */ + bce_get_media(sc); - if (BCE_CHIP_BOND_ID(sc) & BCE_CHIP_BOND_ID_SERDES_BIT) { - sc->bce_phy_flags |= BCE_PHY_SERDES_FLAG; - sc->bce_flags |= BCE_NO_WOL_FLAG; - if (BCE_CHIP_NUM(sc) != BCE_CHIP_NUM_5706) { - sc->bce_phy_addr = 2; - val = REG_RD_IND(sc, sc->bce_shmem_base + - BCE_SHARED_HW_CFG_CONFIG); - if (val & BCE_SHARED_HW_CFG_PHY_2_5G) { - sc->bce_phy_flags |= BCE_PHY_2_5G_CAPABLE_FLAG; - DBPRINT(sc, BCE_INFO_LOAD, "Found 2.5Gb capable adapter\n"); - } - } - } - /* Store data needed by PHY driver for backplane applications */ sc->bce_shared_hw_cfg = REG_RD_IND(sc, sc->bce_shmem_base + BCE_SHARED_HW_CFG_CONFIG); sc->bce_port_hw_cfg = REG_RD_IND(sc, sc->bce_shmem_base + - BCE_SHARED_HW_CFG_CONFIG); + BCE_PORT_HW_CFG_CONFIG); /* Allocate DMA memory resources. */ if (bce_dma_alloc(dev)) { @@ -765,7 +957,7 @@ /* Allocate an ifnet structure. */ ifp = sc->bce_ifp = if_alloc(IFT_ETHER); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jun 15 14:10:28 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3725A1065673; Sun, 15 Jun 2008 14:10:28 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D5B8D106566C for ; Sun, 15 Jun 2008 14:10:27 +0000 (UTC) (envelope-from gk@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CAE5F8FC1B for ; Sun, 15 Jun 2008 14:10:27 +0000 (UTC) (envelope-from gk@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5FEARui025069 for ; Sun, 15 Jun 2008 14:10:27 GMT (envelope-from gk@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5FEAR46025067 for perforce@freebsd.org; Sun, 15 Jun 2008 14:10:27 GMT (envelope-from gk@FreeBSD.org) Date: Sun, 15 Jun 2008 14:10:27 GMT Message-Id: <200806151410.m5FEAR46025067@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gk@FreeBSD.org using -f From: Gleb Kurtsou To: Perforce Change Reviews Cc: Subject: PERFORCE change 143510 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Jun 2008 14:10:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=143510 Change 143510 by gk@gk_h1 on 2008/06/15 14:10:06 support stateful filtering by layer2 addresses. check only layer2 addresses, that were specified in rule created state. allow packet if it contains no layer2 addresses tag in stateful filter but we excpect to have one. problem is that tagging is performed only for incomming packet on ethernet interfaces and for outgoing packets on if_bridge. Affected files ... .. //depot/projects/soc2008/gk_l2filter/sys-netinet/ip_fw.h#8 edit .. //depot/projects/soc2008/gk_l2filter/sys-netinet/ip_fw2.c#9 edit Differences ... ==== //depot/projects/soc2008/gk_l2filter/sys-netinet/ip_fw.h#8 (text+ko) ==== @@ -268,7 +268,7 @@ #define IP_FW_EA_CHECK 0x02 #define IP_FW_EA_MULTICAST 0x04 -typedef struct _ip_fw_ether_addr { +typedef struct _ipfw_ether_addr { u_char octet[6]; u_int16_t flags; } ipfw_ether_addr; @@ -485,6 +485,8 @@ struct in6_addr src_ip6; u_int32_t flow_id6; u_int32_t frag_id6; + ipfw_ether_addr src_ether; + ipfw_ether_addr dst_ether; }; #define IS_IP6_FLOW_ID(id) ((id)->addr_type == 6) ==== //depot/projects/soc2008/gk_l2filter/sys-netinet/ip_fw2.c#9 (text+ko) ==== @@ -166,7 +166,13 @@ #define EA_CMP(a) (*((u_int64_t*)(a)) & *((u_int64_t*)&mask)) return (EA_CMP(want) == EA_CMP(ea)); #undef EA_CMP +} +static __inline int ether_addr_allow_dyn(ipfw_ether_addr *want, ipfw_ether_addr *a) +{ + if ((a->flags & IP_FW_EA_INIT) == 0) + return (1); + return (ether_addr_allow(want, (struct ether_addr *)a->octet)); } struct table_entry { @@ -1226,7 +1232,23 @@ if (q == NULL) goto done; /* q = NULL, not found */ - if ( prev != NULL) { /* found and not in front */ + /* + * Only check {src,dst}_ether if it was specified in rule and packet + * mbuf has mtag_ether_header. + */ + if (dir == MATCH_NONE || + !ether_addr_allow_dyn(&q->id.src_ether, + (dir == MATCH_FORWARD ? &pkt->src_ether : &pkt->dst_ether)) || + !ether_addr_allow_dyn(&q->id.dst_ether, + (dir == MATCH_FORWARD ? &pkt->dst_ether : &pkt->src_ether))) { + printf("XXX IPFW DYN RULE: dropped by mac: %6D -> %6D\n", + &pkt->src_ether.octet, ":", &pkt->dst_ether.octet, ":"); + q = NULL; + dir = MATCH_NONE; + goto done; + } + + if (prev != NULL) { /* found and not in front */ prev->next = q->next; q->next = ipfw_dyn_v[i]; ipfw_dyn_v[i] = q; @@ -2247,8 +2269,18 @@ /* * if we have an ether header, */ - if (args->eh) + if (args->eh) { etype = ntohs(args->eh->ether_type); + memcpy(args->f_id.src_ether.octet, args->eh->ether_shost, + ETHER_ADDR_LEN); + args->f_id.src_ether.flags = IP_FW_EA_INIT; + memcpy(args->f_id.dst_ether.octet, args->eh->ether_dhost, + ETHER_ADDR_LEN); + args->f_id.dst_ether.flags = IP_FW_EA_INIT; + } else { + args->f_id.src_ether.flags = 0; + args->f_id.dst_ether.flags = 0; + } /* Identify IP packets and fill up variables. */ if (pktlen >= sizeof(struct ip6_hdr) && @@ -2611,6 +2643,13 @@ (cmd->opcode == O_ETHER_SRC ? args->eh->ether_shost : args->eh->ether_dhost)); + if (match) { + /* use address to create dynamic rule */ + ipfw_ether_addr *a = (cmd->opcode == O_ETHER_SRC ? + &args->f_id.src_ether : + &args->f_id.dst_ether); + *a = *want; + } } break; From owner-p4-projects@FreeBSD.ORG Sun Jun 15 16:01:24 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E46441065672; Sun, 15 Jun 2008 16:01:23 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A48E3106566B for ; Sun, 15 Jun 2008 16:01:23 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 985B58FC19 for ; Sun, 15 Jun 2008 16:01:23 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5FG1NnO035137 for ; Sun, 15 Jun 2008 16:01:23 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5FG1NYo035135 for perforce@freebsd.org; Sun, 15 Jun 2008 16:01:23 GMT (envelope-from gabor@freebsd.org) Date: Sun, 15 Jun 2008 16:01:23 GMT Message-Id: <200806151601.m5FG1NYo035135@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 143527 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Jun 2008 16:01:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=143527 Change 143527 by gabor@gabor_server on 2008/06/15 16:00:35 - Eliminate the Sflag variable. If -P or nothing is specified Pflag is set, if -S is set Pflag is unset Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/grep.c#18 edit .. //depot/projects/soc2008/gabor_textproc/grep/grep.h#14 edit .. //depot/projects/soc2008/gabor_textproc/grep/util.c#18 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/grep.c#18 (text+ko) ==== @@ -77,7 +77,6 @@ int Oflag; /* -O: if -R, follow explicitly listed symlinks */ int Pflag; /* -P: if -R, no symlinks are followed */ int Rflag; /* -R: recursively search directory trees */ -int Sflag; /* -S: if -R, follow all symlinks */ int Zflag; /* -Z: grep in gzipped file */ int bflag; /* -b: show block numbers for each match */ int cflag; /* -c: only show a count of matching lines */ @@ -410,7 +409,7 @@ qflag = 1; break; case 'S': - Sflag++; + Pflag = 0; break; case 'R': case 'r': ==== //depot/projects/soc2008/gabor_textproc/grep/grep.h#14 (text+ko) ==== @@ -60,11 +60,10 @@ extern int cflags, eflags; /* Command line flags */ -extern int Aflag, Bflag, Dflag, Eflag, Fflag, Gflag, Hflag, Jflag, Lflag, Pflag, - Sflag, Rflag, Zflag, - bflag, cflag, hflag, iflag, lflag, mflag, nflag, Oflag, oflag, qflag, sflag, - vflag, wflag, xflag, - nullflag; +extern int Aflag, Bflag, Dflag, Eflag, Fflag, Gflag, Hflag, Jflag, + Lflag, Oflag, Pflag, Rflag, Zflag, + bflag, cflag, hflag, iflag, lflag, mflag, nflag, oflag, + qflag, sflag, vflag, wflag, xflag, nullflag; extern long long mcount; extern char *color, *label; extern int binbehave; ==== //depot/projects/soc2008/gabor_textproc/grep/util.c#18 (text+ko) ==== @@ -74,7 +74,7 @@ fts_flags = FTS_COMFOLLOW; if (Pflag) fts_flags = FTS_PHYSICAL; - if (Sflag) + else fts_flags = FTS_LOGICAL; fts_flags |= FTS_NOSTAT | FTS_NOCHDIR; From owner-p4-projects@FreeBSD.ORG Sun Jun 15 16:18:41 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 939281065675; Sun, 15 Jun 2008 16:18:41 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 55100106566B for ; Sun, 15 Jun 2008 16:18:41 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3765F8FC2B for ; Sun, 15 Jun 2008 16:18:41 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5FGIf75037557 for ; Sun, 15 Jun 2008 16:18:41 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5FGIf7J037555 for perforce@freebsd.org; Sun, 15 Jun 2008 16:18:41 GMT (envelope-from gabor@freebsd.org) Date: Sun, 15 Jun 2008 16:18:41 GMT Message-Id: <200806151618.m5FGIf7J037555@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 143529 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Jun 2008 16:18:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=143529 Change 143529 by gabor@gabor_server on 2008/06/15 16:18:03 - Enable some commented out parts and remove some other ones. - Bump .Dd Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/grep.1#11 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/grep.1#11 (text+ko) ==== @@ -29,7 +29,7 @@ .\" .\" @(#)grep.1 8.3 (Berkeley) 4/18/94 .\" -.Dd 15 Jun, 2008 +.Dd 16 Jun, 2008 .Dt GREP 1 .Os .Sh NAME @@ -281,11 +281,11 @@ The default is not to follow symbolic links. .It Fl o, Fl Fl only-matching Prints only the matching part of the lines. -.\" XXX: UNIMPLEMENTED / INCOMPATIBLE .It Fl P -.\"If -.\".Fl R -.\"is specified, no symbolic links are followed. -.\"This is the default. +.It Fl P +If +.Fl R +is specified, no symbolic links are followed. +This is the default. .It Fl q , Fl Fl quiet , Fl Fl silent Quiet mode: suppress normal output. @@ -294,19 +294,17 @@ making searches potentially less expensive. .It Fl R , Fl r , Fl Fl recursive Recursively search subdirectories listed. -.\" XXX: INCOMPATOBLE .It Fl S -.\"If -.\".Fl R -.\"is specified, all symbolic links are followed. -.\"The default is not to follow symbolic links. +.It Fl S +If +.Fl R +is specified, all symbolic links are followed. +The default is not to follow symbolic links. .It Fl s , Fl Fl no-messaes Silent mode. Nonexistent and unreadable files are ignored (i.e. their error messages are suppressed). .It Fl U , Fl Fl binary Search binary files, but do not attempt to print them. -.\" XXX: UNDOCUMENTED .It Fl u, Fl Fl unix-byte-offsets -.\"Undocumented. .It Fl V , Fl Fl version Display version information and exit. .It Fl v , Fl Fl invert-match From owner-p4-projects@FreeBSD.ORG Sun Jun 15 16:24:48 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 394511065671; Sun, 15 Jun 2008 16:24:48 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EF783106566C for ; Sun, 15 Jun 2008 16:24:47 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BCAC68FC0A for ; Sun, 15 Jun 2008 16:24:47 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5FGOl1t038108 for ; Sun, 15 Jun 2008 16:24:47 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5FGOlsW038106 for perforce@freebsd.org; Sun, 15 Jun 2008 16:24:47 GMT (envelope-from gabor@freebsd.org) Date: Sun, 15 Jun 2008 16:24:47 GMT Message-Id: <200806151624.m5FGOlsW038106@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 143532 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Jun 2008 16:24:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=143532 Change 143532 by gabor@gabor_server on 2008/06/15 16:24:44 - Remove an outdated comment Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/util.c#19 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/util.c#19 (text+ko) ==== @@ -225,7 +225,6 @@ r = REG_NOMATCH; } if ((r == 0) && (color != NULL) && !oflag && !nottext) { -/* XXX: this color stuff does not work yet :( */ char *tmp, *begin, *matched, *end; if ((begin = malloc(strlen(l->dat) - pmatch.rm_so + 20)) == NULL) From owner-p4-projects@FreeBSD.ORG Mon Jun 16 01:05:38 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 938DF106566C; Mon, 16 Jun 2008 01:05:38 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3D619106567F for ; Mon, 16 Jun 2008 01:05:38 +0000 (UTC) (envelope-from snagg@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 291488FC18 for ; Mon, 16 Jun 2008 01:05:38 +0000 (UTC) (envelope-from snagg@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5G15cER023250 for ; Mon, 16 Jun 2008 01:05:38 GMT (envelope-from snagg@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5G15cxu023248 for perforce@freebsd.org; Mon, 16 Jun 2008 01:05:38 GMT (envelope-from snagg@FreeBSD.org) Date: Mon, 16 Jun 2008 01:05:38 GMT Message-Id: <200806160105.m5G15cxu023248@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to snagg@FreeBSD.org using -f From: Vincenzo Iozzo To: Perforce Change Reviews Cc: Subject: PERFORCE change 143560 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Jun 2008 01:05:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=143560 Change 143560 by snagg@snagg_macosx on 2008/06/16 01:04:51 Some functionalities for the testing framework Affected files ... .. //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/audit_pipe_regression_test_utils.c#2 edit .. //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/audit_pipe_regression_test_utils.h#1 add Differences ... ==== //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/audit_pipe_regression_test_utils.c#2 (text+ko) ==== @@ -1,64 +1,47 @@ -/*- - * Copyright (c) 2008 Vincenzo Iozzo - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - */ +#include "audit_pipe_regression_test_utils.h" -#include -#include -#include -#include -#include +struct audit_record *del_record_au(struct audit_record *head, int index) +{ + struct audit_record *tmp; + struct audit_record *p; + + tmp = head; + if(tmp == NULL) + return NULL; + for(; tmp->next != NULL; tmp = tmp->next) + { + if(tmp->next->index == index) { + p = tmp->next; + tmp->next = tmp->next->next; + free(p); + return head; + } + } + + return NULL; +} + +struct audit_record +*add_field_au(struct audit_record *head, struct audit_record *new) +{ + struct audit_record *tmp; + + tmp = head; + if(tmp == NULL) { + new->next = NULL; + return new; + } + + for(; tmp->next != NULL;tmp = tmp->next); + + new->index = tmp->index +1; + tmp->next= new; + new->next = NULL; + + return head; +} -#include -#include - -#include - -#include -#include -#include -#include -#include -#include -#include -#include - -#define AUDIT_BUFFER_LEN 65536 -#define SHMSZ 512 -char SEM_NAME[]= "/audit-test"; -char SEM_CLIENT_NAME[]="/client"; -sem_t *mutex, *mutex_client; -char *shm; -int shmid; - -enum TYPES{ - INT_TYPE, - STRING_TYPE, - CHAR_TYPE -}; - + void init_channel() { key_t key; @@ -194,30 +177,55 @@ /* * We fetch every token from auditpipe and eventually dump them to a file + * Modified version of praudit function. */ -tokenstr_t -audit_print_record(char *buffer, int buflen, FILE *st) +struct audit_record +*audit_print_record(FILE *st, FILE *in) { + u_char *buf; tokenstr_t tok; + int reclen; + int bytesread; + int count; + u_char type; + struct audit_record *rec; - while (buflen > 0) { + type = 0; + count = 0; + rec = malloc(sizeof(struct audit_record)); + if(rec == NULL) + err(-1, "MALLOC"); + + /* Record must begin with a header token. */ + do { + type = fgetc(in); + } while(type != AU_HEADER_32_TOKEN); + ungetc(type, in); - /* XXX: Is this an incomplete record? */ - if (au_fetch_tok(&tok, buffer, buflen) == -1) - break; - au_print_tok_xml(st, &tok, ",", 0, 0); - buflen -= tok.len; - buffer += tok.len; - fprintf(st, "\n"); + while ((reclen = au_read_rec(in, &buf)) != -1) { + bytesread = 0; + while (bytesread < reclen) { + + /* Is this an incomplete record? */ + if (-1 == au_fetch_tok(&tok, buf + bytesread, + reclen - bytesread)) + break; + rec->toks[count] = tok; + rec->count = count; + au_print_tok_xml(st, &tok, ",", 0, 0); + fprintf(st, "\n"); + bytesread += tok.len; + } + free(buf); + fflush(st); } - fflush(st); - return tok; + return rec; } /* * Init log file for evaluation */ -FILE *f init_log(pid_t pid) +FILE *init_log(pid_t pid) { FILE *f; char path[512]; @@ -231,6 +239,33 @@ return f; } +void report_error(tokenstr_t tok, struct audit_record *rec, FILE *f) +{ + int i; + + if(rec == NULL) + return; + for(i = 0; i <= rec->count; i++) { + au_print_tok_xml(f, &(rec->toks[i]), ",", 0, 0); + fprintf(f, "\n"); + } + fprintf(f, "ERROR:***"); + au_print_tok_xml(f, &tok, ",", 0, 0); + fprintf(f, "\n"); +} + +/* + * Check the return value of a bsm-token + */ +int check_ret(au_exit_t ret, int r, char *val) +{ + if(ret.ret == r) + //if(!strncmp(ret.status, val, strlen(ret.status) > strlen(val)? + // strlen(ret.status): strlen(val))) + return 1; + return 0; +} + /* * Check the path field of a bsm-token */ @@ -238,5 +273,51 @@ { if(!path.len) return -1; - return strncmp(path.path, val, path.len); -} + + if(!strncmp(path.path, val, path.len > strlen(val)? path.len: strlen(val))) + return 1; + + return 0; +} + +/* + * Check the arg field of a bsm-token + */ +int check_arg(au_arg32_t arg, long val) +{ + if(!arg.len) + return -1; + + if(arg.val == val) + return 1; + + return 0; +} + +/* + * Check the pid and privilege of a bsm-token + */ +int check_priv(au_proc32ex_t priv, pid_t pid) +{ + if(priv.pid == pid && priv.euid == geteuid() && priv.ruid == getuid() && + priv.rgid == getgid() && priv.egid == getegid()) + return 1; + + return 0; +} + +/* + * Check attributes of fd from a bsm-token + */ +int check_fd(au_attr32_t attr, int fd) +{ + struct stat s; + + if(fstat(fd, &s) == -1) + return -1; + if(attr.mode == s.st_mode && attr.uid == s.st_uid && attr.gid == s.st_gid && + attr.nid == s.st_ino && attr.dev == s.st_dev) + return 1; + + return 0; +} From owner-p4-projects@FreeBSD.ORG Mon Jun 16 05:57:39 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A74621065687; Mon, 16 Jun 2008 05:57:39 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 695581065682 for ; Mon, 16 Jun 2008 05:57:39 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 573048FC15 for ; Mon, 16 Jun 2008 05:57:39 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5G5vdC9060497 for ; Mon, 16 Jun 2008 05:57:39 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5G5vaew060495 for perforce@freebsd.org; Mon, 16 Jun 2008 05:57:36 GMT (envelope-from jb@freebsd.org) Date: Mon, 16 Jun 2008 05:57:36 GMT Message-Id: <200806160557.m5G5vaew060495@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 143567 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Jun 2008 05:57:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=143567 Change 143567 by jb@freebsd3 on 2008/06/16 05:56:53 IFC Affected files ... .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/Makefile#8 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/compiz-fusion/article.sgml#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/dialup-firewall/Makefile#4 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/explaining-bsd/Makefile#4 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/explaining-bsd/article.sgml#4 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/formatting-media/Makefile#4 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/formatting-media/article.sgml#4 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/freebsd-questions/Makefile#4 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/gjournal-desktop/Makefile#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/gjournal-desktop/article.sgml#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/laptop/Makefile#4 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/linux-users/Makefile#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/linux-users/article.sgml#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/multi-os/Makefile#4 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/releng-packages/Makefile#4 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/share/sgml/articles.ent#5 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/share/sgml/books.ent#3 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/share/sgml/freebsd.ent#4 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/share/tools/checkupdate/Makefile#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/share/tools/checkupdate/checkupdate.1#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/share/tools/checkupdate/checkupdate.py#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/compiz-fusion/article.sgml#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#82 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#46 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/portbuild/article.sgml#12 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/version-guide/article.sgml#5 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/faq/book.sgml#22 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml#11 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml#17 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#16 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#77 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/share/sgml/authors.ent#37 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#7 integrate .. //depot/projects/dtrace/doc/share/pgpkeys/ivoras.key#1 branch .. //depot/projects/dtrace/doc/share/pgpkeys/pgpkeys-developers.sgml#38 integrate .. //depot/projects/dtrace/doc/share/pgpkeys/pgpkeys.ent#36 integrate .. //depot/projects/dtrace/ports/CHANGES#13 integrate .. //depot/projects/dtrace/ports/GIDs#23 integrate .. //depot/projects/dtrace/ports/Tools/portbuild/scripts/buildscript#7 integrate .. //depot/projects/dtrace/ports/Tools/portbuild/scripts/cpdistfiles#3 integrate .. //depot/projects/dtrace/ports/Tools/portbuild/scripts/dodistfiles#3 integrate .. //depot/projects/dtrace/ports/Tools/portbuild/scripts/dologs#6 integrate .. //depot/projects/dtrace/ports/Tools/portbuild/scripts/dopackages#8 integrate .. //depot/projects/dtrace/ports/Tools/portbuild/scripts/mkbindist#7 integrate .. //depot/projects/dtrace/ports/UIDs#27 integrate .. //depot/projects/dtrace/ports/UPDATING#78 integrate .. //depot/projects/dtrace/src/ObsoleteFiles.inc#47 integrate .. //depot/projects/dtrace/src/UPDATING#34 integrate .. //depot/projects/dtrace/src/etc/devd.conf#6 integrate .. //depot/projects/dtrace/src/include/sgtty.h#4 integrate .. //depot/projects/dtrace/src/lib/libarchive/Makefile#15 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive.h#1 branch .. //depot/projects/dtrace/src/lib/libarchive/archive.h.in#13 delete .. //depot/projects/dtrace/src/lib/libarchive/archive_entry_link_resolver.c#3 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_entry_strmode.c#4 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_read_support_compression_program.c#3 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_read_support_format_mtree.c#6 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_read_support_format_zip.c#14 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_string.c#8 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_string.h#9 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_write_set_compression_program.c#3 integrate .. //depot/projects/dtrace/src/lib/libarchive/config_freebsd.h#7 integrate .. //depot/projects/dtrace/src/lib/libarchive/filter_fork.c#4 integrate .. //depot/projects/dtrace/src/lib/libarchive/test/Makefile#8 integrate .. //depot/projects/dtrace/src/lib/libarchive/test/main.c#6 integrate .. //depot/projects/dtrace/src/lib/libarchive/test/test.h#5 integrate .. //depot/projects/dtrace/src/lib/libarchive/test/test_link_resolver.c#2 integrate .. //depot/projects/dtrace/src/lib/libarchive/test/test_read_extract.c#2 integrate .. //depot/projects/dtrace/src/lib/libarchive/test/test_write_disk.c#4 integrate .. //depot/projects/dtrace/src/lib/libarchive/test/test_write_disk_perms.c#3 integrate .. //depot/projects/dtrace/src/lib/libarchive/test/test_write_disk_secure.c#2 integrate .. //depot/projects/dtrace/src/lib/libc/stdlib/malloc.c#24 integrate .. //depot/projects/dtrace/src/lib/libc/sys/getsockopt.2#9 integrate .. //depot/projects/dtrace/src/lib/libcompat/4.1/gtty.c#4 delete .. //depot/projects/dtrace/src/lib/libcompat/4.1/stty.3#5 delete .. //depot/projects/dtrace/src/lib/libcompat/4.1/stty.c#4 delete .. //depot/projects/dtrace/src/lib/libcompat/Makefile#4 integrate .. //depot/projects/dtrace/src/lib/libgeom/libgeom.3#6 integrate .. //depot/projects/dtrace/src/libexec/rpc.rstatd/Makefile#4 integrate .. //depot/projects/dtrace/src/libexec/rpc.rstatd/rstat_proc.c#4 integrate .. //depot/projects/dtrace/src/sbin/Makefile#11 integrate .. //depot/projects/dtrace/src/sbin/dhclient/dhclient-script#7 integrate .. //depot/projects/dtrace/src/sbin/geom/class/part/geom_part.c#6 integrate .. //depot/projects/dtrace/src/sbin/rcorder/rcorder.8#4 integrate .. //depot/projects/dtrace/src/share/man/man4/ciss.4#6 integrate .. //depot/projects/dtrace/src/share/man/man4/ixgbe.4#1 branch .. //depot/projects/dtrace/src/share/man/man4/uplcom.4#6 integrate .. //depot/projects/dtrace/src/share/man/man5/tmpfs.5#2 integrate .. //depot/projects/dtrace/src/share/man/man9/bus_dma.9#8 integrate .. //depot/projects/dtrace/src/share/man/man9/taskqueue.9#6 integrate .. //depot/projects/dtrace/src/share/misc/committers-src.dot#10 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/pmap.c#46 integrate .. //depot/projects/dtrace/src/sys/arm/at91/if_ate.c#14 integrate .. //depot/projects/dtrace/src/sys/arm/xscale/i8134x/i81342_pci.c#3 integrate .. //depot/projects/dtrace/src/sys/arm/xscale/pxa/files.pxa#2 integrate .. //depot/projects/dtrace/src/sys/arm/xscale/pxa/pxa_obio.c#2 integrate .. //depot/projects/dtrace/src/sys/arm/xscale/pxa/pxa_space.c#2 integrate .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#10 integrate .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#5 integrate .. //depot/projects/dtrace/src/sys/compat/ndis/subr_ndis.c#9 integrate .. //depot/projects/dtrace/src/sys/compat/ndis/subr_ntoskrnl.c#12 integrate .. //depot/projects/dtrace/src/sys/conf/files#96 integrate .. //depot/projects/dtrace/src/sys/conf/files.i386#36 integrate .. //depot/projects/dtrace/src/sys/conf/files.pc98#22 integrate .. //depot/projects/dtrace/src/sys/conf/options.i386#12 integrate .. //depot/projects/dtrace/src/sys/conf/options.pc98#10 integrate .. //depot/projects/dtrace/src/sys/dev/ata/ata-all.c#16 integrate .. //depot/projects/dtrace/src/sys/dev/ata/ata-chipset.c#29 integrate .. //depot/projects/dtrace/src/sys/dev/ata/ata-pci.c#11 integrate .. //depot/projects/dtrace/src/sys/dev/bce/if_bce.c#23 integrate .. //depot/projects/dtrace/src/sys/dev/bce/if_bcefw.h#6 integrate .. //depot/projects/dtrace/src/sys/dev/bce/if_bcereg.h#14 integrate .. //depot/projects/dtrace/src/sys/dev/ciss/ciss.c#16 integrate .. //depot/projects/dtrace/src/sys/dev/ex/if_ex.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/ex/if_ex_isa.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/ex/if_ex_pccard.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/ex/if_exvar.h#5 integrate .. //depot/projects/dtrace/src/sys/dev/if_ndis/if_ndis.c#20 integrate .. //depot/projects/dtrace/src/sys/dev/if_ndis/if_ndisvar.h#10 integrate .. //depot/projects/dtrace/src/sys/dev/ixgbe/ixgbe.h#3 integrate .. //depot/projects/dtrace/src/sys/dev/ixgbe/tcp_lro.c#2 delete .. //depot/projects/dtrace/src/sys/dev/ixgbe/tcp_lro.h#2 delete .. //depot/projects/dtrace/src/sys/dev/mii/brgphy.c#17 integrate .. //depot/projects/dtrace/src/sys/dev/nmdm/nmdm.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/si/si.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/si/si.h#5 integrate .. //depot/projects/dtrace/src/sys/dev/smc/if_smc.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/smc/if_smcvar.h#2 integrate .. //depot/projects/dtrace/src/sys/dev/snp/snp.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/tx/if_tx.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/tx/if_txvar.h#4 integrate .. //depot/projects/dtrace/src/sys/dev/usb/ehci.c#16 integrate .. //depot/projects/dtrace/src/sys/dev/usb/ehcivar.h#6 integrate .. //depot/projects/dtrace/src/sys/dev/usb/if_rum.c#11 integrate .. //depot/projects/dtrace/src/sys/dev/usb/uplcom.c#9 integrate .. //depot/projects/dtrace/src/sys/dev/usb/usbdevs#39 integrate .. //depot/projects/dtrace/src/sys/dev/vkbd/vkbd.c#6 integrate .. //depot/projects/dtrace/src/sys/fs/cd9660/cd9660_vnops.c#2 integrate .. //depot/projects/dtrace/src/sys/fs/ntfs/ntfs_ihash.c#5 integrate .. //depot/projects/dtrace/src/sys/fs/tmpfs/tmpfs_subr.c#6 integrate .. //depot/projects/dtrace/src/sys/geom/part/g_part_apm.c#5 integrate .. //depot/projects/dtrace/src/sys/geom/part/g_part_bsd.c#6 integrate .. //depot/projects/dtrace/src/sys/geom/part/g_part_gpt.c#7 integrate .. //depot/projects/dtrace/src/sys/geom/part/g_part_mbr.c#6 integrate .. //depot/projects/dtrace/src/sys/geom/part/g_part_pc98.c#4 integrate .. //depot/projects/dtrace/src/sys/geom/part/g_part_vtoc8.c#4 integrate .. //depot/projects/dtrace/src/sys/i386/acpica/acpi_machdep.c#8 integrate .. //depot/projects/dtrace/src/sys/i386/conf/NOTES#23 integrate .. //depot/projects/dtrace/src/sys/i386/include/pecoff_machdep.h#4 delete .. //depot/projects/dtrace/src/sys/kern/kern_conf.c#15 integrate .. //depot/projects/dtrace/src/sys/kern/uipc_sem.c#12 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_export.c#9 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_mount.c#35 integrate .. //depot/projects/dtrace/src/sys/modules/Makefile#49 integrate .. //depot/projects/dtrace/src/sys/modules/ixgbe/Makefile#4 integrate .. //depot/projects/dtrace/src/sys/net/if_tap.c#12 integrate .. //depot/projects/dtrace/src/sys/net/if_tun.c#11 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp.h#5 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_asconf.c#8 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_auth.c#5 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_bsd_addr.c#9 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_bsd_addr.h#5 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_cc_functions.c#3 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_header.h#3 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_indata.c#13 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_input.c#14 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_lock_bsd.h#5 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_os_bsd.h#6 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_output.c#17 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_pcb.c#17 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_pcb.h#7 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_peeloff.c#5 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_sysctl.c#4 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_sysctl.h#3 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_timer.c#9 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_uio.h#8 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_usrreq.c#16 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_var.h#9 integrate .. //depot/projects/dtrace/src/sys/netinet/sctputil.c#20 integrate .. //depot/projects/dtrace/src/sys/netinet/tcp_lro.c#1 branch .. //depot/projects/dtrace/src/sys/netinet/tcp_lro.h#1 branch .. //depot/projects/dtrace/src/sys/netinet6/sctp6_usrreq.c#10 integrate .. //depot/projects/dtrace/src/sys/pc98/conf/NOTES#12 integrate .. //depot/projects/dtrace/src/sys/pc98/include/pecoff_machdep.h#4 delete .. //depot/projects/dtrace/src/sys/powerpc/booke/pmap.c#4 integrate .. //depot/projects/dtrace/src/sys/powerpc/powermac/grackle.c#8 integrate .. //depot/projects/dtrace/src/sys/powerpc/powermac/macio.c#8 integrate .. //depot/projects/dtrace/src/sys/powerpc/powermac/uninorth.c#9 integrate .. //depot/projects/dtrace/src/sys/security/audit/audit_pipe.c#12 integrate .. //depot/projects/dtrace/src/sys/security/audit/audit_worker.c#14 integrate .. //depot/projects/dtrace/src/sys/security/mac/mac_framework.h#16 integrate .. //depot/projects/dtrace/src/sys/security/mac/mac_inet.c#14 integrate .. //depot/projects/dtrace/src/sys/security/mac/mac_policy.h#10 integrate .. //depot/projects/dtrace/src/sys/security/mac_biba/mac_biba.c#16 integrate .. //depot/projects/dtrace/src/sys/security/mac_lomac/mac_lomac.c#14 integrate .. //depot/projects/dtrace/src/sys/security/mac_mls/mac_mls.c#16 integrate .. //depot/projects/dtrace/src/sys/security/mac_stub/mac_stub.c#14 integrate .. //depot/projects/dtrace/src/sys/security/mac_test/mac_test.c#14 integrate .. //depot/projects/dtrace/src/sys/sys/apm.h#3 integrate .. //depot/projects/dtrace/src/sys/sys/conf.h#13 integrate .. //depot/projects/dtrace/src/sys/sys/ioctl.h#4 integrate .. //depot/projects/dtrace/src/sys/sys/ioctl_compat.h#5 integrate .. //depot/projects/dtrace/src/sys/sys/mount.h#12 integrate .. //depot/projects/dtrace/src/sys/sys/param.h#55 integrate .. //depot/projects/dtrace/src/sys/sys/systm.h#21 integrate .. //depot/projects/dtrace/src/sys/sys/ttychars.h#4 delete .. //depot/projects/dtrace/src/sys/sys/ttydev.h#4 delete .. //depot/projects/dtrace/src/sys/vm/vnode_pager.c#14 integrate .. //depot/projects/dtrace/src/usr.bin/calendar/calendars/calendar.freebsd#24 integrate .. //depot/projects/dtrace/src/usr.bin/fstat/fstat.c#8 integrate .. //depot/projects/dtrace/src/usr.bin/tar/subst.c#3 integrate .. //depot/projects/dtrace/src/usr.bin/tar/test/main.c#3 integrate .. //depot/projects/dtrace/src/usr.bin/tar/test/test.h#3 integrate .. //depot/projects/dtrace/src/usr.bin/tar/util.c#8 integrate .. //depot/projects/dtrace/src/usr.sbin/mergemaster/mergemaster.8#6 integrate .. //depot/projects/dtrace/src/usr.sbin/pkg_install/add/perform.c#8 integrate .. //depot/projects/dtrace/src/usr.sbin/pkg_install/lib/lib.h#12 integrate .. //depot/projects/dtrace/src/usr.sbin/pkg_install/updating/main.c#4 integrate .. //depot/projects/dtrace/src/usr.sbin/sicontrol/sicontrol.8#4 integrate .. //depot/projects/dtrace/src/usr.sbin/sicontrol/sicontrol.c#6 integrate .. //depot/projects/dtrace/www/de/developers.sgml#13 integrate .. //depot/projects/dtrace/www/de/docs/books.sgml#15 integrate .. //depot/projects/dtrace/www/de/news/news.sgml#7 integrate .. //depot/projects/dtrace/www/de/platforms/alpha.sgml#6 integrate .. //depot/projects/dtrace/www/de/platforms/amd64.sgml#8 integrate .. //depot/projects/dtrace/www/de/platforms/arm.sgml#7 integrate .. //depot/projects/dtrace/www/de/platforms/mips.sgml#5 integrate .. //depot/projects/dtrace/www/de/platforms/pc98.sgml#6 integrate .. //depot/projects/dtrace/www/de/platforms/ppc.sgml#5 integrate .. //depot/projects/dtrace/www/de/platforms/sparc.sgml#5 integrate .. //depot/projects/dtrace/www/de/platforms/sun4v.sgml#3 integrate .. //depot/projects/dtrace/www/de/platforms/xbox.sgml#2 integrate .. //depot/projects/dtrace/www/de/projects/newbies.sgml#8 integrate .. //depot/projects/dtrace/www/de/security/security.sgml#14 integrate .. //depot/projects/dtrace/www/de/share/sgml/news.xml#24 integrate .. //depot/projects/dtrace/www/en/Makefile#10 integrate .. //depot/projects/dtrace/www/en/developers.sgml#36 integrate .. //depot/projects/dtrace/www/en/donations/donors.sgml#30 integrate .. //depot/projects/dtrace/www/en/multimedia/Makefile#2 integrate .. //depot/projects/dtrace/www/en/multimedia/Makefile.inc#1 branch .. //depot/projects/dtrace/www/en/multimedia/Makefile.output#1 branch .. //depot/projects/dtrace/www/en/multimedia/multimedia-input.xml#3 integrate .. //depot/projects/dtrace/www/en/multimedia/multimedia.pl#3 integrate .. //depot/projects/dtrace/www/en/multimedia/multimedia.sgml.intro#1 branch .. //depot/projects/dtrace/www/en/multimedia/multimedia.sgml.post#1 branch .. //depot/projects/dtrace/www/en/multimedia/multimedia.sgml.pre#1 branch .. //depot/projects/dtrace/www/en/platforms/amd64/motherboards.sgml#22 integrate .. //depot/projects/dtrace/www/en/platforms/ppc.sgml#5 integrate .. //depot/projects/dtrace/www/en/platforms/sparc.sgml#5 integrate .. //depot/projects/dtrace/www/en/platforms/sun4v.sgml#2 integrate .. //depot/projects/dtrace/www/en/projects/newbies.sgml#7 integrate .. //depot/projects/dtrace/www/share/sgml/commercial.consult.xml#14 integrate .. //depot/projects/dtrace/www/share/sgml/commercial.isp.xml#13 integrate .. //depot/projects/dtrace/www/share/sgml/news.xml#51 integrate Differences ... ==== //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/Makefile#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: doc/el_GR.ISO8859-7/articles/Makefile,v 1.14 2008/06/05 08:09:49 manolis Exp $ +# $FreeBSD: doc/el_GR.ISO8859-7/articles/Makefile,v 1.15 2008/06/10 05:35:00 manolis Exp $ # # %SOURCE% en_US.ISO8859-1/articles/Makefile # %SRCID% 1.39 @@ -13,6 +13,7 @@ SUBDIR+= gjournal-desktop SUBDIR+= greek-language-support SUBDIR+= laptop +SUBDIR+= linux-users SUBDIR+= multi-os SUBDIR+= new-users SUBDIR+= problem-reports ==== //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/compiz-fusion/article.sgml#2 (text+ko) ==== @@ -5,7 +5,7 @@ The FreeBSD Greek Documentation Project %SOURCE% en_US.ISO8859-1/articles/compiz-fusion/article.sgml - %SRCID% 1.3 + %SRCID% 1.6 --> @@ -23,7 +23,7 @@ Ìáíþëçò ÊéáãéÜò -
manolis@freebsd.org
+
manolis@FreeBSD.org
 @@ -32,7 +32,7 @@ Ìáíþëçò ÊéáãéÜò - $FreeBSD: doc/el_GR.ISO8859-7/articles/compiz-fusion/article.sgml,v 1.1 2008/06/05 08:09:49 manolis Exp $ + $FreeBSD: doc/el_GR.ISO8859-7/articles/compiz-fusion/article.sgml,v 1.2 2008/06/15 16:01:02 keramida Exp $ &tm-attrib.freebsd; @@ -286,7 +286,7 @@ Áí èÝëåôå íá äåßôå üëåò ôéò äõíáôüôçôåò ôïõ ðáñáðÜíù ðñïãñÜììáôïò, äþóôå ôçí åíôïëÞ - nvidia-xconfig -A |more. + nvidia-xconfig -A | more. ==== //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/dialup-firewall/Makefile#4 (text+ko) ==== @@ -1,7 +1,7 @@ -# $FreeBSD: doc/el_GR.ISO8859-7/articles/dialup-firewall/Makefile,v 1.3 2008/01/14 14:19:41 keramida Exp $ +# $FreeBSD: doc/el_GR.ISO8859-7/articles/dialup-firewall/Makefile,v 1.4 2008/06/14 17:05:20 keramida Exp $ # # %SOURCE% en_US.ISO8859-1/articles/dialup-firewall/Makefile -# %SRCID% 1.16 +# %SRCID% 1.5 DOC?= article ==== //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/explaining-bsd/Makefile#4 (text+ko) ==== @@ -1,22 +1,21 @@ -# $FreeBSD: doc/el_GR.ISO8859-7/articles/explaining-bsd/Makefile,v 1.4 2008/01/14 14:19:42 keramida Exp $ +# $FreeBSD: doc/el_GR.ISO8859-7/articles/explaining-bsd/Makefile,v 1.6 2008/06/16 01:11:48 keramida Exp $ # -# %SOURCE% en_US.ISO8859-1/articles/explaining-freebsd/Makefile -# %SRCID% 1.1 +# %SOURCE% en_US.ISO8859-1/articles/explaining-bsd/Makefile +# %SRCID% 1.6 MAINTAINER=keramida@FreeBSD.org DOC?= article FORMATS?= html +WITH_ARTICLE_TOC?= YES INSTALL_COMPRESSED?= gz INSTALL_ONLY_COMPRESSED?= -# SRCS lists the individual SGML files that make up the document. -# Changes to any of these files will force a rebuild. +SRCS= article.sgml -# SGML content -SRCS= article.sgml +URL_RELPREFIX?= ../../../.. +DOC_PREFIX?= ${.CURDIR}/../../.. -DOC_PREFIX?= ${.CURDIR}/../../.. .include "${DOC_PREFIX}/share/mk/doc.project.mk" ==== //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/explaining-bsd/article.sgml#4 (text+ko) ==== @@ -1,12 +1,12 @@ @@ -590,6 +590,14 @@ êþäéêá. + + Ôá BSD óõóôÞìáôá Ý÷ïõí ôç öÞìç üôé Ý÷ïõí ðéï ðïéïôéêÞ êáé + ïëïêëçñùìÝíç ôåêìçñßùóç. Ïé äéÜöïñåò ïìÜäåò ôåêìçñßùóçò + ðñïóðáèïýí íá ðáñÝ÷ïõí åíçìåñùìÝíç ôåêìçñßùóç óå ðïëëÝò ãëþóóåò, + íá êñáôïýí ôçí ôåêìçñßùóç åíçìåñùìÝíç êáé íá êáëýðôïõí êÜèå + ÷áñáêôçñéóôéêü ôïõ óõóôÞìáôïò óå âÜèïò. + + Ç BSD Üäåéá ìðïñåß íá óáò áñÝóåé ðåñéóóüôåñï áðü ôçí GPL. ==== //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/formatting-media/Makefile#4 (text+ko) ==== @@ -1,7 +1,7 @@ -# $FreeBSD: doc/el_GR.ISO8859-7/articles/formatting-media/Makefile,v 1.3 2008/01/14 14:19:42 keramida Exp $ +# $FreeBSD: doc/el_GR.ISO8859-7/articles/formatting-media/Makefile,v 1.4 2008/06/16 01:11:48 keramida Exp $ # # %SOURCE% en_US.ISO8859-1/articles/formatting-media/Makefile -# %SRCID% 1.1 +# %SRCID% 1.8 DOC?= article ==== //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/formatting-media/article.sgml#4 (text+ko) ==== @@ -1,11 +1,11 @@ @@ -269,20 +269,6 @@ - èá óáò æçôçèåß: - - - Do you want to do this with a true partition entry so as to remain -cooperative with any future possible operating systems on the -drive(s)? - - - (ÈÝëåôå íá ôï êÜíåôå áõôü ìå ðñáãìáôéêÜ êïììÜôéá ãéá íá ðáñáìåßíåé - óõìâáôüò ìå Üëëá ëåéôïõñãéêÜ óõóôÞìáôá?) ÁðáíôÞóôå - No. - - - Ìüëéò óáò ñùôÞóåé áí üíôùò èÝëåôå íá ôï êÜíåôå áõôü (Do you still want to do this) áðáíôÞóôå Yes. @@ -296,7 +282,22 @@ õðÜñ÷ïíôá óõóôÞìáôá áðáíôÞóôå Yes. + + Ìüëéò óáò ñùôÞóåé áí èÝëåôå íá åãêáôáóôÞóåôå Ýíá boot loader, + åðéëÝîôå None ãéá íá áðïöýãåôå ïðïéáäÞðïôå + áëëáãÞ óôï Master Boot Record. Ç åãêáôÜóôáóç åíüò boot loader + ÷ñåéÜæåôáé ìüíï óå êáéíïýñéåò åãêáôáóôÜóåéò ôïõ &os; Þ áí + ó÷åäéÜæåôå íá ôïðïèåôÞóåôå ôï äßóêï óå êÜðïéï Üëëï + ìç÷Üíçìá. + + + ÐáôÞóôå ENTER óôï åíçìåñùôéêü ìÞíõìá ðïõ + ëÝåé Wrote FDISK partition information out + successfully. + + + ÅðéëÝîôå Quit ãéá íá âãåßôå áðü ôï FDISK Editor êáé ìåôÜ ESCAPE ãéá íá åðéóôñÝøåôå óôï Index menu. @@ -597,7 +598,7 @@ åßíáé üìïéïé. - &prompt.root; cd /dev ; sh MAKDEV ccd0 + &prompt.root; cd /dev ; sh MAKEDEV ccd0 &prompt.root; disklabel -r -w da0 auto &prompt.root; disklabel -r -w da1 auto ==== //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/freebsd-questions/Makefile#4 (text+ko) ==== @@ -1,24 +1,21 @@ -# $FreeBSD: doc/el_GR.ISO8859-7/articles/freebsd-questions/Makefile,v 1.3 2008/01/14 14:19:42 keramida Exp $ +# $FreeBSD: doc/el_GR.ISO8859-7/articles/freebsd-questions/Makefile,v 1.4 2008/06/16 01:11:48 keramida Exp $ # # %SOURCE% en_US.ISO8859-1/articles/freebsd-questions/Makefile -# %SRCID% 1.1 +# %SRCID% 1.6 MAINTAINER=keramida@FreeBSD.org DOC?= article FORMATS?= html +WITH_ARTICLE_TOC?= YES INSTALL_COMPRESSED?= gz INSTALL_ONLY_COMPRESSED?= -# -# SRCS lists the individual SGML files that make up the document. Changes -# to any of these files will force a rebuild -# - -# SGML content SRCS= article.sgml +URL_RELPREFIX?= ../../../.. DOC_PREFIX?= ${.CURDIR}/../../.. + .include "${DOC_PREFIX}/share/mk/doc.project.mk" ==== //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/gjournal-desktop/Makefile#2 (text+ko) ==== @@ -1,10 +1,10 @@ # -# $FreeBSD: doc/el_GR.ISO8859-7/articles/gjournal-desktop/Makefile,v 1.1 2008/05/29 18:08:01 manolis Exp $ +# $FreeBSD: doc/el_GR.ISO8859-7/articles/gjournal-desktop/Makefile,v 1.2 2008/06/14 17:05:21 keramida Exp $ # # Article: Implementing UFS journaling on a desktop PC # # %SOURCE% en_US.ISO8859-1/articles/gjournal-desktop/Makefile -# %SRCID% 1.11 +# %SRCID% 1.1 # DOC?= article ==== //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/gjournal-desktop/article.sgml#2 (text+ko) ==== @@ -4,7 +4,7 @@ The FreeBSD Greek Documentation Project - %SOURCE% en_US.ISO8859-1/articles/gjournal-dekstop/article.sgml + %SOURCE% en_US.ISO8859-1/articles/gjournal-desktop/article.sgml %SRCID% 1.2 --> @@ -32,7 +32,7 @@ Ìáíþëçò ÊéáãéÜò - $FreeBSD: doc/el_GR.ISO8859-7/articles/gjournal-desktop/article.sgml,v 1.1 2008/05/29 18:08:01 manolis Exp $ + $FreeBSD: doc/el_GR.ISO8859-7/articles/gjournal-desktop/article.sgml,v 1.2 2008/06/14 16:53:45 keramida Exp $ &tm-attrib.freebsd; ==== //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/laptop/Makefile#4 (text+ko) ==== @@ -1,7 +1,7 @@ -# $FreeBSD: doc/el_GR.ISO8859-7/articles/laptop/Makefile,v 1.4 2008/01/14 14:19:42 keramida Exp $ +# $FreeBSD: doc/el_GR.ISO8859-7/articles/laptop/Makefile,v 1.5 2008/06/16 01:11:48 keramida Exp $ # # %SOURCE% en_US.ISO8859-1/articles/laptop/Makefile -# %SRCID% 1.1 +# %SRCID% 1.4 DOC?= article ==== //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/multi-os/Makefile#4 (text+ko) ==== @@ -1,14 +1,17 @@ -# $FreeBSD: doc/el_GR.ISO8859-7/articles/multi-os/Makefile,v 1.4 2008/01/14 14:19:42 keramida Exp $ +# $FreeBSD: doc/el_GR.ISO8859-7/articles/multi-os/Makefile,v 1.5 2008/06/16 01:11:49 keramida Exp $ # # %SOURCE% en_US.ISO8859-1/articles/multi-os/Makefile -# %SRCID% 1.8 +# %SRCID% 1.12 DOC?= article FORMATS?= html +WITH_ARTICLE_TOC?= YES + INSTALL_COMPRESSED?=gz +INSTALL_ONLY_COMPRESSED?= -SRCS= article.sgml +SRCS= article.sgml DOC_PREFIX?= ${.CURDIR}/../../.. .include "${DOC_PREFIX}/share/mk/doc.project.mk" ==== //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/releng-packages/Makefile#4 (text+ko) ==== @@ -1,6 +1,6 @@ -# $FreeBSD: doc/el_GR.ISO8859-7/articles/releng-packages/Makefile,v 1.3 2008/01/14 14:19:43 keramida Exp $ +# $FreeBSD: doc/el_GR.ISO8859-7/articles/releng-packages/Makefile,v 1.4 2008/06/15 03:43:37 keramida Exp $ # -# %SOURCE% articles/releng-packages/Makefile, +# %SOURCE% en_US.ISO8859-1/articles/releng-packages/Makefile # %SRCID% 1.1 DOC?= article ==== //depot/projects/dtrace/doc/el_GR.ISO8859-7/share/sgml/articles.ent#5 (text+ko) ==== @@ -3,9 +3,9 @@ Ëßóôá áðü ôá áñ÷åßá ìå ìåôáöñáóìÝíá SGML entities ãéá êåßìåíá óå ìïñöÞ Üñèñïõ. The FreeBSD Greek Documentation Project - $FreeBSD: doc/el_GR.ISO8859-7/share/sgml/articles.ent,v 1.3 2008/05/28 07:37:37 keramida Exp $ + $FreeBSD: doc/el_GR.ISO8859-7/share/sgml/articles.ent,v 1.4 2008/06/15 03:40:11 keramida Exp $ - %SOURCE% en_US.ISO8859-1/share/sgml/articles.ent + %SOURCE% share/sgml/articles.ent %SRCID% 1.2 --> ==== //depot/projects/dtrace/doc/el_GR.ISO8859-7/share/sgml/books.ent#3 (text+ko) ==== @@ -5,9 +5,9 @@ The FreeBSD Greek Documentation Project - $FreeBSD: doc/el_GR.ISO8859-7/share/sgml/books.ent,v 1.2 2008/01/14 14:19:47 keramida Exp $ + $FreeBSD: doc/el_GR.ISO8859-7/share/sgml/books.ent,v 1.3 2008/06/15 03:40:11 keramida Exp $ - %SOURCE% en_US.ISO8859-1/share/sgml/books.ent + %SOURCE% share/sgml/books.ent %SRCID% 1.2 --> ==== //depot/projects/dtrace/doc/el_GR.ISO8859-7/share/sgml/freebsd.ent#4 (text+ko) ==== @@ -2,9 +2,9 @@ ÄéÜöïñá DocBook Entities ãéá ôï FreeBSD Project. - $FreeBSD: doc/el_GR.ISO8859-7/share/sgml/freebsd.ent,v 1.3 2008/05/28 07:37:37 keramida Exp $ + $FreeBSD: doc/el_GR.ISO8859-7/share/sgml/freebsd.ent,v 1.4 2008/06/15 03:32:48 keramida Exp $ - %SOURCE% en_US.ISO8859-1/share/sgml/freebsd.ent + %SOURCE% share/sgml/freebsd.ent %SRCID% 1.100 Áõôü ôï áñ÷åßï åßíáé Ýãêõñï êáé ùò XML êáé ùò SGML. Óáò ðáñáêáëþ ìç ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/compiz-fusion/article.sgml#3 (text+ko) ==== @@ -19,16 +19,16 @@ Manolis Kiagias -
sonicy@otenet.gr
+
manolis@FreeBSD.org
 2008 - Manolis Kiagias + Manolis Kiagias - $FreeBSD: doc/en_US.ISO8859-1/articles/compiz-fusion/article.sgml,v 1.3 2008/05/10 13:32:28 blackend Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/compiz-fusion/article.sgml,v 1.6 2008/06/15 15:58:38 keramida Exp $ &tm-attrib.freebsd; @@ -111,24 +111,27 @@ The latest versions of nVidia cards are supported by the x11/nvidia-driver port. + nVidia cards like the GeForce 2MX/3/4 series are supported by - the 96X series of drivers, available in the - x11/nvidia-driver-96xx + the 96XX series of drivers, available + in the x11/nvidia-driver-96xx port. + Even older cards, like GeForce and RIVA TNT are supported - by the 71XX series of drivers, available in the - x11/nvidia-driver-71XX + by the 71XX series of drivers, + available in the + x11/nvidia-driver-71xx port. In fact, nVidia provides detailed information on which card is - supported by which driver. This information is available directly - on their web site: - . + supported by which driver. This information is available directly + on their web site: . @@ -139,7 +142,8 @@ Make sure to update your ports tree using your favorite method - (like csup, CVSup or + (like csup, + CVSup or portsnap) before you install any application from the ports system. Graphics drivers and the desktop effects programs are under heavy development, and are @@ -181,10 +185,10 @@ Driver "nvidia" Start your GUI as usual, and you should be greeted by the nVidia - splash. Everything should work as usual. Note, that at this point you - have only set up &xorg; to use the nVidia - driver, but further configuration is needed before you can actually use - 3D desktop effects. This is described in the following + splash. Everything should work as usual. Note, that at this point + you have only set up &xorg; to use the + nVidia driver, but further configuration is needed before you can + actually use 3D desktop effects. This is described in the following sections. @@ -200,7 +204,6 @@ - Configuring xorg.conf for desktop effects Before you install and run @@ -226,7 +229,7 @@ do): DefaultDepth 24 - Option "AddARGBGLXVisuals" "True" +Option "AddARGBGLXVisuals" "True" Locate the Subsection that refers to the screen resolution that you wish to use. For example, if you wish to @@ -239,8 +242,8 @@ Modes "1280x1024" EndSubSection - A color depth of 24bits is needed for desktop composition, change - the above subsection to: + A color depth of 24 bits is needed for desktop composition, + change the above subsection to: SubSection "Display" Viewport 0 0 @@ -257,19 +260,19 @@ Load "glx" ... - - If you installed the - x11/nvidia-xconfig port, - you should be able to perform most of the above settings by - entering the following commands (as root): - - &prompt.root; nvidia-xconfig --add-argb-glx-visuals + + If you installed the + x11/nvidia-xconfig port, + you should be able to perform most of the above settings by + entering the following commands (as root): + + &prompt.root; nvidia-xconfig --add-argb-glx-visuals &prompt.root; nvidia-xconfig --composite &prompt.root; nvidia-xconfig --depth=24 - You may wish to run nvidia-xonfig -A |more - to see a list of all the options offered by the above - program. + You may wish to run nvidia-xconfig -A | more + to see a list of all the options offered by the above program. + @@ -347,57 +350,55 @@ - Troubleshooting Compiz Fusion - The following section covers frequently asked questions regarding - problems when running - Compiz Fusion. + The following section covers frequently asked questions regarding + problems when running + Compiz Fusion. - - - - I have installed Compiz Fusion, - and after running the commands you mention, my windows are left - without title bars and buttons. What is wrong? - + + + + I have installed + Compiz Fusion, + and after running the commands you mention, my windows are left + without title bars and buttons. What is wrong? + - - You are probably missing a setting in - /etc/X11/xorg.conf. Review this file - carefully and check especially the DefaultDepth and - AddARGBGLXVisuals directives. - - + + You are probably missing a setting in + /etc/X11/xorg.conf. Review this file + carefully and check especially the DefaultDepth + and AddARGBGLXVisuals directives. + + - - - When I run the command to start - Compiz Fusion, the X server - crashes and I am back at the console. What is wrong? - + + + When I run the command to start + Compiz Fusion, the X server + crashes and I am back at the console. What is wrong? + - - If you check your /var/log/Xorg.0.log - file, you will probably find error messages during the X - startup. The most common would be: + + If you check your /var/log/Xorg.0.log + file, you will probably find error messages during the X + startup. The most common would be: - (EE) NVIDIA(0): Failed to initialize the GLX module; please check in your X + (EE) NVIDIA(0): Failed to initialize the GLX module; please check in your X (EE) NVIDIA(0): log file that the GLX module has been loaded in your X (EE) NVIDIA(0): server, and that the module is the NVIDIA GLX module. If (EE) NVIDIA(0): you continue to encounter problems, Please try (EE) NVIDIA(0): reinstalling the NVIDIA driver. - This is usually the case when you upgrade - &xorg;. You - will need to reinstall the - x11/nvidia-driver port so - glx is built again. - - - + This is usually the case when you upgrade + &xorg;. You will need to reinstall the + x11/nvidia-driver port so + glx is built again. + + + - + + 1.6 articles/compiz-fusion/article.sgml 1.11 --> 1.12 articles/version-guide/article.sgml 1.75 --> 1.76 books/handbook/desktop/chapter.sgml 1.82 --> 1.83 books/handbook/firewalls/chapter.sgml 1.443 --> 1.444 books/handbook/mirrors/chapter.sgml 1.30 --> 1.31 share/sgml/glossary/freebsd-glossary.sgml MFP4 after: 3 days Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/compiz-fusion/article.sgml#5 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/version-guide/article.sgml#4 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/desktop/chapter.sgml#2 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/firewalls/chapter.sgml#4 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/mirrors/chapter.sgml#2 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/glossary/freebsd-glossary.sgml#5 edit Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/compiz-fusion/article.sgml#5 (text+ko) ==== @@ -10,7 +10,7 @@ + Original Revision: 1.6 --> @@ -26,13 +26,13 @@ Manolis Kiagias -
sonicy@otenet.gr
+
manolis@FreeBSD.org
 2008 - Manolis Kiagias + Manolis Kiagias $FreeBSD: doc/hu_HU.ISO8859-2/articles/compiz-fusion/article.sgml,v 1.1 2008/05/28 17:19:18 pgj Exp $ @@ -159,8 +159,9 @@ A GeForce 2MX/3/4 sorozatú nVidia - kártyákat a meghajtó 96XX sorozata - támogatja, amely a XX sorozata támogatja, + amely a x11/nvidia-driver-96xx porton keresztül érhetõ el. @@ -366,11 +367,11 @@ &prompt.root; nvidia-xconfig --composite &prompt.root; nvidia-xconfig --depth=24 - A nvidia-xonfig -A | more parancs - kiadásával a program által - felkínált további - lehetõségeket is - lekérdezhetjük. + Az nvidia-xconfig -A | more parancs + kiadásával a program által + felkínált további + lehetõségeket is + lekérdezhetjük. ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/version-guide/article.sgml#4 (text+ko) ==== @@ -8,7 +8,7 @@ + Original Revision: 1.12 -->
Válasszuk ki a nekünk igazán megfelelõ &os; @@ -396,7 +396,8 @@ <variablelist> <varlistentry> <term> - <ulink url="&url.base;/releng/index.html#schedule"></ulink> + <ulink + url="&url.base;/releng/index.html#schedule">&url.base;/releng/index.html#schedule</ulink> </term> <listitem> <para>The Release Engineering Schedule</para> @@ -405,7 +406,8 @@ <varlistentry> <term> - <ulink url="&url.base;/security/security.html#supported-branches"></ulink> + <ulink + url="&url.base;/security/security.html#supported-branches">&url.base;/security/security.html#supported-branches</ulink> </term> <listitem> <para>The Security Branch Schedule</para> ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/desktop/chapter.sgml#2 (text+ko) ==== @@ -5,7 +5,7 @@ <!-- The FreeBSD Hungarian Documentation Project Translated by: PALI, Gabor <pgj@FreeBSD.org> - Original Revision: 1.75 --> + Original Revision: 1.76 --> <chapter id="desktop" lang="hu"> <chapterinfo> @@ -394,50 +394,27 @@ &realplayer; pluginjait is használhatóvá teszi.</para> - <para>Telepítsük fel a <filename - role="package">www/linuxpluginwrapper</filename> portot. A port + <para>Telepítsük a <filename + role="package">www/nspluginwrapper</filename> portot. A port telepítése viszont maga után vonja a <filename role="package">emulators/linux_base</filename> - telepítését is, ami viszont egy nagyobb - port. Igyekezzünk minél pontosabban követni a - port telepítése során megjelenõ - utasításokat és minél jobban - beállítani a <filename>/etc/libmap.conf</filename> - állományt! Ehhez segítséget a - <filename>/usr/local/share/examples/linuxpluginwrapper/</filename> - könyvtárban találhatunk.</para> + telepítését is, amely viszont egy nagyobb + port.</para> <para>A következõ lépésben telepítsük a <filename role="package">www/linux-flashplugin7</filename> portot. - Miután felkerült a plugin, indítsuk el a - böngészõt és írjuk be az - <literal>about:plugins</literal> sort a címsorba, majd - nyomjuk le az <keycap>Enter</keycap> billentyût. Az eddig - telepített pluginok felsorolása fog - megjelenni.</para> + Miután felkerült, a hozzátartozó + plugint minden felhasználónak külön + telepítenie kell az <command>nspluginwrapper</command> + parancs kiadásával:</para> - <para>Ha nem szerepel közte a &flash; plugin, akkor annak az - oka (legalább is az esetek - többségében) egy hiányzó - szimbolikus link. A pótlásához - <username>root</username> felhasználóként - adjuk ki a következõ parancsokat:</para> + <screen>&prompt.user; <userinput>nspluginwrapper -v -a -i</userinput></screen> - <screen>&prompt.root; <userinput>ln -s /usr/local/lib/npapi/linux-flashplugin/libflashplayer.so \ - /usr/local/lib/browser_plugins/</userinput> -&prompt.root; <userinput>ln -s /usr/local/lib/npapi/linux-flashplugin/flashplayer.xpt \ - /usr/local/lib/browser_plugins/</userinput></screen> - - <para>Ha most újraindítjuk a - böngészõt, a pluginnak meg kell jelennie az - elõbb említett listában.</para> - - <note> - <para>A <application>linuxpluginwrapper</application> csak az - &i386; architektúrán mûködik.</para> - </note> - + <para>Ezután indítsuk el a böngészõt, majd gépeljük be a + <literal>about:plugins</literal> szöveget a címsorba és nyomjuk + le az <keycap>Enter</keycap> billentyût. Ekkor a jelenleg + elérhetõ pluginok listájának kell megjelennie.</para> </sect2> <sect2> ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/firewalls/chapter.sgml#4 (text+ko) ==== @@ -6,7 +6,7 @@ <!-- The FreeBSD Hungarian Documentation Project Translated by: PALI, Gabor <pgj@FreeBSD.org> - Original Revision: 1.82 --> + Original Revision: 1.83 --> <chapter id="firewalls" lang="hu"> <chapterinfo> @@ -243,6 +243,17 @@ </sect1> <sect1 id="firewalls-pf"> + <sect1info> + <authorgroup> + <author> + <firstname>John</firstname> + <surname>Ferrell</surname> + <contrib>Átnézte és + aktualizálta:</contrib> + </author> + </authorgroup> + </sect1info> + <title>Az OpenBSD csomagszûrõje (PF) és az <acronym>ALTQ</acronym> @@ -266,76 +277,81 @@ teszi a sávszélesség korlátozását a szolgáltatás minõsége (Quality of Service, QoS) - alapján, aminek köszönhetõen a - különbözõ szolgáltatások a - szûrési szabályok mentén - garantált sávszélességhez juthatnak. - Az OpenBSD Projekt kiváló munkát végez - a PF felhasználói útmutatójának - karbantartásával, amely így most nem lesz - része a kézikönyvnek, hiszen ez csak az - erõforrások kétszerezése lenne. + alapján. + + Az OpenBSD Projekt kiváló munkát + végez a PF felhasználói + útmutatójának + karbantartásával. A kézikönyv ezen + szakasza ezért elsõsorban azzal foglalkozik, hogyan a + PF-et &os; alatt használni, + miközben igyekszik egy általános + összefoglalást adni a témáról. A + részletesebb információkkal kapcsolatban + azonban feltétlenül nézzük meg a + felhasználói útmutatót. A - címen olvashatunk többet arról (angolul), hogy a - PF-et hogyan használjunk &os;-n. + címen olvashatunk többet arról (angolul), hogy + a PF-et hogyan használjunk + &os;-n. - A PF engedélyezése + A PF rendszermagmodul használata - A PF a &os; 5.3 verziója utáni - kiadásokban az alaprendszer része, amelyet a - rendszer mûködése közben egy - külön modul betöltésével - aktiválhatunk. Ha az rc.conf + A &os; 5.3 megjelenése óta a + PF az alaprendszer része mint + futás közben betölthetõ rendszermagmodul. + A rendszer induláskor tehát képes + automatikusan betölteni, ha az &man.rc.conf.5; állományban megadjuk a - pf_enable="YES" sort, akkor a rendszer - magától be is tölti a PF-hez tartozó - rendszermag modult. Ez a betölthetõ modul - egyébként még a &man.pflog.4; - felületen keresztüli naplózást is - engedélyezi. + pf_enable="YES" sort. A + PF modul azonban csak akkor fog + mûködésbe lépni, ha talál + hozzátartozó szabályrendszert, amely + alapértelmezés szerint az + /etc/pf.conf állományban + található. Amennyiben a PF + szabályrendszere a mi esetünkben máshol + található, akkor az rc.conf + állományban ne felejtsük megadni a + pf_rules="/elérési/útvonal/pf.szabályok" + sor használatával. - A modul feltételezi az options - INET és a device bpf sorok - jelenlétét. Hacsak nem adtuk meg - &os; 6.0-RELEASE elõtti verziókban a - NOINET6, illetve az utána - következõ verziókban a - NO_INET6 beállítást - (például a &man.make.conf.5; - állományban) a rendszer - fordítására vonatkozóan, akkor az - options INET6 - beállításra is szükség - lesz. + A &os; 7.0 kiadással a minta + pf.conf állomány az + /etc + könyvtárból + átköltözött a /usr/share/examples/pf + könyvtárba. A &os; 7.0 elõtti + kiadásokban alapértelmezés szerint + található egy pf.conf + állomány az /etc + könyvtárban. - Ahogy betöltõdött a modul, vagy ha már - eleve a rendszermagba építettük a PF - támogatását, a - pf használatát a - pfctl paranccsal tudjuk engedélyezni - vagy letiltani. + A PF modul parancssorból + akár kézzel is betölthetõ: - Ebben a példában a - pf - engedélyezését láthatjuk: + &prompt.root; kldload pf.ko - &prompt.root; pfctl -e - - A pfctl parancs - segítségével könnyedén lehet - irányítani a pf - mûködését. A - használatáról többet úgy - tudhatunk meg, ha elolvassuk a &man.pfctl.8; man oldalt. - + A betölthetõ modul tartalmazza a &man.pflog.4; + támogatását, amely + segítségével naplózni is tudunk. + Amennyiben a PF további + szolgáltatásaira is szükségünk + lenne, akkor a PF + támogatását be kell + építenünk a rendszermagba. - A rendszermag beállításai + A PF rendszermagbeli + beállításai a rendszermag @@ -355,28 +371,37 @@ device pfsync - Egyáltalán nem fontos a PF - támogatását beépíteni a - rendszermagba. Az itt szereplõ információk - csupán kiegészítésként - szerepelnek. Ha a PF használatát beletesszük - a rendszermagba, akkor a modulra már nincs - szükségünk. + Noha egyáltalán nem szükséges + beépítenünk a PF + támogatását a rendszermagba, abban az + esetben mégis szükségünk lehet + rá, amikor a PF olyan komolyabb + lehetõségeit szeretnénk kiaknázni, + amelyek már nem részei a modulnak. Ilyen + például a &man.pfsync.4;, amely a + PF által használt + állapottáblázatok bizonyos + változásainak megjelenítésére + alkalmas pszeudoeszköz. A &man.carp.4; + megoldásával párosítva így + akár hibatûrõ tûzfalak is + kialakíthatóak a PF-fel. A + CARP-ról bõvebb + ismertetést a kézikönyv e ad. - A rendszermag forrásai között - található + A PF rendszermag + konfigurációs beállításai a /usr/src/sys/conf/NOTES - állományban a PF - beállításaira vonatkozó - utasítások így foglalhatóak - össze: + állományban találhatóak: device pf device pflog device pfsync - A device pf engedélyezi a - csomagszûrõ tûzfalat. + A device pf + beállítás engedélyezi a + csomagszûrõ tûzfalat (&man.pf.4;). A device pflog megadásával keletkezik egy &man.pflog.4; pszeudo hálózati @@ -391,27 +416,18 @@ &man.pfsync.4; pszeudo hálózati eszköz létrejöttét, amely az ún. állapotváltások - megfigyelésére alkalmas. Mivel ez nem - része a betölthetõ modulnak, ezért egy - saját rendszermagot kell készíteni a - használatához. - - Ezek a beállítások csak akkor - lépnek érvénybe, ha fordítunk - velük egy saját rendszermagot és - telepítjük azt. - + megfigyelésére alkalmas. Az <filename>rc.conf</filename> állományban elérhetõ beállítások - Az /etc/rc.conf - állományba a következõket kell - betennünk ahhoz, hogy a PF a rendszer - indítása során - aktivizálódjon: + A következõ &man.rc.conf.5; + beállítások aktiválják a + rendszerindítás során a + PF és a &man.pflog.4; + használatát: pf_enable="YES" # a PF engedélyezése (a modul betöltése, ha kell) pf_rules="/etc/pf.conf" # a pf szabályait tartalmazó állomány @@ -425,11 +441,122 @@ levõ gépek számára valamilyen módon tudnunk kell továbbítani a csomagokat vagy címfordítást kell végezni, - így ez a beállítás is - mindenképpen kelleni fog: + így ez is mindenképpen kelleni fog: gateway_enable="YES" # az átjáró funkciók engedélyezése + + + + A szûrési szabályok + megfogalmazása + + A PF a beállításait + a &man.pf.conf.5; állomány tárolja (amely + alapértelmezés szerint az + /etc/pf.conf helyen + található), és az ebben + található szabályok alapján + módosítja, dobja el vagy éppen engedi + át a csomagokat. A &os; rendszerünkben ehhez + találhatunk néhány példát a + /usr/share/examples/pf/ + könyvtárban. A PF által + használt szabályokról minden + részletre kiterjedõen a PF GYIK-ban + olvashatunk. + + + A PF GYIK + olvasásakor ne feledkezzünk meg róla, hogy + a különbözõ &os; verziók + különbözõ PF + verziókat tartalmaznak: + + + + &os; 5.X — + OpenBSD 3.5 PF + + + &os; 6.X — + OpenBSD 3.7 PF + + + &os; 7.X — + OpenBSD 4.1 PF + + + + + A &a.pf; remek hely a PF tûzfal + beállításával és + futtatásával kapcsolatos kérdésekre. + A kérdezés elõtt azonban ne felejtsük el + alaposan átnézni az archívumot! + + + + A PF használata + + A PF a &man.pfctl.8; + segítségével vezérelhetõ. Az + alábbiakban ezzel kapcsolatban most összefoglalunk + néhány hasznos parancsot (de ne felejtsük el + megnézni a &man.pfctl.8; man oldalon + található többi lehetõséget + sem): + + + + + + Parancs + Leírás + + + + + + pfctl + A PF engedélyezése + + + + pfctl + A PF tiltása + + + + pfctl all /etc/pf.conf + Az összes (címfordítási, + szûrési, állapottartási stb.) + szabály törlése, és az + /etc/pf.conf állomány + újratöltése + + + + pfctl [ rules | nat | state ] + A szûrési (rules), + címfordítási + (nat) és + állapottartási (state) + információk + lekérdezése + + + pfctl /etc/pf.conf + Az /etc/pf.conf + állomány ellenõrzése a benne + levõ szabályok betöltése + nélkül + + + + @@ -437,16 +564,19 @@ engedélyezése Az ALTQ kizárólag csak - úgy érhetõ el, ha belefordítjuk a &os; - rendszermagjába. Az ALTQ nem minden - hálózati kártya részérõl - támogatott. Az &man.altq.4; man oldalán - megtalálhatjuk azokat a meghajtókat, amelyek a - &os; aktuális kiadásában - támogatottak. A következõ - beállítások az ALTQ - további lehetõségeit igyekeznek - engedélyezni. + úgy használható, ha a + konfigurációs beállításokon + keresztül beépítjük a &os; + rendszermagjába. Az ALTQ + alkalmazását nem minden hálózati + kártya meghajtója támogatja, ezért + ezt a &man.altq.4; man oldalon ellenõrizzük. + + A következõ rendszermag + konfigurációs beállításokkal + engedélyezhetjük az ALTQ + használatát és bõvíthetjük + azt további lehetõségekkel: options ALTQ options ALTQ_CBQ # osztályozás alapú besorolás (Class Bases Queuing, CBQ) @@ -515,53 +645,6 @@ kötelezõ. - - - A szûrési szabályok - megfogalmazása - - A csomagszûrõ a &man.pf.conf.5; - állományból olvassa be a szabályokat - és a benne szereplõ szabályok vagy - definíciók alapján módosítja, - eldobja vagy átengedi a csomagokat. A &os; - telepítésében alapértelmezés - szerint az /etc/pf.conf - állomány látja el ennek szerepét, - amely számos hasznos példát és - magyarázatot tartalmaz. - - Noha a &os; saját /etc/pf.conf - állománnyal rendelkezik, a - felépítése mégis - tökéletesen megegyezik az OpenBSD-ben - használatossal. A pf - tûzfal beállításával az OpenBSD - csapat által írt nagyszerû írás - foglalkozik, amely a címrõl - érhetõ el (angolul). - - - A pf felhasználói - útmutatóját olvasgatva azonban soha nem - szabad elfelejtenünk, hogy &os; egyes változatai a - pf különbözõ - verzióit tartalmazzák. A &os; 6.X - változataiban az OpenBSD 3.7 szerinti - verzióját találjuk. - - - A &a.pf; kitûnõ hely a - pf - beállításával és - mûködtetésével kapcsolatos - kérdések feltevésére. Viszont - mielõtt itt kérdeznénk, ne felejtsük el - átnézni a levelezési lista - archívumait sem. - - ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/mirrors/chapter.sgml#2 (text+ko) ==== @@ -6,7 +6,7 @@ + Original Revision: 1.444 --> A &os; beszerzése @@ -61,14 +61,6 @@
- BSD-Systems - e-mail: info@bsd-systems.co.uk - WWW: -
- - - -
FreeBSD Mall, Inc. 3623 Sanford Street Concord, CA 94520-1405 @@ -112,17 +104,6 @@
- Linux CD Mall - Private Bag MBE N348 - Auckland 1030 - Új-Zéland - Telefon: +64 21 866529 - WWW: -
- - - -
The Linux Emporium Hilliard House, Lester Way Wallingford @@ -130,7 +111,7 @@ Egyesült Királyság Telefon: +44 1491 837010 Fax: +44 1491 837016 - WWW: + WWW:
@@ -169,7 +150,7 @@ Oroszország Telefon: +7-812-3125208 e-mail: info@linuxcenter.ru - WWW: + WWW:
==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/glossary/freebsd-glossary.sgml#5 (text+ko) ==== @@ -32,7 +32,7 @@ --> + Original Revision: 1.31 --> A &os;-s szakkifejezések gyûjteménye @@ -130,7 +130,10 @@ Access Control List ACL - + Egy objektumhoz, például egy + állományhoz vagy hálózati + eszközhöz tartozó engedélyeket + tartalmazó felsorolás. @@ -179,7 +182,14 @@ Advanced Power Management APM - + Egy olyan API, amely + lehetõvé teszi az operációs rendszer + számára, hogy a BIOS-szal + együtt energiagazdálkodást tudjon + megvalósítani. A legtöbb esetben azonban + már az APM-et leváltotta a + sokkal általánosabb és kidolgozottabb + ACPI specifikáció. @@ -394,7 +404,10 @@ Challenge Handshake Authentication Protocol CHAP - + A felhasználók + hitelesítésére használt + módszer, amely a kliens és a szerver közt + megosztott titkos információkon alapszik. @@ -413,6 +426,8 @@ A távoli rendszer számára a küldést engedélyezõ RS232C szabványú jel. + + @@ -518,6 +533,8 @@ terminálunknak, amikor készen áll az adatok fogadására és küldésére. + + @@ -552,7 +569,10 @@ Differentiated System Description Table DSDT - + Egy olyan ACPI táblázat, + amely az alaprendszerrõl nyújt alapvetõ + konfigurációs + információkat. @@ -1277,7 +1297,15 @@ Network Address Translation NAT - + Egy olyan technikai megoldás, amelynek + használata során az átjárón + keresztül haladó IP-csomagok + információt módosítják, + és ezáltal lehetõvé teszik az + átjáró mögött levõ + gépek számára, hogy hatékonyan + osztozzanak egyetlen + IP-címen. @@ -1306,7 +1334,9 @@ Network Time Protocol NTP - + A számítógépek + óráinak hálózaton keresztüli + egyeztetésének egyik módszere. @@ -1583,6 +1613,7 @@ POP + From owner-p4-projects@FreeBSD.ORG Tue Jun 17 00:05:06 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F30C71065670; Tue, 17 Jun 2008 00:05:05 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B572B106566B for ; Tue, 17 Jun 2008 00:05:05 +0000 (UTC) (envelope-from konrad@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A40FD8FC16 for ; Tue, 17 Jun 2008 00:05:05 +0000 (UTC) (envelope-from konrad@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5H0550p027605 for ; Tue, 17 Jun 2008 00:05:05 GMT (envelope-from konrad@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5H055rP027603 for perforce@freebsd.org; Tue, 17 Jun 2008 00:05:05 GMT (envelope-from konrad@FreeBSD.org) Date: Tue, 17 Jun 2008 00:05:05 GMT Message-Id: <200806170005.m5H055rP027603@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to konrad@FreeBSD.org using -f From: Konrad Jankowski To: Perforce Change Reviews Cc: Subject: PERFORCE change 143620 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Jun 2008 00:05:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=143620 Change 143620 by konrad@vspredator on 2008/06/17 00:04:24 Some style(9) related cleanup. Also, one bug fixed. Affected files ... .. //depot/projects/soc2008/konrad_collation/colldef/colldef.c#3 edit Differences ... ==== //depot/projects/soc2008/konrad_collation/colldef/colldef.c#3 (text+ko) ==== @@ -3,13 +3,6 @@ * at Bluemedia Sp. z o. o., Sopot, Poland - www.bluemedia.pl * All rights reserved. * - * This program is just a demonstration of the first approach to building - * binary collation table. Parsing is purposefully ugly. Later I will do it - * in yacc. - * Now, I don't want to focus on the parsing, but on building the table. - * This is a much more involved process. I want to experiment to find the - * best approach. - * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -46,7 +39,7 @@ #define DEFAULT_IN_FILE "../colldef_in.src.simple" #define DEFAULT_OUT_FILE "LC_COLLATE" -#define WEIGHT_TABLE_SIZE (1<<16) +#define WEIGHT_TABLE_SIZE (1 << 16) #define NWEIGHTS 4 struct sym_entry { @@ -58,7 +51,7 @@ SLIST_HEAD(, sym_entry) head; /* - * this will have to be a structure, to at least accomodate symbol chaining + * This will have to be a structure, to at least accomodate symbol chaining. */ uint8_t weight_table[WEIGHT_TABLE_SIZE][NWEIGHTS]; struct weight_uncompressed { @@ -81,7 +74,8 @@ static int counter = 1; struct sym_entry *sym; - sym = malloc(sizeof(*sym)); + if ((sym = malloc(sizeof(*sym))) == NULL) + err(1, "add_symbol: malloc(%d)", sizeof(*sym)); sym->name = strdup(name); sym->val = counter++; SLIST_INSERT_HEAD(&head, sym, sym_next); @@ -119,7 +113,7 @@ { int i; struct weight_uncompressed *w = weights_uncompressed; - + for (i = 0; i < WEIGHT_TABLE_SIZE; i++, w++) { if (!w->used) continue; @@ -161,7 +155,7 @@ bzero(weights_uncompressed, sizeof(weights_uncompressed)); SLIST_INIT(&head); if (freopen(name, "r", stdin) == NULL) - err(1, "freopen: %s", name); + err(1, "freopen: %s", name); while (fgets(buf, sizeof(buf), stdin)) { #ifdef DEBUG fputs(buf, stdout); @@ -175,15 +169,13 @@ break; case '\\': codepoint = get_codepoint(buf, &p); - /* zamiast strchr uzyc powrotu z get_codepoint */ - /*assign_weights(codepoint, strchr(buf, ' ') + 1);*/ assign_weights(codepoint, p + 1); break; } } - fclose(stdin); /* no needed - freopen closes */ + fclose(stdin); /* not really needed - freopen closes */ } int @@ -210,10 +202,10 @@ /* we get literal value, instead of symbol */ ret = get_codepoint(p2, &p3); *p = p3 + 1; - return ret; + return ret; default: errx(1, "get_weight_val: unrecognized weight symbol: %s\n", - p2); + p2); } } @@ -227,7 +219,6 @@ for (i = 0; i < 4; i++) { int val; - val = get_weight_val(&weights); weights_uncompressed[codepoint].w[i] = val; } From owner-p4-projects@FreeBSD.ORG Tue Jun 17 12:02:40 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6ABA3106577A; Tue, 17 Jun 2008 12:02:39 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1005E1065763 for ; Tue, 17 Jun 2008 12:02:39 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D35D98FC1E for ; Tue, 17 Jun 2008 12:02:26 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5HC2Qg9026411 for ; Tue, 17 Jun 2008 12:02:26 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5HC2Qv5026409 for perforce@freebsd.org; Tue, 17 Jun 2008 12:02:26 GMT (envelope-from gabor@freebsd.org) Date: Tue, 17 Jun 2008 12:02:26 GMT Message-Id: <200806171202.m5HC2Qv5026409@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 143638 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Jun 2008 12:02:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=143638 Change 143638 by gabor@gabor_server on 2008/06/17 12:02:09 - Make -A compatible with GNU grep Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/grep.c#19 edit .. //depot/projects/soc2008/gabor_textproc/grep/grep.h#15 edit .. //depot/projects/soc2008/gabor_textproc/grep/util.c#20 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/grep.c#19 (text+ko) ==== @@ -110,7 +110,8 @@ }; /* Housekeeping */ -int first; /* flag whether or not this is our first match */ +int first = 1; /* flag whether we are processing the first match */ +int prev; /* flag whether or not the previous line matched */ int tail; /* lines left to print */ struct patfile { ==== //depot/projects/soc2008/gabor_textproc/grep/grep.h#15 (text+ko) ==== @@ -68,7 +68,7 @@ extern char *color, *label; extern int binbehave; -extern int first, matchall, patterns, tail; +extern int first, prev, matchall, patterns, tail; extern char **pattern; extern struct fastgrep *fg_pattern; extern regex_t *r_pattern; ==== //depot/projects/soc2008/gabor_textproc/grep/util.c#20 (text+ko) ==== @@ -276,22 +276,27 @@ if (c && binbehave == BIN_FILE_BIN && nottext) return (c); /* Binary file */ - if ((tail > 0 || c) && !cflag && !qflag) { + if ((tail || c) && !cflag && !qflag) { if (c) { - if (first > 0 && tail == 0 && (Bflag < linesqueued) && - (Aflag || Bflag)) + if (!first && !prev && !tail && (Aflag || Bflag)) printf("--\n"); - first = 1; tail = Aflag; if (Bflag > 0) printqueue(); linesqueued = 0; printline(l, ':'); } else { + prev = 0; printline(l, '-'); tail--; } } + + if (c) { + prev++; + first = 0; + } + return (c); } From owner-p4-projects@FreeBSD.ORG Tue Jun 17 12:38:08 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7F2BA106567F; Tue, 17 Jun 2008 12:38:08 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 40D9D1065670 for ; Tue, 17 Jun 2008 12:38:08 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2CE388FC29 for ; Tue, 17 Jun 2008 12:38:08 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5HCc8Jc030335 for ; Tue, 17 Jun 2008 12:38:08 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5HCc8qO030333 for perforce@freebsd.org; Tue, 17 Jun 2008 12:38:08 GMT (envelope-from gabor@freebsd.org) Date: Tue, 17 Jun 2008 12:38:08 GMT Message-Id: <200806171238.m5HCc8qO030333@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 143639 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Jun 2008 12:38:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=143639 Change 143639 by gabor@gabor_server on 2008/06/17 12:37:14 - Clean up allocations - Improve --color compatibility Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/grep.c#20 edit .. //depot/projects/soc2008/gabor_textproc/grep/util.c#21 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/grep.c#20 (text+ko) ==== @@ -455,14 +455,14 @@ case COLOR_OPT: if (optarg == NULL) optarg = "auto"; - if (strcmp("always", optarg) == 0) { + if (strcmp("auto", optarg) == 0 || strcmp("always", optarg) == 0 ) { color = getenv("GREP_COLOR"); if (color == NULL) color = "01;31"; - } else if ((strcmp("auto", optarg) == 0)) - color = getenv("GREP_COLOR"); - else if (strcmp("never", optarg) == 0) + } else if (strcmp("never", optarg) == 0) color = NULL; + else + usage(); break; case LABEL_OPT: label = optarg; ==== //depot/projects/soc2008/gabor_textproc/grep/util.c#21 (text+ko) ==== @@ -227,11 +227,11 @@ if ((r == 0) && (color != NULL) && !oflag && !nottext) { char *tmp, *begin, *matched, *end; - if ((begin = malloc(strlen(l->dat) - pmatch.rm_so + 20)) == NULL) + if ((begin = malloc(strlen(l->dat) - pmatch.rm_so + 1)) == NULL) errx(2, NULL); - if ((matched = malloc((pmatch.rm_eo - pmatch.rm_so + 20) * sizeof(char))) == NULL) + if ((matched = malloc((pmatch.rm_eo - pmatch.rm_so + 1) * sizeof(char))) == NULL) errx(2, NULL); - if ((end = malloc(strlen(l->dat) - pmatch.rm_eo + 20)) == NULL) + if ((end = malloc(strlen(l->dat) - pmatch.rm_eo + 1)) == NULL) errx(2, NULL); strlcpy(begin, l->dat, pmatch.rm_so + 1); From owner-p4-projects@FreeBSD.ORG Tue Jun 17 12:42:12 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B48191065679; Tue, 17 Jun 2008 12:42:12 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 765751065675 for ; Tue, 17 Jun 2008 12:42:12 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 62B4B8FC17 for ; Tue, 17 Jun 2008 12:42:12 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5HCgCQX030748 for ; Tue, 17 Jun 2008 12:42:12 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5HCgCoc030746 for perforce@freebsd.org; Tue, 17 Jun 2008 12:42:12 GMT (envelope-from gabor@freebsd.org) Date: Tue, 17 Jun 2008 12:42:12 GMT Message-Id: <200806171242.m5HCgCoc030746@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 143640 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Jun 2008 12:42:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=143640 Change 143640 by gabor@gabor_server on 2008/06/17 12:42:03 - Eliminate unnecessary variable Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/util.c#22 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/util.c#22 (text+ko) ==== @@ -120,7 +120,7 @@ { struct str ln; struct file *f; - int c, t, z, nottext; + int c, t, nottext; if (mflag && (mcount <= 0)) return (0); @@ -163,9 +163,7 @@ --ln.len; ln.line_no++; - z = tail; - - if ((t = procline(&ln, nottext)) == 0 && Bflag > 0 && z == 0) { + if ((t = procline(&ln, nottext)) == 0 && Bflag > 0) { enqueue(&ln); linesqueued++; } From owner-p4-projects@FreeBSD.ORG Tue Jun 17 13:22:53 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 98EE6106567B; Tue, 17 Jun 2008 13:22:53 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5A0321065671 for ; Tue, 17 Jun 2008 13:22:53 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 45B308FC16 for ; Tue, 17 Jun 2008 13:22:53 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5HDMrqq046547 for ; Tue, 17 Jun 2008 13:22:53 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5HDMrp9046545 for perforce@freebsd.org; Tue, 17 Jun 2008 13:22:53 GMT (envelope-from gabor@freebsd.org) Date: Tue, 17 Jun 2008 13:22:53 GMT Message-Id: <200806171322.m5HDMrp9046545@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 143641 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Jun 2008 13:22:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=143641 Change 143641 by gabor@gabor_server on 2008/06/17 13:22:05 - Improve compatibility of -B Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/util.c#23 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/util.c#23 (text+ko) ==== @@ -276,7 +276,7 @@ if ((tail || c) && !cflag && !qflag) { if (c) { - if (!first && !prev && !tail && (Aflag || Bflag)) + if (!first && !prev && !tail && Aflag) printf("--\n"); tail = Aflag; if (Bflag > 0) @@ -284,16 +284,19 @@ linesqueued = 0; printline(l, ':'); } else { - prev = 0; printline(l, '-'); tail--; } } + if (!c && Bflag && prev) + printf("--\n"); + if (c) { prev++; first = 0; - } + } else + prev = 0; return (c); } From owner-p4-projects@FreeBSD.ORG Tue Jun 17 14:14:47 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 633C21065677; Tue, 17 Jun 2008 14:14:47 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2894E1065675 for ; Tue, 17 Jun 2008 14:14:47 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 11A1F8FC12 for ; Tue, 17 Jun 2008 14:14:47 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5HEEkoo051772 for ; Tue, 17 Jun 2008 14:14:46 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5HEEkp7051770 for perforce@freebsd.org; Tue, 17 Jun 2008 14:14:46 GMT (envelope-from gabor@freebsd.org) Date: Tue, 17 Jun 2008 14:14:46 GMT Message-Id: <200806171414.m5HEEkp7051770@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 143647 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Jun 2008 14:14:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=143647 Change 143647 by gabor@gabor_server on 2008/06/17 14:14:15 - Make -B compatible with GNU grep Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/util.c#24 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/util.c#24 (text+ko) ==== @@ -279,8 +279,11 @@ if (!first && !prev && !tail && Aflag) printf("--\n"); tail = Aflag; - if (Bflag > 0) + if (Bflag > 0) { + if (!first && !prev) + printf("--\n"); printqueue(); + } linesqueued = 0; printline(l, ':'); } else { @@ -289,9 +292,6 @@ } } - if (!c && Bflag && prev) - printf("--\n"); - if (c) { prev++; first = 0; From owner-p4-projects@FreeBSD.ORG Tue Jun 17 16:13:47 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C38C81065684; Tue, 17 Jun 2008 16:13:47 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 83FDF106567D for ; Tue, 17 Jun 2008 16:13:47 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6CF958FC14 for ; Tue, 17 Jun 2008 16:13:47 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5HGDlJT063704 for ; Tue, 17 Jun 2008 16:13:47 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5HGDlEX063702 for perforce@freebsd.org; Tue, 17 Jun 2008 16:13:47 GMT (envelope-from gabor@freebsd.org) Date: Tue, 17 Jun 2008 16:13:47 GMT Message-Id: <200806171613.m5HGDlEX063702@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 143650 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Jun 2008 16:13:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=143650 Change 143650 by gabor@gabor_server on 2008/06/17 16:13:31 - Little compatibility change to --color Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/util.c#25 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/util.c#25 (text+ko) ==== @@ -236,13 +236,13 @@ strlcpy(matched, &(l->dat[pmatch.rm_so]), pmatch.rm_eo - pmatch.rm_so + 1); strlcpy(end, &(l->dat[pmatch.rm_eo]), strlen(l->dat) - pmatch.rm_eo + 1); - asprintf(&tmp, "%s\33[%sm%s\33[00m%s", begin, color, matched, end); + asprintf(&tmp, "%s\33[%sm\33[K%s\33[00m\33[K%s", begin, color, matched, end); free(begin); free(matched); free(end); - l->len += strlen(color) + 8; + l->len += strlen(color) + 14; l->dat = tmp; } if (r == 0 && oflag && !nottext) { From owner-p4-projects@FreeBSD.ORG Tue Jun 17 16:27:01 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 67D0F1065672; Tue, 17 Jun 2008 16:27:01 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 29D801065671 for ; Tue, 17 Jun 2008 16:27:01 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id ED2B78FC17 for ; Tue, 17 Jun 2008 16:27:00 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5HGR0wW064743 for ; Tue, 17 Jun 2008 16:27:00 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5HGR03Y064741 for perforce@freebsd.org; Tue, 17 Jun 2008 16:27:00 GMT (envelope-from gabor@freebsd.org) Date: Tue, 17 Jun 2008 16:27:00 GMT Message-Id: <200806171627.m5HGR03Y064741@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 143652 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Jun 2008 16:27:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=143652 Change 143652 by gabor@gabor_server on 2008/06/17 16:26:05 - GNU compatibility: return 2 if file does not exist Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/util.c#26 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/util.c#26 (text+ko) ==== @@ -137,6 +137,8 @@ if (f == NULL) { if (!sflag) warn("%s", fn); + if (errno == ENOENT) + exit (2); return (0); } From owner-p4-projects@FreeBSD.ORG Tue Jun 17 16:55:30 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 56D891065677; Tue, 17 Jun 2008 16:55:30 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 184131065673 for ; Tue, 17 Jun 2008 16:55:30 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 00A708FC1B for ; Tue, 17 Jun 2008 16:55:30 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5HGtTjo076256 for ; Tue, 17 Jun 2008 16:55:29 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5HGtTOD076254 for perforce@freebsd.org; Tue, 17 Jun 2008 16:55:29 GMT (envelope-from gabor@freebsd.org) Date: Tue, 17 Jun 2008 16:55:29 GMT Message-Id: <200806171655.m5HGtTOD076254@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 143654 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Jun 2008 16:55:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=143654 Change 143654 by gabor@gabor_server on 2008/06/17 16:54:31 - GNU compatibility: - should represent stdin as a command line argument - GNU compatibility: return the proper status codes in all cases regarding the -q flag, the matched texts and the inexisting files Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/grep.c#21 edit .. //depot/projects/soc2008/gabor_textproc/grep/grep.h#16 edit .. //depot/projects/soc2008/gabor_textproc/grep/util.c#27 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/grep.c#21 (text+ko) ==== @@ -113,6 +113,7 @@ int first = 1; /* flag whether we are processing the first match */ int prev; /* flag whether or not the previous line matched */ int tail; /* lines left to print */ +int notfound; /* file not found */ struct patfile { const char *pf_file; @@ -550,5 +551,15 @@ } c+= procfile(*argv); } - exit(!c); + if (c) { + if (notfound && qflag) + exit(0); + else if (notfound) + exit (2); + else + exit (0); + } else if (notfound) + exit(2); + else + exit(1); } ==== //depot/projects/soc2008/gabor_textproc/grep/grep.h#16 (text+ko) ==== @@ -68,7 +68,7 @@ extern char *color, *label; extern int binbehave; -extern int first, prev, matchall, patterns, tail; +extern int first, prev, matchall, patterns, tail, notfound; extern char **pattern; extern struct fastgrep *fg_pattern; extern regex_t *r_pattern; ==== //depot/projects/soc2008/gabor_textproc/grep/util.c#27 (text+ko) ==== @@ -125,7 +125,7 @@ if (mflag && (mcount <= 0)) return (0); - if (fn == NULL) { + if (fn == NULL || (strcmp(fn, "-") == 0)) { if (label != NULL) fn = label; else @@ -138,7 +138,7 @@ if (!sflag) warn("%s", fn); if (errno == ENOENT) - exit (2); + notfound++; return (0); } From owner-p4-projects@FreeBSD.ORG Tue Jun 17 18:54:46 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 320F1106567E; Tue, 17 Jun 2008 18:54:46 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E6797106567A for ; Tue, 17 Jun 2008 18:54:45 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CE04A8FC20 for ; Tue, 17 Jun 2008 18:54:45 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5HIsjoJ088752 for ; Tue, 17 Jun 2008 18:54:45 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5HIsjMo088750 for perforce@freebsd.org; Tue, 17 Jun 2008 18:54:45 GMT (envelope-from gabor@freebsd.org) Date: Tue, 17 Jun 2008 18:54:45 GMT Message-Id: <200806171854.m5HIsjMo088750@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 143658 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Jun 2008 18:54:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=143658 Change 143658 by gabor@gabor_server on 2008/06/17 18:54:12 - GNU compatibility: Add workaround to allow '|' with empty subexpressions. This is done by cutting off those parts, e.g. "(|a|b||c|)" will be "(a|b|c)" Reported by: dougb Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/grep.c#22 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/grep.c#22 (text+ko) ==== @@ -187,6 +187,18 @@ static void add_pattern(char *pat, size_t len) { + char *ptr; + +/* Workaround for our libc-regex library to match GNU behaviour. + Our library rejects '|' with empty subexpressions. Just cut out + those parts, e.g. "(|a|b||c|)" will be "(a|b|c)" */ + while ((ptr = strstr(pat, "|)")) != NULL) + strlcpy(ptr, &(ptr[1]), strlen(pat) - strlen(ptr)); + while ((ptr = strstr(pat, "(|")) != NULL) + strlcpy(&(ptr[1]), &(ptr[2]), strlen(pat) - strlen(ptr) - 1); + while ((ptr = strstr(pat, "||")) != NULL) + strlcpy(&(ptr[1]), &(ptr[2]), strlen(pat) - strlen(ptr) - 1); + if (!xflag && (len == 0 || matchall)) { matchall = 1; return; From owner-p4-projects@FreeBSD.ORG Tue Jun 17 19:52:45 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4FE6E1065678; Tue, 17 Jun 2008 19:52:45 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 119091065674 for ; Tue, 17 Jun 2008 19:52:45 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id ED59E8FC18 for ; Tue, 17 Jun 2008 19:52:44 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5HJqiIH095954 for ; Tue, 17 Jun 2008 19:52:44 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5HJqinG095952 for perforce@freebsd.org; Tue, 17 Jun 2008 19:52:44 GMT (envelope-from gabor@freebsd.org) Date: Tue, 17 Jun 2008 19:52:44 GMT Message-Id: <200806171952.m5HJqinG095952@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 143665 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Jun 2008 19:52:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=143665 Change 143665 by gabor@gabor_server on 2008/06/17 19:52:15 - Pass REG_EXTENDED to regexec if -E is given - GNU compatibility: allow * at the beginning of a subexpression Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/grep.c#23 edit .. //depot/projects/soc2008/gabor_textproc/grep/util.c#28 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/grep.c#23 (text+ko) ==== @@ -199,6 +199,16 @@ while ((ptr = strstr(pat, "||")) != NULL) strlcpy(&(ptr[1]), &(ptr[2]), strlen(pat) - strlen(ptr) - 1); +/* Work-around to allow * at the beginning of a subexpression */ + while (pat[0] == '*') + pat++; + while ((ptr = strstr(pat, "(*")) != NULL) + strlcpy(&(ptr[1]), &(ptr[2]), strlen(pat) - strlen(ptr) - 1); + while ((ptr = strstr(pat, "|*")) != NULL) + strlcpy(&(ptr[1]), &(ptr[2]), strlen(pat) - strlen(ptr) - 1); + + printf("PAT: %s\n", pat); + if (!xflag && (len == 0 || matchall)) { matchall = 1; return; @@ -357,6 +367,7 @@ case 'E': Fflag = Gflag = 0; Eflag++; + eflags |= REG_EXTENDED; break; case 'e': add_patterns(optarg); ==== //depot/projects/soc2008/gabor_textproc/grep/util.c#28 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Tue Jun 17 19:55:48 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9A28E1065688; Tue, 17 Jun 2008 19:55:48 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5BB8C106567D for ; Tue, 17 Jun 2008 19:55:48 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2A8778FC1C for ; Tue, 17 Jun 2008 19:55:48 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5HJtmDG096233 for ; Tue, 17 Jun 2008 19:55:48 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5HJtmKp096231 for perforce@freebsd.org; Tue, 17 Jun 2008 19:55:48 GMT (envelope-from gabor@freebsd.org) Date: Tue, 17 Jun 2008 19:55:48 GMT Message-Id: <200806171955.m5HJtmKp096231@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 143666 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Jun 2008 19:55:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=143666 Change 143666 by gabor@gabor_server on 2008/06/17 19:54:58 - Remove work-in-progress debug line Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/grep.c#24 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/grep.c#24 (text+ko) ==== @@ -207,8 +207,6 @@ while ((ptr = strstr(pat, "|*")) != NULL) strlcpy(&(ptr[1]), &(ptr[2]), strlen(pat) - strlen(ptr) - 1); - printf("PAT: %s\n", pat); - if (!xflag && (len == 0 || matchall)) { matchall = 1; return; From owner-p4-projects@FreeBSD.ORG Tue Jun 17 19:59:52 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B694B1065675; Tue, 17 Jun 2008 19:59:52 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 783DC106566B for ; Tue, 17 Jun 2008 19:59:52 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 602858FC14 for ; Tue, 17 Jun 2008 19:59:52 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5HJxqVD096485 for ; Tue, 17 Jun 2008 19:59:52 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5HJxqbC096483 for perforce@freebsd.org; Tue, 17 Jun 2008 19:59:52 GMT (envelope-from gabor@freebsd.org) Date: Tue, 17 Jun 2008 19:59:52 GMT Message-Id: <200806171959.m5HJxqbC096483@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 143667 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Jun 2008 19:59:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=143667 Change 143667 by gabor@gabor_server on 2008/06/17 19:59:39 - Partly revert the previous change as it made the compatibility worse Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/grep.c#25 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/grep.c#25 (text+ko) ==== @@ -199,13 +199,9 @@ while ((ptr = strstr(pat, "||")) != NULL) strlcpy(&(ptr[1]), &(ptr[2]), strlen(pat) - strlen(ptr) - 1); -/* Work-around to allow * at the beginning of a subexpression */ +/* Work-around to allow * at the beginning of the regexp */ while (pat[0] == '*') pat++; - while ((ptr = strstr(pat, "(*")) != NULL) - strlcpy(&(ptr[1]), &(ptr[2]), strlen(pat) - strlen(ptr) - 1); - while ((ptr = strstr(pat, "|*")) != NULL) - strlcpy(&(ptr[1]), &(ptr[2]), strlen(pat) - strlen(ptr) - 1); if (!xflag && (len == 0 || matchall)) { matchall = 1; @@ -365,7 +361,6 @@ case 'E': Fflag = Gflag = 0; Eflag++; - eflags |= REG_EXTENDED; break; case 'e': add_patterns(optarg); From owner-p4-projects@FreeBSD.ORG Tue Jun 17 20:45:44 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C8A5C1065684; Tue, 17 Jun 2008 20:45:43 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7FADA106567C for ; Tue, 17 Jun 2008 20:45:43 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 67D098FC19 for ; Tue, 17 Jun 2008 20:45:43 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5HKjhGV001414 for ; Tue, 17 Jun 2008 20:45:43 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5HKjhAL001412 for perforce@freebsd.org; Tue, 17 Jun 2008 20:45:43 GMT (envelope-from pgj@FreeBSD.org) Date: Tue, 17 Jun 2008 20:45:43 GMT Message-Id: <200806172045.m5HKjhAL001412@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 143668 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Jun 2008 20:45:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=143668 Change 143668 by pgj@disznohal on 2008/06/17 20:45:09 Fix translation. Suggested by: gabor (mentor) Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/firewalls/chapter.sgml#5 edit Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/firewalls/chapter.sgml#5 (text+ko) ==== @@ -284,8 +284,8 @@ url="http://www.openbsd.org/faq/pf/">felhasználói útmutatójának karbantartásával. A kézikönyv ezen - szakasza ezért elsõsorban azzal foglalkozik, hogyan a - PF-et &os; alatt használni, + szakasza ezért elsõsorban azzal foglalkozik, hogyan + kell a PF-et &os; alatt használni, miközben igyekszik egy általános összefoglalást adni a témáról. A részletesebb információkkal kapcsolatban @@ -323,9 +323,8 @@ A &os; 7.0 kiadással a minta pf.conf állomány az /etc - könyvtárból - átköltözött a /usr/share/examples/pf + könyvtárból átkerült a + /usr/share/examples/pf könyvtárba. A &os; 7.0 elõtti kiadásokban alapértelmezés szerint található egy pf.conf @@ -462,13 +461,14 @@ /usr/share/examples/pf/ könyvtárban. A PF által használt szabályokról minden - részletre kiterjedõen a PF GYIK-ban - olvashatunk. + részletre kiterjedõen a PF felhasználói + útmutatójában olvashatunk. - A PF GYIK + A PF felhasználói + útmutatójának olvasásakor ne feledkezzünk meg róla, hogy a különbözõ &os; verziók különbözõ PF From owner-p4-projects@FreeBSD.ORG Tue Jun 17 21:15:13 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C7D531065675; Tue, 17 Jun 2008 21:15:13 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 891CA106564A for ; Tue, 17 Jun 2008 21:15:13 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 702028FC12 for ; Tue, 17 Jun 2008 21:15:13 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5HLFDkQ016286 for ; Tue, 17 Jun 2008 21:15:13 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5HLFDVo016275 for perforce@freebsd.org; Tue, 17 Jun 2008 21:15:13 GMT (envelope-from pgj@FreeBSD.org) Date: Tue, 17 Jun 2008 21:15:13 GMT Message-Id: <200806172115.m5HLFDVo016275@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 143670 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Jun 2008 21:15:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=143670 Change 143670 by pgj@disznohal on 2008/06/17 21:14:38 IFC Affected files ... .. //depot/projects/docproj_hu/doc/en_US.ISO8859-1/share/sgml/authors.ent#4 integrate .. //depot/projects/docproj_hu/doc/en_US.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#3 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/compiz-fusion/article.sgml#6 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/version-guide/article.sgml#5 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/desktop/chapter.sgml#3 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/firewalls/chapter.sgml#6 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/mirrors/chapter.sgml#3 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/glossary/freebsd-glossary.sgml#6 integrate .. //depot/projects/docproj_hu/doc/share/sgml/man-refs.ent#3 integrate .. //depot/projects/docproj_hu/www/en/donations/donors.sgml#2 integrate .. //depot/projects/docproj_hu/www/en/projects/newbies.sgml#2 integrate .. //depot/projects/docproj_hu/www/share/sgml/commercial.consult.xml#3 integrate .. //depot/projects/docproj_hu/www/share/sgml/commercial.isp.xml#4 integrate .. //depot/projects/docproj_hu/www/share/sgml/news.xml#5 integrate Differences ... ==== //depot/projects/docproj_hu/doc/en_US.ISO8859-1/share/sgml/authors.ent#4 (text+ko) ==== @@ -13,7 +13,7 @@ builds for the other languages, and we will poke fun of you in public. - $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.449 2008/06/12 22:13:27 ivoras Exp $ + $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.450 2008/06/16 17:25:12 eri Exp $ --> aaron@FreeBSD.org"> @@ -310,6 +310,8 @@ emoore@FreeBSD.org"> +eri@FreeBSD.org"> + eric@FreeBSD.org"> erich@FreeBSD.org"> ==== //depot/projects/docproj_hu/doc/en_US.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#3 (text+ko) ==== @@ -1,5 +1,5 @@ + @@ -701,6 +701,7 @@ + ==== //depot/projects/docproj_hu/www/en/donations/donors.sgml#2 (text+ko) ==== @@ -1,6 +1,6 @@ - + %developers; @@ -2447,6 +2447,12 @@ Received + + brueffer + soekris vpn1401 + simon + Received + &footer; ==== //depot/projects/docproj_hu/www/en/projects/newbies.sgml#2 (text+ko) ==== @@ -1,6 +1,6 @@ - + @@ -177,18 +177,6 @@ question or the odd few minutes to browse. More elementary material is near the front of the book, but there are short easy articles throughout.

- -

  • A UNIX - Introductory Course - from Ohio State University is available online in HTML, - postscript and Acrobat PDF formats.

    • - -

  • A UNIX - System Administration Course - from Ohio State University is available online in HTML, - postscript and Acrobat PDF formats.

  • UNIXhelp for Users is another introductory guide which is available in @@ -197,18 +185,13 @@

  • UNIX questions are dealt with in the newsgroup comp.unix.questions and the - associated - Frequently Asked Questions. - You can also get a copy of the + associated FAQ from the RMIT FTP site. Newbies are likely to be most interested in sections 1 and 2 initially.

  • Another interesting newsgroup is comp.unix.user-friendly - which also has a FAQ. + href="news:comp.unix.user-friendly">comp.unix.user-friendly. Although this newsgroup is for discussing user-friendliness, it can contain some good information for newbies. The FAQ ==== //depot/projects/docproj_hu/www/share/sgml/commercial.consult.xml#3 (text+ko) ==== @@ -1,12 +1,12 @@ - + - $FreeBSD: www/share/sgml/commercial.consult.xml,v 1.48 2008/05/24 13:39:27 jkois Exp $ + $FreeBSD: www/share/sgml/commercial.consult.xml,v 1.49 2008/06/15 13:10:18 jkois Exp $ @@ -1003,6 +1003,23 @@ + + Psychsoft Consulting + http://www.psychsoftek.com + + Psychsoft Consulting is an Industry recognized leading technology + consulting firm based in Quincy, Massachusetts founded in 1987 with a + highly educated, trained and experienced staff to help in all your IT + needs. Psychsoft, Inc. personnel hold advanced degrees in various + fields and have years of experience in IT implementation, + troubleshooting, design and configuration. Areas of expertise include: + Linux, Microsoft Windows, UNIX (including FreeBSD), TCP/IP, LAN, WAN, + VPN, Network security, WIFI security, WIFI design, Database design, + SQL, Web site design, Server design, System integration, Network + printing and DSL/Broadband/T1 Internet access. + + + Questwork Consulting Limited http://www.questwork.com/ ==== //depot/projects/docproj_hu/www/share/sgml/commercial.isp.xml#4 (text+ko) ==== @@ -1,12 +1,12 @@ - + - $FreeBSD: www/share/sgml/commercial.isp.xml,v 1.32 2008/06/09 19:58:37 jkois Exp $ + $FreeBSD: www/share/sgml/commercial.isp.xml,v 1.33 2008/06/15 12:52:45 jkois Exp $ @@ -665,7 +665,7 @@ Verio - http://www.verio.com + http://www.verio.com/freebsd With our FreeBSD VPS v3 and MPS v2, we combine more that 10 years of virtualization and managed experience with the proven ==== //depot/projects/docproj_hu/www/share/sgml/news.xml#5 (text+ko) ==== @@ -20,7 +20,7 @@ - $FreeBSD: www/share/sgml/news.xml,v 1.167 2008/06/13 03:16:31 murray Exp $ + $FreeBSD: www/share/sgml/news.xml,v 1.168 2008/06/16 17:30:22 eri Exp $ @@ -30,6 +30,15 @@ 6 + + 16 + + +

    New committer: Ermal + Luçi (src)

    + + + 10 From owner-p4-projects@FreeBSD.ORG Wed Jun 18 00:07:06 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 96F0E1065689; Wed, 18 Jun 2008 00:07:06 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5922C106566C for ; Wed, 18 Jun 2008 00:07:06 +0000 (UTC) (envelope-from rfrench@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2A2648FC0A for ; Wed, 18 Jun 2008 00:07:06 +0000 (UTC) (envelope-from rfrench@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5I076YS034695 for ; Wed, 18 Jun 2008 00:07:06 GMT (envelope-from rfrench@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5I0763r034693 for perforce@freebsd.org; Wed, 18 Jun 2008 00:07:06 GMT (envelope-from rfrench@FreeBSD.org) Date: Wed, 18 Jun 2008 00:07:06 GMT Message-Id: <200806180007.m5I0763r034693@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rfrench@FreeBSD.org using -f From: Ryan French To: Perforce Change Reviews Cc: Subject: PERFORCE change 143672 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Jun 2008 00:07:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=143672 Change 143672 by rfrench@rfrench_mpls on 2008/06/18 00:06:58 Attempting to submit the first part of my MPLS code. Not entirely sure if this will work as I only added the directory the files will be contained within. If it doesnt I'll add all the files manually. Affected files ... .. //depot/projects/soc2008/rfrench_mpls/netmpls#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Wed Jun 18 00:10:09 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CA17A1065671; Wed, 18 Jun 2008 00:10:09 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8C860106566B for ; Wed, 18 Jun 2008 00:10:09 +0000 (UTC) (envelope-from rfrench@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5DC4B8FC15 for ; Wed, 18 Jun 2008 00:10:09 +0000 (UTC) (envelope-from rfrench@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5I0A90B034997 for ; Wed, 18 Jun 2008 00:10:09 GMT (envelope-from rfrench@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5I0A9oe034995 for perforce@freebsd.org; Wed, 18 Jun 2008 00:10:09 GMT (envelope-from rfrench@FreeBSD.org) Date: Wed, 18 Jun 2008 00:10:09 GMT Message-Id: <200806180010.m5I0A9oe034995@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rfrench@FreeBSD.org using -f From: Ryan French To: Perforce Change Reviews Cc: Subject: PERFORCE change 143673 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Jun 2008 00:10:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=143673 Change 143673 by rfrench@rfrench_mpls on 2008/06/18 00:09:16 Didnt work ,I'm still getting used to perforce and how it works. I'll add all the files individually from now on. Sorry for the spam. Affected files ... .. //depot/projects/soc2008/rfrench_mpls/netmpls#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Wed Jun 18 00:45:46 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 23E681065675; Wed, 18 Jun 2008 00:45:46 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D8E50106566B for ; Wed, 18 Jun 2008 00:45:45 +0000 (UTC) (envelope-from obrien@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C0F958FC12 for ; Wed, 18 Jun 2008 00:45:45 +0000 (UTC) (envelope-from obrien@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5I0jjIf037861 for ; Wed, 18 Jun 2008 00:45:45 GMT (envelope-from obrien@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5I0jj4V037859 for perforce@freebsd.org; Wed, 18 Jun 2008 00:45:45 GMT (envelope-from obrien@freebsd.org) Date: Wed, 18 Jun 2008 00:45:45 GMT Message-Id: <200806180045.m5I0jj4V037859@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to obrien@freebsd.org using -f From: "David E. O'Brien" To: Perforce Change Reviews Cc: Subject: PERFORCE change 143675 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Jun 2008 00:45:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=143675 Change 143675 by obrien@obrien_trang on 2008/06/18 00:45:03 Merge updates from //depot/vendor/juniper/juniper-mips into //depot/projects/mips2-jnpr. Affected files ... .. //depot/projects/mips2-jnpr/src/gnu/usr.bin/gdb/kgdb/trgt_mips.c#2 edit .. //depot/projects/mips2-jnpr/src/juniper-mips/gnu/usr.bin/gdb/arch/mips/Makefile#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/gnu/usr.bin/gdb/arch/mips/config.h#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/gnu/usr.bin/gdb/arch/mips/init.c#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/gnu/usr.bin/gdb/kgdb/trgt_mips.c#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/lib/csu/mips/Makefile#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/lib/csu/mips/crt1.c#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/lib/csu/mips/crti.S#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/lib/csu/mips/crtn.S#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/lib/libc/mips/:errfix#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/lib/libc/mips/Makefile.inc#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/lib/libc/mips/SYS.h#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/lib/libc/mips/_fpmath.h#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/lib/libc/mips/arith.h#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/lib/libc/mips/gen/Makefile.inc#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/lib/libc/mips/gen/_setjmp.S#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/lib/libc/mips/gen/byte_swap_2.S#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/lib/libc/mips/gen/byte_swap_4.S#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/lib/libc/mips/gen/fabs.S#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/lib/libc/mips/gen/flt_rounds.c#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/lib/libc/mips/gen/fpgetmask.c#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/lib/libc/mips/gen/fpgetround.c#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/lib/libc/mips/gen/fpgetsticky.c#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/lib/libc/mips/gen/fpsetmask.c#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/lib/libc/mips/gen/fpsetround.c#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/lib/libc/mips/gen/fpsetsticky.c#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/lib/libc/mips/gen/frexp.c#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/lib/libc/mips/gen/infinity.c#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/lib/libc/mips/gen/isinf.S#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/lib/libc/mips/gen/ldexp.S#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/lib/libc/mips/gen/modf.S#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/lib/libc/mips/gen/setjmp.S#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/lib/libc/mips/gen/sigsetjmp.S#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/lib/libc/mips/net/Makefile.inc#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/lib/libc/mips/net/htonl.S#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/lib/libc/mips/net/htons.S#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/lib/libc/mips/softfloat/milieu.h#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/lib/libc/mips/softfloat/mips-gcc.h#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/lib/libc/mips/softfloat/softfloat.h#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/lib/libc/mips/stdlib/Makefile.inc#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/lib/libc/mips/string/Makefile.inc#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/lib/libc/mips/string/bcmp.S#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/lib/libc/mips/string/bcopy.S#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/lib/libc/mips/string/bzero.S#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/lib/libc/mips/string/ffs.S#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/lib/libc/mips/string/index.S#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/lib/libc/mips/string/rindex.S#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/lib/libc/mips/string/strcmp.S#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/lib/libc/mips/string/strlen.S#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/lib/libc/mips/sys/Makefile.inc#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/lib/libc/mips/sys/Ovfork.S#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/lib/libc/mips/sys/brk.S#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/lib/libc/mips/sys/cerror.S#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/lib/libc/mips/sys/exect.S#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/lib/libc/mips/sys/pipe.S#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/lib/libc/mips/sys/ptrace.S#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/lib/libc/mips/sys/sbrk.S#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/lib/libc/mips/sys/setlogin.S#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/lib/libc/mips/sys/sigpending.S#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/lib/libc/mips/sys/sigprocmask.S#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/lib/libc/mips/sys/sigreturn.S#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/lib/libc/mips/sys/sigsuspend.S#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/lib/libc/mips/sys/syscall.S#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/lib/libthr/arch/mips/Makefile.inc#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/lib/libthr/arch/mips/include/pthread_md.h#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/lib/libthr/arch/mips/mips/pthread_md.c#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/libexec/rtld-elf/mips/reloc.c#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/libexec/rtld-elf/mips/rtld_machdep.h#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/libexec/rtld-elf/mips/rtld_start.S#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/libexec/rtld-elf/rtld.c#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/libexec/rtld-elf/rtld.diff#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/libexec/rtld-elf/rtld.h#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/conf/Makefile.mips#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/conf/NOTES#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/conf/defines#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/conf/files#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/conf/files.mips#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/conf/ldscript.mips#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/conf/newvers.sh#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/conf/options#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/conf/options.mips#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/conf/GENERIC#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/conf/GENERIC.hints#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/drivers/sio/ns16550.c#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/drivers/sio/sio.c#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/drivers/sio/sio_isa.c#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/include/_bus.h#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/include/_inttypes.h#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/include/_limits.h#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/include/_stdint.h#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/include/_types.h#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/include/am29lv081b.h#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/include/archtype.h#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/include/asm.h#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/include/atomic.h#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/include/bootinfo.h#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/include/bswap.h#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/include/bus.h#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/include/clock.h#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/include/clockvar.h#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/include/cp0.h#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/include/cpu.h#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/include/cpuconf.h#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/include/cpufunc.h#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/include/db_machdep.h#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/include/defs.h#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/include/defs_mips.h#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/include/elf.h#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/include/endian.h#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/include/exec.h#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/include/float.h#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/include/frame.h#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/include/gdb_machdep.h#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/include/ieeefp.h#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/include/in_cksum.h#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/include/intr.h#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/include/kdb.h#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/include/limits.h#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/include/md_var.h#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/include/memdev.h#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/include/mips_opcode.h#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/include/mutex.h#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/include/ns16550.h#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/include/param.h#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/include/pcb.h#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/include/pcpu.h#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/include/pltfm.h#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/include/pmap.h#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/include/pmc_mdep.h#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/include/proc.h#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/include/profile.h#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/include/psl.h#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/include/pte.h#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/include/ptrace.h#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/include/queue.h#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/include/reg.h#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/include/regdef.h#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/include/regnum.h#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/include/reloc.h#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/include/resource.h#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/include/rm7000.h#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/include/runq.h#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/include/setjmp.h#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/include/sf_buf.h#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/include/sigframe.h#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/include/signal.h#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/include/smp.h#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/include/stdarg.h#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/include/sysarch.h#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/include/trap.h#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/include/ucontext.h#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/include/varargs.h#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/include/vmparam.h#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/mips/cache.S#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/mips/clock.c#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/mips/cpu.c#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/mips/db_disasm.c#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/mips/db_interface.c#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/mips/db_trace.c#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/mips/elf_machdep.c#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/mips/exception.S#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/mips/fp.S#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/mips/gdb_machdep.c#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/mips/genassym.c#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/mips/interrupt.c#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/mips/locore.S#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/mips/machdep.c#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/mips/mainbus.c#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/mips/mem.c#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/mips/mips_subr.c#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/mips/mp_machdep.c#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/mips/pm_machdep.c#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/mips/pmap.c#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/mips/psraccess.S#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/mips/support.S#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/mips/swtch.S#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/mips/tlb.S#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/mips/trap.c#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/mips/uio_machdep.c#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/mips/mips/vm_machdep.c#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/vm/vm_glue.c#1 branch .. //depot/projects/mips2-jnpr/src/juniper-mips/sys/vm/vm_object.h#1 branch .. //depot/projects/mips2-jnpr/src/lib/csu/mips/Makefile#3 integrate .. //depot/projects/mips2-jnpr/src/lib/csu/mips/crti.S#3 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/mips/sys/Makefile.inc#3 integrate .. //depot/projects/mips2-jnpr/src/libexec/rtld-elf/rtld.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/conf/files.mips#21 integrate .. //depot/projects/mips2-jnpr/src/sys/conf/ldscript.mips#5 integrate .. //depot/projects/mips2-jnpr/src/sys/conf/options.mips#7 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/archtype.h#4 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/asm.h#17 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/bswap.h#4 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/bus.h#9 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/clock.h#11 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/clockvar.h#4 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/cpu.h#16 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/cpufunc.h#8 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/db_machdep.h#6 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/defs.h#4 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/defs_mips.h#4 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/elf.h#7 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/endian.h#13 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/exec.h#5 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/float.h#7 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/frame.h#7 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/gdb_machdep.h#5 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/ieeefp.h#5 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/intr.h#8 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/md_var.h#11 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/mips_opcode.h#5 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/param.h#10 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/pcb.h#7 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/pltfm.h#4 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/pmap.h#13 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/proc.h#7 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/profile.h#5 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/psl.h#5 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/pte.h#8 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/queue.h#4 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/reg.h#7 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/regdef.h#6 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/regnum.h#8 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/reloc.h#5 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/resource.h#5 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/rm7000.h#4 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/setjmp.h#6 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/sigframe.h#5 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/signal.h#6 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/smp.h#5 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/stdarg.h#6 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/trap.h#8 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/ucontext.h#6 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/varargs.h#5 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/vmparam.h#8 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips/cpu.c#10 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips/db_disasm.c#5 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips/db_interface.c#6 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips/db_trace.c#6 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips/exception.S#25 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips/fp.S#5 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips/gdb_machdep.c#4 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips/genassym.c#8 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips/locore.S#23 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips/machdep.c#27 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips/mainbus.c#5 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips/mem.c#5 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips/pm_machdep.c#8 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips/pmap.c#30 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips/psraccess.S#11 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips/support.S#12 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips/swtch.S#18 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips/tlb.S#11 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips/trap.c#18 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips/vm_machdep.c#25 integrate Differences ... ==== //depot/projects/mips2-jnpr/src/gnu/usr.bin/gdb/kgdb/trgt_mips.c#2 (text+ko) ==== ==== //depot/projects/mips2-jnpr/src/lib/csu/mips/Makefile#3 (text+ko) ==== @@ -1,4 +1,5 @@ -# $FreeBSD: src/lib/csu/arm/Makefile,v 1.1 2004/05/14 12:19:04 cognet Exp $ +# JNPR: Makefile,v 1.2 2006/09/15 12:52:34 +# $FreeBSD$ .PATH: ${.CURDIR}/../common ==== //depot/projects/mips2-jnpr/src/lib/csu/mips/crti.S#3 (text+ko) ==== @@ -1,3 +1,7 @@ +/* + * JNPR: crti.S,v 1.1 2006/09/15 04:23:18 + */ + #include __FBSDID("$FreeBSD: src/lib/csu/arm/crti.S,v 1.2 2004/09/23 23:00:51 cognet Exp $"); ==== //depot/projects/mips2-jnpr/src/lib/libc/mips/sys/Makefile.inc#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libc/arm/sys/Makefile.inc,v 1.2 2004/11/05 23:52:05 cognet Exp $ +# JNPR: Makefile.inc,v 1.2 2006/09/15 12:52:34 MDASM= Ovfork.S brk.S cerror.S exect.S \ fork.S pipe.S ptrace.S sbrk.S shmat.S syscall.S ==== //depot/projects/mips2-jnpr/src/libexec/rtld-elf/rtld.c#3 (text+ko) ==== ==== //depot/projects/mips2-jnpr/src/sys/conf/files.mips#21 (text+ko) ==== @@ -1,10 +1,36 @@ +# Copyright (c) 2001, 2004-2005, 2008 Juniper Networks, 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. +# 3. Neither the name of the Juniper Networks, Inc. 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 JUNIPER NETWORKS 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 JUNIPER NETWORKS 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. +# +# JNPR: files.mips,v 1.11 2007/08/09 12:25:35 + + # This file tells config what files go into building a kernel, # files marked standard are always included. # -# Copyright (c) 2001, 2004-2005, Juniper Networks, Inc. -# All rights reserved. -# JNPR: files.mips,v 1.11 2007/08/09 12:25:35 katta -# # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and # dependency lines other than the first are silently ignored. ==== //depot/projects/mips2-jnpr/src/sys/conf/ldscript.mips#5 (text+ko) ==== @@ -1,5 +1,38 @@ -/* $FreeBSD: src/sys/conf/ldscript.mips,v 1.2 2008/04/30 12:44:58 gonzo Exp $ */ -OUTPUT_FORMAT("elf32-tradbigmips", "elf32-tradbigmips", "elf32-tradlittlemips") +/*- + * Copyright (c) 2001, 2004, 2008, Juniper Networks, 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. + * 3. Neither the name of the Juniper Networks, Inc. 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 JUNIPER NETWORKS 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 JUNIPER NETWORKS 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. + * + * JNPR: ldscript.mips,v 1.3 2006/10/11 06:12:04 + * $FreeBSD: src/sys/conf/ldscript.mips,v 1.2 2008/04/30 12:44:58 gonzo Exp $ + */ + +OUTPUT_FORMAT("elf32-littlemips", "elf32-bigmips", + "elf32-littlemips") + OUTPUT_ARCH(mips) ENTRY(_start) SEARCH_DIR(/usr/lib); ==== //depot/projects/mips2-jnpr/src/sys/conf/options.mips#7 (text+ko) ==== @@ -1,3 +1,31 @@ +# Copyright (c) 2001, 2008, Juniper Networks, 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. +# 3. Neither the name of the Juniper Networks, Inc. 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 JUNIPER NETWORKS 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 JUNIPER NETWORKS 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. +# +# JNPR: options.mips,v 1.2 2006/09/15 12:52:34 # $FreeBSD$ CPU_MIPS4KC opt_global.h ==== //depot/projects/mips2-jnpr/src/sys/mips/include/archtype.h#4 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * JNPR: archtype.h,v 1.6 2007/08/09 11:23:32 katta + * JNPR: archtype.h,v 1.6 2007/08/09 11:23:32 */ #ifndef _MACHINE_ARCHTYPE_H_ ==== //depot/projects/mips2-jnpr/src/sys/mips/include/asm.h#17 (text+ko) ==== @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * @(#)machAsmDefs.h 8.1 (Berkeley) 6/10/93 - * JNPR: asm.h,v 1.10 2007/08/09 11:23:32 katta + * JNPR: asm.h,v 1.10 2007/08/09 11:23:32 * $FreeBSD$ */ ==== //depot/projects/mips2-jnpr/src/sys/mips/include/bswap.h#4 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: bswap.h,v 1.2 1999/08/21 05:39:53 simonb Exp $ */ -/* JNPR: bswap.h,v 1.1 2006/08/07 05:38:57 katta */ +/* JNPR: bswap.h,v 1.1 2006/08/07 05:38:57 */ /* $FreeBSD$ #ifndef _MACHINE_BSWAP_H_ ==== //depot/projects/mips2-jnpr/src/sys/mips/include/bus.h#9 (text+ko) ==== @@ -1,7 +1,5 @@ /* $NetBSD: bus.h,v 1.12 1997/10/01 08:25:15 fvdl Exp $ */ /*- - * $Id: bus.h,v 1.6 2007/08/09 11:23:32 katta Exp $ - * * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc. * All rights reserved. * @@ -69,6 +67,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * from: src/sys/alpha/include/bus.h,v 1.5 1999/08/28 00:38:40 peter + * JNPR: bus.h,v 1.6 2007/08/09 11:23:32 * $FreeBSD$ */ ==== //depot/projects/mips2-jnpr/src/sys/mips/include/clock.h#11 (text+ko) ==== @@ -3,7 +3,7 @@ * This file is in the public domain. * Kernel interface to machine-dependent clock driver. * - * JNPR: clock.h,v 1.6.2.1 2007/08/29 09:36:05 girish + * JNPR: clock.h,v 1.6.2.1 2007/08/29 09:36:05 * from: src/sys/alpha/include/clock.h,v 1.5 1999/12/29 04:27:55 peter * $FreeBSD$ */ ==== //depot/projects/mips2-jnpr/src/sys/mips/include/clockvar.h#4 (text+ko) ==== @@ -28,7 +28,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * JNPR: clockvar.h,v 1.3 2006/08/07 05:38:57 katta + * JNPR: clockvar.h,v 1.3 2006/08/07 05:38:57 * $FreeBSD$ */ ==== //depot/projects/mips2-jnpr/src/sys/mips/include/cpu.h#16 (text+ko) ==== @@ -40,7 +40,7 @@ * without express or implied warranty. * * from: @(#)cpu.h 8.4 (Berkeley) 1/4/94 - * JNPR: cpu.h,v 1.9.2.2 2007/09/10 08:23:46 girish + * JNPR: cpu.h,v 1.9.2.2 2007/09/10 08:23:46 * $FreeBSD$ */ ==== //depot/projects/mips2-jnpr/src/sys/mips/include/cpufunc.h#8 (text+ko) ==== @@ -28,7 +28,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * JNPR: cpufunc.h,v 1.5 2007/08/09 11:23:32 katta + * JNPR: cpufunc.h,v 1.5 2007/08/09 11:23:32 * $FreeBSD$ */ ==== //depot/projects/mips2-jnpr/src/sys/mips/include/db_machdep.h#6 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * JNPR: db_machdep.h,v 1.7 2006/10/16 12:30:34 katta + * JNPR: db_machdep.h,v 1.7 2006/10/16 12:30:34 * $FreeBSD$ */ ==== //depot/projects/mips2-jnpr/src/sys/mips/include/defs.h#4 (text+ko) ==== @@ -1,14 +1,39 @@ -/* - * Copyright (c) 1996, 2001-2003, 2005, Juniper Networks, Inc. +/*- + * Copyright (c) 1996, 2001-2003, 2005, 2008, Juniper Networks, Inc. * All rights reserved. * - * defs.h -- Simple universal types and definitions for use by the microkernel - * Jim Hayes, November 1996 + * 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. + * 3. Neither the name of the Juniper Networks, Inc. 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 JUNIPER NETWORKS 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 JUNIPER NETWORKS 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. * - * JNPR: defs.h,v 1.3.2.1 2007/09/10 08:16:32 girish + * JNPR: defs.h,v 1.3.2.1 2007/09/10 08:16:32 * $FreeBSD$ */ +/* + * defs.h -- Simple universal types and definitions for use by the microkernel + */ + #ifndef __DEFS_H__ #define __DEFS_H__ ==== //depot/projects/mips2-jnpr/src/sys/mips/include/defs_mips.h#4 (text+ko) ==== @@ -1,11 +1,37 @@ +/*- + * Copyright (c) 2001, 2005, 2008, Juniper Networks, 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. + * 3. Neither the name of the Juniper Networks, Inc. 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 JUNIPER NETWORKS 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 JUNIPER NETWORKS 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. + * + * JNPR: defs_mips.h,v 1.3 2006/12/02 09:53:40 + * $FreeBSD$ + */ + /* - * $Id: defs_mips.h,v 1.3 2006/12/02 09:53:40 katta Exp $ * defs_mips.h -- Simple MIPS specific types for use by the microkernel - * - * Truman Joe, February 2001 - * - * Copyright (c) 2001, 2005, Juniper Networks, Inc. - * All rights reserved. */ #ifndef __DEFS_MIPS_H__ ==== //depot/projects/mips2-jnpr/src/sys/mips/include/elf.h#7 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * JNPR: elf.h,v 1.4 2006/12/02 09:53:40 katta + * JNPR: elf.h,v 1.4 2006/12/02 09:53:40 * $FreeBSD$ * */ ==== //depot/projects/mips2-jnpr/src/sys/mips/include/endian.h#13 (text+ko) ==== @@ -26,8 +26,9 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#)endian.h 7.8 (Berkeley) 4/3/91 - * $FreeBSD: src/sys/amd64/include/endian.h,v 1.8 2005/03/11 21:46:01 peter Exp $ + * @(#)endian.h 8.1 (Berkeley) 6/10/93 + * JNPR: endian.h,v 1.8 2007/08/09 11:23:32 + * $FreeBSD$ */ #ifndef _MACHINE_ENDIAN_H_ ==== //depot/projects/mips2-jnpr/src/sys/mips/include/exec.h#5 (text+ko) ==== @@ -28,7 +28,7 @@ * * @(#)exec.h 8.1 (Berkeley) 6/11/93 * from: src/sys/i386/include/exec.h,v 1.8 1999/08/28 00:44:11 peter - * JNPR: exec.h,v 1.3 2006/08/07 05:38:57 katta + * JNPR: exec.h,v 1.3 2006/08/07 05:38:57 * $FreeBSD$ */ ==== //depot/projects/mips2-jnpr/src/sys/mips/include/float.h#7 (text+ko) ==== @@ -28,7 +28,7 @@ * * from: @(#)float.h 7.1 (Berkeley) 5/8/90 * from: src/sys/i386/include/float.h,v 1.8 1999/08/28 00:44:11 peter - * JNPR: float.h,v 1.4 2006/12/02 09:53:41 katta + * JNPR: float.h,v 1.4 2006/12/02 09:53:41 * $FreeBSD: src/sys/mips/include/float.h,v 1.2 2008/05/03 21:04:21 gonzo Exp $ */ ==== //depot/projects/mips2-jnpr/src/sys/mips/include/frame.h#7 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * JNPR: frame.h,v 1.6.2.1 2007/09/10 08:14:57 girish + * JNPR: frame.h,v 1.6.2.1 2007/09/10 08:14:57 * $FreeBSD$ * */ ==== //depot/projects/mips2-jnpr/src/sys/mips/include/gdb_machdep.h#5 (text+ko) ==== @@ -24,7 +24,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * from: src/sys/alpha/include/gdb_machdep.h,v 1.3 2005/01/05 20:05:50 imp - * JNPR: gdb_machdep.h,v 1.1 2007/08/09 12:25:25 katta + * JNPR: gdb_machdep.h,v 1.1 2007/08/09 12:25:25 * $FreeBSD$ */ ==== //depot/projects/mips2-jnpr/src/sys/mips/include/ieeefp.h#5 (text+ko) ==== @@ -4,7 +4,7 @@ * Written by J.T. Conklin, Apr 11, 1995 * Public domain. * - * JNPR: ieeefp.h,v 1.1 2006/08/07 05:38:57 katta + * JNPR: ieeefp.h,v 1.1 2006/08/07 05:38:57 * $FreeBSD$ */ ==== //depot/projects/mips2-jnpr/src/sys/mips/include/intr.h#8 (text+ko) ==== @@ -28,7 +28,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * JNPR: intr.h,v 1.4 2007/08/09 11:23:32 katta + * JNPR: intr.h,v 1.4 2007/08/09 11:23:32 * $FreeBSD$ */ ==== //depot/projects/mips2-jnpr/src/sys/mips/include/md_var.h#11 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * from: src/sys/i386/include/md_var.h,v 1.35 2000/02/20 20:51:23 bsd - * JNPR: md_var.h,v 1.4 2006/10/16 12:30:34 katta + * JNPR: md_var.h,v 1.4 2006/10/16 12:30:34 * $FreeBSD$ */ ==== //depot/projects/mips2-jnpr/src/sys/mips/include/mips_opcode.h#5 (text+ko) ==== @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * from: @(#)mips_opcode.h 8.1 (Berkeley) 6/10/93 - * JNPR: mips_opcode.h,v 1.1 2006/08/07 05:38:57 katta + * JNPR: mips_opcode.h,v 1.1 2006/08/07 05:38:57 * $FreeBSD$ */ ==== //depot/projects/mips2-jnpr/src/sys/mips/include/param.h#10 (text+ko) ==== @@ -35,7 +35,7 @@ * * from: Utah Hdr: machparam.h 1.11 89/08/14 * from: @(#)param.h 8.1 (Berkeley) 6/10/93 - * JNPR: param.h,v 1.6.2.1 2007/09/10 07:49:36 girish + * JNPR: param.h,v 1.6.2.1 2007/09/10 07:49:36 * $FreeBSD$ */ ==== //depot/projects/mips2-jnpr/src/sys/mips/include/pcb.h#7 (text+ko) ==== @@ -35,7 +35,7 @@ * * from: Utah Hdr: pcb.h 1.13 89/04/23 * from: @(#)pcb.h 8.1 (Berkeley) 6/10/93 - * JNPR: pcb.h,v 1.2 2006/08/07 11:51:17 katta + * JNPR: pcb.h,v 1.2 2006/08/07 11:51:17 * $FreeBSD$ */ ==== //depot/projects/mips2-jnpr/src/sys/mips/include/pltfm.h#4 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * JNPR: pltfm.h,v 1.5.2.1 2007/09/10 05:56:11 girish + * JNPR: pltfm.h,v 1.5.2.1 2007/09/10 05:56:11 * $FreeBSD$ */ ==== //depot/projects/mips2-jnpr/src/sys/mips/include/pmap.h#13 (text+ko) ==== @@ -39,7 +39,7 @@ * from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90 * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 * from: src/sys/i386/include/pmap.h,v 1.65.2.2 2000/11/30 01:54:42 peter - * JNPR: pmap.h,v 1.7.2.1 2007/09/10 07:44:12 girish + * JNPR: pmap.h,v 1.7.2.1 2007/09/10 07:44:12 */ #ifndef _MACHINE_PMAP_H_ ==== //depot/projects/mips2-jnpr/src/sys/mips/include/proc.h#7 (text+ko) ==== @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * @(#)proc.h 8.1 (Berkeley) 6/10/93 - * JNPR: proc.h,v 1.7.2.1 2007/09/10 06:25:24 girish + * JNPR: proc.h,v 1.7.2.1 2007/09/10 06:25:24 * $FreeBSD$ */ ==== //depot/projects/mips2-jnpr/src/sys/mips/include/profile.h#5 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)profile.h 8.1 (Berkeley) 6/10/93 - * JNPR: profile.h,v 1.4 2006/12/02 09:53:41 katta + * JNPR: profile.h,v 1.4 2006/12/02 09:53:41 * $FreeBSD$ */ #ifndef _MACHINE_PROFILE_H_ ==== //depot/projects/mips2-jnpr/src/sys/mips/include/psl.h#5 (text+ko) ==== @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * from: @(#)psl.h 8.1 (Berkeley) 6/10/93 - * JNPR: psl.h,v 1.1 2006/08/07 05:38:57 katta + * JNPR: psl.h,v 1.1 2006/08/07 05:38:57 * $FreeBSD$ */ ==== //depot/projects/mips2-jnpr/src/sys/mips/include/pte.h#8 (text+ko) ==== @@ -39,7 +39,7 @@ * * from: Utah Hdr: pte.h 1.11 89/09/03 * from: @(#)pte.h 8.1 (Berkeley) 6/10/93 - * JNPR: pte.h,v 1.1.4.1 2007/09/10 06:20:19 girish + * JNPR: pte.h,v 1.1.4.1 2007/09/10 06:20:19 * $FreeBSD$ */ ==== //depot/projects/mips2-jnpr/src/sys/mips/include/queue.h#4 (text+ko) ==== @@ -1,13 +1,37 @@ /*- - * Copyright (c) 1996-1997, 2001, 2005, Juniper Networks, Inc. + * Copyright (c) 1996-1997, 2001, 2005, 2008, Juniper Networks, Inc. * All rights reserved. - * Jim Hayes, November 1996 + * + * 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. + * 3. Neither the name of the Juniper Networks, Inc. nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. * - * queue.h - Description of uKernel queues, for the Juniper Kernel + * THIS SOFTWARE IS PROVIDED BY JUNIPER NETWORKS 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 JUNIPER NETWORKS 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. * - * JNPR: queue.h,v 1.1 2006/08/07 05:38:57 katta + * JNPR: queue.h,v 1.1 2006/08/07 05:38:57 * $FreeBSD$ - * + */ + +/* + * queue.h - Description of uKernel queues, for the Juniper Kernel */ #ifndef __QUEUE_H__ ==== //depot/projects/mips2-jnpr/src/sys/mips/include/reg.h#7 (text+ko) ==== @@ -35,7 +35,7 @@ * * from: Utah Hdr: reg.h 1.1 90/07/09 * @(#)reg.h 8.2 (Berkeley) 1/11/94 - * JNPR: reg.h,v 1.6 2006/09/15 12:52:34 katta + * JNPR: reg.h,v 1.6 2006/09/15 12:52:34 * $FreeBSD$ */ ==== //depot/projects/mips2-jnpr/src/sys/mips/include/regdef.h#6 (text+ko) ==== @@ -1,14 +1,39 @@ /*- - * Copyright (c) 2001, Juniper Networks, Inc. + * Copyright (c) 2001, 2008, Juniper Networks, Inc. * All rights reserved. - * Truman Joe, February 2001. + * + * 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. + * 3. Neither the name of the Juniper Networks, Inc. nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. * - * regdef.h -- MIPS register definitions. + * THIS SOFTWARE IS PROVIDED BY JUNIPER NETWORKS 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 JUNIPER NETWORKS 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. * - * JNPR: regdef.h,v 1.3 2006/08/07 05:38:57 katta + * JNPR: regdef.h,v 1.3 2006/08/07 05:38:57 * $FreeBSD$ */ +/* + * regdef.h -- MIPS register definitions. + */ + #ifndef _MACHINE_REGDEF_H_ #define _MACHINE_REGDEF_H_ ==== //depot/projects/mips2-jnpr/src/sys/mips/include/regnum.h#8 (text+ko) ==== @@ -35,7 +35,7 @@ * * from: Utah Hdr: reg.h 1.1 90/07/09 * @(#)reg.h 8.2 (Berkeley) 1/11/94 - * JNPR: regnum.h,v 1.6 2007/08/09 11:23:32 katta + * JNPR: regnum.h,v 1.6 2007/08/09 11:23:32 * $FreeBSD$ */ ==== //depot/projects/mips2-jnpr/src/sys/mips/include/reloc.h#5 (text+ko) ==== @@ -30,6 +30,6 @@ * SUCH DAMAGE. * * from: src/sys/alpha/include/reloc.h,v 1.1.1.1.6.1 2000/08/03 00:48:04 peter - * JNPR: reloc.h,v 1.3 2006/08/07 05:38:57 katta + * JNPR: reloc.h,v 1.3 2006/08/07 05:38:57 * $FreeBSD$ */ ==== //depot/projects/mips2-jnpr/src/sys/mips/include/resource.h#5 (text+ko) ==== @@ -26,7 +26,7 @@ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * from: src/sys/i386/include/resource.h,v 1.3 1999/10/14 21:38:30 dfr - * JNPR: resource.h,v 1.3 2006/08/07 05:38:57 katta + * JNPR: resource.h,v 1.3 2006/08/07 05:38:57 * $FreeBSD$ */ ==== //depot/projects/mips2-jnpr/src/sys/mips/include/rm7000.h#4 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * JNPR: rm7000.h,v 1.2.4.1 2007/08/29 12:06:30 girish + * JNPR: rm7000.h,v 1.2.4.1 2007/08/29 12:06:30 * $FreeBSD$ */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jun 18 01:10:11 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 103E2106567F; Wed, 18 Jun 2008 01:10:11 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C67C21065674 for ; Wed, 18 Jun 2008 01:10:10 +0000 (UTC) (envelope-from rfrench@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 977EB8FC15 for ; Wed, 18 Jun 2008 01:10:10 +0000 (UTC) (envelope-from rfrench@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5I1AAwA050085 for ; Wed, 18 Jun 2008 01:10:10 GMT (envelope-from rfrench@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5I1AAjm050083 for perforce@freebsd.org; Wed, 18 Jun 2008 01:10:10 GMT (envelope-from rfrench@FreeBSD.org) Date: Wed, 18 Jun 2008 01:10:10 GMT Message-Id: <200806180110.m5I1AAjm050083@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rfrench@FreeBSD.org using -f From: Ryan French To: Perforce Change Reviews Cc: Subject: PERFORCE change 143676 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Jun 2008 01:10:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=143676 Change 143676 by rfrench@rfrench_mpls on 2008/06/18 01:09:49 First proper submit of MPLS files. I wrote this a while ago, so I still have a lot of changes to go with it. I just wanted to start getting my perforce stuff ready to go for my developments later this week. Affected files ... .. //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_input.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Wed Jun 18 05:42:48 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C06CB1065679; Wed, 18 Jun 2008 05:42:48 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 83DDA1065674 for ; Wed, 18 Jun 2008 05:42:48 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6EAAA8FC1A for ; Wed, 18 Jun 2008 05:42:48 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5I5gmWR085241 for ; Wed, 18 Jun 2008 05:42:48 GMT (envelope-from weongyo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5I5gj0i085237 for perforce@freebsd.org; Wed, 18 Jun 2008 05:42:45 GMT (envelope-from weongyo@FreeBSD.org) Date: Wed, 18 Jun 2008 05:42:45 GMT Message-Id: <200806180542.m5I5gj0i085237@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to weongyo@FreeBSD.org using -f From: Weongyo Jeong To: Perforce Change Reviews Cc: Subject: PERFORCE change 143681 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Jun 2008 05:42:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=143681 Change 143681 by weongyo@weongyo_ws on 2008/06/18 05:41:56 handle (PCI|PCMCIA|USB) .INF files correctly that specify multiple entries in [Manufacturer] sections. Affected files ... .. //depot/projects/ndisusb/usr.sbin/ndiscvt/inf.c#3 edit Differences ... ==== //depot/projects/ndisusb/usr.sbin/ndiscvt/inf.c#3 (text+ko) ==== @@ -285,7 +285,7 @@ struct section *sec; struct assign *assign; char xpsec[256]; - int found = 0; + int first = 1, found = 0; /* Find manufacturer name */ manf = find_assign("Manufacturer", NULL); @@ -322,8 +322,11 @@ found = 0; - /* Emit start of PCI device table */ - fprintf (ofp, "#define NDIS_PCI_DEV_TABLE"); + if (first == 1) { + /* Emit start of PCI device table */ + fprintf (ofp, "#define NDIS_PCI_DEV_TABLE"); + first = 0; + } retry: @@ -375,7 +378,7 @@ struct section *sec; struct assign *assign; char xpsec[256]; - int found = 0; + int first = 1, found = 0; /* Find manufacturer name */ manf = find_assign("Manufacturer", NULL); @@ -412,8 +415,11 @@ found = 0; - /* Emit start of PCMCIA device table */ - fprintf (ofp, "#define NDIS_PCMCIA_DEV_TABLE"); + if (first == 1) { + /* Emit start of PCMCIA device table */ + fprintf (ofp, "#define NDIS_PCMCIA_DEV_TABLE"); + first = 0; + } retry: @@ -465,7 +471,7 @@ struct section *sec; struct assign *assign; char xpsec[256]; - int found = 0; + int first = 1, found = 0; /* Find manufacturer name */ manf = find_assign("Manufacturer", NULL); @@ -502,8 +508,11 @@ found = 0; - /* Emit start of USB device table */ - fprintf (ofp, "#define NDIS_USB_DEV_TABLE"); + if (first == 1) { + /* Emit start of USB device table */ + fprintf (ofp, "#define NDIS_USB_DEV_TABLE"); + first = 0; + } retry: From owner-p4-projects@FreeBSD.ORG Wed Jun 18 07:33:42 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 29ACC1065671; Wed, 18 Jun 2008 07:33:42 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E04E9106567A for ; Wed, 18 Jun 2008 07:33:41 +0000 (UTC) (envelope-from snb@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CC5F08FC1B for ; Wed, 18 Jun 2008 07:33:41 +0000 (UTC) (envelope-from snb@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5I7Xf5G096466 for ; Wed, 18 Jun 2008 07:33:41 GMT (envelope-from snb@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5I7XfSZ096464 for perforce@freebsd.org; Wed, 18 Jun 2008 07:33:41 GMT (envelope-from snb@FreeBSD.org) Date: Wed, 18 Jun 2008 07:33:41 GMT Message-Id: <200806180733.m5I7XfSZ096464@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to snb@FreeBSD.org using -f From: Nick Barkas To: Perforce Change Reviews Cc: Subject: PERFORCE change 143684 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Jun 2008 07:33:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=143684 Change 143684 by snb@snb_toro on 2008/06/18 07:33:00 Definition of a new function to free dirhashes when the kernel signals that memory is low. Affected files ... .. //depot/projects/soc2008/snb-dirhash/sys-ufs-ufs/ufs_dirhash.c#2 edit Differences ... ==== //depot/projects/soc2008/snb-dirhash/sys-ufs-ufs/ufs_dirhash.c#2 (text+ko) ==== @@ -48,6 +48,7 @@ #include #include #include +#include #include #include @@ -1132,6 +1133,15 @@ return (0); } +/* + * Calback that frees some dirhashes when the system is low on virtual memory. + */ +static void +ufsdirhash_lowmem() +{ + +} + void ufsdirhash_init() @@ -1140,6 +1150,10 @@ NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, 0); mtx_init(&ufsdirhash_mtx, "dirhash list", NULL, MTX_DEF); TAILQ_INIT(&ufsdirhash_list); + + /* Register a callback function to handle low memory signals */ + EVENTHANDLER_REGISTER(vm_lowmem, ufsdirhash_lowmem, NULL, + EVENTHANDLER_PRI_FIRST); } void From owner-p4-projects@FreeBSD.ORG Wed Jun 18 11:40:55 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 006BF1065671; Wed, 18 Jun 2008 11:40:55 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B5D0B106566B for ; Wed, 18 Jun 2008 11:40:54 +0000 (UTC) (envelope-from snagg@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9FBCB8FC16 for ; Wed, 18 Jun 2008 11:40:54 +0000 (UTC) (envelope-from snagg@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5IBesQ6032989 for ; Wed, 18 Jun 2008 11:40:54 GMT (envelope-from snagg@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5IBer35032987 for perforce@freebsd.org; Wed, 18 Jun 2008 11:40:53 GMT (envelope-from snagg@FreeBSD.org) Date: Wed, 18 Jun 2008 11:40:53 GMT Message-Id: <200806181140.m5IBer35032987@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to snagg@FreeBSD.org using -f From: Vincenzo Iozzo To: Perforce Change Reviews Cc: Subject: PERFORCE change 143689 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Jun 2008 11:40:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=143689 Change 143689 by snagg@snagg_macosx on 2008/06/18 11:40:21 Finished the first event-specific framework part, added also a testing program. Some other bugs were corrected in the utils. Still need some testing Affected files ... .. //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/audit_pipe_ioctl_events.c#2 delete .. //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/audit_pipe_regression_test_utils.c#3 edit .. //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/audit_pipe_regression_test_utils.h#2 edit .. //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/specific-event/audit_pipe_event_open.c#1 add .. //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/tests/open_test.c#1 add Differences ... ==== //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/audit_pipe_regression_test_utils.c#3 (text+ko) ==== @@ -1,47 +1,6 @@ #include "audit_pipe_regression_test_utils.h" -struct audit_record *del_record_au(struct audit_record *head, int index) -{ - struct audit_record *tmp; - struct audit_record *p; - - tmp = head; - if(tmp == NULL) - return NULL; - for(; tmp->next != NULL; tmp = tmp->next) - { - if(tmp->next->index == index) { - p = tmp->next; - tmp->next = tmp->next->next; - free(p); - return head; - } - } - - return NULL; -} - -struct audit_record -*add_field_au(struct audit_record *head, struct audit_record *new) -{ - struct audit_record *tmp; - - tmp = head; - if(tmp == NULL) { - new->next = NULL; - return new; - } - - for(; tmp->next != NULL;tmp = tmp->next); - new->index = tmp->index +1; - tmp->next= new; - new->next = NULL; - - return head; -} - - void init_channel() { key_t key; @@ -101,7 +60,7 @@ /* * Every string in the shared-memory channel is of the form - * value:!!audit-field:**type. + * value\\!!audit-field:**type. * Here we parse the audit-field part */ char *get_descr(char *string) @@ -110,7 +69,7 @@ str = string; - if((string = strsep(&str, ":!!")) != NULL) + if((string = strsep(&str, "\\!!")) != NULL) { str +=2; return str; @@ -119,7 +78,7 @@ /* * Every string in the shared-memory channel is of the form - * value:!!audit-field:**type. + * value\!!audit-field:**type. * Here we parse the type part */ int parse_string(char *string) @@ -179,47 +138,49 @@ * We fetch every token from auditpipe and eventually dump them to a file * Modified version of praudit function. */ -struct audit_record -*audit_print_record(FILE *st, FILE *in) + +int +audit_print_record(FILE *st, char *buffer, int buflen, struct audit_record rec) { - u_char *buf; - tokenstr_t tok; - int reclen; - int bytesread; int count; u_char type; - struct audit_record *rec; - + int i, exit; + type = 0; count = 0; - rec = malloc(sizeof(struct audit_record)); - if(rec == NULL) - err(-1, "MALLOC"); - + exit = 0; + /* Record must begin with a header token. */ - do { - type = fgetc(in); - } while(type != AU_HEADER_32_TOKEN); - ungetc(type, in); + for( i = 0; i< buflen; i++) { + type = buffer[i]; + if(type == AU_HEADER_32_TOKEN) { + buffer +=i; + buflen -=i; + break; + } + } + while (buflen > 0) { - while ((reclen = au_read_rec(in, &buf)) != -1) { - bytesread = 0; - while (bytesread < reclen) { - - /* Is this an incomplete record? */ - if (-1 == au_fetch_tok(&tok, buf + bytesread, - reclen - bytesread)) - break; - rec->toks[count] = tok; - rec->count = count; - au_print_tok_xml(st, &tok, ",", 0, 0); - fprintf(st, "\n"); - bytesread += tok.len; - } - free(buf); - fflush(st); + /* XXX: Is this an incomplete record? */ + if (au_fetch_tok(&(rec.toks[count]), buffer, buflen) == -1) + break; + + rec.count = count; + au_print_tok_xml(st, &(rec.toks[count]), ",", 0, 0); + buflen -= rec.toks[count].len; + buffer += rec.toks[count].len; + fprintf(st, "\n"); + count++; + if(count == 20) + return -1; + if(exit) + break; + if(*buffer == AU_TRAILER_TOKEN) + exit = 1; } - return rec; + + fflush(st); + return 0; } /* @@ -239,25 +200,19 @@ return f; } -void report_error(tokenstr_t tok, struct audit_record *rec, FILE *f) +void report_error(tokenstr_t tok, FILE *f) { - int i; - if(rec == NULL) - return; - for(i = 0; i <= rec->count; i++) { - au_print_tok_xml(f, &(rec->toks[i]), ",", 0, 0); - fprintf(f, "\n"); - } - fprintf(f, "ERROR:***"); + fprintf(f, "ERROR:***\n"); au_print_tok_xml(f, &tok, ",", 0, 0); fprintf(f, "\n"); + } /* * Check the return value of a bsm-token */ -int check_ret(au_exit_t ret, int r, char *val) +int check_ret(au_ret32_t ret, int r, char *val) { if(ret.ret == r) //if(!strncmp(ret.status, val, strlen(ret.status) > strlen(val)? ==== //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/audit_pipe_regression_test_utils.h#2 (text+ko) ==== @@ -46,6 +46,9 @@ #include #include +#define AUDIT_BUFFER_LEN 65536 +#define AUDIT_RECORD_MAX 256 + #define SHMSZ 512 #define SEM_NAME "/audit-test" #define SEM_CLIENT_NAME "/client" @@ -59,17 +62,27 @@ CHAR_TYPE }; +/* + * NOT = do not validate anything + * GOT_READLINK = we took the last function (a readlink) of the standard + * "prologue" of every process + * VALID = we need to validate stuff + * WAITING = this is not the right syscall to parse + */ +enum VALIDATE { + NOT, + GOT_READLINK, + VALID, + WAITING +}; + struct audit_record { tokenstr_t toks[20]; int count; int index; - struct audit_record *next; }; -struct audit_record *del_record_au(struct audit_record *head, int index); -struct audit_record *add_field_au(struct audit_record *head, - struct audit_record *new); void init_channel(); void end_channel(); char *read_string(); @@ -77,11 +90,11 @@ int parse_string(char *string); long get_int(char *string); char get_c(char *string); -struct audit_record *audit_print_record(FILE *st, FILE *in); +int audit_print_record(FILE *st, char *buffer, int buflen, + struct audit_record rec); FILE *init_log(pid_t pid); -void report_error(tokenstr_t tok, struct audit_record *rec, - FILE *f); -int check_ret(au_exit_t ret, int r, char *val); +void report_error(tokenstr_t tok, FILE *f); +int check_ret(au_ret32_t ret, int r, char *val); int check_path(au_path_t path, char *val); int check_arg(au_arg32_t arg, long val); int check_priv(au_proc32ex_t priv, pid_t pid); From owner-p4-projects@FreeBSD.ORG Wed Jun 18 14:55:13 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9C3081065689; Wed, 18 Jun 2008 14:55:13 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5D3FD106566C for ; Wed, 18 Jun 2008 14:55:13 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 45E538FC26 for ; Wed, 18 Jun 2008 14:55:13 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5IEtD8w060896 for ; Wed, 18 Jun 2008 14:55:13 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5IEtDIm060894 for perforce@freebsd.org; Wed, 18 Jun 2008 14:55:13 GMT (envelope-from zec@FreeBSD.org) Date: Wed, 18 Jun 2008 14:55:13 GMT Message-Id: <200806181455.m5IEtDIm060894@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 143697 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Jun 2008 14:55:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=143697 Change 143697 by zec@zec_tpx32 on 2008/06/18 14:55:06 Add #include lines the script failed to inject automatically. Affected files ... .. //depot/projects/vimage-commit2/src/sys/security/mac_biba/mac_biba.c#5 edit .. //depot/projects/vimage-commit2/src/sys/security/mac_lomac/mac_lomac.c#5 edit .. //depot/projects/vimage-commit2/src/sys/security/mac_mls/mac_mls.c#5 edit .. //depot/projects/vimage-commit2/src/sys/security/mac_stub/mac_stub.c#5 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/security/mac_biba/mac_biba.c#5 (text+ko) ==== @@ -69,6 +69,7 @@ #include #include #include +#include #include ==== //depot/projects/vimage-commit2/src/sys/security/mac_lomac/mac_lomac.c#5 (text+ko) ==== @@ -68,6 +68,7 @@ #include #include #include +#include #include ==== //depot/projects/vimage-commit2/src/sys/security/mac_mls/mac_mls.c#5 (text+ko) ==== @@ -70,6 +70,7 @@ #include #include #include +#include #include ==== //depot/projects/vimage-commit2/src/sys/security/mac_stub/mac_stub.c#5 (text+ko) ==== @@ -67,6 +67,7 @@ #include #include #include +#include #include From owner-p4-projects@FreeBSD.ORG Wed Jun 18 15:04:23 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 02ACB1065672; Wed, 18 Jun 2008 15:04:23 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B8D33106566C for ; Wed, 18 Jun 2008 15:04:22 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A190F8FC17 for ; Wed, 18 Jun 2008 15:04:22 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5IF4MeV062727 for ; Wed, 18 Jun 2008 15:04:22 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5IF4Mlq062725 for perforce@freebsd.org; Wed, 18 Jun 2008 15:04:22 GMT (envelope-from zec@FreeBSD.org) Date: Wed, 18 Jun 2008 15:04:22 GMT Message-Id: <200806181504.m5IF4Mlq062725@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 143698 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Jun 2008 15:04:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=143698 Change 143698 by zec@zec_tpx32 on 2008/06/18 15:04:00 WS cleanup Affected files ... .. //depot/projects/vimage/src/sys/sys/sysctl.h#18 edit Differences ... ==== //depot/projects/vimage/src/sys/sys/sysctl.h#18 (text+ko) ==== @@ -245,16 +245,16 @@ DATA_SET(sysctl_set, sysctl__##parent##_##name) #ifdef VIMAGE -#define SYSCTL_V_OID(subs, mod, parent, nbr, name, kind, a1, a2, \ - handler, fmt, descr) \ - static struct sysctl_v_oid sysctl__##parent##_##name = { \ - &sysctl_##parent##_children, { 0 }, nbr, kind, \ - (void *) offsetof(struct mod, _##a1), a2, #name, \ - handler, fmt, 0, __DESCR(descr), subs, V_MOD_##mod }; \ - DATA_SET(sysctl_set, sysctl__##parent##_##name) +#define SYSCTL_V_OID(subs, mod, parent, nbr, name, kind, a1, a2, \ + handler, fmt, descr) \ + static struct sysctl_v_oid sysctl__##parent##_##name = { \ + &sysctl_##parent##_children, { 0 }, nbr, kind, \ + (void *) offsetof(struct mod, _##a1), a2, #name, \ + handler, fmt, 0, __DESCR(descr), subs, V_MOD_##mod }; \ + DATA_SET(sysctl_set, sysctl__##parent##_##name) #else #define SYSCTL_V_OID(subs, mod, parent, nbr, name, kind, a1, a2, \ - handler, fmt, descr) \ + handler, fmt, descr) \ SYSCTL_OID(parent, nbr, name, kind, &a1, a2, handler, fmt, descr) #endif From owner-p4-projects@FreeBSD.ORG Wed Jun 18 15:17:36 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7C5631065686; Wed, 18 Jun 2008 15:17:36 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 41F10106567D for ; Wed, 18 Jun 2008 15:17:36 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2ADD18FC1C for ; Wed, 18 Jun 2008 15:17:36 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5IFHajb063768 for ; Wed, 18 Jun 2008 15:17:36 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5IFHa2K063766 for perforce@freebsd.org; Wed, 18 Jun 2008 15:17:36 GMT (envelope-from zec@FreeBSD.org) Date: Wed, 18 Jun 2008 15:17:36 GMT Message-Id: <200806181517.m5IFHa2K063766@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 143700 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Jun 2008 15:17:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=143700 Change 143700 by zec@zec_tpx32 on 2008/06/18 15:17:10 Add comments. Affected files ... .. //depot/projects/vimage/src/sys/kern/kern_linker.c#15 edit Differences ... ==== //depot/projects/vimage/src/sys/kern/kern_linker.c#15 (text+ko) ==== @@ -962,9 +962,14 @@ return (error); #ifdef VIMAGE + /* For now permit only the default vimage to kldload modules */ if (!IS_DEFAULT_VIMAGE(TD_TO_VIMAGE(td))) return (EPERM); + /* + * It's possible that kldloaded module will attach a new ifnet, + * so vnet context must be set when this ocurs. + */ CURVNET_SET(TD_TO_VNET(td)); #endif @@ -1297,6 +1302,10 @@ } } #ifdef VIMAGE + /* + * If symbol not found in global namespace, look up + * for it in the current vnet. + */ if (lf == NULL) { CURVNET_SET(TD_TO_VNET(td)); error = vi_symlookup(&lookup, symstr); From owner-p4-projects@FreeBSD.ORG Wed Jun 18 15:34:54 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EE4371065685; Wed, 18 Jun 2008 15:34:53 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B16CE106567A for ; Wed, 18 Jun 2008 15:34:53 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 99D728FC1D for ; Wed, 18 Jun 2008 15:34:53 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5IFYr3Z065245 for ; Wed, 18 Jun 2008 15:34:53 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5IFYr4U065243 for perforce@freebsd.org; Wed, 18 Jun 2008 15:34:53 GMT (envelope-from zec@FreeBSD.org) Date: Wed, 18 Jun 2008 15:34:53 GMT Message-Id: <200806181534.m5IFYr4U065243@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 143701 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Jun 2008 15:34:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=143701 Change 143701 by zec@zec_tpx32 on 2008/06/18 15:34:50 More WS noise redux. Affected files ... .. //depot/projects/vimage/src/sys/kern/kern_synch.c#18 edit .. //depot/projects/vimage/src/sys/kern/sched_4bsd.c#23 edit .. //depot/projects/vimage/src/sys/kern/uipc_socket.c#17 edit .. //depot/projects/vimage/src/sys/kern/uipc_syscalls.c#19 edit Differences ... ==== //depot/projects/vimage/src/sys/kern/kern_synch.c#18 (text+ko) ==== @@ -82,7 +82,6 @@ struct loadavg averunnable = { {0, 0, 0}, FSCALE }; /* load average, of runnable procs */ - /* * Constants for averages over 1, 5, and 15 minutes * when sampling at 5 second intervals. ==== //depot/projects/vimage/src/sys/kern/sched_4bsd.c#23 (text+ko) ==== @@ -243,7 +243,6 @@ sched_tdcnt--; CTR1(KTR_SCHED, "global load: %d", sched_tdcnt); } - /* * Arrange to reschedule if necessary, taking the priorities and * schedulers into account. ==== //depot/projects/vimage/src/sys/kern/uipc_socket.c#17 (text+ko) ==== @@ -2025,7 +2025,8 @@ error = 0; if (sopt->sopt_level != SOL_SOCKET) { if (so->so_proto && so->so_proto->pr_ctloutput) - return ((*so->so_proto->pr_ctloutput) (so, sopt)); + return ((*so->so_proto->pr_ctloutput) + (so, sopt)); error = ENOPROTOOPT; } else { switch (sopt->sopt_name) { ==== //depot/projects/vimage/src/sys/kern/uipc_syscalls.c#19 (text+ko) ==== @@ -1577,7 +1577,6 @@ error = ENOTCONN; goto done; } - *sa = NULL; CURVNET_SET(so->so_vnet); error = (*so->so_proto->pr_usrreqs->pru_peeraddr)(so, sa); From owner-p4-projects@FreeBSD.ORG Wed Jun 18 16:25:45 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 542211065676; Wed, 18 Jun 2008 16:25:45 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 14369106564A for ; Wed, 18 Jun 2008 16:25:45 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F02A58FC12 for ; Wed, 18 Jun 2008 16:25:44 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5IGPiBc070759 for ; Wed, 18 Jun 2008 16:25:44 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5IGPiDs070757 for perforce@freebsd.org; Wed, 18 Jun 2008 16:25:44 GMT (envelope-from zec@FreeBSD.org) Date: Wed, 18 Jun 2008 16:25:44 GMT Message-Id: <200806181625.m5IGPiDs070757@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 143702 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Jun 2008 16:25:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=143702 Change 143702 by zec@zec_tpx32 on 2008/06/18 16:25:26 Unbreak option SCHED_4BSD kernel builds. Affected files ... .. //depot/projects/vimage/src/sys/kern/kern_exit.c#19 edit Differences ... ==== //depot/projects/vimage/src/sys/kern/kern_exit.c#19 (text+ko) ==== @@ -418,7 +418,7 @@ LIST_REMOVE(p, p_list); LIST_INSERT_HEAD(&zombproc, p, p_list); LIST_REMOVE(p, p_hash); -#if defined(VIMAGE) && defined(SCHED_4BSD) +#if defined(NOTYET) && defined(VIMAGE) && defined(SCHED_4BSD) if (P_TO_VPROCG(p) != P_TO_VPROCG(p->p_pptr)) sched_load_reassign(P_TO_VPROCG(p), P_TO_VPROCG(p->p_pptr)); #endif From owner-p4-projects@FreeBSD.ORG Wed Jun 18 16:35:37 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2042F106567D; Wed, 18 Jun 2008 16:35:37 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C03F41065674 for ; Wed, 18 Jun 2008 16:35:36 +0000 (UTC) (envelope-from andenore@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A602C8FC1D for ; Wed, 18 Jun 2008 16:35:36 +0000 (UTC) (envelope-from andenore@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5IGZZul071551 for ; Wed, 18 Jun 2008 16:35:35 GMT (envelope-from andenore@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5IGZY6F071544 for perforce@freebsd.org; Wed, 18 Jun 2008 16:35:34 GMT (envelope-from andenore@FreeBSD.org) Date: Wed, 18 Jun 2008 16:35:34 GMT Message-Id: <200806181635.m5IGZY6F071544@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to andenore@FreeBSD.org using -f From: Anders Nore To: Perforce Change Reviews Cc: Subject: PERFORCE change 143703 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Jun 2008 16:35:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=143703 Change 143703 by andenore@andenore_laptop on 2008/06/18 16:34:46 Lot's of small changes, and syntax changes. Added a small initial man- page for pkg_convert. pkg_info has speed improvements for default behaviour and -W flag. pkg_{add, delete} adds and removes entries from the database cache so you don't have to run pkg_convert everytime you install og deinstall a package. Affected files ... .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/CHANGES#1 add .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/add/main.c#2 edit .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/add/perform.c#2 edit .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/convert/Makefile#2 edit .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/convert/converter.c#3 edit .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/convert/main.c#1 add .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/convert/perform.c#1 add .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/convert/pkg_convert.1#2 edit .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/delete/main.c#2 edit .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/delete/perform.c#2 edit .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/info/Makefile#3 edit .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/info/main.c#4 edit .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/info/perform.c#4 edit .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/info/show.c#3 edit .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/lib/database.c#3 edit .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/lib/deps.c#2 edit .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/lib/exec.c#2 edit .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/lib/global.c#3 edit .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/lib/lib.h#4 edit .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/lib/match.c#4 edit .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/lib/plist.c#3 edit .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/lib/str.c#3 edit .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/version/Makefile#3 edit .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/version/main.c#2 edit .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/version/perform.c#2 edit Differences ... ==== //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/add/main.c#2 (text+ko) ==== @@ -98,237 +98,243 @@ int main(int argc, char **argv) { - int ch, error; - char **start; - char *cp, *packagesite = NULL, *remotepkg = NULL, *ptr; - static char temppackageroot[MAXPATHLEN]; - static char pkgaddpath[MAXPATHLEN]; + int ch, error; + char **start; + char *cp, *packagesite = NULL, *remotepkg = NULL, *ptr; + static char temppackageroot[MAXPATHLEN]; + static char pkgaddpath[MAXPATHLEN]; - if (*argv[0] != '/' && strchr(argv[0], '/') != NULL) - PkgAddCmd = realpath(argv[0], pkgaddpath); - else - PkgAddCmd = argv[0]; + if (*argv[0] != '/' && strchr(argv[0], '/') != NULL) + PkgAddCmd = realpath(argv[0], pkgaddpath); + else + PkgAddCmd = argv[0]; - start = argv; - while ((ch = getopt(argc, argv, Options)) != -1) { - switch(ch) { - case 'v': - Verbose++; - break; + if(cacheExists()) { + printf("add.main(): cacheExists()\n"); + openDatabase(PKG_DBCACHE_FILE); + } - case 'p': - Prefix = optarg; - PrefixRecursive = FALSE; - break; - - case 'P': - Prefix = optarg; - PrefixRecursive = TRUE; - break; - - case 'I': - NoInstall = TRUE; - break; - - case 'R': - NoRecord = TRUE; - break; - - case 'f': - Force = TRUE; - break; - - case 'F': - FailOnAlreadyInstalled = FALSE; - break; - - case 'K': - KeepPackage = TRUE; - break; - - case 'n': - Fake = TRUE; - break; - - case 'r': - Remote = TRUE; - break; - - case 't': - if (strlcpy(FirstPen, optarg, sizeof(FirstPen)) >= sizeof(FirstPen)) - errx(1, "-t Argument too long."); - break; - - case 'S': - AddMode = SLAVE; - break; - - case 'M': - AddMode = MASTER; - break; - - case 'C': - Chroot = optarg; - break; - case 'i': - IgnoreDeps = TRUE; - break; - - case 'h': - case '?': - default: - usage(); - break; + start = argv; + while ((ch = getopt(argc, argv, Options)) != -1) { + switch(ch) { + case 'v': + Verbose++; + break; + + case 'p': + Prefix = optarg; + PrefixRecursive = FALSE; + break; + + case 'P': + Prefix = optarg; + PrefixRecursive = TRUE; + break; + + case 'I': + NoInstall = TRUE; + break; + + case 'R': + NoRecord = TRUE; + break; + + case 'f': + Force = TRUE; + break; + + case 'F': + FailOnAlreadyInstalled = FALSE; + break; + + case 'K': + KeepPackage = TRUE; + break; + + case 'n': + Fake = TRUE; + break; + + case 'r': + Remote = TRUE; + break; + + case 't': + if (strlcpy(FirstPen, optarg, sizeof(FirstPen)) >= sizeof(FirstPen)) + errx(1, "-t Argument too long."); + break; + + case 'S': + AddMode = SLAVE; + break; + + case 'M': + AddMode = MASTER; + break; + + case 'C': + Chroot = optarg; + break; + case 'i': + IgnoreDeps = TRUE; + break; + + case 'h': + case '?': + default: + usage(); + break; + } } - } - argc -= optind; - argv += optind; + argc -= optind; + argv += optind; - if (AddMode != SLAVE) { - pkgs = (char **)malloc((argc+1) * sizeof(char *)); - for (ch = 0; ch <= argc; pkgs[ch++] = NULL) ; + if (AddMode != SLAVE) { + pkgs = (char **)malloc((argc+1) * sizeof(char *)); + for (ch = 0; ch <= argc; pkgs[ch++] = NULL) ; - /* Get all the remaining package names, if any */ - for (ch = 0; *argv; ch++, argv++) { - char temp[MAXPATHLEN]; - if (Remote) { - if ((packagesite = getpackagesite()) == NULL) - errx(1, "package name too long"); - if (strlcpy(temppackageroot, packagesite, - sizeof(temppackageroot)) >= sizeof(temppackageroot)) - errx(1, "package name too long"); - if (strlcat(temppackageroot, *argv, sizeof(temppackageroot)) - >= sizeof(temppackageroot)) - errx(1, "package name too long"); - remotepkg = temppackageroot; - if (!((ptr = strrchr(remotepkg, '.')) && ptr[1] == 't' && - (ptr[2] == 'b' || ptr[2] == 'g') && ptr[3] == 'z' && - !ptr[4])) - if (strlcat(remotepkg, + /* Get all the remaining package names, if any */ + for (ch = 0; *argv; ch++, argv++) { + char temp[MAXPATHLEN]; + if (Remote) { + if ((packagesite = getpackagesite()) == NULL) + errx(1, "package name too long"); + if (strlcpy(temppackageroot, packagesite, + sizeof(temppackageroot)) >= sizeof(temppackageroot)) + errx(1, "package name too long"); + if (strlcat(temppackageroot, *argv, sizeof(temppackageroot)) + >= sizeof(temppackageroot)) + errx(1, "package name too long"); + remotepkg = temppackageroot; + if (!((ptr = strrchr(remotepkg, '.')) && ptr[1] == 't' && + (ptr[2] == 'b' || ptr[2] == 'g') && ptr[3] == 'z' && + !ptr[4])) + if (strlcat(remotepkg, #if defined(__FreeBSD_version) && __FreeBSD_version >= 500039 - ".tbz", + ".tbz", #else - ".tgz", + ".tgz", #endif - sizeof(temppackageroot)) >= sizeof(temppackageroot)) - errx(1, "package name too long"); + sizeof(temppackageroot)) >= sizeof(temppackageroot)) + errx(1, "package name too long"); } - if (!strcmp(*argv, "-")) /* stdin? */ - pkgs[ch] = (char *)"-"; - else if (isURL(*argv)) { /* preserve URLs */ - if (strlcpy(temp, *argv, sizeof(temp)) >= sizeof(temp)) - errx(1, "package name too long"); - pkgs[ch] = strdup(temp); - } - else if ((Remote) && isURL(remotepkg)) { - if (strlcpy(temp, remotepkg, sizeof(temp)) >= sizeof(temp)) - errx(1, "package name too long"); - pkgs[ch] = strdup(temp); - } else { /* expand all pathnames to fullnames */ - if (fexists(*argv)) /* refers to a file directly */ - pkgs[ch] = strdup(realpath(*argv, temp)); - else { /* look for the file in the expected places */ - if (!(cp = fileFindByPath(NULL, *argv))) { - /* let pkg_do() fail later, so that error is reported */ - if (strlcpy(temp, *argv, sizeof(temp)) >= sizeof(temp)) - errx(1, "package name too long"); - pkgs[ch] = strdup(temp); - } else { - if (strlcpy(temp, cp, sizeof(temp)) >= sizeof(temp)) - errx(1, "package name too long"); - pkgs[ch] = strdup(temp); - } + if (!strcmp(*argv, "-")) /* stdin? */ + pkgs[ch] = (char *)"-"; + else if (isURL(*argv)) { /* preserve URLs */ + if (strlcpy(temp, *argv, sizeof(temp)) >= sizeof(temp)) + errx(1, "package name too long"); + pkgs[ch] = strdup(temp); + } + else if ((Remote) && isURL(remotepkg)) { + if (strlcpy(temp, remotepkg, sizeof(temp)) >= sizeof(temp)) + errx(1, "package name too long"); + pkgs[ch] = strdup(temp); + } else { /* expand all pathnames to fullnames */ + if (fexists(*argv)) /* refers to a file directly */ + pkgs[ch] = strdup(realpath(*argv, temp)); + else { /* look for the file in the expected places */ + if (!(cp = fileFindByPath(NULL, *argv))) { + /* let pkg_do() fail later, so that error is reported */ + if (strlcpy(temp, *argv, sizeof(temp)) >= sizeof(temp)) + errx(1, "package name too long"); + pkgs[ch] = strdup(temp); + } else { + if (strlcpy(temp, cp, sizeof(temp)) >= sizeof(temp)) + errx(1, "package name too long"); + pkgs[ch] = strdup(temp); + } + } + } + if (packagesite != NULL) + packagesite[0] = '\0'; } - } - if (packagesite != NULL) - packagesite[0] = '\0'; + } + + /* If no packages, yelp */ + else if (!ch) { + warnx("missing package name(s)"); + usage(); + } + else if (ch > 1 && AddMode == MASTER) { + warnx("only one package name may be specified with master mode"); + usage(); + } + + /* Perform chroot if requested */ + if (Chroot != NULL) { + if (chroot(Chroot)) + errx(1, "chroot to %s failed", Chroot); } - } - /* If no packages, yelp */ - else if (!ch) { - warnx("missing package name(s)"); - usage(); - } - else if (ch > 1 && AddMode == MASTER) { - warnx("only one package name may be specified with master mode"); - usage(); - } - /* Perform chroot if requested */ - if (Chroot != NULL) { - if (chroot(Chroot)) - errx(1, "chroot to %s failed", Chroot); - } - /* Make sure the sub-execs we invoke get found */ - setenv("PATH", - "/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/X11R6/bin", - 1); + /* Make sure the sub-execs we invoke get found */ + setenv("PATH", + "/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/X11R6/bin", + 1); - /* Set a reasonable umask */ - umask(022); + /* Set a reasonable umask */ + umask(022); - if ((error = pkg_perform(pkgs)) != 0) { - if (Verbose) - warnx("%d package addition(s) failed", error); - return error; - } - else - return 0; + if ((error = pkg_perform(pkgs)) != 0) { + if (Verbose) + warnx("%d package addition(s) failed", error); + return error; + } + else + return 0; } static char * getpackagesite(void) { - int reldate, i; - static char sitepath[MAXPATHLEN]; - struct utsname u; + int reldate, i; + static char sitepath[MAXPATHLEN]; + struct utsname u; - if (getenv("PACKAGESITE")) { - if (strlcpy(sitepath, getenv("PACKAGESITE"), sizeof(sitepath)) - >= sizeof(sitepath)) - return NULL; - return sitepath; - } + if (getenv("PACKAGESITE")) { + if (strlcpy(sitepath, getenv("PACKAGESITE"), sizeof(sitepath)) + >= sizeof(sitepath)) + return NULL; + return sitepath; + } - if (getenv("PACKAGEROOT")) { - if (strlcpy(sitepath, getenv("PACKAGEROOT"), sizeof(sitepath)) - >= sizeof(sitepath)) - return NULL; - } else { - if (strlcat(sitepath, "ftp://ftp.freebsd.org", sizeof(sitepath)) - >= sizeof(sitepath)) - return NULL; - } + if (getenv("PACKAGEROOT")) { + if (strlcpy(sitepath, getenv("PACKAGEROOT"), sizeof(sitepath)) + >= sizeof(sitepath)) + return NULL; + } else { + if (strlcat(sitepath, "ftp://ftp.freebsd.org", sizeof(sitepath)) + >= sizeof(sitepath)) + return NULL; + } - if (strlcat(sitepath, "/pub/FreeBSD/ports/", sizeof(sitepath)) - >= sizeof(sitepath)) - return NULL; + if (strlcat(sitepath, "/pub/FreeBSD/ports/", sizeof(sitepath)) + >= sizeof(sitepath)) + return NULL; - uname(&u); - if (strlcat(sitepath, u.machine, sizeof(sitepath)) >= sizeof(sitepath)) - return NULL; + uname(&u); + if (strlcat(sitepath, u.machine, sizeof(sitepath)) >= sizeof(sitepath)) + return NULL; - reldate = getosreldate(); - for(i = 0; releases[i].directory != NULL; i++) { - if (reldate >= releases[i].lowver && reldate <= releases[i].hiver) { - if (strlcat(sitepath, releases[i].directory, sizeof(sitepath)) - >= sizeof(sitepath)) - return NULL; - break; + reldate = getosreldate(); + for(i = 0; releases[i].directory != NULL; i++) { + if (reldate >= releases[i].lowver && reldate <= releases[i].hiver) { + if (strlcat(sitepath, releases[i].directory, sizeof(sitepath)) + >= sizeof(sitepath)) + return NULL; + break; + } } - } - if (strlcat(sitepath, "/Latest/", sizeof(sitepath)) >= sizeof(sitepath)) - return NULL; + if (strlcat(sitepath, "/Latest/", sizeof(sitepath)) >= sizeof(sitepath)) + return NULL; - return sitepath; - + return sitepath; } static void usage() { - fprintf(stderr, "%s\n%s\n", + fprintf(stderr, "%s\n%s\n", "usage: pkg_add [-viInfFrRMSK] [-t template] [-p prefix] [-P prefix] [-C chrootdir]", " pkg-name [pkg-name ...]"); - exit(1); + exit(1); } ==== //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/add/perform.c#2 (text+ko) ==== @@ -38,18 +38,18 @@ int pkg_perform(char **pkgs) { - int i, err_cnt = 0; + int i, err_cnt = 0; - signal(SIGINT, cleanup); - signal(SIGHUP, cleanup); + signal(SIGINT, cleanup); + signal(SIGHUP, cleanup); - if (AddMode == SLAVE) - err_cnt = pkg_do(NULL); - else { - for (i = 0; pkgs[i]; i++) - err_cnt += pkg_do(pkgs[i]); - } - return err_cnt; + if (AddMode == SLAVE) + err_cnt = pkg_do(NULL); + else { + for (i = 0; pkgs[i]; i++) + err_cnt += pkg_do(pkgs[i]); + } + return err_cnt; } static Package Plist; @@ -63,590 +63,678 @@ static int pkg_do(char *pkg) { - char pkg_fullname[FILENAME_MAX]; - char playpen[FILENAME_MAX]; - char extract_contents[FILENAME_MAX]; - char *where_to, *extract; - FILE *cfile; - int code; - PackingList p; - struct stat sb; - int inPlace, conflictsfound, errcode; - /* support for separate pre/post install scripts */ - int new_m = 0; - char pre_script[FILENAME_MAX] = INSTALL_FNAME; - char post_script[FILENAME_MAX]; - char pre_arg[FILENAME_MAX], post_arg[FILENAME_MAX]; - char *conflict[2]; - char **matched; + char pkg_fullname[FILENAME_MAX]; + char playpen[FILENAME_MAX]; + char extract_contents[FILENAME_MAX]; + char *where_to, *extract; + FILE *cfile; + int code; + PackingList p; + struct stat sb; + int inPlace, conflictsfound, errcode; + /* support for separate pre/post install scripts */ + int new_m = 0; + char pre_script[FILENAME_MAX] = INSTALL_FNAME; + char post_script[FILENAME_MAX]; + char pre_arg[FILENAME_MAX], post_arg[FILENAME_MAX]; + char *conflict[2]; + char **matched; - conflictsfound = 0; - code = 0; - zapLogDir = 0; - LogDir[0] = '\0'; - strcpy(playpen, FirstPen); - inPlace = 0; + conflictsfound = 0; + code = 0; + zapLogDir = 0; + LogDir[0] = '\0'; + strcpy(playpen, FirstPen); + inPlace = 0; - /* Are we coming in for a second pass, everything already extracted? */ - if (!pkg) { - fgets(playpen, FILENAME_MAX, stdin); - playpen[strlen(playpen) - 1] = '\0'; /* pesky newline! */ - if (chdir(playpen) == FAIL) { - warnx("pkg_add in SLAVE mode can't chdir to %s", playpen); - return 1; + /* Are we coming in for a second pass, everything already extracted? */ + if (!pkg) { + fgets(playpen, FILENAME_MAX, stdin); + playpen[strlen(playpen) - 1] = '\0'; /* pesky newline! */ + if (chdir(playpen) == FAIL) { + warnx("pkg_add in SLAVE mode can't chdir to %s", playpen); + return 1; + } + read_plist(&Plist, stdin); + where_to = playpen; } - read_plist(&Plist, stdin); - where_to = playpen; - } - /* Nope - do it now */ - else { - /* Is it an ftp://foo.bar.baz/file.t[bg]z specification? */ - if (isURL(pkg)) { - if (!(Home = fileGetURL(NULL, pkg, KeepPackage))) { - warnx("unable to fetch '%s' by URL", pkg); - return 1; - } - where_to = Home; - strcpy(pkg_fullname, pkg); - cfile = fopen(CONTENTS_FNAME, "r"); - if (!cfile) { - warnx( - "unable to open table of contents file '%s' - not a package?", - CONTENTS_FNAME); - goto bomb; - } - read_plist(&Plist, cfile); - fclose(cfile); - } + /* Nope - do it now */ else { - strcpy(pkg_fullname, pkg); /* - * Copy for sanity's sake, - * could remove pkg_fullname - */ - if (strcmp(pkg, "-")) { - if (stat(pkg_fullname, &sb) == FAIL) { - warnx("can't stat package file '%s'", pkg_fullname); - goto bomb; + /* Is it an ftp://foo.bar.baz/file.t[bg]z specification? */ + if (isURL(pkg)) { + if (!(Home = fileGetURL(NULL, pkg, KeepPackage))) { + warnx("unable to fetch '%s' by URL", pkg); + return 1; + } + where_to = Home; + strcpy(pkg_fullname, pkg); + cfile = fopen(CONTENTS_FNAME, "r"); + if (!cfile) { + warnx( + "unable to open table of contents file '%s' - not a package?", + CONTENTS_FNAME); + + goto bomb; + } + read_plist(&Plist, cfile); + fclose(cfile); } - sprintf(extract_contents, "--fast-read %s", CONTENTS_FNAME); - extract = extract_contents; - } - else { - extract = NULL; - sb.st_size = 100000; /* Make up a plausible average size */ - } - Home = make_playpen(playpen, sb.st_size * 4); - if (!Home) - errx(1, "unable to make playpen for %lld bytes", (long long)sb.st_size * 4); - where_to = Home; - /* Since we can call ourselves recursively, keep notes on where we came from */ - if (!getenv("_TOP")) - setenv("_TOP", Home, 1); - if (unpack(pkg_fullname, extract)) { - warnx( - "unable to extract table of contents file from '%s' - not a package?", + else { + strcpy(pkg_fullname, pkg); /* + * Copy for sanity's sake, + * could remove pkg_fullname + */ + if (strcmp(pkg, "-")) { + if (stat(pkg_fullname, &sb) == FAIL) { + warnx("can't stat package file '%s'", pkg_fullname); + goto bomb; + } + sprintf(extract_contents, "--fast-read %s", CONTENTS_FNAME); + extract = extract_contents; + } + else { + extract = NULL; + sb.st_size = 100000; /* Make up a plausible average size */ + } + + Home = make_playpen(playpen, sb.st_size * 4); + if (!Home) + errx(1, "unable to make playpen for %lld bytes", (long long)sb.st_size * 4); + + where_to = Home; + /* Since we can call ourselves recursively, keep notes on where we came from */ + if (!getenv("_TOP")) + setenv("_TOP", Home, 1); + + if (unpack(pkg_fullname, extract)) { + warnx( + "unable to extract table of contents file from '%s' - not a package?", pkg_fullname); - goto bomb; - } - cfile = fopen(CONTENTS_FNAME, "r"); - if (!cfile) { - warnx( - "unable to open table of contents file '%s' - not a package?", - CONTENTS_FNAME); - goto bomb; - } - read_plist(&Plist, cfile); - fclose(cfile); + goto bomb; + } + + cfile = fopen(CONTENTS_FNAME, "r"); + if (!cfile) { + warnx( + "unable to open table of contents file '%s' - not a package?", + CONTENTS_FNAME); + goto bomb; + } + read_plist(&Plist, cfile); + fclose(cfile); - /* Extract directly rather than moving? Oh goodie! */ - if (find_plist_option(&Plist, "extract-in-place")) { - if (Verbose) - printf("Doing in-place extraction for %s\n", pkg_fullname); - p = find_plist(&Plist, PLIST_CWD); - if (p) { - if (!isdir(p->name) && !Fake) { - if (Verbose) - printf("Desired prefix of %s does not exist, creating..\n", p->name); - vsystem("/bin/mkdir -p %s", p->name); - if (chdir(p->name) == -1) { - warn("unable to change directory to '%s'", p->name); - goto bomb; + /* Extract directly rather than moving? Oh goodie! */ + if (find_plist_option(&Plist, "extract-in-place")) { + if (Verbose) + printf("Doing in-place extraction for %s\n", pkg_fullname); + + p = find_plist(&Plist, PLIST_CWD); + if (p) { + if (!isdir(p->name) && !Fake) { + if (Verbose) + printf("Desired prefix of %s does not exist, creating..\n", p->name); + vsystem("/bin/mkdir -p %s", p->name); + if (chdir(p->name) == -1) { + warn("unable to change directory to '%s'", p->name); + goto bomb; + } + } + where_to = p->name; + inPlace = 1; + } + else { + warnx( + "no prefix specified in '%s' - this is a bad package!", + pkg_fullname); + goto bomb; + } } - } - where_to = p->name; - inPlace = 1; - } - else { - warnx( - "no prefix specified in '%s' - this is a bad package!", - pkg_fullname); - goto bomb; - } - } - /* - * Apply a crude heuristic to see how much space the package will - * take up once it's unpacked. I've noticed that most packages - * compress an average of 75%, so multiply by 4 for good measure. - */ + /* + * Apply a crude heuristic to see how much space the package will + * take up once it's unpacked. I've noticed that most packages + * compress an average of 75%, so multiply by 4 for good measure. + */ - if (!extract && !inPlace && min_free(playpen) < sb.st_size * 4) { - warnx("projected size of %lld exceeds available free space.\n" -"Please set your PKG_TMPDIR variable to point to a location with more\n" - "free space and try again", (long long)sb.st_size * 4); - warnx("not extracting %s\ninto %s, sorry!", - pkg_fullname, where_to); - goto bomb; + if (!extract && !inPlace && min_free(playpen) < sb.st_size * 4) { + warnx("projected size of %lld exceeds available free space.\n" + "Please set your PKG_TMPDIR variable to point to a location with more\n" + "free space and try again", (long long)sb.st_size * 4); + warnx("not extracting %s\ninto %s, sorry!", + pkg_fullname, where_to); + goto bomb; } /* If this is a direct extract and we didn't want it, stop now */ - if (inPlace && Fake) - goto success; + if (inPlace && Fake) + goto success; - /* Finally unpack the whole mess. If extract is null we - already + did so so don't bother doing it again. */ - if (extract && unpack(pkg_fullname, NULL)) { - warnx("unable to extract '%s'!", pkg_fullname); - goto bomb; - } + /* Finally unpack the whole mess. If extract is null we + already + did so so don't bother doing it again. */ + if (extract && unpack(pkg_fullname, NULL)) { + warnx("unable to extract '%s'!", pkg_fullname); + goto bomb; + } } - /* Check for sanity and dependencies */ - if (sanity_check(pkg)) - goto bomb; - - /* If we're running in MASTER mode, just output the plist and return */ - if (AddMode == MASTER) { - printf("%s\n", where_playpen()); - write_plist(&Plist, stdout); - return 0; + /* Check for sanity and dependencies */ + if (sanity_check(pkg)) + goto bomb; + + /* If we're running in MASTER mode, just output the plist and return */ + if (AddMode == MASTER) { + printf("%s\n", where_playpen()); + write_plist(&Plist, stdout); + return 0; + } } - } /* * If we have a prefix, delete the first one we see and add this * one in place of it. */ - if (Prefix) { - delete_plist(&Plist, FALSE, PLIST_CWD, NULL); - add_plist_top(&Plist, PLIST_CWD, Prefix); - } + if (Prefix) { + delete_plist(&Plist, FALSE, PLIST_CWD, NULL); + add_plist_top(&Plist, PLIST_CWD, Prefix); + } - setenv(PKG_PREFIX_VNAME, (p = find_plist(&Plist, PLIST_CWD)) ? p->name : ".", 1); - /* Protect against old packages with bogus @name and origin fields */ - if (Plist.name == NULL) - Plist.name = "anonymous"; - if (Plist.origin == NULL) - Plist.origin = "anonymous/anonymous"; + setenv(PKG_PREFIX_VNAME, (p = find_plist(&Plist, PLIST_CWD)) ? p->name : ".", 1); + /* Protect against old packages with bogus @name and origin fields */ + if (Plist.name == NULL) + Plist.name = "anonymous"; + + if (Plist.origin == NULL) + Plist.origin = "anonymous/anonymous"; - /* - * See if we're already registered either with the same name (the same - * version) or some other version with the same origin. - */ - if ((isinstalledpkg(Plist.name) > 0 || + /* + * See if we're already registered either with the same name (the same + * version) or some other version with the same origin. + */ + if ((isinstalledpkg(Plist.name) > 0 || matchbyorigin(Plist.origin, NULL) != NULL) && !Force) { - warnx("package '%s' or its older version already installed%s", - Plist.name, FailOnAlreadyInstalled ? "" : " (ignored)"); - code = FailOnAlreadyInstalled != FALSE; - goto success; /* close enough for government work */ + warnx("package '%s' or its older version already installed%s", + Plist.name, FailOnAlreadyInstalled ? "" : " (ignored)"); + code = FailOnAlreadyInstalled != FALSE; + goto success; /* close enough for government work */ } - /* Now check the packing list for conflicts */ - if (!IgnoreDeps){ - for (p = Plist.head; p != NULL; p = p->next) { - if (p->type == PLIST_CONFLICTS) { - int i; - conflict[0] = strdup(p->name); - conflict[1] = NULL; - matched = matchinstalled(MATCH_GLOB, conflict, &errcode); - free(conflict[0]); - if (errcode == 0 && matched != NULL) - for (i = 0; matched[i] != NULL; i++) - if (isinstalledpkg(matched[i]) > 0) { - warnx("package '%s' conflicts with %s", Plist.name, - matched[i]); - conflictsfound = 1; - } + /* Now check the packing list for conflicts */ + if (!IgnoreDeps) { + for (p = Plist.head; p != NULL; p = p->next) { + if (p->type == PLIST_CONFLICTS) { + int i; + conflict[0] = strdup(p->name); + conflict[1] = NULL; + matched = matchinstalled(MATCH_GLOB, conflict, &errcode); + free(conflict[0]); + if (errcode == 0 && matched != NULL) + for (i = 0; matched[i] != NULL; i++) + if (isinstalledpkg(matched[i]) > 0) { + warnx("package '%s' conflicts with %s", Plist.name, + matched[i]); + conflictsfound = 1; + } + + continue; + } + } - continue; + if(conflictsfound) { + if(!Force) { + warnx("please use pkg_delete first to remove conflicting package(s) or -f to force installation"); + code = 1; + goto bomb; + } else + warnx("-f specified; proceeding anyway"); } - } - if(conflictsfound) { - if(!Force) { - warnx("please use pkg_delete first to remove conflicting package(s) or -f to force installation"); - code = 1; - goto bomb; - } else - warnx("-f specified; proceeding anyway"); - } - /* Now check the packing list for dependencies */ - for (p = Plist.head; p ; p = p->next) { - char *deporigin; + /* Now check the packing list for dependencies */ + for (p = Plist.head; p ; p = p->next) { + char *deporigin; - if (p->type != PLIST_PKGDEP) - continue; - deporigin = (p->next->type == PLIST_DEPORIGIN) ? p->next->name : NULL; - if (Verbose) { - printf("Package '%s' depends on '%s'", Plist.name, p->name); - if (deporigin != NULL) - printf(" with '%s' origin", deporigin); - printf(".\n"); - } - if (isinstalledpkg(p->name) <= 0 && - !(deporigin != NULL && matchbyorigin(deporigin, NULL) != NULL)) { - char path[FILENAME_MAX], *cp = NULL; + if (p->type != PLIST_PKGDEP) + continue; + + deporigin = (p->next->type == PLIST_DEPORIGIN) ? p->next->name : NULL; + if (Verbose) { + printf("Package '%s' depends on '%s'", Plist.name, p->name); + if (deporigin != NULL) + printf(" with '%s' origin", deporigin); + printf(".\n"); + } + + if (isinstalledpkg(p->name) <= 0 && + !(deporigin != NULL && matchbyorigin(deporigin, NULL) != NULL)) { + char path[FILENAME_MAX], *cp = NULL; - if (!Fake) { - char prefixArg[2 + MAXPATHLEN]; /* "-P" + Prefix */ - if (PrefixRecursive) { - strlcpy(prefixArg, "-P", sizeof(prefixArg)); - strlcat(prefixArg, Prefix, sizeof(prefixArg)); - } - if (!isURL(pkg) && !getenv("PKG_ADD_BASE")) { - const char *ext; + if (!Fake) { + char prefixArg[2 + MAXPATHLEN]; /* "-P" + Prefix */ + if (PrefixRecursive) { + strlcpy(prefixArg, "-P", sizeof(prefixArg)); + strlcat(prefixArg, Prefix, sizeof(prefixArg)); + } + + if (!isURL(pkg) && !getenv("PKG_ADD_BASE")) { + const char *ext; - ext = strrchr(pkg_fullname, '.'); - if (ext == NULL) + ext = strrchr(pkg_fullname, '.'); + if (ext == NULL) #if defined(__FreeBSD_version) && __FreeBSD_version >= 500039 - ext = ".tbz"; + ext = ".tbz"; #else - ext = ".tgz"; + ext = ".tgz"; #endif - snprintf(path, FILENAME_MAX, "%s/%s%s", getenv("_TOP"), p->name, ext); - if (fexists(path)) - cp = path; - else - cp = fileFindByPath(pkg, p->name); - if (cp) { >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jun 18 16:37:59 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CD4B61065677; Wed, 18 Jun 2008 16:37:58 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 92FD2106566B for ; Wed, 18 Jun 2008 16:37:58 +0000 (UTC) (envelope-from andenore@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6120E8FC20 for ; Wed, 18 Jun 2008 16:37:58 +0000 (UTC) (envelope-from andenore@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5IGbwdx071707 for ; Wed, 18 Jun 2008 16:37:58 GMT (envelope-from andenore@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5IGbwsk071705 for perforce@freebsd.org; Wed, 18 Jun 2008 16:37:58 GMT (envelope-from andenore@FreeBSD.org) Date: Wed, 18 Jun 2008 16:37:58 GMT Message-Id: <200806181637.m5IGbwsk071705@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to andenore@FreeBSD.org using -f From: Anders Nore To: Perforce Change Reviews Cc: Subject: PERFORCE change 143704 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Jun 2008 16:37:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=143704 Change 143704 by andenore@andenore_laptop on 2008/06/18 16:36:57 Removed converter.c to make the pkg_convert code style like the other programs in pkg_install. Affected files ... .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/convert/converter.c#4 delete Differences ... From owner-p4-projects@FreeBSD.ORG Wed Jun 18 16:50:11 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1FAC21065685; Wed, 18 Jun 2008 16:50:11 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D55301065682 for ; Wed, 18 Jun 2008 16:50:10 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BC8338FC30 for ; Wed, 18 Jun 2008 16:50:10 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5IGoAb0081914 for ; Wed, 18 Jun 2008 16:50:10 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5IGoALj081912 for perforce@freebsd.org; Wed, 18 Jun 2008 16:50:10 GMT (envelope-from zec@FreeBSD.org) Date: Wed, 18 Jun 2008 16:50:10 GMT Message-Id: <200806181650.m5IGoALj081912@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 143705 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Jun 2008 16:50:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=143705 Change 143705 by zec@zec_tpx32 on 2008/06/18 16:49:40 Small but futile steps towards LINT compile. Affected files ... .. //depot/projects/vimage/src/sys/net/if.c#26 edit .. //depot/projects/vimage/src/sys/netgraph/ng_base.c#29 edit .. //depot/projects/vimage/src/sys/netinet/ip_carp.c#8 edit Differences ... ==== //depot/projects/vimage/src/sys/net/if.c#26 (text+ko) ==== @@ -317,6 +317,7 @@ static void if_init(void *dummy __unused) { + #ifdef VIMAGE vnet_mod_register(&vnet_net_modinfo); #else @@ -2601,6 +2602,7 @@ void if_delmulti_ifma(struct ifmultiaddr *ifma) { + INIT_VNET_NET(curvnet); struct ifnet *ifp; int lastref; @@ -2612,7 +2614,7 @@ struct ifnet *oifp; IFNET_RLOCK(); - TAILQ_FOREACH(oifp, &ifnet, if_link) + TAILQ_FOREACH(oifp, &V_ifnet, if_link) if (ifp == oifp) break; if (ifp != oifp) { ==== //depot/projects/vimage/src/sys/netgraph/ng_base.c#29 (text+ko) ==== @@ -131,10 +131,10 @@ }, 1, /* refs */ #ifdef NETGRAPH_DEBUG - ND_MAGIC, - __FILE__, - __LINE__, - {NULL} + .nd_magic = ND_MAGIC, + .lastfile = __FILE__, + .lastline = __LINE__, + .nd_all = {NULL} #endif /* NETGRAPH_DEBUG */ }; ==== //depot/projects/vimage/src/sys/netinet/ip_carp.c#8 (text+ko) ==== @@ -31,6 +31,7 @@ #include "opt_bpf.h" #include "opt_inet.h" #include "opt_inet6.h" +#include "opt_vimage.h" #include #include @@ -49,6 +50,7 @@ #include #include #include +#include #include #include @@ -66,6 +68,7 @@ #include #ifdef INET +#include #include #include #include @@ -76,6 +79,7 @@ #endif #ifdef INET6 +#include #include #include #include @@ -913,6 +917,7 @@ ch.carp_cksum = 0; #ifdef INET + INIT_VNET_INET(curvnet); if (sc->sc_ia) { struct ip *ip; @@ -1451,6 +1456,7 @@ static int carp_set_addr(struct carp_softc *sc, struct sockaddr_in *sin) { + INIT_VNET_INET(curvnet); struct ifnet *ifp; struct carp_if *cif; struct in_ifaddr *ia, *ia_if; @@ -1470,7 +1476,7 @@ /* we have to do it by hands to check we won't match on us */ ia_if = NULL; own = 0; - TAILQ_FOREACH(ia, &in_ifaddrhead, ia_link) { + TAILQ_FOREACH(ia, &V_in_ifaddrhead, ia_link) { /* and, yeah, we need a multicast-capable iface too */ if (ia->ia_ifp != SC2IFP(sc) && (ia->ia_ifp->if_flags & IFF_MULTICAST) && @@ -1612,6 +1618,7 @@ static int carp_set_addr6(struct carp_softc *sc, struct sockaddr_in6 *sin6) { + INIT_VNET_INET6(curvnet); struct ifnet *ifp; struct carp_if *cif; struct in6_ifaddr *ia, *ia_if; @@ -1631,7 +1638,7 @@ /* we have to do it by hands to check we won't match on us */ ia_if = NULL; own = 0; - for (ia = in6_ifaddr; ia; ia = ia->ia_next) { + for (ia = V_in6_ifaddr; ia; ia = ia->ia_next) { int i; for (i = 0; i < 4; i++) { From owner-p4-projects@FreeBSD.ORG Wed Jun 18 19:20:05 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 968B81065671; Wed, 18 Jun 2008 19:20:05 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 57807106566B for ; Wed, 18 Jun 2008 19:20:05 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 24FD88FC14 for ; Wed, 18 Jun 2008 19:20:05 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5IJK47w097997 for ; Wed, 18 Jun 2008 19:20:04 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5IJK44r097995 for perforce@freebsd.org; Wed, 18 Jun 2008 19:20:04 GMT (envelope-from zec@FreeBSD.org) Date: Wed, 18 Jun 2008 19:20:04 GMT Message-Id: <200806181920.m5IJK44r097995@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 143709 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Jun 2008 19:20:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=143709 Change 143709 by zec@zec_tpx32 on 2008/06/18 19:19:15 There's no reason for not building the ZFS module. Affected files ... .. //depot/projects/vimage/src/sys/modules/Makefile#21 edit Differences ... ==== //depot/projects/vimage/src/sys/modules/Makefile#21 (text+ko) ==== @@ -442,6 +442,9 @@ _tmpfs= tmpfs _wi= wi _xe= xe +.if ${MK_ZFS} != "no" || defined(ALL_MODULES) +_zfs= zfs +.endif .if ${MACHINE} == "i386" _aac= aac _acpi= acpi From owner-p4-projects@FreeBSD.ORG Wed Jun 18 19:42:28 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2889E1065679; Wed, 18 Jun 2008 19:42:28 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DE9AB1065676 for ; Wed, 18 Jun 2008 19:42:27 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C55328FC2B for ; Wed, 18 Jun 2008 19:42:27 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5IJgRJW099881 for ; Wed, 18 Jun 2008 19:42:27 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5IJgR1O099879 for perforce@freebsd.org; Wed, 18 Jun 2008 19:42:27 GMT (envelope-from zec@FreeBSD.org) Date: Wed, 18 Jun 2008 19:42:27 GMT Message-Id: <200806181942.m5IJgR1O099879@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 143710 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Jun 2008 19:42:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=143710 Change 143710 by zec@zec_tpx32 on 2008/06/18 19:41:39 Unbreak nooptions DIAGNOSTIC builds, and more WS cleanup. Affected files ... .. //depot/projects/vimage/src/sys/net/if.c#27 edit .. //depot/projects/vimage/src/sys/net/if_clone.c#7 edit Differences ... ==== //depot/projects/vimage/src/sys/net/if.c#27 (text+ko) ==== @@ -2602,7 +2602,9 @@ void if_delmulti_ifma(struct ifmultiaddr *ifma) { +#ifdef DIAGNOSTIC INIT_VNET_NET(curvnet); +#endif struct ifnet *ifp; int lastref; @@ -2883,6 +2885,7 @@ if_register_com_alloc(u_char type, if_com_alloc_t *a, if_com_free_t *f) { + KASSERT(if_com_alloc[type] == NULL, ("if_register_com_alloc: %d already registered", type)); KASSERT(if_com_free[type] == NULL, @@ -2895,6 +2898,7 @@ void if_deregister_com_alloc(u_char type) { + KASSERT(if_com_alloc[type] != NULL, ("if_deregister_com_alloc: %d not registered", type)); KASSERT(if_com_free[type] != NULL, ==== //depot/projects/vimage/src/sys/net/if_clone.c#7 (text+ko) ==== @@ -470,6 +470,7 @@ #ifndef VIMAGE int bytoff, bitoff; + /* * Compute offset in the bitmap and deallocate the unit. */ From owner-p4-projects@FreeBSD.ORG Wed Jun 18 21:26:04 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3C96A1065677; Wed, 18 Jun 2008 21:26:04 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D9EB11065673 for ; Wed, 18 Jun 2008 21:26:03 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C27A58FC0A for ; Wed, 18 Jun 2008 21:26:03 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5ILQ3lm021932 for ; Wed, 18 Jun 2008 21:26:03 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5ILQ3kk021930 for perforce@freebsd.org; Wed, 18 Jun 2008 21:26:03 GMT (envelope-from julian@freebsd.org) Date: Wed, 18 Jun 2008 21:26:03 GMT Message-Id: <200806182126.m5ILQ3kk021930@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 143716 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Jun 2008 21:26:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=143716 Change 143716 by julian@julian_trafmon1 on 2008/06/18 21:25:59 IFC@143713 Affected files ... .. //depot/projects/vimage-commit2/src/sys/boot/i386/libi386/time.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/compat/ndis/subr_ntoskrnl.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/ddb/db_ps.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/smc/if_smc.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/fs/devfs/devfs_devs.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/fs/devfs/devfs_int.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/fs/devfs/devfs_vnops.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/fs/tmpfs/tmpfs_subr.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/geom/part/g_part.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/geom/part/g_part.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/geom/part/g_part_if.m#2 integrate .. //depot/projects/vimage-commit2/src/sys/geom/part/g_part_mbr.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_conf.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_dtrace.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_pcb.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_pcb.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_usrreq.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_var.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_syncache.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/pci/if_rl.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/pci/if_rlreg.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/pci/nfsmb.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/sys/conf.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/sys/param.h#3 integrate Differences ... ==== //depot/projects/vimage-commit2/src/sys/boot/i386/libi386/time.c#2 (text+ko) ==== @@ -25,25 +25,23 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/time.c,v 1.5 2003/08/25 23:28:31 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/time.c,v 1.6 2008/06/16 17:04:04 olli Exp $"); #include #include #include "bootstrap.h" #include "libi386.h" +static int bios_seconds(void); + /* - * Return the time in seconds since the beginning of the day. + * Return the BIOS time-of-day value. * - * If we pass midnight, don't wrap back to 0. - * * XXX uses undocumented BCD support from libstand. */ - -time_t -time(time_t *t) +static int +bios_seconds(void) { - static time_t lasttime, now; int hr, minute, sec; v86.ctl = 0; @@ -55,7 +53,33 @@ minute = bcd2bin(v86.ecx & 0xff); /* minute in %cl */ sec = bcd2bin((v86.edx & 0xff00) >> 8); /* second in %dh */ - now = hr * 3600 + minute * 60 + sec; + return (hr * 3600 + minute * 60 + sec); +} + +/* + * Return the time in seconds since the beginning of the day. + * + * Some BIOSes (notably qemu) don't correctly read the RTC + * registers in an atomic way, sometimes returning bogus values. + * Therefore we "debounce" the reading by accepting it only when + * we got two identical values in succession. + * + * If we pass midnight, don't wrap back to 0. + */ +time_t +time(time_t *t) +{ + static time_t lasttime; + time_t now, check; + int try; + + try = 0; + check = bios_seconds(); + do { + now = check; + check = bios_seconds(); + } while (now != check && ++try < 1000); + if (now < lasttime) now += 24 * 3600; lasttime = now; ==== //depot/projects/vimage-commit2/src/sys/compat/ndis/subr_ntoskrnl.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.95 2008/05/30 06:31:55 weongyo Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.96 2008/06/15 13:37:29 cokane Exp $"); #include #include @@ -225,6 +225,8 @@ static ndis_status PsCreateSystemThread(ndis_handle *, uint32_t, void *, ndis_handle, void *, void *, void *); static ndis_status PsTerminateSystemThread(ndis_status); +static ndis_status IoGetDeviceObjectPointer(unicode_string *, + uint32_t, void *, device_object *); static ndis_status IoGetDeviceProperty(device_object *, uint32_t, uint32_t, void *, uint32_t *); static void KeInitializeMutex(kmutant *, uint32_t); @@ -3235,6 +3237,16 @@ } static ndis_status +IoGetDeviceObjectPointer(name, reqaccess, fileobj, devobj) + unicode_string *name; + uint32_t reqaccess; + void *fileobj; + device_object *devobj; +{ + return(STATUS_SUCCESS); +} + +static ndis_status IoGetDeviceProperty(devobj, regprop, buflen, prop, reslen) device_object *devobj; uint32_t regprop; @@ -4391,6 +4403,7 @@ IMPORT_SFUNC(MmUnmapIoSpace, 2), IMPORT_SFUNC(KeInitializeSpinLock, 1), IMPORT_SFUNC(IoIsWdmVersionAvailable, 2), + IMPORT_SFUNC(IoGetDeviceObjectPointer, 4), IMPORT_SFUNC(IoGetDeviceProperty, 5), IMPORT_SFUNC(IoAllocateWorkItem, 1), IMPORT_SFUNC(IoFreeWorkItem, 1), ==== //depot/projects/vimage-commit2/src/sys/ddb/db_ps.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ddb/db_ps.c,v 1.68 2008/03/25 20:36:32 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/ddb/db_ps.c,v 1.69 2008/06/18 20:42:01 attilio Exp $"); #include #include @@ -292,6 +292,7 @@ DB_SHOW_COMMAND(thread, db_show_thread) { struct thread *td; + struct lock_object *lock; boolean_t comma; /* Determine which thread to examine. */ @@ -299,6 +300,7 @@ td = db_lookup_thread(addr, FALSE); else td = kdb_thread; + lock = (struct lock_object *)td->td_lock; db_printf("Thread %d at %p:\n", td->td_tid, td); db_printf(" proc (pid %d): %p\n", td->td_proc->p_pid, td->td_proc); @@ -365,6 +367,7 @@ db_printf(" wmesg: %s wchan: %p\n", td->td_wmesg, td->td_wchan); db_printf(" priority: %d\n", td->td_priority); + db_printf(" container lock: %s (%p)\n", lock->lo_name, lock); } DB_SHOW_COMMAND(proc, db_show_proc) ==== //depot/projects/vimage-commit2/src/sys/dev/smc/if_smc.c#5 (text+ko) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/smc/if_smc.c,v 1.5 2008/06/13 00:48:09 benno Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/smc/if_smc.c,v 1.6 2008/06/17 05:48:42 benno Exp $"); /* * Driver for SMSC LAN91C111, may work for older variants. @@ -394,6 +394,13 @@ smc_stop(sc); SMC_UNLOCK(sc); + if (sc->smc_ifp != NULL) { + ether_ifdetach(sc->smc_ifp); + } + + callout_drain(&sc->smc_watchdog); + callout_drain(&sc->smc_mii_tick_ch); + #ifdef DEVICE_POLLING if (sc->smc_ifp->if_capenable & IFCAP_POLLING) ether_poll_deregister(sc->smc_ifp); @@ -409,10 +416,8 @@ taskqueue_free(sc->smc_tq); sc->smc_tq = NULL; } - if (sc->smc_ifp != NULL) { - ether_ifdetach(sc->smc_ifp); if_free(sc->smc_ifp); } ==== //depot/projects/vimage-commit2/src/sys/fs/devfs/devfs_devs.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ * * From: FreeBSD: src/sys/miscfs/kernfs/kernfs_vfsops.c 1.36 * - * $FreeBSD: src/sys/fs/devfs/devfs_devs.c,v 1.53 2008/01/13 14:44:03 attilio Exp $ + * $FreeBSD: src/sys/fs/devfs/devfs_devs.c,v 1.54 2008/06/16 17:34:59 kib Exp $ */ #include "opt_mac.h" @@ -125,7 +125,6 @@ cdp->cdp_maxdirent = 0; cdev = &cdp->cdp_c; - cdev->si_priv = cdp; cdev->si_name = cdev->__si_namebuf; LIST_INIT(&cdev->si_children); @@ -137,7 +136,7 @@ { struct cdev_priv *cdp; - cdp = cdev->si_priv; + cdp = cdev2priv(cdev); if (cdev->si_cred != NULL) crfree(cdev->si_cred); if (cdp->cdp_inode > 0) @@ -510,7 +509,7 @@ struct cdev_priv *cdp; mtx_assert(&devmtx, MA_OWNED); - cdp = dev->si_priv; + cdp = cdev2priv(dev); cdp->cdp_flags |= CDP_ACTIVE; cdp->cdp_inode = alloc_unrl(devfs_inos); dev_refl(dev); @@ -524,7 +523,7 @@ struct cdev_priv *cdp; mtx_assert(&devmtx, MA_OWNED); - cdp = dev->si_priv; + cdp = cdev2priv(dev); cdp->cdp_flags &= ~CDP_ACTIVE; devfs_generation++; } ==== //depot/projects/vimage-commit2/src/sys/fs/devfs/devfs_int.h#2 (text+ko) ==== @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/devfs/devfs_int.h,v 1.5 2008/05/21 09:31:44 kib Exp $ + * $FreeBSD: src/sys/fs/devfs/devfs_int.h,v 1.6 2008/06/16 17:34:59 kib Exp $ */ /* @@ -68,6 +68,8 @@ LIST_HEAD(, cdev_privdata) cdp_fdpriv; }; +#define cdev2priv(c) member2struct(cdev_priv, cdp_c, c) + struct cdev *devfs_alloc(void); void devfs_free(struct cdev *); void devfs_create(struct cdev *dev); ==== //depot/projects/vimage-commit2/src/sys/fs/devfs/devfs_vnops.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ * @(#)kernfs_vnops.c 8.15 (Berkeley) 5/21/95 * From: FreeBSD: src/sys/miscfs/kernfs/kernfs_vnops.c 1.43 * - * $FreeBSD: src/sys/fs/devfs/devfs_vnops.c,v 1.162 2008/06/05 09:15:47 kib Exp $ + * $FreeBSD: src/sys/fs/devfs/devfs_vnops.c,v 1.163 2008/06/16 17:34:59 kib Exp $ */ /* @@ -132,7 +132,7 @@ fp = curthread->td_fpop; if (fp == NULL) return (ENOENT); - cdp = ((struct cdev *)fp->f_data)->si_priv; + cdp = cdev2priv((struct cdev *)fp->f_data); p = malloc(sizeof(struct cdev_privdata), M_CDEVPDATA, M_WAITOK); p->cdpd_data = priv; p->cdpd_dtr = priv_dtr; @@ -541,7 +541,7 @@ fix(dev->si_ctime); vap->va_ctime = dev->si_ctime; - vap->va_rdev = dev->si_priv->cdp_inode; + vap->va_rdev = cdev2priv(dev)->cdp_inode; } vap->va_gen = 0; vap->va_flags = 0; @@ -742,7 +742,7 @@ } dev_lock(); - dde = &cdev->si_priv->cdp_dirents[dmp->dm_idx]; + dde = &cdev2priv(cdev)->cdp_dirents[dmp->dm_idx]; if (dde != NULL && *dde != NULL) de = *dde; dev_unlock(); @@ -1141,7 +1141,7 @@ KASSERT((ap->a_flags & REVOKEALL) != 0, ("devfs_revoke !REVOKEALL")); dev = vp->v_rdev; - cdp = dev->si_priv; + cdp = cdev2priv(dev); dev_lock(); cdp->cdp_inuse++; @@ -1419,7 +1419,7 @@ { if (x == NULL) return (NODEV); - return (x->si_priv->cdp_inode); + return (cdev2priv(x)->cdp_inode); } static struct fileops devfs_ops_f = { ==== //depot/projects/vimage-commit2/src/sys/fs/tmpfs/tmpfs_subr.c#2 (text+ko) ==== @@ -41,7 +41,7 @@ * Efficient memory file system supporting functions. */ #include -__FBSDID("$FreeBSD: src/sys/fs/tmpfs/tmpfs_subr.c,v 1.16 2008/02/25 18:45:56 attilio Exp $"); +__FBSDID("$FreeBSD: src/sys/fs/tmpfs/tmpfs_subr.c,v 1.17 2008/06/15 18:40:58 kib Exp $"); #include #include @@ -391,11 +391,8 @@ vnode_pager_setsize(vp, node->tn_size); error = insmntque(vp, mp); - if (error) { - vgone(vp); - vput(vp); + if (error) vp = NULL; - } unlock: TMPFS_NODE_LOCK(node); ==== //depot/projects/vimage-commit2/src/sys/geom/part/g_part.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002, 2005, 2006, 2007 Marcel Moolenaar + * Copyright (c) 2002, 2005-2008 Marcel Moolenaar * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/part/g_part.c,v 1.18 2008/04/23 20:13:05 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/part/g_part.c,v 1.19 2008/06/18 01:13:34 marcel Exp $"); #include #include @@ -121,7 +121,9 @@ G_PART_CTL_MOVE, G_PART_CTL_RECOVER, G_PART_CTL_RESIZE, - G_PART_CTL_UNDO + G_PART_CTL_SET, + G_PART_CTL_UNDO, + G_PART_CTL_UNSET }; /* @@ -954,6 +956,53 @@ } static int +g_part_ctl_setunset(struct gctl_req *req, struct g_part_parms *gpp, + unsigned int set) +{ + char buf[32]; + struct g_geom *gp; + struct g_part_entry *entry; + struct g_part_table *table; + struct sbuf *sb; + int error; + + gp = gpp->gpp_geom; + G_PART_TRACE((G_T_TOPOLOGY, "%s(%s)", __func__, gp->name)); + g_topology_assert(); + + table = gp->softc; + + LIST_FOREACH(entry, &table->gpt_entry, gpe_entry) { + if (entry->gpe_deleted || entry->gpe_internal) + continue; + if (entry->gpe_index == gpp->gpp_index) + break; + } + if (entry == NULL) { + gctl_error(req, "%d index '%d'", ENOENT, gpp->gpp_index); + return (ENOENT); + } + + error = G_PART_SETUNSET(table, entry, gpp->gpp_attrib, set); + if (error) { + gctl_error(req, "%d attrib '%s'", error, gpp->gpp_attrib); + return (error); + } + + /* Provide feedback if so requested. */ + if (gpp->gpp_parms & G_PART_PARM_OUTPUT) { + sb = sbuf_new(NULL, NULL, 0, SBUF_AUTOEXTEND); + sbuf_printf(sb, "%s%s has %s %sset\n", gp->name, + G_PART_NAME(table, entry, buf, sizeof(buf)), + gpp->gpp_attrib, (set) ? "" : "un"); + sbuf_finish(sb); + gctl_set_param(req, "output", sbuf_data(sb), sbuf_len(sb) + 1); + sbuf_delete(sb); + } + return (0); +} + +static int g_part_ctl_undo(struct gctl_req *req, struct g_part_parms *gpp) { struct g_consumer *cp; @@ -1129,11 +1178,22 @@ mparms |= G_PART_PARM_GEOM | G_PART_PARM_INDEX; } break; + case 's': + if (!strcmp(verb, "set")) { + ctlreq = G_PART_CTL_SET; + mparms |= G_PART_PARM_ATTRIB | G_PART_PARM_GEOM | + G_PART_PARM_INDEX; + } + break; case 'u': if (!strcmp(verb, "undo")) { ctlreq = G_PART_CTL_UNDO; mparms |= G_PART_PARM_GEOM; modifies = 0; + } else if (!strcmp(verb, "unset")) { + ctlreq = G_PART_CTL_UNSET; + mparms |= G_PART_PARM_ATTRIB | G_PART_PARM_GEOM | + G_PART_PARM_INDEX; } break; } @@ -1147,6 +1207,10 @@ ap = &req->arg[i]; parm = 0; switch (ap->name[0]) { + case 'a': + if (!strcmp(ap->name, "attrib")) + parm = G_PART_PARM_ATTRIB; + break; case 'b': if (!strcmp(ap->name, "bootcode")) parm = G_PART_PARM_BOOTCODE; @@ -1215,6 +1279,9 @@ return; } switch (parm) { + case G_PART_PARM_ATTRIB: + error = g_part_parm_str(p, &gpp.gpp_attrib); + break; case G_PART_PARM_BOOTCODE: gpp.gpp_codeptr = p; gpp.gpp_codesize = len; @@ -1328,9 +1395,15 @@ case G_PART_CTL_RESIZE: error = g_part_ctl_resize(req, &gpp); break; + case G_PART_CTL_SET: + error = g_part_ctl_setunset(req, &gpp, 1); + break; case G_PART_CTL_UNDO: error = g_part_ctl_undo(req, &gpp); break; + case G_PART_CTL_UNSET: + error = g_part_ctl_setunset(req, &gpp, 0); + break; } /* Implement automatic commit. */ ==== //depot/projects/vimage-commit2/src/sys/geom/part/g_part.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2006, 2007 Marcel Moolenaar + * Copyright (c) 2006-2008 Marcel Moolenaar * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/geom/part/g_part.h,v 1.9 2008/04/13 19:54:54 marcel Exp $ + * $FreeBSD: src/sys/geom/part/g_part.h,v 1.10 2008/06/18 01:13:34 marcel Exp $ */ #ifndef _GEOM_PART_H_ @@ -136,6 +136,7 @@ #define G_PART_PARM_TYPE 0x0400 #define G_PART_PARM_VERSION 0x0800 #define G_PART_PARM_BOOTCODE 0x1000 +#define G_PART_PARM_ATTRIB 0x2000 struct g_part_parms { unsigned int gpp_parms; @@ -152,6 +153,7 @@ unsigned int gpp_version; const void *gpp_codeptr; unsigned int gpp_codesize; + const char *gpp_attrib; }; void g_part_geometry_heads(off_t, u_int, off_t *, u_int *); ==== //depot/projects/vimage-commit2/src/sys/geom/part/g_part_if.m#2 (text+ko) ==== @@ -1,5 +1,5 @@ #- -# Copyright (c) 2006, 2007 Marcel Moolenaar +# Copyright (c) 2006-2008 Marcel Moolenaar # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -23,7 +23,7 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -# $FreeBSD: src/sys/geom/part/g_part_if.m,v 1.3 2008/04/13 19:54:54 marcel Exp $ +# $FreeBSD: src/sys/geom/part/g_part_if.m,v 1.4 2008/06/18 01:13:34 marcel Exp $ #include #include @@ -108,6 +108,14 @@ struct g_consumer *cp; }; +# setunset() - set or unset partition entry attributes. +METHOD int setunset { + struct g_part_table *table; + struct g_part_entry *entry; + const char *attrib; + unsigned int set; +}; + # type() - return a string representation of the partition type. # Preferrably, the alias names. METHOD const char * type { ==== //depot/projects/vimage-commit2/src/sys/geom/part/g_part_mbr.c#3 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2007 Marcel Moolenaar + * Copyright (c) 2007, 2008 Marcel Moolenaar * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/part/g_part_mbr.c,v 1.8 2008/06/12 05:56:03 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/part/g_part_mbr.c,v 1.9 2008/06/18 01:13:34 marcel Exp $"); #include #include @@ -71,6 +71,8 @@ char *, size_t); static int g_part_mbr_probe(struct g_part_table *, struct g_consumer *); static int g_part_mbr_read(struct g_part_table *, struct g_consumer *); +static int g_part_mbr_setunset(struct g_part_table *, struct g_part_entry *, + const char *, unsigned int); static const char *g_part_mbr_type(struct g_part_table *, struct g_part_entry *, char *, size_t); static int g_part_mbr_write(struct g_part_table *, struct g_consumer *); @@ -86,6 +88,7 @@ KOBJMETHOD(g_part_name, g_part_mbr_name), KOBJMETHOD(g_part_probe, g_part_mbr_probe), KOBJMETHOD(g_part_read, g_part_mbr_read), + KOBJMETHOD(g_part_setunset, g_part_mbr_setunset), KOBJMETHOD(g_part_type, g_part_mbr_type), KOBJMETHOD(g_part_write, g_part_mbr_write), { 0, 0 } @@ -262,6 +265,8 @@ /* confxml: partition entry information */ sbuf_printf(sb, "%s%u\n", indent, entry->ent.dp_typ); + if (entry->ent.dp_flag & 0x80) + sbuf_printf(sb, "%sactive\n", indent); } else { /* confxml: scheme information */ } @@ -420,6 +425,43 @@ return (0); } +static int +g_part_mbr_setunset(struct g_part_table *table, struct g_part_entry *baseentry, + const char *attrib, unsigned int set) +{ + struct g_part_entry *iter; + struct g_part_mbr_entry *entry; + int changed; + + if (strcasecmp(attrib, "active") != 0) + return (EINVAL); + + /* Only one entry can have the active attribute. */ + LIST_FOREACH(iter, &table->gpt_entry, gpe_entry) { + if (iter->gpe_deleted) + continue; + changed = 0; + entry = (struct g_part_mbr_entry *)iter; + if (iter == baseentry) { + if (set && (entry->ent.dp_flag & 0x80) == 0) { + entry->ent.dp_flag |= 0x80; + changed = 1; + } else if (!set && (entry->ent.dp_flag & 0x80)) { + entry->ent.dp_flag &= ~0x80; + changed = 1; + } + } else { + if (set && (entry->ent.dp_flag & 0x80)) { + entry->ent.dp_flag &= ~0x80; + changed = 1; + } + } + if (changed && !iter->gpe_created) + iter->gpe_modified = 1; + } + return (0); +} + static const char * g_part_mbr_type(struct g_part_table *basetable, struct g_part_entry *baseentry, char *buf, size_t bufsz) ==== //depot/projects/vimage-commit2/src/sys/kern/kern_conf.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_conf.c,v 1.217 2008/06/12 08:30:54 ed Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_conf.c,v 1.218 2008/06/16 17:34:59 kib Exp $"); #include #include @@ -115,7 +115,7 @@ struct cdev_priv *cdp; mtx_assert(&devmtx, MA_OWNED); - cdp = cdev->si_priv; + cdp = cdev2priv(cdev); TAILQ_INSERT_HEAD(&cdevp_free_list, cdp, cdp_list); } @@ -187,7 +187,7 @@ dev_lock(); csw = dev->si_devsw; if (csw != NULL) { - cdp = dev->si_priv; + cdp = cdev2priv(dev); if ((cdp->cdp_flags & CDP_SCHED_DTR) == 0) dev->si_threadcount++; else @@ -208,7 +208,7 @@ dev_lock(); *devp = vp->v_rdev; if (*devp != NULL) { - cdp = (*devp)->si_priv; + cdp = cdev2priv(*devp); if ((cdp->cdp_flags & CDP_SCHED_DTR) == 0) { csw = (*devp)->si_devsw; if (csw != NULL) @@ -851,7 +851,7 @@ dev_unlock(); notify_destroy(dev); mtx_lock(&cdevpriv_mtx); - LIST_FOREACH_SAFE(p, &dev->si_priv->cdp_fdpriv, cdpd_list, p1) { + LIST_FOREACH_SAFE(p, &cdev2priv(dev)->cdp_fdpriv, cdpd_list, p1) { devfs_destroy_cdevpriv(p); mtx_lock(&cdevpriv_mtx); } @@ -1071,7 +1071,7 @@ KASSERT(dev->si_flags & SI_CLONELIST, ("Dev %p(%s) should be on clonelist", dev, dev->si_name)); dev->si_flags &= ~SI_CLONELIST; - cp = dev->si_priv; + cp = cdev2priv(dev); if (!(cp->cdp_flags & CDP_SCHED_DTR)) { cp->cdp_flags |= CDP_SCHED_DTR; KASSERT(dev->si_flags & SI_NAMED, @@ -1125,7 +1125,7 @@ struct cdev_priv *cp; mtx_assert(&devmtx, MA_OWNED); - cp = dev->si_priv; + cp = cdev2priv(dev); if (cp->cdp_flags & CDP_SCHED_DTR) { dev_unlock(); return (0); ==== //depot/projects/vimage-commit2/src/sys/kern/kern_dtrace.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_dtrace.c,v 1.1 2008/05/18 19:43:52 jb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_dtrace.c,v 1.2 2008/06/16 04:44:29 jb Exp $"); #include "opt_kdb.h" @@ -106,15 +106,3 @@ } SYSINIT(kdtrace, SI_SUB_KDTRACE, SI_ORDER_FIRST, init_dtrace, NULL); - -#ifndef KDB -/* - * This is a stub for the kernel debugger for the DTrace actions to call - * when the kernel has been built without KDB. - */ -void -kdb_enter(const char *why, const char *msg) -{ - printf("Cannot enter kernel debugger - No KDB in kernel.\n%s - %s\n", why, msg); -} -#endif ==== //depot/projects/vimage-commit2/src/sys/netinet/sctp_pcb.c#5 (text+ko) ==== @@ -31,7 +31,7 @@ /* $KAME: sctp_pcb.c,v 1.38 2005/03/06 16:04:18 itojun Exp $ */ #include -__FBSDID("$FreeBSD: src/sys/netinet/sctp_pcb.c,v 1.69 2008/06/14 07:58:05 rrs Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/sctp_pcb.c,v 1.70 2008/06/15 12:31:23 rrs Exp $"); #include #include @@ -5330,6 +5330,7 @@ #if defined(SCTP_USE_THREAD_BASED_ITERATOR) SCTP_BASE_INFO(iterator_running) = 0; + SCTP_BASE_INFO(threads_must_exit) = 0; sctp_startup_iterator(); #endif @@ -5357,6 +5358,11 @@ int i; /* FIXME MT */ + SCTP_BASE_INFO(threads_must_exit) = 1; +#if defined(SCTP_USE_THREAD_BASED_ITERATOR) + /* Wake the thread up so it will exit now */ + sctp_wakeup_iterator(); +#endif /* * free the vrf/ifn/ifa lists and hashes (be sure address monitor is * destroyed first). @@ -5428,6 +5434,16 @@ SCTP_ZONE_DESTROY(SCTP_BASE_INFO(ipi_zone_strmoq)); SCTP_ZONE_DESTROY(SCTP_BASE_INFO(ipi_zone_asconf)); SCTP_ZONE_DESTROY(SCTP_BASE_INFO(ipi_zone_asconf_ack)); + /* Get rid of other stuff to */ + if (SCTP_BASE_INFO(sctp_asochash) != NULL) + SCTP_HASH_FREE(SCTP_BASE_INFO(sctp_asochash), SCTP_BASE_INFO(hashasocmark)); + if (SCTP_BASE_INFO(sctp_ephash) != NULL) + SCTP_HASH_FREE(SCTP_BASE_INFO(sctp_ephash), SCTP_BASE_INFO(hashmark)); + if (SCTP_BASE_INFO(sctp_tcpephash) != NULL) + SCTP_HASH_FREE(SCTP_BASE_INFO(sctp_tcpephash), SCTP_BASE_INFO(hashtcpmark)); + if (SCTP_BASE_INFO(sctp_restarthash) != NULL) + SCTP_HASH_FREE(SCTP_BASE_INFO(sctp_restarthash), SCTP_BASE_INFO(hashrestartmark)); + } ==== //depot/projects/vimage-commit2/src/sys/netinet/sctp_pcb.h#3 (text+ko) ==== @@ -31,7 +31,7 @@ /* $KAME: sctp_pcb.h,v 1.21 2005/07/16 01:18:47 suz Exp $ */ #include -__FBSDID("$FreeBSD: src/sys/netinet/sctp_pcb.h,v 1.35 2008/06/14 07:58:05 rrs Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/sctp_pcb.h,v 1.36 2008/06/15 12:31:23 rrs Exp $"); #ifndef __sctp_pcb_h__ #define __sctp_pcb_h__ @@ -177,7 +177,7 @@ struct sctpladdr addr_wq; struct sctpiterators iteratorhead; - + int threads_must_exit; /* ep zone info */ sctp_zone_t ipi_zone_ep; sctp_zone_t ipi_zone_asoc; ==== //depot/projects/vimage-commit2/src/sys/netinet/sctp_usrreq.c#5 (text+ko) ==== @@ -31,7 +31,7 @@ /* $KAME: sctp_usrreq.c,v 1.48 2005/03/07 23:26:08 itojun Exp $ */ #include -__FBSDID("$FreeBSD: src/sys/netinet/sctp_usrreq.c,v 1.56 2008/06/14 07:58:05 rrs Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/sctp_usrreq.c,v 1.57 2008/06/15 12:31:23 rrs Exp $"); #include #include #include @@ -98,23 +98,6 @@ sctp_pcb_finish(); } -/* - * cleanup of the SCTP_BASE_INFO() structure. - * Assumes that the SCTP_BASE_INFO() lock is held. - */ -void -sctp_pcbinfo_cleanup(void) -{ - /* free the hash tables */ - if (SCTP_BASE_INFO(sctp_asochash) != NULL) - SCTP_HASH_FREE(SCTP_BASE_INFO(sctp_asochash), SCTP_BASE_INFO(hashasocmark)); - if (SCTP_BASE_INFO(sctp_ephash) != NULL) - SCTP_HASH_FREE(SCTP_BASE_INFO(sctp_ephash), SCTP_BASE_INFO(hashmark)); - if (SCTP_BASE_INFO(sctp_tcpephash) != NULL) - SCTP_HASH_FREE(SCTP_BASE_INFO(sctp_tcpephash), SCTP_BASE_INFO(hashtcpmark)); - if (SCTP_BASE_INFO(sctp_restarthash) != NULL) - SCTP_HASH_FREE(SCTP_BASE_INFO(sctp_restarthash), SCTP_BASE_INFO(hashrestartmark)); -} void ==== //depot/projects/vimage-commit2/src/sys/netinet/sctp_var.h#3 (text+ko) ==== @@ -31,7 +31,7 @@ /* $KAME: sctp_var.h,v 1.24 2005/03/06 16:04:19 itojun Exp $ */ #include -__FBSDID("$FreeBSD: src/sys/netinet/sctp_var.h,v 1.25 2008/06/14 07:58:05 rrs Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/sctp_var.h,v 1.26 2008/06/15 12:31:23 rrs Exp $"); #ifndef _NETINET_SCTP_VAR_H_ #define _NETINET_SCTP_VAR_H_ @@ -308,7 +308,6 @@ void sctp_finish(void); -void sctp_pcbinfo_cleanup(void); int sctp_flush(struct socket *, int); int sctp_shutdown __P((struct socket *)); void sctp_notify ==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_syncache.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netinet/tcp_syncache.c,v 1.145 2008/05/09 23:02:58 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/tcp_syncache.c,v 1.147 2008/06/16 20:08:22 ups Exp $"); #include "opt_inet.h" #include "opt_inet6.h" @@ -907,11 +907,14 @@ goto failed; } /* - * The SEQ must match the received initial receive sequence - * number + 1 (the SYN) because we didn't ACK any data that - * may have come with the SYN. + * The SEQ must fall in the window starting a the received initial receive + * sequence number + 1 (the SYN). */ - if (th->th_seq != sc->sc_irs + 1 && !TOEPCB_ISSET(sc)) { + + if ((SEQ_LEQ(th->th_seq, sc->sc_irs) || + SEQ_GT(th->th_seq, sc->sc_irs + sc->sc_wnd )) && + !TOEPCB_ISSET(sc)) + { if ((s = tcp_log_addrs(inc, th, NULL, NULL))) log(LOG_DEBUG, "%s; %s: SEQ %u != IRS+1 %u, segment " "rejected\n", s, __func__, th->th_seq, sc->sc_irs); @@ -1616,7 +1619,7 @@ * The secret wasn't updated for the lifetime of a syncookie, * so this SYN-ACK/ACK is either too old (replay) or totally bogus. */ - if (sch->sch_reseed < time_uptime) { + if (sch->sch_reseed + SYNCOOKIE_LIFETIME < time_uptime) { return (NULL); } ==== //depot/projects/vimage-commit2/src/sys/pci/if_rl.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/pci/if_rl.c,v 1.174 2008/04/10 01:06:05 yongari Exp $"); +__FBSDID("$FreeBSD: src/sys/pci/if_rl.c,v 1.175 2008/06/16 18:32:20 remko Exp $"); /* * RealTek 8129/8139 PCI NIC driver @@ -144,6 +144,8 @@ "RealTek 8129 10/100BaseTX" }, { RT_VENDORID, RT_DEVICEID_8139, RL_8139, "RealTek 8139 10/100BaseTX" }, + { RT_VENDORID, RT_DEVICEID_8139D, RL_8139, + "RealTek 8139 10/100BaseTX" }, { RT_VENDORID, RT_DEVICEID_8138, RL_8139, "RealTek 8139 10/100BaseTX CardBus" }, { RT_VENDORID, RT_DEVICEID_8100, RL_8139, ==== //depot/projects/vimage-commit2/src/sys/pci/if_rlreg.h#2 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/pci/if_rlreg.h,v 1.74 2008/03/31 04:03:14 yongari Exp $ + * $FreeBSD: src/sys/pci/if_rlreg.h,v 1.75 2008/06/16 18:32:20 remko Exp $ */ /* @@ -862,6 +862,7 @@ /* * RealTek chip device IDs. */ +#define RT_DEVICEID_8139D 0x8039 #define RT_DEVICEID_8129 0x8129 #define RT_DEVICEID_8101E 0x8136 #define RT_DEVICEID_8138 0x8138 ==== //depot/projects/vimage-commit2/src/sys/pci/nfsmb.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/pci/nfsmb.c,v 1.9 2008/06/06 18:29:56 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/pci/nfsmb.c,v 1.10 2008/06/18 20:39:56 joerg Exp $"); #include #include @@ -64,6 +64,7 @@ #define NFSMB_DEVICEID_NF4_51_SMB 0x0264 #define NFSMB_DEVICEID_NF4_55_SMB 0x0368 #define NFSMB_DEVICEID_NF4_61_SMB 0x03eb +#define NFSMB_DEVICEID_NF4_65_SMB 0x0446 /* PCI Configuration space registers */ #define NF2PCI_SMBASE_1 PCIR_BAR(4) @@ -156,6 +157,7 @@ case NFSMB_DEVICEID_NF4_51_SMB: case NFSMB_DEVICEID_NF4_55_SMB: case NFSMB_DEVICEID_NF4_61_SMB: + case NFSMB_DEVICEID_NF4_65_SMB: device_set_desc(dev, "nForce2/3/4 MCP SMBus Controller"); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jun 18 21:27:05 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 44FDB106567A; Wed, 18 Jun 2008 21:27:05 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 054E91065673 for ; Wed, 18 Jun 2008 21:27:05 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E21248FC1C for ; Wed, 18 Jun 2008 21:27:04 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5ILR4KZ022048 for ; Wed, 18 Jun 2008 21:27:04 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5ILR4YN022046 for perforce@freebsd.org; Wed, 18 Jun 2008 21:27:04 GMT (envelope-from julian@freebsd.org) Date: Wed, 18 Jun 2008 21:27:04 GMT Message-Id: <200806182127.m5ILR4YN022046@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 143717 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Jun 2008 21:27:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=143717 Change 143717 by julian@julian_trafmon1 on 2008/06/18 21:27:01 IFC@143713 Affected files ... .. //depot/projects/vimage-commit/src/sys/boot/i386/libi386/time.c#2 integrate .. //depot/projects/vimage-commit/src/sys/compat/ndis/subr_ntoskrnl.c#2 integrate .. //depot/projects/vimage-commit/src/sys/ddb/db_ps.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/smc/if_smc.c#5 integrate .. //depot/projects/vimage-commit/src/sys/fs/devfs/devfs_devs.c#2 integrate .. //depot/projects/vimage-commit/src/sys/fs/devfs/devfs_int.h#2 integrate .. //depot/projects/vimage-commit/src/sys/fs/devfs/devfs_vnops.c#3 integrate .. //depot/projects/vimage-commit/src/sys/fs/tmpfs/tmpfs_subr.c#2 integrate .. //depot/projects/vimage-commit/src/sys/geom/part/g_part.c#2 integrate .. //depot/projects/vimage-commit/src/sys/geom/part/g_part.h#2 integrate .. //depot/projects/vimage-commit/src/sys/geom/part/g_part_if.m#2 integrate .. //depot/projects/vimage-commit/src/sys/geom/part/g_part_mbr.c#3 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_conf.c#4 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_dtrace.c#2 integrate .. //depot/projects/vimage-commit/src/sys/netinet/sctp_pcb.c#3 integrate .. //depot/projects/vimage-commit/src/sys/netinet/sctp_pcb.h#3 integrate .. //depot/projects/vimage-commit/src/sys/netinet/sctp_usrreq.c#3 integrate .. //depot/projects/vimage-commit/src/sys/netinet/sctp_var.h#3 integrate .. //depot/projects/vimage-commit/src/sys/netinet/tcp_syncache.c#3 integrate .. //depot/projects/vimage-commit/src/sys/pci/if_rl.c#2 integrate .. //depot/projects/vimage-commit/src/sys/pci/if_rlreg.h#2 integrate .. //depot/projects/vimage-commit/src/sys/pci/nfsmb.c#3 integrate .. //depot/projects/vimage-commit/src/sys/sys/conf.h#4 integrate .. //depot/projects/vimage-commit/src/sys/sys/param.h#3 integrate Differences ... ==== //depot/projects/vimage-commit/src/sys/boot/i386/libi386/time.c#2 (text+ko) ==== @@ -25,25 +25,23 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/time.c,v 1.5 2003/08/25 23:28:31 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/time.c,v 1.6 2008/06/16 17:04:04 olli Exp $"); #include #include #include "bootstrap.h" #include "libi386.h" +static int bios_seconds(void); + /* - * Return the time in seconds since the beginning of the day. + * Return the BIOS time-of-day value. * - * If we pass midnight, don't wrap back to 0. - * * XXX uses undocumented BCD support from libstand. */ - -time_t -time(time_t *t) +static int +bios_seconds(void) { - static time_t lasttime, now; int hr, minute, sec; v86.ctl = 0; @@ -55,7 +53,33 @@ minute = bcd2bin(v86.ecx & 0xff); /* minute in %cl */ sec = bcd2bin((v86.edx & 0xff00) >> 8); /* second in %dh */ - now = hr * 3600 + minute * 60 + sec; + return (hr * 3600 + minute * 60 + sec); +} + +/* + * Return the time in seconds since the beginning of the day. + * + * Some BIOSes (notably qemu) don't correctly read the RTC + * registers in an atomic way, sometimes returning bogus values. + * Therefore we "debounce" the reading by accepting it only when + * we got two identical values in succession. + * + * If we pass midnight, don't wrap back to 0. + */ +time_t +time(time_t *t) +{ + static time_t lasttime; + time_t now, check; + int try; + + try = 0; + check = bios_seconds(); + do { + now = check; + check = bios_seconds(); + } while (now != check && ++try < 1000); + if (now < lasttime) now += 24 * 3600; lasttime = now; ==== //depot/projects/vimage-commit/src/sys/compat/ndis/subr_ntoskrnl.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.95 2008/05/30 06:31:55 weongyo Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.96 2008/06/15 13:37:29 cokane Exp $"); #include #include @@ -225,6 +225,8 @@ static ndis_status PsCreateSystemThread(ndis_handle *, uint32_t, void *, ndis_handle, void *, void *, void *); static ndis_status PsTerminateSystemThread(ndis_status); +static ndis_status IoGetDeviceObjectPointer(unicode_string *, + uint32_t, void *, device_object *); static ndis_status IoGetDeviceProperty(device_object *, uint32_t, uint32_t, void *, uint32_t *); static void KeInitializeMutex(kmutant *, uint32_t); @@ -3235,6 +3237,16 @@ } static ndis_status +IoGetDeviceObjectPointer(name, reqaccess, fileobj, devobj) + unicode_string *name; + uint32_t reqaccess; + void *fileobj; + device_object *devobj; +{ + return(STATUS_SUCCESS); +} + +static ndis_status IoGetDeviceProperty(devobj, regprop, buflen, prop, reslen) device_object *devobj; uint32_t regprop; @@ -4391,6 +4403,7 @@ IMPORT_SFUNC(MmUnmapIoSpace, 2), IMPORT_SFUNC(KeInitializeSpinLock, 1), IMPORT_SFUNC(IoIsWdmVersionAvailable, 2), + IMPORT_SFUNC(IoGetDeviceObjectPointer, 4), IMPORT_SFUNC(IoGetDeviceProperty, 5), IMPORT_SFUNC(IoAllocateWorkItem, 1), IMPORT_SFUNC(IoFreeWorkItem, 1), ==== //depot/projects/vimage-commit/src/sys/ddb/db_ps.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ddb/db_ps.c,v 1.68 2008/03/25 20:36:32 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/ddb/db_ps.c,v 1.69 2008/06/18 20:42:01 attilio Exp $"); #include #include @@ -292,6 +292,7 @@ DB_SHOW_COMMAND(thread, db_show_thread) { struct thread *td; + struct lock_object *lock; boolean_t comma; /* Determine which thread to examine. */ @@ -299,6 +300,7 @@ td = db_lookup_thread(addr, FALSE); else td = kdb_thread; + lock = (struct lock_object *)td->td_lock; db_printf("Thread %d at %p:\n", td->td_tid, td); db_printf(" proc (pid %d): %p\n", td->td_proc->p_pid, td->td_proc); @@ -365,6 +367,7 @@ db_printf(" wmesg: %s wchan: %p\n", td->td_wmesg, td->td_wchan); db_printf(" priority: %d\n", td->td_priority); + db_printf(" container lock: %s (%p)\n", lock->lo_name, lock); } DB_SHOW_COMMAND(proc, db_show_proc) ==== //depot/projects/vimage-commit/src/sys/dev/smc/if_smc.c#5 (text+ko) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/smc/if_smc.c,v 1.5 2008/06/13 00:48:09 benno Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/smc/if_smc.c,v 1.6 2008/06/17 05:48:42 benno Exp $"); /* * Driver for SMSC LAN91C111, may work for older variants. @@ -394,6 +394,13 @@ smc_stop(sc); SMC_UNLOCK(sc); + if (sc->smc_ifp != NULL) { + ether_ifdetach(sc->smc_ifp); + } + + callout_drain(&sc->smc_watchdog); + callout_drain(&sc->smc_mii_tick_ch); + #ifdef DEVICE_POLLING if (sc->smc_ifp->if_capenable & IFCAP_POLLING) ether_poll_deregister(sc->smc_ifp); @@ -409,10 +416,8 @@ taskqueue_free(sc->smc_tq); sc->smc_tq = NULL; } - if (sc->smc_ifp != NULL) { - ether_ifdetach(sc->smc_ifp); if_free(sc->smc_ifp); } ==== //depot/projects/vimage-commit/src/sys/fs/devfs/devfs_devs.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ * * From: FreeBSD: src/sys/miscfs/kernfs/kernfs_vfsops.c 1.36 * - * $FreeBSD: src/sys/fs/devfs/devfs_devs.c,v 1.53 2008/01/13 14:44:03 attilio Exp $ + * $FreeBSD: src/sys/fs/devfs/devfs_devs.c,v 1.54 2008/06/16 17:34:59 kib Exp $ */ #include "opt_mac.h" @@ -125,7 +125,6 @@ cdp->cdp_maxdirent = 0; cdev = &cdp->cdp_c; - cdev->si_priv = cdp; cdev->si_name = cdev->__si_namebuf; LIST_INIT(&cdev->si_children); @@ -137,7 +136,7 @@ { struct cdev_priv *cdp; - cdp = cdev->si_priv; + cdp = cdev2priv(cdev); if (cdev->si_cred != NULL) crfree(cdev->si_cred); if (cdp->cdp_inode > 0) @@ -510,7 +509,7 @@ struct cdev_priv *cdp; mtx_assert(&devmtx, MA_OWNED); - cdp = dev->si_priv; + cdp = cdev2priv(dev); cdp->cdp_flags |= CDP_ACTIVE; cdp->cdp_inode = alloc_unrl(devfs_inos); dev_refl(dev); @@ -524,7 +523,7 @@ struct cdev_priv *cdp; mtx_assert(&devmtx, MA_OWNED); - cdp = dev->si_priv; + cdp = cdev2priv(dev); cdp->cdp_flags &= ~CDP_ACTIVE; devfs_generation++; } ==== //depot/projects/vimage-commit/src/sys/fs/devfs/devfs_int.h#2 (text+ko) ==== @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/devfs/devfs_int.h,v 1.5 2008/05/21 09:31:44 kib Exp $ + * $FreeBSD: src/sys/fs/devfs/devfs_int.h,v 1.6 2008/06/16 17:34:59 kib Exp $ */ /* @@ -68,6 +68,8 @@ LIST_HEAD(, cdev_privdata) cdp_fdpriv; }; +#define cdev2priv(c) member2struct(cdev_priv, cdp_c, c) + struct cdev *devfs_alloc(void); void devfs_free(struct cdev *); void devfs_create(struct cdev *dev); ==== //depot/projects/vimage-commit/src/sys/fs/devfs/devfs_vnops.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ * @(#)kernfs_vnops.c 8.15 (Berkeley) 5/21/95 * From: FreeBSD: src/sys/miscfs/kernfs/kernfs_vnops.c 1.43 * - * $FreeBSD: src/sys/fs/devfs/devfs_vnops.c,v 1.162 2008/06/05 09:15:47 kib Exp $ + * $FreeBSD: src/sys/fs/devfs/devfs_vnops.c,v 1.163 2008/06/16 17:34:59 kib Exp $ */ /* @@ -132,7 +132,7 @@ fp = curthread->td_fpop; if (fp == NULL) return (ENOENT); - cdp = ((struct cdev *)fp->f_data)->si_priv; + cdp = cdev2priv((struct cdev *)fp->f_data); p = malloc(sizeof(struct cdev_privdata), M_CDEVPDATA, M_WAITOK); p->cdpd_data = priv; p->cdpd_dtr = priv_dtr; @@ -541,7 +541,7 @@ fix(dev->si_ctime); vap->va_ctime = dev->si_ctime; - vap->va_rdev = dev->si_priv->cdp_inode; + vap->va_rdev = cdev2priv(dev)->cdp_inode; } vap->va_gen = 0; vap->va_flags = 0; @@ -742,7 +742,7 @@ } dev_lock(); - dde = &cdev->si_priv->cdp_dirents[dmp->dm_idx]; + dde = &cdev2priv(cdev)->cdp_dirents[dmp->dm_idx]; if (dde != NULL && *dde != NULL) de = *dde; dev_unlock(); @@ -1141,7 +1141,7 @@ KASSERT((ap->a_flags & REVOKEALL) != 0, ("devfs_revoke !REVOKEALL")); dev = vp->v_rdev; - cdp = dev->si_priv; + cdp = cdev2priv(dev); dev_lock(); cdp->cdp_inuse++; @@ -1419,7 +1419,7 @@ { if (x == NULL) return (NODEV); - return (x->si_priv->cdp_inode); + return (cdev2priv(x)->cdp_inode); } static struct fileops devfs_ops_f = { ==== //depot/projects/vimage-commit/src/sys/fs/tmpfs/tmpfs_subr.c#2 (text+ko) ==== @@ -41,7 +41,7 @@ * Efficient memory file system supporting functions. */ #include -__FBSDID("$FreeBSD: src/sys/fs/tmpfs/tmpfs_subr.c,v 1.16 2008/02/25 18:45:56 attilio Exp $"); +__FBSDID("$FreeBSD: src/sys/fs/tmpfs/tmpfs_subr.c,v 1.17 2008/06/15 18:40:58 kib Exp $"); #include #include @@ -391,11 +391,8 @@ vnode_pager_setsize(vp, node->tn_size); error = insmntque(vp, mp); - if (error) { - vgone(vp); - vput(vp); + if (error) vp = NULL; - } unlock: TMPFS_NODE_LOCK(node); ==== //depot/projects/vimage-commit/src/sys/geom/part/g_part.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002, 2005, 2006, 2007 Marcel Moolenaar + * Copyright (c) 2002, 2005-2008 Marcel Moolenaar * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/part/g_part.c,v 1.18 2008/04/23 20:13:05 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/part/g_part.c,v 1.19 2008/06/18 01:13:34 marcel Exp $"); #include #include @@ -121,7 +121,9 @@ G_PART_CTL_MOVE, G_PART_CTL_RECOVER, G_PART_CTL_RESIZE, - G_PART_CTL_UNDO + G_PART_CTL_SET, + G_PART_CTL_UNDO, + G_PART_CTL_UNSET }; /* @@ -954,6 +956,53 @@ } static int +g_part_ctl_setunset(struct gctl_req *req, struct g_part_parms *gpp, + unsigned int set) +{ + char buf[32]; + struct g_geom *gp; + struct g_part_entry *entry; + struct g_part_table *table; + struct sbuf *sb; + int error; + + gp = gpp->gpp_geom; + G_PART_TRACE((G_T_TOPOLOGY, "%s(%s)", __func__, gp->name)); + g_topology_assert(); + + table = gp->softc; + + LIST_FOREACH(entry, &table->gpt_entry, gpe_entry) { + if (entry->gpe_deleted || entry->gpe_internal) + continue; + if (entry->gpe_index == gpp->gpp_index) + break; + } + if (entry == NULL) { + gctl_error(req, "%d index '%d'", ENOENT, gpp->gpp_index); + return (ENOENT); + } + + error = G_PART_SETUNSET(table, entry, gpp->gpp_attrib, set); + if (error) { + gctl_error(req, "%d attrib '%s'", error, gpp->gpp_attrib); + return (error); + } + + /* Provide feedback if so requested. */ + if (gpp->gpp_parms & G_PART_PARM_OUTPUT) { + sb = sbuf_new(NULL, NULL, 0, SBUF_AUTOEXTEND); + sbuf_printf(sb, "%s%s has %s %sset\n", gp->name, + G_PART_NAME(table, entry, buf, sizeof(buf)), + gpp->gpp_attrib, (set) ? "" : "un"); + sbuf_finish(sb); + gctl_set_param(req, "output", sbuf_data(sb), sbuf_len(sb) + 1); + sbuf_delete(sb); + } + return (0); +} + +static int g_part_ctl_undo(struct gctl_req *req, struct g_part_parms *gpp) { struct g_consumer *cp; @@ -1129,11 +1178,22 @@ mparms |= G_PART_PARM_GEOM | G_PART_PARM_INDEX; } break; + case 's': + if (!strcmp(verb, "set")) { + ctlreq = G_PART_CTL_SET; + mparms |= G_PART_PARM_ATTRIB | G_PART_PARM_GEOM | + G_PART_PARM_INDEX; + } + break; case 'u': if (!strcmp(verb, "undo")) { ctlreq = G_PART_CTL_UNDO; mparms |= G_PART_PARM_GEOM; modifies = 0; + } else if (!strcmp(verb, "unset")) { + ctlreq = G_PART_CTL_UNSET; + mparms |= G_PART_PARM_ATTRIB | G_PART_PARM_GEOM | + G_PART_PARM_INDEX; } break; } @@ -1147,6 +1207,10 @@ ap = &req->arg[i]; parm = 0; switch (ap->name[0]) { + case 'a': + if (!strcmp(ap->name, "attrib")) + parm = G_PART_PARM_ATTRIB; + break; case 'b': if (!strcmp(ap->name, "bootcode")) parm = G_PART_PARM_BOOTCODE; @@ -1215,6 +1279,9 @@ return; } switch (parm) { + case G_PART_PARM_ATTRIB: + error = g_part_parm_str(p, &gpp.gpp_attrib); + break; case G_PART_PARM_BOOTCODE: gpp.gpp_codeptr = p; gpp.gpp_codesize = len; @@ -1328,9 +1395,15 @@ case G_PART_CTL_RESIZE: error = g_part_ctl_resize(req, &gpp); break; + case G_PART_CTL_SET: + error = g_part_ctl_setunset(req, &gpp, 1); + break; case G_PART_CTL_UNDO: error = g_part_ctl_undo(req, &gpp); break; + case G_PART_CTL_UNSET: + error = g_part_ctl_setunset(req, &gpp, 0); + break; } /* Implement automatic commit. */ ==== //depot/projects/vimage-commit/src/sys/geom/part/g_part.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2006, 2007 Marcel Moolenaar + * Copyright (c) 2006-2008 Marcel Moolenaar * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/geom/part/g_part.h,v 1.9 2008/04/13 19:54:54 marcel Exp $ + * $FreeBSD: src/sys/geom/part/g_part.h,v 1.10 2008/06/18 01:13:34 marcel Exp $ */ #ifndef _GEOM_PART_H_ @@ -136,6 +136,7 @@ #define G_PART_PARM_TYPE 0x0400 #define G_PART_PARM_VERSION 0x0800 #define G_PART_PARM_BOOTCODE 0x1000 +#define G_PART_PARM_ATTRIB 0x2000 struct g_part_parms { unsigned int gpp_parms; @@ -152,6 +153,7 @@ unsigned int gpp_version; const void *gpp_codeptr; unsigned int gpp_codesize; + const char *gpp_attrib; }; void g_part_geometry_heads(off_t, u_int, off_t *, u_int *); ==== //depot/projects/vimage-commit/src/sys/geom/part/g_part_if.m#2 (text+ko) ==== @@ -1,5 +1,5 @@ #- -# Copyright (c) 2006, 2007 Marcel Moolenaar +# Copyright (c) 2006-2008 Marcel Moolenaar # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -23,7 +23,7 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -# $FreeBSD: src/sys/geom/part/g_part_if.m,v 1.3 2008/04/13 19:54:54 marcel Exp $ +# $FreeBSD: src/sys/geom/part/g_part_if.m,v 1.4 2008/06/18 01:13:34 marcel Exp $ #include #include @@ -108,6 +108,14 @@ struct g_consumer *cp; }; +# setunset() - set or unset partition entry attributes. +METHOD int setunset { + struct g_part_table *table; + struct g_part_entry *entry; + const char *attrib; + unsigned int set; +}; + # type() - return a string representation of the partition type. # Preferrably, the alias names. METHOD const char * type { ==== //depot/projects/vimage-commit/src/sys/geom/part/g_part_mbr.c#3 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2007 Marcel Moolenaar + * Copyright (c) 2007, 2008 Marcel Moolenaar * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/part/g_part_mbr.c,v 1.8 2008/06/12 05:56:03 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/part/g_part_mbr.c,v 1.9 2008/06/18 01:13:34 marcel Exp $"); #include #include @@ -71,6 +71,8 @@ char *, size_t); static int g_part_mbr_probe(struct g_part_table *, struct g_consumer *); static int g_part_mbr_read(struct g_part_table *, struct g_consumer *); +static int g_part_mbr_setunset(struct g_part_table *, struct g_part_entry *, + const char *, unsigned int); static const char *g_part_mbr_type(struct g_part_table *, struct g_part_entry *, char *, size_t); static int g_part_mbr_write(struct g_part_table *, struct g_consumer *); @@ -86,6 +88,7 @@ KOBJMETHOD(g_part_name, g_part_mbr_name), KOBJMETHOD(g_part_probe, g_part_mbr_probe), KOBJMETHOD(g_part_read, g_part_mbr_read), + KOBJMETHOD(g_part_setunset, g_part_mbr_setunset), KOBJMETHOD(g_part_type, g_part_mbr_type), KOBJMETHOD(g_part_write, g_part_mbr_write), { 0, 0 } @@ -262,6 +265,8 @@ /* confxml: partition entry information */ sbuf_printf(sb, "%s%u\n", indent, entry->ent.dp_typ); + if (entry->ent.dp_flag & 0x80) + sbuf_printf(sb, "%sactive\n", indent); } else { /* confxml: scheme information */ } @@ -420,6 +425,43 @@ return (0); } +static int +g_part_mbr_setunset(struct g_part_table *table, struct g_part_entry *baseentry, + const char *attrib, unsigned int set) +{ + struct g_part_entry *iter; + struct g_part_mbr_entry *entry; + int changed; + + if (strcasecmp(attrib, "active") != 0) + return (EINVAL); + + /* Only one entry can have the active attribute. */ + LIST_FOREACH(iter, &table->gpt_entry, gpe_entry) { + if (iter->gpe_deleted) + continue; + changed = 0; + entry = (struct g_part_mbr_entry *)iter; + if (iter == baseentry) { + if (set && (entry->ent.dp_flag & 0x80) == 0) { + entry->ent.dp_flag |= 0x80; + changed = 1; + } else if (!set && (entry->ent.dp_flag & 0x80)) { + entry->ent.dp_flag &= ~0x80; + changed = 1; + } + } else { + if (set && (entry->ent.dp_flag & 0x80)) { + entry->ent.dp_flag &= ~0x80; + changed = 1; + } + } + if (changed && !iter->gpe_created) + iter->gpe_modified = 1; + } + return (0); +} + static const char * g_part_mbr_type(struct g_part_table *basetable, struct g_part_entry *baseentry, char *buf, size_t bufsz) ==== //depot/projects/vimage-commit/src/sys/kern/kern_conf.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_conf.c,v 1.217 2008/06/12 08:30:54 ed Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_conf.c,v 1.218 2008/06/16 17:34:59 kib Exp $"); #include #include @@ -115,7 +115,7 @@ struct cdev_priv *cdp; mtx_assert(&devmtx, MA_OWNED); - cdp = cdev->si_priv; + cdp = cdev2priv(cdev); TAILQ_INSERT_HEAD(&cdevp_free_list, cdp, cdp_list); } @@ -187,7 +187,7 @@ dev_lock(); csw = dev->si_devsw; if (csw != NULL) { - cdp = dev->si_priv; + cdp = cdev2priv(dev); if ((cdp->cdp_flags & CDP_SCHED_DTR) == 0) dev->si_threadcount++; else @@ -208,7 +208,7 @@ dev_lock(); *devp = vp->v_rdev; if (*devp != NULL) { - cdp = (*devp)->si_priv; + cdp = cdev2priv(*devp); if ((cdp->cdp_flags & CDP_SCHED_DTR) == 0) { csw = (*devp)->si_devsw; if (csw != NULL) @@ -851,7 +851,7 @@ dev_unlock(); notify_destroy(dev); mtx_lock(&cdevpriv_mtx); - LIST_FOREACH_SAFE(p, &dev->si_priv->cdp_fdpriv, cdpd_list, p1) { + LIST_FOREACH_SAFE(p, &cdev2priv(dev)->cdp_fdpriv, cdpd_list, p1) { devfs_destroy_cdevpriv(p); mtx_lock(&cdevpriv_mtx); } @@ -1071,7 +1071,7 @@ KASSERT(dev->si_flags & SI_CLONELIST, ("Dev %p(%s) should be on clonelist", dev, dev->si_name)); dev->si_flags &= ~SI_CLONELIST; - cp = dev->si_priv; + cp = cdev2priv(dev); if (!(cp->cdp_flags & CDP_SCHED_DTR)) { cp->cdp_flags |= CDP_SCHED_DTR; KASSERT(dev->si_flags & SI_NAMED, @@ -1125,7 +1125,7 @@ struct cdev_priv *cp; mtx_assert(&devmtx, MA_OWNED); - cp = dev->si_priv; + cp = cdev2priv(dev); if (cp->cdp_flags & CDP_SCHED_DTR) { dev_unlock(); return (0); ==== //depot/projects/vimage-commit/src/sys/kern/kern_dtrace.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_dtrace.c,v 1.1 2008/05/18 19:43:52 jb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_dtrace.c,v 1.2 2008/06/16 04:44:29 jb Exp $"); #include "opt_kdb.h" @@ -106,15 +106,3 @@ } SYSINIT(kdtrace, SI_SUB_KDTRACE, SI_ORDER_FIRST, init_dtrace, NULL); - -#ifndef KDB -/* - * This is a stub for the kernel debugger for the DTrace actions to call - * when the kernel has been built without KDB. - */ -void -kdb_enter(const char *why, const char *msg) -{ - printf("Cannot enter kernel debugger - No KDB in kernel.\n%s - %s\n", why, msg); -} -#endif ==== //depot/projects/vimage-commit/src/sys/netinet/sctp_pcb.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ /* $KAME: sctp_pcb.c,v 1.38 2005/03/06 16:04:18 itojun Exp $ */ #include -__FBSDID("$FreeBSD: src/sys/netinet/sctp_pcb.c,v 1.69 2008/06/14 07:58:05 rrs Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/sctp_pcb.c,v 1.70 2008/06/15 12:31:23 rrs Exp $"); #include #include @@ -5330,6 +5330,7 @@ #if defined(SCTP_USE_THREAD_BASED_ITERATOR) SCTP_BASE_INFO(iterator_running) = 0; + SCTP_BASE_INFO(threads_must_exit) = 0; sctp_startup_iterator(); #endif @@ -5357,6 +5358,11 @@ int i; /* FIXME MT */ + SCTP_BASE_INFO(threads_must_exit) = 1; +#if defined(SCTP_USE_THREAD_BASED_ITERATOR) + /* Wake the thread up so it will exit now */ + sctp_wakeup_iterator(); +#endif /* * free the vrf/ifn/ifa lists and hashes (be sure address monitor is * destroyed first). @@ -5428,6 +5434,16 @@ SCTP_ZONE_DESTROY(SCTP_BASE_INFO(ipi_zone_strmoq)); SCTP_ZONE_DESTROY(SCTP_BASE_INFO(ipi_zone_asconf)); SCTP_ZONE_DESTROY(SCTP_BASE_INFO(ipi_zone_asconf_ack)); + /* Get rid of other stuff to */ + if (SCTP_BASE_INFO(sctp_asochash) != NULL) + SCTP_HASH_FREE(SCTP_BASE_INFO(sctp_asochash), SCTP_BASE_INFO(hashasocmark)); + if (SCTP_BASE_INFO(sctp_ephash) != NULL) + SCTP_HASH_FREE(SCTP_BASE_INFO(sctp_ephash), SCTP_BASE_INFO(hashmark)); + if (SCTP_BASE_INFO(sctp_tcpephash) != NULL) + SCTP_HASH_FREE(SCTP_BASE_INFO(sctp_tcpephash), SCTP_BASE_INFO(hashtcpmark)); + if (SCTP_BASE_INFO(sctp_restarthash) != NULL) + SCTP_HASH_FREE(SCTP_BASE_INFO(sctp_restarthash), SCTP_BASE_INFO(hashrestartmark)); + } ==== //depot/projects/vimage-commit/src/sys/netinet/sctp_pcb.h#3 (text+ko) ==== @@ -31,7 +31,7 @@ /* $KAME: sctp_pcb.h,v 1.21 2005/07/16 01:18:47 suz Exp $ */ #include -__FBSDID("$FreeBSD: src/sys/netinet/sctp_pcb.h,v 1.35 2008/06/14 07:58:05 rrs Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/sctp_pcb.h,v 1.36 2008/06/15 12:31:23 rrs Exp $"); #ifndef __sctp_pcb_h__ #define __sctp_pcb_h__ @@ -177,7 +177,7 @@ struct sctpladdr addr_wq; struct sctpiterators iteratorhead; - + int threads_must_exit; /* ep zone info */ sctp_zone_t ipi_zone_ep; sctp_zone_t ipi_zone_asoc; ==== //depot/projects/vimage-commit/src/sys/netinet/sctp_usrreq.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ /* $KAME: sctp_usrreq.c,v 1.48 2005/03/07 23:26:08 itojun Exp $ */ #include -__FBSDID("$FreeBSD: src/sys/netinet/sctp_usrreq.c,v 1.56 2008/06/14 07:58:05 rrs Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/sctp_usrreq.c,v 1.57 2008/06/15 12:31:23 rrs Exp $"); #include #include #include @@ -98,23 +98,6 @@ sctp_pcb_finish(); } -/* - * cleanup of the SCTP_BASE_INFO() structure. - * Assumes that the SCTP_BASE_INFO() lock is held. - */ -void -sctp_pcbinfo_cleanup(void) -{ - /* free the hash tables */ - if (SCTP_BASE_INFO(sctp_asochash) != NULL) - SCTP_HASH_FREE(SCTP_BASE_INFO(sctp_asochash), SCTP_BASE_INFO(hashasocmark)); - if (SCTP_BASE_INFO(sctp_ephash) != NULL) - SCTP_HASH_FREE(SCTP_BASE_INFO(sctp_ephash), SCTP_BASE_INFO(hashmark)); - if (SCTP_BASE_INFO(sctp_tcpephash) != NULL) - SCTP_HASH_FREE(SCTP_BASE_INFO(sctp_tcpephash), SCTP_BASE_INFO(hashtcpmark)); - if (SCTP_BASE_INFO(sctp_restarthash) != NULL) - SCTP_HASH_FREE(SCTP_BASE_INFO(sctp_restarthash), SCTP_BASE_INFO(hashrestartmark)); -} void ==== //depot/projects/vimage-commit/src/sys/netinet/sctp_var.h#3 (text+ko) ==== @@ -31,7 +31,7 @@ /* $KAME: sctp_var.h,v 1.24 2005/03/06 16:04:19 itojun Exp $ */ #include -__FBSDID("$FreeBSD: src/sys/netinet/sctp_var.h,v 1.25 2008/06/14 07:58:05 rrs Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/sctp_var.h,v 1.26 2008/06/15 12:31:23 rrs Exp $"); #ifndef _NETINET_SCTP_VAR_H_ #define _NETINET_SCTP_VAR_H_ @@ -308,7 +308,6 @@ void sctp_finish(void); -void sctp_pcbinfo_cleanup(void); int sctp_flush(struct socket *, int); int sctp_shutdown __P((struct socket *)); void sctp_notify ==== //depot/projects/vimage-commit/src/sys/netinet/tcp_syncache.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netinet/tcp_syncache.c,v 1.145 2008/05/09 23:02:58 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/tcp_syncache.c,v 1.147 2008/06/16 20:08:22 ups Exp $"); #include "opt_inet.h" #include "opt_inet6.h" @@ -929,11 +929,14 @@ goto failed; } /* - * The SEQ must match the received initial receive sequence - * number + 1 (the SYN) because we didn't ACK any data that - * may have come with the SYN. + * The SEQ must fall in the window starting a the received initial receive + * sequence number + 1 (the SYN). */ - if (th->th_seq != sc->sc_irs + 1 && !TOEPCB_ISSET(sc)) { + + if ((SEQ_LEQ(th->th_seq, sc->sc_irs) || + SEQ_GT(th->th_seq, sc->sc_irs + sc->sc_wnd )) && + !TOEPCB_ISSET(sc)) + { if ((s = tcp_log_addrs(inc, th, NULL, NULL))) log(LOG_DEBUG, "%s; %s: SEQ %u != IRS+1 %u, segment " "rejected\n", s, __func__, th->th_seq, sc->sc_irs); @@ -1644,7 +1647,7 @@ * The secret wasn't updated for the lifetime of a syncookie, * so this SYN-ACK/ACK is either too old (replay) or totally bogus. */ - if (sch->sch_reseed < time_uptime) { + if (sch->sch_reseed + SYNCOOKIE_LIFETIME < time_uptime) { return (NULL); } ==== //depot/projects/vimage-commit/src/sys/pci/if_rl.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/pci/if_rl.c,v 1.174 2008/04/10 01:06:05 yongari Exp $"); +__FBSDID("$FreeBSD: src/sys/pci/if_rl.c,v 1.175 2008/06/16 18:32:20 remko Exp $"); /* * RealTek 8129/8139 PCI NIC driver @@ -144,6 +144,8 @@ "RealTek 8129 10/100BaseTX" }, { RT_VENDORID, RT_DEVICEID_8139, RL_8139, "RealTek 8139 10/100BaseTX" }, + { RT_VENDORID, RT_DEVICEID_8139D, RL_8139, + "RealTek 8139 10/100BaseTX" }, { RT_VENDORID, RT_DEVICEID_8138, RL_8139, "RealTek 8139 10/100BaseTX CardBus" }, { RT_VENDORID, RT_DEVICEID_8100, RL_8139, ==== //depot/projects/vimage-commit/src/sys/pci/if_rlreg.h#2 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/pci/if_rlreg.h,v 1.74 2008/03/31 04:03:14 yongari Exp $ + * $FreeBSD: src/sys/pci/if_rlreg.h,v 1.75 2008/06/16 18:32:20 remko Exp $ */ /* @@ -862,6 +862,7 @@ /* * RealTek chip device IDs. */ +#define RT_DEVICEID_8139D 0x8039 #define RT_DEVICEID_8129 0x8129 #define RT_DEVICEID_8101E 0x8136 #define RT_DEVICEID_8138 0x8138 ==== //depot/projects/vimage-commit/src/sys/pci/nfsmb.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/pci/nfsmb.c,v 1.9 2008/06/06 18:29:56 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/pci/nfsmb.c,v 1.10 2008/06/18 20:39:56 joerg Exp $"); #include #include @@ -64,6 +64,7 @@ #define NFSMB_DEVICEID_NF4_51_SMB 0x0264 #define NFSMB_DEVICEID_NF4_55_SMB 0x0368 #define NFSMB_DEVICEID_NF4_61_SMB 0x03eb +#define NFSMB_DEVICEID_NF4_65_SMB 0x0446 /* PCI Configuration space registers */ #define NF2PCI_SMBASE_1 PCIR_BAR(4) @@ -156,6 +157,7 @@ case NFSMB_DEVICEID_NF4_51_SMB: case NFSMB_DEVICEID_NF4_55_SMB: case NFSMB_DEVICEID_NF4_61_SMB: + case NFSMB_DEVICEID_NF4_65_SMB: device_set_desc(dev, "nForce2/3/4 MCP SMBus Controller"); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jun 18 21:28:06 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 681F11065679; Wed, 18 Jun 2008 21:28:06 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2471D106564A for ; Wed, 18 Jun 2008 21:28:06 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0CFFE8FC1E for ; Wed, 18 Jun 2008 21:28:06 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5ILS5qT022135 for ; Wed, 18 Jun 2008 21:28:05 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5ILS5Jc022133 for perforce@freebsd.org; Wed, 18 Jun 2008 21:28:05 GMT (envelope-from julian@freebsd.org) Date: Wed, 18 Jun 2008 21:28:05 GMT Message-Id: <200806182128.m5ILS5Jc022133@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 143718 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Jun 2008 21:28:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=143718 Change 143718 by julian@julian_trafmon1 on 2008/06/18 21:27:56 IFC@143713 Affected files ... .. //depot/projects/vimage/src/sys/boot/i386/libi386/time.c#2 integrate .. //depot/projects/vimage/src/sys/compat/ndis/subr_ntoskrnl.c#8 integrate .. //depot/projects/vimage/src/sys/ddb/db_ps.c#6 integrate .. //depot/projects/vimage/src/sys/dev/smc/if_smc.c#5 integrate .. //depot/projects/vimage/src/sys/fs/devfs/devfs_devs.c#5 integrate .. //depot/projects/vimage/src/sys/fs/devfs/devfs_int.h#4 integrate .. //depot/projects/vimage/src/sys/fs/devfs/devfs_vnops.c#14 integrate .. //depot/projects/vimage/src/sys/fs/tmpfs/tmpfs_subr.c#8 integrate .. //depot/projects/vimage/src/sys/geom/part/g_part.c#8 integrate .. //depot/projects/vimage/src/sys/geom/part/g_part.h#7 integrate .. //depot/projects/vimage/src/sys/geom/part/g_part_if.m#3 integrate .. //depot/projects/vimage/src/sys/geom/part/g_part_mbr.c#4 integrate .. //depot/projects/vimage/src/sys/kern/kern_conf.c#13 integrate .. //depot/projects/vimage/src/sys/kern/kern_dtrace.c#2 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_pcb.c#26 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_pcb.h#18 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_usrreq.c#27 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_var.h#18 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_syncache.c#27 integrate .. //depot/projects/vimage/src/sys/pci/if_rl.c#9 integrate .. //depot/projects/vimage/src/sys/pci/if_rlreg.h#11 integrate .. //depot/projects/vimage/src/sys/pci/nfsmb.c#6 integrate .. //depot/projects/vimage/src/sys/sys/conf.h#10 integrate .. //depot/projects/vimage/src/sys/sys/param.h#20 integrate Differences ... ==== //depot/projects/vimage/src/sys/boot/i386/libi386/time.c#2 (text+ko) ==== @@ -25,25 +25,23 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/time.c,v 1.5 2003/08/25 23:28:31 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/time.c,v 1.6 2008/06/16 17:04:04 olli Exp $"); #include #include #include "bootstrap.h" #include "libi386.h" +static int bios_seconds(void); + /* - * Return the time in seconds since the beginning of the day. + * Return the BIOS time-of-day value. * - * If we pass midnight, don't wrap back to 0. - * * XXX uses undocumented BCD support from libstand. */ - -time_t -time(time_t *t) +static int +bios_seconds(void) { - static time_t lasttime, now; int hr, minute, sec; v86.ctl = 0; @@ -55,7 +53,33 @@ minute = bcd2bin(v86.ecx & 0xff); /* minute in %cl */ sec = bcd2bin((v86.edx & 0xff00) >> 8); /* second in %dh */ - now = hr * 3600 + minute * 60 + sec; + return (hr * 3600 + minute * 60 + sec); +} + +/* + * Return the time in seconds since the beginning of the day. + * + * Some BIOSes (notably qemu) don't correctly read the RTC + * registers in an atomic way, sometimes returning bogus values. + * Therefore we "debounce" the reading by accepting it only when + * we got two identical values in succession. + * + * If we pass midnight, don't wrap back to 0. + */ +time_t +time(time_t *t) +{ + static time_t lasttime; + time_t now, check; + int try; + + try = 0; + check = bios_seconds(); + do { + now = check; + check = bios_seconds(); + } while (now != check && ++try < 1000); + if (now < lasttime) now += 24 * 3600; lasttime = now; ==== //depot/projects/vimage/src/sys/compat/ndis/subr_ntoskrnl.c#8 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.95 2008/05/30 06:31:55 weongyo Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.96 2008/06/15 13:37:29 cokane Exp $"); #include #include @@ -225,6 +225,8 @@ static ndis_status PsCreateSystemThread(ndis_handle *, uint32_t, void *, ndis_handle, void *, void *, void *); static ndis_status PsTerminateSystemThread(ndis_status); +static ndis_status IoGetDeviceObjectPointer(unicode_string *, + uint32_t, void *, device_object *); static ndis_status IoGetDeviceProperty(device_object *, uint32_t, uint32_t, void *, uint32_t *); static void KeInitializeMutex(kmutant *, uint32_t); @@ -3235,6 +3237,16 @@ } static ndis_status +IoGetDeviceObjectPointer(name, reqaccess, fileobj, devobj) + unicode_string *name; + uint32_t reqaccess; + void *fileobj; + device_object *devobj; +{ + return(STATUS_SUCCESS); +} + +static ndis_status IoGetDeviceProperty(devobj, regprop, buflen, prop, reslen) device_object *devobj; uint32_t regprop; @@ -4391,6 +4403,7 @@ IMPORT_SFUNC(MmUnmapIoSpace, 2), IMPORT_SFUNC(KeInitializeSpinLock, 1), IMPORT_SFUNC(IoIsWdmVersionAvailable, 2), + IMPORT_SFUNC(IoGetDeviceObjectPointer, 4), IMPORT_SFUNC(IoGetDeviceProperty, 5), IMPORT_SFUNC(IoAllocateWorkItem, 1), IMPORT_SFUNC(IoFreeWorkItem, 1), ==== //depot/projects/vimage/src/sys/ddb/db_ps.c#6 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ddb/db_ps.c,v 1.68 2008/03/25 20:36:32 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/ddb/db_ps.c,v 1.69 2008/06/18 20:42:01 attilio Exp $"); #include #include @@ -292,6 +292,7 @@ DB_SHOW_COMMAND(thread, db_show_thread) { struct thread *td; + struct lock_object *lock; boolean_t comma; /* Determine which thread to examine. */ @@ -299,6 +300,7 @@ td = db_lookup_thread(addr, FALSE); else td = kdb_thread; + lock = (struct lock_object *)td->td_lock; db_printf("Thread %d at %p:\n", td->td_tid, td); db_printf(" proc (pid %d): %p\n", td->td_proc->p_pid, td->td_proc); @@ -365,6 +367,7 @@ db_printf(" wmesg: %s wchan: %p\n", td->td_wmesg, td->td_wchan); db_printf(" priority: %d\n", td->td_priority); + db_printf(" container lock: %s (%p)\n", lock->lo_name, lock); } DB_SHOW_COMMAND(proc, db_show_proc) ==== //depot/projects/vimage/src/sys/dev/smc/if_smc.c#5 (text+ko) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/smc/if_smc.c,v 1.5 2008/06/13 00:48:09 benno Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/smc/if_smc.c,v 1.6 2008/06/17 05:48:42 benno Exp $"); /* * Driver for SMSC LAN91C111, may work for older variants. @@ -394,6 +394,13 @@ smc_stop(sc); SMC_UNLOCK(sc); + if (sc->smc_ifp != NULL) { + ether_ifdetach(sc->smc_ifp); + } + + callout_drain(&sc->smc_watchdog); + callout_drain(&sc->smc_mii_tick_ch); + #ifdef DEVICE_POLLING if (sc->smc_ifp->if_capenable & IFCAP_POLLING) ether_poll_deregister(sc->smc_ifp); @@ -409,10 +416,8 @@ taskqueue_free(sc->smc_tq); sc->smc_tq = NULL; } - if (sc->smc_ifp != NULL) { - ether_ifdetach(sc->smc_ifp); if_free(sc->smc_ifp); } ==== //depot/projects/vimage/src/sys/fs/devfs/devfs_devs.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ * * From: FreeBSD: src/sys/miscfs/kernfs/kernfs_vfsops.c 1.36 * - * $FreeBSD: src/sys/fs/devfs/devfs_devs.c,v 1.53 2008/01/13 14:44:03 attilio Exp $ + * $FreeBSD: src/sys/fs/devfs/devfs_devs.c,v 1.54 2008/06/16 17:34:59 kib Exp $ */ #include "opt_mac.h" @@ -125,7 +125,6 @@ cdp->cdp_maxdirent = 0; cdev = &cdp->cdp_c; - cdev->si_priv = cdp; cdev->si_name = cdev->__si_namebuf; LIST_INIT(&cdev->si_children); @@ -137,7 +136,7 @@ { struct cdev_priv *cdp; - cdp = cdev->si_priv; + cdp = cdev2priv(cdev); if (cdev->si_cred != NULL) crfree(cdev->si_cred); if (cdp->cdp_inode > 0) @@ -510,7 +509,7 @@ struct cdev_priv *cdp; mtx_assert(&devmtx, MA_OWNED); - cdp = dev->si_priv; + cdp = cdev2priv(dev); cdp->cdp_flags |= CDP_ACTIVE; cdp->cdp_inode = alloc_unrl(devfs_inos); dev_refl(dev); @@ -524,7 +523,7 @@ struct cdev_priv *cdp; mtx_assert(&devmtx, MA_OWNED); - cdp = dev->si_priv; + cdp = cdev2priv(dev); cdp->cdp_flags &= ~CDP_ACTIVE; devfs_generation++; } ==== //depot/projects/vimage/src/sys/fs/devfs/devfs_int.h#4 (text+ko) ==== @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/devfs/devfs_int.h,v 1.5 2008/05/21 09:31:44 kib Exp $ + * $FreeBSD: src/sys/fs/devfs/devfs_int.h,v 1.6 2008/06/16 17:34:59 kib Exp $ */ /* @@ -68,6 +68,8 @@ LIST_HEAD(, cdev_privdata) cdp_fdpriv; }; +#define cdev2priv(c) member2struct(cdev_priv, cdp_c, c) + struct cdev *devfs_alloc(void); void devfs_free(struct cdev *); void devfs_create(struct cdev *dev); ==== //depot/projects/vimage/src/sys/fs/devfs/devfs_vnops.c#14 (text+ko) ==== @@ -31,7 +31,7 @@ * @(#)kernfs_vnops.c 8.15 (Berkeley) 5/21/95 * From: FreeBSD: src/sys/miscfs/kernfs/kernfs_vnops.c 1.43 * - * $FreeBSD: src/sys/fs/devfs/devfs_vnops.c,v 1.162 2008/06/05 09:15:47 kib Exp $ + * $FreeBSD: src/sys/fs/devfs/devfs_vnops.c,v 1.163 2008/06/16 17:34:59 kib Exp $ */ /* @@ -132,7 +132,7 @@ fp = curthread->td_fpop; if (fp == NULL) return (ENOENT); - cdp = ((struct cdev *)fp->f_data)->si_priv; + cdp = cdev2priv((struct cdev *)fp->f_data); p = malloc(sizeof(struct cdev_privdata), M_CDEVPDATA, M_WAITOK); p->cdpd_data = priv; p->cdpd_dtr = priv_dtr; @@ -541,7 +541,7 @@ fix(dev->si_ctime); vap->va_ctime = dev->si_ctime; - vap->va_rdev = dev->si_priv->cdp_inode; + vap->va_rdev = cdev2priv(dev)->cdp_inode; } vap->va_gen = 0; vap->va_flags = 0; @@ -742,7 +742,7 @@ } dev_lock(); - dde = &cdev->si_priv->cdp_dirents[dmp->dm_idx]; + dde = &cdev2priv(cdev)->cdp_dirents[dmp->dm_idx]; if (dde != NULL && *dde != NULL) de = *dde; dev_unlock(); @@ -1141,7 +1141,7 @@ KASSERT((ap->a_flags & REVOKEALL) != 0, ("devfs_revoke !REVOKEALL")); dev = vp->v_rdev; - cdp = dev->si_priv; + cdp = cdev2priv(dev); dev_lock(); cdp->cdp_inuse++; @@ -1419,7 +1419,7 @@ { if (x == NULL) return (NODEV); - return (x->si_priv->cdp_inode); + return (cdev2priv(x)->cdp_inode); } static struct fileops devfs_ops_f = { ==== //depot/projects/vimage/src/sys/fs/tmpfs/tmpfs_subr.c#8 (text+ko) ==== @@ -41,7 +41,7 @@ * Efficient memory file system supporting functions. */ #include -__FBSDID("$FreeBSD: src/sys/fs/tmpfs/tmpfs_subr.c,v 1.16 2008/02/25 18:45:56 attilio Exp $"); +__FBSDID("$FreeBSD: src/sys/fs/tmpfs/tmpfs_subr.c,v 1.17 2008/06/15 18:40:58 kib Exp $"); #include #include @@ -391,11 +391,8 @@ vnode_pager_setsize(vp, node->tn_size); error = insmntque(vp, mp); - if (error) { - vgone(vp); - vput(vp); + if (error) vp = NULL; - } unlock: TMPFS_NODE_LOCK(node); ==== //depot/projects/vimage/src/sys/geom/part/g_part.c#8 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002, 2005, 2006, 2007 Marcel Moolenaar + * Copyright (c) 2002, 2005-2008 Marcel Moolenaar * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/part/g_part.c,v 1.18 2008/04/23 20:13:05 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/part/g_part.c,v 1.19 2008/06/18 01:13:34 marcel Exp $"); #include #include @@ -121,7 +121,9 @@ G_PART_CTL_MOVE, G_PART_CTL_RECOVER, G_PART_CTL_RESIZE, - G_PART_CTL_UNDO + G_PART_CTL_SET, + G_PART_CTL_UNDO, + G_PART_CTL_UNSET }; /* @@ -954,6 +956,53 @@ } static int +g_part_ctl_setunset(struct gctl_req *req, struct g_part_parms *gpp, + unsigned int set) +{ + char buf[32]; + struct g_geom *gp; + struct g_part_entry *entry; + struct g_part_table *table; + struct sbuf *sb; + int error; + + gp = gpp->gpp_geom; + G_PART_TRACE((G_T_TOPOLOGY, "%s(%s)", __func__, gp->name)); + g_topology_assert(); + + table = gp->softc; + + LIST_FOREACH(entry, &table->gpt_entry, gpe_entry) { + if (entry->gpe_deleted || entry->gpe_internal) + continue; + if (entry->gpe_index == gpp->gpp_index) + break; + } + if (entry == NULL) { + gctl_error(req, "%d index '%d'", ENOENT, gpp->gpp_index); + return (ENOENT); + } + + error = G_PART_SETUNSET(table, entry, gpp->gpp_attrib, set); + if (error) { + gctl_error(req, "%d attrib '%s'", error, gpp->gpp_attrib); + return (error); + } + + /* Provide feedback if so requested. */ + if (gpp->gpp_parms & G_PART_PARM_OUTPUT) { + sb = sbuf_new(NULL, NULL, 0, SBUF_AUTOEXTEND); + sbuf_printf(sb, "%s%s has %s %sset\n", gp->name, + G_PART_NAME(table, entry, buf, sizeof(buf)), + gpp->gpp_attrib, (set) ? "" : "un"); + sbuf_finish(sb); + gctl_set_param(req, "output", sbuf_data(sb), sbuf_len(sb) + 1); + sbuf_delete(sb); + } + return (0); +} + +static int g_part_ctl_undo(struct gctl_req *req, struct g_part_parms *gpp) { struct g_consumer *cp; @@ -1129,11 +1178,22 @@ mparms |= G_PART_PARM_GEOM | G_PART_PARM_INDEX; } break; + case 's': + if (!strcmp(verb, "set")) { + ctlreq = G_PART_CTL_SET; + mparms |= G_PART_PARM_ATTRIB | G_PART_PARM_GEOM | + G_PART_PARM_INDEX; + } + break; case 'u': if (!strcmp(verb, "undo")) { ctlreq = G_PART_CTL_UNDO; mparms |= G_PART_PARM_GEOM; modifies = 0; + } else if (!strcmp(verb, "unset")) { + ctlreq = G_PART_CTL_UNSET; + mparms |= G_PART_PARM_ATTRIB | G_PART_PARM_GEOM | + G_PART_PARM_INDEX; } break; } @@ -1147,6 +1207,10 @@ ap = &req->arg[i]; parm = 0; switch (ap->name[0]) { + case 'a': + if (!strcmp(ap->name, "attrib")) + parm = G_PART_PARM_ATTRIB; + break; case 'b': if (!strcmp(ap->name, "bootcode")) parm = G_PART_PARM_BOOTCODE; @@ -1215,6 +1279,9 @@ return; } switch (parm) { + case G_PART_PARM_ATTRIB: + error = g_part_parm_str(p, &gpp.gpp_attrib); + break; case G_PART_PARM_BOOTCODE: gpp.gpp_codeptr = p; gpp.gpp_codesize = len; @@ -1328,9 +1395,15 @@ case G_PART_CTL_RESIZE: error = g_part_ctl_resize(req, &gpp); break; + case G_PART_CTL_SET: + error = g_part_ctl_setunset(req, &gpp, 1); + break; case G_PART_CTL_UNDO: error = g_part_ctl_undo(req, &gpp); break; + case G_PART_CTL_UNSET: + error = g_part_ctl_setunset(req, &gpp, 0); + break; } /* Implement automatic commit. */ ==== //depot/projects/vimage/src/sys/geom/part/g_part.h#7 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2006, 2007 Marcel Moolenaar + * Copyright (c) 2006-2008 Marcel Moolenaar * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/geom/part/g_part.h,v 1.9 2008/04/13 19:54:54 marcel Exp $ + * $FreeBSD: src/sys/geom/part/g_part.h,v 1.10 2008/06/18 01:13:34 marcel Exp $ */ #ifndef _GEOM_PART_H_ @@ -136,6 +136,7 @@ #define G_PART_PARM_TYPE 0x0400 #define G_PART_PARM_VERSION 0x0800 #define G_PART_PARM_BOOTCODE 0x1000 +#define G_PART_PARM_ATTRIB 0x2000 struct g_part_parms { unsigned int gpp_parms; @@ -152,6 +153,7 @@ unsigned int gpp_version; const void *gpp_codeptr; unsigned int gpp_codesize; + const char *gpp_attrib; }; void g_part_geometry_heads(off_t, u_int, off_t *, u_int *); ==== //depot/projects/vimage/src/sys/geom/part/g_part_if.m#3 (text+ko) ==== @@ -1,5 +1,5 @@ #- -# Copyright (c) 2006, 2007 Marcel Moolenaar +# Copyright (c) 2006-2008 Marcel Moolenaar # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -23,7 +23,7 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -# $FreeBSD: src/sys/geom/part/g_part_if.m,v 1.3 2008/04/13 19:54:54 marcel Exp $ +# $FreeBSD: src/sys/geom/part/g_part_if.m,v 1.4 2008/06/18 01:13:34 marcel Exp $ #include #include @@ -108,6 +108,14 @@ struct g_consumer *cp; }; +# setunset() - set or unset partition entry attributes. +METHOD int setunset { + struct g_part_table *table; + struct g_part_entry *entry; + const char *attrib; + unsigned int set; +}; + # type() - return a string representation of the partition type. # Preferrably, the alias names. METHOD const char * type { ==== //depot/projects/vimage/src/sys/geom/part/g_part_mbr.c#4 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2007 Marcel Moolenaar + * Copyright (c) 2007, 2008 Marcel Moolenaar * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/part/g_part_mbr.c,v 1.8 2008/06/12 05:56:03 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/part/g_part_mbr.c,v 1.9 2008/06/18 01:13:34 marcel Exp $"); #include #include @@ -71,6 +71,8 @@ char *, size_t); static int g_part_mbr_probe(struct g_part_table *, struct g_consumer *); static int g_part_mbr_read(struct g_part_table *, struct g_consumer *); +static int g_part_mbr_setunset(struct g_part_table *, struct g_part_entry *, + const char *, unsigned int); static const char *g_part_mbr_type(struct g_part_table *, struct g_part_entry *, char *, size_t); static int g_part_mbr_write(struct g_part_table *, struct g_consumer *); @@ -86,6 +88,7 @@ KOBJMETHOD(g_part_name, g_part_mbr_name), KOBJMETHOD(g_part_probe, g_part_mbr_probe), KOBJMETHOD(g_part_read, g_part_mbr_read), + KOBJMETHOD(g_part_setunset, g_part_mbr_setunset), KOBJMETHOD(g_part_type, g_part_mbr_type), KOBJMETHOD(g_part_write, g_part_mbr_write), { 0, 0 } @@ -262,6 +265,8 @@ /* confxml: partition entry information */ sbuf_printf(sb, "%s%u\n", indent, entry->ent.dp_typ); + if (entry->ent.dp_flag & 0x80) + sbuf_printf(sb, "%sactive\n", indent); } else { /* confxml: scheme information */ } @@ -420,6 +425,43 @@ return (0); } +static int +g_part_mbr_setunset(struct g_part_table *table, struct g_part_entry *baseentry, + const char *attrib, unsigned int set) +{ + struct g_part_entry *iter; + struct g_part_mbr_entry *entry; + int changed; + + if (strcasecmp(attrib, "active") != 0) + return (EINVAL); + + /* Only one entry can have the active attribute. */ + LIST_FOREACH(iter, &table->gpt_entry, gpe_entry) { + if (iter->gpe_deleted) + continue; + changed = 0; + entry = (struct g_part_mbr_entry *)iter; + if (iter == baseentry) { + if (set && (entry->ent.dp_flag & 0x80) == 0) { + entry->ent.dp_flag |= 0x80; + changed = 1; + } else if (!set && (entry->ent.dp_flag & 0x80)) { + entry->ent.dp_flag &= ~0x80; + changed = 1; + } + } else { + if (set && (entry->ent.dp_flag & 0x80)) { + entry->ent.dp_flag &= ~0x80; + changed = 1; + } + } + if (changed && !iter->gpe_created) + iter->gpe_modified = 1; + } + return (0); +} + static const char * g_part_mbr_type(struct g_part_table *basetable, struct g_part_entry *baseentry, char *buf, size_t bufsz) ==== //depot/projects/vimage/src/sys/kern/kern_conf.c#13 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_conf.c,v 1.217 2008/06/12 08:30:54 ed Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_conf.c,v 1.218 2008/06/16 17:34:59 kib Exp $"); #include #include @@ -115,7 +115,7 @@ struct cdev_priv *cdp; mtx_assert(&devmtx, MA_OWNED); - cdp = cdev->si_priv; + cdp = cdev2priv(cdev); TAILQ_INSERT_HEAD(&cdevp_free_list, cdp, cdp_list); } @@ -187,7 +187,7 @@ dev_lock(); csw = dev->si_devsw; if (csw != NULL) { - cdp = dev->si_priv; + cdp = cdev2priv(dev); if ((cdp->cdp_flags & CDP_SCHED_DTR) == 0) dev->si_threadcount++; else @@ -208,7 +208,7 @@ dev_lock(); *devp = vp->v_rdev; if (*devp != NULL) { - cdp = (*devp)->si_priv; + cdp = cdev2priv(*devp); if ((cdp->cdp_flags & CDP_SCHED_DTR) == 0) { csw = (*devp)->si_devsw; if (csw != NULL) @@ -851,7 +851,7 @@ dev_unlock(); notify_destroy(dev); mtx_lock(&cdevpriv_mtx); - LIST_FOREACH_SAFE(p, &dev->si_priv->cdp_fdpriv, cdpd_list, p1) { + LIST_FOREACH_SAFE(p, &cdev2priv(dev)->cdp_fdpriv, cdpd_list, p1) { devfs_destroy_cdevpriv(p); mtx_lock(&cdevpriv_mtx); } @@ -1071,7 +1071,7 @@ KASSERT(dev->si_flags & SI_CLONELIST, ("Dev %p(%s) should be on clonelist", dev, dev->si_name)); dev->si_flags &= ~SI_CLONELIST; - cp = dev->si_priv; + cp = cdev2priv(dev); if (!(cp->cdp_flags & CDP_SCHED_DTR)) { cp->cdp_flags |= CDP_SCHED_DTR; KASSERT(dev->si_flags & SI_NAMED, @@ -1125,7 +1125,7 @@ struct cdev_priv *cp; mtx_assert(&devmtx, MA_OWNED); - cp = dev->si_priv; + cp = cdev2priv(dev); if (cp->cdp_flags & CDP_SCHED_DTR) { dev_unlock(); return (0); ==== //depot/projects/vimage/src/sys/kern/kern_dtrace.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_dtrace.c,v 1.1 2008/05/18 19:43:52 jb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_dtrace.c,v 1.2 2008/06/16 04:44:29 jb Exp $"); #include "opt_kdb.h" @@ -106,15 +106,3 @@ } SYSINIT(kdtrace, SI_SUB_KDTRACE, SI_ORDER_FIRST, init_dtrace, NULL); - -#ifndef KDB -/* - * This is a stub for the kernel debugger for the DTrace actions to call - * when the kernel has been built without KDB. - */ -void -kdb_enter(const char *why, const char *msg) -{ - printf("Cannot enter kernel debugger - No KDB in kernel.\n%s - %s\n", why, msg); -} -#endif ==== //depot/projects/vimage/src/sys/netinet/sctp_pcb.c#26 (text+ko) ==== @@ -31,7 +31,7 @@ /* $KAME: sctp_pcb.c,v 1.38 2005/03/06 16:04:18 itojun Exp $ */ #include -__FBSDID("$FreeBSD: src/sys/netinet/sctp_pcb.c,v 1.69 2008/06/14 07:58:05 rrs Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/sctp_pcb.c,v 1.70 2008/06/15 12:31:23 rrs Exp $"); #include #include @@ -5330,6 +5330,7 @@ #if defined(SCTP_USE_THREAD_BASED_ITERATOR) SCTP_BASE_INFO(iterator_running) = 0; + SCTP_BASE_INFO(threads_must_exit) = 0; sctp_startup_iterator(); #endif @@ -5357,6 +5358,11 @@ int i; /* FIXME MT */ + SCTP_BASE_INFO(threads_must_exit) = 1; +#if defined(SCTP_USE_THREAD_BASED_ITERATOR) + /* Wake the thread up so it will exit now */ + sctp_wakeup_iterator(); +#endif /* * free the vrf/ifn/ifa lists and hashes (be sure address monitor is * destroyed first). @@ -5428,6 +5434,16 @@ SCTP_ZONE_DESTROY(SCTP_BASE_INFO(ipi_zone_strmoq)); SCTP_ZONE_DESTROY(SCTP_BASE_INFO(ipi_zone_asconf)); SCTP_ZONE_DESTROY(SCTP_BASE_INFO(ipi_zone_asconf_ack)); + /* Get rid of other stuff to */ + if (SCTP_BASE_INFO(sctp_asochash) != NULL) + SCTP_HASH_FREE(SCTP_BASE_INFO(sctp_asochash), SCTP_BASE_INFO(hashasocmark)); + if (SCTP_BASE_INFO(sctp_ephash) != NULL) + SCTP_HASH_FREE(SCTP_BASE_INFO(sctp_ephash), SCTP_BASE_INFO(hashmark)); + if (SCTP_BASE_INFO(sctp_tcpephash) != NULL) + SCTP_HASH_FREE(SCTP_BASE_INFO(sctp_tcpephash), SCTP_BASE_INFO(hashtcpmark)); + if (SCTP_BASE_INFO(sctp_restarthash) != NULL) + SCTP_HASH_FREE(SCTP_BASE_INFO(sctp_restarthash), SCTP_BASE_INFO(hashrestartmark)); + } ==== //depot/projects/vimage/src/sys/netinet/sctp_pcb.h#18 (text+ko) ==== @@ -31,7 +31,7 @@ /* $KAME: sctp_pcb.h,v 1.21 2005/07/16 01:18:47 suz Exp $ */ #include -__FBSDID("$FreeBSD: src/sys/netinet/sctp_pcb.h,v 1.35 2008/06/14 07:58:05 rrs Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/sctp_pcb.h,v 1.36 2008/06/15 12:31:23 rrs Exp $"); #ifndef __sctp_pcb_h__ #define __sctp_pcb_h__ @@ -177,7 +177,7 @@ struct sctpladdr addr_wq; struct sctpiterators iteratorhead; - + int threads_must_exit; /* ep zone info */ sctp_zone_t ipi_zone_ep; sctp_zone_t ipi_zone_asoc; ==== //depot/projects/vimage/src/sys/netinet/sctp_usrreq.c#27 (text+ko) ==== @@ -31,7 +31,7 @@ /* $KAME: sctp_usrreq.c,v 1.48 2005/03/07 23:26:08 itojun Exp $ */ #include -__FBSDID("$FreeBSD: src/sys/netinet/sctp_usrreq.c,v 1.56 2008/06/14 07:58:05 rrs Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/sctp_usrreq.c,v 1.57 2008/06/15 12:31:23 rrs Exp $"); #include #include #include @@ -98,23 +98,6 @@ sctp_pcb_finish(); } -/* - * cleanup of the SCTP_BASE_INFO() structure. - * Assumes that the SCTP_BASE_INFO() lock is held. - */ -void -sctp_pcbinfo_cleanup(void) -{ - /* free the hash tables */ - if (SCTP_BASE_INFO(sctp_asochash) != NULL) - SCTP_HASH_FREE(SCTP_BASE_INFO(sctp_asochash), SCTP_BASE_INFO(hashasocmark)); - if (SCTP_BASE_INFO(sctp_ephash) != NULL) - SCTP_HASH_FREE(SCTP_BASE_INFO(sctp_ephash), SCTP_BASE_INFO(hashmark)); - if (SCTP_BASE_INFO(sctp_tcpephash) != NULL) - SCTP_HASH_FREE(SCTP_BASE_INFO(sctp_tcpephash), SCTP_BASE_INFO(hashtcpmark)); - if (SCTP_BASE_INFO(sctp_restarthash) != NULL) - SCTP_HASH_FREE(SCTP_BASE_INFO(sctp_restarthash), SCTP_BASE_INFO(hashrestartmark)); -} void ==== //depot/projects/vimage/src/sys/netinet/sctp_var.h#18 (text+ko) ==== @@ -31,7 +31,7 @@ /* $KAME: sctp_var.h,v 1.24 2005/03/06 16:04:19 itojun Exp $ */ #include -__FBSDID("$FreeBSD: src/sys/netinet/sctp_var.h,v 1.25 2008/06/14 07:58:05 rrs Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/sctp_var.h,v 1.26 2008/06/15 12:31:23 rrs Exp $"); #ifndef _NETINET_SCTP_VAR_H_ #define _NETINET_SCTP_VAR_H_ @@ -308,7 +308,6 @@ void sctp_finish(void); -void sctp_pcbinfo_cleanup(void); int sctp_flush(struct socket *, int); int sctp_shutdown __P((struct socket *)); void sctp_notify ==== //depot/projects/vimage/src/sys/netinet/tcp_syncache.c#27 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netinet/tcp_syncache.c,v 1.145 2008/05/09 23:02:58 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/tcp_syncache.c,v 1.147 2008/06/16 20:08:22 ups Exp $"); #include "opt_inet.h" #include "opt_inet6.h" @@ -887,11 +887,14 @@ goto failed; } /* - * The SEQ must match the received initial receive sequence - * number + 1 (the SYN) because we didn't ACK any data that - * may have come with the SYN. + * The SEQ must fall in the window starting a the received initial receive + * sequence number + 1 (the SYN). */ - if (th->th_seq != sc->sc_irs + 1 && !TOEPCB_ISSET(sc)) { + + if ((SEQ_LEQ(th->th_seq, sc->sc_irs) || + SEQ_GT(th->th_seq, sc->sc_irs + sc->sc_wnd )) && + !TOEPCB_ISSET(sc)) + { if ((s = tcp_log_addrs(inc, th, NULL, NULL))) log(LOG_DEBUG, "%s; %s: SEQ %u != IRS+1 %u, segment " "rejected\n", s, __func__, th->th_seq, sc->sc_irs); @@ -1602,7 +1605,7 @@ * The secret wasn't updated for the lifetime of a syncookie, * so this SYN-ACK/ACK is either too old (replay) or totally bogus. */ - if (sch->sch_reseed < time_uptime) { + if (sch->sch_reseed + SYNCOOKIE_LIFETIME < time_uptime) { return (NULL); } ==== //depot/projects/vimage/src/sys/pci/if_rl.c#9 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/pci/if_rl.c,v 1.174 2008/04/10 01:06:05 yongari Exp $"); +__FBSDID("$FreeBSD: src/sys/pci/if_rl.c,v 1.175 2008/06/16 18:32:20 remko Exp $"); /* * RealTek 8129/8139 PCI NIC driver @@ -144,6 +144,8 @@ "RealTek 8129 10/100BaseTX" }, { RT_VENDORID, RT_DEVICEID_8139, RL_8139, "RealTek 8139 10/100BaseTX" }, + { RT_VENDORID, RT_DEVICEID_8139D, RL_8139, + "RealTek 8139 10/100BaseTX" }, { RT_VENDORID, RT_DEVICEID_8138, RL_8139, "RealTek 8139 10/100BaseTX CardBus" }, { RT_VENDORID, RT_DEVICEID_8100, RL_8139, ==== //depot/projects/vimage/src/sys/pci/if_rlreg.h#11 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/pci/if_rlreg.h,v 1.74 2008/03/31 04:03:14 yongari Exp $ + * $FreeBSD: src/sys/pci/if_rlreg.h,v 1.75 2008/06/16 18:32:20 remko Exp $ */ /* @@ -862,6 +862,7 @@ /* * RealTek chip device IDs. */ +#define RT_DEVICEID_8139D 0x8039 #define RT_DEVICEID_8129 0x8129 #define RT_DEVICEID_8101E 0x8136 #define RT_DEVICEID_8138 0x8138 ==== //depot/projects/vimage/src/sys/pci/nfsmb.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/pci/nfsmb.c,v 1.9 2008/06/06 18:29:56 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/pci/nfsmb.c,v 1.10 2008/06/18 20:39:56 joerg Exp $"); #include #include @@ -64,6 +64,7 @@ #define NFSMB_DEVICEID_NF4_51_SMB 0x0264 #define NFSMB_DEVICEID_NF4_55_SMB 0x0368 #define NFSMB_DEVICEID_NF4_61_SMB 0x03eb +#define NFSMB_DEVICEID_NF4_65_SMB 0x0446 /* PCI Configuration space registers */ #define NF2PCI_SMBASE_1 PCIR_BAR(4) @@ -156,6 +157,7 @@ case NFSMB_DEVICEID_NF4_51_SMB: case NFSMB_DEVICEID_NF4_55_SMB: case NFSMB_DEVICEID_NF4_61_SMB: + case NFSMB_DEVICEID_NF4_65_SMB: device_set_desc(dev, "nForce2/3/4 MCP SMBus Controller"); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jun 18 21:29:07 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9CBDF1065670; Wed, 18 Jun 2008 21:29:07 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5BA07106564A for ; Wed, 18 Jun 2008 21:29:07 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 445018FC1D for ; Wed, 18 Jun 2008 21:29:07 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5ILT7CS022217 for ; Wed, 18 Jun 2008 21:29:07 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5ILT7pV022215 for perforce@freebsd.org; Wed, 18 Jun 2008 21:29:07 GMT (envelope-from julian@freebsd.org) Date: Wed, 18 Jun 2008 21:29:07 GMT Message-Id: <200806182129.m5ILT7pV022215@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 143719 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Jun 2008 21:29:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=143719 Change 143719 by julian@julian_trafmon1 on 2008/06/18 21:28:59 IFC@143713 Affected files ... .. //depot/projects/vimage-devel/src/sys/boot/i386/libi386/time.c#2 integrate .. //depot/projects/vimage-devel/src/sys/compat/ndis/subr_ntoskrnl.c#2 integrate .. //depot/projects/vimage-devel/src/sys/ddb/db_ps.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/smc/if_smc.c#3 integrate .. //depot/projects/vimage-devel/src/sys/fs/devfs/devfs_devs.c#2 integrate .. //depot/projects/vimage-devel/src/sys/fs/devfs/devfs_int.h#2 integrate .. //depot/projects/vimage-devel/src/sys/fs/devfs/devfs_vnops.c#2 integrate .. //depot/projects/vimage-devel/src/sys/fs/tmpfs/tmpfs_subr.c#2 integrate .. //depot/projects/vimage-devel/src/sys/geom/part/g_part.c#2 integrate .. //depot/projects/vimage-devel/src/sys/geom/part/g_part.h#2 integrate .. //depot/projects/vimage-devel/src/sys/geom/part/g_part_if.m#2 integrate .. //depot/projects/vimage-devel/src/sys/geom/part/g_part_mbr.c#3 integrate .. //depot/projects/vimage-devel/src/sys/kern/kern_conf.c#3 integrate .. //depot/projects/vimage-devel/src/sys/kern/kern_dtrace.c#2 integrate .. //depot/projects/vimage-devel/src/sys/netinet/sctp_pcb.c#3 integrate .. //depot/projects/vimage-devel/src/sys/netinet/sctp_pcb.h#3 integrate .. //depot/projects/vimage-devel/src/sys/netinet/sctp_usrreq.c#3 integrate .. //depot/projects/vimage-devel/src/sys/netinet/sctp_var.h#3 integrate .. //depot/projects/vimage-devel/src/sys/netinet/tcp_syncache.c#3 integrate .. //depot/projects/vimage-devel/src/sys/pci/if_rl.c#2 integrate .. //depot/projects/vimage-devel/src/sys/pci/if_rlreg.h#2 integrate .. //depot/projects/vimage-devel/src/sys/pci/nfsmb.c#2 integrate .. //depot/projects/vimage-devel/src/sys/sys/conf.h#3 integrate .. //depot/projects/vimage-devel/src/sys/sys/param.h#3 integrate Differences ... ==== //depot/projects/vimage-devel/src/sys/boot/i386/libi386/time.c#2 (text+ko) ==== @@ -25,25 +25,23 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/time.c,v 1.5 2003/08/25 23:28:31 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/time.c,v 1.6 2008/06/16 17:04:04 olli Exp $"); #include #include #include "bootstrap.h" #include "libi386.h" +static int bios_seconds(void); + /* - * Return the time in seconds since the beginning of the day. + * Return the BIOS time-of-day value. * - * If we pass midnight, don't wrap back to 0. - * * XXX uses undocumented BCD support from libstand. */ - -time_t -time(time_t *t) +static int +bios_seconds(void) { - static time_t lasttime, now; int hr, minute, sec; v86.ctl = 0; @@ -55,7 +53,33 @@ minute = bcd2bin(v86.ecx & 0xff); /* minute in %cl */ sec = bcd2bin((v86.edx & 0xff00) >> 8); /* second in %dh */ - now = hr * 3600 + minute * 60 + sec; + return (hr * 3600 + minute * 60 + sec); +} + +/* + * Return the time in seconds since the beginning of the day. + * + * Some BIOSes (notably qemu) don't correctly read the RTC + * registers in an atomic way, sometimes returning bogus values. + * Therefore we "debounce" the reading by accepting it only when + * we got two identical values in succession. + * + * If we pass midnight, don't wrap back to 0. + */ +time_t +time(time_t *t) +{ + static time_t lasttime; + time_t now, check; + int try; + + try = 0; + check = bios_seconds(); + do { + now = check; + check = bios_seconds(); + } while (now != check && ++try < 1000); + if (now < lasttime) now += 24 * 3600; lasttime = now; ==== //depot/projects/vimage-devel/src/sys/compat/ndis/subr_ntoskrnl.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.95 2008/05/30 06:31:55 weongyo Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.96 2008/06/15 13:37:29 cokane Exp $"); #include #include @@ -225,6 +225,8 @@ static ndis_status PsCreateSystemThread(ndis_handle *, uint32_t, void *, ndis_handle, void *, void *, void *); static ndis_status PsTerminateSystemThread(ndis_status); +static ndis_status IoGetDeviceObjectPointer(unicode_string *, + uint32_t, void *, device_object *); static ndis_status IoGetDeviceProperty(device_object *, uint32_t, uint32_t, void *, uint32_t *); static void KeInitializeMutex(kmutant *, uint32_t); @@ -3235,6 +3237,16 @@ } static ndis_status +IoGetDeviceObjectPointer(name, reqaccess, fileobj, devobj) + unicode_string *name; + uint32_t reqaccess; + void *fileobj; + device_object *devobj; +{ + return(STATUS_SUCCESS); +} + +static ndis_status IoGetDeviceProperty(devobj, regprop, buflen, prop, reslen) device_object *devobj; uint32_t regprop; @@ -4391,6 +4403,7 @@ IMPORT_SFUNC(MmUnmapIoSpace, 2), IMPORT_SFUNC(KeInitializeSpinLock, 1), IMPORT_SFUNC(IoIsWdmVersionAvailable, 2), + IMPORT_SFUNC(IoGetDeviceObjectPointer, 4), IMPORT_SFUNC(IoGetDeviceProperty, 5), IMPORT_SFUNC(IoAllocateWorkItem, 1), IMPORT_SFUNC(IoFreeWorkItem, 1), ==== //depot/projects/vimage-devel/src/sys/ddb/db_ps.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ddb/db_ps.c,v 1.68 2008/03/25 20:36:32 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/ddb/db_ps.c,v 1.69 2008/06/18 20:42:01 attilio Exp $"); #include #include @@ -292,6 +292,7 @@ DB_SHOW_COMMAND(thread, db_show_thread) { struct thread *td; + struct lock_object *lock; boolean_t comma; /* Determine which thread to examine. */ @@ -299,6 +300,7 @@ td = db_lookup_thread(addr, FALSE); else td = kdb_thread; + lock = (struct lock_object *)td->td_lock; db_printf("Thread %d at %p:\n", td->td_tid, td); db_printf(" proc (pid %d): %p\n", td->td_proc->p_pid, td->td_proc); @@ -365,6 +367,7 @@ db_printf(" wmesg: %s wchan: %p\n", td->td_wmesg, td->td_wchan); db_printf(" priority: %d\n", td->td_priority); + db_printf(" container lock: %s (%p)\n", lock->lo_name, lock); } DB_SHOW_COMMAND(proc, db_show_proc) ==== //depot/projects/vimage-devel/src/sys/dev/smc/if_smc.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/smc/if_smc.c,v 1.5 2008/06/13 00:48:09 benno Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/smc/if_smc.c,v 1.6 2008/06/17 05:48:42 benno Exp $"); /* * Driver for SMSC LAN91C111, may work for older variants. @@ -394,6 +394,13 @@ smc_stop(sc); SMC_UNLOCK(sc); + if (sc->smc_ifp != NULL) { + ether_ifdetach(sc->smc_ifp); + } + + callout_drain(&sc->smc_watchdog); + callout_drain(&sc->smc_mii_tick_ch); + #ifdef DEVICE_POLLING if (sc->smc_ifp->if_capenable & IFCAP_POLLING) ether_poll_deregister(sc->smc_ifp); @@ -409,10 +416,8 @@ taskqueue_free(sc->smc_tq); sc->smc_tq = NULL; } - if (sc->smc_ifp != NULL) { - ether_ifdetach(sc->smc_ifp); if_free(sc->smc_ifp); } ==== //depot/projects/vimage-devel/src/sys/fs/devfs/devfs_devs.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ * * From: FreeBSD: src/sys/miscfs/kernfs/kernfs_vfsops.c 1.36 * - * $FreeBSD: src/sys/fs/devfs/devfs_devs.c,v 1.53 2008/01/13 14:44:03 attilio Exp $ + * $FreeBSD: src/sys/fs/devfs/devfs_devs.c,v 1.54 2008/06/16 17:34:59 kib Exp $ */ #include "opt_mac.h" @@ -125,7 +125,6 @@ cdp->cdp_maxdirent = 0; cdev = &cdp->cdp_c; - cdev->si_priv = cdp; cdev->si_name = cdev->__si_namebuf; LIST_INIT(&cdev->si_children); @@ -137,7 +136,7 @@ { struct cdev_priv *cdp; - cdp = cdev->si_priv; + cdp = cdev2priv(cdev); if (cdev->si_cred != NULL) crfree(cdev->si_cred); if (cdp->cdp_inode > 0) @@ -510,7 +509,7 @@ struct cdev_priv *cdp; mtx_assert(&devmtx, MA_OWNED); - cdp = dev->si_priv; + cdp = cdev2priv(dev); cdp->cdp_flags |= CDP_ACTIVE; cdp->cdp_inode = alloc_unrl(devfs_inos); dev_refl(dev); @@ -524,7 +523,7 @@ struct cdev_priv *cdp; mtx_assert(&devmtx, MA_OWNED); - cdp = dev->si_priv; + cdp = cdev2priv(dev); cdp->cdp_flags &= ~CDP_ACTIVE; devfs_generation++; } ==== //depot/projects/vimage-devel/src/sys/fs/devfs/devfs_int.h#2 (text+ko) ==== @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/devfs/devfs_int.h,v 1.5 2008/05/21 09:31:44 kib Exp $ + * $FreeBSD: src/sys/fs/devfs/devfs_int.h,v 1.6 2008/06/16 17:34:59 kib Exp $ */ /* @@ -68,6 +68,8 @@ LIST_HEAD(, cdev_privdata) cdp_fdpriv; }; +#define cdev2priv(c) member2struct(cdev_priv, cdp_c, c) + struct cdev *devfs_alloc(void); void devfs_free(struct cdev *); void devfs_create(struct cdev *dev); ==== //depot/projects/vimage-devel/src/sys/fs/devfs/devfs_vnops.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ * @(#)kernfs_vnops.c 8.15 (Berkeley) 5/21/95 * From: FreeBSD: src/sys/miscfs/kernfs/kernfs_vnops.c 1.43 * - * $FreeBSD: src/sys/fs/devfs/devfs_vnops.c,v 1.162 2008/06/05 09:15:47 kib Exp $ + * $FreeBSD: src/sys/fs/devfs/devfs_vnops.c,v 1.163 2008/06/16 17:34:59 kib Exp $ */ /* @@ -132,7 +132,7 @@ fp = curthread->td_fpop; if (fp == NULL) return (ENOENT); - cdp = ((struct cdev *)fp->f_data)->si_priv; + cdp = cdev2priv((struct cdev *)fp->f_data); p = malloc(sizeof(struct cdev_privdata), M_CDEVPDATA, M_WAITOK); p->cdpd_data = priv; p->cdpd_dtr = priv_dtr; @@ -541,7 +541,7 @@ fix(dev->si_ctime); vap->va_ctime = dev->si_ctime; - vap->va_rdev = dev->si_priv->cdp_inode; + vap->va_rdev = cdev2priv(dev)->cdp_inode; } vap->va_gen = 0; vap->va_flags = 0; @@ -742,7 +742,7 @@ } dev_lock(); - dde = &cdev->si_priv->cdp_dirents[dmp->dm_idx]; + dde = &cdev2priv(cdev)->cdp_dirents[dmp->dm_idx]; if (dde != NULL && *dde != NULL) de = *dde; dev_unlock(); @@ -1141,7 +1141,7 @@ KASSERT((ap->a_flags & REVOKEALL) != 0, ("devfs_revoke !REVOKEALL")); dev = vp->v_rdev; - cdp = dev->si_priv; + cdp = cdev2priv(dev); dev_lock(); cdp->cdp_inuse++; @@ -1419,7 +1419,7 @@ { if (x == NULL) return (NODEV); - return (x->si_priv->cdp_inode); + return (cdev2priv(x)->cdp_inode); } static struct fileops devfs_ops_f = { ==== //depot/projects/vimage-devel/src/sys/fs/tmpfs/tmpfs_subr.c#2 (text+ko) ==== @@ -41,7 +41,7 @@ * Efficient memory file system supporting functions. */ #include -__FBSDID("$FreeBSD: src/sys/fs/tmpfs/tmpfs_subr.c,v 1.16 2008/02/25 18:45:56 attilio Exp $"); +__FBSDID("$FreeBSD: src/sys/fs/tmpfs/tmpfs_subr.c,v 1.17 2008/06/15 18:40:58 kib Exp $"); #include #include @@ -391,11 +391,8 @@ vnode_pager_setsize(vp, node->tn_size); error = insmntque(vp, mp); - if (error) { - vgone(vp); - vput(vp); + if (error) vp = NULL; - } unlock: TMPFS_NODE_LOCK(node); ==== //depot/projects/vimage-devel/src/sys/geom/part/g_part.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002, 2005, 2006, 2007 Marcel Moolenaar + * Copyright (c) 2002, 2005-2008 Marcel Moolenaar * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/part/g_part.c,v 1.18 2008/04/23 20:13:05 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/part/g_part.c,v 1.19 2008/06/18 01:13:34 marcel Exp $"); #include #include @@ -121,7 +121,9 @@ G_PART_CTL_MOVE, G_PART_CTL_RECOVER, G_PART_CTL_RESIZE, - G_PART_CTL_UNDO + G_PART_CTL_SET, + G_PART_CTL_UNDO, + G_PART_CTL_UNSET }; /* @@ -954,6 +956,53 @@ } static int +g_part_ctl_setunset(struct gctl_req *req, struct g_part_parms *gpp, + unsigned int set) +{ + char buf[32]; + struct g_geom *gp; + struct g_part_entry *entry; + struct g_part_table *table; + struct sbuf *sb; + int error; + + gp = gpp->gpp_geom; + G_PART_TRACE((G_T_TOPOLOGY, "%s(%s)", __func__, gp->name)); + g_topology_assert(); + + table = gp->softc; + + LIST_FOREACH(entry, &table->gpt_entry, gpe_entry) { + if (entry->gpe_deleted || entry->gpe_internal) + continue; + if (entry->gpe_index == gpp->gpp_index) + break; + } + if (entry == NULL) { + gctl_error(req, "%d index '%d'", ENOENT, gpp->gpp_index); + return (ENOENT); + } + + error = G_PART_SETUNSET(table, entry, gpp->gpp_attrib, set); + if (error) { + gctl_error(req, "%d attrib '%s'", error, gpp->gpp_attrib); + return (error); + } + + /* Provide feedback if so requested. */ + if (gpp->gpp_parms & G_PART_PARM_OUTPUT) { + sb = sbuf_new(NULL, NULL, 0, SBUF_AUTOEXTEND); + sbuf_printf(sb, "%s%s has %s %sset\n", gp->name, + G_PART_NAME(table, entry, buf, sizeof(buf)), + gpp->gpp_attrib, (set) ? "" : "un"); + sbuf_finish(sb); + gctl_set_param(req, "output", sbuf_data(sb), sbuf_len(sb) + 1); + sbuf_delete(sb); + } + return (0); +} + +static int g_part_ctl_undo(struct gctl_req *req, struct g_part_parms *gpp) { struct g_consumer *cp; @@ -1129,11 +1178,22 @@ mparms |= G_PART_PARM_GEOM | G_PART_PARM_INDEX; } break; + case 's': + if (!strcmp(verb, "set")) { + ctlreq = G_PART_CTL_SET; + mparms |= G_PART_PARM_ATTRIB | G_PART_PARM_GEOM | + G_PART_PARM_INDEX; + } + break; case 'u': if (!strcmp(verb, "undo")) { ctlreq = G_PART_CTL_UNDO; mparms |= G_PART_PARM_GEOM; modifies = 0; + } else if (!strcmp(verb, "unset")) { + ctlreq = G_PART_CTL_UNSET; + mparms |= G_PART_PARM_ATTRIB | G_PART_PARM_GEOM | + G_PART_PARM_INDEX; } break; } @@ -1147,6 +1207,10 @@ ap = &req->arg[i]; parm = 0; switch (ap->name[0]) { + case 'a': + if (!strcmp(ap->name, "attrib")) + parm = G_PART_PARM_ATTRIB; + break; case 'b': if (!strcmp(ap->name, "bootcode")) parm = G_PART_PARM_BOOTCODE; @@ -1215,6 +1279,9 @@ return; } switch (parm) { + case G_PART_PARM_ATTRIB: + error = g_part_parm_str(p, &gpp.gpp_attrib); + break; case G_PART_PARM_BOOTCODE: gpp.gpp_codeptr = p; gpp.gpp_codesize = len; @@ -1328,9 +1395,15 @@ case G_PART_CTL_RESIZE: error = g_part_ctl_resize(req, &gpp); break; + case G_PART_CTL_SET: + error = g_part_ctl_setunset(req, &gpp, 1); + break; case G_PART_CTL_UNDO: error = g_part_ctl_undo(req, &gpp); break; + case G_PART_CTL_UNSET: + error = g_part_ctl_setunset(req, &gpp, 0); + break; } /* Implement automatic commit. */ ==== //depot/projects/vimage-devel/src/sys/geom/part/g_part.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2006, 2007 Marcel Moolenaar + * Copyright (c) 2006-2008 Marcel Moolenaar * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/geom/part/g_part.h,v 1.9 2008/04/13 19:54:54 marcel Exp $ + * $FreeBSD: src/sys/geom/part/g_part.h,v 1.10 2008/06/18 01:13:34 marcel Exp $ */ #ifndef _GEOM_PART_H_ @@ -136,6 +136,7 @@ #define G_PART_PARM_TYPE 0x0400 #define G_PART_PARM_VERSION 0x0800 #define G_PART_PARM_BOOTCODE 0x1000 +#define G_PART_PARM_ATTRIB 0x2000 struct g_part_parms { unsigned int gpp_parms; @@ -152,6 +153,7 @@ unsigned int gpp_version; const void *gpp_codeptr; unsigned int gpp_codesize; + const char *gpp_attrib; }; void g_part_geometry_heads(off_t, u_int, off_t *, u_int *); ==== //depot/projects/vimage-devel/src/sys/geom/part/g_part_if.m#2 (text+ko) ==== @@ -1,5 +1,5 @@ #- -# Copyright (c) 2006, 2007 Marcel Moolenaar +# Copyright (c) 2006-2008 Marcel Moolenaar # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -23,7 +23,7 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -# $FreeBSD: src/sys/geom/part/g_part_if.m,v 1.3 2008/04/13 19:54:54 marcel Exp $ +# $FreeBSD: src/sys/geom/part/g_part_if.m,v 1.4 2008/06/18 01:13:34 marcel Exp $ #include #include @@ -108,6 +108,14 @@ struct g_consumer *cp; }; +# setunset() - set or unset partition entry attributes. +METHOD int setunset { + struct g_part_table *table; + struct g_part_entry *entry; + const char *attrib; + unsigned int set; +}; + # type() - return a string representation of the partition type. # Preferrably, the alias names. METHOD const char * type { ==== //depot/projects/vimage-devel/src/sys/geom/part/g_part_mbr.c#3 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2007 Marcel Moolenaar + * Copyright (c) 2007, 2008 Marcel Moolenaar * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/part/g_part_mbr.c,v 1.8 2008/06/12 05:56:03 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/part/g_part_mbr.c,v 1.9 2008/06/18 01:13:34 marcel Exp $"); #include #include @@ -71,6 +71,8 @@ char *, size_t); static int g_part_mbr_probe(struct g_part_table *, struct g_consumer *); static int g_part_mbr_read(struct g_part_table *, struct g_consumer *); +static int g_part_mbr_setunset(struct g_part_table *, struct g_part_entry *, + const char *, unsigned int); static const char *g_part_mbr_type(struct g_part_table *, struct g_part_entry *, char *, size_t); static int g_part_mbr_write(struct g_part_table *, struct g_consumer *); @@ -86,6 +88,7 @@ KOBJMETHOD(g_part_name, g_part_mbr_name), KOBJMETHOD(g_part_probe, g_part_mbr_probe), KOBJMETHOD(g_part_read, g_part_mbr_read), + KOBJMETHOD(g_part_setunset, g_part_mbr_setunset), KOBJMETHOD(g_part_type, g_part_mbr_type), KOBJMETHOD(g_part_write, g_part_mbr_write), { 0, 0 } @@ -262,6 +265,8 @@ /* confxml: partition entry information */ sbuf_printf(sb, "%s%u\n", indent, entry->ent.dp_typ); + if (entry->ent.dp_flag & 0x80) + sbuf_printf(sb, "%sactive\n", indent); } else { /* confxml: scheme information */ } @@ -420,6 +425,43 @@ return (0); } +static int +g_part_mbr_setunset(struct g_part_table *table, struct g_part_entry *baseentry, + const char *attrib, unsigned int set) +{ + struct g_part_entry *iter; + struct g_part_mbr_entry *entry; + int changed; + + if (strcasecmp(attrib, "active") != 0) + return (EINVAL); + + /* Only one entry can have the active attribute. */ + LIST_FOREACH(iter, &table->gpt_entry, gpe_entry) { + if (iter->gpe_deleted) + continue; + changed = 0; + entry = (struct g_part_mbr_entry *)iter; + if (iter == baseentry) { + if (set && (entry->ent.dp_flag & 0x80) == 0) { + entry->ent.dp_flag |= 0x80; + changed = 1; + } else if (!set && (entry->ent.dp_flag & 0x80)) { + entry->ent.dp_flag &= ~0x80; + changed = 1; + } + } else { + if (set && (entry->ent.dp_flag & 0x80)) { + entry->ent.dp_flag &= ~0x80; + changed = 1; + } + } + if (changed && !iter->gpe_created) + iter->gpe_modified = 1; + } + return (0); +} + static const char * g_part_mbr_type(struct g_part_table *basetable, struct g_part_entry *baseentry, char *buf, size_t bufsz) ==== //depot/projects/vimage-devel/src/sys/kern/kern_conf.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_conf.c,v 1.217 2008/06/12 08:30:54 ed Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_conf.c,v 1.218 2008/06/16 17:34:59 kib Exp $"); #include #include @@ -115,7 +115,7 @@ struct cdev_priv *cdp; mtx_assert(&devmtx, MA_OWNED); - cdp = cdev->si_priv; + cdp = cdev2priv(cdev); TAILQ_INSERT_HEAD(&cdevp_free_list, cdp, cdp_list); } @@ -187,7 +187,7 @@ dev_lock(); csw = dev->si_devsw; if (csw != NULL) { - cdp = dev->si_priv; + cdp = cdev2priv(dev); if ((cdp->cdp_flags & CDP_SCHED_DTR) == 0) dev->si_threadcount++; else @@ -208,7 +208,7 @@ dev_lock(); *devp = vp->v_rdev; if (*devp != NULL) { - cdp = (*devp)->si_priv; + cdp = cdev2priv(*devp); if ((cdp->cdp_flags & CDP_SCHED_DTR) == 0) { csw = (*devp)->si_devsw; if (csw != NULL) @@ -851,7 +851,7 @@ dev_unlock(); notify_destroy(dev); mtx_lock(&cdevpriv_mtx); - LIST_FOREACH_SAFE(p, &dev->si_priv->cdp_fdpriv, cdpd_list, p1) { + LIST_FOREACH_SAFE(p, &cdev2priv(dev)->cdp_fdpriv, cdpd_list, p1) { devfs_destroy_cdevpriv(p); mtx_lock(&cdevpriv_mtx); } @@ -1071,7 +1071,7 @@ KASSERT(dev->si_flags & SI_CLONELIST, ("Dev %p(%s) should be on clonelist", dev, dev->si_name)); dev->si_flags &= ~SI_CLONELIST; - cp = dev->si_priv; + cp = cdev2priv(dev); if (!(cp->cdp_flags & CDP_SCHED_DTR)) { cp->cdp_flags |= CDP_SCHED_DTR; KASSERT(dev->si_flags & SI_NAMED, @@ -1125,7 +1125,7 @@ struct cdev_priv *cp; mtx_assert(&devmtx, MA_OWNED); - cp = dev->si_priv; + cp = cdev2priv(dev); if (cp->cdp_flags & CDP_SCHED_DTR) { dev_unlock(); return (0); ==== //depot/projects/vimage-devel/src/sys/kern/kern_dtrace.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_dtrace.c,v 1.1 2008/05/18 19:43:52 jb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_dtrace.c,v 1.2 2008/06/16 04:44:29 jb Exp $"); #include "opt_kdb.h" @@ -106,15 +106,3 @@ } SYSINIT(kdtrace, SI_SUB_KDTRACE, SI_ORDER_FIRST, init_dtrace, NULL); - -#ifndef KDB -/* - * This is a stub for the kernel debugger for the DTrace actions to call - * when the kernel has been built without KDB. - */ -void -kdb_enter(const char *why, const char *msg) -{ - printf("Cannot enter kernel debugger - No KDB in kernel.\n%s - %s\n", why, msg); -} -#endif ==== //depot/projects/vimage-devel/src/sys/netinet/sctp_pcb.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ /* $KAME: sctp_pcb.c,v 1.38 2005/03/06 16:04:18 itojun Exp $ */ #include -__FBSDID("$FreeBSD: src/sys/netinet/sctp_pcb.c,v 1.69 2008/06/14 07:58:05 rrs Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/sctp_pcb.c,v 1.70 2008/06/15 12:31:23 rrs Exp $"); #include #include @@ -5330,6 +5330,7 @@ #if defined(SCTP_USE_THREAD_BASED_ITERATOR) SCTP_BASE_INFO(iterator_running) = 0; + SCTP_BASE_INFO(threads_must_exit) = 0; sctp_startup_iterator(); #endif @@ -5357,6 +5358,11 @@ int i; /* FIXME MT */ + SCTP_BASE_INFO(threads_must_exit) = 1; +#if defined(SCTP_USE_THREAD_BASED_ITERATOR) + /* Wake the thread up so it will exit now */ + sctp_wakeup_iterator(); +#endif /* * free the vrf/ifn/ifa lists and hashes (be sure address monitor is * destroyed first). @@ -5428,6 +5434,16 @@ SCTP_ZONE_DESTROY(SCTP_BASE_INFO(ipi_zone_strmoq)); SCTP_ZONE_DESTROY(SCTP_BASE_INFO(ipi_zone_asconf)); SCTP_ZONE_DESTROY(SCTP_BASE_INFO(ipi_zone_asconf_ack)); + /* Get rid of other stuff to */ + if (SCTP_BASE_INFO(sctp_asochash) != NULL) + SCTP_HASH_FREE(SCTP_BASE_INFO(sctp_asochash), SCTP_BASE_INFO(hashasocmark)); + if (SCTP_BASE_INFO(sctp_ephash) != NULL) + SCTP_HASH_FREE(SCTP_BASE_INFO(sctp_ephash), SCTP_BASE_INFO(hashmark)); + if (SCTP_BASE_INFO(sctp_tcpephash) != NULL) + SCTP_HASH_FREE(SCTP_BASE_INFO(sctp_tcpephash), SCTP_BASE_INFO(hashtcpmark)); + if (SCTP_BASE_INFO(sctp_restarthash) != NULL) + SCTP_HASH_FREE(SCTP_BASE_INFO(sctp_restarthash), SCTP_BASE_INFO(hashrestartmark)); + } ==== //depot/projects/vimage-devel/src/sys/netinet/sctp_pcb.h#3 (text+ko) ==== @@ -31,7 +31,7 @@ /* $KAME: sctp_pcb.h,v 1.21 2005/07/16 01:18:47 suz Exp $ */ #include -__FBSDID("$FreeBSD: src/sys/netinet/sctp_pcb.h,v 1.35 2008/06/14 07:58:05 rrs Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/sctp_pcb.h,v 1.36 2008/06/15 12:31:23 rrs Exp $"); #ifndef __sctp_pcb_h__ #define __sctp_pcb_h__ @@ -177,7 +177,7 @@ struct sctpladdr addr_wq; struct sctpiterators iteratorhead; - + int threads_must_exit; /* ep zone info */ sctp_zone_t ipi_zone_ep; sctp_zone_t ipi_zone_asoc; ==== //depot/projects/vimage-devel/src/sys/netinet/sctp_usrreq.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ /* $KAME: sctp_usrreq.c,v 1.48 2005/03/07 23:26:08 itojun Exp $ */ #include -__FBSDID("$FreeBSD: src/sys/netinet/sctp_usrreq.c,v 1.56 2008/06/14 07:58:05 rrs Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/sctp_usrreq.c,v 1.57 2008/06/15 12:31:23 rrs Exp $"); #include #include #include @@ -98,23 +98,6 @@ sctp_pcb_finish(); } -/* - * cleanup of the SCTP_BASE_INFO() structure. - * Assumes that the SCTP_BASE_INFO() lock is held. - */ -void -sctp_pcbinfo_cleanup(void) -{ - /* free the hash tables */ - if (SCTP_BASE_INFO(sctp_asochash) != NULL) - SCTP_HASH_FREE(SCTP_BASE_INFO(sctp_asochash), SCTP_BASE_INFO(hashasocmark)); - if (SCTP_BASE_INFO(sctp_ephash) != NULL) - SCTP_HASH_FREE(SCTP_BASE_INFO(sctp_ephash), SCTP_BASE_INFO(hashmark)); - if (SCTP_BASE_INFO(sctp_tcpephash) != NULL) - SCTP_HASH_FREE(SCTP_BASE_INFO(sctp_tcpephash), SCTP_BASE_INFO(hashtcpmark)); - if (SCTP_BASE_INFO(sctp_restarthash) != NULL) - SCTP_HASH_FREE(SCTP_BASE_INFO(sctp_restarthash), SCTP_BASE_INFO(hashrestartmark)); -} void ==== //depot/projects/vimage-devel/src/sys/netinet/sctp_var.h#3 (text+ko) ==== @@ -31,7 +31,7 @@ /* $KAME: sctp_var.h,v 1.24 2005/03/06 16:04:19 itojun Exp $ */ #include -__FBSDID("$FreeBSD: src/sys/netinet/sctp_var.h,v 1.25 2008/06/14 07:58:05 rrs Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/sctp_var.h,v 1.26 2008/06/15 12:31:23 rrs Exp $"); #ifndef _NETINET_SCTP_VAR_H_ #define _NETINET_SCTP_VAR_H_ @@ -308,7 +308,6 @@ void sctp_finish(void); -void sctp_pcbinfo_cleanup(void); int sctp_flush(struct socket *, int); int sctp_shutdown __P((struct socket *)); void sctp_notify ==== //depot/projects/vimage-devel/src/sys/netinet/tcp_syncache.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netinet/tcp_syncache.c,v 1.145 2008/05/09 23:02:58 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/tcp_syncache.c,v 1.147 2008/06/16 20:08:22 ups Exp $"); #include "opt_inet.h" #include "opt_inet6.h" @@ -887,11 +887,14 @@ goto failed; } /* - * The SEQ must match the received initial receive sequence - * number + 1 (the SYN) because we didn't ACK any data that - * may have come with the SYN. + * The SEQ must fall in the window starting a the received initial receive + * sequence number + 1 (the SYN). */ - if (th->th_seq != sc->sc_irs + 1 && !TOEPCB_ISSET(sc)) { + + if ((SEQ_LEQ(th->th_seq, sc->sc_irs) || + SEQ_GT(th->th_seq, sc->sc_irs + sc->sc_wnd )) && + !TOEPCB_ISSET(sc)) + { if ((s = tcp_log_addrs(inc, th, NULL, NULL))) log(LOG_DEBUG, "%s; %s: SEQ %u != IRS+1 %u, segment " "rejected\n", s, __func__, th->th_seq, sc->sc_irs); @@ -1602,7 +1605,7 @@ * The secret wasn't updated for the lifetime of a syncookie, * so this SYN-ACK/ACK is either too old (replay) or totally bogus. */ - if (sch->sch_reseed < time_uptime) { + if (sch->sch_reseed + SYNCOOKIE_LIFETIME < time_uptime) { return (NULL); } ==== //depot/projects/vimage-devel/src/sys/pci/if_rl.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/pci/if_rl.c,v 1.174 2008/04/10 01:06:05 yongari Exp $"); +__FBSDID("$FreeBSD: src/sys/pci/if_rl.c,v 1.175 2008/06/16 18:32:20 remko Exp $"); /* * RealTek 8129/8139 PCI NIC driver @@ -144,6 +144,8 @@ "RealTek 8129 10/100BaseTX" }, { RT_VENDORID, RT_DEVICEID_8139, RL_8139, "RealTek 8139 10/100BaseTX" }, + { RT_VENDORID, RT_DEVICEID_8139D, RL_8139, + "RealTek 8139 10/100BaseTX" }, { RT_VENDORID, RT_DEVICEID_8138, RL_8139, "RealTek 8139 10/100BaseTX CardBus" }, { RT_VENDORID, RT_DEVICEID_8100, RL_8139, ==== //depot/projects/vimage-devel/src/sys/pci/if_rlreg.h#2 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/pci/if_rlreg.h,v 1.74 2008/03/31 04:03:14 yongari Exp $ + * $FreeBSD: src/sys/pci/if_rlreg.h,v 1.75 2008/06/16 18:32:20 remko Exp $ */ /* @@ -862,6 +862,7 @@ /* * RealTek chip device IDs. */ +#define RT_DEVICEID_8139D 0x8039 #define RT_DEVICEID_8129 0x8129 #define RT_DEVICEID_8101E 0x8136 #define RT_DEVICEID_8138 0x8138 ==== //depot/projects/vimage-devel/src/sys/pci/nfsmb.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/pci/nfsmb.c,v 1.9 2008/06/06 18:29:56 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/pci/nfsmb.c,v 1.10 2008/06/18 20:39:56 joerg Exp $"); #include #include @@ -64,6 +64,7 @@ #define NFSMB_DEVICEID_NF4_51_SMB 0x0264 #define NFSMB_DEVICEID_NF4_55_SMB 0x0368 #define NFSMB_DEVICEID_NF4_61_SMB 0x03eb +#define NFSMB_DEVICEID_NF4_65_SMB 0x0446 /* PCI Configuration space registers */ #define NF2PCI_SMBASE_1 PCIR_BAR(4) @@ -156,6 +157,7 @@ case NFSMB_DEVICEID_NF4_51_SMB: case NFSMB_DEVICEID_NF4_55_SMB: case NFSMB_DEVICEID_NF4_61_SMB: + case NFSMB_DEVICEID_NF4_65_SMB: device_set_desc(dev, "nForce2/3/4 MCP SMBus Controller"); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jun 18 21:44:44 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ADC021065680; Wed, 18 Jun 2008 21:44:44 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 55DEB1065670 for ; Wed, 18 Jun 2008 21:44:44 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 419528FC24 for ; Wed, 18 Jun 2008 21:44:44 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5ILii0r027334 for ; Wed, 18 Jun 2008 21:44:44 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5ILihwk027332 for perforce@freebsd.org; Wed, 18 Jun 2008 21:44:43 GMT (envelope-from julian@freebsd.org) Date: Wed, 18 Jun 2008 21:44:43 GMT Message-Id: <200806182144.m5ILihwk027332@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 143723 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Jun 2008 21:44:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=143723 Change 143723 by julian@julian_trafmon1 on 2008/06/18 21:44:24 mark the removal of the experimental features as resolved but not incorporated Affected files ... .. //depot/projects/vimage-devel/src/sys/compat/linprocfs/linprocfs.c#3 integrate .. //depot/projects/vimage-devel/src/sys/compat/linux/linux_misc.c#3 integrate .. //depot/projects/vimage-devel/src/sys/i386/conf/VIMAGE#2 integrate .. //depot/projects/vimage-devel/src/sys/i386/i386/dump_machdep.c#4 integrate .. //depot/projects/vimage-devel/src/sys/i386/i386/minidump_machdep.c#4 integrate .. //depot/projects/vimage-devel/src/sys/kern/kern_clock.c#3 integrate .. //depot/projects/vimage-devel/src/sys/kern/kern_synch.c#3 integrate .. //depot/projects/vimage-devel/src/sys/kern/kern_vimage.c#2 integrate .. //depot/projects/vimage-devel/src/sys/kern/kern_xxx.c#3 integrate .. //depot/projects/vimage-devel/src/sys/kern/sched_4bsd.c#3 integrate .. //depot/projects/vimage-devel/src/sys/kern/tty.c#3 integrate .. //depot/projects/vimage-devel/src/sys/net/bpf.c#3 integrate .. //depot/projects/vimage-devel/src/sys/net/bpf.h#2 integrate .. //depot/projects/vimage-devel/src/sys/net/if_ethersubr.c#3 integrate .. //depot/projects/vimage-devel/src/sys/net/route.c#3 integrate .. //depot/projects/vimage-devel/src/sys/net/vnet.h#2 integrate .. //depot/projects/vimage-devel/src/sys/net80211/ieee80211.c#3 integrate .. //depot/projects/vimage-devel/src/sys/netgraph/ng_base.c#3 integrate .. //depot/projects/vimage-devel/src/sys/netgraph/ng_bridge.c#3 integrate .. //depot/projects/vimage-devel/src/sys/netgraph/ng_ether.c#3 integrate .. //depot/projects/vimage-devel/src/sys/netgraph/ng_hub.c#3 integrate .. //depot/projects/vimage-devel/src/sys/netgraph/ng_wormhole.c#2 integrate .. //depot/projects/vimage-devel/src/sys/netinet/in_pcb.c#3 integrate .. //depot/projects/vimage-devel/src/sys/sys/resource.h#3 integrate .. //depot/projects/vimage-devel/src/sys/sys/sched.h#3 integrate .. //depot/projects/vimage-devel/src/sys/sys/vimage.h#3 integrate .. //depot/projects/vimage-devel/src/sys/vm/vm_meter.c#3 integrate Differences ... ==== //depot/projects/vimage-devel/src/sys/compat/linprocfs/linprocfs.c#3 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/compat/linux/linux_misc.c#3 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/i386/conf/VIMAGE#2 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/i386/i386/dump_machdep.c#4 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/i386/i386/minidump_machdep.c#4 (text) ==== ==== //depot/projects/vimage-devel/src/sys/kern/kern_clock.c#3 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/kern/kern_synch.c#3 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/kern/kern_vimage.c#2 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/kern/kern_xxx.c#3 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/kern/sched_4bsd.c#3 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/kern/tty.c#3 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/net/bpf.c#3 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/net/bpf.h#2 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/net/if_ethersubr.c#3 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/net/route.c#3 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/net/vnet.h#2 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/net80211/ieee80211.c#3 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/netgraph/ng_base.c#3 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/netgraph/ng_bridge.c#3 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/netgraph/ng_ether.c#3 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/netgraph/ng_hub.c#3 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/netgraph/ng_wormhole.c#2 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/netinet/in_pcb.c#3 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/sys/resource.h#3 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/sys/sched.h#3 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/sys/vimage.h#3 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/vm/vm_meter.c#3 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Wed Jun 18 22:06:06 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8E5011065708; Wed, 18 Jun 2008 22:06:06 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 363E210657E8 for ; Wed, 18 Jun 2008 22:06:06 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2304E8FC1D for ; Wed, 18 Jun 2008 22:06:06 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5IM65s2035599 for ; Wed, 18 Jun 2008 22:06:05 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5IM65Uq035597 for perforce@freebsd.org; Wed, 18 Jun 2008 22:06:05 GMT (envelope-from julian@freebsd.org) Date: Wed, 18 Jun 2008 22:06:05 GMT Message-Id: <200806182206.m5IM65Uq035597@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 143726 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Jun 2008 22:06:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=143726 Change 143726 by julian@julian_trafmon1 on 2008/06/18 22:05:07 more moerging from vimage main Affected files ... .. //depot/projects/vimage-devel/src/sys/kern/kern_clock.c#4 integrate .. //depot/projects/vimage-devel/src/sys/kern/kern_vimage.c#3 integrate .. //depot/projects/vimage-devel/src/sys/net/vnet.h#3 integrate .. //depot/projects/vimage-devel/src/sys/netgraph/ng_pipe.c#2 integrate .. //depot/projects/vimage-devel/src/sys/netgraph/ng_pipe.h#2 integrate .. //depot/projects/vimage-devel/src/sys/netgraph/ng_wormhole.c#3 integrate .. //depot/projects/vimage-devel/src/sys/netgraph/vnetgraph.h#2 integrate .. //depot/projects/vimage-devel/src/sys/netinet/ip_fw2.c#3 integrate .. //depot/projects/vimage-devel/src/sys/netinet/tcp_subr.c#3 integrate .. //depot/projects/vimage-devel/src/sys/netinet/tcp_syncache.h#2 integrate .. //depot/projects/vimage-devel/src/sys/netinet/vinet.h#2 integrate .. //depot/projects/vimage-devel/src/sys/netinet6/ip6_input.c#3 integrate .. //depot/projects/vimage-devel/src/sys/netinet6/nd6.c#3 integrate .. //depot/projects/vimage-devel/src/sys/netinet6/vinet6.h#2 integrate .. //depot/projects/vimage-devel/src/sys/netipsec/vipsec.h#2 integrate .. //depot/projects/vimage-devel/src/sys/sys/sysctl.h#3 integrate .. //depot/projects/vimage-devel/src/sys/sys/vimage.h#4 integrate Differences ... ==== //depot/projects/vimage-devel/src/sys/kern/kern_clock.c#4 (text+ko) ==== @@ -502,7 +502,8 @@ sel = CP_IDLE; } } - atomic_add_long(&V_cp_time[sel], 1); /* XXX remove atomic! */ + cp_time[sel]++; + #ifdef VIMAGE if (sel != CP_INTR) sel = CP_IDLE; ==== //depot/projects/vimage-devel/src/sys/kern/kern_vimage.c#3 (text+ko) ==== @@ -1,6 +1,6 @@ /*- - * Copyright (c) 2004, 2005, 2006 University of Zagreb - * Copyright (c) 2006 FreeBSD Foundation + * Copyright (c) 2004-2008 University of Zagreb + * Copyright (c) 2006-2008 FreeBSD Foundation * * This software was developed by the University of Zagreb and the * FreeBSD Foundation under sponsorship by the Stichting NLnet and the @@ -26,8 +26,6 @@ * 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. - * - * XXX RCS tag goes here */ #include "opt_ddb.h" ==== //depot/projects/vimage-devel/src/sys/net/vnet.h#3 (text+ko) ==== @@ -1,6 +1,6 @@ /*- - * Copyright (c) 2006 University of Zagreb - * Copyright (c) 2006 FreeBSD Foundation + * Copyright (c) 2006-2008 University of Zagreb + * Copyright (c) 2006-2008 FreeBSD Foundation * * This software was developed by the University of Zagreb and the * FreeBSD Foundation under sponsorship by the Stichting NLnet and the @@ -26,8 +26,6 @@ * 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. - * - * XXX RCS tag goes here */ #ifndef _NET_VNET_H_ ==== //depot/projects/vimage-devel/src/sys/netgraph/ng_pipe.c#2 (text+ko) ==== @@ -1,6 +1,6 @@ /* - * Copyright (c) 2004, 2005, 2007 University of Zagreb - * Copyright (c) 2007 FreeBSD Foundation + * Copyright (c) 2004-2008 University of Zagreb + * Copyright (c) 2007-2008 FreeBSD Foundation * * This software was developed by the University of Zagreb and the * FreeBSD Foundation under sponsorship by the Stichting NLnet and the @@ -539,7 +539,8 @@ * NIH sindrome, so probably it would be wise to look around what other * folks have found out to be a good and efficient IP hash function... */ -static int ip_hash(struct mbuf *m, int offset) +static int +ip_hash(struct mbuf *m, int offset) { u_int64_t i; struct ip *ip = (struct ip *)(mtod(m, u_char *) + offset); ==== //depot/projects/vimage-devel/src/sys/netgraph/ng_pipe.h#2 (text+ko) ==== @@ -1,6 +1,6 @@ /* - * Copyright (c) 2004, 2007 University of Zagreb - * Copyright (c) 2007 FreeBSD Foundation + * Copyright (c) 2004-2008 University of Zagreb + * Copyright (c) 2007-2008 FreeBSD Foundation * * This software was developed by the University of Zagreb and the * FreeBSD Foundation under sponsorship by the Stichting NLnet and the ==== //depot/projects/vimage-devel/src/sys/netgraph/ng_wormhole.c#3 (text+ko) ==== @@ -1,6 +1,6 @@ /*- - * Copyright (c) 2007 University of Zagreb - * Copyright (c) 2007 FreeBSD Foundation + * Copyright (c) 2007-2008 University of Zagreb + * Copyright (c) 2007-2008 FreeBSD Foundation * * This software was developed by the University of Zagreb and the * FreeBSD Foundation under sponsorship by the Stichting NLnet and the @@ -26,8 +26,6 @@ * 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. - * - * XXX RCS tag goes here */ /* ==== //depot/projects/vimage-devel/src/sys/netgraph/vnetgraph.h#2 (text+ko) ==== @@ -1,6 +1,6 @@ /*- - * Copyright (c) 2006 University of Zagreb - * Copyright (c) 2006 FreeBSD Foundation + * Copyright (c) 2006-2008 University of Zagreb + * Copyright (c) 2006-2008 FreeBSD Foundation * * This software was developed by the University of Zagreb and the * FreeBSD Foundation under sponsorship by the Stichting NLnet and the @@ -26,8 +26,6 @@ * 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. - * - * XXX RCS tag goes here */ #ifndef _NETGRAPH_VNETGRPAH_H_ ==== //depot/projects/vimage-devel/src/sys/netinet/ip_fw2.c#3 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/netinet/tcp_subr.c#3 (text+ko) ==== @@ -196,9 +196,11 @@ &tcp_inflight_debug, 0, "Debug TCP inflight calculations"); static int sysctl_tcp_inflight_rttthresh(SYSCTL_HANDLER_ARGS); -int sysctl_tcp_inflight_rttthresh(SYSCTL_HANDLER_ARGS) + +static int +sysctl_tcp_inflight_rttthresh(SYSCTL_HANDLER_ARGS) { - return (0); /* XXX MARKO REVISIT */ + return (0); /* XXX MARKO REVISIT */ } SYSCTL_PROC(_net_inet_tcp_inflight, OID_AUTO, rttthresh, CTLTYPE_INT|CTLFLAG_RW, 0, 0, sysctl_tcp_inflight_rttthresh, "I", ==== //depot/projects/vimage-devel/src/sys/netinet/tcp_syncache.h#2 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/netinet/vinet.h#2 (text+ko) ==== @@ -1,6 +1,6 @@ /*- - * Copyright (c) 2006 University of Zagreb - * Copyright (c) 2006 FreeBSD Foundation + * Copyright (c) 2006-2008 University of Zagreb + * Copyright (c) 2006-2008 FreeBSD Foundation * * This software was developed by the University of Zagreb and the * FreeBSD Foundation under sponsorship by the Stichting NLnet and the @@ -26,8 +26,6 @@ * 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. - * - * XXX RCS tag goes here */ #ifndef _NETINET_VINET_H_ ==== //depot/projects/vimage-devel/src/sys/netinet6/ip6_input.c#3 (text+ko) ==== @@ -153,9 +153,10 @@ VNET_MOD_DECLARE(INET6, inet6, NULL, NULL, INET, NULL) -static void vnet_inet6_register() +static void +vnet_inet6_register(void) { - vnet_mod_register(&vnet_inet6_modinfo); + vnet_mod_register(&vnet_inet6_modinfo); } SYSINIT(inet6, SI_SUB_PROTO_BEGIN, SI_ORDER_FIRST, vnet_inet6_register, 0); ==== //depot/projects/vimage-devel/src/sys/netinet6/nd6.c#3 (text+ko) ==== @@ -472,7 +472,7 @@ ln = (struct llinfo_nd6 *)arg; - if (ln->ln_ntick > 0) { + if (ln->ln_ntick > 0) { if (ln->ln_ntick > INT_MAX) { ln->ln_ntick -= INT_MAX; nd6_llinfo_settimer(ln, INT_MAX); ==== //depot/projects/vimage-devel/src/sys/netinet6/vinet6.h#2 (text+ko) ==== @@ -1,6 +1,6 @@ /*- - * Copyright (c) 2006 University of Zagreb - * Copyright (c) 2006 FreeBSD Foundation + * Copyright (c) 2006-2008 University of Zagreb + * Copyright (c) 2006-2008 FreeBSD Foundation * * This software was developed by the University of Zagreb and the * FreeBSD Foundation under sponsorship by the Stichting NLnet and the @@ -26,8 +26,6 @@ * 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. - * - * XXX RCS tag goes here */ #ifndef _NETINET6_VINET6_H_ ==== //depot/projects/vimage-devel/src/sys/netipsec/vipsec.h#2 (text+ko) ==== @@ -1,6 +1,6 @@ /* - * Copyright (c) 2007 University of Zagreb - * Copyright (c) 2007 FreeBSD Foundation + * Copyright (c) 2007-2008 University of Zagreb + * Copyright (c) 2007-2008 FreeBSD Foundation * * This software was developed by the University of Zagreb and the * FreeBSD Foundation under sponsorship by the Stichting NLnet and the @@ -26,8 +26,6 @@ * 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. - * - * XXX RCS tag goes here */ #ifndef _NETIPSEC_VIPSEC_H_ ==== //depot/projects/vimage-devel/src/sys/sys/sysctl.h#3 (text+ko) ==== @@ -247,10 +247,10 @@ #ifdef VIMAGE #define SYSCTL_V_OID(subs, mod, parent, nbr, name, kind, a1, a2, \ handler, fmt, descr) \ - static struct sysctl_v_oid sysctl__##parent##_##name = { \ - &sysctl_##parent##_children, { 0 }, nbr, kind, \ - (void *) offsetof(struct mod, _##a1), a2, #name, \ - handler, fmt, 0, __DESCR(descr), subs, V_MOD_##mod }; \ + static struct sysctl_v_oid sysctl__##parent##_##name = { \ + &sysctl_##parent##_children, { 0 }, nbr, kind, \ + (void *) offsetof(struct mod, _##a1), a2, #name, \ + handler, fmt, 0, __DESCR(descr), subs, V_MOD_##mod }; \ DATA_SET(sysctl_set, sysctl__##parent##_##name) #else #define SYSCTL_V_OID(subs, mod, parent, nbr, name, kind, a1, a2, \ ==== //depot/projects/vimage-devel/src/sys/sys/vimage.h#4 (text+ko) ==== @@ -1,6 +1,6 @@ /*- - * Copyright (c) 2006 University of Zagreb - * Copyright (c) 2006 FreeBSD Foundation + * Copyright (c) 2006-2008 University of Zagreb + * Copyright (c) 2006-2008 FreeBSD Foundation * * This software was developed by the University of Zagreb and the * FreeBSD Foundation under sponsorship by the Stichting NLnet and the @@ -26,8 +26,6 @@ * 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. - * - * XXX RCS tag goes here */ #ifndef _NET_VIMAGE_H_ @@ -51,7 +49,10 @@ struct ifnet; /* XXX must go away */ #define curvnet curthread->td_vnet -#define basevnet thread0.td_vnet + +#define basevnet thread0.td_ucred->cr_vimage->v_vnet +#define basevprocg thread0.td_ucred->cr_vimage->v_procg +#define basevcpu thread0.td_ucred->cr_vimage->v_cpu typedef int vnet_attach_fn(const void *); typedef int vnet_detach_fn(const void *); @@ -231,7 +232,7 @@ #define VNET_ITERLOOP_END() \ CURVNET_RESTORE(); \ } \ - VNET_LIST_UNREF(); + VNET_LIST_UNREF(); #else /* !VNET_DEBUG */ @@ -261,7 +262,7 @@ #define VNET_ITERLOOP_END() \ CURVNET_RESTORE(); \ } \ - VNET_LIST_UNREF(); + VNET_LIST_UNREF(); #endif /* !VNET_DEBUG */ @@ -321,13 +322,16 @@ #define VCPU(sym) VSYM(vcpu, sym) #define V_hostname VPROCG(hostname) -#define G_hostname VSYM(basevnet, hostname) /* global hostname */ +#define G_hostname VSYM(basevprocg, hostname) /* global hostname */ #define V_domainname VPROCG(domainname) #define V_morphing_symlinks VPROCG(morphing_symlinks) + +#ifdef NOTYET #define V_cp_time VPROCG(cp_time) #define V_averunnable VPROCG(averunnable) #define V_sched_tdcnt VPROCG(sched_tdcnt) #define V_tdq_sysload VPROCG(tdq_sysload) +#endif #define V_acc_statcalls VCPU(acc_statcalls) #define V_avg1_fixp VCPU(avg1_fixp) @@ -405,18 +409,18 @@ u_int nprocs; - long _cp_time[CPUSTATES]; - char _hostname[MAXHOSTNAMELEN]; char _domainname[MAXHOSTNAMELEN]; int _morphing_symlinks; +#if 0 + long _cp_time[CPUSTATES]; + struct loadavg _averunnable; /* from kern/kern_synch.c */ int _sched_tdcnt; /* from kern/sched_4bsd.c */ int _tdq_sysload[32]; /* XXX MAXCPUS from kern/sched_ule.c (SMP) */ -#if 0 u_int proc_limit; /* max. number of processes */ struct msgbuf *msgbufp; From owner-p4-projects@FreeBSD.ORG Wed Jun 18 22:17:18 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EF00D1065678; Wed, 18 Jun 2008 22:17:17 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B0FB21065672 for ; Wed, 18 Jun 2008 22:17:17 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9FADF8FC25 for ; Wed, 18 Jun 2008 22:17:17 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5IMHHli040236 for ; Wed, 18 Jun 2008 22:17:17 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5IMHHTX040234 for perforce@freebsd.org; Wed, 18 Jun 2008 22:17:17 GMT (envelope-from julian@freebsd.org) Date: Wed, 18 Jun 2008 22:17:17 GMT Message-Id: <200806182217.m5IMHHTX040234@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 143728 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Jun 2008 22:17:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=143728 Change 143728 by julian@julian_trafmon1 on 2008/06/18 22:16:25 More whitespace changes Affected files ... .. //depot/projects/vimage-devel/src/sys/kern/kern_exit.c#3 integrate .. //depot/projects/vimage-devel/src/sys/kern/kern_fork.c#3 integrate .. //depot/projects/vimage-devel/src/sys/kern/kern_switch.c#3 integrate .. //depot/projects/vimage-devel/src/sys/kern/kern_timeout.c#3 integrate .. //depot/projects/vimage-devel/src/sys/kern/kern_vimage.c#4 integrate .. //depot/projects/vimage-devel/src/sys/kern/sched_4bsd.c#4 integrate .. //depot/projects/vimage-devel/src/sys/kern/sys_socket.c#3 integrate .. //depot/projects/vimage-devel/src/sys/kern/uipc_domain.c#3 integrate .. //depot/projects/vimage-devel/src/sys/sys/vimage.h#5 integrate Differences ... ==== //depot/projects/vimage-devel/src/sys/kern/kern_exit.c#3 (text+ko) ==== @@ -179,7 +179,6 @@ } KASSERT(p->p_numthreads == 1, ("exit1: proc %p exiting with %d threads", p, p->p_numthreads)); - /* * Wakeup anyone in procfs' PIOCWAIT. They should have a hold * on our vmspace, so we should block below until they have @@ -699,7 +698,6 @@ AUDIT_ARG(pid, pid); q = td->td_proc; - if (pid == 0) { PROC_LOCK(q); pid = -q->p_pgid; ==== //depot/projects/vimage-devel/src/sys/kern/kern_fork.c#3 (text+ko) ==== @@ -516,8 +516,10 @@ td2->td_sigmask = td->td_sigmask; td2->td_flags = TDF_INMEM; - td2->td_vnet = NULL; /* XXX */ - td2->td_vnet_lpush = NULL; /* XXX */ +#ifdef VIMAGE + td2->td_vnet = NULL; + td2->td_vnet_lpush = NULL; +#endif /* * Duplicate sub-structures as needed. ==== //depot/projects/vimage-devel/src/sys/kern/kern_switch.c#3 (text+ko) ==== @@ -455,7 +455,6 @@ return (NULL); } - /* * Remove the thread from the queue specified by its priority, and clear the * corresponding status bit if the queue becomes empty. ==== //depot/projects/vimage-devel/src/sys/kern/kern_timeout.c#3 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/kern/kern_vimage.c#4 (text+ko) ==== @@ -132,16 +132,15 @@ static TAILQ_HEAD(vnet_modlink_head, vnet_modlink) vnet_modlink_head; static TAILQ_HEAD(vnet_modpending_head, vnet_modlink) vnet_modpending_head; -void vnet_mod_register(vmi) - const struct vnet_modinfo *vmi; +void +vnet_mod_register(const struct vnet_modinfo *vmi) { vnet_mod_register_multi(vmi, NULL, NULL); } -void vnet_mod_register_multi(vmi, iarg, iname) - const struct vnet_modinfo *vmi; - const void *iarg; - const char *iname; +void +vnet_mod_register_multi(const struct vnet_modinfo *vmi, void *iarg, + char *iname) { struct vnet_modlink *vml, *vml_iter; @@ -186,8 +185,8 @@ vnet_mod_complete_registration(vml); } -void vnet_mod_complete_registration(vml) -struct vnet_modlink *vml; +void +vnet_mod_complete_registration(struct vnet_modlink *vml) { struct vnet_modlink *vml_iter; @@ -217,16 +216,15 @@ } while (vml_iter != NULL); } -void vnet_mod_deregister(vmi) - const struct vnet_modinfo *vmi; +void +vnet_mod_deregister(const struct vnet_modinfo *vmi) { vnet_mod_deregister_multi(vmi, NULL, NULL); } -void vnet_mod_deregister_multi(vmi, iarg, iname) - const struct vnet_modinfo *vmi; - const void *iarg; - const char *iname; +void +vnet_mod_deregister_multi(const struct vnet_modinfo *vmi, void *iarg, + char *iname) { struct vnet_modlink *vml; @@ -245,8 +243,8 @@ vi_free(vml, M_VIMAGE); } -struct vimage *vnet2vimage(vnet) - struct vnet *vnet; +struct vimage * +vnet2vimage(struct vnet *vnet) { struct vimage *vip; @@ -257,16 +255,15 @@ panic("vnet2vimage"); /* must never happen */ } -char *vnet_name(vnet) - struct vnet *vnet; +char * +vnet_name(struct vnet *vnet) { return(vnet2vimage(vnet)->vi_name); } int -vi_child_of(parent, child) - struct vimage *parent, *child; +vi_child_of(struct vimage *parent, struct vimage *child) { if (child == parent) return (0); @@ -354,10 +351,7 @@ * interface is moved to the parent vnet. */ int -vi_if_move(vi_req, ifp, vip) - struct vi_req *vi_req; - struct ifnet *ifp; - struct vimage *vip; +vi_if_move(struct vi_req *vi_req, struct ifnet *ifp, struct vimage *vip) { struct vimage *new_vip; struct vnet *new_vnet = NULL; @@ -498,10 +492,7 @@ int -vi_td_ioctl(cmd, vi_req, td) - u_long cmd; - struct vi_req *vi_req; - struct thread *td; +vi_td_ioctl(u_long cmd, struct vi_req *vi_req, struct thread *td) { int error; struct vimage *vip = TD_TO_VIMAGE(td); @@ -608,9 +599,7 @@ int -vi_symlookup(lookup, symstr) - struct kld_sym_lookup *lookup; - char *symstr; +vi_symlookup(struct kld_sym_lookup *lookup, char *symstr) { struct vnet_modlink *vml; @@ -793,8 +782,7 @@ return (0); } -static int vnet_mod_constructor(vml) -struct vnet_modlink *vml; +static int vnet_mod_constructor(struct vnet_modlink *vml) { const struct vnet_modinfo *vmi = vml->vml_modinfo; @@ -824,8 +812,7 @@ return 0; } -static int vnet_mod_destructor(vml) -struct vnet_modlink *vml; +static int vnet_mod_destructor(struct vnet_modlink *vml) { const struct vnet_modinfo *vmi = vml->vml_modinfo; ==== //depot/projects/vimage-devel/src/sys/kern/sched_4bsd.c#4 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/kern/sys_socket.c#3 (text+ko) ==== @@ -287,8 +287,7 @@ fp->f_ops = &badfileops; fp->f_data = NULL; - if (so) { + if (so) error = soclose(so); - } return (error); } ==== //depot/projects/vimage-devel/src/sys/kern/uipc_domain.c#3 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/sys/vimage.h#5 (text+ko) ==== @@ -340,10 +340,8 @@ #ifdef VIMAGE void vnet_mod_register(const struct vnet_modinfo *); void vnet_mod_deregister(const struct vnet_modinfo *); -void vnet_mod_register_multi(const struct vnet_modinfo *, const void *, - const char *); -void vnet_mod_deregister_multi(const struct vnet_modinfo *, const void *, - const char *); +void vnet_mod_register_multi(const struct vnet_modinfo *, void *, char *); +void vnet_mod_deregister_multi(const struct vnet_modinfo *, void *, char *); void printcpuinfo(struct vprocg *); void vi_cpu_acct(void *); From owner-p4-projects@FreeBSD.ORG Wed Jun 18 22:29:30 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 77C431065675; Wed, 18 Jun 2008 22:29:30 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 211C6106566B for ; Wed, 18 Jun 2008 22:29:30 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 102598FC1A for ; Wed, 18 Jun 2008 22:29:30 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5IMTTF1041499 for ; Wed, 18 Jun 2008 22:29:29 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5IMTTsB041497 for perforce@freebsd.org; Wed, 18 Jun 2008 22:29:29 GMT (envelope-from julian@freebsd.org) Date: Wed, 18 Jun 2008 22:29:29 GMT Message-Id: <200806182229.m5IMTTsB041497@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 143729 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Jun 2008 22:29:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=143729 Change 143729 by julian@julian_trafmon1 on 2008/06/18 22:29:00 bring vimage_develp up to date with vimage Affected files ... .. //depot/projects/vimage-devel/src/sys/kern/kern_exit.c#4 integrate .. //depot/projects/vimage-devel/src/sys/kern/kern_synch.c#4 integrate .. //depot/projects/vimage-devel/src/sys/kern/sched_4bsd.c#5 integrate .. //depot/projects/vimage-devel/src/sys/kern/uipc_socket.c#3 integrate .. //depot/projects/vimage-devel/src/sys/kern/uipc_syscalls.c#3 integrate .. //depot/projects/vimage-devel/src/sys/modules/Makefile#3 integrate .. //depot/projects/vimage-devel/src/sys/net/if.c#3 integrate .. //depot/projects/vimage-devel/src/sys/net/if_clone.c#3 integrate .. //depot/projects/vimage-devel/src/sys/netgraph/ng_base.c#4 integrate .. //depot/projects/vimage-devel/src/sys/netinet/ip_carp.c#2 integrate .. //depot/projects/vimage-devel/src/sys/sys/sysctl.h#4 integrate Differences ... ==== //depot/projects/vimage-devel/src/sys/kern/kern_exit.c#4 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/kern/kern_synch.c#4 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/kern/sched_4bsd.c#5 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/kern/uipc_socket.c#3 (text+ko) ==== @@ -2025,7 +2025,8 @@ error = 0; if (sopt->sopt_level != SOL_SOCKET) { if (so->so_proto && so->so_proto->pr_ctloutput) - return ((*so->so_proto->pr_ctloutput) (so, sopt)); + return ((*so->so_proto->pr_ctloutput) + (so, sopt)); error = ENOPROTOOPT; } else { switch (sopt->sopt_name) { ==== //depot/projects/vimage-devel/src/sys/kern/uipc_syscalls.c#3 (text+ko) ==== @@ -1577,7 +1577,6 @@ error = ENOTCONN; goto done; } - *sa = NULL; CURVNET_SET(so->so_vnet); error = (*so->so_proto->pr_usrreqs->pru_peeraddr)(so, sa); ==== //depot/projects/vimage-devel/src/sys/modules/Makefile#3 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/net/if.c#3 (text+ko) ==== @@ -317,6 +317,7 @@ static void if_init(void *dummy __unused) { + #ifdef VIMAGE vnet_mod_register(&vnet_net_modinfo); #else @@ -2601,6 +2602,9 @@ void if_delmulti_ifma(struct ifmultiaddr *ifma) { +#ifdef DIAGNOSTIC + INIT_VNET_NET(curvnet); +#endif struct ifnet *ifp; int lastref; @@ -2612,7 +2616,7 @@ struct ifnet *oifp; IFNET_RLOCK(); - TAILQ_FOREACH(oifp, &ifnet, if_link) + TAILQ_FOREACH(oifp, &V_ifnet, if_link) if (ifp == oifp) break; if (ifp != oifp) { @@ -2881,6 +2885,7 @@ if_register_com_alloc(u_char type, if_com_alloc_t *a, if_com_free_t *f) { + KASSERT(if_com_alloc[type] == NULL, ("if_register_com_alloc: %d already registered", type)); KASSERT(if_com_free[type] == NULL, @@ -2893,6 +2898,7 @@ void if_deregister_com_alloc(u_char type) { + KASSERT(if_com_alloc[type] != NULL, ("if_deregister_com_alloc: %d not registered", type)); KASSERT(if_com_free[type] != NULL, ==== //depot/projects/vimage-devel/src/sys/net/if_clone.c#3 (text+ko) ==== @@ -470,6 +470,7 @@ #ifndef VIMAGE int bytoff, bitoff; + /* * Compute offset in the bitmap and deallocate the unit. */ ==== //depot/projects/vimage-devel/src/sys/netgraph/ng_base.c#4 (text+ko) ==== @@ -131,10 +131,10 @@ }, 1, /* refs */ #ifdef NETGRAPH_DEBUG - ND_MAGIC, - __FILE__, - __LINE__, - {NULL} + .nd_magic = ND_MAGIC, + .lastfile = __FILE__, + .lastline = __LINE__, + .nd_all = {NULL} #endif /* NETGRAPH_DEBUG */ }; ==== //depot/projects/vimage-devel/src/sys/netinet/ip_carp.c#2 (text+ko) ==== @@ -31,6 +31,7 @@ #include "opt_bpf.h" #include "opt_inet.h" #include "opt_inet6.h" +#include "opt_vimage.h" #include #include @@ -49,6 +50,7 @@ #include #include #include +#include #include #include @@ -66,6 +68,7 @@ #include #ifdef INET +#include #include #include #include @@ -76,6 +79,7 @@ #endif #ifdef INET6 +#include #include #include #include @@ -913,6 +917,7 @@ ch.carp_cksum = 0; #ifdef INET + INIT_VNET_INET(curvnet); if (sc->sc_ia) { struct ip *ip; @@ -1451,6 +1456,7 @@ static int carp_set_addr(struct carp_softc *sc, struct sockaddr_in *sin) { + INIT_VNET_INET(curvnet); struct ifnet *ifp; struct carp_if *cif; struct in_ifaddr *ia, *ia_if; @@ -1470,7 +1476,7 @@ /* we have to do it by hands to check we won't match on us */ ia_if = NULL; own = 0; - TAILQ_FOREACH(ia, &in_ifaddrhead, ia_link) { + TAILQ_FOREACH(ia, &V_in_ifaddrhead, ia_link) { /* and, yeah, we need a multicast-capable iface too */ if (ia->ia_ifp != SC2IFP(sc) && (ia->ia_ifp->if_flags & IFF_MULTICAST) && @@ -1612,6 +1618,7 @@ static int carp_set_addr6(struct carp_softc *sc, struct sockaddr_in6 *sin6) { + INIT_VNET_INET6(curvnet); struct ifnet *ifp; struct carp_if *cif; struct in6_ifaddr *ia, *ia_if; @@ -1631,7 +1638,7 @@ /* we have to do it by hands to check we won't match on us */ ia_if = NULL; own = 0; - for (ia = in6_ifaddr; ia; ia = ia->ia_next) { + for (ia = V_in6_ifaddr; ia; ia = ia->ia_next) { int i; for (i = 0; i < 4; i++) { ==== //depot/projects/vimage-devel/src/sys/sys/sysctl.h#4 (text+ko) ==== @@ -245,16 +245,16 @@ DATA_SET(sysctl_set, sysctl__##parent##_##name) #ifdef VIMAGE -#define SYSCTL_V_OID(subs, mod, parent, nbr, name, kind, a1, a2, \ - handler, fmt, descr) \ - static struct sysctl_v_oid sysctl__##parent##_##name = { \ - &sysctl_##parent##_children, { 0 }, nbr, kind, \ - (void *) offsetof(struct mod, _##a1), a2, #name, \ - handler, fmt, 0, __DESCR(descr), subs, V_MOD_##mod }; \ - DATA_SET(sysctl_set, sysctl__##parent##_##name) +#define SYSCTL_V_OID(subs, mod, parent, nbr, name, kind, a1, a2, \ + handler, fmt, descr) \ + static struct sysctl_v_oid sysctl__##parent##_##name = { \ + &sysctl_##parent##_children, { 0 }, nbr, kind, \ + (void *) offsetof(struct mod, _##a1), a2, #name, \ + handler, fmt, 0, __DESCR(descr), subs, V_MOD_##mod }; \ + DATA_SET(sysctl_set, sysctl__##parent##_##name) #else #define SYSCTL_V_OID(subs, mod, parent, nbr, name, kind, a1, a2, \ - handler, fmt, descr) \ + handler, fmt, descr) \ SYSCTL_OID(parent, nbr, name, kind, &a1, a2, handler, fmt, descr) #endif From owner-p4-projects@FreeBSD.ORG Wed Jun 18 23:41:20 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 33A9D106567B; Wed, 18 Jun 2008 23:41:20 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E95D2106566B for ; Wed, 18 Jun 2008 23:41:19 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DEDDE8FC13 for ; Wed, 18 Jun 2008 23:41:19 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5INfJuP059516 for ; Wed, 18 Jun 2008 23:41:19 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5INekSe059499 for perforce@freebsd.org; Wed, 18 Jun 2008 23:40:46 GMT (envelope-from julian@freebsd.org) Date: Wed, 18 Jun 2008 23:40:46 GMT Message-Id: <200806182340.m5INekSe059499@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 143733 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Jun 2008 23:41:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=143733 Change 143733 by julian@julian_trafmon1 on 2008/06/18 23:39:55 accidentally removed too much Affected files ... .. //depot/projects/vimage-devel/src/sys/sys/vimage.h#6 edit Differences ... ==== //depot/projects/vimage-devel/src/sys/sys/vimage.h#6 (text+ko) ==== @@ -326,12 +326,10 @@ #define V_domainname VPROCG(domainname) #define V_morphing_symlinks VPROCG(morphing_symlinks) -#ifdef NOTYET #define V_cp_time VPROCG(cp_time) #define V_averunnable VPROCG(averunnable) #define V_sched_tdcnt VPROCG(sched_tdcnt) #define V_tdq_sysload VPROCG(tdq_sysload) -#endif #define V_acc_statcalls VCPU(acc_statcalls) #define V_avg1_fixp VCPU(avg1_fixp) From owner-p4-projects@FreeBSD.ORG Thu Jun 19 02:04:51 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 318C11065670; Thu, 19 Jun 2008 02:04:51 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E829F106566B for ; Thu, 19 Jun 2008 02:04:50 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CD6238FC12 for ; Thu, 19 Jun 2008 02:04:50 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5J24oEe088821 for ; Thu, 19 Jun 2008 02:04:50 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5J24oIC088819 for perforce@freebsd.org; Thu, 19 Jun 2008 02:04:50 GMT (envelope-from julian@freebsd.org) Date: Thu, 19 Jun 2008 02:04:50 GMT Message-Id: <200806190204.m5J24oIC088819@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 143734 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Jun 2008 02:04:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=143734 Change 143734 by julian@julian_trafmon1 on 2008/06/19 02:04:13 diff the devel branch from the stable branch Affected files ... .. //depot/projects/vimage-devel/makemeat.pl#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Thu Jun 19 03:36:00 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 98CF0106571B; Thu, 19 Jun 2008 03:35:46 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AA560106578A for ; Thu, 19 Jun 2008 03:35:30 +0000 (UTC) (envelope-from rfrench@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 91BA18FC12 for ; Thu, 19 Jun 2008 03:35:29 +0000 (UTC) (envelope-from rfrench@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5J3ZTZl000415 for ; Thu, 19 Jun 2008 03:35:29 GMT (envelope-from rfrench@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5J3ZTNS000413 for perforce@freebsd.org; Thu, 19 Jun 2008 03:35:29 GMT (envelope-from rfrench@FreeBSD.org) Date: Thu, 19 Jun 2008 03:35:29 GMT Message-Id: <200806190335.m5J3ZTNS000413@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rfrench@FreeBSD.org using -f From: Ryan French To: Perforce Change Reviews Cc: Subject: PERFORCE change 143737 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Jun 2008 03:36:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=143737 Change 143737 by rfrench@rfrench_mpls on 2008/06/19 03:35:12 No new code, just submitting the files that I will be working on. Mostly empty files in the netmpls directory at the moment, still just getting stuff ready for where I start coding. Affected files ... .. //depot/projects/soc2008/rfrench_mpls/net/if_ethersubr.c#1 add .. //depot/projects/soc2008/rfrench_mpls/net/route.h#1 add .. //depot/projects/soc2008/rfrench_mpls/netmpls/mpls.h#1 add .. //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_proto.c#1 add .. //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_raw.c#1 add .. //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_shim.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Thu Jun 19 04:09:43 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7BCC51065944; Thu, 19 Jun 2008 04:09:27 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4E0021065A2D for ; Thu, 19 Jun 2008 04:09:13 +0000 (UTC) (envelope-from mayur@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BABD38FC14 for ; Thu, 19 Jun 2008 04:09:04 +0000 (UTC) (envelope-from mayur@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5J494fv004378 for ; Thu, 19 Jun 2008 04:09:04 GMT (envelope-from mayur@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5J494p3004376 for perforce@freebsd.org; Thu, 19 Jun 2008 04:09:04 GMT (envelope-from mayur@FreeBSD.org) Date: Thu, 19 Jun 2008 04:09:04 GMT Message-Id: <200806190409.m5J494p3004376@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mayur@FreeBSD.org using -f From: Mayur Shardul To: Perforce Change Reviews Cc: Subject: PERFORCE change 143740 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Jun 2008 04:09:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=143740 Change 143740 by mayur@mayur_freebsd_vm on 2008/06/19 04:08:16 Userspace implementation of the data structure and a test program. Submitted by: mayur Affected files ... .. //depot/projects/soc2008/mayur_vmalgo/uspace/Makefile#1 add .. //depot/projects/soc2008/mayur_vmalgo/uspace/README#1 add .. //depot/projects/soc2008/mayur_vmalgo/uspace/radix_tree.c#1 add .. //depot/projects/soc2008/mayur_vmalgo/uspace/radix_tree.h#1 add .. //depot/projects/soc2008/mayur_vmalgo/uspace/rtree_test.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Thu Jun 19 05:13:11 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 29C1A106567D; Thu, 19 Jun 2008 05:13:11 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id ADCAE1065673 for ; Thu, 19 Jun 2008 05:13:10 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A86E58FC15 for ; Thu, 19 Jun 2008 05:13:10 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5J5DAa9026230 for ; Thu, 19 Jun 2008 05:13:10 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5J5DAj4026228 for perforce@freebsd.org; Thu, 19 Jun 2008 05:13:10 GMT (envelope-from julian@freebsd.org) Date: Thu, 19 Jun 2008 05:13:10 GMT Message-Id: <200806190513.m5J5DAj4026228@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 143745 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Jun 2008 05:13:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=143745 Change 143745 by julian@julian_trafmon1 on 2008/06/19 05:13:09 Bring in more whitespace fixes I apparently missed Affected files ... .. //depot/projects/vimage-devel/src/sys/net/bpf.c#4 edit .. //depot/projects/vimage-devel/src/sys/net/if_ethersubr.c#4 edit .. //depot/projects/vimage-devel/src/sys/net/route.c#4 edit .. //depot/projects/vimage-devel/src/sys/net/vnet.h#4 edit .. //depot/projects/vimage-devel/src/sys/net80211/ieee80211.c#4 edit .. //depot/projects/vimage-devel/src/sys/netgraph/ng_bridge.c#4 edit .. //depot/projects/vimage-devel/src/sys/netgraph/ng_ether.c#4 edit .. //depot/projects/vimage-devel/src/sys/netgraph/ng_hub.c#4 edit .. //depot/projects/vimage-devel/src/sys/netgraph/ng_wormhole.c#4 edit .. //depot/projects/vimage-devel/src/sys/netinet/in_pcb.c#4 edit .. //depot/projects/vimage-devel/src/sys/netinet/tcp_syncache.h#3 edit Differences ... ==== //depot/projects/vimage-devel/src/sys/net/bpf.c#4 (text+ko) ==== @@ -1417,7 +1417,7 @@ if (target_vimage == NULL) return ENXIO; target_vnet = target_vimage->v_net; - } + } CURVNET_SET_QUIET(target_vnet); #endif ==== //depot/projects/vimage-devel/src/sys/net/if_ethersubr.c#4 (text+ko) ==== @@ -892,16 +892,16 @@ static void ether_reassign(struct ifnet *ifp, struct vnet *vnet, char *dname) { - u_char eaddr[6]; + u_char eaddr[6]; bcopy(IF_LLADDR(ifp), eaddr, 6); ether_ifdetach(ifp); ifp->if_bpf = NULL; - if_reassign_common(ifp, vnet, "eth"); + if_reassign_common(ifp, vnet, "eth"); if (dname) snprintf(ifp->if_xname, IFNAMSIZ, "%s", dname); - CURVNET_SET_QUIET(vnet); + CURVNET_SET_QUIET(vnet); ether_ifattach(ifp, eaddr); CURVNET_RESTORE(); } @@ -977,7 +977,7 @@ SYSCTL_NODE(_net_link, IFT_ETHER, ether, CTLFLAG_RW, 0, "Ethernet"); #if defined(INET) || defined(INET6) SYSCTL_V_INT(V_NET, vnet_net, _net_link_ether, OID_AUTO, ipfw, CTLFLAG_RW, - ether_ipfw, 0, "Pass ether pkts through firewall"); + ether_ipfw, 0, "Pass ether pkts through firewall"); #endif #if 0 ==== //depot/projects/vimage-devel/src/sys/net/route.c#4 (text+ko) ==== @@ -153,15 +153,15 @@ { int table; int fam; - struct domain *dom; - INIT_VNET_NET(curvnet); + struct domain *dom; + INIT_VNET_NET(curvnet); for (dom = domains; dom; dom = dom->dom_next) { if (dom->dom_rtattach) { for (table = 0; table < rt_numfibs; table++) { if ( (fam = dom->dom_family) == AF_INET || table == 0) { - /* for now only AF_INET has > 1 table */ + /* for now only AF_INET has > 1 table */ /* XXX MRT * rtattach will be also called * from vfs_export.c but the @@ -178,7 +178,7 @@ } } } - return 0; + return (0); } #ifdef VIMAGE @@ -187,15 +187,15 @@ { int table; int fam; - struct domain *dom; - INIT_VNET_NET(curvnet); + struct domain *dom; + INIT_VNET_NET(curvnet); for (dom = domains; dom; dom = dom->dom_next) { if (dom->dom_rtdetach) { for (table = 0; table < rt_numfibs; table++) { if ( (fam = dom->dom_family) == AF_INET || table == 0) { - /* for now only AF_INET has > 1 table */ + /* for now only AF_INET has > 1 table */ dom->dom_rtdetach( (void **)&V_rt_tables[table][fam], dom->dom_rtoffset); @@ -205,7 +205,7 @@ } } } - return 0; + return (0); } VNET_MOD_DECLARE_STATELESS(RTABLE, rtable, rtable_init, rtable_idetach, NET); @@ -233,7 +233,7 @@ #ifndef _SYS_SYSPROTO_H_ struct setfib_args { - int fibnum; + int fibnum; }; #endif int ==== //depot/projects/vimage-devel/src/sys/net/vnet.h#4 (text+ko) ==== @@ -70,7 +70,7 @@ LIST_HEAD(, rawcb) _rawcb_list; - int _ether_ipfw; + int _ether_ipfw; }; #endif ==== //depot/projects/vimage-devel/src/sys/net80211/ieee80211.c#4 (text+ko) ==== @@ -672,18 +672,18 @@ ieee80211_reassign( struct ieee80211vap *vap, struct vnet *vnet, char *dname) { struct ifnet *ifp = vap->iv_ifp; - u_char eaddr[6]; + u_char eaddr[6]; bcopy(IF_LLADDR(ifp), eaddr, 6); bpfdetach(ifp); ether_ifdetach(ifp); ifp->if_bpf = NULL; vap->iv_rawbpf = NULL; - if_reassign_common(ifp, vnet, ifp->if_dname); + if_reassign_common(ifp, vnet, ifp->if_dname); if (dname) snprintf(ifp->if_xname, IFNAMSIZ, "%s", dname); - CURVNET_SET_QUIET(vnet); + CURVNET_SET_QUIET(vnet); ether_ifattach(ifp, eaddr); bpfattach2(ifp, DLT_IEEE802_11, sizeof(struct ieee80211_frame_addr4), &vap->iv_rawbpf); ==== //depot/projects/vimage-devel/src/sys/netgraph/ng_bridge.c#4 (text+ko) ==== @@ -375,7 +375,7 @@ NG_HOOK_SET_PRIVATE(hook, (void *)linkNum); priv->numLinks++; return (0); - } + } /* Unknown hook name */ return (EINVAL); ==== //depot/projects/vimage-devel/src/sys/netgraph/ng_ether.c#4 (text+ko) ==== @@ -782,7 +782,7 @@ static int ng_ether_iattach(const void *unused) { - INIT_VNET_NET(curvnet); + INIT_VNET_NET(curvnet); struct ifnet *ifp; #ifdef VIMAGE ==== //depot/projects/vimage-devel/src/sys/netgraph/ng_hub.c#4 (text+ko) ==== @@ -62,9 +62,9 @@ static int ng_hub_newhook(node_p node, hook_p hook, const char *name) { - if (strcmp(name, "anchor") == 0) - node->nd_private = (void *) 1; - return 0; + if (strcmp(name, "anchor") == 0) + node->nd_private = (void *) 1; + return (0); } static int ==== //depot/projects/vimage-devel/src/sys/netgraph/ng_wormhole.c#4 (text+ko) ==== @@ -124,19 +124,19 @@ }; static const struct ng_cmdlist ng_wormhole_cmds[] = { - { + { .cookie = NGM_WORMHOLE_COOKIE, .cmd = NGM_WORMHOLE_PEER, .name = "peer", .mesgType = &ng_wormhole_peer_type, .respType = &ng_wormhole_peer_type, - }, - { + }, + { .cookie = NGM_WORMHOLE_COOKIE, .cmd = NGM_WORMHOLE_STATUS, .name = "status", .respType = &ng_wormhole_status_type, - }, + }, { 0 } }; @@ -182,9 +182,9 @@ return (ENOMEM); NG_NODE_SET_PRIVATE(node, priv); - priv->unit = alloc_unr(V_ng_wormhole_unit); + priv->unit = alloc_unr(V_ng_wormhole_unit); snprintf(buf, NG_NODESIZ, "%s%d", typestruct.name, priv->unit); - if (ng_name_node(node, buf) != 0) + if (ng_name_node(node, buf) != 0) log(LOG_WARNING, "%s: can't acquire netgraph name\n", buf); priv->vnet = curvnet; priv->node = node; @@ -248,7 +248,7 @@ sizeof(priv->remote_priv)); } - break; + break; case NGM_WORMHOLE_STATUS: NG_MKRESPONSE(resp, msg, sizeof(priv->status), M_NOWAIT); @@ -257,15 +257,15 @@ else bcopy(&priv->status, resp->data, sizeof(priv->status)); - break; - default: - error = EINVAL; - break; + break; + default: + error = EINVAL; + break; } break; - default: - error = EINVAL; - break; + default: + error = EINVAL; + break; } NG_RESPOND_MSG(error, node, item, resp); NG_FREE_MSG(msg); @@ -274,8 +274,8 @@ static int ng_wormhole_peer_parse(const struct ng_parse_type *type, - const char *s, int *off, const u_char *const start, - u_char *const buf, int *buflen) + const char *s, int *off, const u_char *const start, + u_char *const buf, int *buflen) { char node_name_buf[NG_NODESIZ]; char *t; @@ -296,9 +296,9 @@ return (EINVAL); if ((len = t - (s + *off)) > sizeof(node_name_buf) - 1) return (EINVAL); - strncpy(node_name_buf, s + *off, len); - node_name_buf[len] = '\0'; - *off += len + 1; /* vnet name should be in &s[*off] now */ + strncpy(node_name_buf, s + *off, len); + node_name_buf[len] = '\0'; + *off += len + 1; /* vnet name should be in &s[*off] now */ /* XXX should lock all wormhole list here */ LIST_FOREACH(*remote_priv, &all_wormholes_head, all_wormholes_le) @@ -316,7 +316,7 @@ static int ng_wormhole_peer_unparse(const struct ng_parse_type *type, - const u_char *data, int *off, char *cbuf, int cbuflen) + const u_char *data, int *off, char *cbuf, int cbuflen) { const priv_p *remote_priv = (const priv_p *)(data + *off); @@ -332,7 +332,7 @@ static int ng_wormhole_status_unparse(const struct ng_parse_type *type, - const u_char *data, int *off, char *cbuf, int cbuflen) + const u_char *data, int *off, char *cbuf, int cbuflen) { const int *status = (const int *)(data + *off); @@ -373,7 +373,7 @@ static int ng_wormhole_rcvdata(hook_p hook, item_p item) { - priv_p priv = NG_NODE_PRIVATE(NG_HOOK_NODE(hook)); + priv_p priv = NG_NODE_PRIVATE(NG_HOOK_NODE(hook)); int error = 0; priv_p remote_priv = priv->remote_priv; struct mbuf *m; @@ -385,7 +385,7 @@ m = NGI_M(item); m->m_flags |= M_REMOTE_VNET; CURVNET_SET_QUIET(remote_priv->vnet); - NG_FWD_ITEM_HOOK(error, item, remote_priv->hook); + NG_FWD_ITEM_HOOK(error, item, remote_priv->hook); CURVNET_RESTORE(); } return (error); ==== //depot/projects/vimage-devel/src/sys/netinet/in_pcb.c#4 (text+ko) ==== @@ -128,8 +128,8 @@ #endif { #ifdef VIMAGE - INIT_VNET_INET(curvnet); - SYSCTL_RESOLVE_V_ARG1(); + INIT_VNET_INET(curvnet); + SYSCTL_RESOLVE_V_ARG1(); #endif int error; ==== //depot/projects/vimage-devel/src/sys/netinet/tcp_syncache.h#3 (text+ko) ==== @@ -1,6 +1,12 @@ /*- - * Copyright (c) 1982, 1986, 1993, 1994, 1995 - * The Regents of the University of California. All rights reserved. + * Copyright (c) 2001 McAfee, Inc. + * Copyright (c) 2006 Andre Oppermann, Internet Business Solutions AG + * All rights reserved. + * + * This software was developed for the FreeBSD Project by Jonathan Lemon + * and McAfee Research, the Security Research Division of McAfee, Inc. under + * DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the + * DARPA CHATS research program. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -10,14 +16,11 @@ * 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 + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) @@ -26,27 +29,95 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#)tcp_var.h 8.4 (Berkeley) 5/24/95 - * $FreeBSD: src/sys/netinet/tcp_syncache.h,v 1.2 2007/12/12 20:35:59 kmacy Exp $ + * XXX RCS ID */ #ifndef _NETINET_TCP_SYNCACHE_H_ #define _NETINET_TCP_SYNCACHE_H_ #ifdef _KERNEL -void syncache_init(void); -void syncache_unreach(struct in_conninfo *, struct tcphdr *); -int syncache_expand(struct in_conninfo *, struct tcpopt *, - struct tcphdr *, struct socket **, struct mbuf *); -void syncache_add(struct in_conninfo *, struct tcpopt *, - struct tcphdr *, struct inpcb *, struct socket **, struct mbuf *); -void syncache_offload_add(struct in_conninfo *, struct tcpopt *, - struct tcphdr *, struct inpcb *, struct socket **, - struct toe_usrreqs *tu, void *toepcb); -void syncache_chkrst(struct in_conninfo *, struct tcphdr *); -void syncache_badack(struct in_conninfo *); -int syncache_pcbcount(void); -int syncache_pcblist(struct sysctl_req *req, int max_pcbs, int *pcbs_exported); +void syncache_init(void); +#ifdef VIMAGE +void syncache_destroy(void); +#endif +void syncache_unreach(struct in_conninfo *, struct tcphdr *); +int syncache_expand(struct in_conninfo *, struct tcpopt *, + struct tcphdr *, struct socket **, struct mbuf *); +void syncache_add(struct in_conninfo *, struct tcpopt *, + struct tcphdr *, struct inpcb *, struct socket **, struct mbuf *); +void syncache_offload_add(struct in_conninfo *, struct tcpopt *, + struct tcphdr *, struct inpcb *, struct socket **, + struct toe_usrreqs *tu, void *toepcb); +void syncache_chkrst(struct in_conninfo *, struct tcphdr *); +void syncache_badack(struct in_conninfo *); +int syncache_pcbcount(void); +int syncache_pcblist(struct sysctl_req *req, int max_pcbs, + int *pcbs_exported); + +struct syncache { + TAILQ_ENTRY(syncache) sc_hash; + struct in_conninfo sc_inc; /* addresses */ + u_long sc_rxttime; /* retransmit time */ + u_int16_t sc_rxmits; /* retransmit counter */ + + u_int32_t sc_tsreflect; /* timestamp to reflect */ + u_int32_t sc_ts; /* our timestamp to send */ + u_int32_t sc_tsoff; /* ts offset w/ syncookies */ + u_int32_t sc_flowlabel; /* IPv6 flowlabel */ + tcp_seq sc_irs; /* seq from peer */ + tcp_seq sc_iss; /* our ISS */ + struct mbuf *sc_ipopts; /* source route */ + + u_int16_t sc_peer_mss; /* peer's MSS */ + u_int16_t sc_wnd; /* advertised window */ + u_int8_t sc_ip_ttl; /* IPv4 TTL */ + u_int8_t sc_ip_tos; /* IPv4 TOS */ + u_int8_t sc_requested_s_scale:4, + sc_requested_r_scale:4; + u_int8_t sc_flags; +#define SCF_NOOPT 0x01 /* no TCP options */ +#define SCF_WINSCALE 0x02 /* negotiated window scaling */ +#define SCF_TIMESTAMP 0x04 /* negotiated timestamps */ + /* MSS is implicit */ +#define SCF_UNREACH 0x10 /* icmp unreachable received */ +#define SCF_SIGNATURE 0x20 /* send MD5 digests */ +#define SCF_SACK 0x80 /* send SACK option */ +#ifndef TCP_OFFLOAD_DISABLE + struct toe_usrreqs *sc_tu; /* TOE operations */ + void *sc_toepcb; /* TOE protocol block */ +#endif +#ifdef MAC + struct label *sc_label; /* MAC label reference */ +#endif +}; + +#define SYNCOOKIE_SECRET_SIZE 8 /* dwords */ +#define SYNCOOKIE_LIFETIME 16 /* seconds */ + +struct syncache_head { + struct mtx sch_mtx; + TAILQ_HEAD(sch_head, syncache) sch_bucket; + struct vnet *sch_vnet; + struct callout sch_timer; + int sch_nextc; + u_int sch_length; + u_int sch_oddeven; + u_int32_t sch_secbits_odd[SYNCOOKIE_SECRET_SIZE]; + u_int32_t sch_secbits_even[SYNCOOKIE_SECRET_SIZE]; + u_int sch_reseed; /* time_uptime, seconds */ +}; + +struct tcp_syncache { + struct syncache_head *hashbase; + uma_zone_t zone; + u_int hashsize; + u_int hashmask; + u_int bucket_limit; + u_int cache_count; /* XXX: unprotected */ + u_int cache_limit; + u_int rexmt_limit; + u_int hash_secret; +}; #endif /* _KERNEL */ -#endif /* _NETINET_TCP_SYNCACHE_H_ */ +#endif /* !_NETINET_TCP_SYNCACHE_H_ */ From owner-p4-projects@FreeBSD.ORG Thu Jun 19 05:57:55 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9E3B8106566B; Thu, 19 Jun 2008 05:57:55 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6077C106568F for ; Thu, 19 Jun 2008 05:57:55 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 599E48FC17 for ; Thu, 19 Jun 2008 05:57:55 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5J5vtWt029737 for ; Thu, 19 Jun 2008 05:57:55 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5J5vtpN029735 for perforce@freebsd.org; Thu, 19 Jun 2008 05:57:55 GMT (envelope-from julian@freebsd.org) Date: Thu, 19 Jun 2008 05:57:55 GMT Message-Id: <200806190557.m5J5vtpN029735@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 143746 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Jun 2008 05:57:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=143746 Change 143746 by julian@julian_trafmon1 on 2008/06/19 05:57:37 white space diffs and such Affected files ... .. //depot/projects/vimage-devel/src/sys/i386/i386/dump_machdep.c#5 edit .. //depot/projects/vimage-devel/src/sys/i386/i386/minidump_machdep.c#5 edit .. //depot/projects/vimage-devel/src/sys/kern/kern_xxx.c#4 edit Differences ... ==== //depot/projects/vimage-devel/src/sys/i386/i386/dump_machdep.c#5 (text+ko) ==== @@ -112,7 +112,6 @@ mkdumpheader(struct kerneldumpheader *kdh, uint32_t archver, uint64_t dumplen, uint32_t blksz) { - INIT_VPROCG(TD_TO_VPROCG(&thread0)); /* XXX */ bzero(kdh, sizeof(*kdh)); strncpy(kdh->magic, KERNELDUMPMAGIC, sizeof(kdh->magic)); ==== //depot/projects/vimage-devel/src/sys/i386/i386/minidump_machdep.c#5 (text) ==== @@ -86,7 +86,6 @@ mkdumpheader(struct kerneldumpheader *kdh, uint32_t archver, uint64_t dumplen, uint32_t blksz) { - INIT_VPROCG(TD_TO_VPROCG(curthread)); bzero(kdh, sizeof(*kdh)); strncpy(kdh->magic, KERNELDUMPMAGIC, sizeof(kdh->magic)); ==== //depot/projects/vimage-devel/src/sys/kern/kern_xxx.c#4 (text+ko) ==== @@ -273,21 +273,20 @@ struct setdomainname_args *uap; { INIT_VPROCG(TD_TO_VPROCG(td)); - int error, domainnamelen; + int error, domainnamelen; error = priv_check(td, PRIV_SETDOMAINNAME); -printf("setdomainname error=%d\n", error); if (error) return (error); mtx_lock(&Giant); - if ((u_int)uap->len > sizeof (V_domainname) - 1) { + if ((u_int)uap->len > sizeof (V_domainname) - 1) { error = EINVAL; goto done2; } - domainnamelen = uap->len; - error = copyin(uap->domainname, V_domainname, uap->len); - V_domainname[domainnamelen] = 0; + domainnamelen = uap->len; + error = copyin(uap->domainname, V_domainname, uap->len); + V_domainname[domainnamelen] = 0; done2: mtx_unlock(&Giant); - return (error); + return (error); } From owner-p4-projects@FreeBSD.ORG Thu Jun 19 06:03:01 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DA4A41065686; Thu, 19 Jun 2008 06:03:00 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9C51A10656B4 for ; Thu, 19 Jun 2008 06:03:00 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 951328FC2C for ; Thu, 19 Jun 2008 06:03:00 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5J630IS030185 for ; Thu, 19 Jun 2008 06:03:00 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5J630Rf030183 for perforce@freebsd.org; Thu, 19 Jun 2008 06:03:00 GMT (envelope-from julian@freebsd.org) Date: Thu, 19 Jun 2008 06:03:00 GMT Message-Id: <200806190603.m5J630Rf030183@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 143747 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Jun 2008 06:03:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=143747 Change 143747 by julian@julian_trafmon1 on 2008/06/19 06:02:07 Some comments Affected files ... .. //depot/projects/vimage-devel/src/sys/kern/kern_linker.c#3 edit Differences ... ==== //depot/projects/vimage-devel/src/sys/kern/kern_linker.c#3 (text+ko) ==== @@ -962,9 +962,14 @@ return (error); #ifdef VIMAGE + /* For now permit only the default vimage to kldload modules */ if (!IS_DEFAULT_VIMAGE(TD_TO_VIMAGE(td))) return (EPERM); + /* + * It's possible that kldloaded module will attach a new ifnet, + * so vnet context must be set when this ocurs. + */ CURVNET_SET(TD_TO_VNET(td)); #endif @@ -1297,6 +1302,10 @@ } } #ifdef VIMAGE + /* + * If symbol not found in global namespace, look up + * for it in the current vnet. + */ if (lf == NULL) { CURVNET_SET(TD_TO_VNET(td)); error = vi_symlookup(&lookup, symstr); From owner-p4-projects@FreeBSD.ORG Thu Jun 19 06:11:09 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8664A10656A8; Thu, 19 Jun 2008 06:11:09 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 47867106568D for ; Thu, 19 Jun 2008 06:11:09 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F40BD8FC12 for ; Thu, 19 Jun 2008 06:11:08 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5J6B8f6032014 for ; Thu, 19 Jun 2008 06:11:08 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5J6B82L032012 for perforce@freebsd.org; Thu, 19 Jun 2008 06:11:08 GMT (envelope-from julian@freebsd.org) Date: Thu, 19 Jun 2008 06:11:08 GMT Message-Id: <200806190611.m5J6B82L032012@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 143748 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Jun 2008 06:11:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=143748 Change 143748 by julian@julian_trafmon1 on 2008/06/19 06:10:30 Remove NOTYET code.. it is in the devel branch. no point in cluttering up this diff with it. Affected files ... .. //depot/projects/vimage/src/sys/kern/kern_exit.c#20 edit .. //depot/projects/vimage/src/sys/kern/kern_vimage.c#63 edit .. //depot/projects/vimage/src/sys/sys/vimage.h#57 edit Differences ... ==== //depot/projects/vimage/src/sys/kern/kern_exit.c#20 (text+ko) ==== @@ -418,10 +418,6 @@ LIST_REMOVE(p, p_list); LIST_INSERT_HEAD(&zombproc, p, p_list); LIST_REMOVE(p, p_hash); -#if defined(NOTYET) && defined(VIMAGE) && defined(SCHED_4BSD) - if (P_TO_VPROCG(p) != P_TO_VPROCG(p->p_pptr)) - sched_load_reassign(P_TO_VPROCG(p), P_TO_VPROCG(p->p_pptr)); -#endif sx_xunlock(&allproc_lock); /* ==== //depot/projects/vimage/src/sys/kern/kern_vimage.c#63 (text+ko) ==== @@ -527,10 +527,6 @@ case SIOCGPVIMAGE: vimage_relative_name(vip, vip_r, vi_req->vi_name, sizeof (vi_req->vi_name)); -#ifdef NOTYET - bcopy(&vip_r->v_procg->_averunnable, &vi_req->averunnable, - sizeof (vi_req->averunnable)); -#endif vi_req->vi_proc_count = vip_r->v_procg->nprocs; vi_req->vi_if_count = vip_r->v_net->ifccnt; vi_req->vi_sock_count = vip_r->v_net->sockcnt; ==== //depot/projects/vimage/src/sys/sys/vimage.h#57 (text+ko) ==== @@ -326,13 +326,6 @@ #define V_domainname VPROCG(domainname) #define V_morphing_symlinks VPROCG(morphing_symlinks) -#ifdef NOTYET -#define V_cp_time VPROCG(cp_time) -#define V_averunnable VPROCG(averunnable) -#define V_sched_tdcnt VPROCG(sched_tdcnt) -#define V_tdq_sysload VPROCG(tdq_sysload) -#endif - #define V_acc_statcalls VCPU(acc_statcalls) #define V_avg1_fixp VCPU(avg1_fixp) #define V_avg2_fixp VCPU(avg2_fixp) From owner-p4-projects@FreeBSD.ORG Thu Jun 19 06:51:51 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 28F161065675; Thu, 19 Jun 2008 06:51:51 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DEEF81065673 for ; Thu, 19 Jun 2008 06:51:50 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D46488FC12 for ; Thu, 19 Jun 2008 06:51:50 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5J6poAx040211 for ; Thu, 19 Jun 2008 06:51:50 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5J6poto040209 for perforce@freebsd.org; Thu, 19 Jun 2008 06:51:50 GMT (envelope-from julian@freebsd.org) Date: Thu, 19 Jun 2008 06:51:50 GMT Message-Id: <200806190651.m5J6poto040209@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 143750 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Jun 2008 06:51:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=143750 Change 143750 by julian@julian_trafmon1 on 2008/06/19 06:51:46 G_hostname doesn't need special treatment Affected files ... .. //depot/projects/vimage/src/sys/amd64/amd64/dump_machdep.c#6 edit .. //depot/projects/vimage/src/sys/amd64/amd64/minidump_machdep.c#6 edit .. //depot/projects/vimage/src/sys/arm/arm/dump_machdep.c#5 edit .. //depot/projects/vimage/src/sys/ia64/ia64/dump_machdep.c#5 edit .. //depot/projects/vimage/src/sys/sparc64/sparc64/dump_machdep.c#5 edit .. //depot/projects/vimage/src/sys/sun4v/sun4v/dump_machdep.c#5 edit Differences ... ==== //depot/projects/vimage/src/sys/amd64/amd64/dump_machdep.c#6 (text+ko) ==== @@ -112,7 +112,6 @@ mkdumpheader(struct kerneldumpheader *kdh, uint32_t archver, uint64_t dumplen, uint32_t blksz) { - INIT_VPROCG(TD_TO_VPROCG(&thread0)); /* XXX */ bzero(kdh, sizeof(*kdh)); strncpy(kdh->magic, KERNELDUMPMAGIC, sizeof(kdh->magic)); ==== //depot/projects/vimage/src/sys/amd64/amd64/minidump_machdep.c#6 (text) ==== @@ -88,7 +88,6 @@ mkdumpheader(struct kerneldumpheader *kdh, uint32_t archver, uint64_t dumplen, uint32_t blksz) { - INIT_VPROCG(TD_TO_VPROCG(curthread)); /* XXX */ bzero(kdh, sizeof(*kdh)); strncpy(kdh->magic, KERNELDUMPMAGIC, sizeof(kdh->magic)); ==== //depot/projects/vimage/src/sys/arm/arm/dump_machdep.c#5 (text+ko) ==== @@ -110,7 +110,6 @@ mkdumpheader(struct kerneldumpheader *kdh, uint32_t archver, uint64_t dumplen, uint32_t blksz) { - INIT_VPROCG(TD_TO_VPROCG(&thread0)); /* XXX */ bzero(kdh, sizeof(*kdh)); strncpy(kdh->magic, KERNELDUMPMAGIC, sizeof(kdh->magic)); ==== //depot/projects/vimage/src/sys/ia64/ia64/dump_machdep.c#5 (text+ko) ==== @@ -67,7 +67,6 @@ mkdumpheader(struct kerneldumpheader *kdh, uint32_t archver, uint64_t dumplen, uint32_t blksz) { - INIT_VPROCG(TD_TO_VPROCG(&thread0)); /* XXX */ bzero(kdh, sizeof(*kdh)); strncpy(kdh->magic, KERNELDUMPMAGIC, sizeof(kdh->magic)); ==== //depot/projects/vimage/src/sys/sparc64/sparc64/dump_machdep.c#5 (text+ko) ==== @@ -63,7 +63,6 @@ mkdumpheader(struct kerneldumpheader *kdh, uint32_t archver, uint64_t dumplen, uint32_t blksz) { - INIT_VPROCG(TD_TO_VPROCG(&thread0)); /* XXX */ bzero(kdh, sizeof(*kdh)); strncpy(kdh->magic, KERNELDUMPMAGIC, sizeof(kdh->magic)); ==== //depot/projects/vimage/src/sys/sun4v/sun4v/dump_machdep.c#5 (text+ko) ==== @@ -64,7 +64,6 @@ mkdumpheader(struct kerneldumpheader *kdh, uint32_t archver, uint64_t dumplen, uint32_t blksz) { - INIT_VPROCG(TD_TO_VPROCG(&thread0)); /* XXX */ bzero(kdh, sizeof(*kdh)); strncpy(kdh->magic, KERNELDUMPMAGIC, sizeof(kdh->magic)); From owner-p4-projects@FreeBSD.ORG Thu Jun 19 06:54:54 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5BFE51065686; Thu, 19 Jun 2008 06:54:54 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1CE15106567A for ; Thu, 19 Jun 2008 06:54:54 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 122D38FC29 for ; Thu, 19 Jun 2008 06:54:54 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5J6srwI040411 for ; Thu, 19 Jun 2008 06:54:53 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5J6srfR040409 for perforce@freebsd.org; Thu, 19 Jun 2008 06:54:53 GMT (envelope-from julian@freebsd.org) Date: Thu, 19 Jun 2008 06:54:53 GMT Message-Id: <200806190654.m5J6srfR040409@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 143751 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Jun 2008 06:54:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=143751 Change 143751 by julian@julian_trafmon1 on 2008/06/19 06:54:31 IFvimage@143750 Don't need to set up locals when using G_hostname Affected files ... .. //depot/projects/vimage-devel/src/sys/amd64/amd64/dump_machdep.c#4 integrate .. //depot/projects/vimage-devel/src/sys/amd64/amd64/minidump_machdep.c#4 integrate .. //depot/projects/vimage-devel/src/sys/arm/arm/dump_machdep.c#4 integrate .. //depot/projects/vimage-devel/src/sys/ia64/ia64/dump_machdep.c#4 integrate .. //depot/projects/vimage-devel/src/sys/sparc64/sparc64/dump_machdep.c#4 integrate .. //depot/projects/vimage-devel/src/sys/sun4v/sun4v/dump_machdep.c#4 integrate Differences ... ==== //depot/projects/vimage-devel/src/sys/amd64/amd64/dump_machdep.c#4 (text+ko) ==== @@ -112,7 +112,6 @@ mkdumpheader(struct kerneldumpheader *kdh, uint32_t archver, uint64_t dumplen, uint32_t blksz) { - INIT_VPROCG(TD_TO_VPROCG(&thread0)); /* XXX */ bzero(kdh, sizeof(*kdh)); strncpy(kdh->magic, KERNELDUMPMAGIC, sizeof(kdh->magic)); ==== //depot/projects/vimage-devel/src/sys/amd64/amd64/minidump_machdep.c#4 (text) ==== @@ -88,7 +88,6 @@ mkdumpheader(struct kerneldumpheader *kdh, uint32_t archver, uint64_t dumplen, uint32_t blksz) { - INIT_VPROCG(TD_TO_VPROCG(curthread)); /* XXX */ bzero(kdh, sizeof(*kdh)); strncpy(kdh->magic, KERNELDUMPMAGIC, sizeof(kdh->magic)); ==== //depot/projects/vimage-devel/src/sys/arm/arm/dump_machdep.c#4 (text+ko) ==== @@ -110,7 +110,6 @@ mkdumpheader(struct kerneldumpheader *kdh, uint32_t archver, uint64_t dumplen, uint32_t blksz) { - INIT_VPROCG(TD_TO_VPROCG(&thread0)); /* XXX */ bzero(kdh, sizeof(*kdh)); strncpy(kdh->magic, KERNELDUMPMAGIC, sizeof(kdh->magic)); ==== //depot/projects/vimage-devel/src/sys/ia64/ia64/dump_machdep.c#4 (text+ko) ==== @@ -67,7 +67,6 @@ mkdumpheader(struct kerneldumpheader *kdh, uint32_t archver, uint64_t dumplen, uint32_t blksz) { - INIT_VPROCG(TD_TO_VPROCG(&thread0)); /* XXX */ bzero(kdh, sizeof(*kdh)); strncpy(kdh->magic, KERNELDUMPMAGIC, sizeof(kdh->magic)); ==== //depot/projects/vimage-devel/src/sys/sparc64/sparc64/dump_machdep.c#4 (text+ko) ==== @@ -63,7 +63,6 @@ mkdumpheader(struct kerneldumpheader *kdh, uint32_t archver, uint64_t dumplen, uint32_t blksz) { - INIT_VPROCG(TD_TO_VPROCG(&thread0)); /* XXX */ bzero(kdh, sizeof(*kdh)); strncpy(kdh->magic, KERNELDUMPMAGIC, sizeof(kdh->magic)); ==== //depot/projects/vimage-devel/src/sys/sun4v/sun4v/dump_machdep.c#4 (text+ko) ==== @@ -64,7 +64,6 @@ mkdumpheader(struct kerneldumpheader *kdh, uint32_t archver, uint64_t dumplen, uint32_t blksz) { - INIT_VPROCG(TD_TO_VPROCG(&thread0)); /* XXX */ bzero(kdh, sizeof(*kdh)); strncpy(kdh->magic, KERNELDUMPMAGIC, sizeof(kdh->magic)); From owner-p4-projects@FreeBSD.ORG Thu Jun 19 08:10:10 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8E0C81065678; Thu, 19 Jun 2008 08:10:10 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4EA171065672 for ; Thu, 19 Jun 2008 08:10:10 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3E2938FC28 for ; Thu, 19 Jun 2008 08:10:10 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5J8AAt1049154 for ; Thu, 19 Jun 2008 08:10:10 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5J8A9Li049152 for perforce@freebsd.org; Thu, 19 Jun 2008 08:10:09 GMT (envelope-from julian@freebsd.org) Date: Thu, 19 Jun 2008 08:10:09 GMT Message-Id: <200806190810.m5J8A9Li049152@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 143754 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Jun 2008 08:10:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=143754 Change 143754 by julian@julian_trafmon1 on 2008/06/19 08:09:15 slight changes from vimage branch Affected files ... .. //depot/projects/vimage-commit/src/sys/amd64/amd64/dump_machdep.c#4 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/minidump_machdep.c#4 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/dump_machdep.c#4 integrate .. //depot/projects/vimage-commit/src/sys/compat/linprocfs/linprocfs.c#5 integrate .. //depot/projects/vimage-commit/src/sys/compat/linux/linux_ioctl.c#3 integrate .. //depot/projects/vimage-commit/src/sys/compat/linux/linux_misc.c#5 integrate .. //depot/projects/vimage-commit/src/sys/conf/files#5 integrate .. //depot/projects/vimage-commit/src/sys/conf/options#3 integrate .. //depot/projects/vimage-commit/src/sys/contrib/pf/net/if_pflog.c#2 integrate .. //depot/projects/vimage-commit/src/sys/contrib/pf/net/if_pflog.h#2 integrate .. //depot/projects/vimage-commit/src/sys/contrib/pf/net/if_pfsync.h#2 integrate .. //depot/projects/vimage-commit/src/sys/contrib/pf/net/pf_mtag.h#2 integrate .. //depot/projects/vimage-commit/src/sys/contrib/pf/net/pf_norm.c#2 integrate .. //depot/projects/vimage-commit/src/sys/contrib/pf/net/pf_osfp.c#2 integrate .. //depot/projects/vimage-commit/src/sys/contrib/pf/net/pf_ruleset.c#2 integrate .. //depot/projects/vimage-commit/src/sys/contrib/pf/net/pfvar.h#4 integrate .. //depot/projects/vimage-commit/src/sys/contrib/pf/netinet/in4_cksum.c#2 integrate .. //depot/projects/vimage-commit/src/sys/ddb/db_command.c#2 integrate .. //depot/projects/vimage-commit/src/sys/ddb/db_textdump.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/firewire/firewire.c#3 integrate .. //depot/projects/vimage-commit/src/sys/fs/cd9660/cd9660_rrip.c#3 integrate .. //depot/projects/vimage-commit/src/sys/i386/conf/NOTES#4 integrate .. //depot/projects/vimage-commit/src/sys/i386/i386/dump_machdep.c#4 integrate .. //depot/projects/vimage-commit/src/sys/i386/i386/minidump_machdep.c#4 integrate .. //depot/projects/vimage-commit/src/sys/ia64/ia64/dump_machdep.c#4 integrate .. //depot/projects/vimage-commit/src/sys/kern/init_main.c#2 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_clock.c#2 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_exit.c#2 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_fork.c#2 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_jail.c#3 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_linker.c#3 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_mib.c#3 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_prot.c#2 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_switch.c#2 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_synch.c#4 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_sysctl.c#2 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_timeout.c#2 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_uuid.c#3 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_vimage.c#1 branch .. //depot/projects/vimage-commit/src/sys/kern/kern_xxx.c#3 integrate .. //depot/projects/vimage-commit/src/sys/kern/sched_4bsd.c#2 integrate .. //depot/projects/vimage-commit/src/sys/kern/subr_pcpu.c#2 integrate .. //depot/projects/vimage-commit/src/sys/kern/sys_socket.c#2 integrate .. //depot/projects/vimage-commit/src/sys/kern/tty.c#3 integrate .. //depot/projects/vimage-commit/src/sys/kern/uipc_domain.c#2 integrate .. //depot/projects/vimage-commit/src/sys/kern/uipc_socket.c#2 integrate .. //depot/projects/vimage-commit/src/sys/kern/uipc_syscalls.c#2 integrate .. //depot/projects/vimage-commit/src/sys/kern/uipc_usrreq.c#2 integrate .. //depot/projects/vimage-commit/src/sys/kern/vfs_export.c#3 integrate .. //depot/projects/vimage-commit/src/sys/kern/vfs_lookup.c#2 integrate .. //depot/projects/vimage-commit/src/sys/modules/Makefile#4 integrate .. //depot/projects/vimage-commit/src/sys/modules/netgraph/Makefile#2 integrate .. //depot/projects/vimage-commit/src/sys/modules/netgraph/pipe/Makefile#1 branch .. //depot/projects/vimage-commit/src/sys/modules/netgraph/wormhole/Makefile#1 branch .. //depot/projects/vimage-commit/src/sys/net/bpf.c#2 integrate .. //depot/projects/vimage-commit/src/sys/net/bpf.h#2 integrate .. //depot/projects/vimage-commit/src/sys/net/if.c#4 integrate .. //depot/projects/vimage-commit/src/sys/net/if_clone.c#2 integrate .. //depot/projects/vimage-commit/src/sys/net/if_ethersubr.c#3 integrate .. //depot/projects/vimage-commit/src/sys/net/if_faith.c#3 integrate .. //depot/projects/vimage-commit/src/sys/net/if_gif.c#3 integrate .. //depot/projects/vimage-commit/src/sys/net/if_gif.h#4 integrate .. //depot/projects/vimage-commit/src/sys/net/if_gre.c#2 integrate .. //depot/projects/vimage-commit/src/sys/net/if_loop.c#3 integrate .. //depot/projects/vimage-commit/src/sys/net/if_mib.c#3 integrate .. //depot/projects/vimage-commit/src/sys/net/if_ppp.c#2 integrate .. //depot/projects/vimage-commit/src/sys/net/if_spppsubr.c#2 integrate .. //depot/projects/vimage-commit/src/sys/net/if_stf.c#4 integrate .. //depot/projects/vimage-commit/src/sys/net/if_tap.c#4 integrate .. //depot/projects/vimage-commit/src/sys/net/if_tun.c#4 integrate .. //depot/projects/vimage-commit/src/sys/net/if_var.h#4 integrate .. //depot/projects/vimage-commit/src/sys/net/if_vlan.c#3 integrate .. //depot/projects/vimage-commit/src/sys/net/netisr.c#2 integrate .. //depot/projects/vimage-commit/src/sys/net/raw_cb.c#4 integrate .. //depot/projects/vimage-commit/src/sys/net/raw_cb.h#2 integrate .. //depot/projects/vimage-commit/src/sys/net/raw_usrreq.c#4 integrate .. //depot/projects/vimage-commit/src/sys/net/route.c#3 integrate .. //depot/projects/vimage-commit/src/sys/net/rtsock.c#3 integrate .. //depot/projects/vimage-commit/src/sys/net/vnet.h#1 branch .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211.c#3 integrate .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_ddb.c#3 integrate .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_freebsd.c#2 integrate .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_ioctl.c#2 integrate .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_var.h#3 integrate .. //depot/projects/vimage-commit/src/sys/netgraph/netgraph.h#3 integrate .. //depot/projects/vimage-commit/src/sys/netgraph/ng_bridge.c#2 integrate .. //depot/projects/vimage-commit/src/sys/netgraph/ng_eiface.c#4 integrate .. //depot/projects/vimage-commit/src/sys/netgraph/ng_ether.c#3 integrate .. //depot/projects/vimage-commit/src/sys/netgraph/ng_hub.c#2 integrate .. //depot/projects/vimage-commit/src/sys/netgraph/ng_iface.c#3 integrate .. //depot/projects/vimage-commit/src/sys/netgraph/ng_pipe.c#1 branch .. //depot/projects/vimage-commit/src/sys/netgraph/ng_pipe.h#1 branch .. //depot/projects/vimage-commit/src/sys/netgraph/ng_wormhole.c#1 branch .. //depot/projects/vimage-commit/src/sys/netgraph/vnetgraph.h#1 branch .. //depot/projects/vimage-commit/src/sys/netinet/icmp_var.h#2 integrate .. //depot/projects/vimage-commit/src/sys/netinet/if_ether.c#3 integrate .. //depot/projects/vimage-commit/src/sys/netinet/igmp.c#3 integrate .. //depot/projects/vimage-commit/src/sys/netinet/in.c#3 integrate .. //depot/projects/vimage-commit/src/sys/netinet/in_gif.c#3 integrate .. //depot/projects/vimage-commit/src/sys/netinet/in_gif.h#2 integrate .. //depot/projects/vimage-commit/src/sys/netinet/in_mcast.c#4 integrate .. //depot/projects/vimage-commit/src/sys/netinet/in_pcb.c#3 integrate .. //depot/projects/vimage-commit/src/sys/netinet/in_pcb.h#2 integrate .. //depot/projects/vimage-commit/src/sys/netinet/in_proto.c#2 integrate .. //depot/projects/vimage-commit/src/sys/netinet/in_rmx.c#4 integrate .. //depot/projects/vimage-commit/src/sys/netinet/in_var.h#2 integrate .. //depot/projects/vimage-commit/src/sys/netinet/ip6.h#4 integrate .. //depot/projects/vimage-commit/src/sys/netinet/ip_carp.c#2 integrate .. //depot/projects/vimage-commit/src/sys/netinet/ip_divert.c#2 integrate .. //depot/projects/vimage-commit/src/sys/netinet/ip_fastfwd.c#3 integrate .. //depot/projects/vimage-commit/src/sys/netinet/ip_fw.h#3 integrate .. //depot/projects/vimage-commit/src/sys/netinet/ip_fw2.c#4 integrate .. //depot/projects/vimage-commit/src/sys/netinet/ip_fw_nat.c#4 integrate .. //depot/projects/vimage-commit/src/sys/netinet/ip_fw_pfil.c#3 integrate .. //depot/projects/vimage-commit/src/sys/netinet/ip_icmp.c#3 integrate .. //depot/projects/vimage-commit/src/sys/netinet/ip_ipsec.c#4 integrate .. //depot/projects/vimage-commit/src/sys/netinet/ip_mroute.c#3 integrate .. //depot/projects/vimage-commit/src/sys/netinet/ip_options.c#3 integrate .. //depot/projects/vimage-commit/src/sys/netinet/ip_output.c#3 integrate .. //depot/projects/vimage-commit/src/sys/netinet/ip_var.h#2 integrate .. //depot/projects/vimage-commit/src/sys/netinet/ipprotosw.h#2 integrate .. //depot/projects/vimage-commit/src/sys/netinet/raw_ip.c#4 integrate .. //depot/projects/vimage-commit/src/sys/netinet/sctp_output.c#3 integrate .. //depot/projects/vimage-commit/src/sys/netinet/tcp_hostcache.c#4 integrate .. //depot/projects/vimage-commit/src/sys/netinet/tcp_hostcache.h#1 branch .. //depot/projects/vimage-commit/src/sys/netinet/tcp_input.c#3 integrate .. //depot/projects/vimage-commit/src/sys/netinet/tcp_output.c#3 integrate .. //depot/projects/vimage-commit/src/sys/netinet/tcp_reass.c#3 integrate .. //depot/projects/vimage-commit/src/sys/netinet/tcp_sack.c#3 integrate .. //depot/projects/vimage-commit/src/sys/netinet/tcp_subr.c#4 integrate .. //depot/projects/vimage-commit/src/sys/netinet/tcp_syncache.c#4 integrate .. //depot/projects/vimage-commit/src/sys/netinet/tcp_timer.c#3 integrate .. //depot/projects/vimage-commit/src/sys/netinet/tcp_timewait.c#3 integrate .. //depot/projects/vimage-commit/src/sys/netinet/tcp_usrreq.c#3 integrate .. //depot/projects/vimage-commit/src/sys/netinet/tcp_var.h#2 integrate .. //depot/projects/vimage-commit/src/sys/netinet/udp_usrreq.c#3 integrate .. //depot/projects/vimage-commit/src/sys/netinet/udp_var.h#2 integrate .. //depot/projects/vimage-commit/src/sys/netinet/vinet.h#1 branch .. //depot/projects/vimage-commit/src/sys/netinet6/dest6.c#3 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/frag6.c#3 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/icmp6.c#3 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/in6.c#3 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/in6_gif.c#3 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/in6_ifattach.c#3 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/in6_pcb.c#3 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/in6_rmx.c#4 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/in6_src.c#3 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/in6_var.h#2 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/ip6_forward.c#3 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/ip6_input.c#4 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/ip6_ipsec.c#4 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/ip6_mroute.c#3 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/ip6_output.c#3 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/ip6_var.h#2 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/ip6protosw.h#2 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/mld6.c#3 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/nd6.c#4 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/nd6.h#3 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/nd6_nbr.c#4 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/nd6_rtr.c#3 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/raw_ip6.c#3 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/route6.c#3 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/scope6.c#4 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/sctp6_usrreq.c#4 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/udp6_usrreq.c#3 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/vinet6.h#1 branch .. //depot/projects/vimage-commit/src/sys/netipsec/ipsec.c#4 integrate .. //depot/projects/vimage-commit/src/sys/netipsec/ipsec.h#4 integrate .. //depot/projects/vimage-commit/src/sys/netipsec/ipsec_input.c#3 integrate .. //depot/projects/vimage-commit/src/sys/netipsec/ipsec_mbuf.c#3 integrate .. //depot/projects/vimage-commit/src/sys/netipsec/ipsec_output.c#3 integrate .. //depot/projects/vimage-commit/src/sys/netipsec/key.c#3 integrate .. //depot/projects/vimage-commit/src/sys/netipsec/key.h#2 integrate .. //depot/projects/vimage-commit/src/sys/netipsec/key_debug.h#3 integrate .. //depot/projects/vimage-commit/src/sys/netipsec/keysock.c#4 integrate .. //depot/projects/vimage-commit/src/sys/netipsec/keysock.h#2 integrate .. //depot/projects/vimage-commit/src/sys/netipsec/vipsec.h#1 branch .. //depot/projects/vimage-commit/src/sys/netipsec/xform_ah.c#3 integrate .. //depot/projects/vimage-commit/src/sys/netipsec/xform_esp.c#4 integrate .. //depot/projects/vimage-commit/src/sys/netipsec/xform_ipcomp.c#3 integrate .. //depot/projects/vimage-commit/src/sys/netipsec/xform_ipip.c#3 integrate .. //depot/projects/vimage-commit/src/sys/nfsclient/nfs_diskless.c#3 integrate .. //depot/projects/vimage-commit/src/sys/nfsclient/nfs_socket.c#3 integrate .. //depot/projects/vimage-commit/src/sys/nfsclient/nfs_vfsops.c#3 integrate .. //depot/projects/vimage-commit/src/sys/nfsclient/nfs_vnops.c#3 integrate .. //depot/projects/vimage-commit/src/sys/rpc/auth_unix.c#2 integrate .. //depot/projects/vimage-commit/src/sys/rpc/authunix_prot.c#3 integrate .. //depot/projects/vimage-commit/src/sys/rpc/clnt_dg.c#2 integrate .. //depot/projects/vimage-commit/src/sys/rpc/rpc_generic.c#2 integrate .. //depot/projects/vimage-commit/src/sys/rpc/svc_dg.c#2 integrate .. //depot/projects/vimage-commit/src/sys/rpc/svc_generic.c#2 integrate .. //depot/projects/vimage-commit/src/sys/sparc64/sparc64/dump_machdep.c#4 integrate .. //depot/projects/vimage-commit/src/sys/sun4v/sun4v/dump_machdep.c#4 integrate .. //depot/projects/vimage-commit/src/sys/sys/domain.h#2 integrate .. //depot/projects/vimage-commit/src/sys/sys/kernel.h#2 integrate .. //depot/projects/vimage-commit/src/sys/sys/mbuf.h#2 integrate .. //depot/projects/vimage-commit/src/sys/sys/proc.h#2 integrate .. //depot/projects/vimage-commit/src/sys/sys/protosw.h#2 integrate .. //depot/projects/vimage-commit/src/sys/sys/resource.h#2 integrate .. //depot/projects/vimage-commit/src/sys/sys/sched.h#2 integrate .. //depot/projects/vimage-commit/src/sys/sys/socketvar.h#2 integrate .. //depot/projects/vimage-commit/src/sys/sys/sockio.h#2 integrate .. //depot/projects/vimage-commit/src/sys/sys/ucred.h#2 integrate .. //depot/projects/vimage-commit/src/sys/vm/vm_meter.c#3 integrate .. //depot/projects/vimage-commit/src/usr.sbin/vimage/Makefile#1 branch .. //depot/projects/vimage-commit/src/usr.sbin/vimage/vimage.8#1 branch .. //depot/projects/vimage-commit/src/usr.sbin/vimage/vimage.c#1 branch Differences ... ==== //depot/projects/vimage-commit/src/sys/amd64/amd64/dump_machdep.c#4 (text+ko) ==== @@ -112,7 +112,6 @@ mkdumpheader(struct kerneldumpheader *kdh, uint32_t archver, uint64_t dumplen, uint32_t blksz) { - INIT_VPROCG(TD_TO_VPROCG(&thread0)); /* XXX */ bzero(kdh, sizeof(*kdh)); strncpy(kdh->magic, KERNELDUMPMAGIC, sizeof(kdh->magic)); ==== //depot/projects/vimage-commit/src/sys/amd64/amd64/minidump_machdep.c#4 (text) ==== @@ -88,7 +88,6 @@ mkdumpheader(struct kerneldumpheader *kdh, uint32_t archver, uint64_t dumplen, uint32_t blksz) { - INIT_VPROCG(TD_TO_VPROCG(curthread)); /* XXX */ bzero(kdh, sizeof(*kdh)); strncpy(kdh->magic, KERNELDUMPMAGIC, sizeof(kdh->magic)); ==== //depot/projects/vimage-commit/src/sys/arm/arm/dump_machdep.c#4 (text+ko) ==== @@ -110,7 +110,6 @@ mkdumpheader(struct kerneldumpheader *kdh, uint32_t archver, uint64_t dumplen, uint32_t blksz) { - INIT_VPROCG(TD_TO_VPROCG(&thread0)); /* XXX */ bzero(kdh, sizeof(*kdh)); strncpy(kdh->magic, KERNELDUMPMAGIC, sizeof(kdh->magic)); ==== //depot/projects/vimage-commit/src/sys/compat/linprocfs/linprocfs.c#5 (text+ko) ==== @@ -1002,7 +1002,7 @@ static int linprocfs_donetdev(PFS_FILL_ARGS) { - INIT_VNET_NET(curvnet); + INIT_VNET_NET(TD_TO_VNET(curthread)); char ifname[16]; /* XXX LINUX_IFNAMSIZ */ struct ifnet *ifp; ==== //depot/projects/vimage-commit/src/sys/compat/linux/linux_ioctl.c#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/compat/linux/linux_misc.c#5 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/conf/files#5 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/conf/options#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/contrib/pf/net/if_pflog.c#2 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/contrib/pf/net/if_pflog.h#2 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/contrib/pf/net/if_pfsync.h#2 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/contrib/pf/net/pf_mtag.h#2 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/contrib/pf/net/pf_norm.c#2 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/contrib/pf/net/pf_osfp.c#2 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/contrib/pf/net/pf_ruleset.c#2 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/contrib/pf/net/pfvar.h#4 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/contrib/pf/netinet/in4_cksum.c#2 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/ddb/db_command.c#2 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/ddb/db_textdump.c#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#2 (text+ko) ==== @@ -140,10 +140,6 @@ #define TCP_CLOSE 2 #define TCP_DROP 3 -extern int tcp_do_autorcvbuf; -extern int tcp_do_autosndbuf; -extern int tcp_autorcvbuf_max; -extern int tcp_autosndbuf_max; static void t3_send_reset(struct toepcb *toep); static void send_abort_rpl(struct mbuf *m, struct toedev *tdev, int rst_status); ==== //depot/projects/vimage-commit/src/sys/dev/firewire/firewire.c#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/fs/cd9660/cd9660_rrip.c#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/i386/conf/NOTES#4 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/i386/i386/dump_machdep.c#4 (text+ko) ==== @@ -112,7 +112,6 @@ mkdumpheader(struct kerneldumpheader *kdh, uint32_t archver, uint64_t dumplen, uint32_t blksz) { - INIT_VPROCG(TD_TO_VPROCG(&thread0)); /* XXX */ bzero(kdh, sizeof(*kdh)); strncpy(kdh->magic, KERNELDUMPMAGIC, sizeof(kdh->magic)); ==== //depot/projects/vimage-commit/src/sys/i386/i386/minidump_machdep.c#4 (text) ==== @@ -86,7 +86,6 @@ mkdumpheader(struct kerneldumpheader *kdh, uint32_t archver, uint64_t dumplen, uint32_t blksz) { - INIT_VPROCG(TD_TO_VPROCG(curthread)); bzero(kdh, sizeof(*kdh)); strncpy(kdh->magic, KERNELDUMPMAGIC, sizeof(kdh->magic)); ==== //depot/projects/vimage-commit/src/sys/ia64/ia64/dump_machdep.c#4 (text+ko) ==== @@ -67,7 +67,6 @@ mkdumpheader(struct kerneldumpheader *kdh, uint32_t archver, uint64_t dumplen, uint32_t blksz) { - INIT_VPROCG(TD_TO_VPROCG(&thread0)); /* XXX */ bzero(kdh, sizeof(*kdh)); strncpy(kdh->magic, KERNELDUMPMAGIC, sizeof(kdh->magic)); ==== //depot/projects/vimage-commit/src/sys/kern/init_main.c#2 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/kern/kern_clock.c#2 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/kern/kern_exit.c#2 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/kern/kern_fork.c#2 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/kern/kern_jail.c#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/kern/kern_linker.c#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/kern/kern_mib.c#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/kern/kern_prot.c#2 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/kern/kern_switch.c#2 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/kern/kern_synch.c#4 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/kern/kern_sysctl.c#2 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/kern/kern_timeout.c#2 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/kern/kern_uuid.c#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/kern/kern_xxx.c#3 (text+ko) ==== @@ -273,21 +273,21 @@ struct setdomainname_args *uap; { INIT_VPROCG(TD_TO_VPROCG(td)); - int error, domainnamelen; + int error, domainnamelen; error = priv_check(td, PRIV_SETDOMAINNAME); printf("setdomainname error=%d\n", error); if (error) return (error); mtx_lock(&Giant); - if ((u_int)uap->len > sizeof (V_domainname) - 1) { + if ((u_int)uap->len > sizeof (V_domainname) - 1) { error = EINVAL; goto done2; } - domainnamelen = uap->len; - error = copyin(uap->domainname, V_domainname, uap->len); - V_domainname[domainnamelen] = 0; + domainnamelen = uap->len; + error = copyin(uap->domainname, V_domainname, uap->len); + V_domainname[domainnamelen] = 0; done2: mtx_unlock(&Giant); - return (error); + return (error); } ==== //depot/projects/vimage-commit/src/sys/kern/sched_4bsd.c#2 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/kern/subr_pcpu.c#2 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/kern/sys_socket.c#2 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/kern/tty.c#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/kern/uipc_domain.c#2 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/kern/uipc_socket.c#2 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/kern/uipc_syscalls.c#2 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/kern/uipc_usrreq.c#2 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/kern/vfs_export.c#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/kern/vfs_lookup.c#2 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/modules/Makefile#4 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/modules/netgraph/Makefile#2 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/net/bpf.c#2 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/net/bpf.h#2 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/net/if.c#4 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/net/if_clone.c#2 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/net/if_ethersubr.c#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/net/if_faith.c#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/net/if_gif.c#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/net/if_gif.h#4 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/net/if_gre.c#2 (text+ko) ==== @@ -51,6 +51,7 @@ #include "opt_atalk.h" #include "opt_inet.h" #include "opt_inet6.h" +#include "opt_vimage.h" #include #include @@ -64,6 +65,7 @@ #include #include #include +#include #include #include @@ -240,12 +242,15 @@ gre_output(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst, struct rtentry *rt) { +#ifdef INET6 + INIT_VNET_INET(ifp->if_vnet); +#endif int error = 0; struct gre_softc *sc = ifp->if_softc; struct greip *gh; struct ip *ip; - u_short ip_id = 0; - uint8_t ip_tos = 0; + u_short gre_ip_id = 0; + uint8_t gre_ip_tos = 0; u_int16_t etype = 0; struct mobile_h mob_h; u_int32_t af; @@ -362,13 +367,13 @@ switch (dst->sa_family) { case AF_INET: ip = mtod(m, struct ip *); - ip_tos = ip->ip_tos; - ip_id = ip->ip_id; + gre_ip_tos = ip->ip_tos; + gre_ip_id = ip->ip_id; etype = ETHERTYPE_IP; break; #ifdef INET6 case AF_INET6: - ip_id = ip_newid(); + gre_ip_id = ip_newid(); etype = ETHERTYPE_IPV6; break; #endif @@ -413,8 +418,8 @@ ((struct ip*)gh)->ip_v = IPPROTO_IPV4; ((struct ip*)gh)->ip_hl = (sizeof(struct ip)) >> 2; ((struct ip*)gh)->ip_ttl = GRE_TTL; - ((struct ip*)gh)->ip_tos = ip_tos; - ((struct ip*)gh)->ip_id = ip_id; + ((struct ip*)gh)->ip_tos = gre_ip_tos; + ((struct ip*)gh)->ip_id = gre_ip_id; gh->gi_len = m->m_pkthdr.len; } ==== //depot/projects/vimage-commit/src/sys/net/if_loop.c#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/net/if_mib.c#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/net/if_ppp.c#2 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/net/if_spppsubr.c#2 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/net/if_stf.c#4 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/net/if_tap.c#4 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/net/if_tun.c#4 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/net/if_var.h#4 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/net/if_vlan.c#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/net/netisr.c#2 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/net/raw_cb.c#4 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/net/raw_cb.h#2 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/net/raw_usrreq.c#4 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/net/route.c#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/net/rtsock.c#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/net80211/ieee80211.c#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/net80211/ieee80211_ddb.c#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/net80211/ieee80211_freebsd.c#2 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/net80211/ieee80211_ioctl.c#2 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/net80211/ieee80211_var.h#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netgraph/netgraph.h#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netgraph/ng_bridge.c#2 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netgraph/ng_eiface.c#4 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netgraph/ng_ether.c#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netgraph/ng_hub.c#2 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netgraph/ng_iface.c#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netinet/icmp_var.h#2 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netinet/if_ether.c#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netinet/igmp.c#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netinet/in.c#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netinet/in_gif.c#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netinet/in_gif.h#2 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netinet/in_mcast.c#4 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netinet/in_pcb.c#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netinet/in_pcb.h#2 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netinet/in_proto.c#2 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netinet/in_rmx.c#4 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netinet/in_var.h#2 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netinet/ip6.h#4 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netinet/ip_carp.c#2 (text+ko) ==== @@ -31,6 +31,7 @@ #include "opt_bpf.h" #include "opt_inet.h" #include "opt_inet6.h" +#include "opt_vimage.h" #include #include @@ -49,6 +50,7 @@ #include #include #include +#include #include #include @@ -913,6 +915,7 @@ ch.carp_cksum = 0; #ifdef INET + INIT_VNET_INET(curvnet); if (sc->sc_ia) { struct ip *ip; @@ -1451,6 +1454,7 @@ static int carp_set_addr(struct carp_softc *sc, struct sockaddr_in *sin) { + INIT_VNET_INET(curvnet); struct ifnet *ifp; struct carp_if *cif; struct in_ifaddr *ia, *ia_if; @@ -1470,7 +1474,7 @@ /* we have to do it by hands to check we won't match on us */ ia_if = NULL; own = 0; - TAILQ_FOREACH(ia, &in_ifaddrhead, ia_link) { + TAILQ_FOREACH(ia, &V_in_ifaddrhead, ia_link) { /* and, yeah, we need a multicast-capable iface too */ if (ia->ia_ifp != SC2IFP(sc) && (ia->ia_ifp->if_flags & IFF_MULTICAST) && @@ -1612,6 +1616,7 @@ static int carp_set_addr6(struct carp_softc *sc, struct sockaddr_in6 *sin6) { + INIT_VNET_INET6(curvnet); struct ifnet *ifp; struct carp_if *cif; struct in6_ifaddr *ia, *ia_if; @@ -1631,7 +1636,7 @@ /* we have to do it by hands to check we won't match on us */ ia_if = NULL; own = 0; - for (ia = in6_ifaddr; ia; ia = ia->ia_next) { + for (ia = V_in6_ifaddr; ia; ia = ia->ia_next) { int i; for (i = 0; i < 4; i++) { ==== //depot/projects/vimage-commit/src/sys/netinet/ip_divert.c#2 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netinet/ip_fastfwd.c#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netinet/ip_fw.h#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netinet/ip_fw2.c#4 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netinet/ip_fw_nat.c#4 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netinet/ip_fw_pfil.c#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netinet/ip_icmp.c#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netinet/ip_ipsec.c#4 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netinet/ip_mroute.c#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netinet/ip_options.c#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netinet/ip_output.c#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netinet/ip_var.h#2 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netinet/ipprotosw.h#2 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netinet/raw_ip.c#4 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netinet/sctp_output.c#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netinet/tcp_hostcache.c#4 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netinet/tcp_input.c#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netinet/tcp_output.c#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netinet/tcp_reass.c#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netinet/tcp_sack.c#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netinet/tcp_subr.c#4 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netinet/tcp_syncache.c#4 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netinet/tcp_timer.c#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netinet/tcp_timewait.c#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netinet/tcp_usrreq.c#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netinet/tcp_var.h#2 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netinet/udp_usrreq.c#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netinet/udp_var.h#2 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netinet6/dest6.c#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netinet6/frag6.c#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netinet6/icmp6.c#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netinet6/in6.c#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netinet6/in6_gif.c#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netinet6/in6_ifattach.c#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netinet6/in6_pcb.c#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netinet6/in6_rmx.c#4 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netinet6/in6_src.c#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netinet6/in6_var.h#2 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netinet6/ip6_forward.c#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netinet6/ip6_input.c#4 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netinet6/ip6_ipsec.c#4 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netinet6/ip6_mroute.c#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netinet6/ip6_output.c#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netinet6/ip6_var.h#2 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netinet6/ip6protosw.h#2 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netinet6/mld6.c#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netinet6/nd6.c#4 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netinet6/nd6.h#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netinet6/nd6_nbr.c#4 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netinet6/nd6_rtr.c#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netinet6/raw_ip6.c#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netinet6/route6.c#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netinet6/scope6.c#4 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netinet6/sctp6_usrreq.c#4 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netinet6/udp6_usrreq.c#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netipsec/ipsec.c#4 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netipsec/ipsec.h#4 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netipsec/ipsec_input.c#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netipsec/ipsec_mbuf.c#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netipsec/ipsec_output.c#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netipsec/key.c#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netipsec/key.h#2 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netipsec/key_debug.h#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netipsec/keysock.c#4 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netipsec/keysock.h#2 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netipsec/xform_ah.c#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netipsec/xform_esp.c#4 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netipsec/xform_ipcomp.c#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netipsec/xform_ipip.c#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/nfsclient/nfs_diskless.c#3 (text+ko) ==== @@ -46,6 +46,7 @@ #include #include +#include #include #include #include ==== //depot/projects/vimage-commit/src/sys/nfsclient/nfs_socket.c#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/nfsclient/nfs_vfsops.c#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/nfsclient/nfs_vnops.c#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/rpc/auth_unix.c#2 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/rpc/authunix_prot.c#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/rpc/clnt_dg.c#2 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/rpc/rpc_generic.c#2 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/rpc/svc_dg.c#2 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/rpc/svc_generic.c#2 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/sparc64/sparc64/dump_machdep.c#4 (text+ko) ==== @@ -63,7 +63,6 @@ mkdumpheader(struct kerneldumpheader *kdh, uint32_t archver, uint64_t dumplen, uint32_t blksz) { - INIT_VPROCG(TD_TO_VPROCG(&thread0)); /* XXX */ bzero(kdh, sizeof(*kdh)); strncpy(kdh->magic, KERNELDUMPMAGIC, sizeof(kdh->magic)); ==== //depot/projects/vimage-commit/src/sys/sun4v/sun4v/dump_machdep.c#4 (text+ko) ==== @@ -64,7 +64,6 @@ mkdumpheader(struct kerneldumpheader *kdh, uint32_t archver, uint64_t dumplen, uint32_t blksz) { - INIT_VPROCG(TD_TO_VPROCG(&thread0)); /* XXX */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jun 19 08:12:12 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B96921065678; Thu, 19 Jun 2008 08:12:12 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7A4611065681 for ; Thu, 19 Jun 2008 08:12:12 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6BD8F8FC0C for ; Thu, 19 Jun 2008 08:12:12 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5J8CCoZ049326 for ; Thu, 19 Jun 2008 08:12:12 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5J8CCvI049324 for perforce@freebsd.org; Thu, 19 Jun 2008 08:12:12 GMT (envelope-from julian@freebsd.org) Date: Thu, 19 Jun 2008 08:12:12 GMT Message-Id: <200806190812.m5J8CCvI049324@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 143755 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Jun 2008 08:12:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=143755 Change 143755 by julian@julian_trafmon1 on 2008/06/19 08:11:56 update all the diff scripts Affected files ... .. //depot/projects/vimage-commit/makediff.pl#2 edit .. //depot/projects/vimage-commit/makemeat.pl#2 edit .. //depot/projects/vimage-commit2/makediff.pl#2 edit .. //depot/projects/vimage-commit2/makemeat.pl#1 add .. //depot/projects/vimage-commit2/makemeat2.pl#1 add .. //depot/projects/vimage-devel/makediff.pl#3 edit .. //depot/projects/vimage-devel/makemeat.pl#2 edit .. //depot/projects/vimage/makediff.pl#2 edit Differences ... ==== //depot/projects/vimage-commit/makediff.pl#2 (text+ko) ==== ==== //depot/projects/vimage-commit/makemeat.pl#2 (text+ko) ==== @@ -4,9 +4,8 @@ $src_base = '//depot/projects/vimage-commit/src/sys'; $dst_base = '//depot/projects/vimage/src/sys'; -$dst_label = ''; -$cmd = "p4 diff2 -du $src_base/...$dst_label $dst_base/...#head"; +$cmd = "p4 diff2 -du $src_base/...#head $dst_base/...#head"; open(P, "$cmd |") || die $!; $time = localtime(); ==== //depot/projects/vimage-commit2/makediff.pl#2 (text+ko) ==== ==== //depot/projects/vimage-devel/makediff.pl#3 (text+ko) ==== ==== //depot/projects/vimage-devel/makemeat.pl#2 (text+ko) ==== @@ -4,9 +4,9 @@ $src_base = '//depot/projects/vimage-devel/src/sys'; $dst_base = '//depot/projects/vimage/src/sys'; -$dst_label = ''; +$dst_label = '#head'; -$cmd = "p4 diff2 -du $src_base/...$dst_label $dst_base/...#head"; +$cmd = "p4 diff2 -du $src_base/...#head $dst_base/...#head"; open(P, "$cmd |") || die $!; $time = localtime(); ==== //depot/projects/vimage/makediff.pl#2 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Thu Jun 19 11:52:26 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 07B7910656B3; Thu, 19 Jun 2008 11:52:26 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BBF0210656AD for ; Thu, 19 Jun 2008 11:52:25 +0000 (UTC) (envelope-from strauss@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A60E68FC15 for ; Thu, 19 Jun 2008 11:52:25 +0000 (UTC) (envelope-from strauss@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5JBqPPY079456 for ; Thu, 19 Jun 2008 11:52:25 GMT (envelope-from strauss@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5JBqPju079452 for perforce@freebsd.org; Thu, 19 Jun 2008 11:52:25 GMT (envelope-from strauss@FreeBSD.org) Date: Thu, 19 Jun 2008 11:52:25 GMT Message-Id: <200806191152.m5JBqPju079452@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to strauss@FreeBSD.org using -f From: Anselm Strauss To: Perforce Change Reviews Cc: Subject: PERFORCE change 143760 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Jun 2008 11:52:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=143760 Change 143760 by strauss@strauss_marvelman on 2008/06/19 11:51:27 Build fixes: - autogen.sh can just use 'autoreconf -i' - include instead of "../config.h" for build outside source directory Affected files ... .. //depot/projects/soc2008/strauss_libarchive/autogen.sh#5 edit .. //depot/projects/soc2008/strauss_libarchive/libarchive/archive_platform.h#8 edit Differences ... ==== //depot/projects/soc2008/strauss_libarchive/autogen.sh#5 (text+kox) ==== @@ -1,9 +1,3 @@ #!/bin/sh -set -xe -mkdir -p config.aux -aclocal -autoheader -autoconf -libtoolize --automake -c -automake -a -c +autoreconf -i ==== //depot/projects/soc2008/strauss_libarchive/libarchive/archive_platform.h#8 (ktext) ==== @@ -22,7 +22,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id$ $Change: 143014 $ $DateTime$ $Author$ + * $Id$ $Change: 143760 $ $DateTime$ $Author$ */ /* @@ -47,7 +47,7 @@ #include PLATFORM_CONFIG_H #elif defined(HAVE_CONFIG_H) /* Most POSIX platforms use the 'configure' script to build config.h */ -#include "../config.h" +#include #else /* Warn if the library hasn't been (automatically or manually) configured. */ #error Oops: No config.h and no pre-built configuration in archive_platform.h. From owner-p4-projects@FreeBSD.ORG Thu Jun 19 13:20:03 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5D61B1065673; Thu, 19 Jun 2008 13:20:03 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1BA62106566C for ; Thu, 19 Jun 2008 13:20:03 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 01F808FC16 for ; Thu, 19 Jun 2008 13:20:03 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5JDK20I001790 for ; Thu, 19 Jun 2008 13:20:02 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5JDK2Xb001788 for perforce@freebsd.org; Thu, 19 Jun 2008 13:20:02 GMT (envelope-from rpaulo@FreeBSD.org) Date: Thu, 19 Jun 2008 13:20:02 GMT Message-Id: <200806191320.m5JDK2Xb001788@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo To: Perforce Change Reviews Cc: Subject: PERFORCE change 143761 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Jun 2008 13:20:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=143761 Change 143761 by rpaulo@rpaulo_sigma on 2008/06/19 13:19:41 Ignore syn/ack for connections we have seen no syn. Affected files ... .. //depot/projects/soc2008/rpaulo-tcpad/handler.c#7 edit Differences ... ==== //depot/projects/soc2008/rpaulo-tcpad/handler.c#7 (text+ko) ==== @@ -23,7 +23,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/soc2008/rpaulo-tcpad/handler.c#6 $ + * $P4: //depot/projects/soc2008/rpaulo-tcpad/handler.c#7 $ */ #include @@ -99,6 +99,12 @@ TAILQ_INIT(cp->pktshead); dumper_addpkt(cp->pktshead, ph, bytes); } else if ((tcp->th_flags & TH_FLAGS) == (TH_SYN|TH_ACK)) { + if (rcp == NULL) { + /* ignore this syn+ack because we missed + the earlier syn. + */ + return; + } if (cp) { DPRINTF("connection already being tracked!\n"); print_packet(bytes, linkhlen); From owner-p4-projects@FreeBSD.ORG Thu Jun 19 18:37:07 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2E8281065685; Thu, 19 Jun 2008 18:37:07 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E43BC1065680 for ; Thu, 19 Jun 2008 18:37:06 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C3B0E8FC14 for ; Thu, 19 Jun 2008 18:37:06 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5JIb6ST047439 for ; Thu, 19 Jun 2008 18:37:06 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5JIb6i2047437 for perforce@freebsd.org; Thu, 19 Jun 2008 18:37:06 GMT (envelope-from julian@freebsd.org) Date: Thu, 19 Jun 2008 18:37:06 GMT Message-Id: <200806191837.m5JIb6i2047437@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 143781 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Jun 2008 18:37:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=143781 Change 143781 by julian@julian_trafmon1 on 2008/06/19 18:36:16 in vimage-devel, we want these defined. Affected files ... .. //depot/projects/vimage-devel/src/sys/sys/vimage.h#7 edit Differences ... ==== //depot/projects/vimage-devel/src/sys/sys/vimage.h#7 (text+ko) ==== @@ -410,11 +410,11 @@ int _morphing_symlinks; -#if 0 long _cp_time[CPUSTATES]; struct loadavg _averunnable; /* from kern/kern_synch.c */ int _sched_tdcnt; /* from kern/sched_4bsd.c */ +#if 0 int _tdq_sysload[32]; /* XXX MAXCPUS from kern/sched_ule.c (SMP) */ u_int proc_limit; /* max. number of processes */ From owner-p4-projects@FreeBSD.ORG Thu Jun 19 18:44:14 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7571D1065670; Thu, 19 Jun 2008 18:44:14 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 35010106568C for ; Thu, 19 Jun 2008 18:44:14 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1402C8FC36 for ; Thu, 19 Jun 2008 18:44:14 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5JIiE6J048795 for ; Thu, 19 Jun 2008 18:44:14 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5JIiE51048793 for perforce@freebsd.org; Thu, 19 Jun 2008 18:44:14 GMT (envelope-from pgj@FreeBSD.org) Date: Thu, 19 Jun 2008 18:44:14 GMT Message-Id: <200806191844.m5JIiE51048793@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 143782 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Jun 2008 18:44:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=143782 Change 143782 by pgj@disznohal on 2008/06/19 18:43:58 Prepare the translation of FAQ: - Add a placeholder of English version 1.838 - The completed translation of 1.838 will arrive in 24 hours Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/Makefile#2 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/faq/Makefile#1 add .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/faq/book.sgml#1 add Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/Makefile#2 (text+ko) ==== @@ -6,9 +6,10 @@ # Original Revision: 1.4 # -SUBDIR = handbook +SUBDIR = faq +SUBDIR+= handbook -ROOT_SYMLINKS= handbook +ROOT_SYMLINKS= faq handbook DOC_PREFIX?= ${.CURDIR}/../.. .include "${DOC_PREFIX}/share/mk/doc.project.mk" From owner-p4-projects@FreeBSD.ORG Thu Jun 19 19:53:24 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 237D8106567D; Thu, 19 Jun 2008 19:53:24 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DA8C81065675; Thu, 19 Jun 2008 19:53:23 +0000 (UTC) (envelope-from zec@icir.org) Received: from xaqua.tel.fer.hr (xaqua.tel.fer.hr [161.53.19.25]) by mx1.freebsd.org (Postfix) with ESMTP id 87BE98FC15; Thu, 19 Jun 2008 19:53:23 +0000 (UTC) (envelope-from zec@icir.org) Received: by xaqua.tel.fer.hr (Postfix, from userid 20006) id 1FD8A9B645; Thu, 19 Jun 2008 21:25:00 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.1.7 (2006-10-05) on xaqua.tel.fer.hr X-Spam-Level: X-Spam-Status: No, score=-4.3 required=5.0 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=ham version=3.1.7 Received: from [192.168.200.112] (zec2.tel.fer.hr [161.53.19.79]) by xaqua.tel.fer.hr (Postfix) with ESMTP id A7F1B9B644; Thu, 19 Jun 2008 21:24:58 +0200 (CEST) From: Marko Zec To: Julian Elischer Date: Thu, 19 Jun 2008 21:24:36 +0200 User-Agent: KMail/1.9.7 References: <200806191837.m5JIb6i2047437@repoman.freebsd.org> In-Reply-To: <200806191837.m5JIb6i2047437@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-2" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200806192124.36702.zec@icir.org> Cc: Perforce Change Reviews Subject: Re: PERFORCE change 143781 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Jun 2008 19:53:24 -0000 On Thursday 19 June 2008 20:37:06 Julian Elischer wrote: > http://perforce.freebsd.org/chv.cgi?CH=143781 > > Change 143781 by julian@julian_trafmon1 on 2008/06/19 18:36:16 > > in vimage-devel, we want these defined. For now that's OK I guess, given that vimage-devel should be consider a highly experimental branch. The problem is that cp_time[] is now instantiated on per-cpu basis in both HEAD and RELENG_7. We need to come up with a generic method of providing virtualized counterparts of PCPU variables. Marko > Affected files ... > > .. //depot/projects/vimage-devel/src/sys/sys/vimage.h#7 edit > > Differences ... > > ==== //depot/projects/vimage-devel/src/sys/sys/vimage.h#7 (text+ko) > ==== > > @@ -410,11 +410,11 @@ > > int _morphing_symlinks; > > -#if 0 > long _cp_time[CPUSTATES]; > > struct loadavg _averunnable; /* from kern/kern_synch.c */ > int _sched_tdcnt; /* from kern/sched_4bsd.c */ > +#if 0 > int _tdq_sysload[32]; /* XXX MAXCPUS from kern/sched_ule.c (SMP) */ > > u_int proc_limit; /* max. number of processes */ From owner-p4-projects@FreeBSD.ORG Thu Jun 19 20:08:39 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6C797106568E; Thu, 19 Jun 2008 20:08:39 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2E1BE1065673 for ; Thu, 19 Jun 2008 20:08:39 +0000 (UTC) (envelope-from gk@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E8C5B8FC0A for ; Thu, 19 Jun 2008 20:08:38 +0000 (UTC) (envelope-from gk@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5JK8cRR058816 for ; Thu, 19 Jun 2008 20:08:38 GMT (envelope-from gk@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5JK8cTb058814 for perforce@freebsd.org; Thu, 19 Jun 2008 20:08:38 GMT (envelope-from gk@FreeBSD.org) Date: Thu, 19 Jun 2008 20:08:38 GMT Message-Id: <200806192008.m5JK8cTb058814@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gk@FreeBSD.org using -f From: Gleb Kurtsou To: Perforce Change Reviews Cc: Subject: PERFORCE change 143783 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Jun 2008 20:08:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=143783 Change 143783 by gk@gk_h1 on 2008/06/19 20:08:35 branch if_bridge.4 man page Affected files ... .. //depot/projects/soc2008/gk_l2filter/share-man4/if_bridge.4#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Thu Jun 19 20:12:43 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AD9401065689; Thu, 19 Jun 2008 20:12:43 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6F8C41065687 for ; Thu, 19 Jun 2008 20:12:43 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4E4C68FC16 for ; Thu, 19 Jun 2008 20:12:43 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5JKChuM059179 for ; Thu, 19 Jun 2008 20:12:43 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5JKChmr059177 for perforce@freebsd.org; Thu, 19 Jun 2008 20:12:43 GMT (envelope-from julian@freebsd.org) Date: Thu, 19 Jun 2008 20:12:43 GMT Message-Id: <200806192012.m5JKChmr059177@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 143784 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Jun 2008 20:12:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=143784 Change 143784 by julian@julian_trafmon1 on 2008/06/19 20:12:11 Remove all sctp changes Affected files ... .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_asconf.c#4 edit .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_bsd_addr.c#5 edit .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_input.c#4 edit .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_os.h#2 edit .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_os_bsd.h#4 edit .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_output.c#6 edit .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_pcb.c#6 edit .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_timer.c#4 edit .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_usrreq.c#6 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/sctp6_usrreq.c#5 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/netinet/sctp_asconf.c#4 (text+ko) ==== @@ -877,7 +877,7 @@ */ /* we probably don't need these operations */ (void)sa6_recoverscope(from6); - sa6_embedscope(from6, V_ip6_use_defzone); + sa6_embedscope(from6, ip6_use_defzone); break; } #endif ==== //depot/projects/vimage-commit2/src/sys/netinet/sctp_bsd_addr.c#5 (text+ko) ==== @@ -47,7 +47,6 @@ #include #include #include -#include /* Declare all of our malloc named types */ @@ -124,7 +123,7 @@ ifa6 = (struct in6_ifaddr *)ifa->ifa; ifa->flags = ifa6->ia6_flags; - if (!V_ip6_use_deprecated) { + if (!ip6_use_deprecated) { if (ifa->flags & IN6_IFF_DEPRECATED) { ifa->localifa_flags |= SCTP_ADDR_IFA_UNUSEABLE; @@ -201,7 +200,7 @@ struct sctp_ifa *sctp_ifa; uint32_t ifa_flags; - TAILQ_FOREACH(ifn, &V_ifnet, if_list) { + TAILQ_FOREACH(ifn, &ifnet, if_list) { TAILQ_FOREACH(ifa, &ifn->if_addrlist, ifa_list) { if (ifa->ifa_addr == NULL) { continue; ==== //depot/projects/vimage-commit2/src/sys/netinet/sctp_input.c#4 (text+ko) ==== @@ -5434,7 +5434,7 @@ * idea, so I will leave it in place. */ if (inp && ipsec4_in_reject(m, &inp->ip_inp.inp)) { - V_ipsec4stat.in_polvio++; + ipsec4stat.in_polvio++; SCTP_STAT_INCR(sctps_hdrops); goto bad; } ==== //depot/projects/vimage-commit2/src/sys/netinet/sctp_os.h#2 (text+ko) ==== ==== //depot/projects/vimage-commit2/src/sys/netinet/sctp_os_bsd.h#4 (text+ko) ==== @@ -60,7 +60,6 @@ #include #include #include -#include #include #include ==== //depot/projects/vimage-commit2/src/sys/netinet/sctp_output.c#6 (text+ko) ==== @@ -3826,7 +3826,7 @@ sin6 = &tmp; /* KAME hack: embed scopeid */ - if (sa6_embedscope(sin6, V_ip6_use_defzone) != 0) { + if (sa6_embedscope(sin6, ip6_use_defzone) != 0) { SCTP_LTRACE_ERR_RET_PKT(m, inp, stcb, net, SCTP_FROM_SCTP_OUTPUT, EINVAL); return (EINVAL); } @@ -3880,7 +3880,7 @@ if (net->src_addr_selected == 0) { sin6 = (struct sockaddr_in6 *)&net->ro._l_addr; /* KAME hack: embed scopeid */ - if (sa6_embedscope(sin6, V_ip6_use_defzone) != 0) { + if (sa6_embedscope(sin6, ip6_use_defzone) != 0) { SCTP_LTRACE_ERR_RET_PKT(m, inp, stcb, net, SCTP_FROM_SCTP_OUTPUT, EINVAL); return (EINVAL); } @@ -3903,7 +3903,7 @@ } else { sin6 = (struct sockaddr_in6 *)&ro->ro_dst; /* KAME hack: embed scopeid */ - if (sa6_embedscope(sin6, V_ip6_use_defzone) != 0) { + if (sa6_embedscope(sin6, ip6_use_defzone) != 0) { SCTP_LTRACE_ERR_RET_PKT(m, inp, stcb, net, SCTP_FROM_SCTP_OUTPUT, EINVAL); return (EINVAL); } @@ -5096,7 +5096,7 @@ */ (void)sa6_recoverscope(sin6); stc.scope_id = sin6->sin6_scope_id; - sa6_embedscope(sin6, V_ip6_use_defzone); + sa6_embedscope(sin6, ip6_use_defzone); stc.loopback_scope = 1; stc.local_scope = 0; stc.site_scope = 1; @@ -5132,7 +5132,7 @@ */ (void)sa6_recoverscope(sin6); stc.scope_id = sin6->sin6_scope_id; - sa6_embedscope(sin6, V_ip6_use_defzone); + sa6_embedscope(sin6, ip6_use_defzone); } else if (IN6_IS_ADDR_SITELOCAL(&sin6->sin6_addr)) { /* * If the new destination is @@ -10260,7 +10260,7 @@ /* Fill in the IPv6 header for the ABORT */ ip6_out->ip6_flow = ip6->ip6_flow; - ip6_out->ip6_hlim = V_ip6_defhlim; + ip6_out->ip6_hlim = ip6_defhlim; if (port) { ip6_out->ip6_nxt = IPPROTO_UDP; } else { @@ -11225,7 +11225,7 @@ /* Fill in the IP6 header for the ABORT */ ip6_out->ip6_flow = ip6->ip6_flow; - ip6_out->ip6_hlim = V_ip6_defhlim; + ip6_out->ip6_hlim = ip6_defhlim; if (port) { ip6_out->ip6_nxt = IPPROTO_UDP; } else { @@ -11517,7 +11517,7 @@ in6 = mtod(m, struct ip6_hdr *); out6 = mtod(mout, struct ip6_hdr *); out6->ip6_flow = in6->ip6_flow; - out6->ip6_hlim = V_ip6_defhlim; + out6->ip6_hlim = ip6_defhlim; if (port) { out6->ip6_nxt = IPPROTO_UDP; } else { @@ -13162,7 +13162,7 @@ return (0); /* get prefix entry of address */ - LIST_FOREACH(pfx, &V_nd_prefix, ndpr_entry) { + LIST_FOREACH(pfx, &nd_prefix, ndpr_entry) { if (pfx->ndpr_stateflags & NDPRF_DETACHED) continue; if (IN6_ARE_MASKED_ADDR_EQUAL(&pfx->ndpr_prefix.sin6_addr, ==== //depot/projects/vimage-commit2/src/sys/netinet/sctp_pcb.c#6 (text+ko) ==== @@ -59,11 +59,11 @@ struct sockaddr_in6 tmp_a, tmp_b; memcpy(&tmp_a, a, sizeof(struct sockaddr_in6)); - if (sa6_embedscope(&tmp_a, V_ip6_use_defzone) != 0) { + if (sa6_embedscope(&tmp_a, ip6_use_defzone) != 0) { return 0; } memcpy(&tmp_b, b, sizeof(struct sockaddr_in6)); - if (sa6_embedscope(&tmp_b, V_ip6_use_defzone) != 0) { + if (sa6_embedscope(&tmp_b, ip6_use_defzone) != 0) { return 0; } return (IN6_ARE_ADDR_EQUAL(&tmp_a.sin6_addr, &tmp_b.sin6_addr)); @@ -1894,7 +1894,7 @@ /* Get the scopes in properly to the sin6 addr's */ /* we probably don't need these operations */ (void)sa6_recoverscope(from6); - sa6_embedscope(from6, V_ip6_use_defzone); + sa6_embedscope(from6, ip6_use_defzone); break; } #endif @@ -1941,7 +1941,7 @@ /* Get the scopes in properly to the sin6 addr's */ /* we probably don't need these operations */ (void)sa6_recoverscope(to6); - sa6_embedscope(to6, V_ip6_use_defzone); + sa6_embedscope(to6, ip6_use_defzone); break; } #endif @@ -2193,7 +2193,7 @@ } #endif /* IPSEC */ SCTP_INCR_EP_COUNT(); - inp->ip_inp.inp.inp_ip_ttl = V_ip_defttl; + inp->ip_inp.inp.inp_ip_ttl = ip_defttl; SCTP_INP_INFO_WUNLOCK(); so->so_pcb = (caddr_t)inp; @@ -2606,7 +2606,7 @@ if (!IN6_IS_ADDR_UNSPECIFIED(&sin6->sin6_addr)) { bindall = 0; /* KAME hack: embed scopeid */ - if (sa6_embedscope(sin6, V_ip6_use_defzone) != 0) { + if (sa6_embedscope(sin6, ip6_use_defzone) != 0) { SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTP_PCB, EINVAL); return (EINVAL); } @@ -2706,8 +2706,8 @@ int done; if (ip_inp->inp_flags & INP_HIGHPORT) { - first = V_ipport_hifirstauto; - last = V_ipport_hilastauto; + first = ipport_hifirstauto; + last = ipport_hilastauto; } else if (ip_inp->inp_flags & INP_LOWPORT) { if (p && (error = priv_check(p, PRIV_NETINET_RESERVEDPORT) @@ -2718,11 +2718,11 @@ SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTP_PCB, error); return (error); } - first = V_ipport_lowfirstauto; - last = V_ipport_lowlastauto; + first = ipport_lowfirstauto; + last = ipport_lowlastauto; } else { - first = V_ipport_firstauto; - last = V_ipport_lastauto; + first = ipport_firstauto; + last = ipport_lastauto; } if (first > last) { uint16_t temp; @@ -3635,7 +3635,7 @@ struct sockaddr_in6 *sin6; sin6 = (struct sockaddr_in6 *)&net->ro._l_addr; - (void)sa6_embedscope(sin6, V_ip6_use_defzone); + (void)sa6_embedscope(sin6, ip6_use_defzone); sin6->sin6_scope_id = 0; } #endif ==== //depot/projects/vimage-commit2/src/sys/netinet/sctp_timer.c#4 (text+ko) ==== @@ -1711,7 +1711,7 @@ struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)&net->ro._l_addr; /* KAME hack: embed scopeid */ - (void)sa6_embedscope(sin6, V_ip6_use_defzone); + (void)sa6_embedscope(sin6, ip6_use_defzone); } #endif ==== //depot/projects/vimage-commit2/src/sys/netinet/sctp_usrreq.c#6 (text+ko) ==== @@ -532,7 +532,7 @@ inp->sctp_flags &= ~SCTP_PCB_FLAGS_BOUND_V6; /* I'm not v6! */ ip_inp = &inp->ip_inp.inp; ip_inp->inp_vflag |= INP_IPV4; - ip_inp->inp_ip_ttl = V_ip_defttl; + ip_inp->inp_ip_ttl = ip_defttl; #ifdef IPSEC error = ipsec_init_policy(so, &ip_inp->inp_sp); #ifdef SCTP_LOG_CLOSING ==== //depot/projects/vimage-commit2/src/sys/netinet6/sctp6_usrreq.c#5 (text+ko) ==== @@ -210,7 +210,7 @@ */ if (in6p_ip && (ipsec6_in_reject(m, in6p_ip))) { /* XXX */ - V_ipsec6stat.in_polvio++; + ipsec6stat.in_polvio++; goto bad; } #endif /* IPSEC */ @@ -679,7 +679,7 @@ * socket as well, because the socket may be bound to an IPv6 * wildcard address, which may match an IPv4-mapped IPv6 address. */ - inp6->inp_ip_ttl = V_ip_defttl; + inp6->inp_ip_ttl = ip_defttl; #endif /* * Hmm what about the IPSEC stuff that is missing here but in @@ -843,7 +843,7 @@ } } if (IN6_IS_ADDR_V4MAPPED(&sin6->sin6_addr)) { - if (!V_ip6_v6only) { + if (!ip6_v6only) { struct sockaddr_in sin; /* convert v4-mapped into v4 addr and send */ @@ -974,7 +974,7 @@ } } if (IN6_IS_ADDR_V4MAPPED(&sin6->sin6_addr)) { - if (!V_ip6_v6only) { + if (!ip6_v6only) { /* convert v4-mapped into v4 addr */ in6_sin6_2_sin((struct sockaddr_in *)&ss, sin6); addr = (struct sockaddr *)&ss; From owner-p4-projects@FreeBSD.ORG Thu Jun 19 20:20:52 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1B167106568E; Thu, 19 Jun 2008 20:20:52 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D06361065688 for ; Thu, 19 Jun 2008 20:20:51 +0000 (UTC) (envelope-from gk@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id AFA138FC1E for ; Thu, 19 Jun 2008 20:20:51 +0000 (UTC) (envelope-from gk@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5JKKp4I059841 for ; Thu, 19 Jun 2008 20:20:51 GMT (envelope-from gk@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5JKKpTY059839 for perforce@freebsd.org; Thu, 19 Jun 2008 20:20:51 GMT (envelope-from gk@FreeBSD.org) Date: Thu, 19 Jun 2008 20:20:51 GMT Message-Id: <200806192020.m5JKKpTY059839@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gk@FreeBSD.org using -f From: Gleb Kurtsou To: Perforce Change Reviews Cc: Subject: PERFORCE change 143785 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Jun 2008 20:20:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=143785 Change 143785 by gk@gk_h1 on 2008/06/19 20:20:05 IFC Affected files ... .. //depot/projects/soc2008/gk_l2filter/sys-net/if_tap.c#2 integrate .. //depot/projects/soc2008/gk_l2filter/sys-net/if_tun.c#2 integrate .. //depot/projects/soc2008/gk_l2filter/sys-netinet/sctp.h#2 integrate .. //depot/projects/soc2008/gk_l2filter/sys-netinet/sctp_asconf.c#2 integrate .. //depot/projects/soc2008/gk_l2filter/sys-netinet/sctp_auth.c#2 integrate .. //depot/projects/soc2008/gk_l2filter/sys-netinet/sctp_bsd_addr.c#2 integrate .. //depot/projects/soc2008/gk_l2filter/sys-netinet/sctp_bsd_addr.h#2 integrate .. //depot/projects/soc2008/gk_l2filter/sys-netinet/sctp_cc_functions.c#2 integrate .. //depot/projects/soc2008/gk_l2filter/sys-netinet/sctp_header.h#2 integrate .. //depot/projects/soc2008/gk_l2filter/sys-netinet/sctp_indata.c#2 integrate .. //depot/projects/soc2008/gk_l2filter/sys-netinet/sctp_input.c#2 integrate .. //depot/projects/soc2008/gk_l2filter/sys-netinet/sctp_lock_bsd.h#2 integrate .. //depot/projects/soc2008/gk_l2filter/sys-netinet/sctp_os_bsd.h#2 integrate .. //depot/projects/soc2008/gk_l2filter/sys-netinet/sctp_output.c#2 integrate .. //depot/projects/soc2008/gk_l2filter/sys-netinet/sctp_pcb.c#2 integrate .. //depot/projects/soc2008/gk_l2filter/sys-netinet/sctp_pcb.h#2 integrate .. //depot/projects/soc2008/gk_l2filter/sys-netinet/sctp_peeloff.c#2 integrate .. //depot/projects/soc2008/gk_l2filter/sys-netinet/sctp_sysctl.c#2 integrate .. //depot/projects/soc2008/gk_l2filter/sys-netinet/sctp_sysctl.h#2 integrate .. //depot/projects/soc2008/gk_l2filter/sys-netinet/sctp_timer.c#2 integrate .. //depot/projects/soc2008/gk_l2filter/sys-netinet/sctp_uio.h#2 integrate .. //depot/projects/soc2008/gk_l2filter/sys-netinet/sctp_usrreq.c#2 integrate .. //depot/projects/soc2008/gk_l2filter/sys-netinet/sctp_var.h#2 integrate .. //depot/projects/soc2008/gk_l2filter/sys-netinet/sctputil.c#2 integrate .. //depot/projects/soc2008/gk_l2filter/sys-netinet/tcp_lro.c#1 branch .. //depot/projects/soc2008/gk_l2filter/sys-netinet/tcp_lro.h#1 branch .. //depot/projects/soc2008/gk_l2filter/sys-netinet/tcp_syncache.c#2 integrate Differences ... ==== //depot/projects/soc2008/gk_l2filter/sys-net/if_tap.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ /* - * $FreeBSD: src/sys/net/if_tap.c,v 1.72 2008/04/15 16:54:39 emax Exp $ + * $FreeBSD: src/sys/net/if_tap.c,v 1.73 2008/06/11 18:55:19 ed Exp $ * $Id: if_tap.c,v 0.21 2000/07/23 21:46:02 max Exp $ */ @@ -132,7 +132,7 @@ static struct cdevsw tap_cdevsw = { .d_version = D_VERSION, - .d_flags = D_PSEUDO | D_NEEDGIANT, + .d_flags = D_PSEUDO | D_NEEDGIANT | D_NEEDMINOR, .d_open = tapopen, .d_close = tapclose, .d_read = tapread, ==== //depot/projects/soc2008/gk_l2filter/sys-net/if_tun.c#2 (text+ko) ==== @@ -13,7 +13,7 @@ * UCL. This driver is based much more on read/write/poll mode of * operation though. * - * $FreeBSD: src/sys/net/if_tun.c,v 1.164 2007/10/24 19:03:57 rwatson Exp $ + * $FreeBSD: src/sys/net/if_tun.c,v 1.165 2008/06/11 18:55:19 ed Exp $ */ #include "opt_atalk.h" @@ -162,7 +162,7 @@ static struct cdevsw tun_cdevsw = { .d_version = D_VERSION, - .d_flags = D_PSEUDO | D_NEEDGIANT, + .d_flags = D_PSEUDO | D_NEEDGIANT | D_NEEDMINOR, .d_open = tunopen, .d_close = tunclose, .d_read = tunread, ==== //depot/projects/soc2008/gk_l2filter/sys-netinet/sctp.h#2 (text+ko) ==== @@ -30,13 +30,16 @@ /* $KAME: sctp.h,v 1.18 2005/03/06 16:04:16 itojun Exp $ */ #include -__FBSDID("$FreeBSD: src/sys/netinet/sctp.h,v 1.24 2008/05/20 13:47:44 rrs Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/sctp.h,v 1.25 2008/06/14 07:58:05 rrs Exp $"); #ifndef _NETINET_SCTP_H_ #define _NETINET_SCTP_H_ #include + +#define SCTP_PACKED __attribute__((packed)) + /* * SCTP protocol - RFC2960. */ @@ -46,27 +49,25 @@ uint32_t v_tag; /* verification tag of packet */ uint32_t checksum; /* Adler32 C-Sum */ /* chunks follow... */ -} +} SCTP_PACKED; -__attribute__((packed)); - /* * SCTP Chunks */ - struct sctp_chunkhdr { - uint8_t chunk_type; /* chunk type */ - uint8_t chunk_flags; /* chunk flags */ - uint16_t chunk_length; /* chunk length */ - /* optional params follow */ - } __attribute__((packed)); +struct sctp_chunkhdr { + uint8_t chunk_type; /* chunk type */ + uint8_t chunk_flags; /* chunk flags */ + uint16_t chunk_length; /* chunk length */ + /* optional params follow */ +} SCTP_PACKED; /* * SCTP chunk parameters */ - struct sctp_paramhdr { - uint16_t param_type; /* parameter type */ - uint16_t param_length; /* parameter length */ - } __attribute__((packed)); +struct sctp_paramhdr { + uint16_t param_type; /* parameter type */ + uint16_t param_length; /* parameter length */ +} SCTP_PACKED; /* * user socket options: socket API defined @@ -303,49 +304,42 @@ /* * error cause parameters (user visisble) */ - struct sctp_error_cause { - uint16_t code; - uint16_t length; - /* optional cause-specific info may follow */ - } __attribute__((packed)); +struct sctp_error_cause { + uint16_t code; + uint16_t length; + /* optional cause-specific info may follow */ +} SCTP_PACKED; - struct sctp_error_invalid_stream { - struct sctp_error_cause cause; /* code=SCTP_ERROR_INVALID_STRE - * AM */ - uint16_t stream_id; /* stream id of the DATA in error */ - uint16_t reserved; - } __attribute__((packed)); +struct sctp_error_invalid_stream { + struct sctp_error_cause cause; /* code=SCTP_ERROR_INVALID_STREAM */ + uint16_t stream_id; /* stream id of the DATA in error */ + uint16_t reserved; +} SCTP_PACKED; - struct sctp_error_missing_param { - struct sctp_error_cause cause; /* code=SCTP_ERROR_MISSING_PARA - * M */ - uint32_t num_missing_params; /* number of missing - * parameters */ - /* uint16_t param_type's follow */ - } __attribute__((packed)); +struct sctp_error_missing_param { + struct sctp_error_cause cause; /* code=SCTP_ERROR_MISSING_PARAM */ + uint32_t num_missing_params; /* number of missing parameters */ + /* uint16_t param_type's follow */ +} SCTP_PACKED; - struct sctp_error_stale_cookie { - struct sctp_error_cause cause; /* code=SCTP_ERROR_STALE_COOKIE - * */ - uint32_t stale_time; /* time in usec of staleness */ - } __attribute__((packed)); +struct sctp_error_stale_cookie { + struct sctp_error_cause cause; /* code=SCTP_ERROR_STALE_COOKIE */ + uint32_t stale_time; /* time in usec of staleness */ +} SCTP_PACKED; - struct sctp_error_out_of_resource { - struct sctp_error_cause cause; /* code=SCTP_ERROR_OUT_OF_RESOU - * RCES */ - } __attribute__((packed)); +struct sctp_error_out_of_resource { + struct sctp_error_cause cause; /* code=SCTP_ERROR_OUT_OF_RESOURCES */ +} SCTP_PACKED; - struct sctp_error_unresolv_addr { - struct sctp_error_cause cause; /* code=SCTP_ERROR_UNRESOLVABLE - * _ADDR */ +struct sctp_error_unresolv_addr { + struct sctp_error_cause cause; /* code=SCTP_ERROR_UNRESOLVABLE_ADDR */ - } __attribute__((packed)); +} SCTP_PACKED; - struct sctp_error_unrecognized_chunk { - struct sctp_error_cause cause; /* code=SCTP_ERROR_UNRECOG_CHUN - * K */ - struct sctp_chunkhdr ch; /* header from chunk in error */ - } __attribute__((packed)); +struct sctp_error_unrecognized_chunk { + struct sctp_error_cause cause; /* code=SCTP_ERROR_UNRECOG_CHUNK */ + struct sctp_chunkhdr ch;/* header from chunk in error */ +} SCTP_PACKED; /* * Main SCTP chunk types we place these here so natd and f/w's in user land @@ -401,18 +395,18 @@ * in sat */ /* Data Chuck Specific Flags */ -#define SCTP_DATA_FRAG_MASK 0x03 -#define SCTP_DATA_MIDDLE_FRAG 0x00 -#define SCTP_DATA_LAST_FRAG 0x01 -#define SCTP_DATA_FIRST_FRAG 0x02 -#define SCTP_DATA_NOT_FRAG 0x03 -#define SCTP_DATA_UNORDERED 0x04 - +#define SCTP_DATA_FRAG_MASK 0x03 +#define SCTP_DATA_MIDDLE_FRAG 0x00 +#define SCTP_DATA_LAST_FRAG 0x01 +#define SCTP_DATA_FIRST_FRAG 0x02 +#define SCTP_DATA_NOT_FRAG 0x03 +#define SCTP_DATA_UNORDERED 0x04 +#define SCTP_DATA_SACK_IMMEDIATELY 0x08 /* ECN Nonce: SACK Chunk Specific Flags */ -#define SCTP_SACK_NONCE_SUM 0x01 +#define SCTP_SACK_NONCE_SUM 0x01 /* CMT DAC algorithm SACK flag */ -#define SCTP_SACK_CMT_DAC 0x80 +#define SCTP_SACK_CMT_DAC 0x80 /* * PCB flags (in sctp_flags bitmask). @@ -541,4 +535,6 @@ +#undef SCTP_PACKED + #endif /* !_NETINET_SCTP_H_ */ ==== //depot/projects/soc2008/gk_l2filter/sys-netinet/sctp_asconf.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ /* $KAME: sctp_asconf.c,v 1.24 2005/03/06 16:04:16 itojun Exp $ */ #include -__FBSDID("$FreeBSD: src/sys/netinet/sctp_asconf.c,v 1.36 2008/05/20 13:47:44 rrs Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/sctp_asconf.c,v 1.37 2008/06/14 07:58:05 rrs Exp $"); #include #include #include @@ -264,7 +264,7 @@ } /* end switch */ /* if 0.0.0.0/::0, add the source address instead */ - if (zero_address && sctp_nat_friendly) { + if (zero_address && SCTP_BASE_SYSCTL(sctp_nat_friendly)) { sa = (struct sockaddr *)&sa_source; sctp_asconf_get_source_ip(m, sa); SCTPDBG(SCTP_DEBUG_ASCONF1, @@ -416,7 +416,7 @@ return m_reply; } /* if deleting 0.0.0.0/::0, delete all addresses except src addr */ - if (zero_address && sctp_nat_friendly) { + if (zero_address && SCTP_BASE_SYSCTL(sctp_nat_friendly)) { result = sctp_asconf_del_remote_addrs_except(stcb, (struct sockaddr *)&sa_source); @@ -534,7 +534,7 @@ } /* if 0.0.0.0/::0, use the source address instead */ - if (zero_address && sctp_nat_friendly) { + if (zero_address && SCTP_BASE_SYSCTL(sctp_nat_friendly)) { sa = (struct sockaddr *)&sa_source; sctp_asconf_get_source_ip(m, sa); SCTPDBG(SCTP_DEBUG_ASCONF1, @@ -667,7 +667,7 @@ if (ack->data != NULL) { sctp_m_freem(ack->data); } - SCTP_ZONE_FREE(sctppcbinfo.ipi_zone_asconf_ack, ack); + SCTP_ZONE_FREE(SCTP_BASE_INFO(ipi_zone_asconf_ack), ack); ack = ack_next; } } @@ -814,7 +814,7 @@ send_reply: ack_cp->ch.chunk_length = htons(ack_cp->ch.chunk_length); /* save the ASCONF-ACK reply */ - ack = SCTP_ZONE_GET(sctppcbinfo.ipi_zone_asconf_ack, + ack = SCTP_ZONE_GET(SCTP_BASE_INFO(ipi_zone_asconf_ack), struct sctp_asconf_ack); if (ack == NULL) { sctp_m_freem(m_ack); @@ -1392,7 +1392,7 @@ TAILQ_INSERT_TAIL(&stcb->asoc.asconf_queue, aa, next); #ifdef SCTP_DEBUG - if (sctp_debug_on && SCTP_DEBUG_ASCONF2) { + if (SCTP_BASE_SYSCTL(sctp_debug_on) && SCTP_DEBUG_ASCONF2) { if (type == SCTP_ADD_IP_ADDRESS) { SCTP_PRINTF("asconf_queue_mgmt: inserted asconf ADD_IP_ADDRESS: "); SCTPDBG_ADDR(SCTP_DEBUG_ASCONF2, sa); @@ -1479,7 +1479,7 @@ net->error_count = 0; } stcb->asoc.overall_error_count = 0; - if (sctp_logging_level & SCTP_THRESHOLD_LOGGING) { + if (SCTP_BASE_SYSCTL(sctp_logging_level) & SCTP_THRESHOLD_LOGGING) { sctp_misc_ints(SCTP_THRESHOLD_CLEAR, stcb->asoc.overall_error_count, 0, @@ -2336,7 +2336,7 @@ ifa->localifa_flags &= ~SCTP_ADDR_DEFER_USE; } sctp_free_ifa(ifa); - SCTP_ZONE_FREE(sctppcbinfo.ipi_zone_laddr, l); + SCTP_ZONE_FREE(SCTP_BASE_INFO(ipi_zone_laddr), l); SCTP_DECR_LADDR_COUNT(); l = l_next; } @@ -2392,7 +2392,7 @@ struct sctp_inpcb *inp; /* go through all our PCB's */ - LIST_FOREACH(inp, &sctppcbinfo.listhead, sctp_list) { + LIST_FOREACH(inp, &SCTP_BASE_INFO(listhead), sctp_list) { struct sctp_tcb *stcb; /* process for all associations for this endpoint */ @@ -3188,7 +3188,7 @@ SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTP_ASCONF, ENOMEM); return (ENOMEM); } - wi = SCTP_ZONE_GET(sctppcbinfo.ipi_zone_laddr, + wi = SCTP_ZONE_GET(SCTP_BASE_INFO(ipi_zone_laddr), struct sctp_laddr); if (wi == NULL) { SCTP_FREE(asc, SCTP_M_ASC_IT); @@ -3203,7 +3203,7 @@ if (inp->laddr_count < 2) { /* can't delete the last local address */ SCTP_FREE(asc, SCTP_M_ASC_IT); - SCTP_ZONE_FREE(sctppcbinfo.ipi_zone_laddr, wi); + SCTP_ZONE_FREE(SCTP_BASE_INFO(ipi_zone_laddr), wi); SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTP_ASCONF, EINVAL); return (EINVAL); } ==== //depot/projects/soc2008/gk_l2filter/sys-netinet/sctp_auth.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netinet/sctp_auth.c,v 1.19 2008/01/28 10:31:12 rrs Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/sctp_auth.c,v 1.20 2008/06/14 07:58:05 rrs Exp $"); #include #include @@ -43,8 +43,8 @@ #include #ifdef SCTP_DEBUG -#define SCTP_AUTH_DEBUG (sctp_debug_on & SCTP_DEBUG_AUTH1) -#define SCTP_AUTH_DEBUG2 (sctp_debug_on & SCTP_DEBUG_AUTH2) +#define SCTP_AUTH_DEBUG (SCTP_BASE_SYSCTL(sctp_debug_on) & SCTP_DEBUG_AUTH1) +#define SCTP_AUTH_DEBUG2 (SCTP_BASE_SYSCTL(sctp_debug_on) & SCTP_DEBUG_AUTH2) #endif /* SCTP_DEBUG */ @@ -1988,7 +1988,7 @@ "SCTP: peer sent chunk list w/o AUTH\n"); return (-1); } - if (!sctp_asconf_auth_nochk && peer_supports_asconf && + if (!SCTP_BASE_SYSCTL(sctp_asconf_auth_nochk) && peer_supports_asconf && !peer_supports_auth) { SCTPDBG(SCTP_DEBUG_AUTH1, "SCTP: peer supports ASCONF but not AUTH\n"); ==== //depot/projects/soc2008/gk_l2filter/sys-netinet/sctp_bsd_addr.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ /* $KAME: sctp_output.c,v 1.46 2005/03/06 16:04:17 itojun Exp $ */ #include -__FBSDID("$FreeBSD: src/sys/netinet/sctp_bsd_addr.c,v 1.18 2008/04/16 17:24:18 rrs Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/sctp_bsd_addr.c,v 1.19 2008/06/14 07:58:05 rrs Exp $"); #include #include @@ -48,7 +48,6 @@ #include #include - /* Declare all of our malloc named types */ /* Note to Michael/Peter for mac-os, @@ -85,17 +84,17 @@ void sctp_wakeup_iterator(void) { - wakeup(&sctppcbinfo.iterator_running); + wakeup(&SCTP_BASE_INFO(iterator_running)); } static void sctp_iterator_thread(void *v) { SCTP_IPI_ITERATOR_WQ_LOCK(); - sctppcbinfo.iterator_running = 0; + SCTP_BASE_INFO(iterator_running) = 0; while (1) { - msleep(&sctppcbinfo.iterator_running, - &sctppcbinfo.ipi_iterator_wq_mtx, + msleep(&SCTP_BASE_INFO(iterator_running), + &SCTP_BASE_INFO(ipi_iterator_wq_mtx), 0, "waiting_for_work", 0); sctp_iterator_worker(); } @@ -108,7 +107,7 @@ ret = kproc_create(sctp_iterator_thread, (void *)NULL, - &sctppcbinfo.thread_proc, + &SCTP_BASE_INFO(thread_proc), RFPROC, SCTP_KTHREAD_PAGES, SCTP_KTRHEAD_NAME); @@ -172,6 +171,7 @@ case IFT_PPP: case IFT_LOOP: case IFT_SLIP: + case IFT_GIF: case IFT_IP: case IFT_IPOVERCDLC: case IFT_IPOVERCLAW: @@ -185,6 +185,7 @@ return (result); } + static void sctp_init_ifns_for_vrf(int vrfid) { @@ -204,20 +205,16 @@ if (ifa->ifa_addr == NULL) { continue; } - if ((ifa->ifa_addr->sa_family != AF_INET) && - (ifa->ifa_addr->sa_family != AF_INET6) - ) { + if ((ifa->ifa_addr->sa_family != AF_INET) && (ifa->ifa_addr->sa_family != AF_INET6)) { /* non inet/inet6 skip */ continue; } if (ifa->ifa_addr->sa_family == AF_INET6) { - ifa6 = (struct in6_ifaddr *)ifa; - ifa_flags = ifa6->ia6_flags; if (IN6_IS_ADDR_UNSPECIFIED(&((struct sockaddr_in6 *)ifa->ifa_addr)->sin6_addr)) { /* skip unspecifed addresses */ continue; } - } else if (ifa->ifa_addr->sa_family == AF_INET) { + } else { if (((struct sockaddr_in *)ifa->ifa_addr)->sin_addr.s_addr == 0) { continue; } @@ -226,26 +223,23 @@ /* non desired type */ continue; } - if ((ifa->ifa_addr->sa_family == AF_INET6) || - (ifa->ifa_addr->sa_family == AF_INET)) { - if (ifa->ifa_addr->sa_family == AF_INET6) { - ifa6 = (struct in6_ifaddr *)ifa; - ifa_flags = ifa6->ia6_flags; - } else { - ifa_flags = 0; - } - sctp_ifa = sctp_add_addr_to_vrf(vrfid, - (void *)ifn, - ifn->if_index, - ifn->if_type, - ifn->if_xname, - (void *)ifa, - ifa->ifa_addr, - ifa_flags, 0 - ); - if (sctp_ifa) { - sctp_ifa->localifa_flags &= ~SCTP_ADDR_DEFER_USE; - } + if (ifa->ifa_addr->sa_family == AF_INET6) { + ifa6 = (struct in6_ifaddr *)ifa; + ifa_flags = ifa6->ia6_flags; + } else { + ifa_flags = 0; + } + sctp_ifa = sctp_add_addr_to_vrf(vrfid, + (void *)ifn, + ifn->if_index, + ifn->if_type, + ifn->if_xname, + (void *)ifa, + ifa->ifa_addr, + ifa_flags, + 0); + if (sctp_ifa) { + sctp_ifa->localifa_flags &= ~SCTP_ADDR_DEFER_USE; } } } @@ -269,24 +263,20 @@ sctp_init_ifns_for_vrf(vrfid); } -static uint8_t first_time = 0; - - void sctp_addr_change(struct ifaddr *ifa, int cmd) { struct sctp_ifa *ifap = NULL; uint32_t ifa_flags = 0; - struct in6_ifaddr *ifa6; /* * BSD only has one VRF, if this changes we will need to hook in the * right things here to get the id to pass to the address managment * routine. */ - if (first_time == 0) { + if (SCTP_BASE_VAR(first_time) == 0) { /* Special test to see if my ::1 will showup with this */ - first_time = 1; + SCTP_BASE_VAR(first_time) = 1; sctp_init_ifns_for_vrf(SCTP_DEFAULT_VRFID); } if ((cmd != RTM_ADD) && (cmd != RTM_DELETE)) { @@ -296,24 +286,22 @@ if (ifa->ifa_addr == NULL) { return; } - if ((ifa->ifa_addr->sa_family != AF_INET) && - (ifa->ifa_addr->sa_family != AF_INET6) - ) { + if ((ifa->ifa_addr->sa_family != AF_INET) && (ifa->ifa_addr->sa_family != AF_INET6)) { /* non inet/inet6 skip */ return; } if (ifa->ifa_addr->sa_family == AF_INET6) { - ifa6 = (struct in6_ifaddr *)ifa; - ifa_flags = ifa6->ia6_flags; + ifa_flags = ((struct in6_ifaddr *)ifa)->ia6_flags; if (IN6_IS_ADDR_UNSPECIFIED(&((struct sockaddr_in6 *)ifa->ifa_addr)->sin6_addr)) { /* skip unspecifed addresses */ return; } - } else if (ifa->ifa_addr->sa_family == AF_INET) { + } else { if (((struct sockaddr_in *)ifa->ifa_addr)->sin_addr.s_addr == 0) { return; } } + if (sctp_is_desired_interface_type(ifa) == 0) { /* non desired type */ return; @@ -323,7 +311,7 @@ ifa->ifa_ifp->if_index, ifa->ifa_ifp->if_type, ifa->ifa_ifp->if_xname, (void *)ifa, ifa->ifa_addr, ifa_flags, 1); - } else if (cmd == RTM_DELETE) { + } else { sctp_del_addr_from_vrf(SCTP_DEFAULT_VRFID, ifa->ifa_addr, ifa->ifa_ifp->if_index, @@ -336,6 +324,21 @@ } } +void + sctp_add_or_del_interfaces(int (*pred) (struct ifnet *), int add){ + struct ifnet *ifn; + struct ifaddr *ifa; + + TAILQ_FOREACH(ifn, &ifnet, if_list) { + if (!(*pred) (ifn)) { + continue; + } + TAILQ_FOREACH(ifa, &ifn->if_addrlist, ifa_list) { + sctp_addr_change(ifa, add ? RTM_ADD : RTM_DELETE); + } + } +} + struct mbuf * sctp_get_mbuf_for_msg(unsigned int space_needed, int want_header, int how, int allonebuf, int type) @@ -368,7 +371,7 @@ SCTP_BUF_NEXT(m) = NULL; } #ifdef SCTP_MBUF_LOGGING - if (sctp_logging_level & SCTP_MBUF_LOGGING_ENABLE) { + if (SCTP_BASE_SYSCTL(sctp_logging_level) & SCTP_MBUF_LOGGING_ENABLE) { if (SCTP_BUF_IS_EXTENDED(m)) { sctp_log_mb(m, SCTP_MBUF_IALLOC); } @@ -379,12 +382,6 @@ #ifdef SCTP_PACKET_LOGGING - -int packet_log_writers = 0; -int packet_log_end = 0; -uint8_t packet_log_buffer[SCTP_PACKET_LOG_SIZE]; - - void sctp_packet_log(struct mbuf *m, int length) { @@ -406,40 +403,40 @@ /* Can't log this packet I have not a buffer big enough */ return; } - if (length < (SCTP_MIN_V4_OVERHEAD + sizeof(struct sctp_cookie_ack_chunk))) { + if (length < (int)(SCTP_MIN_V4_OVERHEAD + sizeof(struct sctp_cookie_ack_chunk))) { return; } - atomic_add_int(&packet_log_writers, 1); + atomic_add_int(&SCTP_BASE_VAR(packet_log_writers), 1); try_again: - if (packet_log_writers > SCTP_PKTLOG_WRITERS_NEED_LOCK) { + if (SCTP_BASE_VAR(packet_log_writers) > SCTP_PKTLOG_WRITERS_NEED_LOCK) { SCTP_IP_PKTLOG_LOCK(); grabbed_lock = 1; again_locked: - value = packet_log_end; - newval = packet_log_end + total_len; + value = SCTP_BASE_VAR(packet_log_end); + newval = SCTP_BASE_VAR(packet_log_end) + total_len; if (newval >= SCTP_PACKET_LOG_SIZE) { /* we wrapped */ thisbegin = 0; thisend = total_len; } else { - thisbegin = packet_log_end; + thisbegin = SCTP_BASE_VAR(packet_log_end); thisend = newval; } - if (!(atomic_cmpset_int(&packet_log_end, value, thisend))) { + if (!(atomic_cmpset_int(&SCTP_BASE_VAR(packet_log_end), value, thisend))) { goto again_locked; } } else { - value = packet_log_end; - newval = packet_log_end + total_len; + value = SCTP_BASE_VAR(packet_log_end); + newval = SCTP_BASE_VAR(packet_log_end) + total_len; if (newval >= SCTP_PACKET_LOG_SIZE) { /* we wrapped */ thisbegin = 0; thisend = total_len; } else { - thisbegin = packet_log_end; + thisbegin = SCTP_BASE_VAR(packet_log_end); thisend = newval; } - if (!(atomic_cmpset_int(&packet_log_end, value, thisend))) { + if (!(atomic_cmpset_int(&SCTP_BASE_VAR(packet_log_end), value, thisend))) { goto try_again; } } @@ -448,14 +445,14 @@ printf("Insanity stops a log thisbegin:%d thisend:%d writers:%d lock:%d end:%d\n", thisbegin, thisend, - packet_log_writers, + SCTP_BASE_VAR(packet_log_writers), grabbed_lock, - packet_log_end); - packet_log_end = 0; + SCTP_BASE_VAR(packet_log_end)); + SCTP_BASE_VAR(packet_log_end) = 0; goto no_log; } - lenat = (int *)&packet_log_buffer[thisbegin]; + lenat = (int *)&SCTP_BASE_VAR(packet_log_buffer)[thisbegin]; *lenat = total_len; lenat++; *lenat = value; @@ -465,7 +462,7 @@ *tick_tock = sctp_get_tick_count(); copyto = (void *)lenat; thisone = thisend - sizeof(int); - lenat = (int *)&packet_log_buffer[thisone]; + lenat = (int *)&SCTP_BASE_VAR(packet_log_buffer)[thisone]; *lenat = thisbegin; if (grabbed_lock) { SCTP_IP_PKTLOG_UNLOCK(); @@ -476,7 +473,7 @@ if (grabbed_lock) { SCTP_IP_PKTLOG_UNLOCK(); } - atomic_subtract_int(&packet_log_writers, 1); + atomic_subtract_int(&SCTP_BASE_VAR(packet_log_writers), 1); } @@ -492,14 +489,14 @@ int did_delay = 0; tocopy = length; - if (length < (2 * sizeof(int))) { + if (length < (int)(2 * sizeof(int))) { /* not enough room */ return (0); } if (SCTP_PKTLOG_WRITERS_NEED_LOCK) { - atomic_add_int(&packet_log_writers, SCTP_PKTLOG_WRITERS_NEED_LOCK); + atomic_add_int(&SCTP_BASE_VAR(packet_log_writers), SCTP_PKTLOG_WRITERS_NEED_LOCK); again: - if ((did_delay == 0) && (packet_log_writers != SCTP_PKTLOG_WRITERS_NEED_LOCK)) { + if ((did_delay == 0) && (SCTP_BASE_VAR(packet_log_writers) != SCTP_PKTLOG_WRITERS_NEED_LOCK)) { /* * we delay here for just a moment hoping the * writer(s) that were present when we entered will @@ -515,12 +512,12 @@ } SCTP_IP_PKTLOG_LOCK(); lenat = (int *)target; - *lenat = packet_log_end; + *lenat = SCTP_BASE_VAR(packet_log_end); lenat++; this_copy = min((length - sizeof(int)), SCTP_PACKET_LOG_SIZE); - memcpy((void *)lenat, (void *)packet_log_buffer, this_copy); + memcpy((void *)lenat, (void *)SCTP_BASE_VAR(packet_log_buffer), this_copy); if (SCTP_PKTLOG_WRITERS_NEED_LOCK) { - atomic_subtract_int(&packet_log_writers, + atomic_subtract_int(&SCTP_BASE_VAR(packet_log_writers), SCTP_PKTLOG_WRITERS_NEED_LOCK); } SCTP_IP_PKTLOG_UNLOCK(); ==== //depot/projects/soc2008/gk_l2filter/sys-netinet/sctp_bsd_addr.h#2 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netinet/sctp_bsd_addr.h,v 1.7 2008/04/16 17:24:18 rrs Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/sctp_bsd_addr.h,v 1.8 2008/06/14 07:58:05 rrs Exp $"); #ifndef __sctp_bsd_addr_h__ #define __sctp_bsd_addr_h__ @@ -58,5 +58,7 @@ void sctp_addr_change(struct ifaddr *ifa, int cmd); +void sctp_add_or_del_interfaces(int (*pred) (struct ifnet *), int add); + #endif #endif ==== //depot/projects/soc2008/gk_l2filter/sys-netinet/sctp_cc_functions.c#2 (text+ko) ==== @@ -43,7 +43,7 @@ #include #include #include -__FBSDID("$FreeBSD: src/sys/netinet/sctp_cc_functions.c,v 1.5 2008/05/20 13:47:44 rrs Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/sctp_cc_functions.c,v 1.6 2008/06/14 07:58:05 rrs Exp $"); void sctp_set_initial_cc_param(struct sctp_tcb *stcb, struct sctp_nets *net) { @@ -55,7 +55,7 @@ net->cwnd = min((net->mtu * 4), max((2 * net->mtu), SCTP_INITIAL_CWND)); net->ssthresh = stcb->asoc.peers_rwnd; - if (sctp_logging_level & (SCTP_CWND_MONITOR_ENABLE | SCTP_CWND_LOGGING_ENABLE)) { + if (SCTP_BASE_SYSCTL(sctp_logging_level) & (SCTP_CWND_MONITOR_ENABLE | SCTP_CWND_LOGGING_ENABLE)) { sctp_log_cwnd(stcb, net, 0, SCTP_CWND_INITIALIZATION); } } @@ -71,7 +71,7 @@ * (net->fast_retran_loss_recovery == 0))) */ TAILQ_FOREACH(net, &asoc->nets, sctp_next) { - if ((asoc->fast_retran_loss_recovery == 0) || (sctp_cmt_on_off == 1)) { + if ((asoc->fast_retran_loss_recovery == 0) || (SCTP_BASE_SYSCTL(sctp_cmt_on_off) == 1)) { /* out of a RFC2582 Fast recovery window? */ if (net->net_ack > 0) { /* @@ -88,7 +88,7 @@ net->ssthresh = 2 * net->mtu; } net->cwnd = net->ssthresh; - if (sctp_logging_level & SCTP_CWND_MONITOR_ENABLE) { + if (SCTP_BASE_SYSCTL(sctp_logging_level) & SCTP_CWND_MONITOR_ENABLE) { sctp_log_cwnd(stcb, net, (net->cwnd - old_cwnd), SCTP_CWND_LOG_FROM_FR); } @@ -165,7 +165,7 @@ } } #endif - if (sctp_early_fr) { + if (SCTP_BASE_SYSCTL(sctp_early_fr)) { /* * So, first of all do we need to have a Early FR * timer running? @@ -201,7 +201,7 @@ } /* if nothing was acked on this destination skip it */ if (net->net_ack == 0) { - if (sctp_logging_level & SCTP_CWND_LOGGING_ENABLE) { + if (SCTP_BASE_SYSCTL(sctp_logging_level) & SCTP_CWND_LOGGING_ENABLE) { sctp_log_cwnd(stcb, net, 0, SCTP_CWND_LOG_FROM_SACK); } continue; @@ -232,10 +232,11 @@ * * Should we stop any running T3 timer here? */ - if (sctp_cmt_on_off && sctp_cmt_pf && ((net->dest_state & SCTP_ADDR_PF) == - SCTP_ADDR_PF)) { + if (SCTP_BASE_SYSCTL(sctp_cmt_on_off) && + SCTP_BASE_SYSCTL(sctp_cmt_pf) && + ((net->dest_state & SCTP_ADDR_PF) == SCTP_ADDR_PF)) { net->dest_state &= ~SCTP_ADDR_PF; - net->cwnd = net->mtu * sctp_cmt_pf; + net->cwnd = net->mtu * SCTP_BASE_SYSCTL(sctp_cmt_pf); SCTPDBG(SCTP_DEBUG_INDATA1, "Destination %p moved from PF to reachable with cwnd %d.\n", net, net->cwnd); /* @@ -259,7 +260,7 @@ */ #endif - if (asoc->fast_retran_loss_recovery && will_exit == 0 && sctp_cmt_on_off == 0) { + if (asoc->fast_retran_loss_recovery && will_exit == 0 && SCTP_BASE_SYSCTL(sctp_cmt_on_off) == 0) { /* * If we are in loss recovery we skip any cwnd * update @@ -270,26 +271,26 @@ * CMT: CUC algorithm. Update cwnd if pseudo-cumack has * moved. */ - if (accum_moved || (sctp_cmt_on_off && net->new_pseudo_cumack)) { + if (accum_moved || (SCTP_BASE_SYSCTL(sctp_cmt_on_off) && net->new_pseudo_cumack)) { /* If the cumulative ack moved we can proceed */ if (net->cwnd <= net->ssthresh) { /* We are in slow start */ if (net->flight_size + net->net_ack >= net->cwnd) { - if (net->net_ack > (net->mtu * sctp_L2_abc_variable)) { - net->cwnd += (net->mtu * sctp_L2_abc_variable); - if (sctp_logging_level & SCTP_CWND_MONITOR_ENABLE) { + if (net->net_ack > (net->mtu * SCTP_BASE_SYSCTL(sctp_L2_abc_variable))) { + net->cwnd += (net->mtu * SCTP_BASE_SYSCTL(sctp_L2_abc_variable)); + if (SCTP_BASE_SYSCTL(sctp_logging_level) & SCTP_CWND_MONITOR_ENABLE) { sctp_log_cwnd(stcb, net, net->mtu, SCTP_CWND_LOG_FROM_SS); } } else { net->cwnd += net->net_ack; - if (sctp_logging_level & SCTP_CWND_MONITOR_ENABLE) { + if (SCTP_BASE_SYSCTL(sctp_logging_level) & SCTP_CWND_MONITOR_ENABLE) { sctp_log_cwnd(stcb, net, net->net_ack, SCTP_CWND_LOG_FROM_SS); } } } else { - if (sctp_logging_level & SCTP_CWND_LOGGING_ENABLE) { + if (SCTP_BASE_SYSCTL(sctp_logging_level) & SCTP_CWND_LOGGING_ENABLE) { sctp_log_cwnd(stcb, net, net->net_ack, SCTP_CWND_LOG_NOADV_SS); } @@ -305,19 +306,19 @@ (net->partial_bytes_acked >= net->cwnd)) { net->partial_bytes_acked -= net->cwnd; net->cwnd += net->mtu; - if (sctp_logging_level & SCTP_CWND_MONITOR_ENABLE) { + if (SCTP_BASE_SYSCTL(sctp_logging_level) & SCTP_CWND_MONITOR_ENABLE) { sctp_log_cwnd(stcb, net, net->mtu, SCTP_CWND_LOG_FROM_CA); } } else { - if (sctp_logging_level & SCTP_CWND_LOGGING_ENABLE) { + if (SCTP_BASE_SYSCTL(sctp_logging_level) & SCTP_CWND_LOGGING_ENABLE) { sctp_log_cwnd(stcb, net, net->net_ack, SCTP_CWND_LOG_NOADV_CA); } } } } else { - if (sctp_logging_level & SCTP_CWND_LOGGING_ENABLE) { + if (SCTP_BASE_SYSCTL(sctp_logging_level) & SCTP_CWND_LOGGING_ENABLE) { sctp_log_cwnd(stcb, net, net->mtu, SCTP_CWND_LOG_NO_CUMACK); } @@ -351,7 +352,7 @@ net->cwnd = net->mtu; net->partial_bytes_acked = 0; - if (sctp_logging_level & SCTP_CWND_MONITOR_ENABLE) { + if (SCTP_BASE_SYSCTL(sctp_logging_level) & SCTP_CWND_MONITOR_ENABLE) { sctp_log_cwnd(stcb, net, net->cwnd - old_cwnd, SCTP_CWND_LOG_FROM_RTX); } } @@ -369,7 +370,7 @@ net->RTO <<= 1; } net->cwnd = net->ssthresh; - if (sctp_logging_level & SCTP_CWND_MONITOR_ENABLE) { + if (SCTP_BASE_SYSCTL(sctp_logging_level) & SCTP_CWND_MONITOR_ENABLE) { sctp_log_cwnd(stcb, net, (net->cwnd - old_cwnd), SCTP_CWND_LOG_FROM_SAT); } } @@ -478,7 +479,7 @@ } if (net->cwnd - old_cwnd != 0) { /* log only changes */ - if (sctp_logging_level & SCTP_CWND_MONITOR_ENABLE) { + if (SCTP_BASE_SYSCTL(sctp_logging_level) & SCTP_CWND_MONITOR_ENABLE) { sctp_log_cwnd(stcb, net, (net->cwnd - old_cwnd), SCTP_CWND_LOG_FROM_SAT); } @@ -495,7 +496,7 @@ net->ssthresh = net->cwnd; net->cwnd = (net->flight_size + (burst_limit * net->mtu)); - if (sctp_logging_level & SCTP_CWND_MONITOR_ENABLE) { + if (SCTP_BASE_SYSCTL(sctp_logging_level) & SCTP_CWND_MONITOR_ENABLE) { sctp_log_cwnd(stcb, net, (net->cwnd - old_cwnd), SCTP_CWND_LOG_FROM_BRST); } } @@ -516,7 +517,7 @@ if (net->cwnd < net->ssthresh) /* still in SS move to CA */ net->ssthresh = net->cwnd - 1; - if (sctp_logging_level & SCTP_CWND_MONITOR_ENABLE) { + if (SCTP_BASE_SYSCTL(sctp_logging_level) & SCTP_CWND_MONITOR_ENABLE) { sctp_log_cwnd(stcb, net, (old_cwnd - net->cwnd), SCTP_CWND_LOG_FROM_FR); } } @@ -619,12 +620,12 @@ /* normal mode */ if (net->net_ack > net->mtu) { net->cwnd += net->mtu; - if (sctp_logging_level & SCTP_CWND_MONITOR_ENABLE) { + if (SCTP_BASE_SYSCTL(sctp_logging_level) & SCTP_CWND_MONITOR_ENABLE) { sctp_log_cwnd(stcb, net, net->mtu, SCTP_CWND_LOG_FROM_SS); } } else { net->cwnd += net->net_ack; - if (sctp_logging_level & SCTP_CWND_MONITOR_ENABLE) { + if (SCTP_BASE_SYSCTL(sctp_logging_level) & SCTP_CWND_MONITOR_ENABLE) { sctp_log_cwnd(stcb, net, net->net_ack, SCTP_CWND_LOG_FROM_SS); } } @@ -638,7 +639,7 @@ net->last_hs_used = indx; incr = ((sctp_cwnd_adjust[indx].increase) << 10); net->cwnd += incr; - if (sctp_logging_level & SCTP_CWND_MONITOR_ENABLE) { + if (SCTP_BASE_SYSCTL(sctp_logging_level) & SCTP_CWND_MONITOR_ENABLE) { sctp_log_cwnd(stcb, net, incr, SCTP_CWND_LOG_FROM_SS); } } @@ -680,7 +681,7 @@ net->last_hs_used = indx; } } - if (sctp_logging_level & SCTP_CWND_MONITOR_ENABLE) { + if (SCTP_BASE_SYSCTL(sctp_logging_level) & SCTP_CWND_MONITOR_ENABLE) { sctp_log_cwnd(stcb, net, (net->cwnd - old_cwnd), SCTP_CWND_LOG_FROM_FR); } } @@ -696,7 +697,7 @@ * (net->fast_retran_loss_recovery == 0))) */ TAILQ_FOREACH(net, &asoc->nets, sctp_next) { - if ((asoc->fast_retran_loss_recovery == 0) || (sctp_cmt_on_off == 1)) { >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jun 19 21:03:35 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F1FB81065688; Thu, 19 Jun 2008 21:03:34 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B38811065679 for ; Thu, 19 Jun 2008 21:03:34 +0000 (UTC) (envelope-from sson@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 95B418FC1B for ; Thu, 19 Jun 2008 21:03:34 +0000 (UTC) (envelope-from sson@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5JL3Y5L075019 for ; Thu, 19 Jun 2008 21:03:34 GMT (envelope-from sson@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5JL3YAL075017 for perforce@freebsd.org; Thu, 19 Jun 2008 21:03:34 GMT (envelope-from sson@FreeBSD.org) Date: Thu, 19 Jun 2008 21:03:34 GMT Message-Id: <200806192103.m5JL3YAL075017@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sson@FreeBSD.org using -f From: Stacey Son To: Perforce Change Reviews Cc: Subject: PERFORCE change 143786 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Jun 2008 21:03:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=143786 Change 143786 by sson@sson_amd64 on 2008/06/19 21:02:42 Added missing pthread_mutex_unlock() in getacna(). Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_control.c#17 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_control.c#17 (text+ko) ==== @@ -27,7 +27,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_control.c#16 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_control.c#17 $ */ #include @@ -485,6 +485,7 @@ return (-3); } strcpy(auditstr, str); + pthread_mutex_unlock(&mutex); return (0); } From owner-p4-projects@FreeBSD.ORG Thu Jun 19 23:00:33 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 13C5E106568C; Thu, 19 Jun 2008 23:00:33 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C9B5E1065675 for ; Thu, 19 Jun 2008 23:00:32 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id AF07C8FC0C for ; Thu, 19 Jun 2008 23:00:32 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5JN0WLP086109 for ; Thu, 19 Jun 2008 23:00:32 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5JN0W3L086107 for perforce@freebsd.org; Thu, 19 Jun 2008 23:00:32 GMT (envelope-from rpaulo@FreeBSD.org) Date: Thu, 19 Jun 2008 23:00:32 GMT Message-Id: <200806192300.m5JN0W3L086107@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo To: Perforce Change Reviews Cc: Subject: PERFORCE change 143791 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Jun 2008 23:00:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=143791 Change 143791 by rpaulo@rpaulo_epsilon on 2008/06/19 22:59:31 Add last bits of basic FSM processing. Affected files ... .. //depot/projects/soc2008/rpaulo-tcpad/handler.c#8 edit Differences ... ==== //depot/projects/soc2008/rpaulo-tcpad/handler.c#8 (text+ko) ==== @@ -23,7 +23,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/soc2008/rpaulo-tcpad/handler.c#7 $ + * $P4: //depot/projects/soc2008/rpaulo-tcpad/handler.c#8 $ */ #include @@ -129,32 +129,42 @@ cp->pktshead = rcp->pktshead; dumper_addpkt(cp->pktshead, ph, bytes); } else if ((tcp->th_flags & TH_FLAGS) == TH_ACK) { + if (cp == NULL || rcp == NULL) + return; - if (cp) { - dumper_addpkt(cp->pktshead, ph, bytes); - if (cp->tcpstate == TCPS_SYN_SENT || - cp->tcpstate == TCPS_SYN_RECEIVED) { - cp->tcpstate = TCPS_ESTABLISHED; - rcp->tcpstate = TCPS_ESTABLISHED; - DPRINTF("established\n"); - print_packet(bytes, linkhlen); - } - if (cp->tcpstate == TCPS_FIN_WAIT_1) { - cp->tcpstate = TCPS_FIN_WAIT_2; - rcp->tcpstate = TCPS_CLOSE_WAIT; - print_packet(bytes, linkhlen); - } + dumper_addpkt(cp->pktshead, ph, bytes); + if (cp->tcpstate == TCPS_SYN_SENT || + cp->tcpstate == TCPS_SYN_RECEIVED) { + cp->tcpstate = TCPS_ESTABLISHED; + rcp->tcpstate = TCPS_ESTABLISHED; + DPRINTF("established\n"); + print_packet(bytes, linkhlen); + } + if (cp->tcpstate == TCPS_ESTABLISHED && + rcp->tcpstate == TCPS_FIN_WAIT_1) { + printf("first ack\n"); + cp->tcpstate = TCPS_CLOSE_WAIT; + rcp->tcpstate = TCPS_FIN_WAIT_2; + } + if (cp->tcpstate == TCPS_LAST_ACK) { + cp->tcpstate = TCPS_TIME_WAIT; + printf("connection down\n"); } } else if ((tcp->th_flags & TH_FLAGS) == (TH_FIN|TH_ACK)) { - if (cp) { - dumper_addpkt(cp->pktshead, ph, bytes); - if (cp->tcpstate == TCPS_ESTABLISHED) { - cp->tcpstate = TCPS_FIN_WAIT_1; - rcp->tcpstate = TCPS_CLOSE_WAIT; - DPRINTF("fin_wait_1\n"); - print_packet(bytes, linkhlen); - dumper_error(p, "test.cap", cp->pktshead); - } + if (cp == NULL || rcp == NULL) + return; + + dumper_addpkt(cp->pktshead, ph, bytes); + if (cp->tcpstate == TCPS_ESTABLISHED) { + cp->tcpstate = TCPS_FIN_WAIT_1; + DPRINTF("fin_wait_1\n"); + print_packet(bytes, linkhlen); + } + if (cp->tcpstate == TCPS_CLOSE_WAIT && + rcp->tcpstate == TCPS_FIN_WAIT_2) { + printf("last_ack\n"); + cp->tcpstate = TCPS_TIME_WAIT; + rcp->tcpstate = TCPS_LAST_ACK; } } else if ((tcp->th_flags & TH_FLAGS) == (TH_RST|TH_ACK)) { if (rcp && rcp->tcpstate == TCPS_SYN_SENT) { From owner-p4-projects@FreeBSD.ORG Thu Jun 19 23:02:35 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 42F791065670; Thu, 19 Jun 2008 23:02:35 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 05175106564A for ; Thu, 19 Jun 2008 23:02:35 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DEDB28FC1B for ; Thu, 19 Jun 2008 23:02:34 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5JN2YOA086243 for ; Thu, 19 Jun 2008 23:02:34 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5JN2Y4B086241 for perforce@freebsd.org; Thu, 19 Jun 2008 23:02:34 GMT (envelope-from rpaulo@FreeBSD.org) Date: Thu, 19 Jun 2008 23:02:34 GMT Message-Id: <200806192302.m5JN2Y4B086241@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo To: Perforce Change Reviews Cc: Subject: PERFORCE change 143792 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Jun 2008 23:02:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=143792 Change 143792 by rpaulo@rpaulo_epsilon on 2008/06/19 23:02:10 Oops, add the CLOSING case. Affected files ... .. //depot/projects/soc2008/rpaulo-tcpad/handler.c#9 edit Differences ... ==== //depot/projects/soc2008/rpaulo-tcpad/handler.c#9 (text+ko) ==== @@ -23,7 +23,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/soc2008/rpaulo-tcpad/handler.c#8 $ + * $P4: //depot/projects/soc2008/rpaulo-tcpad/handler.c#9 $ */ #include @@ -146,7 +146,8 @@ cp->tcpstate = TCPS_CLOSE_WAIT; rcp->tcpstate = TCPS_FIN_WAIT_2; } - if (cp->tcpstate == TCPS_LAST_ACK) { + if (cp->tcpstate == TCPS_LAST_ACK || + cp->tcpstate == TCPS_CLOSING) { cp->tcpstate = TCPS_TIME_WAIT; printf("connection down\n"); } @@ -166,6 +167,9 @@ cp->tcpstate = TCPS_TIME_WAIT; rcp->tcpstate = TCPS_LAST_ACK; } + if (cp->tcpstate == TCPS_FIN_WAIT_1) { + cp->tcpstate = TCPS_CLOSING; + } } else if ((tcp->th_flags & TH_FLAGS) == (TH_RST|TH_ACK)) { if (rcp && rcp->tcpstate == TCPS_SYN_SENT) { DPRINTF("stopped tracking connection (rst) between" From owner-p4-projects@FreeBSD.ORG Thu Jun 19 23:32:05 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 13EDA106566C; Thu, 19 Jun 2008 23:32:05 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CA506106566B for ; Thu, 19 Jun 2008 23:32:04 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B07FA8FC22 for ; Thu, 19 Jun 2008 23:32:04 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5JNW4DF089701 for ; Thu, 19 Jun 2008 23:32:04 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5JNW4W4089699 for perforce@freebsd.org; Thu, 19 Jun 2008 23:32:04 GMT (envelope-from rpaulo@FreeBSD.org) Date: Thu, 19 Jun 2008 23:32:04 GMT Message-Id: <200806192332.m5JNW4W4089699@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo To: Perforce Change Reviews Cc: Subject: PERFORCE change 143793 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Jun 2008 23:32:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=143793 Change 143793 by rpaulo@rpaulo_epsilon on 2008/06/19 23:31:54 Add more robust debugging macro. Affected files ... .. //depot/projects/soc2008/rpaulo-tcpad/debug.h#3 edit Differences ... ==== //depot/projects/soc2008/rpaulo-tcpad/debug.h#3 (text+ko) ==== @@ -23,14 +23,17 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/soc2008/rpaulo-tcpad/debug.h#2 $ + * $P4: //depot/projects/soc2008/rpaulo-tcpad/debug.h#3 $ */ #ifndef _DEBUG_H_ #define _DEBUG_H_ #ifdef DEBUG -#define DPRINTF printf +#define DPRINTF(...) do { \ + fprintf(stderr, "%s: ", __func__); \ + fprintf(stderr, __VA_ARGS__); \ +} while (0) #else #define DPRINTF #endif From owner-p4-projects@FreeBSD.ORG Thu Jun 19 23:51:25 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 00C77106567E; Thu, 19 Jun 2008 23:51:25 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B61E91065673 for ; Thu, 19 Jun 2008 23:51:24 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9BBB48FC18 for ; Thu, 19 Jun 2008 23:51:24 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5JNpO5Q091261 for ; Thu, 19 Jun 2008 23:51:24 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5JNpOfA091259 for perforce@freebsd.org; Thu, 19 Jun 2008 23:51:24 GMT (envelope-from rpaulo@FreeBSD.org) Date: Thu, 19 Jun 2008 23:51:24 GMT Message-Id: <200806192351.m5JNpOfA091259@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo To: Perforce Change Reviews Cc: Subject: PERFORCE change 143795 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Jun 2008 23:51:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=143795 Change 143795 by rpaulo@rpaulo_epsilon on 2008/06/19 23:50:47 Rename variables to more sensible names. Affected files ... .. //depot/projects/soc2008/rpaulo-tcpad/handler.c#10 edit .. //depot/projects/soc2008/rpaulo-tcpad/tcpad.h#7 edit Differences ... ==== //depot/projects/soc2008/rpaulo-tcpad/handler.c#10 (text+ko) ==== @@ -23,7 +23,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/soc2008/rpaulo-tcpad/handler.c#9 $ + * $P4: //depot/projects/soc2008/rpaulo-tcpad/handler.c#10 $ */ #include @@ -47,9 +47,9 @@ #include "debug.h" -static conn_t * find_conn(struct in_addr ipsrc, struct in_addr ipdst, +static struct tcpc *find_conn(struct in_addr ipsrc, struct in_addr ipdst, unsigned short sport, unsigned short dport); -static void print_packet(const unsigned char *bytes, const int linkhlen); +static void print_packet(const unsigned char *bytes, const int linkhlen); void tcpad_pcaphandler(unsigned char *user, const struct pcap_pkthdr *ph, @@ -58,8 +58,8 @@ const struct ip *ip; const struct tcphdr *tcp; int linkhlen; - conn_t *cp; - conn_t *rcp; + struct tcpc *cp; + struct tcpc *rcp; linkhlen = (int)*user; @@ -80,7 +80,7 @@ free(cp); } cp = malloc(sizeof(*cp)); - cp->tcpstate = TCPS_SYN_SENT; + cp->t_state = TCPS_SYN_SENT; cp->dport = tcp->th_dport; cp->sport = tcp->th_sport; cp->isv6 = 0; @@ -89,7 +89,7 @@ DPRINTF("tracking (syn) connection between %s and ", inet_ntoa(cp->sv4addr)); DPRINTF("%s\n",inet_ntoa(cp->dv4addr)); - LIST_INSERT_HEAD(&chead, cp, entries); + LIST_INSERT_HEAD(&tcpchead, cp, entries); print_packet(bytes, linkhlen); /* @@ -112,7 +112,7 @@ free(cp); } cp = malloc(sizeof(*cp)); - cp->tcpstate = TCPS_SYN_RECEIVED; + cp->t_state = TCPS_SYN_RECEIVED; cp->dport = tcp->th_dport; cp->sport = tcp->th_sport; cp->isv6 = 0; @@ -121,7 +121,7 @@ DPRINTF("tracking (syn/ack) connection between %s and ", inet_ntoa(cp->sv4addr)); DPRINTF("%s\n",inet_ntoa(cp->dv4addr)); - LIST_INSERT_HEAD(&chead, cp, entries); + LIST_INSERT_HEAD(&tcpchead, cp, entries); print_packet(bytes, linkhlen); /* rcp->pktshead should have been already malloc'ed and @@ -133,22 +133,22 @@ return; dumper_addpkt(cp->pktshead, ph, bytes); - if (cp->tcpstate == TCPS_SYN_SENT || - cp->tcpstate == TCPS_SYN_RECEIVED) { - cp->tcpstate = TCPS_ESTABLISHED; - rcp->tcpstate = TCPS_ESTABLISHED; + if (cp->t_state == TCPS_SYN_SENT || + cp->t_state == TCPS_SYN_RECEIVED) { + cp->t_state = TCPS_ESTABLISHED; + rcp->t_state = TCPS_ESTABLISHED; DPRINTF("established\n"); print_packet(bytes, linkhlen); } - if (cp->tcpstate == TCPS_ESTABLISHED && - rcp->tcpstate == TCPS_FIN_WAIT_1) { + if (cp->t_state == TCPS_ESTABLISHED && + rcp->t_state == TCPS_FIN_WAIT_1) { printf("first ack\n"); - cp->tcpstate = TCPS_CLOSE_WAIT; - rcp->tcpstate = TCPS_FIN_WAIT_2; + cp->t_state = TCPS_CLOSE_WAIT; + rcp->t_state = TCPS_FIN_WAIT_2; } - if (cp->tcpstate == TCPS_LAST_ACK || - cp->tcpstate == TCPS_CLOSING) { - cp->tcpstate = TCPS_TIME_WAIT; + if (cp->t_state == TCPS_LAST_ACK || + cp->t_state == TCPS_CLOSING) { + cp->t_state = TCPS_TIME_WAIT; printf("connection down\n"); } } else if ((tcp->th_flags & TH_FLAGS) == (TH_FIN|TH_ACK)) { @@ -156,22 +156,22 @@ return; dumper_addpkt(cp->pktshead, ph, bytes); - if (cp->tcpstate == TCPS_ESTABLISHED) { - cp->tcpstate = TCPS_FIN_WAIT_1; + if (cp->t_state == TCPS_ESTABLISHED) { + cp->t_state = TCPS_FIN_WAIT_1; DPRINTF("fin_wait_1\n"); print_packet(bytes, linkhlen); } - if (cp->tcpstate == TCPS_CLOSE_WAIT && - rcp->tcpstate == TCPS_FIN_WAIT_2) { + if (cp->t_state == TCPS_CLOSE_WAIT && + rcp->t_state == TCPS_FIN_WAIT_2) { printf("last_ack\n"); - cp->tcpstate = TCPS_TIME_WAIT; - rcp->tcpstate = TCPS_LAST_ACK; + cp->t_state = TCPS_TIME_WAIT; + rcp->t_state = TCPS_LAST_ACK; } - if (cp->tcpstate == TCPS_FIN_WAIT_1) { - cp->tcpstate = TCPS_CLOSING; + if (cp->t_state == TCPS_FIN_WAIT_1) { + cp->t_state = TCPS_CLOSING; } } else if ((tcp->th_flags & TH_FLAGS) == (TH_RST|TH_ACK)) { - if (rcp && rcp->tcpstate == TCPS_SYN_SENT) { + if (rcp && rcp->t_state == TCPS_SYN_SENT) { DPRINTF("stopped tracking connection (rst) between" " %s and ", inet_ntoa(rcp->sv4addr)); DPRINTF("%s\n",inet_ntoa(rcp->dv4addr)); @@ -182,13 +182,13 @@ } } -static conn_t * +static struct tcpc * find_conn(struct in_addr ipsrc, struct in_addr ipdst, unsigned short sport, unsigned short dport) { - conn_t *cp; + struct tcpc *cp; - LIST_FOREACH(cp, &chead, entries) { + LIST_FOREACH(cp, &tcpchead, entries) { if (memcmp(&cp->sv4addr, &ipsrc, sizeof(struct in_addr)) == 0 && memcmp(&cp->dv4addr, &ipdst, sizeof(struct in_addr)) == 0 && cp->sport == sport && cp->dport == dport) { ==== //depot/projects/soc2008/rpaulo-tcpad/tcpad.h#7 (text+ko) ==== @@ -23,7 +23,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/soc2008/rpaulo-tcpad/tcpad.h#6 $ + * $P4: //depot/projects/soc2008/rpaulo-tcpad/tcpad.h#7 $ */ #ifndef _TCPAD_H_ @@ -33,17 +33,17 @@ pcap_t *p; -typedef struct _conn_t { - LIST_ENTRY(_conn_t) entries; +struct tcpc { + LIST_ENTRY(tcpc) entries; struct in_addr sv4addr; struct in_addr dv4addr; unsigned short dport; unsigned short sport; - int tcpstate; /* TCP FSM state */ + int t_state; /* TCP FSM state */ int isv6; struct dumppkth *pktshead; -} conn_t; +}; -LIST_HEAD(chead, _conn_t) chead; +LIST_HEAD(tcpchead, tcpc) tcpchead; #endif /* _TCPAD_H_ */ From owner-p4-projects@FreeBSD.ORG Thu Jun 19 23:51:25 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B9D211065677; Thu, 19 Jun 2008 23:51:25 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D79CA1065676 for ; Thu, 19 Jun 2008 23:51:24 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BE2B38FC1E for ; Thu, 19 Jun 2008 23:51:24 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5JNpO6t091266 for ; Thu, 19 Jun 2008 23:51:24 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5JNpOAJ091264 for perforce@freebsd.org; Thu, 19 Jun 2008 23:51:24 GMT (envelope-from rpaulo@FreeBSD.org) Date: Thu, 19 Jun 2008 23:51:24 GMT Message-Id: <200806192351.m5JNpOAJ091264@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo To: Perforce Change Reviews Cc: Subject: PERFORCE change 143796 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Jun 2008 23:51:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=143796 Change 143796 by rpaulo@rpaulo_epsilon on 2008/06/19 23:51:13 Add timer facility. Affected files ... .. //depot/projects/soc2008/rpaulo-tcpad/Makefile#7 edit .. //depot/projects/soc2008/rpaulo-tcpad/main.c#7 edit .. //depot/projects/soc2008/rpaulo-tcpad/timer.c#1 add .. //depot/projects/soc2008/rpaulo-tcpad/timer.h#1 add Differences ... ==== //depot/projects/soc2008/rpaulo-tcpad/Makefile#7 (text+ko) ==== @@ -1,7 +1,7 @@ -# $P4: //depot/projects/soc2008/rpaulo-tcpad/Makefile#6 $ +# $P4: //depot/projects/soc2008/rpaulo-tcpad/Makefile#7 $ PROG=tcpad -SRCS=main.c device.c linkhdr.c handler.c dumper.c +SRCS=main.c device.c linkhdr.c handler.c dumper.c timer.c CFLAGS+=-DDEBUG -ggdb WARNS=5 LDADD=-lpcap ==== //depot/projects/soc2008/rpaulo-tcpad/main.c#7 (text+ko) ==== @@ -23,7 +23,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/soc2008/rpaulo-tcpad/main.c#6 $ + * $P4: //depot/projects/soc2008/rpaulo-tcpad/main.c#7 $ */ #include @@ -38,6 +38,7 @@ #include "device.h" #include "linkhdr.h" #include "handler.h" +#include "timer.h" static void usage(void) @@ -111,7 +112,9 @@ if (linkhlen == -1) errx(1, "interface type not recognized"); - LIST_INIT(&chead); + LIST_INIT(&tcpchead); + + timer_setup(); pcap_loop(p, -1, tcpad_pcaphandler, (unsigned char *)&linkhlen); From owner-p4-projects@FreeBSD.ORG Thu Jun 19 23:59:33 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 97C471065672; Thu, 19 Jun 2008 23:59:33 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 59C221065678 for ; Thu, 19 Jun 2008 23:59:33 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 401AE8FC15 for ; Thu, 19 Jun 2008 23:59:33 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5JNxWvT091825 for ; Thu, 19 Jun 2008 23:59:32 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5JNxWd9091823 for perforce@freebsd.org; Thu, 19 Jun 2008 23:59:32 GMT (envelope-from rpaulo@FreeBSD.org) Date: Thu, 19 Jun 2008 23:59:32 GMT Message-Id: <200806192359.m5JNxWd9091823@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo To: Perforce Change Reviews Cc: Subject: PERFORCE change 143797 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Jun 2008 23:59:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=143797 Change 143797 by rpaulo@rpaulo_epsilon on 2008/06/19 23:59:29 Fix the CLOSING case. Affected files ... .. //depot/projects/soc2008/rpaulo-tcpad/handler.c#11 edit Differences ... ==== //depot/projects/soc2008/rpaulo-tcpad/handler.c#11 (text+ko) ==== @@ -23,7 +23,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/soc2008/rpaulo-tcpad/handler.c#10 $ + * $P4: //depot/projects/soc2008/rpaulo-tcpad/handler.c#11 $ */ #include @@ -142,14 +142,15 @@ } if (cp->t_state == TCPS_ESTABLISHED && rcp->t_state == TCPS_FIN_WAIT_1) { - printf("first ack\n"); + DPRINTF("first ack\n"); cp->t_state = TCPS_CLOSE_WAIT; rcp->t_state = TCPS_FIN_WAIT_2; } if (cp->t_state == TCPS_LAST_ACK || cp->t_state == TCPS_CLOSING) { cp->t_state = TCPS_TIME_WAIT; - printf("connection down\n"); + DPRINTF("connection down\n"); + dumper_error(p, "a.cap", cp->pktshead); } } else if ((tcp->th_flags & TH_FLAGS) == (TH_FIN|TH_ACK)) { if (cp == NULL || rcp == NULL) @@ -163,11 +164,12 @@ } if (cp->t_state == TCPS_CLOSE_WAIT && rcp->t_state == TCPS_FIN_WAIT_2) { - printf("last_ack\n"); + DPRINTF("last_ack\n"); cp->t_state = TCPS_TIME_WAIT; rcp->t_state = TCPS_LAST_ACK; } - if (cp->t_state == TCPS_FIN_WAIT_1) { + if (rcp->t_state == TCPS_FIN_WAIT_1) { + DPRINTF("closing\n"); cp->t_state = TCPS_CLOSING; } } else if ((tcp->th_flags & TH_FLAGS) == (TH_RST|TH_ACK)) { From owner-p4-projects@FreeBSD.ORG Fri Jun 20 00:55:30 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 145FA1065672; Fri, 20 Jun 2008 00:55:30 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CA12E106566C for ; Fri, 20 Jun 2008 00:55:29 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B0AAD8FC0A for ; Fri, 20 Jun 2008 00:55:29 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5K0tTpJ007120 for ; Fri, 20 Jun 2008 00:55:29 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5K0tT7u007118 for perforce@freebsd.org; Fri, 20 Jun 2008 00:55:29 GMT (envelope-from rpaulo@FreeBSD.org) Date: Fri, 20 Jun 2008 00:55:29 GMT Message-Id: <200806200055.m5K0tT7u007118@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo To: Perforce Change Reviews Cc: Subject: PERFORCE change 143801 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Jun 2008 00:55:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=143801 Change 143801 by rpaulo@rpaulo_epsilon on 2008/06/20 00:55:06 Lower timer for debugging purposes. Add helper module. Move find_conn() to helper module. Implement dumper_free(). Add forward pointer to the other side of the connection. Implement resource dealocation when timer expires. Affected files ... .. //depot/projects/soc2008/rpaulo-tcpad/Makefile#8 edit .. //depot/projects/soc2008/rpaulo-tcpad/dumper.c#6 edit .. //depot/projects/soc2008/rpaulo-tcpad/dumper.h#4 edit .. //depot/projects/soc2008/rpaulo-tcpad/handler.c#12 edit .. //depot/projects/soc2008/rpaulo-tcpad/helper.c#1 add .. //depot/projects/soc2008/rpaulo-tcpad/helper.h#1 add .. //depot/projects/soc2008/rpaulo-tcpad/tcpad.h#8 edit .. //depot/projects/soc2008/rpaulo-tcpad/timer.c#2 edit Differences ... ==== //depot/projects/soc2008/rpaulo-tcpad/Makefile#8 (text+ko) ==== @@ -1,7 +1,7 @@ -# $P4: //depot/projects/soc2008/rpaulo-tcpad/Makefile#7 $ +# $P4: //depot/projects/soc2008/rpaulo-tcpad/Makefile#8 $ PROG=tcpad -SRCS=main.c device.c linkhdr.c handler.c dumper.c timer.c +SRCS=main.c device.c linkhdr.c handler.c helper.c dumper.c timer.c CFLAGS+=-DDEBUG -ggdb WARNS=5 LDADD=-lpcap ==== //depot/projects/soc2008/rpaulo-tcpad/dumper.c#6 (text+ko) ==== @@ -23,14 +23,17 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/soc2008/rpaulo-tcpad/dumper.c#5 $ + * $P4: //depot/projects/soc2008/rpaulo-tcpad/dumper.c#6 $ */ +#include +#include #include #include #include #include +#include "debug.h" #include "dumper.h" /** @@ -71,3 +74,23 @@ pcap_dump((u_char *)pd, &dp->pheader, dp->headers); pcap_dump_close(pd); } + +/** + * Free a list of packets and the head. + */ +void +dumper_free(struct dumppkth *head) +{ + struct dumppkt *p1, *p2; + + assert(head != NULL); + + DPRINTF("freeing dumppkth struct @ %p\n", head); + p1 = TAILQ_FIRST(head); + while (p1 != NULL) { + p2 = TAILQ_NEXT(p1, entries); + free(p1); + p1 = p2; + } + free(head); +} ==== //depot/projects/soc2008/rpaulo-tcpad/dumper.h#4 (text+ko) ==== @@ -23,7 +23,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/soc2008/rpaulo-tcpad/dumper.h#3 $ + * $P4: //depot/projects/soc2008/rpaulo-tcpad/dumper.h#4 $ */ #ifndef _DUMPER_H_ @@ -41,7 +41,8 @@ void dumper_addpkt(struct dumppkth *head, const struct pcap_pkthdr *ph, const unsigned char *headers); -void dumper_error(pcap_t *p, const char *path, struct dumppkth *head); +void dumper_error(pcap_t *, const char *path, struct dumppkth *head); +void dumper_free(struct dumppkth *head); #endif /* _DUMPER_H_ */ ==== //depot/projects/soc2008/rpaulo-tcpad/handler.c#12 (text+ko) ==== @@ -23,7 +23,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/soc2008/rpaulo-tcpad/handler.c#11 $ + * $P4: //depot/projects/soc2008/rpaulo-tcpad/handler.c#12 $ */ #include @@ -43,12 +43,11 @@ #include "linkhdr.h" #include "handler.h" #include "dumper.h" +#include "helper.h" #include "tcpad.h" #include "debug.h" -static struct tcpc *find_conn(struct in_addr ipsrc, struct in_addr ipdst, - unsigned short sport, unsigned short dport); static void print_packet(const unsigned char *bytes, const int linkhlen); void @@ -148,9 +147,10 @@ } if (cp->t_state == TCPS_LAST_ACK || cp->t_state == TCPS_CLOSING) { + cp->rcp = rcp; + rcp->rcp = cp; cp->t_state = TCPS_TIME_WAIT; DPRINTF("connection down\n"); - dumper_error(p, "a.cap", cp->pktshead); } } else if ((tcp->th_flags & TH_FLAGS) == (TH_FIN|TH_ACK)) { if (cp == NULL || rcp == NULL) @@ -184,22 +184,6 @@ } } -static struct tcpc * -find_conn(struct in_addr ipsrc, struct in_addr ipdst, unsigned short - sport, unsigned short dport) -{ - struct tcpc *cp; - - LIST_FOREACH(cp, &tcpchead, entries) { - if (memcmp(&cp->sv4addr, &ipsrc, sizeof(struct in_addr)) == 0 && - memcmp(&cp->dv4addr, &ipdst, sizeof(struct in_addr)) == 0 && - cp->sport == sport && cp->dport == dport) { - return (cp); - } - } - return (NULL); -} - static void print_packet(const unsigned char *bytes, const int linkhlen) { ==== //depot/projects/soc2008/rpaulo-tcpad/tcpad.h#8 (text+ko) ==== @@ -23,7 +23,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/soc2008/rpaulo-tcpad/tcpad.h#7 $ + * $P4: //depot/projects/soc2008/rpaulo-tcpad/tcpad.h#8 $ */ #ifndef _TCPAD_H_ @@ -42,6 +42,7 @@ int t_state; /* TCP FSM state */ int isv6; struct dumppkth *pktshead; + struct tcpc *rcp; }; LIST_HEAD(tcpchead, tcpc) tcpchead; ==== //depot/projects/soc2008/rpaulo-tcpad/timer.c#2 (text+ko) ==== @@ -23,10 +23,11 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/soc2008/rpaulo-tcpad/timer.c#1 $ + * $P4: //depot/projects/soc2008/rpaulo-tcpad/timer.c#2 $ */ #include +#include #include #include #include @@ -36,9 +37,15 @@ #include "debug.h" #include "tcpad.h" #include "timer.h" +#include "helper.h" +#include "dumper.h" static void timer_sigalrm(int sig); +/** + * @brief + * Timer setup. + */ int timer_setup(void) { @@ -51,23 +58,32 @@ firstime = 0; } - itp.it_interval.tv_sec = 30; + itp.it_interval.tv_sec = 1; itp.it_interval.tv_usec = 0; - itp.it_value.tv_sec = 30; + itp.it_value.tv_sec = 1; itp.it_value.tv_usec = 0; - printf("%d\n", setitimer(ITIMER_REAL, &itp, NULL)); - return 0; + return (setitimer(ITIMER_REAL, &itp, NULL)); } +/** + * @brief + * Signal catching function. + */ static void timer_sigalrm(int __unused sig) { - struct tcpc *cp; + struct tcpc *cp, *cp_t; - LIST_FOREACH(cp, &tcpchead, entries) { + LIST_FOREACH_SAFE(cp, &tcpchead, entries, cp_t) { if (cp->t_state == TCPS_TIME_WAIT) { DPRINTF("freeing tcp connection @ %p\n", cp); + LIST_REMOVE(cp, entries); + if (cp->pktshead) + dumper_free(cp->pktshead); + cp->pktshead = NULL; + cp->rcp->pktshead = NULL; + free(cp); } } From owner-p4-projects@FreeBSD.ORG Fri Jun 20 08:54:37 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3FBD81065686; Fri, 20 Jun 2008 08:54:37 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 01D281065680 for ; Fri, 20 Jun 2008 08:54:37 +0000 (UTC) (envelope-from snb@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E253A8FC18 for ; Fri, 20 Jun 2008 08:54:36 +0000 (UTC) (envelope-from snb@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5K8saOI073996 for ; Fri, 20 Jun 2008 08:54:36 GMT (envelope-from snb@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5K8saxf073994 for perforce@freebsd.org; Fri, 20 Jun 2008 08:54:36 GMT (envelope-from snb@FreeBSD.org) Date: Fri, 20 Jun 2008 08:54:36 GMT Message-Id: <200806200854.m5K8saxf073994@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to snb@FreeBSD.org using -f From: Nick Barkas To: Perforce Change Reviews Cc: Subject: PERFORCE change 143807 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Jun 2008 08:54:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=143807 Change 143807 by snb@snb_toro on 2008/06/20 08:54:17 First cut at deleting a single dirhash whenever a vm_lowmem event occurs. Untested. Affected files ... .. //depot/projects/soc2008/snb-dirhash/sys-ufs-ufs/ufs_dirhash.c#3 edit Differences ... ==== //depot/projects/soc2008/snb-dirhash/sys-ufs-ufs/ufs_dirhash.c#3 (text+ko) ==== @@ -89,7 +89,9 @@ static int ufsdirhash_findslot(struct dirhash *dh, char *name, int namelen, doff_t offset); static doff_t ufsdirhash_getprev(struct direct *dp, doff_t offset); +static int ufsdirhash_destroy(void); static int ufsdirhash_recycle(int wanted); +static void ufsdirhash_lowmem(void); static void ufsdirhash_free_locked(struct inode *ip); static uma_zone_t ufsdirhash_zone; @@ -1076,6 +1078,62 @@ } /* + * Delete the first dirhash on the list and reclaim its memory. + * Assumes that ufsdirhash_list is locked, and leaves it locked. + * If unable to obtain a lock on the first dirhash, moves down + * the list until it can lock a dirhash and destroys it. Returns + * -1 if unable to find any dirhashes that can be destroyed. + */ +static int +ufsdirhash_destroy() +{ + struct dirhash *dh; + doff_t **hash; + u_int8_t *blkfree; + int i, mem, narrays; + + dh = TAILQ_FIRST(&ufsdirhash_list); + if (dh == NULL) + return (-1); + + /* + * If we can't lock it it's in use and we don't want to + * destroy it anyway. Go on to the next in the list. + */ + while (lockmgr(&dh->dh_lock, LK_EXCLUSIVE | LK_NOWAIT, NULL)) { + dh = TAILQ_NEXT(dh, dh_list); + if (dh == NULL) + return (-1); + } + KASSERT(dh->dh_hash != NULL, ("dirhash: NULL hash on list")); + + /* Remove it from the list and detach its memory. */ + TAILQ_REMOVE(&ufsdirhash_list, dh, dh_list); + dh->dh_onlist = 0; + hash = dh->dh_hash; + dh->dh_hash = NULL; + blkfree = dh->dh_blkfree; + dh->dh_blkfree = NULL; + narrays = dh->dh_narrays; + mem = dh->dh_memreq; + dh->dh_memreq = 0; + + /* Unlock everything, free the detached memory. */ + ufsdirhash_release(dh); + DIRHASHLIST_UNLOCK(); + for (i = 0; i < narrays; i++) + DIRHASH_BLKFREE(hash[i]); + FREE(hash, M_DIRHASH); + FREE(blkfree, M_DIRHASH); + + /* Account for the returned memory. */ + DIRHASHLIST_LOCK(); + ufs_dirhashmem -= mem; + + return (0); +} + +/* * Try to free up `wanted' bytes by stealing memory from existing * dirhashes. Returns zero with list locked if successful. */ @@ -1083,9 +1141,6 @@ ufsdirhash_recycle(int wanted) { struct dirhash *dh; - doff_t **hash; - u_int8_t *blkfree; - int i, mem, narrays; DIRHASHLIST_LOCK(); dh = TAILQ_FIRST(&ufsdirhash_list); @@ -1095,38 +1150,12 @@ DIRHASHLIST_UNLOCK(); return (-1); } - /* - * If we can't lock it it's in use and we don't want to - * recycle it anyway. - */ - if (lockmgr(&dh->dh_lock, LK_EXCLUSIVE | LK_NOWAIT, NULL)) { - dh = TAILQ_NEXT(dh, dh_list); - continue; - } - KASSERT(dh->dh_hash != NULL, ("dirhash: NULL hash on list")); - /* Remove it from the list and detach its memory. */ - TAILQ_REMOVE(&ufsdirhash_list, dh, dh_list); - dh->dh_onlist = 0; - hash = dh->dh_hash; - dh->dh_hash = NULL; - blkfree = dh->dh_blkfree; - dh->dh_blkfree = NULL; - narrays = dh->dh_narrays; - mem = dh->dh_memreq; - dh->dh_memreq = 0; + /* Try deleting a dirhash. Give up if we can't delete any. */ + if (ufsdirhash_destroy() < 0) + return (-1); - /* Unlock everything, free the detached memory. */ - ufsdirhash_release(dh); - DIRHASHLIST_UNLOCK(); - for (i = 0; i < narrays; i++) - DIRHASH_BLKFREE(hash[i]); - FREE(hash, M_DIRHASH); - FREE(blkfree, M_DIRHASH); - - /* Account for the returned memory, and repeat if necessary. */ - DIRHASHLIST_LOCK(); - ufs_dirhashmem -= mem; + /* Repeat if necessary. */ dh = TAILQ_FIRST(&ufsdirhash_list); } /* Success; return with list locked. */ @@ -1139,7 +1168,16 @@ static void ufsdirhash_lowmem() { - + /* XXX: temporary silly way of notifying when this is called */ + printf("dirhash: ufsdirhash_lowmem() called\n"); + + DIRHASHLIST_LOCK(); + /* + * Try deleting only one dirhash for now, and don't bother + * to check if it worked. + */ + ufsdirhash_destroy(); + DIRHASHLIST_UNLOCK(); } From owner-p4-projects@FreeBSD.ORG Fri Jun 20 10:28:12 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 21C581065678; Fri, 20 Jun 2008 10:28:12 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D7AFB1065675 for ; Fri, 20 Jun 2008 10:28:11 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id AC1208FC12 for ; Fri, 20 Jun 2008 10:28:11 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5KASBt7084164 for ; Fri, 20 Jun 2008 10:28:11 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5KASB4D084162 for perforce@freebsd.org; Fri, 20 Jun 2008 10:28:11 GMT (envelope-from pgj@FreeBSD.org) Date: Fri, 20 Jun 2008 10:28:11 GMT Message-Id: <200806201028.m5KASB4D084162@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 143813 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Jun 2008 10:28:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=143813 Change 143813 by pgj@disznohal on 2008/06/20 10:28:09 Add Bibliography to be translated. Other translation projects usually do not include this file, but I think it is not a great problem, because it is not updated so quickly. Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/bibliography.sgml#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Fri Jun 20 11:28:16 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 364A41065672; Fri, 20 Jun 2008 11:28:16 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D255A1065678 for ; Fri, 20 Jun 2008 11:28:15 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C03328FC30 for ; Fri, 20 Jun 2008 11:28:15 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5KBSF6H090372 for ; Fri, 20 Jun 2008 11:28:15 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5KBSBDe090366 for perforce@freebsd.org; Fri, 20 Jun 2008 11:28:11 GMT (envelope-from pgj@FreeBSD.org) Date: Fri, 20 Jun 2008 11:28:11 GMT Message-Id: <200806201128.m5KBSBDe090366@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 143814 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Jun 2008 11:28:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=143814 Change 143814 by pgj@disznohal on 2008/06/20 11:27:37 Here comes the initial import of my FAQ translation. It will not be merged to CVS at once, because I have to finish the renovation of the original documentation, and I want to merge its changes in this depot. Of course, fixes and comments are always welcome :) Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/faq/book.sgml#2 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/bibliography.sgml#2 edit Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/faq/book.sgml#2 (text+ko) ==== @@ -1,14 +1,19 @@ + + %books.ent; - + ]> - + - Frequently Asked Questions for FreeBSD 5.X and 6.X + Gyakran Ismételt Kérdések a &os; 5.X + és 6.X változatairól - The FreeBSD Documentation Project + A &os; Dokumentációs Projekt $FreeBSD: doc/en_US.ISO8859-1/books/faq/book.sgml,v 1.838 2008/05/31 09:35:18 pgj Exp $ @@ -27,7 +32,7 @@ 2006 2007 2008 - The FreeBSD Documentation Project + A &os; Dokumentációs Projekt &bookinfo.legalnotice; @@ -57,1056 +62,1366 @@ - This is the FAQ for FreeBSD versions 5.X and 6.X. - All entries are assumed to be relevant to FreeBSD 5.X and - later, unless otherwise noted. If you are interested in - helping with this project, send email to the &a.doc;. The - latest version of this document is always available from the - FreeBSD - World Wide Web server. It may also be downloaded as - one large HTML file with HTTP - or as plain text, &postscript;, PDF, etc. from the FreeBSD FTP - server. You may also want to Search the - FAQ. + Ezek a gyakran ismételt kérdések a &os; + 5.X és 6.X változataira vonatkoznak. Az összes + bejegyzés a &os; 5.X vagy annál újabb + változataira vonatkozik, hacsak azt külön nem + jelezzük. Ha szeretnénk segíteni a + projektnek, akkor küldjünk egy levelet a &a.doc; + címére! Ennek a dokumentumnak a legfrissebb + változata mindig elérhetõ a &os; + World Wide Web szerverérõl. HTTP-n + keresztül letölthetõ egyetlen nagy HTML állományként, + vagy a &os; + FTP szerverérõl szöveges, &postscript; + PDF stb. formátumban. Továbbá keresni is tudunk a + GYIK-ban. + + Fordította és a + fordítást karbantartja: &a.hu.pgj; - - Introduction + + Bevezetés - Welcome to the FreeBSD 5.X-6.X FAQ! + Üdvözöljük a &os; 5.X-6.X Gyakran + Ismételt Kérdéseiben! - As is usual with Usenet FAQs, this document aims to cover the - most frequently asked questions concerning the FreeBSD operating - system (and of course answer them!). Although originally intended - to reduce bandwidth and avoid the same old questions being asked - over and over again, FAQs have become recognized as valuable - information resources. + Hasonlóan a Usenetes GYIK-okhoz, ennek a dokumentumnak + is az a célja, hogy a &os; operációs + rendszerrel kapcsolatban feltegye a legyakrabban ismételt + kérdéseket (és persze megválaszolja + ezeket!). Habár eredetileg azért + íródott, hogy megspórolja a feleslegesen + elvesztegetett sávszélességet és hogy + megelõzze a régóta ismert + kérdések újbóli + feltételét, a GYIK idõközben egy + értékes + információforrássá is + vált. - Every effort has been made to make this FAQ as informative as - possible; if you have any suggestions as to how it may be improved, - please feel free to mail them to the &a.doc;. + Igyekeztünk minden megtenni annak + érdekében, hogy a GYIK a lehetõ legtöbb + információt szolgáltassa. Ha + szeretnénk javaslatokat tenni a + továbbfejlesztésére, írjunk + bátran a &a.doc; címére! - - What is FreeBSD? - + + Mi az a &os;? + - - Briefly, FreeBSD is a &unix; like operating system for - AMD64 and &intel; EM64T, &i386; PC-98, IA-64, &arm;, &powerpc; - and &ultrasparc; platforms - based on U.C. Berkeley's 4.4BSD-Lite - release, with some 4.4BSD-Lite2 - enhancements. It is also based indirectly on William - Jolitz's port of U.C. Berkeley's Net/2 to - the &i386;, known as 386BSD, though very - little of the 386BSD code remains. A fuller description of - what FreeBSD is and how it can work for you may be found on - the FreeBSD home - page. + + Ha tömören akarjuk összefoglalni, akkor a + &os; egy AMD64, &intel; EM64T, &i386;, PC-98, IA-64, &arm;, + &powerpc; és &ultrasparc; platformokra fejlesztett + &unix;-szerû operációs rendszer, amely a + Kaliforniai Egyetem (Berkeley) rendszerének + 4.4BSD-Lite kiadására + épül, valamint a 4.4BSD-Lite2 + kiadásból tartalmaz még + néhány továbbfejlesztést. + Továbbá közvetett módon még + felhasználja a Berkeley Net/2 + kiadásának &i386; architektúrára + készített portját, a + 386BSD forrásait is, amit annak + idején William Jolitz készített, noha + ebbõl ténylegesen már csak nagyon + kevés található a rendszerben. A &os; + részletesebb bemutatása és annak + tulajdonságai a &os; honlapján + találhatóak. - FreeBSD is used by companies, Internet Service Providers, - researchers, computer professionals, students and home users - all over the world in their work, education and recreation. + A &os;-t munkához, oktatáshoz és + szórakozáshoz rengeteg cég, + internetszolgáltató, kutató, + informatikus, diák és otthoni + felhasználó használja a világ + minden táján. - For more detailed information on FreeBSD, please see the - FreeBSD - Handbook. - + A &os; bõvebb bemutatásához olvassuk + el a &os; + kézikönyvet. + - - What is the goal of the FreeBSD Project? - + + Mi a &os; Projekt célja? + - - The goal of the FreeBSD Project is to provide software - that may be used for any purpose and without strings attached. - Many of us have a significant investment in the code (and - project) and would certainly not mind a little financial - compensation now and then, but we definitely do not - insist on it. We believe that our first and foremost - mission is to provide code to any and all - comers, and for whatever purpose, so that the code gets the - widest possible use and provides the widest possible benefit. - This is, we believe, one of the most fundamental goals of Free - Software and one that we enthusiastically support. + + A &os; Projektnek az a célja, hogy olyan + szoftvereket állítson elõ, amelyek + tetszõlegesen felhasználhatóak, + mindenféle kötöttségek + nélkül. A fejlesztõk közül sokan + nagyon sok idõt és munkát fektetnek a + forráskódba (és így a + Projektbe), ami nyilván megérdemelne + némi anyagi ellensúlyozást olykor, de + egyáltalán nem ragaszkodunk hozzá. + Úgy érezzük, mindenek elõtt az a + küldetésünk, hogy + feltétel nélkül segítsünk + mindenkit a munkánkkal, függetlenül annak + szándékaitól, így a + munkánk a lehetõ legnagyobb körben + kerül felhasználására és + így nyújtja a lehetõ legtöbb + hasznot. Véleményünk szerint ez az egyik + legalapvetõbb célja a szabad szoftvereknek + és ezt a hozzáállást + támogatjuk a leginkább. - That code in our source tree which falls under the - GNU - General Public License (GPL) or GNU - Library General Public License (LGPL) comes with - slightly more strings attached, though at least on the - side of enforced access rather than the usual opposite. - Due to the additional complexities that can evolve in the - commercial use of GPL software, we do, however, endeavor - to replace such software with submissions under the more - relaxed - FreeBSD license whenever possible. - + A forrásaink között + található, GNU General + Public License (GPL) vagy a GNU + Library General Public License (LGPL) + licencelésû munkák azonban már + valamivel több kötöttséggel + járnak, habár ezek inkább a + közzétételükre vonatkoznak, nem + pedig annak ellenkezõjére, ahogy azt + általában megszokhattuk. A GPL licencû + szoftverek kereskedelmi célú + felhasználásának további + esetleges nehézségei miatt azonban + lehetõségeink szerint igyekszünk ezeket + olyan szoftverekkel felváltani, amelyek a tõle + enyhébb + FreeBSD licencet alkalmazzák. + - - Does the FreeBSD license have any restrictions? - + + A &os; licenc tartalmaz valamilyen + megszorítást? + - - Yes. Those restrictions do not control how you use - the code, merely how you treat the FreeBSD Project itself. - If you have serious license concerns, read the actual - - license. For the simply curious, the license can - be summarized like this. + + Igen. Ezek a megszorítások azonban nem az + adott munka felhasználását + szabályozzák, hanem csupán azt, hogy + miként viszonyuljunk a &os; Projekthez. Ha komoly + kétségeink lennének a + licenceléssel kapcsolatban, olvassuk a jelenleg + érvényes + licencet (angolul). Az egyszerû + kíváncsiskodók kedvéért + nagyjából így tudnánk + összefoglalni a licencet: - - - Do not claim that you wrote this. - + + + Ne állítsuk, hogy mi + készítettük. + - - Do not sue us if it breaks. - - - + + Ne pereljük a Projektet, ha nem + mûködik. + + + - - Can FreeBSD replace my current operating system? - + + A &os; képes kiváltani a jelenleg + használt operációs rendszeremet? + - - For most people, yes. But this question is not quite - that cut-and-dried. + + A legtöbb ember számára igen. A + kérdés megválaszolása azonban + természetesen nem ennyire + egyértelmû. - Most people do not actually use an operating system. - They use applications. The applications are what really - use the operating system. FreeBSD is designed to provide - a robust and full-featured environment for applications. - It supports a wide variety of web browsers, office suites, - email readers, graphics programs, programming - environments, network servers, and just about everything - else you might want. Most of these applications can be - managed through the Ports - Collection. + Sokan nem is magát az operációs + rendszert, hanem inkább az alkalmazásokat + használják. Valójában pedig + maguk az alkalmazások azok, amelyek az + operációs rendszert használják. + A &os;-t úgy alakították ki, hogy az + alkalmazások számára egy szilárd + és mindentudó környezetet + nyújtson. Támogatja a + böngészõk, irodai programcsomagok, + levelezõ programok, grafikus programok, + programozási környezetek, hálózati + szerverek széles választékát, + és szinte minden mást, amire csak + szükségünk lehet. Az ilyen + alkalmazások legnagyobb része + elérhetõ a Portgyûjteményen + keresztül. - If you need to use an application that is only - available on one operating system, you simply cannot - replace that operating system. Chances are there is a very - similar application on FreeBSD, however. If you want a - solid office or Internet server, a reliable workstation, - or just the ability to do your job without interruptions, - FreeBSD will almost certainly do everything you need. - Many computer users across the world, including both - novices and experienced &unix; administrators, use FreeBSD - as their only desktop operating system. + Ha viszont olyan alkalmazást + kívánunk használni, amely csak bizonyos + operációs rendszereken érhetõ el, + nem tudjuk magát az operációs rendszert + egyszerûen lecserélni alatta. Bizonyos + esetekben azonban elõfordulhat, hogy &os; alatt is + találunk hozzá hasonló + alkalmazásokat. Amikor egy stabil irodai vagy + internet szerverre van szükségünk, esetleg + egy megbízható munkaállomásra, + vagy egyszerûen csak megszakítások + nélkül szeretnénk végezni a + munkánkat, a &os;-ben igényeinkhez + mérten szinte minden megtalálhatunk. A + világon rengeteg felhasználó, + beleértve a kezdõket és a tapasztalt + &unix; rendszergazdákat egyaránt, asztali + operációs rendszerként is a &os;-t + használja. - If you are migrating to FreeBSD from some other &unix; - environment, you already know most of what you need to. - If your background is in graphic-driven operating systems - such as &windows; and older versions of &macos;, expect to - invest additional time learning the &unix; way of doing - things. This FAQ and the FreeBSD Handbook are - excellent places to start. - + Ha egy másik &unix; környezetrõl + akarunk &os;-re váltani, akkor a legtöbb dolog + már ismerõs lehet számunkra. Amennyiben + viszont valamilyen grafikus operációs + rendszerrõl, például &windows;-ról + vagy a &macos; valamelyik régebbi + változatáról szándékozunk + átállni, minden bizonnyal idõt kell majd + szánnunk a feladatok &unix; stílusú + megvalósításának + megismerésére. Ez a GYIK és a &os; + kézikönyv ehhez tökéletes + kiindulási alapot biztosít. + - - Why is it called FreeBSD? - + + Miért hívják &os;-nek? + - - - - It may be used free of charge, even by commercial - users. - + + + + Szabadon (mint free) + elhasználható, akár kereskedelmi + célokra is. + - - Full source for the operating system is freely - available, and the minimum possible restrictions have - been placed upon its use, distribution and incorporation - into other work (commercial or non-commercial). - + + Az operációs rendszer teljes + forráskódja bárki által + szabadon elérhetõ, minimális + megkötésekkel arra vonatkozóan, hogy + miként használható és + más (kereskedelmi vagy nem kereskedelmi) + munkák részeként miként + építhetõ be, + terjeszthetõ. + - - Anyone who has an improvement or bug fix is free - to submit their code and have it added to the source tree - (subject to one or two obvious provisions). - - + + Bárki, akinek fejlesztési vagy + hibajavítási javaslata van a rendszerrel + kapcsolatban, szabadon benyújthatja azt, amely + aztán bekerül a források + közé (egy-két + nyilvánvaló ellenõrzést + követõen). + + - It is worth pointing out that the word - free is being used in two ways here, one meaning - at no cost, the other meaning you can do - whatever you like. Apart from one or two things you - cannot do with the FreeBSD code, for - example pretending you wrote it, you can really do whatever you - like with it. - + Érdemes valamint rámutatni, hogy a + szabad szót az imént két + értelemben is használtuk: az egyik + jelentése szerint költségek + nélkül, míg a másik + jelentése szerint tetszés + szerint. Egy-két + tiltott dologtól, + például azt állítjuk, hogy mi + írtuk, eltekintve tényleg bármit + csinálhatunk vele. + - What are the differences between FreeBSD and NetBSD, OpenBSD, - and other open source BSD operating systems? + Mi a különbség a FreeBSD, a NetBSD, + OpenBSD és a többi nyílt + forráskódú BSD operációs + rendszerek között? - James Howard wrote a good explanation of the history - and differences between the various projects for DaemonNews, - called James Howard a DaemonNews + oldalán The - BSD Family Tree which goes a fair way to answering - this question. + BSD Family Tree címmel (angolul) + készített alapos leírást a + különbözõ projektek közti + eltérések bemutatására. - - What is the latest version of FreeBSD? - + + Melyik a &os; legújabb változata? + - + + Jelen pillanatban a &os; fejlesztése két + párhuzamos ágon folyik, és mind a + kettõbõl készülnek kiadások. A + 5.X sorozat kiadásai a 5-STABLE + ágból, míg a 6.X sorozat + kiadásai a 6-STABLE + ágból készülnek. - - At this point in FreeBSD's development, there are two - parallel development branches; releases are being made from - both branches. The 5.X series of releases - is being made from the 5-STABLE branch - and the 6.X series of releases from 6-STABLE. + Az 5.3-as kiadás megjelenéséig a + 4.X sorozat volt a -STABLE. Az 5.3 + kiadás megjelenésével azonban a 4.X + ág meghosszabbított + támogatást kapott, és + már csak a nagyobb hibákat, + például a biztonsági hibákat + javítják benne. Az + 5-STABLE ágból még + várhatóak további kiadások is, + azonban ezt jelenleg már + örökségi ágnak + tekintjük, és a legtöbb munka már a + 6-STABLE részeként + jelenik meg. - Up until the release of 5.3, the 4.X series was the - one known as -STABLE. However, - as of 5.3, the 4.X branch will be designated for - an extended support status and receive - only fixes for major problems, such as security-related - fixes. There will be more releases made from the - 5-STABLE branch, but it is considered - a legacy branch and most current work will - only become a part of 6-STABLE. + A &rel.current; + változat a 6-STABLE ág + legfrissebb kiadása, amely &rel.current.date;ban + jelent meg. Az 5-STABLE + ágból a &rel2.current; + a legfrissebb kiadás, amely &rel2.current.date;ban + jelent meg. - Version &rel.current; - is the latest release from the - 6-STABLE branch; it was released in - &rel.current.date;. Version &rel2.current; - is the latest release from the - 5-STABLE branch; it was released in - &rel2.current.date;. + Ha röviden össze akarjuk foglalni, akkor a + -STABLE változatokat + elsõsorban az internet-szolgáltatók, + vállalkozások számára + ajánljuk, illetve minden olyan + felhasználó számára, aki a + legújabb (és minden bizonnyal még + instabil) -CURRENT + pillanatkiadásokhoz viszonyítottan a + legkevesebb változtatással + kívánnak egy megbízható, stabil + verziót használni a rendszerbõl. Ugyan + bármelyik ágból + készülhetnek, azonban a + -CURRENT esetében + meglehetõsen sok változásra kell + felkészülnünk (a + -STABLE ághoz képest) az + egyes kiadások között. - Briefly, -STABLE is aimed at the - ISP, corporate user, or any user who wants stability and a - minimal number of changes compared to the new (and - possibly unstable) features of the latest - -CURRENT snapshot. Releases can come - from either branch, but -CURRENT - should only be used if you are prepared for its increased - volatility (relative to -STABLE, that - is). + A kiadások néhány havonta + készülnek. Mivel a legtöbben ennél + pontosabban követik a &os; forrásait + (lásd a &os.current; + és &os.stable; + változatokra vonatkozó + kérdéseket), ennél valamire többre + van szükségünk, hiszen a források + folyamatosan változnak. - Releases are made every - few months. While many people stay more up-to-date with - the FreeBSD sources (see the questions on &os.current; and &os.stable;) than that, doing so - is more of a commitment, as the sources are a moving - target. - - More information on FreeBSD releases can be found on - the Release - Engineering page on the FreeBSD Web site. - + A &os; egyes kiadásairól a Kiadások + megjelentetését összefoglaló + oldalon tájékozódhatunk a &os; + honlapján. + - - What is FreeBSD-CURRENT? - + + Mi az a &os;-CURRENT? + - - &os.current; - is the development version of the operating system, which - will in due course become the new &os.stable; branch. - As such, it is - really only of interest to developers working on the - system and die-hard hobbyists. See the relevant - section in the handbook for details - on running -CURRENT. + + A &os.current; + az operációs rendszer aktív + fejlesztés alatt álló változata, + amely idõvel az új &os.stable; + ággá válik. Ez a változat + tulajdonképpen csak a rendszeren dolgozó + fejlesztõk és a megátalkodott + hobbifelhasználók számára + érdekes. A kézikönyv + erre + vonatkozó szakaszában olvashatunk + részletesebben a -CURRENT + használatáról. - If you are not familiar with the operating system or are - not capable of identifying the difference between a real - problem and a temporary problem, you should not use - &os.current;. This branch sometimes evolves quite quickly - and can be un-buildable for a number of days at a time. - People that use &os.current; are expected to be able to - analyze any problems and only report them if they are deemed - to be mistakes rather than glitches. Questions - such as make world produces some error about - groups on the -CURRENT mailing list may be - treated with contempt. + Ha nem mozgunk otthonosan az operációs + rendszerek világában, vagy nem ha nem tudjuk + megmondani a különbséget egy valódi + és egy ideiglenes probléma között, + akkor nem javasoljuk a &os.current; + használatát. Ez a fejlesztési vonal + nagyon gyorsan fejlõdik és gyakran naponta + többször is lefordíthatatlan + állapotba kerül. A &os.current; változat + használóitól elvárjuk, hogy + képesek legyenek felmérni a felbukkanó + problémákat, és csak + közülük csak azokat jelenteni, amelyek + valóban hibákat takarnak és nem pedig + csak apró bökkenõk. + Ezért a -CURRENT levelezési listákon + A make world parancs valami csoportra + panaszkodik típusú + kérdéseket általában figyelembe + se veszik. - Every day, snapshot - releases are made based on the current state of the - -CURRENT and -STABLE branches. Distributions of the - occasional snapshot are made available. The goals - behind each snapshot release are: + A -CURRENT és -STABLE ágak aktuális + állapotáról minden nap pillanatkiadások + készülnek. Ezek a kiadások bárki + által hozzáférhetõek. + Célunk ezzel: - - - To test the latest version of the installation - software. - + + + A telepítõ legfrissebb + változatának tesztelése. + - - To give people who would like to run -CURRENT or - -STABLE but who do not have the time or bandwidth to - follow it on a day-to-day basis an easy way of - bootstrapping it onto their systems. - + + Idõt és + sávszélességet szeretnénk + megspórolni a -CURRENT vagy -STABLE + változatok azon felhasználóinak, + akik az iméntiek hiányából + fakadóan nem tudják naponta + frissíteni a rendszerüket. + - - To preserve a fixed reference point for the code in - question, just in case we break something really badly - later. (Although CVS normally prevents anything horrible - like this happening :) - + + Kiindulási pontokat + rögzítünk a kód aktuális + állapota alapján, ha késõbb + netalán valamilyen szörnyûség + történne. (Noha a CVS + általában védelmet nyújt az + ilyen rémisztõ dolgok + bekövetkezése ellen :) + - - To ensure that all new features and fixes in need - of testing have the greatest possible number of - potential testers. - - + + Az összes tesztelendõ + újítást és + javítást ezen a módon + kívánjuk a lehetõ legszélesebb + körben elérhetõvé tenni. + + - No claims are made that any -CURRENT snapshot can be - considered production quality for any purpose. - If you want to run a stable and fully tested system, you will - have to stick to full releases, or use the -STABLE - snapshots. + Egyik -CURRENT pillanatkiadás sem tekinthetõ + hétköznapi felhasználásra + alkalmasnak. Ha egy megbízható + és széles körben tesztelt rendszerre van + szükségünk, akkor vagy maradjunk a + kiadásoknál vagy használjuk a -STABLE + vonalból készült + pillanatkiadásokat. - Snapshot releases are directly available from snapshot. + A pillanatkiadások innen + érhetõek el. - Snapshots are generated, on the average, daily for - all actively developed branches. - + A pillanatkiadások általában minden + nap, minden aktívan fejlesztett ághoz + elkészülnek. + - - What is the FreeBSD-STABLE concept? - + + Mit takar a &os;-STABLE? + - - Back when FreeBSD 2.0.5 was released, FreeBSD - development branched in two. One branch was named -STABLE, - one -CURRENT. - FreeBSD-STABLE is intended for Internet Service Providers - and other commercial enterprises for whom sudden shifts or - experimental features are quite undesirable. It receives - only well-tested bug fixes and other small incremental - enhancements. FreeBSD-CURRENT, on the other hand, has - been one unbroken line since 2.0 was released, leading - towards 6.2-RELEASE and beyond. Just before 6.0-RELEASE, the - 6-STABLE branch was created, and - &os.current; became 7-CURRENT. For more detailed information, - see - FreeBSD Release Engineering: - Creating the Release Branch. + + Amikor a &os; 2.0.5 megjelent, a &os; + fejlesztése kettévált. Az egyik + ág neve -STABLE, + a másiké pedig -CURRENT + lett. A &os;-STABLE az olyan + internet-szolgáltatók és egyéb + vállalkozások számára + készült, ahol a fejlesztés alatt + álló újítások vagy a + hirtelen váltások által okozott + problémák gyakran nem engedhetõek meg. + Ide csak olyan hibajavítások és kisebb + módosítások kerülnek, amelyeket + alaposan leteszteltek. A &os;-CURRENT ezzel szemben a 2.0 + megjelenése óta egyetlen, + szakadásmentes fejlesztési vonalat + képvisel, amely a 6.2-RELEASE és az azon + túli kiadások felé halad. Pontosan a + 6.0-RELEASE kiadás megjelentetése elõtt + létrejött a 6-STABLE fejlesztési vonal, + és a &os.current; a 7-CURRENT lett. Ha errõl + többet szeretnénk megtudni, akkor ezzel + kapcsolatban a + &os; Release Engineering: Creating the Release + Branch címû cikket olvassuk el + (angolul). - The 2.2-STABLE branch was retired with the release of 2.2.8. - The 3-STABLE branch has ended with the release of 3.5.1, the - final 3.X release. The 4-STABLE branch has ended with the release - of 4.11, the final 4.X release. The only changes made to either - of these branches will be, for the most part, security-related bug - fixes. Support for the 5-STABLE branches will continue for some - time but focus primarily on security-related bug fixes and other - serious issues. + A 2.2-STABLE ág a 2.2.8 + megjelenésével nyugdíjba vonult. A + 3-STABLE ág a 3.5.1 mint az utolsó 3.X + kiadás megjelenésével ért + véget. A 4-STABLE ág a 4.11 mint az + utolsó 4.X kiadással fejezõdött be. + Ezekbe az ágakban a legtöbb esetben már + csak biztonsági javításokat + végeznek. Az 5-STABLE ág fejlesztése + egy ideig még folytatódik, de a + hangsúly ebben az esetben is már csak a + biztonsági, illetve a súlyosabb hibák + kijavításán lesz. - &rel.current;-STABLE is the actively developed -STABLE branch. - The latest release on the &rel.current;-STABLE branch is - &rel.current;-RELEASE, which was released in - &rel.current.date;. + A &rel.current;-STABLE a jelenleg fejlesztett -STABLE + ág. A &rel.current;-STABLE ágból + megjelent legfrissebb kiadás a &rel.current;-RELEASE, + amely &rel.current.date;ban jelent meg. - The 7-CURRENT branch is the actively developed - -CURRENT branch toward the next generation of &os;. - See What is &os;-CURRENT? for more - information on this branch. - + A 7-CURRENT a -CURRENT ág legfrissebb + változata, és ez a &os; következõ + generációja. Errõl az + ágról a Mi az a + &os;-CURRENT? kérdésnél + szolgálunk részletesebb + információkkal. + - - When are FreeBSD releases made? - + + Mikor készülnek &os; kiadások? + - - The &a.re; releases a new version of FreeBSD about every - four months, on average. Release dates are announced well in - advance, so that the people working on the system know - when their projects need to be finished and tested. - A testing period precedes each release, in order to ensure - that the addition of new features does not compromise the - stability of the release. - Many users regard this caution as one of the best things about - FreeBSD, even though waiting for all the latest goodies to reach - -STABLE can be a little frustrating. + + A &a.re; a &os; egy újabb + változatát átlagosan négy havonta + jelenteti meg. A kiadások dátumát + elõre kihirdetik, így a rendszeren + dolgozó emberek pontosan tudják, hogy mikorra + kell befejezniük a munkájukat és + letesztelni azt. Minden kiadást egy + tesztelési idõszak elõz meg, ahol + megbizonyosodnak róla, hogy az elkészült + újítások nem veszélyeztetik az + új kiadás + megbízhatóságát. A legtöbb + felhasználó pontosan ezt a + típusú elõvigyázatosságot + szereti legjobban a &os;-ben, még annak + árán is, hogy a legújabb + finomságok bekerülésére még + a -STABLE ág esetén gyakran sokat kell + várni. - More information on the release engineering process - (including a schedule of upcoming releases) can be found - on the release - engineering pages on the FreeBSD Web site. + A kiadások szerkesztésérõl + (valamint a soronkövetkezõ kiadások + ütemezésérõl) a &os; + honlapján belül ezen + az oldalon olvashatunk részletesebben + (angolul). >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jun 20 11:38:26 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 76230106567B; Fri, 20 Jun 2008 11:38:26 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 381461065672 for ; Fri, 20 Jun 2008 11:38:26 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2800F8FC15 for ; Fri, 20 Jun 2008 11:38:26 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5KBcPXF091294 for ; Fri, 20 Jun 2008 11:38:25 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5KBcPYO091292 for perforce@freebsd.org; Fri, 20 Jun 2008 11:38:25 GMT (envelope-from gabor@freebsd.org) Date: Fri, 20 Jun 2008 11:38:25 GMT Message-Id: <200806201138.m5KBcPYO091292@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 143815 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Jun 2008 11:38:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=143815 Change 143815 by gabor@gabor_server on 2008/06/20 11:37:51 - Fix some regressions that went through Reported by: Jaakko Heinonen Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/grep.c#26 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/grep.c#26 (text+ko) ==== @@ -192,12 +192,15 @@ /* Workaround for our libc-regex library to match GNU behaviour. Our library rejects '|' with empty subexpressions. Just cut out those parts, e.g. "(|a|b||c|)" will be "(a|b|c)" */ - while ((ptr = strstr(pat, "|)")) != NULL) - strlcpy(ptr, &(ptr[1]), strlen(pat) - strlen(ptr)); - while ((ptr = strstr(pat, "(|")) != NULL) - strlcpy(&(ptr[1]), &(ptr[2]), strlen(pat) - strlen(ptr) - 1); - while ((ptr = strstr(pat, "||")) != NULL) - strlcpy(&(ptr[1]), &(ptr[2]), strlen(pat) - strlen(ptr) - 1); + while (((ptr = strstr(pat, "|)"))) != NULL && (strstr(pat, "\\|)") != (ptr - 1))) { + strlcpy(ptr, &(ptr[1]), strlen(ptr)); + } + while (((ptr = strstr(pat, "(|")) != NULL) && (strstr(pat, "(\\|") != ptr) && (strstr(pat, "\\(|") != (ptr - 1))) { + strlcpy(&(ptr[1]), &(ptr[2]), strlen(ptr)); + } + while ((ptr = strstr(pat, "||")) != NULL) { + strlcpy(&(ptr[1]), &(ptr[2]), strlen(ptr)); + } /* Work-around to allow * at the beginning of the regexp */ while (pat[0] == '*') From owner-p4-projects@FreeBSD.ORG Fri Jun 20 11:49:38 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E7345106566C; Fri, 20 Jun 2008 11:49:37 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A9AB01065676 for ; Fri, 20 Jun 2008 11:49:37 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9A6A78FC1E for ; Fri, 20 Jun 2008 11:49:37 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5KBnbXv092147 for ; Fri, 20 Jun 2008 11:49:37 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5KBnb63092145 for perforce@freebsd.org; Fri, 20 Jun 2008 11:49:37 GMT (envelope-from gabor@freebsd.org) Date: Fri, 20 Jun 2008 11:49:37 GMT Message-Id: <200806201149.m5KBnb63092145@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 143816 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Jun 2008 11:49:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=143816 Change 143816 by gabor@gabor_server on 2008/06/20 11:48:57 - Don't grep directories as standard files when -R is given Reported by: Michael Plass Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/util.c#29 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/util.c#29 (text+ko) ==== @@ -66,7 +66,6 @@ FTS *fts; FTSENT *p; int c, fts_flags; - struct stat *finfo = 0; c = fts_flags = 0; @@ -91,19 +90,26 @@ case FTS_DP: break; default: - if (Dflag) { + if (Dflag || Rflag) { + struct stat *finfo; + if (!(finfo = malloc(sizeof(struct stat)))) err(2, NULL); if (stat(p->fts_path, finfo) == -1) err(2, NULL); - if (S_ISBLK(finfo->st_mode) || + + if (Dflag && (S_ISBLK(finfo->st_mode) || S_ISCHR(finfo->st_mode) || S_ISFIFO(finfo->st_mode) || - S_ISSOCK(finfo->st_mode)) { + S_ISSOCK(finfo->st_mode))) { free(finfo); break; - } else + } + if (Rflag && S_ISDIR(finfo->st_mode)) { free(finfo); + break; + } + free(finfo); } c += procfile(p->fts_path); break; From owner-p4-projects@FreeBSD.ORG Fri Jun 20 12:08:57 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6C2701065670; Fri, 20 Jun 2008 12:08:57 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2D4F8106564A for ; Fri, 20 Jun 2008 12:08:57 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1EB5B8FC1F for ; Fri, 20 Jun 2008 12:08:57 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5KC8u5c095235 for ; Fri, 20 Jun 2008 12:08:56 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5KC8ueq095233 for perforce@freebsd.org; Fri, 20 Jun 2008 12:08:56 GMT (envelope-from gabor@freebsd.org) Date: Fri, 20 Jun 2008 12:08:56 GMT Message-Id: <200806201208.m5KC8ueq095233@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 143817 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Jun 2008 12:08:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=143817 Change 143817 by gabor@gabor_server on 2008/06/20 12:08:52 - GNU compatibility: allow two repetition operators after one another Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/grep.c#27 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/grep.c#27 (text+ko) ==== @@ -198,7 +198,13 @@ while (((ptr = strstr(pat, "(|")) != NULL) && (strstr(pat, "(\\|") != ptr) && (strstr(pat, "\\(|") != (ptr - 1))) { strlcpy(&(ptr[1]), &(ptr[2]), strlen(ptr)); } - while ((ptr = strstr(pat, "||")) != NULL) { + while (((ptr = strstr(pat, "||")) != NULL) && (strstr(pat, "\\||") != (ptr - 1))) { + strlcpy(&(ptr[1]), &(ptr[2]), strlen(ptr)); + } + while (((ptr = strstr(pat, "*?")) != NULL) && (strstr(pat, "\\*?") != (ptr - 1))) { + strlcpy(&(ptr[1]), &(ptr[2]), strlen(ptr)); + } + while (((ptr = strstr(pat, "?*")) != NULL) && (strstr(pat, "\\?*") != (ptr - 1))) { strlcpy(&(ptr[1]), &(ptr[2]), strlen(ptr)); } From owner-p4-projects@FreeBSD.ORG Fri Jun 20 13:24:17 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CFFDC1065688; Fri, 20 Jun 2008 13:24:16 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 76F591065679 for ; Fri, 20 Jun 2008 13:24:16 +0000 (UTC) (envelope-from andenore@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6A4E48FC1D for ; Fri, 20 Jun 2008 13:24:16 +0000 (UTC) (envelope-from andenore@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5KDOGh3013100 for ; Fri, 20 Jun 2008 13:24:16 GMT (envelope-from andenore@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5KDOG8O013098 for perforce@freebsd.org; Fri, 20 Jun 2008 13:24:16 GMT (envelope-from andenore@FreeBSD.org) Date: Fri, 20 Jun 2008 13:24:16 GMT Message-Id: <200806201324.m5KDOG8O013098@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to andenore@FreeBSD.org using -f From: Anders Nore To: Perforce Change Reviews Cc: Subject: PERFORCE change 143818 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Jun 2008 13:24:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=143818 Change 143818 by andenore@andenore_laptop on 2008/06/20 13:24:13 pkg_version now uses origin lookups in database, although the speedup is not as much as I would like. Affected files ... .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/convert/perform.c#2 edit .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/info/Makefile#4 edit .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/info/test.sh#1 add .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/version/Makefile#4 edit .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/version/main.c#3 edit .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/version/perform.c#3 edit Differences ... ==== //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/convert/perform.c#2 (text+ko) ==== @@ -32,11 +32,6 @@ char tmp[PATH_MAX]; DBT key, data; - key.size = strlen(pkgname) + 1; - key.data = pkgname; - dbsave(&key, &key); - printf("Package: %s\n", key.data); - /* * Add Which indexing i.e. index files installed by package and they point * to the installed package (alot of redundant data) @@ -45,18 +40,35 @@ Package pkg; PackingList itr; char *cwd = NULL; + Boolean skip = FALSE; + pkg.head = pkg.tail = NULL; + pkg.name = pkg.origin = NULL; + snprintf(tmp, PATH_MAX, "%s/%s/%s", LOG_DIR, pkgname, CONTENTS_FNAME); fp = fopen(tmp, "r"); if (fp == NULL) { - warn("%s", tmp); + warnx("the package info for package '%s' is corrupt", pkgname); return 1; } - Boolean skip = FALSE; - pkg.head = pkg.tail = NULL; read_plist(&pkg, fp); fclose(fp); + + if (pkg.name == NULL || pkg.origin == NULL) { + warnx("%s does not appear to be a valid package!", pkg); + return 1; + } + + key.size = strlen(pkg.name) + 1; + key.data = pkg.name; + data.size = strlen(pkg.origin) + 1; + data.data = pkg.origin; + + if(!Quiet) + printf("Saving package: %s\n", key.data); + dbsave(&key, &data); + for (itr = pkg.head; itr != pkg.tail; itr = itr->next) { if (itr->type == PLIST_CWD && skip == FALSE) { cwd = itr->name; ==== //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/info/Makefile#4 (text+ko) ==== @@ -11,4 +11,7 @@ DPADD= ${LIBINSTALL} ${LIBFETCH} ${LIBMD} LDADD= ${LIBINSTALL} -lfetch -lmd +test: + ./test.sh + .include ==== //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/version/Makefile#4 (text+ko) ==== ==== //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/version/main.c#3 (text+ko) ==== @@ -44,7 +44,7 @@ if(cacheExists()) { openDatabase(PKG_DBCACHE_FILE); -// atexit(closeDatabase); + atexit(closeDatabase); } if (argc == 4 && !strcmp(argv[1], "-t")) { ==== //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/version/perform.c#3 (text+ko) ==== @@ -33,6 +33,7 @@ static int pkg_do(char *); static void show_version(Package, const char *, const char *); +static char *getPkgName(const char *makefile); /* * This is the traditional pkg_perform, except that the argument is _not_ @@ -140,12 +141,11 @@ plist.name = plist.origin = NULL; if(CacheExists) { -// DEBUG("Using Cache!\n"); + DEBUG("Using Cache!\n"); plist.name = pkg; char *origin = dbgetdata(pkg); -// printf("pkg = %s :: origin = %s\n", pkg, origin); + printf("pkg = %s -> origin = %s\n", pkg, origin); plist.origin = origin; - } else { DEBUG("Not using cache\n"); /* Suck in the contents list. */ @@ -172,12 +172,16 @@ if (plist.origin != NULL && !UseINDEXOnly) { snprintf(tmp, PATH_MAX, "%s/%s", PORTS_DIR, plist.origin); if (isdir(tmp) && chdir(tmp) != FAIL && isfile("Makefile")) { - if ((latest = vpipe("/usr/bin/make -V PKGNAME", tmp)) == NULL) - warnx("Failed to get PKGNAME from %s/Makefile!", tmp); - else - show_version(plist, latest, "port"); + snprintf(tmp2, PATH_MAX, "%s/Makefile", tmp); + if((latest = getPkgName(tmp2)) == NULL) { + if ((latest = vpipe("/usr/bin/make -V PKGNAME", tmp)) == NULL) + warnx("Failed to get PKGNAME from %s/Makefile!", tmp); + else + show_version(plist, latest, "port"); + } } } + if (latest == NULL) { /* Report package as not found in INDEX if the INDEX is not required. */ if (IndexFile == NULL && !UseINDEXOnly) @@ -423,9 +427,23 @@ return ret; } +static char * +getPkgName(const char *makefile) +{ + FILE *fp; + fp = fopen(tmp, "r"); + if (!fp) { + warnx("Could not open %s, trying make -V PKGNAME", makefile); + return NULL; + } + + return NULL; +} + void cleanup(int sig) { if (sig) exit(1); } + From owner-p4-projects@FreeBSD.ORG Fri Jun 20 15:03:57 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6AC3A1065675; Fri, 20 Jun 2008 15:03:57 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 136A6106564A for ; Fri, 20 Jun 2008 15:03:57 +0000 (UTC) (envelope-from sson@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 094F08FC0C for ; Fri, 20 Jun 2008 15:03:57 +0000 (UTC) (envelope-from sson@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5KF3uY1027160 for ; Fri, 20 Jun 2008 15:03:56 GMT (envelope-from sson@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5KF3ub6027158 for perforce@freebsd.org; Fri, 20 Jun 2008 15:03:56 GMT (envelope-from sson@FreeBSD.org) Date: Fri, 20 Jun 2008 15:03:56 GMT Message-Id: <200806201503.m5KF3ub6027158@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sson@FreeBSD.org using -f From: Stacey Son To: Perforce Change Reviews Cc: Subject: PERFORCE change 143821 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Jun 2008 15:03:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=143821 Change 143821 by sson@sson_amd64 on 2008/06/20 15:03:20 - For darwin, added Mach IPC support for audit trigger messages. - Added LOG_PERROR flag to openlog when -d option is used with auditd. - Fixed minor autoconf bugs in audit and auditd dealing with queue.h. - Updated the HISTORY file. Affected files ... .. //depot/projects/trustedbsd/openbsm/HISTORY#67 edit .. //depot/projects/trustedbsd/openbsm/bin/audit/Makefile.am#2 edit .. //depot/projects/trustedbsd/openbsm/bin/audit/Makefile.in#5 edit .. //depot/projects/trustedbsd/openbsm/bin/audit/audit.c#9 edit .. //depot/projects/trustedbsd/openbsm/bin/audit/auditd_control.defs#1 add .. //depot/projects/trustedbsd/openbsm/bin/auditd/Makefile.am#2 edit .. //depot/projects/trustedbsd/openbsm/bin/auditd/Makefile.in#5 edit .. //depot/projects/trustedbsd/openbsm/bin/auditd/audit_triggers.defs#1 add .. //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#27 edit .. //depot/projects/trustedbsd/openbsm/bin/auditd/auditd_control.defs#1 add .. //depot/projects/trustedbsd/openbsm/config/config.h.in#12 edit .. //depot/projects/trustedbsd/openbsm/configure#36 edit .. //depot/projects/trustedbsd/openbsm/configure.ac#39 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/HISTORY#67 (text+ko) ==== @@ -1,4 +1,7 @@ - Modify the -m option so users can select more then one audit event. +- For darwin, added Mach IPC support for audit trigger messages. +- Fixed a bug in getacna() which resulted in a locking problem on darwin. +- Added LOG_PERROR flag to openlog when -d option is used with auditd. OpenBSM 1.1 alpha 1 @@ -318,4 +321,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/HISTORY#66 $ +$P4: //depot/projects/trustedbsd/openbsm/HISTORY#67 $ ==== //depot/projects/trustedbsd/openbsm/bin/audit/Makefile.am#2 (text+ko) ==== @@ -1,10 +1,19 @@ # -# $P4: //depot/projects/trustedbsd/openbsm/bin/audit/Makefile.am#1 $ +# $P4: //depot/projects/trustedbsd/openbsm/bin/audit/Makefile.am#2 $ # INCLUDES = -I$(top_srcdir) sbin_PROGRAMS = audit -audit_SOURCES = audit.c audit_LDADD = $(top_builddir)/libbsm/libbsm.la man8_MANS = audit.8 + +if USE_MACH_IPC +audit_SOURCES = auditd_control_user.c audit.c +CLEANFILES = auditd_control_user.c auditd_control_user.h + +auditd_control_user.c: auditd_control.defs + $(MIG) -user auditd_control_user.c -header auditd_control_user.h -server /dev/null -sheader /dev/null auditd_control.defs +else +audit_SOURCES = audit.c +endif ==== //depot/projects/trustedbsd/openbsm/bin/audit/Makefile.in#5 (text+ko) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/openbsm/bin/audit/Makefile.in#4 $ +# $P4: //depot/projects/trustedbsd/openbsm/bin/audit/Makefile.in#5 $ # VPATH = @srcdir@ @@ -49,7 +49,10 @@ am__installdirs = "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man8dir)" sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(sbin_PROGRAMS) -am_audit_OBJECTS = audit.$(OBJEXT) +am__audit_SOURCES_DIST = audit.c auditd_control_user.c +@USE_MACH_IPC_FALSE@am_audit_OBJECTS = audit.$(OBJEXT) +@USE_MACH_IPC_TRUE@am_audit_OBJECTS = auditd_control_user.$(OBJEXT) \ +@USE_MACH_IPC_TRUE@ audit.$(OBJEXT) audit_OBJECTS = $(am_audit_OBJECTS) audit_DEPENDENCIES = $(top_builddir)/libbsm/libbsm.la DEFAULT_INCLUDES = -I. -I$(top_builddir)/config@am__isrc@ @@ -65,7 +68,7 @@ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ SOURCES = $(audit_SOURCES) -DIST_SOURCES = $(audit_SOURCES) +DIST_SOURCES = $(am__audit_SOURCES_DIST) man8dir = $(mandir)/man8 NROFF = nroff MANS = $(man8_MANS) @@ -113,6 +116,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MIG = @MIG@ MKDIR_P = @MKDIR_P@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ @@ -123,7 +127,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ RANLIB = @RANLIB@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -180,9 +183,11 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ INCLUDES = -I$(top_srcdir) -audit_SOURCES = audit.c audit_LDADD = $(top_builddir)/libbsm/libbsm.la man8_MANS = audit.8 +@USE_MACH_IPC_FALSE@audit_SOURCES = audit.c +@USE_MACH_IPC_TRUE@audit_SOURCES = auditd_control_user.c audit.c +@USE_MACH_IPC_TRUE@CLEANFILES = auditd_control_user.c auditd_control_user.h all: all-am .SUFFIXES: @@ -196,9 +201,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign bin/audit/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu bin/audit/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign bin/audit/Makefile + $(AUTOMAKE) --gnu bin/audit/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -255,6 +260,7 @@ -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audit.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/auditd_control_user.Po@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -426,6 +432,7 @@ mostlyclean-generic: clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) @@ -511,6 +518,9 @@ tags uninstall uninstall-am uninstall-man uninstall-man8 \ uninstall-sbinPROGRAMS + +@USE_MACH_IPC_TRUE@auditd_control_user.c: auditd_control.defs +@USE_MACH_IPC_TRUE@ $(MIG) -user auditd_control_user.c -header auditd_control_user.h -server /dev/null -sheader /dev/null auditd_control.defs # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: ==== //depot/projects/trustedbsd/openbsm/bin/audit/audit.c#9 (text+ko) ==== @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/audit/audit.c#8 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/audit/audit.c#9 $ */ /* * Program to trigger the audit daemon with a message that is either: @@ -37,7 +37,12 @@ */ #include +#include +#ifdef HAVE_FULL_QUEUE_H #include +#else /* !HAVE_FULL_QUEUE_H */ +#include +#endif /* !HAVE_FULL_QUEUE_H */ #include #include @@ -47,6 +52,58 @@ #include #include + +static int send_trigger(unsigned int); + +#ifdef USE_MACH_IPC +#include +#include +#include +#include +#include +#include +#include + +#include "auditd_control_user.h" + +static int +send_trigger(unsigned int trigger) +{ + mach_port_t serverPort; + kern_return_t error; + + error = host_get_audit_control_port(mach_host_self(), &serverPort); + if (error != KERN_SUCCESS) { + mach_error("Cannot get auditd_control Mach port: ", error); + return (-1); + } + + error = auditd_control(serverPort, trigger); + if (error != KERN_SUCCESS) { + mach_error("Error sending trigger: ", error); + return (-1); + } + + return (0); +} + +#else /* ! USE_MACH_IPC */ + +static int +send_trigger(unsigned int trigger) +{ + int error; + + error = auditon(A_SENDTRIGGER, &trigger, sizeof(trigger)); + if (error != 0) { + perror("Error sending trigger"); + return (-1); + } + + return (0); +} +#endif /* ! USE_MACH_IPC */ + static void usage(void) { @@ -88,11 +145,9 @@ break; } } - if (auditon(A_SENDTRIGGER, &trigger, sizeof(trigger)) < 0) { - perror("Error sending trigger"); + if (send_trigger(trigger) < 0) exit(-1); - } else { - printf("Trigger sent.\n"); - exit (0); - } + + printf("Trigger sent.\n"); + exit (0); } ==== //depot/projects/trustedbsd/openbsm/bin/auditd/Makefile.am#2 (text+ko) ==== @@ -1,10 +1,22 @@ # -# $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/Makefile.am#1 $ +# $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/Makefile.am#2 $ # INCLUDES = -I$(top_srcdir) sbin_PROGRAMS = auditd -auditd_SOURCES = audit_warn.c auditd.c auditd_LDADD = $(top_builddir)/libbsm/libbsm.la man8_MANS = auditd.8 + +if USE_MACH_IPC +auditd_SOURCES = auditd_control_server.c audit_triggers_server.c audit_warn.c auditd.c +CLEANFILES = auditd_control_server.c auditd_control_server.h audit_triggers_server.c audit_triggers_server.h + +auditd_control_server.c: auditd_control.defs + $(MIG) -user /dev/null -header /dev/null -server auditd_control_server.c -sheader auditd_control_server.h auditd_control.defs + +audit_triggers_server.c: audit_triggers.defs + $(MIG) -user /dev/null -header /dev/null -server audit_triggers_server.c -sheader audit_triggers_server.h audit_triggers.defs +else +auditd_SOURCES = audit_warn.c auditd.c +endif ==== //depot/projects/trustedbsd/openbsm/bin/auditd/Makefile.in#5 (text+ko) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/Makefile.in#4 $ +# $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/Makefile.in#5 $ # VPATH = @srcdir@ @@ -49,7 +49,14 @@ am__installdirs = "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man8dir)" sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(sbin_PROGRAMS) -am_auditd_OBJECTS = audit_warn.$(OBJEXT) auditd.$(OBJEXT) +am__auditd_SOURCES_DIST = audit_warn.c auditd.c \ + auditd_control_server.c audit_triggers_server.c +@USE_MACH_IPC_FALSE@am_auditd_OBJECTS = audit_warn.$(OBJEXT) \ +@USE_MACH_IPC_FALSE@ auditd.$(OBJEXT) +@USE_MACH_IPC_TRUE@am_auditd_OBJECTS = \ +@USE_MACH_IPC_TRUE@ auditd_control_server.$(OBJEXT) \ +@USE_MACH_IPC_TRUE@ audit_triggers_server.$(OBJEXT) \ +@USE_MACH_IPC_TRUE@ audit_warn.$(OBJEXT) auditd.$(OBJEXT) auditd_OBJECTS = $(am_auditd_OBJECTS) auditd_DEPENDENCIES = $(top_builddir)/libbsm/libbsm.la DEFAULT_INCLUDES = -I. -I$(top_builddir)/config@am__isrc@ @@ -65,7 +72,7 @@ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ SOURCES = $(auditd_SOURCES) -DIST_SOURCES = $(auditd_SOURCES) +DIST_SOURCES = $(am__auditd_SOURCES_DIST) man8dir = $(mandir)/man8 NROFF = nroff MANS = $(man8_MANS) @@ -113,6 +120,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MIG = @MIG@ MKDIR_P = @MKDIR_P@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ @@ -123,7 +131,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ RANLIB = @RANLIB@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -180,9 +187,11 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ INCLUDES = -I$(top_srcdir) -auditd_SOURCES = audit_warn.c auditd.c auditd_LDADD = $(top_builddir)/libbsm/libbsm.la man8_MANS = auditd.8 +@USE_MACH_IPC_FALSE@auditd_SOURCES = audit_warn.c auditd.c +@USE_MACH_IPC_TRUE@auditd_SOURCES = auditd_control_server.c audit_triggers_server.c audit_warn.c auditd.c +@USE_MACH_IPC_TRUE@CLEANFILES = auditd_control_server.c auditd_control_server.h audit_triggers_server.c audit_triggers_server.h all: all-am .SUFFIXES: @@ -196,9 +205,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign bin/auditd/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu bin/auditd/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign bin/auditd/Makefile + $(AUTOMAKE) --gnu bin/auditd/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -254,8 +263,10 @@ distclean-compile: -rm -f *.tab.c +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audit_triggers_server.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audit_warn.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/auditd.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/auditd_control_server.Po@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -427,6 +438,7 @@ mostlyclean-generic: clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) @@ -512,6 +524,12 @@ tags uninstall uninstall-am uninstall-man uninstall-man8 \ uninstall-sbinPROGRAMS + +@USE_MACH_IPC_TRUE@auditd_control_server.c: auditd_control.defs +@USE_MACH_IPC_TRUE@ $(MIG) -user /dev/null -header /dev/null -server auditd_control_server.c -sheader auditd_control_server.h auditd_control.defs + +@USE_MACH_IPC_TRUE@audit_triggers_server.c: audit_triggers.defs +@USE_MACH_IPC_TRUE@ $(MIG) -user /dev/null -header /dev/null -server audit_triggers_server.c -sheader audit_triggers_server.h audit_triggers.defs # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: ==== //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#27 (text+ko) ==== @@ -26,13 +26,20 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#26 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#27 $ */ #include + +#include + #include #include +#ifdef HAVE_FULL_QUEUE_H #include +#else /* !HAVE_FULL_QUEUE_H */ +#include +#endif /* !HAVE_FULL_QUEUE_H */ #include #include @@ -53,18 +60,40 @@ #include #include "auditd.h" +#ifdef USE_MACH_IPC +#include +#include +#include +#include +#include +#include +#include "auditd_control_server.h" +#include "audit_triggers_server.h" +#endif /* USE_MACH_IPC */ + #define NA_EVENT_STR_SIZE 25 #define POL_STR_SIZE 128 - static int ret, minval; static char *lastfile = NULL; static int allhardcount = 0; static int triggerfd = 0; static int sigchlds, sigchlds_handled; static int sighups, sighups_handled; +#ifndef USE_MACH_IPC static int sigterms, sigterms_handled; +#else /* USE_MACH_IPC */ + +static mach_port_t control_port = MACH_PORT_NULL; +static mach_port_t signal_port = MACH_PORT_NULL; +static mach_port_t port_set = MACH_PORT_NULL; + +#ifndef __BSM_INTERNAL_NOTIFY_KEY +#define __BSM_INTERNAL_NOTIFY_KEY "com.apple.audit.change" +#endif /* __BSM_INTERNAL_NOTIFY_KEY */ +#endif /* USE_MACH_IPC */ + static TAILQ_HEAD(, dir_ent) dir_q; static int config_audit_controls(void); @@ -305,6 +334,11 @@ free_dir_q(); endac(); +#ifdef USE_MACH_IPC + /* Post that the audit config changed. */ + notify_post(__BSM_INTERNAL_NOTIFY_KEY); +#endif + /* * Read the list of directories into a local linked list. * @@ -415,8 +449,10 @@ } endac(); +#ifdef USE_MACH_IPC if (close(triggerfd) != 0) syslog(LOG_ERR, "Error closing control file"); +#endif syslog(LOG_INFO, "Finished"); return (0); } @@ -427,6 +463,22 @@ * main servicing loop to do proper handling from a non-signal-handler * context. */ +#ifdef USE_MACH_IPC +static void +relay_signal(int signal) +{ + mach_msg_empty_send_t msg; + + msg.header.msgh_id = signal; + msg.header.msgh_remote_port = signal_port; + msg.header.msgh_local_port = MACH_PORT_NULL; + msg.header.msgh_bits = MACH_MSGH_BITS(MACH_MSG_TYPE_MAKE_SEND, 0); + mach_msg(&(msg.header), MACH_SEND_MSG|MACH_SEND_TIMEOUT, sizeof(msg), + 0, MACH_PORT_NULL, MACH_MSG_TIMEOUT_NONE, MACH_PORT_NULL); +} + +#else /* ! USE_MACH_IPC */ + static void relay_signal(int signal) { @@ -438,6 +490,7 @@ if (signal == SIGCHLD) sigchlds++; } +#endif /* ! USE_MACH_IPC */ /* * Registering the daemon. @@ -492,6 +545,48 @@ return (0); } +#ifdef USE_MACH_IPC +/* + * Implementation of the auditd_control() MIG simpleroutine. + * + * React to input from the audit(1) tool. + */ + +/* ARGSUSED */ +kern_return_t +auditd_control(mach_port_t __unused auditd_port, int trigger) +{ + int err_ret = 0; + + switch (trigger) { + + case AUDIT_TRIGGER_ROTATE_USER: + /* + * Create a new file and swap with the one + * being used in kernel. + */ + if (swap_audit_file() == -1) + syslog(LOG_ERR, "Error swapping audit file"); + break; + + case AUDIT_TRIGGER_READ_FILE: + if (read_control_file() == -1) + syslog(LOG_ERR, "Error in audit control file"); + break; + + case AUDIT_TRIGGER_CLOSE_AND_DIE: + err_ret = close_all(); + exit (err_ret); + break; + + default: + break; + } + + return (KERN_SUCCESS); +} +#endif /* USE_MACH_IPC */ + /* * Handle the audit trigger event. * @@ -503,8 +598,18 @@ * not be retransmitted, and the log file will grow in an unbounded fashion. */ #define DUPLICATE_INTERVAL 30 -static void +#ifdef USE_MACH_IPC +#define AT_SUCCESS KERN_SUCCESS + +/* ARGSUSED */ +kern_return_t +audit_triggers(mach_port_t __unused audit_port, int trigger) +#else +#define AT_SUCCESS 0 + +static int handle_audit_trigger(int trigger) +#endif { static int last_trigger, last_warning; static time_t last_time; @@ -533,7 +638,7 @@ syslog(LOG_INFO, "Suppressing duplicate trigger %d", trigger); - return; + return (AT_SUCCESS); } last_warning = tt; break; @@ -634,8 +739,12 @@ syslog(LOG_ERR, "Got unknown trigger %d", trigger); break; } + + return (AT_SUCCESS); } +#undef AT_SUCCESS + static void handle_sighup(void) { @@ -675,6 +784,60 @@ /* * Read the control file for triggers/signals and handle appropriately. */ +#ifdef USE_MACH_IPC +#define MAX_MSG_SIZE 4096 + +static boolean_t +auditd_combined_server(mach_msg_header_t *InHeadP, mach_msg_header_t *OutHeadP) +{ + mach_port_t local_port = InHeadP->msgh_local_port; + + if (local_port == signal_port) { + int signo = InHeadP->msgh_id; + int ret; + + switch(signo) { + case SIGTERM: + ret = close_all(); + exit(ret); + + case SIGCHLD: + handle_sigchld(); + return (TRUE); + + case SIGHUP: + handle_sighup(); + return (TRUE); + + default: + syslog(LOG_INFO, "Received signal %d", signo); + return (TRUE); + } + } else if (local_port == control_port) { + boolean_t result; + + result = audit_triggers_server(InHeadP, OutHeadP); + if (!result) + result = auditd_control_server(InHeadP, OutHeadP); + return (result); + } + syslog(LOG_INFO, "Recevied msg on bad port 0x%x.", local_port); + return (FALSE); +} + +static int +wait_for_events(void) +{ + kern_return_t result; + + result = mach_msg_server(auditd_combined_server, MAX_MSG_SIZE, + port_set, MACH_MSG_OPTION_NONE); + syslog(LOG_ERR, "abnormal exit\n"); + return (close_all()); +} + +#else /* ! USE_MACH_IPC */ + static int wait_for_events(void) { @@ -706,10 +869,11 @@ if (trigger == AUDIT_TRIGGER_CLOSE_AND_DIE) break; else - handle_audit_trigger(trigger); + (void)handle_audit_trigger(trigger); } return (close_all()); } +#endif /* ! USE_MACH_IPC */ /* * Configure the audit controls in the kernel: the event to class mapping, @@ -820,6 +984,62 @@ return (0); } +#ifdef USE_MACH_IPC +static void +mach_setup(void) +{ + mach_msg_type_name_t poly; + + /* + * Allocate a port set + */ + if (mach_port_allocate(mach_task_self(), + MACH_PORT_RIGHT_PORT_SET, + &port_set) != KERN_SUCCESS) { + syslog(LOG_ERR, "Allocation of port set failed"); + fail_exit(); + } + + /* + * Allocate a signal reflection port + */ + if (mach_port_allocate(mach_task_self(), + MACH_PORT_RIGHT_RECEIVE, + &signal_port) != KERN_SUCCESS || + mach_port_move_member(mach_task_self(), + signal_port, + port_set) != KERN_SUCCESS) { + syslog(LOG_ERR, "Allocation of signal port failed"); + fail_exit(); + } + + /* + *Allocate a trigger port + */ + if (mach_port_allocate(mach_task_self(), + MACH_PORT_RIGHT_RECEIVE, + &control_port) != KERN_SUCCESS || + mach_port_move_member(mach_task_self(), + control_port, + port_set) != KERN_SUCCESS) { + syslog(LOG_ERR, "Allocation of trigger port failed"); + fail_exit(); + } + /* create a send right on our trigger port */ + mach_port_extract_right(mach_task_self(), control_port, + MACH_MSG_TYPE_MAKE_SEND, &control_port, &poly); + + /* register the trigger port with the kernel */ + if (host_set_audit_control_port(mach_host_self(), control_port) != + KERN_SUCCESS) { + syslog(LOG_ERR, "Cannot set Mach control port"); + fail_exit(); + } + else + syslog(LOG_DEBUG, "Mach control port registered"); +} +#endif /* USE_MACH_IPC */ + static void setup(void) { @@ -828,6 +1048,10 @@ int aufd; token_t *tok; +#ifdef USE_MACH_IPC + mach_setup(); +#endif + if ((triggerfd = open(AUDIT_TRIGGER_FILE, O_RDONLY, 0)) < 0) { syslog(LOG_ERR, "Error opening trigger file"); fail_exit(); @@ -890,7 +1114,7 @@ { int ch; int debug = 0; - int rc; + int rc, logopts; while ((ch = getopt(argc, argv, "d")) != -1) { switch(ch) { @@ -907,10 +1131,14 @@ } } + logopts = LOG_CONS | LOG_PID; + if (debug != 0) + logopts |= LOG_PERROR; + #ifdef LOG_SECURITY - openlog("auditd", LOG_CONS | LOG_PID, LOG_SECURITY); + openlog("auditd", logopts, LOG_SECURITY); #else - openlog("auditd", LOG_CONS | LOG_PID, LOG_AUTH); + openlog("auditd", logopts, LOG_AUTH); #endif syslog(LOG_INFO, "starting..."); ==== //depot/projects/trustedbsd/openbsm/config/config.h.in#12 (text+ko) ==== @@ -174,6 +174,9 @@ /* Define to 1 if your declares `struct tm'. */ #undef TM_IN_SYS_TIME +/* Define if uses Mach IPC for Triggers messages */ +#undef USE_MACH_IPC + /* Version number of package */ #undef VERSION ==== //depot/projects/trustedbsd/openbsm/configure#36 (xtext) ==== @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#37 . +# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#38 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for OpenBSM 1.1alpha1. # @@ -812,6 +812,7 @@ MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT +MIG CC CFLAGS LDFLAGS @@ -830,7 +831,6 @@ host_cpu host_vendor host_os -SED GREP EGREP LN_S @@ -880,6 +880,8 @@ LIBOBJS HAVE_AUDIT_SYSCALLS_TRUE HAVE_AUDIT_SYSCALLS_FALSE +USE_MACH_IPC_TRUE +USE_MACH_IPC_FALSE LTLIBOBJS' ac_subst_files='' ac_precious_vars='build_alias @@ -2001,6 +2003,52 @@ +for ac_prog in mig +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_MIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $MIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_MIG="$MIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_MIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + ;; +esac +fi +MIG=$ac_cv_path_MIG +if test -n "$MIG"; then + { echo "$as_me:$LINENO: result: $MIG" >&5 +echo "${ECHO_T}$MIG" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + + test -n "$MIG" && break +done + + # Checks for programs. ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -3170,13 +3218,12 @@ test -z "$as_dir" && as_dir=. for lt_ac_prog in sed gsed; do for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$lt_ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$lt_ac_prog$ac_exec_ext"; }; then + if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" fi done done done -IFS=$as_save_IFS lt_ac_max=0 lt_ac_count=0 # Add /usr/xpg4/bin/sed as it is typically found on Solaris @@ -3211,7 +3258,6 @@ fi SED=$lt_cv_path_SED - { echo "$as_me:$LINENO: result: $SED" >&5 echo "${ECHO_T}$SED" >&6; } @@ -3573,8 +3619,8 @@ echo "${ECHO_T}no, using $LN_S" >&6; } fi -{ echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5 -echo $ECHO_N "checking how to recognize dependent libraries... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5 +echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6; } if test "${lt_cv_deplibs_check_method+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -3615,22 +3661,16 @@ mingw* | pw32*) # Base MSYS/MinGW do not provide the 'file' command needed by - # func_win32_libid shell function, so use a weaker test based on 'objdump', - # unless we find 'file', for example because we are cross-compiling. - if ( file / ) >/dev/null 2>&1; then - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - else - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' - lt_cv_file_magic_cmd='$OBJDUMP -f' - fi + # func_win32_libid shell function, so use a weaker test based on 'objdump'. + lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' + lt_cv_file_magic_cmd='$OBJDUMP -f' ;; darwin* | rhapsody*) lt_cv_deplibs_check_method=pass_all ;; -freebsd* | dragonfly*) +freebsd* | kfreebsd*-gnu | dragonfly*) if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then case $host_cpu in i*86 ) @@ -3668,7 +3708,7 @@ esac ;; -interix[3-9]*) +interix3*) # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$' ;; @@ -3684,7 +3724,7 @@ ;; # This must be Linux ELF. -linux* | k*bsd*-gnu) +linux*) lt_cv_deplibs_check_method=pass_all ;; @@ -3718,10 +3758,6 @@ lt_cv_deplibs_check_method=pass_all ;; -rdos*) - lt_cv_deplibs_check_method=pass_all - ;; - solaris*) lt_cv_deplibs_check_method=pass_all ;; @@ -3809,7 +3845,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 3812 "configure"' > conftest.$ac_ext + echo '#line 3848 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -3844,8 +3880,7 @@ rm -rf conftest* ;; -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ -s390*-*linux*|sparc*-*linux*) +x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jun 20 16:14:11 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5048C106568C; Fri, 20 Jun 2008 16:14:11 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 138C71065671 for ; Fri, 20 Jun 2008 16:14:11 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0E8388FC22 for ; Fri, 20 Jun 2008 16:14:11 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5KGEAuK034848 for ; Fri, 20 Jun 2008 16:14:10 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5KGEAcp034846 for perforce@freebsd.org; Fri, 20 Jun 2008 16:14:10 GMT (envelope-from gabor@freebsd.org) Date: Fri, 20 Jun 2008 16:14:10 GMT Message-Id: <200806201614.m5KGEAcp034846@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 143824 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Jun 2008 16:14:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=143824 Change 143824 by gabor@gabor_server on 2008/06/20 16:13:19 - GNU compatibility: some * and ? token manipulations to provide better GNU compatibility Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/grep.c#28 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/grep.c#28 (text+ko) ==== @@ -207,6 +207,20 @@ while (((ptr = strstr(pat, "?*")) != NULL) && (strstr(pat, "\\?*") != (ptr - 1))) { strlcpy(&(ptr[1]), &(ptr[2]), strlen(ptr)); } + while (((ptr = strstr(pat, "**")) != NULL) && (strstr(pat, "\\**") != (ptr - 1)) && (strstr(pat, "\\(**") != (ptr - 2))) { + strlcpy(&(ptr[1]), &(ptr[2]), strlen(ptr)); + } + while (((ptr = strstr(pat, "??")) != NULL) && (strstr(pat, "\\??") != (ptr - 1))) { + strlcpy(&(ptr[1]), &(ptr[2]), strlen(ptr)); + } + while ((ptr = strstr(pat, "^*")) != NULL) { + strlcpy(&(ptr[1]), &(ptr[2]), strlen(ptr)); + } + while ((ptr = strstr(pat, "(*")) != NULL && (strstr(pat, "\\(*") != (ptr - 1))) { + strlcpy(&(ptr[1]), &(ptr[2]), strlen(ptr)); + } + +// printf("PAT %s\n", pat); /* Work-around to allow * at the beginning of the regexp */ while (pat[0] == '*') From owner-p4-projects@FreeBSD.ORG Fri Jun 20 16:18:15 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A3640106567D; Fri, 20 Jun 2008 16:18:15 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6525E1065677 for ; Fri, 20 Jun 2008 16:18:15 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 44C738FC1D for ; Fri, 20 Jun 2008 16:18:15 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5KGIFWH035158 for ; Fri, 20 Jun 2008 16:18:15 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5KGIE2u035156 for perforce@freebsd.org; Fri, 20 Jun 2008 16:18:15 GMT (envelope-from gabor@freebsd.org) Date: Fri, 20 Jun 2008 16:18:15 GMT Message-Id: <200806201618.m5KGIE2u035156@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 143825 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Jun 2008 16:18:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=143825 Change 143825 by gabor@gabor_server on 2008/06/20 16:17:43 - Don't compile with debug symbols, the code is supposed to be stable enough now. Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/Makefile#4 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/Makefile#4 (text+ko) ==== @@ -15,7 +15,7 @@ grep.1 zegrep.1 \ grep.1 zfgrep.1 -CFLAGS+= -std=c99 -Wall -pedantic -ggdb +CFLAGS+= -std=c99 -Wall -pedantic LDADD= -lz -lbz2 DPADD= ${LIBZ} ${LIBBZ2} From owner-p4-projects@FreeBSD.ORG Fri Jun 20 18:01:04 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BA4391065677; Fri, 20 Jun 2008 18:01:04 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7B5A31065678 for ; Fri, 20 Jun 2008 18:01:04 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 79F118FC16 for ; Fri, 20 Jun 2008 18:01:04 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5KI14V7055465 for ; Fri, 20 Jun 2008 18:01:04 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5KI144D055463 for perforce@freebsd.org; Fri, 20 Jun 2008 18:01:04 GMT (envelope-from gabor@freebsd.org) Date: Fri, 20 Jun 2008 18:01:04 GMT Message-Id: <200806201801.m5KI144D055463@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 143829 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Jun 2008 18:01:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=143829 Change 143829 by gabor@gabor_server on 2008/06/20 18:00:53 - Rework the GNU compatibility part a bit, the workaround substitutions are more accurate now Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/grep.c#29 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/grep.c#29 (text+ko) ==== @@ -187,37 +187,55 @@ static void add_pattern(char *pat, size_t len) { - char *ptr; + char *ptr, *st; /* Workaround for our libc-regex library to match GNU behaviour. Our library rejects '|' with empty subexpressions. Just cut out those parts, e.g. "(|a|b||c|)" will be "(a|b|c)" */ - while (((ptr = strstr(pat, "|)"))) != NULL && (strstr(pat, "\\|)") != (ptr - 1))) { + st = pat; + while (((ptr = strstr(st, "|)"))) != NULL && (strstr(st, "\\|)") != (ptr - 1))) { strlcpy(ptr, &(ptr[1]), strlen(ptr)); + st = ptr; } - while (((ptr = strstr(pat, "(|")) != NULL) && (strstr(pat, "(\\|") != ptr) && (strstr(pat, "\\(|") != (ptr - 1))) { + st = pat; + while (((ptr = strstr(st, "(|")) != NULL) && (strstr(st, "(\\|") != ptr) && (strstr(st, "\\(|") != (ptr - 1))) { strlcpy(&(ptr[1]), &(ptr[2]), strlen(ptr)); + st = ptr; } - while (((ptr = strstr(pat, "||")) != NULL) && (strstr(pat, "\\||") != (ptr - 1))) { + st = pat; + while (((ptr = strstr(st, "||")) != NULL) && (strstr(st, "\\||") != (ptr - 1))) { strlcpy(&(ptr[1]), &(ptr[2]), strlen(ptr)); + st = ptr; } - while (((ptr = strstr(pat, "*?")) != NULL) && (strstr(pat, "\\*?") != (ptr - 1))) { + st = pat; + while (((ptr = strstr(st, "*?")) != NULL) && (strstr(st, "\\*?") != (ptr - 1))) { strlcpy(&(ptr[1]), &(ptr[2]), strlen(ptr)); + st = ptr; } - while (((ptr = strstr(pat, "?*")) != NULL) && (strstr(pat, "\\?*") != (ptr - 1))) { + st = pat; + while (((ptr = strstr(st, "?*")) != NULL) && (strstr(st, "\\?*") != (ptr - 1))) { strlcpy(&(ptr[1]), &(ptr[2]), strlen(ptr)); + st = ptr; } - while (((ptr = strstr(pat, "**")) != NULL) && (strstr(pat, "\\**") != (ptr - 1)) && (strstr(pat, "\\(**") != (ptr - 2))) { + st = pat; + while (((ptr = strstr(st, "**")) != NULL) && (strstr(st, "\\**") != (ptr - 1)) && (strstr(st, "\\(**") != (ptr - 2))) { strlcpy(&(ptr[1]), &(ptr[2]), strlen(ptr)); + st = ptr; } - while (((ptr = strstr(pat, "??")) != NULL) && (strstr(pat, "\\??") != (ptr - 1))) { + st = pat; + while (((ptr = strstr(st, "??")) != NULL) && (strstr(st, "\\??") != (ptr - 1))) { strlcpy(&(ptr[1]), &(ptr[2]), strlen(ptr)); + st = ptr; } - while ((ptr = strstr(pat, "^*")) != NULL) { + st = pat; + while ((ptr = strstr(st, "^*")) != NULL) { strlcpy(&(ptr[1]), &(ptr[2]), strlen(ptr)); + st = ptr; } - while ((ptr = strstr(pat, "(*")) != NULL && (strstr(pat, "\\(*") != (ptr - 1))) { + st = pat; + while ((ptr = strstr(st, "(*")) != NULL && (strstr(st, "\\(*") != (ptr - 1))) { strlcpy(&(ptr[1]), &(ptr[2]), strlen(ptr)); + st = ptr; } // printf("PAT %s\n", pat); From owner-p4-projects@FreeBSD.ORG Fri Jun 20 18:33:37 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 771131065674; Fri, 20 Jun 2008 18:33:37 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 378CE1065671 for ; Fri, 20 Jun 2008 18:33:37 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3719B8FC19 for ; Fri, 20 Jun 2008 18:33:37 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5KIXa3F062707 for ; Fri, 20 Jun 2008 18:33:36 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5KIXaqH062705 for perforce@freebsd.org; Fri, 20 Jun 2008 18:33:36 GMT (envelope-from gabor@freebsd.org) Date: Fri, 20 Jun 2008 18:33:36 GMT Message-Id: <200806201833.m5KIXaqH062705@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 143830 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Jun 2008 18:33:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=143830 Change 143830 by gabor@gabor_server on 2008/06/20 18:32:37 - GNU compatibility: return 2 for unbalanced parentheses if -E is specified Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/grep.c#30 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/grep.c#30 (text+ko) ==== @@ -188,6 +188,7 @@ add_pattern(char *pat, size_t len) { char *ptr, *st; + int lbr, rbr; /* Workaround for our libc-regex library to match GNU behaviour. Our library rejects '|' with empty subexpressions. Just cut out @@ -237,6 +238,25 @@ strlcpy(&(ptr[1]), &(ptr[2]), strlen(ptr)); st = ptr; } + if (Eflag) { + st = pat; + lbr = 0; + while ((ptr = strstr(st, "(")) != NULL) { + if (strstr(st, "\\(") != (ptr - 1)) + lbr++; + st = &(ptr[1]); + } + st = pat; + rbr = 0; + while ((ptr = strstr(st, ")")) != NULL) { + if (strstr(st, "\\)") != (ptr - 1)) + rbr++; + st = &(ptr[1]); + } + if (lbr != rbr) { + errx(2, "parentheses not balanced"); + } + } // printf("PAT %s\n", pat); From owner-p4-projects@FreeBSD.ORG Fri Jun 20 18:34:38 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C16B2106567A; Fri, 20 Jun 2008 18:34:38 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6AC6E1065674 for ; Fri, 20 Jun 2008 18:34:38 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5FF228FC16 for ; Fri, 20 Jun 2008 18:34:38 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5KIYcSw062774 for ; Fri, 20 Jun 2008 18:34:38 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5KIYcMl062772 for perforce@freebsd.org; Fri, 20 Jun 2008 18:34:38 GMT (envelope-from trasz@freebsd.org) Date: Fri, 20 Jun 2008 18:34:38 GMT Message-Id: <200806201834.m5KIYcMl062772@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 143831 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Jun 2008 18:34:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=143831 Change 143831 by trasz@trasz_traszkan on 2008/06/20 18:33:52 Refactor acl_from_text(3) by breaking out part that is POSIX-specific. There should be no functional change. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_from_text.c#2 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_from_text.c#2 (text+ko) ==== @@ -109,6 +109,91 @@ } } +static int +_posix1e_acl_entry_from_text(acl_t aclp, char *entry) +{ + acl_tag_t t; + acl_perm_t p; + char *tag, *qualifier, *permission; + uid_t id; + int error; + + /* Split into three ':' delimited fields. */ + tag = strsep(&entry, ":"); + if (tag == NULL) { + errno = EINVAL; + return (-1); + } + tag = string_skip_whitespace(tag); + if ((*tag == '\0') && (!entry)) { + /* + * Is an entirely comment line, skip to next + * comma. + */ + return (0); + } + string_trim_trailing_whitespace(tag); + + qualifier = strsep(&entry, ":"); + if (qualifier == NULL) { + errno = EINVAL; + return (-1); + } + qualifier = string_skip_whitespace(qualifier); + string_trim_trailing_whitespace(qualifier); + + permission = strsep(&entry, ":"); + if (permission == NULL || entry) { + errno = EINVAL; + return (-1); + } + permission = string_skip_whitespace(permission); + string_trim_trailing_whitespace(permission); + + t = acl_string_to_tag(tag, qualifier); + if (t == -1) { + errno = EINVAL; + return (-1); + } + + error = _posix1e_acl_string_to_perm(permission, &p); + if (error == -1) { + errno = EINVAL; + return (-1); + } + + switch(t) { + case ACL_USER_OBJ: + case ACL_GROUP_OBJ: + case ACL_MASK: + case ACL_OTHER: + if (*qualifier != '\0') { + errno = EINVAL; + return (-1); + } + id = 0; + break; + + case ACL_USER: + case ACL_GROUP: + error = _posix1e_acl_name_to_id(t, qualifier, + &id); + if (error == -1) + return (-1); + break; + + default: + errno = EINVAL; + return (-1); + } + + error = _posix1e_acl_add_entry(aclp, t, id, p); + if (error == -1) + return (-1); + + return (0); +} + /* * acl_from_text -- Convert a string into an ACL. * Postpone most validity checking until the end and call acl_valid() to do @@ -117,13 +202,9 @@ acl_t acl_from_text(const char *buf_p) { - acl_tag_t t; - acl_perm_t p; acl_t acl; char *mybuf_p, *line, *cur, *notcomment, *comment, *entry; - char *tag, *qualifier, *permission; int error; - uid_t id; /* Local copy we can mess up. */ mybuf_p = strdup(buf_p); @@ -145,77 +226,8 @@ /* Inner loop: delimit at ',' boundaries. */ while ((entry = strsep(¬comment, ","))) { - /* Now split into three ':' delimited fields. */ - tag = strsep(&entry, ":"); - if (tag == NULL) { - errno = EINVAL; - goto error_label; - } - tag = string_skip_whitespace(tag); - if ((*tag == '\0') && (!entry)) { - /* - * Is an entirely comment line, skip to next - * comma. - */ - continue; - } - string_trim_trailing_whitespace(tag); - - qualifier = strsep(&entry, ":"); - if (qualifier == NULL) { - errno = EINVAL; - goto error_label; - } - qualifier = string_skip_whitespace(qualifier); - string_trim_trailing_whitespace(qualifier); - - permission = strsep(&entry, ":"); - if (permission == NULL || entry) { - errno = EINVAL; - goto error_label; - } - permission = string_skip_whitespace(permission); - string_trim_trailing_whitespace(permission); - - t = acl_string_to_tag(tag, qualifier); - if (t == -1) { - errno = EINVAL; - goto error_label; - } - - error = _posix1e_acl_string_to_perm(permission, &p); - if (error == -1) { - errno = EINVAL; - goto error_label; - } - - switch(t) { - case ACL_USER_OBJ: - case ACL_GROUP_OBJ: - case ACL_MASK: - case ACL_OTHER: - if (*qualifier != '\0') { - errno = EINVAL; - goto error_label; - } - id = 0; - break; - - case ACL_USER: - case ACL_GROUP: - error = _posix1e_acl_name_to_id(t, qualifier, - &id); - if (error == -1) - goto error_label; - break; - - default: - errno = EINVAL; - goto error_label; - } - - error = _posix1e_acl_add_entry(acl, t, id, p); - if (error == -1) + error = _posix1e_acl_entry_from_text(acl, entry); + if (error) goto error_label; } } From owner-p4-projects@FreeBSD.ORG Fri Jun 20 19:07:11 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 97A6E1065674; Fri, 20 Jun 2008 19:07:11 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4193E106566B for ; Fri, 20 Jun 2008 19:07:11 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 421DF8FC1E for ; Fri, 20 Jun 2008 19:07:11 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5KJ7AFP066554 for ; Fri, 20 Jun 2008 19:07:10 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5KJ7ATx066552 for perforce@freebsd.org; Fri, 20 Jun 2008 19:07:10 GMT (envelope-from gabor@freebsd.org) Date: Fri, 20 Jun 2008 19:07:10 GMT Message-Id: <200806201907.m5KJ7ATx066552@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 143832 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Jun 2008 19:07:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=143832 Change 143832 by gabor@gabor_server on 2008/06/20 19:06:44 - Add some commented out work-in-progress Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/grep.c#31 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/grep.c#31 (text+ko) ==== @@ -238,6 +238,11 @@ strlcpy(&(ptr[1]), &(ptr[2]), strlen(ptr)); st = ptr; } + st = pat; +/* XXX + while ((ptr = strstr(st, "{1")) != NULL && (strstr(st, "\\{1") != (ptr - 1))) { + st = ptr; + } */ if (Eflag) { st = pat; lbr = 0; @@ -258,7 +263,7 @@ } } -// printf("PAT %s\n", pat); +/// printf("PAT %s\n", pat); /* Work-around to allow * at the beginning of the regexp */ while (pat[0] == '*') From owner-p4-projects@FreeBSD.ORG Fri Jun 20 19:12:16 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D03871065676; Fri, 20 Jun 2008 19:12:16 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 921CE1065671 for ; Fri, 20 Jun 2008 19:12:16 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7E6A58FC25 for ; Fri, 20 Jun 2008 19:12:16 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5KJCGnM066970 for ; Fri, 20 Jun 2008 19:12:16 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5KJCGff066968 for perforce@freebsd.org; Fri, 20 Jun 2008 19:12:16 GMT (envelope-from gabor@freebsd.org) Date: Fri, 20 Jun 2008 19:12:16 GMT Message-Id: <200806201912.m5KJCGff066968@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 143833 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Jun 2008 19:12:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=143833 Change 143833 by gabor@gabor_server on 2008/06/20 19:11:20 - GNU compatibility: better --color codes Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/util.c#30 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/util.c#30 (text+ko) ==== @@ -244,13 +244,13 @@ strlcpy(matched, &(l->dat[pmatch.rm_so]), pmatch.rm_eo - pmatch.rm_so + 1); strlcpy(end, &(l->dat[pmatch.rm_eo]), strlen(l->dat) - pmatch.rm_eo + 1); - asprintf(&tmp, "%s\33[%sm\33[K%s\33[00m\33[K%s", begin, color, matched, end); + asprintf(&tmp, "%s\33[%sm\33[K%s\33[m\33[K%s", begin, color, matched, end); free(begin); free(matched); free(end); - l->len += strlen(color) + 14; + l->len += strlen(color) + 12; l->dat = tmp; } if (r == 0 && oflag && !nottext) { @@ -261,7 +261,7 @@ strlcpy(matched, &(l->dat[pmatch.rm_so]), pmatch.rm_eo - pmatch.rm_so + 1); if (color != NULL) - asprintf(&tmp, "\33[%sm%s\33[00m", color, matched); + asprintf(&tmp, "\33[%sm%s\33[m", color, matched); else tmp = matched; From owner-p4-projects@FreeBSD.ORG Fri Jun 20 23:33:53 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7A38D106567A; Fri, 20 Jun 2008 23:33:53 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 392CE106568E for ; Fri, 20 Jun 2008 23:33:53 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 19BA98FC15 for ; Fri, 20 Jun 2008 23:33:53 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5KNXq8W014424 for ; Fri, 20 Jun 2008 23:33:52 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5KNXqLT014422 for perforce@freebsd.org; Fri, 20 Jun 2008 23:33:52 GMT (envelope-from jb@freebsd.org) Date: Fri, 20 Jun 2008 23:33:52 GMT Message-Id: <200806202333.m5KNXqLT014422@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 143848 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Jun 2008 23:33:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=143848 Change 143848 by jb@freebsd3 on 2008/06/20 23:33:40 IFC Affected files ... .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/greek-language-support/article.sgml#5 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/share/tools/checkupdate/checkupdate.1#2 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/share/tools/checkupdate/checkupdate.py#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/committers-guide/article.sgml#20 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#83 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#47 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/version-guide/article.sgml#6 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/share/sgml/authors.ent#38 integrate .. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/articles/compiz-fusion/article.sgml#2 integrate .. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/articles/version-guide/article.sgml#4 integrate .. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/books/handbook/desktop/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/books/handbook/firewalls/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/books/handbook/mirrors/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/share/sgml/glossary/freebsd-glossary.sgml#3 integrate .. //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/desktop/chapter.sgml#4 integrate .. //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/firewalls/chapter.sgml#7 integrate .. //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/mirrors/chapter.sgml#5 integrate .. //depot/projects/dtrace/doc/mn_MN.UTF-8/share/sgml/glossary/freebsd-glossary.sgml#4 integrate .. //depot/projects/dtrace/doc/share/pgpkeys/amdmi3.key#1 branch .. //depot/projects/dtrace/doc/share/pgpkeys/pgpkeys-developers.sgml#39 integrate .. //depot/projects/dtrace/doc/share/pgpkeys/pgpkeys.ent#37 integrate .. //depot/projects/dtrace/doc/share/sgml/man-refs.ent#34 integrate .. //depot/projects/dtrace/ports/MOVED#96 integrate .. //depot/projects/dtrace/ports/Mk/bsd.gnustep.mk#15 integrate .. //depot/projects/dtrace/ports/Mk/bsd.sites.mk#33 integrate .. //depot/projects/dtrace/ports/Tools/scripts/addport#7 integrate .. //depot/projects/dtrace/ports/Tools/scripts/chkmodules.pl#4 delete .. //depot/projects/dtrace/ports/Tools/scripts/modulesupdate#3 delete .. //depot/projects/dtrace/ports/Tools/scripts/rmport#11 integrate .. //depot/projects/dtrace/ports/UPDATING#79 integrate .. //depot/projects/dtrace/src/Makefile#25 integrate .. //depot/projects/dtrace/src/Makefile.inc1#47 integrate .. //depot/projects/dtrace/src/contrib/cvs/src/classify.c#7 integrate .. //depot/projects/dtrace/src/etc/defaults/rc.conf#37 integrate .. //depot/projects/dtrace/src/etc/rc.d/quota#6 integrate .. //depot/projects/dtrace/src/etc/rc.subr#18 integrate .. //depot/projects/dtrace/src/gnu/lib/libstdc++/Makefile#7 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/Makefile#9 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/cpio/Makefile#5 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/gdb/kgdb/trgt_mips.c#2 integrate .. //depot/projects/dtrace/src/include/Makefile#17 integrate .. //depot/projects/dtrace/src/include/spawn.h#1 branch .. //depot/projects/dtrace/src/include/unistd.h#14 integrate .. //depot/projects/dtrace/src/kerberos5/tools/slc/Makefile#2 integrate .. //depot/projects/dtrace/src/lib/libc/gen/Makefile.inc#17 integrate .. //depot/projects/dtrace/src/lib/libc/gen/Symbol.map#8 integrate .. //depot/projects/dtrace/src/lib/libc/gen/exec.3#5 integrate .. //depot/projects/dtrace/src/lib/libc/gen/exec.c#5 integrate .. //depot/projects/dtrace/src/lib/libc/gen/posix_spawn.c#1 branch .. //depot/projects/dtrace/src/lib/libc/stdlib/Symbol.map#4 integrate .. //depot/projects/dtrace/src/lib/libc/stdlib/grantpt.c#7 integrate .. //depot/projects/dtrace/src/lib/libc/sys/accept.2#5 integrate .. //depot/projects/dtrace/src/lib/libc/sys/setgroups.2#5 integrate .. //depot/projects/dtrace/src/lib/msun/Makefile#15 integrate .. //depot/projects/dtrace/src/lib/msun/Symbol.map#13 integrate .. //depot/projects/dtrace/src/lib/msun/man/fmod.3#5 integrate .. //depot/projects/dtrace/src/lib/msun/src/e_fmodl.c#1 branch .. //depot/projects/dtrace/src/lib/msun/src/math.h#12 integrate .. //depot/projects/dtrace/src/sbin/geom/class/part/geom_part.c#7 integrate .. //depot/projects/dtrace/src/sbin/geom/class/part/gpart.8#4 integrate .. //depot/projects/dtrace/src/sbin/ggate/ggated/ggated.c#5 integrate .. //depot/projects/dtrace/src/sbin/ifconfig/ifconfig.8#19 integrate .. //depot/projects/dtrace/src/sbin/ifconfig/ifconfig.c#11 integrate .. //depot/projects/dtrace/src/share/man/man4/crypto.4#5 integrate .. //depot/projects/dtrace/src/share/man/man4/gre.4#5 integrate .. //depot/projects/dtrace/src/share/man/man4/ixgbe.4#2 integrate .. //depot/projects/dtrace/src/share/man/man4/ubsa.4#8 integrate .. //depot/projects/dtrace/src/share/man/man5/src.conf.5#16 integrate .. //depot/projects/dtrace/src/share/man/man9/zone.9#6 integrate .. //depot/projects/dtrace/src/share/misc/committers-ports.dot#6 integrate .. //depot/projects/dtrace/src/share/misc/committers-src.dot#11 integrate .. //depot/projects/dtrace/src/share/mk/bsd.own.mk#23 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/mem.c#5 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/minidump_machdep.c#6 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/pmap.c#47 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/trap.c#26 integrate .. //depot/projects/dtrace/src/sys/amd64/conf/GENERIC#42 integrate .. //depot/projects/dtrace/src/sys/amd64/include/pmc_mdep.h#5 integrate .. //depot/projects/dtrace/src/sys/amd64/include/stack.h#2 integrate .. //depot/projects/dtrace/src/sys/boot/i386/libi386/time.c#4 integrate .. //depot/projects/dtrace/src/sys/conf/NOTES#59 integrate .. //depot/projects/dtrace/src/sys/conf/files#97 integrate .. //depot/projects/dtrace/src/sys/ddb/db_ps.c#15 integrate .. //depot/projects/dtrace/src/sys/dev/agp/agp_i810.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/et/if_et.c#1 branch .. //depot/projects/dtrace/src/sys/dev/et/if_etreg.h#1 branch .. //depot/projects/dtrace/src/sys/dev/et/if_etvar.h#1 branch .. //depot/projects/dtrace/src/sys/dev/mii/miidevs#20 integrate .. //depot/projects/dtrace/src/sys/dev/mii/truephy.c#1 branch .. //depot/projects/dtrace/src/sys/dev/mii/truephyreg.h#1 branch .. //depot/projects/dtrace/src/sys/dev/smc/if_smc.c#3 integrate .. //depot/projects/dtrace/src/sys/fs/devfs/devfs_devs.c#11 integrate .. //depot/projects/dtrace/src/sys/fs/devfs/devfs_int.h#7 integrate .. //depot/projects/dtrace/src/sys/fs/devfs/devfs_vnops.c#23 integrate .. //depot/projects/dtrace/src/sys/geom/journal/g_journal.c#7 integrate .. //depot/projects/dtrace/src/sys/geom/part/g_part.c#9 integrate .. //depot/projects/dtrace/src/sys/geom/part/g_part.h#8 integrate .. //depot/projects/dtrace/src/sys/geom/part/g_part_if.m#3 integrate .. //depot/projects/dtrace/src/sys/geom/part/g_part_mbr.c#7 integrate .. //depot/projects/dtrace/src/sys/i386/conf/GENERIC#42 integrate .. //depot/projects/dtrace/src/sys/kern/kern_conf.c#16 integrate .. //depot/projects/dtrace/src/sys/kern/kern_dtrace.c#9 integrate .. //depot/projects/dtrace/src/sys/kern/kern_jail.c#15 integrate .. //depot/projects/dtrace/src/sys/kern/link_elf_obj.c#16 integrate .. //depot/projects/dtrace/src/sys/kern/subr_bus.c#16 integrate .. //depot/projects/dtrace/src/sys/kern/sysv_sem.c#10 integrate .. //depot/projects/dtrace/src/sys/modules/Makefile#50 integrate .. //depot/projects/dtrace/src/sys/modules/et/Makefile#1 branch .. //depot/projects/dtrace/src/sys/modules/mii/Makefile#9 integrate .. //depot/projects/dtrace/src/sys/net/if_gre.c#14 integrate .. //depot/projects/dtrace/src/sys/net/if_gre.h#7 integrate .. //depot/projects/dtrace/src/sys/netinet/tcp_syncache.c#20 integrate .. //depot/projects/dtrace/src/sys/pci/if_rl.c#12 integrate .. //depot/projects/dtrace/src/sys/pci/if_rlreg.h#15 integrate .. //depot/projects/dtrace/src/sys/pci/nfsmb.c#12 integrate .. //depot/projects/dtrace/src/sys/sys/bus.h#11 integrate .. //depot/projects/dtrace/src/sys/sys/conf.h#14 integrate .. //depot/projects/dtrace/src/sys/sys/jail.h#7 integrate .. //depot/projects/dtrace/src/sys/sys/param.h#56 integrate .. //depot/projects/dtrace/src/tools/build/options/WITHOUT_BSD_CPIO#1 branch .. //depot/projects/dtrace/src/tools/build/options/WITHOUT_GNU_GREP#1 branch .. //depot/projects/dtrace/src/tools/build/options/WITH_GNU_CPIO#1 branch .. //depot/projects/dtrace/src/usr.bin/Makefile#18 integrate .. //depot/projects/dtrace/src/usr.bin/calendar/calendars/calendar.freebsd#25 integrate .. //depot/projects/dtrace/src/usr.bin/cpio/Makefile#2 integrate .. //depot/projects/dtrace/src/usr.bin/fstat/fstat.c#9 integrate .. //depot/projects/dtrace/src/usr.bin/shar/shar.sh#5 integrate .. //depot/projects/dtrace/src/usr.bin/whereis/whereis.c#4 integrate .. //depot/projects/dtrace/src/usr.sbin/ndiscvt/inf.c#5 integrate .. //depot/projects/dtrace/src/usr.sbin/pkg_install/Makefile#10 integrate .. //depot/projects/dtrace/src/usr.sbin/pkg_install/add/main.c#11 integrate .. //depot/projects/dtrace/src/usr.sbin/pkg_install/add/perform.c#9 integrate .. //depot/projects/dtrace/src/usr.sbin/pkg_install/create/main.c#9 integrate .. //depot/projects/dtrace/src/usr.sbin/pkg_install/lib/file.c#4 integrate .. //depot/projects/dtrace/src/usr.sbin/pkg_install/lib/url.c#7 integrate .. //depot/projects/dtrace/www/en/cgi/query-pr-lib.pl#2 integrate .. //depot/projects/dtrace/www/en/community.xsl#3 integrate .. //depot/projects/dtrace/www/en/community/irc.sgml#4 integrate .. //depot/projects/dtrace/www/en/developers.sgml#37 integrate .. //depot/projects/dtrace/www/en/index.xsl#17 integrate .. //depot/projects/dtrace/www/en/projects/ideas/ideas.xml#22 integrate .. //depot/projects/dtrace/www/en/security/Makefile#5 integrate .. //depot/projects/dtrace/www/en/security/errata-rss.xsl#1 branch .. //depot/projects/dtrace/www/en/security/errata.rss#1 branch .. //depot/projects/dtrace/www/share/sgml/libcommon.xsl#12 integrate .. //depot/projects/dtrace/www/share/sgml/news.xml#52 integrate .. //depot/projects/dtrace/www/share/sgml/notices.xml#7 integrate Differences ... ==== //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/greek-language-support/article.sgml#5 (text+ko) ==== @@ -10,11 +10,12 @@ %articles.ent; + ]>
    - ÕðïóôÞñéîç ôçò ÅëëçíéêÞò Ãëþóóáò óôï FreeBSD + ÕðïóôÞñéîç ôçò ÅëëçíéêÞò Ãëþóóáò óôï &os; Íéêüëáïò @@ -31,7 +32,7 @@ Íéêüëáïò Êüêêáëçò - $FreeBSD: doc/el_GR.ISO8859-7/articles/greek-language-support/article.sgml,v 1.4 2008/05/29 00:01:31 keramida Exp $ + $FreeBSD: doc/el_GR.ISO8859-7/articles/greek-language-support/article.sgml,v 1.8 2008/06/20 00:49:00 keramida Exp $ &tm-attrib.freebsd; @@ -54,7 +55,7 @@ ãñÜøåé êáé íá äéáâÜóåé êáíåßò óùóôÜ ÅëëçíéêÜ ìå ôçí åðßóçìç êùäéêïðïßçóç &iso-greek;, ôüóï óå êáôÜóôáóç êïíóüëáò üóï êáé ìÝóá áðü ôï ãñáöéêü ðåñéâÜëëïí &xorg;. Áí êáé ïé ñõèìßóåéò ðïõ - áöïñïýí áðïêëåéóôéêÜ óôï FreeBSD åßíáé áõôÝò ôçò êïíóüëáò, åäþ èá + áöïñïýí áðïêëåéóôéêÜ óôï &os; åßíáé áõôÝò ôçò êïíóüëáò, åäþ èá áíáöåñèïýí êáé áõôÝò ðïõ áöïñïýí êáé ôá &xorg; áëëÜ êáé ôéò åðéìÝñïõò åöáñìïãÝò. @@ -112,7 +113,8 @@ - ÅëëçíéêÞ ãñáììáôïóåéñÜ êáé áíôéóôïé÷ßá ðëçêôñïëïãßïõ ãéá ôçí êïíóüëá + ÅëëçíéêÞ ãñáììáôïóåéñÜ êáé áíôéóôïé÷ßá ðëçêôñïëïãßïõ ãéá ôçí + êïíóüëá Ãéá íá ìðïñÝóïõìå íá äéáâÜóïõìå êáé íá ãñÜøïõìå ÅëëçíéêÜ ìå ôçí êùäéêïðïßçóç &iso-greek; óôçí êïíóüëá ôïõ &os; ÷ñåéáæüìáóôå @@ -159,9 +161,9 @@ Ñõèìßóåéò ãéá ôï êÝëõöïò ÷ñÞóôç Ìå ôéò ñõèìßóåéò ðïõ Ý÷ïõìå êÜíåé ùò ôþñá äåí Ý÷åé åíåñãïðïéçèåß - ðëÞñùò ç ÅëëçíéêÞ õðïóôÞñéîç. ÊÜèå ðñüãñáììá ðïõ ôñÝ÷åé óôï &os;, áêüìá êáé ôï - êÝëõöïò ÷ñÞóôç ðïõ ÷ñçóéìïðïéïýìå, åîáñôÜôáé áðü ôéò ôñÝ÷ïõóåò - ñõèìßóåéò locale, ãéá íá îÝñåé óå ôé ãëþóóá + ðëÞñùò ç ÅëëçíéêÞ õðïóôÞñéîç. ÊÜèå ðñüãñáììá ðïõ ôñÝ÷åé óôï &os;, + áêüìá êáé ôï êÝëõöïò ÷ñÞóôç ðïõ ÷ñçóéìïðïéïýìå, åîáñôÜôáé áðü ôéò + ôñÝ÷ïõóåò ñõèìßóåéò locale, ãéá íá îÝñåé óå ôé ãëþóóá äïõëåýïõìå. Ïé ðñïêáèïñéóìÝíåò ñõèìßóåéò locale õðïóôçñßæïõí ìüíï ôçí åéóáãùãÞ @@ -257,15 +259,15 @@ ÃåíéêÜ, õðÜñ÷ïõí ôïõëÜ÷éóôïí äýï äéáöïñåôéêÜ InputDevice ôìÞìáôá óå Ýíá óõíçèéóìÝíï áñ÷åßï /etc/x11/xorg.conf: - Ýíá ãéá ôï ðñïêáèïñéóìÝíï ðëçêôñïëüãéï êé Ýíá ãéá ôï ðñïêáèïñéóìÝíï ðïíôßêé. - Ðñïóï÷Þ íá êÜíåôå üðïéåò ôñïðïðïéÞóåéò Ý÷åôå êáôÜ íïõ óôï ôìÞìá ôï - ïðïßï áíáöÝñåé ôï ðëçêôñïëüãéï (áõôü óçìáßíåé + Ýíá ãéá ôï ðñïêáèïñéóìÝíï ðëçêôñïëüãéï êé Ýíá ãéá ôï ðñïêáèïñéóìÝíï + ðïíôßêé. Ðñïóï÷Þ íá êÜíåôå üðïéåò ôñïðïðïéÞóåéò Ý÷åôå êáôÜ íïõ óôï + ôìÞìá ôï ïðïßï áíáöÝñåé ôï ðëçêôñïëüãéï (áõôü óçìáßíåé ôï Identifier "Keyboard1" ðáñáðÜíù). Ìå ôéò ñõèìßóåéò ðïõ Ý÷ïõìå êÜíåé ùò ôþñá äåí Ý÷åé åíåñãïðïéçèåß - ðëÞñùò ç ÅëëçíéêÞ õðïóôÞñéîç. Óôï FreeBSD êÜèå ðñüãñáììá, áêüìá êáé ôï + ðëÞñùò ç ÅëëçíéêÞ õðïóôÞñéîç. Óôï &os; êÜèå ðñüãñáììá, áêüìá êáé ôï ðåñéâÜëëïí &xorg; ðïõ ÷ñçóéìïðïéïýìå, åîáñôÜôáé áðü ôéò ôñÝ÷ïõóåò ñõèìßóåéò locale, ãéá íá îÝñåé óå ôé ãëþóóá äïõëåýïõìå. @@ -282,6 +284,11 @@ export LC_CTYPE="el_GR.ISO8859-7" export LC_COLLATE="el_GR.ISO8859-7" + Ðñéí îåêéíÞóåôå íá ÷ñçóéìïðïéåßôå ôá ×, âåâáéùèåßôå åðßóçò üôé Ý÷åôå + ôéò óùóôÝò ñõèìßóåéò locale óôï êÝëõöïò óáò. ¸ôóé èá áðïöýãåôå ðéèáíÜ + ðñïâëÞìáôá áðåéêüíéóçò Åëëçíéêþí óå êÜðïéåò åöáñìïãÝò. Äåßôå ôçí åíüôçôá + Ñõèìßóåéò ãéá ôï êÝëõöïò ÷ñÞóôç. + Ìå áõôÝò ôéò ñõèìßóåéò, ôï ðåñéâÜëëïí &xorg; èá îåêéíÜ ìå ôï óùóôü process environment ãéá íá õðïóôçñßæåé ôçí ÅëëçíéêÞ ãëþóóá. @@ -312,13 +319,75 @@ + + ÅëëçíéêÝò ãñáììáôïóåéñÝò ãéá ôï ðåñéâÜëëïí &xorg; + + Ôï ðåñéâÜëëïí &xorg; Ýñ÷åôáé ìå Ýíá âáóéêü óýíïëï ãñáììáôïóåéñþí óå + ìïñöÞ bitmap. ÌåñéêÝò áðü áõôÝò Ý÷ïõí õðïóôÞñéîç + åëëçíéêþí, åßôå ãéá ôçí êùäéêïðïßçóç &iso-greek;, åßôå ãéá ôçí + êùäéêïðïßçóç &iso-ucs; (Universal Character Set). Ïé âáóéêÝò bitmap + ãñáììáôïóåéñÝò ðïõ äéáíÝìïíôáé ìå ôï &xorg; Ý÷ïõí óôï ôÝëïò áðü ôï üíïìÜ + ôïõò ôçí êùäéêïðïßçóç, ïðüôå ìðïñåßôå íá ôéò âñåßôå åýêïëá ìå ôï + åñãáëåßï &man.xlsfonts.1;. Ãéá íá äåßôå, ãéá ðáñÜäåéãìá, ðïéÝò âáóéêÝò + ãñáììáôïóåéñÝò õðïóôçñßæïõí ôçí êùäéêïðïßçóç &iso-greek; ìðïñåßôå íá + ÷ñçóéìïðïéÞóåôå ôçí åíôïëÞ: + + &prompt.user; xlsfonts | fgrep -i iso8859-7 + + Áíôßóôïé÷á, ãéá íá âñåßôå ðïéÝò ãñáììáôïóåéñÝò õðïóôçñßæïõí ôçí + êùäéêïðïßçóç &iso-ucs;, ïðüôå ìðïñïýí íá ÷ñçóéìïðïéçèïýí ãéá ôçí + áðåéêüíéóç êåéìÝíùí ìå êùäéêïðïßçóç UTF-8, ìðïñåßôå íá ÷ñçóéìïðïéÞóåôå + ôçí åíôïëÞ: + + &prompt.user; xlsfonts | fgrep -i iso10646 + + Áêüìç ðåñéóóüôåñåò ãñáììáôïóåéñÝò ìå õðïóôÞñéîç ãéá áðåéêüíéóç + Åëëçíéêþí ÷áñáêôÞñùí ìðïñåßôå íá âñåßôå óôç óõëëïãÞ ôùí Ports. Ç + êáôçãïñßá x11-fonts ðåñéÝ÷åé óõëëïãÝò ãñáììáôïóåéñþí + üðùò ïé ðáñáêÜôù: + + + + x11-fonts/bitstream-vera + + + + x11-fonts/dejavu + + + + x11-fonts/liberation-fonts-ttf + + + + x11-fonts/urwfonts-ttf + + + + x11-fonts/webfonts + + + + ¼ëåò áõôÝò ïé ãñáììáôïóåéñÝò åßíáé óå ìïñöÞ &truetype;. ¸ôóé äåí + Ý÷ïõí ôïõò ðåñéïñéóìïýò ìåãÝèïõò ðïõ Ý÷ïõí ïé âáóéêÝò, bitmap + ãñáììáôïóåéñÝò, êáé ìðïñïýí íá áðåéêïíßóïõí Åëëçíéêïýò ÷áñáêôÞñåò ó÷åäüí + óå ïðïéïäÞðïôå ìÝãåèïò, ìå áñêåôÜ éêáíïðïéçôéêÜ áðïôåëÝóìáôá. + + Áí ÷ñçóéìïðïéåßôå êÜðïéï áðü ôá äçìïöéëÞ ðåñéâÜëëïíôá åñãáóßáò ãéá + &xorg;, üðùò ôï GNOME Þ + ôï KDE, ïé &truetype; ãñáììáôïóåéñÝò áðü + áõôÝò ôéò óõëëïãÝò âåëôéþíïõí ðÜñá ðïëý ôçí ðïéüôçôá áðåéêüíéóçò óå üëåò + ôéò åöáñìïãÝò ôïõ ðåñéâÜëëïíôïò åñãáóßáò. Ïðüôå óßãïõñá áîßæåé ôïí êüðï + íá ôéò äïêéìÜóåôå. + + Ñõèìßóåéò ãéá ÅëëçíéêÜ óå äéÜöïñåò åöáñìïãÝò. Ãéá íá äéáâÜæïõìå êáé íá ãñÜöïõìå &iso-greek; ÅëëçíéêÜ ìå ôïí - åðåîåñãáóôÞ êåéìÝíïõ editors/emacs èá ðñÝðåé íá - ðñïóèÝóïõìå óôï .emacs ôïõ ëïãáñéáóìïý ìáò ôéò - åîÞò ñõèìßóåéò: + åðåîåñãáóôÞ êåéìÝíïõ editors/emacs + èá ðñÝðåé íá ðñïóèÝóïõìå óôï .emacs ôïõ + ëïãáñéáóìïý ìáò ôéò åîÞò ñõèìßóåéò: (setq unibyte-display-via-language-environment t) (if (< emacs-major-version 22) @@ -328,10 +397,10 @@ (nth 1 (current-input-mode)) 0) - Ãéá íá äéáâÜæïõìå êáé íá ãñÜöïõìå åëëçíéêÜ ìå ôïí åðåîåñãáóôÞ êåéìÝíïõ - editors/vim óå ãñáöéêü ðåñéâÜëëïí, - èá ðñÝðåé íá ðñïóèÝóïõìå óôï áñ÷åßï .vimrc ôïõ - ëïãáñéáóìïý ìáò ôéò åîÞò ñõèìßóåéò: + Ãéá íá äéáâÜæïõìå êáé íá ãñÜöïõìå åëëçíéêÜ ìå ôïí åðåîåñãáóôÞ + êåéìÝíïõ editors/vim óå ãñáöéêü + ðåñéâÜëëïí, èá ðñÝðåé íá ðñïóèÝóïõìå óôï áñ÷åßï + .vimrc ôïõ ëïãáñéáóìïý ìáò ôéò åîÞò ñõèìßóåéò: set gfs=fixedgr ==== //depot/projects/dtrace/doc/el_GR.ISO8859-7/share/tools/checkupdate/checkupdate.1#2 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: doc/el_GR.ISO8859-7/share/tools/checkupdate/checkupdate.1,v 1.2 2008/06/15 16:36:55 keramida Exp $ +.\" $FreeBSD: doc/el_GR.ISO8859-7/share/tools/checkupdate/checkupdate.1,v 1.3 2008/06/16 21:53:10 keramida Exp $ .\" .Dd June 15, 2008 .Dt CHECKUPDATE 1 @@ -32,7 +32,7 @@ .Nd "check a translation of the FreeBSD doc/ tree for source updates" .Sh SYNOPSIS .Nm -.Op Fl aenpqv +.Op Fl aenpqtv .Op Fl R Ar workspace .Sh DESCRIPTION The @@ -94,6 +94,17 @@ option should be used to point to the toplevel directory of the .Pa doc/ tree. +.It Fl t +Run in +.Dq tuple mode . +This option implies +.Fl e +too. +When the script runs in tuple mode it prints Python tuples with the file +information it collects for all the files, instead of parsing and +presenting the information in human readable format. +This may be a bit useful for post-processing the output of the script to +generate output in different ways. .It Fl v Bump verbosity level. The ==== //depot/projects/dtrace/doc/el_GR.ISO8859-7/share/tools/checkupdate/checkupdate.py#2 (text+ko) ==== @@ -25,7 +25,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: doc/el_GR.ISO8859-7/share/tools/checkupdate/checkupdate.py,v 1.4 2008/06/15 17:12:47 keramida Exp $ +# $FreeBSD: doc/el_GR.ISO8859-7/share/tools/checkupdate/checkupdate.py,v 1.5 2008/06/16 21:53:10 keramida Exp $ """ The translation helper utility `checkupdate'. @@ -72,6 +72,7 @@ root = "." # The default workspace directory. verbose = None # Run in `quiet' mode by default. everything = False # Report everything, i.e. all input files. +tuplemode = False # Use the standard output mode # -------------------- useful functions -------------------------------- @@ -349,19 +350,23 @@ debug(2, "Skipping directory `%s'" % fname) return None + retval = None info = fileinfo(fname) if info: - checkinfo(info) - - # XXX: Add `patchmode' handling here, to show the diffs of the original - # XXX: English text. - if patchmode: - message("Patch preview mode not implemented for `%s'" % fname) - return fname + r = fname + if tuplemode: + print info + else: + checkinfo(info) + if patchmode: + # XXX: Add `patchmode' handling here, to show the diffs of the + # XXX: original English text. + message("Patch preview mode not implemented for `%s'" % fname) + return retval def usage(): """Print a usage message, and exit.""" - print "usage: %s [-aenpqv] [-R workspace]" % progname + print "usage: %s [-aenpqtv] [-R workspace]" % progname exit(1) # -------------------- main script body -------------------------------- @@ -369,7 +374,7 @@ if __name__ == "__main__": debug(3, "Parsing script options") try: - opts, args = getopt.getopt(sys.argv[1:], 'aenpqR:v') + opts, args = getopt.getopt(sys.argv[1:], 'aenpqtR:v') except getopt.GetoptError, err: usage() @@ -395,6 +400,9 @@ debug(3, "Switching to workspace at `%s'" % v) if not setroot(v): error(1, "Directory `%s' does not exist" % v) + elif o == '-t': + debug(3, "Output formatted as tuples") + tuplemode = True elif o == '-v': verbose = verbose and (verbose + 1) or 1 debug(1, "Bumping verbosity level to %d" % verbose) ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/committers-guide/article.sgml#20 (text+ko) ==== @@ -13,7 +13,7 @@ - $FreeBSD: doc/en_US.ISO8859-1/articles/committers-guide/article.sgml,v 1.274 2008/05/11 19:24:40 pav Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/committers-guide/article.sgml,v 1.275 2008/06/20 00:28:50 erwin Exp $ 1999 @@ -2517,8 +2517,7 @@ freefall. It will add a port from the directory you specify, determining the category automatically from the port Makefile. - It will also add an entry to the - CVSROOT/modules file and the port's + It will also add an entry to the port's category Makefile. It was written by &a.mharo; and &a.will;, and is currently maintained by &a.garga;, so please send questions/patches about @@ -2615,11 +2614,6 @@ - Remove the module entry in - CVSROOT/modules. - - - Add an entry to ports/MOVED. @@ -2741,11 +2735,6 @@ - Add the new module entry to - CVSROOT/modules. - - - Add an entry to ports/MOVED, if you remove the original port. @@ -3021,23 +3010,6 @@ - Add the following module entry to - CVSROOT-ports/modules: - ports_categoryname   categoryname - - - The whitespace should be a tab. - - If the categoryname - contains a dash, convert that to an underscore first. - - - - Change all the affected port module entries in - CVSROOT-ports/modules. - - - Add appropriate entries to ports/MOVED. ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#83 (text+ko) ==== @@ -1,4 +1,4 @@ - + + %articles.ent; aaron@FreeBSD.org"> @@ -52,6 +52,8 @@ ambrisko@FreeBSD.org"> +amdmi3@FreeBSD.org"> + amorita@FreeBSD.org"> amurai@FreeBSD.org"> @@ -310,6 +312,8 @@ emoore@FreeBSD.org"> +eri@FreeBSD.org"> + eric@FreeBSD.org"> erich@FreeBSD.org"> ==== //depot/projects/dtrace/doc/hu_HU.ISO8859-2/articles/compiz-fusion/article.sgml#2 (text+ko) ==== @@ -1,4 +1,4 @@ - + + Original Revision: 1.6 --> @@ -26,16 +26,16 @@ Manolis Kiagias -
    sonicy@otenet.gr
    +
    manolis@FreeBSD.org
     2008 - Manolis Kiagias + Manolis Kiagias - $FreeBSD: doc/hu_HU.ISO8859-2/articles/compiz-fusion/article.sgml,v 1.1 2008/05/28 17:19:18 pgj Exp $ + $FreeBSD: doc/hu_HU.ISO8859-2/articles/compiz-fusion/article.sgml,v 1.2 2008/06/17 20:56:39 pgj Exp $ &tm-attrib.freebsd; @@ -159,8 +159,9 @@ A GeForce 2MX/3/4 sorozatú nVidia - kártyákat a meghajtó 96XX sorozata - támogatja, amely a XX sorozata támogatja, + amely a x11/nvidia-driver-96xx porton keresztül érhetõ el. @@ -366,11 +367,11 @@ &prompt.root; nvidia-xconfig --composite &prompt.root; nvidia-xconfig --depth=24 - A nvidia-xonfig -A | more parancs - kiadásával a program által - felkínált további - lehetõségeket is - lekérdezhetjük. + Az nvidia-xconfig -A | more parancs + kiadásával a program által + felkínált további + lehetõségeket is + lekérdezhetjük. ==== //depot/projects/dtrace/doc/hu_HU.ISO8859-2/articles/version-guide/article.sgml#4 (text+ko) ==== @@ -8,7 +8,7 @@ + Original Revision: 1.12 -->
    Válasszuk ki a nekünk igazán megfelelõ &os; @@ -21,7 +21,7 @@ </author> </authorgroup> - <pubdate>$FreeBSD: doc/hu_HU.ISO8859-2/articles/version-guide/article.sgml,v 1.5 2008/05/21 04:14:49 pgj Exp $</pubdate> + <pubdate>$FreeBSD: doc/hu_HU.ISO8859-2/articles/version-guide/article.sgml,v 1.6 2008/06/17 20:56:39 pgj Exp $</pubdate> <legalnotice id="trademarks" role="trademarks"> &tm-attrib.freebsd; @@ -396,7 +396,8 @@ <variablelist> <varlistentry> <term> - <ulink url="&url.base;/releng/index.html#schedule"></ulink> + <ulink + url="&url.base;/releng/index.html#schedule">&url.base;/releng/index.html#schedule</ulink> </term> <listitem> <para>The Release Engineering Schedule</para> @@ -405,7 +406,8 @@ <varlistentry> <term> - <ulink url="&url.base;/security/security.html#supported-branches"></ulink> + <ulink + url="&url.base;/security/security.html#supported-branches">&url.base;/security/security.html#supported-branches</ulink> </term> <listitem> <para>The Security Branch Schedule</para> ==== //depot/projects/dtrace/doc/hu_HU.ISO8859-2/books/handbook/desktop/chapter.sgml#2 (text+ko) ==== @@ -1,11 +1,11 @@ <!-- The FreeBSD Documentation Project - $FreeBSD: doc/hu_HU.ISO8859-2/books/handbook/desktop/chapter.sgml,v 1.1 2008/05/14 16:54:15 pgj Exp $ + $FreeBSD: doc/hu_HU.ISO8859-2/books/handbook/desktop/chapter.sgml,v 1.2 2008/06/17 20:56:39 pgj Exp $ --> <!-- The FreeBSD Hungarian Documentation Project Translated by: PALI, Gabor <pgj@FreeBSD.org> - Original Revision: 1.75 --> + Original Revision: 1.76 --> <chapter id="desktop" lang="hu"> <chapterinfo> @@ -394,50 +394,27 @@ &realplayer; pluginjait is használhatóvá teszi.</para> - <para>Telepítsük fel a <filename - role="package">www/linuxpluginwrapper</filename> portot. A port + <para>Telepítsük a <filename + role="package">www/nspluginwrapper</filename> portot. A port telepítése viszont maga után vonja a <filename role="package">emulators/linux_base</filename> - telepítését is, ami viszont egy nagyobb - port. Igyekezzünk minél pontosabban követni a - port telepítése során megjelenõ - utasításokat és minél jobban - beállítani a <filename>/etc/libmap.conf</filename> - állományt! Ehhez segítséget a - <filename>/usr/local/share/examples/linuxpluginwrapper/</filename> - könyvtárban találhatunk.</para> + telepítését is, amely viszont egy nagyobb + port.</para> <para>A következõ lépésben telepítsük a <filename role="package">www/linux-flashplugin7</filename> portot. - Miután felkerült a plugin, indítsuk el a - böngészõt és írjuk be az - <literal>about:plugins</literal> sort a címsorba, majd - nyomjuk le az <keycap>Enter</keycap> billentyût. Az eddig - telepített pluginok felsorolása fog - megjelenni.</para> + Miután felkerült, a hozzátartozó + plugint minden felhasználónak külön + telepítenie kell az <command>nspluginwrapper</command> + parancs kiadásával:</para> - <para>Ha nem szerepel közte a &flash; plugin, akkor annak az - oka (legalább is az esetek - többségében) egy hiányzó - szimbolikus link. A pótlásához - <username>root</username> felhasználóként - adjuk ki a következõ parancsokat:</para> + <screen>&prompt.user; <userinput>nspluginwrapper -v -a -i</userinput></screen> - <screen>&prompt.root; <userinput>ln -s /usr/local/lib/npapi/linux-flashplugin/libflashplayer.so \ - /usr/local/lib/browser_plugins/</userinput> -&prompt.root; <userinput>ln -s /usr/local/lib/npapi/linux-flashplugin/flashplayer.xpt \ - /usr/local/lib/browser_plugins/</userinput></screen> - - <para>Ha most újraindítjuk a - böngészõt, a pluginnak meg kell jelennie az - elõbb említett listában.</para> - - <note> - <para>A <application>linuxpluginwrapper</application> csak az - &i386; architektúrán mûködik.</para> - </note> - + <para>Ezután indítsuk el a böngészõt, majd gépeljük be a + <literal>about:plugins</literal> szöveget a címsorba és nyomjuk + le az <keycap>Enter</keycap> billentyût. Ekkor a jelenleg + elérhetõ pluginok listájának kell megjelennie.</para> </sect2> <sect2> ==== //depot/projects/dtrace/doc/hu_HU.ISO8859-2/books/handbook/firewalls/chapter.sgml#3 (text+ko) ==== @@ -1,12 +1,12 @@ <!-- The FreeBSD Documentation Project - $FreeBSD: doc/hu_HU.ISO8859-2/books/handbook/firewalls/chapter.sgml,v 1.2 2008/06/04 19:49:07 pgj Exp $ + $FreeBSD: doc/hu_HU.ISO8859-2/books/handbook/firewalls/chapter.sgml,v 1.3 2008/06/17 20:56:39 pgj Exp $ --> <!-- The FreeBSD Hungarian Documentation Project Translated by: PALI, Gabor <pgj@FreeBSD.org> - Original Revision: 1.82 --> + Original Revision: 1.83 --> <chapter id="firewalls" lang="hu"> <chapterinfo> @@ -243,6 +243,17 @@ </sect1> <sect1 id="firewalls-pf"> + <sect1info> + <authorgroup> + <author> + <firstname>John</firstname> + <surname>Ferrell</surname> + <contrib>Átnézte és + aktualizálta:</contrib> + </author> + </authorgroup> + </sect1info> + <title>Az OpenBSD csomagszûrõje (PF) és az <acronym>ALTQ</acronym> @@ -266,76 +277,80 @@ teszi a sávszélesség korlátozását a szolgáltatás minõsége (Quality of Service, QoS) - alapján, aminek köszönhetõen a - különbözõ szolgáltatások a - szûrési szabályok mentén - garantált sávszélességhez juthatnak. - Az OpenBSD Projekt kiváló munkát végez - a PF felhasználói útmutatójának - karbantartásával, amely így most nem lesz - része a kézikönyvnek, hiszen ez csak az - erõforrások kétszerezése lenne. + alapján. + + Az OpenBSD Projekt kiváló munkát + végez a PF felhasználói + útmutatójának + karbantartásával. A kézikönyv ezen + szakasza ezért elsõsorban azzal foglalkozik, hogyan + kell a PF-et &os; alatt használni, + miközben igyekszik egy általános + összefoglalást adni a témáról. A + részletesebb információkkal kapcsolatban + azonban feltétlenül nézzük meg a + felhasználói útmutatót. A - címen olvashatunk többet arról (angolul), hogy a - PF-et hogyan használjunk &os;-n. + címen olvashatunk többet arról (angolul), hogy + a PF-et hogyan használjunk + &os;-n. - A PF engedélyezése + A PF rendszermagmodul használata - A PF a &os; 5.3 verziója utáni - kiadásokban az alaprendszer része, amelyet a - rendszer mûködése közben egy - külön modul betöltésével - aktiválhatunk. Ha az rc.conf + A &os; 5.3 megjelenése óta a + PF az alaprendszer része mint + futás közben betölthetõ rendszermagmodul. + A rendszer induláskor tehát képes + automatikusan betölteni, ha az &man.rc.conf.5; állományban megadjuk a - pf_enable="YES" sort, akkor a rendszer - magától be is tölti a PF-hez tartozó - rendszermag modult. Ez a betölthetõ modul - egyébként még a &man.pflog.4; - felületen keresztüli naplózást is - engedélyezi. + pf_enable="YES" sort. A + PF modul azonban csak akkor fog + mûködésbe lépni, ha talál + hozzátartozó szabályrendszert, amely + alapértelmezés szerint az + /etc/pf.conf állományban + található. Amennyiben a PF + szabályrendszere a mi esetünkben máshol + található, akkor az rc.conf + állományban ne felejtsük megadni a + pf_rules="/elérési/útvonal/pf.szabályok" + sor használatával. - A modul feltételezi az options - INET és a device bpf sorok - jelenlétét. Hacsak nem adtuk meg - &os; 6.0-RELEASE elõtti verziókban a - NOINET6, illetve az utána - következõ verziókban a - NO_INET6 beállítást - (például a &man.make.conf.5; - állományban) a rendszer - fordítására vonatkozóan, akkor az - options INET6 - beállításra is szükség - lesz. + A &os; 7.0 kiadással a minta + pf.conf állomány az + /etc + könyvtárból átkerült a + /usr/share/examples/pf + könyvtárba. A &os; 7.0 elõtti + kiadásokban alapértelmezés szerint + található egy pf.conf + állomány az /etc + könyvtárban. - Ahogy betöltõdött a modul, vagy ha már - eleve a rendszermagba építettük a PF - támogatását, a - pf használatát a >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Jun 21 00:33:54 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2BF2A1065678; Sat, 21 Jun 2008 00:33:54 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E20351065677 for ; Sat, 21 Jun 2008 00:33:53 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B9FDE8FC0C for ; Sat, 21 Jun 2008 00:33:53 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5L0Xr81020836 for ; Sat, 21 Jun 2008 00:33:53 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5L0Xr5k020834 for perforce@freebsd.org; Sat, 21 Jun 2008 00:33:53 GMT (envelope-from gabor@freebsd.org) Date: Sat, 21 Jun 2008 00:33:53 GMT Message-Id: <200806210033.m5L0Xr5k020834@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 143851 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 21 Jun 2008 00:33:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=143851 Change 143851 by gabor@gabor_server on 2008/06/21 00:33:00 - GNU compatibility: better -d behaviour Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/grep.c#32 edit .. //depot/projects/soc2008/gabor_textproc/grep/grep.h#17 edit .. //depot/projects/soc2008/gabor_textproc/grep/util.c#31 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/grep.c#32 (text+ko) ==== @@ -80,6 +80,7 @@ int Zflag; /* -Z: grep in gzipped file */ int bflag; /* -b: show block numbers for each match */ int cflag; /* -c: only show a count of matching lines */ +int dflag; /* -d: skip reading of directories */ int hflag; /* -h: don't print filename headers */ int iflag; /* -i: ignore case */ int lflag; /* -l: only show names of files with matches */ @@ -422,7 +423,10 @@ if (strcmp("recurse", optarg) == 0) { Hflag++; Rflag++; - } + } else if (strcmp("skip", optarg) == 0) + dflag++; + else if (strcmp("read", optarg) != 0) + usage(); break; case 'E': Fflag = Gflag = 0; ==== //depot/projects/soc2008/gabor_textproc/grep/grep.h#17 (text+ko) ==== @@ -62,7 +62,7 @@ /* Command line flags */ extern int Aflag, Bflag, Dflag, Eflag, Fflag, Gflag, Hflag, Jflag, Lflag, Oflag, Pflag, Rflag, Zflag, - bflag, cflag, hflag, iflag, lflag, mflag, nflag, oflag, + bflag, cflag, dflag, hflag, iflag, lflag, mflag, nflag, oflag, qflag, sflag, vflag, wflag, xflag, nullflag; extern long long mcount; extern char *color, *label; ==== //depot/projects/soc2008/gabor_textproc/grep/util.c#31 (text+ko) ==== @@ -90,7 +90,7 @@ case FTS_DP: break; default: - if (Dflag || Rflag) { + if (Dflag || Rflag || dflag) { struct stat *finfo; if (!(finfo = malloc(sizeof(struct stat)))) @@ -105,7 +105,7 @@ free(finfo); break; } - if (Rflag && S_ISDIR(finfo->st_mode)) { + if ((Rflag || dflag) && S_ISDIR(finfo->st_mode)) { free(finfo); break; } From owner-p4-projects@FreeBSD.ORG Sat Jun 21 01:00:21 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0EE671065673; Sat, 21 Jun 2008 01:00:21 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C49781065685 for ; Sat, 21 Jun 2008 01:00:20 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 95E048FC14 for ; Sat, 21 Jun 2008 01:00:20 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5L10Kdm032232 for ; Sat, 21 Jun 2008 01:00:20 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5L10KnG032230 for perforce@freebsd.org; Sat, 21 Jun 2008 01:00:20 GMT (envelope-from julian@freebsd.org) Date: Sat, 21 Jun 2008 01:00:20 GMT Message-Id: <200806210100.m5L10KnG032230@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 143852 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 21 Jun 2008 01:00:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=143852 Change 143852 by julian@julian_trafmon1 on 2008/06/21 01:00:06 Add more so that the remaining diff is reduced Affected files ... .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/dump_machdep.c#5 edit .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/minidump_machdep.c#5 edit .. //depot/projects/vimage-commit2/src/sys/arm/arm/dump_machdep.c#5 edit .. //depot/projects/vimage-commit2/src/sys/arm/arm/genassym.c#3 edit .. //depot/projects/vimage-commit2/src/sys/compat/linprocfs/linprocfs.c#3 edit .. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_ioctl.c#3 edit .. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_misc.c#3 edit .. //depot/projects/vimage-commit2/src/sys/compat/svr4/svr4_sockio.c#3 edit .. //depot/projects/vimage-commit2/src/sys/conf/options#2 edit .. //depot/projects/vimage-commit2/src/sys/contrib/altq/altq/altq_subr.c#3 edit .. //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/fil.c#3 edit .. //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_auth.c#3 edit .. //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#4 edit .. //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_frag.c#3 edit .. //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_log.c#3 edit .. //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_nat.c#3 edit .. //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_proxy.c#3 edit .. //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_state.c#3 edit .. //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_sync.c#3 edit .. //depot/projects/vimage-commit2/src/sys/dev/firewire/firewire.c#2 edit .. //depot/projects/vimage-commit2/src/sys/fs/cd9660/cd9660_rrip.c#3 edit .. //depot/projects/vimage-commit2/src/sys/i386/conf/NOTES#3 edit .. //depot/projects/vimage-commit2/src/sys/i386/i386/dump_machdep.c#5 edit .. //depot/projects/vimage-commit2/src/sys/i386/i386/minidump_machdep.c#5 edit .. //depot/projects/vimage-commit2/src/sys/ia64/ia64/dump_machdep.c#5 edit .. //depot/projects/vimage-commit2/src/sys/kern/kern_jail.c#3 edit .. //depot/projects/vimage-commit2/src/sys/kern/kern_mib.c#3 edit .. //depot/projects/vimage-commit2/src/sys/kern/kern_uuid.c#3 edit .. //depot/projects/vimage-commit2/src/sys/kern/kern_xxx.c#3 edit .. //depot/projects/vimage-commit2/src/sys/net/if.c#3 edit .. //depot/projects/vimage-commit2/src/sys/net/if_faith.c#3 edit .. //depot/projects/vimage-commit2/src/sys/net/if_gif.c#3 edit .. //depot/projects/vimage-commit2/src/sys/net/if_gre.c#3 edit .. //depot/projects/vimage-commit2/src/sys/net/if_loop.c#3 edit .. //depot/projects/vimage-commit2/src/sys/net/if_mib.c#3 edit .. //depot/projects/vimage-commit2/src/sys/net/if_var.h#3 edit .. //depot/projects/vimage-commit2/src/sys/net/if_vlan.c#3 edit .. //depot/projects/vimage-commit2/src/sys/net/raw_cb.c#3 edit .. //depot/projects/vimage-commit2/src/sys/net/raw_usrreq.c#3 edit .. //depot/projects/vimage-commit2/src/sys/net/route.c#3 edit .. //depot/projects/vimage-commit2/src/sys/net/rtsock.c#3 edit .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211.c#2 edit .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_base.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_eiface.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_ether.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_iface.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet/if_ether.c#4 edit .. //depot/projects/vimage-commit2/src/sys/netinet/igmp.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet/in.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet/in_gif.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet/in_mcast.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet/in_pcb.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet/in_rmx.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet/ip_carp.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet/ip_fastfwd.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw2.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw_nat.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw_pfil.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet/ip_icmp.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet/ip_input.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet/ip_ipsec.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet/ip_mroute.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet/ip_options.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet/ip_output.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet/raw_ip.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_hostcache.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_input.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_output.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_reass.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_sack.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_subr.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_syncache.c#4 edit .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_timer.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_timewait.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_usrreq.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet/udp_usrreq.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/dest6.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/frag6.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/icmp6.c#4 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/in6.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_gif.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_ifattach.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_pcb.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_proto.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_rmx.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_src.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_forward.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_input.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_ipsec.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_mroute.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_output.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/mld6.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/nd6.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/nd6_nbr.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/nd6_rtr.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/raw_ip6.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/route6.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/scope6.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/sctp6_usrreq.c#6 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/udp6_usrreq.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netipsec/ipsec.c#4 edit .. //depot/projects/vimage-commit2/src/sys/netipsec/ipsec_input.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netipsec/ipsec_mbuf.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netipsec/ipsec_output.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netipsec/keysock.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netipsec/xform_ah.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netipsec/xform_esp.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netipsec/xform_ipcomp.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netipsec/xform_ipip.c#3 edit .. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_vnops.c#3 edit .. //depot/projects/vimage-commit2/src/sys/nlm/nlm_prot_impl.c#4 edit .. //depot/projects/vimage-commit2/src/sys/rpc/authunix_prot.c#3 edit .. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/dump_machdep.c#5 edit .. //depot/projects/vimage-commit2/src/sys/sun4v/sun4v/dump_machdep.c#5 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/dump_machdep.c#5 (text+ko) ==== @@ -27,6 +27,8 @@ #include __FBSDID("$FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.14 2008/02/15 06:26:25 scottl Exp $"); +#include "opt_vimage.h" + #include #include #include ==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/minidump_machdep.c#5 (text) ==== @@ -27,6 +27,8 @@ #include __FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.4 2008/02/15 06:26:25 scottl Exp $"); +#include "opt_vimage.h" + #include #include #include ==== //depot/projects/vimage-commit2/src/sys/arm/arm/dump_machdep.c#5 (text+ko) ==== @@ -27,6 +27,8 @@ #include __FBSDID("$FreeBSD: src/sys/arm/arm/dump_machdep.c,v 1.3 2008/01/28 19:04:06 ru Exp $"); +#include "opt_vimage.h" + #include #include #include ==== //depot/projects/vimage-commit2/src/sys/arm/arm/genassym.c#3 (text+ko) ==== @@ -32,7 +32,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/vimage-commit2/src/sys/compat/linprocfs/linprocfs.c#3 (text+ko) ==== @@ -39,6 +39,9 @@ * @(#)procfs_status.c 8.4 (Berkeley) 6/15/94 */ +#include "opt_compat.h" +#include "opt_vimage.h" + #include __FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.119 2008/03/31 12:01:18 kib Exp $"); @@ -89,7 +92,6 @@ #include #endif /* __i386__ || __amd64__ */ -#include "opt_compat.h" #ifdef COMPAT_LINUX32 /* XXX */ #include #else ==== //depot/projects/vimage-commit2/src/sys/compat/linux/linux_ioctl.c#3 (text+ko) ==== @@ -29,6 +29,9 @@ #include __FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.139 2007/11/07 16:42:52 kib Exp $"); +#include "opt_vimage.h" +#include "opt_compat.h" + #include #include #include @@ -57,12 +60,11 @@ #include #include #include + #include #include #include -#include "opt_compat.h" - #ifdef COMPAT_LINUX32 #include #include ==== //depot/projects/vimage-commit2/src/sys/compat/linux/linux_misc.c#3 (text+ko) ==== @@ -32,6 +32,7 @@ #include "opt_compat.h" #include "opt_mac.h" +#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit2/src/sys/compat/svr4/svr4_sockio.c#3 (text+ko) ==== @@ -29,6 +29,8 @@ #include __FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_sockio.c,v 1.18 2006/08/04 21:15:09 brooks Exp $"); +#include "opt_vimage.h" + #include #include #include ==== //depot/projects/vimage-commit2/src/sys/conf/options#2 (text+ko) ==== @@ -765,3 +765,6 @@ #Disable code to dispatch tcp offloading TCP_OFFLOAD_DISABLE opt_inet.h + +# Virtualize the network stack +VIMAGE opt_vimage.h ==== //depot/projects/vimage-commit2/src/sys/contrib/altq/altq/altq_subr.c#3 (text+ko) ==== @@ -32,6 +32,7 @@ #if (__FreeBSD__ != 2) #include "opt_inet.h" #ifdef __FreeBSD__ +#include "opt_vimage.h" #include "opt_inet6.h" #endif #endif ==== //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/fil.c#3 (text+ko) ==== @@ -15,7 +15,6 @@ #include #include #include -#include #if defined(__NetBSD__) # if (NetBSD >= 199905) && !defined(IPFILTER_LKM) && defined(_KERNEL) # if (__NetBSD_Version__ < 301000000) @@ -29,7 +28,9 @@ (__FreeBSD_version >= 220000) # if (__FreeBSD_version >= 400000) # if !defined(IPFILTER_LKM) +# include "opt_vimage.h" # include "opt_inet6.h" +# include # endif # if (__FreeBSD_version == 400019) # define CSUM_DELAY_DATA ==== //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_auth.c#3 (text+ko) ==== @@ -16,7 +16,6 @@ #include #include #include -#include #if !defined(_KERNEL) # include # include @@ -55,7 +54,9 @@ #endif #if (defined(_BSDI_VERSION) && _BSDI_VERSION >= 199802) || \ (defined(__FreeBSD_version) &&(__FreeBSD_version >= 400000)) +# include "opt_vimage.h" # include +# include #endif #if defined(__NetBSD__) || defined(__OpenBSD__) || defined(bsdi) # include ==== //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#4 (text+ko) ==== @@ -19,11 +19,16 @@ #if defined(__FreeBSD_version) && (__FreeBSD_version >= 400000) && \ !defined(KLD_MODULE) && !defined(IPFILTER_LKM) # include "opt_inet6.h" +# include "opt_vimage.h" #endif #if defined(__FreeBSD_version) && (__FreeBSD_version >= 440000) && \ !defined(KLD_MODULE) && !defined(IPFILTER_LKM) # include "opt_random_ip_id.h" #endif +#if defined(__FreeBSD_version) && (__FreeBSD_version >= 800000) && \ + !defined(KLD_MODULE) && !defined(IPFILTER_LKM) +# include "opt_vimage.h" +#endif #include #if defined(__FreeBSD__) && !defined(__FreeBSD_version) # if defined(IPFILTER_LKM) @@ -39,13 +44,6 @@ #include #include #include -#if __FreeBSD_version > 800000 -# include -#else -# define V_ipforwarding ipforwarding -# define V_path_mtu_discovery path_mtu_discovery -# define V_ip_defttl ip_defttl -#endif #if __FreeBSD_version >= 220000 # include # include @@ -69,6 +67,12 @@ #else # include #endif +#if __FreeBSD_version >= 800000 +# include +#else +#define V_path_mtu_discovery path_mtu_discovery +#define V_ipforwarding ipforwarding +#endif #include #if __FreeBSD_version >= 300000 ==== //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_frag.c#3 (text+ko) ==== @@ -16,7 +16,6 @@ #include #include #include -#include #ifdef __hpux # include #endif @@ -87,6 +86,10 @@ # ifndef IPFILTER_LKM # include # include +# if (__FreeBSD_version > 800000) +# include "opt_vimage.h" +# include +# endif # endif extern struct callout_handle fr_slowtimer_ch; # endif ==== //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_log.c#3 (text+ko) ==== @@ -38,7 +38,6 @@ #include #include #include -#include #ifndef _KERNEL # include # include ==== //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_nat.c#3 (text+ko) ==== @@ -16,7 +16,6 @@ #include #include #include -#include #if defined(_KERNEL) && defined(__NetBSD_Version__) && \ (__NetBSD_Version__ >= 399002000) # include ==== //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_proxy.c#3 (text+ko) ==== @@ -16,7 +16,6 @@ #include #include #include -#include #if !defined(AIX) # include #endif @@ -50,6 +49,10 @@ #if defined(_KERNEL) && (__FreeBSD_version >= 220000) # include # include +# if (__FreeBSD_version > 800000) +# include "opt_vimage.h" +# include +# endif # if (__FreeBSD_version >= 300000) && !defined(IPFILTER_LKM) # include "opt_ipfilter.h" # endif ==== //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_state.c#3 (text+ko) ==== @@ -15,7 +15,6 @@ #include #include #include -#include #if defined(__NetBSD__) && (NetBSD >= 199905) && !defined(IPFILTER_LKM) && \ defined(_KERNEL) # if (__NetBSD_Version__ < 399001400) @@ -45,6 +44,10 @@ # if (__FreeBSD_version >= 300000) && !defined(IPFILTER_LKM) # include "opt_ipfilter.h" # endif +# if (__FreeBSD_version > 800000) +# include "opt_vimage.h" +# include +# endif #else # include #endif ==== //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_sync.c#3 (text+ko) ==== @@ -15,7 +15,6 @@ #include #include #include -#include #if !defined(_KERNEL) && !defined(__KERNEL__) # include # include @@ -43,6 +42,10 @@ # if (__FreeBSD_version >= 300000) && !defined(IPFILTER_LKM) # include "opt_ipfilter.h" # endif +# if (__FreeBSD_version > 800000) +# include "opt_vimage.h" +# include +# endif #else # include #endif ==== //depot/projects/vimage-commit2/src/sys/dev/firewire/firewire.c#2 (text+ko) ==== @@ -35,6 +35,8 @@ * */ +#include "opt_vimage.h" + #include #include #include @@ -45,6 +47,7 @@ #include #include #include +#include #include @@ -702,7 +705,7 @@ crom_add_simple_text(src, root, &buf->vendor, "FreeBSD Project"); crom_add_entry(root, CSRKEY_HW, __FreeBSD_version); #endif - crom_add_simple_text(src, root, &buf->hw, hostname); + crom_add_simple_text(src, root, &buf->hw, V_hostname); } /* ==== //depot/projects/vimage-commit2/src/sys/fs/cd9660/cd9660_rrip.c#3 (text+ko) ==== @@ -34,6 +34,8 @@ * @(#)cd9660_rrip.c 8.6 (Berkeley) 12/5/94 */ +#include "opt_vimage.h" + #include __FBSDID("$FreeBSD: src/sys/fs/cd9660/cd9660_rrip.c,v 1.30 2007/02/11 13:54:25 rodrigc Exp $"); ==== //depot/projects/vimage-commit2/src/sys/i386/conf/NOTES#3 (text+ko) ==== @@ -248,8 +248,14 @@ # # Not all device drivers support this mode of operation at the time of # this writing. See polling(4) for more details. +# +# VIMAGE adds support for maintaining multiple independent network stack +# state instances in the kernel. This feature is still in early +# experimental phase, and needs more thought, testing, and documentation. +# options DEVICE_POLLING +options VIMAGE # BPF_JITTER adds support for BPF just-in-time compiler. ==== //depot/projects/vimage-commit2/src/sys/i386/i386/dump_machdep.c#5 (text+ko) ==== @@ -24,6 +24,8 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "opt_vimage.h" + #include __FBSDID("$FreeBSD: src/sys/i386/i386/dump_machdep.c,v 1.14 2008/02/15 06:26:25 scottl Exp $"); ==== //depot/projects/vimage-commit2/src/sys/i386/i386/minidump_machdep.c#5 (text) ==== @@ -24,6 +24,8 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "opt_vimage.h" + #include __FBSDID("$FreeBSD: src/sys/i386/i386/minidump_machdep.c,v 1.5 2008/02/15 06:26:25 scottl Exp $"); ==== //depot/projects/vimage-commit2/src/sys/ia64/ia64/dump_machdep.c#5 (text+ko) ==== @@ -27,6 +27,8 @@ #include __FBSDID("$FreeBSD: src/sys/ia64/ia64/dump_machdep.c,v 1.14 2008/01/28 19:04:07 ru Exp $"); +#include "opt_vimage.h" + #include #include #include ==== //depot/projects/vimage-commit2/src/sys/kern/kern_jail.c#3 (text+ko) ==== @@ -11,6 +11,7 @@ __FBSDID("$FreeBSD: src/sys/kern/kern_jail.c,v 1.77 2008/04/11 21:31:14 delphij Exp $"); #include "opt_mac.h" +#include "opt_vimage.h" #include #include @@ -36,6 +37,7 @@ #include #include #include + #include #include ==== //depot/projects/vimage-commit2/src/sys/kern/kern_mib.c#3 (text+ko) ==== @@ -41,6 +41,7 @@ #include "opt_compat.h" #include "opt_posix.h" #include "opt_config.h" +#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit2/src/sys/kern/kern_uuid.c#3 (text+ko) ==== @@ -27,6 +27,8 @@ #include __FBSDID("$FreeBSD: src/sys/kern/kern_uuid.c,v 1.13 2007/04/23 12:53:00 pjd Exp $"); +#include "opt_vimage.h" + #include #include #include ==== //depot/projects/vimage-commit2/src/sys/kern/kern_xxx.c#3 (text+ko) ==== @@ -33,6 +33,7 @@ __FBSDID("$FreeBSD: src/sys/kern/kern_xxx.c,v 1.49 2007/03/05 13:10:57 rwatson Exp $"); #include "opt_compat.h" +#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit2/src/sys/net/if.c#3 (text+ko) ==== @@ -35,6 +35,7 @@ #include "opt_inet.h" #include "opt_mac.h" #include "opt_carp.h" +#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit2/src/sys/net/if_faith.c#3 (text+ko) ==== @@ -41,6 +41,7 @@ */ #include "opt_inet.h" #include "opt_inet6.h" +#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit2/src/sys/net/if_gif.c#3 (text+ko) ==== @@ -33,6 +33,7 @@ #include "opt_inet.h" #include "opt_inet6.h" #include "opt_mac.h" +#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit2/src/sys/net/if_gre.c#3 (text+ko) ==== @@ -51,6 +51,7 @@ #include "opt_atalk.h" #include "opt_inet.h" #include "opt_inet6.h" +#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit2/src/sys/net/if_loop.c#3 (text+ko) ==== @@ -38,6 +38,7 @@ #include "opt_inet.h" #include "opt_inet6.h" #include "opt_ipx.h" +#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit2/src/sys/net/if_mib.c#3 (text+ko) ==== @@ -29,6 +29,8 @@ * $FreeBSD: src/sys/net/if_mib.c,v 1.18 2006/01/04 12:57:09 harti Exp $ */ +#include "opt_vimage.h" + #include #include #include ==== //depot/projects/vimage-commit2/src/sys/net/if_var.h#3 (text+ko) ==== @@ -644,7 +644,7 @@ struct cdev *ife_dev; }; -#define ifnet_byindex(idx) ifindex_table[(idx)].ife_ifnet +#define ifnet_byindex(idx) V_ifindex_table[(idx)].ife_ifnet /* * Given the index, ifaddr_byindex() returns the one and only * link-level ifaddr for the interface. You are not supposed to use ==== //depot/projects/vimage-commit2/src/sys/net/if_vlan.c#3 (text+ko) ==== @@ -42,6 +42,7 @@ */ #include "opt_vlan.h" +#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit2/src/sys/net/raw_cb.c#3 (text+ko) ==== @@ -30,6 +30,8 @@ * $FreeBSD: src/sys/net/raw_cb.c,v 1.35 2008/03/25 09:38:59 ru Exp $ */ +#include "opt_vimage.h" + #include #include #include ==== //depot/projects/vimage-commit2/src/sys/net/raw_usrreq.c#3 (text+ko) ==== @@ -30,6 +30,8 @@ * $FreeBSD: src/sys/net/raw_usrreq.c,v 1.44 2006/11/06 13:42:02 rwatson Exp $ */ +#include "opt_vimage.h" + #include #include #include ==== //depot/projects/vimage-commit2/src/sys/net/route.c#3 (text+ko) ==== @@ -38,6 +38,7 @@ #include "opt_route.h" #include "opt_mrouting.h" #include "opt_mpath.h" +#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit2/src/sys/net/rtsock.c#3 (text+ko) ==== @@ -29,8 +29,10 @@ * @(#)rtsock.c 8.7 (Berkeley) 10/12/95 * $FreeBSD: src/sys/net/rtsock.c,v 1.146 2008/05/09 23:02:56 julian Exp $ */ + #include "opt_sctp.h" #include "opt_mpath.h" +#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit2/src/sys/net80211/ieee80211.c#2 (text+ko) ==== @@ -32,11 +32,14 @@ */ #include "opt_wlan.h" +#include "opt_vimage.h" + #include #include #include #include +#include #include #include ==== //depot/projects/vimage-commit2/src/sys/netgraph/ng_base.c#3 (text+ko) ==== @@ -46,6 +46,8 @@ * This file implements the base netgraph code. */ +#include "opt_vimage.h" + #include #include #include ==== //depot/projects/vimage-commit2/src/sys/netgraph/ng_eiface.c#3 (text+ko) ==== @@ -28,6 +28,8 @@ * $FreeBSD: src/sys/netgraph/ng_eiface.c,v 1.39 2007/07/26 10:54:33 glebius Exp $ */ +#include "opt_vimage.h" + #include #include #include ==== //depot/projects/vimage-commit2/src/sys/netgraph/ng_ether.c#3 (text+ko) ==== @@ -46,6 +46,8 @@ * ng_ether(4) netgraph node type */ +#include "opt_vimage.h" + #include #include #include ==== //depot/projects/vimage-commit2/src/sys/netgraph/ng_iface.c#3 (text+ko) ==== @@ -56,6 +56,7 @@ #include "opt_inet.h" #include "opt_inet6.h" #include "opt_ipx.h" +#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit2/src/sys/netinet/if_ether.c#4 (text+ko) ==== @@ -41,6 +41,7 @@ #include "opt_inet.h" #include "opt_mac.h" #include "opt_carp.h" +#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit2/src/sys/netinet/igmp.c#3 (text+ko) ==== @@ -48,6 +48,7 @@ __FBSDID("$FreeBSD: src/sys/netinet/igmp.c,v 1.56 2007/10/28 15:55:21 rwatson Exp $"); #include "opt_mac.h" +#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit2/src/sys/netinet/in.c#3 (text+ko) ==== @@ -34,6 +34,7 @@ __FBSDID("$FreeBSD: src/sys/netinet/in.c,v 1.103 2008/01/24 08:14:38 bz Exp $"); #include "opt_carp.h" +#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit2/src/sys/netinet/in_gif.c#3 (text+ko) ==== @@ -35,6 +35,7 @@ #include "opt_mrouting.h" #include "opt_inet.h" #include "opt_inet6.h" +#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit2/src/sys/netinet/in_mcast.c#3 (text+ko) ==== @@ -39,6 +39,8 @@ #include __FBSDID("$FreeBSD: src/sys/netinet/in_mcast.c,v 1.5 2008/05/09 23:02:57 julian Exp $"); +#include "opt_vimage.h" + #include #include #include ==== //depot/projects/vimage-commit2/src/sys/netinet/in_pcb.c#3 (text+ko) ==== @@ -38,6 +38,7 @@ #include "opt_ipsec.h" #include "opt_inet6.h" #include "opt_mac.h" +#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit2/src/sys/netinet/in_rmx.c#3 (text+ko) ==== @@ -43,6 +43,8 @@ #include __FBSDID("$FreeBSD: src/sys/netinet/in_rmx.c,v 1.59 2008/05/09 23:02:57 julian Exp $"); +#include "opt_vimage.h" + #include #include #include ==== //depot/projects/vimage-commit2/src/sys/netinet/ip_carp.c#3 (text+ko) ==== @@ -31,6 +31,7 @@ #include "opt_bpf.h" #include "opt_inet.h" #include "opt_inet6.h" +#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit2/src/sys/netinet/ip_fastfwd.c#3 (text+ko) ==== @@ -78,6 +78,7 @@ #include "opt_ipfw.h" #include "opt_ipstealth.h" +#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit2/src/sys/netinet/ip_fw2.c#3 (text+ko) ==== @@ -45,6 +45,7 @@ #include "opt_inet6.h" #include "opt_ipsec.h" #include "opt_mac.h" +#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit2/src/sys/netinet/ip_fw_nat.c#3 (text+ko) ==== @@ -24,6 +24,7 @@ * SUCH DAMAGE. */ +#include "opt_vimage.h" #include __FBSDID("$FreeBSD: src/sys/netinet/ip_fw_nat.c,v 1.3 2008/06/01 12:29:23 mav Exp $"); ==== //depot/projects/vimage-commit2/src/sys/netinet/ip_fw_pfil.c#3 (text+ko) ==== @@ -36,6 +36,7 @@ #endif /* INET */ #endif /* KLD_MODULE */ #include "opt_inet6.h" +#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit2/src/sys/netinet/ip_icmp.c#3 (text+ko) ==== @@ -34,6 +34,7 @@ #include "opt_ipsec.h" #include "opt_mac.h" +#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit2/src/sys/netinet/ip_input.c#3 (text+ko) ==== @@ -38,6 +38,7 @@ #include "opt_ipsec.h" #include "opt_mac.h" #include "opt_carp.h" +#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit2/src/sys/netinet/ip_ipsec.c#3 (text+ko) ==== @@ -31,6 +31,7 @@ __FBSDID("$FreeBSD: src/sys/netinet/ip_ipsec.c,v 1.10 2008/04/09 05:17:18 bz Exp $"); #include "opt_ipsec.h" +#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit2/src/sys/netinet/ip_mroute.c#3 (text+ko) ==== @@ -60,6 +60,7 @@ #include "opt_inet6.h" #include "opt_mac.h" #include "opt_mrouting.h" +#include "opt_vimage.h" #define _PIM_VT 1 ==== //depot/projects/vimage-commit2/src/sys/netinet/ip_options.c#3 (text+ko) ==== @@ -34,6 +34,7 @@ #include "opt_ipstealth.h" #include "opt_mac.h" +#include "opt_vimage.h" #include >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Jun 21 01:47:08 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 907C21065673; Sat, 21 Jun 2008 01:47:08 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 52E19106564A for ; Sat, 21 Jun 2008 01:47:08 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DAD798FC12 for ; Sat, 21 Jun 2008 01:47:07 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5L1l73M036926 for ; Sat, 21 Jun 2008 01:47:07 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5L1l7ZM036924 for perforce@freebsd.org; Sat, 21 Jun 2008 01:47:07 GMT (envelope-from julian@freebsd.org) Date: Sat, 21 Jun 2008 01:47:07 GMT Message-Id: <200806210147.m5L1l7ZM036924@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 143854 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 21 Jun 2008 01:47:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=143854 Change 143854 by julian@julian_trafmon1 on 2008/06/21 01:46:22 Some things need vimage.h because of ip_var.h needing it Affected files ... .. //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_frag.c#4 edit .. //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_log.c#4 edit .. //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_nat.c#4 edit .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_os_bsd.h#5 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_frag.c#4 (text+ko) ==== @@ -58,6 +58,10 @@ # include # include #endif +#if (__FreeBSD_version > 800000) +# include "opt_vimage.h" +# include +#endif #include #ifdef sun # include @@ -86,10 +90,6 @@ # ifndef IPFILTER_LKM # include # include -# if (__FreeBSD_version > 800000) -# include "opt_vimage.h" -# include -# endif # endif extern struct callout_handle fr_slowtimer_ch; # endif ==== //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_log.c#4 (text+ko) ==== @@ -104,6 +104,10 @@ #if __FreeBSD_version >= 300000 # include #endif +#if __FreeBSD_version >= 800000 +# include "opt_vimage.h" +# include +#endif #include #include #ifdef __sgi ==== //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_nat.c#4 (text+ko) ==== @@ -70,6 +70,10 @@ #if __FreeBSD_version >= 300000 # include #endif +#if __FreeBSD_version >= 800000 +# include "opt_vimage.h" +# include +#endif #include #if __FreeBSD_version >= 300000 # include ==== //depot/projects/vimage-commit2/src/sys/netinet/sctp_os_bsd.h#5 (text+ko) ==== @@ -39,6 +39,7 @@ #include "opt_inet6.h" #include "opt_inet.h" #include "opt_sctp.h" +#include "opt_vimage.h" #include #include #include @@ -60,6 +61,7 @@ #include #include #include +#include #include #include From owner-p4-projects@FreeBSD.ORG Sat Jun 21 04:20:43 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D106B1065676; Sat, 21 Jun 2008 04:20:42 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 89D6B106566B for ; Sat, 21 Jun 2008 04:20:42 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6C26E8FC18 for ; Sat, 21 Jun 2008 04:20:42 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5L4KgrB054890 for ; Sat, 21 Jun 2008 04:20:42 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5L4Kgih054888 for perforce@freebsd.org; Sat, 21 Jun 2008 04:20:42 GMT (envelope-from julian@freebsd.org) Date: Sat, 21 Jun 2008 04:20:42 GMT Message-Id: <200806210420.m5L4Kgih054888@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 143857 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 21 Jun 2008 04:20:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=143857 Change 143857 by julian@julian_trafmon1 on 2008/06/21 04:19:50 more missing opt_vimage.h Affected files ... .. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_socket.c#3 edit .. //depot/projects/vimage-commit2/src/sys/compat/svr4/svr4_stat.c#3 edit .. //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#5 edit .. //depot/projects/vimage-commit2/src/sys/contrib/pf/net/if_pfsync.c#3 edit .. //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf.c#4 edit .. //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf_if.c#3 edit .. //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf_ioctl.c#4 edit .. //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf_norm.c#3 edit .. //depot/projects/vimage-commit2/src/sys/contrib/pf/netinet/in4_cksum.c#3 edit .. //depot/projects/vimage-commit2/src/sys/ddb/db_textdump.c#3 edit .. //depot/projects/vimage-commit2/src/sys/i386/ibcs2/ibcs2_socksys.c#3 edit .. //depot/projects/vimage-commit2/src/sys/kern/kern_poll.c#3 edit .. //depot/projects/vimage-commit2/src/sys/net/bridgestp.c#3 edit .. //depot/projects/vimage-commit2/src/sys/net/if_bridge.c#3 edit .. //depot/projects/vimage-commit2/src/sys/net/if_ef.c#3 edit .. //depot/projects/vimage-commit2/src/sys/net/if_enc.c#3 edit .. //depot/projects/vimage-commit2/src/sys/net/if_ethersubr.c#3 edit .. //depot/projects/vimage-commit2/src/sys/net/if_spppsubr.c#3 edit .. //depot/projects/vimage-commit2/src/sys/net/if_stf.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netgraph/atm/ng_atm.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_bridge.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_gif.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_ipfw.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_nat.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet/in_proto.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet/ip_divert.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet/ip_dummynet.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet/ip_encap.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet/ip_gre.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet/ip_id.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_debug.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netipsec/key.c#4 edit .. //depot/projects/vimage-commit2/src/sys/nfsclient/bootp_subr.c#4 edit .. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_diskless.c#3 edit .. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_vfsops.c#3 edit .. //depot/projects/vimage-commit2/src/sys/rpc/rpcb_clnt.c#4 edit .. //depot/projects/vimage-commit2/src/sys/security/mac/mac_inet.c#6 edit .. //depot/projects/vimage-commit2/src/sys/security/mac/mac_net.c#4 edit .. //depot/projects/vimage-commit2/src/sys/security/mac/mac_socket.c#3 edit .. //depot/projects/vimage-commit2/src/sys/security/mac_biba/mac_biba.c#6 edit .. //depot/projects/vimage-commit2/src/sys/security/mac_lomac/mac_lomac.c#6 edit .. //depot/projects/vimage-commit2/src/sys/security/mac_mls/mac_mls.c#6 edit .. //depot/projects/vimage-commit2/src/sys/security/mac_stub/mac_stub.c#6 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/compat/linux/linux_socket.c#3 (text+ko) ==== @@ -32,6 +32,7 @@ /* XXX we use functions that might not exist. */ #include "opt_compat.h" #include "opt_inet6.h" +#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit2/src/sys/compat/svr4/svr4_stat.c#3 (text+ko) ==== @@ -26,6 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "opt_vimage.h" #include __FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_stat.c,v 1.23 2006/09/02 08:18:22 rwatson Exp $"); ==== //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#5 (text+ko) ==== @@ -19,16 +19,11 @@ #if defined(__FreeBSD_version) && (__FreeBSD_version >= 400000) && \ !defined(KLD_MODULE) && !defined(IPFILTER_LKM) # include "opt_inet6.h" -# include "opt_vimage.h" #endif #if defined(__FreeBSD_version) && (__FreeBSD_version >= 440000) && \ !defined(KLD_MODULE) && !defined(IPFILTER_LKM) # include "opt_random_ip_id.h" #endif -#if defined(__FreeBSD_version) && (__FreeBSD_version >= 800000) && \ - !defined(KLD_MODULE) && !defined(IPFILTER_LKM) -# include "opt_vimage.h" -#endif #include #if defined(__FreeBSD__) && !defined(__FreeBSD_version) # if defined(IPFILTER_LKM) @@ -68,6 +63,7 @@ # include #endif #if __FreeBSD_version >= 800000 +# include "opt_vimage.h" # include #else #define V_path_mtu_discovery path_mtu_discovery ==== //depot/projects/vimage-commit2/src/sys/contrib/pf/net/if_pfsync.c#3 (text+ko) ==== @@ -32,6 +32,7 @@ #include "opt_carp.h" #include "opt_bpf.h" #include "opt_pf.h" +#include "opt_vimage.h" #include __FBSDID("$FreeBSD: src/sys/contrib/pf/net/if_pfsync.c,v 1.36 2007/07/28 07:31:29 rwatson Exp $"); ==== //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf.c#4 (text+ko) ==== @@ -38,6 +38,7 @@ #ifdef __FreeBSD__ #include "opt_inet.h" #include "opt_inet6.h" +#include "opt_vimage.h" #include __FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.54 2008/05/09 23:02:55 julian Exp $"); ==== //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf_if.c#3 (text+ko) ==== @@ -35,6 +35,7 @@ #if defined(__FreeBSD__) #include "opt_inet.h" #include "opt_inet6.h" +#include "opt_vimage.h" #include __FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_if.c,v 1.15 2008/03/29 00:24:36 mlaier Exp $"); ==== //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf_ioctl.c#4 (text+ko) ==== @@ -38,6 +38,7 @@ #ifdef __FreeBSD__ #include "opt_inet.h" #include "opt_inet6.h" +#include "opt_vimage.h" #include __FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_ioctl.c,v 1.33 2008/06/05 19:30:20 mlaier Exp $"); ==== //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf_norm.c#3 (text+ko) ==== @@ -29,6 +29,7 @@ #include "opt_inet.h" #include "opt_inet6.h" #include "opt_pf.h" +#include "opt_vimage.h" #include __FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_norm.c,v 1.19 2007/07/03 12:16:07 mlaier Exp $"); ==== //depot/projects/vimage-commit2/src/sys/contrib/pf/netinet/in4_cksum.c#3 (text+ko) ==== @@ -63,6 +63,8 @@ * @(#)in_cksum.c 8.1 (Berkeley) 6/10/93 */ +#include "opt_vimage.h" + #include #include #include ==== //depot/projects/vimage-commit2/src/sys/ddb/db_textdump.c#3 (text+ko) ==== @@ -60,6 +60,7 @@ __FBSDID("$FreeBSD: src/sys/ddb/db_textdump.c,v 1.3 2008/01/31 16:22:14 rwatson Exp $"); #include "opt_config.h" +#include "opt_vimage.h" #include #include @@ -193,7 +194,7 @@ kdh->dumplength = htod64(dumplen); kdh->dumptime = htod64(time_second); kdh->blocksize = htod32(blksz); - strncpy(kdh->hostname, V_hostname, sizeof(kdh->hostname)); + strncpy(kdh->hostname, G_hostname, sizeof(kdh->hostname)); strncpy(kdh->versionstring, version, sizeof(kdh->versionstring)); if (panicstr != NULL) strncpy(kdh->panicstring, panicstr, sizeof(kdh->panicstring)); ==== //depot/projects/vimage-commit2/src/sys/i386/ibcs2/ibcs2_socksys.c#3 (text+ko) ==== @@ -23,6 +23,8 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "opt_vimage.h" + #include __FBSDID("$FreeBSD: src/sys/i386/ibcs2/ibcs2_socksys.c,v 1.22 2006/11/06 13:41:59 rwatson Exp $"); ==== //depot/projects/vimage-commit2/src/sys/kern/kern_poll.c#3 (text+ko) ==== @@ -29,6 +29,7 @@ __FBSDID("$FreeBSD: src/sys/kern/kern_poll.c,v 1.32 2008/03/16 10:58:05 rwatson Exp $"); #include "opt_device_polling.h" +#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit2/src/sys/net/bridgestp.c#3 (text+ko) ==== @@ -34,6 +34,8 @@ * ISO/IEC 802.1D-2004, June 9, 2004. */ +#include "opt_vimage.h" + #include __FBSDID("$FreeBSD: src/sys/net/bridgestp.c,v 1.40 2007/12/09 20:47:12 thompsa Exp $"); ==== //depot/projects/vimage-commit2/src/sys/net/if_bridge.c#3 (text+ko) ==== @@ -80,6 +80,7 @@ #include "opt_inet.h" #include "opt_inet6.h" #include "opt_carp.h" +#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit2/src/sys/net/if_ef.c#3 (text+ko) ==== @@ -29,6 +29,7 @@ #include "opt_inet.h" #include "opt_ipx.h" #include "opt_ef.h" +#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit2/src/sys/net/if_enc.c#3 (text+ko) ==== @@ -27,6 +27,8 @@ * $FreeBSD$ */ +#include "opt_vimage.h" + #include #include #include ==== //depot/projects/vimage-commit2/src/sys/net/if_ethersubr.c#3 (text+ko) ==== @@ -38,6 +38,7 @@ #include "opt_netgraph.h" #include "opt_carp.h" #include "opt_mbuf_profiling.h" +#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit2/src/sys/net/if_spppsubr.c#3 (text+ko) ==== @@ -27,6 +27,7 @@ #include "opt_inet.h" #include "opt_inet6.h" #include "opt_ipx.h" +#include "opt_vimage.h" #endif #ifdef NetBSD1_3 ==== //depot/projects/vimage-commit2/src/sys/net/if_stf.c#3 (text+ko) ==== @@ -76,6 +76,7 @@ #include "opt_inet.h" #include "opt_inet6.h" +#include "opt_vimage.h" #include "opt_mac.h" #include ==== //depot/projects/vimage-commit2/src/sys/netgraph/atm/ng_atm.c#3 (text+ko) ==== @@ -34,6 +34,7 @@ #include __FBSDID("$FreeBSD: src/sys/netgraph/atm/ng_atm.c,v 1.15 2005/08/10 06:25:40 obrien Exp $"); +#include "opt_vimage.h" #include #include #include ==== //depot/projects/vimage-commit2/src/sys/netgraph/ng_bridge.c#3 (text+ko) ==== @@ -58,6 +58,8 @@ * from one port to the other only rarely. */ +#include "opt_vimage.h" + #include #include #include ==== //depot/projects/vimage-commit2/src/sys/netgraph/ng_gif.c#3 (text+ko) ==== @@ -69,6 +69,8 @@ * ng_gif(4) netgraph node type */ +#include "opt_vimage.h" + #include #include #include ==== //depot/projects/vimage-commit2/src/sys/netgraph/ng_ipfw.c#3 (text+ko) ==== @@ -26,6 +26,8 @@ * $FreeBSD: src/sys/netgraph/ng_ipfw.c,v 1.9 2006/02/14 15:22:24 ru Exp $ */ +#include "opt_vimage.h" + #include #include #include ==== //depot/projects/vimage-commit2/src/sys/netgraph/ng_nat.c#3 (text+ko) ==== @@ -26,6 +26,8 @@ * $FreeBSD: src/sys/netgraph/ng_nat.c,v 1.12 2008/06/01 15:13:32 mav Exp $ */ +#include "opt_vimage.h" + #include #include #include ==== //depot/projects/vimage-commit2/src/sys/netinet/in_proto.c#3 (text+ko) ==== @@ -40,6 +40,7 @@ #include "opt_carp.h" #include "opt_sctp.h" #include "opt_mpath.h" +#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit2/src/sys/netinet/ip_divert.c#3 (text+ko) ==== @@ -34,6 +34,7 @@ #include "opt_inet.h" #include "opt_ipfw.h" #include "opt_mac.h" +#include "opt_vimage.h" #ifndef INET #error "IPDIVERT requires INET." #endif ==== //depot/projects/vimage-commit2/src/sys/netinet/ip_dummynet.c#3 (text+ko) ==== @@ -31,6 +31,7 @@ #define DUMMYNET_DEBUG #include "opt_inet6.h" +#include "opt_vimage.h" /* * This module implements IP dummynet, a bandwidth limiter/delay emulator ==== //depot/projects/vimage-commit2/src/sys/netinet/ip_encap.c#3 (text+ko) ==== @@ -62,6 +62,7 @@ #include "opt_mrouting.h" #include "opt_inet.h" #include "opt_inet6.h" +#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit2/src/sys/netinet/ip_gre.c#3 (text+ko) ==== @@ -44,6 +44,8 @@ * This currently handles IPPROTO_GRE, IPPROTO_MOBILE */ +#include "opt_vimage.h" + #include __FBSDID("$FreeBSD$"); ==== //depot/projects/vimage-commit2/src/sys/netinet/ip_id.c#3 (text+ko) ==== @@ -74,6 +74,8 @@ * enabled. */ +#include "opt_vimage.h" + #include #include #include ==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_debug.c#3 (text+ko) ==== @@ -36,6 +36,7 @@ #include "opt_inet.h" #include "opt_inet6.h" #include "opt_tcpdebug.h" +#include "opt_vimage.h" #ifndef INET #error The option TCPDEBUG requires option INET. ==== //depot/projects/vimage-commit2/src/sys/netipsec/key.c#4 (text+ko) ==== @@ -37,6 +37,7 @@ #include "opt_inet.h" #include "opt_inet6.h" #include "opt_ipsec.h" +#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit2/src/sys/nfsclient/bootp_subr.c#4 (text+ko) ==== @@ -44,6 +44,7 @@ __FBSDID("$FreeBSD: src/sys/nfsclient/bootp_subr.c,v 1.72 2008/05/16 06:27:03 benno Exp $"); #include "opt_bootp.h" +#include "opt_vimage.h" #include #include @@ -1570,8 +1571,8 @@ printf("hostname %s (ignored) ", p); } else { strcpy(nd->my_hostnam, p); - strcpy(hostname, p); - printf("hostname %s ", hostname); + strcpy(G_hostname, p); + printf("hostname %s ", G_hostname); gctx->sethostname = ifctx; } } ==== //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_diskless.c#3 (text+ko) ==== @@ -36,6 +36,7 @@ __FBSDID("$FreeBSD: src/sys/nfsclient/nfs_diskless.c,v 1.20 2008/03/16 10:58:07 rwatson Exp $"); #include "opt_bootp.h" +#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_vfsops.c#3 (text+ko) ==== @@ -38,6 +38,7 @@ #include "opt_bootp.h" #include "opt_nfsroot.h" +#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit2/src/sys/rpc/rpcb_clnt.c#4 (text+ko) ==== @@ -66,6 +66,7 @@ */ #include "opt_inet6.h" +#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit2/src/sys/security/mac/mac_inet.c#6 (text+ko) ==== @@ -42,6 +42,7 @@ __FBSDID("$FreeBSD: src/sys/security/mac/mac_inet.c,v 1.20 2008/06/13 22:14:15 rwatson Exp $"); #include "opt_mac.h" +#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit2/src/sys/security/mac/mac_net.c#4 (text+ko) ==== @@ -42,6 +42,7 @@ __FBSDID("$FreeBSD: src/sys/security/mac/mac_net.c,v 1.131 2007/10/28 17:55:56 rwatson Exp $"); #include "opt_mac.h" +#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit2/src/sys/security/mac/mac_socket.c#3 (text+ko) ==== @@ -42,6 +42,7 @@ __FBSDID("$FreeBSD: src/sys/security/mac/mac_socket.c,v 1.11 2007/10/24 19:04:01 rwatson Exp $"); #include "opt_mac.h" +#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit2/src/sys/security/mac_biba/mac_biba.c#6 (text+ko) ==== @@ -44,6 +44,8 @@ * Biba fixed label mandatory integrity policy. */ +#include "opt_vimage.h" + #include #include #include ==== //depot/projects/vimage-commit2/src/sys/security/mac_lomac/mac_lomac.c#6 (text+ko) ==== @@ -43,6 +43,7 @@ * * Low-watermark floating label mandatory integrity policy. */ +#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit2/src/sys/security/mac_mls/mac_mls.c#6 (text+ko) ==== @@ -43,6 +43,7 @@ * * MLS fixed label mandatory confidentiality policy. */ +#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit2/src/sys/security/mac_stub/mac_stub.c#6 (text+ko) ==== @@ -45,6 +45,8 @@ * policy entry points. */ +#include "opt_vimage.h" + #include #include #include From owner-p4-projects@FreeBSD.ORG Sat Jun 21 05:41:04 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 096091065670; Sat, 21 Jun 2008 05:41:04 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C0114106564A for ; Sat, 21 Jun 2008 05:41:03 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A1AB88FC12 for ; Sat, 21 Jun 2008 05:41:03 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5L5f3mH071621 for ; Sat, 21 Jun 2008 05:41:03 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5L5f3op071619 for perforce@freebsd.org; Sat, 21 Jun 2008 05:41:03 GMT (envelope-from julian@freebsd.org) Date: Sat, 21 Jun 2008 05:41:03 GMT Message-Id: <200806210541.m5L5f3op071619@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 143862 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 21 Jun 2008 05:41:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=143862 Change 143862 by julian@julian_trafmon1 on 2008/06/21 05:40:22 More missing opt_vimage includes Affected files ... .. //depot/projects/vimage-commit2/src/sys/contrib/rdma/rdma_cma.c#3 edit .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c#3 edit .. //depot/projects/vimage-commit2/src/sys/geom/vinum/geom_vinum_drive.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_source.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet/ip_divert.c#4 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/contrib/rdma/rdma_cma.c#3 (text+ko) ==== @@ -29,6 +29,8 @@ * */ +#include "opt_vimage.h" + #include __FBSDID("$FreeBSD: src/sys/contrib/rdma/rdma_cma.c,v 1.1 2008/05/05 18:35:54 kmacy Exp $"); ==== //depot/projects/vimage-commit2/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c#3 (text+ko) ==== @@ -26,6 +26,8 @@ POSSIBILITY OF SUCH DAMAGE. ***************************************************************************/ +#include "opt_vimage.h" + #include __FBSDID("$FreeBSD: src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c,v 1.1 2008/05/05 18:46:18 kmacy Exp $"); ==== //depot/projects/vimage-commit2/src/sys/geom/vinum/geom_vinum_drive.c#3 (text+ko) ==== @@ -24,6 +24,8 @@ * SUCH DAMAGE. */ +#include "opt_vimage.h" + #include __FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_drive.c,v 1.27 2008/03/18 08:48:51 lulf Exp $"); @@ -63,7 +65,7 @@ vhdr->magic = GV_MAGIC; vhdr->config_length = GV_CFG_LEN; - bcopy(V_hostname, vhdr->label.sysname, GV_HOSTNAME_LEN); + bcopy(G_hostname, vhdr->label.sysname, GV_HOSTNAME_LEN); strncpy(vhdr->label.name, d->name, GV_MAXDRIVENAME); microtime(&vhdr->label.date_of_birth); ==== //depot/projects/vimage-commit2/src/sys/netgraph/ng_source.c#3 (text+ko) ==== @@ -38,6 +38,8 @@ * Author: Dave Chapeskie */ +#include "opt_vimage.h" + #include __FBSDID("$FreeBSD: src/sys/netgraph/ng_source.c,v 1.30 2007/03/02 14:36:19 emaste Exp $"); ==== //depot/projects/vimage-commit2/src/sys/netinet/ip_divert.c#4 (text+ko) ==== @@ -30,11 +30,11 @@ #include __FBSDID("$FreeBSD: src/sys/netinet/ip_divert.c,v 1.133 2008/04/21 12:03:59 rwatson Exp $"); +#include "opt_vimage.h" #if !defined(KLD_MODULE) #include "opt_inet.h" #include "opt_ipfw.h" #include "opt_mac.h" -#include "opt_vimage.h" #ifndef INET #error "IPDIVERT requires INET." #endif From owner-p4-projects@FreeBSD.ORG Sat Jun 21 07:37:08 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B412F1065678; Sat, 21 Jun 2008 07:37:08 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 69032106566C for ; Sat, 21 Jun 2008 07:37:03 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4544E8FC18 for ; Sat, 21 Jun 2008 07:37:03 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5L7b3FN084694 for ; Sat, 21 Jun 2008 07:37:03 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5L7b0TS084685 for perforce@freebsd.org; Sat, 21 Jun 2008 07:37:00 GMT (envelope-from thompsa@freebsd.org) Date: Sat, 21 Jun 2008 07:37:00 GMT Message-Id: <200806210737.m5L7b0TS084685@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thompsa@freebsd.org using -f From: Andrew Thompson To: Perforce Change Reviews Cc: Subject: PERFORCE change 143865 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 21 Jun 2008 07:37:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=143865 Change 143865 by thompsa@thompsa_burger on 2008/06/21 07:36:10 IFC Affected files ... .. //depot/projects/vap/Makefile#9 integrate .. //depot/projects/vap/Makefile.inc1#12 integrate .. //depot/projects/vap/ObsoleteFiles.inc#12 integrate .. //depot/projects/vap/UPDATING#13 integrate .. //depot/projects/vap/contrib/cvs/src/classify.c#7 integrate .. //depot/projects/vap/etc/defaults/rc.conf#15 integrate .. //depot/projects/vap/etc/devd.conf#4 integrate .. //depot/projects/vap/etc/rc.d/quota#4 integrate .. //depot/projects/vap/etc/rc.subr#5 integrate .. //depot/projects/vap/games/morse/morse.6#3 integrate .. //depot/projects/vap/games/morse/morse.c#3 integrate .. //depot/projects/vap/gnu/lib/libstdc++/Makefile#3 integrate .. //depot/projects/vap/gnu/usr.bin/Makefile#5 integrate .. //depot/projects/vap/gnu/usr.bin/cpio/Makefile#4 integrate .. //depot/projects/vap/gnu/usr.bin/gdb/kgdb/trgt_mips.c#2 integrate .. //depot/projects/vap/include/Makefile#5 integrate .. //depot/projects/vap/include/pthread.h#4 integrate .. //depot/projects/vap/include/sgtty.h#3 integrate .. //depot/projects/vap/include/spawn.h#1 branch .. //depot/projects/vap/include/unistd.h#9 integrate .. //depot/projects/vap/kerberos5/tools/slc/Makefile#2 integrate .. //depot/projects/vap/lib/libarchive/Makefile#8 integrate .. //depot/projects/vap/lib/libarchive/archive.h#1 branch .. //depot/projects/vap/lib/libarchive/archive.h.in#6 delete .. //depot/projects/vap/lib/libarchive/archive_entry_link_resolver.c#3 integrate .. //depot/projects/vap/lib/libarchive/archive_entry_strmode.c#4 integrate .. //depot/projects/vap/lib/libarchive/archive_read_support_compression_program.c#4 integrate .. //depot/projects/vap/lib/libarchive/archive_read_support_format_mtree.c#5 integrate .. //depot/projects/vap/lib/libarchive/archive_read_support_format_zip.c#6 integrate .. //depot/projects/vap/lib/libarchive/archive_string.c#4 integrate .. //depot/projects/vap/lib/libarchive/archive_string.h#5 integrate .. //depot/projects/vap/lib/libarchive/archive_write_set_compression_program.c#4 integrate .. //depot/projects/vap/lib/libarchive/config_freebsd.h#6 integrate .. //depot/projects/vap/lib/libarchive/filter_fork.c#5 integrate .. //depot/projects/vap/lib/libarchive/test/Makefile#9 integrate .. //depot/projects/vap/lib/libarchive/test/main.c#7 integrate .. //depot/projects/vap/lib/libarchive/test/test.h#6 integrate .. //depot/projects/vap/lib/libarchive/test/test_link_resolver.c#2 integrate .. //depot/projects/vap/lib/libarchive/test/test_read_extract.c#3 integrate .. //depot/projects/vap/lib/libarchive/test/test_write_disk.c#4 integrate .. //depot/projects/vap/lib/libarchive/test/test_write_disk_perms.c#4 integrate .. //depot/projects/vap/lib/libarchive/test/test_write_disk_secure.c#3 integrate .. //depot/projects/vap/lib/libc/gen/Makefile.inc#8 integrate .. //depot/projects/vap/lib/libc/gen/Symbol.map#5 integrate .. //depot/projects/vap/lib/libc/gen/exec.3#3 integrate .. //depot/projects/vap/lib/libc/gen/exec.c#3 integrate .. //depot/projects/vap/lib/libc/gen/posix_spawn.c#1 branch .. //depot/projects/vap/lib/libc/include/namespace.h#6 integrate .. //depot/projects/vap/lib/libc/include/un-namespace.h#6 integrate .. //depot/projects/vap/lib/libc/stdlib/Symbol.map#3 integrate .. //depot/projects/vap/lib/libc/stdlib/grantpt.c#5 integrate .. //depot/projects/vap/lib/libc/stdlib/malloc.c#10 integrate .. //depot/projects/vap/lib/libc/sys/accept.2#3 integrate .. //depot/projects/vap/lib/libc/sys/getsockopt.2#4 integrate .. //depot/projects/vap/lib/libc/sys/setgroups.2#3 integrate .. //depot/projects/vap/lib/libcompat/4.1/gtty.c#3 delete .. //depot/projects/vap/lib/libcompat/4.1/stty.3#3 delete .. //depot/projects/vap/lib/libcompat/4.1/stty.c#3 delete .. //depot/projects/vap/lib/libcompat/Makefile#3 integrate .. //depot/projects/vap/lib/libgeom/libgeom.3#4 integrate .. //depot/projects/vap/lib/libthr/pthread.map#8 integrate .. //depot/projects/vap/lib/libthr/thread/thr_clean.c#3 integrate .. //depot/projects/vap/lib/libthr/thread/thr_private.h#8 integrate .. //depot/projects/vap/lib/msun/Makefile#8 integrate .. //depot/projects/vap/lib/msun/Symbol.map#8 integrate .. //depot/projects/vap/lib/msun/man/fmod.3#3 integrate .. //depot/projects/vap/lib/msun/src/e_fmodl.c#1 branch .. //depot/projects/vap/lib/msun/src/math.h#8 integrate .. //depot/projects/vap/libexec/rpc.rstatd/Makefile#3 integrate .. //depot/projects/vap/libexec/rpc.rstatd/rstat_proc.c#3 integrate .. //depot/projects/vap/sbin/Makefile#4 integrate .. //depot/projects/vap/sbin/dhclient/dhclient-script#5 integrate .. //depot/projects/vap/sbin/fsck_ffs/main.c#6 integrate .. //depot/projects/vap/sbin/geom/class/part/geom_part.c#6 integrate .. //depot/projects/vap/sbin/geom/class/part/gpart.8#4 integrate .. //depot/projects/vap/sbin/ggate/ggated/ggated.c#3 integrate .. //depot/projects/vap/sbin/ifconfig/ifconfig.8#13 integrate .. //depot/projects/vap/sbin/ifconfig/ifconfig.c#8 integrate .. //depot/projects/vap/sbin/rcorder/rcorder.8#3 integrate .. //depot/projects/vap/share/man/man4/ciss.4#4 integrate .. //depot/projects/vap/share/man/man4/cpufreq.4#3 integrate .. //depot/projects/vap/share/man/man4/crypto.4#3 integrate .. //depot/projects/vap/share/man/man4/ddb.4#7 integrate .. //depot/projects/vap/share/man/man4/gre.4#3 integrate .. //depot/projects/vap/share/man/man4/ixgbe.4#1 branch .. //depot/projects/vap/share/man/man4/ubsa.4#5 integrate .. //depot/projects/vap/share/man/man4/uplcom.4#3 integrate .. //depot/projects/vap/share/man/man5/src.conf.5#7 integrate .. //depot/projects/vap/share/man/man5/tmpfs.5#3 integrate .. //depot/projects/vap/share/man/man9/bus_dma.9#3 integrate .. //depot/projects/vap/share/man/man9/taskqueue.9#4 integrate .. //depot/projects/vap/share/man/man9/zone.9#3 integrate .. //depot/projects/vap/share/misc/committers-ports.dot#6 integrate .. //depot/projects/vap/share/misc/committers-src.dot#6 integrate .. //depot/projects/vap/share/mk/bsd.own.mk#8 integrate .. //depot/projects/vap/sys/amd64/amd64/mem.c#4 integrate .. //depot/projects/vap/sys/amd64/amd64/minidump_machdep.c#5 integrate .. //depot/projects/vap/sys/amd64/amd64/pmap.c#18 integrate .. //depot/projects/vap/sys/amd64/amd64/trap.c#9 integrate .. //depot/projects/vap/sys/amd64/conf/GENERIC#17 integrate .. //depot/projects/vap/sys/amd64/include/pmc_mdep.h#6 integrate .. //depot/projects/vap/sys/amd64/include/stack.h#2 integrate .. //depot/projects/vap/sys/arm/at91/if_ate.c#4 integrate .. //depot/projects/vap/sys/arm/xscale/i8134x/crb_machdep.c#6 integrate .. //depot/projects/vap/sys/arm/xscale/i8134x/i81342_pci.c#3 integrate .. //depot/projects/vap/sys/arm/xscale/pxa/files.pxa#2 integrate .. //depot/projects/vap/sys/arm/xscale/pxa/pxa_machdep.c#2 integrate .. //depot/projects/vap/sys/arm/xscale/pxa/pxa_obio.c#2 integrate .. //depot/projects/vap/sys/arm/xscale/pxa/pxa_space.c#2 integrate .. //depot/projects/vap/sys/boot/i386/libi386/time.c#3 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#3 integrate .. //depot/projects/vap/sys/compat/linux/linux_file.c#11 integrate .. //depot/projects/vap/sys/compat/ndis/subr_ndis.c#9 integrate .. //depot/projects/vap/sys/compat/ndis/subr_ntoskrnl.c#9 integrate .. //depot/projects/vap/sys/conf/NOTES#22 integrate .. //depot/projects/vap/sys/conf/files#43 integrate .. //depot/projects/vap/sys/conf/files.i386#12 integrate .. //depot/projects/vap/sys/conf/files.pc98#11 integrate .. //depot/projects/vap/sys/conf/files.powerpc#13 integrate .. //depot/projects/vap/sys/conf/kern.pre.mk#8 integrate .. //depot/projects/vap/sys/conf/newvers.sh#6 integrate .. //depot/projects/vap/sys/conf/options.i386#8 integrate .. //depot/projects/vap/sys/conf/options.pc98#8 integrate .. //depot/projects/vap/sys/ddb/db_ps.c#7 integrate .. //depot/projects/vap/sys/dev/age/if_age.c#2 integrate .. //depot/projects/vap/sys/dev/agp/agp_i810.c#4 integrate .. //depot/projects/vap/sys/dev/ata/ata-all.c#11 integrate .. //depot/projects/vap/sys/dev/ata/ata-chipset.c#12 integrate .. //depot/projects/vap/sys/dev/ata/ata-pci.c#9 integrate .. //depot/projects/vap/sys/dev/bce/if_bce.c#8 integrate .. //depot/projects/vap/sys/dev/bce/if_bcefw.h#5 integrate .. //depot/projects/vap/sys/dev/bce/if_bcereg.h#5 integrate .. //depot/projects/vap/sys/dev/bm/if_bm.c#1 branch .. //depot/projects/vap/sys/dev/bm/if_bmreg.h#1 branch .. //depot/projects/vap/sys/dev/bm/if_bmvar.h#1 branch .. //depot/projects/vap/sys/dev/ciss/ciss.c#9 integrate .. //depot/projects/vap/sys/dev/dc/if_dc.c#4 integrate .. //depot/projects/vap/sys/dev/et/if_et.c#1 branch .. //depot/projects/vap/sys/dev/et/if_etreg.h#1 branch .. //depot/projects/vap/sys/dev/et/if_etvar.h#1 branch .. //depot/projects/vap/sys/dev/ex/if_ex.c#5 integrate .. //depot/projects/vap/sys/dev/ex/if_ex_isa.c#5 integrate .. //depot/projects/vap/sys/dev/ex/if_ex_pccard.c#6 integrate .. //depot/projects/vap/sys/dev/ex/if_exvar.h#5 integrate .. //depot/projects/vap/sys/dev/if_ndis/if_ndis.c#28 integrate .. //depot/projects/vap/sys/dev/if_ndis/if_ndisvar.h#15 integrate .. //depot/projects/vap/sys/dev/ixgbe/ixgbe.h#4 integrate .. //depot/projects/vap/sys/dev/ixgbe/tcp_lro.c#2 delete .. //depot/projects/vap/sys/dev/ixgbe/tcp_lro.h#2 delete .. //depot/projects/vap/sys/dev/mii/brgphy.c#8 integrate .. //depot/projects/vap/sys/dev/mii/lxtphy.c#5 integrate .. //depot/projects/vap/sys/dev/mii/miidevs#12 integrate .. //depot/projects/vap/sys/dev/mii/truephy.c#1 branch .. //depot/projects/vap/sys/dev/mii/truephyreg.h#1 branch .. //depot/projects/vap/sys/dev/nmdm/nmdm.c#6 integrate .. //depot/projects/vap/sys/dev/si/si.c#6 integrate .. //depot/projects/vap/sys/dev/si/si.h#4 integrate .. //depot/projects/vap/sys/dev/smc/if_smc.c#2 integrate .. //depot/projects/vap/sys/dev/smc/if_smcvar.h#2 integrate .. //depot/projects/vap/sys/dev/snp/snp.c#7 integrate .. //depot/projects/vap/sys/dev/tx/if_tx.c#6 integrate .. //depot/projects/vap/sys/dev/tx/if_txvar.h#5 integrate .. //depot/projects/vap/sys/dev/usb/ehci.c#12 integrate .. //depot/projects/vap/sys/dev/usb/ehcivar.h#6 integrate .. //depot/projects/vap/sys/dev/usb/if_rum.c#27 integrate .. //depot/projects/vap/sys/dev/usb/uplcom.c#7 integrate .. //depot/projects/vap/sys/dev/usb/usbdevs#21 integrate .. //depot/projects/vap/sys/dev/vkbd/vkbd.c#7 integrate .. //depot/projects/vap/sys/fs/cd9660/cd9660_vnops.c#3 integrate .. //depot/projects/vap/sys/fs/devfs/devfs_devs.c#7 integrate .. //depot/projects/vap/sys/fs/devfs/devfs_int.h#4 integrate .. //depot/projects/vap/sys/fs/devfs/devfs_vnops.c#10 integrate .. //depot/projects/vap/sys/fs/ntfs/ntfs_ihash.c#5 integrate .. //depot/projects/vap/sys/fs/tmpfs/tmpfs_subr.c#5 integrate .. //depot/projects/vap/sys/geom/journal/g_journal.c#3 integrate .. //depot/projects/vap/sys/geom/part/g_part.c#7 integrate .. //depot/projects/vap/sys/geom/part/g_part.h#7 integrate .. //depot/projects/vap/sys/geom/part/g_part_apm.c#5 integrate .. //depot/projects/vap/sys/geom/part/g_part_bsd.c#4 integrate .. //depot/projects/vap/sys/geom/part/g_part_gpt.c#6 integrate .. //depot/projects/vap/sys/geom/part/g_part_if.m#4 integrate .. //depot/projects/vap/sys/geom/part/g_part_mbr.c#8 integrate .. //depot/projects/vap/sys/geom/part/g_part_pc98.c#4 integrate .. //depot/projects/vap/sys/geom/part/g_part_vtoc8.c#4 integrate .. //depot/projects/vap/sys/i386/acpica/acpi_machdep.c#6 integrate .. //depot/projects/vap/sys/i386/conf/GENERIC#19 integrate .. //depot/projects/vap/sys/i386/conf/NOTES#12 integrate .. //depot/projects/vap/sys/i386/include/pecoff_machdep.h#3 delete .. //depot/projects/vap/sys/kern/kern_conf.c#11 integrate .. //depot/projects/vap/sys/kern/kern_dtrace.c#2 integrate .. //depot/projects/vap/sys/kern/kern_jail.c#10 integrate .. //depot/projects/vap/sys/kern/link_elf_obj.c#8 integrate .. //depot/projects/vap/sys/kern/subr_bus.c#12 integrate .. //depot/projects/vap/sys/kern/sysv_sem.c#6 integrate .. //depot/projects/vap/sys/kern/uipc_sem.c#8 integrate .. //depot/projects/vap/sys/kern/vfs_export.c#7 integrate .. //depot/projects/vap/sys/kern/vfs_mount.c#16 integrate .. //depot/projects/vap/sys/mips/include/pte.h#2 integrate .. //depot/projects/vap/sys/mips/mips/trap.c#2 integrate .. //depot/projects/vap/sys/modules/Makefile#30 integrate .. //depot/projects/vap/sys/modules/bm/Makefile#1 branch .. //depot/projects/vap/sys/modules/et/Makefile#1 branch .. //depot/projects/vap/sys/modules/ixgbe/Makefile#5 integrate .. //depot/projects/vap/sys/modules/mii/Makefile#7 integrate .. //depot/projects/vap/sys/net/if_gre.c#8 integrate .. //depot/projects/vap/sys/net/if_gre.h#6 integrate .. //depot/projects/vap/sys/net/if_tap.c#7 integrate .. //depot/projects/vap/sys/net/if_tun.c#6 integrate .. //depot/projects/vap/sys/netinet/sctp.h#5 integrate .. //depot/projects/vap/sys/netinet/sctp_asconf.c#5 integrate .. //depot/projects/vap/sys/netinet/sctp_auth.c#4 integrate .. //depot/projects/vap/sys/netinet/sctp_bsd_addr.c#6 integrate .. //depot/projects/vap/sys/netinet/sctp_bsd_addr.h#4 integrate .. //depot/projects/vap/sys/netinet/sctp_cc_functions.c#4 integrate .. //depot/projects/vap/sys/netinet/sctp_header.h#3 integrate .. //depot/projects/vap/sys/netinet/sctp_indata.c#6 integrate .. //depot/projects/vap/sys/netinet/sctp_input.c#7 integrate .. //depot/projects/vap/sys/netinet/sctp_lock_bsd.h#4 integrate .. //depot/projects/vap/sys/netinet/sctp_os_bsd.h#5 integrate .. //depot/projects/vap/sys/netinet/sctp_output.c#8 integrate .. //depot/projects/vap/sys/netinet/sctp_pcb.c#7 integrate .. //depot/projects/vap/sys/netinet/sctp_pcb.h#5 integrate .. //depot/projects/vap/sys/netinet/sctp_peeloff.c#4 integrate .. //depot/projects/vap/sys/netinet/sctp_sysctl.c#5 integrate .. //depot/projects/vap/sys/netinet/sctp_sysctl.h#4 integrate .. //depot/projects/vap/sys/netinet/sctp_timer.c#4 integrate .. //depot/projects/vap/sys/netinet/sctp_uio.h#4 integrate .. //depot/projects/vap/sys/netinet/sctp_usrreq.c#7 integrate .. //depot/projects/vap/sys/netinet/sctp_var.h#6 integrate .. //depot/projects/vap/sys/netinet/sctputil.c#7 integrate .. //depot/projects/vap/sys/netinet/tcp_lro.c#1 branch .. //depot/projects/vap/sys/netinet/tcp_lro.h#1 branch .. //depot/projects/vap/sys/netinet/tcp_syncache.c#11 integrate .. //depot/projects/vap/sys/netinet6/sctp6_usrreq.c#6 integrate .. //depot/projects/vap/sys/pc98/conf/NOTES#9 integrate .. //depot/projects/vap/sys/pc98/include/pecoff_machdep.h#3 delete .. //depot/projects/vap/sys/pci/if_rl.c#8 integrate .. //depot/projects/vap/sys/pci/if_rlreg.h#10 integrate .. //depot/projects/vap/sys/pci/nfsmb.c#5 integrate .. //depot/projects/vap/sys/powerpc/booke/pmap.c#4 integrate .. //depot/projects/vap/sys/powerpc/conf/GENERIC#10 integrate .. //depot/projects/vap/sys/powerpc/conf/NOTES#8 integrate .. //depot/projects/vap/sys/powerpc/include/dbdma.h#1 branch .. //depot/projects/vap/sys/powerpc/powermac/dbdma.c#1 branch .. //depot/projects/vap/sys/powerpc/powermac/dbdmavar.h#1 branch .. //depot/projects/vap/sys/powerpc/powermac/grackle.c#6 integrate .. //depot/projects/vap/sys/powerpc/powermac/macio.c#7 integrate .. //depot/projects/vap/sys/powerpc/powermac/uninorth.c#6 integrate .. //depot/projects/vap/sys/security/audit/audit_pipe.c#5 integrate .. //depot/projects/vap/sys/security/audit/audit_worker.c#9 integrate .. //depot/projects/vap/sys/security/mac/mac_framework.h#5 integrate .. //depot/projects/vap/sys/security/mac/mac_inet.c#8 integrate .. //depot/projects/vap/sys/security/mac/mac_policy.h#5 integrate .. //depot/projects/vap/sys/security/mac_biba/mac_biba.c#6 integrate .. //depot/projects/vap/sys/security/mac_lomac/mac_lomac.c#6 integrate .. //depot/projects/vap/sys/security/mac_mls/mac_mls.c#7 integrate .. //depot/projects/vap/sys/security/mac_stub/mac_stub.c#7 integrate .. //depot/projects/vap/sys/security/mac_test/mac_test.c#7 integrate .. //depot/projects/vap/sys/sys/apm.h#3 integrate .. //depot/projects/vap/sys/sys/bus.h#9 integrate .. //depot/projects/vap/sys/sys/conf.h#10 integrate .. //depot/projects/vap/sys/sys/ioctl.h#6 integrate .. //depot/projects/vap/sys/sys/ioctl_compat.h#5 integrate .. //depot/projects/vap/sys/sys/jail.h#7 integrate .. //depot/projects/vap/sys/sys/mount.h#8 integrate .. //depot/projects/vap/sys/sys/param.h#23 integrate .. //depot/projects/vap/sys/sys/systm.h#10 integrate .. //depot/projects/vap/sys/sys/ttychars.h#5 delete .. //depot/projects/vap/sys/sys/ttydev.h#5 delete .. //depot/projects/vap/sys/vm/vnode_pager.c#8 integrate .. //depot/projects/vap/tools/build/options/WITHOUT_BSD_CPIO#1 branch .. //depot/projects/vap/tools/build/options/WITHOUT_GNU_GREP#1 branch .. //depot/projects/vap/tools/build/options/WITH_GNU_CPIO#1 branch .. //depot/projects/vap/usr.bin/Makefile#9 integrate .. //depot/projects/vap/usr.bin/calendar/calendars/calendar.freebsd#10 integrate .. //depot/projects/vap/usr.bin/cpio/Makefile#2 integrate .. //depot/projects/vap/usr.bin/fstat/fstat.c#5 integrate .. //depot/projects/vap/usr.bin/lex/flex.skl#3 integrate .. //depot/projects/vap/usr.bin/lex/flexdef.h#3 integrate .. //depot/projects/vap/usr.bin/lex/lex.1#3 integrate .. //depot/projects/vap/usr.bin/lex/parse.y#3 integrate .. //depot/projects/vap/usr.bin/lex/scan.l#3 integrate .. //depot/projects/vap/usr.bin/rev/rev.c#3 integrate .. //depot/projects/vap/usr.bin/shar/shar.sh#4 integrate .. //depot/projects/vap/usr.bin/tar/subst.c#2 integrate .. //depot/projects/vap/usr.bin/tar/test/main.c#3 integrate .. //depot/projects/vap/usr.bin/tar/test/test.h#3 integrate .. //depot/projects/vap/usr.bin/tar/util.c#5 integrate .. //depot/projects/vap/usr.bin/whereis/whereis.c#3 integrate .. //depot/projects/vap/usr.sbin/config/mkmakefile.c#4 integrate .. //depot/projects/vap/usr.sbin/mergemaster/mergemaster.8#3 integrate .. //depot/projects/vap/usr.sbin/ndiscvt/inf.c#4 integrate .. //depot/projects/vap/usr.sbin/pkg_install/Makefile#7 integrate .. //depot/projects/vap/usr.sbin/pkg_install/add/main.c#5 integrate .. //depot/projects/vap/usr.sbin/pkg_install/add/perform.c#6 integrate .. //depot/projects/vap/usr.sbin/pkg_install/create/main.c#4 integrate .. //depot/projects/vap/usr.sbin/pkg_install/lib/file.c#3 integrate .. //depot/projects/vap/usr.sbin/pkg_install/lib/lib.h#6 integrate .. //depot/projects/vap/usr.sbin/pkg_install/lib/url.c#3 integrate .. //depot/projects/vap/usr.sbin/pkg_install/updating/main.c#4 integrate .. //depot/projects/vap/usr.sbin/sicontrol/sicontrol.8#3 integrate .. //depot/projects/vap/usr.sbin/sicontrol/sicontrol.c#5 integrate Differences ... ==== //depot/projects/vap/Makefile#9 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.351 2008/05/25 22:13:17 jb Exp $ +# $FreeBSD: src/Makefile,v 1.353 2008/06/17 11:08:49 bz Exp $ # # The user-driven targets are: # ==== //depot/projects/vap/Makefile.inc1#12 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.605 2008/05/23 04:22:14 jb Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.606 2008/06/18 13:52:58 obrien Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -121,7 +121,7 @@ TARGET?= ${MACHINE} TARGET_ARCH?= ${MACHINE_ARCH} -KNOWN_ARCHES?= amd64 arm i386 i386/pc98 ia64 powerpc sparc64 sparc64/sun4v +KNOWN_ARCHES?= amd64 arm i386 i386/pc98 ia64 mips powerpc sparc64 sparc64/sun4v .if ${TARGET} == ${TARGET_ARCH} _t= ${TARGET} .else ==== //depot/projects/vap/ObsoleteFiles.inc#12 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.141 2008/05/27 21:05:49 bz Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.143 2008/06/14 10:42:18 ed Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,14 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20080614: sgtty removed +OLD_FILES+=usr/include/sys/ttychars.h +OLD_FILES+=usr/include/sys/ttydev.h +OLD_FILES+=usr/share/man/man3/gtty.3.gz +OLD_FILES+=usr/share/man/man3/stty.3.gz +# 20080609: gpt(8) removed +OLD_FILES+=sbin/gpt +OLD_FILES+=usr/share/man/man8/gpt.8.gz # 20080525: I4B removed OLD_FILES+=etc/isdn/answer OLD_FILES+=etc/isdn/isdntel ==== //depot/projects/vap/UPDATING#13 (text+ko) ==== @@ -22,6 +22,10 @@ to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20080609: + The gpt(8) utility has been removed. Use gpart(8) to partition + disks instead. + 20080603: The version that Linuxulator emulates was changed from 2.4.2 to 2.6.16. If you experience any problems with Linux binaries @@ -1049,4 +1053,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.531 2008/06/03 18:09:10 rdivacky Exp $ +$FreeBSD: src/UPDATING,v 1.532 2008/06/09 21:33:57 marcel Exp $ ==== //depot/projects/vap/contrib/cvs/src/classify.c#7 (text+ko) ==== @@ -12,6 +12,9 @@ * */ +#include +__FBSDID("$FreeBSD: src/contrib/cvs/src/classify.c,v 1.4 2008/06/16 17:06:17 obrien Exp $"); + #include "cvs.h" static void sticky_ck PROTO ((struct file_info *finfo, int aflag, ==== //depot/projects/vap/etc/defaults/rc.conf#15 (text+ko) ==== @@ -15,7 +15,7 @@ # For a more detailed explanation of all the rc.conf variables, please # refer to the rc.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.336 2008/05/26 10:39:45 bz Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.337 2008/06/19 07:06:11 mtm Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -528,7 +528,7 @@ dumpdev="AUTO" # Device to crashdump to (device name, AUTO, or NO). dumpdir="/var/crash" # Directory where crash dumps are to be stored savecore_flags="" # Used if dumpdev is enabled above, and present. -enable_quotas="NO" # turn on quotas on startup (or NO). +quota_enable="NO" # turn on quotas on startup (or NO). check_quotas="YES" # Check quotas on startup (or NO). quotaon_flags="-a" # Turn quotas on for all file systems (if enabled) quotaoff_flags="-a" # Turn quotas off for all file systems at shutdown ==== //depot/projects/vap/etc/devd.conf#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/devd.conf,v 1.39 2008/01/26 13:50:38 mtm Exp $ +# $FreeBSD: src/etc/devd.conf,v 1.41 2008/06/15 13:26:25 kmacy Exp $ # # Refer to devd.conf(5) and devd(8) man pages for the details on how to # run and configure devd. @@ -108,13 +108,16 @@ action "/etc/rc.d/syscons setkeyboard /dev/kbd0"; }; -# The entry below starts moused when a mouse is plugged in. Moused -# stops automatically (actually it bombs :) when the device disappears. attach 100 { device-name "ums[0-9]+"; action "/etc/rc.d/moused quietstart $device-name"; }; +detach 100 { + device-name "ums[0-9]+"; + action "/etc/rc.d/moused stop $device-name"; +}; + # Firmware download into the ActiveWire board. After the firmware download is # done the device detaches and reappears as something new and shiny # automatically. ==== //depot/projects/vap/etc/rc.d/quota#4 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/quota,v 1.7 2007/12/08 22:27:18 dougb Exp $ +# $FreeBSD: src/etc/rc.d/quota,v 1.8 2008/06/19 07:06:11 mtm Exp $ # # Enable/Check the quotas (must be after ypbind if using NIS) @@ -13,7 +13,7 @@ . /etc/rc.subr name="quota" -rcvar="enable_quotas" +rcvar=`set_rcvar` start_cmd="quota_start" stop_cmd="/usr/sbin/quotaoff ${quotaoff_flags}" ==== //depot/projects/vap/etc/rc.subr#5 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: rc.subr,v 1.67 2006/10/07 11:25:15 elad Exp $ -# $FreeBSD: src/etc/rc.subr,v 1.83 2008/05/05 15:52:54 maxim Exp $ +# $FreeBSD: src/etc/rc.subr,v 1.85 2008/06/19 07:06:11 mtm Exp $ # # Copyright (c) 1997-2004 The NetBSD Foundation, Inc. # All rights reserved. @@ -612,29 +612,29 @@ fi fi + eval $_pidcmd # determine the pid if necessary + + for _elem in $_keywords; do + if [ "$_elem" != "$rc_arg" ]; then + continue + fi # if ${rcvar} is set, and $1 is not # "rcvar", then run # checkyesno ${rcvar} # and return if that failed # - if [ -n "${rcvar}" -a "$rc_arg" != "rcvar" ]; then - if ! checkyesno ${rcvar}; then - if [ -n "${rc_quiet}" ]; then + if [ -n "${rcvar}" -a "$rc_arg" != "rcvar" ]; then + if ! checkyesno ${rcvar}; then + if [ -n "${rc_quiet}" ]; then + return 0 + fi + echo -n "Cannot '${rc_arg}' $name. Set ${rcvar} to " + echo -n "YES in /etc/rc.conf or use 'one${rc_arg}' " + echo "instead of '${rc_arg}'." return 0 fi - echo -n "Cannot '${rc_arg}' $name. Set ${rcvar} to " - echo -n "YES in /etc/rc.conf or use 'one${rc_arg}' " - echo "instead of '${rc_arg}'." - return 0 fi - fi - - eval $_pidcmd # determine the pid if necessary - for _elem in $_keywords; do - if [ "$_elem" != "$rc_arg" ]; then - continue - fi # if there's a custom ${XXX_cmd}, # run that instead of the default # @@ -942,6 +942,10 @@ debug "Sourcing /etc/rc.conf.d/${_name}" . /etc/rc.conf.d/"$_name" fi + + # Old variable names support + # + [ -n "$enable_quotas" ] && quota_enable="$enable_quotas" } # ==== //depot/projects/vap/games/morse/morse.6#3 (text+ko) ==== @@ -31,7 +31,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)bcd.6 8.1 (Berkeley) 5/31/93 -.\" $FreeBSD: src/games/morse/morse.6,v 1.17 2005/06/07 21:43:16 ru Exp $ +.\" $FreeBSD: src/games/morse/morse.6,v 1.18 2008/06/08 19:35:47 scf Exp $ .\" .Dd June 7, 2005 .Dt MORSE 6 @@ -172,7 +172,8 @@ .Sh FILES .Bl -tag -width ".Pa /dev/speaker" -compact .It Pa /dev/speaker -speaker device file +.Xr speaker 4 +device file .El .Sh SEE ALSO .Xr speaker 4 @@ -180,7 +181,7 @@ Sound support for .Nm added by -.An Lyndon Nerenberg (VE7TCP/VE6BBM) Aq lyndon@orthanc.com . +.An Lyndon Nerenberg (VE6BBM) Aq lyndon@orthanc.ca . .Pp Ability to key an external device added by .An J\(:org Wunsch ==== //depot/projects/vap/games/morse/morse.c#3 (text+ko) ==== @@ -32,8 +32,8 @@ */ /* - * Taught to send *real* morse by Lyndon Nerenberg (VE7TCP/VE6BBM) - * + * Taught to send *real* morse by Lyndon Nerenberg (VE6BBM) + * */ #ifndef lint @@ -47,7 +47,7 @@ static char sccsid[] = "@(#)morse.c 8.1 (Berkeley) 5/31/93"; #endif static const char rcsid[] = - "$FreeBSD: src/games/morse/morse.c,v 1.21 2005/11/11 09:57:32 ru Exp $"; + "$FreeBSD: src/games/morse/morse.c,v 1.22 2008/06/08 19:35:47 scf Exp $"; #endif /* not lint */ #include @@ -483,7 +483,8 @@ printf(" %s\n", s); } else { for (; *s; ++s) - printf(" %s", *s == '.' ? "dit" : "dah"); + printf(" %s", *s == '.' ? *(s + 1) == '\0' ? "dit" : + "di" : "dah"); printf("\n"); } } ==== //depot/projects/vap/gnu/lib/libstdc++/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/lib/libstdc++/Makefile,v 1.61 2007/08/16 23:02:00 kan Exp $ +# $FreeBSD: src/gnu/lib/libstdc++/Makefile,v 1.62 2008/06/16 22:49:30 kan Exp $ GCCDIR= ${.CURDIR}/../../../contrib/gcc GCCLIB= ${.CURDIR}/../../../contrib/gcclibs @@ -93,7 +93,7 @@ CLEANFILES+= atomicity.cc INCSGROUPS= BITSHDRS BKWHDRS EXTHDRS BASEHDRS BASEXHDRS STDHDRS \ - TARGETHDRS THRHDRS DEBUGHDRS TR1HDRS PBHDRS0 + TARGETHDRS THRHDRS DEBUGHDRS TR1HDRS PBHDRS0 PBHDRS1 CXXINCLUDEDIR= ${INCLUDEDIR}/c++/4.2 STDHDRS= std_algorithm.h std_bitset.h std_complex.h std_deque.h \ @@ -208,6 +208,20 @@ PBHDRS0:= ${PBHDRS0:S;^;${SRCDIR}/include/ext/pb_ds/;} PBHDRS0DIR= ${CXXINCLUDEDIR}/ext/pb_ds +PBHDRS1 = \ + basic_types.hpp \ + cond_dealtor.hpp \ + constructors_destructor_fn_imps.hpp \ + container_base_dispatch.hpp \ + map_debug_base.hpp \ + priority_queue_base_dispatch.hpp \ + standard_policies.hpp \ + tree_trace_base.hpp \ + type_utils.hpp \ + types_traits.hpp +PBHDRS1:= ${PBHDRS1:S;^;${SRCDIR}/include/ext/pb_ds/detail/;} +PBHDRS1DIR= ${CXXINCLUDEDIR}/ext/pb_ds/detail + PBHDRS+= \ basic_tree_policy/basic_tree_policy_base.hpp \ basic_tree_policy/null_node_metadata.hpp \ ==== //depot/projects/vap/gnu/usr.bin/Makefile#5 (text+ko) ==== @@ -1,11 +1,11 @@ -# $FreeBSD: src/gnu/usr.bin/Makefile,v 1.96 2008/03/19 15:21:44 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/Makefile,v 1.97 2008/06/16 05:48:15 dougb Exp $ .include SUBDIR= bc \ ${_binutils} \ ${_cc} \ - cpio \ + ${_cpio} \ ${_cvs} \ dc \ dialog \ @@ -13,7 +13,7 @@ diff3 \ ${_gdb} \ ${_gperf} \ - grep \ + ${_grep} \ ${_groff} \ ${_man} \ patch \ @@ -30,10 +30,18 @@ .endif .endif +.if ${MK_GNU_CPIO} == "yes" +_cpio= cpio +.endif + .if ${MK_CVS} != "no" _cvs= cvs .endif +.if ${MK_GNU_GREP} != "no" +_grep= grep +.endif + .if ${MK_MAN} != "no" _man= man .endif ==== //depot/projects/vap/gnu/usr.bin/cpio/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/cpio/Makefile,v 1.13 2008/05/26 17:21:12 kientzle Exp $ +# $FreeBSD: src/gnu/usr.bin/cpio/Makefile,v 1.14 2008/06/16 05:48:15 dougb Exp $ CPIODIR= ${.CURDIR}/../../../contrib/cpio .PATH: ${CPIODIR}/lib ${CPIODIR}/src ${CPIODIR}/doc @@ -62,9 +62,7 @@ gcpio.1: ${CPIODIR}/doc/cpio.1 cat ${CPIODIR}/doc/cpio.1 >gcpio.1 -.if !defined(WITH_BSDCPIO) SYMLINKS=gcpio ${BINDIR}/cpio MLINKS=gcpio.1 cpio.1 -.endif .include ==== //depot/projects/vap/gnu/usr.bin/gdb/kgdb/trgt_mips.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/trgt_mips.c,v 1.2 2008/05/20 22:58:47 obrien Exp $"); +__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/trgt_mips.c,v 1.3 2008/06/18 14:23:28 jhb Exp $"); #include #include @@ -54,7 +54,7 @@ struct kthr *kt; struct pcb pcb; - kt = kgdb_thr_lookup_tid(ptid_get_tid(inferior_ptid)); + kt = kgdb_thr_lookup_tid(ptid_get_pid(inferior_ptid)); if (kt == NULL) return; if (kvm_read(kvm, kt->pcb, &pcb, sizeof(pcb)) != sizeof(pcb)) { @@ -82,6 +82,11 @@ fprintf_unfiltered(gdb_stderr, "XXX: %s\n", __func__); } +void +kgdb_trgt_new_objfile(struct objfile *objfile) +{ +} + struct kgdb_frame_cache { CORE_ADDR pc; CORE_ADDR sp; ==== //depot/projects/vap/include/Makefile#5 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 1/4/94 -# $FreeBSD: src/include/Makefile,v 1.279 2008/05/26 10:39:47 bz Exp $ +# $FreeBSD: src/include/Makefile,v 1.280 2008/06/17 06:26:29 davidxu Exp $ # # Doing a "make install" builds /usr/include. @@ -19,7 +19,7 @@ printf.h proc_service.h pthread.h \ pthread_np.h pwd.h ranlib.h readpassphrase.h regex.h regexp.h \ res_update.h resolv.h runetype.h search.h setjmp.h sgtty.h \ - signal.h stab.h \ + signal.h spawn.h stab.h \ stdbool.h stddef.h stdio.h stdlib.h string.h stringlist.h \ strings.h sysexits.h tar.h tgmath.h \ time.h timeconv.h timers.h ttyent.h \ ==== //depot/projects/vap/include/pthread.h#4 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/include/pthread.h,v 1.42 2008/03/22 09:59:20 davidxu Exp $ + * $FreeBSD: src/include/pthread.h,v 1.43 2008/06/09 01:14:10 davidxu Exp $ */ #ifndef _PTHREAD_H_ #define _PTHREAD_H_ @@ -135,6 +135,10 @@ #define PTHREAD_MUTEX_DEFAULT PTHREAD_MUTEX_ERRORCHECK +struct _pthread_cleanup_info { + __uintptr_t pthread_cleanup_pad[8]; +}; + /* * Thread function prototype definitions: */ @@ -162,8 +166,19 @@ int *); int pthread_barrierattr_init(pthread_barrierattr_t *); int pthread_barrierattr_setpshared(pthread_barrierattr_t *, int); -void pthread_cleanup_pop(int); -void pthread_cleanup_push(void (*) (void *), void *); + +#define pthread_cleanup_push(cleanup_routine, cleanup_arg) \ + { \ + struct _pthread_cleanup_info __cleanup_info__; \ + __pthread_cleanup_push_imp(cleanup_routine, cleanup_arg,\ + &__cleanup_info__); \ + { + +#define pthread_cleanup_pop(execute) \ + } \ + __pthread_cleanup_pop_imp(execute); \ + } + int pthread_condattr_destroy(pthread_condattr_t *); int pthread_condattr_getclock(const pthread_condattr_t *, clockid_t *); @@ -268,6 +283,10 @@ const struct sched_param *); int pthread_getconcurrency(void); int pthread_setconcurrency(int); + +void __pthread_cleanup_push_imp(void (*)(void *), void *, + struct _pthread_cleanup_info *); +void __pthread_cleanup_pop_imp(int); __END_DECLS #endif ==== //depot/projects/vap/include/sgtty.h#3 (text+ko) ==== @@ -1,39 +1,3 @@ -/* - * Copyright (c) 1985, 1993 - * The Regents of the University of California. 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. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 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. - * - * @(#)sgtty.h 8.1 (Berkeley) 6/2/93 - */ - -#ifndef USE_OLD_TTY -#define USE_OLD_TTY -#endif -#include +/* $FreeBSD: src/include/sgtty.h,v 1.2 2008/06/14 10:42:18 ed Exp $ */ +#error "The sgtty interface has been replaced by termios(4)" +#error "Try to use or migrate to " ==== //depot/projects/vap/include/unistd.h#9 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)unistd.h 8.12 (Berkeley) 4/27/95 - * $FreeBSD: src/include/unistd.h,v 1.87 2008/04/10 12:13:56 kib Exp $ + * $FreeBSD: src/include/unistd.h,v 1.88 2008/06/17 06:26:29 davidxu Exp $ */ #ifndef _UNISTD_H_ @@ -335,6 +335,7 @@ int execv(const char *, char * const *); int execve(const char *, char * const *, char * const *); int execvp(const char *, char * const *); +int execvpe(const char *, char * const *, char * const *); pid_t fork(void); long fpathconf(int, int); char *getcwd(char *, size_t); ==== //depot/projects/vap/kerberos5/tools/slc/Makefile#2 (text+ko) ==== @@ -1,10 +1,11 @@ -# $FreeBSD: src/kerberos5/tools/slc/Makefile,v 1.1 2008/05/07 13:53:07 dfr Exp $ +# $FreeBSD: src/kerberos5/tools/slc/Makefile,v 1.2 2008/06/18 21:20:50 marius Exp $ PROG= slc NO_MAN= SRCS= get_window_size.c \ getarg.c \ + roken.h \ slc-gram.y \ slc-lex.l \ slc.h \ ==== //depot/projects/vap/lib/libarchive/Makefile#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libarchive/Makefile,v 1.84 2008/05/26 17:00:22 kientzle Exp $ +# $FreeBSD: src/lib/libarchive/Makefile,v 1.85 2008/06/15 05:05:53 kientzle Exp $ LIB= archive DPADD= ${LIBBZ2} ${LIBZ} @@ -16,16 +16,8 @@ # Headers to be installed in /usr/include INCS= archive.h archive_entry.h -# For now, archive.h is the same as archive.h.in. -archive.h: archive.h.in - cat ${.CURDIR}/archive.h.in > archive.h - -# archive.h needs to be cleaned -CLEANFILES+= archive.h - # Sources to be compiled. -SRCS= archive.h \ - archive_check_magic.c \ +SRCS= archive_check_magic.c \ archive_entry.c \ archive_entry_copy_stat.c \ archive_entry_stat.c \ ==== //depot/projects/vap/lib/libarchive/archive_entry_link_resolver.c#3 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry_link_resolver.c,v 1.2 2008/05/26 17:00:22 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry_link_resolver.c,v 1.3 2008/06/15 04:31:43 kientzle Exp $"); #ifdef HAVE_SYS_STAT_H #include @@ -181,6 +181,9 @@ /* If it has only one link, then we're done. */ if (archive_entry_nlink(*e) == 1) return; + /* Directories never have hardlinks. */ + if (archive_entry_filetype(*e) == AE_IFDIR) + return; switch (res->strategy) { case ARCHIVE_ENTRY_LINKIFY_LIKE_TAR: ==== //depot/projects/vap/lib/libarchive/archive_entry_strmode.c#4 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry_strmode.c,v 1.3 2008/05/23 04:57:28 cperciva Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry_strmode.c,v 1.4 2008/06/15 05:14:01 kientzle Exp $"); #ifdef HAVE_SYS_STAT_H #include @@ -57,6 +57,11 @@ case AE_IFLNK: bp[0] = 'l'; break; case AE_IFSOCK: bp[0] = 's'; break; case AE_IFIFO: bp[0] = 'p'; break; + default: + if (archive_entry_hardlink(entry) != NULL) { + bp[0] = 'h'; + break; + } } for (i = 0; i < 9; i++) ==== //depot/projects/vap/lib/libarchive/archive_read_support_compression_program.c#4 (text+ko) ==== @@ -24,11 +24,12 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_compression_program.c,v 1.3 2008/05/26 17:00:22 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_compression_program.c,v 1.4 2008/06/15 10:45:57 kientzle Exp $"); /* This capability is only available on POSIX systems. */ -#if !defined(HAVE_PIPE) || !defined(HAVE_VFORK) || !defined(HAVE_FCNTL) +#if !defined(HAVE_PIPE) || !defined(HAVE_FCNTL) || \ + !(defined(HAVE_FORK) || defined(HAVE_VFORK)) /* * On non-Posix systems, allow the program to build, but choke if @@ -177,6 +178,12 @@ state->child_in_buf_avail = ret; } + if (state->child_stdin == -1) { + fcntl(state->child_stdout, F_SETFL, 0); + __archive_check_child(state->child_stdin, state->child_stdout); + goto restart_read; + } + do { ret = write(state->child_stdin, state->child_in_buf, state->child_in_buf_avail); @@ -191,7 +198,7 @@ goto restart_read; } else if (ret == 0 || (ret == -1 && errno == EPIPE)) { close(state->child_stdin); - state->child_stdout = -1; + state->child_stdin = -1; fcntl(state->child_stdout, F_SETFL, 0); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Jun 21 08:34:01 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 44B191065678; Sat, 21 Jun 2008 08:34:01 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 06C571065674 for ; Sat, 21 Jun 2008 08:34:01 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DA3C78FC0A for ; Sat, 21 Jun 2008 08:34:00 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5L8Y02l091768 for ; Sat, 21 Jun 2008 08:34:00 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5L8Y0bn091765 for perforce@freebsd.org; Sat, 21 Jun 2008 08:34:00 GMT (envelope-from julian@freebsd.org) Date: Sat, 21 Jun 2008 08:34:00 GMT Message-Id: <200806210834.m5L8Y0bn091765@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 143868 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 21 Jun 2008 08:34:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=143868 Change 143868 by julian@julian_trafmon1 on 2008/06/21 08:33:58 cleanups Affected files ... .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_bridge.c#4 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/sctp6_usrreq.c#7 edit .. //depot/projects/vimage-commit2/src/sys/rpc/rpcb_clnt.c#5 edit .. //depot/projects/vimage-commit2/src/sys/security/mac/mac_net.c#5 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/netgraph/ng_bridge.c#4 (text+ko) ==== ==== //depot/projects/vimage-commit2/src/sys/netinet6/sctp6_usrreq.c#7 (text+ko) ==== @@ -32,11 +32,8 @@ #include __FBSDID("$FreeBSD: src/sys/netinet6/sctp6_usrreq.c,v 1.45 2008/06/14 07:58:05 rrs Exp $"); -#include "opt_vimage.h" - #include #include -#include #include #include #include ==== //depot/projects/vimage-commit2/src/sys/rpc/rpcb_clnt.c#5 (text+ko) ==== @@ -66,7 +66,6 @@ */ #include "opt_inet6.h" -#include "opt_vimage.h" #include #include @@ -75,7 +74,6 @@ #include #include #include -#include #include #include ==== //depot/projects/vimage-commit2/src/sys/security/mac/mac_net.c#5 (text+ko) ==== @@ -42,7 +42,6 @@ __FBSDID("$FreeBSD: src/sys/security/mac/mac_net.c,v 1.131 2007/10/28 17:55:56 rwatson Exp $"); #include "opt_mac.h" -#include "opt_vimage.h" #include #include @@ -60,7 +59,6 @@ #include #include #include -#include #include #include From owner-p4-projects@FreeBSD.ORG Sat Jun 21 08:57:25 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D698B106567B; Sat, 21 Jun 2008 08:57:24 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 98D311065678 for ; Sat, 21 Jun 2008 08:57:24 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 787B68FC21 for ; Sat, 21 Jun 2008 08:57:24 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5L8vOsT003107 for ; Sat, 21 Jun 2008 08:57:24 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5L8vORx003105 for perforce@freebsd.org; Sat, 21 Jun 2008 08:57:24 GMT (envelope-from pgj@FreeBSD.org) Date: Sat, 21 Jun 2008 08:57:24 GMT Message-Id: <200806210857.m5L8vORx003105@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 143869 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 21 Jun 2008 08:57:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=143869 Change 143869 by pgj@disznohal on 2008/06/21 08:56:53 MFen: 1.12 --> 1.13 articles/version-guide/article.sgml 1.407 --> 1.408 books/handbook/advanced-networking/chapter.sgml MFP4 after: 2 days Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/version-guide/article.sgml#6 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/advanced-networking/chapter.sgml#4 edit Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/version-guide/article.sgml#6 (text+ko) ==== @@ -1,4 +1,5 @@ %articles.ent; + Original Revision: 1.13 -->
    Válasszuk ki a nekünk igazán megfelelõ &os; @@ -397,8 +398,7 @@ <varlistentry> <term> <ulink - url="&url.base;/releng/index.html#schedule">&url.base;/releng/index.html#schedule</ulink> - </term> + url="&url.base;/releng/index.html#schedule"></ulink></term> <listitem> <para>The Release Engineering Schedule</para> </listitem> @@ -407,8 +407,7 @@ <varlistentry> <term> <ulink - url="&url.base;/security/security.html#supported-branches">&url.base;/security/security.html#supported-branches</ulink> - </term> + url="&url.base;/security/security.html#supported-branches"></ulink></term> <listitem> <para>The Security Branch Schedule</para> </listitem> ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/advanced-networking/chapter.sgml#4 (text+ko) ==== @@ -6,7 +6,7 @@ <!-- The FreeBSD Hungarian Documentation Project Translated by: PALI, Gabor <pgj@FreeBSD.org> - Original Revision: 1.407 --> + Original Revision: 1.408 --> <chapter id="advanced-networking" lang="hu"> <title>Egyéb haladó hálózati @@ -919,6 +919,23 @@ beállításokat az &man.mrouted.8; man oldalán találhatjuk.</para> + <note> + <para>A &os; 7.0 megjelenésével a + &man.mrouted.8; démont kivették az + alaprendszerbõl. Azt a <acronym>DVMRP</acronym> + többesküldési protokollt + valósítja meg, amelyet a legtöbb + alkalmazásban mostanság már a &man.pim.4; + segítségével oldanak meg. Ennek + megfelelõen a hozzátartozó + &man.map-mbone.8; és &man.mrinfo.8; + segédprogramok is eltávolításra + kerültek. Ezek a programok attól a + kiadástól kezdõdõen a + Portgyûjtemény részeként + érhetõek el a <filename + role="package">net/mrouted</filename> portban.</para> + </note> </sect2> </sect1> From owner-p4-projects@FreeBSD.ORG Sat Jun 21 09:21:50 2008 Return-Path: <owner-p4-projects@FreeBSD.ORG> Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2F9491065676; Sat, 21 Jun 2008 09:21:50 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E99611065672 for <perforce@FreeBSD.org>; Sat, 21 Jun 2008 09:21:49 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C9FF18FC28 for <perforce@FreeBSD.org>; Sat, 21 Jun 2008 09:21:49 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5L9LnOX006258 for <perforce@FreeBSD.org>; Sat, 21 Jun 2008 09:21:49 GMT (envelope-from weongyo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5L9Lnca006256 for perforce@freebsd.org; Sat, 21 Jun 2008 09:21:49 GMT (envelope-from weongyo@FreeBSD.org) Date: Sat, 21 Jun 2008 09:21:49 GMT Message-Id: <200806210921.m5L9Lnca006256@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to weongyo@FreeBSD.org using -f From: Weongyo Jeong <weongyo@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Cc: Subject: PERFORCE change 143872 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes <p4-projects.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/p4-projects> List-Post: <mailto:p4-projects@freebsd.org> List-Help: <mailto:p4-projects-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sat, 21 Jun 2008 09:21:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=143872 Change 143872 by weongyo@weongyo_ws on 2008/06/21 09:21:43 don't force short transfers if the xfer directions are to OUT. Sometimes allowing short transfers to OUT makes problems such as failing USB's firmware loading. Affected files ... .. //depot/projects/ndisusb/sys/compat/ndis/subr_usbd.c#6 edit Differences ... ==== //depot/projects/ndisusb/sys/compat/ndis/subr_usbd.c#6 (text+ko) ==== @@ -978,7 +978,6 @@ USBD_NO_TIMEOUT, usbd_xfereof); } else { /* TX (bulk OUT) */ - xfer->flags |= USBD_FORCE_SHORT_XFER; xfer->flags |= USBD_NO_COPY; usbd_setup_xfer(xfer, sc->ndisusb_ep[NDISUSB_ENDPT_BOUT], @@ -993,8 +992,6 @@ UE_GET_XFERTYPE(ep->bmAttributes), UE_GET_DIR(ep->bEndpointAddress))); - xfer->flags |= USBD_FORCE_SHORT_XFER; - usbd_setup_xfer(xfer, sc->ndisusb_ep[NDISUSB_ENDPT_IOUT], ip, xfer->buffer, xfer->length, xfer->flags, NDISUSB_INTR_TIMEOUT, usbd_xfereof); From owner-p4-projects@FreeBSD.ORG Sat Jun 21 12:55:33 2008 Return-Path: <owner-p4-projects@FreeBSD.ORG> Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0016A106567D; Sat, 21 Jun 2008 12:55:32 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B53BB1065679 for <perforce@FreeBSD.org>; Sat, 21 Jun 2008 12:55:32 +0000 (UTC) (envelope-from diego@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A079C8FC18 for <perforce@FreeBSD.org>; Sat, 21 Jun 2008 12:55:32 +0000 (UTC) (envelope-from diego@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5LCtWYh038321 for <perforce@FreeBSD.org>; Sat, 21 Jun 2008 12:55:32 GMT (envelope-from diego@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5LCtTCu038315 for perforce@freebsd.org; Sat, 21 Jun 2008 12:55:29 GMT (envelope-from diego@FreeBSD.org) Date: Sat, 21 Jun 2008 12:55:29 GMT Message-Id: <200806211255.m5LCtTCu038315@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to diego@FreeBSD.org using -f From: Diego Giagio <diego@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Cc: Subject: PERFORCE change 143875 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes <p4-projects.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/p4-projects> List-Post: <mailto:p4-projects@freebsd.org> List-Help: <mailto:p4-projects-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sat, 21 Jun 2008 12:55:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=143875 Change 143875 by diego@diego_black on 2008/06/21 12:54:45 IFC Affected files ... .. //depot/projects/soc2008/diego-audit/src/sys/amd64/amd64/mem.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/amd64/amd64/minidump_machdep.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/amd64/amd64/pmap.c#6 integrate .. //depot/projects/soc2008/diego-audit/src/sys/amd64/amd64/trap.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/amd64/conf/GENERIC#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/amd64/include/pmc_mdep.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/amd64/include/stack.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/arm/xscale/i8134x/i81342_pci.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/arm/xscale/pxa/files.pxa#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/arm/xscale/pxa/pxa_obio.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/arm/xscale/pxa/pxa_space.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/boot/i386/libi386/time.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/compat/ndis/subr_ndis.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/compat/ndis/subr_ntoskrnl.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/conf/NOTES#6 integrate .. //depot/projects/soc2008/diego-audit/src/sys/conf/files#7 integrate .. //depot/projects/soc2008/diego-audit/src/sys/conf/files.i386#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/conf/files.pc98#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/conf/options.i386#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/conf/options.pc98#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/ddb/db_ps.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/agp/agp_i810.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/ata/ata-all.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/ata/ata-chipset.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/ata/ata-pci.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/bce/if_bce.c#5 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/bce/if_bcefw.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/bce/if_bcereg.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/ciss/ciss.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/et/if_et.c#1 branch .. //depot/projects/soc2008/diego-audit/src/sys/dev/et/if_etreg.h#1 branch .. //depot/projects/soc2008/diego-audit/src/sys/dev/et/if_etvar.h#1 branch .. //depot/projects/soc2008/diego-audit/src/sys/dev/ex/if_ex.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/ex/if_ex_isa.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/ex/if_ex_pccard.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/ex/if_exvar.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/if_ndis/if_ndis.c#6 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/if_ndis/if_ndisvar.h#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/ixgbe/ixgbe.h#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/ixgbe/tcp_lro.c#2 delete .. //depot/projects/soc2008/diego-audit/src/sys/dev/ixgbe/tcp_lro.h#2 delete .. //depot/projects/soc2008/diego-audit/src/sys/dev/mii/brgphy.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/mii/miidevs#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/mii/truephy.c#1 branch .. //depot/projects/soc2008/diego-audit/src/sys/dev/mii/truephyreg.h#1 branch .. //depot/projects/soc2008/diego-audit/src/sys/dev/nmdm/nmdm.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/smc/if_smc.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/smc/if_smcvar.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/snp/snp.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/tx/if_tx.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/tx/if_txvar.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/usb/ehci.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/usb/ehcivar.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/usb/if_rum.c#6 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/usb/uplcom.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/usb/usbdevs#7 integrate .. //depot/projects/soc2008/diego-audit/src/sys/dev/vkbd/vkbd.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/fs/cd9660/cd9660_vnops.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/fs/devfs/devfs_devs.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/fs/devfs/devfs_int.h#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/fs/devfs/devfs_vnops.c#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/fs/ntfs/ntfs_ihash.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/fs/tmpfs/tmpfs_subr.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/geom/journal/g_journal.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/geom/part/g_part.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/geom/part/g_part.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/geom/part/g_part_apm.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/geom/part/g_part_bsd.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/geom/part/g_part_gpt.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/geom/part/g_part_if.m#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/geom/part/g_part_mbr.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/geom/part/g_part_pc98.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/geom/part/g_part_vtoc8.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/i386/acpica/acpi_machdep.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/i386/conf/GENERIC#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/i386/conf/NOTES#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/i386/include/pecoff_machdep.h#2 delete .. //depot/projects/soc2008/diego-audit/src/sys/kern/kern_conf.c#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/kern/kern_dtrace.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/kern/kern_jail.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/kern/link_elf_obj.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/kern/subr_bus.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/kern/sysv_sem.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/kern/uipc_sem.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/kern/vfs_aio.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/modules/Makefile#5 integrate .. //depot/projects/soc2008/diego-audit/src/sys/modules/et/Makefile#1 branch .. //depot/projects/soc2008/diego-audit/src/sys/modules/ixgbe/Makefile#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/modules/mii/Makefile#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/net/if_gre.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/net/if_gre.h#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/net/if_tap.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/net/if_tun.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/netinet/sctp.h#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/netinet/sctp_asconf.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/netinet/sctp_auth.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/netinet/sctp_bsd_addr.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/netinet/sctp_bsd_addr.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/netinet/sctp_cc_functions.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/netinet/sctp_header.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/netinet/sctp_indata.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/netinet/sctp_input.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/netinet/sctp_lock_bsd.h#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/netinet/sctp_os_bsd.h#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/netinet/sctp_output.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/netinet/sctp_pcb.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/netinet/sctp_pcb.h#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/netinet/sctp_peeloff.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/netinet/sctp_sysctl.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/netinet/sctp_sysctl.h#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/netinet/sctp_timer.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/netinet/sctp_uio.h#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/netinet/sctp_usrreq.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/netinet/sctp_var.h#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/netinet/sctputil.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/netinet/tcp_lro.c#1 branch .. //depot/projects/soc2008/diego-audit/src/sys/netinet/tcp_lro.h#1 branch .. //depot/projects/soc2008/diego-audit/src/sys/netinet/tcp_syncache.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/netinet6/sctp6_usrreq.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/pc98/conf/NOTES#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/pc98/include/pecoff_machdep.h#2 delete .. //depot/projects/soc2008/diego-audit/src/sys/pci/if_rl.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/pci/if_rlreg.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/pci/nfsmb.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/powerpc/booke/pmap.c#4 integrate .. //depot/projects/soc2008/diego-audit/src/sys/powerpc/powermac/grackle.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/powerpc/powermac/macio.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/powerpc/powermac/uninorth.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/security/audit/audit_pipe.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/security/audit/audit_worker.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/security/mac/mac_framework.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/security/mac/mac_inet.c#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/security/mac/mac_policy.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/security/mac_biba/mac_biba.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/security/mac_lomac/mac_lomac.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/security/mac_mls/mac_mls.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/security/mac_stub/mac_stub.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/security/mac_test/mac_test.c#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sys/apm.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sys/bus.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sys/conf.h#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sys/ioctl.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sys/ioctl_compat.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sys/jail.h#2 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sys/param.h#5 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sys/systm.h#3 integrate .. //depot/projects/soc2008/diego-audit/src/sys/sys/ttychars.h#2 delete .. //depot/projects/soc2008/diego-audit/src/sys/sys/ttydev.h#2 delete .. //depot/projects/soc2008/diego-audit/src/sys/vm/vnode_pager.c#3 integrate Differences ... ==== //depot/projects/soc2008/diego-audit/src/sys/amd64/amd64/mem.c#2 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mem.c,v 1.122 2008/03/12 21:43:50 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mem.c,v 1.123 2008/06/20 05:22:09 alc Exp $"); /* * Memory special file @@ -119,7 +119,7 @@ addr = trunc_page(v); eaddr = round_page(v + c); - if (addr < (vm_offset_t)KERNBASE) + if (addr < VM_MIN_KERNEL_ADDRESS) return (EFAULT); for (; addr < eaddr; addr += PAGE_SIZE) if (pmap_extract(kernel_pmap, addr) == 0) ==== //depot/projects/soc2008/diego-audit/src/sys/amd64/amd64/minidump_machdep.c#2 (text) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.4 2008/02/15 06:26:25 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.5 2008/06/20 20:59:31 alc Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -206,7 +206,7 @@ /* Walk page table pages, set bits in vm_page_dump */ ptesize = 0; pdp = (uint64_t *)PHYS_TO_DMAP(KPDPphys); - for (va = KERNBASE; va < kernel_vm_end; va += NBPDR) { + for (va = VM_MIN_KERNEL_ADDRESS; va < kernel_vm_end; va += NBPDR) { i = (va >> PDPSHIFT) & ((1ul << NPDPEPGSHIFT) - 1); /* * We always write a page, even if it is zero. Each @@ -278,7 +278,7 @@ mdhdr.msgbufsize = msgbufp->msg_size; mdhdr.bitmapsize = vm_page_dump_size; mdhdr.ptesize = ptesize; - mdhdr.kernbase = KERNBASE; + mdhdr.kernbase = VM_MIN_KERNEL_ADDRESS; mdhdr.dmapbase = DMAP_MIN_ADDRESS; mdhdr.dmapend = DMAP_MAX_ADDRESS; @@ -312,7 +312,7 @@ /* Dump kernel page table pages */ pdp = (uint64_t *)PHYS_TO_DMAP(KPDPphys); - for (va = KERNBASE; va < kernel_vm_end; va += NBPDR) { + for (va = VM_MIN_KERNEL_ADDRESS; va < kernel_vm_end; va += NBPDR) { i = (va >> PDPSHIFT) & ((1ul << NPDPEPGSHIFT) - 1); /* We always write a page, even if it is zero */ if ((pdp[i] & PG_V) == 0) { ==== //depot/projects/soc2008/diego-audit/src/sys/amd64/amd64/pmap.c#6 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.619 2008/06/01 07:36:59 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.622 2008/06/20 05:22:09 alc Exp $"); /* * Manages physical address maps. @@ -1673,7 +1673,7 @@ static int kvm_size(SYSCTL_HANDLER_ARGS) { - unsigned long ksize = VM_MAX_KERNEL_ADDRESS - KERNBASE; + unsigned long ksize = VM_MAX_KERNEL_ADDRESS - VM_MIN_KERNEL_ADDRESS; return sysctl_handle_long(oidp, &ksize, 0, req); } @@ -1703,7 +1703,7 @@ mtx_assert(&kernel_map->system_mtx, MA_OWNED); if (kernel_vm_end == 0) { - kernel_vm_end = KERNBASE; + kernel_vm_end = VM_MIN_KERNEL_ADDRESS; nkpt = 0; while ((*pmap_pde(kernel_pmap, kernel_vm_end) & PG_V) != 0) { kernel_vm_end = (kernel_vm_end + PAGE_SIZE * NPTEPG) & ~(PAGE_SIZE * NPTEPG - 1); @@ -2759,8 +2759,8 @@ /* * Tries to promote the 512, contiguous 4KB page mappings that are within a - * single page table page to a single 2MB page mapping. For promotion to - * occur, two conditions must be met: (1) the 4KB page mappings must map + * single page table page (PTP) to a single 2MB page mapping. For promotion + * to occur, two conditions must be met: (1) the 4KB page mappings must map * aligned, contiguous physical memory and (2) the 4KB page mappings must have * identical characteristics. */ @@ -2768,31 +2768,46 @@ pmap_promote_pde(pmap_t pmap, pd_entry_t *pde, vm_offset_t va) { pd_entry_t newpde; - pt_entry_t *firstpte, oldpte, *pte; + pt_entry_t *firstpte, oldpte, pa, *pte; vm_offset_t oldpteva; - vm_paddr_t pa; vm_page_t mpte; PMAP_LOCK_ASSERT(pmap, MA_OWNED); + + /* + * Examine the first PTE in the specified PTP. Abort if this PTE is + * either invalid, unused, or does not map the first 4KB physical page + * within a 2MB page. + */ firstpte = (pt_entry_t *)PHYS_TO_DMAP(*pde & PG_FRAME); +setpde: newpde = *firstpte; - if ((newpde & (PG_A | PG_V)) != (PG_A | PG_V)) { + if ((newpde & ((PG_FRAME & PDRMASK) | PG_A | PG_V)) != (PG_A | PG_V)) { pmap_pde_p_failures++; CTR2(KTR_PMAP, "pmap_promote_pde: failure for va %#lx" " in pmap %p", va, pmap); return; } - if ((newpde & (PG_M | PG_RW)) == PG_RW) + if ((newpde & (PG_M | PG_RW)) == PG_RW) { + /* + * When PG_M is already clear, PG_RW can be cleared without + * a TLB invalidation. + */ + if (!atomic_cmpset_long(firstpte, newpde, newpde & ~PG_RW)) + goto setpde; newpde &= ~PG_RW; + } - /* - * Check all the ptes before promotion + /* + * Examine each of the other PTEs in the specified PTP. Abort if this + * PTE maps an unexpected 4KB physical page or does not have identical + * characteristics to the first PTE. */ - pa = newpde & PG_PS_FRAME; - for (pte = firstpte; pte < firstpte + NPTEPG; pte++) { -retry: + pa = (newpde & (PG_PS_FRAME | PG_A | PG_V)) + NBPDR - PAGE_SIZE; + for (pte = firstpte + NPTEPG - 1; pte > firstpte; pte--) { +setpte: oldpte = *pte; - if ((oldpte & PG_FRAME) != pa) { + if ((oldpte & (PG_FRAME | PG_A | PG_V)) != pa) { pmap_pde_p_failures++; CTR2(KTR_PMAP, "pmap_promote_pde: failure for va %#lx" " in pmap %p", va, pmap); @@ -2804,7 +2819,7 @@ * without a TLB invalidation. */ if (!atomic_cmpset_long(pte, oldpte, oldpte & ~PG_RW)) - goto retry; + goto setpte; oldpte &= ~PG_RW; oldpteva = (oldpte & PG_FRAME & PDRMASK) | (va & ~PDRMASK); @@ -2817,7 +2832,7 @@ " in pmap %p", va, pmap); return; } - pa += PAGE_SIZE; + pa -= PAGE_SIZE; } /* ==== //depot/projects/soc2008/diego-audit/src/sys/amd64/amd64/trap.c#3 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.326 2008/05/24 06:32:26 jb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.327 2008/06/20 05:22:09 alc Exp $"); /* * AMD64 Trap and System call handling @@ -605,7 +605,7 @@ vm_offset_t eva = frame->tf_addr; va = trunc_page(eva); - if (va >= KERNBASE) { + if (va >= VM_MIN_KERNEL_ADDRESS) { /* * Don't allow user-mode faults in kernel address space. */ ==== //depot/projects/soc2008/diego-audit/src/sys/amd64/conf/GENERIC#4 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.501 2008/05/27 02:22:32 yongari Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.502 2008/06/20 19:28:33 delphij Exp $ cpu HAMMER ident GENERIC @@ -204,6 +204,7 @@ device bfe # Broadcom BCM440x 10/100 Ethernet device bge # Broadcom BCM570xx Gigabit Ethernet device dc # DEC/Intel 21143 and various workalikes +device et # Agere ET1310 10/100/Gigabit Ethernet device fxp # Intel EtherExpress PRO/100B (82557, 82558) device jme # JMicron JMC250 Gigabit/JMC260 Fast Ethernet device lge # Level 1 LXT1001 gigabit Ethernet ==== //depot/projects/soc2008/diego-audit/src/sys/amd64/include/pmc_mdep.h#2 (text+ko) ==== @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/pmc_mdep.h,v 1.4 2007/12/07 08:20:15 jkoshy Exp $ + * $FreeBSD: src/sys/amd64/include/pmc_mdep.h,v 1.5 2008/06/20 05:22:09 alc Exp $ */ /* Machine dependent interfaces */ @@ -74,8 +74,8 @@ #define PMC_IN_KERNEL_STACK(S,START,END) \ ((S) >= (START) && (S) < (END)) -#define PMC_IN_KERNEL(va) (((va) >= DMAP_MIN_ADDRESS && \ - (va) < DMAP_MAX_ADDRESS) || ((va) >= KERNBASE && \ +#define PMC_IN_KERNEL(va) (((va) >= DMAP_MIN_ADDRESS && \ + (va) < DMAP_MAX_ADDRESS) || ((va) >= VM_MIN_KERNEL_ADDRESS && \ (va) < VM_MAX_KERNEL_ADDRESS)) #define PMC_IN_USERSPACE(va) ((va) <= VM_MAXUSER_ADDRESS) ==== //depot/projects/soc2008/diego-audit/src/sys/amd64/include/stack.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $FreeBSD: src/sys/amd64/include/stack.h,v 1.1 2007/12/02 20:40:31 rwatson Exp $ + * $FreeBSD: src/sys/amd64/include/stack.h,v 1.2 2008/06/20 05:22:09 alc Exp $ */ #ifndef _MACHINE_STACK_H_ @@ -33,7 +33,7 @@ * Stack trace. */ #define INKERNEL(va) (((va) >= DMAP_MIN_ADDRESS && (va) < DMAP_MAX_ADDRESS) \ - || ((va) >= KERNBASE && (va) < VM_MAX_KERNEL_ADDRESS)) + || ((va) >= VM_MIN_KERNEL_ADDRESS && (va) < VM_MAX_KERNEL_ADDRESS)) struct amd64_frame { struct amd64_frame *f_frame; ==== //depot/projects/soc2008/diego-audit/src/sys/arm/xscale/i8134x/i81342_pci.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/xscale/i8134x/i81342_pci.c,v 1.2 2007/09/30 11:05:14 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/i8134x/i81342_pci.c,v 1.3 2008/06/12 01:46:06 kevlo Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -185,7 +185,7 @@ IOP34X_PCIE_OIOBAR_VADDR, (sc->sc_is_atux ? IOP34X_PCIX_OIOBAR_VADDR : IOP34X_PCIE_OIOBAR_VADDR) + IOP34X_OIOBAR_SIZE) != 0) { - panic("i80321_pci_probe: failed to set up I/O rman"); + panic("i81342_pci_probe: failed to set up I/O rman"); } sc->sc_mem_rman.rm_type = RMAN_ARRAY; sc->sc_mem_rman.rm_descr = "I81342 PCI Memory"; ==== //depot/projects/soc2008/diego-audit/src/sys/arm/xscale/pxa/files.pxa#2 (text+ko) ==== @@ -1,5 +1,6 @@ -# $FreeBSD: src/sys/arm/xscale/pxa/files.pxa,v 1.1 2008/06/06 05:08:09 benno Exp $ +# $FreeBSD: src/sys/arm/xscale/pxa/files.pxa,v 1.2 2008/06/10 03:44:14 kevlo Exp $ +arm/arm/bus_space_generic.c standard arm/arm/cpufunc_asm_xscale.S standard arm/arm/irq_dispatch.S standard ==== //depot/projects/soc2008/diego-audit/src/sys/arm/xscale/pxa/pxa_obio.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/xscale/pxa/pxa_obio.c,v 1.1 2008/06/06 05:08:09 benno Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/pxa/pxa_obio.c,v 1.2 2008/06/10 06:06:15 kevlo Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -183,6 +183,12 @@ } static int +pxa_teardown_intr(device_t dev, device_t child, struct resource *ires, + void *cookie) +{ + return (BUS_TEARDOWN_INTR(device_get_parent(dev), child, ires, cookie));} + +static int pxa_read_ivar(device_t dev, device_t child, int which, uintptr_t *result) { struct obio_device *od; @@ -313,19 +319,20 @@ } static device_method_t pxa_methods[] = { - DEVMETHOD(device_identify, pxa_identify), - DEVMETHOD(device_probe, pxa_probe), - DEVMETHOD(device_attach, pxa_attach), + DEVMETHOD(device_identify, pxa_identify), + DEVMETHOD(device_probe, pxa_probe), + DEVMETHOD(device_attach, pxa_attach), - DEVMETHOD(bus_print_child, pxa_print_child), + DEVMETHOD(bus_print_child, pxa_print_child), - DEVMETHOD(bus_read_ivar, pxa_read_ivar), - DEVMETHOD(bus_setup_intr, pxa_setup_intr), + DEVMETHOD(bus_read_ivar, pxa_read_ivar), + DEVMETHOD(bus_setup_intr, pxa_setup_intr), + DEVMETHOD(bus_teardown_intr, pxa_teardown_intr), - DEVMETHOD(bus_get_resource_list, pxa_get_resource_list), - DEVMETHOD(bus_alloc_resource, pxa_alloc_resource), - DEVMETHOD(bus_release_resource, pxa_release_resource), - DEVMETHOD(bus_activate_resource, pxa_activate_resource), + DEVMETHOD(bus_get_resource_list, pxa_get_resource_list), + DEVMETHOD(bus_alloc_resource, pxa_alloc_resource), + DEVMETHOD(bus_release_resource, pxa_release_resource), + DEVMETHOD(bus_activate_resource, pxa_activate_resource), {0, 0} }; ==== //depot/projects/soc2008/diego-audit/src/sys/arm/xscale/pxa/pxa_space.c#2 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/xscale/pxa/pxa_space.c,v 1.1 2008/06/06 05:08:09 benno Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/pxa/pxa_space.c,v 1.2 2008/06/10 03:44:14 kevlo Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -48,13 +48,6 @@ #include <sys/kernel.h> #include <sys/malloc.h> -#include <machine/pcb.h> - -#include <vm/vm.h> -#include <vm/pmap.h> -#include <vm/vm_kern.h> -#include <vm/vm_extern.h> - #include <machine/bus.h> #include <arm/xscale/pxa/pxareg.h> @@ -63,7 +56,6 @@ MALLOC_DEFINE(M_PXATAG, "PXA bus_space tags", "Bus_space tags for PXA"); /* Prototypes for all the bus_space structure functions */ -bs_protos(obio); bs_protos(generic); bs_protos(generic_armv4); bs_protos(pxa); @@ -77,16 +69,16 @@ (void *) 0, /* mapping/unmapping */ - obio_bs_map, - obio_bs_unmap, - obio_bs_subregion, + generic_bs_map, + generic_bs_unmap, + generic_bs_subregion, /* allocation/deallocation */ - obio_bs_alloc, - obio_bs_free, + generic_bs_alloc, + generic_bs_free, /* barrier */ - obio_bs_barrier, + generic_bs_barrier, /* read (single) */ pxa_bs_r_1, @@ -174,94 +166,6 @@ return ((bus_space_tag_t)tag); } -int -obio_bs_map(void *t, bus_addr_t bpa, bus_size_t size, int flags, - bus_space_handle_t *bshp) -{ - const struct pmap_devmap *pd; - vm_paddr_t startpa, endpa, pa, offset; - vm_offset_t va; - pt_entry_t *pte; - - if ((pd = pmap_devmap_find_pa(bpa, size)) != NULL) { - /* Device was statically mapped. */ - *bshp = pd->pd_va + (bpa - pd->pd_pa); - return (0); - } - - endpa = round_page(bpa + size); - offset = bpa & PAGE_MASK; - startpa = trunc_page(bpa); - - va = kmem_alloc(kernel_map, endpa - startpa); - if (va == 0) - return (ENOMEM); - - *bshp = va + offset; - - for (pa = startpa; pa < endpa; pa += PAGE_SIZE, va += PAGE_SIZE) { - pmap_kenter(va, pa); - pte = vtopte(va); - *pte &= ~L2_S_CACHE_MASK; - PTE_SYNC(pte); - } - - return (0); -} - -int -obio_bs_alloc(void *t, bus_addr_t rstart, bus_addr_t rend, bus_size_t size, - bus_size_t alignment, bus_size_t boundary, int flags, bus_addr_t *bpap, - bus_space_handle_t *bshp) -{ - - panic("obio_bs_alloc(): not implemented"); -} - - -void -obio_bs_unmap(void *t, bus_space_handle_t h, bus_size_t size) -{ - vm_offset_t va, endva; - - if (pmap_devmap_find_va((vm_offset_t)t, size) != NULL) { - /* Device was statically mapped; nothing to do. */ - return; - } - - endva = round_page((vm_offset_t)t + size); - va = trunc_page((vm_offset_t)t); - - while (va < endva) { - pmap_kremove(va); - va += PAGE_SIZE; - } - kmem_free(kernel_map, va, endva - va); -} - -void -obio_bs_free(void *t, bus_space_handle_t bsh, bus_size_t size) -{ - - panic("obio_bs_free(): not implemented"); -} - -int -obio_bs_subregion(void *t, bus_space_handle_t bsh, bus_size_t offset, - bus_size_t size, bus_space_handle_t *nbshp) -{ - - *nbshp = bsh + offset; - return (0); -} - -void -obio_bs_barrier(void *t, bus_space_handle_t bsh, bus_size_t offset, - bus_size_t len, int flags) -{ - - /* Nothing to do. */ -} #define READ_SINGLE(type, proto, base) \ type \ ==== //depot/projects/soc2008/diego-audit/src/sys/boot/i386/libi386/time.c#2 (text+ko) ==== @@ -25,25 +25,23 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/time.c,v 1.5 2003/08/25 23:28:31 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/time.c,v 1.6 2008/06/16 17:04:04 olli Exp $"); #include <stand.h> #include <btxv86.h> #include "bootstrap.h" #include "libi386.h" +static int bios_seconds(void); + /* - * Return the time in seconds since the beginning of the day. + * Return the BIOS time-of-day value. * - * If we pass midnight, don't wrap back to 0. - * * XXX uses undocumented BCD support from libstand. */ - -time_t -time(time_t *t) +static int +bios_seconds(void) { - static time_t lasttime, now; int hr, minute, sec; v86.ctl = 0; @@ -55,7 +53,33 @@ minute = bcd2bin(v86.ecx & 0xff); /* minute in %cl */ sec = bcd2bin((v86.edx & 0xff00) >> 8); /* second in %dh */ - now = hr * 3600 + minute * 60 + sec; + return (hr * 3600 + minute * 60 + sec); +} + +/* + * Return the time in seconds since the beginning of the day. + * + * Some BIOSes (notably qemu) don't correctly read the RTC + * registers in an atomic way, sometimes returning bogus values. + * Therefore we "debounce" the reading by accepting it only when + * we got two identical values in succession. + * + * If we pass midnight, don't wrap back to 0. + */ +time_t +time(time_t *t) +{ + static time_t lasttime; + time_t now, check; + int try; + + try = 0; + check = bios_seconds(); + do { + now = check; + check = bios_seconds(); + } while (now != check && ++try < 1000); + if (now < lasttime) now += 24 * 3600; lasttime = now; ==== //depot/projects/soc2008/diego-audit/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#2 (text+ko) ==== @@ -18,7 +18,7 @@ * * CDDL HEADER END * - * $FreeBSD: src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c,v 1.4 2008/06/01 01:46:37 jb Exp $ + * $FreeBSD: src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c,v 1.5 2008/06/11 18:55:19 ed Exp $ */ /* @@ -16445,6 +16445,7 @@ static struct cdevsw dtrace_cdevsw = { .d_version = D_VERSION, + .d_flags = D_NEEDMINOR, .d_close = dtrace_close, .d_ioctl = dtrace_ioctl, .d_open = dtrace_open, ==== //depot/projects/soc2008/diego-audit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#2 (text+ko) ==== @@ -279,12 +279,6 @@ #ifndef MAXMIN64 #define MAXMIN64 0xffffffffUL #endif -#ifndef major -#define major(x) ((int)(((u_int)(x) >> 8)&0xff)) /* major number */ -#endif -#ifndef minor -#define minor(x) ((int)((x)&0xffff00ff)) /* minor number */ -#endif /* * Create special expldev for ZFS private use. @@ -297,7 +291,7 @@ static uint64_t zfs_expldev(dev_t dev) { - return (((uint64_t)major(dev) << NBITSMINOR64) | minor(dev)); + return (((uint64_t)umajor(dev) << NBITSMINOR64) | uminor(dev)); } /* * Special cmpldev for ZFS private use. ==== //depot/projects/soc2008/diego-audit/src/sys/compat/ndis/subr_ndis.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.112 2008/05/15 04:29:28 weongyo Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.113 2008/06/11 07:55:07 weongyo Exp $"); /* * This file implements a translation layer between the BSD networking @@ -1018,7 +1018,7 @@ sc = device_get_softc(dev); ifp = sc->ifp; - if (ifp->if_flags & IFF_DEBUG) { + if (ifp != NULL && ifp->if_flags & IFF_DEBUG) { error = pe_get_message((vm_offset_t)drv->dro_driverstart, code, &str, &i, &flags); if (error == 0) { @@ -1036,7 +1036,7 @@ device_printf (dev, "NDIS ERROR: %x (%s)\n", code, str == NULL ? "unknown error" : str); - if (ifp->if_flags & IFF_DEBUG) { + if (ifp != NULL && ifp->if_flags & IFF_DEBUG) { device_printf (dev, "NDIS NUMERRORS: %x\n", numerrors); va_start(ap, numerrors); for (i = 0; i < numerrors; i++) ==== //depot/projects/soc2008/diego-audit/src/sys/compat/ndis/subr_ntoskrnl.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.95 2008/05/30 06:31:55 weongyo Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.96 2008/06/15 13:37:29 cokane Exp $"); #include <sys/ctype.h> #include <sys/unistd.h> @@ -225,6 +225,8 @@ static ndis_status PsCreateSystemThread(ndis_handle *, uint32_t, void *, ndis_handle, void *, void *, void *); static ndis_status PsTerminateSystemThread(ndis_status); +static ndis_status IoGetDeviceObjectPointer(unicode_string *, + uint32_t, void *, device_object *); static ndis_status IoGetDeviceProperty(device_object *, uint32_t, uint32_t, void *, uint32_t *); static void KeInitializeMutex(kmutant *, uint32_t); @@ -3235,6 +3237,16 @@ } static ndis_status +IoGetDeviceObjectPointer(name, reqaccess, fileobj, devobj) + unicode_string *name; + uint32_t reqaccess; + void *fileobj; + device_object *devobj; +{ + return(STATUS_SUCCESS); +} + +static ndis_status IoGetDeviceProperty(devobj, regprop, buflen, prop, reslen) device_object *devobj; uint32_t regprop; @@ -4391,6 +4403,7 @@ IMPORT_SFUNC(MmUnmapIoSpace, 2), IMPORT_SFUNC(KeInitializeSpinLock, 1), IMPORT_SFUNC(IoIsWdmVersionAvailable, 2), + IMPORT_SFUNC(IoGetDeviceObjectPointer, 4), IMPORT_SFUNC(IoGetDeviceProperty, 5), IMPORT_SFUNC(IoAllocateWorkItem, 1), IMPORT_SFUNC(IoFreeWorkItem, 1), ==== //depot/projects/soc2008/diego-audit/src/sys/conf/NOTES#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1494 2008/06/08 01:58:11 marcel Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1495 2008/06/20 19:28:33 delphij Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -1876,6 +1876,7 @@ device cxgb # Chelsio T3 10 Gigabit Ethernet device cxgb_t3fw # Chelsio T3 10 Gigabit Ethernet firmware device dc # DEC/Intel 21143 and various workalikes +device et # Agere ET1310 10/100/Gigabit Ethernet device fxp # Intel EtherExpress PRO/100B (82557, 82558) hint.fxp.0.prefer_iomap="0" device gem # Apple GMAC/Sun ERI/Sun GEM ==== //depot/projects/soc2008/diego-audit/src/sys/conf/files#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1307 2008/06/06 05:00:49 benno Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1310 2008/06/20 19:28:33 delphij Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -636,6 +636,7 @@ compile-with "${NORMAL_C} -I$S/dev/em" dev/em/e1000_osdep.c optional em | igb \ compile-with "${NORMAL_C} -I$S/dev/em" +dev/et/if_et.c optional et dev/en/if_en_pci.c optional en pci dev/en/midway.c optional en dev/ep/if_ep.c optional ep @@ -904,6 +905,7 @@ dev/mii/smcphy.c optional miibus | smcphy dev/mii/tdkphy.c optional miibus | tdkphy dev/mii/tlphy.c optional miibus | tlphy +dev/mii/truephy.c optional miibus | truephy dev/mii/ukphy.c optional miibus | mii dev/mii/ukphy_subr.c optional miibus | mii dev/mii/xmphy.c optional miibus | xmphy @@ -1817,7 +1819,7 @@ netatalk/aarp.c optional netatalk netatalk/at_control.c optional netatalk netatalk/at_proto.c optional netatalk -netatalk/at_rmx.c optional netatalkdebug +netatalk/at_rmx.c optional netatalk netatalk/ddp_input.c optional netatalk netatalk/ddp_output.c optional netatalk netatalk/ddp_pcb.c optional netatalk @@ -1946,6 +1948,7 @@ netinet/tcp_debug.c optional tcpdebug netinet/tcp_hostcache.c optional inet netinet/tcp_input.c optional inet +netinet/tcp_lro.c optional inet netinet/tcp_output.c optional inet netinet/tcp_offload.c optional inet netinet/tcp_reass.c optional inet ==== //depot/projects/soc2008/diego-audit/src/sys/conf/files.i386#3 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.i386,v 1.596 2008/05/26 10:39:52 bz Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.597 2008/06/14 12:51:44 wkoszek Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -107,7 +107,6 @@ compat/ndis/subr_pe.c optional ndisapi pci compat/ndis/subr_usbd.c optional ndisapi pci compat/ndis/winx32_wrap.S optional ndisapi pci -compat/pecoff/imgact_pecoff.c optional pecoff_support compat/svr4/imgact_svr4.c optional compat_svr4 compat/svr4/svr4_fcntl.c optional compat_svr4 compat/svr4/svr4_filio.c optional compat_svr4 ==== //depot/projects/soc2008/diego-audit/src/sys/conf/files.pc98#3 (text+ko) ==== @@ -3,7 +3,7 @@ # # modified for PC-9801/PC-9821 # -# $FreeBSD: src/sys/conf/files.pc98,v 1.363 2008/05/26 10:39:52 bz Exp $ +# $FreeBSD: src/sys/conf/files.pc98,v 1.364 2008/06/14 12:51:44 wkoszek Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -70,7 +70,6 @@ compat/linux/linux_time.c optional compat_linux compat/linux/linux_uid16.c optional compat_linux compat/linux/linux_util.c optional compat_linux -compat/pecoff/imgact_pecoff.c optional pecoff_support compat/svr4/imgact_svr4.c optional compat_svr4 compat/svr4/svr4_fcntl.c optional compat_svr4 compat/svr4/svr4_filio.c optional compat_svr4 ==== //depot/projects/soc2008/diego-audit/src/sys/conf/options.i386#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options.i386,v 1.241 2008/05/26 10:39:52 bz Exp $ +# $FreeBSD: src/sys/conf/options.i386,v 1.242 2008/06/14 12:51:44 wkoszek Exp $ # Options specific to the i386 platform kernels AUTO_EOI_1 opt_auto_eoi.h @@ -27,8 +27,6 @@ LINPROCFS opt_dontuse.h LINSYSFS opt_dontuse.h NDISAPI opt_dontuse.h -PECOFF_DEBUG opt_pecoff.h -PECOFF_SUPPORT opt_dontuse.h # Change KVM size. Changes things all over the kernel. KVA_PAGES opt_global.h ==== //depot/projects/soc2008/diego-audit/src/sys/conf/options.pc98#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options.pc98,v 1.203 2008/05/26 10:39:52 bz Exp $ +# $FreeBSD: src/sys/conf/options.pc98,v 1.204 2008/06/14 12:51:44 wkoszek Exp $ # Options specific to the pc98 platform kernels AUTO_EOI_1 opt_auto_eoi.h @@ -25,8 +25,6 @@ DEBUG_SVR4 opt_svr4.h LINPROCFS opt_dontuse.h LINSYSFS opt_dontuse.h -PECOFF_DEBUG opt_pecoff.h -PECOFF_SUPPORT opt_dontuse.h # Change KVM size. Changes things all over the kernel. KVA_PAGES opt_global.h ==== //depot/projects/soc2008/diego-audit/src/sys/ddb/db_ps.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/ddb/db_ps.c,v 1.68 2008/03/25 20:36:32 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/ddb/db_ps.c,v 1.69 2008/06/18 20:42:01 attilio Exp $"); #include <sys/param.h> #include <sys/cons.h> @@ -292,6 +292,7 @@ DB_SHOW_COMMAND(thread, db_show_thread) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Jun 21 13:33:11 2008 Return-Path: <owner-p4-projects@FreeBSD.ORG> Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5465E1065679; Sat, 21 Jun 2008 13:33:11 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 16BBD1065672 for <perforce@FreeBSD.org>; Sat, 21 Jun 2008 13:33:11 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 05BC28FC12 for <perforce@FreeBSD.org>; Sat, 21 Jun 2008 13:33:11 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5LDXAbE042921 for <perforce@FreeBSD.org>; Sat, 21 Jun 2008 13:33:10 GMT (envelope-from weongyo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5LDXARr042919 for perforce@freebsd.org; Sat, 21 Jun 2008 13:33:10 GMT (envelope-from weongyo@FreeBSD.org) Date: Sat, 21 Jun 2008 13:33:10 GMT Message-Id: <200806211333.m5LDXARr042919@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to weongyo@FreeBSD.org using -f From: Weongyo Jeong <weongyo@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Cc: Subject: PERFORCE change 143877 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes <p4-projects.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/p4-projects> List-Post: <mailto:p4-projects@freebsd.org> List-Help: <mailto:p4-projects-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sat, 21 Jun 2008 13:33:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=143877 Change 143877 by weongyo@weongyo_ws on 2008/06/21 13:32:41 choice a smaller buffer to save the config descriptors that this provents a overwrite if the buffer to save is smaller than the total size of config descriptors. Affected files ... .. //depot/projects/ndisusb/sys/compat/ndis/subr_usbd.c#7 edit Differences ... ==== //depot/projects/ndisusb/sys/compat/ndis/subr_usbd.c#7 (text+ko) ==== @@ -368,7 +368,7 @@ ctldesc->ucd_trans_buflen = 0; return usbd_usb2urb(status); } - len = UGETW(cd.wTotalLength); + len = MIN(UGETW(cd.wTotalLength), ctldesc->ucd_trans_buflen); /* Get the full descriptor. Try a few times for slow devices. */ for (i = 0; i < 3; i++) { status = usbd_get_desc(uaa->device, From owner-p4-projects@FreeBSD.ORG Sat Jun 21 13:48:27 2008 Return-Path: <owner-p4-projects@FreeBSD.ORG> Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F066C1065689; Sat, 21 Jun 2008 13:48:26 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B2623106567A for <perforce@FreeBSD.org>; Sat, 21 Jun 2008 13:48:26 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A20688FC0C for <perforce@FreeBSD.org>; Sat, 21 Jun 2008 13:48:26 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5LDmQ1S044163 for <perforce@FreeBSD.org>; Sat, 21 Jun 2008 13:48:26 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5LDmQOq044161 for perforce@freebsd.org; Sat, 21 Jun 2008 13:48:26 GMT (envelope-from hselasky@FreeBSD.org) Date: Sat, 21 Jun 2008 13:48:26 GMT Message-Id: <200806211348.m5LDmQOq044161@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky <hselasky@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Cc: Subject: PERFORCE change 143878 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes <p4-projects.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/p4-projects> List-Post: <mailto:p4-projects@freebsd.org> List-Help: <mailto:p4-projects-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sat, 21 Jun 2008 13:48:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=143878 Change 143878 by hselasky@hselasky_laptop001 on 2008/06/21 13:47:29 Make the new USB interface available when building USB kernel modules. Affected files ... .. //depot/projects/usb/src/sys/conf/kmod.mk#9 edit Differences ... ==== //depot/projects/usb/src/sys/conf/kmod.mk#9 (text+ko) ==== @@ -331,6 +331,7 @@ dev/sound/pcm/feeder_if.m dev/sound/pcm/mixer_if.m \ dev/sound/midi/mpu_if.m dev/sound/midi/mpufoi_if.m \ dev/sound/midi/synth_if.m dev/usb/usb_if.m isa/isa_if.m \ + dev/usb2/core/usb2_if.m \ kern/bus_if.m kern/cpufreq_if.m kern/device_if.m kern/serdev_if.m \ libkern/iconv_converter_if.m opencrypto/cryptodev_if.m \ pc98/pc98/canbus_if.m From owner-p4-projects@FreeBSD.ORG Sat Jun 21 14:40:25 2008 Return-Path: <owner-p4-projects@FreeBSD.ORG> Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 841241065681; Sat, 21 Jun 2008 14:40:25 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2DC271065679 for <perforce@freebsd.org>; Sat, 21 Jun 2008 14:40:25 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1F8F88FC0C for <perforce@freebsd.org>; Sat, 21 Jun 2008 14:40:25 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5LEeNX6049655 for <perforce@freebsd.org>; Sat, 21 Jun 2008 14:40:23 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5LEeNfp049653 for perforce@freebsd.org; Sat, 21 Jun 2008 14:40:23 GMT (envelope-from gabor@freebsd.org) Date: Sat, 21 Jun 2008 14:40:23 GMT Message-Id: <200806211440.m5LEeNfp049653@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan <gabor@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Cc: Subject: PERFORCE change 143880 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes <p4-projects.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/p4-projects> List-Post: <mailto:p4-projects@freebsd.org> List-Help: <mailto:p4-projects-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sat, 21 Jun 2008 14:40:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=143880 Change 143880 by gabor@gabor_server on 2008/06/21 14:40:13 - Polish GNU compatibility blog Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/grep.c#33 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/grep.c#33 (text+ko) ==== @@ -195,76 +195,80 @@ Our library rejects '|' with empty subexpressions. Just cut out those parts, e.g. "(|a|b||c|)" will be "(a|b|c)" */ st = pat; - while (((ptr = strstr(st, "|)"))) != NULL && (strstr(st, "\\|)") != (ptr - 1))) { - strlcpy(ptr, &(ptr[1]), strlen(ptr)); + while (((ptr = strstr(st, "|)"))) != NULL) { + if (strstr(st, "\\|)") != (ptr - 1)) + strlcpy(ptr, &(ptr[1]), strlen(ptr)); st = ptr; } st = pat; - while (((ptr = strstr(st, "(|")) != NULL) && (strstr(st, "(\\|") != ptr) && (strstr(st, "\\(|") != (ptr - 1))) { - strlcpy(&(ptr[1]), &(ptr[2]), strlen(ptr)); - st = ptr; + while ((ptr = strstr(st, "(|")) != NULL) { + if ((strstr(st, "(\\|") != ptr) && (strstr(st, "\\(|") != (ptr - 1))) + strlcpy(&(ptr[1]), &(ptr[2]), strlen(ptr)); + st = ptr + 1; } st = pat; - while (((ptr = strstr(st, "||")) != NULL) && (strstr(st, "\\||") != (ptr - 1))) { - strlcpy(&(ptr[1]), &(ptr[2]), strlen(ptr)); - st = ptr; + while ((ptr = strstr(st, "||")) != NULL) { + if (strstr(st, "\\||") != (ptr - 1)) + strlcpy(&(ptr[1]), &(ptr[2]), strlen(ptr)); + st = ptr + 1; } st = pat; - while (((ptr = strstr(st, "*?")) != NULL) && (strstr(st, "\\*?") != (ptr - 1))) { - strlcpy(&(ptr[1]), &(ptr[2]), strlen(ptr)); - st = ptr; + while ((ptr = strstr(st, "*?")) != NULL) { + if (strstr(st, "\\*?") != (ptr - 1)) + strlcpy(&(ptr[1]), &(ptr[2]), strlen(ptr)); + st = ptr + 1; } st = pat; - while (((ptr = strstr(st, "?*")) != NULL) && (strstr(st, "\\?*") != (ptr - 1))) { - strlcpy(&(ptr[1]), &(ptr[2]), strlen(ptr)); - st = ptr; + while ((ptr = strstr(st, "?*")) != NULL) { + if (strstr(st, "\\?*") != (ptr - 1)) + strlcpy(&(ptr[1]), &(ptr[2]), strlen(ptr)); + st = ptr + 1; } st = pat; - while (((ptr = strstr(st, "**")) != NULL) && (strstr(st, "\\**") != (ptr - 1)) && (strstr(st, "\\(**") != (ptr - 2))) { - strlcpy(&(ptr[1]), &(ptr[2]), strlen(ptr)); - st = ptr; + while ((ptr = strstr(st, "**")) != NULL) { + if ((strstr(st, "\\**") != (ptr - 1)) && (strstr(st, "\\(**") != (ptr - 2))) + strlcpy(&(ptr[1]), &(ptr[2]), strlen(ptr)); + st = ptr + 1; } st = pat; - while (((ptr = strstr(st, "??")) != NULL) && (strstr(st, "\\??") != (ptr - 1))) { - strlcpy(&(ptr[1]), &(ptr[2]), strlen(ptr)); - st = ptr; + while ((ptr = strstr(st, "??")) != NULL) { + if (strstr(st, "\\??") != (ptr - 1)) + strlcpy(&(ptr[1]), &(ptr[2]), strlen(ptr)); + st = ptr + 1; } st = pat; while ((ptr = strstr(st, "^*")) != NULL) { strlcpy(&(ptr[1]), &(ptr[2]), strlen(ptr)); - st = ptr; + st = ptr + 1; } st = pat; - while ((ptr = strstr(st, "(*")) != NULL && (strstr(st, "\\(*") != (ptr - 1))) { - strlcpy(&(ptr[1]), &(ptr[2]), strlen(ptr)); - st = ptr; + while ((ptr = strstr(st, "(*")) != NULL) { + if (strstr(st, "\\(*") != (ptr - 1)) + strlcpy(&(ptr[1]), &(ptr[2]), strlen(ptr)); + st = ptr + 1; } st = pat; -/* XXX - while ((ptr = strstr(st, "{1")) != NULL && (strstr(st, "\\{1") != (ptr - 1))) { - st = ptr; - } */ if (Eflag) { st = pat; lbr = 0; while ((ptr = strstr(st, "(")) != NULL) { if (strstr(st, "\\(") != (ptr - 1)) lbr++; - st = &(ptr[1]); + st = ptr + 1; } st = pat; rbr = 0; while ((ptr = strstr(st, ")")) != NULL) { if (strstr(st, "\\)") != (ptr - 1)) rbr++; - st = &(ptr[1]); + st = ptr + 1; } if (lbr != rbr) { errx(2, "parentheses not balanced"); } } -/// printf("PAT %s\n", pat); +// printf("PAT %s\n", pat); /* Work-around to allow * at the beginning of the regexp */ while (pat[0] == '*') From owner-p4-projects@FreeBSD.ORG Sat Jun 21 14:47:32 2008 Return-Path: <owner-p4-projects@FreeBSD.ORG> Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8D02F1065681; Sat, 21 Jun 2008 14:47:32 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4E9B2106567C for <perforce@FreeBSD.org>; Sat, 21 Jun 2008 14:47:32 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 413498FC17 for <perforce@FreeBSD.org>; Sat, 21 Jun 2008 14:47:32 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5LElWaL050217 for <perforce@FreeBSD.org>; Sat, 21 Jun 2008 14:47:32 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5LElWNW050215 for perforce@freebsd.org; Sat, 21 Jun 2008 14:47:32 GMT (envelope-from hselasky@FreeBSD.org) Date: Sat, 21 Jun 2008 14:47:32 GMT Message-Id: <200806211447.m5LElWNW050215@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky <hselasky@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Cc: Subject: PERFORCE change 143881 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes <p4-projects.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/p4-projects> List-Post: <mailto:p4-projects@freebsd.org> List-Help: <mailto:p4-projects-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sat, 21 Jun 2008 14:47:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=143881 Change 143881 by hselasky@hselasky_laptop001 on 2008/06/21 14:47:07 Fix a problem with Giant and condition variables. Please see the diff for an explanation. Maybe someone into locking can review this patch? Affected files ... .. //depot/projects/usb/src/sys/kern/kern_mutex.c#9 edit Differences ... ==== //depot/projects/usb/src/sys/kern/kern_mutex.c#9 (text+ko) ==== @@ -133,7 +133,8 @@ void lock_mtx(struct lock_object *lock, int how) { - + if (how == 1) + return; mtx_lock((struct mtx *)lock); } @@ -150,6 +151,18 @@ struct mtx *m; m = (struct mtx *)lock; + if ((m == &Giant) && (!mtx_owned(m))) { + /* + * Sometimes DROP_GIANT() gets in our way when we use + * the system condition variables passing the "Giant" + * mutex. If Giant is not locked when we get into this + * function then we can simply ignore those cases, + * because the locking is then handled by the DROP_XXX + * macros! + */ + return (1); + } + mtx_assert(m, MA_OWNED | MA_NOTRECURSED); mtx_unlock(m); return (0); From owner-p4-projects@FreeBSD.ORG Sat Jun 21 18:27:18 2008 Return-Path: <owner-p4-projects@FreeBSD.ORG> Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9B7EA10656AD; Sat, 21 Jun 2008 18:27:18 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5D38C10656A9 for <perforce@FreeBSD.org>; Sat, 21 Jun 2008 18:27:18 +0000 (UTC) (envelope-from gk@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 539928FC15 for <perforce@FreeBSD.org>; Sat, 21 Jun 2008 18:27:18 +0000 (UTC) (envelope-from gk@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5LIRIE0083262 for <perforce@FreeBSD.org>; Sat, 21 Jun 2008 18:27:18 GMT (envelope-from gk@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5LIRIHb083260 for perforce@freebsd.org; Sat, 21 Jun 2008 18:27:18 GMT (envelope-from gk@FreeBSD.org) Date: Sat, 21 Jun 2008 18:27:18 GMT Message-Id: <200806211827.m5LIRIHb083260@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gk@FreeBSD.org using -f From: Gleb Kurtsou <gk@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Cc: Subject: PERFORCE change 143890 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes <p4-projects.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/p4-projects> List-Post: <mailto:p4-projects@freebsd.org> List-Help: <mailto:p4-projects-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sat, 21 Jun 2008 18:27:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=143890 Change 143890 by gk@gk_h1 on 2008/06/21 18:27:01 update man pages and ipfw usage Affected files ... .. //depot/projects/soc2008/gk_l2filter/sbin-ifconfig/ifconfig.8#2 edit .. //depot/projects/soc2008/gk_l2filter/sbin-ipfw/ipfw.8#2 edit .. //depot/projects/soc2008/gk_l2filter/sbin-ipfw/ipfw2.c#6 edit .. //depot/projects/soc2008/gk_l2filter/share-man4/if_bridge.4#2 edit Differences ... ==== //depot/projects/soc2008/gk_l2filter/sbin-ifconfig/ifconfig.8#2 (text+ko) ==== @@ -240,6 +240,27 @@ If the Address Resolution Protocol is enabled, the host will perform normally, sending out requests and listening for replies. +.It Cm l2tag +Special tag containing source and destination layer 2 addresses will be +attached to every packet passing through interface. +Note that only incoming or outgoing packets may be tagged (but not both), it is +interface dependant. +.It Fl l2tag +Disable special packet tagging with layer 2 addresses. +.It Cm l2filter +Perform layer 2 filtering of packets passing through interface. +This option doesn't imply +.Cm l2tag +option. +With +.Cm l2filter +specified packets are passed to firewall as they were received from wire. +But +.Cm l2tag +just tags packet and usual layer 3 filtering is performed. +.It Fl l2filter +Disable layer 2 filtering. +Higher level filtering will perform normally. .It Cm broadcast (Inet only.) Specify the address to use to represent broadcasts to the ==== //depot/projects/soc2008/gk_l2filter/sbin-ipfw/ipfw.8#2 (text+ko) ==== @@ -45,7 +45,7 @@ .Cm set show .Pp .Nm -.Cm table Ar number Cm add Ar addr Ns Oo / Ns Ar masklen Oc Op Ar value +.Cm table Ar number Cm add Ar addr Ns Oo / Ns Ar masklen Oc Oo Cm ether Ar etheraddr Oc Op Ar value .Nm .Cm table Ar number Cm delete Ar addr Ns Op / Ns Ar masklen .Nm @@ -332,9 +332,9 @@ to temporarily disable the firewall to regain access to the network, allowing you to fix the problem. .Sh PACKET FLOW -A packet is checked against the active ruleset in multiple places -in the protocol stack, under control of several sysctl variables. -These places and variables are shown below, and it is important to +A packet is checked against the active ruleset in multiple places in the +protocol stack, under control of several sysctl variables and interface flags. +These places and variables and flags are shown below, and it is important to have this picture in mind in order to design a correct ruleset. .Bd -literal -offset indent ^ to upper layers V @@ -342,11 +342,12 @@ +----------->-----------+ ^ V [ip(6)_input] [ip(6)_output] net.inet(6).ip(6).fw.enable=1 + | | (l2tag interface flag) | | ^ V - [ether_demux] [ether_output_frame] net.link.ether.ipfw=1 + [ether_demux] [ether_output_frame] l2filter interface flag | | - +-->--[bdg_forward]-->--+ net.link.bridge.ipfw=1 + +-->----[bridge]----->--+ l2filter interface flag ^ V | to devices | .Ed @@ -370,13 +371,39 @@ or .Cm ip6_input() . .Pp +Note that packets do +.Em not +contain IP header when invoked from +.Cm ether_demux() , ether_output_frame() +or +.Cm bridge . +.Pp +In order to filter by both MAC and IP headers interface flag +.Cm l2tag +should be used. +When enabled a special tag containing MAC header is appended to incoming +packets. Tag is used when +.Nm +invoked from +.Cm ip_input() +or +.Cm ip6_input() . +Note that as a rule only incoming packets are tagged, but +.Cm bridge +appends tag to outgoing packets. +Therefore dynamic rules (like rules created by +.Cm keep-state +option) do not check specified MAC header options if there is no +.Cm l2tag +tag appended to packet. +.Pp Also note that each packet is always checked against the complete ruleset, irrespective of the place where the check occurs, or the source of the packet. If a rule contains some match patterns or actions which are not valid for the place of invocation (e.g.\& trying to match a MAC header within .Cm ip_input or -.Cm ip6_input ), +.Cm ip6_input ) Ns , the match pattern will not match, but a .Cm not operator in front of such patterns @@ -390,7 +417,7 @@ .Cm skipto rules can be useful here, as an example: .Bd -literal -offset indent -# packets from ether_demux or bdg_forward +# packets from ether_demux or bridge ipfw add 10 skipto 1000 all from any to any layer2 in # packets from ip_input ipfw add 10 skipto 2000 all from any to any not layer2 in @@ -401,7 +428,7 @@ .Ed .Pp (yes, at the moment there is no way to differentiate between -ether_demux and bdg_forward). +ether_demux and bridge). .Sh SYNTAX In general, each keyword or argument must be provided as a separate command line argument, with no leading or trailing @@ -1121,6 +1148,15 @@ .It Cm diverted-output Matches only packets going from a divert socket back outward to the IP stack output for delivery. +.It Cm dst-ether Ar dst-ether +Match packets with a given destination MAC address +.Ar dst-ether Ns , +specified as the +.Cm any +keyword (matching any MAC address), +.Cm muticast +keyword (matching multicast MAC addresses), or six groups of hex digits +separated by colons. .It Cm dst-ip Ar ip-address Matches IPv4 packets whose destination IP is one of the address(es) specified as argument. @@ -1336,48 +1372,10 @@ specified. Currently, only IPv4 flows are supported. -.It Cm { MAC | mac } Ar dst-mac src-mac -Match packets with a given -.Ar dst-mac -and -.Ar src-mac -addresses, specified as the -.Cm any -keyword (matching any MAC address), or six groups of hex digits -separated by colons, -and optionally followed by a mask indicating the significant bits. -The mask may be specified using either of the following methods: -.Bl -enum -width indent -.It -A slash -.Pq / -followed by the number of significant bits. -For example, an address with 33 significant bits could be specified as: -.Pp -.Dl "MAC 10:20:30:40:50:60/33 any" -.Pp -.It -An ampersand -.Pq & -followed by a bitmask specified as six groups of hex digits separated -by colons. -For example, an address in which the last 16 bits are significant could -be specified as: -.Pp -.Dl "MAC 10:20:30:40:50:60&00:00:00:00:ff:ff any" -.Pp -Note that the ampersand character has a special meaning in many shells -and should generally be escaped. -.Pp -.El -Note that the order of MAC addresses (destination first, -source second) is -the same as on the wire, but the opposite of the one used for -IP addresses. -.It Cm mac-type Ar mac-type +.It Cm ether-type Ar ether-type Matches packets whose Ethernet Type field corresponds to one of those specified as argument. -.Ar mac-type +.Ar ether-type is specified in the same way as .Cm port numbers (i.e., one or more comma-separated single values or ranges). @@ -1435,6 +1433,15 @@ Matches TCP packets that have the SYN bit set but no ACK bit. This is the short form of .Dq Li tcpflags\ syn,!ack . +.It Cm src-ether Ar src-ether +Match packets with a given source MAC address +.Ar src-ether Ns , +specified as the +.Cm any +keyword (matching any MAC address), +.Cm muticast +keyword (matching multicast MAC addresses), or six groups of hex digits +separated by colons. .It Cm src-ip Ar ip-address Matches IPv4 packets whose source IP is one of the address(es) specified as an argument. @@ -1591,6 +1598,8 @@ is not specified, it defaults to 32. When looking up an IP address in a table, the most specific entry will match. +Optionally each entry specifies MAC address +.Pq Cm ether Ar etheraddr Ns . Associated with each entry is a 32-bit unsigned .Ar value , which can optionally be checked by a rule matching code. @@ -1716,6 +1725,16 @@ .Em dst are used here only to denote the initial match addresses, but they are completely equivalent afterwards). +If rule specifies +.Em src-ether +and/or +.Em dst-ether +address they are also used to match packets. +But note that packets without +.Cm l2tag +appended to them match against such dynamic rules, because +.Cm l2tag +presents only in incoming or outgoing packets, but not in both. Dynamic rules will be checked at the first .Cm check-state, keep-state or ==== //depot/projects/soc2008/gk_l2filter/sbin-ipfw/ipfw2.c#6 (text+ko) ==== @@ -2728,7 +2728,7 @@ " redirect_port linkspec|redirect_proto linkspec}\n" "set [disable N... enable N...] | move [rule] X to Y | swap X Y | show\n" "set N {show|list|zero|resetlog|delete} [N{,N}] | flush\n" -"table N {add ip[/bits] [value] | delete ip[/bits] | flush | list}\n" +"table N {add ip[/bits] [ether ETHERADDR] [value] | delete ip[/bits] | flush | list}\n" "\n" "RULE-BODY: check-state [PARAMS] | ACTION [PARAMS] ADDR [OPTION_LIST]\n" "ACTION: check-state | allow | count | deny | unreach{,6} CODE |\n" @@ -2742,6 +2742,7 @@ "IP6ADDR: [not] { any | me | me6 | ip6/bits | IP6LIST }\n" "IP6LIST: { ip6 | ip6/bits }[,IP6LIST]\n" "IPLIST: { ip | ip/bits | ip:mask }[,IPLIST]\n" +"ETHERADDR: { any | multicast | ether }\n" "OPTION_LIST: OPTION [OPTION_LIST]\n" "OPTION: bridged | diverted | diverted-loopback | diverted-output |\n" " {dst-ip|src-ip} IPADDR | {dst-ip6|src-ip6|dst-ipv6|src-ipv6} IP6ADDR |\n" @@ -2750,9 +2751,10 @@ " iplen LIST | ipoptions SPEC | ipprecedence | ipsec | iptos SPEC |\n" " ipttl LIST | ipversion VER | keep-state | layer2 | limit ... |\n" " icmp6types LIST | ext6hdr LIST | flow-id N[,N] | fib FIB |\n" -" mac ... | mac-type LIST | proto LIST | {recv|xmit|via} {IF|IPADDR} |\n" -" setup | {tcpack|tcpseq|tcpwin} NN | tcpflags SPEC | tcpoptions SPEC |\n" -" tcpdatalen LIST | verrevpath | versrcreach | antispoof\n" +" {src-ether|dst-ether} ETHERADDR | ether-type LIST | proto LIST |\n" +" {recv|xmit|via} {IF|IPADDR} | setup | {tcpack|tcpseq|tcpwin} NN |\n" +" tcpflags SPEC | tcpoptions SPEC | tcpdatalen LIST |\n" +" verrevpath | versrcreach | antispoof\n" ); exit(0); } ==== //depot/projects/soc2008/gk_l2filter/share-man4/if_bridge.4#2 (text+ko) ==== @@ -171,6 +171,14 @@ to only allow IP packets to pass (subject to firewall rules), set to .Li 0 to unconditionally pass all non-IP Ethernet frames. +.It Va net.link.bridge.pfil_layer2_arp +Set to +.Li 1 +to enable layer2 ARP filtering with +.Xr pfil 9 , +set to +.Li 0 +to disable it. .It Va net.link.bridge.pfil_member Set to .Li 1 @@ -192,36 +200,6 @@ Set to .Li 0 to disable this feature. -.It Va net.link.bridge.ipfw -Set to -.Li 1 -to enable layer2 filtering with -.Xr ipfirewall 4 , -set to -.Li 0 -to disable it. -This needs to be enabled for -.Xr dummynet 4 -support. -When -.Va ipfw -is enabled, -.Va pfil_bridge -and -.Va pfil_member -will be disabled so that IPFW -is not run twice; these can be re-enabled if desired. -.It Va net.link.bridge.ipfw_arp -Set to -.Li 1 -to enable layer2 ARP filtering with -.Xr ipfirewall 4 , -set to -.Li 0 -to disable it. -Requires -.Va ipfw -to be enabled. .El .Pp ARP and REVARP packets are forwarded without being filtered and others From owner-p4-projects@FreeBSD.ORG Sat Jun 21 19:07:07 2008 Return-Path: <owner-p4-projects@FreeBSD.ORG> Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 053C31065744; Sat, 21 Jun 2008 19:07:07 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B9DEA1065740 for <perforce@freebsd.org>; Sat, 21 Jun 2008 19:07:06 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id AF19C8FC22 for <perforce@freebsd.org>; Sat, 21 Jun 2008 19:07:06 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5LJ76VN087636 for <perforce@freebsd.org>; Sat, 21 Jun 2008 19:07:06 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5LJ73FF087630 for perforce@freebsd.org; Sat, 21 Jun 2008 19:07:03 GMT (envelope-from peter-gmail@wemm.org) Date: Sat, 21 Jun 2008 19:07:03 GMT Message-Id: <200806211907.m5LJ73FF087630@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter-gmail@wemm.org using -f From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Cc: Subject: PERFORCE change 143892 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes <p4-projects.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/p4-projects> List-Post: <mailto:p4-projects@freebsd.org> List-Help: <mailto:p4-projects-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sat, 21 Jun 2008 19:07:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=143892 Change 143892 by peter@peter_overcee on 2008/06/21 19:06:06 IFC @143891 Affected files ... .. //depot/projects/hammer/LOCKS#4 integrate .. //depot/projects/hammer/MAINTAINERS#48 integrate .. //depot/projects/hammer/Makefile#51 integrate .. //depot/projects/hammer/Makefile.inc1#136 integrate .. //depot/projects/hammer/ObsoleteFiles.inc#53 integrate .. //depot/projects/hammer/UPDATING#118 integrate .. //depot/projects/hammer/bin/ln/ln.1#9 integrate .. //depot/projects/hammer/bin/ln/ln.c#8 integrate .. //depot/projects/hammer/bin/sh/alias.c#6 integrate .. //depot/projects/hammer/bin/sh/parser.c#13 integrate .. //depot/projects/hammer/contrib/binutils/bfd/elfn32-mips.c#1 branch .. //depot/projects/hammer/contrib/binutils/bfd/elfxx-mips.c#1 branch .. //depot/projects/hammer/contrib/binutils/bfd/elfxx-mips.h#1 branch .. //depot/projects/hammer/contrib/binutils/bfd/hosts/mipsbsd.h#1 branch .. //depot/projects/hammer/contrib/binutils/bfd/hosts/mipsmach3.h#1 branch .. //depot/projects/hammer/contrib/binutils/bfd/hosts/news-mips.h#1 branch .. //depot/projects/hammer/contrib/binutils/bfd/pei-mips.c#1 branch .. //depot/projects/hammer/contrib/binutils/gas/config/e-mipsecoff.c#1 branch .. //depot/projects/hammer/contrib/binutils/gas/config/e-mipself.c#1 branch .. //depot/projects/hammer/contrib/binutils/gas/config/itbl-mips.h#1 branch .. //depot/projects/hammer/contrib/binutils/gas/config/tc-mips.c#1 branch .. //depot/projects/hammer/contrib/binutils/gas/config/tc-mips.h#1 branch .. //depot/projects/hammer/contrib/binutils/gas/config/te-tmips.h#1 branch .. //depot/projects/hammer/contrib/binutils/gas/doc/c-mips.texi#1 branch .. //depot/projects/hammer/contrib/binutils/gprof/mips.c#1 branch .. //depot/projects/hammer/contrib/binutils/include/coff/mips.h#1 branch .. //depot/projects/hammer/contrib/binutils/include/coff/mipspe.h#1 branch .. //depot/projects/hammer/contrib/binutils/ld/emulparams/elf32bmipn32-defs.sh#1 branch .. //depot/projects/hammer/contrib/binutils/ld/emulparams/elf32btsmip.sh#1 branch .. //depot/projects/hammer/contrib/binutils/ld/emulparams/elf32btsmipn32.sh#1 branch .. //depot/projects/hammer/contrib/binutils/ld/emulparams/elf32ltsmip.sh#1 branch .. //depot/projects/hammer/contrib/binutils/ld/emulparams/elf32ltsmipn32.sh#1 branch .. //depot/projects/hammer/contrib/binutils/ld/emulparams/elf32mipswindiss.sh#1 branch .. //depot/projects/hammer/contrib/binutils/ld/emulparams/elf64btsmip.sh#1 branch .. //depot/projects/hammer/contrib/binutils/ld/emulparams/elf64ltsmip.sh#1 branch .. //depot/projects/hammer/contrib/binutils/ld/emulparams/mipsbig.sh#1 branch .. //depot/projects/hammer/contrib/binutils/ld/emulparams/mipsbsd.sh#1 branch .. //depot/projects/hammer/contrib/binutils/ld/emulparams/mipsidt.sh#1 branch .. //depot/projects/hammer/contrib/binutils/ld/emulparams/mipsidtl.sh#1 branch .. //depot/projects/hammer/contrib/binutils/ld/emulparams/mipslit.sh#1 branch .. //depot/projects/hammer/contrib/binutils/ld/emulparams/mipslnews.sh#1 branch .. //depot/projects/hammer/contrib/binutils/ld/emulparams/mipspe.sh#1 branch .. //depot/projects/hammer/contrib/binutils/ld/emultempl/mipsecoff.em#1 branch .. //depot/projects/hammer/contrib/binutils/ld/emultempl/mipself.em#1 branch .. //depot/projects/hammer/contrib/binutils/ld/scripttempl/mips.sc#1 branch .. //depot/projects/hammer/contrib/binutils/ld/scripttempl/mipsbsd.sc#1 branch .. //depot/projects/hammer/contrib/binutils/opcodes/mips-dis.c#1 branch .. //depot/projects/hammer/contrib/binutils/opcodes/mips-opc.c#1 branch .. //depot/projects/hammer/contrib/binutils/opcodes/mips16-opc.c#1 branch .. //depot/projects/hammer/contrib/cvs/src/classify.c#6 integrate .. //depot/projects/hammer/contrib/ncurses/FREEBSD-vendor#3 integrate .. //depot/projects/hammer/contrib/top/top.X#10 integrate .. //depot/projects/hammer/contrib/top/top.c#13 integrate .. //depot/projects/hammer/etc/defaults/rc.conf#87 integrate .. //depot/projects/hammer/etc/devd.conf#32 integrate .. //depot/projects/hammer/etc/rc.d/Makefile#62 integrate .. //depot/projects/hammer/etc/rc.d/NETWORKING#15 integrate .. //depot/projects/hammer/etc/rc.d/defaultroute#1 branch .. //depot/projects/hammer/etc/rc.d/quota#7 integrate .. //depot/projects/hammer/etc/rc.d/routing#9 integrate .. //depot/projects/hammer/etc/rc.firewall#9 integrate .. //depot/projects/hammer/etc/rc.subr#43 integrate .. //depot/projects/hammer/games/fortune/datfiles/freebsd-tips#17 integrate .. //depot/projects/hammer/games/morse/morse.6#8 integrate .. //depot/projects/hammer/games/morse/morse.c#8 integrate .. //depot/projects/hammer/gnu/lib/libstdc++/Makefile#30 integrate .. //depot/projects/hammer/gnu/usr.bin/Makefile#19 integrate .. //depot/projects/hammer/gnu/usr.bin/cpio/Makefile#6 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/kgdb/trgt_mips.c#2 integrate .. //depot/projects/hammer/include/Makefile#74 integrate .. //depot/projects/hammer/include/pthread.h#15 integrate .. //depot/projects/hammer/include/sgtty.h#2 integrate .. //depot/projects/hammer/include/spawn.h#1 branch .. //depot/projects/hammer/include/unistd.h#24 integrate .. //depot/projects/hammer/kerberos5/tools/slc/Makefile#2 integrate .. //depot/projects/hammer/lib/libarchive/Makefile#50 integrate .. //depot/projects/hammer/lib/libarchive/archive.h.in#24 delete .. //depot/projects/hammer/lib/libarchive/archive_entry_link_resolver.c#3 integrate .. //depot/projects/hammer/lib/libarchive/archive_entry_strmode.c#4 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_compression_program.c#4 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_mtree.c#5 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_zip.c#19 integrate .. //depot/projects/hammer/lib/libarchive/archive_string.c#13 integrate .. //depot/projects/hammer/lib/libarchive/archive_string.h#12 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_compression_program.c#3 integrate .. //depot/projects/hammer/lib/libarchive/config_freebsd.h#8 integrate .. //depot/projects/hammer/lib/libarchive/filter_fork.c#4 integrate .. //depot/projects/hammer/lib/libarchive/test/Makefile#11 integrate .. //depot/projects/hammer/lib/libarchive/test/main.c#12 integrate .. //depot/projects/hammer/lib/libarchive/test/test.h#8 integrate .. //depot/projects/hammer/lib/libarchive/test/test_link_resolver.c#2 integrate .. //depot/projects/hammer/lib/libarchive/test/test_read_extract.c#4 integrate .. //depot/projects/hammer/lib/libarchive/test/test_write_disk.c#6 integrate .. //depot/projects/hammer/lib/libarchive/test/test_write_disk_perms.c#9 integrate .. //depot/projects/hammer/lib/libarchive/test/test_write_disk_secure.c#4 integrate .. //depot/projects/hammer/lib/libc/gen/Makefile.inc#36 integrate .. //depot/projects/hammer/lib/libc/gen/Symbol.map#9 integrate .. //depot/projects/hammer/lib/libc/gen/exec.3#10 integrate .. //depot/projects/hammer/lib/libc/gen/exec.c#5 integrate .. //depot/projects/hammer/lib/libc/gen/posix_spawn.c#1 branch .. //depot/projects/hammer/lib/libc/include/namespace.h#14 integrate .. //depot/projects/hammer/lib/libc/include/un-namespace.h#13 integrate .. //depot/projects/hammer/lib/libc/stdlib/Symbol.map#6 integrate .. //depot/projects/hammer/lib/libc/stdlib/grantpt.c#10 integrate .. //depot/projects/hammer/lib/libc/stdlib/malloc.c#45 integrate .. //depot/projects/hammer/lib/libc/sys/Symbol.map#12 integrate .. //depot/projects/hammer/lib/libc/sys/accept.2#9 integrate .. //depot/projects/hammer/lib/libc/sys/fcntl.c#3 integrate .. //depot/projects/hammer/lib/libc/sys/getsockopt.2#13 integrate .. //depot/projects/hammer/lib/libc/sys/setgroups.2#6 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_fcntl.c#4 integrate .. //depot/projects/hammer/lib/libcompat/4.1/gtty.c#2 delete .. //depot/projects/hammer/lib/libcompat/4.1/stty.3#3 delete .. //depot/projects/hammer/lib/libcompat/4.1/stty.c#2 delete .. //depot/projects/hammer/lib/libcompat/Makefile#5 integrate .. //depot/projects/hammer/lib/libgeom/libgeom.3#8 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_fcntl.c#4 integrate .. //depot/projects/hammer/lib/libthr/pthread.map#20 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_clean.c#5 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_init.c#30 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_mutex.c#43 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_once.c#6 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_private.h#43 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_syscalls.c#15 integrate .. //depot/projects/hammer/lib/msun/Makefile#41 integrate .. //depot/projects/hammer/lib/msun/Symbol.map#11 integrate .. //depot/projects/hammer/lib/msun/man/fmod.3#3 integrate .. //depot/projects/hammer/lib/msun/src/e_fmodl.c#1 branch .. //depot/projects/hammer/lib/msun/src/math.h#37 integrate .. //depot/projects/hammer/libexec/rpc.rstatd/Makefile#3 integrate .. //depot/projects/hammer/libexec/rpc.rstatd/rstat_proc.c#7 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/readme/article.sgml#18 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/article.sgml#34 integrate .. //depot/projects/hammer/release/doc/share/sgml/release.ent#25 integrate .. //depot/projects/hammer/release/ia64/boot_crunch.conf#12 integrate .. //depot/projects/hammer/sbin/Makefile#48 integrate .. //depot/projects/hammer/sbin/dhclient/dhclient-script#14 integrate .. //depot/projects/hammer/sbin/fsck_ffs/main.c#16 integrate .. //depot/projects/hammer/sbin/geom/Makefile#4 integrate .. //depot/projects/hammer/sbin/geom/class/label/geom_label.c#12 integrate .. //depot/projects/hammer/sbin/geom/class/part/geom_part.c#5 integrate .. //depot/projects/hammer/sbin/geom/class/part/gpart.8#3 integrate .. //depot/projects/hammer/sbin/geom/core/geom.c#22 integrate .. //depot/projects/hammer/sbin/geom/misc/subr.c#8 integrate .. //depot/projects/hammer/sbin/geom/misc/subr.h#9 integrate .. //depot/projects/hammer/sbin/ggate/ggated/ggated.c#6 integrate .. //depot/projects/hammer/sbin/ifconfig/ifconfig.8#50 integrate .. //depot/projects/hammer/sbin/ifconfig/ifconfig.c#38 integrate .. //depot/projects/hammer/sbin/mdconfig/mdconfig.8#22 integrate .. //depot/projects/hammer/sbin/mdconfig/mdconfig.c#27 integrate .. //depot/projects/hammer/sbin/mount/mount.8#27 integrate .. //depot/projects/hammer/sbin/natd/natd.c#12 integrate .. //depot/projects/hammer/sbin/rcorder/rcorder.8#4 integrate .. //depot/projects/hammer/share/man/man4/ciss.4#13 integrate .. //depot/projects/hammer/share/man/man4/cpufreq.4#13 integrate .. //depot/projects/hammer/share/man/man4/crypto.4#7 integrate .. //depot/projects/hammer/share/man/man4/ddb.4#16 integrate .. //depot/projects/hammer/share/man/man4/gre.4#8 integrate .. //depot/projects/hammer/share/man/man4/ixgbe.4#1 branch .. //depot/projects/hammer/share/man/man4/snd_emu10kx.4#3 integrate .. //depot/projects/hammer/share/man/man4/ubsa.4#10 integrate .. //depot/projects/hammer/share/man/man4/uplcom.4#13 integrate .. //depot/projects/hammer/share/man/man5/rc.conf.5#91 integrate .. //depot/projects/hammer/share/man/man5/src.conf.5#18 integrate .. //depot/projects/hammer/share/man/man5/tmpfs.5#2 integrate .. //depot/projects/hammer/share/man/man9/VOP_LOCK.9#11 integrate .. //depot/projects/hammer/share/man/man9/bus_dma.9#27 integrate .. //depot/projects/hammer/share/man/man9/taskqueue.9#16 integrate .. //depot/projects/hammer/share/man/man9/zone.9#8 integrate .. //depot/projects/hammer/share/misc/committers-ports.dot#10 integrate .. //depot/projects/hammer/share/misc/committers-src.dot#11 integrate .. //depot/projects/hammer/share/mk/bsd.own.mk#27 integrate .. //depot/projects/hammer/share/sendmail/Makefile#6 integrate .. //depot/projects/hammer/share/syscons/keymaps/colemak.iso15.acc.kbd#2 integrate .. //depot/projects/hammer/sys/amd64/amd64/mem.c#28 integrate .. //depot/projects/hammer/sys/amd64/amd64/minidump_machdep.c#6 integrate .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#180 integrate .. //depot/projects/hammer/sys/amd64/amd64/trap.c#105 integrate .. //depot/projects/hammer/sys/amd64/conf/GENERIC#110 integrate .. //depot/projects/hammer/sys/amd64/include/pmc_mdep.h#4 integrate .. //depot/projects/hammer/sys/amd64/include/stack.h#2 integrate .. //depot/projects/hammer/sys/arm/at91/at91_twi.c#7 integrate .. //depot/projects/hammer/sys/arm/at91/if_ate.c#12 integrate .. //depot/projects/hammer/sys/arm/conf/GUMSTIX#1 branch .. //depot/projects/hammer/sys/arm/conf/GUMSTIX.hints#1 branch .. //depot/projects/hammer/sys/arm/include/intr.h#9 integrate .. //depot/projects/hammer/sys/arm/xscale/i8134x/crb_machdep.c#6 integrate .. //depot/projects/hammer/sys/arm/xscale/i8134x/i81342_pci.c#3 integrate .. //depot/projects/hammer/sys/arm/xscale/pxa/files.pxa#1 branch .. //depot/projects/hammer/sys/arm/xscale/pxa/if_smc_smi.c#1 branch .. //depot/projects/hammer/sys/arm/xscale/pxa/pxa_gpio.c#1 branch .. //depot/projects/hammer/sys/arm/xscale/pxa/pxa_icu.c#1 branch .. //depot/projects/hammer/sys/arm/xscale/pxa/pxa_machdep.c#1 branch .. //depot/projects/hammer/sys/arm/xscale/pxa/pxa_obio.c#1 branch .. //depot/projects/hammer/sys/arm/xscale/pxa/pxa_smi.c#1 branch .. //depot/projects/hammer/sys/arm/xscale/pxa/pxa_space.c#1 branch .. //depot/projects/hammer/sys/arm/xscale/pxa/pxa_timer.c#1 branch .. //depot/projects/hammer/sys/arm/xscale/pxa/pxareg.h#1 branch .. //depot/projects/hammer/sys/arm/xscale/pxa/pxavar.h#1 branch .. //depot/projects/hammer/sys/arm/xscale/pxa/std.pxa#1 branch .. //depot/projects/hammer/sys/arm/xscale/pxa/uart_bus_pxa.c#1 branch .. //depot/projects/hammer/sys/arm/xscale/pxa/uart_cpu_pxa.c#1 branch .. //depot/projects/hammer/sys/boot/common/ufsread.c#9 integrate .. //depot/projects/hammer/sys/boot/i386/libi386/biossmap.c#13 integrate .. //depot/projects/hammer/sys/boot/i386/libi386/time.c#3 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#3 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace_impl.h#2 integrate .. //depot/projects/hammer/sys/compat/linux/linux_file.c#31 integrate .. //depot/projects/hammer/sys/compat/linux/linux_mib.c#12 integrate .. //depot/projects/hammer/sys/compat/linux/linux_stats.c#33 integrate .. //depot/projects/hammer/sys/compat/linux/linux_util.c#15 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_ndis.c#46 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_ntoskrnl.c#48 integrate .. //depot/projects/hammer/sys/conf/NOTES#146 integrate .. //depot/projects/hammer/sys/conf/files#183 integrate .. //depot/projects/hammer/sys/conf/files.i386#93 integrate .. //depot/projects/hammer/sys/conf/files.pc98#69 integrate .. //depot/projects/hammer/sys/conf/files.powerpc#31 integrate .. //depot/projects/hammer/sys/conf/kern.pre.mk#53 integrate .. //depot/projects/hammer/sys/conf/newvers.sh#21 integrate .. //depot/projects/hammer/sys/conf/options.arm#14 integrate .. //depot/projects/hammer/sys/conf/options.i386#53 integrate .. //depot/projects/hammer/sys/conf/options.pc98#48 integrate .. //depot/projects/hammer/sys/contrib/pf/net/pf_ioctl.c#29 integrate .. //depot/projects/hammer/sys/ddb/db_ps.c#23 integrate .. //depot/projects/hammer/sys/dev/age/if_age.c#2 integrate .. //depot/projects/hammer/sys/dev/agp/agp_i810.c#4 integrate .. //depot/projects/hammer/sys/dev/ata/ata-all.c#70 integrate .. //depot/projects/hammer/sys/dev/ata/ata-chipset.c#88 integrate .. //depot/projects/hammer/sys/dev/ata/ata-pci.c#47 integrate .. //depot/projects/hammer/sys/dev/ath/ah_osdep.h#4 integrate .. //depot/projects/hammer/sys/dev/ath/if_ath.c#60 integrate .. //depot/projects/hammer/sys/dev/ath/if_athvar.h#31 integrate .. //depot/projects/hammer/sys/dev/atkbdc/psm.c#11 integrate .. //depot/projects/hammer/sys/dev/bce/if_bce.c#15 integrate .. //depot/projects/hammer/sys/dev/bce/if_bcefw.h#7 integrate .. //depot/projects/hammer/sys/dev/bce/if_bcereg.h#11 integrate .. //depot/projects/hammer/sys/dev/bktr/bktr_i2c.c#7 integrate .. //depot/projects/hammer/sys/dev/bm/if_bm.c#1 branch .. //depot/projects/hammer/sys/dev/bm/if_bmreg.h#1 branch .. //depot/projects/hammer/sys/dev/bm/if_bmvar.h#1 branch .. //depot/projects/hammer/sys/dev/ciss/ciss.c#50 integrate .. //depot/projects/hammer/sys/dev/cnw/if_cnw.c#18 integrate .. //depot/projects/hammer/sys/dev/cs/if_cs.c#21 integrate .. //depot/projects/hammer/sys/dev/cs/if_cs_isa.c#7 integrate .. //depot/projects/hammer/sys/dev/cs/if_cs_pccard.c#13 integrate .. //depot/projects/hammer/sys/dev/cs/if_csreg.h#4 integrate .. //depot/projects/hammer/sys/dev/cs/if_csvar.h#8 integrate .. //depot/projects/hammer/sys/dev/dc/if_dc.c#15 integrate .. //depot/projects/hammer/sys/dev/et/if_et.c#1 branch .. //depot/projects/hammer/sys/dev/et/if_etreg.h#1 branch .. //depot/projects/hammer/sys/dev/et/if_etvar.h#1 branch .. //depot/projects/hammer/sys/dev/ex/if_ex.c#21 integrate .. //depot/projects/hammer/sys/dev/ex/if_ex_isa.c#7 integrate .. //depot/projects/hammer/sys/dev/ex/if_ex_pccard.c#13 integrate .. //depot/projects/hammer/sys/dev/ex/if_exvar.h#6 integrate .. //depot/projects/hammer/sys/dev/fe/if_fe.c#26 integrate .. //depot/projects/hammer/sys/dev/fe/if_fe_pccard.c#18 integrate .. //depot/projects/hammer/sys/dev/fe/if_fevar.h#6 integrate .. //depot/projects/hammer/sys/dev/ichsmb/ichsmb.c#12 integrate .. //depot/projects/hammer/sys/dev/ichsmb/ichsmb_pci.c#13 integrate .. //depot/projects/hammer/sys/dev/ichsmb/ichsmb_var.h#4 integrate .. //depot/projects/hammer/sys/dev/ie/if_ie.c#18 integrate .. //depot/projects/hammer/sys/dev/ie/if_ie_isa.c#8 integrate .. //depot/projects/hammer/sys/dev/ie/if_ievar.h#4 integrate .. //depot/projects/hammer/sys/dev/ieee488/upd7210.c#8 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndis.c#63 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndisvar.h#25 integrate .. //depot/projects/hammer/sys/dev/iicbus/iicsmb.c#5 integrate .. //depot/projects/hammer/sys/dev/iwi/if_iwi.c#30 integrate .. //depot/projects/hammer/sys/dev/iwn/if_iwn.c#3 integrate .. //depot/projects/hammer/sys/dev/ixgbe/ixgbe.h#4 integrate .. //depot/projects/hammer/sys/dev/ixgbe/tcp_lro.c#2 delete .. //depot/projects/hammer/sys/dev/ixgbe/tcp_lro.h#2 delete .. //depot/projects/hammer/sys/dev/led/led.c#15 integrate .. //depot/projects/hammer/sys/dev/md/md.c#66 integrate .. //depot/projects/hammer/sys/dev/mfi/mfi.c#15 integrate .. //depot/projects/hammer/sys/dev/mfi/mfi_ioctl.h#6 integrate .. //depot/projects/hammer/sys/dev/mii/brgphy.c#35 integrate .. //depot/projects/hammer/sys/dev/mii/lxtphy.c#13 integrate .. //depot/projects/hammer/sys/dev/mii/miidevs#25 integrate .. //depot/projects/hammer/sys/dev/mii/smcphy.c#1 branch .. //depot/projects/hammer/sys/dev/mii/truephy.c#1 branch .. //depot/projects/hammer/sys/dev/mii/truephyreg.h#1 branch .. //depot/projects/hammer/sys/dev/nmdm/nmdm.c#25 integrate .. //depot/projects/hammer/sys/dev/nve/if_nve.c#23 integrate .. //depot/projects/hammer/sys/dev/nve/if_nvereg.h#9 integrate .. //depot/projects/hammer/sys/dev/pccard/pccard_cis.c#18 integrate .. //depot/projects/hammer/sys/dev/puc/pucdata.c#32 integrate .. //depot/projects/hammer/sys/dev/ral/rt2560.c#15 integrate .. //depot/projects/hammer/sys/dev/ral/rt2661.c#14 integrate .. //depot/projects/hammer/sys/dev/si/si.c#27 integrate .. //depot/projects/hammer/sys/dev/si/si.h#8 integrate .. //depot/projects/hammer/sys/dev/smbus/smb.c#11 integrate .. //depot/projects/hammer/sys/dev/smc/if_smc.c#1 branch .. //depot/projects/hammer/sys/dev/smc/if_smcreg.h#1 branch .. //depot/projects/hammer/sys/dev/smc/if_smcvar.h#1 branch .. //depot/projects/hammer/sys/dev/snc/dp83932.c#17 integrate .. //depot/projects/hammer/sys/dev/snc/dp83932subr.c#5 integrate .. //depot/projects/hammer/sys/dev/snc/dp83932var.h#6 integrate .. //depot/projects/hammer/sys/dev/snc/if_sncreg.h#3 integrate .. //depot/projects/hammer/sys/dev/snp/snp.c#26 integrate .. //depot/projects/hammer/sys/dev/tx/if_tx.c#29 integrate .. //depot/projects/hammer/sys/dev/tx/if_txvar.h#7 integrate .. //depot/projects/hammer/sys/dev/uart/uart_dev_ns8250.c#18 integrate .. //depot/projects/hammer/sys/dev/usb/ehci.c#35 integrate .. //depot/projects/hammer/sys/dev/usb/ehcivar.h#13 integrate .. //depot/projects/hammer/sys/dev/usb/if_rum.c#10 integrate .. //depot/projects/hammer/sys/dev/usb/if_ural.c#29 integrate .. //depot/projects/hammer/sys/dev/usb/if_zyd.c#12 integrate .. //depot/projects/hammer/sys/dev/usb/ubsa.c#21 integrate .. //depot/projects/hammer/sys/dev/usb/uplcom.c#28 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs#104 integrate .. //depot/projects/hammer/sys/dev/vkbd/vkbd.c#13 integrate .. //depot/projects/hammer/sys/dev/wpi/if_wpi.c#9 integrate .. //depot/projects/hammer/sys/dev/xe/if_xe.c#29 integrate .. //depot/projects/hammer/sys/dev/xe/if_xe_pccard.c#21 integrate .. //depot/projects/hammer/sys/dev/xe/if_xevar.h#5 integrate .. //depot/projects/hammer/sys/fs/cd9660/cd9660_vnops.c#3 integrate .. //depot/projects/hammer/sys/fs/devfs/devfs_devs.c#21 integrate .. //depot/projects/hammer/sys/fs/devfs/devfs_int.h#6 integrate .. //depot/projects/hammer/sys/fs/devfs/devfs_vnops.c#59 integrate .. //depot/projects/hammer/sys/fs/ntfs/ntfs_ihash.c#7 integrate .. //depot/projects/hammer/sys/fs/tmpfs/tmpfs_subr.c#10 integrate .. //depot/projects/hammer/sys/geom/geom_dev.c#38 integrate .. //depot/projects/hammer/sys/geom/journal/g_journal.c#6 integrate .. //depot/projects/hammer/sys/geom/part/g_part.c#14 integrate .. //depot/projects/hammer/sys/geom/part/g_part.h#10 integrate .. //depot/projects/hammer/sys/geom/part/g_part_apm.c#7 integrate .. //depot/projects/hammer/sys/geom/part/g_part_bsd.c#6 integrate .. //depot/projects/hammer/sys/geom/part/g_part_gpt.c#9 integrate .. //depot/projects/hammer/sys/geom/part/g_part_if.m#3 integrate .. //depot/projects/hammer/sys/geom/part/g_part_mbr.c#6 integrate .. //depot/projects/hammer/sys/geom/part/g_part_pc98.c#4 integrate .. //depot/projects/hammer/sys/geom/part/g_part_vtoc8.c#4 integrate .. //depot/projects/hammer/sys/i386/acpica/acpi_machdep.c#31 integrate .. //depot/projects/hammer/sys/i386/conf/GENERIC#68 integrate .. //depot/projects/hammer/sys/i386/conf/NOTES#103 integrate .. //depot/projects/hammer/sys/i386/cpufreq/est.c#11 integrate .. //depot/projects/hammer/sys/i386/include/pecoff_machdep.h#2 delete .. //depot/projects/hammer/sys/ia64/include/atomic.h#8 integrate .. //depot/projects/hammer/sys/kern/kern_conf.c#51 integrate .. //depot/projects/hammer/sys/kern/kern_descrip.c#82 integrate .. //depot/projects/hammer/sys/kern/kern_dtrace.c#2 integrate .. //depot/projects/hammer/sys/kern/kern_jail.c#31 integrate .. //depot/projects/hammer/sys/kern/kern_umtx.c#32 integrate .. //depot/projects/hammer/sys/kern/link_elf_obj.c#57 integrate .. //depot/projects/hammer/sys/kern/subr_bus.c#62 integrate .. //depot/projects/hammer/sys/kern/sysv_sem.c#29 integrate .. //depot/projects/hammer/sys/kern/tty_tty.c#15 integrate .. //depot/projects/hammer/sys/kern/uipc_sem.c#21 integrate .. //depot/projects/hammer/sys/kern/vfs_aio.c#56 integrate .. //depot/projects/hammer/sys/kern/vfs_export.c#19 integrate .. //depot/projects/hammer/sys/kern/vfs_mount.c#95 integrate .. //depot/projects/hammer/sys/mips/include/pte.h#2 integrate .. //depot/projects/hammer/sys/mips/mips/trap.c#2 integrate .. //depot/projects/hammer/sys/modules/Makefile#127 integrate .. //depot/projects/hammer/sys/modules/ath_rate_onoe/Makefile#6 integrate .. //depot/projects/hammer/sys/modules/ath_rate_sample/Makefile#6 integrate .. //depot/projects/hammer/sys/modules/bm/Makefile#1 branch .. //depot/projects/hammer/sys/modules/cnw/Makefile#1 branch .. //depot/projects/hammer/sys/modules/dtrace/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/et/Makefile#1 branch .. //depot/projects/hammer/sys/modules/ixgbe/Makefile#4 integrate .. //depot/projects/hammer/sys/modules/mii/Makefile#12 integrate .. //depot/projects/hammer/sys/net/if_gre.c#37 integrate .. //depot/projects/hammer/sys/net/if_gre.h#10 integrate .. //depot/projects/hammer/sys/net/if_tap.c#34 integrate .. //depot/projects/hammer/sys/net/if_tun.c#33 integrate .. //depot/projects/hammer/sys/net/radix_mpath.c#4 integrate .. //depot/projects/hammer/sys/net/radix_mpath.h#3 integrate .. //depot/projects/hammer/sys/net80211/ieee80211.c#35 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_crypto.c#15 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_crypto.h#13 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_crypto_ccmp.c#10 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_crypto_tkip.c#10 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_crypto_wep.c#9 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_ddb.c#3 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_freebsd.h#15 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_ioctl.c#38 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_node.c#47 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_output.c#36 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_proto.c#35 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_proto.h#22 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_scan.c#6 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_var.h#35 integrate .. //depot/projects/hammer/sys/netgraph/ng_nat.c#6 integrate .. //depot/projects/hammer/sys/netinet/ip_carp.c#28 integrate .. //depot/projects/hammer/sys/netinet/ip_fw_nat.c#2 integrate .. //depot/projects/hammer/sys/netinet/libalias/alias.c#8 integrate .. //depot/projects/hammer/sys/netinet/libalias/alias_db.c#7 integrate .. //depot/projects/hammer/sys/netinet/libalias/alias_ftp.c#7 integrate .. //depot/projects/hammer/sys/netinet/libalias/alias_local.h#6 integrate .. //depot/projects/hammer/sys/netinet/sctp.h#11 integrate .. //depot/projects/hammer/sys/netinet/sctp_asconf.c#18 integrate .. //depot/projects/hammer/sys/netinet/sctp_auth.c#12 integrate .. //depot/projects/hammer/sys/netinet/sctp_bsd_addr.c#12 integrate .. //depot/projects/hammer/sys/netinet/sctp_bsd_addr.h#8 integrate .. //depot/projects/hammer/sys/netinet/sctp_cc_functions.c#4 integrate .. //depot/projects/hammer/sys/netinet/sctp_header.h#6 integrate .. //depot/projects/hammer/sys/netinet/sctp_indata.c#21 integrate .. //depot/projects/hammer/sys/netinet/sctp_input.c#20 integrate .. //depot/projects/hammer/sys/netinet/sctp_lock_bsd.h#9 integrate .. //depot/projects/hammer/sys/netinet/sctp_os_bsd.h#16 integrate .. //depot/projects/hammer/sys/netinet/sctp_output.c#24 integrate .. //depot/projects/hammer/sys/netinet/sctp_pcb.c#22 integrate .. //depot/projects/hammer/sys/netinet/sctp_pcb.h#16 integrate .. //depot/projects/hammer/sys/netinet/sctp_peeloff.c#12 integrate .. //depot/projects/hammer/sys/netinet/sctp_sysctl.c#12 integrate .. //depot/projects/hammer/sys/netinet/sctp_sysctl.h#9 integrate .. //depot/projects/hammer/sys/netinet/sctp_timer.c#17 integrate .. //depot/projects/hammer/sys/netinet/sctp_uio.h#13 integrate .. //depot/projects/hammer/sys/netinet/sctp_usrreq.c#23 integrate .. //depot/projects/hammer/sys/netinet/sctp_var.h#14 integrate .. //depot/projects/hammer/sys/netinet/sctputil.c#27 integrate .. //depot/projects/hammer/sys/netinet/tcp_lro.c#1 branch .. //depot/projects/hammer/sys/netinet/tcp_lro.h#1 branch .. //depot/projects/hammer/sys/netinet/tcp_subr.c#83 integrate .. //depot/projects/hammer/sys/netinet/tcp_syncache.c#61 integrate .. //depot/projects/hammer/sys/netinet/tcp_timer.c#32 integrate .. //depot/projects/hammer/sys/netinet/udp_usrreq.c#55 integrate .. //depot/projects/hammer/sys/netinet6/sctp6_usrreq.c#18 integrate .. //depot/projects/hammer/sys/netinet6/udp6_usrreq.c#38 integrate .. //depot/projects/hammer/sys/netipx/spx_usrreq.c#22 integrate .. //depot/projects/hammer/sys/nfsserver/nfs_serv.c#42 integrate .. //depot/projects/hammer/sys/nlm/nlm_prot_impl.c#4 integrate .. //depot/projects/hammer/sys/pc98/conf/NOTES#64 integrate .. //depot/projects/hammer/sys/pc98/include/pecoff_machdep.h#2 delete .. //depot/projects/hammer/sys/pci/amdpm.c#14 integrate .. //depot/projects/hammer/sys/pci/amdsmb.c#6 integrate .. //depot/projects/hammer/sys/pci/if_rl.c#61 integrate .. //depot/projects/hammer/sys/pci/if_rlreg.h#34 integrate .. //depot/projects/hammer/sys/pci/if_xl.c#70 integrate .. //depot/projects/hammer/sys/pci/if_xlreg.h#18 integrate .. //depot/projects/hammer/sys/pci/intpm.c#15 integrate .. //depot/projects/hammer/sys/pci/nfsmb.c#7 integrate .. //depot/projects/hammer/sys/pci/viapm.c#16 integrate .. //depot/projects/hammer/sys/powerpc/aim/trap.c#4 integrate .. //depot/projects/hammer/sys/powerpc/booke/pmap.c#4 integrate .. //depot/projects/hammer/sys/powerpc/conf/GENERIC#40 integrate .. //depot/projects/hammer/sys/powerpc/conf/NOTES#11 integrate .. //depot/projects/hammer/sys/powerpc/include/dbdma.h#1 branch .. //depot/projects/hammer/sys/powerpc/powermac/dbdma.c#1 branch .. //depot/projects/hammer/sys/powerpc/powermac/dbdmavar.h#1 branch .. //depot/projects/hammer/sys/powerpc/powermac/grackle.c#11 integrate .. //depot/projects/hammer/sys/powerpc/powermac/macio.c#15 integrate .. //depot/projects/hammer/sys/powerpc/powermac/uninorth.c#16 integrate .. //depot/projects/hammer/sys/security/audit/audit.c#18 integrate .. //depot/projects/hammer/sys/security/audit/audit_pipe.c#10 integrate .. //depot/projects/hammer/sys/security/audit/audit_worker.c#11 integrate .. //depot/projects/hammer/sys/security/mac/mac_framework.h#11 integrate .. //depot/projects/hammer/sys/security/mac/mac_inet.c#10 integrate .. //depot/projects/hammer/sys/security/mac/mac_policy.h#12 integrate .. //depot/projects/hammer/sys/security/mac_biba/mac_biba.c#46 integrate .. //depot/projects/hammer/sys/security/mac_lomac/mac_lomac.c#34 integrate .. //depot/projects/hammer/sys/security/mac_mls/mac_mls.c#45 integrate .. //depot/projects/hammer/sys/security/mac_stub/mac_stub.c#29 integrate .. //depot/projects/hammer/sys/security/mac_test/mac_test.c#48 integrate .. //depot/projects/hammer/sys/sys/apm.h#3 integrate .. //depot/projects/hammer/sys/sys/bus.h#28 integrate .. //depot/projects/hammer/sys/sys/conf.h#45 integrate .. //depot/projects/hammer/sys/sys/ioctl.h#7 integrate .. //depot/projects/hammer/sys/sys/ioctl_compat.h#7 integrate .. //depot/projects/hammer/sys/sys/jail.h#14 integrate .. //depot/projects/hammer/sys/sys/mount.h#54 integrate .. //depot/projects/hammer/sys/sys/param.h#113 integrate .. //depot/projects/hammer/sys/sys/systm.h#55 integrate .. //depot/projects/hammer/sys/sys/ttychars.h#5 delete .. //depot/projects/hammer/sys/sys/ttydefaults.h#8 integrate .. //depot/projects/hammer/sys/sys/ttydev.h#5 delete .. //depot/projects/hammer/sys/vm/vm_page.c#73 integrate .. //depot/projects/hammer/sys/vm/vnode_pager.c#46 integrate .. //depot/projects/hammer/tools/build/options/WITHOUT_BSD_CPIO#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_GNU_GREP#1 branch .. //depot/projects/hammer/tools/build/options/WITH_GNU_CPIO#1 branch .. //depot/projects/hammer/tools/tools/mctest/mctest.1#3 integrate .. //depot/projects/hammer/tools/tools/mctest/mctest.cc#4 integrate .. //depot/projects/hammer/tools/tools/mctest/mctest_run.sh#2 integrate .. //depot/projects/hammer/usr.bin/Makefile#63 integrate .. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.freebsd#64 integrate .. //depot/projects/hammer/usr.bin/comm/comm.c#3 integrate .. //depot/projects/hammer/usr.bin/cpio/Makefile#2 integrate .. //depot/projects/hammer/usr.bin/cpio/cmdline.c#2 integrate .. //depot/projects/hammer/usr.bin/cpio/cpio.c#2 integrate .. //depot/projects/hammer/usr.bin/cpio/cpio.h#2 integrate .. //depot/projects/hammer/usr.bin/cpio/matching.c#2 integrate .. //depot/projects/hammer/usr.bin/cpio/test/main.c#2 integrate .. //depot/projects/hammer/usr.bin/cpio/test/test.h#2 integrate .. //depot/projects/hammer/usr.bin/fstat/fstat.c#22 integrate .. //depot/projects/hammer/usr.bin/lex/ccl.c#2 integrate .. //depot/projects/hammer/usr.bin/lex/dfa.c#2 integrate .. //depot/projects/hammer/usr.bin/lex/ecs.c#2 integrate .. //depot/projects/hammer/usr.bin/lex/flex.skl#4 integrate .. //depot/projects/hammer/usr.bin/lex/flexdef.h#3 integrate .. //depot/projects/hammer/usr.bin/lex/gen.c#3 integrate .. //depot/projects/hammer/usr.bin/lex/initscan.c#3 integrate .. //depot/projects/hammer/usr.bin/lex/lex.1#4 integrate .. //depot/projects/hammer/usr.bin/lex/misc.c#2 integrate .. //depot/projects/hammer/usr.bin/lex/nfa.c#2 integrate .. //depot/projects/hammer/usr.bin/lex/parse.y#2 integrate .. //depot/projects/hammer/usr.bin/lex/scan.l#2 integrate .. //depot/projects/hammer/usr.bin/lex/sym.c#2 integrate .. //depot/projects/hammer/usr.bin/lex/tblcmp.c#2 integrate .. //depot/projects/hammer/usr.bin/rev/rev.c#6 integrate .. //depot/projects/hammer/usr.bin/shar/shar.sh#3 integrate .. //depot/projects/hammer/usr.bin/su/su.c#21 integrate .. //depot/projects/hammer/usr.bin/tar/subst.c#2 integrate .. //depot/projects/hammer/usr.bin/tar/test/main.c#2 integrate .. //depot/projects/hammer/usr.bin/tar/test/test.h#2 integrate .. //depot/projects/hammer/usr.bin/tar/util.c#15 integrate .. //depot/projects/hammer/usr.bin/whereis/whereis.c#6 integrate .. //depot/projects/hammer/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c#7 integrate .. //depot/projects/hammer/usr.sbin/config/Makefile#7 integrate .. //depot/projects/hammer/usr.sbin/config/mkmakefile.c#16 integrate .. //depot/projects/hammer/usr.sbin/jexec/jexec.8#6 integrate .. //depot/projects/hammer/usr.sbin/jexec/jexec.c#6 integrate .. //depot/projects/hammer/usr.sbin/mergemaster/mergemaster.8#10 integrate .. //depot/projects/hammer/usr.sbin/ndiscvt/inf.c#9 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/Makefile#12 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/add/main.c#23 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/add/perform.c#13 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/add/pkg_add.1#20 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/create/main.c#11 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/create/pkg_create.1#16 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/delete/main.c#6 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/delete/pkg_delete.1#6 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/info/main.c#12 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/info/pkg_info.1#14 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/lib/file.c#9 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/lib/lib.h#18 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/lib/url.c#9 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/updating/main.c#3 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/updating/pkg_updating.1#4 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/version/main.c#9 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/version/pkg_version.1#16 integrate .. //depot/projects/hammer/usr.sbin/ppp/physical.c#9 integrate .. //depot/projects/hammer/usr.sbin/rpc.lockd/lockd.c#12 integrate .. //depot/projects/hammer/usr.sbin/setfib/setfib.c#2 integrate .. //depot/projects/hammer/usr.sbin/sicontrol/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/sicontrol/sicontrol.8#5 integrate .. //depot/projects/hammer/usr.sbin/sicontrol/sicontrol.c#6 integrate .. //depot/projects/hammer/usr.sbin/timed/timed/timed.c#3 integrate .. //depot/projects/hammer/usr.sbin/tzsetup/paths.h#2 delete .. //depot/projects/hammer/usr.sbin/tzsetup/tzsetup.c#4 integrate .. //depot/projects/hammer/usr.sbin/wlandebug/wlandebug.c#4 integrate Differences ... ==== //depot/projects/hammer/LOCKS#4 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/LOCKS,v 1.4 2008/01/24 22:07:03 cperciva Exp $ +$FreeBSD: src/LOCKS,v 1.5 2008/06/05 19:47:58 peter Exp $ This file documents formal review/approval requirements that have been approved by core. @@ -7,7 +7,7 @@ -------------------------------------- Special cases: -src/* RELENG_4_* Requires Security Officer approval. -src/* RELENG_5_* Requires Security Officer approval. -src/* RELENG_6_* Requires Security Officer approval. -src/* RELENG_7_* Requires Security Officer approval. +releng/4.* Requires Security Officer approval. +releng/5.* Requires Security Officer approval. +releng/6.* Requires Security Officer approval. +releng/7.* Requires Security Officer approval. ==== //depot/projects/hammer/MAINTAINERS#48 (text+ko) ==== @@ -1,8 +1,8 @@ -$FreeBSD: src/MAINTAINERS,v 1.147 2008/05/27 06:50:46 peter Exp $ +$FreeBSD: src/MAINTAINERS,v 1.150 2008/06/06 21:32:01 peter Exp $ Please note that the content of this file is strictly advisory. No locks listed here are valid. The only strict review requirements -are granted by core. These are documented in src/LOCKS and enforced +are granted by core. These are documented in head/LOCKS and enforced by CVSROOT/approvers. The source tree is a community effort. However, some folks go to the @@ -71,7 +71,6 @@ ps gad I am working on a number of changes to this. Would like advance notice of major changes planned to it. cvs peter Heads-up appreciated, try not to break it. -ncurses peter Heads-up appreciated, try not to break it. nvi peter Try not to break it. libz peter Try not to break it. groff ru Recommends pre-commit review. @@ -127,6 +126,7 @@ gnu/usr.bin/send-pr bugmaster Pre-commit review requested. BSD.{local,x11*}.dist portmgr Pre-commit review requested, since these files interface with ports. usb core Please contact core@ before any major changes +ncurses rafan Heads-up appreciated, try not to break it. Following are the entries from the Makefiles, and a few other sources. Please remove stale entries from both their origin, and this file. ==== //depot/projects/hammer/Makefile#51 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.351 2008/05/25 22:13:17 jb Exp $ +# $FreeBSD: src/Makefile,v 1.353 2008/06/17 11:08:49 bz Exp $ # # The user-driven targets are: # ==== //depot/projects/hammer/Makefile.inc1#136 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.605 2008/05/23 04:22:14 jb Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.606 2008/06/18 13:52:58 obrien Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -121,7 +121,7 @@ TARGET?= ${MACHINE} TARGET_ARCH?= ${MACHINE_ARCH} -KNOWN_ARCHES?= amd64 arm i386 i386/pc98 ia64 powerpc sparc64 sparc64/sun4v +KNOWN_ARCHES?= amd64 arm i386 i386/pc98 ia64 mips powerpc sparc64 sparc64/sun4v .if ${TARGET} == ${TARGET_ARCH} _t= ${TARGET} .else ==== //depot/projects/hammer/ObsoleteFiles.inc#53 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.141 2008/05/27 21:05:49 bz Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.143 2008/06/14 10:42:18 ed Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,14 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20080614: sgtty removed +OLD_FILES+=usr/include/sys/ttychars.h +OLD_FILES+=usr/include/sys/ttydev.h +OLD_FILES+=usr/share/man/man3/gtty.3.gz +OLD_FILES+=usr/share/man/man3/stty.3.gz +# 20080609: gpt(8) removed +OLD_FILES+=sbin/gpt +OLD_FILES+=usr/share/man/man8/gpt.8.gz # 20080525: I4B removed OLD_FILES+=etc/isdn/answer OLD_FILES+=etc/isdn/isdntel ==== //depot/projects/hammer/UPDATING#118 (text+ko) ==== @@ -22,6 +22,16 @@ to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20080609: + The gpt(8) utility has been removed. Use gpart(8) to partition + disks instead. + +20080603: + The version that Linuxulator emulates was changed from 2.4.2 + to 2.6.16. If you experience any problems with Linux binaries + please try to set sysctl compat.linux.osrelease to 2.4.2 and + if it fixes the problem contact emulation mailing list. + 20080525: ISDN4BSD (I4B) was removed from the src tree. You may need to update a your kernel configuration and remove relevant entries. @@ -1043,4 +1053,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.529 2008/05/26 10:39:45 bz Exp $ +$FreeBSD: src/UPDATING,v 1.532 2008/06/09 21:33:57 marcel Exp $ ==== //depot/projects/hammer/bin/ln/ln.1#9 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)ln.1 8.2 (Berkeley) 12/30/93 -.\" $FreeBSD: src/bin/ln/ln.1,v 1.32 2007/11/17 21:01:22 ru Exp $ +.\" $FreeBSD: src/bin/ln/ln.1,v 1.33 2008/06/06 08:27:59 keramida Exp $ .\" -.Dd February 14, 2006 +.Dd June 6, 2008 .Dt LN 1 .Os .Sh NAME @@ -42,13 +42,13 @@ .Sh SYNOPSIS .Nm .Op Fl s Op Fl F -.Op Fl f | i +.Op Fl f | iw .Op Fl hnv .Ar source_file .Op Ar target_file .Nm .Op Fl s Op Fl F -.Op Fl f | i +.Op Fl f | iw .Op Fl hnv .Ar source_file ... .Ar target_dir @@ -79,6 +79,8 @@ .Fl f option overrides any previous .Fl i +and +.Fl w options.) .It Fl F If the target file already exists and is a directory, then remove it @@ -134,6 +136,8 @@ Cause .Nm to be verbose, showing files as they are processed. +.It Fl w +Warn if the source of a symbolic link does not currently exist. .El .Pp By default, @@ -194,9 +198,10 @@ The .Fl h , .Fl i , -.Fl n +.Fl n , +.Fl v and -.Fl v +.Fl w options are non-standard and their use in scripts is not recommended. They are provided solely for compatibility with other .Nm ==== //depot/projects/hammer/bin/ln/ln.c#8 (text+ko) ==== @@ -39,7 +39,7 @@ #endif /* not lint */ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/ln/ln.c,v 1.36 2007/11/17 21:01:22 ru Exp $"); +__FBSDID("$FreeBSD: src/bin/ln/ln.c,v 1.38 2008/06/07 09:37:30 keramida Exp $"); #include <sys/param.h> #include <sys/stat.h> @@ -58,6 +58,8 @@ int iflag; /* Interactive mode. */ int sflag; /* Symbolic, not hard, link. */ int vflag; /* Verbose output. */ +int wflag; /* Warn if symlink target does not + * exist, and -f is not enabled. */ /* System link call. */ int (*linkf)(const char *, const char *); char linkch; @@ -92,7 +94,7 @@ exit(linkit(argv[0], argv[1], 0)); } - while ((ch = getopt(argc, argv, "Ffhinsv")) != -1) + while ((ch = getopt(argc, argv, "Ffhinsvw")) != -1) switch (ch) { case 'F': Fflag = 1; @@ -100,6 +102,7 @@ case 'f': fflag = 1; iflag = 0; + wflag = 0; break; case 'h': case 'n': @@ -115,6 +118,9 @@ case 'v': vflag = 1; break; + case 'w': + wflag = 1; + break; case '?': default: usage(); @@ -127,8 +133,10 @@ linkch = sflag ? '-' : '='; if (sflag == 0) Fflag = 0; - if (Fflag == 1 && iflag == 0) + if (Fflag == 1 && iflag == 0) { fflag = 1; + wflag = 0; /* Implied when fflag != 0 */ + } switch(argc) { case 0: @@ -167,6 +175,7 @@ const char *p; int ch, exists, first; char path[PATH_MAX]; + char wbuf[PATH_MAX]; if (!sflag) { /* If source doesn't exist, quit now. */ @@ -204,6 +213,32 @@ exists = !lstat(target, &sb); /* + * If the link source doesn't exist, and a symbolic link was + * requested, and -w was specified, give a warning. + */ + if (sflag && wflag) { + if (*source == '/') { + /* Absolute link source. */ + if (stat(source, &sb) != 0) + warn("warning: %s inaccessible", source); + } else { + /* + * Relative symlink source. Try to construct the + * absolute path of the source, by appending `source' + * to the parent directory of the target. + */ + p = strrchr(target, '/'); + if (p != NULL) + p++; + else + p = target; + (void)snprintf(wbuf, sizeof(wbuf), "%.*s%s", + (int)(p - target), target, source); + if (stat(wbuf, &sb) != 0) + warn("warning: %s", source); + } + } + /* * If the file exists, then unlink it forcibly if -f was specified * and interactively if -i was specified. */ ==== //depot/projects/hammer/bin/sh/alias.c#6 (text+ko) ==== @@ -36,11 +36,10 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/alias.c,v 1.20 2005/09/02 22:43:28 stefanf Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/alias.c,v 1.22 2008/06/07 16:28:20 rse Exp $"); #include <stdlib.h> #include "shell.h" -#include "input.h" #include "output.h" #include "error.h" #include "memalloc.h" @@ -53,8 +52,8 @@ STATIC struct alias *atab[ATABSIZE]; STATIC void setalias(char *, char *); -STATIC int unalias(char *); -STATIC struct alias **hashalias(char *); +STATIC int unalias(const char *); +STATIC struct alias **hashalias(const char *); STATIC void @@ -111,7 +110,7 @@ } STATIC int -unalias(char *name) +unalias(const char *name) { struct alias *ap, **app; @@ -248,7 +247,7 @@ } STATIC struct alias ** -hashalias(char *p) +hashalias(const char *p) { unsigned int hashval; ==== //depot/projects/hammer/bin/sh/parser.c#13 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.59 2008/05/15 19:55:27 stefanf Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.60 2008/05/28 21:44:32 stefanf Exp $"); #include <stdlib.h> #include <unistd.h> @@ -1188,6 +1188,7 @@ int bracketed_name = 0; /* used to handle ${[0-9]*} variables */ int i; int linno; + int length; c = pgetc(); if (c != '(' && c != '{' && (is_eof(c) || !is_name(c)) && @@ -1220,12 +1221,14 @@ subtype = 0; } if (!is_eof(c) && is_name(c)) { - p = out; + length = 0; do { STPUTC(c, out); c = pgetc(); + length++; } while (!is_eof(c) && is_in_name(c)); - if (out - p == 6 && strncmp(p, "LINENO", 6) == 0) { + if (length == 6 && + strncmp(out - length, "LINENO", length) == 0) { /* Replace the variable name with the * current line number. */ linno = plinno; ==== //depot/projects/hammer/contrib/cvs/src/classify.c#6 (text+ko) ==== @@ -12,6 +12,9 @@ * */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/contrib/cvs/src/classify.c,v 1.4 2008/06/16 17:06:17 obrien Exp $"); + #include "cvs.h" static void sticky_ck PROTO ((struct file_info *finfo, int aflag, @@ -34,11 +37,14 @@ aflag /* ...and... */ && (/* ...there used to be a tag which subs in Name keys... */ - (vers->entdata->tag && !isdigit (vers->entdata->tag[0])) + (vers->entdata->tag && !isdigit (vers->entdata->tag[0]) + && vers->tag && !isdigit (vers->tag[0]) + && strcmp (vers->entdata->tag, vers->tag)) /* ...or there used to be a keyword mode which may be * changed by -A... */ || (strlen (vers->entdata->options) + && strcmp (vers->entdata->options, vers->options) && strcmp (vers->entdata->options, "-kkv") && strcmp (vers->entdata->options, "-kb")))) /* ...or... */ ==== //depot/projects/hammer/contrib/ncurses/FREEBSD-vendor#3 (text+ko) ==== @@ -1,8 +1,8 @@ -# $FreeBSD: src/contrib/ncurses/FREEBSD-vendor,v 1.2 2008/05/09 02:30:24 rafan Exp $ +# $FreeBSD: src/contrib/ncurses/FREEBSD-vendor,v 1.3 2008/06/04 07:38:38 rafan Exp $ Project: Ncurses (new curses) library ProjectURL: http://www.gnu.org/software/ncurses/ Version: 5.6-20080503 snapshot VendorTag: NCURSES VersionTag: v5_6_20080503 License: MIT-like -Maintainer: peter, rafan +Maintainer: rafan ==== //depot/projects/hammer/contrib/top/top.X#10 (text+ko) ==== @@ -1,6 +1,6 @@ .\" NOTE: changes to the manual page for "top" should be made in the .\" file "top.X" and NOT in the file "top.1". -.\" $FreeBSD: src/contrib/top/top.X,v 1.20 2007/05/04 15:42:58 rafan Exp $ +.\" $FreeBSD: src/contrib/top/top.X,v 1.21 2008/06/21 15:48:16 ru Exp $ .nr N %topn% .nr D %delay% .TH TOP 1 Local @@ -10,7 +10,7 @@ .SH SYNOPSIS .B top [ -.B \-abCHIijnqStuv +.B \-abCHIijnPqStuv ] [ .BI \-d count ] [ @@ -119,6 +119,9 @@ Use \*(lqnon-interactive\*(rq mode. This is identical to \*(lqbatch\*(rq mode. .TP +.B \-P +Display per-cpu CPU usage statistics. +.TP >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Jun 21 20:36:37 2008 Return-Path: <owner-p4-projects@FreeBSD.ORG> Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 437291065677; Sat, 21 Jun 2008 20:36:37 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 040441065670 for <perforce@freebsd.org>; Sat, 21 Jun 2008 20:36:37 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EEE038FC17 for <perforce@freebsd.org>; Sat, 21 Jun 2008 20:36:36 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5LKaaBP096984 for <perforce@freebsd.org>; Sat, 21 Jun 2008 20:36:36 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5LKaaxw096982 for perforce@freebsd.org; Sat, 21 Jun 2008 20:36:36 GMT (envelope-from peter-gmail@wemm.org) Date: Sat, 21 Jun 2008 20:36:36 GMT Message-Id: <200806212036.m5LKaaxw096982@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter-gmail@wemm.org using -f From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Cc: Subject: PERFORCE change 143897 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes <p4-projects.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/p4-projects> List-Post: <mailto:p4-projects@freebsd.org> List-Help: <mailto:p4-projects-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sat, 21 Jun 2008 20:36:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=143897 Change 143897 by peter@peter_overcee on 2008/06/21 20:36:01 IFC @143896 Affected files ... .. //depot/projects/hammer/contrib/binutils/bfd/coff-mips.c#3 branch .. //depot/projects/hammer/contrib/binutils/bfd/cpu-mips.c#3 branch .. //depot/projects/hammer/contrib/binutils/bfd/elf32-mips.c#3 branch .. //depot/projects/hammer/contrib/binutils/bfd/elf64-mips.c#3 branch .. //depot/projects/hammer/contrib/binutils/bfd/mipsbsd.c#3 branch .. //depot/projects/hammer/contrib/binutils/bfd/pe-mips.c#3 branch .. //depot/projects/hammer/contrib/binutils/include/opcode/mips.h#3 branch .. //depot/projects/hammer/contrib/gdtoa/gethex.c#5 integrate .. //depot/projects/hammer/crypto/heimdal/acinclude.m4#3 branch .. //depot/projects/hammer/lib/libarchive/archive.h#13 branch .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_mtree.c#6 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_disk.c#14 integrate .. //depot/projects/hammer/lib/libarchive/test/test_read_format_isorr_bz2.c#4 integrate .. //depot/projects/hammer/lib/libarchive/test/test_read_format_isorr_bz2.iso.bz2.uu#1 branch .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#181 integrate .. //depot/projects/hammer/sys/netinet/libalias/alias.c#9 integrate .. //depot/projects/hammer/tools/regression/lib/libc/stdio/test-scanfloat.c#8 integrate Differences ... ==== //depot/projects/hammer/contrib/gdtoa/gethex.c#5 (text+ko) ==== @@ -113,8 +113,11 @@ e += e1; } *sp = (char*)s; - if (zret) - return havedig ? STRTOG_Zero : STRTOG_NoNumber; + if (zret) { + if (!havedig) + *sp = s0 - 1; + return STRTOG_Zero; + } n = s1 - s0 - 1; for(k = 0; n > 7; n >>= 1) k++; ==== //depot/projects/hammer/lib/libarchive/archive_read_support_format_mtree.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_mtree.c,v 1.8 2008/06/15 10:43:59 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_mtree.c,v 1.9 2008/06/21 19:06:37 kientzle Exp $"); #ifdef HAVE_SYS_STAT_H #include <sys/stat.h> @@ -1020,7 +1020,7 @@ } /* - * Since parsing octal escapes always makes strings shorter, + * Since parsing backslash sequences always makes strings shorter, * we can always do this conversion in-place. */ static void @@ -1041,13 +1041,57 @@ if (c == '/' && mentry != NULL) mentry->full = 1; if (c == '\\') { - if (src[0] >= '0' && src[0] <= '3' - && src[1] >= '0' && src[1] <= '7' - && src[2] >= '0' && src[2] <= '7') { - c = (src[0] - '0') << 6; - c |= (src[1] - '0') << 3; - c |= (src[2] - '0'); - src += 3; + switch (src[0]) { + case '0': + if (src[1] < '0' || src[1] > '7') { + c = 0; + ++src; + break; + } + /* FALLTHROUGH */ + case '1': + case '2': + case '3': + if (src[1] >= '0' && src[1] <= '7' && + src[2] >= '0' && src[2] <= '7') { + c = (src[0] - '0') << 6; + c |= (src[1] - '0') << 3; + c |= (src[2] - '0'); + src += 3; + } + break; + case 'a': + c = '\a'; + ++src; + break; + case 'b': + c = '\b'; + ++src; + break; + case 'f': + c = '\f'; + ++src; + break; + case 'n': + c = '\n'; + ++src; + break; + case 'r': + c = '\r'; + ++src; + break; + case 's': + c = ' '; + ++src; + break; + case 't': + c = '\t'; + ++src; + break; + case 'v': + c = '\v'; + ++src; + break; } } *dest++ = c; @@ -1190,6 +1234,7 @@ const void *t; const char *s; void *p; + char *u; /* Accumulate line in a line buffer. */ for (;;) { @@ -1222,10 +1267,32 @@ total_size += bytes_read; /* Null terminate. */ mtree->line.s[total_size] = '\0'; - /* If we found '\n', clean up and return. */ - if (p != NULL) { - *start = mtree->line.s; - return (total_size); + /* If we found an unescaped '\n', clean up and return. */ + if (p == NULL) + continue; + for (u = mtree->line.s; *u; ++u) { + if (u[0] == '\n') { + *start = mtree->line.s; + return total_size; + } + if (u[0] == '#') { + if (p == NULL) + break; + *start = mtree->line.s; + return total_size; + } + if (u[0] != '\\') + continue; + if (u[1] == '\\') { + ++u; + continue; + } + if (u[1] == '\n') { + memmove(u, u + 1, + total_size - (u - mtree->line.s) + 1); + --total_size; + continue; + } } } } ==== //depot/projects/hammer/lib/libarchive/archive_write_disk.c#14 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_disk.c,v 1.25 2008/05/26 17:00:23 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_disk.c,v 1.26 2008/06/21 19:05:29 kientzle Exp $"); #ifdef HAVE_SYS_TYPES_H #include <sys/types.h> @@ -1351,7 +1351,7 @@ if (*src == '\0') { archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC, "Invalid empty pathname"); - return (ARCHIVE_WARN); + return (ARCHIVE_FAILED); } /* Skip leading '/'. */ @@ -1382,7 +1382,7 @@ archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC, "Path contains '..'"); - return (ARCHIVE_WARN); + return (ARCHIVE_FAILED); } lastdotdot = 1; } else @@ -1421,7 +1421,7 @@ archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC, "Path contains trailing '..'"); - return (ARCHIVE_WARN); + return (ARCHIVE_FAILED); } if (dest == a->name) { /* ==== //depot/projects/hammer/lib/libarchive/test/test_read_format_isorr_bz2.c#4 (text+ko) ==== @@ -23,11 +23,11 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_isorr_bz2.c,v 1.3 2008/01/01 22:28:04 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_isorr_bz2.c,v 1.4 2008/06/21 19:11:51 kientzle Exp $"); /* Execute the following to rebuild the data for this program: - tail -n +5 test-read_format-isorr_bz2.c | /bin/sh + tail -n +32 test_read_format_isorr_bz2.c | /bin/sh rm -rf /tmp/iso mkdir /tmp/iso @@ -35,79 +35,37 @@ echo "hello" >/tmp/iso/file ln /tmp/iso/file /tmp/iso/hardlink (cd /tmp/iso; ln -s file symlink) -TZ=utc touch -afhm -t 197001010000.01 /tmp/iso /tmp/iso/file /tmp/iso/dir -TZ=utc touch -afhm -t 196912312359.58 /tmp/iso/symlink -mkhybrid -R -uid 1 -gid 2 /tmp/iso | bzip2 > data.iso.bz2 -cat data.iso.bz2 | ./maketest.pl > data.c +TZ=utc touch -afhm -t 197001020000.01 /tmp/iso /tmp/iso/file /tmp/iso/dir +TZ=utc touch -afhm -t 197001030000.02 /tmp/iso/symlink +mkhybrid -R -uid 1 -gid 2 /tmp/iso | bzip2 > test_read_format_isorr_bz2.iso.bz2 +F=test_read_format_isorr_bz2.iso.bz2 +uuencode $F $F > $F.uu exit 1 */ -static unsigned char archive[] = { -'B','Z','h','9','1','A','Y','&','S','Y','G',11,4,'c',0,0,199,255,221,255, -255,203,252,221,'c',251,248,'?',255,223,224,167,255,222,'&','!',234,'$',0, -'0',1,' ',0,'D',2,129,8,192,3,14,'2','3','$',19,184,'J',' ','F',168,244,201, -149,'6','Q',226,155,'S',212,209,160,'h','4','i',160,26,13,0,244,134,212,0, -218,'O',212,153,1,144,244,128,148,' ',147,13,' ',213,'=','1','\'',169,166, -128,'=','!',233,0,208,0,26,0,0,30,160,'h',0,'4','z',130,180,163,'@',0,0,4, -211,0,0,0,2,'b','`',0,0,0,0,0,8,146,133,'F',154,'y','A',163,'A',161,163,'@', -'z',134,'C','C','F',131,'F','@',0,0,0,0,6,154,26,'Q',24,234,180,'P',172,251, -'=',2,'P','H','&','Y','o',130,28,'"',229,210,247,227,248,200,'?','6',161, -'?',170,'H',172,'"','H','I',16,'2','"','&',148,'G',133,'T','z',224,1,215, -' ',0,191,184,10,160,24,248,180,183,244,156,'K',202,133,208,'U',5,'6','C', -26,144,'H',168,'H','H','(','"',151,'@','m',223,'(','P',169,'e',145,148,'6', -237,235,7,227,204,']','k','{',241,187,227,244,251,':','a','L',138,'#','R', -'"',221,'_',239,')',140,'*','*',172,'Q',16,1,16,207,166,251,233,'Z',169,'4', -'_',195,'a',14,18,231,'}',14,139,137,'e',213,185,'T',194,'D','`',25,'$',187, -208,'%','c',162,'~',181,'@',204,'2',238,'P',161,213,127,'I',169,3,' ','o', -6,161,16,128,'F',214,'S','m',6,244,11,229,'Z','y','.',176,'q',' ',248,167, -204,26,193,'q',211,241,214,133,221,212,'I','`',28,244,'N','N','f','H','9', -'w',245,209,'*',20,26,208,'h','(',194,156,192,'l',';',192,'X','T',151,177, -209,'0',156,16,'=',20,'k',184,144,'z',26,'j',133,194,'9',227,'<','[','^', -17,'w','p',225,220,248,'>',205,'>','[',19,'5',155,17,175,28,28,168,175,'n', -'\'','c','w',27,222,204,'k','n','x','I',23,237,'c',145,11,184,'A','(',1,169, -'0',180,189,134,'\\','Y','x',187,'C',151,'d','k','y','-','L',218,138,'s', -'*','(',12,'h',242,'*',17,'E','L',202,146,138,'l','0',217,160,'9','.','S', -214,198,143,'3','&',237,'=','t','P',168,214,210,'`','p','J',181,'H',138,149, -'1','B',206,22,164,'[','O','A',172,134,224,179,219,166,184,'X',185,'W',154, -219,19,161,'Y',184,220,237,147,'9',191,237,'&','i','_',226,146,205,160,'@', -'b',182,';',3,'!',183,'J','t',161,160,178,173,'S',235,':','2',159,':',245, -'{','U',174,'P',142,'G','(',')',9,168,185,'A','U',231,193,'g',213,'e',12, -'X',223,22,249,')',152,237,'G',150,156,3,201,245,212,'2',218,209,177,196, -235,'_','~',137,24,31,196,232,'B',172,'w',159,24,'n',156,150,225,'1','y', -22,'#',138,193,227,232,169,170,166,179,1,11,182,'i',')',160,180,198,175,128, -249,167,5,194,142,183,'f',134,206,180,'&','E','!','[',31,195,':',192,'s', -232,187,'N',131,'Y',137,243,15,'y',12,'J',163,'-',242,'5',197,151,130,163, -240,220,'T',161,'L',159,141,159,152,'4',18,128,'.','^',250,168,200,163,'P', -231,'Y','w','F','U',186,'x',190,16,'0',228,22,'9','F','t',168,157,'i',190, -'+',246,141,142,18,' ','M',174,197,'O',165,'m',224,27,'b',150,'|','W','H', -196,'.','*','Q','$',225,'I','-',148,169,'F',7,197,'m','-',130,153,0,158,21, -'(',221,221,226,206,'g',13,159,163,'y',176,'~',158,'k','4','q','d','s',177, -'7',14,217,'1',173,206,228,'t',250,200,170,162,'d','2','Z','$','e',168,224, -223,129,174,229,165,187,252,203,'-',28,'`',207,183,'-','/',127,196,230,131, -'B',30,237,' ',8,26,194,'O',132,'L','K','\\',144,'L','c',1,10,176,192,'c', -0,244,2,168,3,0,'+',233,186,16,17,'P',17,129,252,'2',0,2,154,247,255,166, -'.',228,138,'p',161,' ',142,22,8,198}; - DEFINE_TEST(test_read_format_isorr_bz2) { + const char *refname = "test_read_format_isorr_bz2.iso.bz2"; struct archive_entry *ae; struct archive *a; const void *p; size_t size; off_t offset; + + extract_reference_file(refname); assert((a = archive_read_new()) != NULL); - assert(0 == archive_read_support_compression_all(a)); - assert(0 == archive_read_support_format_all(a)); - assert(0 == archive_read_open_memory(a, archive, sizeof(archive))); + assertEqualInt(0, archive_read_support_compression_all(a)); + assertEqualInt(0, archive_read_support_format_all(a)); + assertEqualInt(0, archive_read_open_filename(a, refname, 10240)); /* First entry is '.' root directory. */ - assert(0 == archive_read_next_header(a, &ae)); + assertEqualInt(0, archive_read_next_header(a, &ae)); assertEqualString(".", archive_entry_pathname(ae)); assert(S_ISDIR(archive_entry_stat(ae)->st_mode)); assertEqualInt(2048, archive_entry_size(ae)); - assertEqualInt(1, archive_entry_mtime(ae)); + assertEqualInt(86401, archive_entry_mtime(ae)); assertEqualInt(0, archive_entry_mtime_nsec(ae)); - assertEqualInt(1, archive_entry_ctime(ae)); + assertEqualInt(86401, archive_entry_ctime(ae)); assertEqualInt(0, archive_entry_stat(ae)->st_nlink); assertEqualInt(0, archive_entry_uid(ae)); assertEqualIntA(a, ARCHIVE_EOF, @@ -115,66 +73,66 @@ assertEqualInt(size, 0); /* A directory. */ - assert(0 == archive_read_next_header(a, &ae)); + assertEqualInt(0, archive_read_next_header(a, &ae)); assertEqualString("dir", archive_entry_pathname(ae)); assert(S_ISDIR(archive_entry_stat(ae)->st_mode)); - assert(2048 == archive_entry_size(ae)); - assert(1 == archive_entry_mtime(ae)); - assert(1 == archive_entry_atime(ae)); - assert(2 == archive_entry_stat(ae)->st_nlink); - assert(1 == archive_entry_uid(ae)); - assert(2 == archive_entry_gid(ae)); + assertEqualInt(2048, archive_entry_size(ae)); + assertEqualInt(86401, archive_entry_mtime(ae)); + assertEqualInt(86401, archive_entry_atime(ae)); + assertEqualInt(2, archive_entry_stat(ae)->st_nlink); + assertEqualInt(1, archive_entry_uid(ae)); + assertEqualInt(2, archive_entry_gid(ae)); /* A regular file. */ - assert(0 == archive_read_next_header(a, &ae)); + assertEqualInt(0, archive_read_next_header(a, &ae)); assertEqualString("file", archive_entry_pathname(ae)); assert(S_ISREG(archive_entry_stat(ae)->st_mode)); - assert(6 == archive_entry_size(ae)); - assert(0 == archive_read_data_block(a, &p, &size, &offset)); - assert(6 == size); - assert(0 == offset); - assert(0 == memcmp(p, "hello\n", 6)); - assert(1 == archive_entry_mtime(ae)); - assert(1 == archive_entry_atime(ae)); - assert(2 == archive_entry_stat(ae)->st_nlink); - assert(1 == archive_entry_uid(ae)); - assert(2 == archive_entry_gid(ae)); + assertEqualInt(6, archive_entry_size(ae)); + assertEqualInt(0, archive_read_data_block(a, &p, &size, &offset)); + assertEqualInt(6, size); + assertEqualInt(0, offset); + assertEqualInt(0, memcmp(p, "hello\n", 6)); + assertEqualInt(86401, archive_entry_mtime(ae)); + assertEqualInt(86401, archive_entry_atime(ae)); + assertEqualInt(2, archive_entry_stat(ae)->st_nlink); + assertEqualInt(1, archive_entry_uid(ae)); + assertEqualInt(2, archive_entry_gid(ae)); /* A hardlink to the regular file. */ - assert(0 == archive_read_next_header(a, &ae)); + assertEqualInt(0, archive_read_next_header(a, &ae)); assertEqualString("hardlink", archive_entry_pathname(ae)); assert(S_ISREG(archive_entry_stat(ae)->st_mode)); assertEqualString("file", archive_entry_hardlink(ae)); - assert(6 == archive_entry_size(ae)); - assert(1 == archive_entry_mtime(ae)); - assert(1 == archive_entry_atime(ae)); - assert(2 == archive_entry_stat(ae)->st_nlink); - assert(1 == archive_entry_uid(ae)); - assert(2 == archive_entry_gid(ae)); + assertEqualInt(6, archive_entry_size(ae)); + assertEqualInt(86401, archive_entry_mtime(ae)); + assertEqualInt(86401, archive_entry_atime(ae)); + assertEqualInt(2, archive_entry_stat(ae)->st_nlink); + assertEqualInt(1, archive_entry_uid(ae)); + assertEqualInt(2, archive_entry_gid(ae)); /* A symlink to the regular file. */ - assert(0 == archive_read_next_header(a, &ae)); + assertEqualInt(0, archive_read_next_header(a, &ae)); assertEqualString("symlink", archive_entry_pathname(ae)); assert(S_ISLNK(archive_entry_stat(ae)->st_mode)); assertEqualString("file", archive_entry_symlink(ae)); - assert(0 == archive_entry_size(ae)); - assert(-2 == archive_entry_mtime(ae)); - assert(-2 == archive_entry_atime(ae)); - assert(1 == archive_entry_stat(ae)->st_nlink); - assert(1 == archive_entry_uid(ae)); - assert(2 == archive_entry_gid(ae)); + assertEqualInt(0, archive_entry_size(ae)); + assertEqualInt(172802, archive_entry_mtime(ae)); + assertEqualInt(172802, archive_entry_atime(ae)); + assertEqualInt(1, archive_entry_stat(ae)->st_nlink); + assertEqualInt(1, archive_entry_uid(ae)); + assertEqualInt(2, archive_entry_gid(ae)); /* End of archive. */ - assert(ARCHIVE_EOF == archive_read_next_header(a, &ae)); + assertEqualInt(ARCHIVE_EOF, archive_read_next_header(a, &ae)); /* Verify archive format. */ - assert(archive_compression(a) == ARCHIVE_COMPRESSION_BZIP2); - assert(archive_format(a) == ARCHIVE_FORMAT_ISO9660_ROCKRIDGE); + assertEqualInt(archive_compression(a), ARCHIVE_COMPRESSION_BZIP2); + assertEqualInt(archive_format(a), ARCHIVE_FORMAT_ISO9660_ROCKRIDGE); /* Close the archive. */ - assert(0 == archive_read_close(a)); + assertEqualInt(0, archive_read_close(a)); #if ARCHIVE_API_VERSION > 1 - assert(0 == archive_read_finish(a)); + assertEqualInt(0, archive_read_finish(a)); #else archive_read_finish(a); #endif ==== //depot/projects/hammer/sys/amd64/amd64/pmap.c#181 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.622 2008/06/20 05:22:09 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.623 2008/06/21 19:19:09 alc Exp $"); /* * Manages physical address maps. @@ -448,8 +448,10 @@ /* Read-only from zero to physfree */ /* XXX not fully used, underneath 2M pages */ for (i = 0; (i << PAGE_SHIFT) < *firstaddr; i++) { - ((pt_entry_t *)KPTphys)[i] = i << PAGE_SHIFT; - ((pt_entry_t *)KPTphys)[i] |= PG_RW | PG_V | PG_G; + ((pt_entry_t *)KPTphys)[(KERNBASE - VM_MIN_KERNEL_ADDRESS) / + PAGE_SIZE + i] = i << PAGE_SHIFT; + ((pt_entry_t *)KPTphys)[(KERNBASE - VM_MIN_KERNEL_ADDRESS) / + PAGE_SIZE + i] |= PG_RW | PG_V | PG_G; } /* Now map the page tables at their location within PTmap */ @@ -461,8 +463,10 @@ /* Map from zero to end of allocations under 2M pages */ /* This replaces some of the KPTphys entries above */ for (i = 0; (i << PDRSHIFT) < *firstaddr; i++) { - ((pd_entry_t *)KPDphys)[i] = i << PDRSHIFT; - ((pd_entry_t *)KPDphys)[i] |= PG_RW | PG_V | PG_PS | PG_G; + ((pd_entry_t *)KPDphys)[(KERNBASE - VM_MIN_KERNEL_ADDRESS) / + NBPDR + i] = i << PDRSHIFT; + ((pd_entry_t *)KPDphys)[(KERNBASE - VM_MIN_KERNEL_ADDRESS) / + NBPDR + i] |= PG_RW | PG_V | PG_PS | PG_G; } /* And connect up the PD to the PDP */ ==== //depot/projects/hammer/sys/netinet/libalias/alias.c#9 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/netinet/libalias/alias.c,v 1.63 2008/06/01 17:52:40 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/libalias/alias.c,v 1.64 2008/06/21 20:18:57 mav Exp $"); /* Alias.c provides supervisory control for the functions of the @@ -271,7 +271,7 @@ int create); static int UdpAliasIn(struct libalias *, struct ip *); -static int UdpAliasOut(struct libalias *, struct ip *, int create); +static int UdpAliasOut(struct libalias *, struct ip *, int, int create); static int TcpAliasIn(struct libalias *, struct ip *); static int TcpAliasOut(struct libalias *, struct ip *, int, int create); @@ -717,19 +717,18 @@ struct alias_link *lnk; LIBALIAS_LOCK_ASSERT(la); -/* Return if proxy-only mode is enabled */ - if (la->packetAliasMode & PKT_ALIAS_PROXY_ONLY) - return (PKT_ALIAS_OK); ud = (struct udphdr *)ip_next(pip); lnk = FindUdpTcpIn(la, pip->ip_src, pip->ip_dst, ud->uh_sport, ud->uh_dport, - IPPROTO_UDP, 1); + IPPROTO_UDP, !(la->packetAliasMode & PKT_ALIAS_PROXY_ONLY)); if (lnk != NULL) { struct in_addr alias_address; struct in_addr original_address; + struct in_addr proxy_address; u_short alias_port; + u_short proxy_port; int accumulate; int r = 0, error; struct alias_data ad = { @@ -744,8 +743,10 @@ alias_address = GetAliasAddress(lnk); original_address = GetOriginalAddress(lnk); + proxy_address = GetProxyAddress(lnk); alias_port = ud->uh_dport; ud->uh_dport = GetOriginalPort(lnk); + proxy_port = GetProxyPort(lnk); /* Walk out chain. */ error = find_handler(IN, UDP, la, pip, &ad); @@ -757,8 +758,32 @@ accumulate -= ud->uh_dport; accumulate += twowords(&alias_address); accumulate -= twowords(&original_address); + +/* If this is a proxy packet, modify checksum because of source change.*/ + if (proxy_port != 0) { + accumulate += ud->uh_sport; + accumulate -= proxy_port; + } + + if (proxy_address.s_addr != 0) { + accumulate += twowords(&pip->ip_src); + accumulate -= twowords(&proxy_address); + } + ADJUST_CHECKSUM(accumulate, ud->uh_sum); } +/* XXX: Could the two if's below be concatenated to one ? */ +/* Restore source port and/or address in case of proxying*/ + + if (proxy_port != 0) + ud->uh_sport = proxy_port; + + if (proxy_address.s_addr != 0) { + DifferentialChecksum(&pip->ip_sum, + &proxy_address, &pip->ip_src, 2); + pip->ip_src = proxy_address; + } + /* Restore original IP address */ DifferentialChecksum(&pip->ip_sum, &original_address, &pip->ip_dst, 2); @@ -776,19 +801,50 @@ } static int -UdpAliasOut(struct libalias *la, struct ip *pip, int create) +UdpAliasOut(struct libalias *la, struct ip *pip, int maxpacketsize, int create) { struct udphdr *ud; struct alias_link *lnk; + struct in_addr dest_address; + struct in_addr proxy_server_address; + u_short dest_port; + u_short proxy_server_port; + int proxy_type; int error; LIBALIAS_LOCK_ASSERT(la); -/* Return if proxy-only mode is enabled */ - if (la->packetAliasMode & PKT_ALIAS_PROXY_ONLY) + +/* Return if proxy-only mode is enabled and not proxyrule found.*/ + ud = (struct udphdr *)ip_next(pip); + proxy_type = ProxyCheck(la, &proxy_server_address, + &proxy_server_port, pip->ip_src, pip->ip_dst, + ud->uh_dport, pip->ip_p); + if (proxy_type == 0 && (la->packetAliasMode & PKT_ALIAS_PROXY_ONLY)) return (PKT_ALIAS_OK); - ud = (struct udphdr *)ip_next(pip); +/* If this is a transparent proxy, save original destination, + * then alter the destination and adjust checksums */ + dest_port = ud->uh_dport; + dest_address = pip->ip_dst; + + if (proxy_type != 0) { + int accumulate; + + accumulate = twowords(&pip->ip_dst); + accumulate -= twowords(&proxy_server_address); + + ADJUST_CHECKSUM(accumulate, pip->ip_sum); + if (ud->uh_sum != 0) { + accumulate = twowords(&pip->ip_dst); + accumulate -= twowords(&proxy_server_address); + accumulate += ud->uh_dport; + accumulate -= proxy_server_port; + ADJUST_CHECKSUM(accumulate, ud->uh_sum); + } + pip->ip_dst = proxy_server_address; + ud->uh_dport = proxy_server_port; + } lnk = FindUdpTcpOut(la, pip->ip_src, pip->ip_dst, ud->uh_sport, ud->uh_dport, IPPROTO_UDP, create); @@ -805,6 +861,16 @@ .maxpktsize = 0 }; +/* Save original destination address, if this is a proxy packet. + * Also modify packet to include destination encoding. This may + * change the size of IP header. */ + if (proxy_type != 0) { + SetProxyPort(lnk, dest_port); + SetProxyAddress(lnk, dest_address); + ProxyModify(la, lnk, pip, maxpacketsize, proxy_type); + ud = (struct udphdr *)ip_next(pip); + } + alias_address = GetAliasAddress(lnk); alias_port = GetAliasPort(lnk); @@ -1409,7 +1475,7 @@ iresult = IcmpAliasOut(la, pip, create); break; case IPPROTO_UDP: - iresult = UdpAliasOut(la, pip, create); + iresult = UdpAliasOut(la, pip, maxpacketsize, create); break; case IPPROTO_TCP: iresult = TcpAliasOut(la, pip, maxpacketsize, create); ==== //depot/projects/hammer/tools/regression/lib/libc/stdio/test-scanfloat.c#8 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/tools/regression/lib/libc/stdio/test-scanfloat.c,v 1.9 2007/12/09 21:00:12 das Exp $"); +__FBSDID("$FreeBSD: src/tools/regression/lib/libc/stdio/test-scanfloat.c,v 1.10 2008/06/21 19:28:26 das Exp $"); #include <assert.h> #include <fenv.h> @@ -49,8 +49,9 @@ long double ld = 0.0; double d = 0.0; float f = 0.0; + char *endp; - printf("1..3\n"); + printf("1..4\n"); buf[0] = '\0'; assert(setlocale(LC_NUMERIC, "")); @@ -274,6 +275,15 @@ printf("ok 3 - scanfloat\n"); + /* + * Tests specific to strtod(). + */ + + assert(strtod("0xy", &endp) == 0); + assert(strcmp("xy", endp) == 0); + + printf("ok 4 - scanfloat\n"); + return (0); } From owner-p4-projects@FreeBSD.ORG Sat Jun 21 20:57:59 2008 Return-Path: <owner-p4-projects@FreeBSD.ORG> Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 277C81065676; Sat, 21 Jun 2008 20:57:59 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DE3DA106566B for <perforce@freebsd.org>; Sat, 21 Jun 2008 20:57:58 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D678D8FC0A for <perforce@freebsd.org>; Sat, 21 Jun 2008 20:57:58 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5LKvwaf007968 for <perforce@freebsd.org>; Sat, 21 Jun 2008 20:57:58 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5LKvwxj007966 for perforce@freebsd.org; Sat, 21 Jun 2008 20:57:58 GMT (envelope-from peter-gmail@wemm.org) Date: Sat, 21 Jun 2008 20:57:58 GMT Message-Id: <200806212057.m5LKvwxj007966@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter-gmail@wemm.org using -f From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Cc: Subject: PERFORCE change 143898 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes <p4-projects.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/p4-projects> List-Post: <mailto:p4-projects@freebsd.org> List-Help: <mailto:p4-projects-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sat, 21 Jun 2008 20:57:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=143898 Change 143898 by peter@peter_overcee on 2008/06/21 20:57:17 Bah. Disable WIP. Affected files ... .. //depot/projects/hammer/lib/libkvm/kvm_amd64.c#25 edit Differences ... ==== //depot/projects/hammer/lib/libkvm/kvm_amd64.c#25 (text+ko) ==== @@ -75,9 +75,11 @@ void *mmapbase; size_t mmapsize; pml4_entry_t *PML4; +#if 0 int mp_maxcpus; int pcpu_recsize; char *pcpu; +#endif }; /* @@ -359,6 +361,7 @@ return (_kvm_vatop(kd, va, pa)); } +#if 0 static int _kvm_initpcpu(kvm_t *kd) { @@ -423,7 +426,8 @@ } if (cpu < 0 || cpu > vm->vm_maxcpus) - _kvm_err(kd, kd->program, " + _kvm_err(kd, kd->program, ""); return (NULL); /* EDOOFUS actually */ return ((struct pcpu *)&vm->pcpu[cpu * vm->pcpu_recsize]); } +#endif From owner-p4-projects@FreeBSD.ORG Sat Jun 21 22:19:21 2008 Return-Path: <owner-p4-projects@FreeBSD.ORG> Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D767D1065676; Sat, 21 Jun 2008 22:19:20 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 98BA91065670 for <perforce@freebsd.org>; Sat, 21 Jun 2008 22:19:20 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 78B8E8FC19 for <perforce@freebsd.org>; Sat, 21 Jun 2008 22:19:20 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5LMJKYP016747 for <perforce@freebsd.org>; Sat, 21 Jun 2008 22:19:20 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5LMJKKk016745 for perforce@freebsd.org; Sat, 21 Jun 2008 22:19:20 GMT (envelope-from gabor@freebsd.org) Date: Sat, 21 Jun 2008 22:19:20 GMT Message-Id: <200806212219.m5LMJKKk016745@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan <gabor@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Cc: Subject: PERFORCE change 143900 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes <p4-projects.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/p4-projects> List-Post: <mailto:p4-projects@freebsd.org> List-Help: <mailto:p4-projects-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sat, 21 Jun 2008 22:19:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=143900 Change 143900 by gabor@gabor_server on 2008/06/21 22:19:12 - Remove commented out debug line Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/grep.c#34 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/grep.c#34 (text+ko) ==== @@ -268,8 +268,6 @@ } } -// printf("PAT %s\n", pat); - /* Work-around to allow * at the beginning of the regexp */ while (pat[0] == '*') pat++;