Revert "search: use pointer to SearchNode"

This reverts commit 3a41f2ce56.
search: improve canGet performance
2026-11-08 20:37:23 +00:00 · 2018-06-20 14:40:41 -04:00 · 2018-06-20 14:01:48 -04:00 · 2018-06-20 14:01:48 -04:00 · 2018-06-20 14:01:48 -04:00
96 changed files with 1602 additions and 2938 deletions
@@ -1 +0,0 @@
-Checks: '-*,clang-diagnostic-*,performance-*,bugprone-*,llvm-*,clang-analyzer-*,misc-*,-llvm-namespace-comment,-misc-unused-parameters,-misc-non-private-member-variables-in-classes,-llvm-header-guard,-llvm-include-order,-bugprone-suspicious-string-compare'
@@ -1,4 +1,3 @@
-dist: xenial
 sudo: required

 services:
@@ -1,7 +1,7 @@
 cmake_minimum_required (VERSION 3.1)
 project (opendht)
 set (opendht_VERSION_MAJOR 1)
-set (opendht_VERSION_MINOR 8.2)
+set (opendht_VERSION_MINOR 7.2)
 set (opendht_VERSION ${opendht_VERSION_MAJOR}.${opendht_VERSION_MINOR})
 set (PACKAGE_VERSION ${opendht_VERSION})
 set (VERSION "${opendht_VERSION}")
@@ -59,7 +59,7 @@ endif()

 if (OPENDHT_PROXY_SERVER OR OPENDHT_PROXY_CLIENT)
    find_package(Restbed REQUIRED)
-    if (NOT Jsoncpp_FOUND)
+    if (!Jsoncpp_FOUND)
        message(SEND_ERROR "Jsoncpp is required for DHT proxy support")
    endif()
 endif()
@@ -99,8 +99,8 @@ endif ()
 if (Nettle_INCLUDE_DIRS)
    include_directories (SYSTEM "${Nettle_INCLUDE_DIRS}")
 endif ()
-if (Restbed_INCLUDE_DIR)
-    include_directories (SYSTEM "${Restbed_INCLUDE_DIR}")
+if (RESTBED_INCLUDE)
+    include_directories (SYSTEM "${RESTBED_INCLUDE}")
 endif ()
 if (Jsoncpp_INCLUDE_DIRS)
    include_directories (SYSTEM "${Jsoncpp_INCLUDE_DIRS}")
@@ -182,34 +182,40 @@ if (OPENDHT_INDEX)
 endif()

 if (OPENDHT_PROXY_SERVER)
-  add_definitions(-DOPENDHT_PROXY_SERVER)
+  add_definitions(-DOPENDHT_PROXY_SERVER=true)
  if (OPENDHT_PROXY_SERVER_IDENTITY)
-    add_definitions(-DOPENDHT_PROXY_SERVER_IDENTITY)
+    add_definitions(-DOPENDHT_PROXY_SERVER_IDENTITY=true)
+  else ()
+    add_definitions(-DOPENDHT_PROXY_SERVER_IDENTITY=false)
  endif()
  list (APPEND opendht_HEADERS
    include/opendht/dht_proxy_server.h
  )
  list (APPEND opendht_SOURCES
-    src/thread_pool.h
-    src/thread_pool.cpp
    src/dht_proxy_server.cpp
  )
+else ()
+    add_definitions(-DENABLE_PROXY_SERVER=false)
 endif ()

 if (OPENDHT_PROXY_CLIENT)
-  add_definitions(-DOPENDHT_PROXY_CLIENT)
+  add_definitions(-DOPENDHT_PROXY_CLIENT=true)
  list (APPEND opendht_HEADERS
    include/opendht/dht_proxy_client.h
  )
  list (APPEND opendht_SOURCES
    src/dht_proxy_client.cpp
  )
+else ()
+  add_definitions(-DOPENDHT_PROXY_CLIENT=false)
 endif ()

 if (OPENDHT_PROXY_SERVER OR OPENDHT_PROXY_CLIENT)
  if (OPENDHT_PUSH_NOTIFICATIONS)
    message("Using push notification")
-    add_definitions(-DOPENDHT_PUSH_NOTIFICATIONS)
+    add_definitions(-DOPENDHT_PUSH_NOTIFICATIONS=true)
+  else ()
+    add_definitions(-DOPENDHT_PUSH_NOTIFICATIONS=false)
  endif ()
  list (APPEND opendht_HEADERS
    include/opendht/proxy.h
@@ -240,14 +246,16 @@ if (OPENDHT_STATIC)
        ${opendht_HEADERS}
    )
    set_target_properties (opendht-static PROPERTIES OUTPUT_NAME "opendht")
+    if (OPENDHT_LTO)
+        target_link_libraries(opendht-static -flto -fuse-linker-plugin)
+    endif ()
    if (OPENDHT_ARGON2)
        target_include_directories(opendht-static SYSTEM PRIVATE argon2)
    else ()
+        target_link_libraries(opendht-static ${argon2_LIBRARIES})
        target_include_directories(opendht-static SYSTEM PRIVATE ${argon2_INCLUDE_DIRS})
    endif ()
-    target_link_libraries(opendht-static
-        PRIVATE ${Restbed_LIBRARY} ${argon2_LIBRARIES}
-        PUBLIC ${CMAKE_THREAD_LIBS_INIT} ${GNUTLS_LIBRARIES} ${Nettle_LIBRARIES} ${Jsoncpp_LIBRARIES})
+    target_link_libraries(opendht-static ${CMAKE_THREAD_LIBS_INIT} ${GNUTLS_LIBRARIES} ${Nettle_LIBRARIES} ${Restbed_LIBRARIES} ${Jsoncpp_LIBRARIES})
    install (TARGETS opendht-static DESTINATION ${CMAKE_INSTALL_LIBDIR} EXPORT opendht)
 endif ()

@@ -259,13 +267,16 @@ 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)
+    if (OPENDHT_LTO)
+        target_link_libraries(opendht PRIVATE -flto -fuse-linker-plugin)
+    endif ()
    if (OPENDHT_ARGON2)
        target_include_directories(opendht SYSTEM PRIVATE argon2)
    else ()
        target_link_libraries(opendht PRIVATE ${argon2_LIBRARIES})
        target_include_directories(opendht SYSTEM PRIVATE ${argon2_INCLUDE_DIRS})
    endif ()
-    target_link_libraries(opendht PRIVATE ${CMAKE_THREAD_LIBS_INIT} ${GNUTLS_LIBRARIES} ${Nettle_LIBRARIES} ${Restbed_LIBRARY} ${Jsoncpp_LIBRARIES})
+    target_link_libraries(opendht PRIVATE ${CMAKE_THREAD_LIBS_INIT} ${GNUTLS_LIBRARIES} ${Nettle_LIBRARIES} ${Restbed_LIBRARIES} ${Jsoncpp_LIBRARIES})
    install (TARGETS opendht DESTINATION ${CMAKE_INSTALL_LIBDIR} EXPORT opendht)
 endif ()

@@ -298,14 +309,12 @@ install (EXPORT opendht DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/opendht FILE o
 install (FILES ${CMAKE_CURRENT_BINARY_DIR}/opendhtConfigVersion.cmake DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/opendht)

 # Unit tests
-if (OPENDHT_TESTS)
+IF(OPENDHT_TESTS)
  FIND_PACKAGE(Cppunit REQUIRED)
  # unit testing
    list (APPEND test_FILES
      tests/infohashtester.h
      tests/infohashtester.cpp
-      tests/valuetester.h
-      tests/valuetester.cpp
      tests/cryptotester.h
      tests/cryptotester.cpp
      tests/dhtrunnertester.h
@@ -321,17 +330,16 @@ if (OPENDHT_TESTS)
      tests/tests_runner.cpp
      ${test_FILES}
    )
-    target_include_directories(opendht_unit_tests SYSTEM PRIVATE ${CPPUNIT_INCLUDE_DIRS})
    if (OPENDHT_SHARED)
-      target_link_libraries(opendht_unit_tests opendht)
+      TARGET_LINK_LIBRARIES(opendht_unit_tests opendht)
    else ()
-      target_link_libraries(opendht_unit_tests opendht-static)
+      TARGET_LINK_LIBRARIES(opendht_unit_tests opendht-static)
    endif ()
-    target_link_libraries(opendht_unit_tests
+    TARGET_LINK_LIBRARIES(opendht_unit_tests
       ${CMAKE_THREAD_LIBS_INIT}
       ${CPPUNIT_LIBRARIES}
       ${GNUTLS_LIBRARIES}
    )
    enable_testing()
    add_test(TEST opendht_unit_tests)
-endif()
+ENDIF()
@@ -146,7 +146,7 @@
      <Optimization>Disabled</Optimization>
      <SDLCheck>true</SDLCheck>
      <AdditionalIncludeDirectories>..\..\include;..\include;..\include\opendht;..\..\msgpack-c\include;</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32_NATIVE;WIN32_LEAN_AND_MEAN;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <DisableSpecificWarnings>4804;4800;4101;4267;4244;4503;</DisableSpecificWarnings>
      <AdditionalOptions>-D_SCL_SECURE_NO_WARNINGS %(AdditionalOptions)</AdditionalOptions>
      <SuppressStartupBanner>false</SuppressStartupBanner>
@@ -169,7 +169,7 @@ copy ..\include\opendht.h $(OutDir)\include\</Command>
      <Optimization>Disabled</Optimization>
      <SDLCheck>true</SDLCheck>
      <AdditionalIncludeDirectories>..\..\include;..\include;..\include\opendht;..\..\msgpack-c\include;</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32_NATIVE;WIN32_LEAN_AND_MEAN;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <DisableSpecificWarnings>4804;4800;4101;4267;4244;4503;</DisableSpecificWarnings>
      <AdditionalOptions>-D_SCL_SECURE_NO_WARNINGS %(AdditionalOptions)</AdditionalOptions>
    </ClCompile>
@@ -193,7 +193,7 @@ copy ..\include\opendht.h $(OutDir)\include\</Command>
      <IntrinsicFunctions>true</IntrinsicFunctions>
      <SDLCheck>true</SDLCheck>
      <AdditionalIncludeDirectories>..\..\include;..\include;..\include\opendht;..\..\msgpack-c\include;</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32_NATIVE;WIN32_LEAN_AND_MEAN;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <DisableSpecificWarnings>4804;4800;4101;4267;4244;4503;</DisableSpecificWarnings>
      <AdditionalOptions>-D_SCL_SECURE_NO_WARNINGS %(AdditionalOptions)</AdditionalOptions>
      <ProgramDataBaseFileName>$(OutDir)\lib\x86\$(TargetName).pdb</ProgramDataBaseFileName>
@@ -223,7 +223,7 @@ copy ..\include\opendht.h $(OutDir)\include\</Command>
      <IntrinsicFunctions>true</IntrinsicFunctions>
      <SDLCheck>true</SDLCheck>
      <AdditionalIncludeDirectories>$(ProjectDir)contrib\build\include;$(ProjectDir)..\include;$(ProjectDir)..\include\opendht;$(ProjectDir)contrib\build\msgpack-c\include;$(ProjectDir)contrib\build\argon2\include;$(ProjectDir)..\..\include;$(ProjectDir)..\..\argon2\include</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32_NATIVE;WIN32_LEAN_AND_MEAN;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <DisableSpecificWarnings>4804;4800;4101;4267;4244;4503;4273;</DisableSpecificWarnings>
      <AdditionalOptions>-D_SCL_SECURE_NO_WARNINGS %(AdditionalOptions)</AdditionalOptions>
      <ProgramDataBaseFileName>$(OutDir)\lib\x64\$(TargetName).pdb</ProgramDataBaseFileName>
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2016-2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2016 Savoir-faire Linux Inc.
 *
 *  Author: Andreas Traczyk <andreas.traczyk@savoirfairelinux.com>
 *
@@ -16,9 +16,7 @@ if ENABLE_TESTS
 SUBDIRS += tests
 endif

-if HAVE_DOXYGEN
 SUBDIRS += doc
-endif

 ACLOCAL_AMFLAGS = -I m4

@@ -106,7 +106,7 @@ for r in results:
 IRC: join us on Freenode at [`#opendht`](https://webchat.freenode.net/?channels=%23opendht).

 ## License
-Copyright (C) 2014-2019 Savoir-faire Linux Inc.
+Copyright (C) 2014-2018 Savoir-faire Linux Inc.

 OpenDHT is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version.

@@ -1,16 +1,17 @@
-if(NOT Restbed_FOUND)
-    find_path (Restbed_INCLUDE_DIR restbed
-               HINTS
-               "/usr/include"
-               "/usr/local/include"
-               "/opt/local/include")
-    find_library(Restbed_LIBRARY restbed
-                 HINTS ${Restbed_ROOT_DIR} PATH_SUFFIXES lib)
-    include(FindPackageHandleStandardArgs)
-    find_package_handle_standard_args(Restbed DEFAULT_MSG Restbed_LIBRARY Restbed_INCLUDE_DIR)
-    if (Restbed_INCLUDE_DIR)
-        set(Restbed_FOUND TRUE)
-        set(Restbed_LIBRARIES ${Restbed_LIBRARY})
-        set(Restbed_INCLUDE_DIRS ${Restbed_INCLUDE_DIR})
-    endif()
+find_path (RESTBED_INCLUDE restbed
+           HINTS
+           "/usr/include"
+           "/usr/local/include"
+           "/opt/local/include"
+)
+
+if (RESTBED_INCLUDE)
+    message(STATUS "${green}Found Restbed: ${RESTBED_INCLUDE}")
+else()
+    message(FATAL_ERROR "${red}Failed to locate Restbed.}")
+endif()
+
+if (RESTBED_INCLUDE)
+    set(RESTBED_FOUND TRUE)
+    set(Restbed_LIBRARIES restbed)
 endif()
@@ -1,6 +1,6 @@
 dnl define macros
 m4_define([opendht_major_version], 1)
-m4_define([opendht_minor_version], 8)
+m4_define([opendht_minor_version], 7)
 m4_define([opendht_patch_version], 2)
 m4_define([opendht_version],
 		  [opendht_major_version.opendht_minor_version.opendht_patch_version])
@@ -130,7 +130,7 @@ PKG_CHECK_MODULES([GnuTLS], [gnutls >= 3.3])
 PKG_CHECK_MODULES([MsgPack], [msgpack >= 1.2])

 AC_ARG_WITH([jsoncpp], AS_HELP_STRING([--without-jsoncpp], [Build without JsonCpp support]))
-AS_IF([test "x$with_jsoncpp" != "xno"],
+AS_IF([test "x$with_jsoncpp" != "xno"], 
      [PKG_CHECK_MODULES([JsonCpp], [jsoncpp >= 1.7.2], [have_jsoncpp=yes], [have_jsoncpp=no])],
      [have_jsoncpp=no])
 AS_IF([test "x$have_jsoncpp" = "xyes"], [
@@ -177,14 +177,23 @@ AM_COND_IF([ENABLE_TOOLS], [
  ])
 ])

-AM_COND_IF(ENABLE_PROXY_SERVER, [CPPFLAGS+=" -DOPENDHT_PROXY_SERVER"], [])
-AM_COND_IF(ENABLE_PROXY_CLIENT, [CPPFLAGS+=" -DOPENDHT_PROXY_CLIENT"], [])
-AM_COND_IF(ENABLE_PUSH_NOTIFICATIONS, [CPPFLAGS+=" -DOPENDHT_PUSH_NOTIFICATIONS"], [])
-AM_COND_IF(ENABLE_PROXY_SERVER_IDENTITY, [CPPFLAGS+=" -DOPENDHT_PROXY_SERVER_IDENTITY"], [])
+AM_COND_IF(ENABLE_PROXY_SERVER,
+    [CPPFLAGS+=" -DOPENDHT_PROXY_SERVER=true"],
+    [CPPFLAGS+=" -DOPENDHT_PROXY_SERVER=false"])

-AM_COND_IF([HAVE_DOXYGEN], [
-  AC_CONFIG_FILES([doc/Doxyfile doc/Makefile])
-])
+AM_COND_IF(ENABLE_PROXY_CLIENT,
+    [CPPFLAGS+=" -DOPENDHT_PROXY_CLIENT=true"],
+    [CPPFLAGS+=" -DOPENDHT_PROXY_CLIENT=false"])
+
+AM_COND_IF(ENABLE_PUSH_NOTIFICATIONS,
+    [CPPFLAGS+=" -DOPENDHT_PUSH_NOTIFICATIONS=true"],
+    [CPPFLAGS+=" -DOPENDHT_PUSH_NOTIFICATIONS=false"])
+
+AM_COND_IF(ENABLE_PROXY_SERVER_IDENTITY,
+    [CPPFLAGS+=" -DOPENDHT_PROXY_SERVER_IDENTITY=true"],
+    [CPPFLAGS+=" -DOPENDHT_PROXY_SERVER_IDENTITY=false"])
+
+AC_CONFIG_FILES([doc/Doxyfile doc/Makefile])

 dnl Configure setup.py if we build the python module
 AM_COND_IF([USE_CYTHON], [
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 Savoir-faire Linux Inc.
 *  Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 *
 *  This program is free software; you can redistribute it and/or modify
@@ -19,7 +19,7 @@
 #pragma once

 #include "opendht/dhtrunner.h"
-#ifdef OPENDHT_PROXY_SERVER
+#if OPENDHT_PROXY_SERVER
 #include "opendht/dht_proxy_server.h"
 #endif
 #include "opendht/log.h"
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 Savoir-faire Linux Inc.
 *  Authors: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 *           Simon Désaulniers <simon.desaulniers@savoirfairelinux.com>
 *           Sébastien Blin <sebastien.blin@savoirfairelinux.com>
@@ -51,7 +51,6 @@ struct OPENDHT_PUBLIC NodeStats {
             incoming_nodes {0};
    unsigned table_depth {0};
    unsigned getKnownNodes() const { return good_nodes + dubious_nodes; }
-    unsigned long getNetworkSizeEstimation() const { return 8 * std::exp2(table_depth); }
    std::string toString() const;

 #ifdef OPENDHT_JSONCPP
@@ -84,6 +83,16 @@ struct OPENDHT_PUBLIC NodeInfo {
    MSGPACK_DEFINE_MAP(id, node_id, ipv4, ipv6)
 };

+struct OPENDHT_PUBLIC MessageStats {
+    unsigned packets {0};
+    unsigned ping    {0};
+    unsigned find    {0};
+    unsigned get     {0};
+    unsigned put     {0};
+    unsigned listen  {0};
+    unsigned refresh {0};
+};
+
 /**
 * Dht configuration.
 */
@@ -103,9 +112,6 @@ struct OPENDHT_PUBLIC Config {

    /** Makes the DHT responsible to maintain its stored values. Consumes more ressources. */
    bool maintain_storage;
-
-    /** If set, the dht will load its state from this file on start and save its state in this file on shutdown */
-    std::string persist_path;
 };

 /**
@@ -131,8 +137,8 @@ using CertificateStoreQuery = std::function<std::vector<std::shared_ptr<crypto::

 typedef bool (*GetCallbackRaw)(std::shared_ptr<Value>, void *user_data);

-OPENDHT_PUBLIC GetCallbackSimple bindGetCb(const GetCallbackRaw& raw_cb, void* user_data);
-OPENDHT_PUBLIC GetCallback bindGetCb(const GetCallbackSimple& cb);
+OPENDHT_PUBLIC GetCallbackSimple bindGetCb(GetCallbackRaw raw_cb, void* user_data);
+OPENDHT_PUBLIC GetCallback bindGetCb(GetCallbackSimple cb);

 using DoneCallback = std::function<void(bool success, const std::vector<std::shared_ptr<Node>>& nodes)>;
 typedef void (*DoneCallbackRaw)(bool, std::vector<std::shared_ptr<Node>>*, void *user_data);
@@ -142,10 +148,10 @@ typedef bool (*FilterRaw)(const Value&, void *user_data);

 using DoneCallbackSimple = std::function<void(bool success)>;

-OPENDHT_PUBLIC ShutdownCallback bindShutdownCb(const ShutdownCallbackRaw& shutdown_cb_raw, void* user_data);
+OPENDHT_PUBLIC ShutdownCallback bindShutdownCb(ShutdownCallbackRaw shutdown_cb_raw, void* user_data);
 OPENDHT_PUBLIC DoneCallback bindDoneCb(DoneCallbackSimple donecb);
-OPENDHT_PUBLIC DoneCallback bindDoneCb(const DoneCallbackRaw& raw_cb, void* user_data);
-OPENDHT_PUBLIC DoneCallbackSimple bindDoneCbSimple(const DoneCallbackSimpleRaw& raw_cb, void* user_data);
-OPENDHT_PUBLIC Value::Filter bindFilterRaw(const FilterRaw& raw_filter, void* user_data);
+OPENDHT_PUBLIC DoneCallback bindDoneCb(DoneCallbackRaw raw_cb, void* user_data);
+OPENDHT_PUBLIC DoneCallbackSimple bindDoneCbSimple(DoneCallbackSimpleRaw raw_cb, void* user_data);
+OPENDHT_PUBLIC Value::Filter bindFilterRaw(FilterRaw raw_filter, void* user_data);

 }
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 Savoir-faire Linux Inc.
 *  Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 *
 *  This program is free software; you can redistribute it and/or modify
@@ -66,7 +66,7 @@ using Identity = std::pair<std::shared_ptr<PrivateKey>, std::shared_ptr<Certific
 */
 struct OPENDHT_PUBLIC PublicKey
 {
-    PublicKey();
+    PublicKey() {}

    /**
     * Takes ownership of an existing gnutls_pubkey.
@@ -86,16 +86,8 @@ struct OPENDHT_PUBLIC PublicKey

    PublicKey& operator=(PublicKey&& o) noexcept;

-    /**
-     * Get public key fingerprint
-     */
    InfoHash getId() const;
-
-    /**
-     * Get public key long fingerprint
-     */
    PkId getLongId() const;
-
    bool checkSignature(const Blob& data, const Blob& signature) const;
    Blob encrypt(const Blob&) const;

@@ -115,9 +107,7 @@ struct OPENDHT_PUBLIC PublicKey

    void msgpack_unpack(msgpack::object o);

-    gnutls_digest_algorithm_t getPreferredDigest() const;
-
-    gnutls_pubkey_t pk {nullptr};
+    gnutls_pubkey_t pk {};
 private:
    PublicKey(const PublicKey&) = delete;
    PublicKey& operator=(const PublicKey&) = delete;
@@ -143,7 +133,6 @@ struct OPENDHT_PUBLIC PrivateKey
    PrivateKey(const Blob& import, const std::string& password = {});
    ~PrivateKey();
    explicit operator bool() const { return key; }
-
    PublicKey getPublicKey() const;
    Blob serialize(const std::string& password = {}) const;

@@ -188,7 +177,7 @@ class OPENDHT_PUBLIC RevocationList
 public:
    RevocationList();
    RevocationList(const Blob& b);
-    RevocationList(RevocationList&& o) noexcept : crl(o.crl) { o.crl = nullptr; }
+    RevocationList(RevocationList&& o) : crl(o.crl) { o.crl = nullptr; }
    ~RevocationList();

    RevocationList& operator=(RevocationList&& o) { crl = o.crl; o.crl = nullptr; return *this; }
@@ -256,48 +245,14 @@ private:
    RevocationList& operator=(const RevocationList&) = delete;
 };

-enum class NameType { UNKNOWN = 0, RFC822, DNS, URI, IP };
-
-class OPENDHT_PUBLIC CertificateRequest {
-public:
-    CertificateRequest();
-    CertificateRequest(const uint8_t* data, size_t size);
-    CertificateRequest(const Blob& data) : CertificateRequest(data.data(), data.size()) {}
-
-    CertificateRequest(CertificateRequest&& o) noexcept : request(std::move(o.request)) {
-        o.request = nullptr;
-    }
-    CertificateRequest& operator=(CertificateRequest&& o) noexcept;
-
-    ~CertificateRequest();
-
-    void setName(const std::string& name);
-    void setUID(const std::string& name);
-    void setAltName(NameType type, const std::string& name);
-
-    std::string getName() const;
-    std::string getUID() const;
-
-    void sign(const PrivateKey& key, const std::string& password = {});
-
-    bool verify() const;
-
-    Blob pack() const;
-
-    gnutls_x509_crq_t get() const { return request; }
-private:
-    CertificateRequest(const CertificateRequest& o) = delete;
-    CertificateRequest& operator=(const CertificateRequest& o) = delete;
-    gnutls_x509_crq_t request {nullptr};
-};

 struct OPENDHT_PUBLIC Certificate {
-    Certificate() noexcept {}
+    Certificate() {}

    /**
     * Take ownership of existing gnutls structure
     */
-    Certificate(gnutls_x509_crt_t crt) noexcept : cert(crt) {}
+    Certificate(gnutls_x509_crt_t crt) : cert(crt) {}

    Certificate(Certificate&& o) noexcept : cert(o.cert), issuer(std::move(o.issuer)) { o.cert = nullptr; };

@@ -413,7 +368,6 @@ struct OPENDHT_PUBLIC Certificate {

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

    /** Read certificate Common Name (CN) */
@@ -428,6 +382,8 @@ struct OPENDHT_PUBLIC Certificate {
    /** Read certificate issuer User ID (UID) */
    std::string getIssuerUID() const;

+    enum class NameType { UNKNOWN = 0, RFC822, DNS, URI, IP };
+
    /** Read certificate alternative names */
    std::vector<std::pair<NameType, std::string>> getAltNames() const;

@@ -448,25 +404,12 @@ struct OPENDHT_PUBLIC Certificate {

    std::string print() const;

-    /**
-     * As a CA, revoke a certificate, adding it to
-     * the attached Certificate Revocation List (CRL)
-     */
    void revoke(const PrivateKey&, const Certificate&);
-
-    /**
-     * Get the list of certificates revoked as as CA.
-     */
    std::vector<std::shared_ptr<RevocationList>> getRevocationLists() const;
-
-    /**
-     * Attach existing revocation list.
-     */
    void addRevocationList(RevocationList&&);
    void addRevocationList(std::shared_ptr<RevocationList>);

-    static Certificate generate(const PrivateKey& key, const std::string& name = "dhtnode", const Identity& ca = {}, bool is_ca = false);
-    static Certificate generate(const CertificateRequest& request, const Identity& ca);
+    static Certificate generate(const PrivateKey& key, const std::string& name = "dhtnode", Identity ca = {}, bool is_ca = false);

    gnutls_x509_crt_t getCopy() const {
        if (not cert)
@@ -507,9 +450,7 @@ struct OPENDHT_PUBLIC Certificate {
        return {crts, crls};
    }

-    gnutls_digest_algorithm_t getPreferredDigest() const;
-
-    gnutls_x509_crt_t cert {nullptr};
+    gnutls_x509_crt_t cert {};
    std::shared_ptr<Certificate> issuer {};
 private:
    Certificate(const Certificate&) = delete;
@@ -537,10 +478,10 @@ struct OPENDHT_PUBLIC TrustList
    };

    TrustList();
-    TrustList(TrustList&& o) noexcept : trust(std::move(o.trust)) {
+    TrustList(TrustList&& o) : trust(std::move(o.trust)) {
        o.trust = nullptr;
    }
-    TrustList& operator=(TrustList&& o) noexcept;
+    TrustList& operator=(TrustList&& o);
    ~TrustList();
    void add(const Certificate& crt);
    void add(const RevocationList& crl);
@@ -550,7 +491,7 @@ struct OPENDHT_PUBLIC TrustList
 private:
    TrustList(const TrustList& o) = delete;
    TrustList& operator=(const TrustList& o) = delete;
-    gnutls_x509_trust_list_t trust {nullptr};
+    gnutls_x509_trust_list_t trust;
 };

 template <class T>
@@ -567,13 +508,9 @@ public:
    ~secure_vector() { clean(); }

    static secure_vector<T> getRandom(size_t size) {
-        secure_vector<T> ret(size);
+        secure_vector<T> ret(size/sizeof(T));
        crypto::random_device rdev;
-#ifdef _WIN32
-        std::uniform_int_distribution<int> rand_byte{ 0, std::numeric_limits<uint8_t>::max() };
-#else
        std::uniform_int_distribution<uint8_t> rand_byte;
-#endif
        std::generate_n((uint8_t*)ret.data_.data(), ret.size()*sizeof(T), std::bind(rand_byte, std::ref(rdev)));
        return ret;
    }
@@ -648,11 +585,11 @@ using SecureBlob = secure_vector<uint8_t>;
 *           If not set, the generated certificate will be a self-signed CA.
 * @param key_length stength of the generated private key (bits).
 */
-OPENDHT_PUBLIC Identity generateIdentity(const std::string& name, const Identity& ca, unsigned key_length, bool is_ca);
-OPENDHT_PUBLIC Identity generateIdentity(const std::string& name = "dhtnode", const Identity& ca = {}, unsigned key_length = 4096);
+OPENDHT_PUBLIC Identity generateIdentity(const std::string& name, Identity ca, unsigned key_length, bool is_ca);
+OPENDHT_PUBLIC Identity generateIdentity(const std::string& name = "dhtnode", Identity ca = {}, unsigned key_length = 4096);

-OPENDHT_PUBLIC Identity generateEcIdentity(const std::string& name, const Identity& ca, bool is_ca);
-OPENDHT_PUBLIC Identity generateEcIdentity(const std::string& name = "dhtnode", const Identity& ca = {});
+OPENDHT_PUBLIC Identity generateEcIdentity(const std::string& name, Identity ca, bool is_ca);
+OPENDHT_PUBLIC Identity generateEcIdentity(const std::string& name = "dhtnode", Identity ca = {});


 /**
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 Savoir-faire Linux Inc.
 *  Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 *
 *  This program is free software; you can redistribute it and/or modify
@@ -38,7 +38,7 @@ class OPENDHT_PUBLIC DhtMessage : public Value::Serializable<DhtMessage>
 public:
    static const ValueType TYPE;

-    DhtMessage(const std::string& s = {}, const Blob& msg = {}) : service(s), data(msg) {}
+    DhtMessage(std::string s = {}, Blob msg = {}) : service(s), data(msg) {}

    std::string getService() const {
        return service;
@@ -48,7 +48,7 @@ public:

    static bool storePolicy(InfoHash key, std::shared_ptr<Value>& value, const InfoHash& from, const SockAddr&);

-    static Value::Filter ServiceFilter(const std::string& s);
+    static Value::Filter ServiceFilter(std::string s);

    /** print value for debugging */
    friend std::ostream& operator<< (std::ostream&, const DhtMessage&);
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 Savoir-faire Linux Inc.
 *  Authors: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 *           Simon Désaulniers <simon.desaulniers@savoirfairelinux.com>
 *           Sébastien Blin <sebastien.blin@savoirfairelinux.com>
@@ -68,7 +68,7 @@ public:
     * Initialise the Dht with two open sockets (for IPv4 and IP6)
     * and an ID for the node.
     */
-    Dht(const int& s, const int& s6, const Config& config);
+    Dht(const int& s, const int& s6, Config config);
    virtual ~Dht();

    /**
@@ -163,7 +163,7 @@ public:
    /**
     * Get locally stored data for the given hash.
     */
-    std::vector<Sp<Value>> getLocal(const InfoHash& key, Value::Filter f = {}) const;
+    std::vector<Sp<Value>> getLocal(const InfoHash& key, Value::Filter f = Value::AllFilter()) const;

    /**
     * Get locally stored data for the given key and value id.
@@ -261,14 +261,11 @@ public:
     * Get the list of good nodes for local storage saving purposes
     * The list is ordered to minimize the back-to-work delay.
     */
-    std::vector<NodeExport> exportNodes() const;
+    std::vector<NodeExport> exportNodes();

    std::vector<ValuesExport> exportValues() const;
    void importValues(const std::vector<ValuesExport>&);

-    void saveState(const std::string& path) const;
-    void loadState(const std::string& path);
-
    NodeStats getNodesStats(sa_family_t af) const;

    std::string getStorageLog() const;
@@ -327,10 +324,10 @@ private:
    static constexpr unsigned LISTEN_NODES {4};

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

    /* The maximum number of searches we keep data about. */
-    static constexpr unsigned MAX_SEARCHES {64 * 1024};
+    static constexpr unsigned MAX_SEARCHES {16384};

    static constexpr std::chrono::minutes MAX_STORAGE_MAINTENANCE_EXPIRE_TIME {10};

@@ -362,6 +359,13 @@ private:
    // registred types
    TypeStore types;

+    // are we a bootstrap node ?
+    // note: Any running node can be used as a bootstrap node.
+    //       Only nodes running only as bootstrap nodes should
+    //       be put in bootstrap mode.
+    const bool is_bootstrap {false};
+    const bool maintain_storage {false};
+
    // the stuff
    RoutingTable buckets4 {};
    RoutingTable buckets6 {};
@@ -396,15 +400,6 @@ private:

    std::mt19937_64 rd {crypto::getSeededRandomEngine<std::mt19937_64>()};

-    std::string persistPath;
-
-    // are we a bootstrap node ?
-    // note: Any running node can be used as a bootstrap node.
-    //       Only nodes running only as bootstrap nodes should
-    //       be put in bootstrap mode.
-    const bool is_bootstrap {false};
-    const bool maintain_storage {false};
-
    void rotateSecrets();

    Blob makeToken(const SockAddr&, bool old) const;
@@ -414,9 +409,7 @@ private:

    // Storage
    void storageAddListener(const InfoHash& id, const Sp<Node>& node, size_t tid, Query&& = {});
-    bool storageStore(const InfoHash& id, const Sp<Value>& value, time_point created, const SockAddr& sa = {}, bool permanent = false);
-    bool storageErase(const InfoHash& id, Value::Id vid);
-    bool storageRefresh(const InfoHash& id, Value::Id vid);
+    bool storageStore(const InfoHash& id, const Sp<Value>& value, time_point created, const SockAddr& sa = {});
    void expireStore();
    void expireStorage(InfoHash h);
    void expireStore(decltype(store)::iterator);
@@ -430,7 +423,7 @@ private:
     * nodes.
     */
    void dataPersistence(InfoHash id);
-    size_t maintainStorage(decltype(store)::value_type&, bool force=false, const DoneCallback& donecb={});
+    size_t maintainStorage(decltype(store)::value_type&, bool force=false, DoneCallback donecb=nullptr);

    // Buckets
    RoutingTable& buckets(sa_family_t af) { return af == AF_INET ? buckets4 : buckets6; }
@@ -471,10 +464,10 @@ private:
     * Low-level method that will perform a search on the DHT for the specified
     * infohash (id), using the specified IP version (IPv4 or IPv6).
     */
-    Sp<Search> search(const InfoHash& id, sa_family_t af, GetCallback = {}, QueryCallback = {}, DoneCallback = {}, Value::Filter = {}, const Sp<Query>& q = {});
+    Sp<Search> search(const InfoHash& id, sa_family_t af, GetCallback = {}, QueryCallback = {}, DoneCallback = {}, Value::Filter = {}, Query q = {});

    void announce(const InfoHash& id, sa_family_t af, Sp<Value> value, DoneCallback callback, time_point created=time_point::max(), bool permanent = false);
-    size_t listenTo(const InfoHash& id, sa_family_t af, ValueCallback cb, Value::Filter f = {}, const Sp<Query>& q = {});
+    size_t listenTo(const InfoHash& id, sa_family_t af, ValueCallback cb, Value::Filter f = Value::AllFilter(), const Sp<Query>& q = {});

    /**
     * Refill the search with good nodes if possible.
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 Savoir-faire Linux Inc.
 *  Author: Sébastien Blin <sebastien.blin@savoirfairelinux.com>
 *
 *  This program is free software; you can redistribute it and/or modify
@@ -40,7 +40,7 @@ public:
    virtual NodeStatus getStatus() const = 0;

    /**
-     * Get the ID of the DHT node.
+     * Get the ID of the node.
     */
    virtual const InfoHash& getNodeId() const = 0;

@@ -106,7 +106,7 @@ public:
    /**
     * Get locally stored data for the given hash.
     */
-    virtual std::vector<Sp<Value>> getLocal(const InfoHash& key, Value::Filter f = {}) const = 0;
+    virtual std::vector<Sp<Value>> getLocal(const InfoHash& key, Value::Filter f = Value::AllFilter()) const = 0;

    /**
     * Get locally stored data for the given key and value id.
@@ -181,7 +181,7 @@ public:
     * Get the list of good nodes for local storage saving purposes
     * The list is ordered to minimize the back-to-work delay.
     */
-    virtual std::vector<NodeExport> exportNodes() const = 0;
+    virtual std::vector<NodeExport> exportNodes() = 0;

    virtual std::vector<ValuesExport> exportValues() const = 0;
    virtual void importValues(const std::vector<ValuesExport>&) = 0;
@@ -216,7 +216,7 @@ public:
     */
    virtual void setLoggers(LogMethod error = NOLOG, LogMethod warn = NOLOG, LogMethod debug = NOLOG)
    {
-        DHT_LOG.DBG = debug;
+        DHT_LOG.DEBUG = debug;
        DHT_LOG.WARN = warn;
        DHT_LOG.ERR = error;
    }
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2016-2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2016-2018 Savoir-faire Linux Inc.
 *  Author: Sébastien Blin <sebastien.blin@savoirfairelinux.com>
 *          Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 *
@@ -17,6 +17,8 @@
 *  along with this program. If not, see <https://www.gnu.org/licenses/>.
 */

+#if OPENDHT_PROXY_CLIENT
+
 #pragma once

 #include <functional>
@@ -39,6 +41,8 @@ namespace Json {

 namespace dht {

+class SearchCache;
+
 class OPENDHT_PUBLIC DhtProxyClient final : public DhtInterface {
 public:

@@ -47,7 +51,7 @@ public:
    explicit DhtProxyClient(std::function<void()> loopSignal, const std::string& serverHost, const std::string& pushClientId = "");

    virtual void setPushNotificationToken(const std::string& token) {
-#ifdef OPENDHT_PUSH_NOTIFICATIONS
+#if OPENDHT_PUSH_NOTIFICATIONS
        deviceKey_ = token;
 #endif
    }
@@ -235,7 +239,7 @@ public:
    void insertNode(const InfoHash&, const sockaddr*, socklen_t) { }
    void insertNode(const NodeExport&) { }
    std::pair<size_t, size_t> getStoreSize() const { return {}; }
-    std::vector<NodeExport> exportNodes() const { return {}; }
+    std::vector<NodeExport> exportNodes() { return {}; }
    std::vector<ValuesExport> exportValues() const { return {}; }
    void importValues(const std::vector<ValuesExport>&) {}
    std::string getStorageLog() const { return {}; }
@@ -272,18 +276,12 @@ private:

    void opFailed();

+    size_t doListen(const InfoHash& key, ValueCallback, Value::Filter);
    bool doCancelListen(const InfoHash& key, size_t token);

    struct ListenState;
-    enum class ListenMethod {
-        LISTEN,
-        SUBSCRIBE,
-        RESUBSCRIBE,
-    };
-    void sendListen(const std::shared_ptr<restbed::Request> &request,
-                    const ValueCallback &, const Value::Filter &filter,
-                    const Sp<ListenState> &state,
-                    ListenMethod method = ListenMethod::LISTEN);
+    void sendListen(const std::shared_ptr<restbed::Request>& request, const ValueCallback&, const Value::Filter& filter, const Sp<ListenState>& state);
+    void sendSubscribe(const std::shared_ptr<restbed::Request>& request, const Sp<proxy::ListenToken>&, const Sp<ListenState>& state);

    void doPut(const InfoHash&, Sp<Value>, DoneCallback, time_point created, bool permanent);

@@ -353,8 +351,6 @@ private:
     */
    void confirmProxy();
    Sp<Scheduler::Job> nextProxyConfirmation {};
-    Sp<Scheduler::Job> listenerRestart {};
-
    /**
     * Relaunch LISTEN requests if the client disconnect/reconnect.
     */
@@ -374,12 +370,14 @@ private:

    const std::function<void()> loopSignal_;

-#ifdef OPENDHT_PUSH_NOTIFICATIONS
-    void fillBody(std::shared_ptr<restbed::Request> request, bool resubscribe);
+#if OPENDHT_PUSH_NOTIFICATIONS
+    void fillBodyToGetToken(std::shared_ptr<restbed::Request> request, unsigned token = 0);
    void getPushRequest(Json::Value&) const;
 #endif // OPENDHT_PUSH_NOTIFICATIONS

-    std::atomic_bool isDestroying_ {false};
+    bool isDestroying_ {false};
 };

 }
+
+#endif // OPENDHT_PROXY_CLIENT
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2017-2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2017-2018 Savoir-faire Linux Inc.
 *  Author: Sébastien Blin <sebastien.blin@savoirfairelinux.com>
 *          Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 *
@@ -17,6 +17,8 @@
 *  along with this program. If not, see <https://www.gnu.org/licenses/>.
 */

+#if OPENDHT_PROXY_SERVER
+
 #pragma once

 #include "callbacks.h"
@@ -32,10 +34,6 @@
 #include <mutex>
 #include <restbed>

-#ifdef OPENDHT_JSONCPP
-#include <json/json.h>
-#endif
-
 namespace Json {
    class Value;
 }
@@ -43,7 +41,6 @@ namespace Json {
 namespace dht {

 class DhtRunner;
-class ThreadPool;

 /**
 * Describes the REST API
@@ -76,44 +73,15 @@ public:
        size_t pushListenersCount;
        /** Average requests per second */
        double requestRate;
-        /** Node Info **/
-        NodeInfo nodeInfo;

        std::string toString() const {
            std::ostringstream ss;
            ss << "Listens: " << listenCount << " Puts: " << putCount << " PushListeners: " << pushListenersCount << std::endl;
            ss << "Requests: " << requestRate << " per second." << std::endl;
-            auto& ni = nodeInfo;
-            auto& ipv4 = ni.ipv4;
-            if (ipv4.table_depth > 1) {
-                ss << "IPv4 Network estimation: " << ipv4.getNetworkSizeEstimation() << std::endl;;
-            }
-            auto& ipv6 = ni.ipv6;
-            if (ipv6.table_depth > 1) {
-                ss << "IPv6 Network estimation: " << ipv6.getNetworkSizeEstimation() << std::endl;;
-            }
            return ss.str();
        }
-
-#ifdef OPENDHT_JSONCPP
-        /**
-         * Build a json object from a NodeStats
-         */
-        Json::Value toJson() const {
-            Json::Value result;
-            result["listenCount"] = static_cast<Json::UInt64>(listenCount);
-            result["putCount"] = static_cast<Json::UInt64>(putCount);
-            result["pushListenersCount"] = static_cast<Json::UInt64>(pushListenersCount);
-            result["requestRate"] = requestRate;
-            result["nodeInfo"] = nodeInfo.toJson();
-            return result;
-        }
-#endif
    };
-
-    ServerStats stats() const { return stats_; }
-
-    void updateStats() const;
+    ServerStats getStats() const;

    std::shared_ptr<DhtRunner> getNode() const { return dht_; }

@@ -132,14 +100,6 @@ private:
     */
    void getNodeInfo(const std::shared_ptr<restbed::Session>& session) const;

-    /**
-     * Return ServerStats in JSON format
-     * Method: STATS "/"
-     * Result: HTTP 200, body: Node infos in JSON format
-     * @param session
-     */
-    void getStats(const std::shared_ptr<restbed::Session>& session) const;
-
    /**
     * Return Values of an infoHash
     * Method: GET "/{InfoHash: .*}"
@@ -177,7 +137,7 @@ private:

    void cancelPut(const InfoHash& key, Value::Id vid);

-#ifdef OPENDHT_PROXY_SERVER_IDENTITY
+#if OPENDHT_PROXY_SERVER_IDENTITY
    /**
     * Put a value to sign by the proxy on the DHT
     * Method: SIGN "/{InfoHash: .*}"
@@ -228,7 +188,7 @@ private:
     */
    void removeClosedListeners(bool testSession = true);

-#ifdef OPENDHT_PUSH_NOTIFICATIONS
+#if OPENDHT_PUSH_NOTIFICATIONS
    /**
     * Subscribe to push notifications for an iOS or Android device.
     * Method: SUBSCRIBE "/{InfoHash: .*}"
@@ -252,7 +212,7 @@ private:
     * @param key of the device
     * @param json, the content to send
     */
-    void sendPushNotification(const std::string& key, Json::Value&& json, bool isAndroid) const;
+    void sendPushNotification(const std::string& key, const Json::Value& json, bool isAndroid) const;

    /**
     * Remove a push listener between a client and a hash
@@ -271,13 +231,11 @@ private:
    std::thread server_thread {};
    std::unique_ptr<restbed::Service> service_;
    std::shared_ptr<DhtRunner> dht_;
-    Json::StreamWriterBuilder jsonBuilder_;

    std::mutex schedulerLock_;
    std::condition_variable schedulerCv_;
    Scheduler scheduler_;
    std::thread schedulerThread_;
-    std::unique_ptr<ThreadPool> threadPool_;

    Sp<Scheduler::Job> printStatsJob_;
    mutable std::mutex statsMutex_;
@@ -304,9 +262,7 @@ private:

    const std::string pushServer_;

-    mutable ServerStats stats_;
-
-#ifdef OPENDHT_PUSH_NOTIFICATIONS
+#if OPENDHT_PUSH_NOTIFICATIONS
    struct Listener;
    struct PushListener;
    std::mutex lockPushListeners_;
@@ -316,3 +272,5 @@ private:
 };

 }
+
+#endif //OPENDHT_PROXY_SERVER
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 Savoir-faire Linux Inc.
 *  Authors: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 *           Simon Désaulniers <simon.desaulniers@savoirfairelinux.com>
 *           Sébastien Blin <sebastien.blin@savoirfairelinux.com>
@@ -63,20 +63,20 @@ public:
    DhtRunner();
    virtual ~DhtRunner();

-    void get(InfoHash id, GetCallbackSimple cb, DoneCallback donecb={}, Value::Filter f = {}, Where w = {}) {
+    void get(InfoHash id, GetCallbackSimple cb, DoneCallback donecb={}, Value::Filter f = Value::AllFilter(), Where w = {}) {
        get(id, bindGetCb(cb), donecb, f, w);
    }

-    void get(InfoHash id, GetCallbackSimple cb, DoneCallbackSimple donecb={}, Value::Filter f = {}, Where w = {}) {
+    void get(InfoHash id, GetCallbackSimple cb, DoneCallbackSimple donecb={}, Value::Filter f = Value::AllFilter(), Where w = {}) {
        get(id, bindGetCb(cb), donecb, f, w);
    }

    void get(InfoHash hash, GetCallback vcb, DoneCallback dcb, Value::Filter f={}, Where w = {});

-    void get(InfoHash id, GetCallback cb, DoneCallbackSimple donecb={}, Value::Filter f = {}, Where w = {}) {
+    void get(InfoHash id, GetCallback cb, DoneCallbackSimple donecb={}, Value::Filter f = Value::AllFilter(), Where w = {}) {
        get(id, cb, bindDoneCb(donecb), f, w);
    }
-    void get(const std::string& key, GetCallback vcb, DoneCallbackSimple dcb={}, Value::Filter f = {}, Where w = {});
+    void get(const std::string& key, GetCallback vcb, DoneCallbackSimple dcb={}, Value::Filter f = Value::AllFilter(), Where w = {});

    template <class T>
    void get(InfoHash hash, std::function<bool(std::vector<T>&&)> cb, DoneCallbackSimple dcb={})
@@ -158,15 +158,6 @@ public:
        },
        getFilterSet<T>());
    }
-    template <class T>
-    std::future<size_t> listen(InfoHash hash, std::function<bool(std::vector<T>&&, bool)> cb)
-    {
-        return listen(hash, [=](const std::vector<std::shared_ptr<Value>>& vals, bool expired) {
-            return cb(unpackVector<T>(vals), expired);
-        },
-        getFilterSet<T>());
-    }
-
    template <typename T>
    std::future<size_t> listen(InfoHash hash, std::function<bool(T&&)> cb, Value::Filter f = Value::AllFilter(), Where w = {})
    {
@@ -183,22 +174,6 @@ public:
        },
        getFilterSet<T>(f), w);
    }
-    template <typename T>
-    std::future<size_t> listen(InfoHash hash, std::function<bool(T&&, bool)> cb, Value::Filter f = Value::AllFilter(), Where w = {})
-    {
-        return listen(hash, [=](const std::vector<std::shared_ptr<Value>>& vals, bool expired) {
-            for (const auto& v : vals) {
-                try {
-                    if (not cb(Value::unpack<T>(*v), expired))
-                        return false;
-                } catch (const std::exception&) {
-                    continue;
-                }
-            }
-            return true;
-        },
-        getFilterSet<T>(f), w);
-    }

    void cancelListen(InfoHash h, size_t token);
    void cancelListen(InfoHash h, std::shared_future<size_t> token);
@@ -273,14 +248,8 @@ public:

    void dumpTables() const;

-    /**
-     * Get the public key fingerprint if an identity is used with this node, 0 otherwise.
-     */
    InfoHash getId() const;

-    /**
-     * Get the ID of the DHT node.
-     */
    InfoHash getNodeId() const;

    /**
@@ -354,8 +323,7 @@ public:
                    /*.node_id = */{},
                    /*.network = */network,
                    /*.is_bootstrap = */false,
-                    /*.maintain_storage = */false,
-                    /*.persist_path = */{}
+                    /*.maintain_storage*/false
                },
                /*.id = */identity
            },
@@ -364,7 +332,7 @@ public:
            /*.push_node_id = */""
        });
    }
-    void run(in_port_t port, const Config& config);
+    void run(in_port_t port, Config config);

    /**
     * @param local4: Local IPv4 address and port to bind. Can be null.
@@ -374,12 +342,12 @@ public:
     * @param threaded: If false, loop() must be called periodically. Otherwise a thread is launched.
     * @param cb: Optional callback to receive general state information.
     */
-    void run(const SockAddr& local4, const SockAddr& local6, const Config& config);
+    void run(const SockAddr& local4, const SockAddr& local6, Config config);

    /**
     * Same as @run(sockaddr_in, sockaddr_in6, Identity, bool, StatusCallback), but with string IP addresses and service (port).
     */
-    void run(const char* ip4, const char* ip6, const char* service, const Config& config);
+    void run(const char* ip4, const char* ip6, const char* service, Config config);

    void setOnStatusChanged(StatusCallback&& cb) {
        statusCb = std::move(cb);
@@ -448,7 +416,6 @@ private:
     */
    void tryBootstrapContinuously();

-    void stopNetwork();
    void startNetwork(const SockAddr sin4, const SockAddr sin6);
    time_point loop_();

@@ -519,7 +486,6 @@ private:
               status6 {NodeStatus::Disconnected};
    StatusCallback statusCb {nullptr};

-    int stop_writefd {-1};
    int s4 {-1}, s6 {-1};
    SockAddr bound4 {};
    SockAddr bound6 {};
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 Savoir-faire Linux Inc.
 *  Author(s) : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 *              Simon Désaulniers <simon.desaulniers@savoirfairelinux.com>
 *              Nicolas Reynaud <nicolas.reynaud@savoirfairelinux.com>
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 Savoir-faire Linux Inc.
 *  Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 *
 *  This program is free software; you can redistribute it and/or modify
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 Savoir-faire Linux Inc.
 *
 *  Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 *
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2016-2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2016 Savoir-faire Linux Inc.
 *  Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 *
 *  This program is free software; you can redistribute it and/or modify
@@ -85,7 +85,7 @@ private:
 };

 struct Logger {
-    LogMethod DBG = NOLOG;
+    LogMethod DEBUG = NOLOG;
    LogMethod WARN = NOLOG;
    LogMethod ERR = NOLOG;
    void setFilter(const InfoHash& f) {
@@ -114,7 +114,7 @@ struct Logger {
 #if OPENDHT_LOG
        va_list args;
        va_start(args, format);
-        log0(DBG, format, args);
+        log0(DEBUG, format, args);
        va_end(args);
 #endif
    }
@@ -122,7 +122,7 @@ struct Logger {
 #if OPENDHT_LOG
        va_list args;
        va_start(args, format);
-        log1(DBG, f, format, args);
+        log1(DEBUG, f, format, args);
        va_end(args);
 #endif
    }
@@ -130,7 +130,7 @@ struct Logger {
 #if OPENDHT_LOG
        va_list args;
        va_start(args, format);
-        log2(DBG, f1, f2, format, args);
+        log2(DEBUG, f1, f2, format, args);
        va_end(args);
 #endif
    }
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2018 Savoir-faire Linux Inc.
 *  Author(s) : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 *              Simon Désaulniers <simon.desaulniers@savoirfairelinux.com>
 *
@@ -27,6 +27,7 @@
 #include "utils.h"
 #include "rng.h"
 #include "rate_limiter.h"
+#include "callbacks.h"

 #include <vector>
 #include <string>
@@ -206,15 +207,15 @@ public:

    NetworkEngine(Logger& log, Scheduler& scheduler, const int& s = -1, const int& s6 = -1);
    NetworkEngine(InfoHash& myid, NetId net, const int& s, const int& s6, Logger& log, Scheduler& scheduler,
-            decltype(NetworkEngine::onError)&& onError,
-            decltype(NetworkEngine::onNewNode)&& onNewNode,
-            decltype(NetworkEngine::onReportedAddr)&& onReportedAddr,
-            decltype(NetworkEngine::onPing)&& onPing,
-            decltype(NetworkEngine::onFindNode)&& onFindNode,
-            decltype(NetworkEngine::onGetValues)&& onGetValues,
-            decltype(NetworkEngine::onListen)&& onListen,
-            decltype(NetworkEngine::onAnnounce)&& onAnnounce,
-            decltype(NetworkEngine::onRefresh)&& onRefresh);
+            decltype(NetworkEngine::onError) onError,
+            decltype(NetworkEngine::onNewNode) onNewNode,
+            decltype(NetworkEngine::onReportedAddr) onReportedAddr,
+            decltype(NetworkEngine::onPing) onPing,
+            decltype(NetworkEngine::onFindNode) onFindNode,
+            decltype(NetworkEngine::onGetValues) onGetValues,
+            decltype(NetworkEngine::onListen) onListen,
+            decltype(NetworkEngine::onAnnounce) onAnnounce,
+            decltype(NetworkEngine::onRefresh) onRefresh);

    virtual ~NetworkEngine();

@@ -290,9 +291,9 @@ public:
     */
    Sp<Request> sendFindNode(Sp<Node> n,
                             const InfoHash& hash,
-                             want_t want = -1,
-                             RequestCb&& on_done = {},
-                             RequestExpiredCb&& on_expired = {});
+                             want_t want,
+                             RequestCb&& on_done,
+                             RequestExpiredCb&& on_expired);
    /**
     * Send a "get" request to a given node.
     *
@@ -408,6 +409,10 @@ public:
        return stats;
    }

+    MessageStats getMessageStats(bool in) {
+        return in ? in_stats : out_stats;
+    }
+
    void blacklistNode(const Sp<Node>& n);

    std::vector<Sp<Node>> getCachedNodes(const InfoHash& id, sa_family_t sa_f, size_t count) {
@@ -457,16 +462,6 @@ private:
     */
    void sendRequest(const Sp<Request>& request);

-    struct MessageStats {
-        unsigned ping    {0};
-        unsigned find    {0};
-        unsigned get     {0};
-        unsigned put     {0};
-        unsigned listen  {0};
-        unsigned refresh {0};
-    };
-
-
    // basic wrapper for socket sendto function
    int send(const char *buf, size_t len, int flags, const SockAddr& addr);

@@ -531,8 +526,6 @@ private:
    std::set<SockAddr> blacklist {};

    Scheduler& scheduler;
-
-    bool logIncoming_ {false};
 };

 } /* namespace net  */
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 Savoir-faire Linux Inc.
 *  Author(s) : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 *              Simon Désaulniers <simon.desaulniers@savoirfairelinux.com>
 *
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 Savoir-faire Linux Inc.
 *  Author(s) : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 *
 *  This program is free software; you can redistribute it and/or modify
@@ -40,16 +40,12 @@ struct NodeCache {
    ~NodeCache();

 private:
-    class NodeMap : private std::map<InfoHash, std::weak_ptr<Node>> {
+    class NodeMap : public std::map<InfoHash, std::weak_ptr<Node>> {
    public:
        Sp<Node> getNode(const InfoHash& id);
        Sp<Node> getNode(const InfoHash& id, const SockAddr&, time_point now, bool confirmed, bool client);
-        std::vector<Sp<Node>> getCachedNodes(const InfoHash& id, size_t count) const;
        void clearBadNodes();
        void setExpired();
-        void cleanup();
-    private:
-        size_t cleanup_counter {0};
    };

    const NodeMap& cache(sa_family_t af) const { return af == AF_INET ? cache_4 : cache_6; }
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2017-2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2017-2018 Savoir-faire Linux Inc.
 *  Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 *
 *  This program is free software; you can redistribute it and/or modify
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2017-2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2017 Savoir-faire Linux Inc.
 *  Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 *
 *  This program is free software; you can redistribute it and/or modify
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 Savoir-faire Linux Inc.
 *  Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 *
 *  This program is free software; you can redistribute it and/or modify
@@ -25,7 +25,7 @@
 namespace dht {
 namespace crypto {

-#ifndef _MSC_VER
+#ifndef WIN32_NATIVE
 #ifdef _WIN32

 /**
@@ -43,8 +43,8 @@ public:
     * result_type is unsigned int so this is currently safe.
     */
    static_assert(
-        sizeof(result_type) == 2 ||
-        sizeof(result_type) == 4 ||
+        sizeof(result_type) == 2 || 
+        sizeof(result_type) == 4 || 
        sizeof(result_type) == 8,
        "result_type must be 16, 32 or 64 bits");

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 Savoir-faire Linux Inc.
 *  Author(s) : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 *              Simon Désaulniers <simon.desaulniers@savoirfairelinux.com>
 *
@@ -42,11 +42,6 @@ struct Bucket {
    Sp<Node> randomNode();

    void sendCachedPing(net::NetworkEngine& ne);
-    void connectivityChanged() {
-        time = time_point::min();
-        for (auto& node : nodes)
-            node->setTime(time_point::min());
-    }
 };

 class RoutingTable : public std::list<Bucket> {
@@ -81,7 +76,7 @@ public:
    void connectivityChanged(const time_point& now) {
        grow_time = now;
        for (auto& b : *this)
-            b.connectivityChanged();
+            b.time = time_point::min();
    }

    bool onNewNode(const Sp<Node>& node, int comfirm, const time_point& now, const InfoHash& myid, net::NetworkEngine& ne);
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 Savoir-faire Linux Inc.
 *  Author(s) : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 *              Simon Désaulniers <simon.desaulniers@savoirfairelinux.com>
 *
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 Savoir-faire Linux Inc.
 *  Authors: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 *           Simon Désaulniers <simon.desaulniers@savoirfairelinux.com>
 *           Sébastien Blin <sebastien.blin@savoirfairelinux.com>
@@ -37,9 +37,9 @@ public:

    using Config = SecureDhtConfig;

-    static dht::Config getConfig(const SecureDht::Config& conf)
+    static dht::Config& getConfig(SecureDht::Config& conf)
    {
-        auto c = conf.node_config;
+        auto& c = conf.node_config;
        if (not c.node_id and conf.id.second)
            c.node_id = InfoHash::get("node:"+conf.id.second->getId().toString());
        return c;
@@ -71,7 +71,7 @@ public:
        return secureType(std::move(tmp_type));
    }

-    void registerType(const ValueType& type) override {
+    void registerType(const ValueType& type) {
        if (dht_)
            dht_->registerType(secureType(type));
    }
@@ -89,14 +89,14 @@ public:
     * If the signature can't be checked, or if the data can't be decrypted, it is not returned.
     * Public, non-signed & non-encrypted data is retransmitted as-is.
     */
-    void get(const InfoHash& id, GetCallback cb, DoneCallback donecb={}, Value::Filter&& = {}, Where&& w = {}) override;
-    void get(const InfoHash& id, GetCallback cb, DoneCallbackSimple donecb={}, Value::Filter&& f = {}, Where&& w = {}) override {
+    void get(const InfoHash& id, GetCallback cb, DoneCallback donecb={}, Value::Filter&& = {}, Where&& w = {});
+    void get(const InfoHash& id, GetCallback cb, DoneCallbackSimple donecb={}, Value::Filter&& f = {}, Where&& w = {}) {
        get(id, cb, bindDoneCb(donecb), std::forward<Value::Filter>(f), std::forward<Where>(w));
    }
-    void get(const InfoHash& key, GetCallbackSimple cb, DoneCallback donecb={}, Value::Filter&& f={}, Where&& w = {}) override {
+    void get(const InfoHash& key, GetCallbackSimple cb, DoneCallback donecb={}, Value::Filter&& f={}, Where&& w = {}) {
        get(key, bindGetCb(cb), donecb, std::forward<Value::Filter>(f), std::forward<Where>(w));
    }
-    void get(const InfoHash& key, GetCallbackSimple cb, DoneCallbackSimple donecb, Value::Filter&& f={}, Where&& w = {}) override {
+    void get(const InfoHash& key, GetCallbackSimple cb, DoneCallbackSimple donecb, Value::Filter&& f={}, Where&& w = {}) {
        get(key, bindGetCb(cb), bindDoneCb(donecb), std::forward<Value::Filter>(f), std::forward<Where>(w));
    }

@@ -127,8 +127,8 @@ public:

    Value decrypt(const Value& v);

-    void findCertificate(const InfoHash& node, const std::function<void(const Sp<crypto::Certificate>)>& cb);
-    void findPublicKey(const InfoHash& node, const std::function<void(const Sp<const crypto::PublicKey>)>& cb);
+    void findCertificate(const InfoHash& node, std::function<void(const Sp<crypto::Certificate>)> cb);
+    void findPublicKey(const InfoHash& node, std::function<void(const Sp<const crypto::PublicKey>)> cb);

    const Sp<crypto::Certificate> registerCertificate(const InfoHash& node, const Blob& cert);
    void registerCertificate(Sp<crypto::Certificate>& cert);
@@ -148,100 +148,99 @@ public:
    /**
     * SecureDht to Dht proxy
     */
-    void shutdown(ShutdownCallback cb) override {
+    void shutdown(ShutdownCallback cb) {
        dht_->shutdown(cb);
    }
-    void dumpTables() const override {
+    void dumpTables() const {
        dht_->dumpTables();
    }
-    inline const InfoHash& getNodeId() const override { return dht_->getNodeId(); }
-
-    std::pair<size_t, size_t> getStoreSize() const override {
+    inline const InfoHash& getNodeId() const { return dht_->getNodeId(); }
+    std::pair<size_t, size_t> getStoreSize() const {
        return dht_->getStoreSize();
    }
-    std::string getStorageLog() const override {
+    std::string getStorageLog() const {
        return dht_->getStorageLog();
    }
-    std::string getStorageLog(const InfoHash& h) const override {
+    std::string getStorageLog(const InfoHash& h) const {
        return dht_->getStorageLog(h);
    }
-    void setStorageLimit(size_t limit = DEFAULT_STORAGE_LIMIT) override {
+    void setStorageLimit(size_t limit = DEFAULT_STORAGE_LIMIT) {
        dht_->setStorageLimit(limit);
    }
-    std::vector<NodeExport> exportNodes() const override {
+    std::vector<NodeExport> exportNodes() {
        return dht_->exportNodes();
    }
-    std::vector<ValuesExport> exportValues() const override {
+    std::vector<ValuesExport> exportValues() const {
        return dht_->exportValues();
    }
-    void importValues(const std::vector<ValuesExport>& v) override {
+    void importValues(const std::vector<ValuesExport>& v) {
        dht_->importValues(v);
    }
-    NodeStats getNodesStats(sa_family_t af) const override {
+    NodeStats getNodesStats(sa_family_t af) const {
        return dht_->getNodesStats(af);
    }
-    std::vector<unsigned> getNodeMessageStats(bool in = false) override {
+    std::vector<unsigned> getNodeMessageStats(bool in = false) {
        return dht_->getNodeMessageStats(in);
    }
-    std::string getRoutingTablesLog(sa_family_t af) const override {
+    std::string getRoutingTablesLog(sa_family_t af) const {
        return dht_->getRoutingTablesLog(af);
    }
-    std::string getSearchesLog(sa_family_t af) const override {
+    std::string getSearchesLog(sa_family_t af) const {
        return dht_->getSearchesLog(af);
    }
-    std::string getSearchLog(const InfoHash& h, sa_family_t af = AF_UNSPEC) const override {
+    std::string getSearchLog(const InfoHash& h, sa_family_t af = AF_UNSPEC) const {
        return dht_->getSearchLog(h, af);
    }
-    std::vector<SockAddr> getPublicAddress(sa_family_t family = 0) override {
+    std::vector<SockAddr> getPublicAddress(sa_family_t family = 0) {
        return dht_->getPublicAddress(family);
    }
-    time_point periodic(const uint8_t *buf, size_t buflen, const SockAddr& sa) override {
+    time_point periodic(const uint8_t *buf, size_t buflen, const SockAddr& sa) {
        return dht_->periodic(buf, buflen, sa);
    }
-    time_point periodic(const uint8_t *buf, size_t buflen, const sockaddr* from, socklen_t fromlen) override {
+    time_point periodic(const uint8_t *buf, size_t buflen, const sockaddr* from, socklen_t fromlen) {
        return dht_->periodic(buf, buflen, from, fromlen);
    }
-    NodeStatus getStatus(sa_family_t af) const override {
+    NodeStatus getStatus(sa_family_t af) const {
        return dht_->getStatus(af);
    }
-    NodeStatus getStatus() const override {
+    NodeStatus getStatus() const {
        return dht_->getStatus();
    }
-    bool isRunning(sa_family_t af = 0) const override {
+    bool isRunning(sa_family_t af = 0) const {
        return dht_->isRunning(af);
    }
-    const ValueType& getType(ValueType::Id type_id) const override {
+    const ValueType& getType(ValueType::Id type_id) const {
        return dht_->getType(type_id);
    }
-    void insertNode(const InfoHash& id, const SockAddr& sa) override {
+    void insertNode(const InfoHash& id, const SockAddr& sa) {
        dht_->insertNode(id, sa);
    }
-    void insertNode(const InfoHash& id, const sockaddr* sa, socklen_t salen) override {
+    void insertNode(const InfoHash& id, const sockaddr* sa, socklen_t salen) {
        dht_->insertNode(id, sa, salen);
    }
-    void insertNode(const NodeExport& n) override {
+    void insertNode(const NodeExport& n) {
        dht_->insertNode(n);
    }
-    void pingNode(const sockaddr* sa, socklen_t salen, DoneCallbackSimple&& cb={}) override {
+    void pingNode(const sockaddr* sa, socklen_t salen, DoneCallbackSimple&& cb={}) {
        dht_->pingNode(sa, salen, std::move(cb));
    }
-    void query(const InfoHash& key, QueryCallback cb, DoneCallback done_cb = {}, Query&& q = {}) override {
+    void query(const InfoHash& key, QueryCallback cb, DoneCallback done_cb = {}, Query&& q = {}) {
        dht_->query(key, cb, done_cb, std::move(q));
    }
-    void query(const InfoHash& key, QueryCallback cb, DoneCallbackSimple done_cb = {}, Query&& q = {}) override {
+    void query(const InfoHash& key, QueryCallback cb, DoneCallbackSimple done_cb = {}, Query&& q = {}) {
        dht_->query(key, cb, done_cb, std::move(q));
    }
-    std::vector<Sp<Value>> getLocal(const InfoHash& key, Value::Filter f = Value::AllFilter()) const override {
+    std::vector<Sp<Value>> getLocal(const InfoHash& key, Value::Filter f = Value::AllFilter()) const {
        return dht_->getLocal(key, f);
    }
-    Sp<Value> getLocalById(const InfoHash& key, Value::Id vid) const override {
+    Sp<Value> getLocalById(const InfoHash& key, Value::Id vid) const {
        return dht_->getLocalById(key, vid);
    }
    void put(const InfoHash& key,
            Sp<Value> v,
            DoneCallback cb=nullptr,
            time_point created=time_point::max(),
-            bool permanent = false) override
+            bool permanent = false)
    {
        dht_->put(key, v, cb, created, permanent);
    }
@@ -249,7 +248,7 @@ public:
            const Sp<Value>& v,
            DoneCallbackSimple cb,
            time_point created=time_point::max(),
-            bool permanent = false) override
+            bool permanent = false)
    {
        dht_->put(key, v, cb, created, permanent);
    }
@@ -258,7 +257,7 @@ public:
            Value&& v,
            DoneCallback cb=nullptr,
            time_point created=time_point::max(),
-            bool permanent = false) override
+            bool permanent = false)
    {
        dht_->put(key, std::move(v), cb, created, permanent);
    }
@@ -266,32 +265,32 @@ public:
            Value&& v,
            DoneCallbackSimple cb,
            time_point created=time_point::max(),
-            bool permanent = false) override
+            bool permanent = false)
    {
        dht_->put(key, std::move(v), cb, created, permanent);
    }
-    std::vector<Sp<Value>> getPut(const InfoHash& h) override {
+    std::vector<Sp<Value>> getPut(const InfoHash& h) {
        return dht_->getPut(h);
    }
-    Sp<Value> getPut(const InfoHash& h, const Value::Id& vid) override {
+    Sp<Value> getPut(const InfoHash& h, const Value::Id& vid) {
        return dht_->getPut(h, vid);
    }
-    bool cancelPut(const InfoHash& h, const Value::Id& vid) override {
+    bool cancelPut(const InfoHash& h, const Value::Id& vid) {
        return dht_->cancelPut(h, vid);
    }

-    size_t listen(const InfoHash& key, ValueCallback, Value::Filter={}, Where={}) override;
-    size_t listen(const InfoHash& key, GetCallback cb, Value::Filter = {}, Where w = {}) override;
-    size_t listen(const InfoHash& key, GetCallbackSimple cb, Value::Filter f={}, Where w = {}) override {
+    size_t listen(const InfoHash& key, ValueCallback, Value::Filter={}, Where={});
+    size_t listen(const InfoHash& key, GetCallback cb, Value::Filter = {}, Where w = {});
+    size_t listen(const InfoHash& key, GetCallbackSimple cb, Value::Filter f={}, Where w = {}) {
        return listen(key, bindGetCb(cb), f, w);
    }
-    bool cancelListen(const InfoHash& h, size_t token) override {
+    bool cancelListen(const InfoHash& h, size_t token) {
        return dht_->cancelListen(h, token);
    }
-    void connectivityChanged(sa_family_t af) override {
+    void connectivityChanged(sa_family_t af) {
        dht_->connectivityChanged(af);
    }
-    void connectivityChanged() override {
+    void connectivityChanged() {
        dht_->connectivityChanged();
    }

@@ -299,7 +298,7 @@ public:
        forward_all_ = forward;
    }

-    void setPushNotificationToken(const std::string& token = "") override {
+    void setPushNotificationToken(const std::string& token = "") {
        dht_->setPushNotificationToken(token);
    }

@@ -307,20 +306,22 @@ public:
     * Call linked callback with push_notification
     * @param notification to process
     */
-    void pushNotificationReceived(const std::map<std::string, std::string>& notification) override {
+    void pushNotificationReceived(const std::map<std::string, std::string>& notification) {
        dht_->pushNotificationReceived(notification);
    }

-    void setLoggers(LogMethod error = NOLOG, LogMethod warn = NOLOG, LogMethod debug = NOLOG) override
+    void setLoggers(LogMethod error = NOLOG, LogMethod warn = NOLOG, LogMethod debug = NOLOG)
    {
-        DhtInterface::setLoggers(error, warn, debug);
+        DHT_LOG.DEBUG = debug;
+        DHT_LOG.WARN = warn;
+        DHT_LOG.ERR = error;
        dht_->setLoggers(error, warn, debug);
    }

    /**
     * Only print logs related to the given InfoHash (if given), or disable filter (if zeroes).
     */
-    void setLogFilter(const InfoHash& f) override {
+    void setLogFilter(const InfoHash& f) {
        DHT_LOG.setFilter(f);
        dht_->setLogFilter(f);
    }
@@ -332,8 +333,8 @@ private:
    SecureDht& operator=(const SecureDht&) = delete;

    Sp<Value> checkValue(const Sp<Value>& v);
-    ValueCallback getCallbackFilter(const ValueCallback&, Value::Filter&&);
-    GetCallback getCallbackFilter(const GetCallback&, Value::Filter&&);
+    ValueCallback getCallbackFilter(ValueCallback, Value::Filter&&);
+    GetCallback getCallbackFilter(GetCallback, Value::Filter&&);

    Sp<crypto::PrivateKey> key_ {};
    Sp<crypto::Certificate> certificate_ {};
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2016-2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2016 Savoir-faire Linux Inc.
 *  Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 *
 *  This program is free software; you can redistribute it and/or modify
@@ -58,7 +58,7 @@ public:
    SockAddr(const SockAddr& o) {
        set(o.get(), o.getLength());
    }
-    SockAddr(SockAddr&& o) noexcept : len(o.len), addr(std::move(o.addr)) {
+    SockAddr(SockAddr&& o) : len(o.len), addr(std::move(o.addr)) {
        o.len = 0;
    }

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 Savoir-faire Linux Inc.
 *  Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 *
 *  This program is free software; you can redistribute it and/or modify
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 Savoir-faire Linux Inc.
 *  Author(s) : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 *              Simon Désaulniers <simon.desaulniers@savoirfairelinux.com>
 *
@@ -79,7 +79,7 @@ static constexpr const size_t MAX_VALUE_SIZE {1024 * 64};
 struct OPENDHT_PUBLIC ValueType {
    typedef uint16_t Id;

-    static bool DEFAULT_STORE_POLICY(InfoHash, const std::shared_ptr<Value>& v, const InfoHash&, const SockAddr&);
+    static bool DEFAULT_STORE_POLICY(InfoHash, std::shared_ptr<Value>& v, const InfoHash&, const SockAddr&);
    static bool DEFAULT_EDIT_POLICY(InfoHash, const std::shared_ptr<Value>&, std::shared_ptr<Value>&, const InfoHash&, const SockAddr&) {
        return false;
    }
@@ -122,8 +122,6 @@ private:
    std::map<ValueType::Id, ValueType> types {};
 };

-struct CryptoValueCache;
-
 /**
 * A "value" is data potentially stored on the Dht, with some metadata.
 *
@@ -165,13 +163,6 @@ struct OPENDHT_PUBLIC Value
            return chainOr(std::move(f1), std::move(f2));
        }
        static Filter chain(Filter&& f1, Filter&& f2) {
-            if (not f1) return std::move(f2);
-            if (not f2) return std::move(f1);
-            return [f1,f2](const Value& v) {
-                return f1(v) and f2(v);
-            };
-        }
-        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) {
@@ -191,15 +182,11 @@ struct OPENDHT_PUBLIC Value
            return chainAll(std::vector<Filter>(l.begin(), l.end()));
        }
        static Filter chainOr(Filter&& f1, Filter&& f2) {
-            if (not f1 or not f2) return {};
+            if (not f1 or not f2) return AllFilter();
            return [f1,f2](const Value& v) {
                return f1(v) or f2(v);
            };
        }
-        static Filter notFilter(Filter&& f) {
-            if (not f) return [](const Value&) { return false; };
-            return [f](const Value& v) { return not f(v); };
-        }
        std::vector<Sp<Value>> filter(const std::vector<Sp<Value>>& values) {
            if (not (*this))
                return values;
@@ -601,14 +588,6 @@ struct OPENDHT_PUBLIC Value
     * Hold encrypted version of the data.
     */
    Blob cypher {};
-
-private:
-    friend class SecureDht;
-    /* Cache for crypto ops */
-    bool signatureChecked {false};
-    bool signatureValid {false};
-    bool decrypted {false};
-    Sp<Value> decryptedValue {};
 };

 using ValuesExport = std::pair<InfoHash, Blob>;
@@ -885,7 +864,7 @@ struct OPENDHT_PUBLIC Query
 {
    static const std::string QUERY_PARSE_ERROR;

-    Query(Select s = {}, Where w = {}, bool none = false) : select(std::move(s)), where(std::move(w)), none(none) { };
+    Query(Select s = {}, Where w = {}, bool none = false) : select(s), where(w), none(none) { };

    /**
     * Initializes a query based on a SQL-ish formatted string. The abstract
@@ -947,7 +926,7 @@ struct OPENDHT_PUBLIC Query
 */
 struct OPENDHT_PUBLIC FieldValueIndex {
    FieldValueIndex() {}
-    FieldValueIndex(const Value& v, const Select& s = {});
+    FieldValueIndex(const Value& v, Select s = {});
    /**
     * Tells if all the fields of this are contained in the other
     * FieldValueIndex with the same value.
@@ -1001,7 +980,7 @@ template <typename T,
 Value::Filter
 getFilterSet()
 {
-    return {};
+    return Value::AllFilter();
 }

 template <class T>
@@ -5,7 +5,7 @@
 # distutils: libraries = opendht gnutls
 # cython: language_level=3
 #
-# Copyright (c) 2015-2019 Savoir-faire Linux Inc.
+# Copyright (c) 2015-2016 Savoir-faire Linux Inc.
 # Author(s): Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
 #            Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 #            Simon Désaulniers <sim.desaulniers@gmail.com>
@@ -139,12 +139,6 @@ cdef class SockAddr(object):
        return self._addr.setPort(port)
    def setFamily(SockAddr self, cpp.sa_family_t af):
        return self._addr.setFamily(af)
-    def isLoopback(SockAddr self):
-        return self._addr.isLoopback()
-    def isPrivate(SockAddr self):
-        return self._addr.isPrivate()
-    def isUnspecified(SockAddr self):
-        return self._addr.isUnspecified()
    def __str__(self):
        return self.toString().decode()
    def __repr__(self):
@@ -1,4 +1,4 @@
-# Copyright (c) 2015-2019 Savoir-faire Linux Inc.
+# Copyright (c) 2015-2016 Savoir-faire Linux Inc.
 # Author(s): Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 #            Simon Désaulniers <sim.desaulniers@gmail.com>
 #
@@ -77,9 +77,6 @@ cdef extern from "opendht/sockaddr.h" namespace "dht":
        void setPort(in_port_t p)
        sa_family_t getFamily() const
        void setFamily(sa_family_t f)
-        bool isLoopback() const
-        bool isPrivate() const
-        bool isUnspecified() const

 ctypedef vector[uint8_t] Blob

@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2019 Savoir-faire Linux Inc.
+# Copyright (C) 2015-2017 Savoir-faire Linux Inc.
 # Author: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
 # Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 #
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-# Copyright (C) 2015-2019 Savoir-faire Linux Inc.
+# Copyright (C) 2015-2016 Savoir-faire Linux Inc.
 # Author(s): Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 #            Simon Désaulniers <sim.desaulniers@gmail.com>
 #
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-# Copyright (c) 2015-2019 Savoir-faire Linux Inc.
+# Copyright (c) 2015-2016 Savoir-faire Linux Inc.
 # Author(s): Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 #            Simon Désaulniers <sim.desaulniers@gmail.com>
 #
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2015-2019 Savoir-Faire Linux Inc.
+# Copyright (C) 2015 Savoir-Faire Linux Inc.
 # Author(s): Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 #            Simon Désaulniers <sim.desaulniers@gmail.com>

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-# Copyright (c) 2015-2019 Savoir-faire Linux Inc.
+# Copyright (c) 2015-2016 Savoir-faire Linux Inc.
 # Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 #
 # This program is free software; you can redistribute it and/or modify
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-# Copyright (C) 2015-2019 Savoir-faire Linux Inc.
+# Copyright (C) 2015-2017 Savoir-faire Linux Inc.
 # Author(s): Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 #
 # This program is free software; you can redistribute it and/or modify
@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# Copyright (c) 2016-2019 Savoir-faire Linux Inc.
+# Copyright (c) 2016 Savoir-faire Linux Inc.
 # Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 #
 # This program is free software; you can redistribute it and/or modify
@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# Copyright (c) 2015-2019 Savoir-faire Linux Inc.
+# Copyright (c) 2015-2016 Savoir-faire Linux Inc.
 # Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 #
 # This program is free software; you can redistribute it and/or modify
@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# Copyright (c) 2015-2019 Savoir-faire Linux Inc.
+# Copyright (c) 2015-2017 Savoir-faire Linux Inc.
 # Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 #
 # This program is free software; you can redistribute it and/or modify
@@ -27,7 +27,7 @@ ping_node.run()
 pong_node = dht.DhtRunner()
 pong_node.run()
 #pong_node.enableLogging()
-pong_node.ping(ping_node.getBound())
+pong_node.ping(ping_node.getBound());

 loc_ping = dht.InfoHash.get("toto99")
 loc_pong = dht.InfoHash.get(str(loc_ping))
@@ -42,7 +42,7 @@ def done(h, ok):

 def ping(node, h):
 	global i
-	time.sleep(0.0075)
+	time.sleep(0.0075) 
 	i += 1
 	if i < MAX:
 		node.put(h, dht.Value(b"hey"), lambda ok, nodes: done(node.getNodeId().decode(), ok))
@@ -51,7 +51,7 @@ def ping(node, h):

 def pong(node, h):
 	print(node.getNodeId().decode(), "got ping", h, i)
-	loop.call_soon_threadsafe(ping, node, h)
+	loop.call_soon_threadsafe(ping, node, h);
 	return True

 ping_node.listen(loc_ping, lambda v: pong(pong_node, loc_pong))
@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# Copyright (c) 2015-2019 Savoir-faire Linux Inc.
+# Copyright (c) 2015-2016 Savoir-faire Linux Inc.
 # Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 #
 # This program is free software; you can redistribute it and/or modify
@@ -1,6 +1,6 @@
 lib_LTLIBRARIES = libopendht.la

-libopendht_la_CPPFLAGS = @CPPFLAGS@ -I$(top_srcdir)/include/opendht @Argon2_CFLAGS@ @JsonCpp_CFLAGS@ @MsgPack_CFLAGS@
+libopendht_la_CPPFLAGS = @CPPFLAGS@ -I$(top_srcdir)/include/opendht @Argon2_CFLAGS@ @JsonCpp_CFLAGS@
 libopendht_la_LIBADD   = @Argon2_LIBS@ @JsonCpp_LIBS@ @GnuTLS_LIBS@ @Nettle_LIBS@
 libopendht_la_LDFLAGS  = @LDFLAGS@ @Argon2_LDFLAGS@
 libopendht_la_SOURCES  = \
@@ -56,7 +56,7 @@ nobase_include_HEADERS = \
        ../include/opendht/rng.h

 if ENABLE_PROXY_SERVER
-libopendht_la_SOURCES += dht_proxy_server.cpp thread_pool.h thread_pool.cpp
+libopendht_la_SOURCES += dht_proxy_server.cpp
 nobase_include_HEADERS += ../include/opendht/dht_proxy_server.h
 endif

@@ -65,8 +65,8 @@ libopendht_la_SOURCES += dht_proxy_client.cpp
 nobase_include_HEADERS += ../include/opendht/dht_proxy_client.h ../include/opendht/dht_interface.h
 endif

-libopendht_la_SOURCES += base64.h base64.cpp
 if PROXY_CLIENT_OR_SERVER
+libopendht_la_SOURCES += base64.h base64.cpp
 nobase_include_HEADERS += ../include/opendht/proxy.h
 endif

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2004-2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2004-2017 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
@@ -17,8 +17,8 @@

 #include "base64.h"

-#include <cstdint>
-#include <cstdlib>
+#include <stdint.h>
+#include <stdlib.h>

 /* Mainly based on the following stackoverflow question:
 * http://stackoverflow.com/questions/342409/how-do-i-base64-encode-decode-in-c
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2004-2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2004-2017 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
@@ -4,7 +4,7 @@ namespace dht {


 GetCallbackSimple
-bindGetCb(const GetCallbackRaw& raw_cb, void* user_data)
+bindGetCb(GetCallbackRaw raw_cb, void* user_data)
 {
    if (not raw_cb) return {};
    return [=](const std::shared_ptr<Value>& value) {
@@ -13,7 +13,7 @@ bindGetCb(const GetCallbackRaw& raw_cb, void* user_data)
 }

 GetCallback
-bindGetCb(const GetCallbackSimple& cb)
+bindGetCb(GetCallbackSimple cb)
 {
    if (not cb) return {};
    return [=](const std::vector<std::shared_ptr<Value>>& values) {
@@ -25,7 +25,7 @@ bindGetCb(const GetCallbackSimple& cb)
 }

 ShutdownCallback
-bindShutdownCb(const ShutdownCallbackRaw& shutdown_cb_raw, void* user_data)
+bindShutdownCb(ShutdownCallbackRaw shutdown_cb_raw, void* user_data)
 {
    return [=]() { shutdown_cb_raw(user_data); };
 }
@@ -39,7 +39,7 @@ bindDoneCb(DoneCallbackSimple donecb)
 }

 DoneCallback
-bindDoneCb(const DoneCallbackRaw& raw_cb, void* user_data)
+bindDoneCb(DoneCallbackRaw raw_cb, void* user_data)
 {
    if (not raw_cb) return {};
    return [=](bool success, const std::vector<std::shared_ptr<Node>>& nodes) {
@@ -48,7 +48,7 @@ bindDoneCb(const DoneCallbackRaw& raw_cb, void* user_data)
 }

 DoneCallbackSimple
-bindDoneCbSimple(const DoneCallbackSimpleRaw& raw_cb, void* user_data) {
+bindDoneCbSimple(DoneCallbackSimpleRaw raw_cb, void* user_data) {
    if (not raw_cb) return {};
    return [=](bool success) {
        raw_cb(success, user_data);
@@ -62,7 +62,8 @@ NodeStats::toString() const
    ss << "Known nodes: " << good_nodes << " good, " << dubious_nodes << " dubious, " << incoming_nodes << " incoming." << std::endl;
    if (table_depth > 1) {
        ss << "Routing table depth: " << table_depth << std::endl;
-        ss << "Network size estimation: " << getNetworkSizeEstimation() << " nodes" << std::endl;
+        unsigned long tot_nodes = 8 * std::exp2(table_depth);
+        ss << "Network size estimation: " << tot_nodes << " nodes" << std::endl;
    }
    return ss.str();
 }
@@ -80,7 +81,8 @@ NodeStats::toJson() const
    val["incoming"] = static_cast<Json::LargestUInt>(incoming_nodes);
    if (table_depth > 1) {
        val["table_depth"] = static_cast<Json::LargestUInt>(table_depth);
-        val["network_size_estimation"] = static_cast<Json::LargestUInt>(getNetworkSizeEstimation());
+        unsigned long tot_nodes = 8 * std::exp2(table_depth);
+        val["network_size_estimation"] = static_cast<Json::LargestUInt>(tot_nodes);
    }
    return val;
 }
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 Savoir-faire Linux Inc.
 *  Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 *
 *  This program is free software; you can redistribute it and/or modify
@@ -40,6 +40,31 @@ static std::uniform_int_distribution<int> rand_byte{ 0, std::numeric_limits<uint
 static std::uniform_int_distribution<uint8_t> rand_byte;
 #endif

+static gnutls_digest_algorithm_t get_dig_for_pub(gnutls_pubkey_t pubkey)
+{
+    gnutls_digest_algorithm_t dig;
+    int result = gnutls_pubkey_get_preferred_hash_algorithm(pubkey, &dig, nullptr);
+    if (result < 0)
+        return GNUTLS_DIG_UNKNOWN;
+    return dig;
+}
+
+static gnutls_digest_algorithm_t get_dig(gnutls_x509_crt_t crt)
+{
+    gnutls_pubkey_t pubkey;
+    gnutls_pubkey_init(&pubkey);
+
+    int result = gnutls_pubkey_import_x509(pubkey, crt, 0);
+    if (result < 0) {
+        gnutls_pubkey_deinit(pubkey);
+        return GNUTLS_DIG_UNKNOWN;
+    }
+
+    gnutls_digest_algorithm_t dig = get_dig_for_pub(pubkey);
+    gnutls_pubkey_deinit(pubkey);
+    return dig;
+}
+
 // support for GnuTLS < 3.4.
 #if GNUTLS_VERSION_NUMBER < 0x030400
 #define GNUTLS_PKCS_PKCS12_3DES GNUTLS_PKCS_USE_PKCS12_3DES
@@ -352,19 +377,15 @@ PrivateKey::serialize(const std::string& password) const
 PublicKey
 PrivateKey::getPublicKey() const
 {
-    PublicKey pk;
-    if (auto err = gnutls_pubkey_import_privkey(pk.pk, key, GNUTLS_KEY_KEY_CERT_SIGN | GNUTLS_KEY_CRL_SIGN, 0))
-        throw CryptoException(std::string("Can't retreive public key: ") + gnutls_strerror(err));
-    return pk;
+    gnutls_pubkey_t pk;
+    gnutls_pubkey_init(&pk);
+    PublicKey pk_ret {pk};
+    if (gnutls_pubkey_import_privkey(pk, key, GNUTLS_KEY_KEY_CERT_SIGN | GNUTLS_KEY_CRL_SIGN, 0) != GNUTLS_E_SUCCESS)
+        return {};
+    return pk_ret;
 }

-PublicKey::PublicKey()
-{
-    if (auto err = gnutls_pubkey_init(&pk))
-        throw CryptoException(std::string("Can't initialize public key: ") + gnutls_strerror(err));
-}
-
-PublicKey::PublicKey(const Blob& dat) : PublicKey()
+PublicKey::PublicKey(const Blob& dat) : pk(nullptr)
 {
    unpack(dat.data(), dat.size());
 }
@@ -394,7 +415,8 @@ PublicKey::pack(Blob& b) const
        throw CryptoException(std::string("Could not export public key: null key"));
    std::vector<uint8_t> tmp(2048);
    size_t sz = tmp.size();
-    if (int err = gnutls_pubkey_export(pk, GNUTLS_X509_FMT_DER, tmp.data(), &sz))
+    int err = gnutls_pubkey_export(pk, GNUTLS_X509_FMT_DER, tmp.data(), &sz);
+    if (err != GNUTLS_E_SUCCESS)
        throw CryptoException(std::string("Could not export public key: ") + gnutls_strerror(err));
    tmp.resize(sz);
    b.insert(b.end(), tmp.begin(), tmp.end());
@@ -403,6 +425,9 @@ PublicKey::pack(Blob& b) const
 void
 PublicKey::unpack(const uint8_t* data, size_t data_size)
 {
+    if (pk)
+        gnutls_pubkey_deinit(pk);
+    gnutls_pubkey_init(&pk);
    const gnutls_datum_t dat {(uint8_t*)data, (unsigned)data_size};
    int err = gnutls_pubkey_import(pk, &dat, GNUTLS_X509_FMT_PEM);
    if (err != GNUTLS_E_SUCCESS)
@@ -421,9 +446,10 @@ PublicKey::toString() const
    int err = gnutls_pubkey_export(pk, GNUTLS_X509_FMT_PEM, (void*)ret.data(), &sz);
    if (err ==  GNUTLS_E_SHORT_MEMORY_BUFFER) {
        ret.resize(sz);
-        err = gnutls_pubkey_export(pk, GNUTLS_X509_FMT_PEM, (void*)ret.data(), &sz);
-    }
-    if (err != GNUTLS_E_SUCCESS)
+        int err = gnutls_pubkey_export(pk, GNUTLS_X509_FMT_PEM, (void*)ret.data(), &sz);
+        if (err != GNUTLS_E_SUCCESS)
+            throw CryptoException(std::string("Could not print public key: ") + gnutls_strerror(err));
+    } else if (err != GNUTLS_E_SUCCESS)
        throw CryptoException(std::string("Could not print public key: ") + gnutls_strerror(err));
    return ret;
 }
@@ -546,180 +572,7 @@ PublicKey::getLongId() const
 #endif
 }

-gnutls_digest_algorithm_t
-PublicKey::getPreferredDigest() const
-{
-    gnutls_digest_algorithm_t dig;
-    int result = gnutls_pubkey_get_preferred_hash_algorithm(pk, &dig, nullptr);
-    if (result < 0)
-        return GNUTLS_DIG_UNKNOWN;
-    return dig;
-}
-
-// Certificate Request
-
-static NameType
-typeFromGnuTLS(gnutls_x509_subject_alt_name_t type)
-{
-    switch(type) {
-    case GNUTLS_SAN_DNSNAME:
-        return NameType::DNS;
-    case GNUTLS_SAN_RFC822NAME:
-        return NameType::RFC822;
-    case GNUTLS_SAN_URI:
-        return NameType::URI;
-    case GNUTLS_SAN_IPADDRESS:
-        return NameType::IP;
-    default:
-        return NameType::UNKNOWN;
-    }
-}
-
-static gnutls_x509_subject_alt_name_t
-GnuTLSFromType(NameType type)
-{
-    switch(type) {
-    case NameType::DNS:
-        return GNUTLS_SAN_DNSNAME;
-    case NameType::RFC822:
-        return GNUTLS_SAN_RFC822NAME;
-    case NameType::URI:
-        return GNUTLS_SAN_URI;
-    case NameType::IP:
-        return GNUTLS_SAN_IPADDRESS;
-    default:
-        return (gnutls_x509_subject_alt_name_t)0;
-    }
-}
-
-static std::string
-getDN(gnutls_x509_crq_t request, const char* oid)
-{
-    std::string dn;
-    dn.resize(512);
-    size_t dn_sz = dn.size();
-    int ret = gnutls_x509_crq_get_dn_by_oid(request, oid, 0, 0, &(*dn.begin()), &dn_sz);
-    if (ret != GNUTLS_E_SUCCESS)
-        return {};
-    dn.resize(dn_sz);
-    return dn;
-}
-
-CertificateRequest::CertificateRequest()
-{
-    if (auto err = gnutls_x509_crq_init(&request))
-        throw CryptoException(std::string("Can't initialize certificate request: ") + gnutls_strerror(err));
-}
-
-CertificateRequest::CertificateRequest(const uint8_t* data, size_t size) : CertificateRequest()
-{
-    const gnutls_datum_t dat {(uint8_t*)data, (unsigned)size};
-    if (auto err = gnutls_x509_crq_import(request, &dat, GNUTLS_X509_FMT_PEM))
-        throw CryptoException(std::string("Can't import certificate request: ") + gnutls_strerror(err));
-}
-
-CertificateRequest::~CertificateRequest()
-{
-    if (request) {
-        gnutls_x509_crq_deinit(request);
-        request = nullptr;
-    }
-}
-
-CertificateRequest&
-CertificateRequest::operator=(CertificateRequest&& o) noexcept
-{
-    if (request)
-        gnutls_x509_crq_deinit(request);
-    request = o.request;
-    o.request = nullptr;
-    return *this;
-}
-
-void
-CertificateRequest::setAltName(NameType type, const std::string& name)
-{
-    gnutls_x509_crq_set_subject_alt_name(request, GnuTLSFromType(type), name.data(), name.size(), 0);
-}
-
-void
-CertificateRequest::setName(const std::string& name)
-{
-    gnutls_x509_crq_set_dn_by_oid(request, GNUTLS_OID_X520_COMMON_NAME, 0, name.data(), name.length());
-}
-
-std::string
-CertificateRequest::getName() const
-{
-    return getDN(request, GNUTLS_OID_X520_COMMON_NAME);
-}
-
-std::string
-CertificateRequest::getUID() const
-{
-    return getDN(request, GNUTLS_OID_LDAP_UID);
-}
-
-void
-CertificateRequest::setUID(const std::string& uid)
-{
-    gnutls_x509_crq_set_dn_by_oid(request, GNUTLS_OID_LDAP_UID, 0, uid.data(), uid.length());
-}
-
-void
-CertificateRequest::sign(const PrivateKey& key, const std::string& password)
-{
-    gnutls_x509_crq_set_version(request, 1);
-    if (not password.empty())
-        gnutls_x509_crq_set_challenge_password(request, password.c_str());
-
-    if (auto err = gnutls_x509_crq_set_key(request,  key.x509_key))
-        throw CryptoException(std::string("Can't set certificate request key: ") + gnutls_strerror(err));
-
-#if GNUTLS_VERSION_NUMBER < 0x030601
-    if (auto err = gnutls_x509_crq_privkey_sign(request, key.key, key.getPublicKey().getPreferredDigest(), 0))
-        throw CryptoException(std::string("Can't sign certificate request: ") + gnutls_strerror(err));
-#else
-    if (auto err = gnutls_x509_crq_privkey_sign(request, key.key, GNUTLS_DIG_UNKNOWN, 0))
-        throw CryptoException(std::string("Can't sign certificate request: ") + gnutls_strerror(err));
-#endif
-}
-
-bool
-CertificateRequest::verify() const 
-{
-    return gnutls_x509_crq_verify(request, 0) >= 0;
-}
-
-Blob 
-CertificateRequest::pack() const 
-{
-    gnutls_datum_t dat {nullptr, 0};
-    if (auto err = gnutls_x509_crq_export2(request, GNUTLS_X509_FMT_PEM, &dat))
-        throw CryptoException(std::string("Can't export certificate request: ") + gnutls_strerror(err));
-    Blob ret(dat.data, dat.data + dat.size);
-    gnutls_free(dat.data);
-    return ret;
-}
-
-// Certificate
-
-static std::string
-getDN(gnutls_x509_crt_t cert, const char* oid, bool issuer = false)
-{
-    std::string dn;
-    dn.resize(512);
-    size_t dn_sz = dn.size();
-    int ret = issuer
-            ? gnutls_x509_crt_get_issuer_dn_by_oid(cert, oid, 0, 0, &(*dn.begin()), &dn_sz)
-            : gnutls_x509_crt_get_dn_by_oid(       cert, oid, 0, 0, &(*dn.begin()), &dn_sz);
-    if (ret != GNUTLS_E_SUCCESS)
-        return {};
-    dn.resize(dn_sz);
-    return dn;
-}
-
-Certificate::Certificate(const Blob& certData)
+Certificate::Certificate(const Blob& certData) : cert(nullptr)
 {
    unpack(certData.data(), certData.size());
 }
@@ -803,9 +656,11 @@ Certificate::~Certificate()
 PublicKey
 Certificate::getPublicKey() const
 {
-    PublicKey pk_ret;
-    if (auto err = gnutls_pubkey_import_x509(pk_ret.pk, cert, 0))
-        throw CryptoException(std::string("Can't get certificate public key: ") + gnutls_strerror(err));
+    gnutls_pubkey_t pk;
+    gnutls_pubkey_init(&pk);
+    PublicKey pk_ret(pk);
+    if (gnutls_pubkey_import_x509(pk, cert, 0) != GNUTLS_E_SUCCESS)
+        return {};
    return pk_ret;
 }

@@ -841,6 +696,21 @@ Certificate::getLongId() const
 #endif
 }

+static std::string
+getDN(gnutls_x509_crt_t cert, const char* oid, bool issuer = false)
+{
+    std::string dn;
+    dn.resize(512);
+    size_t dn_sz = dn.size();
+    int ret = issuer
+            ? gnutls_x509_crt_get_issuer_dn_by_oid(cert, oid, 0, 0, &(*dn.begin()), &dn_sz)
+            : gnutls_x509_crt_get_dn_by_oid(       cert, oid, 0, 0, &(*dn.begin()), &dn_sz);
+    if (ret != GNUTLS_E_SUCCESS)
+        return {};
+    dn.resize(dn_sz);
+    return dn;
+}
+
 std::string
 Certificate::getName() const
 {
@@ -865,7 +735,24 @@ Certificate::getIssuerUID() const
    return getDN(cert, GNUTLS_OID_LDAP_UID, true);
 }

-std::vector<std::pair<NameType, std::string>>
+static Certificate::NameType
+typeFromGnuTLS(gnutls_x509_subject_alt_name_t type)
+{
+    switch(type) {
+    case GNUTLS_SAN_DNSNAME:
+        return Certificate::NameType::DNS;
+    case GNUTLS_SAN_RFC822NAME:
+        return Certificate::NameType::RFC822;
+    case GNUTLS_SAN_URI:
+        return Certificate::NameType::URI;
+    case GNUTLS_SAN_IPADDRESS:
+        return Certificate::NameType::IP;
+    default:
+        return Certificate::NameType::UNKNOWN;
+    }
+}
+
+std::vector<std::pair<Certificate::NameType, std::string>>
 Certificate::getAltNames() const
 {
    std::vector<std::pair<NameType, std::string>> names;
@@ -980,14 +867,6 @@ Certificate::getExpiration() const
    return std::chrono::system_clock::from_time_t(t);
 }

-gnutls_digest_algorithm_t
-Certificate::getPreferredDigest() const
-{
-    return getPublicKey().getPreferredDigest();
-}
-
-// PrivateKey
-
 PrivateKey
 PrivateKey::generate(unsigned key_length)
 {
@@ -1017,7 +896,7 @@ PrivateKey::generateEC()
 }

 Identity
-generateIdentity(const std::string& name, const Identity& ca, unsigned key_length, bool is_ca)
+generateIdentity(const std::string& name, crypto::Identity ca, unsigned key_length, bool is_ca)
 {
    auto key = std::make_shared<PrivateKey>(PrivateKey::generate(key_length));
    auto cert = std::make_shared<Certificate>(Certificate::generate(*key, name, ca, is_ca));
@@ -1026,12 +905,12 @@ generateIdentity(const std::string& name, const Identity& ca, unsigned key_lengt


 Identity
-generateIdentity(const std::string& name, const Identity& ca, unsigned key_length) {
+generateIdentity(const std::string& name, Identity ca, unsigned key_length) {
    return generateIdentity(name, ca, key_length, !ca.first || !ca.second);
 }

 Identity
-generateEcIdentity(const std::string& name, const Identity& ca, bool is_ca)
+generateEcIdentity(const std::string& name, crypto::Identity ca, bool is_ca)
 {
    auto key = std::make_shared<PrivateKey>(PrivateKey::generateEC());
    auto cert = std::make_shared<Certificate>(Certificate::generate(*key, name, ca, is_ca));
@@ -1039,40 +918,25 @@ generateEcIdentity(const std::string& name, const Identity& ca, bool is_ca)
 }

 Identity
-generateEcIdentity(const std::string& name, const Identity& ca) {
+generateEcIdentity(const std::string& name, Identity ca) {
    return generateEcIdentity(name, ca, !ca.first || !ca.second);
 }

-void
-setValidityPeriod(gnutls_x509_crt_t cert, int64_t validity)
-{
-    int64_t now = time(nullptr);
-    /* 2038 bug: don't allow time wrap */
-    auto boundTime = [](int64_t t) -> time_t {
-        return std::min<int64_t>(t, std::numeric_limits<time_t>::max());
-    };
-    gnutls_x509_crt_set_activation_time(cert, boundTime(now));
-    gnutls_x509_crt_set_expiration_time(cert, boundTime(now + validity));
-}
-
-void
-setRandomSerial(gnutls_x509_crt_t cert)
-{
-    random_device rdev;
-    std::uniform_int_distribution<uint64_t> dist{};
-    uint64_t cert_serial = dist(rdev);
-    gnutls_x509_crt_set_serial(cert, &cert_serial, sizeof(cert_serial));
-}
-
 Certificate
-Certificate::generate(const PrivateKey& key, const std::string& name, const Identity& ca, bool is_ca)
+Certificate::generate(const PrivateKey& key, const std::string& name, Identity ca, bool is_ca)
 {
    gnutls_x509_crt_t cert;
    if (not key.x509_key or gnutls_x509_crt_init(&cert) != GNUTLS_E_SUCCESS)
        return {};
    Certificate ret {cert};

-    setValidityPeriod(cert, 10 * 365 * 24 * 60 * 60);
+    int64_t now = time(NULL);
+    /* 2038 bug: don't allow time wrap */
+    auto boundTime = [](int64_t t) -> time_t {
+        return std::min<int64_t>(t, std::numeric_limits<time_t>::max());
+    };
+    gnutls_x509_crt_set_activation_time(cert, boundTime(now));
+    gnutls_x509_crt_set_expiration_time(cert, boundTime(now + (10 * 365 * 24 * 60 * 60)));
    if (gnutls_x509_crt_set_key(cert, key.x509_key) != GNUTLS_E_SUCCESS) {
        std::cerr << "Error when setting certificate key" << std::endl;
        return {};
@@ -1083,15 +947,19 @@ Certificate::generate(const PrivateKey& key, const std::string& name, const Iden
    }

    // TODO: compute the subject key using the recommended RFC method
-    auto pk = key.getPublicKey();
-    auto pk_id = pk.getId();
+    auto pk_id = key.getPublicKey().getId();
    const std::string uid_str = pk_id.toString();

    gnutls_x509_crt_set_subject_key_id(cert, &pk_id, sizeof(pk_id));
    gnutls_x509_crt_set_dn_by_oid(cert, GNUTLS_OID_X520_COMMON_NAME, 0, name.data(), name.length());
    gnutls_x509_crt_set_dn_by_oid(cert, GNUTLS_OID_LDAP_UID, 0, uid_str.data(), uid_str.length());

-    setRandomSerial(cert);
+    {
+        random_device rdev;
+        std::uniform_int_distribution<uint64_t> dist{};
+        uint64_t cert_serial = dist(rdev);
+        gnutls_x509_crt_set_serial(cert, &cert_serial, sizeof(cert_serial));
+    }

    unsigned key_usage = 0;
    if (is_ca) {
@@ -1107,13 +975,15 @@ Certificate::generate(const PrivateKey& key, const std::string& name, const Iden
            // Signing certificate must be CA.
            return {};
        }
-        if (gnutls_x509_crt_privkey_sign(cert, ca.second->cert, ca.first->key, pk.getPreferredDigest(), 0) != GNUTLS_E_SUCCESS) {
+        //if (gnutls_x509_crt_sign2(cert, ca.second->cert, ca.first->x509_key, get_dig(cert), 0) != GNUTLS_E_SUCCESS) {
+        if (gnutls_x509_crt_privkey_sign(cert, ca.second->cert, ca.first->key, get_dig(cert), 0) != GNUTLS_E_SUCCESS) {
            std::cerr << "Error when signing certificate" << std::endl;
            return {};
        }
        ret.issuer = ca.second;
    } else {
-        if (gnutls_x509_crt_privkey_sign(cert, cert, key.key, pk.getPreferredDigest(), 0) != GNUTLS_E_SUCCESS) {
+        //if (gnutls_x509_crt_sign2(cert, cert, key, get_dig(cert), 0) != GNUTLS_E_SUCCESS) {
+        if (gnutls_x509_crt_privkey_sign(cert, cert, key.key, get_dig(cert), 0) != GNUTLS_E_SUCCESS) {
            std::cerr << "Error when signing certificate" << std::endl;
            return {};
        }
@@ -1122,31 +992,6 @@ Certificate::generate(const PrivateKey& key, const std::string& name, const Iden
    return ret.getPacked();
 }

-Certificate
-Certificate::generate(const CertificateRequest& request, const Identity& ca)
-{
-    gnutls_x509_crt_t cert;
-    if (auto err = gnutls_x509_crt_init(&cert))
-        throw CryptoException(std::string("Can't initialize certificate: ") + gnutls_strerror(err));
-    Certificate ret {cert};
-    if (auto err = gnutls_x509_crt_set_crq(cert, request.get()))
-        throw CryptoException(std::string("Can't initialize certificate: ") + gnutls_strerror(err));
-
-    if (auto err = gnutls_x509_crt_set_version(cert, 3)) {
-        throw CryptoException(std::string("Can't set certificate version: ") + gnutls_strerror(err));
-    }
-
-    setValidityPeriod(cert, 10 * 365 * 24 * 60 * 60);
-    setRandomSerial(cert);
-
-    if (auto err = gnutls_x509_crt_privkey_sign(cert, ca.second->cert, ca.first->key, ca.second->getPreferredDigest(), 0)) {
-        throw CryptoException(std::string("Can't sign certificate: ") + gnutls_strerror(err));
-    }
-    ret.issuer = ca.second;
-
-    return ret.getPacked();
-}
-
 std::vector<std::shared_ptr<RevocationList>>
 Certificate::getRevocationLists() const
 {
@@ -1157,8 +1002,6 @@ Certificate::getRevocationLists() const
    return ret;
 }

-// RevocationList
-
 RevocationList::RevocationList()
 {
    gnutls_x509_crl_init(&crl);
@@ -1376,8 +1219,6 @@ RevocationList::toString() const
    return ret;
 }

-// TrustList
-
 TrustList::TrustList() {
    gnutls_x509_trust_list_init(&trust, 0);
 }
@@ -1387,11 +1228,11 @@ TrustList::~TrustList() {
 }

 TrustList&
-TrustList::operator=(TrustList&& o) noexcept
+TrustList::operator=(TrustList&& o)
 {
    if (trust)
        gnutls_x509_trust_list_deinit(trust, true);
-    trust = o.trust;
+    trust = std::move(o.trust);
    o.trust = nullptr;
    return *this;
 }
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 Savoir-faire Linux Inc.
 *  Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 *
 *  This program is free software; you can redistribute it and/or modify
@@ -38,7 +38,7 @@ DhtMessage::storePolicy(InfoHash h, std::shared_ptr<Value>& v, const InfoHash& f
 }

 Value::Filter
-DhtMessage::ServiceFilter(const std::string& s)
+DhtMessage::ServiceFilter(std::string s)
 {
    return Value::Filter::chain(
        Value::TypeFilter(TYPE),
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2016-2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2016-2018 Savoir-faire Linux Inc.
 *  Author: Sébastien Blin <sebastien.blin@savoirfairelinux.com>
 *          Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 *
@@ -17,6 +17,8 @@
 *  along with this program. If not, see <https://www.gnu.org/licenses/>.
 */

+#if OPENDHT_PROXY_CLIENT
+
 #include "dht_proxy_client.h"

 #include "dhtrunner.h"
@@ -43,29 +45,33 @@ struct DhtProxyClient::ListenState {

 struct DhtProxyClient::Listener
 {
-    OpValueCache cache;
+    ValueCache cache;
+    Sp<Scheduler::Job> cacheExpirationJob {};
    ValueCallback cb;
    Value::Filter filter;
    Sp<restbed::Request> req;
    std::thread thread;
    unsigned callbackId;
    Sp<ListenState> state;
+    Sp<proxy::ListenToken> pushNotifToken;
    Sp<Scheduler::Job> refreshJob;
-    Listener(OpValueCache&& c, const Sp<restbed::Request>& r, Value::Filter&& f)
-        : cache(std::move(c)), filter(std::move(f)),req(r) {}
+    Listener(ValueCache&& c, Sp<Scheduler::Job>&& j, const Sp<restbed::Request>& r, Value::Filter&& f)
+        : cache(std::move(c)),
+          cacheExpirationJob(std::move(j)),
+          filter(std::move(f)),
+          req(r)
+    {}
 };

 struct PermanentPut {
    Sp<Value> value;
    Sp<Scheduler::Job> refreshJob;
    Sp<std::atomic_bool> ok;
-    PermanentPut(const Sp<Value>& v, Sp<Scheduler::Job>&& j, const Sp<std::atomic_bool>& o)
-        : value(v), refreshJob(std::move(j)), ok(o) {}
 };

 struct DhtProxyClient::ProxySearch {
    SearchCache ops {};
-    Sp<Scheduler::Job> opExpirationJob {};
+    Sp<Scheduler::Job> opExpirationJob;
    std::map<size_t, Listener> listeners {};
    std::map<Value::Id, PermanentPut> puts {};
 };
@@ -75,8 +81,6 @@ DhtProxyClient::DhtProxyClient() {}
 DhtProxyClient::DhtProxyClient(std::function<void()> signal, const std::string& serverHost, const std::string& pushClientId)
 : serverHost_(serverHost), pushClientId_(pushClientId), loopSignal_(signal)
 {
-    if (serverHost_.find("://") == std::string::npos)
-        serverHost_ = proxy::HTTP_PROTO + serverHost_;
    if (!serverHost_.empty())
        startProxy();
 }
@@ -94,7 +98,6 @@ DhtProxyClient::startProxy()
    if (serverHost_.empty()) return;
    DHT_LOG.w("Staring proxy client to %s", serverHost_.c_str());
    nextProxyConfirmation = scheduler.add(scheduler.time(), std::bind(&DhtProxyClient::confirmProxy, this));
-    listenerRestart = std::make_shared<Scheduler::Job>(std::bind(&DhtProxyClient::restartListeners, this));
    loopSignal_();
 }

@@ -240,7 +243,7 @@ void
 DhtProxyClient::get(const InfoHash& key, GetCallback cb, DoneCallback donecb, Value::Filter&& f, Where&& w)
 {
    DHT_LOG.d(key, "[search %s]: get", key.to_c_str());
-    restbed::Uri uri(serverHost_ + "/" + key.toString());
+    restbed::Uri uri(proxy::HTTP_PROTO + serverHost_ + "/" + key.toString());
    auto req = std::make_shared<restbed::Request>(uri);
    Value::Filter filter = w.empty() ? f : f.chain(w.getFilter());

@@ -251,60 +254,54 @@ DhtProxyClient::get(const InfoHash& key, GetCallback cb, DoneCallback donecb, Va
    o.thread = std::thread([=](){
        // Try to contact the proxy and set the status to connected when done.
        // will change the connectivity status
-        struct GetState{ std::atomic_bool ok {true}; std::atomic_bool stop {false}; };
-        auto state = std::make_shared<GetState>();
-        try {
-            restbed::Http::async(req,
-                [=](const std::shared_ptr<restbed::Request>& req,
-                    const std::shared_ptr<restbed::Response>& reply) {
-                auto code = reply->get_status_code();
+        auto ok = std::make_shared<std::atomic_bool>(true);
+        restbed::Http::async(req,
+            [=](const std::shared_ptr<restbed::Request>& req,
+                const std::shared_ptr<restbed::Response>& reply) {
+            auto code = reply->get_status_code();

-                if (code == 200) {
-                    try {
-                        while (restbed::Http::is_open(req) and not *finished and not state->stop) {
-                            restbed::Http::fetch("\n", reply);
-                            if (*finished or state->stop)
-                                break;
-                            std::string body;
-                            reply->get_body(body);
-                            reply->set_body(""); // Reset the body for the next fetch
+            if (code == 200) {
+                try {
+                    while (restbed::Http::is_open(req) and not *finished) {
+                        restbed::Http::fetch("\n", reply);
+                        if (*finished)
+                            break;
+                        std::string body;
+                        reply->get_body(body);
+                        reply->set_body(""); // Reset the body for the next fetch

-                            std::string err;
-                            Json::Value json;
-                            Json::CharReaderBuilder rbuilder;
-                            auto* char_data = reinterpret_cast<const char*>(&body[0]);
-                            auto reader = std::unique_ptr<Json::CharReader>(rbuilder.newCharReader());
-                            if (reader->parse(char_data, char_data + body.size(), &json, &err)) {
-                                auto value = std::make_shared<Value>(json);
-                                if ((not filter or filter(*value)) and cb) {
-                                    std::lock_guard<std::mutex> lock(lockCallbacks);
-                                    callbacks_.emplace_back([cb, value, state]() {
-                                        if (not state->stop and not cb({value}))
-                                            state->stop = true;
-                                    });
-                                    loopSignal_();
-                                }
-                            } else {
-                                state->ok = false;
+                        std::string err;
+                        Json::Value json;
+                        Json::CharReaderBuilder rbuilder;
+                        auto* char_data = reinterpret_cast<const char*>(&body[0]);
+                        auto reader = std::unique_ptr<Json::CharReader>(rbuilder.newCharReader());
+                        if (reader->parse(char_data, char_data + body.size(), &json, &err)) {
+                            auto value = std::make_shared<Value>(json);
+                            if ((not filter or filter(*value)) and cb) {
+                                std::lock_guard<std::mutex> lock(lockCallbacks);
+                                callbacks_.emplace_back([cb, value, finished]() {
+                                    if (not *finished and not cb({value}))
+                                        *finished = true;
+                                });
+                                loopSignal_();
                            }
+                        } else {
+                            *ok = false;
                        }
-                    } catch (std::runtime_error& e) { }
-                } else {
-                    state->ok = false;
-                }
-            }).wait();
-        } catch(const std::exception& e) {
-            state->ok = false;
-        }
+                    }
+                } catch (std::runtime_error& e) { }
+            } else {
+                *ok = false;
+            }
+        }).wait();
        if (donecb) {
            std::lock_guard<std::mutex> lock(lockCallbacks);
            callbacks_.emplace_back([=](){
-                donecb(state->ok, {});
-                state->stop = true;
+                donecb(*ok, {});
            });
            loopSignal_();
        }
-        if (!state->ok) {
+        if (!ok) {
            // Connection failed, update connectivity
            opFailed();
        }
@@ -333,26 +330,24 @@ DhtProxyClient::put(const InfoHash& key, Sp<Value> val, DoneCallback cb, time_po
    if (permanent) {
        std::lock_guard<std::mutex> lock(searchLock_);
        auto id = val->id;
-        auto& search = searches_[key];
+        auto search = searches_.emplace(key, ProxySearch{}).first;
        auto nextRefresh = scheduler.time() + proxy::OP_TIMEOUT - proxy::OP_MARGIN;
        auto ok = std::make_shared<std::atomic_bool>(false);
-        search.puts.erase(id);
-        search.puts.emplace(std::piecewise_construct,
-            std::forward_as_tuple(id),
-            std::forward_as_tuple(val, scheduler.add(nextRefresh, [this, key, id, ok]{
-                std::lock_guard<std::mutex> lock(searchLock_);
-                auto s = searches_.find(key);
-                if (s != searches_.end()) {
-                    auto p = s->second.puts.find(id);
-                    if (p != s->second.puts.end()) {
-                        doPut(key, p->second.value,
-                        [ok](bool result, const std::vector<std::shared_ptr<dht::Node> >&){
-                            *ok = result;
-                        }, time_point::max(), true);
-                        scheduler.edit(p->second.refreshJob, scheduler.time() + proxy::OP_TIMEOUT - proxy::OP_MARGIN);
-                    }
+        search->second.puts.erase(id);
+        search->second.puts.emplace(id, PermanentPut {val, scheduler.add(nextRefresh, [this, key, id, ok]{
+            std::lock_guard<std::mutex> lock(searchLock_);
+            auto s = searches_.find(key);
+            if (s != searches_.end()) {
+                auto p = s->second.puts.find(id);
+                if (p != s->second.puts.end()) {
+                    doPut(key, p->second.value,
+                    [ok](bool result, const std::vector<std::shared_ptr<dht::Node> >&){
+                        *ok = !result;
+                    }, time_point::max(), true);
+                    scheduler.edit(p->second.refreshJob, scheduler.time() + proxy::OP_TIMEOUT - proxy::OP_MARGIN);
                }
-            }), ok));
+            }
+        }), ok});
    }
    doPut(key, val, std::move(cb), created, permanent);
 }
@@ -361,7 +356,7 @@ void
 DhtProxyClient::doPut(const InfoHash& key, Sp<Value> val, DoneCallback cb, time_point /*created*/, bool permanent)
 {
    DHT_LOG.d(key, "[search %s] performing put of %s", key.to_c_str(), val->toString().c_str());
-    restbed::Uri uri(serverHost_ + "/" + key.toString());
+    restbed::Uri uri(proxy::HTTP_PROTO + serverHost_ + "/" + key.toString());
    auto req = std::make_shared<restbed::Request>(uri);
    req->set_method("POST");

@@ -370,7 +365,7 @@ DhtProxyClient::doPut(const InfoHash& key, Sp<Value> val, DoneCallback cb, time_
        if (deviceKey_.empty()) {
            json["permanent"] = true;
        } else {
-#ifdef OPENDHT_PUSH_NOTIFICATIONS
+#if OPENDHT_PUSH_NOTIFICATIONS
            Json::Value refresh;
            getPushRequest(refresh);
            json["permanent"] = refresh;
@@ -392,36 +387,32 @@ DhtProxyClient::doPut(const InfoHash& key, Sp<Value> val, DoneCallback cb, time_
    o.finished = finished;
    o.thread = std::thread([=](){
        auto ok = std::make_shared<std::atomic_bool>(true);
-        try {
-            restbed::Http::async(req,
-                [ok](const std::shared_ptr<restbed::Request>& /*req*/,
-                            const std::shared_ptr<restbed::Response>& reply) {
-                auto code = reply->get_status_code();
+        restbed::Http::async(req,
+            [ok](const std::shared_ptr<restbed::Request>& /*req*/,
+                        const std::shared_ptr<restbed::Response>& reply) {
+            auto code = reply->get_status_code();

-                if (code == 200) {
-                    restbed::Http::fetch("\n", reply);
-                    std::string body;
-                    reply->get_body(body);
-                    reply->set_body(""); // Reset the body for the next fetch
+            if (code == 200) {
+                restbed::Http::fetch("\n", reply);
+                std::string body;
+                reply->get_body(body);
+                reply->set_body(""); // Reset the body for the next fetch

-                    try {
-                        std::string err;
-                        Json::Value json;
-                        Json::CharReaderBuilder rbuilder;
-                        auto* char_data = reinterpret_cast<const char*>(&body[0]);
-                        auto reader = std::unique_ptr<Json::CharReader>(rbuilder.newCharReader());
-                        if (not reader->parse(char_data, char_data + body.size(), &json, &err))
-                            *ok = false;
-                    } catch (...) {
+                try {
+                    std::string err;
+                    Json::Value json;
+                    Json::CharReaderBuilder rbuilder;
+                    auto* char_data = reinterpret_cast<const char*>(&body[0]);
+                    auto reader = std::unique_ptr<Json::CharReader>(rbuilder.newCharReader());
+                    if (not reader->parse(char_data, char_data + body.size(), &json, &err))
                        *ok = false;
-                    }
-                } else {
+                } catch (...) {
                    *ok = false;
                }
-            }).wait();
-        } catch(const std::exception& e) {
-            *ok = false;
-        }
+            } else {
+                *ok = false;
+            }
+        }).wait();
        if (cb) {
            std::lock_guard<std::mutex> lock(lockCallbacks);
            callbacks_.emplace_back([=](){
@@ -524,14 +515,7 @@ DhtProxyClient::getProxyInfos()
    }
    statusThread_ = std::thread([this, serverHost, infoState]{
        try {
-            auto endpointStr = serverHost;
-            auto protocol = std::string(proxy::HTTP_PROTO);
-            auto protocolIdx = serverHost.find("://");
-            if (protocolIdx != std::string::npos) {
-                protocol = endpointStr.substr(0, protocolIdx + 3);
-                endpointStr = endpointStr.substr(protocolIdx + 3);
-            }
-            auto hostAndService = splitPort(endpointStr);
+            auto hostAndService = splitPort(serverHost);
            auto resolved_proxies = SockAddr::resolve(hostAndService.first, hostAndService.second);
            std::vector<std::future<Sp<restbed::Response>>> reqs;
            reqs.reserve(resolved_proxies.size());
@@ -540,9 +524,9 @@ DhtProxyClient::getProxyInfos()
                if (resolved_proxy.getFamily() == AF_INET6) {
                    // HACK restbed seems to not correctly handle directly http://[ipv6]
                    // See https://github.com/Corvusoft/restbed/issues/290.
-                    server = endpointStr;
+                    server = serverHost;
                }
-                restbed::Uri uri(protocol + server + "/");
+                restbed::Uri uri(proxy::HTTP_PROTO + server + "/");
                auto req = std::make_shared<restbed::Request>(uri);
                if (infoState->cancel)
                    return;
@@ -592,8 +576,6 @@ DhtProxyClient::getProxyInfos()
 void
 DhtProxyClient::onProxyInfos(const Json::Value& proxyInfos, sa_family_t family)
 {
-    if (isDestroying_)
-        return;
    std::lock_guard<std::mutex> l(lockCurrentProxyInfos_);
    auto oldStatus = std::max(statusIpv4_, statusIpv6_);
    auto& status = family == AF_INET ? statusIpv4_ : statusIpv6_;
@@ -627,7 +609,7 @@ DhtProxyClient::onProxyInfos(const Json::Value& proxyInfos, sa_family_t family)
    auto newStatus = std::max(statusIpv4_, statusIpv6_);
    if (newStatus == NodeStatus::Connected) {
        if (oldStatus == NodeStatus::Disconnected || oldStatus == NodeStatus::Connecting) {
-            scheduler.edit(listenerRestart, scheduler.time());
+            restartListeners();
        }
        scheduler.edit(nextProxyConfirmation, scheduler.time() + std::chrono::minutes(15));
    }
@@ -660,72 +642,13 @@ DhtProxyClient::getPublicAddress(sa_family_t family)
 size_t
 DhtProxyClient::listen(const InfoHash& key, ValueCallback cb, Value::Filter filter, Where where) {
    DHT_LOG.d(key, "[search %s]: listen", key.to_c_str());
-    auto& search = searches_[key];
+    auto it = searches_.find(key);
+    if (it == searches_.end()) {
+        it = searches_.emplace(key, ProxySearch{}).first;
+    }
    auto query = std::make_shared<Query>(Select{}, where);
-    auto token = search.ops.listen(cb, query, filter, [this, key, filter](Sp<Query> /*q*/, ValueCallback cb, SyncCallback /*scb*/) -> size_t {
-        scheduler.syncTime();
-        restbed::Uri uri(serverHost_ + "/" + key.toString());
-        std::lock_guard<std::mutex> lock(searchLock_);
-        auto search = searches_.find(key);
-        if (search == searches_.end()) {
-            DHT_LOG.e(key, "[search %s] listen: search not found", key.to_c_str());
-            return 0;
-        }
-        DHT_LOG.d(key, "[search %s] sending %s", key.to_c_str(), deviceKey_.empty() ? "listen" : "subscribe");
-
-        auto req = std::make_shared<restbed::Request>(uri);
-        auto token = ++listenerToken_;
-        auto l = search->second.listeners.find(token);
-        if (l == search->second.listeners.end()) {
-            auto f = filter;
-            l = search->second.listeners.emplace(std::piecewise_construct,
-                    std::forward_as_tuple(token),
-                    std::forward_as_tuple(std::move(cb), req, std::move(f))).first;
-        } else {
-            if (l->second.state)
-                l->second.state->cancel = true;
-        }
-
-        auto state = std::make_shared<ListenState>();
-        l->second.state = state;
-        l->second.cb = [this,key,token,state](const std::vector<Sp<Value>>& values, bool expired) {
-            if (state->cancel)
-                return false;
-            std::lock_guard<std::mutex> lock(searchLock_);
-            auto s = searches_.find(key);
-            if (s == searches_.end()) {
-                return false;
-            }
-            auto l = s->second.listeners.find(token);
-            if (l == s->second.listeners.end()) {
-                return false;
-            }
-            return l->second.cache.onValue(values, expired);
-        };
-
-        auto vcb = l->second.cb;
-        l->second.req = req;
-
-        if (not deviceKey_.empty()) {
-            // Relaunch push listeners even if a timeout is not received (if the proxy crash for any reason)
-            l->second.refreshJob = scheduler.add(scheduler.time() + proxy::OP_TIMEOUT - proxy::OP_MARGIN, [this, key, token, state] {
-                if (state->cancel)
-                    return;
-                std::lock_guard<std::mutex> lock(searchLock_);
-                auto s = searches_.find(key);
-                if (s != searches_.end()) {
-                    auto l = s->second.listeners.find(token);
-                    if (l != s->second.listeners.end()) {
-                        resubscribe(key, l->second);
-                    }
-                }
-            });
-        }
-        l->second.thread = std::thread([this, req, vcb, filter, state]() {
-            sendListen(req, vcb, filter, state,
-                    deviceKey_.empty() ? ListenMethod::LISTEN : ListenMethod::SUBSCRIBE);
-        });
-        return token;
+    auto token = it->second.ops.listen(cb, query, filter, [&](Sp<Query> /*q*/, ValueCallback vcb){
+        return doListen(key, vcb, filter);
    });
    return token;
 }
@@ -757,78 +680,194 @@ DhtProxyClient::cancelListen(const InfoHash& key, size_t gtoken) {
    return canceled;
 }

-void DhtProxyClient::sendListen(const std::shared_ptr<restbed::Request> &req,
-                                const ValueCallback &cb,
-                                const Value::Filter &filter,
-                                const Sp<ListenState> &state,
-                                ListenMethod method) {
-    auto settings = std::make_shared<restbed::Settings>();
-    if (method != ListenMethod::LISTEN) {
-        req->set_method("SUBSCRIBE");
-    } else {
-        std::chrono::milliseconds timeout(std::numeric_limits<int>::max());
-        settings->set_connection_timeout(timeout); // Avoid the client to close the socket after 5 seconds.
-        req->set_method("LISTEN");
-    }
-    try {
-#ifdef OPENDHT_PUSH_NOTIFICATIONS
-        if (method != ListenMethod::LISTEN)
-        fillBody(req, method == ListenMethod::RESUBSCRIBE);
-    #endif
-        restbed::Http::async(req,
-              [this, filter, cb, state](const std::shared_ptr<restbed::Request>& req,
-                                        const std::shared_ptr<restbed::Response>& reply)
-        {
-            auto code = reply->get_status_code();
-            if (code == 200) {
-                try {
-                    while (restbed::Http::is_open(req) and not state->cancel) {
-                        restbed::Http::fetch("\n", reply);
-                        if (state->cancel)
-                            break;
-                        std::string body;
-                        reply->get_body(body);
-                        reply->set_body(""); // Reset the body for the next fetch

-                        Json::Value json;
-                        std::string err;
-                        Json::CharReaderBuilder rbuilder;
-                        auto reader = std::unique_ptr<Json::CharReader>(rbuilder.newCharReader());
-                        if (reader->parse(body.data(), body.data() + body.size(), &json, &err)) {
-                            if (json.size() == 0) {
-                                // Empty value, it's the end
-                                break;
-                            }
-                            auto expired = json.get("expired", Json::Value(false)).asBool();
-                            auto value = std::make_shared<Value>(json);
-                            if ((not filter or filter(*value)) and cb) {
-                                std::lock_guard<std::mutex> lock(lockCallbacks);
-                                callbacks_.emplace_back([cb, value, state, expired]() {
-                                    if (not state->cancel and not cb({value}, expired))
-                                        state->cancel = true;
-                                });
-                                loopSignal_();
-                            }
+void
+DhtProxyClient::sendListen(const std::shared_ptr<restbed::Request>& req, const ValueCallback& cb, const Value::Filter& filter, const Sp<ListenState>& state) {
+    auto settings = std::make_shared<restbed::Settings>();
+    std::chrono::milliseconds timeout(std::numeric_limits<int>::max());
+    settings->set_connection_timeout(timeout); // Avoid the client to close the socket after 5 seconds.
+    req->set_method("LISTEN");
+    restbed::Http::async(req,
+        [this, filter, cb, state](const std::shared_ptr<restbed::Request>& req,
+                                  const std::shared_ptr<restbed::Response>& reply) {
+        auto code = reply->get_status_code();
+        if (code == 200) {
+            try {
+                while (restbed::Http::is_open(req) and not state->cancel) {
+                    restbed::Http::fetch("\n", reply);
+                    if (state->cancel)
+                        break;
+                    std::string body;
+                    reply->get_body(body);
+                    reply->set_body(""); // Reset the body for the next fetch
+
+                    Json::Value json;
+                    std::string err;
+                    Json::CharReaderBuilder rbuilder;
+                    auto reader = std::unique_ptr<Json::CharReader>(rbuilder.newCharReader());
+                    if (reader->parse(body.data(), body.data() + body.size(), &json, &err)) {
+                        auto value = std::make_shared<Value>(json);
+                        if ((not filter or filter(*value)) and cb)  {
+                            std::lock_guard<std::mutex> lock(lockCallbacks);
+                            callbacks_.emplace_back([cb, value, state]() {
+                                if (not state->cancel and not cb({value}, false))
+                                    state->cancel = true;
+                            });
+                            loopSignal_();
                        }
                    }
-                } catch (const std::exception& e) {
-                    if (not state->cancel) {
-                        DHT_LOG.w("Listen closed by the proxy server: %s", e.what());
-                        state->ok = false;
-                    }
                }
-            } else {
-                state->ok = false;
+            } catch (const std::exception& e) {
+                if (not state->cancel) {
+                    DHT_LOG.w("Listen closed by the proxy server: %s", e.what());
+                    state->ok = false;
+                }
            }
-        }, settings).get();
-    } catch (const std::exception& e) {
-        state->ok = false;
-    }
+        } else {
+            state->ok = false;
+        }
+    }, settings).get();
    auto& s = *state;
    if (not s.ok and not s.cancel)
        opFailed();
 }

+void
+DhtProxyClient::sendSubscribe(const std::shared_ptr<restbed::Request>& req, const Sp<proxy::ListenToken>& token, const Sp<ListenState>& state) {
+#if OPENDHT_PUSH_NOTIFICATIONS
+    req->set_method("SUBSCRIBE");
+    fillBodyToGetToken(req);
+    restbed::Http::async(req, [this,state, token](const std::shared_ptr<restbed::Request>&,
+                                             const std::shared_ptr<restbed::Response>& reply) {
+        auto code = reply->get_status_code();
+        if (code == 200) {
+            try {
+                restbed::Http::fetch("\n", reply);
+                std::string body;
+                reply->get_body(body);
+
+                std::string err;
+                Json::Value json;
+                Json::CharReaderBuilder rbuilder;
+                auto reader = std::unique_ptr<Json::CharReader>(rbuilder.newCharReader());
+                if (reader->parse(body.data(), body.data() + body.size(), &json, &err)) {
+                    if (not json.isMember("token")) {
+                        state->ok = false;
+                        return;
+                    }
+                    *token = unpackId(json, "token");
+                }
+            } catch (const std::exception& e) {
+                if (not state->cancel) {
+                    DHT_LOG.e("sendSubscribe: error: %s", e.what());
+                    state->ok = false;
+                }
+            }
+        } else {
+            state->ok = false;
+        }
+    }).get();
+    auto& s = *state;
+    if (not s.ok and not s.cancel)
+        opFailed();
+#endif
+}
+
+size_t
+DhtProxyClient::doListen(const InfoHash& key, ValueCallback cb, Value::Filter filter/*, Where where*/)
+{
+    scheduler.syncTime();
+    restbed::Uri uri(proxy::HTTP_PROTO + serverHost_ + "/" + key.toString());
+    std::lock_guard<std::mutex> lock(searchLock_);
+    auto search = searches_.find(key);
+    if (search == searches_.end()) {
+        DHT_LOG.e(key, "[search %s] listen: search not found", key.to_c_str());
+        return 0;
+    }
+    DHT_LOG.d(key, "[search %s] sending %s", key.to_c_str(), deviceKey_.empty() ? "listen" : "subscribe");
+
+    auto req = std::make_shared<restbed::Request>(uri);
+    auto token = ++listenerToken_;
+    auto l = search->second.listeners.find(token);
+    if (l == search->second.listeners.end()) {
+        auto f = filter;
+        l = search->second.listeners.emplace(token, Listener {
+            ValueCache(cb), scheduler.add(time_point::max(), [this, key, token]{
+                std::lock_guard<std::mutex> lock(searchLock_);
+                auto s = searches_.find(key);
+                if (s == searches_.end()) {
+                    return;
+                }
+                auto l = s->second.listeners.find(token);
+                if (l == s->second.listeners.end()) {
+                    return;
+                }
+                auto next = l->second.cache.expireValues(scheduler.time());
+                scheduler.edit(l->second.cacheExpirationJob, next);
+            }), req, std::move(f)
+        }).first;
+    } else {
+        if (l->second.state)
+            l->second.state->cancel = true;
+    }
+
+    auto state = std::make_shared<ListenState>();
+    l->second.state = state;
+    l->second.cb = [this,key,token,state](const std::vector<Sp<Value>>& values, bool expired) {
+        if (state->cancel)
+            return false;
+        std::lock_guard<std::mutex> lock(searchLock_);
+        auto s = searches_.find(key);
+        if (s == searches_.end()) {
+            return false;
+        }
+        auto l = s->second.listeners.find(token);
+        if (l == s->second.listeners.end()) {
+            return false;
+        }
+        const std::vector<Sp<Value>> new_values_empty;
+        std::vector<Value::Id> expired_ids;
+        if (expired) {
+            expired_ids.reserve(values.size());
+            for (const auto& v : values)
+                expired_ids.emplace_back(v->id);
+        }
+        auto next = l->second.cache.onValues(expired ? new_values_empty : values, std::vector<Value::Id>{}, expired_ids, types, scheduler.time());
+        scheduler.edit(l->second.cacheExpirationJob, next);
+        loopSignal_();
+        return true;
+    };
+
+    auto pushNotifToken = std::make_shared<proxy::ListenToken>(0);
+    auto vcb = l->second.cb;
+    l->second.pushNotifToken = pushNotifToken;
+    l->second.req = req;
+
+    if (not deviceKey_.empty()) {
+        // Relaunch push listeners even if a timeout is not received (if the proxy crash for any reason)
+        l->second.refreshJob = scheduler.add(scheduler.time() + proxy::OP_TIMEOUT - proxy::OP_MARGIN, [this, key, token, state] {
+            if (state->cancel)
+                return;
+            std::lock_guard<std::mutex> lock(searchLock_);
+            auto s = searches_.find(key);
+            if (s != searches_.end()) {
+                auto l = s->second.listeners.find(token);
+                if (l != s->second.listeners.end()) {
+                    resubscribe(key, l->second);
+                }
+            }
+        });
+        l->second.thread = std::thread([this, req,pushNotifToken, state](){
+            sendSubscribe(req,pushNotifToken,state);
+        });
+    } else {
+        l->second.thread = std::thread([this, req, vcb, filter, state]{
+            sendListen(req,vcb,filter,state);
+        });
+    }
+    return token;
+}
+
 bool
 DhtProxyClient::doCancelListen(const InfoHash& key, size_t ltoken)
 {
@@ -852,13 +891,14 @@ DhtProxyClient::doCancelListen(const InfoHash& key, size_t ltoken)
            listener.thread.join();
        }
        // UNSUBSCRIBE
-        restbed::Uri uri(serverHost_ + "/" + key.toString());
+        restbed::Uri uri(proxy::HTTP_PROTO + serverHost_ + "/" + key.toString());
        auto req = std::make_shared<restbed::Request>(uri);
        req->set_method("UNSUBSCRIBE");
        // fill request body
        Json::Value body;
        body["key"] = deviceKey_;
        body["client_id"] = pushClientId_;
+        body["token"] = std::to_string(*listener.pushNotifToken);
        Json::StreamWriterBuilder wbuilder;
        wbuilder["commentStyle"] = "None";
        wbuilder["indentation"] = "";
@@ -866,11 +906,8 @@ DhtProxyClient::doCancelListen(const InfoHash& key, size_t ltoken)
        std::replace(content.begin(), content.end(), '\n', ' ');
        req->set_body(content);
        req->set_header("Content-Length", std::to_string(content.size()));
-        try {
-            restbed::Http::async(req, [](const std::shared_ptr<restbed::Request>&, const std::shared_ptr<restbed::Response>&){});
-        } catch (const std::exception& e) {
-            DHT_LOG.w(key, "[search %s] cancelListen: Http::async failed: %s", key.to_c_str(), e.what());
-        }
+
+        restbed::Http::async(req, [](const std::shared_ptr<restbed::Request>&, const std::shared_ptr<restbed::Response>&){});
    } else {
        // Just stop the request
        if (listener.thread.joinable()) {
@@ -911,16 +948,14 @@ DhtProxyClient::getConnectivityStatus()
 void
 DhtProxyClient::restartListeners()
 {
-    if (isDestroying_) return;
-    std::lock_guard<std::mutex> lock(searchLock_);
    DHT_LOG.d("Refresh permanent puts");
    for (auto& search : searches_) {
        for (auto& put : search.second.puts) {
-            if (!*put.second.ok) {
+            if (!put.second.ok) {
                auto ok = put.second.ok;
                doPut(search.first, put.second.value,
                [ok](bool result, const std::vector<std::shared_ptr<dht::Node> >&){
-                    *ok = result;
+                    *ok = !result;
                }, time_point::max(), true);
                scheduler.edit(put.second.refreshJob, scheduler.time() + proxy::OP_TIMEOUT - proxy::OP_MARGIN);
            }
@@ -936,6 +971,7 @@ DhtProxyClient::restartListeners()
        return;
    }
    DHT_LOG.d("Restarting listeners");
+    std::lock_guard<std::mutex> lock(searchLock_);
    for (auto& search: searches_) {
        for (auto& l: search.second.listeners) {
            auto& listener = l.second;
@@ -951,7 +987,7 @@ DhtProxyClient::restartListeners()
            state->ok = true;
            auto filter = listener.filter;
            auto cb = listener.cb;
-            restbed::Uri uri(serverHost_ + "/" + search.first.toString());
+            restbed::Uri uri(proxy::HTTP_PROTO + serverHost_ + "/" + search.first.toString());
            auto req = std::make_shared<restbed::Request>(uri);
            req->set_method("LISTEN");
            listener.req = req;
@@ -965,7 +1001,7 @@ DhtProxyClient::restartListeners()
 void
 DhtProxyClient::pushNotificationReceived(const std::map<std::string, std::string>& notification)
 {
-#ifdef OPENDHT_PUSH_NOTIFICATIONS
+#if OPENDHT_PUSH_NOTIFICATIONS
    scheduler.syncTime();
    {
        // If a push notification is received, the proxy is up and running
@@ -992,45 +1028,18 @@ DhtProxyClient::pushNotificationReceived(const std::map<std::string, std::string
                    resubscribe(key, list.second);
            }
        } else {
-            auto key = InfoHash(notification.at("key"));
-            auto& search = searches_.at(key);
-            for (auto& list : search.listeners) {
-                if (list.second.state->cancel)
-                    continue;
-                DHT_LOG.d(key, "[search %s] handling push notification", key.to_c_str());
-                auto expired = notification.find("exp");
-                auto token = list.first;
-                auto state = list.second.state;
-                if (expired == notification.end()) {
+            auto token = std::stoull(notification.at("token"));
+            for (auto& search: searches_) {
+                for (auto& list : search.second.listeners) {
+                    if (*list.second.pushNotifToken != token or list.second.state->cancel)
+                        continue;
+                    DHT_LOG.d(search.first, "[search %s] handling push notification", search.first.to_c_str());
                    auto cb = list.second.cb;
                    auto filter = list.second.filter;
-                    auto oldValues = list.second.cache.getValues();
-                    get(key, [cb](const std::vector<Sp<Value>>& vals) {
-                        return cb(vals, false);
-                    }, [cb, oldValues](bool /*ok*/) {
-                        // Decrement old values refcount to expire values not present in the new list
-                        cb(oldValues, true);
-                    }, std::move(filter));
-                } else {
-                    std::stringstream ss(expired->second);
-                    std::vector<Value::Id> ids;
-                    while(ss.good()){
-                        std::string substr;
-                        getline(ss, substr, ',');
-                        ids.emplace_back(std::stoull(substr));
-                    }
-                    std::lock_guard<std::mutex> lock(lockCallbacks);
-                    callbacks_.emplace_back([this, key, token, state, ids]() {
-                        if (state->cancel) return;
-                        std::lock_guard<std::mutex> lock(searchLock_);
-                        auto s = searches_.find(key);
-                        if (s == searches_.end()) return;
-                        auto l = s->second.listeners.find(token);
-                        if (l == s->second.listeners.end()) return;
-                        if (not state->cancel and not l->second.cache.onValuesExpired(ids))
-                            state->cancel = true;
-                    });
-                    loopSignal_();
+                    get(search.first, [cb](const std::vector<Sp<Value>>& vals) {
+                        cb(vals, false);
+                        return true;
+                    }, DoneCallbackSimple{}, std::move(filter));
                }
            }
        }
@@ -1043,33 +1052,31 @@ DhtProxyClient::pushNotificationReceived(const std::map<std::string, std::string
 void
 DhtProxyClient::resubscribe(const InfoHash& key, Listener& listener)
 {
-#ifdef OPENDHT_PUSH_NOTIFICATIONS
+#if OPENDHT_PUSH_NOTIFICATIONS
    if (deviceKey_.empty()) return;
    scheduler.syncTime();
    DHT_LOG.d(key, "[search %s] resubscribe push listener", key.to_c_str());
    // Subscribe
+    restbed::Uri uri(proxy::HTTP_PROTO + serverHost_ + "/" + key.toString());
+    auto req = std::make_shared<restbed::Request>(uri);
+    req->set_method("SUBSCRIBE");
+
+    auto pushNotifToken = std::make_shared<proxy::ListenToken>(0);
    auto state = listener.state;
-    if (listener.thread.joinable()) {
-        state->cancel = true;
-        if (listener.req)
-            restbed::Http::close(listener.req);
+    if (listener.thread.joinable())
        listener.thread.join();
-    }
    state->cancel = false;
    state->ok = true;
-    auto req = std::make_shared<restbed::Request>(restbed::Uri {serverHost_ + "/" + key.toString()});
-    req->set_method("SUBSCRIBE");
    listener.req = req;
+    listener.pushNotifToken = pushNotifToken;
    scheduler.edit(listener.refreshJob, scheduler.time() + proxy::OP_TIMEOUT - proxy::OP_MARGIN);
-    auto vcb = listener.cb;
-    auto filter = listener.filter;
-    listener.thread = std::thread([this, req, vcb, filter, state]() {
-        sendListen(req, vcb, filter, state, ListenMethod::RESUBSCRIBE);
+    listener.thread = std::thread([this, req, pushNotifToken, state]() {
+        sendSubscribe(req, pushNotifToken, state);
    });
 #endif
 }

-#ifdef OPENDHT_PUSH_NOTIFICATIONS
+#if OPENDHT_PUSH_NOTIFICATIONS
 void
 DhtProxyClient::getPushRequest(Json::Value& body) const
 {
@@ -1084,18 +1091,17 @@ DhtProxyClient::getPushRequest(Json::Value& body) const
 }

 void
-DhtProxyClient::fillBody(std::shared_ptr<restbed::Request> req, bool resubscribe)
+DhtProxyClient::fillBodyToGetToken(std::shared_ptr<restbed::Request> req, unsigned token)
 {
    // Fill body with
    // {
    //   "key":"device_key",
+    //   "token": xxx
    // }
    Json::Value body;
    getPushRequest(body);
-    if (resubscribe) {
-        // This is the first listen, we want to retrieve previous values.
-        body["refresh"] = true;
-    }
+    if (token > 0)
+        body["token"] = token;
    Json::StreamWriterBuilder wbuilder;
    wbuilder["commentStyle"] = "None";
    wbuilder["indentation"] = "";
@@ -1107,3 +1113,5 @@ DhtProxyClient::fillBody(std::shared_ptr<restbed::Request> req, bool resubscribe
 #endif // OPENDHT_PUSH_NOTIFICATIONS

 } // namespace dht
+
+#endif // OPENDHT_PROXY_CLIENT
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2017-2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2017-2018 Savoir-faire Linux Inc.
 *  Author: Sébastien Blin <sebastien.blin@savoirfairelinux.com>
 *          Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 *
@@ -17,9 +17,9 @@
 *  along with this program. If not, see <https://www.gnu.org/licenses/>.
 */

+#if OPENDHT_PROXY_SERVER
 #include "dht_proxy_server.h"

-#include "thread_pool.h"
 #include "default_types.h"
 #include "dhtrunner.h"

@@ -47,11 +47,9 @@ struct DhtProxyServer::SearchPuts {
 };

 constexpr const std::chrono::minutes PRINT_STATS_PERIOD {2};
-constexpr const size_t IO_THREADS_MAX {64};
-

 DhtProxyServer::DhtProxyServer(std::shared_ptr<DhtRunner> dht, in_port_t port , const std::string& pushServer)
-: dht_(dht), threadPool_(new ThreadPool(IO_THREADS_MAX)), pushServer_(pushServer)
+: dht_(dht) , pushServer_(pushServer)
 {
    if (not dht_)
        throw std::invalid_argument("A DHT instance must be provided");
@@ -60,33 +58,29 @@ DhtProxyServer::DhtProxyServer(std::shared_ptr<DhtRunner> dht, in_port_t port ,

    std::cout << "Running DHT proxy server on port " << port << std::endl;
    if (not pushServer.empty()) {
-#ifdef OPENDHT_PUSH_NOTIFICATIONS
-        std::cout << "Using push notification server: " << pushServer << std::endl;
-#else
+#if !OPENDHT_PUSH_NOTIFICATIONS
        std::cerr << "Push server defined but built OpenDHT built without push notification support" << std::endl;
+#else
+        std::cout << "Using push notification server: " << pushServer << std::endl;
 #endif
    }

-    jsonBuilder_["commentStyle"] = "None";
-    jsonBuilder_["indentation"] = "";
-
    server_thread = std::thread([this, port]() {
        // Create endpoints
        auto resource = std::make_shared<restbed::Resource>();
        resource->set_path("/");
        resource->set_method_handler("GET", std::bind(&DhtProxyServer::getNodeInfo, this, _1));
-        resource->set_method_handler("STATS", std::bind(&DhtProxyServer::getStats, this, _1));
        service_->publish(resource);
        resource = std::make_shared<restbed::Resource>();
        resource->set_path("/{hash: .*}");
        resource->set_method_handler("GET", std::bind(&DhtProxyServer::get, this, _1));
        resource->set_method_handler("LISTEN", [this](const Sp<restbed::Session>& session) mutable { listen(session); } );
-#ifdef OPENDHT_PUSH_NOTIFICATIONS
+#if OPENDHT_PUSH_NOTIFICATIONS
        resource->set_method_handler("SUBSCRIBE", [this](const Sp<restbed::Session>& session) mutable { subscribe(session); } );
        resource->set_method_handler("UNSUBSCRIBE", [this](const Sp<restbed::Session>& session) mutable { unsubscribe(session); } );
 #endif //OPENDHT_PUSH_NOTIFICATIONS
        resource->set_method_handler("POST", [this](const Sp<restbed::Session>& session) mutable { put(session); });
-#ifdef OPENDHT_PROXY_SERVER_IDENTITY
+#if OPENDHT_PROXY_SERVER_IDENTITY
        resource->set_method_handler("SIGN", std::bind(&DhtProxyServer::putSigned, this, _1));
        resource->set_method_handler("ENCRYPT", std::bind(&DhtProxyServer::putEncrypted, this, _1));
 #endif // OPENDHT_PROXY_SERVER_IDENTITY
@@ -143,7 +137,7 @@ DhtProxyServer::DhtProxyServer(std::shared_ptr<DhtRunner> dht, in_port_t port ,
    printStatsJob_ = scheduler_.add(scheduler_.time() + PRINT_STATS_PERIOD, [this] {
        if (stopListeners) return;
        if (service_->is_up())
-            updateStats();
+            std::cout << getStats().toString() << std::endl;
        // Refresh stats cache
        auto newInfo = dht_->getNodeInfo();
        {
@@ -182,33 +176,33 @@ DhtProxyServer::stop()
        schedulerThread_.join();
    if (server_thread.joinable())
        server_thread.join();
-    threadPool_->stop();
 }

-void
-DhtProxyServer::updateStats() const
+DhtProxyServer::ServerStats
+DhtProxyServer::getStats() const
 {
+    ServerStats ret {};
    auto now = clock::now();
    auto last = lastStatsReset_.exchange(now);
    auto count = requestNum_.exchange(0);
    auto dt = std::chrono::duration<double>(now - last);
-    stats_.requestRate = count / dt.count();
-#ifdef OPENDHT_PUSH_NOTIFICATIONS
-    stats_.pushListenersCount = pushListeners_.size();
+    ret.requestRate = count / dt.count();
+#if OPENDHT_PUSH_NOTIFICATIONS
+    ret.pushListenersCount = pushListeners_.size();
 #endif
-    stats_.putCount = puts_.size();
-    stats_.listenCount = currentListeners_.size();
-    stats_.nodeInfo = nodeInfo_;
+    ret.putCount = puts_.size();
+    ret.listenCount = currentListeners_.size();
+    return ret;
 }

 void
-DhtProxyServer::getNodeInfo(const Sp<restbed::Session>& session) const
+DhtProxyServer::getNodeInfo(const std::shared_ptr<restbed::Session>& session) const
 {
    requestNum_++;
    const auto request = session->get_request();
    int content_length = std::stoi(request->get_header("Content-Length", "0"));
    session->fetch(content_length,
-        [this](const Sp<restbed::Session>& s, const restbed::Bytes& /*b*/) mutable
+        [this](const std::shared_ptr<restbed::Session> s, const restbed::Bytes& /*b*/) mutable
        {
            try {
                if (dht_) {
@@ -225,7 +219,10 @@ DhtProxyServer::getNodeInfo(const Sp<restbed::Session>& session) const
                        result = nodeInfo_.toJson();
                    }
                    result["public_ip"] = s->get_origin(); // [ipv6:ipv4]:port or ipv4:port
-                    auto output = Json::writeString(jsonBuilder_, result) + "\n";
+                    Json::StreamWriterBuilder wbuilder;
+                    wbuilder["commentStyle"] = "None";
+                    wbuilder["indentation"] = "";
+                    auto output = Json::writeString(wbuilder, result) + "\n";
                    s->close(restbed::OK, output);
                }
                else
@@ -238,41 +235,14 @@ DhtProxyServer::getNodeInfo(const Sp<restbed::Session>& session) const
 }

 void
-DhtProxyServer::getStats(const Sp<restbed::Session>& session) const
-{
-    requestNum_++;
-    const auto request = session->get_request();
-    int content_length = std::stoi(request->get_header("Content-Length", "0"));
-    session->fetch(content_length,
-        [this](const Sp<restbed::Session>& s, const restbed::Bytes& /*b*/) mutable
-        {
-            try {
-                if (dht_) {
-#ifdef OPENDHT_JSONCPP
-                    auto output = Json::writeString(jsonBuilder_, stats_.toJson()) + "\n";
-                    s->close(restbed::OK, output);
-#else
-                    s->close(restbed::NotFound, "{\"err\":\"JSON not enabled on this instance\"}");
-#endif
-                }
-                else
-                    s->close(restbed::SERVICE_UNAVAILABLE, "{\"err\":\"Incorrect DhtRunner\"}");
-            } catch (...) {
-                s->close(restbed::INTERNAL_SERVER_ERROR, "{\"err\":\"Internal server error\"}");
-            }
-        }
-    );
-}
-
-void
-DhtProxyServer::get(const Sp<restbed::Session>& session) const
+DhtProxyServer::get(const std::shared_ptr<restbed::Session>& session) const
 {
    requestNum_++;
    const auto request = session->get_request();
    int content_length = std::stoi(request->get_header("Content-Length", "0"));
    auto hash = request->get_path_parameter("hash");
    session->fetch(content_length,
-        [=](const Sp<restbed::Session>& s, const restbed::Bytes& /*b* */)
+        [=](const std::shared_ptr<restbed::Session> s, const restbed::Bytes& /*b* */)
        {
            try {
                if (dht_) {
@@ -280,18 +250,23 @@ DhtProxyServer::get(const Sp<restbed::Session>& session) const
                    if (!infoHash) {
                        infoHash = InfoHash::get(hash);
                    }
-                    s->yield(restbed::OK, "", [=](const Sp<restbed::Session>&) {});
-                    dht_->get(infoHash, [this,s](const Sp<Value>& value) {
-                        if (s->is_closed()) return false;
-                        // Send values as soon as we get them
-                        auto output = Json::writeString(jsonBuilder_, value->toJson()) + "\n";
-                        s->yield(output, [](const Sp<restbed::Session>& /*session*/){ });
-                        return true;
-                    }, [s](bool /*ok* */) {
-                        // Communication is finished
-                        if (not s->is_closed()) {
+                    s->yield(restbed::OK, "", [=]( const std::shared_ptr< restbed::Session > s) {
+                        auto cacheSession = std::weak_ptr<restbed::Session>(s);
+
+                        dht_->get(infoHash, [cacheSession](std::shared_ptr<Value> value) {
+                            auto s = cacheSession.lock();
+                            if (!s) return false;
+                            // Send values as soon as we get them
+                            Json::StreamWriterBuilder wbuilder;
+                            wbuilder["commentStyle"] = "None";
+                            wbuilder["indentation"] = "";
+                            auto output = Json::writeString(wbuilder, value->toJson()) + "\n";
+                            s->yield(output, [](const std::shared_ptr<restbed::Session> /*session*/){ });
+                            return true;
+                        }, [s](bool /*ok* */) {
+                            // Communication is finished
                            s->close();
-                        }
+                        });
                    });
                } else {
                    s->close(restbed::SERVICE_UNAVAILABLE, "{\"err\":\"Incorrect DhtRunner\"}");
@@ -304,7 +279,7 @@ DhtProxyServer::get(const Sp<restbed::Session>& session) const
 }

 void
-DhtProxyServer::listen(const Sp<restbed::Session>& session)
+DhtProxyServer::listen(const std::shared_ptr<restbed::Session>& session)
 {
    requestNum_++;
    const auto request = session->get_request();
@@ -314,7 +289,7 @@ DhtProxyServer::listen(const Sp<restbed::Session>& session)
    if (!infoHash)
        infoHash = InfoHash::get(hash);
    session->fetch(content_length,
-        [=](const Sp<restbed::Session>& s, const restbed::Bytes& /*b* */)
+        [=](const std::shared_ptr<restbed::Session> s, const restbed::Bytes& /*b* */)
        {
            try {
                if (dht_) {
@@ -332,18 +307,16 @@ DhtProxyServer::listen(const Sp<restbed::Session>& session)
                    // cache the session to avoid an incrementation of the shared_ptr's counter
                    // else, the session->close() will not close the socket.
                    auto cacheSession = std::weak_ptr<restbed::Session>(s);
-                    listener.token = dht_->listen(infoHash, [this,cacheSession](const std::vector<Sp<Value>>& values, bool expired) {
+                    listener.token = dht_->listen(infoHash, [cacheSession](std::shared_ptr<Value> value) {
                        auto s = cacheSession.lock();
                        if (!s) return false;
                        // Send values as soon as we get them
                        if (!s->is_closed()) {
-                            for (const auto& value : values) {
-                                auto val = value->toJson();
-                                if (expired)
-                                    val["expired"] = true;
-                                auto output = Json::writeString(jsonBuilder_, val) + "\n";
-                                s->yield(output, [](const Sp<restbed::Session>&){ });
-                            }
+                            Json::StreamWriterBuilder wbuilder;
+                            wbuilder["commentStyle"] = "None";
+                            wbuilder["indentation"] = "";
+                            auto output = Json::writeString(wbuilder, value->toJson()) + "\n";
+                            s->yield(output, [](const std::shared_ptr<restbed::Session>){ });
                        }
                        return !s->is_closed();
                    });
@@ -361,9 +334,10 @@ DhtProxyServer::listen(const Sp<restbed::Session>& session)
    );
 }

-#ifdef OPENDHT_PUSH_NOTIFICATIONS
+#if OPENDHT_PUSH_NOTIFICATIONS

 struct DhtProxyServer::Listener {
+    std::shared_ptr<proxy::ListenToken> token;
    std::string clientId;
    std::future<size_t> internalToken;
    Sp<Scheduler::Job> expireJob;
@@ -402,11 +376,12 @@ DhtProxyServer::subscribe(const std::shared_ptr<restbed::Session>& session)
                    s->close(restbed::BAD_REQUEST, "{\"err\":\"No token\"}");
                    return;
                }
+                auto tokenFromReq = unpackId(root, "token");
                auto platform = root["platform"].asString();
                auto isAndroid = platform == "android";
                auto clientId = root.isMember("client_id") ? root["client_id"].asString() : std::string();

-                std::cout << "Subscribe " << infoHash << " client:" << clientId << std::endl;
+                std::cout << "Subscribe " << infoHash << " token:" << tokenFromReq << " client:" << clientId << std::endl;

                {
                    std::lock(schedulerLock_, lockListener_);
@@ -420,34 +395,10 @@ DhtProxyServer::subscribe(const std::shared_ptr<restbed::Session>& session)
                    auto listeners = pushListener->second.listeners.emplace(infoHash, std::vector<Listener>{}).first;
                    for (auto& listener: listeners->second) {
                        if (listener.clientId == clientId) {
+                            *listener.token = tokenFromReq;
                            scheduler_.edit(listener.expireJob, timeout);
                            scheduler_.edit(listener.expireNotifyJob, timeout - proxy::OP_MARGIN);
-                            s->yield(restbed::OK);
-
-                            if (!root.isMember("refresh") or !root["refresh"].asBool()) {
-                                dht_->get(
-                                    infoHash,
-                                    [this, s](const Sp<Value> &value) {
-                                        if (s->is_closed())
-                                            return false;
-                                        // Send values as soon as we get them
-                                        auto output = Json::writeString(jsonBuilder_, value->toJson()) + "\n";
-                                        s->yield(output, [](const Sp<restbed::Session>
-                                                                & /*session*/) {});
-                                        return true;
-                                    },
-                                    [s](bool /*ok* */) {
-                                        // Communication is finished
-                                        if (not s->is_closed()) {
-                                            s->close("{}\n");
-                                        }
-                                    });
-                            } else {
-                                // Communication is finished
-                                if (not s->is_closed()) {
-                                    s->close("{}\n");
-                                }
-                            }
+                            s->close(restbed::OK, "{\"token\": " + std::to_string(tokenFromReq) + "}\n");
                            schedulerCv_.notify_one();
                            return;
                        }
@@ -460,23 +411,16 @@ DhtProxyServer::subscribe(const std::shared_ptr<restbed::Session>& session)
                    pushListener->second.isAndroid = isAndroid;

                    // The listener is not found, so add it.
+                    auto token = std::make_shared<proxy::ListenToken>(tokenFromReq);
+                    listener.token = token;
                    listener.internalToken = dht_->listen(infoHash,
-                        [this, infoHash, pushToken, isAndroid, clientId](const std::vector<std::shared_ptr<Value>>& values, bool expired) {
-                            threadPool_->run([this, infoHash, pushToken, isAndroid, clientId, values, expired]() {
-                                // Build message content
-                                Json::Value json;
-                                json["key"] = infoHash.toString();
-                                json["to"] = clientId;
-                                if (expired and values.size() < 3) {
-                                    std::stringstream ss;
-                                    for(size_t i = 0; i < values.size(); ++i) {
-                                        if(i != 0) ss << ",";
-                                        ss << values[i]->id;
-                                    }
-                                    json["exp"] = ss.str();
-                                }
-                                sendPushNotification(pushToken, std::move(json), isAndroid);
-                            });
+                        [this, token, infoHash, pushToken, isAndroid, clientId](std::vector<std::shared_ptr<Value>> /*value*/) {
+                            // Build message content.
+                            Json::Value json;
+                            json["key"] = infoHash.toString();
+                            json["to"] = clientId;
+                            json["token"] = std::to_string(*token);
+                            sendPushNotification(pushToken, json, isAndroid);
                            return true;
                        }
                    );
@@ -486,17 +430,18 @@ DhtProxyServer::subscribe(const std::shared_ptr<restbed::Session>& session)
                        }
                    );
                    listener.expireNotifyJob = scheduler_.add(timeout - proxy::OP_MARGIN,
-                        [this, infoHash, pushToken, isAndroid, clientId] {
+                        [this, token, infoHash, pushToken, isAndroid, clientId] {
                            std::cout << "Listener: sending refresh " << infoHash << std::endl;
                            Json::Value json;
                            json["timeout"] = infoHash.toString();
                            json["to"] = clientId;
-                            sendPushNotification(pushToken, std::move(json), isAndroid);
+                            json["token"] = std::to_string(*token);
+                            sendPushNotification(pushToken, json, isAndroid);
                        }
                    );
                }
                schedulerCv_.notify_one();
-                s->close(restbed::OK, "{}\n");
+                s->close(restbed::OK, "{\"token\": " + std::to_string(tokenFromReq) + "}\n");
            } catch (...) {
                s->close(restbed::INTERNAL_SERVER_ERROR, "{\"err\":\"Internal server error\"}");
            }
@@ -507,6 +452,7 @@ DhtProxyServer::subscribe(const std::shared_ptr<restbed::Session>& session)
 void
 DhtProxyServer::unsubscribe(const std::shared_ptr<restbed::Session>& session)
 {
+
    requestNum_++;
    const auto request = session->get_request();
    int content_length = std::stoi(request->get_header("Content-Length", "0"));
@@ -569,10 +515,8 @@ DhtProxyServer::cancelPushListen(const std::string& pushToken, const dht::InfoHa
 }

 void
-DhtProxyServer::sendPushNotification(const std::string& token, Json::Value&& json, bool isAndroid) const
+DhtProxyServer::sendPushNotification(const std::string& token, const Json::Value& json, bool isAndroid) const
 {
-    if (pushServer_.empty())
-        return;
    restbed::Uri uri(proxy::HTTP_PROTO + pushServer_ + "/api/push");
    auto req = std::make_shared<restbed::Request>(uri);
    req->set_method("POST");
@@ -581,9 +525,9 @@ DhtProxyServer::sendPushNotification(const std::string& token, Json::Value&& jso
    Json::Value notification(Json::objectValue);
    Json::Value tokens(Json::arrayValue);
    tokens[0] = token;
-    notification["tokens"] = std::move(tokens);
+    notification["tokens"] = tokens;
    notification["platform"] = isAndroid ? 2 : 1;
-    notification["data"] = std::move(json);
+    notification["data"] = json;
    notification["priority"] = "high";
    notification["time_to_live"] = 600;

@@ -591,7 +535,7 @@ DhtProxyServer::sendPushNotification(const std::string& token, Json::Value&& jso
    notifications[0] = notification;

    Json::Value content;
-    content["notifications"] = std::move(notifications);
+    content["notifications"] = notifications;

    Json::StreamWriterBuilder wbuilder;
    wbuilder["commentStyle"] = "None";
@@ -682,7 +626,7 @@ DhtProxyServer::put(const std::shared_ptr<restbed::Session>& session)
                                        std::cout << "Permanent put expired: " << infoHash << " " << vid << std::endl;
                                        cancelPut(infoHash, vid);
                                    });
-#ifdef OPENDHT_PUSH_NOTIFICATIONS
+#if OPENDHT_PUSH_NOTIFICATIONS
                                    if (not pushToken.empty()) {
                                        pput.expireNotifyJob = scheduler_.add(timeout - proxy::OP_MARGIN,
                                            [this, infoHash, vid, pushToken, clientId, isAndroid]
@@ -692,7 +636,7 @@ DhtProxyServer::put(const std::shared_ptr<restbed::Session>& session)
                                            json["timeout"] = infoHash.toString();
                                            json["to"] = clientId;
                                            json["vid"] = std::to_string(vid);
-                                            sendPushNotification(pushToken, std::move(json), isAndroid);
+                                            sendPushNotification(pushToken, json, isAndroid);
                                        });
                                    }
 #endif
@@ -732,7 +676,7 @@ DhtProxyServer::put(const std::shared_ptr<restbed::Session>& session)
    );
 }

-#ifdef OPENDHT_PROXY_SERVER_IDENTITY
+#if OPENDHT_PROXY_SERVER_IDENTITY
 void
 DhtProxyServer::putSigned(const std::shared_ptr<restbed::Session>& session) const
 {
@@ -838,7 +782,7 @@ void
 DhtProxyServer::handleOptionsMethod(const std::shared_ptr<restbed::Session>& session) const
 {
    requestNum_++;
-#ifdef OPENDHT_PROXY_SERVER_IDENTITY
+#if OPENDHT_PROXY_SERVER_IDENTITY
    const auto allowed = "OPTIONS, GET, POST, LISTEN, SIGN, ENCRYPT";
 #else
    const auto allowed = "OPTIONS, GET, POST, LISTEN";
@@ -908,3 +852,4 @@ DhtProxyServer::removeClosedListeners(bool testSession)
 }

 }
+#endif //OPENDHT_PROXY_SERVER
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 Savoir-faire Linux Inc.
 *  Authors: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 *           Simon Désaulniers <simon.desaulniers@savoirfairelinux.com>
 *           Sébastien Blin <sebastien.blin@savoirfairelinux.com>
@@ -21,7 +21,7 @@
 #include "dhtrunner.h"
 #include "securedht.h"

-#ifdef OPENDHT_PROXY_CLIENT
+#if OPENDHT_PROXY_CLIENT
 #include "dht_proxy_client.h"
 #endif

@@ -37,7 +37,6 @@
 #include <winsock2.h>
 #include <ws2tcpip.h>
 #define close(x) closesocket(x)
-#define write(s, b, f) send(s, b, (int)strlen(b), 0)
 #endif

 namespace dht {
@@ -55,7 +54,7 @@ struct DhtRunner::Listener {
 };

 DhtRunner::DhtRunner() : dht_()
-#ifdef OPENDHT_PROXY_CLIENT
+#if OPENDHT_PROXY_CLIENT
 , dht_via_proxy_()
 #endif //OPENDHT_PROXY_CLIENT
 {
@@ -75,7 +74,7 @@ DhtRunner::~DhtRunner()
 }

 void
-DhtRunner::run(in_port_t port, const DhtRunner::Config& config)
+DhtRunner::run(in_port_t port, DhtRunner::Config config)
 {
    SockAddr sin4;
    sin4.setFamily(AF_INET);
@@ -87,7 +86,7 @@ DhtRunner::run(in_port_t port, const DhtRunner::Config& config)
 }

 void
-DhtRunner::run(const char* ip4, const char* ip6, const char* service, const DhtRunner::Config& config)
+DhtRunner::run(const char* ip4, const char* ip6, const char* service, DhtRunner::Config config)
 {
    auto res4 = SockAddr::resolve(ip4, service);
    auto res6 = SockAddr::resolve(ip6, service);
@@ -96,7 +95,7 @@ DhtRunner::run(const char* ip4, const char* ip6, const char* service, const DhtR
 }

 void
-DhtRunner::run(const SockAddr& local4, const SockAddr& local6, const DhtRunner::Config& config)
+DhtRunner::run(const SockAddr& local4, const SockAddr& local6, DhtRunner::Config config)
 {
    if (running)
        return;
@@ -105,7 +104,7 @@ DhtRunner::run(const SockAddr& local4, const SockAddr& local6, const DhtRunner::
    auto dht = std::unique_ptr<DhtInterface>(new Dht(s4, s6, SecureDht::getConfig(config.dht_config)));
    dht_ = std::unique_ptr<SecureDht>(new SecureDht(std::move(dht), config.dht_config));

-#ifdef OPENDHT_PROXY_CLIENT
+#if OPENDHT_PROXY_CLIENT
    config_ = config;
 #endif
    enableProxy(not config.proxy_server.empty());
@@ -151,7 +150,7 @@ DhtRunner::run(const SockAddr& local4, const SockAddr& local6, const DhtRunner::

 void
 DhtRunner::shutdown(ShutdownCallback cb) {
-#ifdef OPENDHT_PROXY_CLIENT
+#if OPENDHT_PROXY_CLIENT
    if (dht_via_proxy_)
        dht_via_proxy_->shutdown(cb);
 #endif
@@ -165,7 +164,7 @@ DhtRunner::shutdown(ShutdownCallback cb) {
 void
 DhtRunner::join()
 {
-    stopNetwork();
+    running_network = false;
    running = false;
    cv.notify_all();
    bootstrap_cv.notify_all();
@@ -250,7 +249,7 @@ DhtRunner::setLoggers(LogMethod error, LogMethod warn, LogMethod debug) {
    std::lock_guard<std::mutex> lck(dht_mtx);
    if (dht_)
        dht_->setLoggers(error, warn, debug);
-#ifdef OPENDHT_PROXY_CLIENT
+#if OPENDHT_PROXY_CLIENT
    if (dht_via_proxy_)
        dht_via_proxy_->setLoggers(error, warn, debug);
 #endif
@@ -262,7 +261,7 @@ DhtRunner::setLogFilter(const InfoHash& f) {
    activeDht()->setLogFilter(f);
    if (dht_)
        dht_->setLogFilter(f);
-#ifdef OPENDHT_PROXY_CLIENT
+#if OPENDHT_PROXY_CLIENT
    if (dht_via_proxy_)
        dht_via_proxy_->setLogFilter(f);
 #endif
@@ -376,7 +375,7 @@ DhtRunner::registerCertificate(std::shared_ptr<crypto::Certificate> cert) {
 void
 DhtRunner::setLocalCertificateStore(CertificateStoreQuery&& query_method) {
    std::lock_guard<std::mutex> lck(dht_mtx);
-#ifdef OPENDHT_PROXY_CLIENT
+#if OPENDHT_PROXY_CLIENT
    if (dht_via_proxy_)
        dht_via_proxy_->setLocalCertificateStore(std::forward<CertificateStoreQuery>(query_method));
 #endif
@@ -411,15 +410,25 @@ DhtRunner::loop_()
        received = std::move(rcv);
    }
    if (not received.empty()) {
+        size_t packet_num = received.size();
+        auto start = clock::now();
        while (not received.empty()) {
            auto& pck = received.front();
-            auto delay = clock::now() - pck.received;
-            if (delay > std::chrono::milliseconds(500))
+            auto now = clock::now();
+            auto delay = now - pck.received;
+            if (delay > std::chrono::seconds(1))
                std::cerr << "Dropping packet with high delay: " << print_dt(delay) << std::endl;
-            else
+            else {
                wakeup = dht->periodic(pck.data.data(), pck.data.size()-1, pck.from);
+                auto end = clock::now();
+                std::cerr << "periodic took " << print_dt(end - now)*1000 << std::endl;
+            }
            received.pop();
        }
+        if (packet_num > 1) {
+            auto time_all = print_dt(clock::now() - start);
+            std::cerr << "Treating " << packet_num << " packets took " << time_all << " - " << (packet_num/time_all) << " packets/sec" << std::endl;
+        }
    } else {
        wakeup = dht->periodic(nullptr, 0, nullptr, 0);
    }
@@ -459,11 +468,8 @@ int bindSocket(const SockAddr& addr, SockAddr& bound)
    if (is_ipv6)
        setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY, (const char*)&set, sizeof(set));
    int rc = bind(sock, addr.get(), addr.getLength());
-    if(rc < 0) {
-        rc = errno;
-        close(sock);
+    if(rc < 0)
        throw DhtException("Can't bind socket on " + addr.toString() + " " + strerror(rc));
-    }
    sockaddr_storage ss;
    socklen_t ss_len = sizeof(ss);
    getsockname(sock, (sockaddr*)&ss, &ss_len);
@@ -471,105 +477,39 @@ int bindSocket(const SockAddr& addr, SockAddr& bound)
    return sock;
 }

-#ifdef _WIN32
-inline void udpPipe(int fds[2])
-{
-    int lst = socket(AF_INET, SOCK_DGRAM, 0);
-    if (lst < 0)
-        throw DhtException(std::string("Can't open socket: ") + strerror(lst));
-    sockaddr_in inaddr;
-    sockaddr addr;
-    memset(&inaddr, 0, sizeof(inaddr));
-    memset(&addr, 0, sizeof(addr));
-    inaddr.sin_family = AF_INET;
-    inaddr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
-    inaddr.sin_port = 0;
-    int yes=1;
-    setsockopt(lst, SOL_SOCKET, SO_REUSEADDR, (char*)&yes, sizeof(yes));
-    int rc = bind(lst, (sockaddr*)&inaddr, sizeof(inaddr));
-    if (rc < 0) {
-        close(lst);
-        throw DhtException("Can't bind socket on " + print_addr((sockaddr*)&addr, sizeof(inaddr)) + " " + strerror(rc));
-    }
-    socklen_t len = sizeof(inaddr);
-    getsockname(lst, &addr, &len);
-    fds[0] = lst;
-    fds[1] = socket(AF_INET, SOCK_DGRAM, 0);
-    connect(fds[1], &addr, len);
-}
-#endif
-
-void
-DhtRunner::stopNetwork()
-{
-    running_network = false;
-    if (stop_writefd != -1) {
-        if (write(stop_writefd, "\0", 1) == -1) {
-            perror("write");
-        }
-    }
-}
-
 void
 DhtRunner::startNetwork(const SockAddr sin4, const SockAddr sin6)
 {
-    stopNetwork();
+    running_network = false;
    if (rcv_thread.joinable())
        rcv_thread.join();
-
-    int stopfds[2];
-#ifndef _WIN32
-    auto status = pipe(stopfds);
-    if (status == -1) {
-        throw DhtException(std::string("Can't open pipe: ") + strerror(errno));
-    }
-#else
-    udpPipe(stopfds);
-#endif
-    int stop_readfd = stopfds[0];
-    stop_writefd = stopfds[1];
-
    s4 = -1;
    s6 = -1;

    bound4 = {};
-    if (sin4) {
-        try {
-            s4 = bindSocket(sin4, bound4);
-        } catch (const DhtException& e) {
-            std::cerr << "Can't bind inet socket: " << e.what() << std::endl;
-        }
-    }
+    if (sin4)
+        s4 = bindSocket(sin4, bound4);

 #if 1
    bound6 = {};
-    if (sin6) {
-        try {
-            s6 = bindSocket(sin6, bound6);
-        } catch (const DhtException& e) {
-            std::cerr << "Can't bind inet6 socket: " << e.what() << std::endl;
-        }
-    }
+    if (sin6)
+        s6 = bindSocket(sin6, bound6);
 #endif

-    if (s4 == -1 && s6 == -1) {
-        throw DhtException("Can't bind socket");
-    }
-
    running_network = true;
-    rcv_thread = std::thread([this, stop_readfd]() {
+    rcv_thread = std::thread([this]() {
        try {
            while (running_network) {
+                struct timeval tv {/*.tv_sec = */0, /*.tv_usec = */250000};
                fd_set readfds;

                FD_ZERO(&readfds);
-                FD_SET(stop_readfd, &readfds);
                if(s4 >= 0)
                    FD_SET(s4, &readfds);
                if(s6 >= 0)
                    FD_SET(s6, &readfds);

-                int rc = select(s4 > s6 ? s4 + 1 : s6 + 1, &readfds, nullptr, nullptr, nullptr);
+                int rc = select(s4 > s6 ? s4 + 1 : s6 + 1, &readfds, nullptr, nullptr, &tv);
                if(rc < 0) {
                    if(errno != EINTR) {
                        perror("select");
@@ -590,13 +530,13 @@ DhtRunner::startNetwork(const SockAddr sin4, const SockAddr sin6)
                    else if(s6 >= 0 && FD_ISSET(s6, &readfds))
                        rc = recvfrom(s6, (char*)buf.data(), buf.size(), 0, (sockaddr*)&from, &from_len);
                    else
-                        continue;
+                        break;
                    if (rc > 0) {
                        {
                            std::lock_guard<std::mutex> lck(sock_mtx);
                            if (rcv.size() >= RX_QUEUE_MAX_SIZE) {
                                std::cerr << "Dropping packet: queue is full!" << std::endl;
-                                rcv.pop();
+                                continue;
                            }
                            rcv.emplace(ReceivedPacket {Blob {buf.begin(), buf.begin()+rc+1}, SockAddr(from, from_len), clock::now()});
                        }
@@ -615,11 +555,6 @@ DhtRunner::startNetwork(const SockAddr sin4, const SockAddr sin6)
        s6 = -1;
        bound4 = {};
        bound6 = {};
-        if (stop_readfd != -1)
-            close(stop_readfd);
-        if (stop_writefd != -1)
-            close(stop_writefd);
-        stop_writefd = -1;
    });
 }

@@ -629,7 +564,7 @@ DhtRunner::get(InfoHash hash, GetCallback vcb, DoneCallback dcb, Value::Filter f
    {
        std::lock_guard<std::mutex> lck(storage_mtx);
        pending_ops.emplace([=](SecureDht& dht) mutable {
-            dht.get(hash, std::move(vcb), std::move(dcb), std::move(f), std::move(w));
+            dht.get(hash, vcb, dcb, std::move(f), std::move(w));
        });
    }
    cv.notify_all();
@@ -638,14 +573,14 @@ DhtRunner::get(InfoHash hash, GetCallback vcb, DoneCallback dcb, Value::Filter f
 void
 DhtRunner::get(const std::string& key, GetCallback vcb, DoneCallbackSimple dcb, Value::Filter f, Where w)
 {
-    get(InfoHash::get(key), std::move(vcb), std::move(dcb), std::move(f), std::move(w));
+    get(InfoHash::get(key), vcb, dcb, f, w);
 }
 void
 DhtRunner::query(const InfoHash& hash, QueryCallback cb, DoneCallback done_cb, Query q) {
    {
        std::lock_guard<std::mutex> lck(storage_mtx);
        pending_ops.emplace([=](SecureDht& dht) mutable {
-            dht.query(hash, std::move(cb), std::move(done_cb), std::move(q));
+            dht.query(hash, cb, done_cb, std::move(q));
        });
    }
    cv.notify_all();
@@ -658,7 +593,6 @@ DhtRunner::listen(InfoHash hash, ValueCallback vcb, Value::Filter f, Where w)
    {
        std::lock_guard<std::mutex> lck(storage_mtx);
        pending_ops.emplace([=](SecureDht& dht) mutable {
-#ifdef OPENDHT_PROXY_CLIENT
            auto tokenbGlobal = listener_token_++;
            Listener listener {};
            listener.hash = hash;
@@ -666,20 +600,21 @@ DhtRunner::listen(InfoHash hash, ValueCallback vcb, Value::Filter f, Where w)
            listener.w = std::move(w);
            listener.gcb = [hash,vcb,tokenbGlobal,this](const std::vector<Sp<Value>>& vals, bool expired){
                if (not vcb(vals, expired)) {
+#if OPENDHT_PROXY_CLIENT
                    cancelListen(hash, tokenbGlobal);
+#endif
                    return false;
                }
                return true;
            };
+#if OPENDHT_PROXY_CLIENT
            if (use_proxy)
                listener.tokenProxyDht = dht.listen(hash, listener.gcb, listener.f, listener.w);
            else
+#endif
                listener.tokenClassicDht = dht.listen(hash, listener.gcb, listener.f, listener.w);
            listeners_.emplace(tokenbGlobal, std::move(listener));
            ret_token->set_value(tokenbGlobal);
-#else
-            ret_token->set_value(dht.listen(hash, std::move(vcb), std::move(f), std::move(w)));
-#endif
        });
    }
    cv.notify_all();
@@ -689,7 +624,7 @@ DhtRunner::listen(InfoHash hash, ValueCallback vcb, Value::Filter f, Where w)
 std::future<size_t>
 DhtRunner::listen(const std::string& key, GetCallback vcb, Value::Filter f, Where w)
 {
-    return listen(InfoHash::get(key), std::move(vcb), std::move(f), std::move(w));
+    return listen(InfoHash::get(key), vcb, f, w);
 }

 void
@@ -697,7 +632,7 @@ DhtRunner::cancelListen(InfoHash h, size_t token)
 {
    {
        std::lock_guard<std::mutex> lck(storage_mtx);
-#ifdef OPENDHT_PROXY_CLIENT
+#if OPENDHT_PROXY_CLIENT
        pending_ops.emplace([=](SecureDht&) {
            auto it = listeners_.find(token);
            if (it == listeners_.end()) return;
@@ -721,7 +656,7 @@ DhtRunner::cancelListen(InfoHash h, std::shared_future<size_t> ftoken)
 {
    {
        std::lock_guard<std::mutex> lck(storage_mtx);
-#ifdef OPENDHT_PROXY_CLIENT
+#if OPENDHT_PROXY_CLIENT
        pending_ops.emplace([=](SecureDht&) {
            auto it = listeners_.find(ftoken.get());
            if (it == listeners_.end()) return;
@@ -768,7 +703,7 @@ DhtRunner::put(InfoHash hash, std::shared_ptr<Value> value, DoneCallback cb, tim
 void
 DhtRunner::put(const std::string& key, Value&& value, DoneCallbackSimple cb, time_point created, bool permanent)
 {
-    put(InfoHash::get(key), std::forward<Value>(value), std::move(cb), created, permanent);
+    put(InfoHash::get(key), std::forward<Value>(value), cb, created, permanent);
 }

 void
@@ -798,13 +733,13 @@ DhtRunner::putSigned(InfoHash hash, std::shared_ptr<Value> value, DoneCallback c
 void
 DhtRunner::putSigned(InfoHash hash, Value&& value, DoneCallback cb)
 {
-    putSigned(hash, std::make_shared<Value>(std::move(value)), std::move(cb));
+    putSigned(hash, std::make_shared<Value>(std::move(value)), cb);
 }

 void
 DhtRunner::putSigned(const std::string& key, Value&& value, DoneCallbackSimple cb)
 {
-    putSigned(InfoHash::get(key), std::forward<Value>(value), std::move(cb));
+    putSigned(InfoHash::get(key), std::forward<Value>(value), cb);
 }

 void
@@ -822,13 +757,13 @@ DhtRunner::putEncrypted(InfoHash hash, InfoHash to, std::shared_ptr<Value> value
 void
 DhtRunner::putEncrypted(InfoHash hash, InfoHash to, Value&& value, DoneCallback cb)
 {
-    putEncrypted(hash, to, std::make_shared<Value>(std::move(value)), std::move(cb));
+    putEncrypted(hash, to, std::make_shared<Value>(std::move(value)), cb);
 }

 void
 DhtRunner::putEncrypted(const std::string& key, InfoHash to, Value&& value, DoneCallback cb)
 {
-    putEncrypted(InfoHash::get(key), to, std::forward<Value>(value), std::move(cb));
+    putEncrypted(InfoHash::get(key), to, std::forward<Value>(value), cb);
 }

 void
@@ -973,8 +908,8 @@ DhtRunner::findCertificate(InfoHash hash, std::function<void(const std::shared_p
 void
 DhtRunner::resetDht()
 {
-#ifdef OPENDHT_PROXY_CLIENT
    listeners_.clear();
+#if OPENDHT_PROXY_CLIENT
    dht_via_proxy_.reset();
 #endif // OPENDHT_PROXY_CLIENT
    dht_.reset();
@@ -983,7 +918,7 @@ DhtRunner::resetDht()
 SecureDht*
 DhtRunner::activeDht() const
 {
-#ifdef OPENDHT_PROXY_CLIENT
+#if OPENDHT_PROXY_CLIENT
    return use_proxy? dht_via_proxy_.get() : dht_.get();
 #else
    return dht_.get();
@@ -993,7 +928,7 @@ DhtRunner::activeDht() const
 void
 DhtRunner::setProxyServer(const std::string& proxy, const std::string& pushNodeId)
 {
-#ifdef OPENDHT_PROXY_CLIENT
+#if OPENDHT_PROXY_CLIENT
    if (config_.proxy_server == proxy and config_.push_node_id == pushNodeId)
        return;
    config_.proxy_server = proxy;
@@ -1008,7 +943,7 @@ DhtRunner::setProxyServer(const std::string& proxy, const std::string& pushNodeI
 void
 DhtRunner::enableProxy(bool proxify)
 {
-#ifdef OPENDHT_PROXY_CLIENT
+#if OPENDHT_PROXY_CLIENT
    if (dht_via_proxy_) {
        dht_via_proxy_->shutdown({});
    }
@@ -1026,7 +961,7 @@ DhtRunner::enableProxy(bool proxify)
            }, config_.proxy_server, config_.push_node_id)
        );
        dht_via_proxy_ = std::unique_ptr<SecureDht>(new SecureDht(std::move(dht_via_proxy), config_.dht_config));
-#ifdef OPENDHT_PUSH_NOTIFICATIONS
+#if OPENDHT_PUSH_NOTIFICATIONS
        if (not pushToken_.empty())
            dht_via_proxy_->setPushNotificationToken(pushToken_);
 #endif
@@ -1059,8 +994,8 @@ DhtRunner::enableProxy(bool proxify)
 void
 DhtRunner::forwardAllMessages(bool forward)
 {
-#ifdef OPENDHT_PROXY_SERVER
-#ifdef OPENDHT_PROXY_CLIENT
+#if OPENDHT_PROXY_SERVER
+#if OPENDHT_PROXY_CLIENT
    if (dht_via_proxy_)
        dht_via_proxy_->forwardAllMessages(forward);
 #endif // OPENDHT_PROXY_CLIENT
@@ -1074,7 +1009,7 @@ DhtRunner::forwardAllMessages(bool forward)
 */
 void
 DhtRunner::setPushNotificationToken(const std::string& token) {
-#if defined(OPENDHT_PROXY_CLIENT) && defined(OPENDHT_PUSH_NOTIFICATIONS)
+#if OPENDHT_PROXY_CLIENT && OPENDHT_PUSH_NOTIFICATIONS
    pushToken_ = token;
    if (dht_via_proxy_)
        dht_via_proxy_->setPushNotificationToken(token);
@@ -1084,7 +1019,7 @@ DhtRunner::setPushNotificationToken(const std::string& token) {
 void
 DhtRunner::pushNotificationReceived(const std::map<std::string, std::string>& data)
 {
-#if defined(OPENDHT_PROXY_CLIENT) && defined(OPENDHT_PUSH_NOTIFICATIONS)
+#if OPENDHT_PROXY_CLIENT && OPENDHT_PUSH_NOTIFICATIONS
    {
        std::lock_guard<std::mutex> lck(storage_mtx);
        pending_ops_prio.emplace([=](SecureDht&) {
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 Savoir-faire Linux Inc.
 *  Author(s) : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 *              Simon Désaulniers <simon.desaulniers@savoirfairelinux.com>
 *              Nicolas Reynaud <nicolas.reynaud@savoirfairelinux.com>
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 Savoir-faire Linux Inc.
 *  Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 *
 *  This program is free software; you can redistribute it and/or modify
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 Savoir-faire Linux Inc.
 *  Author(s) : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 *
 *  This program is free software; you can redistribute it and/or modify
@@ -48,4 +48,11 @@ struct LocalListener {
    ValueCallback get_cb;
 };

+
+struct SearchListener {
+    Sp<Query> query;
+    Value::Filter filter;
+    ValueCallback get_cb;
+};
+
 }
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 Savoir-faire Linux Inc.
 *
 *  Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 *
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2017 Savoir-faire Linux Inc.
 *  Author(s) : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 *
 *  This program is free software; you can redistribute it and/or modify
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 Savoir-faire Linux Inc.
 *  Author(s) : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 *              Simon Désaulniers <simon.desaulniers@savoirfairelinux.com>
 *
@@ -142,27 +142,19 @@ RequestAnswer::RequestAnswer(ParsedMessage&& msg)
 NetworkEngine::NetworkEngine(Logger& log, Scheduler& scheduler, const int& s, const int& s6)
    : myid(zeroes), dht_socket(s), dht_socket6(s6), DHT_LOG(log), scheduler(scheduler)
 {}
-
 NetworkEngine::NetworkEngine(InfoHash& myid, NetId net, const int& s, const int& s6, Logger& log, Scheduler& scheduler,
-        decltype(NetworkEngine::onError)&& onError,
-        decltype(NetworkEngine::onNewNode)&& onNewNode,
-        decltype(NetworkEngine::onReportedAddr)&& onReportedAddr,
-        decltype(NetworkEngine::onPing)&& onPing,
-        decltype(NetworkEngine::onFindNode)&& onFindNode,
-        decltype(NetworkEngine::onGetValues)&& onGetValues,
-        decltype(NetworkEngine::onListen)&& onListen,
-        decltype(NetworkEngine::onAnnounce)&& onAnnounce,
-        decltype(NetworkEngine::onRefresh)&& onRefresh) :
-    onError(std::move(onError)),
-    onNewNode(std::move(onNewNode)),
-    onReportedAddr(std::move(onReportedAddr)),
-    onPing(std::move(onPing)),
-    onFindNode(std::move(onFindNode)),
-    onGetValues(std::move(onGetValues)),
-    onListen(std::move(onListen)),
-    onAnnounce(std::move(onAnnounce)),
-    onRefresh(std::move(onRefresh)),
-    myid(myid), network(net), dht_socket(s), dht_socket6(s6), DHT_LOG(log), scheduler(scheduler)
+        decltype(NetworkEngine::onError) onError,
+        decltype(NetworkEngine::onNewNode) onNewNode,
+        decltype(NetworkEngine::onReportedAddr) onReportedAddr,
+        decltype(NetworkEngine::onPing) onPing,
+        decltype(NetworkEngine::onFindNode) onFindNode,
+        decltype(NetworkEngine::onGetValues) onGetValues,
+        decltype(NetworkEngine::onListen) onListen,
+        decltype(NetworkEngine::onAnnounce) onAnnounce,
+        decltype(NetworkEngine::onRefresh) onRefresh) :
+    onError(onError), onNewNode(onNewNode), onReportedAddr(onReportedAddr), onPing(onPing), onFindNode(onFindNode),
+    onGetValues(onGetValues), onListen(onListen), onAnnounce(onAnnounce), onRefresh(onRefresh), myid(myid),
+    network(net), dht_socket(s), dht_socket6(s6), DHT_LOG(log), scheduler(scheduler)
 {
    if (dht_socket >= 0) {
        if (!set_nonblocking(dht_socket, 1))
@@ -193,29 +185,29 @@ NetworkEngine::tellListener(Sp<Node> node, Tid socket_id, const InfoHash& hash,
 }

 void
-NetworkEngine::tellListenerRefreshed(Sp<Node> n, Tid socket_id, const InfoHash&, const Blob& token, const std::vector<Value::Id>& values)
+NetworkEngine::tellListenerRefreshed(Sp<Node> n, Tid socket_id, const InfoHash& hash, const Blob& token, const std::vector<Value::Id>& values)
 {
    msgpack::sbuffer buffer;
    msgpack::packer<msgpack::sbuffer> pk(&buffer);
    pk.pack_map(4+(network?1:0));

-    pk.pack(KEY_U);
+    pk.pack(std::string("u"));
    pk.pack_map(1 + (not values.empty()?1:0) + (not token.empty()?1:0));
-    pk.pack(KEY_REQ_ID); pk.pack(myid);
+    pk.pack(std::string("id")); pk.pack(myid);
    if (not token.empty()) {
-        pk.pack(KEY_REQ_TOKEN); packToken(pk, token);
+        pk.pack(std::string("token")); packToken(pk, token);
    }
    if (not values.empty()) {
-        pk.pack(KEY_REQ_REFRESHED);
+        pk.pack(std::string("re"));
        pk.pack(values);
        DHT_LOG.d(n->id, "[node %s] sending %zu refreshed values", n->toString().c_str(), values.size());
    }

-    pk.pack(KEY_TID); pk.pack(socket_id);
-    pk.pack(KEY_Y); pk.pack(KEY_R);
-    pk.pack(KEY_UA); pk.pack(my_v);
+    pk.pack(std::string("t")); pk.pack(socket_id);
+    pk.pack(std::string("y")); pk.pack(std::string("r"));
+    pk.pack(std::string("v")); pk.pack(my_v);
    if (network) {
-        pk.pack(KEY_NETID); pk.pack(network);
+        pk.pack(std::string("n")); pk.pack(network);
    }

    // send response
@@ -223,29 +215,29 @@ NetworkEngine::tellListenerRefreshed(Sp<Node> n, Tid socket_id, const InfoHash&,
 }

 void
-NetworkEngine::tellListenerExpired(Sp<Node> n, Tid socket_id, const InfoHash&, const Blob& token, const std::vector<Value::Id>& values)
+NetworkEngine::tellListenerExpired(Sp<Node> n, Tid socket_id, const InfoHash& hash, const Blob& token, const std::vector<Value::Id>& values)
 {
    msgpack::sbuffer buffer;
    msgpack::packer<msgpack::sbuffer> pk(&buffer);
    pk.pack_map(4+(network?1:0));

-    pk.pack(KEY_U);
+    pk.pack(std::string("u"));
    pk.pack_map(1 + (not values.empty()?1:0) + (not token.empty()?1:0));
-    pk.pack(KEY_REQ_ID); pk.pack(myid);
+    pk.pack(std::string("id")); pk.pack(myid);
    if (not token.empty()) {
-        pk.pack(KEY_REQ_TOKEN); packToken(pk, token);
+        pk.pack(std::string("token")); packToken(pk, token);
    }
    if (not values.empty()) {
-        pk.pack(KEY_REQ_EXPIRED);
+        pk.pack(std::string("exp"));
        pk.pack(values);
        DHT_LOG.d(n->id, "[node %s] sending %zu expired values", n->toString().c_str(), values.size());
    }

-    pk.pack(KEY_TID); pk.pack(socket_id);
-    pk.pack(KEY_Y); pk.pack(KEY_R);
-    pk.pack(KEY_UA); pk.pack(my_v);
+    pk.pack(std::string("t")); pk.pack(socket_id);
+    pk.pack(std::string("y")); pk.pack(std::string("r"));
+    pk.pack(std::string("v")); pk.pack(my_v);
    if (network) {
-        pk.pack(KEY_NETID); pk.pack(network);
+        pk.pack(std::string("n")); pk.pack(network);
    }

    // send response
@@ -361,8 +353,9 @@ NetworkEngine::rateLimit(const SockAddr& addr)
        limiter_maintenance = 0;
    }

+    auto it = address_rate_limiter.emplace(addr, IpLimiter{});
    // invoke per IP, then global rate limiter
-    return address_rate_limiter[addr].limit(now) and rate_limiter.limit(now);
+    return it.first->second.limit(now) and rate_limiter.limit(now);
 }

 bool
@@ -410,6 +403,7 @@ NetworkEngine::isNodeBlacklisted(const SockAddr& addr) const
 void
 NetworkEngine::processMessage(const uint8_t *buf, size_t buflen, const SockAddr& from)
 {
+    in_stats.packets++;
    if (isMartian(from)) {
        DHT_LOG.w("Received packet from martian node %s", from.toString().c_str());
        return;
@@ -426,7 +420,7 @@ NetworkEngine::processMessage(const uint8_t *buf, size_t buflen, const SockAddr&
        msg->msgpack_unpack(msg_res.get());
    } catch (const std::exception& e) {
        DHT_LOG.w("Can't parse message of size %lu: %s", buflen, e.what());
-        //DHT_LOG.DBG.logPrintable(buf, buflen);
+        DHT_LOG.DEBUG.logPrintable(buf, buflen);
        return;
    }

@@ -441,8 +435,7 @@ NetworkEngine::processMessage(const uint8_t *buf, size_t buflen, const SockAddr&
    if (msg->type == MessageType::ValueData) {
        auto pmsg_it = partial_messages.find(msg->tid);
        if (pmsg_it == partial_messages.end()) {
-            if (logIncoming_)
-                DHT_LOG.d("Can't find partial message");
+            DHT_LOG.d("Can't find partial message");
            rateLimit(from);
            return;
        }
@@ -482,15 +475,15 @@ NetworkEngine::processMessage(const uint8_t *buf, size_t buflen, const SockAddr&
        process(std::move(msg), from);
    } else {
        // starting partial message session
-        auto k = msg->tid;
-        auto& pmsg = partial_messages[k];
-        if (not pmsg.msg) {
-            pmsg.from = from;
-            pmsg.msg = std::move(msg);
-            pmsg.start = now;
-            pmsg.last_part = now;
-            scheduler.add(now + RX_MAX_PACKET_TIME, std::bind(&NetworkEngine::maintainRxBuffer, this, k));
-            scheduler.add(now + RX_TIMEOUT, std::bind(&NetworkEngine::maintainRxBuffer, this, k));
+        PartialMessage pmsg;
+        pmsg.from = from;
+        pmsg.msg = std::move(msg);
+        pmsg.start = now;
+        pmsg.last_part = now;
+        auto wmsg = partial_messages.emplace(pmsg.msg->tid, std::move(pmsg));
+        if (wmsg.second) {
+            scheduler.add(now + RX_MAX_PACKET_TIME, std::bind(&NetworkEngine::maintainRxBuffer, this, wmsg.first->first));
+            scheduler.add(now + RX_TIMEOUT, std::bind(&NetworkEngine::maintainRxBuffer, this, wmsg.first->first));
        } else
            DHT_LOG.e("Partial message with given TID already exists");
    }
@@ -552,21 +545,19 @@ NetworkEngine::process(std::unique_ptr<ParsedMessage>&& msg, const SockAddr& fro
                req->reply_time = time_point::min();
                onError(req, DhtProtocolException {msg->error_code});
            } else {
-                if (logIncoming_)
-                    DHT_LOG.w(msg->id, "[node %s %s] received unknown error message %u",
+                DHT_LOG.w(msg->id, "[node %s %s] received unknown error message %u",
                        msg->id.toString().c_str(), from.toString().c_str(), msg->error_code);
            }
            break;
        }
        case MessageType::Reply:
            if (req) { /* request reply */
-                auto& r = *req;
-                if (r.getType() == MessageType::AnnounceValue or r.getType() == MessageType::Listen)
-                    r.node->authSuccess();
-                r.reply_time = scheduler.time();
+                if (msg->type == MessageType::AnnounceValue or msg->type == MessageType::Listen)
+                    req->node->authSuccess();
+                req->reply_time = scheduler.time();

                deserializeNodes(*msg, from);
-                r.setDone(std::move(*msg));
+                req->setDone(std::move(*msg));
                break;
            } else { /* request socket data */
                deserializeNodes(*msg, from);
@@ -584,8 +575,7 @@ NetworkEngine::process(std::unique_ptr<ParsedMessage>&& msg, const SockAddr& fro
            switch (msg->type) {
            case MessageType::Ping:
                ++in_stats.ping;
-                if (logIncoming_)
-                    DHT_LOG.d(node->id, "[node %s] sending pong", node->toString().c_str());
+                DHT_LOG.d(node->id, "[node %s] sending pong", node->toString().c_str());
                onPing(node);
                sendPong(from, msg->tid);
                break;
@@ -606,8 +596,7 @@ NetworkEngine::process(std::unique_ptr<ParsedMessage>&& msg, const SockAddr& fro
                break;
            }
            case MessageType::AnnounceValue: {
-                if (logIncoming_)
-                    DHT_LOG.d(msg->info_hash, node->id, "[node %s] got 'put' request for %s", node->toString().c_str(), msg->info_hash.toString().c_str());
+                DHT_LOG.d(msg->info_hash, node->id, "[node %s] got 'put' request for %s", node->toString().c_str(), msg->info_hash.toString().c_str());
                ++in_stats.put;
                onAnnounce(node, msg->info_hash, msg->token, msg->values, msg->created);

@@ -620,15 +609,13 @@ NetworkEngine::process(std::unique_ptr<ParsedMessage>&& msg, const SockAddr& fro
                break;
            }
            case MessageType::Refresh:
-                if (logIncoming_)
-                    DHT_LOG.d(msg->info_hash, node->id, "[node %s] got 'refresh' request for %s", node->toString().c_str(), msg->info_hash.toString().c_str());
+                DHT_LOG.d(msg->info_hash, node->id, "[node %s] got 'refresh' request for %s", node->toString().c_str(), msg->info_hash.toString().c_str());
                onRefresh(node, msg->info_hash, msg->token, msg->value_id);
                /* Same note as above in MessageType::AnnounceValue applies. */
                sendValueAnnounced(from, msg->tid, msg->value_id);
                break;
            case MessageType::Listen: {
-                if (logIncoming_)
-                    DHT_LOG.d(msg->info_hash, node->id, "[node %s] got 'listen' request for %s", node->toString().c_str(), msg->info_hash.toString().c_str());
+                DHT_LOG.d(msg->info_hash, node->id, "[node %s] got 'listen' request for %s", node->toString().c_str(), msg->info_hash.toString().c_str());
                ++in_stats.listen;
                RequestAnswer answer = onListen(node, msg->info_hash, msg->token, msg->socket_id, std::move(msg->query));
                auto nnodes = bufferNodes(from.getFamily(), msg->info_hash, msg->want, answer.nodes4, answer.nodes6);
@@ -677,6 +664,8 @@ NetworkEngine::send(const char *buf, size_t len, int flags, const SockAddr& addr
 #ifdef MSG_NOSIGNAL
    flags |= MSG_NOSIGNAL;
 #endif
+
+    out_stats.packets++;
    if (sendto(s, buf, len, flags, addr.get(), addr.getLength()) == -1) {
        int err = errno;
        DHT_LOG.e("Can't send message to %s: %s", addr.toString().c_str(), strerror(err));
@@ -695,16 +684,16 @@ NetworkEngine::sendPing(Sp<Node> node, RequestCb&& on_done, RequestExpiredCb&& o
    msgpack::packer<msgpack::sbuffer> pk(&buffer);
    pk.pack_map(5+(network?1:0));

-    pk.pack(KEY_A); pk.pack_map(1);
-     pk.pack(KEY_REQ_ID); pk.pack(myid);
+    pk.pack(std::string("a")); pk.pack_map(1);
+     pk.pack(std::string("id")); pk.pack(myid);

-    pk.pack(KEY_Q); pk.pack(QUERY_PING);
-    pk.pack(KEY_TID); pk.pack_bin(tid.size());
+    pk.pack(std::string("q")); pk.pack(std::string("ping"));
+    pk.pack(std::string("t")); pk.pack_bin(tid.size());
                              pk.pack_bin_body((const char*)tid.data(), tid.size());
-    pk.pack(KEY_Y); pk.pack(KEY_Q);
-    pk.pack(KEY_UA); pk.pack(my_v);
+    pk.pack(std::string("y")); pk.pack(std::string("q"));
+    pk.pack(std::string("v")); pk.pack(my_v);
    if (network) {
-        pk.pack(KEY_NETID); pk.pack(network);
+        pk.pack(std::string("n")); pk.pack(network);
    }

    auto req = std::make_shared<Request>(MessageType::Ping, tid.toInt(), node,
@@ -732,17 +721,17 @@ NetworkEngine::sendPong(const SockAddr& addr, Tid tid) {
    msgpack::packer<msgpack::sbuffer> pk(&buffer);
    pk.pack_map(4+(network?1:0));

-    pk.pack(KEY_R); pk.pack_map(2);
-      pk.pack(KEY_REQ_ID); pk.pack(myid);
+    pk.pack(std::string("r")); pk.pack_map(2);
+      pk.pack(std::string("id")); pk.pack(myid);
      insertAddr(pk, addr);

    TransId t (tid);
-    pk.pack(KEY_TID); pk.pack_bin(t.size());
+    pk.pack(std::string("t")); pk.pack_bin(t.size());
                               pk.pack_bin_body((const char*)t.data(), t.size());
-    pk.pack(KEY_Y); pk.pack(KEY_R);
-    pk.pack(KEY_UA); pk.pack(my_v);
+    pk.pack(std::string("y")); pk.pack(std::string("r"));
+    pk.pack(std::string("v")); pk.pack(my_v);
    if (network) {
-        pk.pack(KEY_NETID); pk.pack(network);
+        pk.pack(std::string("n")); pk.pack(network);
    }

    send(buffer.data(), buffer.size(), 0, addr);
@@ -756,23 +745,23 @@ NetworkEngine::sendFindNode(Sp<Node> n, const InfoHash& target, want_t want,
    msgpack::packer<msgpack::sbuffer> pk(&buffer);
    pk.pack_map(5+(network?1:0));

-    pk.pack(KEY_A); pk.pack_map(2 + (want>0?1:0));
-      pk.pack(KEY_REQ_ID);     pk.pack(myid);
-      pk.pack(KEY_REQ_TARGET); pk.pack(target);
+    pk.pack(std::string("a")); pk.pack_map(2 + (want>0?1:0));
+      pk.pack(std::string("id"));     pk.pack(myid);
+      pk.pack(std::string("target")); pk.pack(target);
    if (want > 0) {
-      pk.pack(KEY_REQ_WANT);
+      pk.pack(std::string("w"));
      pk.pack_array(((want & WANT4)?1:0) + ((want & WANT6)?1:0));
      if (want & WANT4) pk.pack(AF_INET);
      if (want & WANT6) pk.pack(AF_INET6);
    }

-    pk.pack(KEY_Q); pk.pack(QUERY_FIND);
-    pk.pack(KEY_TID); pk.pack_bin(tid.size());
+    pk.pack(std::string("q")); pk.pack(std::string("find"));
+    pk.pack(std::string("t")); pk.pack_bin(tid.size());
                               pk.pack_bin_body((const char*)tid.data(), tid.size());
-    pk.pack(KEY_Y); pk.pack(KEY_Q);
-    pk.pack(KEY_UA); pk.pack(my_v);
+    pk.pack(std::string("y")); pk.pack(std::string("q"));
+    pk.pack(std::string("v")); pk.pack(my_v);
    if (network) {
-        pk.pack(KEY_NETID); pk.pack(network);
+        pk.pack(std::string("n")); pk.pack(network);
    }

    auto req = std::make_shared<Request>(MessageType::FindNode, tid.toInt(), n,
@@ -802,26 +791,26 @@ NetworkEngine::sendGetValues(Sp<Node> n, const InfoHash& info_hash, const Query&
    msgpack::packer<msgpack::sbuffer> pk(&buffer);
    pk.pack_map(5+(network?1:0));

-    pk.pack(KEY_A);  pk.pack_map(2 +
+    pk.pack(std::string("a"));  pk.pack_map(2 +
                                (query.where.getFilter() or not query.select.getSelection().empty() ? 1:0) +
                                (want>0?1:0));
-      pk.pack(KEY_REQ_ID); pk.pack(myid);
-      pk.pack(KEY_REQ_H);  pk.pack(info_hash);
-      pk.pack(KEY_Q); pk.pack(query);
+      pk.pack(std::string("id")); pk.pack(myid);
+      pk.pack(std::string("h"));  pk.pack(info_hash);
+      pk.pack(std::string("q")); pk.pack(query);
    if (want > 0) {
-      pk.pack(KEY_REQ_WANT);
+      pk.pack(std::string("w"));
      pk.pack_array(((want & WANT4)?1:0) + ((want & WANT6)?1:0));
      if (want & WANT4) pk.pack(AF_INET);
      if (want & WANT6) pk.pack(AF_INET6);
    }

-    pk.pack(KEY_Q); pk.pack(QUERY_GET);
-    pk.pack(KEY_TID); pk.pack_bin(tid.size());
+    pk.pack(std::string("q")); pk.pack(std::string("get"));
+    pk.pack(std::string("t")); pk.pack_bin(tid.size());
                               pk.pack_bin_body((const char*)tid.data(), tid.size());
-    pk.pack(KEY_Y); pk.pack(KEY_Q);
-    pk.pack(KEY_UA); pk.pack(my_v);
+    pk.pack(std::string("y")); pk.pack(std::string("q"));
+    pk.pack(std::string("v")); pk.pack(my_v);
    if (network) {
-        pk.pack(KEY_NETID); pk.pack(network);
+        pk.pack(std::string("n")); pk.pack(network);
    }

    auto req = std::make_shared<Request>(MessageType::GetValues, tid.toInt(), n,
@@ -909,13 +898,13 @@ NetworkEngine::packValueHeader(msgpack::sbuffer& buffer, const std::vector<Sp<Va
        total_size += v.size();

    msgpack::packer<msgpack::sbuffer> pk(&buffer);
-    pk.pack(KEY_REQ_VALUES);
+    pk.pack(std::string("values"));
    pk.pack_array(svals.size());
    // try to put everything in a single UDP packet
    if (svals.size() < 50 && total_size < MAX_PACKET_VALUE_SIZE) {
        for (const auto& b : svals)
            buffer.write((const char*)b.data(), b.size());
-        // DHT_LOG.d("sending %lu bytes of values", total_size);
+        DHT_LOG.d("sending %lu bytes of values", total_size);
        svals.clear();
    } else {
        for (const auto& b : svals)
@@ -937,12 +926,12 @@ NetworkEngine::sendValueParts(const TransId& tid, const std::vector<Blob>& svals
            msgpack::packer<msgpack::sbuffer> pk(&buffer);
            pk.pack_map(3+(network?1:0));
            if (network) {
-                pk.pack(KEY_NETID); pk.pack(network);
+                pk.pack(std::string("n")); pk.pack(network);
            }
-            pk.pack(KEY_Y); pk.pack(KEY_V);
-            pk.pack(KEY_TID); pk.pack_bin(tid.size());
+            pk.pack(std::string("y")); pk.pack(std::string("v"));
+            pk.pack(std::string("t")); pk.pack_bin(tid.size());
                                       pk.pack_bin_body((const char*)tid.data(), tid.size());
-            pk.pack(KEY_V); pk.pack_map(1);
+            pk.pack(std::string("p")); pk.pack_map(1);
                pk.pack(i); pk.pack_map(2);
                    pk.pack(std::string("o")); pk.pack(start);
                    pk.pack(std::string("d")); pk.pack_bin(end-start);
@@ -962,22 +951,22 @@ NetworkEngine::sendNodesValues(const SockAddr& addr, Tid tid, const Blob& nodes,
    msgpack::packer<msgpack::sbuffer> pk(&buffer);
    pk.pack_map(4+(network?1:0));

-    pk.pack(KEY_R);
+    pk.pack(std::string("r"));
    pk.pack_map(2 + (not st.empty()?1:0) + (nodes.size()>0?1:0) + (nodes6.size()>0?1:0) + (not token.empty()?1:0));
-    pk.pack(KEY_REQ_ID); pk.pack(myid);
+    pk.pack(std::string("id")); pk.pack(myid);
    insertAddr(pk, addr);
    if (nodes.size() > 0) {
-        pk.pack(KEY_REQ_NODES4);
+        pk.pack(std::string("n4"));
        pk.pack_bin(nodes.size());
        pk.pack_bin_body((const char*)nodes.data(), nodes.size());
    }
    if (nodes6.size() > 0) {
-        pk.pack(KEY_REQ_NODES6);
+        pk.pack(std::string("n6"));
        pk.pack_bin(nodes6.size());
        pk.pack_bin_body((const char*)nodes6.data(), nodes6.size());
    }
    if (not token.empty()) {
-        pk.pack(KEY_REQ_TOKEN); packToken(pk, token);
+        pk.pack(std::string("token")); packToken(pk, token);
    }
    std::vector<Blob> svals {};
    if (not st.empty()) { /* pack complete values */
@@ -985,24 +974,24 @@ NetworkEngine::sendNodesValues(const SockAddr& addr, Tid tid, const Blob& nodes,
        if (fields.empty()) {
            svals = packValueHeader(buffer, st);
        } else { /* pack fields */
-            pk.pack(KEY_REQ_FIELDS);
+            pk.pack(std::string("fields"));
            pk.pack_map(2);
            pk.pack(std::string("f")); pk.pack(fields);
            pk.pack(std::string("v")); pk.pack_array(st.size()*fields.size());
            for (const auto& v : st)
                v->msgpack_pack_fields(fields, pk);
-            //DHT_LOG_DBG("sending closest nodes (%d+%d nodes.), %u value headers containing %u fields",
+            //DHT_LOG_DEBUG("sending closest nodes (%d+%d nodes.), %u value headers containing %u fields",
            //        nodes.size(), nodes6.size(), st.size(), fields.size());
        }
    }

    TransId t (tid);
-    pk.pack(KEY_TID); pk.pack_bin(t.size());
-                      pk.pack_bin_body((const char*)t.data(), t.size());
-    pk.pack(KEY_Y); pk.pack(KEY_R);
-    pk.pack(KEY_UA); pk.pack(my_v);
+    pk.pack(std::string("t")); pk.pack_bin(t.size());
+                               pk.pack_bin_body((const char*)t.data(), t.size());
+    pk.pack(std::string("y")); pk.pack(std::string("r"));
+    pk.pack(std::string("v")); pk.pack(my_v);
    if (network) {
-        pk.pack(KEY_NETID); pk.pack(network);
+        pk.pack(std::string("n")); pk.pack(network);
    }

    // send response
@@ -1094,23 +1083,23 @@ NetworkEngine::sendListen(Sp<Node> n,
    pk.pack_map(5+(network?1:0));

    auto has_query = query.where.getFilter() or not query.select.getSelection().empty();
-    pk.pack(KEY_A); pk.pack_map(4 + has_query);
-      pk.pack(KEY_REQ_ID);    pk.pack(myid);
-      pk.pack(KEY_REQ_H);     pk.pack(hash);
-      pk.pack(KEY_REQ_TOKEN); packToken(pk, token);
-      pk.pack(KEY_REQ_SID);   pk.pack_bin(sid.size());
-                              pk.pack_bin_body((const char*)sid.data(), sid.size());
+    pk.pack(std::string("a")); pk.pack_map(4 + has_query);
+      pk.pack(std::string("id"));    pk.pack(myid);
+      pk.pack(std::string("h"));     pk.pack(hash);
+      pk.pack(std::string("token")); packToken(pk, token);
+      pk.pack(std::string("sid"));  pk.pack_bin(sid.size());
+                                     pk.pack_bin_body((const char*)sid.data(), sid.size());
      if (has_query) {
-          pk.pack(KEY_REQ_QUERY); pk.pack(query);
+          pk.pack(std::string("q")); pk.pack(query);
      }

-    pk.pack(KEY_Q); pk.pack(QUERY_LISTEN);
-    pk.pack(KEY_TID); pk.pack_bin(tid.size());
+    pk.pack(std::string("q")); pk.pack(std::string("listen"));
+    pk.pack(std::string("t")); pk.pack_bin(tid.size());
                               pk.pack_bin_body((const char*)tid.data(), tid.size());
-    pk.pack(KEY_Y); pk.pack(KEY_Q);
-    pk.pack(KEY_UA); pk.pack(my_v);
+    pk.pack(std::string("y")); pk.pack(std::string("q"));
+    pk.pack(std::string("v")); pk.pack(my_v);
    if (network) {
-        pk.pack(KEY_NETID); pk.pack(network);
+        pk.pack(std::string("n")); pk.pack(network);
    }

    auto req = std::make_shared<Request>(MessageType::Listen, tid.toInt(), n,
@@ -1136,17 +1125,17 @@ NetworkEngine::sendListenConfirmation(const SockAddr& addr, Tid tid) {
    msgpack::packer<msgpack::sbuffer> pk(&buffer);
    pk.pack_map(4+(network?1:0));

-    pk.pack(KEY_R); pk.pack_map(2);
-      pk.pack(KEY_REQ_ID); pk.pack(myid);
+    pk.pack(std::string("r")); pk.pack_map(2);
+      pk.pack(std::string("id")); pk.pack(myid);
      insertAddr(pk, addr);

    TransId t (tid);
-    pk.pack(KEY_TID); pk.pack_bin(t.size());
+    pk.pack(std::string("t")); pk.pack_bin(t.size());
                               pk.pack_bin_body((const char*)t.data(), t.size());
-    pk.pack(KEY_Y); pk.pack(KEY_R);
-    pk.pack(KEY_UA); pk.pack(my_v);
+    pk.pack(std::string("y")); pk.pack(std::string("r"));
+    pk.pack(std::string("v")); pk.pack(my_v);
    if (network) {
-        pk.pack(KEY_NETID); pk.pack(network);
+        pk.pack(std::string("n")); pk.pack(network);
    }

    send(buffer.data(), buffer.size(), 0, addr);
@@ -1166,23 +1155,23 @@ NetworkEngine::sendAnnounceValue(Sp<Node> n,
    msgpack::packer<msgpack::sbuffer> pk(&buffer);
    pk.pack_map(5+(network?1:0));

-    pk.pack(KEY_A); pk.pack_map((created < scheduler.time() ? 5 : 4));
-      pk.pack(KEY_REQ_ID);     pk.pack(myid);
-      pk.pack(KEY_REQ_H);      pk.pack(infohash);
+    pk.pack(std::string("a")); pk.pack_map((created < scheduler.time() ? 5 : 4));
+      pk.pack(std::string("id"));     pk.pack(myid);
+      pk.pack(std::string("h"));      pk.pack(infohash);
      auto v = packValueHeader(buffer, {value});
      if (created < scheduler.time()) {
-          pk.pack(KEY_REQ_CREATION);
+          pk.pack(std::string("c"));
          pk.pack(to_time_t(created));
      }
-      pk.pack(KEY_REQ_TOKEN);  pk.pack(token);
+      pk.pack(std::string("token"));  pk.pack(token);

-    pk.pack(KEY_Q);   pk.pack(QUERY_PUT);
-    pk.pack(KEY_TID); pk.pack_bin(tid.size());
-                      pk.pack_bin_body((const char*)tid.data(), tid.size());
-    pk.pack(KEY_Y);   pk.pack(KEY_Q);
-    pk.pack(KEY_UA);  pk.pack(my_v);
+    pk.pack(std::string("q")); pk.pack(std::string("put"));
+    pk.pack(std::string("t")); pk.pack_bin(tid.size());
+                               pk.pack_bin_body((const char*)tid.data(), tid.size());
+    pk.pack(std::string("y")); pk.pack(std::string("q"));
+    pk.pack(std::string("v")); pk.pack(my_v);
    if (network) {
-        pk.pack(KEY_NETID); pk.pack(network);
+        pk.pack(std::string("n")); pk.pack(network);
    }

    auto req = std::make_shared<Request>(MessageType::AnnounceValue, tid.toInt(), n,
@@ -1224,19 +1213,19 @@ NetworkEngine::sendRefreshValue(Sp<Node> n,
    msgpack::packer<msgpack::sbuffer> pk(&buffer);
    pk.pack_map(5+(network?1:0));

-    pk.pack(KEY_A); pk.pack_map(4);
-      pk.pack(KEY_REQ_ID);       pk.pack(myid);
-      pk.pack(KEY_REQ_H);        pk.pack(infohash);
-      pk.pack(KEY_REQ_VALUE_ID); pk.pack(vid);
-      pk.pack(KEY_REQ_TOKEN);    pk.pack(token);
+    pk.pack(std::string("a")); pk.pack_map(4);
+      pk.pack(std::string("id"));  pk.pack(myid);
+      pk.pack(std::string("h"));  pk.pack(infohash);
+      pk.pack(std::string("vid")); pk.pack(vid);
+      pk.pack(std::string("token"));  pk.pack(token);

-    pk.pack(KEY_Q); pk.pack(QUERY_REFRESH);
-    pk.pack(KEY_TID); pk.pack_bin(tid.size());
+    pk.pack(std::string("q")); pk.pack(std::string("refresh"));
+    pk.pack(std::string("t")); pk.pack_bin(tid.size());
                               pk.pack_bin_body((const char*)tid.data(), tid.size());
-    pk.pack(KEY_Y); pk.pack(KEY_Q);
-    pk.pack(KEY_UA); pk.pack(my_v);
+    pk.pack(std::string("y")); pk.pack(std::string("q"));
+    pk.pack(std::string("v")); pk.pack(my_v);
    if (network) {
-        pk.pack(KEY_NETID); pk.pack(network);
+        pk.pack(std::string("n")); pk.pack(network);
    }

    auto req = std::make_shared<Request>(MessageType::Refresh, tid.toInt(), n,
@@ -1269,18 +1258,18 @@ NetworkEngine::sendValueAnnounced(const SockAddr& addr, Tid tid, Value::Id vid)
    msgpack::packer<msgpack::sbuffer> pk(&buffer);
    pk.pack_map(4+(network?1:0));

-    pk.pack(KEY_R); pk.pack_map(3);
-      pk.pack(KEY_REQ_ID);  pk.pack(myid);
-      pk.pack(KEY_REQ_VALUE_ID); pk.pack(vid);
+    pk.pack(std::string("r")); pk.pack_map(3);
+      pk.pack(std::string("id"));  pk.pack(myid);
+      pk.pack(std::string("vid")); pk.pack(vid);
      insertAddr(pk, addr);

    TransId t(tid);
-    pk.pack(KEY_TID); pk.pack_bin(t.size());
+    pk.pack(std::string("t")); pk.pack_bin(t.size());
                               pk.pack_bin_body((const char*)t.data(), t.size());
-    pk.pack(KEY_Y); pk.pack(KEY_R);
-    pk.pack(KEY_UA); pk.pack(my_v);
+    pk.pack(std::string("y")); pk.pack(std::string("r"));
+    pk.pack(std::string("v")); pk.pack(my_v);
    if (network) {
-        pk.pack(KEY_NETID); pk.pack(network);
+        pk.pack(std::string("n")); pk.pack(network);
    }

    send(buffer.data(), buffer.size(), 0, addr);
@@ -1297,22 +1286,22 @@ NetworkEngine::sendError(const SockAddr& addr,
    msgpack::packer<msgpack::sbuffer> pk(&buffer);
    pk.pack_map(4 + (include_id?1:0));

-    pk.pack(KEY_E); pk.pack_array(2);
+    pk.pack(std::string("e")); pk.pack_array(2);
      pk.pack(code);
      pk.pack(message);

    if (include_id) {
-        pk.pack(KEY_R); pk.pack_map(1);
-          pk.pack(KEY_REQ_ID); pk.pack(myid);
+        pk.pack(std::string("r")); pk.pack_map(1);
+          pk.pack(std::string("id")); pk.pack(myid);
    }

    TransId t(tid);
-    pk.pack(KEY_TID); pk.pack_bin(t.size());
+    pk.pack(std::string("t")); pk.pack_bin(t.size());
                               pk.pack_bin_body((const char*)t.data(), t.size());
-    pk.pack(KEY_Y); pk.pack(KEY_E);
-    pk.pack(KEY_UA); pk.pack(my_v);
+    pk.pack(std::string("y")); pk.pack(std::string("e"));
+    pk.pack(std::string("v")); pk.pack(my_v);
    if (network) {
-        pk.pack(KEY_NETID); pk.pack(network);
+        pk.pack(std::string("n")); pk.pack(network);
    }

    send(buffer.data(), buffer.size(), 0, addr);
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 Savoir-faire Linux Inc.
 *  Author(s) : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 *              Simon Désaulniers <simon.desaulniers@savoirfairelinux.com>
 *
@@ -49,7 +49,7 @@ Node::isGood(time_point now) const
 bool
 Node::isPendingMessage() const
 {
-    for (const auto& r : requests_) {
+    for (auto r : requests_) {
        if (r.second->pending())
            return true;
    }
@@ -60,7 +60,7 @@ size_t
 Node::getPendingMessageCount() const
 {
    size_t count {0};
-    for (const auto& r : requests_) {
+    for (auto r : requests_) {
        if (r.second->pending())
            count++;
    }
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 Savoir-faire Linux Inc.
 *  Author(s) : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 *
 *  This program is free software; you can redistribute it and/or modify
@@ -20,9 +20,6 @@

 namespace dht {

-constexpr size_t CLEANUP_MAX_NODES {1024};
-constexpr size_t CLEANUP_FREQ {1024};
-
 NodeCache::~NodeCache()
 {
    cache_4.setExpired();
@@ -44,33 +41,29 @@ NodeCache::getNode(const InfoHash& id, const SockAddr& addr, time_point now, boo
 std::vector<Sp<Node>>
 NodeCache::getCachedNodes(const InfoHash& id, sa_family_t sa_f, size_t count) const
 {
-    return cache(sa_f).getCachedNodes(id, count);
-}
+    const auto& c = cache(sa_f);

-std::vector<Sp<Node>>
-NodeCache::NodeMap::getCachedNodes(const InfoHash& id, size_t count) const
-{
    std::vector<Sp<Node>> nodes;
-    nodes.reserve(std::min(size(), count));
-    const_iterator it;
-    auto dec_it = [this](const_iterator& it) {
+    nodes.reserve(std::min(c.size(), count));
+    NodeMap::const_iterator it;
+    auto dec_it = [&c](NodeMap::const_iterator& it) {
        auto ret = it;
-        it = (it == cbegin()) ? cend() : std::prev(it);
+        it = (it == c.cbegin()) ? c.cend() : std::prev(it);
        return ret;
    };

-    auto it_p = lower_bound(id),
+    auto it_p = c.lower_bound(id),
        it_n = it_p;
-    if (not empty())
+    if (not c.empty())
        dec_it(it_p); /* Create 2 separate iterator if we could */

-    while (nodes.size() < count and (it_n != cend() or it_p != cend())) {
+    while (nodes.size() < count and (it_n != c.cend() or it_p != c.cend())) {
        /* If one of the iterator is at the end, then take the other one
           If they are both in middle of somewhere comapre both and take
           the closest to the id. */
-        if (it_p == cend())      it = it_n++;
-        else if (it_n == cend()) it = dec_it(it_p);
-        else                     it = id.xorCmp(it_p->first, it_n->first) < 0 ? dec_it(it_p) : it_n++;
+        if (it_p == c.cend())       it = it_n++;
+        else if (it_n == c.cend())  it = dec_it(it_p);
+        else                        it = id.xorCmp(it_p->first, it_n->first) < 0 ? dec_it(it_p) : it_n++;

        if (auto n = it->second.lock())
            if ( not n->isExpired() and not n->isClient() )
@@ -111,10 +104,6 @@ NodeCache::NodeMap::getNode(const InfoHash& id, const SockAddr& addr, time_point
    if (not node) {
        node = std::make_shared<Node>(id, addr, client);
        it.first->second = node;
-        if (cleanup_counter++ == CLEANUP_FREQ) {
-            cleanup();
-            cleanup_counter = 0;
-        }
    } else if (confirm or node->isOld(now)) {
        node->update(addr);
    }
@@ -131,7 +120,6 @@ NodeCache::NodeMap::clearBadNodes() {
            erase(it++);
        }
    }
-    cleanup_counter = 0;
 }

 void
@@ -140,21 +128,6 @@ NodeCache::NodeMap::setExpired() {
        if (auto n = wn.second.lock())
            n->setExpired();
    clear();
-    cleanup_counter = 0;
-}
-
-void
-NodeCache::NodeMap::cleanup()
-{
-    auto it = lower_bound(InfoHash::getRandom());
-    for (size_t n = 0, maxNodes = std::min(size(), CLEANUP_MAX_NODES); n != maxNodes; n++) {
-        if (it == end())
-            it = begin();
-        if (it->second.expired())
-            erase(it++);
-        else
-            ++it;
-    }
 }

 }
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2018 Savoir-faire Linux Inc.
 *  Author(s) : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 *
 *  This program is free software; you can redistribute it and/or modify
@@ -25,7 +25,7 @@ bool
 OpValueCache::onValuesAdded(const std::vector<Sp<Value>>& vals) {
    std::vector<Sp<Value>> newValues;
    for (const auto& v : vals) {
-        auto viop = values.emplace(v->id, v);
+        auto viop = values.emplace(v->id, OpCacheValueStorage{v});
        if (viop.second) {
            newValues.emplace_back(v);
        } else {
@@ -34,7 +34,6 @@ OpValueCache::onValuesAdded(const std::vector<Sp<Value>>& vals) {
    }
    return newValues.empty() ? true : callback(newValues, false);
 }
-
 bool
 OpValueCache::onValuesExpired(const std::vector<Sp<Value>>& vals) {
    std::vector<Sp<Value>> expiredValues;
@@ -50,26 +49,8 @@ OpValueCache::onValuesExpired(const std::vector<Sp<Value>>& vals) {
    }
    return expiredValues.empty() ? true : callback(expiredValues, true);
 }
-
-bool
-OpValueCache::onValuesExpired(const std::vector<Value::Id>& vids)
-{
-    std::vector<Sp<Value>> expiredValues;
-    for (const auto& vid : vids) {
-        auto vit = values.find(vid);
-        if (vit != values.end()) {
-            vit->second.refCount--;
-            if (not vit->second.refCount) {
-                expiredValues.emplace_back(std::move(vit->second.data));
-                values.erase(vit);
-            }
-        }
-    }
-    return expiredValues.empty() ? true : callback(expiredValues, true);
-}
-
 std::vector<Sp<Value>>
-OpValueCache::get(const Value::Filter& filter) const {
+OpValueCache::get(Value::Filter& filter) const {
    std::vector<Sp<Value>> ret;
    if (not filter)
        ret.reserve(values.size());
@@ -127,57 +108,33 @@ OpCache::getExpiration() const {
    return lastRemoved + EXPIRATION;
 }

-SearchCache::OpMap::iterator
-SearchCache::getOp(const Sp<Query>& q)
-{
-    // find exact match
-    auto op = ops.find(q);
-    if (op != ops.end())
-        return op;
-    // find satisfying query
-    for (auto it = ops.begin(); it != ops.end(); it++) {
-        if (q->isSatisfiedBy(*it->first)) {
-            return it;
-        }
-    }
-    return ops.end();
-}
-
-SearchCache::OpMap::const_iterator
-SearchCache::getOp(const Sp<Query>& q) const
-{
-    // find exact match
-    auto op = ops.find(q);
-    if (op != ops.cend())
-        return op;
-    // find satisfying query
-    for (auto it = ops.begin(); it != ops.end(); it++) {
-        if (q->isSatisfiedBy(*it->first)) {
-            return it;
-        }
-    }
-    return ops.cend();
-}
-
 size_t
-SearchCache::listen(const ValueCallback& get_cb, const Sp<Query>& q, const Value::Filter& filter, const OnListen& onListen)
+SearchCache::listen(ValueCallback get_cb, Sp<Query> q, Value::Filter filter, std::function<size_t(Sp<Query>, ValueCallback)> onListen)
 {
    // find exact match
-    auto op = getOp(q);
+    auto op = ops.find(q);
+    if (op == ops.end()) {
+        // find satisfying query
+        for (auto it = ops.begin(); it != ops.end(); it++) {
+            if (q->isSatisfiedBy(*it->first)) {
+                op = it;
+                break;
+            }
+        }
+    }
    if (op == ops.end()) {
        // New query
        op = ops.emplace(q, std::unique_ptr<OpCache>(new OpCache)).first;
        auto& cache = *op->second;
        cache.searchToken = onListen(q, [&](const std::vector<Sp<Value>>& values, bool expired){
            return cache.onValue(values, expired);
-        }, [&](ListenSyncStatus status) {
-            cache.onNodeChanged(status);
        });
    }
    auto token = nextToken_++;
    if (nextToken_ == 0)
        nextToken_++;
-    return op->second->addListener(token, get_cb, q, filter) ? token : 0;
+    op->second->addListener(token, get_cb, q, filter);
+    return token;
 }

 bool
@@ -192,7 +149,7 @@ SearchCache::cancelListen(size_t gtoken, const time_point& now) {
 }

 void
-SearchCache::cancelAll(const std::function<void(size_t)>& onCancel) {
+SearchCache::cancelAll(std::function<void(size_t)> onCancel) {
    for (auto& op : ops) {
        auto cache = std::move(op.second);
        cache->removeAll();
@@ -202,7 +159,7 @@ SearchCache::cancelAll(const std::function<void(size_t)>& onCancel) {
 }

 time_point
-SearchCache::expire(const time_point& now, const std::function<void(size_t)>& onCancel) {
+SearchCache::expire(const time_point& now, std::function<void(size_t)> onCancel) {
    nextExpiration_ = time_point::max();
    auto ret = nextExpiration_;
    for (auto it = ops.begin(); it != ops.end();) {
@@ -220,22 +177,8 @@ SearchCache::expire(const time_point& now, const std::function<void(size_t)>& on
    return ret;
 }

-bool
-SearchCache::get(const Value::Filter& f, const Sp<Query>& q, const GetCallback& gcb, const DoneCallback& dcb) const
-{
-    auto op = getOp(q);
-    if (op != ops.end()) {
-        auto vals = op->second->get(f);
-        if ((not vals.empty() and not gcb(vals)) or op->second->isSynced()) {
-            dcb(true, {});
-            return true;
-        }
-    }
-    return false;
-}
-
 std::vector<Sp<Value>>
-SearchCache::get(const Value::Filter& filter) const {
+SearchCache::get(Value::Filter& filter) const {
    if (ops.size() == 1)
        return ops.begin()->second->get(filter);
    std::map<Value::Id, Sp<Value>> c;
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2018 Savoir-faire Linux Inc.
 *  Author(s) : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 *
 *  This program is free software; you can redistribute it and/or modify
@@ -27,23 +27,20 @@ struct OpCacheValueStorage
 {
    Sp<Value> data {};
    unsigned refCount {1};
-    OpCacheValueStorage(Sp<Value> val) : data(val) {}
+    OpCacheValueStorage(Sp<Value> val = {}) : data(val) {}
 };

 class OpValueCache {
 public:
-    OpValueCache(ValueCallback&& cb) noexcept : callback(std::forward<ValueCallback>(cb)) {}
-    OpValueCache(OpValueCache&& o) noexcept : values(std::move(o.values)), callback(std::move(o.callback)) {
+    OpValueCache(ValueCallback&& cb) : callback(std::forward<ValueCallback>(cb)) {}
+    OpValueCache(OpValueCache&& o) : values(std::move(o.values)), callback(std::move(o.callback)) {
        o.callback = {};
    }

-    static ValueCallback cacheCallback(ValueCallback&& cb, std::function<void()>&& onCancel) {
+    static ValueCallback cacheCallback(ValueCallback&& cb) {
        auto cache = std::make_shared<OpValueCache>(std::forward<ValueCallback>(cb));
-        return [cache, onCancel](const std::vector<Sp<Value>>& vals, bool expired){
-            auto ret = cache->onValue(vals, expired);
-            if (not ret)
-                onCancel();
-            return ret;
+        return [cache](const std::vector<Sp<Value>>& vals, bool expired){
+            return cache->onValue(vals, expired);
        };
    }

@@ -56,20 +53,8 @@ public:

    bool onValuesAdded(const std::vector<Sp<Value>>& vals);
    bool onValuesExpired(const std::vector<Sp<Value>>& vals);
-    bool onValuesExpired(const std::vector<Value::Id>& vals);

-    void onNodeChanged(ListenSyncStatus status) {
-        switch (status) {
-            case ListenSyncStatus::ADDED: nodes++; break;
-            case ListenSyncStatus::REMOVED: nodes--; break;
-            case ListenSyncStatus::SYNCED : syncedNodes++; break;
-            case ListenSyncStatus::UNSYNCED: syncedNodes--; break;
-        }
-    }
-
-    bool isSynced() const { return nodes > 0 and syncedNodes == nodes; }
-
-    std::vector<Sp<Value>> get(const Value::Filter& filter) const;
+    std::vector<Sp<Value>> get(Value::Filter& filter) const;
    Sp<Value> get(Value::Id id) const;
    std::vector<Sp<Value>> getValues() const;

@@ -77,8 +62,6 @@ private:
    OpValueCache(const OpValueCache&) = delete;
    OpValueCache& operator=(const OpValueCache&) = delete;

-    size_t nodes {0};
-    size_t syncedNodes {0};
    std::map<Value::Id, OpCacheValueStorage> values {};
    ValueCallback callback;
 };
@@ -97,23 +80,13 @@ public:
        cache.onValue(vals, expired);
        return not listeners.empty();
    }
-    void onNodeChanged(ListenSyncStatus status) {
-        cache.onNodeChanged(status);
-    }

    void onValuesAdded(const std::vector<Sp<Value>>& vals);
    void onValuesExpired(const std::vector<Sp<Value>>& vals);

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

    bool removeListener(size_t token, const time_point& now) {
@@ -129,7 +102,7 @@ public:
        return listeners.empty();
    }

-    std::vector<Sp<Value>> get(const Value::Filter& filter) const {
+    std::vector<Sp<Value>> get(Value::Filter& filter) const {
        return cache.get(filter);
    }

@@ -137,10 +110,6 @@ public:
        return cache.get(id);
    }

-    bool isSynced() const {
-        return cache.isSynced();
-    }
-
    bool isExpired(const time_point& now) const {
        return listeners.empty() and (lastRemoved + EXPIRATION < now);
    }
@@ -161,31 +130,24 @@ class SearchCache {
 public:
    SearchCache() {}
    SearchCache(SearchCache&&) = default;
-
-    using OnListen = std::function<size_t(Sp<Query>, ValueCallback, SyncCallback)>;
-    size_t listen(const ValueCallback& get_cb, const Sp<Query>& q, const Value::Filter& filter, const OnListen& onListen);
+    size_t listen(ValueCallback get_cb, Sp<Query> q, Value::Filter filter, std::function<size_t(Sp<Query>, ValueCallback)> onListen);

    bool cancelListen(size_t gtoken, const time_point& now);
-    void cancelAll(const std::function<void(size_t)>& onCancel);
+    void cancelAll(std::function<void(size_t)> onCancel);

-    time_point expire(const time_point& now, const std::function<void(size_t)>& onCancel);
+    time_point expire(const time_point& now, std::function<void(size_t)> onCancel);
    time_point getExpiration() const {
        return nextExpiration_;
    }

-    bool get(const Value::Filter& f, const Sp<Query>& q, const GetCallback& gcb, const DoneCallback& dcb) const;
-    std::vector<Sp<Value>> get(const Value::Filter& filter) const;
+    std::vector<Sp<Value>> get(Value::Filter& filter) const;
    Sp<Value> get(Value::Id id) const;

 private:
    SearchCache(const SearchCache&) = delete;
    SearchCache& operator=(const SearchCache&) = delete;

-    using OpMap = std::map<Sp<Query>, std::unique_ptr<OpCache>>;
-    OpMap ops {};
-    OpMap::iterator getOp(const Sp<Query>& q);
-    OpMap::const_iterator getOp(const Sp<Query>& q) const;
-
+    std::map<Sp<Query>, std::unique_ptr<OpCache>> ops {};
    size_t nextToken_ {1};
    time_point nextExpiration_ {time_point::max()};
 };
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2017 Savoir-faire Linux Inc.
 *  Author(s) : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 *
 *  This program is free software; you can redistribute it and/or modify
@@ -26,42 +26,6 @@
 namespace dht {
 namespace net {

-static const std::string KEY_Y {"y"};
-static const std::string KEY_R {"r"};
-static const std::string KEY_U {"u"};
-static const std::string KEY_E {"e"};
-static const std::string KEY_V {"p"};
-static const std::string KEY_TID {"t"};
-static const std::string KEY_UA {"v"};
-static const std::string KEY_NETID {"n"};
-static const std::string KEY_ISCLIENT {"s"};
-static const std::string KEY_Q {"q"};
-static const std::string KEY_A {"a"};
-
-static const std::string KEY_REQ_SID {"sid"};
-static const std::string KEY_REQ_ID {"id"};
-static const std::string KEY_REQ_H {"h"};
-static const std::string KEY_REQ_TARGET {"target"};
-static const std::string KEY_REQ_QUERY {"q"};
-static const std::string KEY_REQ_TOKEN {"token"};
-static const std::string KEY_REQ_VALUE_ID {"vid"};
-static const std::string KEY_REQ_NODES4 {"n4"};
-static const std::string KEY_REQ_NODES6 {"n6"};
-static const std::string KEY_REQ_CREATION {"c"};
-static const std::string KEY_REQ_ADDRESS {"sa"};
-static const std::string KEY_REQ_VALUES {"values"};
-static const std::string KEY_REQ_EXPIRED {"exp"};
-static const std::string KEY_REQ_REFRESHED {"re"};
-static const std::string KEY_REQ_FIELDS {"fileds"};
-static const std::string KEY_REQ_WANT {"w"};
-
-static const std::string QUERY_PING {"ping"};
-static const std::string QUERY_FIND {"find"};
-static const std::string QUERY_GET {"get"};
-static const std::string QUERY_PUT {"put"};
-static const std::string QUERY_LISTEN {"listen"};
-static const std::string QUERY_REFRESH {"refresh"};
-
 Tid unpackTid(const msgpack::object& o) {
    switch (o.type) {
    case msgpack::type::POSITIVE_INTEGER:
@@ -114,7 +78,7 @@ struct ParsedMessage {
    /* reported address by the distant node */
    std::string ua;
    SockAddr addr;
-    void msgpack_unpack(const msgpack::object& o);
+    void msgpack_unpack(msgpack::object o);

    bool append(const ParsedMessage& block);
    bool complete();
@@ -159,79 +123,63 @@ ParsedMessage::complete()
 }

 void
-ParsedMessage::msgpack_unpack(const msgpack::object& msg)
+ParsedMessage::msgpack_unpack(msgpack::object msg)
 {
-    if (msg.type != msgpack::type::MAP) throw msgpack::type_error();
+    auto y = findMapValue(msg, "y");
+    auto r = findMapValue(msg, "r");
+    auto u = findMapValue(msg, "u");
+    auto e = findMapValue(msg, "e");
+    auto v = findMapValue(msg, "p");

-    struct ParsedMsg {
-        msgpack::object* y;
-        msgpack::object* r;
-        msgpack::object* u;
-        msgpack::object* e;
-        msgpack::object* v;
-        msgpack::object* a;
-        std::string q;
-    } parsed {};
+    if (auto t = findMapValue(msg, "t"))
+        tid = unpackTid(*t);

-    for (unsigned i = 0; i < msg.via.map.size; i++) {
-        auto& o = msg.via.map.ptr[i];
-        if (o.key.type != msgpack::type::STR)
-            continue;
-        auto key = o.key.as<std::string>();
-        if (key == KEY_Y)
-            parsed.y = &o.val;
-        else if (key == KEY_R)
-            parsed.r = &o.val;
-        else if (key == KEY_U)
-            parsed.u = &o.val;
-        else if (key == KEY_E)
-            parsed.e = &o.val;
-        else if (key == KEY_V)
-            parsed.v = &o.val;
-        else if (key == KEY_TID)
-            tid = unpackTid(o.val);
-        else if (key == KEY_UA)
-            ua = o.val.as<std::string>();
-        else if (key == KEY_NETID)
-            network = o.val.as<NetId>();
-        else if (key == KEY_ISCLIENT)
-            is_client = o.val.as<bool>();
-        else if (key == KEY_Q)
-            parsed.q = o.val.as<std::string>();
-        else if (key == KEY_A)
-            parsed.a = &o.val;
+    if (auto rv = findMapValue(msg, "v"))
+        ua = rv->as<std::string>();
+
+    if (auto netid = findMapValue(msg, "n"))
+        network = netid->as<NetId>();
+
+    if (auto is_client_v = findMapValue(msg, "s"))
+        is_client = is_client_v->as<bool>();
+
+    std::string q;
+    if (auto rq = findMapValue(msg, "q")) {
+        if (rq->type != msgpack::type::STR)
+            throw msgpack::type_error();
+        q = rq->as<std::string>();
    }

-    if (parsed.e)
+    if (e)
        type = MessageType::Error;
-    else if (parsed.r)
+    else if (r)
        type = MessageType::Reply;
-    else if (parsed.v)
+    else if (v)
        type = MessageType::ValueData;
-    else if (parsed.u)
+    else if (u)
        type = MessageType::ValueUpdate;
-    else if (parsed.y and parsed.y->as<std::string>() != "q")
+    else if (y and y->as<std::string>() != "q")
        throw msgpack::type_error();
-    else if (parsed.q == QUERY_PING)
+    else if (q == "ping")
        type = MessageType::Ping;
-    else if (parsed.q == QUERY_FIND)
+    else if (q == "find")
        type = MessageType::FindNode;
-    else if (parsed.q == QUERY_GET)
+    else if (q == "get")
        type = MessageType::GetValues;
-    else if (parsed.q == QUERY_LISTEN)
+    else if (q == "listen")
        type = MessageType::Listen;
-    else if (parsed.q == QUERY_PUT)
+    else if (q == "put")
        type = MessageType::AnnounceValue;
-    else if (parsed.q == QUERY_REFRESH)
+    else if (q == "refresh")
        type = MessageType::Refresh;
    else
        throw msgpack::type_error();

    if (type == MessageType::ValueData) {
-        if (parsed.v->type != msgpack::type::MAP)
+        if (v->type != msgpack::type::MAP)
            throw msgpack::type_error();
-        for (size_t i = 0; i < parsed.v->via.map.size; ++i) {
-            auto& vdat = parsed.v->via.map.ptr[i];
+        for (size_t i = 0; i < v->via.map.size; ++i) {
+            auto& vdat = v->via.map.ptr[i];
            auto o = findMapValue(vdat.val, "o");
            auto d = findMapValue(vdat.val, "d");
            if (not o or not d)
@@ -241,85 +189,70 @@ ParsedMessage::msgpack_unpack(const msgpack::object& msg)
        return;
    }

-    if (!parsed.a && !parsed.r && !parsed.e && !parsed.u)
+    auto a = findMapValue(msg, "a");
+    if (!a && !r && !e && !u)
        throw msgpack::type_error();
-    auto& req = parsed.a ? *parsed.a : (parsed.r ? *parsed.r : (parsed.u ? *parsed.u : *parsed.e));
+    auto& req = a ? *a : (r ? *r : (u ? *u : *e));

-    if (parsed.e) {
-        if (parsed.e->type != msgpack::type::ARRAY)
+    if (e) {
+        if (e->type != msgpack::type::ARRAY)
            throw msgpack::type_error();
-        error_code = parsed.e->via.array.ptr[0].as<uint16_t>();
+        error_code = e->via.array.ptr[0].as<uint16_t>();
    }

-    struct ParsedReq {
-        msgpack::object* values;
-        msgpack::object* fields;
-        msgpack::object* sa;
-        msgpack::object* want;
-    } parsedReq {};
+    if (auto t = findMapValue(req, "sid"))
+        socket_id = unpackTid(*t);

-    for (unsigned i = 0; i < req.via.map.size; i++) {
-        auto& o = req.via.map.ptr[i];
-        if (o.key.type != msgpack::type::STR)
-            continue;
-        auto key = o.key.as<std::string>();
-        if (key == KEY_REQ_SID)
-            socket_id = unpackTid(o.val);
-        else if (key == KEY_REQ_ID)
-            id = {o.val};
-        else if (key == KEY_REQ_H)
-            info_hash = {o.val};
-        else if (key == KEY_REQ_TARGET)
-            target = {o.val};
-        else if (key == KEY_REQ_QUERY)
-            query.msgpack_unpack(o.val);
-        else if (key == KEY_REQ_TOKEN)
-            token = unpackBlob(o.val);
-        else if (key == KEY_REQ_VALUE_ID)
-            value_id = o.val.as<Value::Id>();
-        else if (key == KEY_REQ_NODES4)
-            nodes4_raw = unpackBlob(o.val);
-        else if (key == KEY_REQ_NODES6)
-            nodes6_raw = unpackBlob(o.val);
-        else if (key == KEY_REQ_ADDRESS)
-            parsedReq.sa = &o.val;
-        else if (key == KEY_REQ_CREATION)
-            created = from_time_t(o.val.as<std::time_t>());
-        else if (key == KEY_REQ_VALUES)
-            parsedReq.values = &o.val;
-        else if (key == KEY_REQ_EXPIRED)
-            expired_values = o.val.as<decltype(expired_values)>();
-        else if (key == KEY_REQ_REFRESHED)
-            refreshed_values = o.val.as<decltype(refreshed_values)>();
-        else if (key == KEY_REQ_FIELDS)
-            parsedReq.fields = &o.val;
-        else if (key == KEY_REQ_WANT)
-            parsedReq.want = &o.val;
-    }
+    if (auto rid = findMapValue(req, "id"))
+        id = {*rid};

-    if (parsedReq.sa) {
-        if (parsedReq.sa->type != msgpack::type::BIN)
+    if (auto rh = findMapValue(req, "h"))
+        info_hash = {*rh};
+
+    if (auto rtarget = findMapValue(req, "target"))
+        target = {*rtarget};
+
+    if (auto rquery = findMapValue(req, "q"))
+        query.msgpack_unpack(*rquery);
+
+    if (auto otoken = findMapValue(req, "token"))
+        token = unpackBlob(*otoken);
+
+    if (auto vid = findMapValue(req, "vid"))
+        value_id = vid->as<Value::Id>();
+
+    if (auto rnodes4 = findMapValue(req, "n4"))
+        nodes4_raw = unpackBlob(*rnodes4);
+
+    if (auto rnodes6 = findMapValue(req, "n6"))
+        nodes6_raw = unpackBlob(*rnodes6);
+
+    if (auto sa = findMapValue(req, "sa")) {
+        if (sa->type != msgpack::type::BIN)
            throw msgpack::type_error();
-        auto l = parsedReq.sa->via.bin.size;
+        auto l = sa->via.bin.size;
        if (l == sizeof(in_addr)) {
            addr.setFamily(AF_INET);
            auto& a = addr.getIPv4();
            a.sin_port = 0;
-            std::copy_n(parsedReq.sa->via.bin.ptr, l, (char*)&a.sin_addr);
+            std::copy_n(sa->via.bin.ptr, l, (char*)&a.sin_addr);
        } else if (l == sizeof(in6_addr)) {
            addr.setFamily(AF_INET6);
            auto& a = addr.getIPv6();
            a.sin6_port = 0;
-            std::copy_n(parsedReq.sa->via.bin.ptr, l, (char*)&a.sin6_addr);
+            std::copy_n(sa->via.bin.ptr, l, (char*)&a.sin6_addr);
        }
    } else
        addr = {};

-    if (parsedReq.values) {
-        if (parsedReq.values->type != msgpack::type::ARRAY)
+    if (auto rcreated = findMapValue(req, "c"))
+        created = from_time_t(rcreated->as<std::time_t>());
+
+    if (auto rvalues = findMapValue(req, "values")) {
+        if (rvalues->type != msgpack::type::ARRAY)
            throw msgpack::type_error();
-        for (size_t i = 0; i < parsedReq.values->via.array.size; i++) {
-            auto& packed_v = parsedReq.values->via.array.ptr[i];
+        for (size_t i = 0; i < rvalues->via.array.size; i++) {
+            auto& packed_v = rvalues->via.array.ptr[i];
            if (packed_v.type == msgpack::type::POSITIVE_INTEGER) {
                // Skip oversize values with a small margin for header overhead
                if (packed_v.via.u64 > MAX_VALUE_SIZE + 32)
@@ -327,16 +260,16 @@ ParsedMessage::msgpack_unpack(const msgpack::object& msg)
                value_parts.emplace(i, std::make_pair(packed_v.via.u64, Blob{}));
            } else {
                try {
-                    values.emplace_back(std::make_shared<Value>(parsedReq.values->via.array.ptr[i]));
+                    values.emplace_back(std::make_shared<Value>(rvalues->via.array.ptr[i]));
                } catch (const std::exception& e) {
                     //DHT_LOG_WARN("Error reading value: %s", e.what());
                }
            }
        }
-    } else if (parsedReq.fields) {
-        if (auto rfields = findMapValue(*parsedReq.fields, "f")) {
+    } else if (auto raw_fields = findMapValue(req, "fields")) {
+        if (auto rfields = findMapValue(*raw_fields, "f")) {
            auto vfields = rfields->as<std::set<Value::Field>>();
-            if (auto rvalues = findMapValue(*parsedReq.fields, "v")) {
+            if (auto rvalues = findMapValue(*raw_fields, "v")) {
                if (rvalues->type != msgpack::type::ARRAY)
                    throw msgpack::type_error();
                size_t val_num = rvalues->via.array.size / vfields.size();
@@ -351,14 +284,18 @@ ParsedMessage::msgpack_unpack(const msgpack::object& msg)
        } else {
            throw msgpack::type_error();
        }
+    } else if (auto raw_fields = findMapValue(req, "exp")) {
+        expired_values = raw_fields->as<decltype(expired_values)>();
+    } else if (auto raw_fields = findMapValue(req, "re")) {
+        refreshed_values = raw_fields->as<decltype(refreshed_values)>();
    }

-    if (parsedReq.want) {
-        if (parsedReq.want->type != msgpack::type::ARRAY)
+    if (auto w = findMapValue(req, "w")) {
+        if (w->type != msgpack::type::ARRAY)
            throw msgpack::type_error();
        want = 0;
-        for (unsigned i=0; i<parsedReq.want->via.array.size; i++) {
-            auto& val = parsedReq.want->via.array.ptr[i];
+        for (unsigned i=0; i<w->via.array.size; i++) {
+            auto& val = w->via.array.ptr[i];
            try {
                auto w = val.as<sa_family_t>();
                if (w == AF_INET)
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2016-2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2016 Savoir-faire Linux Inc.
 *  Author(s) : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 *              Simon Désaulniers <simon.desaulniers@savoirfairelinux.com>
 *
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 Savoir-faire Linux Inc.
 *  Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 *
 *  This program is free software; you can redistribute it and/or modify
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 Savoir-faire Linux Inc.
 *  Author(s) : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 *
 *  This program is free software; you can redistribute it and/or modify
@@ -92,7 +92,7 @@ RoutingTable::middle(const RoutingTable::const_iterator& it) const
        throw std::out_of_range("End of table");

    InfoHash id = it->first;
-    id.setBit(bit, true);
+    id.setBit(bit, 1);
    return id;
 }

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2018 Savoir-faire Linux Inc.
 *  Author(s) : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 *
 *  This program is free software; you can redistribute it and/or modify
@@ -65,8 +65,7 @@ struct Dht::SearchNode {
        ValueCache cache;
        Sp<Scheduler::Job> cacheExpirationJob {};
        Sp<net::Request> req {};
-        CachedListenStatus(ValueStateCallback&& cb, SyncCallback&& scb)
-         : cache(std::forward<ValueStateCallback>(cb), std::forward<SyncCallback>(scb)) {}
+        CachedListenStatus(ValueStateCallback&& cb) : cache(std::forward<ValueStateCallback>(cb)) {}
        CachedListenStatus(CachedListenStatus&&) = default;
        CachedListenStatus(const CachedListenStatus&) = delete;
        CachedListenStatus& operator=(const CachedListenStatus&) = delete;
@@ -226,13 +225,6 @@ struct Dht::SearchNode {
        }
    }

-    void onListenSynced(const Sp<Query>& q, bool synced = true) {
-        auto l = listenStatus.find(q);
-        if (l != listenStatus.end()) {
-            l->second.cache.onSynced(synced);
-        }
-    }
-
    void expireValues(const Sp<Query>& q, Scheduler& scheduler) {
        auto l = listenStatus.find(q);
        if (l != listenStatus.end()) {
@@ -328,21 +320,22 @@ struct Dht::SearchNode {
    }

    /**
-     * Assuming the node is synced, should a "put" request be sent to this node now ?
+     * Assumng the node is synced, should a "put" request be sent to this node now ?
     */
    time_point getAnnounceTime(Value::Id vid) const {
        const auto& ack = acked.find(vid);
-        if (ack == acked.cend() or not ack->second.first) {
+        const auto& gs = probe_query ? getStatus.find(probe_query) : getStatus.cend();
+        if ((ack == acked.cend() or not ack->second.first) and (gs == getStatus.cend()
+                                                          or not gs->second or not gs->second->pending()))
            return time_point::min();
-        }
-        if (ack->second.first->completed()) {
-            return ack->second.second - REANNOUNCE_MARGIN;
-        }
-        return ack->second.first->pending() ? time_point::max() : time_point::min();
+        return ((gs != getStatus.cend() and gs->second and gs->second->pending())
+                or ack == acked.cend() or not ack->second.first or ack->second.first->pending())
+                ? time_point::max()
+                : (ack->second.first->completed() ? ack->second.second - REANNOUNCE_MARGIN : time_point::min());
    }

    /**
-     * Assuming the node is synced, should the "listen" request with Query q be
+     * Assumng the node is synced, should the "listen" request with Query q be
     * sent to this node now ?
     */
    time_point getListenTime(const Sp<Query>& q) const {
@@ -385,11 +378,6 @@ struct Dht::Search {
    std::multimap<time_point, Get> callbacks {};

    /* listeners */
-    struct SearchListener {
-        Sp<Query> query;
-        ValueCallback get_cb;
-        SyncCallback sync_cb;
-    };
    std::map<size_t, SearchListener> listeners {};
    size_t listener_token = 1;

@@ -488,22 +476,12 @@ struct Dht::Search {
    bool isAnnounced(Value::Id id) const;
    bool isListening(time_point now) const;

-    void get(const Value::Filter& f, const Sp<Query>& q, const QueryCallback& qcb, const GetCallback& gcb, const DoneCallback& dcb, Scheduler& scheduler) {
-        if (gcb or qcb) {
-            if (not cache.get(f, q, gcb, dcb)) {
-                const auto& now = scheduler.time();
-                callbacks.emplace(now, Get { now, f, q, qcb, gcb, dcb });
-                scheduler.edit(nextSearchStep, now);
-            }
-        }
-    }
-
-    size_t listen(const ValueCallback& cb, const Value::Filter& f, const Sp<Query>& q, Scheduler& scheduler) {
+    size_t listen(ValueCallback cb, Value::Filter f, const Sp<Query>& q, Scheduler& scheduler) {
        //DHT_LOG.e(id, "[search %s IPv%c] listen", id.toString().c_str(), (af == AF_INET) ? '4' : '6');
-        return cache.listen(cb, q, f, [&](const Sp<Query>& q, ValueCallback vcb, SyncCallback scb){
+        return cache.listen(cb, q, f, [&](const Sp<Query>& q, ValueCallback vcb){
            done = false;
            auto token = ++listener_token;
-            listeners.emplace(token, SearchListener{q, vcb, scb});
+            listeners.emplace(token, SearchListener{q, f, vcb});
            scheduler.edit(nextSearchStep, scheduler.time());
            return token;
        });
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 Savoir-faire Linux Inc.
 *  Authors: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 *           Simon Désaulniers <simon.desaulniers@savoirfairelinux.com>
 *           Sébastien Blin <sebastien.blin@savoirfairelinux.com>
@@ -56,26 +56,25 @@ SecureDht::SecureDht(std::unique_ptr<DhtInterface> dht, SecureDht::Config conf)
            1
        }, [this](bool ok) {
            if (ok)
-                DHT_LOG.DBG("SecureDht: public key announced successfully");
+                DHT_LOG.DEBUG("SecureDht: public key announced successfully");
        }, {}, true);
    }
 }

-SecureDht::~SecureDht() = default;
+SecureDht::~SecureDht()
+{}

 ValueType
 SecureDht::secureType(ValueType&& type)
 {
    type.storePolicy = [this,type](InfoHash id, Sp<Value>& v, const InfoHash& nid, const SockAddr& a) {
        if (v->isSigned()) {
-            if (!v->signatureChecked) {
-                v->signatureChecked = true;
-                v->signatureValid = v->owner and v->owner->checkSignature(v->getToSign(), v->signature);
-            }
-            if (!v->signatureValid) {
+            if (!v->owner or !v->owner->checkSignature(v->getToSign(), v->signature)) {
                DHT_LOG.WARN("Signature verification failed");
                return false;
            }
+            else
+                DHT_LOG.WARN("Signature verification succeeded");
        }
        return type.storePolicy(id, v, nid, a);
    };
@@ -86,11 +85,7 @@ SecureDht::secureType(ValueType&& type)
            DHT_LOG.WARN("Edition forbidden: owner changed.");
            return false;
        }
-        if (!n->signatureChecked) {
-            n->signatureChecked = true;
-            n->signatureValid = o->owner and o->owner->checkSignature(n->getToSign(), n->signature);
-        }
-        if (!n->signatureValid) {
+        if (!o->owner or !o->owner->checkSignature(n->getToSign(), n->signature)) {
            DHT_LOG.WARN("Edition forbidden: signature verification failed.");
            return false;
        }
@@ -144,7 +139,7 @@ SecureDht::registerCertificate(const InfoHash& node, const Blob& data)
    }
    InfoHash h = crt->getPublicKey().getId();
    if (node == h) {
-        DHT_LOG.DBG("Registering certificate for %s", h.toString().c_str());
+        DHT_LOG.DEBUG("Registering certificate for %s", h.toString().c_str());
        auto it = nodesCertificates_.find(h);
        if (it == nodesCertificates_.end())
            std::tie(it, std::ignore) = nodesCertificates_.emplace(h, std::move(crt));
@@ -152,7 +147,7 @@ SecureDht::registerCertificate(const InfoHash& node, const Blob& data)
            it->second = std::move(crt);
        return it->second;
    } else {
-        DHT_LOG.WARN("Certificate %s for node %s does not match node id !", h.toString().c_str(), node.toString().c_str());
+        DHT_LOG.DEBUG("Certificate %s for node %s does not match node id !", h.toString().c_str(), node.toString().c_str());
        return nullptr;
    }
 }
@@ -165,11 +160,11 @@ SecureDht::registerCertificate(Sp<crypto::Certificate>& cert)
 }

 void
-SecureDht::findCertificate(const InfoHash& node, const std::function<void(const Sp<crypto::Certificate>)>& cb)
+SecureDht::findCertificate(const InfoHash& node, std::function<void(const Sp<crypto::Certificate>)> cb)
 {
    Sp<crypto::Certificate> b = getCertificate(node);
    if (b && *b) {
-        DHT_LOG.DBG("Using certificate from cache for %s", node.toString().c_str());
+        DHT_LOG.DEBUG("Using certificate from cache for %s", node.toString().c_str());
        if (cb)
            cb(b);
        return;
@@ -177,7 +172,7 @@ SecureDht::findCertificate(const InfoHash& node, const std::function<void(const
    if (localQueryMethod_) {
        auto res = localQueryMethod_(node);
        if (not res.empty()) {
-            DHT_LOG.DBG("Registering certificate from local store for %s", node.toString().c_str());
+            DHT_LOG.DEBUG("Registering certificate from local store for %s", node.toString().c_str());
            nodesCertificates_.emplace(node, res.front());
            if (cb)
                cb(res.front());
@@ -192,7 +187,7 @@ SecureDht::findCertificate(const InfoHash& node, const std::function<void(const
        for (const auto& v : vals) {
            if (auto cert = registerCertificate(node, v->data)) {
                *found = true;
-                DHT_LOG.DBG("Found certificate for %s", node.toString().c_str());
+                DHT_LOG.DEBUG("Found certificate for %s", node.toString().c_str());
                if (cb)
                    cb(cert);
                return false;
@@ -206,11 +201,11 @@ SecureDht::findCertificate(const InfoHash& node, const std::function<void(const
 }

 void
-SecureDht::findPublicKey(const InfoHash& node, const std::function<void(const Sp<const crypto::PublicKey>)>& cb)
+SecureDht::findPublicKey(const InfoHash& node, std::function<void(const Sp<const crypto::PublicKey>)> cb)
 {
    auto pk = getPublicKey(node);
    if (pk && *pk) {
-        DHT_LOG.DBG("Found public key from cache for %s", node.toString().c_str());
+        DHT_LOG.DEBUG("Found public key from cache for %s", node.toString().c_str());
        if (cb)
            cb(pk);
        return;
@@ -234,23 +229,18 @@ SecureDht::checkValue(const Sp<Value>& v)
    // Decrypt encrypted values
    if (v->isEncrypted()) {
        if (not key_) {
-#ifdef OPENDHT_PROXY_SERVER
+#if OPENDHT_PROXY_SERVER
            if (forward_all_) // We are currently a proxy, send messages to clients.
                return v;
 #endif
            return {};
        }
-        if (v->decrypted) {
-            return v->decryptedValue;
-        }
-        v->decrypted = true;
        try {
            Value decrypted_val (decrypt(*v));
            if (decrypted_val.recipient == getId()) {
                if (decrypted_val.owner)
                    nodesPubKeys_[decrypted_val.owner->getId()] = decrypted_val.owner;
-                v->decryptedValue = std::make_shared<Value>(std::move(decrypted_val));
-                return v->decryptedValue;
+                return std::make_shared<Value>(std::move(decrypted_val));
            }
            // Ignore values belonging to other people
        } catch (const std::exception& e) {
@@ -259,12 +249,7 @@ SecureDht::checkValue(const Sp<Value>& v)
    }
    // Check signed values
    else if (v->isSigned()) {
-        if (v->signatureChecked) {
-            return v->signatureValid ? v : Sp<Value>{};
-        }
-        v->signatureChecked = true;
        if (v->owner and v->owner->checkSignature(v->getToSign(), v->signature)) {
-            v->signatureValid = true;
            nodesPubKeys_[v->owner->getId()] = v->owner;
            return v;
        }
@@ -279,12 +264,10 @@ SecureDht::checkValue(const Sp<Value>& v)
 }

 ValueCallback
-SecureDht::getCallbackFilter(const ValueCallback& cb, Value::Filter&& filter)
+SecureDht::getCallbackFilter(ValueCallback cb, Value::Filter&& filter)
 {
    return [=](const std::vector<Sp<Value>>& values, bool expired) {
        std::vector<Sp<Value>> tmpvals {};
-        if (not filter)
-            tmpvals.reserve(values.size());
        for (const auto& v : values) {
            if (auto nv = checkValue(v))
                if (not filter or filter(*nv))
@@ -298,12 +281,10 @@ SecureDht::getCallbackFilter(const ValueCallback& cb, Value::Filter&& filter)


 GetCallback
-SecureDht::getCallbackFilter(const GetCallback& cb, Value::Filter&& filter)
+SecureDht::getCallbackFilter(GetCallback cb, Value::Filter&& filter)
 {
    return [=](const std::vector<Sp<Value>>& values) {
        std::vector<Sp<Value>> tmpvals {};
-        if (not filter)
-            tmpvals.reserve(values.size());
        for (const auto& v : values) {
            if (auto nv = checkValue(v))
                if (not filter or filter(*nv))
@@ -346,13 +327,14 @@ SecureDht::putSigned(const InfoHash& hash, Sp<Value> val, DoneCallback callback,
    // Check if we are already announcing a value
    auto p = dht_->getPut(hash, val->id);
    if (p && val->seq <= p->seq) {
+        DHT_LOG.DEBUG("Found previous value being announced.");
        val->seq = p->seq + 1;
    }

    // Check if data already exists on the dht
    get(hash,
        [val,this] (const std::vector<Sp<Value>>& vals) {
-            DHT_LOG.DBG("Found online previous value being announced.");
+            DHT_LOG.DEBUG("Found online previous value being announced.");
            for (const auto& v : vals) {
                if (!v->isSigned())
                    DHT_LOG.ERR("Existing non-signed value seems to exists at this location.");
@@ -367,15 +349,14 @@ SecureDht::putSigned(const InfoHash& hash, Sp<Value> val, DoneCallback callback,
            sign(*val);
            dht_->put(hash, val, callback, time_point::max(), permanent);
        },
-        Value::IdFilter(val->id),
-        std::move(Where().id(val->id))
+        Value::IdFilter(val->id)
    );
 }

 void
 SecureDht::putEncrypted(const InfoHash& hash, const InfoHash& to, Sp<Value> val, DoneCallback callback, bool permanent)
 {
-    findPublicKey(to, [=](const Sp<const crypto::PublicKey>& pk) {
+    findPublicKey(to, [=](const Sp<const crypto::PublicKey> pk) {
        if(!pk || !*pk) {
            if (callback)
                callback(false, {});
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 Savoir-faire Linux Inc.
 *  Author(s) : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 *
 *  This program is free software; you can redistribute it and/or modify
@@ -90,7 +90,20 @@ struct Storage {

    Storage() {}
    Storage(time_point t) : maintenance_time(t) {}
+
+#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ <= 9 || defined(_WIN32)
+    // GCC-bug: remove me when support of GCC < 4.9.2 is abandoned
+    Storage(Storage&& o) noexcept
+        : maintenance_time(std::move(o.maintenance_time))
+        , listeners(std::move(o.listeners))
+        , local_listeners(std::move(o.local_listeners))
+        , listener_token(std::move(o.listener_token))
+        , values(std::move(o.values))
+        , total_size(std::move(o.total_size)) {}
+#else
    Storage(Storage&& o) noexcept = default;
+#endif
+
    Storage& operator=(Storage&& o) = default;

    bool empty() const {
@@ -141,22 +154,15 @@ struct Storage {
     *
     * @param now  The reference to now
     * @param vid  The value id
-     * @return time of the next expiration, time_point::max() if no expiration
+     * @return true if a value storage was updated, false otherwise
     */
-    time_point refresh(const time_point& now, const Value::Id& vid, const TypeStore& types) {
+    bool refresh(const time_point& now, const Value::Id& vid) {
        for (auto& vs : values)
            if (vs.data->id == vid) {
                vs.created = now;
-                vs.expiration = std::max(vs.expiration, now + types.getType(vs.data->type).expiration);
-                return vs.expiration;
+                return true;
            }
-        return time_point::max();
-    }
-
-    size_t listen(ValueCallback& cb, Value::Filter& f, const Sp<Query>& q);
-
-    void cancelListen(size_t token) {
-        local_listeners.erase(token);
+        return false;
    }

    StoreDiff remove(const InfoHash& id, Value::Id);
@@ -172,22 +178,6 @@ private:
 };


-size_t
-Storage::listen(ValueCallback& gcb, Value::Filter& filter, const Sp<Query>& query)
-{
-    if (not empty()) {
-        std::vector<Sp<Value>> newvals = get(filter);
-        if (not newvals.empty()) {
-            if (!gcb(newvals, false))
-                return 0;
-        }
-    }
-    auto tokenlocal = ++listener_token;
-    local_listeners.emplace(tokenlocal, LocalListener{query, filter, gcb});
-    return tokenlocal;
-}
-
-
 std::pair<ValueStorage*, Storage::StoreDiff>
 Storage::store(const InfoHash& id, const Sp<Value>& value, time_point created, time_point expiration, StorageBucket* sb)
 {
@@ -1,134 +0,0 @@
-/*
- *  Copyright (C) 2016-2019 Savoir-faire Linux Inc.
- *
- *  Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "thread_pool.h"
-
-#include <atomic>
-#include <thread>
-
-#include <ciso646> // fix windows compiler bug
-
-namespace dht {
-
-constexpr const size_t IO_THREADS_MAX {64};
-
-struct ThreadPool::ThreadState
-{
-    std::thread thread {};
-    std::atomic_bool run {true};
-};
-
-ThreadPool&
-ThreadPool::computation()
-{
-    static ThreadPool pool;
-    return pool;
-}
-
-ThreadPool&
-ThreadPool::io()
-{
-    static ThreadPool pool(IO_THREADS_MAX);
-    return pool;
-}
-
-
-ThreadPool::ThreadPool(size_t maxThreads) : maxThreads_(maxThreads)
-{
-    threads_.reserve(maxThreads_);
-}
-
-ThreadPool::ThreadPool()
- : ThreadPool(std::max<size_t>(std::thread::hardware_concurrency(), 4))
-{}
-
-ThreadPool::~ThreadPool()
-{
-    join();
-}
-
-void
-ThreadPool::run(std::function<void()>&& cb)
-{
-    std::unique_lock<std::mutex> l(lock_);
-    if (not running_) return;
-
-    // launch new thread if necessary
-    if (not readyThreads_ && threads_.size() < maxThreads_) {
-        threads_.emplace_back(new ThreadState());
-        auto& t = *threads_.back();
-        t.thread = std::thread([&]() {
-            while (t.run) {
-                std::function<void()> task;
-
-                // pick task from queue
-                {
-                    std::unique_lock<std::mutex> l(lock_);
-                    readyThreads_++;
-                    cv_.wait(l, [&](){
-                        return not t.run or not tasks_.empty();
-                    });
-                    readyThreads_--;
-                    if (not t.run)
-                        break;
-                    task = std::move(tasks_.front());
-                    tasks_.pop();
-                }
-
-                // run task
-                try {
-                    if (task)
-                        task();
-                } catch (const std::exception& e) {
-                    // LOG_ERR("Exception running task: %s", e.what());
-                }
-            }
-        });
-    }
-
-    // push task to queue
-    tasks_.emplace(std::move(cb));
-
-    // notify thread
-    l.unlock();
-    cv_.notify_one();
-}
-
-void
-ThreadPool::stop()
-{
-    {
-        std::lock_guard<std::mutex> l(lock_);
-        running_ = false;
-    }
-    for (auto& t : threads_)
-        t->run = false;
-    cv_.notify_all();
-}
-
-void
-ThreadPool::join()
-{
-    stop();
-    for (auto& t : threads_)
-        t->thread.join();
-    threads_.clear();
-}
-
-}
@@ -1,69 +0,0 @@
-/*
- *  Copyright (C) 2016-2019 Savoir-faire Linux Inc.
- *
- *  Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include <condition_variable>
-#include <vector>
-#include <queue>
-#include <future>
-#include <functional>
-
-namespace dht {
-
-class ThreadPool {
-public:
-    static ThreadPool& computation();
-    static ThreadPool& io();
-
-    ThreadPool();
-    ThreadPool(size_t maxThreads);
-    ~ThreadPool();
-
-    void run(std::function<void()>&& cb);
-
-    template<class T>
-    std::future<T> get(std::function<T()>&& cb) {
-        auto ret = std::make_shared<std::promise<T>>();
-        run(std::bind([=](std::function<T()>& mcb) mutable {
-                ret->set_value(mcb());
-            }, std::move(cb)));
-        return ret->get_future();
-    }
-    template<class T>
-    std::shared_ptr<std::future<T>> getShared(std::function<T()>&& cb) {
-        return std::make_shared<std::future<T>>(get(std::move(cb)));
-    }
-
-    void stop();
-    void join();
-
-private:
-    struct ThreadState;
-    std::queue<std::function<void()>> tasks_ {};
-    std::vector<std::unique_ptr<ThreadState>> threads_;
-    unsigned readyThreads_ {0};
-    std::mutex lock_ {};
-    std::condition_variable cv_ {};
-
-    const unsigned maxThreads_;
-    bool running_ {true};
-};
-
-}
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 Savoir-faire Linux Inc.
 *  Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 *
 *  This program is free software; you can redistribute it and/or modify
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 Savoir-faire Linux Inc.
 *  Author(s) : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 *              Simon Désaulniers <simon.desaulniers@savoirfairelinux.com>
 *
@@ -54,19 +54,17 @@ std::ostream& operator<< (std::ostream& s, const Value& v)
            s << IpServiceAnnouncement(v.data);
        } else if (v.type == CERTIFICATE_TYPE.id) {
            s << "Certificate";
-#ifdef OPENDHT_LOG_CRT_ID
            try {
-                auto h = crypto::Certificate(v.data).getPublicKey().getLongId();
+                InfoHash h = crypto::Certificate(v.data).getPublicKey().getId();
                s << " with ID " << h;
            } catch (const std::exception& e) {
                s << " (invalid)";
            }
-#endif
        } else {
            s << "Data (type: " << v.type << " ): ";
            s << std::hex;
-            for (auto i : v.data)
-                s << std::setfill('0') << std::setw(2) << (unsigned)i;
+            for (size_t i=0; i<v.data.size(); i++)
+                s << std::setfill('0') << std::setw(2) << (unsigned)v.data[i];
            s << std::dec;
        }
    }
@@ -78,7 +76,7 @@ std::ostream& operator<< (std::ostream& s, const Value& v)
 const ValueType ValueType::USER_DATA = {0, "User Data"};

 bool
-ValueType::DEFAULT_STORE_POLICY(InfoHash, const std::shared_ptr<Value>& v, const InfoHash&, const SockAddr&)
+ValueType::DEFAULT_STORE_POLICY(InfoHash, std::shared_ptr<Value>& v, const InfoHash&, const SockAddr&)
 {
    return v->size() <= MAX_VALUE_SIZE;
 }
@@ -288,11 +286,11 @@ FieldValue::getLocalFilter() const
        case Value::Field::UserType:
            return Value::UserTypeFilter(std::string {blobValue.begin(), blobValue.end()});
        default:
-            return {};
+            return Value::AllFilter();
    }
 }

-FieldValueIndex::FieldValueIndex(const Value& v, const Select& s)
+FieldValueIndex::FieldValueIndex(const Value& v, Select s)
 {
    auto selection = s.getSelection();
    if (not selection.empty()) {
@@ -399,8 +397,8 @@ FieldValueIndex::msgpack_unpack_fields(const std::set<Value::Field>& fields, con
 }

 void trim_str(std::string& str) {
-    auto first = std::min(str.size(), str.find_first_not_of(' '));
-    auto last = std::min(str.size(), str.find_last_not_of(' '));
+    auto first = std::min(str.size(), str.find_first_not_of(" "));
+    auto last = std::min(str.size(), str.find_last_not_of(" "));
    str = str.substr(first, last - first + 1);
 }

@@ -497,7 +495,8 @@ template <typename T>
 bool subset(std::vector<T> fds, std::vector<T> qfds)
 {
    for (auto& fd : fds) {
-        if (std::find_if(qfds.begin(), qfds.end(), [&fd](T& _vfd) { return fd == _vfd; }) == qfds.end())
+        auto correspondance = std::find_if(qfds.begin(), qfds.end(), [&fd](T& _vfd) { return fd == _vfd; });
+        if (correspondance == qfds.end())
            return false;
    }
    return true;
@@ -505,9 +504,10 @@ bool subset(std::vector<T> fds, std::vector<T> qfds)

 bool Select::isSatisfiedBy(const Select& os) const {
    /* empty, means all values are selected. */
-    return fieldSelection_.empty() ?
-        os.fieldSelection_.empty() :
-        subset(fieldSelection_, os.fieldSelection_);
+    if (fieldSelection_.empty() and not os.fieldSelection_.empty())
+        return false;
+    else
+        return subset(fieldSelection_, os.fieldSelection_);
 }

 bool Where::isSatisfiedBy(const Where& ow) const {
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2018 Savoir-faire Linux Inc.
 *  Author(s) : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 *
 *  This program is free software; you can redistribute it and/or modify
@@ -22,32 +22,19 @@
 namespace dht {

 using ValueStateCallback = std::function<void(const std::vector<Sp<Value>>&, bool)>;
-enum class ListenSyncStatus { ADDED, SYNCED, UNSYNCED, REMOVED };
-using SyncCallback = std::function<void(ListenSyncStatus)>;
 using CallbackQueue = std::list<std::function<void()>>;

 class ValueCache {
 public:
-    ValueCache(ValueStateCallback&& cb, SyncCallback&& scb = {})
-        : callback(std::forward<ValueStateCallback>(cb)), syncCallback(std::move(scb))
-    {
-        if (syncCallback)
-            syncCallback(ListenSyncStatus::ADDED);
-    }
-    ValueCache(ValueCache&& o) noexcept : values(std::move(o.values)), callback(std::move(o.callback)), syncCallback(std::move(o.syncCallback)) {
+    ValueCache(ValueStateCallback&& cb) : callback(std::forward<ValueStateCallback>(cb)) {}
+    ValueCache(ValueCache&& o) : values(std::move(o.values)), callback(std::move(o.callback)) {
        o.callback = {};
-        o.syncCallback = {};
    }

    ~ValueCache() {
        auto q = clear();
        for (auto& cb: q)
            cb();
-        if (syncCallback) {
-            if (status == ListenSyncStatus::SYNCED)
-                syncCallback(ListenSyncStatus::UNSYNCED);
-            syncCallback(ListenSyncStatus::REMOVED);
-        }
    }

    CallbackQueue clear() {
@@ -79,7 +66,7 @@ public:
    CallbackQueue expireValues(const time_point& now, time_point& next) {
        std::vector<Sp<Value>> expired_values;
        for (auto it = values.begin(); it != values.end();) {
-            if (it->second.expiration <= now) {
+            if (it->second.expiration < now) {
                expired_values.emplace_back(std::move(it->second.data));
                it = values.erase(it);
            } else {
@@ -87,7 +74,7 @@ public:
                ++it;
            }
        }
-        while (values.size() > MAX_VALUES) {
+        while (values.size() >= MAX_VALUES) {
            // too many values, remove oldest values
            time_point oldest_creation = time_point::max();
            auto oldest_value = values.end();
@@ -133,15 +120,6 @@ public:
        return ret;
    }

-    void onSynced(bool synced) {
-        auto newStatus = synced ? ListenSyncStatus::SYNCED : ListenSyncStatus::UNSYNCED;
-        if (status != newStatus) {
-            status = newStatus;
-            if (syncCallback)
-                syncCallback(newStatus);
-        }
-    }
-
 private:
    // prevent copy
    ValueCache(const ValueCache&) = delete;
@@ -149,7 +127,7 @@ private:
    ValueCache& operator=(ValueCache&&) = delete;

    /* The maximum number of values we store in the cache. */
-    static constexpr unsigned MAX_VALUES {4096};
+    static constexpr unsigned MAX_VALUES {1024};

    struct CacheValueStorage {
        Sp<Value> data {};
@@ -163,8 +141,6 @@ private:

    std::map<Value::Id, CacheValueStorage> values;
    ValueStateCallback callback;
-    SyncCallback syncCallback;
-    ListenSyncStatus status {ListenSyncStatus::UNSYNCED};

    CallbackQueue addValues(const std::vector<Sp<Value>>& new_values, const TypeStore& types, const time_point& now) {
        std::vector<Sp<Value>> nvals;
@@ -3,7 +3,7 @@ bin_PROGRAMS = opendht_unit_tests

 AM_CPPFLAGS = -I../include

-nobase_include_HEADERS = infohashtester.h valuetester.h cryptotester.h dhtrunnertester.h dhtproxytester.h
-opendht_unit_tests_SOURCES = tests_runner.cpp cryptotester.cpp infohashtester.cpp valuetester.cpp dhtrunnertester.cpp dhtproxytester.cpp
+nobase_include_HEADERS = infohashtester.h cryptotester.h dhtrunnertester.h dhtproxytester.h
+opendht_unit_tests_SOURCES = tests_runner.cpp cryptotester.cpp infohashtester.cpp dhtrunnertester.cpp dhtproxytester.cpp
 opendht_unit_tests_LDFLAGS = -lopendht -lcppunit -L@top_builddir@/src/.libs @GnuTLS_LIBS@
 endif
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2018 Savoir-faire Linux Inc.
 *
 *  Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 *
@@ -46,70 +46,6 @@ CryptoTester::testSignatureEncryption() {
    CPPUNIT_ASSERT(data == decrypted);
 }

-void
-CryptoTester::testCertificateRevocation()
-{
-    auto ca1 = dht::crypto::generateIdentity("ca1");
-    auto account1 = dht::crypto::generateIdentity("acc1", ca1, 4096, true);
-    auto device11 = dht::crypto::generateIdentity("dev11", account1);
-    auto device12 = dht::crypto::generateIdentity("dev12", account1);
-
-    dht::crypto::TrustList list;
-    list.add(*ca1.second);
-    auto v = list.verify(*account1.second);
-    CPPUNIT_ASSERT_MESSAGE(v.toString(), v);
-
-    list.add(*account1.second);
-    v = list.verify(*device11.second);
-    CPPUNIT_ASSERT_MESSAGE(v.toString(), v);
-    v = list.verify(*device12.second);
-    CPPUNIT_ASSERT_MESSAGE(v.toString(), v);
-
-    auto ca2 = dht::crypto::generateIdentity("ca2");
-    auto account2 = dht::crypto::generateIdentity("acc2", ca2, 4096, true);
-    auto device2 = dht::crypto::generateIdentity("dev2", account2);
-
-    v = list.verify(*device2.second);
-    CPPUNIT_ASSERT_MESSAGE(v.toString(), !v);
-
-    account1.second->revoke(*account1.first, *device11.second);
-    dht::crypto::TrustList list2;
-    list2.add(*account1.second);
-
-    v = list2.verify(*device11.second);
-    CPPUNIT_ASSERT_MESSAGE(v.toString(), !v);
-    v = list2.verify(*device12.second);
-    CPPUNIT_ASSERT_MESSAGE(v.toString(), v);
-}
-
-void
-CryptoTester::testCertificateRequest()
-{
-    // Generate CA
-    auto ca = dht::crypto::generateIdentity("Test CA");
-
-    // Generate signed request
-    auto deviceKey = dht::crypto::PrivateKey::generate();
-    auto request = dht::crypto::CertificateRequest();
-    request.setName("Test Device");
-    request.sign(deviceKey);
-
-    // Export/import request
-    auto importedRequest = dht::crypto::CertificateRequest(request.pack());
-    CPPUNIT_ASSERT(importedRequest.verify());
-
-    // Generate/sign certificate from request
-    auto signedCert = dht::crypto::Certificate::generate(request, ca);
-    CPPUNIT_ASSERT_EQUAL(ca.second->getName(), signedCert.getIssuerName());
-    CPPUNIT_ASSERT_EQUAL(request.getName(), signedCert.getName());
-
-    // Check generated certificate
-    dht::crypto::TrustList list;
-    list.add(*ca.second);
-    auto v = list.verify(signedCert);
-    CPPUNIT_ASSERT_MESSAGE(v.toString(), v);
-}
-
 void
 CryptoTester::tearDown() {

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2018 Savoir-faire Linux Inc.
 *
 *  Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 *
@@ -28,8 +28,6 @@ namespace test {
 class CryptoTester : public CppUnit::TestFixture {
    CPPUNIT_TEST_SUITE(CryptoTester);
    CPPUNIT_TEST(testSignatureEncryption);
-    CPPUNIT_TEST(testCertificateRevocation);
-    CPPUNIT_TEST(testCertificateRequest);
    CPPUNIT_TEST_SUITE_END();

 public:
@@ -42,17 +40,9 @@ class CryptoTester : public CppUnit::TestFixture {
     */
    void tearDown();
    /**
-     * Test data signature, encryption and decryption
+     * Test the differents behaviors of constructors
     */
    void testSignatureEncryption();
-    /**
-     * Test certificate generation, validation and revocation
-     */
-    void testCertificateRevocation();
-    /**
-     * Test certificate requests
-     */
-    void testCertificateRequest();
 };

 }  // namespace test
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2018 Savoir-faire Linux Inc.
 *
 *  Author: Sébastien Blin <sebastien.blin@savoirfairelinux.com>
 *
@@ -77,6 +77,7 @@ DhtProxyTester::testGetPut() {
    CPPUNIT_ASSERT(vals.front()->data == val_data);
 }

+
 void
 DhtProxyTester::testListen() {
    bool done = false;
@@ -107,7 +108,7 @@ DhtProxyTester::testListen() {

    cv.wait_for(lk, std::chrono::seconds(10), [&]{ return done; });
    done = false;
-    // Here values should contains 1 values
+    // Here values should contains 2 values
    CPPUNIT_ASSERT_EQUAL(static_cast<int>(values.size()), 1);
    CPPUNIT_ASSERT(values.front() == firstVal_data);

@@ -115,65 +116,14 @@ DhtProxyTester::testListen() {
    // All values
    dht::Value secondVal {"You're a monster"};
    auto secondVal_data = secondVal.data;
-    nodePeer.put(key, std::move(secondVal));
+    nodePeer.put(key, std::move(secondVal), [&](bool) {
+        done = true;
+        cv.notify_all();
+    });
    cv.wait_for(lk, std::chrono::seconds(10), [&]{ return done; });
-    // Here values should contains 2 values
+    // Here values should contains 3 values
    CPPUNIT_ASSERT_EQUAL(static_cast<int>(values.size()), 2);
    CPPUNIT_ASSERT(values.back() == secondVal_data);
 }

-void
-DhtProxyTester::testResubscribeGetValues() {
-    nodeClient->setPushNotificationToken("atlas");
-
-    bool done = false;
-    std::condition_variable cv;
-    std::mutex cv_m;
-    std::unique_lock<std::mutex> lk(cv_m);
-    auto key = dht::InfoHash::get("GLaDOs");
-
-    // If a peer send a value, the listen operation from the client
-    // should retrieve this value
-    dht::Value firstVal {"Hey! It's been a long time. How have you been?"};
-    auto firstVal_data = firstVal.data;
-    nodePeer.put(key, std::move(firstVal), [&](bool) {
-        done = true;
-        cv.notify_all();
-    });
-    cv.wait_for(lk, std::chrono::seconds(10), [&]{ return done; });
-    done = false;
-
-    // Send a first subscribe, the value is sent via a push notification
-    // So ignore values here.
-    nodeClient->listen(key, [&](const std::vector<std::shared_ptr<dht::Value>>&, bool) {
-        return true;
-    });
-    cv.wait_for(lk, std::chrono::seconds(1));
-
-    // Reboot node (to avoid cache)
-    nodeClient->join();
-    nodeClient->run(42242, {}, true);
-    nodeClient->bootstrap(nodePeer.getBound());
-    nodeClient->setProxyServer("127.0.0.1:8080");
-    nodeClient->enableProxy(true);
-    nodeClient->setPushNotificationToken("atlas");
-
-    // For the second subscribe, the proxy will return the value in the body
-    auto values = std::vector<dht::Blob>();
-    nodeClient->listen(key, [&](const std::vector<std::shared_ptr<dht::Value>>& v, bool) {
-        for (const auto& value : v)
-            values.emplace_back(value->data);
-        done = true;
-        cv.notify_all();
-        return true;
-    });
-
-    cv.wait_for(lk, std::chrono::seconds(10), [&]{ return done; });
-    done = false;
-    // Here values should still contains 1 values
-    CPPUNIT_ASSERT_EQUAL(static_cast<int>(values.size()), 1);
-    CPPUNIT_ASSERT(values.front() == firstVal_data);
-
-}
-
 }  // namespace test
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2018 Savoir-faire Linux Inc.
 *
 *  Author: Sébastien Blin <sebastien.blin@savoirfairelinux.com>
 *
@@ -32,7 +32,6 @@ class DhtProxyTester : public CppUnit::TestFixture {
    CPPUNIT_TEST_SUITE(DhtProxyTester);
    CPPUNIT_TEST(testGetPut);
    CPPUNIT_TEST(testListen);
-    CPPUNIT_TEST(testResubscribeGetValues);
    CPPUNIT_TEST_SUITE_END();

 public:
@@ -40,25 +39,19 @@ class DhtProxyTester : public CppUnit::TestFixture {
     * Method automatically called before each test by CppUnit
     * Init nodes
     */
-   void setUp();
+    void setUp();
    /**
     * Method automatically called after each test CppUnit
     */
-   void tearDown();
+    void tearDown();
    /**
     * Test get and put methods
     */
-   void testGetPut();
+    void testGetPut();
    /**
     * Test listen
     */
-   void testListen();
-
-   /**
-    * When a proxy redo a subscribe on the proxy
-    * it should retrieve existant values
-    */
-   void testResubscribeGetValues();
+    void testListen();

 private:
    dht::DhtRunner nodePeer {};
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2018 Savoir-faire Linux Inc.
 *
 *  Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 *
@@ -50,56 +50,15 @@ DhtRunnerTester::testGetPut() {
    auto key = dht::InfoHash::get("123");
    dht::Value val {"hey"};
    auto val_data = val.data;
-    std::promise<bool> p;
-    node2.put(key, std::move(val), [&](bool ok){
-        p.set_value(ok);
-    });
-    CPPUNIT_ASSERT(p.get_future().get());
-    auto vals = node1.get(key).get();
+    node1.put(key, std::move(val));
+    auto vals = node2.get(key).get();
    CPPUNIT_ASSERT(not vals.empty());
    CPPUNIT_ASSERT(vals.front()->data == val_data);
 }

 void
 DhtRunnerTester::testListen() {
-    std::atomic_uint valueCount(0);
-    std::atomic_uint putCount(0);
-
-    auto a = dht::InfoHash::get("234");
-    auto b = dht::InfoHash::get("2345");
-    auto c = dht::InfoHash::get("23456");
-    constexpr unsigned N = 32;
-
-    auto ftokena = node1.listen(a, [&](const std::shared_ptr<dht::Value>&){
-        valueCount++;
-        return true;
-    });
-
-    auto ftokenb = node1.listen(b, [&](const std::shared_ptr<dht::Value>&){
-        valueCount++;
-        return false;
-    });
-
-    auto ftokenc = node1.listen(c, [&](const std::shared_ptr<dht::Value>&){
-        valueCount++;
-        return true;
-    });
-
-    for (unsigned i=0; i<N; i++) {
-        node2.put(a, dht::Value("v1"), [&](bool ok) { if (ok) putCount++; });
-        node2.put(b, dht::Value("v2"), [&](bool ok) { if (ok) putCount++; });
-    }
-
-    std::this_thread::sleep_for(std::chrono::milliseconds(100));
-    auto tokena = ftokena.get();
-    auto tokenb = ftokenb.get();
-    auto tokenc = ftokenc.get();
-
-    CPPUNIT_ASSERT(tokena);
-    CPPUNIT_ASSERT(tokenb);
-    CPPUNIT_ASSERT(tokenc);
-    CPPUNIT_ASSERT_EQUAL(N * 2u, putCount.load());
-    CPPUNIT_ASSERT_EQUAL(N + 1u, valueCount.load());
+    // TODO
 }

 }  // namespace test
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2018 Savoir-faire Linux Inc.
 *
 *  Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 *
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2018 Savoir-faire Linux Inc.
 *
 *  Author: Sébastien Blin <sebastien.blin@savoirfairelinux.com>
 *
@@ -38,13 +38,14 @@ void
 InfoHashTester::testConstructors() {
    // Default constructor creates a null infohash
    auto nullHash = dht::InfoHash();
-    CPPUNIT_ASSERT_EQUAL((size_t)20u, nullHash.size());
+    CPPUNIT_ASSERT(nullHash.size() == 20);
    CPPUNIT_ASSERT(!nullHash);
    // Build from a uint8_t. if length to short, should get a null infohash
    uint8_t to_short[] = {0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8};
    auto infohash = dht::InfoHash(to_short, 8);
-    CPPUNIT_ASSERT_EQUAL((size_t)20u, infohash.size());
-    CPPUNIT_ASSERT_EQUAL(std::string("0000000000000000000000000000000000000000"), infohash.toString());
+    CPPUNIT_ASSERT(infohash.size() == 20);
+    CPPUNIT_ASSERT_EQUAL(infohash.toString(),
+        std::string("0000000000000000000000000000000000000000"));
    // Build from a uint8_t. if length is enough, data should contains the uint8_t
    uint8_t enough[] = {0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0xa,
                        0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0xa};
@@ -65,7 +66,7 @@ InfoHashTester::testConstructors() {
    }
    // Build from string
    auto infohashFromStr = dht::InfoHash("0102030405060708090A0102030405060708090A");
-    CPPUNIT_ASSERT_EQUAL((size_t)20u, infohashFromStr.size());
+    CPPUNIT_ASSERT(infohashFromStr.size() == 20);
    const auto* dataStr = infohashFromStr.data();
    for (auto i = 0; i < 20; ++i) {
        CPPUNIT_ASSERT_EQUAL((int)dataStr[i], (int)data[i]);
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2018 Savoir-faire Linux Inc.
 *
 *  Author: Sébastien Blin <sebastien.blin@savoirfairelinux.com>
 *
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2017-2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2017-2018 Savoir-faire Linux Inc.
 *  Author: Sébastien Blin <sebastien.blin@savoirfairelinux.com>
 *
 *  This program is free software; you can redistribute it and/or modify
@@ -21,7 +21,7 @@
 #include <cppunit/CompilerOutputter.h>
 #include <iostream>

-int main(int /*argc*/, char** /*argv*/) {
+int main(int argc, char** argv) {
    CppUnit::TestFactoryRegistry &registry = CppUnit::TestFactoryRegistry::getRegistry();
    CppUnit::Test *suite = registry.makeTest();
    if (suite->countTestCases() == 0) {
@@ -1,83 +0,0 @@
-/*
- *  Copyright (C) 2019 Savoir-faire Linux Inc.
- *
- *  Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-#include "valuetester.h"
-
-#include <iostream>
-#include <string>
-
-// opendht
-#include "opendht/value.h"
-
-namespace test {
-CPPUNIT_TEST_SUITE_REGISTRATION(ValueTester);
-
-void
-ValueTester::setUp() {
-
-}
-
-void
-ValueTester::testConstructors() {
-    std::string the_data {"42 cats"};
-    dht::Value the_dht_value {(const uint8_t*)the_data.data(), the_data.size()};
-    std::string from_value {the_dht_value.data.begin(), the_dht_value.data.end()};
-    CPPUNIT_ASSERT_EQUAL(the_data, from_value);
-}
-
-void
-ValueTester::testFilter()
-{
-    dht::Value::Filter defaultFiler {};
-
-    auto isPairSize = dht::Value::Filter([](const dht::Value& v) {
-        return v.data.size() % 2 == 0;
-    });
-
-    auto isUserTypeTest = dht::Value::Filter([](const dht::Value& v) {
-        return v.user_type == "test";
-    });
-
-    std::string data1 {"42 cats"};
-    dht::Value value1 {(const uint8_t*)data1.data(), data1.size()};
-    value1.user_type = "test";
-
-    std::string data2 {"420 cats"};
-    dht::Value value2 {(const uint8_t*)data2.data(), data2.size()};
-    dht::Value value3 {(const uint8_t*)data2.data(), data2.size()};
-    value3.user_type = "test";
-
-    CPPUNIT_ASSERT(!isPairSize(value1));
-    CPPUNIT_ASSERT(isUserTypeTest(value1));
-
-    auto isBoth = dht::Value::Filter::chain(isPairSize, isUserTypeTest);
-    auto isUserTypeTest2 = dht::Value::Filter::chain(defaultFiler, isUserTypeTest);
-
-    CPPUNIT_ASSERT(isUserTypeTest2(value1));
-    CPPUNIT_ASSERT(!isUserTypeTest2(value2));
-    CPPUNIT_ASSERT(!isBoth(value1));
-    CPPUNIT_ASSERT(!isBoth(value2));
-    CPPUNIT_ASSERT(isBoth(value3));
-}
-
-void
-ValueTester::tearDown() {
-
-}
-}  // namespace test
@@ -1,53 +0,0 @@
-/*
- *  Copyright (C) 2019 Savoir-faire Linux Inc.
- *
- *  Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-// cppunit
-#include <cppunit/TestFixture.h>
-#include <cppunit/extensions/HelperMacros.h>
-
-namespace test {
-
-class ValueTester : public CppUnit::TestFixture {
-    CPPUNIT_TEST_SUITE(ValueTester);
-    CPPUNIT_TEST(testConstructors);
-    CPPUNIT_TEST(testFilter);
-    CPPUNIT_TEST_SUITE_END();
-
- public:
-    /**
-     * Method automatically called before each test by CppUnit
-     */
-    void setUp();
-    /**
-     * Method automatically called after each test CppUnit
-     */
-    void tearDown();
-    /**
-     * Test the differents behaviors of constructors
-     */
-    void testConstructors();
-    /**
-     * Test compare operators
-     */
-    void testFilter();
-};
-
-}  // namespace test
@@ -1,7 +1,7 @@
 bin_PROGRAMS = dhtnode dhtchat dhtscanner
 noinst_HEADERS = tools_common.h

-AM_CPPFLAGS = -I../include @JsonCpp_CFLAGS@ @MsgPack_CFLAGS@
+AM_CPPFLAGS = -I../include

 dhtnode_SOURCES = dhtnode.cpp
 dhtnode_LDFLAGS = -lopendht -lreadline -L@top_builddir@/src/.libs @Argon2_LDFLAGS@ @GnuTLS_LIBS@
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 Savoir-faire Linux Inc.
 *
 *  Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 *
@@ -64,19 +64,10 @@ main(int argc, char **argv)
    try {
        dht.run(params.port, dht::crypto::generateIdentity("DHT Chat Node"), true, params.network);

-        if (params.log) {
-            if (params.syslog)
-                log::enableSyslog(dht, "dhtnode");
-            else if (not params.logfile.empty())
-                log::enableFileLogging(dht, params.logfile);
-            else
-                log::enableLogging(dht);
-        }
-
        if (not params.bootstrap.first.empty())
            dht.bootstrap(params.bootstrap.first.c_str(), params.bootstrap.second.c_str());

-#ifdef OPENDHT_PROXY_CLIENT
+#if OPENDHT_PROXY_CLIENT
    if (!params.proxyclient.empty()) {
        dht.setProxyServer(params.proxyclient);
        dht.enableProxy(true);
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 Savoir-faire Linux Inc.
 *
 *  Authors: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 *           Simon Désaulniers <simon.desaulniers@savoirfairelinux.com>
@@ -58,9 +58,9 @@ void print_help() {
              << "  ld [key]   Print basic information about currenty stored values on this node (or key)." << std::endl
              << "  lr         Print the full current routing table of this node." << std::endl;

-#ifdef OPENDHT_PROXY_SERVER
+#if OPENDHT_PROXY_SERVER
    std::cout << std::endl << "Operations with the proxy:" << std::endl
-#ifdef OPENDHT_PUSH_NOTIFICATIONS
+#if OPENDHT_PUSH_NOTIFICATIONS
              << "  pst [port] <pushServer> Start the proxy interface on port." << std::endl
 #else
              << "  pst [port]              Start the proxy interface on port." << std::endl
@@ -68,9 +68,9 @@ void print_help() {
              << "  psp [port]              Stop the proxy interface on port." << std::endl;
 #endif //OPENDHT_PROXY_SERVER

-#ifdef OPENDHT_PROXY_CLIENT
+#if OPENDHT_PROXY_CLIENT
    std::cout << std::endl << "Operations with the proxy:" << std::endl
-#ifdef OPENDHT_PUSH_NOTIFICATIONS
+#if OPENDHT_PUSH_NOTIFICATIONS
              << "  stt [server_address] <device_key> Start the proxy client." << std::endl
              << "  rs  [token]                       Resubscribe to opendht." << std::endl
              << "  rp  [token]                       Inject a push notification in Opendht." << std::endl
@@ -102,7 +102,7 @@ void print_help() {
 }

 void cmd_loop(std::shared_ptr<DhtRunner>& dht, dht_params& params
-#ifdef OPENDHT_PROXY_SERVER
+#if OPENDHT_PROXY_SERVER
    , std::map<in_port_t, std::unique_ptr<DhtProxyServer>>& proxies
 #endif
 )
@@ -141,10 +141,10 @@ void cmd_loop(std::shared_ptr<DhtRunner>& dht, dht_params& params
            std::cout << dht->getNodesStats(AF_INET).toString() << std::endl;
            std::cout << "IPv6 stats:" << std::endl;
            std::cout << dht->getNodesStats(AF_INET6).toString() << std::endl;
-#ifdef OPENDHT_PROXY_SERVER
+#if OPENDHT_PROXY_SERVER
            for (const auto& proxy : proxies) {
                std::cout << "Stats for proxy on port " << proxy.first << std::endl;
-                std::cout << "  " << proxy.second->stats().toString() << std::endl;
+                std::cout << "  " << proxy.second->getStats().toString() << std::endl;
            }
 #endif
            continue;
@@ -201,16 +201,16 @@ void cmd_loop(std::shared_ptr<DhtRunner>& dht, dht_params& params
            dht->connectivityChanged();
            continue;
        }
-#ifdef OPENDHT_PROXY_SERVER
+#if OPENDHT_PROXY_SERVER
        else if (op == "pst") {
-#ifdef OPENDHT_PUSH_NOTIFICATIONS
+#if OPENDHT_PUSH_NOTIFICATIONS
                iss >> idstr >> pushServer;
 #else
                iss >> idstr;
 #endif // OPENDHT_PUSH_NOTIFICATIONS
            try {
                unsigned int port = std::stoi(idstr);
-#ifdef OPENDHT_PUSH_NOTIFICATIONS
+#if OPENDHT_PUSH_NOTIFICATIONS
                proxies.emplace(port, std::unique_ptr<DhtProxyServer>(new DhtProxyServer(dht, port, pushServer)));
 #else
                proxies.emplace(port, std::unique_ptr<DhtProxyServer>(new DhtProxyServer(dht, port)));
@@ -227,7 +227,7 @@ void cmd_loop(std::shared_ptr<DhtRunner>& dht, dht_params& params
            continue;
        }
 #endif //OPENDHT_PROXY_SERVER
-#ifdef OPENDHT_PROXY_CLIENT
+#if OPENDHT_PROXY_CLIENT
        else if (op == "stt") {
            dht->enableProxy(true);
            continue;
@@ -235,7 +235,7 @@ void cmd_loop(std::shared_ptr<DhtRunner>& dht, dht_params& params
            dht->enableProxy(false);
            continue;
        }
-#ifdef OPENDHT_PUSH_NOTIFICATIONS
+#if OPENDHT_PUSH_NOTIFICATIONS
        else if (op == "rp") {
            iss >> value;
            dht->pushNotificationReceived({{"to", "dhtnode"}, {"token", value}});
@@ -307,7 +307,7 @@ void cmd_loop(std::shared_ptr<DhtRunner>& dht, dht_params& params
            }, [start](bool ok) {
                auto end = std::chrono::high_resolution_clock::now();
                std::cout << "Get: " << (ok ? "completed" : "failure") << " (took " << print_dt(end-start) << "s)" << std::endl;
-            }, {}, dht::Where {rem});
+            }, {}, dht::Where {std::move(rem)});
        }
        else if (op == "q") {
            std::string rem;
@@ -322,7 +322,7 @@ void cmd_loop(std::shared_ptr<DhtRunner>& dht, dht_params& params
            }, [start](bool ok) {
                auto end = std::chrono::high_resolution_clock::now();
                std::cout << "Query: " << (ok ? "completed" : "failure") << " (took " << print_dt(end-start) << "s)" << std::endl;
-            }, dht::Query {rem});
+            }, dht::Query {std::move(rem)});
        }
        else if (op == "l") {
            std::string rem;
@@ -332,7 +332,7 @@ void cmd_loop(std::shared_ptr<DhtRunner>& dht, dht_params& params
                for (const auto& value : values)
                    std::cout << "\t" << *value << std::endl;
                return true;
-            }, {}, dht::Where {rem});
+            }, {}, dht::Where {std::move(rem)});
            auto t = token.get();
            std::cout << "Listening, token: " << t << std::endl;
        }
@@ -431,7 +431,7 @@ void cmd_loop(std::shared_ptr<DhtRunner>& dht, dht_params& params
                                  << p.toString() << std::endl
                                  << "   hash: " << p.hash() << std::endl;
                        std::cout << "   entries:" << std::endl;
-                        for (const auto& v : vals)
+                        for (auto v : vals)
                             std::cout << "      " << v->first.toString() << "[vid: " << v->second << "]" << std::endl;
                    },
                    [start](bool ok) {
@@ -500,7 +500,6 @@ main(int argc, char **argv)
        dht::DhtRunner::Config config {};
        config.dht_config.node_config.network = params.network;
        config.dht_config.node_config.maintain_storage = false;
-        config.dht_config.node_config.persist_path = params.persist_path;
        config.dht_config.id = crt;
        config.threaded = true;
        config.proxy_server = params.proxyclient;
@@ -524,11 +523,11 @@ main(int argc, char **argv)
            dht->bootstrap(params.bootstrap.first.c_str(), params.bootstrap.second.c_str());
        }

-#ifdef OPENDHT_PROXY_SERVER
+#if OPENDHT_PROXY_SERVER
        std::map<in_port_t, std::unique_ptr<DhtProxyServer>> proxies;
 #endif
        if (params.proxyserver != 0) {
-#ifdef OPENDHT_PROXY_SERVER
+#if OPENDHT_PROXY_SERVER
            proxies.emplace(params.proxyserver, std::unique_ptr<DhtProxyServer>(new DhtProxyServer(dht, params.proxyserver, params.pushserver)));
 #else
            std::cerr << "DHT proxy server requested but OpenDHT built without proxy server support." << std::endl;
@@ -540,7 +539,7 @@ main(int argc, char **argv)
            while (runner.wait());
        else
            cmd_loop(dht, params
-#ifdef OPENDHT_PROXY_SERVER
+#if OPENDHT_PROXY_SERVER
                , proxies
 #endif
            );
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 Savoir-faire Linux Inc.
 *
 *  Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 *
@@ -63,15 +63,11 @@ $(function() {
                        if (!element || element.length == 0)
                            return;
                        const o = JSON.parse(element);
-                        if (o.expired) {
-                            $('#value'+o.id).slideUp(100, (e) => $(e.target).remove());
-                        } else {
-                            const d = window.atob(o.data);
-                            const delay = Math.max(0, start-now);
-                            $('<li class="list-group-item" id="value'+o.id+'"/>').append(valueGetElement(o)).appendTo(group).hide().delay(delay).slideDown(100);
-                            lastAppended = i+1;
-                            start = Math.max(start, now)+25;
-                        }
+                        const d = window.atob(o.data);
+                        const delay = Math.max(0, start-now);
+                        $('<li class="list-group-item"/>').append(valueGetElement(o)).appendTo(group).hide().delay(delay).slideDown(100);
+                        lastAppended = i+1;
+                        start = Math.max(start, now)+25;
                    }
                } else if (this.status !== 0) {
                    group.empty().append($('<li class="list-group-item list-group-item-danger"/>').text("Error loading content: " + this.statusText));
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 Savoir-faire Linux Inc.
 *
 *  Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 *  Author: Sébastien Blin <sebastien.blin@savoirfairelinux.com>
@@ -103,7 +103,6 @@ struct dht_params {
    std::string proxyclient {};
    std::string pushserver {};
    std::string devicekey {};
-    std::string persist_path {};
 };

 static const constexpr struct option long_options[] = {
@@ -115,7 +114,6 @@ static const constexpr struct option long_options[] = {
   {"verbose",    no_argument      , nullptr, 'v'},
   {"daemonize",  no_argument      , nullptr, 'd'},
   {"service",    no_argument      , nullptr, 's'},
-   {"persist",    required_argument, nullptr, 'f'},
   {"logfile",    required_argument, nullptr, 'l'},
   {"syslog",     no_argument      , nullptr, 'L'},
   {"proxyserver",required_argument, nullptr, 'S'},
@@ -129,7 +127,7 @@ dht_params
 parseArgs(int argc, char **argv) {
    dht_params params;
    int opt;
-    while ((opt = getopt_long(argc, argv, "hidsvp:n:b:f:l:", long_options, nullptr)) != -1) {
+    while ((opt = getopt_long(argc, argv, "hidsvp:n:b:l:", long_options, nullptr)) != -1) {
        switch (opt) {
        case 'p': {
                int port_arg = atoi(optarg);
@@ -156,9 +154,6 @@ parseArgs(int argc, char **argv) {
        case 'D':
            params.devicekey = optarg;
            break;
-        case 'f':
-            params.persist_path = optarg;
-            break;
        case 'n':
            params.network = strtoul(optarg, nullptr, 0);
            break;
Author	SHA1	Message	Date
Adrien Béraud	5fbbcb2f45	Revert "search: use pointer to SearchNode" This reverts commit `3a41f2ce56`.	2018-06-20 14:40:41 -04:00
Adrien Béraud	b10e8bbc51	search: improve canGet performance	2018-06-20 14:01:48 -04:00
Adrien Béraud	0e05b12422	network engine: make MessageStats public, add packet counter	2018-06-20 14:01:48 -04:00
Adrien Béraud	9980fc89b3	dhtrunner: add stats	2018-06-20 14:01:48 -04:00
				`@@ -1 +0,0 @@`
				`Checks: '-,clang-diagnostic-,performance-,bugprone-,llvm-,clang-analyzer-,misc-*,-llvm-namespace-comment,-misc-unused-parameters,-misc-non-private-member-variables-in-classes,-llvm-header-guard,-llvm-include-order,-bugprone-suspicious-string-compare'`