PSARC 2009/373 Clearview IP Tunneling

PSARC 2009/410 Datalink Administration from Non-Global Zones
6858533 Clearview IP Tunneling
4861777 *snoop* cannot snoop on tunnel interfaces
5010680 M_IOCTL interface between ip and tun is horribly wrong
5029727 tun prints bogus debug messages when receiving multicast packets on 6to4 tunnels
6835873 dlpi_walk() silently fails in an exclusive zone
4152864 must not allow two tunnels to have the same tsrc/tdst pair
6855902 link and flow kstats are too promiscuous
6218826 need to be able to tunnel into a zone
4505468 network interface names can confuse, lie, and deceive
4524756 tun_wproc() takes up too much stack
6417373 tun_wproc_mdata assertion failures
4627970 scalability problems with IP in IP tunnels
4674797 ifparse_ifspec() will not correctly parse ipv6 tunnels
6509231 dladm should show links in exclusive stack zone
4793233 tun driver should include addr in DL_PHYS_ADDR_ACK for non-zero lengths
6795831 ZONE_*_DATALINK syscalls should take datalink_id_t as argument
6791472 mac module doesn't allow MAC addresses < 6 bytes
6618091 Race condition trips ASSERT() in tun.c's SIOCSLIFNAME path
6837580 bogus mi_active check in mac_set_mtu()
6868083 libinetutil: ofmt_open()'s template argument should be const
6870313 libdladm: needless dladm_init_linkprop() in i_dladm_aggr_up()
6872221 panic in dls_devnet_close() if "mtu" property is being set
4289774 Change to the interface-id does not change IPv6 link-local address
6873561 unable to create links with 31 character link names
6874666 changing a link property can accidentally destroy it
6874682 removing a link attribute corrupts the attribute list
6875167 IPCL_ISV6 conn flag is set but never used
6881764 itp reference leak in ipsec_construct_inverse_acquire()
6881951 dladm delete-vlan can no longer delete persistent-only VLANs

--HG--
rename : usr/src/uts/common/inet/tun.h => usr/src/uts/common/inet/iptun.h
rename : usr/src/uts/common/inet/ip/tun.c => usr/src/uts/common/inet/iptun/iptun.c
rename : usr/src/uts/intel/tun/Makefile => usr/src/uts/intel/iptun/Makefile
rename : usr/src/uts/sparc/tun/Makefile => usr/src/uts/sparc/iptun/Makefile

1 files changed, 24 insertions, 21 deletions

diff --git a/usr/src/uts/common/sys/netstack.h b/usr/src/uts/common/sys/netstack.h
index e44efab458..033adcb6aa 100644
--- a/usr/src/uts/common/sys/netstack.h
+++ b/usr/src/uts/common/sys/netstack.h
@@ -20,7 +20,7 @@
  */
 
 /*
- * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 #ifndef _SYS_NETSTACK_H
@@ -59,26 +59,27 @@ typedef id_t	netstackid_t;
  *
  * The order of these is important for some modules both for
  * the creation (which done in ascending order) and destruction (which is
- * done ine in decending order).
+ * done in in decending order).
  */
 #define	NS_ALL		-1	/* Match all */
-#define	NS_STR		0	/* autopush list etc */
-#define	NS_HOOK		1
-#define	NS_NETI		2
-#define	NS_ARP		3
-#define	NS_IP		4
-#define	NS_ICMP		5
-#define	NS_UDP		6
-#define	NS_TCP		7
-#define	NS_SCTP		8
-#define	NS_RTS		9
-#define	NS_IPSEC	10
-#define	NS_KEYSOCK	11
-#define	NS_SPDSOCK	12
-#define	NS_IPSECAH	13
-#define	NS_IPSECESP	14
-#define	NS_TUN		15
-#define	NS_IPNET	16
+#define	NS_DLS		0
+#define	NS_IPTUN	1
+#define	NS_STR		2	/* autopush list etc */
+#define	NS_HOOK		3
+#define	NS_NETI		4
+#define	NS_ARP		5
+#define	NS_IP		6
+#define	NS_ICMP		7
+#define	NS_UDP		8
+#define	NS_TCP		9
+#define	NS_SCTP		10
+#define	NS_RTS		11
+#define	NS_IPSEC	12
+#define	NS_KEYSOCK	13
+#define	NS_SPDSOCK	14
+#define	NS_IPSECAH	15
+#define	NS_IPSECESP	16
+#define	NS_IPNET	17
 #define	NS_MAX		(NS_IPNET+1)
 
 /*
@@ -136,6 +137,8 @@ struct netstack {
 	union {
 		void	*nu_modules[NS_MAX];
 		struct {
+			struct dls_stack	*nu_dls;
+			struct iptun_stack	*nu_iptun;
 			struct str_stack	*nu_str;
 			struct hook_stack	*nu_hook;
 			struct neti_stack	*nu_neti;
@@ -151,11 +154,12 @@ struct netstack {
 			struct spd_stack	*nu_spdsock;
 			struct ipsecah_stack	*nu_ipsecah;
 			struct ipsecesp_stack	*nu_ipsecesp;
-			struct tun_stack	*nu_tun;
 			struct ipnet_stack	*nu_ipnet;
 		} nu_s;
 	} netstack_u;
 #define	netstack_modules	netstack_u.nu_modules
+#define	netstack_dls		netstack_u.nu_s.nu_dls
+#define	netstack_iptun		netstack_u.nu_s.nu_iptun
 #define	netstack_str		netstack_u.nu_s.nu_str
 #define	netstack_hook		netstack_u.nu_s.nu_hook
 #define	netstack_neti		netstack_u.nu_s.nu_neti
@@ -171,7 +175,6 @@ struct netstack {
 #define	netstack_spdsock	netstack_u.nu_s.nu_spdsock
 #define	netstack_ipsecah	netstack_u.nu_s.nu_ipsecah
 #define	netstack_ipsecesp	netstack_u.nu_s.nu_ipsecesp
-#define	netstack_tun		netstack_u.nu_s.nu_tun
 #define	netstack_ipnet		netstack_u.nu_s.nu_ipnet
 
 	nm_state_t	netstack_m_state[NS_MAX]; /* module state */