update to version 1.9.5

dhtrunner: don't override statusCallback if not provided
context: add statusCallback, certificateStore
2026-11-12 22:36:49 +00:00 · 2019-06-04 09:54:02 -04:00 · 2019-05-31 19:29:59 -04:00 · 2019-05-31 10:12:42 -04:00 · 2019-05-23 10:39:43 -04:00 · 2019-05-22 11:20:27 -04:00
46 changed files with 1454 additions and 774 deletions
@@ -1,7 +1,7 @@
 cmake_minimum_required (VERSION 3.1)
 project (opendht)
 set (opendht_VERSION_MAJOR 1)
-set (opendht_VERSION_MINOR 8.2)
+set (opendht_VERSION_MINOR 9.5)
 set (opendht_VERSION ${opendht_VERSION_MAJOR}.${opendht_VERSION_MINOR})
 set (PACKAGE_VERSION ${opendht_VERSION})
 set (VERSION "${opendht_VERSION}")
@@ -75,6 +75,7 @@ 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 ()
@@ -152,6 +153,7 @@ list (APPEND opendht_SOURCES
    src/peer_discovery.cpp
    src/network_utils.h
    src/network_utils.cpp
+    src/thread_pool.cpp
 )

 list (APPEND opendht_HEADERS
@@ -176,6 +178,7 @@ list (APPEND opendht_HEADERS
    include/opendht/log.h
    include/opendht/log_enable.h
    include/opendht/peer_discovery.h
+    include/opendht/thread_pool.h
    include/opendht.h
 )

@@ -198,8 +201,6 @@ if (OPENDHT_PROXY_SERVER)
    include/opendht/dht_proxy_server.h
  )
  list (APPEND opendht_SOURCES
-    src/thread_pool.h
-    src/thread_pool.cpp
    src/dht_proxy_server.cpp
  )
 endif ()
@@ -320,6 +321,8 @@ if (OPENDHT_TESTS)
      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
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.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>8.1</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
    <CharacterSet>MultiByte</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>MultiByte</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
    <CharacterSet>MultiByte</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>MultiByte</CharacterSet>
  </PropertyGroup>
@@ -86,14 +86,14 @@
      <WarningLevel>Level3</WarningLevel>
      <Optimization>Disabled</Optimization>
      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>..\..\include;..\..\msgpack-c\include;$(ProjectDir)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32_NATIVE;WIN32_LEAN_AND_MEAN;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <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>
      <DisableSpecificWarnings>4804;4267;4244;4800;4273;</DisableSpecificWarnings>
      <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
    </ClCompile>
    <Link>
-      <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>
+      <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>
      <AdditionalOptions>/ignore:4049 %(AdditionalOptions)</AdditionalOptions>
    </Link>
  </ItemDefinitionGroup>
@@ -102,14 +102,14 @@
      <WarningLevel>Level3</WarningLevel>
      <Optimization>Disabled</Optimization>
      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>..\..\include;..\..\msgpack-c\include;$(ProjectDir)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32_NATIVE;WIN32_LEAN_AND_MEAN;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <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>
      <DisableSpecificWarnings>4804;4267;4244;4800;4273;</DisableSpecificWarnings>
      <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
    </ClCompile>
    <Link>
-      <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>
+      <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>
      <AdditionalOptions>/ignore:4049 %(AdditionalOptions)</AdditionalOptions>
    </Link>
  </ItemDefinitionGroup>
@@ -120,16 +120,16 @@
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <IntrinsicFunctions>true</IntrinsicFunctions>
      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>..\..\include;..\..\msgpack-c\include;$(ProjectDir)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32_NATIVE;WIN32_LEAN_AND_MEAN;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <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>
      <DisableSpecificWarnings>4804;4267;4244;4800;4273;</DisableSpecificWarnings>
      <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
    </ClCompile>
    <Link>
      <EnableCOMDATFolding>true</EnableCOMDATFolding>
      <OptimizeReferences>true</OptimizeReferences>
-      <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>
+      <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>
      <AdditionalOptions>/ignore:4049 %(AdditionalOptions)</AdditionalOptions>
    </Link>
  </ItemDefinitionGroup>
@@ -140,16 +140,16 @@
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <IntrinsicFunctions>true</IntrinsicFunctions>
      <SDLCheck>true</SDLCheck>
-      <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>
+      <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>
      <DisableSpecificWarnings>4804;4267;4244;4800;4273;</DisableSpecificWarnings>
      <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
    </ClCompile>
    <Link>
      <EnableCOMDATFolding>true</EnableCOMDATFolding>
      <OptimizeReferences>true</OptimizeReferences>
-      <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>
+      <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>
      <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="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.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>8.1</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
    <CharacterSet>MultiByte</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>MultiByte</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
    <CharacterSet>MultiByte</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>MultiByte</CharacterSet>
  </PropertyGroup>
@@ -86,14 +86,14 @@
      <WarningLevel>Level3</WarningLevel>
      <Optimization>Disabled</Optimization>
      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>..\..\include;..\..\msgpack-c\include;$(ProjectDir)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32_NATIVE;WIN32_LEAN_AND_MEAN;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <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>
      <DisableSpecificWarnings>4804;4267;4244;4800;4273;4101;</DisableSpecificWarnings>
      <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
    </ClCompile>
    <Link>
-      <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>
+      <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>
      <AdditionalOptions>/ignore:4049 %(AdditionalOptions)</AdditionalOptions>
    </Link>
  </ItemDefinitionGroup>
@@ -102,14 +102,14 @@
      <WarningLevel>Level3</WarningLevel>
      <Optimization>Disabled</Optimization>
      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>..\..\include;..\..\msgpack-c\include;$(ProjectDir)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32_NATIVE;WIN32_LEAN_AND_MEAN;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <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>
      <DisableSpecificWarnings>4804;4267;4244;4800;4273;4101;</DisableSpecificWarnings>
      <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
    </ClCompile>
    <Link>
-      <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>
+      <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>
      <AdditionalOptions>/ignore:4049 %(AdditionalOptions)</AdditionalOptions>
    </Link>
  </ItemDefinitionGroup>
@@ -120,16 +120,16 @@
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <IntrinsicFunctions>true</IntrinsicFunctions>
      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>..\..\include;..\..\msgpack-c\include;$(ProjectDir)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32_NATIVE;WIN32_LEAN_AND_MEAN;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <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>
      <DisableSpecificWarnings>4804;4267;4244;4800;4273;4101;</DisableSpecificWarnings>
      <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
    </ClCompile>
    <Link>
      <EnableCOMDATFolding>true</EnableCOMDATFolding>
      <OptimizeReferences>true</OptimizeReferences>
-      <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>
+      <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>
      <AdditionalOptions>/ignore:4049 %(AdditionalOptions)</AdditionalOptions>
    </Link>
  </ItemDefinitionGroup>
@@ -140,16 +140,16 @@
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <IntrinsicFunctions>true</IntrinsicFunctions>
      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>..\..\include;$(ProjectDir)contrib\build\include;$(ProjectDir)contrib\build\msgpack-c\include;$(ProjectDir)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32_NATIVE;WIN32_LEAN_AND_MEAN;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <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>
      <DisableSpecificWarnings>4804;4267;4244;4800;4273;4101;</DisableSpecificWarnings>
      <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
    </ClCompile>
    <Link>
      <EnableCOMDATFolding>true</EnableCOMDATFolding>
      <OptimizeReferences>true</OptimizeReferences>
-      <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>
+      <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>
      <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="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.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>8.1</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
    <CharacterSet>MultiByte</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>MultiByte</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
    <CharacterSet>MultiByte</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>MultiByte</CharacterSet>
  </PropertyGroup>
@@ -86,14 +86,14 @@
      <WarningLevel>Level3</WarningLevel>
      <Optimization>Disabled</Optimization>
      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>..\..\include;..\..\msgpack-c\include;$(ProjectDir)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32_NATIVE;WIN32_LEAN_AND_MEAN;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <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>
      <DisableSpecificWarnings>4804;4267;4244;4800;4273;4101;</DisableSpecificWarnings>
      <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
    </ClCompile>
    <Link>
-      <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>
+      <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>
      <AdditionalOptions>/ignore:4049 %(AdditionalOptions)</AdditionalOptions>
    </Link>
  </ItemDefinitionGroup>
@@ -102,14 +102,14 @@
      <WarningLevel>Level3</WarningLevel>
      <Optimization>Disabled</Optimization>
      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>..\..\include;..\..\msgpack-c\include;$(ProjectDir)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32_NATIVE;WIN32_LEAN_AND_MEAN;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <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>
      <DisableSpecificWarnings>4804;4267;4244;4800;4273;4101;</DisableSpecificWarnings>
      <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
    </ClCompile>
    <Link>
-      <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>
+      <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>
      <AdditionalOptions>/ignore:4049 %(AdditionalOptions)</AdditionalOptions>
    </Link>
  </ItemDefinitionGroup>
@@ -120,16 +120,16 @@
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <IntrinsicFunctions>true</IntrinsicFunctions>
      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>..\..\include;..\..\msgpack-c\include;$(ProjectDir)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32_NATIVE;WIN32_LEAN_AND_MEAN;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <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>
      <DisableSpecificWarnings>4804;4267;4244;4800;4273;4101;</DisableSpecificWarnings>
      <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
    </ClCompile>
    <Link>
      <EnableCOMDATFolding>true</EnableCOMDATFolding>
      <OptimizeReferences>true</OptimizeReferences>
-      <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>
+      <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>
      <AdditionalOptions>/ignore:4049 %(AdditionalOptions)</AdditionalOptions>
    </Link>
  </ItemDefinitionGroup>
@@ -140,16 +140,16 @@
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <IntrinsicFunctions>true</IntrinsicFunctions>
      <SDLCheck>true</SDLCheck>
-      <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>
+      <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>
      <DisableSpecificWarnings>4804;4267;4244;4800;4273;4101;</DisableSpecificWarnings>
      <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
    </ClCompile>
    <Link>
      <EnableCOMDATFolding>true</EnableCOMDATFolding>
      <OptimizeReferences>true</OptimizeReferences>
-      <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>
+      <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>
      <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="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="Debug|Win32">
      <Configuration>Debug</Configuration>
@@ -19,6 +19,17 @@
    </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" />
@@ -39,6 +50,8 @@
    <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" />
@@ -75,32 +88,32 @@
  <PropertyGroup Label="Globals">
    <ProjectGuid>{711397CE-E5D5-467D-9457-8716C047E50C}</ProjectGuid>
    <RootNamespace>opendht</RootNamespace>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
    <CharacterSet>MultiByte</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
    <WholeProgramOptimization>false</WholeProgramOptimization>
    <CharacterSet>MultiByte</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
    <CharacterSet>MultiByte</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
    <WholeProgramOptimization>false</WholeProgramOptimization>
    <CharacterSet>MultiByte</CharacterSet>
  </PropertyGroup>
@@ -123,33 +136,34 @@
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(ProjectDir)..\..\</OutDir>
+    <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
    <IntDir>$(Platform)\$(Configuration)\</IntDir>
-    <TargetName>opendhtd</TargetName>
+    <TargetName>libopendht</TargetName>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(ProjectDir)..\..\</OutDir>
+    <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
    <IntDir>$(Platform)\$(Configuration)\</IntDir>
-    <TargetName>opendht</TargetName>
+    <TargetName>libopendht</TargetName>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(ProjectDir)..\..\</OutDir>
-    <TargetName>opendhtd</TargetName>
+    <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
+    <TargetName>libopendht</TargetName>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(ProjectDir)..\..\</OutDir>
-    <TargetName>opendht</TargetName>
+    <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
+    <TargetName>libopendht</TargetName>
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <ClCompile>
      <WarningLevel>Level3</WarningLevel>
      <Optimization>Disabled</Optimization>
      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>..\..\include;..\include;..\include\opendht;..\..\msgpack-c\include;</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <DisableSpecificWarnings>4804;4800;4101;4267;4244;4503;</DisableSpecificWarnings>
-      <AdditionalOptions>-D_SCL_SECURE_NO_WARNINGS %(AdditionalOptions)</AdditionalOptions>
+      <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>
      <SuppressStartupBanner>false</SuppressStartupBanner>
+      <ProgramDataBaseFileName>$(OutDir)lib\$(PlatformTarget)\$(TargetName).pdb</ProgramDataBaseFileName>
    </ClCompile>
    <PostBuildEvent>
      <Command>mkdir $(OutDir)\include
@@ -160,7 +174,7 @@ copy ..\include\opendht\*.h $(OutDir)\include\opendht
 copy ..\include\opendht.h $(OutDir)\include\</Command>
    </PostBuildEvent>
    <Lib>
-      <OutputFile>$(OutDir)\lib\x86\$(TargetName)$(TargetExt)</OutputFile>
+      <OutputFile>$(OutDir)lib\$(PlatformTarget)\$(TargetName)$(TargetExt)</OutputFile>
    </Lib>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -168,10 +182,11 @@ copy ..\include\opendht.h $(OutDir)\include\</Command>
      <WarningLevel>Level3</WarningLevel>
      <Optimization>Disabled</Optimization>
      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>..\..\include;..\include;..\include\opendht;..\..\msgpack-c\include;</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <DisableSpecificWarnings>4804;4800;4101;4267;4244;4503;</DisableSpecificWarnings>
-      <AdditionalOptions>-D_SCL_SECURE_NO_WARNINGS %(AdditionalOptions)</AdditionalOptions>
+      <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>
    </ClCompile>
    <PostBuildEvent>
      <Command>mkdir $(OutDir)\include
@@ -182,7 +197,7 @@ copy ..\include\opendht\*.h $(OutDir)\include\opendht
 copy ..\include\opendht.h $(OutDir)\include\</Command>
    </PostBuildEvent>
    <Lib>
-      <OutputFile>$(OutDir)\lib\x64\$(TargetName)$(TargetExt)</OutputFile>
+      <OutputFile>$(OutDir)lib\$(PlatformTarget)\$(TargetName)$(TargetExt)</OutputFile>
    </Lib>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -192,11 +207,11 @@ copy ..\include\opendht.h $(OutDir)\include\</Command>
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <IntrinsicFunctions>true</IntrinsicFunctions>
      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>..\..\include;..\include;..\include\opendht;..\..\msgpack-c\include;</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <DisableSpecificWarnings>4804;4800;4101;4267;4244;4503;</DisableSpecificWarnings>
-      <AdditionalOptions>-D_SCL_SECURE_NO_WARNINGS %(AdditionalOptions)</AdditionalOptions>
-      <ProgramDataBaseFileName>$(OutDir)\lib\x86\$(TargetName).pdb</ProgramDataBaseFileName>
+      <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>
    </ClCompile>
    <Link>
      <EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -211,7 +226,7 @@ copy ..\include\opendht\*.h $(OutDir)\include\opendht
 copy ..\include\opendht.h $(OutDir)\include\</Command>
    </PostBuildEvent>
    <Lib>
-      <OutputFile>$(OutDir)\lib\x86\$(TargetName)$(TargetExt)</OutputFile>
+      <OutputFile>$(OutDir)lib\$(PlatformTarget)\$(TargetName)$(TargetExt)</OutputFile>
      <LinkTimeCodeGeneration>false</LinkTimeCodeGeneration>
    </Lib>
  </ItemDefinitionGroup>
@@ -222,11 +237,11 @@ copy ..\include\opendht.h $(OutDir)\include\</Command>
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <IntrinsicFunctions>true</IntrinsicFunctions>
      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(ProjectDir)contrib\build\include;$(ProjectDir)..\include;$(ProjectDir)..\include\opendht;$(ProjectDir)contrib\build\msgpack-c\include;$(ProjectDir)contrib\build\argon2\include;$(ProjectDir)..\..\include;$(ProjectDir)..\..\argon2\include</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <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\x64\$(TargetName).pdb</ProgramDataBaseFileName>
+      <AdditionalOptions>-D_SCL_SECURE_NO_WARNINGS  %(AdditionalOptions)</AdditionalOptions>
+      <ProgramDataBaseFileName>$(OutDir)lib\$(PlatformTarget)\$(TargetName).pdb</ProgramDataBaseFileName>
    </ClCompile>
    <Link>
      <EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -241,7 +256,7 @@ copy ..\include\opendht\*.h $(OutDir)\include\opendht
 copy ..\include\opendht.h $(OutDir)\include\</Command>
    </PostBuildEvent>
    <Lib>
-      <OutputFile>$(OutDir)\lib\x64\$(TargetName)$(TargetExt)</OutputFile>
+      <OutputFile>$(OutDir)lib\$(PlatformTarget)\$(TargetName)$(TargetExt)</OutputFile>
      <LinkTimeCodeGeneration>false</LinkTimeCodeGeneration>
      <AdditionalLibraryDirectories>
      </AdditionalLibraryDirectories>
@@ -53,12 +53,26 @@
      <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>
@@ -139,6 +153,24 @@
    </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,7 +1,7 @@
 dnl define macros
 m4_define([opendht_major_version], 1)
-m4_define([opendht_minor_version], 8)
-m4_define([opendht_patch_version], 2)
+m4_define([opendht_minor_version], 9)
+m4_define([opendht_patch_version], 5)
 m4_define([opendht_version],
 		  [opendht_major_version.opendht_minor_version.opendht_patch_version])

@@ -52,6 +52,10 @@ Enable the verbose mode (log to stdout by default)
 \fB-l\fP \fIlog_file\fP
 Write log to file instead of stdout

+.TP
+\fB-L\fP
+Write log to syslog instead of stdout
+
 .TP
 \fB-i\fP
 Generate cryptographic identity for the node.
@@ -60,6 +64,18 @@ Generate cryptographic identity for the node.
 \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
 Specify the network id. This let you connect to distinct networks and prevents
@@ -67,7 +83,7 @@ the merge of two different networks (available since OpenDHT v0.6.1).

 .TP
 \fB-p\fP \fIlocal_port\fP
-Use port \fIlocal_port\fP for the program to bind to.
+Use UDP port \fIlocal_port\fP for the program to bind to.

 .TP
 \fB-b\fP \fIbootstrap_host\fP[:\fIport\fP]
@@ -22,7 +22,6 @@
 #ifdef 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"
@@ -114,8 +114,10 @@ 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)
+    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;
@@ -126,10 +128,11 @@ public:
    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)
+    MSGPACK_DEFINE_MAP(id, msg, date, status, datatype, metadatas)
 };

 class OPENDHT_PUBLIC TrustRequest : public EncryptedValue<TrustRequest>
@@ -68,27 +68,27 @@ public:
     * Initialise the Dht with two open sockets (for IPv4 and IP6)
     * and an ID for the node.
     */
-    Dht(const int& s, const int& s6, const Config& config);
+    Dht(const int& s, const int& s6, const Config& config, const Logger& l = {});
    virtual ~Dht();

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

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

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

    /**
     * Performs final operations before quitting.
     */
-    void shutdown(ShutdownCallback cb);
+    void shutdown(ShutdownCallback cb) override;

    /**
     * Returns true if the node is running (have access to an open socket).
@@ -96,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;
+    bool isRunning(sa_family_t af = 0) const override;

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

@@ -110,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&);
-    void insertNode(const InfoHash& id, const sockaddr* sa, socklen_t salen) {
+    void insertNode(const InfoHash& id, const SockAddr&) override;
+    void insertNode(const InfoHash& id, const sockaddr* sa, socklen_t salen) override {
        insertNode(id, SockAddr(sa, salen));
    }
-    void insertNode(const NodeExport& n) {
+    void insertNode(const NodeExport& n) override {
        insertNode(n.id, SockAddr(n.ss, n.sslen));
    }

-    void pingNode(const sockaddr*, socklen_t, DoneCallbackSimple&& cb={});
+    void pingNode(const sockaddr*, socklen_t, DoneCallbackSimple&& cb={}) 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) {
+    time_point periodic(const uint8_t *buf, size_t buflen, const SockAddr&) override;
+    time_point periodic(const uint8_t *buf, size_t buflen, const sockaddr* from, socklen_t fromlen) override {
        return periodic(buf, buflen, SockAddr(from, fromlen));
    }

@@ -135,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 = {});
-    virtual void get(const InfoHash& key, GetCallback cb, DoneCallbackSimple donecb={}, Value::Filter&& f={}, Where&& w = {}) {
+    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 {
        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 = {}) {
+    virtual void get(const InfoHash& key, GetCallbackSimple cb, DoneCallback donecb={}, Value::Filter&& f={}, Where&& w = {}) override {
        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 = {}) {
+    virtual void get(const InfoHash& key, GetCallbackSimple cb, DoneCallbackSimple donecb, Value::Filter&& f={}, Where&& w = {}) override {
        get(key, bindGetCb(cb), bindDoneCb(donecb), std::forward<Value::Filter>(f), std::forward<Where>(w));
    }
    /**
@@ -155,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 = {});
-    virtual void query(const InfoHash& key, QueryCallback cb, DoneCallbackSimple done_cb = {}, Query&& q = {}) {
+    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 {
        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;
+    std::vector<Sp<Value>> getLocal(const InfoHash& key, const Value::Filter& f = {}) const override;

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

    /**
     * Announce a value on all available protocols (IPv4, IPv6).
@@ -180,12 +180,12 @@ public:
            Sp<Value>,
            DoneCallback cb=nullptr,
            time_point created=time_point::max(),
-            bool permanent = false);
+            bool permanent = false) override;
    void put(const InfoHash& key,
            const Sp<Value>& v,
            DoneCallbackSimple cb,
            time_point created=time_point::max(),
-            bool permanent = false)
+            bool permanent = false) override
    {
        put(key, v, bindDoneCb(cb), created, permanent);
    }
@@ -194,7 +194,7 @@ public:
            Value&& v,
            DoneCallback cb=nullptr,
            time_point created=time_point::max(),
-            bool permanent = false)
+            bool permanent = false) override
    {
        put(key, std::make_shared<Value>(std::move(v)), cb, created, permanent);
    }
@@ -202,7 +202,7 @@ public:
            Value&& v,
            DoneCallbackSimple cb,
            time_point created=time_point::max(),
-            bool permanent = false)
+            bool permanent = false) override
    {
        put(key, std::forward<Value>(v), bindDoneCb(cb), created, permanent);
    }
@@ -210,18 +210,18 @@ 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&) const override;

    /**
     * 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&) const override;

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

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

-    virtual size_t listen(const InfoHash& key, GetCallback cb, Value::Filter f={}, Where w={}) {
+    size_t listen(const InfoHash& key, GetCallback cb, Value::Filter f={}, Where w={}) override {
        return listen(key, [cb](const std::vector<Sp<Value>>& vals, bool expired){
            if (not expired)
                return cb(vals);
            return true;
        }, std::forward<Value::Filter>(f), std::forward<Where>(w));
    }
-    virtual size_t listen(const InfoHash& key, GetCallbackSimple cb, Value::Filter f={}, Where w={}) {
+    size_t listen(const InfoHash& key, GetCallbackSimple cb, Value::Filter f={}, Where w={}) override {
        return listen(key, bindGetCb(cb), std::forward<Value::Filter>(f), std::forward<Where>(w));
    }

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

    /**
     * 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);
-    void connectivityChanged() {
+    void connectivityChanged(sa_family_t) override;
+    void connectivityChanged() override {
        reported_addr.clear();
        connectivityChanged(AF_INET);
        connectivityChanged(AF_INET6);
@@ -261,32 +261,32 @@ public:
     * Get the list of good nodes for local storage saving purposes
     * The list is ordered to minimize the back-to-work delay.
     */
-    std::vector<NodeExport> exportNodes() const;
+    std::vector<NodeExport> exportNodes() const override;

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

    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;
-    std::vector<unsigned> getNodeMessageStats(bool in = false) {
+    void dumpTables() const override;
+    std::vector<unsigned> getNodeMessageStats(bool in = false) override {
        return network_engine.getNodeMessageStats(in);
    }

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

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

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

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

 private:
@@ -436,17 +436,9 @@ private:
    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) {
-        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;
-        }
+        auto& b = buckets(af);
+        auto it = b.findBucket(id);
+        return it == b.end() ? nullptr : &(*it);
    }
    const Bucket* findBucket(const InfoHash& id, sa_family_t af) const {
        return const_cast<Dht*>(this)->findBucket(id, af);
@@ -26,6 +26,7 @@ namespace dht {
 class OPENDHT_PUBLIC DhtInterface {
 public:
    DhtInterface() = default;
+    DhtInterface(const Logger& l) : DHT_LOG(l) {};
    virtual ~DhtInterface() = default;

    // [[deprecated]]
@@ -214,13 +215,18 @@ public:
    /**
     * Enable or disable logging of DHT internal messages
     */
-    virtual void setLoggers(LogMethod error = NOLOG, LogMethod warn = NOLOG, LogMethod debug = NOLOG)
-    {
+    virtual void setLoggers(LogMethod error = {}, LogMethod warn = {}, LogMethod debug = {}) {
        DHT_LOG.DBG = 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).
     */
@@ -238,8 +244,6 @@ public:
    virtual void pushNotificationReceived(const std::map<std::string, std::string>& data) = 0;

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

@@ -44,11 +44,13 @@ public:

    DhtProxyClient();

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

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

@@ -52,7 +52,7 @@ struct SecureDhtConfig;
 class OPENDHT_PUBLIC DhtRunner {

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

    struct Config {
        SecureDhtConfig dht_config;
@@ -63,6 +63,14 @@ public:
        bool peer_publish;
    };

+    struct Context {
+        std::unique_ptr<Logger> logger {};
+        std::shared_ptr<PeerDiscovery> peerDiscovery {};
+        StatusCallback statusChangedCallback {};
+        CertificateStoreQuery certificateStore {};
+        Context() {}
+    };
+
    DhtRunner();
    virtual ~DhtRunner();

@@ -316,7 +324,8 @@ public:

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

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

    /**
     * Only print logs related to the given InfoHash (if given), or disable filter (if zeroes).
@@ -375,7 +384,7 @@ public:
            /*.peer_publish = */true,
        });
    }
-    void run(in_port_t port, const Config& config);
+    void run(in_port_t port, const Config& config, Context&& context = {});

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

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

    void setOnStatusChanged(StatusCallback&& cb) {
        statusCb = std::move(cb);
@@ -424,6 +433,8 @@ public:
     */
    void join();

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

    /**
@@ -539,10 +550,7 @@ private:
    std::string pushToken_;

    /** PeerDiscovery Parameters */
-    std::unique_ptr<PeerDiscovery> peerDiscovery4_;
-    std::unique_ptr<PeerDiscovery> peerDiscovery6_;
-    const in_port_t port_multicast = 8888;
-
+    std::shared_ptr<PeerDiscovery> peerDiscovery_;
 };

 }
@@ -66,6 +66,15 @@ 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);

@@ -32,11 +32,6 @@ namespace dht {

 // Logging related utility functions

-/**
- * Dummy function used to disable logging
- */
-inline void NOLOG(char const*, va_list) {}
-
 /**
 * Wrapper for logging methods
 */
@@ -85,9 +80,13 @@ private:
 };

 struct Logger {
-    LogMethod DBG = NOLOG;
-    LogMethod WARN = NOLOG;
-    LogMethod ERR = NOLOG;
+    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)) {}
    void setFilter(const InfoHash& f) {
        filter_ = f;
        filterEnable_ = static_cast<bool>(filter_);
@@ -27,6 +27,7 @@
 #include "utils.h"
 #include "rng.h"
 #include "rate_limiter.h"
+#include "log_enable.h"

 #include <vector>
 #include <string>
@@ -68,14 +69,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) {}

-    std::string getMsg() const { return msg; }
+    const 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;
-    const InfoHash failing_node_id;
+    InfoHash failing_node_id;
 };

 struct ParsedMessage;
@@ -18,13 +18,10 @@

 #pragma once

+#include "def.h"
 #include "sockaddr.h"
 #include "infohash.h"

-#include <string.h>
-#include <stdio.h>
-#include <unistd.h>
-
 #include <thread>
 #include <mutex>
 #include <condition_variable>
@@ -34,27 +31,53 @@ namespace dht {
 class OPENDHT_PUBLIC PeerDiscovery
 {
 public:
+    static constexpr in_port_t DEFAULT_PORT = 8888;
+    using ServiceDiscoveredCallback = std::function<void(msgpack::object&&, SockAddr&&)>;

-    using PeerDiscoveredCallback = std::function<void(const InfoHash&, const SockAddr&)>;
-
-    PeerDiscovery(sa_family_t domain, in_port_t port);
+    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(PeerDiscoveredCallback callback);
+    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
+     * startPublish - Keeping sending data until node is joinned or stop is called - msgpack
    */
-    void startPublish(const dht::InfoHash &nodeId, in_port_t port_to_send);
+    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
    */
@@ -63,75 +86,12 @@ public:
    /**
     * Join the threads
    */
-    void join() {
-        if(running_listen.joinable()) running_listen.join();
-        if(running_send.joinable()) running_send.join();
-    }
+    void join();

 private:
-    std::mutex mtx_;
-    std::condition_variable cv_;
-    bool running_ {true};
-    sa_family_t domain_ {AF_UNSPEC};
-    int port_;
-    int sockfd_ {-1};
-    int stop_writefd_ {-1};
-
-    SockAddr sockAddrSend_;
-    std::array<uint8_t,dht::InfoHash::size() + sizeof(in_port_t)> data_send_;
-
-    //Thread export to be joined
-    std::thread running_listen;
-    std::thread running_send;
-    dht::InfoHash nodeId_;
-
-    /**
-     * Multicast Socket Initialization, accept IPV4, IPV6
-    */
-    static int initialize_socket(sa_family_t domain);
-
-    /**
-     * Send messages
-    */
-    void sendTo(uint8_t *buf,size_t buf_size);
-
-    /**
-     * Receive messages
-    */
-    SockAddr recvFrom(uint8_t *buf, size_t &buf_size);
-
-    /**
-     * Send thread loop
-    */
-    void sender_thread();
-
-    /**
-     * Listener thread loop
-    */
-    void listener_thread(PeerDiscoveredCallback callback);
-
-    /**
-     * Listener Parameters Setup
-    */
-    void listener_setup();
-
-    /**
-     * Sender Parameters Setup
-    */
-    void sender_setup(const dht::InfoHash& nodeId, in_port_t port_to_send);
-
-    /**
-     * Binary Converters
-    */
-    static void inttolitend(uint32_t x, uint8_t *lit_int) {
-        lit_int[0] = (uint8_t)(x >>  0);
-        lit_int[1] = (uint8_t)(x >>  8);
-    }
-
-    static uint16_t litendtoint(uint8_t *lit_int) {
-        return (uint32_t)lit_int[0] <<  0
-            |  (uint32_t)lit_int[1] <<  8;
-    }
+    class DomainPeerDiscovery;
+    std::unique_ptr<DomainPeerDiscovery> peerDiscovery4_;
+    std::unique_ptr<DomainPeerDiscovery> peerDiscovery6_;
 };

 }
@@ -21,7 +21,6 @@
 #pragma once

 #include "utils.h"
-#include "log_enable.h"

 #include <functional>
 #include <map>
@@ -311,10 +311,9 @@ public:
        dht_->pushNotificationReceived(notification);
    }

-    void setLoggers(LogMethod error = NOLOG, LogMethod warn = NOLOG, LogMethod debug = NOLOG) override
-    {
-        DhtInterface::setLoggers(error, warn, debug);
-        dht_->setLoggers(error, warn, debug);
+    void setLogger(const Logger& logger) override {
+        DhtInterface::setLogger(logger);
+        dht_->setLogger(logger);
    }

    /**
@@ -19,6 +19,8 @@

 #pragma once

+#include "def.h"
+
 #include <condition_variable>
 #include <vector>
 #include <queue>
@@ -27,7 +29,7 @@

 namespace dht {

-class ThreadPool {
+class OPENDHT_PUBLIC ThreadPool {
 public:
    static ThreadPool& computation();
    static ThreadPool& io();
@@ -66,4 +68,23 @@ private:
    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();
+};
+
 }
@@ -40,6 +40,8 @@ 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>;
@@ -90,6 +92,18 @@ 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>;
@@ -2,7 +2,7 @@ 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@
+libopendht_la_LDFLAGS  = @LDFLAGS@ @Argon2_LDFLAGS@ -version-number @OPENDHT_MAJOR_VERSION@:@OPENDHT_MINOR_VERSION@:@OPENDHT_PATCH_VERSION@
 libopendht_la_SOURCES  = \
        dht.cpp \
        storage.h \
@@ -27,8 +27,10 @@ libopendht_la_SOURCES  = \
        dhtrunner.cpp \
        default_types.cpp \
        log.cpp \
+        peer_discovery.cpp \
        network_utils.h \
-        network_utils.cpp
+        network_utils.cpp \
+        thread_pool.cpp

 if WIN32
 libopendht_la_SOURCES += rng.cpp
@@ -55,10 +57,12 @@ nobase_include_HEADERS = \
        ../include/opendht/default_types.h \
        ../include/opendht/log.h \
        ../include/opendht/log_enable.h \
-        ../include/opendht/rng.h
+        ../include/opendht/peer_discovery.h \
+        ../include/opendht/rng.h \
+        ../include/opendht/thread_pool.h

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

@@ -1691,8 +1691,8 @@ Dht::~Dht()

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

-Dht::Dht(const int& s, const int& s6, const Config& config)
-    : myid(config.node_id ? config.node_id : InfoHash::getRandom()), store(), store_quota(),
+Dht::Dht(const int& s, const int& s6, const Config& config, const Logger& l)
+    : DhtInterface(l), myid(config.node_id ? config.node_id : InfoHash::getRandom()), store(), store_quota(),
    network_engine(myid, config.network, s, s6, DHT_LOG, scheduler,
            std::bind(&Dht::onError, this, _1, _2),
            std::bind(&Dht::onNewNode, this, _1, _2),
@@ -1722,9 +1722,7 @@ Dht::Dht(const int& s, const int& s6, const Config& config)
    search_id = std::uniform_int_distribution<decltype(search_id)>{}(rd);

    uniform_duration_distribution<> time_dis {std::chrono::seconds(3), std::chrono::seconds(5)};
-    auto confirm_nodes_time = scheduler.time() + time_dis(rd);
-    DHT_LOG.d(myid, "Scheduling %s", myid.toString().c_str());
-    nextNodesConfirmation = scheduler.add(confirm_nodes_time, std::bind(&Dht::confirmNodes, this));
+    nextNodesConfirmation = scheduler.add(scheduler.time() + time_dis(rd), std::bind(&Dht::confirmNodes, this));

    // Fill old secret
    {
@@ -1735,7 +1733,7 @@ Dht::Dht(const int& s, const int& s6, const Config& config)

    expire();

-    DHT_LOG.d("DHT initialised with node ID %s", myid.toString().c_str());
+    DHT_LOG.d("DHT node initialised with ID %s", myid.toString().c_str());

    if (not persistPath.empty())
        loadState(persistPath);
@@ -72,8 +72,8 @@ struct DhtProxyClient::ProxySearch {

 DhtProxyClient::DhtProxyClient() {}

-DhtProxyClient::DhtProxyClient(std::function<void()> signal, const std::string& serverHost, const std::string& pushClientId)
-: serverHost_(serverHost), pushClientId_(pushClientId), loopSignal_(signal)
+DhtProxyClient::DhtProxyClient(std::function<void()> signal, const std::string& serverHost, const std::string& pushClientId, const Logger& l)
+: DhtInterface(l), serverHost_(serverHost), pushClientId_(pushClientId), loopSignal_(signal)
 {
    if (serverHost_.find("://") == std::string::npos)
        serverHost_ = proxy::HTTP_PROTO + serverHost_;
@@ -135,7 +135,14 @@ DhtProxyClient::cancelAllOperations()
    while (operation != operations_.end()) {
        if (operation->thread.joinable()) {
            // Close connection to stop operation?
-            restbed::Http::close(operation->req);
+            if (operation->req) {
+                try {
+                    restbed::Http::close(operation->req);
+                } catch (const std::exception& e) {
+                    DHT_LOG.w("Error closing socket: %s", e.what());
+                }
+                operation->req.reset();
+            }
            operation->thread.join();
            operation = operations_.erase(operation);
        } else {
@@ -157,8 +164,14 @@ DhtProxyClient::cancelAllListeners()
            if (l->second.thread.joinable()) {
                // Close connection to stop listener?
                l->second.state->cancel = true;
-                if (l->second.req)
-                    restbed::Http::close(l->second.req);
+                if (l->second.req) {
+                    try {
+                        restbed::Http::close(l->second.req);
+                    } catch (const std::exception& e) {
+                        DHT_LOG.w("Error closing socket: %s", e.what());
+                    }
+                    l->second.req.reset();
+                }
                l->second.thread.join();
            }
            s.second.listeners.erase(token);
@@ -210,12 +223,15 @@ DhtProxyClient::periodic(const uint8_t*, size_t, const SockAddr&)
 {
    // Exec all currently stored callbacks
    scheduler.syncTime();
-    if (!callbacks_.empty()) {
+    decltype(callbacks_) callbacks;
+    {
        std::lock_guard<std::mutex> lock(lockCallbacks);
-        for (auto& callback : callbacks_)
-            callback();
-        callbacks_.clear();
+        callbacks = std::move(callbacks_);
    }
+    for (auto& callback : callbacks)
+        callback();
+    callbacks.clear();
+
    // Remove finished operations
    {
        std::lock_guard<std::mutex> lock(lockOperations_);
@@ -224,7 +240,14 @@ DhtProxyClient::periodic(const uint8_t*, size_t, const SockAddr&)
            if (*(operation->finished)) {
                if (operation->thread.joinable()) {
                    // Close connection to stop operation?
-                    restbed::Http::close(operation->req);
+                    if (operation->req) {
+                        try {
+                            restbed::Http::close(operation->req);
+                        } catch (const std::exception& e) {
+                            DHT_LOG.w("Error closing socket: %s", e.what());
+                        }
+                        operation->req.reset();
+                    }
                    operation->thread.join();
                }
                operation = operations_.erase(operation);
@@ -277,11 +300,13 @@ DhtProxyClient::get(const InfoHash& key, GetCallback cb, DoneCallback donecb, Va
                            if (reader->parse(char_data, char_data + body.size(), &json, &err)) {
                                auto value = std::make_shared<Value>(json);
                                if ((not filter or filter(*value)) and cb) {
-                                    std::lock_guard<std::mutex> lock(lockCallbacks);
-                                    callbacks_.emplace_back([cb, value, state]() {
-                                        if (not state->stop and not cb({value}))
-                                            state->stop = true;
-                                    });
+                                    {
+                                        std::lock_guard<std::mutex> lock(lockCallbacks);
+                                        callbacks_.emplace_back([cb, value, state]() {
+                                            if (not state->stop and not cb({value}))
+                                                state->stop = true;
+                                        });
+                                    }
                                    loopSignal_();
                                }
                            } else {
@@ -297,11 +322,13 @@ DhtProxyClient::get(const InfoHash& key, GetCallback cb, DoneCallback donecb, Va
            state->ok = false;
        }
        if (donecb) {
-            std::lock_guard<std::mutex> lock(lockCallbacks);
-            callbacks_.emplace_back([=](){
-                donecb(state->ok, {});
-                state->stop = true;
-            });
+            {
+                std::lock_guard<std::mutex> lock(lockCallbacks);
+                callbacks_.emplace_back([=](){
+                    donecb(state->ok, {});
+                    state->stop = true;
+                });
+            }
            loopSignal_();
        }
        if (!state->ok) {
@@ -423,10 +450,12 @@ DhtProxyClient::doPut(const InfoHash& key, Sp<Value> val, DoneCallback cb, time_
            *ok = false;
        }
        if (cb) {
-            std::lock_guard<std::mutex> lock(lockCallbacks);
-            callbacks_.emplace_back([=](){
-                cb(*ok, {});
-            });
+            {
+                std::lock_guard<std::mutex> lock(lockCallbacks);
+                callbacks_.emplace_back([=](){
+                    cb(*ok, {});
+                });
+            }
            loopSignal_();
        }
        if (!ok) {
@@ -802,11 +831,13 @@ void DhtProxyClient::sendListen(const std::shared_ptr<restbed::Request> &req,
                            auto expired = json.get("expired", Json::Value(false)).asBool();
                            auto value = std::make_shared<Value>(json);
                            if ((not filter or filter(*value)) and cb) {
-                                std::lock_guard<std::mutex> lock(lockCallbacks);
-                                callbacks_.emplace_back([cb, value, state, expired]() {
-                                    if (not state->cancel and not cb({value}, expired))
-                                        state->cancel = true;
-                                });
+                                {
+                                    std::lock_guard<std::mutex> lock(lockCallbacks);
+                                    callbacks_.emplace_back([cb, value, state, expired]() {
+                                        if (not state->cancel and not cb({value}, expired))
+                                            state->cancel = true;
+                                    });
+                                }
                                loopSignal_();
                            }
                        }
@@ -875,8 +906,14 @@ DhtProxyClient::doCancelListen(const InfoHash& key, size_t ltoken)
        // Just stop the request
        if (listener.thread.joinable()) {
            // Close connection to stop listener
-            if (listener.req)
-                restbed::Http::close(listener.req);
+            if (listener.req) {
+                try {
+                    restbed::Http::close(listener.req);
+                } catch (const std::exception& e) {
+                    DHT_LOG.w("Error closing socket: %s", e.what());
+                }
+                listener.req.reset();
+            }
            listener.thread.join();
        }
    }
@@ -936,14 +973,26 @@ DhtProxyClient::restartListeners()
        return;
    }
    DHT_LOG.d("Restarting listeners");
+    for (auto& search: searches_) {
+        for (auto& l: search.second.listeners) {
+            auto& listener = l.second;
+            if (auto state = listener.state)
+                state->cancel = true;
+            if (listener.req) {
+                try {
+                    restbed::Http::close(listener.req);
+                } catch (const std::exception& e) {
+                    DHT_LOG.w("Error closing socket: %s", e.what());
+                }
+                listener.req.reset();
+            }
+        }
+    }
    for (auto& search: searches_) {
        for (auto& l: search.second.listeners) {
            auto& listener = l.second;
            auto state = listener.state;
            if (listener.thread.joinable()) {
-                state->cancel = true;
-                if (listener.req)
-                    restbed::Http::close(listener.req);
                listener.thread.join();
            }
            // Redo listen
@@ -1019,17 +1068,19 @@ DhtProxyClient::pushNotificationReceived(const std::map<std::string, std::string
                        getline(ss, substr, ',');
                        ids.emplace_back(std::stoull(substr));
                    }
-                    std::lock_guard<std::mutex> lock(lockCallbacks);
-                    callbacks_.emplace_back([this, key, token, state, ids]() {
-                        if (state->cancel) return;
-                        std::lock_guard<std::mutex> lock(searchLock_);
-                        auto s = searches_.find(key);
-                        if (s == searches_.end()) return;
-                        auto l = s->second.listeners.find(token);
-                        if (l == s->second.listeners.end()) return;
-                        if (not state->cancel and not l->second.cache.onValuesExpired(ids))
-                            state->cancel = true;
-                    });
+                    {
+                        std::lock_guard<std::mutex> lock(lockCallbacks);
+                        callbacks_.emplace_back([this, key, token, state, ids]() {
+                            if (state->cancel) return;
+                            std::lock_guard<std::mutex> lock(searchLock_);
+                            auto s = searches_.find(key);
+                            if (s == searches_.end()) return;
+                            auto l = s->second.listeners.find(token);
+                            if (l == s->second.listeners.end()) return;
+                            if (not state->cancel and not l->second.cache.onValuesExpired(ids))
+                                state->cancel = true;
+                        });
+                    }
                    loopSignal_();
                }
            }
@@ -1037,6 +1088,8 @@ DhtProxyClient::pushNotificationReceived(const std::map<std::string, std::string
    } catch (const std::exception& e) {
        DHT_LOG.e("Error handling push notification: %s", e.what());
    }
+#else
+    (void) notification;
 #endif
 }

@@ -1051,8 +1104,14 @@ DhtProxyClient::resubscribe(const InfoHash& key, Listener& listener)
    auto state = listener.state;
    if (listener.thread.joinable()) {
        state->cancel = true;
-        if (listener.req)
-            restbed::Http::close(listener.req);
+        if (listener.req) {
+            try {
+                restbed::Http::close(listener.req);
+            } catch (const std::exception& e) {
+                DHT_LOG.w("Error closing socket: %s", e.what());
+            }
+            listener.req.reset();
+        }
        listener.thread.join();
    }
    state->cancel = false;
@@ -1066,6 +1125,9 @@ DhtProxyClient::resubscribe(const InfoHash& key, Listener& listener)
    listener.thread = std::thread([this, req, vcb, filter, state]() {
        sendListen(req, vcb, filter, state, ListenMethod::RESUBSCRIBE);
    });
+#else
+    (void) key;
+    (void) listener;
 #endif
 }

@@ -669,7 +669,6 @@ DhtProxyServer::put(const std::shared_ptr<restbed::Session>& session)
                                    clientId = pVal["client_id"].asString();
                                    platform = pVal["platform"].asString();
                                }
-                                bool isAndroid = platform == "android";
                                std::unique_lock<std::mutex> lock(schedulerLock_);
                                scheduler_.syncTime();
                                auto timeout = scheduler_.time() + proxy::OP_TIMEOUT;
@@ -684,6 +683,7 @@ DhtProxyServer::put(const std::shared_ptr<restbed::Session>& session)
                                    });
 #ifdef OPENDHT_PUSH_NOTIFICATIONS
                                    if (not pushToken.empty()) {
+                                        bool isAndroid = platform == "android";
                                        pput.expireNotifyJob = scheduler_.add(timeout - proxy::OP_MARGIN,
                                            [this, infoHash, vid, pushToken, clientId, isAndroid]
                                        {
@@ -27,20 +27,35 @@
 #include "dht_proxy_client.h"
 #endif

+#ifdef _WIN32
+#include <cstring>
+#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;
-    size_t tokenProxyDht;
+    size_t tokenClassicDht {0};
+    size_t tokenProxyDht {0};
    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
 , dht_via_proxy_()
@@ -62,7 +77,7 @@ DhtRunner::~DhtRunner()
 }

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

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

 void
-DhtRunner::run(const SockAddr& local4, const SockAddr& local6, const DhtRunner::Config& config)
+DhtRunner::run(const SockAddr& local4, const SockAddr& local6, const DhtRunner::Config& config, Context&& context)
 {
    if (running)
        return;
    startNetwork(local4, local6);

-    auto dht = std::unique_ptr<DhtInterface>(new Dht(s4, s6, SecureDht::getConfig(config.dht_config)));
+    auto dht = std::unique_ptr<DhtInterface>(new Dht(s4, s6, SecureDht::getConfig(config.dht_config), context.logger ? *context.logger : Logger{}));
    dht_ = std::unique_ptr<SecureDht>(new SecureDht(std::move(dht), config.dht_config));

 #ifdef 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)
@@ -136,39 +162,43 @@ DhtRunner::run(const SockAddr& local4, const SockAddr& local6, const DhtRunner::
    });

    if (config.peer_discovery or config.peer_publish) {
-        try {
-            peerDiscovery4_.reset(new PeerDiscovery(AF_INET, port_multicast));
-        } catch(std::exception &exception){
-            perror(exception.what());
-        }
-        try{
-            peerDiscovery6_.reset(new PeerDiscovery(AF_INET6, port_multicast));
-        } catch(std::exception &exception){
-            perror(exception.what());
-        }
+        peerDiscovery_ = context.peerDiscovery ?
+            std::move(context.peerDiscovery) :
+            std::make_shared<PeerDiscovery>();
    }
-    if (config.peer_discovery) {
-        using sig = void (DhtRunner::*)(const InfoHash&, const SockAddr&);
-        if (peerDiscovery4_)
-            peerDiscovery4_->startDiscovery(std::bind(static_cast<sig>(&DhtRunner::bootstrap),
-                                                   this,
-                                                   std::placeholders::_1,std::placeholders::_2));

-        if (peerDiscovery6_)
-            peerDiscovery6_->startDiscovery(std::bind(static_cast<sig>(&DhtRunner::bootstrap),
-                                                    this,
-                                                    std::placeholders::_1,std::placeholders::_2));
+    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) {
-        if (peerDiscovery4_)
-            peerDiscovery4_->startPublish(getNodeId(), getBoundPort(AF_INET));
-        if (peerDiscovery6_)
-            peerDiscovery6_->startPublish(getNodeId(), getBoundPort(AF_INET6));
+        msgpack::sbuffer sbuf_node;
+        // IPv4
+        NodeInsertionPack adc;
+        adc.net = netId;
+        adc.port = getBoundPort(AF_INET);
+        adc.nodeId = dht_->getNodeId();
+        msgpack::pack(sbuf_node, adc);
+        peerDiscovery_->startPublish(AF_INET, PEER_DISCOVERY_DHT_SERVICE, sbuf_node);
+        // IPv6
+        adc.port = getBoundPort(AF_INET6);
+        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;
+    }
 #ifdef OPENDHT_PROXY_CLIENT
    if (dht_via_proxy_)
        dht_via_proxy_->shutdown(cb);
@@ -187,10 +217,7 @@ DhtRunner::join()
    running = false;
    cv.notify_all();
    bootstrap_cv.notify_all();
-    if (peerDiscovery4_)
-        peerDiscovery4_->stop();
-    if (peerDiscovery6_)
-        peerDiscovery6_->stop();
+    if (peerDiscovery_) peerDiscovery_->stop();

    if (dht_thread.joinable())
        dht_thread.join();
@@ -198,10 +225,10 @@ DhtRunner::join()
        bootstrap_thread.join();
    if (rcv_thread.joinable())
        rcv_thread.join();
-    if (peerDiscovery4_)
-        peerDiscovery4_->join();
-    if (peerDiscovery6_)
-        peerDiscovery6_->join();
+
+    if (peerDiscovery_) {
+        peerDiscovery_->join();
+    }

    {
        std::lock_guard<std::mutex> lck(storage_mtx);
@@ -226,17 +253,17 @@ DhtRunner::dumpTables() const
 InfoHash
 DhtRunner::getId() const
 {
-    if (!activeDht())
-        return {};
-    return activeDht()->getId();
+    if (auto dht = activeDht())
+        return dht->getId();
+    return {};
 }

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


@@ -273,16 +300,22 @@ DhtRunner::exportValues() const {
 }

 void
-DhtRunner::setLoggers(LogMethod error, LogMethod warn, LogMethod debug) {
+DhtRunner::setLogger(const Logger& logger) {
    std::lock_guard<std::mutex> lck(dht_mtx);
    if (dht_)
-        dht_->setLoggers(error, warn, debug);
+        dht_->setLogger(logger);
 #ifdef OPENDHT_PROXY_CLIENT
    if (dht_via_proxy_)
-        dht_via_proxy_->setLoggers(error, warn, debug);
+        dht_via_proxy_->setLogger(logger);
 #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);
@@ -437,20 +470,35 @@ 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();
-            auto delay = clock::now() - pck.received;
-            if (delay > std::chrono::milliseconds(500))
-                std::cerr << "Dropping packet with high delay: " << print_dt(delay) << std::endl;
+            if (clock::now() - pck.received > RX_QUEUE_MAX_DELAY)
+                dropped++;
            else
-                wakeup = dht->periodic(pck.data.data(), pck.data.size()-1, pck.from);
+                wakeup = dht->periodic(pck.data.data(), pck.data.size(), pck.from);
            received.pop();
        }
    } else {
+        // Or just run the scheduler
        wakeup = dht->periodic(nullptr, 0, nullptr, 0);
    }

+    if (dropped)
+        std::cerr << "Dropped %zu packets with high delay" << dropped << std::endl;
+
    NodeStatus nstatus4 = dht->getStatus(AF_INET);
    NodeStatus nstatus6 = dht->getStatus(AF_INET6);
    if (nstatus4 != status4 || nstatus6 != status6) {
@@ -485,6 +533,7 @@ int bindSocket(const SockAddr& addr, SockAddr& bound)
 #endif
    if (is_ipv6)
        setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY, (const char*)&set, sizeof(set));
+    net::set_nonblocking(sock);
    int rc = bind(sock, addr.get(), addr.getLength());
    if(rc < 0) {
        rc = errno;
@@ -580,14 +629,20 @@ DhtRunner::startNetwork(const SockAddr sin4, const SockAddr sin6)
                if (not running_network)
                    break;

-                if(rc > 0) {
+                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))
+                    if (FD_ISSET(stop_readfd, &readfds)) {
+                        if (recv(stop_readfd, (char*)buf.data(), buf.size(), 0) < 0) {
+                            std::cerr << "Got stop packet error: " << strerror(errno) << std::endl;
+                            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))
+                    else if (s6 >= 0 && FD_ISSET(s6, &readfds))
                        rc = recvfrom(s6, (char*)buf.data(), buf.size(), 0, (sockaddr*)&from, &from_len);
                    else
                        continue;
@@ -599,9 +654,11 @@ DhtRunner::startNetwork(const SockAddr sin4, const SockAddr sin6)
                                std::cerr << "Dropping packet: queue is full!" << std::endl;
                                rcv.pop();
                            }
-                            rcv.emplace(ReceivedPacket {Blob {buf.begin(), buf.begin()+rc+1}, SockAddr(from, from_len), clock::now()});
+                            rcv.emplace(ReceivedPacket {Blob {buf.begin(), buf.begin()+rc}, SockAddr(from, from_len), clock::now()});
                        }
                        cv.notify_all();
+                    } else if (rc == -1) {
+                        std::cerr << "Error receiving packet: " << strerror(errno) << std::endl;
                    }
                }
            }
@@ -661,22 +718,21 @@ DhtRunner::listen(InfoHash hash, ValueCallback vcb, Value::Filter f, Where w)
        pending_ops.emplace([=](SecureDht& dht) mutable {
 #ifdef OPENDHT_PROXY_CLIENT
            auto tokenbGlobal = listener_token_++;
-            Listener listener {};
+            auto& listener = listeners_[tokenbGlobal];
            listener.hash = hash;
            listener.f = std::move(f);
            listener.w = std::move(w);
-            listener.gcb = [hash,vcb,tokenbGlobal,this](const std::vector<Sp<Value>>& vals, bool expired){
+            listener.gcb = [hash,vcb,tokenbGlobal,this](const std::vector<Sp<Value>>& vals, bool expired) {
                if (not vcb(vals, expired)) {
                    cancelListen(hash, tokenbGlobal);
                    return false;
                }
                return true;
            };
-            if (use_proxy)
-                listener.tokenProxyDht = dht.listen(hash, listener.gcb, listener.f, listener.w);
-            else
-                listener.tokenClassicDht = dht.listen(hash, listener.gcb, listener.f, listener.w);
-            listeners_.emplace(tokenbGlobal, std::move(listener));
+            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)));
@@ -986,8 +1042,7 @@ DhtRunner::findCertificate(InfoHash hash, std::function<void(const std::shared_p
 void
 DhtRunner::resetDht()
 {
-    peerDiscovery4_.reset();
-    peerDiscovery6_.reset();
+    peerDiscovery_.reset();
 #ifdef OPENDHT_PROXY_CLIENT
    listeners_.clear();
    dht_via_proxy_.reset();
@@ -1081,6 +1136,8 @@ DhtRunner::forwardAllMessages(bool forward)
 #endif // OPENDHT_PROXY_CLIENT
    if (dht_)
        dht_->forwardAllMessages(forward);
+#else
+    (void) forward;
 #endif // OPENDHT_PROXY_SERVER
 }

@@ -1093,6 +1150,8 @@ DhtRunner::setPushNotificationToken(const std::string& token) {
    pushToken_ = token;
    if (dht_via_proxy_)
        dht_via_proxy_->setPushNotificationToken(token);
+#else
+    (void) token;
 #endif
 }

@@ -1108,6 +1167,8 @@ DhtRunner::pushNotificationReceived(const std::map<std::string, std::string>& da
        });
    }
    cv.notify_all();
+#else
+    (void) data;
 #endif
 }

@@ -55,9 +55,9 @@ printLog(std::ostream& s, char const *m, va_list args) {
    s << std::endl;
 }

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

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

-    dht.setLoggers(
+    return std::unique_ptr<Logger>(new Logger(
        [=](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); }
-    );
+    ));
 }

-OPENDHT_PUBLIC void
-enableSyslog(dht::DhtRunner &dht, const char* name) {
+std::unique_ptr<Logger>
+getSyslogLogger(const char* name) {
 #ifndef _WIN32
    struct Syslog {
        Syslog(const char* n) {
@@ -102,17 +102,34 @@ enableSyslog(dht::DhtRunner &dht, const char* name) {
        logfile = std::make_shared<Syslog>(name);
        opened_logfile = logfile;
    }
-    dht.setLoggers(
+    return std::unique_ptr<Logger>(new Logger(
        [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.setLoggers(dht::NOLOG, dht::NOLOG, dht::NOLOG);
+    dht.setLogger({});
 }

 }
@@ -17,27 +17,14 @@
 *  along with this program. If not, see <https://www.gnu.org/licenses/>.
 */

-
 #include "network_engine.h"
 #include "request.h"
 #include "default_types.h"
 #include "log_enable.h"
 #include "parsed_message.h"
-#include "network_utils.h"

 #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 {

@@ -56,9 +43,7 @@ constexpr std::chrono::seconds NetworkEngine::RX_TIMEOUT;
 const std::string NetworkEngine::my_v {"RNG1"};
 constexpr size_t NetworkEngine::MAX_REQUESTS_PER_SEC;

-static const uint8_t v4prefix[16] = {
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xFF, 0xFF, 0, 0, 0, 0
-};
+static constexpr 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};

@@ -138,16 +123,7 @@ NetworkEngine::NetworkEngine(InfoHash& myid, NetId net, const int& s, const int&
    onAnnounce(std::move(onAnnounce)),
    onRefresh(std::move(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))
-            throw DhtException("Can't set socket to non-blocking mode");
-    }
-    if (dht_socket6 >= 0) {
-        if (!set_nonblocking(dht_socket6))
-            throw DhtException("Can't set socket to non-blocking mode");
-    }
-}
+{}

 NetworkEngine::~NetworkEngine() {
    clear();
@@ -310,11 +286,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);
 }

@@ -18,18 +18,17 @@

 #include "network_utils.h"

-#ifndef _WIN32
-#include <arpa/inet.h>
-#include <unistd.h>
-#include <sys/socket.h>
-#else
-#include <winsock2.h>
-#include <ws2tcpip.h>
+#ifdef _WIN32
+#include "utils.h"
+#include "sockaddr.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)
-#endif
+#else
 #include <fcntl.h>
+#endif

 namespace dht {
 namespace net {
@@ -55,7 +54,7 @@ void udpPipe(int fds[2])
 {
    int lst = socket(AF_INET, SOCK_DGRAM, 0);
    if (lst < 0)
-        throw DhtException(std::string("Can't open socket: ") + strerror(lst));
+        throw DhtException(std::string("Can't open socket: ") + strerror(WSAGetLastError()));
    sockaddr_in inaddr;
    sockaddr addr;
    memset(&inaddr, 0, sizeof(inaddr));
@@ -63,14 +62,14 @@ void udpPipe(int fds[2])
    inaddr.sin_family = AF_INET;
    inaddr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
    inaddr.sin_port = 0;
-    int yes=1;
+    int yes = 1;
    setsockopt(lst, SOL_SOCKET, SO_REUSEADDR, (char*)&yes, sizeof(yes));
    int rc = bind(lst, (sockaddr*)&inaddr, sizeof(inaddr));
    if (rc < 0) {
        close(lst);
-        throw DhtException("Can't bind socket on " + print_addr((sockaddr*)&addr, sizeof(inaddr)) + " " + strerror(rc));
+        throw DhtException("Can't bind socket on " + print_addr((sockaddr*)&inaddr, sizeof(inaddr)) + " " + strerror(rc));
    }
-    socklen_t len = sizeof(inaddr);
+    socklen_t len = sizeof(addr);
    getsockname(lst, &addr, &len);
    fds[0] = lst;
    fds[1] = socket(AF_INET, SOCK_DGRAM, 0);
@@ -18,9 +18,16 @@
 #pragma once

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

 namespace dht {
@@ -30,7 +37,6 @@ bool set_nonblocking(int fd, bool nonblocking = true);

 #ifdef _WIN32
 void udpPipe(int fds[2]);
-// extern const char *inet_ntop(int, const void *, char *, socklen_t);
 #endif

 }
@@ -84,13 +84,13 @@ struct ParsedMessage {
    /* target id around which to find nodes */
    InfoHash target;
    /* transaction id */
-    Tid tid;
+    Tid tid {0};
    /* tid for packets going through request socket */
-    Tid socket_id;
+    Tid socket_id {0};
    /* security token */
    Blob token;
    /* the value id (announce confirmation) */
-    Value::Id value_id;
+    Value::Id value_id {0};
    /* time when value was first created */
    time_point created { time_point::max() };
    /* IPv4 nodes in response to a 'find' request */
@@ -18,12 +18,20 @@

 #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>

@@ -32,14 +40,118 @@ namespace dht {
 constexpr char MULTICAST_ADDRESS_IPV4[10] = "224.0.0.1";
 constexpr char MULTICAST_ADDRESS_IPV6[8] = "ff05::2"; // Site-local multicast

-PeerDiscovery::PeerDiscovery(sa_family_t domain, in_port_t port)
+
+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::~PeerDiscovery()
+PeerDiscovery::DomainPeerDiscovery::~DomainPeerDiscovery()
 {
+    stop();
+    join();
    if (sockfd_ != -1)
        close(sockfd_);

@@ -49,7 +161,7 @@ PeerDiscovery::~PeerDiscovery()
 }

 int
-PeerDiscovery::initialize_socket(sa_family_t domain)
+PeerDiscovery::DomainPeerDiscovery::initialize_socket(sa_family_t domain)
 {
 #ifdef _WIN32
    WSADATA wsaData;
@@ -67,7 +179,7 @@ PeerDiscovery::initialize_socket(sa_family_t domain)
 }

 void
-PeerDiscovery::listener_setup()
+PeerDiscovery::DomainPeerDiscovery::listener_setup()
 {
    SockAddr sockAddrListen_;
    sockAddrListen_.setFamily(domain_);
@@ -75,18 +187,23 @@ PeerDiscovery::listener_setup()
    sockAddrListen_.setAny();

    unsigned int opt = 1;
-    if (setsockopt(sockfd_, SOL_SOCKET, SO_REUSEADDR|SO_REUSEPORT, (char*) &opt, sizeof(opt)) < 0){
-       throw std::runtime_error(std::string("Reusing ADDR failed: ") + strerror(errno));
+    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("Bind Socket For Listener Error: ") + strerror(errno));
+        throw std::runtime_error(std::string("Error binding socket: ") + strerror(errno));
    }
 }

 void
-PeerDiscovery::socketJoinMulticast(int sockfd, sa_family_t family)
+PeerDiscovery::DomainPeerDiscovery::socketJoinMulticast(int sockfd, sa_family_t family)
 {
    switch (family)
    {
@@ -96,42 +213,42 @@ PeerDiscovery::socketJoinMulticast(int sockfd, sa_family_t family)
        //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, &config_ipv4.imr_interface, sizeof( struct in_addr )) < 0 ) {
-            throw std::runtime_error(std::string("Bound Network Interface IPV4 Error: ") + strerror(errno));
+        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, &ttl4, sizeof( ttl4 )) < 0 ) {
-            throw std::runtime_error(std::string(" TTL Sockopt Error: ") + strerror(errno));
+        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));
+            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 ) {
-            throw std::runtime_error(std::string("Bound Network Interface IPV6 Error: ") + strerror(errno));
-        }
+        /* 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, &ttl6, sizeof( ttl6 )) < 0 ) {
+        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_ADD_MEMBERSHIP, &config_ipv6, sizeof(config_ipv6)) < 0){
-            throw std::runtime_error(std::string("Member Addition IPV6 Error: ") + strerror(errno));
+        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;
    }
@@ -139,108 +256,68 @@ PeerDiscovery::socketJoinMulticast(int sockfd, sa_family_t family)
 }

 void
-PeerDiscovery::sendTo(uint8_t *buf, size_t buf_size)
+PeerDiscovery::DomainPeerDiscovery::startDiscovery(const std::string &type, ServiceDiscoveredCallback callback)
 {
-    ssize_t nbytes = sendto(
-        sockfd_,
-        buf,
-        buf_size,
-        0,
-        sockAddrSend_.get(),
-        sockAddrSend_.getLength()
-    );
-    if (nbytes < 0) {
-        throw std::runtime_error(std::string("Error sending packet: ") + strerror(errno));
+    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);
    }
 }

-SockAddr
-PeerDiscovery::recvFrom(uint8_t *buf, size_t& buf_size)
+std::pair<SockAddr, msgpack::object_handle>
+PeerDiscovery::DomainPeerDiscovery::recvFrom()
 {
-    sockaddr_storage storeage_recv;
-    socklen_t sa_len = sizeof(storeage_recv);
+    sockaddr_storage sa;
+    socklen_t sa_len = sizeof(sa);

+    std::array<uint8_t, 64 * 1024> buf;
    ssize_t nbytes = recvfrom(
        sockfd_,
-        buf,
-        buf_size,
+        (char*)buf.data(), buf.size(),
        0,
-        (sockaddr*)&storeage_recv,
-        &sa_len
+        (sockaddr*)&sa, &sa_len
    );
-    if (nbytes < 0) {
+    if (nbytes < 0)
        throw std::runtime_error(std::string("Error receiving packet: ") + strerror(errno));
-    }

-    buf_size = nbytes;
-    SockAddr ret {storeage_recv, sa_len};
-    return ret;
+    return { SockAddr { sa, sa_len }, msgpack::unpack(reinterpret_cast<char*>(buf.data()), nbytes) };
 }

 void
-PeerDiscovery::sender_setup(const dht::InfoHash& nodeId, in_port_t port_to_send)
-{
-    nodeId_ = nodeId;
-    //Set up for Sender
-    sockAddrSend_.setFamily(domain_);
-    sockAddrSend_.setAddress(domain_ == AF_INET ? MULTICAST_ADDRESS_IPV4 : MULTICAST_ADDRESS_IPV6);
-    sockAddrSend_.setPort(port_);
-
-    //Setup for send data
-    int port_node = port_to_send;
-    uint8_t port_node_binary[2];
-    PeerDiscovery::inttolitend(port_node,port_node_binary);
-
-    //Copy Node id and node port
-    memcpy (data_send_.data(), nodeId.data(), nodeId.size());
-    data_send_[InfoHash::size()] = port_node_binary[0];
-    data_send_[InfoHash::size() + 1] = port_node_binary[1];
-}
-
-void
-PeerDiscovery::sender_thread()
-{
-    while(true) {
-        try {
-            sendTo(data_send_.data(), data_send_.size());
-        } catch (const std::exception& e) {
-            std::cerr << e.what() << std::endl;
-        }
-        {
-            std::unique_lock<std::mutex> lck(mtx_);
-            if (cv_.wait_for(lck,std::chrono::seconds(3),[&]{ return !running_; }))
-                break;
-        }
-    }
-}
-
-void
-PeerDiscovery::listener_thread(PeerDiscoveredCallback callback)
+PeerDiscovery::DomainPeerDiscovery::listenerpack_thread()
 {
    int stopfds_pipe[2];
 #ifndef _WIN32
-    auto status = pipe(stopfds_pipe);
-    if (status == -1) {
+    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) {
+    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(sockfd_ > stop_readfd ? sockfd_ + 1 : stop_readfd + 1, &readfds, nullptr, nullptr, nullptr);
+        int data_coming = select(std::max(sockfd_, stop_readfd) + 1, &readfds, nullptr, nullptr, nullptr);

        {
-            std::unique_lock<std::mutex> lck(mtx_);
-            if (not running_)
+            std::lock_guard<std::mutex> lck(dmtx_);
+            if (not drunning_)
                break;
        }

@@ -249,35 +326,35 @@ PeerDiscovery::listener_thread(PeerDiscoveredCallback callback)
                perror("Select Error");
                std::this_thread::sleep_for( std::chrono::seconds(1) );
            }
-        }
-
-        if (data_coming > 0) {
-
-            if(FD_ISSET(stop_readfd, &readfds)){ break; }
-
-            std::array<uint8_t,dht::InfoHash::size() + sizeof(in_port_t)> data_receive;
-            size_t data_receive_size = data_receive.size();
-            auto from = recvFrom(data_receive.data(), data_receive_size);
-
-            //Data_receive_size as a value-result member will hlep to filter packs
-            if(data_receive_size != data_receive.size()){
-                perror("Data Received Unmatch");
-                continue;
+        } 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);
            }

-            std::array<uint8_t,dht::InfoHash::size()> data_infohash;
-            uint8_t data_port[2];
+            try {
+                auto rcv = recvFrom();
+                msgpack::object obj = rcv.second.get();

-            memcpy (data_infohash.data(), data_receive.data(), dht::InfoHash::size());
-            data_port[0] = data_receive[dht::InfoHash::size()];
-            data_port[1] = data_receive[dht::InfoHash::size() + 1];
-
-            auto port = PeerDiscovery::litendtoint(data_port);
-            auto nodeId = dht::InfoHash(data_infohash.data(), dht::InfoHash::size());
-
-            if (nodeId != nodeId_){
-                from.setPort(port);
-                callback(nodeId, from);
+                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;
            }
        }
    }
@@ -290,32 +367,207 @@ PeerDiscovery::listener_thread(PeerDiscoveredCallback callback)
 }

 void
-PeerDiscovery::startDiscovery(PeerDiscoveredCallback callback)
+PeerDiscovery::DomainPeerDiscovery::sender_setup()
 {
-    listener_setup();
-    running_listen = std::thread(&PeerDiscovery::listener_thread, this, callback);
+    // Setup sender address
+    sockAddrSend_.setFamily(domain_);
+    sockAddrSend_.setAddress(domain_ == AF_INET ? MULTICAST_ADDRESS_IPV4 : MULTICAST_ADDRESS_IPV6);
+    sockAddrSend_.setPort(port_);
 }

 void
-PeerDiscovery::startPublish(const dht::InfoHash &nodeId, in_port_t port_to_send)
+PeerDiscovery::DomainPeerDiscovery::startPublish(const std::string &type, const msgpack::sbuffer &pack_buf)
 {
-    sender_setup(nodeId, port_to_send);
-    running_send = std::thread(&PeerDiscovery::sender_thread, this);
+    //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()
 {
-    {
-        std::unique_lock<std::mutex> lck(mtx_);
-        running_ = false;
-    }
-    cv_.notify_one();
-    if (stop_writefd_ != -1) {
-        if (write(stop_writefd_, "\0", 1) == -1) {
-            perror("write");
-        }
+    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();
 }

 }
@@ -545,6 +545,7 @@ struct Dht::Search {
            if (a.value->id == vid)
                return a.value;
        }
+        return {};
    }

    bool cancelPut(Value::Id vid) {
@@ -54,9 +54,9 @@ SecureDht::SecureDht(std::unique_ptr<DhtInterface> dht, SecureDht::Config conf)
            CERTIFICATE_TYPE,
            *certificate_,
            1
-        }, [this](bool ok) {
+        }, [this, certId](bool ok) {
            if (ok)
-                DHT_LOG.DBG("SecureDht: public key announced successfully");
+                DHT_LOG.d(certId, "SecureDht: public key announced successfully");
        }, {}, true);
    }
 }
@@ -73,7 +73,7 @@ SecureDht::secureType(ValueType&& type)
                v->signatureValid = v->owner and v->owner->checkSignature(v->getToSign(), v->signature);
            }
            if (!v->signatureValid) {
-                DHT_LOG.WARN("Signature verification failed");
+                DHT_LOG.w("Signature verification failed");
                return false;
            }
        }
@@ -83,7 +83,7 @@ SecureDht::secureType(ValueType&& type)
        if (!o->isSigned())
            return type.editPolicy(id, o, n, nid, a);
        if (o->owner != n->owner) {
-            DHT_LOG.WARN("Edition forbidden: owner changed.");
+            DHT_LOG.w("Edition forbidden: owner changed.");
            return false;
        }
        if (!n->signatureChecked) {
@@ -91,14 +91,14 @@ SecureDht::secureType(ValueType&& type)
            n->signatureValid = o->owner and o->owner->checkSignature(n->getToSign(), n->signature);
        }
        if (!n->signatureValid) {
-            DHT_LOG.WARN("Edition forbidden: signature verification failed.");
+            DHT_LOG.w("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.WARN("Edition forbidden: sequence number must be increasing.");
+                DHT_LOG.w("Edition forbidden: sequence number must be increasing.");
                return false;
            }
        }
@@ -144,7 +144,7 @@ SecureDht::registerCertificate(const InfoHash& node, const Blob& data)
    }
    InfoHash h = crt->getPublicKey().getId();
    if (node == h) {
-        DHT_LOG.DBG("Registering certificate for %s", h.toString().c_str());
+        DHT_LOG.d("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 +152,7 @@ SecureDht::registerCertificate(const InfoHash& node, const Blob& data)
            it->second = std::move(crt);
        return it->second;
    } else {
-        DHT_LOG.WARN("Certificate %s for node %s does not match node id !", h.toString().c_str(), node.toString().c_str());
+        DHT_LOG.w("Certificate %s for node %s does not match node id !", h.toString().c_str(), node.toString().c_str());
        return nullptr;
    }
 }
@@ -169,7 +169,7 @@ SecureDht::findCertificate(const InfoHash& node, const std::function<void(const
 {
    Sp<crypto::Certificate> b = getCertificate(node);
    if (b && *b) {
-        DHT_LOG.DBG("Using certificate from cache for %s", node.toString().c_str());
+        DHT_LOG.d("Using certificate from cache for %s", node.toString().c_str());
        if (cb)
            cb(b);
        return;
@@ -177,7 +177,7 @@ SecureDht::findCertificate(const InfoHash& node, const std::function<void(const
    if (localQueryMethod_) {
        auto res = localQueryMethod_(node);
        if (not res.empty()) {
-            DHT_LOG.DBG("Registering certificate from local store for %s", node.toString().c_str());
+            DHT_LOG.d("Registering certificate from local store for %s", node.toString().c_str());
            nodesCertificates_.emplace(node, res.front());
            if (cb)
                cb(res.front());
@@ -192,7 +192,7 @@ SecureDht::findCertificate(const InfoHash& node, const std::function<void(const
        for (const auto& v : vals) {
            if (auto cert = registerCertificate(node, v->data)) {
                *found = true;
-                DHT_LOG.DBG("Found certificate for %s", node.toString().c_str());
+                DHT_LOG.d("Found certificate for %s", node.toString().c_str());
                if (cb)
                    cb(cert);
                return false;
@@ -210,7 +210,7 @@ SecureDht::findPublicKey(const InfoHash& node, const std::function<void(const Sp
 {
    auto pk = getPublicKey(node);
    if (pk && *pk) {
-        DHT_LOG.DBG("Found public key from cache for %s", node.toString().c_str());
+        DHT_LOG.d("Found public key from cache for %s", node.toString().c_str());
        if (cb)
            cb(pk);
        return;
@@ -254,7 +254,7 @@ SecureDht::checkValue(const Sp<Value>& v)
            }
            // Ignore values belonging to other people
        } catch (const std::exception& e) {
-            DHT_LOG.WARN("Could not decrypt value %s : %s", v->toString().c_str(), e.what());
+            DHT_LOG.w("Could not decrypt value %s : %s", v->toString().c_str(), e.what());
        }
    }
    // Check signed values
@@ -269,7 +269,7 @@ SecureDht::checkValue(const Sp<Value>& v)
            return v;
        }
        else
-            DHT_LOG.WARN("Signature verification failed for %s", v->toString().c_str());
+            DHT_LOG.w("Signature verification failed for %s", v->toString().c_str());
    }
    // Forward normal values
    else {
@@ -352,12 +352,12 @@ SecureDht::putSigned(const InfoHash& hash, Sp<Value> val, DoneCallback callback,
    // Check if data already exists on the dht
    get(hash,
        [val,this] (const std::vector<Sp<Value>>& vals) {
-            DHT_LOG.DBG("Found online previous value being announced.");
+            DHT_LOG.d("Found online previous value being announced.");
            for (const auto& v : vals) {
                if (!v->isSigned())
-                    DHT_LOG.ERR("Existing non-signed value seems to exists at this location.");
+                    DHT_LOG.e("Existing non-signed value seems to exists at this location.");
                else if (not v->owner or v->owner->getId() != getId())
-                    DHT_LOG.ERR("Existing signed value belonging to someone else seems to exists at this location.");
+                    DHT_LOG.e("Existing signed value belonging to someone else seems to exists at this location.");
                else if (val->seq <= v->seq)
                    val->seq = v->seq + 1;
            }
@@ -381,11 +381,11 @@ SecureDht::putEncrypted(const InfoHash& hash, const InfoHash& to, Sp<Value> val,
                callback(false, {});
            return;
        }
-        DHT_LOG.WARN("Encrypting data for PK: %s", pk->getId().toString().c_str());
+        DHT_LOG.w("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.ERR("Error putting encrypted data: %s", e.what());
+            DHT_LOG.e("Error putting encrypted data: %s", e.what());
            if (callback)
                callback(false, {});
        }
@@ -21,7 +21,7 @@

 #include <atomic>
 #include <thread>
-
+#include <iostream>
 #include <ciso646> // fix windows compiler bug

 namespace dht {
@@ -97,6 +97,7 @@ ThreadPool::run(std::function<void()>&& cb)
                        task();
                } catch (const std::exception& e) {
                    // LOG_ERR("Exception running task: %s", e.what());
+                    std::cerr << "Exception running task: " << e.what() << std::endl;
                }
            }
        });
@@ -131,4 +132,44 @@ ThreadPool::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();
+    }
+}
+
 }
@@ -16,6 +16,10 @@
 *  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"
@@ -25,10 +29,18 @@
 #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())
@@ -71,7 +71,7 @@ DhtRunnerTester::testListen() {
    auto a = dht::InfoHash::get("234");
    auto b = dht::InfoHash::get("2345");
    auto c = dht::InfoHash::get("23456");
-    constexpr unsigned N = 64;
+    constexpr unsigned N = 32;

    auto ftokena = node1.listen(a, [&](const std::shared_ptr<dht::Value>&) {
        valueCount++;
@@ -114,18 +114,21 @@ DhtRunnerTester::testListen() {
        CPPUNIT_ASSERT_EQUAL(N * 2u, putOkCount);
    }

+    CPPUNIT_ASSERT(ftokena.valid());
+    CPPUNIT_ASSERT(ftokenb.valid());
+    CPPUNIT_ASSERT(ftokenc.valid());
+
    auto tokena = ftokena.get();
-    auto tokenb = ftokenb.get();
    auto tokenc = ftokenc.get();
+    // tokenb might be 0 since the callback returns false.

    CPPUNIT_ASSERT(tokena);
-    CPPUNIT_ASSERT(tokenb);
    CPPUNIT_ASSERT(tokenc);
    CPPUNIT_ASSERT_EQUAL(N + 1u, valueCount.load());

    node1.cancelListen(a, tokena);
-    node1.cancelListen(b, tokena);
-    node1.cancelListen(c, tokena);
+    node1.cancelListen(b, std::move(ftokenb));
+    node1.cancelListen(c, tokenc);
 }

 }  // namespace test
@@ -18,77 +18,95 @@
 */

 #include "peerdiscoverytester.h"
+#include "opendht/value.h"

 namespace test {

+struct NodeInsertion {
+    dht::InfoHash nodeid;
+    in_port_t node_port;
+    dht::NetId nid;
+    MSGPACK_DEFINE(nodeid, node_port, nid)
+};
+
+struct TestPack {
+    int num;
+    char cha;
+    std::string str;
+    MSGPACK_DEFINE(num, cha, str)
+};
+
 CPPUNIT_TEST_SUITE_REGISTRATION(PeerDiscoveryTester);

 void PeerDiscoveryTester::setUp(){}

-void PeerDiscoveryTester::testTransmission_ipv4(){
-
+void PeerDiscoveryTester::testTransmission()
+{
    // Node for getnode id
-    dht::InfoHash data_n = dht::InfoHash::get("applepin");
-    int port = 2222;
-    in_port_t port_n = 50000;
-    try{
-        dht::PeerDiscovery test_n(AF_INET, port);
-        dht::PeerDiscovery test_s(AF_INET, port);
-        try{
-            test_s.startDiscovery([&](const dht::InfoHash& node, const dht::SockAddr& addr){
-                CPPUNIT_ASSERT_EQUAL(data_n, node);
-                CPPUNIT_ASSERT_EQUAL(port_n, addr.getPort());
-            });
+    const std::string type {"dht"};
+    const std::string test_type {"pdd"};
+    constexpr int MULTICAST_PORT = 2222;

-            test_n.startPublish(data_n,port_n);
+    NodeInsertion adc;
+    adc.nid = 10;
+    adc.node_port = 50000;
+    adc.nodeid = dht::InfoHash::get("applepin");

-            sleep(5);
-            test_n.stop();
-            test_s.stop();
-            test_n.join();
-            test_s.join();
-        } catch(std::exception &exception){
-            perror(exception.what());
-            CPPUNIT_ASSERT(false);
-        }
-    } catch(std::exception &exception){
-            perror(exception.what());
+    TestPack pdd;
+    pdd.num = 100;
+    pdd.cha = 'a';
+    pdd.str = "apple";
+
+    std::mutex lock;
+    std::condition_variable cv;
+    unsigned count_node {0};
+    unsigned count_test {0};
+
+    {
+        std::unique_lock<std::mutex> l(lock);
+        dht::PeerDiscovery test_n(MULTICAST_PORT);
+        dht::PeerDiscovery test_s(MULTICAST_PORT);
+
+        test_s.startDiscovery<NodeInsertion>(type,[&](NodeInsertion&& v, dht::SockAddr&& add){
+            CPPUNIT_ASSERT_EQUAL(adc.node_port, v.node_port);
+            CPPUNIT_ASSERT_EQUAL(adc.nodeid, v.nodeid);
+            CPPUNIT_ASSERT_EQUAL(adc.nid, v.nid);
+            {
+                std::lock_guard<std::mutex> l(lock);
+                count_node++;
+            }
+            cv.notify_all();
+        });
+
+        test_s.startDiscovery(test_type,[&](msgpack::object&& obj, dht::SockAddr&& add){
+            auto v = obj.as<TestPack>();
+            CPPUNIT_ASSERT_EQUAL(pdd.num, v.num);
+            CPPUNIT_ASSERT_EQUAL(pdd.cha, v.cha);
+            CPPUNIT_ASSERT_EQUAL(pdd.str, v.str);
+            {
+                std::lock_guard<std::mutex> l(lock);
+                count_test++;
+            }
+            cv.notify_all();
+        });
+
+        test_n.startPublish(type, adc);
+        CPPUNIT_ASSERT(cv.wait_for(l, std::chrono::seconds(5), [&]{
+            return count_node > 0;
+        }));
+
+        test_n.startPublish(test_type, pdd);
+        CPPUNIT_ASSERT(cv.wait_for(l, std::chrono::seconds(5), [&]{
+            return count_node > 1 and count_test > 0;
+        }));
+        l.unlock();
+        test_n.stopPublish(type);
+        test_n.stopPublish(test_type);
+        test_s.stopDiscovery(type);
+        test_s.stopDiscovery(test_type);
    }
 }

-void PeerDiscoveryTester::testTransmission_ipv6(){
-
-    // Node for getnode id
-    dht::InfoHash data_n = dht::InfoHash::get("applepin");
-    int port = 3333;
-    in_port_t port_n = 50001;
-    try{
-        dht::PeerDiscovery test_n(AF_INET6,port);
-        dht::PeerDiscovery test_s(AF_INET6,port);
-
-        try{
-            test_s.startDiscovery([&](const dht::InfoHash& node, const dht::SockAddr& addr){
-                CPPUNIT_ASSERT_EQUAL(data_n, node);
-                CPPUNIT_ASSERT_EQUAL(port_n, addr.getPort());
-            });
-
-            test_n.startPublish(data_n,port_n);
-
-            sleep(5);
-            test_n.stop();
-            test_s.stop();
-            test_n.join();
-            test_s.join();
-        } catch(std::exception &exception){
-            perror(exception.what());
-            CPPUNIT_ASSERT(false);
-        }
-    } catch(std::exception &exception){
-            perror(exception.what());
-    }
-
-}
-
 void PeerDiscoveryTester::tearDown(){}

 }  // namespace test
@@ -26,11 +26,10 @@

 namespace test {

-class PeerDiscoveryTester : public CppUnit::TestFixture {
+class OPENDHT_PUBLIC PeerDiscoveryTester : public CppUnit::TestFixture {

    CPPUNIT_TEST_SUITE(PeerDiscoveryTester);
-    CPPUNIT_TEST(testTransmission_ipv4);
-    CPPUNIT_TEST(testTransmission_ipv6);
+    CPPUNIT_TEST(testTransmission);
    CPPUNIT_TEST_SUITE_END();

 public:
@@ -45,12 +44,7 @@ class PeerDiscoveryTester : public CppUnit::TestFixture {
    /**
     * Test Multicast Transmission Ipv4
     */
-    void testTransmission_ipv4();
-    /**
-     * Test Multicast Transmission Ipv6
-     */
-    void testTransmission_ipv6();
-
+    void testTransmission();
 };

 }  // namespace test
@@ -0,0 +1,90 @@
+/*
+ *  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 "threadpooltester.h"
+
+#include "opendht/thread_pool.h"
+#include <atomic>
+
+namespace test {
+CPPUNIT_TEST_SUITE_REGISTRATION(ThreadPoolTester);
+using clock = std::chrono::steady_clock;
+
+void
+ThreadPoolTester::setUp() {
+
+}
+
+void
+ThreadPoolTester::testThreadPool() {
+    dht::ThreadPool pool(16);
+
+    constexpr unsigned N = 64 * 1024;
+    std::atomic_uint count {0};
+    for (unsigned i=0; i<N; i++)
+        pool.run([&] {
+            count++;
+        });
+
+    auto start = clock::now();
+    while (count.load() != N && clock::now() - start < std::chrono::seconds(10))
+        std::this_thread::sleep_for(std::chrono::milliseconds(10));
+
+    pool.join();
+    CPPUNIT_ASSERT(count.load() == N);
+}
+
+void
+ThreadPoolTester::testExecutor()
+{
+    dht::ThreadPool pool(8);
+    auto executor1 = std::make_shared<dht::Executor>(pool, 1);
+    auto executor4 = std::make_shared<dht::Executor>(pool, 4);
+    auto executor8 = std::make_shared<dht::Executor>(pool, 8);
+
+    constexpr unsigned N = 64 * 1024;
+    std::atomic_uint count1 {0};
+    std::atomic_uint count4 {0};
+    std::atomic_uint count8 {0};
+    for (unsigned i=0; i<N; i++) {
+        executor1->run([&] { count1++; });
+        executor4->run([&] { count4++; });
+        executor8->run([&] { count8++; });
+    }
+
+    auto start = clock::now();
+    while ((count1.load() != N ||
+            count4.load() != N ||
+            count8.load() != N) && clock::now() - start < std::chrono::seconds(20))
+    {
+        std::this_thread::sleep_for(std::chrono::milliseconds(10));
+    }
+    executor1.reset();
+    executor4.reset();
+    executor8.reset();
+    CPPUNIT_ASSERT_EQUAL(N, count1.load());
+    CPPUNIT_ASSERT_EQUAL(N, count4.load());
+    CPPUNIT_ASSERT_EQUAL(N, count8.load());
+}
+
+void
+ThreadPoolTester::tearDown() {
+}
+
+}  // namespace test
@@ -0,0 +1,48 @@
+/*
+ *  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 ThreadPoolTester : public CppUnit::TestFixture {
+    CPPUNIT_TEST_SUITE(ThreadPoolTester);
+    CPPUNIT_TEST(testThreadPool);
+    CPPUNIT_TEST(testExecutor);
+    CPPUNIT_TEST_SUITE_END();
+
+ public:
+    /**
+     * Method automatically called before each test by CppUnit
+     */
+    void setUp();
+    /**
+     * Method automatically called after each test CppUnit
+     */
+    void tearDown();
+
+    void testThreadPool();
+    void testExecutor();
+};
+
+}  // namespace test
@@ -29,24 +29,39 @@ extern "C" {

 using namespace dht;

-void print_usage() {
-    std::cout << "Usage: dhtnode [-v [-l logfile]] [-i] [-d] [-n network_id] [-p local_port] [-b bootstrap_host[:port]] [--proxyserver local_port]" << std::endl << std::endl;
+void print_info() {
    std::cout << "dhtnode, a simple OpenDHT command line node runner." << std::endl;
    std::cout << "Report bugs to: https://opendht.net" << std::endl;
 }

+void print_version() {
+    std::cout << "OpenDHT version " << dht::version() << std::endl;
+    print_info();
+}
+
+void print_usage() {
+    std::cout << "Usage: dhtnode [-v [-l logfile]] [-i] [-d] [-n network_id] [-p local_port] [-b bootstrap_host[:port]] [--proxyserver local_port]" << std::endl << std::endl;
+    print_info();
+}
+
 void print_id_req() {
    std::cout << "An identity is required to perform this operation (run with -i)" << std::endl;
 }

-void print_node_info(const std::shared_ptr<DhtRunner>& dht, const dht_params& params) {
-    std::cout << "OpenDht node " << dht->getNodeId() << " running on port " <<  dht->getBoundPort() << std::endl;
+void print_node_info(const std::shared_ptr<DhtRunner>& node, const dht_params& params) {
+    std::cout << "OpenDHT node " << node->getNodeId() << " running on ";
+    auto port4 = node->getBoundPort(AF_INET);
+    auto port6 = node->getBoundPort(AF_INET6);
+    if (port4 == port6)
+        std::cout << "port " << port4 << std::endl;
+    else
+        std::cout << "IPv4 port " << port4 << ", IPv6 port " << port6 << std::endl;
    if (params.generate_identity)
-        std::cout << "Public key ID " << dht->getId() << std::endl;
+        std::cout << "Public key ID " << node->getId() << std::endl;
 }

 void print_help() {
-    std::cout << "OpenDht command line interface (CLI)" << std::endl;
+    std::cout << "OpenDHT command line interface (CLI)" << std::endl;
    std::cout << "Possible commands:" << std::endl
              << "  h, help    Print this help message." << std::endl
              << "  x, quit    Quit the program." << std::endl
@@ -101,13 +116,13 @@ void print_help() {
 #endif
 }

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

 #ifndef WIN32_NATIVE
@@ -136,11 +151,11 @@ void cmd_loop(std::shared_ptr<DhtRunner>& dht, dht_params& params
            print_help();
            continue;
        } else if (op == "ll") {
-            print_node_info(dht, params);
+            print_node_info(node, params);
            std::cout << "IPv4 stats:" << std::endl;
-            std::cout << dht->getNodesStats(AF_INET).toString() << std::endl;
+            std::cout << node->getNodesStats(AF_INET).toString() << std::endl;
            std::cout << "IPv6 stats:" << std::endl;
-            std::cout << dht->getNodesStats(AF_INET6).toString() << std::endl;
+            std::cout << node->getNodesStats(AF_INET6).toString() << std::endl;
 #ifdef OPENDHT_PROXY_SERVER
            for (const auto& proxy : proxies) {
                std::cout << "Stats for proxy on port " << proxy.first << std::endl;
@@ -150,29 +165,29 @@ void cmd_loop(std::shared_ptr<DhtRunner>& dht, dht_params& params
            continue;
        } else if (op == "lr") {
            std::cout << "IPv4 routing table:" << std::endl;
-            std::cout << dht->getRoutingTablesLog(AF_INET) << std::endl;
+            std::cout << node->getRoutingTablesLog(AF_INET) << std::endl;
            std::cout << "IPv6 routing table:" << std::endl;
-            std::cout << dht->getRoutingTablesLog(AF_INET6) << std::endl;
+            std::cout << node->getRoutingTablesLog(AF_INET6) << std::endl;
            continue;
        } else if (op == "ld") {
            iss >> idstr;
            InfoHash filter(idstr);
            if (filter)
-                std::cout << dht->getStorageLog(filter) << std::endl;
+                std::cout << node->getStorageLog(filter) << std::endl;
            else
-                std::cout << dht->getStorageLog() << std::endl;
+                std::cout << node->getStorageLog() << std::endl;
            continue;
        } else if (op == "ls") {
            iss >> idstr;
            InfoHash filter(idstr);
            if (filter)
-                std::cout << dht->getSearchLog(filter) << std::endl;
+                std::cout << node->getSearchLog(filter) << std::endl;
            else
-                std::cout << dht->getSearchesLog() << std::endl;
+                std::cout << node->getSearchesLog() << std::endl;
            continue;
        } else if (op == "la")  {
            std::cout << "Reported public addresses:" << std::endl;
-            auto addrs = dht->getPublicAddressStr();
+            auto addrs = node->getPublicAddressStr();
            for (const auto& addr : addrs)
                std::cout << addr << std::endl;
            continue;
@@ -182,7 +197,7 @@ void cmd_loop(std::shared_ptr<DhtRunner>& dht, dht_params& params
                auto addr = splitPort(idstr);
                if (not addr.first.empty() and addr.second.empty())
                    addr.second = std::to_string(DHT_DEFAULT_PORT);
-                dht->bootstrap(addr.first.c_str(), addr.second.c_str());
+                node->bootstrap(addr.first.c_str(), addr.second.c_str());
            } catch (const std::exception& e) {
                std::cerr << e.what() << std::endl;
            }
@@ -190,15 +205,15 @@ void cmd_loop(std::shared_ptr<DhtRunner>& dht, dht_params& params
        } else if (op == "log") {
            iss >> idstr;
            InfoHash filter(idstr);
-            params.log = filter == InfoHash{} ? !params.log : true;
+            params.log = filter ? true : !params.log;
            if (params.log)
-                log::enableLogging(*dht);
+                log::enableLogging(*node);
            else
-                log::disableLogging(*dht);
-            dht->setLogFilter(filter);
+                log::disableLogging(*node);
+            node->setLogFilter(filter);
            continue;
        } else if (op == "cc") {
-            dht->connectivityChanged();
+            node->connectivityChanged();
            continue;
        }
 #ifdef OPENDHT_PROXY_SERVER
@@ -211,9 +226,9 @@ void cmd_loop(std::shared_ptr<DhtRunner>& dht, dht_params& params
            try {
                unsigned int port = std::stoi(idstr);
 #ifdef OPENDHT_PUSH_NOTIFICATIONS
-                proxies.emplace(port, std::unique_ptr<DhtProxyServer>(new DhtProxyServer(dht, port, pushServer)));
+                proxies.emplace(port, std::unique_ptr<DhtProxyServer>(new DhtProxyServer(node, port, pushServer)));
 #else
-                proxies.emplace(port, std::unique_ptr<DhtProxyServer>(new DhtProxyServer(dht, port)));
+                proxies.emplace(port, std::unique_ptr<DhtProxyServer>(new DhtProxyServer(node, port)));
 #endif // OPENDHT_PUSH_NOTIFICATIONS
            } catch (...) { }
            continue;
@@ -229,16 +244,16 @@ void cmd_loop(std::shared_ptr<DhtRunner>& dht, dht_params& params
 #endif //OPENDHT_PROXY_SERVER
 #ifdef OPENDHT_PROXY_CLIENT
        else if (op == "stt") {
-            dht->enableProxy(true);
+            node->enableProxy(true);
            continue;
        } else if (op == "stp") {
-            dht->enableProxy(false);
+            node->enableProxy(false);
            continue;
        }
 #ifdef OPENDHT_PUSH_NOTIFICATIONS
        else if (op == "rp") {
            iss >> value;
-            dht->pushNotificationReceived({{"to", "dhtnode"}, {"token", value}});
+            node->pushNotificationReceived({{"to", "dhtnode"}, {"token", value}});
            continue;
        }
 #endif // OPENDHT_PUSH_NOTIFICATIONS
@@ -275,7 +290,7 @@ void cmd_loop(std::shared_ptr<DhtRunner>& dht, dht_params& params
                    std::transform(key.begin(), key.end(), std::inserter(ks, ks.end()), [](Pht::Key::value_type& f) {
                        return std::make_pair(f.first, f.second.size());
                    });
-                    indexes.emplace(index, Pht {index, std::move(ks), dht});
+                    indexes.emplace(index, Pht {index, std::move(ks), node});
                } catch (std::invalid_argument& e) { std::cout << e.what() << std::endl; }
            }
        }
@@ -299,35 +314,36 @@ void cmd_loop(std::shared_ptr<DhtRunner>& dht, dht_params& params
        if (op == "g") {
            std::string rem;
            std::getline(iss, rem);
-            dht->get(id, [start](std::shared_ptr<Value> value) {
+            node->get(id, [start](const std::vector<std::shared_ptr<Value>>& values) {
                auto now = std::chrono::high_resolution_clock::now();
-                std::cout << "Get: found value (after " << print_dt(now-start) << "s)" << std::endl;
-                std::cout << "\t" << *value << std::endl;
+                std::cout << "Get: found " << values.size() << " value(s) after " << print_duration(now-start) << std::endl;
+                for (const auto& value : values)
+                    std::cout << "\t" << *value << std::endl;
                return true;
            }, [start](bool ok) {
                auto end = std::chrono::high_resolution_clock::now();
-                std::cout << "Get: " << (ok ? "completed" : "failure") << " (took " << print_dt(end-start) << "s)" << std::endl;
+                std::cout << "Get: " << (ok ? "completed" : "failure") << ", took " << print_duration(end-start) << std::endl;
            }, {}, dht::Where {rem});
        }
        else if (op == "q") {
            std::string rem;
            std::getline(iss, rem);
-            dht->query(id, [start](const std::vector<std::shared_ptr<FieldValueIndex>>& field_value_indexes) {
+            node->query(id, [start](const std::vector<std::shared_ptr<FieldValueIndex>>& field_value_indexes) {
                auto now = std::chrono::high_resolution_clock::now();
                for (auto& index : field_value_indexes) {
-                    std::cout << "Query: found field value index (after " << print_dt(now-start) << "s)" << std::endl;
+                    std::cout << "Query: found field value index after " << print_duration(now-start) << std::endl;
                    std::cout << "\t" << *index << std::endl;
                }
                return true;
            }, [start](bool ok) {
                auto end = std::chrono::high_resolution_clock::now();
-                std::cout << "Query: " << (ok ? "completed" : "failure") << " (took " << print_dt(end-start) << "s)" << std::endl;
+                std::cout << "Query: " << (ok ? "completed" : "failure") << ", took " << print_duration(end-start) << std::endl;
            }, dht::Query {rem});
        }
        else if (op == "l") {
            std::string rem;
            std::getline(iss, rem);
-            auto token = dht->listen(id, [](const std::vector<std::shared_ptr<Value>>& values, bool expired) {
+            auto token = node->listen(id, [](const std::vector<std::shared_ptr<Value>>& values, bool expired) {
                std::cout << "Listen: found " << values.size() << " values" << (expired ? " expired" : "") << std::endl;
                for (const auto& value : values)
                    std::cout << "\t" << *value << std::endl;
@@ -346,17 +362,17 @@ void cmd_loop(std::shared_ptr<DhtRunner>& dht, dht_params& params
                std::cerr << "Syntax: cl [key] [token]" << std::endl;
                continue;
            }
-            dht->cancelListen(id, token);
+            node->cancelListen(id, token);
        }
        else if (op == "p") {
            std::string v;
            iss >> v;
-            dht->put(id, dht::Value {
+            node->put(id, dht::Value {
                dht::ValueType::USER_DATA.id,
                std::vector<uint8_t> {v.begin(), v.end()}
            }, [start](bool ok) {
                auto end = std::chrono::high_resolution_clock::now();
-                std::cout << "Put: " << (ok ? "success" : "failure") << " (took " << print_dt(end-start) << "s)" << std::endl;
+                std::cout << "Put: " << (ok ? "success" : "failure") << ", took " << print_duration(end-start) << std::endl;
            });
        }
        else if (op == "pp") {
@@ -366,17 +382,17 @@ void cmd_loop(std::shared_ptr<DhtRunner>& dht, dht_params& params
                dht::ValueType::USER_DATA.id,
                std::vector<uint8_t> {v.begin(), v.end()}
            );
-            dht->put(id, value, [start,value](bool ok) {
+            node->put(id, value, [start,value](bool ok) {
                auto end = std::chrono::high_resolution_clock::now();
                auto flags(std::cout.flags());
-                std::cout << "Put: " << (ok ? "success" : "failure") << " (took " << print_dt(end-start) << "s). Value ID: " << std::hex << value->id << std::endl;
+                std::cout << "Put: " << (ok ? "success" : "failure") << ", took " << print_duration(end-start) << ". Value ID: " << std::hex << value->id << std::endl;
                std::cout.flags(flags);
            }, time_point::max(), true);
        }
        else if (op == "cpp") {
            std::string rem;
            iss >> rem;
-            dht->cancelPut(id, std::stoul(rem, nullptr, 16));
+            node->cancelPut(id, std::stoul(rem, nullptr, 16));
        }
        else if (op == "s") {
            if (not params.generate_identity) {
@@ -385,12 +401,12 @@ void cmd_loop(std::shared_ptr<DhtRunner>& dht, dht_params& params
            }
            std::string v;
            iss >> v;
-            dht->putSigned(id, dht::Value {
+            node->putSigned(id, dht::Value {
                dht::ValueType::USER_DATA.id,
                std::vector<uint8_t> {v.begin(), v.end()}
            }, [start](bool ok) {
                auto end = std::chrono::high_resolution_clock::now();
-                std::cout << "Put signed: " << (ok ? "success" : "failure") << " (took " << print_dt(end-start) << "s)" << std::endl;
+                std::cout << "Put signed: " << (ok ? "success" : "failure") << " (took " << print_duration(end-start) << "s)" << std::endl;
            });
        }
        else if (op == "e") {
@@ -401,20 +417,20 @@ void cmd_loop(std::shared_ptr<DhtRunner>& dht, dht_params& params
            std::string tostr;
            std::string v;
            iss >> tostr >> v;
-            dht->putEncrypted(id, InfoHash(tostr), dht::Value {
+            node->putEncrypted(id, InfoHash(tostr), dht::Value {
                dht::ValueType::USER_DATA.id,
                std::vector<uint8_t> {v.begin(), v.end()}
            }, [start](bool ok) {
                auto end = std::chrono::high_resolution_clock::now();
-                std::cout << "Put encrypted: " << (ok ? "success" : "failure") << " (took " << print_dt(end-start) << "s)" << std::endl;
+                std::cout << "Put encrypted: " << (ok ? "success" : "failure") << " (took " << print_duration(end-start) << std::endl;
            });
        }
        else if (op == "a") {
            in_port_t port;
            iss >> port;
-            dht->put(id, dht::Value {dht::IpServiceAnnouncement::TYPE.id, dht::IpServiceAnnouncement(port)}, [start](bool ok) {
+            node->put(id, dht::Value {dht::IpServiceAnnouncement::TYPE.id, dht::IpServiceAnnouncement(port)}, [start](bool ok) {
                auto end = std::chrono::high_resolution_clock::now();
-                std::cout << "Announce: " << (ok ? "success" : "failure") << " (took " << print_dt(end-start) << "s)" << std::endl;
+                std::cout << "Announce: " << (ok ? "success" : "failure") << " (took " << print_duration(end-start) << std::endl;
            });
        }
 #ifdef OPENDHT_INDEXATION
@@ -437,7 +453,7 @@ void cmd_loop(std::shared_ptr<DhtRunner>& dht, dht_params& params
                    [start](bool ok) {
                        auto end = std::chrono::high_resolution_clock::now();
                        std::cout << "Pht::lookup: " << (ok ? "done." : "failed.")
-                                  << " took " << print_dt(end-start) << "s)" << std::endl;
+                                  << " took " << print_duration(end-start) << std::endl;

                    }, exact_match.size() != 0 and exact_match == "false" ? false : true
                );
@@ -475,22 +491,25 @@ main(int argc, char **argv)
 #ifdef WIN32_NATIVE
    gnutls_global_init();
 #endif
+    auto params = parseArgs(argc, argv);
+    if (params.help) {
+        print_usage();
+        return 0;
+    }
+    if (params.version) {
+        print_version();
+        return 0;
+    }

-    auto dht = std::make_shared<DhtRunner>();
+    if (params.daemonize) {
+        daemonize();
+    } else if (params.service) {
+        setupSignals();
+    }
+
+    auto node = std::make_shared<DhtRunner>();

    try {
-        auto params = parseArgs(argc, argv);
-        if (params.help) {
-            print_usage();
-            return 0;
-        }
-
-        if (params.daemonize) {
-            daemonize();
-        } else if (params.service) {
-            setupSignals();
-        }
-
        dht::crypto::Identity crt {};
        if (params.generate_identity) {
            auto ca_tmp = dht::crypto::generateEcIdentity("DHT Node CA");
@@ -508,22 +527,23 @@ main(int argc, char **argv)
        config.peer_discovery = params.peer_discovery;
        config.peer_publish = params.peer_discovery;
        if (not params.proxyclient.empty())
-            dht->setPushNotificationToken(params.devicekey);
-
-        dht->run(params.port, config);
+            node->setPushNotificationToken(params.devicekey);

+        dht::DhtRunner::Context context {};
        if (params.log) {
            if (params.syslog or (params.daemonize and params.logfile.empty()))
-                log::enableSyslog(*dht, "dhtnode");
+                context.logger = log::getSyslogLogger("dhtnode");
            else if (not params.logfile.empty())
-                log::enableFileLogging(*dht, params.logfile);
+                context.logger = log::getFileLogger(params.logfile);
            else
-                log::enableLogging(*dht);
+                context.logger = log::getStdLogger();
        }

+        node->run(params.port, config, std::move(context));
+
        if (not params.bootstrap.first.empty()) {
            //std::cout << "Bootstrap: " << params.bootstrap.first << ":" << params.bootstrap.second << std::endl;
-            dht->bootstrap(params.bootstrap.first.c_str(), params.bootstrap.second.c_str());
+            node->bootstrap(params.bootstrap.first.c_str(), params.bootstrap.second.c_str());
        }

 #ifdef OPENDHT_PROXY_SERVER
@@ -531,7 +551,7 @@ main(int argc, char **argv)
 #endif
        if (params.proxyserver != 0) {
 #ifdef OPENDHT_PROXY_SERVER
-            proxies.emplace(params.proxyserver, std::unique_ptr<DhtProxyServer>(new DhtProxyServer(dht, params.proxyserver, params.pushserver)));
+            proxies.emplace(params.proxyserver, std::unique_ptr<DhtProxyServer>(new DhtProxyServer(node, params.proxyserver, params.pushserver)));
 #else
            std::cerr << "DHT proxy server requested but OpenDHT built without proxy server support." << std::endl;
            exit(EXIT_FAILURE);
@@ -541,7 +561,7 @@ main(int argc, char **argv)
        if (params.daemonize or params.service)
            while (runner.wait());
        else
-            cmd_loop(dht, params
+            cmd_loop(node, params
 #ifdef OPENDHT_PROXY_SERVER
                , proxies
 #endif
@@ -555,7 +575,7 @@ main(int argc, char **argv)
    std::mutex m;
    std::atomic_bool done {false};

-    dht->shutdown([&]()
+    node->shutdown([&]()
    {
        std::lock_guard<std::mutex> lk(m);
        done = true;
@@ -566,7 +586,7 @@ main(int argc, char **argv)
    std::unique_lock<std::mutex> lk(m);
    cv.wait(lk, [&](){ return done.load(); });

-    dht->join();
+    node->join();
 #ifdef WIN32_NATIVE
    gnutls_global_deinit();
 #endif
@@ -1 +1 @@
-DHT_ARGS=-b bootstrap.ring.cx -p 4222 -v
+DHT_ARGS=-b bootstrap.jami.net -p 4222 -v
@@ -1,13 +1,13 @@
 [Unit]
 Description=OpenDHT standalone node
 After=network.target
- 
+
 [Service]
 EnvironmentFile=@sysconfdir@/dhtnode.conf
-ExecStart=@bindir@/dhtnode -d $DHT_ARGS
+ExecStart=@bindir@/dhtnode -s $DHT_ARGS
 KillMode=process
 Restart=on-failure
-Type=forking
+Type=simple
 DynamicUser=yes

 [Install]
@@ -22,6 +22,7 @@
 #pragma once

 #include <opendht.h>
+#include <opendht/log.h>
 #ifndef WIN32_NATIVE
 #include <getopt.h>
 #include <readline/readline.h>
@@ -90,6 +91,7 @@ static const constexpr in_port_t DHT_DEFAULT_PORT = 4222;

 struct dht_params {
    bool help {false}; // print help and exit
+    bool version {false};
    bool log {false};
    std::string logfile {};
    bool syslog {false};
@@ -124,6 +126,7 @@ static const constexpr struct option long_options[] = {
   {"proxyclient",      required_argument, nullptr, 'C'},
   {"pushserver",       required_argument, nullptr, 'y'},
   {"devicekey",        required_argument, nullptr, 'z'},
+   {"version",          no_argument      , nullptr, 'V'},
   {nullptr,            0                , nullptr,  0}
 };

@@ -173,6 +176,9 @@ parseArgs(int argc, char **argv) {
                params.bootstrap.second = std::to_string(DHT_DEFAULT_PORT);
            }
            break;
+        case 'V':
+            params.version = true;
+            break;
        case 'h':
            params.help = true;
            break;
@@ -278,10 +284,6 @@ void daemonize()
        exit(EXIT_FAILURE);
    }

-    if ((chdir("/")) < 0) {
-        exit(EXIT_FAILURE);
-    }
-
    close(STDIN_FILENO);
    close(STDOUT_FILENO);
    close(STDERR_FILENO);
Author	SHA1	Message	Date
Adrien Béraud	941e53425f	update to version 1.9.5	2019-06-04 09:54:02 -04:00
Adrien Béraud	baf811bfe9	dhtrunner: don't override statusCallback if not provided	2019-05-31 19:29:59 -04:00
Adrien Béraud	76f0672e63	context: add statusCallback, certificateStore	2019-05-31 10:12:42 -04:00
Adrien Béraud	ff6be81929	peer discovery: add default port	2019-05-23 10:39:43 -04:00
Adrien Béraud	e4516772ee	dht: log cleanup	2019-05-22 11:20:27 -04:00
Adrien Béraud	c7e2483160	dht: add logger to constructor	2019-05-22 00:47:25 -04:00
Adrien Béraud	37b12c114d	dht: cleanup	2019-05-22 00:17:18 -04:00
MingruiZhangW	77bd34ad9c	Merge pull request #405 from savoirfairelinux/context dhtrunner: add context	2019-05-21 16:21:45 -04:00
Adrien Béraud	44490bd9ca	dhtrunner: add context	2019-05-21 13:43:55 -04:00
Adrien Béraud	ca01568824	dhtrunner: add API to access PeerDiscovery instance	2019-05-20 10:21:35 -04:00
Adrien Béraud	2b259639d2	peer discovery: fix occasional use-after-free in unit test	2019-05-20 10:21:26 -04:00
Adrien Béraud	84d322e428	peer discovery: check running before select	2019-05-20 10:21:26 -04:00
Sébastien Blin	d807af3951	Merge pull request #402 from MingruiZhangW/peerdiscovery_fix_bind peerdiscovery: bind socket problem fix	2019-05-16 17:19:02 -04:00
Mingrui Zhang	29003700db	peerdiscovery: fix the issue where bind() can be interrupted after calling publish() first	2019-05-15 15:42:32 -04:00
Sébastien Blin	b143bc459d	default_types: add metadatas map into ImMessage Give the ability to store more datas into an ImMessage Issue: #345	2019-05-03 14:54:43 -04:00
Adrien Béraud	4d6e5ab877	peer discovery: fix warning	2019-05-03 10:13:05 -04:00
Adrien Béraud	248d2e3f73	update to version 1.9.4	2019-05-02 12:44:27 -04:00
Adrien Béraud	0692bd9bc9	proxy server: fix warning when building without push notifications	2019-04-30 17:47:40 -04:00
Adrien Béraud	7f48c4808b	network engine: minor cleanup	2019-04-30 17:47:40 -04:00
Adrien Béraud	32a443a1d8	thread pool: add unit test	2019-04-30 17:47:40 -04:00
Adrien Béraud	6d0fcba3b5	thread pool: add Executor	2019-04-30 17:47:40 -04:00
Adrien Béraud	76e2efb19b	peerdiscovery: undef write macro after use	2019-04-26 11:50:25 -04:00
Adrien Béraud	bbe1b9233f	dhtrunner: use recv instead of recvfrom for stoppipe	2019-04-26 02:29:49 -04:00
Adrien Béraud	7558ca0dca	peerdiscovery: unit test cleanup	2019-04-26 02:29:49 -04:00
Adrien Béraud	38141322f1	peerdiscovery: stop threads when stopping services	2019-04-26 02:29:49 -04:00
Adrien Béraud	6c5ea125ca	peerdiscovery: add automatic template serialization	2019-04-26 02:29:49 -04:00
Adrien Béraud	d0362e58e0	dhtnode: update dht instance name Avoid confusion with the namespace	2019-04-25 23:33:22 -04:00
Adrien Béraud	1b3a40f345	dhtrunner: clear stop file descriptor if still running	2019-04-25 22:12:28 -04:00
Adrien Béraud	38d854e6f4	dhtrunner: read correct size from buffer	2019-04-25 22:11:20 -04:00
Adrien Béraud	e0241ccfbd	dhtrunner: drop older packets in batch	2019-04-25 22:10:46 -04:00
Adrien Béraud	d4311925b4	dhtrunner: shutdown: return if not running	2019-04-25 21:38:52 -04:00
Adrien Béraud	9aa56dd464	dhtnode/systemd: use simple service mode	2019-04-25 21:32:35 -04:00
Adrien Béraud	ec3b259ead	dhtnode/systemd: update default bootstrap	2019-04-25 21:18:11 -04:00
Adrien Béraud	332cab10ef	tools: don't chdir to / when deamonizing	2019-04-25 21:17:44 -04:00
Adrien Béraud	85f2b618c7	logs: use ofstream for file logging	2019-04-25 14:31:06 -04:00
Adrien Béraud	bcf18fda53	update to version 1.9.3	2019-04-25 11:10:42 -04:00
Adrien Béraud	6b78a4cad6	peerdiscovery: catch parsing errors	2019-04-25 10:25:36 -04:00
Adrien Béraud	66d3a8aeaa	dhtrunner: cleanup	2019-04-24 14:51:43 -04:00
Adrien Béraud	958cb250a3	dhtnode: show both IPv4, IPv6 bound ports	2019-04-23 12:13:53 -04:00
Adrien Béraud	6a5724a868	peerdiscovery: allow per-domain publish, cleanup	2019-04-23 12:09:08 -04:00
Adrien Béraud	11ac84de54	Merge pull request #392 from MingruiZhangW/peer_discovery_version_2 peerdiscovery: modify to add support for sending and receiving msgpack	2019-04-23 11:20:18 -04:00
MingruiZhangW	f65e8c1a1f	Merge branch 'master' into peer_discovery_version_2	2019-04-22 09:13:17 -04:00
Adrien Béraud	c2fdf6ae92	dhtnode: show grouped get results, improve duration display	2019-04-21 21:39:54 -04:00
Adrien Béraud	91a81f64ac	thread pool: make public	2019-04-21 21:39:54 -04:00
Adrien Béraud	17b772e6cc	proxy client: close all sockets before joining	2019-04-20 22:38:36 -04:00
Adrien Béraud	75738ac28b	proxy client: don't hold lock while calling callback	2019-04-20 22:07:48 -04:00
Adrien Béraud	84a2d771c1	dht: add some missing override	2019-04-20 22:07:48 -04:00
Adrien Béraud	f6273f9efc	tools/dhtnode: improve documentation	2019-04-20 17:30:39 -04:00
Adrien Béraud	5881c91510	utils: include config.h	2019-04-19 20:24:01 -04:00
Adrien Béraud	e09c55ca42	update to version 1.9.2	2019-04-19 16:15:56 -04:00
Andreas Traczyk	c737e4690e	update visual studio build	2019-04-19 15:53:42 -04:00
Adrien Béraud	35a9d1f612	proxy client: catch exception in Http::close()	2019-04-18 17:38:00 -04:00
Mingrui Zhang	0f3396cd66	peerdiscovery: make nested classes to hide ip versions	2019-04-18 12:20:17 -04:00
Mingrui Zhang	98cd6cc61e	peerdiscovery: fix memory leakage cased by sbuffer release	2019-04-18 10:20:00 -04:00
Mingrui Zhang	092cb9551e	peerdiscovery: add testpack into tester to verify the possibility of sending & receiving 2 packages simultaneously (including stop functions)	2019-04-18 09:33:15 -04:00
Mingrui Zhang	a2bbca792c	peerdiscovery: add dmtx_ to distinguish send & listen shared resources, add stopDiscovery, stoplisten to stop listen or discover certain type of service	2019-04-17 10:26:49 -04:00
Adrien Béraud	5ec72e213e	dht: add override	2019-04-17 10:00:15 -04:00
Mingrui Zhang	0f51115f44	peerdiscovery: modify maps to handle more services in one instance	2019-04-16 15:11:07 -04:00
Adrien Béraud	683a111726	autotools: build versioned shared library	2019-04-16 12:23:32 -04:00
Adrien Béraud	0fd4fed537	search: add fallback return	2019-04-16 12:23:32 -04:00
Mingrui Zhang	18aa6ddb7b	peerdiscovery: modify function signatures to make service consistent	2019-04-15 18:24:15 -04:00
Mingrui Zhang	0a436e17b0	peerdiscovery: modifications on tester fit for the updates	2019-04-15 17:26:59 -04:00
Mingrui Zhang	763ffddf51	peerdiscovery: modify to add support for sending and receiving msgpack	2019-04-15 16:50:48 -04:00
Adrien Béraud	ef82652a1e	network: header cleanup	2019-04-14 11:30:10 -04:00
Adrien Béraud	4f03a5c64e	network: tid, socket_id, value_id: default to 0	2019-04-14 09:15:16 -04:00
Adrien Béraud	5257ac314f	add API to retrieve version string	2019-04-14 00:19:01 -04:00
Adrien Béraud	0580a4e7dd	update to version 1.9.1	2019-04-13 23:29:43 -04:00
Yanfei Han	fd1f2cd0e4	add peer_discovery.o object into auto configure lib	2019-04-13 23:04:18 -04:00
Adrien Béraud	af940c63b1	proxy: mute unused variable warning if disabled	2019-04-13 23:02:57 -04:00
Adrien Béraud	15da502354	dhtrunner: make peer discovery port static constexpr	2019-04-13 22:56:31 -04:00
Adrien Béraud	b7a9a52f97	network engine: DhtProtocolException cleanup	2019-04-13 22:56:31 -04:00
Adrien Béraud	6e10756e28	peerdiscovery: cleanup	2019-04-13 22:56:31 -04:00
Adrien Béraud	aad4ad03cf	network utils: add missing includes	2019-04-13 22:56:31 -04:00
Adrien Béraud	3d1e055c7b	peerdiscovery: always use local node id	2019-04-13 20:50:00 -04:00
Adrien Béraud	b02e9cfff7	peerdiscovery: flush stop socket if not stopping	2019-04-13 20:50:00 -04:00
Adrien Béraud	453db29058	dht: add override to getNodeId	2019-04-13 20:43:57 -04:00
Adrien Béraud	a8ba536d44	update to version 1.9.0	2019-04-09 16:25:39 -04:00
Adrien Béraud	a238183031	peerdiscovery: don't assign IPv6 multicast interface	2019-04-09 16:11:21 -04:00
Adrien Béraud	73827cd34d	peerdiscovery: allow IPV6_MULTICAST_IF failure	2019-04-09 15:12:37 -04:00
Adrien Béraud	876190a392	peerdiscovery: SO_REUSEADDR, SO_REUSEPORT in different calls	2019-04-09 14:58:22 -04:00
Adrien Béraud	7fe321e4fc	peerdiscovery: cleanup data serialization	2019-04-09 14:57:48 -04:00
Adrien Béraud	7f7075ca9a	peerdiscovery: support IPV6_JOIN_GROUP	2019-04-09 12:31:23 -04:00
Adrien Béraud	9b9f12d87e	tests: accept null token if callback returns false	2019-04-08 15:58:46 -04:00
Adrien Béraud	26ad6de3a4	dhtrunner: avoid race condition when setting token	2019-04-08 15:57:25 -04:00
Adrien Béraud	ae91f8bd55	dhtrunner: default-initialize tokens	2019-04-08 15:36:24 -04:00
Adrien Béraud	28eeee24ba	runnertester: reduce number of test values	2019-04-08 15:35:55 -04:00
Adrien Béraud	671c55a01d	dhtrunner: print peer discovery error message to cerr	2019-04-08 14:36:15 -04:00