Date: Fri, 28 Nov 2008 23:46:50 GMT From: Marko Zec <zec@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 153728 for review Message-ID: <200811282346.mASNkofU013578@repoman.freebsd.org>
index | next in thread | raw e-mail
http://perforce.freebsd.org/chv.cgi?CH=153728 Change 153728 by zec@zec_tpx32 on 2008/11/28 23:46:00 IFC @ 153726 Affected files ... .. //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/mlfk_ipl.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_jail.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/kern/uipc_mqueue.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/net/vnet.h#7 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/netgraph.h#16 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_base.c#16 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_eiface.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in.c#15 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_id.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_input.c#20 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_var.h#10 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_hostcache.c#15 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_hostcache.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_subr.c#31 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/vinet.h#17 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_ifattach.c#17 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/vinet6.h#14 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/keysock.c#18 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/keysock.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/vipsec.h#13 integrate .. //depot/projects/vimage-commit2/src/sys/sys/param.h#21 integrate Differences ... ==== //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#12 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c,v 1.11 2008/08/17 23:27:27 bz Exp $ */ +/* $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c,v 1.12 2008/11/28 23:30:51 zec Exp $ */ /* * Copyright (C) 1993-2003 by Darren Reed. ==== //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/mlfk_ipl.c#4 (text+ko) ==== @@ -1,9 +1,9 @@ -/* $FreeBSD: src/sys/contrib/ipfilter/netinet/mlfk_ipl.c,v 1.20 2007/10/18 21:52:14 darrenr Exp $ */ +/* $FreeBSD: src/sys/contrib/ipfilter/netinet/mlfk_ipl.c,v 1.21 2008/11/28 23:30:51 zec Exp $ */ /* * Copyright (C) 2000 by Darren Reed. * - * $FreeBSD: src/sys/contrib/ipfilter/netinet/mlfk_ipl.c,v 1.20 2007/10/18 21:52:14 darrenr Exp $ + * $FreeBSD: src/sys/contrib/ipfilter/netinet/mlfk_ipl.c,v 1.21 2008/11/28 23:30:51 zec Exp $ * See the IPFILTER.LICENCE file for details on licencing. */ ==== //depot/projects/vimage-commit2/src/sys/kern/kern_jail.c#13 (text+ko) ==== @@ -1,14 +1,30 @@ /*- - * ---------------------------------------------------------------------------- - * "THE BEER-WARE LICENSE" (Revision 42): - * <phk@FreeBSD.ORG> wrote this file. As long as you retain this notice you - * can do whatever you want with this stuff. If we meet some day, and you think - * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp - * ---------------------------------------------------------------------------- + * Copyright (c) 1999 Poul-Henning Kamp. 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 <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/kern/kern_jail.c,v 1.84 2008/11/17 20:49:29 pjd Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_jail.c,v 1.85 2008/11/28 19:23:46 bz Exp $"); #include "opt_mac.h" ==== //depot/projects/vimage-commit2/src/sys/kern/uipc_mqueue.c#6 (text+ko) ==== @@ -43,7 +43,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/kern/uipc_mqueue.c,v 1.38 2008/10/28 13:44:11 trasz Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_mqueue.c,v 1.39 2008/11/28 14:53:18 ed Exp $"); #include <sys/param.h> #include <sys/kernel.h> @@ -793,7 +793,8 @@ sx_assert(&pd->mn_info->mi_lock, SX_LOCKED); LIST_FOREACH(pn, &pd->mn_children, mn_sibling) { - if (strncmp(pn->mn_name, name, len) == 0) + if (strncmp(pn->mn_name, name, len) == 0 && + pn->mn_name[len] == '\0') return (pn); } return (NULL); ==== //depot/projects/vimage-commit2/src/sys/net/vnet.h#7 (text+ko) ==== @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/net/vnet.h,v 1.1 2008/10/02 15:37:58 zec Exp $ + * $FreeBSD: src/sys/net/vnet.h,v 1.2 2008/11/28 23:30:51 zec Exp $ */ #ifndef _NET_VNET_H_ ==== //depot/projects/vimage-commit2/src/sys/netgraph/netgraph.h#16 (text+ko) ==== @@ -37,7 +37,7 @@ * * Author: Julian Elischer <julian@freebsd.org> * - * $FreeBSD: src/sys/netgraph/netgraph.h,v 1.77 2008/10/23 15:53:51 des Exp $ + * $FreeBSD: src/sys/netgraph/netgraph.h,v 1.78 2008/11/28 23:30:51 zec Exp $ * $Whistle: netgraph.h,v 1.29 1999/11/01 07:56:13 julian Exp $ */ ==== //depot/projects/vimage-commit2/src/sys/netgraph/ng_base.c#16 (text+ko) ==== @@ -38,7 +38,7 @@ * Authors: Julian Elischer <julian@freebsd.org> * Archie Cobbs <archie@freebsd.org> * - * $FreeBSD: src/sys/netgraph/ng_base.c,v 1.167 2008/11/22 16:03:18 mav Exp $ + * $FreeBSD: src/sys/netgraph/ng_base.c,v 1.168 2008/11/28 23:30:51 zec Exp $ * $Whistle: ng_base.c,v 1.39 1999/01/28 23:54:53 julian Exp $ */ ==== //depot/projects/vimage-commit2/src/sys/netgraph/ng_eiface.c#13 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/netgraph/ng_eiface.c,v 1.42 2008/10/23 15:53:51 des Exp $ + * $FreeBSD: src/sys/netgraph/ng_eiface.c,v 1.43 2008/11/28 23:30:51 zec Exp $ */ #include <sys/param.h> ==== //depot/projects/vimage-commit2/src/sys/netinet/in.c#15 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/netinet/in.c,v 1.108 2008/11/19 09:39:34 zec Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/in.c,v 1.109 2008/11/28 23:30:51 zec Exp $"); #include "opt_carp.h" ==== //depot/projects/vimage-commit2/src/sys/netinet/ip_id.c#9 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/netinet/ip_id.c,v 1.10 2008/02/06 15:40:30 silby Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/ip_id.c,v 1.11 2008/11/28 23:30:51 zec Exp $"); /* * IP ID generation is a fascinating topic. ==== //depot/projects/vimage-commit2/src/sys/netinet/ip_input.c#20 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/netinet/ip_input.c,v 1.345 2008/11/19 09:39:34 zec Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/ip_input.c,v 1.346 2008/11/28 23:30:51 zec Exp $"); #include "opt_bootp.h" #include "opt_ipfw.h" ==== //depot/projects/vimage-commit2/src/sys/netinet/ip_var.h#10 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)ip_var.h 8.2 (Berkeley) 1/9/95 - * $FreeBSD: src/sys/netinet/ip_var.h,v 1.104 2008/08/25 05:49:16 julian Exp $ + * $FreeBSD: src/sys/netinet/ip_var.h,v 1.105 2008/11/28 23:30:51 zec Exp $ */ #ifndef _NETINET_IP_VAR_H_ ==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_hostcache.c#15 (text+ko) ==== @@ -63,7 +63,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/netinet/tcp_hostcache.c,v 1.24 2008/11/19 09:39:34 zec Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/tcp_hostcache.c,v 1.25 2008/11/28 23:30:51 zec Exp $"); #include "opt_inet6.h" ==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_hostcache.h#2 (text+ko) ==== ==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_subr.c#31 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/netinet/tcp_subr.c,v 1.323 2008/11/26 22:32:07 zec Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/tcp_subr.c,v 1.324 2008/11/28 13:13:44 des Exp $"); #include "opt_compat.h" #include "opt_inet.h" @@ -201,7 +201,7 @@ "Enable tcp_drain routine for extra help when low on mbufs"); SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp, OID_AUTO, pcbcount, - CTLFLAG_RD, tcbinfo.ipi_count, 0, "Number of active PCBs"); + CTLFLAG_RD, V_tcbinfo.ipi_count, 0, "Number of active PCBs"); SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp, OID_AUTO, icmp_may_rst, CTLFLAG_RW, icmp_may_rst, 0, ==== //depot/projects/vimage-commit2/src/sys/netinet/vinet.h#17 (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/netinet/vinet.h,v 1.3 2008/11/26 22:32:07 zec Exp $ + * $FreeBSD: src/sys/netinet/vinet.h,v 1.4 2008/11/28 23:30:51 zec Exp $ */ #ifndef _NETINET_VINET_H_ ==== //depot/projects/vimage-commit2/src/sys/netinet6/in6_ifattach.c#17 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/netinet6/in6_ifattach.c,v 1.49 2008/11/26 22:32:07 zec Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet6/in6_ifattach.c,v 1.50 2008/11/28 23:30:51 zec Exp $"); #include <sys/param.h> #include <sys/systm.h> ==== //depot/projects/vimage-commit2/src/sys/netinet6/vinet6.h#14 (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/netinet6/vinet6.h,v 1.2 2008/11/19 09:39:34 zec Exp $ + * $FreeBSD: src/sys/netinet6/vinet6.h,v 1.3 2008/11/28 23:30:51 zec Exp $ */ #ifndef _NETINET6_VINET6_H_ ==== //depot/projects/vimage-commit2/src/sys/netipsec/keysock.c#18 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/netipsec/keysock.c,v 1.26 2008/11/26 22:32:07 zec Exp $ */ +/* $FreeBSD: src/sys/netipsec/keysock.c,v 1.27 2008/11/28 23:30:51 zec Exp $ */ /* $KAME: keysock.c,v 1.25 2001/08/13 20:07:41 itojun Exp $ */ /*- ==== //depot/projects/vimage-commit2/src/sys/netipsec/keysock.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/netipsec/keysock.h,v 1.3 2006/01/21 10:44:34 bz Exp $ */ +/* $FreeBSD: src/sys/netipsec/keysock.h,v 1.4 2008/11/28 23:30:51 zec Exp $ */ /* $KAME: keysock.h,v 1.8 2000/03/27 05:11:06 sumikawa Exp $ */ /*- ==== //depot/projects/vimage-commit2/src/sys/netipsec/vipsec.h#13 (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/netipsec/vipsec.h,v 1.2 2008/11/26 22:32:07 zec Exp $ + * $FreeBSD: src/sys/netipsec/vipsec.h,v 1.3 2008/11/28 23:30:51 zec Exp $ */ #ifndef _NETIPSEC_VIPSEC_H_ ==== //depot/projects/vimage-commit2/src/sys/sys/param.h#21 (text+ko) ==== @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * @(#)param.h 8.3 (Berkeley) 4/4/95 - * $FreeBSD: src/sys/sys/param.h,v 1.374 2008/11/27 09:00:47 jkoshy Exp $ + * $FreeBSD: src/sys/sys/param.h,v 1.375 2008/11/28 23:30:51 zec Exp $ */ #ifndef _SYS_PARAM_H_help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200811282346.mASNkofU013578>