aandrieux/Test-Miroir
1
0
Fork 0
mirror of https://github.com/xPaw/PHP-Source-Query.git synced 2026-05-18 13:53:35 +02:00
Code Issues Releases Wiki Activity

Strict checks; implement GameID from extra data flags

Browse Source
This commit is contained in:
xPaw
2014-07-21 19:09:56 +03:00
parent 266cf6afe7
commit 5e84d9e873
4 changed files with 67 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SourceQuery/Socket.class.php
+20 -4
View File
@@ -69,7 +69,19 @@
{
$this->Buffer->Set( FRead( $this->Socket, $Length ) );
if( $this->Buffer->Remaining( ) > 0 && $this->Buffer->GetLong( ) == -2 )
if( $this->Buffer->Remaining( ) === 0 )
{
// TODO: Should we throw an exception here?
return;
}
$Header = $this->Buffer->GetLong( );
if( $Header === -1 ) // Single packet
{
// We don't have to do anything
}
else if( $Header === -2 ) // Split packet
{
$Packets = Array( );
$IsCompressed = false;
@@ -91,7 +103,7 @@
}
case SourceQuery :: SOURCE:
{
$IsCompressed = ( $RequestID & 0x80000000 ) != 0;
$IsCompressed = ( $RequestID & 0x80000000 ) !== 0;
$PacketCount = $this->Buffer->GetByte( );
$PacketNumber = $this->Buffer->GetByte( ) + 1;
@@ -129,7 +141,7 @@
$Data = bzdecompress( $Data );
if( CRC32( $Data ) != $PacketChecksum )
if( CRC32( $Data ) !== $PacketChecksum )
{
throw new SourceQueryException( 'CRC32 checksum mismatch of uncompressed packet data.' );
}
@@ -137,6 +149,10 @@
$this->Buffer->Set( SubStr( $Buffer, 4 ) );
}
else
{
throw new SourceQueryException( 'Socket read: Raw packet header mismatch. (0x' . DecHex( $Header ) . ')' );
}
}
private function Sherlock( $Length )
@@ -150,6 +166,6 @@
$this->Buffer->Set( $Data );
return $this->Buffer->GetLong( ) == -2;
return $this->Buffer->GetLong( ) === -2;
}
}