From 6777fc3b6efb59bf42ee709508cf384ec5890dcf Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Wed, 18 Feb 2015 14:33:13 +0545 Subject: [PATCH] diag_arp allow underscore in resolved host names is_hostname() and is_domain() allow underscore in the names. So it is possible to have underscore in host names, for example in DHCP server static mapped entries I have some things like: 10.42.3.4 client-pc-01_LAN 10.42.3.5 client-pc-01_WIFI These reverse-resolve fine - 10.42.3.4 becomes client-pc-01_LAN But the preg_match here misses such names that have an underscore in them. I noticed this when looking into forum post: https://forum.pfsense.org/index.php?topic=88956.0 --- usr/local/www/diag_arp.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr/local/www/diag_arp.php b/usr/local/www/diag_arp.php index ffe960ff67..16b3303f0f 100644 --- a/usr/local/www/diag_arp.php +++ b/usr/local/www/diag_arp.php @@ -251,7 +251,7 @@ function _getHostName($mac,$ip) { return $dhcpip[$ip]; else{ exec("host -W 1 " . escapeshellarg($ip), $output); - if (preg_match('/.*pointer ([A-Za-z0-9.-]+)\..*/',$output[0],$matches)) { + if (preg_match('/.*pointer ([A-Za-z_0-9.-]+)\..*/',$output[0],$matches)) { if ($matches[1] <> $ip) return $matches[1]; }