From 29003700db7f3995d1d7207ba1e608ade959553b Mon Sep 17 00:00:00 2001
From: Mingrui Zhang <mingrui.zhang@savoirfairelinux.com>
Date: Wed, 15 May 2019 15:42:32 -0400
Subject: [PATCH] peerdiscovery: fix the issue where bind() can be interrupted
after calling publish() first
---
src/peer_discovery.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/peer_discovery.cpp b/src/peer_discovery.cpp
index 172a281c..78d054cd 100644
--- a/src/peer_discovery.cpp
+++ b/src/peer_discovery.cpp
@@ -144,6 +144,8 @@ PeerDiscovery::DomainPeerDiscovery::DomainPeerDiscovery(sa_family_t domain, in_p
: domain_(domain), port_(port), sockfd_(initialize_socket(domain))
{
socketJoinMulticast(sockfd_, domain);
+ listener_setup();
+ sender_setup();
}
PeerDiscovery::DomainPeerDiscovery::~DomainPeerDiscovery()
@@ -262,7 +264,6 @@ PeerDiscovery::DomainPeerDiscovery::startDiscovery(const std::string &type, Serv
if (running_listen_.joinable())
running_listen_.join();
drunning_ = true;
- listener_setup();
running_listen_ = std::thread(&DomainPeerDiscovery::listenerpack_thread, this);
}
}
@@ -383,7 +384,6 @@ PeerDiscovery::DomainPeerDiscovery::startPublish(const std::string &type, const
if (running_send_.joinable())
running_send_.join();
lrunning_ = true;
- sender_setup();
running_send_ = std::thread([this](){
std::unique_lock<std::mutex> lck(mtx_);
while (lrunning_) {
--
GitLab