aandrieux/Test-Miroir
1
0
Fork 0
mirror of https://github.com/xPaw/PHP-Source-Query.git synced 2026-06-08 05:15:59 +02:00
Code Issues Releases Wiki Activity

Initial work on multi packet reading for source RCON

Browse Source
This commit is contained in:
xPaw
2014-06-26 14:05:50 +03:00
parent f3684b4783
commit 3f2df8560e
1 changed files with 37 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SourceQuery/SourceRcon.class.php
+37 -6
View File
@@ -75,13 +75,19 @@
{ {
$this->Buffer->Set( FRead( $this->RconSocket, $Length ) ); $this->Buffer->Set( FRead( $this->RconSocket, $Length ) );
$Buffer = "";
$PacketSize = $this->Buffer->GetLong( ); $PacketSize = $this->Buffer->GetLong( );
$Buffer .= $this->Buffer->Get( ); $Buffer = $this->Buffer->Get( );
// TODO: multi packet reading $Remaining = $PacketSize - StrLen( $Buffer );
while( $Remaining > 0 )
{
$Buffer2 = FRead( $this->RconSocket, $Length );
$Buffer .= $Buffer2;
$Remaining -= StrLen( $Buffer2 );
}
$this->Buffer->Set( $Buffer ); $this->Buffer->Set( $Buffer );
} }
@@ -89,9 +95,10 @@
public function Command( $Command ) public function Command( $Command )
{ {
$this->Write( SourceQuery :: SERVERDATA_EXECCOMMAND, $Command ); $this->Write( SourceQuery :: SERVERDATA_EXECCOMMAND, $Command );
$this->Read( ); $this->Read( );
$RequestID = $this->Buffer->GetLong( ); $this->Buffer->GetLong( ); // RequestID
$Type = $this->Buffer->GetLong( ); $Type = $this->Buffer->GetLong( );
if( $Type === SourceQuery :: SERVERDATA_AUTH_RESPONSE ) if( $Type === SourceQuery :: SERVERDATA_AUTH_RESPONSE )
@@ -103,9 +110,33 @@
return false; return false;
} }
$Buffer = $this->Buffer->Get( );
// We do this stupid hack to handle split packets
// See https://developer.valvesoftware.com/wiki/Source_RCON_Protocol#Multiple-packet_Responses
if( StrLen( $Buffer ) >= 4000 )
{
do
{
$this->Write( SourceQuery :: SERVERDATA_RESPONSE_VALUE );
$this->Read( );
$this->Buffer->GetLong( ); // RequestID
if( $this->Buffer->GetLong( ) !== SourceQuery :: SERVERDATA_RESPONSE_VALUE )
{
break;
}
$Buffer .= $this->Buffer->Get( );
}
while( false ); // TODO: This is so broken that we don't even try to read multiple times, needs to be revised
}
// TODO: It should use GetString, but there are no null bytes at the end, why? // TODO: It should use GetString, but there are no null bytes at the end, why?
// $Buffer = $this->Buffer->GetString( ); // $Buffer = $this->Buffer->GetString( );
return $this->Buffer->Get( ); return $Buffer;
} }
public function Authorize( $Password ) public function Authorize( $Password )