diff --git a/src/network/MinecraftInterface.php b/src/network/MinecraftInterface.php index ad91322e..725d99ef 100644 --- a/src/network/MinecraftInterface.php +++ b/src/network/MinecraftInterface.php @@ -41,14 +41,14 @@ class MinecraftInterface{ $pid = ord($buffer[0]); if(RakNetInfo::isValid($pid)){ - $parser = new RakNetParser($buffer); - if($parser->packet !== false){ - $parser->packet->ip = $source; - $parser->packet->port = $port; - if(EventHandler::callEvent(new PacketReceiveEvent($parser->packet)) === BaseEvent::DENY){ + $packet = RakNetParser::parse($buffer); + if($packet !== false){ + $packet->ip = $source; + $packet->port = $port; + if(EventHandler::callEvent(new PacketReceiveEvent($packet)) === BaseEvent::DENY){ return false; } - return $parser->packet; + return $packet; } return false; }elseif($pid === 0xfe and $buffer[1] === "\xfd" and ServerAPI::request()->api->query instanceof QueryHandler){ @@ -74,7 +74,7 @@ class MinecraftInterface{ if(EventHandler::callEvent(new PacketSendEvent($packet)) === BaseEvent::DENY){ return 0; }elseif($packet instanceof RakNetPacket){ - $codec = new RakNetCodec($packet); + RakNetCodec::encode($packet); } $write = $this->socket->write($packet->buffer, $packet->ip, $packet->port); $this->bandwidth[1] += $write; diff --git a/src/network/raknet/RakNetCodec.php b/src/network/raknet/RakNetCodec.php index 34393bc6..bbd52589 100644 --- a/src/network/raknet/RakNetCodec.php +++ b/src/network/raknet/RakNetCodec.php @@ -1,46 +1,39 @@ packet = $packet; - $this->buffer = &$this->packet->buffer; - $this->encode(); - } - - private function encode(){ - if($this->packet->buffer != null && strlen($this->packet->buffer) > 0){ + public static function encode(RakNetPacket $packet){ + if($packet->buffer != null && strlen($packet->buffer) > 0){ return; } - $this->buffer .= chr($this->packet->pid()); + $packet->buffer .= chr($packet->pid()); - switch($this->packet->pid()){ + switch($packet->pid()){ case RakNetInfo::OPEN_CONNECTION_REPLY_1: - $this->buffer .= RakNetInfo::MAGIC; - $this->putLong($this->packet->serverID); - $this->putByte(0); //server security - $this->putShort($this->packet->mtuSize); + $packet->buffer .= RakNetInfo::MAGIC; + $packet->buffer .= Utils::writeLong($packet->serverID); + $packet->buffer .= chr(0); //server security + $packet->buffer .= Utils::writeShort($packet->mtuSize); break; case RakNetInfo::OPEN_CONNECTION_REPLY_2: - $this->buffer .= RakNetInfo::MAGIC; - $this->putLong($this->packet->serverID); - $this->putShort($this->packet->port); - $this->putShort($this->packet->mtuSize); - $this->putByte(0); //Server security + $packet->buffer .= RakNetInfo::MAGIC; + $packet->buffer .= Utils::writeLong($packet->serverID); + $packet->buffer .= Utils::writeShort($packet->port); + $packet->buffer .= Utils::writeShort($packet->mtuSize); + $packet->buffer .= chr(0); //Server security break; case RakNetInfo::INCOMPATIBLE_PROTOCOL_VERSION: - $this->putByte(RakNetInfo::STRUCTURE); - $this->buffer .= RakNetInfo::MAGIC; - $this->putLong($this->packet->serverID); + $packet->buffer .= chr(RakNetInfo::STRUCTURE); + $packet->buffer .= RakNetInfo::MAGIC; + $packet->buffer .= Utils::writeLong($packet->serverID); break; case RakNetInfo::UNCONNECTED_PONG: case RakNetInfo::ADVERTISE_SYSTEM: - $this->putLong($this->packet->pingID); - $this->putLong($this->packet->serverID); - $this->buffer .= RakNetInfo::MAGIC; - $this->putString($this->packet->serverType); + $packet->buffer .= Utils::writeLong($packet->pingID); + $packet->buffer .= Utils::writeLong($packet->serverID); + $packet->buffer .= RakNetInfo::MAGIC; + + $packet->buffer .= Utils::writeShort(strlen($packet->serverType)); + $packet->buffer .= $packet->serverType; break; case RakNetInfo::DATA_PACKET_0: case RakNetInfo::DATA_PACKET_1: @@ -58,9 +51,9 @@ class RakNetCodec{ case RakNetInfo::DATA_PACKET_D: case RakNetInfo::DATA_PACKET_E: case RakNetInfo::DATA_PACKET_F: - $this->putLTriad($this->packet->seqNumber); - foreach($this->packet->data as $pk){ - $this->encodeDataPacket($pk); + $packet->buffer .= Utils::writeLTriad($packet->seqNumber); + foreach($packet->data as $pk){ + static::encodeDataPacket($packet, $pk); } break; case RakNetInfo::NACK: @@ -68,14 +61,14 @@ class RakNetCodec{ $payload = b""; $records = 0; $pointer = 0; - sort($this->packet->packets, SORT_NUMERIC); - $max = count($this->packet->packets); + sort($packet->packets, SORT_NUMERIC); + $max = count($packet->packets); while($pointer < $max){ $type = true; - $curr = $start = $this->packet->packets[$pointer]; + $curr = $start = $packet->packets[$pointer]; for($i = $start + 1; $i < $max; ++$i){ - $n = $this->packet->packets[$i]; + $n = $packet->packets[$i]; if(($n - $curr) === 1){ $curr = $end = $n; $type = false; @@ -95,73 +88,58 @@ class RakNetCodec{ } ++$records; } - $this->putShort($records); - $this->buffer .= $payload; + $packet->buffer .= Utils::writeShort($records); + $packet->buffer .= $payload; break; default: } - } - protected function putLong($v){ - $this->buffer .= Utils::writeLong($v); - } - - protected function putByte($v){ - $this->buffer .= chr($v); - } - - protected function putShort($v){ - $this->buffer .= Utils::writeShort($v); - } - - protected function putString($v){ - $this->putShort(strlen($v)); - $this->put($v); - } - - protected function put($str){ - $this->buffer .= $str; - } - - protected function putLTriad($v){ - $this->buffer .= Utils::writeLTriad($v); - } - - private function encodeDataPacket(RakNetDataPacket $pk){ - $this->putByte(($pk->reliability << 5) | ($pk->hasSplit > 0 ? 0b00010000 : 0)); - $this->putShort(strlen($pk->buffer) << 3); + public static function encodeDataPacket(RakNetPacket $packet, RakNetDataPacket $pk){ + $packet->buffer .= chr(($pk->reliability << 5) | ($pk->hasSplit > 0 ? 0b00010000 : 0)); + $packet->buffer .= Utils::writeShort(strlen($pk->buffer) << 3); if($pk->reliability === 2 or $pk->reliability === 3 or $pk->reliability === 4 or $pk->reliability === 6 or $pk->reliability === 7){ - $this->putLTriad($pk->messageIndex); + $packet->buffer .= Utils::writeLTriad($pk->messageIndex); } if($pk->reliability === 1 or $pk->reliability === 3 or $pk->reliability === 4 or $pk->reliability === 7){ - $this->putLTriad($pk->orderIndex); - $this->putByte($pk->orderChannel); + $packet->buffer .= Utils::writeLTriad($pk->orderIndex); + $packet->buffer .= chr($pk->orderChannel); } if($pk->hasSplit === true){ - $this->putInt($pk->splitCount); - $this->putShort($pk->splitID); - $this->putInt($pk->splitIndex); + $packet->buffer .= Utils::writeInt($pk->splitCount); + $packet->buffer .= Utils::writeShort($pk->splitID); + $packet->buffer .= Utils::writeInt($pk->splitIndex); } - $this->buffer .= $pk->buffer; + $packet->buffer .= $pk->buffer; } - - protected function putInt($v){ - $this->buffer .= Utils::writeInt($v); - } - - protected function putTriad($v){ - $this->buffer .= Utils::writeTriad($v); + + /** + * @deprecated + */ + public $packet; + /** + * @deprecated + */ + public $buffer; + /** + * @deprecated use RakNetCodec::encode + * @param RakNetPacket $packet + */ + public function __construct(RakNetPacket $packet){ + $this->packet = $packet; + $this->buffer = &$packet->buffer; + static::encode($packet); } + } \ No newline at end of file diff --git a/src/network/raknet/RakNetParser.php b/src/network/raknet/RakNetParser.php index f5318b9c..764bf64f 100644 --- a/src/network/raknet/RakNetParser.php +++ b/src/network/raknet/RakNetParser.php @@ -1,42 +1,35 @@ buffer =& $buffer; - $this->offset = 0; - if(strlen($this->buffer) > 0){ - $this->parse(); - }else{ - $this->packet = false; - } - } - - private function parse(){ - $this->packet = new RakNetPacket(ord($this->get(1))); - $this->packet->buffer =& $this->buffer; - $this->packet->length = strlen($this->buffer); - switch($this->packet->pid()){ + public static function parse(&$buffer){ + $offset = 0; + ++$offset; + $packet = new RakNetPacket(ord(substr($buffer, $offset - 1, 1))); + $packet->buffer = &$buffer; + $packet->length = strlen($buffer); + switch($packet->pid()){ case RakNetInfo::UNCONNECTED_PING: case RakNetInfo::UNCONNECTED_PING_OPEN_CONNECTIONS: - $this->packet->pingID = $this->getLong(); - $this->offset += 16; //Magic + $offset += 8; + $packet->pingID = Utils::readLong(substr($buffer, $offset - 8, 8), false); + $offset += 16; //Magic break; case RakNetInfo::OPEN_CONNECTION_REQUEST_1: - $this->offset += 16; //Magic - $this->packet->structure = $this->getByte(); - $this->packet->mtuSize = strlen($this->get(true)); + $offset += 16; //Magic + ++$offset; + $packet->structure = ord(substr($buffer, $offset - 1, 1)); + $packet->mtuSize = strlen(substr($buffer, $offset)); break; case RakNetInfo::OPEN_CONNECTION_REQUEST_2: - $this->offset += 16; //Magic - $this->packet->security = $this->get(5); - $this->packet->port = $this->getShort(false); - $this->packet->mtuSize = $this->getShort(false); - $this->packet->clientID = $this->getLong(); + $offset += 16; //Magic + $offset += 5; + $packet->security = Utils::readLong(substr($buffer, $offset - 5, 5), false); + $offset += 2; + $packet->port = Utils::readShort(substr($buffer, $offset - 2, 2), false); + $offset += 2; + $packet->mtuSize = Utils::readShort(substr($buffer, $offset - 2, 2), false); + $offset += 8; + $packet->clientID = Utils::readLong(substr($buffer, $offset - 8, 8), false); break; case RakNetInfo::DATA_PACKET_0: case RakNetInfo::DATA_PACKET_1: @@ -54,36 +47,43 @@ class RakNetParser{ case RakNetInfo::DATA_PACKET_D: case RakNetInfo::DATA_PACKET_E: case RakNetInfo::DATA_PACKET_F: - $this->packet->seqNumber = $this->getLTriad(); - $this->packet->data = []; + $offset += 3; + $packet->seqNumber = Utils::readTriad(strrev(substr($buffer, $offset - 3, 3))); + $packet->data = []; - while(!$this->feof() and ($pk = $this->parseDataPacket()) instanceof RakNetDataPacket){ - $this->packet->data[] = $pk; + while(isset($buffer[$offset]) and ($pk = static::parseDataPacket($offset, $buffer)) instanceof RakNetDataPacket){ + $packet->data[] = $pk; } break; case RakNetInfo::NACK: case RakNetInfo::ACK: - $count = $this->getShort(); - $this->packet->packets = []; - for($i = 0; $i < $count and !$this->feof(); ++$i){ - if($this->getByte() === 0){ - $start = $this->getLTriad(); - $end = $this->getLTriad(); + $offset += 2; + $count = Utils::readShort(substr($buffer, $offset - 2, 2), false); + $packet->packets = []; + for($i = 0; $i < $count && isset($buffer[$offset]); ++$i){ + ++$offset; + if(ord(substr($buffer, $offset - 1, 1)) === 0){ + $offset += 3; + $start = Utils::readTriad(strrev(substr($buffer, $offset - 3, 3))); + $offset += 3; + $end = Utils::readTriad(strrev(substr($buffer, $offset - 3, 3))); if(($end - $start) > 4096){ $end = $start + 4096; } for($c = $start; $c <= $end; ++$c){ - $this->packet->packets[] = $c; + $packet->packets[] = $c; } }else{ - $this->packet->packets[] = $this->getLTriad(); + $offset += 3; + $packet->packets[] = Utils::readTriad(strrev(substr($buffer, $offset - 3, 3))); } } break; default: - $this->packet = false; + $packet = false; break; } + return $packet; } private function get($len){ @@ -98,57 +98,50 @@ class RakNetParser{ return substr($this->buffer, $this->offset - $len, $len); } - private function getLong($unsigned = false){ - return Utils::readLong($this->get(8), $unsigned); - } - private function getByte(){ return ord($this->get(1)); } private function getShort($unsigned = false){ - return Utils::readShort($this->get(2), $unsigned); + return ; } private function getLTriad(){ return Utils::readTriad(strrev($this->get(3))); } - private function feof(){ - return !isset($this->buffer[$this->offset]); - } - - private function parseDataPacket(){ - $packetFlags = $this->getByte(); + private static function parseDataPacket(&$offset, &$buffer){ + ++$offset; + $packetFlags = ord(substr($buffer, $offset - 1, 1)); $reliability = ($packetFlags & 0b11100000) >> 5; $hasSplit = ($packetFlags & 0b00010000) > 0; - $length = (int) ceil($this->getShort() / 8); + $offset += 2; + $length = (int) ceil(Utils::readShort(substr($buffer, $offset - 2, 2), false) / 8); - if($reliability === 2 - or $reliability === 3 - or $reliability === 4 - or $reliability === 6 - or $reliability === 7){ - $messageIndex = $this->getLTriad(); + if($reliability == 2 ||$reliability == 3 || $reliability == 4 || $reliability == 6 || $reliability == 7){ + $offset += 3; + $messageIndex = Utils::readTriad(strrev(substr($buffer, $offset - 3, 3))); }else{ $messageIndex = false; } - if($reliability === 1 - or $reliability === 3 - or $reliability === 4 - or $reliability === 7){ - $orderIndex = $this->getLTriad(); - $orderChannel = $this->getByte(); + if($reliability == 1 ||$reliability == 3 || $reliability == 4 || $reliability == 7){ + $offset += 3; + $orderIndex = Utils::readTriad(strrev(substr($buffer, $offset - 3, 3))); + ++$offset; + $orderChannel = ord(substr($buffer, $offset - 1, 1)); }else{ $orderIndex = false; $orderChannel = false; } if($hasSplit){ - $splitCount = $this->getInt(); - $splitID = $this->getShort(); - $splitIndex = $this->getInt(); + $offset += 4; + $splitCount = Utils::readInt(substr($buffer, $offset - 4, 4), false); + $offset += 2; + $splitID = Utils::readShort(substr($buffer, $offset - 2, 2), false); + $offset += 4; + $splitIndex = Utils::readInt(substr($buffer, $offset - 4, 4), false); }else{ $splitCount = false; $splitID = false; @@ -160,9 +153,11 @@ class RakNetParser{ or ($hasSplit === true and $splitIndex >= $splitCount)){ return false; }else{ - $pid = $this->getByte(); - $buffer = $this->get($length - 1); - if(strlen($buffer) < ($length - 1)){ + ++$offset; + $pid = ord(substr($buffer, $offset - 1, 1)); + $offset += $length-1; + $buf = substr($buffer, $offset - ($length - 1), ($length - 1)); + if(strlen($buf) < ($length - 1)){ return false; } @@ -233,13 +228,23 @@ class RakNetParser{ $data->splitCount = $splitCount; $data->splitID = $splitID; $data->splitIndex = $splitIndex; - $data->setBuffer($buffer); + $data->setBuffer($buf); } return $data; } - - private function getInt($unsigned = false){ - return Utils::readInt($this->get(4), $unsigned); + + /** + * @deprecated + */ + public $packet; + /** + * @deprecated use RakNetParser::parse + */ + public function __construct(&$buffer){ + if(strlen($buffer) > 0){ + $this->packet = static::parse($buffer); + }else{ + $this->packet = false; + } } - } \ No newline at end of file