clang

Co-authored-by: Denis Angell <dangell@transia.co>

src/ripple/app/main/Application.cpp

@@ -1527,7 +1527,7 @@ ApplicationImp::setup(boost::program_options::variables_map const& cmdline)
         reportingETL_->start();
 
     // Datagram monitor if applicable
-    if (!config_->standalone() && !config_->DATAGRAM_MONITOR.empty())
+    if (!config_->standalone() && config_->DATAGRAM_MONITOR != "")
     {
         datagram_monitor_ = std::make_unique<DatagramMonitor>(*this);
         if (datagram_monitor_)

src/ripple/app/misc/DatagramMonitor.h

@@ -996,24 +996,15 @@ private:
     void
     monitorThread()
     {
-        std::vector<std::pair<EndpointInfo, int>> endpoints;
-
-        for (auto const& epStr : app_.config().DATAGRAM_MONITOR)
-        {
-            auto endpoint = parseEndpoint(epStr);
-            endpoints.push_back(
-                std::make_pair(endpoint, createSocket(endpoint)));
-        }
+        auto endpoint = parseEndpoint(app_.config().DATAGRAM_MONITOR);
+        int sock = createSocket(endpoint);
 
         while (running_)
         {
             try
             {
                 auto info = generateServerInfo();
-                for (auto const& ep : endpoints)
-                {
-                    sendPacket(ep.second, ep.first, info);
-                }
+                sendPacket(sock, endpoint, info);
                 std::this_thread::sleep_for(std::chrono::seconds(1));
             }
             catch (const std::exception& e)
@@ -1024,10 +1015,7 @@ private:
             }
         }
 
-        for (auto const& ep : endpoints)
-        {
-            close(ep.second);
-        }
+        close(sock);
     }
 
 public:

src/ripple/core/Config.h

@@ -155,7 +155,7 @@ public:
     std::map<std::string, PublicKey>
         IMPORT_VL_KEYS;  // hex string -> class PublicKey (for caching purposes)
 
-    std::vector<std::string> DATAGRAM_MONITOR;
+    std::string DATAGRAM_MONITOR;
 
     enum StartUpType {
         FRESH,

src/ripple/core/impl/Config.cpp

@@ -510,10 +510,11 @@ Config::loadFromString(std::string const& fileContents)
             NETWORK_ID = beast::lexicalCastThrow<uint32_t>(strTemp);
     }
 
-    if (auto s = getIniFileSection(secConfig, SECTION_DATAGRAM_MONITOR))
+    if (getSingleSection(secConfig, SECTION_DATAGRAM_MONITOR, strTemp, j_))
     {
-        DATAGRAM_MONITOR = *s;
-        replaceColons(DATAGRAM_MONITOR);
+        std::vector<std::string> vecTemp{strTemp};
+        replaceColons(vecTemp);
+        DATAGRAM_MONITOR = vecTemp[0];
     }
 
     if (getSingleSection(secConfig, SECTION_PEER_PRIVATE, strTemp, j_))