protocol login working

This commit is contained in:
Henrique Santiago
2012-06-05 18:27:37 -03:00
parent 6b9943447a
commit 3cb5216858
12 changed files with 172 additions and 348 deletions

View File

@@ -91,6 +91,9 @@ void OutputMessage::addPaddingBytes(int bytes, uint8 byte)
void OutputMessage::encryptRSA(int size, const std::string& key)
{
if(m_writePos - size < 0)
throw NetworkException("writePos - size < 0");
RSA::encrypt((char*)m_buffer + m_writePos - size, size, key.c_str());
}

View File

@@ -229,3 +229,14 @@ void Protocol::onConnect()
{
callLuaField("onConnect");
}
void Protocol::onRecv(const InputMessagePtr& inputMessage)
{
callLuaField("onRecv", inputMessage);
}
void Protocol::onError(const boost::system::error_code& err)
{
callLuaField("onError", err.message(), true);
disconnect();
}

View File

@@ -54,8 +54,8 @@ public:
protected:
virtual void onConnect();
virtual void onRecv(const InputMessagePtr& inputMessage) {}
virtual void onError(const boost::system::error_code& err) {}
virtual void onRecv(const InputMessagePtr& inputMessage);
virtual void onError(const boost::system::error_code& err);
uint32 m_xteaKey[4];

View File

@@ -57,7 +57,6 @@ SET(otclient_SOURCES ${otclient_SOURCES}
${CMAKE_CURRENT_LIST_DIR}/ui/uimap.cpp
# otclient net
${CMAKE_CURRENT_LIST_DIR}/net/protocollogin.cpp
${CMAKE_CURRENT_LIST_DIR}/net/protocolgame.cpp
${CMAKE_CURRENT_LIST_DIR}/net/protocolgamesend.cpp
${CMAKE_CURRENT_LIST_DIR}/net/protocolgameparse.cpp

View File

@@ -37,7 +37,6 @@
#include <otclient/core/map.h>
#include <otclient/core/thingstype.h>
#include <otclient/core/spritemanager.h>
#include <otclient/net/protocollogin.h>
#include <otclient/net/protocolgame.h>
#include <otclient/ui/uiitem.h>
#include <otclient/ui/uicreature.h>

View File

@@ -1,106 +0,0 @@
/*
* Copyright (c) 2010-2012 OTClient <https://github.com/edubart/otclient>
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
#include "protocollogin.h"
#include <framework/net/outputmessage.h>
#include <framework/luascript/luainterface.h>
#include <boost/bind.hpp>
#include <otclient/core/thingstype.h>
#include <otclient/core/spritemanager.h>
#include <otclient/core/game.h>
void ProtocolLogin::onRecv(const InputMessagePtr& msg)
{
try {
while(!msg->eof()) {
int opcode = msg->getU8();
// try to parse in lua first
if(callLuaField<bool>("onOpcode", opcode, msg))
continue;
switch(opcode) {
case Proto::LoginServerUpdateNeeded:
callLuaField("onError", "Client needs update.");
break;
default:
stdext::throw_exception(stdext::format("unknown opcode %d", opcode));
break;
}
}
} catch(stdext::exception& e) {
g_logger.error(stdext::format("Network exception in login protocol: %s", e.what()));
}
disconnect();
}
void ProtocolLogin::onError(const boost::system::error_code& error)
{
callLuaField("onError", error.message(), true);
disconnect();
}
void ProtocolLogin::sendLoginPacket()
{
OutputMessagePtr msg(new OutputMessage);
msg->addU8(Proto::ClientEnterAccount);
msg->addU16(Proto::ClientOs);
msg->addU16(Proto::ClientVersion);
msg->addU32(g_thingsType.getSignature()); // data signature
msg->addU32(g_sprites.getSignature()); // sprite signature
msg->addU32(Proto::PicSignature); // pic signature
int paddingBytes = 128;
msg->addU8(0); // first RSA byte must be 0
paddingBytes -= 1;
// xtea key
generateXteaKey();
msg->addU32(m_xteaKey[0]);
msg->addU32(m_xteaKey[1]);
msg->addU32(m_xteaKey[2]);
msg->addU32(m_xteaKey[3]);
paddingBytes -= 16;
if(g_game.getFeature(Otc::GameProtocolChecksum))
enableChecksum();
if(g_game.getFeature(Otc::GameAccountNames)) {
msg->addString(m_accountName);
msg->addString(m_accountPassword);
paddingBytes -= 4 + m_accountName.length() + m_accountPassword.length();
} else {
msg->addU32(stdext::from_string<uint32>(m_accountName));
msg->addString(m_accountPassword);
paddingBytes -= 6 + m_accountPassword.length();
}
msg->addPaddingBytes(paddingBytes); // complete the 128 bytes for rsa encryption with zeros
msg->encryptRSA(128, Proto::RSA);
send(msg);
enableXteaEncryption();
recv();
}

View File

@@ -1,53 +0,0 @@
/*
* Copyright (c) 2010-2012 OTClient <https://github.com/edubart/otclient>
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
#ifndef PROTOCOLLOGIN_H
#define PROTOCOLLOGIN_H
#include "declarations.h"
#include <framework/net/protocol.h>
class ProtocolLogin;
typedef std::shared_ptr<ProtocolLogin> ProtocolLoginPtr;
class ProtocolLogin : public Protocol
{
public:
static ProtocolLoginPtr create() { return ProtocolLoginPtr(new ProtocolLogin); }
void login(const std::string& host, int port, const std::string& accountName, const std::string& accountPassword);
void cancelLogin() { disconnect(); }
void onConnect();
void onRecv(const InputMessagePtr& inputMessage);
void onError(const boost::system::error_code& error);
ProtocolLoginPtr asProtocolLogin() { return std::static_pointer_cast<ProtocolLogin>(shared_from_this()); }
private:
void sendLoginPacket();
std::string m_accountName, m_accountPassword;
};
#endif