From 22083d7d6224cdbc5cfbf95e07bbd192e2aedf2b Mon Sep 17 00:00:00 2001 From: Conrad Parker Date: Thu, 13 Sep 2018 10:36:26 +0800 Subject: [PATCH 1/2] Problem: UDP does not support ZMQ_MULTICAST_HOPS Solution: add support for ZMQ_MULTICAST_HOPS (IP_MULTICAST_TTL) --- src/udp_engine.cpp | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/udp_engine.cpp b/src/udp_engine.cpp index 905de541..0d5453f7 100644 --- a/src/udp_engine.cpp +++ b/src/udp_engine.cpp @@ -149,6 +149,21 @@ void zmq::udp_engine_t::plug (io_thread_t *io_thread_, session_base_t *session_) errno_assert (rc == 0); #endif + int hops = _options.multicast_hops; + + if (hops > 0) { + rc = setsockopt (_fd, level, IP_MULTICAST_TTL, + reinterpret_cast (&hops), + sizeof (hops)); + } else { + rc = 0; + } + +#ifdef ZMQ_HAVE_WINDOWS + wsa_assert (rc != SOCKET_ERROR); +#else + errno_assert (rc == 0); +#endif if (out->family () == AF_INET6) { int bind_if = udp_addr->bind_if (); From 4ce402687abb89f8704b065c7fc4fd51448654f9 Mon Sep 17 00:00:00 2001 From: Conrad Parker Date: Tue, 30 Oct 2018 05:54:50 +0000 Subject: [PATCH 2/2] Problem: no relicense agreement by kfish Solution: add relicense agreement --- RELICENSE/kfish.md | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 RELICENSE/kfish.md diff --git a/RELICENSE/kfish.md b/RELICENSE/kfish.md new file mode 100644 index 00000000..832cb969 --- /dev/null +++ b/RELICENSE/kfish.md @@ -0,0 +1,17 @@ +# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL + +This is a statement by Conrad Parker that grants permission to +relicense its copyrights in the libzmq C++ library (ZeroMQ) under the +Mozilla Public License v2 (MPLv2) or any other Open Source Initiative +approved license chosen by the current ZeroMQ BDFL (Benevolent +Dictator for Life). + +A portion of the commits made by the Github handle "kfish", with +commit author "Conrad Parker ", are +copyright of Conrad Parker. This document hereby grants the libzmq +project team to relicense libzmq, including all past, present and +future contributions of the author listed above. + +Conrad Parker +2018/10/30 +