From 892119f7918b327bab97fa584001ba19c77ed948 Mon Sep 17 00:00:00 2001 From: Shoghi Cervantes Date: Sun, 6 Jul 2014 01:18:28 +0200 Subject: [PATCH] Updated RakLib version, Query works again --- src/pocketmine/Server.php | 41 +++++++++++++-- src/pocketmine/network/RakLibInterface.php | 8 +++ src/pocketmine/network/query/QueryHandler.php | 51 ++++++++++--------- src/pocketmine/network/query/QueryPacket.php | 45 ---------------- src/raklib | 2 +- 5 files changed, 71 insertions(+), 76 deletions(-) delete mode 100644 src/pocketmine/network/query/QueryPacket.php diff --git a/src/pocketmine/Server.php b/src/pocketmine/Server.php index 4edc14ad3..5bc29e85e 100644 --- a/src/pocketmine/Server.php +++ b/src/pocketmine/Server.php @@ -60,6 +60,7 @@ use pocketmine\nbt\tag\String; use pocketmine\network\protocol\DataPacket; use pocketmine\network\protocol\Info; use pocketmine\network\query\QueryHandler; +use pocketmine\network\query\QueryPacket; use pocketmine\network\RakLibInterface; use pocketmine\network\rcon\RCON; use pocketmine\network\SourceInterface; @@ -161,6 +162,8 @@ class Server{ /** @var SourceInterface[] */ private $interfaces = []; + /** @var RakLibInterface */ + private $mainInterface; private $serverID; @@ -546,7 +549,35 @@ class Server{ * @param SourceInterface $interface */ public function addInterface(SourceInterface $interface){ - $this->interfaces[] = $interface; + $this->interfaces[spl_object_hash($interface)] = $interface; + } + + /** + * @param SourceInterface $interface + */ + public function removeInterface(SourceInterface $interface){ + $interface->shutdown(); + unset($this->interfaces[spl_object_hash($interface)]); + } + + /** + * @param string $address + * @param int $port + * @param string $payload + */ + public function sendPacket($address, $port, $payload){ + $this->mainInterface->putRaw($address, $port, $payload); + } + + /** + * @param string $address + * @param int $port + * @param string $payload + */ + public function handlePacket($address, $port, $payload){ + if(strlen($payload) > 2 and substr($payload, 0, 2) === "\xfe\xfd" and $this->queryHandler instanceof QueryHandler){ + $this->queryHandler->handle($address, $port, $payload); + } //TODO: add raw packet events } /** @@ -1027,7 +1058,7 @@ class Server{ $this->levels[$level->getID()] = $level; $this->getPluginManager()->callEvent(new LevelInitEvent($level)); - + $this->getPluginManager()->callEvent(new LevelLoadEvent($level)); for($Z = 5; $Z <= 11; ++$Z){ @@ -1424,7 +1455,7 @@ class Server{ define("BOOTUP_RANDOM", Utils::getRandomBytes(16)); $this->serverID = Binary::readLong(substr(Utils::getUniqueID(true, $this->getIp() . $this->getPort()), 0, 8)); - $this->interfaces[] = new RakLibInterface($this); + $this->addInterface($this->mainInterface = new RakLibInterface($this)); $this->logger->info("This server is running PocketMine-MP version " . ($version->isDev() ? TextFormat::YELLOW : "") . $version->get(false) . TextFormat::RESET . " \"" . $this->getCodename() . "\" (API " . $this->getApiVersion() . ")", true, true, 0); $this->logger->info("PocketMine-MP is distributed under the LGPL License", true, true, 0); @@ -1676,8 +1707,8 @@ class Server{ public function start(){ if($this->getConfigBoolean("enable-query", true) === true){ - //$this->queryHandler = new QueryHandler(); - //TODO: query + $this->queryHandler = new QueryHandler(); + } diff --git a/src/pocketmine/network/RakLibInterface.php b/src/pocketmine/network/RakLibInterface.php index 7a28e194a..d5dd84e91 100644 --- a/src/pocketmine/network/RakLibInterface.php +++ b/src/pocketmine/network/RakLibInterface.php @@ -153,6 +153,14 @@ class RakLibInterface implements ServerInstance, SourceInterface{ } } + public function handleRaw($address, $port, $payload){ + $this->server->handlePacket($address, $port, $payload); + } + + public function putRaw($address, $port, $payload){ + $this->interface->sendRaw($address, $port, $payload); + } + public function notifyACK($identifier, $identifierACK){ if(isset($this->players[$identifier])){ $this->players[$identifier]->handleACK($identifierACK); diff --git a/src/pocketmine/network/query/QueryHandler.php b/src/pocketmine/network/query/QueryHandler.php index 642d2c5aa..96da8622e 100644 --- a/src/pocketmine/network/query/QueryHandler.php +++ b/src/pocketmine/network/query/QueryHandler.php @@ -32,6 +32,9 @@ use pocketmine\utils\Utils; class QueryHandler{ private $socket, $server, $lastToken, $token, $longData, $timeout; + const HANDSHAKE = 9; + const STATISTICS = 0; + public function __construct(){ $this->server = Server::getInstance(); $this->server->getLogger()->info("Starting GS4 status listener"); @@ -102,39 +105,37 @@ class QueryHandler{ return Binary::readInt(substr(hash("sha512", $salt . ":" . $token, true), 7, 4)); } - public function handle(QueryPacket $packet){ - $packet->decode(); - switch($packet->packetType){ - case QueryPacket::HANDSHAKE: //Handshake - $pk = new QueryPacket; - $pk->ip = $packet->ip; - $pk->port = $packet->port; - $pk->packetType = QueryPacket::HANDSHAKE; - $pk->sessionID = $packet->sessionID; - $pk->payload = self::getTokenString($this->token, $packet->ip) . "\x00"; - $pk->encode(); - $this->server->sendPacket($pk); + public function handle($address, $port, $packet){ + $offset = 2; + $packetType = ord($packet{$offset++}); + $sessionID = Binary::readInt(substr($packet, $offset, 4)); + $offset += 4; + $payload = substr($packet, $offset); + + switch($packetType){ + case self::HANDSHAKE: //Handshake + $reply = chr(self::HANDSHAKE); + $reply .= Binary::writeInt($sessionID); + $reply .= self::getTokenString($this->token, $address) . "\x00"; + + $this->server->sendPacket($address, $port, $reply); break; - case QueryPacket::STATISTICS: //Stat - $token = Binary::readInt(substr($packet->payload, 0, 4)); - if($token !== self::getTokenString($this->token, $packet->ip) and $token !== self::getTokenString($this->lastToken, $packet->ip)){ + case self::STATISTICS: //Stat + $token = Binary::readInt(substr($payload, 0, 4)); + if($token !== self::getTokenString($this->token, $address) and $token !== self::getTokenString($this->lastToken, $ip)){ break; } - $pk = new QueryPacket; - $pk->ip = $packet->ip; - $pk->port = $packet->port; - $pk->packetType = QueryPacket::STATISTICS; - $pk->sessionID = $packet->sessionID; - if(strlen($packet->payload) === 8){ + $reply = chr(self::STATISTICS); + $reply .= Binary::writeInt($sessionID); + if(strlen($payload) === 8){ if($this->timeout < microtime(true)){ $this->regenerateInfo(); } - $pk->payload = $this->longData; + $reply .= $this->longData; }else{ - $pk->payload = $this->server->getServerName() . "\x00" . (($this->server->getGamemode() & 0x01) === 0 ? "SMP" : "CMP") . "\x00" . $this->server->getDefaultLevel()->getName() . "\x00" . count($this->server->getOnlinePlayers()) . "\x00" . $this->server->getMaxPlayers() . "\x00" . Binary::writeLShort($this->server->getPort()) . $this->server->getIp() . "\x00"; + $reply .= $this->server->getServerName() . "\x00" . (($this->server->getGamemode() & 0x01) === 0 ? "SMP" : "CMP") . "\x00" . $this->server->getDefaultLevel()->getName() . "\x00" . count($this->server->getOnlinePlayers()) . "\x00" . $this->server->getMaxPlayers() . "\x00" . Binary::writeLShort($this->server->getPort()) . $this->server->getIp() . "\x00"; } - $pk->encode(); - $this->server->sendPacket($pk); + $this->server->sendPacket($address, $port, $reply); break; } } diff --git a/src/pocketmine/network/query/QueryPacket.php b/src/pocketmine/network/query/QueryPacket.php deleted file mode 100644 index 43879bc84..000000000 --- a/src/pocketmine/network/query/QueryPacket.php +++ /dev/null @@ -1,45 +0,0 @@ -packetType = ord($this->buffer{2}); - $this->sessionID = Binary::readInt(substr($this->buffer, 3, 4)); - $this->payload = substr($this->buffer, 7); - } - - public function encode(){ - $this->buffer .= chr($this->packetType); - $this->buffer .= Binary::writeInt($this->sessionID); - $this->buffer .= $this->payload; - } -} \ No newline at end of file diff --git a/src/raklib b/src/raklib index 3f1f9ca18..740c96f03 160000 --- a/src/raklib +++ b/src/raklib @@ -1 +1 @@ -Subproject commit 3f1f9ca18e76b80a37913312704dc982f3c101a6 +Subproject commit 740c96f033322d99e8804bb1a0218abef0ef117a