Don't add separate mutex for relayAddrs.

Signed-off-by: Michael Beardsworth <[email protected]>

include/gz/transport/Discovery.hh

@@ -64,7 +64,6 @@
 #include <map>
 #include <memory>
 #include <mutex>
-#include <shared_mutex>
 #include <string>
 #include <thread>
 #include <vector>
@@ -745,7 +744,7 @@ namespace gz
       /// \param[in] _ip New IP address.
       public: void AddRelayAddress(const std::string &_ip)
       {
-        std::lock_guard<std::shared_mutex> lock(this->relayAddrsMutex);
+        std::lock_guard<std::mutex> lock(this->mutex);
         // Sanity check: Make sure that this IP address is not already saved.
         for (auto const &addr : this->relayAddrs)
         {
@@ -768,7 +767,7 @@ namespace gz
       {
         std::vector<std::string> result;
 
-        std::shared_lock<std::shared_mutex> lock(this->relayAddrsMutex);
+        std::lock_guard<std::mutex> lock(this->mutex);
 
         for (auto const &addr : this->relayAddrs) {
           result.push_back(inet_ntoa(addr.sin_addr));
@@ -1291,7 +1290,7 @@ namespace gz
         if (_msg.SerializeToArray(buffer + sizeof(msgSize), msgSize))
         {
           // Send the discovery message to the unicast relays.
-          std::shared_lock<std::shared_mutex> lock(this->relayAddrsMutex);
+          std::lock_guard<std::mutex> lock(this->mutex);
 
           for (const auto &sockAddr : this->relayAddrs)
           {
@@ -1554,9 +1553,6 @@ namespace gz
       /// \brief Collection of socket addresses used as remote relays.
       private: std::vector<sockaddr_in> relayAddrs;
 
-      /// \brief Mutex to guarantee exclusive write access to relayAddrs.
-      private: mutable std::shared_mutex relayAddrsMutex;
-
       /// \brief Mutex to guarantee exclusive access between the threads.
       private: mutable std::mutex mutex;