From 20eb7b94bd6e709ad0537fa5dfb49957b03d58cc Mon Sep 17 00:00:00 2001 From: lotodore Date: Mon, 16 Sep 2013 23:11:16 +0200 Subject: [PATCH] Fixing several compiler warnings. --- src/net/common/asiosendbuffer.cpp | 2 +- src/net/common/serveracceptwebhelper.cpp | 4 ++-- src/net/common/sessiondata.cpp | 10 ++++++++-- src/net/common/webreceivebuffer.cpp | 2 +- src/net/common/websendbuffer.cpp | 11 +++++++---- src/net/sessiondata.h | 1 + src/net/websendbuffer.h | 5 +---- 7 files changed, 21 insertions(+), 14 deletions(-) diff --git a/src/net/common/asiosendbuffer.cpp b/src/net/common/asiosendbuffer.cpp index 9dad639c..6e379926 100644 --- a/src/net/common/asiosendbuffer.cpp +++ b/src/net/common/asiosendbuffer.cpp @@ -99,7 +99,7 @@ AsioSendBuffer::AsyncSendNextPacket(boost::shared_ptr session, boost::shared_ptr packet) +AsioSendBuffer::InternalStorePacket(boost::shared_ptr /*session*/, boost::shared_ptr packet) { uint32_t packetSize = packet->GetMsg()->ByteSize(); google::protobuf::uint8 *buf = new google::protobuf::uint8[packetSize + NET_HEADER_SIZE]; diff --git a/src/net/common/serveracceptwebhelper.cpp b/src/net/common/serveracceptwebhelper.cpp index aac05908..f5149ad2 100644 --- a/src/net/common/serveracceptwebhelper.cpp +++ b/src/net/common/serveracceptwebhelper.cpp @@ -37,7 +37,7 @@ using namespace std; ServerAcceptWebHelper::ServerAcceptWebHelper(ServerCallback &serverCallback, boost::shared_ptr ioService) - : m_serverCallback(serverCallback), m_ioService(ioService) + : m_ioService(ioService), m_serverCallback(serverCallback) { m_webSocketServer.reset(new server); } @@ -71,7 +71,7 @@ ServerAcceptWebHelper::Close() } bool -ServerAcceptWebHelper::validate(websocketpp::connection_hdl hdl) +ServerAcceptWebHelper::validate(websocketpp::connection_hdl /*hdl*/) { return true; } diff --git a/src/net/common/sessiondata.cpp b/src/net/common/sessiondata.cpp index 63e0a1ed..372300bb 100644 --- a/src/net/common/sessiondata.cpp +++ b/src/net/common/sessiondata.cpp @@ -50,13 +50,13 @@ SessionData::SessionData(boost::shared_ptr sock, S m_sendBuffer.reset(new AsioSendBuffer); } -SessionData::SessionData(boost::shared_ptr webData, SessionId id, SessionDataCallback &cb, boost::asio::io_service &ioService, int filler) +SessionData::SessionData(boost::shared_ptr webData, SessionId id, SessionDataCallback &cb, boost::asio::io_service &ioService, int /*filler*/) : m_webData(webData), m_id(id), m_state(SessionData::Init), m_readyFlag(false), m_wantsLobbyMsg(true), m_activityTimeoutSec(0), m_activityWarningRemainingSec(0), m_initTimeoutTimer(ioService), m_globalTimeoutTimer(ioService), m_activityTimeoutTimer(ioService), m_callback(cb), m_authSession(NULL), m_curAuthStep(0) { m_receiveBuffer.reset(new WebReceiveBuffer); - m_sendBuffer.reset(new WebSendBuffer(webData)); + m_sendBuffer.reset(new WebSendBuffer); } SessionData::~SessionData() @@ -107,6 +107,12 @@ SessionData::GetAsioSocket() return m_socket; } +boost::shared_ptr +SessionData::GetWebData() +{ + return m_webData; +} + bool SessionData::CreateServerAuthSession(Gsasl *context) { diff --git a/src/net/common/webreceivebuffer.cpp b/src/net/common/webreceivebuffer.cpp index e2b0fc0a..05c7d820 100644 --- a/src/net/common/webreceivebuffer.cpp +++ b/src/net/common/webreceivebuffer.cpp @@ -41,7 +41,7 @@ WebReceiveBuffer::WebReceiveBuffer() } void -WebReceiveBuffer::StartAsyncRead(boost::shared_ptr session) +WebReceiveBuffer::StartAsyncRead(boost::shared_ptr /*session*/) { // Nothing to do. This is handled internally by websocketpp. } diff --git a/src/net/common/websendbuffer.cpp b/src/net/common/websendbuffer.cpp index daba16d3..2ba665a5 100644 --- a/src/net/common/websendbuffer.cpp +++ b/src/net/common/websendbuffer.cpp @@ -32,12 +32,13 @@ #include #include #include +#include using namespace std; -WebSendBuffer::WebSendBuffer(boost::shared_ptr webData) - : closeAfterSend(false), m_webData(webData) +WebSendBuffer::WebSendBuffer() + : closeAfterSend(false) { } @@ -57,7 +58,8 @@ WebSendBuffer::AsyncSendNextPacket(boost::shared_ptr session) { if (closeAfterSend) { boost::system::error_code ec; - m_webData->webSocketServer->close(m_webData->webHandle, websocketpp::close::status::normal, "PokerTH server closed the connection.", ec); + boost::shared_ptr webData = session->GetWebData(); + webData->webSocketServer->close(webData->webHandle, websocketpp::close::status::normal, "PokerTH server closed the connection.", ec); } } @@ -69,7 +71,8 @@ WebSendBuffer::InternalStorePacket(boost::shared_ptr session, boost packet->GetMsg()->SerializeWithCachedSizesToArray(buf); boost::system::error_code ec; - m_webData->webSocketServer->send(m_webData->webHandle, string((const char *)buf, packetSize), websocketpp::frame::opcode::BINARY, ec); + boost::shared_ptr webData = session->GetWebData(); + webData->webSocketServer->send(webData->webHandle, string((const char *)buf, packetSize), websocketpp::frame::opcode::BINARY, ec); if (ec) { SetCloseAfterSend(); } diff --git a/src/net/sessiondata.h b/src/net/sessiondata.h index e74eefa1..48d94d9b 100644 --- a/src/net/sessiondata.h +++ b/src/net/sessiondata.h @@ -74,6 +74,7 @@ public: void SetState(State state); boost::shared_ptr GetAsioSocket(); + boost::shared_ptr GetWebData(); bool CreateServerAuthSession(Gsasl *context); bool CreateClientAuthSession(Gsasl *context, const std::string &userName, const std::string &password); diff --git a/src/net/websendbuffer.h b/src/net/websendbuffer.h index e3005d50..632be600 100644 --- a/src/net/websendbuffer.h +++ b/src/net/websendbuffer.h @@ -36,12 +36,10 @@ #include #include -struct WebSocketData; - class WebSendBuffer : public SendBuffer { public: - WebSendBuffer(boost::shared_ptr webData); + WebSendBuffer(); virtual void SetCloseAfterSend(); @@ -52,7 +50,6 @@ public: private: bool closeAfterSend; - boost::shared_ptr m_webData; }; #endif