Revert "Add 1200 byte padding to all requests"

This reverts commit 7231921.

Author: xPaw

SourceQuery/BaseSocket.php

@@ -41,7 +41,6 @@ public function __destruct( )
 		abstract public function Close( ) : void;
 		abstract public function Open( string $Address, int $Port, int $Timeout, int $Engine ) : void;
 		abstract public function Write( int $Header, string $String = '' ) : bool;
-		abstract public function WritePadded( int $Header, string $String = '' ) : bool;
 		abstract public function Read( int $Length = 1400 ) : Buffer;
 
 		protected function ReadInternal( Buffer $Buffer, int $Length, callable $SherlockFunction ) : Buffer

SourceQuery/Socket.php

@@ -61,26 +61,6 @@ public function Write( int $Header, string $String = '' ) : bool
 			return $Length === FWrite( $this->Socket, $Command, $Length );
 		}
 
-		/**
-		 * Write a request packge to the socket. Pads it up to 1200 bytes to prevent reflective DoS.
-		 *
-		 * @see https://steamcommunity.com/discussions/forum/14/2989789048633291344/
-		 * @return bool Whether fwrite succeeded.
-		 */
-		public function WritePadded( int $Header, string $String = '' ) : bool
-		{
-			$Command = pack( 'ccccca*', 0xFF, 0xFF, 0xFF, 0xFF, $Header, $String );
-			$Length  = strlen( $Command );
-
-			if( $Length < 1200 )
-			{
-				$Command .= str_repeat( "\0", 1200 - $Length );
-				$Length = 1200;
-			}
-
-			return $Length === fwrite( $this->Socket, $Command, $Length );
-		}
-
 		/**
 		 * Reads from socket and returns Buffer.
 		 *

SourceQuery/SourceQuery.php

@@ -200,7 +200,7 @@ public function GetInfo( ) : array
 				throw new SocketException( 'Not connected.', SocketException::NOT_CONNECTED );
 			}
 
-			$this->Socket->WritePadded( self::A2S_INFO, "Source Engine Query\0" );
+			$this->Socket->Write( self::A2S_INFO, "Source Engine Query\0" );
 			$Buffer = $this->Socket->Read( );
 
 			$Type = $Buffer->GetByte( );
@@ -365,7 +365,7 @@ public function GetPlayers( ) : array
 
 			$this->GetChallenge( self::A2S_PLAYER, self::S2A_PLAYER );
 
-			$this->Socket->WritePadded( self::A2S_PLAYER, $this->Challenge );
+			$this->Socket->Write( self::A2S_PLAYER, $this->Challenge );
 			$Buffer = $this->Socket->Read( 14000 ); // Moronic Arma 3 developers do not split their packets, so we have to read more data
 			// This violates the protocol spec, and they probably should fix it: https://developer.valvesoftware.com/wiki/Server_queries#Protocol
 
@@ -411,7 +411,7 @@ public function GetRules( ) : array
 
 			$this->GetChallenge( self::A2S_RULES, self::S2A_RULES );
 
-			$this->Socket->WritePadded( self::A2S_RULES, $this->Challenge );
+			$this->Socket->Write( self::A2S_RULES, $this->Challenge );
 			$Buffer = $this->Socket->Read( );
 
 			$Type = $Buffer->GetByte( );
@@ -452,13 +452,10 @@ private function GetChallenge( int $Header, int $ExpectedResult ) : void
 
 			if( $this->UseOldGetChallengeMethod )
 			{
-				$this->Socket->Write( self::A2S_SERVERQUERY_GETCHALLENGE, "\xFF\xFF\xFF\xFF" );
-			}
-			else
-			{
-				$this->Socket->WritePadded( $Header, "\xFF\xFF\xFF\xFF" );
+				$Header = self::A2S_SERVERQUERY_GETCHALLENGE;
 			}
 
+			$this->Socket->Write( $Header, "\xFF\xFF\xFF\xFF" );
 			$Buffer = $this->Socket->Read( );
 
 			$Type = $Buffer->GetByte( );

Tests/Tests.php

@@ -38,11 +38,6 @@ public function Write( int $Header, string $String = '' ) : bool
 			return true;
 		}
 
-		public function WritePadded( int $Header, string $String = '' ) : bool
-		{
-			return true;
-		}
-		
 		public function Read( int $Length = 1400 ) : Buffer
 		{
 			$Buffer = new Buffer( );