socket on the stack

This commit is contained in:
badaix 2019-11-01 17:54:25 +01:00
parent 7884348ae6
commit 505769760e
2 changed files with 19 additions and 37 deletions

View file

@ -76,7 +76,7 @@ public:
virtual ~ClientConnection();
virtual void start();
virtual void stop();
virtual bool send(const msg::BaseMessage* message) const;
virtual bool send(const msg::BaseMessage* message);
/// Send request to the server and wait for answer
virtual std::shared_ptr<msg::SerializedMessage> sendRequest(const msg::BaseMessage* message, const chronos::msec& timeout = chronos::msec(1000));
@ -93,19 +93,13 @@ public:
return msg;
}
std::string getMacAddress() const;
std::string getMacAddress();
virtual bool active() const
{
return active_;
}
virtual bool connected() const
{
return (socket_ != nullptr);
// return (connected_ && socket);
}
protected:
virtual void reader();
@ -114,9 +108,8 @@ protected:
boost::asio::io_context io_context_;
mutable std::mutex socketMutex_;
std::shared_ptr<tcp::socket> socket_;
tcp::socket socket_;
std::atomic<bool> active_;
std::atomic<bool> connected_;
MessageReceiver* messageReceiver_;
mutable std::mutex pendingRequestsMutex_;
std::set<std::shared_ptr<PendingRequest>> pendingRequests_;