Merge branch 'master' of https://github.com/if-Team/CustomPacket.git

if-Team · Nov 28, 2014 · 5dac4a2 · 5dac4a2
2 parents 9c31bc8 + c65fbb3
commit 5dac4a2
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 11 deletions.
diff --git a/plugin/src/ifteam/CustomPacket/CustomSocket.php b/plugin/src/ifteam/CustomPacket/CustomSocket.php
@@ -4,17 +4,18 @@
 
 use pocketmine\Thread;
 use pocketmine\Server;
+use ifteam\CustomPacket\Event\ReceivePacketEvent;
 
 class CustomSocket extends Thread{
 
-	protected $caller, $logger, $interface, $port, $socket;
+	protected $caller, $interface, $port, $socket;
 
 	public function __construct($caller, $interface = '0.0.0.0', $port = 19131){
-		$this->caller = $caller;
-		$this->logger = $caller->getLogger();
+		global $plugin;
+		$plugin = $caller;
 		$this->interface = filter_var($interface, FILTER_VALIDATE_IP)? $interface : '0.0.0.0';
 		$this->port = $port;
-		$this->start();
+		$this->start(PTHREADS_INHERIT_ALL | PTHREADS_ALLOW_GLOBALS);
 	}
 
 	public function sendPacket($buffer, $address, $port, $scream = false){
@@ -33,22 +34,23 @@ public function close(){
 	}
 
 	public function run(){
+		global $plugin;
 		$this->socket = socket_create(AF_INET, SOCK_DGRAM, SOL_UDP);
 		if (socket_bind ( $this->socket, $this->interface, $this->port ) === true) {
 			@socket_set_option ( $this->socket, SOL_SOCKET, SO_REUSEADDR, 0 );
 			@socket_set_option ( $this->socket, SOL_SOCKET, SO_RCVBUF, 1024 * 1024 );
 			@socket_set_option ( $this->socket, SOL_SOCKET, SO_SNDBUF, 1024 * 1024 * 8 );
 		} else {
-			$this->logger->critical ("*** FAILED TO BIND TO " . $this->interface . ":" . $this->port . "!", true, true, 0 );
-			$this->logger->critical ("*** Perhaps a server is already running on that port?", \true, \true, 0);
+			$plugin->getServer()->getLogger()->critical ("*** FAILED TO BIND TO " . $this->interface . ":" . $this->port . "!", true, true, 0 );
+			$plugin->getServer()->getLogger()->critical ("*** Perhaps a server is already running on that port?", \true, \true, 0);
 		}
 		socket_set_nonblock ( $this->socket );
-		//$this->logger->info("CustomSocket: Done loading. Enthering the loop...");
+		$plugin->getServer()->getLogger()->info("CustomSocket: Done loading. Enthering the loop...");
 		while(1){
 			$buffer = $address = $port = NULL;
 			if($this->recvPacket($buffer, $address, $port) !== false){
 				echo 'GOTCHA! from: '.$address.':'.$port.', data: '.$buffer.PHP_EOL;
-				// $this->caller->getPluginManager()->callEvent(new ReceivePacketEvent(new CustomPacket($buffer), $address, $port)); //THIS CAUSES SEGFAULT!
+				$plugin->callEvent('rcv', array('rawstring' => $buffer, 'ip' => $address, 'port' => $port));
 				$this->sendPacket('You sent '. $buffer .' !!! success! WOW!', $address, $port, true); //Test code. should be remove in official release.
 			}
 		}

diff --git a/plugin/src/ifteam/CustomPacket/Event/SendPacketEvent.php b/plugin/src/ifteam/CustomPacket/Event/SendPacketEvent.php
@@ -3,10 +3,11 @@
 namespace ifteam\CustomPacket\event;
 
 use pocketmine\event\Cancellable;
+use ifteam\CustomPacket\Packet\CustomPacket;
 
 class SendPacketEvent extends CustomPacketEvent implements Cancellable{
-	public function __construct(CustomSocket $plugin, $packet, $ip, $port) {
-		parent::__construct ( $plugin, $packet, $ip, $port );
+	public function __construct(CustomPacket $packet, $ip, $port) {
+		parent::__construct ($packet, $ip, $port );
 	}
 
     public function getPacket() {

diff --git a/plugin/src/ifteam/CustomPacket/MainLoader.php b/plugin/src/ifteam/CustomPacket/MainLoader.php
@@ -8,6 +8,7 @@
 use pocketmine\Server;
 use ifteam\CustomPacket\event\ReceivePacketEvent;
 use ifteam\CustomPacket\event\SendPacketEvent;
+use ifteam\CustomPacket\Packet\CustomPacket;
 use pocketmine\scheduler\CallbackTask;
 
 class MainLoader extends PluginBase implements Listener {
@@ -29,7 +30,7 @@ public function onEnable() {
             "port" => 19131
         ];
         $this->option = (new Config($this->getDataFolder() . "SocketOption.yml", Config::YAML, $defaultOption))->getAll();
-        $this->socket = new CustomSocket($this->getServer(), $this->option["interface"], $this->option["port"]);
+        $this->socket = new CustomSocket($this, $this->option["interface"], $this->option["port"]);
 		//$this->socketManager = new SocketManager($this->socket, $this);
         $this->getServer()->getPluginManager()->registerEvents($this, $this);
     }
@@ -93,5 +94,20 @@ public static function sendPacket($packet, $ip, $port) {
             }
         }
     }
+
+	public function callEvent($type, array $data){
+		switch($type){
+			case 'recv':
+				$this->getServer()->getPluginManager()->callEvent(new ReceivePacketEvent(new CustomPacket($data['rawstring']), $data['ip'], $data['port']));
+				break;
+			case 'send':
+				$this->getServer()->getPluginManager()->callEvent(new SendPacketEvent($data['pk'], $data['ip'], $data['port']));
+				break;
+		}
+		ob_start();
+		var_dump($data);
+		$dump = ob_get_clean();
+		$this->getServer()->getLogger()->debug("[CustomPacket Event debug message]\n".$dump);
+	}
 }
 ?>