Index: head/cddl/lib/libdtrace/Makefile
===================================================================
--- head/cddl/lib/libdtrace/Makefile	(revision 283025)
+++ head/cddl/lib/libdtrace/Makefile	(revision 283026)
@@ -1,123 +1,124 @@
 # $FreeBSD$
 
 .PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libdtrace/common
 .PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libgen/common
 
 LIB=		dtrace
 SRCS=		dt_aggregate.c \
 		dt_as.c \
 		dt_buf.c \
 		dt_cc.c \
 		dt_cg.c \
 		dt_consume.c \
 		dt_decl.c \
 		dt_dis.c \
 		dt_dof.c \
 		dt_error.c \
 		dt_errtags.c \
 		dt_grammar.y \
 		dt_handle.c \
 		dt_ident.c \
 		dt_isadep.c \
 		dt_inttab.c \
 		dt_lex.l \
 		dt_link.c \
 		dt_list.c \
 		dt_map.c \
 		dt_module.c \
 		dt_names.c \
 		dt_open.c \
 		dt_options.c \
 		dt_parser.c \
 		dt_pcb.c \
 		dt_pid.c \
 		dt_pq.c \
 		dt_pragma.c \
 		dt_print.c \
 		dt_printf.c \
 		dt_proc.c \
 		dt_program.c \
 		dt_provider.c \
 		dt_regset.c \
 		dt_string.c \
 		dt_strtab.c \
 		dt_subr.c \
 		dt_work.c \
 		dt_xlator.c \
 		gmatch.c
 
 DSRCS=		errno.d			\
 		io.d			\
 		ip.d			\
 		psinfo.d		\
+		siftr.d			\
 		signal.d		\
 		tcp.d			\
 		udp.d			\
 		unistd.d
 
 WARNS?=		1
 
 CFLAGS+=	-I${.OBJDIR} -I${.CURDIR} \
 		-I${.CURDIR}/../../../sys/cddl/dev/dtrace/${MACHINE_ARCH} \
 		-I${.CURDIR}/../../../sys/cddl/compat/opensolaris \
 		-I${.CURDIR}/../../../cddl/compat/opensolaris/include \
 		-I${OPENSOLARIS_USR_DISTDIR}/head \
 		-I${OPENSOLARIS_USR_DISTDIR}/lib/libctf/common \
 		-I${OPENSOLARIS_USR_DISTDIR}/lib/libdtrace/common \
 		-I${OPENSOLARIS_SYS_DISTDIR}/uts/common
 
 #CFLAGS+=	-DYYDEBUG
 
 .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
 CFLAGS+=	-I${.CURDIR}/../../../sys/cddl/dev/dtrace/x86
 CFLAGS+=	-I${OPENSOLARIS_SYS_DISTDIR}/uts/intel -DDIS_MEM
 .PATH:		${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libdtrace/i386
 .PATH:		${.CURDIR}/../../../sys/cddl/dev/dtrace/${MACHINE_ARCH}
 .PATH:		${.CURDIR}/../../../sys/cddl/dev/dtrace/x86
 .elif ${MACHINE_CPUARCH} == "sparc64"
 CFLAGS+=	-I${OPENSOLARIS_SYS_DISTDIR}/uts/sparc
 .PATH:		${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libdtrace/sparc
 .elif ${MACHINE_CPUARCH} == "mips"
 CFLAGS+=	-I${OPENSOLARIS_SYS_DISTDIR}/uts/mips
 .PATH:		${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libdtrace/mips
 .PATH:		${.CURDIR}/../../../sys/cddl/dev/dtrace/mips
 .elif ${MACHINE_CPUARCH} == "arm"
 CFLAGS+=	-I${OPENSOLARIS_SYS_DISTDIR}/uts/arm
 .PATH:		${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libdtrace/arm
 .PATH:		${.CURDIR}/../../../sys/cddl/dev/dtrace/arm
 .elif ${MACHINE_CPUARCH} == "powerpc"
 CFLAGS+=	-I${OPENSOLARIS_SYS_DISTDIR}/uts/powerpc
 .PATH:		${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libdtrace/powerpc
 .PATH:		${.CURDIR}/../../../sys/cddl/dev/dtrace/powerpc
 .else
 # temporary hack
 CFLAGS+=	-I${OPENSOLARIS_SYS_DISTDIR}/uts/intel
 .endif
 
 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64"
 SRCS+=		dis_tables.c
 DSRCS+=		regs_x86.d
 .endif
 
 LFLAGS+=-l
 
 YFLAGS+=-d
 
 CLEANFILES=	dt_errtags.c dt_names.c
 
 dt_errtags.c:
 	sh ${OPENSOLARIS_USR_DISTDIR}/lib/libdtrace/common/mkerrtags.sh < ${OPENSOLARIS_USR_DISTDIR}/lib/libdtrace/common/dt_errtags.h > dt_errtags.c
 
 dt_names.c:
 	sh ${OPENSOLARIS_USR_DISTDIR}/lib/libdtrace/common/mknames.sh < ${OPENSOLARIS_SYS_DISTDIR}/uts/common/sys/dtrace.h > dt_names.c
 
 beforedepend:	dt_errtags.c dt_names.c
 
 beforeinstall:
 .if !defined(LIBRARIES_ONLY) && exists(${DESTDIR}/usr/lib/dtrace)
 .for file in ${DSRCS}
 	${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} ${.CURDIR}/${file} ${DESTDIR}/usr/lib/dtrace
 .endfor
 .endif
 
 .include <bsd.lib.mk>
Index: head/cddl/lib/libdtrace/siftr.d
===================================================================
--- head/cddl/lib/libdtrace/siftr.d	(nonexistent)
+++ head/cddl/lib/libdtrace/siftr.d	(revision 283026)
@@ -0,0 +1,100 @@
+/*
+ * 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$
+ */
+
+#pragma D depends_on module siftr
+#pragma D depends_on provider tcp
+
+/*
+ * Convert a SIFTR direction value to a string
+ */
+#pragma D binding "1.12.1" SIFTR_IN
+inline int SIFTR_IN =	1;
+#pragma D binding "1.12.1" SIFTR_OUT
+inline int SIFTR_OUT =	2;
+
+/* SIFTR direction strings. */
+#pragma D binding "1.12.1" siftr_dir_string
+inline string siftr_dir_string[uint8_t direction] =
+	direction == SIFTR_IN ?	"in" :
+	direction == SIFTR_OUT ? "out" :
+	"unknown" ;
+
+typedef struct siftrinfo {
+	struct timeval		tval;
+	uint8_t			direction;
+	uint8_t			ipver;
+	uint32_t		hash;
+	uint16_t		tcp_localport;
+	uint16_t		tcp_foreignport;
+	uint64_t		snd_cwnd;
+	u_long			snd_wnd;
+	u_long			rcv_wnd;
+	u_long			snd_bwnd;
+	u_long			snd_ssthresh;
+	int			conn_state;
+	u_int			max_seg_size;
+	int			smoothed_rtt;
+	u_char			sack_enabled;
+	u_char			snd_scale;
+	u_char			rcv_scale;
+	u_int			flags;
+	int			rxt_length;
+	u_int			snd_buf_hiwater;
+	u_int			snd_buf_cc;
+	u_int			rcv_buf_hiwater;
+	u_int			rcv_buf_cc;
+	u_int			sent_inflight_bytes;
+	int			t_segqlen;
+	u_int			flowid;
+	u_int			flowtype;
+} siftrinfo_t;
+
+#pragma D binding "1.12.1" translator
+translator siftrinfo_t < struct pkt_node *p > {
+	direction = 		p == NULL ? 0 : p->direction;
+	ipver =			p == NULL ? 0 : p->ipver;
+	hash = 			p == NULL ? 0 : p->hash;
+	tcp_localport =		p == NULL ? 0 : ntohs(p->tcp_localport);
+	tcp_foreignport =	p == NULL ? 0 : ntohs(p->tcp_foreignport);
+	snd_cwnd =		p == NULL ? 0 : p->snd_cwnd;
+	snd_wnd =		p == NULL ? 0 : p->snd_wnd;
+	rcv_wnd =		p == NULL ? 0 : p->rcv_wnd;
+	snd_bwnd =		p == NULL ? 0 : p->snd_bwnd;
+	snd_ssthresh =		p == NULL ? 0 : p->snd_ssthresh;
+	conn_state =		p == NULL ? 0 : p->conn_state;
+	max_seg_size = 		p == NULL ? 0 : p->max_seg_size;
+	smoothed_rtt =		p == NULL ? 0 : p->smoothed_rtt;
+	sack_enabled = 		p == NULL ? 0 : p->sack_enabled;
+	snd_scale =		p == NULL ? 0 : p->snd_scale;
+	rcv_scale =		p == NULL ? 0 : p->rcv_scale;
+	flags =			p == NULL ? 0 : p->flags;
+	rxt_length = 		p == NULL ? 0 : p->rxt_length;
+	snd_buf_hiwater =	p == NULL ? 0 : p->snd_buf_hiwater;
+	snd_buf_cc = 		p == NULL ? 0 : p->snd_buf_cc;
+	rcv_buf_hiwater = 	p == NULL ? 0 : p->rcv_buf_hiwater;
+	rcv_buf_cc = 		p == NULL ? 0 : p->rcv_buf_cc;
+	sent_inflight_bytes = 	p == NULL ? 0 : p->sent_inflight_bytes;
+	t_segqlen =		p == NULL ? 0 : p->t_segqlen;
+	flowid = 		p == NULL ? 0 : p->flowid;
+	flowtype = 		p == NULL ? 0 : p->flowtype;
+};

Property changes on: head/cddl/lib/libdtrace/siftr.d
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property