Date: Thu, 6 Sep 2007 13:25:12 GMT From: Ana Kukec <anchie@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 126126 for review Message-ID: <200709061325.l86DPCZS039109@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=126126 Change 126126 by anchie@anchie_malimis on 2007/09/06 13:24:19 Added corrections to enable succesfull compiling w/o VIMAGE and INET6 options. Affected files ... .. //depot/projects/vimage/src/sys/netinet/in_pcb.c#15 edit .. //depot/projects/vimage/src/sys/netinet/tcp_subr.c#29 edit .. //depot/projects/vimage/src/sys/netinet6/in6_proto.c#16 edit .. //depot/projects/vimage/src/sys/netinet6/ip6_mroute.c#10 edit .. //depot/projects/vimage/src/sys/netipsec/ipsec.c#14 edit Differences ... ==== //depot/projects/vimage/src/sys/netinet/in_pcb.c#15 (text+ko) ==== @@ -75,10 +75,9 @@ #ifdef INET6 #include <netinet/ip6.h> #include <netinet6/ip6_var.h> +#endif /* INET6 */ #include <netinet6/vinet6.h> -#endif /* INET6 */ - #ifdef IPSEC #include <netipsec/ipsec.h> #include <netipsec/key.h> @@ -195,7 +194,6 @@ int in_pcballoc(struct socket *so, struct inpcbinfo *pcbinfo) { - INIT_VNET_INET6(curvnet); struct inpcb *inp; int error; ==== //depot/projects/vimage/src/sys/netinet/tcp_subr.c#29 (text+ko) ==== @@ -2064,7 +2064,6 @@ sysctl_drop(SYSCTL_HANDLER_ARGS) { INIT_VNET_INET(curvnet); - INIT_VNET_INET6(curvnet); /* addrs[0] is a foreign socket, addrs[1] is a local one. */ struct sockaddr_storage addrs[2]; struct inpcb *inp; ==== //depot/projects/vimage/src/sys/netinet6/in6_proto.c#16 (text+ko) ==== @@ -376,9 +376,6 @@ 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. */ @@ -613,10 +610,6 @@ V_ip6_hdrnestlimit = 15; /* How many header options will we process? */ V_ip6_dad_count = 1; /* DupAddrDetectionTransmits */ V_ip6_auto_flowlabel = 1; - /* 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/ip6_mroute.c#10 (text+ko) ==== @@ -182,7 +182,7 @@ #ifdef MRT6DEBUG #ifndef VIMAGE -static u_int mrt6debug = 0; /* debug level */ +static u_int mrt6debug; /* debug level */ #endif /* !VIMAGE */ #define DEBUG_MFC 0x02 #define DEBUG_FORWARD 0x04 @@ -479,10 +479,11 @@ INIT_VNET_INET6(curvnet); V_ip6_mrouter_ver = 0; + +#ifdef MRT6DEBUG V_mrt6debug = 0; -#ifdef MRT6DEBUG - if (mrt6debug) + if (V_mrt6debug) log(LOG_DEBUG, "ip6_mrouter_init: so_type = %d, pr_protocol = %d\n", so->so_type, so->so_proto->pr_protocol); ==== //depot/projects/vimage/src/sys/netipsec/ipsec.c#14 (text+ko) ==== @@ -79,6 +79,8 @@ #include <netinet/icmp6.h> #endif +#include <netinet6/vinet6.h> + #include <sys/types.h> #include <netipsec/ipsec.h> #ifdef INET6 @@ -189,12 +191,12 @@ #ifdef INET6 #ifndef VIMAGE struct ipsecstat ipsec6stat; -int ip6_esp_trans_deflev = IPSEC_LEVEL_USE; -int ip6_esp_net_deflev = IPSEC_LEVEL_USE; -int ip6_ah_trans_deflev = IPSEC_LEVEL_USE; -int ip6_ah_net_deflev = IPSEC_LEVEL_USE; -int ip6_ipsec_ecn = 0; /* ECN ignore(-1)/forbidden(0)/allowed(1) */ -int ip6_esp_randpad = -1; +int ip6_esp_trans_deflev; +int ip6_esp_net_deflev; +int ip6_ah_trans_deflev; +int ip6_ah_net_deflev; +int ip6_ipsec_ecn; /* ECN ignore(-1)/forbidden(0)/allowed(1) */ +int ip6_esp_randpad; #endif SYSCTL_DECL(_net_inet6_ipsec6); @@ -1987,6 +1989,9 @@ const void *unused; { INIT_VNET_IPSEC(curvnet); +#ifdef INET6 + INIT_VNET_INET6(curvnet); +#endif #ifdef IPSEC_DEBUG V_ipsec_debug = 1; @@ -2012,12 +2017,14 @@ V_ipsec_integrity = 0; #endif +#ifdef INET6 V_ip6_esp_trans_deflev = IPSEC_LEVEL_USE; V_ip6_esp_net_deflev = IPSEC_LEVEL_USE; V_ip6_ah_trans_deflev = IPSEC_LEVEL_USE; V_ip6_ah_net_deflev = IPSEC_LEVEL_USE; V_ip6_ipsec_ecn = 0; /* ECN ignore(-1)/forbidden(0)/allowed(1) */ V_ip6_esp_randpad = -1; +#endif return 0; }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200709061325.l86DPCZS039109>