Date: Thu, 27 Nov 2008 00:16:41 GMT From: Marko Zec <zec@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 153648 for review Message-ID: <200811270016.mAR0Gf4O014496@repoman.freebsd.org>
index | next in thread | raw e-mail
http://perforce.freebsd.org/chv.cgi?CH=153648 Change 153648 by zec@zec_tca51 on 2008/11/27 00:15:46 Fix misintegrations. Affected files ... .. //depot/projects/vimage-commit/src/sys/dev/sbni/if_sbni.c#3 add .. //depot/projects/vimage-commit/src/sys/dev/sbni/if_sbni_isa.c#3 add .. //depot/projects/vimage-commit/src/sys/dev/sbni/if_sbni_pci.c#3 add .. //depot/projects/vimage-commit/src/sys/dev/sbni/if_sbnireg.h#3 add .. //depot/projects/vimage-commit/src/sys/dev/sbni/if_sbnivar.h#3 add .. //depot/projects/vimage-commit/src/sys/modules/sbni/Makefile#3 add .. //depot/projects/vimage-commit/src/sys/net/vnet.h#3 edit .. //depot/projects/vimage-commit/src/sys/netinet/vinet.h#4 edit .. //depot/projects/vimage-commit/src/sys/netinet6/vinet6.h#3 edit .. //depot/projects/vimage-commit/src/sys/netipsec/vipsec.h#3 edit Differences ... ==== //depot/projects/vimage-commit/src/sys/net/vnet.h#3 (text+ko) ==== @@ -26,12 +26,13 @@ * 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. + * + * $FreeBSD: src/sys/net/vnet.h,v 1.1 2008/10/02 15:37:58 zec Exp $ */ #ifndef _NET_VNET_H_ #define _NET_VNET_H_ - #ifdef VIMAGE #include "opt_route.h" @@ -44,14 +45,6 @@ #include <net/route.h> #include <net/raw_cb.h> - -/* calculate this the same as in route.c */ -#ifndef ROUTETABLES - #define RT_MAXFIBS 1 -#else - #define RT_MAXFIBS 16 -#endif - struct vnet_net { int _if_index; struct ifindex_entry *_ifindex_table; @@ -78,23 +71,23 @@ /* * Symbol translation macros */ -#define INIT_VNET_NET(vnet) \ +#define INIT_VNET_NET(vnet) \ INIT_FROM_VNET(vnet, VNET_MOD_NET, struct vnet_net, vnet_net) -#define VNET_NET(sym) VSYM(vnet_net, sym) +#define VNET_NET(sym) VSYM(vnet_net, sym) -#define V_if_index VNET_NET(if_index) -#define V_ifindex_table VNET_NET(ifindex_table) -#define V_ifnet VNET_NET(ifnet) -#define V_ifg_head VNET_NET(ifg_head) -#define V_if_indexlim VNET_NET(if_indexlim) -#define V_ifklist VNET_NET(ifklist) -#define V_rtstat VNET_NET(rtstat) -#define V_rt_tables VNET_NET(rt_tables) -#define V_rttrash VNET_NET(rttrash) -#define V_loif VNET_NET(loif) -#define V_lo_list VNET_NET(lo_list) -#define V_rawcb_list VNET_NET(rawcb_list) -#define V_ether_ipfw VNET_NET(ether_ipfw) +#define V_ether_ipfw VNET_NET(ether_ipfw) +#define V_if_index VNET_NET(if_index) +#define V_if_indexlim VNET_NET(if_indexlim) +#define V_ifg_head VNET_NET(ifg_head) +#define V_ifindex_table VNET_NET(ifindex_table) +#define V_ifklist VNET_NET(ifklist) +#define V_ifnet VNET_NET(ifnet) +#define V_lo_list VNET_NET(lo_list) +#define V_loif VNET_NET(loif) +#define V_rawcb_list VNET_NET(rawcb_list) +#define V_rt_tables VNET_NET(rt_tables) +#define V_rtstat VNET_NET(rtstat) +#define V_rttrash VNET_NET(rttrash) #endif /* !_NET_VNET_H_ */ ==== //depot/projects/vimage-commit/src/sys/netinet/vinet.h#4 (text+ko) ==== @@ -26,6 +26,7 @@ * 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. + * * $FreeBSD: src/sys/netinet/vinet.h,v 1.3 2008/11/26 22:32:07 zec Exp $ */ @@ -67,6 +68,7 @@ int _sameprefixcarponly; int _ipforwarding; + int _ipstealth; int _ipfastforward_active; int _ipsendredirects; int _ip_defttl; @@ -146,6 +148,7 @@ struct inpcbhead _udb; struct inpcbinfo _udbinfo; struct udpstat _udpstat; + int _udp_blackhole; struct inpcbhead _ripcb; struct inpcbinfo _ripcbinfo; @@ -181,6 +184,17 @@ int _ipport_stoprandom; int _ipport_tcpallocs; int _ipport_tcplastcount; + + int _icmpmaskrepl; + u_int _icmpmaskfake; + int _drop_redirect; + int _log_redirect; + int _icmplim; + int _icmplim_output; + char _reply_src[IFNAMSIZ]; + int _icmp_rfi; + int _icmp_quotelen; + int _icmpbmcastecho; }; #endif @@ -188,120 +202,11 @@ /* * Symbol translation macros */ -#define INIT_VNET_INET(vnet) \ +#define INIT_VNET_INET(vnet) \ INIT_FROM_VNET(vnet, VNET_MOD_INET, struct vnet_inet, vnet_inet) -#define VNET_INET(sym) VSYM(vnet_inet, sym) - -#define V_in_ifaddrhead VNET_INET(in_ifaddrhead) -#define V_in_ifaddrhashtbl VNET_INET(in_ifaddrhashtbl) -#define V_in_ifaddrhmask VNET_INET(in_ifaddrhmask) -#define V_in_multihead VNET_INET(in_multihead) - -#define V_llinfo_arp VNET_INET(llinfo_arp) -#define V_arpt_prune VNET_INET(arpt_prune) -#define V_arpt_keep VNET_INET(arpt_keep) -#define V_arp_maxtries VNET_INET(arp_maxtries) -#define V_useloopback VNET_INET(useloopback) -#define V_arp_proxyall VNET_INET(arp_proxyall) -#define V_subnetsarelocal VNET_INET(subnetsarelocal) -#define V_sameprefixcarponly VNET_INET(sameprefixcarponly) +#define VNET_INET(sym) VSYM(vnet_inet, sym) -#define V_ipforwarding VNET_INET(ipforwarding) -#define V_ipfastforward_active VNET_INET(ipfastforward_active) -#define V_ipsendredirects VNET_INET(ipsendredirects) -#define V_ip_defttl VNET_INET(ip_defttl) -#define V_ip_keepfaith VNET_INET(ip_keepfaith) -#define V_ip_sendsourcequench VNET_INET(ip_sendsourcequench) -#define V_ip_id VNET_INET(ip_id) -#define V_ip_do_randomid VNET_INET(ip_do_randomid) -#define V_ip_checkinterface VNET_INET(ip_checkinterface) - -#define V_ipq VNET_INET(ipq) -#define V_ipq_zone VNET_INET(ipq_zone) -#define V_nipq VNET_INET(nipq) -#define V_maxnipq VNET_INET(maxnipq) -#define V_maxfragsperpacket VNET_INET(maxfragsperpacket) - -#define V_tcb VNET_INET(tcb) -#define V_tcbinfo VNET_INET(tcbinfo) -#define V_tcpstat VNET_INET(tcpstat) -#define V_twq_2msl VNET_INET(twq_2msl) -#define V_tcp_hostcache VNET_INET(tcp_hostcache) -#define V_tcp_hc_callout VNET_INET(tcp_hc_callout) -#define V_tcp_syncache VNET_INET(tcp_syncache) -#define V_tcp_sc_rst_sock_fail VNET_INET(tcp_sc_rst_sock_fail) - -#define V_tcp_mssdflt VNET_INET(tcp_mssdflt) -#define V_tcp_v6mssdflt VNET_INET(tcp_v6mssdflt) -#define V_tcp_minmss VNET_INET(tcp_minmss) -#define V_tcp_do_rfc1323 VNET_INET(tcp_do_rfc1323) -#define V_icmp_may_rst VNET_INET(icmp_may_rst) -#define V_tcp_isn_reseed_interval VNET_INET(tcp_isn_reseed_interval) -#define V_tcp_inflight_enable VNET_INET(tcp_inflight_enable) -#define V_tcp_inflight_rttthresh VNET_INET(tcp_inflight_rttthresh) -#define V_tcp_inflight_min VNET_INET(tcp_inflight_min) -#define V_tcp_inflight_max VNET_INET(tcp_inflight_max) -#define V_tcp_inflight_stab VNET_INET(tcp_inflight_stab) -#define V_nolocaltimewait VNET_INET(nolocaltimewait) -#define V_path_mtu_discovery VNET_INET(path_mtu_discovery) -#define V_ss_fltsz VNET_INET(ss_fltsz) -#define V_ss_fltsz_local VNET_INET(ss_fltsz_local) -#define V_tcp_do_newreno VNET_INET(tcp_do_newreno) -#define V_tcp_do_tso VNET_INET(tcp_do_tso) -#define V_tcp_do_autosndbuf VNET_INET(tcp_do_autosndbuf) -#define V_tcp_autosndbuf_inc VNET_INET(tcp_autosndbuf_inc) -#define V_tcp_autosndbuf_max VNET_INET(tcp_autosndbuf_max) -#define V_tcp_do_sack VNET_INET(tcp_do_sack) -#define V_tcp_sack_maxholes VNET_INET(tcp_sack_maxholes) -#define V_tcp_sack_globalmaxholes VNET_INET(tcp_sack_globalmaxholes) -#define V_tcp_sack_globalholes VNET_INET(tcp_sack_globalholes) -#define V_blackhole VNET_INET(blackhole) -#define V_tcp_delack_enabled VNET_INET(tcp_delack_enabled) -#define V_drop_synfin VNET_INET(drop_synfin) -#define V_tcp_do_rfc3042 VNET_INET(tcp_do_rfc3042) -#define V_tcp_do_rfc3390 VNET_INET(tcp_do_rfc3390) -#define V_tcp_do_ecn VNET_INET(tcp_do_ecn) -#define V_tcp_ecn_maxretries VNET_INET(tcp_ecn_maxretries) -#define V_tcp_insecure_rst VNET_INET(tcp_insecure_rst) -#define V_tcp_do_autorcvbuf VNET_INET(tcp_do_autorcvbuf) -#define V_tcp_autorcvbuf_inc VNET_INET(tcp_autorcvbuf_inc) -#define V_tcp_autorcvbuf_max VNET_INET(tcp_autorcvbuf_max) -#define V_tcp_reass_maxseg VNET_INET(tcp_reass_maxseg) -#define V_tcp_reass_qsize VNET_INET(tcp_reass_qsize) -#define V_tcp_reass_maxqlen VNET_INET(tcp_reass_maxqlen) -#define V_tcp_reass_overflows VNET_INET(tcp_reass_overflows) - -#define V_isn_secret VNET_INET(isn_secret) -#define V_isn_last_reseed VNET_INET(isn_last_reseed) -#define V_isn_offset VNET_INET(isn_offset) -#define V_isn_offset_old VNET_INET(isn_offset_old) -#define V_isn_ctx VNET_INET(isn_ctx) - -#define V_udb VNET_INET(udb) -#define V_udbinfo VNET_INET(udbinfo) -#define V_udpstat VNET_INET(udpstat) - -#define V_ripcb VNET_INET(ripcb) -#define V_ripcbinfo VNET_INET(ripcbinfo) -#define V_ip_mrouter VNET_INET(ip_mrouter) - -#define V_rsvp_on VNET_INET(rsvp_on) -#define V_ip_rsvp_on VNET_INET(ip_rsvp_on) -#define V_ip_rsvpd VNET_INET(ip_rsvpd) - -#define V_icmpstat VNET_INET(icmpstat) -#define V_ipstat VNET_INET(ipstat) -#define V_igmpstat VNET_INET(igmpstat) - -#define V_router_info_head VNET_INET(router_info_head) - -#define V_rtq_timeout VNET_INET(rtq_timeout) -#define V_rtq_reallyold VNET_INET(rtq_reallyold) -#define V_rtq_minreallyold VNET_INET(rtq_minreallyold) -#define V_rtq_toomany VNET_INET(rtq_toomany) -#define V_rtq_timer VNET_INET(rtq_timer) - #define V_arp_maxtries VNET_INET(arp_maxtries) #define V_arp_proxyall VNET_INET(arp_proxyall) #define V_arpt_keep VNET_INET(arpt_keep) @@ -428,6 +333,4 @@ #define V_udpstat VNET_INET(udpstat) #define V_useloopback VNET_INET(useloopback) -#define V_divcb VNET_INET(divcb) -#define V_divcbinfo VNET_INET(divcbinfo) #endif /* !_NETINET_VINET_H_ */ ==== //depot/projects/vimage-commit/src/sys/netinet6/vinet6.h#3 (text+ko) ==== @@ -26,31 +26,26 @@ * 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. + * * $FreeBSD: src/sys/netinet6/vinet6.h,v 1.2 2008/11/19 09:39:34 zec Exp $ */ #ifndef _NETINET6_VINET6_H_ #define _NETINET6_VINET6_H_ +#ifdef VIMAGE +#include <sys/socket.h> #include <netinet/ip6.h> -#include <netinet/ip6.h> -#include <netinet6/in6_var.h> +#include <net/if.h> #include <netinet6/ip6_var.h> #include <netinet6/raw_ip6.h> -#include <netinet/in_pcb.h> #include <netinet/icmp6.h> #include <netinet6/scope6_var.h> #include <netinet6/in6_ifattach.h> +#include <netinet6/in6_var.h> #include <netinet6/nd6.h> - -#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) - +#include <netinet/in_pcb.h> -#ifdef VIMAGE struct vnet_inet6 { struct in6_ifaddr * _in6_ifaddr; @@ -64,6 +59,9 @@ TAILQ_HEAD(, addrsel_policyent) _addrsel_policytab; u_int _in6_maxmtu; int _ip6_auto_linklocal; + int _rtq_minreallyold6; + int _rtq_reallyold6; + int _rtq_toomany6; struct ip6stat _ip6stat; struct rip6stat _rip6stat; @@ -90,8 +88,7 @@ int _dad_init; int _icmp6errpps_count; - //int _icmp6errppslim_last; - //int _icmp6_nodeinfo; + int _icmp6errppslim_last; int _ip6_forwarding; int _ip6_sendredirects; @@ -160,110 +157,11 @@ #endif -/* - * Symbol translation macros - */ -#define V_in6_ifaddr VNET_INET6(in6_ifaddr) +#define INIT_VNET_INET6(vnet) \ + INIT_FROM_VNET(vnet, VNET_MOD_INET6, struct vnet_inet6, vnet_inet6) -#define V_frag6_nfragpackets VNET_INET6(frag6_nfragpackets) -#define V_frag6_nfrags VNET_INET6(frag6_nfrags) -#define V_ip6q VNET_INET6(ip6q) - -#define V_ip6_forward_rt VNET_INET6(ip6_forward_rt) - -#define V_defaultaddrpolicy VNET_INET6(defaultaddrpolicy) -#define V_addrsel_policytab VNET_INET6(addrsel_policytab) -#define V_in6_maxmtu VNET_INET6(in6_maxmtu) -#define V_ip6_auto_linklocal VNET_INET6(ip6_auto_linklocal) - -#define V_ip6stat VNET_INET6(ip6stat) -#define V_rip6stat VNET_INET6(rip6stat) -#define V_icmp6stat VNET_INET6(icmp6stat) - -#define V_rtq_timeout6 VNET_INET6(rtq_timeout6) -#define V_rtq_timer6 VNET_INET6(rtq_timer6) -#define V_rtq_mtutimer VNET_INET6(rtq_mtutimer) -#define V_nd6_slowtimo_ch VNET_INET6(nd6_slowtimo_ch) -#define V_nd6_timer_ch VNET_INET6(nd6_timer_ch) -#define V_in6_tmpaddrtimer_ch VNET_INET6(in6_tmpaddrtimer_ch) - -#define V_nd6_inuse VNET_INET6(nd6_inuse) -#define V_nd6_allocated VNET_INET6(nd6_allocated) -#define V_llinfo_nd6 VNET_INET6(llinfo_nd6) -#define V_nd_defrouter VNET_INET6(nd_defrouter) -#define V_nd_prefix VNET_INET6(nd_prefix) -#define V_nd6_defifp VNET_INET6(nd6_defifp) -#define V_nd6_defifindex VNET_INET6(nd6_defifindex) - -#define V_sid_default VNET_INET6(sid_default) - -#define V_dadq VNET_INET6(dadq) -#define V_dad_init VNET_INET6(dad_init) +#define VNET_INET6(sym) VSYM(vnet_inet6, sym) -//#define V_icmp6errppslim VNET_INET6(icmp6errppslim) -#define V_icmp6errpps_count VNET_INET6(icmp6errpps_count) -//#define V_icmp6_nodeinfo VNET_INET6(icmp6_nodeinfo) - -#define V_ip6_forwarding VNET_INET6(ip6_forwarding) -#define V_ip6_sendredirects VNET_INET6(ip6_sendredirects) -#define V_ip6_defhlim VNET_INET6(ip6_defhlim) -#define V_ip6_defmcasthlim VNET_INET6(ip6_defmcasthlim) -#define V_ip6_accept_rtadv VNET_INET6(ip6_accept_rtadv) -#define V_ip6_maxfragpackets VNET_INET6(ip6_maxfragpackets) -#define V_ip6_maxfrags VNET_INET6(ip6_maxfrags) -#define V_ip6_log_interval VNET_INET6(ip6_log_interval) -#define V_ip6_hdrnestlimit VNET_INET6(ip6_hdrnestlimit) -#define V_ip6_dad_count VNET_INET6(ip6_dad_count) -#define V_ip6_auto_flowlabel VNET_INET6(ip6_auto_flowlabel) -#define V_ip6_use_deprecated VNET_INET6(ip6_use_deprecated) -#define V_ip6_rr_prune VNET_INET6(ip6_rr_prune) -#define V_ip6_mcast_pmtu VNET_INET6(ip6_mcast_pmtu) -#define V_ip6_v6only VNET_INET6(ip6_v6only) -#define V_ip6_keepfaith VNET_INET6(ip6_keepfaith) -#define V_ip6stealth VNET_INET6(ip6stealth) -#define V_ip6_log_time VNET_INET6(ip6_log_time) - -#define V_pmtu_expire VNET_INET6(pmtu_expire) -#define V_pmtu_probe VNET_INET6(pmtu_probe) -#define V_rip6_sendspace VNET_INET6(rip6_sendspace) -#define V_rip6_recvspace VNET_INET6(rip6_recvspace) -#define V_icmp6_rediraccept VNET_INET6(icmp6_rediraccept) -#define V_icmp6_redirtimeout VNET_INET6(icmp6_redirtimeout) -#define V_icmp6errppslim VNET_INET6(icmp6errppslim) -#define V_icmp6_nodeinfo VNET_INET6(icmp6_nodeinfo) -#define V_udp6_sendspace VNET_INET6(udp6_sendspace) -#define V_udp6_recvspace VNET_INET6(udp6_recvspace) -//#define V_icmp6errppslim_last VNET_INET6(icmp6errppslim_last) -#define V_ip6_prefer_tempaddr VNET_INET6(ip6_prefer_tempaddr) -#define V_ip6qmaxlen VNET_INET6(ip6qmaxlen) -#define V_ip6_forward_srcrt VNET_INET6(ip6_forward_srcrt) -#define V_ip6_sourcecheck VNET_INET6(ip6_sourcecheck) -#define V_ip6_sourcecheck_interval VNET_INET6(ip6_sourcecheck_interval) -#define V_ip6_ours_check_algorithm VNET_INET6(ip6_ours_check_algorithm) -#define V_nd6_prune VNET_INET6(nd6_prune) -#define V_nd6_delay VNET_INET6(nd6_delay) -#define V_nd6_umaxtries VNET_INET6(nd6_umaxtries) -#define V_nd6_mmaxtries VNET_INET6(nd6_mmaxtries) -#define V_nd6_useloopback VNET_INET6(nd6_useloopback) -#define V_nd6_gctimer VNET_INET6(nd6_gctimer) -#define V_nd6_maxndopt VNET_INET6(nd6_maxndopt) -#define V_nd6_maxnudhint VNET_INET6(nd6_maxnudhint) -#define V_nd6_maxqueuelen VNET_INET6(nd6_maxqueuelen) -#define V_nd6_debug VNET_INET6(nd6_debug) -#define V_nd6_recalc_reachtm_interval VNET_INET6(nd6_recalc_reachtm_interval) -#define V_dad_ignore_ns VNET_INET6(dad_ignore_ns) -#define V_dad_maxtry VNET_INET6(dad_maxtry) -#define V_ip6_use_tempaddr VNET_INET6(ip6_use_tempaddr) -#define V_ip6_desync_factor VNET_INET6(ip6_desync_factor) -#define V_ip6_temp_preferred_lifetime VNET_INET6(ip6_temp_preferred_lifetime) -#define V_ip6_temp_valid_lifetime VNET_INET6(ip6_temp_valid_lifetime) - -#define V_ip6_mrouter_ver VNET_INET6(ip6_mrouter_ver) -#define V_pim6 VNET_INET6(pim6) -#define V_mrt6debug VNET_INET6(mrt6debug) -#define V_ip6_temp_regen_advance VNET_INET6(ip6_temp_regen_advance) - -#define V_ip6_use_defzone VNET_INET6(ip6_use_defzone) /* * Symbol translation macros ==== //depot/projects/vimage-commit/src/sys/netipsec/vipsec.h#3 (text+ko) ==== @@ -26,13 +26,13 @@ * 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. + * * $FreeBSD: src/sys/netipsec/vipsec.h,v 1.2 2008/11/26 22:32:07 zec Exp $ */ #ifndef _NETIPSEC_VIPSEC_H_ #define _NETIPSEC_VIPSEC_H_ - #ifdef VIMAGE #include <sys/proc.h> #include <sys/protosw.h> @@ -52,34 +52,34 @@ #include <netipsec/keysock.h> struct vnet_ipsec { - int _ipsec_debug; + 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; - int _ip4_ah_net_deflev; - int _ip4_ah_offsetmask; - int _ip4_ipsec_dfbit; - int _ip4_ipsec_ecn; - int _ip4_esp_randpad; + int _ip4_esp_trans_deflev; + int _ip4_esp_net_deflev; + int _ip4_ah_trans_deflev; + int _ip4_ah_net_deflev; + int _ip4_ah_offsetmask; + int _ip4_ipsec_dfbit; + int _ip4_ipsec_ecn; + int _ip4_esp_randpad; - int _ipsec_replay; - int _ipsec_integrity; - int _crypto_support; + int _ipsec_replay; + int _ipsec_integrity; + int _crypto_support; - u_int32_t _key_debug_level; - u_int _key_spi_trycnt; - u_int32_t _key_spi_minval; - u_int32_t _key_spi_maxval; - u_int32_t _policy_id; - u_int _key_int_random; - u_int _key_larval_lifetime; - int _key_blockacq_count; - int _key_blockacq_lifetime; - int _key_preferred_oldsa; - u_int32_t _acq_seq; + u_int32_t _key_debug_level; + u_int _key_spi_trycnt; + u_int32_t _key_spi_minval; + u_int32_t _key_spi_maxval; + u_int32_t _policy_id; + u_int _key_int_random; + u_int _key_larval_lifetime; + int _key_blockacq_count; + int _key_blockacq_lifetime; + int _key_preferred_oldsa; + u_int32_t _acq_seq; int _esp_enable; struct espstat _espstat; @@ -117,50 +117,29 @@ /* * Symbol translation macros */ -#define INIT_VNET_IPSEC(vnet) \ +#define INIT_VNET_IPSEC(vnet) \ INIT_FROM_VNET(vnet, VNET_MOD_IPSEC, struct vnet_ipsec, vnet_ipsec) -#define VNET_IPSEC(sym) VSYM(vnet_ipsec, sym) +#define VNET_IPSEC(sym) VSYM(vnet_ipsec, sym) -#define V_ipsec_debug VNET_IPSEC(ipsec_debug) -#define V_ipsec4stat VNET_IPSEC(ipsec4stat) -#define V_ip4_def_policy VNET_IPSEC(ip4_def_policy) -#define V_ip4_ah_offsetmask VNET_IPSEC(ip4_ah_offsetmask) -#define V_ip4_ipsec_dfbit VNET_IPSEC(ip4_ipsec_dfbit) -#define V_ip4_esp_trans_deflev VNET_IPSEC(ip4_esp_trans_deflev) -#define V_ip4_esp_net_deflev VNET_IPSEC(ip4_esp_net_deflev) -#define V_ip4_ah_trans_deflev VNET_IPSEC(ip4_ah_trans_deflev) -#define V_ip4_ah_net_deflev VNET_IPSEC(ip4_ah_net_deflev) -#define V_ip4_ipsec_ecn VNET_IPSEC(ip4_ipsec_ecn) -#define V_ip4_esp_randpad VNET_IPSEC(ip4_esp_randpad) -#define V_ipsec_replay VNET_IPSEC(ipsec_replay) -#define V_ipsec_integrity VNET_IPSEC(ipsec_integrity) -#define V_crypto_support VNET_IPSEC(crypto_support) -#define V_key_debug_level VNET_IPSEC(key_debug_level) -#define V_key_spi_trycnt VNET_IPSEC(key_spi_trycnt) -#define V_key_spi_minval VNET_IPSEC(key_spi_minval) -#define V_key_spi_maxval VNET_IPSEC(key_spi_maxval) -#define V_policy_id VNET_IPSEC(policy_id) -#define V_key_int_random VNET_IPSEC(key_int_random) -#define V_key_larval_lifetime VNET_IPSEC(key_larval_lifetime) -#define V_key_blockacq_count VNET_IPSEC(key_blockacq_count) -#define V_key_blockacq_lifetime VNET_IPSEC(key_blockacq_lifetime) -#define V_key_preferred_oldsa VNET_IPSEC(key_preferred_oldsa) -#define V_acq_seq VNET_IPSEC(acq_seq) -#define V_saorder_state_alive VNET_IPSEC(saorder_state_alive) -#define V_saorder_state_any VNET_IPSEC(saorder_state_any) -#define V_esp_enable VNET_IPSEC(esp_enable) -#define V_espstat VNET_IPSEC(espstat) -#define V_esp_max_ivlen VNET_IPSEC(esp_max_ivlen) -#define V_ipsec_esp_keymin VNET_IPSEC(ipsec_esp_keymin) -#define V_ipsec_esp_auth VNET_IPSEC(ipsec_esp_auth) -#define V_ipsec_ah_keymin VNET_IPSEC(ipsec_ah_keymin) -#define V_ipip_allow VNET_IPSEC(ipip_allow) -#define V_ipipstat VNET_IPSEC(ipipstat) -#define V_ipsec6stat VNET_IPSEC(ipsec6stat) -#define V_ip6_esp_trans_deflev VNET_IPSEC(ip6_esp_trans_deflev) -#define V_ip6_esp_net_deflev VNET_IPSEC(ip6_esp_net_deflev) -#define V_ip6_ah_trans_deflev VNET_IPSEC(ip6_ah_trans_deflev) +#define V_acq_seq VNET_IPSEC(acq_seq) +#define V_acqtree VNET_IPSEC(acqtree) +#define V_ah_cleartos VNET_IPSEC(ah_cleartos) +#define V_ah_enable VNET_IPSEC(ah_enable) +#define V_ahstat VNET_IPSEC(ahstat) +#define V_crypto_support VNET_IPSEC(crypto_support) +#define V_esp_enable VNET_IPSEC(esp_enable) +#define V_esp_max_ivlen VNET_IPSEC(esp_max_ivlen) +#define V_espstat VNET_IPSEC(espstat) +#define V_ip4_ah_net_deflev VNET_IPSEC(ip4_ah_net_deflev) +#define V_ip4_ah_offsetmask VNET_IPSEC(ip4_ah_offsetmask) +#define V_ip4_ah_trans_deflev VNET_IPSEC(ip4_ah_trans_deflev) +#define V_ip4_def_policy VNET_IPSEC(ip4_def_policy) +#define V_ip4_esp_net_deflev VNET_IPSEC(ip4_esp_net_deflev) +#define V_ip4_esp_randpad VNET_IPSEC(ip4_esp_randpad) +#define V_ip4_esp_trans_deflev VNET_IPSEC(ip4_esp_trans_deflev) +#define V_ip4_ipsec_dfbit VNET_IPSEC(ip4_ipsec_dfbit) +#define V_ip4_ipsec_ecn VNET_IPSEC(ip4_ipsec_ecn) #define V_ip6_ah_net_deflev VNET_IPSEC(ip6_ah_net_deflev) #define V_ip6_ah_trans_deflev VNET_IPSEC(ip6_ah_trans_deflev) #define V_ip6_esp_net_deflev VNET_IPSEC(ip6_esp_net_deflev)help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200811270016.mAR0Gf4O014496>