Fixed raw packets

PocketMine · Jul 5, 2014 · 740c96f · 740c96f
1 parent 1aa7c42
commit 740c96f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/raklib/server/ServerHandler.php b/raklib/server/ServerHandler.php
@@ -101,7 +101,7 @@ public function handlePacket(){
 				$len = ord($packet{$offset++});
 				$address = substr($packet, $offset, $len);
 				$offset += $len;
-				$port = substr($packet, $offset, 2);
+				$port = Binary::readShort(substr($packet, $offset, 2), false);
 				$offset += 2;
 				$payload = substr($packet, $offset);
 				$this->instance->handleRaw($address, $port, $payload);

diff --git a/raklib/server/SessionManager.php b/raklib/server/SessionManager.php
@@ -185,7 +185,7 @@ public function streamEncapsulated(Session $session, EncapsulatedPacket $packet,
 
 	public function streamRaw($address, $port, $payload){
 		$buffer = chr(RakLib::PACKET_RAW) . chr(strlen($address)) . $address . Binary::writeShort($port) . $payload;
-		@socket_write($this->socket, Binary::writeInt(strlen($buffer)) . $buffer);
+		@socket_write($this->internalSocket, Binary::writeInt(strlen($buffer)) . $buffer);
 	}
 
 	protected function streamClose($identifier, $reason){
@@ -246,7 +246,7 @@ public function receiveStream(){
 				$len = ord($packet{$offset++});
 				$address = substr($packet, $offset, $len);
 				$offset += $len;
-				$port = substr($packet, $offset, 2);
+				$port = Binary::readShort(substr($packet, $offset, 2), false);
 				$offset += 2;
 				$payload = substr($packet, $offset);
 				$this->socket->writePacket($payload, $address, $port);