build/dev: cleanup launch.json

docker: install libtool
c: update dhtcnode
2026-11-08 20:37:23 +00:00 · 2022-04-12 15:24:17 -04:00 · 2022-04-12 15:24:17 -04:00 · 2022-04-12 15:24:17 -04:00 · 2022-04-12 15:23:45 -04:00 · 2022-04-11 17:18:30 -04:00
68 changed files with 1028 additions and 1997 deletions
@@ -29,24 +29,6 @@ jobs:
    - name: make check
      run: make check

-  build-ubuntu-minimal:
-    name: Ubuntu/GCC minimal build
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v3
-    - name: deps
-      run: |
-        sudo apt install libncurses5-dev libreadline-dev nettle-dev \
-        libgnutls28-dev libcppunit-dev libmsgpack-dev libargon2-0-dev
-    - name: cmake
-      run: |
-        mkdir build && cd build
-        cmake .. -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_BUILD_TYPE=Debug \
-                 -DOPENDHT_C=Off -DOPENDHT_TESTS=On -DOPENDHT_PEER_DISCOVERY=Off -DOPENDHT_PYTHON=Off \
-                 -DOPENDHT_TOOLS=On -DOPENDHT_PROXY_SERVER=Off -DOPENDHT_PROXY_CLIENT=Off
-    - name: make
-      run: cd build && make
-
  build-macos:
    name: macOS/Clang build
    runs-on: macos-11
@@ -55,13 +37,13 @@ jobs:
    - name: deps
      run: |
        brew install msgpack-cxx asio gnutls nettle readline fmt jsoncpp argon2 openssl http-parser cppunit
-
+    
    - name: restinio
      run: |
        mkdir restinio && cd restinio
-        wget https://github.com/aberaud/restinio/archive/bbaa034dbcc7555ce67df0f8a1475591a7441733.tar.gz
-        ls -l && tar -xzf bbaa034dbcc7555ce67df0f8a1475591a7441733.tar.gz
-        cd restinio-bbaa034dbcc7555ce67df0f8a1475591a7441733/dev
+        wget https://github.com/aberaud/restinio/archive/e0a261dd8488246a3cb8bbb3ea781ea5139c3c94.tar.gz
+        ls -l && tar -xzf e0a261dd8488246a3cb8bbb3ea781ea5139c3c94.tar.gz
+        cd restinio-e0a261dd8488246a3cb8bbb3ea781ea5139c3c94/dev
        cmake -DCMAKE_INSTALL_PREFIX=/usr/local -DRESTINIO_TEST=OFF -DRESTINIO_SAMPLE=OFF \
                -DRESTINIO_INSTALL_SAMPLES=OFF -DRESTINIO_BENCH=OFF -DRESTINIO_INSTALL_BENCHES=OFF \
                -DRESTINIO_FIND_DEPS=ON -DRESTINIO_ALLOW_SOBJECTIZER=Off -DRESTINIO_USE_BOOST_ASIO=none .
@@ -77,7 +59,7 @@ jobs:
        export PKG_CONFIG_PATH="/usr/local/opt/openssl@3/lib/pkgconfig"
        cmake .. -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_BUILD_TYPE=Debug \
                 -DOPENDHT_C=On -DOPENDHT_TESTS=On -DOPENDHT_PEER_DISCOVERY=On -DOPENDHT_PYTHON=Off \
-                 -DOPENDHT_TOOLS=On -DOPENDHT_PROXY_SERVER=On -DOPENDHT_PROXY_CLIENT=On -DOPENDHT_PUSH_NOTIFICATIONS=On
+                 -DOPENDHT_TOOLS=On -DOPENDHT_PROXY_SERVER=On -DOPENDHT_PROXY_CLIENT=On

    - name: make
      run: cd build && make
@@ -1,6 +1,6 @@
 name: Clang Static Analysis
-on: [push, pull_request]
-
+on:
+  push
 jobs:
  clang-analyzer:
    name: Clang Static Analysis
@@ -18,9 +18,9 @@ jobs:
      - name: restinio
        run: |
          mkdir restinio && cd restinio \
-          && wget https://github.com/aberaud/restinio/archive/bbaa034dbcc7555ce67df0f8a1475591a7441733.tar.gz \
-          && ls -l && tar -xzf bbaa034dbcc7555ce67df0f8a1475591a7441733.tar.gz \
-          && cd restinio-bbaa034dbcc7555ce67df0f8a1475591a7441733/dev \
+          && wget https://github.com/aberaud/restinio/archive/e0a261dd8488246a3cb8bbb3ea781ea5139c3c94.tar.gz \
+          && ls -l && tar -xzf e0a261dd8488246a3cb8bbb3ea781ea5139c3c94.tar.gz \
+          && cd restinio-e0a261dd8488246a3cb8bbb3ea781ea5139c3c94/dev \
          && cmake -DCMAKE_INSTALL_PREFIX=/usr -DRESTINIO_TEST=OFF -DRESTINIO_SAMPLE=OFF \
                  -DRESTINIO_INSTALL_SAMPLES=OFF -DRESTINIO_BENCH=OFF -DRESTINIO_INSTALL_BENCHES=OFF \
                  -DRESTINIO_FIND_DEPS=ON -DRESTINIO_ALLOW_SOBJECTIZER=Off -DRESTINIO_USE_BOOST_ASIO=none . \
@@ -30,6 +30,6 @@ jobs:
      - name: cmake
        run: |
          mkdir build && cd build && \
-          cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Debug -DOPENDHT_C=On -DOPENDHT_PEER_DISCOVERY=On -DOPENDHT_PYTHON=Off -DOPENDHT_TOOLS=On -DOPENDHT_PROXY_SERVER=On -DOPENDHT_PROXY_CLIENT=On -DOPENDHT_PUSH_NOTIFICATIONS=On
+          cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Debug -DOPENDHT_C=On -DOPENDHT_PEER_DISCOVERY=On -DOPENDHT_PYTHON=Off -DOPENDHT_TOOLS=On -DOPENDHT_PROXY_SERVER=On -DOPENDHT_PROXY_CLIENT=On
      - name: scan-build
        run: cd build && scan-build --status-bugs make
@@ -1,53 +0,0 @@
-name: "CodeQL"
-
-on:
-  push:
-    branches: [ "master" ]
-  pull_request:
-    # The branches below must be a subset of the branches above
-    branches: [ "master" ]
-
-jobs:
-  analyze:
-    name: Analyze
-    runs-on: ubuntu-latest
-    container:
-      image: ghcr.io/savoirfairelinux/opendht/opendht-deps:latest
-
-    permissions:
-      actions: read
-      contents: read
-      security-events: write
-
-    strategy:
-      fail-fast: false
-      matrix:
-        language: [ 'cpp' ]
-
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v3
-
-    # Initializes the CodeQL tools for scanning.
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
-      with:
-        languages: ${{ matrix.language }}
-        
-    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-    # If this step fails, then you should remove it and run the build manually (see below)
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
-
-    # ℹ️ Command-line programs to run using the OS shell.
-    # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
-
-    #   If the Autobuild fails above, remove it and uncomment the following three lines. 
-    #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
-
-    # - run: |
-    #   echo "Run, Build Application using script"
-    #   ./location_of_script_within_repo/buildscript.sh
-
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
@@ -1,258 +0,0 @@
-name: Release actions
-
-on:
-  push:
-    tags:
-    - 'v*'
-
-env:
-  REGISTRY: ghcr.io
-  IMAGE_NAME_DEPS: ${{ github.repository }}/opendht-deps
-  IMAGE_NAME: ${{ github.repository }}/opendht
-  IMAGE_NAME_DEPS_LLVM: ${{ github.repository }}/opendht-deps-llvm
-  IMAGE_NAME_LLVM: ${{ github.repository }}/opendht-llvm
-  IMAGE_NAME_DHTNODE: ${{ github.repository }}/dhtnode
-  IMAGE_NAME_ALPINE: ${{ github.repository }}/opendht-alpine
-
-jobs:
-  build-and-push-deps-image:
-    name: Dependency Docker image
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
-
-      - name: Log in to the Container registry
-        uses: docker/login-action@v2
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Extract metadata (tags, labels) for Docker
-        id: meta
-        uses: docker/metadata-action@v4
-        with:
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME_DEPS }}
-
-      - name: Build and push Docker image
-        uses: docker/build-push-action@v3
-        with:
-          context: .
-          file: docker/DockerfileDeps
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-
-  build-and-push-image:
-    name: OpenDHT Docker image
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
-
-      - name: Log in to the Container registry
-        uses: docker/login-action@v2
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Extract metadata (tags, labels) for Docker
-        id: meta
-        uses: docker/metadata-action@v4
-        with:
-          images: |
-            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-
-      - name: Build and push Docker image
-        uses: docker/build-push-action@v3
-        with:
-          context: .
-          file: docker/Dockerfile
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-
-  build-and-push-deps-image-llvm:
-    name: Dependency Docker image (LLVM)
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
-
-      - name: Log in to the Container registry
-        uses: docker/login-action@v2
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Extract metadata (tags, labels) for Docker
-        id: meta
-        uses: docker/metadata-action@v4
-        with:
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME_DEPS_LLVM }}
-
-      - name: Build and push Docker image
-        uses: docker/build-push-action@v3
-        with:
-          context: .
-          file: docker/DockerfileDepsLlvm
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-
-  build-and-push-image-llvm:
-    name: OpenDHT Docker image (LLVM)
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
-
-      - name: Log in to the Container registry
-        uses: docker/login-action@v2
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Extract metadata (tags, labels) for Docker
-        id: meta
-        uses: docker/metadata-action@v4
-        with:
-          images: |
-            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME_LLVM }}
-
-      - name: Build and push Docker image
-        uses: docker/build-push-action@v3
-        with:
-          context: .
-          file: docker/DockerfileLlvm
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-
-  build-and-push-image-dhtnode:
-    name: dhtnode Docker image
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
-
-      - name: Log in to the Container registry
-        uses: docker/login-action@v2
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Extract metadata (tags, labels) for Docker
-        id: meta
-        uses: docker/metadata-action@v4
-        with:
-          images: |
-            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME_DHTNODE }}
-
-      - name: Build and push Docker image
-        uses: docker/build-push-action@v3
-        with:
-          context: .
-          file: docker/DockerfileDhtnode
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-
-  build-and-push-image-alpine:
-    name: Alpine Docker image
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
-
-      - name: Log in to the Container registry
-        uses: docker/login-action@v2
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Extract metadata (tags, labels) for Docker
-        id: meta
-        uses: docker/metadata-action@v4
-        with:
-          images: |
-            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME_ALPINE }}
-
-      - name: Build and push Docker image
-        uses: docker/build-push-action@v3
-        with:
-          context: .
-          file: docker/DockerfileAlpine
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-
-  build-python-wheel:
-    name: Release and build Python Wheel package
-    runs-on: ubuntu-latest
-    container: ghcr.io/savoirfairelinux/opendht/opendht-deps:latest
-
-    permissions:
-      contents: write
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
-
-      - name: cmake
-        run: |
-          mkdir build && cd build && \
-          cmake .. -DCMAKE_INSTALL_PREFIX=/usr \
-                   -DCMAKE_BUILD_TYPE=Release \
-                   -DOPENDHT_STATIC=Off \
-                   -DOPENDHT_PYTHON=On \
-                   -DOPENDHT_C=Off \
-                   -DOPENDHT_PEER_DISCOVERY=On \
-                   -DOPENDHT_TOOLS=Off \
-                   -DOPENDHT_PROXY_SERVER=On \
-                   -DOPENDHT_PROXY_CLIENT=On
-
-      - name: build
-        run: cd build && make dist
-
-      - uses: actions/upload-artifact@v3
-        with:
-          name: opendht-wheels-linux
-          path: build/python/dist/*.whl
-
-      - name: Create Release
-        id: create_release
-        uses: softprops/action-gh-release@v1
-        with:
-          draft: true
-          files: build/python/dist/*.whl
@@ -20,9 +20,7 @@
            "command": "cmake",
            "args": [
                "${workspaceRoot}",
-                "-DCMAKE_EXPORT_COMPILE_COMMANDS=On",
                "-DCMAKE_BUILD_TYPE=Debug",
-                "-DOPENDHT_SANITIZE=On",
                "-DOPENDHT_PROXY_CLIENT=On",
                "-DOPENDHT_PROXY_SERVER=On",
                "-DOPENDHT_TESTS=On",
@@ -1,4 +1,10 @@
-cmake_minimum_required (VERSION 3.10..3.20)
+cmake_minimum_required (VERSION 3.10)
+if(POLICY CMP0065)
+  cmake_policy(SET CMP0065 NEW)
+endif()
+if(POLICY CMP0069)
+  cmake_policy(SET CMP0069 NEW)
+endif()
 if(POLICY CMP0073)
  cmake_policy(SET CMP0073 NEW)
 endif()
@@ -9,20 +15,18 @@ project (opendht)

 include(CMakePackageConfigHelpers)
 include(CMakeDependentOption)
-include(CheckIncludeFileCXX)
 include(FindPkgConfig)
 include(cmake/CheckAtomic.cmake)
-include(CTest)

 set (opendht_VERSION_MAJOR 2)
-set (opendht_VERSION_MINOR 4.12)
+set (opendht_VERSION_MINOR 4.0)
 set (opendht_VERSION ${opendht_VERSION_MAJOR}.${opendht_VERSION_MINOR})
 set (PACKAGE_VERSION ${opendht_VERSION})
 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_STATIC "Build static library" ON)
+option (OPENDHT_SHARED "Build shared library" ON)
 option (OPENDHT_LOG "Build with logs" ON)
 option (OPENDHT_PYTHON "Build Python bindings" OFF)
 option (OPENDHT_TOOLS "Build DHT tools" ON)
@@ -37,16 +41,13 @@ option (OPENDHT_PROXY_OPENSSL "Build DHT proxy with OpenSSL" ON)
 CMAKE_DEPENDENT_OPTION(OPENDHT_HTTP "Build embedded http(s) client" OFF "NOT OPENDHT_PROXY_SERVER;NOT OPENDHT_PROXY_CLIENT" ON)
 option (OPENDHT_PEER_DISCOVERY "Enable multicast peer discovery" ON)
 option (OPENDHT_INDEX "Build DHT indexation feature" OFF)
+option (OPENDHT_TESTS "Add unit tests executable" OFF)
 option (OPENDHT_TESTS_NETWORK "Enable unit tests that require network access" ON)
 option (OPENDHT_C "Build C bindings" OFF)

 find_package(Doxygen)
 option (OPENDHT_DOCUMENTATION "Create and install the HTML based API documentation (requires Doxygen)" ${DOXYGEN_FOUND})

-# Build flags
-set (CMAKE_CXX_STANDARD 17)
-set (CMAKE_CXX_STANDARD_REQUIRED on)
-
 # Dependencies
 if (NOT HAVE_CXX_ATOMICS_WITHOUT_LIB)
    link_libraries (atomic)
@@ -57,18 +58,16 @@ if (NOT MSVC)
    set (THREADS_PREFER_PTHREAD_FLAG TRUE)
    find_package (Threads)
    find_package (PkgConfig REQUIRED)
-    pkg_search_module (GnuTLS REQUIRED IMPORTED_TARGET gnutls)
-    pkg_search_module (Nettle REQUIRED IMPORTED_TARGET nettle)
-    find_package (msgpack REQUIRED NAMES msgpackc-cxx msgpack msgpack-cxx)
+    find_package (GnuTLS 3.3 REQUIRED)
+    pkg_search_module (Nettle REQUIRED nettle)
+    find_package (msgpack REQUIRED)
    if (OPENDHT_TOOLS)
        find_package (Readline 6 REQUIRED)
    endif ()
-    pkg_search_module(argon2 REQUIRED IMPORTED_TARGET libargon2)
-    set(argon2_lib ", libargon2")
-    pkg_search_module(Jsoncpp IMPORTED_TARGET jsoncpp)
+    pkg_search_module(argon2 REQUIRED libargon2)
+    pkg_search_module(Jsoncpp jsoncpp)
    if (Jsoncpp_FOUND)
        add_definitions(-DOPENDHT_JSONCPP)
-        set(jsoncpp_lib ", jsoncpp")
        list (APPEND opendht_SOURCES
          src/base64.h
          src/base64.cpp
@@ -85,16 +84,16 @@ if (NOT MSVC)
        add_library(fmt SHARED IMPORTED)
        find_library(HTTP_PARSER_LIBRARY http_parser)
        add_library(http_parser SHARED IMPORTED)
-        set(http_parser_lib "-lhttp_parser")
        if (NOT Jsoncpp_FOUND)
            message(SEND_ERROR "Jsoncpp is required for DHT proxy support")
        endif()
        if (OPENDHT_PROXY_OPENSSL)
            # https://cmake.org/cmake/help/latest/module/FindOpenSSL.html
-            pkg_search_module(OPENSSL REQUIRED IMPORTED_TARGET openssl)
+            pkg_search_module(OPENSSL REQUIRED openssl)
            if (OPENSSL_FOUND)
                message(STATUS "Found OpenSSL ${OPENSSL_VERSION} ${OPENSSL_INCLUDE_DIRS}")
-                set(openssl_lib ", openssl")
+                include_directories(SYSTEM ${OPENSSL_INCLUDE_DIRS})
+                link_directories (${OPENSSL_LIBRARY_DIRS})
            else ()
                message(SEND_ERROR "OpenSSL is required for DHT proxy as specified")
            endif()
@@ -128,8 +127,12 @@ if (OPENDHT_HTTP OR OPENDHT_PEER_DISCOVERY)
    add_definitions(-DASIO_STANDALONE)
 endif()

+# Build flags
+set (CMAKE_CXX_STANDARD 17)
+set (CMAKE_CXX_STANDARD_REQUIRED on)
+
 if (NOT MSVC)
-    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-return-type -Wno-deprecated -Wall -Wextra -Wnon-virtual-dtor -pedantic-errors -fvisibility=hidden")
+    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-return-type -Wall -Wextra -Wnon-virtual-dtor -pedantic-errors -fvisibility=hidden")
    if (OPENDHT_SANITIZE)
        set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address -fstack-protector-strong")
    endif ()
@@ -145,6 +148,9 @@ else ()
 endif ()
 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DMSGPACK_NO_BOOST -DMSGPACK_DISABLE_LEGACY_NIL -DMSGPACK_DISABLE_LEGACY_CONVERT")

+if (NOT CMAKE_BUILD_TYPE)
+    set(CMAKE_BUILD_TYPE Release)
+endif ()
 add_definitions(-DPACKAGE_VERSION="${opendht_VERSION}")
 if (OPENDHT_LOG)
    add_definitions(-DOPENDHT_LOG=true)
@@ -152,12 +158,27 @@ else ()
    add_definitions(-DOPENDHT_LOG=false)
 endif()

+if (MSGPACK_INCLUDE_DIRS)
+    include_directories (SYSTEM "${MSGPACK_INCLUDE_DIRS}")
+endif ()
+if (GNUTLS_INCLUDE_DIRS)
+    include_directories (SYSTEM "${GNUTLS_INCLUDE_DIRS}")
+endif ()
+if (Nettle_INCLUDE_DIRS)
+    include_directories (SYSTEM "${Nettle_INCLUDE_DIRS}")
+endif ()
 if (ASIO_INCLUDE_DIR)
    include_directories (SYSTEM "${ASIO_INCLUDE_DIR}")
 endif ()
 if (Restinio_INCLUDE_DIR)
    include_directories (SYSTEM "${Restinio_INCLUDE_DIR}")
 endif ()
+if (Jsoncpp_INCLUDE_DIRS)
+    include_directories (SYSTEM "${Jsoncpp_INCLUDE_DIRS}")
+endif ()
+link_directories (${Nettle_LIBRARY_DIRS})
+link_directories (${Jsoncpp_LIBRARY_DIRS})
+link_directories (${argon2_LIBRARY_DIRS})
 include_directories (
    ./
    include/
@@ -290,8 +311,20 @@ if (MSVC)
 endif ()

 # Targets
-if (MSVC)
-    if (OPENDHT_STATIC)
+if (OPENDHT_STATIC)
+    if (NOT MSVC)
+        add_library (opendht-static STATIC
+            ${opendht_SOURCES}
+            ${opendht_HEADERS}
+        )
+        set_target_properties (opendht-static PROPERTIES OUTPUT_NAME "opendht")
+        target_include_directories(opendht-static SYSTEM PRIVATE ${argon2_INCLUDE_DIRS})
+        target_link_libraries(opendht-static
+            PRIVATE  ${argon2_LIBRARIES}
+            PUBLIC ${CMAKE_THREAD_LIBS_INIT} ${GNUTLS_LIBRARIES} ${Nettle_STATIC_LIBRARIES}
+                   ${Jsoncpp_STATIC_LIBRARIES} ${FMT_LIBRARY} ${HTTP_PARSER_LIBRARY}
+                   ${OPENSSL_STATIC_LIBRARIES})
+    else ()
        if (OPENDHT_TOOLS)
            function (add_obj_lib name libfile)
                add_library(${name} OBJECT IMPORTED)
@@ -330,59 +363,56 @@ if (MSVC)
                ${PROJECT_SOURCE_DIR}/../openssl/libcrypto.lib
            )
        endif ()
+        add_library (opendht-static STATIC
+            ${opendht_SOURCES}
+            ${opendht_HEADERS}
+            ${obj_libs}
+        )
+        target_link_libraries(opendht-static PUBLIC ${Win32_STATIC_LIBRARIES} ${Win32_IMPORT_LIBRARIES})
        set(CMAKE_STATIC_LINKER_FLAGS "${CMAKE_STATIC_LINKER_FLAGS} /ignore:4006")
+        set_target_properties (opendht-static PROPERTIES OUTPUT_NAME "libopendht")
    endif()
+    install (TARGETS opendht-static DESTINATION ${CMAKE_INSTALL_LIBDIR} EXPORT opendht)
 endif ()

-add_library (opendht
-    ${opendht_SOURCES}
-    ${opendht_HEADERS}
-    ${obj_libs}
-)
-set_target_properties (opendht PROPERTIES OUTPUT_NAME "opendht")
-target_link_libraries(opendht
-    PRIVATE
-        PkgConfig::argon2
-        PkgConfig::Nettle
-        ${HTTP_PARSER_LIBRARY}
-    PUBLIC
-        ${CMAKE_THREAD_LIBS_INIT}
-        PkgConfig::GnuTLS
-        msgpackc-cxx
-        ${FMT_LIBRARY}
-)
-if (Jsoncpp_FOUND)
-    target_link_libraries(opendht PUBLIC PkgConfig::Jsoncpp)
-endif()
-if (OPENDHT_PROXY_OPENSSL)
-    target_link_libraries(opendht PUBLIC PkgConfig::OPENSSL)
-endif()
-if (APPLE)
-    target_link_libraries(opendht PRIVATE SYSTEM "-framework CoreFoundation" "-framework Security")
-endif()
-if (MSVC)
-    if (OPENDHT_STATIC)
-        target_link_libraries(opendht PUBLIC ${Win32_STATIC_LIBRARIES} ${Win32_IMPORT_LIBRARIES})
-        set_target_properties (opendht PROPERTIES OUTPUT_NAME "libopendht")
-    endif()
-endif ()
-
-if (BUILD_SHARED_LIBS)
+if (OPENDHT_SHARED)
+    add_library (opendht SHARED
+        ${opendht_SOURCES}
+        ${opendht_HEADERS}
+    )
    set_target_properties (opendht PROPERTIES IMPORT_SUFFIX "_import.lib")
    set_target_properties (opendht PROPERTIES SOVERSION ${opendht_VERSION_MAJOR} VERSION ${opendht_VERSION})
    target_compile_definitions(opendht PRIVATE OPENDHT_BUILD)
+    target_include_directories(opendht SYSTEM PRIVATE ${argon2_INCLUDE_DIRS})
+    if (APPLE)
+        target_link_libraries(opendht
+            PUBLIC ${CMAKE_THREAD_LIBS_INIT} ${OPENSSL_LIBRARIES}
+            PRIVATE ${GNUTLS_LIBRARIES} ${Nettle_LIBRARIES}
+                    ${Jsoncpp_LIBRARIES}
+                    ${FMT_LIBRARY} ${HTTP_PARSER_LIBRARY} ${argon2_LIBRARIES}
+            SYSTEM "-framework CoreFoundation" "-framework Security")
+    else ()
+        target_link_libraries(opendht
+            PUBLIC ${CMAKE_THREAD_LIBS_INIT} ${OPENSSL_LIBRARIES}
+            PRIVATE ${GNUTLS_LIBRARIES} ${Nettle_LIBRARIES}
+                    ${Jsoncpp_LIBRARIES}
+                    ${FMT_LIBRARY} ${HTTP_PARSER_LIBRARY} ${argon2_LIBRARIES})
+    endif ()
+
+    install (TARGETS opendht DESTINATION ${CMAKE_INSTALL_LIBDIR} EXPORT opendht)
 endif ()
-install (TARGETS opendht DESTINATION ${CMAKE_INSTALL_LIBDIR} EXPORT opendht)

 if (OPENDHT_C)
-    add_library (opendht-c
+    add_library (opendht-c SHARED
        c/opendht.cpp
        c/opendht_c.h
    )
    target_compile_definitions(opendht-c PRIVATE OPENDHT_C_BUILD)
-    target_link_libraries(opendht-c PRIVATE opendht)
-    set_target_properties (opendht-c PROPERTIES SOVERSION ${opendht_VERSION_MAJOR} VERSION ${opendht_VERSION})
-    install (TARGETS opendht-c DESTINATION ${CMAKE_INSTALL_LIBDIR} EXPORT opendht-c)
+    if (OPENDHT_SHARED)
+        target_link_libraries(opendht-c opendht)
+    else ()
+        target_link_libraries(opendht-c opendht-static)
+    endif ()

    # PkgConfig module
    configure_file (
@@ -390,6 +420,7 @@ if (OPENDHT_C)
        opendht-c.pc
        @ONLY
    )
+    install (TARGETS opendht-c DESTINATION ${CMAKE_INSTALL_LIBDIR} EXPORT opendht-c)
    install (FILES ${CMAKE_CURRENT_BINARY_DIR}/opendht-c.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
    install (FILES c/opendht_c.h DESTINATION ${CMAKE_INSTALL_PREFIX}/include/opendht)
 endif ()
@@ -422,8 +453,8 @@ install (EXPORT opendht DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/opendht FILE o
 install (FILES ${CMAKE_CURRENT_BINARY_DIR}/opendhtConfigVersion.cmake DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/opendht)

 # Unit tests
-if (BUILD_TESTING)
-    pkg_search_module(Cppunit REQUIRED IMPORTED_TARGET cppunit)
+if (OPENDHT_TESTS)
+    pkg_search_module(Cppunit REQUIRED cppunit)
    # unit testing
    list (APPEND test_FILES
        tests/infohashtester.h
@@ -457,10 +488,22 @@ if (BUILD_TESTING)
        tests/tests_runner.cpp
        ${test_FILES}
    )
-    target_link_libraries(opendht_unit_tests PRIVATE
-       opendht
+    target_include_directories(opendht_unit_tests SYSTEM PRIVATE ${Cppunit_INCLUDE_DIR})
+    target_link_directories(opendht_unit_tests PRIVATE ${Cppunit_LIBRARY_DIRS})
+    if (OPENDHT_SHARED)
+        target_link_libraries(opendht_unit_tests opendht)
+    else ()
+        target_link_libraries(opendht_unit_tests opendht-static)
+    endif ()
+    target_link_libraries(opendht_unit_tests
       ${CMAKE_THREAD_LIBS_INIT}
-       PkgConfig::Cppunit
+       ${Cppunit_LIBRARIES}
+       ${GNUTLS_LIBRARIES}
+       ${Jsoncpp_LIBRARIES}
    )
+    if (OPENDHT_PROXY_OPENSSL)
+        target_link_libraries(opendht_unit_tests ${OPENSSL_LIBRARIES})
+    endif()
+    enable_testing()
    add_test(TEST opendht_unit_tests)
 endif()
@@ -25,6 +25,11 @@ See the wiki: <https://github.com/savoirfairelinux/opendht/wiki>

 Build instructions: <https://github.com/savoirfairelinux/opendht/wiki/Build-the-library>

+#### How-to build a simple client app
+```bash
+g++ main.cpp -std=c++17 -lopendht
+```
+
 ## Examples
 ### C++ example
 The `tools` directory includes simple example programs :
@@ -112,3 +117,6 @@ See COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html for the full GPLv3 l
 ## Acknowledgements
 This project was originally based on https://github.com/jech/dht by Juliusz Chroboczek.
 It is independent from another project called OpenDHT (Sean Rhea. Ph.D. Thesis, 2005), now extinct.
+
+## Donations
+We gratefully accept Bitcoin donations to support OpenDHT development at: `bitcoin:3EykSd1An888efq4Bq3KaV3hJ3JQ4FPnwm`.
@@ -1,10 +1,7 @@
 lib_LTLIBRARIES = libopendht-c.la
 noinst_HEADERS = opendht_c.h

-AM_CPPFLAGS = -DOPENDHT_C_BUILD -isystem @top_srcdir@/include @JsonCpp_CFLAGS@ @MsgPack_CFLAGS@
-if OPENDHT_SHARED
-AM_CPPFLAGS += -Dopendht_c_EXPORTS
-endif
+AM_CPPFLAGS = -isystem @top_srcdir@/include @JsonCpp_CFLAGS@ @MsgPack_CFLAGS@

 libopendht_c_la_LIBADD = $(LIBOBJS) ../src/.libs/libopendht.la

@@ -32,11 +32,6 @@ extern "C" {

 #include <errno.h>

-const char* dht_version()
-{
-    return dht::version();
-}
-
 // dht::InfoHash

 inline dht_infohash dht_infohash_to_c(const dht::InfoHash& h) {
@@ -76,11 +71,7 @@ bool dht_infohash_is_zero(const dht_infohash* h) {
 }

 void dht_infohash_from_hex(dht_infohash* h, const char* dat) {
-    *h = dht_infohash_to_c(dht::InfoHash(std::string_view(dat, HASH_LEN*2)));
-}
-
-void dht_infohash_from_hex_null(dht_infohash* h, const char* dat) {
-    *h = dht_infohash_to_c(dht::InfoHash(std::string_view(dat)));
+    *h = dht_infohash_to_c(dht::InfoHash(std::string(dat, HASH_LEN*2)));
 }

 const char* dht_pkid_print(const dht_pkid* h) {
@@ -342,8 +333,6 @@ int dht_runner_run_config(dht_runner* r, in_port_t port, const dht_runner_config
        config.proxy_server = conf->proxy_server ? std::string(conf->proxy_server) : std::string{};
        config.push_node_id = conf->push_node_id ? std::string(conf->push_node_id) : std::string{};
        config.push_token = conf->push_token ? std::string(conf->push_token) : std::string{};
-        config.push_topic = conf->push_topic ? std::string(conf->push_topic) : std::string{};
-        config.push_platform = conf->push_platform ? std::string(conf->push_platform) : std::string{};
        config.peer_discovery = conf->peer_discovery;
        config.peer_publish = conf->peer_publish;

@@ -506,8 +495,14 @@ struct sockaddr** dht_runner_get_public_address(const dht_runner* r) {
    if (addrs.empty())
        return nullptr;
    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();
+    for (size_t i=0; i<addrs.size(); i++) {
+        if (const auto& addr = addrs[i]) {
+            ret[i] = (struct sockaddr*)malloc(addr.getLength());
+            memcpy((struct sockaddr*)ret[i], addr.get(), addr.getLength());
+        } else {
+            ret[i] = nullptr;
+        }
+    }
    ret[addrs.size()] = nullptr;
    return ret;
 }
@@ -36,8 +36,6 @@ struct OPENDHT_C_PUBLIC dht_data_view {
 };
 typedef struct dht_data_view dht_data_view;

-OPENDHT_C_PUBLIC const char* dht_version(void);
-
 // dht::Blob
 struct OPENDHT_C_PUBLIC dht_blob;
 typedef struct dht_blob dht_blob;
@@ -50,7 +48,6 @@ typedef struct dht_infohash dht_infohash;
 OPENDHT_C_PUBLIC void dht_infohash_zero(dht_infohash* h);
 OPENDHT_C_PUBLIC void dht_infohash_random(dht_infohash* h);
 OPENDHT_C_PUBLIC void dht_infohash_from_hex(dht_infohash* h, const char* dat);
-OPENDHT_C_PUBLIC void dht_infohash_from_hex_null(dht_infohash* h, const char* dat);
 OPENDHT_C_PUBLIC void dht_infohash_get(dht_infohash* h, const uint8_t* dat, size_t dat_size);
 OPENDHT_C_PUBLIC void dht_infohash_get_from_string(dht_infohash* h, const char* str);
 OPENDHT_C_PUBLIC const char* dht_infohash_print(const dht_infohash* h);
@@ -146,8 +143,6 @@ struct OPENDHT_PUBLIC dht_runner_config {
    const char* proxy_server;
    const char* push_node_id;
    const char* push_token;
-    const char* push_topic;
-    const char* push_platform;
    bool peer_discovery;
    bool peer_publish;
    dht_certificate* server_ca;
@@ -1,7 +1,7 @@
 dnl define macros
 m4_define([opendht_major_version], 2)
 m4_define([opendht_minor_version], 4)
-m4_define([opendht_patch_version], 12)
+m4_define([opendht_patch_version], 0)
 m4_define([opendht_version],
 		  [opendht_major_version.opendht_minor_version.opendht_patch_version])

@@ -18,26 +18,18 @@ AC_SUBST(OPENDHT_PATCH_VERSION, opendht_patch_version)

 AC_ARG_ENABLE([debug], AS_HELP_STRING([--enable-debug], [Build in debug mode, adds stricter warnings, disables optimization]))
 AS_IF([test "x$enable_debug" = "xyes"],
-      [CXXFLAGS="${CXXFLAGS} -g -Og -Wno-return-type -Wall -Wextra -Wnon-virtual-dtor -Wno-deprecated -pedantic-errors"],
-      [CXXFLAGS="${CXXFLAGS} -O3 -Wno-deprecated -pedantic-errors -fvisibility=hidden"])
+      [CXXFLAGS="${CXXFLAGS} -g -Wno-return-type -Wall -Wextra -Wnon-virtual-dtor -O0 -pedantic-errors"],
+      [CXXFLAGS="${CXXFLAGS} -O3 -pedantic-errors"])

-CPPFLAGS+=" -DOPENDHT_BUILD"
-AM_CONDITIONAL([OPENDHT_SHARED], [test "x$enable_shared" != xno])
-AM_COND_IF(OPENDHT_SHARED, [
-  CPPFLAGS+=" -Dopendht_EXPORTS"
-])
-
-AM_PROG_AR
-LT_INIT()
-LT_LANG(C++)
-AC_LANG(C++)
 AC_PROG_CXX
-AX_CXX_COMPILE_STDCXX(17,[noext],[mandatory])
+AM_PROG_AR

 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])
+AS_IF([test "x$enable_logs" != "xno"], [
+	AC_DEFINE([OPENDHT_LOG], [true], [Define if DHT logs are enabled])
+], [
+	AC_DEFINE([OPENDHT_LOG], [false], [Define if DHT logs are enabled])
 ])

 dnl Check for C binding
@@ -114,6 +106,11 @@ AM_CONDITIONAL(WIN32, [test "x$SYS" = "xmingw32"])
 AS_IF([test "x$SYS" = "xandroid"],
      [], [LDFLAGS="${LDFLAGS} -lpthread"])

+LT_INIT()
+LT_LANG(C++)
+
+AX_CXX_COMPILE_STDCXX(17,[noext],[mandatory])
+
 PKG_PROG_PKG_CONFIG()

 AC_ARG_ENABLE([proxy_server], AS_HELP_STRING([--enable-proxy-server], [Enable proxy server ability]), proxy_server=yes, proxy_server=no)
@@ -132,8 +129,8 @@ AC_ARG_ENABLE([proxy_client], AS_HELP_STRING([--enable-proxy-client], [Enable pr
 AM_CONDITIONAL(ENABLE_PROXY_CLIENT, test x$proxy_client == xyes)

 AC_ARG_ENABLE([tests], AS_HELP_STRING([--enable-tests], [Enable tests]), build_tests=yes, build_tests=no)
-AM_CONDITIONAL(ENABLE_TESTS, test "x$build_tests" == xyes)
-AS_IF([test "x$build_tests" == xyes], [
+AM_CONDITIONAL(ENABLE_TESTS, test x$build_tests == xyes)
+AM_COND_IF([ENABLE_TESTS], [
 	PKG_CHECK_MODULES([CppUnit], [cppunit >= 1.12])
 ])

@@ -141,9 +138,7 @@ AM_CONDITIONAL(PROXY_CLIENT_OR_SERVER, test x$proxy_client == xyes || test x$pro

 PKG_CHECK_MODULES([Nettle], [nettle >= 2.4])
 PKG_CHECK_MODULES([GnuTLS], [gnutls >= 3.3])
-AC_CHECK_HEADERS([msgpack.hpp], [], [
-  PKG_CHECK_MODULES([MsgPack], [msgpack >= 1.2])
-])
+PKG_CHECK_MODULES([MsgPack], [msgpack >= 1.2])
 PKG_CHECK_MODULES([Argon2], [libargon2])
 AC_SUBST(argon2_lib, [", libargon2"])

@@ -172,7 +167,7 @@ AS_IF([test "x$have_openssl" = "xyes"], [
 ])

 AM_COND_IF([PROXY_CLIENT_OR_SERVER], [
-    AC_CHECK_HEADERS([asio.hpp],, AC_MSG_ERROR([Missing Asio headers files]))
+    AC_CHECK_HEADERS([asio.hpp], exit,, 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"], [
@@ -12,6 +12,5 @@ RUN git clone https://github.com/savoirfairelinux/opendht.git \
 				-DOPENDHT_TOOLS=On \
 				-DOPENDHT_PROXY_SERVER=On \
 				-DOPENDHT_PROXY_CLIENT=On \
-				-DOPENDHT_SYSTEMD=On \
 	&& make -j8 && make install \
 	&& cd ../.. && rm -rf opendht
@@ -1,57 +0,0 @@
-FROM alpine:3.17 AS build
-LABEL maintainer="Adrien Béraud <adrien.beraud@savoirfairelinux.com>"
-LABEL org.opencontainers.image.source https://github.com/savoirfairelinux/opendht
-
-RUN apk add --no-cache \
-        build-base cmake ninja git wget \
-        cython python3-dev py3-setuptools \
-        ncurses-dev readline-dev nettle-dev \
-        cppunit-dev gnutls-dev jsoncpp-dev \
-        argon2-dev openssl-dev fmt-dev \
-        http-parser-dev asio-dev msgpack-cxx-dev \
-    && rm -rf /var/cache/apk/*
-
-RUN echo "*** Downloading RESTinio ***" \
-    && mkdir restinio && cd restinio \
-    && wget https://github.com/aberaud/restinio/archive/bbaa034dbcc7555ce67df0f8a1475591a7441733.tar.gz \
-    && tar -xzf bbaa034dbcc7555ce67df0f8a1475591a7441733.tar.gz \
-    && cd restinio-bbaa034dbcc7555ce67df0f8a1475591a7441733/dev \
-    && cmake -DCMAKE_INSTALL_PREFIX=/usr -DRESTINIO_TEST=OFF -DRESTINIO_SAMPLE=OFF \
-             -DRESTINIO_INSTALL_SAMPLES=OFF -DRESTINIO_BENCH=OFF -DRESTINIO_INSTALL_BENCHES=OFF \
-             -DRESTINIO_FIND_DEPS=ON -DRESTINIO_ALLOW_SOBJECTIZER=Off -DRESTINIO_USE_BOOST_ASIO=none . \
-    && make -j8 && make install \
-    && cd ../../.. && rm -rf restinio
-
-COPY . opendht
-
-RUN mkdir /install
-ENV DESTDIR /install
-
-RUN cd opendht && mkdir build && cd build \
-	&& cmake .. -DCMAKE_INSTALL_PREFIX=/usr \
-				-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=On \
-				-DOPENDHT_C=On \
-				-DOPENDHT_PEER_DISCOVERY=On \
-				-DOPENDHT_PYTHON=On \
-				-DOPENDHT_TOOLS=On \
-				-DOPENDHT_PROXY_SERVER=On \
-				-DOPENDHT_PROXY_CLIENT=On \
-				-DOPENDHT_SYSTEMD=On \
-	&& make -j8 && make install
-
-FROM alpine:3.17 AS install
-COPY --from=build /install /
-RUN apk add --no-cache \
-        libstdc++ \
-        gnutls \
-        nettle \
-        openssl \
-        argon2-dev \
-        jsoncpp \
-        fmt \
-        http-parser \
-        readline \
-        ncurses
-CMD ["dhtnode", "-b", "bootstrap.jami.net", "-p", "4222", "--proxyserver", "8080"]
-EXPOSE 4222/udp
-EXPOSE 8080/tcp
@@ -1,4 +1,4 @@
-FROM ubuntu:22.04
+FROM ubuntu:20.04
 LABEL maintainer="Adrien Béraud <adrien.beraud@savoirfairelinux.com>"
 LABEL org.opencontainers.image.source https://github.com/savoirfairelinux/opendht

@@ -10,7 +10,7 @@ RUN apt-get update && apt-get install -y \
 RUN apt-get update && apt-get install -y \
        build-essential pkg-config cmake git wget \
        libtool autotools-dev autoconf \
-        cython3 python3-dev python3-setuptools python3-build python3-virtualenv \
+        cython3 python3-dev python3-setuptools \
        libncurses5-dev libreadline-dev nettle-dev libcppunit-dev \
        libgnutls28-dev libuv1-dev libjsoncpp-dev libargon2-dev \
        libssl-dev libfmt-dev libhttp-parser-dev libasio-dev libmsgpack-dev \
@@ -18,9 +18,9 @@ RUN apt-get update && apt-get install -y \

 RUN echo "*** Downloading RESTinio ***" \
    && mkdir restinio && cd restinio \
-    && wget https://github.com/aberaud/restinio/archive/bbaa034dbcc7555ce67df0f8a1475591a7441733.tar.gz \
-    && ls -l && tar -xzf bbaa034dbcc7555ce67df0f8a1475591a7441733.tar.gz \
-    && cd restinio-bbaa034dbcc7555ce67df0f8a1475591a7441733/dev \
+    && wget https://github.com/aberaud/restinio/archive/e0a261dd8488246a3cb8bbb3ea781ea5139c3c94.tar.gz \
+    && ls -l && tar -xzf e0a261dd8488246a3cb8bbb3ea781ea5139c3c94.tar.gz \
+    && cd restinio-e0a261dd8488246a3cb8bbb3ea781ea5139c3c94/dev \
    && cmake -DCMAKE_INSTALL_PREFIX=/usr -DRESTINIO_TEST=OFF -DRESTINIO_SAMPLE=OFF \
             -DRESTINIO_INSTALL_SAMPLES=OFF -DRESTINIO_BENCH=OFF -DRESTINIO_INSTALL_BENCHES=OFF \
             -DRESTINIO_FIND_DEPS=ON -DRESTINIO_ALLOW_SOBJECTIZER=Off -DRESTINIO_USE_BOOST_ASIO=none . \
@@ -1,28 +0,0 @@
-FROM ubuntu:20.04
-LABEL maintainer="Adrien Béraud <adrien.beraud@savoirfairelinux.com>"
-LABEL org.opencontainers.image.source https://github.com/savoirfairelinux/opendht
-
-RUN apt-get update && apt-get install -y \
-        dialog apt-utils \
-    && apt-get clean \
-    && echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections
-
-RUN apt-get update && apt-get install -y \
-        build-essential pkg-config cmake git wget \
-        libtool autotools-dev autoconf \
-        cython3 python3-dev python3-setuptools \
-        libncurses5-dev libreadline-dev nettle-dev libcppunit-dev \
-        libgnutls28-dev libuv1-dev libjsoncpp-dev libargon2-dev \
-        libssl-dev libfmt-dev libhttp-parser-dev libasio-dev libmsgpack-dev \
-    && apt-get clean && rm -rf /var/lib/apt/lists/* /var/cache/apt/*
-
-RUN echo "*** Downloading RESTinio ***" \
-    && mkdir restinio && cd restinio \
-    && wget https://github.com/aberaud/restinio/archive/e0a261dd8488246a3cb8bbb3ea781ea5139c3c94.tar.gz \
-    && ls -l && tar -xzf e0a261dd8488246a3cb8bbb3ea781ea5139c3c94.tar.gz \
-    && cd restinio-e0a261dd8488246a3cb8bbb3ea781ea5139c3c94/dev \
-    && cmake -DCMAKE_INSTALL_PREFIX=/usr -DRESTINIO_TEST=OFF -DRESTINIO_SAMPLE=OFF \
-             -DRESTINIO_INSTALL_SAMPLES=OFF -DRESTINIO_BENCH=OFF -DRESTINIO_INSTALL_BENCHES=OFF \
-             -DRESTINIO_FIND_DEPS=ON -DRESTINIO_ALLOW_SOBJECTIZER=Off -DRESTINIO_USE_BOOST_ASIO=none . \
-    && make -j8 && make install \
-    && cd ../../.. && rm -rf restinio
@@ -1,4 +1,4 @@
-FROM ubuntu:22.04
+FROM ubuntu:20.04
 LABEL maintainer="Adrien Béraud <adrien.beraud@savoirfairelinux.com>"
 LABEL org.opencontainers.image.source https://github.com/savoirfairelinux/opendht

@@ -11,7 +11,7 @@ RUN apt-get update \
    && apt-get install -y llvm llvm-dev lldb clang gdb make cmake pkg-config \
       libtool git wget libncurses5-dev libreadline-dev \
       nettle-dev libgnutls28-dev libuv1-dev libmsgpack-dev libjsoncpp-dev cython3 python3-dev \
-       python3-setuptools libcppunit-dev python3-pip python3-build python3-virtualenv \
+       python3-setuptools libcppunit-dev python3-pip \
       autotools-dev autoconf libssl-dev libargon2-dev \
       libfmt-dev libhttp-parser-dev libasio-dev \
    && apt-get remove -y gcc g++ && apt-get autoremove -y \
@@ -22,9 +22,9 @@ ENV CXX c++

 RUN echo "*** Downloading RESTinio ***" \
    && mkdir restinio && cd restinio \
-    && wget https://github.com/aberaud/restinio/archive/bbaa034dbcc7555ce67df0f8a1475591a7441733.tar.gz \
-    && ls -l && tar -xzf bbaa034dbcc7555ce67df0f8a1475591a7441733.tar.gz \
-    && cd restinio-bbaa034dbcc7555ce67df0f8a1475591a7441733/dev \
+    && wget https://github.com/aberaud/restinio/archive/e0a261dd8488246a3cb8bbb3ea781ea5139c3c94.tar.gz \
+    && ls -l && tar -xzf e0a261dd8488246a3cb8bbb3ea781ea5139c3c94.tar.gz \
+    && cd restinio-e0a261dd8488246a3cb8bbb3ea781ea5139c3c94/dev \
    && cmake -DCMAKE_INSTALL_PREFIX=/usr -DRESTINIO_TEST=OFF -DRESTINIO_SAMPLE=OFF \
             -DRESTINIO_INSTALL_SAMPLES=OFF -DRESTINIO_BENCH=OFF -DRESTINIO_INSTALL_BENCHES=OFF \
             -DRESTINIO_FIND_DEPS=ON -DRESTINIO_ALLOW_SOBJECTIZER=Off -DRESTINIO_USE_BOOST_ASIO=none . \
@@ -1,4 +0,0 @@
-FROM ghcr.io/savoirfairelinux/opendht/opendht:latest
-CMD ["dhtnode", "-b", "bootstrap.jami.net", "-p", "4222", "--proxyserver", "8080"]
-EXPOSE 4222/udp
-EXPOSE 8080/tcp
@@ -1,16 +0,0 @@
-FROM ghcr.io/savoirfairelinux/opendht/opendht-deps-bionic:latest
-LABEL maintainer="Adrien Béraud <adrien.beraud@savoirfairelinux.com>"
-LABEL org.opencontainers.image.source https://github.com/savoirfairelinux/opendht
-
-RUN git clone https://github.com/savoirfairelinux/opendht.git \
-	&& cd opendht && mkdir build && cd build \
-	&& cmake .. -DCMAKE_INSTALL_PREFIX=/usr \
-				-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=On \
-				-DOPENDHT_C=On \
-				-DOPENDHT_PEER_DISCOVERY=On \
-				-DOPENDHT_PYTHON=On \
-				-DOPENDHT_TOOLS=On \
-				-DOPENDHT_PROXY_SERVER=On \
-				-DOPENDHT_PROXY_CLIENT=On \
-	&& make -j8 && make install \
-	&& cd ../.. && rm -rf opendht
@@ -12,6 +12,5 @@ RUN git clone https://github.com/savoirfairelinux/opendht.git \
 				-DOPENDHT_TOOLS=On \
 				-DOPENDHT_PROXY_SERVER=On \
 				-DOPENDHT_PROXY_CLIENT=On \
-				-DOPENDHT_SYSTEMD=On \
 	&& make -j8 && make install \
 	&& cd ../.. && rm -rf opendht
@@ -82,8 +82,6 @@ struct OPENDHT_PUBLIC NodeInfo {
    NodeStats ipv4 {};
    NodeStats ipv6 {};
    size_t ongoing_ops {0};
-    size_t storage_values {0};
-    size_t storage_size {0};
    in_port_t bound4 {0};
    in_port_t bound6 {0};

@@ -134,9 +132,6 @@ struct OPENDHT_PUBLIC Config {
    /* If non-0, overrides the default maximum store size. -1 means no limit.  */
    ssize_t max_store_size {0};

-    /* If non-0, overrides the default maximum store key count. -1 means no limit.  */
-    ssize_t max_store_keys {0};
-
    /**
     * Use appropriate bahavior for a public IP, stable node:
     *   - No connectivity change triggered when a search fails
@@ -32,9 +32,6 @@ extern "C" {

 #include <vector>
 #include <memory>
-#include <atomic>
-#include <mutex>
-#include <string_view>

 #ifdef _WIN32
 #include <iso646.h>
@@ -87,13 +84,12 @@ struct OPENDHT_PUBLIC PublicKey
    /** Import public key from serialized data */
    PublicKey(const uint8_t* dat, size_t dat_size);
    PublicKey(const Blob& pk) : PublicKey(pk.data(), pk.size()) {}
-    PublicKey(std::string_view pk) : PublicKey((const uint8_t*)pk.data(), pk.size()) {}
-    PublicKey(PublicKey&& o) noexcept : pk(o.pk) { o.pk = nullptr; }
+    PublicKey(PublicKey&& o) noexcept : pk(o.pk) { o.pk = nullptr; };

    ~PublicKey();
    explicit operator bool() const { return pk; }
    bool operator ==(const PublicKey& o) const {
-        return pk == o.pk || getLongId() == o.getLongId();
+        return pk == o.pk || getId() == o.getId();
    }
    bool operator !=(const PublicKey& o) const {
        return !(*this == o);
@@ -104,12 +100,12 @@ struct OPENDHT_PUBLIC PublicKey
    /**
     * Get public key fingerprint
     */
-   const InfoHash& getId() const;
+    InfoHash getId() const;

    /**
     * Get public key long fingerprint
     */
-    const PkId& getLongId() const;
+    PkId getLongId() const;

    bool checkSignature(const uint8_t* data, size_t data_len, const uint8_t* signature, size_t signature_len) const;
    inline bool checkSignature(const Blob& data, const Blob& signature) const {
@@ -120,9 +116,7 @@ struct OPENDHT_PUBLIC PublicKey
    inline Blob encrypt(const Blob& data) const {
        return encrypt(data.data(), data.size());
    }
-    inline Blob encrypt(std::string_view data) const {
-        return encrypt((const uint8_t*)data.data(), data.size());
-    }
+
    void pack(Blob& b) const;
    int pack(uint8_t* out, size_t* out_len) const;
    void unpack(const uint8_t* dat, size_t dat_size);
@@ -144,11 +138,6 @@ struct OPENDHT_PUBLIC PublicKey

    gnutls_pubkey_t pk {nullptr};
 private:
-    mutable InfoHash cachedId_ {};
-    mutable PkId cachedLongId_ {};
-    mutable std::atomic_bool idCached_ {false};
-    mutable std::atomic_bool longIdCached_ {false};
-
    PublicKey(const PublicKey&) = delete;
    PublicKey& operator=(const PublicKey&) = delete;
    void encryptBloc(const uint8_t* src, size_t src_size, uint8_t* dst, size_t dst_size) const;
@@ -171,9 +160,7 @@ struct OPENDHT_PUBLIC PrivateKey
    PrivateKey& operator=(PrivateKey&& o) noexcept;

    PrivateKey(const uint8_t* src, size_t src_size, const char* password = nullptr);
-    PrivateKey(const Blob& src, const std::string& password = {}) : PrivateKey(src.data(), src.size(), password.c_str()) {}
-    PrivateKey(std::string_view src, const std::string& password = {}) : PrivateKey((const uint8_t*)src.data(), src.size(), password.c_str()) {}
-
+    PrivateKey(const Blob& src, const std::string& password = {}) : PrivateKey(src.data(), src.size(), password.data()) {}
    ~PrivateKey();
    explicit operator bool() const { return key; }

@@ -188,7 +175,6 @@ struct OPENDHT_PUBLIC PrivateKey
     * @returns the signature data.
     */
    Blob sign(const uint8_t* data, size_t data_len) const;
-    inline Blob sign(std::string_view dat) const { return sign((const uint8_t*)dat.data(), dat.size()); }
    inline Blob sign(const Blob& dat) const { return sign(dat.data(), dat.size()); }

    /**
@@ -215,7 +201,6 @@ private:
    PrivateKey& operator=(const PrivateKey&) = delete;
    Blob decryptBloc(const uint8_t* src, size_t src_size) const;

-    mutable std::mutex publicKeyMutex_ {};
    mutable std::shared_ptr<PublicKey> publicKey_ {};
 };

@@ -301,7 +286,6 @@ class OPENDHT_PUBLIC CertificateRequest {
 public:
    CertificateRequest();
    CertificateRequest(const uint8_t* data, size_t size);
-    CertificateRequest(std::string_view src) : CertificateRequest((const uint8_t*)src.data(), src.size()) {}
    CertificateRequest(const Blob& data) : CertificateRequest(data.data(), data.size()) {}

    CertificateRequest(CertificateRequest&& o) noexcept : request(std::move(o.request)) {
@@ -335,9 +319,8 @@ private:
 class OPENDHT_PUBLIC OcspRequest
 {
 public:
-    OcspRequest(gnutls_ocsp_req_t r) : request(r) {}
+    OcspRequest(gnutls_ocsp_req_t r) : request(r) {};
    OcspRequest(const uint8_t* dat_ptr, size_t dat_size);
-    OcspRequest(std::string_view dat): OcspRequest((const uint8_t*)dat.data(), dat.size()) {}
    ~OcspRequest();

    /*
@@ -355,7 +338,7 @@ class OPENDHT_PUBLIC OcspResponse
 {
 public:
    OcspResponse(const uint8_t* dat_ptr, size_t dat_size);
-    OcspResponse(std::string_view response) : OcspResponse((const uint8_t*)response.data(), response.size()) {}
+    OcspResponse(const std::string& response) : OcspResponse((const uint8_t*)response.data(), response.size()) {};
    ~OcspResponse();

    Blob pack() const;
@@ -397,10 +380,12 @@ struct OPENDHT_PUBLIC Certificate {
     * ordered from subject to issuer
     */
    Certificate(const Blob& crt);
+    Certificate(const std::string& pem) : cert(nullptr) {
+        unpack((const uint8_t*)pem.data(), pem.size());
+    }
    Certificate(const uint8_t* dat, size_t dat_size) : cert(nullptr) {
        unpack(dat, dat_size);
    }
-    Certificate(std::string_view pem) : Certificate((const uint8_t*)pem.data(), pem.size()) {}

    /**
     * Import certificate chain (PEM or DER),
@@ -501,9 +486,9 @@ struct OPENDHT_PUBLIC Certificate {
    PublicKey getPublicKey() const;

    /** Same as getPublicKey().getId() */
-    const InfoHash& getId() const;
+    InfoHash getId() const;
    /** Same as getPublicKey().getLongId() */
-    const PkId& getLongId() const;
+    PkId getLongId() const;

    Blob getSerialNumber() const;

@@ -621,8 +606,6 @@ private:
    Certificate& operator=(const Certificate&) = delete;
    mutable InfoHash cachedId_ {};
    mutable PkId cachedLongId_ {};
-    mutable std::atomic_bool idCached_ {false};
-    mutable std::atomic_bool longIdCached_ {false};

    struct crlNumberCmp {
        bool operator() (const std::shared_ptr<RevocationList>& lhs, const std::shared_ptr<RevocationList>& rhs) const {
@@ -302,9 +302,6 @@ public:
    void setStorageLimit(size_t limit = DEFAULT_STORAGE_LIMIT) override {
        max_store_size = limit;
    }
-    size_t getStorageLimit() const override {
-        return max_store_size;
-    }

    /**
     * Returns the total memory usage of stored values and the number
@@ -343,7 +340,7 @@ private:
    static constexpr unsigned LISTEN_NODES {4};

    /* The maximum number of hashes we're willing to track. */
-    static constexpr unsigned MAX_HASHES {1024 * 1024 * 1024};
+    static constexpr unsigned MAX_HASHES {1024 * 1024};

    /* The maximum number of searches we keep data about. */
    static constexpr unsigned MAX_SEARCHES {1024 * 1024};
@@ -450,13 +447,13 @@ 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 = {}, bool permanent = false);
+    bool storageErase(const InfoHash& id, Value::Id vid);
    bool storageRefresh(const InfoHash& id, Value::Id vid);
    void expireStore();
    void expireStorage(InfoHash h);
    void expireStore(decltype(store)::iterator);

-    void storageRemoved(const InfoHash& id, Storage& st, const std::vector<Sp<Value>>& values, size_t totalSize);
-    void storageChanged(const InfoHash& id, Storage& st, const Sp<Value>&, bool newValue);
+    void storageChanged(const InfoHash& id, Storage& st, ValueStorage&, bool newValue);
    std::string printStorageLog(const decltype(store)::value_type&) const;

    /**
@@ -221,7 +221,6 @@ public:
     * Set the in-memory storage limit in bytes
     */
    virtual void setStorageLimit(size_t limit = DEFAULT_STORAGE_LIMIT) = 0;
-    virtual size_t getStorageLimit() const = 0;

    /**
     * Returns the total memory usage of stored values and the number
@@ -265,9 +264,6 @@ public:

    virtual void setPushNotificationToken(const std::string&) {};

-    virtual void setPushNotificationTopic(const std::string&) {};
-    virtual void setPushNotificationPlatform(const std::string&) {};
-
    /**
     * Call linked callback with a push notification
     * @param notification to process
@@ -67,22 +67,6 @@ public:
 #endif
    }

-    virtual void setPushNotificationTopic(const std::string& topic) override {
-#ifdef OPENDHT_PUSH_NOTIFICATIONS
-        notificationTopic_ = topic;
-#else
-        (void) topic;
-#endif
-    }
-
-    virtual void setPushNotificationPlatform(const std::string& platform) override {
-#ifdef OPENDHT_PUSH_NOTIFICATIONS
-        platform_ = platform;
-#else
-        (void) platform;
-#endif
-    }
-
    virtual ~DhtProxyClient();

    /**
@@ -279,7 +263,6 @@ public:
    void dumpTables() const override {}
    std::vector<unsigned> getNodeMessageStats(bool) override { return {}; }
    void setStorageLimit(size_t) override {}
-    virtual size_t getStorageLimit() const override { return 0; }
    void connectivityChanged(sa_family_t) override {
        getProxyInfos();
    }
@@ -352,8 +335,6 @@ private:
    NodeStatus statusIpv6_ {NodeStatus::Disconnected};
    NodeStats stats4_ {};
    NodeStats stats6_ {};
-    SockAddr localAddrv4_;
-    SockAddr localAddrv6_;
    SockAddr publicAddressV4_;
    SockAddr publicAddressV6_;
    std::atomic_bool launchConnectedCbs_ {false};
@@ -368,7 +349,6 @@ private:
     * Note: Each context is used in one thread only
     */
    asio::io_context httpContext_;
-    mutable std::mutex resolverLock_;
    std::shared_ptr<http::Resolver> resolver_;

    mutable std::mutex requestLock_;
@@ -419,25 +399,6 @@ private:
     */
    std::string deviceKey_ {};

-    /**
-     * Notification topic for ios notifications.
-     */
-    std::string notificationTopic_ {};
-
-    /**
-     * Platform for push notifications (supported android, ios, unifiedpush)
-     */
-    std::string platform_
-#ifdef __ANDROID__
-    {"android"};
-#else
-#ifdef __APPLE__
-    {"ios"};
-#else
-    {};
-#endif
-#endif
-
    const std::function<void()> loopSignal_;

 #ifdef OPENDHT_PUSH_NOTIFICATIONS
@@ -40,8 +40,7 @@ namespace dht {
 enum class PushType {
    None = 0,
    Android,
-    iOS,
-    UnifiedPush
+    iOS
 };
 }
 MSGPACK_ADD_ENUM(dht::PushType)
@@ -62,13 +61,11 @@ class DhtRunner;
 using RestRouter = restinio::router::express_router_t<>;
 using RequestStatus = restinio::request_handling_status_t;

-struct OPENDHT_PUBLIC ProxyServerConfig {
-    std::string address {};
+struct ProxyServerConfig {
    in_port_t port {8000};
    std::string pushServer {};
    std::string persistStatePath {};
    dht::crypto::Identity identity {};
-    std::string bundleId {};
 };

 /**
@@ -276,11 +273,6 @@ private:
                           restinio::router::route_params_t params);

 #ifdef OPENDHT_PUSH_NOTIFICATIONS
-    PushType getTypeFromString(const std::string& type);
-    std::string getDefaultTopic(PushType type);
-
-    RequestStatus pingPush(restinio::request_handle_t request,
-                         restinio::router::route_params_t /*params*/);
    /**
     * Subscribe to push notifications for an iOS or Android device.
     * Method: SUBSCRIBE "/{InfoHash: .*}"
@@ -308,7 +300,7 @@ private:
     * @param key of the device
     * @param json, the content to send
     */
-    void sendPushNotification(const std::string& key, Json::Value&& json, PushType type, bool highPriority, const std::string& topic);
+    void sendPushNotification(const std::string& key, Json::Value&& json, PushType type, bool highPriority);

    /**
     * Send push notification with an expire timeout.
@@ -316,10 +308,9 @@ private:
     * @param pushToken
     * @param json
     * @param type
-     * @param topic
     */
    void handleNotifyPushListenExpire(const asio::error_code &ec, const std::string pushToken,
-                                      std::function<Json::Value()> json, PushType type, const std::string& topic);
+                                      std::function<Json::Value()> json, PushType type);

    /**
     * Remove a push listener between a client and a hash
@@ -391,12 +382,11 @@ private:
        std::unique_ptr<asio::steady_timer> expireNotifyTimer;
        Sp<Value> value;
        PushType type;
-        std::string topic;

        template <typename Packer>
        void msgpack_pack(Packer& p) const
        {
-            p.pack_map(2 + (sessionCtx ? 1 : 0) + (clientId.empty() ? 0 : 1) + (type == PushType::None ? 0 : 2) + (topic.empty() ? 0 : 1));
+            p.pack_map(2 + (sessionCtx ? 1 : 0) + (clientId.empty() ? 0 : 1) + (type == PushType::None ? 0 : 2));
            p.pack("value"); p.pack(value);
            p.pack("exp"); p.pack(to_time_t(expiration));
            if (not clientId.empty()) {
@@ -410,9 +400,6 @@ private:
                p.pack("t"); p.pack(type);
                p.pack("token"); p.pack(pushToken);
            }
-            if (not topic.empty()) {
-                p.pack("top"); p.pack(topic);
-            }
        }

        void msgpack_unpack(const msgpack::object& o);
@@ -428,7 +415,6 @@ private:
    mutable std::atomic<time_point> lastStatsReset_ {time_point::min()};

    std::string pushServer_;
-    std::string bundleId_;

 #ifdef OPENDHT_PUSH_NOTIFICATIONS
    struct Listener {
@@ -439,12 +425,11 @@ private:
        std::unique_ptr<asio::steady_timer> expireTimer;
        std::unique_ptr<asio::steady_timer> expireNotifyTimer;
        PushType type;
-        std::string topic;

        template <typename Packer>
        void msgpack_pack(Packer& p) const
        {
-            p.pack_map(3 + (sessionCtx ? 1 : 0) + (topic.empty() ? 0 : 1));
+            p.pack_map(sessionCtx ? 4 : 3);
            p.pack("cid"); p.pack(clientId);
            p.pack("exp"); p.pack(to_time_t(expiration));
            if (sessionCtx) {
@@ -452,9 +437,6 @@ private:
                p.pack("sid"); p.pack(sessionCtx->sessionId);
            }
            p.pack("t"); p.pack(type);
-            if (!topic.empty()) {
-                p.pack("top"); p.pack(topic);
-            }
        }

        void msgpack_unpack(const msgpack::object& o);
@@ -464,6 +446,7 @@ private:
        MSGPACK_DEFINE_ARRAY(listeners)
    };
    std::map<std::string, PushListener> pushListeners_;
+    proxy::ListenToken tokenPushNotif_ {0};
 #endif //OPENDHT_PUSH_NOTIFICATIONS
 };

@@ -61,8 +61,6 @@ public:
        std::string proxy_server {};
        std::string push_node_id {};
        std::string push_token {};
-        std::string push_topic {};
-        std::string push_platform {};
        bool peer_discovery {false};
        bool peer_publish {false};
        std::shared_ptr<dht::crypto::Certificate> server_ca;
@@ -337,7 +335,6 @@ public:

    std::pair<size_t, size_t> getStoreSize() const;

-    void getStorageLimit() const;
    void setStorageLimit(size_t limit = DEFAULT_STORAGE_LIMIT);

    std::vector<NodeExport> exportNodes() const;
@@ -374,8 +371,8 @@ public:
    std::string getRoutingTablesLog(sa_family_t af) const;
    std::string getSearchesLog(sa_family_t af = AF_UNSPEC) const;
    std::string getSearchLog(const InfoHash&, sa_family_t af = AF_UNSPEC) const;
-    std::vector<SockAddr> getPublicAddress(sa_family_t af = AF_UNSPEC) const;
-    std::vector<std::string> getPublicAddressStr(sa_family_t af = AF_UNSPEC) const;
+    std::vector<SockAddr> getPublicAddress(sa_family_t af = AF_UNSPEC);
+    std::vector<std::string> getPublicAddressStr(sa_family_t af = AF_UNSPEC);
    void getPublicAddress(std::function<void(std::vector<SockAddr>&&)>, sa_family_t af = AF_UNSPEC);

    // securedht methods
@@ -439,6 +436,7 @@ public:
    /**
     * Start or stop the proxy
     * @param proxify if we want to use the proxy
+     * @param deviceKey non empty to enable push notifications
     */
    void enableProxy(bool proxify);

@@ -449,16 +447,6 @@ public:
     */
    void setPushNotificationToken(const std::string& token);

-     /**
-     * Sets the push notification topic
-     */
-    void setPushNotificationTopic(const std::string& topic);
-
-     /**
-     * Sets the push notification platform
-     */
-    void setPushNotificationPlatform(const std::string& platform);
-
    /**
     * Insert a push notification to process for OpenDHT
     */
@@ -485,9 +473,12 @@ private:
    DoneCallback bindOpDoneCallback(DoneCallback&& cb);
    DoneCallbackSimple bindOpDoneCallback(DoneCallbackSimple&& cb);

-    /** DHT instance */
+    /** Local DHT instance */
    std::unique_ptr<SecureDht> dht_;

+    /** Proxy client instance */
+    std::unique_ptr<SecureDht> dht_via_proxy_;
+
    /** true if we are currently using a proxy */
    std::atomic_bool use_proxy {false};

@@ -499,6 +490,17 @@ private:
     * reset dht clients
     */
    void resetDht();
+    /**
+     * @return the current active DHT
+     */
+    SecureDht* activeDht() const;
+
+    /**
+     * Store current listeners and translates global tokens for each client.
+     */
+    struct Listener;
+    std::map<size_t, Listener> listeners_;
+    size_t listener_token_ {1};

    mutable std::mutex dht_mtx {};
    std::thread dht_thread {};
@@ -114,16 +114,13 @@ public:
    void async_read(size_t bytes, BytesHandlerCb cb);
    void async_read_some(size_t bytes, BytesHandlerCb cb);

-    const asio::ip::address& local_address() const;
-
-    void timeout(const std::chrono::seconds& timeout, HandlerCb cb = {});
-
+    void timeout(const std::chrono::seconds timeout, HandlerCb cb = {});
    void close();

 private:

    template<typename T>
-    T wrapCallback(T cb) const {
+    T wrapCallabck(T cb) const {
        return [t=shared_from_this(),cb=std::move(cb)](auto ...params) {
            cb(params...);
        };
@@ -145,8 +142,6 @@ private:
    asio::streambuf read_buf_;
    std::istream istream_;

-    asio::ip::address local_address_;
-
    std::unique_ptr<asio::steady_timer> timeout_timer_;
    std::shared_ptr<dht::Logger> logger_;
    bool checkOcsp_ {false};
@@ -266,11 +261,6 @@ public:
        return resolver_->get_url();
    };

-    void timeout(const std::chrono::seconds& timeout, HandlerCb cb = {}) {
-        timeout_ = timeout;
-        timeoutCb_ = cb;
-    }
-
    /** The previous request in case of redirect following */
    std::shared_ptr<Request> getPrevious() const {
        return prev_.lock();
@@ -380,9 +370,6 @@ private:
    std::weak_ptr<Request> prev_;
    unsigned num_redirect {0};
    bool follow_redirect {true};
-
-    HandlerCb timeoutCb_ {};
-    std::chrono::seconds timeout_ {0};
 };

 } // namespace http
@@ -103,7 +103,13 @@ public:
    static constexpr inline Hash zero() noexcept { return Hash{}; }

    bool operator==(const Hash& h) const {
-        return data_ == h.data_;
+        auto a = reinterpret_cast<const uint32_t*>(data_.data());
+        auto b = reinterpret_cast<const uint32_t*>(h.data_.data());
+        constexpr unsigned n = N / sizeof(uint32_t);
+        for (unsigned i=0; i < n; i++)
+            if (a[i] != b[i])
+                return false;
+        return true;
    }
    bool operator!=(const Hash& h) const { return !(*this == h); }

@@ -249,8 +255,6 @@ public:
    template <size_t M>
    OPENDHT_PUBLIC friend std::istream& operator>> (std::istream& s, Hash<M>& h);

-    /** Returns view to thread-allocated memory, only valid until the next call to this function. */
-    std::string_view to_view() const { return std::string_view(to_c_str(), N*2); }
    const char* to_c_str() const;

    std::string toString() const;
@@ -42,7 +42,7 @@ namespace dht {
 namespace net {

 static const constexpr in_port_t DHT_DEFAULT_PORT = 4222;
-static const constexpr size_t RX_QUEUE_MAX_SIZE = 1024 * 64;
+static const constexpr size_t RX_QUEUE_MAX_SIZE = 1024 * 16;
 static const constexpr std::chrono::milliseconds RX_QUEUE_MAX_DELAY(650);

 int bindSocket(const SockAddr& addr, SockAddr& bound);
@@ -173,10 +173,6 @@ public:
    void setStorageLimit(size_t limit = DEFAULT_STORAGE_LIMIT) override {
        dht_->setStorageLimit(limit);
    }
-    size_t getStorageLimit() const override {
-        return dht_->getStorageLimit();
-    }
-
    std::vector<NodeExport> exportNodes() const override {
        return dht_->exportNodes();
    }
@@ -236,15 +236,6 @@ public:
        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.
     */
@@ -171,29 +171,29 @@ struct OPENDHT_PUBLIC Value
        template<typename Functor>
        Filter(Functor f) : std::function<bool(const Value&)>::function(f) {}

-        inline Filter chain(Filter&& f2) {
+        Filter chain(Filter&& f2) {
            auto f1 = *this;
            return chain(std::move(f1), std::move(f2));
        }
-        inline Filter chainOr(Filter&& f2) {
+        Filter chainOr(Filter&& f2) {
            auto f1 = *this;
            return chainOr(std::move(f1), std::move(f2));
        }
-        static inline Filter chain(Filter&& f1, Filter&& f2) {
+        static Filter chain(Filter&& f1, Filter&& f2) {
            if (not f1) return std::move(f2);
            if (not f2) return std::move(f1);
            return [f1 = std::move(f1), f2 = std::move(f2)](const Value& v) {
                return f1(v) and f2(v);
            };
        }
-        static inline Filter chain(const Filter& f1, const Filter& f2) {
+        static Filter chain(const Filter& f1, const Filter& f2) {
            if (not f1) return f2;
            if (not f2) return f1;
            return [f1,f2](const Value& v) {
                return f1(v) and f2(v);
            };
        }
-        static inline Filter chainAll(std::vector<Filter>&& set) {
+        static Filter chainAll(std::vector<Filter>&& set) {
            if (set.empty()) return {};
            return [set = std::move(set)](const Value& v) {
                for (const auto& f : set)
@@ -202,18 +202,18 @@ struct OPENDHT_PUBLIC Value
                return true;
            };
        }
-        static inline Filter chain(std::initializer_list<Filter> l) {
+        static Filter chain(std::initializer_list<Filter> l) {
            return chainAll(std::vector<Filter>(l.begin(), l.end()));
        }
-        static inline Filter chainOr(Filter&& f1, Filter&& f2) {
+        static Filter chainOr(Filter&& f1, Filter&& f2) {
            if (not f1 or not f2) return {};
            return [f1=std::move(f1),f2=std::move(f2)](const Value& v) {
                return f1(v) or f2(v);
            };
        }
-        static inline Filter notFilter(Filter&& f) {
+        static Filter notFilter(Filter&& f) {
            if (not f) return [](const Value&) { return false; };
-            return [f = std::move(f)](const Value& v) { return not f(v); };
+            return [f](const Value& v) { return not f(v); };
        }
        std::vector<Sp<Value>> filter(const std::vector<Sp<Value>>& values) {
            if (not (*this))
@@ -228,50 +228,50 @@ struct OPENDHT_PUBLIC Value

    /* Sneaky functions disguised in classes */

-    static inline Filter AllFilter() {
+    static const Filter AllFilter() {
        return {};
    }

-    static inline Filter TypeFilter(const ValueType& t) {
+    static Filter TypeFilter(const ValueType& t) {
        return [tid = t.id](const Value& v) {
            return v.type == tid;
        };
    }
-    static inline Filter TypeFilter(const ValueType::Id& tid) {
+    static Filter TypeFilter(const ValueType::Id& tid) {
        return [tid](const Value& v) {
            return v.type == tid;
        };
    }

-    static inline Filter IdFilter(const Id id) {
+    static Filter IdFilter(const Id id) {
        return [id](const Value& v) {
            return v.id == id;
        };
    }

-    static inline Filter RecipientFilter(const InfoHash& r) {
+    static Filter RecipientFilter(const InfoHash& r) {
        return [r](const Value& v) {
            return v.recipient == r;
        };
    }

-    static inline Filter OwnerFilter(const crypto::PublicKey& pk) {
+    static Filter OwnerFilter(const crypto::PublicKey& pk) {
        return OwnerFilter(pk.getId());
    }

-    static inline Filter OwnerFilter(const InfoHash& pkh) {
+    static Filter OwnerFilter(const InfoHash& pkh) {
        return [pkh](const Value& v) {
            return v.owner and v.owner->getId() == pkh;
        };
    }

-    static inline Filter SeqNumFilter(uint16_t seq_no) {
+    static Filter SeqNumFilter(uint16_t seq_no) {
        return [seq_no](const Value& v) {
            return v.seq == seq_no;
        };
    }

-    static inline Filter UserTypeFilter(std::string ut) {
+    static Filter UserTypeFilter(std::string ut) {
        return [ut = std::move(ut)](const Value& v) {
            return v.user_type == ut;
        };
@@ -343,10 +343,10 @@ struct OPENDHT_PUBLIC Value
        return unpack<T>(*this);
    }

-    inline bool isEncrypted() const {
+    bool isEncrypted() const {
        return not cypher.empty();
    }
-    inline bool isSigned() const {
+    bool isSigned() const {
        return owner and not signature.empty();
    }

@@ -355,24 +355,37 @@ struct OPENDHT_PUBLIC Value
     * Afterward, checkSignature() will return true and owner will
     * be set to the corresponding public key.
     */
-    void sign(const crypto::PrivateKey& key);
+    void sign(const crypto::PrivateKey& key) {
+        if (isEncrypted())
+            throw DhtException("Can't sign encrypted data.");
+        owner = key.getSharedPublicKey();
+        signature = key.sign(getToSign());
+    }

    /**
     * Check that the value is signed and that the signature matches.
     * If true, the owner field will contain the signer public key.
     */
-    inline bool checkSignature() const {
+    bool checkSignature() const {
        return isSigned() and owner->checkSignature(getToSign(), signature);
    }

-    inline std::shared_ptr<crypto::PublicKey> getOwner() const {
-        return owner;
+    std::shared_ptr<crypto::PublicKey> getOwner() const {
+        return std::static_pointer_cast<crypto::PublicKey>(owner);
    }

    /**
     * Sign the value with from and returns the encrypted version for to.
     */
-    Value encrypt(const crypto::PrivateKey& from, const crypto::PublicKey& to);
+    Value encrypt(const crypto::PrivateKey& from, const crypto::PublicKey& to) {
+        if (isEncrypted())
+            throw DhtException("Data is already encrypted.");
+        setRecipient(to.getId());
+        sign(from);
+        Value nv {id};
+        nv.setCypher(to.encrypt(getToEncrypt()));
+        return nv;
+    }

    Value() {}

@@ -427,7 +440,7 @@ struct OPENDHT_PUBLIC Value
    /**
     * Returns true if value contents are equals (not considering the value ID)
     */
-    inline bool contentEquals(const Value& o) const {
+    inline bool contentEquals(const Value& o) {
        return isEncrypted() ? cypher == o.cypher :
            ((owner == o.owner || (owner and o.owner and *owner == *o.owner))
                && type == o.type
@@ -436,25 +449,22 @@ struct OPENDHT_PUBLIC Value
                && signature == o.signature);
    }

-    inline bool operator== (const Value& o) const {
+    inline bool operator== (const Value& o) {
        return id == o.id and contentEquals(o);
    }
-    inline bool operator!= (const Value& o) const {
-        return !(*this == o);
-    }

-    inline void setRecipient(const InfoHash& r) {
+    void setRecipient(const InfoHash& r) {
        recipient = r;
    }

-    inline void setCypher(Blob&& c) {
+    void setCypher(Blob&& c) {
        cypher = std::move(c);
    }

    /**
     * Pack part of the data to be signed (must always be done the same way)
     */
-    inline Blob getToSign() const {
+    Blob getToSign() const {
        msgpack::sbuffer buffer;
        msgpack::packer<msgpack::sbuffer> pk(&buffer);
        msgpack_pack_to_sign(pk);
@@ -464,7 +474,7 @@ struct OPENDHT_PUBLIC Value
    /**
     * Pack part of the data to be encrypted
     */
-    inline Blob getToEncrypt() const {
+    Blob getToEncrypt() const {
        msgpack::sbuffer buffer;
        msgpack::packer<msgpack::sbuffer> pk(&buffer);
        msgpack_pack_to_encrypt(pk);
@@ -474,7 +484,7 @@ struct OPENDHT_PUBLIC Value
    /** print value for debugging */
    OPENDHT_PUBLIC friend std::ostream& operator<< (std::ostream& s, const Value& v);

-    inline std::string toString() const {
+    std::string toString() const {
        std::stringstream ss;
        ss << *this;
        return ss.str();
@@ -628,16 +638,8 @@ struct OPENDHT_PUBLIC Value
     */
    unsigned priority {0};

-    inline bool isSignatureChecked() const {
-        return signatureChecked;
-    }
-    inline bool isDecrypted() const {
-        return decrypted;
-    }
-    bool checkSignature();
-    Sp<Value> decrypt(const crypto::PrivateKey& key);
-
 private:
+    friend class SecureDht;
    /* Cache for crypto ops */
    bool signatureChecked {false};
    bool signatureValid {false};
@@ -807,11 +809,11 @@ struct OPENDHT_PUBLIC Where
     *
     * @return the resulting Where instance.
     */
-    Where&& id(Value::Id id) {
+    Where& id(Value::Id id) {
        FieldValue fv {Value::Field::Id, id};
        if (std::find(filters_.begin(), filters_.end(), fv) == filters_.end())
            filters_.emplace_back(std::move(fv));
-        return std::move(*this);
+        return *this;
    }

    /**
@@ -821,11 +823,11 @@ struct OPENDHT_PUBLIC Where
     *
     * @return the resulting Where instance.
     */
-    Where&& valueType(ValueType::Id type) {
+    Where& valueType(ValueType::Id type) {
        FieldValue fv {Value::Field::ValueType, type};
        if (std::find(filters_.begin(), filters_.end(), fv) == filters_.end())
            filters_.emplace_back(std::move(fv));
-        return std::move(*this);
+        return *this;
    }

    /**
@@ -835,11 +837,11 @@ struct OPENDHT_PUBLIC Where
     *
     * @return the resulting Where instance.
     */
-    Where&& owner(InfoHash owner_pk_hash) {
+    Where& owner(InfoHash owner_pk_hash) {
        FieldValue fv {Value::Field::OwnerPk, owner_pk_hash};
        if (std::find(filters_.begin(), filters_.end(), fv) == filters_.end())
            filters_.emplace_back(std::move(fv));
-        return std::move(*this);
+        return *this;
    }

    /**
@@ -849,11 +851,11 @@ struct OPENDHT_PUBLIC Where
     *
     * @return the resulting Where instance.
     */
-    Where&& seq(uint16_t seq_no) {
+    Where& seq(uint16_t seq_no) {
        FieldValue fv {Value::Field::SeqNum, seq_no};
        if (std::find(filters_.begin(), filters_.end(), fv) == filters_.end())
            filters_.emplace_back(std::move(fv));
-        return std::move(*this);
+        return *this;
    }

    /**
@@ -863,11 +865,11 @@ struct OPENDHT_PUBLIC Where
     *
     * @return the resulting Where instance.
     */
-    Where&& userType(std::string_view user_type) {
+    Where& userType(std::string_view user_type) {
        FieldValue fv {Value::Field::UserType, Blob {user_type.begin(), user_type.end()}};
        if (std::find(filters_.begin(), filters_.end(), fv) == filters_.end())
            filters_.emplace_back(std::move(fv));
-        return std::move(*this);
+        return *this;
    }

    /**
@@ -876,10 +878,7 @@ struct OPENDHT_PUBLIC Where
     * @return the resulting Value::Filter.
     */
    Value::Filter getFilter() const {
-        if (filters_.empty())
-            return {};
-        if (filters_.size() == 1)
-            return filters_[0].getLocalFilter();
+        if (filters_.empty()) return {};
        std::vector<Value::Filter> fset;
        fset.reserve(filters_.size());
        for (const auto& f : filters_) {
@@ -1,75 +0,0 @@
-project('opendht', 'c', 'cpp',
-    version: '2.5.0',
-    default_options: [
-        'cpp_std=c++17',
-        'warning_level=3'
-    ])
-
-gnutls = dependency('gnutls')
-nettle = dependency('nettle')
-msgpack = dependency('msgpack-cxx')
-argon2 = dependency('libargon2')
-openssl = dependency('openssl', required: get_option('proxy_client'))
-jsoncpp = dependency('jsoncpp', required: get_option('proxy_client'))
-
-dirs=[]
-if host_machine.system() == 'freebsd'
-    dirs+='/usr/local/lib'
-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]
-
-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')
-
-opendht_inc = include_directories('include/opendht')
-opendht_src = [
-    'src/utils.cpp',
-    'src/infohash.cpp',
-    'src/crypto.cpp',
-    'src/default_types.cpp',
-    'src/node.cpp',
-    'src/value.cpp',
-    'src/dht.cpp',
-    'src/callbacks.cpp',
-    'src/routing_table.cpp',
-    'src/node_cache.cpp',
-    'src/network_engine.cpp',
-    'src/securedht.cpp',
-    'src/dhtrunner.cpp',
-    'src/log.cpp',
-    'src/op_cache.cpp',
-    'src/network_utils.cpp'
-]
-if jsoncpp.found()
-    opendht_src += ['src/base64.cpp']
-    add_project_arguments('-DOPENDHT_JSONCPP', language : 'cpp')
-endif
-if http_parser.found()
-    opendht_src += ['src/http.cpp', 'src/compat/os_cert.cpp']
-    if host_machine.system() == 'darwin'
-        deps+=dependency('appleframeworks', modules : ['CoreFoundation', 'Security'])
-    endif
-endif
-if get_option('proxy_client').enabled()
-    opendht_src += ['src/dht_proxy_client.cpp']
-    add_project_arguments('-DOPENDHT_PROXY_CLIENT', language : 'cpp')
-endif
-if get_option('proxy_server').enabled()
-    opendht_src += 'src/dht_proxy_server.cpp'
-    add_project_arguments('-DOPENDHT_PROXY_SERVER', language : 'cpp')
-endif
-if get_option('peer_discovery').enabled()
-    opendht_src += 'src/peer_discovery.cpp'
-    add_project_arguments('-DOPENDHT_PEER_DISCOVERY', language : 'cpp')
-endif
-opendht = shared_library('opendht',
-    opendht_src, 
-    include_directories : opendht_inc,
-    dependencies : deps,
-    cpp_args : ['-DOPENHT_BUILD', '-Dopendht_EXPORTS'])
-
-readline = meson.get_compiler('c').find_library('readline')
-dhtnode = executable('dhtnode', 'tools/dhtnode.cpp', link_with : opendht, dependencies : [readline, msgpack])
@@ -1,3 +0,0 @@
-option('proxy_client', type : 'feature', value : 'disabled')
-option('proxy_server', type : 'feature', value : 'disabled')
-option('peer_discovery', type : 'feature', value : 'enabled')
@@ -3,10 +3,9 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
 Name: OpenDHT
-Description: C++17 Distributed Hash Table library
+Description: C++14 Distributed Hash Table library
 Version: @VERSION@
 Libs: -L${libdir} -lopendht
 Libs.private: @http_parser_lib@ -pthread
-Requires: gnutls >= 3.3@jsoncpp_lib@@openssl_lib@
-Requires.private: nettle >= 2.4@argon2_lib@
+Requires.private: gnutls >= 3.3, nettle >= 2.4@argon2_lib@@jsoncpp_lib@@openssl_lib@
 Cflags: -I${includedir}
@@ -3,15 +3,10 @@ set(CURRENT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
 set(CURRENT_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})

 configure_file(setup.py.in setup.py)
-configure_file(pyproject.toml pyproject.toml COPYONLY)

 add_custom_target(python ALL
    COMMAND python3 setup.py build
-    DEPENDS opendht opendht_cpp.pxd opendht.pyx pyproject.toml)
-
-add_custom_target(dist
-    COMMAND python3 -m build
-    DEPENDS opendht opendht_cpp.pxd opendht.pyx pyproject.toml)
+    DEPENDS opendht opendht_cpp.pxd opendht.pyx)

 install(CODE "execute_process(COMMAND python3 setup.py install --root=\$ENV{DESTDIR}/ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})")
 if (OPENDHT_TOOLS)
@@ -2,8 +2,7 @@ if USE_CYTHON

 noinst_HEADERS = \
 	opendht.pyx \
-	opendht_cpp.pxd \
-	pyproject.toml
+	opendht_cpp.pxd

 PYTHON_INSTALL_RECORD = $(builddir)/install_record.txt

@@ -1,3 +0,0 @@
-[build-system]
-requires = ["setuptools", "wheel", "Cython"]
-build-backend = "setuptools.build_meta"
@@ -20,7 +20,7 @@ help).

 ## Python dependencies

- pyroute2 >=0.6.9
+- pyroute2 >=0.3.14
 - matplotlib
 - GeoIP (used by `scanner.py` for drawing map of the world)
 - ipaddress
@@ -30,7 +30,7 @@ import traceback
 import ipaddress
 import netifaces
 import numpy as np
-from pyroute2 import NSPopen
+from pyroute2.netns.process.proxy import NSPopen
 import msgpack

 from opendht import *
@@ -15,253 +15,107 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; If not, see <http://www.gnu.org/licenses/>.
-import argparse
-import os
-import subprocess

-from pyroute2 import NDB, NSPopen
+import argparse, subprocess

+from pyroute2 import IPDB, NetNS
+from pyroute2.netns.process.proxy import NSPopen

-def int_range(mini, maxi):
-    def check_ifnum(arg):
-        try:
-            ret = int(arg)
-        except ValueError:
-            raise argparse.ArgumentTypeError('must be an integer')
-        if ret > maxi or ret < mini:
-            raise argparse.ArgumentTypeError(
-                f'must be {mini} <= int <= {maxi}'
-            )
-        return ret
-
-    return check_ifnum
-
-
-if __name__ == '__main__':
-    parser = argparse.ArgumentParser(
-        description='Creates a virtual network topology for testing'
-    )
-    parser.add_argument(
-        '-i', '--ifname', help='interface name', default='ethdht'
-    )
-    parser.add_argument(
-        '-n',
-        '--ifnum',
-        type=int_range(1, 245),
-        help='number of isolated interfaces to create',
-        default=1,
-    )
-    parser.add_argument(
-        '-r',
-        '--remove',
-        help='remove instead of adding network interfaces',
-        action='store_true',
-    )
-    parser.add_argument(
-        '-l',
-        '--loss',
-        help='simulated packet loss (percent)',
-        type=int,
-        default=0,
-    )
-    parser.add_argument(
-        '-d', '--delay', help='simulated latency (ms)', type=int, default=0
-    )
-    parser.add_argument(
-        '-4', '--ipv4', help='Enable IPv4', action='store_true'
-    )
-    parser.add_argument(
-        '-6', '--ipv6', help='Enable IPv6', action='store_true'
-    )
-    parser.add_argument(
-        '-b',
-        '--debug',
-        help='Turn on debug logging and dump topology databases',
-        action='store_true',
-    )
-    parser.add_argument(
-        '-v',
-        '--verbose',
-        help='Turn on verbose output on netns and interfaces operations',
-        action='store_true',
-    )
+if __name__ == "__main__":
+    parser = argparse.ArgumentParser(description='Creates a virtual network topology for testing')
+    parser.add_argument('-i', '--ifname', help='interface name', default='ethdht')
+    parser.add_argument('-n', '--ifnum', type=int, help='number of isolated interfaces to create', default=1)
+    parser.add_argument('-r', '--remove', help='remove instead of adding network interfaces', action="store_true")
+    parser.add_argument('-l', '--loss', help='simulated packet loss (percent)', type=int, default=0)
+    parser.add_argument('-d', '--delay', help='simulated latency (ms)', type=int, default=0)
+    parser.add_argument('-4', '--ipv4', help='Enable IPv4', action="store_true")
+    parser.add_argument('-6', '--ipv6', help='Enable IPv6', action="store_true")

    args = parser.parse_args()

    local_addr4 = '10.0.42.'
    local_addr6 = '2001:db9::'
-    bripv4 = f'{local_addr4}1/24'
-    bripv6 = f'{local_addr6}1/64'
-    bridge_name = f'br{args.ifname}'
-    tap_name = f'tap{args.ifname}'
-    veth_names = []
-    namespaces = []
-    ipv4addrs = []
-    ipv6addrs = []
-    for ifn in range(args.ifnum):
-        namespaces.append(f'node{ifn}')
-        veth_names.append(f'{args.ifname}{ifn}')
-        ipv4addrs.append(f'{local_addr4}{ifn+8}/24' if args.ipv4 else None)
-        ipv6addrs.append(f'{local_addr6}{ifn+8}/64' if args.ipv6 else None)
+    brige_name = 'br'+args.ifname

-    with NDB(log='debug' if args.debug else None) as ndb:
+    ip = None
+    try:
+        ip = IPDB()
        if args.remove:
-            # cleanup interfaces in the main namespace
-            for iface in veth_names + [bridge_name] + [tap_name]:
-                if iface in ndb.interfaces:
-                    ndb.interfaces[iface].remove().commit()
-                    if args.verbose:
-                        print(f'link: del main/{iface}')
-
-            # cleanup namespaces
-            for nsname in namespaces:
-                try:
-                    ndb.netns[nsname].remove().commit()
-                    if args.verbose:
-                        print(f'netns: del {nsname}')
-                except KeyError:
-                    pass
-        else:
-            # create ports
-            for veth, nsname, ipv4addr, ipv6addr in zip(
-                veth_names, namespaces, ipv4addrs, ipv6addrs
-            ):
-                # create a network namespace and launch NDB for it
-                #
-                # another possible solution could be simply to attach
-                # the namespace to the main NDB instance, but it can
-                # take a lot of memory in case of many interfaces, thus
-                # launch and discard netns NDB instances
-                netns = NDB(
-                    log='debug' if args.debug else None,
-                    sources=[
-                        {
-                            'target': 'localhost',
-                            'netns': nsname,
-                            'kind': 'netns',
-                        }
-                    ],
-                )
-                if args.verbose:
-                    print(f'netns: add {nsname}')
-                # create the port and push the peer into the namespace
-                (
-                    ndb.interfaces.create(
-                        **{
-                            'ifname': veth,
-                            'kind': 'veth',
-                            'state': 'up',
-                            'peer': {'ifname': veth, 'net_ns_fd': nsname},
-                        }
-                    ).commit()
-                )
-                if args.verbose:
-                    print(f'link: add main/{veth} <-> {nsname}/{veth}')
-                # bring up namespace's loopback
-                (
-                    netns.interfaces.wait(ifname='lo', timeout=3)
-                    .set('state', 'up')
-                    .commit()
-                )
-                if args.verbose:
-                    print(f'link: set {nsname}/lo')
-                # bring up the peer
-                with netns.interfaces.wait(ifname=veth, timeout=3) as i:
-                    i.set('state', 'up')
-                    if args.ipv4:
-                        i.add_ip(ipv4addr)
-                    if args.ipv6:
-                        i.add_ip(ipv6addr)
-                if args.verbose:
-                    print(f'link: set {nsname}/{veth}, {ipv4addr}, {ipv6addr}')
-                # disconnect the namespace NDB agent, not removing the NS
-                if args.debug:
-                    fname = f'{nsname}-ndb.db'
-                    print(f'dump: netns topology database {fname}')
-                    netns.schema.backup(fname)
+            # cleanup interfaces
+            for ifn in range(args.ifnum):
+                iface = args.ifname+str(ifn)
+                if iface in ip.interfaces:
+                    with ip.interfaces[iface] as i:
+                        i.remove()
+            if 'tap'+args.ifname in ip.interfaces:
+                with ip.interfaces['tap'+args.ifname] as i:
+                    i.remove()
+            if brige_name in ip.interfaces:
+                with ip.interfaces[brige_name] as i:
+                    i.remove()
+            for ifn in range(args.ifnum):
+                netns = NetNS('node'+str(ifn))
                netns.close()
-                # set up the emulation QDisc
-                nsp = NSPopen(
-                    nsname,
-                    [
-                        'tc',
-                        'qdisc',
-                        'add',
-                        'dev',
-                        veth,
-                        'root',
-                        'netem',
-                        'delay',
-                        f'{args.delay}ms',
-                        f'{int(args.delay)/2}ms',
-                        'loss',
-                        f'{args.loss}%',
-                        '25%',
-                    ],
-                    stdout=subprocess.PIPE,
-                )
+                netns.remove()
+        else:
+            for ifn in range(args.ifnum):
+                iface = args.ifname+str(ifn)
+                if not iface in ip.interfaces:
+                    ip.create(kind='veth', ifname=iface, peer=iface+'.1').commit()
+
+            ip.create(kind='tuntap', ifname='tap'+args.ifname, mode='tap').commit()
+
+            with ip.create(kind='bridge', ifname=brige_name) as i:
+                for ifn in range(args.ifnum):
+                    iface = args.ifname+str(ifn)
+                    i.add_port(ip.interfaces[iface])
+                i.add_port(ip.interfaces['tap'+args.ifname])
+                if args.ipv4:
+                    i.add_ip(local_addr4+'1/24')
+                if args.ipv6:
+                    i.add_ip(local_addr6+'1/64')
+                i.up()
+
+            with ip.interfaces['tap'+args.ifname] as tap:
+                tap.up()
+
+            for ifn in range(args.ifnum):
+                iface = args.ifname+str(ifn)
+
+                nns = NetNS('node'+str(ifn))
+                iface1 = iface+'.1'
+                with ip.interfaces[iface1] as i:
+                    i.net_ns_fd = nns.netns
+
+                with ip.interfaces[iface] as i:
+                    i.up()
+
+                ip_ns = IPDB(nl=nns)
+                try:
+                    with ip_ns.interfaces.lo as lo:
+                        lo.up()
+                    with ip_ns.interfaces[iface1] as i:
+                        if args.ipv4:
+                            i.add_ip(local_addr4+str(ifn+8)+'/24')
+                        if args.ipv6:
+                            i.add_ip(local_addr6+str(ifn+8)+'/64')
+                        i.up()
+                finally:
+                    ip_ns.release()
+
+                nsp = NSPopen(nns.netns, ["tc", "qdisc", "add", "dev", iface1, "root", "netem", "delay", str(args.delay)+"ms", str(int(args.delay/2))+"ms", "loss", str(args.loss)+"%", "25%"], stdout=subprocess.PIPE)
+                #print(nsp.communicate()[0].decode())
                nsp.communicate()
                nsp.wait()
                nsp.release()
-                if args.verbose:
-                    print(
-                        f'netem: add {nsname}/{veth}, '
-                        f'{args.delay}, {args.loss}'
-                    )

-            # create the tap
-            #
-            # for some reason we should create the tap inteface first,
-            # and only then bring it up, thus two commit() calls
-            (
-                ndb.interfaces.create(
-                    kind='tuntap', ifname=tap_name, mode='tap'
-                )
-                .commit()
-                .set('state', 'up')
-                .commit()
-            )
-            if args.verbose:
-                print(f'link: add main/{tap_name}')
+            if args.ipv4:
+                subprocess.call(["sysctl", "-w", "net.ipv4.conf."+brige_name+".forwarding=1"])
+            if args.ipv6:
+                subprocess.call(["sysctl", "-w", "net.ipv6.conf."+brige_name+".forwarding=1"])

-            # create the bridge and add all the ports
-            with ndb.interfaces.create(
-                ifname=bridge_name, kind='bridge', state='up'
-            ) as i:
-                if args.ipv4:
-                    i.add_ip(bripv4)
-                if args.ipv6:
-                    i.add_ip(bripv6)
-                for iface in veth_names + [tap_name]:
-                    i.add_port(iface)
-            if args.verbose:
-                print(f'link: add main/{bridge_name}, {bripv4}, {bripv6}')
-
-            with open(os.devnull, 'w') as fnull:
-                if args.ipv4:
-                    subprocess.call(
-                        [
-                            'sysctl',
-                            '-w',
-                            f'net.ipv4.conf.{bridge_name}.forwarding=1',
-                        ],
-                        stdout=fnull,
-                    )
-                if args.verbose:
-                    print(f'sysctl: set {bridge_name} ipv4 forwarding')
-                if args.ipv6:
-                    subprocess.call(
-                        [
-                            'sysctl',
-                            '-w',
-                            f'net.ipv6.conf.{bridge_name}.forwarding=1',
-                        ],
-                        stdout=fnull,
-                    )
-                if args.verbose:
-                    print(f'sysctl: set {bridge_name} ipv4 forwarding')
-
-            if args.debug:
-                fname = 'main-ndb.db'
-                print('dump: the main netns topology database')
-                ndb.schema.backup(fname)
+    except Exception as e:
+          print('Error',e)
+    finally:
+        if ip:
+            ip.release()
@@ -8,4 +8,4 @@ edition = "2018"

 [dependencies]
 libc="0.2.0"
-os_socketaddr="0.2.3"
+os_socketaddr="0.1.0"
@@ -47,8 +47,6 @@ impl DhtRunnerConfig {
            proxy_server: ptr::null(),
            push_node_id: ptr::null(),
            push_token: ptr::null(),
-            push_topic: ptr::null(),
-            push_platform: ptr::null(),
            peer_discovery: false,
            peer_publish: false,
            server_ca: ptr::null_mut(),
@@ -75,14 +73,6 @@ impl DhtRunnerConfig {
        self.push_token = CString::new(push_token).unwrap().as_ptr();
    }

-    pub fn set_push_topic(&mut self, push_topic: &str) {
-        self.push_topic = CString::new(push_topic).unwrap().as_ptr();
-    }
-
-    pub fn set_push_platform(&mut self, push_platform: &str) {
-        self.push_platform = CString::new(push_platform).unwrap().as_ptr();
-    }
-
    pub fn set_identity(&mut self, certificate: Box<DhtCertificate>, privatekey: Box<PrivateKey>) {
        self.dht_config.id.privatekey = Box::into_raw(privatekey);
        self.dht_config.id.certificate = Box::into_raw(certificate);
@@ -118,8 +118,6 @@ pub struct DhtRunnerConfig
    pub proxy_server: *const c_char,
    pub push_node_id: *const c_char,
    pub push_token: *const c_char,
-    pub push_topic: *const c_char,
-    pub push_platform: *const c_char,
    pub peer_discovery: bool,
    pub peer_publish: bool,
    pub server_ca: *mut DhtCertificate,
@@ -84,3 +84,6 @@ if ENABLE_INDEXATION
 libopendht_la_SOURCES += indexation/pht.cpp
 nobase_include_HEADERS += ../include/opendht/indexation/pht.h
 endif
+
+clean-local:
+	rm -rf libargon2.la
@@ -43,6 +43,18 @@ static std::uniform_int_distribution<int> rand_byte{ 0, std::numeric_limits<uint
 static std::uniform_int_distribution<uint8_t> rand_byte;
 #endif

+// support for GnuTLS < 3.4.
+#if GNUTLS_VERSION_NUMBER < 0x030400
+#define GNUTLS_PKCS_PKCS12_3DES GNUTLS_PKCS_USE_PKCS12_3DES
+#define GNUTLS_PKCS_PKCS12_ARCFOUR GNUTLS_PKCS_USE_PKCS12_ARCFOUR
+#define GNUTLS_PKCS_PKCS12_RC2_40 GNUTLS_PKCS_USE_PKCS12_RC2_40
+#define GNUTLS_PKCS_PBES2_3DES GNUTLS_PKCS_USE_PBES2_3DES
+#define GNUTLS_PKCS_PBES2_AES_128 GNUTLS_PKCS_USE_PBES2_AES_128
+#define GNUTLS_PKCS_PBES2_AES_192 GNUTLS_PKCS_USE_PBES2_AES_192
+#define GNUTLS_PKCS_PBES2_AES_256 GNUTLS_PKCS_USE_PBES2_AES_256
+#endif
+
+#define DHT_AES_LEGACY_ENCRYPT 0
 #define DHT_AES_LEGACY_DECRYPT 1

 namespace dht {
@@ -98,6 +110,10 @@ Blob aesEncrypt(const uint8_t* data, size_t data_length, const Blob& key)
    struct gcm_aes_ctx aes;
    gcm_aes_set_key(&aes, key.size(), key.data());
    gcm_aes_set_iv(&aes, GCM_IV_SIZE, ret.data());
+#if DHT_AES_LEGACY_ENCRYPT
+    gcm_aes_update(&aes, data_length, data);
+#endif
+
    gcm_aes_encrypt(&aes, data_length, ret.data() + GCM_IV_SIZE, data);
    gcm_aes_digest(&aes, GCM_DIGEST_SIZE, ret.data() + GCM_IV_SIZE + data_length);
    return ret;
@@ -361,13 +377,12 @@ PrivateKey::getPublicKey() const
 const std::shared_ptr<PublicKey>&
 PrivateKey::getSharedPublicKey() const
 {
-    std::lock_guard<std::mutex> lock(publicKeyMutex_);
-    if (not publicKey_) {
-        auto pk = std::make_shared<PublicKey>();
-        if (auto err = gnutls_pubkey_import_privkey(pk->pk, key, GNUTLS_KEY_KEY_CERT_SIGN | GNUTLS_KEY_CRL_SIGN, 0))
-            throw CryptoException(std::string("Can't retreive public key: ") + gnutls_strerror(err));
-        publicKey_ = pk;
-    }
+    if (publicKey_)
+        return publicKey_;
+    auto pk = std::make_shared<PublicKey>();
+    if (auto err = gnutls_pubkey_import_privkey(pk->pk, key, GNUTLS_KEY_KEY_CERT_SIGN | GNUTLS_KEY_CRL_SIGN, 0))
+        throw CryptoException(std::string("Can't retreive public key: ") + gnutls_strerror(err));
+    publicKey_ = pk;
    return publicKey_;
 }

@@ -527,36 +542,36 @@ PublicKey::encrypt(const uint8_t* data, size_t data_len) const
    return ret;
 }

-const InfoHash&
+InfoHash
 PublicKey::getId() const
 {
-    if (pk and not idCached_.load()) {
-        InfoHash id;
-        size_t sz = id.size();
-        if (auto err = gnutls_pubkey_get_key_id(pk, 0, id.data(), &sz))
-            throw CryptoException(std::string("Can't get public key ID: ") + gnutls_strerror(err));
-        if (sz != id.size())
-            throw CryptoException("Can't get public key ID: wrong output length.");
-        cachedId_ = id;
-        idCached_.store(true);
-    }
-    return cachedId_;
+    if (not pk)
+        return {};
+    InfoHash id;
+    size_t sz = id.size();
+    if (auto err = gnutls_pubkey_get_key_id(pk, 0, id.data(), &sz))
+        throw CryptoException(std::string("Can't get public key ID: ") + gnutls_strerror(err));
+    if (sz != id.size())
+        throw CryptoException("Can't get public key ID: wrong output length.");
+    return id;
 }

-const PkId&
+PkId
 PublicKey::getLongId() const
 {
-    if (pk and not longIdCached_.load()) {
-        PkId h;
-        size_t sz = h.size();
-        if (auto err = gnutls_pubkey_get_key_id(pk, GNUTLS_KEYID_USE_SHA256, h.data(), &sz))
-            throw CryptoException(std::string("Can't get 256 bits public key ID: ") + gnutls_strerror(err));
-        if (sz != h.size())
-            throw CryptoException("Can't get 256 bits public key ID: wrong output length.");
-        cachedLongId_ = h;
-        longIdCached_.store(true);
-    }
-    return cachedLongId_;
+    if (not pk)
+        return {};
+#if GNUTLS_VERSION_NUMBER < 0x030401
+    throw CryptoException("Can't get 256 bits public key ID: GnuTLS 3.4.1 or higher required.");
+#else
+    PkId h;
+    size_t sz = h.size();
+    if (auto err = gnutls_pubkey_get_key_id(pk, GNUTLS_KEYID_USE_SHA256, h.data(), &sz))
+        throw CryptoException(std::string("Can't get 256 bits public key ID: ") + gnutls_strerror(err));
+    if (sz != h.size())
+        throw CryptoException("Can't get 256 bits public key ID: wrong output length.");
+    return h;
+#endif
 }

 gnutls_digest_algorithm_t
@@ -833,36 +848,42 @@ Certificate::getPublicKey() const
    return pk_ret;
 }

-const InfoHash&
+InfoHash
 Certificate::getId() const
 {
-    if (cert and not idCached_.load()) {
-        InfoHash id;
-        size_t sz = id.size();
-        if (auto err = gnutls_x509_crt_get_key_id(cert, 0, id.data(), &sz))
-            throw CryptoException(std::string("Can't get certificate public key ID: ") + gnutls_strerror(err));
-        if (sz != id.size())
-            throw CryptoException("Can't get certificate public key ID: wrong output length.");
-        cachedId_ = id;
-        idCached_.store(true);
-    }
-    return cachedId_;
+    if (not cert)
+        return {};
+    if (cachedId_)
+        return cachedId_;
+    InfoHash id;
+    size_t sz = id.size();
+    if (auto err = gnutls_x509_crt_get_key_id(cert, 0, id.data(), &sz))
+        throw CryptoException(std::string("Can't get certificate public key ID: ") + gnutls_strerror(err));
+    if (sz != id.size())
+        throw CryptoException("Can't get certificate public key ID: wrong output length.");
+    cachedId_ = id;
+    return id;
 }

-const PkId&
+PkId
 Certificate::getLongId() const
 {
-    if (cert and not longIdCached_.load()) {
-        PkId id;
-        size_t sz = id.size();
-        if (auto err = gnutls_x509_crt_get_key_id(cert, GNUTLS_KEYID_USE_SHA256, id.data(), &sz))
-            throw CryptoException(std::string("Can't get certificate 256 bits public key ID: ") + gnutls_strerror(err));
-        if (sz != id.size())
-            throw CryptoException("Can't get certificate 256 bits public key ID: wrong output length.");
-        cachedLongId_ = id;
-        longIdCached_.store(true);
-    }
-    return cachedLongId_;
+    if (not cert)
+        return {};
+    if (cachedLongId_)
+        return cachedLongId_;
+#if GNUTLS_VERSION_NUMBER < 0x030401
+    throw CryptoException("Can't get certificate 256 bits public key ID: GnuTLS 3.4.1 or higher required.");
+#else
+    PkId id;
+    size_t sz = id.size();
+    if (auto err = gnutls_x509_crt_get_key_id(cert, GNUTLS_KEYID_USE_SHA256, id.data(), &sz))
+        throw CryptoException(std::string("Can't get certificate 256 bits public key ID: ") + gnutls_strerror(err));
+    if (sz != id.size())
+        throw CryptoException("Can't get certificate 256 bits public key ID: wrong output length.");
+    cachedLongId_ = id;
+    return id;
+#endif
 }

 Blob
@@ -1750,8 +1771,10 @@ std::ostream& operator<< (std::ostream& o, const TrustList::VerifyResult& h)
            o << "* Certificate has expired" << std::endl;
        if (h.result & GNUTLS_CERT_UNEXPECTED_OWNER)
            o << "* The owner is not the expected one" << std::endl;
+#if GNUTLS_VERSION_NUMBER >= 0x030401
        if (h.result & GNUTLS_CERT_PURPOSE_MISMATCH)
            o << "* Certificate or an intermediate does not match the intended purpose" << std::endl;
+#endif
        if (h.result & GNUTLS_CERT_MISMATCH)
            o << "* Certificate presented isn't the expected one" << std::endl;
    } else {
@@ -870,7 +870,7 @@ Dht::listenTo(const InfoHash& id, sa_family_t af, ValueCallback cb, Value::Filte
        throw DhtException("Can't create search");
    if (logger_)
        logger_->w(id, "[search %s IPv%c] listen", id.to_c_str(), (af == AF_INET) ? '4' : '6');
-    return sr->listen(cb, std::move(f), q, scheduler);
+    return sr->listen(cb, f, q, scheduler);
 }

 size_t
@@ -889,7 +889,7 @@ Dht::listen(const InfoHash& id, ValueCallback cb, Value::Filter f, Where where)
    });

    auto query = std::make_shared<Query>(Select{}, std::move(where));
-    auto filter = Value::Filter::chain(std::move(f), query->where.getFilter());
+    auto filter = f.chain(query->where.getFilter());
    auto st = store.find(id);
    if (st == store.end() && store.size() < max_store_keys)
        st = store.emplace(id, scheduler.time() + MAX_STORAGE_MAINTENANCE_EXPIRE_TIME).first;
@@ -1194,20 +1194,15 @@ Dht::cancelPut(const InfoHash& id, const Value::Id& vid)
    };
    canceled |= sr_cancel_put(dht4.searches);
    canceled |= sr_cancel_put(dht6.searches);
-    if (canceled) {
-        auto st = store.find(id);
-        if (st != store.end()) {
-            if (auto value = st->second.remove(id, vid))
-                storageRemoved(id, st->second, {value}, value->size());
-        }
-    }
+    if (canceled)
+        storageErase(id, vid);
    return canceled;
 }

 // Storage

 void
-Dht::storageChanged(const InfoHash& id, Storage& st, const Sp<Value>& v, bool newValue)
+Dht::storageChanged(const InfoHash& id, Storage& st, ValueStorage& v, bool newValue)
 {
    if (newValue) {
        if (not st.local_listeners.empty()) {
@@ -1217,8 +1212,8 @@ Dht::storageChanged(const InfoHash& id, Storage& st, const Sp<Value>& v, bool ne
            cbs.reserve(st.local_listeners.size());
            for (const auto& l : st.local_listeners) {
                std::vector<Sp<Value>> vals;
-                if (not l.second.filter or l.second.filter(*v))
-                    vals.push_back(v);
+                if (not l.second.filter or l.second.filter(*v.data))
+                    vals.push_back(v.data);
                if (not vals.empty()) {
                    if (logger_)
                        logger_->d(id, "[store %s] sending update local listener with token %lu",
@@ -1239,14 +1234,14 @@ Dht::storageChanged(const InfoHash& id, Storage& st, const Sp<Value>& v, bool ne
        for (const auto& node_listeners : st.listeners) {
            for (const auto& l : node_listeners.second) {
                auto f = l.second.query.where.getFilter();
-                if (f and not f(*v))
+                if (f and not f(*v.data))
                    continue;
                if (logger_)
                    logger_->w(id, node_listeners.first->id, "[store %s] [node %s] sending update",
                        id.toString().c_str(),
                        node_listeners.first->toString().c_str());
                std::vector<Sp<Value>> vals {};
-                vals.push_back(v);
+                vals.push_back(v.data);
                Blob ntoken = makeToken(node_listeners.first->getAddr(), false);
                network_engine.tellListener(node_listeners.first, l.first, id, 0, ntoken, {}, {},
                        std::move(vals), l.second.query, l.second.version);
@@ -1287,19 +1282,26 @@ Dht::storageStore(const InfoHash& id, const Sp<Value>& value, time_point created
            vs->expiration_job = scheduler.add(expiration, std::bind(&Dht::expireStorage, this, id));
        }
        if (total_store_size > max_store_size) {
-            auto value = vs->data;
-            auto value_diff = store.second.values_diff;
-            auto value_edit = store.second.edited_values;
            expireStore();
-            storageChanged(id, st->second, value, value_diff > 0 || value_edit > 0);
-        } else {
-            storageChanged(id, st->second, vs->data, store.second.values_diff > 0 || store.second.edited_values > 0);
        }
+        storageChanged(id, st->second, *vs, store.second.values_diff > 0);
    }

    return std::get<0>(store);
 }

+bool
+Dht::storageErase(const InfoHash& id, Value::Id vid)
+{
+    auto st = store.find(id);
+    if (st == store.end())
+        return false;
+    auto ret = st->second.remove(id, vid);
+    total_store_size += ret.size_diff;
+    total_values += ret.values_diff;
+    return ret.values_diff;
+}
+
 void
 Dht::storageAddListener(const InfoHash& id, const Sp<Node>& node, size_t socket_id, Query&& query, int version)
 {
@@ -1331,8 +1333,36 @@ Dht::expireStore(decltype(store)::iterator i)
    const auto& id = i->first;
    auto& st = i->second;
    auto stats = st.expire(id, scheduler.time());
+    total_store_size += stats.first;
+    total_values -= stats.second.size();
    if (not stats.second.empty()) {
-        storageRemoved(id, st, stats.second, -stats.first);
+        if (logger_)
+            logger_->d(id, "[store %s] discarded %ld expired values (%ld bytes)",
+            id.toString().c_str(), stats.second.size(), -stats.first);
+
+        if (not st.listeners.empty()) {
+            if (logger_)
+                logger_->d(id, "[store %s] %lu remote listeners", id.toString().c_str(), st.listeners.size());
+
+            std::vector<Value::Id> ids;
+            ids.reserve(stats.second.size());
+            for (const auto& v : stats.second)
+                ids.emplace_back(v->id);
+
+            for (const auto& node_listeners : st.listeners) {
+                for (const auto& l : node_listeners.second) {
+                    if (logger_)
+                        logger_->w(id, node_listeners.first->id, "[store %s] [node %s] sending expired",
+                            id.toString().c_str(),
+                            node_listeners.first->toString().c_str());
+                    Blob ntoken = makeToken(node_listeners.first->getAddr(), false);
+                    network_engine.tellListenerExpired(node_listeners.first, l.first, id, ntoken, ids, l.second.version);
+                }
+            }
+        }
+        for (const auto& local_listeners : st.local_listeners) {
+            local_listeners.second.get_cb(stats.second, true);
+        }
    }
 }

@@ -1344,41 +1374,6 @@ Dht::expireStorage(InfoHash h)
        expireStore(i);
 }

-void
-Dht::storageRemoved(const InfoHash& id, Storage& st, const std::vector<Sp<Value>>& values, size_t totalSize)
-{
-    if (logger_)
-        logger_->d(id, "[store %s] discarded %ld values (%ld bytes)",
-        id.toString().c_str(), values.size(), totalSize);
-
-    total_store_size -= totalSize;
-    total_values -= values.size();
-
-    if (not st.listeners.empty()) {
-        if (logger_)
-            logger_->d(id, "[store %s] %lu remote listeners", id.toString().c_str(), st.listeners.size());
-
-        std::vector<Value::Id> ids;
-        ids.reserve(values.size());
-        for (const auto& v : values)
-            ids.emplace_back(v->id);
-
-        for (const auto& node_listeners : st.listeners) {
-            for (const auto& l : node_listeners.second) {
-                if (logger_)
-                    logger_->w(id, node_listeners.first->id, "[store %s] [node %s] sending expired",
-                        id.toString().c_str(),
-                        node_listeners.first->toString().c_str());
-                Blob ntoken = makeToken(node_listeners.first->getAddr(), false);
-                network_engine.tellListenerExpired(node_listeners.first, l.first, id, ntoken, ids, l.second.version);
-            }
-        }
-    }
-    for (const auto& local_listeners : st.local_listeners) {
-        local_listeners.second.get_cb(values, true);
-    }
-}
-
 void
 Dht::expireStore()
 {
@@ -1404,23 +1399,23 @@ Dht::expireStore()
            break;
        }
        auto largest = store_quota.begin();
-        for (auto it = std::next(largest); it != store_quota.end(); ++it) {
+        for (auto it = ++largest; it != store_quota.end(); ++it) {
            if (it->second.size() > largest->second.size())
                largest = it;
        }
-        if (largest != store_quota.end()) {
-            while (true) {
-                auto exp_value = largest->second.getOldest();
-                auto storage = store.find(exp_value.first);
-                if (storage != store.end()) {
-                    if (logger_)
-                        logger_->w("Storage quota full: discarding value from %s at %s %016" PRIx64, largest->first.toString().c_str(), exp_value.first.to_c_str(), exp_value.second);
-
-                    if (auto value = storage->second.remove(exp_value.first, exp_value.second)) {
-                        storageRemoved(storage->first, storage->second, {value}, value->size());
-                        break;
-                    }
-                }
+        if (logger_)
+            logger_->w("No space left: discarding value of largest consumer %s", largest->first.toString().c_str());
+        while (true) {
+            auto exp_value = largest->second.getOldest();
+            auto storage = store.find(exp_value.first);
+            if (storage != store.end()) {
+                auto ret = storage->second.remove(exp_value.first, exp_value.second);
+                total_store_size += ret.size_diff;
+                total_values += ret.values_diff;
+                if (logger_)
+                    logger_->w("Discarded %ld bytes, still %ld used", largest->first.toString().c_str(), total_store_size);
+                if (ret.values_diff)
+                    break;
            }
        }
    }
@@ -1669,7 +1664,7 @@ Dht::dumpTables() const
 std::string
 Dht::getStorageLog() const
 {
-    std::ostringstream out;
+    std::stringstream out;
    for (const auto& s : store)
        out << printStorageLog(s);
    out << std::endl << std::endl;
@@ -1794,8 +1789,7 @@ Dht::Dht(std::unique_ptr<net::DatagramSocket>&& sock, const Config& config, cons
    myid(config.node_id ? config.node_id : InfoHash::getRandom(rd)),
    store(),
    store_quota(),
-    max_store_keys(config.max_store_keys ? (int)config.max_store_keys : MAX_HASHES),
-    max_store_size(config.max_store_size ? (int)config.max_store_size : DEFAULT_STORAGE_LIMIT),
+    max_store_keys(config.max_store_size ? (int)config.max_store_size : MAX_HASHES),
    max_searches(config.max_searches ? (int)config.max_searches : MAX_SEARCHES),
    network_engine(myid, fromDhtConfig(config), std::move(sock), logger_, rd, scheduler,
            std::bind(&Dht::onError, this, _1, _2),
@@ -2564,7 +2558,7 @@ Dht::storageRefresh(const InfoHash& id, Value::Id vid)
            }
        }

-        auto expiration = s->second.refresh(id, now, vid, types);
+        auto expiration = s->second.refresh(now, vid, types);
        if (expiration.first) {
            scheduler.cancel(expiration.first->expiration_job);
            if (expiration.second != time_point::max()) {
@@ -26,7 +26,6 @@
 #include <http_parser.h>
 #include <deque>

-
 namespace dht {

 struct DhtProxyClient::InfoState {
@@ -117,9 +116,6 @@ DhtProxyClient::DhtProxyClient(
    , loopSignal_(signal)
    , jsonReader_(Json::CharReaderBuilder{}.newCharReader())
 {
-    localAddrv4_.setFamily(AF_INET);
-    localAddrv6_.setFamily(AF_INET6);
-
    jsonBuilder_["commentStyle"] = "None";
    jsonBuilder_["indentation"] = "";
    if (logger_) {
@@ -191,10 +187,7 @@ void
 DhtProxyClient::stop()
 {
    if (not isDestroying_.exchange(true)) {
-        {
-            std::lock_guard<std::mutex> l(resolverLock_);
-            resolver_.reset();
-        }
+        resolver_.reset();
        cancelAllListeners();
        if (infoState_)
            infoState_->cancel = true;
@@ -318,30 +311,26 @@ DhtProxyClient::get(const InfoHash& key, GetCallback cb, DoneCallback donecb, Va
        return;
    }
    try {
-        auto request = buildRequest("/key/" + key.toString());
+        auto request = buildRequest("/" + key.toString());
        auto reqid = request->id();
        //request->set_connection_type(restinio::http_connection_header_t::keep_alive);
        request->set_method(restinio::http_method_get());
        setHeaderFields(*request);

        auto opstate = std::make_shared<OperationState>();
+        Value::Filter filter = w.empty() ? f : f.chain(w.getFilter());

-        request->add_on_body_callback([
-            this,
-            key,
-            opstate,
-            filter = Value::Filter::chain(std::move(f), w.getFilter()),
-            rxBuf = std::make_shared<LineSplit>(),
-            cb
-        ](const char* at, size_t length){
+        auto rxBuf = std::make_shared<LineSplit>();
+        request->add_on_body_callback([this, key, opstate, filter, rxBuf, cb](const char* at, size_t length){
            try {
-                rxBuf->append(at, length);
+                auto& b = *rxBuf;
+                b.append(at, length);
                // one value per body line
                std::vector<Sp<Value>> values;
-                while (rxBuf->getLine('\n') and !opstate->stop) {
+                while (b.getLine('\n') and !opstate->stop) {
                    std::string err;
                    Json::Value json;
-                    const auto& line = rxBuf->line();
+                    const auto& line = b.line();
                    if (!jsonReader_->parse(line.data(), line.data() + line.size(), &json, &err)){
                        opstate->ok.store(false);
                        return;
@@ -471,9 +460,7 @@ DhtProxyClient::handleRefreshPut(const asio::error_code &ec, InfoHash key, Value
 std::shared_ptr<http::Request>
 DhtProxyClient::buildRequest(const std::string& target)
 {
-    std::unique_lock<std::mutex> l(resolverLock_);
    auto resolver = resolver_;
-    l.unlock();
    if (not resolver)
        resolver = std::make_shared<http::Resolver>(httpContext_, proxyUrl_, logger_);
    auto request = target.empty()
@@ -494,7 +481,7 @@ DhtProxyClient::doPut(const InfoHash& key, Sp<Value> val, DoneCallbackSimple cb,
        logger_->d("[proxy:client] [put] [search %s] executing for %s", key.to_c_str(), val->toString().c_str());

    try {
-        auto request = buildRequest("/key/" + key.toString());
+        auto request = buildRequest("/" + key.toString());
        auto reqid = request->id();
        request->set_method(restinio::http_method_post());
        setHeaderFields(*request);
@@ -639,7 +626,6 @@ DhtProxyClient::getProxyInfos()
    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_);
    resolver_ = resolver;
 }

@@ -671,12 +657,6 @@ DhtProxyClient::queryProxyInfo(const Sp<InfoState>& infoState, const Sp<http::Re
                if (!jsonReader_->parse(response.body.data(), response.body.data() + response.body.size(), &proxyInfos, &err)){
                    onProxyInfos(Json::Value{}, family);
                } else if (not infoState->cancel) {
-                    if (auto req = response.request.lock()) {
-                        if (auto conn = req->get_connection()) {
-                            const auto& localAddr = conn->local_address();
-                            proxyInfos["local_ip"] = localAddr.to_string();
-                        }
-                    }
                    onProxyInfos(proxyInfos, family);
                }
            }
@@ -708,17 +688,10 @@ DhtProxyClient::onProxyInfos(const Json::Value& proxyInfos, const sa_family_t fa
    std::unique_lock<std::mutex> l(lockCurrentProxyInfos_);
    auto oldStatus = std::max(statusIpv4_, statusIpv6_);
    auto& status = family == AF_INET ? statusIpv4_ : statusIpv6_;
-    auto ipChanged = false;
-    auto& pubAddress = family == AF_INET? publicAddressV4_ : publicAddressV6_;
-    auto& localAddress = family == AF_INET? localAddrv4_ : localAddrv6_;
    if (not proxyInfos.isMember("node_id")) {
        if (logger_)
            logger_->e("[proxy:client] [info] request failed for %s", family == AF_INET ? "ipv4" : "ipv6");
        status = NodeStatus::Disconnected;
-        if (pubAddress) {
-            pubAddress = {};
-            ipChanged = true;
-        }
    } else {
        if (logger_)
            logger_->d("[proxy:client] [info] got proxy reply for %s",
@@ -727,25 +700,19 @@ DhtProxyClient::onProxyInfos(const Json::Value& proxyInfos, const sa_family_t fa
            myid = InfoHash(proxyInfos["node_id"].asString());
            stats4_ = NodeStats(proxyInfos["ipv4"]);
            stats6_ = NodeStats(proxyInfos["ipv6"]);
-            auto publicIp = parsePublicAddress(proxyInfos["public_ip"]);
-            ipChanged = pubAddress && pubAddress.toString() != publicIp.toString();
-            pubAddress = publicIp;
-
-            if (proxyInfos.isMember("local_ip")) {
-                std::string localIp = proxyInfos["local_ip"].asString();
-                if (localAddress.toString() != localIp) {
-                    localAddress.setAddress(localIp.c_str());
-                    ipChanged = (bool)localAddress;
-                }
-            }
-
-            if (!ipChanged && stats4_.good_nodes + stats6_.good_nodes)
+            if (stats4_.good_nodes + stats6_.good_nodes)
                status = NodeStatus::Connected;
-            else if (!ipChanged && stats4_.dubious_nodes + stats6_.dubious_nodes)
+            else if (stats4_.dubious_nodes + stats6_.dubious_nodes)
                status = NodeStatus::Connecting;
            else
                status = NodeStatus::Disconnected;

+            auto publicIp = parsePublicAddress(proxyInfos["public_ip"]);
+            auto publicFamily = publicIp.getFamily();
+            if (publicFamily == AF_INET)
+                publicAddressV4_ = publicIp;
+            else if (publicFamily == AF_INET6)
+                publicAddressV6_ = publicIp;
        } catch (const std::exception& e) {
            if (logger_)
                logger_->e("[proxy:client] [info] error processing: %s", e.what());
@@ -771,10 +738,7 @@ DhtProxyClient::onProxyInfos(const Json::Value& proxyInfos, const sa_family_t fa
        nextProxyConfirmationTimer_->async_wait(std::bind(&DhtProxyClient::handleProxyConfirm, this, std::placeholders::_1));
    }
    else if (newStatus == NodeStatus::Disconnected) {
-        auto next = std::chrono::steady_clock::now();
-        if (!ipChanged)
-            next += std::chrono::minutes(1);
-        nextProxyConfirmationTimer_->expires_at(next);
+        nextProxyConfirmationTimer_->expires_at(std::chrono::steady_clock::now() + std::chrono::minutes(1));
        nextProxyConfirmationTimer_->async_wait(std::bind(&DhtProxyClient::handleProxyConfirm, this, std::placeholders::_1));
    }
    l.unlock();
@@ -812,7 +776,7 @@ DhtProxyClient::listen(const InfoHash& key, ValueCallback cb, Value::Filter filt
    std::lock_guard<std::mutex> lock(searchLock_);
    auto& search = searches_[key];
    auto query = std::make_shared<Query>(Select{}, std::move(where));
-    return search.ops.listen(cb, query, std::move(filter), [this, key](Sp<Query>, ValueCallback cb, SyncCallback) -> size_t {
+    return search.ops.listen(cb, query, filter, [this, key](Sp<Query>, ValueCallback cb, SyncCallback) -> size_t {
        // Find search
        auto search = searches_.find(key);
        if (search == searches_.end()) {
@@ -874,7 +838,7 @@ DhtProxyClient::listen(const InfoHash& key, ValueCallback cb, Value::Filter filt
        else {
            method = ListenMethod::SUBSCRIBE;
            header.method(restinio::http_method_subscribe());
-            header.request_target("/key/" + key.toString());
+            header.request_target("/" + key.toString());
        }
        sendListen(header, l->second.cb, opstate, l->second, method);
        return token;
@@ -960,7 +924,7 @@ DhtProxyClient::handleExpireListener(const asio::error_code &ec, const InfoHash&

        if (not deviceKey_.empty()) {
            // UNSUBSCRIBE
-            auto request = buildRequest("/key/" + key.toString());
+            auto request = buildRequest("/" + key.toString());
            auto reqid = request->id();
            try {
                request->set_method(restinio::http_method_unsubscribe());
@@ -1335,8 +1299,12 @@ DhtProxyClient::getPushRequest(Json::Value& body) const
    body["key"] = deviceKey_;
    body["client_id"] = pushClientId_;
    body["session_id"] = pushSessionId_;
-    body["topic"] = notificationTopic_;
-    body["platform"] = platform_;
+#ifdef __ANDROID__
+    body["platform"] = "android";
+#endif
+#ifdef __APPLE__
+    body["platform"] = "apple";
+#endif
 }

 std::string
@@ -173,9 +173,6 @@ DhtProxyServer::PermanentPut::msgpack_unpack(const msgpack::object& o)
    if (auto val = findMapValue(o, "value"sv)) {
        value = std::make_shared<dht::Value>(*val);
    }
-    if (auto top = findMapValue(o, "top"sv)) {
-        topic = top->as<std::string>();
-    }
 }

 #ifdef OPENDHT_PUSH_NOTIFICATIONS
@@ -197,9 +194,6 @@ DhtProxyServer::Listener::msgpack_unpack(const msgpack::object& o)
    if (auto t = findMapValue(o, "t"sv)) {
        type = t->as<PushType>();
    }
-    if (auto top = findMapValue(o, "top"sv)) {
-        topic = top->as<std::string>();
-    }
 }
 #endif

@@ -211,8 +205,7 @@ DhtProxyServer::DhtProxyServer(const std::shared_ptr<DhtRunner>& dht,
        dht_(dht), persistPath_(config.persistStatePath), logger_(logger),
        printStatsTimer_(std::make_unique<asio::steady_timer>(*ioContext_, 3s)),
        connListener_(std::make_shared<ConnectionListener>(std::bind(&DhtProxyServer::onConnectionClosed, this, std::placeholders::_1))),
-        pushServer_(config.pushServer),
-        bundleId_(config.bundleId)
+        pushServer_(config.pushServer)
 {
    if (not dht_)
        throw std::invalid_argument("A DHT instance must be provided");
@@ -271,8 +264,6 @@ DhtProxyServer::DhtProxyServer(const std::shared_ptr<DhtRunner>& dht,
        // build http server
        auto settings = restinio::run_on_this_thread_settings_t<RestRouterTraitsTls>();
        addServerSettings(settings);
-        if (not config.address.empty())
-            settings.address(config.address);
        settings.port(config.port);
        settings.tls_context(std::move(tls_context));
        httpsServer_ = std::make_unique<restinio::http_server_t<RestRouterTraitsTls>>(
@@ -290,8 +281,6 @@ DhtProxyServer::DhtProxyServer(const std::shared_ptr<DhtRunner>& dht,
    else {
        auto settings = restinio::run_on_this_thread_settings_t<RestRouterTraits>();
        addServerSettings(settings);
-        if (not config.address.empty())
-            settings.address(config.address);
        settings.port(config.port);
        httpServer_ = std::make_unique<restinio::http_server_t<RestRouterTraits>>(
            ioContext_,
@@ -383,7 +372,7 @@ DhtProxyServer::loadState(Is& is, size_t size) {
                            pput.second.expireNotifyTimer = std::make_unique<asio::steady_timer>(io_context(), pput.second.expiration - proxy::OP_MARGIN);
                            pput.second.expireNotifyTimer->async_wait(std::bind(
                                &DhtProxyServer::handleNotifyPushListenExpire, this,
-                                std::placeholders::_1, pput.second.pushToken, std::move(jsonProvider), pput.second.type, pput.second.topic));
+                                std::placeholders::_1, pput.second.pushToken, std::move(jsonProvider), pput.second.type));
                        }
 #endif
                        dht_->put(put.first, pput.second.value, DoneCallbackSimple{}, time_point::max(), true);
@@ -403,7 +392,7 @@ DhtProxyServer::loadState(Is& is, size_t size) {
                    for (auto& listeners : pushListener.second.listeners) {
                        for (auto& listener : listeners.second) {
                            listener.internalToken = dht_->listen(listeners.first,
-                                [this, infoHash=listeners.first, pushToken=pushListener.first, type=listener.type, clientId=listener.clientId, sessionCtx = listener.sessionCtx, topic=listener.topic]
+                                [this, infoHash=listeners.first, pushToken=pushListener.first, type=listener.type, clientId=listener.clientId, sessionCtx = listener.sessionCtx]
                                (const std::vector<std::shared_ptr<Value>>& values, bool expired) {
                                    // Build message content
                                    Json::Value json;
@@ -415,7 +404,7 @@ DhtProxyServer::loadState(Is& is, size_t size) {
                                        json["s"] = sessionCtx->sessionId;
                                    }
                                    if (expired and values.size() < 2){
-                                        std::ostringstream ss;
+                                        std::stringstream ss;
                                        for(size_t i = 0; i < values.size(); ++i){
                                            if(i != 0) ss << ",";
                                            ss << values[i]->id;
@@ -425,7 +414,7 @@ DhtProxyServer::loadState(Is& is, size_t size) {
                                    auto maxPrio = 1000u;
                                    for (const auto& v : values)
                                        maxPrio = std::min(maxPrio, v->priority);
-                                    sendPushNotification(pushToken, std::move(json), type, !expired and maxPrio == 0, topic);
+                                    sendPushNotification(pushToken, std::move(json), type, !expired and maxPrio == 0);
                                    return true;
                                }
                            );
@@ -440,7 +429,7 @@ DhtProxyServer::loadState(Is& is, size_t size) {
                                return json;
                            };
                            listener.expireNotifyTimer->async_wait(std::bind(&DhtProxyServer::handleNotifyPushListenExpire, this,
-                                                                std::placeholders::_1, pushListener.first, std::move(jsonProvider), listener.type, listener.topic));
+                                                                std::placeholders::_1, pushListener.first, std::move(jsonProvider), listener.type));
                            // cancel push listen
                            listener.expireTimer = std::make_unique<asio::steady_timer>(io_context(), listener.expiration);
                            listener.expireTimer->async_wait(std::bind(&DhtProxyServer::handleCancelPushListen, this,
@@ -631,8 +620,6 @@ DhtProxyServer::createRestRouter()
    // key.listen
    router->http_get("/key/:hash/listen", std::bind(&DhtProxyServer::listen, this, _1, _2));
 #ifdef OPENDHT_PUSH_NOTIFICATIONS
-    // node.pingPush
-    router->http_post("/node/pingPush", std::bind(&DhtProxyServer::pingPush, this, _1, _2));
    // key.subscribe
    router->add_handler(restinio::http_method_subscribe(),
                        "/key/:hash", std::bind(&DhtProxyServer::subscribe, this, _1, _2));
@@ -758,59 +745,6 @@ DhtProxyServer::listen(restinio::request_handle_t request,

 #ifdef OPENDHT_PUSH_NOTIFICATIONS

-PushType
-DhtProxyServer::getTypeFromString(const std::string& type) {
-    if (type == "android")
-        return PushType::Android;
-    else if (type == "ios")
-        return PushType::iOS;
-    else if (type == "unifiedpush")
-        return PushType::UnifiedPush;
-    return PushType::None;
-}
-
-std::string
-DhtProxyServer::getDefaultTopic(PushType) {
-    return bundleId_;
-}
-
-RequestStatus
-DhtProxyServer::pingPush(restinio::request_handle_t request,
-                         restinio::router::route_params_t /*params*/)
-{
-    requestNum_++;
-    try {
-        std::string err;
-        Json::Value r;
-        auto* char_data = reinterpret_cast<const char*>(request->body().data());
-        auto reader = std::unique_ptr<Json::CharReader>(jsonReaderBuilder_.newCharReader());
-        if (!reader->parse(char_data, char_data + request->body().size(), &r, &err)){
-            auto response = initHttpResponse(request->create_response(restinio::status_bad_request()));
-            response.set_body(RESP_MSG_JSON_INCORRECT);
-            return response.done();
-        }
-        const Json::Value& root(r); // parse using const Json so [] never creates element
-        auto pushToken = root["key"].asString();
-        if (pushToken.empty()){
-            auto response = initHttpResponse(request->create_response(restinio::status_bad_request()));
-            response.set_body(RESP_MSG_NO_TOKEN);
-            return response.done();
-        }
-        auto type = getTypeFromString(root["platform"].asString());
-        auto topic = root["topic"].asString();
-        if (topic.empty()) {
-            topic = getDefaultTopic(type);
-        }
-        Json::Value json;
-        json["to"] = root["client_id"];
-        json["pong"] = true;
-        sendPushNotification(pushToken, std::move(json), type, true, topic);
-    } catch (...) {
-        return serverError(*request);
-    }
-    return restinio::request_handling_status_t::accepted;
-}
-
 RequestStatus
 DhtProxyServer::subscribe(restinio::request_handle_t request,
                          restinio::router::route_params_t params)
@@ -837,11 +771,7 @@ DhtProxyServer::subscribe(restinio::request_handle_t request,
            response.set_body(RESP_MSG_NO_TOKEN);
            return response.done();
        }
-        auto type = getTypeFromString(root["platform"].asString());
-        auto topic = root["topic"].asString();
-        if (topic.empty()) {
-            topic = getDefaultTopic(type);
-        }
+        auto type = root["platform"].asString() == "android" ? PushType::Android : PushType::iOS;
        auto clientId = root["client_id"].asString();
        auto sessionId = root["session_id"].asString();

@@ -872,7 +802,6 @@ DhtProxyServer::subscribe(restinio::request_handle_t request,
        auto timeout = std::chrono::steady_clock::now() + proxy::OP_TIMEOUT;
        listener.expiration = timeout;
        listener.type = type;
-        listener.topic = topic;
        if (listener.expireNotifyTimer)
            listener.expireNotifyTimer->expires_at(timeout - proxy::OP_MARGIN);
        else
@@ -886,7 +815,7 @@ DhtProxyServer::subscribe(restinio::request_handle_t request,
            return json;
        };
        listener.expireNotifyTimer->async_wait(std::bind(&DhtProxyServer::handleNotifyPushListenExpire, this,
-                                               std::placeholders::_1, pushToken, std::move(jsonProvider), listener.type, listener.topic));
+                                               std::placeholders::_1, pushToken, std::move(jsonProvider), listener.type));
        if (!listener.expireTimer)
            listener.expireTimer = std::make_unique<asio::steady_timer>(io_context(), timeout);
        else
@@ -921,7 +850,7 @@ DhtProxyServer::subscribe(restinio::request_handle_t request,
            // =========== No existing listener for an infoHash ============
            // Add listen on dht
            listener.internalToken = dht_->listen(infoHash,
-                [this, infoHash, pushToken, type, clientId, sessionCtx = listener.sessionCtx, topic]
+                [this, infoHash, pushToken, type, clientId, sessionCtx = listener.sessionCtx]
                (const std::vector<std::shared_ptr<Value>>& values, bool expired){
                    // Build message content
                    Json::Value json;
@@ -933,8 +862,8 @@ DhtProxyServer::subscribe(restinio::request_handle_t request,
                        json["s"] = sessionCtx->sessionId;
                    }
                    if (expired and values.size() < 2){
-                        std::ostringstream ss;
-                        for(size_t i = 0; i < values.size(); ++i) {
+                        std::stringstream ss;
+                        for(size_t i = 0; i < values.size(); ++i){
                            if(i != 0) ss << ",";
                            ss << values[i]->id;
                        }
@@ -943,7 +872,7 @@ DhtProxyServer::subscribe(restinio::request_handle_t request,
                    auto maxPrio = 1000u;
                    for (const auto& v : values)
                        maxPrio = std::min(maxPrio, v->priority);
-                    sendPushNotification(pushToken, std::move(json), type, !expired and maxPrio == 0, topic);
+                    sendPushNotification(pushToken, std::move(json), type, !expired and maxPrio == 0);
                    return true;
                }
            );
@@ -999,7 +928,7 @@ DhtProxyServer::unsubscribe(restinio::request_handle_t request,

 void
 DhtProxyServer::handleNotifyPushListenExpire(const asio::error_code &ec, const std::string pushToken,
-                                             std::function<Json::Value()> jsonProvider, PushType type, const std::string& topic)
+                                             std::function<Json::Value()> jsonProvider, PushType type)
 {
    if (ec == asio::error::operation_aborted)
        return;
@@ -1008,8 +937,8 @@ DhtProxyServer::handleNotifyPushListenExpire(const asio::error_code &ec, const s
            logger_->e("[proxy:server] [subscribe] error sending put refresh: %s", ec.message().c_str());
    }
    if (logger_)
-        logger_->d("[proxy:server] [subscribe] sending refresh to %s token", pushToken.c_str());
-    sendPushNotification(pushToken, jsonProvider(), type, false, topic);
+        logger_->d("[proxy:server] [subscribe] sending put refresh to %s token", pushToken.c_str());
+    sendPushNotification(pushToken, jsonProvider(), type, false);
 }

 void
@@ -1051,70 +980,45 @@ 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)
+DhtProxyServer::sendPushNotification(const std::string& token, Json::Value&& json, PushType type, bool highPriority)
 {
    if (pushServer_.empty())
        return;

    unsigned reqid = 0;
    try {
-        std::shared_ptr<http::Request> request;
-        http::Url tokenUrl(token);
-        if (type == PushType::UnifiedPush)
-            request = std::make_shared<http::Request>(io_context(), tokenUrl.protocol + "://" + tokenUrl.host, logger_);
-        else
-            request = std::make_shared<http::Request>(io_context(), pushHostPort_.first, pushHostPort_.second, pushHostPort_.first.find("https://") == 0, logger_);;
+        auto request = std::make_shared<http::Request>(io_context(), pushHostPort_.first, pushHostPort_.second,
+                                                                    httpsServer_ ? true : false, logger_);
        reqid = request->id();
-        request->set_target(type == PushType::UnifiedPush ? (tokenUrl.target) : "/api/push");
+        request->set_target("/api/push");
        request->set_method(restinio::http_method_post());
-        request->set_header_field(restinio::http_field_t::host, type == PushType::UnifiedPush ? tokenUrl.host.c_str() : pushServer_.c_str());
+        request->set_header_field(restinio::http_field_t::host, pushServer_.c_str());
        request->set_header_field(restinio::http_field_t::user_agent, "RESTinio client");
        request->set_header_field(restinio::http_field_t::accept, "*/*");
        request->set_header_field(restinio::http_field_t::content_type, "application/json");

-        if (type == PushType::UnifiedPush) {
-            Json::Value notification(Json::objectValue);
-            notification["message"] = Json::writeString(jsonBuilder_, std::move(json));
-            notification["topic"] = token;
-            notification["priority"] = highPriority ? 5 : 1;
-            request->set_body(Json::writeString(jsonBuilder_, std::move(json)));
-        } else {
-            // NOTE: see https://github.com/appleboy/gorush
-            Json::Value notification(Json::objectValue);
-            Json::Value tokens(Json::arrayValue);
-            tokens[0] = token;
-            notification["tokens"] = std::move(tokens);
-            notification["platform"] = type == PushType::Android ? 2 : 1;
-            notification["data"] = std::move(json);
-            notification["priority"] = highPriority ? "high" : "normal";
-            if (type == PushType::Android)
-                notification["time_to_live"] = 3600 * 24; // 24 hours
-            else {
-                const auto expiration = std::chrono::system_clock::now() + std::chrono::hours(24);
-                uint32_t exp = std::chrono::duration_cast<std::chrono::seconds>(expiration.time_since_epoch()).count();
-                notification["expiration"] = exp;
-                if (!topic.empty())
-                    notification["topic"] = topic;
-                if (highPriority) {
-                    Json::Value alert(Json::objectValue);
-                    alert["title"]="hello";
-                    notification["push_type"] = "alert";
-                    notification["alert"] = alert;
-                    notification["mutable_content"] = true;
-                } else {
-                    notification["push_type"] = "background";
-                    notification["content_available"] = true;
-                }
-            }
-
-            Json::Value notifications(Json::arrayValue);
-            notifications[0] = notification;
-
-            Json::Value content;
-            content["notifications"] = std::move(notifications);
-            request->set_body(Json::writeString(jsonBuilder_, content));
+        // NOTE: see https://github.com/appleboy/gorush
+        Json::Value notification(Json::objectValue);
+        Json::Value tokens(Json::arrayValue);
+        tokens[0] = token;
+        notification["tokens"] = std::move(tokens);
+        notification["platform"] = type == PushType::Android ? 2 : 1;
+        notification["data"] = std::move(json);
+        notification["priority"] = highPriority ? "high" : "normal";
+        if (type == PushType::Android)
+            notification["time_to_live"] = 3600 * 24; // 24 hours
+        else {
+            const auto expiration = std::chrono::system_clock::now() + std::chrono::hours(24);
+            uint32_t exp = std::chrono::duration_cast<std::chrono::seconds>(expiration.time_since_epoch()).count();
+            notification["expiration"] = exp;
        }

+        Json::Value notifications(Json::arrayValue);
+        notifications[0] = notification;
+
+        Json::Value content;
+        content["notifications"] = std::move(notifications);
+        request->set_body(Json::writeString(jsonBuilder_, content));
        request->add_on_state_change_callback([this, reqid]
                                              (http::Request::State state, const http::Response& response){
            if (state == http::Request::State::DONE){
@@ -1132,7 +1036,7 @@ DhtProxyServer::sendPushNotification(const std::string& token, Json::Value&& jso
    }
    catch (const std::exception &e){
        if (logger_)
-            logger_->e("[proxy:server] [notification] error send push: %s", e.what());
+            logger_->e("[proxy:server] [notification] error send push: %i", e.what());
        if (reqid) {
            std::lock_guard<std::mutex> l(requestLock_);
            requests_.erase(reqid);
@@ -1200,14 +1104,13 @@ DhtProxyServer::put(restinio::request_handle_t request,
                logger_->d("[proxy:server] [put %s] %s %s", infoHash.toString().c_str(),
                          value->toString().c_str(), (permanent ? "permanent" : ""));
            if (permanent) {
-                std::string pushToken, clientId, sessionId, platform, topic;
+                std::string pushToken, clientId, sessionId, platform;
                auto& pVal = root["permanent"];
                if (pVal.isObject()){
                    pushToken = pVal["key"].asString();
                    clientId = pVal["client_id"].asString();
                    platform = pVal["platform"].asString();
                    sessionId = pVal["session_id"].asString();
-                    topic = pVal["topic"].asString();
                }
                std::lock_guard<std::mutex> lock(lockSearchPuts_);
                auto timeout = std::chrono::steady_clock::now() + proxy::OP_TIMEOUT;
@@ -1230,7 +1133,7 @@ DhtProxyServer::put(restinio::request_handle_t request,
                                }
                            }
                            auto response = initHttpResponse(request->create_response());
-                            response.append_body(Json::writeString(jsonBuilder_, pp.second.value->toJson()) + "\n");
+                            response.append_body(Json::writeString(jsonBuilder_, value->toJson()) + "\n");
                            return response.done();
                        }
                    }
@@ -1242,17 +1145,34 @@ DhtProxyServer::put(restinio::request_handle_t request,
                pput.value = value;
                pput.expiration = timeout;
                if (not pput.expireTimer) {
+                    auto &ctx = io_context();
                    // cancel permanent put
-                    pput.expireTimer = std::make_unique<asio::steady_timer>(io_context(), timeout);
+                    pput.expireTimer = std::make_unique<asio::steady_timer>(ctx, timeout);
 #ifdef OPENDHT_PUSH_NOTIFICATIONS
-                    if (not pushToken.empty()) {
+                    if (not pushToken.empty()){
+                        bool isAndroid = platform == "android";
                        pput.pushToken = pushToken;
                        pput.clientId = clientId;
-                        pput.type = getTypeFromString(platform);
-                        if (topic.empty())
-                            topic = getDefaultTopic(pput.type);
-                        pput.topic = topic;
+                        pput.type = isAndroid ? PushType::Android : PushType::iOS;
                        pput.sessionCtx = std::make_shared<PushSessionContext>(sessionId);
+                        // notify push listen expire
+                        auto jsonProvider = [infoHash, clientId, vid, sessionCtx = pput.sessionCtx](){
+                            Json::Value json;
+                            json["timeout"] = infoHash.toString();
+                            json["to"] = clientId;
+                            json["vid"] = std::to_string(vid);
+                            std::lock_guard<std::mutex> l(sessionCtx->lock);
+                            json["s"] = sessionCtx->sessionId;
+                            return json;
+                        };
+                        if (!pput.expireNotifyTimer)
+                            pput.expireNotifyTimer = std::make_unique<asio::steady_timer>(ctx,
+                                                     timeout - proxy::OP_MARGIN);
+                        else
+                            pput.expireNotifyTimer->expires_at(timeout - proxy::OP_MARGIN);
+                        pput.expireNotifyTimer->async_wait(std::bind(
+                            &DhtProxyServer::handleNotifyPushListenExpire, this,
+                            std::placeholders::_1, pushToken, std::move(jsonProvider), pput.type));
                    }
 #endif
                } else {
@@ -1265,34 +1185,12 @@ DhtProxyServer::put(restinio::request_handle_t request,
                        }
                    }
                    pput.expireTimer->expires_at(timeout);
+                    if (pput.expireNotifyTimer)
+                        pput.expireNotifyTimer->expires_at(timeout - proxy::OP_MARGIN);
                }
                pput.expireTimer->async_wait(std::bind(&DhtProxyServer::handleCancelPermamentPut, this,
                                                std::placeholders::_1, infoHash, vid));
-
-#ifdef OPENDHT_PUSH_NOTIFICATIONS
-                // notify put permanent expiration
-                if (pput.sessionCtx) {
-                    auto jsonProvider = [infoHash, clientId, vid, sessionCtx = pput.sessionCtx](){
-                        Json::Value json;
-                        json["timeout"] = infoHash.toString();
-                        json["to"] = clientId;
-                        json["vid"] = std::to_string(vid);
-                        std::lock_guard<std::mutex> l(sessionCtx->lock);
-                        json["s"] = sessionCtx->sessionId;
-                        return json;
-                    };
-                    if (!pput.expireNotifyTimer)
-                        pput.expireNotifyTimer = std::make_unique<asio::steady_timer>(io_context(),
-                                                    timeout - proxy::OP_MARGIN);
-                    else
-                        pput.expireNotifyTimer->expires_at(timeout - proxy::OP_MARGIN);
-                    pput.expireNotifyTimer->async_wait(std::bind(
-                        &DhtProxyServer::handleNotifyPushListenExpire, this,
-                        std::placeholders::_1, pushToken, std::move(jsonProvider), pput.type, pput.topic));
-                }
-#endif
            }
-
            dht_->put(infoHash, value, [this, request, value](bool ok){
                if (ok){
                    auto response = initHttpResponse(request->create_response());
@@ -38,6 +38,15 @@ namespace dht {

 static const std::string PEER_DISCOVERY_DHT_SERVICE = "dht";

+struct DhtRunner::Listener {
+    size_t tokenClassicDht {0};
+    size_t tokenProxyDht {0};
+    ValueCallback gcb;
+    InfoHash hash {};
+    Value::Filter f;
+    Where w;
+};
+
 struct NodeInsertionPack {
    dht::InfoHash nodeId;
    in_port_t port;
@@ -46,6 +55,9 @@ struct NodeInsertionPack {
 };

 DhtRunner::DhtRunner() : dht_()
+#ifdef OPENDHT_PROXY_CLIENT
+, dht_via_proxy_()
+#endif //OPENDHT_PROXY_CLIENT
 {
 #ifdef _WIN32
    WSADATA wsd;
@@ -107,9 +119,8 @@ DhtRunner::run(const Config& config, Context&& context)
            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.getPort() == 0 || local6.getPort() == 0)) {
+            state_path += "_port.txt";
            std::ifstream inConfig(state_path);
            if (inConfig.is_open()) {
                in_port_t port;
@@ -132,59 +143,68 @@ DhtRunner::run(const Config& config, Context&& context)

        if (context.logger) {
            logger_ = context.logger;
+        }
+
+        if (not context.sock) {
+            context.sock.reset(new net::UdpSocket(local4, local6, context.logger));
+        }
+
+        if (not state_path.empty()) {
+            std::ofstream outConfig(state_path);
+            outConfig << context.sock->getBoundRef(AF_INET).getPort() << std::endl;
+            outConfig << context.sock->getBoundRef(AF_INET6).getPort() << std::endl;
+        }
+
+        if (context.logger) {
            logger_->d("[runner %p] state changed to Running", this);
        }

+        context.sock->setOnReceive([&] (net::PacketList&& pkts) {
+            net::PacketList ret;
+            {
+                std::lock_guard<std::mutex> lck(sock_mtx);
+                auto maxSize = net::RX_QUEUE_MAX_SIZE - pkts.size();
+                while (rcv.size() > maxSize) {
+                    if (logger_)
+                        logger_->e("Dropping packet: queue is full!");
+                    rcv.pop_front();
+                }
+
+                rcv.splice(rcv.end(), std::move(pkts));
+                ret = std::move(rcv_free);
+            }
+            cv.notify_all();
+            return ret;
+        });
+
 #ifdef OPENDHT_PROXY_CLIENT
        config_ = config;
        identityAnnouncedCb_ = context.identityAnnouncedCb;
 #endif
-
-        if (config.proxy_server.empty()) {
-            if (not context.sock) {
-                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!", 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->getBoundRef(AF_INET).getPort() << std::endl;
-                outConfig << context.sock->getBoundRef(AF_INET6).getPort() << std::endl;
-            }
-            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);
-        }
+        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);
+        enableProxy(not config.proxy_server.empty());
    } catch(const std::exception& e) {
        config_ = {};
        identityAnnouncedCb_ = {};
        dht_.reset();
+#ifdef OPENDHT_PROXY_CLIENT
+        dht_via_proxy_.reset();
+#endif
        running = State::Idle;
        throw;
    }

+    if (context.logger and dht_via_proxy_) {
+        dht_via_proxy_->setLogger(context.logger);
+    }
    if (context.statusChangedCallback) {
        statusCb = std::move(context.statusChangedCallback);
    }
    if (context.certificateStore) {
        dht_->setLocalCertificateStore(std::move(context.certificateStore));
+        if (dht_via_proxy_)
+            dht_via_proxy_->setLocalCertificateStore(std::move(context.certificateStore));
    }

    if (not config.threaded)
@@ -219,50 +239,46 @@ DhtRunner::run(const Config& config, Context&& context)
        }
    });

-    if (config.proxy_server.empty()) {
-        if (config.peer_discovery or config.peer_publish) {
+    if (config.peer_discovery or config.peer_publish) {
 #ifdef OPENDHT_PEER_DISCOVERY
-            peerDiscovery_ = context.peerDiscovery ?
-                std::move(context.peerDiscovery) :
-                std::make_shared<PeerDiscovery>();
+        peerDiscovery_ = context.peerDiscovery ?
+            std::move(context.peerDiscovery) :
+            std::make_shared<PeerDiscovery>();
 #else
-            std::cerr << "Peer discovery requested but OpenDHT built without peer discovery support." << std::endl;
-#endif
-        }
-
-#ifdef OPENDHT_PEER_DISCOVERY
-        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.setPort(v.port);
-                if (v.nodeId != dht_->getNodeId() && netId == v.net){
-                    bootstrap(v.nodeId, addr);
-                }
-            });
-        }
-        if (config.peer_publish) {
-            msgpack::sbuffer sbuf_node;
-            NodeInsertionPack adc;
-            adc.net = netId;
-            adc.nodeId = dht_->getNodeId();
-            if (auto socket = dht_->getSocket()) {
-                // IPv4
-                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
-                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);
-                }
-            }
-        }
+        std::cerr << "Peer discovery requested but OpenDHT built without peer discovery support." << std::endl;
 #endif
    }
+
+#ifdef OPENDHT_PEER_DISCOVERY
+    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.setPort(v.port);
+            if (v.nodeId != dht_->getNodeId() && netId == v.net){
+                bootstrap(v.nodeId, addr);
+            }
+        });
+    }
+    if (config.peer_publish) {
+        msgpack::sbuffer sbuf_node;
+        NodeInsertionPack adc;
+        adc.net = netId;
+        adc.nodeId = dht_->getNodeId();
+        // IPv4
+        if (const auto& bound4 = dht_->getSocket()->getBoundRef(AF_INET)) {
+            adc.port = bound4.getPort();
+            msgpack::pack(sbuf_node, adc);
+            peerDiscovery_->startPublish(AF_INET, PEER_DISCOVERY_DHT_SERVICE, sbuf_node);
+        }
+        // IPv6
+        if (const auto& bound6 = dht_->getSocket()->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);
+        }
+    }
+#endif
 }

 void
@@ -271,8 +287,7 @@ DhtRunner::shutdown(ShutdownCallback cb, bool stop) {
    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));
+            shutdownCallbacks_.emplace_back(std::move(cb));
        }
        else if (cb) {
            lck.unlock();
@@ -286,10 +301,12 @@ DhtRunner::shutdown(ShutdownCallback cb, bool stop) {
    shutdownCallbacks_.emplace_back(std::move(cb));
    pending_ops.emplace([=](SecureDht&) mutable {
        auto onShutdown = [this]{ opEnded(); };
+#ifdef OPENDHT_PROXY_CLIENT
+        if (dht_via_proxy_)
+            dht_via_proxy_->shutdown(onShutdown, stop);
+#endif
        if (dht_)
            dht_->shutdown(onShutdown, stop);
-        else
-            opEnded();
    });
    cv.notify_all();
 }
@@ -392,25 +409,31 @@ void
 DhtRunner::dumpTables() const
 {
    std::lock_guard<std::mutex> lck(dht_mtx);
-    dht_->dumpTables();
+    activeDht()->dumpTables();
 }

 InfoHash
 DhtRunner::getId() const
 {
-    return dht_ ? dht_->getId() : InfoHash{};
+    if (auto dht = activeDht())
+        return dht->getId();
+    return {};
 }

 std::shared_ptr<crypto::PublicKey>
 DhtRunner::getPublicKey() const
 {
-    return dht_ ? dht_->getPublicKey() : std::shared_ptr<crypto::PublicKey>{};
+    if (auto dht = activeDht())
+        return dht->getPublicKey();
+    return {};
 }

 InfoHash
 DhtRunner::getNodeId() const
 {
-    return dht_ ? dht_->getNodeId() : InfoHash{};
+    if (auto dht = activeDht())
+        return dht->getNodeId();
+    return {};
 }


@@ -452,6 +475,10 @@ DhtRunner::setLogger(const Sp<Logger>& logger) {
    logger_ = logger;
    if (dht_)
        dht_->setLogger(logger);
+#ifdef OPENDHT_PROXY_CLIENT
+    if (dht_via_proxy_)
+        dht_via_proxy_->setLogger(logger);
+#endif
 }

 void
@@ -465,12 +492,16 @@ DhtRunner::setLogFilter(const InfoHash& f) {
    std::lock_guard<std::mutex> lck(dht_mtx);
    if (dht_)
        dht_->setLogFilter(f);
+#ifdef OPENDHT_PROXY_CLIENT
+    if (dht_via_proxy_)
+        dht_via_proxy_->setLogFilter(f);
+#endif
 }

 void
 DhtRunner::registerType(const ValueType& type) {
    std::lock_guard<std::mutex> lck(dht_mtx);
-    dht_->registerType(type);
+    activeDht()->registerType(type);
 }

 void
@@ -483,7 +514,7 @@ unsigned
 DhtRunner::getNodesStats(sa_family_t af, unsigned *good_return, unsigned *dubious_return, unsigned *cached_return, unsigned *incoming_return) const
 {
    std::lock_guard<std::mutex> lck(dht_mtx);
-    const auto stats = dht_->getNodesStats(af);
+    const auto stats = activeDht()->getNodesStats(af);
    if (good_return)
        *good_return = stats.good_nodes;
    if (dubious_return)
@@ -499,19 +530,19 @@ NodeStats
 DhtRunner::getNodesStats(sa_family_t af) const
 {
    std::lock_guard<std::mutex> lck(dht_mtx);
-    return dht_->getNodesStats(af);
+    return activeDht()->getNodesStats(af);
 }

 NodeInfo
 DhtRunner::getNodeInfo() const {
    std::lock_guard<std::mutex> lck(dht_mtx);
    NodeInfo info {};
-    if (dht_) {
-        info.id = dht_->getId();
-        info.node_id = dht_->getNodeId();
-        info.ipv4 = dht_->getNodesStats(AF_INET);
-        info.ipv6 = dht_->getNodesStats(AF_INET6);
-        if (auto sock = dht_->getSocket()) {
+    if (auto dht = activeDht()) {
+        info.id = dht->getId();
+        info.node_id = dht->getNodeId();
+        info.ipv4 = dht->getNodesStats(AF_INET);
+        info.ipv6 = dht->getNodesStats(AF_INET6);
+        if (auto sock = dht->getSocket()) {
            info.bound4 = sock->getBoundRef(AF_INET).getPort();
            info.bound6 = sock->getBoundRef(AF_INET6).getPort();
        }
@@ -532,7 +563,6 @@ DhtRunner::getNodeInfo(std::function<void(std::shared_ptr<NodeInfo>)> cb)
        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();
@@ -548,49 +578,49 @@ std::vector<unsigned>
 DhtRunner::getNodeMessageStats(bool in) const
 {
    std::lock_guard<std::mutex> lck(dht_mtx);
-    return dht_->getNodeMessageStats(in);
+    return activeDht()->getNodeMessageStats(in);
 }

 std::string
 DhtRunner::getStorageLog() const
 {
    std::lock_guard<std::mutex> lck(dht_mtx);
-    return dht_->getStorageLog();
+    return activeDht()->getStorageLog();
 }
 std::string
 DhtRunner::getStorageLog(const InfoHash& f) const
 {
    std::lock_guard<std::mutex> lck(dht_mtx);
-    return dht_->getStorageLog(f);
+    return activeDht()->getStorageLog(f);
 }
 std::string
 DhtRunner::getRoutingTablesLog(sa_family_t af) const
 {
    std::lock_guard<std::mutex> lck(dht_mtx);
-    return dht_->getRoutingTablesLog(af);
+    return activeDht()->getRoutingTablesLog(af);
 }
 std::string
 DhtRunner::getSearchesLog(sa_family_t af) const
 {
    std::lock_guard<std::mutex> lck(dht_mtx);
-    return dht_->getSearchesLog(af);
+    return activeDht()->getSearchesLog(af);
 }
 std::string
 DhtRunner::getSearchLog(const InfoHash& f, sa_family_t af) const
 {
    std::lock_guard<std::mutex> lck(dht_mtx);
-    return dht_->getSearchLog(f, af);
+    return activeDht()->getSearchLog(f, af);
 }
 std::vector<SockAddr>
-DhtRunner::getPublicAddress(sa_family_t af) const
+DhtRunner::getPublicAddress(sa_family_t af)
 {
    std::lock_guard<std::mutex> lck(dht_mtx);
-    if (dht_)
-        return dht_->getPublicAddress(af);
+    if (auto dht = activeDht())
+        return dht->getPublicAddress(af);
    return {};
 }
 std::vector<std::string>
-DhtRunner::getPublicAddressStr(sa_family_t af) const
+DhtRunner::getPublicAddressStr(sa_family_t af)
 {
    auto addrs = getPublicAddress(af);
    std::vector<std::string> ret(addrs.size());
@@ -613,12 +643,15 @@ DhtRunner::getPublicAddress(std::function<void(std::vector<SockAddr>&&)> cb, sa_
 void
 DhtRunner::registerCertificate(std::shared_ptr<crypto::Certificate> cert) {
    std::lock_guard<std::mutex> lck(dht_mtx);
-    dht_->registerCertificate(cert);
+    activeDht()->registerCertificate(cert);
 }
-
 void
 DhtRunner::setLocalCertificateStore(CertificateStoreQuery&& query_method) {
    std::lock_guard<std::mutex> lck(dht_mtx);
+#ifdef OPENDHT_PROXY_CLIENT
+    if (dht_via_proxy_)
+        dht_via_proxy_->setLocalCertificateStore(std::forward<CertificateStoreQuery>(query_method));
+#endif
    if (dht_)
        dht_->setLocalCertificateStore(std::forward<CertificateStoreQuery>(query_method));
 }
@@ -626,7 +659,8 @@ DhtRunner::setLocalCertificateStore(CertificateStoreQuery&& query_method) {
 time_point
 DhtRunner::loop_()
 {
-    if (not dht_)
+    auto dht = activeDht();
+    if (not dht)
        return {};

    decltype(pending_ops) ops {};
@@ -637,7 +671,7 @@ DhtRunner::loop_()
               std::move(pending_ops) : std::move(pending_ops_prio);
    }
    while (not ops.empty()) {
-        ops.front()(*dht_);
+        ops.front()(*dht);
        ops.pop();
    }

@@ -670,13 +704,13 @@ DhtRunner::loop_()
            if (now - pkt.received > net::RX_QUEUE_MAX_DELAY)
                dropped++;
            else
-                wakeup = dht_->periodic(pkt.data.data(), pkt.data.size(), std::move(pkt.from), now);
+                wakeup = dht->periodic(pkt.data.data(), pkt.data.size(), std::move(pkt.from), now);
            pkt.data.clear();
        }
        received_treated.splice(received_treated.end(), std::move(received));
    } else {
        // Or just run the scheduler
-        wakeup = dht_->periodic(nullptr, 0, nullptr, 0, clock::now());
+        wakeup = dht->periodic(nullptr, 0, nullptr, 0, clock::now());
    }

    if (not received_treated.empty()) {
@@ -688,8 +722,8 @@ DhtRunner::loop_()
    if (dropped && logger_)
        logger_->e("[runner %p] Dropped %zu packets with high delay.", this, dropped);

-    NodeStatus nstatus4 = dht_->updateStatus(AF_INET);
-    NodeStatus nstatus6 = dht_->updateStatus(AF_INET6);
+    NodeStatus nstatus4 = dht->updateStatus(AF_INET);
+    NodeStatus nstatus6 = dht->updateStatus(AF_INET6);
    if (nstatus4 != status4 || nstatus6 != status6) {
        status4 = nstatus4;
        status6 = nstatus6;
@@ -747,7 +781,27 @@ DhtRunner::listen(InfoHash hash, ValueCallback vcb, Value::Filter f, Where w)
        return ret_token->get_future();
    }
    pending_ops.emplace([=](SecureDht& dht) mutable {
+#ifdef OPENDHT_PROXY_CLIENT
+        auto tokenbGlobal = listener_token_++;
+        auto& listener = listeners_[tokenbGlobal];
+        listener.hash = hash;
+        listener.f = std::move(f);
+        listener.w = std::move(w);
+        listener.gcb = [hash,vcb,tokenbGlobal,this](const std::vector<Sp<Value>>& vals, bool expired) {
+            if (not vcb(vals, expired)) {
+                cancelListen(hash, tokenbGlobal);
+                return false;
+            }
+            return true;
+        };
+        if (auto token = dht.listen(hash, listener.gcb, listener.f, listener.w)) {
+            if (use_proxy)  listener.tokenProxyDht = token;
+            else            listener.tokenClassicDht = token;
+        }
+        ret_token->set_value(tokenbGlobal);
+#else
        ret_token->set_value(dht.listen(hash, std::move(vcb), std::move(f), std::move(w)));
+#endif
    });
    cv.notify_all();
    return ret_token->get_future();
@@ -766,10 +820,23 @@ DhtRunner::cancelListen(InfoHash h, size_t token)
    if (running != State::Running)
        return;
    ongoing_ops++;
+#ifdef OPENDHT_PROXY_CLIENT
+    pending_ops.emplace([=](SecureDht&) {
+        auto it = listeners_.find(token);
+        if (it == listeners_.end()) return;
+        if (it->second.tokenClassicDht)
+            dht_->cancelListen(h, it->second.tokenClassicDht);
+        if (it->second.tokenProxyDht and dht_via_proxy_)
+            dht_via_proxy_->cancelListen(h, it->second.tokenProxyDht);
+        listeners_.erase(it);
+        opEnded();
+    });
+#else
    pending_ops.emplace([=](SecureDht& dht) {
        dht.cancelListen(h, token);
        opEnded();
    });
+#endif // OPENDHT_PROXY_CLIENT
    cv.notify_all();
 }

@@ -780,10 +847,23 @@ DhtRunner::cancelListen(InfoHash h, std::shared_future<size_t> ftoken)
    if (running != State::Running)
        return;
    ongoing_ops++;
+#ifdef OPENDHT_PROXY_CLIENT
+    pending_ops.emplace([this, h, ftoken = std::move(ftoken)](SecureDht&) {
+        auto it = listeners_.find(ftoken.get());
+        if (it == listeners_.end()) return;
+        if (it->second.tokenClassicDht)
+            dht_->cancelListen(h, it->second.tokenClassicDht);
+        if (it->second.tokenProxyDht and dht_via_proxy_)
+            dht_via_proxy_->cancelListen(h, it->second.tokenProxyDht);
+        listeners_.erase(it);
+        opEnded();
+    });
+#else
    pending_ops.emplace([this, h, ftoken = std::move(ftoken)](SecureDht& dht) {
        dht.cancelListen(h, ftoken.get());
        opEnded();
    });
+#endif // OPENDHT_PROXY_CLIENT
    cv.notify_all();
 }

@@ -1072,9 +1152,23 @@ void
 DhtRunner::resetDht()
 {
    peerDiscovery_.reset();
+#ifdef OPENDHT_PROXY_CLIENT
+    listeners_.clear();
+    dht_via_proxy_.reset();
+#endif // OPENDHT_PROXY_CLIENT
    dht_.reset();
 }

+SecureDht*
+DhtRunner::activeDht() const
+{
+#ifdef OPENDHT_PROXY_CLIENT
+    return use_proxy? dht_via_proxy_.get() : dht_.get();
+#else
+    return dht_.get();
+#endif // OPENDHT_PROXY_CLIENT
+}
+
 void
 DhtRunner::setProxyServer(const std::string& proxy, const std::string& pushNodeId)
 {
@@ -1087,7 +1181,7 @@ DhtRunner::setProxyServer(const std::string& proxy, const std::string& pushNodeI
    enableProxy(use_proxy and not config_.proxy_server.empty());
 #else
    if (not proxy.empty())
-        throw std::runtime_error("DHT proxy requested but OpenDHT built without proxy support.");
+        std::cerr << "DHT proxy requested but OpenDHT built without proxy support." << std::endl;
 #endif
 }

@@ -1095,37 +1189,54 @@ void
 DhtRunner::enableProxy(bool proxify)
 {
 #ifdef OPENDHT_PROXY_CLIENT
-    if (dht_) {
-        dht_->shutdown({});
+    if (dht_via_proxy_) {
+        dht_via_proxy_->shutdown({});
    }
    if (proxify) {
        // Init the proxy client
-        auto dht_via_proxy = std::make_unique<DhtProxyClient>(
+        auto dht_via_proxy = std::unique_ptr<DhtInterface>(
+            new DhtProxyClient(
                config_.server_ca,
                config_.client_identity,
                [this]{
                    if (config_.threaded) {
-                        std::lock_guard<std::mutex> lck(storage_mtx);
-                        pending_ops_prio.emplace([=](SecureDht&) mutable {});
+                        {
+                            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_);
+                config_.proxy_server, config_.push_node_id, logger_)
+        );
+#ifdef OPENDHT_PUSH_NOTIFICATIONS
        if (not config_.push_token.empty())
            dht_via_proxy->setPushNotificationToken(config_.push_token);
-        if (not config_.push_topic.empty())
-            dht_via_proxy->setPushNotificationTopic(config_.push_topic);
-        if (not config_.push_platform.empty())
-            dht_via_proxy->setPushNotificationPlatform(config_.push_platform);
-        dht_ = std::make_unique<SecureDht>(std::move(dht_via_proxy), config_.dht_config, identityAnnouncedCb_, logger_);
+#endif
+        dht_via_proxy_ = std::unique_ptr<SecureDht>(new SecureDht(std::move(dht_via_proxy), config_.dht_config, identityAnnouncedCb_, logger_));
+        // add current listeners
+        for (auto& l: listeners_)
+            l.second.tokenProxyDht = dht_via_proxy_->listen(l.second.hash, l.second.gcb, l.second.f, l.second.w);
        // and use it
        use_proxy = proxify;
    } else {
        use_proxy = proxify;
+        std::lock_guard<std::mutex> lck(storage_mtx);
+        if (not listeners_.empty()) {
+            pending_ops.emplace([this](SecureDht& /*dht*/) mutable {
+                if (not dht_)
+                    return;
+                for (auto& l : listeners_) {
+                    if (not l.second.tokenClassicDht) {
+                        l.second.tokenClassicDht = dht_->listen(l.second.hash, l.second.gcb, l.second.f, l.second.w);
+                    }
+                }
+            });
+        }
    }
 #else
    if (proxify)
-        throw std::runtime_error("DHT proxy requested but OpenDHT built without proxy support.");
+        std::cerr << "DHT proxy requested but OpenDHT built without proxy support." << std::endl;
 #endif
 }

@@ -1133,8 +1244,16 @@ void
 DhtRunner::forwardAllMessages(bool forward)
 {
    std::lock_guard<std::mutex> lck(dht_mtx);
+#ifdef OPENDHT_PROXY_SERVER
+#ifdef OPENDHT_PROXY_CLIENT
+    if (dht_via_proxy_)
+        dht_via_proxy_->forwardAllMessages(forward);
+#endif // OPENDHT_PROXY_CLIENT
    if (dht_)
        dht_->forwardAllMessages(forward);
+#else
+    (void) forward;
+#endif // OPENDHT_PROXY_SERVER
 }

 /**
@@ -1145,46 +1264,24 @@ DhtRunner::setPushNotificationToken(const std::string& token) {
    std::lock_guard<std::mutex> lck(dht_mtx);
 #if defined(OPENDHT_PROXY_CLIENT) && defined(OPENDHT_PUSH_NOTIFICATIONS)
    config_.push_token = token;
-    if (dht_)
-        dht_->setPushNotificationToken(token);
+    if (dht_via_proxy_)
+        dht_via_proxy_->setPushNotificationToken(token);
 #else
    (void) token;
 #endif
 }

-void
-DhtRunner::setPushNotificationTopic(const std::string& topic) {
-    std::lock_guard<std::mutex> lck(dht_mtx);
-#if defined(OPENDHT_PROXY_CLIENT) && defined(OPENDHT_PUSH_NOTIFICATIONS)
-    config_.push_topic = topic;
-    if (dht_)
-        dht_->setPushNotificationTopic(topic);
-#else
-    (void) topic;
-#endif
-}
-
-void
-DhtRunner::setPushNotificationPlatform(const std::string& platform) {
-    std::lock_guard<std::mutex> lck(dht_mtx);
-#if defined(OPENDHT_PROXY_CLIENT) && defined(OPENDHT_PUSH_NOTIFICATIONS)
-    config_.push_platform = platform;
-    if (dht_)
-        dht_->setPushNotificationPlatform(platform);
-#else
-    (void) platform;
-#endif
-}
-
 void
 DhtRunner::pushNotificationReceived(const std::map<std::string, std::string>& data)
 {
 #if defined(OPENDHT_PROXY_CLIENT) && defined(OPENDHT_PUSH_NOTIFICATIONS)
-    std::lock_guard<std::mutex> lck(storage_mtx);
-    pending_ops_prio.emplace([=](SecureDht&) {
-        if (dht_)
-            dht_->pushNotificationReceived(data);
-    });
+    {
+        std::lock_guard<std::mutex> lck(storage_mtx);
+        pending_ops_prio.emplace([=](SecureDht&) {
+            if (dht_via_proxy_)
+                dht_via_proxy_->pushNotificationReceived(data);
+        });
+    }
    cv.notify_all();
 #else
    (void) data;
@@ -567,12 +567,9 @@ Connection::async_connect(std::vector<asio::ip::tcp::endpoint>&& endpoints, Conn
    }
    auto& base = ssl_socket_? ssl_socket_->lowest_layer() : *socket_;

-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wunused-variable"
-    ConnectHandlerCb wcb = [this, &base, cb=std::move(cb)](const asio::error_code& ec, const asio::ip::tcp::endpoint& endpoint) {
+    ConnectHandlerCb wcb = [&base, cb=std::move(cb)](const asio::error_code& ec, const asio::ip::tcp::endpoint& endpoint) {
        if (!ec) {
            auto socket = base.native_handle();
-            local_address_ = base.local_endpoint().address();
            // Once connected, set a keep alive on the TCP socket with 30 seconds delay
            // This will generate broken pipes as soon as possible.
            // Note this needs to be done once connected to have a valid native_handle()
@@ -617,12 +614,10 @@ Connection::async_connect(std::vector<asio::ip::tcp::endpoint>&& endpoints, Conn
        if (cb)
            cb(ec, endpoint);
    };
-#pragma GCC diagnostic pop
-
    if (ssl_socket_)
-        asio::async_connect(ssl_socket_->lowest_layer(), std::move(endpoints), wrapCallback(std::move(wcb)));
+        asio::async_connect(ssl_socket_->lowest_layer(), std::move(endpoints), wrapCallabck(std::move(wcb)));
    else
-        asio::async_connect(*socket_, std::move(endpoints), wrapCallback(std::move(wcb)));
+        asio::async_connect(*socket_, std::move(endpoints), wrapCallabck(std::move(wcb)));
 }

 void
@@ -667,8 +662,8 @@ Connection::async_write(BytesHandlerCb cb)
        if (cb) ctx_.post([cb](){ cb(asio::error::broken_pipe, 0); });
        return;
    }
-    if (ssl_socket_)  asio::async_write(*ssl_socket_, write_buf_, wrapCallback(std::move(cb)));
-    else if (socket_) asio::async_write(*socket_, write_buf_, wrapCallback(std::move(cb)));
+    if (ssl_socket_)  asio::async_write(*ssl_socket_, write_buf_, wrapCallabck(std::move(cb)));
+    else if (socket_) asio::async_write(*socket_, write_buf_, wrapCallabck(std::move(cb)));
    else if (cb)      ctx_.post([cb](){ cb(asio::error::operation_aborted, 0); });
 }

@@ -680,8 +675,8 @@ Connection::async_read_until(const char* delim, BytesHandlerCb cb)
        if (cb) ctx_.post([cb](){ cb(asio::error::broken_pipe, 0); });
        return;
    }
-    if (ssl_socket_)  asio::async_read_until(*ssl_socket_, read_buf_, delim, wrapCallback(std::move(cb)));
-    else if (socket_) asio::async_read_until(*socket_, read_buf_, delim, wrapCallback(std::move(cb)));
+    if (ssl_socket_)  asio::async_read_until(*ssl_socket_, read_buf_, delim, wrapCallabck(std::move(cb)));
+    else if (socket_) asio::async_read_until(*socket_, read_buf_, delim, wrapCallabck(std::move(cb)));
    else if (cb)      ctx_.post([cb](){ cb(asio::error::operation_aborted, 0); });
 }

@@ -693,8 +688,8 @@ Connection::async_read_until(char delim, BytesHandlerCb cb)
        if (cb) ctx_.post([cb](){ cb(asio::error::broken_pipe, 0); });
        return;
    }
-    if (ssl_socket_)  asio::async_read_until(*ssl_socket_, read_buf_, delim, wrapCallback(std::move(cb)));
-    else if (socket_) asio::async_read_until(*socket_, read_buf_, delim, wrapCallback(std::move(cb)));
+    if (ssl_socket_)  asio::async_read_until(*ssl_socket_, read_buf_, delim, wrapCallabck(std::move(cb)));
+    else if (socket_) asio::async_read_until(*socket_, read_buf_, delim, wrapCallabck(std::move(cb)));
    else if (cb)      ctx_.post([cb](){ cb(asio::error::operation_aborted, 0); });
 }

@@ -706,8 +701,8 @@ Connection::async_read(size_t bytes, BytesHandlerCb cb)
        if (cb) ctx_.post([cb](){ cb(asio::error::broken_pipe, 0); });
        return;
    }
-    if (ssl_socket_)  asio::async_read(*ssl_socket_, read_buf_, asio::transfer_exactly(bytes), wrapCallback(std::move(cb)));
-    else if (socket_) asio::async_read(*socket_, read_buf_, asio::transfer_exactly(bytes), wrapCallback(std::move(cb)));
+    if (ssl_socket_)  asio::async_read(*ssl_socket_, read_buf_, asio::transfer_exactly(bytes), wrapCallabck(std::move(cb)));
+    else if (socket_) asio::async_read(*socket_, read_buf_, asio::transfer_exactly(bytes), wrapCallabck(std::move(cb)));
    else if (cb)      ctx_.post([cb](){ cb(asio::error::operation_aborted, 0); });
 }

@@ -728,15 +723,16 @@ Connection::async_read_some(size_t bytes, BytesHandlerCb cb)
    else              socket_->async_read_some(buf, onEnd);
 }

-const asio::ip::address&
-Connection::local_address() const
-{
-    return local_address_;
-}
-
 void
-Connection::timeout(const std::chrono::seconds& timeout, HandlerCb cb)
+Connection::timeout(const std::chrono::seconds timeout, HandlerCb cb)
 {
+    if (!is_open()){
+        if (logger_)
+            logger_->e("[connection:%i] closed, can't timeout", id_);
+        if (cb)
+            cb(asio::error::operation_aborted);
+        return;
+    }
    if (!timeout_timer_)
        timeout_timer_ = std::make_unique<asio::steady_timer>(ctx_);
    timeout_timer_->expires_at(std::chrono::steady_clock::now() + timeout);
@@ -1195,9 +1191,6 @@ Request::connect(std::vector<asio::ip::tcp::endpoint>&& endpoints, HandlerCb cb)
    else
        conn_ = std::make_shared<Connection>(ctx_, false/*ssl*/, logger_);

-    if (conn_ && timeoutCb_)
-        conn_->timeout(timeout_, std::move(timeoutCb_));
-
    // try to connect to any until one works
    std::weak_ptr<Request> wthis = shared_from_this();
    conn_->async_connect(std::move(endpoints), [wthis, cb, isHttps]
@@ -415,7 +415,7 @@ NetworkEngine::processMessage(const uint8_t *buf, size_t buflen, SockAddr f)
        return;
    }

-    auto msg = std::make_unique<ParsedMessage>();
+    std::unique_ptr<ParsedMessage> msg {new ParsedMessage};
    try {
        msgpack::unpacked msg_res = msgpack::unpack((const char*)buf, buflen);
        msg->msgpack_unpack(msg_res.get());
@@ -1155,12 +1155,11 @@ NetworkEngine::sendAnnounceValue(const Sp<Node>& n,
    msgpack::packer<msgpack::sbuffer> pk(&buffer);
    pk.pack_map(5+(config.network?1:0));

-    bool add_created = created < scheduler.time();
-    pk.pack(KEY_A); pk.pack_map(add_created ? 5 : 4);
+    pk.pack(KEY_A); pk.pack_map((created < scheduler.time() ? 5 : 4));
      pk.pack(KEY_REQ_ID);     pk.pack(myid);
      pk.pack(KEY_REQ_H);      pk.pack(infohash);
      auto v = packValueHeader(buffer, {value});
-      if (add_created) {
+      if (created < scheduler.time()) {
          pk.pack(KEY_REQ_CREATION);
          pk.pack(to_time_t(created));
      }
@@ -148,8 +148,6 @@ UdpSocket::sendTo(const SockAddr& dest, const uint8_t* data, size_t size, bool r
 #ifdef MSG_CONFIRM
    if (replied)
        flags |= MSG_CONFIRM;
-#else
-    (void) replied;
 #endif
 #ifdef MSG_NOSIGNAL
    flags |= MSG_NOSIGNAL;
@@ -28,12 +28,6 @@ OpValueCache::onValuesAdded(const std::vector<Sp<Value>>& vals, const system_clo
        auto viop = values.emplace(v->id, v);
        if (viop.second) {
            newValues.emplace_back(v);
-        } else if (*viop.first->second.data != *v) {
-            // Special case for edition
-            if (v->seq > viop.first->second.data->seq) {
-                viop.first->second.data = v;
-                newValues.emplace_back(v);
-            }
        } else {
            viop.first->second.refCount++;
        }
@@ -175,7 +169,7 @@ SearchCache::getOp(const Sp<Query>& q) const
 }

 size_t
-SearchCache::listen(const ValueCallback& get_cb, const Sp<Query>& q, Value::Filter&& filter, const OnListen& onListen)
+SearchCache::listen(const ValueCallback& get_cb, const Sp<Query>& q, const Value::Filter& filter, const OnListen& onListen)
 {
    // find exact match
    auto op = getOp(q);
@@ -192,7 +186,7 @@ SearchCache::listen(const ValueCallback& get_cb, const Sp<Query>& q, Value::Filt
    auto token = nextToken_++;
    if (nextToken_ == 0)
        nextToken_++;
-    return op->second->addListener(token, get_cb, q, std::move(filter)) ? token : 0;
+    return op->second->addListener(token, get_cb, q, filter) ? token : 0;
 }

 bool
@@ -107,12 +107,12 @@ public:
    void onValuesAdded(const std::vector<Sp<Value>>& vals);
    void onValuesExpired(const std::vector<Sp<Value>>& vals);

-    bool addListener(size_t token, const ValueCallback& cb, const Sp<Query>& q, Value::Filter&& filter) {
+    bool addListener(size_t token, const ValueCallback& cb, const Sp<Query>& q, const Value::Filter& filter) {
        auto cached = cache.get(filter);
        if (not cached.empty() and not cb(cached, false)) {
            return false;
        }
-        listeners.emplace(token, LocalListener{q, std::move(filter), cb});
+        listeners.emplace(token, LocalListener{q, filter, cb});
        return true;
    }

@@ -167,7 +167,7 @@ public:
    SearchCache(SearchCache&&) = default;

    using OnListen = std::function<size_t(Sp<Query>, ValueCallback, SyncCallback)>;
-    size_t listen(const ValueCallback& get_cb, const Sp<Query>& q, Value::Filter&& filter, const OnListen& onListen);
+    size_t listen(const ValueCallback& get_cb, const Sp<Query>& q, const Value::Filter& filter, const OnListen& onListen);

    bool cancelListen(size_t gtoken, const time_point& now);
    void cancelAll(const std::function<void(size_t)>& onCancel);
@@ -194,7 +194,7 @@ PeerDiscovery::DomainPeerDiscovery::publish(const asio::ip::udp::endpoint& peer)
    if (not lrunning_)
        return;

-    sockFd_.async_send_to(asio::buffer((const void*)sbuf_.data(), sbuf_.size()), peer,
+    sockFd_.async_send_to(asio::buffer(sbuf_.data(), sbuf_.size()), peer,
            [logger=logger_, peer] (const asio::error_code& ec, size_t)
            {
                if (ec and (ec != asio::error::operation_aborted) and logger)
@@ -209,8 +209,8 @@ PeerDiscovery::DomainPeerDiscovery::publish(const asio::ip::udp::endpoint& peer)
 void
 PeerDiscovery::DomainPeerDiscovery::startPublish(const std::string &type, const msgpack::sbuffer &pack_buf)
 {
-    msgpack::sbuffer pack_buf_c(pack_buf.size());
-    pack_buf_c.write(pack_buf.data(), pack_buf.size());
+    msgpack::sbuffer pack_buf_c;
+    pack_buf_c.write(pack_buf.data(),pack_buf.size());

    std::lock_guard<std::mutex> lck(mtx_);
    messages_[type] = std::move(pack_buf_c);
@@ -547,9 +547,9 @@ struct Dht::Search {
        }
    }

-    size_t listen(const ValueCallback& cb, Value::Filter&& f, const Sp<Query>& q, Scheduler& scheduler) {
+    size_t listen(const ValueCallback& cb, const 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){
+        return cache.listen(cb, q, f, [&](const Sp<Query>& q, ValueCallback vcb, SyncCallback scb){
            done = false;
            auto token = ++listener_token;
            listeners.emplace(token, SearchListener{q, vcb, scb});
@@ -71,20 +71,33 @@ SecureDht::~SecureDht() = default;
 ValueType
 SecureDht::secureType(ValueType&& type)
 {
-    type.storePolicy = [type](InfoHash id, Sp<Value>& v, const InfoHash& nid, const SockAddr& a) {
-        if (v->isSigned())
-            return v->checkSignature();
+    type.storePolicy = [this,type](InfoHash id, Sp<Value>& v, const InfoHash& nid, const SockAddr& a) {
+        if (v->isSigned()) {
+            if (!v->signatureChecked) {
+                v->signatureChecked = true;
+                v->signatureValid = v->owner and v->owner->checkSignature(v->getToSign(), v->signature);
+            }
+            if (!v->signatureValid) {
+                if (logger_)
+                    logger_->w("Signature verification failed");
+                return false;
+            }
+        }
        return type.storePolicy(id, v, nid, a);
    };
    type.editPolicy = [this,type](InfoHash id, const Sp<Value>& o, Sp<Value>& n, const InfoHash& nid, const SockAddr& a) {
-        if (not o->isSigned())
+        if (!o->isSigned())
            return type.editPolicy(id, o, n, nid, a);
-        if (*o->owner != *n->owner or not n->isSigned()) {
+        if (o->owner != n->owner) {
            if (logger_)
-                logger_->w("Edition forbidden: not signed or wrong owner.");
+                logger_->w("Edition forbidden: owner changed.");
            return false;
        }
-        if (not n->checkSignature()) {
+        if (!n->signatureChecked) {
+            n->signatureChecked = true;
+            n->signatureValid = o->owner and o->owner->checkSignature(n->getToSign(), n->signature);
+        }
+        if (!n->signatureValid) {
            if (logger_)
                logger_->w("Edition forbidden: signature verification failed.");
            return false;
@@ -240,14 +253,19 @@ SecureDht::checkValue(const Sp<Value>& v)
 #endif
            return {};
        }
+        if (v->decrypted) {
+            return v->decryptedValue;
+        }
+        v->decrypted = true;
        try {
-            auto isDecrypted = v->isDecrypted();
-            if (auto decrypted_val = v->decrypt(*key_)) {
-                auto cacheValue = not isDecrypted and decrypted_val->owner;
-                if (cacheValue)
-                    nodesPubKeys_[decrypted_val->owner->getId()] = decrypted_val->owner;
-                return decrypted_val;
+            Value decrypted_val (decrypt(*v));
+            if (decrypted_val.recipient == getId()) {
+                if (decrypted_val.owner)
+                    nodesPubKeys_[decrypted_val.owner->getId()] = decrypted_val.owner;
+                v->decryptedValue = std::make_shared<Value>(std::move(decrypted_val));
+                return v->decryptedValue;
            }
+            // Ignore values belonging to other people
        } catch (const std::exception& e) {
            if (logger_)
                logger_->w("Could not decrypt value %s : %s", v->toString().c_str(), e.what());
@@ -255,12 +273,17 @@ SecureDht::checkValue(const Sp<Value>& v)
    }
    // Check signed values
    else if (v->isSigned()) {
-        auto cacheValue = not v->isSignatureChecked() and enableCache_ and v->owner;
-        if (v->checkSignature()) {
-            if (cacheValue)
+        if (v->signatureChecked) {
+            return v->signatureValid ? v : Sp<Value>{};
+        }
+        v->signatureChecked = true;
+        if (v->owner and v->owner->checkSignature(v->getToSign(), v->signature)) {
+            v->signatureValid = true;
+            if (enableCache_)
                nodesPubKeys_[v->owner->getId()] = v->owner;
            return v;
-        } else if (logger_)
+        }
+        else if (logger_)
            logger_->w("Signature verification failed for %s", v->toString().c_str());
    }
    // Forward normal values
@@ -329,7 +352,7 @@ SecureDht::listen(const InfoHash& id, GetCallback cb, Value::Filter f, Where w)
 void
 SecureDht::putSigned(const InfoHash& hash, Sp<Value> val, DoneCallback callback, bool permanent)
 {
-    if (not key_ or not hash or not val)  {
+    if (not key_)  {
        if (callback)
            callback(false, {});
        return;
@@ -368,7 +391,7 @@ SecureDht::putSigned(const InfoHash& hash, Sp<Value> val, DoneCallback callback,
            dht_->put(hash, val, callback, time_point::max(), permanent);
        },
        Value::IdFilter(val->id),
-        Where().id(val->id)
+        std::move(Where().id(val->id))
    );
 }

@@ -37,32 +37,18 @@ public:
        storedValues_.emplace(expiration, std::pair<InfoHash, Value::Id>(id, value.id));
    }
    void erase(const InfoHash& id, const Value& value, time_point expiration) {
+        totalSize_ -= value.size();
        auto range = storedValues_.equal_range(expiration);
        for (auto rit = range.first; rit != range.second;) {
            if (rit->second.first == id && rit->second.second == value.id) {
-                totalSize_ -= value.size();
                storedValues_.erase(rit);
-                return;
+                break;
            } else
                ++rit;
        }
-        // printf("StorageBucket::erase can't find value %s %016" PRIx64 "\n", id.to_c_str(), value.id);
-    }
-    void refresh(const InfoHash& id, const Value& value, time_point old_expiration, time_point expiration) {
-        auto range = storedValues_.equal_range(old_expiration);
-        for (auto rit = range.first; rit != range.second;) {
-            if (rit->second.first == id && rit->second.second == value.id) {
-                storedValues_.erase(rit);
-                storedValues_.emplace(expiration, std::pair<InfoHash, Value::Id>(id, value.id));
-                return;
-            } else
-                ++rit;
-        }
-        // printf("StorageBucket::refresh can't find value %s %016" PRIx64 "\n", id.to_c_str(), value.id);
-        insert(id, value, expiration);
    }
    size_t size() const { return totalSize_; }
-    std::pair<InfoHash, Value::Id> getOldest() const { return storedValues_.empty() ? std::pair<InfoHash, Value::Id>{} : storedValues_.begin()->second; }
+    std::pair<InfoHash, Value::Id> getOldest() const { return storedValues_.begin()->second; }
 private:
    std::multimap<time_point, std::pair<InfoHash, Value::Id>> storedValues_;
    size_t totalSize_ {0};
@@ -88,7 +74,7 @@ struct Storage {
    size_t listener_token {1};

    /* The maximum number of values we store for a given hash. */
-    static constexpr unsigned MAX_VALUES {64 * 1024};
+    static constexpr unsigned MAX_VALUES {1024};

    /**
     * Changes caused by an operation on the storage.
@@ -100,8 +86,6 @@ struct Storage {
        ssize_t values_diff;
        /** Difference in number of listeners */
        ssize_t listeners_diff;
-        /** Number of edited values */
-        size_t edited_values;
    };

    Storage() {}
@@ -160,14 +144,11 @@ struct Storage {
     * @return time of the next expiration, time_point::max() if no expiration
     */
    std::pair<ValueStorage*, time_point>
-    refresh(const InfoHash& id, const time_point& now, const Value::Id& vid, const TypeStore& types) {
+    refresh(const time_point& now, const Value::Id& vid, const TypeStore& types) {
        for (auto& vs : values)
            if (vs.data->id == vid) {
                vs.created = now;
-                auto oldExp = vs.expiration;
-                vs.expiration = std::max(oldExp, now + types.getType(vs.data->type).expiration);
-                if (vs.store_bucket)
-                    vs.store_bucket->refresh(id, *vs.data, oldExp, vs.expiration);
+                vs.expiration = std::max(vs.expiration, now + types.getType(vs.data->type).expiration);
                return {&vs, vs.expiration};
            }
        return {nullptr, time_point::max()};
@@ -179,7 +160,7 @@ struct Storage {
        local_listeners.erase(token);
    }

-    Sp<Value> remove(const InfoHash& id, Value::Id);
+    StoreDiff remove(const InfoHash& id, Value::Id);

    std::pair<ssize_t, std::vector<Sp<Value>>> expire(const InfoHash& id, time_point now);

@@ -232,7 +213,7 @@ Storage::store(const InfoHash& id, const Sp<Value>& value, time_point created, t
                sb->insert(id, *value, expiration);
            it->data = value;
            total_size += size_diff;
-            return std::make_pair(&(*it), StoreDiff{size_diff, 0, 0, 1});
+            return std::make_pair(&(*it), StoreDiff{size_diff, 0, 0});
        }
    } else {
        //DHT_LOG.DEBUG("Storing %s -> %s", id.toString().c_str(), value->toString().c_str());
@@ -242,13 +223,13 @@ Storage::store(const InfoHash& id, const Sp<Value>& value, time_point created, t
            values.back().store_bucket = sb;
            if (sb)
                sb->insert(id, *value, expiration);
-            return std::make_pair(&values.back(), StoreDiff{size_new, 1, 0, 0});
+            return std::make_pair(&values.back(), StoreDiff{size_new, 1, 0});
        }
    }
    return std::make_pair(nullptr, StoreDiff{});
 }

-Sp<Value>
+Storage::StoreDiff
 Storage::remove(const InfoHash& id, Value::Id vid)
 {
    auto it = std::find_if (values.begin(), values.end(), [&](const ValueStorage& vr) {
@@ -262,9 +243,8 @@ Storage::remove(const InfoHash& id, Value::Id vid)
    if (it->expiration_job)
        it->expiration_job->cancel();
    total_size -= size;
-    auto value = it->data;
    values.erase(it);
-    return value;
+    return {-size, -1, 0};
 }

 Storage::StoreDiff
@@ -274,7 +254,7 @@ Storage::clear()
    ssize_t tot_size = total_size;
    values.clear();
    total_size = 0;
-    return {-tot_size, -num_values, 0, 0};
+    return {-tot_size, -num_values, 0};
 }

 std::pair<ssize_t, std::vector<Sp<Value>>>
@@ -106,7 +106,6 @@ ThreadPool::stop()
 {
    std::lock_guard<std::mutex> l(lock_);
    running_ = false;
-    tasks_ = {};
    cv_.notify_all();
 }

@@ -106,7 +106,7 @@ print_addr(const sockaddr* sa, socklen_t slen)
 {
    char hbuf[NI_MAXHOST];
    char sbuf[NI_MAXSERV];
-    std::ostringstream out;
+    std::stringstream 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 << "]";
@@ -254,62 +254,6 @@ unpackId(const Json::Value& json, const std::string& key) {
 }
 #endif

-void
-Value::sign(const crypto::PrivateKey& key)
-{
-    if (isEncrypted())
-        throw DhtException("Can't sign encrypted data.");
-    owner = key.getSharedPublicKey();
-    signature = key.sign(getToSign());
-}
-
-Value
-Value::encrypt(const crypto::PrivateKey& from, const crypto::PublicKey& to)
-{
-    if (isEncrypted())
-        throw DhtException("Data is already encrypted.");
-    setRecipient(to.getId());
-    sign(from);
-    Value nv {id};
-    nv.setCypher(to.encrypt(getToEncrypt()));
-    return nv;
-}
-
-bool
-Value::checkSignature()
-{
-    if (!signatureChecked) {
-        signatureChecked = true;
-        if (isSigned()) {
-            signatureValid = owner and owner->checkSignature(getToSign(), signature);
-        } else {
-            signatureValid = true;
-        }
-    }
-    return signatureValid;
-}
-
-Sp<Value>
-Value::decrypt(const crypto::PrivateKey& key)
-{
-    if (not decrypted) {
-        decrypted = true;
-        if (isEncrypted()) {
-            auto decryptedBlob = key.decrypt(cypher);
-            auto msg = msgpack::unpack((const char*)decryptedBlob.data(), decryptedBlob.size());
-            auto v = std::make_unique<Value>(id);
-            v->msgpack_unpack_body(msg.get());
-            if (v->recipient != key.getPublicKey().getId())
-                throw crypto::DecryptError("Recipient mismatch");
-            // Ignore values belonging to other people
-            if (not v->owner or not v->owner->checkSignature(v->getToSign(), v->signature))
-                throw crypto::DecryptError("Signature mismatch");
-            decryptedValue = std::move(v);
-        }
-    }
-    return decryptedValue;
-}
-
 bool
 FieldValue::operator==(const FieldValue& vfd) const
 {
@@ -309,13 +309,13 @@ DhtProxyTester::testShutdownStop()
    for (size_t i = 0; i < C; i++) {
        auto nodeTest = std::make_shared<dht::DhtRunner>();
        nodeTest->run(0, clientConfig);
-        nodeTest->put(key, dht::Value(mtu), [&](bool /*ok*/) {
+        nodeTest->put(key, dht::Value(mtu), [&](bool ok) {
            callback_count++;
        });
        nodeTest->get(key, [&](const std::vector<std::shared_ptr<dht::Value>>& vals){
            values.insert(values.end(), vals.begin(), vals.end());
            return true;
-        },[&](bool /*ok*/){
+        },[&](bool ok){
            callback_count++;
        });
        bool done = false;
@@ -35,11 +35,9 @@ DhtRunnerTester::setUp() {
    dht::DhtRunner::Config config;
    config.dht_config.node_config.max_peer_req_per_sec = -1;
    config.dht_config.node_config.max_req_per_sec = -1;
-    config.dht_config.node_config.max_store_size = -1;
-    config.dht_config.node_config.max_store_keys = -1;

-    node1.run(0, config);
-    node2.run(0, config);
+    node1.run(42222, config);
+    node2.run(42232, config);
    node2.bootstrap(node1.getBound());
 }

@@ -56,17 +54,15 @@ DhtRunnerTester::tearDown() {
    node1.shutdown(shutdown);
    node2.shutdown(shutdown);
    std::unique_lock<std::mutex> lk(cv_m);
-    CPPUNIT_ASSERT(cv.wait_for(lk, 30s, [&]{ return done == 2u; }));
+    CPPUNIT_ASSERT(cv.wait_for(lk, 12s, [&]{ return done == 2; }));
    node1.join();
    node2.join();
 }

 void
 DhtRunnerTester::testConstructors() {
-    CPPUNIT_ASSERT(node1.getBoundPort());
-    CPPUNIT_ASSERT_EQUAL(node1.getBoundPort(), node1.getBound().getPort());
-    CPPUNIT_ASSERT(node2.getBoundPort());
-    CPPUNIT_ASSERT_EQUAL(node2.getBoundPort(), node2.getBound().getPort());
+    CPPUNIT_ASSERT(node1.getBoundPort() == 42222);
+    CPPUNIT_ASSERT(node2.getBoundPort() == 42232);

    dht::DhtRunner::Config config {};
    dht::DhtRunner::Context context {};
@@ -94,53 +90,34 @@ void
 DhtRunnerTester::testListen() {
    std::mutex mutex;
    std::condition_variable cv;
-    std::atomic_uint valueCounta(0);
-    std::atomic_uint valueCountb(0);
-    std::atomic_uint valueCountc(0);
-    std::atomic_uint valueCountd(0);
-
+    std::atomic_uint valueCount(0);
    unsigned putCount(0);
-    unsigned putOkCount1(0);
-    unsigned putOkCount2(0);
-    unsigned putOkCount3(0);
+    unsigned putOkCount(0);

    auto a = dht::InfoHash::get("234");
    auto b = dht::InfoHash::get("2345");
    auto c = dht::InfoHash::get("23456");
    auto d = dht::InfoHash::get("234567");
-    constexpr unsigned N = 2048;
+    constexpr unsigned N = 256;
    constexpr unsigned SZ = 56 * 1024;

-    auto ftokena = node1.listen(a, [&](const std::vector<std::shared_ptr<dht::Value>>& values, bool expired) {
-        if (expired)
-            valueCounta -= values.size();
-        else
-            valueCounta += values.size();
+    auto ftokena = node1.listen(a, [&](const std::shared_ptr<dht::Value>&) {
+        valueCount++;
        return true;
    });

    auto ftokenb = node1.listen(b, [&](const std::shared_ptr<dht::Value>&) {
-        /*if (expired)
-            valueCountb -= values.size();
-        else
-            valueCountb += values.size();*/
-        valueCountb++;
+        valueCount++;
        return false;
    });

-    auto ftokenc = node1.listen(c, [&](const std::vector<std::shared_ptr<dht::Value>>& values, bool expired) {
-        if (expired)
-            valueCountc -= values.size();
-        else
-            valueCountc += values.size();
+    auto ftokenc = node1.listen(c, [&](const std::shared_ptr<dht::Value>&) {
+        valueCount++;
        return true;
    });

-    auto ftokend = node1.listen(d, [&](const std::vector<std::shared_ptr<dht::Value>>& values, bool expired) {
-        if (expired)
-            valueCountd -= values.size();
-        else
-            valueCountd += values.size();
+    auto ftokend = node1.listen(d, [&](const std::shared_ptr<dht::Value>&) {
+        valueCount++;
        return true;
    });

@@ -153,21 +130,21 @@ DhtRunnerTester::testListen() {
        node2.put(a, dht::Value("v1"), [&](bool ok) {
            std::lock_guard<std::mutex> lock(mutex);
            putCount++;
-            if (ok) putOkCount1++;
+            if (ok) putOkCount++;
            cv.notify_all();
        });
        node2.put(b, dht::Value("v2"), [&](bool ok) {
            std::lock_guard<std::mutex> lock(mutex);
            putCount++;
-            if (ok) putOkCount2++;
+            if (ok) putOkCount++;
            cv.notify_all();
        });
        auto bigVal = std::make_shared<dht::Value>();
        bigVal->data = mtu;
-        node2.put(c, std::move(bigVal), [&](bool ok) {
+        node2.put(c, bigVal, [&](bool ok) {
            std::lock_guard<std::mutex> lock(mutex);
            putCount++;
-            if (ok) putOkCount3++;
+            if (ok) putOkCount++;
            cv.notify_all();
        });
    }
@@ -175,9 +152,7 @@ DhtRunnerTester::testListen() {
    {
        std::unique_lock<std::mutex> lk(mutex);
        CPPUNIT_ASSERT(cv.wait_for(lk, 30s, [&]{ return putCount == N * 3u; }));
-        CPPUNIT_ASSERT_EQUAL(N, putOkCount1);
-        CPPUNIT_ASSERT_EQUAL(N, putOkCount2);
-        CPPUNIT_ASSERT_EQUAL(N, putOkCount3);
+        CPPUNIT_ASSERT_EQUAL(N * 3u, putOkCount);
    }

    CPPUNIT_ASSERT(ftokena.valid());
@@ -193,10 +168,7 @@ DhtRunnerTester::testListen() {
    CPPUNIT_ASSERT(tokena);
    CPPUNIT_ASSERT(tokenc);
    CPPUNIT_ASSERT(tokend);
-    CPPUNIT_ASSERT_EQUAL(N, valueCounta.load());
-    CPPUNIT_ASSERT_EQUAL(1u, valueCountb.load());
-    CPPUNIT_ASSERT_EQUAL(N, valueCountc.load());
-    CPPUNIT_ASSERT_EQUAL(0u, valueCountd.load());
+    CPPUNIT_ASSERT_EQUAL(N * 2u + 1u, valueCount.load());

    node1.cancelListen(a, tokena);
    node1.cancelListen(b, std::move(ftokenb));
@@ -209,7 +181,6 @@ DhtRunnerTester::testIdOps() {
    std::mutex mutex;
    std::condition_variable cv;
    unsigned valueCount(0);
-    unsigned valueCountEdit(0);

    dht::DhtRunner::Config config2;
    config2.dht_config.node_config.max_peer_req_per_sec = -1;
@@ -281,44 +252,10 @@ DhtRunnerTester::testIdOps() {
        return true;
    });

-    auto key2 = dht::InfoHash::get("key2");
-    auto editValue = std::make_shared<dht::Value>("v1");
-    node1.putSigned(key2, editValue, [&](bool ok){
-        CPPUNIT_ASSERT(ok);
-        std::lock_guard<std::mutex> lk(mutex);
-        valueCountEdit++;
-        cv.notify_all();
-    });
-    node2.listen(key2, [&](const std::vector<std::shared_ptr<dht::Value>>& values, bool expired){
-        for (const auto& v : values) {
-            if (v->seq == 0)
-                CPPUNIT_ASSERT_EQUAL("v1"s, dht::unpackMsg<std::string>(v->data));
-            else if (v->seq == 1)
-                CPPUNIT_ASSERT_EQUAL("v2"s, dht::unpackMsg<std::string>(v->data));
-            CPPUNIT_ASSERT_EQUAL(v->owner->getLongId(), node1.getPublicKey()->getLongId());
-        }
-        std::lock_guard<std::mutex> lk(mutex);
-        valueCountEdit += values.size();
-        cv.notify_all();
-        return true;
-    });
-
    {
        std::unique_lock<std::mutex> lk(mutex);
-        CPPUNIT_ASSERT(cv.wait_for(lk, 20s, [&]{ return valueCount == 7 && valueCountEdit == 2; }));
+        CPPUNIT_ASSERT(cv.wait_for(lk, 20s, [&]{ return valueCount == 7; }));
    }
-
-    // editValue->data = dht::packMsg("v2");
-    editValue = std::make_shared<dht::Value>(editValue->id);
-    editValue->data = dht::packMsg("v2");
-    node1.putSigned(key2, editValue, [&](bool ok){
-        CPPUNIT_ASSERT(ok);
-        std::lock_guard<std::mutex> lk(mutex);
-        valueCountEdit++;
-        cv.notify_all();
-    });
-    std::unique_lock<std::mutex> lk(mutex);
-    CPPUNIT_ASSERT(cv.wait_for(lk, 20s, [&]{ return valueCountEdit == 4; }));
 }

 void
@@ -332,7 +269,7 @@ DhtRunnerTester::testListenLotOfBytes() {
    std::string data(10000, 'a');

    auto foo = dht::InfoHash::get("foo");
-    constexpr unsigned N = 1024;
+    constexpr unsigned N = 50;

    for (unsigned i=0; i<N; i++) {
        node2.put(foo, data, [&](bool ok) {
@@ -1,4 +1,7 @@
-if (OPENDHT_STATIC)
+if (OPENDHT_SHARED)
+    set (OPENDHT_LIBS opendht)
+else ()
+    set (OPENDHT_LIBS opendht-static)
    if (MSVC)
        set (MSC_COMPAT_SOURCES ${MSC_COMPAT_DIR}/wingetopt.c)
    endif ()
@@ -6,8 +9,8 @@ endif ()

 function (configure_tool name extra_files)
    add_executable (${name} ${name}.cpp ${extra_files})
-    add_dependencies(${name} opendht)
-    target_link_libraries (${name} LINK_PUBLIC opendht ${READLINE_LIBRARIES})
+    target_link_libraries (${name} LINK_PUBLIC ${READLINE_LIBRARIES})
+    target_link_libraries (${name} LINK_PUBLIC ${OPENDHT_LIBS})
    if (MSVC)
        target_sources(${name} PRIVATE ${MSC_COMPAT_SOURCES})
        target_include_directories (${name} PRIVATE ${MSC_COMPAT_DIR})
@@ -26,7 +29,6 @@ endif ()

 if (OPENDHT_C)
    add_executable (dhtcnode dhtcnode.c)
-    add_dependencies(dhtcnode opendht-c)
    target_link_libraries (dhtcnode LINK_PUBLIC opendht-c ${READLINE_LIBRARIES})
    target_include_directories (dhtcnode SYSTEM PRIVATE ${PROJECT_SOURCE_DIR}/c)
 endif ()
@@ -1,34 +1,16 @@
-/*
- *  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/>.
- */
-
 #include <opendht_c.h>

+#include <getopt.h>
+#include <readline/readline.h>
+#include <readline/history.h>
+#include <arpa/inet.h>
+
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <stdatomic.h>

-#include <getopt.h>
-#include <readline/readline.h>
-#include <readline/history.h>
-#include <arpa/inet.h>
-
 struct op_context {
    dht_runner* runner;
    atomic_bool stop;
@@ -36,18 +18,12 @@ struct op_context {
 struct listen_context {
    dht_runner* runner;
    dht_op_token* token;
-    size_t count;
 };

 bool dht_value_callback(const dht_value* value, bool expired, void* user_data)
 {
-    struct listen_context* ctx = (struct listen_context*) user_data;
-    if (expired)
-        ctx->count--;
-    else
-        ctx->count++;
    dht_data_view data = dht_value_get_data(value);
-    printf("Listen: %s value: %.*s (total %zu).\n", expired ? "expired" : "new", (int)data.size, data.data, ctx->count);
+    printf("Value callback %s: %.*s.\n", expired ? "expired" : "new", (int)data.size, data.data);
    return true;
 }

@@ -120,26 +96,24 @@ struct dht_params {
 };

 static const struct option long_options[] = {
-    {"help",                no_argument      , NULL, 'h'},
-    {"port",                required_argument, NULL, 'p'},
-    {"net",                 required_argument, NULL, 'n'},
-    {"bootstrap",           required_argument, NULL, 'b'},
-    {"identity",            no_argument      , NULL, 'i'},
-    {"verbose",             no_argument      , NULL, 'v'},
-    {"service",             no_argument      , NULL, 's'},
-    {"peer-discovery",      no_argument      , NULL, 'D'},
-    {"no-rate-limit",       no_argument      , NULL, 'U'},
-    {"persist",             required_argument, NULL, 'f'},
-    {"logfile",             required_argument, NULL, 'l'},
-    {"syslog",              no_argument      , NULL, 'L'},
-    {"version",             no_argument      , NULL, 'V'},
-    {NULL,                  0                , NULL,  0}
+    {"help",                    no_argument      , NULL, 'h'},
+    {"port",                    required_argument, NULL, 'p'},
+    {"net",                     required_argument, NULL, 'n'},
+    {"bootstrap",               required_argument, NULL, 'b'},
+    {"identity",                no_argument      , NULL, 'i'},
+    {"verbose",                 no_argument      , NULL, 'v'},
+    {"service",                 no_argument      , NULL, 's'},
+    {"peer-discovery",          no_argument      , NULL, 'D'},
+    {"no-rate-limit",           no_argument      , NULL, 'U'},
+    {"persist",                 required_argument, NULL, 'f'},
+    {"logfile",                 required_argument, NULL, 'l'},
+    {"syslog",                  no_argument      , NULL, 'L'},
+    {NULL,                      0                , NULL,  0}
 };

 struct dht_params
 parse_args(int argc, char **argv) {
    struct dht_params params;
-    memset(&params, 0, sizeof params);
    int opt;
    while ((opt = getopt_long(argc, argv, "hisvDp:n:b:f:l:", long_options, NULL)) != -1) {
        switch (opt) {
@@ -170,9 +144,6 @@ parse_args(int argc, char **argv) {
        case 's':
            params.service = true;
            break;
-        case 'V':
-            params.version = true;
-            break;
        default:
            break;
        }
@@ -180,30 +151,15 @@ parse_args(int argc, char **argv) {
    return params;
 }

-dht_infohash parse_key(const char* key_str) {
-    dht_infohash key;
-    dht_infohash_from_hex_null(&key, key_str);
-    if (dht_infohash_is_zero(&key)) {
-        dht_infohash_get_from_string(&key, key_str);
-        printf("Using h(%s) = %s\n", key_str, dht_infohash_print(&key));
-    }
-    return key;
-}
-
 int main(int argc, char **argv)
 {
    struct dht_params params = parse_args(argc, argv);

-    if (params.version) {
-        printf("OpenDHT version %s\n", dht_version());
-        return EXIT_SUCCESS;
-    }
-
    dht_runner* runner = dht_runner_new();
    dht_runner_config dht_config;
-    dht_runner_config_default(&dht_config);
-    dht_config.peer_discovery = params.peer_discovery; // Look for other peers on the network
-    dht_config.peer_publish = params.peer_discovery; // Publish our own peer info
+	dht_runner_config_default(&dht_config);
+	dht_config.peer_discovery = params.peer_discovery; // Look for other peers on the network
+	dht_config.peer_publish = params.peer_discovery; // Publish our own peer info
    dht_config.dht_config.node_config.network = params.network;
    dht_config.log = params.log;
    dht_runner_run_config(runner, params.port, &dht_config);
@@ -216,19 +172,20 @@ int main(int argc, char **argv)
    char cmd[64];
    char arg[64];
    char value[256];
-    dht_infohash key;
    while (true) {
        const char* line_read = readline("> ");
+        if (line_read && *line_read)
+            add_history(line_read);
        if (!line_read)
            break;
-        if (!*line_read)
+        if (!strcmp(line_read, "\0"))
            continue;
-        add_history(line_read);

-        memset(cmd, 0, sizeof cmd);
-        memset(arg, 0, sizeof arg);
-        memset(value, 0, sizeof value);
+        bzero(cmd, sizeof cmd);
+        bzero(arg, sizeof arg);
+        bzero(value, sizeof value);
        sscanf(line_read, "%64s %64s %256s", cmd, arg, value);
+        //printf("%s -> %s\n", cmd, arg);

        if (!strcmp(cmd, "la")) {
            struct sockaddr** addrs = dht_runner_get_public_address(runner);
@@ -242,44 +199,36 @@ int main(int argc, char **argv)
                }
                free(addrs);
            }
+            continue;
        }
-        else if (!strcmp(cmd, "ll")) {
-            key = dht_runner_get_node_id(runner);
-            printf("DHT node %s running on port %u\n", dht_infohash_print(&key), dht_runner_get_bound_port(runner, AF_INET));
+
+        dht_infohash key;
+        dht_infohash_from_hex(&key, arg);
+        if (dht_infohash_is_zero(&key)) {
+            dht_infohash_get_from_string(&key, arg);
+            printf("Using h(%s) = %s\n", arg, dht_infohash_print(&key));
        }
-        else if (!strcmp(cmd, "g")) {
-            key = parse_key(arg);
+        if (!strcmp(cmd, "g")) {
            dht_runner_get(runner, &key, dht_get_callback, dht_get_done_callback, runner);
-        }
-        else if (!strcmp(cmd, "l")) {
-            key = parse_key(arg);
+        } else if (!strcmp(cmd, "l")) {
            struct listen_context* ctx = malloc(sizeof(struct listen_context));
            ctx->runner = runner;
-            ctx->count = 0;
            ctx->token = dht_runner_listen(runner, &key, dht_value_callback, listen_context_free, ctx);
-        }
-        else if (!strcmp(cmd, "p")) {
-            key = parse_key(arg);
+        } else if (!strcmp(cmd, "p")) {
            dht_value* val = dht_value_new_from_string(value);
            dht_runner_put(runner, &key, val, dht_put_done_callback, runner, true);
            dht_value_unref(val);
        }
-        else {
-            printf("Unkown command: %s\n", cmd);
-        }
    }
+    printf("Stopping..\n");

-    // Graceful shutdown
-    printf("Stopping…\n");
    struct op_context ctx;
    ctx.runner = runner;
    atomic_init(&ctx.stop, false);
    dht_runner_shutdown(runner, dht_shutdown_callback, &ctx);
-
-    // Wait until shutdown callback is called
    while (!atomic_load(&ctx.stop)) {
-        usleep(10000);
+        usleep(250);
    }
    dht_runner_delete(runner);
-    return EXIT_SUCCESS;
+    return 0;
 }
@@ -43,7 +43,7 @@ void print_version() {
 }

 void print_usage() {
-    std::cout << "Usage: dhtnode [-v [-l logfile]] [-i] [-d] [-n network_id] [-p local_port] [-b bootstrap_host[:port]] [--proxyserver local_port] [--proxyserverssl local_port] [--bundleid bundleid] [--openpush endpoint]" << std::endl << std::endl;
+    std::cout << "Usage: dhtnode [-v [-l logfile]] [-i] [-d] [-n network_id] [-p local_port] [-b bootstrap_host[:port]] [--proxyserver local_port] [--proxyserverssl local_port]" << std::endl << std::endl;
    print_info();
 }

@@ -146,7 +146,6 @@ void cmd_loop(std::shared_ptr<DhtRunner>& node, dht_params& params
            node->getNodeInfo([&](const std::shared_ptr<dht::NodeInfo>& nodeInfo) {
                print_node_info(*nodeInfo);
                std::cout << nodeInfo->ongoing_ops << " ongoing operations" << std::endl;
-                std::cout << "Storage has " << nodeInfo->storage_values <<  " values, using " << (nodeInfo->storage_size/1024) << " KB" << std::endl;
                std::cout << "IPv4 stats:" << std::endl;
                std::cout << nodeInfo->ipv4.toString() << std::endl;
                std::cout << "IPv6 stats:" << std::endl;
@@ -550,8 +549,6 @@ main(int argc, char **argv)
 #ifdef OPENDHT_PROXY_SERVER
            ProxyServerConfig serverConfig;
            serverConfig.pushServer = params.pushserver;
-            serverConfig.bundleId = params.bundle_id;
-            serverConfig.address = params.proxy_address;
            if (params.proxyserverssl and params.proxy_id.first and params.proxy_id.second){
                serverConfig.identity = params.proxy_id;
                serverConfig.port = params.proxyserverssl;
@@ -131,10 +131,8 @@ struct dht_params {
    in_port_t proxyserver {0};
    in_port_t proxyserverssl {0};
    std::string proxyclient {};
-    std::string proxy_address {};
    std::string pushserver {};
    std::string devicekey {};
-    std::string bundle_id {};
    std::string persist_path {};
    dht::crypto::Identity id {};
    dht::crypto::Identity proxy_id {};
@@ -225,14 +223,12 @@ static const constexpr struct option long_options[] = {
    {"syslog",                  no_argument      , nullptr, 'L'},
    {"proxyserver",             required_argument, nullptr, 'S'},
    {"proxyserverssl",          required_argument, nullptr, 'e'},
-    {"proxy-addr",              required_argument, nullptr, 'a'},
    {"proxy-certificate",       required_argument, nullptr, 'w'},
    {"proxy-privkey",           required_argument, nullptr, 'K'},
    {"proxy-privkey-password",  required_argument, nullptr, 'M'},
    {"proxyclient",             required_argument, nullptr, 'C'},
    {"pushserver",              required_argument, nullptr, 'y'},
    {"devicekey",               required_argument, nullptr, 'z'},
-    {"bundleid",                required_argument, nullptr, 'u'},
    {"version",                 no_argument      , nullptr, 'V'},
    {nullptr,                   0                , nullptr,  0}
 };
@@ -243,7 +239,7 @@ parseArgs(int argc, char **argv) {
    int opt;
    std::string privkey;
    std::string proxy_privkey;
-    while ((opt = getopt_long(argc, argv, "hidsvODUPp:n:b:f:l:", long_options, nullptr)) != -1) {
+    while ((opt = getopt_long(argc, argv, "hidsvDUPp:n:b:f:l:", long_options, nullptr)) != -1) {
        switch (opt) {
        case 'p': {
                int port_arg = atoi(optarg);
@@ -272,9 +268,6 @@ parseArgs(int argc, char **argv) {
        case 'D':
            params.peer_discovery = true;
            break;
-        case 'a':
-            params.proxy_address = optarg;
-            break;
        case 'y':
            params.pushserver = optarg;
            break;
@@ -343,9 +336,6 @@ parseArgs(int argc, char **argv) {
        case 'k':
            privkey = optarg;
            break;
-        case 'u':
-            params.bundle_id = optarg;
-            break;
        case 'K':
            proxy_privkey = optarg;
            break;
Author	SHA1	Message	Date
Adrien Béraud	fb38ba8a6f	build/dev: cleanup launch.json	2022-04-12 15:24:17 -04:00
Adrien Béraud	a1d0273514	docker: install libtool	2022-04-12 15:24:17 -04:00
Adrien Béraud	a1da0af78c	c: update dhtcnode	2022-04-12 15:24:17 -04:00
Adrien Béraud	6d95f7a181	c: support log to stdout/stderr	2022-04-12 15:23:45 -04:00
Adrien Béraud	76097b0da2	c: support building with autotools	2022-04-11 17:18:30 -04:00