PERFORCE change 144166 for review
Julian Elischer
julian at FreeBSD.org
Thu Jun 26 22:22:23 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=144166
Change 144166 by julian at julian_trafmon1 on 2008/06/26 22:22:02
Make lint compile with the new vimage.h
Affected files ...
.. //depot/projects/vimage-commit3/src/sys/netgraph/netgraph.h#2 edit
.. //depot/projects/vimage-commit3/src/sys/netinet/in.h#3 edit
.. //depot/projects/vimage-commit3/src/sys/netipsec/ipsec.h#2 edit
.. //depot/projects/vimage-commit3/src/sys/netipsec/keysock.c#2 edit
Differences ...
==== //depot/projects/vimage-commit3/src/sys/netgraph/netgraph.h#2 (text+ko) ====
@@ -1181,4 +1181,17 @@
#define NGI_GET_META(i,m)
#define ng_copy_meta(meta) NULL
+#define INIT_VNET_NETGRAPH(vnet) int vnet_nergraph;
+
+#define VNET_NETGRAPH(sym) VSYM(vnet_netgraph, sym)
+
+/* Symbol translation macros */
+#define V_ng_ID_hash VNET_NETGRAPH(ng_ID_hash)
+#define V_ng_name_hash VNET_NETGRAPH(ng_name_hash)
+#define V_ng_nodelist VNET_NETGRAPH(ng_nodelist)
+#define V_nextID VNET_NETGRAPH(nextID)
+#define V_ng_iface_unit VNET_NETGRAPH(ng_iface_unit)
+#define V_ng_eiface_unit VNET_NETGRAPH(ng_eiface_unit)
+#define V_ng_wormhole_unit VNET_NETGRAPH(ng_wormhole_unit)
+
#endif /* _NETGRAPH_NETGRAPH_H_ */
==== //depot/projects/vimage-commit3/src/sys/netinet/in.h#3 (text+ko) ====
@@ -769,6 +769,7 @@
#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)
==== //depot/projects/vimage-commit3/src/sys/netipsec/ipsec.h#2 (text+ko) ====
@@ -433,6 +433,70 @@
extern char *ipsec_dump_policy __P((caddr_t, char *));
extern const char *ipsec_strerror __P((void));
-#endif /* !_KERNEL */
+#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_ */
==== //depot/projects/vimage-commit3/src/sys/netipsec/keysock.c#2 (text+ko) ====
@@ -53,13 +53,17 @@
#include <sys/systm.h>
#include <sys/vimage.h>
+#include <net/if.h>
#include <net/raw_cb.h>
#include <net/route.h>
+#include <netinet/in.h>
+
#include <net/pfkeyv2.h>
#include <netipsec/key.h>
#include <netipsec/keysock.h>
#include <netipsec/key_debug.h>
+#include <netipsec/ipsec.h>
#include <machine/stdarg.h>
More information about the p4-projects
mailing list