Rewriting network receive functions. This is still work in progress to make it more efficient.
This commit is contained in:
@@ -0,0 +1,126 @@
|
||||
/***************************************************************************
|
||||
* Copyright (C) 2011 by Lothar May *
|
||||
* *
|
||||
* This program is free software; you can redistribute it and/or modify *
|
||||
* it under the terms of the GNU General Public License as published by *
|
||||
* the Free Software Foundation; either version 2 of the License, or *
|
||||
* (at your option) any later version. *
|
||||
* *
|
||||
* This program is distributed in the hope that it will be useful, *
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
|
||||
* GNU General Public License for more details. *
|
||||
* *
|
||||
* You should have received a copy of the GNU General Public License *
|
||||
* along with this program; if not, write to the *
|
||||
* Free Software Foundation, Inc., *
|
||||
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
|
||||
***************************************************************************/
|
||||
|
||||
#include <boost/asio.hpp>
|
||||
#include <boost/bind.hpp>
|
||||
|
||||
#include <net/receivebuffer.h>
|
||||
#include <net/sessiondata.h>
|
||||
#include <core/loghelper.h>
|
||||
#include <core/pokerthexception.h>
|
||||
#include <boost/swap.hpp>
|
||||
|
||||
using namespace std;
|
||||
using boost::asio::ip::tcp;
|
||||
|
||||
|
||||
ReceiveBuffer::ReceiveBuffer()
|
||||
: recvBufUsed(0)
|
||||
{
|
||||
recvBuf[0] = 0;
|
||||
}
|
||||
|
||||
void
|
||||
ReceiveBuffer::StartAsyncRead(boost::shared_ptr<SessionData> session)
|
||||
{
|
||||
session->GetAsioSocket()->async_read_some(
|
||||
boost::asio::buffer(recvBuf + recvBufUsed, RECV_BUF_SIZE - recvBufUsed),
|
||||
boost::bind(
|
||||
&ReceiveBuffer::HandleRead,
|
||||
shared_from_this(),
|
||||
session,
|
||||
boost::asio::placeholders::error,
|
||||
boost::asio::placeholders::bytes_transferred));
|
||||
}
|
||||
|
||||
void
|
||||
ReceiveBuffer::HandleRead(boost::shared_ptr<SessionData> session, const boost::system::error_code &error, size_t bytesRead)
|
||||
{
|
||||
if (error != boost::asio::error::operation_aborted) {
|
||||
try {
|
||||
if (!error) {
|
||||
recvBufUsed += bytesRead;
|
||||
ScanPackets();
|
||||
ProcessPackets(session);
|
||||
StartAsyncRead(session);
|
||||
} else if (error == boost::asio::error::interrupted || error == boost::asio::error::try_again) {
|
||||
LOG_ERROR("Session " << session->GetId() << " - recv interrupted: " << error);
|
||||
StartAsyncRead(session);
|
||||
} else {
|
||||
LOG_ERROR("Session " << session->GetId() << " - Connection closed: " << error);
|
||||
// On error: Close this session.
|
||||
session->Close();
|
||||
}
|
||||
} catch (const exception &e) {
|
||||
LOG_ERROR("Session " << session->GetId() << " - unhandled exception in HandleRead: " << e.what());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
ReceiveBuffer::ScanPackets()
|
||||
{
|
||||
bool dataAvailable = true;
|
||||
do {
|
||||
boost::shared_ptr<NetPacket> tmpPacket;
|
||||
// This is necessary, because we use TCP.
|
||||
// Packets may be received in multiple chunks or
|
||||
// several packets may be received at once.
|
||||
if (recvBufUsed) {
|
||||
try {
|
||||
// This call will also handle the memmove stuff, i.e.
|
||||
// buffering for partial packets.
|
||||
tmpPacket = NetPacket::Create(recvBuf, recvBufUsed);
|
||||
} catch (const exception &e) {
|
||||
// Reset buffer on error.
|
||||
recvBufUsed = 0;
|
||||
LOG_ERROR(e.what());
|
||||
}
|
||||
}
|
||||
if (tmpPacket) {
|
||||
//cerr << "IN:" << endl << tmpPacket->ToString() << endl;
|
||||
if (asn_check_constraints(&asn_DEF_PokerTHMessage, tmpPacket->GetMsg(), NULL, NULL) == 0)
|
||||
receivedPackets.push_back(tmpPacket);
|
||||
else
|
||||
LOG_ERROR("Invalid packet: " << endl << tmpPacket->ToString());
|
||||
} else
|
||||
dataAvailable = false;
|
||||
} while(dataAvailable);
|
||||
}
|
||||
|
||||
void
|
||||
ReceiveBuffer::ProcessPackets(boost::shared_ptr<SessionData> session)
|
||||
{
|
||||
while (!receivedPackets.empty()) {
|
||||
boost::shared_ptr<NetPacket> p = receivedPackets.front();
|
||||
receivedPackets.pop_front();
|
||||
// We need to catch specific exceptions, so that they do not affect the server.
|
||||
try {
|
||||
session->HandlePacket(p);
|
||||
} catch (const PokerTHException &e) {
|
||||
LOG_ERROR("Session " << session->GetId() << " - Read handler exception: " << e.what());
|
||||
// TODO add error handling, close session.
|
||||
}
|
||||
}
|
||||
if (recvBufUsed >= RECV_BUF_SIZE) {
|
||||
LOG_ERROR("Session " << session->GetId() << " - Receive buf full: " << recvBufUsed);
|
||||
recvBufUsed = 0;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user