From nobody Thu Dec 09 19:00:20 2021 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id A976B18C88B7; Thu, 9 Dec 2021 19:00:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4J93JP20gMz4Ttx; Thu, 9 Dec 2021 19:00:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CE27F40A3; Thu, 9 Dec 2021 19:00:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1B9J0K8f055452; Thu, 9 Dec 2021 19:00:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B9J0KuS055446; Thu, 9 Dec 2021 19:00:20 GMT (envelope-from git) Date: Thu, 9 Dec 2021 19:00:20 GMT Message-Id: <202112091900.1B9J0KuS055446@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: 09aa9a1f82bf - stable/12 - ipfilter: Add DTrace SDT probe List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 09aa9a1f82bfccfd7e87dcf7f2bf055d2c137b52 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639076421; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b1/2WHv9BZwrUvzd/y6DoXzEVw1jCmbpmZhM+OaGKkM=; b=CnimWjWWVr2okDFWG3GaHjOR8DyrOZ8kriwKXOWq6xl7lZnaLOetqCO8TTOefaXPHEd4AM UTHOrfLwKcXomEvr2+VE/AJ8h/gqn6wgoXjpj/eDJsda+3eVs/1wcxYnDbhnoBq5VambcR GEbfj3kUasPNBd9dtK+3sRtRZEfeVGd8TEzsuzEsvElPyWIsefQn9y8sBG74iuGpAiueWU eGvaiRomEr9gqRLkVM5hPN95dK2EsB49obNIxU6keYsjERLdGSnnRZuZZblE999bA02JAa +gl3BUMlbMvV9Z8ARqCvqzBjUtrJkXxe0Wesnm8T6QkbrXWNrYMii7sDedaegw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639076421; a=rsa-sha256; cv=none; b=ijMlZKi0/Rc8zw2sHR69t+kx4FibthxyD+LSdRzkc08GvcyEQk49RDOjL2meUOzD4Vsomy XpgeZNQ9KVjP/lqJ+YJIvCG1+cgxAGQ4+b467IWBME6uzr5DyTI/Tk/+/DpfQm/9xnQcz9 Gqx9E1bka7JK33KzeG6gfJGgIxt3KPc8H3AqPD7DqKzg/eEfHNnZTArAXHsaM5dYfWQUBn aAbPgzFGw8zJG/Elq6cCYkqNjl6llW4NbXGCdr/KtHW6pzGk81TScmEBzH9sCDFsIf3W/F 4d4zeYZW3MSDboChI6zptlFDLnW6O3abQKiSkg6vTrpsIL81UdDlBTSIU30yOg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=09aa9a1f82bfccfd7e87dcf7f2bf055d2c137b52 commit 09aa9a1f82bfccfd7e87dcf7f2bf055d2c137b52 Author: Cy Schubert AuthorDate: 2021-10-05 04:26:58 +0000 Commit: Cy Schubert CommitDate: 2021-12-09 18:52:11 +0000 ipfilter: Add DTrace SDT probe Add an SDT probe, using the newly created DT5 macro, in similar vein to DEBUG_PARSE printf for when FTP junk is anticipated and ok. This will assist in debugging port (active) FTP proxy issues. (cherry picked from commit 106f42596e4b61c26425735a3999bd51d39dd82c) --- sys/contrib/ipfilter/netinet/ip_ftp_pxy.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c b/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c index 0079e884a8b8..4ac7ffc7e5b1 100644 --- a/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c +++ b/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c @@ -1523,6 +1523,8 @@ whilemore: len = wptr - rptr; f->ftps_junk = ipf_p_ftp_valid(softf, ftp, rv, rptr, len); + DT5(junk_ftp_valid, int, len, int, rv, u_long, rptr, + u_long, wptr, int, f->ftps_junk); if (softf->ipf_p_ftp_debug & DEBUG_PARSE) { printf("%s=%d len %d rv %d ptr %lx/%lx ",