From f134539c0238f4f378ec533d09df6655b5694ff3 Mon Sep 17 00:00:00 2001
From: Devin Teske <dteske@FreeBSD.org>
Date: Sat, 12 May 2018 06:18:15 +0000
Subject: [PATCH] dwatch(1): Expose process for ip/tcp/udp

Knowing the value of execname during these probes is of some value even
if it is commonly the interrupt kernel thread (intr[12]) -- quite often
it is not, but that depends on the probe.

Sponsored by:	Smule, Inc.
---
 cddl/usr.sbin/dwatch/libexec/ip  | 21 ---------------------
 cddl/usr.sbin/dwatch/libexec/tcp | 21 ---------------------
 cddl/usr.sbin/dwatch/libexec/udp | 21 ---------------------
 3 files changed, 63 deletions(-)

diff --git a/cddl/usr.sbin/dwatch/libexec/ip b/cddl/usr.sbin/dwatch/libexec/ip
index 49f3b0227ed3..8de385f568bf 100644
--- a/cddl/usr.sbin/dwatch/libexec/ip
+++ b/cddl/usr.sbin/dwatch/libexec/ip
@@ -17,20 +17,6 @@ ip) : ${PROBE:=ip:::send, ip:::receive} ;;
  *) : ${PROBE:=ip:::${PROFILE#ip-}}
 esac
 
-############################################################ GLOBALS
-
-#
-# This profile does not support these dwatch features
-# NB: They are disabled here so they have no effect when profile is loaded
-#
-unset EXECNAME		# -k name
-unset EXECREGEX		# -z regex
-unset GROUP		# -g group
-unset PID		# -p pid
-unset PSARGS		# affects -d
-unset PSTREE		# -R
-unset USER		# -u user
-
 ############################################################ ACTIONS
 
 exec 9<<EOF
@@ -67,13 +53,6 @@ EOF
 ACTIONS=$( cat <&9 )
 ID=$(( $ID + 1 ))
 
-############################################################ EVENT TAG
-
-exec 9<<EOF
-	printf("%s: ", "$PROFILE");
-EOF
-EVENT_TAG=$( cat <&9 )
-
 ############################################################ EVENT DETAILS
 
 if [ ! "$CUSTOM_DETAILS" ]; then
diff --git a/cddl/usr.sbin/dwatch/libexec/tcp b/cddl/usr.sbin/dwatch/libexec/tcp
index 94226ca43046..344cdb4ee6e8 100644
--- a/cddl/usr.sbin/dwatch/libexec/tcp
+++ b/cddl/usr.sbin/dwatch/libexec/tcp
@@ -55,20 +55,6 @@ tcp-status)
 	: ${PROBE:=tcp:::${PROFILE#tcp-}}
 esac
 
-############################################################ GLOBALS
-
-#
-# This profile does not support these dwatch features
-# NB: They are disabled here so they have no effect when profile is loaded
-#
-unset EXECNAME		# -k name
-unset EXECREGEX		# -z regex
-unset GROUP		# -g group
-unset PID		# -p pid
-unset PSARGS		# affects -d
-unset PSTREE		# -R
-unset USER		# -u user
-
 ############################################################ ACTIONS
 
 exec 9<<EOF
@@ -203,13 +189,6 @@ EOF
 ACTIONS=$( cat <&9 )
 ID=$(( $ID + 4 ))
 
-############################################################ EVENT TAG
-
-exec 9<<EOF
-	printf("%s: ", "$PROFILE");
-EOF
-EVENT_TAG=$( cat <&9 )
-
 ############################################################ EVENT DETAILS
 
 if [ ! "$CUSTOM_DETAILS" ]; then
diff --git a/cddl/usr.sbin/dwatch/libexec/udp b/cddl/usr.sbin/dwatch/libexec/udp
index 134a95b7fca8..1f896a71805d 100644
--- a/cddl/usr.sbin/dwatch/libexec/udp
+++ b/cddl/usr.sbin/dwatch/libexec/udp
@@ -17,20 +17,6 @@ udp) : ${PROBE:=udp:::send, udp:::receive} ;;
   *) : ${PROBE:=udp:::${PROFILE#udp-}}
 esac
 
-############################################################ GLOBALS
-
-#
-# This profile does not support these dwatch features
-# NB: They are disabled here so they have no effect when profile is loaded
-#
-unset EXECNAME		# -k name
-unset EXECREGEX		# -z regex
-unset GROUP		# -g group
-unset PID		# -p pid
-unset PSARGS		# affects -d
-unset PSTREE		# -R
-unset USER		# -u user
-
 ############################################################ ACTIONS
 
 exec 9<<EOF
@@ -81,13 +67,6 @@ EOF
 ACTIONS=$( cat <&9 )
 ID=$(( $ID + 1 ))
 
-############################################################ EVENT TAG
-
-exec 9<<EOF
-	printf("%s: ", "$PROFILE");
-EOF
-EVENT_TAG=$( cat <&9 )
-
 ############################################################ EVENT DETAILS
 
 if [ ! "$CUSTOM_DETAILS" ]; then