mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-22 19:34:02 +00:00
Code Issues Projects Releases Wiki Activity

Updated Query to new packet format

Browse Source
This commit is contained in:
Shoghi Cervantes 2014-02-08 17:56:48 +01:00
parent d8aea544f3
commit f255948eb6
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/network/Query.php
View File

@ -41,7 +41,7 @@ class Query{
Then, the Query class handles itself sending the packets in raw form, because Then, the Query class handles itself sending the packets in raw form, because
packets can conflict with the MCPE ones. packets can conflict with the MCPE ones.
*/ */
$this->server->addHandler("server.unknownpacket", array($this, "packetHandler"), 50); $this->server->addHandler("server.unknownpacket.254", array($this, "packetHandler"), 50);
$this->server->schedule(20 * 30, array($this, "regenerateToken"), array(), true); $this->server->schedule(20 * 30, array($this, "regenerateToken"), array(), true);
$this->regenerateToken(); $this->regenerateToken();
$this->lastToken = $this->token; $this->lastToken = $this->token;
@ -94,37 +94,45 @@ class Query{
$this->token = Utils::readInt("\x00".Utils::getRandomBytes(3, false)); $this->token = Utils::readInt("\x00".Utils::getRandomBytes(3, false));
} }
public function packetHandler(&$packet, $event){ public function packetHandler($packet, $event){
if($event !== "server.unknownpacket"){ if($event !== "server.unknownpacket.254"){
return; return;
} }
$magic = substr($packet["raw"], 0, 2); $magic = substr($packet->buffer, 0, 2);
$offset = 2; $offset = 2;
if($magic !== "\xfe\xfd"){ if($magic !== "\xfe\xfd"){
return; return;
} }
$type = ord($packet["raw"]{2}); $type = ord($packet->buffer{2});
++$offset; ++$offset;
$sessionID = Utils::readInt(substr($packet["raw"], $offset, 4)); $sessionID = Utils::readInt(substr($packet->buffer, $offset, 4));
$offset += 4; $offset += 4;
$payload = substr($packet["raw"], $offset); $payload = substr($packet->buffer, $offset);
switch($type){ switch($type){
case 9: //Handshake case 9: //Handshake
$this->server->send(9, chr(9).Utils::writeInt($sessionID).$this->token."\x00", true, $packet["ip"], $packet["port"]); $pk = new Packet;
$pk->ip = $packet->ip;
$pk->port = $packet->port;
$pk->buffer = chr(9).Utils::writeInt($sessionID).$this->token."\x00";
$this->server->send($pk);
break; break;
case 0: //Stat case 0: //Stat
$token = Utils::readInt(substr($payload, 0, 4)); $token = Utils::readInt(substr($payload, 0, 4));
if($token !== $this->token and $token !== $this->lastToken){ if($token !== $this->token and $token !== $this->lastToken){
break; break;
} }
$pk = new Packet;
$pk->ip = $packet->ip;
$pk->port = $packet->port;
if(strlen($payload) === 8){ if(strlen($payload) === 8){
if($this->timeout < microtime(true)){ if($this->timeout < microtime(true)){
$this->regenerateInfo(); $this->regenerateInfo();
} }
$this->server->send(0, chr(0).Utils::writeInt($sessionID).$this->longData, true, $packet["ip"], $packet["port"]); $pk->buffer = chr(0).Utils::writeInt($sessionID).$this->longData;
}else{ }else{
$this->server->send(0, chr(0).Utils::writeInt($sessionID).$this->server->name."\x00".(($this->server->gamemode & 0x01) === 0 ? "SMP":"CMP")."\x00".$this->server->api->level->getDefault()->getName()."\x00".count($this->server->clients)."\x00".$this->server->maxClients."\x00".Utils::writeLShort($this->server->api->getProperty("server-port")).$this->server->api->getProperty("server-ip", "0.0.0.0")."\x00", true, $packet["ip"], $packet["port"]); $pk->buffer = chr(0).Utils::writeInt($sessionID).$this->server->name."\x00".(($this->server->gamemode & 0x01) === 0 ? "SMP":"CMP")."\x00".$this->server->api->level->getDefault()->getName()."\x00".count($this->server->clients)."\x00".$this->server->maxClients."\x00".Utils::writeLShort($this->server->api->getProperty("server-port")).$this->server->api->getProperty("server-ip", "0.0.0.0")."\x00";
} }
$this->server->send($pk);
break; break;
} }
return true; return true;