proxy_client: use atomic bool for shared state flags

2026-11-10 21:37:05 +00:00 · 2017-12-05 16:32:45 +01:00
60 changed files with 1387 additions and 4081 deletions
@@ -48,7 +48,6 @@ Makefile.in

 # Python
 *.pyc
-*.stamp
 python/opendht.cpp
 python/setup.py

@@ -61,6 +60,3 @@ doc/Doxyfile
 # vim swap files
 *.swp
 *.swo
-
-# build dir
-build
@@ -5,62 +5,13 @@ services:

 language: cpp

-env:
-  matrix:
-    - OPENDHT_TEST_JOB="opendht.classic"
-    - OPENDHT_TEST_JOB="opendht.llvm"
-    - OPENDHT_TEST_JOB="opendht.proxyserver"
-    - OPENDHT_TEST_JOB="opendht.proxyclient"
-    - OPENDHT_TEST_JOB="opendht.push"
-
 before_install:
-  - |
-    # non llvm builds
-    if [[ "$OPENDHT_TEST_JOB" != *"opendht.llvm"* ]]; then
-      docker pull aberaud/opendht-deps;
-    fi
-
-  - |
-    # classic build
-    if [[ "$OPENDHT_TEST_JOB" == *"opendht.llvm"* ]]; then
-      docker pull aberaud/opendht-deps-llvm
-    fi
+- docker pull aberaud/opendht-deps
+- docker pull aberaud/opendht-deps-llvm

 script:
-  - |
-    # classic build
-    if [[ "$OPENDHT_TEST_JOB" == *"opendht.classic"* ]]; then
-      docker build -t opendht -f docker/DockerfileTravis .;
-    fi
-
-  - |
-    # proxy builds
-    if [[ "$OPENDHT_TEST_JOB" != *"opendht.llvm"* ]] && [[ "$OPENDHT_TEST_JOB" != *"opendht.classic"* ]]; then
-      docker build -t opendht-proxy -f docker/DockerfileTravisProxy .;
-      options='';
-      if [[ "$OPENDHT_TEST_JOB" == *"opendht.proxyserver"* ]] || [[ "$OPENDHT_TEST_JOB" == *"opendht.push"* ]]; then
-        options+='-DOPENDHT_PROXY_SERVER=ON ';
-      else
-        options+='-DOPENDHT_PROXY_SERVER=OFF ';
-      fi
-      if [[ "$OPENDHT_TEST_JOB" == *"opendht.proxyclient"* ]] || [[ "$OPENDHT_TEST_JOB" == *"opendht.push"* ]]; then
-        options+='-DOPENDHT_PROXY_CLIENT=ON ';
-      else
-        options+='-DOPENDHT_PROXY_CLIENT=OFF ';
-      fi
-      if [[ "$OPENDHT_TEST_JOB" == *"opendht.push"* ]]; then
-        options+='-DOPENDHT_PUSH_NOTIFICATIONS=ON ';
-      else
-        options+='-DOPENDHT_PUSH_NOTIFICATIONS=OFF ';
-      fi
-      docker run opendht-proxy /bin/sh -c "cd /root/opendht && mkdir build && cd build && cmake -DCMAKE_INSTALL_PREFIX=/usr -DOPENDHT_PYTHON=ON -DOPENDHT_LTO=ON -DOPENDHT_TESTS=ON $options .. && make -j8 && ./opendht_unit_tests && make install";
-    fi
-
-  - |
-    # llvm build
-    if [[ "$OPENDHT_TEST_JOB" == *"opendht.llvm"* ]]; then
-      docker build -f docker/DockerfileTravisLlvm .
-    fi
+- docker build -f docker/DockerfileTravis .
+- docker build -f docker/DockerfileTravisLlvm .

 notifications:
  email:
@@ -1,7 +1,7 @@
 cmake_minimum_required (VERSION 3.1)
 project (opendht)
 set (opendht_VERSION_MAJOR 1)
-set (opendht_VERSION_MINOR 7.1)
+set (opendht_VERSION_MINOR 5.0)
 set (opendht_VERSION ${opendht_VERSION_MAJOR}.${opendht_VERSION_MINOR})
 set (PACKAGE_VERSION ${opendht_VERSION})
 set (VERSION "${opendht_VERSION}")
@@ -17,11 +17,8 @@ option (OPENDHT_ARGON2 "Use included argon2 sources" OFF)
 option (OPENDHT_LTO "Build with LTO" OFF)
 option (OPENDHT_SANITIZE "Build with address sanitizer and stack protector" OFF)
 option (OPENDHT_PROXY_SERVER "Enable DHT proxy server, use Restbed and jsoncpp" OFF)
-option (OPENDHT_PUSH_NOTIFICATIONS "Enable push notifications support" OFF)
 option (OPENDHT_PROXY_SERVER_IDENTITY "Allow clients to use the node identity" OFF)
 option (OPENDHT_PROXY_CLIENT "Enable DHT proxy client, use Restbed and jsoncpp" OFF)
-option (OPENDHT_INDEX "Build DHT indexation feature" OFF)
-option (OPENDHT_TESTS "Add unit tests executable" OFF)

 find_package(Doxygen)
 option (OPENDHT_DOCUMENTATION "Create and install the HTML based API documentation (requires Doxygen)" ${DOXYGEN_FOUND})
@@ -121,12 +118,9 @@ list (APPEND opendht_SOURCES
    src/node.cpp
    src/value.cpp
    src/dht.cpp
-    src/op_cache.cpp
    src/storage.h
    src/listener.h
    src/search.h
-    src/value_cache.h
-    src/op_cache.h
    src/net.h
    src/parsed_message.h
    src/request.h
@@ -136,6 +130,7 @@ list (APPEND opendht_SOURCES
    src/network_engine.cpp
    src/securedht.cpp
    src/dhtrunner.cpp
+    src/indexation/pht.cpp
    src/log.cpp
 )

@@ -161,14 +156,9 @@ list (APPEND opendht_HEADERS
    include/opendht/log.h
    include/opendht/log_enable.h
    include/opendht.h
+    include/opendht/indexation/pht.h
 )

-if (OPENDHT_INDEX)
-    list (APPEND opendht_SOURCES src/indexation/pht.cpp)
-    list (APPEND opendht_HEADERS include/opendht/indexation/pht.h)
-    add_definitions(-DOPENDHT_INDEXATION)
-endif()
-
 if (OPENDHT_PROXY_SERVER)
  add_definitions(-DOPENDHT_PROXY_SERVER=true)
  if (OPENDHT_PROXY_SERVER_IDENTITY)
@@ -182,11 +172,6 @@ if (OPENDHT_PROXY_SERVER)
  list (APPEND opendht_SOURCES
    src/dht_proxy_server.cpp
  )
-  if (OPENDHT_PUSH_NOTIFICATIONS)
-    add_definitions(-DOPENDHT_PUSH_NOTIFICATIONS=true)
-  else ()
-    add_definitions(-DOPENDHT_PUSH_NOTIFICATIONS=false)
-  endif ()
 else ()
    add_definitions(-DENABLE_PROXY_SERVER=false)
 endif ()
@@ -204,9 +189,6 @@ else ()
 endif ()

 if (OPENDHT_PROXY_SERVER OR OPENDHT_PROXY_CLIENT)
-  list (APPEND opendht_HEADERS
-    include/opendht/proxy.h
-  )
  list (APPEND opendht_SOURCES
    src/base64.h
    src/base64.cpp
@@ -299,28 +281,3 @@ install (DIRECTORY include DESTINATION ${CMAKE_INSTALL_PREFIX})
 install (FILES ${CMAKE_CURRENT_BINARY_DIR}/opendht.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
 install (EXPORT opendht DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/opendht FILE opendhtConfig.cmake)
 install (FILES ${CMAKE_CURRENT_BINARY_DIR}/opendhtConfigVersion.cmake DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/opendht)
-
-# Unit tests
-IF(OPENDHT_TESTS)
-  FIND_PACKAGE(Cppunit REQUIRED)
-  # unit testing
-    add_executable(opendht_unit_tests
-      tests/tests_runner.cpp
-      tests/infohashtester.h
-      tests/infohashtester.cpp
-      tests/dhtrunnertester.h
-      tests/dhtrunnertester.cpp
-    )
-    if (OPENDHT_SHARED)
-      TARGET_LINK_LIBRARIES(opendht_unit_tests opendht)
-    else ()
-      TARGET_LINK_LIBRARIES(opendht_unit_tests opendht-static)
-    endif ()
-    TARGET_LINK_LIBRARIES(opendht_unit_tests
-       ${CMAKE_THREAD_LIBS_INIT}
-       ${CPPUNIT_LIBRARIES}
-       ${GNUTLS_LIBRARIES}
-    )
-    enable_testing()
-    add_test(TEST opendht_unit_tests)
-ENDIF()
@@ -19,14 +19,11 @@
    </ProjectConfiguration>
  </ItemGroup>
  <ItemGroup>
-    <ClCompile Include="wingetopt.c" />
-    <ClCompile Include="..\src\base64.cpp" />
    <ClCompile Include="..\src\callbacks.cpp" />
    <ClCompile Include="..\src\crypto.cpp" />
    <ClCompile Include="..\src\default_types.cpp" />
    <ClCompile Include="..\src\dht.cpp" />
    <ClCompile Include="..\src\dhtrunner.cpp" />
-    <ClCompile Include="..\src\dht_proxy_server.cpp" />
    <ClCompile Include="..\src\indexation\pht.cpp" />
    <ClCompile Include="..\src\infohash.cpp" />
    <ClCompile Include="..\src\log.cpp" />
@@ -39,8 +36,6 @@
    <ClCompile Include="..\src\value.cpp" />
  </ItemGroup>
  <ItemGroup>
-    <ClInclude Include="unistd.h" />
-    <ClInclude Include="wingetopt.h" />
    <ClInclude Include="..\include\opendht.h" />
    <ClInclude Include="..\include\opendht\callbacks.h" />
    <ClInclude Include="..\include\opendht\crypto.h" />
@@ -48,7 +43,6 @@
    <ClInclude Include="..\include\opendht\default_types.h" />
    <ClInclude Include="..\include\opendht\dht.h" />
    <ClInclude Include="..\include\opendht\dhtrunner.h" />
-    <ClInclude Include="..\include\opendht\dht_proxy_server.h" />
    <ClInclude Include="..\include\opendht\indexation\pht.h" />
    <ClInclude Include="..\include\opendht\infohash.h" />
    <ClInclude Include="..\include\opendht\log.h" />
@@ -57,6 +51,7 @@
    <ClInclude Include="..\include\opendht\node.h" />
    <ClInclude Include="..\include\opendht\node_cache.h" />
    <ClInclude Include="..\include\opendht\rate_limiter.h" />
+    <ClInclude Include="..\include\opendht\request.h" />
    <ClInclude Include="..\include\opendht\rng.h" />
    <ClInclude Include="..\include\opendht\routing_table.h" />
    <ClInclude Include="..\include\opendht\scheduler.h" />
@@ -64,11 +59,9 @@
    <ClInclude Include="..\include\opendht\sockaddr.h" />
    <ClInclude Include="..\include\opendht\utils.h" />
    <ClInclude Include="..\include\opendht\value.h" />
-    <ClInclude Include="..\src\base64.h" />
-    <ClInclude Include="..\src\listener.h" />
    <ClInclude Include="..\src\net.h" />
+    <ClInclude Include="..\src\listener.h" />
    <ClInclude Include="..\src\parsed_message.h" />
-    <ClInclude Include="..\src\request.h" />
    <ClInclude Include="..\src\search.h" />
    <ClInclude Include="..\src\storage.h" />
  </ItemGroup>
@@ -222,9 +215,9 @@ copy ..\include\opendht.h $(OutDir)\include\</Command>
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <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>
+      <AdditionalIncludeDirectories>$(ProjectDir)contrib\build\include;$(ProjectDir)..\include;$(ProjectDir)..\include\opendht;$(ProjectDir)contrib\build\msgpack-c\include;$(ProjectDir)contrib\build\argon2\include</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32_NATIVE;WIN32_LEAN_AND_MEAN;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <DisableSpecificWarnings>4804;4800;4101;4267;4244;4503;4273;</DisableSpecificWarnings>
+      <DisableSpecificWarnings>4804;4800;4101;4267;4244;4503;</DisableSpecificWarnings>
      <AdditionalOptions>-D_SCL_SECURE_NO_WARNINGS %(AdditionalOptions)</AdditionalOptions>
      <ProgramDataBaseFileName>$(OutDir)\lib\x64\$(TargetName).pdb</ProgramDataBaseFileName>
    </ClCompile>
@@ -31,6 +31,9 @@
    <ClCompile Include="..\src\node_cache.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
+    <ClCompile Include="..\src\indexation\pht.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
    <ClCompile Include="..\src\routing_table.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
@@ -43,102 +46,80 @@
    <ClCompile Include="..\src\value.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="..\src\base64.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\dht_proxy_server.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\indexation\pht.cpp">
-      <Filter>Source Files\indexation</Filter>
-    </ClCompile>
-    <ClCompile Include="wingetopt.c" />
  </ItemGroup>
  <ItemGroup>
-    <ClInclude Include="..\include\opendht\def.h" />
-    <ClInclude Include="..\include\opendht\sockaddr.h" />
-    <ClInclude Include="..\src\net.h" />
-    <ClInclude Include="..\src\parsed_message.h" />
-    <ClInclude Include="..\src\base64.h">
-      <Filter>Source Files</Filter>
+    <ClInclude Include="..\include\opendht\callbacks.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\opendht\crypto.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\opendht\default_types.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\opendht\dht.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\opendht\dhtrunner.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\opendht\infohash.h">
+      <Filter>Header Files</Filter>
    </ClInclude>
    <ClInclude Include="..\src\listener.h">
-      <Filter>Source Files</Filter>
+      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="..\src\request.h">
-      <Filter>Source Files</Filter>
+    <ClInclude Include="..\include\opendht\log.h">
+      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="..\src\search.h">
-      <Filter>Source Files</Filter>
+    <ClInclude Include="..\include\opendht\log_enable.h">
+      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="..\src\storage.h">
-      <Filter>Source Files</Filter>
+    <ClInclude Include="..\include\opendht\network_engine.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\opendht\node.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\opendht\node_cache.h">
+      <Filter>Header Files</Filter>
    </ClInclude>
    <ClInclude Include="..\include\opendht.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="..\include\opendht\callbacks.h">
-      <Filter>Header Files\opendht</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\opendht\crypto.h">
-      <Filter>Header Files\opendht</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\opendht\default_types.h">
-      <Filter>Header Files\opendht</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\opendht\dht.h">
-      <Filter>Header Files\opendht</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\opendht\dht_proxy_server.h">
-      <Filter>Header Files\opendht</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\opendht\dhtrunner.h">
-      <Filter>Header Files\opendht</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\opendht\infohash.h">
-      <Filter>Header Files\opendht</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\opendht\log.h">
-      <Filter>Header Files\opendht</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\opendht\log_enable.h">
-      <Filter>Header Files\opendht</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\opendht\network_engine.h">
-      <Filter>Header Files\opendht</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\opendht\node.h">
-      <Filter>Header Files\opendht</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\opendht\node_cache.h">
-      <Filter>Header Files\opendht</Filter>
+    <ClInclude Include="..\include\opendht\indexation\pht.h">
+      <Filter>Header Files</Filter>
    </ClInclude>
    <ClInclude Include="..\include\opendht\rate_limiter.h">
-      <Filter>Header Files\opendht</Filter>
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\opendht\request.h">
+      <Filter>Header Files</Filter>
    </ClInclude>
    <ClInclude Include="..\include\opendht\rng.h">
-      <Filter>Header Files\opendht</Filter>
+      <Filter>Header Files</Filter>
    </ClInclude>
    <ClInclude Include="..\include\opendht\routing_table.h">
-      <Filter>Header Files\opendht</Filter>
+      <Filter>Header Files</Filter>
    </ClInclude>
    <ClInclude Include="..\include\opendht\scheduler.h">
-      <Filter>Header Files\opendht</Filter>
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\search.h">
+      <Filter>Header Files</Filter>
    </ClInclude>
    <ClInclude Include="..\include\opendht\securedht.h">
-      <Filter>Header Files\opendht</Filter>
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\storage.h">
+      <Filter>Header Files</Filter>
    </ClInclude>
    <ClInclude Include="..\include\opendht\utils.h">
-      <Filter>Header Files\opendht</Filter>
+      <Filter>Header Files</Filter>
    </ClInclude>
    <ClInclude Include="..\include\opendht\value.h">
-      <Filter>Header Files\opendht</Filter>
+      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="..\include\opendht\indexation\pht.h">
-      <Filter>Header Files\opendht\indexation</Filter>
-    </ClInclude>
-    <ClInclude Include="unistd.h" />
-    <ClInclude Include="wingetopt.h" />
  </ItemGroup>
  <ItemGroup>
    <Filter Include="Source Files">
@@ -147,14 +128,5 @@
    <Filter Include="Header Files">
      <UniqueIdentifier>{d1ab5bfe-3ab1-45ee-9324-b4b071887668}</UniqueIdentifier>
    </Filter>
-    <Filter Include="Source Files\indexation">
-      <UniqueIdentifier>{939134d3-d5a2-4458-bca8-a10ea9042ea2}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\opendht">
-      <UniqueIdentifier>{0b46e2d0-4874-404c-bae3-fae8d49b85b8}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\opendht\indexation">
-      <UniqueIdentifier>{03bd5139-2ae5-41b0-a77b-944814e1b2b6}</UniqueIdentifier>
-    </Filter>
  </ItemGroup>
 </Project>
@@ -12,10 +12,6 @@ if USE_CYTHON
 SUBDIRS += python
 endif

-if ENABLE_TESTS
-SUBDIRS += tests
-endif
-
 SUBDIRS += doc

 ACLOCAL_AMFLAGS = -I m4
@@ -4,19 +4,14 @@
    <a id="user-content-opendht-" class="anchor" href="/savoirfairelinux/opendht/blob/master/README.md#opendht-" aria-hidden="true"></a>OpenDHT
 </h1>

-A lightweight C++11 Distributed Hash Table implementation.
+A lightweight C++11 Distributed Hash Table implementation originally based on https://github.com/jech/dht by Juliusz Chroboczek.

-OpenDHT provides an easy to use distributed in-memory data store.
-Every node in the network can read and write values to the store.
-Values are distributed over the network, with redundancy.
-
- * Lightweight and scalable, designed for large networks and small devices
- * High resilience to network disruption
- * Public key cryptography layer providing optional data signature and encryption (using GnuTLS)
- * IPv4 and IPv6 support
- * Clean and powerful C++11 map API
- * Python 3 bindings
- * REST API
+ * Light and fast C++11 Kademlia DHT library.
+ * Distributed shared key->value data-store
+ * Clean and powerful distributed map API with storage of arbitrary binary values of up to 56 KB.
+ * Optional public key cryptography layer providing data signature and encryption (using GnuTLS).
+ * IPv4 and IPv6 support.
+ * Python binding.

 ## Documentation
 See the wiki: <https://github.com/savoirfairelinux/opendht/wiki>
@@ -98,25 +93,23 @@ for r in results:
 - Nettle 2.4+, a GnuTLS dependency for crypto.
 - (optional) restbed used for the REST API. commit fb84213e170bc171fecd825a8e47ed9f881a12cd (https://github.com/AmarOk1412/restbed/tree/async_read_until)
 - (optional) jsoncpp 1.7.4-3+, used for the REST API.
- Build tested with GCC 5.2+ (GNU/Linux, Windows with MinGW), Clang/LLVM (GNU/Linux, Android, macOS, iOS).
+- Build tested with GCC 4.8+ (GNU/Linux, Android, Windows with MinGW), Clang/LLVM (Linux, macOS).
 - Build tested with Microsoft Visual Studio 2015

 ## Contact

 IRC: join us on Freenode at [`#opendht`](https://webchat.freenode.net/?channels=%23opendht).

-## License
-Copyright (C) 2014-2018 Savoir-faire Linux Inc.
+## Licence
+Copyright (C) 2014-2017 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.

 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.

-See COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html for the full GPLv3 license.
+See COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html for the full GPLv3 licence.

-## Acknowledgements
-This project was originally based on https://github.com/jech/dht by Juliusz Chroboczek.
-It is independent from another project called OpenDHT (Sean Rhea. Ph.D. Thesis, 2005), now extinct.
+This project is independent from another project called OpenDHT (Sean Rhea. Ph.D. Thesis, 2005), now extinct.

 ## Donations
 We gratefully accept Bitcoin donations to support OpenDHT development at: `bitcoin:3EykSd1An888efq4Bq3KaV3hJ3JQ4FPnwm`.
@@ -1,28 +0,0 @@
-INCLUDE(FindPkgConfig)
-PKG_CHECK_MODULES(PC_CPPUNIT "cppunit")
-
-FIND_PATH(CPPUNIT_INCLUDE_DIRS
-    NAMES cppunit/TestCase.h
-    HINTS ${PC_CPPUNIT_INCLUDE_DIR}
-    ${CMAKE_INSTALL_PREFIX}/include
-    PATHS
-    /usr/local/include
-    /usr/include
-)
-
-FIND_LIBRARY(CPPUNIT_LIBRARIES
-    NAMES cppunit
-    HINTS ${PC_CPPUNIT_LIBDIR}
-    ${CMAKE_INSTALL_PREFIX}/lib
-    ${CMAKE_INSTALL_PREFIX}/lib64
-    PATHS
-    ${CPPUNIT_INCLUDE_DIRS}/../lib
-    /usr/local/lib
-    /usr/lib
-)
-
-LIST(APPEND CPPUNIT_LIBRARIES ${CMAKE_DL_LIBS})
-
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(CPPUNIT DEFAULT_MSG CPPUNIT_LIBRARIES CPPUNIT_INCLUDE_DIRS)
-MARK_AS_ADVANCED(CPPUNIT_LIBRARIES CPPUNIT_INCLUDE_DIRS)
@@ -1,7 +1,7 @@
 dnl define macros
 m4_define([opendht_major_version], 1)
-m4_define([opendht_minor_version], 7)
-m4_define([opendht_patch_version], 1)
+m4_define([opendht_minor_version], 5)
+m4_define([opendht_patch_version], 0)
 m4_define([opendht_version],
 		  [opendht_major_version.opendht_minor_version.opendht_patch_version])

@@ -25,20 +25,13 @@ AC_PROG_CXX
 AM_PROG_AR

 dnl Check for logs
-AC_ARG_ENABLE([logs], [AS_HELP_STRING([--disable-logs], [Disable DHT logs])])
+AC_ARG_ENABLE([logs], [AS_HELP_STRING([--disable-logs], [Disble DHT logs])])
 AS_IF([test "x$enable_logs" != "xno"], [
 	AC_DEFINE([OPENDHT_LOG], [true], [Define if DHT logs are enabled])
 ], [
 	AC_DEFINE([OPENDHT_LOG], [false], [Define if DHT logs are enabled])
 ])

-dnl Check for indexation
-AC_ARG_ENABLE([indexation], [AS_HELP_STRING([--disable-indexation], [Disable DHT indexation])])
-AM_CONDITIONAL(ENABLE_INDEXATION, test x$enable_indexation != "xno")
-AS_IF([test "x$enable_indexation" != "xno"], [
-	AC_DEFINE([OPENDHT_INDEXATION], [1], [Define if DHT indexation is enabled])
-])
-
 dnl Check for Doxygen
 AC_ARG_ENABLE([doc], AS_HELP_STRING([--enable-doc], [Enable documentation generation (doxygen)]))
 AS_IF([test "x$enable_doc" = "xyes"], [
@@ -137,8 +130,6 @@ AM_COND_IF([ENABLE_TOOLS], [

 AC_ARG_ENABLE([proxy_server], AS_HELP_STRING([--enable-proxy-server], [Enable proxy server ability]), proxy_server=yes, proxy_server=no)
 AM_CONDITIONAL(ENABLE_PROXY_SERVER, test x$proxy_server == xyes)
-AC_ARG_ENABLE([push_notifications], AS_HELP_STRING([--enable-push-notifications], [Enable push notifications support]), push_notifications=yes, push_notifications=no)
-AM_CONDITIONAL(ENABLE_PUSH_NOTIFICATIONS, test x$push_notifications == xyes)
 AC_ARG_ENABLE([proxy_server_identity], AS_HELP_STRING([--enable-proxy-server-identity],
 	[Enable proxy server ability]), proxy_server_identity=yes, proxy_server_identity=no)
 AM_CONDITIONAL(ENABLE_PROXY_SERVER_IDENTITY, test x$proxy_server_identity == xyes)
@@ -147,18 +138,11 @@ AM_CONDITIONAL(ENABLE_PROXY_CLIENT, test x$proxy_client == xyes)

 AM_COND_IF([ENABLE_PROXY_SERVER], [
 	AC_CHECK_LIB(restbed, exit,, AC_MSG_ERROR([Missing restbed files]))
-	PKG_CHECK_MODULES([Jsoncpp], [jsoncpp >= 1.7.2])
+	PKG_CHECK_MODULES([Jsoncpp], [jsoncpp >= 1.7.4])
 	CPPFLAGS+=" -DOPENDHT_PROXY_SERVER=true -ljsoncpp -lrestbed"
 ], [
 	CPPFLAGS+=" -DOPENDHT_PROXY_SERVER=false"
 ])
-
-AM_COND_IF([ENABLE_PUSH_NOTIFICATIONS], [
-	CPPFLAGS+=" -DOPENDHT_PUSH_NOTIFICATIONS=true"
-], [
-	CPPFLAGS+=" -DOPENDHT_PUSH_NOTIFICATIONS=false"
-])
-
 AC_ARG_ENABLE([proxy_server_identity], AS_HELP_STRING([--enable-proxy-server-identity],
    [Enable proxy server ability]), proxy_server_identity=yes, proxy_server_identity=no)
 AM_CONDITIONAL(ENABLE_PROXY_SERVER_IDENTITY, test x$proxy_server_identity == xyes -a x$proxy_server == xyes)
@@ -182,11 +166,6 @@ AM_COND_IF([PROXY_CLIENT_OR_SERVER], [
 	LDFLAGS="${LDFLAGS} ${Jsoncpp_LIBS} -lrestbed"
 ], [])

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

 AC_CONFIG_FILES([doc/Doxyfile doc/Makefile])

@@ -202,6 +181,5 @@ AM_COND_IF([USE_CYTHON], [
 AC_CONFIG_FILES([Makefile
                 src/Makefile
                 tools/Makefile
-								 tests/Makefile
                 opendht.pc])
 AC_OUTPUT
@@ -1,18 +1,3 @@
-FROM ubuntu:16.04
+FROM ubuntu:17.04
 MAINTAINER Adrien Béraud <adrien.beraud@savoirfairelinux.com>
-RUN apt-get update && apt-get install -y build-essential cmake git wget libncurses5-dev libreadline-dev nettle-dev libgnutls28-dev libuv1-dev  cython3 python3-dev libcppunit-dev libjsoncpp-dev libasio-dev libssl-dev python3-setuptools && apt-get clean
-
-# build restbed from sources
-RUN git clone --recursive https://github.com/corvusoft/restbed.git \
-	&& cd restbed && mkdir build && cd build \
-	&& cmake -DBUILD_TESTS=NO -DBUILD_EXAMPLES=NO -DBUILD_SSL=NO -DBUILD_SHARED=YES -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=lib .. \
-	&& make -j8 install \
-	&& cd .. && rm -rf restbed
-
-#build msgpack from source
-RUN wget https://github.com/msgpack/msgpack-c/releases/download/cpp-2.1.5/msgpack-2.1.5.tar.gz \
-	&& tar -xzf msgpack-2.1.5.tar.gz \
-	&& cd msgpack-2.1.5 && mkdir build && cd build \
-	&& cmake -DMSGPACK_CXX11=ON -DMSGPACK_BUILD_EXAMPLES=OFF -DCMAKE_INSTALL_PREFIX=/usr .. \
-	&& make -j8 && make install \
-	&& cd ../.. && rm -rf msgpack-2.1.5 msgpack-2.1.5.tar.gz
+RUN apt-get update && apt-get install -y build-essential cmake git wget libncurses5-dev libreadline-dev nettle-dev libgnutls28-dev libuv1-dev libmsgpack-dev libargon2-0-dev cython3 python3-dev python3-setuptools && apt-get clean
@@ -1,23 +1,7 @@
-FROM ubuntu:16.04
+FROM ubuntu:17.04
 MAINTAINER Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 RUN apt-get update \
-	&& apt-get install -y llvm llvm-dev clang make cmake git wget libncurses5-dev libreadline-dev nettle-dev libgnutls28-dev libuv1-dev libmsgpack-dev libjsoncpp-dev libasio-dev cython3 python3-dev python3-setuptools libcppunit-dev \
+	&& apt-get install -y llvm llvm-dev clang make cmake git wget libncurses5-dev libreadline-dev nettle-dev libgnutls28-dev libuv1-dev libmsgpack-dev libargon2-0-dev cython3 python3-dev python3-setuptools \
 	&& apt-get remove -y gcc g++ && apt-get autoremove -y && apt-get clean
-
 ENV CC cc
-ENV CXX c++
-
-# build restbed from sources
-RUN git clone --recursive https://github.com/corvusoft/restbed.git \
-	&& cd restbed && mkdir build && cd build \
-	&& cmake -DBUILD_TESTS=NO -DBUILD_EXAMPLES=NO -DBUILD_SSL=NO -DBUILD_SHARED=YES -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=lib .. \
-	&& make -j8 install \
-	&& cd .. && rm -rf restbed
-
-#build msgpack from source
-RUN wget https://github.com/msgpack/msgpack-c/releases/download/cpp-2.1.5/msgpack-2.1.5.tar.gz \
-	&& tar -xzf msgpack-2.1.5.tar.gz \
-	&& cd msgpack-2.1.5 && mkdir build && cd build \
-	&& cmake -DMSGPACK_CXX11=ON -DMSGPACK_BUILD_EXAMPLES=OFF -DCMAKE_INSTALL_PREFIX=/usr .. \
-	&& make -j8 && make install \
-	&& cd ../.. && rm -rf msgpack-2.1.5 msgpack-2.1.5.tar.gz
+ENV CXX c++
@@ -0,0 +1,6 @@
+FROM aberaud/opendht-deps-llvm
+MAINTAINER Adrien Béraud <adrien.beraud@savoirfairelinux.com>
+RUN git clone https://github.com/savoirfairelinux/opendht.git \
+	&& cd opendht && mkdir build && cd build \
+	&& cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DOPENDHT_PYTHON=On && make -j8 && make install \
+	&& cd ../.. && rm -rf opendht
@@ -1,7 +1,6 @@
 FROM aberaud/opendht-deps
 MAINTAINER Adrien Béraud <adrien.beraud@savoirfairelinux.com>
-
 COPY . /root/opendht
 RUN cd /root/opendht && mkdir build && cd build \
-	&& cmake -DCMAKE_INSTALL_PREFIX=/usr -DOPENDHT_PYTHON=On -DOPENDHT_LTO=On -DOPENDHT_TESTS=ON ..  \
-	&& make -j8 && ./opendht_unit_tests && make install
+	&& cmake -DCMAKE_INSTALL_PREFIX=/usr -DOPENDHT_PYTHON=On -DOPENDHT_LTO=On .. && make -j8 && make install \
+	&& cd ../.. && rm -rf opendht
@@ -1,7 +1,6 @@
 FROM aberaud/opendht-deps-llvm
 MAINTAINER Adrien Béraud <adrien.beraud@savoirfairelinux.com>
-
 COPY . /root/opendht
 RUN cd /root/opendht && mkdir build && cd build \
-	&& cmake -DCMAKE_INSTALL_PREFIX=/usr -DOPENDHT_PYTHON=On -DOPENDHT_TESTS=ON .. \
-	&& make -j8 && ./opendht_unit_tests && make install
+	&& cmake -DCMAKE_INSTALL_PREFIX=/usr -DOPENDHT_PYTHON=On .. && make -j8 && make install \
+	&& cd ../.. && rm -rf opendht
@@ -1,4 +0,0 @@
-FROM aberaud/opendht-deps
-MAINTAINER Adrien Béraud <adrien.beraud@savoirfairelinux.com>
-
-COPY . /root/opendht
@@ -24,6 +24,4 @@
 #endif
 #include "opendht/log.h"
 #include "opendht/default_types.h"
-#ifdef OPENDHT_INDEXATION
 #include "opendht/indexation/pht.h"
-#endif
@@ -1,8 +1,7 @@
 /*
 *  Copyright (C) 2014-2017 Savoir-faire Linux Inc.
- *  Authors: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
+ *  Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 *           Simon Désaulniers <simon.desaulniers@savoirfairelinux.com>
- *           Sébastien Blin <sebastien.blin@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
@@ -52,7 +51,7 @@ struct OPENDHT_PUBLIC NodeStats {
    unsigned table_depth {0};
    unsigned getKnownNodes() const { return good_nodes + dubious_nodes; }
    std::string toString() const;
-#if OPENDHT_PROXY_SERVER || OPENDHT_PROXY_CLIENT
+#if OPENDHT_PROXY_SERVER
    /**
     * Build a json object from a NodeStats
     */
@@ -98,7 +97,6 @@ using ValuesExport = std::pair<InfoHash, Blob>;

 using QueryCallback = std::function<bool(const std::vector<std::shared_ptr<FieldValueIndex>>& fields)>;
 using GetCallback = std::function<bool(const std::vector<std::shared_ptr<Value>>& values)>;
-using ValueCallback = std::function<bool(const std::vector<std::shared_ptr<Value>>& values, bool expired)>;
 using GetCallbackSimple = std::function<bool(std::shared_ptr<Value> value)>;
 using ShutdownCallback = std::function<void()>;

@@ -387,7 +387,6 @@ struct OPENDHT_PUBLIC Certificate {
    /** Read certificate alternative names */
    std::vector<std::pair<NameType, std::string>> getAltNames() const;

-    std::chrono::system_clock::time_point getActivation() const;
    std::chrono::system_clock::time_point getExpiration() const;

    /**
@@ -1,8 +1,7 @@
 /*
 *  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>
+ *  Author(s) : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
+ *              Simon Désaulniers <simon.desaulniers@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
@@ -68,9 +67,14 @@ 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, Config config);
+    Dht(int s, int s6, Config config);
    virtual ~Dht();

+
+#if OPENDHT_PROXY_CLIENT
+    void startProxy(const std::string&) {};
+#endif
+
    /**
     * Get the ID of the node.
     */
@@ -99,10 +103,11 @@ public:
    bool isRunning(sa_family_t af = 0) const;

    virtual void registerType(const ValueType& type) {
-        types.registerType(type);
+        types[type.id] = type;
    }
    const ValueType& getType(ValueType::Id type_id) const {
-        return types.getType(type_id);
+        const auto& t_it = types.find(type_id);
+        return (t_it == types.end()) ? ValueType::USER_DATA : t_it->second;
    }

    /**
@@ -230,16 +235,8 @@ public:
     *
     * @return a token to cancel the listener later.
     */
-    virtual size_t listen(const InfoHash&, ValueCallback, Value::Filter={}, Where={});
-
-    virtual size_t listen(const InfoHash& key, GetCallback cb, Value::Filter f={}, Where w={}) {
-        return listen(key, [cb](const std::vector<Sp<Value>>& vals, bool expired){
-            if (not expired)
-                return cb(vals);
-            return true;
-        }, std::forward<Value::Filter>(f), std::forward<Where>(w));
-    }
-    virtual size_t listen(const InfoHash& key, GetCallbackSimple cb, Value::Filter f={}, Where w={}) {
+    virtual size_t listen(const InfoHash&, GetCallback, Value::Filter&&={}, Where&& w = {});
+    virtual size_t listen(const InfoHash& key, GetCallbackSimple cb, Value::Filter f={}, Where w = {}) {
        return listen(key, bindGetCb(cb), std::forward<Value::Filter>(f), std::forward<Where>(w));
    }

@@ -297,9 +294,6 @@ public:

    std::vector<SockAddr> getPublicAddress(sa_family_t family = 0);

-    void pushNotificationReceived(const std::map<std::string, std::string>&) {}
-    void resubscribe(unsigned) {}
-
 private:

    /* When performing a search, we search for up to SEARCH_NODES closest nodes
@@ -357,7 +351,7 @@ private:
    uint64_t oldsecret {};

    // registred types
-    TypeStore types;
+    std::map<ValueType::Id, ValueType> types;

    // are we a bootstrap node ?
    // note: Any running node can be used as a bootstrap node.
@@ -414,7 +408,7 @@ private:
    void expireStorage(InfoHash h);
    void expireStore(decltype(store)::iterator);

-    void storageChanged(const InfoHash& id, Storage& st, ValueStorage&, bool newValue);
+    void storageChanged(const InfoHash& id, Storage& st, ValueStorage&);
    std::string printStorageLog(const decltype(store)::value_type&) const;

    /**
@@ -467,7 +461,7 @@ private:
    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 = Value::AllFilter(), const Sp<Query>& q = {});
+    size_t listenTo(const InfoHash& id, sa_family_t af, GetCallback cb, Value::Filter f = Value::AllFilter(), const Sp<Query>& q = {});

    /**
     * Refill the search with good nodes if possible.
@@ -535,9 +529,7 @@ private:
     *
     * @param sr  The search to execute its operations.
     */
-    void searchStep(Sp<Search>);
-    void searchSynchedNodeListen(const Sp<Search>&, SearchNode&);
-
+    void searchStep(Sp<Search> sr);
    void dumpSearch(const Search& sr, std::ostream& out) const;

    bool neighbourhoodMaintenance(RoutingTable&);
@@ -28,6 +28,10 @@ public:
    DhtInterface() = default;
    virtual ~DhtInterface() = default;

+#if OPENDHT_PROXY_CLIENT
+    virtual void startProxy(const std::string& host) = 0;
+#endif
+
    // [[deprecated]]
    using Status = NodeStatus;
    // [[deprecated]]
@@ -163,9 +167,8 @@ public:
     *
     * @return a token to cancel the listener later.
     */
-    virtual size_t listen(const InfoHash&, GetCallback, Value::Filter={}, Where w = {}) = 0;
+    virtual size_t listen(const InfoHash&, GetCallback, Value::Filter&&={}, Where&& w = {}) = 0;
    virtual size_t listen(const InfoHash& key, GetCallbackSimple cb, Value::Filter f={}, Where w = {}) = 0;
-    virtual size_t listen(const InfoHash&, ValueCallback, Value::Filter={}, Where w = {}) = 0;

    virtual bool cancelListen(const InfoHash&, size_t token) = 0;

@@ -211,6 +214,7 @@ public:

    virtual std::vector<SockAddr> getPublicAddress(sa_family_t family = 0) = 0;

+    Logger DHT_LOG;
    /**
     * Enable or disable logging of DHT internal messages
     */
@@ -224,23 +228,12 @@ public:
    /**
     * Only print logs related to the given InfoHash (if given), or disable filter (if zeroes).
     */
-    virtual void setLogFilter(const InfoHash& f)
-    {
+    virtual void setLogFilter(const InfoHash& f) {
        DHT_LOG.setFilter(f);
    }
-
-    virtual void setPushNotificationToken(const std::string&) {};
-
-    /**
-     * Call linked callback with a push notification
-     * @param notification to process
-     */
-    virtual void pushNotificationReceived(const std::map<std::string, std::string>& data) = 0;
-
 protected:
    bool logFilerEnable_ {};
    InfoHash logFiler_ {};
-    Logger DHT_LOG;
 };

 } // namespace dht
@@ -1,7 +1,6 @@
 /*
- *  Copyright (C) 2016-2018 Savoir-faire Linux Inc.
+ *  Copyright (C) 2016 Savoir-faire Linux Inc.
 *  Author: Sébastien Blin <sebastien.blin@savoirfairelinux.com>
- *          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
@@ -29,32 +28,29 @@
 #include "def.h"
 #include "dht_interface.h"
 #include "scheduler.h"
-#include "proxy.h"

-namespace restbed {
+namespace restbed
+{
    class Request;
 }

-namespace Json {
-    class Value;
-}
-
 namespace dht {

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

-    DhtProxyClient();
+    DhtProxyClient() : scheduler(DHT_LOG) {}

-    explicit DhtProxyClient(std::function<void()> loopSignal, const std::string& serverHost, const std::string& pushClientId = "");
-
-    virtual void setPushNotificationToken(const std::string& token) {
-#if OPENDHT_PUSH_NOTIFICATIONS
-        deviceKey_ = token;
-#endif
-    }
+    /**
+     * Initialise the DhtProxyClient with two open sockets (for IPv4 and IP6)
+     * and an ID for the node.
+     */
+    explicit DhtProxyClient(const std::string& serverHost);
+    /**
+     * Start the connection with a server.
+     * @param serverHost the server address
+     */
+    void startProxy(const std::string& serverHost);

    virtual ~DhtProxyClient();

@@ -162,31 +158,22 @@ public:
     *
     * @return a token to cancel the listener later.
     */
-    virtual size_t listen(const InfoHash&, ValueCallback, Value::Filter={}, Where={});
-
-    virtual size_t listen(const InfoHash& key, GetCallback cb, Value::Filter f={}, Where w={}) {
-        return listen(key, [cb](const std::vector<Sp<Value>>& vals, bool expired){
-            if (not expired)
-                return cb(vals);
-            return true;
-        }, std::forward<Value::Filter>(f), std::forward<Where>(w));
-    }
-    virtual size_t listen(const InfoHash& key, GetCallbackSimple cb, Value::Filter f={}, Where w={}) {
+    virtual size_t listen(const InfoHash&, GetCallback, Value::Filter&&={}, Where&&={});
+    virtual size_t listen(const InfoHash& key, GetCallbackSimple cb, Value::Filter f={}, Where w = {}) {
        return listen(key, bindGetCb(cb), std::forward<Value::Filter>(f), std::forward<Where>(w));
    }
-    virtual bool cancelListen(const InfoHash& key, size_t token);
-
-    /**
-     * Call linked callback with a push notification
-     * @param notification to process
-     */
-    void pushNotificationReceived(const std::map<std::string, std::string>& notification);

    time_point periodic(const uint8_t*, size_t, const SockAddr&);
    time_point periodic(const uint8_t *buf, size_t buflen, const sockaddr* from, socklen_t fromlen) {
        return periodic(buf, buflen, SockAddr(from, fromlen));
    }

+    /**
+     * TODO
+     * NOTE: For now, there is no endpoint in the DhtProxyServer to do the following methods.
+     * It will come in another version. (with push_notifications support)
+     */
+    virtual bool cancelListen(const InfoHash&, size_t token);

    /**
     * Similar to Dht::get, but sends a Query to filter data remotely.
@@ -206,31 +193,21 @@ public:
    /**
     * Get data currently being put at the given hash.
     */
-    std::vector<Sp<Value>> getPut(const InfoHash&);
+    std::vector<Sp<Value>> getPut(const InfoHash&) { return {}; }

    /**
     * Get data currently being put at the given hash with the given id.
     */
-    Sp<Value> getPut(const InfoHash&, const Value::Id&);
+    Sp<Value> getPut(const InfoHash&, const Value::Id&) { return {}; }

    /**
     * Stop any put/announce operation at the given location,
     * for the value with the given id.
     */
-    bool cancelPut(const InfoHash&, const Value::Id&);
+    bool cancelPut(const InfoHash&, const Value::Id&) { return false; }

    void pingNode(const sockaddr*, socklen_t, DoneCallbackSimple&& /*cb*/={}) { }

-    virtual void registerType(const ValueType& type) {
-        types.registerType(type);
-    }
-    const ValueType& getType(ValueType::Id type_id) const {
-        return types.getType(type_id);
-    }
-
-    std::vector<Sp<Value>> getLocal(const InfoHash& k, Value::Filter filter) const;
-    Sp<Value> getLocalById(const InfoHash& k, Value::Id id) const;
-
    /**
     * NOTE: The following methods will not be implemented because the
     * DhtProxyClient doesn't have any storage nor synchronization process
@@ -239,6 +216,10 @@ public:
    void insertNode(const InfoHash&, const sockaddr*, socklen_t) { }
    void insertNode(const NodeExport&) { }
    std::pair<size_t, size_t> getStoreSize() const { return {}; }
+    virtual void registerType(const ValueType&) { }
+    const ValueType& getType(ValueType::Id) const { return NO_VALUE; }
+    std::vector<Sp<Value>> getLocal(const InfoHash&, Value::Filter) const { return {}; }
+    Sp<Value> getLocalById(const InfoHash&, Value::Id) const { return {}; }
    std::vector<NodeExport> exportNodes() { return {}; }
    std::vector<ValuesExport> exportValues() const { return {}; }
    void importValues(const std::vector<ValuesExport>&) {}
@@ -250,36 +231,16 @@ public:
    void dumpTables() const {}
    std::vector<unsigned> getNodeMessageStats(bool) { return {}; }
    void setStorageLimit(size_t) {}
-    void connectivityChanged(sa_family_t) {
-        restartListeners();
-    }
-    void connectivityChanged() {
-        getProxyInfos();
-        restartListeners();
-        loopSignal_();
-    }
+    void connectivityChanged(sa_family_t) {}
+    void connectivityChanged() { }

 private:
-    /**
-     * Start the connection with a server.
-     */
-    void startProxy();
-
+    const ValueType NO_VALUE;
    /**
     * Get informations from the proxy node
     * @return the JSON returned by the proxy
     */
-    void getProxyInfos();
-    void onProxyInfos(const Json::Value& val, sa_family_t family);
-    SockAddr parsePublicAddress(const Json::Value& val);
-
-    void opFailed();
-
-    size_t doListen(const InfoHash& key, ValueCallback, Value::Filter);
-    bool doCancelListen(const InfoHash& key, size_t token);
-
-    void doPut(const InfoHash&, Sp<Value>, DoneCallback, time_point created, bool permanent);
-
+    Json::Value getProxyInfos() const;
    /**
     * Initialize statusIpvX_
     */
@@ -292,32 +253,27 @@ private:
     * cancel all Operations
     */
    void cancelAllOperations();
-
    std::string serverHost_;
-    std::string pushClientId_;
-
-    std::atomic_flag ongoingStatusUpdate_ = ATOMIC_FLAG_INIT;
    NodeStatus statusIpv4_ {NodeStatus::Disconnected};
    NodeStatus statusIpv6_ {NodeStatus::Disconnected};
-    NodeStats stats4_ {};
-    NodeStats stats6_ {};
-    SockAddr publicAddressV4_;
-    SockAddr publicAddressV6_;

    InfoHash myid {};

-    // registred types
-    TypeStore types;
-
    /**
     * Store listen requests.
     */
-    struct Listener;
-    struct ProxySearch;
-
-    size_t listenerToken_ {0};
-    std::map<InfoHash, ProxySearch> searches_;
-    mutable std::mutex searchLock_;
+    struct Listener
+    {
+        size_t token;
+        std::shared_ptr<restbed::Request> req;
+        std::string key;
+        GetCallback cb;
+        Value::Filter filterChain;
+        std::thread thread;
+    };
+    std::vector<Listener> listeners_;
+    size_t listener_token_ {0};
+    std::mutex lockListener_;

    /**
     * Store current put and get requests.
@@ -335,9 +291,7 @@ private:
     */
    std::vector<std::function<void()>> callbacks_;
    std::mutex lockCallbacks;
-
-    std::thread statusThread_;
-    mutable std::mutex lockCurrentProxyInfos_;
+    std::unique_ptr<std::mutex> lockCurrentProxyInfos_;

    Scheduler scheduler;
    /**
@@ -345,31 +299,20 @@ private:
     */
    void confirmProxy();
    Sp<Scheduler::Job> nextProxyConfirmation {};
+    /**
+     * Verify if we are still connected.
+     */
+    void confirmConnectivity();
+    Sp<Scheduler::Job> nextConnectivityConfirmation {};
    /**
     * Relaunch LISTEN requests if the client disconnect/reconnect.
     */
    void restartListeners();

    /**
-     * Refresh a listen via a token
-     * @param token
+     * Store the current proxy status
     */
-    void resubscribe(const InfoHash& key, Listener& listener);
-
-    /**
-     * If we want to use push notifications by default.
-     * NOTE: empty by default to avoid to use services like FCM or APN.
-     */
-    std::string deviceKey_ {};
-
-    const std::function<void()> loopSignal_;
-
-#if OPENDHT_PUSH_NOTIFICATIONS
-    void fillBodyToGetToken(std::shared_ptr<restbed::Request> request, unsigned token = 0);
-    void getPushRequest(Json::Value&) const;
-#endif // OPENDHT_PUSH_NOTIFICATIONS
-
-    bool isDestroying_ {false};
+    std::unique_ptr<Json::Value> currentProxyInfos_;
 };

 }
@@ -1,7 +1,6 @@
 /*
- *  Copyright (C) 2017-2018 Savoir-faire Linux Inc.
+ *  Copyright (C) 2017 Savoir-faire Linux Inc.
 *  Author: Sébastien Blin <sebastien.blin@savoirfairelinux.com>
- *          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
@@ -24,19 +23,12 @@
 #include "def.h"
 #include "sockaddr.h"
 #include "infohash.h"
-#include "scheduler.h"
-#include "value.h"
-#include "proxy.h"

 #include <thread>
 #include <memory>
 #include <mutex>
 #include <restbed>

-namespace Json {
-    class Value;
-}
-
 namespace dht {

 class DhtRunner;
@@ -51,11 +43,10 @@ public:
     * Start the Http server for OpenDHT
     * @param dht the DhtRunner linked to this proxy server
     * @param port to listen
-     * @param pushServer where to push notifications
     * @note if the server fails to start (if port is already used or reserved),
     * it will fails silently
     */
-    DhtProxyServer(std::shared_ptr<DhtRunner> dht, in_port_t port = 8000, const std::string& pushServer = "");
+    DhtProxyServer(std::shared_ptr<DhtRunner> dht, in_port_t port = 8000);
    virtual ~DhtProxyServer();

    DhtProxyServer(const DhtProxyServer& other) = delete;
@@ -63,27 +54,6 @@ public:
    DhtProxyServer& operator=(const DhtProxyServer& other) = delete;
    DhtProxyServer& operator=(DhtProxyServer&& other) = delete;

-    struct ServerStats {
-        /** Current number of listen operations */
-        size_t listenCount;
-        /** Current number of permanent put operations */
-        size_t putCount;
-        /** Current number of push tokens with at least one listen operation */
-        size_t pushListenersCount;
-        /** Average requests per second */
-        double requestRate;
-
-        std::string toString() const {
-            std::ostringstream ss;
-            ss << "Listens: " << listenCount << " Puts: " << putCount << " PushListeners: " << pushListenersCount << std::endl;
-            ss << "Requests: " << requestRate << " per second." << std::endl;
-            return ss.str();
-        }
-    };
-    ServerStats getStats() const;
-
-    std::shared_ptr<DhtRunner> getNode() const { return dht_; }
-
    /**
     * Stop the DhtProxyServer
     */
@@ -100,7 +70,7 @@ private:
    void getNodeInfo(const std::shared_ptr<restbed::Session>& session) const;

    /**
-     * Return Values of an infoHash
+     * Return Values of a InfoHash
     * Method: GET "/{InfoHash: .*}"
     * Return: Multiple JSON object in parts. Example:
     * Value in JSON format\n
@@ -112,7 +82,7 @@ private:
    void get(const std::shared_ptr<restbed::Session>& session) const;

    /**
-     * Listen incoming Values of an infoHash.
+     * Listen incoming Values of a InfoHash.
     * Method: LISTEN "/{InfoHash: .*}"
     * Return: Multiple JSON object in parts. Example:
     * Value in JSON format\n
@@ -121,7 +91,7 @@ private:
     * On error: HTTP 503, body: {"err":"xxxx"}
     * @param session
     */
-    void listen(const std::shared_ptr<restbed::Session>& session);
+    void listen(const std::shared_ptr<restbed::Session>& session) const;

    /**
     * Put a value on the DHT
@@ -132,9 +102,7 @@ private:
     * HTTP 400, body: {"err":"xxxx"} if bad json or HTTP 502 if put fails
     * @param session
     */
-    void put(const std::shared_ptr<restbed::Session>& session);
-
-    void cancelPut(const InfoHash& key, Value::Id vid);
+    void put(const std::shared_ptr<restbed::Session>& session) const;

 #if OPENDHT_PROXY_SERVER_IDENTITY
    /**
@@ -161,7 +129,7 @@ private:
 #endif // OPENDHT_PROXY_SERVER_IDENTITY

    /**
-     * Return Values of an infoHash filtered by a value id
+     * Return Values of a InfoHash filtered by a value id
     * Method: GET "/{InfoHash: .*}/{ValueId: .*}"
     * Return: Multiple JSON object in parts. Example:
     * Value in JSON format\n
@@ -177,67 +145,13 @@ private:
     * Method: OPTIONS "/{hash: .*}"
     * Return: HTTP 200 + Allow: allowed methods
     * See https://developer.mozilla.org/en-US/docs/Web/HTTP/Methods/OPTIONS
-     * @param session
     */
    void handleOptionsMethod(const std::shared_ptr<restbed::Session>& session) const;

-    /**
-     * Remove finished listeners
-     * @param testSession if we remove the listener only if the session is closed
-     */
-    void removeClosedListeners(bool testSession = true);
-
-#if OPENDHT_PUSH_NOTIFICATIONS
-    /**
-     * Subscribe to push notifications for an iOS or Android device.
-     * Method: SUBSCRIBE "/{InfoHash: .*}"
-     * Body: {"key": "device_key", (optional)"isAndroid":false (default true)}"
-     * Return: {"token": x}" where x if a token to save
-     * @note: the listen will timeout after six hours (and send a push notification).
-     * so you need to refresh the operation each six hours.
-     * @param session
-     */
-    void subscribe(const std::shared_ptr<restbed::Session>& session);
-    /**
-     * Unsubscribe to push notifications for an iOS or Android device.
-     * Method: UNSUBSCRIBE "/{InfoHash: .*}"
-     * Body: {"key": "device_key", "token": x} where x if the token to cancel
-     * Return: nothing
-     * @param session
-     */
-    void unsubscribe(const std::shared_ptr<restbed::Session>& session);
-    /**
-     * Send a push notification via a gorush push gateway
-     * @param key of the device
-     * @param json, the content to send
-     */
-    void sendPushNotification(const std::string& key, const Json::Value& json, bool isAndroid) const;
-
-    /**
-     * Remove a push listener between a client and a hash
-     * @param pushToken
-     * @param key
-     * @param clientId
-     */
-    void cancelPushListen(const std::string& pushToken, const InfoHash& key, const std::string& clientId);
-
-
-#endif //OPENDHT_PUSH_NOTIFICATIONS
-
-    using clock = std::chrono::steady_clock;
-    using time_point = clock::time_point;
-
    std::thread server_thread {};
    std::unique_ptr<restbed::Service> service_;
    std::shared_ptr<DhtRunner> dht_;

-    std::mutex schedulerLock_;
-    std::condition_variable schedulerCv_;
-    Scheduler scheduler_;
-    std::thread schedulerThread_;
-
-    Sp<Scheduler::Job> printStatsJob_;
-
    // Handle client quit for listen.
    // NOTE: can be simplified when we will supports restbed 5.0
    std::thread listenThread_;
@@ -246,26 +160,9 @@ private:
        InfoHash hash;
        std::future<size_t> token;
    };
-    std::vector<SessionToHashToken> currentListeners_;
-    std::mutex lockListener_;
+    mutable std::vector<SessionToHashToken> currentListeners_;
+    mutable std::mutex lockListener_;
    std::atomic_bool stopListeners {false};
-
-    struct PermanentPut;
-    struct SearchPuts;
-    std::map<InfoHash, SearchPuts> puts_;
-
-    mutable std::atomic<size_t> requestNum_ {0};
-    mutable std::atomic<time_point> lastStatsReset_ {time_point::min()};
-
-    const std::string pushServer_;
-
-#if OPENDHT_PUSH_NOTIFICATIONS
-    struct Listener;
-    struct PushListener;
-    std::mutex lockPushListeners_;
-    std::map<std::string, PushListener> pushListeners_;
-    proxy::ListenToken tokenPushNotif_ {0};
-#endif //OPENDHT_PUSH_NOTIFICATIONS
 };

 }
@@ -1,8 +1,7 @@
 /*
 *  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>
+ *  Author(s) : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
+ *              Simon Désaulniers <simon.desaulniers@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
@@ -20,6 +19,7 @@

 #pragma once

+//#include "securedht.h"
 #include "infohash.h"
 #include "value.h"
 #include "callbacks.h"
@@ -36,6 +36,10 @@
 #include <queue>
 #include <chrono>

+#if OPENDHT_PROXY_CLIENT
+#include "dht_proxy_client.h"
+#endif // OPENDHT_PROXY_CLIENT
+
 namespace dht {

 struct Node;
@@ -53,13 +57,6 @@ class OPENDHT_PUBLIC DhtRunner {
 public:
    typedef std::function<void(NodeStatus, NodeStatus)> StatusCallback;

-    struct Config {
-        SecureDhtConfig dht_config;
-        bool threaded;
-        std::string proxy_server;
-        std::string push_node_id;
-    };
-
    DhtRunner();
    virtual ~DhtRunner();

@@ -136,15 +133,7 @@ public:
        query(hash, cb, bindDoneCb(done_cb), q);
    }

-    std::future<size_t> listen(InfoHash key, ValueCallback vcb, Value::Filter f = Value::AllFilter(), Where w = {});
-
-    std::future<size_t> listen(InfoHash key, GetCallback cb, Value::Filter f={}, Where w={}) {
-        return listen(key, [cb](const std::vector<Sp<Value>>& vals, bool expired){
-            if (not expired)
-                return cb(vals);
-            return true;
-        }, std::forward<Value::Filter>(f), std::forward<Where>(w));
-    }
+    std::future<size_t> listen(InfoHash key, GetCallback vcb, Value::Filter f = Value::AllFilter(), Where w = {});
    std::future<size_t> listen(const std::string& key, GetCallback vcb, Value::Filter f = Value::AllFilter(), Where w = {});
    std::future<size_t> listen(InfoHash key, GetCallbackSimple cb, Value::Filter f = Value::AllFilter(), Where w = {}) {
        return listen(key, bindGetCb(cb), f, w);
@@ -309,13 +298,25 @@ public:
    void registerCertificate(std::shared_ptr<crypto::Certificate> cert);
    void setLocalCertificateStore(CertificateStoreQuery&& query_method);

+    struct Config {
+        SecureDhtConfig dht_config;
+        bool threaded;
+#if OPENDHT_PROXY_CLIENT
+        std::string proxy_server;
+#endif //OPENDHT_PROXY_CLIENT
+    };
+
    /**
     * @param port: Local port to bind. Both IPv4 and IPv6 will be tried (ANY).
     * @param identity: RSA key pair to use for cryptographic operations.
     * @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(in_port_t port = 4222, const crypto::Identity identity = {}, bool threaded = false, NetId network = 0) {
+    void run(in_port_t port, const crypto::Identity identity, bool threaded = false, NetId network = 0
+#if OPENDHT_PROXY_CLIENT
+    , const std::string& proxy_server = "127.0.0.1:8000"
+#endif //OPENDHT_PROXY_CLIENT
+) {
        run(port, {
            /*.dht_config = */{
                /*.node_config = */{
@@ -327,8 +328,9 @@ public:
                /*.id = */identity
            },
            /*.threaded = */threaded,
-            /*.proxy_server = */"",
-            /*.push_node_id = */""
+#if OPENDHT_PROXY_CLIENT
+            /*.proxy_server = */proxy_server
+#endif //OPENDHT_PROXY_CLIENT
        });
    }
    void run(in_port_t port, Config config);
@@ -359,13 +361,7 @@ public:
     */
    time_point loop() {
        std::lock_guard<std::mutex> lck(dht_mtx);
-        time_point wakeup = time_point::min();
-        try {
-            wakeup = loop_();
-        } catch (const dht::SocketException& e) {
-            startNetwork(bound4, bound6);
-        }
-        return wakeup;
+        return loop_();
    }

    /**
@@ -380,38 +376,17 @@ public:
     */
    void join();

-    void setProxyServer(const std::string& proxy, const std::string& pushNodeId = "") {
 #if OPENDHT_PROXY_CLIENT
-        if (config_.proxy_server == proxy and config_.push_node_id == pushNodeId)
-            return;
-        config_.proxy_server = proxy;
-        config_.push_node_id = pushNodeId;
-        enableProxy(use_proxy and not config_.proxy_server.empty());
-#endif
+    void setProxyServer(const std::string& url = "127.0.0.1:8000") {
+        config_.proxy_server = url;
    }
-
-    /**
-     * Start or stop the proxy
-     * @param proxify if we want to use the proxy
-     * @param deviceKey non empty to enable push notifications
-     */
    void enableProxy(bool proxify);
-
-    /* Push notification methods */
-
-    /**
-     * Updates the push notification device token
-     */
-    void setPushNotificationToken(const std::string& token);
-
-    /**
-     * Insert a push notification to process for OpenDHT
-     */
-    void pushNotificationReceived(const std::map<std::string, std::string>& data);
-
-    /* Proxy server mothods */
+#endif // OPENDHT_PROXY_CLIENT
+#if OPENDHT_PROXY_SERVER
    void forwardAllMessages(bool forward);
+#endif // OPENDHT_PROXY_SERVER

+    static std::vector<SockAddr> getAddrInfo(const std::string& host, const std::string& service);
 private:
    static constexpr std::chrono::seconds BOOTSTRAP_PERIOD {10};

@@ -423,25 +398,14 @@ private:
     */
    void tryBootstrapContinuously();

-    void startNetwork(const SockAddr sin4, const SockAddr sin6);
+    void doRun(const SockAddr& sin4, const SockAddr& sin6, SecureDhtConfig config);
    time_point loop_();

    NodeStatus getStatus() const {
        return std::max(status4, status6);
    }

-    /** Local DHT instance */
    std::unique_ptr<SecureDht> dht_;
-
-    /** Proxy client instance */
-    std::unique_ptr<SecureDht> dht_via_proxy_;
-
-    /** true if we are currently using a proxy */
-    std::atomic_bool use_proxy {false};
-
-    /** Current configuration */
-    Config config_;
-
    /**
     * reset dht clients
     */
@@ -450,12 +414,30 @@ private:
     * @return the current active DHT
     */
    SecureDht* activeDht() const;
-
+#if OPENDHT_PROXY_CLIENT
+    /**
+     * true if we are currently using a proxy
+     */
+    std::atomic_bool use_proxy {false};
+    /**
+     * The current proxy client
+     */
+    std::unique_ptr<SecureDht> dht_via_proxy_;
+    Config config_;
+#endif // OPENDHT_PROXY_CLIENT
    /**
     * Store current listeners and translates global tokens for each client.
     */
-    struct Listener;
-    std::map<size_t, Listener> listeners_;
+    struct Listener {
+        size_t globalToken;
+        size_t tokenClassicDht;
+        size_t tokenProxyDht;
+        GetCallback gcb;
+        InfoHash hash;
+        Value::Filter f;
+        Where w;
+    };
+    std::vector<std::unique_ptr<Listener>> listeners_ {};
    size_t listener_token_ {1};

    mutable std::mutex dht_mtx {};
@@ -480,19 +462,14 @@ private:
    std::queue<std::function<void(SecureDht&)>> pending_ops {};
    std::mutex storage_mtx {};

-    std::atomic_bool running {false};
-    std::atomic_bool running_network {false};
+    std::atomic<bool> running {false};

    NodeStatus status4 {NodeStatus::Disconnected},
               status6 {NodeStatus::Disconnected};
    StatusCallback statusCb {nullptr};

-    int s4 {-1}, s6 {-1};
    SockAddr bound4 {};
    SockAddr bound6 {};
-
-    /** Push notification token */
-    std::string pushToken_;
 };

 }
@@ -129,7 +129,7 @@ public:
     * Find the lowest 1 bit in an id.
     * Result will allways be lower than 8*N
     */
-    inline int lowbit() const {
+    inline unsigned lowbit() const {
        int i, j;
        for(i = N-1; i >= 0; i--)
            if(data_[i] != 0)
@@ -378,7 +378,7 @@ struct OPENDHT_PUBLIC NodeExport {

    void msgpack_unpack(msgpack::object o);

-    OPENDHT_PUBLIC friend std::ostream& operator<< (std::ostream& s, const NodeExport& h);
+    OPENDHT_PUBLIC friend std::ostream& operator<< (std::ostream& s, const InfoHash& h);
 };

 }
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2018 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>
 *
@@ -87,8 +87,6 @@ struct RequestAnswer {
    Blob ntoken {};
    Value::Id vid {};
    std::vector<Sp<Value>> values {};
-    std::vector<Value::Id> refreshed_values {};
-    std::vector<Value::Id> expired_values {};
    std::vector<Sp<FieldValueIndex>> fields {};
    std::vector<Sp<Node>> nodes4 {};
    std::vector<Sp<Node>> nodes6 {};
@@ -204,8 +202,8 @@ public:
    using RequestCb = std::function<void(const Request&, RequestAnswer&&)>;
    using RequestExpiredCb = std::function<void(const Request&, bool)>;

-    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,
+    NetworkEngine(Logger& log, Scheduler& scheduler);
+    NetworkEngine(InfoHash& myid, NetId net, int s, int s6, Logger& log, Scheduler& scheduler,
            decltype(NetworkEngine::onError) onError,
            decltype(NetworkEngine::onNewNode) onNewNode,
            decltype(NetworkEngine::onReportedAddr) onReportedAddr,
@@ -237,9 +235,6 @@ public:
            std::vector<Sp<Node>>&& nodes, std::vector<Sp<Node>>&& nodes6,
            std::vector<Sp<Value>>&& values, const Query& q);

-    void tellListenerRefreshed(Sp<Node> n, Tid socket_id, const InfoHash& hash, const Blob& ntoken, const std::vector<Value::Id>& values);
-    void tellListenerExpired(Sp<Node> n, Tid socket_id, const InfoHash& hash, const Blob& ntoken, const std::vector<Value::Id>& values);
-
    bool isRunning(sa_family_t af) const;
    inline want_t want () const { return dht_socket >= 0 && dht_socket6 >= 0 ? (WANT4 | WANT6) : -1; }

@@ -510,8 +505,8 @@ private:
    /* DHT info */
    const InfoHash& myid;
    const NetId network {0};
-    const int& dht_socket;
-    const int& dht_socket6;
+    const int dht_socket {-1};
+    const int dht_socket6 {-1};
    const Logger& DHT_LOG;

    NodeCache cache {};
@@ -117,7 +117,7 @@ struct Node {
     */
    Tid openSocket(SocketCb&& cb);

-    Sp<Socket> getSocket(Tid id);
+    Socket* getSocket(Tid id);

    /**
     * Closes a socket so that no further data will be red on that socket.
@@ -167,7 +167,7 @@ private:
    using TransactionDist = std::uniform_int_distribution<decltype(transaction_id)>;

    std::map<Tid, Sp<net::Request>> requests_ {};
-    std::map<Tid, Sp<Socket>> sockets_;
+    std::map<Tid, Socket> sockets_;
 };

 }
@@ -1,31 +0,0 @@
-/*
- *  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
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include <chrono>
-
-namespace dht {
-namespace proxy {
-
-constexpr const std::chrono::minutes OP_TIMEOUT {1 * 10}; // one hour
-constexpr const std::chrono::minutes OP_MARGIN {5}; // 5 minutes
-constexpr const char* const HTTP_PROTO {"http://"};
-using ListenToken = uint64_t;
-
-}
-}
@@ -36,10 +36,11 @@ namespace dht {
 */
 class Scheduler {
 public:
+    Scheduler(const Logger& l) : DHT_LOG(l) {}
+
    struct Job {
        Job(std::function<void()>&& f) : do_(std::move(f)) {}
        std::function<void()> do_;
-        void cancel() { do_ = {}; }
    };

    /**
@@ -57,19 +58,17 @@ public:
        return job;
    }

-    void add(const Sp<Scheduler::Job>& job, time_point t) {
-        if (t != time_point::max())
-            timers.emplace(std::move(t), job);
-    }
-
    /**
     * Reschedules a job.
     *
+     * @param time  The time at which the job shall be rescheduled.
     * @param job  The job to edit.
-     * @param t  The time at which the job shall be rescheduled.
+     *
+     * @return pointer to the newly scheduled job.
     */
    void edit(Sp<Scheduler::Job>& job, time_point t) {
        if (not job) {
+            DHT_LOG.ERR("editing an empty job");
            return;
        }
        // std::function move doesn't garantee to leave the object empty.
@@ -119,6 +118,7 @@ public:
 private:
    time_point now {clock::now()};
    std::multimap<time_point, Sp<Job>> timers {}; /* the jobs ordered by time */
+    const Logger& DHT_LOG;
 };

 }
@@ -1,8 +1,7 @@
 /*
 *  Copyright (C) 2014-2017 Savoir-faire Linux Inc.
- *  Authors: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
+ *  Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 *           Simon Désaulniers <simon.desaulniers@savoirfairelinux.com>
- *           Sébastien Blin <sebastien.blin@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
@@ -100,6 +99,8 @@ public:
        get(key, bindGetCb(cb), bindDoneCb(donecb), std::forward<Value::Filter>(f), std::forward<Where>(w));
    }

+    size_t listen(const InfoHash& id, GetCallback cb, Value::Filter&& = {}, Where&& w = {});
+
    /**
     * Will take ownership of the value, sign it using our private key and put it in the DHT.
     */
@@ -278,11 +279,8 @@ public:
    bool cancelPut(const InfoHash& h, const Value::Id& vid) {
        return dht_->cancelPut(h, vid);
    }
-
-    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);
+        return dht_->listen(key, cb, f, w);
    }
    bool cancelListen(const InfoHash& h, size_t token) {
        return dht_->cancelListen(h, token);
@@ -294,37 +292,17 @@ public:
        dht_->connectivityChanged();
    }

+#if OPENDHT_PROXY_CLIENT
+    void startProxy(const std::string& host) {
+        dht_->startProxy(host);
+    }
+#endif
+
+#if OPENDHT_PROXY_SERVER
    void forwardAllMessages(bool forward) {
        forward_all_ = forward;
    }
-
-    void setPushNotificationToken(const std::string& token = "") {
-        dht_->setPushNotificationToken(token);
-    }
-
-    /**
-     * Call linked callback with push_notification
-     * @param notification to process
-     */
-    void pushNotificationReceived(const std::map<std::string, std::string>& notification) {
-        dht_->pushNotificationReceived(notification);
-    }
-
-    void setLoggers(LogMethod error = NOLOG, LogMethod warn = NOLOG, LogMethod debug = NOLOG)
-    {
-        DHT_LOG.DEBUG = debug;
-        DHT_LOG.WARN = warn;
-        DHT_LOG.ERR = error;
-        dht_->setLoggers(std::forward<LogMethod>(error), std::forward<LogMethod>(warn), std::forward<LogMethod>(debug));
-    }
-
-    /**
-     * Only print logs related to the given InfoHash (if given), or disable filter (if zeroes).
-     */
-    void setLogFilter(const InfoHash& f) {
-        DHT_LOG.setFilter(f);
-        dht_->setLogFilter(f);
-    }
+#endif //OPENDHT_PROXY_SERVER

 private:
    std::unique_ptr<DhtInterface> dht_;
@@ -332,8 +310,6 @@ private:
    SecureDht(const SecureDht&) = delete;
    SecureDht& operator=(const SecureDht&) = delete;

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

    Sp<crypto::PrivateKey> key_ {};
@@ -346,7 +322,11 @@ private:
    std::map<InfoHash, Sp<crypto::Certificate>> nodesCertificates_ {};
    std::map<InfoHash, Sp<const crypto::PublicKey>> nodesPubKeys_ {};

+    std::uniform_int_distribution<Value::Id> rand_id {};
+
+#if OPENDHT_PROXY_SERVER
    std::atomic_bool forward_all_ {false};
+#endif //OPENDHT_PROXY_SERVER
 };

 const ValueType CERTIFICATE_TYPE = {
@@ -28,8 +28,6 @@ typedef uint16_t in_port_t;
 #endif
 #else
 #include <iso646.h>
-#include <stdint.h>
-#include <winsock2.h>
 #include <ws2def.h>
 #include <ws2tcpip.h>
 typedef uint16_t sa_family_t;
@@ -39,7 +37,6 @@ typedef uint16_t in_port_t;
 #include <string>
 #include <memory>
 #include <vector>
-#include <stdlib.h>

 #include <cstring>
 #include <cstddef>
@@ -70,19 +67,6 @@ public:
            throw std::runtime_error("Socket address length is too large");
        set(sa, length);
    }
-    SockAddr(const sockaddr* sa) {
-        socklen_t len = 0;
-        if (sa) {
-            if (sa->sa_family == AF_INET)
-                len = sizeof(sockaddr_in);
-            else if(sa->sa_family == AF_INET6)
-                len = sizeof(sockaddr_in6);
-            else
-                throw std::runtime_error("Unknown address family");
-        }
-        set(sa, len);
-    }
-
    /**
     * Build from an existing sockaddr_storage structure.
     */
@@ -139,7 +123,7 @@ public:
        }
        if (new_length != len) {
            len = new_length;
-            if (len) addr.reset((sockaddr*)::calloc(len, 1));
+            if (len) addr.reset((sockaddr*)std::calloc(len, 1));
            else     addr.reset();
        }
        if (len > sizeof(sa_family_t))
@@ -225,9 +209,6 @@ public:

    bool isUnspecified() const;

-    bool isMappedIPv4() const;
-    SockAddr getMappedIPv4() const;
-
    /**
     * A comparator to classify IP addresses, only considering the
     * first 64 bits in IPv6.
@@ -258,13 +239,13 @@ public:
    };
 private:
    socklen_t len {0};
-    struct free_delete { void operator()(void* p) { ::free(p); } };
+    struct free_delete { void operator()(void* p) { std::free(p); } };
    std::unique_ptr<sockaddr, free_delete> addr {};

    void set(const sockaddr* sa, socklen_t length) {
        if (len != length) {
            len = length;
-            if (len) addr.reset((sockaddr*)::malloc(len));
+            if (len) addr.reset((sockaddr*)std::malloc(len));
            else     addr.reset();
        }
        if (len)
@@ -54,22 +54,10 @@ void erase_if(std::map<Key, Item>& map, const Condition& condition)
    }
 }

-/**
- * Split "[host]:port" or "host:port" to pair<"host", "port">.
- */
-OPENDHT_PUBLIC std::pair<std::string, std::string>
-splitPort(const std::string& s);
-
 class OPENDHT_PUBLIC DhtException : public std::runtime_error {
-public:
-    DhtException(const std::string &str = "") :
-        std::runtime_error("DhtException occurred: " + str) {}
-};
-
-class OPENDHT_PUBLIC SocketException : public DhtException {
-public:
-    SocketException(int err) :
-        DhtException(strerror(err)) {}
+    public:
+        DhtException(const std::string &str = "") :
+            std::runtime_error("DhtException occurred: " + str) {}
 };

 // Time related definitions and utility functions
@@ -37,7 +37,7 @@
 #include <chrono>
 #include <set>

-#if OPENDHT_PROXY_SERVER || OPENDHT_PROXY_CLIENT
+#if OPENDHT_PROXY_SERVER
 #include <json/json.h>
 #endif //OPENDHT_PROXY_SERVER

@@ -109,19 +109,6 @@ struct OPENDHT_PUBLIC ValueType {
    EditPolicy editPolicy {DEFAULT_EDIT_POLICY};
 };

-class TypeStore {
-public:
-    void registerType(const ValueType& type) {
-        types[type.id] = type;
-    }
-    const ValueType& getType(ValueType::Id type_id) const {
-        const auto& t_it = types.find(type_id);
-        return (t_it == types.end()) ? ValueType::USER_DATA : t_it->second;
-    }
-private:
-    std::map<ValueType::Id, ValueType> types {};
-};
-
 /**
 * A "value" is data potentially stored on the Dht, with some metadata.
 *
@@ -187,15 +174,6 @@ struct OPENDHT_PUBLIC Value
                return f1(v) or f2(v);
            };
        }
-        std::vector<Sp<Value>> filter(const std::vector<Sp<Value>>& values) {
-            if (not (*this))
-                return values;
-            std::vector<Sp<Value>> ret;
-            for (const auto& v : values)
-                if ((*this)(v))
-                    ret.emplace_back(v);
-            return ret;
-        }
    };

    /* Sneaky functions disguised in classes */
@@ -372,7 +350,7 @@ struct OPENDHT_PUBLIC Value
    Value(ValueType::Id t, const uint8_t* dat_ptr, size_t dat_len, Id id = INVALID_ID)
     : id(id), type(t), data(dat_ptr, dat_ptr+dat_len) {}

-#if OPENDHT_PROXY_SERVER || OPENDHT_PROXY_CLIENT
+#if OPENDHT_PROXY_SERVER
    /**
     * Build a value from a json object
     * @param json
@@ -451,7 +429,7 @@ struct OPENDHT_PUBLIC Value
        return ss.str();
    }

-#if OPENDHT_PROXY_SERVER || OPENDHT_PROXY_CLIENT
+#if OPENDHT_PROXY_SERVER
    /**
     * Build a json object from a value
     * Example:
@@ -842,10 +820,6 @@ struct OPENDHT_PUBLIC Where
        return ss.str();
    }

-    bool empty() const {
-        return filters_.empty();
-    }
-
    OPENDHT_PUBLIC friend std::ostream& operator<<(std::ostream& s, const dht::Where& q);

 private:
@@ -996,10 +970,6 @@ unpackVector(const std::vector<std::shared_ptr<Value>>& vals) {
    return ret;
 }

-#if OPENDHT_PROXY_SERVER || OPENDHT_PROXY_CLIENT
-uint64_t unpackId(const Json::Value& json, const std::string& key);
-#endif
-
 }

 MSGPACK_ADD_ENUM(dht::Value::Field)
@@ -9,9 +9,6 @@ libopendht_la_SOURCES  = \
        listener.h \
        request.h \
        search.h \
-        value_cache.h \
-        op_cache.h \
-        op_cache.cpp \
        net.h \
        parsed_message.h \
        node_cache.cpp \
@@ -26,6 +23,7 @@ libopendht_la_SOURCES  = \
        securedht.cpp \
        dhtrunner.cpp \
        default_types.cpp \
+        indexation/pht.cpp \
        log.cpp

 if WIN32
@@ -53,28 +51,14 @@ nobase_include_HEADERS = \
        ../include/opendht/default_types.h \
        ../include/opendht/log.h \
        ../include/opendht/log_enable.h \
-        ../include/opendht/rng.h
+        ../include/opendht/rng.h \
+        ../include/opendht/indexation/pht.h

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

-if ENABLE_PROXY_CLIENT
-libopendht_la_SOURCES += dht_proxy_client.cpp
-nobase_include_HEADERS += ../include/opendht/dht_proxy_client.h ../include/opendht/dht_interface.h
-endif
-
-if PROXY_CLIENT_OR_SERVER
-libopendht_la_SOURCES += base64.h base64.cpp
-nobase_include_HEADERS += ../include/opendht/proxy.h
-endif
-
-if ENABLE_INDEXATION
-libopendht_la_SOURCES += indexation/pht.cpp
-nobase_include_HEADERS += ../include/opendht/indexation/pht.h
-endif
-
 clean-local:
 	rm -rf libargon2.la

@@ -68,7 +68,7 @@ NodeStats::toString() const
    return ss.str();
 }

-#if OPENDHT_PROXY_SERVER || OPENDHT_PROXY_CLIENT
+#if OPENDHT_PROXY_SERVER
 /**
 * Build a json object from a NodeStats
 */
@@ -411,8 +411,6 @@ PublicKey::operator=(PublicKey&& o) noexcept
 void
 PublicKey::pack(Blob& b) const
 {
-    if (not pk)
-        throw CryptoException(std::string("Could not export public key: null key"));
    std::vector<uint8_t> tmp(2048);
    size_t sz = tmp.size();
    int err = gnutls_pubkey_export(pk, GNUTLS_X509_FMT_DER, tmp.data(), &sz);
@@ -439,8 +437,6 @@ PublicKey::unpack(const uint8_t* data, size_t data_size)
 std::string
 PublicKey::toString() const
 {
-    if (not pk)
-        throw CryptoException(std::string("Could not print public key: null key"));
    std::string ret;
    size_t sz = ret.size();
    int err = gnutls_pubkey_export(pk, GNUTLS_X509_FMT_PEM, (void*)ret.data(), &sz);
@@ -542,11 +538,7 @@ PublicKey::getId() const
        return {};
    InfoHash id;
    size_t sz = id.size();
-#if GNUTLS_VERSION_NUMBER < 0x030401
-    const int flags = 0;
-#else
    const int flags = (id.size() == 32) ? GNUTLS_KEYID_USE_SHA256 : 0;
-#endif
    if (auto err = gnutls_pubkey_get_key_id(pk, flags, id.data(), &sz))
        throw CryptoException(std::string("Can't get public key ID: ") + gnutls_strerror(err));
    if (sz != id.size())
@@ -849,15 +841,6 @@ Certificate::addRevocationList(std::shared_ptr<RevocationList> list)
    revocation_lists.emplace(std::move(list));
 }

-std::chrono::system_clock::time_point
-Certificate::getActivation() const
-{
-    auto t = gnutls_x509_crt_get_activation_time(cert);
-    if (t == (time_t)-1)
-        return std::chrono::system_clock::time_point::min();
-    return std::chrono::system_clock::from_time_t(t);
-}
-
 std::chrono::system_clock::time_point
 Certificate::getExpiration() const
 {
@@ -930,13 +913,8 @@ Certificate::generate(const PrivateKey& key, const std::string& name, Identity c
        return {};
    Certificate ret {cert};

-    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)));
+    gnutls_x509_crt_set_activation_time(cert, time(NULL));
+    gnutls_x509_crt_set_expiration_time(cert, time(NULL) + (20 * 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 {};
@@ -1309,10 +1287,8 @@ std::ostream& operator<< (std::ostream& o, const TrustList::VerifyResult& h)
            o << "* Certificate has expired" << std::endl;
        if (h.result & GNUTLS_CERT_UNEXPECTED_OWNER)
            o << "* The owner is not the expected one" << std::endl;
-#if GNUTLS_VERSION_NUMBER >= 0x030401
        if (h.result & GNUTLS_CERT_PURPOSE_MISMATCH)
            o << "* Certificate or an intermediate does not match the intended purpose" << std::endl;
-#endif
        if (h.result & GNUTLS_CERT_MISMATCH)
            o << "* Certificate presented isn't the expected one" << std::endl;
    } else {
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2018 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>
 *
@@ -130,7 +130,7 @@ Dht::trySearchInsert(const Sp<Node>& node)
        auto& s = *it->second;
        if (s.insertNode(node, now)) {
            inserted = true;
-            scheduler.edit(s.nextSearchStep, now);
+            scheduler.edit(s.nextSearchStep, s.getNextStepTime(now));
        } else if (not s.expired and not s.done)
            break;
        ++it;
@@ -142,7 +142,7 @@ Dht::trySearchInsert(const Sp<Node>& node)
        auto& s = *it->second;
        if (s.insertNode(node, now)) {
            inserted = true;
-            scheduler.edit(s.nextSearchStep, now);
+            scheduler.edit(s.nextSearchStep, s.getNextStepTime(now));
        } else if (not s.expired and not s.done)
            break;
    }
@@ -180,7 +180,7 @@ Dht::expireBuckets(RoutingTable& list)
 {
    for (auto& b : list) {
        bool changed = false;
-        b.nodes.remove_if([&changed](const Sp<Node>& n) {
+        b.nodes.remove_if([this,&changed](const Sp<Node>& n) {
            if (n->isExpired()) {
                changed = true;
                return true;
@@ -217,7 +217,6 @@ Dht::searchNodeGetDone(const net::Request& req,
 {
    const auto& now = scheduler.time();
    if (auto sr = ws.lock()) {
-        sr->insertNode(req.node, now, answer.ntoken);
        if (auto srn = sr->getNode(req.node)) {
            /* all other get requests which are satisfied by this answer
               should not be sent anymore */
@@ -229,12 +228,8 @@ Dht::searchNodeGetDone(const net::Request& req,
                    srn->getStatus[q] = std::move(dummy_req);
                }
            }
-            auto syncTime = srn->getSyncTime(scheduler.time());
-            if (srn->syncJob)
-                scheduler.edit(srn->syncJob, syncTime);
-            else
-                srn->syncJob = scheduler.add(syncTime, std::bind(&Dht::searchStep, this, sr));
        }
+        sr->insertNode(req.node, now, answer.ntoken);
        onGetValuesDone(req.node, answer, sr, query);
    }
 }
@@ -341,8 +336,8 @@ Dht::searchSendGetValues(Sp<Search> sr, SearchNode* pn, bool update)
            if (not n)
                return nullptr;

-            /*DHT_LOG.d(sr->id, n->node->id, "[search %s] [node %s] sending 'find_node'",
-                    sr->id.toString().c_str(), n->node->toString().c_str());*/
+            DHT_LOG.w(sr->id, n->node->id, "[search %s] [node %s] sending 'find_node'",
+                    sr->id.toString().c_str(), n->node->toString().c_str());
            n->getStatus[query] = network_engine.sendFindNode(n->node,
                    sr->id,
                    -1,
@@ -355,8 +350,8 @@ Dht::searchSendGetValues(Sp<Search> sr, SearchNode* pn, bool update)

            if (query and not query->select.getSelection().empty()) {
                /* The request contains a select. No need to paginate... */
-                /*DHT_LOG.d(sr->id, n->node->id, "[search %s] [node %s] sending 'get'",
-                        sr->id.toString().c_str(), n->node->toString().c_str());*/
+                DHT_LOG.w(sr->id, n->node->id, "[search %s] [node %s] sending 'get'",
+                        sr->id.toString().c_str(), n->node->toString().c_str());
                n->getStatus[query] = network_engine.sendGetValues(n->node,
                        sr->id,
                        *query,
@@ -387,7 +382,7 @@ void Dht::searchSendAnnounceValue(const Sp<Search>& sr) {
        if (not n.isSynced(now))
            continue;
        if (std::find_if(sr->announce.cbegin(), sr->announce.cend(),
-            [&now,&n](const Announce& a) {
+            [this,&now,&n](const Announce& a) {
                return n.getAnnounceTime(a.value->id) <= now;
            }) == sr->announce.cend())
            continue;
@@ -416,7 +411,7 @@ void Dht::searchSendAnnounceValue(const Sp<Search>& sr) {
                const auto& now = scheduler.time();
                if (not sn->isSynced(now)) {
                    /* Search is now unsynced. Let's call searchStep to sync again. */
-                    scheduler.edit(sr->nextSearchStep, now);
+                    scheduler.edit(sr->nextSearchStep, sr->getNextStepTime(now));
                    return;
                }
                for (auto& a : sr->announce) {
@@ -482,72 +477,6 @@ void Dht::searchSendAnnounceValue(const Sp<Search>& sr) {
    }
 }

-void
-Dht::searchSynchedNodeListen(const Sp<Search>& sr, SearchNode& n)
-{
-    std::weak_ptr<Search> ws = sr;
-    for (const auto& l : sr->listeners) {
-        const auto& query = l.second.query;
-        auto list_token = l.first;
-        if (n.getListenTime(query) > scheduler.time())
-            continue;
-        DHT_LOG.w(sr->id, n.node->id, "[search %s] [node %s] sending 'listen'",
-                sr->id.toString().c_str(), n.node->toString().c_str());
-
-        auto r = n.listenStatus.find(query);
-        if (r == n.listenStatus.end()) {
-            r = n.listenStatus.emplace(query, SearchNode::CachedListenStatus{
-                [ws,list_token](const std::vector<Sp<Value>>& values, bool expired){
-                    if (auto sr = ws.lock()) {
-                        auto l = sr->listeners.find(list_token);
-                        if (l != sr->listeners.end()) {
-                            l->second.get_cb(l->second.filter.filter(values), expired);
-                        }
-                    }
-                }
-            }).first;
-            auto node = n.node;
-            r->second.cacheExpirationJob = scheduler.add(time_point::max(), [this,ws,query,node]{
-                if (auto sr = ws.lock()) {
-                    if (auto sn = sr->getNode(node)) {
-                        sn->expireValues(query, scheduler);
-                    }
-                }
-            });
-        }
-        auto prev_req = r != n.listenStatus.end() ? r->second.req : nullptr;
-        r->second.req = network_engine.sendListen(n.node, sr->id, *query, n.token, prev_req,
-            [this,ws,query](const net::Request& req, net::RequestAnswer&& answer) mutable
-            { /* on done */
-                if (auto sr = ws.lock()) {
-                    scheduler.edit(sr->nextSearchStep, scheduler.time());
-                    if (auto sn = sr->getNode(req.node))
-                        scheduler.add(sn->getListenTime(query), std::bind(&Dht::searchStep, this, sr));
-                    onListenDone(req.node, answer, sr);
-                }
-            },
-            [this,ws,query](const net::Request& req, bool over) mutable
-            { /* on request expired */
-                if (auto sr = ws.lock()) {
-                    scheduler.edit(sr->nextSearchStep, scheduler.time());
-                    if (over)
-                        if (auto sn = sr->getNode(req.node))
-                            sn->listenStatus.erase(query);
-                }
-            },
-            [this,ws,query](const Sp<Node>& node, net::RequestAnswer&& answer) mutable
-            { /* on new values */
-                if (auto sr = ws.lock()) {
-                    scheduler.edit(sr->nextSearchStep, scheduler.time());
-                    if (auto sn = sr->getNode(node)) {
-                        sn->onValues(query, std::move(answer), types, scheduler);
-                    }
-                }
-            }
-        );
-    }
-}
-
 /* When a search is in progress, we periodically call search_step to send
   further requests. */
 void
@@ -604,7 +533,43 @@ Dht::searchStep(Sp<Search> sr)
            for (auto& n : sr->nodes) {
                if (not n.isSynced(now))
                    continue;
-                searchSynchedNodeListen(sr, n);
+                for (const auto& l : sr->listeners) {
+                    const auto& query = l.second.query;
+                    if (n.getListenTime(query) > now)
+                        continue;
+                    DHT_LOG.w(sr->id, n.node->id, "[search %s] [node %s] sending 'listen'",
+                            sr->id.toString().c_str(), n.node->toString().c_str());
+
+                    const auto& r = n.listenStatus.find(query);
+                    auto prev_req = r != n.listenStatus.end() ? r->second : nullptr;
+
+                    std::weak_ptr<Search> ws = sr;
+                    n.listenStatus[query] = network_engine.sendListen(n.node, sr->id, *query, n.token, prev_req,
+                        [this,ws,query](const net::Request& req, net::RequestAnswer&& answer) mutable
+                        { /* on done */
+                            if (auto sr = ws.lock()) {
+                                scheduler.edit(sr->nextSearchStep, scheduler.time());
+                                onListenDone(req.node, answer, sr);
+                            }
+                        },
+                        [this,ws,query](const net::Request& req, bool over) mutable
+                        { /* on expired */
+                            if (auto sr = ws.lock()) {
+                                scheduler.edit(sr->nextSearchStep, scheduler.time());
+                                if (over)
+                                    if (auto sn = sr->getNode(req.node))
+                                        sn->listenStatus.erase(query);
+                            }
+                        },
+                        [this,ws,query](const Sp<Node>& node, net::RequestAnswer&& answer) mutable
+                        { /* on new values */
+                            if (auto sr = ws.lock()) {
+                                scheduler.edit(sr->nextSearchStep, scheduler.time());
+                                onGetValuesDone(node, answer, sr, query);
+                            }
+                        }
+                    );
+                }
                if (not n.candidate and ++i == LISTEN_NODES)
                    break;
            }
@@ -641,8 +606,8 @@ Dht::searchStep(Sp<Search> sr)
    /* dumpSearch(*sr, std::cout); */

    /* periodic searchStep scheduling. */
-    //if (not sr->done)
-    //    scheduler.edit(sr->nextSearchStep, now);
+    if (not sr->done)
+        scheduler.edit(sr->nextSearchStep, sr->getNextStepTime(now));
 }

 unsigned Dht::refill(Dht::Search& sr) {
@@ -730,7 +695,7 @@ Dht::search(const InfoHash& id, sa_family_t af, GetCallback gcb, QueryCallback q

    refill(*sr);
    if (sr->nextSearchStep)
-        scheduler.edit(sr->nextSearchStep, scheduler.time());
+        scheduler.edit(sr->nextSearchStep, sr->getNextStepTime(scheduler.time()));
    else
        sr->nextSearchStep = scheduler.add(scheduler.time(), std::bind(&Dht::searchStep, this, sr));

@@ -800,8 +765,9 @@ Dht::announce(const InfoHash& id,
 }

 size_t
-Dht::listenTo(const InfoHash& id, sa_family_t af, ValueCallback cb, Value::Filter f, const Sp<Query>& q)
+Dht::listenTo(const InfoHash& id, sa_family_t af, GetCallback cb, Value::Filter f, const Sp<Query>& q)
 {
+    const auto& now = scheduler.time();
    if (!isRunning(af))
        return 0;
       // DHT_LOG_ERR("[search %s IPv%c] search_time is now in %lfs", sr->id.toString().c_str(), (sr->af == AF_INET) ? '4' : '6', print_dt(tm-clock::now()));
@@ -813,11 +779,15 @@ Dht::listenTo(const InfoHash& id, sa_family_t af, ValueCallback cb, Value::Filte
    if (!sr)
        throw DhtException("Can't create search");
    DHT_LOG.e(id, "[search %s IPv%c] listen", id.toString().c_str(), (af == AF_INET) ? '4' : '6');
-    return sr->listen(cb, f, q, scheduler);
+    sr->done = false;
+    auto token = ++sr->listener_token;
+    sr->listeners.emplace(token, LocalListener{q, f, cb});
+    scheduler.edit(sr->nextSearchStep, sr->getNextStepTime(now));
+    return token;
 }

 size_t
-Dht::listen(const InfoHash& id, ValueCallback cb, Value::Filter f, Where where)
+Dht::listen(const InfoHash& id, GetCallback cb, Value::Filter&& f, Where&& where)
 {
    scheduler.syncTime();

@@ -825,7 +795,26 @@ Dht::listen(const InfoHash& id, ValueCallback cb, Value::Filter f, Where where)
    auto vals = std::make_shared<std::map<Value::Id, Sp<Value>>>();
    auto token = ++listener_token;

-    auto gcb = OpValueCache::cacheCallback(std::move(cb));
+    auto gcb = [=](const std::vector<Sp<Value>>& values) {
+        std::vector<Sp<Value>> newvals;
+        for (const auto& v : values) {
+            auto it = vals->find(v->id);
+            if (it == vals->cend() || !(*it->second == *v))
+                newvals.push_back(v);
+        }
+        if (!newvals.empty()) {
+            if (!cb(newvals)) {
+                cancelListen(id, token);
+                return false;
+            }
+            for (const auto& v : newvals) {
+                auto it = vals->emplace(v->id, v);
+                if (not it.second)
+                    it.first->second = v;
+            }
+        }
+        return true;
+    };

    auto query = std::make_shared<Query>(q);
    auto filter = f.chain(q.where.getFilter());
@@ -837,7 +826,7 @@ Dht::listen(const InfoHash& id, ValueCallback cb, Value::Filter f, Where where)
        if (not st->second.empty()) {
            std::vector<Sp<Value>> newvals = st->second.get(filter);
            if (not newvals.empty()) {
-                if (!gcb(newvals, false))
+                if (!cb(newvals))
                    return 0;
                for (const auto& v : newvals) {
                    auto it = vals->emplace(v->id, v);
@@ -874,10 +863,10 @@ Dht::cancelListen(const InfoHash& id, size_t token)
    if (st != store.end() && tokenlocal)
        st->second.local_listeners.erase(tokenlocal);

-    auto searches_cancel_listen = [this,&id](std::map<InfoHash, Sp<Search>>& srs, size_t token) {
+    auto searches_cancel_listen = [&id](std::map<InfoHash, Sp<Search>>& srs, size_t token) {
        auto srp = srs.find(id);
        if (srp != srs.end() and token)
-            srp->second->cancelListen(token, scheduler);
+            srp->second->cancelListen(token);
    };
    searches_cancel_listen(searches4, std::get<1>(it->second));
    searches_cancel_listen(searches6, std::get<2>(it->second));
@@ -1139,45 +1128,42 @@ Dht::cancelPut(const InfoHash& id, const Value::Id& vid)
 // Storage

 void
-Dht::storageChanged(const InfoHash& id, Storage& st, ValueStorage& v, bool newValue)
+Dht::storageChanged(const InfoHash& id, Storage& st, ValueStorage& v)
 {
-    if (newValue) {
-        if (not st.local_listeners.empty()) {
-            DHT_LOG.d(id, "[store %s] %lu local listeners", id.toString().c_str(), st.local_listeners.size());
-            std::vector<std::pair<ValueCallback, std::vector<Sp<Value>>>> cbs;
-            for (const auto& l : st.local_listeners) {
-                std::vector<Sp<Value>> vals;
-                if (not l.second.filter or l.second.filter(*v.data))
-                    vals.push_back(v.data);
-                if (not vals.empty()) {
-                    DHT_LOG.d(id, "[store %s] sending update local listener with token %lu",
-                            id.toString().c_str(),
-                            l.first);
-                    cbs.emplace_back(l.second.get_cb, std::move(vals));
-                }
+    DHT_LOG.d(id, "[store %s] changed", id.toString().c_str());
+    if (not st.local_listeners.empty()) {
+        DHT_LOG.d(id, "[store %s] %lu local listeners", id.toString().c_str(), st.local_listeners.size());
+        std::vector<std::pair<GetCallback, std::vector<Sp<Value>>>> cbs;
+        for (const auto& l : st.local_listeners) {
+            std::vector<Sp<Value>> vals;
+            if (not l.second.filter or l.second.filter(*v.data))
+                vals.push_back(v.data);
+            if (not vals.empty()) {
+                DHT_LOG.d(id, "[store %s] sending update local listener with token %lu",
+                        id.toString().c_str(),
+                        l.first);
+                cbs.emplace_back(l.second.get_cb, std::move(vals));
            }
-            // listeners are copied: they may be deleted by the callback
-            for (auto& cb : cbs)
-                cb.first(cb.second, false);
        }
+        // listeners are copied: they may be deleted by the callback
+        for (auto& cb : cbs)
+            cb.first(cb.second);
    }

-    if (not st.listeners.empty()) {
-        DHT_LOG.d(id, "[store %s] %lu remote listeners", id.toString().c_str(), st.listeners.size());
-        for (const auto& node_listeners : st.listeners) {
-            for (const auto& l : node_listeners.second) {
-                auto f = l.second.query.where.getFilter();
-                if (f and not f(*v.data))
-                    continue;
-                DHT_LOG.w(id, node_listeners.first->id, "[store %s] [node %s] sending update",
-                        id.toString().c_str(),
-                        node_listeners.first->toString().c_str());
-                std::vector<Sp<Value>> vals {};
-                vals.push_back(v.data);
-                Blob ntoken = makeToken(node_listeners.first->getAddr(), false);
-                network_engine.tellListener(node_listeners.first, l.first, id, 0, ntoken, {}, {},
-                        std::move(vals), l.second.query);
-            }
+    DHT_LOG.d(id, "[store %s] %lu remote listeners", id.toString().c_str(), st.listeners.size());
+    for (const auto& node_listeners : st.listeners) {
+        for (const auto& l : node_listeners.second) {
+            auto f = l.second.query.where.getFilter();
+            if (f and not f(*v.data))
+                continue;
+            DHT_LOG.w(id, node_listeners.first->id, "[store %s] [node %s] sending update",
+                    id.toString().c_str(),
+                    node_listeners.first->toString().c_str());
+            std::vector<Sp<Value>> vals {};
+            vals.push_back(v.data);
+            Blob ntoken = makeToken(node_listeners.first->getAddr(), false);
+            network_engine.tellListener(node_listeners.first, l.second.sid, id, 0, ntoken, {}, {},
+                    std::move(vals), l.second.query);
        }
    }
 }
@@ -1213,7 +1199,7 @@ Dht::storageStore(const InfoHash& id, const Sp<Value>& value, time_point created
        if (total_store_size > max_store_size) {
            expireStore();
        }
-        storageChanged(id, st->second, *vs, store.second.values_diff > 0);
+        storageChanged(id, st->second, *vs);
    }

    return std::get<0>(store);
@@ -1238,45 +1224,20 @@ Dht::storageAddListener(const InfoHash& id, const Sp<Node>& node, size_t socket_
                    buckets4.findClosestNodes(id, now, TARGET_NODES), buckets6.findClosestNodes(id, now, TARGET_NODES),
                    std::move(vals), query);
        }
-        node_listeners->second.emplace(socket_id, Listener {now, std::forward<Query>(query)});
+        node_listeners->second.emplace(socket_id, Listener {socket_id, now, std::forward<Query>(query)});
    }
    else
-        l->second.refresh(now, std::forward<Query>(query));
+        l->second.refresh(socket_id, now, std::forward<Query>(query));
 }

 void
 Dht::expireStore(decltype(store)::iterator i)
 {
-    const auto& id = i->first;
-    auto& st = i->second;
-    auto stats = st.expire(id, scheduler.time());
-    total_store_size += stats.first;
-    total_values -= stats.second.size();
-    if (not stats.second.empty()) {
-        DHT_LOG.d(id, "[store %s] discarded %ld expired values (%ld bytes)",
-            id.toString().c_str(), stats.second.size(), -stats.first);
-
-        if (not st.listeners.empty()) {
-            DHT_LOG.d(id, "[store %s] %lu remote listeners", id.toString().c_str(), st.listeners.size());
-
-            std::vector<Value::Id> ids;
-            ids.reserve(stats.second.size());
-            for (const auto& v : stats.second)
-                ids.emplace_back(v->id);
-
-            for (const auto& node_listeners : st.listeners) {
-                for (const auto& l : node_listeners.second) {
-                    DHT_LOG.w(id, node_listeners.first->id, "[store %s] [node %s] sending expired",
-                            id.toString().c_str(),
-                            node_listeners.first->toString().c_str());
-                    Blob ntoken = makeToken(node_listeners.first->getAddr(), false);
-                    network_engine.tellListenerExpired(node_listeners.first, l.first, id, ntoken, ids);
-                }
-            }
-        }
-        for (const auto& local_listeners : st.local_listeners) {
-            local_listeners.second.get_cb(stats.second, true);
-        }
+    auto stats = i->second.expire(i->first, scheduler.time());
+    total_store_size += stats.size_diff;
+    total_values += stats.values_diff;
+    if (stats.values_diff) {
+        DHT_LOG.d(i->first, "[store %s] discarded %ld expired values (%ld bytes)", i->first.toString().c_str(), -stats.values_diff, -stats.size_diff);
    }
 }

@@ -1349,7 +1310,7 @@ Dht::connectivityChanged(sa_family_t af)
    for (auto& sp : searches(af))
        for (auto& sn : sp.second->nodes) {
            for (auto& ls : sn.listenStatus)
-                sn.node->cancelRequest(ls.second.req);
+                sn.node->cancelRequest(ls.second);
            sn.listenStatus.clear();
        }
    reported_addr.erase(std::remove_if(reported_addr.begin(), reported_addr.end(), [&](const ReportedAddr& addr){
@@ -1473,8 +1434,10 @@ Dht::dumpSearch(const Search& sr, std::ostream& out) const
        out << " [expired]";
    bool synced = sr.isSynced(now);
    out << (synced ? " [synced]" : " [not synced]");
-    if (synced && sr.isListening(now))
-        out << " [listening]";
+    if (synced && sr.isListening(now)) {
+        auto lt = sr.getListenTime(now);
+        out << " [listening, next in " << duration_cast<seconds>(lt-now).count() << " s]";
+    }
    out << std::endl;

    /*printing the queries*/
@@ -1684,12 +1647,13 @@ Dht::~Dht()
        s.second->clear();
 }

-Dht::Dht() : store(), network_engine(DHT_LOG, scheduler) {}
+Dht::Dht() : store(), scheduler(DHT_LOG), network_engine(DHT_LOG, scheduler) {}

-Dht::Dht(const int& s, const int& s6, Config config)
+Dht::Dht(int s, int s6, Config config)
    : myid(config.node_id ? config.node_id : InfoHash::getRandom()),
    is_bootstrap(config.is_bootstrap),
    maintain_storage(config.maintain_storage), store(), store_quota(),
+    scheduler(DHT_LOG),
    network_engine(myid, config.network, s, s6, DHT_LOG, scheduler,
            std::bind(&Dht::onError, this, _1, _2),
            std::bind(&Dht::onNewNode, this, _1, _2),
@@ -1901,7 +1865,7 @@ Dht::periodic(const uint8_t *buf, size_t buflen, const SockAddr& from)
        try {
            network_engine.processMessage(buf, buflen, from);
        } catch (const std::exception& e) {
-            DHT_LOG.e("Can't process message from %s: %s", from.toString().c_str(), e.what());
+            DHT_LOG.e("Can't parse message from %s: %s", from.toString().c_str(), e.what());
        }
    }
    return scheduler.run();
@@ -2095,7 +2059,6 @@ Dht::onError(Sp<net::Request> req, net::DhtProtocolException e) {
                n.token.clear();
                n.last_get_reply = time_point::min();
                searchSendGetValues(sr);
-                scheduler.edit(sr->nextSearchStep, scheduler.time());
                break;
            }
        }
@@ -2150,6 +2113,8 @@ Dht::onGetValues(Sp<Node> node, const InfoHash& hash, want_t, const Query& query
    if (st != store.end() && not st->second.empty()) {
        answer.values = st->second.get(query.where.getFilter());
        DHT_LOG.d(hash, "[node %s] sending %u values", node->toString().c_str(), answer.values.size());
+    } else {
+        DHT_LOG.d(hash, "[node %s] sending nodes", node->toString().c_str());
    }
    return answer;
 }
@@ -2164,13 +2129,14 @@ void Dht::onGetValuesDone(const Sp<Node>& node,
        return;
    }

-    /*DHT_LOG.d(sr->id, "[search %s] [node %s] got reply to 'get' with %u nodes",
-            sr->id.toString().c_str(), node->toString().c_str(), a.nodes4.size()+a.nodes6.size());*/
+    DHT_LOG.d(sr->id, "[search %s] [node %s] got reply to 'get' with %u nodes",
+            sr->id.toString().c_str(), node->toString().c_str(), a.nodes4.size()+a.nodes6.size());

    if (not a.ntoken.empty()) {
        if (not a.values.empty() or not a.fields.empty()) {
-            DHT_LOG.d(sr->id, node->id, "[search %s] [node %s] found %u values",
-                      sr->id.toString().c_str(), node->toString().c_str(), a.values.size());
+            DHT_LOG.d(sr->id, "[search %s IPv%c] found %u values",
+                    sr->id.toString().c_str(), sr->af == AF_INET ? '4' : '6',
+                    a.values.size());
            for (auto& getp : sr->callbacks) { /* call all callbacks for this search */
                auto& get = getp.second;
                if (not (get.get_cb or get.query_cb) or
@@ -2198,7 +2164,7 @@ void Dht::onGetValuesDone(const Sp<Node>& node,
            }

            /* callbacks for local search listeners */
-            /*std::vector<std::pair<ValueCallback, std::vector<Sp<Value>>>> tmp_lists;
+            std::vector<std::pair<GetCallback, std::vector<Sp<Value>>>> tmp_lists;
            for (auto& l : sr->listeners) {
                if (!l.second.get_cb or (orig_query and l.second.query and not l.second.query->isSatisfiedBy(*orig_query)))
                    continue;
@@ -2210,10 +2176,7 @@ void Dht::onGetValuesDone(const Sp<Node>& node,
                    tmp_lists.emplace_back(l.second.get_cb, std::move(tmp));
            }
            for (auto& l : tmp_lists)
-                l.first(l.second, false);*/
-        } else if (not a.expired_values.empty()) {
-            DHT_LOG.w(sr->id, node->id, "[search %s] [node %s] %u expired values",
-                      sr->id.toString().c_str(), node->toString().c_str(), a.expired_values.size());
+                l.first(l.second);
        }
    } else {
        DHT_LOG.w(sr->id, "[node %s] no token provided. Ignoring response content.", node->toString().c_str());
@@ -2258,7 +2221,7 @@ Dht::onListenDone(const Sp<Node>& node,
    if (not sr->done) {
        const auto& now = scheduler.time();
        searchSendGetValues(sr);
-        scheduler.edit(sr->nextSearchStep, now);
+        scheduler.edit(sr->nextSearchStep, sr->getNextStepTime(now));
    }
 }

@@ -1,7 +1,6 @@
 /*
- *  Copyright (C) 2017-2018 Savoir-faire Linux Inc.
+ *  Copyright (C) 2017 Savoir-faire Linux Inc.
 *  Author: Sébastien Blin <sebastien.blin@savoirfairelinux.com>
- *          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
@@ -22,48 +21,23 @@

 #include "default_types.h"
 #include "dhtrunner.h"
-
-#include <msgpack.hpp>
-#include <json/json.h>
+#include "msgpack.hpp"

 #include <chrono>
 #include <functional>
+#include <json/json.h>
 #include <limits>

 using namespace std::placeholders;

 namespace dht {

-struct DhtProxyServer::PermanentPut {
-    time_point expiration;
-    std::string pushToken;
-    std::string clientId;
-    Sp<Scheduler::Job> expireJob;
-    Sp<Scheduler::Job> expireNotifyJob;
-};
-struct DhtProxyServer::SearchPuts {
-    std::map<dht::Value::Id, PermanentPut> puts;
-};
-
-constexpr const std::chrono::minutes PRINT_STATS_PERIOD {2};
-
-DhtProxyServer::DhtProxyServer(std::shared_ptr<DhtRunner> dht, in_port_t port , const std::string& pushServer)
-: dht_(dht) , pushServer_(pushServer)
+DhtProxyServer::DhtProxyServer(std::shared_ptr<DhtRunner> dht, in_port_t port)
+: dht_(dht)
 {
-    if (not dht_)
-        throw std::invalid_argument("A DHT instance must be provided");
    // NOTE in c++14, use make_unique
    service_ = std::unique_ptr<restbed::Service>(new restbed::Service());

-    std::cout << "Running DHT proxy server on port " << port << std::endl;
-    if (not pushServer.empty()) {
-#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
-    }
-
    server_thread = std::thread([this, port]() {
        // Create endpoints
        auto resource = std::make_shared<restbed::Resource>();
@@ -73,12 +47,8 @@ DhtProxyServer::DhtProxyServer(std::shared_ptr<DhtRunner> dht, in_port_t port ,
        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); } );
-#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); });
+        resource->set_method_handler("LISTEN", std::bind(&DhtProxyServer::listen, this, _1));
+        resource->set_method_handler("POST", std::bind(&DhtProxyServer::put, this, _1));
 #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));
@@ -100,7 +70,6 @@ DhtProxyServer::DhtProxyServer(std::shared_ptr<DhtRunner> dht, in_port_t port ,
        settings->set_port(port);
        auto maxThreads = std::thread::hardware_concurrency() - 1;
        settings->set_worker_limit(maxThreads > 1 ? maxThreads : 1);
-        lastStatsReset_ = clock::now();
        try {
            service_->start(settings);
        } catch(std::system_error& e) {
@@ -109,34 +78,37 @@ DhtProxyServer::DhtProxyServer(std::shared_ptr<DhtRunner> dht, in_port_t port ,
    });

    listenThread_ = std::thread([this]() {
-        while (not service_->is_up() and not stopListeners) {
+        while (!service_->is_up() && !stopListeners) {
            std::this_thread::sleep_for(std::chrono::seconds(1));
        }
-        while (service_->is_up() and not stopListeners) {
-            removeClosedListeners();
+        while (service_->is_up()  && !stopListeners) {
+            lockListener_.lock();
+            auto listener = currentListeners_.begin();
+            while (listener != currentListeners_.end()) {
+                if (dht_ && listener->session->is_closed()) {
+                    dht_->cancelListen(listener->hash, std::move(listener->token));
+                    // Remove listener if unused
+                    listener = currentListeners_.erase(listener);
+                } else {
+                     ++listener;
+                }
+            }
+            lockListener_.unlock();
            std::this_thread::sleep_for(std::chrono::seconds(1));
        }
        // Remove last listeners
-        removeClosedListeners(false);
-    });
-    schedulerThread_ = std::thread([this]() {
-        while (not service_->is_up() and not stopListeners) {
-            std::this_thread::sleep_for(std::chrono::seconds(1));
-        }
-        printStatsJob_ = scheduler_.add(scheduler_.time() + PRINT_STATS_PERIOD, [this]{
-            if (service_->is_up() and not stopListeners) {
-                std::cout << getStats().toString() << std::endl;
-                scheduler_.edit(printStatsJob_, scheduler_.time() + PRINT_STATS_PERIOD);
+        lockListener_.lock();
+        auto listener = currentListeners_.begin();
+        while (listener != currentListeners_.end()) {
+            if (dht_) {
+                dht_->cancelListen(listener->hash, std::move(listener->token.get()));
+                // Remove listener if unused
+                listener = currentListeners_.erase(listener);
+            } else {
+                 ++listener;
            }
-        });
-        while (service_->is_up()  and not stopListeners) {
-            std::unique_lock<std::mutex> lock(schedulerLock_);
-            auto next = scheduler_.run();
-            if (next == time_point::max())
-                schedulerCv_.wait(lock);
-            else
-                schedulerCv_.wait_until(lock, next);
        }
+        lockListener_.unlock();
    });

    dht->forwardAllMessages(true);
@@ -150,75 +122,44 @@ DhtProxyServer::~DhtProxyServer()
 void
 DhtProxyServer::stop()
 {
-    if (printStatsJob_)
-        printStatsJob_->cancel();
    service_->stop();
-    {
-        std::lock_guard<std::mutex> lock(lockListener_);
-        auto listener = currentListeners_.begin();
-        while (listener != currentListeners_.end()) {
-            listener->session->close();
-            ++ listener;
-        }
+    lockListener_.lock();
+    auto listener = currentListeners_.begin();
+    while (listener != currentListeners_.end()) {
+        listener->session->close();
+        ++ listener;
    }
+    lockListener_.unlock();
    stopListeners = true;
-    schedulerCv_.notify_all();
    // listenThreads_ will stop because there is no more sessions
    if (listenThread_.joinable())
        listenThread_.join();
-    if (schedulerThread_.joinable())
-        schedulerThread_.join();
    if (server_thread.joinable())
        server_thread.join();
 }

-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);
-    ret.requestRate = count / dt.count();
-#if OPENDHT_PUSH_NOTIFICATIONS
-    ret.pushListenersCount = pushListeners_.size();
-#endif
-    ret.putCount = puts_.size();
-    ret.listenCount = currentListeners_.size();
-    return ret;
-}
-
 void
 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,
        [=](const std::shared_ptr<restbed::Session> s, const restbed::Bytes& /*b*/)
        {
-            try {
-                if (dht_) {
-                    Json::Value result;
-                    auto id = dht_->getId();
-                    if (id)
-                        result["id"] = id.toString();
-                    result["node_id"] = dht_->getNodeId().toString();
-                    result["ipv4"] = dht_->getNodesStats(AF_INET).toJson();
-                    result["ipv6"] = dht_->getNodesStats(AF_INET6).toJson();
-                    result["public_ip"] = s->get_origin(); // [ipv6:ipv4]:port or ipv4:port
-                    Json::StreamWriterBuilder wbuilder;
-                    wbuilder["commentStyle"] = "None";
-                    wbuilder["indentation"] = "";
-                    auto output = Json::writeString(wbuilder, result) + "\n";
-                    s->close(restbed::OK, output);
-                }
-                else
-                    s->close(restbed::SERVICE_UNAVAILABLE, "{\"err\":\"Incorrect DhtRunner\"}");
-            } catch (...) {
-                s->close(restbed::INTERNAL_SERVER_ERROR, "{\"err\":\"Internal server error\"}");
+            if (dht_) {
+                Json::Value result;
+                auto id = dht_->getId();
+                if (id)
+                    result["id"] = id.toString();
+                result["node_id"] = dht_->getNodeId().toString();
+                result["ipv4"] = dht_->getNodesStats(AF_INET).toJson();
+                result["ipv6"] = dht_->getNodesStats(AF_INET6).toJson();
+                result["public_ip"] = s->get_origin(); // [ipv6:ipv4]:port or ipv4:port
+                Json::FastWriter writer;
+                s->close(restbed::OK, writer.write(result));
            }
+            else
+                s->close(restbed::SERVICE_UNAVAILABLE, "{\"err\":\"Incorrect DhtRunner\"}");
        }
    );
 }
@@ -226,441 +167,132 @@ DhtProxyServer::getNodeInfo(const std::shared_ptr<restbed::Session>& session) co
 void
 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 std::shared_ptr<restbed::Session> s, const restbed::Bytes& /*b* */)
        {
-            try {
-                if (dht_) {
-                    InfoHash infoHash(hash);
-                    if (!infoHash) {
-                        infoHash = InfoHash::get(hash);
-                    }
-                    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\"}");
+            if (dht_) {
+                InfoHash infoHash(hash);
+                if (!infoHash) {
+                    infoHash = InfoHash::get(hash);
                }
-            } catch (...) {
-                s->close(restbed::INTERNAL_SERVER_ERROR, "{\"err\":\"Internal server error\"}");
-            }
-        }
-    );
-}
-
-void
-DhtProxyServer::listen(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"));
-    auto hash = request->get_path_parameter("hash");
-    InfoHash infoHash(hash);
-    if (!infoHash)
-        infoHash = InfoHash::get(hash);
-    session->fetch(content_length,
-        [=](const std::shared_ptr<restbed::Session> s, const restbed::Bytes& /*b* */)
-        {
-            try {
-                if (dht_) {
-                    InfoHash infoHash(hash);
-                    if (!infoHash) {
-                        infoHash = InfoHash::get(hash);
-                    }
-                    s->yield(restbed::OK);
-                    // Handle client deconnection
-                    // NOTE: for now, there is no handler, so we test the session in a thread
-                    // will be the case in restbed 5.0
-                    SessionToHashToken listener;
-                    listener.session = session;
-                    listener.hash = infoHash;
-                    // cache the session to avoid an incrementation of the shared_ptr's counter
-                    // else, the session->close() will not close the socket.
+                s->yield(restbed::OK, "", [=]( const std::shared_ptr< restbed::Session > s) {
                    auto cacheSession = std::weak_ptr<restbed::Session>(s);
-                    listener.token = dht_->listen(infoHash, [cacheSession](std::shared_ptr<Value> value) {
+
+                    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
-                        if (!s->is_closed()) {
-                            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();
+                        Json::FastWriter writer;
+                        s->yield(writer.write(value->toJson()), [](const std::shared_ptr<restbed::Session> /*session*/){ });
+                        return true;
+                    }, [s](bool /*ok* */) {
+                        // Communication is finished
+                        s->close();
                    });
-                    {
-                        std::lock_guard<std::mutex> lock(lockListener_);
-                        currentListeners_.emplace_back(std::move(listener));
+                });
+            } else {
+                s->close(restbed::SERVICE_UNAVAILABLE, "{\"err\":\"Incorrect DhtRunner\"}");
+            }
+        }
+    );
+
+}
+
+void
+DhtProxyServer::listen(const std::shared_ptr<restbed::Session>& session) const
+{
+
+    const auto request = session->get_request();
+    int content_length = std::stoi(request->get_header("Content-Length", "0"));
+    auto hash = request->get_path_parameter("hash");
+    InfoHash infoHash(hash);
+    if (!infoHash)
+        infoHash = InfoHash::get(hash);
+    session->fetch(content_length,
+        [=](const std::shared_ptr<restbed::Session> s, const restbed::Bytes& /*b* */)
+        {
+            if (dht_) {
+                InfoHash infoHash(hash);
+                if (!infoHash) {
+                    infoHash = InfoHash::get(hash);
+                }
+                s->yield(restbed::OK);
+                // Handle client deconnection
+                // NOTE: for now, there is no handler, so we test the session in a thread
+                // will be the case in restbed 5.0
+                SessionToHashToken listener;
+                listener.session = session;
+                listener.hash = infoHash;
+                // 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, [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()) {
+                        Json::FastWriter writer;
+                        s->yield(writer.write(value->toJson()), [](const std::shared_ptr<restbed::Session>){ });
                    }
+                    return !s->is_closed();
+                });
+                lockListener_.lock();
+                currentListeners_.emplace_back(std::move(listener));
+                lockListener_.unlock();
+            } else {
+                session->close(restbed::SERVICE_UNAVAILABLE, "{\"err\":\"Incorrect DhtRunner\"}");
+            }
+        }
+    );
+}
+
+void
+DhtProxyServer::put(const std::shared_ptr<restbed::Session>& session) const
+{
+    const auto request = session->get_request();
+    int content_length = std::stoi(request->get_header("Content-Length", "0"));
+    auto hash = request->get_path_parameter("hash");
+    InfoHash infoHash(hash);
+    if (!infoHash)
+        infoHash = InfoHash::get(hash);
+
+    session->fetch(content_length,
+        [=](const std::shared_ptr<restbed::Session> s, const restbed::Bytes& b)
+        {
+            if (dht_) {
+                if(b.empty()) {
+                    std::string response("{\"err\":\"Missing parameters\"}");
+                    s->close(restbed::BAD_REQUEST, response);
                } else {
-                    session->close(restbed::SERVICE_UNAVAILABLE, "{\"err\":\"Incorrect DhtRunner\"}");
-                }
-            } catch (...) {
-                s->close(restbed::INTERNAL_SERVER_ERROR, "{\"err\":\"Internal server error\"}");
-            }
-        }
-    );
-}
+                    restbed::Bytes buf(b);
+                    Json::Value root;
+                    Json::Reader reader;
+                    std::string strJson(buf.begin(), buf.end());
+                    bool parsingSuccessful = reader.parse(strJson.c_str(), root);
+                    if (parsingSuccessful) {
+                        // Build the Value from json
+                        auto value = std::make_shared<Value>(root);
+                        auto permanent = root.isMember("permanent") ? root["permanent"].asBool() : false;

-#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;
-    Sp<Scheduler::Job> expireNotifyJob;
-};
-struct DhtProxyServer::PushListener {
-    std::map<InfoHash, std::vector<Listener>> listeners;
-    bool isAndroid;
-};
-
-void
-DhtProxyServer::subscribe(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"));
-    auto hash = request->get_path_parameter("hash");
-    InfoHash infoHash(hash);
-    if (!infoHash)
-        infoHash = InfoHash::get(hash);
-    session->fetch(content_length,
-        [=](const std::shared_ptr<restbed::Session> s, const restbed::Bytes& b) mutable
-        {
-            try {
-                std::string err;
-                Json::Value root;
-                Json::CharReaderBuilder rbuilder;
-                auto* char_data = reinterpret_cast<const char*>(b.data());
-                auto reader = std::unique_ptr<Json::CharReader>(rbuilder.newCharReader());
-                if (!reader->parse(char_data, char_data + b.size(), &root, &err)) {
-                    s->close(restbed::BAD_REQUEST, "{\"err\":\"Incorrect JSON\"}");
-                    return;
-                }
-                auto pushToken = root["key"].asString();
-                if (pushToken.empty()) 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 << " token:" << tokenFromReq << " client:" << clientId << std::endl;
-
-                {
-                    std::lock(schedulerLock_, lockListener_);
-                    std::lock_guard<std::mutex> lk1(lockListener_, std::adopt_lock);
-                    std::lock_guard<std::mutex> lk2(schedulerLock_, std::adopt_lock);
-                    scheduler_.syncTime();
-                    auto timeout = scheduler_.time() + proxy::OP_TIMEOUT;
-                    // Check if listener is already present and refresh timeout if launched
-                    // One push listener per pushToken.infoHash.clientId
-                    auto pushListener = pushListeners_.emplace(pushToken, PushListener{}).first;
-                    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->close(restbed::OK, "{\"token\": " + std::to_string(tokenFromReq) + "}\n");
-                            schedulerCv_.notify_one();
-                            return;
-                        }
-                    }
-                    listeners->second.emplace_back(Listener{});
-                    auto& listener = listeners->second.back();
-                    listener.clientId = clientId;
-
-                    // New listener
-                    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, 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;
-                        }
-                    );
-                    listener.expireJob = scheduler_.add(timeout,
-                        [this, clientId, infoHash, pushToken] {
-                            cancelPushListen(pushToken, infoHash, clientId);
-                        }
-                    );
-                    listener.expireNotifyJob = scheduler_.add(timeout - proxy::OP_MARGIN,
-                        [this, token, infoHash, pushToken, isAndroid, clientId] {
-                            std::cout << "Listener: sending refresh " << infoHash << std::endl;
-                            Json::Value json;
-                            json["timeout"] = infoHash.toString();
-                            json["to"] = clientId;
-                            json["token"] = std::to_string(*token);
-                            sendPushNotification(pushToken, json, isAndroid);
-                        }
-                    );
-                }
-                schedulerCv_.notify_one();
-                s->close(restbed::OK, "{\"token\": " + std::to_string(tokenFromReq) + "}\n");
-            } catch (...) {
-                s->close(restbed::INTERNAL_SERVER_ERROR, "{\"err\":\"Internal server error\"}");
-            }
-        }
-    );
-}
-
-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"));
-    auto hash = request->get_path_parameter("hash");
-    InfoHash infoHash(hash);
-    if (!infoHash)
-        infoHash = InfoHash::get(hash);
-    session->fetch(content_length,
-        [=](const std::shared_ptr<restbed::Session> s, const restbed::Bytes& b)
-        {
-            try {
-                std::string err;
-                Json::Value root;
-                Json::CharReaderBuilder rbuilder;
-                auto* char_data = reinterpret_cast<const char*>(b.data());
-                auto reader = std::unique_ptr<Json::CharReader>(rbuilder.newCharReader());
-                if (!reader->parse(char_data, char_data + b.size(), &root, &err)) {
-                    s->close(restbed::BAD_REQUEST, "{\"err\":\"Incorrect JSON\"}");
-                    return;
-                }
-                auto pushToken = root["key"].asString();
-                if (pushToken.empty()) return;
-                auto clientId = root["client_id"].asString();
-
-                cancelPushListen(pushToken, infoHash, clientId);
-                s->close(restbed::OK);
-            } catch (...) {
-                s->close(restbed::INTERNAL_SERVER_ERROR, "{\"err\":\"Internal server error\"}");
-            }
-        }
-    );
-}
-
-void
-DhtProxyServer::cancelPushListen(const std::string& pushToken, const dht::InfoHash& key, const std::string& clientId)
-{
-    std::cout << "cancelPushListen: " << key << " clientId:" << clientId << std::endl;
-    std::lock_guard<std::mutex> lock(lockListener_);
-    auto pushListener = pushListeners_.find(pushToken);
-    if (pushListener == pushListeners_.end())
-        return;
-    auto listeners = pushListener->second.listeners.find(key);
-    if (listeners == pushListener->second.listeners.end())
-        return;
-    for (auto listener = listeners->second.begin(); listener != listeners->second.end();) {
-        if (listener->clientId == clientId) {
-            if (dht_)
-                dht_->cancelListen(key, std::move(listener->internalToken));
-            listener = listeners->second.erase(listener);
-        } else {
-            ++listener;
-        }
-    }
-    if (listeners->second.empty()) {
-        pushListener->second.listeners.erase(listeners);
-    }
-    if (pushListener->second.listeners.empty()) {
-        pushListeners_.erase(pushListener);
-    }
-}
-
-void
-DhtProxyServer::sendPushNotification(const std::string& token, const Json::Value& json, bool isAndroid) const
-{
-    restbed::Uri uri(proxy::HTTP_PROTO + pushServer_ + "/api/push");
-    auto req = std::make_shared<restbed::Request>(uri);
-    req->set_method("POST");
-
-    // NOTE: see https://github.com/appleboy/gorush
-    Json::Value notification(Json::objectValue);
-    Json::Value tokens(Json::arrayValue);
-    tokens[0] = token;
-    notification["tokens"] = tokens;
-    notification["platform"] = isAndroid ? 2 : 1;
-    notification["data"] = json;
-    notification["priority"] = "high";
-    notification["time_to_live"] = 600;
-
-    Json::Value notifications(Json::arrayValue);
-    notifications[0] = notification;
-
-    Json::Value content;
-    content["notifications"] = notifications;
-
-    Json::StreamWriterBuilder wbuilder;
-    wbuilder["commentStyle"] = "None";
-    wbuilder["indentation"] = "";
-    auto valueStr = Json::writeString(wbuilder, content);
-
-    req->set_header("Content-Type", "application/json");
-    req->set_header("Accept", "*/*");
-    req->set_header("Host", pushServer_);
-    req->set_header("Content-Length", std::to_string(valueStr.length()));
-    req->set_body(valueStr);
-
-    // Send request.
-    restbed::Http::async(req, {});
-}
-
-#endif //OPENDHT_PUSH_NOTIFICATIONS
-
-void
-DhtProxyServer::cancelPut(const InfoHash& key, Value::Id vid)
-{
-    std::cout << "cancelPut " << key << " " << vid << std::endl;
-    auto sPuts = puts_.find(key);
-    if (sPuts == puts_.end())
-        return;
-    auto& sPutsMap = sPuts->second.puts;
-    auto put = sPutsMap.find(vid);
-    if (put == sPutsMap.end())
-        return;
-    if (dht_)
-        dht_->cancelPut(key, vid);
-    if (put->second.expireNotifyJob)
-        put->second.expireNotifyJob->cancel();
-    sPutsMap.erase(put);
-    if (sPutsMap.empty())
-        puts_.erase(sPuts);
-}
-
-void
-DhtProxyServer::put(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"));
-    auto hash = request->get_path_parameter("hash");
-    InfoHash infoHash(hash);
-    if (!infoHash)
-        infoHash = InfoHash::get(hash);
-
-    session->fetch(content_length,
-        [=](const std::shared_ptr<restbed::Session> s, const restbed::Bytes& b)
-        {
-            try {
-                if (dht_) {
-                    if(b.empty()) {
-                        std::string response("{\"err\":\"Missing parameters\"}");
-                        s->close(restbed::BAD_REQUEST, response);
-                    } else {
-                        std::string err;
-                        Json::Value root;
-                        Json::CharReaderBuilder rbuilder;
-                        auto* char_data = reinterpret_cast<const char*>(b.data());
-                        auto reader = std::unique_ptr<Json::CharReader>(rbuilder.newCharReader());
-                        if (reader->parse(char_data, char_data + b.size(), &root, &err)) {
-                            // Build the Value from json
-                            auto value = std::make_shared<Value>(root);
-                            bool permanent = root.isMember("permanent");
-                            std::cout << "Got put " << infoHash << " " << *value << " " << (permanent ? "permanent" : "") << std::endl;
-
-                            if (permanent) {
-                                std::string pushToken, clientId, platform;
-                                auto& pVal = root["permanent"];
-                                if (pVal.isObject()) {
-                                    pushToken = pVal["key"].asString();
-                                    clientId = pVal["client_id"].asString();
-                                    platform = pVal["platform"].asString();
-                                }
-                                std::cout << "permanent: pushToken " << pushToken << " clientId " << clientId << " platform " << platform << std::endl;
-                                bool isAndroid = platform == "android";
-                                std::unique_lock<std::mutex> lock(schedulerLock_);
-                                scheduler_.syncTime();
-                                auto timeout = scheduler_.time() + proxy::OP_TIMEOUT;
-                                auto vid = value->id;
-                                auto sPuts = puts_.emplace(infoHash, SearchPuts{}).first;
-                                auto r = sPuts->second.puts.emplace(vid, PermanentPut{});
-                                auto& pput = r.first->second;
-                                if (r.second) {
-                                    std::cout << "New ppush entry" << std::endl;
-                                    pput.expireJob = scheduler_.add(timeout, [this, infoHash, vid]{
-                                        std::cout << "Permanent put expired: " << infoHash << " " << vid << std::endl;
-                                        cancelPut(infoHash, vid);
-                                    });
-#if OPENDHT_PUSH_NOTIFICATIONS
-                                    if (not pushToken.empty()) {
-                                        std::cout << "Adding refresh job" << std::endl;
-                                        pput.expireNotifyJob = scheduler_.add(timeout - proxy::OP_MARGIN,
-                                            [this, infoHash, vid, pushToken, clientId, isAndroid]
-                                        {
-                                            std::cout << "Permanent put refresh: " << infoHash << " " << std::to_string(vid) << " " << clientId << std::endl;
-                                            Json::Value json;
-                                            json["timeout"] = infoHash.toString();
-                                            json["to"] = clientId;
-                                            json["vid"] = std::to_string(vid);
-                                            sendPushNotification(pushToken, json, isAndroid);
-                                        });
-                                    }
-#endif
-                                } else {
-                                    std::cout << "Refreshing put jobs" << std::endl;
-                                    scheduler_.edit(pput.expireJob, timeout);
-                                    if (pput.expireNotifyJob)
-                                        scheduler_.edit(pput.expireNotifyJob, timeout - proxy::OP_MARGIN);
-                                }
-                                lock.unlock();
-                                schedulerCv_.notify_one();
+                        dht_->put(infoHash, value, [s, value](bool ok) {
+                            if (ok) {
+                                Json::FastWriter writer;
+                                if (s->is_open())
+                                    s->close(restbed::OK, writer.write(value->toJson()));
+                            } else {
+                                if (s->is_open())
+                                    s->close(restbed::BAD_GATEWAY, "{\"err\":\"put failed\"}");
                            }
-
-                            dht_->put(infoHash, value, [s, value](bool ok) {
-                                if (ok) {
-                                    Json::StreamWriterBuilder wbuilder;
-                                    wbuilder["commentStyle"] = "None";
-                                    wbuilder["indentation"] = "";
-                                    if (s->is_open())
-                                        s->close(restbed::OK, Json::writeString(wbuilder, value->toJson()) + "\n");
-                                } else {
-                                    if (s->is_open())
-                                        s->close(restbed::BAD_GATEWAY, "{\"err\":\"put failed\"}");
-                                }
-                            }, time_point::max(), permanent);
-                        } else {
-                            s->close(restbed::BAD_REQUEST, "{\"err\":\"Incorrect JSON\"}");
-                        }
+                        }, time_point::max(), permanent);
+                    } else {
+                        s->close(restbed::BAD_REQUEST, "{\"err\":\"Incorrect JSON\"}");
                    }
-                } else {
-                    s->close(restbed::SERVICE_UNAVAILABLE, "{\"err\":\"Incorrect DhtRunner\"}");
                }
-            } catch (const std::exception& e) {
-                std::cout << "Error performing put: " << e.what() << std::endl;
-                s->close(restbed::INTERNAL_SERVER_ERROR, "{\"err\":\"Internal server error\"}");
+            } else {
+                s->close(restbed::SERVICE_UNAVAILABLE, "{\"err\":\"Incorrect DhtRunner\"}");
            }
        }
    );
@@ -670,7 +302,6 @@ DhtProxyServer::put(const std::shared_ptr<restbed::Session>& session)
 void
 DhtProxyServer::putSigned(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");
@@ -681,35 +312,28 @@ DhtProxyServer::putSigned(const std::shared_ptr<restbed::Session>& session) cons
    session->fetch(content_length,
        [=](const std::shared_ptr<restbed::Session> s, const restbed::Bytes& b)
        {
-            try {
-                if (dht_) {
-                    if(b.empty()) {
-                        std::string response("{\"err\":\"Missing parameters\"}");
-                        s->close(restbed::BAD_REQUEST, response);
-                    } else {
-                        std::string err;
-                        Json::Value root;
-                        Json::CharReaderBuilder rbuilder;
-                        auto* char_data = reinterpret_cast<const char*>(b.data());
-                        auto reader = std::unique_ptr<Json::CharReader>(rbuilder.newCharReader());
-                        if (reader->parse(char_data, char_data + b.size(), &root, &err)) {
-                            auto value = std::make_shared<Value>(root);
-
-                            Json::StreamWriterBuilder wbuilder;
-                            wbuilder["commentStyle"] = "None";
-                            wbuilder["indentation"] = "";
-                            auto output = Json::writeString(wbuilder, value->toJson()) + "\n";
-                            dht_->putSigned(infoHash, value);
-                            s->close(restbed::OK, output);
-                        } else {
-                            s->close(restbed::BAD_REQUEST, "{\"err\":\"Incorrect JSON\"}");
-                        }
-                    }
+            if (dht_) {
+                if(b.empty()) {
+                    std::string response("{\"err\":\"Missing parameters\"}");
+                    s->close(restbed::BAD_REQUEST, response);
                } else {
-                    s->close(restbed::SERVICE_UNAVAILABLE, "{\"err\":\"Incorrect DhtRunner\"}");
+                    restbed::Bytes buf(b);
+                    Json::Value root;
+                    Json::Reader reader;
+                    std::string strJson(buf.begin(), buf.end());
+                    bool parsingSuccessful = reader.parse(strJson.c_str(), root);
+                    if (parsingSuccessful) {
+                        auto value = std::make_shared<Value>(root);
+
+                        Json::FastWriter writer;
+                        dht_->putSigned(infoHash, value);
+                        s->close(restbed::OK, writer.write(value->toJson()));
+                    } else {
+                        s->close(restbed::BAD_REQUEST, "{\"err\":\"Incorrect JSON\"}");
+                    }
                }
-            } catch (...) {
-                s->close(restbed::INTERNAL_SERVER_ERROR, "{\"err\":\"Internal server error\"}");
+            } else {
+                s->close(restbed::SERVICE_UNAVAILABLE, "{\"err\":\"Incorrect DhtRunner\"}");
            }
        }
    );
@@ -718,7 +342,6 @@ DhtProxyServer::putSigned(const std::shared_ptr<restbed::Session>& session) cons
 void
 DhtProxyServer::putEncrypted(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");
@@ -729,39 +352,31 @@ DhtProxyServer::putEncrypted(const std::shared_ptr<restbed::Session>& session) c
    session->fetch(content_length,
        [=](const std::shared_ptr<restbed::Session> s, const restbed::Bytes& b)
        {
-            try {
-                if (dht_) {
-                    if(b.empty()) {
-                        std::string response("{\"err\":\"Missing parameters\"}");
-                        s->close(restbed::BAD_REQUEST, response);
-                    } else {
-                        std::string err;
-                        Json::Value root;
-                        Json::CharReaderBuilder rbuilder;
-                        auto* char_data = reinterpret_cast<const char*>(b.data());
-                        auto reader = std::unique_ptr<Json::CharReader>(rbuilder.newCharReader());
-                        bool parsingSuccessful = reader->parse(char_data, char_data + b.size(), &root, &err);
-                        InfoHash to(root["to"].asString());
-                        if (parsingSuccessful && to) {
-                            auto value = std::make_shared<Value>(root);
-                            Json::StreamWriterBuilder wbuilder;
-                            wbuilder["commentStyle"] = "None";
-                            wbuilder["indentation"] = "";
-                            auto output = Json::writeString(wbuilder, value->toJson()) + "\n";
-                            dht_->putEncrypted(key, to, value);
-                            s->close(restbed::OK, output);
-                        } else {
-                            if(!parsingSuccessful)
-                                s->close(restbed::BAD_REQUEST, "{\"err\":\"Incorrect JSON\"}");
-                            else
-                                s->close(restbed::BAD_REQUEST, "{\"err\":\"No destination found\"}");
-                        }
-                    }
+            if (dht_) {
+                if(b.empty()) {
+                    std::string response("{\"err\":\"Missing parameters\"}");
+                    s->close(restbed::BAD_REQUEST, response);
                } else {
-                    s->close(restbed::SERVICE_UNAVAILABLE, "{\"err\":\"Incorrect DhtRunner\"}");
+                    restbed::Bytes buf(b);
+                    Json::Value root;
+                    Json::Reader reader;
+                    std::string strJson(buf.begin(), buf.end());
+                    bool parsingSuccessful = reader.parse(strJson.c_str(), root);
+                    InfoHash to(root["to"].asString());
+                    if (parsingSuccessful && to) {
+                        auto value = std::make_shared<Value>(root);
+                        Json::FastWriter writer;
+                        dht_->putEncrypted(key, to, value);
+                        s->close(restbed::OK, writer.write(value->toJson()));
+                    } else {
+                        if(!parsingSuccessful)
+                            s->close(restbed::BAD_REQUEST, "{\"err\":\"Incorrect JSON\"}");
+                        else
+                            s->close(restbed::BAD_REQUEST, "{\"err\":\"No destination found\"}");
+                    }
                }
-            } catch (...) {
-                s->close(restbed::INTERNAL_SERVER_ERROR, "{\"err\":\"Internal server error\"}");
+            } else {
+                s->close(restbed::SERVICE_UNAVAILABLE, "{\"err\":\"Incorrect DhtRunner\"}");
            }
        }
    );
@@ -771,7 +386,6 @@ DhtProxyServer::putEncrypted(const std::shared_ptr<restbed::Session>& session) c
 void
 DhtProxyServer::handleOptionsMethod(const std::shared_ptr<restbed::Session>& session) const
 {
-    requestNum_++;
 #if OPENDHT_PROXY_SERVER_IDENTITY
    const auto allowed = "OPTIONS, GET, POST, LISTEN, SIGN, ENCRYPT";
 #else
@@ -785,7 +399,6 @@ DhtProxyServer::handleOptionsMethod(const std::shared_ptr<restbed::Session>& ses
 void
 DhtProxyServer::getFiltered(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");
@@ -793,53 +406,28 @@ DhtProxyServer::getFiltered(const std::shared_ptr<restbed::Session>& session) co
    session->fetch(content_length,
        [=](const std::shared_ptr<restbed::Session> s, const restbed::Bytes& /*b* */)
        {
-            try {
-                if (dht_) {
-                    InfoHash infoHash(hash);
-                    if (!infoHash) {
-                        infoHash = InfoHash::get(hash);
-                    }
-                    s->yield(restbed::OK, "", [=]( const std::shared_ptr< restbed::Session > s) {
-                        dht_->get(infoHash, [s](std::shared_ptr<Value> v) {
-                            // Send values as soon as we get them
-                            Json::StreamWriterBuilder wbuilder;
-                            wbuilder["commentStyle"] = "None";
-                            wbuilder["indentation"] = "";
-                            auto output = Json::writeString(wbuilder, v->toJson()) + "\n";
-                            s->yield(output, [](const std::shared_ptr<restbed::Session> /*session*/){ });
-                            return true;
-                        }, [s](bool /*ok* */) {
-                            // Communication is finished
-                            s->close();
-                        }, {}, value);
-                    });
-                } else {
-                    s->close(restbed::SERVICE_UNAVAILABLE, "{\"err\":\"Incorrect DhtRunner\"}");
+            if (dht_) {
+                InfoHash infoHash(hash);
+                if (!infoHash) {
+                    infoHash = InfoHash::get(hash);
                }
-            } catch (...) {
-                s->close(restbed::INTERNAL_SERVER_ERROR, "{\"err\":\"Internal server error\"}");
+                s->yield(restbed::OK, "", [=]( const std::shared_ptr< restbed::Session > s) {
+                    dht_->get(infoHash, [s](std::shared_ptr<Value> v) {
+                        // Send values as soon as we get them
+                        Json::FastWriter writer;
+                        s->yield(writer.write(v->toJson()), [](const std::shared_ptr<restbed::Session> /*session*/){ });
+                        return true;
+                    }, [s](bool /*ok* */) {
+                        // Communication is finished
+                        s->close();
+                    }, {}, value);
+                });
+            } else {
+                s->close(restbed::SERVICE_UNAVAILABLE, "{\"err\":\"Incorrect DhtRunner\"}");
            }
        }
    );
 }

-void
-DhtProxyServer::removeClosedListeners(bool testSession)
-{
-    // clean useless listeners
-    std::lock_guard<std::mutex> lock(lockListener_);
-    auto listener = currentListeners_.begin();
-    while (listener != currentListeners_.end()) {
-        auto cancel = dht_ and (not testSession or listener->session->is_closed());
-        if (cancel) {
-            dht_->cancelListen(listener->hash, std::move(listener->token));
-            // Remove listener if unused
-            listener = currentListeners_.erase(listener);
-        } else {
-             ++listener;
-        }
-    }
-}
-
 }
 #endif //OPENDHT_PROXY_SERVER
@@ -1,8 +1,7 @@
 /*
 *  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>
+ *  Author(s) : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
+ *              Simon Désaulniers <simon.desaulniers@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
@@ -21,10 +20,6 @@
 #include "dhtrunner.h"
 #include "securedht.h"

-#if OPENDHT_PROXY_CLIENT
-#include "dht_proxy_client.h"
-#endif
-
 #ifndef _WIN32
 #include <unistd.h>
 #else
@@ -43,15 +38,6 @@ namespace dht {

 constexpr std::chrono::seconds DhtRunner::BOOTSTRAP_PERIOD;

-struct DhtRunner::Listener {
-    size_t tokenClassicDht;
-    size_t tokenProxyDht;
-    ValueCallback gcb;
-    InfoHash hash;
-    Value::Filter f;
-    Where w;
-};
-
 DhtRunner::DhtRunner() : dht_()
 #if OPENDHT_PROXY_CLIENT
 , dht_via_proxy_()
@@ -98,30 +84,21 @@ DhtRunner::run(const SockAddr& local4, const SockAddr& local6, DhtRunner::Config
 {
    if (running)
        return;
-    startNetwork(local4, local6);
-
-    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));
-
-#if OPENDHT_PROXY_CLIENT
-    config_ = config;
-#endif
-    enableProxy(not config.proxy_server.empty());
-
+    if (rcv_thread.joinable())
+        rcv_thread.join();
    running = true;
+#if OPENDHT_PROXY_CLIENT
+    config_.dht_config = config.dht_config;
+    config_.threaded = config.threaded;
+#endif //OPENDHT_PROXY_CLIENT
+    doRun(local4, local6, config.dht_config);
    if (not config.threaded)
        return;
-    dht_thread = std::thread([this, local4, local6]() {
+    dht_thread = std::thread([this]() {
        while (running) {
            std::unique_lock<std::mutex> lk(dht_mtx);
-            time_point wakeup;
-            try {
-                wakeup = loop_();
-            } catch (const dht::SocketException& e) {
-                startNetwork(local4, local6);
-            }
-
-            auto hasJobToDo = [this]() {
+            auto wakeup = loop_();
+            cv.wait_until(lk, wakeup, [this]() {
                if (not running)
                    return true;
                {
@@ -138,11 +115,7 @@ DhtRunner::run(const SockAddr& local4, const SockAddr& local6, DhtRunner::Config
                        return true;
                }
                return false;
-            };
-            if (wakeup == time_point::max())
-                cv.wait(lk, hasJobToDo);
-            else
-                cv.wait_until(lk, wakeup, hasJobToDo);
+            });
        }
    });
 }
@@ -150,8 +123,7 @@ DhtRunner::run(const SockAddr& local4, const SockAddr& local6, DhtRunner::Config
 void
 DhtRunner::shutdown(ShutdownCallback cb) {
 #if OPENDHT_PROXY_CLIENT
-    if (dht_via_proxy_)
-        dht_via_proxy_->shutdown(cb);
+    dht_via_proxy_->shutdown(cb);
 #endif
    std::lock_guard<std::mutex> lck(storage_mtx);
    pending_ops_prio.emplace([=](SecureDht& dht) mutable {
@@ -163,16 +135,15 @@ DhtRunner::shutdown(ShutdownCallback cb) {
 void
 DhtRunner::join()
 {
-    running_network = false;
    running = false;
    cv.notify_all();
    bootstrap_cv.notify_all();
    if (dht_thread.joinable())
        dht_thread.join();
-    if (bootstrap_thread.joinable())
-        bootstrap_thread.join();
    if (rcv_thread.joinable())
        rcv_thread.join();
+    if (bootstrap_thread.joinable())
+        bootstrap_thread.join();

    {
        std::lock_guard<std::mutex> lck(storage_mtx);
@@ -184,6 +155,8 @@ DhtRunner::join()
        resetDht();
        status4 = NodeStatus::Disconnected;
        status6 = NodeStatus::Disconnected;
+        bound4 = {};
+        bound6 = {};
    }
 }

@@ -214,17 +187,17 @@ DhtRunner::getNodeId() const
 std::pair<size_t, size_t>
 DhtRunner::getStoreSize() const {
    std::lock_guard<std::mutex> lck(dht_mtx);
-    if (!dht_)
+    if (!activeDht())
        return {};
-    return dht_->getStoreSize();
+    return activeDht()->getStoreSize();
 }

 void
 DhtRunner::setStorageLimit(size_t limit) {
    std::lock_guard<std::mutex> lck(dht_mtx);
-    if (!dht_)
+    if (!activeDht())
        throw std::runtime_error("dht is not running");
-    return dht_->setStorageLimit(limit);
+    return activeDht()->setStorageLimit(limit);
 }

 std::vector<NodeExport>
@@ -232,38 +205,27 @@ DhtRunner::exportNodes() const {
    std::lock_guard<std::mutex> lck(dht_mtx);
    if (!dht_)
        return {};
-    return dht_->exportNodes();
+    return activeDht()->exportNodes();
 }

 std::vector<ValuesExport>
 DhtRunner::exportValues() const {
    std::lock_guard<std::mutex> lck(dht_mtx);
-    if (!dht_)
+    if (!activeDht())
        return {};
-    return dht_->exportValues();
+    return activeDht()->exportValues();
 }

 void
 DhtRunner::setLoggers(LogMethod error, LogMethod warn, LogMethod debug) {
    std::lock_guard<std::mutex> lck(dht_mtx);
-    if (dht_)
-        dht_->setLoggers(std::forward<LogMethod>(error), std::forward<LogMethod>(warn), std::forward<LogMethod>(debug));
-#if OPENDHT_PROXY_CLIENT
-    if (dht_via_proxy_)
-        dht_via_proxy_->setLoggers(std::forward<LogMethod>(error), std::forward<LogMethod>(warn), std::forward<LogMethod>(debug));
-#endif
+    activeDht()->setLoggers(std::forward<LogMethod>(error), std::forward<LogMethod>(warn), std::forward<LogMethod>(debug));
 }

 void
 DhtRunner::setLogFilter(const InfoHash& f) {
    std::lock_guard<std::mutex> lck(dht_mtx);
    activeDht()->setLogFilter(f);
-    if (dht_)
-        dht_->setLogFilter(f);
-#if OPENDHT_PROXY_CLIENT
-    if (dht_via_proxy_)
-        dht_via_proxy_->setLogFilter(f);
-#endif
 }

 void
@@ -275,7 +237,7 @@ DhtRunner::registerType(const ValueType& type) {
 void
 DhtRunner::importValues(const std::vector<ValuesExport>& values) {
    std::lock_guard<std::mutex> lck(dht_mtx);
-    dht_->importValues(values);
+    activeDht()->importValues(values);
 }

 unsigned
@@ -362,18 +324,15 @@ void
 DhtRunner::setLocalCertificateStore(CertificateStoreQuery&& query_method) {
    std::lock_guard<std::mutex> lck(dht_mtx);
 #if OPENDHT_PROXY_CLIENT
-    if (dht_via_proxy_)
-        dht_via_proxy_->setLocalCertificateStore(std::forward<CertificateStoreQuery>(query_method));
+    dht_via_proxy_->setLocalCertificateStore(std::forward<CertificateStoreQuery>(query_method));
 #endif
-    if (dht_)
-        dht_->setLocalCertificateStore(std::forward<CertificateStoreQuery>(query_method));
+    dht_->setLocalCertificateStore(std::forward<CertificateStoreQuery>(query_method));
 }

 time_point
 DhtRunner::loop_()
 {
-    auto dht = activeDht();
-    if (not dht)
+    if (!activeDht())
        return {};

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

@@ -399,15 +358,15 @@ DhtRunner::loop_()
        for (const auto& pck : received) {
            auto& buf = pck.first;
            auto& from = pck.second;
-            wakeup = dht->periodic(buf.data(), buf.size()-1, from);
+            wakeup = activeDht()->periodic(buf.data(), buf.size()-1, from);
        }
        received.clear();
    } else {
-        wakeup = dht->periodic(nullptr, 0, nullptr, 0);
+        wakeup = activeDht()->periodic(nullptr, 0, nullptr, 0);
    }

-    NodeStatus nstatus4 = dht->getStatus(AF_INET);
-    NodeStatus nstatus6 = dht->getStatus(AF_INET6);
+    NodeStatus nstatus4 = activeDht()->getStatus(AF_INET);
+    NodeStatus nstatus6 = activeDht()->getStatus(AF_INET6);
    if (nstatus4 != status4 || nstatus6 != status6) {
        status4 = nstatus4;
        status6 = nstatus6;
@@ -451,13 +410,12 @@ int bindSocket(const SockAddr& addr, SockAddr& bound)
 }

 void
-DhtRunner::startNetwork(const SockAddr sin4, const SockAddr sin6)
+DhtRunner::doRun(const SockAddr& sin4, const SockAddr& sin6, SecureDht::Config config)
 {
-    running_network = false;
-    if (rcv_thread.joinable())
-        rcv_thread.join();
-    s4 = -1;
-    s6 = -1;
+    resetDht();
+
+    int s4 = -1,
+        s6 = -1;

    bound4 = {};
    if (sin4)
@@ -469,10 +427,23 @@ DhtRunner::startNetwork(const SockAddr sin4, const SockAddr sin6)
        s6 = bindSocket(sin6, bound6);
 #endif

-    running_network = true;
-    rcv_thread = std::thread([this]() {
+    auto dht = std::unique_ptr<DhtInterface>(
+        new Dht(s4, s6, SecureDht::getConfig(config))
+    );
+    dht_ = std::unique_ptr<SecureDht>(new SecureDht(std::move(dht), config));
+
+#if OPENDHT_PROXY_CLIENT
+    if (!dht_via_proxy_) {
+        auto dht_via_proxy = std::unique_ptr<DhtInterface>(
+            new DhtProxyClient(config_.proxy_server)
+        );
+        dht_via_proxy_ = std::unique_ptr<SecureDht>(new SecureDht(std::move(dht_via_proxy), config_.dht_config));
+    }
+#endif
+
+    rcv_thread = std::thread([this,s4,s6]() {
        try {
-            while (running_network) {
+            while (true) {
                struct timeval tv {/*.tv_sec = */0, /*.tv_usec = */250000};
                fd_set readfds;

@@ -490,7 +461,7 @@ DhtRunner::startNetwork(const SockAddr sin4, const SockAddr sin6)
                    }
                }

-                if (not running_network)
+                if(!running)
                    break;

                if(rc > 0) {
@@ -520,10 +491,6 @@ DhtRunner::startNetwork(const SockAddr sin4, const SockAddr sin6)
            close(s4);
        if (s6 >= 0)
            close(s6);
-        s4 = -1;
-        s6 = -1;
-        bound4 = {};
-        bound6 = {};
    });
 }

@@ -556,34 +523,34 @@ DhtRunner::query(const InfoHash& hash, QueryCallback cb, DoneCallback done_cb, Q
 }

 std::future<size_t>
-DhtRunner::listen(InfoHash hash, ValueCallback vcb, Value::Filter f, Where w)
+DhtRunner::listen(InfoHash hash, GetCallback vcb, Value::Filter f, Where w)
 {
    auto ret_token = std::make_shared<std::promise<size_t>>();
    {
        std::lock_guard<std::mutex> lck(storage_mtx);
-        pending_ops.emplace([=](SecureDht& dht) mutable {
-            auto tokenbGlobal = listener_token_++;
-            Listener listener {};
-            listener.hash = hash;
-            listener.f = std::move(f);
-            listener.w = std::move(w);
-            listener.gcb = [hash,vcb,tokenbGlobal,this](const std::vector<Sp<Value>>& vals, bool expired){
-                if (not vcb(vals, expired)) {
 #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);
+        pending_ops.emplace([=](SecureDht&) mutable {
+            auto tokenProxy = 0, tokenClassic = 0;
+            if (!use_proxy)
+                tokenClassic = dht_->listen(hash, vcb, std::move(f), std::move(w));
            else
+                tokenProxy = dht_via_proxy_->listen(hash, vcb, std::move(f), std::move(w));
+#else
+        pending_ops.emplace([=](SecureDht& dht) mutable {
+            auto tokenClassic = dht.listen(hash, vcb, std::move(f), std::move(w));
+            auto tokenProxy = 0;
 #endif
-                listener.tokenClassicDht = dht.listen(hash, listener.gcb, listener.f, listener.w);
-            listeners_.emplace(tokenbGlobal, std::move(listener));
-            ret_token->set_value(tokenbGlobal);
+            auto listener = std::unique_ptr<Listener>(new Listener());
+            listener->globalToken = listener_token_;
+            listener->tokenClassicDht = tokenClassic;
+            listener->tokenProxyDht = tokenProxy;
+            listener->gcb = vcb;
+            listener->hash = hash;
+            listener->f = f;
+            listener->w = w;
+            this->listeners_.emplace_back(std::move(listener));
+            ret_token->set_value(listener_token_);
+            listener_token_++;
        });
    }
    cv.notify_all();
@@ -599,41 +566,44 @@ DhtRunner::listen(const std::string& key, GetCallback vcb, Value::Filter f, Wher
 void
 DhtRunner::cancelListen(InfoHash h, size_t token)
 {
-    std::lock_guard<std::mutex> lck(storage_mtx);
-    pending_ops.emplace([=](SecureDht& dht) {
+    {
 #if OPENDHT_PROXY_CLIENT
-        auto it = listeners_.find(token);
+        auto it = listeners_.begin();
+        for (; it != listeners_.end(); ++it) {
+            auto& listener = *it;
+            if (listener->globalToken == token) {
+                break;
+            }
+        }
        if (it == listeners_.end()) return;
-        if (it->second.tokenClassicDht)
-            dht_->cancelListen(h, it->second.tokenClassicDht);
-        if (it->second.tokenProxyDht and dht_via_proxy_)
-            dht_via_proxy_->cancelListen(h, it->second.tokenProxyDht);
-        listeners_.erase(it);
-#else
-        dht.cancelListen(h, token);
 #endif // OPENDHT_PROXY_CLIENT
-    });
+        std::lock_guard<std::mutex> lck(storage_mtx);
+#if OPENDHT_PROXY_CLIENT
+        pending_ops.emplace([=](SecureDht&) {
+            auto& listener = *it;
+            if (listener->tokenClassicDht != 0) {
+                dht_->cancelListen(h, listener->tokenClassicDht);
+            }
+            if (listener->tokenProxyDht != 0) {
+                dht_via_proxy_->cancelListen(h, listener->tokenProxyDht);
+            }
+#else
+        pending_ops.emplace([=](SecureDht& dht) {
+            dht.cancelListen(h, token);
+#endif // OPENDHT_PROXY_CLIENT
+        });
+    }
    cv.notify_all();
 }

 void
-DhtRunner::cancelListen(InfoHash h, std::shared_future<size_t> ftoken)
+DhtRunner::cancelListen(InfoHash h, std::shared_future<size_t> token)
 {
    {
        std::lock_guard<std::mutex> lck(storage_mtx);
        pending_ops.emplace([=](SecureDht& dht) {
-            auto token = ftoken.get();
-#if OPENDHT_PROXY_CLIENT
-            auto it = listeners_.find(token);
-            if (it == listeners_.end()) return;
-            if (it->second.tokenClassicDht)
-                dht_->cancelListen(h, it->second.tokenClassicDht);
-            if (it->second.tokenProxyDht and dht_via_proxy_)
-                dht_via_proxy_->cancelListen(h, it->second.tokenProxyDht);
-            listeners_.erase(it);
-#else
-            dht.cancelListen(h, token);
-#endif // OPENDHT_PROXY_CLIENT
+            auto tk = token.get();
+            dht.cancelListen(h, tk);
        });
    }
    cv.notify_all();
@@ -789,6 +759,30 @@ DhtRunner::tryBootstrapContinuously()
    });
 }

+std::vector<SockAddr>
+DhtRunner::getAddrInfo(const std::string& host, const std::string& service)
+{
+    std::vector<SockAddr> ips {};
+    if (host.empty())
+        return ips;
+
+    addrinfo hints;
+    memset(&hints, 0, sizeof(hints));
+    hints.ai_socktype = SOCK_DGRAM;
+    addrinfo* info = nullptr;
+    int rc = getaddrinfo(host.c_str(), service.c_str(), &hints, &info);
+    if(rc != 0)
+        throw std::invalid_argument(std::string("Error: `") + host + ":" + service + "`: " + gai_strerror(rc));
+
+    addrinfo* infop = info;
+    while (infop) {
+        ips.emplace_back(infop->ai_addr, infop->ai_addrlen);
+        infop = infop->ai_next;
+    }
+    freeaddrinfo(info);
+    return ips;
+}
+
 void
 DhtRunner::bootstrap(const std::string& host, const std::string& service)
 {
@@ -870,13 +864,12 @@ DhtRunner::findCertificate(InfoHash hash, std::function<void(const std::shared_p
 }

 void
-DhtRunner::resetDht()
-{
-    listeners_.clear();
+DhtRunner::resetDht() {
 #if OPENDHT_PROXY_CLIENT
-    dht_via_proxy_.reset();
-#endif // OPENDHT_PROXY_CLIENT
+    use_proxy? dht_via_proxy_.reset() : dht_.reset();
+#else
    dht_.reset();
+#endif // OPENDHT_PROXY_CLIENT
 }

 SecureDht*
@@ -889,95 +882,56 @@ DhtRunner::activeDht() const
 #endif // OPENDHT_PROXY_CLIENT
 }

-void
-DhtRunner::enableProxy(bool proxify)
-{
 #if OPENDHT_PROXY_CLIENT
-    if (dht_via_proxy_) {
-        dht_via_proxy_->shutdown({});
+void
+DhtRunner::enableProxy(bool proxify) {
+    if (!dht_via_proxy_) {
+        auto dht_via_proxy = std::unique_ptr<DhtInterface>(
+            new DhtProxyClient(config_.proxy_server)
+        );
+        dht_via_proxy_ = std::unique_ptr<SecureDht>(new SecureDht(std::move(dht_via_proxy), config_.dht_config));
    }
    if (proxify) {
        // Init the proxy client
-        auto dht_via_proxy = std::unique_ptr<DhtInterface>(
-            new DhtProxyClient([this]{
-                if (config_.threaded) {
-                    {
-                        std::lock_guard<std::mutex> lck(storage_mtx);
-                        pending_ops_prio.emplace([=](SecureDht&) mutable {});
-                    }
-                    cv.notify_all();
-                }
-            }, config_.proxy_server, config_.push_node_id)
-        );
-        dht_via_proxy_ = std::unique_ptr<SecureDht>(new SecureDht(std::move(dht_via_proxy), config_.dht_config));
-#if OPENDHT_PUSH_NOTIFICATIONS
-        if (not pushToken_.empty())
-            dht_via_proxy_->setPushNotificationToken(pushToken_);
-#endif
+        dht_via_proxy_->startProxy(config_.proxy_server);
        // add current listeners
-        for (auto& l: listeners_)
-            l.second.tokenProxyDht = dht_via_proxy_->listen(l.second.hash, l.second.gcb, l.second.f, l.second.w);
+        for (auto& listener: listeners_) {
+            auto tokenProxy = dht_via_proxy_->listen(listener->hash, listener->gcb, std::move(listener->f), std::move(listener->w));
+            listener->tokenProxyDht = tokenProxy;
+        }
        // and use it
        use_proxy = proxify;
    } else {
        use_proxy = proxify;
-        std::lock_guard<std::mutex> lck(storage_mtx);
-        if (not listeners_.empty()) {
-            pending_ops.emplace([this](SecureDht& /*dht*/) mutable {
-                if (not dht_)
-                    return;
-                for (auto& l : listeners_) {
-                    if (not l.second.tokenClassicDht) {
-                        l.second.tokenClassicDht = dht_->listen(l.second.hash, l.second.gcb, l.second.f, l.second.w);
-                    }
-                }
-            });
+        loop_(); // Restart the classic DHT.
+        // We doesn't need to maintain the connection with the proxy.
+        // Delete it
+        dht_via_proxy_->shutdown({});
+        // update all proxyToken for all proxyListener
+        auto it = listeners_.begin();
+        for (; it != listeners_.end(); ++it) {
+            auto& listener = *it;
+            if (listener->tokenClassicDht == 0) {
+                pending_ops.emplace([it](SecureDht& dht) mutable {
+                    auto& listener = *it;
+                    auto token = dht.listen(listener->hash, listener->gcb, std::move(listener->f), std::move(listener->w));
+                    listener->tokenClassicDht = token;
+                });
+            }
+            listener->tokenProxyDht = 0;
        }
    }
-#else
-    if (proxify)
-        std::cerr << "DHT proxy requested but OpenDHT built without proxy support." << std::endl;
-#endif
 }
+#endif // OPENDHT_PROXY_CLIENT

+#if OPENDHT_PROXY_SERVER
 void
 DhtRunner::forwardAllMessages(bool forward)
 {
-#if OPENDHT_PROXY_SERVER
 #if OPENDHT_PROXY_CLIENT
-    if (dht_via_proxy_)
-        dht_via_proxy_->forwardAllMessages(forward);
+    dht_via_proxy_->forwardAllMessages(forward);
 #endif // OPENDHT_PROXY_CLIENT
-    if (dht_)
-        dht_->forwardAllMessages(forward);
+    dht_->forwardAllMessages(forward);
+}
 #endif // OPENDHT_PROXY_SERVER
 }
-
-/**
- * Updates the push notification device token
- */
-void
-DhtRunner::setPushNotificationToken(const std::string& token) {
-#if OPENDHT_PROXY_CLIENT && OPENDHT_PUSH_NOTIFICATIONS
-    pushToken_ = token;
-    if (dht_via_proxy_)
-        dht_via_proxy_->setPushNotificationToken(token);
-#endif
-}
-
-void
-DhtRunner::pushNotificationReceived(const std::map<std::string, std::string>& data)
-{
-#if OPENDHT_PROXY_CLIENT && OPENDHT_PUSH_NOTIFICATIONS
-    {
-        std::lock_guard<std::mutex> lck(storage_mtx);
-        pending_ops_prio.emplace([=](SecureDht& dht) {
-            if (dht_via_proxy_)
-                dht_via_proxy_->pushNotificationReceived(data);
-        });
-    }
-    cv.notify_all();
-#endif
-}
-
-}
@@ -20,7 +20,6 @@

 #include "value.h"
 #include "utils.h"
-#include "callbacks.h"

 namespace dht {

@@ -28,12 +27,14 @@ namespace dht {
 * Foreign nodes asking for updates about an InfoHash.
 */
 struct Listener {
+    size_t sid;
    time_point time;
    Query query;

-    Listener(time_point t, Query&& q) : time(t), query(std::move(q)) {}
+    Listener(size_t sid, time_point t, Query&& q) : sid(sid), time(t), query(std::move(q)) {}

-    void refresh(time_point t, Query&& q) {
+    void refresh(size_t s, time_point t, Query&& q) {
+        sid = s;
        time = t;
        query = std::move(q);
    }
@@ -45,14 +46,7 @@ struct Listener {
 struct LocalListener {
    Sp<Query> query;
    Value::Filter filter;
-    ValueCallback get_cb;
-};
-
-
-struct SearchListener {
-    Sp<Query> query;
-    Value::Filter filter;
-    ValueCallback get_cb;
+    GetCallback get_cb;
 };

 }
@@ -122,27 +122,12 @@ serializeValues(const std::vector<Sp<Value>>& st)
    return svals;
 }

-void
-packToken(msgpack::packer<msgpack::sbuffer>& pk, const Blob& token)
-{
-    pk.pack_bin(token.size());
-    pk.pack_bin_body((char*)token.data(), token.size());
-}
-
 RequestAnswer::RequestAnswer(ParsedMessage&& msg)
- : ntoken(std::move(msg.token)),
-   values(std::move(msg.values)),
-   refreshed_values(std::move(msg.refreshed_values)),
-   expired_values(std::move(msg.expired_values)),
-   fields(std::move(msg.fields)),
-   nodes4(std::move(msg.nodes4)),
-   nodes6(std::move(msg.nodes6))
-{}
+ : ntoken(std::move(msg.token)), values(std::move(msg.values)), fields(std::move(msg.fields)),
+    nodes4(std::move(msg.nodes4)), nodes6(std::move(msg.nodes6)) {}

-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,
+NetworkEngine::NetworkEngine(Logger& log, Scheduler& scheduler) : myid(zeroes), DHT_LOG(log), scheduler(scheduler) {}
+NetworkEngine::NetworkEngine(InfoHash& myid, NetId net, int s, int s6, Logger& log, Scheduler& scheduler,
        decltype(NetworkEngine::onError) onError,
        decltype(NetworkEngine::onNewNode) onNewNode,
        decltype(NetworkEngine::onReportedAddr) onReportedAddr,
@@ -184,67 +169,6 @@ NetworkEngine::tellListener(Sp<Node> node, Tid socket_id, const InfoHash& hash,
    }
 }

-void
-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(std::string("u"));
-    pk.pack_map(1 + (not values.empty()?1:0) + (not token.empty()?1:0));
-    pk.pack(std::string("id")); pk.pack(myid);
-    if (not token.empty()) {
-        pk.pack(std::string("token")); packToken(pk, token);
-    }
-    if (not values.empty()) {
-        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(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(std::string("n")); pk.pack(network);
-    }
-
-    // send response
-    send(buffer.data(), buffer.size(), 0, n->getAddr());
-}
-
-void
-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(std::string("u"));
-    pk.pack_map(1 + (not values.empty()?1:0) + (not token.empty()?1:0));
-    pk.pack(std::string("id")); pk.pack(myid);
-    if (not token.empty()) {
-        pk.pack(std::string("token")); packToken(pk, token);
-    }
-    if (not values.empty()) {
-        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(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(std::string("n")); pk.pack(network);
-    }
-
-    // send response
-    send(buffer.data(), buffer.size(), 0, n->getAddr());
-}
-
-
 bool
 NetworkEngine::isRunning(sa_family_t af) const
 {
@@ -292,24 +216,20 @@ NetworkEngine::requestStep(Sp<Request> sreq)
    auto err = send((char*)req.msg.data(), req.msg.size(),
            (node.getReplyTime() >= now - UDP_REPLY_TIME) ? 0 : MSG_CONFIRM,
            node.getAddr());
-    std::weak_ptr<Request> wreq = sreq;
    if (err == ENETUNREACH  ||
        err == EHOSTUNREACH ||
        err == EAFNOSUPPORT ||
        err == EPIPE)
    {
-        scheduler.add(now, [this,wreq]() mutable {
-            if (auto req = wreq.lock()) {
-                req->node->setExpired();
-                if (not req->node->id)
-                    requests.erase(req->tid);
-            }
-        });
+        node.setExpired();
+        if (not node.id)
+            requests.erase(req.tid);
    } else {
        if (err != EAGAIN) {
            ++req.attempt_count;
        }
        req.last_try = now;
+        std::weak_ptr<Request> wreq = sreq;
        scheduler.add(req.last_try + Node::MAX_RESPONSE_TIME, [this,wreq] {
            if (auto req = wreq.lock())
                requestStep(req);
@@ -415,7 +335,7 @@ NetworkEngine::processMessage(const uint8_t *buf, size_t buflen, const SockAddr&
        msgpack::unpacked msg_res = msgpack::unpack((const char*)buf, buflen);
        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.w("Can't process message of size %lu: %s", buflen, e.what());
        DHT_LOG.DEBUG.logPrintable(buf, buflen);
        return;
    }
@@ -576,7 +496,7 @@ NetworkEngine::process(std::unique_ptr<ParsedMessage>&& msg, const SockAddr& fro
                sendPong(from, msg->tid);
                break;
            case MessageType::FindNode: {
-                //DHT_LOG.d(msg->target, node->id, "[node %s] got 'find' request for %s (%d)", node->toString().c_str(), msg->target.toString().c_str(), msg->want);
+                DHT_LOG.d(msg->target, node->id, "[node %s] got 'find' request for %s (%d)", node->toString().c_str(), msg->target.toString().c_str(), msg->want);
                ++in_stats.find;
                RequestAnswer answer = onFindNode(node, msg->target, msg->want);
                auto nnodes = bufferNodes(from.getFamily(), msg->target, msg->want, answer.nodes4, answer.nodes6);
@@ -584,7 +504,7 @@ NetworkEngine::process(std::unique_ptr<ParsedMessage>&& msg, const SockAddr& fro
                break;
            }
            case MessageType::GetValues: {
-                //DHT_LOG.d(msg->info_hash, node->id, "[node %s] got 'get' request for %s", node->toString().c_str(), msg->info_hash.toString().c_str());
+                DHT_LOG.d(msg->info_hash, node->id, "[node %s] got 'get' request for %s", node->toString().c_str(), msg->info_hash.toString().c_str());
                ++in_stats.get;
                RequestAnswer answer = onGetValues(node, msg->info_hash, msg->want, msg->query);
                auto nnodes = bufferNodes(from.getFamily(), msg->info_hash, msg->want, answer.nodes4, answer.nodes6);
@@ -614,7 +534,6 @@ NetworkEngine::process(std::unique_ptr<ParsedMessage>&& msg, const SockAddr& fro
                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);
                sendListenConfirmation(from, msg->tid);
                break;
            }
@@ -629,6 +548,13 @@ NetworkEngine::process(std::unique_ptr<ParsedMessage>&& msg, const SockAddr& fro
    }
 }

+void
+packToken(msgpack::packer<msgpack::sbuffer>& pk, const Blob& token)
+{
+    pk.pack_bin(token.size());
+    pk.pack_bin_body((char*)token.data(), token.size());
+}
+
 void
 insertAddr(msgpack::packer<msgpack::sbuffer>& pk, const SockAddr& addr)
 {
@@ -663,9 +589,6 @@ NetworkEngine::send(const char *buf, size_t len, int flags, const SockAddr& addr
    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));
-        if (err == EPIPE) {
-            throw SocketException(EPIPE);
-        }
        return err;
    }
    return 0;
@@ -30,10 +30,11 @@ constexpr std::chrono::minutes Node::NODE_EXPIRE_TIME;
 constexpr std::chrono::minutes Node::NODE_GOOD_TIME;
 constexpr std::chrono::seconds Node::MAX_RESPONSE_TIME;

+
 Node::Node(const InfoHash& id, const SockAddr& addr, bool client)
 : id(id), addr(addr), is_client(client), sockets_()
 {
-    thread_local crypto::random_device rd {};
+    crypto::random_device rd;
    transaction_id = std::uniform_int_distribution<Tid>{1}(rd);
 }

@@ -133,18 +134,18 @@ Node::openSocket(SocketCb&& cb)
    if (++transaction_id == 0)
        transaction_id = 1;

-    auto sock = std::make_shared<Socket>(std::move(cb));
+    auto sock = Socket(std::move(cb));
    auto s = sockets_.emplace(transaction_id, std::move(sock));
    if (not s.second)
        s.first->second = std::move(sock);
    return transaction_id;
 }

-Sp<Socket>
+Socket*
 Node::getSocket(Tid id)
 {
    auto it = sockets_.find(id);
-    return it == sockets_.end() ? nullptr : it->second;
+    return it == sockets_.end() ? nullptr : &it->second;
 }

 void
@@ -1,204 +0,0 @@
-/*
- *  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
- *  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 "op_cache.h"
-
-namespace dht {
-
-constexpr const std::chrono::seconds OpCache::EXPIRATION;
-
-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, OpCacheValueStorage{v});
-        if (viop.second) {
-            newValues.emplace_back(v);
-        } else {
-            viop.first->second.refCount++;
-        }
-    }
-    return newValues.empty() ? true : callback(newValues, false);
-}
-bool
-OpValueCache::onValuesExpired(const std::vector<Sp<Value>>& vals) {
-    std::vector<Sp<Value>> expiredValues;
-    for (const auto& v : vals) {
-        auto vit = values.find(v->id);
-        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(Value::Filter& filter) const {
-    std::vector<Sp<Value>> ret;
-    if (not filter)
-        ret.reserve(values.size());
-    for (const auto& v : values)
-        if (not filter or filter(*v.second.data))
-            ret.emplace_back(v.second.data);
-    return ret;
-}
-
-Sp<Value>
-OpValueCache::get(Value::Id id) const {
-    auto v = values.find(id);
-    if (v == values.end())
-        return {};
-    return v->second.data;
-}
-
-std::vector<Sp<Value>>
-OpValueCache::getValues() const {
-    std::vector<Sp<Value>> ret;
-    ret.reserve(values.size());
-    for (const auto& v : values)
-        ret.emplace_back(v.second.data);
-    return ret;
-}
-
-void
-OpCache::onValuesAdded(const std::vector<Sp<Value>>& vals) {
-    if (not listeners.empty()) {
-        std::vector<LocalListener> list;
-        list.reserve(listeners.size());
-        for (const auto& l : listeners)
-            list.emplace_back(l.second);
-        for (auto& l : list)
-            l.get_cb(l.filter.filter(vals), false);
-    }
-}
-
-void
-OpCache::onValuesExpired(const std::vector<Sp<Value>>& vals) {
-    if (not listeners.empty()) {
-        std::vector<LocalListener> list;
-        list.reserve(listeners.size());
-        for (const auto& l : listeners)
-            list.emplace_back(l.second);
-        for (auto& l : list)
-            l.get_cb(l.filter.filter(vals), true);
-    }
-}
-
-time_point
-OpCache::getExpiration() const {
-    if (not listeners.empty())
-        return time_point::max();
-    return lastRemoved + EXPIRATION;
-}
-
-size_t
-SearchCache::listen(ValueCallback get_cb, Sp<Query> q, Value::Filter filter, std::function<size_t(Sp<Query>, ValueCallback)> onListen)
-{
-    // find exact match
-    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);
-        });
-    }
-    auto token = nextToken_++;
-    if (nextToken_ == 0)
-        nextToken_++;
-    op->second->addListener(token, get_cb, q, filter);
-    return token;
-}
-
-bool
-SearchCache::cancelListen(size_t gtoken, const time_point& now) {
-    for (auto& op : ops) {
-        if (op.second->removeListener(gtoken, now)) {
-            nextExpiration_ = std::min(nextExpiration_, op.second->getExpiration());
-            return true;
-        }
-    }
-    return false;
-}
-
-void
-SearchCache::cancelAll(std::function<void(size_t)> onCancel) {
-    for (auto& op : ops) {
-        auto cache = std::move(op.second);
-        cache->removeAll();
-        onCancel(cache->searchToken);
-    }
-    ops.clear();
-}
-
-time_point
-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();) {
-        auto expiration = it->second->getExpiration();
-        if (expiration < now) {
-            auto cache = std::move(it->second);
-            it = ops.erase(it);
-            onCancel(cache->searchToken);
-        } else {
-            nextExpiration_ = std::min(nextExpiration_, expiration);
-            ret = nextExpiration_;
-            ++it;
-        }
-    }
-    return ret;
-}
-
-std::vector<Sp<Value>>
-SearchCache::get(Value::Filter& filter) const {
-    if (ops.size() == 1)
-        return ops.begin()->second->get(filter);
-    std::map<Value::Id, Sp<Value>> c;
-    for (const auto& op : ops) {
-        for (const auto& v : op.second->get(filter))
-            c.emplace(v->id, v);
-    }
-    std::vector<Sp<Value>> ret;
-    ret.reserve(c.size());
-    for (auto& v : c)
-        ret.emplace_back(std::move(v.second));
-    return ret;
-}
-
-Sp<Value>
-SearchCache::get(Value::Id id) const {
-    for (const auto& op : ops)
-        if (auto v = op.second->get(id))
-            return v;
-    return {};
-}
-
-}
@@ -1,155 +0,0 @@
-/*
- *  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
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "value.h"
-#include "value_cache.h"
-#include "listener.h"
-
-namespace dht {
-
-struct OpCacheValueStorage
-{
-    Sp<Value> data {};
-    unsigned refCount {1};
-    OpCacheValueStorage(Sp<Value> val = {}) : data(val) {}
-};
-
-class OpValueCache {
-public:
-    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) {
-        auto cache = std::make_shared<OpValueCache>(std::forward<ValueCallback>(cb));
-        return [cache](const std::vector<Sp<Value>>& vals, bool expired){
-            return cache->onValue(vals, expired);
-        };
-    }
-
-    bool onValue(const std::vector<Sp<Value>>& vals, bool expired) {
-        if (expired)
-            return onValuesExpired(vals);
-        else
-            return onValuesAdded(vals);
-    }
-
-    bool onValuesAdded(const std::vector<Sp<Value>>& vals);
-    bool onValuesExpired(const std::vector<Sp<Value>>& vals);
-
-    std::vector<Sp<Value>> get(Value::Filter& filter) const;
-    Sp<Value> get(Value::Id id) const;
-    std::vector<Sp<Value>> getValues() const;
-
-private:
-    OpValueCache(const OpValueCache&) = delete;
-    OpValueCache& operator=(const OpValueCache&) = delete;
-
-    std::map<Value::Id, OpCacheValueStorage> values {};
-    ValueCallback callback;
-};
-
-class OpCache {
-public:
-    OpCache() : cache([this](const std::vector<Sp<Value>>& vals, bool expired){
-        if (expired)
-            onValuesExpired(vals);
-        else
-            onValuesAdded(vals);
-        return true;
-    }) {}
-
-    bool onValue(const std::vector<Sp<Value>>& vals, bool expired) {
-        cache.onValue(vals, expired);
-        return not listeners.empty();
-    }
-
-    void onValuesAdded(const std::vector<Sp<Value>>& vals);
-    void onValuesExpired(const std::vector<Sp<Value>>& vals);
-
-    void addListener(size_t token, ValueCallback cb, Sp<Query> q, Value::Filter filter) {
-        listeners.emplace(token, LocalListener{q, filter, cb});
-        cb(cache.get(filter), false);
-    }
-
-    bool removeListener(size_t token, const time_point& now) {
-        lastRemoved = now;
-        return listeners.erase(token) > 0;
-    }
-
-    void removeAll() {
-        listeners.clear();
-    }
-
-    bool isDone() {
-        return listeners.empty();
-    }
-
-    std::vector<Sp<Value>> get(Value::Filter& filter) const {
-        return cache.get(filter);
-    }
-
-    Sp<Value> get(Value::Id id) const {
-        return cache.get(id);
-    }
-
-    bool isExpired(const time_point& now) const {
-        return listeners.empty() and (lastRemoved + EXPIRATION < now);
-    }
-    time_point getExpiration() const;
-
-    size_t searchToken;
-private:
-    constexpr static const std::chrono::seconds EXPIRATION {60};
-    OpCache(const OpCache&) = delete;
-    OpCache& operator=(const OpCache&) = delete;
-
-    OpValueCache cache;
-    std::map<size_t, LocalListener> listeners;
-    time_point lastRemoved {clock::now()};
-};
-
-class SearchCache {
-public:
-    SearchCache() {}
-    SearchCache(SearchCache&&) = default;
-    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(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_;
-    }
-
-    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;
-
-    std::map<Sp<Query>, std::unique_ptr<OpCache>> ops {};
-    size_t nextToken_ {1};
-    time_point nextExpiration_ {time_point::max()};
-};
-
-}
@@ -62,8 +62,6 @@ struct ParsedMessage {
    std::vector<Sp<Node>> nodes4, nodes6;
    /* values to store or retreive request */
    std::vector<Sp<Value>> values;
-    std::vector<Value::Id> refreshed_values {};
-    std::vector<Value::Id> expired_values {};
    /* index for fields values */
    std::vector<Sp<FieldValueIndex>> fields;
    /** When part of the message header: {index -> (total size, {})}
@@ -284,10 +282,6 @@ ParsedMessage::msgpack_unpack(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 (auto w = findMapValue(req, "w")) {
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2018 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
@@ -21,8 +21,6 @@
 #include "value.h"
 #include "request.h"
 #include "listener.h"
-#include "value_cache.h"
-#include "op_cache.h"

 namespace dht {

@@ -61,17 +59,6 @@ struct Dht::SearchNode {
     */
    using SyncStatus = std::map<Sp<Query>, Sp<net::Request>>;

-    struct CachedListenStatus {
-        ValueCache cache;
-        Sp<Scheduler::Job> cacheExpirationJob {};
-        Sp<net::Request> req {};
-        CachedListenStatus(ValueStateCallback&& cb) : cache(std::forward<ValueStateCallback>(cb)) {}
-        CachedListenStatus(CachedListenStatus&&) = default;
-        CachedListenStatus(const CachedListenStatus&) = delete;
-        CachedListenStatus& operator=(const CachedListenStatus&) = delete;
-    };
-    using NodeListenerStatus = std::map<Sp<Query>, CachedListenStatus>;
-
    Sp<Node> node {};                 /* the node info */

    /* queries sent for finding out values hosted by the node */
@@ -80,14 +67,13 @@ struct Dht::SearchNode {
    std::map<Sp<Query>, std::vector<Sp<Query>>> pagination_queries {};

    SyncStatus getStatus {};    /* get/sync status */
-    NodeListenerStatus listenStatus {}; /* listen status */
+    SyncStatus listenStatus {}; /* listen status */
    AnnounceStatus acked {};    /* announcement status for a given value id */

    Blob token {};                                 /* last token the node sent to us after a get request */
    time_point last_get_reply {time_point::min()}; /* last time received valid token */
    bool candidate {false};                        /* A search node is candidate if the search is/was synced and this
                                                      node is a new candidate for inclusion. */
-    Sp<Scheduler::Job> syncJob {};

    SearchNode() : node() {}
    SearchNode(const SearchNode&) = delete;
@@ -107,17 +93,11 @@ struct Dht::SearchNode {
    /**
     * Can we use this node to listen/announce now ?
     */
-    bool isSynced(const time_point& now) const {
+    bool isSynced(time_point now) const {
        return not node->isExpired() and
               not token.empty() and last_get_reply >= now - Node::NODE_EXPIRE_TIME;
    }

-    time_point getSyncTime(const time_point& now) const {
-        if (node->isExpired() or token.empty())
-            return now;
-        return last_get_reply + Node::NODE_EXPIRE_TIME;
-    }
-
    /**
     * Could a particular "get" request be sent to this node now ?
     *
@@ -214,25 +194,6 @@ struct Dht::SearchNode {
        getStatus.clear();
    }

-    void onValues(const Sp<Query>& q, net::RequestAnswer&& answer, const TypeStore& types, Scheduler& scheduler)
-    {
-        auto l = listenStatus.find(q);
-        if (l != listenStatus.end()) {
-            auto next = l->second.cache.onValues(answer.values,
-                                     answer.refreshed_values,
-                                     answer.expired_values, types, scheduler.time());
-            scheduler.edit(l->second.cacheExpirationJob, next);
-        }
-    }
-
-    void expireValues(const Sp<Query>& q, Scheduler& scheduler) {
-        auto l = listenStatus.find(q);
-        if (l != listenStatus.end()) {
-            auto next = l->second.cache.expireValues(scheduler.time());
-            scheduler.edit(l->second.cacheExpirationJob, next);
-        }
-    }
-
    /**
     * Tells if a request in the status map is expired.
     *
@@ -260,12 +221,6 @@ struct Dht::SearchNode {
                return r.second and r.second->pending();
            }) != status.end();
    }
-    static bool pending(const NodeListenerStatus& status) {
-        return std::find_if(status.begin(), status.end(),
-            [](const NodeListenerStatus::value_type& r){
-                return r.second.req and r.second.req->pending();
-            }) != status.end();
-    }

    bool pendingGet() const { return pending(getStatus); }

@@ -301,20 +256,20 @@ struct Dht::SearchNode {
        else
            return isListening(now, ls);
    }
-    bool isListening(time_point now, NodeListenerStatus::const_iterator listen_status) const {
+    bool isListening(time_point now, SyncStatus::const_iterator listen_status) const {
        if (listen_status == listenStatus.end())
            return false;
-        return listen_status->second.req->reply_time + LISTEN_EXPIRE_TIME > now;
+        return listen_status->second->reply_time + LISTEN_EXPIRE_TIME > now;
    }
    void cancelListen() {
        for (const auto& status : listenStatus)
-            node->cancelRequest(status.second.req);
+            node->cancelRequest(status.second);
        listenStatus.clear();
    }
    void cancelListen(const Sp<Query>& query) {
        auto it = listenStatus.find(query);
        if (it != listenStatus.end()) {
-            node->cancelRequest(it->second.req);
+            node->cancelRequest(it->second);
            listenStatus.erase(it);
        }
    }
@@ -340,10 +295,10 @@ struct Dht::SearchNode {
     */
    time_point getListenTime(const Sp<Query>& q) const {
        auto listen_status = listenStatus.find(q);
-        if (listen_status == listenStatus.end() or not listen_status->second.req)
+        if (listen_status == listenStatus.end() or not listen_status->second)
            return time_point::min();
-        return listen_status->second.req->pending() ? time_point::max() :
-            listen_status->second.req->reply_time + LISTEN_EXPIRE_TIME - REANNOUNCE_MARGIN;
+        return listen_status->second->pending() ? time_point::max() :
+            listen_status->second->reply_time + LISTEN_EXPIRE_TIME - REANNOUNCE_MARGIN;
    }

    /**
@@ -378,16 +333,10 @@ struct Dht::Search {
    std::multimap<time_point, Get> callbacks {};

    /* listeners */
-    std::map<size_t, SearchListener> listeners {};
+    std::map<size_t, LocalListener> listeners {};
    size_t listener_token = 1;

-    /* Cache */
-    SearchCache cache;
-    Sp<Scheduler::Job> opExpirationJob;
-
    ~Search() {
-        if (opExpirationJob)
-            opExpirationJob->cancel();
        for (auto& get : callbacks) {
            get.second.done_cb(false, {});
            get.second.done_cb = {};
@@ -472,41 +421,24 @@ struct Dht::Search {
        done = true;
    }

+    time_point getUpdateTime(time_point now) const;
+
    bool isAnnounced(Value::Id id) const;
    bool isListening(time_point now) const;

-    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){
-            done = false;
-            auto token = ++listener_token;
-            listeners.emplace(token, SearchListener{q, f, vcb});
-            scheduler.edit(nextSearchStep, scheduler.time());
-            return token;
-        });
-    }
-
-    void cancelListen(size_t token, Scheduler& scheduler) {
-        cache.cancelListen(token, scheduler.time());
-        if (not opExpirationJob)
-            opExpirationJob = scheduler.add(time_point::max(), [this,&scheduler]{
-                auto nextExpire = cache.expire(scheduler.time(), [&](size_t t){
-                    Sp<Query> query;
-                    const auto& ll = listeners.find(t);
-                    if (ll != listeners.cend()) {
-                        query = ll->second.query;
-                        listeners.erase(ll);
-                    }
-                    for (auto& sn : nodes) {
-                        if (listeners.empty())
-                            sn.cancelListen();
-                        else if (query)
-                            sn.cancelListen(query);
-                    }
-                });
-                scheduler.edit(opExpirationJob, nextExpire);
-            });
-        scheduler.edit(opExpirationJob, cache.getExpiration());
+    void cancelListen(size_t token) {
+        Sp<Query> query;
+        const auto& ll = listeners.find(token);
+        if (ll != listeners.cend()) {
+            query = ll->second.query;
+            listeners.erase(ll);
+        }
+        for (auto& sn : nodes) {
+            if (listeners.empty())
+                sn.cancelListen();
+            else if (query)
+                sn.cancelListen(query);
+        }
    }

    /**
@@ -528,6 +460,26 @@ struct Dht::Search {
        return count;
    }

+    /**
+     * Returns the time of the next "announce" event for this search,
+     * or time_point::max() if no such event is planned.
+     * Only makes sense when the search is synced.
+     */
+    time_point getAnnounceTime(time_point now) const;
+
+    /**
+     * Returns the time of the next "listen" event for this search,
+     * or time_point::max() if no such event is planned.
+     * Only makes sense when the search is synced.
+     */
+    time_point getListenTime(time_point now) const;
+
+    /**
+     * Returns the time of the next event for this search,
+     * or time_point::max() if no such event is planned.
+     */
+    time_point getNextStepTime(time_point now) const;
+
    /**
     * Removes a node which have been expired for at least
     * NODE::NODE_EXPIRE_TIME minutes. The search for an expired node starts
@@ -769,6 +721,36 @@ Dht::Search::isDone(const Get& get) const
    return true;
 }

+time_point
+Dht::Search::getUpdateTime(time_point now) const
+{
+    time_point ut = time_point::max();
+    const auto last_get = getLastGetTime();
+    unsigned i = 0, t = 0, d = 0;
+    const auto solicited_nodes = currentlySolicitedNodeCount();
+    for (const auto& sn : nodes) {
+        if (sn.node->isExpired() or (sn.candidate and t >= TARGET_NODES))
+            continue;
+        auto pending = sn.pendingGet();
+        if (sn.last_get_reply < std::max(now - Node::NODE_EXPIRE_TIME, last_get) or pending) {
+            // not isSynced
+            if (not pending and solicited_nodes < MAX_REQUESTED_SEARCH_NODES)
+                ut = std::min(ut, now);
+            if (not sn.candidate)
+                d++;
+        } else
+            ut = std::min(ut, sn.last_get_reply + Node::NODE_EXPIRE_TIME);
+
+        t++;
+        if (not sn.candidate and ++i == TARGET_NODES)
+            break;
+    }
+    if (not callbacks.empty() and d == 0)
+        // If all synced/updated but some callbacks remain, step now to clear them
+        return now;
+    return ut;
+}
+
 bool
 Dht::Search::isAnnounced(Value::Id id) const
 {
@@ -795,7 +777,7 @@ Dht::Search::isListening(time_point now) const
    for (const auto& n : nodes) {
        if (n.isBad())
            continue;
-        SearchNode::NodeListenerStatus::const_iterator ls {};
+        SearchNode::SyncStatus::const_iterator ls {};
        for (ls = n.listenStatus.begin(); ls != n.listenStatus.end() ; ++ls) {
            if (n.isListening(now, ls))
                break;
@@ -808,4 +790,78 @@ Dht::Search::isListening(time_point now) const
    return i;
 }

+time_point
+Dht::Search::getAnnounceTime(time_point now) const
+{
+    if (nodes.empty())
+        return time_point::max();
+    time_point ret {time_point::max()};
+    for (const auto& a : announce) {
+        if (!a.value) continue;
+        unsigned i = 0, t = 0;
+        for (const auto& n : nodes) {
+            if (not n.isSynced(now) or (n.candidate and t >= TARGET_NODES))
+                continue;
+            ret = std::min(ret, n.getAnnounceTime(a.value->id));
+            t++;
+            if (not n.candidate and ++i == TARGET_NODES)
+                break;
+        }
+    }
+    return ret;
+}
+
+time_point
+Dht::Search::getListenTime(time_point now) const
+{
+    if (listeners.empty())
+        return time_point::max();
+
+    time_point listen_time {time_point::max()};
+    unsigned i = 0, t = 0;
+    for (const auto& sn : nodes) {
+        if (not sn.isSynced(now) or (sn.candidate and t >= LISTEN_NODES))
+            continue;
+        for (auto& l : listeners)
+            listen_time = std::min(listen_time, sn.getListenTime(l.second.query));
+        t++;
+        if (not sn.candidate and ++i == LISTEN_NODES)
+            break;
+    }
+    return listen_time;
+}
+
+time_point
+Dht::Search::getNextStepTime(time_point now) const
+{
+    auto next_step = time_point::max();
+    if (expired or done)
+        return next_step;
+
+    auto ut = getUpdateTime(now);
+    if (ut != time_point::max()) {
+        //std::cout << id.toString() << " IPv" << (af==AF_INET?"4":"6") << " update time in " << print_dt(ut - now) << " s" << std::endl;
+        next_step = std::min(next_step, ut);
+    }
+
+    if (isSynced(now))
+    {
+        auto at = getAnnounceTime(now);
+        if (at != time_point::max()) {
+            //std::cout << id.toString() << " IPv" << (af==AF_INET?"4":"6") << " announce time in " << print_dt(at - now) << " s" << std::endl;
+            next_step = std::min(next_step, at);
+        }
+
+        auto lt = getListenTime(now);
+        if (lt != time_point::max()) {
+            //std::cout << id.toString() << " IPv" << (af==AF_INET?"4":"6") << " listen time in " << print_dt(lt - now) << " s" << std::endl;
+            next_step = std::min(next_step, lt);
+        }
+    }
+
+
+    return next_step;
+}
+
+
 }
@@ -1,8 +1,7 @@
 /*
 *  Copyright (C) 2014-2017 Savoir-faire Linux Inc.
- *  Authors: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
+ *  Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 *           Simon Désaulniers <simon.desaulniers@savoirfairelinux.com>
- *           Sébastien Blin <sebastien.blin@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
@@ -213,84 +212,58 @@ SecureDht::findPublicKey(const InfoHash& node, std::function<void(const Sp<const
    findCertificate(node, [=](const Sp<crypto::Certificate> crt) {
        if (crt && *crt) {
            auto pk = std::make_shared<crypto::PublicKey>(crt->getPublicKey());
-            if (*pk) {
-                nodesPubKeys_[pk->getId()] = pk;
-                if (cb) cb(pk);
-                return;
-            }
+            nodesPubKeys_[pk->getId()] = pk;
+            if (cb) cb(pk);
+        } else {
+            if (cb) cb(nullptr);
        }
-        if (cb) cb(nullptr);
    });
 }

-Sp<Value>
-SecureDht::checkValue(const Sp<Value>& v)
-{
-    // Decrypt encrypted values
-    if (v->isEncrypted()) {
-        if (not key_) {
-#if OPENDHT_PROXY_SERVER
-            if (forward_all_) // We are currently a proxy, send messages to clients.
-                return v;
-#endif
-            return {};
-        }
-        try {
-            Value decrypted_val (decrypt(*v));
-            if (decrypted_val.recipient == getId()) {
-                if (decrypted_val.owner)
-                    nodesPubKeys_[decrypted_val.owner->getId()] = decrypted_val.owner;
-                return std::make_shared<Value>(std::move(decrypted_val));
-            }
-            // Ignore values belonging to other people
-        } catch (const std::exception& e) {
-            DHT_LOG.WARN("Could not decrypt value %s : %s", v->toString().c_str(), e.what());
-        }
-    }
-    // Check signed values
-    else if (v->isSigned()) {
-        if (v->owner and v->owner->checkSignature(v->getToSign(), v->signature)) {
-            nodesPubKeys_[v->owner->getId()] = v->owner;
-            return v;
-        }
-        else
-            DHT_LOG.WARN("Signature verification failed for %s", v->toString().c_str());
-    }
-    // Forward normal values
-    else {
-        return v;
-    }
-    return {};
-}
-
-ValueCallback
-SecureDht::getCallbackFilter(ValueCallback cb, Value::Filter&& filter)
-{
-    return [=](const std::vector<Sp<Value>>& values, bool expired) {
-        std::vector<Sp<Value>> tmpvals {};
-        for (const auto& v : values) {
-            if (auto nv = checkValue(v))
-                if (not filter or filter(*nv))
-                    tmpvals.emplace_back(std::move(nv));
-        }
-        if (cb and not tmpvals.empty())
-            return cb(tmpvals, expired);
-        return true;
-    };
-}
-
-
 GetCallback
 SecureDht::getCallbackFilter(GetCallback cb, Value::Filter&& filter)
 {
    return [=](const std::vector<Sp<Value>>& values) {
        std::vector<Sp<Value>> tmpvals {};
        for (const auto& v : values) {
-            if (auto nv = checkValue(v))
-                if (not filter or filter(*nv))
-                    tmpvals.emplace_back(std::move(nv));
+            // Decrypt encrypted values
+            if (v->isEncrypted()) {
+                if (not key_) {
+#if OPENDHT_PROXY_SERVER
+                    if (forward_all_) // We are currently a proxy, send messages to clients.
+                        tmpvals.push_back(v);
+#endif
+                    continue;
+                }
+                try {
+                    Value decrypted_val (decrypt(*v));
+                    if (decrypted_val.recipient == getId()) {
+                        nodesPubKeys_[decrypted_val.owner->getId()] = decrypted_val.owner;
+                        if (not filter or filter(decrypted_val))
+                            tmpvals.push_back(std::make_shared<Value>(std::move(decrypted_val)));
+                    }
+                    // Ignore values belonging to other people
+                } catch (const std::exception& e) {
+                    DHT_LOG.WARN("Could not decrypt value %s : %s", v->toString().c_str(), e.what());
+                }
+            }
+            // Check signed values
+            else if (v->isSigned()) {
+                if (v->owner and v->owner->checkSignature(v->getToSign(), v->signature)) {
+                    nodesPubKeys_[v->owner->getId()] = v->owner;
+                    if (not filter  or filter(*v))
+                        tmpvals.push_back(v);
+                }
+                else
+                    DHT_LOG.WARN("Signature verification failed for %s", v->toString().c_str());
+            }
+            // Forward normal values
+            else {
+                if (not filter or filter(*v))
+                    tmpvals.push_back(v);
+            }
        }
-        if (cb and not tmpvals.empty())
+        if (cb && not tmpvals.empty())
            return cb(tmpvals);
        return true;
    };
@@ -303,14 +276,7 @@ SecureDht::get(const InfoHash& id, GetCallback cb, DoneCallback donecb, Value::F
 }

 size_t
-SecureDht::listen(const InfoHash& id, ValueCallback cb, Value::Filter f, Where w)
-{
-    return dht_->listen(id, getCallbackFilter(cb, std::forward<Value::Filter>(f)), {}, std::forward<Where>(w));
-}
-
-
-size_t
-SecureDht::listen(const InfoHash& id, GetCallback cb, Value::Filter f, Where w)
+SecureDht::listen(const InfoHash& id, GetCallback cb, Value::Filter&& f, Where&& w)
 {
    return dht_->listen(id, getCallbackFilter(cb, std::forward<Value::Filter>(f)), {}, std::forward<Where>(w));
 }
@@ -320,7 +286,6 @@ SecureDht::putSigned(const InfoHash& hash, Sp<Value> val, DoneCallback callback,
 {
    if (val->id == Value::INVALID_ID) {
        crypto::random_device rdev;
-        std::uniform_int_distribution<Value::Id> rand_id;
        val->id = rand_id(rdev);
    }

@@ -167,7 +167,7 @@ struct Storage {

    StoreDiff remove(const InfoHash& id, Value::Id);

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

 private:
    Storage(const Storage&) = delete;
@@ -245,7 +245,7 @@ Storage::clear()
    return {-tot_size, -num_values, 0};
 }

-std::pair<ssize_t, std::vector<Sp<Value>>>
+Storage::StoreDiff
 Storage::expire(const InfoHash& id, time_point now)
 {
    // expire listeners
@@ -271,18 +271,16 @@ Storage::expire(const InfoHash& id, time_point now)
    auto r = std::partition(values.begin(), values.end(), [&](const ValueStorage& v) {
        return v.expiration > now;
    });
-    std::vector<Sp<Value>> ret;
-    ret.reserve(std::distance(r, values.end()));
+    ssize_t del_num = -std::distance(r, values.end());
    ssize_t size_diff {};
    std::for_each(r, values.end(), [&](const ValueStorage& v) {
        size_diff -= v.data->size();
        if (v.store_bucket)
            v.store_bucket->erase(id, *v.data, v.expiration);
-        ret.emplace_back(std::move(v.data));
    });
    total_size += size_diff;
    values.erase(r, values.end());
-    return {size_diff, std::move(ret)};
+    return {size_diff, del_num, del_listen};
 }

 }
@@ -27,28 +27,6 @@

 namespace dht {

-static constexpr std::array<uint8_t, 12> MAPPED_IPV4_PREFIX {{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xff, 0xff}};
-
-std::pair<std::string, std::string>
-splitPort(const std::string& s) {
-    if (s.empty())
-        return {};
-    if (s[0] == '[') {
-        std::size_t closure = s.find_first_of(']');
-        std::size_t found = s.find_last_of(':');
-        if (closure == std::string::npos)
-            return {s, ""};
-        if (found == std::string::npos or found < closure)
-            return {s.substr(1,closure-1), ""};
-        return {s.substr(1,closure-1), s.substr(found+1)};
-    }
-    std::size_t found = s.find_last_of(':');
-    std::size_t first = s.find_first_of(':');
-    if (found == std::string::npos or found != first)
-        return {s, ""};
-    return {s.substr(0,found), s.substr(found+1)};
-}
-
 std::vector<SockAddr>
 SockAddr::resolve(const std::string& host, const std::string& service)
 {
@@ -161,30 +139,6 @@ SockAddr::isPrivate() const
    }
 }

-bool
-SockAddr::isMappedIPv4() const
-{
-    if (getFamily() != AF_INET6)
-        return false;
-    const uint8_t* addr6 = reinterpret_cast<const uint8_t*>(&getIPv6().sin6_addr);
-    return std::equal(MAPPED_IPV4_PREFIX.begin(), MAPPED_IPV4_PREFIX.end(), addr6);
-}
-
-SockAddr
-SockAddr::getMappedIPv4() const
-{
-    if (not isMappedIPv4())
-        return *this;
-    SockAddr ret;
-    ret.setFamily(AF_INET);
-    ret.setPort(getPort());
-    auto addr6 = reinterpret_cast<const uint8_t*>(&getIPv6().sin6_addr);
-    auto addr4 = reinterpret_cast<uint8_t*>(&ret.getIPv4().sin_addr);
-    addr6 += MAPPED_IPV4_PREFIX.size();
-    std::copy_n(addr6, sizeof(in_addr), addr4);
-    return ret;
-}
-
 bool operator==(const SockAddr& a, const SockAddr& b) {
    return a.equals(b);
 }
@@ -22,7 +22,7 @@
 #include "default_types.h"
 #include "securedht.h" // print certificate ID

-#if OPENDHT_PROXY_SERVER || OPENDHT_PROXY_CLIENT
+#if OPENDHT_PROXY_SERVER
 #include "base64.h"
 #endif //OPENDHT_PROXY_SERVER

@@ -172,40 +172,43 @@ Value::msgpack_unpack_body(const msgpack::object& o)
    }
 }

-#if OPENDHT_PROXY_SERVER || OPENDHT_PROXY_CLIENT
+#if OPENDHT_PROXY_SERVER
 Value::Value(Json::Value& json)
 {
-    id = Value::Id(unpackId(json, "id"));
-    if (json.isMember("cypher")) {
-        auto cypherStr = json["cypher"].asString();
-        cypherStr = base64_decode(cypherStr);
-        cypher = std::vector<unsigned char>(cypherStr.begin(), cypherStr.end());
-    }
-    if (json.isMember("sig")) {
-        auto sigStr = json["sig"].asString();
-        sigStr = base64_decode(sigStr);
-        signature = std::vector<unsigned char>(sigStr.begin(), sigStr.end());
-    }
-    if (json.isMember("seq"))
-        seq = json["seq"].asInt();
-    if (json.isMember("owner")) {
-        auto ownerStr = json["owner"].asString();
-        auto ownerBlob = std::vector<unsigned char>(ownerStr.begin(), ownerStr.end());
-        owner = std::make_shared<const crypto::PublicKey>(ownerBlob);
-    }
-    if (json.isMember("to")) {
-        auto toStr = json["to"].asString();
-        recipient = InfoHash(toStr);
-    }
-    if (json.isMember("type"))
-        type = json["type"].asInt();
-    if (json.isMember("data")){
-        auto dataStr = json["data"].asString();
-        dataStr = base64_decode(dataStr);
-        data = std::vector<unsigned char>(dataStr.begin(), dataStr.end());
-    }
-    if (json.isMember("utype"))
-        user_type = json["utype"].asString();
+   try {
+       if (json.isMember("id"))
+           id = ValueType::Id(json["id"].asInt());
+   } catch (...) { }
+   if (json.isMember("cypher")) {
+       auto cypherStr = json["cypher"].asString();
+       cypherStr = base64_decode(cypherStr);
+       cypher = std::vector<unsigned char>(cypherStr.begin(), cypherStr.end());
+   }
+   if (json.isMember("sig")) {
+       auto sigStr = json["sig"].asString();
+       sigStr = base64_decode(sigStr);
+       signature = std::vector<unsigned char>(sigStr.begin(), sigStr.end());
+   }
+   if (json.isMember("seq"))
+       seq = json["seq"].asInt();
+   if (json.isMember("owner")) {
+       auto ownerStr = json["owner"].asString();
+       auto ownerBlob = std::vector<unsigned char>(ownerStr.begin(), ownerStr.end());
+       owner = std::make_shared<const crypto::PublicKey>(ownerBlob);
+   }
+   if (json.isMember("to")) {
+       auto toStr = json["to"].asString();
+       recipient = InfoHash(toStr);
+   }
+   if (json.isMember("type"))
+       type = json["type"].asInt();
+   if (json.isMember("data")){
+       auto dataStr = json["data"].asString();
+       dataStr = base64_decode(dataStr);
+       data = std::vector<unsigned char>(dataStr.begin(), dataStr.end());
+   }
+   if (json.isMember("utype"))
+       user_type = json["utype"].asString();
 }

 Json::Value
@@ -222,7 +225,7 @@ Value::toJson() const
        if (has_owner) { // isSigned
            val["seq"] = seq;
            val["owner"] = owner->toString();
-            if (recipient)
+            if (recipient != InfoHash())
                val["to"] = recipient.toString();
        }
        val["type"] = type;
@@ -232,22 +235,6 @@ Value::toJson() const
    }
    return val;
 }
-
-uint64_t
-unpackId(const Json::Value& json, const std::string& key) {
-    uint64_t ret = 0;
-    try {
-        if (json.isMember(key)) {
-            const auto& t = json[key];
-            if (t.isString()) {
-                ret = std::stoull(t.asString());
-            } else {
-                ret = t.asLargestUInt();
-            }
-        }
-    } catch (...) {}
-    return ret;
-}
 #endif //OPENDHT_PROXY_SERVER

 bool
@@ -1,189 +0,0 @@
-/*
- *  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
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "value.h"
-
-namespace dht {
-
-using ValueStateCallback = std::function<void(const std::vector<Sp<Value>>&, bool)>;
-using CallbackQueue = std::list<std::function<void()>>;
-
-class ValueCache {
-public:
-    ValueCache(ValueStateCallback&& cb) : callback(std::forward<ValueStateCallback>(cb)) {}
-    ValueCache(ValueCache&& o) : values(std::move(o.values)), callback(std::move(o.callback)) {
-        o.callback = {};
-    }
-
-    ~ValueCache() {
-        auto q = clear();
-        for (auto& cb: q)
-            cb();
-    }
-
-    CallbackQueue clear() {
-        std::vector<Sp<Value>> expired_values;
-        expired_values.reserve(values.size());
-        for (const auto& v : values)
-            expired_values.emplace_back(std::move(v.second.data));
-        values.clear();
-        CallbackQueue ret;
-        if (not expired_values.empty() and callback) {
-            auto cb = callback;
-            ret.emplace_back([expired_values, cb]{
-                cb(expired_values, true);
-            });
-        }
-        return ret;
-    }
-
-    time_point expireValues(const time_point& now) {
-        time_point ret = time_point::max();
-        auto cbs = expireValues(now, ret);
-        while (not cbs.empty()) {
-            cbs.front()();
-            cbs.pop_front();
-        }
-        return ret;
-    }
-
-    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) {
-                expired_values.emplace_back(std::move(it->second.data));
-                it = values.erase(it);
-            } else {
-                next = std::min(next, it->second.expiration);
-                ++it;
-            }
-        }
-        while (values.size() >= MAX_VALUES) {
-            // too many values, remove oldest values
-            time_point oldest_creation = time_point::max();
-            auto oldest_value = values.end();
-            for (auto it = values.begin(); it != values.end(); ++it)
-                if (it->second.created < oldest_creation) {
-                    oldest_value = it;
-                    oldest_creation = it->second.created;
-                }
-            if (oldest_value != values.end()) {
-                expired_values.emplace_back(std::move(oldest_value->second.data));
-                values.erase(oldest_value);
-            }
-        }
-        CallbackQueue ret;
-        if (not expired_values.empty() and callback) {
-            auto cb = callback;
-            ret.emplace_back([cb, expired_values]{
-                if (cb) cb(expired_values, true);
-            });
-        }
-        return ret;
-    }
-
-    time_point onValues
-        (const std::vector<Sp<Value>>& values,
-        const std::vector<Value::Id>& refreshed_values,
-        const std::vector<Value::Id>& expired_values,
-        const TypeStore& types, const time_point& now)
-    {
-        CallbackQueue cbs;
-        time_point ret = time_point::max();
-        if (not values.empty())
-            cbs.splice(cbs.end(), addValues(values, types, now));
-        for (const auto& vid : refreshed_values)
-            refreshValue(vid, types, now);
-        for (const auto& vid : expired_values)
-            cbs.splice(cbs.end(), expireValue(vid));
-        cbs.splice(cbs.end(), expireValues(now, ret));
-        while (not cbs.empty()) {
-            cbs.front()();
-            cbs.pop_front();
-        }
-        return ret;
-    }
-
-private:
-    // prevent copy
-    ValueCache(const ValueCache&) = delete;
-    ValueCache& operator=(const ValueCache&) = delete;
-    ValueCache& operator=(ValueCache&&) = delete;
-
-    /* The maximum number of values we store in the cache. */
-    static constexpr unsigned MAX_VALUES {1024};
-
-    struct CacheValueStorage {
-        Sp<Value> data {};
-        time_point created {};
-        time_point expiration {};
-
-        CacheValueStorage() {}
-        CacheValueStorage(const Sp<Value>& v, time_point t, time_point e)
-         : data(v), created(t), expiration(e) {}
-    };
-
-    std::map<Value::Id, CacheValueStorage> values;
-    ValueStateCallback callback;
-
-    CallbackQueue addValues(const std::vector<Sp<Value>>& new_values, const TypeStore& types, const time_point& now) {
-        std::vector<Sp<Value>> nvals;
-        for (const auto& value : new_values) {
-            auto v = values.find(value->id);
-            if (v == values.end()) {
-                // new value
-                nvals.emplace_back(value);
-                values.emplace(value->id, CacheValueStorage(value, now, now + types.getType(value->type).expiration));
-            } else {
-                // refreshed value
-                v->second.created = now;
-                v->second.expiration = now + types.getType(v->second.data->type).expiration;
-            }
-        }
-        auto cb = callback;
-        CallbackQueue ret;
-        if (not nvals.empty())
-            ret.emplace_back([cb, nvals]{
-                if (cb) cb(nvals, false);
-            });
-        return ret;
-    }
-    CallbackQueue expireValue(Value::Id vid) {
-        auto v = values.find(vid);
-        if (v == values.end())
-            return {};
-        const std::vector<Sp<Value>> val {std::move(v->second.data)};
-        values.erase(v);
-        auto cb = callback;
-        CallbackQueue ret;
-        ret.emplace_back([cb, val]{
-            if (cb) cb(val, true);
-        });
-        return ret;
-    }
-    void refreshValue(Value::Id vid, const TypeStore& types, const time_point& now) {
-        auto v = values.find(vid);
-        if (v == values.end())
-            return;
-        v->second.created = now;
-        v->second.expiration = now + types.getType(v->second.data->type).expiration;
-    }
-};
-
-}
@@ -1,9 +0,0 @@
-if ENABLE_TESTS
-bin_PROGRAMS = opendht_unit_tests
-
-AM_CPPFLAGS = -I../include
-
-nobase_include_HEADERS = infohashtester.h dhtrunnertester.h
-opendht_unit_tests_SOURCES = tests_runner.cpp infohashtester.cpp dhtrunnertester.cpp
-opendht_unit_tests_LDFLAGS = -lopendht -lcppunit -L@top_builddir@/src/.libs @GnuTLS_LIBS@
-endif
@@ -1,64 +0,0 @@
-/*
- *  Copyright (C) 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
- *  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 "dhtrunnertester.h"
-
-// std
-#include <iostream>
-#include <string>
-
-namespace test {
-CPPUNIT_TEST_SUITE_REGISTRATION(DhtRunnerTester);
-
-void
-DhtRunnerTester::setUp() {
-    node1.run(42222, {}, true);
-    node2.run(42232, {}, true);
-    node2.bootstrap(node1.getBound());
-}
-
-void
-DhtRunnerTester::tearDown() {
-    node1.join();
-    node2.join();
-}
-
-void
-DhtRunnerTester::testConstructors() {
-    CPPUNIT_ASSERT(node1.getBoundPort() == 42222);
-    CPPUNIT_ASSERT(node2.getBoundPort() == 42232);
-}
-
-void
-DhtRunnerTester::testGetPut() {
-    auto key = dht::InfoHash::get("123");
-    dht::Value val {"hey"};
-    auto val_data = val.data;
-    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() {
-    // TODO
-}
-
-}  // namespace test
@@ -1,62 +0,0 @@
-/*
- *  Copyright (C) 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
- *  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>
-
-#include <opendht/dhtrunner.h>
-
-namespace test {
-
-class DhtRunnerTester : public CppUnit::TestFixture {
-    CPPUNIT_TEST_SUITE(DhtRunnerTester);
-    CPPUNIT_TEST(testConstructors);
-    CPPUNIT_TEST(testGetPut);
-    CPPUNIT_TEST(testListen);
-    CPPUNIT_TEST_SUITE_END();
-
-    dht::DhtRunner node1 {};
-    dht::DhtRunner node2 {};
- 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 get and put methods
-     */
-    void testGetPut();
-    /**
-     * Test listen method
-     */
-    void testListen();
-};
-
-}  // namespace test
@@ -1,144 +0,0 @@
-/*
- *  Copyright (C) 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
- *  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 "infohashtester.h"
-
-// std
-#include <iostream>
-#include <string>
-
-// opendht
-#include "opendht/infohash.h"
-
-namespace test {
-CPPUNIT_TEST_SUITE_REGISTRATION(InfoHashTester);
-
-void
-InfoHashTester::setUp() {
-
-}
-
-void
-InfoHashTester::testConstructors() {
-    // Default constructor creates a null infohash
-    auto nullHash = dht::InfoHash();
-    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(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};
-    infohash = dht::InfoHash(enough, 20);
-    CPPUNIT_ASSERT(infohash.size() == 20);
-    const auto* data = infohash.data();
-    for (auto i = 0; i < 20; ++i) {
-        CPPUNIT_ASSERT_EQUAL(enough[i], data[i]);
-    }
-    // if too long, should be cutted to 20
-    uint8_t tooLong[] = {0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0xa,
-                        0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0xa, 0xb0};
-    infohash = dht::InfoHash(tooLong, 21);
-    CPPUNIT_ASSERT(infohash.size() == 20);
-    const auto* data2 = infohash.data();
-    for (auto i = 0; i < 20; ++i) {
-        CPPUNIT_ASSERT_EQUAL(enough[i], data2[i]);
-    }
-    // Build from string
-    auto infohashFromStr = dht::InfoHash("0102030405060708090A0102030405060708090A");
-    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]);
-    }
-}
-
-void
-InfoHashTester::testComperators() {
-    auto nullHash = dht::InfoHash();
-    auto minHash = dht::InfoHash("0000000000000000000000000000000000111110");
-    auto maxHash = dht::InfoHash("0111110000000000000000000000000000000000");
-    // operator ==
-    CPPUNIT_ASSERT_EQUAL(minHash, minHash);
-    CPPUNIT_ASSERT_EQUAL(minHash, dht::InfoHash("0000000000000000000000000000000000111110"));
-	CPPUNIT_ASSERT(!(minHash == maxHash));
-    // operator !=
-    CPPUNIT_ASSERT(!(minHash != minHash));
-    CPPUNIT_ASSERT(!(minHash != dht::InfoHash("0000000000000000000000000000000000111110")));
-	CPPUNIT_ASSERT(minHash != maxHash);
-    // operator<
-    CPPUNIT_ASSERT(nullHash < minHash);
-    CPPUNIT_ASSERT(nullHash < maxHash);
-    CPPUNIT_ASSERT(minHash < maxHash);
-    CPPUNIT_ASSERT(!(minHash < nullHash));
-    CPPUNIT_ASSERT(!(maxHash < nullHash));
-    CPPUNIT_ASSERT(!(maxHash < minHash));
-    CPPUNIT_ASSERT(!(minHash < minHash));
-    // bool()
-    CPPUNIT_ASSERT(maxHash);
-    CPPUNIT_ASSERT(!nullHash);
-
-}
-
-void
-InfoHashTester::testLowBit() {
-    auto nullHash = dht::InfoHash();
-    auto minHash = dht::InfoHash("0000000000000000000000000000000000000010");
-    auto maxHash = dht::InfoHash("0100000000000000000000000000000000000000");
-    CPPUNIT_ASSERT_EQUAL(nullHash.lowbit(), -1);
-    CPPUNIT_ASSERT_EQUAL(minHash.lowbit(), 155);
-    CPPUNIT_ASSERT_EQUAL(maxHash.lowbit(), 7);
-}
-
-void
-InfoHashTester::testCommonBits() {
-    auto nullHash = dht::InfoHash();
-    auto minHash = dht::InfoHash("0000000000000000000000000000000000000010");
-    auto maxHash = dht::InfoHash("0100000000000000000000000000000000000000");
-    CPPUNIT_ASSERT_EQUAL(dht::InfoHash::commonBits(nullHash, nullHash), (unsigned)160);
-    CPPUNIT_ASSERT_EQUAL(dht::InfoHash::commonBits(nullHash, minHash), (unsigned)155);
-    CPPUNIT_ASSERT_EQUAL(dht::InfoHash::commonBits(nullHash, maxHash), (unsigned)7);
-    CPPUNIT_ASSERT_EQUAL(dht::InfoHash::commonBits(minHash, maxHash), (unsigned)7);
-}
-
-void
-InfoHashTester::testXorCmp() {
-    auto nullHash = dht::InfoHash();
-    auto minHash = dht::InfoHash("0000000000000000000000000000000000000010");
-    auto maxHash = dht::InfoHash("0100000000000000000000000000000000000000");
-    CPPUNIT_ASSERT_EQUAL(minHash.xorCmp(nullHash, maxHash), -1);
-    CPPUNIT_ASSERT_EQUAL(minHash.xorCmp(maxHash, nullHash), 1);
-    CPPUNIT_ASSERT_EQUAL(minHash.xorCmp(minHash, maxHash), -1);
-    CPPUNIT_ASSERT_EQUAL(minHash.xorCmp(maxHash, minHash), 1);
-    CPPUNIT_ASSERT_EQUAL(nullHash.xorCmp(minHash, maxHash), -1);
-    CPPUNIT_ASSERT_EQUAL(nullHash.xorCmp(maxHash, minHash), 1);
-    // Because hashes are circular in distance.
-    CPPUNIT_ASSERT_EQUAL(maxHash.xorCmp(nullHash, minHash), -1);
-    CPPUNIT_ASSERT_EQUAL(maxHash.xorCmp(minHash, nullHash), 1);
-}
-
-void
-InfoHashTester::tearDown() {
-
-}
-}  // namespace test
@@ -1,69 +0,0 @@
-/*
- *  Copyright (C) 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
- *  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 InfoHashTester : public CppUnit::TestFixture {
-    CPPUNIT_TEST_SUITE(InfoHashTester);
-    CPPUNIT_TEST(testConstructors);
-    CPPUNIT_TEST(testComperators);
-    CPPUNIT_TEST(testLowBit);
-    CPPUNIT_TEST(testCommonBits);
-    CPPUNIT_TEST(testXorCmp);
-    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 testComperators();
-    /**
-     * Test lowbit method
-     */
-    void testLowBit();
-    /**
-     * Test commonBits method
-     */
-    void testCommonBits();
-    /**
-     * Test xorCmp operators
-     */
-    void testXorCmp();
-
-};
-
-}  // namespace test
@@ -1,35 +0,0 @@
-/*
- *  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
- *  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, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
- */
-#include <cppunit/extensions/TestFactoryRegistry.h>
-#include <cppunit/ui/text/TestRunner.h>
-#include <cppunit/CompilerOutputter.h>
-#include <iostream>
-
-int main(int argc, char** argv) {
-    CppUnit::TestFactoryRegistry &registry = CppUnit::TestFactoryRegistry::getRegistry();
-    CppUnit::Test *suite = registry.makeTest();
-    if (suite->countTestCases() == 0) {
-        std::cout << "No test cases specified for suite" << std::endl;
-        return 1;
-    }
-    CppUnit::TextUi::TestRunner runner;
-    runner.addTest(suite);
-    auto result = runner.run() ? 0 : 1;
-    return result;
-}
@@ -1,9 +1,8 @@
 /*
 *  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>
+ *  Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
+ *          Simon Désaulniers <simon.desaulniers@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
@@ -60,24 +59,14 @@ void print_help() {

 #if OPENDHT_PROXY_SERVER
    std::cout << std::endl << "Operations with the proxy:" << std::endl
-#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
-#endif // OPENDHT_PUSH_NOTIFICATIONS
-              << "  psp [port]              Stop the proxy interface on port." << std::endl;
+              << "  pst [port]            Start the proxy interface on port." << std::endl
+              << "  psp [port]            Stop the proxy interface on port." << std::endl;
 #endif //OPENDHT_PROXY_SERVER

 #if OPENDHT_PROXY_CLIENT
    std::cout << std::endl << "Operations with the proxy:" << std::endl
-#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
-#else
-              << "  stt [server_address]              Start the proxy client." << std::endl
-#endif // OPENDHT_PUSH_NOTIFICATIONS
-              << "  stp                               Stop the proxy client." << std::endl;
+              << "  stt [server_address]  Start the proxy client." << std::endl
+              << "  stp                   Stop the proxy client." << std::endl;
 #endif //OPENDHT_PROXY_CLIENT

    std::cout << std::endl << "Operations on the DHT:" << std::endl
@@ -87,25 +76,17 @@ void print_help() {
              << "  cl <key> <token>      Cancel listen for <token> and <key>." << std::endl
              << "  p <key> <str>         Put string value at <key>." << std::endl
              << "  pp <key> <str>        Put string value at <key> (persistent version)." << std::endl
-              << "  cpp <key> <id>        Cancel persistent put operation for <key> and value <id>." << std::endl
              << "  s <key> <str>         Put string value at <key>, signed with our generated private key." << std::endl
-              << "  e <key> <dest> <str>  Put string value at <key>, encrypted for <dest> with its public key (if found)." << std::endl
-              << "  cc                    Trigger connectivity changed signal." << std::endl;
+              << "  e <key> <dest> <str>  Put string value at <key>, encrypted for <dest> with its public key (if found)." << std::endl;

-#ifdef OPENDHT_INDEXATION
    std::cout << std::endl << "Indexation operations on the DHT:" << std::endl
              << "  il <name> <key> [exact match]   Lookup the index named <name> with the key <key>." << std::endl
              << "                                  Set [exact match] to 'false' for inexact match lookup." << std::endl
              << "  ii <name> <key> <value>         Inserts the value <value> under the key <key> in the index named <name>." << std::endl
              << std::endl;
-#endif
 }

-void cmd_loop(std::shared_ptr<DhtRunner>& dht, dht_params& params
-#if OPENDHT_PROXY_SERVER
-    , std::map<in_port_t, std::unique_ptr<DhtProxyServer>>& proxies
-#endif
-)
+void cmd_loop(std::shared_ptr<DhtRunner>& dht, dht_params& params)
 {
    print_node_info(dht, params);
    std::cout << " (type 'h' or 'help' for a list of possible commands)" << std::endl << std::endl;
@@ -115,9 +96,19 @@ void cmd_loop(std::shared_ptr<DhtRunner>& dht, dht_params& params
    using_history();
 #endif

-#ifdef OPENDHT_INDEXATION
    std::map<std::string, indexation::Pht> indexes;
-#endif
+#if OPENDHT_PROXY_SERVER
+    std::map<in_port_t, std::unique_ptr<DhtProxyServer>> proxies;
+    if (params.proxyserver != 0) {
+        proxies.emplace(params.proxyserver, new DhtProxyServer(dht, params.proxyserver));
+    }
+#endif //OPENDHT_PROXY_SERVER
+#if OPENDHT_PROXY_CLIENT
+    if (!params.proxyclient.empty()) {
+        dht->setProxyServer(params.proxyclient);
+        dht->enableProxy(true);
+    }
+#endif //OPENDHT_PROXY_CLIENT

    while (true)
    {
@@ -127,7 +118,7 @@ void cmd_loop(std::shared_ptr<DhtRunner>& dht, dht_params& params
            break;

        std::istringstream iss(line);
-        std::string op, idstr, value, index, keystr, pushServer, deviceKey;
+        std::string op, idstr, value, index, keystr;
        iss >> op;

        if (op == "x" || op == "exit" || op == "quit") {
@@ -141,12 +132,6 @@ 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;
-#if OPENDHT_PROXY_SERVER
-            for (const auto& proxy : proxies) {
-                std::cout << "Stats for proxy on port " << proxy.first << std::endl;
-                std::cout << "  " << proxy.second->getStats().toString() << std::endl;
-            }
-#endif
            continue;
        } else if (op == "lr") {
            std::cout << "IPv4 routing table:" << std::endl;
@@ -180,8 +165,11 @@ void cmd_loop(std::shared_ptr<DhtRunner>& dht, dht_params& params
            iss >> idstr;
            try {
                auto addr = splitPort(idstr);
-                if (not addr.first.empty() and addr.second.empty())
-                    addr.second = std::to_string(DHT_DEFAULT_PORT);
+                if (not addr.first.empty() and addr.second.empty()){
+                    std::stringstream ss;
+                    ss << DHT_DEFAULT_PORT;
+                    addr.second = ss.str();
+                }
                dht->bootstrap(addr.first.c_str(), addr.second.c_str());
            } catch (const std::exception& e) {
                std::cerr << e.what() << std::endl;
@@ -197,23 +185,13 @@ void cmd_loop(std::shared_ptr<DhtRunner>& dht, dht_params& params
                log::disableLogging(*dht);
            dht->setLogFilter(filter);
            continue;
-        } else if (op == "cc") {
-            dht->connectivityChanged();
        }
 #if OPENDHT_PROXY_SERVER
        else if (op == "pst") {
-#if OPENDHT_PUSH_NOTIFICATIONS
-                iss >> idstr >> pushServer;
-#else
-                iss >> idstr;
-#endif // OPENDHT_PUSH_NOTIFICATIONS
+            iss >> idstr;
            try {
                unsigned int port = std::stoi(idstr);
-#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)));
-#endif // OPENDHT_PUSH_NOTIFICATIONS
+                proxies.emplace(port, new DhtProxyServer(dht, port));
            } catch (...) { }
            continue;
        } else if (op == "psp") {
@@ -228,19 +206,14 @@ void cmd_loop(std::shared_ptr<DhtRunner>& dht, dht_params& params
 #endif //OPENDHT_PROXY_SERVER
 #if OPENDHT_PROXY_CLIENT
        else if (op == "stt") {
+            iss >> idstr;
+            dht->setProxyServer(idstr);
            dht->enableProxy(true);
            continue;
        } else if (op == "stp") {
            dht->enableProxy(false);
            continue;
        }
-#if OPENDHT_PUSH_NOTIFICATIONS
-        else if (op == "rp") {
-            iss >> value;
-            dht->pushNotificationReceived({{"to", "dhtnode"}, {"token", value}});
-            continue;
-        }
-#endif // OPENDHT_PUSH_NOTIFICATIONS
 #endif //OPENDHT_PROXY_CLIENT

        if (op.empty())
@@ -254,9 +227,7 @@ void cmd_loop(std::shared_ptr<DhtRunner>& dht, dht_params& params
        }
        dht::InfoHash id;

-        if (false) {}
-#ifdef OPENDHT_INDEXATION
-        else if (op == "il" or op == "ii") {
+        if (op == "il" or op == "ii") {
            // Pht syntax
            iss >> index >> keystr;
            auto new_index = std::find_if(indexes.begin(), indexes.end(),
@@ -264,7 +235,7 @@ void cmd_loop(std::shared_ptr<DhtRunner>& dht, dht_params& params
                        return i.first == index;
                    }) == indexes.end();
            if (not index.size()) {
-                std::cerr << "You must enter the index name." << std::endl;
+                std::cout << "You must enter the index name." << std::endl;
                continue;
            } else if (new_index) {
                using namespace dht::indexation;
@@ -278,7 +249,6 @@ void cmd_loop(std::shared_ptr<DhtRunner>& dht, dht_params& params
                } catch (std::invalid_argument& e) { std::cout << e.what() << std::endl; }
            }
        }
-#endif
        else {
            // Dht syntax
            iss >> idstr;
@@ -326,26 +296,17 @@ void cmd_loop(std::shared_ptr<DhtRunner>& dht, dht_params& params
        else if (op == "l") {
            std::string rem;
            std::getline(iss, rem);
-            auto token = dht->listen(id, [](const std::vector<std::shared_ptr<Value>>& values, bool expired) {
-                std::cout << "Listen: found " << values.size() << " values" << (expired ? " expired" : "") << std::endl;
-                for (const auto& value : values)
-                    std::cout << "\t" << *value << std::endl;
+            auto token = dht->listen(id, [](std::shared_ptr<Value> value) {
+                std::cout << "Listen: found value:" << std::endl;
+                std::cout << "\t" << *value << std::endl;
                return true;
            }, {}, dht::Where {std::move(rem)});
-            auto t = token.get();
-            std::cout << "Listening, token: " << t << std::endl;
+            std::cout << "Listening, token: " << token.get() << std::endl;
        }
-        if (op == "cl") {
+        else if (op == "cl") {
            std::string rem;
            iss >> rem;
-            size_t token;
-            try {
-                token = std::stoul(rem);
-            } catch(...) {
-                std::cerr << "Syntax: cl [key] [token]" << std::endl;
-                continue;
-            }
-            dht->cancelListen(id, token);
+            dht->cancelListen(id, std::stoul(rem));
        }
        else if (op == "p") {
            std::string v;
@@ -416,7 +377,6 @@ void cmd_loop(std::shared_ptr<DhtRunner>& dht, dht_params& params
                std::cout << "Announce: " << (ok ? "success" : "failure") << " (took " << print_dt(end-start) << "s)" << std::endl;
            });
        }
-#ifdef OPENDHT_INDEXATION
        else if (op == "il") {
            std::string exact_match;
            iss >> exact_match;
@@ -462,7 +422,6 @@ void cmd_loop(std::shared_ptr<DhtRunner>& dht, dht_params& params
            catch (std::invalid_argument& e) { std::cout << e.what() << std::endl; }
            catch (std::out_of_range& e) { }
        }
-#endif
    }

    std::cout << std::endl <<  "Stopping node..." << std::endl;
@@ -483,7 +442,6 @@ main(int argc, char **argv)
            print_usage();
            return 0;
        }
-
        if (params.daemonize) {
            daemonize();
        } else if (params.service) {
@@ -493,20 +451,10 @@ main(int argc, char **argv)
        dht::crypto::Identity crt {};
        if (params.generate_identity) {
            auto ca_tmp = dht::crypto::generateEcIdentity("DHT Node CA");
-            crt = dht::crypto::generateIdentity("DHT Node", ca_tmp);
+            crt = dht::crypto::generateEcIdentity("DHT Node", ca_tmp);
        }

-        dht::DhtRunner::Config config;
-        config.dht_config.node_config.network = params.network;
-        config.dht_config.node_config.maintain_storage = false;
-        config.dht_config.id = crt;
-        config.threaded = true;
-        config.proxy_server = params.proxyclient;
-        config.push_node_id = "dhtnode";
-        if (not params.proxyclient.empty())
-            dht->setPushNotificationToken(params.devicekey);
-
-        dht->run(params.port, config);
+        dht->run(params.port, crt, true, params.network);

        if (params.log) {
            if (params.syslog or (params.daemonize and params.logfile.empty()))
@@ -522,26 +470,11 @@ main(int argc, char **argv)
            dht->bootstrap(params.bootstrap.first.c_str(), params.bootstrap.second.c_str());
        }

-#if OPENDHT_PROXY_SERVER
-        std::map<in_port_t, std::unique_ptr<DhtProxyServer>> proxies;
-#endif
-        if (params.proxyserver != 0) {
-#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;
-            exit(EXIT_FAILURE);
-#endif
-        }
-
-        if (params.daemonize or params.service)
+        if (params.daemonize or params.service) {
            while (runner.wait());
-        else
-            cmd_loop(dht, params
-#if OPENDHT_PROXY_SERVER
-                , proxies
-#endif
-            );
+        } else {
+            cmd_loop(dht, params);
+        }

    } catch(const std::exception&e) {
        std::cerr << std::endl <<  e.what() << std::endl;
@@ -2,7 +2,6 @@
 *  Copyright (C) 2014-2017 Savoir-faire Linux Inc.
 *
 *  Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
- *  Author: Sébastien Blin <sebastien.blin@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
@@ -45,6 +44,29 @@
 #include <sstream>
 #include <fstream>

+/**
+ * Split "[host]:port" or "host:port" to pair<"host", "port">.
+ */
+std::pair<std::string, std::string>
+splitPort(const std::string& s) {
+    if (s.empty())
+        return {};
+    if (s[0] == '[') {
+        std::size_t closure = s.find_first_of(']');
+        std::size_t found = s.find_last_of(':');
+        if (closure == std::string::npos)
+            return {s, ""};
+        if (found == std::string::npos or found < closure)
+            return {s.substr(1,closure-1), ""};
+        return {s.substr(1,closure-1), s.substr(found+1)};
+    }
+    std::size_t found = s.find_last_of(':');
+    std::size_t first = s.find_first_of(':');
+    if (found == std::string::npos or found != first)
+        return {s, ""};
+    return {s.substr(0,found), s.substr(found+1)};
+}
+
 /*
 * The mapString shall have the following format:
 *
@@ -67,7 +89,6 @@ std::map<std::string, std::string> parseStringMap(std::string mapString) {
    return map;
 }

-#ifdef OPENDHT_INDEXATION
 dht::indexation::Pht::Key createPhtKey(std::map<std::string, std::string> pht_key_str_map) {
    dht::indexation::Pht::Key pht_key;
    for (auto f : pht_key_str_map) {
@@ -76,7 +97,6 @@ dht::indexation::Pht::Key createPhtKey(std::map<std::string, std::string> pht_ke
    }
    return pht_key;
 }
-#endif

 bool isInfoHash(const dht::InfoHash& h) {
    if (not h) {
@@ -101,8 +121,6 @@ struct dht_params {
    std::pair<std::string, std::string> bootstrap {};
    in_port_t proxyserver {0};
    std::string proxyclient {};
-    std::string pushserver {};
-    std::string devicekey {};
 };

 static const constexpr struct option long_options[] = {
@@ -118,8 +136,6 @@ static const constexpr struct option long_options[] = {
   {"syslog",     no_argument      , nullptr, 'L'},
   {"proxyserver",required_argument, nullptr, 'S'},
   {"proxyclient",required_argument, nullptr, 'C'},
-   {"pushserver", required_argument, nullptr, 'P'},
-   {"devicekey",  required_argument, nullptr, 'D'},
   {nullptr,      0                , nullptr,  0}
 };

@@ -145,20 +161,14 @@ parseArgs(int argc, char **argv) {
                    std::cout << "Invalid port: " << port_arg << std::endl;
            }
            break;
-        case 'P':
-            params.pushserver = optarg;
-            break;
        case 'C':
            params.proxyclient = optarg;
            break;
-        case 'D':
-            params.devicekey = optarg;
-            break;
        case 'n':
            params.network = strtoul(optarg, nullptr, 0);
            break;
        case 'b':
-            params.bootstrap = dht::splitPort((optarg[0] == '=') ? optarg+1 : optarg);
+            params.bootstrap = splitPort((optarg[0] == '=') ? optarg+1 : optarg);
            if (not params.bootstrap.first.empty() and params.bootstrap.second.empty()) {
                params.bootstrap.second = std::to_string(DHT_DEFAULT_PORT);
            }