From: Eric Wong <e@80x24.org>
Date: Tue, 8 Apr 2025 20:49:57 +0000 (+0000)
Subject: daemon: use unpack_sockaddr_* for clarity
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0785d75893590043963beb00dd9d11411a3f9c07;p=thirdparty%2Fpublic-inbox.git

daemon: use unpack_sockaddr_* for clarity

unpack_sockaddr_un and unpack_sockaddr_in have been around since
Perl 5.002 in the mid-1990s, so be explicit and use them instead
of relying on wantarray caller context.  We'll also omit the
$host check for ($port == 0) since zero is not a valid TCP port.
---

diff --git a/lib/PublicInbox/Daemon.pm b/lib/PublicInbox/Daemon.pm
index cb13a4cc0..dbac51463 100644
--- a/lib/PublicInbox/Daemon.pm
+++ b/lib/PublicInbox/Daemon.pm
@@ -431,11 +431,7 @@ sub sockname ($) {
 	my ($s) = @_;
 	my $addr = getsockname($s) or return;
 	my ($host, $port) = host_with_port($addr);
-	if ($port == 0 && $host eq '127.0.0.1') {
-		my ($path) = Socket::sockaddr_un($addr);
-		return $path;
-	}
-	"$host:$port";
+	($port == 0) ? (Socket::unpack_sockaddr_un($addr))[0] : "$host:$port";
 }
 
 sub unpack_ipv6 ($) {
@@ -470,7 +466,7 @@ sub host_with_port ($) {
 			($host, $port) = unpack_ipv6($addr);
 			$host = "[$host]";
 		} else {
-			($port, $host) = Socket::sockaddr_in($addr);
+			($port, $host) = Socket::unpack_sockaddr_in($addr);
 			$host = Socket::inet_ntoa($host);
 		}
 	};