Skip to content

Prefix all global functions calls with \ to skip the look up and resolve process and go straight to the global function #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
clue merged 1 commit into from
Oct 4, 2018
Merged

Prefix all global functions calls with \ to skip the look up and resolve process and go straight to the global function #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/Buffer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public function send($data, $remoteAddress = null)

public function onWritable()
{
list($data, $remoteAddress) = array_shift($this->outgoing);
list($data, $remoteAddress) = \array_shift($this->outgoing);

try {
$this->handleWrite($data, $remoteAddress);
Expand Down Expand Up @@ -105,14 +105,14 @@ protected function handleWrite($data, $remoteAddress)
if ($remoteAddress === null) {
// do not use fwrite() as it obeys the stream buffer size and
// packets are not to be split at 8kb
$ret = @stream_socket_sendto($this->socket, $data);
$ret = @\stream_socket_sendto($this->socket, $data);
} else {
$ret = @stream_socket_sendto($this->socket, $data, 0, $remoteAddress);
$ret = @\stream_socket_sendto($this->socket, $data, 0, $remoteAddress);
}

if ($ret < 0 || $ret === false) {
$error = error_get_last();
throw new Exception('Unable to send packet: ' . trim($error['message']));
$error = \error_get_last();
throw new Exception('Unable to send packet: ' . \trim($error['message']));
}
}
}
20 changes: 10 additions & 10 deletions src/Factory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public function __construct(LoopInterface $loop, Resolver $resolver = null)
if ($resolver === null) {
// try to load nameservers from system config or default to Google's public DNS
$config = Config::loadSystemConfigBlocking();
$server = $config->nameservers ? reset($config->nameservers) : '8.8.8.8';
$server = $config->nameservers ? \reset($config->nameservers) : '8.8.8.8';

$factory = new DnsFactory();
$resolver = $factory->create($server, $loop);
Expand All @@ -43,7 +43,7 @@ public function createClient($address)
$loop = $this->loop;

return $this->resolveAddress($address)->then(function ($address) use ($loop) {
$socket = @stream_socket_client($address, $errno, $errstr);
$socket = @\stream_socket_client($address, $errno, $errstr);
if (!$socket) {
throw new Exception('Unable to create client socket: ' . $errstr, $errno);
}
Expand All @@ -57,7 +57,7 @@ public function createServer($address)
$loop = $this->loop;

return $this->resolveAddress($address)->then(function ($address) use ($loop) {
$socket = @stream_socket_server($address, $errno, $errstr, STREAM_SERVER_BIND);
$socket = @\stream_socket_server($address, $errno, $errstr, \STREAM_SERVER_BIND);
if (!$socket) {
throw new Exception('Unable to create server socket: ' . $errstr, $errno);
}
Expand All @@ -68,18 +68,18 @@ public function createServer($address)

protected function resolveAddress($address)
{
if (strpos($address, '://') === false) {
if (\strpos($address, '://') === false) {
$address = 'udp://' . $address;
}

// parse_url() does not accept null ports (random port assignment) => manually remove
$nullport = false;
if (substr($address, -2) === ':0') {
$address = substr($address, 0, -2);
if (\substr($address, -2) === ':0') {
$address = \substr($address, 0, -2);
$nullport = true;
}

$parts = parse_url($address);
$parts = \parse_url($address);

if (!$parts || !isset($parts['host'])) {
return Promise\resolve($address);
Expand All @@ -90,12 +90,12 @@ protected function resolveAddress($address)
}

// remove square brackets for IPv6 addresses
$host = trim($parts['host'], '[]');
$host = \trim($parts['host'], '[]');

return $this->resolveHost($host)->then(function ($host) use ($parts) {
$address = $parts['scheme'] . '://';

if (isset($parts['port']) && strpos($host, ':') !== false) {
if (isset($parts['port']) && \strpos($host, ':') !== false) {
// enclose IPv6 address in square brackets if a port will be appended
$host = '[' . $host . ']';
}
Expand All @@ -113,7 +113,7 @@ protected function resolveAddress($address)
protected function resolveHost($host)
{
// there's no need to resolve if the host is already given as an IP address
if (false !== filter_var($host, FILTER_VALIDATE_IP)) {
if (false !== \filter_var($host, \FILTER_VALIDATE_IP)) {
return Promise\resolve($host);
}

Expand Down
16 changes: 8 additions & 8 deletions src/Socket.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,12 @@ public function __construct(LoopInterface $loop, $socket, Buffer $buffer = null)

public function getLocalAddress()
{
return $this->sanitizeAddress(@stream_socket_get_name($this->socket, false));
return $this->sanitizeAddress(@\stream_socket_get_name($this->socket, false));
}

public function getRemoteAddress()
{
return $this->sanitizeAddress(@stream_socket_get_name($this->socket, true));
return $this->sanitizeAddress(@\stream_socket_get_name($this->socket, true));
}

public function send($data, $remoteAddress = null)
Expand Down Expand Up @@ -103,17 +103,17 @@ private function sanitizeAddress($address)
}

// this is an IPv6 address which includes colons but no square brackets
$pos = strrpos($address, ':');
if ($pos !== false && strpos($address, ':') < $pos && substr($address, 0, 1) !== '[') {
$port = substr($address, $pos + 1);
$address = '[' . substr($address, 0, $pos) . ']:' . $port;
$pos = \strrpos($address, ':');
if ($pos !== false && \strpos($address, ':') < $pos && \substr($address, 0, 1) !== '[') {
$port = \substr($address, $pos + 1);
$address = '[' . \substr($address, 0, $pos) . ']:' . $port;
}
return $address;
}

protected function handleReceive(&$peerAddress)
{
$data = stream_socket_recvfrom($this->socket, $this->bufferSize, 0, $peerAddress);
$data = \stream_socket_recvfrom($this->socket, $this->bufferSize, 0, $peerAddress);

if ($data === false) {
// receiving data failed => remote side rejected one of our packets
Expand All @@ -130,6 +130,6 @@ protected function handleReceive(&$peerAddress)

protected function handleClose()
{
fclose($this->socket);
\fclose($this->socket);
}
}