update version to 3.2.0

.github/workflows/ccpp.yml

@@ -10,7 +10,6 @@ jobs:
     - uses: actions/checkout@v3
     - name: Dependencies
       run: |
-        sudo apt update && \
         sudo apt install libncurses5-dev libreadline-dev nettle-dev libasio-dev \
         libgnutls28-dev libuv1-dev python3-pip python3-dev python3-setuptools libcppunit-dev libjsoncpp-dev \
         autotools-dev autoconf libfmt-dev libmsgpack-dev libargon2-0-dev
@@ -53,7 +52,6 @@ jobs:
     - uses: actions/checkout@v3
     - name: Dependencies
       run: |
-        sudo apt update && \
         sudo apt install ninja-build libncurses5-dev libreadline-dev nettle-dev libasio-dev \
         libgnutls28-dev libuv1-dev python3-dev python3-setuptools python3-pip \
         libcppunit-dev libjsoncpp-dev libfmt-dev libmsgpack-dev libargon2-0-dev
@@ -71,7 +69,6 @@ jobs:
     - uses: actions/checkout@v3
     - name: Dependencies
       run: |
-        sudo apt update && \
         sudo apt install libncurses5-dev libreadline-dev nettle-dev libfmt-dev \
         libgnutls28-dev libcppunit-dev libmsgpack-dev libargon2-0-dev
     - name: Configure

.github/workflows/clang-analyzer.yml

@@ -9,7 +9,6 @@ jobs:
       - uses: actions/checkout@v3
       - name: deps
         run: |
-          sudo apt update && \
           sudo apt install libncurses5-dev libreadline-dev nettle-dev \
           libgnutls28-dev libuv1-dev python3-dev python3-setuptools libcppunit-dev libjsoncpp-dev \
           autotools-dev autoconf libfmt-dev libmsgpack-dev libargon2-0-dev libasio-dev \

README.md

@@ -98,7 +98,6 @@ for r in results:
 - Nettle 2.4+, a GnuTLS dependency for crypto.
 - {fmt} 9.0+, for log formatting.
 - (optional) restinio used for the REST API.
-- (optional) llhttp used for the REST API.
 - (optional) jsoncpp 1.7.4-3+, used for the REST API.
 - Build tested with GCC 7+ (GNU/Linux, Windows with MinGW), Clang/LLVM (GNU/Linux, Android, macOS, iOS).
 - Build tested with Microsoft Visual Studio 2019, 2022

include/opendht/callbacks.h

@@ -143,9 +143,6 @@ struct OPENDHT_PUBLIC Config {
      *   - Larger listen refresh time
      */
     bool public_stable {false};
-
-    /* Client mode, node will not be used by other nodes to store data. */
-    bool client_mode {false};
 };
 
 /**

include/opendht/network_engine.h

@@ -52,7 +52,6 @@ struct NetworkConfig {
     NetId network {0};
     ssize_t max_req_per_sec {0};
     ssize_t max_peer_req_per_sec {0};
-    bool is_client {false};
 };
 
 class DhtProtocolException : public DhtException {

src/compat/getif_workaround_android.h

@@ -1,39 +0,0 @@
-//Code from getifaddrs.3 man
-#include <arpa/inet.h>
-#include <sys/socket.h>
-#include <ifaddrs.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <net/if.h>
-#include <asio.hpp>
-#include <stdexcept>
-namespace dht{
-namespace workaround{
-
-asio::ip::address_v4
-get_interface(){
-    struct ifaddrs *ifaddr;
-    if(getifaddrs(&ifaddr) == -1){
-        throw std::runtime_error("Can't getifaddrs");
-    }
-    for (struct ifaddrs *if1 = ifaddr; if1 != NULL; if1 = if1->ifa_next){
-        if (if1->ifa_addr == NULL)
-            continue;
-        if (if1->ifa_addr->sa_family != AF_INET)
-            continue;
-        if((if1->ifa_flags & IFF_MULTICAST) == IFF_MULTICAST){
-            char* sa_data = if1->ifa_addr->sa_data;
-            uint32_t value = sa_data[2] << 24
-                | sa_data[3] << 16
-                | sa_data[4] << 8
-                | sa_data[5];
-            freeifaddrs(ifaddr);
-            return asio::ip::address_v4(value);
-        }
-    }
-    freeifaddrs(ifaddr);
-    throw std::runtime_error("Can't find a interface which supports multicast");
-}
-
-} /* namespace workaround */
-} /* namespace dht */

src/dht.cpp

@@ -1812,7 +1812,6 @@ fromDhtConfig(const Config& config)
     netConf.max_peer_req_per_sec = config.max_peer_req_per_sec
         ? config.max_peer_req_per_sec
         : netConf.max_req_per_sec/8;
-    netConf.is_client = config.client_mode;
     return netConf;
 }
 

src/network_engine.cpp

@@ -143,7 +143,7 @@ NetworkEngine::tellListenerRefreshed(const Sp<Node>& n, Tid socket_id, const Inf
     msgpack::sbuffer buffer;
     msgpack::packer<msgpack::sbuffer> pk(&buffer);
 
-    pk.pack_map(4 + (version >= 1 ? 1 : 0) + (config.network?1:0)+(config.is_client?1:0));
+    pk.pack_map(4 + (version >= 1 ? 1 : 0) + (config.network?1:0));
 
     pk.pack(version >= 1 ? KEY_A : KEY_U);
         pk.pack_map(1 + (version >= 1 ? 1 : 0) + (not values.empty()?1:0) + (not token.empty()?1:0));
@@ -166,9 +166,6 @@ NetworkEngine::tellListenerRefreshed(const Sp<Node>& n, Tid socket_id, const Inf
     if (config.network) {
         pk.pack(KEY_NETID); pk.pack(config.network);
     }
-    if (config.is_client) {
-        pk.pack(KEY_ISCLIENT); pk.pack(config.is_client);
-    }
 
     if (version >= 1) {
         Tid tid (n->getNewTid());
@@ -197,7 +194,7 @@ NetworkEngine::tellListenerExpired(const Sp<Node>& n, Tid socket_id, const InfoH
     msgpack::sbuffer buffer;
     msgpack::packer<msgpack::sbuffer> pk(&buffer);
 
-    pk.pack_map(4 + (version >= 1 ? 1 : 0) + (config.network?1:0)+(config.is_client?1:0));
+    pk.pack_map(4 + (version >= 1 ? 1 : 0) + (config.network?1:0));
 
     pk.pack(version >= 1 ? KEY_A : KEY_U);
         pk.pack_map(1 + (version >= 1 ? 1 : 0) + (not values.empty()?1:0) + (not token.empty()?1:0));
@@ -220,9 +217,6 @@ NetworkEngine::tellListenerExpired(const Sp<Node>& n, Tid socket_id, const InfoH
     if (config.network) {
         pk.pack(KEY_NETID); pk.pack(config.network);
     }
-    if (config.is_client) {
-        pk.pack(KEY_ISCLIENT); pk.pack(config.is_client);
-    }
 
     if (version >= 1) {
         Tid tid (n->getNewTid());
@@ -710,7 +704,7 @@ NetworkEngine::sendPing(const Sp<Node>& node, RequestCb&& on_done, RequestExpire
     Tid tid (node->getNewTid());
     msgpack::sbuffer buffer;
     msgpack::packer<msgpack::sbuffer> pk(&buffer);
-    pk.pack_map(5+(config.network?1:0)+(config.is_client?1:0));
+    pk.pack_map(5+(config.network?1:0));
 
     pk.pack(KEY_A); pk.pack_map(1);
      pk.pack(KEY_REQ_ID); pk.pack(myid);
@@ -722,9 +716,6 @@ NetworkEngine::sendPing(const Sp<Node>& node, RequestCb&& on_done, RequestExpire
     if (config.network) {
         pk.pack(KEY_NETID); pk.pack(config.network);
     }
-    if (config.is_client) {
-        pk.pack(KEY_ISCLIENT); pk.pack(config.is_client);
-    }
 
     auto req = std::make_shared<Request>(MessageType::Ping, tid, node,
         Blob(buffer.data(), buffer.data() + buffer.size()),
@@ -750,7 +741,7 @@ void
 NetworkEngine::sendPong(const SockAddr& addr, Tid tid) {
     msgpack::sbuffer buffer;
     msgpack::packer<msgpack::sbuffer> pk(&buffer);
-    pk.pack_map(4+(config.network?1:0)+(config.is_client?1:0));
+    pk.pack_map(4+(config.network?1:0));
 
     pk.pack(KEY_R); pk.pack_map(2);
       pk.pack(KEY_REQ_ID); pk.pack(myid);
@@ -762,9 +753,6 @@ NetworkEngine::sendPong(const SockAddr& addr, Tid tid) {
     if (config.network) {
         pk.pack(KEY_NETID); pk.pack(config.network);
     }
-    if (config.is_client) {
-        pk.pack(KEY_ISCLIENT); pk.pack(config.is_client);
-    }
 
     send(addr, buffer.data(), buffer.size());
 }
@@ -775,7 +763,7 @@ NetworkEngine::sendFindNode(const Sp<Node>& n, const InfoHash& target, want_t wa
     Tid tid (n->getNewTid());
     msgpack::sbuffer buffer;
     msgpack::packer<msgpack::sbuffer> pk(&buffer);
-    pk.pack_map(5+(config.network?1:0)+(config.is_client?1:0));
+    pk.pack_map(5+(config.network?1:0));
 
     pk.pack(KEY_A); pk.pack_map(2 + (want>0?1:0));
       pk.pack(KEY_REQ_ID);     pk.pack(myid);
@@ -794,9 +782,6 @@ NetworkEngine::sendFindNode(const Sp<Node>& n, const InfoHash& target, want_t wa
     if (config.network) {
         pk.pack(KEY_NETID); pk.pack(config.network);
     }
-    if (config.is_client) {
-        pk.pack(KEY_ISCLIENT); pk.pack(config.is_client);
-    }
 
     auto req = std::make_shared<Request>(MessageType::FindNode, tid, n,
         Blob(buffer.data(), buffer.data() + buffer.size()),
@@ -823,7 +808,7 @@ NetworkEngine::sendGetValues(const Sp<Node>& n, const InfoHash& info_hash, const
     Tid tid (n->getNewTid());
     msgpack::sbuffer buffer;
     msgpack::packer<msgpack::sbuffer> pk(&buffer);
-    pk.pack_map(5+(config.network?1:0)+(config.is_client?1:0));
+    pk.pack_map(5+(config.network?1:0));
 
     unsigned sendQuery = (not query.where.empty() or not query.select.empty()) ? 1 : 0;
     unsigned sendWant = (want > 0) ? 1 : 0;
@@ -850,10 +835,7 @@ NetworkEngine::sendGetValues(const Sp<Node>& n, const InfoHash& info_hash, const
     if (config.network) {
         pk.pack(KEY_NETID); pk.pack(config.network);
     }
-    if (config.is_client) {
-        pk.pack(KEY_ISCLIENT); pk.pack(config.is_client);
-    }
-    
+
     auto req = std::make_shared<Request>(MessageType::GetValues, tid, n,
         Blob(buffer.data(), buffer.data() + buffer.size()),
         [=](const Request& req_status, ParsedMessage&& msg) { /* on done */
@@ -970,13 +952,10 @@ NetworkEngine::sendValueParts(Tid tid, const std::vector<Blob>& svals, const Soc
             end = std::min(start + MTU, v.size());
             buffer.clear();
             msgpack::packer<msgpack::sbuffer> pk(&buffer);
-            pk.pack_map(3+(config.network?1:0)+(config.is_client?1:0));
+            pk.pack_map(3+(config.network?1:0));
             if (config.network) {
                 pk.pack(KEY_NETID); pk.pack(config.network);
             }
-            if (config.is_client) {
-                pk.pack(KEY_ISCLIENT); pk.pack(config.is_client);
-            }
             pk.pack(KEY_Y); pk.pack(KEY_V);
             pk.pack(KEY_TID); pk.pack(tid);
             pk.pack(KEY_V); pk.pack_map(1);
@@ -997,7 +976,7 @@ NetworkEngine::sendNodesValues(const SockAddr& addr, Tid tid, const Blob& nodes,
 {
     msgpack::sbuffer buffer;
     msgpack::packer<msgpack::sbuffer> pk(&buffer);
-    pk.pack_map(4+(config.network?1:0)+(config.is_client?1:0));
+    pk.pack_map(4+(config.network?1:0));
 
     pk.pack(KEY_R);
     pk.pack_map(2 + (not st.empty()?1:0) + (nodes.size()>0?1:0) + (nodes6.size()>0?1:0) + (not token.empty()?1:0));
@@ -1039,9 +1018,6 @@ NetworkEngine::sendNodesValues(const SockAddr& addr, Tid tid, const Blob& nodes,
     if (config.network) {
         pk.pack(KEY_NETID); pk.pack(config.network);
     }
-    if (config.is_client) {
-        pk.pack(KEY_ISCLIENT); pk.pack(config.is_client);
-    }
 
     // send response
     send(addr, buffer.data(), buffer.size());
@@ -1113,7 +1089,7 @@ NetworkEngine::sendListen(const Sp<Node>& n,
     Tid tid (n->getNewTid());
     msgpack::sbuffer buffer;
     msgpack::packer<msgpack::sbuffer> pk(&buffer);
-    pk.pack_map(5+(config.network?1:0)+(config.is_client?1:0));
+    pk.pack_map(5+(config.network?1:0));
 
     auto has_query = not query.where.empty() or not query.select.empty();
     pk.pack(KEY_A); pk.pack_map(5 + has_query);
@@ -1133,9 +1109,6 @@ NetworkEngine::sendListen(const Sp<Node>& n,
     if (config.network) {
         pk.pack(KEY_NETID); pk.pack(config.network);
     }
-    if (config.is_client) {
-        pk.pack(KEY_ISCLIENT); pk.pack(config.is_client);
-    }
 
     auto req = std::make_shared<Request>(MessageType::Listen, tid, n,
         Blob(buffer.data(), buffer.data() + buffer.size()),
@@ -1157,7 +1130,7 @@ void
 NetworkEngine::sendListenConfirmation(const SockAddr& addr, Tid tid) {
     msgpack::sbuffer buffer;
     msgpack::packer<msgpack::sbuffer> pk(&buffer);
-    pk.pack_map(4+(config.network?1:0)+(config.is_client?1:0));
+    pk.pack_map(4+(config.network?1:0));
 
     pk.pack(KEY_R); pk.pack_map(2);
       pk.pack(KEY_REQ_ID); pk.pack(myid);
@@ -1169,9 +1142,6 @@ NetworkEngine::sendListenConfirmation(const SockAddr& addr, Tid tid) {
     if (config.network) {
         pk.pack(KEY_NETID); pk.pack(config.network);
     }
-    if (config.is_client) {
-        pk.pack(KEY_ISCLIENT); pk.pack(config.is_client);
-    }
 
     send(addr, buffer.data(), buffer.size());
 }
@@ -1188,7 +1158,7 @@ NetworkEngine::sendAnnounceValue(const Sp<Node>& n,
     Tid tid (n->getNewTid());
     msgpack::sbuffer buffer;
     msgpack::packer<msgpack::sbuffer> pk(&buffer);
-    pk.pack_map(5+(config.network?1:0)+(config.is_client?1:0));
+    pk.pack_map(5+(config.network?1:0));
 
     bool add_created = created < scheduler.time();
     pk.pack(KEY_A); pk.pack_map(add_created ? 5 : 4);
@@ -1208,9 +1178,6 @@ NetworkEngine::sendAnnounceValue(const Sp<Node>& n,
     if (config.network) {
         pk.pack(KEY_NETID); pk.pack(config.network);
     }
-    if (config.is_client) {
-        pk.pack(KEY_ISCLIENT); pk.pack(config.is_client);
-    }
 
     auto req = std::make_shared<Request>(MessageType::AnnounceValue, tid, n,
         Blob(buffer.data(), buffer.data() + buffer.size()),
@@ -1277,7 +1244,7 @@ NetworkEngine::sendUpdateValues(const Sp<Node>& n,
 
     msgpack::sbuffer buffer;
     msgpack::packer<msgpack::sbuffer> pk(&buffer);
-    pk.pack_map(5+(config.network?1:0)+(config.is_client?1:0));
+    pk.pack_map(5+(config.network?1:0));
 
     pk.pack(KEY_A); pk.pack_map((created < scheduler.time() ? 7 : 6));
       pk.pack(KEY_REQ_ID);     pk.pack(myid);
@@ -1298,9 +1265,6 @@ NetworkEngine::sendUpdateValues(const Sp<Node>& n,
     if (config.network) {
         pk.pack(KEY_NETID); pk.pack(config.network);
     }
-    if (config.is_client) {
-        pk.pack(KEY_ISCLIENT); pk.pack(config.is_client);
-    }
 
     auto req = std::make_shared<Request>(MessageType::UpdateValue, tid, n,
         Blob(buffer.data(), buffer.data() + buffer.size()),
@@ -1325,7 +1289,7 @@ NetworkEngine::sendRefreshValue(const Sp<Node>& n,
     Tid tid (n->getNewTid());
     msgpack::sbuffer buffer;
     msgpack::packer<msgpack::sbuffer> pk(&buffer);
-    pk.pack_map(5+(config.network?1:0)+(config.is_client?1:0));
+    pk.pack_map(5+(config.network?1:0));
 
     pk.pack(KEY_A); pk.pack_map(4);
       pk.pack(KEY_REQ_ID);       pk.pack(myid);
@@ -1340,9 +1304,6 @@ NetworkEngine::sendRefreshValue(const Sp<Node>& n,
     if (config.network) {
         pk.pack(KEY_NETID); pk.pack(config.network);
     }
-    if (config.is_client) {
-        pk.pack(KEY_ISCLIENT); pk.pack(config.is_client);
-    }
 
     auto req = std::make_shared<Request>(MessageType::Refresh, tid, n,
         Blob(buffer.data(), buffer.data() + buffer.size()),
@@ -1374,7 +1335,7 @@ void
 NetworkEngine::sendValueAnnounced(const SockAddr& addr, Tid tid, Value::Id vid) {
     msgpack::sbuffer buffer;
     msgpack::packer<msgpack::sbuffer> pk(&buffer);
-    pk.pack_map(4+(config.network?1:0)+(config.is_client?1:0));
+    pk.pack_map(4+(config.network?1:0));
 
     pk.pack(KEY_R); pk.pack_map(3);
       pk.pack(KEY_REQ_ID);  pk.pack(myid);
@@ -1387,9 +1348,6 @@ NetworkEngine::sendValueAnnounced(const SockAddr& addr, Tid tid, Value::Id vid)
     if (config.network) {
         pk.pack(KEY_NETID); pk.pack(config.network);
     }
-    if (config.is_client) {
-        pk.pack(KEY_ISCLIENT); pk.pack(config.is_client);
-    }
 
     send(addr, buffer.data(), buffer.size());
 }
@@ -1403,7 +1361,7 @@ NetworkEngine::sendError(const SockAddr& addr,
 {
     msgpack::sbuffer buffer;
     msgpack::packer<msgpack::sbuffer> pk(&buffer);
-    pk.pack_map(4 + (include_id?1:0) + (config.network?1:0)+(config.is_client?1:0));
+    pk.pack_map(4 + (include_id?1:0) + (config.network?1:0));
 
     pk.pack(KEY_E); pk.pack_array(2);
       pk.pack(code);
@@ -1420,9 +1378,6 @@ NetworkEngine::sendError(const SockAddr& addr,
     if (config.network) {
         pk.pack(KEY_NETID); pk.pack(config.network);
     }
-    if (config.is_client) {
-        pk.pack(KEY_ISCLIENT); pk.pack(config.is_client);
-    }
 
     send(addr, buffer.data(), buffer.size());
 }

src/peer_discovery.cpp

@@ -22,10 +22,6 @@
 #include "network_utils.h"
 #include "utils.h"
 
-#ifdef __ANDROID__
-#include "compat/getif_workaround_android.h"
-#endif
-
 #include <asio.hpp>
 
 using namespace std::literals;
@@ -95,23 +91,8 @@ PeerDiscovery::DomainPeerDiscovery::DomainPeerDiscovery(asio::ip::udp domain, in
         sockFd_.set_option(asio::ip::udp::socket::reuse_address(true));
         sockFd_.bind({domain, port});
     } catch (const std::exception& e) {
-#ifdef __ANDROID__
-        if(domain.family() == AF_INET && strcmp(e.what(), "set_option: No such device") == 0) {
-            try{
-                sockFd_.set_option(asio::ip::udp::socket::reuse_address(true));
-                auto mc_interface = workaround::get_interface();
-                sockFd_.set_option(asio::ip::multicast::outbound_interface(mc_interface));
-                sockFd_.set_option(asio::ip::multicast::join_group(sockAddrSend_.address().to_v4(), mc_interface));
-                sockFd_.bind({domain, port});
-            } catch(const std::exception& e){
-                if (logger_)
-                    logger_->error("Can't start peer discovery using android workaround: {}", e.what());
-            }
-        }
-        else
-#endif
         if (logger_)
-            logger_->error("Can't start peer discovery for {}: {}",
+            logger_->e("Can't start peer discovery for %s: %s",
                     domain.family() == AF_INET ? "IPv4" : "IPv6", e.what());
     }
 }