danog/dns
1
0
Fork 0
mirror of https://github.com/danog/dns.git synced 2025-01-23 05:51:11 +01:00
Code Issues Projects Releases Wiki Activity

Rename request -> lookup in client

Browse Source
This commit is contained in:
Chris Wright 2014-06-16 01:30:28 +01:00
parent 32d52285e1
commit f7e199ff75
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
lib/Addr/Client.php
View File

@ -39,7 +39,7 @@ class Client
/**
* @var array
*/
private $outstandingRequests = [];
private $outstandingLookups = [];
/**
* @var int
@ -96,7 +96,7 @@ class Client
if ($this->requestIdCounter >= 65536) {
$this->requestIdCounter = 0;
}
} while(isset($this->outstandingRequests[$result]));
} while(isset($this->outstandingLookups[$result]));
return $result;
}
@ -144,9 +144,9 @@ class Client
list($id, $addr, $ttl) = $response;
if ($addr !== null) {
$this->completeOutstandingRequest($id, $addr, $this->outstandingRequests[$id]['last_type'], $ttl);
$this->completeOutstandingRequest($id, $addr, $this->outstandingLookups[$id]['last_type'], $ttl);
} else {
$this->processOutstandingRequest($id);
$this->processOutstandingLookup($id);
}
}
@ -160,11 +160,11 @@ class Client
*/
private function completeOutstandingRequest($id, $addr, $type, $ttl = null)
{
$this->reactor->cancel($this->outstandingRequests[$id]['timeout_id']);
call_user_func($this->outstandingRequests[$id]['callback'], $addr, $type, $ttl);
unset($this->outstandingRequests[$id]);
$this->reactor->cancel($this->outstandingLookups[$id]['timeout_id']);
call_user_func($this->outstandingLookups[$id]['callback'], $addr, $type, $ttl);
unset($this->outstandingLookups[$id]);
if (!$this->outstandingRequests) {
if (!$this->outstandingLookups) {
$this->reactor->cancel($this->readWatcherId);
$this->readWatcherId = null;
}
@ -175,20 +175,20 @@ class Client
*
* @param int $id
*/
private function processOutstandingRequest($id)
private function processOutstandingLookup($id)
{
if (!$this->outstandingRequests[$id]['requests']) {
if (!$this->outstandingLookups[$id]['requests']) {
$this->completeOutstandingRequest($id, null, ResolutionErrors::ERR_NO_RECORD);
return;
}
$type = array_shift($this->outstandingRequests[$id]['requests']);
$this->outstandingRequests[$id]['last_type'] = $type;
$type = array_shift($this->outstandingLookups[$id]['requests']);
$this->outstandingLookups[$id]['last_type'] = $type;
$packet = $this->requestBuilder->buildRequest($id, $this->outstandingRequests[$id]['name'], $type);
$packet = $this->requestBuilder->buildRequest($id, $this->outstandingLookups[$id]['name'], $type);
fwrite($this->socket, $packet);
$this->outstandingRequests[$id]['timeout_id'] = $this->reactor->once(function() use($id) {
$this->outstandingLookups[$id]['timeout_id'] = $this->reactor->once(function() use($id) {
$this->completeOutstandingRequest($id, null, ResolutionErrors::ERR_SERVER_TIMEOUT);
}, $this->requestTimeout);
@ -211,7 +211,7 @@ class Client
$requests = $this->getRequestList($mode);
$id = $this->getNextFreeRequestId();
$this->outstandingRequests[$id] = [
$this->outstandingLookups[$id] = [
'name' => $name,
'requests' => $requests,
'last_type' => null,
@ -219,6 +219,6 @@ class Client
'callback' => $callback
];
$this->processOutstandingRequest($id);
$this->processOutstandingLookup($id);
}
}