bbs/clrghouz
1
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Change gethostbyname() with dns_get_record()

Browse Source
This commit is contained in:
Deon George 2022-03-25 21:50:58 +11:00
parent 8072f7c5a9
commit 0fe65d6187
1 changed files with 34 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
app/Classes/Sock/SocketClient.php
View File

@ -58,7 +58,7 @@ final class SocketClient {
public function __construct (\Socket $connection) { public function __construct (\Socket $connection) {
socket_getsockname($connection,$this->address_local,$this->port_local); socket_getsockname($connection,$this->address_local,$this->port_local);
socket_getpeername($connection,$this->address_remote,$this->port_remote); socket_getpeername($connection,$this->address_remote,$this->port_remote);
Log::info(sprintf('%s:+ Connection from [%s] on port [%d]',self::LOGKEY,$this->address_remote,$this->port_remote)); Log::info(sprintf('%s:+ Connection host [%s] on port [%d]',self::LOGKEY,$this->address_remote,$this->port_remote));
$this->connection = $connection; $this->connection = $connection;
} }
@ -226,32 +226,53 @@ final class SocketClient {
* Create a client socket * Create a client socket
* @param string $address * @param string $address
* @param int $port * @param int $port
* @param int $speed
* @return static * @return static
* @throws SocketException * @throws SocketException
*/ */
public static function create(string $address,int $port,int $speed=self::TCP_SPEED): self public static function create(string $address,int $port): self
{ {
Log::debug(sprintf('%s:+ Creating connection to [%s:%d]',self::LOGKEY,$address,$port)); Log::debug(sprintf('%s:+ Creating connection to [%s:%d]',self::LOGKEY,$address,$port));
$sort = collect(['AAAA','A']);
$address = gethostbyname($address); // We only look at AAAA/A records
$resolved = collect(dns_get_record($address,DNS_AAAA|DNS_A))
->filter(function($item) use ($sort) { return $sort->search(Arr::get($item,'type')) !== FALSE; })
->sort(function($item) use ($sort) { return $sort->search(Arr::get($item,'type')); });
/* Create a TCP/IP socket. */ if (! $resolved->count())
$socket = socket_create(AF_INET,SOCK_STREAM,SOL_TCP); throw new SocketException(SocketException::CANT_CONNECT,sprintf('%s doesnt resolved to an IPv4/IPv6 address',$address));
if ($socket === FALSE)
throw new SocketException(SocketException::CANT_CREATE_SOCKET,socket_strerror(socket_last_error($socket)));
try { $result = FALSE;
$result = socket_connect($socket,$address,$port);
} catch (\ErrorException $e) { foreach ($resolved as $address) {
throw new SocketException(SocketException::CANT_CONNECT,socket_strerror(socket_last_error($socket))); try {
$try = Arr::get($address,Arr::get($address,'type') == 'AAAA' ? 'ipv6' : 'ip');
if (! $try)
continue;
Log::alert(sprintf('%s: - Trying [%s:%d]',self::LOGKEY,$try,$port));
/* Create a TCP/IP socket. */
$socket = socket_create(Arr::get($address,'type') == 'AAAA' ? AF_INET6 : AF_INET,SOCK_STREAM,SOL_TCP);
if ($socket === FALSE)
throw new SocketException(SocketException::CANT_CREATE_SOCKET,socket_strerror(socket_last_error($socket)));
$result = socket_connect($socket,$try,$port);
break;
} catch (\ErrorException $e) {
// If 'Cannot assign requested address'
if (socket_last_error($socket) == 99)
continue;
throw new SocketException(SocketException::CANT_CONNECT,socket_strerror(socket_last_error($socket)));
}
} }
if ($result === FALSE) if ($result === FALSE)
throw new SocketException(SocketException::CANT_CONNECT,socket_strerror(socket_last_error($socket))); throw new SocketException(SocketException::CANT_CONNECT,socket_strerror(socket_last_error($socket)));
return new self($socket,$speed); return new self($socket);
} }
/** /**