Digitalstack/otclient
2
0
Fork 0
mirror of https://github.com/edubart/otclient.git synced 2025-12-16 13:49:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

merge total remake

Browse Source
This commit is contained in:
Eduardo Bart
2011-08-13 23:09:11 -03:00
parent 0af7856475
commit 55862b07ad
253 changed files with 6777 additions and 8463 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/framework/net/connection.cpp
View File

@@ -1,6 +1,6 @@
#include "connection.h"
#include <core/dispatcher.h>
#include <core/eventdispatcher.h>
static asio::io_service ioService;
@@ -21,7 +21,7 @@ void Connection::connect(const std::string& host, uint16 port, const ConnectCall
{
m_connectCallback = connectCallback;
asio::ip::tcp::resolver::query query(host, convert<std::string>(port));
asio::ip::tcp::resolver::query query(host, aux::unsafe_cast<std::string>(port));
m_resolver.async_resolve(query, std::bind(&Connection::onResolve, shared_from_this(), std::placeholders::_1, std::placeholders::_2));
m_timer.expires_from_now(boost::posix_time::seconds(2));
@@ -56,7 +56,7 @@ void Connection::recv(uint16 bytes, uint32 timeout, const RecvCallback& callback
void Connection::onTimeout(const boost::system::error_code& error)
{
if(error != asio::error::operation_aborted)
g_dispatcher.addTask(std::bind(m_errorCallback, error));
g_dispatcher.addEvent(std::bind(m_errorCallback, error));
}
void Connection::onResolve(const boost::system::error_code& error, asio::ip::tcp::resolver::iterator endpointIterator)
@@ -65,7 +65,7 @@ void Connection::onResolve(const boost::system::error_code& error, asio::ip::tcp
if(error) {
if(m_errorCallback)
g_dispatcher.addTask(std::bind(m_errorCallback, error));
g_dispatcher.addEvent(std::bind(m_errorCallback, error));
return;
}
@@ -81,12 +81,12 @@ void Connection::onConnect(const boost::system::error_code& error)
if(error) {
if(m_errorCallback)
g_dispatcher.addTask(std::bind(m_errorCallback, error));
g_dispatcher.addEvent(std::bind(m_errorCallback, error));
return;
}
if(m_connectCallback)
g_dispatcher.addTask(m_connectCallback);
g_dispatcher.addEvent(m_connectCallback);
}
void Connection::onSend(const boost::system::error_code& error, size_t)
@@ -95,7 +95,7 @@ void Connection::onSend(const boost::system::error_code& error, size_t)
if(error) {
if(m_errorCallback)
g_dispatcher.addTask(std::bind(m_errorCallback, error));
g_dispatcher.addEvent(std::bind(m_errorCallback, error));
return;
}
}
@@ -106,10 +106,10 @@ void Connection::onRecv(const boost::system::error_code& error)
if(error) {
if(m_errorCallback)
g_dispatcher.addTask(std::bind(m_errorCallback, error));
g_dispatcher.addEvent(std::bind(m_errorCallback, error));
return;
}
if(m_recvCallback)
g_dispatcher.addTask(std::bind(m_recvCallback, m_recvBuffer, m_recvSize));
g_dispatcher.addEvent(std::bind(m_recvCallback, m_recvBuffer, m_recvSize));
}

2
src/framework/net/protocol.cpp
View File

@@ -82,7 +82,7 @@ void Protocol::onError(const boost::system::error_code& err)
// displays a dialog, finish protocol
callField("onError", message.str());
callLuaField("onError", message.str());
}
bool Protocol::xteaDecrypt(InputMessage& inputMessage)

4
src/framework/net/protocol.h
View File

@@ -5,7 +5,7 @@
#include "inputmessage.h"
#include "outputmessage.h"
#include <script/luaobject.h>
#include <luascript/luaobject.h>
class Protocol : public LuaObject
{
@@ -24,8 +24,6 @@ public:
ProtocolPtr asProtocol() { return std::static_pointer_cast<Protocol>(shared_from_this()); }
virtual const char* getLuaTypeName() const { return "Protocol"; }
protected:
uint32 m_xteaKey[4];
bool m_checksumEnabled, m_xteaEncryptionEnabled;