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

Get rid of global buffer

Browse Source 
Closes #75
This commit is contained in:
Pavel Djundik
2015-10-19 21:38:01 +03:00
parent caf5296b5b
commit d42aae5046
4 changed files with 149 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SourceQuery/GoldSourceRcon.php
+12 -20
View File
@@ -23,13 +23,6 @@
*/
class GoldSourceRcon
{
/**
* Points to buffer class
*
* @var Buffer
*/
private $Buffer;
/**
* Points to socket class
*
@@ -41,9 +34,8 @@
private $RconRequestId;
private $RconChallenge;
public function __construct( $Buffer, $Socket )
public function __construct( $Socket )
{
$this->Buffer = $Buffer;
$this->Socket = $Socket;
}
@@ -75,14 +67,14 @@
public function Read( $Length = 1400 )
{
// GoldSource RCON has same structure as Query
$this->Socket->Read( );
$Buffer = $this->Socket->Read( );
if( $this->Buffer->GetByte( ) !== SourceQuery::S2A_RCON )
if( $Buffer->GetByte( ) !== SourceQuery::S2A_RCON )
{
return false;
}
$Buffer = $this->Buffer->Get( );
$Buffer = $Buffer->Get( );
$Trimmed = Trim( $Buffer );
if( $Trimmed === 'Bad rcon_password.' )
@@ -102,11 +94,11 @@
{
$this->Socket->Read( );
$ReadMore = $this->Buffer->Remaining( ) > 0 && $this->Buffer->GetByte( ) === SourceQuery::S2A_RCON;
$ReadMore = $Buffer->Remaining( ) > 0 && $Buffer->GetByte( ) === SourceQuery::S2A_RCON;
if( $ReadMore )
{
$Packet = $this->Buffer->Get( );
$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
@@ -115,7 +107,7 @@
}
while( $ReadMore );
$this->Buffer->Set( Trim( $Buffer ) );
$Buffer->Set( Trim( $Buffer ) );
}
public function Command( $Command )
@@ -126,9 +118,9 @@
}
$this->Write( 0, 'rcon ' . $this->RconChallenge . ' "' . $this->RconPassword . '" ' . $Command . "\0" );
$this->Read( );
$Buffer = $this->Read( );
return $this->Buffer->Get( );
return $Buffer->Get( );
}
public function Authorize( $Password )
@@ -136,14 +128,14 @@
$this->RconPassword = $Password;
$this->Write( 0, 'challenge rcon' );
$this->Socket->Read( );
$Buffer = $this->Socket->Read( );
if( $this->Buffer->Get( 14 ) !== 'challenge rcon' )
if( $Buffer->Get( 14 ) !== 'challenge rcon' )
{
return false;
}
$this->RconChallenge = Trim( $this->Buffer->Get( ) );
$this->RconChallenge = Trim( $Buffer->Get( ) );
return true;
}