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

Socket cleanup

Browse Source
This commit is contained in:
Shoghi Cervantes Pueyo 2012-12-12 20:03:06 +01:00
parent ca74f4f0c1
commit 801c2736ba
1 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
classes/MinecraftInterface.class.php
View File

@ -26,10 +26,10 @@ the Free Software Foundation, either version 3 of the License, or
*/ */
class MinecraftInterface{ class MinecraftInterface{
var $pstruct, $name, $server, $protocol, $client, $buffer, $dataName; var $pstruct, $name, $protocol, $client, $buffer, $dataName;
private $socket;
function __construct($server, $protocol = CURRENT_PROTOCOL, $port = 25565, $listen = false, $client = true){ function __construct($server, $protocol = CURRENT_PROTOCOL, $port = 25565, $listen = false, $client = true){
$this->server = new UDPSocket($server, $port, (bool) $listen); $this->socket = new UDPSocket($server, $port, (bool) $listen);
$this->protocol = (int) $protocol; $this->protocol = (int) $protocol;
require("pstruct/RakNet.php"); require("pstruct/RakNet.php");
require("pstruct/packetName.php"); require("pstruct/packetName.php");
@ -44,7 +44,7 @@ class MinecraftInterface{
} }
public function close(){ public function close(){
return $this->server->close(); return $this->socket->close();
} }
protected function getStruct($pid){ protected function getStruct($pid){
@ -74,30 +74,22 @@ class MinecraftInterface{
if($p !== false){ if($p !== false){
return $p; return $p;
} }
if($this->server->connected === false){ if($this->socket->connected === false){
//return array("pid" => "ff", "data" => array(0 => 'Connection error')); return false;
} }
$data = $this->server->read(); $data = $this->socket->read();
if($data[3] === false){ if($data[3] === false){
return false; return false;
} }
$pid = ord($data[0]); $pid = ord($data[0]);
/*if($pid === 0x84){
$data[0] = substr($data[0], 10);
$pid = ord($data[0]);
}*/
$struct = $this->getStruct($pid); $struct = $this->getStruct($pid);
if($struct === false){ if($struct === false){
console("[ERROR] Bad packet id 0x".Utils::strTohex(chr($pid)), true, true, 0); 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 = "[".(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 .= Utils::hexdump($data[0]);
$p .= PHP_EOL; $p .= PHP_EOL;
logg($p, "packets", true, 2); logg($p, "packets", true, 2);
$this->buffer = ""; $this->buffer = "";
//$this->server->recieve("\xff".Utils::writeString('Bad packet id '.$pid.''));
//$this->writePacket("ff", array(0 => 'Bad packet id '.$pid.''));
//return array("pid" => "ff", "data" => array(0 => 'Bad packet id '.$pid.''));
return false; return false;
} }
@ -131,10 +123,10 @@ class MinecraftInterface{
$packet->protocol = $this->protocol; $packet->protocol = $this->protocol;
$packet->data = $data; $packet->data = $data;
$packet->create(); $packet->create();
$write = $this->server->write($packet->raw, $dest, $port); $write = $this->socket->write($packet->raw, $dest, $port);
$this->writeDump($pid, $packet->raw, $data, "client", $dest, $port); $this->writeDump($pid, $packet->raw, $data, "client", $dest, $port);
}else{ }else{
$write = $this->server->write($data, $dest, $port); $write = $this->socket->write($data, $dest, $port);
$this->writeDump($pid, $data, false, "client", $dest, $port); $this->writeDump($pid, $data, false, "client", $dest, $port);
} }
return true; return true;