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

update parsing conditions, remove hardcoded ipv6 impl

Browse source
This commit is contained in:
yggverse 2026-03-04 23:19:46 +02:00
parent 34390a0713
commit 13a7c607e1
1 changed files with 17 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/Xash3D/Master.php
View file

@ -107,13 +107,13 @@ class Master
// Get host // Get host
if (false === $host = fread($socket, 16)) if (false === $host = fread($socket, 16))
{ {
continue; break;
} }
// Is end of packet // Is end of packet
if (true === str_ends_with(bin2hex($host), bin2hex("\0\0\0\0\0\0"))) if (true === str_ends_with(bin2hex($host), bin2hex("\0\0\0\0\0\0")))
{ {
continue; break;
} }
// Skip invalid host value // Skip invalid host value
@ -126,22 +126,27 @@ class Master
} }
// Calculate port value // Calculate port value
$port = unpack('nport', fread($socket, 2)); if (false === $port = fread($socket, 2))
// Validate IPv6 result
if (
false !== strpos($host, '.') || // filter_var not always works with mixed IPv6
false === filter_var($host, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6) ||
false === filter_var($port, FILTER_VALIDATE_INT) // @TODO
)
{ {
continue; continue;
} }
$servers["[{$host}]:{$port}"] = // keep unique if (false === $port = unpack('nport', $port))
{
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' => $host,
'port' => $port 'port' => $port['port']
]; ];
} }