Throw an exception when nothing was read from socket

pull/94/head
Pavel Djundik 9 years ago
parent d42aae5046
commit f41e4b551c

@ -82,15 +82,14 @@
if( $Buffer->Remaining( ) === 0 ) if( $Buffer->Remaining( ) === 0 )
{ {
// TODO: Should we throw an exception here? throw new InvalidPacketException( 'Failed to read any data from socket', InvalidPacketException::BUFFER_EMPTY );
return;
} }
$Header = $Buffer->GetLong( ); $Header = $Buffer->GetLong( );
if( $Header === -1 ) // Single packet if( $Header === -1 ) // Single packet
{ {
// We don't have to do anything // We don't have to do anything
} }
else if( $Header === -2 ) // Split packet else if( $Header === -2 ) // Split packet
{ {

@ -192,8 +192,6 @@
if( !$this->Connected ) if( !$this->Connected )
{ {
throw new SocketException( 'Not connected.', SocketException::NOT_CONNECTED ); throw new SocketException( 'Not connected.', SocketException::NOT_CONNECTED );
return false;
} }
$this->Socket->Write( self::A2S_PING ); $this->Socket->Write( self::A2S_PING );
@ -215,8 +213,6 @@
if( !$this->Connected ) if( !$this->Connected )
{ {
throw new SocketException( 'Not connected.', SocketException::NOT_CONNECTED ); throw new SocketException( 'Not connected.', SocketException::NOT_CONNECTED );
return false;
} }
$this->Socket->Write( self::A2S_INFO, "Source Engine Query\0" ); $this->Socket->Write( self::A2S_INFO, "Source Engine Query\0" );
@ -224,11 +220,6 @@
$Type = $Buffer->GetByte( ); $Type = $Buffer->GetByte( );
if( $Type === 0 )
{
return false;
}
// Old GoldSource protocol, HLTV still uses it // Old GoldSource protocol, HLTV still uses it
if( $Type === self::S2A_INFO_OLD && $this->Socket->Engine === self::GOLDSOURCE ) if( $Type === self::S2A_INFO_OLD && $this->Socket->Engine === self::GOLDSOURCE )
{ {
@ -361,8 +352,6 @@
if( !$this->Connected ) if( !$this->Connected )
{ {
throw new SocketException( 'Not connected.', SocketException::NOT_CONNECTED ); throw new SocketException( 'Not connected.', SocketException::NOT_CONNECTED );
return false;
} }
switch( $this->GetChallenge( self::A2S_PLAYER, self::S2A_PLAYER ) ) switch( $this->GetChallenge( self::A2S_PLAYER, self::S2A_PLAYER ) )
@ -422,8 +411,6 @@
if( !$this->Connected ) if( !$this->Connected )
{ {
throw new SocketException( 'Not connected.', SocketException::NOT_CONNECTED ); throw new SocketException( 'Not connected.', SocketException::NOT_CONNECTED );
return false;
} }
switch( $this->GetChallenge( self::A2S_RULES, self::S2A_RULES ) ) switch( $this->GetChallenge( self::A2S_RULES, self::S2A_RULES ) )
@ -537,8 +524,6 @@
if( !$this->Connected ) if( !$this->Connected )
{ {
throw new SocketException( 'Not connected.', SocketException::NOT_CONNECTED ); throw new SocketException( 'Not connected.', SocketException::NOT_CONNECTED );
return false;
} }
switch( $this->Socket->Engine ) switch( $this->Socket->Engine )
@ -578,8 +563,6 @@
if( !$this->Connected ) if( !$this->Connected )
{ {
throw new SocketException( 'Not connected.', SocketException::NOT_CONNECTED ); throw new SocketException( 'Not connected.', SocketException::NOT_CONNECTED );
return false;
} }
return $this->Rcon->Command( $Command ); return $this->Rcon->Command( $Command );

Loading…
Cancel
Save