Fixed boost asio stuff. Now working but probably some polishing required.

src/net/common/clientcontext.cpp

@@ -44,7 +44,7 @@ ClientContext::ClientContext()
 {
 	bzero(&m_clientSockaddr, sizeof(m_clientSockaddr));
 	m_senderCallback.reset(new ClientSenderCallback());
-	m_senderThread.reset(new SenderThread(*m_senderCallback));
+	m_senderThread.reset(new SenderThread(*m_senderCallback, m_ioService));
 	m_senderThread->Start();
 }
 
@@ -65,7 +65,7 @@ ClientContext::GetSocket() const
 void
 ClientContext::SetSocket(SOCKET sockfd)
 {
-	m_sessionData.reset(new SessionData(sockfd, SESSION_ID_GENERIC, m_senderThread, *m_senderCallback));
+	m_sessionData.reset(new SessionData(sockfd, SESSION_ID_GENERIC, m_senderThread, *m_senderCallback, m_ioService));
 }
 
 boost::shared_ptr<SessionData>

src/net/common/senderthread.cpp

@@ -26,7 +26,6 @@
 #include <cassert>
 
 #include <boost/bind.hpp>
-#include <boost/asio.hpp>
 
 using namespace std;
 using boost::asio::ip::tcp;
@@ -46,8 +45,8 @@ SenderThread::SendDataManager::HandleWrite(const boost::system::error_code& erro
 	SetCompleted(true);
 }
 
-SenderThread::SenderThread(SenderCallback &cb)
-: m_callback(cb)
+SenderThread::SenderThread(SenderCallback &cb, boost::asio::io_service& ioService)
+: m_callback(cb), m_ioService(ioService)
 {
 }
 
@@ -81,7 +80,7 @@ SenderThread::Send(boost::shared_ptr<SessionData> session, boost::shared_ptr<Net
 		boost::mutex::scoped_lock lock(m_sendQueueMapMutex);
 		SendQueueMap::iterator pos = m_sendQueueMap.find(session->GetId());
 		if (pos == m_sendQueueMap.end())
-			pos = m_sendQueueMap.insert(SendQueueMap::value_type(session->GetId(), boost::shared_ptr<SendDataManager>(new SendDataManager(session, m_ioService)))).first;
+			pos = m_sendQueueMap.insert(SendQueueMap::value_type(session->GetId(), boost::shared_ptr<SendDataManager>(new SendDataManager(session)))).first;
 		if (pos->second->list.size() < SEND_QUEUE_SIZE)
 			pos->second->list.push_back(packet);
 	}
@@ -95,7 +94,7 @@ SenderThread::Send(boost::shared_ptr<SessionData> session, const NetPacketList &
 		boost::mutex::scoped_lock lock(m_sendQueueMapMutex);
 		SendQueueMap::iterator pos = m_sendQueueMap.find(session->GetId());
 		if (pos == m_sendQueueMap.end())
-			pos = m_sendQueueMap.insert(SendQueueMap::value_type(session->GetId(), boost::shared_ptr<SendDataManager>(new SendDataManager(session, m_ioService)))).first;
+			pos = m_sendQueueMap.insert(SendQueueMap::value_type(session->GetId(), boost::shared_ptr<SendDataManager>(new SendDataManager(session)))).first;
 		if (pos->second->list.size() + packetList.size() <= SEND_QUEUE_SIZE)
 		{
 			NetPacketList::const_iterator i = packetList.begin();
@@ -130,12 +129,15 @@ SenderThread::Main()
 					if (!tmpManager->IsWriteInProgress())
 					{
 						if (tmpManager->IsCompleted())
+						{
 							tmpManager->list.pop_front();
+							tmpManager->SetCompleted(false);
+						}
 						else
 						{
 							boost::shared_ptr<NetPacket> tmpPacket = tmpManager->list.front();
 							boost::asio::async_write(
-								*tmpManager->socket,
+								*tmpManager->session->GetAsioSocket(),
 								boost::asio::buffer(tmpPacket->GetRawData(),
 									tmpPacket->GetLen()),
 								boost::bind(&SendDataManager::HandleWrite, tmpManager,
@@ -146,9 +148,9 @@ SenderThread::Main()
 				}
 				i = next;
 			}
-			m_ioService.run_one();
-			Msleep(SEND_TIMEOUT_MSEC);
 		}
+		m_ioService.run_one();
+		Msleep(SEND_TIMEOUT_MSEC);
 	}
 }
 

src/net/common/serverlobbythread.cpp

@@ -84,7 +84,7 @@ ServerLobbyThread::ServerLobbyThread(GuiInterface &gui, ConfigFile *playerConfig
   m_statDataChanged(false), m_startTime(boost::posix_time::second_clock::local_time())
 {
 	m_senderCallback.reset(new ServerSenderCallback(*this));
-	m_sender.reset(new SenderThread(*m_senderCallback));
+	m_sender.reset(new SenderThread(*m_senderCallback, m_ioService));
 	m_receiver.reset(new ReceiverHelper);
 }
 
@@ -1055,7 +1055,7 @@ ServerLobbyThread::HandleNewConnection(boost::shared_ptr<ConnectData> connData)
 	//}
 
 	// Create a new session.
-	boost::shared_ptr<SessionData> sessionData(new SessionData(connData->ReleaseSocket(), m_curSessionId++, m_sender, *m_senderCallback));
+	boost::shared_ptr<SessionData> sessionData(new SessionData(connData->ReleaseSocket(), m_curSessionId++, m_sender, *m_senderCallback, m_ioService));
 	m_sessionManager.AddSession(sessionData);
 
 	LOG_VERBOSE("Accepted connection - session #" << sessionData->GetId() << ".");

src/net/common/sessiondata.cpp

@@ -20,16 +20,19 @@
 #include <net/sessiondata.h>
 #include <net/senderinterface.h>
 
-SessionData::SessionData(SOCKET sockfd, SessionId id, boost::shared_ptr<SenderInterface> sender, SessionDataCallback &cb)
-: m_sockfd(sockfd), m_id(id), m_state(SessionData::Init), m_readyFlag(false),
+SessionData::SessionData(SOCKET sockfd, SessionId id, boost::shared_ptr<SenderInterface> sender, SessionDataCallback &cb, boost::asio::io_service &ioService)
+: m_id(id), m_state(SessionData::Init), m_readyFlag(false),
   m_wantsLobbyMsg(true), m_activityTimeoutNoticeSent(false), m_callback(cb)
 {
+	m_socket.reset(new boost::asio::ip::tcp::socket(
+		ioService, boost::asio::ip::tcp::v6(), sockfd));
 	m_sender = sender;
 }
 
 SessionData::~SessionData()
 {
 	m_callback.SignalSessionTerminated(m_id);
+	m_socket->cancel();
 }
 
 SessionId
@@ -54,10 +57,15 @@ SessionData::SetState(SessionData::State state)
 }
 
 SOCKET
-SessionData::GetSocket() const
+SessionData::GetSocket()
 {
-	// value never modified - no mutex needed.
-	return m_sockfd;
+	return m_socket->native();
+}
+
+boost::shared_ptr<boost::asio::ip::tcp::socket>
+SessionData::GetAsioSocket()
+{
+	return m_socket;
 }
 
 void