|
|
@ -27,16 +27,17 @@
|
|
|
|
#include <boost/asio.hpp>
|
|
|
|
#include <boost/asio.hpp>
|
|
|
|
|
|
|
|
|
|
|
|
asio::io_service g_ioService;
|
|
|
|
asio::io_service g_ioService;
|
|
|
|
|
|
|
|
std::list<std::shared_ptr<asio::streambuf>> Connection::m_outputStreams;
|
|
|
|
|
|
|
|
|
|
|
|
Connection::Connection() :
|
|
|
|
Connection::Connection() :
|
|
|
|
m_readTimer(g_ioService),
|
|
|
|
m_readTimer(g_ioService),
|
|
|
|
m_writeTimer(g_ioService),
|
|
|
|
m_writeTimer(g_ioService),
|
|
|
|
|
|
|
|
m_delayedWriteTimer(g_ioService),
|
|
|
|
m_resolver(g_ioService),
|
|
|
|
m_resolver(g_ioService),
|
|
|
|
m_socket(g_ioService)
|
|
|
|
m_socket(g_ioService)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
m_connected = false;
|
|
|
|
m_connected = false;
|
|
|
|
m_connecting = false;
|
|
|
|
m_connecting = false;
|
|
|
|
m_sendBufferSize = 0;
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
Connection::~Connection()
|
|
|
|
Connection::~Connection()
|
|
|
@ -56,34 +57,7 @@ void Connection::poll()
|
|
|
|
void Connection::terminate()
|
|
|
|
void Connection::terminate()
|
|
|
|
{
|
|
|
|
{
|
|
|
|
g_ioService.stop();
|
|
|
|
g_ioService.stop();
|
|
|
|
}
|
|
|
|
m_outputStreams.clear();
|
|
|
|
|
|
|
|
|
|
|
|
void Connection::connect(const std::string& host, uint16 port, const std::function<void()>& connectCallback)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
m_connected = false;
|
|
|
|
|
|
|
|
m_connecting = true;
|
|
|
|
|
|
|
|
m_error.clear();
|
|
|
|
|
|
|
|
m_connectCallback = connectCallback;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
asio::ip::tcp::resolver::query query(host, stdext::unsafe_cast<std::string>(port));
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
auto self = asConnection();
|
|
|
|
|
|
|
|
m_resolver.async_resolve(query, [=](const boost::system::error_code& error, asio::ip::tcp::resolver::iterator endpointIterator) {
|
|
|
|
|
|
|
|
if(self.is_unique())
|
|
|
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
m_readTimer.cancel();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if(!error) {
|
|
|
|
|
|
|
|
m_socket.async_connect(*endpointIterator, std::bind(&Connection::onConnect, asConnection(), std::placeholders::_1));
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
m_readTimer.expires_from_now(boost::posix_time::seconds(READ_TIMEOUT));
|
|
|
|
|
|
|
|
m_readTimer.async_wait(std::bind(&Connection::onTimeout, asConnection(), std::placeholders::_1));
|
|
|
|
|
|
|
|
} else
|
|
|
|
|
|
|
|
handleError(error);
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
m_readTimer.expires_from_now(boost::posix_time::seconds(READ_TIMEOUT));
|
|
|
|
|
|
|
|
m_readTimer.async_wait(std::bind(&Connection::onTimeout, asConnection(), std::placeholders::_1));
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void Connection::close()
|
|
|
|
void Connection::close()
|
|
|
@ -92,8 +66,8 @@ void Connection::close()
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
|
|
// flush send data before disconnecting on clean connections
|
|
|
|
// flush send data before disconnecting on clean connections
|
|
|
|
if(m_connected && !m_error && m_sendBufferSize > 0 && m_sendEvent)
|
|
|
|
if(m_connected && !m_error && m_outputStream)
|
|
|
|
m_sendEvent->execute();
|
|
|
|
internal_write();
|
|
|
|
|
|
|
|
|
|
|
|
m_connecting = false;
|
|
|
|
m_connecting = false;
|
|
|
|
m_connected = false;
|
|
|
|
m_connected = false;
|
|
|
@ -104,6 +78,7 @@ void Connection::close()
|
|
|
|
m_resolver.cancel();
|
|
|
|
m_resolver.cancel();
|
|
|
|
m_readTimer.cancel();
|
|
|
|
m_readTimer.cancel();
|
|
|
|
m_writeTimer.cancel();
|
|
|
|
m_writeTimer.cancel();
|
|
|
|
|
|
|
|
m_delayedWriteTimer.cancel();
|
|
|
|
|
|
|
|
|
|
|
|
if(m_socket.is_open()) {
|
|
|
|
if(m_socket.is_open()) {
|
|
|
|
boost::system::error_code ec;
|
|
|
|
boost::system::error_code ec;
|
|
|
@ -112,95 +87,138 @@ void Connection::close()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void Connection::write(uint8* buffer, uint16 size)
|
|
|
|
void Connection::connect(const std::string& host, uint16 port, const std::function<void()>& connectCallback)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
m_connected = false;
|
|
|
|
|
|
|
|
m_connecting = true;
|
|
|
|
|
|
|
|
m_error.clear();
|
|
|
|
|
|
|
|
m_connectCallback = connectCallback;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
asio::ip::tcp::resolver::query query(host, stdext::unsafe_cast<std::string>(port));
|
|
|
|
|
|
|
|
m_resolver.async_resolve(query, std::bind(&Connection::onResolve, asConnection(), std::placeholders::_1, std::placeholders::_2));
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
m_readTimer.cancel();
|
|
|
|
|
|
|
|
m_readTimer.expires_from_now(boost::posix_time::seconds(READ_TIMEOUT));
|
|
|
|
|
|
|
|
m_readTimer.async_wait(std::bind(&Connection::onTimeout, asConnection(), std::placeholders::_1));
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void Connection::internal_connect(asio::ip::basic_resolver<asio::ip::tcp>::iterator endpointIterator)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
m_socket.async_connect(*endpointIterator, std::bind(&Connection::onConnect, asConnection(), std::placeholders::_1));
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
m_readTimer.cancel();
|
|
|
|
|
|
|
|
m_readTimer.expires_from_now(boost::posix_time::seconds(READ_TIMEOUT));
|
|
|
|
|
|
|
|
m_readTimer.async_wait(std::bind(&Connection::onTimeout, asConnection(), std::placeholders::_1));
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void Connection::write(uint8* buffer, size_t size)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if(!m_connected)
|
|
|
|
if(!m_connected)
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
|
|
// send old buffer if we can't add more data
|
|
|
|
|
|
|
|
if(m_sendBufferSize + size >= SEND_BUFFER_SIZE && m_sendEvent)
|
|
|
|
|
|
|
|
m_sendEvent->execute();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// we can't send the data right away, otherwise we could create tcp congestion
|
|
|
|
// we can't send the data right away, otherwise we could create tcp congestion
|
|
|
|
memcpy(m_sendBuffer + m_sendBufferSize, buffer, size);
|
|
|
|
if(!m_outputStream) {
|
|
|
|
m_sendBufferSize += size;
|
|
|
|
if(!m_outputStreams.empty()) {
|
|
|
|
|
|
|
|
m_outputStream = m_outputStreams.front();
|
|
|
|
|
|
|
|
m_outputStreams.pop_front();
|
|
|
|
|
|
|
|
} else
|
|
|
|
|
|
|
|
m_outputStream = std::shared_ptr<asio::streambuf>(new asio::streambuf);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
m_delayedWriteTimer.cancel();
|
|
|
|
|
|
|
|
m_delayedWriteTimer.expires_from_now(boost::posix_time::milliseconds(1));
|
|
|
|
|
|
|
|
m_delayedWriteTimer.async_wait(std::bind(&Connection::onCanWrite, asConnection(), std::placeholders::_1));
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if(!m_sendEvent || m_sendEvent->isExecuted() || m_sendEvent->isCanceled()) {
|
|
|
|
std::ostream os(m_outputStream.get());
|
|
|
|
auto self = asConnection();
|
|
|
|
os.write((const char*)buffer, size);
|
|
|
|
|
|
|
|
os.flush();
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// wait 1 ms to do the real send
|
|
|
|
void Connection::internal_write()
|
|
|
|
m_sendEvent = g_dispatcher.scheduleEvent([=] {
|
|
|
|
{
|
|
|
|
if(self.is_unique())
|
|
|
|
if(!m_connected)
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
//m_writeTimer.cancel();
|
|
|
|
|
|
|
|
|
|
|
|
std::shared_ptr<asio::streambuf> outputStream = m_outputStream;
|
|
|
|
|
|
|
|
m_outputStream = nullptr;
|
|
|
|
|
|
|
|
|
|
|
|
asio::async_write(m_socket,
|
|
|
|
asio::async_write(m_socket,
|
|
|
|
asio::buffer(m_sendBuffer, m_sendBufferSize),
|
|
|
|
*outputStream,
|
|
|
|
std::bind(&Connection::onWrite, asConnection(), std::placeholders::_1, std::placeholders::_2));
|
|
|
|
std::bind(&Connection::onWrite, asConnection(), std::placeholders::_1, std::placeholders::_2, outputStream));
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
m_writeTimer.cancel();
|
|
|
|
m_writeTimer.expires_from_now(boost::posix_time::seconds(WRITE_TIMEOUT));
|
|
|
|
m_writeTimer.expires_from_now(boost::posix_time::seconds(WRITE_TIMEOUT));
|
|
|
|
m_writeTimer.async_wait(std::bind(&Connection::onTimeout, asConnection(), std::placeholders::_1));
|
|
|
|
m_writeTimer.async_wait(std::bind(&Connection::onTimeout, asConnection(), std::placeholders::_1));
|
|
|
|
|
|
|
|
|
|
|
|
m_sendBufferSize = 0;
|
|
|
|
|
|
|
|
}, SEND_INTERVAL);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void Connection::read(uint16 bytes, const RecvCallback& callback)
|
|
|
|
void Connection::read(uint16 bytes, const RecvCallback& callback)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
m_readTimer.cancel();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if(!m_connected)
|
|
|
|
if(!m_connected)
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
|
|
m_recvCallback = callback;
|
|
|
|
m_recvCallback = callback;
|
|
|
|
|
|
|
|
|
|
|
|
asio::async_read(m_socket,
|
|
|
|
asio::async_read(m_socket,
|
|
|
|
asio::buffer(m_streamBuffer.prepare(bytes)),
|
|
|
|
asio::buffer(m_inputStream.prepare(bytes)),
|
|
|
|
std::bind(&Connection::onRecv, asConnection(), std::placeholders::_1, bytes));
|
|
|
|
std::bind(&Connection::onRecv, asConnection(), std::placeholders::_1, std::placeholders::_2));
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
m_readTimer.cancel();
|
|
|
|
m_readTimer.expires_from_now(boost::posix_time::seconds(READ_TIMEOUT));
|
|
|
|
m_readTimer.expires_from_now(boost::posix_time::seconds(READ_TIMEOUT));
|
|
|
|
m_readTimer.async_wait(std::bind(&Connection::onTimeout, asConnection(), std::placeholders::_1));
|
|
|
|
m_readTimer.async_wait(std::bind(&Connection::onTimeout, asConnection(), std::placeholders::_1));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void Connection::read_until(const std::string& what, const RecvCallback& callback)
|
|
|
|
void Connection::read_until(const std::string& what, const RecvCallback& callback)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
m_readTimer.cancel();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if(!m_connected)
|
|
|
|
if(!m_connected)
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
|
|
m_recvCallback = callback;
|
|
|
|
m_recvCallback = callback;
|
|
|
|
|
|
|
|
|
|
|
|
asio::async_read_until(m_socket,
|
|
|
|
asio::async_read_until(m_socket,
|
|
|
|
m_streamBuffer,
|
|
|
|
m_inputStream,
|
|
|
|
what.c_str(),
|
|
|
|
what.c_str(),
|
|
|
|
std::bind(&Connection::onRecv, asConnection(), std::placeholders::_1, std::placeholders::_2));
|
|
|
|
std::bind(&Connection::onRecv, asConnection(), std::placeholders::_1, std::placeholders::_2));
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
m_readTimer.cancel();
|
|
|
|
m_readTimer.expires_from_now(boost::posix_time::seconds(READ_TIMEOUT));
|
|
|
|
m_readTimer.expires_from_now(boost::posix_time::seconds(READ_TIMEOUT));
|
|
|
|
m_readTimer.async_wait(std::bind(&Connection::onTimeout, asConnection(), std::placeholders::_1));
|
|
|
|
m_readTimer.async_wait(std::bind(&Connection::onTimeout, asConnection(), std::placeholders::_1));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void Connection::read_some(const RecvCallback& callback)
|
|
|
|
void Connection::read_some(const RecvCallback& callback)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
m_readTimer.cancel();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if(!m_connected)
|
|
|
|
if(!m_connected)
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
|
|
m_recvCallback = callback;
|
|
|
|
m_recvCallback = callback;
|
|
|
|
|
|
|
|
|
|
|
|
m_socket.async_read_some(asio::buffer(m_streamBuffer.prepare(RECV_BUFFER_SIZE)),
|
|
|
|
m_socket.async_read_some(asio::buffer(m_inputStream.prepare(RECV_BUFFER_SIZE)),
|
|
|
|
std::bind(&Connection::onRecv, asConnection(), std::placeholders::_1, std::placeholders::_2));
|
|
|
|
std::bind(&Connection::onRecv, asConnection(), std::placeholders::_1, std::placeholders::_2));
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
m_readTimer.cancel();
|
|
|
|
m_readTimer.expires_from_now(boost::posix_time::seconds(READ_TIMEOUT));
|
|
|
|
m_readTimer.expires_from_now(boost::posix_time::seconds(READ_TIMEOUT));
|
|
|
|
m_readTimer.async_wait(std::bind(&Connection::onTimeout, asConnection(), std::placeholders::_1));
|
|
|
|
m_readTimer.async_wait(std::bind(&Connection::onTimeout, asConnection(), std::placeholders::_1));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void Connection::onResolve(const boost::system::error_code& error, asio::ip::basic_resolver<asio::ip::tcp>::iterator endpointIterator)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
m_readTimer.cancel();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if(error == asio::error::operation_aborted)
|
|
|
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if(!error)
|
|
|
|
|
|
|
|
internal_connect(endpointIterator);
|
|
|
|
|
|
|
|
else
|
|
|
|
|
|
|
|
handleError(error);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void Connection::onConnect(const boost::system::error_code& error)
|
|
|
|
void Connection::onConnect(const boost::system::error_code& error)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
m_readTimer.cancel();
|
|
|
|
m_readTimer.cancel();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if(error == asio::error::operation_aborted)
|
|
|
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
|
|
if(!error) {
|
|
|
|
if(!error) {
|
|
|
|
m_connected = true;
|
|
|
|
m_connected = true;
|
|
|
|
|
|
|
|
|
|
|
@ -216,14 +234,29 @@ void Connection::onConnect(const boost::system::error_code& error)
|
|
|
|
m_connecting = false;
|
|
|
|
m_connecting = false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void Connection::onWrite(const boost::system::error_code& error, size_t)
|
|
|
|
void Connection::onCanWrite(const boost::system::error_code& error)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
m_delayedWriteTimer.cancel();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if(error == asio::error::operation_aborted)
|
|
|
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if(m_connected)
|
|
|
|
|
|
|
|
internal_write();
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void Connection::onWrite(const boost::system::error_code& error, size_t writeSize, std::shared_ptr<asio::streambuf> outputStream)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
m_writeTimer.cancel();
|
|
|
|
m_writeTimer.cancel();
|
|
|
|
|
|
|
|
|
|
|
|
if(!m_connected)
|
|
|
|
if(error == asio::error::operation_aborted)
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
|
|
if(error)
|
|
|
|
// free output stream and store for using it again later
|
|
|
|
|
|
|
|
outputStream->consume(outputStream->size());
|
|
|
|
|
|
|
|
m_outputStreams.push_back(outputStream);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if(m_connected && error)
|
|
|
|
handleError(error);
|
|
|
|
handleError(error);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
@ -231,37 +264,42 @@ void Connection::onRecv(const boost::system::error_code& error, size_t recvSize)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
m_readTimer.cancel();
|
|
|
|
m_readTimer.cancel();
|
|
|
|
|
|
|
|
|
|
|
|
if(!m_connected)
|
|
|
|
if(error == asio::error::operation_aborted)
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if(m_connected) {
|
|
|
|
if(!error) {
|
|
|
|
if(!error) {
|
|
|
|
if(m_recvCallback) {
|
|
|
|
if(m_recvCallback) {
|
|
|
|
const char* header = boost::asio::buffer_cast<const char*>(m_streamBuffer.data());
|
|
|
|
const char* header = boost::asio::buffer_cast<const char*>(m_inputStream.data());
|
|
|
|
m_recvCallback((uint8*)header, recvSize);
|
|
|
|
m_recvCallback((uint8*)header, recvSize);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} else
|
|
|
|
else
|
|
|
|
|
|
|
|
handleError(error);
|
|
|
|
handleError(error);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
m_streamBuffer.consume(recvSize);
|
|
|
|
if(!error)
|
|
|
|
|
|
|
|
m_inputStream.consume(recvSize);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void Connection::onTimeout(const boost::system::error_code& error)
|
|
|
|
void Connection::onTimeout(const boost::system::error_code& error)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if(error != asio::error::operation_aborted)
|
|
|
|
if(error == asio::error::operation_aborted)
|
|
|
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
|
|
handleError(asio::error::timed_out);
|
|
|
|
handleError(asio::error::timed_out);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void Connection::handleError(const boost::system::error_code& error)
|
|
|
|
void Connection::handleError(const boost::system::error_code& error)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if(error != asio::error::operation_aborted) {
|
|
|
|
if(error == asio::error::operation_aborted)
|
|
|
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
|
|
m_error = error;
|
|
|
|
m_error = error;
|
|
|
|
if(m_errorCallback)
|
|
|
|
if(m_errorCallback)
|
|
|
|
m_errorCallback(error);
|
|
|
|
m_errorCallback(error);
|
|
|
|
if(m_connected || m_connecting)
|
|
|
|
if(m_connected || m_connecting)
|
|
|
|
close();
|
|
|
|
close();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
int Connection::getIp()
|
|
|
|
int Connection::getIp()
|
|
|
|
{
|
|
|
|
{
|
|
|
|