--- a/usr/src/cmd/cmd-inet/usr.sbin/6to4relay.c	Wed Sep 23 09:09:49 2009 +0800
+++ b/usr/src/cmd/cmd-inet/usr.sbin/6to4relay.c	Tue Sep 22 22:04:45 2009 -0400
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,12 +19,10 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2002 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <sys/socket.h>
 #include <sys/stream.h>
 #include <sys/param.h>
@@ -34,7 +31,6 @@
 #include <net/if.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
-#include <inet/tun.h>
 
 #include <locale.h>
 
@@ -46,82 +42,15 @@
 #include <string.h>
 #include <stropts.h>
 #include <fcntl.h>
+#include <libdliptun.h>
 
-/*
- * Converts an IPv4 address to a 6to4 /64 route.  Address is of the form
- * 2002:<V4ADDR>:<SUBNETID>::/64 where SUBNETID will always be 0 and V4ADDR
- * equals the input IPv4 address.  IN6_V4ADDR_TO_6TO4(v4, v6) creates an
- * address of form 2002:<V4ADDR>:<SUBNETID>::<HOSTID>, where SUBNETID equals 0
- * and HOSTID equals 1.  For this route, we are not concerned about the
- * HOSTID portion of the address, thus it can be set to 0.
- *
- *  void V4ADDR_TO_6TO4_RT(const struct in_addr *v4, in6_addr_t *v6)
- */
-#define	V4ADDR_TO_6TO4_RT(v4, v6) \
-	(IN6_V4ADDR_TO_6TO4(v4, v6), (v6)->_S6_un._S6_u32[3] = 0)
-
-static void strioctl(int, void *, size_t);
-static void getkstatus(ipaddr_t *);
-static void printkstatus(void);
-static void modifyroute(unsigned int, in6_addr_t *);
-static void setkrraddr(ipaddr_t);
-static void printerror(char *);
 static void usage(void);
 
+static dladm_handle_t	handle;
 /* booleans corresponding to command line flags */
-static boolean_t eflag = B_FALSE;
-static boolean_t dflag = B_FALSE;
-static boolean_t aflag = B_FALSE;
-
-static int fd = -1;
-
-/*
- * srtioctl(cmd, buf, size)
- *
- * Passes the contents of 'buf' using the ioctl specified by 'cmd', by way of
- * the I_STR ioctl mechanism.  The response of the ioctl will be stored in buf
- * when this function returns.  The input 'size' specifies the size of the
- * buffer to be passed.
- */
-static void
-strioctl(int cmd, void *buf, size_t size)
-{
-	struct strioctl ioc;
-
-	(void) memset(&ioc, 0, sizeof (ioc));
-
-	ioc.ic_cmd = cmd;
-	ioc.ic_timout = 0;
-	ioc.ic_len = size;
-	ioc.ic_dp = (char *)buf;
-
-	if (ioctl(fd, I_STR, &ioc) < 0) {
-		printerror("ioctl (I_STR)");
-		(void) close(fd);
-		exit(EXIT_FAILURE);
-		/* NOTREACHED */
-	}
-}
-
-
-/*
- * getkstatus(out_addr)
- *
- * Queries the kernel for the 6to4 Relay Router destination address by sending
- * the SIOCG6TO4TUNRRADDR ioctl to the tunnel module using the I_STR ioctl
- * mechanism.  The value returned, through the ioctl, will be an ipaddr_t
- * embedded in a strioctl.  Output parameter is set with result.
- */
-static void
-getkstatus(ipaddr_t *out_addr)
-{
-	ipaddr_t an_addr;
-
-	/* Get the Relay Router address from the kernel */
-	strioctl(SIOCG6TO4TUNRRADDR, &an_addr, sizeof (an_addr));
-
-	*out_addr = an_addr;	/* set output parameter */
-}
+static boolean_t	eflag = B_FALSE;
+static boolean_t	dflag = B_FALSE;
+static boolean_t	aflag = B_FALSE;
 
 
 /*
@@ -135,12 +64,20 @@
 static void
 printkstatus(void)
 {
-	ipaddr_t rr_addr;
-	char buf[INET6_ADDRSTRLEN];
+	struct in_addr	rr_addr;
+	char		buf[INET6_ADDRSTRLEN];
+	char		errstr[DLADM_STRSIZE];
+	dladm_status_t	status;
 
-	getkstatus(&rr_addr);	/* get value from kernel */
+	status = dladm_iptun_get6to4relay(handle, &rr_addr);
+	if (status != DLADM_STATUS_OK) {
+		(void) fprintf(stderr, gettext("6to4relay: unable to get "
+		    "6to4 relay status: %s\n"),
+		    dladm_status2str(status, errstr));
+		return;
+	}
 	(void) printf("6to4relay: ");
-	if (rr_addr == INADDR_ANY) {
+	if (rr_addr.s_addr == INADDR_ANY) {
 		(void) printf(gettext("6to4 Relay Router communication "
 		    "support is disabled.\n"));
 	} else {
@@ -177,10 +114,9 @@
 
 	/* Open a routing socket for passing route commands */
 	if ((rtsock = socket(AF_ROUTE, SOCK_RAW, AF_INET)) < 0) {
-		printerror("socket");
-		(void) close(fd);
-		exit(EXIT_FAILURE);
-		/* NOTREACHED */
+		(void) fprintf(stderr, gettext("6to4relay: unable to modify "
+		    "default IPv6 route: socket: %s\n"), strerror(errno));
+		return;
 	}
 
 	(void) memset(&rt_msg, 0, sizeof (rt_msg));
@@ -222,48 +158,24 @@
 	(void) close(rtsock);
 }
 
-/*
- * setkrraddr(in_addr)
- *
- * Sets the 6to4 Relay Router destination address value in the kernel using
- * the SIOCS6TO4TUNRRADDR ioctl using the I_STR ioctl mechanism.
- * The address is sent to the kernel, as an ipaddr_t, embedded in an strioctl.
- */
-static void
-setkrraddr(ipaddr_t in_addr)
-{
-	/* set Relay Router address */
-	strioctl(SIOCS6TO4TUNRRADDR, &in_addr, sizeof (in_addr));
-}
-
-static void
-printerror(char *s)
-{
-	int sverrno = errno;
-
-	(void) fprintf(stderr, "6to4relay: ");
-	if (s != NULL)
-		(void) fprintf(stderr, "%s: ", s);
-	(void) fprintf(stderr, "%s\n", strerror(sverrno));
-}
-
 static void
 usage(void)
 {
 	(void) fprintf(stderr,
 	    gettext("usage:\n"
-		"\t6to4relay\n"
-		"\t6to4relay -e [-a <addr>]\n"
-		"\t6to4relay -d\n"
-		"\t6to4relay -h\n"));
+	    "\t6to4relay\n"
+	    "\t6to4relay -e [-a <addr>]\n"
+	    "\t6to4relay -d\n"
+	    "\t6to4relay -h\n"));
 }
 
 int
 main(int argc, char **argv)
 {
-	int ch;
-	char *in_addr = NULL;
-	int ret = EXIT_SUCCESS;
+	int		ch;
+	char		*relay_arg = NULL;
+	dladm_status_t	status;
+	char		errstr[DLADM_STRSIZE];
 
 	(void) setlocale(LC_ALL, "");
 
@@ -272,23 +184,18 @@
 #endif
 	(void) textdomain(TEXT_DOMAIN);
 
-	/* open /dev/ip for use */
-	if ((fd = open("/dev/ip", O_RDWR)) == -1) {
-		printerror(gettext("can't open /dev/ip"));
-		exit(EXIT_FAILURE);
+	if ((status = dladm_open(&handle)) != DLADM_STATUS_OK) {
+		(void) fprintf(stderr, gettext("6to4relay: error opening "
+		    "dladm handle: %s\n"), dladm_status2str(status, errstr));
+		return (EXIT_FAILURE);
 	}
 
-	if (ioctl(fd, I_PUSH, TUN_NAME) < 0) {
-		printerror("ioctl (I_PUSH)");
-		ret = EXIT_FAILURE;
-		goto done;
+	/* If no args are specified, print the current status. */
+	if (argc < 2) {
+		printkstatus();
+		return (EXIT_SUCCESS);
 	}
 
-	/* If no args are specified, print status as queried from kernel */
-	if (argc < 2) {
-		printkstatus();
-		goto done;
-	}
 	while ((ch = getopt(argc, argv, "ea:dh")) != EOF) {
 		switch (ch) {
 		case 'e':
@@ -299,15 +206,14 @@
 			break;
 		case 'a':
 			aflag = B_TRUE;
-			in_addr = optarg;
+			relay_arg = optarg;
 			break;
 		case 'h':
 			usage();
-			goto done;
+			return (EXIT_SUCCESS);
 		default:
 			usage();
-			ret = EXIT_FAILURE;
-			goto done;
+			return (EXIT_FAILURE);
 		}
 	}
 	/*
@@ -316,16 +222,15 @@
 	 */
 	if ((aflag && !eflag) || (eflag && dflag)) {
 		usage();
-		ret = EXIT_FAILURE;
-		goto done;
+		return (EXIT_FAILURE);
 	}
 
 	/*
 	 * Enable Relay Router communication support in the kernel.
 	 */
 	if (eflag) {
-		struct in_addr current_addr; /* addr currently set in kernel */
-		struct in_addr new_addr; /* new addr we plan to set */
+		struct in_addr current_addr;
+		struct in_addr new_addr;
 		in6_addr_t v6_rt;
 
 		/*
@@ -334,92 +239,79 @@
 		 */
 		if (!aflag) {
 			new_addr.s_addr = htonl(INADDR_6TO4RRANYCAST);
-
-		} else if (inet_pton(AF_INET, in_addr, &new_addr) <= 0) {
+		} else if (inet_pton(AF_INET, relay_arg, &new_addr) <= 0) {
 			(void) fprintf(stderr, gettext("6to4relay: input "
 			    "address (%s) is not a valid IPv4 dotted-decimal "
-			    "string.\n"), in_addr);
-			ret = EXIT_FAILURE;
-			goto done;
+			    "string.\n"), relay_arg);
+			return (EXIT_FAILURE);
 		}
 
-		/*
-		 * INADDR_ANY has special meaning in the kernel, reject this
-		 * input and exit.
-		 */
-		if (new_addr.s_addr == INADDR_ANY) {
-			(void) fprintf(stderr, gettext("6to4relay: input "
-			    "(0.0.0.0) is not a valid IPv4 unicast "
-			    "address.\n"));
-			ret = EXIT_FAILURE;
-			goto done;
+		status = dladm_iptun_get6to4relay(handle, &current_addr);
+		if (status != DLADM_STATUS_OK) {
+			(void) fprintf(stderr, gettext("6to4relay: "
+			    "unable to obtain current 6to4 relay address: %s"),
+			    dladm_status2str(status, errstr));
+			return (EXIT_FAILURE);
 		}
 
-		/*
-		 * get the current Relay Router address from the kernel.
-		 *
-		 * 1. If the current address is INADDR_ANY, set the new
-		 *    address in the kernel and add a default IPv6 route using
-		 *    the new address.
-		 *
-		 * 2. If the current address is different than the new address,
-		 *    set the new address in the kernel, delete the
-		 *    old default IPv6 route and add a new default IPv6 route
-		 *    (using the new address).
-		 *
-		 * 3. If the kernel address is the same as the one we are
-		 *    adding, no additional processing is needed.
-		 */
-		getkstatus(&current_addr.s_addr);
+		if (current_addr.s_addr == new_addr.s_addr)
+			return (EXIT_SUCCESS);
 
-		if (current_addr.s_addr == INADDR_ANY) {
-			setkrraddr(new_addr.s_addr);
-			V4ADDR_TO_6TO4_RT(&new_addr, &v6_rt);
-			modifyroute(RTM_ADD, &v6_rt);
-		} else if (new_addr.s_addr != current_addr.s_addr) {
-			setkrraddr(new_addr.s_addr);
+		status = dladm_iptun_set6to4relay(handle, &new_addr);
+		if (status != DLADM_STATUS_OK) {
+			(void) fprintf(stderr, gettext("6to4relay: "
+			    "unable to set the 6to4 relay router address: "
+			    "%s\n"), dladm_status2str(status, errstr));
+			return (EXIT_FAILURE);
+		}
+
+		if (current_addr.s_addr != INADDR_ANY) {
 			/* remove old default IPv6 route */
-			V4ADDR_TO_6TO4_RT(&current_addr, &v6_rt);
+			IN6_V4ADDR_TO_6TO4(&current_addr, &v6_rt);
 			modifyroute(RTM_DELETE, &v6_rt);
-			/*
-			 * Add new default IPv6 route using a 6to4 address
-			 * created from the address we just set in the kernel.
-			 */
-			V4ADDR_TO_6TO4_RT(&new_addr, &v6_rt);
-			modifyroute(RTM_ADD, &v6_rt);
 		}
+
+		IN6_V4ADDR_TO_6TO4(&new_addr, &v6_rt);
+		modifyroute(RTM_ADD, &v6_rt);
 	}
 
 	/*
 	 * Disable Relay Router communication support in kernel.
 	 */
 	if (dflag) {
-		struct in_addr current_addr; /* addr currently set in kernel */
+		struct in_addr rr_addr;
 		in6_addr_t v6_rt;
 
 		/*
 		 * get Relay Router address from the kernel and delete
 		 * default IPv6 route that was added for it.
 		 */
-		getkstatus(&current_addr.s_addr);
-		if (current_addr.s_addr == INADDR_ANY) {
-			/*
-			 * Feature is already disabled in kernel, no
-			 * additional processing is needed.
-			 */
-			goto done;
+		status = dladm_iptun_get6to4relay(handle, &rr_addr);
+		if (status != DLADM_STATUS_OK) {
+			(void) fprintf(stderr, gettext("6to4relay: "
+			    "unable to obtain current 6to4 relay address: %s"),
+			    dladm_status2str(status, errstr));
+			return (EXIT_FAILURE);
 		}
+		if (rr_addr.s_addr == INADDR_ANY)
+			return (EXIT_SUCCESS);
 
-		V4ADDR_TO_6TO4_RT(&current_addr, &v6_rt);
+		IN6_V4ADDR_TO_6TO4(&rr_addr, &v6_rt);
 		modifyroute(RTM_DELETE, &v6_rt);
 
 		/*
 		 * INADDR_ANY (0.0.0.0) is used by the kernel to disable Relay
 		 * Router communication support.
 		 */
-		setkrraddr(INADDR_ANY);
+		rr_addr.s_addr = INADDR_ANY;
+		status = dladm_iptun_set6to4relay(handle, &rr_addr);
+		if (status != DLADM_STATUS_OK) {
+			(void) fprintf(stderr, gettext("6to4relay: "
+			    "unable to disable tunneling to 6to4 relay router: "
+			    "%s\n"), dladm_status2str(status, errstr));
+			return (EXIT_FAILURE);
+		}
 	}
-done:
-	(void) close(fd);
-	return (ret);
+
+	return (EXIT_SUCCESS);
 }

--- a/usr/src/cmd/cmd-inet/usr.sbin/Makefile	Wed Sep 23 09:09:49 2009 +0800
+++ b/usr/src/cmd/cmd-inet/usr.sbin/Makefile	Tue Sep 22 22:04:45 2009 -0400
@@ -54,6 +54,7 @@
 CMDPROG=	in.telnetd
 K5PROGS=	in.telnetd in.rlogind in.rshd
 TSNETPROG=	route
+DLADMPROG=	6to4relay ndd
 DEFAULTFILES=	telnetd.dfl
 
 PROGSRCS=	$(PROG:%=%.c)
@@ -144,12 +145,12 @@
 				-I$(SRC)/lib/pam_modules/krb5
 LDLIBS +=	$(K5LIBS)
 $(TSNETPROG)		:=	LDLIBS += -ltsnet
+$(DLADMPROG)		:=	LDLIBS += -ldladm
 
 in.rarpd		:=	LDLIBS += -linetutil -ldlpi
 if_mpadm		:=	LDLIBS += -linetutil -lipmp
 if_mpadm.po		:=	XGETFLAGS += -a
 route			:=	CPPFLAGS += -DNDEBUG
-ndd			:=	LDLIBS += -ldladm
 gettable in.comsat	:=	LDFLAGS += $(MAPFILE.NGB:%=-M%)
 
 .KEEP_STATE:
@@ -227,7 +228,7 @@
 	-$(RM) $(CLEANFILES) $(CLOBBERFILES)
 
 lint: $(LINTSUBDIRS)
-	$(LINT.c) 6to4relay.c $(LDLIBS) -lsocket -lnsl
+	$(LINT.c) 6to4relay.c $(LDLIBS) -lsocket -ldladm
 	$(LINT.c) arp.c $(LDLIBS) -lsocket -lnsl
 	@# $(LINT.c) in.rexecd.c $(LDLIBS) -lbsm -lpam
 	$(LINT.c) -erroff=E_NAME_USED_NOT_DEF2 -erroff=E_NAME_DEF_NOT_USED2 \

--- a/usr/src/cmd/cmd-inet/usr.sbin/ifconfig/Makefile	Wed Sep 23 09:09:49 2009 +0800
+++ b/usr/src/cmd/cmd-inet/usr.sbin/ifconfig/Makefile	Tue Sep 22 22:04:45 2009 -0400
@@ -37,7 +37,7 @@
 SRCS=		$(LOCALSRCS) $(COMMONSRCS)
 
 CPPFLAGS +=	-I$(CMDINETCOMMONDIR) -I$(SRC)/common/net/dhcp
-LDLIBS +=       -ldhcpagent -ldlpi -linetutil -linetcfg -lipmp -ldladm
+LDLIBS +=       -ldhcpagent -ldlpi -linetutil -lipmp -ldladm
 LINTFLAGS +=	-m
 
 ROOTUSRSBINLINKS = $(PROG:%=$(ROOTUSRSBIN)/%)

--- a/usr/src/cmd/cmd-inet/usr.sbin/ifconfig/defs.h	Wed Sep 23 09:09:49 2009 +0800
+++ b/usr/src/cmd/cmd-inet/usr.sbin/ifconfig/defs.h	Tue Sep 22 22:04:45 2009 -0400
@@ -54,7 +54,6 @@
 
 #include <ipmp_mpathd.h>
 #include <ipmp_admin.h>
-#include <inetcfg.h>
 #include <libinetutil.h>
 #include <alloca.h>
 

--- a/usr/src/cmd/cmd-inet/usr.sbin/ifconfig/ifconfig.c	Wed Sep 23 09:09:49 2009 +0800
+++ b/usr/src/cmd/cmd-inet/usr.sbin/ifconfig/ifconfig.c	Tue Sep 22 22:04:45 2009 -0400
@@ -14,15 +14,14 @@
 #include <compat.h>
 #include <libdlpi.h>
 #include <libdllink.h>
+#include <libdliptun.h>
+#include <libdllink.h>
 #include <inet/ip.h>
 #include <inet/ipsec_impl.h>
 
 #define	LOOPBACK_IF	"lo0"
 #define	NONE_STR	"none"
 #define	ARP_MOD_NAME	"arp"
-#define	TUN_NAME	"tun"
-#define	ATUN_NAME	"atun"
-#define	TUN6TO4_NAME	"6to4tun"
 #define	IPMPSTUB	(void *)-1
 
 typedef struct if_flags {
@@ -84,12 +83,16 @@
 	{  NULL,		0,			0 }
 };
 
-static struct	lifreq lifr;
+static dladm_handle_t	dlh;
+boolean_t		dlh_opened;
+static struct		lifreq lifr;
 /* current interface name a particular function is accessing */
-static char	name[LIFNAMSIZ];
+static char		name[LIFNAMSIZ];
 /* foreach interface saved name */
-static char	origname[LIFNAMSIZ];
-static int	setaddr;
+static char		origname[LIFNAMSIZ];
+static int		setaddr;
+static boolean_t	ipsec_policy_set;
+static boolean_t	ipsec_auth_covered;
 
 /*
  * Make sure the algorithm variables hold more than the sizeof an algorithm
@@ -176,10 +179,9 @@
 static int	in_getprefixlen(char *addr, boolean_t slash, int plen);
 static boolean_t	in_prefixlentomask(int prefixlen, int maxlen,
 			    uchar_t *mask);
-static int	settaddr(char *, int (*)(icfg_handle_t,
-			    const struct sockaddr *, socklen_t));
 static void	status(void);
 static void	ifstatus(const char *);
+static void	tun_status(datalink_id_t);
 static void	usage(void);
 static int	strioctl(int s, int cmd, void *buf, int buflen);
 static int	setifdhcp(const char *caller, const char *ifname,
@@ -187,9 +189,7 @@
 static int	ip_domux2fd(int *, int *, int *, int *, int *);
 static int	ip_plink(int, int, int, int, int);
 static int	modop(char *arg, char op);
-static int	find_all_global_interfaces(struct lifconf *lifcp, char **buf,
-		    int64_t lifc_flags);
-static int	find_all_zone_interfaces(struct lifconf *lifcp, char **buf,
+static int	find_all_interfaces(struct lifconf *lifcp, char **buf,
 		    int64_t lifc_flags);
 static int	create_ipmp(const char *grname, int af, const char *ifname,
 		    boolean_t implicit);
@@ -197,6 +197,9 @@
 static void	start_ipmp_daemon(void);
 static boolean_t ifaddr_up(ifaddrlistx_t *ifaddrp);
 static boolean_t ifaddr_down(ifaddrlistx_t *ifaddrp);
+static dladm_status_t	ifconfig_dladm_open(const char *, datalink_class_t,
+		    datalink_id_t *);
+static void	dladmerr_exit(dladm_status_t status, const char *str);
 
 #define	max(a, b)	((a) < (b) ? (b) : (a))
 
@@ -359,8 +362,8 @@
 int
 main(int argc, char *argv[])
 {
-	int64_t lifc_flags;
-	char *default_ip_str;
+	int64_t		lifc_flags;
+	char		*default_ip_str;
 
 	lifc_flags = LIFC_NOXMIT|LIFC_TEMPORARY|LIFC_ALLZONES|LIFC_UNDER_IPMP;
 
@@ -510,23 +513,12 @@
 	buf = NULL;
 	/*
 	 * Special case:
-	 * ifconfig -a plumb should find all network interfaces
-	 * in the machine for the global zone.
-	 * For non-global zones, only find the assigned interfaces.
-	 * Also, there is no need to  SIOCGLIF* ioctls, since
-	 * those interfaces have already been plumbed
+	 * ifconfig -a plumb should find all network interfaces in the current
+	 * zone.
 	 */
 	if (argc > 0 && (strcmp(*argv, "plumb") == 0)) {
-		if (getzoneid() == GLOBAL_ZONEID) {
-			if (find_all_global_interfaces(&lifc, &buf,
-			    lifc_flags) != 0)
-				return;
-		} else {
-			if (find_all_zone_interfaces(&lifc, &buf,
-			    lifc_flags) != 0)
-				return;
-		}
-		if (lifc.lifc_len == 0)
+		if (find_all_interfaces(&lifc, &buf, lifc_flags) != 0 ||
+		    lifc.lifc_len == 0)
 			return;
 		plumball = 1;
 	} else {
@@ -659,38 +651,6 @@
 		free(buf);
 }
 
-static void
-tun_reality_check(void)
-{
-	struct iftun_req treq;
-	ipsec_req_t *ipsr;
-
-	(void) strncpy(treq.ifta_lifr_name, name, sizeof (treq.ifta_lifr_name));
-	if (strchr(name, ':') != NULL) {
-		/* Return, we don't need to check. */
-		return;
-	}
-	if (ioctl(s, SIOCGTUNPARAM, (caddr_t)&treq) < 0 ||
-	    !(treq.ifta_flags & IFTUN_SECURITY) ||
-	    (treq.ifta_flags & IFTUN_COMPLEX_SECURITY)) {
-		/*
-		 * Either not a tunnel (the SIOCGTUNPARAM fails on
-		 * non-tunnels), the security flag is not set, or
-		 * this is a tunnel with ipsecconf(1M)-set policy.
-		 * Regardless, return.
-		 */
-		return;
-	}
-
-	ipsr = (ipsec_req_t *)&treq.ifta_secinfo;
-
-	if (ipsr->ipsr_esp_req != 0 &&
-	    ipsr->ipsr_esp_auth_alg == SADB_AALG_NONE &&
-	    ipsr->ipsr_ah_req == 0)
-		(void) fprintf(stderr, "ifconfig: WARNING - tunnel with "
-		    "only ESP and no authentication.\n");
-}
-
 /*
  * for the specified interface call (*func)(argc, argv, af, lifrp).
  */
@@ -869,7 +829,10 @@
 	}
 
 	/* Check to see if there's a security hole in the tunnel setup. */
-	tun_reality_check();
+	if (ipsec_policy_set && !ipsec_auth_covered) {
+		(void) fprintf(stderr, "ifconfig: WARNING: tunnel with only "
+		    "ESP and no authentication.\n");
+	}
 }
 
 /* ARGSUSED */
@@ -1061,7 +1024,7 @@
  * this isn't common to ipseckey.c.
  *
  * NOTE: Static buffer in this function for the return value.  Since ifconfig
- *	 isn't multithreaded, this isn't a huge problem.
+ *       isn't multithreaded, this isn't a huge problem.
  */
 
 #define	NBUF_SIZE 20	/* Enough to print a large integer. */
@@ -1146,52 +1109,34 @@
 
 enum ipsec_alg_type { ESP_ENCR_ALG = 1, ESP_AUTH_ALG, AH_AUTH_ALG };
 
-boolean_t first_set_tun = _B_TRUE;
-boolean_t encr_alg_set = _B_FALSE;
-
-/*
- * Need global for multiple calls to set_tun_algs
- * because we accumulate algorithm selections over
- * the lifetime of this ifconfig(1M) invocation.
- */
-static struct iftun_req treq_tun;
-
 static int
 set_tun_algs(int which_alg, int alg)
 {
-	ipsec_req_t *ipsr;
-
-	(void) strncpy(treq_tun.ifta_lifr_name, name,
-	    sizeof (treq_tun.ifta_lifr_name));
-	if (strchr(name, ':') != NULL) {
-		errno = EPERM;
-		Perror0_exit("Tunnel params on logical interfaces");
-	}
-	if (ioctl(s, SIOCGTUNPARAM, (caddr_t)&treq_tun) < 0) {
-		if (errno == EOPNOTSUPP || errno == EINVAL)
-			Perror0_exit("Not a tunnel");
-		else Perror0_exit("SIOCGTUNPARAM");
-	}
-
-	ipsr = (ipsec_req_t *)&treq_tun.ifta_secinfo;
-
-	if (treq_tun.ifta_vers != IFTUN_VERSION) {
-		(void) fprintf(stderr,
-		    "Kernel tunnel secinfo version mismatch.\n");
-		exit(1);
-	}
+	boolean_t	encr_alg_set = _B_FALSE;
+	iptun_params_t	params;
+	dladm_status_t	status;
+	ipsec_req_t	*ipsr;
+
+	if ((status = ifconfig_dladm_open(name, DATALINK_CLASS_IPTUN,
+	    &params.iptun_param_linkid)) != DLADM_STATUS_OK)
+		goto done;
+
+	status = dladm_iptun_getparams(dlh, &params, DLADM_OPT_ACTIVE);
+	if (status != DLADM_STATUS_OK)
+		goto done;
+
+	ipsr = &params.iptun_param_secinfo;
 
 	/*
 	 * If I'm just starting off this ifconfig, I want a clean slate,
 	 * otherwise, I've captured the current tunnel security settings.
 	 * In the case of continuation, I merely add to the settings.
 	 */
-	if (first_set_tun) {
-		first_set_tun = _B_FALSE;
+	if (!(params.iptun_param_flags & IPTUN_PARAM_SECINFO))
 		(void) memset(ipsr, 0, sizeof (*ipsr));
-	}
-
-	treq_tun.ifta_flags = IFTUN_SECURITY;
+
+	/* We're only modifying the IPsec information */
+	params.iptun_param_flags = IPTUN_PARAM_SECINFO;
 
 	switch (which_alg) {
 	case ESP_ENCR_ALG:
@@ -1243,11 +1188,19 @@
 		/* Will never hit DEFAULT */
 	}
 
-	if (ioctl(s, SIOCSTUNPARAM, (caddr_t)&treq_tun) < 0) {
-		Perror2_exit("set tunnel security properties",
-		    treq_tun.ifta_lifr_name);
+	status = dladm_iptun_modify(dlh, &params, DLADM_OPT_ACTIVE);
+
+done:
+	if (status != DLADM_STATUS_OK)
+		dladmerr_exit(status, name);
+	else {
+		ipsec_policy_set = _B_TRUE;
+		if ((ipsr->ipsr_esp_req != 0 &&
+		    ipsr->ipsr_esp_auth_alg != SADB_AALG_NONE) ||
+		    (ipsr->ipsr_ah_req != 0 &&
+		    ipsr->ipsr_auth_alg != SADB_AALG_NONE))
+			ipsec_auth_covered = _B_TRUE;
 	}
-
 	return (0);
 }
 
@@ -1678,10 +1631,7 @@
 static void
 print_ifether(char *ifname)
 {
-	int		protocol;
-	icfg_if_t	interface;
-	icfg_handle_t	handle;
-	int		fd;
+	int fd;
 
 	(void) strncpy(lifr.lifr_name, name, sizeof (lifr.lifr_name));
 
@@ -1704,36 +1654,19 @@
 	if (lifr.lifr_flags & (IFF_VIRTUAL|IFF_IPMP))
 		return;
 
-	/*
-	 * We must be careful to set if_protocol based on the current
-	 * properties of the interface.  For instance, if "ip.tun0" is
-	 * configured only as an IPv6 tunnel, then if_protocol must be
-	 * set to AF_INET6 or icfg_get_tunnel_lower() will fail and
-	 * we will falsely conclude that it's not a tunnel.
-	 */
-	interface.if_protocol = AF_INET;
-	if (lifr.lifr_flags & IFF_IPV6)
-		interface.if_protocol = AF_INET6;
-
-	(void) strncpy(interface.if_name, ifname, sizeof (interface.if_name));
-
-	if (icfg_open(&handle, &interface) == ICFG_SUCCESS) {
-		if (icfg_get_tunnel_lower(handle, &protocol) == ICFG_SUCCESS) {
-			/* Tunnel op succeeded -- it's a tunnel so skip */
-			icfg_close(handle);
-			return;
-		}
-		icfg_close(handle);
-	}
+	/* IP tunnels also don't have Ethernet-like MAC addresses */
+	if (ifconfig_dladm_open(ifname, DATALINK_CLASS_IPTUN, NULL) ==
+	    DLADM_STATUS_OK)
+		return;
 
 	dlpi_print_address(ifname);
 }
 
 /*
- * static int find_all_global_interfaces(struct lifconf *lifcp, char **buf,
+ * static int find_all_interfaces(struct lifconf *lifcp, char **buf,
  *     int64_t lifc_flags)
  *
- * It finds all data links for the global zone.
+ * It finds all active data links.
  *
  * It takes in input a pointer to struct lifconf to receive interfaces
  * informations, a **char to hold allocated buffer, and a lifc_flags.
@@ -1743,32 +1676,23 @@
  * -1 = problem
  */
 static int
-find_all_global_interfaces(struct lifconf *lifcp, char **buf,
-    int64_t lifc_flags)
+find_all_interfaces(struct lifconf *lifcp, char **buf, int64_t lifc_flags)
 {
 	unsigned bufsize;
 	int n;
 	ni_t *nip;
 	struct lifreq *lifrp;
-	dladm_handle_t dld_handle;
 	dladm_status_t status;
-	char errmsg[DLADM_STRSIZE];
-
-	if ((status = dladm_open(&dld_handle)) != DLADM_STATUS_OK) {
-		(void) fprintf(stderr,
-		    "ifconfig: find_all_global_interfaces failed: %s\n",
-		    dladm_status2str(status, errmsg));
-		return (-1);
+
+	if (!dlh_opened) {
+		status = ifconfig_dladm_open(NULL, 0, NULL);
+		if (status != DLADM_STATUS_OK)
+			dladmerr_exit(status, "unable to open dladm handle");
 	}
 
-	(void) dlpi_walk(ni_entry, dld_handle, 0);
-
-	dladm_close(dld_handle);
-
-	/*
-	 * Now, translate the linked list into
-	 * a struct lifreq buffer
-	 */
+	(void) dlpi_walk(ni_entry, dlh, 0);
+
+	/* Now, translate the linked list into a struct lifreq buffer */
 	if (num_ni == 0) {
 		lifcp->lifc_family = AF_UNSPEC;
 		lifcp->lifc_flags = lifc_flags;
@@ -1797,92 +1721,6 @@
 }
 
 /*
- * static int find_all_zone_interfaces(struct lifconf *lifcp, char **buf,
- *     int64_t lifc_flags)
- *
- * It finds all interfaces for an exclusive-IP zone, that is all the interfaces
- * assigned to it.
- *
- * It takes in input a pointer to struct lifconf to receive interfaces
- * informations, a **char to hold allocated buffer, and a lifc_flags.
- *
- * Return values:
- *  0 = everything OK
- * -1 = problem
- */
-static int
-find_all_zone_interfaces(struct lifconf *lifcp, char **buf, int64_t lifc_flags)
-{
-	zoneid_t zoneid;
-	unsigned bufsize;
-	char *dlnames, *ptr;
-	struct lifreq *lifrp;
-	int num_ni_saved, i;
-
-	zoneid = getzoneid();
-
-	num_ni = 0;
-	if (zone_list_datalink(zoneid, &num_ni, NULL) != 0)
-		Perror0_exit("find_all_interfaces: list interfaces failed");
-again:
-	/* this zone doesn't have any data-links */
-	if (num_ni == 0) {
-		lifcp->lifc_family = AF_UNSPEC;
-		lifcp->lifc_flags = lifc_flags;
-		lifcp->lifc_len = 0;
-		lifcp->lifc_buf = NULL;
-		return (0);
-	}
-
-	dlnames = malloc(num_ni * LIFNAMSIZ);
-	if (dlnames == NULL)
-		Perror0_exit("find_all_interfaces: out of memory");
-	num_ni_saved = num_ni;
-
-	if (zone_list_datalink(zoneid, &num_ni, dlnames) != 0)
-		Perror0_exit("find_all_interfaces: list interfaces failed");
-
-	if (num_ni_saved < num_ni) {
-		/* list increased, try again */
-		free(dlnames);
-		goto again;
-	}
-
-	/* this zone doesn't have any data-links now */
-	if (num_ni == 0) {
-		free(dlnames);
-		lifcp->lifc_family = AF_UNSPEC;
-		lifcp->lifc_flags = lifc_flags;
-		lifcp->lifc_len = 0;
-		lifcp->lifc_buf = NULL;
-		return (0);
-	}
-
-	bufsize = num_ni * sizeof (struct lifreq);
-	if ((*buf = malloc(bufsize)) == NULL) {
-		free(dlnames);
-		Perror0_exit("find_all_interfaces: malloc failed");
-	}
-
-	lifrp = (struct lifreq *)*buf;
-	ptr = dlnames;
-	for (i = 0; i < num_ni; i++) {
-		if (strlcpy(lifrp->lifr_name, ptr, LIFNAMSIZ) >=
-		    LIFNAMSIZ)
-			Perror0_exit("find_all_interfaces: overflow");
-		ptr += LIFNAMSIZ;
-		lifrp++;
-	}
-
-	free(dlnames);
-	lifcp->lifc_family = AF_UNSPEC;
-	lifcp->lifc_flags = lifc_flags;
-	lifcp->lifc_len = bufsize;
-	lifcp->lifc_buf = *buf;
-	return (0);
-}
-
-/*
  * Create the next unused logical interface using the original name
  * and assign the address (and mask if '/<n>' is part of the address).
  * Use the new logical interface for subsequent subcommands by updating
@@ -2619,10 +2457,7 @@
 	 */
 	if (op == MODREMOVE_OP &&
 	    (strcmp(mod.mod_name, ARP_MOD_NAME) == 0 ||
-	    strcmp(mod.mod_name, IP_MOD_NAME) == 0 ||
-	    strcmp(mod.mod_name, TUN_NAME) == 0 ||
-	    strcmp(mod.mod_name, ATUN_NAME) == 0 ||
-	    strcmp(mod.mod_name, TUN6TO4_NAME) == 0)) {
+	    strcmp(mod.mod_name, IP_MOD_NAME) == 0)) {
 		(void) fprintf(stderr, "ifconfig: cannot remove %s\n",
 		    mod.mod_name);
 		exit(1);
@@ -2668,6 +2503,19 @@
 	    orig_arpid));
 }
 
+static int
+modify_tun(iptun_params_t *params)
+{
+	dladm_status_t status;
+
+	if ((status = ifconfig_dladm_open(name, DATALINK_CLASS_IPTUN,
+	    &params->iptun_param_linkid)) == DLADM_STATUS_OK)
+		status = dladm_iptun_modify(dlh, params, DLADM_OPT_ACTIVE);
+	if (status != DLADM_STATUS_OK)
+		dladmerr_exit(status, name);
+	return (0);
+}
+
 /*
  * Set tunnel source address
  */
@@ -2675,7 +2523,12 @@
 static int
 setiftsrc(char *addr, int64_t param)
 {
-	return (settaddr(addr, icfg_set_tunnel_src));
+	iptun_params_t params;
+
+	params.iptun_param_flags = IPTUN_PARAM_LADDR;
+	(void) strlcpy(params.iptun_param_laddr, addr,
+	    sizeof (params.iptun_param_laddr));
+	return (modify_tun(&params));
 }
 
 /*
@@ -2685,56 +2538,27 @@
 static int
 setiftdst(char *addr, int64_t param)
 {
-	return (settaddr(addr, icfg_set_tunnel_dest));
+	iptun_params_t params;
+
+	params.iptun_param_flags = IPTUN_PARAM_RADDR;
+	(void) strlcpy(params.iptun_param_raddr, addr,
+	    sizeof (params.iptun_param_raddr));
+	return (modify_tun(&params));
 }
 
-/*
- * sets tunnels src|dst address.  settaddr() expects the following:
- * addr: Points to a printable string containing the address to be
- *       set, e.g. 129.153.128.110.
- * fn:   Pointer to a libinetcfg routine that will do the actual work.
- *       The only valid functions are icfg_set_tunnel_src and
- *       icfg_set_tunnel_dest.
- */
 static int
-settaddr(char *addr,
-    int (*fn)(icfg_handle_t, const struct sockaddr *, socklen_t))
+set_tun_prop(const char *propname, char *value)
 {
-	icfg_handle_t handle;
-	icfg_if_t interface;
-	struct sockaddr_storage laddr;
-	int lower;
-	int rc;
-
-	if (strchr(name, ':') != NULL) {
-		errno = EPERM;
-		Perror0_exit("Tunnel params on logical interfaces");
+	dladm_status_t	status;
+	datalink_id_t	linkid;
+
+	status = ifconfig_dladm_open(name, DATALINK_CLASS_IPTUN, &linkid);
+	if (status == DLADM_STATUS_OK) {
+		status = dladm_set_linkprop(dlh, linkid, propname, &value, 1,
+		    DLADM_OPT_ACTIVE);
 	}
-	(void) strncpy(interface.if_name, name, sizeof (interface.if_name));
-	interface.if_protocol = SOCKET_AF(af);
-
-	/* Open interface. */
-	if ((rc = icfg_open(&handle, &interface)) != ICFG_SUCCESS)
-		Perror0_exit((char *)icfg_errmsg(rc));
-
-	rc = icfg_get_tunnel_lower(handle, &lower);
-	if (rc != ICFG_SUCCESS)
-		Perror0_exit((char *)icfg_errmsg(rc));
-
-	if (lower == AF_INET) {
-		in_getaddr(addr, (struct sockaddr *)&laddr, NULL);
-	} else {
-		in6_getaddr(addr, (struct sockaddr *)&laddr, NULL);
-	}
-
-	/* Call fn to do the real work, and close the interface. */
-	rc = (*fn)(handle, (struct sockaddr *)&laddr,
-	    sizeof (struct sockaddr_storage));
-	icfg_close(handle);
-
-	if (rc != ICFG_SUCCESS)
-		Perror0_exit((char *)icfg_errmsg(rc));
-
+	if (status != DLADM_STATUS_OK)
+		dladmerr_exit(status, name);
 	return (0);
 }
 
@@ -2743,35 +2567,7 @@
 static int
 set_tun_encap_limit(char *arg, int64_t param)
 {
-	short limit;
-	icfg_if_t interface;
-	icfg_handle_t handle;
-	int rc;
-
-	if (strchr(name, ':') != NULL) {
-		errno = EPERM;
-		Perror0_exit("Tunnel params on logical interfaces");
-	}
-
-	if ((sscanf(arg, "%hd", &limit) != 1) || (limit < 0) ||
-	    (limit > 255)) {
-		errno = EINVAL;
-		Perror0_exit("Invalid encapsulation limit");
-	}
-
-	/* Open interface for configuration. */
-	(void) strncpy(interface.if_name, name, sizeof (interface.if_name));
-	interface.if_protocol = SOCKET_AF(af);
-	if (icfg_open(&handle, &interface) != ICFG_SUCCESS)
-		Perror0_exit("couldn't open interface");
-
-	rc = icfg_set_tunnel_encaplimit(handle, (int)limit);
-	icfg_close(handle);
-
-	if (rc != ICFG_SUCCESS)
-		Perror0_exit("Could not configure tunnel encapsulation limit");
-
-	return (0);
+	return (set_tun_prop("encaplimit", arg));
 }
 
 /* Disable encapsulation limit. */
@@ -2779,28 +2575,7 @@
 static int
 clr_tun_encap_limit(char *arg, int64_t param)
 {
-	icfg_if_t interface;
-	icfg_handle_t handle;
-	int rc;
-
-	if (strchr(name, ':') != NULL) {
-		errno = EPERM;
-		Perror0_exit("Tunnel params on logical interfaces");
-	}
-
-	/* Open interface for configuration. */
-	(void) strncpy(interface.if_name, name, sizeof (interface.if_name));
-	interface.if_protocol = SOCKET_AF(af);
-	if (icfg_open(&handle, &interface) != ICFG_SUCCESS)
-		Perror0_exit("couldn't open interface");
-
-	rc = icfg_set_tunnel_encaplimit(handle, -1);
-	icfg_close(handle);
-
-	if (rc != ICFG_SUCCESS)
-		Perror0_exit((char *)icfg_errmsg(rc));
-
-	return (0);
+	return (set_tun_encap_limit("-1", 0));
 }
 
 /* Set tunnel hop limit. */
@@ -2808,37 +2583,7 @@
 static int
 set_tun_hop_limit(char *arg, int64_t param)
 {
-	unsigned short limit;
-	icfg_if_t interface;
-	icfg_handle_t handle;
-	int rc;
-
-	if (strchr(name, ':') != NULL) {
-		errno = EPERM;
-		Perror0_exit("Tunnel params on logical interfaces");
-	}
-
-	/*
-	 * Check limit here since it's really only an 8-bit unsigned quantity.
-	 */
-	if ((sscanf(arg, "%hu", &limit) != 1) || (limit > 255)) {
-		errno = EINVAL;
-		Perror0_exit("Invalid hop limit");
-	}
-
-	/* Open interface for configuration. */
-	(void) strncpy(interface.if_name, name, sizeof (interface.if_name));
-	interface.if_protocol = SOCKET_AF(af);
-	if (icfg_open(&handle, &interface) != ICFG_SUCCESS)
-		Perror0_exit("couldn't open interface");
-
-	rc = icfg_set_tunnel_hoplimit(handle, (uint8_t)limit);
-	icfg_close(handle);
-
-	if (rc != ICFG_SUCCESS)
-		Perror0_exit("Could not configure tunnel hop limit");
-
-	return (0);
+	return (set_tun_prop("hoplimit", arg));
 }
 
 /* Set zone ID */
@@ -3066,8 +2811,9 @@
 static void
 status(void)
 {
-	struct afswtch *p = afp;
-	uint64_t flags;
+	struct afswtch	*p = afp;
+	uint64_t	flags;
+	datalink_id_t	linkid;
 
 	(void) strncpy(lifr.lifr_name, name, sizeof (lifr.lifr_name));
 	if (ioctl(s, SIOCGLIFFLAGS, (caddr_t)&lifr) < 0) {
@@ -3094,6 +2840,10 @@
 
 	ifstatus(name);
 
+	if (ifconfig_dladm_open(name, DATALINK_CLASS_IPTUN, &linkid) ==
+	    DLADM_STATUS_OK)
+		tun_status(linkid);
+
 	if (p != NULL) {
 		(*p->af_status)(1, flags);
 	} else {
@@ -3219,28 +2969,20 @@
 		}
 	}
 
-	(void) printf("\n");
+	(void) putchar('\n');
 	return (0);
 }
 
 static void
-print_tsec(struct iftun_req *tparams)
+print_tsec(iptun_params_t *params)
 {
 	ipsec_req_t *ipsr;
 
 	(void) printf("\ttunnel security settings  ");
-	/*
-	 * Deal with versioning, for now just point
-	 * an ipsec_req_t at ifta_secinfo.  If versions
-	 * change, something else will overlay ifta_secinfo.
-	 */
-	assert(tparams->ifta_vers == IFTUN_VERSION);
-
-	if (tparams->ifta_flags & IFTUN_COMPLEX_SECURITY) {
-		(void) printf("-->  use 'ipsecconf -ln -i %s'",
-		    tparams->ifta_lifr_name);
+	if (!(params->iptun_param_flags & IPTUN_PARAM_SECINFO)) {
+		(void) printf("-->  use 'ipsecconf -ln -i %s'", name);
 	} else {
-		ipsr = (ipsec_req_t *)(&tparams->ifta_secinfo);
+		ipsr = &params->iptun_param_secinfo;
 		if (ipsr->ipsr_ah_req & IPSEC_PREF_REQUIRED) {
 			(void) printf("ah (%s)  ",
 			    rparsealg(ipsr->ipsr_auth_alg, IPSEC_PROTO_AH));
@@ -3256,117 +2998,81 @@
 }
 
 static void
-tun_status(void)
+tun_status(datalink_id_t linkid)
 {
-	icfg_if_t interface;
-	int rc;
-	icfg_handle_t handle;
-	int protocol;
-	char srcbuf[INET6_ADDRSTRLEN];
-	char dstbuf[INET6_ADDRSTRLEN];
-	boolean_t tabbed;
-	uint8_t hoplimit;
-	int16_t encaplimit;
-	struct sockaddr_storage taddr;
-	socklen_t socklen = sizeof (taddr);
-
-	(void) strncpy(interface.if_name, name, sizeof (interface.if_name));
-	interface.if_protocol = SOCKET_AF(af);
-	if ((rc = icfg_open(&handle, &interface)) != ICFG_SUCCESS)
-		Perror0_exit((char *)icfg_errmsg(rc));
-
-	/*
-	 * only print tunnel info for lun 0.  If ioctl fails, assume
-	 * we are not a tunnel
-	 */
-	if (strchr(name, ':') != NULL ||
-	    icfg_get_tunnel_lower(handle, &protocol) != ICFG_SUCCESS) {
-		icfg_close(handle);
+	iptun_params_t	params;
+	char		propval[DLADM_PROP_VAL_MAX];
+	char		*valptr[1];
+	uint_t		valcnt = 1;
+	boolean_t	tabbed = _B_FALSE;
+
+	params.iptun_param_linkid = linkid;
+
+	/* If dladm_iptun_getparams() fails, assume we are not a tunnel. */
+	assert(dlh_opened);
+	if (dladm_iptun_getparams(dlh, &params, DLADM_OPT_ACTIVE) !=
+	    DLADM_STATUS_OK)
 		return;
-	}
-
-	switch (protocol) {
-	case AF_INET:
+
+	switch (params.iptun_param_type) {
+	case IPTUN_TYPE_IPV4:
+	case IPTUN_TYPE_6TO4:
 		(void) printf("\tinet");
 		break;
-	case AF_INET6:
+	case IPTUN_TYPE_IPV6:
 		(void) printf("\tinet6");
 		break;
 	default:
-		Perror0_exit("\ttunnel: Illegal lower stream\n\t");
+		dladmerr_exit(DLADM_STATUS_IPTUNTYPE, name);
 		break;
 	}
 
-	rc = icfg_get_tunnel_src(handle, (struct sockaddr *)&taddr, &socklen);
-	if (rc == ICFG_NOT_SET) {
-		(void) strlcpy(srcbuf, (protocol == AF_INET) ? "0.0.0.0" :
-		    "::", sizeof (srcbuf));
-	} else if (rc != ICFG_SUCCESS) {
-		Perror0_exit((char *)icfg_errmsg(rc));
-	} else {
-		rc = icfg_sockaddr_to_str(protocol, (struct sockaddr *)&taddr,
-		    srcbuf, sizeof (srcbuf));
-		if (rc != ICFG_SUCCESS) {
-			Perror0_exit((char *)icfg_errmsg(rc));
-		}
-	}
-
-	(void) printf(" tunnel src %s ", srcbuf);
-
-	rc = icfg_get_tunnel_dest(handle, (struct sockaddr *)&taddr, &socklen);
-	if (rc == ICFG_NOT_SET) {
-		(void) printf("\n");
-	} else {
-		rc = icfg_sockaddr_to_str(protocol, (struct sockaddr *)&taddr,
-		    dstbuf, sizeof (dstbuf));
-		if (rc != ICFG_SUCCESS) {
-			Perror0_exit((char *)icfg_errmsg(rc));
-		}
-		(void) printf("tunnel dst %s\n", dstbuf);
-	}
-
-	if (handle->ifh_tunnel_params != NULL &&
-	    (handle->ifh_tunnel_params->ifta_flags & IFTUN_SECURITY))
-		print_tsec(handle->ifh_tunnel_params);
-
 	/*
-	 * tabbed indicates tabbed and printed.  Use it tell us whether
-	 * to tab and that we've printed something here, so we need a
-	 * newline
+	 * There is always a source address.  If it hasn't been explicitly
+	 * set, the API will pass back a buffer containing the unspecified
+	 * address.
 	 */
-	tabbed = _B_FALSE;
-
-	if (icfg_get_tunnel_hoplimit(handle, &hoplimit) == ICFG_SUCCESS) {
-		(void) printf("\ttunnel hop limit %d ", hoplimit);
+	(void) printf(" tunnel src %s ", params.iptun_param_laddr);
+
+	if (params.iptun_param_flags & IPTUN_PARAM_RADDR)
+		(void) printf("tunnel dst %s\n", params.iptun_param_raddr);
+	else
+		(void) putchar('\n');
+
+	if (params.iptun_param_flags & IPTUN_PARAM_IPSECPOL)
+		print_tsec(&params);
+
+	valptr[0] = propval;
+	if (dladm_get_linkprop(dlh, linkid, DLADM_PROP_VAL_CURRENT, "hoplimit",
+	    (char **)valptr, &valcnt) == DLADM_STATUS_OK) {
+		(void) printf("\ttunnel hop limit %s ", propval);
 		tabbed = _B_TRUE;
 	}
 
-	if ((protocol == AF_INET6) &&
-	    (icfg_get_tunnel_encaplimit(handle, &encaplimit) ==
-	    ICFG_SUCCESS)) {
+	if (dladm_get_linkprop(dlh, linkid, DLADM_PROP_VAL_CURRENT,
+	    "encaplimit", (char **)valptr, &valcnt) == DLADM_STATUS_OK) {
+		uint32_t elim;
+
 		if (!tabbed) {
-			(void) printf("\t");
+			(void) putchar('\t');
 			tabbed = _B_TRUE;
 		}
-		if (encaplimit >= 0) {
-			(void) printf("tunnel encapsulation limit %d",
-			    encaplimit);
-		} else {
+		elim = strtol(propval, NULL, 10);
+		if (elim > 0)
+			(void) printf("tunnel encapsulation limit %s", propval);
+		else
 			(void) printf("tunnel encapsulation limit disabled");
-		}
 	}
 
 	if (tabbed)
-		(void) printf("\n");
-
-	icfg_close(handle);
+		(void) putchar('\n');
 }
 
 static void
 in_status(int force, uint64_t flags)
 {
-	struct sockaddr_in *sin, *laddr;
-	struct	sockaddr_in netmask = { AF_INET };
+	struct sockaddr_in	*sin, *laddr;
+	struct sockaddr_in	netmask = { AF_INET };
 
 	if (debug)
 		(void) printf("in_status(%s) flags 0x%llx\n", name, flags);
@@ -3375,9 +3081,6 @@
 	if (!(flags & IFF_IPV4))
 		return;
 
-	/* if the interface is a tunnel, print the tunnel status */
-	tun_status();
-
 	if (!(flags & IFF_NOLOCAL)) {
 		(void) strncpy(lifr.lifr_name, name, sizeof (lifr.lifr_name));
 		if (ioctl(s, SIOCGLIFADDR, (caddr_t)&lifr) < 0) {
@@ -3468,8 +3171,8 @@
 static void
 in6_status(int force, uint64_t flags)
 {
-	char abuf[INET6_ADDRSTRLEN];
-	struct sockaddr_in6 *sin6, *laddr6;
+	char			abuf[INET6_ADDRSTRLEN];
+	struct sockaddr_in6	*sin6, *laddr6;
 
 	if (debug)
 		(void) printf("in6_status(%s) flags 0x%llx\n", name, flags);
@@ -3477,9 +3180,6 @@
 	if (!(flags & IFF_IPV6))
 		return;
 
-	/* if the interface is a tunnel, print the tunnel status */
-	tun_status();
-
 	if (!(flags & IFF_NOLOCAL)) {
 		(void) strncpy(lifr.lifr_name, name, sizeof (lifr.lifr_name));
 		if (ioctl(s, SIOCGLIFADDR, (caddr_t)&lifr) < 0) {
@@ -4014,9 +3714,6 @@
 	/*
 	 * This interface does use ARP, so set up a separate stream
 	 * from the interface to ARP.
-	 *
-	 * Note: modules specified by the user are pushed
-	 * only on the interface stream, not on the ARP stream.
 	 */
 	if (debug)
 		(void) printf("ifconfig: ifplumb: interface %s", ifname);
@@ -4251,6 +3948,7 @@
 	char		*strptr;
 	boolean_t	islo;
 	zoneid_t	zoneid;
+	datalink_id_t	linkid;
 
 	strptr = strchr(name, ':');
 	islo = (strcmp(name, LOOPBACK_IF) == 0);
@@ -4280,16 +3978,19 @@
 	}
 
 	/*
-	 * For global zone, check if the interface is used by a non-global
-	 * zone, note that the non-global zones doesn't need this check,
-	 * because zoneadm has taken care of this when the zone boots.
+	 * If we're in the global zone and we're plumbing a datalink, make
+	 * sure that the datalink is not assigned to a non-global zone.  Note
+	 * that the non-global zones don't need this check, because zoneadm
+	 * has taken care of this when the zones boot.
 	 */
 	zoneid = getzoneid();
-	if (zoneid == GLOBAL_ZONEID) {
+	if (zoneid == GLOBAL_ZONEID &&
+	    ifconfig_dladm_open(name, DATALINK_CLASS_ALL, &linkid) ==
+	    DLADM_STATUS_OK) {
 		int ret;
 
 		zoneid = ALL_ZONES;
-		ret = zone_check_datalink(&zoneid, name);
+		ret = zone_check_datalink(&zoneid, linkid);
 		if (ret == 0) {
 			char zonename[ZONENAME_MAX];
 
@@ -4531,6 +4232,44 @@
 	return (ifaddr_op(ifaddrp, _B_FALSE));
 }
 
+/*
+ * Open the global libdladm handle "dlh" if it isn't already opened.  The
+ * caller may optionally supply a link name to obtain its linkid.  If a link
+ * of a specific class or classes is required, reqclass specifies the class
+ * mask.
+ */
+static dladm_status_t
+ifconfig_dladm_open(const char *name, datalink_class_t reqclass,
+    datalink_id_t *linkid)
+{
+	dladm_status_t status = DLADM_STATUS_OK;
+	datalink_class_t class;
+
+	if (!dlh_opened) {
+		if ((status = dladm_open(&dlh)) != DLADM_STATUS_OK)
+			return (status);
+		dlh_opened = _B_TRUE;
+	}
+	if (name != NULL) {
+		status = dladm_name2info(dlh, name, linkid, NULL, &class, NULL);
+		if (status == DLADM_STATUS_OK) {
+			if (!(class & reqclass))
+				status = DLADM_STATUS_LINKINVAL;
+		}
+	}
+	return (status);
+}
+
+void
+dladmerr_exit(dladm_status_t status, const char *str)
+{
+	char errstr[DLADM_STRSIZE];
+
+	(void) fprintf(stderr, "%s: %s\n", str,
+	    dladm_status2str(status, errstr));
+	exit(1);
+}
+
 void
 Perror0(const char *cmd)
 {
@@ -4542,7 +4281,6 @@
 {
 	Perror0(cmd);
 	exit(1);
-	/* NOTREACHED */
 }
 
 void

--- a/usr/src/cmd/cmd-inet/usr.sbin/in.rarpd.c	Wed Sep 23 09:09:49 2009 +0800
+++ b/usr/src/cmd/cmd-inet/usr.sbin/in.rarpd.c	Tue Sep 22 22:04:45 2009 -0400
@@ -19,7 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 /*	Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T	*/
@@ -30,8 +30,6 @@
  * under license from the Regents of the University of California.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*
  * rarpd.c  Reverse-ARP server.
  * Refer to RFC 903 "A Reverse Address Resolution Protocol".
@@ -240,9 +238,8 @@
 			error("out of memory");
 		}
 
-		if (!ifparse_ifspec(buf, &ifsp) || ifsp.ifsp_modcnt != 0) {
+		if (!ifparse_ifspec(buf, &ifsp))
 			error("invalid interface specification");
-		}
 
 		if (ifsp.ifsp_lunvalid) {
 			(void) snprintf(ifdev->ldevice,

--- a/usr/src/cmd/cmd-inet/usr.sbin/snoop/snoop.c	Wed Sep 23 09:09:49 2009 +0800
+++ b/usr/src/cmd/cmd-inet/usr.sbin/snoop/snoop.c	Tue Sep 22 22:04:45 2009 -0400
@@ -89,7 +89,6 @@
 static int vlanid = 0;
 
 static void usage(void);
-void show_count();
 static void snoop_sigrecover(int sig, siginfo_t *info, void *p);
 static char *protmalloc(size_t);
 static void resetperm(void);

--- a/usr/src/cmd/cmd-inet/usr.sbin/snoop/snoop.h	Wed Sep 23 09:09:49 2009 +0800
+++ b/usr/src/cmd/cmd-inet/usr.sbin/snoop/snoop.h	Tue Sep 22 22:04:45 2009 -0400
@@ -125,11 +125,13 @@
 
 extern char *get_sum_line(void);
 extern char *get_detail_line(int, int);
+extern int want_packet(uchar_t *, int, int);
 extern void set_vlan_id(int);
 extern struct timeval prev_time;
 extern void process_pkt(struct sb_hdr *, char *, int, int);
 extern char *getflag(int, int, char *, char *);
 extern void show_header(char *, char *, int);
+extern void show_count(void);
 extern void xdr_init(char *, int);
 extern char *get_line(int, int);
 extern int get_line_remain(void);
@@ -263,6 +265,7 @@
 extern char *printether(struct ether_addr *);
 extern char *print_ethertype(int);
 extern const char *arp_htype(int);
+extern int valid_rpc(char *, int);
 
 /*
  * Describes characteristics of the Media Access Layer.
@@ -283,6 +286,8 @@
  * and only use a user space filter if the filter expression
  * cannot be expressed in kernel space.
  */
+typedef uint_t (interpreter_fn_t)(int, char *, int, int);
+typedef uint_t (headerlen_fn_t)(char *, size_t);
 typedef struct interface {
 	uint_t		mac_type;
 	uint_t		mtu_size;
@@ -290,8 +295,8 @@
 	size_t		network_type_len;
 	uint_t		network_type_ip;
 	uint_t		network_type_ipv6;
-	uint_t		(*header_len)(char *);
-	uint_t 		(*interpreter)(int, char *, int, int);
+	headerlen_fn_t	*header_len;
+	interpreter_fn_t *interpreter;
 	boolean_t	try_kernel_filter;
 } interface_t;
 

--- a/usr/src/cmd/cmd-inet/usr.sbin/snoop/snoop_capture.c	Wed Sep 23 09:09:49 2009 +0800
+++ b/usr/src/cmd/cmd-inet/usr.sbin/snoop/snoop_capture.c	Tue Sep 22 22:04:45 2009 -0400
@@ -448,7 +448,7 @@
 
 		header_okay = 1;
 		if (!filter ||
-		    want_packet(pktp,
+		    want_packet((uchar_t *)pktp,
 		    nhdrp->sbh_msglen,
 		    nhdrp->sbh_origlen)) {
 			count++;

--- a/usr/src/cmd/cmd-inet/usr.sbin/snoop/snoop_ether.c	Wed Sep 23 09:09:49 2009 +0800
+++ b/usr/src/cmd/cmd-inet/usr.sbin/snoop/snoop_ether.c	Tue Sep 22 22:04:45 2009 -0400
@@ -42,6 +42,7 @@
 #include <sys/ethernet.h>
 #include <sys/vlan.h>
 #include <sys/zone.h>
+#include <inet/iptun.h>
 #include <sys/byteorder.h>
 #include <limits.h>
 #include <inet/ip.h>
@@ -51,12 +52,12 @@
 #include "at.h"
 #include "snoop.h"
 
-static uint_t ether_header_len(char *), fddi_header_len(char *),
-	tr_header_len(char *), ib_header_len(char *), ipnet_header_len(char *);
-static uint_t interpret_ether(), interpret_fddi(), interpret_tr();
-static uint_t interpret_ib(int, char *, int, int),
-	interpret_ipnet(int, char *, int, int);
+static headerlen_fn_t ether_header_len, fddi_header_len, tr_header_len,
+    ib_header_len, ipnet_header_len, ipv4_header_len, ipv6_header_len;
+static interpreter_fn_t interpret_ether, interpret_fddi, interpret_tr,
+    interpret_ib, interpret_ipnet, interpret_iptun;
 static void addr_copy_swap(struct ether_addr *, struct ether_addr *);
+static int tr_machdr_len(char *, int *, int *);
 
 interface_t *interface;
 interface_t INTERFACES[] = {
@@ -85,6 +86,18 @@
 	{ DL_IPNET, INT_MAX, 1, 1, IPV4_VERSION, IPV6_VERSION,
 	    ipnet_header_len, interpret_ipnet, B_TRUE },
 
+	/* IPv4 tunnel */
+	{ DL_IPV4, 0, 9, 1, IPPROTO_ENCAP, IPPROTO_IPV6,
+	    ipv4_header_len, interpret_iptun, B_FALSE },
+
+	/* IPv6 tunnel */
+	{ DL_IPV6, 0, 40, 1, IPPROTO_ENCAP, IPPROTO_IPV6,
+	    ipv6_header_len, interpret_iptun, B_FALSE },
+
+	/* 6to4 tunnel */
+	{ DL_6TO4, 0, 9, 1, IPPROTO_ENCAP, IPPROTO_IPV6,
+	    ipv4_header_len, interpret_iptun, B_FALSE },
+
 	{ (uint_t)-1, 0, 0, 0, 0, NULL, NULL, B_FALSE }
 };
 
@@ -110,11 +123,9 @@
 static const struct ether_addr all_isis_rbridges = ALL_ISIS_RBRIDGES;
 
 uint_t
-interpret_ether(flags, e, elen, origlen)
-	int flags;
-	struct ether_header *e;
-	int elen, origlen;
+interpret_ether(int flags, char *header, int elen, int origlen)
 {
+	struct ether_header *e = (struct ether_header *)header;
 	uchar_t *off, *ieeestart;
 	int len;
 	int ieee8023 = 0;
@@ -138,10 +149,11 @@
 	}
 inner_pkt:
 	if (origlen < 14) {
-		if (flags & F_SUM)
+		if (flags & F_SUM) {
 			(void) sprintf(get_sum_line(),
-			"RUNT (short packet - %d bytes)",
-			origlen);
+			    "RUNT (short packet - %d bytes)",
+			    origlen);
+		}
 		if (flags & F_DTAIL)
 			show_header("RUNT:  ", "Short packet", origlen);
 		return (elen);
@@ -373,10 +385,13 @@
  *           a VLAN header otherwise.
  */
 uint_t
-ether_header_len(e)
-char *e;
+ether_header_len(char *e, size_t msgsize)
 {
 	uint16_t ether_type = 0;
+
+	if (msgsize < sizeof (struct ether_header))
+		return (0);
+
 	e += (offsetof(struct ether_header, ether_type));
 
 	GETINT16(ether_type, e);
@@ -623,8 +638,7 @@
 };
 
 char *
-print_fc(type)
-uint_t type;
+print_fc(uint_t type)
 {
 
 	switch (type) {
@@ -636,8 +650,7 @@
 }
 
 char *
-print_smtclass(type)
-uint_t type;
+print_smtclass(uint_t type)
 {
 	switch (type) {
 		case 0x01: return ("NIF");
@@ -657,8 +670,7 @@
 
 }
 char *
-print_smttype(type)
-uint_t type;
+print_smttype(uint_t type)
 {
 	switch (type) {
 		case 0x01: return ("Announce");
@@ -669,8 +681,7 @@
 
 }
 char *
-print_ethertype(type)
-	int type;
+print_ethertype(int type)
 {
 	int i;
 
@@ -793,10 +804,7 @@
 }
 
 uint_t
-interpret_tr(flags, e, elen, origlen)
-	int flags;
-	caddr_t	e;
-	int elen, origlen;
+interpret_tr(int flags, caddr_t e, int elen, int origlen)
 {
 	struct tr_header *mh;
 	struct tr_ri *rh;
@@ -808,7 +816,6 @@
 	extern char *dst_name, *src_name;
 	int ethertype;
 	int is_llc = 0, is_snap = 0, source_routing = 0;
-	int tr_machdr_len(char *, int *, int *);
 	int blen = MAX(origlen, 17800);
 
 	if (data != NULL && datalen != 0 && datalen < blen) {
@@ -824,10 +831,11 @@
 	}
 
 	if (origlen < ACFCDASA_LEN) {
-		if (flags & F_SUM)
+		if (flags & F_SUM) {
 			(void) sprintf(get_sum_line(),
-			"RUNT (short packet - %d bytes)",
-			origlen);
+			    "RUNT (short packet - %d bytes)",
+			    origlen);
+		}
 		if (flags & F_DTAIL)
 			show_header("RUNT:  ", "Short packet", origlen);
 		return (elen);
@@ -842,8 +850,8 @@
 	if (is_llc = tr_machdr_len(e, &maclen, &source_routing)) {
 		snaphdr = (struct llc_snap_hdr *)(e + maclen);
 		if (snaphdr->d_lsap == LSAP_SNAP &&
-			snaphdr->s_lsap == LSAP_SNAP &&
-			snaphdr->control == CNTL_LLC_UI) {
+		    snaphdr->s_lsap == LSAP_SNAP &&
+		    snaphdr->control == CNTL_LLC_UI) {
 			is_snap = 1;
 		}
 	}
@@ -852,7 +860,7 @@
 	    sizeof (struct ether_addr)) == 0)
 		dst_name = "(broadcast)";
 	else if (memcmp(&mh->dhost, &tokenbroadcastaddr2,
-		sizeof (struct ether_addr)) == 0)
+	    sizeof (struct ether_addr)) == 0)
 		dst_name = "(mac broadcast)";
 	else if (mh->dhost.ether_addr_octet[0] & TR_FN_ADDR)
 		dst_name = "(functional)";
@@ -894,72 +902,74 @@
 
 		if (is_llc) {
 			if (is_snap) {
-				(void) sprintf(get_sum_line(),
-				"TR LLC w/SNAP Type=%04X (%s), size=%d bytes",
-				ethertype,
-				print_ethertype(ethertype),
-				origlen);
+				(void) sprintf(get_sum_line(), "TR LLC w/SNAP "
+				    "Type=%04X (%s), size=%d bytes",
+				    ethertype,
+				    print_ethertype(ethertype),
+				    origlen);
 			} else {
-				(void) sprintf(get_sum_line(),
-				"TR LLC, but no SNAP encoding, size = %d bytes",
-				origlen);
+				(void) sprintf(get_sum_line(), "TR LLC, but no "
+				    "SNAP encoding, size = %d bytes",
+				    origlen);
 			}
 		} else {
 			(void) sprintf(get_sum_line(),
-				"TR MAC FC=%02X (%s), size = %d bytes",
-				fc, print_fc(fc), origlen);
+			    "TR MAC FC=%02X (%s), size = %d bytes",
+			    fc, print_fc(fc), origlen);
 		}
 	}
 
 	if (flags & F_DTAIL) {
-	show_header("TR:  ", "TR Header", elen);
-	show_space();
-	(void) sprintf(get_line(0, 0),
-		"Packet %d arrived at %d:%02d:%d.%05d",
-		pi_frame,
-		pi_time_hour, pi_time_min, pi_time_sec,
-		pi_time_usec / 10);
-	(void) sprintf(get_line(0, 0),
-		"Packet size = %d bytes",
-		elen);
-	(void) sprintf(get_line(0, 1),
-		"Frame Control = %02x (%s)",
-		fc, print_fc(fc));
-	(void) sprintf(get_line(2, 6),
-		"Destination = %s, %s",
-		printether(&mh->dhost),
-		print_etherinfo(&mh->dhost));
-	(void) sprintf(get_line(8, 6),
-		"Source      = %s, %s",
-		printether(&mh->shost),
-		print_etherinfo(&mh->shost));
+		show_header("TR:  ", "TR Header", elen);
+		show_space();
+		(void) sprintf(get_line(0, 0),
+		    "Packet %d arrived at %d:%02d:%d.%05d",
+		    pi_frame,
+		    pi_time_hour, pi_time_min, pi_time_sec,
+		    pi_time_usec / 10);
+		(void) sprintf(get_line(0, 0),
+		    "Packet size = %d bytes",
+		    elen);
+		(void) sprintf(get_line(0, 1),
+		    "Frame Control = %02x (%s)",
+		    fc, print_fc(fc));
+		(void) sprintf(get_line(2, 6),
+		    "Destination = %s, %s",
+		    printether(&mh->dhost),
+		    print_etherinfo(&mh->dhost));
+		(void) sprintf(get_line(8, 6),
+		    "Source      = %s, %s",
+		    printether(&mh->shost),
+		    print_etherinfo(&mh->shost));
+
+		if (source_routing)
+			sprintf(get_line(ACFCDASA_LEN, rh->len), print_sr(rh));
 
-	if (source_routing)
-		sprintf(get_line(ACFCDASA_LEN, rh->len), print_sr(rh));
+		if (is_llc) {
+			(void) sprintf(get_line(maclen, 1),
+			    "Dest   Service Access Point = %02x",
+			    snaphdr->d_lsap);
+			(void) sprintf(get_line(maclen+1, 1),
+			    "Source Service Access Point = %02x",
+			    snaphdr->s_lsap);
+			(void) sprintf(get_line(maclen+2, 1),
+			    "Control = %02x",
+			    snaphdr->control);
+			if (is_snap) {
+				(void) sprintf(get_line(maclen+3, 3),
+				    "SNAP Protocol Id = %02x%02x%02x",
+				    snaphdr->org[0], snaphdr->org[1],
+				    snaphdr->org[2]);
+			}
+		}
 
-	if (is_llc) {
-		(void) sprintf(get_line(maclen, 1),
-			"Dest   Service Access Point = %02x",
-			snaphdr->d_lsap);
-		(void) sprintf(get_line(maclen+1, 1),
-			"Source Service Access Point = %02x",
-			snaphdr->s_lsap);
-		(void) sprintf(get_line(maclen+2, 1),
-			"Control = %02x",
-			snaphdr->control);
-		if (is_snap)
-			(void) sprintf(get_line(maclen+3, 3),
-				"SNAP Protocol Id = %02x%02x%02x",
-				snaphdr->org[0], snaphdr->org[1],
-				snaphdr->org[2]);
-	}
+		if (is_snap) {
+			(void) sprintf(get_line(maclen+6, 2),
+			    "SNAP Type = %04X (%s)",
+			    ethertype, print_ethertype(ethertype));
+		}
 
-	if (is_snap)
-		(void) sprintf(get_line(maclen+6, 2),
-		"SNAP Type = %04X (%s)",
-		ethertype, print_ethertype(ethertype));
-
-	show_space();
+		show_space();
 	}
 
 	/* go to the next protocol layer */
@@ -997,7 +1007,7 @@
  *		0: mac frame
  *		1: llc frame
  */
-int
+static int
 tr_machdr_len(char *e, int *lenp, int *source_routing)
 {
 	struct tr_header *mh;
@@ -1023,8 +1033,7 @@
 }
 
 uint_t
-tr_header_len(e)
-char	*e;
+tr_header_len(char *e, size_t msgsize)
 {
 	struct llc_snap_hdr *snaphdr;
 	int len = 0, source_routing;
@@ -1032,10 +1041,13 @@
 	if (tr_machdr_len(e, &len, &source_routing) == 0)
 		return (len);		/* it's a MAC frame */
 
+	if (msgsize < sizeof (struct llc_snap_hdr))
+		return (0);
+
 	snaphdr = (struct llc_snap_hdr *)(e + len);
 	if (snaphdr->d_lsap == LSAP_SNAP &&
-			snaphdr->s_lsap == LSAP_SNAP &&
-			snaphdr->control == CNTL_LLC_UI)
+	    snaphdr->s_lsap == LSAP_SNAP &&
+	    snaphdr->control == CNTL_LLC_UI)
 		len += LLC_SNAP_HDR_LEN;	/* it's a SNAP frame */
 	else
 		len += LLC_HDR1_LEN;
@@ -1051,10 +1063,7 @@
 };
 
 uint_t
-interpret_fddi(flags, e, elen, origlen)
-	int flags;
-	caddr_t	e;
-	int elen, origlen;
+interpret_fddi(int flags, caddr_t e, int elen, int origlen)
 {
 	struct fddi_header fhdr, *f = &fhdr;
 	char *off;
@@ -1078,10 +1087,11 @@
 	}
 
 	if (origlen < 13) {
-		if (flags & F_SUM)
+		if (flags & F_SUM) {
 			(void) sprintf(get_sum_line(),
-			"RUNT (short packet - %d bytes)",
-			origlen);
+			    "RUNT (short packet - %d bytes)",
+			    origlen);
+		}
 		if (flags & F_DTAIL)
 			show_header("RUNT:  ", "Short packet", origlen);
 		return (elen);
@@ -1151,86 +1161,89 @@
 		if (is_llc) {
 			if (is_snap) {
 				(void) sprintf(get_sum_line(),
-				"FDDI LLC Type=%04X (%s), size = %d bytes",
-				ethertype,
-				print_ethertype(ethertype),
-				origlen);
+				    "FDDI LLC Type=%04X (%s), size = %d bytes",
+				    ethertype,
+				    print_ethertype(ethertype),
+				    origlen);
 			} else {
-				(void) sprintf(get_sum_line(),
-				"LLC, but no SNAP encoding, size = %d bytes",
-				origlen);
+				(void) sprintf(get_sum_line(), "LLC, but no "
+				    "SNAP encoding, size = %d bytes",
+				    origlen);
 			}
 		} else if (is_smt) {
-			(void) sprintf(get_sum_line(),
-		"SMT Type=%02X (%s), Class = %02X (%s), size = %d bytes",
-			*(uchar_t *)(data+1), print_smttype(*(data+1)), *data,
-			print_smtclass(*data), origlen);
+			(void) sprintf(get_sum_line(), "SMT Type=%02X (%s), "
+			    "Class = %02X (%s), size = %d bytes",
+			    *(uchar_t *)(data+1), print_smttype(*(data+1)),
+			    *data, print_smtclass(*data), origlen);
 		} else {
 			(void) sprintf(get_sum_line(),
-				"FC=%02X (%s), size = %d bytes",
-				f->fc, print_fc(f->fc), origlen);
+			    "FC=%02X (%s), size = %d bytes",
+			    f->fc, print_fc(f->fc), origlen);
 		}
 	}
 
 	if (flags & F_DTAIL) {
-	show_header("FDDI:  ", "FDDI Header", elen);
-	show_space();
-	(void) sprintf(get_line(0, 0),
-		"Packet %d arrived at %d:%02d:%d.%05d",
-		pi_frame,
-		pi_time_hour, pi_time_min, pi_time_sec,
-		pi_time_usec / 10);
-	(void) sprintf(get_line(0, 0),
-		"Packet size = %d bytes",
-		elen, elen);
-	(void) sprintf(get_line(0, 6),
-		"Destination = %s, %s",
-		printether(&f->dhost),
-		print_etherinfo(&f->dhost));
-	(void) sprintf(get_line(6, 6),
-		"Source      = %s, %s",
-		printether(&f->shost),
-		print_etherinfo(&f->shost));
+		show_header("FDDI:  ", "FDDI Header", elen);
+		show_space();
+		(void) sprintf(get_line(0, 0),
+		    "Packet %d arrived at %d:%02d:%d.%05d",
+		    pi_frame,
+		    pi_time_hour, pi_time_min, pi_time_sec,
+		    pi_time_usec / 10);
+		(void) sprintf(get_line(0, 0),
+		    "Packet size = %d bytes",
+		    elen, elen);
+		(void) sprintf(get_line(0, 6),
+		    "Destination = %s, %s",
+		    printether(&f->dhost),
+		    print_etherinfo(&f->dhost));
+		(void) sprintf(get_line(6, 6),
+		    "Source      = %s, %s",
+		    printether(&f->shost),
+		    print_etherinfo(&f->shost));
 
-	if (is_llc) {
-		(void) sprintf(get_line(12, 2),
-			"Frame Control = %02x (%s)",
-			f->fc, print_fc(f->fc));
-		(void) sprintf(get_line(12, 2),
-			"Dest   Service Access Point = %02x",
-			f->dsap);
-		(void) sprintf(get_line(12, 2),
-			"Source Service Access Point = %02x",
-			f->ssap);
-		(void) sprintf(get_line(12, 2),
-			"Control = %02x",
-			f->ctl);
-		if (is_snap)
+		if (is_llc) {
+			(void) sprintf(get_line(12, 2),
+			    "Frame Control = %02x (%s)",
+			    f->fc, print_fc(f->fc));
+			(void) sprintf(get_line(12, 2),
+			    "Dest   Service Access Point = %02x",
+			    f->dsap);
+			(void) sprintf(get_line(12, 2),
+			    "Source Service Access Point = %02x",
+			    f->ssap);
+			(void) sprintf(get_line(12, 2),
+			    "Control = %02x",
+			    f->ctl);
+			if (is_snap) {
+				(void) sprintf(get_line(12, 2),
+				    "Protocol Id = %02x%02x%02x",
+				    f->proto_id[0], f->proto_id[1],
+				    f->proto_id[2]);
+			}
+		} else if (is_smt) {
 			(void) sprintf(get_line(12, 2),
-				"Protocol Id = %02x%02x%02x",
-				f->proto_id[0], f->proto_id[1], f->proto_id[2]);
-	} else if (is_smt) {
-		(void) sprintf(get_line(12, 2),
-			"Frame Control = %02x (%s)",
-			f->fc, print_fc(f->fc));
-		(void) sprintf(get_line(12, 2),
-			"Class = %02x (%s)",
-			(uchar_t)*data, print_smtclass(*data));
-		(void) sprintf(get_line(12, 2),
-			"Type = %02x (%s)",
-			*(uchar_t *)(data+1), print_smttype(*(data+1)));
-	} else {
-		(void) sprintf(get_line(12, 2),
-			"FC=%02X (%s), size = %d bytes",
-			f->fc, print_fc(f->fc), origlen);
-	}
+			    "Frame Control = %02x (%s)",
+			    f->fc, print_fc(f->fc));
+			(void) sprintf(get_line(12, 2),
+			    "Class = %02x (%s)",
+			    (uchar_t)*data, print_smtclass(*data));
+			(void) sprintf(get_line(12, 2),
+			    "Type = %02x (%s)",
+			    *(uchar_t *)(data+1), print_smttype(*(data+1)));
+		} else {
+			(void) sprintf(get_line(12, 2),
+			    "FC=%02X (%s), size = %d bytes",
+			    f->fc, print_fc(f->fc), origlen);
+		}
 
-	if (is_snap)
-		(void) sprintf(get_line(12, 2),
-		"LLC Type = %04X (%s)",
-		ethertype, print_ethertype(ethertype));
+		if (is_snap) {
+			(void) sprintf(get_line(12, 2),
+			    "LLC Type = %04X (%s)",
+			    ethertype, print_ethertype(ethertype));
+		}
 
-	show_space();
+		show_space();
 	}
 
 	/* go to the next protocol layer */
@@ -1257,10 +1270,13 @@
 }
 
 uint_t
-fddi_header_len(char *e)
+fddi_header_len(char *e, size_t msgsize)
 {
 	struct fddi_header fhdr, *f = &fhdr;
 
+	if (msgsize < sizeof (struct fddi_header))
+		return (0);
+
 	(void) memcpy(&f->fc, e, sizeof (f->fc));
 	(void) memcpy(&f->dhost, e+1, sizeof (struct ether_addr));
 	(void) memcpy(&f->shost, e+7, sizeof (struct ether_addr));
@@ -1286,18 +1302,17 @@
  * Print the given Ethernet address
  */
 char *
-printether(p)
-	struct ether_addr *p;
+printether(struct ether_addr *p)
 {
 	static char buf[256];
 
 	sprintf(buf, "%x:%x:%x:%x:%x:%x",
-		p->ether_addr_octet[0],
-		p->ether_addr_octet[1],
-		p->ether_addr_octet[2],
-		p->ether_addr_octet[3],
-		p->ether_addr_octet[4],
-		p->ether_addr_octet[5]);
+	    p->ether_addr_octet[0],
+	    p->ether_addr_octet[1],
+	    p->ether_addr_octet[2],
+	    p->ether_addr_octet[3],
+	    p->ether_addr_octet[4],
+	    p->ether_addr_octet[5]);
 
 	return (buf);
 }
@@ -1489,8 +1504,7 @@
  * Print the additional Ethernet address info
  */
 static char *
-print_etherinfo(eaddr)
-	struct ether_addr *eaddr;
+print_etherinfo(struct ether_addr *eaddr)
 {
 	uint_t addr = 0;
 	char *p = (char *)&addr + 1;
@@ -1546,9 +1560,7 @@
 };
 
 static void
-addr_copy_swap(pd, ps)
-	struct ether_addr	*pd;
-	struct ether_addr	*ps;
+addr_copy_swap(struct ether_addr *pd, struct ether_addr *ps)
 {
 	pd->ether_addr_octet[0] = endianswap[ps->ether_addr_octet[0]];
 	pd->ether_addr_octet[1] = endianswap[ps->ether_addr_octet[1]];
@@ -1560,7 +1572,7 @@
 
 /* ARGSUSED */
 uint_t
-ib_header_len(char *hdr)
+ib_header_len(char *hdr, size_t msgsize)
 {
 	return (IPOIB_HDRSIZE);
 }
@@ -1571,7 +1583,6 @@
 	struct ipoib_header *hdr = (struct ipoib_header *)header;
 	char *off;
 	int len;
-	extern char *dst_name;
 	unsigned short ethertype;
 	int blen = MAX(origlen, 4096);
 
@@ -1647,8 +1658,9 @@
 	return (elen);
 }
 
+/* ARGSUSED */
 uint_t
-ipnet_header_len(char *hdr)
+ipnet_header_len(char *hdr, size_t msgsize)
 {
 	return (sizeof (dl_ipnetinfo_t));
 }
@@ -1728,3 +1740,63 @@
 
 	return (0);
 }
+
+uint_t
+ipv4_header_len(char *hdr, size_t msgsize)
+{
+	return (msgsize < sizeof (ipha_t) ? 0 : IPH_HDR_LENGTH((ipha_t *)hdr));
+}
+
+/*
+ * The header length needs to include all potential extension headers, as the
+ * caller expects to use this length as an offset to the inner network layer
+ * header to be used as a filter offset.  IPsec headers aren't passed up here,
+ * and neither are fragmentation headers.
+ */
+uint_t
+ipv6_header_len(char *hdr, size_t msgsize)
+{
+	ip6_t		*ip6hdr = (ip6_t *)hdr;
+	ip6_hbh_t	*exthdr;
+	uint_t		hdrlen = sizeof (ip6_t), exthdrlen;
+	char		*pptr;
+	uint8_t		nxt;
+
+	if (msgsize < sizeof (ip6_t))
+		return (0);
+
+	nxt = ip6hdr->ip6_nxt;
+	pptr = (char *)(ip6hdr + 1);
+
+	while (nxt != IPPROTO_ENCAP && nxt != IPPROTO_IPV6) {
+		switch (nxt) {
+		case IPPROTO_HOPOPTS:
+		case IPPROTO_DSTOPTS:
+		case IPPROTO_ROUTING:
+			if (msgsize < hdrlen + sizeof (ip6_hbh_t))
+				return (0);
+			exthdr = (ip6_hbh_t *)pptr;
+			exthdrlen = 8 + exthdr->ip6h_len * 8;
+			hdrlen += exthdrlen;
+			pptr += exthdrlen;
+			nxt = exthdr->ip6h_nxt;
+			break;
+		default:
+			/*
+			 * This is garbage, there's no way to know where the
+			 * inner IP header is.
+			 */
+			return (0);
+		}
+	}
+
+	return (hdrlen);
+}
+
+/* ARGSUSED */
+uint_t
+interpret_iptun(int flags, char *header, int elen, int origlen)
+{
+	(void) interpret_ip(flags, (struct ip *)header, elen);
+	return (elen);
+}

--- a/usr/src/cmd/cmd-inet/usr.sbin/snoop/snoop_filter.c	Wed Sep 23 09:09:49 2009 +0800
+++ b/usr/src/cmd/cmd-inet/usr.sbin/snoop/snoop_filter.c	Tue Sep 22 22:04:45 2009 -0400
@@ -19,7 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -32,7 +32,8 @@
 #include <sys/types.h>
 #include <sys/time.h>
 #include <stddef.h>
-
+#include <unistd.h>
+#include <stropts.h>
 #include <sys/socket.h>
 #include <sys/sockio.h>
 #include <sys/vlan.h>
@@ -557,14 +558,13 @@
 	uchar_t **offp;		/* current offset */
 	uchar_t *opkt = NULL;
 	uint_t olen;
-	uint_t ethertype = 0;
 
 	sp = stack;
 	*sp = 1;
 	base = pkt;
 	offp = offstack;
 
-	header_size = (*interface->header_len)((char *)pkt);
+	header_size = (*interface->header_len)((char *)pkt, len);
 
 	for (op = oplist; *op; op++) {
 		switch ((enum optype) *op) {
@@ -839,7 +839,7 @@
 			}
 			/* align */
 			(void) memcpy(&rpcmsg, rpc, 24);
-			if (!valid_rpc(&rpcmsg, 24)) {
+			if (!valid_rpc((char *)&rpcmsg, 24)) {
 				if (sp >= &stack[MAXSS])
 					return (0);
 				*(++sp) = 0;
@@ -1379,6 +1379,27 @@
 	0,		0,  0, 0,		 0,	0
 };
 
+static match_type_t iptun_match_types[] = {
+	"ip",		0,  1, IPPROTO_ENCAP,	-1,	OP_OFFSET_ETHERTYPE,
+	"ip6",		0,  1, IPPROTO_IPV6,	-1,	OP_OFFSET_ETHERTYPE,
+	"tcp",		9,  1, IPPROTO_TCP,	0,	OP_OFFSET_LINK,
+	"tcp",		6,  1, IPPROTO_TCP,	1,	OP_OFFSET_LINK,
+	"udp",		9,  1, IPPROTO_UDP,	0,	OP_OFFSET_LINK,
+	"udp",		6,  1, IPPROTO_UDP,	1,	OP_OFFSET_LINK,
+	"icmp",		9,  1, IPPROTO_ICMP,	0,	OP_OFFSET_LINK,
+	"icmp6",	6,  1, IPPROTO_ICMPV6,	1,	OP_OFFSET_LINK,
+	"ospf",		9,  1, IPPROTO_OSPF,	0,	OP_OFFSET_LINK,
+	"ospf",		6,  1, IPPROTO_OSPF,	1,	OP_OFFSET_LINK,
+	"ip-in-ip",	9,  1, IPPROTO_ENCAP,	0,	OP_OFFSET_LINK,
+	"esp",		9,  1, IPPROTO_ESP,	0,	OP_OFFSET_LINK,
+	"esp",		6,  1, IPPROTO_ESP,	1,	OP_OFFSET_LINK,
+	"ah",		9,  1, IPPROTO_AH,	0,	OP_OFFSET_LINK,
+	"ah",		6,  1, IPPROTO_AH,	1,	OP_OFFSET_LINK,
+	"sctp",		9,  1, IPPROTO_SCTP,	0,	OP_OFFSET_LINK,
+	"sctp",		6,  1, IPPROTO_SCTP,	1,	OP_OFFSET_LINK,
+	0,		0,  0, 0,		0,	0
+};
+
 static void
 generate_check(match_type_t match_types[], int index, int type)
 {
@@ -1422,6 +1443,11 @@
 	case DL_IPNET:
 		match_types = ipnet_match_types;
 		break;
+	case DL_IPV4:
+	case DL_IPV6:
+	case DL_6TO4:
+		match_types = iptun_match_types;
+		break;
 	default:
 		return (0);
 	}
@@ -1894,15 +1920,6 @@
 	}
 }
 
-static void
-ipnettype_match(int val)
-{
-	int ipnet_offset = interface->network_type_offset;
-
-	emitop(OP_OFFSET_ETHERTYPE);
-	compare_value(ipnet_offset, 2, val);
-}
-
 /*
  * Match a network address.  The host part
  * is masked out.  The network address may

--- a/usr/src/cmd/cmd-inet/usr.sbin/snoop/snoop_ip.c	Wed Sep 23 09:09:49 2009 +0800
+++ b/usr/src/cmd/cmd-inet/usr.sbin/snoop/snoop_ip.c	Tue Sep 22 22:04:45 2009 -0400
@@ -19,13 +19,10 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-
 #include <stdio.h>
 #include <string.h>
 #include <fcntl.h>
@@ -97,7 +94,6 @@
 		return (iplen);
 	}
 
-	/* XXX Should this count for mix-and-match v4/v6 encapsulations? */
 	if (encap_levels == 0)
 		total_encap_levels = 0;
 	encap_levels++;
@@ -124,10 +120,8 @@
 	if (morefrag || fragoffset != 0)
 		isfrag = B_TRUE;
 
-	if (encap_levels == 1) {
-		src_name = addrtoname(AF_INET, &ip->ip_src);
-		dst_name = addrtoname(AF_INET, &ip->ip_dst);
-	} /* Else we already have the src_name and dst_name we want! */
+	src_name = addrtoname(AF_INET, &ip->ip_src);
+	dst_name = addrtoname(AF_INET, &ip->ip_dst);
 
 	if (flags & F_SUM) {
 		if (isfrag) {
@@ -370,17 +364,19 @@
 
 		version = ntohl(ip6h->ip6_vcf) >> 28;
 
-		if (strcmp(src_name, src_addrstr) == 0)
+		if (strcmp(src_name, src_addrstr) == 0) {
 			print_srcname[0] = '\0';
-		else
+		} else {
 			snprintf(print_srcname, sizeof (print_srcname),
-				", %s", src_name);
+			    ", %s", src_name);
+		}
 
-		if (strcmp(dst_name, dst_addrstr) == 0)
+		if (strcmp(dst_name, dst_addrstr) == 0) {
 			print_dstname[0] = '\0';
-		else
+		} else {
 			snprintf(print_dstname, sizeof (print_dstname),
-				", %s", dst_name);
+			    ", %s", dst_name);
+		}
 
 		show_header("IPv6:   ", "IPv6 Header", iplen);
 		show_space();

--- a/usr/src/cmd/cmd-inet/usr.sbin/snoop/snoop_rpc.c	Wed Sep 23 09:09:49 2009 +0800
+++ b/usr/src/cmd/cmd-inet/usr.sbin/snoop/snoop_rpc.c	Tue Sep 22 22:04:45 2009 -0400
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,12 +19,10 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <sys/types.h>
 #include <sys/errno.h>
 #include <setjmp.h>
@@ -64,7 +61,6 @@
 static void print_creds(int);
 static void print_verif(int);
 static void stash_xid(ulong_t, int, int, int, int);
-int valid_rpc(char *, int);
 
 #define	LAST_FRAG ((ulong_t)1 << 31)
 
@@ -87,7 +83,7 @@
 	if (setjmp(xdr_err)) {
 		if (flags & F_DTAIL)
 			(void) sprintf(get_line(0, 0),
-				"----  short frame ---");
+			    "----  short frame ---");
 		return (fraglen);
 	}
 
@@ -106,9 +102,10 @@
 		vers = getxdr_long();
 		proc = getxdr_long();
 		stash_xid(xid, pi_frame, prog, vers, proc);
-		if (!(flags & (F_SUM | F_DTAIL)))
+		if (!(flags & (F_SUM | F_DTAIL))) {
 			protoprint(flags, CALL, xid, prog, vers, proc,
-				rpc, fraglen);
+			    rpc, fraglen);
+		}
 	} else {
 		x = find_xid(xid);
 	}
@@ -117,10 +114,10 @@
 		switch (direction) {
 		case CALL:
 			(void) sprintf(get_sum_line(),
-				"RPC C XID=%lu PROG=%d (%s) VERS=%d PROC=%d",
-				xid,
-				prog, nameof_prog(prog),
-				vers, proc);
+			    "RPC C XID=%lu PROG=%d (%s) VERS=%d PROC=%d",
+			    xid,
+			    prog, nameof_prog(prog),
+			    vers, proc);
 			if (getxdr_long() == RPCSEC_GSS) { /* Cred auth type */
 				extract_rpcsec_gss_cred_info(xid);
 				/* RPCSEC_GSS cred auth data */
@@ -132,7 +129,7 @@
 			xdr_skip(RNDUP(getxdr_long()));	/* Verf auth data */
 
 			protoprint(flags, CALL, xid, prog, vers, proc,
-				rpc, fraglen);
+			    rpc, fraglen);
 			break;
 
 		case REPLY:
@@ -141,7 +138,7 @@
 				(void) sprintf(lp, "RPC R XID=%lu", xid);
 			else
 				(void) sprintf(lp, "RPC R (#%d) XID=%lu",
-					x->xid_frame, xid);
+				    x->xid_frame, xid);
 
 			lp += strlen(lp);
 			status = getxdr_long();
@@ -152,18 +149,18 @@
 				xdr_skip(RNDUP(getxdr_long()));
 				astat = getxdr_long();
 				(void) sprintf(lp, " %s",
-					nameof_astat(astat));
+				    nameof_astat(astat));
 				lp += strlen(lp);
 
 				switch (astat) {
 				case SUCCESS:
 					if (x) {
 						protoprint(flags, REPLY,
-							xid,
-							x->xid_prog,
-							x->xid_vers,
-							x->xid_proc,
-							rpc, fraglen);
+						    xid,
+						    x->xid_prog,
+						    x->xid_vers,
+						    x->xid_proc,
+						    rpc, fraglen);
 					}
 					break;
 
@@ -173,8 +170,8 @@
 					lo = getxdr_long();
 					hi = getxdr_long();
 					(void) sprintf(lp,
-						" (low=%d, high=%d)",
-						lo, hi);
+					    " (low=%d, high=%d)",
+					    lo, hi);
 					break;
 
 				case GARBAGE_ARGS:
@@ -193,14 +190,14 @@
 					hi = getxdr_long();
 					(void) sprintf(lp,
 					" Vers mismatch (low=%d, high=%d)",
-						lo, hi);
+					    lo, hi);
 					break;
 
 				case AUTH_ERROR:
 					why = getxdr_u_long();
 					(void) sprintf(lp,
-						" Can't authenticate (%s)",
-						nameof_why(why));
+					    " Can't authenticate (%s)",
+					    nameof_why(why));
 					break;
 				}
 			}
@@ -213,23 +210,23 @@
 		show_space();
 		if (type == IPPROTO_TCP) {	/* record mark */
 			(void) sprintf(get_line(markpos, markpos+4),
-				"Record Mark: %s fragment, length = %d",
-				recmark & LAST_FRAG ? "last" : "",
-				recmark & ~LAST_FRAG);
+			    "Record Mark: %s fragment, length = %d",
+			    recmark & LAST_FRAG ? "last" : "",
+			    recmark & ~LAST_FRAG);
 		}
 
 		(void) sprintf(get_line(0, 0),
-			"Transaction id = %lu",
-			xid);
+		    "Transaction id = %lu",
+		    xid);
 		(void) sprintf(get_line(0, 0),
-			"Type = %d (%s)",
-			direction,
-			direction == CALL ? "Call":"Reply");
+		    "Type = %d (%s)",
+		    direction,
+		    direction == CALL ? "Call":"Reply");
 
 		switch (direction) {
 		case CALL:
 			rpc_detail_call(flags, xid, rpcvers,
-				prog, vers, proc, rpc, fraglen);
+			    prog, vers, proc, rpc, fraglen);
 			break;
 		case REPLY:
 			rpc_detail_reply(flags, xid, x, rpc, fraglen);
@@ -248,11 +245,11 @@
 	char *nameof_prog();
 
 	(void) sprintf(get_line(pos, getxdr_pos()),
-		"RPC version = %d",
-		rpcvers);
+	    "RPC version = %d",
+	    rpcvers);
 	(void) sprintf(get_line(pos, getxdr_pos()),
-		"Program = %d (%s), version = %d, procedure = %d",
-		prog, nameof_prog(prog), vers, proc);
+	    "Program = %d (%s), version = %d, procedure = %d",
+	    prog, nameof_prog(prog), vers, proc);
 	print_creds(xid);
 	print_verif(CALL);
 	show_trailer();
@@ -314,8 +311,8 @@
 	flavor  = getxdr_long();
 	authlen = getxdr_long();
 	(void) sprintf(get_line(pos, getxdr_pos()),
-		"Credentials: Flavor = %d (%s), len = %d bytes",
-		flavor, nameof_flavor(flavor), authlen);
+	    "Credentials: Flavor = %d (%s), len = %d bytes",
+	    flavor, nameof_flavor(flavor), authlen);
 	if (authlen <= 0)
 		return;
 
@@ -327,8 +324,8 @@
 		uid = getxdr_u_long();
 		gid = getxdr_u_long();
 		(void) sprintf(get_line(pos, getxdr_pos()),
-			"   Uid = %d, Gid = %d",
-			uid, gid);
+		    "   Uid = %d, Gid = %d",
+		    uid, gid);
 		len = getxdr_u_long();
 		line = get_line(pos, len * 4);
 		if (len == 0)
@@ -347,24 +344,24 @@
 	case AUTH_DES:
 		namekind = getxdr_u_long();
 		(void) sprintf(get_line(pos, getxdr_pos()),
-			"   Name kind = %d (%s)",
-			namekind,
-			namekind == ADN_FULLNAME ?
-				"fullname" : "nickname");
-			switch (namekind) {
-			case ADN_FULLNAME:
-				(void) showxdr_string(64,
-					"   Network name = %s");
-				(void) showxdr_hex(8,
-				"   Conversation key = 0x%s (DES encrypted)");
-				(void) showxdr_hex(4,
-				"   Window = 0x%s (DES encrypted)");
-				break;
+		    "   Name kind = %d (%s)",
+		    namekind,
+		    namekind == ADN_FULLNAME ?
+		    "fullname" : "nickname");
+		switch (namekind) {
+		case ADN_FULLNAME:
+			(void) showxdr_string(64,
+			    "   Network name = %s");
+			(void) showxdr_hex(8,
+			    "   Conversation key = 0x%s (DES encrypted)");
+			(void) showxdr_hex(4,
+			    "   Window = 0x%s (DES encrypted)");
+			break;
 
-			case ADN_NICKNAME:
-				(void) showxdr_hex(4, "   Nickname = 0x%s");
-				break;
-			};
+		case ADN_NICKNAME:
+			(void) showxdr_hex(4, "   Nickname = 0x%s");
+			break;
+		};
 		break;
 
 	case RPCSEC_GSS:
@@ -386,8 +383,8 @@
 	flavor = getxdr_long();
 	verlen = getxdr_long();
 	(void) sprintf(get_line(pos, getxdr_pos()),
-		"Verifier   : Flavor = %d (%s), len = %d bytes",
-		flavor, nameof_flavor(flavor), verlen);
+	    "Verifier   : Flavor = %d (%s), len = %d bytes",
+	    flavor, nameof_flavor(flavor), verlen);
 	if (verlen == 0)
 		return;
 
@@ -396,7 +393,7 @@
 		(void) showxdr_hex(8, "   Timestamp = 0x%s (DES encrypted)");
 		if (direction == CALL)
 			(void) showxdr_hex(4,
-				"   Window    = 0x%s (DES encrypted)");
+			    "   Window    = 0x%s (DES encrypted)");
 		else
 			(void) showxdr_hex(4, "   Nickname  = 0x%s");
 		break;
@@ -622,14 +619,14 @@
 
 	if (x) {
 		(void) sprintf(get_line(0, 0),
-			"This is a reply to frame %d",
-			x->xid_frame);
+		    "This is a reply to frame %d",
+		    x->xid_frame);
 	}
 	pos = getxdr_pos();
 	status = getxdr_long();
 	(void) sprintf(get_line(pos, getxdr_pos()),
-		"Status = %d (%s)",
-		status, status ? "Denied" : "Accepted");
+	    "Status = %d (%s)",
+	    status, status ? "Denied" : "Accepted");
 
 	switch (status) {
 	case MSG_ACCEPTED:
@@ -637,16 +634,16 @@
 		pos = getxdr_pos();
 		astat = getxdr_long();
 		(void) sprintf(get_line(pos, getxdr_pos()),
-			"Accept status = %d (%s)",
-			astat, nameof_astat(astat));
+		    "Accept status = %d (%s)",
+		    astat, nameof_astat(astat));
 
 		switch (astat) {
 		case SUCCESS:
 			if (x) {
 				show_trailer();
 				protoprint(flags, REPLY, xid,
-					x->xid_prog, x->xid_vers, x->xid_proc,
-					data, len);
+				    x->xid_prog, x->xid_vers, x->xid_proc,
+				    data, len);
 			}
 			break;
 		case PROG_UNAVAIL :
@@ -668,10 +665,10 @@
 		pos = getxdr_pos();
 		rstat = getxdr_long();
 		(void) sprintf(get_line(pos, getxdr_pos()),
-			"Reject status = %d (%s)",
-			rstat,
-			rstat ? "can't authenticate"
-				: "version mismatch");
+		    "Reject status = %d (%s)",
+		    rstat,
+		    rstat ? "can't authenticate"
+		    : "version mismatch");
 
 		switch (rstat) {
 		case RPC_MISMATCH:
@@ -681,8 +678,8 @@
 		case AUTH_ERROR:
 			why = getxdr_u_long();
 			(void) sprintf(get_line(pos, getxdr_pos()),
-				"   Why = %d (%s)",
-				why, nameof_why(why));
+			    "   Why = %d (%s)",
+			    why, nameof_why(why));
 			break;
 		}
 		break;
@@ -712,7 +709,7 @@
 			break;
 		case REPLY:
 			if (xdr_u_int(&xdrm,
-					(uint_t *)&msg.rm_reply.rp_stat) &&
+			    (uint_t *)&msg.rm_reply.rp_stat) &&
 			    (msg.rm_reply.rp_stat == MSG_ACCEPTED ||
 			    msg.rm_reply.rp_stat == MSG_DENIED))
 				return (1);

--- a/usr/src/cmd/devfsadm/misc_link.c	Wed Sep 23 09:09:49 2009 +0800
+++ b/usr/src/cmd/devfsadm/misc_link.c	Tue Sep 22 22:04:45 2009 -0400
@@ -104,7 +104,7 @@
 	    "(^ip$)|(^tcp$)|(^udp$)|(^icmp$)|(^sctp$)|"
 	    "(^ip6$)|(^tcp6$)|(^udp6$)|(^icmp6$)|(^sctp6$)|"
 	    "(^rts$)|(^arp$)|(^ipsecah$)|(^ipsecesp$)|(^keysock$)|(^spdsock$)|"
-	    "(^nca$)|(^rds$)|(^sdp$)|(^ipnet$)|(^dlpistub$)",
+	    "(^nca$)|(^rds$)|(^sdp$)|(^ipnet$)|(^dlpistub$)|(^iptunq)",
 	    TYPE_EXACT | DRV_RE, ILEVEL_1, minor_name
 	},
 	{ "pseudo", "ddi_pseudo",

--- a/usr/src/cmd/dladm/dladm.c	Wed Sep 23 09:09:49 2009 +0800
+++ b/usr/src/cmd/dladm/dladm.c	Tue Sep 22 22:04:45 2009 -0400
@@ -40,6 +40,7 @@
 #include <getopt.h>
 #include <unistd.h>
 #include <priv.h>
+#include <limits.h>
 #include <termios.h>
 #include <pwd.h>
 #include <auth_attr.h>
@@ -55,6 +56,7 @@
 #include <libdlvlan.h>
 #include <libdlvnic.h>
 #include <libdlether.h>
+#include <libdliptun.h>
 #include <libdlsim.h>
 #include <libdlbridge.h>
 #include <libinetutil.h>
@@ -192,6 +194,8 @@
 static cmdfunc_t do_show_usage;
 static cmdfunc_t do_create_bridge, do_modify_bridge, do_delete_bridge;
 static cmdfunc_t do_add_bridge, do_remove_bridge, do_show_bridge;
+static cmdfunc_t do_create_iptun, do_modify_iptun, do_delete_iptun;
+static cmdfunc_t do_show_iptun, do_up_iptun, do_down_iptun;
 
 static void 	do_up_vnic_common(int, char **, const char *, boolean_t);
 
@@ -210,6 +214,12 @@
 static const char	*get_linkstate(const char *, boolean_t, char *);
 static const char	*get_linkduplex(const char *, boolean_t, char *);
 
+static iptun_type_t	iptun_gettypebyname(char *);
+static const char	*iptun_gettypebyvalue(iptun_type_t);
+static dladm_status_t	print_iptun(dladm_handle_t, datalink_id_t,
+			    show_state_t *);
+static int	print_iptun_walker(dladm_handle_t, datalink_id_t, void *);
+
 static int	show_etherprop(dladm_handle_t, datalink_id_t, void *);
 static void	show_ether_xprop(void *, dladm_ether_info_t *);
 static boolean_t	link_is_ether(const char *, datalink_id_t *);
@@ -288,6 +298,17 @@
 	{ "show-vlan",		do_show_vlan,
 	    "    show-vlan        [-pP] [-o <field>,..] [<link>]\n"	},
 	{ "up-vlan",		do_up_vlan,		NULL		},
+	{ "create-iptun",	do_create_iptun,
+	    "    create-iptun     [-t] -T <type> "
+	    "[-a {local|remote}=<addr>,...] <link>]" },
+	{ "delete-iptun",	do_delete_iptun,
+	    "    delete-iptun     [-t] <link>"				},
+	{ "modify-iptun",	do_modify_iptun,
+	    "    modify-iptun     [-t] -a {local|remote}=<addr>,... <link>" },
+	{ "show-iptun",		do_show_iptun,
+	    "    show-iptun       [-pP] [-o <field>,..] [<link>]\n"	},
+	{ "up-iptun",		do_up_iptun,		NULL		},
+	{ "down-iptun",		do_down_iptun,		NULL		},
 	{ "delete-phys",	do_delete_phys,
 	    "    delete-phys      <link>"				},
 	{ "show-phys",		do_show_phys,
@@ -380,6 +401,34 @@
 	{ 0, 0, 0, 0 }
 };
 
+static const struct option iptun_lopts[] = {
+	{"output",	required_argument,	0, 'o'},
+	{"tunnel-type",	required_argument,	0, 'T'},
+	{"address",	required_argument,	0, 'a'},
+	{"root-dir",	required_argument,	0, 'R'},
+	{"parsable",	no_argument,		0, 'p'},
+	{"parseable",	no_argument,		0, 'p'},
+	{"persistent",	no_argument,		0, 'P'},
+	{ 0, 0, 0, 0 }
+};
+
+static char * const iptun_addropts[] = {
+#define	IPTUN_LOCAL	0
+	"local",
+#define	IPTUN_REMOTE	1
+	"remote",
+	NULL};
+
+static const struct {
+	const char	*type_name;
+	iptun_type_t	type_value;
+} iptun_types[] = {
+	{"ipv4",	IPTUN_TYPE_IPV4},
+	{"ipv6",	IPTUN_TYPE_IPV6},
+	{"6to4",	IPTUN_TYPE_6TO4},
+	{NULL,		0}
+};
+
 static const struct option prop_longopts[] = {
 	{"temporary",	no_argument,		0, 't'  },
 	{"output",	required_argument,	0, 'o'  },
@@ -410,6 +459,7 @@
 	{"file",	required_argument,	0, 'f'  },
 	{ 0, 0, 0, 0 }
 };
+
 static const struct option showeth_lopts[] = {
 	{"parsable",	no_argument,		0, 'p'	},
 	{"parseable",	no_argument,		0, 'p'	},
@@ -492,7 +542,7 @@
 	char	eth_rem_fault[16];
 } ether_fields_buf_t;
 
-static ofmt_field_t ether_fields[] = {
+static const ofmt_field_t ether_fields[] = {
 /* name,	field width,	offset	    callback */
 { "LINK",	16,
 	offsetof(ether_fields_buf_t, eth_link), print_default_cb},
@@ -534,7 +584,7 @@
 	LINK_S_OERRORS
 } link_s_field_index_t;
 
-static ofmt_field_t link_s_fields[] = {
+static const ofmt_field_t link_s_fields[] = {
 /* name,	field width,	index,		callback	*/
 { "LINK",	15,		LINK_S_LINK,	print_link_stats_cb},
 { "IPACKETS",	10,		LINK_S_IPKTS,	print_link_stats_cb},
@@ -572,7 +622,7 @@
 /*
  * structures for 'dladm show-link'
  */
-static ofmt_field_t link_fields[] = {
+static const ofmt_field_t link_fields[] = {
 /* name,	field width,	index,	callback */
 { "LINK",	12,
 	offsetof(link_fields_buf_t, link_name), print_default_cb},
@@ -611,7 +661,7 @@
 	boolean_t		laggr_parsable;
 } laggr_args_t;
 
-static ofmt_field_t laggr_fields[] = {
+static const ofmt_field_t laggr_fields[] = {
 /* name,	field width,	offset,	callback */
 { "LINK",	16,
 	offsetof(laggr_fields_buf_t, laggr_name), print_default_cb},
@@ -641,7 +691,7 @@
 	AGGR_X_PORTSTATE
 } aggr_x_field_index_t;
 
-static ofmt_field_t aggr_x_fields[] = {
+static const ofmt_field_t aggr_x_fields[] = {
 /* name,	field width,	index		callback */
 { "LINK",	12,	AGGR_X_LINK,		print_xaggr_cb},
 { "PORT",	15,	AGGR_X_PORT,		print_xaggr_cb},
@@ -667,7 +717,7 @@
 	AGGR_S_OPKTDIST
 } aggr_s_field_index_t;
 
-static ofmt_field_t aggr_s_fields[] = {
+static const ofmt_field_t aggr_s_fields[] = {
 { "LINK",		12,	AGGR_S_LINK, print_aggr_stats_cb},
 { "PORT",		10,	AGGR_S_PORT, print_aggr_stats_cb},
 { "IPACKETS",		8,	AGGR_S_IPKTS, print_aggr_stats_cb},
@@ -693,7 +743,7 @@
 	AGGR_L_EXPIRED
 } aggr_l_field_index_t;
 
-static ofmt_field_t aggr_l_fields[] = {
+static const ofmt_field_t aggr_l_fields[] = {
 /* name,		field width,	index */
 { "LINK",		12,	AGGR_L_LINK,		print_lacp_cb},
 { "PORT",		13,	AGGR_L_PORT,		print_lacp_cb},
@@ -710,7 +760,7 @@
  * structures for 'dladm show-phys'
  */
 
-static ofmt_field_t phys_fields[] = {
+static const ofmt_field_t phys_fields[] = {
 /* name,	field width,	offset */
 { "LINK",	13,
 	offsetof(link_fields_buf_t, link_name), print_default_cb},
@@ -741,7 +791,7 @@
 	PHYS_M_CLIENT
 } phys_m_field_index_t;
 
-static ofmt_field_t phys_m_fields[] = {
+static const ofmt_field_t phys_m_fields[] = {
 /* name,	field width,	offset */
 { "LINK",	13,	PHYS_M_LINK,	print_phys_one_mac_cb},
 { "SLOT",	9,	PHYS_M_SLOT,	print_phys_one_mac_cb},
@@ -763,7 +813,7 @@
 	PHYS_H_CLIENTS
 } phys_h_field_index_t;
 
-static ofmt_field_t phys_h_fields[] = {
+static const ofmt_field_t phys_h_fields[] = {
 { "LINK",	13,	PHYS_H_LINK,	print_phys_one_hwgrp_cb},
 { "GROUP",	9,	PHYS_H_GROUP,	print_phys_one_hwgrp_cb},
 { "GROUPTYPE",	7,	PHYS_H_GRPTYPE,	print_phys_one_hwgrp_cb},
@@ -775,7 +825,7 @@
 /*
  * structures for 'dladm show-vlan'
  */
-static ofmt_field_t vlan_fields[] = {
+static const ofmt_field_t vlan_fields[] = {
 { "LINK",	16,
 	offsetof(link_fields_buf_t, link_name), print_default_cb},
 { "VID",	9,
@@ -834,7 +884,7 @@
 	LINKPROP_POSSIBLE
 } linkprop_field_index_t;
 
-static ofmt_field_t linkprop_fields[] = {
+static const ofmt_field_t linkprop_fields[] = {
 /* name,	field width,  index */
 { "LINK",	13,	LINKPROP_LINK,		print_linkprop_cb},
 { "PROPERTY",	16,	LINKPROP_PROPERTY,	print_linkprop_cb},
@@ -882,7 +932,7 @@
 	char			ss_val[30];
 } secobj_fields_buf_t;
 
-static ofmt_field_t secobj_fields[] = {
+static const ofmt_field_t secobj_fields[] = {
 { "OBJECT",	21,
 	offsetof(secobj_fields_buf_t, ss_obj_name), print_default_cb},
 { "CLASS",	21,
@@ -905,7 +955,7 @@
 	char vnic_vid[6];
 } vnic_fields_buf_t;
 
-static ofmt_field_t vnic_fields[] = {
+static const ofmt_field_t vnic_fields[] = {
 { "LINK",		13,
 	offsetof(vnic_fields_buf_t, vnic_link),	print_default_cb},
 { "OVER",		13,
@@ -932,7 +982,7 @@
 	char simnet_otherlink[DLPI_LINKNAME_MAX];
 } simnet_fields_buf_t;
 
-static ofmt_field_t simnet_fields[] = {
+static const ofmt_field_t simnet_fields[] = {
 { "LINK",		12,
 	offsetof(simnet_fields_buf_t, simnet_name), print_default_cb},
 { "MEDIA",		20,
@@ -958,7 +1008,7 @@
 	char	usage_bandwidth[14];
 } usage_fields_buf_t;
 
-static ofmt_field_t usage_fields[] = {
+static const ofmt_field_t usage_fields[] = {
 { "LINK",	13,
 	offsetof(usage_fields_buf_t, usage_link), print_default_cb},
 { "DURATION",	11,
@@ -990,7 +1040,7 @@
 	char	usage_l_bandwidth[14];
 } usage_l_fields_buf_t;
 
-static ofmt_field_t usage_l_fields[] = {
+static const ofmt_field_t usage_l_fields[] = {
 /* name,	field width,	offset */
 { "LINK",	13,
 	offsetof(usage_l_fields_buf_t, usage_l_link), print_default_cb},
@@ -1007,6 +1057,34 @@
 { NULL,		0, 0, NULL}}
 ;
 
+/* IPTUN_*FLAG_INDEX values are indices into iptun_flags below. */
+enum { IPTUN_SFLAG_INDEX, IPTUN_IFLAG_INDEX, IPTUN_NUM_FLAGS };
+
+/*
+ * structures for 'dladm show-iptun'
+ */
+typedef struct iptun_fields_buf_s {
+	char	iptun_name[MAXLINKNAMELEN];
+	char	iptun_type[5];
+	char	iptun_laddr[NI_MAXHOST];
+	char	iptun_raddr[NI_MAXHOST];
+	char	iptun_flags[IPTUN_NUM_FLAGS + 1];
+} iptun_fields_buf_t;
+
+static const ofmt_field_t iptun_fields[] = {
+{ "LINK",	16,
+	offsetof(iptun_fields_buf_t, iptun_name), print_default_cb },
+{ "TYPE",	6,
+	offsetof(iptun_fields_buf_t, iptun_type), print_default_cb },
+{ "FLAGS",	7,
+	offsetof(iptun_fields_buf_t, iptun_flags), print_default_cb },
+{ "LOCAL",	20,
+	offsetof(iptun_fields_buf_t, iptun_laddr), print_default_cb },
+{ "REMOTE",	20,
+	offsetof(iptun_fields_buf_t, iptun_raddr), print_default_cb },
+{ NULL, 0, 0, NULL}
+};
+
 /*
  * structures for 'dladm show-bridge'.  These are based on sections 14.8.1.1.3
  * and 14.8.1.2.2 of IEEE 802.1D-2004.
@@ -1265,7 +1343,7 @@
 	if (handle != NULL)
 		dladm_close(handle);
 
-	exit(1);
+	exit(EXIT_FAILURE);
 }
 
 int
@@ -1298,15 +1376,14 @@
 			cmdp->c_fn(argc - 1, &argv[1], cmdp->c_usage);
 
 			dladm_close(handle);
-			exit(0);
+			return (EXIT_SUCCESS);
 		}
 	}
 
 	(void) fprintf(stderr, gettext("%s: unknown subcommand '%s'\n"),
 	    progname, argv[1]);
 	usage();
-
-	return (0);
+	return (EXIT_FAILURE);
 }
 
 /*ARGSUSED*/
@@ -1932,12 +2009,8 @@
 		 * and should be removed once 6399681 is fixed.
 		 */
 		if (status == DLADM_STATUS_NOTSUP) {
-			(void) fprintf(stderr,
-			    gettext("%s: add operation failed: %s\n"),
-			    progname,
-			    gettext("link capabilities don't match"));
-			dladm_close(handle);
-			exit(ENOTSUP);
+			die("add operation failed: link capabilities don't "
+			    "match");
 		} else if (status == DLADM_STATUS_NONOTIF) {
 			die("not all links have link up/down detection; must "
 			    "use -f (see dladm(1M))");
@@ -2439,11 +2512,10 @@
 	    DATALINK_CLASS_PHYS, DATALINK_ANY_MEDIATYPE, DLADM_OPT_PERSIST);
 }
 
-
 /*
  * Print the active topology information.
  */
-static dladm_status_t
+void
 print_link_topology(show_state_t *state, datalink_id_t linkid,
     datalink_class_t class, link_fields_buf_t *lbuf)
 {
@@ -2460,46 +2532,43 @@
 	case DATALINK_CLASS_ETHERSTUB:
 		status = dladm_bridge_getlink(handle, linkid, lbuf->link_bridge,
 		    sizeof (lbuf->link_bridge));
-		if (status == DLADM_STATUS_OK)
-			break;
-		if (status != DLADM_STATUS_NOTFOUND)
-			return (status);
+		if (status != DLADM_STATUS_OK &&
+		    status != DLADM_STATUS_NOTFOUND)
+			(void) strcpy(lbuf->link_bridge, "?");
 		break;
 	}
 
-	status = DLADM_STATUS_OK;
 	switch (class) {
 	case DATALINK_CLASS_VLAN: {
 		dladm_vlan_attr_t	vinfo;
 
-		status = dladm_vlan_info(handle, linkid, &vinfo, flags);
-		if (status != DLADM_STATUS_OK)
-			break;
-		status = dladm_datalink_id2info(handle, vinfo.dv_linkid, NULL,
-		    NULL, NULL, lbuf->link_over, sizeof (lbuf->link_over));
+		if (dladm_vlan_info(handle, linkid, &vinfo, flags) !=
+		    DLADM_STATUS_OK) {
+			(void) strcpy(lbuf->link_over, "?");
+			break;
+		}
+		if (dladm_datalink_id2info(handle, vinfo.dv_linkid, NULL, NULL,
+		    NULL, lbuf->link_over, sizeof (lbuf->link_over)) !=
+		    DLADM_STATUS_OK)
+			(void) strcpy(lbuf->link_over, "?");
 		break;
 	}
-
 	case DATALINK_CLASS_AGGR: {
 		dladm_aggr_grp_attr_t	ginfo;
 		int			i;
 
-		lbuf->link_over[0] = '\0';
-
-		status = dladm_aggr_info(handle, linkid, &ginfo, flags);
-		if (status != DLADM_STATUS_OK)
-			break;
-
-		if (ginfo.lg_nports == 0) {
-			status = DLADM_STATUS_BADVAL;
+		if (dladm_aggr_info(handle, linkid, &ginfo, flags) !=
+		    DLADM_STATUS_OK || ginfo.lg_nports == 0) {
+			(void) strcpy(lbuf->link_over, "?");
 			break;
 		}
 		for (i = 0; i < ginfo.lg_nports; i++) {
-			status = dladm_datalink_id2info(handle,
+			if (dladm_datalink_id2info(handle,
 			    ginfo.lg_ports[i].lp_linkid, NULL, NULL, NULL,
-			    tmpbuf, sizeof (tmpbuf));
-			if (status != DLADM_STATUS_OK)
+			    tmpbuf, sizeof (tmpbuf)) != DLADM_STATUS_OK) {
+				(void) strcpy(lbuf->link_over, "?");
 				break;
+			}
 			(void) strlcat(lbuf->link_over, tmpbuf,
 			    sizeof (lbuf->link_over));
 			if (i != (ginfo.lg_nports - 1)) {
@@ -2510,39 +2579,43 @@
 		free(ginfo.lg_ports);
 		break;
 	}
-
 	case DATALINK_CLASS_VNIC: {
 		dladm_vnic_attr_t	vinfo;
 
-		status = dladm_vnic_info(handle, linkid, &vinfo, flags);
-		if (status == DLADM_STATUS_OK)
-			status = dladm_datalink_id2info(handle,
-			    vinfo.va_link_id, NULL, NULL, NULL, lbuf->link_over,
-			    sizeof (lbuf->link_over));
+		if (dladm_vnic_info(handle, linkid, &vinfo, flags) !=
+		    DLADM_STATUS_OK) {
+			(void) strcpy(lbuf->link_over, "?");
+			break;
+		}
+		if (dladm_datalink_id2info(handle, vinfo.va_link_id, NULL, NULL,
+		    NULL, lbuf->link_over, sizeof (lbuf->link_over)) !=
+		    DLADM_STATUS_OK)
+			(void) strcpy(lbuf->link_over, "?");
 		break;
 	}
-
 	case DATALINK_CLASS_BRIDGE: {
 		datalink_id_t *dlp;
 		uint_t i, nports;
 
-		status = dladm_datalink_id2info(handle, linkid, NULL, NULL,
-		    NULL, tmpbuf, sizeof (tmpbuf));
-		if (status != DLADM_STATUS_OK)
-			break;
+		if (dladm_datalink_id2info(handle, linkid, NULL, NULL,
+		    NULL, tmpbuf, sizeof (tmpbuf)) != DLADM_STATUS_OK) {
+			(void) strcpy(lbuf->link_over, "?");
+			break;
+		}
 		if (tmpbuf[0] != '\0')
 			tmpbuf[strlen(tmpbuf) - 1] = '\0';
 		dlp = dladm_bridge_get_portlist(tmpbuf, &nports);
 		if (dlp == NULL) {
-			status = DLADM_STATUS_BADVAL;
-			break;
-		}
-		lbuf->link_over[0] = '\0';
+			(void) strcpy(lbuf->link_over, "?");
+			break;
+		}
 		for (i = 0; i < nports; i++) {
-			status = dladm_datalink_id2info(handle, dlp[i], NULL,
-			    NULL, NULL, tmpbuf, sizeof (tmpbuf));
-			if (status != DLADM_STATUS_OK)
+			if (dladm_datalink_id2info(handle, dlp[i], NULL,
+			    NULL, NULL, tmpbuf, sizeof (tmpbuf)) !=
+			    DLADM_STATUS_OK) {
+				(void) strcpy(lbuf->link_over, "?");
 				break;
+			}
 			(void) strlcat(lbuf->link_over, tmpbuf,
 			    sizeof (lbuf->link_over));
 			if (i != nports - 1) {
@@ -2557,17 +2630,21 @@
 	case DATALINK_CLASS_SIMNET: {
 		dladm_simnet_attr_t	slinfo;
 
-		status = dladm_simnet_info(handle, linkid, &slinfo, flags);
-		if (status == DLADM_STATUS_OK &&
-		    slinfo.sna_peer_link_id != DATALINK_INVALID_LINKID)
-			status = dladm_datalink_id2info(handle,
+		if (dladm_simnet_info(handle, linkid, &slinfo, flags) !=
+		    DLADM_STATUS_OK) {
+			(void) strcpy(lbuf->link_over, "?");
+			break;
+		}
+		if (slinfo.sna_peer_link_id != DATALINK_INVALID_LINKID) {
+			if (dladm_datalink_id2info(handle,
 			    slinfo.sna_peer_link_id, NULL, NULL, NULL,
-			    lbuf->link_over, sizeof (lbuf->link_over));
+			    lbuf->link_over, sizeof (lbuf->link_over)) !=
+			    DLADM_STATUS_OK)
+				(void) strcpy(lbuf->link_over, "?");
+		}
 		break;
 	}
 	}
-
-	return (status);
 }
 
 static dladm_status_t
@@ -2641,10 +2718,7 @@
 		(void) get_linkstate(link, B_TRUE, lbuf->link_state);
 	}
 
-	status = print_link_topology(state, linkid, class, lbuf);
-	if (status != DLADM_STATUS_OK)
-		goto done;
-
+	print_link_topology(state, linkid, class, lbuf);
 done:
 	return (status);
 }
@@ -2661,14 +2735,8 @@
 	 * first get all the link attributes into lbuf;
 	 */
 	bzero(&lbuf, sizeof (link_fields_buf_t));
-	status = print_link(state, linkid, &lbuf);
-
-	if (status != DLADM_STATUS_OK)
-		goto done;
-
-	ofmt_print(state->ls_ofmt, &lbuf);
-
-done:
+	if ((status = print_link(state, linkid, &lbuf)) == DLADM_STATUS_OK)
+		ofmt_print(state->ls_ofmt, &lbuf);
 	state->ls_status = status;
 	return (DLADM_WALK_CONTINUE);
 }
@@ -2713,7 +2781,7 @@
 {
 	char			link[DLPI_LINKNAME_MAX];
 	datalink_class_t	class;
-	show_state_t		*state = (show_state_t *)arg;
+	show_state_t		*state = arg;
 	pktsum_t		stats, diff_stats;
 	dladm_phys_attr_t	dpa;
 	link_args_t		largs;
@@ -2776,7 +2844,6 @@
 		    sizeof (lbuf.laggr_addrpolicy), "auto");
 	}
 
-
 	(void) dladm_aggr_lacpmode2str(ginfop->lg_lacp_mode,
 	    lbuf.laggr_lacpactivity);
 	(void) dladm_aggr_lacptimer2str(ginfop->lg_lacp_timer,
@@ -2793,28 +2860,21 @@
 print_xaggr_cb(ofmt_arg_t *ofarg, char *buf, uint_t bufsize)
 {
 	const laggr_args_t 	*l = ofarg->ofmt_cbarg;
-	int 			portnum;
 	boolean_t		is_port = (l->laggr_lport >= 0);
-	static char		tmpbuf[DLADM_STRSIZE];
-	dladm_aggr_port_attr_t *portp;
+	char			tmpbuf[DLADM_STRSIZE];
+	const char		*objname;
+	dladm_aggr_port_attr_t	*portp;
 	dladm_phys_attr_t	dpa;
-	dladm_status_t		*stat, status = DLADM_STATUS_OK;
-
-	stat = l->laggr_status;
 
 	if (is_port) {
-		portnum = l->laggr_lport;
-		portp = &(l->laggr_ginfop->lg_ports[portnum]);
-		if ((status = dladm_datalink_id2info(handle,
-		    portp->lp_linkid, NULL, NULL, NULL, buf, bufsize)) !=
-		    DLADM_STATUS_OK) {
-			goto err;
-		}
-
-		if ((status = dladm_phys_info(handle, portp->lp_linkid,
-		    &dpa, DLADM_OPT_ACTIVE)) != DLADM_STATUS_OK) {
-			goto err;
-		}
+		portp = &(l->laggr_ginfop->lg_ports[l->laggr_lport]);
+		if (dladm_phys_info(handle, portp->lp_linkid, &dpa,
+		    DLADM_OPT_ACTIVE) != DLADM_STATUS_OK)
+			objname = "?";
+		else
+			objname = dpa.dp_dev;
+	} else {
+		objname = l->laggr_link;
 	}
 
 	switch (ofarg->ofmt_id) {
@@ -2823,36 +2883,25 @@
 		    (is_port && !l->laggr_parsable ? " " : l->laggr_link));
 		break;
 	case AGGR_X_PORT:
-		if (is_port)
-			break;
-		*stat = DLADM_STATUS_OK;
-		return (B_TRUE);
+		if (is_port) {
+			if (dladm_datalink_id2info(handle, portp->lp_linkid,
+			    NULL, NULL, NULL, buf, bufsize) != DLADM_STATUS_OK)
+				(void) sprintf(buf, "?");
+		}
+		break;
 
 	case AGGR_X_SPEED:
-		if (is_port) {
-			(void) snprintf(buf, bufsize, "%uMb",
-			    (uint_t)((get_ifspeed(dpa.dp_dev,
-			    B_FALSE)) / 1000000ull));
-		} else {
-			(void) snprintf(buf, bufsize, "%uMb",
-			    (uint_t)((get_ifspeed(l->laggr_link,
-			    B_TRUE)) / 1000000ull));
-		}
+		(void) snprintf(buf, bufsize, "%uMb",
+		    (uint_t)((get_ifspeed(objname, !is_port)) / 1000000ull));
 		break;
 
 	case AGGR_X_DUPLEX:
-		if (is_port)
-			(void) get_linkduplex(dpa.dp_dev, B_FALSE, tmpbuf);
-		else
-			(void) get_linkduplex(l->laggr_link, B_TRUE, tmpbuf);
+		(void) get_linkduplex(objname, !is_port, tmpbuf);
 		(void) strlcpy(buf, tmpbuf, bufsize);
 		break;
 
 	case AGGR_X_STATE:
-		if (is_port)
-			(void) get_linkstate(dpa.dp_dev,  B_FALSE, tmpbuf);
-		else
-			(void) get_linkstate(l->laggr_link, B_TRUE, tmpbuf);
+		(void) get_linkstate(objname, !is_port, tmpbuf);
 		(void) strlcpy(buf, tmpbuf, bufsize);
 		break;
 	case AGGR_X_ADDRESS:
@@ -2870,7 +2919,7 @@
 		break;
 	}
 err:
-	*stat = status;
+	*(l->laggr_status) = DLADM_STATUS_OK;
 	return (B_TRUE);
 }
 
@@ -2912,22 +2961,13 @@
 	int			portnum;
 	boolean_t		is_port = (l->laggr_lport >= 0);
 	dladm_aggr_port_attr_t	*portp;
-	dladm_status_t		*stat, status;
 	aggr_lacp_state_t	*lstate;
 
-	if (!is_port) {
+	if (!is_port)
 		return (B_FALSE); /* cannot happen! */
-	}
-
-	stat = l->laggr_status;
 
 	portnum = l->laggr_lport;
 	portp = &(l->laggr_ginfop->lg_ports[portnum]);
-
-	if ((status = dladm_datalink_id2info(handle, portp->lp_linkid,
-	    NULL, NULL, NULL, buf, bufsize)) != DLADM_STATUS_OK) {
-			goto err;
-	}
 	lstate = &(portp->lp_lacp_state);
 
 	switch (ofarg->ofmt_id) {
@@ -2937,10 +2977,9 @@
 		break;
 
 	case AGGR_L_PORT:
-		/*
-		 * buf already contains portname as a result of the
-		 * earlier call to dladm_datalink_id2info().
-		 */
+		if (dladm_datalink_id2info(handle, portp->lp_linkid, NULL, NULL,
+		    NULL, buf, bufsize) != DLADM_STATUS_OK)
+			(void) sprintf(buf, "?");
 		break;
 
 	case AGGR_L_AGGREGATABLE:
@@ -2974,11 +3013,7 @@
 		break;
 	}
 
-	*stat = DLADM_STATUS_OK;
-	return (B_TRUE);
-
-err:
-	*stat = status;
+	*(l->laggr_status) = DLADM_STATUS_OK;
 	return (B_TRUE);
 }
 
@@ -3309,14 +3344,9 @@
 	if (optind == (argc-1)) {
 		uint32_t	f;
 
-		if (strlcpy(linkname, argv[optind], MAXLINKNAMELEN)
-		    >= MAXLINKNAMELEN) {
-			(void) fprintf(stderr,
-			    gettext("%s: link name too long\n"),
-			    progname);
-			dladm_close(handle);
-			exit(1);
-		}
+		if (strlcpy(linkname, argv[optind], MAXLINKNAMELEN) >=
+		    MAXLINKNAMELEN)
+			die("link name too long");
 		if ((status = dladm_name2info(handle, linkname, &linkid, &f,
 		    NULL, NULL)) != DLADM_STATUS_OK) {
 			die_dlerr(status, "link %s is not valid", linkname);
@@ -3403,7 +3433,7 @@
 	    "link,port,ipackets,rbytes,opackets,obytes,ipktdist,opktdist";
 	char			*all_extended_fields =
 	    "link,port,speed,duplex,state,address,portstate";
-	ofmt_field_t		*pf;
+	const ofmt_field_t	*pf;
 	ofmt_handle_t		ofmt;
 	ofmt_status_t		oferr;
 	uint_t			ofmtflags = 0;
@@ -3747,6 +3777,338 @@
 	    print_phys_hwgrp_callback));
 }
 
+/*
+ * Parse the "local=<laddr>,remote=<raddr>" sub-options for the -a option of
+ * *-iptun subcommands.
+ */
+static void
+iptun_process_addrarg(char *addrarg, iptun_params_t *params)
+{
+	char *addrval;
+
+	while (*addrarg != '\0') {
+		switch (getsubopt(&addrarg, iptun_addropts, &addrval)) {
+		case IPTUN_LOCAL:
+			params->iptun_param_flags |= IPTUN_PARAM_LADDR;
+			if (strlcpy(params->iptun_param_laddr, addrval,
+			    sizeof (params->iptun_param_laddr)) >=
+			    sizeof (params->iptun_param_laddr))
+				die("tunnel source address is too long");
+			break;
+		case IPTUN_REMOTE:
+			params->iptun_param_flags |= IPTUN_PARAM_RADDR;
+			if (strlcpy(params->iptun_param_raddr, addrval,
+			    sizeof (params->iptun_param_raddr)) >=
+			    sizeof (params->iptun_param_raddr))
+				die("tunnel destination address is too long");
+			break;
+		default:
+			die("invalid address type: %s", addrval);
+			break;
+		}
+	}
+}
+
+/*
+ * Convenience routine to process iptun-create/modify/delete subcommand
+ * arguments.
+ */
+static void
+iptun_process_args(int argc, char *argv[], const char *opts,
+    iptun_params_t *params, uint32_t *flags, char *name, const char *use)
+{
+	int	option;
+	char	*altroot = NULL;
+
+	if (params != NULL)
+		bzero(params, sizeof (*params));
+	*flags = DLADM_OPT_ACTIVE | DLADM_OPT_PERSIST;
+
+	opterr = 0;
+	while ((option = getopt_long(argc, argv, opts, iptun_lopts, NULL)) !=
+	    -1) {
+		switch (option) {
+		case 'a':
+			iptun_process_addrarg(optarg, params);
+			break;
+		case 'R':
+			altroot = optarg;
+			break;
+		case 't':
+			*flags &= ~DLADM_OPT_PERSIST;
+			break;
+		case 'T':
+			params->iptun_param_type = iptun_gettypebyname(optarg);
+			if (params->iptun_param_type == IPTUN_TYPE_UNKNOWN)
+				die("unknown tunnel type: %s", optarg);
+			params->iptun_param_flags |= IPTUN_PARAM_TYPE;
+			break;
+		default:
+			die_opterr(optopt, option, use);
+			break;
+		}
+	}
+
+	/* Get the required tunnel name argument. */
+	if (argc - optind != 1)
+		usage();
+
+	if (strlcpy(name, argv[optind], MAXLINKNAMELEN) >= MAXLINKNAMELEN)
+		die("tunnel name is too long");
+
+	if (altroot != NULL)
+		altroot_cmd(altroot, argc, argv);
+}
+
+static void
+do_create_iptun(int argc, char *argv[], const char *use)
+{
+	iptun_params_t	params;
+	dladm_status_t	status;
+	uint32_t	flags;
+	char		name[MAXLINKNAMELEN];
+
+	iptun_process_args(argc, argv, ":a:R:tT:", &params, &flags, name,
+	    use);
+
+	status = dladm_iptun_create(handle, name, &params, flags);
+	if (status != DLADM_STATUS_OK)
+		die_dlerr(status, "could not create tunnel");
+}
+
+static void
+do_delete_iptun(int argc, char *argv[], const char *use)
+{
+	uint32_t	flags;
+	datalink_id_t	linkid;
+	dladm_status_t	status;
+	char		name[MAXLINKNAMELEN];
+
+	iptun_process_args(argc, argv, ":R:t", NULL, &flags, name, use);
+
+	status = dladm_name2info(handle, name, &linkid, NULL, NULL, NULL);
+	if (status != DLADM_STATUS_OK)
+		die_dlerr(status, "could not delete tunnel");
+	status = dladm_iptun_delete(handle, linkid, flags);
+	if (status != DLADM_STATUS_OK)
+		die_dlerr(status, "could not delete tunnel");
+}
+
+static void
+do_modify_iptun(int argc, char *argv[], const char *use)
+{
+	iptun_params_t	params;
+	uint32_t	flags;
+	dladm_status_t	status;
+	char		name[MAXLINKNAMELEN];
+
+	iptun_process_args(argc, argv, ":a:R:t", &params, &flags, name, use);
+
+	if ((status = dladm_name2info(handle, name, &params.iptun_param_linkid,
+	    NULL, NULL, NULL)) != DLADM_STATUS_OK)
+		die_dlerr(status, "could not modify tunnel");
+	status = dladm_iptun_modify(handle, &params, flags);
+	if (status != DLADM_STATUS_OK)
+		die_dlerr(status, "could not modify tunnel");
+}
+
+static void
+do_show_iptun(int argc, char *argv[], const char *use)
+{
+	char		option;
+	datalink_id_t	linkid;
+	uint32_t	flags = DLADM_OPT_ACTIVE;
+	char		*name = NULL;
+	dladm_status_t	status;
+	const char	*fields_str = NULL;
+	show_state_t	state;
+	ofmt_handle_t	ofmt;
+	ofmt_status_t	oferr;
+	uint_t		ofmtflags = 0;
+
+	bzero(&state, sizeof (state));
+	opterr = 0;
+	while ((option = getopt_long(argc, argv, ":pPo:",
+	    iptun_lopts, NULL)) != -1) {
+		switch (option) {
+		case 'o':
+			fields_str = optarg;
+			break;
+		case 'p':
+			state.ls_parsable = B_TRUE;
+			ofmtflags = OFMT_PARSABLE;
+			break;
+		case 'P':
+			flags = DLADM_OPT_PERSIST;
+			break;
+		default:
+			die_opterr(optopt, option, use);
+			break;
+		}
+	}
+
+	/*
+	 * Get the optional tunnel name argument.  If there is one, it must
+	 * be the last thing remaining on the command-line.
+	 */
+	if (argc - optind > 1)
+		die(gettext(use));
+	if (argc - optind == 1)
+		name = argv[optind];
+
+	oferr = ofmt_open(fields_str, iptun_fields, ofmtflags,
+	    DLADM_DEFAULT_COL, &ofmt);
+	dladm_ofmt_check(oferr, state.ls_parsable, ofmt);
+
+	state.ls_ofmt = ofmt;
+	state.ls_flags = flags;
+
+	if (name == NULL) {
+		(void) dladm_walk_datalink_id(print_iptun_walker, handle,
+		    &state, DATALINK_CLASS_IPTUN, DATALINK_ANY_MEDIATYPE,
+		    flags);
+		status = state.ls_status;
+	} else {
+		if ((status = dladm_name2info(handle, name, &linkid, NULL, NULL,
+		    NULL)) == DLADM_STATUS_OK)
+			status = print_iptun(handle, linkid, &state);
+	}
+
+	if (status != DLADM_STATUS_OK)
+		die_dlerr(status, "unable to obtain tunnel status");
+}
+
+/* ARGSUSED */
+static void
+do_up_iptun(int argc, char *argv[], const char *use)
+{
+	datalink_id_t	linkid = DATALINK_ALL_LINKID;
+	dladm_status_t	status = DLADM_STATUS_OK;
+
+	/*
+	 * Get the optional tunnel name argument.  If there is one, it must
+	 * be the last thing remaining on the command-line.
+	 */
+	if (argc - optind > 1)
+		usage();
+	if (argc - optind == 1) {
+		status = dladm_name2info(handle, argv[optind], &linkid, NULL,
+		    NULL, NULL);
+	}
+	if (status == DLADM_STATUS_OK)
+		status = dladm_iptun_up(handle, linkid);
+	if (status != DLADM_STATUS_OK)
+		die_dlerr(status, "unable to configure IP tunnel links");
+}
+
+/* ARGSUSED */
+static void
+do_down_iptun(int argc, char *argv[], const char *use)
+{
+	datalink_id_t	linkid = DATALINK_ALL_LINKID;
+	dladm_status_t	status = DLADM_STATUS_OK;
+
+	/*
+	 * Get the optional tunnel name argument.  If there is one, it must
+	 * be the last thing remaining on the command-line.
+	 */
+	if (argc - optind > 1)
+		usage();
+	if (argc - optind == 1) {
+		status = dladm_name2info(handle, argv[optind], &linkid, NULL,
+		    NULL, NULL);
+	}
+	if (status == DLADM_STATUS_OK)
+		status = dladm_iptun_down(handle, linkid);
+	if (status != DLADM_STATUS_OK)
+		die_dlerr(status, "unable to bring down IP tunnel links");
+}
+
+static iptun_type_t
+iptun_gettypebyname(char *typestr)
+{
+	int i;
+
+	for (i = 0; iptun_types[i].type_name != NULL; i++) {
+		if (strncmp(iptun_types[i].type_name, typestr,
+		    strlen(iptun_types[i].type_name)) == 0) {
+			return (iptun_types[i].type_value);
+		}
+	}
+	return (IPTUN_TYPE_UNKNOWN);
+}
+
+static const char *
+iptun_gettypebyvalue(iptun_type_t type)
+{
+	int i;
+
+	for (i = 0; iptun_types[i].type_name != NULL; i++) {
+		if (iptun_types[i].type_value == type)
+			return (iptun_types[i].type_name);
+	}
+	return (NULL);
+}
+
+static dladm_status_t
+print_iptun(dladm_handle_t dh, datalink_id_t linkid, show_state_t *state)
+{
+	dladm_status_t		status;
+	iptun_params_t		params;
+	iptun_fields_buf_t	lbuf;
+	const char		*laddr;
+	const char		*raddr;
+
+	params.iptun_param_linkid = linkid;
+	status = dladm_iptun_getparams(dh, &params, state->ls_flags);
+	if (status != DLADM_STATUS_OK)
+		return (status);
+
+	/* LINK */
+	status = dladm_datalink_id2info(dh, linkid, NULL, NULL, NULL,
+	    lbuf.iptun_name, sizeof (lbuf.iptun_name));
+	if (status != DLADM_STATUS_OK)
+		return (status);
+
+	/* TYPE */
+	(void) strlcpy(lbuf.iptun_type,
+	    iptun_gettypebyvalue(params.iptun_param_type),
+	    sizeof (lbuf.iptun_type));
+
+	/* FLAGS */
+	(void) memset(lbuf.iptun_flags, '-', IPTUN_NUM_FLAGS);
+	lbuf.iptun_flags[IPTUN_NUM_FLAGS] = '\0';
+	if (params.iptun_param_flags & IPTUN_PARAM_IPSECPOL)
+		lbuf.iptun_flags[IPTUN_SFLAG_INDEX] = 's';
+	if (params.iptun_param_flags & IPTUN_PARAM_IMPLICIT)
+		lbuf.iptun_flags[IPTUN_IFLAG_INDEX] = 'i';
+
+	/* LOCAL */
+	if (params.iptun_param_flags & IPTUN_PARAM_LADDR)
+		laddr = params.iptun_param_laddr;
+	else
+		laddr = (state->ls_parsable) ? "" : "--";
+	(void) strlcpy(lbuf.iptun_laddr, laddr, sizeof (lbuf.iptun_laddr));
+
+	/* REMOTE */
+	if (params.iptun_param_flags & IPTUN_PARAM_RADDR)
+		raddr = params.iptun_param_raddr;
+	else
+		raddr = (state->ls_parsable) ? "" : "--";
+	(void) strlcpy(lbuf.iptun_raddr, raddr, sizeof (lbuf.iptun_raddr));
+
+	ofmt_print(state->ls_ofmt, &lbuf);
+
+	return (DLADM_STATUS_OK);
+}
+
+static int
+print_iptun_walker(dladm_handle_t dh, datalink_id_t linkid, void *arg)
+{
+	((show_state_t *)arg)->ls_status = print_iptun(dh, linkid, arg);
+	return (DLADM_WALK_CONTINUE);
+}
+
 static dladm_status_t
 print_phys(show_state_t *state, datalink_id_t linkid)
 {
@@ -3868,7 +4230,7 @@
 	char		*all_mac_fields = "link,slot,address,inuse,client";
 	char		*all_hwgrp_fields =
 	    "link,group,grouptype,rings,clients";
-	ofmt_field_t	*pf;
+	const ofmt_field_t *pf;
 	ofmt_handle_t	ofmt;
 	ofmt_status_t	oferr;
 	uint_t		ofmtflags = 0;
@@ -4414,7 +4776,7 @@
 	if (!is_etherstub &&
 	    dladm_datalink_id2info(handle, vnic->va_link_id, NULL, NULL,
 	    NULL, devname, sizeof (devname)) != DLADM_STATUS_OK)
-		return (DLADM_STATUS_BADARG);
+		(void) sprintf(devname, "?");
 
 	state->vs_found = B_TRUE;
 	if (state->vs_stats) {
@@ -4517,7 +4879,7 @@
 	dladm_status_t		status;
 	boolean_t		o_arg = B_FALSE;
 	char			*fields_str = NULL;
-	ofmt_field_t		*pf;
+	const ofmt_field_t	*pf;
 	char			*all_e_fields = "link";
 	ofmt_handle_t		ofmt;
 	ofmt_status_t		oferr;
@@ -6401,7 +6763,7 @@
 	dladm_free_props(proplist);
 	if (status != DLADM_STATUS_OK) {
 		dladm_close(handle);
-		exit(1);
+		exit(EXIT_FAILURE);
 	}
 }
 
@@ -6803,7 +7165,7 @@
 
 	if (status != DLADM_STATUS_OK || pstatus != DLADM_STATUS_OK) {
 		dladm_close(handle);
-		exit(1);
+		exit(EXIT_FAILURE);
 	}
 }
 
@@ -8265,7 +8627,7 @@
 	(void) fprintf(fp, "%s\n", SMF_DLADM_UPGRADE_MSG);
 	(void) fclose(fp);
 	dladm_close(handle);
-	exit(0);
+	exit(EXIT_SUCCESS);
 }
 
 /*