From owner-p4-projects@FreeBSD.ORG Sun Nov 30 16:29:54 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 49E9A10658CC; Sun, 30 Nov 2008 16:29: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 9E6F4106574E for ; Sun, 30 Nov 2008 16:29:52 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E9B6F8FC22 for ; Sun, 30 Nov 2008 16:29:51 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAUGT2Jw062967 for ; Sun, 30 Nov 2008 16:29:51 GMT (envelope-from zec@tel.fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAT0xSVB031008 for perforce@freebsd.org; Sat, 29 Nov 2008 00:59:28 GMT (envelope-from zec@tel.fer.hr) Date: Sat, 29 Nov 2008 00:59:28 GMT Message-Id: <200811290059.mAT0xSVB031008@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@tel.fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 153731 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, 30 Nov 2008 16:29:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=153731 Change 153731 by zec@zec_tpx32 on 2008/11/29 00:58:47 Attempt at fixing misintegrations and reducing the diff against head by visual inspection. Affected files ... .. //depot/projects/vimage/src/sys/net/vnet.h#17 edit .. //depot/projects/vimage/src/sys/netgraph/ng_base.c#45 edit .. //depot/projects/vimage/src/sys/netinet/tcp_hostcache.h#5 edit .. //depot/projects/vimage/src/sys/netinet/tcp_subr.c#65 edit .. //depot/projects/vimage/src/sys/netinet/vinet.h#38 edit .. //depot/projects/vimage/src/sys/netinet6/icmp6.c#36 edit .. //depot/projects/vimage/src/sys/netinet6/vinet6.h#28 edit .. //depot/projects/vimage/src/sys/netipsec/vipsec.h#21 edit Differences ... ==== //depot/projects/vimage/src/sys/net/vnet.h#17 (text+ko) ==== @@ -46,8 +46,6 @@ #include #include -#ifdef VIMAGE - struct vnet_net { int _if_index; struct ifindex_entry *_ifindex_table; ==== //depot/projects/vimage/src/sys/netgraph/ng_base.c#45 (text+ko) ==== @@ -63,7 +63,6 @@ #include #include #include -#include #include ==== //depot/projects/vimage/src/sys/netinet/tcp_hostcache.h#5 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * XXX RCS ID + * $FreeBSD: src/sys/netinet/tcp_hostcache.h,v 1.1 2008/11/28 23:39:25 zec Exp $ */ /* ==== //depot/projects/vimage/src/sys/netinet/tcp_subr.c#65 (text+ko) ==== @@ -121,10 +121,10 @@ static int icmp_may_rst; static int tcp_isn_reseed_interval; static int tcp_inflight_enable; +static int tcp_inflight_rttthresh; static int tcp_inflight_min; static int tcp_inflight_max; static int tcp_inflight_stab; -static int tcp_inflight_rttthresh; #endif static int ==== //depot/projects/vimage/src/sys/netinet/vinet.h#38 (text+ko) ==== @@ -55,8 +55,6 @@ #include #include -#ifdef VIMAGE - struct vnet_inet { struct in_ifaddrhashhead *_in_ifaddrhashtbl; struct in_ifaddrhead _in_ifaddrhead; ==== //depot/projects/vimage/src/sys/netinet6/icmp6.c#36 (text+ko) ==== @@ -114,6 +114,7 @@ extern struct inpcbhead ripcb; extern int icmp6errppslim; extern int icmp6_nodeinfo; + struct icmp6stat icmp6stat; static int icmp6errpps_count; static struct timeval icmp6errppslim_last; ==== //depot/projects/vimage/src/sys/netinet6/vinet6.h#28 (text+ko) ==== @@ -44,18 +44,15 @@ #include #include -#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) - -#ifdef VIMAGE struct vnet_inet6 { struct in6_ifaddr * _in6_ifaddr; + u_int _frag6_nfragpackets; u_int _frag6_nfrags; struct ip6q _ip6q; + struct route_in6 _ip6_forward_rt; + struct in6_addrpolicy _defaultaddrpolicy; TAILQ_HEAD(, addrsel_policyent) _addrsel_policytab; u_int _in6_maxmtu; @@ -63,15 +60,18 @@ int _rtq_minreallyold6; int _rtq_reallyold6; int _rtq_toomany6; + struct ip6stat _ip6stat; struct rip6stat _rip6stat; struct icmp6stat _icmp6stat; + int _rtq_timeout6; struct callout _rtq_timer6; struct callout _rtq_mtutimer; struct callout _nd6_slowtimo_ch; struct callout _nd6_timer_ch; struct callout _in6_tmpaddrtimer_ch; + int _nd6_inuse; int _nd6_allocated; int _nd6_onlink_ns_rfc4861; @@ -80,11 +80,15 @@ struct nd_prhead _nd_prefix; struct ifnet * _nd6_defifp; int _nd6_defifindex; + struct scope6_id _sid_default; + TAILQ_HEAD(, dadq) _dadq; int _dad_init; + int _icmp6errpps_count; struct timeval _icmp6errppslim_last; + int _ip6_forwarding; int _ip6_sendredirects; int _ip6_defhlim; @@ -120,6 +124,7 @@ int _ip6_sourcecheck; int _ip6_sourcecheck_interval; int _ip6_ours_check_algorithm; + int _nd6_prune; int _nd6_delay; int _nd6_umaxtries; @@ -137,11 +142,14 @@ int _ip6_desync_factor; u_int32_t _ip6_temp_preferred_lifetime; u_int32_t _ip6_temp_valid_lifetime; + int _ip6_mrouter_ver; int _pim6; u_int _mrt6debug; + int _ip6_temp_regen_advance; int _ip6_use_defzone; + struct ip6_pktopts _ip6_opts; }; ==== //depot/projects/vimage/src/sys/netipsec/vipsec.h#21 (text+ko) ==== @@ -54,6 +54,7 @@ int _ipsec_debug; struct ipsecstat _ipsec4stat; struct secpolicy _ip4_def_policy; + int _ip4_esp_trans_deflev; int _ip4_esp_net_deflev; int _ip4_ah_trans_deflev; @@ -98,8 +99,10 @@ int _ah_enable; int _ah_cleartos; struct ahstat _ahstat; + int _ipcomp_enable; struct ipcompstat _ipcompstat; + struct pfkeystat _pfkeystat; struct key_cb _key_cb; LIST_HEAD(, secpolicy) _sptree[IPSEC_DIR_MAX];