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

Minor cosmetic changes, throw an error when rcon read fails (#42)

Browse Source
This commit is contained in:
xPaw
2015-02-17 13:42:23 +02:00
parent 3bae84ca68
commit 50729990c6
5 changed files with 76 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SourceQuery/SourceRcon.class.php
+15 -8
View File
@@ -1,14 +1,15 @@
<?php
use xPaw\SourceQuery\Exception\AuthenticationException;
use xPaw\SourceQuery\Exception\TimeoutException;
/**
/**
* Class written by xPaw
*
* Website: http://xpaw.me
* GitHub: https://github.com/xPaw/PHP-Source-Query-Class
*/
use xPaw\SourceQuery\Exception\AuthenticationException;
use xPaw\SourceQuery\Exception\TimeoutException;
use xPaw\SourceQuery\Exception\InvalidPacketException;
class SourceQuerySourceRcon
{
/**
@@ -54,7 +55,7 @@ use xPaw\SourceQuery\Exception\TimeoutException;
if( $ErrNo || !$this->RconSocket )
{
throw new TimeoutException( 'Can\'t connect to RCON server: ' . $ErrStr, TimeoutException::TIMEOUT_CONNECT);
throw new TimeoutException( 'Can\'t connect to RCON server: ' . $ErrStr, TimeoutException::TIMEOUT_CONNECT );
}
Stream_Set_Timeout( $this->RconSocket, $this->Socket->Timeout );
@@ -78,6 +79,11 @@ use xPaw\SourceQuery\Exception\TimeoutException;
{
$this->Buffer->Set( FRead( $this->RconSocket, $Length ) );
if( $this->Buffer->Remaining( ) < 4 )
{
throw new InvalidPacketException( 'Rcon read: Failed to read any data from socket', InvalidPacketException::BUFFER_EMPTY );
}
$PacketSize = $this->Buffer->GetLong( );
$Buffer = $this->Buffer->Get( );
@@ -102,11 +108,12 @@ use xPaw\SourceQuery\Exception\TimeoutException;
$this->Read( );
$this->Buffer->GetLong( ); // RequestID
$Type = $this->Buffer->GetLong( );
$Type = $this->Buffer->GetLong( );
if( $Type === SourceQuery :: SERVERDATA_AUTH_RESPONSE )
{
throw new AuthenticationException( 'Bad rcon_password.', AuthenticationException::BAD_PASSWORD);
throw new AuthenticationException( 'Bad rcon_password.', AuthenticationException::BAD_PASSWORD );
}
else if( $Type !== SourceQuery :: SERVERDATA_RESPONSE_VALUE )
{
@@ -163,7 +170,7 @@ use xPaw\SourceQuery\Exception\TimeoutException;
if( $RequestID === -1 || $Type !== SourceQuery :: SERVERDATA_AUTH_RESPONSE )
{
throw new AuthenticationException( 'RCON authorization failed.', AuthenticationException::BAD_PASSWORD);
throw new AuthenticationException( 'RCON authorization failed.', AuthenticationException::BAD_PASSWORD );
}
return true;