mirror of
https://github.com/badaix/snapcast.git
synced 2025-05-13 09:06:43 +02:00
streamClient
git-svn-id: svn://elaine/murooma/trunk@254 d8a302eb-03bc-478d-80e4-98257eca68ef
This commit is contained in:
parent
25f7f3060d
commit
f7cf7a2537
5 changed files with 66 additions and 11 deletions
|
@ -10,7 +10,7 @@
|
|||
using namespace std;
|
||||
|
||||
|
||||
SocketConnection::SocketConnection(MessageReceiver* _receiver) : active_(false), messageReceiver(_receiver)
|
||||
SocketConnection::SocketConnection(MessageReceiver* _receiver) : active_(false), connected_(false), messageReceiver(_receiver)
|
||||
{
|
||||
}
|
||||
|
||||
|
@ -50,6 +50,8 @@ void SocketConnection::stop()
|
|||
void SocketConnection::send(BaseMessage* message)
|
||||
{
|
||||
std::unique_lock<std::mutex> mlock(mutex_);
|
||||
if (!connected())
|
||||
return;
|
||||
boost::asio::streambuf streambuf;
|
||||
std::ostream stream(&streambuf);
|
||||
message->serialize(stream);
|
||||
|
@ -78,10 +80,15 @@ void SocketConnection::getNextMessage()
|
|||
|
||||
ClientConnection::ClientConnection(MessageReceiver* _receiver, const std::string& _ip, size_t _port) : SocketConnection(_receiver), ip(_ip), port(_port)
|
||||
{
|
||||
// endpt.address(boost::asio::ip::address::from_string(ip));
|
||||
// endpt.port((port));
|
||||
// std::cout << "Endpoint IP: " << endpt.address().to_string() << std::endl;
|
||||
// std::cout << "Endpoint Port: " << endpt.port() << std::endl;
|
||||
}
|
||||
|
||||
|
||||
void ClientConnection::start()
|
||||
{
|
||||
tcp::resolver resolver(io_service);
|
||||
tcp::resolver::query query(tcp::v4(), ip, boost::lexical_cast<string>(port));
|
||||
iterator = resolver.resolve(query);
|
||||
SocketConnection::start();
|
||||
}
|
||||
|
||||
|
||||
|
@ -90,20 +97,20 @@ void ClientConnection::worker()
|
|||
active_ = true;
|
||||
while (active_)
|
||||
{
|
||||
connected_ = false;
|
||||
try
|
||||
{
|
||||
{
|
||||
// std::unique_lock<std::mutex> mlock(mutex_);
|
||||
tcp::resolver resolver(io_service);
|
||||
tcp::resolver::query query(tcp::v4(), ip, boost::lexical_cast<string>(port));
|
||||
iterator = resolver.resolve(query);
|
||||
|
||||
cout << "connecting\n";
|
||||
socket.reset(new tcp::socket(io_service));
|
||||
struct timeval tv;
|
||||
tv.tv_sec = 5;
|
||||
tv.tv_usec = 0;
|
||||
setsockopt(socket->native(), SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv));
|
||||
socket->connect(*iterator);
|
||||
connected_ = true;
|
||||
cout << "connected\n";
|
||||
std::clog << kLogNotice << "connected\n";// to " << ip << ":" << port << std::endl;
|
||||
}
|
||||
while(active_)
|
||||
|
@ -113,6 +120,7 @@ void ClientConnection::worker()
|
|||
}
|
||||
catch (const std::exception& e)
|
||||
{
|
||||
connected_ = false;
|
||||
cout << kLogNotice << "Exception: " << e.what() << ", trying to reconnect" << std::endl;
|
||||
usleep(500*1000);
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue