From nobody Thu Mar 10 00:32:00 2022 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 20C9519F23EB; Thu, 10 Mar 2022 00:32:01 +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 4KDVPX6h0Kz4jwG; Thu, 10 Mar 2022 00:32:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646872321; 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=yj2O51gpwMBNtcxrloTOp6tjUkpe2aW/4ACHFY6qOqY=; b=ig14c38TFnEp5s8QF/aTgJBDcSs1u1f55cvcatKsvi15lI6r/ArjLGGKy03/Y2aWzxG5t/ qIpCrtcdKVKpl99mgf0Q5/c2HjT8ayAXbje5os9OgI7pREcCumMs6sCIWD9bCN3MIRnSeN pCuHgx7zrnae9+Oqy92dW4f8ucRqOvQERgGIhn5fJY4asvtPZak22jH9PWW2BEIRh1UbVU XVfnr2Yvn07d8M/zp7N/+DsROWLn4wTXYZAOgNBiqoIvZlrO84hh4RDlKObxT2mrO/hmWu pAFOJPUkc70BuzUfdCntT45MCY4ShA5crJArDH81J577W++ti2cEzANl2WSgNg== 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 926311AF32; Thu, 10 Mar 2022 00:32:00 +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 22A0W0vE059433; Thu, 10 Mar 2022 00:32:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22A0W0m7059432; Thu, 10 Mar 2022 00:32:00 GMT (envelope-from git) Date: Thu, 10 Mar 2022 00:32:00 GMT Message-Id: <202203100032.22A0W0m7059432@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: 9b1b1dca3175 - stable/13 - ipfilter: Obtain the interface name more efficiently 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: 9b1b1dca31753ec9cb7b371af6945439812c4b58 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646872321; 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=yj2O51gpwMBNtcxrloTOp6tjUkpe2aW/4ACHFY6qOqY=; b=JfpjYmjCAritt94hLdEunBPVS2xR4fODZjcML5nwhgtyG93Jk4LV3Qk0AyPMqEl7X4iO7a MYZSJe6qmw4d02XQnFb/2eGbMch/YNny3+l+xDxe7NuMY0QZLuST4BvXd4URllafw4KyPX NUGKGNpttlNTt8xgELTz1MFXp8Sc5U4f/PRM5QYfZxry1K7eDzKOVaJhBl6XiFaHxFojM4 3b2KP5vX6aq2Ibvz9C2ksLPzBhJQIRnU9Bt2Af+HgD2ikRDp+B/tPMazcFKtFI7K4ZELZ5 b74lds8BA1DeHgLALnCM1pupAHcaYAx7TWC7zXEIWpZ2TkIcajV81abLPLrciQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646872321; a=rsa-sha256; cv=none; b=nMMjfFkyR2dsacc3LT7FJGd2mCANeQbAZOaVR4WSpnHa5wrtAoOo5dRNQHCsnA4UYRsgLl xNrNXG7OnljkNotrjmJ5w3sKmbw4UyeHkhq3pkJNyz9fTfP3ckyvA+Iiok3YnEVSyaoolE s/caesa9WMig65o0m4it846dy9EhXAdntZZXsmG6XicdE/STXuFht2tBNAd30x5W2OCmYg EXc/fZLJh8G2Y64aR60P+SyNismRm9eOV2NuOfzH0jKG4o423MZ37evoc+KtF27Yp/AGKv /90Gb6mo4Cmm7st3XKnGF4lRo4R7pQb1pXbgB1S0NNyQVphwY8s7Kk61bqdIKw== 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=9b1b1dca31753ec9cb7b371af6945439812c4b58 commit 9b1b1dca31753ec9cb7b371af6945439812c4b58 Author: Cy Schubert AuthorDate: 2022-03-03 06:40:18 +0000 Commit: Cy Schubert CommitDate: 2022-03-10 00:31:40 +0000 ipfilter: Obtain the interface name more efficiently Rather than use a kmem read to determine the interface name used by a nat_t structure through a pointer, nat_ipfs->netif->if_xname, obtain it directly from nat_ifnames in the nat_t structure itself using the new FORMAT_IF macro. (cherry picked from commit ec793543feff027f0de9dff3708ab86f5e567d15) --- sbin/ipf/libipf/printactivenat.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sbin/ipf/libipf/printactivenat.c b/sbin/ipf/libipf/printactivenat.c index 3a6337ab0f7b..222f85a5818b 100644 --- a/sbin/ipf/libipf/printactivenat.c +++ b/sbin/ipf/libipf/printactivenat.c @@ -124,8 +124,8 @@ printactivenat(nat_t *nat, int opts, u_long ticks) getsumd(nat->nat_sumd[1]), nat->nat_pr[0], nat->nat_pr[1], nat->nat_hv[0], nat->nat_hv[1], nat->nat_flags); - PRINTF("\tifp %s", getifname(nat->nat_ifps[0])); - PRINTF(",%s ", getifname(nat->nat_ifps[1])); + PRINTF("\tifp %s,%s ", FORMAT_IF(nat->nat_ifnames[0]), + FORMAT_IF(nat->nat_ifnames[1])); #ifdef USE_QUAD_T PRINTF("bytes %"PRIu64"/%"PRIu64" pkts %"PRIu64"/%"PRIu64"", (unsigned long long)nat->nat_bytes[0],