From nobody Thu Mar 10 00:32:01 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 567FC19F2640; Thu, 10 Mar 2022 00:32:02 +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 4KDVPY60SHz4jqc; Thu, 10 Mar 2022 00:32:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646872322; 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=8X6Y1ijGOg7y2LjS0jRUtbJcBP6rw0ujscjquNo/74s=; b=ZYT/mxPM6m+VtviGmgUNuIwus+yxtwRQpQ7r8aUFv6ZnnM7EnJHN1z4lwijZORlWo3nl9K CtYTS9FfBO2Py+hYB6hXhni+1xnPEnR1+AFzKstnu+5YPN6TdirzArQpEjdTuOogeTQZPH 6bTb7PMmvMDpiwZ1kSS7OVVp4kDC6d12GtD6rb2YZNNztOScIsXnjkTEnL5lmXeQuqe68f uLcueNQPSQsivvB6HWKvGn3jqi47YWBPKAE/VwL/5Oc5vSNO3FTdv/Z5uS37eIjMrOBS76 /6f0Gq+NlOCxbj/D5bDbZg7IanvpfLI5ZYXR+fPyxQIYSE2ZVjw7Budv1rzB7Q== 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 A3AF31B0A6; Thu, 10 Mar 2022 00:32:01 +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 22A0W1QI059457; Thu, 10 Mar 2022 00:32:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22A0W1Ya059456; Thu, 10 Mar 2022 00:32:01 GMT (envelope-from git) Date: Thu, 10 Mar 2022 00:32:01 GMT Message-Id: <202203100032.22A0W1Ya059456@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: 1fc127c5e1e0 - stable/13 - ipfilter: Reliably print the interface name 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/13 X-Git-Reftype: branch X-Git-Commit: 1fc127c5e1e0d26051b1b66aae9a6ad50273e42e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646872322; 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=8X6Y1ijGOg7y2LjS0jRUtbJcBP6rw0ujscjquNo/74s=; b=Ni1IfVLQnfLdl/tdf4UOUO5DAczMUeFWrtPUVpCi1GBmgQPxNdZaPPS1UkPdnwCnx6+sls DYz0dm1YwHuFotfKyHm05nT18bRvrnSG1OFuAvY/9nuhZLpoZ+vmge9DWCDxNWt2C/6ZSH msTA2msn6dp+MLeAaIIhNFU5CIDGIghdOQMVuJbRoMzeL+iaOxtx0Ta2KWkNtJduzbRiO6 S+MPDUFpJitfuEkaO796ztsGOk4DN8ZpDbqZOZGb5e8iKH/YGU6s+JHbKLJnl26bDcYZPY weS/dxEvhqIdYm0KgXmVwez8zb4vPxm8P4p+u72h8xrlwq1hrOqp3fkgoq2tIg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646872322; a=rsa-sha256; cv=none; b=iaKGSyvnweCrIJSgI2BBIEseybS4VnZLF6AnOXGIVuIVPHh1eUMDq9vZB8h4NUYiaioRpJ mg8vTqFhpl4aNL5TmG1ghnL9+Q6FUBnmm79e16TFd1un6Tb9NBLnuigYlkJ7xQmWii4nXu PwVEy5KBiLshp9RUFN93nRR5WxG072lG7Pq2VEcPw7RpPRiD9Ovhpm+rfX+LTbU1Rq2C48 s+g00A0PdNRRZS9u6rWrBss/bCwgnpnzmCkTwgjTflNpd8sed0IPGnjR7Swyv2pd+xcr+Q yQ3ElCPWdMA962bLIVt1msGWG1hRzy4Qr+bHceK3lzFUpntzC6hFtnVBdfC+bQ== 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=1fc127c5e1e0d26051b1b66aae9a6ad50273e42e commit 1fc127c5e1e0d26051b1b66aae9a6ad50273e42e Author: Cy Schubert AuthorDate: 2022-03-03 06:43:48 +0000 Commit: Cy Schubert CommitDate: 2022-03-10 00:31:40 +0000 ipfilter: Reliably print the interface name When printing the interface name from the ipstate_t struct the interface name in is_ifp may not always be avaiable when reading it from kmem (tested on FreeBSD and NetBSD). However the is_ifname (the interface name character string) is almost always available -- it is not available when the source of the packet is a process running on the firewall itself. Rather than print both interface name strings, print only the one. (cherry picked from commit 93c1048a1360c3a0f1a6a9248916ef06c52b4504) --- sbin/ipf/libipf/printstate.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/sbin/ipf/libipf/printstate.c b/sbin/ipf/libipf/printstate.c index 8832a723e9f1..1f135231ff58 100644 --- a/sbin/ipf/libipf/printstate.c +++ b/sbin/ipf/libipf/printstate.c @@ -184,23 +184,19 @@ printstate(ipstate_t *sp, int opts, u_long now) PRINTF("\tis_flx %#x %#x %#x %#x\n", sp->is_flx[0][0], sp->is_flx[0][1], sp->is_flx[1][0], sp->is_flx[1][1]); } - PRINTF("\tinterfaces: in %s[%s", getifname(sp->is_ifp[0]), - sp->is_ifname[0]); + PRINTF("\tinterfaces: in %s", FORMAT_IF(sp->is_ifname[0])); if (opts & OPT_DEBUG) PRINTF("/%p", sp->is_ifp[0]); - putchar(']'); - PRINTF(",%s[%s", getifname(sp->is_ifp[1]), sp->is_ifname[1]); + PRINTF(",%s", FORMAT_IF(sp->is_ifname[1])); if (opts & OPT_DEBUG) PRINTF("/%p", sp->is_ifp[1]); - putchar(']'); - PRINTF(" out %s[%s", getifname(sp->is_ifp[2]), sp->is_ifname[2]); + PRINTF(" out %s", FORMAT_IF(sp->is_ifname[2])); if (opts & OPT_DEBUG) PRINTF("/%p", sp->is_ifp[2]); - putchar(']'); - PRINTF(",%s[%s", getifname(sp->is_ifp[3]), sp->is_ifname[3]); + PRINTF(",%s", FORMAT_IF(sp->is_ifname[3])); if (opts & OPT_DEBUG) PRINTF("/%p", sp->is_ifp[3]); - PRINTF("]\n"); + PRINTF("\n"); PRINTF("\tSync status: "); if (sp->is_sync != NULL) {