Date: Thu, 6 Sep 2007 10:16:04 GMT From: Ana Kukec <anchie@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 126123 for review Message-ID: <200709061016.l86AG4Va013639@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=126123 Change 126123 by anchie@anchie_malimis on 2007/09/06 10:15:38 Corrected declarations of netinet6 integer variables. Initialization of ip6_gif_hlim variable moved to vnet_gif_iattach(). Affected files ... .. //depot/projects/vimage/src/sys/net/if_gif.c#9 edit .. //depot/projects/vimage/src/sys/netinet6/icmp6.c#16 edit .. //depot/projects/vimage/src/sys/netinet6/in6_proto.c#15 edit .. //depot/projects/vimage/src/sys/netinet6/nd6.c#20 edit .. //depot/projects/vimage/src/sys/netinet6/nd6_nbr.c#11 edit .. //depot/projects/vimage/src/sys/netinet6/nd6_rtr.c#10 edit Differences ... ==== //depot/projects/vimage/src/sys/net/if_gif.c#9 (text+ko) ==== @@ -254,7 +254,6 @@ int type; void *data; { - switch (type) { case MOD_LOAD: mtx_init(&gif_mtx, "gif_mtx", NULL, MTX_DEF); @@ -271,6 +270,9 @@ vnet_mod_deregister(&vnet_gif_modinfo); #endif mtx_destroy(&gif_mtx); +#ifdef INET6 + V_ip6_gif_hlim = 0; +#endif break; default: return EOPNOTSUPP; ==== //depot/projects/vimage/src/sys/netinet6/icmp6.c#16 (text+ko) ==== @@ -117,7 +117,7 @@ extern struct inpcbhead ripcb; #ifndef VIMAGE extern int icmp6errppslim; -static int icmp6errpps_count = 0; +static int icmp6errpps_count; #endif /* !VIMAGE */ static struct timeval icmp6errppslim_last; #ifndef VIMAGE ==== //depot/projects/vimage/src/sys/netinet6/in6_proto.c#15 (text+ko) ==== @@ -365,28 +365,30 @@ #endif #ifndef VIMAGE -int ip6_forwarding = IPV6FORWARDING; /* act as router? */ -int ip6_sendredirects = IPV6_SENDREDIRECTS; -int ip6_defhlim = IPV6_DEFHLIM; -int ip6_defmcasthlim = IPV6_DEFAULT_MULTICAST_HOPS; -int ip6_accept_rtadv = 0; /* "IPV6FORWARDING ? 0 : 1" is dangerous */ +int ip6_forwarding; /* act as router? */ +int ip6_sendredirects; +int ip6_defhlim; +int ip6_defmcasthlim; +int ip6_accept_rtadv; /* "IPV6FORWARDING ? 0 : 1" is dangerous */ int ip6_maxfragpackets; /* initialized in frag6.c:frag6_init() */ int ip6_maxfrags; /* initialized in frag6.c:frag6_init() */ -int ip6_log_interval = 5; -int ip6_hdrnestlimit = 15; /* How many header options will we process? */ -int ip6_dad_count = 1; /* DupAddrDetectionTransmits */ -int ip6_auto_flowlabel = 1; -int ip6_gif_hlim = 0; -int ip6_use_deprecated = 1; /* allow deprecated addr (RFC2462 5.5.4) */ -int ip6_rr_prune = 5; /* router renumbering prefix +int ip6_log_interval; +int ip6_hdrnestlimit; /* How many header options will we process? */ +int ip6_dad_count; /* DupAddrDetectionTransmits */ +int ip6_auto_flowlabel; +/* XXX (Ana): moved to net/if_gif.h. +int ip6_gif_hlim; +*/ +int ip6_use_deprecated; /* allow deprecated addr (RFC2462 5.5.4) */ +int ip6_rr_prune; /* router renumbering prefix * walk list every 5 sec. */ -int ip6_mcast_pmtu = 0; /* enable pMTU discovery for multicast? */ -int ip6_v6only = 1; +int ip6_mcast_pmtu; /* enable pMTU discovery for multicast? */ +int ip6_v6only; -int ip6_keepfaith = 0; -time_t ip6_log_time = (time_t)0L; +int ip6_keepfaith; +time_t ip6_log_time; #ifdef IPSTEALTH -int ip6stealth = 0; +int ip6stealth; #endif #endif /* !VIMAGE */ @@ -397,8 +399,8 @@ * or so? (jinmei@kame.net 19990310) */ #ifndef VIMAGE -int pmtu_expire = 60*10; -int pmtu_probe = 60*2; +int pmtu_expire; +int pmtu_probe; #endif /* raw IP6 parameters */ @@ -413,15 +415,15 @@ u_long rip6_recvspace = RIPV6RCVQ; /* ICMPV6 parameters */ -int icmp6_rediraccept = 1; /* accept and process redirects */ -int icmp6_redirtimeout = 10 * 60; /* 10 minutes */ -int icmp6errppslim = 100; /* 100pps */ +int icmp6_rediraccept; /* accept and process redirects */ +int icmp6_redirtimeout; /* 10 minutes */ +int icmp6errppslim; /* 100pps */ /* control how to respond to NI queries */ -int icmp6_nodeinfo = (ICMP6_NODEINFO_FQDNOK|ICMP6_NODEINFO_NODEADDROK); +int icmp6_nodeinfo; /* UDP on IP6 parameters */ -int udp6_sendspace = 9216; /* really max datagram size */ -int udp6_recvspace = 40 * (1024 + sizeof(struct sockaddr_in6)); +int udp6_sendspace; /* really max datagram size */ +int udp6_recvspace; #endif /* !VIMAGE */ /* @@ -598,7 +600,6 @@ ip6_test_init(void) { INIT_VNET_INET6(curvnet); - INIT_VNET_GIF(curvnet); printf("---> ip6_test_init() \n"); V_ip6_forwarding = IPV6FORWARDING; /* act as router? */ @@ -612,7 +613,10 @@ V_ip6_hdrnestlimit = 15; /* How many header options will we process? */ V_ip6_dad_count = 1; /* DupAddrDetectionTransmits */ V_ip6_auto_flowlabel = 1; - V_ip6_gif_hlim = 0; + /* XXX (Ana) ip6_gif_hlim initialized to value GIF_HLIM in + * function vnet_gif_iattach() / gifmodevent(). + V_ip6_gif_hlim = 0; + */ V_ip6_use_deprecated = 1; /* allow deprecated addr (RFC2462 5.5.4) */ V_ip6_rr_prune = 5; /* router renumbering prefix * walk list every 5 sec. */ ==== //depot/projects/vimage/src/sys/netinet6/nd6.c#20 (text+ko) ==== @@ -82,18 +82,18 @@ /* timer values */ #ifndef VIMAGE -int nd6_prune = 1; /* walk list every 1 seconds */ -int nd6_delay = 5; /* delay first probe time 5 second */ -int nd6_umaxtries = 3; /* maximum unicast query */ -int nd6_mmaxtries = 3; /* maximum multicast query */ -int nd6_useloopback = 1; /* use loopback interface for local traffic */ -int nd6_gctimer = (60 * 60 * 24); /* 1 day: garbage collection timer */ +int nd6_prune; /* walk list every 1 seconds */ +int nd6_delay; /* delay first probe time 5 second */ +int nd6_umaxtries; /* maximum unicast query */ +int nd6_mmaxtries; /* maximum multicast query */ +int nd6_useloopback; /* use loopback interface for local traffic */ +int nd6_gctimer; /* 1 day: garbage collection timer */ /* preventing too many loops in ND option parsing */ -int nd6_maxndopt = 10; /* max # of ND options allowed */ +int nd6_maxndopt; /* max # of ND options allowed */ -int nd6_maxnudhint = 0; /* max # of subsequent upper layer hints */ -int nd6_maxqueuelen = 1; /* max # of packets cached in unresolved ND entries */ +int nd6_maxnudhint; /* max # of subsequent upper layer hints */ +int nd6_maxqueuelen; /* max # of packets cached in unresolved ND entries */ #ifdef ND6_DEBUG int nd6_debug = 1; @@ -108,7 +108,7 @@ struct nd_drhead nd_defrouter; struct nd_prhead nd_prefix; -int nd6_recalc_reachtm_interval = ND6_RECALC_REACHTM_INTERVAL; +int nd6_recalc_reachtm_interval; #endif /* !VIMAGE */ static struct sockaddr_in6 all1_sa; ==== //depot/projects/vimage/src/sys/netinet6/nd6_nbr.c#11 (text+ko) ==== @@ -84,8 +84,8 @@ static void nd6_dad_na_input __P((struct ifaddr *)); #ifndef VIMAGE -static int dad_ignore_ns = 0; /* ignore NS in DAD - specwise incorrect*/ -static int dad_maxtry = 15; /* max # of *tries* to transmit DAD packet */ +static int dad_ignore_ns; /* ignore NS in DAD - specwise incorrect*/ +static int dad_maxtry; /* max # of *tries* to transmit DAD packet */ #endif /* !VIMAGE */ /* ==== //depot/projects/vimage/src/sys/netinet6/nd6_rtr.c#10 (text+ko) ==== @@ -92,17 +92,17 @@ static struct ifnet *nd6_defifp; int nd6_defifindex; -int ip6_use_tempaddr = 0; +int ip6_use_tempaddr; int ip6_desync_factor; -u_int32_t ip6_temp_preferred_lifetime = DEF_TEMP_PREFERRED_LIFETIME; -u_int32_t ip6_temp_valid_lifetime = DEF_TEMP_VALID_LIFETIME; +u_int32_t ip6_temp_preferred_lifetime; +u_int32_t ip6_temp_valid_lifetime; /* * shorter lifetimes for debugging purposes. -int ip6_temp_preferred_lifetime = 800; -static int ip6_temp_valid_lifetime = 1800; +int ip6_temp_preferred_lifetime; +static int ip6_temp_valid_lifetime; */ -int ip6_temp_regen_advance = TEMPADDR_REGEN_ADVANCE; +int ip6_temp_regen_advance; #endif /* !VIMAGE */ /* RTPREF_MEDIUM has to be 0! */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200709061016.l86AG4Va013639>