ios: support multiple notification types

- VOIP notifications for iOS < 14.5 - alert and background notifications for iOS >= 14.5
2026-11-08 20:37:23 +00:00 · 2022-06-30 15:07:56 -04:00
48 changed files with 387 additions and 887 deletions
@@ -59,9 +59,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/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 +77,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,223 +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
-
-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-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
@@ -22,7 +22,6 @@
                "${workspaceRoot}",
                "-DCMAKE_EXPORT_COMPILE_COMMANDS=On",
                "-DCMAKE_BUILD_TYPE=Debug",
-                "-DOPENDHT_SANITIZE=On",
                "-DOPENDHT_PROXY_CLIENT=On",
                "-DOPENDHT_PROXY_SERVER=On",
                "-DOPENDHT_TESTS=On",
@@ -14,7 +14,7 @@ include(FindPkgConfig)
 include(cmake/CheckAtomic.cmake)

 set (opendht_VERSION_MAJOR 2)
-set (opendht_VERSION_MINOR 4.12)
+set (opendht_VERSION_MINOR 4.7)
 set (opendht_VERSION ${opendht_VERSION_MAJOR}.${opendht_VERSION_MINOR})
 set (PACKAGE_VERSION ${opendht_VERSION})
 set (VERSION "${opendht_VERSION}")
@@ -43,10 +43,6 @@ 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 +53,19 @@ 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)
+    check_include_file_cxx(msgpack.hpp HAVE_MSGPACKCXX)
+    if (NOT HAVE_MSGPACKCXX)
+        find_package (msgpack REQUIRED)
+    endif()
    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 +82,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 +125,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 ()
@@ -155,12 +156,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/
@@ -207,6 +223,13 @@ list (APPEND opendht_SOURCES
    src/thread_pool.cpp
 )

+if (APPLE)
+    list (APPEND opendht_SOURCES
+        src/compat/apple/apple_utils.h
+        src/compat/apple/apple_utils.mm
+    )
+endif()
+
 list (APPEND opendht_HEADERS
    include/opendht/def.h
    include/opendht/utils.h
@@ -302,18 +325,10 @@ if (OPENDHT_STATIC)
        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 PkgConfig::argon2
-            PUBLIC ${CMAKE_THREAD_LIBS_INIT} PkgConfig::GnuTLS PkgConfig::Nettle msgpackc-cxx
-                ${FMT_LIBRARY} ${HTTP_PARSER_LIBRARY})
-        if (Jsoncpp_FOUND)
-            target_link_libraries(opendht-static PUBLIC PkgConfig::Jsoncpp)
-        endif()
-        if (OPENDHT_PROXY_OPENSSL)
-            target_link_libraries(opendht-static PUBLIC PkgConfig::OPENSSL)
-        endif()
-        if (APPLE)
-            target_link_libraries(opendht-static PRIVATE SYSTEM "-framework CoreFoundation" "-framework Security")
-        endif()
+            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)
@@ -373,18 +388,20 @@ if (OPENDHT_SHARED)
    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_link_libraries(opendht
-        PUBLIC ${CMAKE_THREAD_LIBS_INIT} msgpackc-cxx
-        PRIVATE PkgConfig::GnuTLS PkgConfig::Nettle
-                ${FMT_LIBRARY} ${HTTP_PARSER_LIBRARY} PkgConfig::argon2)
-    if (Jsoncpp_FOUND)
-        target_link_libraries(opendht PUBLIC PkgConfig::Jsoncpp)
-    endif()
-    if (OPENDHT_PROXY_OPENSSL)
-        target_link_libraries(opendht PUBLIC PkgConfig::OPENSSL)
-    endif()    
+    target_include_directories(opendht SYSTEM PRIVATE ${argon2_INCLUDE_DIRS})
    if (APPLE)
-        target_link_libraries(opendht PRIVATE SYSTEM "-framework CoreFoundation" "-framework Security")
+        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)
@@ -398,7 +415,6 @@ if (OPENDHT_C)
        )
        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)
    endif ()

@@ -407,7 +423,6 @@ if (OPENDHT_C)
            c/opendht.cpp
            c/opendht_c.h
        )
-        set_target_properties (opendht-c-static PROPERTIES OUTPUT_NAME "opendht-c")
        target_link_libraries(opendht-c-static PRIVATE opendht-static)
        install (TARGETS opendht-c-static DESTINATION ${CMAKE_INSTALL_LIBDIR} EXPORT opendht-c-static)
    endif ()
@@ -451,7 +466,7 @@ install (FILES ${CMAKE_CURRENT_BINARY_DIR}/opendhtConfigVersion.cmake DESTINATIO

 # Unit tests
 if (OPENDHT_TESTS)
-    pkg_search_module(Cppunit REQUIRED IMPORTED_TARGET cppunit)
+    pkg_search_module(Cppunit REQUIRED cppunit)
    # unit testing
    list (APPEND test_FILES
        tests/infohashtester.h
@@ -494,11 +509,12 @@ if (OPENDHT_TESTS)
    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 PkgConfig::OPENSSL)
+        target_link_libraries(opendht_unit_tests ${OPENSSL_LIBRARIES})
    endif()
    enable_testing()
    add_test(TEST opendht_unit_tests)
@@ -343,7 +343,6 @@ int dht_runner_run_config(dht_runner* r, in_port_t port, const dht_runner_config
        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;

@@ -147,7 +147,6 @@ struct OPENDHT_PUBLIC dht_runner_config {
    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], 7)
 m4_define([opendht_version],
 		  [opendht_major_version.opendht_minor_version.opendht_patch_version])

@@ -18,8 +18,8 @@ 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 -fvisibility=hidden"])

 CPPFLAGS+=" -DOPENDHT_BUILD"
 AM_CONDITIONAL([OPENDHT_SHARED], [test "x$enable_shared" != xno])
@@ -32,6 +32,7 @@ LT_INIT()
 LT_LANG(C++)
 AC_LANG(C++)
 AC_PROG_CXX
+AC_PROG_OBJCXX
 AX_CXX_COMPILE_STDCXX(17,[noext],[mandatory])

 dnl Check for logs
@@ -91,6 +92,7 @@ case "${host_os}" in
    SYS=linux
    ;;
  darwin*)
+    APPLE=1
    SYS=darwin
    ;;
  mingw32*)
@@ -110,6 +112,7 @@ case "${host_os}" in
    ;;
 esac

+AM_CONDITIONAL(APPLE, [test "x$SYS" = "xdarwin"])
 AM_CONDITIONAL(WIN32, [test "x$SYS" = "xmingw32"])
 AS_IF([test "x$SYS" = "xandroid"],
      [], [LDFLAGS="${LDFLAGS} -lpthread"])
@@ -188,6 +191,7 @@ AM_COND_IF([PROXY_CLIENT_OR_SERVER], [
 ])

 CXXFLAGS="${CXXFLAGS} -DMSGPACK_NO_BOOST -DMSGPACK_DISABLE_LEGACY_NIL -DMSGPACK_DISABLE_LEGACY_CONVERT"
+OBJCXX="$CXX $CXXFLAGS"

 AC_ARG_ENABLE([tools], AS_HELP_STRING([--disable-tools],[Disable tools (CLI DHT node)]),,build_tools=yes)
 AM_CONDITIONAL(ENABLE_TOOLS, test x$build_tools == 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,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
@@ -34,7 +34,6 @@ extern "C" {
 #include <memory>
 #include <atomic>
 #include <mutex>
-#include <string_view>

 #ifdef _WIN32
 #include <iso646.h>
@@ -87,13 +86,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);
@@ -120,9 +118,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);
@@ -171,9 +167,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 +182,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()); }

    /**
@@ -301,7 +294,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 +327,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 +346,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 +388,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),
@@ -266,7 +266,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
@@ -75,14 +75,6 @@ public:
 #endif
    }

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

    /**
@@ -352,8 +344,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 +358,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_;
@@ -424,20 +413,6 @@ private:
     */
    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
@@ -41,7 +41,7 @@ enum class PushType {
    None = 0,
    Android,
    iOS,
-    UnifiedPush
+    iOSLegacy
 };
 }
 MSGPACK_ADD_ENUM(dht::PushType)
@@ -62,13 +62,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 {};
 };

 /**
@@ -277,10 +275,6 @@ private:

 #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: .*}"
@@ -396,7 +390,7 @@ private:
        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 +404,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 +419,6 @@ private:
    mutable std::atomic<time_point> lastStatsReset_ {time_point::min()};

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

 #ifdef OPENDHT_PUSH_NOTIFICATIONS
    struct Listener {
@@ -444,7 +434,7 @@ private:
        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 +442,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 +451,7 @@ private:
        MSGPACK_DEFINE_ARRAY(listeners)
    };
    std::map<std::string, PushListener> pushListeners_;
+    proxy::ListenToken tokenPushNotif_ {0};
 #endif //OPENDHT_PUSH_NOTIFICATIONS
 };

@@ -62,7 +62,6 @@ public:
        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;
@@ -454,11 +453,6 @@ public:
     */
    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
     */
@@ -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
@@ -249,8 +249,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;
@@ -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,16 +202,16 @@ 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); };
        }
@@ -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;
        };
@@ -427,7 +427,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,12 +436,9 @@ 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) {
        recipient = r;
@@ -807,11 +804,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 +818,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 +832,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 +846,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 +860,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 +873,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_) {
@@ -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"
@@ -8,4 +8,4 @@ edition = "2018"

 [dependencies]
 libc="0.2.0"
-os_socketaddr="0.2.3"
+os_socketaddr="0.1.0"
@@ -48,7 +48,6 @@ impl DhtRunnerConfig {
            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(),
@@ -79,10 +78,6 @@ impl DhtRunnerConfig {
        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);
@@ -119,7 +119,6 @@ pub struct DhtRunnerConfig
    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,
@@ -30,6 +30,12 @@ libopendht_la_SOURCES  = \
        network_utils.cpp \
        thread_pool.cpp

+if APPLE
+libopendht_la_SOURCES += \
+        compat/apple/apple_utils.h \
+        compat/apple/apple_utils.mm
+endif
+
 if WIN32
 libopendht_la_SOURCES += rng.cpp
 endif
@@ -0,0 +1,26 @@
+/*
+ *  Copyright (C) 2014-2022 Savoir-faire Linux Inc.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  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 <string>
+
+namespace dht {
+namespace apple_utils {
+
+std::string getPlatformVersion();
+
+}
+}
@@ -0,0 +1,44 @@
+/*
+ *  Copyright (C) 2014-2022 Savoir-faire Linux Inc.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  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 "apple_utils.h"
+
+#ifdef __APPLE__
+#include <Foundation/Foundation.h>
+#include "TargetConditionals.h"
+#endif
+
+namespace dht {
+namespace apple_utils {
+
+std::string
+getPlatformVersion() {
+#ifdef __APPLE__
+    #if TARGET_OS_IPHONE
+    if (@available(iOS 14.5, *)) {
+        return  "ios";
+    }
+    return "apple";
+    #elif TARGET_OS_MAC
+    return "macos";
+    #endif
+#endif
+    return "";
+}
+
+}
+} /* dht */
@@ -1289,11 +1289,10 @@ Dht::storageStore(const InfoHash& id, const Sp<Value>& value, time_point created
        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);
+            storageChanged(id, st->second, value, value_diff > 0);
        } else {
-            storageChanged(id, st->second, vs->data, store.second.values_diff > 0 || store.second.edited_values > 0);
+            storageChanged(id, st->second, vs->data, store.second.values_diff > 0);
        }
    }

@@ -22,6 +22,9 @@
 #include "dhtrunner.h"
 #include "op_cache.h"
 #include "utils.h"
+#ifdef __APPLE__
+#include "compat/apple/apple_utils.h"
+#endif

 #include <http_parser.h>
 #include <deque>
@@ -117,9 +120,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 +191,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 +315,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 +464,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 +485,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 +630,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 +661,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 +692,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 +704,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 +742,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 +780,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 +842,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 +928,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 +1303,13 @@ DhtProxyClient::getPushRequest(Json::Value& body) const
    body["key"] = deviceKey_;
    body["client_id"] = pushClientId_;
    body["session_id"] = pushSessionId_;
+#ifdef __ANDROID__
+    body["platform"] = "android";
+#endif
+#ifdef __APPLE__
    body["topic"] = notificationTopic_;
-    body["platform"] = platform_;
+    body["platform"] = apple_utils::getPlatformVersion();
+#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_,
@@ -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;
@@ -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));
@@ -760,55 +747,17 @@ DhtProxyServer::listen(restinio::request_handle_t request,

 PushType
 DhtProxyServer::getTypeFromString(const std::string& type) {
-    if (type == "android")
+    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;
+    if (type == "apple") {
+        // proxy_client is not updated or using ios < 14.5
+        return PushType::iOSLegacy;
+    }
+    if (type == "ios") {
+        return PushType::iOS;
+    }
+    return PushType::None;
 }

 RequestStatus
@@ -839,9 +788,6 @@ DhtProxyServer::subscribe(restinio::request_handle_t request,
        }
        auto type = getTypeFromString(root["platform"].asString());
        auto topic = root["topic"].asString();
-        if (topic.empty()) {
-            topic = getDefaultTopic(type);
-        }
        auto clientId = root["client_id"].asString();
        auto sessionId = root["session_id"].asString();

@@ -933,8 +879,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;
                        }
@@ -1008,7 +954,7 @@ 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());
+        logger_->d("[proxy:server] [subscribe] sending put refresh to %s token", pushToken.c_str());
    sendPushNotification(pushToken, jsonProvider(), type, false, topic);
 }

@@ -1058,43 +1004,33 @@ DhtProxyServer::sendPushNotification(const std::string& token, Json::Value&& jso

    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;
+        // 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 (type == PushType::iOS) {
                if (highPriority) {
                    Json::Value alert(Json::objectValue);
                    alert["title"]="hello";
@@ -1105,16 +1041,17 @@ DhtProxyServer::sendPushNotification(const std::string& token, Json::Value&& jso
                    notification["push_type"] = "background";
                    notification["content_available"] = true;
                }
+            } else if (type == PushType::iOSLegacy) {
+                notification["push_type"] = "voip";
            }
-
-            Json::Value notifications(Json::arrayValue);
-            notifications[0] = notification;
-
-            Json::Value content;
-            content["notifications"] = std::move(notifications);
-            request->set_body(Json::writeString(jsonBuilder_, content));
        }

+        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 +1069,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);
@@ -1230,7 +1167,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 +1179,35 @@ 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.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, pput.topic));
                    }
 #endif
                } else {
@@ -1265,34 +1220,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());
@@ -219,50 +219,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
@@ -1115,8 +1111,6 @@ DhtRunner::enableProxy(bool proxify)
            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_);
        // and use it
        use_proxy = proxify;
@@ -1164,18 +1158,6 @@ DhtRunner::setPushNotificationTopic(const std::string& 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)
 {
@@ -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]
@@ -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++;
        }
@@ -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);
@@ -79,16 +79,13 @@ SecureDht::secureType(ValueType&& type)
    type.editPolicy = [this,type](InfoHash id, const Sp<Value>& o, Sp<Value>& n, const InfoHash& nid, const SockAddr& a) {
        if (not o->isSigned())
            return type.editPolicy(id, o, n, nid, a);
-        if (*o->owner != *n->owner or not n->isSigned()) {
-            if (logger_)
-                logger_->w("Edition forbidden: not signed or wrong owner.");
-            return false;
-        }
-        if (not n->checkSignature()) {
+        if (o->owner != n->owner or not n->isSigned()) {
            if (logger_)
                logger_->w("Edition forbidden: signature verification failed.");
            return false;
        }
+        if (not n->checkSignature())
+            return false;
        if (o->seq == n->seq) {
            // If the data is exactly the same,
            // it can be reannounced, possibly by someone else.
@@ -329,7 +326,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 +365,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))
    );
 }

@@ -100,8 +100,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() {}
@@ -232,7 +230,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,7 +240,7 @@ 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{});
@@ -274,7 +272,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();
 }

@@ -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;
@@ -94,6 +94,7 @@ void
 DhtRunnerTester::testListen() {
    std::mutex mutex;
    std::condition_variable cv;
+    std::atomic_uint valueCount(0);
    std::atomic_uint valueCounta(0);
    std::atomic_uint valueCountb(0);
    std::atomic_uint valueCountc(0);
@@ -209,7 +210,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 +281,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 +298,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) {
@@ -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();
 }

@@ -550,8 +550,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;