Date: Fri, 28 Nov 2008 23:58:16 GMT From: Marko Zec <zec@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 153730 for review Message-ID: <200811282358.mASNwG9O014532@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=153730 Change 153730 by zec@zec_tpx32 on 2008/11/28 23:57:36 IFC @ 153726 Affected files ... .. //depot/projects/vimage/src/sys/conf/files.pc98#14 integrate .. //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#12 integrate .. //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/mlfk_ipl.c#6 integrate .. //depot/projects/vimage/src/sys/kern/kern_jail.c#18 integrate .. //depot/projects/vimage/src/sys/kern/uipc_mqueue.c#12 integrate .. //depot/projects/vimage/src/sys/net/vnet.h#16 integrate .. //depot/projects/vimage/src/sys/netgraph/netgraph.h#17 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_base.c#44 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_eiface.c#19 integrate .. //depot/projects/vimage/src/sys/netinet/in.c#23 integrate .. //depot/projects/vimage/src/sys/netinet/ip_id.c#8 integrate .. //depot/projects/vimage/src/sys/netinet/ip_input.c#42 integrate .. //depot/projects/vimage/src/sys/netinet/ip_var.h#13 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_hostcache.c#32 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_hostcache.h#4 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_subr.c#64 integrate .. //depot/projects/vimage/src/sys/netinet/vinet.h#37 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_ifattach.c#30 integrate .. //depot/projects/vimage/src/sys/netinet6/vinet6.h#27 integrate .. //depot/projects/vimage/src/sys/netipsec/keysock.c#23 integrate .. //depot/projects/vimage/src/sys/netipsec/keysock.h#5 integrate .. //depot/projects/vimage/src/sys/netipsec/vipsec.h#20 integrate .. //depot/projects/vimage/src/sys/sys/param.h#34 integrate Differences ... ==== //depot/projects/vimage/src/sys/conf/files.pc98#14 (text+ko) ==== @@ -3,7 +3,7 @@ # # modified for PC-9801/PC-9821 # -# $FreeBSD: src/sys/conf/files.pc98,v 1.368 2008/11/09 17:37:54 jkoshy Exp $ +# $FreeBSD: src/sys/conf/files.pc98,v 1.369 2008/11/28 12:23:02 bz Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -111,6 +111,7 @@ dev/fe/if_fe_cbus.c optional fe isa dev/hwpmc/hwpmc_amd.c optional hwpmc dev/hwpmc/hwpmc_intel.c optional hwpmc +dev/hwpmc/hwpmc_core.c optional hwpmc dev/hwpmc/hwpmc_pentium.c optional hwpmc dev/hwpmc/hwpmc_piv.c optional hwpmc dev/hwpmc/hwpmc_ppro.c optional hwpmc ==== //depot/projects/vimage/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. @@ -121,8 +121,8 @@ #endif extern int ip_optcopy __P((struct ip *, struct ip *)); -#if __FreeBSD_version > 800000 -# include <sys/vimage.h> +#if (__FreeBSD_version > 460000) && (__FreeBSD_version < 800055) +extern int path_mtu_discovery; #endif # ifdef IPFILTER_M_IPFILTER ==== //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/mlfk_ipl.c#6 (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. */ @@ -43,6 +43,9 @@ static int ipf_modload(void); static int ipf_modunload(void); +#if __FreeBSD_version < 800055 +SYSCTL_DECL(_net_inet); +#endif #define SYSCTL_IPF(parent, nbr, name, access, ptr, val, descr) \ SYSCTL_OID(parent, nbr, name, CTLTYPE_INT|access, \ ptr, val, sysctl_ipf_int, "I", descr); ==== //depot/projects/vimage/src/sys/kern/kern_jail.c#18 (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/src/sys/kern/uipc_mqueue.c#12 (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/src/sys/net/vnet.h#16 (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_ @@ -35,6 +35,8 @@ #include "opt_route.h" +#include <sys/param.h> +#include <sys/systm.h> #include <sys/proc.h> #include <sys/protosw.h> #include <sys/socket.h> @@ -67,8 +69,6 @@ int _ether_ipfw; }; -#endif - /* * Symbol translation macros */ ==== //depot/projects/vimage/src/sys/netgraph/netgraph.h#17 (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 $ */ @@ -1188,7 +1188,7 @@ /* Hash related definitions */ #define NG_ID_HASH_SIZE 128 /* most systems wont need even this many */ -#define NG_NAME_HASH_SIZE 128 /* most systems wont need even this many */ +#define NG_NAME_HASH_SIZE 128 /* most systems wont need even this many */ /* Virtualization macros */ #define INIT_VNET_NETGRAPH(vnet) \ @@ -1197,17 +1197,15 @@ #define VNET_NETGRAPH(sym) VSYM(vnet_netgraph, sym) -#ifdef VIMAGE struct vnet_netgraph { - LIST_HEAD(, ng_node) _ng_ID_hash[NG_ID_HASH_SIZE]; - LIST_HEAD(, ng_node) _ng_name_hash[NG_NAME_HASH_SIZE]; - LIST_HEAD(, ng_node) _ng_nodelist; - ng_ID_t _nextID; - struct unrhdr *_ng_iface_unit; - struct unrhdr *_ng_eiface_unit; - struct unrhdr *_ng_wormhole_unit; + LIST_HEAD(, ng_node) _ng_ID_hash[NG_ID_HASH_SIZE]; + LIST_HEAD(, ng_node) _ng_name_hash[NG_NAME_HASH_SIZE]; + LIST_HEAD(, ng_node) _ng_nodelist; + ng_ID_t _nextID; + struct unrhdr *_ng_iface_unit; + struct unrhdr *_ng_eiface_unit; + struct unrhdr *_ng_wormhole_unit; }; -#endif /* Symbol translation macros */ #define V_nextID VNET_NETGRAPH(nextID) ==== //depot/projects/vimage/src/sys/netgraph/ng_base.c#44 (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/src/sys/netgraph/ng_eiface.c#19 (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> @@ -486,7 +486,6 @@ buflen -= len; } break; -#undef SA_SIZE } default: ==== //depot/projects/vimage/src/sys/netinet/in.c#23 (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/src/sys/netinet/ip_id.c#8 (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/src/sys/netinet/ip_input.c#42 (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" @@ -104,7 +104,7 @@ static int ip_rsvp_on; struct socket *ip_rsvpd; int rsvp_on; -static TAILQ_HEAD(ipqhead, ipq) ipq[IPREASS_NHASH]; +static struct ipqhead ipq[IPREASS_NHASH]; static int maxnipq; /* Administrative limit on # reass queues. */ static int maxfragsperpacket; int ipstealth; ==== //depot/projects/vimage/src/sys/netinet/ip_var.h#13 (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_ @@ -240,19 +240,6 @@ void in_delayed_cksum(struct mbuf *m); -#if 0 -static __inline uint16_t -ip_newid(void) -{ - if (V_ip_do_randomid) - return ip_randomid(); - - return htons(V_ip_id++); -} -#else -#define ip_newid() (V_ip_do_randomid ? ip_randomid() : V_ip_id++) -#endif - #endif /* _KERNEL */ #endif /* !_NETINET_IP_VAR_H_ */ ==== //depot/projects/vimage/src/sys/netinet/tcp_hostcache.c#32 (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" @@ -98,7 +98,6 @@ #include <vm/uma.h> - /* Arbitrary values */ #define TCP_HOSTCACHE_HASHSIZE 512 #define TCP_HOSTCACHE_BUCKETLIMIT 30 ==== //depot/projects/vimage/src/sys/netinet/tcp_hostcache.h#4 (text+ko) ==== ==== //depot/projects/vimage/src/sys/netinet/tcp_subr.c#64 (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/src/sys/netinet/vinet.h#37 (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_ @@ -37,7 +37,7 @@ #include <sys/sysctl.h> #include <sys/md5.h> -#include <net/vnet.h> /* XXX revisit this! */ +#include <net/vnet.h> #include <netinet/in.h> #include <netinet/in_systm.h> @@ -199,9 +199,7 @@ int _icmp_quotelen; int _icmpbmcastecho; }; -#endif - /* * Symbol translation macros */ @@ -336,4 +334,16 @@ #define V_udpstat VNET_INET(udpstat) #define V_useloopback VNET_INET(useloopback) +static __inline uint16_t ip_newid(void); +extern int ip_do_randomid; + +static __inline uint16_t +ip_newid(void) +{ + if (V_ip_do_randomid) + return ip_randomid(); + + return htons(V_ip_id++); +} + #endif /* !_NETINET_VINET_H_ */ ==== //depot/projects/vimage/src/sys/netinet6/in6_ifattach.c#30 (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/src/sys/netinet6/vinet6.h#27 (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_ @@ -144,9 +144,15 @@ int _ip6_use_defzone; struct ip6_pktopts _ip6_opts; }; -#endif + +#define INIT_VNET_INET6(vnet) \ + INIT_FROM_VNET(vnet, VNET_MOD_INET6, struct vnet_inet6, vnet_inet6) + +#define VNET_INET6(sym) VSYM(vnet_inet6, sym) -/* Symbol translation macros */ +/* + * Symbol translation macros + */ #define V_addrsel_policytab VNET_INET6(addrsel_policytab) #define V_dad_ignore_ns VNET_INET6(dad_ignore_ns) #define V_dad_init VNET_INET6(dad_init) ==== //depot/projects/vimage/src/sys/netipsec/keysock.c#23 (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/src/sys/netipsec/keysock.h#5 (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/src/sys/netipsec/vipsec.h#20 (text+ko) ==== @@ -27,13 +27,12 @@ * 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_ #define _NETIPSEC_VIPSEC_H_ -#ifdef VIMAGE #include <sys/proc.h> #include <sys/protosw.h> #include <sys/socket.h> @@ -109,7 +108,6 @@ LIST_HEAD(, secacq) _acqtree; LIST_HEAD(, secspacq) _spacqtree; }; -#endif /* * Symbol translation macros ==== //depot/projects/vimage/src/sys/sys/param.h#34 (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_ @@ -92,9 +92,13 @@ #include <sys/priority.h> #endif +#ifndef FALSE #define FALSE 0 +#endif +#ifndef TRUE #define TRUE 1 #endif +#endif #ifndef _KERNEL /* Signals. */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200811282358.mASNwG9O014532>