YGGverse/hl-php
1
0
Fork 0
mirror of https://github.com/YGGverse/hl-php.git synced 2026-03-31 09:05:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

revert getServersIPv6 method as mixed address families are not supported by legacy protocol implementation

Browse source
This commit is contained in:
yggverse 2026-03-05 00:42:21 +02:00
parent 13a7c607e1
commit a101a55715
1 changed files with 36 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

66
src/Xash3D/Master.php
View file

@ -35,9 +35,11 @@ class Master
} }
} }
public function getServers( // Legacy protocol implementation does not support mixed address families
// in the binary master socket response, use separated method for IPv4 servers.
public function getServersIPv6(
int $limit = 100, int $limit = 100,
string $host = "0.0.0.0", string $host = "[::]",
int $port = 0, int $port = 0,
string $gamedir = "valve", string $gamedir = "valve",
string $region = "\xFF" string $region = "\xFF"
@ -52,6 +54,8 @@ class Master
$this->_timeout $this->_timeout
); );
$master = "{$this->_host}:{$this->_port}";
// Is connected // Is connected
if (true === is_resource($socket)) if (true === is_resource($socket))
{ {
@ -64,7 +68,7 @@ class Master
else else
{ {
$this->_errors[] = sprintf( $this->_errors[] = sprintf(
_('Connection error: %s'), _("Connection error for $master: %s"),
$message $message
); );
@ -78,7 +82,7 @@ class Master
// Filter query // Filter query
if (false === fwrite($socket, "1{$region}{$host}:{$port}\0\\gamedir\\{$gamedir}\0")) if (false === fwrite($socket, "1{$region}{$host}:{$port}\0\\gamedir\\{$gamedir}\0"))
{ {
$this->_errors[] = _('Could not send socket query'); $this->_errors[] = _("Could not send socket query for $master");
$this->_fclose( $this->_fclose(
$socket $socket
@ -90,7 +94,7 @@ class Master
// Skip header // Skip header
if (false === fread($socket, 6)) if (false === fread($socket, 6))
{ {
$this->_errors[] = _('Could not init packet header'); $this->_errors[] = _("Could not init packet header for $master");
$this->_fclose( $this->_fclose(
$socket $socket
@ -104,49 +108,51 @@ class Master
for ($i = 0; $i < $limit; $i++) for ($i = 0; $i < $limit; $i++)
{ {
// Get host // Get host bytes
if (false === $host = fread($socket, 16)) if (false === $h = fread($socket, 16))
{
$this->_errors[] = _("Invalid `host` fragment in packet at $i for $master");
break;
}
// End of packet
if (true === str_ends_with(bin2hex($h), bin2hex("\0\0\0\0\0\0")))
{ {
break; break;
} }
// Is end of packet // Get host string
if (true === str_ends_with(bin2hex($host), bin2hex("\0\0\0\0\0\0"))) if (false === $h = inet_ntop($h))
{ {
$this->_errors[] = _("Invalid `host` value in packet at $i for $master");
break; break;
} }
// Skip invalid host value // Get port bytes
if (false === $host = inet_ntop($host)) if (false === $p = fread($socket, 2))
{ {
// Shift port bytes $this->_errors[] = _("Invalid `port` fragment in packet at $i for $master");
fread($socket, 2); break;
}
// Get port value
if (false === $p = unpack('nport', $p))
{
$this->_errors[] = _("Invalid `port` value in packet at $i for $master");
continue; continue;
} }
// Calculate port value // Validate result
if (false === $port = fread($socket, 2)) if (false === filter_var($h, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6) || empty($p['port']))
{ {
$this->_errors[] = _("Invalid socket address in packet at $i for $master");
continue; continue;
} }
if (false === $port = unpack('nport', $port)) $servers["{$h}{$p['port']}"] = // keep unique
{
continue;
}
// Validate IPv6 result
if ((false === filter_var($host, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6) &&
false === filter_var($host, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) || empty($port['port']))
{
continue;
}
$servers["[{$host}]:{$port['port']}"] = // keep unique
[ [
'host' => $host, 'host' => $h,
'port' => $port['port'] 'port' => $p['port']
]; ];
} }