0
/
leftypol_lainchan
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Avoid DNS timeouts by using `host` and cache if available

This commit is contained in:
Savetheinternet 2011-12-03 11:52:31 +11:00
parent 3979d9a740
commit dbe3302987
3 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
inc/config.php
View File

@ -75,6 +75,10 @@
// Use syslog() for logging all error messages and unauthorized login attempts. // Use syslog() for logging all error messages and unauthorized login attempts.
$config['syslog'] = false; $config['syslog'] = false;
// Use `host` via shell_exec() to lookup hostnames, avoiding query timeouts. May not work on your system.
// Requires safe_mode to be disabled.
$config['dns_system'] = false;
/* /*
* ==================== * ====================
* Database settings * Database settings

24
inc/functions.php
View File

@ -487,6 +487,7 @@
$query->bindValue(':board', $board); $query->bindValue(':board', $board);
$query->execute() or error(db_error($query)); $query->execute() or error(db_error($query));
} }
if($query->rowCount() < 1 && $config['ban_cidr'] && !isIPv6()) { if($query->rowCount() < 1 && $config['ban_cidr'] && !isIPv6()) {
// my most insane SQL query yet // my most insane SQL query yet
$query = prepare("SELECT `set`, `expires`, `reason`, `board`, `uri`, `bans`.`id` FROM `bans` LEFT JOIN `boards` ON `boards`.`id` = `board` WHERE (`board` IS NULL OR `uri` = :board) $query = prepare("SELECT `set`, `expires`, `reason`, `board`, `uri`, `bans`.`id` FROM `bans` LEFT JOIN `boards` ON `boards`.`id` = `board` WHERE (`board` IS NULL OR `uri` = :board)
@ -1472,4 +1473,27 @@
} }
} }
function rDNS($ip_addr) {
global $config;
if($config['cache']['enabled'] && ($host = cache::get('rdns_' . $ip_addr))) {
return $host;
}
if(!$config['dns_system']) {
$host = gethostbyaddr($ip_addr);
} else {
$resp = shell_exec('host -W 1 ' . $ip_addr);
if(preg_match('/domain name pointer ([^\s]+)$/', $resp, $m))
$host = $m[1];
else
$host = $ip_addr;
}
if($config['cache']['enabled'])
cache::set('rdns_' . $ip_addr, $host, 3600);
return $host;
}
?> ?>

2
mod.php
View File

@ -2408,7 +2408,7 @@
// View information on an IP address // View information on an IP address
$ip = $matches[1]; $ip = $matches[1];
$host = $config['mod']['dns_lookup'] ? gethostbyaddr($ip) : false; $host = $config['mod']['dns_lookup'] ? rDNS($ip) : false;
if(hasPermission($config['mod']['unban']) && isset($_POST['unban']) && isset($_POST['ban_id'])) { if(hasPermission($config['mod']['unban']) && isset($_POST['unban']) && isset($_POST['ban_id'])) {
removeBan($_POST['ban_id']); removeBan($_POST['ban_id']);