wip

2026-11-09 12:57:03 +00:00 · 2018-04-21 17:16:37 -04:00
120 changed files with 3492 additions and 8601 deletions
@@ -1 +0,0 @@
-Checks: '-*,clang-diagnostic-*,performance-*,bugprone-*,llvm-*,clang-analyzer-*,misc-*,-llvm-namespace-comment,-misc-unused-parameters,-misc-non-private-member-variables-in-classes,-llvm-header-guard,-llvm-include-order,-bugprone-suspicious-string-compare'
@@ -46,15 +46,6 @@ Makefile.in
 .kdev4/
 *.kdev4

-# VSCode
-.vscode/*
-
-# Eclipse CDT
-.cproject
-.project
-.autotools
-language.settings.xml
-
 # Python
 *.pyc
 *.stamp
@@ -1,4 +1,3 @@
-dist: xenial
 sudo: required

 services:
@@ -38,7 +37,7 @@ script:
    # proxy builds
    if [[ "$OPENDHT_TEST_JOB" != *"opendht.llvm"* ]] && [[ "$OPENDHT_TEST_JOB" != *"opendht.classic"* ]]; then
      docker build -t opendht-proxy -f docker/DockerfileTravisProxy .;
-      options='-DOPENDHT_SANITIZE=On ';
+      options='';
      if [[ "$OPENDHT_TEST_JOB" == *"opendht.proxyserver"* ]] || [[ "$OPENDHT_TEST_JOB" == *"opendht.push"* ]]; then
        options+='-DOPENDHT_PROXY_SERVER=ON ';
      else
@@ -1,7 +1,7 @@
 cmake_minimum_required (VERSION 3.1)
 project (opendht)
 set (opendht_VERSION_MAJOR 1)
-set (opendht_VERSION_MINOR 10.0)
+set (opendht_VERSION_MINOR 7.1)
 set (opendht_VERSION ${opendht_VERSION_MAJOR}.${opendht_VERSION_MINOR})
 set (PACKAGE_VERSION ${opendht_VERSION})
 set (VERSION "${opendht_VERSION}")
@@ -16,10 +16,10 @@ option (OPENDHT_SYSTEMD "Install systemd module" OFF)
 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 Restinio and jsoncpp" 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 Restinio and jsoncpp" 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)

@@ -47,31 +47,13 @@ if (NOT OPENDHT_ARGON2)
        set(OPENDHT_ARGON2 ON)
    endif()
 endif ()
-
-pkg_search_module(Jsoncpp jsoncpp)
-if (Jsoncpp_FOUND)
-    add_definitions(-DOPENDHT_JSONCPP)
-    list (APPEND opendht_SOURCES
-      src/base64.h
-      src/base64.cpp
-    )
-endif()
-
 if (OPENDHT_PROXY_SERVER OR OPENDHT_PROXY_CLIENT)
-    find_package(Restinio REQUIRED)
-    if (Restinio_FOUND)
-        find_library(FMT_LIBRARY fmt)
-        add_library(fmt SHARED IMPORTED)
-        find_library(HTTP_PARSER_LIBRARY http_parser)
-        add_library(http_parser SHARED IMPORTED)
-    endif()
-    if (NOT Jsoncpp_FOUND)
-        message(SEND_ERROR "Jsoncpp is required for DHT proxy support")
-    endif()
+    find_package(Restbed REQUIRED)
+    pkg_search_module(Jsoncpp jsoncpp)
 endif()

 # Build flags
-set (CMAKE_CXX_STANDARD 14)
+set (CMAKE_CXX_STANDARD 11)
 set (CMAKE_CXX_STANDARD_REQUIRED on)
 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-return-type -Wall -Wextra -Wnon-virtual-dtor -pedantic-errors -fvisibility=hidden")
 if (OPENDHT_SANITIZE)
@@ -81,7 +63,6 @@ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DMSGPACK_DISABLE_LEGACY_NIL -DMSGPACK_
 if (NOT CMAKE_BUILD_TYPE)
    set(CMAKE_BUILD_TYPE Release)
 endif ()
-add_definitions(-DPACKAGE_VERSION="${opendht_VERSION}")
 if (OPENDHT_LOG)
    add_definitions(-DOPENDHT_LOG=true)
 else ()
@@ -106,8 +87,8 @@ endif ()
 if (Nettle_INCLUDE_DIRS)
    include_directories (SYSTEM "${Nettle_INCLUDE_DIRS}")
 endif ()
-if (Restinio_INCLUDE_DIR)
-    include_directories (SYSTEM "${Restinio_INCLUDE_DIR}")
+if (RESTBED_INCLUDE)
+    include_directories (SYSTEM "${RESTBED_INCLUDE}")
 endif ()
 if (Jsoncpp_INCLUDE_DIRS)
    include_directories (SYSTEM "${Jsoncpp_INCLUDE_DIRS}")
@@ -156,9 +137,6 @@ list (APPEND opendht_SOURCES
    src/securedht.cpp
    src/dhtrunner.cpp
    src/log.cpp
-    src/peer_discovery.cpp
-    src/network_utils.cpp
-    src/thread_pool.cpp
 )

 list (APPEND opendht_HEADERS
@@ -182,16 +160,9 @@ list (APPEND opendht_HEADERS
    include/opendht/securedht.h
    include/opendht/log.h
    include/opendht/log_enable.h
-    include/opendht/peer_discovery.h
-    include/opendht/thread_pool.h
-    include/opendht/network_utils.h
    include/opendht.h
 )

-if (OPENDHT_PYTHON)
-    message("Indexation enabled since it is required for Python support")
-    set(OPENDHT_INDEX ON)
-endif()
 if (OPENDHT_INDEX)
    list (APPEND opendht_SOURCES src/indexation/pht.cpp)
    list (APPEND opendht_HEADERS include/opendht/indexation/pht.h)
@@ -199,9 +170,11 @@ if (OPENDHT_INDEX)
 endif()

 if (OPENDHT_PROXY_SERVER)
-  add_definitions(-DOPENDHT_PROXY_SERVER)
+  add_definitions(-DOPENDHT_PROXY_SERVER=true)
  if (OPENDHT_PROXY_SERVER_IDENTITY)
-    add_definitions(-DOPENDHT_PROXY_SERVER_IDENTITY)
+    add_definitions(-DOPENDHT_PROXY_SERVER_IDENTITY=true)
+  else ()
+    add_definitions(-DOPENDHT_PROXY_SERVER_IDENTITY=false)
  endif()
  list (APPEND opendht_HEADERS
    include/opendht/dht_proxy_server.h
@@ -209,32 +182,38 @@ 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 ()

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

 if (OPENDHT_PROXY_SERVER OR OPENDHT_PROXY_CLIENT)
-  if (OPENDHT_PUSH_NOTIFICATIONS)
-    message("Using push notification")
-    add_definitions(-DOPENDHT_PUSH_NOTIFICATIONS)
-  endif ()
  list (APPEND opendht_HEADERS
    include/opendht/proxy.h
-    include/opendht/http.h
  )
  list (APPEND opendht_SOURCES
-    src/http.cpp
+    src/base64.h
+    src/base64.cpp
  )
 endif ()

+
 if(OPENDHT_ARGON2)
    # make sure argon2 submodule is up to date and initialized
    message("Initializing Argon2 submodule")
@@ -259,15 +238,16 @@ if (OPENDHT_STATIC)
        ${opendht_HEADERS}
    )
    set_target_properties (opendht-static PROPERTIES OUTPUT_NAME "opendht")
+    if (OPENDHT_LTO)
+        target_link_libraries(opendht-static -flto -fuse-linker-plugin)
+    endif ()
    if (OPENDHT_ARGON2)
        target_include_directories(opendht-static SYSTEM PRIVATE argon2)
    else ()
+        target_link_libraries(opendht-static ${argon2_LIBRARIES})
        target_include_directories(opendht-static SYSTEM PRIVATE ${argon2_INCLUDE_DIRS})
    endif ()
-    target_link_libraries(opendht-static
-        PRIVATE  ${argon2_LIBRARIES}
-        PUBLIC ${CMAKE_THREAD_LIBS_INIT} ${GNUTLS_LIBRARIES} ${Nettle_LIBRARIES}
-               ${Jsoncpp_LIBRARIES} ${FMT_LIBRARY} ${HTTP_PARSER_LIBRARY})
+    target_link_libraries(opendht-static ${CMAKE_THREAD_LIBS_INIT} ${GNUTLS_LIBRARIES} ${Nettle_LIBRARIES} ${Restbed_LIBRARIES} ${Jsoncpp_LIBRARIES})
    install (TARGETS opendht-static DESTINATION ${CMAKE_INSTALL_LIBDIR} EXPORT opendht)
 endif ()

@@ -279,18 +259,16 @@ if (OPENDHT_SHARED)
    set_target_properties (opendht PROPERTIES IMPORT_SUFFIX "_import.lib")
    set_target_properties (opendht PROPERTIES SOVERSION ${opendht_VERSION_MAJOR} VERSION ${opendht_VERSION})
    target_compile_definitions(opendht PRIVATE OPENDHT_BUILD)
+    if (OPENDHT_LTO)
+        target_link_libraries(opendht PRIVATE -flto -fuse-linker-plugin)
+    endif ()
    if (OPENDHT_ARGON2)
        target_include_directories(opendht SYSTEM PRIVATE argon2)
    else ()
        target_link_libraries(opendht PRIVATE ${argon2_LIBRARIES})
        target_include_directories(opendht SYSTEM PRIVATE ${argon2_INCLUDE_DIRS})
    endif ()
-    target_link_libraries(opendht
-        PUBLIC ${CMAKE_THREAD_LIBS_INIT}
-        PRIVATE ${GNUTLS_LIBRARIES} ${Nettle_LIBRARIES}
-                ${Jsoncpp_LIBRARIES}
-                ${FMT_LIBRARY} ${HTTP_PARSER_LIBRARY})
-
+    target_link_libraries(opendht PRIVATE ${CMAKE_THREAD_LIBS_INIT} ${GNUTLS_LIBRARIES} ${Nettle_LIBRARIES} ${Restbed_LIBRARIES} ${Jsoncpp_LIBRARIES})
    install (TARGETS opendht DESTINATION ${CMAKE_INSTALL_LIBDIR} EXPORT opendht)
 endif ()

@@ -323,44 +301,26 @@ install (EXPORT opendht DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/opendht FILE o
 install (FILES ${CMAKE_CURRENT_BINARY_DIR}/opendhtConfigVersion.cmake DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/opendht)

 # Unit tests
-if (OPENDHT_TESTS)
+IF(OPENDHT_TESTS)
  FIND_PACKAGE(Cppunit REQUIRED)
  # unit testing
-    list (APPEND test_FILES
-      tests/infohashtester.h
-      tests/infohashtester.cpp
-      tests/valuetester.h
-      tests/valuetester.cpp
-      tests/cryptotester.h
-      tests/cryptotester.cpp
-      tests/dhtrunnertester.h
-      tests/dhtrunnertester.cpp
-      tests/peerdiscoverytester.h
-      tests/peerdiscoverytester.cpp
-      tests/threadpooltester.h
-      tests/threadpooltester.cpp
-    )
-    if (OPENDHT_PROXY_SERVER AND OPENDHT_PROXY_CLIENT)
-      list (APPEND test_FILES
-        tests/dhtproxytester.h
-        tests/dhtproxytester.cpp
-      )
-    endif()
    add_executable(opendht_unit_tests
      tests/tests_runner.cpp
-      ${test_FILES}
+      tests/infohashtester.h
+      tests/infohashtester.cpp
+      tests/dhtrunnertester.h
+      tests/dhtrunnertester.cpp
    )
-    target_include_directories(opendht_unit_tests SYSTEM PRIVATE ${CPPUNIT_INCLUDE_DIRS})
    if (OPENDHT_SHARED)
-      target_link_libraries(opendht_unit_tests opendht)
+      TARGET_LINK_LIBRARIES(opendht_unit_tests opendht)
    else ()
-      target_link_libraries(opendht_unit_tests opendht-static)
+      TARGET_LINK_LIBRARIES(opendht_unit_tests opendht-static)
    endif ()
-    target_link_libraries(opendht_unit_tests
+    TARGET_LINK_LIBRARIES(opendht_unit_tests
       ${CMAKE_THREAD_LIBS_INIT}
       ${CPPUNIT_LIBRARIES}
       ${GNUTLS_LIBRARIES}
    )
    enable_testing()
    add_test(TEST opendht_unit_tests)
-endif()
+ENDIF()
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="Debug|Win32">
      <Configuration>Debug</Configuration>
@@ -21,32 +21,32 @@
  <PropertyGroup Label="Globals">
    <ProjectGuid>{8BE7F14D-B227-4D54-9105-7E5473F2D0BA}</ProjectGuid>
    <RootNamespace>dhtchat</RootNamespace>
-    <WindowsTargetPlatformVersion>$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
    <CharacterSet>MultiByte</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>MultiByte</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
    <CharacterSet>MultiByte</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>MultiByte</CharacterSet>
  </PropertyGroup>
@@ -86,14 +86,14 @@
      <WarningLevel>Level3</WarningLevel>
      <Optimization>Disabled</Optimization>
      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\include;$(ProjectDir)..\include\opendht;$(ProjectDir)..\..\..\msvc\include;$(ProjectDir)..\..\include;$(ProjectDir)..\..\argon2\include;$(ProjectDir)..\..\msgpack-c\include;$(ProjectDir)..\..\jsoncpp\include;$(ProjectDir)..\..\restbed\source;$(ProjectDir)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>OPENDHT_JSONCPP;OPENDHT_PROXY_CLIENT;OPENDHT_PROXY_SERVER;OPENDHT_PUSH_NOTIFICATIONS;_WINSOCK_DEPRECATED_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;WIN32_NATIVE;WIN32_LEAN_AND_MEAN;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\include;..\..\msgpack-c\include;$(ProjectDir)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32_NATIVE;WIN32_LEAN_AND_MEAN;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <DisableSpecificWarnings>4804;4267;4244;4800;4273;</DisableSpecificWarnings>
      <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
    </ClCompile>
    <Link>
-      <AdditionalDependencies>restbed.lib;libeay32.lib;ssleay32.lib;crypt32.lib;Argon2Ref.lib;lib_json.lib;libgnutls.lib;libopendht.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(ProjectDir)..\..\..\msvc\lib\$(PlatformTarget);$(ProjectDir)..\..\restbed\build\Release;$(ProjectDir)..\..\restbed\dependency\openssl\out32dll;$(ProjectDir)..\..\argon2\vs2015\Argon2Ref\vs2015\build</AdditionalLibraryDirectories>
+      <AdditionalDependencies>crypt32.lib;blake.lib;argon.lib;libgnutls.lib;opendht.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(ProjectDir)..\..\lib\x64</AdditionalLibraryDirectories>
      <AdditionalOptions>/ignore:4049 %(AdditionalOptions)</AdditionalOptions>
    </Link>
  </ItemDefinitionGroup>
@@ -102,14 +102,14 @@
      <WarningLevel>Level3</WarningLevel>
      <Optimization>Disabled</Optimization>
      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\include;$(ProjectDir)..\include\opendht;$(ProjectDir)..\..\..\msvc\include;$(ProjectDir)..\..\include;$(ProjectDir)..\..\argon2\include;$(ProjectDir)..\..\msgpack-c\include;$(ProjectDir)..\..\jsoncpp\include;$(ProjectDir)..\..\restbed\source;$(ProjectDir)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>OPENDHT_JSONCPP;OPENDHT_PROXY_CLIENT;OPENDHT_PROXY_SERVER;OPENDHT_PUSH_NOTIFICATIONS;_WINSOCK_DEPRECATED_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;WIN32_NATIVE;WIN32_LEAN_AND_MEAN;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\include;..\..\msgpack-c\include;$(ProjectDir)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32_NATIVE;WIN32_LEAN_AND_MEAN;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <DisableSpecificWarnings>4804;4267;4244;4800;4273;</DisableSpecificWarnings>
      <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
    </ClCompile>
    <Link>
-      <AdditionalDependencies>restbed.lib;libeay32.lib;ssleay32.lib;crypt32.lib;Argon2Ref.lib;lib_json.lib;libgnutls.lib;libopendht.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(ProjectDir)..\..\..\msvc\lib\$(PlatformTarget);$(ProjectDir)..\..\restbed\build\Release;$(ProjectDir)..\..\restbed\dependency\openssl\out32dll;$(ProjectDir)..\..\argon2\vs2015\Argon2Ref\vs2015\build</AdditionalLibraryDirectories>
+      <AdditionalDependencies>crypt32.lib;blake.lib;argon.lib;libgnutls.lib;opendht.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(ProjectDir)..\..\lib\x64</AdditionalLibraryDirectories>
      <AdditionalOptions>/ignore:4049 %(AdditionalOptions)</AdditionalOptions>
    </Link>
  </ItemDefinitionGroup>
@@ -120,16 +120,16 @@
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <IntrinsicFunctions>true</IntrinsicFunctions>
      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\include;$(ProjectDir)..\include\opendht;$(ProjectDir)..\..\..\msvc\include;$(ProjectDir)..\..\include;$(ProjectDir)..\..\argon2\include;$(ProjectDir)..\..\msgpack-c\include;$(ProjectDir)..\..\jsoncpp\include;$(ProjectDir)..\..\restbed\source;$(ProjectDir)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>OPENDHT_JSONCPP;OPENDHT_PROXY_CLIENT;OPENDHT_PROXY_SERVER;OPENDHT_PUSH_NOTIFICATIONS;_WINSOCK_DEPRECATED_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;WIN32_NATIVE;WIN32_LEAN_AND_MEAN;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\include;..\..\msgpack-c\include;$(ProjectDir)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32_NATIVE;WIN32_LEAN_AND_MEAN;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <DisableSpecificWarnings>4804;4267;4244;4800;4273;</DisableSpecificWarnings>
      <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
    </ClCompile>
    <Link>
      <EnableCOMDATFolding>true</EnableCOMDATFolding>
      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>restbed.lib;libeay32.lib;ssleay32.lib;crypt32.lib;Argon2Ref.lib;lib_json.lib;libgnutls.lib;libopendht.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(ProjectDir)..\..\..\msvc\lib\$(PlatformTarget);$(ProjectDir)..\..\restbed\build\Release;$(ProjectDir)..\..\restbed\dependency\openssl\out32dll;$(ProjectDir)..\..\argon2\vs2015\Argon2Ref\vs2015\build</AdditionalLibraryDirectories>
+      <AdditionalDependencies>crypt32.lib;blake.lib;argon.lib;libgnutls.lib;opendht.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(ProjectDir)..\..\lib\x64</AdditionalLibraryDirectories>
      <AdditionalOptions>/ignore:4049 %(AdditionalOptions)</AdditionalOptions>
    </Link>
  </ItemDefinitionGroup>
@@ -140,16 +140,16 @@
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <IntrinsicFunctions>true</IntrinsicFunctions>
      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\include;$(ProjectDir)..\include\opendht;$(ProjectDir)..\..\..\msvc\include;$(ProjectDir)..\..\include;$(ProjectDir)..\..\argon2\include;$(ProjectDir)..\..\msgpack-c\include;$(ProjectDir)..\..\jsoncpp\include;$(ProjectDir)..\..\restbed\source;$(ProjectDir)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>OPENDHT_JSONCPP;OPENDHT_PROXY_CLIENT;OPENDHT_PROXY_SERVER;OPENDHT_PUSH_NOTIFICATIONS;_WINSOCK_DEPRECATED_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;WIN32_NATIVE;WIN32_LEAN_AND_MEAN;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\include;$(ProjectDir)contrib\build\include;$(ProjectDir)contrib\build\msgpack-c\include;$(ProjectDir)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32_NATIVE;WIN32_LEAN_AND_MEAN;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <DisableSpecificWarnings>4804;4267;4244;4800;4273;</DisableSpecificWarnings>
      <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
    </ClCompile>
    <Link>
      <EnableCOMDATFolding>true</EnableCOMDATFolding>
      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>restbed.lib;libeay32.lib;ssleay32.lib;crypt32.lib;Argon2Ref.lib;lib_json.lib;libgnutls.lib;libopendht.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(ProjectDir)..\..\..\msvc\lib\$(PlatformTarget);$(ProjectDir)..\..\restbed\build\Release;$(ProjectDir)..\..\restbed\dependency\openssl\out32dll;$(ProjectDir)..\..\argon2\vs2015\Argon2Ref\vs2015\build</AdditionalLibraryDirectories>
+      <AdditionalDependencies>crypt32.lib;Argon2Ref.lib;libgnutls.lib;opendht.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(ProjectDir)contrib\build\lib\x64;$(ProjectDir)..\..\lib\x64;$(ProjectDir)vs2015\build</AdditionalLibraryDirectories>
      <AdditionalOptions>/ignore:4049 %(AdditionalOptions)</AdditionalOptions>
      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
    </Link>
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="Debug|Win32">
      <Configuration>Debug</Configuration>
@@ -21,32 +21,32 @@
  <PropertyGroup Label="Globals">
    <ProjectGuid>{BF92AECF-AA1D-4B05-9D00-0247E92A24B5}</ProjectGuid>
    <RootNamespace>dhtnode</RootNamespace>
-    <WindowsTargetPlatformVersion>$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
    <CharacterSet>MultiByte</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>MultiByte</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
    <CharacterSet>MultiByte</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>MultiByte</CharacterSet>
  </PropertyGroup>
@@ -86,14 +86,14 @@
      <WarningLevel>Level3</WarningLevel>
      <Optimization>Disabled</Optimization>
      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\include;$(ProjectDir)..\include\opendht;$(ProjectDir)..\..\..\msvc\include;$(ProjectDir)..\..\include;$(ProjectDir)..\..\argon2\include;$(ProjectDir)..\..\msgpack-c\include;$(ProjectDir)..\..\jsoncpp\include;$(ProjectDir)..\..\restbed\source;$(ProjectDir)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>OPENDHT_JSONCPP;OPENDHT_PROXY_CLIENT;OPENDHT_PROXY_SERVER;OPENDHT_PUSH_NOTIFICATIONS;_WINSOCK_DEPRECATED_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;WIN32_NATIVE;WIN32_LEAN_AND_MEAN;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\include;..\..\msgpack-c\include;$(ProjectDir)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32_NATIVE;WIN32_LEAN_AND_MEAN;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <DisableSpecificWarnings>4804;4267;4244;4800;4273;4101;</DisableSpecificWarnings>
      <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
    </ClCompile>
    <Link>
-      <AdditionalDependencies>restbed.lib;libeay32.lib;ssleay32.lib;crypt32.lib;Argon2Ref.lib;lib_json.lib;libgnutls.lib;libopendht.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(ProjectDir)..\..\..\msvc\lib\$(PlatformTarget);$(ProjectDir)..\..\restbed\build\Release;$(ProjectDir)..\..\restbed\dependency\openssl\out32dll;$(ProjectDir)..\..\argon2\vs2015\Argon2Ref\vs2015\build</AdditionalLibraryDirectories>
+      <AdditionalDependencies>crypt32.lib;blake.lib;argon.lib;libgnutls.lib;opendht.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(ProjectDir)..\..\lib\x64</AdditionalLibraryDirectories>
      <AdditionalOptions>/ignore:4049 %(AdditionalOptions)</AdditionalOptions>
    </Link>
  </ItemDefinitionGroup>
@@ -102,14 +102,14 @@
      <WarningLevel>Level3</WarningLevel>
      <Optimization>Disabled</Optimization>
      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\include;$(ProjectDir)..\include\opendht;$(ProjectDir)..\..\..\msvc\include;$(ProjectDir)..\..\include;$(ProjectDir)..\..\argon2\include;$(ProjectDir)..\..\msgpack-c\include;$(ProjectDir)..\..\jsoncpp\include;$(ProjectDir)..\..\restbed\source;$(ProjectDir)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>OPENDHT_JSONCPP;OPENDHT_PROXY_CLIENT;OPENDHT_PROXY_SERVER;OPENDHT_PUSH_NOTIFICATIONS;_WINSOCK_DEPRECATED_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;WIN32_NATIVE;WIN32_LEAN_AND_MEAN;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\include;..\..\msgpack-c\include;$(ProjectDir)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32_NATIVE;WIN32_LEAN_AND_MEAN;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <DisableSpecificWarnings>4804;4267;4244;4800;4273;4101;</DisableSpecificWarnings>
      <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
    </ClCompile>
    <Link>
-      <AdditionalDependencies>restbed.lib;libeay32.lib;ssleay32.lib;crypt32.lib;Argon2Ref.lib;lib_json.lib;libgnutls.lib;libopendht.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(ProjectDir)..\..\..\msvc\lib\$(PlatformTarget);$(ProjectDir)..\..\restbed\build\Release;$(ProjectDir)..\..\restbed\dependency\openssl\out32dll;$(ProjectDir)..\..\argon2\vs2015\Argon2Ref\vs2015\build</AdditionalLibraryDirectories>
+      <AdditionalDependencies>crypt32.lib;blake.lib;argon.lib;libgnutls.lib;opendht.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(ProjectDir)..\..\lib\x64</AdditionalLibraryDirectories>
      <AdditionalOptions>/ignore:4049 %(AdditionalOptions)</AdditionalOptions>
    </Link>
  </ItemDefinitionGroup>
@@ -120,16 +120,16 @@
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <IntrinsicFunctions>true</IntrinsicFunctions>
      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\include;$(ProjectDir)..\include\opendht;$(ProjectDir)..\..\..\msvc\include;$(ProjectDir)..\..\include;$(ProjectDir)..\..\argon2\include;$(ProjectDir)..\..\msgpack-c\include;$(ProjectDir)..\..\jsoncpp\include;$(ProjectDir)..\..\restbed\source;$(ProjectDir)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>OPENDHT_JSONCPP;OPENDHT_PROXY_CLIENT;OPENDHT_PROXY_SERVER;OPENDHT_PUSH_NOTIFICATIONS;_WINSOCK_DEPRECATED_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;WIN32_NATIVE;WIN32_LEAN_AND_MEAN;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\include;..\..\msgpack-c\include;$(ProjectDir)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32_NATIVE;WIN32_LEAN_AND_MEAN;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <DisableSpecificWarnings>4804;4267;4244;4800;4273;4101;</DisableSpecificWarnings>
      <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
    </ClCompile>
    <Link>
      <EnableCOMDATFolding>true</EnableCOMDATFolding>
      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>restbed.lib;libeay32.lib;ssleay32.lib;crypt32.lib;Argon2Ref.lib;lib_json.lib;libgnutls.lib;libopendht.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(ProjectDir)..\..\..\msvc\lib\$(PlatformTarget);$(ProjectDir)..\..\restbed\build\Release;$(ProjectDir)..\..\restbed\dependency\openssl\out32dll;$(ProjectDir)..\..\argon2\vs2015\Argon2Ref\vs2015\build</AdditionalLibraryDirectories>
+      <AdditionalDependencies>crypt32.lib;blake.lib;argon.lib;libgnutls.lib;opendht.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(ProjectDir)..\..\lib\x64</AdditionalLibraryDirectories>
      <AdditionalOptions>/ignore:4049 %(AdditionalOptions)</AdditionalOptions>
    </Link>
  </ItemDefinitionGroup>
@@ -140,16 +140,16 @@
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <IntrinsicFunctions>true</IntrinsicFunctions>
      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\include;$(ProjectDir)..\include\opendht;$(ProjectDir)..\..\..\msvc\include;$(ProjectDir)..\..\include;$(ProjectDir)..\..\argon2\include;$(ProjectDir)..\..\msgpack-c\include;$(ProjectDir)..\..\jsoncpp\include;$(ProjectDir)..\..\restbed\source;$(ProjectDir)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>OPENDHT_JSONCPP;OPENDHT_PROXY_CLIENT;OPENDHT_PROXY_SERVER;OPENDHT_PUSH_NOTIFICATIONS;_WINSOCK_DEPRECATED_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;WIN32_NATIVE;WIN32_LEAN_AND_MEAN;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\include;$(ProjectDir)contrib\build\include;$(ProjectDir)contrib\build\msgpack-c\include;$(ProjectDir)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32_NATIVE;WIN32_LEAN_AND_MEAN;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <DisableSpecificWarnings>4804;4267;4244;4800;4273;4101;</DisableSpecificWarnings>
      <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
    </ClCompile>
    <Link>
      <EnableCOMDATFolding>true</EnableCOMDATFolding>
      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>restbed.lib;libeay32.lib;ssleay32.lib;crypt32.lib;Argon2Ref.lib;lib_json.lib;libgnutls.lib;libopendht.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(ProjectDir)..\..\..\msvc\lib\$(PlatformTarget);$(ProjectDir)..\..\restbed\build\Release;$(ProjectDir)..\..\restbed\dependency\openssl\out32dll;$(ProjectDir)..\..\argon2\vs2015\Argon2Ref\vs2015\build</AdditionalLibraryDirectories>
+      <AdditionalDependencies>crypt32.lib;Argon2Ref.lib;libgnutls.lib;opendht.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(ProjectDir)contrib\build\lib\x64;$(ProjectDir)..\..\lib\x64;$(ProjectDir)vs2015\build</AdditionalLibraryDirectories>
      <AdditionalOptions>/ignore:4049 %(AdditionalOptions)</AdditionalOptions>
      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
    </Link>
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="Debug|Win32">
      <Configuration>Debug</Configuration>
@@ -21,32 +21,32 @@
  <PropertyGroup Label="Globals">
    <ProjectGuid>{78443BCD-4689-4007-A246-F8F34B27F561}</ProjectGuid>
    <RootNamespace>dhtscanner</RootNamespace>
-    <WindowsTargetPlatformVersion>$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
    <CharacterSet>MultiByte</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>MultiByte</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
    <CharacterSet>MultiByte</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>MultiByte</CharacterSet>
  </PropertyGroup>
@@ -86,14 +86,14 @@
      <WarningLevel>Level3</WarningLevel>
      <Optimization>Disabled</Optimization>
      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\include;$(ProjectDir)..\include\opendht;$(ProjectDir)..\..\..\msvc\include;$(ProjectDir)..\..\include;$(ProjectDir)..\..\argon2\include;$(ProjectDir)..\..\msgpack-c\include;$(ProjectDir)..\..\jsoncpp\include;$(ProjectDir)..\..\restbed\source;$(ProjectDir)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>OPENDHT_JSONCPP;OPENDHT_PROXY_CLIENT;OPENDHT_PROXY_SERVER;OPENDHT_PUSH_NOTIFICATIONS;_WINSOCK_DEPRECATED_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;WIN32_NATIVE;WIN32_LEAN_AND_MEAN;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\include;..\..\msgpack-c\include;$(ProjectDir)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32_NATIVE;WIN32_LEAN_AND_MEAN;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <DisableSpecificWarnings>4804;4267;4244;4800;4273;4101;</DisableSpecificWarnings>
      <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
    </ClCompile>
    <Link>
-      <AdditionalDependencies>restbed.lib;libeay32.lib;ssleay32.lib;crypt32.lib;Argon2Ref.lib;lib_json.lib;libgnutls.lib;libopendht.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(ProjectDir)..\..\..\msvc\lib\$(PlatformTarget);$(ProjectDir)..\..\restbed\build\Release;$(ProjectDir)..\..\restbed\dependency\openssl\out32dll;$(ProjectDir)..\..\argon2\vs2015\Argon2Ref\vs2015\build</AdditionalLibraryDirectories>
+      <AdditionalDependencies>crypt32.lib;blake.lib;argon.lib;libgnutls.lib;opendht.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(ProjectDir)..\..\lib\x64</AdditionalLibraryDirectories>
      <AdditionalOptions>/ignore:4049 %(AdditionalOptions)</AdditionalOptions>
    </Link>
  </ItemDefinitionGroup>
@@ -102,14 +102,14 @@
      <WarningLevel>Level3</WarningLevel>
      <Optimization>Disabled</Optimization>
      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\include;$(ProjectDir)..\include\opendht;$(ProjectDir)..\..\..\msvc\include;$(ProjectDir)..\..\include;$(ProjectDir)..\..\argon2\include;$(ProjectDir)..\..\msgpack-c\include;$(ProjectDir)..\..\jsoncpp\include;$(ProjectDir)..\..\restbed\source;$(ProjectDir)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>OPENDHT_JSONCPP;OPENDHT_PROXY_CLIENT;OPENDHT_PROXY_SERVER;OPENDHT_PUSH_NOTIFICATIONS;_WINSOCK_DEPRECATED_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;WIN32_NATIVE;WIN32_LEAN_AND_MEAN;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\include;..\..\msgpack-c\include;$(ProjectDir)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32_NATIVE;WIN32_LEAN_AND_MEAN;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <DisableSpecificWarnings>4804;4267;4244;4800;4273;4101;</DisableSpecificWarnings>
      <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
    </ClCompile>
    <Link>
-      <AdditionalDependencies>restbed.lib;libeay32.lib;ssleay32.lib;crypt32.lib;Argon2Ref.lib;lib_json.lib;libgnutls.lib;libopendht.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(ProjectDir)..\..\..\msvc\lib\$(PlatformTarget);$(ProjectDir)..\..\restbed\build\Release;$(ProjectDir)..\..\restbed\dependency\openssl\out32dll;$(ProjectDir)..\..\argon2\vs2015\Argon2Ref\vs2015\build</AdditionalLibraryDirectories>
+      <AdditionalDependencies>crypt32.lib;blake.lib;argon.lib;libgnutls.lib;opendht.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(ProjectDir)..\..\lib\x64</AdditionalLibraryDirectories>
      <AdditionalOptions>/ignore:4049 %(AdditionalOptions)</AdditionalOptions>
    </Link>
  </ItemDefinitionGroup>
@@ -120,16 +120,16 @@
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <IntrinsicFunctions>true</IntrinsicFunctions>
      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\include;$(ProjectDir)..\include\opendht;$(ProjectDir)..\..\..\msvc\include;$(ProjectDir)..\..\include;$(ProjectDir)..\..\argon2\include;$(ProjectDir)..\..\msgpack-c\include;$(ProjectDir)..\..\jsoncpp\include;$(ProjectDir)..\..\restbed\source;$(ProjectDir)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>OPENDHT_JSONCPP;OPENDHT_PROXY_CLIENT;OPENDHT_PROXY_SERVER;OPENDHT_PUSH_NOTIFICATIONS;_WINSOCK_DEPRECATED_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;WIN32_NATIVE;WIN32_LEAN_AND_MEAN;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\include;..\..\msgpack-c\include;$(ProjectDir)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32_NATIVE;WIN32_LEAN_AND_MEAN;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <DisableSpecificWarnings>4804;4267;4244;4800;4273;4101;</DisableSpecificWarnings>
      <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
    </ClCompile>
    <Link>
      <EnableCOMDATFolding>true</EnableCOMDATFolding>
      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>restbed.lib;libeay32.lib;ssleay32.lib;crypt32.lib;Argon2Ref.lib;lib_json.lib;libgnutls.lib;libopendht.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(ProjectDir)..\..\..\msvc\lib\$(PlatformTarget);$(ProjectDir)..\..\restbed\build\Release;$(ProjectDir)..\..\restbed\dependency\openssl\out32dll;$(ProjectDir)..\..\argon2\vs2015\Argon2Ref\vs2015\build</AdditionalLibraryDirectories>
+      <AdditionalDependencies>crypt32.lib;blake.lib;argon.lib;libgnutls.lib;opendht.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(ProjectDir)..\..\lib\x64</AdditionalLibraryDirectories>
      <AdditionalOptions>/ignore:4049 %(AdditionalOptions)</AdditionalOptions>
    </Link>
  </ItemDefinitionGroup>
@@ -140,16 +140,16 @@
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <IntrinsicFunctions>true</IntrinsicFunctions>
      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\include;$(ProjectDir)..\include\opendht;$(ProjectDir)..\..\..\msvc\include;$(ProjectDir)..\..\include;$(ProjectDir)..\..\argon2\include;$(ProjectDir)..\..\msgpack-c\include;$(ProjectDir)..\..\jsoncpp\include;$(ProjectDir)..\..\restbed\source;$(ProjectDir)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>OPENDHT_JSONCPP;OPENDHT_PROXY_CLIENT;OPENDHT_PROXY_SERVER;OPENDHT_PUSH_NOTIFICATIONS;_WINSOCK_DEPRECATED_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;WIN32_NATIVE;WIN32_LEAN_AND_MEAN;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\include;$(ProjectDir)contrib\build\include;$(ProjectDir)contrib\build\msgpack-c\include;$(ProjectDir)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32_NATIVE;WIN32_LEAN_AND_MEAN;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <DisableSpecificWarnings>4804;4267;4244;4800;4273;4101;</DisableSpecificWarnings>
      <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
    </ClCompile>
    <Link>
      <EnableCOMDATFolding>true</EnableCOMDATFolding>
      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>restbed.lib;libeay32.lib;ssleay32.lib;crypt32.lib;Argon2Ref.lib;lib_json.lib;libgnutls.lib;libopendht.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(ProjectDir)..\..\..\msvc\lib\$(PlatformTarget);$(ProjectDir)..\..\restbed\build\Release;$(ProjectDir)..\..\restbed\dependency\openssl\out32dll;$(ProjectDir)..\..\argon2\vs2015\Argon2Ref\vs2015\build</AdditionalLibraryDirectories>
+      <AdditionalDependencies>crypt32.lib;Argon2Ref.lib;libgnutls.lib;opendht.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(ProjectDir)contrib\build\lib\x64;$(ProjectDir)..\..\lib\x64;$(ProjectDir)vs2015\build</AdditionalLibraryDirectories>
      <AdditionalOptions>/ignore:4049 %(AdditionalOptions)</AdditionalOptions>
      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
    </Link>
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="Debug|Win32">
      <Configuration>Debug</Configuration>
@@ -19,17 +19,6 @@
    </ProjectConfiguration>
  </ItemGroup>
  <ItemGroup>
-    <ClCompile Include="..\src\dht_proxy_client.cpp" />
-    <ClCompile Include="..\src\network_utils.cpp" />
-    <ClCompile Include="..\src\op_cache.cpp" />
-    <ClCompile Include="..\src\peer_discovery.cpp" />
-    <ClCompile Include="..\src\rng.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\src\thread_pool.cpp" />
    <ClCompile Include="wingetopt.c" />
    <ClCompile Include="..\src\base64.cpp" />
    <ClCompile Include="..\src\callbacks.cpp" />
@@ -50,8 +39,6 @@
    <ClCompile Include="..\src\value.cpp" />
  </ItemGroup>
  <ItemGroup>
-    <ClInclude Include="..\src\network_utils.h" />
-    <ClInclude Include="..\src\thread_pool.h" />
    <ClInclude Include="unistd.h" />
    <ClInclude Include="wingetopt.h" />
    <ClInclude Include="..\include\opendht.h" />
@@ -88,32 +75,32 @@
  <PropertyGroup Label="Globals">
    <ProjectGuid>{711397CE-E5D5-467D-9457-8716C047E50C}</ProjectGuid>
    <RootNamespace>opendht</RootNamespace>
-    <WindowsTargetPlatformVersion>$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
    <CharacterSet>MultiByte</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
    <WholeProgramOptimization>false</WholeProgramOptimization>
    <CharacterSet>MultiByte</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
    <CharacterSet>MultiByte</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
    <WholeProgramOptimization>false</WholeProgramOptimization>
    <CharacterSet>MultiByte</CharacterSet>
  </PropertyGroup>
@@ -136,34 +123,33 @@
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
+    <OutDir>$(ProjectDir)..\..\</OutDir>
    <IntDir>$(Platform)\$(Configuration)\</IntDir>
-    <TargetName>libopendht</TargetName>
+    <TargetName>opendhtd</TargetName>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
+    <OutDir>$(ProjectDir)..\..\</OutDir>
    <IntDir>$(Platform)\$(Configuration)\</IntDir>
-    <TargetName>libopendht</TargetName>
+    <TargetName>opendht</TargetName>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
-    <TargetName>libopendht</TargetName>
+    <OutDir>$(ProjectDir)..\..\</OutDir>
+    <TargetName>opendhtd</TargetName>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
-    <TargetName>libopendht</TargetName>
+    <OutDir>$(ProjectDir)..\..\</OutDir>
+    <TargetName>opendht</TargetName>
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <ClCompile>
      <WarningLevel>Level3</WarningLevel>
      <Optimization>Disabled</Optimization>
      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\include;$(ProjectDir)..\include\opendht;$(ProjectDir)..\..\..\msvc\include;$(ProjectDir)..\..\include;$(ProjectDir)..\..\argon2\include;$(ProjectDir)..\..\msgpack-c\include;$(ProjectDir)..\..\jsoncpp\include;$(ProjectDir)..\..\restbed\source</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>OPENDHT_JSONCPP;OPENDHT_PROXY_CLIENT;OPENDHT_PROXY_SERVER;OPENDHT_PUSH_NOTIFICATIONS;_WINSOCK_DEPRECATED_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;WIN32_NATIVE;WIN32_LEAN_AND_MEAN;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <DisableSpecificWarnings>4804;4800;4101;4267;4244;4503;4273;</DisableSpecificWarnings>
-      <AdditionalOptions>-D_SCL_SECURE_NO_WARNINGS  %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>..\..\include;..\include;..\include\opendht;..\..\msgpack-c\include;</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32_NATIVE;WIN32_LEAN_AND_MEAN;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <DisableSpecificWarnings>4804;4800;4101;4267;4244;4503;</DisableSpecificWarnings>
+      <AdditionalOptions>-D_SCL_SECURE_NO_WARNINGS %(AdditionalOptions)</AdditionalOptions>
      <SuppressStartupBanner>false</SuppressStartupBanner>
-      <ProgramDataBaseFileName>$(OutDir)lib\$(PlatformTarget)\$(TargetName).pdb</ProgramDataBaseFileName>
    </ClCompile>
    <PostBuildEvent>
      <Command>mkdir $(OutDir)\include
@@ -174,7 +160,7 @@ copy ..\include\opendht\*.h $(OutDir)\include\opendht
 copy ..\include\opendht.h $(OutDir)\include\</Command>
    </PostBuildEvent>
    <Lib>
-      <OutputFile>$(OutDir)lib\$(PlatformTarget)\$(TargetName)$(TargetExt)</OutputFile>
+      <OutputFile>$(OutDir)\lib\x86\$(TargetName)$(TargetExt)</OutputFile>
    </Lib>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -182,11 +168,10 @@ copy ..\include\opendht.h $(OutDir)\include\</Command>
      <WarningLevel>Level3</WarningLevel>
      <Optimization>Disabled</Optimization>
      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\include;$(ProjectDir)..\include\opendht;$(ProjectDir)..\..\..\msvc\include;$(ProjectDir)..\..\include;$(ProjectDir)..\..\argon2\include;$(ProjectDir)..\..\msgpack-c\include;$(ProjectDir)..\..\jsoncpp\include;$(ProjectDir)..\..\restbed\source</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>OPENDHT_JSONCPP;OPENDHT_PROXY_CLIENT;OPENDHT_PROXY_SERVER;OPENDHT_PUSH_NOTIFICATIONS;_WINSOCK_DEPRECATED_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;WIN32_NATIVE;WIN32_LEAN_AND_MEAN;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <DisableSpecificWarnings>4804;4800;4101;4267;4244;4503;4273;</DisableSpecificWarnings>
-      <AdditionalOptions>-D_SCL_SECURE_NO_WARNINGS  %(AdditionalOptions)</AdditionalOptions>
-      <ProgramDataBaseFileName>$(OutDir)lib\$(PlatformTarget)\$(TargetName).pdb</ProgramDataBaseFileName>
+      <AdditionalIncludeDirectories>..\..\include;..\include;..\include\opendht;..\..\msgpack-c\include;</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32_NATIVE;WIN32_LEAN_AND_MEAN;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <DisableSpecificWarnings>4804;4800;4101;4267;4244;4503;</DisableSpecificWarnings>
+      <AdditionalOptions>-D_SCL_SECURE_NO_WARNINGS %(AdditionalOptions)</AdditionalOptions>
    </ClCompile>
    <PostBuildEvent>
      <Command>mkdir $(OutDir)\include
@@ -197,7 +182,7 @@ copy ..\include\opendht\*.h $(OutDir)\include\opendht
 copy ..\include\opendht.h $(OutDir)\include\</Command>
    </PostBuildEvent>
    <Lib>
-      <OutputFile>$(OutDir)lib\$(PlatformTarget)\$(TargetName)$(TargetExt)</OutputFile>
+      <OutputFile>$(OutDir)\lib\x64\$(TargetName)$(TargetExt)</OutputFile>
    </Lib>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -207,11 +192,11 @@ copy ..\include\opendht.h $(OutDir)\include\</Command>
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <IntrinsicFunctions>true</IntrinsicFunctions>
      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\include;$(ProjectDir)..\include\opendht;$(ProjectDir)..\..\..\msvc\include;$(ProjectDir)..\..\include;$(ProjectDir)..\..\argon2\include;$(ProjectDir)..\..\msgpack-c\include;$(ProjectDir)..\..\jsoncpp\include;$(ProjectDir)..\..\restbed\source</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>OPENDHT_JSONCPP;OPENDHT_PROXY_CLIENT;OPENDHT_PROXY_SERVER;OPENDHT_PUSH_NOTIFICATIONS;_WINSOCK_DEPRECATED_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;WIN32_NATIVE;WIN32_LEAN_AND_MEAN;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <DisableSpecificWarnings>4804;4800;4101;4267;4244;4503;4273;</DisableSpecificWarnings>
-      <AdditionalOptions>-D_SCL_SECURE_NO_WARNINGS  %(AdditionalOptions)</AdditionalOptions>
-      <ProgramDataBaseFileName>$(OutDir)lib\$(PlatformTarget)\$(TargetName).pdb</ProgramDataBaseFileName>
+      <AdditionalIncludeDirectories>..\..\include;..\include;..\include\opendht;..\..\msgpack-c\include;</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32_NATIVE;WIN32_LEAN_AND_MEAN;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <DisableSpecificWarnings>4804;4800;4101;4267;4244;4503;</DisableSpecificWarnings>
+      <AdditionalOptions>-D_SCL_SECURE_NO_WARNINGS %(AdditionalOptions)</AdditionalOptions>
+      <ProgramDataBaseFileName>$(OutDir)\lib\x86\$(TargetName).pdb</ProgramDataBaseFileName>
    </ClCompile>
    <Link>
      <EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -226,7 +211,7 @@ copy ..\include\opendht\*.h $(OutDir)\include\opendht
 copy ..\include\opendht.h $(OutDir)\include\</Command>
    </PostBuildEvent>
    <Lib>
-      <OutputFile>$(OutDir)lib\$(PlatformTarget)\$(TargetName)$(TargetExt)</OutputFile>
+      <OutputFile>$(OutDir)\lib\x86\$(TargetName)$(TargetExt)</OutputFile>
      <LinkTimeCodeGeneration>false</LinkTimeCodeGeneration>
    </Lib>
  </ItemDefinitionGroup>
@@ -237,11 +222,11 @@ copy ..\include\opendht.h $(OutDir)\include\</Command>
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <IntrinsicFunctions>true</IntrinsicFunctions>
      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\include;$(ProjectDir)..\include\opendht;$(ProjectDir)..\..\..\msvc\include;$(ProjectDir)..\..\include;$(ProjectDir)..\..\argon2\include;$(ProjectDir)..\..\msgpack-c\include;$(ProjectDir)..\..\jsoncpp\include;$(ProjectDir)..\..\restbed\source</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>OPENDHT_JSONCPP;OPENDHT_PROXY_CLIENT;OPENDHT_PROXY_SERVER;OPENDHT_PUSH_NOTIFICATIONS;_WINSOCK_DEPRECATED_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;WIN32_NATIVE;WIN32_LEAN_AND_MEAN;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(ProjectDir)contrib\build\include;$(ProjectDir)..\include;$(ProjectDir)..\include\opendht;$(ProjectDir)contrib\build\msgpack-c\include;$(ProjectDir)contrib\build\argon2\include;$(ProjectDir)..\..\include;$(ProjectDir)..\..\argon2\include</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32_NATIVE;WIN32_LEAN_AND_MEAN;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <DisableSpecificWarnings>4804;4800;4101;4267;4244;4503;4273;</DisableSpecificWarnings>
-      <AdditionalOptions>-D_SCL_SECURE_NO_WARNINGS  %(AdditionalOptions)</AdditionalOptions>
-      <ProgramDataBaseFileName>$(OutDir)lib\$(PlatformTarget)\$(TargetName).pdb</ProgramDataBaseFileName>
+      <AdditionalOptions>-D_SCL_SECURE_NO_WARNINGS %(AdditionalOptions)</AdditionalOptions>
+      <ProgramDataBaseFileName>$(OutDir)\lib\x64\$(TargetName).pdb</ProgramDataBaseFileName>
    </ClCompile>
    <Link>
      <EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -256,7 +241,7 @@ copy ..\include\opendht\*.h $(OutDir)\include\opendht
 copy ..\include\opendht.h $(OutDir)\include\</Command>
    </PostBuildEvent>
    <Lib>
-      <OutputFile>$(OutDir)lib\$(PlatformTarget)\$(TargetName)$(TargetExt)</OutputFile>
+      <OutputFile>$(OutDir)\lib\x64\$(TargetName)$(TargetExt)</OutputFile>
      <LinkTimeCodeGeneration>false</LinkTimeCodeGeneration>
      <AdditionalLibraryDirectories>
      </AdditionalLibraryDirectories>
@@ -53,26 +53,12 @@
      <Filter>Source Files\indexation</Filter>
    </ClCompile>
    <ClCompile Include="wingetopt.c" />
-    <ClCompile Include="..\src\rng.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\op_cache.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\dht_proxy_client.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\peer_discovery.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\network_utils.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\thread_pool.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
  </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>
@@ -153,24 +139,6 @@
    </ClInclude>
    <ClInclude Include="unistd.h" />
    <ClInclude Include="wingetopt.h" />
-    <ClInclude Include="..\include\opendht\def.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\net.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\parsed_message.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\opendht\sockaddr.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\network_utils.h">
-      <Filter>Header Files\opendht</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\thread_pool.h">
-      <Filter>Header Files\opendht</Filter>
-    </ClInclude>
  </ItemGroup>
  <ItemGroup>
    <Filter Include="Source Files">
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2016-2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2016 Savoir-faire Linux Inc.
 *
 *  Author: Andreas Traczyk <andreas.traczyk@savoirfairelinux.com>
 *
@@ -16,9 +16,7 @@ if ENABLE_TESTS
 SUBDIRS += tests
 endif

-if HAVE_DOXYGEN
 SUBDIRS += doc
-endif

 ACLOCAL_AMFLAGS = -I m4

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

-A lightweight C++14 Distributed Hash Table implementation.
+A lightweight C++11 Distributed Hash Table implementation.

 OpenDHT provides an easy to use distributed in-memory data store.
 Every node in the network can read and write values to the store.
@@ -14,7 +14,7 @@ Values are distributed over the network, with redundancy.
 * 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++14 map API
+ * Clean and powerful C++11 map API
 * Python 3 bindings
 * REST API

@@ -27,13 +27,13 @@ Build instructions: <https://github.com/savoirfairelinux/opendht/wiki/Build-the-

 #### How-to build a simple client app
 ```bash
-g++ main.cpp -std=c++14 -lopendht -lgnutls
+g++ main.cpp -std=c++11 -lopendht -lgnutls
 ```

 ## Examples
 ### C++ example
 The `tools` directory includes simple example programs :
-* `dhtnode`, a command line tool, allowing to run a DHT node and perform operations supported by the library (get, put etc.) with text values.
+* `dhtnode`, a command line tool, mostly used for debuging, allowing to perform operations supported by the library (get, put etc.) with text values.
 * `dhtchat`, a very simple IM client working over the dht.

 Example program launching a DHT node, connecting to the network and performing some basic operations:
@@ -96,7 +96,7 @@ for r in results:
 - msgpack-c 1.2+, used for data serialization.
 - GnuTLS 3.3+, used for cryptographic operations.
 - Nettle 2.4+, a GnuTLS dependency for crypto.
- (optional) restinio used for the REST API.
+- (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 Microsoft Visual Studio 2015
@@ -106,7 +106,7 @@ for r in results:
 IRC: join us on Freenode at [`#opendht`](https://webchat.freenode.net/?channels=%23opendht).

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

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

@@ -0,0 +1,17 @@
+find_path (RESTBED_INCLUDE restbed
+           HINTS
+           "/usr/include"
+           "/usr/local/include"
+           "/opt/local/include"
+)
+
+if (RESTBED_INCLUDE)
+    message(STATUS "${green}Found Restbed: ${RESTBED_INCLUDE}")
+else()
+    message(FATAL_ERROR "${red}Failed to locate Restbed.}")
+endif()
+
+if (RESTBED_INCLUDE)
+    set(RESTBED_FOUND TRUE)
+    set(Restbed_LIBRARIES restbed)
+endif()
@@ -1,14 +0,0 @@
-# header-only does not produce a library
-if(NOT Restinio_FOUND)
-    find_path (Restinio_INCLUDE_DIR restinio
-               HINTS
-               "/usr/include"
-               "/usr/local/include"
-               "/opt/local/include")
-    include(FindPackageHandleStandardArgs)
-    find_package_handle_standard_args(Restinio DEFAULT_MSG Restinio_INCLUDE_DIR)
-    if (Restinio_INCLUDE_DIR)
-        set(Restinio_FOUND TRUE)
-        set(Restinio_INCLUDE_DIRS ${Restinio_INCLUDE_DIR})
-    endif()
-endif()
@@ -1,7 +1,7 @@
 dnl define macros
 m4_define([opendht_major_version], 1)
-m4_define([opendht_minor_version], 10)
-m4_define([opendht_patch_version], 0)
+m4_define([opendht_minor_version], 7)
+m4_define([opendht_patch_version], 1)
 m4_define([opendht_version],
 		  [opendht_major_version.opendht_minor_version.opendht_patch_version])

@@ -101,55 +101,9 @@ LT_LANG(C++)
 AX_CXX_COMPILE_STDCXX(11,[noext],[mandatory])

 PKG_PROG_PKG_CONFIG()
-
-AC_ARG_ENABLE([proxy_server], AS_HELP_STRING([--enable-proxy-server], [Enable proxy server ability]), proxy_server=yes, proxy_server=no)
-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 -a x$proxy_server == 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)
-
-AC_ARG_ENABLE([proxy_client], AS_HELP_STRING([--enable-proxy-client], [Enable proxy client ability]), proxy_client=yes, proxy_client=no)
-AM_CONDITIONAL(ENABLE_PROXY_CLIENT, test x$proxy_client == xyes)
-
-AC_ARG_ENABLE([tests], AS_HELP_STRING([--enable-tests], [Enable tests]), build_tests=yes, build_tests=no)
-AM_CONDITIONAL(ENABLE_TESTS, test x$build_tests == xyes)
-AM_COND_IF([ENABLE_TESTS], [
-	PKG_CHECK_MODULES([CppUnit], [cppunit >= 1.12])
-])
-
-AM_CONDITIONAL(PROXY_CLIENT_OR_SERVER, test x$proxy_client == xyes | test x$proxy_server == xyes)
-
 PKG_CHECK_MODULES([Nettle], [nettle >= 2.4])
 PKG_CHECK_MODULES([GnuTLS], [gnutls >= 3.3])
 PKG_CHECK_MODULES([MsgPack], [msgpack >= 1.2])
-
-AC_ARG_WITH([jsoncpp], AS_HELP_STRING([--without-jsoncpp], [Build without JsonCpp support]))
-AS_IF([test "x$with_jsoncpp" != "xno"],
-      [PKG_CHECK_MODULES([JsonCpp], [jsoncpp >= 1.7.2], [have_jsoncpp=yes], [have_jsoncpp=no])],
-      [have_jsoncpp=no])
-AS_IF([test "x$have_jsoncpp" = "xyes"], [
-    AC_MSG_NOTICE([Using JsonCpp])
-    CPPFLAGS+=" -DOPENDHT_JSONCPP=1"
-], [
-    AC_MSG_NOTICE([Not using JsonCpp])
-    AM_COND_IF(PROXY_CLIENT_OR_SERVER, AC_MSG_ERROR(["JsonCpp is required for proxy/push notification support"]))
-])
-
-AM_COND_IF([PROXY_CLIENT_OR_SERVER], [
-    PKG_CHECK_MODULES([Asio], [fmt >= 1.12.2])
-    PKG_CHECK_MODULES([Fmt], [fmt >= 5.3.0])
-    # http_parser has no pkgconfig, instead we check with:
-    AC_CHECK_LIB(http_parser, exit,, AC_MSG_ERROR([Missing HttpParser library files]))
-    AC_CHECK_HEADERS([http_parser.h], [http_parser_headers=yes; break;])
-    AS_IF([test "x$http_parser_headers" != "xyes"], AC_MSG_ERROR([Missing HttpParser headers files]))
-])
-
 CXXFLAGS="${CXXFLAGS} -DMSGPACK_DISABLE_LEGACY_NIL -DMSGPACK_DISABLE_LEGACY_CONVERT"

 dnl Check for Argon2
@@ -181,15 +135,61 @@ AM_COND_IF([ENABLE_TOOLS], [
  ])
 ])

-AM_COND_IF(ENABLE_PROXY_SERVER, [CPPFLAGS+=" -DOPENDHT_PROXY_SERVER"], [])
-AM_COND_IF(ENABLE_PROXY_CLIENT, [CPPFLAGS+=" -DOPENDHT_PROXY_CLIENT"], [])
-AM_COND_IF(ENABLE_PUSH_NOTIFICATIONS, [CPPFLAGS+=" -DOPENDHT_PUSH_NOTIFICATIONS"], [])
-AM_COND_IF(ENABLE_PROXY_SERVER_IDENTITY, [CPPFLAGS+=" -DOPENDHT_PROXY_SERVER_IDENTITY"], [])
+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)
+AC_ARG_ENABLE([proxy_client], AS_HELP_STRING([--enable-proxy-client], [Enable proxy client ability]), proxy_client=yes, proxy_client=no)
+AM_CONDITIONAL(ENABLE_PROXY_CLIENT, test x$proxy_client == xyes)

-AM_COND_IF([HAVE_DOXYGEN], [
-  AC_CONFIG_FILES([doc/Doxyfile doc/Makefile])
+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])
+	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)
+AM_COND_IF([ENABLE_PROXY_SERVER_IDENTITY], [
+    CPPFLAGS+=" -DOPENDHT_PROXY_SERVER_IDENTITY=true"
+], [
+    CPPFLAGS+=" -DOPENDHT_PROXY_SERVER_IDENTITY=false"
+])
+
+AM_COND_IF([ENABLE_PROXY_CLIENT], [
+	CPPFLAGS+=" -DOPENDHT_PROXY_CLIENT=true"
+], [
+	CPPFLAGS+=" -DOPENDHT_PROXY_CLIENT=false"
+])
+
+AM_CONDITIONAL(PROXY_CLIENT_OR_SERVER, test x$proxy_client == xyes | test x$proxy_server == xyes)
+AM_COND_IF([PROXY_CLIENT_OR_SERVER], [
+	AC_CHECK_LIB(restbed, exit,, AC_MSG_ERROR([Missing restbed files]))
+	PKG_CHECK_MODULES([Jsoncpp], [jsoncpp >= 1.7.4])
+	CPPFLAGS="${CPPFLAGS} ${Jsoncpp_CFLAGS}"
+	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])
+
 dnl Configure setup.py if we build the python module
 AM_COND_IF([USE_CYTHON], [
    AC_SUBST(CURRENT_SOURCE_DIR, ".")
@@ -202,6 +202,6 @@ AM_COND_IF([USE_CYTHON], [
 AC_CONFIG_FILES([Makefile
                 src/Makefile
                 tools/Makefile
-                 tests/Makefile
+								 tests/Makefile
                 opendht.pc])
 AC_OUTPUT
@@ -1,24 +1,22 @@
-.TH DHTNODE 1 2019-06-08
+.TH DHTNODE 1 2016-07-29
+
 .SH NAME
 .B dhtnode
 - a simple OpenDHT command line node runner.
+
 .SH SYNOPSIS
-.B dhtnode
-[\fB\-h\fR]
-[\fB\-v\fR [\fB\-l\fR \fIlogfile\fR] [\fB\-L\fR]]
-[\fB\-i\fR [\fB\-\-save\-identity\fR \fIfile\fR]]
-[\fB\-d\fR] [\fB\-s\fR]
-[\fB\-n\fR \fInetwork_id\fR]
-[\fB\-p\fR \fIlocal_port\fR]
-[\fB\-b\fR \fIbootstrap_host\fR[:\fIport\fR]]
-[\fB\-\-certificate\fR \fIfile\fR]
-[\fB\-\-privkey\fR \fIfile\fR]
-[\fB\-\-privkey\-password\fR \fIpassword\fR]
-[\fB\-\-proxyserver\fR \fIport\fR]
-[\fB\-\-proxyclient\fR \fIserver\fR]
+.B dhtnode [-h]
+
+.B dhtnode [-v [-l \fIlogfile\fP]] [-i] [-d] [-n \fInetwork_id\fP] [-p \fIlocal_port\fP] [-b \fIbootstrap_host\fP[:\fIport\fP]]
+
 .SH DESCRIPTION
-Runs an OpenDHT node, with a CLI (default) or as a daemon (with \fB'-d'\fP or \fB'-s'\fP).
-Commands available in the interactive shell are:
+
+This program runs a simple OpenDHT node in an interactive way. If you rather
+want to run the node in daemon mode, option \fB'-d'\fP is provided. When running
+in the interactive shell, you benefit from the readline capabilities for writing
+your commands such as command history. Here are the available commands in the
+interactive shell:
+
 .EE
    h, help    Print this help message.
    q, quit    Quit the program.
@@ -39,63 +37,43 @@ Commands available in the interactive shell are:
                          private key.
    e [key] [dest] [str]  Put string value at [key], encrypted for [dest] with
                          its public key (if found).
+
 .SH OPTIONS
+
 .TP
-\fB\-h\fP
+\fB-h\fP
 Prints some help.
+
 .TP
-\fB\-v\fP
-Enable the verbose mode (log to stdout/stderr by default)
+\fB-v\fP
+Enable the verbose mode (log to stdout by default)
+
 .TP
-\fB\-l\fP \fIlog_file\fP
-Write log to file instead of stdout/stderr
+\fB-l\fP \fIlog_file\fP
+Write log to file instead of stdout
+
 .TP
-\fB\-L\fP
-Write log to syslog instead of stdout/stderr
-.TP
-\fB\-i\fP
+\fB-i\fP
 Generate cryptographic identity for the node.
+
 .TP
-\fB\-\-save\-identity\fP \fIfile\fP
-Save generated identity (certificate and private key) to given file prefix.
-.TP
-\fB\-\-certificate\fP \fIfile\fP
-Load identity certificate from given file.
-.TP
-\fB\-\-privkey\fP \fIfile\fP
-Load identity private key from given file.
-.TP
-\fB\-\-privkey\-password\fP \fIpassword\fP
-Password to use for private key encryption or decryption (optional).
-.TP
-\fB\-d\fP
+\fB-d\fP
 Run the program in daemon mode (will fork in the background).
+
 .TP
-\fB\-s\fP
-Run the program in service mode (non\-forking daemon).
-.TP
-\fB\-D\fP
-Enables multicast automatic local peer discovery.
-.TP
-\fB\-f\fP \fIfile\fP
-Specify a file path to persist/load the node state.
-.TP
-\fB\-n\fP \fInetwork_id\fP
+\fB-n\fP \fInetwork_id\fP
 Specify the network id. This let you connect to distinct networks and prevents
 the merge of two different networks (available since OpenDHT v0.6.1).
+
 .TP
-\fB\-p\fP \fIlocal_port\fP
-Use UDP port \fIlocal_port\fP for the program to bind to.
+\fB-p\fP \fIlocal_port\fP
+Use port \fIlocal_port\fP for the program to bind to.
+
 .TP
-\fB\-b\fP \fIbootstrap_host\fP[:\fIport\fP]
+\fB-b\fP \fIbootstrap_host\fP[:\fIport\fP]
 The program needs to be given a node to connect to the network. You use this
 option to provide the ip address of that node.
-.TP
-\fB\-\-proxyserver\fP \fIlocal_port\fP
-Run a proxy server bound to this DHT node on HTTP port \fIlocal_port\fP
-.TP
-\fB\-\-proxyclient\fP \fIserver\fP
-Run this DHT node in proxy client mode, and connect to \fIserver\fP
+
 .SH AUTHORS
 .TP
 Program written by
@@ -1,45 +1,18 @@
 FROM ubuntu:16.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
+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

-#patch for https://github.com/Stiffstream/restinio-conan-example/issues/2
-RUN apt-get update && apt-get install -y \
-        python3-pip libasio-dev
-RUN pip3 install --upgrade cmake
-#install conan & add restinio remotes
-RUN pip3 install conan && \
-    conan remote add stiffstream https://api.bintray.com/conan/stiffstream/public && \
-    conan remote add public-conan https://api.bintray.com/conan/bincrafters/public-conan
-#setup restinio docker project
-RUN mkdir restinio-conan
-COPY conan/restinio/conanfile.txt restinio-conan/conanfile.txt
-COPY conan/restinio/conanfile.py restinio-conan/conanfile.py
-#build restinio from source
-RUN echo "*** Installing RESTinio & dependencies ***" \
-    && cd restinio-conan \
-    && conan source .  \
-    && conan install -o restinio:boost_libs=none --build=missing . \
-    && conan package . -pf /usr/local \
-    && cd ../ && rm -rf restinio*
-#installing dependencies
-RUN echo "*** Installing asio & fmt dependencies ***" \
-    && cp -r ~/.conan/data/asio/*/bincrafters/stable/package/*/include/* /usr/local/include/ \
-    && cp -r ~/.conan/data/fmt/*/bincrafters/stable/package/*/lib/* /usr/local/lib/ \
-    && cp -r ~/.conan/data/fmt/*/bincrafters/stable/package/*/include/* /usr/local/include/
-#build http_parser fork
-RUN echo "*** Building http_parser dependency for custom HTTP methods ***" \
-    && git clone https://github.com/eao197/http-parser.git \
-    && cd http-parser && make -j8 && make install PREFIX=/usr \
-    && cd ../ && rm -rf restinio-conan/
+# 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
+	&& 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
@@ -1,46 +1,23 @@
 FROM ubuntu:16.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 python3-pip \
-    && apt-get remove -y gcc g++ && apt-get autoremove -y && apt-get clean
+	&& 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 remove -y gcc g++ && apt-get autoremove -y && apt-get clean

 ENV CC cc
 ENV CXX c++

-#patch for https://github.com/Stiffstream/restinio-conan-example/issues/2
-RUN apt-get update && apt-get install -y \
-        python3-pip libasio-dev
-RUN pip3 install --upgrade cmake
-#install conan & add restinio remotes
-RUN pip3 install conan && \
-    conan remote add stiffstream https://api.bintray.com/conan/stiffstream/public && \
-    conan remote add public-conan https://api.bintray.com/conan/bincrafters/public-conan
-#setup restinio docker project
-RUN mkdir restinio-conan
-COPY conan/restinio/conanfile.txt restinio-conan/conanfile.txt
-COPY conan/restinio/conanfile.py restinio-conan/conanfile.py
-#build restinio from source
-RUN echo "*** Installing RESTinio & dependencies ***" \
-    && cd restinio-conan \
-    && conan source .  \
-    && conan install -o restinio:boost_libs=none --build=missing . \
-    && conan package . -pf /usr/local \
-    && cd ../ && rm -rf restinio*
-#installing dependencies
-RUN echo "*** Installing asio & fmt dependencies ***" \
-    && cp -r ~/.conan/data/asio/*/bincrafters/stable/package/*/include/* /usr/local/include/ \
-    && cp -r ~/.conan/data/fmt/*/bincrafters/stable/package/*/lib/* /usr/local/lib/ \
-    && cp -r ~/.conan/data/fmt/*/bincrafters/stable/package/*/include/* /usr/local/include/
-#build http_parser fork
-RUN echo "*** Building http_parser dependency for custom HTTP methods ***" \
-    && git clone https://github.com/eao197/http-parser.git \
-    && cd http-parser && make -j8 && make install PREFIX=/usr \
-    && cd ../ && rm -rf restinio-conan/
+# 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
+	&& 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
@@ -1,59 +0,0 @@
-from conans import ConanFile, CMake, tools
-import os
-
-
-class SobjectizerConan(ConanFile):
-    name = "restinio"
-    version = "0.5.1"
-
-    license = "BSD-3-Clause"
-    url = "https://github.com/Stiffstream/restinio-conan"
-
-    description = (
-            "RESTinio is a header-only C++14 library that gives you "
-            "an embedded HTTP/Websocket server."
-    )
-
-    settings = "os", "compiler", "build_type", "arch"
-    options = {'boost_libs': ['none', 'static', 'shared']}
-    default_options = {'boost_libs': 'none'}
-    generators = "cmake"
-    source_subfolder = "restinio"
-    build_policy = "missing"
-
-    def requirements(self):
-        self.requires.add("http-parser/2.8.1@bincrafters/stable")
-        self.requires.add("fmt/5.3.0@bincrafters/stable")
-
-        if self.options.boost_libs == "none":
-            self.requires.add("asio/1.12.2@bincrafters/stable")
-        else:
-            self.requires.add("boost/1.69.0@conan/stable")
-            if self.options.boost_libs == "shared":
-                self.options["boost"].shared = True
-            else:
-                self.options["boost"].shared = False
-
-    def source(self):
-        source_url = "https://bitbucket.org/sobjectizerteam/restinio/downloads"
-        tools.get("{0}/restinio-{1}.zip".format(source_url, self.version))
-        extracted_dir = "restinio-" + self.version
-        os.rename(extracted_dir, self.source_subfolder)
-
-    def _configure_cmake(self):
-        cmake = CMake(self)
-        cmake.definitions['RESTINIO_INSTALL'] = True
-        cmake.definitions['RESTINIO_FIND_DEPS'] = False
-        cmake.definitions['RESTINIO_USE_BOOST_ASIO'] = self.options.boost_libs
-        cmake.configure(source_folder = self.source_subfolder + "/dev/restinio")
-        return cmake
-
-    def package(self):
-        cmake = self._configure_cmake()
-        self.output.info(cmake.definitions)
-        cmake.install()
-
-    def package_info(self):
-        self.info.header_only()
-        if self.options.boost_libs != "none":
-            self.cpp_info.defines.append("RESTINIO_USE_BOOST_ASIO")
@@ -1,11 +0,0 @@
-[requires]
-restinio/0.5.1@stiffstream/stable
-
-[generators]
-cmake
-
-[options]
-
-[imports]
-bin, *.dll -> ./bin # Copies all dll files from packages bin folder to my "bin" folder
-lib, *.dylib* -> ./bin # Copies all dylib files from packages lib folder to my "bin" folder
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 Savoir-faire Linux Inc.
 *  Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 *
 *  This program is free software; you can redistribute it and/or modify
@@ -19,9 +19,10 @@
 #pragma once

 #include "opendht/dhtrunner.h"
-#ifdef OPENDHT_PROXY_SERVER
+#if OPENDHT_PROXY_SERVER
 #include "opendht/dht_proxy_server.h"
 #endif
+#include "opendht/log.h"
 #include "opendht/default_types.h"
 #ifdef OPENDHT_INDEXATION
 #include "opendht/indexation/pht.h"
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 Savoir-faire Linux Inc.
 *  Authors: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 *           Simon Désaulniers <simon.desaulniers@savoirfairelinux.com>
 *           Sébastien Blin <sebastien.blin@savoirfairelinux.com>
@@ -27,9 +27,9 @@
 #include <memory>
 #include <functional>

-#ifdef OPENDHT_JSONCPP
+#if OPENDHT_PROXY_SERVER
 #include <json/json.h>
-#endif
+#endif //OPENDHT_PROXY_SERVER

 namespace dht {

@@ -51,37 +51,15 @@ struct OPENDHT_PUBLIC NodeStats {
             incoming_nodes {0};
    unsigned table_depth {0};
    unsigned getKnownNodes() const { return good_nodes + dubious_nodes; }
-    unsigned long getNetworkSizeEstimation() const { return 8 * std::exp2(table_depth); }
    std::string toString() const;
-
-#ifdef OPENDHT_JSONCPP
+#if OPENDHT_PROXY_SERVER || OPENDHT_PROXY_CLIENT
    /**
     * Build a json object from a NodeStats
     */
    Json::Value toJson() const;
    NodeStats() {};
    explicit NodeStats(const Json::Value& v);
-#endif
-
-    MSGPACK_DEFINE_MAP(good_nodes, dubious_nodes, cached_nodes, incoming_nodes, table_depth)
-};
-
-struct OPENDHT_PUBLIC NodeInfo {
-    InfoHash id;
-    InfoHash node_id;
-    NodeStats ipv4;
-    NodeStats ipv6;
-
-#ifdef OPENDHT_JSONCPP
-    /**
-     * Build a json object from a NodeStats
-     */
-    Json::Value toJson() const;
-    NodeInfo() {};
-    explicit NodeInfo(const Json::Value& v);
-#endif
-
-    MSGPACK_DEFINE_MAP(id, node_id, ipv4, ipv6)
+#endif //OPENDHT_PROXY_SERVER
 };

 /**
@@ -89,23 +67,20 @@ struct OPENDHT_PUBLIC NodeInfo {
 */
 struct OPENDHT_PUBLIC Config {
    /** DHT node ID */
-    InfoHash node_id {};
+    InfoHash node_id;

    /**
     * DHT network ID. A node will only talk with other nodes having
     * the same network ID.
     * Network ID 0 (default) represents the main public network.
     */
-    NetId network {0};
+    NetId network;

    /** For testing purposes only, enables bootstrap mode */
-    bool is_bootstrap {false};
+    bool is_bootstrap;

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

 /**
@@ -113,8 +88,8 @@ struct OPENDHT_PUBLIC Config {
 */
 struct OPENDHT_PUBLIC SecureDhtConfig
 {
-    Config node_config {};
-    crypto::Identity id {};
+    Config node_config;
+    crypto::Identity id;
 };

 static constexpr size_t DEFAULT_STORAGE_LIMIT {1024 * 1024 * 64};
@@ -131,8 +106,8 @@ using CertificateStoreQuery = std::function<std::vector<std::shared_ptr<crypto::

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

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

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

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

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

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

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

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

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

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

    void msgpack_unpack(msgpack::object o);

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

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

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

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

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

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

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

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

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

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

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

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

    std::string print() const;

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

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

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

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

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

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

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

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

-OPENDHT_PUBLIC void saveIdentity(const Identity& id, const std::string& path, const std::string& privkey_password = {});

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

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

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

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

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

    /** print value for debugging */
    friend std::ostream& operator<< (std::ostream&, const DhtMessage&);
@@ -114,10 +114,6 @@ public:
    ImMessage() {}
    ImMessage(dht::Value::Id id, std::string&& m, long d = 0)
        : id(id), msg(std::move(m)), date(d) {}
-    ImMessage(dht::Value::Id id, std::string &&dt, std::string &&m, long d = 0)
-        : id(id), msg(std::move(m)), datatype(std::move(dt)), date(d) {}
-    ImMessage(dht::Value::Id id, std::string &&dt, std::string &&m, std::map<std::string, std::string> &&md, long d = 0)
-        : id(id), msg(std::move(m)), datatype(std::move(dt)), metadatas(std::move(md)), date(d) {}

    virtual void unpackValue(const Value& v) override {
        to = v.recipient;
@@ -127,12 +123,10 @@ public:
    dht::InfoHash to;
    dht::Value::Id id {0};
    std::string msg;
-    std::string datatype;
-    std::map<std::string, std::string> metadatas;
    long date {0};
    ImStatus status {ImStatus::NONE};

-    MSGPACK_DEFINE_MAP(id, msg, date, status, datatype, metadatas)
+    MSGPACK_DEFINE_MAP(id, msg, date, status)
 };

 class OPENDHT_PUBLIC TrustRequest : public EncryptedValue<TrustRequest>
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 Savoir-faire Linux Inc.
 *  Authors: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 *           Simon Désaulniers <simon.desaulniers@savoirfairelinux.com>
 *           Sébastien Blin <sebastien.blin@savoirfairelinux.com>
@@ -68,29 +68,27 @@ public:
     * Initialise the Dht with two open sockets (for IPv4 and IP6)
     * and an ID for the node.
     */
-    Dht(std::unique_ptr<net::DatagramSocket>&& sock, const Config& config, const Logger& l = {});
+    Dht(const int& s, const int& s6, Config config);
    virtual ~Dht();

    /**
     * Get the ID of the node.
     */
-    inline const InfoHash& getNodeId() const override { return myid; }
+    inline const InfoHash& getNodeId() const { return myid; }

    /**
     * Get the current status of the node for the given family.
     */
-    NodeStatus getStatus(sa_family_t af) const override;
+    NodeStatus getStatus(sa_family_t af) const;

-    NodeStatus getStatus() const override {
+    NodeStatus getStatus() const {
        return std::max(getStatus(AF_INET), getStatus(AF_INET6));
    }

-    net::DatagramSocket* getSocket() const override { return network_engine.getSocket(); };
-
    /**
     * Performs final operations before quitting.
     */
-    void shutdown(ShutdownCallback cb) override;
+    void shutdown(ShutdownCallback cb);

    /**
     * Returns true if the node is running (have access to an open socket).
@@ -98,12 +96,12 @@ public:
     *  af: address family. If non-zero, will return true if the node
     *      is running for the provided family.
     */
-    bool isRunning(sa_family_t af = 0) const override;
+    bool isRunning(sa_family_t af = 0) const;

-    virtual void registerType(const ValueType& type) override {
+    virtual void registerType(const ValueType& type) {
        types.registerType(type);
    }
-    const ValueType& getType(ValueType::Id type_id) const override {
+    const ValueType& getType(ValueType::Id type_id) const {
        return types.getType(type_id);
    }

@@ -112,18 +110,18 @@ public:
     * The node is not pinged, so this should be
     * used to bootstrap efficiently from previously known nodes.
     */
-    void insertNode(const InfoHash& id, const SockAddr&) override;
-    void insertNode(const InfoHash& id, const sockaddr* sa, socklen_t salen) override {
+    void insertNode(const InfoHash& id, const SockAddr&);
+    void insertNode(const InfoHash& id, const sockaddr* sa, socklen_t salen) {
        insertNode(id, SockAddr(sa, salen));
    }
-    void insertNode(const NodeExport& n) override {
+    void insertNode(const NodeExport& n) {
        insertNode(n.id, SockAddr(n.ss, n.sslen));
    }

-    void pingNode(const sockaddr*, socklen_t, DoneCallbackSimple&& cb={}) override;
+    void pingNode(const sockaddr*, socklen_t, DoneCallbackSimple&& cb={});

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

@@ -137,14 +135,14 @@ public:
                     cb and donecb won't be called again afterward.
     * @param f a filter function used to prefilter values.
     */
-    virtual void get(const InfoHash& key, GetCallback cb, DoneCallback donecb={}, Value::Filter&& f={}, Where&& w = {}) override;
-    virtual void get(const InfoHash& key, GetCallback cb, DoneCallbackSimple donecb={}, Value::Filter&& f={}, Where&& w = {}) override {
+    virtual void get(const InfoHash& key, GetCallback cb, DoneCallback donecb={}, Value::Filter&& f={}, Where&& w = {});
+    virtual void get(const InfoHash& key, GetCallback cb, DoneCallbackSimple donecb={}, Value::Filter&& f={}, Where&& w = {}) {
        get(key, cb, bindDoneCb(donecb), std::forward<Value::Filter>(f), std::forward<Where>(w));
    }
-    virtual void get(const InfoHash& key, GetCallbackSimple cb, DoneCallback donecb={}, Value::Filter&& f={}, Where&& w = {}) override {
+    virtual void get(const InfoHash& key, GetCallbackSimple cb, DoneCallback donecb={}, Value::Filter&& f={}, Where&& w = {}) {
        get(key, bindGetCb(cb), donecb, std::forward<Value::Filter>(f), std::forward<Where>(w));
    }
-    virtual void get(const InfoHash& key, GetCallbackSimple cb, DoneCallbackSimple donecb, Value::Filter&& f={}, Where&& w = {}) override {
+    virtual void get(const InfoHash& key, GetCallbackSimple cb, DoneCallbackSimple donecb, Value::Filter&& f={}, Where&& w = {}) {
        get(key, bindGetCb(cb), bindDoneCb(donecb), std::forward<Value::Filter>(f), std::forward<Where>(w));
    }
    /**
@@ -157,20 +155,20 @@ public:
     * @param q a query used to filter values on the remotes before they send a
     *          response.
     */
-    virtual void query(const InfoHash& key, QueryCallback cb, DoneCallback done_cb = {}, Query&& q = {}) override;
-    virtual void query(const InfoHash& key, QueryCallback cb, DoneCallbackSimple done_cb = {}, Query&& q = {}) override {
+    virtual void query(const InfoHash& key, QueryCallback cb, DoneCallback done_cb = {}, Query&& q = {});
+    virtual void query(const InfoHash& key, QueryCallback cb, DoneCallbackSimple done_cb = {}, Query&& q = {}) {
        query(key, cb, bindDoneCb(done_cb), std::forward<Query>(q));
    }

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

    /**
     * Get locally stored data for the given key and value id.
     */
-    Sp<Value> getLocalById(const InfoHash& key, Value::Id vid) const override;
+    Sp<Value> getLocalById(const InfoHash& key, Value::Id vid) const;

    /**
     * Announce a value on all available protocols (IPv4, IPv6).
@@ -182,12 +180,12 @@ public:
            Sp<Value>,
            DoneCallback cb=nullptr,
            time_point created=time_point::max(),
-            bool permanent = false) override;
+            bool permanent = false);
    void put(const InfoHash& key,
            const Sp<Value>& v,
            DoneCallbackSimple cb,
            time_point created=time_point::max(),
-            bool permanent = false) override
+            bool permanent = false)
    {
        put(key, v, bindDoneCb(cb), created, permanent);
    }
@@ -196,7 +194,7 @@ public:
            Value&& v,
            DoneCallback cb=nullptr,
            time_point created=time_point::max(),
-            bool permanent = false) override
+            bool permanent = false)
    {
        put(key, std::make_shared<Value>(std::move(v)), cb, created, permanent);
    }
@@ -204,7 +202,7 @@ public:
            Value&& v,
            DoneCallbackSimple cb,
            time_point created=time_point::max(),
-            bool permanent = false) override
+            bool permanent = false)
    {
        put(key, std::forward<Value>(v), bindDoneCb(cb), created, permanent);
    }
@@ -212,18 +210,18 @@ public:
    /**
     * Get data currently being put at the given hash.
     */
-    std::vector<Sp<Value>> getPut(const InfoHash&) const override;
+    std::vector<Sp<Value>> getPut(const InfoHash&);

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

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

    /**
     * Listen on the network for any changes involving a specified hash.
@@ -232,28 +230,28 @@ public:
     *
     * @return a token to cancel the listener later.
     */
-    size_t listen(const InfoHash&, ValueCallback, Value::Filter={}, Where={}) override;
+    virtual size_t listen(const InfoHash&, ValueCallback, Value::Filter={}, Where={});

-    size_t listen(const InfoHash& key, GetCallback cb, Value::Filter f={}, Where w={}) override {
+    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));
    }
-    size_t listen(const InfoHash& key, GetCallbackSimple cb, Value::Filter f={}, Where w={}) override {
+    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));
    }

-    bool cancelListen(const InfoHash&, size_t token) override;
+    virtual bool cancelListen(const InfoHash&, size_t token);

    /**
     * Inform the DHT of lower-layer connectivity changes.
     * This will cause the DHT to assume a public IP address change.
     * The DHT will recontact neighbor nodes, re-register for listen ops etc.
     */
-    void connectivityChanged(sa_family_t) override;
-    void connectivityChanged() override {
+    void connectivityChanged(sa_family_t);
+    void connectivityChanged() {
        reported_addr.clear();
        connectivityChanged(AF_INET);
        connectivityChanged(AF_INET6);
@@ -263,32 +261,29 @@ public:
     * Get the list of good nodes for local storage saving purposes
     * The list is ordered to minimize the back-to-work delay.
     */
-    std::vector<NodeExport> exportNodes() const override;
+    std::vector<NodeExport> exportNodes();

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

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

-    NodeStats getNodesStats(sa_family_t af) const override;
+    std::string getStorageLog() const;
+    std::string getStorageLog(const InfoHash&) const;

-    std::string getStorageLog() const override;
-    std::string getStorageLog(const InfoHash&) const override;
+    std::string getRoutingTablesLog(sa_family_t) const;
+    std::string getSearchesLog(sa_family_t) const;
+    std::string getSearchLog(const InfoHash&, sa_family_t af = AF_UNSPEC) const;

-    std::string getRoutingTablesLog(sa_family_t) const override;
-    std::string getSearchesLog(sa_family_t) const override;
-    std::string getSearchLog(const InfoHash&, sa_family_t af = AF_UNSPEC) const override;
-
-    void dumpTables() const override;
-    std::vector<unsigned> getNodeMessageStats(bool in = false) override {
+    void dumpTables() const;
+    std::vector<unsigned> getNodeMessageStats(bool in = false) {
        return network_engine.getNodeMessageStats(in);
    }

    /**
     * Set the in-memory storage limit in bytes
     */
-    void setStorageLimit(size_t limit = DEFAULT_STORAGE_LIMIT) override {
+    void setStorageLimit(size_t limit = DEFAULT_STORAGE_LIMIT) {
        max_store_size = limit;
    }

@@ -296,13 +291,13 @@ public:
     * Returns the total memory usage of stored values and the number
     * of stored values.
     */
-    std::pair<size_t, size_t> getStoreSize() const override {
+    std::pair<size_t, size_t> getStoreSize() const {
        return {total_store_size, total_values};
    }

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

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

 private:
@@ -329,10 +324,10 @@ private:
    static constexpr unsigned LISTEN_NODES {4};

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

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

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

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

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

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

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

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

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

    // Buckets
    RoutingTable& buckets(sa_family_t af) { return af == AF_INET ? buckets4 : buckets6; }
    const RoutingTable& buckets(sa_family_t af) const { return af == AF_INET ? buckets4 : buckets6; }
    Bucket* findBucket(const InfoHash& id, sa_family_t af) {
-        auto& b = buckets(af);
-        auto it = b.findBucket(id);
-        return it == b.end() ? nullptr : &(*it);
+        RoutingTable::iterator b;
+        switch (af) {
+        case AF_INET:
+            b = buckets4.findBucket(id);
+            return b == buckets4.end() ? nullptr : &(*b);
+        case AF_INET6:
+            b = buckets6.findBucket(id);
+            return b == buckets6.end() ? nullptr : &(*b);
+        default:
+            return nullptr;
+        }
    }
    const Bucket* findBucket(const InfoHash& id, sa_family_t af) const {
        return const_cast<Dht*>(this)->findBucket(id, af);
@@ -465,10 +464,10 @@ private:
     * Low-level method that will perform a search on the DHT for the specified
     * infohash (id), using the specified IP version (IPv4 or IPv6).
     */
-    Sp<Search> search(const InfoHash& id, sa_family_t af, GetCallback = {}, QueryCallback = {}, DoneCallback = {}, Value::Filter = {}, const Sp<Query>& q = {});
+    Sp<Search> search(const InfoHash& id, sa_family_t af, GetCallback = {}, QueryCallback = {}, DoneCallback = {}, Value::Filter = {}, Query q = {});

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

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

 namespace dht {

-namespace net {
-    class DatagramSocket;
-}
-
 class OPENDHT_PUBLIC DhtInterface {
 public:
    DhtInterface() = default;
-    DhtInterface(const Logger& l) : DHT_LOG(l) {};
    virtual ~DhtInterface() = default;

    // [[deprecated]]
@@ -44,10 +39,8 @@ public:
    virtual NodeStatus getStatus(sa_family_t af) const = 0;
    virtual NodeStatus getStatus() const = 0;

-    virtual net::DatagramSocket* getSocket() const { return {}; };
-
    /**
-     * Get the ID of the DHT node.
+     * Get the ID of the node.
     */
    virtual const InfoHash& getNodeId() const = 0;

@@ -79,7 +72,7 @@ public:

    virtual void pingNode(const sockaddr*, socklen_t, DoneCallbackSimple&& cb={}) = 0;

-    virtual time_point periodic(const uint8_t *buf, size_t buflen, SockAddr) = 0;
+    virtual time_point periodic(const uint8_t *buf, size_t buflen, const SockAddr&) = 0;
    virtual time_point periodic(const uint8_t *buf, size_t buflen, const sockaddr* from, socklen_t fromlen) = 0;

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

    /**
     * Get locally stored data for the given key and value id.
@@ -150,12 +143,12 @@ public:
    /**
     * Get data currently being put at the given hash.
     */
-    virtual std::vector<Sp<Value>> getPut(const InfoHash&) const = 0;
+    virtual std::vector<Sp<Value>> getPut(const InfoHash&) = 0;

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

    /**
     * Stop any put/announce operation at the given location,
@@ -188,7 +181,7 @@ public:
     * Get the list of good nodes for local storage saving purposes
     * The list is ordered to minimize the back-to-work delay.
     */
-    virtual std::vector<NodeExport> exportNodes() const = 0;
+    virtual std::vector<NodeExport> exportNodes() = 0;

    virtual std::vector<ValuesExport> exportValues() const = 0;
    virtual void importValues(const std::vector<ValuesExport>&) = 0;
@@ -221,18 +214,13 @@ public:
    /**
     * Enable or disable logging of DHT internal messages
     */
-    virtual void setLoggers(LogMethod error = {}, LogMethod warn = {}, LogMethod debug = {}) {
-        DHT_LOG.DBG = debug;
+    virtual void setLoggers(LogMethod error = NOLOG, LogMethod warn = NOLOG, LogMethod debug = NOLOG)
+    {
+        DHT_LOG.DEBUG = debug;
        DHT_LOG.WARN = warn;
        DHT_LOG.ERR = error;
    }

-    virtual void setLogger(const Logger& l) {
-        DHT_LOG.DBG = l.DBG;
-        DHT_LOG.WARN = l.WARN;
-        DHT_LOG.ERR = l.ERR;
-    }
-
    /**
     * Only print logs related to the given InfoHash (if given), or disable filter (if zeroes).
     */
@@ -250,6 +238,8 @@ public:
    virtual void pushNotificationReceived(const std::map<std::string, std::string>& data) = 0;

 protected:
+    bool logFilerEnable_ {};
+    InfoHash logFiler_ {};
    Logger DHT_LOG;
 };

@@ -1,8 +1,7 @@
 /*
- *  Copyright (C) 2016-2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2016-2018 Savoir-faire Linux Inc.
 *  Author: Sébastien Blin <sebastien.blin@savoirfairelinux.com>
 *          Adrien Béraud <adrien.beraud@savoirfairelinux.com>
- *          Vsevolod Ivanov <vsevolod.ivanov@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
@@ -18,51 +17,42 @@
 *  along with this program. If not, see <https://www.gnu.org/licenses/>.
 */

+#if OPENDHT_PROXY_CLIENT
+
 #pragma once

 #include <functional>
+#include <thread>
 #include <mutex>

 #include "callbacks.h"
 #include "def.h"
 #include "dht_interface.h"
+#include "scheduler.h"
 #include "proxy.h"

-#include <restinio/all.hpp>
-#include <http_parser.h>
-#include <json/json.h>
-#include "http.h"
-
-#include <chrono>
-#include <vector>
-#include <functional>
+namespace restbed {
+    class Request;
+}

 namespace Json {
    class Value;
 }

-namespace http {
-    class Client;
-}
-
 namespace dht {

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

    DhtProxyClient();

-    explicit DhtProxyClient(std::function<void()> loopSignal, const std::string& serverHost,
-                            const std::string& pushClientId = "",
-                            std::shared_ptr<dht::Logger> logger = {});
-
-    restinio::http_header_fields_t initHeaderFields();
+    explicit DhtProxyClient(std::function<void()> loopSignal, const std::string& serverHost, const std::string& pushClientId = "");

    virtual void setPushNotificationToken(const std::string& token) {
-#ifdef OPENDHT_PUSH_NOTIFICATIONS
+#if OPENDHT_PUSH_NOTIFICATIONS
        deviceKey_ = token;
-#else
-        (void) token;
 #endif
    }

@@ -184,10 +174,6 @@ public:
    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));
    }
-    /*
-     * This function relies on the cache implementation.
-     * It means that there are no true cancel here, it keeps the caching in higher priority.
-     */
    virtual bool cancelListen(const InfoHash& key, size_t token);

    /**
@@ -196,11 +182,12 @@ public:
     */
    void pushNotificationReceived(const std::map<std::string, std::string>& notification);

-    time_point periodic(const uint8_t*, size_t, SockAddr);
-    time_point periodic(const uint8_t* buf, size_t buflen, const sockaddr* from, socklen_t fromlen) {
+    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));
    }

+
    /**
     * Similar to Dht::get, but sends a Query to filter data remotely.
     * @param key the key for which to query data for.
@@ -219,12 +206,12 @@ public:
    /**
     * Get data currently being put at the given hash.
     */
-    std::vector<Sp<Value>> getPut(const InfoHash&) const;
+    std::vector<Sp<Value>> getPut(const InfoHash&);

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

    /**
     * Stop any put/announce operation at the given location,
@@ -241,7 +228,7 @@ public:
        return types.getType(type_id);
    }

-    std::vector<Sp<Value>> getLocal(const InfoHash& k, const Value::Filter& filter) const;
+    std::vector<Sp<Value>> getLocal(const InfoHash& k, Value::Filter filter) const;
    Sp<Value> getLocalById(const InfoHash& k, Value::Id id) const;

    /**
@@ -252,7 +239,7 @@ public:
    void insertNode(const InfoHash&, const sockaddr*, socklen_t) { }
    void insertNode(const NodeExport&) { }
    std::pair<size_t, size_t> getStoreSize() const { return {}; }
-    std::vector<NodeExport> exportNodes() const { return {}; }
+    std::vector<NodeExport> exportNodes() { return {}; }
    std::vector<ValuesExport> exportValues() const { return {}; }
    void importValues(const std::vector<ValuesExport>&) {}
    std::string getStorageLog() const { return {}; }
@@ -277,42 +264,21 @@ private:
     * Start the connection with a server.
     */
    void startProxy();
-    void stop();

    /**
     * Get informations from the proxy node
     * @return the JSON returned by the proxy
     */
-    struct InfoState;
    void getProxyInfos();
-    void handleProxyStatus(const asio::error_code &ec, std::shared_ptr<InfoState> infoState);
    void onProxyInfos(const Json::Value& val, sa_family_t family);
    SockAddr parsePublicAddress(const Json::Value& val);

    void opFailed();

-    void handleExpireListener(const asio::error_code &ec, const InfoHash& key);
-
-    struct Listener;
-    struct ListenState;
-    enum class ListenMethod {
-        LISTEN,
-        SUBSCRIBE,
-        RESUBSCRIBE,
-    };
-    /**
-     * Send Listen with httpClient_
-     */
-    void sendListen(const restinio::http_request_header_t header,
-                    const ValueCallback &cb,
-                    const Sp<ListenState> &state, Listener &listener,
-                    ListenMethod method = ListenMethod::LISTEN);
-    void handleResubscribe(const asio::error_code &ec, const InfoHash& key,
-                           const size_t token, std::shared_ptr<ListenState> state);
+    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);
-    void handleRefreshPut(const asio::error_code &ec, const InfoHash& key, const Value::Id id,
-                          std::shared_ptr<std::atomic_bool> ok);

    /**
     * Initialize statusIpvX_
@@ -327,24 +293,10 @@ private:
     */
    void cancelAllOperations();

-    std::pair<std::string, std::string> serverHostService_;
+    std::string serverHost_;
    std::string pushClientId_;

-    /*
-     * ASIO I/O Context for sockets in httpClient_
-     * Note: Each context is used in one thread only
-     */
-    asio::io_context httpContext_;
-    /*
-     * http::Client instance used on http io_context
-     */
-    std::unique_ptr<http::Client> httpClient_;
-    /*
-     * Thread for executing the http io_context.run() blocking call
-     */
-    std::thread httpClientThread_;
-
-    mutable std::mutex lockCurrentProxyInfos_;
+    std::atomic_flag ongoingStatusUpdate_ = ATOMIC_FLAG_INIT;
    NodeStatus statusIpv4_ {NodeStatus::Disconnected};
    NodeStatus statusIpv6_ {NodeStatus::Disconnected};
    NodeStats stats4_ {};
@@ -360,29 +312,39 @@ private:
    /**
     * Store listen requests.
     */
+    struct Listener;
    struct ProxySearch;

    size_t listenerToken_ {0};
    std::map<InfoHash, ProxySearch> searches_;
    mutable std::mutex searchLock_;

+    /**
+     * Store current put and get requests.
+     */
+    struct Operation
+    {
+        std::shared_ptr<restbed::Request> req;
+        std::thread thread;
+        std::shared_ptr<std::atomic_bool> finished;
+    };
+    std::vector<Operation> operations_;
+    std::mutex lockOperations_;
    /**
     * Callbacks should be executed in the main thread.
     */
    std::vector<std::function<void()>> callbacks_;
-    std::mutex lockCallbacks_;
+    std::mutex lockCallbacks;

-    Sp<InfoState> infoState_;
-    Sp<asio::steady_timer> statusTimer_;
-    mutable std::mutex statusLock_;
+    std::thread statusThread_;
+    mutable std::mutex lockCurrentProxyInfos_;

+    Scheduler scheduler;
    /**
     * Retrieve if we can connect to the proxy (update statusIpvX_)
     */
-    void handleProxyConfirm(const asio::error_code &ec);
-    Sp<asio::steady_timer> nextProxyConfirmationTimer_;
-    Sp<asio::steady_timer> listenerRestartTimer_;
-
+    void confirmProxy();
+    Sp<Scheduler::Job> nextProxyConfirmation {};
    /**
     * Relaunch LISTEN requests if the client disconnect/reconnect.
     */
@@ -392,7 +354,7 @@ private:
     * Refresh a listen via a token
     * @param token
     */
-    void resubscribe(const InfoHash& key, const size_t token, Listener& listener);
+    void resubscribe(const InfoHash& key, Listener& listener);

    /**
     * If we want to use push notifications by default.
@@ -402,14 +364,14 @@ private:

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

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

-    std::atomic_bool isDestroying_ {false};
-
-    std::shared_ptr<dht::Logger> logger_;
+    bool isDestroying_ {false};
 };

 }
+
+#endif // OPENDHT_PROXY_CLIENT
@@ -1,8 +1,7 @@
 /*
- *  Copyright (C) 2017-2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2017-2018 Savoir-faire Linux Inc.
 *  Author: Sébastien Blin <sebastien.blin@savoirfairelinux.com>
 *          Adrien Béraud <adrien.beraud@savoirfairelinux.com>
- *          Vsevolod Ivanov <vsevolod.ivanov@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
@@ -18,51 +17,21 @@
 *  along with this program. If not, see <https://www.gnu.org/licenses/>.
 */

+#if OPENDHT_PROXY_SERVER
+
 #pragma once

-#include "callbacks.h"
 #include "def.h"
-#include "infohash.h"
-#include "proxy.h"
-#include "scheduler.h"
 #include "sockaddr.h"
+#include "infohash.h"
+#include "scheduler.h"
 #include "value.h"
-#include "dht_proxy_client.h"
+#include "proxy.h"

+#include <thread>
 #include <memory>
 #include <mutex>
-#include <restinio/all.hpp>
-#include "http.h"
-
-#ifdef OPENDHT_JSONCPP
-#include <json/json.h>
-#endif
-
-namespace http {
-    class Client;
-    class opendht_logger_t;
-    struct ListenerSession;
-    class ConnectionListener;
-}
-
-namespace restinio {
-    class opendht_logger_t;
-    struct custom_http_methods_t;
-}
-
-using RestRouter = restinio::router::express_router_t<>;
-struct RestRouterTraits : public restinio::default_traits_t
-{
-    using timer_manager_t = restinio::asio_timer_manager_t;
-    using http_methods_mapper_t = restinio::custom_http_methods_t;
-    using logger_t = restinio::opendht_logger_t;
-    using request_handler_t = RestRouter;
-    using connection_state_listener_t = http::ConnectionListener;
-};
-using ServerSettings = restinio::run_on_this_thread_settings_t<RestRouterTraits>;
-using RequestStatus = restinio::request_handling_status_t;
-using ResponseByParts = restinio::chunked_output_t;
-using ResponseByPartsBuilder = restinio::response_builder_t<ResponseByParts>;
+#include <restbed>

 namespace Json {
    class Value;
@@ -86,9 +55,7 @@ public:
     * @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 = "",
-                   std::shared_ptr<dht::Logger> logger = {});
+    DhtProxyServer(std::shared_ptr<DhtRunner> dht, in_port_t port = 8000, const std::string& pushServer = "");
    virtual ~DhtProxyServer();

    DhtProxyServer(const DhtProxyServer& other) = delete;
@@ -105,44 +72,15 @@ public:
        size_t pushListenersCount;
        /** Average requests per second */
        double requestRate;
-        /** Node Info **/
-        NodeInfo nodeInfo;

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

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

@@ -152,14 +90,6 @@ public:
    void stop();

 private:
-    template <typename HttpResponse>
-    HttpResponse initHttpResponse(HttpResponse response) const;
-
-    ServerSettings makeHttpServerSettings(
-        const unsigned int max_pipelined_requests = 16);
-
-    std::unique_ptr<RestRouter> createRestRouter();
-
    /**
     * Return the PublicKey id, the node id and node stats
     * Method: GET "/"
@@ -167,17 +97,7 @@ private:
     * On error: HTTP 503, body: {"err":"xxxx"}
     * @param session
     */
-    RequestStatus getNodeInfo(restinio::request_handle_t request,
-                               restinio::router::route_params_t params) const;
-
-    /**
-     * Return ServerStats in JSON format
-     * Method: STATS "/"
-     * Result: HTTP 200, body: Node infos in JSON format
-     * @param session
-     */
-    RequestStatus getStats(restinio::request_handle_t request,
-                           restinio::router::route_params_t params);
+    void getNodeInfo(const std::shared_ptr<restbed::Session>& session) const;

    /**
     * Return Values of an infoHash
@@ -189,8 +109,7 @@ private:
     * On error: HTTP 503, body: {"err":"xxxx"}
     * @param session
     */
-    RequestStatus get(restinio::request_handle_t request,
-                       restinio::router::route_params_t params);
+    void get(const std::shared_ptr<restbed::Session>& session) const;

    /**
     * Listen incoming Values of an infoHash.
@@ -202,8 +121,7 @@ private:
     * On error: HTTP 503, body: {"err":"xxxx"}
     * @param session
     */
-    RequestStatus listen(restinio::request_handle_t request,
-                         restinio::router::route_params_t params);
+    void listen(const std::shared_ptr<restbed::Session>& session);

    /**
     * Put a value on the DHT
@@ -214,12 +132,11 @@ private:
     * HTTP 400, body: {"err":"xxxx"} if bad json or HTTP 502 if put fails
     * @param session
     */
-    RequestStatus put(restinio::request_handle_t request,
-                      restinio::router::route_params_t params);
+    void put(const std::shared_ptr<restbed::Session>& session);

-    void handleCancelPermamentPut(const asio::error_code &ec, const InfoHash& key, Value::Id vid);
+    void cancelPut(const InfoHash& key, Value::Id vid);

-#ifdef OPENDHT_PROXY_SERVER_IDENTITY
+#if OPENDHT_PROXY_SERVER_IDENTITY
    /**
     * Put a value to sign by the proxy on the DHT
     * Method: SIGN "/{InfoHash: .*}"
@@ -229,8 +146,7 @@ private:
     * HTTP 400, body: {"err":"xxxx"} if bad json
     * @param session
     */
-    RequestStatus putSigned(restinio::request_handle_t request,
-                            restinio::router::route_params_t params) const;
+    void putSigned(const std::shared_ptr<restbed::Session>& session) const;

    /**
     * Put a value to encrypt by the proxy on the DHT
@@ -241,9 +157,7 @@ private:
     * HTTP 400, body: {"err":"xxxx"} if bad json
     * @param session
     */
-    RequestStatus putEncrypted(restinio::request_handle_t request,
-                               restinio::router::route_params_t params);
-
+    void putEncrypted(const std::shared_ptr<restbed::Session>& session) const;
 #endif // OPENDHT_PROXY_SERVER_IDENTITY

    /**
@@ -256,8 +170,7 @@ private:
     * On error: HTTP 503, body: {"err":"xxxx"}
     * @param session
     */
-    RequestStatus getFiltered(restinio::request_handle_t request,
-                              restinio::router::route_params_t params);
+    void getFiltered(const std::shared_ptr<restbed::Session>& session) const;

    /**
     * Respond allowed Methods
@@ -266,10 +179,15 @@ private:
     * See https://developer.mozilla.org/en-US/docs/Web/HTTP/Methods/OPTIONS
     * @param session
     */
-    RequestStatus options(restinio::request_handle_t request,
-                           restinio::router::route_params_t params);
+    void handleOptionsMethod(const std::shared_ptr<restbed::Session>& session) const;

-#ifdef OPENDHT_PUSH_NOTIFICATIONS
+    /**
+     * 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: .*}"
@@ -279,9 +197,7 @@ private:
     * so you need to refresh the operation each six hours.
     * @param session
     */
-    RequestStatus subscribe(restinio::request_handle_t request,
-                            restinio::router::route_params_t params);
-
+    void subscribe(const std::shared_ptr<restbed::Session>& session);
    /**
     * Unsubscribe to push notifications for an iOS or Android device.
     * Method: UNSUBSCRIBE "/{InfoHash: .*}"
@@ -289,75 +205,53 @@ private:
     * Return: nothing
     * @param session
     */
-    RequestStatus unsubscribe(restinio::request_handle_t request,
-                              restinio::router::route_params_t params);
-
+    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, Json::Value&& json, bool isAndroid) const;
-
-    /**
-     * Send push notification with an expire timeout.
-     * @param ec
-     * @param pushToken
-     * @param json
-     * @param isAndroid
-     */
-    void handleNotifyPushListenExpire(const asio::error_code &ec, const std::string pushToken,
-                                      Json::Value json, const bool isAndroid);
+    void sendPushNotification(const std::string& key, const Json::Value& json, bool isAndroid) const;

    /**
     * Remove a push listener between a client and a hash
-     * @param ec
     * @param pushToken
     * @param key
     * @param clientId
     */
-    void handleCancelPushListen(const asio::error_code &ec, const std::string pushToken,
-                                const InfoHash key, const std::string clientId);
+    void cancelPushListen(const std::string& pushToken, const InfoHash& key, const std::string& clientId);
+

 #endif //OPENDHT_PUSH_NOTIFICATIONS

-    void handlePrintStats(const asio::error_code &ec);
-
    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::shared_ptr<dht::Logger> logger_;
-    Json::StreamWriterBuilder jsonBuilder_;

-    std::thread httpServerThread_;
-    std::unique_ptr<restinio::http_server_t<RestRouterTraits>> httpServer_;
-    std::unique_ptr<http::Client> httpClient_;
+    std::mutex schedulerLock_;
+    std::condition_variable schedulerCv_;
+    Scheduler scheduler_;
+    std::thread schedulerThread_;

-    mutable std::mutex statsMutex_;
-    mutable ServerStats stats_;
-    mutable NodeInfo nodeInfo_ {};
-    std::unique_ptr<asio::steady_timer> printStatsTimer_;
+    Sp<Scheduler::Job> printStatsJob_;

-    // Thread-safe access to listeners map.
-    std::shared_ptr<std::mutex> lockListener_;
-    // Shared with connection listener.
-    std::shared_ptr<std::map<restinio::connection_id_t,
-                             http::ListenerSession>> listeners_;
-    // Connection Listener observing conn state changes.
-    std::shared_ptr<http::ConnectionListener> connListener_;
-
-    struct PermanentPut {
-        time_point expiration;
-        std::string pushToken;
-        std::string clientId;
-        std::unique_ptr<asio::steady_timer> expireTimer;
-        std::unique_ptr<asio::steady_timer> expireNotifyTimer;
+    // Handle client quit for listen.
+    // NOTE: can be simplified when we will supports restbed 5.0
+    std::thread listenThread_;
+    struct SessionToHashToken {
+        std::shared_ptr<restbed::Session> session;
+        InfoHash hash;
+        std::future<size_t> token;
    };
-    struct SearchPuts {
-        std::map<dht::Value::Id, PermanentPut> puts;
-    };
-    std::mutex lockSearchPuts_;
+    std::vector<SessionToHashToken> currentListeners_;
+    std::mutex lockListener_;
+    std::atomic_bool stopListeners {false};
+
+    struct PermanentPut;
+    struct SearchPuts;
    std::map<InfoHash, SearchPuts> puts_;

    mutable std::atomic<size_t> requestNum_ {0};
@@ -365,16 +259,9 @@ private:

    const std::string pushServer_;

-#ifdef OPENDHT_PUSH_NOTIFICATIONS
-    struct Listener {
-        std::string clientId;
-        std::future<size_t> internalToken;
-        std::unique_ptr<asio::steady_timer> expireTimer;
-        std::unique_ptr<asio::steady_timer> expireNotifyTimer;
-    };
-    struct PushListener {
-        std::map<InfoHash, std::vector<Listener>> listeners;
-    };
+#if OPENDHT_PUSH_NOTIFICATIONS
+    struct Listener;
+    struct PushListener;
    std::mutex lockPushListeners_;
    std::map<std::string, PushListener> pushListeners_;
    proxy::ListenToken tokenPushNotif_ {0};
@@ -382,3 +269,5 @@ private:
 };

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

 #pragma once

-#include "def.h"
 #include "infohash.h"
 #include "value.h"
 #include "callbacks.h"
 #include "sockaddr.h"
 #include "log_enable.h"
-#include "network_utils.h"
+#include "def.h"

 #include <thread>
 #include <mutex>
@@ -41,7 +40,6 @@ namespace dht {

 struct Node;
 class SecureDht;
-class PeerDiscovery;
 struct SecureDhtConfig;

 /**
@@ -53,43 +51,32 @@ struct SecureDhtConfig;
 class OPENDHT_PUBLIC DhtRunner {

 public:
-    using StatusCallback = std::function<void(NodeStatus, NodeStatus)>;
+    typedef std::function<void(NodeStatus, NodeStatus)> StatusCallback;

    struct Config {
-        SecureDhtConfig dht_config {};
-        bool threaded {true};
-        std::string proxy_server {};
-        std::string push_node_id {};
-        bool peer_discovery {false};
-        bool peer_publish {false};
-    };
-
-    struct Context {
-        std::shared_ptr<Logger> logger {};
-        std::unique_ptr<net::DatagramSocket> sock;
-        std::shared_ptr<PeerDiscovery> peerDiscovery {};
-        StatusCallback statusChangedCallback {};
-        CertificateStoreQuery certificateStore {};
-        Context() {}
+        SecureDhtConfig dht_config;
+        bool threaded;
+        std::string proxy_server;
+        std::string push_node_id;
    };

    DhtRunner();
    virtual ~DhtRunner();

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

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

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

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

    template <class T>
    void get(InfoHash hash, std::function<bool(std::vector<T>&&)> cb, DoneCallbackSimple dcb={})
@@ -118,7 +105,7 @@ public:
        getFilterSet<T>());
    }

-    std::future<std::vector<std::shared_ptr<dht::Value>>> get(InfoHash key, Value::Filter f = {}, Where w = {}) {
+    std::future<std::vector<std::shared_ptr<dht::Value>>> get(InfoHash key, Value::Filter f = Value::AllFilter(), Where w = {}) {
        auto p = std::make_shared<std::promise<std::vector<std::shared_ptr< dht::Value >>>>();
        auto values = std::make_shared<std::vector<std::shared_ptr< dht::Value >>>();
        get(key, [=](const std::vector<std::shared_ptr<dht::Value>>& vlist) {
@@ -149,7 +136,7 @@ public:
        query(hash, cb, bindDoneCb(done_cb), q);
    }

-    std::future<size_t> listen(InfoHash key, ValueCallback vcb, Value::Filter f = {}, Where w = {});
+    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){
@@ -158,8 +145,8 @@ public:
            return true;
        }, std::forward<Value::Filter>(f), std::forward<Where>(w));
    }
-    std::future<size_t> listen(const std::string& key, GetCallback vcb, Value::Filter f = {}, Where w = {});
-    std::future<size_t> listen(InfoHash key, GetCallbackSimple cb, Value::Filter f = {}, 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);
    }

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

    void cancelListen(InfoHash h, size_t token);
    void cancelListen(InfoHash h, std::shared_future<size_t> token);
@@ -272,12 +234,6 @@ public:
     */
    void bootstrap(const std::string& host, const std::string& service);

-    /**
-     * Insert known nodes to the routing table, without necessarly ping them.
-     * Usefull to restart a node and get things running fast without putting load on the network.
-     */
-    void bootstrap(const InfoHash& id, const SockAddr& address);
-
    /**
     * Clear the list of bootstrap added using bootstrap(const std::string&, const std::string&).
     */
@@ -292,21 +248,17 @@ public:

    void dumpTables() const;

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

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

    /**
     * Returns the currently bound address.
     * @param f: address family of the bound address to retreive.
     */
-    SockAddr getBound(sa_family_t f = AF_INET) const;
+    const SockAddr& getBound(sa_family_t f = AF_INET) const {
+        return (f == AF_INET) ? bound4 : bound6;
+    }

    /**
     * Returns the currently bound port, in host byte order.
@@ -324,8 +276,7 @@ public:

    std::vector<ValuesExport> exportValues() const;

-    void setLogger(const Logger& logger = {});
-    void setLoggers(LogMethod err = {}, LogMethod warn = {}, LogMethod debug = {});
+    void setLoggers(LogMethod err = NOLOG, LogMethod warn = NOLOG, LogMethod debug = NOLOG);

    /**
     * Only print logs related to the given InfoHash (if given), or disable filter (if zeroes).
@@ -342,7 +293,6 @@ public:

    NodeStats getNodesStats(sa_family_t af) const;
    unsigned getNodesStats(sa_family_t af, unsigned *good_return, unsigned *dubious_return, unsigned *cached_return, unsigned *incoming_return) const;
-    NodeInfo getNodeInfo() const;

    std::vector<unsigned> getNodeMessageStats(bool in = false) const;
    std::string getStorageLog() const;
@@ -365,14 +315,23 @@ public:
     * @param threaded: If false, ::loop() must be called periodically. Otherwise a thread is launched.
     * @param cb: Optional callback to receive general state information.
     */
-    void run(in_port_t port = 4222, const crypto::Identity& identity = {}, bool threaded = true, NetId network = 0) {
-        Config config;
-        config.dht_config.node_config.network = network;
-        config.dht_config.id = identity;
-        config.threaded = threaded;
-        run(port, config);
+    void run(in_port_t port = 4222, const crypto::Identity identity = {}, bool threaded = false, NetId network = 0) {
+        run(port, {
+            /*.dht_config = */{
+                /*.node_config = */{
+                    /*.node_id = */{},
+                    /*.network = */network,
+                    /*.is_bootstrap = */false,
+                    /*.maintain_storage*/false
+                },
+                /*.id = */identity
+            },
+            /*.threaded = */threaded,
+            /*.proxy_server = */"",
+            /*.push_node_id = */""
+        });
    }
-    void run(in_port_t port, const Config& config, Context&& context = {});
+    void run(in_port_t port, Config config);

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

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

    void setOnStatusChanged(StatusCallback&& cb) {
        statusCb = std::move(cb);
@@ -402,7 +359,13 @@ public:
     */
    time_point loop() {
        std::lock_guard<std::mutex> lck(dht_mtx);
-        return loop_();
+        time_point wakeup = time_point::min();
+        try {
+            wakeup = loop_();
+        } catch (const dht::SocketException& e) {
+            startNetwork(bound4, bound6);
+        }
+        return wakeup;
    }

    /**
@@ -417,9 +380,15 @@ public:
     */
    void join();

-    std::shared_ptr<PeerDiscovery> getPeerDiscovery() const { return peerDiscovery_; };
-
-    void setProxyServer(const std::string& proxy, const std::string& pushNodeId = "");
+    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
+    }

    /**
     * Start or stop the proxy
@@ -454,6 +423,7 @@ private:
     */
    void tryBootstrapContinuously();

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

    NodeStatus getStatus() const {
@@ -491,8 +461,10 @@ private:
    mutable std::mutex dht_mtx {};
    std::thread dht_thread {};
    std::condition_variable cv {};
+
+    std::thread rcv_thread {};
    std::mutex sock_mtx {};
-    std::queue<std::unique_ptr<net::ReceivedPacket>> rcv {};
+    std::vector<std::pair<Blob, SockAddr>> rcv {};

    /** true if currently actively boostraping */
    std::atomic_bool bootstraping {false};
@@ -500,6 +472,7 @@ private:
    std::vector<std::pair<std::string,std::string>> bootstrap_nodes_all {};
    std::vector<std::pair<std::string,std::string>> bootstrap_nodes {};
    std::thread bootstrap_thread {};
+    /** protects bootstrap_nodes, bootstrap_thread */
    std::mutex bootstrap_mtx {};
    std::condition_variable bootstrap_cv {};

@@ -508,22 +481,18 @@ private:
    std::mutex storage_mtx {};

    std::atomic_bool running {false};
+    std::atomic_bool running_network {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_;
-
-    /** PeerDiscovery Parameters */
-    std::shared_ptr<PeerDiscovery> peerDiscovery_;
-
-    /**
-     * The Logger instance is used in enableProxy and other methods that
-     * would create instances of classes using a common logger.
-     */
-    std::shared_ptr<dht::Logger> logger_;
 };

 }
@@ -1,240 +0,0 @@
-/*
- *  Copyright (C) 2016-2019 Savoir-faire Linux Inc.
- *  Author: Vsevolod Ivanov <vsevolod.ivanov@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 <asio.hpp>
-#include <json/json.h>
-#include <http_parser.h>
-#include <restinio/all.hpp>
-#include <opendht.h>
-#include <opendht/def.h>
-#include <opendht/log.h>
-
-namespace http {
-
-class Connection;
-
-// basic types
-using Id = unsigned int;
-
-// asio handlers callbacks
-using HandlerCb = std::function<void(const asio::error_code& ec)>;
-using ConnectionCb = std::function<void(const asio::error_code& ec, std::shared_ptr<Connection>)>;
-
-class OPENDHT_PUBLIC Connection
-{
-public:
-    Connection(asio::ip::tcp::socket socket, std::shared_ptr<dht::Logger> logger = {});
-    ~Connection();
-
-    Id id();
-    bool is_open();
-    bool is_v6();
-    void timeout(const std::chrono::seconds timeout, HandlerCb cb = {});
-    // TODO abort to silence error in request?
-    void close();
-
-private:
-    friend class Client;
-
-    Id id_;
-    static Id ids_;
-    std::shared_ptr<dht::Logger> logger_;
-
-    asio::ip::tcp::socket socket_;
-    asio::ip::tcp::endpoint endpoint_;
-
-    asio::streambuf request_;
-    std::string response_body_;
-    asio::streambuf response_chunk_;
-
-    std::unique_ptr<asio::steady_timer> timeout_timer_;
-};
-
-/**
- * Session value associated with a connection_id_t key.
- */
-struct ListenerSession
-{
-    ListenerSession() = default;
-    dht::InfoHash hash;
-    std::future<size_t> token;
-    std::shared_ptr<restinio::response_builder_t<restinio::chunked_output_t>> response;
-};
-
-class ConnectionListener
-{
-public:
-    ConnectionListener();
-    ConnectionListener(std::shared_ptr<dht::DhtRunner> dht,
-        std::shared_ptr<std::map<restinio::connection_id_t, http::ListenerSession>> listeners,
-        std::shared_ptr<std::mutex> lock, std::shared_ptr<dht::Logger> logger);
-    ~ConnectionListener();
-
-    /**
-     * Connection state change used to handle Listeners disconnects.
-     * RESTinio >= 0.5.1 https://github.com/Stiffstream/restinio/issues/28
-     */
-    void state_changed(const restinio::connection_state::notice_t& notice) noexcept;
-
-private:
-    std::string to_str( restinio::connection_state::cause_t cause ) noexcept;
-
-    std::shared_ptr<dht::DhtRunner> dht_;
-    std::shared_ptr<std::mutex> lock_;
-    std::shared_ptr<std::map<restinio::connection_id_t,
-                             http::ListenerSession>> listeners_;
-
-    std::shared_ptr<dht::Logger> logger_;
-};
-
-
-class Resolver {
-    Resolver(asio::io_context& ctx, const std::string& host, const std::string& service = "80");
-
-    using ResolvedCb = std::function<void(const asio::error_code&, const asio::ip::basic_resolver_results<asio::ip::tcp>&)>;
-    void addOnResolved(ResolvedCb cb);
-
-private:
-    std::mutex cbsMutex_;
-    asio::ip::tcp::resolver resolver_;
-    asio::error_code error_;
-    asio::ip::basic_resolver_results<asio::ip::tcp> endpoints_;
-    std::queue<ResolvedCb> cbs_;
-    bool completed_ {false};
-};
-
-class OPENDHT_PUBLIC Request
-{
-public:
-    Request(asio::io_context& ctx, const std::string host, const std::string service = "80",
-            const bool resolve = true, std::shared_ptr<dht::Logger> logger = {});
-    ~Request();
-
-    void set_logger(std::shared_ptr<dht::Logger> logger);
-
-    void terminate();
-
-    void resolve(const std::string host, const std::string service, HandlerCb cb = {});
-    bool resolved();
-
-    void connect(ConnectionCb cb = {});
-
-    std::string build(const restinio::http_request_header_t header,
-                      const restinio::http_header_fields_t header_fields,
-                      const restinio::http_connection_header_t connection, const std::string body);
-
-    void send(std::string request, std::unique_ptr<http_parser> parser,
-              std::unique_ptr<http_parser_settings> parser_s, HandlerCb cb = {});
-
-private:
-    void handle_request(const asio::error_code& ec, HandlerCb cb = {});
-
-    void handle_response_header(const asio::error_code& ec, const size_t bytes, HandlerCb cb = {});
-
-    void handle_response_body(const asio::error_code& ec, const size_t bytes, HandlerCb cb = {});
-
-    void parse_request(const std::string request);
-
-    size_t get_content_length(const std::string str);
-
-    Resolver resolver_;
-    /* std::string service_;
-    std::string host_;
-
-    asio::ip::tcp::resolver resolver_;
-    asio::ip::basic_resolver_results<asio::ip::tcp> endpoints_;
-*/
-    Id id_;
-    static Id ids_;
-    std::shared_ptr<Connection> conn_;
-
-    std::string request_;
-    std::unique_ptr<http_parser> parser_;
-    std::unique_ptr<http_parser_settings> parser_s_;
-
-    std::shared_ptr<dht::Logger> logger_;
-};
-
-} // namespace http
-
-namespace restinio
-{
-
-class opendht_logger_t
-{
-public:
-    opendht_logger_t(std::shared_ptr<dht::Logger> logger = {}){
-        if (logger)
-            m_logger = logger;
-    }
-
-    template <typename Builder>
-    void trace(Builder && msg_builder){
-        if (m_logger)
-            m_logger->d("[proxy:server] %s", msg_builder().c_str());
-    }
-
-    template <typename Builder>
-    void info(Builder && msg_builder){
-        if (m_logger)
-            m_logger->d("[proxy:server] %s", msg_builder().c_str());
-    }
-
-    template <typename Builder>
-    void warn(Builder && msg_builder){
-        if (m_logger)
-            m_logger->w("[proxy:server] %s", msg_builder().c_str());
-    }
-
-    template <typename Builder>
-    void error(Builder && msg_builder){
-        if (m_logger)
-            m_logger->e("[proxy:server] %s", msg_builder().c_str());
-    }
-
-private:
-    std::shared_ptr<dht::Logger> m_logger;
-};
-
-/* Custom HTTP-methods for RESTinio > 0.5.0.
- * https://github.com/Stiffstream/restinio/issues/26
- */
-constexpr const restinio::http_method_id_t method_listen{HTTP_LISTEN, "LISTEN"};
-constexpr const restinio::http_method_id_t method_stats{HTTP_STATS, "STATS"};
-constexpr const restinio::http_method_id_t method_sign{HTTP_SIGN, "SIGN"};
-constexpr const restinio::http_method_id_t method_encrypt{HTTP_ENCRYPT, "ENCRYPT"};
-
-struct custom_http_methods_t
-{
-    static constexpr restinio::http_method_id_t from_nodejs(int m) noexcept {
-        if(m == method_listen.raw_id())
-            return method_listen;
-        else if(m == method_stats.raw_id())
-            return method_stats;
-        else if(m == method_sign.raw_id())
-            return method_sign;
-        else if(m == method_encrypt.raw_id())
-            return method_encrypt;
-        else
-            return restinio::default_http_methods_t::from_nodejs(m);
-    }
-};
-
-} // namespace restinio
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 Savoir-faire Linux Inc.
 *  Author(s) : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 *              Simon Désaulniers <simon.desaulniers@savoirfairelinux.com>
 *              Nicolas Reynaud <nicolas.reynaud@savoirfairelinux.com>
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 Savoir-faire Linux Inc.
 *  Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 *
 *  This program is free software; you can redistribute it and/or modify
@@ -65,7 +65,7 @@ public:
    typedef typename T::iterator iterator;
    typedef typename T::const_iterator const_iterator;

-    Hash () noexcept {
+    Hash () {
        data_.fill(0);
    }
    Hash (const uint8_t* h, size_t data_len) {
@@ -85,7 +85,7 @@ public:
        msgpack_unpack(o);
    }

-    static constexpr size_t size() noexcept { return N; }
+    size_t size() const { return data_.size(); }
    const uint8_t* data() const { return data_.data(); }
    uint8_t* data() { return data_.data(); }
    iterator begin() { return data_.begin(); }
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 Savoir-faire Linux Inc.
 *
 *  Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 *
@@ -66,15 +66,6 @@ constexpr const Color::Modifier yellow(Color::FG_YELLOW);
 OPENDHT_PUBLIC void
 printLog(std::ostream &s, char const *m, va_list args);

-OPENDHT_PUBLIC
-std::unique_ptr<Logger> getStdLogger();
-
-OPENDHT_PUBLIC
-std::unique_ptr<Logger> getFileLogger(const std::string &path);
-
-OPENDHT_PUBLIC
-std::unique_ptr<Logger> getSyslogLogger(const char* name);
-
 OPENDHT_PUBLIC void
 enableLogging(dht::DhtRunner &dht);

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

 // Logging related utility functions

+/**
+ * Dummy function used to disable logging
+ */
+inline void NOLOG(char const*, va_list) {}
+
 /**
 * Wrapper for logging methods
 */
 struct LogMethod {
    LogMethod() = default;

-    LogMethod(LogMethod&& l) : func(std::move(l.func)) {}
-    LogMethod(const LogMethod& l) : func(l.func) {}
-
-    LogMethod& operator=(dht::LogMethod&& l) {
-        func = std::forward<LogMethod>(l.func);
-        return *this;
-    }
-    LogMethod& operator=(const dht::LogMethod& l) {
-        func = l.func;
-        return *this;
-    }
-
    template<typename T>
-    explicit LogMethod(T&& t) : func(std::forward<T>(t)) {}
-
-    template<typename T>
-    LogMethod(const T& t) : func(t) {}
+    LogMethod(T&& t) : func(std::forward<T>(t)) {}

    void operator()(char const* format, ...) const {
        va_list args;
@@ -80,13 +70,9 @@ private:
 };

 struct Logger {
-    LogMethod DBG = {};
-    LogMethod WARN = {};
-    LogMethod ERR = {};
-
-    Logger() = default;
-    Logger(LogMethod&& err, LogMethod&& warn, LogMethod&& dbg)
-        : DBG(std::move(dbg)), WARN(std::move(warn)), ERR(std::move(err)) {}
+    LogMethod DEBUG = NOLOG;
+    LogMethod WARN = NOLOG;
+    LogMethod ERR = NOLOG;
    void setFilter(const InfoHash& f) {
        filter_ = f;
        filterEnable_ = static_cast<bool>(filter_);
@@ -113,7 +99,7 @@ struct Logger {
 #if OPENDHT_LOG
        va_list args;
        va_start(args, format);
-        log0(DBG, format, args);
+        log0(DEBUG, format, args);
        va_end(args);
 #endif
    }
@@ -121,7 +107,7 @@ struct Logger {
 #if OPENDHT_LOG
        va_list args;
        va_start(args, format);
-        log1(DBG, f, format, args);
+        log1(DEBUG, f, format, args);
        va_end(args);
 #endif
    }
@@ -129,7 +115,7 @@ struct Logger {
 #if OPENDHT_LOG
        va_list args;
        va_start(args, format);
-        log2(DBG, f1, f2, format, args);
+        log2(DEBUG, f1, f2, format, args);
        va_end(args);
 #endif
    }
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2018 Savoir-faire Linux Inc.
 *  Author(s) : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 *              Simon Désaulniers <simon.desaulniers@savoirfairelinux.com>
 *
@@ -27,8 +27,6 @@
 #include "utils.h"
 #include "rng.h"
 #include "rate_limiter.h"
-#include "log_enable.h"
-#include "network_utils.h"

 #include <vector>
 #include <string>
@@ -70,14 +68,14 @@ public:
    DhtProtocolException(uint16_t code, const std::string& msg="", InfoHash failing_node_id={})
        : DhtException(msg), msg(msg), code(code), failing_node_id(failing_node_id) {}

-    const std::string& getMsg() const { return msg; }
+    std::string getMsg() const { return msg; }
    uint16_t getCode() const { return code; }
-    const InfoHash& getNodeId() const { return failing_node_id; }
+    const InfoHash getNodeId() const { return failing_node_id; }

 private:
    std::string msg;
    uint16_t code;
-    InfoHash failing_node_id;
+    const InfoHash failing_node_id;
 };

 struct ParsedMessage;
@@ -206,21 +204,19 @@ public:
    using RequestCb = std::function<void(const Request&, RequestAnswer&&)>;
    using RequestExpiredCb = std::function<void(const Request&, bool)>;

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

-    ~NetworkEngine();
-
-    net::DatagramSocket* getSocket() const { return dht_socket.get(); };
+    virtual ~NetworkEngine();

    void clear();

@@ -245,7 +241,7 @@ public:
    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->hasIPv4() and dht_socket->hasIPv6() ? (WANT4 | WANT6) : -1; }
+    inline want_t want () const { return dht_socket >= 0 && dht_socket6 >= 0 ? (WANT4 | WANT6) : -1; }

    void connectivityChanged(sa_family_t);

@@ -294,9 +290,9 @@ public:
     */
    Sp<Request> sendFindNode(Sp<Node> n,
                             const InfoHash& hash,
-                             want_t want = -1,
-                             RequestCb&& on_done = {},
-                             RequestExpiredCb&& on_expired = {});
+                             want_t want,
+                             RequestCb&& on_done,
+                             RequestExpiredCb&& on_expired);
    /**
     * Send a "get" request to a given node.
     *
@@ -397,7 +393,7 @@ public:
     * @param fromlen  The length of the corresponding sockaddr structure.
     * @param now  The time to adjust the clock in the network engine.
     */
-    void processMessage(const uint8_t *buf, size_t buflen, SockAddr addr);
+    void processMessage(const uint8_t *buf, size_t buflen, const SockAddr& addr);

    Sp<Node> insertNode(const InfoHash& myid, const SockAddr& addr) {
        auto n = cache.getNode(myid, addr, scheduler.time(), 0);
@@ -472,7 +468,7 @@ private:


    // basic wrapper for socket sendto function
-    int send(const SockAddr& addr, const char *buf, size_t len, bool confirmed = false);
+    int send(const char *buf, size_t len, int flags, const SockAddr& addr);

    void sendValueParts(const TransId& tid, const std::vector<Blob>& svals, const SockAddr& addr);
    std::vector<Blob> packValueHeader(msgpack::sbuffer&, const std::vector<Sp<Value>>&);
@@ -514,7 +510,8 @@ private:
    /* DHT info */
    const InfoHash& myid;
    const NetId network {0};
-    const std::unique_ptr<DatagramSocket> dht_socket;
+    const int& dht_socket;
+    const int& dht_socket6;
    const Logger& DHT_LOG;

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

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

 } /* namespace net  */
@@ -1,115 +0,0 @@
-/*
- *  Copyright (C) 2019 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 "def.h"
-
-#include "sockaddr.h"
-#include "utils.h"
-#include "log_enable.h"
-
-#ifdef _WIN32
-#include <ws2tcpip.h>
-#include <winsock2.h>
-#else
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <unistd.h>
-#endif
-
-#include <functional>
-#include <thread>
-#include <atomic>
-#include <iostream>
-
-namespace dht {
-namespace net {
-
-int bindSocket(const SockAddr& addr, SockAddr& bound);
-
-bool setNonblocking(int fd, bool nonblocking = true);
-
-#ifdef _WIN32
-void udpPipe(int fds[2]);
-#endif
-struct ReceivedPacket {
-    Blob data;
-    SockAddr from;
-    time_point received;
-};
-
-class OPENDHT_PUBLIC DatagramSocket {
-public:
-    using OnReceive = std::function<void(std::unique_ptr<ReceivedPacket>&& packet)>;
-    virtual ~DatagramSocket() {};
-
-    virtual int sendTo(const SockAddr& dest, const uint8_t* data, size_t size, bool replied) = 0;
-
-    inline void setOnReceive(OnReceive&& cb) {
-        rx_callback = std::move(cb);
-    }
-
-    virtual const SockAddr& getBound(sa_family_t family = AF_UNSPEC) const = 0;
-    virtual bool hasIPv4() const = 0;
-    virtual bool hasIPv6() const = 0;
-
-    in_port_t getPort(sa_family_t family = AF_UNSPEC) const {
-        return getBound(family).getPort();
-    }
-
-    virtual void stop() = 0;
-protected:
-
-    inline void onReceived(std::unique_ptr<ReceivedPacket>&& packet) {
-        if (rx_callback)
-            rx_callback(std::move(packet));
-    }
-private:
-    OnReceive rx_callback;
-};
-
-class OPENDHT_PUBLIC UdpSocket : public DatagramSocket {
-public:
-    UdpSocket(in_port_t port, const Logger& l = {});
-    UdpSocket(const SockAddr& bind4, const SockAddr& bind6, const Logger& l = {});
-    ~UdpSocket();
-
-    int sendTo(const SockAddr& dest, const uint8_t* data, size_t size, bool replied) override;
-
-    const SockAddr& getBound(sa_family_t family = AF_UNSPEC) const override {
-        return (family == AF_INET6) ? bound6 : bound4;
-    }
-
-    bool hasIPv4() const override { return s4 != -1; }
-    bool hasIPv6() const override { return s6 != -1; }
-
-    void stop() override;
-private:
-    Logger logger;
-    int s4 {-1};
-    int s6 {-1};
-    int stopfd {-1};
-    SockAddr bound4, bound6;
-    std::thread rcv_thread {};
-    std::atomic_bool running {false};
-
-    void openSockets(const SockAddr& bind4, const SockAddr& bind6);
-};
-
-}
-}
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 Savoir-faire Linux Inc.
 *  Author(s) : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 *              Simon Désaulniers <simon.desaulniers@savoirfairelinux.com>
 *
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 Savoir-faire Linux Inc.
 *  Author(s) : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 *
 *  This program is free software; you can redistribute it and/or modify
@@ -40,16 +40,12 @@ struct NodeCache {
    ~NodeCache();

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

    const NodeMap& cache(sa_family_t af) const { return af == AF_INET ? cache_4 : cache_6; }
@@ -1,97 +0,0 @@
-/*
- *  Copyright (C) 2014-2019 Savoir-faire Linux Inc.
- *  Author(s) : Mingrui Zhang <mingrui.zhang@savoirfairelinux.com>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "def.h"
-#include "sockaddr.h"
-#include "infohash.h"
-
-#include <thread>
-#include <mutex>
-#include <condition_variable>
-
-namespace dht {
-
-class OPENDHT_PUBLIC PeerDiscovery
-{
-public:
-    static constexpr in_port_t DEFAULT_PORT = 8888;
-    using ServiceDiscoveredCallback = std::function<void(msgpack::object&&, SockAddr&&)>;
-
-    PeerDiscovery(in_port_t port = DEFAULT_PORT);
-    ~PeerDiscovery();
-
-    /**
-     * startDiscovery - Keep Listening data from the sender until node is joinned or stop is called
-    */
-    void startDiscovery(const std::string &type, ServiceDiscoveredCallback callback);
-
-    template<typename T>
-    void startDiscovery(const std::string &type, std::function<void(T&&, SockAddr&&)> cb) {
-        startDiscovery(type, [cb](msgpack::object&& ob, SockAddr&& addr) {
-            cb(ob.as<T>(), std::move(addr));
-        });
-    }
-
-    /**
-     * startPublish - Keeping sending data until node is joinned or stop is called - msgpack
-    */
-    void startPublish(const std::string &type, const msgpack::sbuffer &pack_buf);
-    void startPublish(sa_family_t domain, const std::string &type, const msgpack::sbuffer &pack_buf);
-
-    template<typename T>
-    void startPublish(const std::string &type, const T& object) {
-        msgpack::sbuffer buf;
-        msgpack::pack(buf, object);
-        startPublish(type, buf);
-    }
-
-    /**
-     * Thread Stopper
-    */
-    void stop();
-
-    /**
-     * Remove possible callBack to discovery
-    */
-    bool stopDiscovery(const std::string &type);
-
-    /**
-     * Remove different serivce message to send
-    */
-    bool stopPublish(const std::string &type);
-    bool stopPublish(sa_family_t domain, const std::string &type);
-
-    /**
-     * Configure the sockopt to be able to listen multicast group
-    */
-    static void socketJoinMulticast(int sockfd, sa_family_t family);
-
-    /**
-     * Join the threads
-    */
-    void join();
-
-private:
-    class DomainPeerDiscovery;
-    std::unique_ptr<DomainPeerDiscovery> peerDiscovery4_;
-    std::unique_ptr<DomainPeerDiscovery> peerDiscovery6_;
-};
-
-}
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2017-2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2017-2018 Savoir-faire Linux Inc.
 *  Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 *
 *  This program is free software; you can redistribute it and/or modify
@@ -22,8 +22,8 @@
 namespace dht {
 namespace proxy {

-constexpr const std::chrono::seconds OP_TIMEOUT {1 * 60 * 60}; // one hour
-constexpr const std::chrono::seconds OP_MARGIN {5 * 60}; // 5 minutes
+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;

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

-#ifndef _MSC_VER
+#ifndef WIN32_NATIVE
 #ifdef _WIN32

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

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

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

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

    bool onNewNode(const Sp<Node>& node, int comfirm, const time_point& now, const InfoHash& myid, net::NetworkEngine& ne);
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 Savoir-faire Linux Inc.
 *  Author(s) : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 *              Simon Désaulniers <simon.desaulniers@savoirfairelinux.com>
 *
@@ -21,6 +21,7 @@
 #pragma once

 #include "utils.h"
+#include "log_enable.h"

 #include <functional>
 #include <map>
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 Savoir-faire Linux Inc.
 *  Authors: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 *           Simon Désaulniers <simon.desaulniers@savoirfairelinux.com>
 *           Sébastien Blin <sebastien.blin@savoirfairelinux.com>
@@ -37,9 +37,9 @@ public:

    using Config = SecureDhtConfig;

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

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

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

    Value decrypt(const Value& v);

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

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

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

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

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

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

-    void setLogger(const Logger& logger) override {
-        DhtInterface::setLogger(logger);
-        dht_->setLogger(logger);
+    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) override {
+    void setLogFilter(const InfoHash& f) {
        DHT_LOG.setFilter(f);
        dht_->setLogFilter(f);
    }
@@ -334,8 +333,8 @@ private:
    SecureDht& operator=(const SecureDht&) = delete;

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

    Sp<crypto::PrivateKey> key_ {};
    Sp<crypto::Certificate> certificate_ {};
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2016-2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2016 Savoir-faire Linux Inc.
 *  Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 *
 *  This program is free software; you can redistribute it and/or modify
@@ -23,7 +23,6 @@
 #ifndef _WIN32
 #include <sys/socket.h>
 #include <netinet/in.h>
-#include <arpa/inet.h>
 #ifdef __ANDROID__
 typedef uint16_t in_port_t;
 #endif
@@ -59,7 +58,7 @@ public:
    SockAddr(const SockAddr& o) {
        set(o.get(), o.getLength());
    }
-    SockAddr(SockAddr&& o) noexcept : addr(std::move(o.addr)), len(o.len) {
+    SockAddr(SockAddr&& o) : len(o.len), addr(std::move(o.addr)) {
        o.len = 0;
    }

@@ -119,7 +118,7 @@ public:
    /**
     * Returns the address family or AF_UNSPEC if the address is not set.
     */
-    sa_family_t getFamily() const { return len ? addr->sa_family : AF_UNSPEC; }
+    sa_family_t getFamily() const { return len > sizeof(sa_family_t) ? addr->sa_family : AF_UNSPEC; }

    /**
     * Resize the managed structure to the appropriate size (if needed),
@@ -147,21 +146,6 @@ public:
            addr->sa_family = af;
    }

-    /**
-     * Set Network Interface to any
-     */
-    void setAny() {
-        auto family = getFamily();
-        switch(family) {
-        case AF_INET:
-            getIPv4().sin_addr.s_addr = htonl(INADDR_ANY);
-            break;
-        case AF_INET6:
-            getIPv6().sin6_addr = in6addr_any;
-            break;
-        }
-    }
-
    /**
     * Retreive the port (in host byte order) or 0 if the address is not
     * of a supported family.
@@ -191,12 +175,6 @@ public:
        }
    }

-    /**
-     * Set the address part of the socket address from a numeric IP address (string representation).
-     * Family must be already set. Throws in case of parse failue.
-     */
-    void setAddress(const char* address);
-
    /**
     * Returns the accessible byte length at the pointer returned by #get().
     * If zero, #get() returns null.
@@ -248,8 +226,7 @@ public:
    bool isUnspecified() const;

    bool isMappedIPv4() const;
-    SockAddr getMappedIPv4();
-    SockAddr getMappedIPv6();
+    SockAddr getMappedIPv4() const;

    /**
     * A comparator to classify IP addresses, only considering the
@@ -280,9 +257,9 @@ public:
        }
    };
 private:
+    socklen_t len {0};
    struct free_delete { void operator()(void* p) { ::free(p); } };
    std::unique_ptr<sockaddr, free_delete> addr {};
-    socklen_t len {0};

    void set(const sockaddr* sa, socklen_t length) {
        if (len != length) {
@@ -1,90 +0,0 @@
-/*
- *  Copyright (C) 2016-2019 Savoir-faire Linux Inc.
- *
- *  Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "def.h"
-
-#include <condition_variable>
-#include <vector>
-#include <queue>
-#include <future>
-#include <functional>
-
-namespace dht {
-
-class OPENDHT_PUBLIC ThreadPool {
-public:
-    static ThreadPool& computation();
-    static ThreadPool& io();
-
-    ThreadPool();
-    ThreadPool(size_t maxThreads);
-    ~ThreadPool();
-
-    void run(std::function<void()>&& cb);
-
-    template<class T>
-    std::future<T> get(std::function<T()>&& cb) {
-        auto ret = std::make_shared<std::promise<T>>();
-        run(std::bind([=](std::function<T()>& mcb) mutable {
-                ret->set_value(mcb());
-            }, std::move(cb)));
-        return ret->get_future();
-    }
-    template<class T>
-    std::shared_future<T> getShared(std::function<T()>&& cb) {
-        return get(std::move(cb));
-    }
-
-    void stop();
-    void join();
-
-private:
-    struct ThreadState;
-    std::queue<std::function<void()>> tasks_ {};
-    std::vector<std::unique_ptr<ThreadState>> threads_;
-    unsigned readyThreads_ {0};
-    std::mutex lock_ {};
-    std::condition_variable cv_ {};
-
-    const unsigned maxThreads_;
-    bool running_ {true};
-};
-
-class OPENDHT_PUBLIC Executor : public std::enable_shared_from_this<Executor> {
-public:
-    Executor(ThreadPool& pool, unsigned maxConcurrent = 1)
-     : threadPool_(pool), maxConcurrent_(maxConcurrent)
-    {}
-
-    void run(std::function<void()>&& task);
-
-private:
-    std::reference_wrapper<ThreadPool> threadPool_;
-    const unsigned maxConcurrent_ {1};
-    std::mutex lock_ {};
-    unsigned current_ {0};
-    std::queue<std::function<void()>> tasks_ {};
-
-    void run_(std::function<void()>&& task);
-    void schedule();
-};
-
-}
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 Savoir-faire Linux Inc.
 *  Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 *
 *  This program is free software; you can redistribute it and/or modify
@@ -40,8 +40,6 @@ namespace dht {
 using NetId = uint32_t;
 using want_t = int_fast8_t;

-OPENDHT_PUBLIC const char* version();
-
 // shortcut for std::shared_ptr
 template<class T>
 using Sp = std::shared_ptr<T>;
@@ -92,18 +90,6 @@ print_dt(DT d) {
    return std::chrono::duration_cast<std::chrono::duration<double>>(d).count();
 }

-template <class DT>
-static std::string
-print_duration(DT d) {
-    if (d < std::chrono::milliseconds(1)) {
-        return std::to_string(std::chrono::duration_cast<std::chrono::duration<double, std::micro>>(d).count()) +  " us";
-    } else if (d < std::chrono::seconds(1)) {
-        return std::to_string(std::chrono::duration_cast<std::chrono::duration<double, std::milli>>(d).count()) +  " ms";
-    } else {
-        return std::to_string(print_dt(d)) + " s";
-    }
-}
-
 template <typename Duration = duration>
 class uniform_duration_distribution : public std::uniform_int_distribution<typename Duration::rep> {
    using Base = std::uniform_int_distribution<typename Duration::rep>;
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 Savoir-faire Linux Inc.
 *  Author(s) : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 *              Simon Désaulniers <simon.desaulniers@savoirfairelinux.com>
 *
@@ -37,9 +37,9 @@
 #include <chrono>
 #include <set>

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

 namespace dht {

@@ -79,7 +79,7 @@ static constexpr const size_t MAX_VALUE_SIZE {1024 * 64};
 struct OPENDHT_PUBLIC ValueType {
    typedef uint16_t Id;

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

-struct CryptoValueCache;
-
 /**
 * A "value" is data potentially stored on the Dht, with some metadata.
 *
@@ -165,13 +163,6 @@ struct OPENDHT_PUBLIC Value
            return chainOr(std::move(f1), std::move(f2));
        }
        static Filter chain(Filter&& f1, Filter&& f2) {
-            if (not f1) return std::move(f2);
-            if (not f2) return std::move(f1);
-            return [f1,f2](const Value& v) {
-                return f1(v) and f2(v);
-            };
-        }
-        static Filter chain(const Filter& f1, const Filter& f2) {
            if (not f1) return f2;
            if (not f2) return f1;
            return [f1,f2](const Value& v) {
@@ -191,15 +182,11 @@ struct OPENDHT_PUBLIC Value
            return chainAll(std::vector<Filter>(l.begin(), l.end()));
        }
        static Filter chainOr(Filter&& f1, Filter&& f2) {
-            if (not f1 or not f2) return {};
+            if (not f1 or not f2) return AllFilter();
            return [f1,f2](const Value& v) {
                return f1(v) or f2(v);
            };
        }
-        static Filter notFilter(Filter&& f) {
-            if (not f) return [](const Value&) { return false; };
-            return [f](const Value& v) { return not f(v); };
-        }
        std::vector<Sp<Value>> filter(const std::vector<Sp<Value>>& values) {
            if (not (*this))
                return values;
@@ -385,13 +372,13 @@ 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) {}

-#ifdef OPENDHT_JSONCPP
+#if OPENDHT_PROXY_SERVER || OPENDHT_PROXY_CLIENT
    /**
     * Build a value from a json object
     * @param json
     */
    Value(Json::Value& json);
-#endif
+#endif //OPENDHT_PROXY_SERVER

    template <typename Type>
    Value(ValueType::Id t, const Type& d, Id id = INVALID_ID)
@@ -464,7 +451,7 @@ struct OPENDHT_PUBLIC Value
        return ss.str();
    }

-#ifdef OPENDHT_JSONCPP
+#if OPENDHT_PROXY_SERVER || OPENDHT_PROXY_CLIENT
    /**
     * Build a json object from a value
     * Example:
@@ -474,7 +461,7 @@ struct OPENDHT_PUBLIC Value
     * }
     */
    Json::Value toJson() const;
-#endif
+#endif //OPENDHT_PROXY_SERVER

    /** Return the size in bytes used by this value in memory (minimum). */
    size_t size() const;
@@ -601,14 +588,6 @@ struct OPENDHT_PUBLIC Value
     * Hold encrypted version of the data.
     */
    Blob cypher {};
-
-private:
-    friend class SecureDht;
-    /* Cache for crypto ops */
-    bool signatureChecked {false};
-    bool signatureValid {false};
-    bool decrypted {false};
-    Sp<Value> decryptedValue {};
 };

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

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

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

 template <class T>
@@ -1017,7 +996,7 @@ unpackVector(const std::vector<std::shared_ptr<Value>>& vals) {
    return ret;
 }

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

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

 ctypedef vector[uint8_t] Blob

@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2019 Savoir-faire Linux Inc.
+# Copyright (C) 2015-2017 Savoir-faire Linux Inc.
 # Author: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
 # Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 #
@@ -50,8 +50,8 @@ setup(name="opendht",
          ["@CURRENT_SOURCE_DIR@/opendht.pyx"],
          include_dirs = ['@PROJECT_SOURCE_DIR@/include'],
          language="c++",
-          extra_compile_args=["-std=c++14"],
-          extra_link_args=["-std=c++14"],
+          extra_compile_args=["-std=c++11"],
+          extra_link_args=["-std=c++11"],
          libraries=["opendht"],
          library_dirs = ['@CURRENT_BINARY_DIR@', '@PROJECT_BINARY_DIR@']
      ))
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-# Copyright (C) 2015-2019 Savoir-faire Linux Inc.
+# Copyright (C) 2015-2016 Savoir-faire Linux Inc.
 # Author(s): Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 #            Simon Désaulniers <sim.desaulniers@gmail.com>
 #
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-# Copyright (c) 2015-2019 Savoir-faire Linux Inc.
+# Copyright (c) 2015-2016 Savoir-faire Linux Inc.
 # Author(s): Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 #            Simon Désaulniers <sim.desaulniers@gmail.com>
 #
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2015-2019 Savoir-Faire Linux Inc.
+# Copyright (C) 2015 Savoir-Faire Linux Inc.
 # Author(s): Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 #            Simon Désaulniers <sim.desaulniers@gmail.com>

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

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

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

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

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

-libopendht_la_CPPFLAGS = @CPPFLAGS@ -I$(top_srcdir)/include/opendht @Argon2_CFLAGS@ @JsonCpp_CFLAGS@ @MsgPack_CFLAGS@
-libopendht_la_LIBADD   = @Argon2_LIBS@ @JsonCpp_LIBS@ @GnuTLS_LIBS@ @Nettle_LIBS@
-libopendht_la_LDFLAGS  = @LDFLAGS@ @Argon2_LDFLAGS@ -version-number @OPENDHT_MAJOR_VERSION@:@OPENDHT_MINOR_VERSION@:@OPENDHT_PATCH_VERSION@
+libopendht_la_CPPFLAGS = @CPPFLAGS@ -I$(top_srcdir)/include/opendht @Argon2_CFLAGS@
+libopendht_la_LIBADD   = @Argon2_LIBS@ @GnuTLS_LIBS@ @Nettle_LIBS@
+libopendht_la_LDFLAGS  = @LDFLAGS@ @Argon2_LDFLAGS@
 libopendht_la_SOURCES  = \
        dht.cpp \
        storage.h \
@@ -26,10 +26,7 @@ libopendht_la_SOURCES  = \
        securedht.cpp \
        dhtrunner.cpp \
        default_types.cpp \
-        log.cpp \
-        peer_discovery.cpp \
-        network_utils.cpp \
-        thread_pool.cpp
+        log.cpp

 if WIN32
 libopendht_la_SOURCES += rng.cpp
@@ -56,10 +53,7 @@ nobase_include_HEADERS = \
        ../include/opendht/default_types.h \
        ../include/opendht/log.h \
        ../include/opendht/log_enable.h \
-        ../include/opendht/peer_discovery.h \
-        ../include/opendht/network_utils.h \
-        ../include/opendht/rng.h \
-        ../include/opendht/thread_pool.h
+        ../include/opendht/rng.h

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

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

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

 #include "base64.h"

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

 /* Mainly based on the following stackoverflow question:
 * http://stackoverflow.com/questions/342409/how-do-i-base64-encode-decode-in-c
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2004-2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2004-2017 Savoir-faire Linux Inc.
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
@@ -4,7 +4,7 @@ namespace dht {


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

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

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

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

 DoneCallbackSimple
-bindDoneCbSimple(const DoneCallbackSimpleRaw& raw_cb, void* user_data) {
+bindDoneCbSimple(DoneCallbackSimpleRaw raw_cb, void* user_data) {
    if (not raw_cb) return {};
    return [=](bool success) {
        raw_cb(success, user_data);
@@ -62,12 +62,13 @@ NodeStats::toString() const
    ss << "Known nodes: " << good_nodes << " good, " << dubious_nodes << " dubious, " << incoming_nodes << " incoming." << std::endl;
    if (table_depth > 1) {
        ss << "Routing table depth: " << table_depth << std::endl;
-        ss << "Network size estimation: " << getNetworkSizeEstimation() << " nodes" << std::endl;
+        unsigned long tot_nodes = 8 * std::exp2(table_depth);
+        ss << "Network size estimation: " << tot_nodes << " nodes" << std::endl;
    }
    return ss.str();
 }

-#ifdef OPENDHT_JSONCPP
+#if OPENDHT_PROXY_SERVER || OPENDHT_PROXY_CLIENT
 /**
 * Build a json object from a NodeStats
 */
@@ -80,7 +81,8 @@ NodeStats::toJson() const
    val["incoming"] = static_cast<Json::LargestUInt>(incoming_nodes);
    if (table_depth > 1) {
        val["table_depth"] = static_cast<Json::LargestUInt>(table_depth);
-        val["network_size_estimation"] = static_cast<Json::LargestUInt>(getNetworkSizeEstimation());
+        unsigned long tot_nodes = 8 * std::exp2(table_depth);
+        val["network_size_estimation"] = static_cast<Json::LargestUInt>(tot_nodes);
    }
    return val;
 }
@@ -96,32 +98,6 @@ NodeStats::NodeStats(const Json::Value& val)
    if (val.isMember("table_depth"))
        table_depth = static_cast<unsigned>(val["table_depth"].asLargestUInt());
 }
-
-/**
- * Build a json object from a NodeStats
- */
-Json::Value
-NodeInfo::toJson() const
-{
-    Json::Value val;
-    if (id)
-        val["id"] = id.toString();
-    val["node_id"] = node_id.toString();
-    val["ipv4"] = ipv4.toJson();
-    val["ipv6"] = ipv6.toJson();
-    return val;
-}
-
-NodeInfo::NodeInfo(const Json::Value& v)
-{
-    if (v.isMember("id"))
-        id = InfoHash(v["id"].asString());
-    node_id = InfoHash(v["node_id"].asString());
-    ipv4 = NodeStats(v["ipv4"]);
-    ipv6 = NodeStats(v["ipv6"]);
-}
-
-#endif
-
+#endif //OPENDHT_PROXY_SERVER

 }
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 Savoir-faire Linux Inc.
 *  Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 *
 *  This program is free software; you can redistribute it and/or modify
@@ -31,7 +31,6 @@ extern "C" {

 #include <random>
 #include <sstream>
-#include <fstream>
 #include <stdexcept>
 #include <cassert>

@@ -41,6 +40,31 @@ static std::uniform_int_distribution<int> rand_byte{ 0, std::numeric_limits<uint
 static std::uniform_int_distribution<uint8_t> rand_byte;
 #endif

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

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

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

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

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

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

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

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


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

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

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

-void
-saveIdentity(const Identity& id, const std::string& path, const std::string& privkey_password)
-{
-    {
-        auto ca_key_data = id.first->serialize(privkey_password);
-        std::ofstream key_file(path + ".pem");
-        key_file.write((char*)ca_key_data.data(), ca_key_data.size());
-    }
-    {
-        auto ca_key_data = id.second->getPacked();
-        std::ofstream crt_file(path + ".crt");
-        crt_file.write((char*)ca_key_data.data(), ca_key_data.size());
-    }
-}
-
-void
-setValidityPeriod(gnutls_x509_crt_t cert, int64_t validity)
-{
-    int64_t now = time(nullptr);
-    /* 2038 bug: don't allow time wrap */
-    auto boundTime = [](int64_t t) -> time_t {
-        return std::min<int64_t>(t, std::numeric_limits<time_t>::max());
-    };
-    gnutls_x509_crt_set_activation_time(cert, boundTime(now));
-    gnutls_x509_crt_set_expiration_time(cert, boundTime(now + validity));
-}
-
-void
-setRandomSerial(gnutls_x509_crt_t cert)
-{
-    random_device rdev;
-    std::uniform_int_distribution<uint64_t> dist{};
-    uint64_t cert_serial = dist(rdev);
-    gnutls_x509_crt_set_serial(cert, &cert_serial, sizeof(cert_serial));
-}
-
 Certificate
-Certificate::generate(const PrivateKey& key, const std::string& name, const Identity& ca, bool is_ca)
+Certificate::generate(const PrivateKey& key, const std::string& name, Identity ca, bool is_ca)
 {
    gnutls_x509_crt_t cert;
    if (not key.x509_key or gnutls_x509_crt_init(&cert) != GNUTLS_E_SUCCESS)
        return {};
    Certificate ret {cert};

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

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

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

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

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

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

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

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

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

 Value::Filter
-DhtMessage::ServiceFilter(const std::string& s)
+DhtMessage::ServiceFilter(std::string s)
 {
    return Value::Filter::chain(
        Value::TypeFilter(TYPE),
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 Savoir-faire Linux Inc.
 *  Authors: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 *           Simon Désaulniers <simon.desaulniers@savoirfairelinux.com>
 *           Sébastien Blin <sebastien.blin@savoirfairelinux.com>
@@ -20,44 +20,40 @@

 #include "dhtrunner.h"
 #include "securedht.h"
-#include "peer_discovery.h"
-#include "network_utils.h"

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

-#ifdef _WIN32
-#include <cstring>
+#ifndef _WIN32
+#include <unistd.h>
+#else
+#include <io.h>
+#endif
+
+#ifndef _WIN32
+#include <sys/socket.h>
+#else
+#include <winsock2.h>
+#include <ws2tcpip.h>
 #define close(x) closesocket(x)
-#define write(s, b, f) send(s, b, (int)strlen(b), 0)
 #endif

 namespace dht {

 constexpr std::chrono::seconds DhtRunner::BOOTSTRAP_PERIOD;
-static constexpr size_t RX_QUEUE_MAX_SIZE = 1024 * 16;
-static constexpr std::chrono::milliseconds RX_QUEUE_MAX_DELAY(500);
-static const std::string PEER_DISCOVERY_DHT_SERVICE = "dht";

 struct DhtRunner::Listener {
-    size_t tokenClassicDht {0};
-    size_t tokenProxyDht {0};
+    size_t tokenClassicDht;
+    size_t tokenProxyDht;
    ValueCallback gcb;
-    InfoHash hash {};
+    InfoHash hash;
    Value::Filter f;
    Where w;
 };

-struct NodeInsertionPack {
-    dht::InfoHash nodeId;
-    in_port_t port;
-    dht::NetId net;
-    MSGPACK_DEFINE(nodeId, port, net)
-};
-
 DhtRunner::DhtRunner() : dht_()
-#ifdef OPENDHT_PROXY_CLIENT
+#if OPENDHT_PROXY_CLIENT
 , dht_via_proxy_()
 #endif //OPENDHT_PROXY_CLIENT
 {
@@ -77,7 +73,7 @@ DhtRunner::~DhtRunner()
 }

 void
-DhtRunner::run(in_port_t port, const Config& config, Context&& context)
+DhtRunner::run(in_port_t port, DhtRunner::Config config)
 {
    SockAddr sin4;
    sin4.setFamily(AF_INET);
@@ -85,76 +81,45 @@ DhtRunner::run(in_port_t port, const Config& config, Context&& context)
    SockAddr sin6;
    sin6.setFamily(AF_INET6);
    sin6.setPort(port);
-    run(sin4, sin6, config, std::move(context));
+    run(sin4, sin6, config);
 }

 void
-DhtRunner::run(const char* ip4, const char* ip6, const char* service, const Config& config, Context&& context)
+DhtRunner::run(const char* ip4, const char* ip6, const char* service, DhtRunner::Config config)
 {
    auto res4 = SockAddr::resolve(ip4, service);
    auto res6 = SockAddr::resolve(ip6, service);
    run(res4.empty() ? SockAddr() : res4.front(),
-        res6.empty() ? SockAddr() : res6.front(), config, std::move(context));
+        res6.empty() ? SockAddr() : res6.front(), config);
 }

 void
-DhtRunner::run(const SockAddr& local4, const SockAddr& local6, const Config& config, Context&& context)
+DhtRunner::run(const SockAddr& local4, const SockAddr& local6, DhtRunner::Config config)
 {
-    if (not running) {
-        if (not context.sock)
-            context.sock.reset(new net::UdpSocket(local4, local6, context.logger ? *context.logger : Logger{}));
-        run(config, std::move(context));
-    }
-}
-
-void
-DhtRunner::run(const Config& config, Context&& context)
-{
-    std::lock_guard<std::mutex> lck(dht_mtx);
    if (running)
        return;
+    startNetwork(local4, local6);

-    if (context.logger)
-        logger_ = context.logger;
-
-    context.sock->setOnReceive([&] (std::unique_ptr<net::ReceivedPacket>&& pkt) {
-        {
-            std::lock_guard<std::mutex> lck(sock_mtx);
-            if (rcv.size() >= RX_QUEUE_MAX_SIZE) {
-                std::cerr << "Dropping packet: queue is full!" << std::endl;
-                rcv.pop();
-            }
-            rcv.emplace(std::move(pkt));
-        }
-        cv.notify_all();
-    });
-
-    auto dht = std::unique_ptr<DhtInterface>(new Dht(std::move(context.sock), SecureDht::getConfig(config.dht_config)));
+    auto dht = std::unique_ptr<DhtInterface>(new Dht(s4, s6, SecureDht::getConfig(config.dht_config)));
    dht_ = std::unique_ptr<SecureDht>(new SecureDht(std::move(dht), config.dht_config));

-#ifdef OPENDHT_PROXY_CLIENT
+#if OPENDHT_PROXY_CLIENT
    config_ = config;
 #endif
    enableProxy(not config.proxy_server.empty());
-    if (context.logger and dht_via_proxy_) {
-        dht_via_proxy_->setLogger(*context.logger);
-    }
-    if (context.statusChangedCallback) {
-        statusCb = std::move(context.statusChangedCallback);
-    }
-    if (context.certificateStore) {
-        dht_->setLocalCertificateStore(std::move(context.certificateStore));
-        if (dht_via_proxy_)
-            dht_via_proxy_->setLocalCertificateStore(std::move(context.certificateStore));
-    }

    running = true;
    if (not config.threaded)
        return;
-    dht_thread = std::thread([this]() {
+    dht_thread = std::thread([this, local4, local6]() {
        while (running) {
            std::unique_lock<std::mutex> lk(dht_mtx);
-            time_point wakeup = loop_();
+            time_point wakeup;
+            try {
+                wakeup = loop_();
+            } catch (const dht::SocketException& e) {
+                startNetwork(local4, local6);
+            }

            auto hasJobToDo = [this]() {
                if (not running)
@@ -180,57 +145,17 @@ DhtRunner::run(const Config& config, Context&& context)
                cv.wait_until(lk, wakeup, hasJobToDo);
        }
    });
-
-    if (config.peer_discovery or config.peer_publish) {
-        peerDiscovery_ = context.peerDiscovery ?
-            std::move(context.peerDiscovery) :
-            std::make_shared<PeerDiscovery>();
-    }
-
-    auto netId = config.dht_config.node_config.network;
-    if (config.peer_discovery) {
-        peerDiscovery_->startDiscovery<NodeInsertionPack>(PEER_DISCOVERY_DHT_SERVICE, [this, netId](NodeInsertionPack&& v, SockAddr&& addr){
-            addr.setPort(v.port);
-            if (v.nodeId != dht_->getNodeId() && netId == v.net){
-                bootstrap(v.nodeId, addr);
-            }
-        });
-    }
-    if (config.peer_publish) {
-        msgpack::sbuffer sbuf_node;
-        NodeInsertionPack adc;
-        adc.net = netId;
-        adc.nodeId = dht_->getNodeId();
-        // IPv4
-        if (auto bound4 = dht_->getSocket()->getBound(AF_INET)) {
-            adc.port = bound4.getPort();
-            msgpack::pack(sbuf_node, adc);
-            peerDiscovery_->startPublish(AF_INET, PEER_DISCOVERY_DHT_SERVICE, sbuf_node);
-        }
-        // IPv6
-        if (auto bound6 = dht_->getSocket()->getBound(AF_INET6)) {
-            adc.port = bound6.getPort();
-            sbuf_node.clear();
-            msgpack::pack(sbuf_node, adc);
-            peerDiscovery_->startPublish(AF_INET6, PEER_DISCOVERY_DHT_SERVICE, sbuf_node);
-        }
-    }
 }

 void
 DhtRunner::shutdown(ShutdownCallback cb) {
-    if (not running) {
-        cb();
-        return;
-    }
-    std::lock_guard<std::mutex> lck(storage_mtx);
-    pending_ops_prio.emplace([=](SecureDht&) mutable {
-#ifdef OPENDHT_PROXY_CLIENT
-        if (dht_via_proxy_)
-            dht_via_proxy_->shutdown(cb);
+#if OPENDHT_PROXY_CLIENT
+    if (dht_via_proxy_)
+        dht_via_proxy_->shutdown(cb);
 #endif
-        if (dht_)
-            dht_->shutdown(cb);
+    std::lock_guard<std::mutex> lck(storage_mtx);
+    pending_ops_prio.emplace([=](SecureDht& dht) mutable {
+        dht.shutdown(cb);
    });
    cv.notify_all();
 }
@@ -238,28 +163,16 @@ DhtRunner::shutdown(ShutdownCallback cb) {
 void
 DhtRunner::join()
 {
-    if (peerDiscovery_)
-        peerDiscovery_->stop();
-
-    {
-        std::lock_guard<std::mutex> lck(dht_mtx);
-        running = false;
-        cv.notify_all();
-        bootstrap_cv.notify_all();
-        if (dht_)
-            if (auto sock = dht_->getSocket())
-                sock->stop();
-    }
-
+    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 (peerDiscovery_) {
-        peerDiscovery_->join();
-    }
+    if (rcv_thread.joinable())
+        rcv_thread.join();

    {
        std::lock_guard<std::mutex> lck(storage_mtx);
@@ -274,15 +187,6 @@ DhtRunner::join()
    }
 }

-SockAddr
-DhtRunner::getBound(sa_family_t af) const {
-    std::lock_guard<std::mutex> lck(dht_mtx);
-    if (dht_)
-        if (auto sock = dht_->getSocket())
-            return sock->getBound(af);
-    return SockAddr{};
-}
-
 void
 DhtRunner::dumpTables() const
 {
@@ -293,17 +197,17 @@ DhtRunner::dumpTables() const
 InfoHash
 DhtRunner::getId() const
 {
-    if (auto dht = activeDht())
-        return dht->getId();
-    return {};
+    if (!activeDht())
+        return {};
+    return activeDht()->getId();
 }

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


@@ -340,29 +244,23 @@ DhtRunner::exportValues() const {
 }

 void
-DhtRunner::setLogger(const Logger& logger) {
+DhtRunner::setLoggers(LogMethod error, LogMethod warn, LogMethod debug) {
    std::lock_guard<std::mutex> lck(dht_mtx);
    if (dht_)
-        dht_->setLogger(logger);
-#ifdef OPENDHT_PROXY_CLIENT
+        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_->setLogger(logger);
+        dht_via_proxy_->setLoggers(std::forward<LogMethod>(error), std::forward<LogMethod>(warn), std::forward<LogMethod>(debug));
 #endif
 }

-void
-DhtRunner::setLoggers(LogMethod error, LogMethod warn, LogMethod debug) {
-    Logger logger {std::move(error), std::move(warn), std::move(debug)};
-    setLogger(logger);
-}
-
 void
 DhtRunner::setLogFilter(const InfoHash& f) {
    std::lock_guard<std::mutex> lck(dht_mtx);
    activeDht()->setLogFilter(f);
    if (dht_)
        dht_->setLogFilter(f);
-#ifdef OPENDHT_PROXY_CLIENT
+#if OPENDHT_PROXY_CLIENT
    if (dht_via_proxy_)
        dht_via_proxy_->setLogFilter(f);
 #endif
@@ -403,17 +301,6 @@ DhtRunner::getNodesStats(sa_family_t af) const
    return activeDht()->getNodesStats(af);
 }

-NodeInfo
-DhtRunner::getNodeInfo() const {
-    std::lock_guard<std::mutex> lck(dht_mtx);
-    NodeInfo info;
-    info.id = getId();
-    info.node_id = getNodeId();
-    info.ipv4 = dht_->getNodesStats(AF_INET);
-    info.ipv6 = dht_->getNodesStats(AF_INET6);
-    return info;
-}
-
 std::vector<unsigned>
 DhtRunner::getNodeMessageStats(bool in) const
 {
@@ -455,9 +342,7 @@ std::vector<SockAddr>
 DhtRunner::getPublicAddress(sa_family_t af)
 {
    std::lock_guard<std::mutex> lck(dht_mtx);
-    if (auto dht = activeDht())
-        return dht->getPublicAddress(af);
-    return {};
+    return activeDht()->getPublicAddress(af);
 }
 std::vector<std::string>
 DhtRunner::getPublicAddressStr(sa_family_t af)
@@ -476,7 +361,7 @@ DhtRunner::registerCertificate(std::shared_ptr<crypto::Certificate> cert) {
 void
 DhtRunner::setLocalCertificateStore(CertificateStoreQuery&& query_method) {
    std::lock_guard<std::mutex> lck(dht_mtx);
-#ifdef OPENDHT_PROXY_CLIENT
+#if OPENDHT_PROXY_CLIENT
    if (dht_via_proxy_)
        dht_via_proxy_->setLocalCertificateStore(std::forward<CertificateStoreQuery>(query_method));
 #endif
@@ -510,35 +395,17 @@ DhtRunner::loop_()
        // move to stack
        received = std::move(rcv);
    }
-
-    // Discard old packets
-    size_t dropped {0};
    if (not received.empty()) {
-        auto now = clock::now();
-        while (not received.empty() and now - received.front()->received > RX_QUEUE_MAX_DELAY) {
-            received.pop();
-            dropped++;
-        }
-    }
-
-    // Handle packets
-    if (not received.empty()) {
-        while (not received.empty()) {
-            auto& pck = received.front();
-            if (clock::now() - pck->received > RX_QUEUE_MAX_DELAY)
-                dropped++;
-            else
-                wakeup = dht->periodic(pck->data.data(), pck->data.size(), std::move(pck->from));
-            received.pop();
+        for (const auto& pck : received) {
+            auto& buf = pck.first;
+            auto& from = pck.second;
+            wakeup = dht->periodic(buf.data(), buf.size()-1, from);
        }
+        received.clear();
    } else {
-        // Or just run the scheduler
        wakeup = dht->periodic(nullptr, 0, nullptr, 0);
    }

-    if (dropped)
-        std::cerr << "Dropped " << dropped << " packets with high delay" << std::endl;
-
    NodeStatus nstatus4 = dht->getStatus(AF_INET);
    NodeStatus nstatus6 = dht->getStatus(AF_INET6);
    if (nstatus4 != status4 || nstatus6 != status6) {
@@ -560,13 +427,113 @@ DhtRunner::loop_()
    return wakeup;
 }

+
+int bindSocket(const SockAddr& addr, SockAddr& bound)
+{
+    bool is_ipv6 = addr.getFamily() == AF_INET6;
+    int sock = socket(is_ipv6 ? PF_INET6 : PF_INET, SOCK_DGRAM, 0);
+    if (sock < 0)
+        throw DhtException(std::string("Can't open socket: ") + strerror(sock));
+    int set = 1;
+#ifdef SO_NOSIGPIPE
+    setsockopt(sock, SOL_SOCKET, SO_NOSIGPIPE, (const char*)&set, sizeof(set));
+#endif
+    if (is_ipv6)
+        setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY, (const char*)&set, sizeof(set));
+    int rc = bind(sock, addr.get(), addr.getLength());
+    if(rc < 0)
+        throw DhtException("Can't bind socket on " + addr.toString() + " " + strerror(rc));
+    sockaddr_storage ss;
+    socklen_t ss_len = sizeof(ss);
+    getsockname(sock, (sockaddr*)&ss, &ss_len);
+    bound = {ss, ss_len};
+    return sock;
+}
+
+void
+DhtRunner::startNetwork(const SockAddr sin4, const SockAddr sin6)
+{
+    running_network = false;
+    if (rcv_thread.joinable())
+        rcv_thread.join();
+    s4 = -1;
+    s6 = -1;
+
+    bound4 = {};
+    if (sin4)
+        s4 = bindSocket(sin4, bound4);
+
+#if 1
+    bound6 = {};
+    if (sin6)
+        s6 = bindSocket(sin6, bound6);
+#endif
+
+    running_network = true;
+    rcv_thread = std::thread([this]() {
+        try {
+            while (running_network) {
+                struct timeval tv {/*.tv_sec = */0, /*.tv_usec = */250000};
+                fd_set readfds;
+
+                FD_ZERO(&readfds);
+                if(s4 >= 0)
+                    FD_SET(s4, &readfds);
+                if(s6 >= 0)
+                    FD_SET(s6, &readfds);
+
+                int rc = select(s4 > s6 ? s4 + 1 : s6 + 1, &readfds, nullptr, nullptr, &tv);
+                if(rc < 0) {
+                    if(errno != EINTR) {
+                        perror("select");
+                        std::this_thread::sleep_for( std::chrono::seconds(1) );
+                    }
+                }
+
+                if (not running_network)
+                    break;
+
+                if(rc > 0) {
+                    std::array<uint8_t, 1024 * 64> buf;
+                    sockaddr_storage from;
+                    socklen_t from_len = sizeof(from);
+
+                    if(s4 >= 0 && FD_ISSET(s4, &readfds))
+                        rc = recvfrom(s4, (char*)buf.data(), buf.size(), 0, (sockaddr*)&from, &from_len);
+                    else if(s6 >= 0 && FD_ISSET(s6, &readfds))
+                        rc = recvfrom(s6, (char*)buf.data(), buf.size(), 0, (sockaddr*)&from, &from_len);
+                    else
+                        break;
+                    if (rc > 0) {
+                        {
+                            std::lock_guard<std::mutex> lck(sock_mtx);
+                            rcv.emplace_back(Blob {buf.begin(), buf.begin()+rc+1}, SockAddr(from, from_len));
+                        }
+                        cv.notify_all();
+                    }
+                }
+            }
+        } catch (const std::exception& e) {
+            std::cerr << "Error in DHT networking thread: " << e.what() << std::endl;
+        }
+        if (s4 >= 0)
+            close(s4);
+        if (s6 >= 0)
+            close(s6);
+        s4 = -1;
+        s6 = -1;
+        bound4 = {};
+        bound6 = {};
+    });
+}
+
 void
 DhtRunner::get(InfoHash hash, GetCallback vcb, DoneCallback dcb, Value::Filter f, Where w)
 {
    {
        std::lock_guard<std::mutex> lck(storage_mtx);
        pending_ops.emplace([=](SecureDht& dht) mutable {
-            dht.get(hash, std::move(vcb), std::move(dcb), std::move(f), std::move(w));
+            dht.get(hash, vcb, dcb, std::move(f), std::move(w));
        });
    }
    cv.notify_all();
@@ -575,14 +542,14 @@ DhtRunner::get(InfoHash hash, GetCallback vcb, DoneCallback dcb, Value::Filter f
 void
 DhtRunner::get(const std::string& key, GetCallback vcb, DoneCallbackSimple dcb, Value::Filter f, Where w)
 {
-    get(InfoHash::get(key), std::move(vcb), std::move(dcb), std::move(f), std::move(w));
+    get(InfoHash::get(key), vcb, dcb, f, w);
 }
 void
 DhtRunner::query(const InfoHash& hash, QueryCallback cb, DoneCallback done_cb, Query q) {
    {
        std::lock_guard<std::mutex> lck(storage_mtx);
        pending_ops.emplace([=](SecureDht& dht) mutable {
-            dht.query(hash, std::move(cb), std::move(done_cb), std::move(q));
+            dht.query(hash, cb, done_cb, std::move(q));
        });
    }
    cv.notify_all();
@@ -595,27 +562,28 @@ DhtRunner::listen(InfoHash hash, ValueCallback vcb, Value::Filter f, Where w)
    {
        std::lock_guard<std::mutex> lck(storage_mtx);
        pending_ops.emplace([=](SecureDht& dht) mutable {
-#ifdef OPENDHT_PROXY_CLIENT
            auto tokenbGlobal = listener_token_++;
-            auto& listener = listeners_[tokenbGlobal];
+            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) {
+            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 (auto token = dht.listen(hash, listener.gcb, listener.f, listener.w)) {
-                if (use_proxy)  listener.tokenProxyDht = token;
-                else            listener.tokenClassicDht = token;
-            }
-            ret_token->set_value(tokenbGlobal);
-#else
-            ret_token->set_value(dht.listen(hash, std::move(vcb), std::move(f), std::move(w)));
+#if OPENDHT_PROXY_CLIENT
+            if (use_proxy)
+                listener.tokenProxyDht = dht.listen(hash, listener.gcb, listener.f, listener.w);
+            else
 #endif
+                listener.tokenClassicDht = dht.listen(hash, listener.gcb, listener.f, listener.w);
+            listeners_.emplace(tokenbGlobal, std::move(listener));
+            ret_token->set_value(tokenbGlobal);
        });
    }
    cv.notify_all();
@@ -625,30 +593,26 @@ DhtRunner::listen(InfoHash hash, ValueCallback vcb, Value::Filter f, Where w)
 std::future<size_t>
 DhtRunner::listen(const std::string& key, GetCallback vcb, Value::Filter f, Where w)
 {
-    return listen(InfoHash::get(key), std::move(vcb), std::move(f), std::move(w));
+    return listen(InfoHash::get(key), vcb, f, w);
 }

 void
 DhtRunner::cancelListen(InfoHash h, size_t token)
 {
-    {
-        std::lock_guard<std::mutex> lck(storage_mtx);
-#ifdef OPENDHT_PROXY_CLIENT
-        pending_ops.emplace([=](SecureDht&) {
-            auto it = listeners_.find(token);
-            if (it == listeners_.end()) return;
-            if (it->second.tokenClassicDht)
-                dht_->cancelListen(h, it->second.tokenClassicDht);
-            if (it->second.tokenProxyDht and dht_via_proxy_)
-                dht_via_proxy_->cancelListen(h, it->second.tokenProxyDht);
-            listeners_.erase(it);
-        });
+    std::lock_guard<std::mutex> lck(storage_mtx);
+    pending_ops.emplace([=](SecureDht& dht) {
+#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
-        pending_ops.emplace([=](SecureDht& dht) {
-            dht.cancelListen(h, token);
-        });
+        dht.cancelListen(h, token);
 #endif // OPENDHT_PROXY_CLIENT
-    }
+    });
    cv.notify_all();
 }

@@ -657,21 +621,20 @@ DhtRunner::cancelListen(InfoHash h, std::shared_future<size_t> ftoken)
 {
    {
        std::lock_guard<std::mutex> lck(storage_mtx);
-#ifdef OPENDHT_PROXY_CLIENT
-        pending_ops.emplace([=](SecureDht&) {
-            auto it = listeners_.find(ftoken.get());
+        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
-        pending_ops.emplace([=](SecureDht& dht) {
-            dht.cancelListen(h, ftoken.get());
-        });
+            dht.cancelListen(h, token);
 #endif // OPENDHT_PROXY_CLIENT
+        });
    }
    cv.notify_all();
 }
@@ -704,7 +667,7 @@ DhtRunner::put(InfoHash hash, std::shared_ptr<Value> value, DoneCallback cb, tim
 void
 DhtRunner::put(const std::string& key, Value&& value, DoneCallbackSimple cb, time_point created, bool permanent)
 {
-    put(InfoHash::get(key), std::forward<Value>(value), std::move(cb), created, permanent);
+    put(InfoHash::get(key), std::forward<Value>(value), cb, created, permanent);
 }

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

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

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

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

 void
@@ -870,18 +833,6 @@ DhtRunner::bootstrap(const SockAddr& addr, DoneCallbackSimple&& cb)
    cv.notify_all();
 }

-void
-DhtRunner::bootstrap(const InfoHash& id, const SockAddr& address)
-{
-    {
-        std::unique_lock<std::mutex> lck(storage_mtx);
-        pending_ops_prio.emplace([id, address](SecureDht& dht) mutable {
-            dht.insertNode(id, address);
-        });
-    }
-    cv.notify_all();
-}
-
 void
 DhtRunner::bootstrap(const std::vector<NodeExport>& nodes)
 {
@@ -900,7 +851,7 @@ DhtRunner::connectivityChanged()
 {
    {
        std::lock_guard<std::mutex> lck(storage_mtx);
-        pending_ops_prio.emplace([=](SecureDht& dht) {
+        pending_ops.emplace([=](SecureDht& dht) {
            dht.connectivityChanged();
        });
    }
@@ -921,9 +872,8 @@ DhtRunner::findCertificate(InfoHash hash, std::function<void(const std::shared_p
 void
 DhtRunner::resetDht()
 {
-    peerDiscovery_.reset();
-#ifdef OPENDHT_PROXY_CLIENT
    listeners_.clear();
+#if OPENDHT_PROXY_CLIENT
    dht_via_proxy_.reset();
 #endif // OPENDHT_PROXY_CLIENT
    dht_.reset();
@@ -932,33 +882,17 @@ DhtRunner::resetDht()
 SecureDht*
 DhtRunner::activeDht() const
 {
-#ifdef OPENDHT_PROXY_CLIENT
+#if OPENDHT_PROXY_CLIENT
    return use_proxy? dht_via_proxy_.get() : dht_.get();
 #else
    return dht_.get();
 #endif // OPENDHT_PROXY_CLIENT
 }

-void
-DhtRunner::setProxyServer(const std::string& proxy, const std::string& pushNodeId)
-{
-#ifdef OPENDHT_PROXY_CLIENT
-    std::lock_guard<std::mutex> lck(dht_mtx);
-    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());
-#else
-    if (not proxy.empty())
-        std::cerr << "DHT proxy requested but OpenDHT built without proxy support." << std::endl;
-#endif
-}
-
 void
 DhtRunner::enableProxy(bool proxify)
 {
-#ifdef OPENDHT_PROXY_CLIENT
+#if OPENDHT_PROXY_CLIENT
    if (dht_via_proxy_) {
        dht_via_proxy_->shutdown({});
    }
@@ -973,10 +907,10 @@ DhtRunner::enableProxy(bool proxify)
                    }
                    cv.notify_all();
                }
-            }, config_.proxy_server, config_.push_node_id, logger_)
+            }, config_.proxy_server, config_.push_node_id)
        );
        dht_via_proxy_ = std::unique_ptr<SecureDht>(new SecureDht(std::move(dht_via_proxy), config_.dht_config));
-#ifdef OPENDHT_PUSH_NOTIFICATIONS
+#if OPENDHT_PUSH_NOTIFICATIONS
        if (not pushToken_.empty())
            dht_via_proxy_->setPushNotificationToken(pushToken_);
 #endif
@@ -1009,16 +943,13 @@ DhtRunner::enableProxy(bool proxify)
 void
 DhtRunner::forwardAllMessages(bool forward)
 {
-    std::lock_guard<std::mutex> lck(dht_mtx);
-#ifdef OPENDHT_PROXY_SERVER
-#ifdef OPENDHT_PROXY_CLIENT
+#if OPENDHT_PROXY_SERVER
+#if OPENDHT_PROXY_CLIENT
    if (dht_via_proxy_)
        dht_via_proxy_->forwardAllMessages(forward);
 #endif // OPENDHT_PROXY_CLIENT
    if (dht_)
        dht_->forwardAllMessages(forward);
-#else
-    (void) forward;
 #endif // OPENDHT_PROXY_SERVER
 }

@@ -1027,30 +958,25 @@ DhtRunner::forwardAllMessages(bool forward)
 */
 void
 DhtRunner::setPushNotificationToken(const std::string& token) {
-    std::lock_guard<std::mutex> lck(dht_mtx);
-#if defined(OPENDHT_PROXY_CLIENT) && defined(OPENDHT_PUSH_NOTIFICATIONS)
+#if OPENDHT_PROXY_CLIENT && OPENDHT_PUSH_NOTIFICATIONS
    pushToken_ = token;
    if (dht_via_proxy_)
        dht_via_proxy_->setPushNotificationToken(token);
-#else
-    (void) token;
 #endif
 }

 void
 DhtRunner::pushNotificationReceived(const std::map<std::string, std::string>& data)
 {
-#if defined(OPENDHT_PROXY_CLIENT) && defined(OPENDHT_PUSH_NOTIFICATIONS)
+#if OPENDHT_PROXY_CLIENT && OPENDHT_PUSH_NOTIFICATIONS
    {
        std::lock_guard<std::mutex> lck(storage_mtx);
-        pending_ops_prio.emplace([=](SecureDht&) {
+        pending_ops_prio.emplace([=](SecureDht& dht) {
            if (dht_via_proxy_)
                dht_via_proxy_->pushNotificationReceived(data);
        });
    }
    cv.notify_all();
-#else
-    (void) data;
 #endif
 }

@@ -1,519 +0,0 @@
-/*
- *  Copyright (C) 2016-2019 Savoir-faire Linux Inc.
- *  Author: Vsevolod Ivanov <vsevolod.ivanov@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 "http.h"
-
-namespace http {
-
-constexpr char HTTP_HEADER_CONTENT_LENGTH[] = "Content-Length:";
-
-// connection
-
-Connection::Connection(asio::ip::tcp::socket socket, std::shared_ptr<dht::Logger> logger):
-    id_(++ids_), socket_(std::move(socket)), logger_(logger)
-{}
-
-Connection::~Connection(){
-    close();
-}
-
-ConnectionId
-Connection::id(){
-    return id_;
-}
-
-bool
-Connection::is_open(){
-    return socket_.is_open();
-}
-
-bool
-Connection::is_v6(){
-    return endpoint_.address().is_v6();
-}
-
-void
-Connection::timeout(const std::chrono::seconds timeout, HandlerCb cb)
-{
-    if (!is_open()){
-        if (logger_)
-            logger_->e("[connection:%i] closed, can't timeout", id_);
-        return;
-    }
-    if (!timeout_timer_)
-        timeout_timer_ = std::make_unique<asio::steady_timer>(io_context());
-    timeout_timer_->expires_at(std::chrono::steady_clock::now() + timeout);
-    timeout_timer_->async_wait([this, cb](const asio::error_code &ec){
-        if (ec == asio::error_code::operation_aborted)
-            return;
-        else if (ec){
-            if (logger_)
-                logger_->e("[connection:%i] timeout error: %s", id_, ec.message().c_str());
-        }
-        if (cb)
-            cb(ec);
-    });
-}
-
-void
-Connection::close(){
-    socket_.close();
-}
-
-// connection listener
-
-ConnectionListener::ConnectionListener()
-{}
-
-ConnectionListener::ConnectionListener(std::shared_ptr<dht::DhtRunner> dht,
-    std::shared_ptr<std::map<restinio::connection_id_t, http::ListenerSession>> listeners,
-    std::shared_ptr<std::mutex> lock, std::shared_ptr<dht::Logger> logger):
-        dht_(dht), lock_(lock), listeners_(listeners), logger_(logger)
-{}
-
-ConnectionListener::~ConnectionListener()
-{
-}
-
-void
-ConnectionListener::state_changed(const restinio::connection_state::notice_t& notice) noexcept
-{
-    std::lock_guard<std::mutex> lock(*lock_);
-    auto id = notice.connection_id();
-    auto cause = to_str(notice.cause());
-
-    if (listeners_->find(id) != listeners_->end()){
-        if (notice.cause() == restinio::connection_state::cause_t::closed){
-            if (logger_)
-                logger_->d("[proxy:server] [connection:%li] cancelling listener", id);
-            dht_->cancelListen(listeners_->at(id).hash,
-                               std::move(listeners_->at(id).token));
-            listeners_->erase(id);
-            if (logger_)
-                logger_->d("[proxy:server] %li listeners are connected", listeners_->size());
-        }
-    }
-}
-
-std::string
-ConnectionListener::to_str(restinio::connection_state::cause_t cause) noexcept
-{
-    std::string result;
-    switch(cause)
-    {
-    case restinio::connection_state::cause_t::accepted:
-        result = "accepted";
-        break;
-    case restinio::connection_state::cause_t::closed:
-        result = "closed";
-        break;
-    case restinio::connection_state::cause_t::upgraded_to_websocket:
-        result = "upgraded";
-        break;
-    default:
-        result = "unknown";
-    }
-    return result;
-}
-
-// request
-
-Request::Request(asio::io_context& ctx, const std::string host, const std::string service,
-                 const bool resolve, std::shared_ptr<dht::Logger> logger):
-        id_(++ids_), resolver_(ctx), logger_(logger)
-{
-    if (resolve)
-        resolve(host, service);
-}
-
-Request::~Request()
-{
-    terminate();
-}
-
-void
-Request::set_logger(std::shared_ptr<dht::Logger> logger)
-{
-    logger_ = logger;
-}
-
-void
-Request::terminate()
-{
-    if (parser_)
-        // ensure on_message_complete callback is called
-        http_parser_execute(parser_.get(), parser_s_.get(), "", 0);
-    if (logger_)
-        logger_->d("[http:request:%i] done", id_);
-}
-
-bool
-Request::resolved()
-{
-    return !endpoints_.empty();
-}
-
-void
-Request::resolve(const std::string host, const std::string service, HandlerCb cb)
-{
-    // build the query
-    asio::ip::tcp::resolver::query query(host, service);
-
-    // resolve the query to the server
-    resolver_.async_resolve(query, [this, host, service, cb]
-        (const asio::error_code& ec, asio::ip::tcp::resolver::results_type endpoints)
-    {
-        if (ec){
-            if (logger_)
-                logger_->e("[http:request:%i] error resolving %s:%s: %s",
-                           id_, host.c_str(), service.c_str(), ec.message().c_str());
-        }
-        else {
-            for (auto it = endpoints.begin(); it != endpoints.end(); ++it){
-                if (logger_){
-                    asio::ip::tcp::endpoint endpoint = *it;
-                    logger_->d("[http:request:%i] resolved %s:%s: address=%s ipv%i",
-                        id_, host.c_str(), service.c_str(), endpoint.address().to_string().c_str(),
-                        endpoint.address().is_v6() ? 6 : 4);
-                }
-            }
-            endpoints_ = endpoints;
-        }
-        if (cb)
-            cb(ec);
-    });
-}
-
-std::string
-Request::build(const restinio::http_request_header_t header,
-               const restinio::http_header_fields_t header_fields,
-               const restinio::http_connection_header_t connection, const std::string body)
-{
-    std::stringstream request;
-
-    // first header
-    request << header.method().c_str() << " " << header.request_target() << " " <<
-               "HTTP/" << header.http_major() << "." << header.http_minor() << "\r\n";
-
-    // other headers
-    for (auto header_field: header_fields)
-        request << header_field.name() << ": " << header_field.value() << "\r\n";
-
-    // last connection header
-    std::string conn_str;
-    switch (connection){
-    case restinio::http_connection_header_t::keep_alive:
-        conn_str = "keep-alive";
-        break;
-    case restinio::http_connection_header_t::close:
-        conn_str = "close";
-        break;
-    case restinio::http_connection_header_t::upgrade:
-        throw std::invalid_argument("upgrade");
-        break;
-    }
-    request << "Connection: " << conn_str << "\r\n";
-
-    // body & content-length
-    if (!body.empty()){
-        request << "Content-Length: " << body.size() << "\r\n\r\n";
-        request << body;
-    }
-
-    // last delim
-    request << "\r\n";
-    return request.str();
-}
-
-void
-Request::connect(ConnectionCb cb)
-{
-    if (endpoints_.empty()){
-        if (logger_)
-            logger_->e("[http:request] [connect] host not resolved");
-        if (cb)
-            cb(asio::error::connection_aborted, nullptr);
-        return;
-    }
-    auto socket = asio::ip::tcp::socket{resolver_.get_io_context()};
-    conn_ = std::make_shared<Connection>(std::move(socket));
-
-    // try to connect to any until one works
-    asio::async_connect(conn_->socket_, endpoints_, [this, conn, cb]
-                       (const asio::error_code& ec, const asio::ip::tcp::endpoint& endpoint){
-        if (ec){ // all endpoints failed
-            if (logger_)
-                logger_->e("[http:request:%i] [connect] failed to connect to any endpoints", id_);
-        }
-        else {
-            if (logger_)
-                logger_->d("[http:request:%i] [connect] success", id_);
-            // save the associated endpoint
-            conn_->endpoint_ = endpoint;
-        }
-        if (cb)
-            cb(ec, conn_);
-    });
-}
-
-void
-Request::send(std::string request, std::unique_ptr<http_parser> parser,
-              std::unique_ptr<http_parser_settings> parser_s, HandlerCb cb)
-{
-    if (endpoints_.empty()){
-        if (logger_)
-            logger_->e("[http:request:%i] [send] unresolved destination", id_);
-        if (cb)
-            cb(asio::error::addrinfo_errors::service_not_found);
-    }
-    if (!conn_){
-        if (logger_)
-            logger_->e("[http:request:%i] [send] uninitialized connection", id_);
-        if (cb)
-            cb(asio::error::not_connected);
-    }
-    else if (!conn_->is_open()){
-        if (logger_)
-            logger_->e("[http:request] [send] closed connection");
-        if (cb)
-            cb(asio::error::not_connected);
-    }
-    else {
-        // save the request context
-        request_ = request;
-        parser_ = std::move(parser);
-        parser_s_ = std::move(parser_s);
-
-        // write the request to buffer
-        std::ostream request_stream(&conn_->request_);
-        request_stream << request;
-
-        // send the request
-        asio::async_write(conn_->socket_, conn_->request_,
-            std::bind(&Request::handle_request, this, std::placeholders::_1, cb));
-    }
-}
-
-void
-Request::handle_request(const asio::error_code& ec, HandlerCb cb)
-{
-    if (!conn_->is_open()){
-        if (logger_)
-            logger_->e("[http:request:%i] [write] closed connection", id_);
-        terminate();
-        if (cb)
-            cb(asio::error::not_connected);
-        return;
-    }
-    if (ec and ec != asio::error::eof){
-        if (logger_)
-            logger_->e("[http:request:%i] [write] error: %s", id_, ec.message().c_str());
-        terminate();
-        if (cb)
-            cb(ec);
-        return;
-    }
-    if (logger_)
-        logger_->d("[http:request:%i] [write] success", id_);
-
-    // read response
-    asio::async_read_until(conn_->socket_, conn_->response_chunk_, "\r\n\r\n",
-        std::bind(&Request::handle_response_header, this,
-                  std::placeholders::_1, std::placeholders::_2, cb));
-}
-
-void
-Request::handle_response_header(const asio::error_code& ec, const size_t bytes, HandlerCb cb)
-{
-    if (!conn_->is_open()){
-        if (logger_)
-            logger_->e("[http:request:%i] [read:header] closed connection", id_);
-        terminate();
-        if (cb)
-            cb(asio::error::not_connected);
-        return;
-    }
-    if (ec && ec != asio::error::eof){
-        if (logger_)
-            logger_->e("[http:request:%i] [read:header] error: %s", id_, ec.message().c_str());
-        terminate();
-        if (cb)
-            cb(ec);
-        return;
-    }
-    else if ((ec == asio::error::eof) || (ec == asio::error::connection_reset)){
-        terminate();
-        if (cb)
-            cb(ec);
-        return;
-    }
-    // read the response buffer
-    std::ostringstream str_s;
-    str_s << &conn_->response_chunk_;
-    auto chunk = str_s.str();
-    auto header = chunk.substr(0, bytes);
-    if (logger_)
-        logger_->d("[http:request:%i] [read:header]:\n%s", id_, header.c_str());
-    // parse the header right away
-    parse_request(header, conn_->id());
-
-    unsigned int content_length = get_content_length(header);
-    // has body size
-    if (content_length){
-        // append current body chunk
-        auto body_chunk = chunk.substr(bytes, std::string::npos);
-        conn_->response_body_.append(body_chunk);
-        // read the rest of body
-        asio::async_read(conn_->socket_, conn_->response_chunk_,
-            asio::transfer_exactly(content_length - (body_chunk.size())),
-            std::bind(&Request::handle_response_body, this,
-                std::placeholders::_1, content_length, conn, cb));
-        return;
-    }
-    // has potential body but no content-length (current proxy behavior on key get/listen)
-    else if (header.find("Content-Type: application/json") != std::string::npos){
-        auto body_chunk = chunk.substr(bytes, std::string::npos);
-        if (!body_chunk.empty()){
-            parse_request(body_chunk, conn_->id());
-        }
-        // keep reading
-        asio::async_read(conn_->socket_, conn_->response_chunk_, asio::transfer_at_least(1),
-            std::bind(&Request::handle_response_body, this,
-                std::placeholders::_1, std::placeholders::_2, conn, cb));
-    }
-}
-
-void
-Request::handle_response_body(const asio::error_code& ec, const size_t bytes,
-                             std::shared_ptr<Connection> conn, HandlerCb cb)
-{
-    if (!conn_->is_open()){
-        if (logger_)
-            logger_->e("[http:request] [read:body] closed connection");
-        terminate();
-        if (cb)
-            cb(asio::error::not_connected);
-        return;
-    }
-    if (ec && ec != asio::error::eof){
-        if (logger_)
-            logger_->e("[http:request:%i] [read:body] error: %s", id_, ec.message().c_str());
-        terminate();
-        if (cb)
-            cb(ec);
-        return;
-    }
-    else if ((ec == asio::error::eof) || (ec == asio::error::connection_reset)){
-        terminate();
-        if (cb)
-            cb(ec);
-        return;
-    }
-    std::string body;
-    if (!conn_->response_body_.empty()){
-        // append previous incomplete chunk from header
-        body.append(conn_->response_body_);
-    }
-    // read the response buffer
-    std::ostringstream str_s;
-    str_s << &conn_->response_chunk_;
-    body.append(str_s.str().substr(0, bytes));
-    if (logger_)
-        logger_->d("[http:request:%i] [read:body] success:\n%s", id_, body.c_str());
-
-    parse_request(body);
-    conn_->response_body_.clear();
-
-    asio::async_read(conn_->socket_, conn_->response_chunk_, asio::transfer_at_least(1),
-        std::bind(&Request::handle_response_body, this,
-            std::placeholders::_1, std::placeholders::_2, conn, cb));
-}
-
-void
-Request::parse_request(const std::string request)
-{
-    http_parser_execute(parser_.get(), parser_s_.get(), request.c_str(), request.size());
-    // detect parsing errors
-    if (HPE_OK != parser_->http_errno && HPE_PAUSED != parser_->http_errno){
-        if (logger_){
-            auto err = HTTP_PARSER_ERRNO(parser_.get());
-            logger_->e("[http:request:%i] [parse] error: %s", id_, http_errno_name(err));
-        }
-    }
-}
-
-size_t
-Request::get_content_length(const std::string str)
-{
-    size_t content_length = 0;
-    auto content_length_i = str.find(HTTP_HEADER_CONTENT_LENGTH);
-    if (content_length_i != std::string::npos){
-        auto content_length_str = str.substr(content_length_i + std::strlen(HTTP_HEADER_CONTENT_LENGTH) + 1,
-                                             str.find("\r\n", content_length_i));
-        try {
-            content_length = atoi(content_length_str.c_str());
-        }
-        catch (const std::exception& e){
-            if (logger_)
-                logger_->d("[http:request:%i] [content-length] invalid '%s': %s",
-                           id_, content_length_str.c_str(), e.what());
-        }
-    }
-    return content_length;
-}
-
-
-Resolver::Resolver(asio::io_context& ctx, const std::string& host, const std::string& service)
-{
-    resolver_.async_resolve({host, service}, [this]
-        (const asio::error_code& ec, asio::ip::tcp::resolver::results_type endpoints)
-    {
-        std::lock_guard<std::mutex> lock(cbsMutex_);
-        while (not cbs_.empty()) {
-            cbs_.front()(ec, endpoints);
-            cbs_.pop();
-        }
-        error_ = ec;
-        endpoints_ = endpoints;
-        completed_ = true;
-    }
-}
-
-void
-Resolver::addOnResolved(ResolvedCb cb)
-{
-    std::lock_guard<std::mutex> lock(cbsMutex_);
-    if (completed_) {
-        cb(error_, endpoints_);
-    } else {
-        cbs_.push(std::move(cb));
-    }
-}
-
-/*
-private:
-    std::mutex cbsMutex_;
-    std::queue<ResolvedCb> cbs_;
-
-    asio::ip::tcp::resolver resolver_;
-    asio::error_code error_;
-    asio::ip::basic_resolver_results<asio::ip::tcp> endpoints_;
-} */
-
-
-} // namespace http
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 Savoir-faire Linux Inc.
 *  Author(s) : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 *              Simon Désaulniers <simon.desaulniers@savoirfairelinux.com>
 *              Nicolas Reynaud <nicolas.reynaud@savoirfairelinux.com>
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 Savoir-faire Linux Inc.
 *  Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 *
 *  This program is free software; you can redistribute it and/or modify
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 Savoir-faire Linux Inc.
 *  Author(s) : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 *
 *  This program is free software; you can redistribute it and/or modify
@@ -48,4 +48,11 @@ struct LocalListener {
    ValueCallback get_cb;
 };

+
+struct SearchListener {
+    Sp<Query> query;
+    Value::Filter filter;
+    ValueCallback get_cb;
+};
+
 }
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 Savoir-faire Linux Inc.
 *
 *  Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 *
@@ -55,9 +55,9 @@ printLog(std::ostream& s, char const *m, va_list args) {
    s << std::endl;
 }

-std::unique_ptr<Logger>
-getStdLogger() {
-    return std::unique_ptr<Logger>(new Logger(
+void
+enableLogging(dht::DhtRunner &dht) {
+    dht.setLoggers(
        [](char const *m, va_list args) {
            std::cerr << red;
            printLog(std::cerr, m, args);
@@ -69,23 +69,23 @@ getStdLogger() {
            std::cout << def;
        },
        [](char const *m, va_list args) { printLog(std::cout, m, args); }
-    ));
+    );
 }

-std::unique_ptr<Logger>
-getFileLogger(const std::string &path) {
-    auto logfile = std::make_shared<std::ofstream>();
+void
+enableFileLogging(dht::DhtRunner &dht, const std::string &path) {
+    auto logfile = std::make_shared<std::fstream>();
    logfile->open(path, std::ios::out);

-    return std::unique_ptr<Logger>(new Logger(
+    dht.setLoggers(
        [=](char const *m, va_list args) { printLog(*logfile, m, args); },
        [=](char const *m, va_list args) { printLog(*logfile, m, args); },
        [=](char const *m, va_list args) { printLog(*logfile, m, args); }
-    ));
+    );
 }

-std::unique_ptr<Logger>
-getSyslogLogger(const char* name) {
+OPENDHT_PUBLIC void
+enableSyslog(dht::DhtRunner &dht, const char* name) {
 #ifndef _WIN32
    struct Syslog {
        Syslog(const char* n) {
@@ -102,34 +102,17 @@ getSyslogLogger(const char* name) {
        logfile = std::make_shared<Syslog>(name);
        opened_logfile = logfile;
    }
-    return std::unique_ptr<Logger>(new Logger(
+    dht.setLoggers(
        [logfile](char const *m, va_list args) { vsyslog(LOG_ERR, m, args); },
        [logfile](char const *m, va_list args) { vsyslog(LOG_WARNING, m, args); },
        [logfile](char const *m, va_list args) { vsyslog(LOG_INFO, m, args); }
-    ));
-#else
-    return std::unique_ptr<Logger>(new Logger());
+    );
 #endif
 }

-void
-enableLogging(dht::DhtRunner &dht) {
-    dht.setLogger(*getStdLogger());
-}
-
-void
-enableFileLogging(dht::DhtRunner &dht, const std::string &path) {
-    dht.setLogger(*getFileLogger(path));
-}
-
-OPENDHT_PUBLIC void
-enableSyslog(dht::DhtRunner &dht, const char* name) {
-    dht.setLogger(*getSyslogLogger(name));
-}
-
 void
 disableLogging(dht::DhtRunner &dht) {
-    dht.setLogger({});
+    dht.setLoggers(dht::NOLOG, dht::NOLOG, dht::NOLOG);
 }

 }
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2017 Savoir-faire Linux Inc.
 *  Author(s) : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 *
 *  This program is free software; you can redistribute it and/or modify
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 Savoir-faire Linux Inc.
 *  Author(s) : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 *              Simon Désaulniers <simon.desaulniers@savoirfairelinux.com>
 *
@@ -17,6 +17,7 @@
 *  along with this program. If not, see <https://www.gnu.org/licenses/>.
 */

+
 #include "network_engine.h"
 #include "request.h"
 #include "default_types.h"
@@ -25,6 +26,17 @@

 #include <msgpack.hpp>

+#ifndef _WIN32
+#include <arpa/inet.h>
+#include <unistd.h>
+#else
+#include <ws2tcpip.h>
+#include <io.h>
+#endif
+#include <fcntl.h>
+
+#include <cstring>
+
 namespace dht {
 namespace net {

@@ -43,10 +55,38 @@ constexpr std::chrono::seconds NetworkEngine::RX_TIMEOUT;
 const std::string NetworkEngine::my_v {"RNG1"};
 constexpr size_t NetworkEngine::MAX_REQUESTS_PER_SEC;

-static constexpr uint8_t v4prefix[16] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xFF, 0xFF, 0, 0, 0, 0};
+static const uint8_t v4prefix[16] = {
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xFF, 0xFF, 0, 0, 0, 0
+};

 constexpr unsigned SEND_NODES {8};

+#ifdef _WIN32
+
+static bool
+set_nonblocking(int fd, int nonblocking)
+{
+    unsigned long mode = !!nonblocking;
+    int rc = ioctlsocket(fd, FIONBIO, &mode);
+    return rc == 0;
+}
+
+extern const char *inet_ntop(int, const void *, char *, socklen_t);
+
+#else
+
+static bool
+set_nonblocking(int fd, int nonblocking)
+{
+    int rc = fcntl(fd, F_GETFL, 0);
+    if (rc < 0)
+        return false;
+    rc = fcntl(fd, F_SETFL, nonblocking?(rc | O_NONBLOCK):(rc & ~O_NONBLOCK));
+    return rc >= 0;
+}
+
+#endif
+

 /* Transaction-ids are 4-bytes long, with the first two bytes identifying
 * the kind of request, and the remaining two a sequence number in
@@ -99,31 +139,32 @@ RequestAnswer::RequestAnswer(ParsedMessage&& msg)
   nodes6(std::move(msg.nodes6))
 {}

-NetworkEngine::NetworkEngine(Logger& log, Scheduler& scheduler, std::unique_ptr<DatagramSocket>&& sock)
-    : myid(zeroes), dht_socket(std::move(sock)), DHT_LOG(log), scheduler(scheduler)
-{}
-
-NetworkEngine::NetworkEngine(InfoHash& myid, NetId net, std::unique_ptr<DatagramSocket>&& sock, Logger& log, Scheduler& scheduler,
-        decltype(NetworkEngine::onError)&& onError,
-        decltype(NetworkEngine::onNewNode)&& onNewNode,
-        decltype(NetworkEngine::onReportedAddr)&& onReportedAddr,
-        decltype(NetworkEngine::onPing)&& onPing,
-        decltype(NetworkEngine::onFindNode)&& onFindNode,
-        decltype(NetworkEngine::onGetValues)&& onGetValues,
-        decltype(NetworkEngine::onListen)&& onListen,
-        decltype(NetworkEngine::onAnnounce)&& onAnnounce,
-        decltype(NetworkEngine::onRefresh)&& onRefresh) :
-    onError(std::move(onError)),
-    onNewNode(std::move(onNewNode)),
-    onReportedAddr(std::move(onReportedAddr)),
-    onPing(std::move(onPing)),
-    onFindNode(std::move(onFindNode)),
-    onGetValues(std::move(onGetValues)),
-    onListen(std::move(onListen)),
-    onAnnounce(std::move(onAnnounce)),
-    onRefresh(std::move(onRefresh)),
-    myid(myid), network(net), dht_socket(std::move(sock)), DHT_LOG(log), scheduler(scheduler)
+NetworkEngine::NetworkEngine(Logger& log, Scheduler& scheduler, const int& s, const int& s6)
+    : myid(zeroes), dht_socket(s), dht_socket6(s6), DHT_LOG(log), scheduler(scheduler)
 {}
+NetworkEngine::NetworkEngine(InfoHash& myid, NetId net, const int& s, const int& s6, Logger& log, Scheduler& scheduler,
+        decltype(NetworkEngine::onError) onError,
+        decltype(NetworkEngine::onNewNode) onNewNode,
+        decltype(NetworkEngine::onReportedAddr) onReportedAddr,
+        decltype(NetworkEngine::onPing) onPing,
+        decltype(NetworkEngine::onFindNode) onFindNode,
+        decltype(NetworkEngine::onGetValues) onGetValues,
+        decltype(NetworkEngine::onListen) onListen,
+        decltype(NetworkEngine::onAnnounce) onAnnounce,
+        decltype(NetworkEngine::onRefresh) onRefresh) :
+    onError(onError), onNewNode(onNewNode), onReportedAddr(onReportedAddr), onPing(onPing), onFindNode(onFindNode),
+    onGetValues(onGetValues), onListen(onListen), onAnnounce(onAnnounce), onRefresh(onRefresh), myid(myid),
+    network(net), dht_socket(s), dht_socket6(s6), DHT_LOG(log), scheduler(scheduler)
+{
+    if (dht_socket >= 0) {
+        if (!set_nonblocking(dht_socket, 1))
+            throw DhtException("Can't set socket to non-blocking mode");
+    }
+    if (dht_socket6 >= 0) {
+        if (!set_nonblocking(dht_socket6, 1))
+            throw DhtException("Can't set socket to non-blocking mode");
+    }
+}

 NetworkEngine::~NetworkEngine() {
    clear();
@@ -144,63 +185,63 @@ NetworkEngine::tellListener(Sp<Node> node, Tid socket_id, const InfoHash& hash,
 }

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

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

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

    // send response
-    send(n->getAddr(), buffer.data(), buffer.size());
+    send(buffer.data(), buffer.size(), 0, n->getAddr());
 }

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

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

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

    // send response
-    send(n->getAddr(), buffer.data(), buffer.size());
+    send(buffer.data(), buffer.size(), 0, n->getAddr());
 }


@@ -209,11 +250,11 @@ NetworkEngine::isRunning(sa_family_t af) const
 {
    switch (af) {
    case 0:
-        return dht_socket->hasIPv4() or dht_socket->hasIPv6();
+        return dht_socket  >= 0 ||  dht_socket6 >= 0;
    case AF_INET:
-        return dht_socket->hasIPv4();
+        return dht_socket  >= 0;
    case AF_INET6:
-        return dht_socket->hasIPv6();
+        return dht_socket6 >= 0;
    default:
        return false;
    }
@@ -221,13 +262,7 @@ NetworkEngine::isRunning(sa_family_t af) const

 void
 NetworkEngine::clear()
-{
-    for (auto& request : requests) {
-        request.second->cancel();
-        request.second->node->setExpired();
-    }
-    requests.clear();
-}
+{}

 void
 NetworkEngine::connectivityChanged(sa_family_t af)
@@ -245,7 +280,7 @@ NetworkEngine::requestStep(Sp<Request> sreq)
    auto now = scheduler.time();
    auto& node = *req.node;
    if (req.isExpired(now)) {
-        DHT_LOG.d(node.id, "[node %s] expired !", node.toString().c_str());
+        DHT_LOG.e(node.id, "[node %s] expired !", node.toString().c_str());
        node.setExpired();
        if (not node.id)
            requests.erase(req.tid);
@@ -254,22 +289,27 @@ NetworkEngine::requestStep(Sp<Request> sreq)
        req.on_expired(req, false);
    }

-    auto err = send(node.getAddr(), (char*)req.msg.data(), req.msg.size(), node.getReplyTime() < now - UDP_REPLY_TIME);
+    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        ||
-        err == EPERM)
+        err == EPIPE)
    {
-        node.setExpired();
-        if (not node.id)
-            requests.erase(req.tid);
+        scheduler.add(now, [this,wreq]() mutable {
+            if (auto req = wreq.lock()) {
+                req->node->setExpired();
+                if (not req->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);
@@ -284,11 +324,11 @@ NetworkEngine::requestStep(Sp<Request> sreq)
 void
 NetworkEngine::sendRequest(const Sp<Request>& request)
 {
-    auto& node = *request->node;
-    if (not node.id)
+    auto& node = request->node;
+    if (not node->id)
        requests.emplace(request->tid, request);
    request->start = scheduler.time();
-    node.requested(request);
+    node->requested(request);
    requestStep(request);
 }

@@ -310,8 +350,9 @@ NetworkEngine::rateLimit(const SockAddr& addr)
        limiter_maintenance = 0;
    }

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

 bool
@@ -357,9 +398,8 @@ NetworkEngine::isNodeBlacklisted(const SockAddr& addr) const
 }

 void
-NetworkEngine::processMessage(const uint8_t *buf, size_t buflen, SockAddr f)
+NetworkEngine::processMessage(const uint8_t *buf, size_t buflen, const SockAddr& from)
 {
-    auto from = f.getMappedIPv4();
    if (isMartian(from)) {
        DHT_LOG.w("Received packet from martian node %s", from.toString().c_str());
        return;
@@ -376,7 +416,7 @@ NetworkEngine::processMessage(const uint8_t *buf, size_t buflen, SockAddr f)
        msg->msgpack_unpack(msg_res.get());
    } catch (const std::exception& e) {
        DHT_LOG.w("Can't parse message of size %lu: %s", buflen, e.what());
-        //DHT_LOG.DBG.logPrintable(buf, buflen);
+        DHT_LOG.DEBUG.logPrintable(buf, buflen);
        return;
    }

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

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

@@ -570,15 +605,13 @@ NetworkEngine::process(std::unique_ptr<ParsedMessage>&& msg, const SockAddr& fro
                break;
            }
            case MessageType::Refresh:
-                if (logIncoming_)
-                    DHT_LOG.d(msg->info_hash, node->id, "[node %s] got 'refresh' request for %s", node->toString().c_str(), msg->info_hash.toString().c_str());
+                DHT_LOG.d(msg->info_hash, node->id, "[node %s] got 'refresh' request for %s", node->toString().c_str(), msg->info_hash.toString().c_str());
                onRefresh(node, msg->info_hash, msg->token, msg->value_id);
                /* Same note as above in MessageType::AnnounceValue applies. */
                sendValueAnnounced(from, msg->tid, msg->value_id);
                break;
            case MessageType::Listen: {
-                if (logIncoming_)
-                    DHT_LOG.d(msg->info_hash, node->id, "[node %s] got 'listen' request for %s", node->toString().c_str(), msg->info_hash.toString().c_str());
+                DHT_LOG.d(msg->info_hash, node->id, "[node %s] got 'listen' request for %s", node->toString().c_str(), msg->info_hash.toString().c_str());
                ++in_stats.listen;
                RequestAnswer answer = onListen(node, msg->info_hash, msg->token, msg->socket_id, std::move(msg->query));
                auto nnodes = bufferNodes(from.getFamily(), msg->info_hash, msg->want, answer.nodes4, answer.nodes6);
@@ -609,9 +642,33 @@ insertAddr(msgpack::packer<msgpack::sbuffer>& pk, const SockAddr& addr)
 }

 int
-NetworkEngine::send(const SockAddr& addr, const char *buf, size_t len, bool confirmed)
+NetworkEngine::send(const char *buf, size_t len, int flags, const SockAddr& addr)
 {
-    return dht_socket ? dht_socket->sendTo(addr, (const uint8_t*)buf, len, confirmed) : ENOTCONN;
+    if (not addr)
+        return EFAULT;
+
+    int s;
+    if (addr.getFamily() == AF_INET)
+        s = dht_socket;
+    else if (addr.getFamily() == AF_INET6)
+        s = dht_socket6;
+    else
+        s = -1;
+
+    if (s < 0)
+        return EAFNOSUPPORT;
+#ifdef MSG_NOSIGNAL
+    flags &= MSG_NOSIGNAL;
+#endif
+    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;
 }

 Sp<Request>
@@ -621,16 +678,16 @@ NetworkEngine::sendPing(Sp<Node> node, RequestCb&& on_done, RequestExpiredCb&& o
    msgpack::packer<msgpack::sbuffer> pk(&buffer);
    pk.pack_map(5+(network?1:0));

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

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

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

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

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

-    send(addr, buffer.data(), buffer.size());
+    send(buffer.data(), buffer.size(), 0, addr);
 }

 Sp<Request>
@@ -682,23 +739,23 @@ NetworkEngine::sendFindNode(Sp<Node> n, const InfoHash& target, want_t want,
    msgpack::packer<msgpack::sbuffer> pk(&buffer);
    pk.pack_map(5+(network?1:0));

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

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

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

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

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

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

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

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

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

    // send response
-    send(addr, buffer.data(), buffer.size());
+    send(buffer.data(), buffer.size(), 0, addr);

    // send parts
    if (not svals.empty())
@@ -1020,23 +1077,23 @@ NetworkEngine::sendListen(Sp<Node> n,
    pk.pack_map(5+(network?1:0));

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

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

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

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

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

-    send(addr, buffer.data(), buffer.size());
+    send(buffer.data(), buffer.size(), 0, addr);
 }

 Sp<Request>
@@ -1092,23 +1149,23 @@ NetworkEngine::sendAnnounceValue(Sp<Node> n,
    msgpack::packer<msgpack::sbuffer> pk(&buffer);
    pk.pack_map(5+(network?1:0));

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

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

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

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

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

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

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

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

-    send(addr, buffer.data(), buffer.size());
+    send(buffer.data(), buffer.size(), 0, addr);
 }

 void
@@ -1223,25 +1280,25 @@ NetworkEngine::sendError(const SockAddr& addr,
    msgpack::packer<msgpack::sbuffer> pk(&buffer);
    pk.pack_map(4 + (include_id?1:0));

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

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

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

-    send(addr, buffer.data(), buffer.size());
+    send(buffer.data(), buffer.size(), 0, addr);
 }

 void
@@ -1,333 +0,0 @@
-/*
- *  Copyright (C) 2019 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 "network_utils.h"
-
-#ifdef _WIN32
-#include "utils.h"
-#include <io.h>
-#include <string>
-#include <cstring>
-#define close(x) closesocket(x)
-#define write(s, b, f) send(s, b, (int)strlen(b), 0)
-#else
-#include <fcntl.h>
-#endif
-
-#include <iostream>
-
-namespace dht {
-namespace net {
-
-int
-bindSocket(const SockAddr& addr, SockAddr& bound)
-{
-    bool is_ipv6 = addr.getFamily() == AF_INET6;
-    int sock = socket(is_ipv6 ? PF_INET6 : PF_INET, SOCK_DGRAM, 0);
-    if (sock < 0)
-        throw DhtException(std::string("Can't open socket: ") + strerror(sock));
-    int set = 1;
-#ifdef SO_NOSIGPIPE
-    setsockopt(sock, SOL_SOCKET, SO_NOSIGPIPE, (const char*)&set, sizeof(set));
-#endif
-    if (is_ipv6)
-        setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY, (const char*)&set, sizeof(set));
-    net::setNonblocking(sock);
-    int rc = bind(sock, addr.get(), addr.getLength());
-    if (rc < 0) {
-        rc = errno;
-        close(sock);
-        throw DhtException("Can't bind socket on " + addr.toString() + " " + strerror(rc));
-    }
-    sockaddr_storage ss;
-    socklen_t ss_len = sizeof(ss);
-    getsockname(sock, (sockaddr*)&ss, &ss_len);
-    bound = {ss, ss_len};
-    return sock;
-}
-
-bool
-setNonblocking(int fd, bool nonblocking)
-{
-#ifdef _WIN32
-    unsigned long mode = !!nonblocking;
-    int rc = ioctlsocket(fd, FIONBIO, &mode);
-    return rc == 0;
-#else
-    int rc = fcntl(fd, F_GETFL, 0);
-    if (rc < 0)
-        return false;
-    rc = fcntl(fd, F_SETFL, nonblocking ? (rc | O_NONBLOCK) : (rc & ~O_NONBLOCK));
-    return rc >= 0;
-#endif
-}
-
-#ifdef _WIN32
-void udpPipe(int fds[2])
-{
-    int lst = socket(AF_INET, SOCK_DGRAM, 0);
-    if (lst < 0)
-        throw DhtException(std::string("Can't open socket: ") + strerror(WSAGetLastError()));
-    sockaddr_in inaddr;
-    sockaddr addr;
-    memset(&inaddr, 0, sizeof(inaddr));
-    memset(&addr, 0, sizeof(addr));
-    inaddr.sin_family = AF_INET;
-    inaddr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
-    inaddr.sin_port = 0;
-    int yes = 1;
-    setsockopt(lst, SOL_SOCKET, SO_REUSEADDR, (char*)&yes, sizeof(yes));
-    int rc = bind(lst, (sockaddr*)&inaddr, sizeof(inaddr));
-    if (rc < 0) {
-        close(lst);
-        throw DhtException("Can't bind socket on " + print_addr((sockaddr*)&inaddr, sizeof(inaddr)) + " " + strerror(rc));
-    }
-    socklen_t len = sizeof(addr);
-    getsockname(lst, &addr, &len);
-    fds[0] = lst;
-    fds[1] = socket(AF_INET, SOCK_DGRAM, 0);
-    connect(fds[1], &addr, len);
-}
-#endif
-
-UdpSocket::UdpSocket(in_port_t port, const Logger& l) : logger(l) {
-    SockAddr bind4;
-    bind4.setFamily(AF_INET);
-    bind4.setPort(port);
-    SockAddr bind6;
-    bind6.setFamily(AF_INET6);
-    bind6.setPort(port);
-    openSockets(bind4, bind6);
-}
-
-UdpSocket::UdpSocket(const SockAddr& bind4, const SockAddr& bind6, const Logger& l) : logger(l)
-{
-    openSockets(bind4, bind6);
-}
-
-UdpSocket::~UdpSocket() {
-    stop();
-    if (rcv_thread.joinable())
-        rcv_thread.join();
-}
-
-int
-UdpSocket::sendTo(const SockAddr& dest, const uint8_t* data, size_t size, bool replied) {
-    if (not dest)
-        return EFAULT;
-
-    int s;
-    switch (dest.getFamily()) {
-    case AF_INET:  s = s4; break;
-    case AF_INET6: s = s6; break;
-    default:       s = -1; break;
-    }
-
-    if (s < 0)
-        return EAFNOSUPPORT;
-
-    int flags = 0;
-#ifdef MSG_CONFIRM
-    if (replied)
-        flags |= MSG_CONFIRM;
-#endif
-#ifdef MSG_NOSIGNAL
-    flags |= MSG_NOSIGNAL;
-#endif
-
-    if (sendto(s, (const char*)data, size, flags, dest.get(), dest.getLength()) == -1) {
-        int err = errno;
-        logger.d("Can't send message to %s: %s", dest.toString().c_str(), strerror(err));
-        if (err == EPIPE || err == ENOTCONN || err == ECONNRESET) {
-            auto bind4 = std::move(bound4), bind6 = std::move(bound6);
-            openSockets(bind4, bind6);
-            return sendTo(dest, data, size, false);
-        }
-        return err;
-    }
-    return 0;
-}
-
-void
-UdpSocket::openSockets(const SockAddr& bind4, const SockAddr& bind6)
-{
-    stop();
-    if (rcv_thread.joinable())
-        rcv_thread.join();
-
-    int stopfds[2];
-#ifndef _WIN32
-    auto status = pipe(stopfds);
-    if (status == -1) {
-        throw DhtException(std::string("Can't open pipe: ") + strerror(errno));
-    }
-#else
-    udpPipe(stopfds);
-#endif
-    int stop_readfd = stopfds[0];
-    stopfd = stopfds[1];
-
-    s4 = -1;
-    s6 = -1;
-
-    bound4 = {};
-    if (bind4) {
-        try {
-            s4 = bindSocket(bind4, bound4);
-        } catch (const DhtException& e) {
-            logger.e("Can't bind inet socket: %s", e.what());
-        }
-    }
-
-#if 1
-    bound6 = {};
-    if (bind6) {
-        if (bind6.getPort() == 0) {
-            // Attempt to use the same port as IPv4 with IPv6
-            if (auto p4 = bound4.getPort()) {
-                auto b6 = bind6;
-                b6.setPort(p4);
-                try {
-                    s6 = bindSocket(b6, bound6);
-                } catch (const DhtException& e) {
-                    logger.e("Can't bind inet6 socket: %s", e.what());
-                }
-            }
-        }
-        if (s6 == -1) {
-            try {
-                s6 = bindSocket(bind6, bound6);
-            } catch (const DhtException& e) {
-                logger.e("Can't bind inet6 socket: %s", e.what());
-            }
-        }
-    }
-#endif
-
-    if (s4 == -1 && s6 == -1) {
-        throw DhtException("Can't bind socket");
-    }
-
-    running = true;
-    rcv_thread = std::thread([this, stop_readfd]() {
-        int selectFd = std::max({s4, s6, stop_readfd}) + 1;
-        try {
-            while (running) {
-                fd_set readfds;
-
-                FD_ZERO(&readfds);
-                FD_SET(stop_readfd, &readfds);
-                if(s4 >= 0)
-                    FD_SET(s4, &readfds);
-                if(s6 >= 0)
-                    FD_SET(s6, &readfds);
-
-                int rc = select(selectFd, &readfds, nullptr, nullptr, nullptr);
-                if (rc < 0) {
-                    if (errno != EINTR) {
-                        logger.e("Select error: %s", strerror(errno));
-                        std::this_thread::sleep_for(std::chrono::seconds(1));
-                    }
-                }
-
-                if (not running)
-                    break;
-
-                if (rc > 0) {
-                    std::array<uint8_t, 1024 * 64> buf;
-                    sockaddr_storage from;
-                    socklen_t from_len = sizeof(from);
-
-                    if (FD_ISSET(stop_readfd, &readfds)) {
-                        if (recv(stop_readfd, (char*)buf.data(), buf.size(), 0) < 0) {
-                            logger.e("Got stop packet error: %s", strerror(errno));
-                            break;
-                        }
-                    }
-                    else if (s4 >= 0 && FD_ISSET(s4, &readfds))
-                        rc = recvfrom(s4, (char*)buf.data(), buf.size(), 0, (sockaddr*)&from, &from_len);
-                    else if (s6 >= 0 && FD_ISSET(s6, &readfds))
-                        rc = recvfrom(s6, (char*)buf.data(), buf.size(), 0, (sockaddr*)&from, &from_len);
-                    else
-                        continue;
-
-                    if (rc > 0) {
-                        auto pkt = std::unique_ptr<ReceivedPacket>(new ReceivedPacket);
-                        pkt->data = {buf.begin(), buf.begin()+rc};
-                        pkt->from = {from, from_len};
-                        pkt->received = clock::now();
-                        onReceived(std::move(pkt));
-                    } else if (rc == -1) {
-                        logger.e("Error receiving packet: %s", strerror(errno));
-                        int err = errno;
-                        if (err == EPIPE || err == ENOTCONN || err == ECONNRESET) {
-                            if (s4 >= 0) {
-                                close(s4);
-                                try {
-                                    s4 = bindSocket(bound4, bound4);
-                                } catch (const DhtException& e) {
-                                    logger.e("Can't bind inet socket: %s", e.what());
-                                }
-                            }
-                            if (s6 >= 0) {
-                                close(s6);
-                                try {
-                                    s6 = bindSocket(bound6, bound6);
-                                } catch (const DhtException& e) {
-                                    logger.e("Can't bind inet6 socket: %s", e.what());
-                                }
-                            }
-                            if (s4 < 0 && s6 < 0)
-                                break;
-                            selectFd = std::max({s4, s6, stop_readfd}) + 1;
-                        }
-                    }
-                }
-            }
-        } catch (const std::exception& e) {
-            logger.e("Error in UdpSocket rx thread: %s", e.what());
-        }
-        if (s4 >= 0)
-            close(s4);
-        if (s6 >= 0)
-            close(s6);
-        s4 = -1;
-        s6 = -1;
-        bound4 = {};
-        bound6 = {};
-        if (stop_readfd != -1)
-            close(stop_readfd);
-        if (stopfd != -1)
-            close(stopfd);
-        stopfd = -1;
-    });
-}
-
-void
-UdpSocket::stop()
-{
-    if (running.exchange(false)) {
-        auto sfd = stopfd;
-        if (sfd != -1 && write(sfd, "\0", 1) == -1) {
-            logger.e("Can't write to stop fd");
-        }
-    }
-}
-
-}
-}
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 Savoir-faire Linux Inc.
 *  Author(s) : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 *              Simon Désaulniers <simon.desaulniers@savoirfairelinux.com>
 *
@@ -49,7 +49,7 @@ Node::isGood(time_point now) const
 bool
 Node::isPendingMessage() const
 {
-    for (const auto& r : requests_) {
+    for (auto r : requests_) {
        if (r.second->pending())
            return true;
    }
@@ -60,7 +60,7 @@ size_t
 Node::getPendingMessageCount() const
 {
    size_t count {0};
-    for (const auto& r : requests_) {
+    for (auto r : requests_) {
        if (r.second->pending())
            count++;
    }
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 Savoir-faire Linux Inc.
 *  Author(s) : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 *
 *  This program is free software; you can redistribute it and/or modify
@@ -20,9 +20,6 @@

 namespace dht {

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-static const std::string KEY_Y {"y"};
-static const std::string KEY_R {"r"};
-static const std::string KEY_U {"u"};
-static const std::string KEY_E {"e"};
-static const std::string KEY_V {"p"};
-static const std::string KEY_TID {"t"};
-static const std::string KEY_UA {"v"};
-static const std::string KEY_NETID {"n"};
-static const std::string KEY_ISCLIENT {"s"};
-static const std::string KEY_Q {"q"};
-static const std::string KEY_A {"a"};
-
-static const std::string KEY_REQ_SID {"sid"};
-static const std::string KEY_REQ_ID {"id"};
-static const std::string KEY_REQ_H {"h"};
-static const std::string KEY_REQ_TARGET {"target"};
-static const std::string KEY_REQ_QUERY {"q"};
-static const std::string KEY_REQ_TOKEN {"token"};
-static const std::string KEY_REQ_VALUE_ID {"vid"};
-static const std::string KEY_REQ_NODES4 {"n4"};
-static const std::string KEY_REQ_NODES6 {"n6"};
-static const std::string KEY_REQ_CREATION {"c"};
-static const std::string KEY_REQ_ADDRESS {"sa"};
-static const std::string KEY_REQ_VALUES {"values"};
-static const std::string KEY_REQ_EXPIRED {"exp"};
-static const std::string KEY_REQ_REFRESHED {"re"};
-static const std::string KEY_REQ_FIELDS {"fileds"};
-static const std::string KEY_REQ_WANT {"w"};
-
-static const std::string QUERY_PING {"ping"};
-static const std::string QUERY_FIND {"find"};
-static const std::string QUERY_GET {"get"};
-static const std::string QUERY_PUT {"put"};
-static const std::string QUERY_LISTEN {"listen"};
-static const std::string QUERY_REFRESH {"refresh"};
-
 Tid unpackTid(const msgpack::object& o) {
    switch (o.type) {
    case msgpack::type::POSITIVE_INTEGER:
@@ -84,13 +48,13 @@ struct ParsedMessage {
    /* target id around which to find nodes */
    InfoHash target;
    /* transaction id */
-    Tid tid {0};
+    Tid tid;
    /* tid for packets going through request socket */
-    Tid socket_id {0};
+    Tid socket_id;
    /* security token */
    Blob token;
    /* the value id (announce confirmation) */
-    Value::Id value_id {0};
+    Value::Id value_id;
    /* time when value was first created */
    time_point created { time_point::max() };
    /* IPv4 nodes in response to a 'find' request */
@@ -114,7 +78,7 @@ struct ParsedMessage {
    /* reported address by the distant node */
    std::string ua;
    SockAddr addr;
-    void msgpack_unpack(const msgpack::object& o);
+    void msgpack_unpack(msgpack::object o);

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

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

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

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

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

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

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

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

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

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

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

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

-    if (parsedReq.want) {
-        if (parsedReq.want->type != msgpack::type::ARRAY)
+    if (auto w = findMapValue(req, "w")) {
+        if (w->type != msgpack::type::ARRAY)
            throw msgpack::type_error();
        want = 0;
-        for (unsigned i=0; i<parsedReq.want->via.array.size; i++) {
-            auto& val = parsedReq.want->via.array.ptr[i];
+        for (unsigned i=0; i<w->via.array.size; i++) {
+            auto& val = w->via.array.ptr[i];
            try {
                auto w = val.as<sa_family_t>();
                if (w == AF_INET)
@@ -1,577 +0,0 @@
-/*
- *  Copyright (C) 2014-2019 Savoir-faire Linux Inc.
- *  Author(s) : Mingrui Zhang <mingrui.zhang@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 "peer_discovery.h"
-#include "network_utils.h"
-#include "utils.h"
-
-#ifdef _WIN32
-#include <Ws2tcpip.h> // needed for ip_mreq definition for multicast
-#include <Windows.h>
-#include <cstring>
-#if defined(_MSC_VER)
-#include <BaseTsd.h>
-typedef SSIZE_T ssize_t;
-#endif
-#define close(x) closesocket(x)
-#else
-#include <sys/types.h>
-#include <unistd.h>
-#endif
-#include <fcntl.h>
-
-#ifndef IPV6_JOIN_GROUP
-#define IPV6_JOIN_GROUP IPV6_ADD_MEMBERSHIP
-#endif
-
-namespace dht {
-
-// Organization-local Scope multicast
-constexpr char MULTICAST_ADDRESS_IPV4[12] = "239.192.0.1";
-constexpr char MULTICAST_ADDRESS_IPV6[10] = "ff08::101";
-
-
-class PeerDiscovery::DomainPeerDiscovery
-{
-public:
-    DomainPeerDiscovery(sa_family_t domain, in_port_t port);
-    ~DomainPeerDiscovery();
-
-    /**
-     * startDiscovery - Keep Listening data from the sender until node is joinned or stop is called
-    */
-    void startDiscovery(const std::string &type, ServiceDiscoveredCallback callback);
-
-    /**
-     * startPublish - Keeping sending data until node is joinned or stop is called - msgpack
-    */
-    void startPublish(const std::string &type, const msgpack::sbuffer &pack_buf);
-
-    /**
-     * Thread Stopper
-    */
-    void stop();
-
-    /**
-     * Remove possible callBack to discovery
-    */
-    bool stopDiscovery(const std::string &type);
-
-    /**
-     * Remove different serivce message to send
-    */
-    bool stopPublish(const std::string &type);
-
-    /**
-     * Configure the sockopt to be able to listen multicast group
-    */
-    static void socketJoinMulticast(int sockfd, sa_family_t family);
-
-    /**
-     * Join the threads
-    */
-    void join() {
-        if(running_listen_.joinable()) running_listen_.join();
-        if(running_send_.joinable()) running_send_.join();
-    }
-private:
-    //dmtx_ for callbackmap_ and drunning_ (write)
-    std::mutex dmtx_;
-    //mtx_ for messages_ and lrunning (listen)
-    std::mutex mtx_;
-    std::condition_variable cv_;
-    bool lrunning_ {false};
-    bool drunning_ {false};
-    sa_family_t domain_ {AF_UNSPEC};
-    int port_;
-    int sockfd_ {-1};
-    int stop_writefd_ {-1};
-
-    SockAddr sockAddrSend_;
-
-    //Thread export to be joined
-    std::thread running_listen_;
-    std::thread running_send_;
-
-    msgpack::sbuffer sbuf_;
-    std::map<std::string, msgpack::sbuffer> messages_;
-    std::map<std::string, ServiceDiscoveredCallback> callbackmap_;
-
-    /**
-     * Multicast Socket Initialization, accept IPV4, IPV6
-    */
-    static int initialize_socket(sa_family_t domain);
-
-    /**
-     * Receive messages
-    */
-    std::pair<SockAddr, msgpack::object_handle> recvFrom();
-
-    /**
-     * Listener pack thread loop
-    */
-    void listenerpack_thread();
-
-    /**
-     * Listener Parameters Setup
-    */
-    void listener_setup();
-
-    /**
-     * Sender Parameters Setup
-    */
-    void sender_setup();
-    /**
-     * Sender Parameters Setup
-    */
-    void messages_reload();
-
-    void stopDiscovery();
-    void stopPublish();
-};
-
-PeerDiscovery::DomainPeerDiscovery::DomainPeerDiscovery(sa_family_t domain, in_port_t port)
-    : domain_(domain), port_(port), sockfd_(initialize_socket(domain))
-{
-    socketJoinMulticast(sockfd_, domain);
-    listener_setup();
-    sender_setup();
-}
-
-PeerDiscovery::DomainPeerDiscovery::~DomainPeerDiscovery()
-{
-    stop();
-    join();
-    if (sockfd_ != -1)
-        close(sockfd_);
-
-#ifdef _WIN32
-    WSACleanup();
-#endif
-}
-
-int
-PeerDiscovery::DomainPeerDiscovery::initialize_socket(sa_family_t domain)
-{
-#ifdef _WIN32
-    WSADATA wsaData;
-    if (WSAStartup(0x0101, &wsaData)) {
-        throw std::runtime_error(std::string("Can't initialize Winsock2 ") + strerror(errno));
-    }
-#endif
-
-    int sockfd = socket(domain, SOCK_DGRAM, 0);
-    if (sockfd < 0) {
-        throw std::runtime_error(std::string("Socket Creation Error: ") + strerror(errno));
-    }
-    net::setNonblocking(sockfd);
-    return sockfd;
-}
-
-void
-PeerDiscovery::DomainPeerDiscovery::listener_setup()
-{
-    SockAddr sockAddrListen_;
-    sockAddrListen_.setFamily(domain_);
-    sockAddrListen_.setPort(port_);
-    sockAddrListen_.setAny();
-
-    unsigned int opt = 1;
-    if (setsockopt(sockfd_, SOL_SOCKET, SO_REUSEADDR, (char*)&opt, sizeof(opt)) < 0) {
-       std::cerr << "setsockopt SO_REUSEADDR failed: " << strerror(errno) << std::endl;
-    }
-#ifdef SO_REUSEPORT
-    if (setsockopt(sockfd_, SOL_SOCKET, SO_REUSEPORT, (char*)&opt, sizeof(opt)) < 0) {
-       std::cerr << "setsockopt SO_REUSEPORT failed: " << strerror(errno) << std::endl;
-    }
-#endif
-
-    // bind to receive address
-    if (bind(sockfd_, sockAddrListen_.get(), sockAddrListen_.getLength()) < 0){
-        throw std::runtime_error(std::string("Error binding socket: ") + strerror(errno));
-    }
-}
-
-void
-PeerDiscovery::DomainPeerDiscovery::socketJoinMulticast(int sockfd, sa_family_t family)
-{
-    switch (family)
-    {
-    case AF_INET:{
-        ip_mreq config_ipv4;
-
-        //This option can be used to set the interface for sending outbound
-        //multicast datagrams from the sockets application.
-        config_ipv4.imr_interface.s_addr = htonl(INADDR_ANY);
-        if( setsockopt(sockfd, IPPROTO_IP, IP_MULTICAST_IF, (char*)&config_ipv4.imr_interface, sizeof( struct in_addr )) < 0 ) {
-            throw std::runtime_error(std::string("Bound Network Interface IPv4 Error: ") + strerror(errno));
-        }
-
-        //The IP_MULTICAST_TTL socket option allows the application to primarily
-        //limit the lifetime of the packet in the Internet and prevent it from circulating indefinitely
-        unsigned char ttl4 = 20;
-        if( setsockopt(sockfd, IPPROTO_IP, IP_MULTICAST_TTL, (char*)&ttl4, sizeof( ttl4 )) < 0 ) {
-            throw std::runtime_error(std::string("TTL Sockopt Error: ") + strerror(errno));
-        }
-
-        // config the listener to be interested in joining in the multicast group
-        config_ipv4.imr_multiaddr.s_addr = inet_addr(MULTICAST_ADDRESS_IPV4);
-        config_ipv4.imr_interface.s_addr = htonl(INADDR_ANY);
-        if (setsockopt(sockfd, IPPROTO_IP, IP_ADD_MEMBERSHIP, (char*)&config_ipv4, sizeof(config_ipv4)) < 0){
-            throw std::runtime_error(std::string(" Member Addition IPv4 Error: ") + strerror(errno));
-        }
-        break;
-    }
-    case AF_INET6: {
-        ipv6_mreq config_ipv6;
-
-        /* unsigned int outif = 0;
-        if (setsockopt(sockfd, IPPROTO_IPV6, IPV6_MULTICAST_IF, &outif, sizeof(outif)) < 0) {
-            std::cerr << "Can't assign multicast interface: " << strerror(errno) << std::endl;
-        } */
-
-        unsigned int ttl6 = 20;
-        if( setsockopt(sockfd, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, (char*)&ttl6, sizeof( ttl6 )) < 0 ) {
-            throw std::runtime_error(std::string("Hop Count Set Error: ") + strerror(errno));
-        }
-
-        config_ipv6.ipv6mr_interface = 0;
-        inet_pton(AF_INET6, MULTICAST_ADDRESS_IPV6, &config_ipv6.ipv6mr_multiaddr);
-        if (setsockopt(sockfd, IPPROTO_IPV6, IPV6_JOIN_GROUP, (char*)&config_ipv6, sizeof(config_ipv6)) < 0){
-            throw std::runtime_error(std::string("Member Addition IPv6 Error: ") + strerror(errno));
-        }
-        break;
-    }
-    }
-}
-
-void
-PeerDiscovery::DomainPeerDiscovery::startDiscovery(const std::string &type, ServiceDiscoveredCallback callback)
-{
-    std::unique_lock<std::mutex> lck(dmtx_);
-    callbackmap_[type] = callback;
-    if (not drunning_) {
-        if (running_listen_.joinable())
-            running_listen_.join();
-        drunning_ = true;
-        running_listen_ = std::thread(&DomainPeerDiscovery::listenerpack_thread, this);
-    }
-}
-
-std::pair<SockAddr, msgpack::object_handle>
-PeerDiscovery::DomainPeerDiscovery::recvFrom()
-{
-    sockaddr_storage sa;
-    socklen_t sa_len = sizeof(sa);
-
-    std::array<uint8_t, 64 * 1024> buf;
-    ssize_t nbytes = recvfrom(
-        sockfd_,
-        (char*)buf.data(), buf.size(),
-        0,
-        (sockaddr*)&sa, &sa_len
-    );
-    if (nbytes < 0)
-        throw std::runtime_error(std::string("Error receiving packet: ") + strerror(errno));
-
-    return { SockAddr { sa, sa_len }, msgpack::unpack(reinterpret_cast<char*>(buf.data()), nbytes) };
-}
-
-void
-PeerDiscovery::DomainPeerDiscovery::listenerpack_thread()
-{
-    int stopfds_pipe[2];
-#ifndef _WIN32
-    if (pipe(stopfds_pipe) == -1)
-        throw std::runtime_error(std::string("Can't open pipe: ") + strerror(errno));
-#else
-    net::udpPipe(stopfds_pipe);
-#endif
-    int stop_readfd = stopfds_pipe[0];
-    stop_writefd_ = stopfds_pipe[1];
-
-    while (true) {
-        {
-            std::lock_guard<std::mutex> lck(dmtx_);
-            if (not drunning_)
-                break;
-        }
-
-        fd_set readfds;
-
-        FD_ZERO(&readfds);
-        FD_SET(stop_readfd, &readfds);
-        FD_SET(sockfd_, &readfds);
-
-        int data_coming = select(std::max(sockfd_, stop_readfd) + 1, &readfds, nullptr, nullptr, nullptr);
-
-        {
-            std::lock_guard<std::mutex> lck(dmtx_);
-            if (not drunning_)
-                break;
-        }
-
-        if (data_coming < 0) {
-            if(errno != EINTR) {
-                perror("Select Error");
-                std::this_thread::sleep_for( std::chrono::seconds(1) );
-            }
-        } else if (data_coming > 0) {
-            if (FD_ISSET(stop_readfd, &readfds)) {
-                std::array<uint8_t, 64 * 1024> buf;
-                recv(stop_readfd, (char*)buf.data(), buf.size(), 0);
-            }
-
-            try {
-                auto rcv = recvFrom();
-                msgpack::object obj = rcv.second.get();
-
-                if (obj.type != msgpack::type::MAP)
-                    continue;
-                for (unsigned i = 0; i < obj.via.map.size; i++) {
-                    auto& o = obj.via.map.ptr[i];
-                    if (o.key.type != msgpack::type::STR)
-                        continue;
-                    auto key = o.key.as<std::string>();
-                    ServiceDiscoveredCallback cb;
-                    {
-                        std::lock_guard<std::mutex> lck(dmtx_);
-                        auto callback = callbackmap_.find(key);
-                        if (callback != callbackmap_.end())
-                            cb = callback->second;
-                    }
-                    if (cb)
-                        cb(std::move(o.val), std::move(rcv.first));
-                }
-            } catch (const std::exception& e) {
-                std::cerr << "Error receiving packet: " << e.what() << std::endl;
-            }
-        }
-    }
-    if (stop_readfd != -1)
-        close(stop_readfd);
-    if (stop_writefd_ != -1) {
-        close(stop_writefd_);
-        stop_writefd_ = -1;
-    }
-}
-
-void
-PeerDiscovery::DomainPeerDiscovery::sender_setup()
-{
-    // Setup sender address
-    sockAddrSend_.setFamily(domain_);
-    sockAddrSend_.setAddress(domain_ == AF_INET ? MULTICAST_ADDRESS_IPV4 : MULTICAST_ADDRESS_IPV6);
-    sockAddrSend_.setPort(port_);
-}
-
-void
-PeerDiscovery::DomainPeerDiscovery::startPublish(const std::string &type, const msgpack::sbuffer &pack_buf)
-{
-    //Set up New Sending pack
-    msgpack::sbuffer pack_buf_c;
-    pack_buf_c.write(pack_buf.data(),pack_buf.size());
-
-    std::unique_lock<std::mutex> lck(mtx_);
-    messages_[type] = std::move(pack_buf_c);
-    messages_reload();
-    if (not lrunning_) {
-        if (running_send_.joinable())
-            running_send_.join();
-        lrunning_ = true;
-        running_send_ = std::thread([this](){
-            std::unique_lock<std::mutex> lck(mtx_);
-            while (lrunning_) {
-                ssize_t nbytes = sendto(
-                    sockfd_,
-                    sbuf_.data(),
-                    sbuf_.size(),
-                    0,
-                    sockAddrSend_.get(),
-                    sockAddrSend_.getLength()
-                );
-                if (nbytes < 0) {
-                    std::cerr << "Error sending packet: " << strerror(errno) << std::endl;
-                }
-                if (cv_.wait_for(lck,std::chrono::seconds(3),[&]{ return !lrunning_; }))
-                    break;
-            }
-        });
-    }
-}
-
-bool
-PeerDiscovery::DomainPeerDiscovery::stopDiscovery(const std::string &type)
-{
-    std::lock_guard<std::mutex> lck(dmtx_);
-    if (callbackmap_.erase(type) > 0) {
-        if (callbackmap_.empty())
-            stopDiscovery();
-        return true;
-    }
-    return false;
-}
-
-bool
-PeerDiscovery::DomainPeerDiscovery::stopPublish(const std::string &type)
-{
-    std::lock_guard<std::mutex> lck(mtx_);
-    if (messages_.erase(type) > 0) {
-        if (messages_.empty())
-            stopPublish();
-        else
-            messages_reload();
-        return true;
-    }
-    return false;
-}
-
-void
-PeerDiscovery::DomainPeerDiscovery::stopDiscovery()
-{
-#ifdef _WIN32
-#define write(s, b, f) send((s), (b), (f), 0)
-#endif
-    if (drunning_) {
-        drunning_ = false;
-        if (stop_writefd_ != -1) {
-            if (write(stop_writefd_, "\0", 1) == -1) {
-                std::cerr << "Can't send stop message: " << strerror(errno) << std::endl;
-            }
-        }
-    }
-#ifdef _WIN32
-#undef write
-#endif
-}
-
-void
-PeerDiscovery::DomainPeerDiscovery::stopPublish()
-{
-    if (lrunning_) {
-        lrunning_ = false;
-        cv_.notify_all();
-    }
-}
-
-void
-PeerDiscovery::DomainPeerDiscovery::stop()
-{
-    {
-        std::unique_lock<std::mutex> lck(dmtx_);
-        stopDiscovery();
-    }
-    {
-        std::unique_lock<std::mutex> lck(mtx_);
-        stopPublish();
-    }
-}
-
-void
-PeerDiscovery::DomainPeerDiscovery::messages_reload()
-{
-    sbuf_.clear();
-    msgpack::packer<msgpack::sbuffer> pk(&sbuf_);
-    pk.pack_map(messages_.size());
-    for (const auto& m : messages_) {
-        pk.pack(m.first);
-        sbuf_.write(m.second.data(), m.second.size());
-    }
-}
-
-PeerDiscovery::PeerDiscovery(in_port_t port)
-{
-    try {
-        peerDiscovery4_.reset(new DomainPeerDiscovery(AF_INET, port));
-    } catch(const std::exception& e){
-        std::cerr << "Can't start peer discovery (IPv4): " << e.what() << std::endl;
-    }
-    try {
-        peerDiscovery6_.reset(new DomainPeerDiscovery(AF_INET6, port));
-    } catch(const std::exception& e) {
-        std::cerr << "Can't start peer discovery (IPv6): " << e.what() << std::endl;
-    }
-}
-
-PeerDiscovery::~PeerDiscovery(){}
-
-void
-PeerDiscovery::startDiscovery(const std::string &type, ServiceDiscoveredCallback callback)
-{
-    if(peerDiscovery4_) peerDiscovery4_->startDiscovery(type, callback);
-    if(peerDiscovery6_) peerDiscovery6_->startDiscovery(type, callback);
-}
-
-void
-PeerDiscovery::startPublish(const std::string &type, const msgpack::sbuffer &pack_buf)
-{
-    if(peerDiscovery4_) peerDiscovery4_->startPublish(type, pack_buf);
-    if(peerDiscovery6_) peerDiscovery6_->startPublish(type, pack_buf);
-}
-
-void
-PeerDiscovery::startPublish(sa_family_t domain, const std::string &type, const msgpack::sbuffer &pack_buf)
-{
-    if (domain == AF_INET) {
-        if (peerDiscovery4_) peerDiscovery4_->startPublish(type, pack_buf);
-    } else if (domain == AF_INET6) {
-        if (peerDiscovery6_) peerDiscovery6_->startPublish(type, pack_buf);
-    }
-}
-
-void
-PeerDiscovery::stop()
-{
-    if(peerDiscovery4_) peerDiscovery4_->stop();
-    if(peerDiscovery6_) peerDiscovery6_->stop();
-}
-
-bool
-PeerDiscovery::stopDiscovery(const std::string &type)
-{
-    bool stopped4 = peerDiscovery4_ and peerDiscovery4_->stopDiscovery(type);
-    bool stopped6 = peerDiscovery6_ and peerDiscovery6_->stopDiscovery(type);
-    return stopped4 or stopped6;
-}
-
-bool
-PeerDiscovery::stopPublish(const std::string &type)
-{
-    bool stopped4 = peerDiscovery4_ and peerDiscovery4_->stopPublish(type);
-    bool stopped6 = peerDiscovery6_ and peerDiscovery6_->stopPublish(type);
-    return stopped4 or stopped6;
-}
-
-bool
-PeerDiscovery::stopPublish(sa_family_t domain, const std::string &type)
-{
-    if (domain == AF_INET) {
-        return peerDiscovery4_ and peerDiscovery4_->stopPublish(type);
-    } else if (domain == AF_INET6) {
-        return peerDiscovery6_ and peerDiscovery6_->stopPublish(type);
-    }
-    return false;
-}
-
-void
-PeerDiscovery::join() {
-    if(peerDiscovery4_) peerDiscovery4_->join();
-    if(peerDiscovery6_) peerDiscovery6_->join();
-}
-
-}
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2016-2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2016 Savoir-faire Linux Inc.
 *  Author(s) : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 *              Simon Désaulniers <simon.desaulniers@savoirfairelinux.com>
 *
@@ -57,15 +57,6 @@ struct Request {
    bool pending() const { return state_ == State::PENDING; }
    bool over() const { return not pending(); }
    State getState() const { return state_; }
-    char getStateChar() const {
-        switch (state_) {
-            case State::PENDING:   return 'f';
-            case State::CANCELLED: return 'c';
-            case State::EXPIRED:   return 'e';
-            case State::COMPLETED: return 'a';
-            default:               return '?';
-        }
-    }

    Request(State state = State::PENDING) : state_(state) {}
    Request(MessageType type, Tid tid,
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 Savoir-faire Linux Inc.
 *  Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 *
 *  This program is free software; you can redistribute it and/or modify
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 Savoir-faire Linux Inc.
 *  Author(s) : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 *
 *  This program is free software; you can redistribute it and/or modify
@@ -92,7 +92,7 @@ RoutingTable::middle(const RoutingTable::const_iterator& it) const
        throw std::out_of_range("End of table");

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

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2018 Savoir-faire Linux Inc.
 *  Author(s) : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 *
 *  This program is free software; you can redistribute it and/or modify
@@ -65,8 +65,7 @@ struct Dht::SearchNode {
        ValueCache cache;
        Sp<Scheduler::Job> cacheExpirationJob {};
        Sp<net::Request> req {};
-        CachedListenStatus(ValueStateCallback&& cb, SyncCallback&& scb)
-         : cache(std::forward<ValueStateCallback>(cb), std::forward<SyncCallback>(scb)) {}
+        CachedListenStatus(ValueStateCallback&& cb) : cache(std::forward<ValueStateCallback>(cb)) {}
        CachedListenStatus(CachedListenStatus&&) = default;
        CachedListenStatus(const CachedListenStatus&) = delete;
        CachedListenStatus& operator=(const CachedListenStatus&) = delete;
@@ -137,7 +136,7 @@ struct Dht::SearchNode {
     *
     * @return true if we can send get, else false.
     */
-    bool canGet(time_point now, time_point update, const Sp<Query>& q) const {
+    bool canGet(time_point now, time_point update, Sp<Query> q = {}) const {
        if (node->isExpired())
            return false;

@@ -148,9 +147,9 @@ struct Dht::SearchNode {
            if (s.second and s.second->pending())
                pending = true;
            if (s.first and q and q->isSatisfiedBy(*s.first) and s.second) {
-                if (s.second->pending())
+                if (s.second->pending() and not pending_sq_status)
                    pending_sq_status = true;
-                else if (s.second->completed() and not (update > s.second->reply_time))
+                if (s.second->completed() and not (update > s.second->reply_time) and not completed_sq_status)
                    completed_sq_status = true;
                if (completed_sq_status and pending_sq_status)
                    break;
@@ -158,7 +157,7 @@ struct Dht::SearchNode {
        }

        return (not pending and now > last_get_reply + Node::NODE_EXPIRE_TIME) or
-                not (completed_sq_status or pending_sq_status or hasStartedPagination(q));
+                not (hasStartedPagination(q) or completed_sq_status or pending_sq_status);
    }

    /**
@@ -226,13 +225,6 @@ struct Dht::SearchNode {
        }
    }

-    void onListenSynced(const Sp<Query>& q, bool synced = true) {
-        auto l = listenStatus.find(q);
-        if (l != listenStatus.end()) {
-            l->second.cache.onSynced(synced);
-        }
-    }
-
    void expireValues(const Sp<Query>& q, Scheduler& scheduler) {
        auto l = listenStatus.find(q);
        if (l != listenStatus.end()) {
@@ -310,7 +302,7 @@ struct Dht::SearchNode {
            return isListening(now, ls);
    }
    bool isListening(time_point now, NodeListenerStatus::const_iterator listen_status) const {
-        if (listen_status == listenStatus.end() or not listen_status->second.req)
+        if (listen_status == listenStatus.end())
            return false;
        return listen_status->second.req->reply_time + LISTEN_EXPIRE_TIME > now;
    }
@@ -328,21 +320,22 @@ struct Dht::SearchNode {
    }

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

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

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

@@ -442,8 +430,7 @@ struct Dht::Search {
     *
     * @param query  The query identifying a 'get' request.
     */
-    time_point getLastGetTime(const Query&) const;
-    time_point getLastGetTime() const;
+    time_point getLastGetTime(Sp<Query> query = {}) const;

    /**
     * Is this get operation done ?
@@ -488,22 +475,12 @@ struct Dht::Search {
    bool isAnnounced(Value::Id id) const;
    bool isListening(time_point now) const;

-    void get(const Value::Filter& f, const Sp<Query>& q, const QueryCallback& qcb, const GetCallback& gcb, const DoneCallback& dcb, Scheduler& scheduler) {
-        if (gcb or qcb) {
-            if (not cache.get(f, q, gcb, dcb)) {
-                const auto& now = scheduler.time();
-                callbacks.emplace(now, Get { now, f, q, qcb, gcb, dcb });
-                scheduler.edit(nextSearchStep, now);
-            }
-        }
-    }
-
-    size_t listen(const ValueCallback& cb, const Value::Filter& f, const Sp<Query>& q, Scheduler& scheduler) {
+    size_t listen(ValueCallback cb, Value::Filter f, const Sp<Query>& q, Scheduler& scheduler) {
        //DHT_LOG.e(id, "[search %s IPv%c] listen", id.toString().c_str(), (af == AF_INET) ? '4' : '6');
-        return cache.listen(cb, q, f, [&](const Sp<Query>& q, ValueCallback vcb, SyncCallback scb){
+        return cache.listen(cb, q, f, [&](const Sp<Query>& q, ValueCallback vcb){
            done = false;
            auto token = ++listener_token;
-            listeners.emplace(token, SearchListener{q, vcb, scb});
+            listeners.emplace(token, SearchListener{q, f, vcb});
            scheduler.edit(nextSearchStep, scheduler.time());
            return token;
        });
@@ -532,35 +509,6 @@ struct Dht::Search {
        scheduler.edit(opExpirationJob, cache.getExpiration());
    }

-    std::vector<Sp<Value>> getPut() const {
-        std::vector<Sp<Value>> ret;
-        ret.reserve(announce.size());
-        for (const auto& a : announce)
-            ret.push_back(a.value);
-        return ret;
-    }
-
-    Sp<Value> getPut(Value::Id vid) const {
-        for (auto& a : announce) {
-            if (a.value->id == vid)
-                return a.value;
-        }
-        return {};
-    }
-
-    bool cancelPut(Value::Id vid) {
-        bool canceled {false};
-        for (auto it = announce.begin(); it != announce.end();) {
-            if (it->value->id == vid) {
-                canceled = true;
-                it = announce.erase(it);
-            }
-            else
-                ++it;
-        }
-        return canceled;
-    }
-
    /**
     * @return The number of non-good search nodes.
     */
@@ -798,20 +746,11 @@ Dht::Search::isSynced(time_point now) const
 }

 time_point
-Dht::Search::getLastGetTime(const Query& q) const
+Dht::Search::getLastGetTime(Sp<Query> q) const
 {
    time_point last = time_point::min();
    for (const auto& g : callbacks)
-        last = std::max(last, (q.isSatisfiedBy(*g.second.query) ? g.second.start : time_point::min()));
-    return last;
-}
-
-time_point
-Dht::Search::getLastGetTime() const
-{
-    time_point last = time_point::min();
-    for (const auto& g : callbacks)
-        last = std::max(last, g.second.start);
+        last = std::max(last, (not q or q->isSatisfiedBy(*g.second.query) ? g.second.start : time_point::min()));
    return last;
 }

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 Savoir-faire Linux Inc.
 *  Authors: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 *           Simon Désaulniers <simon.desaulniers@savoirfairelinux.com>
 *           Sébastien Blin <sebastien.blin@savoirfairelinux.com>
@@ -54,28 +54,27 @@ SecureDht::SecureDht(std::unique_ptr<DhtInterface> dht, SecureDht::Config conf)
            CERTIFICATE_TYPE,
            *certificate_,
            1
-        }, [this, certId](bool ok) {
+        }, [this](bool ok) {
            if (ok)
-                DHT_LOG.d(certId, "SecureDht: public key announced successfully");
+                DHT_LOG.DEBUG("SecureDht: public key announced successfully");
        }, {}, true);
    }
 }

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

 ValueType
 SecureDht::secureType(ValueType&& type)
 {
    type.storePolicy = [this,type](InfoHash id, Sp<Value>& v, const InfoHash& nid, const SockAddr& a) {
        if (v->isSigned()) {
-            if (!v->signatureChecked) {
-                v->signatureChecked = true;
-                v->signatureValid = v->owner and v->owner->checkSignature(v->getToSign(), v->signature);
-            }
-            if (!v->signatureValid) {
-                DHT_LOG.w("Signature verification failed");
+            if (!v->owner or !v->owner->checkSignature(v->getToSign(), v->signature)) {
+                DHT_LOG.WARN("Signature verification failed");
                return false;
            }
+            else
+                DHT_LOG.WARN("Signature verification succeeded");
        }
        return type.storePolicy(id, v, nid, a);
    };
@@ -83,22 +82,18 @@ SecureDht::secureType(ValueType&& type)
        if (!o->isSigned())
            return type.editPolicy(id, o, n, nid, a);
        if (o->owner != n->owner) {
-            DHT_LOG.w("Edition forbidden: owner changed.");
+            DHT_LOG.WARN("Edition forbidden: owner changed.");
            return false;
        }
-        if (!n->signatureChecked) {
-            n->signatureChecked = true;
-            n->signatureValid = o->owner and o->owner->checkSignature(n->getToSign(), n->signature);
-        }
-        if (!n->signatureValid) {
-            DHT_LOG.w("Edition forbidden: signature verification failed.");
+        if (!o->owner or !o->owner->checkSignature(n->getToSign(), n->signature)) {
+            DHT_LOG.WARN("Edition forbidden: signature verification failed.");
            return false;
        }
        if (o->seq == n->seq) {
            // If the data is exactly the same,
            // it can be reannounced, possibly by someone else.
            if (o->getToSign() != n->getToSign()) {
-                DHT_LOG.w("Edition forbidden: sequence number must be increasing.");
+                DHT_LOG.WARN("Edition forbidden: sequence number must be increasing.");
                return false;
            }
        }
@@ -144,7 +139,7 @@ SecureDht::registerCertificate(const InfoHash& node, const Blob& data)
    }
    InfoHash h = crt->getPublicKey().getId();
    if (node == h) {
-        DHT_LOG.d("Registering certificate for %s", h.toString().c_str());
+        DHT_LOG.DEBUG("Registering certificate for %s", h.toString().c_str());
        auto it = nodesCertificates_.find(h);
        if (it == nodesCertificates_.end())
            std::tie(it, std::ignore) = nodesCertificates_.emplace(h, std::move(crt));
@@ -152,7 +147,7 @@ SecureDht::registerCertificate(const InfoHash& node, const Blob& data)
            it->second = std::move(crt);
        return it->second;
    } else {
-        DHT_LOG.w("Certificate %s for node %s does not match node id !", h.toString().c_str(), node.toString().c_str());
+        DHT_LOG.DEBUG("Certificate %s for node %s does not match node id !", h.toString().c_str(), node.toString().c_str());
        return nullptr;
    }
 }
@@ -165,11 +160,11 @@ SecureDht::registerCertificate(Sp<crypto::Certificate>& cert)
 }

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

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

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


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

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

 void
 SecureDht::putEncrypted(const InfoHash& hash, const InfoHash& to, Sp<Value> val, DoneCallback callback, bool permanent)
 {
-    findPublicKey(to, [=](const Sp<const crypto::PublicKey>& pk) {
+    findPublicKey(to, [=](const Sp<const crypto::PublicKey> pk) {
        if(!pk || !*pk) {
            if (callback)
                callback(false, {});
            return;
        }
-        DHT_LOG.w("Encrypting data for PK: %s", pk->getId().toString().c_str());
+        DHT_LOG.WARN("Encrypting data for PK: %s", pk->getId().toString().c_str());
        try {
            dht_->put(hash, encrypt(*val, *pk), callback, time_point::max(), permanent);
        } catch (const std::exception& e) {
-            DHT_LOG.e("Error putting encrypted data: %s", e.what());
+            DHT_LOG.ERR("Error putting encrypted data: %s", e.what());
            if (callback)
                callback(false, {});
        }
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 Savoir-faire Linux Inc.
 *  Author(s) : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 *
 *  This program is free software; you can redistribute it and/or modify
@@ -90,7 +90,20 @@ struct Storage {

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

    bool empty() const {
@@ -115,7 +128,7 @@ struct Storage {
        return {};
    }

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

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


-size_t
-Storage::listen(ValueCallback& gcb, Value::Filter& filter, const Sp<Query>& query)
-{
-    if (not empty()) {
-        std::vector<Sp<Value>> newvals = get(filter);
-        if (not newvals.empty()) {
-            if (!gcb(newvals, false))
-                return 0;
-        }
-    }
-    auto tokenlocal = ++listener_token;
-    local_listeners.emplace(tokenlocal, LocalListener{query, filter, gcb});
-    return tokenlocal;
-}
-
-
 std::pair<ValueStorage*, Storage::StoreDiff>
 Storage::store(const InfoHash& id, const Sp<Value>& value, time_point created, time_point expiration, StorageBucket* sb)
 {
@@ -1,175 +0,0 @@
-/*
- *  Copyright (C) 2016-2019 Savoir-faire Linux Inc.
- *
- *  Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "thread_pool.h"
-
-#include <atomic>
-#include <thread>
-#include <iostream>
-#include <ciso646> // fix windows compiler bug
-
-namespace dht {
-
-constexpr const size_t IO_THREADS_MAX {64};
-
-struct ThreadPool::ThreadState
-{
-    std::thread thread {};
-    std::atomic_bool run {true};
-};
-
-ThreadPool&
-ThreadPool::computation()
-{
-    static ThreadPool pool;
-    return pool;
-}
-
-ThreadPool&
-ThreadPool::io()
-{
-    static ThreadPool pool(IO_THREADS_MAX);
-    return pool;
-}
-
-
-ThreadPool::ThreadPool(size_t maxThreads) : maxThreads_(maxThreads)
-{
-    threads_.reserve(maxThreads_);
-}
-
-ThreadPool::ThreadPool()
- : ThreadPool(std::max<size_t>(std::thread::hardware_concurrency(), 4))
-{}
-
-ThreadPool::~ThreadPool()
-{
-    join();
-}
-
-void
-ThreadPool::run(std::function<void()>&& cb)
-{
-    std::unique_lock<std::mutex> l(lock_);
-    if (not running_) return;
-
-    // launch new thread if necessary
-    if (not readyThreads_ && threads_.size() < maxThreads_) {
-        threads_.emplace_back(new ThreadState());
-        auto& t = *threads_.back();
-        t.thread = std::thread([&]() {
-            while (t.run) {
-                std::function<void()> task;
-
-                // pick task from queue
-                {
-                    std::unique_lock<std::mutex> l(lock_);
-                    readyThreads_++;
-                    cv_.wait(l, [&](){
-                        return not t.run or not tasks_.empty();
-                    });
-                    readyThreads_--;
-                    if (not t.run)
-                        break;
-                    task = std::move(tasks_.front());
-                    tasks_.pop();
-                }
-
-                // run task
-                try {
-                    if (task)
-                        task();
-                } catch (const std::exception& e) {
-                    // LOG_ERR("Exception running task: %s", e.what());
-                    std::cerr << "Exception running task: " << e.what() << std::endl;
-                }
-            }
-        });
-    }
-
-    // push task to queue
-    tasks_.emplace(std::move(cb));
-
-    // notify thread
-    l.unlock();
-    cv_.notify_one();
-}
-
-void
-ThreadPool::stop()
-{
-    {
-        std::lock_guard<std::mutex> l(lock_);
-        running_ = false;
-    }
-    for (auto& t : threads_)
-        t->run = false;
-    cv_.notify_all();
-}
-
-void
-ThreadPool::join()
-{
-    stop();
-    for (auto& t : threads_)
-        t->thread.join();
-    threads_.clear();
-}
-
-void
-Executor::run(std::function<void()>&& task)
-{
-    std::lock_guard<std::mutex> l(lock_);
-    if (current_ < maxConcurrent_) {
-        run_(std::move(task));
-    } else {
-        tasks_.emplace(std::move(task));
-    }
-}
-
-void
-Executor::run_(std::function<void()>&& task)
-{
-    current_++;
-    std::weak_ptr<Executor> w = shared_from_this();
-    threadPool_.get().run([w,task] {
-        try {
-            task();
-        } catch (const std::exception& e) {
-            std::cerr << "Exception running task: " << e.what() << std::endl;
-        }
-        if (auto sthis = w.lock()) {
-            auto& this_ = *sthis;
-            std::lock_guard<std::mutex> l(this_.lock_);
-            this_.current_--;
-            this_.schedule();
-        }
-    });
-}
-
-void
-Executor::schedule()
-{
-    if (not tasks_.empty() and current_ < maxConcurrent_) {
-        run_(std::move(tasks_.front()));
-        tasks_.pop();
-    }
-}
-
-}
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 Savoir-faire Linux Inc.
 *  Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 *
 *  This program is free software; you can redistribute it and/or modify
@@ -16,10 +16,6 @@
 *  along with this program. If not, see <https://www.gnu.org/licenses/>.
 */

-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include "utils.h"
 #include "sockaddr.h"
 #include "default_types.h"
@@ -29,18 +25,10 @@
 #define IN_IS_ADDR_UNSPECIFIED(a) (((long int) (a)->s_addr) == 0x00000000)
 #endif /* IN_IS_ADDR_UNSPECIFIED */

-#ifndef PACKAGE_VERSION
-#define PACKAGE_VERSION "(unknown version)"
-#endif
-
 namespace dht {

 static constexpr std::array<uint8_t, 12> MAPPED_IPV4_PREFIX {{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xff, 0xff}};

-const char* version() {
-    return PACKAGE_VERSION;
-}
-
 std::pair<std::string, std::string>
 splitPort(const std::string& s) {
    if (s.empty())
@@ -85,24 +73,6 @@ SockAddr::resolve(const std::string& host, const std::string& service)
    return ips;
 }

-void
-SockAddr::setAddress(const char* address)
-{
-    auto family = getFamily();
-    void* addr = nullptr;
-    switch (family) {
-    case AF_INET:
-        addr = &getIPv4().sin_addr;
-        break;
-    case AF_INET6:
-        addr = &getIPv6().sin6_addr;
-        break;
-    default:
-        throw std::runtime_error("Unknown address family");
-    }
-    if (inet_pton(family, address, addr) <= 0)
-        throw std::runtime_error(std::string("Can't parse IP address: ") + strerror(errno));
-}

 std::string
 print_addr(const sockaddr* sa, socklen_t slen)
@@ -110,7 +80,7 @@ print_addr(const sockaddr* sa, socklen_t slen)
    char hbuf[NI_MAXHOST];
    char sbuf[NI_MAXSERV];
    std::stringstream out;
-    if (sa and slen and !getnameinfo(sa, slen, hbuf, sizeof(hbuf), sbuf, sizeof(sbuf), NI_NUMERICHOST | NI_NUMERICSERV)) {
+    if (!getnameinfo(sa, slen, hbuf, sizeof(hbuf), sbuf, sizeof(sbuf), NI_NUMERICHOST | NI_NUMERICSERV)) {
        if (sa->sa_family == AF_INET6)
            out << "[" << hbuf << "]";
        else
@@ -201,10 +171,10 @@ SockAddr::isMappedIPv4() const
 }

 SockAddr
-SockAddr::getMappedIPv4()
+SockAddr::getMappedIPv4() const
 {
    if (not isMappedIPv4())
-        return std::move(*this);
+        return *this;
    SockAddr ret;
    ret.setFamily(AF_INET);
    ret.setPort(getPort());
@@ -215,22 +185,6 @@ SockAddr::getMappedIPv4()
    return ret;
 }

-SockAddr
-SockAddr::getMappedIPv6()
-{
-    auto family = getFamily();
-    if (family != AF_INET)
-        return std::move(*this);
-    SockAddr ret;
-    ret.setFamily(AF_INET6);
-    ret.setPort(getPort());
-    auto addr4 = reinterpret_cast<const uint8_t*>(&getIPv4().sin_addr);
-    auto addr6 = reinterpret_cast<uint8_t*>(&ret.getIPv6().sin6_addr);
-    std::copy(MAPPED_IPV4_PREFIX.begin(), MAPPED_IPV4_PREFIX.end(), addr6);
-    std::copy_n(addr4, sizeof(in_addr), addr6 + MAPPED_IPV4_PREFIX.size());
-    return ret;
-}
-
 bool operator==(const SockAddr& a, const SockAddr& b) {
    return a.equals(b);
 }
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2019 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2017 Savoir-faire Linux Inc.
 *  Author(s) : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 *              Simon Désaulniers <simon.desaulniers@savoirfairelinux.com>
 *
@@ -22,9 +22,9 @@
 #include "default_types.h"
 #include "securedht.h" // print certificate ID

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


 namespace dht {
@@ -54,19 +54,17 @@ std::ostream& operator<< (std::ostream& s, const Value& v)
            s << IpServiceAnnouncement(v.data);
        } else if (v.type == CERTIFICATE_TYPE.id) {
            s << "Certificate";
-#ifdef OPENDHT_LOG_CRT_ID
            try {
-                auto h = crypto::Certificate(v.data).getPublicKey().getLongId();
+                InfoHash h = crypto::Certificate(v.data).getPublicKey().getId();
                s << " with ID " << h;
            } catch (const std::exception& e) {
                s << " (invalid)";
            }
-#endif
        } else {
            s << "Data (type: " << v.type << " ): ";
            s << std::hex;
-            for (auto i : v.data)
-                s << std::setfill('0') << std::setw(2) << (unsigned)i;
+            for (size_t i=0; i<v.data.size(); i++)
+                s << std::setfill('0') << std::setw(2) << (unsigned)v.data[i];
            s << std::dec;
        }
    }
@@ -78,7 +76,7 @@ std::ostream& operator<< (std::ostream& s, const Value& v)
 const ValueType ValueType::USER_DATA = {0, "User Data"};

 bool
-ValueType::DEFAULT_STORE_POLICY(InfoHash, const std::shared_ptr<Value>& v, const InfoHash&, const SockAddr&)
+ValueType::DEFAULT_STORE_POLICY(InfoHash, std::shared_ptr<Value>& v, const InfoHash&, const SockAddr&)
 {
    return v->size() <= MAX_VALUE_SIZE;
 }
@@ -174,7 +172,7 @@ Value::msgpack_unpack_body(const msgpack::object& o)
    }
 }

-#ifdef OPENDHT_JSONCPP
+#if OPENDHT_PROXY_SERVER || OPENDHT_PROXY_CLIENT
 Value::Value(Json::Value& json)
 {
    id = Value::Id(unpackId(json, "id"));
@@ -250,7 +248,7 @@ unpackId(const Json::Value& json, const std::string& key) {
    } catch (...) {}
    return ret;
 }
-#endif
+#endif //OPENDHT_PROXY_SERVER

 bool
 FieldValue::operator==(const FieldValue& vfd) const
@@ -288,11 +286,11 @@ FieldValue::getLocalFilter() const
        case Value::Field::UserType:
            return Value::UserTypeFilter(std::string {blobValue.begin(), blobValue.end()});
        default:
-            return {};
+            return Value::AllFilter();
    }
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 AM_CPPFLAGS = -I../include

-nobase_include_HEADERS = infohashtester.h valuetester.h cryptotester.h dhtrunnertester.h dhtproxytester.h
-opendht_unit_tests_SOURCES = tests_runner.cpp cryptotester.cpp infohashtester.cpp valuetester.cpp dhtrunnertester.cpp dhtproxytester.cpp
+nobase_include_HEADERS = infohashtester.h 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,117 +0,0 @@
-/*
- *  Copyright (C) 2019 Savoir-faire Linux Inc.
- *
- *  Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-#include "cryptotester.h"
-
-#include "opendht/crypto.h"
-
-namespace test {
-CPPUNIT_TEST_SUITE_REGISTRATION(CryptoTester);
-
-void
-CryptoTester::setUp() {
-
-}
-
-void
-CryptoTester::testSignatureEncryption() {
-    auto key = dht::crypto::PrivateKey::generate();
-    auto public_key = key.getPublicKey();
-
-    std::vector<uint8_t> data {5, 10};
-    std::vector<uint8_t> signature = key.sign(data);
-
-    // check signature
-    CPPUNIT_ASSERT(public_key.checkSignature(data, signature));
-
-    // encrypt data
-    std::vector<uint8_t> encrypted = public_key.encrypt(data);
-    std::vector<uint8_t> decrypted = key.decrypt(encrypted);
-    CPPUNIT_ASSERT(data == decrypted);
-}
-
-void
-CryptoTester::testCertificateRevocation()
-{
-    auto ca1 = dht::crypto::generateIdentity("ca1");
-    auto account1 = dht::crypto::generateIdentity("acc1", ca1, 4096, true);
-    auto device11 = dht::crypto::generateIdentity("dev11", account1);
-    auto device12 = dht::crypto::generateIdentity("dev12", account1);
-
-    dht::crypto::TrustList list;
-    list.add(*ca1.second);
-    auto v = list.verify(*account1.second);
-    CPPUNIT_ASSERT_MESSAGE(v.toString(), v);
-
-    list.add(*account1.second);
-    v = list.verify(*device11.second);
-    CPPUNIT_ASSERT_MESSAGE(v.toString(), v);
-    v = list.verify(*device12.second);
-    CPPUNIT_ASSERT_MESSAGE(v.toString(), v);
-
-    auto ca2 = dht::crypto::generateIdentity("ca2");
-    auto account2 = dht::crypto::generateIdentity("acc2", ca2, 4096, true);
-    auto device2 = dht::crypto::generateIdentity("dev2", account2);
-
-    v = list.verify(*device2.second);
-    CPPUNIT_ASSERT_MESSAGE(v.toString(), !v);
-
-    account1.second->revoke(*account1.first, *device11.second);
-    dht::crypto::TrustList list2;
-    list2.add(*account1.second);
-
-    v = list2.verify(*device11.second);
-    CPPUNIT_ASSERT_MESSAGE(v.toString(), !v);
-    v = list2.verify(*device12.second);
-    CPPUNIT_ASSERT_MESSAGE(v.toString(), v);
-}
-
-void
-CryptoTester::testCertificateRequest()
-{
-    // Generate CA
-    auto ca = dht::crypto::generateIdentity("Test CA");
-
-    // Generate signed request
-    auto deviceKey = dht::crypto::PrivateKey::generate();
-    auto request = dht::crypto::CertificateRequest();
-    request.setName("Test Device");
-    request.sign(deviceKey);
-
-    // Export/import request
-    auto importedRequest = dht::crypto::CertificateRequest(request.pack());
-    CPPUNIT_ASSERT(importedRequest.verify());
-
-    // Generate/sign certificate from request
-    auto signedCert = dht::crypto::Certificate::generate(request, ca);
-    CPPUNIT_ASSERT_EQUAL(ca.second->getName(), signedCert.getIssuerName());
-    CPPUNIT_ASSERT_EQUAL(request.getName(), signedCert.getName());
-
-    // Check generated certificate
-    dht::crypto::TrustList list;
-    list.add(*ca.second);
-    auto v = list.verify(signedCert);
-    CPPUNIT_ASSERT_MESSAGE(v.toString(), v);
-}
-
-void
-CryptoTester::tearDown() {
-
-}
-}  // namespace test
@@ -1,58 +0,0 @@
-/*
- *  Copyright (C) 2019 Savoir-faire Linux Inc.
- *
- *  Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-// cppunit
-#include <cppunit/TestFixture.h>
-#include <cppunit/extensions/HelperMacros.h>
-
-namespace test {
-
-class CryptoTester : public CppUnit::TestFixture {
-    CPPUNIT_TEST_SUITE(CryptoTester);
-    CPPUNIT_TEST(testSignatureEncryption);
-    CPPUNIT_TEST(testCertificateRevocation);
-    CPPUNIT_TEST(testCertificateRequest);
-    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 data signature, encryption and decryption
-     */
-    void testSignatureEncryption();
-    /**
-     * Test certificate generation, validation and revocation
-     */
-    void testCertificateRevocation();
-    /**
-     * Test certificate requests
-     */
-    void testCertificateRequest();
-};
-
-}  // namespace test
@@ -1,199 +0,0 @@
-/*
- *  Copyright (C) 2019 Savoir-faire Linux Inc.
- *
- *  Author: Sébastien Blin <sebastien.blin@savoirfairelinux.com>
- *          Vsevolod Ivanov <vsevolod.ivanov@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 "dhtproxytester.h"
-
-// std
-#include <iostream>
-#include <string>
-
-#include <chrono>
-#include <condition_variable>
-
-
-namespace test {
-CPPUNIT_TEST_SUITE_REGISTRATION(DhtProxyTester);
-
-void
-DhtProxyTester::setUp() {
-    logger = dht::log::getStdLogger();
-
-    nodePeer.run(0, /*identity*/{}, /*threaded*/true);
-
-    nodeProxy = std::make_shared<dht::DhtRunner>();
-    nodeProxy->run(0, /*identity*/{}, /*threaded*/true);
-    nodeProxy->bootstrap(nodePeer.getBound());
-    serverProxy = std::unique_ptr<dht::DhtProxyServer>(new dht::DhtProxyServer(
-        nodeProxy, 8080, /*pushServer*/"127.0.0.1:8090", logger));
-
-    nodeClient = std::make_shared<dht::DhtRunner>();
-    nodeClient->run(0, /*identity*/{}, /*threaded*/true);
-    nodeClient->bootstrap(nodePeer.getBound());
-    nodeClient->setProxyServer("127.0.0.1:8080");
-    nodeClient->enableProxy(true); // creates DhtProxyClient
-}
-
-void
-DhtProxyTester::tearDown() {
-    logger->d("[tester:proxy] stopping peer node");
-    nodePeer.join();
-    nodeClient->join();
-    logger->d("[tester:proxy] stopping proxy server");
-    serverProxy->stop();
-    serverProxy = nullptr;
-    logger->d("[tester:proxy] stopping proxy node");
-    nodeProxy->join();
-}
-
-void
-DhtProxyTester::testGetPut() {
-    bool done = false;
-    std::condition_variable cv;
-    std::mutex cv_m;
-
-    auto key = dht::InfoHash::get("GLaDOs");
-    dht::Value val {"Hey! It's been a long time. How have you been?"};
-    auto val_data = val.data;
-
-    {
-        std::unique_lock<std::mutex> lk(cv_m);
-        nodePeer.put(key, std::move(val), [&](bool) {
-            std::lock_guard<std::mutex> lk(cv_m);
-            done = true;
-            cv.notify_all();
-        });
-        CPPUNIT_ASSERT(cv.wait_for(lk, std::chrono::seconds(10), [&]{ return done; }));
-    }
-
-    auto vals = nodeClient->get(key).get();
-    CPPUNIT_ASSERT(not vals.empty());
-    CPPUNIT_ASSERT(vals.front()->data == val_data);
-}
-
-void
-DhtProxyTester::testListen() {
-    std::condition_variable cv;
-    std::mutex cv_m;
-    std::unique_lock<std::mutex> lk(cv_m);
-    auto key = dht::InfoHash::get("GLaDOs");
-    bool done = false;
-
-    // If a peer send a value, the listen operation from the client
-    // should retrieve this value
-    dht::Value firstVal {"Hey! It's been a long time. How have you been?"};
-    auto firstVal_data = firstVal.data;
-    nodePeer.put(key, std::move(firstVal), [&](bool ok) {
-        CPPUNIT_ASSERT(ok);
-        std::lock_guard<std::mutex> lk(cv_m);
-        done = true;
-        cv.notify_all();
-    });
-    CPPUNIT_ASSERT(cv.wait_for(lk, std::chrono::seconds(10), [&]{ return done; }));
-    done = false;
-
-    std::vector<dht::Blob> values;
-    auto token = nodeClient->listen(key, [&](const std::vector<std::shared_ptr<dht::Value>>& v, bool expired) {
-        if (not expired) {
-            std::lock_guard<std::mutex> lk(cv_m);
-            for (const auto& value : v)
-                values.emplace_back(value->data);
-            done = true;
-            cv.notify_all();
-        }
-        return true;
-    });
-    CPPUNIT_ASSERT(cv.wait_for(lk, std::chrono::seconds(10), [&]{ return done; }));
-    done = false;
-    // Here values should contains 1 values
-    CPPUNIT_ASSERT_EQUAL(static_cast<int>(values.size()), 1);
-    CPPUNIT_ASSERT(values.front() == firstVal_data);
-
-    // And the listen should retrieve futures values
-    // All values
-    dht::Value secondVal {"You're a monster"};
-    auto secondVal_data = secondVal.data;
-    nodePeer.put(key, std::move(secondVal));
-    CPPUNIT_ASSERT(cv.wait_for(lk, std::chrono::seconds(10), [&]{ return done; }));
-    nodeClient->cancelListen(key, std::move(token));
-    // Here values should contains 2 values
-    CPPUNIT_ASSERT_EQUAL(static_cast<int>(values.size()), 2);
-    CPPUNIT_ASSERT(values.back() == secondVal_data);
-}
-
-void
-DhtProxyTester::testResubscribeGetValues() {
-    nodeClient->setPushNotificationToken("atlas");
-
-    bool done = false;
-    std::condition_variable cv;
-    std::mutex cv_m;
-    std::unique_lock<std::mutex> lk(cv_m);
-    auto key = dht::InfoHash::get("GLaDOs");
-
-    // If a peer send a value, the listen operation from the client
-    // should retrieve this value
-    dht::Value firstVal {"Hey! It's been a long time. How have you been?"};
-    auto firstVal_data = firstVal.data;
-    nodePeer.put(key, std::move(firstVal), [&](bool) {
-        std::lock_guard<std::mutex> lk(cv_m);
-        done = true;
-        cv.notify_all();
-    });
-    CPPUNIT_ASSERT(cv.wait_for(lk, std::chrono::seconds(10), [&]{ return done; }));
-    done = false;
-
-    // Send a first subscribe, the value is sent via a push notification
-    // So ignore values here.
-    nodeClient->listen(key, [&](const std::vector<std::shared_ptr<dht::Value>>&, bool) {
-        return true;
-    });
-    cv.wait_for(lk, std::chrono::seconds(1));
-
-    // Reboot node (to avoid cache)
-    nodeClient->join();
-    nodeClient->run(0, {}, true);
-    nodeClient->bootstrap(nodePeer.getBound());
-    nodeClient->setProxyServer("127.0.0.1:8080");
-    nodeClient->enableProxy(true);
-    nodeClient->setPushNotificationToken("atlas");
-
-    // For the second subscribe, the proxy will return the value in the body
-    auto values = std::vector<dht::Blob>();
-    auto ftoken = nodeClient->listen(key, [&](const std::vector<std::shared_ptr<dht::Value>>& v, bool expired) {
-        if (not expired) {
-            std::lock_guard<std::mutex> lk(cv_m);
-            for (const auto& value : v)
-                values.emplace_back(value->data);
-            done = true;
-            cv.notify_all();
-        }
-        return true;
-    });
-
-    CPPUNIT_ASSERT(cv.wait_for(lk, std::chrono::seconds(10), [&]{ return done; }));
-    auto token = ftoken.get();
-    CPPUNIT_ASSERT(token);
-    nodeClient->cancelListen(key, token);
-    // Here values should still contains 1 values
-    CPPUNIT_ASSERT_EQUAL((size_t)1u, values.size());
-    CPPUNIT_ASSERT(firstVal_data == values.front());
-}
-
-}  // namespace test
@@ -1,75 +0,0 @@
-/*
- *  Copyright (C) 2019 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>
-
-#include <opendht/dhtrunner.h>
-#include <opendht/dht_proxy_server.h>
-#include <opendht/log.h>
-
-namespace test {
-
-class DhtProxyTester : public CppUnit::TestFixture {
-    CPPUNIT_TEST_SUITE(DhtProxyTester);
-    CPPUNIT_TEST(testGetPut);
-    CPPUNIT_TEST(testListen);
-    CPPUNIT_TEST(testResubscribeGetValues);
-    CPPUNIT_TEST_SUITE_END();
-
- public:
-    /**
-     * Method automatically called before each test by CppUnit
-     * Init nodes
-     */
-   void setUp();
-    /**
-     * Method automatically called after each test CppUnit
-     */
-   void tearDown();
-    /**
-     * Test get and put methods
-     */
-   void testGetPut();
-    /**
-     * Test listen
-     */
-   void testListen();
-
-   /**
-    * When a proxy redo a subscribe on the proxy
-    * it should retrieve existant values
-    */
-   void testResubscribeGetValues();
-
- private:
-    dht::DhtRunner nodePeer;
-
-    std::shared_ptr<dht::DhtRunner> nodeClient;
-    std::shared_ptr<dht::DhtRunner> nodeProxy;
-    std::unique_ptr<dht::DhtProxyServer> serverProxy;
-
-    dht::DhtRunner::Config config {};
-    std::shared_ptr<dht::Logger> logger {};
-};
-
-}  // namespace test
				`@@ -1 +0,0 @@`
				`Checks: '-,clang-diagnostic-,performance-,bugprone-,llvm-,clang-analyzer-,misc-*,-llvm-namespace-comment,-misc-unused-parameters,-misc-non-private-member-variables-in-classes,-llvm-header-guard,-llvm-include-order,-bugprone-suspicious-string-compare'`