PERFORCE change 144317 for review

Julian Elischer julian at FreeBSD.org
Sun Jun 29 23:31:34 UTC 2008


http://perforce.freebsd.org/chv.cgi?CH=144317

Change 144317 by julian at julian_trafmon1 on 2008/06/29 23:31:03

	revert to using seprate vimage files (mostly) except for netgraph.

Affected files ...

.. //depot/projects/vimage-commit3/src/sys/net/if.h#3 edit
.. //depot/projects/vimage-commit3/src/sys/netgraph/netgraph.h#3 edit
.. //depot/projects/vimage-commit3/src/sys/netinet/in.h#4 edit
.. //depot/projects/vimage-commit3/src/sys/netinet/ip6.h#3 edit
.. //depot/projects/vimage-commit3/src/sys/netipsec/ipsec.h#3 edit

Differences ...

==== //depot/projects/vimage-commit3/src/sys/net/if.h#3 (text+ko) ====

@@ -457,22 +457,8 @@
 #include <net/if_var.h>
 #endif
 
-#define INIT_VNET_NET(_xXX) int vnet_net ;
-
-#define VNET_NET(sym)   VSYM(vnet_net, sym)
+#ifdef _KERNEL
+#include <net/vnet.h>
+#endif
 
-#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)
- 
 #endif /* !_NET_IF_H_ */

==== //depot/projects/vimage-commit3/src/sys/netgraph/netgraph.h#3 (text+ko) ====

@@ -1181,10 +1181,63 @@
 #define NGI_GET_META(i,m)
 #define	ng_copy_meta(meta) NULL
 
-#define INIT_VNET_NETGRAPH(vnet) int vnet_nergraph;
+#endif /* _NETGRAPH_NETGRAPH_H_ */
+/*-
+ * Copyright (c) 2006-2008 University of Zagreb
+ * Copyright (c) 2006-2008 FreeBSD Foundation
+ *
+ * This software was developed by the University of Zagreb and the
+ * FreeBSD Foundation under sponsorship by the Stichting NLnet and the
+ * FreeBSD Foundation.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * 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.
+ */
+
+#ifndef _NETGRAPH_VNETGRPAH_H_
+#define _NETGRAPH_VNETGRAPH_H_
+
+#include <netgraph/ng_message.h>
+
+#define INIT_VNET_NETGRAPH(vnet) \
+	INIT_FROM_VNET(vnet, VNET_MOD_NETGRAPH, \
+	    struct vnet_netgraph, vnet_netgraph)
 
 #define VNET_NETGRAPH(sym)	VSYM(vnet_netgraph, sym)
 
+#define NG_ID_HASH_SIZE 32 /* most systems wont need even this many */
+#define NG_NAME_HASH_SIZE 128 /* most systems wont need even this many */
+
+#ifdef VIMAGE
+struct vnet_netgraph {
+	LIST_HEAD(, ng_node) _ng_ID_hash[NG_ID_HASH_SIZE];
+	LIST_HEAD(, ng_node) _ng_name_hash[NG_ID_HASH_SIZE];
+	LIST_HEAD(, ng_node) _ng_nodelist;
+	ng_ID_t		_nextID;
+	struct unrhdr	*_ng_iface_unit;
+	struct unrhdr	*_ng_eiface_unit;
+	struct unrhdr	*_ng_wormhole_unit;
+};
+#endif
+
 /* Symbol translation macros */
 #define V_ng_ID_hash		VNET_NETGRAPH(ng_ID_hash)
 #define V_ng_name_hash		VNET_NETGRAPH(ng_name_hash)
@@ -1194,4 +1247,4 @@
 #define V_ng_eiface_unit	VNET_NETGRAPH(ng_eiface_unit)
 #define V_ng_wormhole_unit	VNET_NETGRAPH(ng_wormhole_unit)
 
-#endif /* _NETGRAPH_NETGRAPH_H_ */
+#endif /* !_NETGRAPH_VNETGRAPH_H_ */

==== //depot/projects/vimage-commit3/src/sys/netinet/in.h#4 (text+ko) ====

@@ -744,133 +744,8 @@
 #endif
 
 
-#define INIT_VNET_INET(vnet) int  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 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_ipstealth		VNET_INET(ipstealth)
-#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)
+#ifdef _KERNEL
+#include <netinet/vinet.h>
+#endif
 
-#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_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_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)
 #endif /* !_NETINET_IN_H_*/

==== //depot/projects/vimage-commit3/src/sys/netinet/ip6.h#3 (text+ko) ====

@@ -347,116 +347,7 @@
 	}								\
 } while (/*CONSTCOND*/ 0)
 
-#define INIT_VNET_INET6(vnet) int vnet_inet6;
-
-#define VNET_INET6(sym)		VSYM(vnet_inet6, sym)
-
-/*
- * 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_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)
+#include <netinet6/vinet6.h>
 
 #endif /*_KERNEL*/
 

==== //depot/projects/vimage-commit3/src/sys/netipsec/ipsec.h#3 (text+ko) ====

@@ -433,70 +433,8 @@
 extern char *ipsec_dump_policy __P((caddr_t, char *));
 
 extern const char *ipsec_strerror __P((void));
+#include <netipsec/vipsec.h>
+
 #endif /* ! KERNEL */
 
-/*
- * Symbol translation macros
- */
-#define INIT_VNET_IPSEC(vnet) int vnet_ipsec;
-
-#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_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)
-
 #endif /* _NETIPSEC_IPSEC_H_ */


More information about the p4-projects mailing list