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

Fix gold source query not working

Browse Source 
Closes #95
This commit is contained in:
Pavel Djundik
2016-05-14 18:39:05 +03:00
parent ccda8686ae
commit d4ae8c631d
1 changed files with 32 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SourceQuery/GoldSourceRcon.php
+28 -23
View File
@@ -69,13 +69,37 @@
// GoldSource RCON has same structure as Query // GoldSource RCON has same structure as Query
$Buffer = $this->Socket->Read( ); $Buffer = $this->Socket->Read( );
$StringBuffer = '';
$ReadMore = false;
// There is no indentifier of the end, so we just need to continue reading
do
{
$ReadMore = $Buffer->Remaining( ) > 0;
if( $ReadMore )
{
if( $Buffer->GetByte( ) !== SourceQuery::S2A_RCON ) if( $Buffer->GetByte( ) !== SourceQuery::S2A_RCON )
{ {
throw new InvalidPacketException( 'Invalid rcon response.', InvalidPacketException::PACKET_HEADER_MISMATCH ); throw new InvalidPacketException( 'Invalid rcon response.', InvalidPacketException::PACKET_HEADER_MISMATCH );
} }
$Buffer = $Buffer->Get( ); $Packet = $Buffer->Get( );
$Trimmed = Trim( $Buffer ); $StringBuffer .= $Packet;
//$StringBuffer .= SubStr( $Packet, 0, -2 );
// Let's assume if this packet is not long enough, there are no more after this one
$ReadMore = StrLen( $Packet ) > 1000; // use 1300?
if( $ReadMore )
{
$Buffer = $this->Socket->Read( );
}
}
}
while( $ReadMore );
$Trimmed = trim( $StringBuffer );
if( $Trimmed === 'Bad rcon_password.' ) if( $Trimmed === 'Bad rcon_password.' )
{ {
@@ -86,28 +110,9 @@
throw new AuthenticationException( $Trimmed, AuthenticationException::BANNED ); throw new AuthenticationException( $Trimmed, AuthenticationException::BANNED );
} }
$ReadMore = false; $Buffer->Set( $Trimmed );
// There is no indentifier of the end, so we just need to continue reading return $Buffer;
// TODO: Needs to be looked again, it causes timeouts
do
{
$this->Socket->Read( );
$ReadMore = $Buffer->Remaining( ) > 0 && $Buffer->GetByte( ) === SourceQuery::S2A_RCON;
if( $ReadMore )
{
$Packet = $Buffer->Get( );
$Buffer .= SubStr( $Packet, 0, -2 );
// Let's assume if this packet is not long enough, there are no more after this one
$ReadMore = StrLen( $Packet ) > 1000; // use 1300?
}
}
while( $ReadMore );
$Buffer->Set( Trim( $Buffer ) );
} }
public function Command( $Command ) public function Command( $Command )