diff options
| author | Matthew Zipkin <pinheadmz@gmail.com> | 2024-03-13 11:41:04 -0400 |
|---|---|---|
| committer | Matthew Zipkin <pinheadmz@gmail.com> | 2024-04-16 14:14:37 -0400 |
| commit | c87b0a0ff4cb6d83bb59360ac4453f6daa871177 (patch) | |
| tree | 909956aa4982671640188f15685d4923533bcc06 /src/zmq | |
| parent | 312f54278fd972ba3557c6a5b805fd244a063959 (diff) | |
zmq: accept unix domain socket address for notifier
Diffstat (limited to 'src/zmq')
| -rw-r--r-- | src/zmq/zmqnotificationinterface.cpp | 8 | ||||
| -rw-r--r-- | src/zmq/zmqutil.h | 3 |
2 files changed, 10 insertions, 1 deletions
diff --git a/src/zmq/zmqnotificationinterface.cpp b/src/zmq/zmqnotificationinterface.cpp index d10db046f5..536e471053 100644 --- a/src/zmq/zmqnotificationinterface.cpp +++ b/src/zmq/zmqnotificationinterface.cpp @@ -8,6 +8,7 @@ #include <kernel/chain.h> #include <kernel/mempool_entry.h> #include <logging.h> +#include <netbase.h> #include <primitives/block.h> #include <primitives/transaction.h> #include <validationinterface.h> @@ -57,7 +58,12 @@ std::unique_ptr<CZMQNotificationInterface> CZMQNotificationInterface::Create(std { std::string arg("-zmq" + entry.first); const auto& factory = entry.second; - for (const std::string& address : gArgs.GetArgs(arg)) { + for (std::string& address : gArgs.GetArgs(arg)) { + // libzmq uses prefix "ipc://" for UNIX domain sockets + if (address.substr(0, ADDR_PREFIX_UNIX.length()) == ADDR_PREFIX_UNIX) { + address.replace(0, ADDR_PREFIX_UNIX.length(), ADDR_PREFIX_IPC); + } + std::unique_ptr<CZMQAbstractNotifier> notifier = factory(); notifier->SetType(entry.first); notifier->SetAddress(address); diff --git a/src/zmq/zmqutil.h b/src/zmq/zmqutil.h index 334b51aa91..bec48c0a56 100644 --- a/src/zmq/zmqutil.h +++ b/src/zmq/zmqutil.h @@ -9,4 +9,7 @@ void zmqError(const std::string& str); +/** Prefix for unix domain socket addresses (which are local filesystem paths) */ +const std::string ADDR_PREFIX_IPC = "ipc://"; // used by libzmq, example "ipc:///root/path/to/file" + #endif // BITCOIN_ZMQ_ZMQUTIL_H |