danog/dns
1
0
Fork 0
mirror of https://github.com/danog/dns.git synced 2024-11-26 20:14:51 +01:00
Code Issues Projects Releases Wiki Activity

Use flag to control reading requests

Browse Source
This commit is contained in:
Aaron Piotrowski 2017-06-24 00:50:34 -05:00
parent 5f73365b9b
commit 3aaf2708f7
No known key found for this signature in database
GPG Key ID: ADD1EF783EDE9EEB
2 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
composer.json
View File

@ -27,12 +27,16 @@
{
"name": "Niklas Keller",
"email": "me@kelunik.com"
},
{
"name": "Aaron Piotrowski",
"email": "aaron@trowski.com"
}
],
"require": {
"php": ">=7.0",
"amphp/amp": "^2",
"amphp/byte-stream": "^1",
"amphp/byte-stream": "^1.1",
"amphp/cache": "^1",
"amphp/file": "^0.2",
"amphp/parser": "^1",

44
lib/Server.php
View File

@ -37,6 +37,9 @@ abstract class Server {
/** @var int */
private $lastActivity;
/** @var bool */
private $receiving = false;
/**
* @param string $uri
*
@ -73,6 +76,7 @@ abstract class Server {
$this->onResolve = function (\Throwable $exception = null, Message $message = null) {
$this->lastActivity = \time();
$this->receiving = false;
if ($exception) {
$this->error($exception);
@ -81,18 +85,17 @@ abstract class Server {
$id = $message->getId();
if (!isset($this->questions[$id])) {
return; // Ignore duplicate response.
if (isset($this->questions[$id])) { // Ignore duplicate response.
$deferred = $this->questions[$id];
unset($this->questions[$id]);
$deferred->resolve($message);
}
$deferred = $this->questions[$id];
unset($this->questions[$id]);
$empty = empty($this->questions);
$deferred->resolve($message);
if (!$empty) {
if (empty($this->questions)) {
$this->input->unreference();
} elseif (!$this->receiving) {
$this->input->reference();
$this->receiving = true;
$this->receive()->onResolve($this->onResolve);
}
};
@ -113,8 +116,6 @@ abstract class Server {
$this->nextId %= 0xffff;
}
$empty = empty($this->questions);
if (isset($this->questions[$id])) {
$deferred = $this->questions[$id];
unset($this->questions[$id]);
@ -133,7 +134,10 @@ abstract class Server {
$this->questions[$id] = $deferred = new Deferred;
if ($empty) {
$this->input->reference();
if (!$this->receiving) {
$this->receiving = true;
$this->receive()->onResolve($this->onResolve);
}
@ -141,23 +145,17 @@ abstract class Server {
return yield Promise\timeout($deferred->promise(), $timeout);
} catch (Amp\TimeoutException $exception) {
unset($this->questions[$id]);
$exception = new TimeoutException("Didn't receive a response within {$timeout} milliseconds.");
$this->error($exception);
throw $exception;
if (empty($this->questions)) {
$this->input->unreference();
}
throw new TimeoutException("Didn't receive a response within {$timeout} milliseconds.");
}
});
}
public function close() {
if ($this->input === null) {
return;
}
$this->input->close();
$this->output->close();
$this->input = null;
$this->output = null;
}
private function error(\Throwable $exception) {