From nobody Thu Dec 09 18:58:58 2021 X-Original-To: dev-commits-src-all@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 0D3AE18C6BCD; Thu, 9 Dec 2021 18:59:00 +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 4J93Gq2kSrz4TVj; Thu, 9 Dec 2021 18:58:59 +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 024F34251; Thu, 9 Dec 2021 18:58:59 +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 1B9IwwxJ046159; Thu, 9 Dec 2021 18:58:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B9IwwPT046158; Thu, 9 Dec 2021 18:58:58 GMT (envelope-from git) Date: Thu, 9 Dec 2021 18:58:58 GMT Message-Id: <202112091858.1B9IwwPT046158@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: bc942a227a46 - stable/13 - ipfilter: Add DTrace SDT probe List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/13 X-Git-Reftype: branch X-Git-Commit: bc942a227a466255ea2da9b3d7e544b72243aaf7 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639076339; 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=LheAD4B7dcx0LYgoc5xkwDYWR71ZhESmDpa/wwTDKs4=; b=id26hUNbpaJjWzuinRFVwcYCkhdtzCOXXkLNOQ/Q9v3p2I1F8n3BqyoTUaViqZpsX+1+NS 4jSiNIQiEbcBreURJP7nyLZhiKa00LST0GC1nczSATLPdzrSEpt9vEi7tF+Y5Y+YYDTXbN ChXoXAzdBtcJU3hOt1NbDA+7gQonHacbHtfv5ezvKEegy2GL5OiY0PYKjb1gXwslrm8AUc Rl9ubb/V8hauCi+kcxgv6rwJYSPd239QQWpQ6LjzwVMaQoQIYNut25Uu0bFH9WHNljNduW txSq4BWeJV5pAdIgAUcnK0ezNb/+mAuPtvSyI/QOZXQdm5IKcfYEBUvRzqNQlQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639076339; a=rsa-sha256; cv=none; b=m7oVMLlfAYsy0DeutilgT2J5w179EvOlC2r2mJu2OFEkptLErOpAS0zSmjIUYYGxVh+HhO RuSC+Rl/3FsUIvz2+6KC35xauweLG1TxHrZSkt3QgUJ6mueKbEifZqcOVWylhdvHU6uRg2 2NggpIxymPr+Uai3A5ABFoWChuwHZATN4HwGTNawQUgo8ZGH+iXETGU5U7mlSgWysKii+l CMv2Um62vlKQ4zuRXSue0zzYcfibrwvhkkSWqZeZ3+jndzpkVZIFsa+Q5Yz7p8puLzgkPZ 8wNM+j3vD1lVCRp2DvFvMdw9iHqPZSM74m2MXd1rFC65wKC5IgfTC+xKEsfNuQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=bc942a227a466255ea2da9b3d7e544b72243aaf7 commit bc942a227a466255ea2da9b3d7e544b72243aaf7 Author: Cy Schubert AuthorDate: 2021-10-05 04:26:58 +0000 Commit: Cy Schubert CommitDate: 2021-12-09 18:50:22 +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 ",