Merge sync of head

6 files changed, 302 insertions, 1 deletions

diff --git a/share/dtrace/Makefile b/share/dtrace/Makefile
index 328f806..e4f69d4 100644
--- a/share/dtrace/Makefile
+++ b/share/dtrace/Makefile
@@ -15,7 +15,11 @@ _toolkit=	toolkit
 SCRIPTS=	disklatency \
 		disklatencycmd \
 		hotopen \
-		nfsclienttime
+		nfsclienttime \
+		udptrack \
+		tcpstate \
+		tcptrack \
+		tcpconn 
 
 SCRIPTSDIR= ${SHAREDIR}/dtrace
 
diff --git a/share/dtrace/siftr b/share/dtrace/siftr
new file mode 100755
index 0000000..d12d35f
--- /dev/null
+++ b/share/dtrace/siftr
@@ -0,0 +1,68 @@
+#!/usr/sbin/dtrace -s
+/*-
+ * Copyright (c) 2015 George V. Neville-Neil
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD$
+ *
+ * The siftr D script collects data from the SIFTR kernel module.
+ *
+ * Usage: siftr
+ */
+
+#pragma D option quiet
+tcp:kernel::siftr
+{
+	printf("direction %s state %s local %d remote %d\n",
+	       siftr_dir_string[args[0]->direction],
+	       tcp_state_string[args[0]->conn_state],
+	       args[0]->tcp_localport,
+	       args[0]->tcp_foreignport);
+	printf("snd_cwnd %d snd_wnd %d rcv_wnd %d snd_bwnd %d snd_ssthresh %d\n",
+	       args[0]->snd_cwnd,
+	       args[0]->snd_wnd,
+	       args[0]->rcv_wnd,
+	       args[0]->snd_bwnd,
+	       args[0]->snd_ssthresh);
+	printf("\tmax_seg_size %u smoothed_rtt %d sack_enabled %d\n",
+	       args[0]->max_seg_size,
+	       args[0]->smoothed_rtt,
+	       args[0]->sack_enabled);
+	printf("\tsnd_scale %d rcv_scale %d flags 0x%x rxt_length %d\n",
+	       args[0]->snd_scale,
+	       args[0]->rcv_scale,
+	       args[0]->flags,
+	       args[0]->rxt_length);
+	printf("\tsnd_buf_hiwater %u snd_buf_cc %u rcv_buf_hiwater %u\n",
+	       args[0]->snd_buf_hiwater,
+	       args[0]->snd_buf_cc,
+	       args[0]->rcv_buf_hiwater);
+	printf("\trcv_buf_cc %u sent_inflight_bytes %u t_segqlen %d\n",
+	       args[0]->rcv_buf_cc,
+	       args[0]->sent_inflight_bytes,
+	       args[0]->t_segqlen);
+	printf("\tflowid %u flowtype %u\n",
+	       args[0]->flowid,
+	       args[0]->flowtype);
+}
diff --git a/share/dtrace/tcpconn b/share/dtrace/tcpconn
new file mode 100755
index 0000000..5cf3c1c
--- /dev/null
+++ b/share/dtrace/tcpconn
@@ -0,0 +1,47 @@
+#!/usr/sbin/dtrace -s
+/*
+ * Copyright (c) 2015 George V. Neville-Neil
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD$
+ *
+ * The tcpconn D script shows histograms of the source of TCP connections
+ *
+ * Usage: tcpconn
+ */
+
+#pragma D option quiet
+BEGIN
+{
+	printf("Press Ctrl-C for output\n");
+	printf("Source IP");
+}
+tcp:kernel::accept-established
+{
+	@sources[args[2]->ip_daddr] = count();	
+}
+tcp:kernel::accept-refused
+{
+	@sources[args[2]->ip_daddr] = count();	
+}
diff --git a/share/dtrace/tcpstate b/share/dtrace/tcpstate
new file mode 100755
index 0000000..4528bd7
--- /dev/null
+++ b/share/dtrace/tcpstate
@@ -0,0 +1,46 @@
+#!/usr/sbin/dtrace -s
+/*
+ * Copyright (c) 2015 George V. Neville-Neil
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD$
+ *
+ * The tcpstate D script shows TCP sockets transitioning between states.
+ *
+ * Usage: tcpstate
+ */
+
+#pragma D option quiet
+BEGIN
+{
+	printf("Old State\t\tNew State\n");
+}
+
+tcp:kernel::state-change
+{
+	newstate = args[3]->tcps_state;
+	oldstate = args[5]->tcps_state;
+	printf("%s\t\t%s\n", tcp_state_string[oldstate],
+			     tcp_state_string[newstate]);
+}
diff --git a/share/dtrace/tcptrack b/share/dtrace/tcptrack
new file mode 100755
index 0000000..4974a27
--- /dev/null
+++ b/share/dtrace/tcptrack
@@ -0,0 +1,83 @@
+#!/usr/sbin/dtrace -s
+/*
+ * Copyright (c) 2015 George V. Neville-Neil
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD$
+ *
+ * The tcptrack D script shows various information about TCP
+ * connections including acceptance and refusal of inbound and
+ * outbound connections as well as state changes.
+ *
+ * Usage: tcptrack
+ */
+
+#pragma D option quiet
+tcp:kernel::accept-established
+{
+	printf("Accept connection from %s:%d\tto %s:%d\n",
+		       args[2]->ip_saddr,
+		       args[4]->tcp_sport,
+		       args[2]->ip_daddr,
+		       args[4]->tcp_dport);
+
+}
+
+tcp:kernel::accept-refused
+{
+	printf("Refused connection from %s:%d\tto %s:%d\n", 
+		       args[2]->ip_daddr,
+		       args[4]->tcp_dport,
+		       args[2]->ip_saddr,
+		       args[4]->tcp_sport);
+
+}
+
+tcp:kernel::connect-established
+{
+	printf("Connection established to %s:%d from %s:%d\n",
+		       args[2]->ip_saddr,
+		       args[4]->tcp_sport,
+		       args[2]->ip_daddr,
+		       args[4]->tcp_dport);
+
+}
+
+tcp:kernel::connect-refused
+{
+	printf("Connection refused by %s:%d from %s:%d\n", 
+		       args[2]->ip_saddr,
+		       args[4]->tcp_sport,
+		       args[2]->ip_daddr,
+		       args[4]->tcp_dport);
+}
+
+tcp:kernel::state-change
+{
+	newstate = args[3]->tcps_state;
+	oldstate = args[5]->tcps_state;
+	printf("State changed from %s\t\t%s\n", tcp_state_string[oldstate],
+				     tcp_state_string[newstate]);
+}
+
diff --git a/share/dtrace/udptrack b/share/dtrace/udptrack
new file mode 100755
index 0000000..ca7e8e9
--- /dev/null
+++ b/share/dtrace/udptrack
@@ -0,0 +1,53 @@
+#!/usr/sbin/dtrace -s
+/*
+ * Copyright (c) 2015 George V. Neville-Neil
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD$
+ *
+ * The udptrack D script shows various information about UDP
+ * data that are sent and received on the host.
+ *
+ * Usage: udptrack
+ */
+
+#pragma D option quiet
+udp:kernel::receive
+{
+	printf("Received %d bytes of data from %s:%d\n",
+	       args[4]->udp_length,
+	       args[2]->ip_saddr,
+	       args[4]->udp_sport);
+	tracemem(args[4]->udp_hdr, 64);
+}
+
+udp:kernel::send
+{
+	printf("Sent %d bytes of data to %s:%d\n", 
+	       args[4]->udp_length,
+	       args[2]->ip_daddr,
+	       args[4]->udp_dport);
+	tracemem(args[4]->udp_hdr, 64);
+}
+