net improvments

src/framework/global.h

@@ -30,6 +30,7 @@
 #include <array>
 #include <iomanip>
 #include <unordered_map>
+#include <random>
 
 // boost utilities
 #include <boost/algorithm/string.hpp>

src/framework/net/connection.cpp

@@ -42,6 +42,8 @@ void Connection::close()
     if(!m_connected)
         return;
 
+    m_connected = false;
+
     m_readTimer.cancel();
     m_writeTimer.cancel();
 
@@ -50,16 +52,18 @@ void Connection::close()
         m_socket.close();
     }
 
-    m_connected = false;
+    m_connectCallback = nullptr;
+    m_errorCallback = nullptr;
+    m_recvCallback = nullptr;
 }
 
 void Connection::write(uint8* buffer, uint16 size)
 {
+    m_writeTimer.cancel();
+
     if(!m_connected)
         return;
 
-    m_writeTimer.cancel();
-
     asio::async_write(m_socket,
                       asio::buffer(buffer, size),
                       std::bind(&Connection::onWrite, shared_from_this(), _1, _2));
@@ -102,6 +106,7 @@ void Connection::onResolve(const boost::system::error_code& error, asio::ip::tcp
 void Connection::onConnect(const boost::system::error_code& error)
 {
     m_readTimer.cancel();
+
     m_connected = true;
 
     if(!error) {
@@ -115,6 +120,9 @@ void Connection::onWrite(const boost::system::error_code& error, size_t)
 {
     m_writeTimer.cancel();
 
+    if(!m_connected)
+        return;
+
     if(error)
         handleError(error);
 }
@@ -123,6 +131,9 @@ void Connection::onRecv(const boost::system::error_code& error)
 {
     m_readTimer.cancel();
 
+    if(!m_connected)
+        return;
+
     if(!error) {
         if(m_recvCallback)
             g_dispatcher.addEvent(std::bind(m_recvCallback, m_recvBuffer, m_recvSize));
@@ -133,14 +144,16 @@ void Connection::onRecv(const boost::system::error_code& error)
 void Connection::onTimeout(const boost::system::error_code& error)
 {
     if(error != asio::error::operation_aborted)
-        handleError(error);
+        handleError(asio::error::timed_out);
 }
 
 void Connection::handleError(const boost::system::error_code& error)
 {
-    logTraceDebug(error.message());
-    close();
-    if(m_errorCallback)
-        g_dispatcher.addEvent(std::bind(m_errorCallback, error));
+    if(error != asio::error::operation_aborted) {
+        if(m_errorCallback)
+            g_dispatcher.addEvent(std::bind(m_errorCallback, error));
+        if(m_connected)
+            close();
+    }
 }
 

src/framework/net/protocol.cpp

@@ -1,21 +1,23 @@
 #include "protocol.h"
 #include "connection.h"
 
-Protocol::Protocol() : m_connection(new Connection)
+Protocol::Protocol()
 {
-    m_connection->setErrorCallback(std::bind(&Protocol::onError, this,  _1));
     m_xteaEncryptionEnabled = false;
-    m_checksumEnabled = true;
+    m_checksumEnabled = false;
 }
 
 void Protocol::connect(const std::string& host, uint16 port)
 {
+    m_connection = ConnectionPtr(new Connection);
+    m_connection->setErrorCallback(std::bind(&Protocol::onError, asProtocol(),  _1));
     m_connection->connect(host, port, std::bind(&Protocol::onConnect, asProtocol()));
 }
 
 void Protocol::disconnect()
 {
     m_connection->close();
+    m_connection.reset();
 }
 
 void Protocol::send(OutputMessage& outputMessage)
@@ -76,6 +78,16 @@ void Protocol::internalRecvData(uint8* buffer, uint16 size)
     onRecv(m_inputMessage);
 }
 
+void Protocol::generateXteaKey()
+{
+    std::mt19937 eng(std::time(NULL));
+    std::uniform_int_distribution<uint32> unif(0, 0xFFFFFFFF);
+    m_xteaKey[0] = unif(eng);
+    m_xteaKey[1] = unif(eng);
+    m_xteaKey[2] = unif(eng);
+    m_xteaKey[3] = unif(eng);
+}
+
 bool Protocol::xteaDecrypt(InputMessage& inputMessage)
 {
     // FIXME: this function has not been tested yet

src/framework/net/protocol.h

@@ -28,8 +28,11 @@ public:
     ProtocolPtr asProtocol() { return std::static_pointer_cast<Protocol>(shared_from_this()); }
 
 protected:
+    void enableChecksum() { m_checksumEnabled = true; }
+    void enableXteaEncryption() { m_xteaEncryptionEnabled = true; }
+    void generateXteaKey();
+
     uint32 m_xteaKey[4];
-    bool m_checksumEnabled, m_xteaEncryptionEnabled;
     InputMessage m_inputMessage;
 
 private:
@@ -37,6 +40,8 @@ private:
     void xteaEncrypt(OutputMessage& outputMessage);
     uint32 getAdlerChecksum(uint8* buffer, uint16 size);
 
+    bool m_checksumEnabled;
+    bool m_xteaEncryptionEnabled;
     ConnectionPtr m_connection;
 };
 

src/otclient/core/game.cpp

@@ -35,7 +35,10 @@ void Game::onLogin()
 
 void Game::onLogout()
 {
-    m_protocolGame.reset();
+    if(m_protocolGame) {
+        m_protocolGame->disconnect();
+        m_protocolGame.reset();
+    }
     m_localPlayer.reset();
     m_online = false;
 }

src/otclient/net/protocolgame.cpp

@@ -3,7 +3,6 @@
 
 ProtocolGame::ProtocolGame()
 {
-    m_checksumEnabled = false;
     m_waitingLoginPacket = false;
 }
 
@@ -38,7 +37,7 @@ void ProtocolGame::onRecv(InputMessage& inputMessage)
         uint8 unknown = inputMessage.getU8();
 
         m_waitingLoginPacket = false;
-        m_checksumEnabled = true;
+        enableChecksum();
         sendLoginPacket(timestamp, unknown);
         recv();
     }
@@ -50,7 +49,7 @@ void ProtocolGame::onRecv(InputMessage& inputMessage)
 
 void ProtocolGame::onError(const boost::system::error_code& error)
 {
-    // already disconnected, just send onLogout
+    // already disconnected, just fire onLogout
     g_game.onLogout();
 }
 

src/otclient/net/protocolgamesend.cpp

@@ -5,42 +5,37 @@ void ProtocolGame::sendLoginPacket(uint32 timestamp, uint8 unknown)
 {
     OutputMessage oMsg;
 
-    oMsg.addU8(0x0A); // Protocol id
-    oMsg.addU16(0x02);  // OS
-    oMsg.addU16(862); // Client version
+    oMsg.addU8(0x0A); // protocol id
+    oMsg.addU16(0x02); // os
+    oMsg.addU16(862); // client version
 
-    oMsg.addU8(0); // First RSA byte must be 0x00 // 1
+    oMsg.addU8(0); // first RSA byte must be 0
 
-    // Generete xtea key.
-    m_xteaKey[0] = 432324;
-    m_xteaKey[1] = 24324;
-    m_xteaKey[2] = 423432;
-    m_xteaKey[3] = 234324;
-
-    // Add xtea key
-    oMsg.addU32(m_xteaKey[0]); // 5
-    oMsg.addU32(m_xteaKey[1]); // 9
-    oMsg.addU32(m_xteaKey[2]); // 13
-    oMsg.addU32(m_xteaKey[3]); // 17
+    // xtea key
+    generateXteaKey();
+    oMsg.addU32(m_xteaKey[0]);
+    oMsg.addU32(m_xteaKey[1]);
+    oMsg.addU32(m_xteaKey[2]);
+    oMsg.addU32(m_xteaKey[3]);
 
     oMsg.addU8(0); // is gm set?
-    oMsg.addString(m_accountName); // Account Name // 20
-    oMsg.addString(m_characterName); // Character Name // 22
-    oMsg.addString(m_accountPassword); // Password // 24
+    oMsg.addString(m_accountName);
+    oMsg.addString(m_characterName);
+    oMsg.addString(m_accountPassword);
 
-    oMsg.addU32(timestamp); // 28
-    oMsg.addU8(unknown); // 29
+    oMsg.addU32(timestamp);
+    oMsg.addU8(unknown);
 
-    // Packet data must have since byte 0, start, 128 bytes
+    // fill the rest with zeros
     oMsg.addPaddingBytes(128 - (29 + m_accountName.length() + m_characterName.length() + m_accountPassword.length()));
 
-    // Encrypt msg with RSA
+    // encrypt with RSA
     if(!Rsa::encrypt((char*)oMsg.getBuffer() + 6 + oMsg.getMessageSize() - 128, 128, OTSERV_PUBLIC_RSA))
         return;
 
     send(oMsg);
 
-    m_xteaEncryptionEnabled = true;
+    enableXteaEncryption();
 }
 
 void ProtocolGame::sendLogout()

src/otclient/net/protocollogin.cpp

@@ -10,6 +10,7 @@
 
 ProtocolLogin::ProtocolLogin()
 {
+    enableChecksum();
 }
 
 void ProtocolLogin::login(const std::string& accountName, const std::string& accountPassword)
@@ -22,20 +23,6 @@ void ProtocolLogin::login(const std::string& accountName, const std::string& acc
     m_accountName = accountName;
     m_accountPassword = accountPassword;
 
-    /*static const char hosts[][32] = {
-        "login01.tibia.com",
-        "login02.tibia.com",
-        "login03.tibia.com",
-        "login04.tibia.com",
-        "login05.tibia.com",
-        "tibia01.cipsoft.com",
-        "tibia02.cipsoft.com",
-        "tibia03.cipsoft.com",
-        "tibia04.cipsoft.com",
-        "tibia05.cipsoft.com"
-    };
-
-    std::string host = hosts[rand() % 10];*/
     std::string host = "sv3.radbr.com";
     uint16 port = 7171;
 
@@ -47,49 +34,6 @@ void ProtocolLogin::onConnect()
     sendLoginPacket();
 }
 
-void ProtocolLogin::sendLoginPacket()
-{
-    OutputMessage oMsg;
-
-    oMsg.addU8(0x01); // Protocol id
-    oMsg.addU16(0x02);  // OS
-    oMsg.addU16(862); // Client version
-
-    oMsg.addU32(0x4E12DAFF); // Data Signature
-    oMsg.addU32(0x4E12DB27); // Sprite Signature
-    oMsg.addU32(0x4E119CBF); // Picture Signature
-
-    oMsg.addU8(0); // First RSA byte must be 0x00 // 1
-
-    // Generete xtea key.
-    m_xteaKey[0] = 432324;
-    m_xteaKey[1] = 24324;
-    m_xteaKey[2] = 423432;
-    m_xteaKey[3] = 234324;
-
-    // Add xtea key
-    oMsg.addU32(m_xteaKey[0]); // 5
-    oMsg.addU32(m_xteaKey[1]); // 9
-    oMsg.addU32(m_xteaKey[2]); // 13
-    oMsg.addU32(m_xteaKey[3]); // 17
-
-    oMsg.addString(m_accountName); // Account Name // 19
-    oMsg.addString(m_accountPassword); // Password // 21
-
-    // Packet data must have since byte 0, start, 128 bytes
-    oMsg.addPaddingBytes(128 - (21 + m_accountName.length() + m_accountPassword.length()));
-
-    // Encrypt msg with RSA
-    if(!Rsa::encrypt((char*)oMsg.getBuffer() + 6 + oMsg.getMessageSize() - 128, 128, OTSERV_PUBLIC_RSA))
-        return;
-
-    send(oMsg);
-
-    m_xteaEncryptionEnabled = true;
-
-    recv();
-}
-
 void ProtocolLogin::onRecv(InputMessage& inputMessage)
 {
     while(!inputMessage.end()) {
@@ -109,19 +53,56 @@ void ProtocolLogin::onRecv(InputMessage& inputMessage)
             break;
         }
     }
+    disconnect();
 }
 
 void ProtocolLogin::onError(const boost::system::error_code& error)
 {
-    // already disconnected, just send onLogout
     callLuaField("onError", error.message());
 }
 
+void ProtocolLogin::sendLoginPacket()
+{
+    OutputMessage oMsg;
+
+    oMsg.addU8(0x01); // Protocol id
+    oMsg.addU16(0x02);  // OS
+    oMsg.addU16(862); // Client version
+
+    oMsg.addU32(0x4E12DAFF); // Data Signature
+    oMsg.addU32(0x4E12DB27); // Sprite Signature
+    oMsg.addU32(0x4E119CBF); // Picture Signature
+
+    oMsg.addU8(0); // First RSA byte must be 0x00 // 1
+
+    // Add xtea key
+    generateXteaKey();
+    oMsg.addU32(m_xteaKey[0]); // 5
+    oMsg.addU32(m_xteaKey[1]); // 9
+    oMsg.addU32(m_xteaKey[2]); // 13
+    oMsg.addU32(m_xteaKey[3]); // 17
+
+    oMsg.addString(m_accountName); // Account Name // 19
+    oMsg.addString(m_accountPassword); // Password // 21
+
+    // Packet data must have since byte 0, start, 128 bytes
+    oMsg.addPaddingBytes(128 - (21 + m_accountName.length() + m_accountPassword.length()));
+
+    // Encrypt msg with RSA
+    if(!Rsa::encrypt((char*)oMsg.getBuffer() + 6 + oMsg.getMessageSize() - 128, 128, OTSERV_PUBLIC_RSA))
+        return;
+
+    send(oMsg);
+
+    enableXteaEncryption();
+
+    recv();
+}
+
 void ProtocolLogin::parseError(InputMessage& inputMessage)
 {
     std::string error = inputMessage.getString();
     callLuaField("onError", error);
-    disconnect();
 }
 
 void ProtocolLogin::parseMOTD(InputMessage& inputMessage)
@@ -146,5 +127,4 @@ void ProtocolLogin::parseCharacterList(InputMessage& inputMessage)
         }
     }
     /*uint16 premiumDays =*/ inputMessage.getU16();
-    disconnect();
 }

src/otclient/net/protocollogin.h

@@ -15,15 +15,13 @@ public:
     static ProtocolLoginPtr create() { return ProtocolLoginPtr(new ProtocolLogin); }
 
     void login(const std::string& accountName, const std::string& accountPassword);
+    void cancelLogin() { disconnect(); }
 
     void onConnect();
     void onRecv(InputMessage& inputMessage);
     void onError(const boost::system::error_code& error);
 
-    void cancel() { /* TODO: this func */ }
-
     ProtocolLoginPtr asProtocolLogin() { return std::static_pointer_cast<ProtocolLogin>(shared_from_this()); }
-    virtual const char* getLuaTypeName() const { return "ProtocolLogin"; }
 
 private:
     void sendLoginPacket();

src/otclient/otclient.cpp

@@ -161,7 +161,6 @@ void OTClient::terminate()
 
     // terminate network
     Connection::terminate();
-    //g_network.terminate();
 
     // terminate dispatcher
     g_dispatcher.terminate();
@@ -195,7 +194,6 @@ void OTClient::poll()
     g_platform.poll();
 
     // poll network events
-    //g_network.poll();
     Connection::poll();
 
     // poll dispatcher events

src/otclient/otclientluafunctions.cpp

@@ -16,7 +16,7 @@ void OTClient::registerLuaFunctions()
     g_lua.registerClass<ProtocolLogin, Protocol>();
     g_lua.bindClassStaticFunction<ProtocolLogin>("create", &ProtocolLogin::create);
     g_lua.bindClassMemberFunction("login", &ProtocolLogin::login);
-    g_lua.bindClassMemberFunction("cancel", &ProtocolLogin::cancel);
+    g_lua.bindClassMemberFunction("cancelLogin", &ProtocolLogin::cancelLogin);
 
     g_lua.registerClass<ProtocolGame, Protocol>();
 }