danog/MadelineProto
2
2
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Support ipv6 domain name resolution

Browse Source
This commit is contained in:
Daniil Gentili 2019-06-19 14:49:28 +02:00
parent 53dff22994
commit 927f0f2b7a
3 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
phar.php
View File

@ -61,10 +61,10 @@ function ___install_madeline()
$release_branch = '';
}
$release_fallback_branch = '';
/*if (isset($_SERVER['SERVER_ADMIN']) && strpos($_SERVER['SERVER_ADMIN'], '000webhost.io')) {
$release_branch = '-deprecated';
$release_fallback_branch = '-deprecated';
}*/
if (isset($_SERVER['SERVER_ADMIN']) && strpos($_SERVER['SERVER_ADMIN'], '000webhost.io') && $custom_branch === null) {
$release_branch = '-deprecated';
$release_fallback_branch = '-deprecated';
}
if (PHP_MAJOR_VERSION <= 5) {
$release_branch = '5'.$release_branch;

16
src/danog/MadelineProto/DataCenter.php
View File

@ -108,6 +108,7 @@ class DataCenter
*
* Note: Once resolved the socket stream will already be set to non-blocking mode.
*
* @param bool $ipv6
* @param string $uricall
* @param ClientConnectContext $socketContext
* @param ClientTlsContext $tlsContext
@ -116,12 +117,13 @@ class DataCenter
* @return Promise<ClientSocket>
*/
public function cryptoConnect(
bool $ipv6,
string $uri,
ClientConnectContext $socketContext = null,
ClientTlsContext $tlsContext = null,
CancellationToken $token = null
): Promise {
return call(function () use ($uri, $socketContext, $tlsContext, $token) {
return call(function () use ($ipv6, $uri, $socketContext, $tlsContext, $token) {
$tlsContext = $tlsContext ?? new ClientTlsContext;
if ($tlsContext->getPeerName() === null) {
@ -129,7 +131,7 @@ class DataCenter
}
/** @var ClientSocket $socket */
$socket = yield $this->socketConnect($uri, $socketContext, $token);
$socket = yield $this->socketConnect($ipv6, $uri, $socketContext, $token);
$promise = $socket->enableCrypto($tlsContext);
@ -168,15 +170,16 @@ class DataCenter
/**
* Asynchronously establish a socket connection to the specified URI.
*
* @param bool $ipv6 Whether to use IPv6
* @param string $uri URI in scheme://host:port format. TCP is assumed if no scheme is present.
* @param ClientConnectContext $socketContext Socket connect context to use when connecting.
* @param CancellationToken|null $token
*
* @return Promise<\Amp\Socket\ClientSocket>
*/
public function socketConnect(string $uri, ClientConnectContext $socketContext = null, CancellationToken $token = null): Promise
public function socketConnect(bool $ipv6, string $uri, ClientConnectContext $socketContext = null, CancellationToken $token = null): Promise
{
return call(function () use ($uri, $socketContext, $token) {
return call(function () use ($ipv6, $uri, $socketContext, $token) {
$socketContext = $socketContext ?? new ClientConnectContext;
$token = $token ?? new NullCancellationToken;
$attempt = 0;
@ -196,11 +199,12 @@ class DataCenter
// Host is not an IP address, so resolve the domain name.
$records = yield $this->DoHClient->resolve($host, $socketContext->getDnsTypeRestriction());
// Usually the faster response should be preferred, but we don't have a reliable way of determining IPv6
// support, so we always prefer IPv4 here.
\usort($records, function (Record $a, Record $b) {
return $a->getType() - $b->getType();
});
if ($ipv6) {
$records = array_reverse($records);
}
foreach ($records as $record) {
/** @var Record $record */

6
src/danog/MadelineProto/Stream/Transport/DefaultStream.php
View File

@ -57,11 +57,9 @@ class DefaultStream extends Socket implements RawStreamInterface, ProxyStreamInt
public function connectAsync(\danog\MadelineProto\Stream\ConnectionContext $ctx, string $header = ''): \Generator
{
if ($ctx->isSecure()) {
$connector = $this->cryptoConnector;
$this->stream = yield $connector($ctx->getStringUri(), $ctx->getSocketContext(), null, $ctx->getCancellationToken());
$this->stream = yield ($this->cryptoConnector)($ctx->getIpv6(), $ctx->getStringUri(), $ctx->getSocketContext(), null, $ctx->getCancellationToken());
} else {
$connector = $this->connector;
$this->stream = yield $connector($ctx->getStringUri(), $ctx->getSocketContext(), $ctx->getCancellationToken());
$this->stream = yield ($this->connector)($ctx->getIpv6(), $ctx->getStringUri(), $ctx->getSocketContext(), $ctx->getCancellationToken());
}
yield $this->stream->write($header);
}