tiamak/p2pool-salvium
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Import upstream fixes, IPv6 ZMQ support, submodule updates, RandomX prefetch perf tweaks, v2 VM work in progress and bug fixes

Browse Source
This commit is contained in:
Matt Hess
2026-02-19 13:35:59 +00:00
parent 218e04d80d
commit 289bcc2d03
7 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
external/src/RandomX vendored

Submodule external/src/RandomX updated: d341d6a61c...1343007c61

2
external/src/cppzmq vendored

Submodule external/src/cppzmq updated: 57cc98f8fc...041f755b79

2
external/src/grpc vendored

Submodule external/src/grpc updated: b40fe4ffc4...f310102b02

2
external/src/libuv vendored

Submodule external/src/libuv updated: 012b1e9698...4ae2852bbb

2
external/src/libzmq vendored

Submodule external/src/libzmq updated: 1fce1ef005...8d18911edf

2
external/src/miniupnp vendored

Submodule external/src/miniupnp updated: 88a1515ea8...bdbda466ed

13
src/zmq_reader.cpp
View File

@@ -38,6 +38,13 @@ ZMQReader::ZMQReader(const std::string& address, uint32_t zmq_port, const std::s
m_proxy.clear();
}
const bool is_v6 = address.find_first_of(':') != std::string::npos;
if (is_v6) {
m_publisher.set(zmq::sockopt::ipv6, 1);
m_subscriber.set(zmq::sockopt::ipv6, 1);
}
char addr_buf[log::Stream::BUF_SIZE + 1];
addr_buf[0] = '\0';
@@ -49,7 +56,7 @@ ZMQReader::ZMQReader(const std::string& address, uint32_t zmq_port, const std::s
try {
log::Stream s(addr_buf);
s << "tcp://127.0.0.1:" << port << '\0';
s << (is_v6 ? "tcp://[::1]:" : "tcp://127.0.0.1:") << port << '\0';
m_publisher.bind(addr_buf);
m_publisherPort = static_cast<uint16_t>(port);
break;
@@ -65,11 +72,11 @@ ZMQReader::ZMQReader(const std::string& address, uint32_t zmq_port, const std::s
throw zmq::error_t(EFSM);
}
LOGINFO(5, "listening on tcp://127.0.0.1:" << m_publisherPort << " for internal communications");
std::string addr(addr_buf);
LOGINFO(5, "listening on " << addr << " for internal communications");
m_subscriber.set(zmq::sockopt::connect_timeout, 1000);
std::string addr(addr_buf);
if (!connect(addr, false)) {
throw zmq::error_t(EFSM);
}