Merge from head

8 files changed, 675 insertions, 35 deletions

diff --git a/cddl/lib/drti/Makefile b/cddl/lib/drti/Makefile
index 6e3d3a6..c715809 100644
--- a/cddl/lib/drti/Makefile
+++ b/cddl/lib/drti/Makefile
@@ -9,6 +9,8 @@ FILESGRP=	${LIBGRP}
 FILESMODE=	${LIBMODE}
 FILESDIR=	${LIBDIR}/dtrace
 CLEANFILES=	${FILES}
+LIB=		drti-dummy
+INTERNALLIB=
 
 CFLAGS+=	-I${.CURDIR}/../../../sys/cddl/compat/opensolaris \
 		-I${.CURDIR}/../../../cddl/compat/opensolaris/include \
@@ -18,4 +20,10 @@ CFLAGS+=	-I${.CURDIR}/../../../sys/cddl/compat/opensolaris \
 		-I${OPENSOLARIS_SYS_DISTDIR}/uts/common \
 		-DPIC ${PICFLAG}
 
+.if make(install) && defined(LIBRARIES_ONLY)
+install:
+	${INSTALL} -o ${FILESOWN} -g ${FILESGRP} -m ${FILESMODE} \
+	    ${FILES} ${DESTDIR}${FILESDIR}
+.endif
+
 .include <bsd.lib.mk>
diff --git a/cddl/lib/libdtrace/Makefile b/cddl/lib/libdtrace/Makefile
index 4fd7fae..46f7046 100644
--- a/cddl/lib/libdtrace/Makefile
+++ b/cddl/lib/libdtrace/Makefile
@@ -48,8 +48,11 @@ SRCS=		dt_aggregate.c \
 
 DSRCS=		errno.d			\
 		io.d			\
+		ip.d			\
 		psinfo.d		\
 		signal.d		\
+		tcp.d			\
+		udp.d			\
 		unistd.d
 
 WARNS?=		1
diff --git a/cddl/lib/libdtrace/ip.d b/cddl/lib/libdtrace/ip.d
new file mode 100644
index 0000000..b886a0a
--- /dev/null
+++ b/cddl/lib/libdtrace/ip.d
@@ -0,0 +1,285 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * 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.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ * $FreeBSD$
+ */
+/*
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013 Mark Johnston <markj@freebsd.org>
+ */
+
+#pragma D depends_on provider ip
+
+/*
+ * pktinfo is where packet ID info can be made available for deeper
+ * analysis if packet IDs become supported by the kernel in the future.
+ * The pkt_addr member is currently always NULL.
+ */
+typedef struct pktinfo {
+	uintptr_t pkt_addr;
+} pktinfo_t;
+
+/*
+ * csinfo is where connection state info is made available.
+ */
+typedef uint32_t zoneid_t;
+typedef struct csinfo {
+	uintptr_t cs_addr;
+	uint64_t cs_cid;
+	pid_t cs_pid;
+	zoneid_t cs_zoneid;
+} csinfo_t;
+
+/*
+ * ipinfo contains common IP info for both IPv4 and IPv6.
+ */
+typedef struct ipinfo {
+	uint8_t ip_ver;			/* IP version (4, 6) */
+	uint32_t ip_plength;		/* payload length */
+	string ip_saddr;		/* source address */
+	string ip_daddr;		/* destination address */
+} ipinfo_t;
+
+/*
+ * ifinfo contains network interface info.
+ */
+typedef struct ifinfo {
+	string if_name;			/* interface name */
+	int8_t if_local;		/* is delivered locally */
+	/*netstackid_t if_ipstack;*/	/* ipstack ID */
+	uintptr_t if_addr;		/* pointer to raw ill_t */
+} ifinfo_t;
+
+typedef uint32_t ipaddr_t;
+typedef struct {
+	uint8_t		ipha_version_and_hdr_length;
+	uint8_t		ipha_type_of_service;
+	uint16_t	ipha_length;
+	uint16_t	ipha_ident;
+	uint16_t	ipha_fragment_offset_and_flags;
+	uint8_t		ipha_ttl;
+	uint8_t		ipha_protocol;
+	uint16_t	ipha_hdr_checksum;
+	ipaddr_t	ipha_src;
+	ipaddr_t	ipha_dst;
+} ipha_t;
+
+/*
+ * ipv4info is a translated version of the IPv4 header (with raw pointer).
+ * These values are NULL if the packet is not IPv4.
+ */
+typedef struct ipv4info {
+	uint8_t ipv4_ver;		/* IP version (4) */
+	uint8_t ipv4_ihl;		/* header length, bytes */
+	uint8_t ipv4_tos;		/* type of service field */
+	uint16_t ipv4_length;		/* length (header + payload) */
+	uint16_t ipv4_ident;		/* identification */
+	uint8_t ipv4_flags;		/* IP flags */
+	uint16_t ipv4_offset;		/* fragment offset */
+	uint8_t ipv4_ttl;		/* time to live */
+	uint8_t ipv4_protocol;		/* next level protocol */
+	string ipv4_protostr;		/* next level protocol, as a string */
+	uint16_t ipv4_checksum;		/* header checksum */
+	ipaddr_t ipv4_src;		/* source address */
+	ipaddr_t ipv4_dst;		/* destination address */
+	string ipv4_saddr;		/* source address, string */
+	string ipv4_daddr;		/* destination address, string */
+	ipha_t *ipv4_hdr;		/* pointer to raw header */
+} ipv4info_t;
+
+/*
+ * ipv6info is a translated version of the IPv6 header (with raw pointer).
+ * These values are NULL if the packet is not IPv6.
+ */
+typedef struct in6_addr in6_addr_t;
+typedef struct ip6_hdr ip6_t;
+typedef struct ipv6info {
+	uint8_t ipv6_ver;		/* IP version (6) */
+	uint8_t ipv6_tclass;		/* traffic class */
+	uint32_t ipv6_flow;		/* flow label */
+	uint16_t ipv6_plen;		/* payload length */
+	uint8_t ipv6_nexthdr;		/* next header protocol */
+	string ipv6_nextstr;		/* next header protocol, as a string */
+	uint8_t ipv6_hlim;		/* hop limit */
+	in6_addr_t *ipv6_src;		/* source address */
+	in6_addr_t *ipv6_dst;		/* destination address */
+	string ipv6_saddr;		/* source address, string */
+	string ipv6_daddr;		/* destination address, string */
+	ip6_t *ipv6_hdr;		/* pointer to raw header */
+} ipv6info_t;
+
+#pragma D binding "1.0" IPPROTO_IP
+inline short IPPROTO_IP =	0;
+#pragma D binding "1.0" IPPROTO_ICMP
+inline short IPPROTO_ICMP =	1;
+#pragma D binding "1.0" IPPROTO_IGMP
+inline short IPPROTO_IGMP =	2;
+#pragma D binding "1.0" IPPROTO_IPV4
+inline short IPPROTO_IPV4 =	4;
+#pragma D binding "1.0" IPPROTO_TCP
+inline short IPPROTO_TCP =	6;
+#pragma D binding "1.0" IPPROTO_UDP
+inline short IPPROTO_UDP =	17;
+#pragma D binding "1.0" IPPROTO_IPV6
+inline short IPPROTO_IPV6 =	41;
+#pragma D binding "1.0" IPPROTO_ROUTING
+inline short IPPROTO_ROUTING =	43;
+#pragma D binding "1.0" IPPROTO_FRAGMENT
+inline short IPPROTO_FRAGMENT =	44;
+#pragma D binding "1.0" IPPROTO_RSVP
+inline short IPPROTO_RSVP =	46;
+#pragma D binding "1.0" IPPROTO_GRE
+inline short IPPROTO_GRE =	47;
+#pragma D binding "1.0" IPPROTO_ESP
+inline short IPPROTO_ESP =	50;
+#pragma D binding "1.0" IPPROTO_AH
+inline short IPPROTO_AH =	51;
+#pragma D binding "1.0" IPPROTO_MOBILE
+inline short IPPROTO_MOBILE =	55;
+#pragma D binding "1.0" IPPROTO_ICMPV6
+inline short IPPROTO_ICMPV6 =	58;
+#pragma D binding "1.0" IPPROTO_DSTOPTS
+inline short IPPROTO_DSTOPTS =	60;
+#pragma D binding "1.0" IPPROTO_ETHERIP
+inline short IPPROTO_ETHERIP =	97;
+#pragma D binding "1.0" IPPROTO_PIM
+inline short IPPROTO_PIM =	103;
+#pragma D binding "1.0" IPPROTO_IPCOMP
+inline short IPPROTO_IPCOMP =	108;
+#pragma D binding "1.0" IPPROTO_SCTP
+inline short IPPROTO_SCTP =	132;
+#pragma D binding "1.0" IPPROTO_RAW
+inline short IPPROTO_RAW =	255;
+
+inline uint8_t INP_IPV4	= 0x01;
+inline uint8_t INP_IPV6 = 0x02;
+
+#pragma D binding "1.0" protocols
+inline string protocols[int proto] =
+	proto == IPPROTO_IP ? "IP" :
+	proto == IPPROTO_ICMP ? "ICMP" :
+	proto == IPPROTO_IGMP ? "IGMP" :
+	proto == IPPROTO_IPV4 ? "IPV4" :
+	proto == IPPROTO_TCP ? "TCP" :
+	proto == IPPROTO_UDP ? "UDP" :
+	proto == IPPROTO_IPV6 ? "IPV6" :
+	proto == IPPROTO_ROUTING ? "ROUTING" :
+	proto == IPPROTO_FRAGMENT ? "FRAGMENT" :
+	proto == IPPROTO_RSVP ? "RSVP" :
+	proto == IPPROTO_GRE ? "GRE" :
+	proto == IPPROTO_ESP ? "ESP" :
+	proto == IPPROTO_AH ? "AH" :
+	proto == IPPROTO_MOBILE ? "MOBILE" :
+	proto == IPPROTO_ICMPV6 ? "ICMPV6" :
+	proto == IPPROTO_DSTOPTS ? "DSTOPTS" :
+	proto == IPPROTO_ETHERIP ? "ETHERIP" :
+	proto == IPPROTO_PIM ? "PIM" :
+	proto == IPPROTO_IPCOMP ? "IPCOMP" :
+	proto == IPPROTO_SCTP ? "SCTP" :
+	proto == IPPROTO_RAW ? "RAW" :
+	"<unknown>";
+
+/*
+ * This field is always NULL according to the current definition of the ip
+ * probes.
+ */
+#pragma D binding "1.0" translator
+translator pktinfo_t < void *p > {
+	pkt_addr =	NULL;
+};
+
+#pragma D binding "1.0" translator
+translator csinfo_t < void *p > {
+	cs_addr =	NULL;
+	cs_cid =	(uint64_t)p;
+	cs_pid =	0;
+	cs_zoneid =	0;
+};
+
+#pragma D binding "1.0" translator
+translator csinfo_t < struct inpcb *p > {
+	cs_addr =       NULL;
+	cs_cid =        (uint64_t)p;
+	cs_pid =        0;	/* XXX */
+	cs_zoneid =     0;
+};
+
+#pragma D binding "1.0" translator
+translator ipinfo_t < uint8_t *p > {
+	ip_ver =	p == NULL ? 0 : ((struct ip *)p)->ip_v;
+	ip_plength =	p == NULL ? 0 :
+	    ((struct ip *)p)->ip_v == 4 ?
+	    ntohs(((struct ip *)p)->ip_len) - (((struct ip *)p)->ip_hl << 2):
+	    ntohs(((struct ip6_hdr *)p)->ip6_ctlun.ip6_un1.ip6_un1_plen);
+	ip_saddr =	p == NULL ? 0 :
+	    ((struct ip *)p)->ip_v == 4 ?
+	    inet_ntoa(&((struct ip *)p)->ip_src.s_addr) :
+	    inet_ntoa6(&((struct ip6_hdr *)p)->ip6_src);
+	ip_daddr =	p == NULL ? 0 :
+	    ((struct ip *)p)->ip_v == 4 ?
+	    inet_ntoa(&((struct ip *)p)->ip_dst.s_addr) :
+	    inet_ntoa6(&((struct ip6_hdr *)p)->ip6_dst);
+};
+
+#pragma D binding "1.0" IFF_LOOPBACK
+inline int IFF_LOOPBACK =	0x8;
+
+#pragma D binding "1.0" translator
+translator ifinfo_t < struct ifnet *p > {
+	if_name =	p->if_xname;
+	if_local =	(p->if_flags & IFF_LOOPBACK) == 0 ? 0 : 1;
+	if_addr =	(uintptr_t)p;
+};
+
+#pragma D binding "1.0" translator
+translator ipv4info_t < struct ip *p > {
+	ipv4_ver =	p == NULL ? 0 : p->ip_v;
+	ipv4_ihl =	p == NULL ? 0 : p->ip_hl;
+	ipv4_tos =	p == NULL ? 0 : p->ip_tos;
+	ipv4_length =	p == NULL ? 0 : ntohs(p->ip_len);
+	ipv4_ident =	p == NULL ? 0 : ntohs(p->ip_id);
+	ipv4_flags =	p == NULL ? 0 : (p->ip_off & 0xe000);
+	ipv4_offset =	p == NULL ? 0 : p->ip_off;
+	ipv4_ttl =	p == NULL ? 0 : p->ip_ttl;
+	ipv4_protocol =	p == NULL ? 0 : p->ip_p;
+	ipv4_protostr = p == NULL ? "<null>" : protocols[p->ip_p];
+	ipv4_checksum =	p == NULL ? 0 : ntohs(p->ip_sum);
+	ipv4_src =	p == NULL ? 0 : (ipaddr_t)ntohl(p->ip_src.s_addr);
+	ipv4_dst =	p == NULL ? 0 : (ipaddr_t)ntohl(p->ip_dst.s_addr);
+	ipv4_saddr =	p == NULL ? 0 : inet_ntoa(&p->ip_src.s_addr);
+	ipv4_daddr =	p == NULL ? 0 : inet_ntoa(&p->ip_dst.s_addr);
+	ipv4_hdr =	(ipha_t *)p;
+};
+
+#pragma D binding "1.0" translator
+translator ipv6info_t < struct ip6_hdr *p > {
+	ipv6_ver =	p == NULL ? 0 : (ntohl(p->ip6_ctlun.ip6_un1.ip6_un1_flow) & 0xf0000000) >> 28;
+	ipv6_tclass =	p == NULL ? 0 : (ntohl(p->ip6_ctlun.ip6_un1.ip6_un1_flow) & 0x0ff00000) >> 20;
+	ipv6_flow =	p == NULL ? 0 : ntohl(p->ip6_ctlun.ip6_un1.ip6_un1_flow) & 0x000fffff;
+	ipv6_plen =	p == NULL ? 0 : ntohs(p->ip6_ctlun.ip6_un1.ip6_un1_plen);
+	ipv6_nexthdr =	p == NULL ? 0 : p->ip6_ctlun.ip6_un1.ip6_un1_nxt;
+	ipv6_nextstr =	p == NULL ? "<null>" : protocols[p->ip6_ctlun.ip6_un1.ip6_un1_nxt];
+	ipv6_hlim =	p == NULL ? 0 : p->ip6_ctlun.ip6_un1.ip6_un1_hlim;
+	ipv6_src =	p == NULL ? 0 : (in6_addr_t *)&p->ip6_src;
+	ipv6_dst =	p == NULL ? 0 : (in6_addr_t *)&p->ip6_dst;
+	ipv6_saddr =	p == NULL ? 0 : inet_ntoa6(&p->ip6_src);
+	ipv6_daddr =	p == NULL ? 0 : inet_ntoa6(&p->ip6_dst);
+	ipv6_hdr =	(ip6_t *)p;
+};
diff --git a/cddl/lib/libdtrace/nfs.d b/cddl/lib/libdtrace/nfs.d
index 0f936c4..be34228 100644
--- a/cddl/lib/libdtrace/nfs.d
+++ b/cddl/lib/libdtrace/nfs.d
@@ -28,11 +28,9 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #pragma	D depends_on library ip.d
 #pragma	D depends_on library net.d
-#pragma	D depends_on module genunix
+#pragma	D depends_on module nfs
 
 typedef struct nfsv4opinfo {
 	uint64_t noi_xid;	/* unique transation ID */
@@ -47,50 +45,62 @@ typedef struct nfsv4cbinfo {
 #pragma D binding "1.5" translator
 translator conninfo_t < struct svc_req *P > {
 	ci_protocol = P->rq_xprt->xp_master->xp_netid == "tcp" ? "ipv4" :
+	    P->rq_xprt->xp_master->xp_netid == "udp" ? "ipv4" :
 	    P->rq_xprt->xp_master->xp_netid == "tcp6" ? "ipv6" :
+	    P->rq_xprt->xp_master->xp_netid == "udp6" ? "ipv6" :
 	    "<unknown>";
 
-	ci_local = inet_ntoa6(&((conn_t *)P->rq_xprt->xp_xpc.
-	    xpc_wq->q_next->q_ptr)->connua_v6addr.connua_laddr);
-
-	ci_remote = inet_ntoa6(&((conn_t *)P->rq_xprt->xp_xpc.
-	    xpc_wq->q_next->q_ptr)->connua_v6addr.connua_faddr);
+	ci_local = (P->rq_xprt->xp_master->xp_netid == "tcp" ||
+	    P->rq_xprt->xp_master->xp_netid == "udp") ?
+	    inet_ntoa(&((struct sockaddr_in *)
+	    P->rq_xprt->xp_xpc.xpc_lcladdr.buf)->sin_addr.S_un.S_addr) :
+	    (P->rq_xprt->xp_master->xp_netid == "tcp6" ||
+	    P->rq_xprt->xp_master->xp_netid == "udp6") ?
+	    inet_ntoa6(&((struct sockaddr_in6 *)
+	    P->rq_xprt->xp_xpc.xpc_lcladdr.buf)->sin6_addr) :
+	    "unknown";
+
+	ci_remote = (P->rq_xprt->xp_master->xp_netid == "tcp" ||
+	    P->rq_xprt->xp_master->xp_netid == "udp") ?
+	    inet_ntoa(&((struct sockaddr_in *)
+	    P->rq_xprt->xp_xpc.xpc_rtaddr.buf)->sin_addr.S_un.S_addr) :
+	    (P->rq_xprt->xp_master->xp_netid == "tcp6" ||
+	    P->rq_xprt->xp_master->xp_netid == "udp6") ?
+	    inet_ntoa6(&((struct sockaddr_in6 *)
+	    P->rq_xprt->xp_xpc.xpc_rtaddr.buf)->sin6_addr) :
+	    "unknown";
 };
 
 #pragma D binding "1.5" translator
-translator conninfo_t < struct compound_state *P > {
-	ci_protocol = P->req->rq_xprt->xp_master->xp_netid == "tcp" ? "ipv4" :
-	    P->req->rq_xprt->xp_master->xp_netid == "tcp6" ? "ipv6" :
-	    "<unknown>";
+translator conninfo_t < rfs4_client_t *P > {
+	ci_protocol = (P->rc_addr.ss_family == AF_INET) ? "ipv4" : "ipv6";
 
-	ci_local = inet_ntoa6(&((conn_t *)P->req->rq_xprt->xp_xpc.
-	    xpc_wq->q_next->q_ptr)->connua_v6addr.connua_laddr);
+	ci_local = "<unknown>";
 
-	ci_remote = inet_ntoa6(&((conn_t *)P->req->rq_xprt->xp_xpc.
-	    xpc_wq->q_next->q_ptr)->connua_v6addr.connua_faddr);
+	ci_remote = (P->rc_addr.ss_family == AF_INET) ?
+	    inet_ntoa((ipaddr_t *)
+	    &((struct sockaddr_in *)&P->rc_addr)->sin_addr) :
+	    inet_ntoa6(&((struct sockaddr_in6 *)&P->rc_addr)->sin6_addr);
 };
 
 #pragma D binding "1.5" translator
-translator nfsv4opinfo_t < struct compound_state *P > {
-	noi_xid = P->req->rq_xprt->xp_xid;
-	noi_cred = P->basecr;
-	noi_curpath = (P->vp == NULL) ? "<unknown>" : P->vp->v_path;
+translator nfsv4cbinfo_t < rfs4_deleg_state_t *P > {
+	nci_curpath = (P->rds_finfo->rf_vp == NULL) ? "<unknown>" :
+	    P->rds_finfo->rf_vp->v_path;
 };
 
-#pragma D binding "1.5" translator
-translator conninfo_t < rfs4_client_t *P > {
-	ci_protocol = (P->cl_addr.ss_family == AF_INET) ? "ipv4" : "ipv6";
-
-	ci_local = "<unknown>";
+typedef struct nfsv3opinfo {
+	uint64_t noi_xid;	/* unique transation ID */
+	cred_t *noi_cred;	/* credentials for operation */
+	string noi_curpath;	/* current file handle path (if any) */
+} nfsv3opinfo_t;
 
-	ci_remote = (P->cl_addr.ss_family == AF_INET) ?
-	    inet_ntoa((ipaddr_t *)
-	    &((struct sockaddr_in *)&P->cl_addr)->sin_addr) :
-	    inet_ntoa6(&((struct sockaddr_in6 *)&P->cl_addr)->sin6_addr);
-};
+typedef struct nfsv3oparg nfsv3oparg_t;
 
 #pragma D binding "1.5" translator
-translator nfsv4cbinfo_t < rfs4_deleg_state_t *P > {
-	nci_curpath = (P->finfo->vp == NULL) ? "<unknown>" :
-	    P->finfo->vp->v_path;
+translator nfsv3opinfo_t < nfsv3oparg_t *P > {
+	noi_xid = ((struct svc_req *)arg0)->rq_xprt->xp_xid;
+	noi_cred = (cred_t *)arg1;
+	noi_curpath = (arg2 == 0 || ((vnode_t *)arg2)->v_path == NULL) ?
+	    "<unknown>" : ((vnode_t *)arg2)->v_path;
 };
diff --git a/cddl/lib/libdtrace/nfssrv.d b/cddl/lib/libdtrace/nfssrv.d
new file mode 100644
index 0000000..68ac08b
--- /dev/null
+++ b/cddl/lib/libdtrace/nfssrv.d
@@ -0,0 +1,54 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * 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.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ * Portions Copyright 2006-2008 John Birrell jb@freebsd.org
+ *
+ * $FreeBSD$
+ */
+
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#pragma	D depends_on library ip.d
+#pragma	D depends_on library net.d
+#pragma	D depends_on module nfs.d
+#pragma D depends_on module nfssrv
+
+#pragma D binding "1.5" translator
+translator conninfo_t < struct compound_state *P > {
+	ci_protocol = P->req->rq_xprt->xp_master->xp_netid == "tcp" ? "ipv4" :
+	    P->req->rq_xprt->xp_master->xp_netid == "tcp6" ? "ipv6" :
+	    "<unknown>";
+
+	ci_local = inet_ntoa6(&((conn_t *)P->req->rq_xprt->xp_xpc.
+	    xpc_wq->q_next->q_ptr)->connua_v6addr.connua_laddr);
+
+	ci_remote = inet_ntoa6(&((conn_t *)P->req->rq_xprt->xp_xpc.
+	    xpc_wq->q_next->q_ptr)->connua_v6addr.connua_faddr);
+};
+
+#pragma D binding "1.5" translator
+translator nfsv4opinfo_t < struct compound_state *P > {
+	noi_xid = P->req->rq_xprt->xp_xid;
+	noi_cred = P->basecr;
+	noi_curpath = (P->vp == NULL) ? "<unknown>" : P->vp->v_path;
+};
diff --git a/cddl/lib/libdtrace/tcp.d b/cddl/lib/libdtrace/tcp.d
new file mode 100644
index 0000000..27126658
--- /dev/null
+++ b/cddl/lib/libdtrace/tcp.d
@@ -0,0 +1,203 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * 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.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ * $FreeBSD$
+ */
+/*
+ * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013 Mark Johnston <markj@freebsd.org>
+ */
+
+#pragma D depends_on library ip.d
+#pragma D depends_on provider tcp
+
+/*
+ * Convert a TCP state value to a string.
+ */
+#pragma D binding "1.0" TCPS_CLOSED
+inline int TCPS_CLOSED =	0;
+#pragma D binding "1.0" TCPS_LISTEN
+inline int TCPS_LISTEN =	1;
+#pragma D binding "1.0" TCPS_SYN_SENT
+inline int TCPS_SYN_SENT =	2;
+#pragma D binding "1.0" TCPS_SYN_RECEIVED
+inline int TCPS_SYN_RECEIVED =	3;
+#pragma D binding "1.0" TCPS_ESTABLISHED
+inline int TCPS_ESTABLISHED =	4;
+#pragma D binding "1.0" TCPS_CLOSE_WAIT
+inline int TCPS_CLOSE_WAIT =	5;
+#pragma D binding "1.0" TCPS_FIN_WAIT_1
+inline int TCPS_FIN_WAIT_1 =	6;
+#pragma D binding "1.0" TCPS_CLOSING
+inline int TCPS_CLOSING =	7;
+#pragma D binding "1.0" TCPS_LAST_ACK
+inline int TCPS_LAST_ACK =	8;
+#pragma D binding "1.0" TCPS_FIN_WAIT_2
+inline int TCPS_FIN_WAIT_2 =	9;
+#pragma D binding "1.0" TCPS_TIME_WAIT
+inline int TCPS_TIME_WAIT =	10;
+
+/* TCP segment flags. */
+#pragma D binding "1.0" TH_FIN
+inline uint8_t TH_FIN =		0x01;
+#pragma D binding "1.0" TH_SYN
+inline uint8_t TH_SYN =		0x02;
+#pragma D binding "1.0" TH_RST
+inline uint8_t TH_RST =		0x04;
+#pragma D binding "1.0" TH_PUSH
+inline uint8_t TH_PUSH =	0x08;
+#pragma D binding "1.0" TH_ACK
+inline uint8_t TH_ACK =		0x10;
+#pragma D binding "1.0" TH_URG
+inline uint8_t TH_URG =		0x20;
+#pragma D binding "1.0" TH_ECE
+inline uint8_t TH_ECE =		0x40;
+#pragma D binding "1.0" TH_CWR
+inline uint8_t TH_CWR =		0x80;
+
+/* TCP connection state strings. */
+#pragma D binding "1.0" tcp_state_string
+inline string tcp_state_string[int32_t state] =
+	state == TCPS_CLOSED ?		"state-closed" :
+	state == TCPS_LISTEN ?		"state-listen" :
+	state == TCPS_SYN_SENT ?	"state-syn-sent" :
+	state == TCPS_SYN_RECEIVED ?	"state-syn-received" :
+	state == TCPS_ESTABLISHED ?	"state-established" :
+	state == TCPS_CLOSE_WAIT ?	"state-close-wait" :
+	state == TCPS_FIN_WAIT_1 ?	"state-fin-wait-1" :
+	state == TCPS_CLOSING ?		"state-closing" :
+	state == TCPS_LAST_ACK ?	"state-last-ack" :
+	state == TCPS_FIN_WAIT_2 ?	"state-fin-wait-2" :
+	state == TCPS_TIME_WAIT ?	"state-time-wait" :
+	"<unknown>";
+
+/*
+ * tcpsinfo contains stable TCP details from tcp_t.
+ */
+typedef struct tcpsinfo {
+	uintptr_t tcps_addr;
+	int tcps_local;			/* is delivered locally, boolean */
+	int tcps_active;		/* active open (from here), boolean */
+	uint16_t tcps_lport;		/* local port */
+	uint16_t tcps_rport;		/* remote port */
+	string tcps_laddr;		/* local address, as a string */
+	string tcps_raddr;		/* remote address, as a string */
+	int32_t tcps_state;		/* TCP state */
+	uint32_t tcps_iss;		/* Initial sequence # sent */
+	uint32_t tcps_suna;		/* sequence # sent but unacked */
+	uint32_t tcps_snxt;		/* next sequence # to send */
+	uint32_t tcps_rack;		/* sequence # we have acked */
+	uint32_t tcps_rnxt;		/* next sequence # expected */
+	uint32_t tcps_swnd;		/* send window size */
+	int32_t tcps_snd_ws;		/* send window scaling */
+	uint32_t tcps_rwnd;		/* receive window size */
+	int32_t tcps_rcv_ws;		/* receive window scaling */
+	uint32_t tcps_cwnd;		/* congestion window */
+	uint32_t tcps_cwnd_ssthresh;	/* threshold for congestion avoidance */
+	uint32_t tcps_sack_fack;	/* SACK sequence # we have acked */
+	uint32_t tcps_sack_snxt;	/* next SACK seq # for retransmission */
+	uint32_t tcps_rto;		/* round-trip timeout, msec */
+	uint32_t tcps_mss;		/* max segment size */
+	int tcps_retransmit;		/* retransmit send event, boolean */
+} tcpsinfo_t;
+
+/*
+ * tcplsinfo provides the old tcp state for state changes.
+ */
+typedef struct tcplsinfo {
+	int32_t tcps_state;		/* previous TCP state */
+} tcplsinfo_t;
+
+/*
+ * tcpinfo is the TCP header fields.
+ */
+typedef struct tcpinfo {
+	uint16_t tcp_sport;		/* source port */
+	uint16_t tcp_dport;		/* destination port */
+	uint32_t tcp_seq;		/* sequence number */
+	uint32_t tcp_ack;		/* acknowledgment number */
+	uint8_t tcp_offset;		/* data offset, in bytes */
+	uint8_t tcp_flags;		/* flags */
+	uint16_t tcp_window;		/* window size */
+	uint16_t tcp_checksum;		/* checksum */
+	uint16_t tcp_urgent;		/* urgent data pointer */
+	struct tcphdr *tcp_hdr;		/* raw TCP header */
+} tcpinfo_t;
+
+#pragma D binding "1.0" translator
+translator csinfo_t < struct tcpcb *p > {
+	cs_addr =	NULL;
+	cs_cid =	(uint64_t)p;
+	cs_pid =	0;
+	cs_zoneid =	0;
+};
+
+#pragma D binding "1.0" translator
+translator tcpsinfo_t < struct tcpcb *p > {
+	tcps_addr =		(uintptr_t)p;
+	tcps_local =		-1; /* XXX */
+	tcps_active =		-1; /* XXX */
+	tcps_lport =		p == NULL ? 0 : ntohs(p->t_inpcb->inp_inc.inc_ie.ie_lport);
+	tcps_rport =		p == NULL ? 0 : ntohs(p->t_inpcb->inp_inc.inc_ie.ie_fport);
+	tcps_laddr =		p == NULL ? 0 :
+	    p->t_inpcb->inp_vflag == INP_IPV4 ?
+	    inet_ntoa(&p->t_inpcb->inp_inc.inc_ie.ie_dependladdr.ie46_local.ia46_addr4.s_addr) :
+	    inet_ntoa6(&p->t_inpcb->inp_inc.inc_ie.ie_dependladdr.ie6_local);
+	tcps_raddr =		p == NULL ? 0 :
+	    p->t_inpcb->inp_vflag == INP_IPV4 ?
+	    inet_ntoa(&p->t_inpcb->inp_inc.inc_ie.ie_dependfaddr.ie46_foreign.ia46_addr4.s_addr) :
+	    inet_ntoa6(&p->t_inpcb->inp_inc.inc_ie.ie_dependfaddr.ie6_foreign);
+	tcps_state =		p == NULL ? -1 : p->t_state;
+	tcps_iss =		p == NULL ? 0  : p->iss;
+	tcps_suna =		p == NULL ? 0  : p->snd_una;
+	tcps_snxt =		p == NULL ? 0  : p->snd_nxt;
+	tcps_rack =		p == NULL ? 0  : p->last_ack_sent;
+	tcps_rnxt =		p == NULL ? 0  : p->rcv_nxt;
+	tcps_swnd =		p == NULL ? -1  : p->snd_wnd;
+	tcps_snd_ws =		p == NULL ? -1  : p->snd_scale;
+	tcps_rwnd =		p == NULL ? -1  : p->rcv_wnd;
+	tcps_rcv_ws =		p == NULL ? -1  : p->rcv_scale;
+	tcps_cwnd =		p == NULL ? -1  : p->snd_cwnd;
+	tcps_cwnd_ssthresh =	p == NULL ? -1  : p->snd_ssthresh;
+	tcps_sack_fack =	p == NULL ? 0  : p->snd_fack;
+	tcps_sack_snxt =	p == NULL ? 0  : p->sack_newdata;
+	tcps_rto =		p == NULL ? -1  : p->t_rxtcur / 1000; /* XXX */
+	tcps_mss =		p == NULL ? -1  : p->t_maxseg;
+	tcps_retransmit =	-1; /* XXX */
+};
+
+#pragma D binding "1.0" translator
+translator tcpinfo_t < struct tcphdr *p > {
+	tcp_sport =	p == NULL ? 0  : ntohs(p->th_sport);
+	tcp_dport =	p == NULL ? 0  : ntohs(p->th_dport);
+	tcp_seq =	p == NULL ? -1 : ntohl(p->th_seq);
+	tcp_ack =	p == NULL ? -1 : ntohl(p->th_ack);
+	tcp_offset =	p == NULL ? -1 : (p->th_off >> 2);
+	tcp_flags =	p == NULL ? 0  : p->th_flags;
+	tcp_window =	p == NULL ? 0  : ntohs(p->th_win);
+	tcp_checksum =	p == NULL ? 0  : ntohs(p->th_sum);
+	tcp_urgent =	p == NULL ? 0  : ntohs(p->th_urp);
+	tcp_hdr =	(struct tcphdr *)p;
+};
+
+#pragma D binding "1.0" translator
+translator tcplsinfo_t < int s > {
+	tcps_state =	s;
+};
diff --git a/cddl/lib/libdtrace/udp.d b/cddl/lib/libdtrace/udp.d
new file mode 100644
index 0000000..5ad625d
--- /dev/null
+++ b/cddl/lib/libdtrace/udp.d
@@ -0,0 +1,75 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * 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.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ * $FreeBSD$
+ */
+/*
+ * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013 Mark Johnston <markj@FreeBSD.org>
+ */
+
+#pragma D depends_on library ip.d
+#pragma D depends_on provider udp
+
+/*
+ * udpsinfo contains stable UDP details.
+ */
+typedef struct udpsinfo {
+	uintptr_t udps_addr;
+	uint16_t udps_lport;		/* local port */
+	uint16_t udps_rport;		/* remote port */
+	string udps_laddr;		/* local address, as a string */
+	string udps_raddr;		/* remote address, as a string */
+} udpsinfo_t;
+
+/*
+ * udpinfo is the UDP header fields.
+ */
+typedef struct udpinfo {
+	uint16_t udp_sport;		/* source port */
+	uint16_t udp_dport;		/* destination port */
+	uint16_t udp_length;		/* total length */
+	uint16_t udp_checksum;          /* headers + data checksum */
+	struct udphdr *udp_hdr;		/* raw UDP header */
+} udpinfo_t;
+
+#pragma D binding "1.0" translator
+translator udpsinfo_t < struct inpcb *p > {
+	udps_addr =	(uintptr_t)p;
+	udps_lport =	p == NULL ? 0 : ntohs(p->inp_inc.inc_ie.ie_lport);
+	udps_rport =	p == NULL ? 0 : ntohs(p->inp_inc.inc_ie.ie_fport);
+	udps_laddr =	p == NULL ? "" :
+	    p->inp_vflag == INP_IPV4 ?
+	    inet_ntoa(&p->inp_inc.inc_ie.ie_dependladdr.ie46_local.ia46_addr4.s_addr) :
+	    inet_ntoa6(&p->inp_inc.inc_ie.ie_dependladdr.ie6_local);
+	udps_raddr =	p == NULL ? "" :
+	    p->inp_vflag == INP_IPV4 ?
+	    inet_ntoa(&p->inp_inc.inc_ie.ie_dependfaddr.ie46_foreign.ia46_addr4.s_addr) :
+	    inet_ntoa6(&p->inp_inc.inc_ie.ie_dependfaddr.ie6_foreign);
+};
+
+#pragma D binding "1.0" translator
+translator udpinfo_t < struct udphdr *p > {
+	udp_sport =	p == NULL ? 0 : ntohs(p->uh_sport);
+	udp_dport =	p == NULL ? 0 : ntohs(p->uh_dport);
+	udp_length =	p == NULL ? 0 : ntohs(p->uh_ulen);
+	udp_checksum =	p == NULL ? 0 : ntohs(p->uh_sum);
+	udp_hdr =	p;
+};
diff --git a/cddl/lib/libzpool/Makefile b/cddl/lib/libzpool/Makefile
index b159d3a..848325a 100644
--- a/cddl/lib/libzpool/Makefile
+++ b/cddl/lib/libzpool/Makefile
@@ -64,7 +64,9 @@ NO_PROFILE=
 
 CSTD=	c99
 
-CFLAGS+=	-DDEBUG=1
-#DEBUG_FLAGS+=	-g
+# Since there are many asserts in this library, it makes no sense to compile
+# it without debugging.
+
+CFLAGS+=	-g -DDEBUG=1
 
 .include <bsd.lib.mk>