kashire/lainchan
4
0
Fork 0
Code Issues 18 Pull Requests Releases Wiki Activity

use `host` if available for standard DNS lookups too

Browse Source
This commit is contained in:
Michael Save 2012-03-15 14:00:25 +11:00
parent 81c9b612bc
commit 3179eef338
1 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
inc/functions.php
View File

@ -88,7 +88,7 @@
$config['uri_thumb'] = $config['root'] . $board['dir'] . $config['dir']['thumb']; $config['uri_thumb'] = $config['root'] . $board['dir'] . $config['dir']['thumb'];
elseif(isset($board['dir'])) elseif(isset($board['dir']))
$config['uri_thumb'] = sprintf($config['uri_thumb'], $board['dir']); $config['uri_thumb'] = sprintf($config['uri_thumb'], $board['dir']);
if(!isset($config['uri_img'])) if(!isset($config['uri_img']))
$config['uri_img'] = $config['root'] . $board['dir'] . $config['dir']['img']; $config['uri_img'] = $config['root'] . $board['dir'] . $config['dir']['img'];
elseif(isset($board['dir'])) elseif(isset($board['dir']))
@ -1302,8 +1302,8 @@
foreach($config['dnsbl'] as &$blacklist) { foreach($config['dnsbl'] as &$blacklist) {
$lookup = $ip . '.' . $blacklist; $lookup = $ip . '.' . $blacklist;
$host = gethostbyname($lookup); $host = DNS($lookup);
if($host != $lookup) { if($host !== false) {
// On NXDOMAIN (meaning it's not in the blacklist), gethostbyname() returns the host unchanged. // On NXDOMAIN (meaning it's not in the blacklist), gethostbyname() returns the host unchanged.
if(preg_match('/^127\.0\.0\./', $host) && $host != '127.0.0.10') if(preg_match('/^127\.0\.0\./', $host) && $host != '127.0.0.10')
error(sprintf($config['error']['dnsbl'], $blacklist)); error(sprintf($config['error']['dnsbl'], $blacklist));
@ -1672,4 +1672,29 @@
return $host; return $host;
} }
?> function DNS($host) {
global $config;
if($config['cache']['enabled'] && ($host = cache::get('dns_' . $host))) {
return $host;
}
if(!$config['dns_system']) {
$ip_addr = gethostbyname($host);
if($ip_addr == $host)
return false;
} else {
$resp = shell_exec('host -W 1 ' . $host);
if(preg_match('/has address ([^\s]+)$/', $resp, $m))
$ip_addr = $m[1];
else
return false;
}
if($config['cache']['enabled'])
cache::set('dns_' . $ip_addr, $host, 3600);
return $host;
}