ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-11-29 06:55:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

allow multiple datagram monitor endpoints

Browse Source
This commit is contained in:
Richard Holland
2024-12-14 08:53:58 +11:00
parent 532a471a35
commit ae34bbb080
4 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ripple/app/main/Application.cpp
View File

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

21
src/ripple/app/misc/DatagramMonitor.h
View File

@@ -996,15 +996,25 @@ private:
void void
monitorThread() monitorThread()
{ {
auto endpoint = parseEndpoint(app_.config().DATAGRAM_MONITOR);
int sock = createSocket(endpoint); 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)));
}
while (running_) while (running_)
{ {
try try
{ {
auto info = generateServerInfo(); auto info = generateServerInfo();
sendPacket(sock, endpoint, info); for (auto const& ep : endpoints)
{
sendPacket(ep.second, ep.first, info);
}
std::this_thread::sleep_for(std::chrono::seconds(1)); std::this_thread::sleep_for(std::chrono::seconds(1));
} }
catch (const std::exception& e) catch (const std::exception& e)
@@ -1015,7 +1025,10 @@ private:
} }
} }
close(sock); for (auto const& ep : endpoints)
{
close(ep.second);
}
} }
public: public:

2
src/ripple/core/Config.h
View File

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

7
src/ripple/core/impl/Config.cpp
View File

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