From nobody Tue Jan 11 01:42:07 2022 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 E6D87194A735; Tue, 11 Jan 2022 01:42:07 +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 4JXtjC4NS7z3tcQ; Tue, 11 Jan 2022 01:42:07 +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 6F03E7D4E; Tue, 11 Jan 2022 01:42:07 +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 20B1g7d1077493; Tue, 11 Jan 2022 01:42:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20B1g7RF077492; Tue, 11 Jan 2022 01:42:07 GMT (envelope-from git) Date: Tue, 11 Jan 2022 01:42:07 GMT Message-Id: <202201110142.20B1g7RF077492@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: 486bb274aa0a - stable/12 - ipfilter: Add SDT probe frb_natv6in 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: 486bb274aa0a5482684b2ee4ab2949ca98b0df8d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641865327; 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=3CXIvV8szt0DItZw/bKKeDj6EwtWJfSgniTbQYqLHC0=; b=CP7AITA+ewBVFjMhuOTiQTnjWxpkKL8hsKRpVce/orAADu2kqfFJgvmJPpUecLtu1/48Kz Nt9+OD2ay4GE4Sd1b4IpRDwqw9fPi8l1Dkl4KqEFX5aaDig8rURS8BUASj0gORBEGm1IKP jZvQSdph1hT2PIr/eaGeQj8dr0UswGK0ZiXUXNdfffJyMjQDdn7Oe5ys3kVtCXYLt1SUuA oq8QCaduC6ffWcIzW7llhZnMCLS+S+PsXWfCh3UQXq95rX06vfYCnpS2riC9OOrOAsuxM3 QgDnt5m3n+v6qG1TeAAGZe+PHPgl8ggMMXSIYEXQuQK+KhpMjdw1m5c0nuAq5Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641865327; a=rsa-sha256; cv=none; b=nFGdh/YrNU1q0vQsYOKKm8o7FhUzEJwgBNHgjjQBeo4DnLfMOac/WWESLc1y94/nwZoJqJ xBDDB30cBGthinG0EPmXQ04+6Jrc2iTNl3djPnlVaSoiO00FMxTzCuZ9SaGGL3/tVfAsii vVCdoK5CzIBt9+HkDA/1FKu+TxU5F75xytjYtAuKecOY+zBI6RC5Dx24lhal/SutDZA5i4 xL9hROr2pHF2V71xV/u3BCfoH5b8aS6RXuPU6nZnN16cDonCyUHGjITxlWgA+ZauzFVlWG Ox8XLv/3DvTEEk8x/rh+a2MUYVX7izqxqmQejbLNzLCySKccW2EOGdsFpoWV5w== 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=486bb274aa0a5482684b2ee4ab2949ca98b0df8d commit 486bb274aa0a5482684b2ee4ab2949ca98b0df8d Author: Cy Schubert AuthorDate: 2021-12-29 01:45:21 +0000 Commit: Cy Schubert CommitDate: 2022-01-10 15:09:26 +0000 ipfilter: Add SDT probe frb_natv6in Like IPv4 NAT frb_natv4in, add a corresponding IPv6 NAT SDT probe called frb_natv6in. (cherry picked from commit 6b54d2f4c52985b2e48c7ece6f0bdbc396bcc23f) --- sys/contrib/ipfilter/netinet/ip_nat6.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/contrib/ipfilter/netinet/ip_nat6.c b/sys/contrib/ipfilter/netinet/ip_nat6.c index baa3c302504a..b12eaeef674c 100644 --- a/sys/contrib/ipfilter/netinet/ip_nat6.c +++ b/sys/contrib/ipfilter/netinet/ip_nat6.c @@ -3167,6 +3167,7 @@ maskloop: inmatchfail: RWLOCK_EXIT(&softc->ipf_nat); + DT2(frb_natv6in, fr_info_t *, fin, int, rval); switch (rval) { case -1 :