iOS: use high priority for resubscribe notifications

Makes the test pass in many more cases.

.github/workflows/ccpp.yml

@@ -42,7 +42,7 @@ jobs:
     - uses: actions/checkout@v3
     - name: Dependencies
       run: |
-        sudo apt install libncurses5-dev libreadline-dev nettle-dev \
+        sudo apt install libncurses5-dev libreadline-dev nettle-dev libfmt-dev \
         libgnutls28-dev libcppunit-dev libmsgpack-dev libargon2-0-dev
     - name: Configure
       run: |

.vscode/settings.json

@@ -1,9 +0,0 @@
-{
-    "cmake.configureSettings": {
-        "OPENDHT_SANITIZE": true,
-        "OPENDHT_PROXY_CLIENT": true,
-        "OPENDHT_PROXY_SERVER": true,
-        "OPENDHT_C": true,
-        "OPENDHT_DOCUMENTATION": false
-    }
-}

CMakeLists.txt

@@ -15,7 +15,7 @@ include(cmake/CheckAtomic.cmake)
 include(CTest)
 
 set (opendht_VERSION_MAJOR 2)
-set (opendht_VERSION_MINOR 5.5)
+set (opendht_VERSION_MINOR 6.0)
 set (opendht_VERSION ${opendht_VERSION_MAJOR}.${opendht_VERSION_MINOR})
 set (PACKAGE_VERSION ${opendht_VERSION})
 set (VERSION "${opendht_VERSION}")
@@ -23,7 +23,6 @@ set (VERSION "${opendht_VERSION}")
 # Options
 option (BUILD_SHARED_LIBS "Build shared library" ON)
 CMAKE_DEPENDENT_OPTION (OPENDHT_STATIC "Build static library" OFF BUILD_SHARED_LIBS ON)
-option (OPENDHT_LOG "Build with logs" ON)
 option (OPENDHT_PYTHON "Build Python bindings" OFF)
 option (OPENDHT_TOOLS "Build DHT tools" ON)
 option (OPENDHT_SYSTEMD "Install systemd module" OFF)
@@ -84,12 +83,14 @@ if (NOT MSVC)
         )
     endif()
 
-    find_path(ASIO_INCLUDE_DIR asio.hpp REQUIRED)
+    if (OPENDHT_HTTP OR OPENDHT_PEER_DISCOVERY)
+        find_path(ASIO_INCLUDE_DIR asio.hpp REQUIRED)
+    endif ()
+
+    find_package(fmt)
 
     if (OPENDHT_HTTP)
         find_package(Restinio REQUIRED)
-        find_library(FMT_LIBRARY fmt)
-        add_library(fmt SHARED IMPORTED)
         find_library(HTTP_PARSER_LIBRARY http_parser)
         add_library(http_parser SHARED IMPORTED)
         set(http_parser_lib "-lhttp_parser")
@@ -139,6 +140,7 @@ if (NOT MSVC)
     set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-return-type -Wno-deprecated -Wall -Wextra -Wnon-virtual-dtor -pedantic-errors -fvisibility=hidden")
     if (OPENDHT_SANITIZE)
         set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address -fstack-protector-strong")
+        set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address -fstack-protector-strong")
     endif ()
 else ()
     add_definitions(-D_WINSOCK_DEPRECATED_NO_WARNINGS
@@ -153,11 +155,6 @@ endif ()
 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DMSGPACK_NO_BOOST -DMSGPACK_DISABLE_LEGACY_NIL -DMSGPACK_DISABLE_LEGACY_CONVERT")
 
 add_definitions(-DPACKAGE_VERSION="${opendht_VERSION}")
-if (OPENDHT_LOG)
-    add_definitions(-DOPENDHT_LOG=true)
-else ()
-    add_definitions(-DOPENDHT_LOG=false)
-endif()
 
 if (ASIO_INCLUDE_DIR)
     include_directories (SYSTEM "${ASIO_INCLUDE_DIR}")
@@ -208,12 +205,12 @@ list (APPEND opendht_SOURCES
     src/log.cpp
     src/network_utils.cpp
     src/thread_pool.cpp
-    src/udp_socket.cpp
 )
 
 list (APPEND opendht_HEADERS
     include/opendht/def.h
     include/opendht/utils.h
+    include/opendht/sockaddr.h
     include/opendht/rng.h
     include/opendht/crypto.h
     include/opendht/infohash.h
@@ -230,9 +227,9 @@ list (APPEND opendht_HEADERS
     include/opendht/rate_limiter.h
     include/opendht/securedht.h
     include/opendht/log.h
-    include/opendht/log_enable.h
+    include/opendht/logger.h
     include/opendht/thread_pool.h
-    include/opendht/udp_socket.h
+    include/opendht/network_utils.h
     include/opendht.h
 )
 
@@ -351,7 +348,7 @@ if (NOT HAVE_MSGPACKCXX)
     target_link_libraries(opendht PUBLIC ${MSGPACK_TARGET})
 endif()
 if (APPLE)
-    target_link_libraries(opendht PRIVATE SYSTEM "-framework CoreFoundation" "-framework Security")
+    target_link_libraries(opendht PRIVATE "-framework CoreFoundation" "-framework Security")
 endif()
 if (MSVC)
     if (OPENDHT_STATIC)
@@ -367,7 +364,7 @@ else()
         PUBLIC
             ${CMAKE_THREAD_LIBS_INIT}
             PkgConfig::GnuTLS
-            ${FMT_LIBRARY}
+            fmt::fmt
     )
     if (Jsoncpp_FOUND)
         target_link_libraries(opendht PUBLIC PkgConfig::Jsoncpp)

README.md

@@ -21,6 +21,11 @@ Values are distributed over the network, with redundancy.
 ## Documentation
 See the wiki: <https://github.com/savoirfairelinux/opendht/wiki>
 
+#### How to run a node
+
+You can help contributing to the public network by running a stable node with a public IP address.
+https://github.com/savoirfairelinux/opendht/wiki/Running-a-node-with-dhtnode
+
 #### How-to build and install
 
 Build instructions: <https://github.com/savoirfairelinux/opendht/wiki/Build-the-library>
@@ -91,17 +96,18 @@ for r in results:
 - msgpack-c 1.2+, used for data serialization.
 - GnuTLS 3.3+, used for cryptographic operations.
 - Nettle 2.4+, a GnuTLS dependency for crypto.
+- {fmt} 9.0+, for log formatting.
 - (optional) restinio 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 2017, 2019, 2022
+- Build tested with Microsoft Visual Studio 2019, 2022
 
 ## Contact
 
 IRC: join us on Libera.chat at [`#opendht`](https://web.libera.chat/#opendht).
 
 ## License
-Copyright (C) 2014-2022 Savoir-faire Linux Inc.
+Copyright (C) 2014-2023 Savoir-faire Linux Inc.
 
 OpenDHT is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version.
 

c/opendht.cpp

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2022 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
  *  Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -31,7 +31,6 @@ extern "C" {
 #endif
 
 #include <errno.h>
-#include <cstdlib>
 
 const char* dht_version()
 {
@@ -359,53 +358,14 @@ int dht_runner_run_config(dht_runner* r, in_port_t port, const dht_runner_config
     return 0;
 }
 
-asio::ip::udp::endpoint sockaddr_to_endpoint(struct sockaddr* addr, socklen_t addr_len) {
-    if (addr->sa_family == AF_INET) {
-        auto addr_in = reinterpret_cast<struct sockaddr_in*>(addr);
-        asio::ip::address_v4 address(ntohl(addr_in->sin_addr.s_addr));
-        unsigned short port = ntohs(addr_in->sin_port);
-        return asio::ip::udp::endpoint(address, port);
-    } else if (addr->sa_family == AF_INET6) {
-        auto addr_in6 = reinterpret_cast<struct sockaddr_in6*>(addr);
-        asio::ip::address_v6::bytes_type bytes;
-        std::memcpy(bytes.data(), &addr_in6->sin6_addr, 16);
-        asio::ip::address_v6 address(bytes, addr_in6->sin6_scope_id);
-        unsigned short port = ntohs(addr_in6->sin6_port);
-        return asio::ip::udp::endpoint(address, port);
-    } else {
-        throw std::runtime_error("Invalid sockaddr family");
-    }
-}
-
-struct sockaddr* endpoint_to_sockaddr(const asio::ip::udp::endpoint& endpoint, socklen_t* addr_len = nullptr) {
-    const struct sockaddr* addr_src = endpoint.data();
-    auto len = endpoint.size();
-    struct sockaddr* addr_copy = reinterpret_cast<struct sockaddr*>(std::malloc(len));
-    std::memcpy(addr_copy, addr_src, len);
-    if (addr_len)
-        *addr_len = len;
-    return addr_copy;
-}
-
-struct sockaddr** endpoints_to_sockaddrs(const std::vector<asio::ip::udp::endpoint>& endpoints) {
-    size_t num_endpoints = endpoints.size();
-    struct sockaddr** sockaddrs = reinterpret_cast<struct sockaddr**>(std::malloc((num_endpoints + 1) * sizeof(struct sockaddr*)));
-    for (size_t i = 0; i < num_endpoints; ++i) {
-        sockaddrs[i] = endpoint_to_sockaddr(endpoints[i]);
-    }
-    sockaddrs[num_endpoints] = nullptr; // Null-terminate the array
-    return sockaddrs;
-}
-
-
 void dht_runner_ping(dht_runner* r, struct sockaddr* addr, socklen_t addr_len, dht_done_cb done_cb, void* cb_user_data) {
     auto runner = reinterpret_cast<dht::DhtRunner*>(r);
     if (done_cb) {
-        runner->bootstrap(sockaddr_to_endpoint(addr, addr_len), [done_cb, cb_user_data](bool ok){
+        runner->bootstrap(dht::SockAddr(addr, addr_len), [done_cb, cb_user_data](bool ok){
             done_cb(ok, cb_user_data);
         });
     } else {
-        runner->bootstrap(sockaddr_to_endpoint(addr, addr_len));
+        runner->bootstrap(dht::SockAddr(addr, addr_len));
     }
 }
 
@@ -545,7 +505,11 @@ struct sockaddr** dht_runner_get_public_address(const dht_runner* r) {
     auto addrs = const_cast<dht::DhtRunner*>(runner)->getPublicAddress();
     if (addrs.empty())
         return nullptr;
-    return endpoints_to_sockaddrs(addrs);
+    auto ret = (struct sockaddr**)malloc(sizeof(struct sockaddr*) * (addrs.size() + 1));
+    for (size_t i=0; i<addrs.size(); i++)
+        ret[i] = addrs[i].release();
+    ret[addrs.size()] = nullptr;
+    return ret;
 }
 
 #ifdef __cplusplus

c/opendht_c.h

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2022 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
  *  Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify

configure.ac

@@ -1,7 +1,7 @@
 dnl define macros
 m4_define([opendht_major_version], 2)
-m4_define([opendht_minor_version], 5)
-m4_define([opendht_patch_version], 5)
+m4_define([opendht_minor_version], 6)
+m4_define([opendht_patch_version], 0)
 m4_define([opendht_version],
 		  [opendht_major_version.opendht_minor_version.opendht_patch_version])
 
@@ -34,12 +34,6 @@ AC_LANG(C++)
 AC_PROG_CXX
 AX_CXX_COMPILE_STDCXX(17,[noext],[mandatory])
 
-dnl Check for logs
-AC_ARG_ENABLE([logs], [AS_HELP_STRING([--disable-logs], [Disable DHT logs])])
-AS_IF([test "x$enable_logs" != "xno"], [], [
-	AC_DEFINE([OPENDHT_LOG], [false], [Define if DHT logs are disabled])
-])
-
 dnl Check for C binding
 AC_ARG_ENABLE([c], [AS_HELP_STRING([--disable-c], [Disable DHT C binding])])
 AM_CONDITIONAL(ENABLE_C, test x$enable_c != "xno")
@@ -171,15 +165,16 @@ AS_IF([test "x$have_openssl" = "xyes"], [
     AC_MSG_NOTICE([Not using OpenSSL])
 ])
 
+PKG_CHECK_MODULES([Fmt], [fmt >= 5.3.0], [have_fmt=yes], [have_fmt=no])
+AS_IF([test "x$have_fmt" = "xyes"], [
+    AC_MSG_NOTICE([Using libfmt])
+], [
+    AC_MSG_NOTICE([Missing libfmt files])
+])
+
 AM_COND_IF([PROXY_CLIENT_OR_SERVER], [
     AC_CHECK_HEADERS([asio.hpp],, AC_MSG_ERROR([Missing Asio headers files]))
     CXXFLAGS="${CXXFLAGS} -DASIO_STANDALONE"
-    PKG_CHECK_MODULES([Fmt], [fmt >= 5.3.0], [have_fmt=yes], [have_fmt=no])
-    AS_IF([test "x$have_fmt" = "xyes"], [
-        AC_MSG_NOTICE([Using libfmt])
-    ], [
-        AC_MSG_NOTICE([Missing libfmt files])
-    ])
     # http_parser has no pkgconfig, instead we check with:
     AC_CHECK_LIB(http_parser, exit,, AC_MSG_ERROR([Missing HttpParser library files]))
     AC_CHECK_HEADERS([http_parser.h], [http_parser_headers=yes; break;])

doc/dhtnode.1

@@ -19,7 +19,7 @@
 .SH DESCRIPTION
 Runs an OpenDHT node, with a CLI (default) or as a daemon (with \fB'-d'\fP or \fB'-s'\fP).
 Commands available in the interactive shell are:
-.EE
+.EX
     h, help    Print this help message.
     q, quit    Quit the program.
     log        Start/stop printing DHT logs.
@@ -39,6 +39,7 @@ Commands available in the interactive shell are:
                           private key.
     e [key] [dest] [str]  Put string value at [key], encrypted for [dest] with
                           its public key (if found).
+.EE
 .SH OPTIONS
 .TP
 \fB\-h\fP

docker/DockerfileAlpine

@@ -19,7 +19,7 @@ RUN cd opendht && mkdir build && cd build \
 				-DOPENDHT_SYSTEMD=On \
 	&& make -j8 && make install
 
-FROM alpine:3.17 AS install
+FROM alpine:3.18 AS install
 COPY --from=build /install /
 RUN apk add --no-cache \
         libstdc++ \

docker/DockerfileDepsAlpine

@@ -1,4 +1,4 @@
-FROM alpine:3.17
+FROM alpine:3.18
 LABEL maintainer="Adrien Béraud <adrien.beraud@savoirfairelinux.com>"
 LABEL org.opencontainers.image.source https://github.com/savoirfairelinux/opendht
 

include/opendht.h

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2022 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
  *  Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify

include/opendht/callbacks.h

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2022 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
  *  Authors: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *           Simon Désaulniers <simon.desaulniers@savoirfairelinux.com>
  *           Sébastien Blin <sebastien.blin@savoirfairelinux.com>
@@ -44,18 +44,6 @@ enum class NodeStatus {
     Connecting,   // 1+ nodes
     Connected     // 1+ good nodes
 };
-struct OPENDHT_PUBLIC DhtNodeStatus {
-    NodeStatus ipv4;
-    NodeStatus ipv6;
-    inline NodeStatus get() const {
-        if (ipv4 == NodeStatus::Connected or ipv6 == NodeStatus::Connected)
-            return NodeStatus::Connected;
-        if (ipv4 == NodeStatus::Connecting or ipv6 == NodeStatus::Connecting)
-            return NodeStatus::Connecting;
-        return NodeStatus::Disconnected;
-    }
-};
-using StatusCallback = std::function<void(DhtNodeStatus)>;
 
 inline constexpr const char*
 statusToStr(NodeStatus status) {
@@ -91,7 +79,6 @@ struct OPENDHT_PUBLIC NodeStats {
 struct OPENDHT_PUBLIC NodeInfo {
     InfoHash id;
     InfoHash node_id;
-    PkId node_long_id;
     NodeStats ipv4 {};
     NodeStats ipv6 {};
     size_t ongoing_ops {0};
@@ -183,19 +170,19 @@ using ValueCallback = std::function<bool(const std::vector<std::shared_ptr<Value
 using GetCallbackSimple = std::function<bool(std::shared_ptr<Value> value)>;
 using ShutdownCallback = std::function<void()>;
 using IdentityAnnouncedCb = std::function<void(bool)>;
+using PublicAddressChangedCb = std::function<void(std::vector<SockAddr>)>;
 
 using CertificateStoreQuery = std::function<std::vector<std::shared_ptr<crypto::Certificate>>(const InfoHash& pk_id)>;
+using DoneCallback = std::function<void(bool success, const std::vector<std::shared_ptr<Node>>& nodes)>;
+using DoneCallbackSimple = std::function<void(bool success)>;
 
 typedef bool (*GetCallbackRaw)(std::shared_ptr<Value>, void *user_data);
 typedef bool (*ValueCallbackRaw)(std::shared_ptr<Value>, bool expired, void *user_data);
-
-using DoneCallback = std::function<void(bool success, const std::vector<std::shared_ptr<Node>>& nodes)>;
 typedef void (*DoneCallbackRaw)(bool, std::vector<std::shared_ptr<Node>>*, void *user_data);
 typedef void (*ShutdownCallbackRaw)(void *user_data);
 typedef void (*DoneCallbackSimpleRaw)(bool, void *user_data);
 typedef bool (*FilterRaw)(const Value&, void *user_data);
 
-using DoneCallbackSimple = std::function<void(bool success)>;
 
 OPENDHT_PUBLIC GetCallbackSimple bindGetCb(GetCallbackRaw raw_cb, void* user_data);
 OPENDHT_PUBLIC GetCallback bindGetCb(GetCallbackSimple cb);

include/opendht/crypto.h

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2022 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
  *  Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *           Vsevolod Ivanov <vsevolod.ivanov@savoirfairelinux.com>
  *

include/opendht/default_types.h

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2022 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
  *  Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -19,8 +19,7 @@
 #pragma once
 
 #include "value.h"
-
-#include <asio/ip/udp.hpp>
+#include "sockaddr.h"
 
 namespace dht {
 enum class ImStatus : uint8_t {
@@ -216,10 +215,9 @@ private:
 public:
     static const ValueType TYPE;
 
-    IpServiceAnnouncement(sa_family_t family = AF_UNSPEC, in_port_t p = 0) 
-        : addr() {
-        addr.address(family == AF_INET ? asio::ip::address(asio::ip::address_v4::any()) : asio::ip::address(asio::ip::address_v6::any()));
-        addr.port(p);
+    IpServiceAnnouncement(sa_family_t family = AF_UNSPEC, in_port_t p = 0) {
+        addr.setFamily(family);
+        addr.setPort(p);
     }
 
     IpServiceAnnouncement(const SockAddr& sa) : addr(sa) {}
@@ -231,25 +229,23 @@ public:
     template <typename Packer>
     void msgpack_pack(Packer& pk) const
     {
-        pk.pack_bin(addr.size());
-        pk.pack_bin_body((const char*)addr.data(), addr.size());
+        pk.pack_bin(addr.getLength());
+        pk.pack_bin_body((const char*)addr.get(), addr.getLength());
     }
 
     virtual void msgpack_unpack(const msgpack::object& o)
     {
-        //{(sockaddr*)o.via.bin.ptr, (socklen_t)o.via.bin.size};
-        //auto p = 
         if (o.type == msgpack::type::BIN)
-            addr = *reinterpret_cast<const asio::ip::udp::endpoint*>((sockaddr*)o.via.bin.ptr);
+            addr = {(sockaddr*)o.via.bin.ptr, (socklen_t)o.via.bin.size};
         else
             throw msgpack::type_error();
     }
 
     in_port_t getPort() const {
-        return addr.port();
+        return addr.getPort();
     }
     void setPort(in_port_t p) {
-        addr.port(p);
+        addr.setPort(p);
     }
 
     const SockAddr& getPeerAddr() const {

include/opendht/dht.h

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2022 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
  *  Authors: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *           Simon Désaulniers <simon.desaulniers@savoirfairelinux.com>
  *           Sébastien Blin <sebastien.blin@savoirfairelinux.com>
@@ -29,8 +29,6 @@
 #include "callbacks.h"
 #include "dht_interface.h"
 
-#include <asio/strand.hpp>
-
 #include <string>
 #include <array>
 #include <vector>
@@ -46,7 +44,6 @@ namespace dht {
 
 namespace net {
 struct Request;
-class UdpSocket;
 } /* namespace net */
 
 struct Storage;
@@ -68,7 +65,7 @@ public:
      * Initialise the Dht with two open sockets (for IPv4 and IP6)
      * and an ID for the node.
      */
-    Dht(std::shared_ptr<net::strand> strand, std::unique_ptr<net::DatagramSocket>&& sock, const Config& config, const Sp<Logger>& l = {});
+    Dht(std::unique_ptr<net::DatagramSocket>&& sock, const Config& config, const Sp<Logger>& l = {});
 
     virtual ~Dht();
 
@@ -76,6 +73,9 @@ public:
      * Get the ID of the node.
      */
     inline const InfoHash& getNodeId() const override { return myid; }
+    void setOnPublicAddressChanged(PublicAddressChangedCb cb) override {
+        publicAddressChangedCb_ = std::move(cb);
+    }
 
     NodeStatus updateStatus(sa_family_t af) override;
 
@@ -89,14 +89,8 @@ public:
     NodeStatus getStatus() const override {
         return std::max(getStatus(AF_INET), getStatus(AF_INET6));
     }
-    void addOnConnectedCallback(std::function<void()> cb) {
-        onConnectCallbacks_.emplace(std::move(cb));
-    }
-    void addOnStateChangeCallback(StatusCallback cb) {
-        onStateChangeCallbacks_.emplace_back(std::move(cb));
-    }
 
-    const net::DatagramSocket* getSocket() const override { return network_engine.getSocket(); };
+    net::DatagramSocket* getSocket() const override { return network_engine.getSocket(); };
 
     /**
      * Performs final operations before quitting.
@@ -139,10 +133,10 @@ public:
 
     void pingNode(SockAddr, DoneCallbackSimple&& cb={}) override;
 
-    /*time_point periodic(const uint8_t *buf, size_t buflen, SockAddr, const time_point& now) override;
+    time_point periodic(const uint8_t *buf, size_t buflen, SockAddr, const time_point& now) override;
     time_point periodic(const uint8_t *buf, size_t buflen, const sockaddr* from, socklen_t fromlen, const time_point& now) override {
         return periodic(buf, buflen, SockAddr(from, fromlen), now);
-    }*/
+    }
 
     /**
      * Get a value by searching on all available protocols (IPv4, IPv6),
@@ -271,7 +265,6 @@ public:
      */
     void connectivityChanged(sa_family_t) override;
     void connectivityChanged() override {
-        reported_addr.clear();
         connectivityChanged(AF_INET);
         connectivityChanged(AF_INET6);
     }
@@ -385,17 +378,19 @@ private:
 
     uint64_t secret {};
     uint64_t oldsecret {};
-    asio::steady_timer rotateRecretsJob;
 
     // registred types
     TypeStore types;
 
     using SearchMap = std::map<InfoHash, Sp<Search>>;
+    using ReportedAddr = std::pair<unsigned, SockAddr>;
+
     struct Kad {
         RoutingTable buckets {};
         SearchMap searches {};
         unsigned pending_pings {0};
         NodeStatus status;
+        std::vector<ReportedAddr> reported_addr;
 
         NodeStatus getStatus(time_point now) const;
         NodeStats getNodesStats(time_point now, const InfoHash& myid) const;
@@ -403,13 +398,14 @@ private:
 
     Kad dht4 {};
     Kad dht6 {};
+    PublicAddressChangedCb publicAddressChangedCb_ {};
 
     std::vector<std::pair<std::string,std::string>> bootstrap_nodes {};
     std::chrono::steady_clock::duration bootstrap_period {BOOTSTRAP_PERIOD};
-    asio::steady_timer bootstrapJob;
+    Sp<Scheduler::Job> bootstrapJob {};
 
     std::map<InfoHash, Storage> store;
-    std::map<SockAddr, StorageBucket, ipCmp> store_quota;
+    std::map<SockAddr, StorageBucket, SockAddr::ipCmp> store_quota;
     size_t total_values {0};
     size_t total_store_size {0};
     size_t max_store_keys {MAX_HASHES};
@@ -425,18 +421,13 @@ private:
 
 
     // timing
-    asio::steady_timer nextNodesConfirmation;
-    asio::steady_timer nextStorageMaintenance;
-    asio::steady_timer expirationJob;
-    asio::steady_timer statusCheckJob;
+    Scheduler scheduler;
+    Sp<Scheduler::Job> nextNodesConfirmation {};
+    Sp<Scheduler::Job> nextStorageMaintenance {};
 
     net::NetworkEngine network_engine;
-    using ReportedAddr = std::pair<unsigned, SockAddr>;
-    std::vector<ReportedAddr> reported_addr;
 
     std::string persistPath;
-    std::vector<StatusCallback> onStateChangeCallbacks_ {};
-    std::queue<std::function<void()>> onConnectCallbacks_ {};
 
     // are we a bootstrap node ?
     // note: Any running node can be used as a bootstrap node.
@@ -459,7 +450,7 @@ private:
 
     // Storage
     void storageAddListener(const InfoHash& id, const Sp<Node>& node, size_t tid, Query&& = {}, int version = 0);
-    bool storageStore(const InfoHash& id, const Sp<Value>& value, time_point created, const SockAddr* sa = nullptr, bool permanent = false);
+    bool storageStore(const InfoHash& id, const Sp<Value>& value, time_point created, const SockAddr& sa = {}, bool permanent = false);
     bool storageRefresh(const InfoHash& id, Value::Id vid);
     void expireStore();
     void expireStorage(InfoHash h);
@@ -503,8 +494,7 @@ private:
     void onNewNode(const Sp<Node>& node, int confirm);
     const Sp<Node> findNode(const InfoHash& id, sa_family_t af) const;
     bool trySearchInsert(const Sp<Node>& node);
-    void scheduleStatusCheck();
-    
+
     // Searches
     inline SearchMap& searches(sa_family_t af) { return dht(af).searches; }
     inline const SearchMap& searches(sa_family_t af) const { return dht(af).searches; }
@@ -514,7 +504,6 @@ private:
      * infohash (id), using the specified IP version (IPv4 or IPv6).
      */
     Sp<Search> search(const InfoHash& id, sa_family_t af, GetCallback = {}, QueryCallback = {}, DoneCallback = {}, Value::Filter = {}, const Sp<Query>& q = {});
-    void scheduleNodeConfirmation(const time_point& step);
 
     void announce(const InfoHash& id, sa_family_t af, Sp<Value> value, DoneCallback callback, time_point created=time_point::max(), bool permanent = false);
     size_t listenTo(const InfoHash& id, sa_family_t af, ValueCallback cb, Value::Filter f = {}, const Sp<Query>& q = {});
@@ -532,13 +521,9 @@ private:
     void confirmNodes();
     void expire();
 
-    void onStateChanged();
     void onConnected();
     void onDisconnected();
 
-    inline const time_point& time() const { return network_engine.time(); }
-    inline asio::io_context& context() const { return network_engine.context(); }
-
     /**
      * Generic function to execute when a 'get' request has completed.
      *
@@ -583,7 +568,7 @@ private:
      * @param sr  The search for which we want to announce a value.
      * @param announce  The 'announce' structure.
      */
-    void searchSendAnnounceValue(const Sp<Search>& sr);
+    void searchSendAnnounceValue(const Sp<Search>& sr, unsigned syncLevel = TARGET_NODES);
 
     /**
      * Main process of a Search's operations. This function will demand the

include/opendht/dht_interface.h

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2022 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
  *  Author: Sébastien Blin <sebastien.blin@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -19,23 +19,22 @@
 #pragma once
 
 #include "infohash.h"
-#include "log_enable.h"
+#include "logger.h"
 #include "node_export.h"
-#include "callbacks.h"
 
 #include <queue>
 
 namespace dht {
 
 namespace net {
-class DatagramSocket;
+    class DatagramSocket;
 }
 
 class OPENDHT_PUBLIC DhtInterface {
 public:
     DhtInterface() = default;
-    DhtInterface(const Logger& l) : logger_(std::make_shared<Logger>(l)) {};
-    DhtInterface(const std::shared_ptr<Logger>& l) : logger_(l) {};
+    DhtInterface(const Logger& l) : logger_(std::make_shared<Logger>(l)) {}
+    DhtInterface(const std::shared_ptr<Logger>& l) : logger_(l) {}
     virtual ~DhtInterface() = default;
 
     // [[deprecated]]
@@ -46,14 +45,16 @@ public:
     /**
      * Get the current status of the node for the given family.
      */
-    virtual NodeStatus updateStatus(sa_family_t af) { return getStatus(af); };
+    virtual NodeStatus updateStatus(sa_family_t af) { return getStatus(af); }
     virtual NodeStatus getStatus(sa_family_t af) const = 0;
     virtual NodeStatus getStatus() const = 0;
 
-    virtual void addOnConnectedCallback(std::function<void()> cb) = 0;
-    virtual void addOnStateChangeCallback(StatusCallback cb) = 0;
+    void addOnConnectedCallback(std::function<void()> cb) {
+        onConnectCallbacks_.emplace(std::move(cb));
+    }
+    virtual void setOnPublicAddressChanged(PublicAddressChangedCb) {}
 
-    virtual const net::DatagramSocket* getSocket() const { return {}; };
+    virtual net::DatagramSocket* getSocket() const { return {}; }
 
     /**
      * Get the ID of the DHT node.
@@ -92,6 +93,9 @@ public:
 
     virtual void pingNode(SockAddr, DoneCallbackSimple&& cb={}) = 0;
 
+    virtual time_point periodic(const uint8_t *buf, size_t buflen, SockAddr, const time_point& now) = 0;
+    virtual time_point periodic(const uint8_t *buf, size_t buflen, const sockaddr* from, socklen_t fromlen, const time_point& now) = 0;
+
     /**
      * Get a value by searching on all available protocols (IPv4, IPv6),
      * and call the provided get callback when values are found at key.
@@ -229,18 +233,6 @@ public:
 
     virtual std::vector<SockAddr> getPublicAddress(sa_family_t family = 0) = 0;
 
-    /**
-     * Enable or disable logging of DHT internal messages
-     */
-    virtual void setLoggers(LogMethod error = {}, LogMethod warn = {}, LogMethod debug = {}) {
-        if (logger_) {
-            logger_->DBG = std::move(debug);
-            logger_->WARN = std::move(warn);
-            logger_->ERR = std::move(error);
-        } else
-            logger_= std::make_shared<Logger>(std::move(error), std::move(warn), std::move(debug));
-    }
-
     virtual void setLogger(const Logger& l) {
         if (logger_)
             *logger_ = l;
@@ -274,6 +266,7 @@ public:
 
 protected:
     std::shared_ptr<Logger> logger_ {};
+    std::queue<std::function<void()>> onConnectCallbacks_ {};
 };
 
 } // namespace dht

include/opendht/dht_proxy_client.h

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2022 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
  *  Author: Sébastien Blin <sebastien.blin@savoirfairelinux.com>
  *          Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *          Vsevolod Ivanov <vsevolod.ivanov@savoirfairelinux.com>
@@ -54,7 +54,7 @@ public:
 
     explicit DhtProxyClient(
         std::shared_ptr<crypto::Certificate> serverCA, crypto::Identity clientIdentity,
-        std::shared_ptr<asio::io_context::strand> strand, const std::string& serverHost,
+        std::function<void()> loopSignal, const std::string& serverHost,
         const std::string& pushClientId = "", std::shared_ptr<Logger> logger = {});
 
     void setHeaderFields(http::Request& request);
@@ -89,6 +89,9 @@ public:
      * Get the ID of the node.
      */
     inline const InfoHash& getNodeId() const override { return myid; }
+    void setOnPublicAddressChanged(PublicAddressChangedCb cb) override {
+        publicAddressChangedCb_ = std::move(cb);
+    }
 
     /**
      * Get the current status of the node for the given family.
@@ -97,13 +100,6 @@ public:
     NodeStatus getStatus() const override {
         return std::max(getStatus(AF_INET), getStatus(AF_INET6));
     }
-    void addOnConnectedCallback(std::function<void()> cb) {
-        onConnectCallbacks_.emplace(std::move(cb));
-    }
-    void addOnStateChangeCallback(StatusCallback cb) {
-        onStateChangeCallbacks_.emplace_back(std::move(cb));
-    }
-    void onStateChanged();
 
     /**
      * Performs final operations before quitting.
@@ -220,6 +216,11 @@ public:
      */
     void pushNotificationReceived(const std::map<std::string, std::string>& notification) override;
 
+    time_point periodic(const uint8_t*, size_t, SockAddr, const time_point& now) override;
+    time_point periodic(const uint8_t* buf, size_t buflen, const sockaddr* from, socklen_t fromlen, const time_point& now) override {
+        return periodic(buf, buflen, SockAddr(from, fromlen), now);
+    }
+
     /**
      * Similar to Dht::get, but sends a Query to filter data remotely.
      * @param key the key for which to query data for.
@@ -287,6 +288,7 @@ public:
     }
     void connectivityChanged() override {
         getProxyInfos();
+        loopSignal_();
     }
 
 private:
@@ -358,8 +360,7 @@ private:
     SockAddr publicAddressV4_;
     SockAddr publicAddressV6_;
     std::atomic_bool launchConnectedCbs_ {false};
-    std::vector<StatusCallback> onStateChangeCallbacks_ {};
-    std::queue<std::function<void()>> onConnectCallbacks_ {};
+    PublicAddressChangedCb publicAddressChangedCb_ {};
 
     InfoHash myid {};
 
@@ -370,10 +371,7 @@ private:
      * ASIO I/O Context for sockets in httpClient_
      * Note: Each context is used in one thread only
      */
-    //asio::io_context httpContext_;
-    //std::shared_ptr<asio::io_context> httpContext_;
-    std::shared_ptr<asio::io_context::strand> strand_;
-    asio::io_context& context() const { return strand_->context(); }
+    asio::io_context httpContext_;
     mutable std::mutex resolverLock_;
     std::shared_ptr<http::Resolver> resolver_;
 
@@ -393,6 +391,12 @@ private:
     size_t listenerToken_ {0};
     std::map<InfoHash, ProxySearch> searches_;
 
+    /**
+     * Callbacks should be executed in the main thread.
+     */
+    std::mutex lockCallbacks_;
+    std::vector<std::function<void()>> callbacks_;
+
     Sp<InfoState> infoState_;
 
     /**
@@ -438,6 +442,8 @@ private:
 #endif
 #endif
 
+    const std::function<void()> loopSignal_;
+
 #ifdef OPENDHT_PUSH_NOTIFICATIONS
     std::string fillBody(bool resubscribe);
     void getPushRequest(Json::Value&) const;

include/opendht/dht_proxy_server.h

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2022 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
  *  Author: Sébastien Blin <sebastien.blin@savoirfairelinux.com>
  *          Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *          Vsevolod Ivanov <vsevolod.ivanov@savoirfairelinux.com>
@@ -25,6 +25,7 @@
 #include "infohash.h"
 #include "proxy.h"
 #include "scheduler.h"
+#include "sockaddr.h"
 #include "value.h"
 #include "http.h"
 
@@ -86,9 +87,8 @@ public:
      */
     DhtProxyServer(const std::shared_ptr<DhtRunner>& dht,
         const ProxyServerConfig& config = {},
-        const std::shared_ptr<dht::Logger>& logger = {});
+        const std::shared_ptr<log::Logger>& logger = {});
 
-    void stop();
     virtual ~DhtProxyServer();
 
     DhtProxyServer(const DhtProxyServer& other) = delete;
@@ -364,7 +364,7 @@ private:
     mutable std::mutex requestLock_;
     std::map<unsigned int /*id*/, std::shared_ptr<http::Request>> requests_;
 
-    std::shared_ptr<dht::Logger> logger_;
+    std::shared_ptr<log::Logger> logger_;
 
     std::shared_ptr<ServerStats> stats_;
     std::shared_ptr<NodeInfo> nodeInfo_ {};

include/opendht/dhtrunner.h

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2022 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
  *  Authors: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *           Simon Désaulniers <simon.desaulniers@savoirfairelinux.com>
  *           Sébastien Blin <sebastien.blin@savoirfairelinux.com>
@@ -24,10 +24,10 @@
 #include "infohash.h"
 #include "value.h"
 #include "callbacks.h"
-#include "log_enable.h"
-#include "node_export.h"
+#include "sockaddr.h"
+#include "logger.h"
 #include "network_utils.h"
-#include "udp_socket.h"
+#include "node_export.h"
 
 #include <thread>
 #include <mutex>
@@ -52,7 +52,10 @@ struct SecureDhtConfig;
  * thread that will update the DHT when appropriate.
  */
 class OPENDHT_PUBLIC DhtRunner {
+
 public:
+    using StatusCallback = std::function<void(NodeStatus, NodeStatus)>;
+
     struct Config {
         SecureDhtConfig dht_config {};
         bool threaded {true};
@@ -71,11 +74,11 @@ public:
     struct Context {
         std::shared_ptr<Logger> logger {};
         std::unique_ptr<net::DatagramSocket> sock;
-        std::shared_ptr<asio::io_context> ioContext {};
         std::shared_ptr<PeerDiscovery> peerDiscovery {};
         StatusCallback statusChangedCallback {};
         CertificateStoreQuery certificateStore {};
         IdentityAnnouncedCb identityAnnouncedCb {};
+        PublicAddressChangedCb publicAddressChangedCb {};
         Context() {}
     };
 
@@ -347,7 +350,6 @@ public:
     void setLogger(const Logger& logger) {
         setLogger(std::make_shared<Logger>(logger));
     }
-    void setLoggers(LogMethod err = {}, LogMethod warn = {}, LogMethod debug = {});
 
     /**
      * Only print logs related to the given InfoHash (if given), or disable filter (if zeroes).
@@ -405,6 +407,20 @@ public:
 
     void run(const Config& config, Context&& context);
 
+    void setOnStatusChanged(StatusCallback&& cb) {
+        statusCb = std::move(cb);
+    }
+
+    /**
+     * In non-threaded mode, the user should call this method
+     * regularly and everytime a new packet is received.
+     * @return the next op
+     */
+    time_point loop() {
+        std::lock_guard<std::mutex> lck(dht_mtx);
+        return loop_();
+    }
+
     /**
      * Gracefuly disconnect from network.
      */
@@ -459,20 +475,17 @@ private:
         Stopping
     };
 
+    time_point loop_();
+
+    NodeStatus getStatus() const {
+        return std::max(status4, status6);
+    }
+
     bool checkShutdown();
     void opEnded();
     DoneCallback bindOpDoneCallback(DoneCallback&& cb);
     DoneCallbackSimple bindOpDoneCallback(DoneCallbackSimple&& cb);
 
-    inline void post(std::function<void()>&& op, bool prio = false) {
-        ioContext_->post(asio::bind_executor(*strand_, std::move(op)));
-    }
-
-    void postOp(std::function<void(SecureDht&)>&& op, bool prio = false);
-
-    std::shared_ptr<asio::io_context> ioContext_;
-    std::shared_ptr<asio::io_context::strand> strand_;
-
     /** DHT instance */
     std::unique_ptr<SecureDht> dht_;
 
@@ -491,7 +504,11 @@ private:
     mutable std::mutex dht_mtx {};
     std::thread dht_thread {};
     std::condition_variable cv {};
-    /*std::queue<std::function<void(SecureDht&)>> pending_ops_prio {};*/
+    std::mutex sock_mtx {};
+    net::PacketList rcv {};
+    decltype(rcv) rcv_free {};
+
+    std::queue<std::function<void(SecureDht&)>> pending_ops_prio {};
     std::queue<std::function<void(SecureDht&)>> pending_ops {};
     std::mutex storage_mtx {};
 
@@ -499,6 +516,10 @@ private:
     std::atomic_size_t ongoing_ops {0};
     std::vector<ShutdownCallback> shutdownCallbacks_;
 
+    NodeStatus status4 {NodeStatus::Disconnected},
+               status6 {NodeStatus::Disconnected};
+    StatusCallback statusCb {nullptr};
+
     /** PeerDiscovery Parameters */
     std::shared_ptr<PeerDiscovery> peerDiscovery_;
 

include/opendht/http.h

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2022 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
  *  Author: Vsevolod Ivanov <vsevolod.ivanov@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -53,7 +53,9 @@ class tls_socket_t;
 }
 
 namespace dht {
+namespace log {
 struct Logger;
+}
 
 namespace crypto {
 struct Certificate;
@@ -88,9 +90,9 @@ public:
 class OPENDHT_PUBLIC Connection : public std::enable_shared_from_this<Connection>
 {
 public:
-    Connection(asio::io_context& ctx, const bool ssl = true, std::shared_ptr<dht::Logger> l = {});
+    Connection(asio::io_context& ctx, const bool ssl = true, std::shared_ptr<log::Logger> l = {});
     Connection(asio::io_context& ctx, std::shared_ptr<dht::crypto::Certificate> server_ca,
-               const dht::crypto::Identity& identity, std::shared_ptr<dht::Logger> l = {});
+               const dht::crypto::Identity& identity, std::shared_ptr<log::Logger> l = {});
     ~Connection();
 
     inline unsigned int id() const { return  id_; };
@@ -148,7 +150,7 @@ private:
     asio::ip::address local_address_;
 
     std::unique_ptr<asio::steady_timer> timeout_timer_;
-    std::shared_ptr<dht::Logger> logger_;
+    std::shared_ptr<log::Logger> logger_;
     bool checkOcsp_ {false};
 };
 
@@ -172,15 +174,15 @@ public:
     using ResolverCb = std::function<void(const asio::error_code& ec,
                                           const std::vector<asio::ip::tcp::endpoint>& endpoints)>;
 
-    Resolver(asio::io_context& ctx, const std::string& url, std::shared_ptr<dht::Logger> logger = {});
+    Resolver(asio::io_context& ctx, const std::string& url, std::shared_ptr<log::Logger> logger = {});
     Resolver(asio::io_context& ctx, const std::string& host, const std::string& service,
-             const bool ssl = false, std::shared_ptr<dht::Logger> logger = {});
+             const bool ssl = false, std::shared_ptr<log::Logger> logger = {});
 
     // use already resolved endpoints with classes using this resolver
     Resolver(asio::io_context& ctx, std::vector<asio::ip::tcp::endpoint> endpoints,
-             const bool ssl = false, std::shared_ptr<dht::Logger> logger = {});
+             const bool ssl = false, std::shared_ptr<log::Logger> logger = {});
     Resolver(asio::io_context& ctx, const std::string& url, std::vector<asio::ip::tcp::endpoint> endpoints,
-            std::shared_ptr<dht::Logger> logger = {});
+            std::shared_ptr<log::Logger> logger = {});
 
     ~Resolver();
 
@@ -190,7 +192,7 @@ public:
 
     void add_callback(ResolverCb cb, sa_family_t family = AF_UNSPEC);
 
-    std::shared_ptr<Logger> getLogger() const {
+    std::shared_ptr<log::Logger> getLogger() const {
         return logger_;
     }
 
@@ -208,7 +210,7 @@ private:
     bool completed_ {false};
     std::queue<ResolverCb> cbs_;
 
-    std::shared_ptr<dht::Logger> logger_;
+    std::shared_ptr<log::Logger> logger_;
 };
 
 class Request;
@@ -240,14 +242,14 @@ public:
 
     // resolves implicitly
     Request(asio::io_context& ctx, const std::string& url, const Json::Value& json, OnJsonCb jsoncb,
-            std::shared_ptr<dht::Logger> logger = {});
+            std::shared_ptr<log::Logger> logger = {});
     Request(asio::io_context& ctx, const std::string& url, OnJsonCb jsoncb,
-            std::shared_ptr<dht::Logger> logger = {});
+            std::shared_ptr<log::Logger> logger = {});
 
-    Request(asio::io_context& ctx, const std::string& url, std::shared_ptr<dht::Logger> logger = {});
+    Request(asio::io_context& ctx, const std::string& url, std::shared_ptr<log::Logger> logger = {});
     Request(asio::io_context& ctx, const std::string& host, const std::string& service,
-            const bool ssl = false, std::shared_ptr<dht::Logger> logger = {});
-    Request(asio::io_context& ctx, const std::string& url, OnDoneCb onDone, std::shared_ptr<dht::Logger> logger = {});
+            const bool ssl = false, std::shared_ptr<log::Logger> logger = {});
+    Request(asio::io_context& ctx, const std::string& url, OnDoneCb onDone, std::shared_ptr<log::Logger> logger = {});
 
     // user defined resolver
     Request(asio::io_context& ctx, std::shared_ptr<Resolver> resolver, sa_family_t family = AF_UNSPEC);
@@ -255,7 +257,7 @@ public:
 
     // user defined resolved endpoints
     Request(asio::io_context& ctx, std::vector<asio::ip::tcp::endpoint>&& endpoints,
-            const bool ssl = false, std::shared_ptr<dht::Logger> logger = {});
+            const bool ssl = false, std::shared_ptr<log::Logger> logger = {});
 
     ~Request();
 
@@ -282,7 +284,7 @@ public:
 
     void set_certificate_authority(std::shared_ptr<dht::crypto::Certificate> certificate);
     void set_identity(const dht::crypto::Identity& identity);
-    void set_logger(std::shared_ptr<dht::Logger> logger);
+    void set_logger(std::shared_ptr<log::Logger> logger);
 
     /**
      * Define the HTTP header/body as per https://tools.ietf.org/html/rfc7230.
@@ -328,6 +330,8 @@ private:
 
     void build();
 
+    static std::string url_encode(std::string_view value);
+
     void init_default_headers();
     /**
      * Initialized and wraps the http_parser callbacks with our user defined callbacks.
@@ -347,7 +351,7 @@ private:
 
     mutable std::mutex mutex_;
 
-    std::shared_ptr<dht::Logger> logger_;
+    std::shared_ptr<log::Logger> logger_;
 
     restinio::http_request_header_t header_;
     std::map<restinio::http_field_t, std::string> headers_;

include/opendht/indexation/pht.h

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2022 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
  *  Author(s) : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *              Simon Désaulniers <simon.desaulniers@savoirfairelinux.com>
  *              Nicolas Reynaud <nicolas.reynaud@savoirfairelinux.com>

include/opendht/infohash.h

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2022 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
  *  Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -22,7 +22,20 @@
 #include "rng.h"
 
 #include <msgpack.hpp>
-#include <asio/ip/udp.hpp>
+#include <fmt/core.h>
+
+#ifndef _WIN32
+#include <netinet/in.h>
+#include <netdb.h>
+#ifdef __ANDROID__
+typedef uint16_t in_port_t;
+#endif
+#else
+#include <iso646.h>
+#include <ws2tcpip.h>
+typedef uint16_t sa_family_t;
+typedef uint16_t in_port_t;
+#endif
 
 #include <iostream>
 #include <iomanip>
@@ -38,7 +51,6 @@
 
 namespace dht {
 
-
 using byte = uint8_t;
 
 namespace crypto {
@@ -383,3 +395,10 @@ Hash<N>::toString() const
 }
 
 }
+
+template <size_t N>
+struct fmt::formatter<dht::Hash<N>>: formatter<string_view> {
+  constexpr auto format(const dht::Hash<N>& c, format_context& ctx) const {
+    return formatter<string_view>::format(c.to_view(), ctx);
+  }
+};

include/opendht/log.h

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2022 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
  *
  *  Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *
@@ -20,7 +20,7 @@
 #pragma once
 
 #include "def.h"
-#include "log_enable.h"
+#include "logger.h"
 
 #include <iostream>
 #include <memory>
@@ -34,42 +34,6 @@ class DhtRunner;
  */
 namespace log {
 
-/**
- * Terminal colors for logging
- */
-namespace Color {
-    enum Code {
-        FG_RED      = 31,
-        FG_GREEN    = 32,
-        FG_YELLOW   = 33,
-        FG_BLUE     = 34,
-        FG_DEFAULT  = 39,
-        BG_RED      = 41,
-        BG_GREEN    = 42,
-        BG_BLUE     = 44,
-        BG_DEFAULT  = 49
-    };
-    class Modifier {
-        const Code code;
-    public:
-        constexpr Modifier(Code pCode) : code(pCode) {}
-        friend std::ostream&
-        operator<<(std::ostream& os, const Modifier& mod) {
-            return os << "\033[" << mod.code << 'm';
-        }
-    };
-}
-
-constexpr const Color::Modifier def(Color::FG_DEFAULT);
-constexpr const Color::Modifier red(Color::FG_RED);
-constexpr const Color::Modifier yellow(Color::FG_YELLOW);
-
-/**
- * Print va_list to std::ostream (used for logging).
- */
-OPENDHT_PUBLIC void
-printLog(std::ostream &s, char const *m, va_list args);
-
 OPENDHT_PUBLIC
 std::shared_ptr<Logger> getStdLogger();
 

include/opendht/log_enable.h

@@ -1,191 +0,0 @@
-/*
- *  Copyright (C) 2014-2022 Savoir-faire Linux Inc.
- *  Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "infohash.h"
-
-#include <cstdarg>
-
-#ifndef OPENDHT_LOG
-#define OPENDHT_LOG true
-#endif
-
-namespace dht {
-
-// Logging related utility functions
-
-/**
- * Wrapper for logging methods
- */
-struct LogMethod {
-    LogMethod() = default;
-
-    LogMethod(LogMethod&& l) : func(std::move(l.func)) {}
-    LogMethod(const LogMethod& l) : func(l.func) {}
-
-    LogMethod& operator=(dht::LogMethod&& l) {
-        func = std::forward<LogMethod>(l.func);
-        return *this;
-    }
-    LogMethod& operator=(const dht::LogMethod& l) {
-        func = l.func;
-        return *this;
-    }
-
-    template<typename T>
-    explicit LogMethod(T&& t) : func(std::forward<T>(t)) {}
-
-    template<typename T>
-    LogMethod(const T& t) : func(t) {}
-
-    void operator()(char const* format, ...) const {
-        va_list args;
-        va_start(args, format);
-        func(format, args);
-        va_end(args);
-    }
-    inline void log(char const* format, va_list args) const {
-        func(format, args);
-    }
-    explicit operator bool() const {
-        return (bool)func;
-    }
-
-    void logPrintable(const uint8_t *buf, size_t buflen) const {
-        std::string buf_clean(buflen, '\0');
-        for (size_t i=0; i<buflen; i++)
-            buf_clean[i] = isprint(buf[i]) ? buf[i] : '.';
-        (*this)("%s", buf_clean.c_str());
-    }
-private:
-    std::function<void(char const*, va_list)> func;
-};
-
-struct Logger {
-    LogMethod ERR = {};
-    LogMethod WARN = {};
-    LogMethod DBG = {};
-
-    Logger() = default;
-    Logger(LogMethod&& err, LogMethod&& warn, LogMethod&& dbg)
-        : ERR(std::move(err)), WARN(std::move(warn)), DBG(std::move(dbg)) {}
-    void setFilter(const InfoHash& f) {
-        filter_ = f;
-        filterEnable_ = static_cast<bool>(filter_);
-    }
-    inline void log0(const LogMethod& logger, char const* format, va_list args) const {
-#if OPENDHT_LOG
-        if (logger and not filterEnable_)
-            logger.log(format, args);
-#endif
-    }
-    inline void log1(const LogMethod& logger, const InfoHash& f, char const* format, va_list args) const {
-#if OPENDHT_LOG
-        if (logger and (not filterEnable_ or f == filter_))
-            logger.log(format, args);
-#endif
-    }
-    inline void log2(const LogMethod& logger, const InfoHash& f1, const InfoHash& f2, char const* format, va_list args) const {
-#if OPENDHT_LOG
-        if (logger and (not filterEnable_ or f1 == filter_ or f2 == filter_))
-            logger.log(format, args);
-#endif
-    }
-    inline void d(char const* format, ...) const {
-#if OPENDHT_LOG
-        va_list args;
-        va_start(args, format);
-        log0(DBG, format, args);
-        va_end(args);
-#endif
-    }
-    inline void d(const InfoHash& f, char const* format, ...) const {
-#if OPENDHT_LOG
-        va_list args;
-        va_start(args, format);
-        log1(DBG, f, format, args);
-        va_end(args);
-#endif
-    }
-    inline void d(const InfoHash& f1, const InfoHash& f2, char const* format, ...) const {
-#if OPENDHT_LOG
-        va_list args;
-        va_start(args, format);
-        log2(DBG, f1, f2, format, args);
-        va_end(args);
-#endif
-    }
-    inline void w(char const* format, ...) const {
-#if OPENDHT_LOG
-        va_list args;
-        va_start(args, format);
-        log0(WARN, format, args);
-        va_end(args);
-#endif
-    }
-    inline void w(const InfoHash& f, char const* format, ...) const {
-#if OPENDHT_LOG
-        va_list args;
-        va_start(args, format);
-        log1(WARN, f, format, args);
-        va_end(args);
-#endif
-    }
-    inline void w(const InfoHash& f1, const InfoHash& f2, char const* format, ...) const {
-#if OPENDHT_LOG
-        va_list args;
-        va_start(args, format);
-        log2(WARN, f1, f2, format, args);
-        va_end(args);
-#endif
-    }
-    inline void e(char const* format, ...) const {
-#if OPENDHT_LOG
-        va_list args;
-        va_start(args, format);
-        log0(ERR, format, args);
-        va_end(args);
-#endif
-    }
-    inline void e(const InfoHash& f, char const* format, ...) const {
-#if OPENDHT_LOG
-        va_list args;
-        va_start(args, format);
-        log1(ERR, f, format, args);
-        va_end(args);
-#endif
-    }
-    inline void e(const InfoHash& f1, const InfoHash& f2, char const* format, ...) const {
-#if OPENDHT_LOG
-        va_list args;
-        va_start(args, format);
-        log2(ERR, f1, f2, format, args);
-        va_end(args);
-#endif
-    }
-private:
-    bool filterEnable_ {false};
-    InfoHash filter_ {};
-};
-
-}

include/opendht/logger.h

@@ -0,0 +1,118 @@
+/*
+ *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
+ *  Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "infohash.h"
+
+#include <fmt/format.h>
+#include <fmt/printf.h>
+
+#include <functional>
+#include <string_view>
+#include <cstdarg>
+
+namespace dht {
+namespace log {
+
+enum class LogLevel {
+    debug, warning, error
+};
+
+using LogMethod = std::function<void(LogLevel, std::string&&)>;
+
+struct OPENDHT_PUBLIC Logger {
+    Logger() = delete;
+    Logger(LogMethod&& l)
+        : logger(std::move(l)) {
+            if (!logger)
+                throw std::invalid_argument{"logger and loggerf must be set"};
+        }
+    void setFilter(const InfoHash& f) {
+        filter_ = f;
+        filterEnable_ = static_cast<bool>(filter_);
+    }
+    inline void log0(LogLevel level, fmt::string_view format, fmt::printf_args args) const {
+        if (not filterEnable_)
+            logger(level, fmt::vsprintf(format, args));
+    }
+    inline void log1(LogLevel level, const InfoHash& f, fmt::string_view format, fmt::printf_args args) const {
+        if (not filterEnable_ or f == filter_)
+            logger(level, fmt::vsprintf(format, args));
+    }
+    inline void log2(LogLevel level, const InfoHash& f1, const InfoHash& f2, fmt::string_view format, fmt::printf_args args) const {
+        if (not filterEnable_ or f1 == filter_ or f2 == filter_)
+            logger(level, fmt::vsprintf(format, args));
+    }
+    template<typename S, typename... Args>
+    inline void debug(S&& format, Args&&... args) const {
+        logger(LogLevel::debug, fmt::format(format, args...));
+    }
+    template<typename S, typename... Args>
+    inline void warn(S&& format, Args&&... args) const {
+        logger(LogLevel::warning, fmt::format(format, args...));
+    }
+    template<typename S, typename... Args>
+    inline void error(S&& format, Args&&... args) const {
+        logger(LogLevel::error, fmt::format(format, args...));
+    }
+    template <typename... T>
+    inline void d(fmt::format_string<T...> format, T&&... args) const {
+        log0(LogLevel::debug, format, fmt::make_printf_args(args...));
+    }
+    template <typename... T>
+    inline void d(const InfoHash& f, fmt::format_string<T...> format, T&&... args) const {
+        log1(LogLevel::debug, f, format, fmt::make_printf_args(args...));
+    }
+    template <typename... T>
+    inline void d(const InfoHash& f1, const InfoHash& f2, fmt::format_string<T...> format, T&&... args) const {
+        log2(LogLevel::debug, f1, f2, format, fmt::make_printf_args(args...));
+    }
+    template <typename... T>
+    inline void w(fmt::format_string<T...> format, T&&... args) const {
+        log0(LogLevel::warning, format, fmt::make_printf_args(args...));
+    }
+    template <typename... T>
+    inline void w(const InfoHash& f, fmt::format_string<T...> format, T&&... args) const {
+        log1(LogLevel::warning, f, format, fmt::make_printf_args(args...));
+    }
+    template <typename... T>
+    inline void w(const InfoHash& f1, const InfoHash& f2, fmt::format_string<T...> format, T&&... args) const {
+        log2(LogLevel::warning, f1, f2, format, fmt::make_printf_args(args...));
+    }
+    template <typename... T>
+    inline void e(fmt::format_string<T...> format, T&&... args) const {
+        log0(LogLevel::error, format, fmt::make_printf_args(args...));
+    }
+    template <typename... T>
+    inline void e(const InfoHash& f, fmt::format_string<T...> format, T&&... args) const {
+        log1(LogLevel::error, f, format, fmt::make_printf_args(args...));
+    }
+    template <typename... T>
+    inline void e(const InfoHash& f1, const InfoHash& f2, fmt::format_string<T...> format, T&&... args) const {
+        log2(LogLevel::error, f1, f2, format, fmt::make_printf_args(args...));
+    }
+private:
+    LogMethod logger = {};
+    bool filterEnable_ {false};
+    InfoHash filter_ {};
+};
+
+}
+using Logger = log::Logger;
+}

include/opendht/network_engine.h

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2022 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
  *  Author(s) : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *              Simon Désaulniers <simon.desaulniers@savoirfairelinux.com>
  *
@@ -19,19 +19,16 @@
 
 #pragma once
 
-#include "network_utils.h"
 #include "node_cache.h"
 #include "value.h"
 #include "infohash.h"
 #include "node.h"
+#include "scheduler.h"
 #include "utils.h"
 #include "rng.h"
 #include "rate_limiter.h"
-#include "log_enable.h"
-#include "udp_socket.h"
-
-#include <asio/strand.hpp>
-#include <asio/ip/udp.hpp>
+#include "logger.h"
+#include "network_utils.h"
 
 #include <vector>
 #include <string>
@@ -47,6 +44,10 @@ struct Request;
 struct Socket;
 struct TransId;
 
+#ifndef MSG_CONFIRM
+#define MSG_CONFIRM 0
+#endif
+
 struct NetworkConfig {
     NetId network {0};
     ssize_t max_req_per_sec {0};
@@ -216,10 +217,10 @@ public:
     NetworkEngine(
             InfoHash& myid,
             NetworkConfig config,
-            const Sp<strand>& strand,
             std::unique_ptr<DatagramSocket>&& sock,
             const Sp<Logger>& log,
             std::mt19937_64& rd,
+            Scheduler& scheduler,
             decltype(NetworkEngine::onError)&& onError,
             decltype(NetworkEngine::onNewNode)&& onNewNode,
             decltype(NetworkEngine::onReportedAddr)&& onReportedAddr,
@@ -232,9 +233,7 @@ public:
 
     ~NetworkEngine();
 
-    asio::io_context& context() const { return strand_->context(); }
-
-    const net::DatagramSocket* getSocket() const { return dht_socket.get(); };
+    net::DatagramSocket* getSocket() const { return dht_socket.get(); };
 
     void clear();
 
@@ -442,8 +441,8 @@ public:
      */
     void processMessage(const uint8_t *buf, size_t buflen, SockAddr addr);
 
-    Sp<Node> insertNode(const InfoHash& id, const SockAddr& addr) {        
-        auto n = cache.getNode(id, addr, time(), 0);
+    Sp<Node> insertNode(const InfoHash& id, const SockAddr& addr) {
+        auto n = cache.getNode(id, addr, scheduler.time(), 0);
         onNewNode(n, 0);
         return n;
     }
@@ -475,12 +474,6 @@ public:
     size_t getPartialCount() const {
         return partial_messages.size();
     }
-    /**
-     * Accessors for the common time reference used for synchronizing
-     * operations.
-     */
-    inline const time_point& time() const { return now; }
-    inline const time_point& syncTime() { return (now = clock::now()); }
 
 private:
 
@@ -506,9 +499,7 @@ private:
 
     static constexpr size_t MTU {1280};
     static constexpr size_t MAX_PACKET_VALUE_SIZE {600};
-    static constexpr size_t MAX_MESSAGE_VALUE_SIZE {16 * MTU};
-
-    static const std::string my_v;
+    static constexpr size_t MAX_MESSAGE_VALUE_SIZE {56 * 1024};
 
     void process(std::unique_ptr<ParsedMessage>&&, const SockAddr& from);
 
@@ -537,7 +528,7 @@ private:
 
 
     // basic wrapper for socket sendto function
-    asio::error_code send(const SockAddr& addr, const char *buf, size_t len, bool confirmed = false);
+    int send(const SockAddr& addr, const char *buf, size_t len, bool confirmed = false);
 
     void sendValueParts(Tid tid, const std::vector<Blob>& svals, const SockAddr& addr);
     std::vector<Blob> packValueHeader(msgpack::sbuffer&, std::vector<Sp<Value>>::const_iterator, std::vector<Sp<Value>>::const_iterator) const;
@@ -580,10 +571,9 @@ private:
     void deserializeNodes(ParsedMessage& msg, const SockAddr& from);
 
     /* DHT info */
-    Sp<strand> strand_;
     const InfoHash& myid;
     const NetworkConfig config {};
-    std::unique_ptr<DatagramSocket> dht_socket;
+    const std::unique_ptr<DatagramSocket> dht_socket;
     Sp<Logger> logger_;
     std::mt19937_64& rd;
 
@@ -591,7 +581,7 @@ private:
 
     // global limiting should be triggered by at least 8 different IPs
     using IpLimiter = RateLimiter;
-    using IpLimiterMap = std::map<SockAddr, IpLimiter, ipCmp>;
+    using IpLimiterMap = std::map<SockAddr, IpLimiter, SockAddr::ipCmp>;
     IpLimiterMap address_rate_limiter;
     RateLimiter rate_limiter;
     ssize_t limiter_maintenance {0};
@@ -602,9 +592,10 @@ private:
 
     MessageStats in_stats {}, out_stats {};
     std::set<SockAddr> blacklist {};
-    bool logIncoming_ {false};
 
-    time_point now {clock::now()};
+    Scheduler& scheduler;
+
+    bool logIncoming_ {false};
 };
 
 } /* namespace net  */

include/opendht/network_utils.h

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2022 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
  *  Author(s) : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -19,21 +19,143 @@
 
 #include "def.h"
 
-#include <asio.hpp>
-#include <chrono>
-#include <cstdint>
+#include "sockaddr.h"
+#include "utils.h"
+#include "logger.h"
+
+#ifdef _WIN32
+#include <ws2tcpip.h>
+#include <winsock2.h>
+#else
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <unistd.h>
+#endif
+
 #include <functional>
+#include <thread>
+#include <atomic>
+#include <mutex>
 #include <list>
-#include <memory>
-#include <vector>
 
 namespace dht {
 namespace net {
 
-using asio::ip::udp;
-//using time_point = std::chrono::high_resolution_clock::time_point;
-
 static const constexpr in_port_t DHT_DEFAULT_PORT = 4222;
+static const constexpr size_t RX_QUEUE_MAX_SIZE = 1024 * 64;
+static const constexpr std::chrono::milliseconds RX_QUEUE_MAX_DELAY(650);
+
+int bindSocket(const SockAddr& addr, SockAddr& bound);
+
+bool setNonblocking(int fd, bool nonblocking = true);
+
+#ifdef _WIN32
+void udpPipe(int fds[2]);
+#endif
+struct ReceivedPacket {
+    Blob data;
+    SockAddr from;
+    time_point received;
+};
+using PacketList = std::list<ReceivedPacket>;
+
+class OPENDHT_PUBLIC DatagramSocket {
+public:
+    /** A function that takes a list of new received packets and
+     *  optionally returns consumed packets for recycling.
+     **/
+    using OnReceive = std::function<PacketList(PacketList&& packets)>;
+    virtual ~DatagramSocket() {};
+
+    virtual int sendTo(const SockAddr& dest, const uint8_t* data, size_t size, bool replied) = 0;
+
+    inline void setOnReceive(OnReceive&& cb) {
+        std::lock_guard<std::mutex> lk(lock);
+        rx_callback = std::move(cb);
+    }
+
+    virtual bool hasIPv4() const = 0;
+    virtual bool hasIPv6() const = 0;
+
+    SockAddr getBound(sa_family_t family = AF_UNSPEC) const {
+        std::lock_guard<std::mutex> lk(lock);
+        return getBoundRef(family);
+    }
+    in_port_t getPort(sa_family_t family = AF_UNSPEC) const {
+        std::lock_guard<std::mutex> lk(lock);
+        return getBoundRef(family).getPort();
+    }
+
+    virtual const SockAddr& getBoundRef(sa_family_t family = AF_UNSPEC) const = 0;
+
+    /** Virtual resolver mothod allows to implement custom resolver */
+    virtual std::vector<SockAddr> resolve(const std::string& host, const std::string& service = {}) {
+        return SockAddr::resolve(host, service);
+    }
+
+    virtual void stop() = 0;
+protected:
+
+    PacketList getNewPacket() {
+        PacketList pkts;
+        if (toRecycle_.empty()) {
+            pkts.emplace_back();
+        } else {
+            auto begIt = toRecycle_.begin();
+            auto begItNext = std::next(begIt);
+            pkts.splice(pkts.end(), toRecycle_, begIt, begItNext);
+        }
+        return pkts;
+    }
+
+    inline void onReceived(PacketList&& packets) {
+        std::lock_guard<std::mutex> lk(lock);
+        if (rx_callback) {
+            auto r = rx_callback(std::move(packets));
+            if (not r.empty() and toRecycle_.size() < RX_QUEUE_MAX_SIZE)
+                toRecycle_.splice(toRecycle_.end(), std::move(r));
+        }
+    }
+protected:
+    mutable std::mutex lock;
+private:
+    OnReceive rx_callback;
+    PacketList toRecycle_;
+};
+
+class OPENDHT_PUBLIC UdpSocket : public DatagramSocket {
+public:
+    UdpSocket(in_port_t port, const std::shared_ptr<Logger>& l = {});
+    UdpSocket(const SockAddr& bind4, const SockAddr& bind6, const std::shared_ptr<Logger>& l = {});
+    ~UdpSocket();
+
+    int sendTo(const SockAddr& dest, const uint8_t* data, size_t size, bool replied) override;
+
+    const SockAddr& getBoundRef(sa_family_t family = AF_UNSPEC) const override {
+        return (family == AF_INET6) ? bound6 : bound4;
+    }
+
+    bool hasIPv4() const override {
+        std::lock_guard<std::mutex> lk(lock);
+        return s4 != -1;
+    }
+    bool hasIPv6() const override {
+        std::lock_guard<std::mutex> lk(lock);
+        return s6 != -1;
+    }
+
+    void stop() override;
+private:
+    std::shared_ptr<Logger> logger;
+    int s4 {-1};
+    int s6 {-1};
+    int stopfd {-1};
+    SockAddr bound4, bound6;
+    std::thread rcv_thread {};
+    std::atomic_bool running {false};
+
+    void openSockets(const SockAddr& bind4, const SockAddr& bind6);
+};
 
 }
 }

include/opendht/node.h

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2022 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
  *  Author(s) : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *              Simon Désaulniers <simon.desaulniers@savoirfairelinux.com>
  *
@@ -21,6 +21,7 @@
 
 #include "infohash.h" // includes socket structures
 #include "utils.h"
+#include "sockaddr.h"
 #include "node_export.h"
 
 #include <list>
@@ -49,13 +50,16 @@ struct Node {
 
     Node(const InfoHash& id, const SockAddr& addr, std::mt19937_64& rd, bool client=false);
     Node(const InfoHash& id, SockAddr&& addr, std::mt19937_64& rd, bool client=false);
-    //Node(const InfoHash& id, const sockaddr* sa, socklen_t salen, std::mt19937_64& rd)
-    //    : Node(id, SockAddr(sa, salen), rd) {}
+    Node(const InfoHash& id, const sockaddr* sa, socklen_t salen, std::mt19937_64& rd)
+        : Node(id, SockAddr(sa, salen), rd) {}
 
     const InfoHash& getId() const {
         return id;
     }
     const SockAddr& getAddr() const { return addr; }
+    std::string getAddrStr() const {
+        return addr.toString();
+    }
     bool isClient() const { return is_client; }
     bool isIncoming() { return time > reply_time; }
 
@@ -92,7 +96,7 @@ struct Node {
         ne.addr = addr;
         return ne;
     }
-    sa_family_t getFamily() const { return addr.protocol().family(); }
+    sa_family_t getFamily() const { return addr.getFamily(); }
 
     void update(const SockAddr&);
 
@@ -135,7 +139,7 @@ struct Node {
      */
     Tid getNewTid() {
         ++transaction_id;
-        return transaction_id ? ++transaction_id : transaction_id;
+        return transaction_id ? transaction_id : ++transaction_id;
     }
 
     std::string toString() const;

include/opendht/node_cache.h

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2022 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
  *  Author(s) : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify

include/opendht/node_export.h

@@ -18,9 +18,7 @@
 
 #include "def.h"
 #include "infohash.h"
-#include <asio/ip/udp.hpp>
-
-#include <string_view>
+#include "sockaddr.h"
 
 #include <string_view>
 
@@ -29,7 +27,7 @@ using namespace std::literals;
 
 struct OPENDHT_PUBLIC NodeExport {
     InfoHash id;
-    asio::ip::udp::endpoint addr;
+    SockAddr addr;
 
     template <typename Packer>
     void msgpack_pack(Packer& pk) const
@@ -38,8 +36,8 @@ struct OPENDHT_PUBLIC NodeExport {
         pk.pack("id"sv);
         pk.pack(id);
         pk.pack("addr"sv);
-        pk.pack_bin(addr.size());
-        pk.pack_bin_body((const char*)addr.data(), addr.size());
+        pk.pack_bin(addr.getLength());
+        pk.pack_bin_body((const char*)addr.get(), (size_t)addr.getLength());
     }
 
     void msgpack_unpack(msgpack::object o);

include/opendht/peer_discovery.h

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2022 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
  *  Author(s) : Mingrui Zhang <mingrui.zhang@savoirfairelinux.com>
  *              Vsevolod Ivanov <vsevolod.ivanov@savoirfairelinux.com>
  *
@@ -20,9 +20,9 @@
 #pragma once
 
 #include "def.h"
+#include "sockaddr.h"
 #include "infohash.h"
-#include "utils.h"
-#include "log_enable.h"
+#include "logger.h"
 
 #include <thread>
 
@@ -36,7 +36,7 @@ class OPENDHT_PUBLIC PeerDiscovery
 {
 public:
     static constexpr in_port_t DEFAULT_PORT = 8888;
-    using ServiceDiscoveredCallback = std::function<void(msgpack::object&&, asio::ip::udp::endpoint)>;
+    using ServiceDiscoveredCallback = std::function<void(msgpack::object&&, SockAddr&&)>;
 
     PeerDiscovery(in_port_t port = DEFAULT_PORT, std::shared_ptr<asio::io_context> ioContext = {}, std::shared_ptr<Logger> logger = {});
     ~PeerDiscovery();

include/opendht/proxy.h

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2022 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
  *  Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify

include/opendht/rate_limiter.h

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2022 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
  *  Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify

include/opendht/rng.h

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2022 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
  *  Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify

include/opendht/routing_table.h

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2022 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
  *  Author(s) : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *              Simon Désaulniers <simon.desaulniers@savoirfairelinux.com>
  *

include/opendht/scheduler.h

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2022 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
  *  Author(s) : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *              Simon Désaulniers <simon.desaulniers@savoirfairelinux.com>
  *

include/opendht/securedht.h

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2022 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
  *  Authors: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *           Simon Désaulniers <simon.desaulniers@savoirfairelinux.com>
  *           Sébastien Blin <sebastien.blin@savoirfairelinux.com>
@@ -149,6 +149,9 @@ public:
     void setLocalCertificateStore(CertificateStoreQuery&& query_method) {
         localQueryMethod_ = std::move(query_method);
     }
+    void setOnPublicAddressChanged(PublicAddressChangedCb cb) override {
+        dht_->setOnPublicAddressChanged(cb);
+    }
 
     /**
      * SecureDht to Dht proxy
@@ -204,6 +207,12 @@ public:
     std::vector<SockAddr> getPublicAddress(sa_family_t family = 0) override {
         return dht_->getPublicAddress(family);
     }
+    time_point periodic(const uint8_t *buf, size_t buflen, SockAddr sa, const time_point& now) override {
+        return dht_->periodic(buf, buflen, std::move(sa), now);
+    }
+    time_point periodic(const uint8_t *buf, size_t buflen, const sockaddr* from, socklen_t fromlen, const time_point& now) override {
+        return dht_->periodic(buf, buflen, from, fromlen, now);
+    }
     NodeStatus updateStatus(sa_family_t af) override  {
         return dht_->updateStatus(af);
     }
@@ -213,13 +222,7 @@ public:
     NodeStatus getStatus() const override {
         return dht_->getStatus();
     }
-    void addOnConnectedCallback(std::function<void()> cb) override {
-        dht_->addOnConnectedCallback(std::move(cb));
-    }
-    void addOnStateChangeCallback(StatusCallback cb) override {
-        dht_->addOnStateChangeCallback(std::move(cb));
-    }
-    const net::DatagramSocket* getSocket() const override {
+    net::DatagramSocket* getSocket() const override {
         return dht_->getSocket();
     };
     bool isRunning(sa_family_t af = 0) const override {

include/opendht/sockaddr.h

@@ -0,0 +1,325 @@
+/*
+ *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
+ *  Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "def.h"
+
+#include <fmt/core.h>
+#include <fmt/format.h>
+#include <fmt/ostream.h>
+
+#ifndef _WIN32
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#ifdef __ANDROID__
+typedef uint16_t in_port_t;
+#endif
+#else
+#include <iso646.h>
+#include <stdint.h>
+#include <winsock2.h>
+#include <ws2def.h>
+#include <ws2tcpip.h>
+typedef uint16_t sa_family_t;
+typedef uint16_t in_port_t;
+#endif
+
+#include <string>
+#include <memory>
+#include <vector>
+#include <stdexcept>
+#include <stdlib.h>
+
+#include <cstring>
+#include <cstddef>
+
+namespace dht {
+
+OPENDHT_PUBLIC void print_addr(std::ostream& os, const sockaddr* sa, socklen_t slen);
+OPENDHT_PUBLIC std::string print_addr(const sockaddr* sa, socklen_t slen);
+OPENDHT_PUBLIC std::string print_addr(const sockaddr_storage& ss, socklen_t sslen);
+
+/**
+ * A Socket Address (sockaddr*), with abstraction for IPv4, IPv6 address families.
+ */
+class OPENDHT_PUBLIC SockAddr {
+public:
+    SockAddr() {}
+    SockAddr(const SockAddr& o) {
+        set(o.get(), o.getLength());
+    }
+    SockAddr(SockAddr&& o) noexcept : addr(std::move(o.addr)), len(o.len) {
+        o.len = 0;
+    }
+
+    /**
+     * Build from existing address.
+     */
+    SockAddr(const sockaddr* sa, socklen_t length) {
+        if (length > static_cast<socklen_t>(sizeof(sockaddr_storage)))
+            throw std::runtime_error("Socket address length is too large");
+        set(sa, length);
+    }
+    SockAddr(const sockaddr* sa) {
+        socklen_t len = 0;
+        if (sa) {
+            if (sa->sa_family == AF_INET)
+                len = sizeof(sockaddr_in);
+            else if(sa->sa_family == AF_INET6)
+                len = sizeof(sockaddr_in6);
+            else
+                throw std::runtime_error("Unknown address family");
+        }
+        set(sa, len);
+    }
+
+    /**
+     * Build from an existing sockaddr_storage structure.
+     */
+    SockAddr(const sockaddr_storage& ss, socklen_t len) : SockAddr((const sockaddr*)&ss, len) {}
+
+    static std::vector<SockAddr> resolve(const std::string& host, const std::string& service = {});
+
+    bool operator<(const SockAddr& o) const {
+        if (len != o.len)
+            return len < o.len;
+        return std::memcmp((const uint8_t*)get(), (const uint8_t*)o.get(), len) < 0;
+    }
+
+    bool equals(const SockAddr& o) const {
+        return len == o.len
+            && std::memcmp((const uint8_t*)get(), (const uint8_t*)o.get(), len) == 0;
+    }
+    SockAddr& operator=(const SockAddr& o) {
+        set(o.get(), o.getLength());
+        return *this;
+    }
+    SockAddr& operator=(SockAddr&& o) {
+        len = o.len;
+        o.len = 0;
+        addr = std::move(o.addr);
+        return *this;
+    }
+
+    std::string toString() const {
+        return print_addr(get(), getLength());
+    }
+
+    /**
+     * Returns the address family or AF_UNSPEC if the address is not set.
+     */
+    sa_family_t getFamily() const { return len ? addr->sa_family : AF_UNSPEC; }
+
+    /**
+     * Resize the managed structure to the appropriate size (if needed),
+     * in which case the sockaddr structure is cleared to zero,
+     * and set the address family field (sa_family).
+     */
+    void setFamily(sa_family_t af) {
+        socklen_t new_length;
+        switch(af) {
+        case AF_INET:
+            new_length = sizeof(sockaddr_in);
+            break;
+        case AF_INET6:
+            new_length = sizeof(sockaddr_in6);
+            break;
+        default:
+            new_length = 0;
+        }
+        if (new_length != len) {
+            len = new_length;
+            if (len) addr.reset((sockaddr*)::calloc(len, 1));
+            else     addr.reset();
+        }
+        if (len)
+            addr->sa_family = af;
+    }
+
+    /**
+     * Set Network Interface to any
+     */
+    void setAny() {
+        auto family = getFamily();
+        switch(family) {
+        case AF_INET:
+            getIPv4().sin_addr.s_addr = htonl(INADDR_ANY);
+            break;
+        case AF_INET6:
+            getIPv6().sin6_addr = in6addr_any;
+            break;
+        }
+    }
+
+    /**
+     * Retreive the port (in host byte order) or 0 if the address is not
+     * of a supported family.
+     */
+    in_port_t getPort() const {
+        switch(getFamily()) {
+        case AF_INET:
+            return ntohs(getIPv4().sin_port);
+        case AF_INET6:
+            return ntohs(getIPv6().sin6_port);
+        default:
+            return 0;
+        }
+    }
+    /**
+     * Set the port. The address must be of a supported family.
+     * @param p The port in host byte order.
+     */
+    void setPort(in_port_t p) {
+        switch(getFamily()) {
+        case AF_INET:
+            getIPv4().sin_port = htons(p);
+            break;
+        case AF_INET6:
+            getIPv6().sin6_port = htons(p);
+            break;
+        }
+    }
+
+    /**
+     * Set the address part of the socket address from a numeric IP address (string representation).
+     * Family must be already set. Throws in case of parse failue.
+     */
+    void setAddress(const char* address);
+
+    /**
+     * Returns the accessible byte length at the pointer returned by #get().
+     * If zero, #get() returns null.
+     */
+    socklen_t getLength() const { return len; }
+
+    /**
+     * An address is defined to be true if its length is not zero.
+     */
+    explicit operator bool() const noexcept {
+        return len;
+    }
+
+    /**
+     * Returns the address to the managed sockaddr structure.
+     * The accessible length is returned by #getLength().
+     */
+    const sockaddr* get() const { return addr.get(); }
+
+    /**
+     * Returns the address to the managed sockaddr structure.
+     * The accessible length is returned by #getLength().
+     */
+    sockaddr* get() { return addr.get(); }
+
+    inline const sockaddr_in& getIPv4() const {
+        return *reinterpret_cast<const sockaddr_in*>(get());
+    }
+    inline const sockaddr_in6& getIPv6() const {
+        return *reinterpret_cast<const sockaddr_in6*>(get());
+    }
+    inline sockaddr_in& getIPv4() {
+        return *reinterpret_cast<sockaddr_in*>(get());
+    }
+    inline sockaddr_in6& getIPv6() {
+        return *reinterpret_cast<sockaddr_in6*>(get());
+    }
+
+    /** 
+     * Releases the ownership of the managed object, if any.
+     * The caller is responsible for deleting the object with free().
+     */
+    inline sockaddr* release() {
+        len = 0;
+        return addr.release();
+    }
+
+    /**
+     * Return true if address is a loopback IP address.
+     */
+    bool isLoopback() const;
+
+    /**
+     * Return true if address is not a public IP address.
+     */
+    bool isPrivate() const;
+
+    bool isUnspecified() const;
+
+    bool isMappedIPv4() const;
+    SockAddr getMappedIPv4();
+    SockAddr getMappedIPv6();
+
+    /**
+     * A comparator to classify IP addresses, only considering the
+     * first 64 bits in IPv6.
+     */
+    struct ipCmp {
+        bool operator()(const SockAddr& a, const SockAddr& b) const {
+            if (a.len != b.len)
+                return a.len < b.len;
+            socklen_t start, len;
+            switch(a.getFamily()) {
+                case AF_INET:
+                    start = offsetof(sockaddr_in, sin_addr);
+                    len = sizeof(in_addr);
+                    break;
+                case AF_INET6:
+                    start = offsetof(sockaddr_in6, sin6_addr);
+                    // don't consider more than 64 bits (IPv6)
+                    len = 8;
+                    break;
+                default:
+                    start = 0;
+                    len = a.len;
+                    break;
+            }
+            return std::memcmp((uint8_t*)a.get()+start,
+                               (uint8_t*)b.get()+start, len) < 0;
+        }
+    };
+    OPENDHT_PUBLIC friend std::ostream& operator<< (std::ostream& s, const SockAddr& h) {
+        print_addr(s, h.get(), h.getLength());
+        return s;
+    }
+
+private:
+    struct free_delete { void operator()(void* p) { ::free(p); } };
+    std::unique_ptr<sockaddr, free_delete> addr {};
+    socklen_t len {0};
+
+    void set(const sockaddr* sa, socklen_t length) {
+        if (len != length) {
+            len = length;
+            if (len) addr.reset((sockaddr*)::malloc(len));
+            else     addr.reset();
+        }
+        if (len)
+            std::memcpy((uint8_t*)get(), (const uint8_t*)sa, len);
+    }
+
+};
+
+OPENDHT_PUBLIC bool operator==(const SockAddr& a, const SockAddr& b);
+
+}
+
+#if FMT_VERSION >= 90000
+template <> struct fmt::formatter<dht::SockAddr> : ostream_formatter {};
+#endif

include/opendht/thread_pool.h

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2022 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
  *
  *  Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *
@@ -37,7 +37,7 @@ public:
     static ThreadPool& io();
 
     ThreadPool();
-    ThreadPool(size_t maxThreads);
+    ThreadPool(unsigned minThreads, unsigned maxThreads = 0);
     ~ThreadPool();
 
     void run(std::function<void()>&& cb);
@@ -61,7 +61,7 @@ public:
         return get(std::move(cb));
     }
 
-    void stop();
+    void stop(bool wait = true);
     void join();
 
 private:
@@ -72,7 +72,12 @@ private:
     unsigned readyThreads_ {0};
     bool running_ {true};
 
+    unsigned minThreads_;
     const unsigned maxThreads_;
+    std::chrono::steady_clock::duration threadExpirationDelay {std::chrono::minutes(5)};
+    double threadDelayRatio_ {2};
+
+    void threadEnded(std::thread&);
 };
 
 class OPENDHT_PUBLIC Executor : public std::enable_shared_from_this<Executor> {

include/opendht/udp_socket.h

@@ -1,106 +0,0 @@
-#pragma once
-
-#include <asio.hpp>
-#include <chrono>
-#include <cstdint>
-#include <functional>
-#include <memory>
-#include <vector>
-
-namespace dht {
-namespace net {
-
-using asio::ip::udp;
-using strand = asio::io_context::strand;
-
-struct ReceivedPacket {
-    std::vector<uint8_t> data;
-    udp::endpoint from;
-    //time_point received;
-};
-
-
-class DatagramSocket {
-public:
-    /** A function that takes a list of new received packets and
-     *  optionally returns consumed packets for recycling.
-     **/
-    //using OnReceive = std::function<PacketList(PacketList&& packets)>;
-    using ReceiveCallback = std::function<void(const ReceivedPacket&)>;
-
-    virtual ~DatagramSocket() {};
-
-    virtual asio::error_code sendTo(const uint8_t* data, size_t size, const udp::endpoint& dest) = 0;
-
-    virtual void setOnReceive(const ReceiveCallback& cb) = 0;/* {
-        //std::lock_guard<std::mutex> lk(lock);
-        //rx_callback = std::move(cb);
-    }*/
-
-    virtual bool hasIPv4() const = 0;
-    virtual bool hasIPv6() const = 0;
-
-    virtual udp::endpoint getBound(sa_family_t family = AF_UNSPEC) const = 0;
-    in_port_t getPort(sa_family_t family = AF_UNSPEC) const {
-        //std::lock_guard<std::mutex> lk(lock);
-        return getBound(family).port();
-    }
-
-    //virtual const udp::endpoint& getBoundRef(sa_family_t family = AF_UNSPEC) const = 0;
-
-    virtual void stop() = 0;
-/*protected:
-
-    PacketList getNewPacket() {
-        PacketList pkts;
-        if (toRecycle_.empty()) {
-            pkts.emplace_back();
-        } else {
-            auto begIt = toRecycle_.begin();
-            auto begItNext = std::next(begIt);
-            pkts.splice(pkts.end(), toRecycle_, begIt, begItNext);
-        }
-        return pkts;
-    }
-
-    inline void onReceived(PacketList&& packets) {
-        std::lock_guard<std::mutex> lk(lock);
-        if (rx_callback) {
-            auto r = rx_callback(std::move(packets));
-            if (not r.empty() and toRecycle_.size() < RX_QUEUE_MAX_SIZE)
-                toRecycle_.splice(toRecycle_.end(), std::move(r));
-        }
-    }
-protected:
-    mutable std::mutex lock;*/
-private:
-    //ReceiveCallback rx_callback;
-    //PacketList toRecycle_;
-};
-
-
-class UdpSocket : public DatagramSocket {
-public:
-    UdpSocket(std::shared_ptr<strand> strand, const udp::endpoint& ipv4_endpoint, const udp::endpoint& ipv6_endpoint);
-
-    void setOnReceive(const ReceiveCallback& callback);
-    void start_receive();
-
-    void stop();
-
-    void sendToAsync(std::vector<uint8_t> data, const udp::endpoint& to);
-    asio::error_code sendTo(const uint8_t* buf, size_t len, const udp::endpoint& to);
-
-    bool hasIPv4() const;
-    bool hasIPv6() const;
-
-    udp::endpoint getBound(sa_family_t af) const;
-private:
-    class SocketHandler;
-    //std::shared_ptr<strand> strand_;
-    std::shared_ptr<SocketHandler> ipv4_handler_;
-    std::shared_ptr<SocketHandler> ipv6_handler_;
-};
-
-}  // namespace net
-}  // namespace dht

include/opendht/utils.h

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2022 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
  *  Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -21,8 +21,6 @@
 #include "def.h"
 
 #include <msgpack.hpp>
-#include <asio/ip/address.hpp>
-#include <asio/ip/udp.hpp>
 
 #include <chrono>
 #include <random>
@@ -64,11 +62,6 @@ void erase_if(std::map<Key, Item>& map, const Condition& condition)
 OPENDHT_PUBLIC std::pair<std::string, std::string>
 splitPort(const std::string& s);
 
-inline
-std::string print_addr(const asio::ip::udp::endpoint& endpoint) {
-    return asio::ip::detail::endpoint(endpoint.address(), endpoint.port()).to_string();
-}
-
 class OPENDHT_PUBLIC DhtException : public std::runtime_error {
 public:
     DhtException(const std::string &str = "") :
@@ -189,36 +182,4 @@ inline msgpack::object* findMapValue(const msgpack::object& map, std::string_vie
     return findMapValue(map, key.data(), key.size());
 }
 
-using SockAddr = asio::ip::udp::endpoint;
-
-/**
- * A comparator to classify IP addresses, only considering the
- * first 64 bits in IPv6.
- */
-struct ipCmp {
-    bool operator()(const SockAddr& a, const SockAddr& b) const {
-        return a < b;
-        /*if (a.len != b.len)
-            return a.len < b.len;
-        socklen_t start, len;
-        switch(a.getFamily()) {
-            case AF_INET:
-                start = offsetof(sockaddr_in, sin_addr);
-                len = sizeof(in_addr);
-                break;
-            case AF_INET6:
-                start = offsetof(sockaddr_in6, sin6_addr);
-                // don't consider more than 64 bits (IPv6)
-                len = 8;
-                break;
-            default:
-                start = 0;
-                len = a.len;
-                break;
-        }
-        return std::memcmp((uint8_t*)a.get()+start,
-                            (uint8_t*)b.get()+start, len) < 0;*/
-    }
-};
-
 } // namespace dht

include/opendht/value.h

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2022 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
  *  Author(s) : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *              Simon Désaulniers <simon.desaulniers@savoirfairelinux.com>
  *
@@ -22,6 +22,7 @@
 #include "infohash.h"
 #include "crypto.h"
 #include "utils.h"
+#include "sockaddr.h"
 
 #include <msgpack.hpp>
 

meson.build

@@ -1,5 +1,5 @@
 project('opendht', 'c', 'cpp',
-    version: '2.5.5',
+    version: '2.6.0',
     default_options: [
         'cpp_std=c++17',
         'warning_level=3'
@@ -11,6 +11,7 @@ msgpack = dependency('msgpack-cxx', required : false)
 argon2 = dependency('libargon2')
 openssl = dependency('openssl', required: get_option('proxy_client'))
 jsoncpp = dependency('jsoncpp', required: get_option('proxy_client'))
+fmt = dependency('fmt')
 
 dirs=[]
 if host_machine.system() == 'freebsd'
@@ -19,7 +20,7 @@ elif host_machine.system() == 'darwin'
     dirs+='/opt/homebrew/lib'
 endif
 http_parser = meson.get_compiler('c').find_library('http_parser', dirs: dirs, required: get_option('proxy_client'))
-deps = [gnutls, nettle, msgpack, argon2, openssl, jsoncpp, http_parser]
+deps = [fmt, gnutls, nettle, msgpack, argon2, openssl, jsoncpp, http_parser]
 
 add_project_arguments('-DMSGPACK_NO_BOOST', language : 'cpp')
 add_project_arguments(['-Wno-return-type','-Wno-deprecated','-Wnon-virtual-dtor','-pedantic-errors','-fvisibility=hidden'], language : 'cpp')
@@ -77,7 +78,17 @@ if get_option('tools').enabled()
     dhtnode = executable('dhtnode', 'tools/dhtnode.cpp',
         include_directories : opendht_interface_inc,
         link_with : opendht,
-        dependencies : [readline, msgpack],
+        dependencies : [readline, msgpack, fmt],
+        install : true)
+    dhtchat = executable('dhtchat', 'tools/dhtchat.cpp',
+        include_directories : opendht_interface_inc,
+        link_with : opendht,
+        dependencies : [readline, msgpack, fmt],
+        install : true)
+    dhtscanner = executable('dhtscanner', 'tools/dhtscanner.cpp',
+        include_directories : opendht_interface_inc,
+        link_with : opendht,
+        dependencies : [readline, msgpack, fmt],
         install : true)
     if http_parser.found()
         durl = executable('durl', 'tools/durl.cpp',

python/opendht.pyx

@@ -5,7 +5,7 @@
 # distutils: libraries = opendht gnutls
 # cython: language_level=3
 #
-# Copyright (c) 2015-2022 Savoir-faire Linux Inc.
+# Copyright (c) 2015-2023 Savoir-faire Linux Inc.
 # Author(s): Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
 #            Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 #            Simon Désaulniers <sim.desaulniers@gmail.com>
@@ -42,7 +42,7 @@ cimport opendht_cpp as cpp
 
 import threading
 
-cdef inline void lookup_callback(cpp.vector[cpp.shared_ptr[cpp.IndexValue]]* values, cpp.Prefix* p, void *user_data) with gil:
+cdef inline void lookup_callback(cpp.vector[cpp.shared_ptr[cpp.IndexValue]]* values, cpp.Prefix* p, void *user_data) noexcept with gil:
     cbs = <object>user_data
     if 'lookup' in cbs and cbs['lookup']:
         vals = []
@@ -52,13 +52,13 @@ cdef inline void lookup_callback(cpp.vector[cpp.shared_ptr[cpp.IndexValue]]* val
             vals.append(v)
         cbs['lookup'](vals, p.toString())
 
-cdef inline void shutdown_callback(void* user_data) with gil:
+cdef inline void shutdown_callback(void* user_data) noexcept with gil:
     cbs = <object>user_data
     if 'shutdown' in cbs and cbs['shutdown']:
         cbs['shutdown']()
     ref.Py_DECREF(cbs)
 
-cdef inline bool get_callback(shared_ptr[cpp.Value] value, void *user_data) with gil:
+cdef inline bool get_callback(shared_ptr[cpp.Value] value, void *user_data) noexcept with gil:
     cbs = <object>user_data
     cb = cbs['get']
     f = cbs['filter'] if 'filter' in cbs else None
@@ -66,7 +66,7 @@ cdef inline bool get_callback(shared_ptr[cpp.Value] value, void *user_data) with
     pv._value = value
     return cb(pv) if not f or f(pv) else True
 
-cdef inline bool value_callback(shared_ptr[cpp.Value] value, bool expired, void *user_data) with gil:
+cdef inline bool value_callback(shared_ptr[cpp.Value] value, bool expired, void *user_data) noexcept with gil:
     cbs = <object>user_data
     cb = cbs['valcb']
     f = cbs['filter'] if 'filter' in cbs else None
@@ -74,7 +74,7 @@ cdef inline bool value_callback(shared_ptr[cpp.Value] value, bool expired, void
     pv._value = value
     return cb(pv, expired) if not f or f(pv) else True
 
-cdef inline void done_callback(bool done, cpp.vector[shared_ptr[cpp.Node]]* nodes, void *user_data) with gil:
+cdef inline void done_callback(bool done, cpp.vector[shared_ptr[cpp.Node]]* nodes, void *user_data) noexcept with gil:
     node_ids = []
     for n in deref(nodes):
         h = NodeEntry()
@@ -86,7 +86,7 @@ cdef inline void done_callback(bool done, cpp.vector[shared_ptr[cpp.Node]]* node
         cbs['done'](done, node_ids)
     ref.Py_DECREF(cbs)
 
-cdef inline void done_callback_simple(bool done, void *user_data) with gil:
+cdef inline void done_callback_simple(bool done, void *user_data) noexcept with gil:
     cbs = <object>user_data
     if 'done' in cbs and cbs['done']:
         cbs['done'](done)

python/opendht_cpp.pxd

@@ -1,4 +1,4 @@
-# Copyright (c) 2015-2022 Savoir-faire Linux Inc.
+# Copyright (c) 2015-2023 Savoir-faire Linux Inc.
 # Author(s): Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 #            Simon Désaulniers <sim.desaulniers@gmail.com>
 #

python/setup.py.in

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2022 Savoir-faire Linux Inc.
+# Copyright (C) 2014-2023 Savoir-faire Linux Inc.
 # Author: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
 # Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 #
@@ -32,17 +32,14 @@ setup(name="opendht",
       author="Adrien Béraud, Guillaume Roguez, Simon Désaulniers",
       license="GPLv3",
       classifiers=[
-          'Development Status :: 3 - Alpha',
+          'Development Status :: 5 - Production/Stable',
           'Intended Audience :: Developers',
           'Topic :: Software Development :: Libraries :: Python Modules',
           'Topic :: System :: Distributed Computing',
           'Topic :: System :: Networking'
           'License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)',
           'Programming Language :: Python :: 3',
-          'Programming Language :: Python :: 3.2',
-          'Programming Language :: Python :: 3.3',
-          'Programming Language :: Python :: 3.4',
-          'Programming Language :: Python :: 3.5',
+          'Programming Language :: Python :: 3.7',
       ],
       cmdclass = { 'build_ext' : build_ext },
       ext_modules = cythonize(Extension(

python/tools/benchmark.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-# Copyright (C) 2014-2022 Savoir-faire Linux Inc.
+# Copyright (C) 2014-2023 Savoir-faire Linux Inc.
 # Author(s): Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 #            Simon Désaulniers <sim.desaulniers@gmail.com>
 #

python/tools/dht/network.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-# Copyright (c) 2015-2022 Savoir-faire Linux Inc.
+# Copyright (c) 2015-2023 Savoir-faire Linux Inc.
 # Author(s): Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 #            Simon Désaulniers <sim.desaulniers@gmail.com>
 #

python/tools/dht/tests.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2015-2022 Savoir-Faire Linux Inc.
+# Copyright (C) 2015-2023 Savoir-Faire Linux Inc.
 # Author(s): Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 #            Simon Désaulniers <sim.desaulniers@gmail.com>
 

python/tools/dht/virtual_network_builder.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-# Copyright (c) 2015-2022 Savoir-faire Linux Inc.
+# Copyright (c) 2015-2023 Savoir-faire Linux Inc.
 # Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 #
 # This program is free software; you can redistribute it and/or modify

python/tools/dhtcluster.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-# Copyright (C) 2014-2022 Savoir-faire Linux Inc.
+# Copyright (C) 2014-2023 Savoir-faire Linux Inc.
 # Author(s): Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 #
 # This program is free software; you can redistribute it and/or modify

python/tools/http_server.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# Copyright (c) 2016-2022 Savoir-faire Linux Inc.
+# Copyright (c) 2016-2023 Savoir-faire Linux Inc.
 # Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 #
 # This program is free software; you can redistribute it and/or modify

python/tools/network_monitor.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# Copyright (c) 2015-2022 Savoir-faire Linux Inc.
+# Copyright (c) 2015-2023 Savoir-faire Linux Inc.
 # Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 #
 # This program is free software; you can redistribute it and/or modify

python/tools/pingpong.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# Copyright (c) 2015-2022 Savoir-faire Linux Inc.
+# Copyright (c) 2015-2023 Savoir-faire Linux Inc.
 # Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 #
 # This program is free software; you can redistribute it and/or modify

python/tools/scanner.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# Copyright (c) 2015-2022 Savoir-faire Linux Inc.
+# Copyright (c) 2015-2023 Savoir-faire Linux Inc.
 # Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 #
 # This program is free software; you can redistribute it and/or modify

rust/examples/dhtnode.rs

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2022 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
  *  Author: Sébastien Blin <sebastien.blin@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify

rust/src/blob.rs

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2022 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
  *  Author: Sébastien Blin <sebastien.blin@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify

rust/src/crypto.rs

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2022 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
  *  Author: Sébastien Blin <sebastien.blin@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify

rust/src/dhtrunner.rs

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2022 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
  *  Author: Sébastien Blin <sebastien.blin@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify

rust/src/ffi.rs

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2022 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
  *  Author: Sébastien Blin <sebastien.blin@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify

rust/src/infohash.rs

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2022 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
  *  Author: Sébastien Blin <sebastien.blin@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify

rust/src/lib.rs

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2022 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
  *  Author: Sébastien Blin <sebastien.blin@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify

rust/src/pkid.rs

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2022 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
  *  Author: Sébastien Blin <sebastien.blin@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify

rust/src/value.rs

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2022 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
  *  Author: Sébastien Blin <sebastien.blin@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify

src/Makefile.am

@@ -45,6 +45,7 @@ nobase_include_HEADERS = \
         ../include/opendht/scheduler.h \
         ../include/opendht/rate_limiter.h \
         ../include/opendht/utils.h \
+        ../include/opendht/sockaddr.h \
         ../include/opendht/infohash.h \
         ../include/opendht/node.h \
         ../include/opendht/value.h \
@@ -53,7 +54,7 @@ nobase_include_HEADERS = \
         ../include/opendht/dhtrunner.h \
         ../include/opendht/default_types.h \
         ../include/opendht/log.h \
-        ../include/opendht/log_enable.h \
+        ../include/opendht/logger.h \
         ../include/opendht/network_utils.h \
         ../include/opendht/rng.h \
         ../include/opendht/thread_pool.h

src/base64.cpp

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2022 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by

src/base64.h

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2022 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by

src/callbacks.cpp

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2022 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
  *  Author(s) : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify

src/compat/msvc/unistd.h

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2022 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
  *
  *  Author: Andreas Traczyk <andreas.traczyk@savoirfairelinux.com>
  *

src/compat/os_cert.cpp

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2022 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
  *  Author: Andreas Traczyk <andreas.traczyk@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -18,7 +18,7 @@
 
 #include "os_cert.h"
 
-#include "log_enable.h"
+#include "logger.h"
 
 #ifdef _WIN32
 #include <windows.h>

src/compat/os_cert.h

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2022 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
  *  Author: Andreas Traczyk <andreas.traczyk@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include "log_enable.h"
+#include "logger.h"
 
 #include <memory>
 

src/crypto.cpp

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2022 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
  *  Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *           Vsevolod Ivanov <vsevolod.ivanov@savoirfairelinux.com>
  *

src/default_types.cpp

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2022 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
  *  Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -54,7 +54,14 @@ DhtMessage::ServiceFilter(const std::string& s)
 
 std::ostream& operator<< (std::ostream& s, const IpServiceAnnouncement& v)
 {
-    s << "Peer: " << v.addr;
+    if (v.addr) {
+        s << "Peer: ";
+        s << "port " << v.getPort();
+        char hbuf[NI_MAXHOST];
+        if (getnameinfo(v.addr.get(), v.addr.getLength(), hbuf, sizeof(hbuf), nullptr, 0, NI_NUMERICHOST) == 0) {
+            s << " addr " << std::string(hbuf, strlen(hbuf));
+        }
+    }
     return s;
 }
 

src/dht_proxy_client.cpp

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2022 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
  *  Author: Sébastien Blin <sebastien.blin@savoirfairelinux.com>
  *          Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *          Vsevolod Ivanov <vsevolod.ivanov@savoirfairelinux.com>
@@ -24,8 +24,6 @@
 #include "utils.h"
 
 #include <http_parser.h>
-
-#include <asio/ip/address.hpp>
 #include <deque>
 
 
@@ -110,17 +108,18 @@ DhtProxyClient::DhtProxyClient() {}
 
 DhtProxyClient::DhtProxyClient(
         std::shared_ptr<dht::crypto::Certificate> serverCA, dht::crypto::Identity clientIdentity,
-        std::shared_ptr<asio::io_context::strand> strand, const std::string& serverHost,
+        std::function<void()> signal, const std::string& serverHost,
         const std::string& pushClientId, std::shared_ptr<dht::Logger> logger)
     : DhtInterface(logger)
     , proxyUrl_(serverHost)
     , clientIdentity_(clientIdentity), serverCertificate_(serverCA)
     , pushClientId_(pushClientId), pushSessionId_(getRandomSessionId())
-    , strand_(strand)
+    , loopSignal_(signal)
     , jsonReader_(Json::CharReaderBuilder{}.newCharReader())
 {
-    /*localAddrv4_.setFamily(AF_INET);
-    localAddrv6_.setFamily(AF_INET6);*/
+    localAddrv4_.setFamily(AF_INET);
+    localAddrv6_.setFamily(AF_INET6);
+
     jsonBuilder_["commentStyle"] = "None";
     jsonBuilder_["indentation"] = "";
     if (logger_) {
@@ -132,13 +131,13 @@ DhtProxyClient::DhtProxyClient(
                        clientIdentity_.second->toString(false/*chain*/).c_str());
     }
     // run http client
-    /*httpClientThread_ = std::thread([this](){
+    httpClientThread_ = std::thread([this](){
         try {
             if (logger_)
                 logger_->d("[proxy:client] starting io_context");
-            // Ensures the context() won't run out of work
-            auto work = asio::make_work_guard(context());
-            context().run();
+            // Ensures the httpContext_ won't run out of work
+            auto work = asio::make_work_guard(httpContext_);
+            httpContext_.run();
             if (logger_)
                 logger_->d("[proxy:client] http client io_context stopped");
         }
@@ -146,7 +145,7 @@ DhtProxyClient::DhtProxyClient(
             if (logger_)
                 logger_->e("[proxy:client] run error: %s", ex.what());
         }
-    });*/
+    });
     if (!proxyUrl_.empty())
         startProxy();
 }
@@ -160,10 +159,12 @@ DhtProxyClient::startProxy()
     if (logger_)
         logger_->d("[proxy:client] start proxy with %s", proxyUrl_.c_str());
 
-    nextProxyConfirmationTimer_ = std::make_unique<asio::steady_timer>(context(), std::chrono::steady_clock::now());
+    nextProxyConfirmationTimer_ = std::make_unique<asio::steady_timer>(httpContext_, std::chrono::steady_clock::now());
     nextProxyConfirmationTimer_->async_wait(std::bind(&DhtProxyClient::handleProxyConfirm, this, std::placeholders::_1));
 
-    listenerRestartTimer_ = std::make_unique<asio::steady_timer>(context());
+    listenerRestartTimer_ = std::make_unique<asio::steady_timer>(httpContext_);
+
+    loopSignal_();
 }
 
 void
@@ -202,8 +203,8 @@ DhtProxyClient::stop()
             for (auto& request : requests_)
                 request.second->cancel();
         }
-        if (not context().stopped())
-            context().stop();
+        if (not httpContext_.stopped())
+            httpContext_.stop();
         if (httpClientThread_.joinable())
             httpClientThread_.join();
         requests_.clear();
@@ -285,6 +286,21 @@ DhtProxyClient::isRunning(sa_family_t af) const
     }
 }
 
+time_point
+DhtProxyClient::periodic(const uint8_t*, size_t, SockAddr, const time_point& /*now*/)
+{
+    // Exec all currently stored callbacks
+    decltype(callbacks_) callbacks;
+    {
+        std::lock_guard<std::mutex> lock(lockCallbacks_);
+        callbacks = std::move(callbacks_);
+    }
+    for (auto& callback : callbacks)
+        callback();
+    callbacks.clear();
+    return time_point::max();
+}
+
 void
 DhtProxyClient::setHeaderFields(http::Request& request){
     request.set_header_field(restinio::http_field_t::accept, "*/*");
@@ -335,11 +351,15 @@ DhtProxyClient::get(const InfoHash& key, GetCallback cb, DoneCallback donecb, Va
                         values.emplace_back(std::move(value));
                 }
                 if (not values.empty() and cb) {
-                    context().post([opstate, cb, values = std::move(values)](){
-                        if (not opstate->stop.load() and not cb(values)){
-                            opstate->stop.store(true);
-                        }
-                    });
+                    {
+                        std::lock_guard<std::mutex> lock(lockCallbacks_);
+                        callbacks_.emplace_back([opstate, cb, values = std::move(values)](){
+                            if (not opstate->stop.load() and not cb(values)){
+                                opstate->stop.store(true);
+                            }
+                        });
+                    }
+                    loopSignal_();
                 }
             } catch(const std::exception& e) {
                 if (logger_)
@@ -356,10 +376,14 @@ DhtProxyClient::get(const InfoHash& key, GetCallback cb, DoneCallback donecb, Va
                     opFailed();
             }
             if (donecb) {
-                context().post([donecb, opstate](){
-                    donecb(opstate->ok, {});
-                    opstate->stop.store(true);
-                });
+                {
+                    std::lock_guard<std::mutex> lock(lockCallbacks_);
+                    callbacks_.emplace_back([donecb, opstate](){
+                        donecb(opstate->ok, {});
+                        opstate->stop.store(true);
+                    });
+                }
+                loopSignal_();
             }
             if (not isDestroying_) {
                 std::lock_guard<std::mutex> l(requestLock_);
@@ -395,7 +419,7 @@ DhtProxyClient::put(const InfoHash& key, Sp<Value> val, DoneCallback cb, time_po
         auto& search = searches_[key];
         if (val->id) {
             auto id = val->id;
-            auto refreshPutTimer = std::make_unique<asio::steady_timer>(context(), proxy::OP_TIMEOUT - proxy::OP_MARGIN);
+            auto refreshPutTimer = std::make_unique<asio::steady_timer>(httpContext_, proxy::OP_TIMEOUT - proxy::OP_MARGIN);
             refreshPutTimer->async_wait(std::bind(&DhtProxyClient::handleRefreshPut, this, std::placeholders::_1, key, id));
             search.puts.erase(id);
             search.puts.emplace(std::piecewise_construct,
@@ -409,10 +433,12 @@ DhtProxyClient::put(const InfoHash& key, Sp<Value> val, DoneCallback cb, time_po
         if (ok)
             *ok = result;
         if (cb) {
-            context().post([cb, result](){
+            std::lock_guard<std::mutex> lock(lockCallbacks_);
+            callbacks_.emplace_back([cb, result](){
                 cb(result, {});
             });
         }
+        loopSignal_();
     }, created, permanent);
 }
 
@@ -449,10 +475,10 @@ DhtProxyClient::buildRequest(const std::string& target)
     auto resolver = resolver_;
     l.unlock();
     if (not resolver)
-        resolver = std::make_shared<http::Resolver>(context(), proxyUrl_, logger_);
+        resolver = std::make_shared<http::Resolver>(httpContext_, proxyUrl_, logger_);
     auto request = target.empty()
-        ? std::make_shared<http::Request>(context(), resolver)
-        : std::make_shared<http::Request>(context(), resolver, target);
+        ? std::make_shared<http::Request>(httpContext_, resolver)
+        : std::make_shared<http::Request>(httpContext_, resolver, target);
     if (serverCertificate_)
         request->set_certificate_authority(serverCertificate_);
     if (clientIdentity_.first and clientIdentity_.second)
@@ -503,7 +529,7 @@ DhtProxyClient::doPut(const InfoHash& key, Sp<Value> val, DoneCallbackSimple cb,
                             auto it = search.pendingPuts.find(val);
                             if (it != search.pendingPuts.end()) {
                                 auto sok = std::make_shared<std::atomic_bool>(ok);
-                                auto refreshPutTimer = std::make_unique<asio::steady_timer>(context(), proxy::OP_TIMEOUT - proxy::OP_MARGIN);
+                                auto refreshPutTimer = std::make_unique<asio::steady_timer>(httpContext_, proxy::OP_TIMEOUT - proxy::OP_MARGIN);
                                 refreshPutTimer->async_wait(std::bind(&DhtProxyClient::handleRefreshPut, this, std::placeholders::_1, key, id));
                                 search.puts.emplace(std::piecewise_construct,
                                     std::forward_as_tuple(id),
@@ -610,7 +636,7 @@ DhtProxyClient::getProxyInfos()
     if (logger_)
         logger_->d("[proxy:client] [status] sending request");
 
-    auto resolver = std::make_shared<http::Resolver>(context(), proxyUrl_, logger_);
+    auto resolver = std::make_shared<http::Resolver>(httpContext_, proxyUrl_, logger_);
     queryProxyInfo(infoState, resolver, AF_INET);
     queryProxyInfo(infoState, resolver, AF_INET6);
     std::lock_guard<std::mutex> l(resolverLock_);
@@ -623,7 +649,7 @@ DhtProxyClient::queryProxyInfo(const Sp<InfoState>& infoState, const Sp<http::Re
     if (logger_)
         logger_->d("[proxy:client] [status] query ipv%i info", family == AF_INET ? 4 : 6);
     try {
-        auto request = std::make_shared<http::Request>(context(), resolver, family);
+        auto request = std::make_shared<http::Request>(httpContext_, resolver, family);
         if (serverCertificate_)
             request->set_certificate_authority(serverCertificate_);
         auto reqid = request->id();
@@ -689,33 +715,41 @@ DhtProxyClient::onProxyInfos(const Json::Value& proxyInfos, const sa_family_t fa
         if (logger_)
             logger_->e("[proxy:client] [info] request failed for %s", family == AF_INET ? "ipv4" : "ipv6");
         status = NodeStatus::Disconnected;
-        if (pubAddress != SockAddr{}) {
+        if (pubAddress) {
             pubAddress = {};
             ipChanged = true;
         }
     } else {
         if (logger_)
-            logger_->d("[proxy:client] [info] got proxy reply for %s",
+            logger_->debug("[proxy:client] [info] got proxy reply for {}",
                        family == AF_INET ? "ipv4" : "ipv6");
         try {
             myid = InfoHash(proxyInfos["node_id"].asString());
             stats4_ = NodeStats(proxyInfos["ipv4"]);
             stats6_ = NodeStats(proxyInfos["ipv6"]);
             auto publicIp = parsePublicAddress(proxyInfos["public_ip"]);
-            ipChanged = pubAddress != SockAddr{} && pubAddress != publicIp;
+            ipChanged = pubAddress && pubAddress.toString() != publicIp.toString();
+            bool pub = ipChanged || !pubAddress;
             pubAddress = publicIp;
 
             if (proxyInfos.isMember("local_ip")) {
                 std::string localIp = proxyInfos["local_ip"].asString();
-                auto localAddr = asio::ip::make_address(localIp);
-                if (localAddr != localAddress.address()) {
-                    localAddress = SockAddr(localAddr, localAddress.port());
-                    ipChanged = localAddress != SockAddr{};
-                }
-                /*if (localAddress.toString() != localIp) {
+                if (localAddress.toString() != localIp) {
                     localAddress.setAddress(localIp.c_str());
-                    ipChanged = localAddress != SockAddr{};
-                }*/
+                    ipChanged = (bool)localAddress;
+                }
+            }
+
+            if (pub && publicAddressChangedCb_) {
+                std::vector<SockAddr> addresses;
+                if (publicAddressV4_)
+                    addresses.emplace_back(publicAddressV4_);
+                if (publicAddressV6_)
+                    addresses.emplace_back(publicAddressV6_);
+                std::lock_guard<std::mutex> lock(lockCallbacks_);
+                callbacks_.emplace_back([cb=publicAddressChangedCb_, addresses = std::move(addresses)](){
+                    cb(std::move(addresses));
+                });
             }
 
             if (!ipChanged && stats4_.good_nodes + stats6_.good_nodes)
@@ -731,16 +765,14 @@ DhtProxyClient::onProxyInfos(const Json::Value& proxyInfos, const sa_family_t fa
         }
     }
     auto newStatus = std::max(statusIpv4_, statusIpv6_);
-    if (newStatus != oldStatus) {
-        onStateChanged();
-    }
     if (newStatus == NodeStatus::Connected) {
         if (oldStatus == NodeStatus::Disconnected || oldStatus == NodeStatus::Connecting || launchConnectedCbs_) {
             launchConnectedCbs_ = false;
             listenerRestartTimer_->expires_at(std::chrono::steady_clock::now());
             listenerRestartTimer_->async_wait(std::bind(&DhtProxyClient::restartListeners, this, std::placeholders::_1));
             if (not onConnectCallbacks_.empty()) {
-                context().post([cbs = std::move(onConnectCallbacks_)]() mutable {
+                std::lock_guard<std::mutex> lock(lockCallbacks_);
+                callbacks_.emplace_back([cbs = std::move(onConnectCallbacks_)]() mutable {
                     while (not cbs.empty()) {
                         cbs.front()();
                         cbs.pop();
@@ -758,25 +790,18 @@ DhtProxyClient::onProxyInfos(const Json::Value& proxyInfos, const sa_family_t fa
         nextProxyConfirmationTimer_->expires_at(next);
         nextProxyConfirmationTimer_->async_wait(std::bind(&DhtProxyClient::handleProxyConfirm, this, std::placeholders::_1));
     }
+    l.unlock();
+    loopSignal_();
 }
 
-void
-DhtProxyClient::onStateChanged(){
-    for (auto& cb : onStateChangeCallbacks_)
-        cb(DhtNodeStatus{statusIpv4_, statusIpv6_});
-}
-
-
 SockAddr
 DhtProxyClient::parsePublicAddress(const Json::Value& val)
 {
     auto public_ip = val.asString();
     auto hostAndService = splitPort(public_ip);
-    auto sa = asio::ip::make_address(hostAndService.first);
-    if (sa == asio::ip::address{}) return {};
-    if (sa.is_v6() and sa.to_v6().is_v4_mapped())
-        return SockAddr(asio::ip::make_address_v4(asio::ip::v4_mapped, sa.to_v6()), 0);
-    return SockAddr(sa, 0);
+    auto sa = SockAddr::resolve(hostAndService.first);
+    if (sa.empty()) return {};
+    return sa.front().getMappedIPv4();
 }
 
 std::vector<SockAddr>
@@ -784,8 +809,8 @@ DhtProxyClient::getPublicAddress(sa_family_t family)
 {
     std::lock_guard<std::mutex> l(lockCurrentProxyInfos_);
     std::vector<SockAddr> result;
-    if (publicAddressV6_ != SockAddr{} && family != AF_INET) result.emplace_back(publicAddressV6_);
-    if (publicAddressV4_ != SockAddr{} && family != AF_INET6) result.emplace_back(publicAddressV4_);
+    if (publicAddressV6_ && family != AF_INET) result.emplace_back(publicAddressV6_);
+    if (publicAddressV4_ && family != AF_INET6) result.emplace_back(publicAddressV4_);
     return result;
 }
 
@@ -845,7 +870,7 @@ DhtProxyClient::listen(const InfoHash& key, ValueCallback cb, Value::Filter filt
              * (if the proxy crash for any reason)
              */
             if (!l->second.refreshSubscriberTimer)
-                l->second.refreshSubscriberTimer = std::make_unique<asio::steady_timer>(context());
+                l->second.refreshSubscriberTimer = std::make_unique<asio::steady_timer>(httpContext_);
             l->second.refreshSubscriberTimer->expires_at(std::chrono::steady_clock::now() +
                                                          proxy::OP_TIMEOUT - proxy::OP_MARGIN);
             l->second.refreshSubscriberTimer->async_wait(std::bind(&DhtProxyClient::handleResubscribe, this,
@@ -912,7 +937,7 @@ DhtProxyClient::cancelListen(const InfoHash& key, size_t gtoken)
 
     // define real cancel listen only once
     if (not it->second.opExpirationTimer)
-        it->second.opExpirationTimer = std::make_unique<asio::steady_timer>(context(), ops.getExpiration());
+        it->second.opExpirationTimer = std::make_unique<asio::steady_timer>(httpContext_, ops.getExpiration());
     else
         it->second.opExpirationTimer->expires_at(ops.getExpiration());
     it->second.opExpirationTimer->async_wait(std::bind(&DhtProxyClient::handleExpireListener, this, std::placeholders::_1, key));
@@ -1044,10 +1069,14 @@ DhtProxyClient::sendListen(const restinio::http_request_header_t& header,
                     auto value = std::make_shared<Value>(json);
                     if (cb){
                         auto expired = json.get("expired", Json::Value(false)).asBool();
-                        context().post([cb, value, opstate, expired]() {
-                            if (not opstate->stop.load() and not cb({value}, expired, system_clock::time_point::min()))
-                                opstate->stop.store(true);
-                        });
+                        {
+                            std::lock_guard<std::mutex> lock(lockCallbacks_);
+                            callbacks_.emplace_back([cb, value, opstate, expired]() {
+                                if (not opstate->stop.load() and not cb({value}, expired, system_clock::time_point::min()))
+                                    opstate->stop.store(true);
+                            });
+                        }
+                        loopSignal_();
                     }
                 }
             } catch(const std::exception& e) {
@@ -1095,6 +1124,7 @@ DhtProxyClient::opFailed()
         statusIpv6_ = NodeStatus::Disconnected;
     }
     getConnectivityStatus();
+    loopSignal_();
 }
 
 void
@@ -1130,7 +1160,7 @@ DhtProxyClient::restartListeners(const asio::error_code &ec)
                 *ok = result;
             }, time_point::max(), true);
             if (!put.second.refreshPutTimer) {
-                put.second.refreshPutTimer = std::make_unique<asio::steady_timer>(context());
+                put.second.refreshPutTimer = std::make_unique<asio::steady_timer>(httpContext_);
             }
             put.second.refreshPutTimer->expires_at(std::chrono::steady_clock::now() + proxy::OP_TIMEOUT - proxy::OP_MARGIN);
             put.second.refreshPutTimer->async_wait(std::bind(&DhtProxyClient::handleRefreshPut, this,
@@ -1176,7 +1206,7 @@ DhtProxyClient::restartListeners(const asio::error_code &ec)
 }
 
 void
-DhtProxyClient::pushNotificationReceived(const std::map<std::string, std::string>& notification)
+DhtProxyClient::pushNotificationReceived([[maybe_unused]] const std::map<std::string, std::string>& notification)
 {
 #ifdef OPENDHT_PUSH_NOTIFICATIONS
     {
@@ -1188,6 +1218,7 @@ DhtProxyClient::pushNotificationReceived(const std::map<std::string, std::string
         statusIpv4_ = NodeStatus::Connected;
         statusIpv6_ = NodeStatus::Connected;
     }
+    auto launchLoop = false;
     try {
         auto sessionId = notification.find("s");
         if (sessionId != notification.end() and sessionId->second != pushSessionId_) {
@@ -1206,7 +1237,7 @@ DhtProxyClient::pushNotificationReceived(const std::map<std::string, std::string
                 auto vid = std::stoull(vidIt->second);
                 auto& put = search.puts.at(vid);
                 if (!put.refreshPutTimer)
-                    put.refreshPutTimer = std::make_unique<asio::steady_timer>(context(), std::chrono::steady_clock::now());
+                    put.refreshPutTimer = std::make_unique<asio::steady_timer>(httpContext_, std::chrono::steady_clock::now());
                 else
                     put.refreshPutTimer->expires_at(std::chrono::steady_clock::now());
                 put.refreshPutTimer->async_wait(std::bind(&DhtProxyClient::handleRefreshPut, this, std::placeholders::_1, key, vid));
@@ -1248,19 +1279,23 @@ DhtProxyClient::pushNotificationReceived(const std::map<std::string, std::string
                         getline(ss, substr, ',');
                         ids.emplace_back(std::stoull(substr));
                     }
-                    context().post([this, key, token, opstate, ids, sendTime]() {
-                        if (opstate->stop)
-                            return;
-                        std::lock_guard<std::mutex> lock(searchLock_);
-                        auto s = searches_.find(key);
-                        if (s == searches_.end())
-                            return;
-                        auto l = s->second.listeners.find(token);
-                        if (l == s->second.listeners.end())
-                            return;
-                        if (not opstate->stop and not l->second.cache.onValuesExpired(ids, sendTime))
-                            opstate->stop = true;
-                    });
+                    {
+                        std::lock_guard<std::mutex> lockCb(lockCallbacks_);
+                        callbacks_.emplace_back([this, key, token, opstate, ids, sendTime]() {
+                            if (opstate->stop)
+                                return;
+                            std::lock_guard<std::mutex> lock(searchLock_);
+                            auto s = searches_.find(key);
+                            if (s == searches_.end())
+                                return;
+                            auto l = s->second.listeners.find(token);
+                            if (l == s->second.listeners.end())
+                                return;
+                            if (not opstate->stop and not l->second.cache.onValuesExpired(ids, sendTime))
+                                opstate->stop = true;
+                        });
+                    }
+                    launchLoop = true;
                 }
             }
         }
@@ -1268,13 +1303,13 @@ DhtProxyClient::pushNotificationReceived(const std::map<std::string, std::string
         if (logger_)
             logger_->e("[proxy:client] [push] receive error: %s", e.what());
     }
-#else
-    (void) notification;
+    if (launchLoop)
+        loopSignal_();
 #endif
 }
 
 void
-DhtProxyClient::resubscribe(const InfoHash& key, const size_t token, Listener& listener)
+DhtProxyClient::resubscribe([[maybe_unused]] const InfoHash& key, [[maybe_unused]] const size_t token, [[maybe_unused]] Listener& listener)
 {
 #ifdef OPENDHT_PUSH_NOTIFICATIONS
     if (deviceKey_.empty())
@@ -1290,7 +1325,7 @@ DhtProxyClient::resubscribe(const InfoHash& key, const size_t token, Listener& l
     header.method(restinio::http_method_subscribe());
     header.request_target("/" + key.toString());
     if (!listener.refreshSubscriberTimer){
-        listener.refreshSubscriberTimer = std::make_unique<asio::steady_timer>(context());
+        listener.refreshSubscriberTimer = std::make_unique<asio::steady_timer>(httpContext_);
     }
     listener.refreshSubscriberTimer->expires_at(std::chrono::steady_clock::now() +
                                                 proxy::OP_TIMEOUT - proxy::OP_MARGIN);
@@ -1298,9 +1333,6 @@ DhtProxyClient::resubscribe(const InfoHash& key, const size_t token, Listener& l
                                                 std::placeholders::_1, key, token, opstate));
     auto vcb = listener.cb;
     sendListen(header, vcb, opstate, listener, ListenMethod::RESUBSCRIBE);
-#else
-    (void) key;
-    (void) listener;
 #endif
 }
 

src/dht_proxy_server.cpp

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2022 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
  *  Author: Sébastien Blin <sebastien.blin@savoirfairelinux.com>
  *          Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *          Vsevolod Ivanov <vsevolod.ivanov@savoirfairelinux.com>
@@ -279,7 +279,7 @@ DhtProxyServer::DhtProxyServer(const std::shared_ptr<DhtRunner>& dht,
             ioContext_,
             std::forward<restinio::run_on_this_thread_settings_t<RestRouterTraitsTls>>(std::move(settings))
         );
-        // run https server
+        // run http server
         serverThread_ = std::thread([this]{
             httpsServer_->open_async([]{/*ok*/}, [](std::exception_ptr ex){
                 std::rethrow_exception(ex);
@@ -466,17 +466,8 @@ DhtProxyServer::io_context() const
     return *ioContext_;
 }
 
-void
-DhtProxyServer::stop()
+DhtProxyServer::~DhtProxyServer()
 {
-    if (logger_)
-        logger_->d("[proxy:server] closing http server");
-    ioContext_->stop();
-    if (serverThread_.joinable())
-        serverThread_.join();
-    if (logger_)
-        logger_->d("[proxy:server] http server closed");
-
     if (not persistPath_.empty()) {
         if (logger_)
             logger_->d("Saving proxy state to %.*s", (int)persistPath_.size(), persistPath_.c_str());
@@ -504,13 +495,13 @@ DhtProxyServer::stop()
         pushListeners_.clear();
 #endif
     }
-}
-
-DhtProxyServer::~DhtProxyServer()
-{
+    if (logger_)
+        logger_->d("[proxy:server] closing http server");
     ioContext_->stop();
     if (serverThread_.joinable())
         serverThread_.join();
+    if (logger_)
+        logger_->d("[proxy:server] http server closed");
 }
 
 template< typename ServerSettings >
@@ -1062,7 +1053,7 @@ DhtProxyServer::handleCancelPushListen(const asio::error_code &ec, const std::st
 void
 DhtProxyServer::sendPushNotification(const std::string& token, Json::Value&& json, PushType type, bool highPriority, const std::string& topic)
 {
-    if (pushServer_.empty())
+    if (pushServer_.empty() && type != PushType::UnifiedPush)
         return;
 
     unsigned reqid = 0;
@@ -1104,12 +1095,14 @@ DhtProxyServer::sendPushNotification(const std::string& token, Json::Value&& jso
                 notification["expiration"] = exp;
                 if (!topic.empty())
                     notification["topic"] = topic;
-                if (highPriority) {
+                auto isResubscribe = !notification["data"]["timeout"].isNull();
+                if (highPriority || isResubscribe) {
                     Json::Value alert(Json::objectValue);
                     alert["title"]="hello";
                     notification["push_type"] = "alert";
                     notification["alert"] = alert;
                     notification["mutable_content"] = true;
+                    notification["priority"] = "high";
                 } else {
                     notification["push_type"] = "background";
                     notification["content_available"] = true;

src/dhtrunner.cpp

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2022 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
  *  Authors: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *           Simon Désaulniers <simon.desaulniers@savoirfairelinux.com>
  *           Sébastien Blin <sebastien.blin@savoirfairelinux.com>
@@ -24,6 +24,7 @@
 
 #include "dhtrunner.h"
 #include "securedht.h"
+#include "network_utils.h"
 #ifdef OPENDHT_PEER_DISCOVERY
 #include "peer_discovery.h"
 #endif
@@ -64,22 +65,24 @@ DhtRunner::~DhtRunner()
 void
 DhtRunner::run(in_port_t port, Config& config, Context&& context)
 {
-    config.bind4 = {asio::ip::address_v4::any(), port};
-    config.bind6 = {asio::ip::address_v6::any(), port};
+    config.bind4.setFamily(AF_INET);
+    config.bind4.setPort(port);
+    config.bind6.setFamily(AF_INET6);
+    config.bind6.setPort(port);
     run(config, std::move(context));
 }
 
 void
 DhtRunner::run(const char* ip4, const char* ip6, const char* service, Config& config, Context&& context)
 {
-    auto s = asio::ip::udp::resolver::query(service);
-    asio::ip::udp::resolver resolver(*context.ioContext);
-    auto res4 = resolver.resolve(ip4, service);
-    auto res6 = resolver.resolve(ip6, service);
-    if (not res4.empty())
-        config.bind4 = std::move(*res4.begin());
-    if (not res6.empty())
-        config.bind6 = std::move(*res6.begin());
+    auto res4 = SockAddr::resolve(ip4, service);
+    auto res6 = SockAddr::resolve(ip6, service);
+    if (res4.empty())
+        res4.emplace_back();
+    if (res6.empty())
+        res6.emplace_back();
+    config.bind4 = std::move(res4.front());
+    config.bind6 = std::move(res6.front());
     run(config, std::move(context));
 }
 
@@ -90,32 +93,38 @@ DhtRunner::run(const Config& config, Context&& context)
     auto expected = State::Idle;
     if (not running.compare_exchange_strong(expected, State::Running)) {
         if (context.logger)
-            context.logger->w("[runner %p] Node is already running. Call join() first before calling run() again.", this);
+            context.logger->w("[runner %p] Node is already running. Call join() first before calling run() again.", fmt::ptr(this));
         return;
     }
 
     try {
         auto local4 = config.bind4;
         auto local6 = config.bind6;
+        if (not local4 and not local6) {
+            if (context.logger)
+                context.logger->w("[runner %p] No address to bind specified in the configuration, using default addresses", fmt::ptr(this));
+            local4.setFamily(AF_INET);
+            local6.setFamily(AF_INET6);
+        }
         auto state_path = config.dht_config.node_config.persist_path;
         if (not state_path.empty())
             state_path += "_port.txt";
-        if (not state_path.empty() && (local4.port() == 0 || local6.port() == 0)) {
+        if (not state_path.empty() && (local4.getPort() == 0 || local6.getPort() == 0)) {
             std::ifstream inConfig(state_path);
             if (inConfig.is_open()) {
                 in_port_t port;
                 if (inConfig >> port) {
-                    if (local4.port() == 0) {
+                    if (local4.getPort() == 0) {
                         if (context.logger)
-                            context.logger->d("[runner %p] Using IPv4 port %hu from saved configuration", this, port);
-                        local4.port(port);
+                            context.logger->d("[runner %p] Using IPv4 port %hu from saved configuration", fmt::ptr(this), port);
+                        local4.setPort(port);
                     }
                 }
                 if (inConfig >> port) {
-                    if (local6.port() == 0) {
+                    if (local6.getPort() == 0) {
                         if (context.logger)
-                            context.logger->d("[runner %p] Using IPv6 port %hu from saved configuration", this, port);
-                        local6.port(port);
+                            context.logger->d("[runner %p] Using IPv6 port %hu from saved configuration", fmt::ptr(this), port);
+                        local6.setPort(port);
                     }
                 }
             }
@@ -123,7 +132,7 @@ DhtRunner::run(const Config& config, Context&& context)
 
         if (context.logger) {
             logger_ = context.logger;
-            logger_->d("[runner %p] state changed to Running", this);
+            logger_->d("[runner %p] state changed to Running", fmt::ptr(this));
         }
 
 #ifdef OPENDHT_PROXY_CLIENT
@@ -131,24 +140,34 @@ DhtRunner::run(const Config& config, Context&& context)
         identityAnnouncedCb_ = context.identityAnnouncedCb;
 #endif
 
-        if (not context.ioContext)
-            context.ioContext.reset(new asio::io_context);
-
-        ioContext_ = context.ioContext;
-        strand_ = std::make_shared<asio::io_context::strand>(asio::io_context::strand(*ioContext_));
-
         if (config.proxy_server.empty()) {
             if (not context.sock) {
-                //if (context.logger)
-                //    context.logger->d("[runner %p] Creating new socket with local addresses %s and %s", this, local4.toString().c_str(), local6.toString().c_str());
-                context.sock.reset(new net::UdpSocket(strand_, local4, local6/*, context.logger*/));
+                context.sock.reset(new net::UdpSocket(local4, local6, context.logger));
             }
+            context.sock->setOnReceive([&] (net::PacketList&& pkts) {
+                net::PacketList ret;
+                {
+                    std::lock_guard<std::mutex> lck(sock_mtx);
+                    rcv.splice(rcv.end(), std::move(pkts));
+                    size_t dropped = 0;
+                    while (rcv.size() > net::RX_QUEUE_MAX_SIZE) {
+                        rcv.pop_front();
+                        dropped++;
+                    }
+                    if (dropped and logger_) {
+                        logger_->w("[runner %p] dropped %zu packets: queue is full!", fmt::ptr(this), dropped);
+                    }
+                    ret = std::move(rcv_free);
+                }
+                cv.notify_all();
+                return ret;
+            });
             if (not state_path.empty()) {
                 std::ofstream outConfig(state_path);
-                outConfig << context.sock->getPort(AF_INET) << std::endl;
-                outConfig << context.sock->getPort(AF_INET6) << std::endl;
+                outConfig << context.sock->getBoundRef(AF_INET).getPort() << std::endl;
+                outConfig << context.sock->getBoundRef(AF_INET6).getPort() << std::endl;
             }
-            auto dht = std::make_unique<Dht>(strand_, std::move(context.sock), SecureDht::getConfig(config.dht_config), context.logger);
+            auto dht = std::make_unique<Dht>(std::move(context.sock), SecureDht::getConfig(config.dht_config), context.logger);
             dht_ = std::make_unique<SecureDht>(std::move(dht), config.dht_config, std::move(context.identityAnnouncedCb), context.logger);
         } else {
             enableProxy(true);
@@ -161,40 +180,45 @@ DhtRunner::run(const Config& config, Context&& context)
         throw;
     }
 
-    dht_->addOnStateChangeCallback([this](const DhtNodeStatus& status){
-        if (status.get() != NodeStatus::Connecting) {
-            auto pending = std::move(pending_ops);
-            while (not pending.empty()) {
-                pending.front()(*dht_);
-                pending.pop();
-            }
-        }
-    });
-
     if (context.statusChangedCallback) {
-        if (logger_)
-            logger_->d("[dhtrunner] starting io_context");
-        dht_->addOnStateChangeCallback(std::move(context.statusChangedCallback));
+        statusCb = std::move(context.statusChangedCallback);
     }
     if (context.certificateStore) {
         dht_->setLocalCertificateStore(std::move(context.certificateStore));
     }
+    if (context.publicAddressChangedCb) {
+        dht_->setOnPublicAddressChanged(std::move(context.publicAddressChangedCb));
+    }
 
     if (not config.threaded)
         return;
     dht_thread = std::thread([this]() {
-        try {
-            if (logger_)
-                logger_->d("[dhtrunner] starting io_context");
-            // Ensures the context won't run out of work
-            auto work = asio::make_work_guard(*ioContext_);
-            ioContext_->run();
-            if (logger_)
-                logger_->d("[dhtrunner] io_context stopped");
-        }
-        catch(const std::exception& ex){
-            if (logger_)
-                logger_->e("[dhtrunner] run error: %s", ex.what());
+        while (running != State::Idle) {
+            std::unique_lock<std::mutex> lk(dht_mtx);
+            time_point wakeup = loop_();
+
+            auto hasJobToDo = [this]() {
+                if (running == State::Idle)
+                    return true;
+                {
+                    std::lock_guard<std::mutex> lck(sock_mtx);
+                    if (not rcv.empty())
+                        return true;
+                }
+                {
+                    std::lock_guard<std::mutex> lck(storage_mtx);
+                    if (not pending_ops_prio.empty())
+                        return true;
+                    auto s = getStatus();
+                    if (not pending_ops.empty() and (s == NodeStatus::Connected or s == NodeStatus::Disconnected))
+                        return true;
+                }
+                return false;
+            };
+            if (wakeup == time_point::max())
+                cv.wait(lk, hasJobToDo);
+            else
+                cv.wait_until(lk, wakeup, hasJobToDo);
         }
     });
 
@@ -213,7 +237,7 @@ DhtRunner::run(const Config& config, Context&& context)
         auto netId = config.dht_config.node_config.network;
         if (config.peer_discovery) {
             peerDiscovery_->startDiscovery<NodeInsertionPack>(PEER_DISCOVERY_DHT_SERVICE, [this, netId](NodeInsertionPack&& v, SockAddr&& addr){
-                addr.port(v.port);
+                addr.setPort(v.port);
                 if (v.nodeId != dht_->getNodeId() && netId == v.net){
                     bootstrap(v.nodeId, addr);
                 }
@@ -226,16 +250,14 @@ DhtRunner::run(const Config& config, Context&& context)
             adc.nodeId = dht_->getNodeId();
             if (auto socket = dht_->getSocket()) {
                 // IPv4
-                const auto& bound4 = socket->getBound(AF_INET);
-                if (bound4 != asio::ip::udp::endpoint{}) {
-                    adc.port = bound4.port();
+                if (const auto& bound4 = socket->getBoundRef(AF_INET)) {
+                    adc.port = bound4.getPort();
                     msgpack::pack(sbuf_node, adc);
                     peerDiscovery_->startPublish(AF_INET, PEER_DISCOVERY_DHT_SERVICE, sbuf_node);
                 }
                 // IPv6
-                const auto& bound6 = socket->getBound(AF_INET6);
-                if (bound6 != asio::ip::udp::endpoint{}) {
-                    adc.port = bound6.port();
+                if (const auto& bound6 = socket->getBoundRef(AF_INET6)) {
+                    adc.port = bound6.getPort();
                     sbuf_node.clear();
                     msgpack::pack(sbuf_node, adc);
                     peerDiscovery_->startPublish(AF_INET6, PEER_DISCOVERY_DHT_SERVICE, sbuf_node);
@@ -248,46 +270,31 @@ DhtRunner::run(const Config& config, Context&& context)
 
 void
 DhtRunner::shutdown(ShutdownCallback cb, bool stop) {
-    //std::unique_lock<std::mutex> lck(storage_mtx);
+    std::unique_lock<std::mutex> lck(storage_mtx);
     auto expected = State::Running;
     if (not running.compare_exchange_strong(expected, State::Stopping)) {
         if (expected == State::Stopping and ongoing_ops) {
             if (cb)
                 shutdownCallbacks_.emplace_back(std::move(cb));
-                //asio::post(*ioContext_, [cb] { cb(); });
-                // ioContext_->post([cb] { cb(); });
         }
         else if (cb) {
+            lck.unlock();
             cb();
         }
         return;
     }
     if (logger_)
-        logger_->d("[runner %p] state changed to Stopping, %zu ongoing ops", this, ongoing_ops.load());
+        logger_->d("[runner %p] state changed to Stopping, %zu ongoing ops", fmt::ptr(this), ongoing_ops.load());
     ongoing_ops++;
     shutdownCallbacks_.emplace_back(std::move(cb));
-    post([=]() mutable {
+    pending_ops.emplace([=](SecureDht&) mutable {
         auto onShutdown = [this]{ opEnded(); };
         if (dht_)
             dht_->shutdown(onShutdown, stop);
         else
             opEnded();
     });
-    //cv.notify_all();
-}
-
-void
-DhtRunner::postOp(std::function<void(SecureDht&)>&& op, bool prio) {
-    ongoing_ops++;
-    /*if (prio)
-        ioContext_->post(asio::bind_executor(*strand_, std::move(op)));
-    else*/
-        ioContext_->post(asio::bind_executor(*strand_, [this, prio, op=std::move(op)]{
-            if (dht_ && (prio || dht_->getStatus() != NodeStatus::Connecting))
-                op(*dht_);
-            else
-                pending_ops.emplace(std::move(op));
-        }));
+    cv.notify_all();
 }
 
 void
@@ -316,6 +323,7 @@ bool
 DhtRunner::checkShutdown() {
     decltype(shutdownCallbacks_) cbs;
     {
+        std::lock_guard<std::mutex> lck(storage_mtx);
         if (running != State::Stopping or ongoing_ops)
             return false;
         cbs = std::move(shutdownCallbacks_);
@@ -337,29 +345,31 @@ DhtRunner::join()
         if (peerDiscovery_)
             peerDiscovery_->stop();
 #endif
-        /*if (dht_)
+        if (dht_)
             if (auto sock = dht_->getSocket())
-                sock->stop();*/
+                sock->stop();
         if (logger_)
-            logger_->d("[runner %p] state changed to Idle", this);
+            logger_->d("[runner %p] state changed to Idle", fmt::ptr(this));
     }
 
-    if (dht_thread.joinable()) {
-        ioContext_->stop();
+    if (dht_thread.joinable())
         dht_thread.join();
-    }
 
     {
         std::lock_guard<std::mutex> lck(storage_mtx);
         if (ongoing_ops and logger_) {
-            logger_->w("[runner %p] stopping with %zu remaining ops", this, ongoing_ops.load());
+            logger_->w("[runner %p] stopping with %zu remaining ops", fmt::ptr(this), ongoing_ops.load());
         }
+        pending_ops = decltype(pending_ops)();
+        pending_ops_prio = decltype(pending_ops_prio)();
         ongoing_ops = 0;
         shutdownCallbacks_.clear();
     }
     {
         std::lock_guard<std::mutex> lck(dht_mtx);
         resetDht();
+        status4 = NodeStatus::Disconnected;
+        status6 = NodeStatus::Disconnected;
     }
 }
 
@@ -377,7 +387,7 @@ DhtRunner::getBoundPort(sa_family_t af) const {
     std::lock_guard<std::mutex> lck(dht_mtx);
     if (dht_)
         if (auto sock = dht_->getSocket())
-            return sock->getBound(af).port();
+            return sock->getPort(af);
     return 0;
 }
 
@@ -447,12 +457,6 @@ DhtRunner::setLogger(const Sp<Logger>& logger) {
         dht_->setLogger(logger);
 }
 
-void
-DhtRunner::setLoggers(LogMethod error, LogMethod warn, LogMethod debug) {
-    Logger logger {std::move(error), std::move(warn), std::move(debug)};
-    setLogger(logger);
-}
-
 void
 DhtRunner::setLogFilter(const InfoHash& f) {
     std::lock_guard<std::mutex> lck(dht_mtx);
@@ -505,8 +509,8 @@ DhtRunner::getNodeInfo() const {
         info.ipv4 = dht_->getNodesStats(AF_INET);
         info.ipv6 = dht_->getNodesStats(AF_INET6);
         if (auto sock = dht_->getSocket()) {
-            info.bound4 = sock->getBound(AF_INET).port();
-            info.bound6 = sock->getBound(AF_INET6).port();
+            info.bound4 = sock->getBoundRef(AF_INET).getPort();
+            info.bound6 = sock->getBoundRef(AF_INET6).getPort();
         }
     }
     info.ongoing_ops = ongoing_ops;
@@ -518,17 +522,17 @@ DhtRunner::getNodeInfo(std::function<void(std::shared_ptr<NodeInfo>)> cb)
 {
     std::lock_guard<std::mutex> lck(storage_mtx);
     ongoing_ops++;
-    post([cb = std::move(cb), this](){
+    pending_ops_prio.emplace([cb = std::move(cb), this](SecureDht& dht){
         auto sinfo = std::make_shared<NodeInfo>();
         auto& info = *sinfo;
-        info.id = dht_->getId();
-        info.node_id = dht_->getNodeId();
-        info.ipv4 = dht_->getNodesStats(AF_INET);
-        info.ipv6 = dht_->getNodesStats(AF_INET6);
-        std::tie(info.storage_size, info.storage_values) = dht_->getStoreSize();
-        if (auto sock = dht_->getSocket()) {
-            info.bound4 = sock->getBound(AF_INET).port();
-            info.bound6 = sock->getBound(AF_INET6).port();
+        info.id = dht.getId();
+        info.node_id = dht.getNodeId();
+        info.ipv4 = dht.getNodesStats(AF_INET);
+        info.ipv6 = dht.getNodesStats(AF_INET6);
+        std::tie(info.storage_size, info.storage_values) = dht.getStoreSize();
+        if (auto sock = dht.getSocket()) {
+            info.bound4 = sock->getBoundRef(AF_INET).getPort();
+            info.bound6 = sock->getBoundRef(AF_INET6).getPort();
         }
         info.ongoing_ops = ongoing_ops;
         cb(std::move(sinfo));
@@ -587,12 +591,7 @@ DhtRunner::getPublicAddressStr(sa_family_t af) const
 {
     auto addrs = getPublicAddress(af);
     std::vector<std::string> ret(addrs.size());
-    std::transform(addrs.begin(), addrs.end(), ret.begin(), [](const SockAddr& a) {
-        return asio::ip::detail::endpoint(a.address(), a.port()).to_string();
-        /*std::ostringstream ss;
-        ss << a;
-        return ss.str();*/
-    });
+    std::transform(addrs.begin(), addrs.end(), ret.begin(), [](const SockAddr& a) { return a.toString(); });
     return ret;
 }
 
@@ -601,8 +600,8 @@ DhtRunner::getPublicAddress(std::function<void(std::vector<SockAddr>&&)> cb, sa_
 {
     std::lock_guard<std::mutex> lck(storage_mtx);
     ongoing_ops++;
-    post([cb = std::move(cb), this, af](){
-        cb(dht_->getPublicAddress(af));
+    pending_ops_prio.emplace([cb = std::move(cb), this, af](SecureDht& dht){
+        cb(dht.getPublicAddress(af));
         opEnded();
     });
     cv.notify_all();
@@ -620,7 +619,7 @@ DhtRunner::setLocalCertificateStore(CertificateStoreQuery&& query_method) {
     if (dht_)
         dht_->setLocalCertificateStore(std::forward<CertificateStoreQuery>(query_method));
 }
-/*
+
 time_point
 DhtRunner::loop_()
 {
@@ -684,7 +683,7 @@ DhtRunner::loop_()
     }
 
     if (dropped && logger_)
-        logger_->e("[runner %p] Dropped %zu packets with high delay.", this, dropped);
+        logger_->e("[runner %p] Dropped %zu packets with high delay.", fmt::ptr(this), dropped);
 
     NodeStatus nstatus4 = dht_->updateStatus(AF_INET);
     NodeStatus nstatus6 = dht_->updateStatus(AF_INET6);
@@ -696,24 +695,22 @@ DhtRunner::loop_()
     }
 
     return wakeup;
-}*/
+}
 
 void
 DhtRunner::get(InfoHash hash, GetCallback vcb, DoneCallback dcb, Value::Filter f, Where w)
 {
+    std::unique_lock<std::mutex> lck(storage_mtx);
     if (running != State::Running) {
+        lck.unlock();
         if (dcb) dcb(false, {});
         return;
     }
-    postOp([
-        hash,
-        vcb = std::move(vcb),
-        dcb=bindOpDoneCallback(std::move(dcb)),
-        f = std::move(f),
-        w = std::move(w)
-    ](SecureDht& dht) mutable {
-        dht.get(hash, std::move(vcb), std::move(dcb), std::move(f), std::move(w));
+    ongoing_ops++;
+    pending_ops.emplace([=](SecureDht& dht) mutable {
+        dht.get(hash, std::move(vcb), bindOpDoneCallback(std::move(dcb)), std::move(f), std::move(w));
     });
+    cv.notify_all();
 }
 
 void
@@ -729,9 +726,11 @@ DhtRunner::query(const InfoHash& hash, QueryCallback cb, DoneCallback done_cb, Q
         if (done_cb) done_cb(false, {});
         return;
     }
-    postOp([=](SecureDht& dht) mutable {
+    ongoing_ops++;
+    pending_ops.emplace([=](SecureDht& dht) mutable {
         dht.query(hash, std::move(cb), bindOpDoneCallback(std::move(done_cb)), std::move(q));
     });
+    cv.notify_all();
 }
 
 std::future<size_t>
@@ -744,8 +743,8 @@ DhtRunner::listen(InfoHash hash, ValueCallback vcb, Value::Filter f, Where w)
         ret_token->set_value(0);
         return ret_token->get_future();
     }
-    post([=]() mutable {
-        ret_token->set_value(dht_->listen(hash, std::move(vcb), std::move(f), std::move(w)));
+    pending_ops.emplace([=](SecureDht& dht) mutable {
+        ret_token->set_value(dht.listen(hash, std::move(vcb), std::move(f), std::move(w)));
     });
     cv.notify_all();
     return ret_token->get_future();
@@ -763,21 +762,26 @@ DhtRunner::cancelListen(InfoHash h, size_t token)
     std::lock_guard<std::mutex> lck(storage_mtx);
     if (running != State::Running)
         return;
-    postOp([=](SecureDht& dht) {
+    ongoing_ops++;
+    pending_ops.emplace([=](SecureDht& dht) {
         dht.cancelListen(h, token);
         opEnded();
     });
+    cv.notify_all();
 }
 
 void
 DhtRunner::cancelListen(InfoHash h, std::shared_future<size_t> ftoken)
 {
+    std::lock_guard<std::mutex> lck(storage_mtx);
     if (running != State::Running)
         return;
-    postOp([this, h, ftoken = std::move(ftoken)](SecureDht& dht) {
+    ongoing_ops++;
+    pending_ops.emplace([this, h, ftoken = std::move(ftoken)](SecureDht& dht) {
         dht.cancelListen(h, ftoken.get());
         opEnded();
     });
+    cv.notify_all();
 }
 
 void
@@ -789,12 +793,14 @@ DhtRunner::put(InfoHash hash, Value&& value, DoneCallback cb, time_point created
         if (cb) cb(false, {});
         return;
     }
-    postOp([=,
+    ongoing_ops++;
+    pending_ops.emplace([=,
         cb = std::move(cb),
         sv = std::make_shared<Value>(std::move(value))
     ] (SecureDht& dht) mutable {
         dht.put(hash, sv, bindOpDoneCallback(std::move(cb)), created, permanent);
     });
+    cv.notify_all();
 }
 
 void
@@ -806,9 +812,11 @@ DhtRunner::put(InfoHash hash, std::shared_ptr<Value> value, DoneCallback cb, tim
         if (cb) cb(false, {});
         return;
     }
-    postOp([=, value = std::move(value), cb = std::move(cb)](SecureDht& dht) mutable {
+    ongoing_ops++;
+    pending_ops.emplace([=, value = std::move(value), cb = std::move(cb)](SecureDht& dht) mutable {
         dht.put(hash, value, bindOpDoneCallback(std::move(cb)), created, permanent);
     });
+    cv.notify_all();
 }
 
 void
@@ -821,18 +829,20 @@ void
 DhtRunner::cancelPut(const InfoHash& h, Value::Id id)
 {
     std::lock_guard<std::mutex> lck(storage_mtx);
-    post([=]() {
-        dht_->cancelPut(h, id);
+    pending_ops.emplace([=](SecureDht& dht) {
+        dht.cancelPut(h, id);
     });
+    cv.notify_all();
 }
 
 void
 DhtRunner::cancelPut(const InfoHash& h, const std::shared_ptr<Value>& value)
 {
     std::lock_guard<std::mutex> lck(storage_mtx);
-    post([=]() {
-        dht_->cancelPut(h, value->id);
+    pending_ops.emplace([=](SecureDht& dht) {
+        dht.cancelPut(h, value->id);
     });
+    cv.notify_all();
 }
 
 void
@@ -844,12 +854,14 @@ DhtRunner::putSigned(InfoHash hash, std::shared_ptr<Value> value, DoneCallback c
         if (cb) cb(false, {});
         return;
     }
-    postOp([=,
+    ongoing_ops++;
+    pending_ops.emplace([=,
         cb = std::move(cb),
         value = std::move(value)
     ](SecureDht& dht) mutable {
         dht.putSigned(hash, value, bindOpDoneCallback(std::move(cb)), permanent);
     });
+    cv.notify_all();
 }
 
 void
@@ -873,12 +885,14 @@ DhtRunner::putEncrypted(InfoHash hash, InfoHash to, std::shared_ptr<Value> value
         if (cb) cb(false, {});
         return;
     }
-    postOp([=,
+    ongoing_ops++;
+    pending_ops.emplace([=,
         cb = std::move(cb),
         value = std::move(value)
     ] (SecureDht& dht) mutable {
         dht.putEncrypted(hash, to, value, bindOpDoneCallback(std::move(cb)), permanent);
     });
+    cv.notify_all();
 }
 
 void
@@ -903,7 +917,7 @@ DhtRunner::putEncrypted(InfoHash hash, const std::shared_ptr<crypto::PublicKey>&
         return;
     }
     ongoing_ops++;
-    postOp([=,
+    pending_ops.emplace([=,
         cb = std::move(cb),
         value = std::move(value)
     ] (SecureDht& dht) mutable {
@@ -922,8 +936,8 @@ void
 DhtRunner::bootstrap(const std::string& host, const std::string& service)
 {
     std::lock_guard<std::mutex> lck(storage_mtx);
-    post([this, host, service] () mutable {
-        dht_->addBootstrap(host, service);
+    pending_ops_prio.emplace([host, service] (SecureDht& dht) mutable {
+        dht.addBootstrap(host, service);
     });
     cv.notify_all();
 }
@@ -932,8 +946,8 @@ void
 DhtRunner::bootstrap(const std::string& hostService)
 {
     std::lock_guard<std::mutex> lck(storage_mtx);
-    post([this, host_service = splitPort(hostService)] () mutable {
-        dht_->addBootstrap(host_service.first, host_service.second);
+    pending_ops_prio.emplace([host_service = splitPort(hostService)] (SecureDht& dht) mutable {
+        dht.addBootstrap(host_service.first, host_service.second);
     });
     cv.notify_all();
 }
@@ -942,8 +956,8 @@ void
 DhtRunner::clearBootstrap()
 {
     std::lock_guard<std::mutex> lck(storage_mtx);
-    post([this] () mutable {
-        dht_->clearBootstrap();
+    pending_ops_prio.emplace([] (SecureDht& dht) mutable {
+        dht.clearBootstrap();
     });
     cv.notify_all();
 }
@@ -957,15 +971,15 @@ DhtRunner::bootstrap(std::vector<SockAddr> nodes, DoneCallbackSimple cb)
     }
     std::lock_guard<std::mutex> lck(storage_mtx);
     ongoing_ops++;
-    post([this,
+    pending_ops_prio.emplace([
         cb = bindOpDoneCallback(std::move(cb)),
         nodes = std::move(nodes)
-    ] () mutable {
+    ] (SecureDht& dht) mutable {
         auto rem = cb ? std::make_shared<std::pair<size_t, bool>>(nodes.size(), false) : nullptr;
         for (auto& node : nodes) {
-            if (node.port() == 0)
-                node.port(net::DHT_DEFAULT_PORT);
-            dht_->pingNode(std::move(node), [rem,cb](bool ok) {
+            if (node.getPort() == 0)
+                node.setPort(net::DHT_DEFAULT_PORT);
+            dht.pingNode(std::move(node), [rem,cb](bool ok) {
                 auto& r = *rem;
                 r.first--;
                 r.second |= ok;
@@ -988,10 +1002,8 @@ DhtRunner::bootstrap(SockAddr addr, DoneCallbackSimple cb)
         return;
     }
     ongoing_ops++;
-    if (addr.address().is_unspecified())
-        addr.address(addr.address().is_v4() ? asio::ip::address(asio::ip::address_v4::loopback()) : asio::ip::address(asio::ip::address_v6::loopback()));
-    post([this, addr = std::move(addr), cb = bindOpDoneCallback(std::move(cb))]() mutable {
-        dht_->pingNode(std::move(addr), std::move(cb));
+    pending_ops_prio.emplace([addr = std::move(addr), cb = bindOpDoneCallback(std::move(cb))](SecureDht& dht) mutable {
+        dht.pingNode(std::move(addr), std::move(cb));
     });
     cv.notify_all();
 }
@@ -1002,8 +1014,8 @@ DhtRunner::bootstrap(const InfoHash& id, const SockAddr& address)
     std::lock_guard<std::mutex> lck(storage_mtx);
     if (running != State::Running)
         return;
-    post([this, id, address]() mutable {
-        dht_->insertNode(id, address);
+    pending_ops_prio.emplace([id, address](SecureDht& dht) mutable {
+        dht.insertNode(id, address);
     });
     cv.notify_all();
 }
@@ -1014,9 +1026,9 @@ DhtRunner::bootstrap(std::vector<NodeExport> nodes)
     std::lock_guard<std::mutex> lck(storage_mtx);
     if (running != State::Running)
         return;
-    post([this, nodes = std::move(nodes)]() {
+    pending_ops_prio.emplace([nodes = std::move(nodes)](SecureDht& dht) {
         for (auto& node : nodes)
-            dht_->insertNode(node);
+            dht.insertNode(node);
     });
     cv.notify_all();
 }
@@ -1025,8 +1037,8 @@ void
 DhtRunner::connectivityChanged()
 {
     std::lock_guard<std::mutex> lck(storage_mtx);
-    post([=]() {
-        dht_->connectivityChanged();
+    pending_ops_prio.emplace([=](SecureDht& dht) {
+        dht.connectivityChanged();
 #ifdef OPENDHT_PEER_DISCOVERY
         if (peerDiscovery_)
             peerDiscovery_->connectivityChanged();
@@ -1043,12 +1055,14 @@ DhtRunner::findCertificate(InfoHash hash, std::function<void(const Sp<crypto::Ce
         cb({});
         return;
     }
-    postOp([this, hash, cb = std::move(cb)] (SecureDht& dht) {
+    ongoing_ops++;
+    pending_ops.emplace([this, hash, cb = std::move(cb)] (SecureDht& dht) {
         dht.findCertificate(hash, [this, cb = std::move(cb)](const Sp<crypto::Certificate>& crt){
             cb(crt);
             opEnded();
         });
     });
+    cv.notify_all();
 }
 
 void
@@ -1087,7 +1101,13 @@ DhtRunner::enableProxy(bool proxify)
         auto dht_via_proxy = std::make_unique<DhtProxyClient>(
                 config_.server_ca,
                 config_.client_identity,
-                strand_,
+                [this]{
+                    if (config_.threaded) {
+                        std::lock_guard<std::mutex> lck(storage_mtx);
+                        pending_ops_prio.emplace([=](SecureDht&) mutable {});
+                        cv.notify_all();
+                    }
+                },
                 config_.proxy_server, config_.push_node_id, logger_);
         if (not config_.push_token.empty())
             dht_via_proxy->setPushNotificationToken(config_.push_token);
@@ -1159,7 +1179,7 @@ DhtRunner::pushNotificationReceived(const std::map<std::string, std::string>& da
 {
 #if defined(OPENDHT_PROXY_CLIENT) && defined(OPENDHT_PUSH_NOTIFICATIONS)
     std::lock_guard<std::mutex> lck(storage_mtx);
-    post([=]() {
+    pending_ops_prio.emplace([=](SecureDht&) {
         if (dht_)
             dht_->pushNotificationReceived(data);
     });

src/http.cpp

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2022 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
  *  Author: Vsevolod Ivanov <vsevolod.ivanov@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@
  */
 
 #include "http.h"
-#include "log_enable.h"
+#include "logger.h"
 #include "crypto.h"
 #include "base64.h"
 #include "compat/os_cert.h"
@@ -33,6 +33,10 @@
 #include <openssl/x509.h>
 #include <openssl/x509_vfy.h>
 
+#include <cctype>
+#include <iomanip>
+#include <sstream>
+
 #define MAXAGE_SEC (14*24*60*60)
 #define JITTER_SEC (60)
 #define OCSP_MAX_RESPONSE_SIZE (20480)
@@ -111,11 +115,11 @@ newTlsClientContext(const std::shared_ptr<dht::Logger>& logger)
 
     if (char* path = getenv("CA_ROOT_FILE")) {
         if (logger)
-            logger->d("Using CA file: %s", path);
+            logger->debug("Using CA file: {}", path);
         ctx->load_verify_file(path);
     } else if (char* path = getenv("CA_ROOT_PATH")) {
         if (logger)
-            logger->d("Using CA path: %s", path);
+            logger->debug("Using CA path: {}", path);
         ctx->add_verify_path(path);
     } else {
 #ifdef __ANDROID__
@@ -1084,6 +1088,30 @@ Request::build()
     request_ = request.str();
 }
 
+// https://stackoverflow.com/a/17708801
+std::string
+Request::url_encode(std::string_view value)
+{
+    std::ostringstream escaped;
+    escaped.fill('0');
+    escaped << std::hex;
+
+    for (const char& c : value) {
+        // Keep alphanumeric and other accepted characters intact
+        if (std::isalnum(c) || c == '-' || c == '_' || c == '.' || c == '~') {
+            escaped << c;
+            continue;
+        }
+
+        // Any other characters are percent-encoded
+        escaped << std::uppercase;
+        escaped << '%' << std::setw(2) << static_cast<int>(static_cast<unsigned char>(c));
+        escaped << std::nouppercase;
+    }
+
+    return escaped.str();
+}
+
 void
 Request::add_on_status_callback(OnStatusCb cb) {
     cbs_.on_status = std::move(cb);
@@ -1289,7 +1317,7 @@ Request::post()
     init_parser();
 
     if (logger_)
-        logger_->d("[http:request:%i] sending %zu bytes", id_, request_.size());
+        logger_->debug("[http:request:{}] sending {} bytes", id_, request_.size());
 
     // write the request to buffer
     std::ostream request_stream(&conn_->input());

src/indexation/pht.cpp

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2022 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
  *  Author(s) : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *              Simon Désaulniers <simon.desaulniers@savoirfairelinux.com>
  *              Nicolas Reynaud <nicolas.reynaud@savoirfairelinux.com>

src/listener.h

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2022 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
  *  Author(s) : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify

src/log.cpp

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2022 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
  *
  *  Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *
@@ -20,6 +20,10 @@
 #include "log.h"
 #include "dhtrunner.h"
 
+#include <fmt/format.h>
+#include <fmt/ostream.h>
+#include <fmt/printf.h>
+
 #ifndef _WIN32
 #include <syslog.h>
 #endif
@@ -30,46 +34,70 @@
 namespace dht {
 namespace log {
 
+/**
+ * Terminal colors for logging
+ */
+namespace Color {
+    enum Code {
+        FG_RED      = 31,
+        FG_GREEN    = 32,
+        FG_YELLOW   = 33,
+        FG_BLUE     = 34,
+        FG_DEFAULT  = 39,
+        BG_RED      = 41,
+        BG_GREEN    = 42,
+        BG_BLUE     = 44,
+        BG_DEFAULT  = 49
+    };
+    class Modifier {
+        const Code code;
+    public:
+        constexpr Modifier(Code pCode) : code(pCode) {}
+        friend std::ostream&
+        operator<<(std::ostream& os, const Modifier& mod) {
+            return os << "\033[" << mod.code << 'm';
+        }
+    };
+}
+
+constexpr const Color::Modifier def(Color::FG_DEFAULT);
+constexpr const Color::Modifier red(Color::FG_RED);
+constexpr const Color::Modifier yellow(Color::FG_YELLOW);
+
 /**
  * Print va_list to std::ostream (used for logging).
  */
 void
-printLog(std::ostream& s, char const *m, va_list args) {
-    // print log to buffer
-    std::array<char, 8192> buffer;
-    int ret = vsnprintf(buffer.data(), buffer.size(), m, args);
-    if (ret <= 0)
-        return;
-
-    // write timestamp
+printfLog(std::ostream& s, const std::string& message) {
     using namespace std::chrono;
     using log_precision = microseconds;
-    constexpr auto den = log_precision::period::den;
     auto num = duration_cast<log_precision>(steady_clock::now().time_since_epoch()).count();
-    s << "[" << std::setfill('0') << std::setw(6) << num / den << "."
-             << std::setfill('0') << std::setw(6) << num % den << "]" << " ";
-
-    // write log
-    s.write(buffer.data(), std::min((size_t) ret, buffer.size()));
-    if ((size_t) ret >= buffer.size())
-        s << "[[TRUNCATED]]";
+    constexpr auto den = log_precision::period::den;
+    fmt::print(s, "[{:06d}.{:06d}] ", num / den, num % den);
+    s << message << std::endl;
+}
+void
+printLog(std::ostream& s, fmt::string_view format, fmt::format_args args) {
+    using namespace std::chrono;
+    using log_precision = microseconds;
+    auto num = duration_cast<log_precision>(steady_clock::now().time_since_epoch()).count();
+    constexpr auto den = log_precision::period::den;
+    fmt::print(s, "[{:06d}.{:06d}] ", num / den, num % den);
+    fmt::vprint(s, format, args);
     s << std::endl;
 }
 
 std::shared_ptr<Logger>
 getStdLogger() {
     return std::make_shared<Logger>(
-        [](char const *m, va_list args) {
-            std::cerr << red;
-            printLog(std::cerr, m, args);
+        [](LogLevel level, std::string&& message) {
+            if (level == LogLevel::error)
+                std::cerr << red;
+            else if (level == LogLevel::warning)
+                std::cerr << yellow;
+            printfLog(std::cerr, message);
             std::cerr << def;
-        },
-        [](char const *m, va_list args) {
-            std::cout << yellow;
-            printLog(std::cout, m, args);
-            std::cout << def;
-        },
-        [](char const *m, va_list args) { printLog(std::cout, m, args); }
+        }
     );
 }
 
@@ -77,14 +105,28 @@ std::shared_ptr<Logger>
 getFileLogger(const std::string &path) {
     auto logfile = std::make_shared<std::ofstream>();
     logfile->open(path, std::ios::out);
-
     return std::make_shared<Logger>(
-        [=](char const *m, va_list args) { printLog(*logfile, m, args); },
-        [=](char const *m, va_list args) { printLog(*logfile, m, args); },
-        [=](char const *m, va_list args) { printLog(*logfile, m, args); }
+        [logfile](LogLevel /*level*/, std::string&& message) {
+            printfLog(*logfile, message);
+        }
     );
 }
 
+#ifndef _WIN32
+constexpr
+int syslogLevel(LogLevel level) {
+    switch (level) {
+    case LogLevel::error:
+        return LOG_ERR;
+    case LogLevel::warning:
+        return LOG_WARNING;
+    case LogLevel::debug:
+        return LOG_INFO;
+    }
+    return LOG_ERR;
+}
+#endif
+
 std::shared_ptr<Logger>
 getSyslogLogger(const char* name) {
 #ifndef _WIN32
@@ -104,12 +146,11 @@ getSyslogLogger(const char* name) {
         opened_logfile = logfile;
     }
     return std::make_shared<Logger>(
-        [logfile](char const *m, va_list args) { vsyslog(LOG_ERR, m, args); },
-        [logfile](char const *m, va_list args) { vsyslog(LOG_WARNING, m, args); },
-        [logfile](char const *m, va_list args) { vsyslog(LOG_INFO, m, args); }
-    );
+        [logfile](LogLevel level, std::string&& message) {
+            syslog(syslogLevel(level), "%s", message.c_str());
+        });
 #else
-    return std::make_shared<Logger>();
+    return getStdLogger();
 #endif
 }
 

src/net.h

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2022 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
  *  Author(s) : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify

src/network_engine.cpp

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2022 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
  *  Author(s) : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *              Simon Désaulniers <simon.desaulniers@savoirfairelinux.com>
  *
@@ -20,10 +20,12 @@
 #include "network_engine.h"
 #include "request.h"
 #include "default_types.h"
-#include "log_enable.h"
+#include "logger.h"
 #include "parsed_message.h"
 
 #include <msgpack.hpp>
+#include <chrono>
+#include <string_view>
 
 namespace dht {
 namespace net {
@@ -41,7 +43,8 @@ constexpr std::chrono::seconds NetworkEngine::UDP_REPLY_TIME;
 constexpr std::chrono::seconds NetworkEngine::RX_MAX_PACKET_TIME;
 constexpr std::chrono::seconds NetworkEngine::RX_TIMEOUT;
 
-const std::string NetworkEngine::my_v {"RNG1"};
+/* OpenDHT User Agent (UA) */
+constexpr std::string_view OPENDHT_UA {"o2"};
 
 static constexpr uint8_t v4prefix[16] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xFF, 0xFF, 0, 0, 0, 0};
 
@@ -53,8 +56,6 @@ struct NetworkEngine::PartialMessage {
     time_point start;
     time_point last_part;
     std::unique_ptr<ParsedMessage> msg;
-    std::unique_ptr<asio::steady_timer> timeout;
-    std::unique_ptr<asio::steady_timer> final_timeout;
 };
 
 std::vector<Blob>
@@ -85,10 +86,10 @@ RequestAnswer::RequestAnswer(ParsedMessage&& msg)
 {}
 
 NetworkEngine::NetworkEngine(InfoHash& myid, NetworkConfig c,
-        const Sp<strand>& strand,
         std::unique_ptr<DatagramSocket>&& sock,
         const Sp<Logger>& log,
         std::mt19937_64& rand,
+        Scheduler& scheduler,
         decltype(NetworkEngine::onError)&& onError,
         decltype(NetworkEngine::onNewNode)&& onNewNode,
         decltype(NetworkEngine::onReportedAddr)&& onReportedAddr,
@@ -98,7 +99,6 @@ NetworkEngine::NetworkEngine(InfoHash& myid, NetworkConfig c,
         decltype(NetworkEngine::onListen)&& onListen,
         decltype(NetworkEngine::onAnnounce)&& onAnnounce,
         decltype(NetworkEngine::onRefresh)&& onRefresh) :
-    strand_(strand),
     onError(std::move(onError)),
     onNewNode(std::move(onNewNode)),
     onReportedAddr(std::move(onReportedAddr)),
@@ -110,12 +110,9 @@ NetworkEngine::NetworkEngine(InfoHash& myid, NetworkConfig c,
     onRefresh(std::move(onRefresh)),
     myid(myid), config(c), dht_socket(std::move(sock)), logger_(log), rd(rand),
     cache(rd),
-    rate_limiter(config.max_req_per_sec)
-{
-    dht_socket->setOnReceive([this](const ReceivedPacket& pkt) {
-        processMessage(pkt.data.data(), pkt.data.size(), pkt.from);
-    });
-}
+    rate_limiter(config.max_req_per_sec),
+    scheduler(scheduler)
+{}
 
 NetworkEngine::~NetworkEngine() {
     clear();
@@ -130,7 +127,7 @@ NetworkEngine::tellListener(const Sp<Node>& node, Tid socket_id, const InfoHash&
     auto nnodes = bufferNodes(node->getFamily(), hash, want, nodes, nodes6);
     try {
         if (version >= 1) {
-            sendUpdateValues(node, hash, std::move(values), time(), ntoken, socket_id);
+            sendUpdateValues(node, hash, std::move(values), scheduler.time(), ntoken, socket_id);
         } else {
             sendNodesValues(node->getAddr(), socket_id, nnodes.first, nnodes.second, std::move(values), query, ntoken);
         }
@@ -165,7 +162,7 @@ NetworkEngine::tellListenerRefreshed(const Sp<Node>& n, Tid socket_id, const Inf
         }
 
     pk.pack(KEY_Y); pk.pack(version >= 1 ? KEY_Q : KEY_R);
-    pk.pack(KEY_UA); pk.pack(my_v);
+    pk.pack(KEY_UA); pk.pack(OPENDHT_UA);
     if (config.network) {
         pk.pack(KEY_NETID); pk.pack(config.network);
     }
@@ -216,7 +213,7 @@ NetworkEngine::tellListenerExpired(const Sp<Node>& n, Tid socket_id, const InfoH
         }
 
     pk.pack(KEY_Y); pk.pack(version >= 1 ? KEY_Q : KEY_R);
-    pk.pack(KEY_UA); pk.pack(my_v);
+    pk.pack(KEY_UA); pk.pack(OPENDHT_UA);
     if (config.network) {
         pk.pack(KEY_NETID); pk.pack(config.network);
     }
@@ -281,7 +278,7 @@ NetworkEngine::requestStep(Sp<Request> sreq)
     if (not req.pending())
         return;
 
-    const auto& now = time();
+    auto now = scheduler.time();
     auto& node = *req.node;
     if (req.isExpired(now)) {
         // if (logger_)
@@ -295,19 +292,18 @@ NetworkEngine::requestStep(Sp<Request> sreq)
     }
 
     auto err = send(node.getAddr(), (char*)req.msg.data(), req.msg.size(), node.getReplyTime() < now - UDP_REPLY_TIME);
-    
-    if (err == asio::error::network_unreachable ||
-        err == asio::error::host_unreachable ||
-        err == asio::error::address_family_not_supported ||
-        err == asio::error::broken_pipe ||
-        err == asio::error::no_permission)
+    if (err == ENETUNREACH  ||
+        err == EHOSTUNREACH ||
+        err == EAFNOSUPPORT ||
+        err == EPIPE        ||
+        err == EPERM)
     {
         node.setExpired();
         if (not node.id)
             requests.erase(req.tid);
     } else {
         req.last_try = now;
-        if (err != asio::error::try_again) {
+        if (err != EAGAIN) {
             ++req.attempt_count;
             req.attempt_duration +=
                 req.attempt_duration + uniform_duration_distribution<>(0ms, ((duration)Node::MAX_RESPONSE_TIME)/4)(rd);
@@ -316,15 +312,9 @@ NetworkEngine::requestStep(Sp<Request> sreq)
             }
         }
         std::weak_ptr<Request> wreq = sreq;
-        if (!req.expiration_timer)
-            req.expiration_timer = std::make_unique<asio::steady_timer>(context());
-        req.expiration_timer->expires_at(req.last_try + req.attempt_duration);
-        req.expiration_timer->async_wait([this,wreq](const asio::error_code& ec) {
-            if (ec != asio::error::operation_aborted) {
-                syncTime();
-                if (auto req = wreq.lock())
-                    requestStep(req);
-            }
+        scheduler.add(req.last_try + req.attempt_duration, [this,wreq] {
+            if (auto req = wreq.lock())
+                requestStep(req);
         });
     }
 }
@@ -339,7 +329,7 @@ NetworkEngine::sendRequest(const Sp<Request>& request)
     auto& node = *request->node;
     if (not node.id)
         requests.emplace(request->tid, request);
-    request->start = time();
+    request->start = scheduler.time();
     node.requested(request);
     requestStep(request);
 }
@@ -349,7 +339,7 @@ NetworkEngine::sendRequest(const Sp<Request>& request)
 bool
 NetworkEngine::rateLimit(const SockAddr& addr)
 {
-    const auto& now = time();
+    const auto& now = scheduler.time();
 
     // occasional IP limiter maintenance (a few times every second at max rate)
     if (limiter_maintenance++ == config.max_peer_req_per_sec) {
@@ -373,20 +363,23 @@ NetworkEngine::rateLimit(const SockAddr& addr)
 bool
 NetworkEngine::isMartian(const SockAddr& addr)
 {
-    if (addr.port() == 0)
+    if (addr.getPort() == 0)
         return true;
-    switch(addr.protocol().family()) {
+    switch(addr.getFamily()) {
     case AF_INET: {
-        const auto& sin = addr.address().to_v4().to_bytes();
-        return (sin[0] == 0) ||
-              ((sin[0] & 0xE0) == 0xE0);
+        const auto& sin = addr.getIPv4();
+        const uint8_t* address = (const uint8_t*)&sin.sin_addr;
+        return (address[0] == 0) ||
+              ((address[0] & 0xE0) == 0xE0);
     }
     case AF_INET6: {
-        const auto& sin6 = addr.address().to_v6().to_bytes();
-        return sin6[0] == 0xFF ||
-              (sin6[0] == 0xFE && (sin6[1] & 0xC0) == 0x80) ||
-               memcmp(sin6.data(), InfoHash::zero().data(), 16) == 0 ||
-               memcmp(sin6.data(), v4prefix,      12) == 0;
+        if (addr.getLength() < sizeof(sockaddr_in6))
+            return true;
+        const auto& sin6 = addr.getIPv6();
+        const uint8_t* address = (const uint8_t*)&sin6.sin6_addr;
+        return address[0] == 0xFF ||
+               memcmp(address, InfoHash::zero().data(), 16) == 0 ||
+               memcmp(address, v4prefix,      12) == 0;
     }
     default:
         return true;
@@ -411,17 +404,16 @@ NetworkEngine::isNodeBlacklisted(const SockAddr& addr) const
 void
 NetworkEngine::processMessage(const uint8_t *buf, size_t buflen, SockAddr f)
 {
-    syncTime();
-    const auto& from = f;/*.getMappedIPv4();
+    auto from = f.getMappedIPv4();
     if (isMartian(from)) {
         if (logger_)
             logger_->w("Received packet from martian node %s", from.toString().c_str());
         return;
-    }*/
+    }
 
     if (isNodeBlacklisted(from)) {
-        //if (logger_)
-        //    logger_->w("Received packet from blacklisted node %s", from.toString().c_str());
+        if (logger_)
+            logger_->w("Received packet from blacklisted node %s", from.toString().c_str());
         return;
     }
 
@@ -443,7 +435,7 @@ NetworkEngine::processMessage(const uint8_t *buf, size_t buflen, SockAddr f)
         return;
     }
 
-    const auto& now = time();
+    const auto& now = scheduler.time();
 
     // partial value data
     if (msg->type == MessageType::ValueData) {
@@ -455,7 +447,7 @@ NetworkEngine::processMessage(const uint8_t *buf, size_t buflen, SockAddr f)
             rateLimit(from);
             return;
         }
-        if (pmsg_it->second.from != from) {
+        if (!pmsg_it->second.from.equals(from)) {
             if (logger_)
                 logger_->d("Received partial message data from unexpected IP address");
             rateLimit(from);
@@ -473,13 +465,8 @@ NetworkEngine::processMessage(const uint8_t *buf, size_t buflen, SockAddr f)
                 } catch (...) {
                     return;
                 }
-            } else {
-                pmsg_it->second.timeout->expires_at(now + RX_TIMEOUT);
-                pmsg_it->second.timeout->async_wait([this, t=msg->tid](const asio::error_code& ec) {
-                    if (ec != asio::error::operation_aborted)
-                        maintainRxBuffer(t);
-                });
-            }
+            } else
+                scheduler.add(now + RX_TIMEOUT, std::bind(&NetworkEngine::maintainRxBuffer, this, msg->tid));
         }
         return;
     }
@@ -514,18 +501,8 @@ NetworkEngine::processMessage(const uint8_t *buf, size_t buflen, SockAddr f)
             pmsg.msg = std::move(msg);
             pmsg.start = now;
             pmsg.last_part = now;
-            //scheduler.add(now + RX_MAX_PACKET_TIME, std::bind(&NetworkEngine::maintainRxBuffer, this, k));
-            //scheduler.add(now + RX_TIMEOUT, std::bind(&NetworkEngine::maintainRxBuffer, this, k));
-            pmsg.timeout = std::make_unique<asio::steady_timer>(context(), now + RX_TIMEOUT);
-            pmsg.final_timeout = std::make_unique<asio::steady_timer>(context(), now + RX_MAX_PACKET_TIME);
-            pmsg.timeout->async_wait([this,k](const asio::error_code& ec) {
-                if (ec != asio::error::operation_aborted)
-                    maintainRxBuffer(k);
-            });
-            pmsg.final_timeout->async_wait([this,k](const asio::error_code& ec) {
-                if (ec != asio::error::operation_aborted)
-                    maintainRxBuffer(k);
-            });
+            scheduler.add(now + RX_MAX_PACKET_TIME, std::bind(&NetworkEngine::maintainRxBuffer, this, k));
+            scheduler.add(now + RX_TIMEOUT, std::bind(&NetworkEngine::maintainRxBuffer, this, k));
         } else if (logger_)
             logger_->e("Partial message with given TID %u already exists", k);
     }
@@ -534,7 +511,7 @@ NetworkEngine::processMessage(const uint8_t *buf, size_t buflen, SockAddr f)
 void
 NetworkEngine::process(std::unique_ptr<ParsedMessage>&& msg, const SockAddr& from)
 {
-    const auto& now = time();
+    const auto& now = scheduler.time();
     auto node = cache.getNode(msg->id, from, now, true, msg->is_client);
 
     if (msg->type == MessageType::ValueUpdate) {
@@ -591,10 +568,10 @@ NetworkEngine::process(std::unique_ptr<ParsedMessage>&& msg, const SockAddr& fro
                 if (not req->setError(DhtProtocolException {msg->error_code}))
                     onError(req, DhtProtocolException {msg->error_code});
             } else {
-                /*if (logIncoming_)
+                if (logIncoming_)
                     if (logger_)
                         logger_->w(msg->id, "[node %s %s] received unknown error message %u",
-                        msg->id.toString().c_str(), from.toString().c_str(), msg->error_code);*/
+                        msg->id.toString().c_str(), from.toString().c_str(), msg->error_code);
             }
             break;
         }
@@ -606,7 +583,7 @@ NetworkEngine::process(std::unique_ptr<ParsedMessage>&& msg, const SockAddr& fro
                  or r.getType() == MessageType::Refresh) {
                     r.node->authSuccess();
                 }
-                r.reply_time = time();
+                r.reply_time = scheduler.time();
 
                 deserializeNodes(*msg, from);
                 r.setDone(std::move(*msg));
@@ -638,7 +615,7 @@ NetworkEngine::process(std::unique_ptr<ParsedMessage>&& msg, const SockAddr& fro
                 //     logger_->d(msg->target, node->id, "[node %s] got 'find' request for %s (%d)", node->toString().c_str(), msg->target.toString().c_str(), msg->want);
                 ++in_stats.find;
                 RequestAnswer answer = onFindNode(node, msg->target, msg->want);
-                auto nnodes = bufferNodes(from.protocol().family(), msg->target, msg->want, answer.nodes4, answer.nodes6);
+                auto nnodes = bufferNodes(from.getFamily(), msg->target, msg->want, answer.nodes4, answer.nodes6);
                 sendNodesValues(from, msg->tid, nnodes.first, nnodes.second, {}, {}, answer.ntoken);
                 break;
             }
@@ -647,7 +624,7 @@ NetworkEngine::process(std::unique_ptr<ParsedMessage>&& msg, const SockAddr& fro
                 //     logger_->d(msg->info_hash, node->id, "[node %s] got 'get' request for %s", node->toString().c_str(), msg->info_hash.toString().c_str());
                 ++in_stats.get;
                 RequestAnswer answer = onGetValues(node, msg->info_hash, msg->want, msg->query);
-                auto nnodes = bufferNodes(from.protocol().family(), msg->info_hash, msg->want, answer.nodes4, answer.nodes6);
+                auto nnodes = bufferNodes(from.getFamily(), msg->info_hash, msg->want, answer.nodes4, answer.nodes6);
                 sendNodesValues(from, msg->tid, nnodes.first, nnodes.second, answer.values, msg->query, answer.ntoken);
                 break;
             }
@@ -677,7 +654,7 @@ NetworkEngine::process(std::unique_ptr<ParsedMessage>&& msg, const SockAddr& fro
                     logger_->d(msg->info_hash, node->id, "[node %s] got 'listen' request for %s", node->toString().c_str(), msg->info_hash.toString().c_str());
                 ++in_stats.listen;
                 RequestAnswer answer = onListen(node, msg->info_hash, msg->token, msg->socket_id, std::move(msg->query), msg->version);
-                auto nnodes = bufferNodes(from.protocol().family(), msg->info_hash, msg->want, answer.nodes4, answer.nodes6);
+                auto nnodes = bufferNodes(from.getFamily(), msg->info_hash, msg->want, answer.nodes4, answer.nodes6);
                 sendListenConfirmation(from, msg->tid);
                 break;
             }
@@ -707,23 +684,19 @@ NetworkEngine::process(std::unique_ptr<ParsedMessage>&& msg, const SockAddr& fro
 void
 insertAddr(msgpack::packer<msgpack::sbuffer>& pk, const SockAddr& addr)
 {
+    size_t addr_len = std::min<size_t>(addr.getLength(),
+                     (addr.getFamily() == AF_INET) ? sizeof(in_addr) : sizeof(in6_addr));
+    void* addr_ptr = (addr.getFamily() == AF_INET) ? (void*)&addr.getIPv4().sin_addr
+                                                : (void*)&addr.getIPv6().sin6_addr;
     pk.pack("sa");
-    const auto& a = addr.address();
-    if (a.is_v4()) {
-        auto bytes = a.to_v4().to_bytes();
-        pk.pack_bin(bytes.size());
-        pk.pack_bin_body((char*)bytes.data(), bytes.size());
-    } else {
-        auto bytes = a.to_v6().to_bytes();
-        pk.pack_bin(bytes.size());
-        pk.pack_bin_body((char*)bytes.data(), bytes.size());
-    }
+    pk.pack_bin(addr_len);
+    pk.pack_bin_body((char*)addr_ptr, addr_len);
 }
 
-asio::error_code
+int
 NetworkEngine::send(const SockAddr& addr, const char *buf, size_t len, bool confirmed)
 {
-    return dht_socket ? dht_socket->sendTo((const uint8_t*)buf, len, addr) : asio::error::not_connected;
+    return dht_socket ? dht_socket->sendTo(addr, (const uint8_t*)buf, len, confirmed) : ENOTCONN;
 }
 
 Sp<Request>
@@ -739,7 +712,7 @@ NetworkEngine::sendPing(const Sp<Node>& node, RequestCb&& on_done, RequestExpire
     pk.pack(KEY_Q); pk.pack(QUERY_PING);
     pk.pack(KEY_TID); pk.pack(tid);
     pk.pack(KEY_Y); pk.pack(KEY_Q);
-    pk.pack(KEY_UA); pk.pack(my_v);
+    pk.pack(KEY_UA); pk.pack(OPENDHT_UA);
     if (config.network) {
         pk.pack(KEY_NETID); pk.pack(config.network);
     }
@@ -776,7 +749,7 @@ NetworkEngine::sendPong(const SockAddr& addr, Tid tid) {
 
     pk.pack(KEY_TID); pk.pack(tid);
     pk.pack(KEY_Y); pk.pack(KEY_R);
-    pk.pack(KEY_UA); pk.pack(my_v);
+    pk.pack(KEY_UA); pk.pack(OPENDHT_UA);
     if (config.network) {
         pk.pack(KEY_NETID); pk.pack(config.network);
     }
@@ -805,7 +778,7 @@ NetworkEngine::sendFindNode(const Sp<Node>& n, const InfoHash& target, want_t wa
     pk.pack(KEY_Q); pk.pack(QUERY_FIND);
     pk.pack(KEY_TID); pk.pack(tid);
     pk.pack(KEY_Y); pk.pack(KEY_Q);
-    pk.pack(KEY_UA); pk.pack(my_v);
+    pk.pack(KEY_UA); pk.pack(OPENDHT_UA);
     if (config.network) {
         pk.pack(KEY_NETID); pk.pack(config.network);
     }
@@ -858,7 +831,7 @@ NetworkEngine::sendGetValues(const Sp<Node>& n, const InfoHash& info_hash, const
     pk.pack(KEY_Q); pk.pack(QUERY_GET);
     pk.pack(KEY_TID); pk.pack(tid);
     pk.pack(KEY_Y); pk.pack(KEY_Q);
-    pk.pack(KEY_UA); pk.pack(my_v);
+    pk.pack(KEY_UA); pk.pack(OPENDHT_UA);
     if (config.network) {
         pk.pack(KEY_NETID); pk.pack(config.network);
     }
@@ -883,15 +856,18 @@ NetworkEngine::sendGetValues(const Sp<Node>& n, const InfoHash& info_hash, const
 
 SockAddr deserializeIPv4(const uint8_t* ni) {
     SockAddr addr;
-    addr.address(asio::ip::address_v4({ni[0], ni[1], ni[2], ni[3]}));
-    addr.port(ntohs(*reinterpret_cast<const uint16_t*>(ni + 4)));
+    addr.setFamily(AF_INET);
+    auto& sin = addr.getIPv4();
+    std::memcpy(&sin.sin_addr, ni, 4);
+    std::memcpy(&sin.sin_port, ni + 4, 2);
     return addr;
 }
 SockAddr deserializeIPv6(const uint8_t* ni) {
     SockAddr addr;
-    addr.address(asio::ip::address_v6({ni[0], ni[1], ni[2], ni[3], ni[4], ni[5], ni[6], ni[7],
-                                       ni[8], ni[9], ni[10], ni[11], ni[12], ni[13], ni[14], ni[15]}));
-    addr.port(ntohs(*reinterpret_cast<const uint16_t*>(ni + 16)));
+    addr.setFamily(AF_INET6);
+    auto& sin6 = addr.getIPv6();
+    std::memcpy(&sin6.sin6_addr, ni, 16);
+    std::memcpy(&sin6.sin6_port, ni + 16, 2);
     return addr;
 }
 
@@ -901,21 +877,21 @@ NetworkEngine::deserializeNodes(ParsedMessage& msg, const SockAddr& from) {
         throw DhtProtocolException {DhtProtocolException::WRONG_NODE_INFO_BUF_LEN};
     }
     // deserialize nodes
-    const auto& now = time();
+    const auto& now = scheduler.time();
     for (unsigned i = 0, n = msg.nodes4_raw.size() / NODE4_INFO_BUF_LEN; i < n; i++) {
         const uint8_t* ni = msg.nodes4_raw.data() + i * NODE4_INFO_BUF_LEN;
         const auto& ni_id = *reinterpret_cast<const InfoHash*>(ni);
         if (ni_id == myid)
             continue;
         SockAddr addr = deserializeIPv4(ni + ni_id.size());
-        if (addr.address().is_loopback() and from.protocol().family() == AF_INET) {
-            auto port = addr.port();
+        if (addr.isLoopback() and from.getFamily() == AF_INET) {
+            auto port = addr.getPort();
             addr = from;
-            addr.port(port);
+            addr.setPort(port);
         }
         if (isMartian(addr) || isNodeBlacklisted(addr))
             continue;
-        msg.nodes4.emplace_back(cache.getNode(ni_id, std::move(addr), now, false));
+        msg.nodes4.emplace_back(cache.getNode(ni_id, addr, now, false));
         onNewNode(msg.nodes4.back(), 0);
     }
     for (unsigned i = 0, n = msg.nodes6_raw.size() / NODE6_INFO_BUF_LEN; i < n; i++) {
@@ -924,14 +900,14 @@ NetworkEngine::deserializeNodes(ParsedMessage& msg, const SockAddr& from) {
         if (ni_id == myid)
             continue;
         SockAddr addr = deserializeIPv6(ni + ni_id.size());
-        if (addr.address().is_loopback() and from.protocol().family() == AF_INET6) {
-            auto port = addr.port();
+        if (addr.isLoopback() and from.getFamily() == AF_INET6) {
+            auto port = addr.getPort();
             addr = from;
-            addr.port(port);
+            addr.setPort(port);
         }
         if (isMartian(addr) || isNodeBlacklisted(addr))
             continue;
-        msg.nodes6.emplace_back(cache.getNode(ni_id, std::move(addr), now, false));
+        msg.nodes6.emplace_back(cache.getNode(ni_id, addr, now, false));
         onNewNode(msg.nodes6.back(), 0);
     }
 }
@@ -1038,7 +1014,7 @@ NetworkEngine::sendNodesValues(const SockAddr& addr, Tid tid, const Blob& nodes,
 
     pk.pack(KEY_TID); pk.pack(tid);
     pk.pack(KEY_Y); pk.pack(KEY_R);
-    pk.pack(KEY_UA); pk.pack(my_v);
+    pk.pack(KEY_UA); pk.pack(OPENDHT_UA);
     if (config.network) {
         pk.pack(KEY_NETID); pk.pack(config.network);
     }
@@ -1063,25 +1039,21 @@ NetworkEngine::bufferNodes(sa_family_t af, const InfoHash& id, std::vector<Sp<No
         bnodes.resize(NODE4_INFO_BUF_LEN * nnode);
         for (size_t i=0; i<nnode; i++) {
             const Node& n = *nodes[i];
-            const auto& sin = n.getAddr();
-            auto port = htons(sin.port());
-            auto addr = sin.address().to_v4().to_bytes();
+            const auto& sin = n.getAddr().getIPv4();
             auto dest = bnodes.data() + NODE4_INFO_BUF_LEN * i;
             memcpy(dest, n.id.data(), HASH_LEN);
-            memcpy(dest + HASH_LEN, addr.data(), sizeof(in_addr));
-            memcpy(dest + HASH_LEN + sizeof(in_addr), &port, sizeof(in_port_t));
+            memcpy(dest + HASH_LEN, &sin.sin_addr, sizeof(in_addr));
+            memcpy(dest + HASH_LEN + sizeof(in_addr), &sin.sin_port, sizeof(in_port_t));
         }
     } else if (af == AF_INET6) {
         bnodes.resize(NODE6_INFO_BUF_LEN * nnode);
         for (size_t i=0; i<nnode; i++) {
             const Node& n = *nodes[i];
-            const auto& sin6 = n.getAddr();
-            auto port = htons(sin6.port());
-            auto addr = sin6.address().to_v6().to_bytes();
+            const auto& sin6 = n.getAddr().getIPv6();
             auto dest = bnodes.data() + NODE6_INFO_BUF_LEN * i;
             memcpy(dest, n.id.data(), HASH_LEN);
-            memcpy(dest + HASH_LEN, addr.data(), sizeof(in6_addr));
-            memcpy(dest + HASH_LEN + sizeof(in6_addr), &port, sizeof(in_port_t));
+            memcpy(dest + HASH_LEN, &sin6.sin6_addr, sizeof(in6_addr));
+            memcpy(dest + HASH_LEN + sizeof(in6_addr), &sin6.sin6_port, sizeof(in_port_t));
         }
     }
     return bnodes;
@@ -1133,7 +1105,7 @@ NetworkEngine::sendListen(const Sp<Node>& n,
     pk.pack(KEY_Q); pk.pack(QUERY_LISTEN);
     pk.pack(KEY_TID); pk.pack(tid);
     pk.pack(KEY_Y); pk.pack(KEY_Q);
-    pk.pack(KEY_UA); pk.pack(my_v);
+    pk.pack(KEY_UA); pk.pack(OPENDHT_UA);
     if (config.network) {
         pk.pack(KEY_NETID); pk.pack(config.network);
     }
@@ -1166,7 +1138,7 @@ NetworkEngine::sendListenConfirmation(const SockAddr& addr, Tid tid) {
 
     pk.pack(KEY_TID); pk.pack(tid);
     pk.pack(KEY_Y); pk.pack(KEY_R);
-    pk.pack(KEY_UA); pk.pack(my_v);
+    pk.pack(KEY_UA); pk.pack(OPENDHT_UA);
     if (config.network) {
         pk.pack(KEY_NETID); pk.pack(config.network);
     }
@@ -1188,7 +1160,7 @@ NetworkEngine::sendAnnounceValue(const Sp<Node>& n,
     msgpack::packer<msgpack::sbuffer> pk(&buffer);
     pk.pack_map(5+(config.network?1:0));
 
-    bool add_created = created < time();
+    bool add_created = created < scheduler.time();
     pk.pack(KEY_A); pk.pack_map(add_created ? 5 : 4);
       pk.pack(KEY_REQ_ID);     pk.pack(myid);
       pk.pack(KEY_REQ_H);      pk.pack(infohash);
@@ -1202,7 +1174,7 @@ NetworkEngine::sendAnnounceValue(const Sp<Node>& n,
     pk.pack(KEY_Q);   pk.pack(QUERY_PUT);
     pk.pack(KEY_TID); pk.pack(tid);
     pk.pack(KEY_Y);   pk.pack(KEY_Q);
-    pk.pack(KEY_UA);  pk.pack(my_v);
+    pk.pack(KEY_UA);  pk.pack(OPENDHT_UA);
     if (config.network) {
         pk.pack(KEY_NETID); pk.pack(config.network);
     }
@@ -1274,13 +1246,13 @@ NetworkEngine::sendUpdateValues(const Sp<Node>& n,
     msgpack::packer<msgpack::sbuffer> pk(&buffer);
     pk.pack_map(5+(config.network?1:0));
 
-    pk.pack(KEY_A); pk.pack_map((created < time() ? 7 : 6));
+    pk.pack(KEY_A); pk.pack_map((created < scheduler.time() ? 7 : 6));
       pk.pack(KEY_REQ_ID);     pk.pack(myid);
       pk.pack(KEY_VERSION);    pk.pack(1);
       pk.pack(KEY_REQ_H);      pk.pack(infohash);
       pk.pack(KEY_REQ_SID);   pk.pack(sid);
       auto v = packValueHeader(buffer, begin, end);
-      if (created < time()) {
+      if (created < scheduler.time()) {
           pk.pack(KEY_REQ_CREATION);
           pk.pack(to_time_t(created));
       }
@@ -1289,7 +1261,7 @@ NetworkEngine::sendUpdateValues(const Sp<Node>& n,
     pk.pack(KEY_Q);   pk.pack(QUERY_UPDATE);
     pk.pack(KEY_TID); pk.pack(tid);
     pk.pack(KEY_Y);   pk.pack(KEY_Q);
-    pk.pack(KEY_UA);  pk.pack(my_v);
+    pk.pack(KEY_UA);  pk.pack(OPENDHT_UA);
     if (config.network) {
         pk.pack(KEY_NETID); pk.pack(config.network);
     }
@@ -1328,7 +1300,7 @@ NetworkEngine::sendRefreshValue(const Sp<Node>& n,
     pk.pack(KEY_Q); pk.pack(QUERY_REFRESH);
     pk.pack(KEY_TID); pk.pack(tid);
     pk.pack(KEY_Y); pk.pack(KEY_Q);
-    pk.pack(KEY_UA); pk.pack(my_v);
+    pk.pack(KEY_UA); pk.pack(OPENDHT_UA);
     if (config.network) {
         pk.pack(KEY_NETID); pk.pack(config.network);
     }
@@ -1372,7 +1344,7 @@ NetworkEngine::sendValueAnnounced(const SockAddr& addr, Tid tid, Value::Id vid)
 
     pk.pack(KEY_TID); pk.pack(tid);
     pk.pack(KEY_Y); pk.pack(KEY_R);
-    pk.pack(KEY_UA); pk.pack(my_v);
+    pk.pack(KEY_UA); pk.pack(OPENDHT_UA);
     if (config.network) {
         pk.pack(KEY_NETID); pk.pack(config.network);
     }
@@ -1402,7 +1374,7 @@ NetworkEngine::sendError(const SockAddr& addr,
 
     pk.pack(KEY_TID); pk.pack(tid);
     pk.pack(KEY_Y); pk.pack(KEY_E);
-    pk.pack(KEY_UA); pk.pack(my_v);
+    pk.pack(KEY_UA); pk.pack(OPENDHT_UA);
     if (config.network) {
         pk.pack(KEY_NETID); pk.pack(config.network);
     }
@@ -1415,11 +1387,11 @@ NetworkEngine::maintainRxBuffer(Tid tid)
 {
     auto msg = partial_messages.find(tid);
     if (msg != partial_messages.end()) {
-        const auto& now = time();
+        const auto& now = scheduler.time();
         if (msg->second.start + RX_MAX_PACKET_TIME < now
          || msg->second.last_part + RX_TIMEOUT < now) {
-            //if (logger_)
-            //    logger_->w("Dropping expired partial message from %s", msg->second.from.toString().c_str());
+            if (logger_)
+                logger_->w("Dropping expired partial message from %s", msg->second.from.toString().c_str());
             partial_messages.erase(msg);
         }
     }

src/network_utils.cpp

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2022 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
  *  Author(s) : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -34,84 +34,330 @@
 
 namespace dht {
 namespace net {
-/*
 
-UdpSocket::UdpSocket(in_port_t port, const std::shared_ptr<Logger>& l)
-    : logger(l)
+int
+bindSocket(const SockAddr& addr, SockAddr& bound)
 {
-    asio::io_service io_service;
-    asio::ip::udp::endpoint endpoint(asio::ip::udp::v4(), port);
-    s4.open(endpoint.protocol());
-    s4.set_option(asio::ip::udp::socket::reuse_address(true));
-    s4.bind(endpoint);
-    s4.non_blocking(true);
-
-    try {
-        asio::ip::udp::endpoint endpoint(asio::ip::udp::v6(), port);
-        s6.open(endpoint.protocol());
-        s6.set_option(asio::ip::udp::socket::reuse_address(true));
-        s6.bind(endpoint);
-        s6.non_blocking(true);
-    } catch (...) {
+    bool is_ipv6 = addr.getFamily() == AF_INET6;
+    int sock = socket(is_ipv6 ? PF_INET6 : PF_INET, SOCK_DGRAM, 0);
+    if (sock < 0)
+        throw DhtException(std::string("Can't open socket: ") + strerror(sock));
+    int set = 1;
+#ifdef SO_NOSIGPIPE
+    setsockopt(sock, SOL_SOCKET, SO_NOSIGPIPE, (const char*)&set, sizeof(set));
+#endif
+    if (is_ipv6)
+        setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY, (const char*)&set, sizeof(set));
+    net::setNonblocking(sock);
+    int rc = bind(sock, addr.get(), addr.getLength());
+    if (rc < 0) {
+        rc = errno;
+        close(sock);
+        throw DhtException("Can't bind socket on " + addr.toString() + " " + strerror(rc));
     }
+    sockaddr_storage ss;
+    socklen_t ss_len = sizeof(ss);
+    getsockname(sock, (sockaddr*)&ss, &ss_len);
+    bound = {ss, ss_len};
+    return sock;
 }
 
-UdpSocket::UdpSocket(const SockAddr& bind4, const SockAddr& bind6, const std::shared_ptr<Logger>& l)
-    : logger(l)
+bool
+setNonblocking(int fd, bool nonblocking)
 {
-    if (bind4.isSet()) {
-        asio::io_service io_service;
-        asio::ip::udp::endpoint endpoint(asio::ip::udp::v4(), bind4.getPort());
-        s4.open(endpoint.protocol());
-        s4.set_option(asio::ip::udp::socket::reuse_address(true));
-        s4.bind(endpoint);
-        s4.non_blocking(true);
+#ifdef _WIN32
+    unsigned long mode = !!nonblocking;
+    int rc = ioctlsocket(fd, FIONBIO, &mode);
+    return rc == 0;
+#else
+    int rc = fcntl(fd, F_GETFL, 0);
+    if (rc < 0)
+        return false;
+    rc = fcntl(fd, F_SETFL, nonblocking ? (rc | O_NONBLOCK) : (rc & ~O_NONBLOCK));
+    return rc >= 0;
+#endif
+}
+
+#ifdef _WIN32
+void udpPipe(int fds[2])
+{
+    int lst = socket(AF_INET, SOCK_DGRAM, 0);
+    if (lst < 0)
+        throw DhtException(std::string("Can't open socket: ") + strerror(WSAGetLastError()));
+    sockaddr_in inaddr;
+    sockaddr addr;
+    memset(&inaddr, 0, sizeof(inaddr));
+    memset(&addr, 0, sizeof(addr));
+    inaddr.sin_family = AF_INET;
+    inaddr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
+    inaddr.sin_port = 0;
+    int yes = 1;
+    setsockopt(lst, SOL_SOCKET, SO_REUSEADDR, (char*)&yes, sizeof(yes));
+    int rc = bind(lst, (sockaddr*)&inaddr, sizeof(inaddr));
+    if (rc < 0) {
+        close(lst);
+        throw DhtException("Can't bind socket on " + print_addr((sockaddr*)&inaddr, sizeof(inaddr)) + " " + strerror(rc));
+    }
+    socklen_t len = sizeof(addr);
+    getsockname(lst, &addr, &len);
+    fds[0] = lst;
+    fds[1] = socket(AF_INET, SOCK_DGRAM, 0);
+    connect(fds[1], &addr, len);
+}
+#endif
+
+UdpSocket::UdpSocket(in_port_t port, const std::shared_ptr<Logger>& l) : logger(l) {
+    SockAddr bind4;
+    bind4.setFamily(AF_INET);
+    bind4.setPort(port);
+    SockAddr bind6;
+    bind6.setFamily(AF_INET6);
+    bind6.setPort(port);
+    std::lock_guard<std::mutex> lk(lock);
+    openSockets(bind4, bind6);
+}
+
+UdpSocket::UdpSocket(const SockAddr& bind4, const SockAddr& bind6, const std::shared_ptr<Logger>& l) : logger(l)
+{
+    std::lock_guard<std::mutex> lk(lock);
+    openSockets(bind4, bind6);
+}
+
+UdpSocket::~UdpSocket() {
+    stop();
+    if (rcv_thread.joinable())
+        rcv_thread.join();
+}
+
+int
+UdpSocket::sendTo(const SockAddr& dest, const uint8_t* data, size_t size, bool replied) {
+    if (not dest)
+        return EFAULT;
+
+    int s;
+    switch (dest.getFamily()) {
+    case AF_INET:  s = s4; break;
+    case AF_INET6: s = s6; break;
+    default:       s = -1; break;
     }
 
-    if (bind6.isSet()) {
+    if (s < 0)
+        return EAFNOSUPPORT;
+
+    int flags = 0;
+#ifdef MSG_CONFIRM
+    if (replied)
+        flags |= MSG_CONFIRM;
+#else
+    (void) replied;
+#endif
+#ifdef MSG_NOSIGNAL
+    flags |= MSG_NOSIGNAL;
+#endif
+
+    if (sendto(s, (const char*)data, size, flags, dest.get(), dest.getLength()) == -1) {
+        int err = errno;
+        if (logger)
+            logger->d("Can't send message to %s: %s", dest.toString().c_str(), strerror(err));
+        if (err == EPIPE || err == ENOTCONN || err == ECONNRESET) {
+            std::lock_guard<std::mutex> lk(lock);
+            auto bind4 = std::move(bound4), bind6 = std::move(bound6);
+            openSockets(bind4, bind6);
+            return sendTo(dest, data, size, false);
+        }
+        return err;
+    }
+    return 0;
+}
+
+void
+UdpSocket::openSockets(const SockAddr& bind4, const SockAddr& bind6)
+{
+    stop();
+    if (rcv_thread.joinable())
+        rcv_thread.join();
+
+    int stopfds[2];
+#ifndef _WIN32
+    auto status = pipe(stopfds);
+    if (status == -1) {
+        throw DhtException(std::string("Can't open pipe: ") + strerror(errno));
+    }
+#else
+    udpPipe(stopfds);
+#endif
+    int stop_readfd = stopfds[0];
+
+    stopfd = stopfds[1];
+    s4 = -1;
+    s6 = -1;
+
+    bound4 = {};
+    if (bind4) {
         try {
-            asio::io_service io_service;
-            asio::ip::udp::endpoint endpoint(asio::ip::udp::v6(), bind6.getPort());
-            s6.open(endpoint.protocol());
-            s6.set_option(asio::ip::udp::socket::reuse_address(true));
-            s6.bind(endpoint);
-            s6.non_blocking(true);
-        } catch (...) {
+            s4 = bindSocket(bind4, bound4);
+        } catch (const DhtException& e) {
+            if (logger)
+                logger->e("Can't bind inet socket: %s", e.what());
+        }
+    }
+
+#if 1
+    bound6 = {};
+    if (bind6) {
+        if (bind6.getPort() == 0) {
+            // Attempt to use the same port as IPv4 with IPv6
+            if (auto p4 = bound4.getPort()) {
+                auto b6 = bind6;
+                b6.setPort(p4);
+                try {
+                    s6 = bindSocket(b6, bound6);
+                } catch (const DhtException& e) {
+                    if (logger)
+                        logger->e("Can't bind inet6 socket: %s", e.what());
+                }
+            }
+        }
+        if (s6 == -1) {
+            try {
+                s6 = bindSocket(bind6, bound6);
+            } catch (const DhtException& e) {
+                if (logger)
+                    logger->e("Can't bind inet6 socket: %s", e.what());
+            }
+        }
+    }
+#endif
+
+    if (s4 == -1 && s6 == -1) {
+        throw DhtException("Can't bind socket");
+    }
+
+    running = true;
+    rcv_thread = std::thread([this, stop_readfd, ls4=s4, ls6=s6]() mutable {
+        int selectFd = std::max({ls4, ls6, stop_readfd}) + 1;
+        try {
+            while (running) {
+                fd_set readfds;
+
+                FD_ZERO(&readfds);
+                FD_SET(stop_readfd, &readfds);
+                if(ls4 >= 0)
+                    FD_SET(ls4, &readfds);
+                if(ls6 >= 0)
+                    FD_SET(ls6, &readfds);
+
+                int rc = select(selectFd, &readfds, nullptr, nullptr, nullptr);
+                if (rc < 0) {
+                    if (errno != EINTR) {
+                        if (logger)
+                            logger->e("Select error: %s", strerror(errno));
+                        std::this_thread::sleep_for(std::chrono::seconds(1));
+                    }
+                }
+
+                if (not running)
+                    break;
+
+                if (rc > 0) {
+                    std::array<uint8_t, 1024 * 64> buf;
+                    sockaddr_storage from;
+                    socklen_t from_len = sizeof(from);
+
+                    if (FD_ISSET(stop_readfd, &readfds)) {
+                        if (recv(stop_readfd, (char*)buf.data(), buf.size(), 0) < 0) {
+                            if (logger)
+                                logger->e("Got stop packet error: %s", strerror(errno));
+                            break;
+                        }
+                    }
+                    else if (ls4 >= 0 && FD_ISSET(ls4, &readfds))
+                        rc = recvfrom(ls4, (char*)buf.data(), buf.size(), 0, (sockaddr*)&from, &from_len);
+                    else if (ls6 >= 0 && FD_ISSET(ls6, &readfds))
+                        rc = recvfrom(ls6, (char*)buf.data(), buf.size(), 0, (sockaddr*)&from, &from_len);
+                    else
+                        continue;
+
+                    if (rc > 0) {
+                        auto pkts = getNewPacket();
+                        auto& pkt = pkts.front();
+                        pkt.data.insert(pkt.data.end(), buf.begin(), buf.begin()+rc);
+                        pkt.from = {from, from_len};
+                        pkt.received = clock::now();
+                        onReceived(std::move(pkts));
+                    } else if (rc == -1) {
+                        if (logger)
+                            logger->e("Error receiving packet: %s", strerror(errno));
+                        int err = errno;
+                        if (err == EPIPE || err == ENOTCONN || err == ECONNRESET) {
+                            if (not running) break;
+                            std::unique_lock<std::mutex> lk(lock, std::try_to_lock);
+                            if (lk.owns_lock()) {
+                                if (not running) break;
+                                if (ls4 >= 0) {
+                                    close(ls4);
+                                    try {
+                                        ls4 = bindSocket(bound4, bound4);
+                                    } catch (const DhtException& e) {
+                                        if (logger)
+                                            logger->e("Can't bind inet socket: %s", e.what());
+                                    }
+                                }
+                                if (ls6 >= 0) {
+                                    close(ls6);
+                                    try {
+                                        ls6 = bindSocket(bound6, bound6);
+                                    } catch (const DhtException& e) {
+                                        if (logger)
+                                            logger->e("Can't bind inet6 socket: %s", e.what());
+                                    }
+                                }
+                                if (ls4 < 0 && ls6 < 0)
+                                    break;
+                                s4 = ls4;
+                                s6 = ls6;
+                                selectFd = std::max({ls4, ls6, stop_readfd}) + 1;
+                            } else {
+                                break;
+                            }
+                        }
+                    }
+                }
+            }
+        } catch (const std::exception& e) {
+            if (logger)
+                logger->e("Error in UdpSocket rx thread: %s", e.what());
+        }
+        if (ls4 >= 0)
+            close(ls4);
+        if (ls6 >= 0)
+            close(ls6);
+        if (stop_readfd != -1)
+            close(stop_readfd);
+        if (stopfd != -1)
+            close(stopfd);
+        std::unique_lock<std::mutex> lk(lock, std::try_to_lock);
+        if (lk.owns_lock()) {
+            s4 = -1;
+            s6 = -1;
+            bound4 = {};
+            bound6 = {};
+            stopfd = -1;
+        }
+    });
+}
+
+void
+UdpSocket::stop()
+{
+    if (running.exchange(false)) {
+        auto sfd = stopfd;
+        if (sfd != -1 && write(sfd, "\0", 1) == -1) {
+            if (logger)
+                logger->e("Can't write to stop fd");
         }
     }
 }
 
-UdpSocket::~UdpSocket()
-{
-    stop();
-}
-
-int UdpSocket::sendTo(const SockAddr& dest, const uint8_t* data, size_t size, bool replied)
-{
-    asio::ip::udp::socket* sock = nullptr;
-    if (dest.isV4())
-        sock = &s4;
-    else if (dest.isV6())
-        sock = &s6;
-    else
-        return -1;
-
-    try {
-        asio::ip::udp::endpoint endpoint(dest.toAsio());
-        return sock->send_to(asio::buffer(data, size), endpoint);
-    } catch (...) {
-        return -1;
-    }
-}
-
-void UdpSocket::stop()
-{
-    s4.cancel();
-    s4.close();
-    s6.cancel();
-    s6.close();
-}
-*/
-
 }
 }

src/node.cpp

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2022 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
  *  Author(s) : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *              Simon Désaulniers <simon.desaulniers@savoirfairelinux.com>
  *
@@ -167,7 +167,7 @@ Node::toString() const
 
 std::ostream& operator<< (std::ostream& s, const Node& h)
 {
-    s << h.id << " " << h.addr;
+    s << h.id << " " << h.addr.toString();
     return s;
 }
 
@@ -188,8 +188,7 @@ NodeExport::msgpack_unpack(msgpack::object o)
     if (maddr.via.bin.size > sizeof(sockaddr_storage))
         throw msgpack::type_error();
     id.msgpack_unpack(o.via.map.ptr[0].val);
-    //addr = {(const sockaddr*)maddr.via.bin.ptr, (socklen_t)maddr.via.bin.size};
-    // TODO
+    addr = {(const sockaddr*)maddr.via.bin.ptr, (socklen_t)maddr.via.bin.size};
 }
 
 std::ostream& operator<< (std::ostream& s, const NodeExport& h)

src/node_cache.cpp

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2022 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
  *  Author(s) : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -20,8 +20,8 @@
 
 namespace dht {
 
-constexpr size_t CLEANUP_MAX_NODES {1024};
-constexpr size_t CLEANUP_FREQ {1024};
+constexpr size_t CLEANUP_MAX_NODES {4 * 1024};
+constexpr size_t CLEANUP_FREQ {4 * 1024};
 
 NodeCache::~NodeCache()
 {
@@ -38,7 +38,7 @@ Sp<Node>
 NodeCache::getNode(const InfoHash& id, const SockAddr& addr, time_point now, bool confirm, bool client) {
     if (not id)
         return std::make_shared<Node>(id, addr, rd, client);
-    return cache(addr.protocol().family()).getNode(id, addr, now, confirm, client, rd);
+    return cache(addr.getFamily()).getNode(id, addr, now, confirm, client, rd);
 }
 
 std::vector<Sp<Node>>

src/op_cache.cpp

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2022 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
  *  Author(s) : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify

src/op_cache.h

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2022 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
  *  Author(s) : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify

src/parsed_message.h

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2022 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
  *  Author(s) : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -18,6 +18,7 @@
  #pragma once
 
 #include "infohash.h"
+#include "sockaddr.h"
 #include "net.h"
 
 #include <map>
@@ -312,29 +313,15 @@ ParsedMessage::msgpack_unpack(const msgpack::object& msg)
             throw msgpack::type_error();
         auto l = parsedReq.sa->via.bin.size;
         if (l == sizeof(in_addr)) {
-            addr = {asio::ip::address_v4({
-                (uint8_t)parsedReq.sa->via.bin.ptr[0], 
-                (uint8_t)parsedReq.sa->via.bin.ptr[1], 
-                (uint8_t)parsedReq.sa->via.bin.ptr[2], 
-                (uint8_t)parsedReq.sa->via.bin.ptr[3]}), 0};
+            addr.setFamily(AF_INET);
+            auto& a = addr.getIPv4();
+            a.sin_port = 0;
+            std::copy_n(parsedReq.sa->via.bin.ptr, l, (char*)&a.sin_addr);
         } else if (l == sizeof(in6_addr)) {
-            addr = {asio::ip::address_v6({
-                (uint8_t)parsedReq.sa->via.bin.ptr[0], 
-                (uint8_t)parsedReq.sa->via.bin.ptr[1], 
-                (uint8_t)parsedReq.sa->via.bin.ptr[2], 
-                (uint8_t)parsedReq.sa->via.bin.ptr[3], 
-                (uint8_t)parsedReq.sa->via.bin.ptr[4], 
-                (uint8_t)parsedReq.sa->via.bin.ptr[5], 
-                (uint8_t)parsedReq.sa->via.bin.ptr[6], 
-                (uint8_t)parsedReq.sa->via.bin.ptr[7], 
-                (uint8_t)parsedReq.sa->via.bin.ptr[8], 
-                (uint8_t)parsedReq.sa->via.bin.ptr[9], 
-                (uint8_t)parsedReq.sa->via.bin.ptr[10], 
-                (uint8_t)parsedReq.sa->via.bin.ptr[11], 
-                (uint8_t)parsedReq.sa->via.bin.ptr[12], 
-                (uint8_t)parsedReq.sa->via.bin.ptr[13], 
-                (uint8_t)parsedReq.sa->via.bin.ptr[14], 
-                (uint8_t)parsedReq.sa->via.bin.ptr[15]}), 0};
+            addr.setFamily(AF_INET6);
+            auto& a = addr.getIPv6();
+            a.sin6_port = 0;
+            std::copy_n(parsedReq.sa->via.bin.ptr, l, (char*)&a.sin6_addr);
         }
     } else
         addr = {};

src/peer_discovery.cpp

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2022 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
  *  Author(s) : Mingrui Zhang <mingrui.zhang@savoirfairelinux.com>
  *              Vsevolod Ivanov <vsevolod.ivanov@savoirfairelinux.com>
  *              Adrien Béraud <adrien.beraud@savoirfairelinux.com>
@@ -19,6 +19,7 @@
  */
 
 #include "peer_discovery.h"
+#include "network_utils.h"
 #include "utils.h"
 
 #include <asio.hpp>
@@ -152,7 +153,7 @@ PeerDiscovery::DomainPeerDiscovery::loopListener()
                             return;
                     }
                     if (cb)
-                        cb(std::move(o.val), receiveFrom_);
+                        cb(std::move(o.val), SockAddr{ receiveFrom_.data(), (socklen_t)receiveFrom_.size() });
                 }
             } else {
                 throw msgpack::type_error{};

src/request.h

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2022 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
  *  Author(s) : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *              Simon Désaulniers <simon.desaulniers@savoirfairelinux.com>
  *
@@ -21,7 +21,6 @@
 
 #include "net.h"
 #include "value.h"
-#include <asio/steady_timer.hpp>
 
 namespace dht {
 struct Node;
@@ -141,7 +140,6 @@ private:
     duration attempt_duration {((duration)Node::MAX_RESPONSE_TIME)/2};
     time_point start {time_point::min()};      /* time when the request is created. */
     time_point last_try {time_point::min()};   /* time of the last attempt to process the request. */
-    std::unique_ptr<asio::steady_timer> expiration_timer;
 
     std::function<void(const Request&, ParsedMessage&&)> on_done {};
     std::function<bool(const Request&, DhtProtocolException&&)> on_error {};

src/rng.cpp

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2022 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
  *  Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify

src/routing_table.cpp

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2022 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
  *  Author(s) : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify

src/search.h

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2022 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
  *  Author(s) : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -23,10 +23,6 @@
 #include "listener.h"
 #include "value_cache.h"
 #include "op_cache.h"
-#include "node.h"
-#include "dht.h"
-
-#include <asio/steady_timer.hpp>
 
 namespace dht {
 
@@ -56,7 +52,7 @@ struct Dht::SearchNode {
 
     struct AnnounceStatus {
         Sp<net::Request> req {};
-        std::unique_ptr<asio::steady_timer> refresh {};
+        Sp<Scheduler::Job> refresh {};
         time_point refresh_time;
         AnnounceStatus(){};
         AnnounceStatus(Sp<net::Request> r, time_point t): req(std::move(r)), refresh_time(t)
@@ -76,9 +72,8 @@ struct Dht::SearchNode {
 
     struct CachedListenStatus {
         ValueCache cache;
-        std::unique_ptr<asio::steady_timer> refresh {};
-        std::unique_ptr<asio::steady_timer> cacheExpirationJob {};
-        std::function<void()> onCacheExpired {};
+        Sp<Scheduler::Job> refresh {};
+        Sp<Scheduler::Job> cacheExpirationJob {};
         Sp<net::Request> req {};
         Tid socketId {0};
         CachedListenStatus(ValueStateCallback&& cb, SyncCallback scb, Tid sid)
@@ -90,14 +85,6 @@ struct Dht::SearchNode {
                 req->node->closeSocket(socketId);
             }
         }
-
-        void scheduleCacheExpired(const time_point& t) {
-            cacheExpirationJob->expires_at(t);
-            cacheExpirationJob->async_wait([cb = onCacheExpired](const asio::error_code &ec){
-                if (ec != asio::error::operation_aborted)
-                    cb();
-            });
-        }
     };
     using NodeListenerStatus = std::map<Sp<Query>, CachedListenStatus>;
 
@@ -114,7 +101,7 @@ struct Dht::SearchNode {
 
     Blob token {};                                 /* last token the node sent to us after a get request */
     time_point last_get_reply {time_point::min()}; /* last time received valid token */
-    std::unique_ptr<asio::steady_timer> syncJob {};
+    Sp<Scheduler::Job> syncJob {};
     bool candidate {false};                        /* A search node is candidate if the search is/was synced and this
                                                       node is a new candidate for inclusion. */
 
@@ -251,17 +238,18 @@ struct Dht::SearchNode {
         getStatus.clear();
     }
 
-    void onValues(const Sp<Query>& q, net::RequestAnswer&& answer, const TypeStore& types, const time_point& now)
+    void onValues(const Sp<Query>& q, net::RequestAnswer&& answer, const TypeStore& types, Scheduler& scheduler)
     {
         auto l = listenStatus.find(q);
         if (l != listenStatus.end()) {
-            l->second.scheduleCacheExpired(l->second.cache.onValues(answer.values,
+            auto next = l->second.cache.onValues(answer.values,
                                      answer.refreshed_values,
-                                     answer.expired_values, types, now));
+                                     answer.expired_values, types, scheduler.time());
+            scheduler.edit(l->second.cacheExpirationJob, next);
         }
     }
 
-    void onListenSynced(const Sp<Query>& q, bool synced = true, std::unique_ptr<asio::steady_timer> refreshJob = {}) {
+    void onListenSynced(const Sp<Query>& q, bool synced = true, Sp<Scheduler::Job> refreshJob = {}) {
         auto l = listenStatus.find(q);
         if (l != listenStatus.end()) {
             if (l->second.refresh)
@@ -271,10 +259,11 @@ struct Dht::SearchNode {
         }
     }
 
-    void expireValues(const Sp<Query>& q, const time_point& now) {
+    void expireValues(const Sp<Query>& q, Scheduler& scheduler) {
         auto l = listenStatus.find(q);
         if (l != listenStatus.end()) {
-            l->second.scheduleCacheExpired(l->second.cache.expireValues(now));
+            auto next = l->second.cache.expireValues(scheduler.time());
+            scheduler.edit(l->second.cacheExpirationJob, next);
         }
     }
 
@@ -420,17 +409,7 @@ struct Dht::Search {
     uint16_t tid;
     time_point refill_time {time_point::min()};
     time_point step_time {time_point::min()};           /* the time of the last search step */
-    std::unique_ptr<asio::steady_timer> nextSearchStep {};
-    std::function<void()> onSearchStep {};
-    void scheduleStep(const time_point& now) {
-        if (nextSearchStep) {
-            nextSearchStep->expires_at(now);
-            nextSearchStep->async_wait([cb=onSearchStep](const asio::error_code &ec){
-                if (ec != asio::error::operation_aborted)
-                    cb();
-            });
-        }
-    }
+    Sp<Scheduler::Job> nextSearchStep {};
 
     bool expired {false};              /* no node, or all nodes expired */
     bool done {false};                 /* search is over, cached for later */
@@ -453,9 +432,7 @@ struct Dht::Search {
 
     /* Cache */
     SearchCache cache;
-    //std::unique_ptr<asio::steady_timer> opExpirationJob;
-    std::unique_ptr<asio::steady_timer> opExpirationJob {};
-
+    Sp<Scheduler::Job> opExpirationJob;
 
     ~Search() {
         if (opExpirationJob)
@@ -508,6 +485,8 @@ struct Dht::Search {
      */
     bool isSynced(time_point now) const;
 
+    unsigned syncLevel(time_point now) const;
+
     /**
      * Get the time of the last "get" operation performed on this search,
      * or time_point::min() if no such operation have been performed.
@@ -560,57 +539,46 @@ struct Dht::Search {
     bool isAnnounced(Value::Id id) const;
     bool isListening(time_point now, duration exp) const;
 
-    void get(const Value::Filter& f, const Sp<Query>& q, const QueryCallback& qcb, const GetCallback& gcb, const DoneCallback& dcb, const time_point& now) {
+    void get(const Value::Filter& f, const Sp<Query>& q, const QueryCallback& qcb, const GetCallback& gcb, const DoneCallback& dcb, Scheduler& scheduler) {
         if (gcb or qcb) {
             if (not cache.get(f, q, gcb, dcb)) {
+                const auto& now = scheduler.time();
                 callbacks.emplace(now, Get { now, f, q, qcb, gcb, dcb });
-                scheduleStep(now);
+                scheduler.edit(nextSearchStep, now);
             }
         }
     }
 
-    size_t listen(const ValueCallback& cb, Value::Filter&& f, const Sp<Query>& q, const time_point& now) {
+    size_t listen(const ValueCallback& cb, Value::Filter&& f, const Sp<Query>& q, Scheduler& scheduler) {
         //DHT_LOG.e(id, "[search %s IPv%c] listen", id.toString().c_str(), (af == AF_INET) ? '4' : '6');
         return cache.listen(cb, q, std::move(f), [&](const Sp<Query>& q, ValueCallback vcb, SyncCallback scb){
             done = false;
             auto token = ++listener_token;
             listeners.emplace(token, SearchListener{q, vcb, scb});
-            scheduleStep(now);
+            scheduler.edit(nextSearchStep, scheduler.time());
             return token;
         });
     }
 
-    time_point expireListeners(const time_point& now) {
-        return cache.expire(now, [&](size_t t){
-            const auto& ll = listeners.find(t);
-            if (ll != listeners.cend()) {
-                auto query = ll->second.query;
-                listeners.erase(ll);
-                if (listeners.empty()) {
-                    for (auto& sn : nodes) sn->cancelListen();
-                } else if (query) {
-                    for (auto& sn : nodes) sn->cancelListen(query);
-                }
-            }
-        });
-    }
-
-    void scheduleListenerExpiration() {
-        opExpirationJob->async_wait([this](const asio::error_code &ec){
-            if (ec != asio::error::operation_aborted) {
-                opExpirationJob->expires_at(expireListeners(clock::now()));
-                scheduleListenerExpiration();
-            }
-        });
-    }
-
-    void cancelListen(size_t token, const time_point& now) {
-        if (cache.cancelListen(token, now)) {
-            if (opExpirationJob) {
-                opExpirationJob->expires_at(cache.getExpiration());
-                scheduleListenerExpiration();
-            }
-        }
+    void cancelListen(size_t token, Scheduler& scheduler) {
+        cache.cancelListen(token, scheduler.time());
+        if (not opExpirationJob)
+            opExpirationJob = scheduler.add(time_point::max(), [this,&scheduler]{
+                auto nextExpire = cache.expire(scheduler.time(), [&](size_t t){
+                    const auto& ll = listeners.find(t);
+                    if (ll != listeners.cend()) {
+                        auto query = ll->second.query;
+                        listeners.erase(ll);
+                        if (listeners.empty()) {
+                            for (auto& sn : nodes) sn->cancelListen();
+                        } else if (query) {
+                            for (auto& sn : nodes) sn->cancelListen(query);
+                        }
+                    }
+                });
+                scheduler.edit(opExpirationJob, nextExpire);
+            });
+        scheduler.edit(opExpirationJob, cache.getExpiration());
     }
 
     std::vector<Sp<Value>> getPut() const {
@@ -929,6 +897,21 @@ Dht::Search::isSynced(time_point now) const
     return i > 0;
 }
 
+unsigned
+Dht::Search::syncLevel(time_point now) const
+{
+    unsigned i = 0;
+    for (const auto& n : nodes) {
+        if (n->isBad())
+            continue;
+        if (not n->isSynced(now))
+            return i;
+        if (++i == TARGET_NODES)
+            break;
+    }
+    return i;
+}
+
 time_point
 Dht::Search::getLastGetTime(const Query& q) const
 {

src/securedht.cpp

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2022 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
  *  Authors: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *           Simon Désaulniers <simon.desaulniers@savoirfairelinux.com>
  *           Sébastien Blin <sebastien.blin@savoirfairelinux.com>
@@ -66,7 +66,9 @@ SecureDht::SecureDht(std::unique_ptr<DhtInterface> dht, SecureDht::Config conf,
     }
 }
 
-SecureDht::~SecureDht() = default;
+SecureDht::~SecureDht(){
+    dht_.reset();
+}
 
 ValueType
 SecureDht::secureType(ValueType&& type)

src/storage.h

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2022 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
  *  Author(s) : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -72,7 +72,7 @@ struct ValueStorage {
     Sp<Value> data {};
     time_point created {};
     time_point expiration {};
-    std::unique_ptr<asio::steady_timer> expiration_job {};
+    Sp<Scheduler::Job> expiration_job {};
     StorageBucket* store_bucket {nullptr};
 
     ValueStorage() {}
@@ -83,7 +83,6 @@ struct ValueStorage {
 
 struct Storage {
     time_point maintenance_time {};
-    std::unique_ptr<asio::steady_timer> maintenance_job {};
     std::map<Sp<Node>, std::map<size_t, Listener>> listeners;
     std::map<size_t, LocalListener> local_listeners {};
     size_t listener_token {1};
@@ -282,7 +281,6 @@ std::pair<ssize_t, std::vector<Sp<Value>>>
 Storage::expire(const InfoHash& id, time_point now)
 {
     // expire listeners
-    ssize_t del_listen {0};
     for (auto nl_it = listeners.begin(); nl_it != listeners.end();) {
         auto& node_listeners = nl_it->second;
         for (auto l = node_listeners.cbegin(); l != node_listeners.cend();) {
@@ -294,7 +292,6 @@ Storage::expire(const InfoHash& id, time_point now)
         }
         if (node_listeners.empty()) {
             nl_it = listeners.erase(nl_it);
-            del_listen--;
         }
         else
             ++nl_it;

src/thread_pool.cpp

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2022 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
  *
  *  Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *
@@ -23,6 +23,7 @@
 #include <thread>
 #include <iostream>
 #include <ciso646> // fix windows compiler bug
+#include <cmath> // std::pow
 
 namespace dht {
 
@@ -38,18 +39,23 @@ ThreadPool::computation()
 ThreadPool&
 ThreadPool::io()
 {
-    static ThreadPool pool(IO_THREADS_MAX);
+    static ThreadPool pool(std::thread::hardware_concurrency(), IO_THREADS_MAX);
     return pool;
 }
 
 
-ThreadPool::ThreadPool(size_t maxThreads) : maxThreads_(maxThreads)
+ThreadPool::ThreadPool(unsigned minThreads, unsigned maxThreads)
+ : minThreads_(std::max(minThreads, 1u))
+ , maxThreads_(maxThreads ? std::max(minThreads_, maxThreads) : minThreads_)
 {
     threads_.reserve(maxThreads_);
+    if (minThreads_ != maxThreads_) {
+        threadDelayRatio_ = std::pow(3, 1.0 / (maxThreads_ - minThreads_));
+    }
 }
 
 ThreadPool::ThreadPool()
- : ThreadPool(std::max<size_t>(std::thread::hardware_concurrency(), 4))
+ : ThreadPool(std::max(std::thread::hardware_concurrency(), 4u))
 {}
 
 ThreadPool::~ThreadPool()
@@ -66,7 +72,9 @@ ThreadPool::run(std::function<void()>&& cb)
     // launch new thread if necessary
     if (not readyThreads_ && threads_.size() < maxThreads_) {
         try {
-            threads_.emplace_back(std::make_unique<std::thread>([this]() {
+            bool permanent_thread = threads_.size() < minThreads_;
+            auto& thread = *threads_.emplace_back(std::make_unique<std::thread>());
+            thread = std::thread([this, permanent_thread, e=threadExpirationDelay, &thread]() {
                 while (true) {
                     std::function<void()> task;
 
@@ -74,11 +82,13 @@ ThreadPool::run(std::function<void()>&& cb)
                     {
                         std::unique_lock<std::mutex> l(lock_);
                         readyThreads_++;
-                        cv_.wait(l, [&](){
-                            return not running_ or not tasks_.empty();
-                        });
+                        auto waitCond = [&](){ return not running_ or not tasks_.empty(); };
+                        if (permanent_thread)
+                            cv_.wait(l, waitCond);
+                        else 
+                            cv_.wait_for(l, e, waitCond);
                         readyThreads_--;
-                        if (not running_)
+                        if (not running_ or tasks_.empty())
                             break;
                         task = std::move(tasks_.front());
                         tasks_.pop();
@@ -92,7 +102,9 @@ ThreadPool::run(std::function<void()>&& cb)
                         std::cerr << "Exception running task: " << e.what() << std::endl;
                     }
                 }
-            }));
+                if (not permanent_thread)
+                    threadEnded(thread);
+            });
         } catch(const std::exception& e) {
             std::cerr << "Exception starting thread: " << e.what() << std::endl;
             if (threads_.empty())
@@ -108,9 +120,37 @@ ThreadPool::run(std::function<void()>&& cb)
 }
 
 void
-ThreadPool::stop()
+ThreadPool::threadEnded(std::thread& thread)
 {
     std::lock_guard<std::mutex> l(lock_);
+    tasks_.emplace([this,t=std::reference_wrapper<std::thread>(thread)]{
+        std::lock_guard<std::mutex> l(lock_);
+        for (auto it = threads_.begin(); it != threads_.end(); ++it) {
+            if (&*(*it) == &t.get()) {
+                t.get().join();
+                threads_.erase(it);
+                break;
+            }
+        }
+    });
+    // A thread expired, maybe after handling a one-time burst of tasks.
+    // If new threads start later, increase the expiration delay.
+    if (threadExpirationDelay > std::chrono::hours(24 * 7)) {
+        // If we reach 7 days, assume the thread is regularly used at full capacity
+        minThreads_ = std::min(minThreads_+1, maxThreads_);
+    } else {
+        threadExpirationDelay *= threadDelayRatio_;
+    }
+    cv_.notify_one();
+}
+
+void
+ThreadPool::stop(bool wait)
+{
+    std::unique_lock<std::mutex> l(lock_);
+    if (wait) {
+        cv_.wait(l, [&](){ return tasks_.empty(); });
+    }
     running_ = false;
     tasks_ = {};
     cv_.notify_all();
@@ -123,6 +163,7 @@ ThreadPool::join()
     for (auto& t : threads_)
         t->join();
     threads_.clear();
+    tasks_ = {};
 }
 
 void

src/udp_socket.cpp

@@ -1,150 +0,0 @@
-#include "udp_socket.h"
-
-namespace dht {
-namespace net {
-
-
-class UdpSocket::SocketHandler : public std::enable_shared_from_this<UdpSocket::SocketHandler> {
-public:
-    SocketHandler(const std::shared_ptr<strand>& strand, const udp::endpoint& endpoint)
-    : strand_(strand), socket_(strand->context())
-    {
-        asio::error_code ec;
-        socket_.open(endpoint.protocol(), ec);
-        if (ec)
-            throw std::runtime_error("Failed to open socket: " + ec.message());
-
-        socket_.set_option(asio::socket_base::reuse_address(true), ec);
-        if (ec)
-            throw std::runtime_error("Failed to set socket option: " + ec.message());
-
-        socket_.bind(endpoint, ec);
-        if (ec)
-            throw std::runtime_error("Failed to bind socket: " + ec.message());
-    }
-    void set_receive_callback(const ReceiveCallback& callback) {
-        receive_callback_ = callback;
-    }
-
-    void start_receive() {
-        receive_next();
-    }
-
-    void stop() {
-        socket_.close();
-    }
-
-    void send_to_async(std::vector<uint8_t> data, const udp::endpoint& to) {
-        auto ctx = std::make_shared<std::vector<uint8_t>>(std::move(data));
-        socket_.async_send_to(asio::buffer(*ctx), to, [ctx](const asio::error_code&, std::size_t) {});
-    }
-
-    asio::error_code send_to(const uint8_t* buf, size_t len, const udp::endpoint& to) {
-        asio::error_code ec;
-        socket_.send_to(asio::buffer(buf, len), to, 0, ec);
-        return ec;
-    }
-
-    udp::endpoint getBound() const {
-        return socket_.local_endpoint();
-    }
-
-private:
-    void receive_next() {
-        socket_.async_receive_from(asio::buffer(receive_buffer_),
-                remote_endpoint_,
-                asio::bind_executor(*strand_, [self = shared_from_this()](const asio::error_code& error, std::size_t bytes) {
-                    self->handle_receive(error, bytes);
-                    self->receive_next();
-                }));
-    }
-
-    void handle_receive(const asio::error_code& error, std::size_t bytes) {
-        if (!error) {
-            if (receive_callback_) {
-                receive_callback_(ReceivedPacket{std::vector<uint8_t>(receive_buffer_.begin(), receive_buffer_.begin() + bytes),
-                                      remote_endpoint_/*, std::chrono::high_resolution_clock::now()*/});
-            }
-        } else {
-            // Handle error
-        }
-    }
-
-    std::shared_ptr<strand> strand_;
-    udp::socket socket_;
-    udp::endpoint remote_endpoint_;
-    std::array<uint8_t, 65536> receive_buffer_;
-    ReceiveCallback receive_callback_;
-};
-
-UdpSocket::UdpSocket(std::shared_ptr<strand> strand, const udp::endpoint& ipv4_endpoint, const udp::endpoint& ipv6_endpoint)
-    //: strand_(strand)
-{
-    try {
-        ipv4_handler_ = std::make_shared<SocketHandler>(strand, ipv4_endpoint);
-    } catch (const std::exception&) {
-
-    }
-
-    // Try to use the same port for IPv6 if not specified
-    udp::endpoint ipv6_endpoint_stack;
-    if (ipv6_endpoint.port() == 0) {
-        ipv6_endpoint_stack = ipv6_endpoint;
-        ipv6_endpoint_stack.port(ipv4_handler_->getBound().port());
-    }
-    const auto& ipv6_endpoint_to_use = ipv6_endpoint.port() == 0 ? ipv6_endpoint_stack : ipv6_endpoint;
-
-    try {
-        ipv6_handler_ = std::make_shared<SocketHandler>(strand, ipv6_endpoint_to_use);
-    } catch (const std::exception&) {
-        
-    }
-    if (!ipv4_handler_ && !ipv6_handler_)
-        throw std::runtime_error("Failed to bind sockets");
-}
-
-void UdpSocket::setOnReceive(const ReceiveCallback& callback) {
-    ipv4_handler_->set_receive_callback(callback);
-    ipv6_handler_->set_receive_callback(callback);
-    start_receive();
-}
-
-void UdpSocket::start_receive() {
-    ipv4_handler_->start_receive();
-    ipv6_handler_->start_receive();
-}
-
-void UdpSocket::stop() {
-    ipv4_handler_->stop();
-    ipv6_handler_->stop();
-}
-
-void UdpSocket::sendToAsync(std::vector<uint8_t> data, const udp::endpoint& to) {
-    auto handler = (to.address().is_v4()) ? ipv4_handler_ : ipv6_handler_;
-    handler->send_to_async(std::move(data), to);
-}
-
-asio::error_code UdpSocket::sendTo(const uint8_t* buf, size_t len, const udp::endpoint& to) {
-    auto handler = (to.address().is_v4()) ? ipv4_handler_ : ipv6_handler_;
-    return handler->send_to(buf, len, to);
-}
-
-bool UdpSocket::hasIPv4() const {
-    return ipv4_handler_ != nullptr;
-}
-
-bool UdpSocket::hasIPv6() const {
-    return ipv6_handler_ != nullptr;
-}
-
-udp::endpoint UdpSocket::getBound(sa_family_t af) const {
-    if (af == AF_INET && ipv4_handler_) {
-        return ipv4_handler_->getBound();
-    } else if (af == AF_INET6 && ipv6_handler_) {
-        return ipv6_handler_->getBound();
-    }
-    throw std::runtime_error("Invalid address family");
-}
-
-}  // namespace net
-}  // namespace dht

src/utils.cpp

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2022 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
  *  Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -21,6 +21,7 @@
 #endif
 
 #include "utils.h"
+#include "sockaddr.h"
 #include "default_types.h"
 
 /* An IPv4 equivalent to IN6_IS_ADDR_UNSPECIFIED */
@@ -40,6 +41,8 @@ const char* version() {
 
 const HexMap hex_map = {};
 
+static constexpr std::array<uint8_t, 12> MAPPED_IPV4_PREFIX {{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xff, 0xff}};
+
 std::pair<std::string, std::string>
 splitPort(const std::string& s) {
     if (s.empty())
@@ -60,7 +63,6 @@ splitPort(const std::string& s) {
     return {s.substr(0,found), s.substr(found+1)};
 }
 
-/*
 std::vector<SockAddr>
 SockAddr::resolve(const std::string& host, const std::string& service)
 {
@@ -100,23 +102,27 @@ SockAddr::setAddress(const char* address)
     if (inet_pton(family, address, addr) <= 0)
         throw std::runtime_error(std::string("Can't parse IP address: ") + strerror(errno));
 }
-*/
+
+void print_addr(std::ostream& out, const sockaddr* sa, socklen_t slen)
+{
+    char hbuf[NI_MAXHOST];
+    char sbuf[NI_MAXSERV];
+    if (sa and slen and !getnameinfo(sa, slen, hbuf, sizeof(hbuf), sbuf, sizeof(sbuf), NI_NUMERICHOST | NI_NUMERICSERV)) {
+        if (sa->sa_family == AF_INET6)
+            out << '[' << hbuf << ']';
+        else
+            out << hbuf;
+        if (std::strcmp(sbuf, "0"))
+            out << ':' << sbuf;
+    } else
+        out << "[invalid address]";
+}
 
 std::string
 print_addr(const sockaddr* sa, socklen_t slen)
 {
-    char hbuf[NI_MAXHOST];
-    char sbuf[NI_MAXSERV];
     std::ostringstream out;
-    if (sa and slen and !getnameinfo(sa, slen, hbuf, sizeof(hbuf), sbuf, sizeof(sbuf), NI_NUMERICHOST | NI_NUMERICSERV)) {
-        if (sa->sa_family == AF_INET6)
-            out << "[" << hbuf << "]";
-        else
-            out << hbuf;
-        if (std::strcmp(sbuf, "0"))
-            out << ":" << sbuf;
-    } else
-        out << "[invalid address]";
+    print_addr(out, sa, slen);
     return out.str();
 }
 
@@ -126,7 +132,6 @@ print_addr(const sockaddr_storage& ss, socklen_t sslen)
     return print_addr((const sockaddr*)&ss, sslen);
 }
 
-/*
 bool
 SockAddr::isUnspecified() const
 {
@@ -232,7 +237,7 @@ SockAddr::getMappedIPv6()
 
 bool operator==(const SockAddr& a, const SockAddr& b) {
     return a.equals(b);
-}*/
+}
 
 time_point from_time_t(std::time_t t) {
     auto dt = system_clock::from_time_t(t) - system_clock::now();

src/value.cpp

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2022 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
  *  Author(s) : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *              Simon Désaulniers <simon.desaulniers@savoirfairelinux.com>
  *