git: 080e8cad4362 - main - pfctl: Make print_hostname() less AF-specific

The branch main has been updated by kp:

URL: https://cgit.FreeBSD.org/src/commit/?id=080e8cad436207a3c09a3c32460e0a0dc7b0a999

commit 080e8cad436207a3c09a3c32460e0a0dc7b0a999
Author:     Kristof Provost <kp@FreeBSD.org>
AuthorDate: 2025-06-27 12:35:35 +0000
Commit:     Kristof Provost <kp@FreeBSD.org>
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 <kn@openbsd.org>, 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