mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-10-16 03:51:37 +00:00
Code Issues Projects Releases Wiki Activity

Packet Sending Buffering

Browse Source
This commit is contained in:
Shoghi Cervantes Pueyo
2013-03-16 00:09:00 +01:00
parent ffaaca6f2d
commit fc06e1bcaf
5 changed files with 86 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/network/CustomPacketHandler.php
View File

@@ -26,7 +26,11 @@ the Free Software Foundation, either version 3 of the License, or
*/
class CustomPacketHandler{
var $offset, $raw, $c, $data, $name = "";
public $offset;
public $raw;
public $c;
public $data;
public $name = "";
private function get($len = true, $check = true){
if($len === true){

17
src/network/MinecraftInterface.php
View File

@@ -69,24 +69,27 @@ class MinecraftInterface{
if($this->socket->connected === false){
return false;
}
$data = $this->socket->read();
if($data[3] === false){
$buf = "";
$source = false;
$port = 1;
$len = $this->socket->read($buf, $source, $port);
if($len === false){
return false;
}
$pid = ord($data[0]);
$pid = ord($buf{0});
$struct = $this->getStruct($pid);
if($struct === false){
console("[ERROR] Unknown Packet ID 0x".Utils::strToHex(chr($pid)), true, true, 0);
$p = "[".(microtime(true) - $this->start)."] [".((($origin === "client" and $this->client === true) or ($origin === "server" and $this->client === false)) ? "CLIENT->SERVER":"SERVER->CLIENT")." ".$ip.":".$port."]: Error, bad packet id 0x".Utils::strTohex(chr($pid))." [length ".strlen($raw)."]".PHP_EOL;
$p .= Utils::hexdump($data[0]);
$p = "[".(microtime(true) - $this->start)."] [".((($origin === "client" and $this->client === true) or ($origin === "server" and $this->client === false)) ? "CLIENT->SERVER":"SERVER->CLIENT")." ".$ip.":".$port."]: Error, bad packet id 0x".Utils::strToHex(chr($pid))." [length ".strlen($buf)."]".PHP_EOL;
$p .= Utils::hexdump($buf);
$p .= PHP_EOL;
logg($p, "packets", true, 2);
return false;
}
$packet = new Packet($pid, $struct, $data[0]);
$packet = new Packet($pid, $struct, $buf);
@$packet->parse();
$this->data[] = array($pid, $packet->data, $data[0], $data[1], $data[2]);
$this->data[] = array($pid, $packet->data, $buf, $source, $port);
return $this->popPacket();
}

13
src/network/Packet.php
View File

@@ -80,10 +80,15 @@ class Packet{
$this->addRaw($reply->raw);
break;
case 0x00:
$reply = new CustomPacketHandler($this->data[$field]["id"], "", $this->data[$field], true);
$this->addRaw(Utils::writeShort((strlen($reply->raw) + 1) << 3));
$this->addRaw(chr($this->data[$field]["id"]));
$this->addRaw($reply->raw);
if($this->data[$field]["id"] !== false){
$raw = new CustomPacketHandler($this->data[$field]["id"], "", $this->data[$field], true);
$raw = $raw->raw;
$this->addRaw(Utils::writeShort((strlen($raw) + 1) << 3));
$this->addRaw(chr($this->data[$field]["id"]));
$this->addRaw($raw);
}else{
$this->addRaw($this->data[$field]["raw"]);
}
break;
}
break;

8
src/network/UDPSocket.php
View File

@@ -76,14 +76,12 @@ class UDPSocket{
socket_set_nonblock($this->sock);
}
public function read(){
public function read(&$buf, &$source, &$port){
if($this->connected === false){
return array(3 => false);
return false;
}
$source = false;
$port = 1; //$source and $port will be overwritten
$len = @socket_recvfrom($this->sock, $buf, 65535, 0, $source, $port);
return array($buf, $source, $port, $len);
return $len;
}
public function write($data, $dest = false, $port = false){