dht: try inserting new nodes smarter

Attempt closest search and nearby searches until we are too far instead of trying every search.
dht: add searches(sa_family)
2026-11-12 06:17:00 +00:00 · 2016-10-27 18:14:42 -04:00 · 2016-10-27 18:12:05 -04:00 · 2016-10-27 16:51:21 -04:00 · 2016-10-27 14:21:52 -04:00 · 2016-10-26 18:07:06 -04:00
53 changed files with 4436 additions and 1005 deletions
@@ -1,7 +1,7 @@
 cmake_minimum_required (VERSION 2.8.6)
 project (opendht)
 set (opendht_VERSION_MAJOR 1)
-set (opendht_VERSION_MINOR 0.2)
+set (opendht_VERSION_MINOR 2.0)
 set (opendht_VERSION ${opendht_VERSION_MAJOR}.${opendht_VERSION_MINOR})
 set (PACKAGE_VERSION ${opendht_VERSION})
 set (VERSION "${opendht_VERSION}")
@@ -15,6 +15,7 @@ set (includedir "\${prefix}/include")

 option (OPENDHT_STATIC "Build static library" ON)
 option (OPENDHT_SHARED "Build shared library" ON)
+option (OPENDHT_LOG "Build with logs" ON)
 option (OPENDHT_PYTHON "Build Python bindings" OFF)
 option (OPENDHT_TOOLS "Build DHT tools" ON)
 option (OPENDHT_LTO "Build with LTO" OFF)
@@ -30,6 +31,11 @@ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DMSGPACK_DISABLE_LEGACY_NIL -DMSGPACK_
 if (NOT CMAKE_BUILD_TYPE)
    set(CMAKE_BUILD_TYPE Release)
 endif ()
+if (OPENDHT_LOG)
+    add_definitions(-DOPENDHT_LOG=true)
+else ()
+    add_definitions(-DOPENDHT_LOG=false)
+endif()
 if (OPENDHT_LTO)
    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -flto")
    if (CMAKE_COMPILER_IS_GNUCC)
@@ -81,6 +87,7 @@ list (APPEND opendht_HEADERS
    include/opendht/rate_limiter.h
    include/opendht/securedht.h
    include/opendht/log.h
+    include/opendht/log_enable.h
    include/opendht.h
    include/opendht/indexation/pht.h
 )
@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{2B85EA05-086B-4DF6-A140-DF52BDAEEEEA}</ProjectGuid>
+    <RootNamespace>argon</RootNamespace>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <WholeProgramOptimization>false</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <WholeProgramOptimization>false</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <TargetExt>.lib</TargetExt>
+    <OutDir>$(ProjectDir)..\..\</OutDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <TargetExt>.lib</TargetExt>
+    <OutDir>$(ProjectDir)..\..\</OutDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <TargetExt>.lib</TargetExt>
+    <OutDir>$(ProjectDir)..\..\</OutDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <TargetExt>.lib</TargetExt>
+    <OutDir>$(ProjectDir)..\..\</OutDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32_NATIVE;WIN32_LEAN_AND_MEAN;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Lib>
+      <OutputFile>$(OutDir)\lib\x86\$(TargetName)$(TargetExt)</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32_NATIVE;WIN32_LEAN_AND_MEAN;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Lib>
+      <OutputFile>$(OutDir)\lib\x64\$(TargetName)$(TargetExt)</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32_NATIVE;WIN32_LEAN_AND_MEAN;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+    <Lib>
+      <OutputFile>$(OutDir)\lib\x86\$(TargetName)$(TargetExt)</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32_NATIVE;WIN32_LEAN_AND_MEAN;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+    <Lib>
+      <OutputFile>$(OutDir)\lib\x64\$(TargetName)$(TargetExt)</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\src\argon2\argon2.c" />
+    <ClCompile Include="..\src\argon2\core.c" />
+    <ClCompile Include="..\src\argon2\encoding.c" />
+    <ClCompile Include="..\src\argon2\opt.c" />
+    <ClCompile Include="..\src\argon2\ref.c" />
+    <ClCompile Include="..\src\argon2\thread.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\src\argon2\argon2.h" />
+    <ClInclude Include="..\src\argon2\core.h" />
+    <ClInclude Include="..\src\argon2\encoding.h" />
+    <ClInclude Include="..\src\argon2\opt.h" />
+    <ClInclude Include="..\src\argon2\ref.h" />
+    <ClInclude Include="..\src\argon2\thread.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{36A40B5B-FBAD-4830-9F74-7B4E5788B7A6}</ProjectGuid>
+    <RootNamespace>blake</RootNamespace>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <WholeProgramOptimization>false</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <WholeProgramOptimization>false</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <TargetExt>.lib</TargetExt>
+    <OutDir>$(ProjectDir)..\..\</OutDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <TargetExt>.lib</TargetExt>
+    <OutDir>$(ProjectDir)..\..\</OutDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <TargetExt>.lib</TargetExt>
+    <OutDir>$(ProjectDir)..\..\</OutDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <TargetExt>.lib</TargetExt>
+    <OutDir>$(ProjectDir)..\..\</OutDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+    </ClCompile>
+    <Lib>
+      <OutputFile>$(OutDir)\lib\x86\$(TargetName)$(TargetExt)</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+    </ClCompile>
+    <Lib>
+      <OutputFile>$(OutDir)\lib\x64\$(TargetName)$(TargetExt)</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+    </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+    <Lib>
+      <OutputFile>$(OutDir)\lib\x86\$(TargetName)$(TargetExt)</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+    </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+    <Lib>
+      <OutputFile>$(OutDir)\lib\x64\$(TargetName)$(TargetExt)</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\src\argon2\blake2\blake2b.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\src\argon2\blake2\blake2-impl.h" />
+    <ClInclude Include="..\src\argon2\blake2\blake2.h" />
+    <ClInclude Include="..\src\argon2\blake2\blamka-round-opt.h" />
+    <ClInclude Include="..\src\argon2\blake2\blamka-round-ref.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
@@ -0,0 +1,166 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{8BE7F14D-B227-4D54-9105-7E5473F2D0BA}</ProjectGuid>
+    <RootNamespace>dhtchat</RootNamespace>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <IntDir>$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <IntDir>$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <IntDir>$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <IntDir>$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <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>
+      <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>
+      <AdditionalOptions>/ignore:4049 %(AdditionalOptions)</AdditionalOptions>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <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>
+      <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>
+      <AdditionalOptions>/ignore:4049 %(AdditionalOptions)</AdditionalOptions>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <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>
+      <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>
+      <AdditionalOptions>/ignore:4049 %(AdditionalOptions)</AdditionalOptions>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <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>
+      <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>
+      <AdditionalOptions>/ignore:4049 %(AdditionalOptions)</AdditionalOptions>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\tools\dhtchat.cpp" />
+    <ClCompile Include="wingetopt.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\tools\tools_common.h" />
+    <ClInclude Include="wingetopt.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
@@ -0,0 +1,166 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{BF92AECF-AA1D-4B05-9D00-0247E92A24B5}</ProjectGuid>
+    <RootNamespace>dhtnode</RootNamespace>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <IntDir>$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <IntDir>$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <IntDir>$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <IntDir>$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <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>
+      <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>
+      <AdditionalOptions>/ignore:4049 %(AdditionalOptions)</AdditionalOptions>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <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>
+      <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>
+      <AdditionalOptions>/ignore:4049 %(AdditionalOptions)</AdditionalOptions>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <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>
+      <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>
+      <AdditionalOptions>/ignore:4049 %(AdditionalOptions)</AdditionalOptions>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <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>
+      <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>
+      <AdditionalOptions>/ignore:4049 %(AdditionalOptions)</AdditionalOptions>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\tools\dhtnode.cpp" />
+    <ClCompile Include="wingetopt.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\tools\tools_common.h" />
+    <ClInclude Include="wingetopt.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
@@ -0,0 +1,166 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{78443BCD-4689-4007-A246-F8F34B27F561}</ProjectGuid>
+    <RootNamespace>dhtscanner</RootNamespace>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <IntDir>$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <IntDir>$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <IntDir>$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <IntDir>$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <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>
+      <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>
+      <AdditionalOptions>/ignore:4049 %(AdditionalOptions)</AdditionalOptions>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <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>
+      <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>
+      <AdditionalOptions>/ignore:4049 %(AdditionalOptions)</AdditionalOptions>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <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>
+      <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>
+      <AdditionalOptions>/ignore:4049 %(AdditionalOptions)</AdditionalOptions>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <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>
+      <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>
+      <AdditionalOptions>/ignore:4049 %(AdditionalOptions)</AdditionalOptions>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\tools\dhtscanner.cpp" />
+    <ClCompile Include="wingetopt.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\tools\tools_common.h" />
+    <ClInclude Include="wingetopt.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
@@ -24,6 +24,7 @@
    <ClCompile Include="..\src\default_types.cpp" />
    <ClCompile Include="..\src\dht.cpp" />
    <ClCompile Include="..\src\dhtrunner.cpp" />
+    <ClCompile Include="..\src\indexation\pht.cpp" />
    <ClCompile Include="..\src\infohash.cpp" />
    <ClCompile Include="..\src\network_engine.cpp" />
    <ClCompile Include="..\src\node.cpp" />
@@ -40,11 +41,14 @@
    <ClInclude Include="..\include\opendht\default_types.h" />
    <ClInclude Include="..\include\opendht\dht.h" />
    <ClInclude Include="..\include\opendht\dhtrunner.h" />
+    <ClInclude Include="..\include\opendht\indexation\pht.h" />
    <ClInclude Include="..\include\opendht\infohash.h" />
    <ClInclude Include="..\include\opendht\log.h" />
+    <ClInclude Include="..\include\opendht\log_enable.h" />
    <ClInclude Include="..\include\opendht\network_engine.h" />
    <ClInclude Include="..\include\opendht\node.h" />
    <ClInclude Include="..\include\opendht\node_cache.h" />
+    <ClInclude Include="..\include\opendht\rate_limiter.h" />
    <ClInclude Include="..\include\opendht\request.h" />
    <ClInclude Include="..\include\opendht\rng.h" />
    <ClInclude Include="..\include\opendht\routing_table.h" />
@@ -135,6 +139,8 @@
    <PostBuildEvent>
      <Command>mkdir $(OutDir)\include
 mkdir $(OutDir)\include\opendht
+mkdir $(OutDir)\include\opendht\indexation
+copy ..\include\opendht\indexation\*.h $(OutDir)\include\opendht\indexation
 copy ..\include\opendht\*.h $(OutDir)\include\opendht
 copy ..\include\opendht.h $(OutDir)\include\</Command>
    </PostBuildEvent>
@@ -155,6 +161,8 @@ copy ..\include\opendht.h $(OutDir)\include\</Command>
    <PostBuildEvent>
      <Command>mkdir $(OutDir)\include
 mkdir $(OutDir)\include\opendht
+mkdir $(OutDir)\include\opendht\indexation
+copy ..\include\opendht\indexation\*.h $(OutDir)\include\opendht\indexation
 copy ..\include\opendht\*.h $(OutDir)\include\opendht
 copy ..\include\opendht.h $(OutDir)\include\</Command>
    </PostBuildEvent>
@@ -182,6 +190,8 @@ copy ..\include\opendht.h $(OutDir)\include\</Command>
    <PostBuildEvent>
      <Command>mkdir $(OutDir)\include
 mkdir $(OutDir)\include\opendht
+mkdir $(OutDir)\include\opendht\indexation
+copy ..\include\opendht\indexation\*.h $(OutDir)\include\opendht\indexation
 copy ..\include\opendht\*.h $(OutDir)\include\opendht
 copy ..\include\opendht.h $(OutDir)\include\</Command>
    </PostBuildEvent>
@@ -210,6 +220,8 @@ copy ..\include\opendht.h $(OutDir)\include\</Command>
    <PostBuildEvent>
      <Command>mkdir $(OutDir)\include
 mkdir $(OutDir)\include\opendht
+mkdir $(OutDir)\include\opendht\indexation
+copy ..\include\opendht\indexation\*.h $(OutDir)\include\opendht\indexation
 copy ..\include\opendht\*.h $(OutDir)\include\opendht
 copy ..\include\opendht.h $(OutDir)\include\</Command>
    </PostBuildEvent>
@@ -1,10 +1,11 @@

 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
-VisualStudioVersion = 14.0.25123.0
+VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opendht", "opendht.vcxproj", "{711397CE-E5D5-467D-9457-8716C047E50C}"
 	ProjectSection(ProjectDependencies) = postProject
+		{2B85EA05-086B-4DF6-A140-DF52BDAEEEEA} = {2B85EA05-086B-4DF6-A140-DF52BDAEEEEA}
 		{070FEF2B-0C3F-4F33-9D3C-53C7330BF518} = {070FEF2B-0C3F-4F33-9D3C-53C7330BF518}
 		{122A2EA4-B283-4241-9655-786DE78283B2} = {122A2EA4-B283-4241-9655-786DE78283B2}
 		{6F610EE8-7F59-4191-AB88-F63843267C02} = {6F610EE8-7F59-4191-AB88-F63843267C02}
@@ -36,6 +37,30 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libzlib", "..\..\zlib\MSVC\
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MessagePack", "..\..\msgpack-c\msgpack_vc8.vcxproj", "{122A2EA4-B283-4241-9655-786DE78283B2}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "argon", "argon.vcxproj", "{2B85EA05-086B-4DF6-A140-DF52BDAEEEEA}"
+	ProjectSection(ProjectDependencies) = postProject
+		{36A40B5B-FBAD-4830-9F74-7B4E5788B7A6} = {36A40B5B-FBAD-4830-9F74-7B4E5788B7A6}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "blake", "blake.vcxproj", "{36A40B5B-FBAD-4830-9F74-7B4E5788B7A6}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{296E2989-CF09-43AC-BBD2-BCF1A4B56D07}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dhtnode", "dhtnode.vcxproj", "{BF92AECF-AA1D-4B05-9D00-0247E92A24B5}"
+	ProjectSection(ProjectDependencies) = postProject
+		{711397CE-E5D5-467D-9457-8716C047E50C} = {711397CE-E5D5-467D-9457-8716C047E50C}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dhtscanner", "dhtscanner.vcxproj", "{78443BCD-4689-4007-A246-F8F34B27F561}"
+	ProjectSection(ProjectDependencies) = postProject
+		{711397CE-E5D5-467D-9457-8716C047E50C} = {711397CE-E5D5-467D-9457-8716C047E50C}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dhtchat", "dhtchat.vcxproj", "{8BE7F14D-B227-4D54-9105-7E5473F2D0BA}"
+	ProjectSection(ProjectDependencies) = postProject
+		{711397CE-E5D5-467D-9457-8716C047E50C} = {711397CE-E5D5-467D-9457-8716C047E50C}
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x64 = Debug|x64
@@ -276,6 +301,146 @@ Global
 		{122A2EA4-B283-4241-9655-786DE78283B2}.ReleaseLTO|x64.Build.0 = Release|Win32
 		{122A2EA4-B283-4241-9655-786DE78283B2}.ReleaseLTO|x86.ActiveCfg = Release|Win32
 		{122A2EA4-B283-4241-9655-786DE78283B2}.ReleaseLTO|x86.Build.0 = Release|Win32
+		{2B85EA05-086B-4DF6-A140-DF52BDAEEEEA}.Debug|x64.ActiveCfg = Debug|x64
+		{2B85EA05-086B-4DF6-A140-DF52BDAEEEEA}.Debug|x64.Build.0 = Debug|x64
+		{2B85EA05-086B-4DF6-A140-DF52BDAEEEEA}.Debug|x86.ActiveCfg = Debug|Win32
+		{2B85EA05-086B-4DF6-A140-DF52BDAEEEEA}.Debug|x86.Build.0 = Debug|Win32
+		{2B85EA05-086B-4DF6-A140-DF52BDAEEEEA}.DebugDLL|x64.ActiveCfg = Debug|x64
+		{2B85EA05-086B-4DF6-A140-DF52BDAEEEEA}.DebugDLL|x64.Build.0 = Debug|x64
+		{2B85EA05-086B-4DF6-A140-DF52BDAEEEEA}.DebugDLL|x86.ActiveCfg = Debug|Win32
+		{2B85EA05-086B-4DF6-A140-DF52BDAEEEEA}.DebugDLL|x86.Build.0 = Debug|Win32
+		{2B85EA05-086B-4DF6-A140-DF52BDAEEEEA}.DebugDLLStaticDeps|x64.ActiveCfg = Debug|x64
+		{2B85EA05-086B-4DF6-A140-DF52BDAEEEEA}.DebugDLLStaticDeps|x64.Build.0 = Debug|x64
+		{2B85EA05-086B-4DF6-A140-DF52BDAEEEEA}.DebugDLLStaticDeps|x86.ActiveCfg = Debug|Win32
+		{2B85EA05-086B-4DF6-A140-DF52BDAEEEEA}.DebugDLLStaticDeps|x86.Build.0 = Debug|Win32
+		{2B85EA05-086B-4DF6-A140-DF52BDAEEEEA}.Release|x64.ActiveCfg = Release|x64
+		{2B85EA05-086B-4DF6-A140-DF52BDAEEEEA}.Release|x64.Build.0 = Release|x64
+		{2B85EA05-086B-4DF6-A140-DF52BDAEEEEA}.Release|x86.ActiveCfg = Release|Win32
+		{2B85EA05-086B-4DF6-A140-DF52BDAEEEEA}.Release|x86.Build.0 = Release|Win32
+		{2B85EA05-086B-4DF6-A140-DF52BDAEEEEA}.ReleaseDLL|x64.ActiveCfg = Release|x64
+		{2B85EA05-086B-4DF6-A140-DF52BDAEEEEA}.ReleaseDLL|x64.Build.0 = Release|x64
+		{2B85EA05-086B-4DF6-A140-DF52BDAEEEEA}.ReleaseDLL|x86.ActiveCfg = Release|Win32
+		{2B85EA05-086B-4DF6-A140-DF52BDAEEEEA}.ReleaseDLL|x86.Build.0 = Release|Win32
+		{2B85EA05-086B-4DF6-A140-DF52BDAEEEEA}.ReleaseDLLStaticDeps|x64.ActiveCfg = Release|x64
+		{2B85EA05-086B-4DF6-A140-DF52BDAEEEEA}.ReleaseDLLStaticDeps|x64.Build.0 = Release|x64
+		{2B85EA05-086B-4DF6-A140-DF52BDAEEEEA}.ReleaseDLLStaticDeps|x86.ActiveCfg = Release|Win32
+		{2B85EA05-086B-4DF6-A140-DF52BDAEEEEA}.ReleaseDLLStaticDeps|x86.Build.0 = Release|Win32
+		{2B85EA05-086B-4DF6-A140-DF52BDAEEEEA}.ReleaseLTO|x64.ActiveCfg = Release|x64
+		{2B85EA05-086B-4DF6-A140-DF52BDAEEEEA}.ReleaseLTO|x64.Build.0 = Release|x64
+		{2B85EA05-086B-4DF6-A140-DF52BDAEEEEA}.ReleaseLTO|x86.ActiveCfg = Release|Win32
+		{2B85EA05-086B-4DF6-A140-DF52BDAEEEEA}.ReleaseLTO|x86.Build.0 = Release|Win32
+		{36A40B5B-FBAD-4830-9F74-7B4E5788B7A6}.Debug|x64.ActiveCfg = Debug|x64
+		{36A40B5B-FBAD-4830-9F74-7B4E5788B7A6}.Debug|x64.Build.0 = Debug|x64
+		{36A40B5B-FBAD-4830-9F74-7B4E5788B7A6}.Debug|x86.ActiveCfg = Debug|Win32
+		{36A40B5B-FBAD-4830-9F74-7B4E5788B7A6}.Debug|x86.Build.0 = Debug|Win32
+		{36A40B5B-FBAD-4830-9F74-7B4E5788B7A6}.DebugDLL|x64.ActiveCfg = Debug|x64
+		{36A40B5B-FBAD-4830-9F74-7B4E5788B7A6}.DebugDLL|x64.Build.0 = Debug|x64
+		{36A40B5B-FBAD-4830-9F74-7B4E5788B7A6}.DebugDLL|x86.ActiveCfg = Debug|Win32
+		{36A40B5B-FBAD-4830-9F74-7B4E5788B7A6}.DebugDLL|x86.Build.0 = Debug|Win32
+		{36A40B5B-FBAD-4830-9F74-7B4E5788B7A6}.DebugDLLStaticDeps|x64.ActiveCfg = Debug|x64
+		{36A40B5B-FBAD-4830-9F74-7B4E5788B7A6}.DebugDLLStaticDeps|x64.Build.0 = Debug|x64
+		{36A40B5B-FBAD-4830-9F74-7B4E5788B7A6}.DebugDLLStaticDeps|x86.ActiveCfg = Debug|Win32
+		{36A40B5B-FBAD-4830-9F74-7B4E5788B7A6}.DebugDLLStaticDeps|x86.Build.0 = Debug|Win32
+		{36A40B5B-FBAD-4830-9F74-7B4E5788B7A6}.Release|x64.ActiveCfg = Release|x64
+		{36A40B5B-FBAD-4830-9F74-7B4E5788B7A6}.Release|x64.Build.0 = Release|x64
+		{36A40B5B-FBAD-4830-9F74-7B4E5788B7A6}.Release|x86.ActiveCfg = Release|Win32
+		{36A40B5B-FBAD-4830-9F74-7B4E5788B7A6}.Release|x86.Build.0 = Release|Win32
+		{36A40B5B-FBAD-4830-9F74-7B4E5788B7A6}.ReleaseDLL|x64.ActiveCfg = Release|x64
+		{36A40B5B-FBAD-4830-9F74-7B4E5788B7A6}.ReleaseDLL|x64.Build.0 = Release|x64
+		{36A40B5B-FBAD-4830-9F74-7B4E5788B7A6}.ReleaseDLL|x86.ActiveCfg = Release|Win32
+		{36A40B5B-FBAD-4830-9F74-7B4E5788B7A6}.ReleaseDLL|x86.Build.0 = Release|Win32
+		{36A40B5B-FBAD-4830-9F74-7B4E5788B7A6}.ReleaseDLLStaticDeps|x64.ActiveCfg = Release|x64
+		{36A40B5B-FBAD-4830-9F74-7B4E5788B7A6}.ReleaseDLLStaticDeps|x64.Build.0 = Release|x64
+		{36A40B5B-FBAD-4830-9F74-7B4E5788B7A6}.ReleaseDLLStaticDeps|x86.ActiveCfg = Release|Win32
+		{36A40B5B-FBAD-4830-9F74-7B4E5788B7A6}.ReleaseDLLStaticDeps|x86.Build.0 = Release|Win32
+		{36A40B5B-FBAD-4830-9F74-7B4E5788B7A6}.ReleaseLTO|x64.ActiveCfg = Release|x64
+		{36A40B5B-FBAD-4830-9F74-7B4E5788B7A6}.ReleaseLTO|x64.Build.0 = Release|x64
+		{36A40B5B-FBAD-4830-9F74-7B4E5788B7A6}.ReleaseLTO|x86.ActiveCfg = Release|Win32
+		{36A40B5B-FBAD-4830-9F74-7B4E5788B7A6}.ReleaseLTO|x86.Build.0 = Release|Win32
+		{BF92AECF-AA1D-4B05-9D00-0247E92A24B5}.Debug|x64.ActiveCfg = Debug|x64
+		{BF92AECF-AA1D-4B05-9D00-0247E92A24B5}.Debug|x64.Build.0 = Debug|x64
+		{BF92AECF-AA1D-4B05-9D00-0247E92A24B5}.Debug|x86.ActiveCfg = Debug|Win32
+		{BF92AECF-AA1D-4B05-9D00-0247E92A24B5}.Debug|x86.Build.0 = Debug|Win32
+		{BF92AECF-AA1D-4B05-9D00-0247E92A24B5}.DebugDLL|x64.ActiveCfg = Debug|x64
+		{BF92AECF-AA1D-4B05-9D00-0247E92A24B5}.DebugDLL|x64.Build.0 = Debug|x64
+		{BF92AECF-AA1D-4B05-9D00-0247E92A24B5}.DebugDLL|x86.ActiveCfg = Debug|Win32
+		{BF92AECF-AA1D-4B05-9D00-0247E92A24B5}.DebugDLL|x86.Build.0 = Debug|Win32
+		{BF92AECF-AA1D-4B05-9D00-0247E92A24B5}.DebugDLLStaticDeps|x64.ActiveCfg = Debug|x64
+		{BF92AECF-AA1D-4B05-9D00-0247E92A24B5}.DebugDLLStaticDeps|x64.Build.0 = Debug|x64
+		{BF92AECF-AA1D-4B05-9D00-0247E92A24B5}.DebugDLLStaticDeps|x86.ActiveCfg = Debug|Win32
+		{BF92AECF-AA1D-4B05-9D00-0247E92A24B5}.DebugDLLStaticDeps|x86.Build.0 = Debug|Win32
+		{BF92AECF-AA1D-4B05-9D00-0247E92A24B5}.Release|x64.ActiveCfg = Release|x64
+		{BF92AECF-AA1D-4B05-9D00-0247E92A24B5}.Release|x64.Build.0 = Release|x64
+		{BF92AECF-AA1D-4B05-9D00-0247E92A24B5}.Release|x86.ActiveCfg = Release|Win32
+		{BF92AECF-AA1D-4B05-9D00-0247E92A24B5}.Release|x86.Build.0 = Release|Win32
+		{BF92AECF-AA1D-4B05-9D00-0247E92A24B5}.ReleaseDLL|x64.ActiveCfg = Release|x64
+		{BF92AECF-AA1D-4B05-9D00-0247E92A24B5}.ReleaseDLL|x64.Build.0 = Release|x64
+		{BF92AECF-AA1D-4B05-9D00-0247E92A24B5}.ReleaseDLL|x86.ActiveCfg = Release|Win32
+		{BF92AECF-AA1D-4B05-9D00-0247E92A24B5}.ReleaseDLL|x86.Build.0 = Release|Win32
+		{BF92AECF-AA1D-4B05-9D00-0247E92A24B5}.ReleaseDLLStaticDeps|x64.ActiveCfg = Release|x64
+		{BF92AECF-AA1D-4B05-9D00-0247E92A24B5}.ReleaseDLLStaticDeps|x64.Build.0 = Release|x64
+		{BF92AECF-AA1D-4B05-9D00-0247E92A24B5}.ReleaseDLLStaticDeps|x86.ActiveCfg = Release|Win32
+		{BF92AECF-AA1D-4B05-9D00-0247E92A24B5}.ReleaseDLLStaticDeps|x86.Build.0 = Release|Win32
+		{BF92AECF-AA1D-4B05-9D00-0247E92A24B5}.ReleaseLTO|x64.ActiveCfg = Release|x64
+		{BF92AECF-AA1D-4B05-9D00-0247E92A24B5}.ReleaseLTO|x64.Build.0 = Release|x64
+		{BF92AECF-AA1D-4B05-9D00-0247E92A24B5}.ReleaseLTO|x86.ActiveCfg = Release|Win32
+		{BF92AECF-AA1D-4B05-9D00-0247E92A24B5}.ReleaseLTO|x86.Build.0 = Release|Win32
+		{78443BCD-4689-4007-A246-F8F34B27F561}.Debug|x64.ActiveCfg = Debug|x64
+		{78443BCD-4689-4007-A246-F8F34B27F561}.Debug|x64.Build.0 = Debug|x64
+		{78443BCD-4689-4007-A246-F8F34B27F561}.Debug|x86.ActiveCfg = Debug|Win32
+		{78443BCD-4689-4007-A246-F8F34B27F561}.Debug|x86.Build.0 = Debug|Win32
+		{78443BCD-4689-4007-A246-F8F34B27F561}.DebugDLL|x64.ActiveCfg = Debug|x64
+		{78443BCD-4689-4007-A246-F8F34B27F561}.DebugDLL|x64.Build.0 = Debug|x64
+		{78443BCD-4689-4007-A246-F8F34B27F561}.DebugDLL|x86.ActiveCfg = Debug|Win32
+		{78443BCD-4689-4007-A246-F8F34B27F561}.DebugDLL|x86.Build.0 = Debug|Win32
+		{78443BCD-4689-4007-A246-F8F34B27F561}.DebugDLLStaticDeps|x64.ActiveCfg = Debug|x64
+		{78443BCD-4689-4007-A246-F8F34B27F561}.DebugDLLStaticDeps|x64.Build.0 = Debug|x64
+		{78443BCD-4689-4007-A246-F8F34B27F561}.DebugDLLStaticDeps|x86.ActiveCfg = Debug|Win32
+		{78443BCD-4689-4007-A246-F8F34B27F561}.DebugDLLStaticDeps|x86.Build.0 = Debug|Win32
+		{78443BCD-4689-4007-A246-F8F34B27F561}.Release|x64.ActiveCfg = Release|x64
+		{78443BCD-4689-4007-A246-F8F34B27F561}.Release|x64.Build.0 = Release|x64
+		{78443BCD-4689-4007-A246-F8F34B27F561}.Release|x86.ActiveCfg = Release|Win32
+		{78443BCD-4689-4007-A246-F8F34B27F561}.Release|x86.Build.0 = Release|Win32
+		{78443BCD-4689-4007-A246-F8F34B27F561}.ReleaseDLL|x64.ActiveCfg = Release|x64
+		{78443BCD-4689-4007-A246-F8F34B27F561}.ReleaseDLL|x64.Build.0 = Release|x64
+		{78443BCD-4689-4007-A246-F8F34B27F561}.ReleaseDLL|x86.ActiveCfg = Release|Win32
+		{78443BCD-4689-4007-A246-F8F34B27F561}.ReleaseDLL|x86.Build.0 = Release|Win32
+		{78443BCD-4689-4007-A246-F8F34B27F561}.ReleaseDLLStaticDeps|x64.ActiveCfg = Release|x64
+		{78443BCD-4689-4007-A246-F8F34B27F561}.ReleaseDLLStaticDeps|x64.Build.0 = Release|x64
+		{78443BCD-4689-4007-A246-F8F34B27F561}.ReleaseDLLStaticDeps|x86.ActiveCfg = Release|Win32
+		{78443BCD-4689-4007-A246-F8F34B27F561}.ReleaseDLLStaticDeps|x86.Build.0 = Release|Win32
+		{78443BCD-4689-4007-A246-F8F34B27F561}.ReleaseLTO|x64.ActiveCfg = Release|x64
+		{78443BCD-4689-4007-A246-F8F34B27F561}.ReleaseLTO|x64.Build.0 = Release|x64
+		{78443BCD-4689-4007-A246-F8F34B27F561}.ReleaseLTO|x86.ActiveCfg = Release|Win32
+		{78443BCD-4689-4007-A246-F8F34B27F561}.ReleaseLTO|x86.Build.0 = Release|Win32
+		{8BE7F14D-B227-4D54-9105-7E5473F2D0BA}.Debug|x64.ActiveCfg = Debug|x64
+		{8BE7F14D-B227-4D54-9105-7E5473F2D0BA}.Debug|x64.Build.0 = Debug|x64
+		{8BE7F14D-B227-4D54-9105-7E5473F2D0BA}.Debug|x86.ActiveCfg = Debug|Win32
+		{8BE7F14D-B227-4D54-9105-7E5473F2D0BA}.Debug|x86.Build.0 = Debug|Win32
+		{8BE7F14D-B227-4D54-9105-7E5473F2D0BA}.DebugDLL|x64.ActiveCfg = Debug|x64
+		{8BE7F14D-B227-4D54-9105-7E5473F2D0BA}.DebugDLL|x64.Build.0 = Debug|x64
+		{8BE7F14D-B227-4D54-9105-7E5473F2D0BA}.DebugDLL|x86.ActiveCfg = Debug|Win32
+		{8BE7F14D-B227-4D54-9105-7E5473F2D0BA}.DebugDLL|x86.Build.0 = Debug|Win32
+		{8BE7F14D-B227-4D54-9105-7E5473F2D0BA}.DebugDLLStaticDeps|x64.ActiveCfg = Debug|x64
+		{8BE7F14D-B227-4D54-9105-7E5473F2D0BA}.DebugDLLStaticDeps|x64.Build.0 = Debug|x64
+		{8BE7F14D-B227-4D54-9105-7E5473F2D0BA}.DebugDLLStaticDeps|x86.ActiveCfg = Debug|Win32
+		{8BE7F14D-B227-4D54-9105-7E5473F2D0BA}.DebugDLLStaticDeps|x86.Build.0 = Debug|Win32
+		{8BE7F14D-B227-4D54-9105-7E5473F2D0BA}.Release|x64.ActiveCfg = Release|x64
+		{8BE7F14D-B227-4D54-9105-7E5473F2D0BA}.Release|x64.Build.0 = Release|x64
+		{8BE7F14D-B227-4D54-9105-7E5473F2D0BA}.Release|x86.ActiveCfg = Release|Win32
+		{8BE7F14D-B227-4D54-9105-7E5473F2D0BA}.Release|x86.Build.0 = Release|Win32
+		{8BE7F14D-B227-4D54-9105-7E5473F2D0BA}.ReleaseDLL|x64.ActiveCfg = Release|x64
+		{8BE7F14D-B227-4D54-9105-7E5473F2D0BA}.ReleaseDLL|x64.Build.0 = Release|x64
+		{8BE7F14D-B227-4D54-9105-7E5473F2D0BA}.ReleaseDLL|x86.ActiveCfg = Release|Win32
+		{8BE7F14D-B227-4D54-9105-7E5473F2D0BA}.ReleaseDLL|x86.Build.0 = Release|Win32
+		{8BE7F14D-B227-4D54-9105-7E5473F2D0BA}.ReleaseDLLStaticDeps|x64.ActiveCfg = Release|x64
+		{8BE7F14D-B227-4D54-9105-7E5473F2D0BA}.ReleaseDLLStaticDeps|x64.Build.0 = Release|x64
+		{8BE7F14D-B227-4D54-9105-7E5473F2D0BA}.ReleaseDLLStaticDeps|x86.ActiveCfg = Release|Win32
+		{8BE7F14D-B227-4D54-9105-7E5473F2D0BA}.ReleaseDLLStaticDeps|x86.Build.0 = Release|Win32
+		{8BE7F14D-B227-4D54-9105-7E5473F2D0BA}.ReleaseLTO|x64.ActiveCfg = Release|x64
+		{8BE7F14D-B227-4D54-9105-7E5473F2D0BA}.ReleaseLTO|x64.Build.0 = Release|x64
+		{8BE7F14D-B227-4D54-9105-7E5473F2D0BA}.ReleaseLTO|x86.ActiveCfg = Release|Win32
+		{8BE7F14D-B227-4D54-9105-7E5473F2D0BA}.ReleaseLTO|x86.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -288,5 +453,10 @@ Global
 		{070FEF2B-0C3F-4F33-9D3C-53C7330BF518} = {71A1A9EC-1104-4335-A87E-AF8749FD5B34}
 		{CA9A4A38-CC63-4BDB-8CFB-E058965DDA32} = {71A1A9EC-1104-4335-A87E-AF8749FD5B34}
 		{122A2EA4-B283-4241-9655-786DE78283B2} = {71A1A9EC-1104-4335-A87E-AF8749FD5B34}
+		{2B85EA05-086B-4DF6-A140-DF52BDAEEEEA} = {71A1A9EC-1104-4335-A87E-AF8749FD5B34}
+		{36A40B5B-FBAD-4830-9F74-7B4E5788B7A6} = {71A1A9EC-1104-4335-A87E-AF8749FD5B34}
+		{BF92AECF-AA1D-4B05-9D00-0247E92A24B5} = {296E2989-CF09-43AC-BBD2-BCF1A4B56D07}
+		{78443BCD-4689-4007-A246-F8F34B27F561} = {296E2989-CF09-43AC-BBD2-BCF1A4B56D07}
+		{8BE7F14D-B227-4D54-9105-7E5473F2D0BA} = {296E2989-CF09-43AC-BBD2-BCF1A4B56D07}
 	EndGlobalSection
 EndGlobal
@@ -0,0 +1,53 @@
+/*
+ *  Copyright (C) 2016 Savoir-faire Linux Inc.
+ *
+ *  Author: Andreas Traczyk <andreas.traczyk@savoirfairelinux.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
+ */
+
+#pragma once
+
+#ifndef __STRICT_ANSI__
+
+#include <stdlib.h>
+#include <process.h>
+#include <direct.h>
+#include <fcntl.h>
+
+#define R_OK    4
+#define W_OK    2
+#define F_OK    0
+
+#ifndef STDIN_FILENO
+#define STDIN_FILENO 0
+#endif
+
+#ifndef STDOUT_FILENO
+#define STDOUT_FILENO 1
+#endif
+
+#ifndef STDERR_FILENO
+#define STDERR_FILENO 2
+#endif
+
+#define srandom srand
+#define random rand
+
+#define inline __inline
+typedef int mode_t;
+#include <BaseTsd.h>
+
+#endif
@@ -0,0 +1,971 @@
+/* Getopt for Microsoft C
+This code is a modification of the Free Software Foundation, Inc.
+Getopt library for parsing command line argument the purpose was
+to provide a Microsoft Visual C friendly derivative. This code
+provides functionality for both Unicode and Multibyte builds.
+Date: 02/03/2011 - Ludvik Jerabek - Initial Release
+Version: 1.0
+Comment: Supports getopt, getopt_long, and getopt_long_only
+and POSIXLY_CORRECT environment flag
+License: LGPL
+Revisions:
+02/03/2011 - Ludvik Jerabek - Initial Release
+02/20/2011 - Ludvik Jerabek - Fixed compiler warnings at Level 4
+07/05/2011 - Ludvik Jerabek - Added no_argument, required_argument, optional_argument defs
+08/03/2011 - Ludvik Jerabek - Fixed non-argument runtime bug which caused runtime exception
+08/09/2011 - Ludvik Jerabek - Added code to export functions for DLL and LIB
+02/15/2012 - Ludvik Jerabek - Fixed _GETOPT_THROW definition missing in implementation file
+08/01/2012 - Ludvik Jerabek - Created separate functions for char and wchar_t characters so single dll can do both unicode and ansi
+10/15/2012 - Ludvik Jerabek - Modified to match latest GNU features
+06/19/2015 - Ludvik Jerabek - Fixed maximum option limitation caused by option_a (255) and option_w (65535) structure val variable
+**DISCLAIMER**
+THIS MATERIAL IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND,
+EITHER EXPRESS OR IMPLIED, INCLUDING, BUT Not LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+PURPOSE, OR NON-INFRINGEMENT. SOME JURISDICTIONS DO NOT ALLOW THE
+EXCLUSION OF IMPLIED WARRANTIES, SO THE ABOVE EXCLUSION MAY NOT
+APPLY TO YOU. IN NO EVENT WILL I BE LIABLE TO ANY PARTY FOR ANY
+DIRECT, INDIRECT, SPECIAL OR OTHER CONSEQUENTIAL DAMAGES FOR ANY
+USE OF THIS MATERIAL INCLUDING, WITHOUT LIMITATION, ANY LOST
+PROFITS, BUSINESS INTERRUPTION, LOSS OF PROGRAMS OR OTHER DATA ON
+YOUR INFORMATION HANDLING SYSTEM OR OTHERWISE, EVEN If WE ARE
+EXPRESSLY ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+*/
+#ifndef _CRT_SECURE_NO_WARNINGS
+# define _CRT_SECURE_NO_WARNINGS
+#endif
+#include <stdlib.h>
+#include <stdio.h>
+#include <malloc.h>
+#include "wingetopt.h"
+
+#ifdef __cplusplus
+    #define _GETOPT_THROW throw()
+#else
+    #define _GETOPT_THROW
+#endif
+
+int optind = 1;
+int opterr = 1;
+int optopt = '?';
+enum ENUM_ORDERING { REQUIRE_ORDER, PERMUTE, RETURN_IN_ORDER };
+
+//
+//
+//		Ansi structures and functions follow
+//
+//
+
+static struct _getopt_data_a
+{
+    int optind;
+    int opterr;
+    int optopt;
+    char *optarg;
+    int __initialized;
+    char *__nextchar;
+    enum ENUM_ORDERING __ordering;
+    int __posixly_correct;
+    int __first_nonopt;
+    int __last_nonopt;
+} getopt_data_a;
+char *optarg_a;
+
+static void exchange_a(char **argv, struct _getopt_data_a *d)
+{
+    int bottom = d->__first_nonopt;
+    int middle = d->__last_nonopt;
+    int top = d->optind;
+    char *tem;
+    while (top > middle && middle > bottom)
+    {
+        if (top - middle > middle - bottom)
+        {
+            int len = middle - bottom;
+            register int i;
+            for (i = 0; i < len; i++)
+            {
+                tem = argv[bottom + i];
+                argv[bottom + i] = argv[top - (middle - bottom) + i];
+                argv[top - (middle - bottom) + i] = tem;
+            }
+            top -= len;
+        }
+        else
+        {
+            int len = top - middle;
+            register int i;
+            for (i = 0; i < len; i++)
+            {
+                tem = argv[bottom + i];
+                argv[bottom + i] = argv[middle + i];
+                argv[middle + i] = tem;
+            }
+            bottom += len;
+        }
+    }
+    d->__first_nonopt += (d->optind - d->__last_nonopt);
+    d->__last_nonopt = d->optind;
+}
+static const char *_getopt_initialize_a (const char *optstring, struct _getopt_data_a *d, int posixly_correct)
+{
+    d->__first_nonopt = d->__last_nonopt = d->optind;
+    d->__nextchar = NULL;
+    d->__posixly_correct = posixly_correct | !!getenv("POSIXLY_CORRECT");
+    if (optstring[0] == '-')
+    {
+        d->__ordering = RETURN_IN_ORDER;
+        ++optstring;
+    }
+    else if (optstring[0] == '+')
+    {
+        d->__ordering = REQUIRE_ORDER;
+        ++optstring;
+    }
+    else if (d->__posixly_correct)
+        d->__ordering = REQUIRE_ORDER;
+    else
+        d->__ordering = PERMUTE;
+    return optstring;
+}
+int _getopt_internal_r_a (int argc, char *const *argv, const char *optstring, const struct option_a *longopts, int *longind, int long_only, struct _getopt_data_a *d, int posixly_correct)
+{
+    int print_errors = d->opterr;
+    if (argc < 1)
+        return -1;
+    d->optarg = NULL;
+    if (d->optind == 0 || !d->__initialized)
+    {
+        if (d->optind == 0)
+            d->optind = 1;
+        optstring = _getopt_initialize_a (optstring, d, posixly_correct);
+        d->__initialized = 1;
+    }
+    else if (optstring[0] == '-' || optstring[0] == '+')
+        optstring++;
+    if (optstring[0] == ':')
+        print_errors = 0;
+    if (d->__nextchar == NULL || *d->__nextchar == '\0')
+    {
+        if (d->__last_nonopt > d->optind)
+            d->__last_nonopt = d->optind;
+        if (d->__first_nonopt > d->optind)
+            d->__first_nonopt = d->optind;
+        if (d->__ordering == PERMUTE)
+        {
+            if (d->__first_nonopt != d->__last_nonopt && d->__last_nonopt != d->optind)
+                exchange_a ((char **) argv, d);
+            else if (d->__last_nonopt != d->optind)
+                d->__first_nonopt = d->optind;
+            while (d->optind < argc && (argv[d->optind][0] != '-' || argv[d->optind][1] == '\0'))
+                d->optind++;
+            d->__last_nonopt = d->optind;
+        }
+        if (d->optind != argc && !strcmp(argv[d->optind], "--"))
+        {
+            d->optind++;
+            if (d->__first_nonopt != d->__last_nonopt && d->__last_nonopt != d->optind)
+                exchange_a((char **) argv, d);
+            else if (d->__first_nonopt == d->__last_nonopt)
+                d->__first_nonopt = d->optind;
+            d->__last_nonopt = argc;
+            d->optind = argc;
+        }
+        if (d->optind == argc)
+        {
+            if (d->__first_nonopt != d->__last_nonopt)
+                d->optind = d->__first_nonopt;
+            return -1;
+        }
+        if ((argv[d->optind][0] != '-' || argv[d->optind][1] == '\0'))
+        {
+            if (d->__ordering == REQUIRE_ORDER)
+                return -1;
+            d->optarg = argv[d->optind++];
+            return 1;
+        }
+        d->__nextchar = (argv[d->optind] + 1 + (longopts != NULL && argv[d->optind][1] == '-'));
+    }
+    if (longopts != NULL && (argv[d->optind][1] == '-' || (long_only && (argv[d->optind][2] || !strchr(optstring, argv[d->optind][1])))))
+    {
+        char *nameend;
+        unsigned int namelen;
+        const struct option_a *p;
+        const struct option_a *pfound = NULL;
+        struct option_list
+        {
+            const struct option_a *p;
+            struct option_list *next;
+        } *ambig_list = NULL;
+        int exact = 0;
+        int indfound = -1;
+        int option_index;
+        for (nameend = d->__nextchar; *nameend && *nameend != '='; nameend++);
+        namelen = (unsigned int)(nameend - d->__nextchar);
+        for (p = longopts, option_index = 0; p->name; p++, option_index++)
+            if (!strncmp(p->name, d->__nextchar, namelen))
+            {
+                if (namelen == (unsigned int)strlen(p->name))
+                {
+                    pfound = p;
+                    indfound = option_index;
+                    exact = 1;
+                    break;
+                }
+                else if (pfound == NULL)
+                {
+                    pfound = p;
+                    indfound = option_index;
+                }
+                else if (long_only || pfound->has_arg != p->has_arg || pfound->flag != p->flag || pfound->val != p->val)
+                {
+                    struct option_list *newp = (struct option_list*)alloca(sizeof(*newp));
+                    newp->p = p;
+                    newp->next = ambig_list;
+                    ambig_list = newp;
+                }
+            }
+            if (ambig_list != NULL && !exact)
+            {
+                if (print_errors)
+                {
+                    struct option_list first;
+                    first.p = pfound;
+                    first.next = ambig_list;
+                    ambig_list = &first;
+                    fprintf (stderr, "%s: option '%s' is ambiguous; possibilities:", argv[0], argv[d->optind]);
+                    do
+                    {
+                        fprintf (stderr, " '--%s'", ambig_list->p->name);
+                        ambig_list = ambig_list->next;
+                    }
+                    while (ambig_list != NULL);
+                    fputc ('\n', stderr);
+                }
+                d->__nextchar += strlen(d->__nextchar);
+                d->optind++;
+                d->optopt = 0;
+                return '?';
+            }
+            if (pfound != NULL)
+            {
+                option_index = indfound;
+                d->optind++;
+                if (*nameend)
+                {
+                    if (pfound->has_arg)
+                        d->optarg = nameend + 1;
+                    else
+                    {
+                        if (print_errors)
+                        {
+                            if (argv[d->optind - 1][1] == '-')
+                            {
+                                fprintf(stderr, "%s: option '--%s' doesn't allow an argument\n",argv[0], pfound->name);
+                            }
+                            else
+                            {
+                                fprintf(stderr, "%s: option '%c%s' doesn't allow an argument\n",argv[0], argv[d->optind - 1][0],pfound->name);
+                            }
+                        }
+                        d->__nextchar += strlen(d->__nextchar);
+                        d->optopt = pfound->val;
+                        return '?';
+                    }
+                }
+                else if (pfound->has_arg == 1)
+                {
+                    if (d->optind < argc)
+                        d->optarg = argv[d->optind++];
+                    else
+                    {
+                        if (print_errors)
+                        {
+                            fprintf(stderr,"%s: option '--%s' requires an argument\n",argv[0], pfound->name);
+                        }
+                        d->__nextchar += strlen(d->__nextchar);
+                        d->optopt = pfound->val;
+                        return optstring[0] == ':' ? ':' : '?';
+                    }
+                }
+                d->__nextchar += strlen(d->__nextchar);
+                if (longind != NULL)
+                    *longind = option_index;
+                if (pfound->flag)
+                {
+                    *(pfound->flag) = pfound->val;
+                    return 0;
+                }
+                return pfound->val;
+            }
+            if (!long_only || argv[d->optind][1] == '-' || strchr(optstring, *d->__nextchar) == NULL)
+            {
+                if (print_errors)
+                {
+                    if (argv[d->optind][1] == '-')
+                    {
+                        fprintf(stderr, "%s: unrecognized option '--%s'\n",argv[0], d->__nextchar);
+                    }
+                    else
+                    {
+                        fprintf(stderr, "%s: unrecognized option '%c%s'\n",argv[0], argv[d->optind][0], d->__nextchar);
+                    }
+                }
+                d->__nextchar = (char *)"";
+                d->optind++;
+                d->optopt = 0;
+                return '?';
+            }
+    }
+    {
+        char c = *d->__nextchar++;
+        char *temp = (char*)strchr(optstring, c);
+        if (*d->__nextchar == '\0')
+            ++d->optind;
+        if (temp == NULL || c == ':' || c == ';')
+        {
+            if (print_errors)
+            {
+                fprintf(stderr, "%s: invalid option -- '%c'\n", argv[0], c);
+            }
+            d->optopt = c;
+            return '?';
+        }
+        if (temp[0] == 'W' && temp[1] == ';')
+        {
+            char *nameend;
+            const struct option_a *p;
+            const struct option_a *pfound = NULL;
+            int exact = 0;
+            int ambig = 0;
+            int indfound = 0;
+            int option_index;
+            if (longopts == NULL)
+                goto no_longs;
+            if (*d->__nextchar != '\0')
+            {
+                d->optarg = d->__nextchar;
+                d->optind++;
+            }
+            else if (d->optind == argc)
+            {
+                if (print_errors)
+                {
+                    fprintf(stderr,"%s: option requires an argument -- '%c'\n",argv[0], c);
+                }
+                d->optopt = c;
+                if (optstring[0] == ':')
+                    c = ':';
+                else
+                    c = '?';
+                return c;
+            }
+            else
+                d->optarg = argv[d->optind++];
+            for (d->__nextchar = nameend = d->optarg; *nameend && *nameend != '='; nameend++);
+            for (p = longopts, option_index = 0; p->name; p++, option_index++)
+                if (!strncmp(p->name, d->__nextchar, nameend - d->__nextchar))
+                {
+                    if ((unsigned int) (nameend - d->__nextchar) == strlen(p->name))
+                    {
+                        pfound = p;
+                        indfound = option_index;
+                        exact = 1;
+                        break;
+                    }
+                    else if (pfound == NULL)
+                    {
+                        pfound = p;
+                        indfound = option_index;
+                    }
+                    else if (long_only || pfound->has_arg != p->has_arg || pfound->flag != p->flag || pfound->val != p->val)
+                        ambig = 1;
+                }
+                if (ambig && !exact)
+                {
+                    if (print_errors)
+                    {
+                        fprintf(stderr, "%s: option '-W %s' is ambiguous\n",argv[0], d->optarg);
+                    }
+                    d->__nextchar += strlen(d->__nextchar);
+                    d->optind++;
+                    return '?';
+                }
+                if (pfound != NULL)
+                {
+                    option_index = indfound;
+                    if (*nameend)
+                    {
+                        if (pfound->has_arg)
+                            d->optarg = nameend + 1;
+                        else
+                        {
+                            if (print_errors)
+                            {
+                                fprintf(stderr, "%s: option '-W %s' doesn't allow an argument\n",argv[0], pfound->name);
+                            }
+                            d->__nextchar += strlen(d->__nextchar);
+                            return '?';
+                        }
+                    }
+                    else if (pfound->has_arg == 1)
+                    {
+                        if (d->optind < argc)
+                            d->optarg = argv[d->optind++];
+                        else
+                        {
+                            if (print_errors)
+                            {
+                                fprintf(stderr, "%s: option '-W %s' requires an argument\n",argv[0], pfound->name);
+                            }
+                            d->__nextchar += strlen(d->__nextchar);
+                            return optstring[0] == ':' ? ':' : '?';
+                        }
+                    }
+                    else
+                        d->optarg = NULL;
+                    d->__nextchar += strlen(d->__nextchar);
+                    if (longind != NULL)
+                        *longind = option_index;
+                    if (pfound->flag)
+                    {
+                        *(pfound->flag) = pfound->val;
+                        return 0;
+                    }
+                    return pfound->val;
+                }
+no_longs:
+                d->__nextchar = NULL;
+                return 'W';
+        }
+        if (temp[1] == ':')
+        {
+            if (temp[2] == ':')
+            {
+                if (*d->__nextchar != '\0')
+                {
+                    d->optarg = d->__nextchar;
+                    d->optind++;
+                }
+                else
+                    d->optarg = NULL;
+                d->__nextchar = NULL;
+            }
+            else
+            {
+                if (*d->__nextchar != '\0')
+                {
+                    d->optarg = d->__nextchar;
+                    d->optind++;
+                }
+                else if (d->optind == argc)
+                {
+                    if (print_errors)
+                    {
+                        fprintf(stderr,"%s: option requires an argument -- '%c'\n",argv[0], c);
+                    }
+                    d->optopt = c;
+                    if (optstring[0] == ':')
+                        c = ':';
+                    else
+                        c = '?';
+                }
+                else
+                    d->optarg = argv[d->optind++];
+                d->__nextchar = NULL;
+            }
+        }
+        return c;
+    }
+}
+int _getopt_internal_a (int argc, char *const *argv, const char *optstring, const struct option_a *longopts, int *longind, int long_only, int posixly_correct)
+{
+    int result;
+    getopt_data_a.optind = optind;
+    getopt_data_a.opterr = opterr;
+    result = _getopt_internal_r_a (argc, argv, optstring, longopts,longind, long_only, &getopt_data_a,posixly_correct);
+    optind = getopt_data_a.optind;
+    optarg_a = getopt_data_a.optarg;
+    optopt = getopt_data_a.optopt;
+    return result;
+}
+int getopt_a (int argc, char *const *argv, const char *optstring) _GETOPT_THROW
+{
+    return _getopt_internal_a (argc, argv, optstring, (const struct option_a *) 0, (int *) 0, 0, 0);
+}
+int getopt_long_a (int argc, char *const *argv, const char *options, const struct option_a *long_options, int *opt_index) _GETOPT_THROW
+{
+    return _getopt_internal_a (argc, argv, options, long_options, opt_index, 0, 0);
+}
+int getopt_long_only_a (int argc, char *const *argv, const char *options, const struct option_a *long_options, int *opt_index) _GETOPT_THROW
+{
+    return _getopt_internal_a (argc, argv, options, long_options, opt_index, 1, 0);
+}
+int _getopt_long_r_a (int argc, char *const *argv, const char *options, const struct option_a *long_options, int *opt_index, struct _getopt_data_a *d)
+{
+    return _getopt_internal_r_a (argc, argv, options, long_options, opt_index,0, d, 0);
+}
+int _getopt_long_only_r_a (int argc, char *const *argv, const char *options, const struct option_a *long_options, int *opt_index, struct _getopt_data_a *d)
+{
+    return _getopt_internal_r_a (argc, argv, options, long_options, opt_index, 1, d, 0);
+}
+
+//
+//
+//	Unicode Structures and Functions
+//
+//
+
+static struct _getopt_data_w
+{
+    int optind;
+    int opterr;
+    int optopt;
+    wchar_t *optarg;
+    int __initialized;
+    wchar_t *__nextchar;
+    enum ENUM_ORDERING __ordering;
+    int __posixly_correct;
+    int __first_nonopt;
+    int __last_nonopt;
+} getopt_data_w;
+wchar_t *optarg_w;
+
+static void exchange_w(wchar_t **argv, struct _getopt_data_w *d)
+{
+    int bottom = d->__first_nonopt;
+    int middle = d->__last_nonopt;
+    int top = d->optind;
+    wchar_t *tem;
+    while (top > middle && middle > bottom)
+    {
+        if (top - middle > middle - bottom)
+        {
+            int len = middle - bottom;
+            register int i;
+            for (i = 0; i < len; i++)
+            {
+                tem = argv[bottom + i];
+                argv[bottom + i] = argv[top - (middle - bottom) + i];
+                argv[top - (middle - bottom) + i] = tem;
+            }
+            top -= len;
+        }
+        else
+        {
+            int len = top - middle;
+            register int i;
+            for (i = 0; i < len; i++)
+            {
+                tem = argv[bottom + i];
+                argv[bottom + i] = argv[middle + i];
+                argv[middle + i] = tem;
+            }
+            bottom += len;
+        }
+    }
+    d->__first_nonopt += (d->optind - d->__last_nonopt);
+    d->__last_nonopt = d->optind;
+}
+static const wchar_t *_getopt_initialize_w (const wchar_t *optstring, struct _getopt_data_w *d, int posixly_correct)
+{
+    d->__first_nonopt = d->__last_nonopt = d->optind;
+    d->__nextchar = NULL;
+    d->__posixly_correct = posixly_correct | !!_wgetenv(L"POSIXLY_CORRECT");
+    if (optstring[0] == L'-')
+    {
+        d->__ordering = RETURN_IN_ORDER;
+        ++optstring;
+    }
+    else if (optstring[0] == L'+')
+    {
+        d->__ordering = REQUIRE_ORDER;
+        ++optstring;
+    }
+    else if (d->__posixly_correct)
+        d->__ordering = REQUIRE_ORDER;
+    else
+        d->__ordering = PERMUTE;
+    return optstring;
+}
+int _getopt_internal_r_w (int argc, wchar_t *const *argv, const wchar_t *optstring, const struct option_w *longopts, int *longind, int long_only, struct _getopt_data_w *d, int posixly_correct)
+{
+    int print_errors = d->opterr;
+    if (argc < 1)
+        return -1;
+    d->optarg = NULL;
+    if (d->optind == 0 || !d->__initialized)
+    {
+        if (d->optind == 0)
+            d->optind = 1;
+        optstring = _getopt_initialize_w (optstring, d, posixly_correct);
+        d->__initialized = 1;
+    }
+    else if (optstring[0] == L'-' || optstring[0] == L'+')
+        optstring++;
+    if (optstring[0] == L':')
+        print_errors = 0;
+    if (d->__nextchar == NULL || *d->__nextchar == L'\0')
+    {
+        if (d->__last_nonopt > d->optind)
+            d->__last_nonopt = d->optind;
+        if (d->__first_nonopt > d->optind)
+            d->__first_nonopt = d->optind;
+        if (d->__ordering == PERMUTE)
+        {
+            if (d->__first_nonopt != d->__last_nonopt && d->__last_nonopt != d->optind)
+                exchange_w((wchar_t **) argv, d);
+            else if (d->__last_nonopt != d->optind)
+                d->__first_nonopt = d->optind;
+            while (d->optind < argc && (argv[d->optind][0] != L'-' || argv[d->optind][1] == L'\0'))
+                d->optind++;
+            d->__last_nonopt = d->optind;
+        }
+        if (d->optind != argc && !wcscmp(argv[d->optind], L"--"))
+        {
+            d->optind++;
+            if (d->__first_nonopt != d->__last_nonopt && d->__last_nonopt != d->optind)
+                exchange_w((wchar_t **) argv, d);
+            else if (d->__first_nonopt == d->__last_nonopt)
+                d->__first_nonopt = d->optind;
+            d->__last_nonopt = argc;
+            d->optind = argc;
+        }
+        if (d->optind == argc)
+        {
+            if (d->__first_nonopt != d->__last_nonopt)
+                d->optind = d->__first_nonopt;
+            return -1;
+        }
+        if ((argv[d->optind][0] != L'-' || argv[d->optind][1] == L'\0'))
+        {
+            if (d->__ordering == REQUIRE_ORDER)
+                return -1;
+            d->optarg = argv[d->optind++];
+            return 1;
+        }
+        d->__nextchar = (argv[d->optind] + 1 + (longopts != NULL && argv[d->optind][1] == L'-'));
+    }
+    if (longopts != NULL && (argv[d->optind][1] == L'-' || (long_only && (argv[d->optind][2] || !wcschr(optstring, argv[d->optind][1])))))
+    {
+        wchar_t *nameend;
+        unsigned int namelen;
+        const struct option_w *p;
+        const struct option_w *pfound = NULL;
+        struct option_list
+        {
+            const struct option_w *p;
+            struct option_list *next;
+        } *ambig_list = NULL;
+        int exact = 0;
+        int indfound = -1;
+        int option_index;
+        for (nameend = d->__nextchar; *nameend && *nameend != L'='; nameend++);
+        namelen = (unsigned int)(nameend - d->__nextchar);
+        for (p = longopts, option_index = 0; p->name; p++, option_index++)
+            if (!wcsncmp(p->name, d->__nextchar, namelen))
+            {
+                if (namelen == (unsigned int)wcslen(p->name))
+                {
+                    pfound = p;
+                    indfound = option_index;
+                    exact = 1;
+                    break;
+                }
+                else if (pfound == NULL)
+                {
+                    pfound = p;
+                    indfound = option_index;
+                }
+                else if (long_only || pfound->has_arg != p->has_arg || pfound->flag != p->flag || pfound->val != p->val)
+                {
+                    struct option_list *newp = (struct option_list*)alloca(sizeof(*newp));
+                    newp->p = p;
+                    newp->next = ambig_list;
+                    ambig_list = newp;
+                }
+            }
+            if (ambig_list != NULL && !exact)
+            {
+                if (print_errors)
+                {
+                    struct option_list first;
+                    first.p = pfound;
+                    first.next = ambig_list;
+                    ambig_list = &first;
+                    fwprintf(stderr, L"%s: option '%s' is ambiguous; possibilities:", argv[0], argv[d->optind]);
+                    do
+                    {
+                        fwprintf (stderr, L" '--%s'", ambig_list->p->name);
+                        ambig_list = ambig_list->next;
+                    }
+                    while (ambig_list != NULL);
+                    fputwc (L'\n', stderr);
+                }
+                d->__nextchar += wcslen(d->__nextchar);
+                d->optind++;
+                d->optopt = 0;
+                return L'?';
+            }
+            if (pfound != NULL)
+            {
+                option_index = indfound;
+                d->optind++;
+                if (*nameend)
+                {
+                    if (pfound->has_arg)
+                        d->optarg = nameend + 1;
+                    else
+                    {
+                        if (print_errors)
+                        {
+                            if (argv[d->optind - 1][1] == L'-')
+                            {
+                                fwprintf(stderr, L"%s: option '--%s' doesn't allow an argument\n",argv[0], pfound->name);
+                            }
+                            else
+                            {
+                                fwprintf(stderr, L"%s: option '%c%s' doesn't allow an argument\n",argv[0], argv[d->optind - 1][0],pfound->name);
+                            }
+                        }
+                        d->__nextchar += wcslen(d->__nextchar);
+                        d->optopt = pfound->val;
+                        return L'?';
+                    }
+                }
+                else if (pfound->has_arg == 1)
+                {
+                    if (d->optind < argc)
+                        d->optarg = argv[d->optind++];
+                    else
+                    {
+                        if (print_errors)
+                        {
+                            fwprintf(stderr,L"%s: option '--%s' requires an argument\n",argv[0], pfound->name);
+                        }
+                        d->__nextchar += wcslen(d->__nextchar);
+                        d->optopt = pfound->val;
+                        return optstring[0] == L':' ? L':' : L'?';
+                    }
+                }
+                d->__nextchar += wcslen(d->__nextchar);
+                if (longind != NULL)
+                    *longind = option_index;
+                if (pfound->flag)
+                {
+                    *(pfound->flag) = pfound->val;
+                    return 0;
+                }
+                return pfound->val;
+            }
+            if (!long_only || argv[d->optind][1] == L'-' || wcschr(optstring, *d->__nextchar) == NULL)
+            {
+                if (print_errors)
+                {
+                    if (argv[d->optind][1] == L'-')
+                    {
+                        fwprintf(stderr, L"%s: unrecognized option '--%s'\n",argv[0], d->__nextchar);
+                    }
+                    else
+                    {
+                        fwprintf(stderr, L"%s: unrecognized option '%c%s'\n",argv[0], argv[d->optind][0], d->__nextchar);
+                    }
+                }
+                d->__nextchar = (wchar_t *)L"";
+                d->optind++;
+                d->optopt = 0;
+                return L'?';
+            }
+    }
+    {
+        wchar_t c = *d->__nextchar++;
+        wchar_t *temp = (wchar_t*)wcschr(optstring, c);
+        if (*d->__nextchar == L'\0')
+            ++d->optind;
+        if (temp == NULL || c == L':' || c == L';')
+        {
+            if (print_errors)
+            {
+                fwprintf(stderr, L"%s: invalid option -- '%c'\n", argv[0], c);
+            }
+            d->optopt = c;
+            return L'?';
+        }
+        if (temp[0] == L'W' && temp[1] == L';')
+        {
+            wchar_t *nameend;
+            const struct option_w *p;
+            const struct option_w *pfound = NULL;
+            int exact = 0;
+            int ambig = 0;
+            int indfound = 0;
+            int option_index;
+            if (longopts == NULL)
+                goto no_longs;
+            if (*d->__nextchar != L'\0')
+            {
+                d->optarg = d->__nextchar;
+                d->optind++;
+            }
+            else if (d->optind == argc)
+            {
+                if (print_errors)
+                {
+                    fwprintf(stderr,L"%s: option requires an argument -- '%c'\n",argv[0], c);
+                }
+                d->optopt = c;
+                if (optstring[0] == L':')
+                    c = L':';
+                else
+                    c = L'?';
+                return c;
+            }
+            else
+                d->optarg = argv[d->optind++];
+            for (d->__nextchar = nameend = d->optarg; *nameend && *nameend != L'='; nameend++);
+            for (p = longopts, option_index = 0; p->name; p++, option_index++)
+                if (!wcsncmp(p->name, d->__nextchar, nameend - d->__nextchar))
+                {
+                    if ((unsigned int) (nameend - d->__nextchar) == wcslen(p->name))
+                    {
+                        pfound = p;
+                        indfound = option_index;
+                        exact = 1;
+                        break;
+                    }
+                    else if (pfound == NULL)
+                    {
+                        pfound = p;
+                        indfound = option_index;
+                    }
+                    else if (long_only || pfound->has_arg != p->has_arg || pfound->flag != p->flag || pfound->val != p->val)
+                        ambig = 1;
+                }
+                if (ambig && !exact)
+                {
+                    if (print_errors)
+                    {
+                        fwprintf(stderr, L"%s: option '-W %s' is ambiguous\n",argv[0], d->optarg);
+                    }
+                    d->__nextchar += wcslen(d->__nextchar);
+                    d->optind++;
+                    return L'?';
+                }
+                if (pfound != NULL)
+                {
+                    option_index = indfound;
+                    if (*nameend)
+                    {
+                        if (pfound->has_arg)
+                            d->optarg = nameend + 1;
+                        else
+                        {
+                            if (print_errors)
+                            {
+                                fwprintf(stderr, L"%s: option '-W %s' doesn't allow an argument\n",argv[0], pfound->name);
+                            }
+                            d->__nextchar += wcslen(d->__nextchar);
+                            return L'?';
+                        }
+                    }
+                    else if (pfound->has_arg == 1)
+                    {
+                        if (d->optind < argc)
+                            d->optarg = argv[d->optind++];
+                        else
+                        {
+                            if (print_errors)
+                            {
+                                fwprintf(stderr, L"%s: option '-W %s' requires an argument\n",argv[0], pfound->name);
+                            }
+                            d->__nextchar += wcslen(d->__nextchar);
+                            return optstring[0] == L':' ? L':' : L'?';
+                        }
+                    }
+                    else
+                        d->optarg = NULL;
+                    d->__nextchar += wcslen(d->__nextchar);
+                    if (longind != NULL)
+                        *longind = option_index;
+                    if (pfound->flag)
+                    {
+                        *(pfound->flag) = pfound->val;
+                        return 0;
+                    }
+                    return pfound->val;
+                }
+no_longs:
+                d->__nextchar = NULL;
+                return L'W';
+        }
+        if (temp[1] == L':')
+        {
+            if (temp[2] == L':')
+            {
+                if (*d->__nextchar != L'\0')
+                {
+                    d->optarg = d->__nextchar;
+                    d->optind++;
+                }
+                else
+                    d->optarg = NULL;
+                d->__nextchar = NULL;
+            }
+            else
+            {
+                if (*d->__nextchar != L'\0')
+                {
+                    d->optarg = d->__nextchar;
+                    d->optind++;
+                }
+                else if (d->optind == argc)
+                {
+                    if (print_errors)
+                    {
+                        fwprintf(stderr,L"%s: option requires an argument -- '%c'\n",argv[0], c);
+                    }
+                    d->optopt = c;
+                    if (optstring[0] == L':')
+                        c = L':';
+                    else
+                        c = L'?';
+                }
+                else
+                    d->optarg = argv[d->optind++];
+                d->__nextchar = NULL;
+            }
+        }
+        return c;
+    }
+}
+int _getopt_internal_w (int argc, wchar_t *const *argv, const wchar_t *optstring, const struct option_w *longopts, int *longind, int long_only, int posixly_correct)
+{
+    int result;
+    getopt_data_w.optind = optind;
+    getopt_data_w.opterr = opterr;
+    result = _getopt_internal_r_w (argc, argv, optstring, longopts,longind, long_only, &getopt_data_w,posixly_correct);
+    optind = getopt_data_w.optind;
+    optarg_w = getopt_data_w.optarg;
+    optopt = getopt_data_w.optopt;
+    return result;
+}
+int getopt_w (int argc, wchar_t *const *argv, const wchar_t *optstring) _GETOPT_THROW
+{
+    return _getopt_internal_w (argc, argv, optstring, (const struct option_w *) 0, (int *) 0, 0, 0);
+}
+int getopt_long_w (int argc, wchar_t *const *argv, const wchar_t *options, const struct option_w *long_options, int *opt_index) _GETOPT_THROW
+{
+    return _getopt_internal_w (argc, argv, options, long_options, opt_index, 0, 0);
+}
+int getopt_long_only_w (int argc, wchar_t *const *argv, const wchar_t *options, const struct option_w *long_options, int *opt_index) _GETOPT_THROW
+{
+    return _getopt_internal_w (argc, argv, options, long_options, opt_index, 1, 0);
+}
+int _getopt_long_r_w (int argc, wchar_t *const *argv, const wchar_t *options, const struct option_w *long_options, int *opt_index, struct _getopt_data_w *d)
+{
+    return _getopt_internal_r_w (argc, argv, options, long_options, opt_index,0, d, 0);
+}
+int _getopt_long_only_r_w (int argc, wchar_t *const *argv, const wchar_t *options, const struct option_w *long_options, int *opt_index, struct _getopt_data_w *d)
+{
+    return _getopt_internal_r_w (argc, argv, options, long_options, opt_index, 1, d, 0);
+}
@@ -0,0 +1,97 @@
+#ifndef __WINGETOPT_H_
+    #define __WINGETOPT_H_
+
+    #ifdef _GETOPT_API
+        #undef _GETOPT_API
+    #endif
+
+    #if defined(EXPORTS_GETOPT) && defined(STATIC_GETOPT)
+        #error "The preprocessor definitions of EXPORTS_GETOPT and STATIC_GETOPT can only be used individually"
+    #elif defined(STATIC_GETOPT)
+        #define _GETOPT_API
+    #elif defined(EXPORTS_GETOPT)
+        #define _GETOPT_API __declspec(dllexport)
+    #else
+        #define _GETOPT_API __declspec(dllimport)
+    #endif
+
+    // Change behavior for C\C++
+    #ifdef __cplusplus
+        #define _BEGIN_EXTERN_C extern "C" {
+        #define _END_EXTERN_C }
+        #define _GETOPT_THROW throw()
+    #else
+        #define _BEGIN_EXTERN_C
+        #define _END_EXTERN_C
+        #define _GETOPT_THROW
+    #endif
+
+    // Standard GNU options
+    #define	null_argument		0	/*Argument Null*/
+    #define	no_argument			0	/*Argument Switch Only*/
+    #define required_argument	1	/*Argument Required*/
+    #define optional_argument	2	/*Argument Optional*/
+
+
+    // Shorter Options
+    #define ARG_NULL	0	/*Argument Null*/
+    #define ARG_NONE	0	/*Argument Switch Only*/
+    #define ARG_REQ		1	/*Argument Required*/
+    #define ARG_OPT		2	/*Argument Optional*/
+
+    #include <string.h>
+    #include <wchar.h>
+
+_BEGIN_EXTERN_C
+
+    extern _GETOPT_API int optind;
+    extern _GETOPT_API int opterr;
+    extern _GETOPT_API int optopt;
+
+    // Ansi
+    struct option_a
+    {
+        const char* name;
+        int has_arg;
+        int *flag;
+        int val;
+    };
+    extern _GETOPT_API char *optarg_a;
+    extern _GETOPT_API int getopt_a(int argc, char *const *argv, const char *optstring) _GETOPT_THROW;
+    extern _GETOPT_API int getopt_long_a(int argc, char *const *argv, const char *options, const struct option_a *long_options, int *opt_index) _GETOPT_THROW;
+    extern _GETOPT_API int getopt_long_only_a(int argc, char *const *argv, const char *options, const struct option_a *long_options, int *opt_index) _GETOPT_THROW;
+
+    // Unicode
+    struct option_w
+    {
+        const wchar_t* name;
+        int has_arg;
+        int *flag;
+        int val;
+    };
+    extern _GETOPT_API wchar_t *optarg_w;
+    extern _GETOPT_API int getopt_w(int argc, wchar_t *const *argv, const wchar_t *optstring) _GETOPT_THROW;
+    extern _GETOPT_API int getopt_long_w(int argc, wchar_t *const *argv, const wchar_t *options, const struct option_w *long_options, int *opt_index) _GETOPT_THROW;
+    extern _GETOPT_API int getopt_long_only_w(int argc, wchar_t *const *argv, const wchar_t *options, const struct option_w *long_options, int *opt_index) _GETOPT_THROW;
+
+_END_EXTERN_C
+
+    #undef _BEGIN_EXTERN_C
+    #undef _END_EXTERN_C
+    #undef _GETOPT_THROW
+    #undef _GETOPT_API
+
+    #ifdef _UNICODE
+        #define getopt getopt_w
+        #define getopt_long getopt_long_w
+        #define getopt_long_only getopt_long_only_w
+        #define option option_w
+        #define optarg optarg_w
+    #else
+        #define getopt getopt_a
+        #define getopt_long getopt_long_a
+        #define getopt_long_only getopt_long_only_a
+        #define option option_a
+        #define optarg optarg_a
+    #endif
+#endif  // __WINGETOPT_H_
@@ -1,7 +1,7 @@
 dnl define macros
 m4_define([opendht_major_version], 1)
-m4_define([opendht_minor_version], 0)
-m4_define([opendht_patch_version], 2)
+m4_define([opendht_minor_version], 2)
+m4_define([opendht_patch_version], 0)
 m4_define([opendht_version],
 		  [opendht_major_version.opendht_minor_version.opendht_patch_version])

@@ -24,6 +24,14 @@ AS_IF([test "x$enable_debug" = "xyes"],
 AC_PROG_CXX
 AM_PROG_AR

+dnl Check for logs
+AC_ARG_ENABLE([logs], [AS_HELP_STRING([--disable-logs], [Disble DHT logs])])
+AS_IF([test "x$enable_logs" != "xno"], [
+	AC_DEFINE([OPENDHT_LOG], [true], [Define if DHT logs are enabled])
+], [
+	AC_DEFINE([OPENDHT_LOG], [false], [Define if DHT logs are enabled])
+])
+
 dnl Check for Doxygen
 AC_ARG_ENABLE([doc], AS_HELP_STRING([--enable-doc], [Enable documentation generation (doxygen)]))
 AS_IF([test "x$enable_doc" = "xyes"], [
@@ -0,0 +1,142 @@
+\documentclass[11pt]{article}
+
+\usepackage[utf8x]{inputenc}
+\usepackage[top=2cm,bottom=2cm]{geometry}
+
+\usepackage{forloop}
+\newcounter{counter}
+
+% maths
+\usepackage{amssymb}
+\usepackage{amsmath}
+\usepackage{mathrsfs}
+\usepackage{shadethm}
+\usepackage{amsthm}
+\newshadetheorem{shadeDef}{Definition}[section]
+\newtheorem{remark}{Remark}[section]
+\renewcommand{\P}{\mathbb{P}}
+
+\usepackage{float}
+\usepackage{booktabs}
+
+\setlength{\parindent}{0ex}
+\setlength{\parskip}{0.5em}
+
+\begin{document}
+    \title{Annex 1: Probabilistic analysis of connectivity changes}
+    \author{Adrien Béraud, Simon Désaulniers, Guillaume Roguez}
+    \maketitle
+    \pagestyle{empty}
+    \begin{shadeDef}
+        A node flagged as \emph{``expired''} by a node $n$ is a node which has not responded to any
+        of $n$'s last three requests.
+    \end{shadeDef}
+    \begin{remark}
+        An expired node will not be contacted before 10 minutes from its expiration time.
+    \end{remark}
+
+    Let $N$ the DHT network, $n_0\in N$, a given node and the following probabilistic events:
+    \begin{itemize}
+        \item $A$: $\forall n \in N$ $n$ is unreachable by $n_0$, \emph{i.e.} $n_0$ lost connection
+            with $N$;
+        \item $B$: $S\subset N$, the nodes unreachable by $n_0$ with $k={|S|\over|N|}$;
+        \item $C$: $m \le |N|$ nodes are flagged as ``expired''.
+    \end{itemize}
+
+    We are interested in knowing $\P(A|C)$, \emph{i.e.} the probability of the event where $A$ occurs
+    prior to $C$. From the above, we immediately get
+    $$\left\{
+        \begin{array}{ll}
+            \P(C|A)       & = 1\\
+            \P(A) + \P(B) & = 1
+        \end{array}
+    \right.$$
+    Also, the event $A|C$ can be abstracted as the urn problem of draw without replacement. Then,
+        $$\P(C|B) = \prod_{i=0}^m \left[k|N| - i \over |N|\right] = \prod_{i=0}^m \left[k - { i \over |N| }\right]$$
+    Furthermore, using Bayes' theroem we have
+    \begin{align*}
+        \P(A|C) & = { \P(C|A)\P(A) \over \P(C|A)\P(A) + \P(C|B)\P(B)}\\
+                & = { \P(A) \over \P(A) + \P(C|B)\P(B) }\\
+                & = { \P(A) \over \P(A) + \P(C|B)\left[1 - \P(A)\right] }\\
+        \Rightarrow \forloop{counter}{0}{\value{counter} < 5}{\qquad}\quad  \P(A)  & =
+            \P(A|C)\left[\P(A) + \P(C|B)\left(1 - \P(A)\right) \right] \\
+        \Rightarrow \forloop{counter}{0}{\value{counter} < 2}{\qquad}\;\:\, \P(A)\left[{ 1 \over \P(A|C)} - 1\right] & =
+            \P(C|B)\left(1 - \P(A)\right) \\
+    \end{align*}
+    Finally,
+    \begin{equation}
+        \label{eq:final}
+        \left[{\P(A) \over 1 - \P(A)}\right]\left[{ 1 \over \P(A|C)} - 1\right] =
+            \prod_{i=0}^m \left[k - { i \over |N| }\right]
+    \end{equation}
+
+    From \eqref{eq:final}, we may set a plausible configuration $\{\P(A),\P(A|C),k,|N|\}$ letting us
+    produce results such as in table \ref{tbl:k_1_2}, \ref{tbl:k_2_3} and \ref{tbl:k_3_4}.
+
+    \begin{table}[H]
+        \centering
+        \caption{The values for $m$ assuming $\P(A|C) \ge 0.95,\, k = {1 \over 2}$}
+        \label{tbl:k_1_2}
+        \begin{tabular}{lcccc}
+            \toprule
+            $|N| \diagdown \P(A)$ & ${1 \over 10 }$ & ${1 \over 100 }$ & ${1 \over 1000 }$ & ${1 \over 10000 }$\\
+            \midrule
+            $2^0$               & 1               & 1                & 1                 & 1\\
+            $2^1$               & 1               & 1                & 1                 & 1\\
+            $2^2$               & 2               & 2                & 2                 & 2\\
+            $2^3$               & 4               & 4                & 4                 & 4\\
+            $2^4$               & 5               & 6                & 7                 & 8\\
+            $2^5$               & 5               & 7                & 9                 & 10\\
+            $2^6$               & 6               & 9                & 11                & 13\\
+            $2^7$               & 6               & 9                & 12                & 14\\
+            $2^8$               & 7               & 10               & 13                & 16\\
+            $2^9$               & 7               & 10               & 13                & 16\\
+            $2^{10}$            & 7               & 10               & 13                & 17\\
+            \bottomrule
+        \end{tabular}
+    \end{table}
+    \begin{table}[H]
+        \centering
+        \caption{The values for $m$ assuming $\P(A|C) \ge 0.95,\, k = {2 \over 3}$}
+        \label{tbl:k_2_3}
+        \begin{tabular}{lcccc}
+            \toprule
+            $|N| \diagdown \P(A)$ & ${1 \over 10 }$ & ${1 \over 100 }$ & ${1 \over 1000 }$ & ${1 \over 10000 }$\\
+            \midrule
+            $2^0$               & 1               & 1                & 1                 & 1\\
+            $2^1$               & 2               & 2                & 2                 & 2\\
+            $2^2$               & 3               & 3                & 4                 & 4\\
+            $2^3$               & 5               & 5                & 6                 & 8\\
+            $2^4$               & 6               & 8                & 9                 & 10\\
+            $2^5$               & 8               & 10               & 12                & 14\\
+            $2^6$               & 9               & 13               & 16                & 18\\
+            $2^7$               & 11              & 15               & 18                & 22\\
+            $2^8$               & 11              & 16               & 21                & 25\\
+            $2^9$               & 12              & 17               & 22                & 27\\
+            $2^{10}$            & 12              & 18               & 23                & 28\\
+            \bottomrule
+        \end{tabular}
+    \end{table}
+    \begin{table}[H]
+        \centering
+        \caption{The values for $m$ assuming $\P(A|C) \ge 0.95,\, k = {3 \over 4}$}
+        \label{tbl:k_3_4}
+        \begin{tabular}{lcccc}
+            \toprule
+            $|N| \diagdown \P(A)$ & ${1 \over 10 }$ & ${1 \over 100 }$ & ${1 \over 1000 }$ & ${1 \over 10000 }$\\
+            \midrule
+            $2^0$               & 1               & 1                & 1                 & 1\\
+            $2^1$               & 2               & 2                & 2                 & 2\\
+            $2^2$               & 3               & 3                & 3                 & 3\\
+            $2^3$               & 5               & 6                & 6                 & 6\\
+            $2^4$               & 7               & 9                & 10                & 11\\
+            $2^5$               & 10              & 12               & 14                & 16\\
+            $2^6$               & 12              & 16               & 19                & 22\\
+            $2^7$               & 14              & 19               & 23                & 27\\
+            $2^8$               & 15              & 21               & 27                & 32\\
+            $2^9$               & 16              & 23               & 30                & 36\\
+            $2^{10}$            & 17              & 24               & 31                & 38\\
+            \bottomrule
+        \end{tabular}
+    \end{table}
+\end{document}
@@ -14,8 +14,7 @@
 *  GNU General Public License for more details.
 *
 *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
+ *  along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

 #pragma once
@@ -27,6 +26,7 @@
 #include "scheduler.h"
 #include "routing_table.h"
 #include "callbacks.h"
+#include "log_enable.h"

 #include <string>
 #include <array>
@@ -100,6 +100,13 @@ public:
     */
    void setLoggers(LogMethod error = NOLOG, LogMethod warn = NOLOG, LogMethod debug = NOLOG);

+    /**
+     * Only print logs related to the given InfoHash (if given), or disable filter (if zeroes).
+     */
+    void setLogFilter(const InfoHash& f) {
+        DHT_LOG.setFilter(f);
+    }
+
    virtual void registerType(const ValueType& type) {
        types[type.id] = type;
    }
@@ -121,7 +128,7 @@ public:
        insertNode(n.id, SockAddr(n.ss, n.sslen));
    }

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

    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) {
@@ -245,7 +252,12 @@ public:
     * 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();
+    void connectivityChanged(sa_family_t);
+    void connectivityChanged() {
+        reported_addr.clear();
+        connectivityChanged(AF_INET);
+        connectivityChanged(AF_INET6);
+    }

    /**
     * Get the list of good nodes for local storage saving purposes
@@ -259,8 +271,11 @@ public:
    unsigned getNodesStats(sa_family_t af, unsigned *good_return, unsigned *dubious_return, unsigned *cached_return,
            unsigned *incoming_return) const;
    std::string getStorageLog() const;
+    std::string getStorageLog(const InfoHash&) const;
+
    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;

    void dumpTables() const;
    std::vector<unsigned> getNodeMessageStats(bool in = false) {
@@ -286,6 +301,8 @@ public:

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

 private:

@@ -294,6 +311,16 @@ private:
       the target 8 turn out to be dead. */
    static constexpr unsigned SEARCH_NODES {14};

+    /* The number of bad nodes is limited in order to help determine
+     * presence of connectivity changes. See
+     * https://github.com/savoirfairelinux/opendht/issues/137 for details.
+     *
+     * According to the tables, 25 is a good average value for big networks. If
+     * the network is small, normal search expiration process will handle the
+     * situation.
+     * */
+    static constexpr unsigned SEARCH_MAX_BAD_NODES {25};
+
    /* Concurrent search nodes requested count */
    static constexpr unsigned MAX_REQUESTED_SEARCH_NODES {4};

@@ -350,7 +377,7 @@ private:
    const bool is_bootstrap {false};

    // the stuff
-    RoutingTable buckets {};
+    RoutingTable buckets4 {};
    RoutingTable buckets6 {};

    std::map<InfoHash, Storage> store;
@@ -358,8 +385,9 @@ private:
    size_t total_store_size {0};
    size_t max_store_size {DEFAULT_STORAGE_LIMIT};

-    std::map<InfoHash, std::shared_ptr<Search>> searches4 {};
-    std::map<InfoHash, std::shared_ptr<Search>> searches6 {};
+    using SearchMap = std::map<InfoHash, std::shared_ptr<Search>>;
+    SearchMap searches4 {};
+    SearchMap searches6 {};
    uint16_t search_id {0};

    // map a global listen token to IPv4, IPv6 specific listen tokens.
@@ -368,7 +396,7 @@ private:
    size_t listener_token {1};

    // timing
-    Scheduler scheduler {};
+    Scheduler scheduler;
    std::shared_ptr<Scheduler::Job> nextNodesConfirmation {};
    std::shared_ptr<Scheduler::Job> nextStorageMaintenance {};
    time_point mybucket_grow_time {time_point::min()}, mybucket6_grow_time {time_point::min()};
@@ -392,22 +420,25 @@ private:
    bool storageStore(const InfoHash& id, const std::shared_ptr<Value>& value, time_point created);
    void expireStorage();
    void storageChanged(const InfoHash& id, Storage& st, ValueStorage&);
+    std::string printStorageLog(const decltype(store)::value_type&) const;

    /**
     * For a given storage, if values don't belong there anymore because this
     * node is too far from the target, values are sent to the appropriate
     * nodes.
     */
-    void dataPersistence();
-    size_t maintainStorage(InfoHash id, bool force=false, DoneCallback donecb=nullptr);
+    void dataPersistence(InfoHash id);
+    size_t maintainStorage(decltype(store)::value_type&, bool force=false, DoneCallback donecb=nullptr);

    // Buckets
+    RoutingTable& buckets(sa_family_t af) { return af == AF_INET ? buckets4 : buckets6; }
+    const RoutingTable& buckets(sa_family_t af) const { return af == AF_INET ? buckets4 : buckets6; }
    Bucket* findBucket(const InfoHash& id, sa_family_t af) {
        RoutingTable::iterator b;
        switch (af) {
        case AF_INET:
-            b = buckets.findBucket(id);
-            return b == buckets.end() ? nullptr : &(*b);
+            b = buckets4.findBucket(id);
+            return b == buckets4.end() ? nullptr : &(*b);
        case AF_INET6:
            b = buckets6.findBucket(id);
            return b == buckets6.end() ? nullptr : &(*b);
@@ -432,6 +463,9 @@ private:

    // Searches

+    inline SearchMap& searches(sa_family_t af) { return af == AF_INET ? searches4 : searches6; }
+    inline const SearchMap& searches(sa_family_t af) const { return af == AF_INET ? searches4 : searches6; }
+
    /**
     * Low-level method that will perform a search on the DHT for the specified
     * infohash (id), using the specified IP version (IPv4 or IPv6).
@@ -522,30 +556,37 @@ private:
    /* when we receive a ping request */
    NetworkEngine::RequestAnswer onPing(std::shared_ptr<Node> node);
    /* when we receive a "find node" request */
-    NetworkEngine::RequestAnswer onFindNode(std::shared_ptr<Node> node, InfoHash& hash, want_t want);
+    NetworkEngine::RequestAnswer onFindNode(std::shared_ptr<Node> node, const InfoHash& hash, want_t want);
    void onFindNodeDone(const Request& status, NetworkEngine::RequestAnswer& a, std::shared_ptr<Search> sr);
    /* when we receive a "get values" request */
-    NetworkEngine::RequestAnswer onGetValues(std::shared_ptr<Node> node, InfoHash& hash, want_t want, const Query& q);
+    NetworkEngine::RequestAnswer onGetValues(std::shared_ptr<Node> node,
+            const InfoHash& hash,
+            want_t want,
+            const Query& q);
    void onGetValuesDone(const Request& status,
            NetworkEngine::RequestAnswer& a,
            std::shared_ptr<Search>& sr,
            const std::shared_ptr<Query>& orig_query);
    /* when we receive a listen request */
    NetworkEngine::RequestAnswer onListen(std::shared_ptr<Node> node,
-            InfoHash& hash,
-            Blob& token,
+            const InfoHash& hash,
+            const Blob& token,
            size_t rid,
-            Query&& query);
+            const Query& query);
    void onListenDone(const Request& status,
            NetworkEngine::RequestAnswer& a,
            std::shared_ptr<Search>& sr,
            const std::shared_ptr<Query>& orig_query);
    /* when we receive an announce request */
    NetworkEngine::RequestAnswer onAnnounce(std::shared_ptr<Node> node,
-            InfoHash& hash,
-            Blob& token,
-            std::vector<std::shared_ptr<Value>> v,
-            time_point created);
+            const InfoHash& hash,
+            const Blob& token,
+            const std::vector<std::shared_ptr<Value>>& v,
+            const time_point& created);
+    NetworkEngine::RequestAnswer onRefresh(std::shared_ptr<Node> node,
+            const InfoHash& hash,
+            const Blob& token,
+            const Value::Id& vid);
    void onAnnounceDone(const Request& status, NetworkEngine::RequestAnswer& a, std::shared_ptr<Search>& sr);
 };

@@ -25,6 +25,7 @@
 #include "value.h"
 #include "callbacks.h"
 #include "sockaddr.h"
+#include "log_enable.h"

 #include <thread>
 #include <mutex>
@@ -197,10 +198,31 @@ public:
    }
    void putEncrypted(const std::string& key, InfoHash to, Value&& value, DoneCallback cb={});

-    void bootstrap(const char* host, const char* service);
-    void bootstrap(const std::vector<std::pair<sockaddr_storage, socklen_t>>& nodes);
+    /**
+     * Insert known nodes to the routing table, without necessarly ping them.
+     * Usefull to restart a node and get things running fast without putting load on the network.
+     */
+    void bootstrap(const std::vector<std::pair<sockaddr_storage, socklen_t>>& nodes, DoneCallbackSimple&& cb={});
+
+    /**
+     * Insert known nodes to the routing table, without necessarly ping them.
+     * Usefull to restart a node and get things running fast without putting load on the network.
+     */
    void bootstrap(const std::vector<NodeExport>& nodes);

+    /**
+     * Add host:service to bootstrap nodes, and ping this node.
+     * DNS resolution is performed asynchronously.
+     * When disconnected, all bootstrap nodes added with this method will be tried regularly until connection
+     * to the DHT network is established.
+     */
+    void bootstrap(const std::string& host, const std::string& service);
+
+    /**
+     * Clear the list of bootstrap added using bootstrap(const std::string&, const std::string&).
+     */
+    void clearBootstrap();
+
    /**
     * Inform the DHT of lower-layer connectivity changes.
     * This will cause the DHT to assume an IP address change.
@@ -240,6 +262,11 @@ public:

    void setLoggers(LogMethod err = NOLOG, LogMethod warn = NOLOG, LogMethod debug = NOLOG);

+    /**
+     * Only print logs related to the given InfoHash (if given), or disable filter (if zeroes).
+     */
+    void setLogFilter(const InfoHash& f = {});
+
    void registerType(const ValueType& type);

    void importValues(const std::vector<ValuesExport>& values);
@@ -252,10 +279,12 @@ public:

    std::vector<unsigned> getNodeMessageStats(bool in = false) const;
    std::string getStorageLog() const;
+    std::string getStorageLog(const InfoHash&) const;
    std::string getRoutingTablesLog(sa_family_t af) const;
-    std::string getSearchesLog(sa_family_t af = 0) const;
-    std::vector<SockAddr> getPublicAddress(sa_family_t af = 0);
-    std::vector<std::string> getPublicAddressStr(sa_family_t af = 0);
+    std::string getSearchesLog(sa_family_t af = AF_UNSPEC) const;
+    std::string getSearchLog(const InfoHash&, sa_family_t af = AF_UNSPEC) const;    
+    std::vector<SockAddr> getPublicAddress(sa_family_t af = AF_UNSPEC);
+    std::vector<std::string> getPublicAddressStr(sa_family_t af = AF_UNSPEC);

    // securedht methods

@@ -331,11 +360,20 @@ public:
    void join();

 private:
+    static constexpr std::chrono::seconds BOOTSTRAP_PERIOD {10};
+
+    /**
+     * Will try to resolve the list of hostnames `bootstrap_nodes` on seperate
+     * thread and then queue ping requests. This list should contain reliable
+     * nodes so that the DHT node can recover quickly from losing connection
+     * with the network.
+     */
+    void tryBootstrapCoutinuously();

    void doRun(const sockaddr_in* sin4, const sockaddr_in6* sin6, SecureDhtConfig config);
    time_point loop_();

-    static std::vector<std::pair<sockaddr_storage, socklen_t>> getAddrInfo(const char* host, const char* service);
+    static std::vector<std::pair<sockaddr_storage, socklen_t>> getAddrInfo(const std::string& host, const std::string& service);

    NodeStatus getStatus() const {
        return std::max(status4, status6);
@@ -350,6 +388,16 @@ private:
    std::mutex sock_mtx {};
    std::vector<std::pair<Blob, SockAddr>> rcv {};

+    /** true if currently actively boostraping */
+    std::atomic_bool bootstraping {false};
+    /* bootstrap nodes given as (host, service) pairs */
+    std::vector<std::pair<std::string,std::string>> bootstrap_nodes_all {};
+    std::vector<std::pair<std::string,std::string>> bootstrap_nodes {};
+    std::thread bootstrap_thread {};
+    /** protects bootstrap_nodes, bootstrap_thread */
+    std::mutex bootstrap_mtx {};
+    std::condition_variable bootstrap_cv {};
+
    std::queue<std::function<void(SecureDht&)>> pending_ops_prio {};
    std::queue<std::function<void(SecureDht&)>> pending_ops {};
    std::mutex storage_mtx {};
@@ -24,6 +24,7 @@

 #include <iostream>
 #include <fstream>
+#include <chrono>

 namespace dht {
 namespace log {
@@ -63,13 +64,23 @@ constexpr const Color::Modifier yellow(Color::FG_YELLOW);
 */
 void
 printLog(std::ostream& s, char const* m, va_list args) {
-    static constexpr int BUF_SZ = 8192;
-    char buffer[BUF_SZ];
-    int ret = vsnprintf(buffer, sizeof(buffer), m, args);
+    // print log to buffer
+    std::array<char, 8192> buffer;
+    int ret = vsnprintf(buffer.data(), buffer.size(), m, args);
    if (ret < 0)
        return;
-    s.write(buffer, std::min(ret, BUF_SZ));
-    if (ret >= BUF_SZ)
+
+    // write timestamp
+    using namespace std::chrono;
+    using log_precision = microseconds;
+    constexpr auto den = log_precision::period::den;
+    auto micro = duration_cast<log_precision>(steady_clock::now().time_since_epoch()).count();
+    s << "[" << std::setfill('0') << std::setw(6) << micro / den << "." 
+             << std::setfill('0') << std::setw(6) << micro % den << "]" << " ";
+
+    // write log
+    s.write(buffer.data(), std::min((size_t)ret, buffer.size()));
+    if ((size_t)ret >= buffer.size())
        s << "[[TRUNCATED]]";
    s.put('\n');
 }
@@ -0,0 +1,175 @@
+/*
+ *  Copyright (C) 2016 Savoir-faire Linux Inc.
+ *  Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "infohash.h"
+
+#ifndef OPENDHT_LOG
+#define OPENDHT_LOG true
+#endif
+
+namespace dht {
+
+// Logging related utility functions
+
+/**
+ * Dummy function used to disable logging
+ */
+inline void NOLOG(char const*, va_list) {}
+
+/**
+ * Wrapper for logging methods
+ */
+struct LogMethod {
+    LogMethod() = default;
+
+    template<typename T>
+    LogMethod(T&& t) : func(std::forward<T>(t)) {}
+
+    void operator()(char const* format, ...) const {
+        va_list args;
+        va_start(args, format);
+        func(format, args);
+        va_end(args);
+    }
+    void log(char const* format, va_list args) const {
+        func(format, args);
+    }
+    explicit operator bool() const {
+        return (bool)func;
+    }
+
+    void logPrintable(const uint8_t *buf, size_t buflen) const {
+        std::string buf_clean(buflen, '\0');
+        for (size_t i=0; i<buflen; i++)
+            buf_clean[i] = isprint(buf[i]) ? buf[i] : '.';
+        (*this)("%s", buf_clean.c_str());
+    }
+private:
+    std::function<void(char const*, va_list)> func;
+};
+
+struct Logger {
+    LogMethod DEBUG = NOLOG;
+    LogMethod WARN = NOLOG;
+    LogMethod ERR = NOLOG;
+    void setFilter(const InfoHash& f) {
+        filter_ = f;
+        filterEnable_ = filter_ != InfoHash{};
+    }
+    inline void log0(const LogMethod& logger, char const* format, va_list args) const {
+#if OPENDHT_LOG
+        if (logger and not filterEnable_)
+            logger.log(format, args);
+#endif
+    }
+    inline void log1(const LogMethod& logger, const InfoHash& f, char const* format, va_list args) const {
+#if OPENDHT_LOG
+        if (logger and (not filterEnable_ or f == filter_))
+            logger.log(format, args);
+#endif
+    }
+    inline void log2(const LogMethod& logger, const InfoHash& f1, const InfoHash& f2, char const* format, va_list args) const {
+#if OPENDHT_LOG
+        if (logger and (not filterEnable_ or f1 == filter_ or f2 == filter_))
+            logger.log(format, args);
+#endif
+    }
+    inline void d(char const* format, ...) const {
+#if OPENDHT_LOG
+        va_list args;
+        va_start(args, format);
+        log0(DEBUG, format, args);
+        va_end(args);
+#endif
+    }
+    inline void d(const InfoHash& f, char const* format, ...) const {
+#if OPENDHT_LOG
+        va_list args;
+        va_start(args, format);
+        log1(DEBUG, f, format, args);
+        va_end(args);
+#endif
+    }
+    inline void d(const InfoHash& f1, const InfoHash& f2, char const* format, ...) const {
+#if OPENDHT_LOG
+        va_list args;
+        va_start(args, format);
+        log2(DEBUG, f1, f2, format, args);
+        va_end(args);
+#endif
+    }
+    inline void w(char const* format, ...) const {
+#if OPENDHT_LOG
+        va_list args;
+        va_start(args, format);
+        log0(WARN, format, args);
+        va_end(args);
+#endif
+    }
+    inline void w(const InfoHash& f, char const* format, ...) const {
+#if OPENDHT_LOG
+        va_list args;
+        va_start(args, format);
+        log1(WARN, f, format, args);
+        va_end(args);
+#endif
+    }
+    inline void w(const InfoHash& f1, const InfoHash& f2, char const* format, ...) const {
+#if OPENDHT_LOG
+        va_list args;
+        va_start(args, format);
+        log2(WARN, f1, f2, format, args);
+        va_end(args);
+#endif
+    }
+    inline void e(char const* format, ...) const {
+#if OPENDHT_LOG
+        va_list args;
+        va_start(args, format);
+        log0(ERR, format, args);
+        va_end(args);
+#endif
+    }
+    inline void e(const InfoHash& f, char const* format, ...) const {
+#if OPENDHT_LOG
+        va_list args;
+        va_start(args, format);
+        log1(ERR, f, format, args);
+        va_end(args);
+#endif
+    }
+    inline void e(const InfoHash& f1, const InfoHash& f2, char const* format, ...) const {
+#if OPENDHT_LOG
+        va_list args;
+        va_start(args, format);
+        log2(ERR, f1, f2, format, args);
+        va_end(args);
+#endif
+    }
+private:
+    bool filterEnable_ {false};
+    InfoHash filter_ {};
+};
+
+}
@@ -14,11 +14,9 @@
 *  GNU General Public License for more details.
 *
 *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
+ *  along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

-
 #pragma once

 #include "node_cache.h"
@@ -49,6 +47,7 @@ public:
    // sent to another peer (http-like).
    static const constexpr uint16_t NON_AUTHORITATIVE_INFORMATION {203}; /* incomplete request packet. */
    static const constexpr uint16_t UNAUTHORIZED {401};                  /* wrong tokens. */
+    static const constexpr uint16_t NOT_FOUND {404};                     /* storage not found */
    // for internal use (custom).
    static const constexpr uint16_t INVALID_TID_SIZE {421};              /* id was truncated. */
    static const constexpr uint16_t UNKNOWN_TID {422};                   /* unknown tid */
@@ -59,6 +58,7 @@ public:
    static const std::string LISTEN_WRONG_TOKEN; /* wrong token in "listen" request */
    static const std::string PUT_NO_INFOHASH;    /* no infohash in "put" request */
    static const std::string PUT_WRONG_TOKEN;    /* got "put" request with wrong token */
+    static const std::string STORAGE_NOT_FOUND;  /* got access request for an unknown storage */
    static const std::string PUT_INVALID_ID;     /* invalid id in "put" request */

    DhtProtocolException(uint16_t code, const std::string& msg="", InfoHash failing_node_id={})
@@ -92,14 +92,17 @@ struct ParsedMessage;
 * @param onGetValues    callback for "get values" request.
 * @param onListen       callback for "listen" request.
 * @param onAnnounce     callback for "announce" request.
+ * @param onRefresh      callback for "refresh" request.
 */
-class NetworkEngine final {
+class NetworkEngine final
+{
    struct TransPrefix : public  std::array<uint8_t, 2>  {
        TransPrefix(const std::string& str) : std::array<uint8_t, 2>({{(uint8_t)str[0], (uint8_t)str[1]}}) {}
        static const TransPrefix PING;
        static const TransPrefix FIND_NODE;
        static const TransPrefix GET_VALUES;
        static const TransPrefix ANNOUNCE_VALUES;
+        static const TransPrefix REFRESH;
        static const TransPrefix LISTEN;
    };
 public:
@@ -168,7 +171,7 @@ public:
     */
    void cancelRequest(std::shared_ptr<Request>& req);

-    void connectivityChanged();
+    void connectivityChanged(sa_family_t);

 private:

@@ -213,7 +216,7 @@ private:
     *             or ipv6.
     */
    std::function<RequestAnswer(std::shared_ptr<Node>,
-            InfoHash&,
+            const InfoHash&,
            want_t)> onFindNode {};
    /**
     * @brief on "get values" request callback.
@@ -224,9 +227,9 @@ private:
     *             or ipv6.
     */
    std::function<RequestAnswer(std::shared_ptr<Node>,
-            InfoHash&,
+            const InfoHash&,
            want_t,
-            Query)> onGetValues {};
+            const Query&)> onGetValues {};
    /**
     * @brief on listen request callback.
     *
@@ -236,10 +239,10 @@ private:
     * @param rid (type: uint16_t) request id.
     */
    std::function<RequestAnswer(std::shared_ptr<Node>,
-            InfoHash&,
-            Blob&,
+            const InfoHash&,
+            const Blob&,
            uint16_t,
-            Query)> onListen {};
+            const Query&)> onListen {};
    /**
     * @brief on announce request callback.
     *
@@ -250,16 +253,28 @@ private:
     * @param created (type: time_point) time when the value was created.
     */
    std::function<RequestAnswer(std::shared_ptr<Node>,
-            InfoHash&,
-            Blob&,
-            std::vector<std::shared_ptr<Value>>,
-            time_point)> onAnnounce {};
+            const InfoHash&,
+            const Blob&,
+            const std::vector<std::shared_ptr<Value>>&,
+            const time_point&)> onAnnounce {};
+    /**
+     * @brief on refresh request callback.
+     *
+     * @param node (type: std::shared_ptr<Node>) the requesting node.
+     * @param vhash (type: InfoHash) hash of the value of interest.
+     * @param token (type: Blob) security token.
+     * @param vid (type: Value::id) the value id.
+     */
+    std::function<RequestAnswer(std::shared_ptr<Node>,
+            const InfoHash&,
+            const Blob&,
+            const Value::Id&)> onRefresh {};

 public:
    using RequestCb = std::function<void(const Request&, RequestAnswer&&)>;
    using RequestExpiredCb = std::function<void(const Request&, bool)>;

-    NetworkEngine(Logger& log, Scheduler& scheduler) : myid(zeroes), DHT_LOG(log), scheduler(scheduler) {}
+    NetworkEngine(Logger& log, Scheduler& scheduler);
    NetworkEngine(InfoHash& myid, NetId net, int s, int s6, Logger& log, Scheduler& scheduler,
            decltype(NetworkEngine::onError) onError,
            decltype(NetworkEngine::onNewNode) onNewNode,
@@ -268,16 +283,10 @@ public:
            decltype(NetworkEngine::onFindNode) onFindNode,
            decltype(NetworkEngine::onGetValues) onGetValues,
            decltype(NetworkEngine::onListen) onListen,
-            decltype(NetworkEngine::onAnnounce) onAnnounce) :
-        onError(onError), onNewNode(onNewNode), onReportedAddr(onReportedAddr), onPing(onPing), onFindNode(onFindNode),
-        onGetValues(onGetValues), onListen(onListen), onAnnounce(onAnnounce), myid(myid), network(net),
-        dht_socket(s), dht_socket6(s6), DHT_LOG(log), scheduler(scheduler)
-    {
-        transaction_id = std::uniform_int_distribution<decltype(transaction_id)>{1}(rd_device);
-    }
-    virtual ~NetworkEngine() {
-        clear();
-    };
+            decltype(NetworkEngine::onAnnounce) onAnnounce,
+            decltype(NetworkEngine::onRefresh) onRefresh);
+
+    virtual ~NetworkEngine();

    void clear();

@@ -333,11 +342,18 @@ public:
    std::shared_ptr<Request>
        sendAnnounceValue(std::shared_ptr<Node> n,
                const InfoHash& infohash,
-                const Value& v,
+                const std::shared_ptr<Value>& v,
                time_point created,
                const Blob& token,
                RequestCb on_done,
                RequestExpiredCb on_expired);
+    std::shared_ptr<Request>
+        sendRefreshValue(std::shared_ptr<Node> n,
+                const InfoHash& infohash,
+                const Value::Id& vid,
+                const Blob& token,
+                RequestCb on_done,
+                RequestExpiredCb on_expired);

    /**
     * Parses a message and calls appropriate callbacks.
@@ -370,6 +386,9 @@ public:
    }

 private:
+
+    struct PartialMessage;
+
    /***************
     *  Constants  *
     ***************/
@@ -378,15 +397,24 @@ private:
    static const constexpr size_t NODE4_INFO_BUF_LEN {26};
    /* the length of a node info buffer in ipv6 format */
    static const constexpr size_t NODE6_INFO_BUF_LEN {38};
-    /* TODO */
+    /* after a UDP reply, the period during which we tell the link layer about it */
    static constexpr std::chrono::seconds UDP_REPLY_TIME {15};
+
+    /* Max. time to receive a full fragmented packet */
+    static constexpr std::chrono::seconds RX_MAX_PACKET_TIME {10};
+    /* Max. time between packet fragments */
+    static constexpr std::chrono::seconds RX_TIMEOUT {3};
    /* The maximum number of nodes that we snub.  There is probably little
        reason to increase this value. */
    static constexpr unsigned BLACKLISTED_MAX {10};

+    static constexpr size_t MTU {1280};
+    static constexpr size_t MAX_PACKET_VALUE_SIZE {8 * 1024};
+
    static const std::string my_v;
    static std::mt19937 rd_device;

+    void process(std::unique_ptr<ParsedMessage>&&, const SockAddr& from);

    bool rateLimit(const SockAddr& addr);

@@ -417,12 +445,17 @@ private:
        unsigned get {0};
        unsigned put {0};
        unsigned listen {0};
+        unsigned refresh {0};
    };


    // basic wrapper for socket sendto function
    int send(const char *buf, size_t len, int flags, const SockAddr& addr);

+    void sendValueParts(TransId tid, const std::vector<Blob>& svals, const SockAddr& addr);
+    std::vector<Blob> packValueHeader(msgpack::sbuffer&, const std::vector<std::shared_ptr<Value>>&);
+    void maintainRxBuffer(const TransId& tid);
+
    /*************
     *  Answers  *
     *************/
@@ -470,7 +503,7 @@ private:
     * first 64 bits in IPv6.
     */
    struct cmpSockAddr {
-        bool operator()(const SockAddr& a, const SockAddr& b) {
+        bool operator()(const SockAddr& a, const SockAddr& b) const {
            if (a.second != b.second)
                return a.second < b.second;
            socklen_t start, len;
@@ -502,6 +535,7 @@ private:
    // requests handling
    uint16_t transaction_id {1};
    std::map<uint16_t, std::shared_ptr<Request>> requests {};
+    std::map<TransId, PartialMessage> partial_messages;
    MessageStats in_stats {}, out_stats {};
    std::set<SockAddr> blacklist {};

@@ -80,7 +80,7 @@ struct Node {
    /**
     * Resets the state of the node so it's not expired anymore.
     */
-    void reset() { expired_ = false; }
+    void reset() { expired_ = false; reply_time = time_point::min(); }

    std::string toString() const;

@@ -22,6 +22,7 @@
 #pragma once

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

 #include <functional>
 #include <map>
@@ -36,8 +37,10 @@ namespace dht {
 */
 class Scheduler {
 public:
+    Scheduler(const Logger& l) : DHT_LOG(l) {}
+
    struct Job {
-        Job(std::function<void()>&& f) : do_(std::forward<std::function<void()>>(f)) {}
+        Job(std::function<void()>&& f) : do_(std::move(f)) {}
        std::function<void()> do_;
    };

@@ -50,7 +53,7 @@ public:
     * @return pointer to the newly scheduled job.
     */
    std::shared_ptr<Scheduler::Job> add(time_point t, std::function<void()>&& job_func) {
-        auto job = std::make_shared<Job>(std::forward<std::function<void()>>(job_func));
+        auto job = std::make_shared<Job>(std::move(job_func));
        if (t != time_point::max())
            timers.emplace(std::move(t), job);
        return job;
@@ -66,10 +69,14 @@ public:
     */
    void edit(std::shared_ptr<Scheduler::Job>& job, time_point t) {
        if (not job) {
-            std::cerr << "editing an empty job" << std::endl;
+            DHT_LOG.ERR("editing an empty job");
            return;
        }
-        job = add(t, std::move(job->do_));
+        // std::function move doesn't garantee to leave the object empty.
+        // Force clearing old value.
+        auto task = std::move(job->do_);
+        job->do_ = {};
+        job = add(t, std::move(task));
    }

    /**
@@ -89,17 +96,16 @@ public:
            if (timer->first > now)
                break;

-            const auto& job = *timer->second;
-            if (job.do_)
-                job.do_();
+            auto job = std::move(timer->second);
            timers.erase(timer);
+
+            if (job->do_)
+                job->do_();
        }
        return getNextJobTime();
    }

    inline time_point getNextJobTime() const {
-        //if (not timers.empty())
-        //    std::cout << "Next job in " << print_dt(timers.begin()->first - clock::now()) << std::endl;
        return timers.empty() ? time_point::max() : timers.begin()->first;
    }

@@ -113,6 +119,7 @@ public:
 private:
    time_point now {clock::now()};
    std::multimap<time_point, std::shared_ptr<Job>> timers {}; /* the jobs ordered by time */
+    const Logger& DHT_LOG;
 };

 }
@@ -21,8 +21,11 @@
 #ifndef _WIN32
 #include <sys/socket.h>
 #else
+#include <iso646.h>
 #include <ws2def.h>
 #include <ws2tcpip.h>
+typedef uint16_t sa_family_t;
+typedef uint16_t in_port_t;
 #endif

 namespace dht {
@@ -32,8 +35,6 @@ std::string print_addr(const sockaddr_storage& ss, socklen_t sslen);

 struct SockAddr : public std::pair<sockaddr_storage, socklen_t> {
 public:
-    using std::pair<sockaddr_storage, socklen_t>::pair;
-
    SockAddr() : pair<sockaddr_storage, socklen_t>::pair({},0) {}
    SockAddr(const SockAddr& o) : pair<sockaddr_storage, socklen_t>::pair({},o.second) {
        std::copy_n((uint8_t*)&o.first, o.second, (uint8_t*)&first);
@@ -43,6 +44,7 @@ public:
            throw std::runtime_error("Socket address length is too large");
        std::copy_n((uint8_t*)sa, len, (uint8_t*)&first);
    }
+    SockAddr(const sockaddr_storage& ss, socklen_t len) : SockAddr((const sockaddr*)&ss, len) {}

    bool operator<(const SockAddr& o) const {
        if (second != o.second)
@@ -50,7 +52,7 @@ public:
        return std::memcmp((uint8_t*)&first, (uint8_t*)&o.first, second) < 0;
    }

-    bool operator==(const SockAddr& o) const {
+    bool equals(const SockAddr& o) const {
        return second == o.second
            && std::memcmp((uint8_t*)&first, (uint8_t*)&o.first, second) == 0;
    }
@@ -66,6 +68,8 @@ public:
    sa_family_t getFamily() const { return second > sizeof(sa_family_t) ? first.ss_family : AF_UNSPEC; }
 };

+bool operator==(const SockAddr& a, const SockAddr& b);
+
 std::string printAddr(const SockAddr& addr);

 }
@@ -89,45 +89,6 @@ public:
    }
 };

-// Logging related utility functions
-
-/**
- * Dummy function used to disable logging
- */
-inline void NOLOG(char const*, va_list) {}
-
-/**
- * Wrapper for logging methods
- */
-struct LogMethod {
-    LogMethod() = default;
-
-    template<typename T>
-    LogMethod(T&& t) : func(std::forward<T>(t)) {}
-
-    void operator()(char const* format, ...) const {
-        va_list args;
-        va_start(args, format);
-        func(format, args);
-        va_end(args);
-    }
-
-    void logPrintable(const uint8_t *buf, size_t buflen) const {
-        std::string buf_clean(buflen, '\0');
-        for (size_t i=0; i<buflen; i++)
-            buf_clean[i] = isprint(buf[i]) ? buf[i] : '.';
-        (*this)("%s", buf_clean.c_str());
-    }
-private:
-    std::function<void(char const*, va_list)> func;
-};
-
-struct Logger {
-    LogMethod DEBUG = NOLOG;
-    LogMethod WARN = NOLOG;
-    LogMethod ERR = NOLOG;
-};
-
 // Serialization related definitions and utility functions

 using Blob = std::vector<uint8_t>;
@@ -70,7 +70,7 @@ using StorePolicy = std::function<bool(InfoHash key, std::shared_ptr<Value>& val
 */
 using EditPolicy = std::function<bool(InfoHash key, const std::shared_ptr<Value>& old_val, std::shared_ptr<Value>& new_val, InfoHash from, const sockaddr* from_addr, socklen_t from_len)>;

-static constexpr const size_t MAX_VALUE_SIZE {1024 * 16};
+static constexpr const size_t MAX_VALUE_SIZE {1024 * 64};

 struct ValueType {
    typedef uint16_t Id;
@@ -131,8 +131,12 @@ struct Value
    static const constexpr Id INVALID_ID {0};

    class Filter : public std::function<bool(const Value&)> {
-        using std::function<bool(const Value&)>::function;
    public:
+        Filter() {}
+
+        template<typename Functor>
+        Filter(Functor f) : std::function<bool(const Value&)>::function(f) {}
+
        Filter chain(Filter&& f2) {
            auto f1 = *this;
            return chain(std::move(f1), std::move(f2));
@@ -0,0 +1,53 @@
+#!/usr/bin/env python3
+# Copyright (c) 2015-2016 Savoir-faire Linux Inc.
+# Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; If not, see <http://www.gnu.org/licenses/>.
+
+import opendht as dht
+import time
+
+ping_node = dht.DhtRunner()
+ping_node.run(port = 5632)
+#ping_node.enableLogging()
+#ping_node.bootstrap("bootstrap.ring.cx", "4222")
+
+pong_node = dht.DhtRunner()
+pong_node.run(port = 5633)
+#pong_node.enableLogging()
+pong_node.bootstrap("192.168.49.55", "5632");
+#pong_node.bootstrap("192.168.49.55", "5632");
+
+loc_ping = dht.InfoHash.get("toto99")
+loc_pong = dht.InfoHash.get(str(loc_ping))
+
+i = 0
+MAX = 8192
+
+def pong(node, h):
+	global i
+	print("got ping", h, i)
+	time.sleep(0.0075)
+	i += 1
+	if i < MAX:
+		node.put(h, dht.Value(b"hey"), lambda ok, nodes: print("over", ok))
+	return True
+
+ping_node.listen(loc_ping, lambda v: pong(pong_node, loc_pong))
+pong_node.listen(loc_pong, lambda v: pong(ping_node, loc_ping))
+
+pong_node.put(loc_pong, dht.Value(b"hey"), lambda ok, nodes: print("i over", ok))
+
+while (i < MAX):
+	time.sleep(1)
@@ -46,6 +46,7 @@ nobase_include_HEADERS = \
        ../include/opendht/dhtrunner.h \
        ../include/opendht/default_types.h \
        ../include/opendht/log.h \
+        ../include/opendht/log_enable.h \
        ../include/opendht/rng.h \
        ../include/opendht/indexation/pht.h

@@ -1,14 +1,18 @@
 /*
- * Argon2 source code package
+ * Argon2 reference source code package - reference C implementations
 *
- * Written by Daniel Dinu and Dmitry Khovratovich, 2015
+ * Copyright 2015
+ * Daniel Dinu, Dmitry Khovratovich, Jean-Philippe Aumasson, and Samuel Neves
 *
- * This work is licensed under a Creative Commons CC0 1.0 License/Waiver.
+ * You may use this work under the terms of a Creative Commons CC0 1.0 
+ * License/Waiver or the Apache Public License 2.0, at your option. The terms of
+ * these licenses can be found at:
 *
- * You should have received a copy of the CC0 Public Domain Dedication along
- * with
- * this software. If not, see
- * <http://creativecommons.org/publicdomain/zero/1.0/>.
+ * - CC0 1.0 Universal : http://creativecommons.org/publicdomain/zero/1.0
+ * - Apache 2.0        : http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * You should have received a copy of both of these licenses along with this
+ * software. If not, they may be obtained at the above URLs.
 */

 #include <string.h>
@@ -19,6 +23,18 @@
 #include "encoding.h"
 #include "core.h"

+const char *argon2_type2string(argon2_type type, int uppercase) {
+    switch (type) {
+        case Argon2_d:
+            return uppercase ? "Argon2d" : "argon2d";
+        case Argon2_i:
+            return uppercase ? "Argon2i" : "argon2i";
+        case Argon2_id:
+            return uppercase ? "Argon2id" : "argon2id";
+    }
+
+    return NULL;
+}

 int argon2_ctx(argon2_context *context, argon2_type type) {
    /* 1. Validate all inputs */
@@ -30,7 +46,7 @@ int argon2_ctx(argon2_context *context, argon2_type type) {
        return result;
    }

-    if (Argon2_d != type && Argon2_i != type) {
+    if (Argon2_d != type && Argon2_i != type && Argon2_id != type) {
        return ARGON2_INCORRECT_TYPE;
    }

@@ -81,7 +97,7 @@ int argon2_hash(const uint32_t t_cost, const uint32_t m_cost,
                const uint32_t parallelism, const void *pwd,
                const size_t pwdlen, const void *salt, const size_t saltlen,
                void *hash, const size_t hashlen, char *encoded,
-                const size_t encodedlen, argon2_type type, 
+                const size_t encodedlen, argon2_type type,
                const uint32_t version){

    argon2_context context;
@@ -188,6 +204,26 @@ int argon2d_hash_raw(const uint32_t t_cost, const uint32_t m_cost,
                       hash, hashlen, NULL, 0, Argon2_d, ARGON2_VERSION_NUMBER);
 }

+int argon2id_hash_encoded(const uint32_t t_cost, const uint32_t m_cost,
+                          const uint32_t parallelism, const void *pwd,
+                          const size_t pwdlen, const void *salt,
+                          const size_t saltlen, const size_t hashlen,
+                          char *encoded, const size_t encodedlen) {
+
+    return argon2_hash(t_cost, m_cost, parallelism, pwd, pwdlen, salt, saltlen,
+                       NULL, hashlen, encoded, encodedlen, Argon2_id,
+                       ARGON2_VERSION_NUMBER);
+}
+
+int argon2id_hash_raw(const uint32_t t_cost, const uint32_t m_cost,
+                      const uint32_t parallelism, const void *pwd,
+                      const size_t pwdlen, const void *salt,
+                      const size_t saltlen, void *hash, const size_t hashlen) {
+    return argon2_hash(t_cost, m_cost, parallelism, pwd, pwdlen, salt, saltlen,
+                       hash, hashlen, NULL, 0, Argon2_id,
+                       ARGON2_VERSION_NUMBER);
+}
+
 static int argon2_compare(const uint8_t *b1, const uint8_t *b2, size_t len) {
    size_t i;
    uint8_t d = 0U;
@@ -279,6 +315,11 @@ int argon2d_verify(const char *encoded, const void *pwd, const size_t pwdlen) {
    return argon2_verify(encoded, pwd, pwdlen, Argon2_d);
 }

+int argon2id_verify(const char *encoded, const void *pwd, const size_t pwdlen) {
+
+    return argon2_verify(encoded, pwd, pwdlen, Argon2_id);
+}
+
 int argon2d_ctx(argon2_context *context) {
    return argon2_ctx(context, Argon2_d);
 }
@@ -287,6 +328,10 @@ int argon2i_ctx(argon2_context *context) {
    return argon2_ctx(context, Argon2_i);
 }

+int argon2id_ctx(argon2_context *context) {
+    return argon2_ctx(context, Argon2_id);
+}
+
 int argon2_verify_ctx(argon2_context *context, const char *hash,
                      argon2_type type) {
    int result;
@@ -311,6 +356,10 @@ int argon2i_verify_ctx(argon2_context *context, const char *hash) {
    return argon2_verify_ctx(context, hash, Argon2_i);
 }

+int argon2id_verify_ctx(argon2_context *context, const char *hash) {
+    return argon2_verify_ctx(context, hash, Argon2_id);
+}
+
 const char *argon2_error_message(int error_code) {
    switch (error_code) {
    case ARGON2_OK:
@@ -391,8 +440,8 @@ const char *argon2_error_message(int error_code) {
 }

 size_t argon2_encodedlen(uint32_t t_cost, uint32_t m_cost, uint32_t parallelism,
-                         uint32_t saltlen, uint32_t hashlen) {
-    return strlen("$argon2x$v=$m=,t=,p=$$") + numlen(t_cost) + numlen(m_cost)
-        + numlen(parallelism) + b64len(saltlen) + b64len(hashlen)
-        + numlen(ARGON2_VERSION_NUMBER) + 1;
+                         uint32_t saltlen, uint32_t hashlen, argon2_type type) {
+  return strlen("$$v=$m=,t=,p=$$") + strlen(argon2_type2string(type, 0)) +
+         numlen(t_cost) + numlen(m_cost) + numlen(parallelism) +
+         b64len(saltlen) + b64len(hashlen) + numlen(ARGON2_VERSION_NUMBER) + 1;
 }
@@ -1,13 +1,18 @@
 /*
- * Argon2 source code package
+ * Argon2 reference source code package - reference C implementations
 *
- * Written by Daniel Dinu and Dmitry Khovratovich, 2015
+ * Copyright 2015
+ * Daniel Dinu, Dmitry Khovratovich, Jean-Philippe Aumasson, and Samuel Neves
 *
- * This work is licensed under a Creative Commons CC0 1.0 License/Waiver.
+ * You may use this work under the terms of a Creative Commons CC0 1.0 
+ * License/Waiver or the Apache Public License 2.0, at your option. The terms of
+ * these licenses can be found at:
 *
- * You should have received a copy of the CC0 Public Domain Dedication
- * along with this software. If not, see
- * <http://creativecommons.org/publicdomain/zero/1.0/>.
+ * - CC0 1.0 Universal : http://creativecommons.org/publicdomain/zero/1.0
+ * - Apache 2.0        : http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * You should have received a copy of both of these licenses along with this
+ * software. If not, they may be obtained at the above URLs.
 */

 #ifndef ARGON2_H
@@ -24,6 +29,8 @@ extern "C" {
 /* Symbols visibility control */
 #ifdef A2_VISCTL
 #define ARGON2_PUBLIC __attribute__((visibility("default")))
+#elif _MSC_VER
+#define ARGON2_PUBLIC __declspec(dllexport)
 #else
 #define ARGON2_PUBLIC
 #endif
@@ -204,7 +211,11 @@ typedef struct Argon2_Context {
 } argon2_context;

 /* Argon2 primitive type */
-typedef enum Argon2_type { Argon2_d = 0, Argon2_i = 1 } argon2_type;
+typedef enum Argon2_type {
+  Argon2_d = 0,
+  Argon2_i = 1,
+  Argon2_id = 2
+} argon2_type;

 /* Version of the algorithm */
 typedef enum Argon2_version {
@@ -213,6 +224,14 @@ typedef enum Argon2_version {
    ARGON2_VERSION_NUMBER = ARGON2_VERSION_13
 } argon2_version;

+/*
+ * Function that gives the string representation of an argon2_type.
+ * @param type The argon2_type that we want the string for
+ * @param uppercase Whether the string should have the first letter uppercase
+ * @return NULL if invalid type, otherwise the string representation.
+ */
+ARGON2_PUBLIC const char *argon2_type2string(argon2_type type, int uppercase);
+
 /*
 * Function that performs memory-hard hashing with certain degree of parallelism
 * @param  context  Pointer to the Argon2 internal structure
@@ -278,6 +297,21 @@ ARGON2_PUBLIC int argon2d_hash_raw(const uint32_t t_cost, const uint32_t m_cost,
                                   const size_t saltlen, void *hash,
                                   const size_t hashlen);

+ARGON2_PUBLIC int argon2id_hash_encoded(const uint32_t t_cost,
+                                        const uint32_t m_cost,
+                                        const uint32_t parallelism,
+                                        const void *pwd, const size_t pwdlen,
+                                        const void *salt, const size_t saltlen,
+                                        const size_t hashlen, char *encoded,
+                                        const size_t encodedlen);
+
+ARGON2_PUBLIC int argon2id_hash_raw(const uint32_t t_cost,
+                                    const uint32_t m_cost,
+                                    const uint32_t parallelism, const void *pwd,
+                                    const size_t pwdlen, const void *salt,
+                                    const size_t saltlen, void *hash,
+                                    const size_t hashlen);
+
 /* generic function underlying the above ones */
 ARGON2_PUBLIC int argon2_hash(const uint32_t t_cost, const uint32_t m_cost,
                              const uint32_t parallelism, const void *pwd,
@@ -300,6 +334,9 @@ ARGON2_PUBLIC int argon2i_verify(const char *encoded, const void *pwd,
 ARGON2_PUBLIC int argon2d_verify(const char *encoded, const void *pwd,
                                 const size_t pwdlen);

+ARGON2_PUBLIC int argon2id_verify(const char *encoded, const void *pwd,
+                                  const size_t pwdlen);
+
 /* generic function underlying the above ones */
 ARGON2_PUBLIC int argon2_verify(const char *encoded, const void *pwd,
                                const size_t pwdlen, argon2_type type);
@@ -324,6 +361,17 @@ ARGON2_PUBLIC int argon2d_ctx(argon2_context *context);
 */
 ARGON2_PUBLIC int argon2i_ctx(argon2_context *context);

+/**
+ * Argon2id: Version of Argon2 where the first half-pass over memory is
+ * password-independent, the rest are password-dependent (on the password and
+ * salt). OK against side channels (they reduce to 1/2-pass Argon2i), and
+ * better with w.r.t. tradeoff attacks (similar to Argon2d).
+ *****
+ * @param  context  Pointer to current Argon2 context
+ * @return  Zero if successful, a non zero error code otherwise
+ */
+ARGON2_PUBLIC int argon2id_ctx(argon2_context *context);
+
 /**
 * Verify if a given password is correct for Argon2d hashing
 * @param  context  Pointer to current Argon2 context
@@ -342,6 +390,16 @@ ARGON2_PUBLIC int argon2d_verify_ctx(argon2_context *context, const char *hash);
 */
 ARGON2_PUBLIC int argon2i_verify_ctx(argon2_context *context, const char *hash);

+/**
+ * Verify if a given password is correct for Argon2id hashing
+ * @param  context  Pointer to current Argon2 context
+ * @param  hash  The password hash to verify. The length of the hash is
+ * specified by the context outlen member
+ * @return  Zero if successful, a non zero error code otherwise
+ */
+ARGON2_PUBLIC int argon2id_verify_ctx(argon2_context *context,
+                                      const char *hash);
+
 /* generic function underlying the above ones */
 ARGON2_PUBLIC int argon2_verify_ctx(argon2_context *context, const char *hash,
                                    argon2_type type);
@@ -363,7 +421,7 @@ ARGON2_PUBLIC const char *argon2_error_message(int error_code);
 */
 ARGON2_PUBLIC size_t argon2_encodedlen(uint32_t t_cost, uint32_t m_cost,
                                       uint32_t parallelism, uint32_t saltlen,
-                                       uint32_t hashlen);
+                                       uint32_t hashlen, argon2_type type);

 #if defined(__cplusplus)
 }
@@ -1,3 +1,20 @@
+/*
+ * Argon2 reference source code package - reference C implementations
+ *
+ * Copyright 2015
+ * Daniel Dinu, Dmitry Khovratovich, Jean-Philippe Aumasson, and Samuel Neves
+ *
+ * You may use this work under the terms of a Creative Commons CC0 1.0 
+ * License/Waiver or the Apache Public License 2.0, at your option. The terms of
+ * these licenses can be found at:
+ *
+ * - CC0 1.0 Universal : http://creativecommons.org/publicdomain/zero/1.0
+ * - Apache 2.0        : http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * You should have received a copy of both of these licenses along with this
+ * software. If not, they may be obtained at the above URLs.
+ */
+
 #ifndef PORTABLE_BLAKE2_IMPL_H
 #define PORTABLE_BLAKE2_IMPL_H

@@ -134,10 +151,6 @@ static BLAKE2_INLINE uint64_t rotr64(const uint64_t w, const unsigned c) {
    return (w >> c) | (w << (64 - c));
 }

-/* prevents compiler optimizing out memset() */
-static BLAKE2_INLINE void burn(void *v, size_t n) {
-    static void *(*const volatile memset_v)(void *, int, size_t) = &memset;
-    memset_v(v, 0, n);
-}
+void secure_wipe_memory(void *v, size_t n);

 #endif
@@ -1,3 +1,20 @@
+/*
+ * Argon2 reference source code package - reference C implementations
+ *
+ * Copyright 2015
+ * Daniel Dinu, Dmitry Khovratovich, Jean-Philippe Aumasson, and Samuel Neves
+ *
+ * You may use this work under the terms of a Creative Commons CC0 1.0 
+ * License/Waiver or the Apache Public License 2.0, at your option. The terms of
+ * these licenses can be found at:
+ *
+ * - CC0 1.0 Universal : http://creativecommons.org/publicdomain/zero/1.0
+ * - Apache 2.0        : http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * You should have received a copy of both of these licenses along with this
+ * software. If not, they may be obtained at the above URLs.
+ */
+
 #ifndef PORTABLE_BLAKE2_H
 #define PORTABLE_BLAKE2_H

@@ -1,3 +1,20 @@
+/*
+ * Argon2 reference source code package - reference C implementations
+ *
+ * Copyright 2015
+ * Daniel Dinu, Dmitry Khovratovich, Jean-Philippe Aumasson, and Samuel Neves
+ *
+ * You may use this work under the terms of a Creative Commons CC0 1.0 
+ * License/Waiver or the Apache Public License 2.0, at your option. The terms of
+ * these licenses can be found at:
+ *
+ * - CC0 1.0 Universal : http://creativecommons.org/publicdomain/zero/1.0
+ * - Apache 2.0        : http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * You should have received a copy of both of these licenses along with this
+ * software. If not, they may be obtained at the above URLs.
+ */
+
 #include <stdint.h>
 #include <string.h>
 #include <stdio.h>
@@ -44,7 +61,7 @@ static BLAKE2_INLINE void blake2b_increment_counter(blake2b_state *S,
 }

 static BLAKE2_INLINE void blake2b_invalidate_state(blake2b_state *S) {
-    burn(S, sizeof(*S));      /* wipe */
+    secure_wipe_memory(S, sizeof(*S));      /* wipe */
    blake2b_set_lastblock(S); /* invalidate for further use */
 }

@@ -140,7 +157,7 @@ int blake2b_init_key(blake2b_state *S, size_t outlen, const void *key,
        memset(block, 0, BLAKE2B_BLOCKBYTES);
        memcpy(block, key, keylen);
        blake2b_update(S, block, BLAKE2B_BLOCKBYTES);
-        burn(block, BLAKE2B_BLOCKBYTES); /* Burn the key from stack */
+        secure_wipe_memory(block, BLAKE2B_BLOCKBYTES); /* Burn the key from stack */
    }
    return 0;
 }
@@ -267,9 +284,9 @@ int blake2b_final(blake2b_state *S, void *out, size_t outlen) {
    }

    memcpy(out, buffer, S->outlen);
-    burn(buffer, sizeof(buffer));
-    burn(S->buf, sizeof(S->buf));
-    burn(S->h, sizeof(S->h));
+    secure_wipe_memory(buffer, sizeof(buffer));
+    secure_wipe_memory(S->buf, sizeof(S->buf));
+    secure_wipe_memory(S->h, sizeof(S->h));
    return 0;
 }

@@ -307,7 +324,7 @@ int blake2b(void *out, size_t outlen, const void *in, size_t inlen,
    ret = blake2b_final(&S, out, outlen);

 fail:
-    burn(&S, sizeof(S));
+    secure_wipe_memory(&S, sizeof(S));
    return ret;
 }

@@ -365,7 +382,7 @@ int blake2b_long(void *pout, size_t outlen, const void *in, size_t inlen) {
        memcpy(out, out_buffer, toproduce);
    }
 fail:
-    burn(&blake_state, sizeof(blake_state));
+    secure_wipe_memory(&blake_state, sizeof(blake_state));
    return ret;
 #undef TRY
 }
@@ -1,3 +1,20 @@
+/*
+ * Argon2 reference source code package - reference C implementations
+ *
+ * Copyright 2015
+ * Daniel Dinu, Dmitry Khovratovich, Jean-Philippe Aumasson, and Samuel Neves
+ *
+ * You may use this work under the terms of a Creative Commons CC0 1.0 
+ * License/Waiver or the Apache Public License 2.0, at your option. The terms of
+ * these licenses can be found at:
+ *
+ * - CC0 1.0 Universal : http://creativecommons.org/publicdomain/zero/1.0
+ * - Apache 2.0        : http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * You should have received a copy of both of these licenses along with this
+ * software. If not, they may be obtained at the above URLs.
+ */
+
 #ifndef BLAKE_ROUND_MKA_OPT_H
 #define BLAKE_ROUND_MKA_OPT_H

@@ -1,3 +1,20 @@
+/*
+ * Argon2 reference source code package - reference C implementations
+ *
+ * Copyright 2015
+ * Daniel Dinu, Dmitry Khovratovich, Jean-Philippe Aumasson, and Samuel Neves
+ *
+ * You may use this work under the terms of a Creative Commons CC0 1.0 
+ * License/Waiver or the Apache Public License 2.0, at your option. The terms of
+ * these licenses can be found at:
+ *
+ * - CC0 1.0 Universal : http://creativecommons.org/publicdomain/zero/1.0
+ * - Apache 2.0        : http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * You should have received a copy of both of these licenses along with this
+ * software. If not, they may be obtained at the above URLs.
+ */
+
 #ifndef BLAKE_ROUND_MKA_H
 #define BLAKE_ROUND_MKA_H

@@ -1,14 +1,18 @@
 /*
- * Argon2 source code package
+ * Argon2 reference source code package - reference C implementations
 *
- * Written by Daniel Dinu and Dmitry Khovratovich, 2015
+ * Copyright 2015
+ * Daniel Dinu, Dmitry Khovratovich, Jean-Philippe Aumasson, and Samuel Neves
 *
- * This work is licensed under a Creative Commons CC0 1.0 License/Waiver.
+ * You may use this work under the terms of a Creative Commons CC0 1.0 
+ * License/Waiver or the Apache Public License 2.0, at your option. The terms of
+ * these licenses can be found at:
 *
- * You should have received a copy of the CC0 Public Domain Dedication along
- * with
- * this software. If not, see
- * <http://creativecommons.org/publicdomain/zero/1.0/>.
+ * - CC0 1.0 Universal : http://creativecommons.org/publicdomain/zero/1.0
+ * - Apache 2.0        : http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * You should have received a copy of both of these licenses along with this
+ * software. If not, they may be obtained at the above URLs.
 */

 /*For memory wiping*/
@@ -252,26 +256,28 @@ int fill_memory_blocks(argon2_instance_t *instance) {
    uint32_t r, s;
    argon2_thread_handle_t *thread = NULL;
    argon2_thread_data *thr_data = NULL;
+    int rc = ARGON2_OK;

    if (instance == NULL || instance->lanes == 0) {
-        return ARGON2_THREAD_FAIL;
+        rc = ARGON2_THREAD_FAIL;
+        goto fail;
    }

    /* 1. Allocating space for threads */
    thread = calloc(instance->lanes, sizeof(argon2_thread_handle_t));
    if (thread == NULL) {
-        return ARGON2_MEMORY_ALLOCATION_ERROR;
+        rc = ARGON2_MEMORY_ALLOCATION_ERROR;
+        goto fail;
    }

    thr_data = calloc(instance->lanes, sizeof(argon2_thread_data));
    if (thr_data == NULL) {
-        free(thread);
-        return ARGON2_MEMORY_ALLOCATION_ERROR;
+        rc = ARGON2_MEMORY_ALLOCATION_ERROR;
+        goto fail;
    }

    for (r = 0; r < instance->passes; ++r) {
        for (s = 0; s < ARGON2_SYNC_POINTS; ++s) {
-            int rc;
            uint32_t l;

            /* 2. Calling threads */
@@ -280,11 +286,9 @@ int fill_memory_blocks(argon2_instance_t *instance) {

                /* 2.1 Join a thread if limit is exceeded */
                if (l >= instance->threads) {
-                    rc = argon2_thread_join(thread[l - instance->threads]);
-                    if (rc) {
-                        free(thr_data);
-                        free(thread);
-                        return ARGON2_THREAD_FAIL;
+                    if (argon2_thread_join(thread[l - instance->threads])) {
+                        rc = ARGON2_THREAD_FAIL;
+                        goto fail;
                    }
                }

@@ -297,12 +301,10 @@ int fill_memory_blocks(argon2_instance_t *instance) {
                    instance; /* preparing the thread input */
                memcpy(&(thr_data[l].pos), &position,
                       sizeof(argon2_position_t));
-                rc = argon2_thread_create(&thread[l], &fill_segment_thr,
-                                          (void *)&thr_data[l]);
-                if (rc) {
-                    free(thr_data);
-                    free(thread);
-                    return ARGON2_THREAD_FAIL;
+                if (argon2_thread_create(&thread[l], &fill_segment_thr,
+                                         (void *)&thr_data[l])) {
+                    rc = ARGON2_THREAD_FAIL;
+                    goto fail;
                }

                /* fill_segment(instance, position); */
@@ -312,9 +314,9 @@ int fill_memory_blocks(argon2_instance_t *instance) {
            /* 3. Joining remaining threads */
            for (l = instance->lanes - instance->threads; l < instance->lanes;
                 ++l) {
-                rc = argon2_thread_join(thread[l]);
-                if (rc) {
-                    return ARGON2_THREAD_FAIL;
+                if (argon2_thread_join(thread[l])) {
+                    rc = ARGON2_THREAD_FAIL;
+                    goto fail;
                }
            }
        }
@@ -324,13 +326,14 @@ int fill_memory_blocks(argon2_instance_t *instance) {
 #endif
    }

+fail:
    if (thread != NULL) {
        free(thread);
    }
    if (thr_data != NULL) {
        free(thr_data);
    }
-    return ARGON2_OK;
+    return rc;
 }

 int validate_inputs(const argon2_context *context) {
@@ -575,7 +578,7 @@ int initialize(argon2_instance_t *instance, argon2_context *context) {
        if (ARGON2_OK != result) {
            return result;
        }
-        memcpy(&(instance->memory), p, sizeof(instance->memory));
+        instance->memory = (block *)p;
    } else {
        result = allocate_memory(&(instance->memory), instance->memory_blocks);
        if (ARGON2_OK != result) {
@@ -1,14 +1,18 @@
 /*
- * Argon2 source code package
+ * Argon2 reference source code package - reference C implementations
 *
- * Written by Daniel Dinu and Dmitry Khovratovich, 2015
+ * Copyright 2015
+ * Daniel Dinu, Dmitry Khovratovich, Jean-Philippe Aumasson, and Samuel Neves
 *
- * This work is licensed under a Creative Commons CC0 1.0 License/Waiver.
+ * You may use this work under the terms of a Creative Commons CC0 1.0 
+ * License/Waiver or the Apache Public License 2.0, at your option. The terms of
+ * these licenses can be found at:
 *
- * You should have received a copy of the CC0 Public Domain Dedication along
- * with
- * this software. If not, see
- * <http://creativecommons.org/publicdomain/zero/1.0/>.
+ * - CC0 1.0 Universal : http://creativecommons.org/publicdomain/zero/1.0
+ * - Apache 2.0        : http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * You should have received a copy of both of these licenses along with this
+ * software. If not, they may be obtained at the above URLs.
 */

 #ifndef ARGON2_CORE_H
@@ -1,3 +1,20 @@
+/*
+ * Argon2 reference source code package - reference C implementations
+ *
+ * Copyright 2015
+ * Daniel Dinu, Dmitry Khovratovich, Jean-Philippe Aumasson, and Samuel Neves
+ *
+ * You may use this work under the terms of a Creative Commons CC0 1.0 
+ * License/Waiver or the Apache Public License 2.0, at your option. The terms of
+ * these licenses can be found at:
+ *
+ * - CC0 1.0 Universal : http://creativecommons.org/publicdomain/zero/1.0
+ * - Apache 2.0        : http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * You should have received a copy of both of these licenses along with this
+ * software. If not, they may be obtained at the above URLs.
+ */
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -291,21 +308,26 @@ int decode_string(argon2_context *ctx, const char *str, argon2_type type) {
    size_t maxsaltlen = ctx->saltlen;
    size_t maxoutlen = ctx->outlen;
    int validation_result;
+    const char* type_string;

    ctx->adlen = 0;
    ctx->saltlen = 0;
    ctx->outlen = 0;
    ctx->pwdlen = 0;

-    if (type == Argon2_i)
-        CC("$argon2i");
-    else if (type == Argon2_d)
-        CC("$argon2d");
-    else
+    /* We should start with the argon2_type we are using */
+    CC("$");
+    type_string = argon2_type2string(type, 0);
+    if (type_string) {
+        CC(type_string);
+    } else {
        return ARGON2_INCORRECT_TYPE;
-    ctx->version = ARGON2_VERSION_10;
+    }
+
    /* Reading the version number if the default is suppressed */
+    ctx->version = ARGON2_VERSION_10;
    CC_opt("$v=", DECIMAL(ctx->version));
+
    CC("$m=");
    DECIMAL(ctx->m_cost);
    CC(",t=");
@@ -370,16 +392,19 @@ int encode_string(char *dst, size_t dst_len, argon2_context *ctx,
        dst_len -= sb_len;                                                     \
    } while ((void)0, 0)

-    if (type == Argon2_i)
-        SS("$argon2i$v=");
-    else if (type == Argon2_d)
-        SS("$argon2d$v=");
-    else
+    const char* type_string = argon2_type2string(type, 0);
+    SS("$");
+    if (type_string) {
+        SS(type_string);
+    } else {
        return ARGON2_ENCODING_FAIL;
+    }

    if (validate_inputs(ctx) != ARGON2_OK) {
        return validate_inputs(ctx);
    }
+
+    SS("$v=");
    SX(ctx->version);
    SS("$m=");
    SX(ctx->m_cost);
@@ -1,3 +1,20 @@
+/*
+ * Argon2 reference source code package - reference C implementations
+ *
+ * Copyright 2015
+ * Daniel Dinu, Dmitry Khovratovich, Jean-Philippe Aumasson, and Samuel Neves
+ *
+ * You may use this work under the terms of a Creative Commons CC0 1.0 
+ * License/Waiver or the Apache Public License 2.0, at your option. The terms of
+ * these licenses can be found at:
+ *
+ * - CC0 1.0 Universal : http://creativecommons.org/publicdomain/zero/1.0
+ * - Apache 2.0        : http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * You should have received a copy of both of these licenses along with this
+ * software. If not, they may be obtained at the above URLs.
+ */
+
 #ifndef ENCODING_H
 #define ENCODING_H
 #include "argon2.h"
@@ -1,14 +1,18 @@
 /*
- * Argon2 source code package
+ * Argon2 reference source code package - reference C implementations
 *
- * Written by Daniel Dinu and Dmitry Khovratovich, 2015
+ * Copyright 2015
+ * Daniel Dinu, Dmitry Khovratovich, Jean-Philippe Aumasson, and Samuel Neves
 *
- * This work is licensed under a Creative Commons CC0 1.0 License/Waiver.
+ * You may use this work under the terms of a Creative Commons CC0 1.0 
+ * License/Waiver or the Apache Public License 2.0, at your option. The terms of
+ * these licenses can be found at:
 *
- * You should have received a copy of the CC0 Public Domain Dedication along
- * with
- * this software. If not, see
- * <http://creativecommons.org/publicdomain/zero/1.0/>.
+ * - CC0 1.0 Universal : http://creativecommons.org/publicdomain/zero/1.0
+ * - Apache 2.0        : http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * You should have received a copy of both of these licenses along with this
+ * software. If not, they may be obtained at the above URLs.
 */

 #include <stdint.h>
@@ -135,7 +139,10 @@ void fill_segment(const argon2_instance_t *instance,
        return;
    }

-    data_independent_addressing = (instance->type == Argon2_i);
+    data_independent_addressing =
+        (instance->type == Argon2_i) ||
+        (instance->type == Argon2_id && (position.pass == 0) &&
+         (position.slice < ARGON2_SYNC_POINTS / 2));

    pseudo_rands =
        (uint64_t *)malloc(sizeof(uint64_t) * instance->segment_length);
@@ -1,14 +1,18 @@
 /*
- * Argon2 source code package
+ * Argon2 reference source code package - reference C implementations
 *
- * Written by Daniel Dinu and Dmitry Khovratovich, 2015
+ * Copyright 2015
+ * Daniel Dinu, Dmitry Khovratovich, Jean-Philippe Aumasson, and Samuel Neves
 *
- * This work is licensed under a Creative Commons CC0 1.0 License/Waiver.
+ * You may use this work under the terms of a Creative Commons CC0 1.0 
+ * License/Waiver or the Apache Public License 2.0, at your option. The terms of
+ * these licenses can be found at:
 *
- * You should have received a copy of the CC0 Public Domain Dedication along
- * with
- * this software. If not, see
- * <http://creativecommons.org/publicdomain/zero/1.0/>.
+ * - CC0 1.0 Universal : http://creativecommons.org/publicdomain/zero/1.0
+ * - Apache 2.0        : http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * You should have received a copy of both of these licenses along with this
+ * software. If not, they may be obtained at the above URLs.
 */

 #ifndef ARGON2_OPT_H
@@ -1,14 +1,18 @@
 /*
- * Argon2 source code package
+ * Argon2 reference source code package - reference C implementations
 *
- * Written by Daniel Dinu and Dmitry Khovratovich, 2015
+ * Copyright 2015
+ * Daniel Dinu, Dmitry Khovratovich, Jean-Philippe Aumasson, and Samuel Neves
 *
- * This work is licensed under a Creative Commons CC0 1.0 License/Waiver.
+ * You may use this work under the terms of a Creative Commons CC0 1.0 
+ * License/Waiver or the Apache Public License 2.0, at your option. The terms of
+ * these licenses can be found at:
 *
- * You should have received a copy of the CC0 Public Domain Dedication along
- * with
- * this software. If not, see
- * <http://creativecommons.org/publicdomain/zero/1.0/>.
+ * - CC0 1.0 Universal : http://creativecommons.org/publicdomain/zero/1.0
+ * - Apache 2.0        : http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * You should have received a copy of both of these licenses along with this
+ * software. If not, they may be obtained at the above URLs.
 */

 #include <stdint.h>
@@ -145,7 +149,10 @@ void fill_segment(const argon2_instance_t *instance,
        return;
    }

-    data_independent_addressing = (instance->type == Argon2_i);
+    data_independent_addressing =
+        (instance->type == Argon2_i) ||
+        (instance->type == Argon2_id && (position.pass == 0) &&
+         (position.slice < ARGON2_SYNC_POINTS / 2));

    pseudo_rands =
        (uint64_t *)malloc(sizeof(uint64_t) * (instance->segment_length));
@@ -1,14 +1,18 @@
 /*
- * Argon2 source code package
+ * Argon2 reference source code package - reference C implementations
 *
- * Written by Daniel Dinu and Dmitry Khovratovich, 2015
+ * Copyright 2015
+ * Daniel Dinu, Dmitry Khovratovich, Jean-Philippe Aumasson, and Samuel Neves
 *
- * This work is licensed under a Creative Commons CC0 1.0 License/Waiver.
+ * You may use this work under the terms of a Creative Commons CC0 1.0 
+ * License/Waiver or the Apache Public License 2.0, at your option. The terms of
+ * these licenses can be found at:
 *
- * You should have received a copy of the CC0 Public Domain Dedication along
- * with
- * this software. If not, see
- * <http://creativecommons.org/publicdomain/zero/1.0/>.
+ * - CC0 1.0 Universal : http://creativecommons.org/publicdomain/zero/1.0
+ * - Apache 2.0        : http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * You should have received a copy of both of these licenses along with this
+ * software. If not, they may be obtained at the above URLs.
 */

 #ifndef ARGON2_REF_H
@@ -1,3 +1,20 @@
+/*
+ * Argon2 reference source code package - reference C implementations
+ *
+ * Copyright 2015
+ * Daniel Dinu, Dmitry Khovratovich, Jean-Philippe Aumasson, and Samuel Neves
+ *
+ * You may use this work under the terms of a Creative Commons CC0 1.0 
+ * License/Waiver or the Apache Public License 2.0, at your option. The terms of
+ * these licenses can be found at:
+ *
+ * - CC0 1.0 Universal : http://creativecommons.org/publicdomain/zero/1.0
+ * - Apache 2.0        : http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * You should have received a copy of both of these licenses along with this
+ * software. If not, they may be obtained at the above URLs.
+ */
+
 #include "thread.h"
 #if defined(_WIN32)
 #include <windows.h>
@@ -1,3 +1,20 @@
+/*
+ * Argon2 reference source code package - reference C implementations
+ *
+ * Copyright 2015
+ * Daniel Dinu, Dmitry Khovratovich, Jean-Philippe Aumasson, and Samuel Neves
+ *
+ * You may use this work under the terms of a Creative Commons CC0 1.0 
+ * License/Waiver or the Apache Public License 2.0, at your option. The terms of
+ * these licenses can be found at:
+ *
+ * - CC0 1.0 Universal : http://creativecommons.org/publicdomain/zero/1.0
+ * - Apache 2.0        : http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * You should have received a copy of both of these licenses along with this
+ * software. If not, they may be obtained at the above URLs.
+ */
+
 #ifndef ARGON2_THREAD_H
 #define ARGON2_THREAD_H
 /*
@@ -37,6 +37,8 @@

 namespace dht {

+constexpr std::chrono::seconds DhtRunner::BOOTSTRAP_PERIOD;
+
 DhtRunner::DhtRunner() : dht_()
 {
 #ifdef _WIN32
@@ -104,7 +106,8 @@ DhtRunner::run(const sockaddr_in* local4, const sockaddr_in6* local6, DhtRunner:
                    std::lock_guard<std::mutex> lck(storage_mtx);
                    if (not pending_ops_prio.empty())
                        return true;
-                    if (not pending_ops.empty() and getStatus() != NodeStatus::Connecting)
+                    auto s = getStatus();
+                    if (not pending_ops.empty() and (s == NodeStatus::Connected or (s == NodeStatus::Disconnected and not bootstraping)))
                        return true;
                }
                return false;
@@ -127,10 +130,14 @@ DhtRunner::join()
 {
    running = false;
    cv.notify_all();
+    bootstrap_cv.notify_all();
    if (dht_thread.joinable())
        dht_thread.join();
    if (rcv_thread.joinable())
        rcv_thread.join();
+    if (bootstrap_thread.joinable())
+        bootstrap_thread.join();
+
    {
        std::lock_guard<std::mutex> lck(storage_mtx);
        pending_ops = decltype(pending_ops)();
@@ -208,6 +215,12 @@ DhtRunner::setLoggers(LogMethod error, LogMethod warn, LogMethod debug) {
    dht_->setLoggers(std::forward<LogMethod>(error), std::forward<LogMethod>(warn), std::forward<LogMethod>(debug));
 }

+void
+DhtRunner::setLogFilter(const InfoHash& f) {
+    std::lock_guard<std::mutex> lck(dht_mtx);
+    dht_->setLogFilter(f);
+}
+
 void
 DhtRunner::registerType(const ValueType& type) {
    std::lock_guard<std::mutex> lck(dht_mtx);
@@ -241,6 +254,12 @@ DhtRunner::getStorageLog() const
    return dht_->getStorageLog();
 }
 std::string
+DhtRunner::getStorageLog(const InfoHash& f) const
+{
+    std::lock_guard<std::mutex> lck(dht_mtx);
+    return dht_->getStorageLog(f);
+}
+std::string
 DhtRunner::getRoutingTablesLog(sa_family_t af) const
 {
    std::lock_guard<std::mutex> lck(dht_mtx);
@@ -252,6 +271,12 @@ DhtRunner::getSearchesLog(sa_family_t af) const
    std::lock_guard<std::mutex> lck(dht_mtx);
    return dht_->getSearchesLog(af);
 }
+std::string
+DhtRunner::getSearchLog(const InfoHash& f, sa_family_t af) const
+{
+    std::lock_guard<std::mutex> lck(dht_mtx);
+    return dht_->getSearchLog(f, af);
+}
 std::vector<SockAddr>
 DhtRunner::getPublicAddress(sa_family_t af)
 {
@@ -287,22 +312,14 @@ DhtRunner::loop_()
    decltype(pending_ops) ops {};
    {
        std::lock_guard<std::mutex> lck(storage_mtx);
-        ops = std::move(pending_ops_prio);
+        auto s = getStatus();
+        ops = (pending_ops_prio.empty() && (s == NodeStatus::Connected or (s == NodeStatus::Disconnected and not bootstraping))) ?
+               std::move(pending_ops) : std::move(pending_ops_prio);
    }
    while (not ops.empty()) {
        ops.front()(*dht_);
        ops.pop();
    }
-    if (getStatus() != NodeStatus::Connecting) {
-        {
-            std::lock_guard<std::mutex> lck(storage_mtx);
-            ops = std::move(pending_ops);
-        }
-        while (not ops.empty()) {
-            ops.front()(*dht_);
-            ops.pop();
-        }
-    }

    time_point wakeup {};
    decltype(rcv) received {};
@@ -327,6 +344,15 @@ DhtRunner::loop_()
    if (nstatus4 != status4 || nstatus6 != status6) {
        status4 = nstatus4;
        status6 = nstatus6;
+        if (status4 == NodeStatus::Disconnected and status6 == NodeStatus::Disconnected) {
+            // We have lost connection with the DHT.  Try to recover using bootstrap nodes.
+            std::unique_lock<std::mutex> lck(bootstrap_mtx);
+            bootstrap_nodes = bootstrap_nodes_all;
+            tryBootstrapCoutinuously();
+        } else {
+            std::unique_lock<std::mutex> lck(bootstrap_mtx);
+            bootstrap_nodes.clear();
+        }
        if (statusCb)
            statusCb(status4, status6);
    }
@@ -431,10 +457,12 @@ DhtRunner::doRun(const sockaddr_in* sin4, const sockaddr_in6* sin6, SecureDht::C
 void
 DhtRunner::get(InfoHash hash, GetCallback vcb, DoneCallback dcb, Value::Filter f, Where w)
 {
-    std::lock_guard<std::mutex> lck(storage_mtx);
-    pending_ops.emplace([=](SecureDht& dht) mutable {
-        dht.get(hash, vcb, dcb, std::move(f), std::move(w));
-    });
+    {
+        std::lock_guard<std::mutex> lck(storage_mtx);
+        pending_ops.emplace([=](SecureDht& dht) mutable {
+            dht.get(hash, vcb, dcb, std::move(f), std::move(w));
+        });
+    }
    cv.notify_all();
 }

@@ -444,21 +472,25 @@ DhtRunner::get(const std::string& key, GetCallback vcb, DoneCallbackSimple dcb,
    get(InfoHash::get(key), vcb, dcb, f, w);
 }
 void DhtRunner::query(const InfoHash& hash, QueryCallback cb, DoneCallback done_cb, Query q) {
-    std::lock_guard<std::mutex> lck(storage_mtx);
-    pending_ops.emplace([=](SecureDht& dht) mutable {
-        dht.query(hash, cb, done_cb, std::move(q));
-    });
+    {
+        std::lock_guard<std::mutex> lck(storage_mtx);
+        pending_ops.emplace([=](SecureDht& dht) mutable {
+            dht.query(hash, cb, done_cb, std::move(q));
+        });
+    }
    cv.notify_all();
 }

 std::future<size_t>
 DhtRunner::listen(InfoHash hash, GetCallback vcb, Value::Filter f, Where w)
 {
-    std::lock_guard<std::mutex> lck(storage_mtx);
    auto ret_token = std::make_shared<std::promise<size_t>>();
-    pending_ops.emplace([=](SecureDht& dht) mutable {
-        ret_token->set_value(dht.listen(hash, vcb, std::move(f), std::move(w)));
-    });
+    {
+        std::lock_guard<std::mutex> lck(storage_mtx);
+        pending_ops.emplace([=](SecureDht& dht) mutable {
+            ret_token->set_value(dht.listen(hash, vcb, std::move(f), std::move(w)));
+        });
+    }
    cv.notify_all();
    return ret_token->get_future();
 }
@@ -472,42 +504,50 @@ DhtRunner::listen(const std::string& key, GetCallback vcb, Value::Filter f, Wher
 void
 DhtRunner::cancelListen(InfoHash h, size_t token)
 {
-    std::lock_guard<std::mutex> lck(storage_mtx);
-    pending_ops.emplace([=](SecureDht& dht) {
-        dht.cancelListen(h, token);
-    });
+    {
+        std::lock_guard<std::mutex> lck(storage_mtx);
+        pending_ops.emplace([=](SecureDht& dht) {
+            dht.cancelListen(h, token);
+        });
+    }
    cv.notify_all();
 }

 void
 DhtRunner::cancelListen(InfoHash h, std::shared_future<size_t> token)
 {
-    std::lock_guard<std::mutex> lck(storage_mtx);
-    pending_ops.emplace([=](SecureDht& dht) {
-        auto tk = token.get();
-        dht.cancelListen(h, tk);
-    });
+    {
+        std::lock_guard<std::mutex> lck(storage_mtx);
+        pending_ops.emplace([=](SecureDht& dht) {
+            auto tk = token.get();
+            dht.cancelListen(h, tk);
+        });
+    }
    cv.notify_all();
 }

 void
 DhtRunner::put(InfoHash hash, Value&& value, DoneCallback cb, time_point created, bool permanent)
 {
-    std::lock_guard<std::mutex> lck(storage_mtx);
-    auto sv = std::make_shared<Value>(std::move(value));
-    pending_ops.emplace([=](SecureDht& dht) {
-        dht.put(hash, sv, cb, created, permanent);
-    });
+    {
+        std::lock_guard<std::mutex> lck(storage_mtx);
+        auto sv = std::make_shared<Value>(std::move(value));
+        pending_ops.emplace([=](SecureDht& dht) {
+            dht.put(hash, sv, cb, created, permanent);
+        });
+    }
    cv.notify_all();
 }

 void
 DhtRunner::put(InfoHash hash, std::shared_ptr<Value> value, DoneCallback cb, time_point created, bool permanent)
 {
-    std::lock_guard<std::mutex> lck(storage_mtx);
-    pending_ops.emplace([=](SecureDht& dht) {
-        dht.put(hash, value, cb, created, permanent);
-    });
+    {
+        std::lock_guard<std::mutex> lck(storage_mtx);
+        pending_ops.emplace([=](SecureDht& dht) {
+            dht.put(hash, value, cb, created, permanent);
+        });
+    }
    cv.notify_all();
 }

@@ -520,20 +560,24 @@ DhtRunner::put(const std::string& key, Value&& value, DoneCallbackSimple cb, tim
 void
 DhtRunner::cancelPut(const InfoHash& h , const Value::Id& id)
 {
-    std::lock_guard<std::mutex> lck(storage_mtx);
-    pending_ops.emplace([=](SecureDht& dht) {
-        dht.cancelPut(h, id);
-    });
+    {
+        std::lock_guard<std::mutex> lck(storage_mtx);
+        pending_ops.emplace([=](SecureDht& dht) {
+            dht.cancelPut(h, id);
+        });
+    }
    cv.notify_all();
 }

 void
 DhtRunner::putSigned(InfoHash hash, std::shared_ptr<Value> value, DoneCallback cb)
 {
-    std::lock_guard<std::mutex> lck(storage_mtx);
-    pending_ops.emplace([=](SecureDht& dht) {
-        dht.putSigned(hash, value, cb);
-    });
+    {
+        std::lock_guard<std::mutex> lck(storage_mtx);
+        pending_ops.emplace([=](SecureDht& dht) {
+            dht.putSigned(hash, value, cb);
+        });
+    }
    cv.notify_all();
 }

@@ -552,10 +596,12 @@ DhtRunner::putSigned(const std::string& key, Value&& value, DoneCallbackSimple c
 void
 DhtRunner::putEncrypted(InfoHash hash, InfoHash to, std::shared_ptr<Value> value, DoneCallback cb)
 {
-    std::lock_guard<std::mutex> lck(storage_mtx);
-    pending_ops.emplace([=](SecureDht& dht) {
-        dht.putEncrypted(hash, to, value, cb);
-    });
+    {
+        std::lock_guard<std::mutex> lck(storage_mtx);
+        pending_ops.emplace([=](SecureDht& dht) {
+            dht.putEncrypted(hash, to, value, cb);
+        });
+    }
    cv.notify_all();
 }

@@ -571,18 +617,77 @@ DhtRunner::putEncrypted(const std::string& key, InfoHash to, Value&& value, Done
    putEncrypted(InfoHash::get(key), to, std::forward<Value>(value), cb);
 }

+void
+DhtRunner::tryBootstrapCoutinuously()
+{
+    if (bootstrap_thread.joinable()) {
+        if (bootstraping)
+            return; // already running
+        else
+            bootstrap_thread.join();
+    }
+    bootstraping = true;
+    bootstrap_thread = std::thread([this]() {
+        auto next = clock::now();
+        do {
+            decltype(bootstrap_nodes) nodes;
+            {
+                std::lock_guard<std::mutex> lck(bootstrap_mtx);
+                nodes = bootstrap_nodes;
+            }
+
+            next += BOOTSTRAP_PERIOD;
+            {
+                std::mutex mtx;
+                std::unique_lock<std::mutex> blck(mtx);
+                unsigned ping_count(0);
+                // Reverse: try last inserted bootstrap nodes first
+                for (auto it = nodes.rbegin(); it != nodes.rend(); it++) {
+                    ++ping_count;
+                    try {
+                        bootstrap(getAddrInfo(it->first, it->second), [&](bool) {
+                            if (not running)
+                                return;
+                            {
+                                std::unique_lock<std::mutex> blck(mtx);
+                                --ping_count;
+                            }
+                            bootstrap_cv.notify_all();
+                        });
+                    } catch (std::invalid_argument& e) {
+                        --ping_count;
+                        std::cerr << e.what() << std::endl;
+                    }
+                }
+                // wait at least until the next BOOTSTRAP_PERIOD
+                bootstrap_cv.wait_until(blck, next, [&]() { return not running; });
+                // wait for bootstrap requests to end.
+                if (running)
+                   bootstrap_cv.wait(blck, [&]() { return not running or ping_count == 0; });
+            }
+            // update state
+            {
+                std::lock_guard<std::mutex> lck(dht_mtx);
+                bootstraping = running and
+                               status4 == NodeStatus::Disconnected and
+                               status6 == NodeStatus::Disconnected;
+            }
+        } while (bootstraping);
+    });
+}
+
 std::vector<std::pair<sockaddr_storage, socklen_t>>
-DhtRunner::getAddrInfo(const char* host, const char* service)
+DhtRunner::getAddrInfo(const std::string& host, const std::string& service)
 {
    std::vector<std::pair<sockaddr_storage, socklen_t>> ips {};
-    if (not host or not service or strlen(host) == 0)
+    if (host.empty())
        return ips;

    addrinfo hints;
    memset(&hints, 0, sizeof(hints));
    hints.ai_socktype = SOCK_DGRAM;
    addrinfo* info = nullptr;
-    int rc = getaddrinfo(host, service, &hints, &info);
+    int rc = getaddrinfo(host.c_str(), service.c_str(), &hints, &info);
    if(rc != 0)
        throw std::invalid_argument(std::string("Error: `") + host + ":" + service + "`: " + gai_strerror(rc));

@@ -597,18 +702,35 @@ DhtRunner::getAddrInfo(const char* host, const char* service)
 }

 void
-DhtRunner::bootstrap(const char* host, const char* service)
+DhtRunner::bootstrap(const std::string& host, const std::string& service)
 {
-    bootstrap(getAddrInfo(host, service));
+    std::lock_guard<std::mutex> lck(bootstrap_mtx);
+    bootstrap_nodes_all.emplace_back(host, service);
+    bootstrap_nodes.emplace_back(host, service);
+    tryBootstrapCoutinuously();
 }

 void
-DhtRunner::bootstrap(const std::vector<std::pair<sockaddr_storage, socklen_t>>& nodes)
+DhtRunner::clearBootstrap()
+{
+    std::lock_guard<std::mutex> lck(bootstrap_mtx);
+    bootstrap_nodes_all.clear();
+}
+
+void
+DhtRunner::bootstrap(const std::vector<std::pair<sockaddr_storage, socklen_t>>& nodes, DoneCallbackSimple&& cb)
 {
    std::lock_guard<std::mutex> lck(storage_mtx);
-    pending_ops_prio.emplace([=](SecureDht& dht) {
+    pending_ops_prio.emplace([=](SecureDht& dht) mutable {
+        auto rem = cb ? std::make_shared<std::pair<size_t, bool>>(nodes.size(), false) : nullptr;
        for (auto& node : nodes)
-            dht.pingNode((sockaddr*)&node.first, node.second);
+            dht.pingNode((sockaddr*)&node.first, node.second, cb ? [rem,cb](bool ok) {
+                auto& r = *rem;
+                r.first--;
+                r.second |= ok;
+                if (not r.first)
+                    cb(r.second);
+            } : DoneCallbackSimple{});
    });
    cv.notify_all();
 }
@@ -616,30 +738,36 @@ DhtRunner::bootstrap(const std::vector<std::pair<sockaddr_storage, socklen_t>>&
 void
 DhtRunner::bootstrap(const std::vector<NodeExport>& nodes)
 {
-    std::lock_guard<std::mutex> lck(storage_mtx);
-    pending_ops_prio.emplace([=](SecureDht& dht) {
-        for (auto& node : nodes)
-            dht.insertNode(node);
-    });
+    {
+        std::lock_guard<std::mutex> lck(storage_mtx);
+        pending_ops_prio.emplace([=](SecureDht& dht) {
+            for (auto& node : nodes)
+                dht.insertNode(node);
+        });
+    }
    cv.notify_all();
 }

 void
 DhtRunner::connectivityChanged()
 {
-    std::lock_guard<std::mutex> lck(storage_mtx);
-    pending_ops.emplace([=](SecureDht& dht) {
-        dht.connectivityChanged();
-    });
+    {
+        std::lock_guard<std::mutex> lck(storage_mtx);
+        pending_ops.emplace([=](SecureDht& dht) {
+            dht.connectivityChanged();
+        });
+    }
    cv.notify_all();
 }

 void
 DhtRunner::findCertificate(InfoHash hash, std::function<void(const std::shared_ptr<crypto::Certificate>)> cb) {
-    std::lock_guard<std::mutex> lck(storage_mtx);
-    pending_ops.emplace([=](SecureDht& dht) {
-        dht.findCertificate(hash, cb);
-    });
+    {
+        std::lock_guard<std::mutex> lck(storage_mtx);
+        pending_ops.emplace([=](SecureDht& dht) {
+            dht.findCertificate(hash, cb);
+        });
+    }
    cv.notify_all();
 }

@@ -14,14 +14,14 @@
 *  GNU General Public License for more details.
 *
 *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
+ *  along with this program. If not, see <http://www.gnu.org/licenses/>.
 */


 #include "network_engine.h"
 #include "request.h"
 #include "default_types.h"
+#include "log_enable.h"

 #include <msgpack.hpp>

@@ -33,17 +33,22 @@ const std::string DhtProtocolException::LISTEN_WRONG_TOKEN {"Listen with wrong t
 const std::string DhtProtocolException::PUT_NO_INFOHASH {"Put with no info_hash"};
 const std::string DhtProtocolException::PUT_WRONG_TOKEN {"Put with wrong token"};
 const std::string DhtProtocolException::PUT_INVALID_ID {"Put with invalid id"};
+const std::string DhtProtocolException::STORAGE_NOT_FOUND {"Access operation for unknown storage"};

 constexpr std::chrono::seconds NetworkEngine::UDP_REPLY_TIME;
+constexpr std::chrono::seconds NetworkEngine::RX_MAX_PACKET_TIME;
+constexpr std::chrono::seconds NetworkEngine::RX_TIMEOUT;
+
 const std::string NetworkEngine::my_v {"RNG1"};
 const constexpr uint16_t NetworkEngine::TransId::INVALID;
 std::mt19937 NetworkEngine::rd_device {dht::crypto::random_device{}()};

 const NetworkEngine::TransPrefix NetworkEngine::TransPrefix::PING = {"pn"};
-const NetworkEngine::TransPrefix NetworkEngine::TransPrefix::FIND_NODE  = {"fn"};
-const NetworkEngine::TransPrefix NetworkEngine::TransPrefix::GET_VALUES  = {"gt"};
-const NetworkEngine::TransPrefix NetworkEngine::TransPrefix::ANNOUNCE_VALUES  = {"pt"};
-const NetworkEngine::TransPrefix NetworkEngine::TransPrefix::LISTEN  = {"lt"};
+const NetworkEngine::TransPrefix NetworkEngine::TransPrefix::FIND_NODE = {"fn"};
+const NetworkEngine::TransPrefix NetworkEngine::TransPrefix::GET_VALUES = {"gt"};
+const NetworkEngine::TransPrefix NetworkEngine::TransPrefix::ANNOUNCE_VALUES = {"pt"};
+const NetworkEngine::TransPrefix NetworkEngine::TransPrefix::REFRESH = {"rf"};
+const NetworkEngine::TransPrefix NetworkEngine::TransPrefix::LISTEN = {"lt"};
 constexpr long unsigned NetworkEngine::MAX_REQUESTS_PER_SEC;

 static const uint8_t v4prefix[16] = {
@@ -59,35 +64,97 @@ enum class MessageType {
    FindNode,
    GetValues,
    AnnounceValue,
-    Listen
+    Refresh,
+    Listen,
+    ValueData
 };

 struct ParsedMessage {
    MessageType type;
-    InfoHash id;                                          /* the id of the sender */
-    NetId network {0};                                    /* network id */
-    InfoHash info_hash;                                   /* hash for which values are requested */
-    InfoHash target;                                      /* target id around which to find nodes */
-    NetworkEngine::TransId tid;                           /* transaction id */
-    Blob token;                                           /* security token */
-    Value::Id value_id;                                   /* the value id */
-    time_point created { time_point::max() };             /* time when value was first created */
-    Blob nodes4_raw, nodes6_raw;                          /* IPv4 nodes in response to a 'find' request */
+    /* Node ID of the sender */
+    InfoHash id;
+    /* Network id */
+    NetId network {0};
+    /* hash for which values are requested */
+    InfoHash info_hash;
+    /* target id around which to find nodes */
+    InfoHash target;
+    /* transaction id */
+    NetworkEngine::TransId tid;
+    /* security token */
+    Blob token;
+    /* the value id (announce confirmation) */
+    Value::Id value_id;
+    /* time when value was first created */
+    time_point created { time_point::max() };
+    /* IPv4 nodes in response to a 'find' request */
+    Blob nodes4_raw, nodes6_raw;
    std::vector<std::shared_ptr<Node>> nodes4, nodes6;
-    std::vector<std::shared_ptr<Value>> values;           /* values for a 'get' request */
-    std::vector<std::shared_ptr<FieldValueIndex>> fields; /* index for fields values */
-    Query query;                                          /* query describing a filter to apply on values. */
-    want_t want;                                          /* states if ipv4 or ipv6 request */
-    uint16_t error_code;                                  /* error code in case of error */
+    /* values to store or retreive request */
+    std::vector<std::shared_ptr<Value>> values;
+    /* index for fields values */
+    std::vector<std::shared_ptr<FieldValueIndex>> fields;
+    /** When part of the message header: {index -> (total size, {})}
+     *  When part of partial value data: {index -> (offset, part_data)} */
+    std::map<unsigned, std::pair<unsigned, Blob>> value_parts;
+    /* query describing a filter to apply on values. */
+    Query query;
+    /* states if ipv4 or ipv6 request */
+    want_t want;
+    /* error code in case of error */
+    uint16_t error_code;
+    /* reported address by the distant node */
    std::string ua;
-    SockAddr addr;                                        /* reported address by the distant node */
+    SockAddr addr;
    void msgpack_unpack(msgpack::object o);
+
+    bool append(const ParsedMessage& block);
+    bool complete();
 };

+struct NetworkEngine::PartialMessage {
+    SockAddr from;
+    time_point start;
+    time_point last_part;
+    std::unique_ptr<ParsedMessage> msg;
+};
+
+std::vector<Blob>
+serializeValues(const std::vector<std::shared_ptr<Value>>& st)
+{
+    std::vector<Blob> svals;
+    svals.reserve(st.size());
+    for (const auto& v : st)
+        svals.emplace_back(packMsg(v));
+    return svals;
+}
+
 NetworkEngine::RequestAnswer::RequestAnswer(ParsedMessage&& msg)
 : ntoken(std::move(msg.token)), values(std::move(msg.values)), fields(std::move(msg.fields)),
    nodes4(std::move(msg.nodes4)), nodes6(std::move(msg.nodes6)) {}

+NetworkEngine::NetworkEngine(Logger& log, Scheduler& scheduler) : myid(zeroes), DHT_LOG(log), scheduler(scheduler) {}
+NetworkEngine::NetworkEngine(InfoHash& myid, NetId net, int s, int s6, Logger& log, Scheduler& scheduler,
+        decltype(NetworkEngine::onError) onError,
+        decltype(NetworkEngine::onNewNode) onNewNode,
+        decltype(NetworkEngine::onReportedAddr) onReportedAddr,
+        decltype(NetworkEngine::onPing) onPing,
+        decltype(NetworkEngine::onFindNode) onFindNode,
+        decltype(NetworkEngine::onGetValues) onGetValues,
+        decltype(NetworkEngine::onListen) onListen,
+        decltype(NetworkEngine::onAnnounce) onAnnounce,
+        decltype(NetworkEngine::onRefresh) onRefresh) :
+    onError(onError), onNewNode(onNewNode), onReportedAddr(onReportedAddr), onPing(onPing), onFindNode(onFindNode),
+    onGetValues(onGetValues), onListen(onListen), onAnnounce(onAnnounce), onRefresh(onRefresh), myid(myid),
+    network(net), dht_socket(s), dht_socket6(s6), DHT_LOG(log), scheduler(scheduler)
+{
+    transaction_id = std::uniform_int_distribution<decltype(transaction_id)>{1}(rd_device);
+}
+
+NetworkEngine::~NetworkEngine() {
+    clear();
+}
+
 void
 NetworkEngine::tellListener(std::shared_ptr<Node> node, uint16_t rid, const InfoHash& hash, want_t want,
        const Blob& ntoken, std::vector<std::shared_ptr<Node>>&& nodes,
@@ -99,7 +166,7 @@ NetworkEngine::tellListener(std::shared_ptr<Node> node, uint16_t rid, const Info
        sendNodesValues(node->addr, TransId {TransPrefix::GET_VALUES, (uint16_t)rid}, nnodes.first, nnodes.second,
                values, query, ntoken);
    } catch (const std::overflow_error& e) {
-        DHT_LOG.ERR("Can't send value: buffer not large enough !");
+        DHT_LOG.e("Can't send value: buffer not large enough !");
    }
 }

@@ -131,45 +198,46 @@ void
 NetworkEngine::clear()
 {
    for (auto& req : requests)
-        req.second->cancel();
+        req.second->setExpired();
    requests.clear();
 }

 void
-NetworkEngine::connectivityChanged()
+NetworkEngine::connectivityChanged(sa_family_t af)
 {
-    cache.clearBadNodes();
+    cache.clearBadNodes(af);
 }

 void
-NetworkEngine::requestStep(std::shared_ptr<Request> req)
+NetworkEngine::requestStep(std::shared_ptr<Request> sreq)
 {
-    if (not req->pending()) {
-        if (req->cancelled())
-            requests.erase(req->tid);
+    auto& req = *sreq;
+    if (not req.pending()) {
+        if (req.cancelled())
+            requests.erase(req.tid);
        return;
    }

    auto now = scheduler.time();
-    if (req->isExpired(now)) {
-        DHT_LOG.ERR("[node %s] expired !", req->node->toString().c_str());
-        req->node->setExpired();
-        requests.erase(req->tid);
+    auto& node = *req.node;
+    if (req.isExpired(now)) {
+        DHT_LOG.e(node.id, "[node %s] expired !", node.toString().c_str());
+        node.setExpired();
+        requests.erase(req.tid);
        return;
-    } else if (req->attempt_count == 1) {
-        req->on_expired(*req, false);
+    } else if (req.attempt_count == 1) {
+        req.on_expired(req, false);
    }

-    send((char*)req->msg.data(), req->msg.size(),
-            (req->node->reply_time >= now - UDP_REPLY_TIME) ? 0 : MSG_CONFIRM,
-            req->node->addr);
-    ++req->attempt_count;
-    req->last_try = now;
-    std::weak_ptr<Request> wreq = req;
-    scheduler.add(req->last_try + Node::MAX_RESPONSE_TIME, [this,wreq]() {
-        if (auto req = wreq.lock()) {
+    send((char*)req.msg.data(), req.msg.size(),
+            (node.reply_time >= now - UDP_REPLY_TIME) ? 0 : MSG_CONFIRM,
+            node.addr);
+    ++req.attempt_count;
+    req.last_try = now;
+    std::weak_ptr<Request> wreq = sreq;
+    scheduler.add(req.last_try + Node::MAX_RESPONSE_TIME, [this,wreq] {
+        if (auto req = wreq.lock())
            requestStep(req);
-        }
    });
 }

@@ -182,8 +250,13 @@ NetworkEngine::sendRequest(std::shared_ptr<Request>& request)
 {
    request->start = scheduler.time();
    auto e = requests.emplace(request->tid, request);
-    if (!e.second)
-        DHT_LOG.ERR("Request already existed (tid: %d)!", request->tid);
+    if (not e.second) {
+        // Should not happen !
+        // Try to handle this scenario as well as we can
+        e.first->second->setExpired();
+        e.first->second = request;
+        DHT_LOG.e(request->node->id, "Request already existed (tid: %d)!", request->tid);
+    }
    request->node->requested(request);
    requestStep(request);
 }
@@ -206,13 +279,9 @@ NetworkEngine::rateLimit(const SockAddr& addr)
        }
    }

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

 bool
@@ -276,66 +345,105 @@ void
 NetworkEngine::processMessage(const uint8_t *buf, size_t buflen, const SockAddr& from)
 {
    if (isMartian(from)) {
-        DHT_LOG.WARN("Received packet from martian node %s", from.toString().c_str());
+        DHT_LOG.w("Received packet from martian node %s", from.toString().c_str());
        return;
    }

    if (isNodeBlacklisted(from)) {
-        DHT_LOG.WARN("Received packet from blacklisted node %s", from.toString().c_str());
+        DHT_LOG.w("Received packet from blacklisted node %s", from.toString().c_str());
        return;
    }

-    ParsedMessage msg;
+    std::unique_ptr<ParsedMessage> msg {new ParsedMessage};
    try {
        msgpack::unpacked msg_res = msgpack::unpack((const char*)buf, buflen);
-        msg.msgpack_unpack(msg_res.get());
-        if (msg.type != MessageType::Error && msg.id == zeroes)
-            throw DhtException("no or invalid InfoHash");
+        msg->msgpack_unpack(msg_res.get());
    } catch (const std::exception& e) {
-        DHT_LOG.WARN("Can't process message of size %lu: %s.", buflen, e.what());
+        DHT_LOG.w("Can't process message of size %lu: %s", buflen, e.what());
        DHT_LOG.DEBUG.logPrintable(buf, buflen);
        return;
    }

-    if (msg.network != network) {
-        DHT_LOG.DEBUG("Received message from other network %u.", msg.network);
+    if (msg->network != network) {
+        DHT_LOG.d("Received message from other network %u", msg->network);
        return;
    }

-    if (msg.id == myid || msg.id == zeroes) {
-        DHT_LOG.DEBUG("Received message from self.");
-        return;
-    }
-
-    if (msg.type > MessageType::Reply) {
-        /* Rate limit requests. */
-        if (!rateLimit(from)) {
-            DHT_LOG.WARN("Dropping request due to rate limiting.");
-            return;
-        }
-    }
-
    const auto& now = scheduler.time();

-    if (msg.tid.length != 4) {
-        DHT_LOG.ERR("Broken node truncates transaction ids (len: %d): ", msg.tid.length);
-        DHT_LOG.ERR.logPrintable(buf, buflen);
-        blacklistNode(cache.getNode(msg.id, from, now, true));
+    // partial value data
+    if (msg->type == MessageType::ValueData) {
+        auto pmsg_it = partial_messages.find(msg->tid);
+        if (pmsg_it == partial_messages.end()) {
+            DHT_LOG.d("Can't find partial message");
+            rateLimit(from);
+            return;
+        }
+        if (!pmsg_it->second.from.equals(from)) {
+            DHT_LOG.d("Received partial message data from unexpected IP address");
+            rateLimit(from);
+            return;
+        }
+        // append data block
+        if (pmsg_it->second.msg->append(*msg)) {
+            pmsg_it->second.last_part = now;
+            // check data completion
+            if (pmsg_it->second.msg->complete()) {
+                // process the full message
+                process(std::move(pmsg_it->second.msg), from);
+                partial_messages.erase(pmsg_it);
+            } else
+                scheduler.add(now + RX_TIMEOUT, std::bind(&NetworkEngine::maintainRxBuffer, this, msg->tid));
+        }
        return;
    }

-    uint16_t ttid = 0;
-    if (msg.type == MessageType::Error or msg.type == MessageType::Reply) {
-        auto reqp = requests.find(msg.tid.getTid());
+    if (msg->id == myid || msg->id == zeroes) {
+        DHT_LOG.d("Received message from self");
+        return;
+    }
+
+    if (msg->type > MessageType::Reply) {
+        /* Rate limit requests. */
+        if (!rateLimit(from)) {
+            DHT_LOG.w("Dropping request due to rate limiting");
+            return;
+        }
+    }
+
+    if (msg->value_parts.empty()) {
+        process(std::move(msg), from);
+    } else {
+        // starting partial message session
+        PartialMessage pmsg;
+        pmsg.from = from;
+        pmsg.msg = std::move(msg);
+        pmsg.start = now;
+        pmsg.last_part = now;
+        auto wmsg = partial_messages.emplace(pmsg.msg->tid, std::move(pmsg));
+        if (wmsg.second) {
+            scheduler.add(now + RX_MAX_PACKET_TIME, std::bind(&NetworkEngine::maintainRxBuffer, this, wmsg.first->first));
+            scheduler.add(now + RX_TIMEOUT, std::bind(&NetworkEngine::maintainRxBuffer, this, wmsg.first->first));
+        } else
+            DHT_LOG.e("Partial message with given TID already exists");
+    }
+}
+
+void
+NetworkEngine::process(std::unique_ptr<ParsedMessage>&& msg, const SockAddr& from)
+{
+    const auto& now = scheduler.time();
+
+    if (msg->type == MessageType::Error or msg->type == MessageType::Reply) {
+        auto reqp = requests.find(msg->tid.getTid());
        if (reqp == requests.end()) {
-            throw DhtProtocolException {DhtProtocolException::UNKNOWN_TID, "Can't find transaction", msg.id};
+            throw DhtProtocolException {DhtProtocolException::UNKNOWN_TID, "Can't find transaction", msg->id};
        }
        auto req = reqp->second;
-
        auto node = req->node;
-        if (node->id != msg.id) {
+        if (node->id != msg->id) {
            bool unknown_node = node->id == zeroes;
-            node = cache.getNode(msg.id, from, now, true);
+            node = cache.getNode(msg->id, from, now, true);
            if (unknown_node) {
                // received reply to a message sent when we didn't know the node ID.
                req->node = node;
@@ -343,7 +451,7 @@ NetworkEngine::processMessage(const uint8_t *buf, size_t buflen, const SockAddr&
                // received reply from unexpected node
                node->received(now, req);
                onNewNode(node, 2);
-                DHT_LOG.WARN("Message received from unexpected ndoe %s", node->toString().c_str());
+                DHT_LOG.w(node->id, "[node %s] message received from unexpected node", node->toString().c_str());
                return;
            }
        } else
@@ -351,33 +459,32 @@ NetworkEngine::processMessage(const uint8_t *buf, size_t buflen, const SockAddr&
        node->received(now, req);

        onNewNode(node, 2);
-        onReportedAddr(msg.id, msg.addr);
+        onReportedAddr(msg->id, msg->addr);

        if (req->cancelled() or req->expired() or (req->completed() and not req->persistent)) {
-            DHT_LOG.WARN("[node %s] response to expired, cancelled or completed request", node->toString().c_str());
+            DHT_LOG.w(node->id, "[node %s] response to expired, cancelled or completed request", node->toString().c_str());
            requests.erase(reqp);
            return;
        }

-        switch (msg.type) {
+        switch (msg->type) {
        case MessageType::Error: {
-            if (msg.error_code == DhtProtocolException::UNAUTHORIZED
-                    && msg.id != zeroes
-                    && (msg.tid.matches(TransPrefix::ANNOUNCE_VALUES, &ttid)
-                    || msg.tid.matches(TransPrefix::LISTEN, &ttid)))
+            if (msg->id != zeroes and (
+                (msg->error_code == DhtProtocolException::NOT_FOUND    and  msg->tid.matches(TransPrefix::REFRESH)) or
+                (msg->error_code == DhtProtocolException::UNAUTHORIZED and (msg->tid.matches(TransPrefix::ANNOUNCE_VALUES)
+                                                                         or msg->tid.matches(TransPrefix::LISTEN)))))
            {
                req->last_try = TIME_INVALID;
                req->reply_time = TIME_INVALID;
-                onError(req, DhtProtocolException {DhtProtocolException::UNAUTHORIZED});
+                onError(req, DhtProtocolException {msg->error_code});
            } else {
-                DHT_LOG.WARN("[node %s %s] received unknown error message %u",
-                        msg.id.toString().c_str(), from.toString().c_str(), msg.error_code);
-                DHT_LOG.WARN.logPrintable(buf, buflen);
+                DHT_LOG.w(msg->id, "[node %s %s] received unknown error message %u",
+                        msg->id.toString().c_str(), from.toString().c_str(), msg->error_code);
            }
            break;
        }
        case MessageType::Reply:
-            if (msg.type == MessageType::AnnounceValue or msg.type == MessageType::Listen)
+            if (msg->type == MessageType::AnnounceValue or msg->type == MessageType::Listen)
                req->node->authSuccess();

            // erase before calling callback to make sure iterator is still valid
@@ -385,72 +492,73 @@ NetworkEngine::processMessage(const uint8_t *buf, size_t buflen, const SockAddr&
                requests.erase(reqp);
            req->reply_time = scheduler.time();

-            deserializeNodes(msg);
-            req->setDone(std::move(msg));
+            deserializeNodes(*msg);
+            req->setDone(std::move(*msg));
            break;
        default:
            break;
        }
    } else {
-        auto node = cache.getNode(msg.id, from, now, true);
+        auto node = cache.getNode(msg->id, from, now, true);
        node->received(now, {});
        onNewNode(node, 1);
        try {
-            switch (msg.type) {
+            switch (msg->type) {
            case MessageType::Ping:
                ++in_stats.ping;
-                DHT_LOG.DEBUG("Sending pong.");
+                DHT_LOG.d(node->id, "[node %s] sending pong", node->toString().c_str());
                onPing(node);
-                sendPong(from, msg.tid);
+                sendPong(from, msg->tid);
                break;
            case MessageType::FindNode: {
-                DHT_LOG.DEBUG("[node %s %s] got 'find' request (%d).",
-                        msg.id.toString().c_str(), from.toString().c_str(), msg.want);
+                DHT_LOG.d(msg->target, node->id, "[node %s] got 'find' request for %s (%d)", node->toString().c_str(), msg->target.toString().c_str(), msg->want);
                ++in_stats.find;
-                RequestAnswer answer = onFindNode(node, msg.target, msg.want);
-                auto nnodes = bufferNodes(from.getFamily(), msg.target, msg.want, answer.nodes4, answer.nodes6);
-                sendNodesValues(from, msg.tid, nnodes.first, nnodes.second, {}, {}, answer.ntoken);
+                RequestAnswer answer = onFindNode(node, msg->target, msg->want);
+                auto nnodes = bufferNodes(from.getFamily(), msg->target, msg->want, answer.nodes4, answer.nodes6);
+                sendNodesValues(from, msg->tid, nnodes.first, nnodes.second, {}, {}, answer.ntoken);
                break;
            }
            case MessageType::GetValues: {
-                DHT_LOG.DEBUG("[node %s %s] got 'get' request for %s.",
-                        msg.id.toString().c_str(), from.toString().c_str(), msg.info_hash.toString().c_str());
+                DHT_LOG.d(msg->info_hash, node->id, "[node %s] got 'get' request for %s", node->toString().c_str(), msg->info_hash.toString().c_str());
                ++in_stats.get;
-                RequestAnswer answer = onGetValues(node, msg.info_hash, msg.want, msg.query);
-                auto nnodes = bufferNodes(from.getFamily(), msg.info_hash, msg.want, answer.nodes4, answer.nodes6);
-                sendNodesValues(from, msg.tid, nnodes.first, nnodes.second, answer.values, msg.query, answer.ntoken);
+                RequestAnswer answer = onGetValues(node, msg->info_hash, msg->want, msg->query);
+                auto nnodes = bufferNodes(from.getFamily(), msg->info_hash, msg->want, answer.nodes4, answer.nodes6);
+                sendNodesValues(from, msg->tid, nnodes.first, nnodes.second, answer.values, msg->query, answer.ntoken);
                break;
            }
            case MessageType::AnnounceValue: {
-                DHT_LOG.DEBUG("[node %s %s] got 'put' request for %s.",
-                    msg.id.toString().c_str(), from.toString().c_str(),
-                    msg.info_hash.toString().c_str());
+                DHT_LOG.d(msg->info_hash, node->id, "[node %s] got 'put' request for %s", node->toString().c_str(), msg->info_hash.toString().c_str());
                ++in_stats.put;
-                onAnnounce(node, msg.info_hash, msg.token, msg.values, msg.created);
+                onAnnounce(node, msg->info_hash, msg->token, msg->values, msg->created);

                /* Note that if storageStore failed, we lie to the requestor.
                   This is to prevent them from backtracking, and hence
                   polluting the DHT. */
-                for (auto& v : msg.values) {
-                   sendValueAnnounced(from, msg.tid, v->id);
+                for (auto& v : msg->values) {
+                   sendValueAnnounced(from, msg->tid, v->id);
                }
                break;
            }
+            case MessageType::Refresh:
+                DHT_LOG.d(msg->info_hash, node->id, "[node %s] got 'refresh' request for %s", node->toString().c_str(), msg->info_hash.toString().c_str());
+                onRefresh(node, msg->info_hash, msg->token, msg->value_id);
+                /* Same note as above in MessageType::AnnounceValue applies. */
+                sendValueAnnounced(from, msg->tid, msg->value_id);
+                break;
            case MessageType::Listen: {
-                DHT_LOG.DEBUG("[node %s %s] got 'listen' request for %s.",
-                        msg.id.toString().c_str(), from.toString().c_str(), msg.info_hash.toString().c_str());
+                DHT_LOG.d(msg->info_hash, node->id, "[node %s] got 'listen' request for %s", node->toString().c_str(), msg->info_hash.toString().c_str());
                ++in_stats.listen;
-                RequestAnswer answer = onListen(node, msg.info_hash, msg.token, msg.tid.getTid(), std::move(msg.query));
-                sendListenConfirmation(from, msg.tid);
+                RequestAnswer answer = onListen(node, msg->info_hash, msg->token, msg->tid.getTid(), std::move(msg->query));
+                sendListenConfirmation(from, msg->tid);
                break;
            }
            default:
                break;
            }
        } catch (const std::overflow_error& e) {
-            DHT_LOG.ERR("Can't send value: buffer not large enough !");
+            DHT_LOG.e("Can't send value: buffer not large enough !");
        } catch (DhtProtocolException& e) {
-            sendError(from, msg.tid, e.getCode(), e.getMsg().c_str(), true);
+            sendError(from, msg->tid, e.getCode(), e.getMsg().c_str(), true);
        }
    }
 }
@@ -515,7 +623,7 @@ NetworkEngine::sendPing(std::shared_ptr<Node> node, RequestCb on_done, RequestEx
    Blob b {buffer.data(), buffer.data() + buffer.size()};
    std::shared_ptr<Request> req(new Request {tid.getTid(), node, std::move(b),
        [=](const Request& req_status, ParsedMessage&&) {
-            DHT_LOG.DEBUG("Got pong from %s", req_status.node->toString().c_str());
+            DHT_LOG.d(req_status.node->id, "[node %s] got pong !", req_status.node->toString().c_str());
            if (on_done) {
                on_done(req_status, {});
            }
@@ -689,6 +797,60 @@ NetworkEngine::deserializeNodes(ParsedMessage& msg) {
    }
 }

+std::vector<Blob>
+NetworkEngine::packValueHeader(msgpack::sbuffer& buffer, const std::vector<std::shared_ptr<Value>>& st)
+{
+    auto svals = serializeValues(st);
+    size_t total_size = 0;
+    for (const auto& v : svals)
+        total_size += v.size();
+
+    msgpack::packer<msgpack::sbuffer> pk(&buffer);
+    pk.pack(std::string("values"));
+    pk.pack_array(svals.size());
+    // try to put everything in a single UDP packet
+    if (svals.size() < 50 && total_size < MAX_PACKET_VALUE_SIZE) {
+        for (const auto& b : svals)
+            buffer.write((const char*)b.data(), b.size());
+        DHT_LOG.d("sending %lu bytes of values", total_size);
+        svals.clear();
+    } else {
+        for (const auto& b : svals)
+            pk.pack(b.size());
+    }
+    return svals;
+}
+
+void
+NetworkEngine::sendValueParts(TransId tid, const std::vector<Blob>& svals, const SockAddr& addr)
+{
+    msgpack::sbuffer buffer;
+    unsigned i=0;
+    for (const auto& v: svals) {
+        size_t start {0}, end;
+        do {
+            end = std::min(start + MTU, v.size());
+            buffer.clear();
+            msgpack::packer<msgpack::sbuffer> pk(&buffer);
+            pk.pack_map(3+(network?1:0));
+            if (network) {
+                pk.pack(std::string("n")); pk.pack(network);
+            }
+            pk.pack(std::string("y")); pk.pack(std::string("v"));
+            pk.pack(std::string("t")); pk.pack_bin(tid.size());
+                                       pk.pack_bin_body((const char*)tid.data(), tid.size());
+            pk.pack(std::string("p")); pk.pack_map(1);
+                pk.pack(i); pk.pack_map(2);
+                    pk.pack(std::string("o")); pk.pack(start);
+                    pk.pack(std::string("d")); pk.pack_bin(end-start);
+                                               pk.pack_bin_body((const char*)v.data()+start, end-start);
+            send(buffer.data(), buffer.size(), 0, addr);
+            start = end;
+        } while (start != v.size());
+        i++;
+    }
+}
+
 void
 NetworkEngine::sendNodesValues(const SockAddr& addr, TransId tid, const Blob& nodes, const Blob& nodes6,
        const std::vector<std::shared_ptr<Value>>& st, const Query& query, const Blob& token) {
@@ -713,34 +875,11 @@ NetworkEngine::sendNodesValues(const SockAddr& addr, TransId tid, const Blob& no
    if (not token.empty()) {
        pk.pack(std::string("token")); packToken(pk, token);
    }
+    std::vector<Blob> svals {};
    if (not st.empty()) { /* pack complete values */
        auto fields = query.select.getSelection();
-        size_t total_size = 0;
        if (fields.empty()) {
-            // We treat the storage as a circular list, and serve a randomly
-            // chosen slice.  In order to make sure we fit,
-            // we limit ourselves to 50 values.
-            std::uniform_int_distribution<> pos_dis(0, st.size()-1);
-            std::vector<Blob> subset {};
-            subset.reserve(std::min<size_t>(st.size(), 50));
-
-            unsigned j0 = pos_dis(rd_device);
-            unsigned j = j0;
-            unsigned k = 0;
-
-            do {
-                subset.emplace_back(packMsg(st[j]));
-                total_size += subset.back().size();
-                ++k;
-                j = (j + 1) % st.size();
-            } while (j != j0 && k < 50 && total_size < MAX_VALUE_SIZE);
-
-            pk.pack(std::string("values"));
-            pk.pack_array(subset.size());
-            for (const auto& b : subset)
-                buffer.write((const char*)b.data(), b.size());
-            DHT_LOG.DEBUG("sending closest nodes (%d+%d nodes.), %lu bytes of values",
-                    nodes.size(), nodes6.size(), total_size);
+            svals = packValueHeader(buffer, st);
        } else { /* pack fields */
            pk.pack(std::string("fields"));
            pk.pack_map(2);
@@ -748,13 +887,10 @@ NetworkEngine::sendNodesValues(const SockAddr& addr, TransId tid, const Blob& no
            pk.pack(std::string("v")); pk.pack_array(st.size()*fields.size());
            for (const auto& v : st)
                v->msgpack_pack_fields(fields, pk);
-            DHT_LOG.DEBUG("sending closest nodes (%d+%d nodes.), %u value headers containing %u fields",
-                    nodes.size(), nodes6.size(), st.size(), fields.size());
+            //DHT_LOG_DEBUG("sending closest nodes (%d+%d nodes.), %u value headers containing %u fields",
+            //        nodes.size(), nodes6.size(), st.size(), fields.size());
        }
-    } else
-        DHT_LOG.DEBUG("sending closest nodes (%d+%d nodes.)", nodes.size(), nodes6.size());
-
-    DHT_LOG.DEBUG("sending closest nodes (%d+%d nodes.)", nodes.size(), nodes6.size());
+    }

    pk.pack(std::string("t")); pk.pack_bin(tid.size());
                               pk.pack_bin_body((const char*)tid.data(), tid.size());
@@ -764,7 +900,12 @@ NetworkEngine::sendNodesValues(const SockAddr& addr, TransId tid, const Blob& no
        pk.pack(std::string("n")); pk.pack(network);
    }

+    // send response
    send(buffer.data(), buffer.size(), 0, addr);
+
+    // send parts
+    if (not svals.empty())
+        sendValueParts(tid, svals, addr);
 }

 Blob
@@ -884,8 +1025,14 @@ NetworkEngine::sendListenConfirmation(const SockAddr& addr, TransId tid) {
 }

 std::shared_ptr<Request>
-NetworkEngine::sendAnnounceValue(std::shared_ptr<Node> n, const InfoHash& infohash, const Value& value, time_point created,
-        const Blob& token, RequestCb on_done, RequestExpiredCb on_expired) {
+NetworkEngine::sendAnnounceValue(std::shared_ptr<Node> n,
+        const InfoHash& infohash,
+        const std::shared_ptr<Value>& value,
+        time_point created,
+        const Blob& token,
+        RequestCb on_done,
+        RequestExpiredCb on_expired)
+{
    auto tid = TransId {TransPrefix::ANNOUNCE_VALUES, getNewTid()};
    msgpack::sbuffer buffer;
    msgpack::packer<msgpack::sbuffer> pk(&buffer);
@@ -894,7 +1041,7 @@ NetworkEngine::sendAnnounceValue(std::shared_ptr<Node> n, const InfoHash& infoha
    pk.pack(std::string("a")); pk.pack_map((created < scheduler.time() ? 5 : 4));
      pk.pack(std::string("id"));     pk.pack(myid);
      pk.pack(std::string("h"));      pk.pack(infohash);
-      pk.pack(std::string("values")); pk.pack_array(1); pk.pack(value);
+      auto v = packValueHeader(buffer, {value});
      if (created < scheduler.time()) {
          pk.pack(std::string("c"));
          pk.pack(to_time_t(created));
@@ -914,7 +1061,7 @@ NetworkEngine::sendAnnounceValue(std::shared_ptr<Node> n, const InfoHash& infoha
    std::shared_ptr<Request> req(new Request {tid.getTid(), n, std::move(b),
        [=](const Request& req_status, ParsedMessage&& msg) { /* on done */
            if (msg.value_id == Value::INVALID_ID) {
-                DHT_LOG.DEBUG("Unknown search or announce!");
+                DHT_LOG.d(infohash, "Unknown search or announce!");
            } else {
                if (on_done) {
                    RequestAnswer answer {};
@@ -930,10 +1077,65 @@ NetworkEngine::sendAnnounceValue(std::shared_ptr<Node> n, const InfoHash& infoha
        }
    });
    sendRequest(req);
+    if (not v.empty())
+        sendValueParts(tid, v, n->addr);
    ++out_stats.put;
    return req;
 }

+std::shared_ptr<Request>
+NetworkEngine::sendRefreshValue(std::shared_ptr<Node> n,
+                const InfoHash& infohash,
+                const Value::Id& vid,
+                const Blob& token,
+                RequestCb on_done,
+                RequestExpiredCb on_expired)
+{
+    auto tid = TransId {TransPrefix::REFRESH, getNewTid()};
+    msgpack::sbuffer buffer;
+    msgpack::packer<msgpack::sbuffer> pk(&buffer);
+    pk.pack_map(5+(network?1:0));
+
+    pk.pack(std::string("a")); pk.pack_map(4);
+      pk.pack(std::string("id"));  pk.pack(myid);
+      pk.pack(std::string("h"));  pk.pack(infohash);
+      pk.pack(std::string("vid")); pk.pack(vid);
+      pk.pack(std::string("token"));  pk.pack(token);
+
+    pk.pack(std::string("q")); pk.pack(std::string("refresh"));
+    pk.pack(std::string("t")); pk.pack_bin(tid.size());
+                               pk.pack_bin_body((const char*)tid.data(), tid.size());
+    pk.pack(std::string("y")); pk.pack(std::string("q"));
+    pk.pack(std::string("v")); pk.pack(my_v);
+    if (network) {
+        pk.pack(std::string("n")); pk.pack(network);
+    }
+
+    Blob b {buffer.data(), buffer.data() + buffer.size()};
+    std::shared_ptr<Request> req(new Request {tid.getTid(), n, std::move(b),
+        [=](const Request& req_status, ParsedMessage&& msg) { /* on done */
+            if (msg.value_id == Value::INVALID_ID) {
+                DHT_LOG.d(infohash, "Unknown search or announce!");
+            } else {
+                if (on_done) {
+                    RequestAnswer answer {};
+                    answer.vid = msg.value_id;
+                    on_done(req_status, std::move(answer));
+                }
+            }
+        },
+        [=](const Request& req_status, bool done) { /* on expired */
+            if (on_expired) {
+                on_expired(req_status, done);
+            }
+        }
+    });
+    sendRequest(req);
+    ++out_stats.refresh;
+    return req;
+
+}
+
 void
 NetworkEngine::sendValueAnnounced(const SockAddr& addr, TransId tid, Value::Id vid) {
    msgpack::sbuffer buffer;
@@ -992,6 +1194,16 @@ ParsedMessage::msgpack_unpack(msgpack::object msg)
    auto y = findMapValue(msg, "y");
    auto r = findMapValue(msg, "r");
    auto e = findMapValue(msg, "e");
+    auto v = findMapValue(msg, "p");
+
+    if (auto t = findMapValue(msg, "t"))
+        tid = {t->as<std::array<char, 4>>()};
+
+    if (auto rv = findMapValue(msg, "v"))
+        ua = rv->as<std::string>();
+
+    if (auto netid = findMapValue(msg, "n"))
+        network = netid->as<NetId>();

    std::string q;
    if (auto rq = findMapValue(msg, "q")) {
@@ -1004,6 +1216,8 @@ ParsedMessage::msgpack_unpack(msgpack::object msg)
        type = MessageType::Error;
    else if (r)
        type = MessageType::Reply;
+    else if (v)
+        type = MessageType::ValueData;
    else if (y and y->as<std::string>() != "q")
        throw msgpack::type_error();
    else if (q == "ping")
@@ -1016,9 +1230,25 @@ ParsedMessage::msgpack_unpack(msgpack::object msg)
        type = MessageType::Listen;
    else if (q == "put")
        type = MessageType::AnnounceValue;
+    else if (q == "refresh")
+        type = MessageType::Refresh;
    else
        throw msgpack::type_error();

+    if (type == MessageType::ValueData) {
+        if (v->type != msgpack::type::MAP)
+            throw msgpack::type_error();
+        for (size_t i = 0; i < v->via.map.size; ++i) {
+            auto& vdat = v->via.map.ptr[i];
+            auto o = findMapValue(vdat.val, "o");
+            auto d = findMapValue(vdat.val, "d");
+            if (not o or not d)
+                continue;
+            value_parts.emplace(vdat.key.as<unsigned>(), std::pair<size_t, Blob>(o->as<size_t>(), unpackBlob(*d)));
+        }
+        return;
+    }
+
    auto a = findMapValue(msg, "a");
    if (!a && !r && !e)
        throw msgpack::type_error();
@@ -1030,9 +1260,6 @@ ParsedMessage::msgpack_unpack(msgpack::object msg)
        error_code = e->via.array.ptr[0].as<uint16_t>();
    }

-    if (auto netid = findMapValue(msg, "n"))
-        network = netid->as<NetId>();
-
    if (auto rid = findMapValue(req, "id"))
        id = {*rid};

@@ -1085,22 +1312,32 @@ ParsedMessage::msgpack_unpack(msgpack::object msg)
    if (auto rvalues = findMapValue(req, "values")) {
        if (rvalues->type != msgpack::type::ARRAY)
            throw msgpack::type_error();
-        for (size_t i = 0; i < rvalues->via.array.size; i++)
-            try {
-                values.emplace_back(std::make_shared<Value>(rvalues->via.array.ptr[i]));
-            } catch (const std::exception& e) {
-                //DHT_LOG.WARN("Error reading value: %s", e.what());
+        for (size_t i = 0; i < rvalues->via.array.size; i++) {
+            auto& packed_v = rvalues->via.array.ptr[i];
+            if (packed_v.type == msgpack::type::POSITIVE_INTEGER) {
+                // Skip oversize values with a small margin for header overhead
+                if (packed_v.via.u64 > MAX_VALUE_SIZE + 32)
+                    continue;
+                value_parts.emplace(i, std::make_pair(packed_v.via.u64, Blob{}));
+            } else {
+                try {
+                    values.emplace_back(std::make_shared<Value>(rvalues->via.array.ptr[i]));
+                } catch (const std::exception& e) {
+                    //DHT_LOG_WARN("Error reading value: %s", e.what());
+                }
            }
+        }
    } else if (auto raw_fields = findMapValue(req, "fields")) {
        if (auto rfields = findMapValue(*raw_fields, "f")) {
-            auto fields_ = rfields->as<std::set<Value::Field>>();
+            auto vfields = rfields->as<std::set<Value::Field>>();
            if (auto rvalues = findMapValue(*raw_fields, "v")) {
                if (rvalues->type != msgpack::type::ARRAY)
                    throw msgpack::type_error();
-                for (size_t i = 0; i < rvalues->via.array.size; ++i) {
+                size_t val_num = rvalues->via.array.size / vfields.size();
+                for (size_t i = 0; i < val_num; ++i) {
                    try {
                        auto v = std::make_shared<FieldValueIndex>();
-                        v->msgpack_unpack_fields(fields_, *rvalues, i*fields_.size());
+                        v->msgpack_unpack_fields(vfields, *rvalues, i*vfields.size());
                        fields.emplace_back(std::move(v));
                    } catch (const std::exception& e) { }
                }
@@ -1127,13 +1364,59 @@ ParsedMessage::msgpack_unpack(msgpack::object msg)
    } else {
        want = -1;
    }
-
-    if (auto t = findMapValue(msg, "t"))
-        tid = {t->as<std::array<char, 4>>()};
-
-    if (auto rv = findMapValue(msg, "v"))
-        ua = rv->as<std::string>();
-
 }

+void
+NetworkEngine::maintainRxBuffer(const TransId& tid)
+{
+    const auto& now = scheduler.time();
+    auto msg = partial_messages.find(tid);
+    if (msg != partial_messages.end()) {
+        if (msg->second.start + RX_MAX_PACKET_TIME < now
+         || msg->second.last_part + RX_TIMEOUT < now) {
+            DHT_LOG.w("Dropping expired partial message from %s", msg->second.from.toString().c_str());
+            partial_messages.erase(msg);
+        }
+    }
+}
+
+bool
+ParsedMessage::append(const ParsedMessage& block)
+{
+    bool ret(false);
+    for (const auto& ve : block.value_parts) {
+        auto part_val = value_parts.find(ve.first);
+        if (part_val == value_parts.end()
+            || part_val->second.second.size() >= part_val->second.first)
+            continue;
+        // TODO: handle out-of-order packets
+        if (ve.second.first != part_val->second.second.size()) {
+            //std::cout << "skipping out-of-order packet" << std::endl;
+            continue;
+        }
+        ret = true;
+        part_val->second.second.insert(part_val->second.second.end(),
+                                       ve.second.second.begin(),
+                                       ve.second.second.end());
+    }
+    return ret;
+}
+
+bool
+ParsedMessage::complete()
+{
+    for (auto& e : value_parts) {
+        //std::cout << "part " << e.first << ": " << e.second.second.size() << "/" << e.second.first << std::endl;
+        if (e.second.first > e.second.second.size())
+            return false;
+    }
+    for (auto& e : value_parts) {
+        msgpack::unpacked msg;
+        msgpack::unpack(msg, (const char*)e.second.second.data(), e.second.second.size());
+        values.emplace_back(std::make_shared<Value>(msg.get()));
+    }
+    return true;
+}
+
+
 }
@@ -321,7 +321,7 @@ SecureDht::putSigned(const InfoHash& hash, std::shared_ptr<Value> val, DoneCallb
        },
        [hash,val,this,callback,permanent] (bool /* ok */) {
            sign(*val);
-            put(hash, val, callback, {}, permanent);
+            put(hash, val, callback, time_point::max(), permanent);
        },
        Value::IdFilter(val->id)
    );
@@ -338,7 +338,7 @@ SecureDht::putEncrypted(const InfoHash& hash, const InfoHash& to, std::shared_pt
        }
        DHT_LOG.WARN("Encrypting data for PK: %s", pk->getId().toString().c_str());
        try {
-            put(hash, encrypt(*val, *pk), callback, {}, permanent);
+            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());
            if (callback)
@@ -52,6 +52,10 @@ printAddr(const SockAddr& addr) {
    return print_addr((const sockaddr*)&addr.first, addr.second);
 }

+bool operator==(const SockAddr& a, const SockAddr& b) {
+    return a.equals(b);
+}
+
 time_point from_time_t(std::time_t t) {
    return clock::now() + (std::chrono::system_clock::from_time_t(t) - std::chrono::system_clock::now());
 }
@@ -65,7 +65,7 @@ const ValueType ValueType::USER_DATA = {0, "User Data"};
 bool
 ValueType::DEFAULT_STORE_POLICY(InfoHash, std::shared_ptr<Value>& v, InfoHash, const sockaddr*, socklen_t)
 {
-    return v->data.size() <= MAX_VALUE_SIZE;
+    return v->size() <= MAX_VALUE_SIZE;
 }

 msgpack::object*
@@ -47,6 +47,9 @@ int
 main(int argc, char **argv)
 {
    auto params = parseArgs(argc, argv);
+#ifdef WIN32_NATIVE
+    gnutls_global_init();
+#endif

    DhtRunner dht;
    dht.run(params.port, dht::crypto::generateIdentity("DHT Chat Node"), true, params.network);
@@ -61,8 +64,10 @@ main(int argc, char **argv)
    InfoHash room;
    const InfoHash myid = dht.getId();

+#ifndef WIN32_NATIVE
    // using the GNU History API
-    using_history();
+    using_history();
+#endif

    while (true)
    {
@@ -125,5 +130,8 @@ main(int argc, char **argv)

    std::cout << std::endl <<  "Stopping node..." << std::endl;
    dht.join();
+#ifdef WIN32_NATIVE
+    gnutls_global_deinit();
+#endif
    return 0;
 }
@@ -53,8 +53,8 @@ void print_help() {

    std::cout << std::endl << "Node information:" << std::endl
              << "  ll         Print basic information and stats about the current node." << std::endl
-              << "  ls         Print basic information about current searches." << std::endl
-              << "  ld         Print basic information about currenty stored values on this node." << std::endl
+              << "  ls [key]   Print basic information about current search(es)." << std::endl
+              << "  ld [key]   Print basic information about currenty stored values on this node (or key)." << std::endl
              << "  lr         Print the full current routing table of this node" << std::endl;

    std::cout << std::endl << "Operations on the DHT:" << std::endl
@@ -76,8 +76,10 @@ void cmd_loop(std::shared_ptr<DhtRunner>& dht, dht_params& params)
    print_node_info(dht, params);
    std::cout << " (type 'h' or 'help' for a list of possible commands)" << std::endl << std::endl;

+#ifndef WIN32_NATIVE
    // using the GNU History API
    using_history();
+#endif

    std::map<std::string, indexation::Pht> indexes;

@@ -113,11 +115,22 @@ void cmd_loop(std::shared_ptr<DhtRunner>& dht, dht_params& params)
            std::cout << dht->getRoutingTablesLog(AF_INET6) << std::endl;
            continue;
        } else if (op == "ld") {
-            std::cout << dht->getStorageLog() << std::endl;
+            iss >> idstr;
+            InfoHash filter(idstr);
+            if (filter == InfoHash{})
+                std::cout << dht->getStorageLog() << std::endl;
+            else
+                std::cout << dht->getStorageLog(filter) << std::endl;
            continue;
        } else if (op == "ls") {
-            std::cout << "Searches:" << std::endl;
-            std::cout << dht->getSearchesLog() << std::endl;
+            iss >> idstr;
+            InfoHash filter(idstr);
+            if (filter == InfoHash{}) {
+                std::cout << "Searches:" << std::endl;
+                std::cout << dht->getSearchesLog() << std::endl;
+            } else {
+                std::cout << dht->getSearchLog(filter) << std::endl;
+            }
            continue;
        } else if (op == "la")  {
            std::cout << "Reported public addresses:" << std::endl;
@@ -140,11 +153,14 @@ void cmd_loop(std::shared_ptr<DhtRunner>& dht, dht_params& params)
            }
            continue;
        } else if (op == "log") {
-            params.log = !params.log;
+            iss >> idstr;
+            InfoHash filter(idstr);
+            params.log = filter == InfoHash{} ? !params.log : true;
            if (params.log)
                log::enableLogging(*dht);
            else
                log::disableLogging(*dht);
+            dht->setLogFilter(filter);
            continue;
        }

@@ -331,6 +347,10 @@ void cmd_loop(std::shared_ptr<DhtRunner>& dht, dht_params& params)
 int
 main(int argc, char **argv)
 {
+#ifdef WIN32_NATIVE
+    gnutls_global_init();
+#endif
+
    auto dht = std::make_shared<DhtRunner>();

    try {
@@ -390,5 +410,8 @@ main(int argc, char **argv)
    cv.wait(lk, [&](){ return done.load(); });

    dht->join();
+#ifdef WIN32_NATIVE
+    gnutls_global_deinit();
+#endif
    return 0;
 }
@@ -69,6 +69,9 @@ step(DhtRunner& dht, std::atomic_uint& done, std::shared_ptr<NodeSet> all_nodes,
 int
 main(int argc, char **argv)
 {
+#ifdef WIN32_NATIVE
+    gnutls_global_init();
+#endif
    auto params = parseArgs(argc, argv);
    auto ca_tmp = dht::crypto::generateIdentity("DHT Node CA");
    auto crt_tmp = dht::crypto::generateIdentity("Scanner node", ca_tmp);
@@ -104,5 +107,8 @@ main(int argc, char **argv)
        std::cout << "Node " << *n << std::endl;

    dht.join();
+#ifdef WIN32_NATIVE
+    gnutls_global_deinit();
+#endif
    return 0;
 }
@@ -14,16 +14,20 @@
 *  GNU General Public License for more details.
 *
 *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
+ *  along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

 // Common utility methods used by C++ OpenDHT tools.

 #include <opendht.h>
+#ifndef WIN32_NATIVE
 #include <getopt.h>
 #include <readline/readline.h>
 #include <readline/history.h>
+#else
+#define SIGHUP 0
+#include "wingetopt.h"
+#endif

 #include <sys/types.h>
 #include <sys/stat.h>
@@ -37,81 +41,6 @@
 #include <sstream>
 #include <fstream>

-/**
- * Terminal colors for logging
- */
-namespace Color {
-    enum Code {
-        FG_RED      = 31,
-        FG_GREEN    = 32,
-        FG_YELLOW   = 33,
-        FG_BLUE     = 34,
-        FG_DEFAULT  = 39,
-        BG_RED      = 41,
-        BG_GREEN    = 42,
-        BG_BLUE     = 44,
-        BG_DEFAULT  = 49
-    };
-    class Modifier {
-        const Code code;
-    public:
-        constexpr Modifier(Code pCode) : code(pCode) {}
-        friend std::ostream&
-        operator<<(std::ostream& os, const Modifier& mod) {
-            return os << "\033[" << mod.code << 'm';
-        }
-    };
-}
-
-constexpr const Color::Modifier def(Color::FG_DEFAULT);
-constexpr const Color::Modifier red(Color::FG_RED);
-constexpr const Color::Modifier yellow(Color::FG_YELLOW);
-
-/**
- * Print va_list to std::ostream (used for logging).
- */
-void
-printLog(std::ostream& s, char const* m, va_list args) {
-    static constexpr int BUF_SZ = 8192;
-    char buffer[BUF_SZ];
-    int ret = vsnprintf(buffer, sizeof(buffer), m, args);
-    if (ret < 0)
-        return;
-    s.write(buffer, std::min(ret, BUF_SZ));
-    if (ret >= BUF_SZ)
-        s << "[[TRUNCATED]]";
-    s.put('\n');
-}
-
-void
-enableLogging(dht::DhtRunner& dht)
-{
-    dht.setLoggers(
-        [](char const* m, va_list args){ std::cerr << red; printLog(std::cerr, m, args); std::cerr << def; },
-        [](char const* m, va_list args){ std::cout << yellow; printLog(std::cout, m, args); 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>();
-    logfile->open(path, std::ios::out);
-
-    dht.setLoggers(
-        [=](char const* m, va_list args){ printLog(*logfile, m, args); },
-        [=](char const* m, va_list args){ printLog(*logfile, m, args); },
-        [=](char const* m, va_list args){ printLog(*logfile, m, args); }
-    );
-}
-
-void
-disableLogging(dht::DhtRunner& dht)
-{
-    dht.setLoggers(dht::NOLOG, dht::NOLOG, dht::NOLOG);
-}
-
 /**
 * Split "[host]:port" or "host:port" to pair<"host", "port">.
 */
@@ -253,10 +182,16 @@ static const constexpr char* PROMPT = ">> ";
 std::string
 readLine(const char* prefix = PROMPT)
 {
+#ifndef WIN32_NATIVE
    const char* line_read = readline(prefix);
    if (line_read && *line_read)
        add_history(line_read);

+#else
+    char line_read[512];
+    std::cout << PROMPT;
+    fgets(line_read, 512 , stdin);
+#endif
    return line_read ? std::string(line_read) : std::string("\0", 1);
 }

@@ -273,6 +208,7 @@ void signal_handler(int sig)

 void daemonize()
 {
+#ifndef WIN32_NATIVE
    pid_t pid = fork();
    if (pid < 0) exit(EXIT_FAILURE);
    if (pid > 0) exit(EXIT_SUCCESS);
@@ -298,4 +234,5 @@ void daemonize()
    signal(SIGTTIN,SIG_IGN);
    signal(SIGHUP,signal_handler); /* catch hangup signal */
    signal(SIGTERM,signal_handler); /* catch kill signal */
+#endif
 }
Author	SHA1	Message	Date
Adrien Béraud	de82eec516	dht: try inserting new nodes smarter Attempt closest search and nearby searches until we are too far instead of trying every search.	2016-10-27 18:14:42 -04:00
Adrien Béraud	274621dcec	dht: add searches(sa_family)	2016-10-27 18:12:05 -04:00
Adrien Béraud	2ab756906d	dht: getSearchLog for a specific search	2016-10-27 16:51:21 -04:00
Adrien Béraud	2b3f63443f	dht: maintain each storage independently Schedule every storage maintenance independently, to improve performance when there are a lot of storages.	2016-10-27 14:21:52 -04:00
Adrien Béraud	c71f960948	python: add ping-pong simple test	2016-10-26 18:07:06 -04:00
Adrien Béraud	9d3514e087	dhtrunner: don't run ops if disconnected and bootstraping	2016-10-26 17:50:30 -04:00
Adrien Béraud	6703e039b1	network_engine: deserialize proper number of fields	2016-10-26 17:50:30 -04:00
Adrien Béraud	29b81750ad	Merge pull request #148 from atraczyk/master bump visual studio support	2016-10-26 12:48:51 -04:00
atraczyk	d6fff53f6b	bump visual studio support	2016-10-26 10:28:05 -04:00
Simon Désaulniers	7ee6281426	log: display time before each line in log	2016-10-25 16:40:48 -04:00
Adrien Béraud	28a5740c37	argon2: bump source	2016-10-25 16:40:48 -04:00
Adrien Béraud	09a3332cf0	Merge pull request #147 from savoirfairelinux/feature/log_filter log: add filters	2016-10-24 16:55:23 -04:00
Adrien Béraud	f584c4849b	dht: unify creation date normalisation	2016-10-24 02:09:38 -04:00
Adrien Béraud	e3663c995a	log: add storage filter	2016-10-24 02:09:38 -04:00
Adrien Béraud	1d62b3ca64	log: add InfoHash filter * filter log entries with new method setLogFilter * filter by node id, search or infohash * add optional parameter to 'log' in dhtnode	2016-10-24 02:09:38 -04:00
Adrien Béraud	3af04a4259	securedht: use default max expiration for putSigned	2016-10-23 17:23:39 -04:00
Adrien Béraud	78d98822a5	securedht: use default max expiration for putEncrypted	2016-10-23 16:47:37 -04:00
Adrien Béraud	8c04ddc66b	dht use proper value type to compute expiration	2016-10-23 14:58:15 -04:00
Adrien Béraud	5277b8d23e	dht: storage refresh returns bool	2016-10-23 03:23:17 -04:00
Simon Désaulniers	86fea49178	doc: add pdf compiled of tex file	2016-10-21 19:00:08 -04:00
Simon Désaulniers	5b1242f786	bump version * several clang related bug fixes; * connectivity changes related enhancements; * new "refresh" protocol primitive (not exposed to API); * "permanent put" operation fixes/enhancements; * fixed general efficiency issues;	2016-10-21 18:56:45 -04:00
Simon Désaulniers	a8cfdbe762	doc: add connectivity loss search analysis tex file	2016-10-21 18:07:11 -04:00
Adrien Béraud	70b1ebae0b	dht: fix scheduler job edition on clang	2016-10-21 17:44:39 -04:00
Adrien Béraud	9dc6004329	network engine: cancel request when clearing listen status	2016-10-19 13:58:18 -04:00
Adrien Béraud	d4bd17a2dc	dhtrunner: use a second condition variable for bootstrap	2016-10-19 13:34:33 -04:00
Simon Désaulniers	6c73e5fa5c	dht: less cases clear values, storage maintenance	2016-10-19 11:53:47 -04:00
Simon Désaulniers	24edfb8eaf	dht: uniformly sync SearchNodes reannouncing Historically, the next announce timing was based on the last acknowledgement received from a SearchNode. This behavior was invalid since the 'refresh' operation. In fact, for a given value that was "refreshed", its creation time would differ from the announcer's info. Therefor, all search node's reannouncing timings would differ, hence causing inconsistency on the network.	2016-10-19 11:53:47 -04:00
Adrien Béraud	4ef5a2216e	dht: revert to previous onNewNode behavior	2016-10-19 01:27:19 -04:00
Adrien Béraud	0d646eb244	network engine: log cleanup	2016-10-19 01:01:51 -04:00
Adrien Béraud	757fea37f3	Merge pull request #142 from sim590/fix-permanent-put-time-info dht: appropriate time info in permanent put ops	2016-10-18 14:26:21 -04:00
Simon Désaulniers	09e41cc9f2	dht: appropriate time info in permanent put ops	2016-10-18 14:20:43 -04:00
Adrien Béraud	71ad92e286	dht: log cleanup	2016-10-17 17:55:22 -04:00
Adrien Béraud	d4f3d3aa98	dht: add missing iterator	2016-10-17 17:14:30 -04:00
Simon Désaulniers	c0612a1b2c	dht: use "refresh" operation for permanent put	2016-10-17 11:56:54 -04:00
Simon Désaulniers	6743cbbf50	dht: introduce "refresh" operation This operation requests a node to refresh a value's time_point information of its lifetime begining. This is intended to fix the permanent put operation which has been having syncing issues since the introduction of an enhanced and lighter put operation.	2016-10-17 11:56:54 -04:00
Adrien Béraud	da1bdf9d4c	dht: retry nodes more aggressively in case of failure	2016-10-16 22:36:52 -04:00
Adrien Béraud	96da4cd85d	build: make logs optional at build time	2016-10-16 22:36:42 -04:00
Adrien Béraud	f233340cb2	node: clear reply_time on reset	2016-10-16 22:36:36 -04:00
Adrien Béraud	cfb817d37f	dht: add buckets() utility	2016-10-16 22:36:30 -04:00
Adrien Béraud	9440c03048	dht: log cleanup	2016-10-16 22:36:24 -04:00
Adrien Béraud	aa611bde50	network engine: cleanup	2016-10-15 20:07:37 -04:00
Adrien Béraud	7af856508e	dht: make connectivityChanged family dependent	2016-10-15 19:13:15 -04:00
Adrien Béraud	aaed64039a	dht: fix compilation on clang	2016-10-12 15:02:02 -04:00
Adrien Béraud	7c5e8c3234	sockaddr: add missing include for Win32	2016-10-12 14:38:39 -04:00
Adrien Béraud	a56bf3f115	dhtrunner: handle null callback in pingNode	2016-10-12 13:25:00 -04:00
Adrien Béraud	2d2fa9cfa9	OpenDHT 1.1.0 * automatic connection loss recovery * dhtrunner: asynchronous DNS lookup for bootstrap * handle values up to 64k * better support for large values on macOS * dht: add callback to pingNode * fix compilation with recent clang versions	2016-10-11 17:36:12 -04:00
Adrien Béraud	9f11930f3d	fix compilation on latest clang	2016-10-11 16:34:40 -04:00
Adrien Béraud	013b1dfe2e	Merge pull request #138 from sim590/connectivity-changes-detect search: detect connectivity changes	2016-10-11 16:01:59 -04:00
Simon Désaulniers	733f699ff2	search: detect connectivity changes The number of bad nodes is limited in order to help determine presence of connectivity changes. See https://github.com/savoirfairelinux/opendht/issues/137 for details. According to the tables, 25 is a good average value for big networks. If the network is small, normal search expiration process will handle the situation.	2016-10-11 15:54:37 -04:00
Adrien Béraud	a366d502a2	fix compilation on latest clang	2016-10-11 15:50:49 -04:00
Adrien Béraud	eed8ffc792	Merge pull request #139 from savoirfairelinux/recover-from-network-changes dhtrunner: recover from network changes	2016-10-11 11:57:31 -04:00
Adrien Béraud	998547e1a1	Merge pull request #136 from savoirfairelinux/feature/value_fragment network: transmit large values in multiple packets	2016-10-11 11:57:18 -04:00
Simon Désaulniers	8567b7ad84	network_engine: expire requests when clearing NE This is to prevent any thread relying on network_engine's callback to block forever just like the Dht::sendPing's callback.	2016-10-10 01:51:26 -04:00
Adrien Béraud	64118404fe	dhtrunner: recover from network changes Using a list of bootstrap nodes, we recover from network loss by pinging those nodes continuously until connected. Written with Simon Désaulniers.	2016-10-10 01:51:26 -04:00
Simon Désaulniers	bb74dc846c	dht/dhtrunner: enable callback for pingNode	2016-10-10 00:23:53 -04:00
Adrien Béraud	659d893dee	network: transmit large values in multiple packets	2016-10-09 16:22:33 -04:00