oxen-io
/
oxen-mq
mirror of https://github.com/oxen-io/oxen-mq.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Disable IPv6 by default 

libzmq's IPv6 support is buggy when also using DNS hostname: in
particular, if you try to connect to a DNS name that has an IPv6
address, then zmq will *only* try an IPv6 connection, even if the local
client has no IPv6 connectivity, and even if the remote is only
listening on its IPv4 address.

This is much too unreliable to enable by default.
This commit is contained in:
Jason Rhinelander 2021-12-02 18:58:57 -04:00
parent 3b634329ac
commit fe8a1f4306
No known key found for this signature in database
GPG Key ID: C4992CE7A88D4262
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -17,7 +17,7 @@ cmake_minimum_required(VERSION 3.7)
set(CMAKE_OSX_DEPLOYMENT_TARGET 10.12 CACHE STRING "macOS deployment target (Apple clang only)")
project(liboxenmq
VERSION 1.2.9
VERSION 1.2.10
LANGUAGES CXX C)
include(GNUInstallDirs)

4
oxenmq/connections.cpp
View File

@ -40,7 +40,9 @@ void OxenMQ::setup_external_socket(zmq::socket_t& socket) {
socket.set(zmq::sockopt::reconnect_ivl_max, (int) RECONNECT_INTERVAL_MAX.count());
socket.set(zmq::sockopt::handshake_ivl, (int) HANDSHAKE_TIME.count());
socket.set(zmq::sockopt::maxmsgsize, MAX_MSG_SIZE);
socket.set(zmq::sockopt::ipv6, 1);
if (IPV6)
socket.set(zmq::sockopt::ipv6, 1);
if (CONN_HEARTBEAT > 0s) {
socket.set(zmq::sockopt::heartbeat_ivl, (int) CONN_HEARTBEAT.count());
if (CONN_HEARTBEAT_TIMEOUT > 0s)

9
oxenmq/oxenmq.h
View File

@ -296,6 +296,15 @@ public:
*/
int SOCKET_UID = -1;
/** If true then enable IPv6 connectivity on incoming/outgoing sockets. This is disabled by
* default because enabling it in libzmq breaks IPv4-only clients trying to connect to
* dual-stack IPv6+IPv4 hosts by hostname (the client will *only* try IPv6 if it finds an IPv6
* address, even if it has no IPv6 connectivity).
*
* This only has an effect for sockets created *after* it is changed.
*/
bool IPV6 = false;
/// A special TaggedThreadID value that always refers to the proxy thread; the main use of this is
/// to direct very simple batch completion jobs to be executed directly in the proxy thread.
inline static constexpr TaggedThreadID run_in_proxy{-1};