Browse Source

fix packet reader

main
ghost 11 months ago
parent
commit
726463e94e
  1. 30
      src/Xash3D/Master.php

30
src/Xash3D/Master.php

@ -88,13 +88,7 @@ class Master
// Get host // Get host
if (false === $host = fread($this->_socket, 16)) if (false === $host = fread($this->_socket, 16))
{ {
fclose( break;
$this->_socket
);
$this->_errors[] = _('Could not read server address');
return null;
} }
// Is end of packet // Is end of packet
@ -103,34 +97,28 @@ class Master
break; break;
} }
// Skip invalid host // Skip invalid host value
if (false === $host = inet_ntop($host)) if (false === $host = inet_ntop($host))
{ {
// Shift port bytes
fread($this->_socket, 2);
continue; continue;
} }
// Decode first byte for port // Decode first byte for port
if (false === $byte1 = fread($this->_socket, 1)) if (false === $byte1 = fread($this->_socket, 1))
{ {
fclose( // Shift port byte
$this->_socket fread($this->_socket, 1);
);
$this->_errors[] = _('Could not read first byte of port');
return null; continue;
} }
// Decode second byte for port // Decode second byte for port
if (false === $byte2 = fread($this->_socket, 1)) if (false === $byte2 = fread($this->_socket, 1))
{ {
fclose( continue;
$this->_socket
);
$this->_errors[] = _('Could not read second byte of port');
return null;
} }
// Calculate port value // Calculate port value

Loading…
Cancel
Save