diff options
author | Renato Botelho <renato@netgate.com> | 2015-09-17 08:13:27 -0300 |
---|---|---|
committer | Renato Botelho <renato@netgate.com> | 2015-09-17 08:13:27 -0300 |
commit | 3155e96966f3a8c28e4a510a4230d651ff4386a2 (patch) | |
tree | 6cd931c461c6b7f644b553755e88e4f173157c8d /usr/local | |
parent | 0227c06c1d7415ea702489379593e4942666880e (diff) | |
parent | 43bcb7a80228edcd8e699303a6881a5d844ec8bd (diff) | |
download | pfsense-3155e96966f3a8c28e4a510a4230d651ff4386a2.zip pfsense-3155e96966f3a8c28e4a510a4230d651ff4386a2.tar.gz |
Merge pull request #1888 from phil-davis/TGdesc22
Diffstat (limited to 'usr/local')
-rwxr-xr-x | usr/local/www/bandwidth_by_ip.php | 58 | ||||
-rw-r--r-- | usr/local/www/status_graph.php | 1 |
2 files changed, 44 insertions, 15 deletions
diff --git a/usr/local/www/bandwidth_by_ip.php b/usr/local/www/bandwidth_by_ip.php index 74697e6..59cd367 100755 --- a/usr/local/www/bandwidth_by_ip.php +++ b/usr/local/www/bandwidth_by_ip.php @@ -55,16 +55,40 @@ else // get the desired format for displaying the host name or IP $hostipformat = $_GET['hostipformat']; $iplookup = array(); -// If hostname display is requested and the DNS forwarder does not already have DHCP static names registered, -// then load the DHCP static mappings into an array keyed by IP address. -if (($hostipformat != "") && ((!isset($config['dnsmasq']['enable']) || !isset($config['dnsmasq']['regdhcpstatic'])) - || (!isset($config['unbound']['enable']) || !isset($config['unbound']['regdhcpstatic'])))) { +// If hostname, description or FQDN is requested then load the locally-known IP address - host/description mappings into an array keyed by IP address. +if ($hostipformat != "") { if (is_array($config['dhcpd'])) { foreach ($config['dhcpd'] as $ifdata) { if (is_array($ifdata['staticmap'])) { foreach ($ifdata['staticmap'] as $hostent) { if (($hostent['ipaddr'] != "") && ($hostent['hostname'] != "")) { - $iplookup[$hostent['ipaddr']] = $hostent['hostname']; + if ($hostipformat == "descr" && $hostent['descr'] != "") { + $iplookup[$hostent['ipaddr']] = $hostent['descr']; + } else { + $iplookup[$hostent['ipaddr']] = $hostent['hostname']; + if ($hostipformat == "fqdn") { + $iplookup[$hostent['ipaddr']] .= "." . $config['system']['domain']; + } + } + } + } + } + } + } + // Add any DNS host override data keyed by IP address. + foreach (array('dnsmasq', 'unbound') as $dns_type) { + if (isset($config[$dns_type]['enable'])) { + if (is_array($config[$dns_type]['hosts'])) { + foreach ($config[$dns_type]['hosts'] as $hostent) { + if (($hostent['ip'] != "") && ($hostent['host'] != "")) { + if ($hostipformat == "descr" && $hostent['descr'] != "") { + $iplookup[$hostent['ip']] = $hostent['descr']; + } else { + $iplookup[$hostent['ip']] = $hostent['host']; + if ($hostipformat == "fqdn") { + $iplookup[$hostent['ip']] .= "." . $hostent['domain']; + } + } } } } @@ -87,19 +111,23 @@ for ($x=2; $x<12; $x++){ (($filter == "local") && (ip_in_subnet($infoarray[0], $intsubnet))) || (($filter == "remote") && (!ip_in_subnet($infoarray[0], $intsubnet)))) { if ($hostipformat == "") { + // pass back just the raw IP address $addrdata = $infoarray[0]; } else { - // $hostipformat is "hostname" or "fqdn" - $addrdata = gethostbyaddr($infoarray[0]); - if ($addrdata == $infoarray[0]) { - // gethostbyaddr() gave us back the IP address, so try the static mapping array - if ($iplookup[$infoarray[0]] != "") - $addrdata = $iplookup[$infoarray[0]]; + // $hostipformat is one of "hostname", "descr" or "fqdn" - we want a text representation if we can get it. + if ($iplookup[$infoarray[0]] != "") { + // We have a local entry, so use it. + $addrdata = $iplookup[$infoarray[0]]; } else { - if ($hostipformat == "hostname") { - // Only pass back the first part of the name, not the FQDN. - $name_array = explode(".", $addrdata); - $addrdata = $name_array[0]; + // Try to reverse lookup the IP address. + $addrdata = gethostbyaddr($infoarray[0]); + if ($addrdata != $infoarray[0]) { + // Reverse lookup returned something other than the IP address (FQDN, we hope!) + if ($hostipformat != "fqdn") { + // The user does not want the whole FQDN, so only pass back the first part of the name. + $name_array = explode(".", $addrdata); + $addrdata = $name_array[0]; + } } } } diff --git a/usr/local/www/status_graph.php b/usr/local/www/status_graph.php index 3c8ba8f..832b068 100644 --- a/usr/local/www/status_graph.php +++ b/usr/local/www/status_graph.php @@ -230,6 +230,7 @@ foreach ($ifdescrs as $ifn => $ifd) { <select id="hostipformat" name="hostipformat" class="formselect" style="z-index: -10;" onchange="document.form1.submit()"> <option value="">IP Address</option> <option value="hostname"<?php if ($curhostipformat == "hostname") echo " selected";?>>Host Name</option> + <option value="descr"<?php if ($curhostipformat == "descr") echo " selected=\"selected\"";?>>Description</option> <option value="fqdn"<?php if ($curhostipformat == "fqdn") echo " selected=\"selected\"";?>>FQDN</option> </select> </form> |