git-svn-id: svn://elaine/murooma/trunk@245 d8a302eb-03bc-478d-80e4-98257eca68ef
This commit is contained in:
(no author) 2014-09-09 20:57:59 +00:00
parent 98ad7db30a
commit a04d96e9d2

View file

@ -53,11 +53,13 @@ void ServerConnection::getNextMessage(tcp::socket* socket)
{
BaseMessage baseMessage;
size_t baseMsgSize = baseMessage.getSize();
cout << "1" << baseMsgSize << "\n";
vector<char> buffer(baseMsgSize);
cout << "2\n";
socketRead(socket, &buffer[0], baseMsgSize);
cout << "3\n";
baseMessage.deserialize(&buffer[0]);
//cout << "type: " << baseMessage.type << ", size: " << baseMessage.size << "\n";
cout << "type: " << baseMessage.type << ", size: " << baseMessage.size << "\n";
if (baseMessage.size > buffer.size())
buffer.resize(baseMessage.size);
socketRead(socket, &buffer[0], baseMessage.size);
@ -80,7 +82,7 @@ void ServerConnection::worker()
tv.tv_sec = 5;
tv.tv_usec = 0;
setsockopt(s.native(), SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv));
// std::clog << kLogNotice << "connected to " << ip << ":" << port << std::endl;
std::clog << kLogNotice << "connected\n";// to " << ip << ":" << port << std::endl;
while(active_)
{