Fix Dns::getAddresses() (librenms#18610)

murrant · web-flow · commit 7aed25a6fed2 · 2025-12-08T09:03:30.000-06:00
Did not properly check for IPv6 key
diff --git a/LibreNMS/Util/Dns.php b/LibreNMS/Util/Dns.php
@@ -79,7 +79,11 @@ public function getAddresses(string $hostname, ?AddressFamily $family = null): a
             return [];
         }
 
-        return array_map(fn ($info) => socket_addrinfo_explain($info)['ai_addr']['sin_addr'], $result);
+        return array_map(function ($info) {
+            $explaned = socket_addrinfo_explain($info);
+
+            return $explaned['ai_addr']['sin6_addr'] ?? $explaned['ai_addr']['sin_addr'];
+        }, $result);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,11 @@ public function getAddresses(string $hostname, ?AddressFamily $family = null): a`
`79`	`79`	`return [];`
`80`	`80`	`}`
`81`	`81`
`82`		`- return array_map(fn ($info) => socket_addrinfo_explain($info)['ai_addr']['sin_addr'], $result);`
	`82`	`+ return array_map(function ($info) {`
	`83`	`+ $explaned = socket_addrinfo_explain($info);`
	`84`	`+`
	`85`	`+ return $explaned['ai_addr']['sin6_addr'] ?? $explaned['ai_addr']['sin_addr'];`
	`86`	`+ }, $result);`
`83`	`87`	`}`
`84`	`88`
`85`	`89`	`/**`