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

PrepareEncryptionTask: remove cyclic dependency on NetworkSession

Browse Source
This commit is contained in:
Dylan K. Taylor
2020-04-18 11:25:29 +01:00
parent e86c243db5
commit 3d3a487422
2 changed files with 29 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/network/mcpe/NetworkSession.php
View File

@@ -530,25 +530,23 @@ class NetworkSession{
if($this->manager->kickDuplicates($this)){
if(NetworkCipher::$ENABLED){
$this->server->getAsyncPool()->submitTask(new PrepareEncryptionTask($this, $clientPubKey));
$this->server->getAsyncPool()->submitTask(new PrepareEncryptionTask($clientPubKey, function(string $encryptionKey, string $handshakeJwt) : void{
if(!$this->connected){
return;
}
$this->sendDataPacket(ServerToClientHandshakePacket::create($handshakeJwt), true); //make sure this gets sent before encryption is enabled
$this->cipher = new NetworkCipher($encryptionKey);
$this->setHandler(new HandshakePacketHandler($this));
$this->logger->debug("Enabled encryption");
}));
}else{
$this->onLoginSuccess();
}
}
}
public function enableEncryption(string $encryptionKey, string $handshakeJwt) : void{
if(!$this->connected){
return;
}
$this->sendDataPacket(ServerToClientHandshakePacket::create($handshakeJwt), true); //make sure this gets sent before encryption is enabled
$this->cipher = new NetworkCipher($encryptionKey);
$this->setHandler(new HandshakePacketHandler($this));
$this->logger->debug("Enabled encryption");
}
public function onLoginSuccess() : void{
$this->loggedIn = true;