PERFORCE change 150232 for review
Bjoern A. Zeeb
bz at FreeBSD.org
Sun Sep 21 20:44:37 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=150232
Change 150232 by bz at bz_dumpster on 2008/09/21 20:44:17
Add missing FreeBSD-Tag.
Lots of style/whitespace.
Sort #define V_* alphabetically as done previously in vimage.h
Affected files ...
.. //depot/projects/vimage-commit2/src/sys/net/vnet.h#3 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/vinet.h#4 edit
.. //depot/projects/vimage-commit2/src/sys/netinet6/vinet6.h#3 edit
.. //depot/projects/vimage-commit2/src/sys/netipsec/vipsec.h#2 edit
.. //depot/projects/vimage-commit2/src/sys/sys/vimage.h#19 edit
Differences ...
==== //depot/projects/vimage-commit2/src/sys/net/vnet.h#3 (text+ko) ====
@@ -26,6 +26,8 @@
* 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$
*/
#ifndef _NET_VNET_H_
@@ -69,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-commit2/src/sys/netinet/vinet.h#4 (text+ko) ====
@@ -26,6 +26,8 @@
* 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$
*/
#ifndef _NETINET_VINET_H_
@@ -196,133 +198,134 @@
/*
* 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 VNET_INET(sym) VSYM(vnet_inet, sym)
+
+#define V_arp_maxtries VNET_INET(arp_maxtries)
+#define V_arp_proxyall VNET_INET(arp_proxyall)
+#define V_arpt_keep VNET_INET(arpt_keep)
+#define V_arpt_prune VNET_INET(arpt_prune)
+#define V_blackhole VNET_INET(blackhole)
+#define V_divcb VNET_INET(divcb)
+#define V_divcbinfo VNET_INET(divcbinfo)
+#define V_drop_redirect VNET_INET(drop_redirect)
+#define V_drop_synfin VNET_INET(drop_synfin)
+#define V_icmp_may_rst VNET_INET(icmp_may_rst)
+#define V_icmp_quotelen VNET_INET(icmp_quotelen)
+#define V_icmp_rfi VNET_INET(icmp_rfi)
+#define V_icmpbmcastecho VNET_INET(icmpbmcastecho)
+#define V_icmplim VNET_INET(icmplim)
+#define V_icmplim_output VNET_INET(icmplim_output)
+#define V_icmpmaskfake VNET_INET(icmpmaskfake)
+#define V_icmpmaskrepl VNET_INET(icmpmaskrepl)
+#define V_icmpstat VNET_INET(icmpstat)
+#define V_igmpstat VNET_INET(igmpstat)
+#define V_in_ifaddrhashtbl VNET_INET(in_ifaddrhashtbl)
+#define V_in_ifaddrhead VNET_INET(in_ifaddrhead)
+#define V_in_ifaddrhmask VNET_INET(in_ifaddrhmask)
+#define V_in_multihead VNET_INET(in_multihead)
+#define V_ip_checkinterface VNET_INET(ip_checkinterface)
+#define V_ip_defttl VNET_INET(ip_defttl)
+#define V_ip_do_randomid VNET_INET(ip_do_randomid)
+#define V_ip_id VNET_INET(ip_id)
+#define V_ip_keepfaith VNET_INET(ip_keepfaith)
+#define V_ip_mrouter VNET_INET(ip_mrouter)
+#define V_ip_rsvp_on VNET_INET(ip_rsvp_on)
+#define V_ip_rsvpd VNET_INET(ip_rsvpd)
+#define V_ip_sendsourcequench VNET_INET(ip_sendsourcequench)
+#define V_ipfastforward_active VNET_INET(ipfastforward_active)
+#define V_ipforwarding VNET_INET(ipforwarding)
+#define V_ipport_firstauto VNET_INET(ipport_firstauto)
+#define V_ipport_hifirstauto VNET_INET(ipport_hifirstauto)
+#define V_ipport_hilastauto VNET_INET(ipport_hilastauto)
+#define V_ipport_lastauto VNET_INET(ipport_lastauto)
+#define V_ipport_lowfirstauto VNET_INET(ipport_lowfirstauto)
+#define V_ipport_lowlastauto VNET_INET(ipport_lowlastauto)
+#define V_ipport_randomcps VNET_INET(ipport_randomcps)
+#define V_ipport_randomized VNET_INET(ipport_randomized)
+#define V_ipport_randomtime VNET_INET(ipport_randomtime)
+#define V_ipport_reservedhigh VNET_INET(ipport_reservedhigh)
+#define V_ipport_reservedlow VNET_INET(ipport_reservedlow)
+#define V_ipport_stoprandom VNET_INET(ipport_stoprandom)
+#define V_ipport_tcpallocs VNET_INET(ipport_tcpallocs)
+#define V_ipport_tcplastcount VNET_INET(ipport_tcplastcount)
+#define V_ipq VNET_INET(ipq)
+#define V_ipq_zone VNET_INET(ipq_zone)
+#define V_ipsendredirects VNET_INET(ipsendredirects)
+#define V_ipstat VNET_INET(ipstat)
+#define V_ipstealth VNET_INET(ipstealth)
+#define V_isn_ctx VNET_INET(isn_ctx)
+#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_secret VNET_INET(isn_secret)
+#define V_llinfo_arp VNET_INET(llinfo_arp)
+#define V_log_redirect VNET_INET(log_redirect)
+#define V_maxfragsperpacket VNET_INET(maxfragsperpacket)
+#define V_maxnipq VNET_INET(maxnipq)
+#define V_nipq VNET_INET(nipq)
+#define V_nolocaltimewait VNET_INET(nolocaltimewait)
+#define V_path_mtu_discovery VNET_INET(path_mtu_discovery)
+#define V_reply_src VNET_INET(reply_src)
+#define V_ripcb VNET_INET(ripcb)
+#define V_ripcbinfo VNET_INET(ripcbinfo)
+#define V_router_info_head VNET_INET(router_info_head)
+#define V_rsvp_on VNET_INET(rsvp_on)
+#define V_rtq_minreallyold VNET_INET(rtq_minreallyold)
+#define V_rtq_reallyold VNET_INET(rtq_reallyold)
+#define V_rtq_timeout VNET_INET(rtq_timeout)
+#define V_rtq_timer VNET_INET(rtq_timer)
+#define V_rtq_toomany VNET_INET(rtq_toomany)
+#define V_sameprefixcarponly VNET_INET(sameprefixcarponly)
+#define V_ss_fltsz VNET_INET(ss_fltsz)
+#define V_ss_fltsz_local VNET_INET(ss_fltsz_local)
+#define V_subnetsarelocal VNET_INET(subnetsarelocal)
+#define V_tcb VNET_INET(tcb)
+#define V_tcbinfo VNET_INET(tcbinfo)
+#define V_tcp_autorcvbuf_inc VNET_INET(tcp_autorcvbuf_inc)
+#define V_tcp_autorcvbuf_max VNET_INET(tcp_autorcvbuf_max)
+#define V_tcp_autosndbuf_inc VNET_INET(tcp_autosndbuf_inc)
+#define V_tcp_autosndbuf_max VNET_INET(tcp_autosndbuf_max)
+#define V_tcp_delack_enabled VNET_INET(tcp_delack_enabled)
+#define V_tcp_do_autorcvbuf VNET_INET(tcp_do_autorcvbuf)
+#define V_tcp_do_autosndbuf VNET_INET(tcp_do_autosndbuf)
+#define V_tcp_do_ecn VNET_INET(tcp_do_ecn)
+#define V_tcp_do_newreno VNET_INET(tcp_do_newreno)
+#define V_tcp_do_rfc1323 VNET_INET(tcp_do_rfc1323)
+#define V_tcp_do_rfc3042 VNET_INET(tcp_do_rfc3042)
+#define V_tcp_do_rfc3390 VNET_INET(tcp_do_rfc3390)
+#define V_tcp_do_sack VNET_INET(tcp_do_sack)
+#define V_tcp_do_tso VNET_INET(tcp_do_tso)
+#define V_tcp_ecn_maxretries VNET_INET(tcp_ecn_maxretries)
+#define V_tcp_hc_callout VNET_INET(tcp_hc_callout)
+#define V_tcp_hostcache VNET_INET(tcp_hostcache)
+#define V_tcp_inflight_enable VNET_INET(tcp_inflight_enable)
+#define V_tcp_inflight_max VNET_INET(tcp_inflight_max)
+#define V_tcp_inflight_min VNET_INET(tcp_inflight_min)
+#define V_tcp_inflight_rttthresh VNET_INET(tcp_inflight_rttthresh)
+#define V_tcp_inflight_stab VNET_INET(tcp_inflight_stab)
+#define V_tcp_insecure_rst VNET_INET(tcp_insecure_rst)
+#define V_tcp_isn_reseed_interval VNET_INET(tcp_isn_reseed_interval)
+#define V_tcp_minmss VNET_INET(tcp_minmss)
+#define V_tcp_mssdflt VNET_INET(tcp_mssdflt)
+#define V_tcp_reass_maxqlen VNET_INET(tcp_reass_maxqlen)
+#define V_tcp_reass_maxseg VNET_INET(tcp_reass_maxseg)
+#define V_tcp_reass_overflows VNET_INET(tcp_reass_overflows)
+#define V_tcp_reass_qsize VNET_INET(tcp_reass_qsize)
+#define V_tcp_sack_globalholes VNET_INET(tcp_sack_globalholes)
+#define V_tcp_sack_globalmaxholes VNET_INET(tcp_sack_globalmaxholes)
+#define V_tcp_sack_maxholes VNET_INET(tcp_sack_maxholes)
+#define V_tcp_sc_rst_sock_fail VNET_INET(tcp_sc_rst_sock_fail)
+#define V_tcp_syncache VNET_INET(tcp_syncache)
+#define V_tcp_v6mssdflt VNET_INET(tcp_v6mssdflt)
+#define V_tcpstat VNET_INET(tcpstat)
+#define V_twq_2msl VNET_INET(twq_2msl)
+#define V_udb VNET_INET(udb)
+#define V_udbinfo VNET_INET(udbinfo)
+#define V_udp_blackhole VNET_INET(udp_blackhole)
+#define V_udpstat VNET_INET(udpstat)
+#define V_useloopback VNET_INET(useloopback)
-#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 V_ipforwarding VNET_INET(ipforwarding)
-#define V_ipstealth VNET_INET(ipstealth)
-#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_udp_blackhole VNET_INET(udp_blackhole)
-#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_ipport_lowfirstauto VNET_INET(ipport_lowfirstauto)
-#define V_ipport_lowlastauto VNET_INET(ipport_lowlastauto)
-#define V_ipport_firstauto VNET_INET(ipport_firstauto)
-#define V_ipport_lastauto VNET_INET(ipport_lastauto)
-#define V_ipport_hifirstauto VNET_INET(ipport_hifirstauto)
-#define V_ipport_hilastauto VNET_INET(ipport_hilastauto)
-#define V_ipport_reservedhigh VNET_INET(ipport_reservedhigh)
-#define V_ipport_reservedlow VNET_INET(ipport_reservedlow)
-#define V_ipport_randomized VNET_INET(ipport_randomized)
-#define V_ipport_randomcps VNET_INET(ipport_randomcps)
-#define V_ipport_randomtime VNET_INET(ipport_randomtime)
-#define V_ipport_stoprandom VNET_INET(ipport_stoprandom)
-#define V_ipport_tcpallocs VNET_INET(ipport_tcpallocs)
-#define V_ipport_tcplastcount VNET_INET(ipport_tcplastcount)
-#define V_divcb VNET_INET(divcb)
-#define V_divcbinfo VNET_INET(divcbinfo)
-#define V_icmpmaskrepl VNET_INET(icmpmaskrepl)
-#define V_icmpmaskfake VNET_INET(icmpmaskfake)
-#define V_drop_redirect VNET_INET(drop_redirect)
-#define V_log_redirect VNET_INET(log_redirect)
-#define V_icmplim VNET_INET(icmplim)
-#define V_icmplim_output VNET_INET(icmplim_output)
-#define V_reply_src VNET_INET(reply_src)
-#define V_icmp_rfi VNET_INET(icmp_rfi)
-#define V_icmp_quotelen VNET_INET(icmp_quotelen)
-#define V_icmpbmcastecho VNET_INET(icmpbmcastecho)
#endif /* !_NETINET_VINET_H_ */
==== //depot/projects/vimage-commit2/src/sys/netinet6/vinet6.h#3 (text+ko) ====
@@ -26,6 +26,8 @@
* 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$
*/
#ifndef _NETINET6_VINET6_H_
@@ -43,11 +45,10 @@
#include <netinet6/nd6.h>
#include <netinet/in_pcb.h>
-#define INIT_VNET_INET6(vnet) \
- INIT_FROM_VNET(vnet, VNET_MOD_INET6, \
- struct vnet_inet6, vnet_inet6)
+#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)
+#define VNET_INET6(sym) VSYM(vnet_inet6, sym)
#ifdef VIMAGE
@@ -164,97 +165,95 @@
/*
* Symbol translation macros
*/
-#define V_in6_ifaddr VNET_INET6(in6_ifaddr)
-#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_rtq_minreallyold6 VNET_INET6(rtq_minreallyold6)
-#define V_rtq_reallyold6 VNET_INET6(rtq_reallyold6)
-#define V_rtq_toomany6 VNET_INET6(rtq_toomany6)
-#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 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)
-#define V_ip6_opts VNET_INET6(ip6_opts)
+#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)
+#define V_dad_maxtry VNET_INET6(dad_maxtry)
+#define V_dadq VNET_INET6(dadq)
+#define V_defaultaddrpolicy VNET_INET6(defaultaddrpolicy)
+#define V_frag6_nfragpackets VNET_INET6(frag6_nfragpackets)
+#define V_frag6_nfrags VNET_INET6(frag6_nfrags)
+#define V_icmp6_nodeinfo VNET_INET6(icmp6_nodeinfo)
+#define V_icmp6_rediraccept VNET_INET6(icmp6_rediraccept)
+#define V_icmp6_redirtimeout VNET_INET6(icmp6_redirtimeout)
+#define V_icmp6errpps_count VNET_INET6(icmp6errpps_count)
+#define V_icmp6errppslim VNET_INET6(icmp6errppslim)
+#define V_icmp6errppslim_last VNET_INET6(icmp6errppslim_last)
+#define V_icmp6stat VNET_INET6(icmp6stat)
+#define V_in6_ifaddr VNET_INET6(in6_ifaddr)
+#define V_in6_maxmtu VNET_INET6(in6_maxmtu)
+#define V_in6_tmpaddrtimer_ch VNET_INET6(in6_tmpaddrtimer_ch)
+#define V_ip6_accept_rtadv VNET_INET6(ip6_accept_rtadv)
+#define V_ip6_auto_flowlabel VNET_INET6(ip6_auto_flowlabel)
+#define V_ip6_auto_linklocal VNET_INET6(ip6_auto_linklocal)
+#define V_ip6_dad_count VNET_INET6(ip6_dad_count)
+#define V_ip6_defhlim VNET_INET6(ip6_defhlim)
+#define V_ip6_defmcasthlim VNET_INET6(ip6_defmcasthlim)
+#define V_ip6_desync_factor VNET_INET6(ip6_desync_factor)
+#define V_ip6_forward_rt VNET_INET6(ip6_forward_rt)
+#define V_ip6_forward_srcrt VNET_INET6(ip6_forward_srcrt)
+#define V_ip6_forwarding VNET_INET6(ip6_forwarding)
+#define V_ip6_hdrnestlimit VNET_INET6(ip6_hdrnestlimit)
+#define V_ip6_keepfaith VNET_INET6(ip6_keepfaith)
+#define V_ip6_log_interval VNET_INET6(ip6_log_interval)
+#define V_ip6_log_time VNET_INET6(ip6_log_time)
+#define V_ip6_maxfragpackets VNET_INET6(ip6_maxfragpackets)
+#define V_ip6_maxfrags VNET_INET6(ip6_maxfrags)
+#define V_ip6_mcast_pmtu VNET_INET6(ip6_mcast_pmtu)
+#define V_ip6_mrouter_ver VNET_INET6(ip6_mrouter_ver)
+#define V_ip6_opts VNET_INET6(ip6_opts)
+#define V_ip6_ours_check_algorithm VNET_INET6(ip6_ours_check_algorithm)
+#define V_ip6_prefer_tempaddr VNET_INET6(ip6_prefer_tempaddr)
+#define V_ip6_rr_prune VNET_INET6(ip6_rr_prune)
+#define V_ip6_sendredirects VNET_INET6(ip6_sendredirects)
+#define V_ip6_sourcecheck VNET_INET6(ip6_sourcecheck)
+#define V_ip6_sourcecheck_interval VNET_INET6(ip6_sourcecheck_interval)
+#define V_ip6_temp_preferred_lifetime VNET_INET6(ip6_temp_preferred_lifetime)
+#define V_ip6_temp_regen_advance VNET_INET6(ip6_temp_regen_advance)
+#define V_ip6_temp_valid_lifetime VNET_INET6(ip6_temp_valid_lifetime)
+#define V_ip6_use_defzone VNET_INET6(ip6_use_defzone)
+#define V_ip6_use_deprecated VNET_INET6(ip6_use_deprecated)
+#define V_ip6_use_tempaddr VNET_INET6(ip6_use_tempaddr)
+#define V_ip6_v6only VNET_INET6(ip6_v6only)
+#define V_ip6q VNET_INET6(ip6q)
+#define V_ip6qmaxlen VNET_INET6(ip6qmaxlen)
+#define V_ip6stat VNET_INET6(ip6stat)
+#define V_ip6stealth VNET_INET6(ip6stealth)
+#define V_llinfo_nd6 VNET_INET6(llinfo_nd6)
+#define V_mrt6debug VNET_INET6(mrt6debug)
+#define V_nd6_allocated VNET_INET6(nd6_allocated)
+#define V_nd6_debug VNET_INET6(nd6_debug)
+#define V_nd6_defifindex VNET_INET6(nd6_defifindex)
+#define V_nd6_defifp VNET_INET6(nd6_defifp)
+#define V_nd6_delay VNET_INET6(nd6_delay)
+#define V_nd6_gctimer VNET_INET6(nd6_gctimer)
+#define V_nd6_inuse VNET_INET6(nd6_inuse)
+#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_mmaxtries VNET_INET6(nd6_mmaxtries)
+#define V_nd6_prune VNET_INET6(nd6_prune)
+#define V_nd6_recalc_reachtm_interval VNET_INET6(nd6_recalc_reachtm_interval)
+#define V_nd6_slowtimo_ch VNET_INET6(nd6_slowtimo_ch)
+#define V_nd6_timer_ch VNET_INET6(nd6_timer_ch)
+#define V_nd6_umaxtries VNET_INET6(nd6_umaxtries)
+#define V_nd6_useloopback VNET_INET6(nd6_useloopback)
+#define V_nd_defrouter VNET_INET6(nd_defrouter)
+#define V_nd_prefix VNET_INET6(nd_prefix)
+#define V_pim6 VNET_INET6(pim6)
+#define V_pmtu_expire VNET_INET6(pmtu_expire)
+#define V_pmtu_probe VNET_INET6(pmtu_probe)
+#define V_rip6_recvspace VNET_INET6(rip6_recvspace)
+#define V_rip6_sendspace VNET_INET6(rip6_sendspace)
+#define V_rip6stat VNET_INET6(rip6stat)
+#define V_rtq_minreallyold6 VNET_INET6(rtq_minreallyold6)
+#define V_rtq_mtutimer VNET_INET6(rtq_mtutimer)
+#define V_rtq_reallyold6 VNET_INET6(rtq_reallyold6)
+#define V_rtq_timeout6 VNET_INET6(rtq_timeout6)
+#define V_rtq_timer6 VNET_INET6(rtq_timer6)
+#define V_rtq_toomany6 VNET_INET6(rtq_toomany6)
+#define V_sid_default VNET_INET6(sid_default)
+#define V_udp6_recvspace VNET_INET6(udp6_recvspace)
+#define V_udp6_sendspace VNET_INET6(udp6_sendspace)
#endif /* !_NETINET6_VINET6_H_ */
==== //depot/projects/vimage-commit2/src/sys/netipsec/vipsec.h#2 (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$
*/
#ifndef _NETIPSEC_VIPSEC_H_
#define _NETIPSEC_VIPSEC_H_
-
#ifdef VIMAGE
#include <sys/proc.h>
#include <sys/protosw.h>
@@ -51,53 +52,53 @@
#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;
- u_int _saorder_state_alive[3];
- u_int _saorder_state_any[4];
- int _esp_enable;
- struct espstat _espstat;
- int _esp_max_ivlen;
- int _ipsec_esp_keymin;
- int _ipsec_esp_auth;
- int _ipsec_ah_keymin;
- int _ipip_allow;
- struct ipipstat _ipipstat;
+ u_int _saorder_state_alive[3];
+ u_int _saorder_state_any[4];
+ int _esp_enable;
+ struct espstat _espstat;
+ int _esp_max_ivlen;
+ int _ipsec_esp_keymin;
+ int _ipsec_esp_auth;
+ int _ipsec_ah_keymin;
+ int _ipip_allow;
+ struct ipipstat _ipipstat;
- struct ipsecstat _ipsec6stat;
- int _ip6_esp_trans_deflev;
- int _ip6_esp_net_deflev;
- int _ip6_ah_trans_deflev;
- int _ip6_ah_net_deflev;
- int _ip6_ipsec_ecn;
- int _ip6_esp_randpad;
+ struct ipsecstat _ipsec6stat;
+ int _ip6_esp_trans_deflev;
+ int _ip6_esp_net_deflev;
+ int _ip6_ah_trans_deflev;
+ int _ip6_ah_net_deflev;
+ int _ip6_ipsec_ecn;
+ int _ip6_esp_randpad;
int _ah_enable;
int _ah_cleartos;
@@ -122,65 +123,66 @@
/*
* 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_ipsec_ecn VNET_IPSEC(ip6_ipsec_ecn)
-#define V_ip6_esp_randpad VNET_IPSEC(ip6_esp_randpad)
-#define V_ah_enable VNET_IPSEC(ah_enable)
-#define V_ah_cleartos VNET_IPSEC(ah_cleartos)
-#define V_ahstat VNET_IPSEC(ahstat)
-#define V_ipcomp_enable VNET_IPSEC(ipcomp_enable)
-#define V_ipcompstat VNET_IPSEC(ipcompstat)
-#define V_pfkeystat VNET_IPSEC(pfkeystat)
-#define V_key_cb VNET_IPSEC(key_cb)
-#define V_key_dst VNET_IPSEC(key_dst)
-#define V_key_src VNET_IPSEC(key_src)
-#define V_sptree VNET_IPSEC(sptree)
-#define V_sahtree VNET_IPSEC(sahtree)
-#define V_regtree VNET_IPSEC(regtree)
-#define V_acqtree VNET_IPSEC(acqtree)
-#define V_spacqtree VNET_IPSEC(spacqtree)
+#define V_ip6_ah_trans_deflev VNET_IPSEC(ip6_ah_trans_deflev)
+#define V_ip6_esp_net_deflev VNET_IPSEC(ip6_esp_net_deflev)
+#define V_ip6_esp_randpad VNET_IPSEC(ip6_esp_randpad)
+#define V_ip6_esp_trans_deflev VNET_IPSEC(ip6_esp_trans_deflev)
+#define V_ip6_ipsec_ecn VNET_IPSEC(ip6_ipsec_ecn)
+#define V_ipcomp_enable VNET_IPSEC(ipcomp_enable)
+#define V_ipcompstat VNET_IPSEC(ipcompstat)
+#define V_ipip_allow VNET_IPSEC(ipip_allow)
+#define V_ipipstat VNET_IPSEC(ipipstat)
+#define V_ipsec4stat VNET_IPSEC(ipsec4stat)
+#define V_ipsec6stat VNET_IPSEC(ipsec6stat)
+#define V_ipsec_ah_keymin VNET_IPSEC(ipsec_ah_keymin)
+#define V_ipsec_debug VNET_IPSEC(ipsec_debug)
+#define V_ipsec_esp_auth VNET_IPSEC(ipsec_esp_auth)
+#define V_ipsec_esp_keymin VNET_IPSEC(ipsec_esp_keymin)
+#define V_ipsec_integrity VNET_IPSEC(ipsec_integrity)
+#define V_ipsec_replay VNET_IPSEC(ipsec_replay)
+#define V_key_blockacq_count VNET_IPSEC(key_blockacq_count)
+#define V_key_blockacq_lifetime VNET_IPSEC(key_blockacq_lifetime)
+#define V_key_cb VNET_IPSEC(key_cb)
+#define V_key_debug_level VNET_IPSEC(key_debug_level)
+#define V_key_dst VNET_IPSEC(key_dst)
+#define V_key_int_random VNET_IPSEC(key_int_random)
+#define V_key_larval_lifetime VNET_IPSEC(key_larval_lifetime)
+#define V_key_preferred_oldsa VNET_IPSEC(key_preferred_oldsa)
+#define V_key_spi_maxval VNET_IPSEC(key_spi_maxval)
+#define V_key_spi_minval VNET_IPSEC(key_spi_minval)
+#define V_key_spi_trycnt VNET_IPSEC(key_spi_trycnt)
+#define V_key_src VNET_IPSEC(key_src)
+#define V_pfkeystat VNET_IPSEC(pfkeystat)
+#define V_policy_id VNET_IPSEC(policy_id)
+#define V_regtree VNET_IPSEC(regtree)
+#define V_sahtree VNET_IPSEC(sahtree)
+#define V_saorder_state_alive VNET_IPSEC(saorder_state_alive)
+#define V_saorder_state_any VNET_IPSEC(saorder_state_any)
+#define V_spacqtree VNET_IPSEC(spacqtree)
+#define V_sptree VNET_IPSEC(sptree)
+
#endif /* !_NETIPSEC_VIPSEC_H_ */
==== //depot/projects/vimage-commit2/src/sys/sys/vimage.h#19 (text+ko) ====
@@ -34,33 +34,33 @@
#define _SYS_VIMAGE_H_
/* Non-VIMAGE null-macros */
-#define CURVNET_SET(arg)
-#define CURVNET_SET_QUIET(arg)
-#define CURVNET_RESTORE()
-#define VNET_ASSERT(condition)
-#define VSYM(base, sym) (sym)
-#define INIT_FROM_VNET(vnet, modindex, modtype, sym)
-#define VNET_ITERATOR_DECL(arg)
-#define VNET_FOREACH(arg)
-#define VNET_LIST_RLOCK()
-#define VNET_LIST_RUNLOCK()
-#define INIT_VPROCG(arg)
-#define INIT_VCPU(arg)
-#define TD_TO_VIMAGE(td)
-#define TD_TO_VNET(td)
-#define TD_TO_VPROCG(td)
-#define TD_TO_VCPU(td)
-#define P_TO_VIMAGE(p)
-#define P_TO_VNET(p)
-#define P_TO_VPROCG(p)
-#define P_TO_VCPU(p)
+#define CURVNET_SET(arg)
+#define CURVNET_SET_QUIET(arg)
+#define CURVNET_RESTORE()
+#define VNET_ASSERT(condition)
+#define VSYM(base, sym) (sym)
+#define INIT_FROM_VNET(vnet, modindex, modtype, sym)
+#define VNET_ITERATOR_DECL(arg)
+#define VNET_FOREACH(arg)
+#define VNET_LIST_RLOCK()
+#define VNET_LIST_RUNLOCK()
+#define INIT_VPROCG(arg)
+#define INIT_VCPU(arg)
+#define TD_TO_VIMAGE(td)
+#define TD_TO_VNET(td)
+#define TD_TO_VPROCG(td)
+#define TD_TO_VCPU(td)
+#define P_TO_VIMAGE(p)
+#define P_TO_VNET(p)
+#define P_TO_VPROCG(p)
+#define P_TO_VCPU(p)
/* XXX those defines bellow should probably go into vprocg.h and vcpu.h */
-#define VPROCG(sym) VSYM(vprocg, sym)
-#define VCPU(sym) VSYM(vcpu, sym)
+#define VPROCG(sym) VSYM(vprocg, sym)
+#define VCPU(sym) VSYM(vcpu, sym)
-#define V_hostname VPROCG(hostname)
-#define G_hostname VSYM(basevprocg, hostname) /* global hostname */
-#define V_domainname VPROCG(domainname)
+#define V_hostname VPROCG(hostname)
+#define G_hostname VSYM(basevprocg, hostname) /* global hostname */
+#define V_domainname VPROCG(domainname)
#endif /* !_SYS_VIMAGE_H_ */
More information about the p4-projects
mailing list