From nobody Wed Jul 2 08:27:12 2025 X-Original-To: dev-commits-src-main@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 4bXCgP1dvqz604dk; Wed, 02 Jul 2025 08:27:13 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bXCgP03Rpz3ZRZ; Wed, 02 Jul 2025 08:27:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751444833; 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=UaepyVyBInXOuGeVHmcMn+xnEtYRwtmQX6SrOpGFp80=; b=B05Op5ASHqImSf2kHmZexnnyFMDGT2POC1Eluk8Xc/h3ZdmBCPe5CimJRkD6nifmkN7Yr/ kGUoDTdydgJzzxiRMzCNtksgCqJFYAlC0s37o21arfK4SwC+ehNC1Z3bQnvKId1dfOBH7R RionUCXwE7doS7sn0EhTQvqILwHFRRTWXSKfUEaVnrv8gWX6ZXbDdIokhZXrVvfYT2CJ7C fv49sC1yLP63aJjltE4lwmhY4dkaEclXh6hTf7M5yAteeEVUlwq8XvMzf3WIJ7Df43MUkd pEn4TX3nhlX4N1j44Txa8qp8Mt3y2TpqjqSr8+5EhoG+X+yGBAStBX2nK25ptQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751444833; 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=UaepyVyBInXOuGeVHmcMn+xnEtYRwtmQX6SrOpGFp80=; b=Pik8jt/1d5PI14ZfxjaKFAeooX/HvKCUdEHs+NO4J6WIpVvonBUip3os/21r/5hvDVBxn1 iAJuuC/gOgXGBq37zSnSDZMomXf1h98FyoXTNFsmYXzf28ax2eBCKNuYm3BYqsMe/xlKXA D04d+APqdjV9cI2S4cu7JKeyrnWkqCdoKTPt0PDI6hQFs8B0GZTX94mQKN5n6L1InCGgWZ x92GJAGEoUtOjvmVDweB82Snld0c+d/lMGImGQEQTyY7Hm79NkFQFmIA4buRprWHZFIuA1 L74JaX97XFMJvtGewQ+5u33EpRGUBhG6/dzlRVi0LjejocvgjJLNOu/sQ9+1TA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751444833; a=rsa-sha256; cv=none; b=w+5+865HdpYKXszOv7SsQQZxLpzw6mViy3pCQAscyy8ksg+5ZD3xUwuMZ5NdL+Ax5+szEk 88yyZcDKn5gC+dxmUYJYybPQqZZsXOTVSiEyl9tTnIDCav6zM+6tvxix38KKMer2wcOGyw HkOF8VoDiSrUY6p8YW0FfqeT+8fFkf2LoYFxuZFy30VkdCRYNXyuBC/FOyS8bFcrf9iqsk 5I9Cod14Km8Edt0C/VIWHIB0/Q6rXgw/G54IBFp0oVPm+4w0yv5q16PWTDR57lOmXzhzT+ UXimURrw7pfuxWODA9E7hxbCo5P+pRCgcp9J2QWaxZeDvDK1US/b+dNgd728Vw== 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 4bXCgN6mTQz1BVL; Wed, 02 Jul 2025 08:27:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5628RCPl025552; Wed, 2 Jul 2025 08:27:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5628RC3j025549; Wed, 2 Jul 2025 08:27:12 GMT (envelope-from git) Date: Wed, 2 Jul 2025 08:27:12 GMT Message-Id: <202507020827.5628RC3j025549@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 080e8cad4362 - main - pfctl: Make print_hostname() less AF-specific List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 080e8cad436207a3c09a3c32460e0a0dc7b0a999 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=080e8cad436207a3c09a3c32460e0a0dc7b0a999 commit 080e8cad436207a3c09a3c32460e0a0dc7b0a999 Author: Kristof Provost AuthorDate: 2025-06-27 12:35:35 +0000 Commit: Kristof Provost CommitDate: 2025-07-02 07:40:53 +0000 pfctl: Make print_hostname() less AF-specific Reduce differences address families and replace strlcpy() with simpler if/else logic as done in print_addr_str(). OK sashan Obtained from: OpenBSD, kn , 7fdc021ee4 Sponsored by: Rubicon Communications, LLC ("Netgate") --- sbin/pfctl/pf_print_state.c | 48 ++++++++++++++++++++------------------------- 1 file changed, 21 insertions(+), 27 deletions(-) diff --git a/sbin/pfctl/pf_print_state.c b/sbin/pfctl/pf_print_state.c index d0882b04f5f6..5abdc2de419d 100644 --- a/sbin/pfctl/pf_print_state.c +++ b/sbin/pfctl/pf_print_state.c @@ -134,34 +134,28 @@ print_addr_str(sa_family_t af, struct pf_addr *addr) void print_name(struct pf_addr *addr, sa_family_t af) { - char host[NI_MAXHOST]; - - strlcpy(host, "?", sizeof(host)); - switch (af) { - case AF_INET: { - struct sockaddr_in sin; - - memset(&sin, 0, sizeof(sin)); - sin.sin_len = sizeof(sin); - sin.sin_family = AF_INET; - sin.sin_addr = addr->v4; - getnameinfo((struct sockaddr *)&sin, sin.sin_len, - host, sizeof(host), NULL, 0, NI_NOFQDN); - break; - } - case AF_INET6: { - struct sockaddr_in6 sin6; - - memset(&sin6, 0, sizeof(sin6)); - sin6.sin6_len = sizeof(sin6); - sin6.sin6_family = AF_INET6; - sin6.sin6_addr = addr->v6; - getnameinfo((struct sockaddr *)&sin6, sin6.sin6_len, - host, sizeof(host), NULL, 0, NI_NOFQDN); - break; - } + struct sockaddr_storage ss; + struct sockaddr_in *sin; + struct sockaddr_in6 *sin6; + char host[NI_MAXHOST]; + + memset(&ss, 0, sizeof(ss)); + ss.ss_family = af; + if (ss.ss_family == AF_INET) { + sin = (struct sockaddr_in *)&ss; + sin->sin_len = sizeof(*sin); + sin->sin_addr = addr->v4; + } else { + sin6 = (struct sockaddr_in6 *)&ss; + sin6->sin6_len = sizeof(*sin6); + sin6->sin6_addr = addr->v6; } - printf("%s", host); + + if (getnameinfo((struct sockaddr *)&ss, ss.ss_len, host, sizeof(host), + NULL, 0, NI_NOFQDN) != 0) + printf("?"); + else + printf("%s", host); } void