Step 1.5 of importing the network stack virtualization infrastructure

from the vimage project, as per plan established at devsummit 08/08:
http://wiki.freebsd.org/Image/Notes200808DevSummit

Introduce INIT_VNET_*() initializer macros, VNET_FOREACH() iterator
macros, and CURVNET_SET() context setting macros, all currently
resolving to NOPs.

Prepare for virtualization of selected SYSCTL objects by introducing a
family of SYSCTL_V_*() macros, currently resolving to their global
counterparts, i.e. SYSCTL_V_INT() == SYSCTL_INT().

Move selected #defines from sys/sys/vimage.h to newly introduced header
files specific to virtualized subsystems (sys/net/vnet.h,
sys/netinet/vinet.h etc.).

All the changes are verified to have zero functional impact at this
point in time by doing MD5 comparision between pre- and post-change
object files(*).

(*) netipsec/keysock.c did not validate depending on compile time options.

Implemented by:	julian, bz, brooks, zec
Reviewed by:	julian, bz, brooks, kris, rwatson, ...
Approved by:	julian (mentor)
Obtained from:	//depot/projects/vimage-commit2/...
X-MFC after:	never
Sponsored by:	NLnet Foundation, The FreeBSD Foundation

1 files changed, 93 insertions, 0 deletions

diff --git a/sys/net/vnet.h b/sys/net/vnet.h
new file mode 100644
index 0000000..f287bf9
--- /dev/null
+++ b/sys/net/vnet.h
@@ -0,0 +1,93 @@
+/*-
+ * 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.
+ *
+ * $FreeBSD$
+ */
+
+#ifndef _NET_VNET_H_
+#define _NET_VNET_H_
+
+#ifdef VIMAGE
+#include "opt_route.h"
+
+#include <sys/proc.h>
+#include <sys/protosw.h>
+#include <sys/socket.h>
+
+#include <net/if.h>
+#include <net/if_var.h>
+#include <net/route.h>
+#include <net/raw_cb.h>
+
+struct vnet_net {
+	int	_if_index;
+	struct	ifindex_entry *_ifindex_table;
+	struct	ifnethead _ifnet;
+	struct	ifgrouphead _ifg_head;
+
+	int	_if_indexlim;
+	struct	knlist _ifklist;
+
+	struct	rtstat _rtstat;
+	struct	radix_node_head *_rt_tables[RT_MAXFIBS][AF_MAX+1];
+	int	_rttrash;
+
+	struct	ifnet *_loif;
+	LIST_HEAD(, lo_softc) _lo_list;
+
+	LIST_HEAD(, rawcb) _rawcb_list;
+
+	int	_ether_ipfw;
+};
+
+#endif
+
+/*
+ * Symbol translation macros
+ */
+#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	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_ */