From owner-p4-projects@FreeBSD.ORG Tue Apr 24 06:51:06 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 261C316A401; Tue, 24 Apr 2007 06:51:06 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C577516A406 for ; Tue, 24 Apr 2007 06:51:05 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id B37E613C458 for ; Tue, 24 Apr 2007 06:51:05 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3O6p5LZ096121 for ; Tue, 24 Apr 2007 06:51:05 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3O6p4ad096048 for perforce@freebsd.org; Tue, 24 Apr 2007 06:51:04 GMT (envelope-from kmacy@freebsd.org) Date: Tue, 24 Apr 2007 06:51:04 GMT Message-Id: <200704240651.l3O6p4ad096048@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 118712 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, 24 Apr 2007 06:51:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=118712 Change 118712 by kmacy@kmacy_vt-x:opentoe_init on 2007/04/24 06:50:50 IFC Affected files ... .. //depot/projects/opentoe/UPDATING#6 integrate .. //depot/projects/opentoe/contrib/sendmail/libmilter/engine.c#3 integrate .. //depot/projects/opentoe/contrib/sendmail/libmilter/listener.c#3 integrate .. //depot/projects/opentoe/contrib/sendmail/libmilter/main.c#3 integrate .. //depot/projects/opentoe/etc/sendmail/freebsd.mc#2 integrate .. //depot/projects/opentoe/etc/sendmail/freebsd.submit.mc#2 integrate .. //depot/projects/opentoe/lib/libbsm/Makefile#2 integrate .. //depot/projects/opentoe/release/doc/en_US.ISO8859-1/relnotes/article.sgml#5 integrate .. //depot/projects/opentoe/sys/cam/scsi/scsi_da.c#4 integrate .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#2 integrate .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#3 integrate .. //depot/projects/opentoe/sys/dev/led/led.c#2 integrate .. //depot/projects/opentoe/sys/dev/led/led.h#2 integrate .. //depot/projects/opentoe/sys/fs/devfs/devfs_devs.c#2 integrate .. //depot/projects/opentoe/sys/fs/devfs/devfs_vnops.c#5 integrate .. //depot/projects/opentoe/sys/fs/pseudofs/pseudofs_vncache.c#3 integrate .. //depot/projects/opentoe/sys/geom/uzip/g_uzip.c#3 integrate .. //depot/projects/opentoe/sys/i386/i386/vm_machdep.c#2 integrate .. //depot/projects/opentoe/sys/kern/kern_uuid.c#2 integrate .. //depot/projects/opentoe/sys/netgraph/ng_l2tp.c#2 integrate .. //depot/projects/opentoe/sys/netinet/tcp_input.c#6 integrate .. //depot/projects/opentoe/sys/netinet6/route6.c#2 integrate .. //depot/projects/opentoe/sys/pci/if_vr.c#4 integrate .. //depot/projects/opentoe/sys/pci/if_vrreg.h#4 integrate .. //depot/projects/opentoe/sys/security/mac/mac_framework.h#3 integrate .. //depot/projects/opentoe/sys/security/mac/mac_policy.h#3 integrate .. //depot/projects/opentoe/sys/security/mac/mac_vfs.c#3 integrate .. //depot/projects/opentoe/sys/security/mac_biba/mac_biba.c#3 integrate .. //depot/projects/opentoe/sys/security/mac_bsdextended/mac_bsdextended.c#3 integrate .. //depot/projects/opentoe/sys/security/mac_ifoff/mac_ifoff.c#2 integrate .. //depot/projects/opentoe/sys/security/mac_lomac/mac_lomac.c#3 integrate .. //depot/projects/opentoe/sys/security/mac_mls/mac_mls.c#3 integrate .. //depot/projects/opentoe/sys/security/mac_partition/mac_partition.c#2 integrate .. //depot/projects/opentoe/sys/security/mac_portacl/mac_portacl.c#2 integrate .. //depot/projects/opentoe/sys/security/mac_seeotheruids/mac_seeotheruids.c#2 integrate .. //depot/projects/opentoe/sys/security/mac_stub/mac_stub.c#3 integrate .. //depot/projects/opentoe/sys/security/mac_test/mac_test.c#3 integrate .. //depot/projects/opentoe/sys/vm/swap_pager.c#2 integrate .. //depot/projects/opentoe/tools/tools/net80211/wesside/wesside/wesside.c#3 integrate .. //depot/projects/opentoe/tools/tools/recoverdisk/recoverdisk.c#2 integrate .. //depot/projects/opentoe/usr.bin/quota/quota.c#2 integrate .. //depot/projects/opentoe/usr.sbin/rpcbind/rpcbind.8#2 integrate .. //depot/projects/opentoe/usr.sbin/rpcbind/rpcbind.c#2 integrate Differences ... ==== //depot/projects/opentoe/UPDATING#6 (text+ko) ==== @@ -21,6 +21,12 @@ developers choose to disable these features on build machines to maximize performance. +20070423: + The ABI breakage in sendmail(8)'s libmilter has been repaired + so it is no longer necessary to recompile mail filters (aka, + milters). If you recompiled mail filters after the 20070408 + note, it is not necessary to recompile them again. + 20070417: The new trunk(4) driver has been renamed to lagg(4) as it better reflects its purpose. ifconfig will need to be recompiled. @@ -767,4 +773,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.488 2007/04/19 17:08:54 dds Exp $ +$FreeBSD: src/UPDATING,v 1.489 2007/04/23 22:15:07 gshapiro Exp $ ==== //depot/projects/opentoe/contrib/sendmail/libmilter/engine.c#3 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999-2004, 2006 Sendmail, Inc. and its suppliers. + * Copyright (c) 1999-2004, 2006, 2007 Sendmail, Inc. and its suppliers. * All rights reserved. * * By using this file, you agree to the terms and conditions set @@ -855,6 +855,7 @@ ; if (g->a_ctx->ctx_smfi != NULL && + g->a_ctx->ctx_smfi->xxfi_version > 4 && (fi_negotiate = g->a_ctx->ctx_smfi->xxfi_negotiate) != NULL) { int r; @@ -1177,6 +1178,7 @@ if (g == NULL) return _SMFIS_ABORT; if (g->a_ctx->ctx_smfi != NULL && + g->a_ctx->ctx_smfi->xxfi_version > 3 && (fi_data = g->a_ctx->ctx_smfi->xxfi_data) != NULL) return (*fi_data)(g->a_ctx); return SMFIS_CONTINUE; @@ -1310,6 +1312,7 @@ if (g == NULL) return _SMFIS_ABORT; if (g->a_ctx->ctx_smfi != NULL && + g->a_ctx->ctx_smfi->xxfi_version > 2 && (fi_unknown = g->a_ctx->ctx_smfi->xxfi_unknown) != NULL) return (*fi_unknown)(g->a_ctx, (const char *) g->a_buf); return SMFIS_CONTINUE; ==== //depot/projects/opentoe/contrib/sendmail/libmilter/listener.c#3 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999-2006 Sendmail, Inc. and its suppliers. + * Copyright (c) 1999-2007 Sendmail, Inc. and its suppliers. * All rights reserved. * * By using this file, you agree to the terms and conditions set @@ -927,9 +927,9 @@ ctx->ctx_pflags |= SMFIP_NOEOH; if (smfi->xxfi_body == NULL) ctx->ctx_pflags |= SMFIP_NOBODY; - if (smfi->xxfi_data == NULL) + if (smfi->xxfi_version <= 3 || smfi->xxfi_data == NULL) ctx->ctx_pflags |= SMFIP_NODATA; - if (smfi->xxfi_unknown == NULL) + if (smfi->xxfi_version <= 2 || smfi->xxfi_unknown == NULL) ctx->ctx_pflags |= SMFIP_NOUNKNOWN; #if _FFR_WORKERS_POOL ==== //depot/projects/opentoe/contrib/sendmail/libmilter/main.c#3 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999-2003, 2006 Sendmail, Inc. and its suppliers. + * Copyright (c) 1999-2003, 2006, 2007 Sendmail, Inc. and its suppliers. * All rights reserved. * * By using this file, you agree to the terms and conditions set @@ -52,7 +52,10 @@ (void) sm_strlcpy(smfi->xxfi_name, smfilter.xxfi_name, len); /* compare milter version with hard coded version */ - if (smfi->xxfi_version != SMFI_VERSION) + if (smfi->xxfi_version != SMFI_VERSION && + smfi->xxfi_version != 2 && + smfi->xxfi_version != 3 && + smfi->xxfi_version != 4) { /* hard failure for now! */ smi_log(SMI_LOG_ERR, ==== //depot/projects/opentoe/etc/sendmail/freebsd.mc#2 (text+ko) ==== @@ -44,7 +44,7 @@ # divert(0) -VERSIONID(`$FreeBSD: src/etc/sendmail/freebsd.mc,v 1.33 2006/08/17 05:12:07 gshapiro Exp $') +VERSIONID(`$FreeBSD: src/etc/sendmail/freebsd.mc,v 1.34 2007/04/23 22:23:54 gshapiro Exp $') OSTYPE(freebsd6) DOMAIN(generic) ==== //depot/projects/opentoe/etc/sendmail/freebsd.submit.mc#2 (text+ko) ==== @@ -16,7 +16,7 @@ # divert(0)dnl -VERSIONID(`$FreeBSD: src/etc/sendmail/freebsd.submit.mc,v 1.4 2006/08/17 05:12:07 gshapiro Exp $') +VERSIONID(`$FreeBSD: src/etc/sendmail/freebsd.submit.mc,v 1.5 2007/04/23 22:23:54 gshapiro Exp $') define(`confCF_VERSION', `Submit')dnl define(`__OSTYPE__',`')dnl dirty hack to keep proto.m4 from complaining define(`_USE_DECNET_SYNTAX_', `1')dnl support DECnet ==== //depot/projects/opentoe/lib/libbsm/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/lib/libbsm/Makefile,v 1.5 2006/09/25 11:53:58 rwatson Exp $ +# $FreeBSD: src/lib/libbsm/Makefile,v 1.6 2007/04/23 14:46:59 rwatson Exp $ # OPENBSMDIR= ${.CURDIR}/../../contrib/openbsm @@ -143,6 +143,7 @@ au_token.3 au_to_header32.3 \ au_token.3 au_to_header64.3 \ au_token.3 au_to_trailer.3 \ + au_token.3 au_to_zonename.3 \ au_user.3 setauuser.3 \ au_user.3 endauuser.3 \ au_user.3 getauuserent.3 \ ==== //depot/projects/opentoe/release/doc/en_US.ISO8859-1/relnotes/article.sgml#5 (text+ko) ==== @@ -30,7 +30,7 @@ The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1021 2007/04/21 03:45:18 hrs Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1022 2007/04/23 22:48:13 gshapiro Exp $ 2000 @@ -2026,9 +2026,7 @@ &merged; sendmail has been updated from - 8.13.4 to 8.14.1. This upgrade includes a new libmilter - library which requires all dynamically linked milters to be - recompiled. &merged; + 8.13.4 to 8.14.1. &merged; tcpdump has been updated from 3.9.1 to 3.9.4. &merged; ==== //depot/projects/opentoe/sys/cam/scsi/scsi_da.c#4 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.207 2007/04/19 22:18:15 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.208 2007/04/23 18:01:44 scottl Exp $"); #include @@ -39,20 +39,13 @@ #include #include #include -#endif /* _KERNEL */ - +#include #include -#include #include #include #include - -#include - -#include -#include - #include +#endif /* _KERNEL */ #ifndef _KERNEL #include ==== //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#2 (text+ko) ==== @@ -2802,13 +2802,14 @@ #ifdef _KERNEL /* Warn about ZFS memory requirements. */ if (((uint64_t)physmem * PAGESIZE) < (256 + 128 + 64) * (1 << 20)) { - printf("ZFS WARNING: Recomended minimum of RAM size is 512MB, " - "expect unstable behaviour.\n"); + printf("ZFS WARNING: Recommended minimum RAM size is 512MB; " + "expect unstable behavior.\n"); } else if (kmem_size() < 256 * (1 << 20)) { - printf("ZFS WARNING: Recomended minimum of kmem_map size is " - "256MB, expect unstable behaviour.\n"); - printf(" Consider tunning vm.kmem_size and " - "vm.kmem_size_max in /boot/loader.conf.\n"); + printf("ZFS WARNING: Recommended minimum kmem_size is 256MB; " + "expect unstable behavior.\n"); + printf(" Consider tuning vm.kmem_size or " + "vm.kmem_size_min\n"); + printf(" in /boot/loader.conf.\n"); } #endif } ==== //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#3 (text+ko) ==== @@ -188,7 +188,7 @@ * data (cmd == _FIO_SEEK_DATA). "off" is an in/out parameter. */ static int -zfs_holey(vnode_t *vp, int cmd, offset_t *off) +zfs_holey(vnode_t *vp, u_long cmd, offset_t *off) { znode_t *zp = VTOZ(vp); uint64_t noff = (uint64_t)*off; /* new offset */ @@ -228,7 +228,7 @@ /* ARGSUSED */ static int -zfs_ioctl(vnode_t *vp, int com, intptr_t data, int flag, cred_t *cred, +zfs_ioctl(vnode_t *vp, u_long com, intptr_t data, int flag, cred_t *cred, int *rvalp) { offset_t off; @@ -3110,7 +3110,7 @@ } */ *ap; { - return (zfs_ioctl(ap->a_vp, (int)ap->a_command, (intptr_t)ap->a_data, + return (zfs_ioctl(ap->a_vp, ap->a_command, (intptr_t)ap->a_data, ap->a_fflag, ap->a_cred, NULL)); } ==== //depot/projects/opentoe/sys/dev/led/led.c#2 (text+ko) ==== @@ -9,7 +9,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/led/led.c,v 1.16 2005/03/07 11:05:46 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/led/led.c,v 1.17 2007/04/23 12:42:15 phk Exp $"); #include #include @@ -242,6 +242,12 @@ struct cdev * led_create(led_t *func, void *priv, char const *name) { + + return (led_create_state(func, priv, name, 0)); +} +struct cdev * +led_create_state(led_t *func, void *priv, char const *name, int state) +{ struct ledsc *sc; sc = malloc(sizeof *sc, M_LED, M_WAITOK | M_ZERO); @@ -259,7 +265,7 @@ if (LIST_EMPTY(&led_list)) callout_reset(&led_ch, hz / 10, led_timeout, NULL); LIST_INSERT_HEAD(&led_list, sc, list); - sc->func(sc->private, 0); + sc->func(sc->private, state != 0); mtx_unlock(&led_mtx); return (sc->dev); ==== //depot/projects/opentoe/sys/dev/led/led.h#2 (text+ko) ==== @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $FreeBSD: src/sys/dev/led/led.h,v 1.5 2004/06/16 09:46:49 phk Exp $ + * $FreeBSD: src/sys/dev/led/led.h,v 1.6 2007/04/23 12:42:15 phk Exp $ */ #ifndef _DEV_LED_H @@ -14,6 +14,7 @@ typedef void led_t(void *, int); +struct cdev *led_create_state(led_t *, void *, char const *, int); struct cdev *led_create(led_t *, void *, char const *); void led_destroy(struct cdev *); ==== //depot/projects/opentoe/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.49 2006/10/22 11:52:12 rwatson Exp $ + * $FreeBSD: src/sys/fs/devfs/devfs_devs.c,v 1.50 2007/04/23 13:36:52 rwatson Exp $ */ #include "opt_mac.h" @@ -182,7 +182,7 @@ de->de_links = 1; de->de_holdcnt = 1; #ifdef MAC - mac_init_devfsdirent(de); + mac_init_devfs(de); #endif return (de); } @@ -274,7 +274,7 @@ de->de_symlink = NULL; } #ifdef MAC - mac_destroy_devfsdirent(de); + mac_destroy_devfs(de); #endif if (de->de_inode > DEVFS_ROOTINO) { free_unr(devfs_inos, de->de_inode); ==== //depot/projects/opentoe/sys/fs/devfs/devfs_vnops.c#5 (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.144 2007/04/20 01:47:05 trhodes Exp $ + * $FreeBSD: src/sys/fs/devfs/devfs_vnops.c,v 1.145 2007/04/23 13:36:52 rwatson Exp $ */ /* @@ -1229,7 +1229,7 @@ de = vp->v_data; mac_relabel_vnode(ap->a_cred, vp, ap->a_label); - mac_update_devfsdirent(vp->v_mount, de, vp); + mac_update_devfs(vp->v_mount, de, vp); return (0); } ==== //depot/projects/opentoe/sys/fs/pseudofs/pseudofs_vncache.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/fs/pseudofs/pseudofs_vncache.c,v 1.37 2007/04/15 17:10:01 des Exp $"); +__FBSDID("$FreeBSD: src/sys/fs/pseudofs/pseudofs_vncache.c,v 1.38 2007/04/23 19:17:01 des Exp $"); #include "opt_pseudofs.h" @@ -150,10 +150,15 @@ /* nope, get a new one */ MALLOC(pvd, struct pfs_vdata *, sizeof *pvd, M_PFSVNCACHE, M_WAITOK); + mtx_lock(&pfs_vncache_mutex); if (++pfs_vncache_entries > pfs_vncache_maxentries) pfs_vncache_maxentries = pfs_vncache_entries; + mtx_unlock(&pfs_vncache_mutex); error = getnewvnode("pseudofs", mp, &pfs_vnodeops, vpp); if (error) { + mtx_lock(&pfs_vncache_mutex); + --pfs_vncache_entries; + mtx_unlock(&pfs_vncache_mutex); FREE(pvd, M_PFSVNCACHE); return (error); } @@ -195,6 +200,9 @@ vn_lock(*vpp, LK_EXCLUSIVE | LK_RETRY, curthread); error = insmntque(*vpp, mp); if (error != 0) { + mtx_lock(&pfs_vncache_mutex); + --pfs_vncache_entries; + mtx_unlock(&pfs_vncache_mutex); FREE(pvd, M_PFSVNCACHE); *vpp = NULLVP; return (error); @@ -226,9 +234,9 @@ pvd->pvd_prev->pvd_next = pvd->pvd_next; else pfs_vncache = pvd->pvd_next; + --pfs_vncache_entries; mtx_unlock(&pfs_vncache_mutex); - --pfs_vncache_entries; FREE(pvd, M_PFSVNCACHE); vp->v_data = NULL; return (0); ==== //depot/projects/opentoe/sys/geom/uzip/g_uzip.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/uzip/g_uzip.c,v 1.11 2007/04/07 02:52:13 simokawa Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/uzip/g_uzip.c,v 1.12 2007/04/24 06:30:06 simokawa Exp $"); #include #include @@ -162,6 +162,13 @@ ulen = MIN(sc->blksz - uoff, bp2->bio_length - upos); len = sc->offsets[i + 1] - sc->offsets[i]; + if (len == 0) { + /* All zero block: no cache update */ + bzero(bp2->bio_data + upos, ulen); + upos += ulen; + bp2->bio_completed += ulen; + continue; + } zs.next_in = bp->bio_data + pos; zs.avail_in = len; zs.next_out = sc->last_buf; ==== //depot/projects/opentoe/sys/i386/i386/vm_machdep.c#2 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/vm_machdep.c,v 1.276 2007/03/05 21:40:10 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/vm_machdep.c,v 1.277 2007/04/23 22:53:01 jhb Exp $"); #include "opt_isa.h" #include "opt_npx.h" @@ -641,7 +641,7 @@ } #endif /* PC98 */ - printf("No known reset method did work, attempting CPU shutdown\n"); + printf("No known reset method worked, attempting CPU shutdown\n"); DELAY(1000000); /* wait 1 sec for printf to complete */ /* Force a shutdown by unmapping entire address space. */ ==== //depot/projects/opentoe/sys/kern/kern_uuid.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_uuid.c,v 1.12 2007/03/05 13:10:57 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_uuid.c,v 1.13 2007/04/23 12:53:00 pjd Exp $"); #include #include @@ -116,7 +116,7 @@ /* * Get the current time as a 60 bit count of 100-nanosecond intervals * since 00:00:00.00, October 15,1582. We apply a magic offset to convert - * the Unix time since 00:00:00.00, Januari 1, 1970 to the date of the + * the Unix time since 00:00:00.00, January 1, 1970 to the date of the * Gregorian reform to the Christian calendar. */ static uint64_t ==== //depot/projects/opentoe/sys/netgraph/ng_l2tp.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ * * Author: Archie Cobbs * - * $FreeBSD: src/sys/netgraph/ng_l2tp.c,v 1.15 2005/08/10 06:25:40 obrien Exp $ + * $FreeBSD: src/sys/netgraph/ng_l2tp.c,v 1.16 2007/04/23 15:25:14 mav Exp $ */ /* @@ -1122,6 +1122,10 @@ hpriv->stats.xmitPackets++; hpriv->stats.xmitOctets += m->m_pkthdr.len; + /* And the global one. */ + priv->stats.xmitPackets++; + priv->stats.xmitOctets += m->m_pkthdr.len; + /* Send packet */ NG_FWD_NEW_DATA(error, item, priv->lower, m); return (error); ==== //depot/projects/opentoe/sys/netinet/tcp_input.c#6 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)tcp_input.c 8.12 (Berkeley) 5/24/95 - * $FreeBSD: src/sys/netinet/tcp_input.c,v 1.340 2007/04/20 15:28:01 andre Exp $ + * $FreeBSD: src/sys/netinet/tcp_input.c,v 1.341 2007/04/23 19:41:47 andre Exp $ */ #include "opt_ipfw.h" /* for ipfw_fwd */ @@ -751,9 +751,9 @@ if (inp->inp_vflag & INP_TIMEWAIT) { if (thflags & TH_SYN) tcp_dooptions(&to, optp, optlen, TO_SYN); + /* NB: tcp_timewait unlocks the INP and frees the mbuf. */ if (tcp_timewait(inp, &to, th, m, tlen)) goto findpcb; - /* tcp_timewait unlocks inp. */ INP_INFO_WUNLOCK(&tcbinfo); return; } @@ -764,7 +764,6 @@ */ tp = intotcpcb(inp); if (tp == NULL) { - INP_UNLOCK(inp); rstreason = BANDLIM_RST_CLOSEDPORT; goto dropwithreset; } @@ -833,6 +832,10 @@ * timestamp. */ tcp_dooptions(&to, optp, optlen, 0); + /* + * NB: syncache_expand() doesn't unlock + * inp and tcpinfo locks. + */ if (!syncache_expand(&inc, &to, th, &so, m)) { /* * No syncache entry or ACK was not @@ -925,8 +928,6 @@ if ((ia6 = ip6_getdstifaddr(m)) && (ia6->ia6_flags & IN6_IFF_DEPRECATED)) { - INP_UNLOCK(inp); - tp = NULL; rstreason = BANDLIM_RST_OPENPORT; goto dropwithreset; } @@ -998,7 +999,7 @@ m = NULL; /* mbuf chain got consumed. */ dropunlock: INP_INFO_WLOCK_ASSERT(&tcbinfo); - if (tp != NULL) + if (inp != NULL) INP_UNLOCK(inp); INP_INFO_WUNLOCK(&tcbinfo); drop: ==== //depot/projects/opentoe/sys/netinet6/route6.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/netinet6/route6.c,v 1.12 2005/07/25 12:31:42 ume Exp $ */ +/* $FreeBSD: src/sys/netinet6/route6.c,v 1.13 2007/04/23 09:32:04 gnn Exp $ */ /* $KAME: route6.c,v 1.24 2001/03/14 03:07:05 itojun Exp $ */ /*- @@ -49,9 +49,12 @@ #include +#if 0 static int ip6_rthdr0 __P((struct mbuf *, struct ip6_hdr *, struct ip6_rthdr0 *)); +#endif /* Disable route header processing. */ + int route6_input(mp, offp, proto) struct mbuf **mp; @@ -87,6 +90,7 @@ #endif switch (rh->ip6r_type) { +#if 0 case IPV6_RTHDR_TYPE_0: rhlen = (rh->ip6r_len + 1) << 3; #ifndef PULLDOWN_TEST @@ -114,6 +118,7 @@ if (ip6_rthdr0(m, ip6, (struct ip6_rthdr0 *)rh)) return (IPPROTO_DONE); break; +#endif /* Disable route header 0 */ default: /* unknown routing type */ if (rh->ip6r_segleft == 0) { @@ -136,6 +141,7 @@ * RFC2292 backward compatibility warning: no support for strict/loose bitmap, * as it was dropped between RFC1883 and RFC2460. */ +#if 0 static int ip6_rthdr0(m, ip6, rh0) struct mbuf *m; @@ -233,3 +239,4 @@ m_freem(m); return (-1); } +#endif ==== //depot/projects/opentoe/sys/pci/if_vr.c#4 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/pci/if_vr.c,v 1.125 2007/04/22 15:58:56 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/pci/if_vr.c,v 1.126 2007/04/23 12:19:02 phk Exp $"); /* * VIA Rhine fast ethernet PCI NIC driver @@ -575,6 +575,7 @@ ifp->if_capabilities |= IFCAP_HWCSUM; } + ifp->if_capabilities |= IFCAP_VLAN_MTU; ifp->if_capenable = ifp->if_capabilities; if (ifp->if_capenable & IFCAP_TXCSUM) ifp->if_hwassist = (CSUM_IP | CSUM_TCP | CSUM_UDP); ==== //depot/projects/opentoe/sys/pci/if_vrreg.h#4 (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_vrreg.h,v 1.33 2007/04/22 15:48:29 phk Exp $ + * $FreeBSD: src/sys/pci/if_vrreg.h,v 1.34 2007/04/23 12:19:02 phk Exp $ */ /* @@ -401,7 +401,7 @@ #define VR_TX_LIST_CNT 256 #define VR_MIN_FRAMELEN 60 #define VR_FRAMELEN 1536 -#define VR_RXLEN 1520 +#define VR_RXLEN 1524 struct vr_mii_frame { u_int8_t mii_stdelim; ==== //depot/projects/opentoe/sys/security/mac/mac_framework.h#3 (text+ko) ==== @@ -35,7 +35,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/security/mac/mac_framework.h,v 1.81 2007/04/22 19:55:55 rwatson Exp $ + * $FreeBSD: src/sys/security/mac/mac_framework.h,v 1.82 2007/04/23 13:36:53 rwatson Exp $ */ /* @@ -91,7 +91,7 @@ */ void mac_init_bpfdesc(struct bpf_d *); void mac_init_cred(struct ucred *); -void mac_init_devfsdirent(struct devfs_dirent *); +void mac_init_devfs(struct devfs_dirent *); void mac_init_ifnet(struct ifnet *); int mac_init_inpcb(struct inpcb *, int); void mac_init_sysv_msgmsg(struct msg *); @@ -112,7 +112,7 @@ void mac_copy_vnode_label(struct label *, struct label *); void mac_destroy_bpfdesc(struct bpf_d *); void mac_destroy_cred(struct ucred *); -void mac_destroy_devfsdirent(struct devfs_dirent *); +void mac_destroy_devfs(struct devfs_dirent *); void mac_destroy_ifnet(struct ifnet *); void mac_destroy_inpcb(struct inpcb *); void mac_destroy_sysv_msgmsg(struct msg *); @@ -152,7 +152,7 @@ void mac_create_mount(struct ucred *cred, struct mount *mp); void mac_relabel_vnode(struct ucred *cred, struct vnode *vp, struct label *newlabel); -void mac_update_devfsdirent(struct mount *mp, struct devfs_dirent *de, +void mac_update_devfs(struct mount *mp, struct devfs_dirent *de, struct vnode *vp); /* ==== //depot/projects/opentoe/sys/security/mac/mac_policy.h#3 (text+ko) ==== @@ -35,7 +35,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/security/mac/mac_policy.h,v 1.90 2007/04/22 19:55:56 rwatson Exp $ + * $FreeBSD: src/sys/security/mac/mac_policy.h,v 1.91 2007/04/23 13:36:53 rwatson Exp $ */ /* * Kernel interface for MAC policy modules. @@ -117,7 +117,7 @@ */ typedef void (*mpo_init_bpfdesc_label_t)(struct label *label); typedef void (*mpo_init_cred_label_t)(struct label *label); -typedef void (*mpo_init_devfsdirent_label_t)(struct label *label); +typedef void (*mpo_init_devfs_label_t)(struct label *label); typedef void (*mpo_init_ifnet_label_t)(struct label *label); typedef int (*mpo_init_inpcb_label_t)(struct label *label, int flag); typedef void (*mpo_init_sysv_msgmsg_label_t)(struct label *label); @@ -136,7 +136,7 @@ typedef void (*mpo_init_vnode_label_t)(struct label *label); typedef void (*mpo_destroy_bpfdesc_label_t)(struct label *label); typedef void (*mpo_destroy_cred_label_t)(struct label *label); -typedef void (*mpo_destroy_devfsdirent_label_t)(struct label *label); +typedef void (*mpo_destroy_devfs_label_t)(struct label *label); typedef void (*mpo_destroy_ifnet_label_t)(struct label *label); typedef void (*mpo_destroy_inpcb_label_t)(struct label *label); typedef void (*mpo_destroy_sysv_msgmsg_label_t)(struct label *label); @@ -227,7 +227,7 @@ typedef int (*mpo_setlabel_vnode_extattr_t)(struct ucred *cred, struct vnode *vp, struct label *vplabel, struct label *intlabel); -typedef void (*mpo_update_devfsdirent_t)(struct mount *mp, +typedef void (*mpo_update_devfs_t)(struct mount *mp, struct devfs_dirent *de, struct label *delabel, struct vnode *vp, struct label *vplabel); @@ -630,7 +630,7 @@ */ mpo_init_bpfdesc_label_t mpo_init_bpfdesc_label; mpo_init_cred_label_t mpo_init_cred_label; - mpo_init_devfsdirent_label_t mpo_init_devfsdirent_label; + mpo_init_devfs_label_t mpo_init_devfs_label; mpo_placeholder_t _mpo_placeholder0; mpo_init_ifnet_label_t mpo_init_ifnet_label; mpo_init_inpcb_label_t mpo_init_inpcb_label; @@ -649,7 +649,7 @@ mpo_init_vnode_label_t mpo_init_vnode_label; mpo_destroy_bpfdesc_label_t mpo_destroy_bpfdesc_label; mpo_destroy_cred_label_t mpo_destroy_cred_label; - mpo_destroy_devfsdirent_label_t mpo_destroy_devfsdirent_label; + mpo_destroy_devfs_label_t mpo_destroy_devfs_label; mpo_placeholder_t _mpo_placeholder1; mpo_destroy_ifnet_label_t mpo_destroy_ifnet_label; mpo_destroy_inpcb_label_t mpo_destroy_inpcb_label; @@ -706,7 +706,7 @@ mpo_create_mount_t mpo_create_mount; mpo_relabel_vnode_t mpo_relabel_vnode; mpo_setlabel_vnode_extattr_t mpo_setlabel_vnode_extattr; - mpo_update_devfsdirent_t mpo_update_devfsdirent; + mpo_update_devfs_t mpo_update_devfs; /* * Labeling event operations: IPC objects. ==== //depot/projects/opentoe/sys/security/mac/mac_vfs.c#3 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/security/mac/mac_vfs.c,v 1.120 2007/04/22 16:18:09 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/security/mac/mac_vfs.c,v 1.121 2007/04/23 13:36:53 rwatson Exp $"); #include "opt_mac.h" @@ -81,20 +81,20 @@ struct vnode *vp, struct label *intlabel); static struct label * -mac_devfsdirent_label_alloc(void) +mac_devfs_label_alloc(void) { struct label *label; label = mac_labelzone_alloc(M_WAITOK); - MAC_PERFORM(init_devfsdirent_label, label); + MAC_PERFORM(init_devfs_label, label); return (label); } void -mac_init_devfsdirent(struct devfs_dirent *de) +mac_init_devfs(struct devfs_dirent *de) { - de->de_label = mac_devfsdirent_label_alloc(); + de->de_label = mac_devfs_label_alloc(); } static struct label * @@ -132,18 +132,18 @@ } static void -mac_devfsdirent_label_free(struct label *label) +mac_devfs_label_free(struct label *label) { - MAC_PERFORM(destroy_devfsdirent_label, label); + MAC_PERFORM(destroy_devfs_label, label); mac_labelzone_free(label); } void -mac_destroy_devfsdirent(struct devfs_dirent *de) +mac_destroy_devfs(struct devfs_dirent *de) { - mac_devfsdirent_label_free(de->de_label); + mac_devfs_label_free(de->de_label); de->de_label = NULL; } @@ -208,12 +208,10 @@ } void -mac_update_devfsdirent(struct mount *mp, struct devfs_dirent *de, - struct vnode *vp) +mac_update_devfs(struct mount *mp, struct devfs_dirent *de, struct vnode *vp) { - MAC_PERFORM(update_devfsdirent, mp, de, de->de_label, vp, - vp->v_label); + MAC_PERFORM(update_devfs, mp, de, de->de_label, vp, vp->v_label); } void ==== //depot/projects/opentoe/sys/security/mac_biba/mac_biba.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/security/mac_biba/mac_biba.c,v 1.104 2007/04/22 16:18:09 rwatson Exp $ + * $FreeBSD: src/sys/security/mac_biba/mac_biba.c,v 1.106 2007/04/23 13:36:53 rwatson Exp $ */ /* @@ -784,12 +784,12 @@ */ static void mac_biba_create_devfs_device(struct ucred *cred, struct mount *mp, - struct cdev *dev, struct devfs_dirent *devfs_dirent, struct label *label) + struct cdev *dev, struct devfs_dirent *de, struct label *delabel) { struct mac_biba *mac_biba; int biba_type; - mac_biba = SLOT(label); + mac_biba = SLOT(delabel); if (strcmp(dev->si_name, "null") == 0 || strcmp(dev->si_name, "zero") == 0 || strcmp(dev->si_name, "random") == 0 || @@ -806,11 +806,11 @@ static void mac_biba_create_devfs_directory(struct mount *mp, char *dirname, - int dirnamelen, struct devfs_dirent *devfs_dirent, struct label *label) + int dirnamelen, struct devfs_dirent *de, struct label *delabel) { struct mac_biba *mac_biba; - mac_biba = SLOT(label); + mac_biba = SLOT(delabel); mac_biba_set_effective(mac_biba, MAC_BIBA_TYPE_HIGH, 0, NULL); } @@ -829,36 +829,35 @@ static void mac_biba_create_mount(struct ucred *cred, struct mount *mp, - struct label *mntlabel) + struct label *mplabel) { struct mac_biba *source, *dest; source = SLOT(cred->cr_label); - dest = SLOT(mntlabel); + dest = SLOT(mplabel); mac_biba_copy_effective(source, dest); } static void mac_biba_relabel_vnode(struct ucred *cred, struct vnode *vp, - struct label *vnodelabel, struct label *label) + struct label *vplabel, struct label *newlabel) { struct mac_biba *source, *dest; - source = SLOT(label); - dest = SLOT(vnodelabel); + source = SLOT(newlabel); + dest = SLOT(vplabel); mac_biba_copy(source, dest); } static void -mac_biba_update_devfsdirent(struct mount *mp, - struct devfs_dirent *devfs_dirent, struct label *direntlabel, - struct vnode *vp, struct label *vnodelabel) +mac_biba_update_devfs(struct mount *mp, struct devfs_dirent *de, + struct label *delabel, struct vnode *vp, struct label *vplabel) { struct mac_biba *source, *dest; - source = SLOT(vnodelabel); - dest = SLOT(direntlabel); + source = SLOT(vplabel); + dest = SLOT(delabel); mac_biba_copy(source, dest); } @@ -866,25 +865,25 @@ static void mac_biba_associate_vnode_devfs(struct mount *mp, struct label *mntlabel, struct devfs_dirent *de, struct label *delabel, struct vnode *vp, - struct label *vlabel) + struct label *vplabel) { struct mac_biba *source, *dest; source = SLOT(delabel); - dest = SLOT(vlabel); + dest = SLOT(vplabel); mac_biba_copy_effective(source, dest); } static int -mac_biba_associate_vnode_extattr(struct mount *mp, struct label *mntlabel, - struct vnode *vp, struct label *vlabel) +mac_biba_associate_vnode_extattr(struct mount *mp, struct label *mplabel, + struct vnode *vp, struct label *vplabel) { struct mac_biba temp, *source, *dest; int buflen, error; - source = SLOT(mntlabel); - dest = SLOT(vlabel); + source = SLOT(mplabel); + dest = SLOT(vplabel); buflen = sizeof(temp); >>> TRUNCATED FOR MAIL (1000 lines) <<<