3pp-mirror/snapcast
1
0
Fork 0
mirror of https://github.com/badaix/snapcast.git synced 2025-05-18 19:46:14 +02:00
Code Issues Projects Releases Packages Wiki Activity

server Settings

Browse source 
git-svn-id: svn://elaine/murooma/trunk@255 d8a302eb-03bc-478d-80e4-98257eca68ef
This commit is contained in:
(no author) 2014-09-12 15:04:17 +00:00
parent f7cf7a2537
commit 979f6460d3
11 changed files with 122 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

9
common/socketConnection.cpp
View file

@ -50,8 +50,10 @@ void SocketConnection::stop()
void SocketConnection::send(BaseMessage* message)
{
std::unique_lock<std::mutex> mlock(mutex_);
//cout << "send: " << message->type << ", size: " << message->getSize() << "\n";
if (!connected())
return;
//cout << "send: " << message->type << ", size: " << message->getSize() << "\n";
boost::asio::streambuf streambuf;
std::ostream stream(&streambuf);
message->serialize(stream);
@ -61,12 +63,13 @@ void SocketConnection::send(BaseMessage* message)
void SocketConnection::getNextMessage()
{
//cout << "getNextMessage\n";
BaseMessage baseMessage;
size_t baseMsgSize = baseMessage.getSize();
vector<char> buffer(baseMsgSize);
socketRead(&buffer[0], baseMsgSize);
baseMessage.deserialize(&buffer[0]);
//cout << "type: " << baseMessage.type << ", size: " << baseMessage.size << "\n";
//cout << "getNextMessage: " << baseMessage.type << ", size: " << baseMessage.size << "\n";
if (baseMessage.size > buffer.size())
buffer.resize(baseMessage.size);
socketRead(&buffer[0], baseMessage.size);
@ -102,7 +105,7 @@ void ClientConnection::worker()
{
{
// std::unique_lock<std::mutex> mlock(mutex_);
cout << "connecting\n";
//cout << "connecting\n";
socket.reset(new tcp::socket(io_service));
struct timeval tv;
tv.tv_sec = 5;
@ -110,7 +113,7 @@ cout << "connecting\n";
setsockopt(socket->native(), SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv));
socket->connect(*iterator);
connected_ = true;
cout << "connected\n";
//cout << "connected\n";
std::clog << kLogNotice << "connected\n";// to " << ip << ":" << port << std::endl;
}
while(active_)