From 6af72289f8aefa645d9f9f0065b74db8bdec13cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Tue, 16 Apr 2019 10:03:07 -0400
Subject: [PATCH] rename ringdht to jamidht
Change-Id: Id5673ba9f2ec519070cc112685dea5ced94c3b38
---
MSVC/ring-daemon.vcxproj | 74 ++++++------
MSVC/ring-daemon.vcxproj.filters | 108 +++++++++---------
configure.ac | 6 +-
src/Makefile.am | 4 +-
src/account_factory.cpp | 2 +-
src/client/configurationmanager.cpp | 2 +-
src/client/presencemanager.cpp | 2 +-
src/data_transfer.cpp | 2 +-
src/{ringdht => jamidht}/Makefile.am | 2 +-
src/{ringdht => jamidht}/accountarchive.cpp | 0
src/{ringdht => jamidht}/accountarchive.h | 0
src/{ringdht => jamidht}/configkeys.h | 0
.../eth/libdevcore/Address.h | 0
.../eth/libdevcore/Common.cpp | 0
.../eth/libdevcore/Common.h | 0
.../eth/libdevcore/CommonData.cpp | 0
.../eth/libdevcore/CommonData.h | 0
.../eth/libdevcore/FixedHash.cpp | 0
.../eth/libdevcore/FixedHash.h | 0
.../eth/libdevcore/Makefile.am | 0
.../eth/libdevcore/SHA3.cpp | 0
.../eth/libdevcore/SHA3.h | 0
.../eth/libdevcore/vector_ref.h | 0
.../eth/libdevcrypto/Common.cpp | 0
.../eth/libdevcrypto/Common.h | 0
.../eth/libdevcrypto/Makefile.am | 2 +-
src/{ringdht => jamidht}/jamiaccount.cpp | 0
src/{ringdht => jamidht}/jamiaccount.h | 0
src/{ringdht => jamidht}/namedirectory.cpp | 0
src/{ringdht => jamidht}/namedirectory.h | 0
src/{ringdht => jamidht}/p2p.cpp | 0
src/{ringdht => jamidht}/p2p.h | 0
src/{ringdht => jamidht}/ringcontact.h | 0
.../sips_transport_ice.cpp | 0
src/{ringdht => jamidht}/sips_transport_ice.h | 0
src/manager.cpp | 2 +-
src/sip/siptransport.cpp | 2 +-
src/sip/sipvoiplink.cpp | 2 +-
38 files changed, 105 insertions(+), 105 deletions(-)
rename src/{ringdht => jamidht}/Makefile.am (92%)
rename src/{ringdht => jamidht}/accountarchive.cpp (100%)
rename src/{ringdht => jamidht}/accountarchive.h (100%)
rename src/{ringdht => jamidht}/configkeys.h (100%)
rename src/{ringdht => jamidht}/eth/libdevcore/Address.h (100%)
rename src/{ringdht => jamidht}/eth/libdevcore/Common.cpp (100%)
rename src/{ringdht => jamidht}/eth/libdevcore/Common.h (100%)
rename src/{ringdht => jamidht}/eth/libdevcore/CommonData.cpp (100%)
rename src/{ringdht => jamidht}/eth/libdevcore/CommonData.h (100%)
rename src/{ringdht => jamidht}/eth/libdevcore/FixedHash.cpp (100%)
rename src/{ringdht => jamidht}/eth/libdevcore/FixedHash.h (100%)
rename src/{ringdht => jamidht}/eth/libdevcore/Makefile.am (100%)
rename src/{ringdht => jamidht}/eth/libdevcore/SHA3.cpp (100%)
rename src/{ringdht => jamidht}/eth/libdevcore/SHA3.h (100%)
rename src/{ringdht => jamidht}/eth/libdevcore/vector_ref.h (100%)
rename src/{ringdht => jamidht}/eth/libdevcrypto/Common.cpp (100%)
rename src/{ringdht => jamidht}/eth/libdevcrypto/Common.h (100%)
rename src/{ringdht => jamidht}/eth/libdevcrypto/Makefile.am (74%)
rename src/{ringdht => jamidht}/jamiaccount.cpp (100%)
rename src/{ringdht => jamidht}/jamiaccount.h (100%)
rename src/{ringdht => jamidht}/namedirectory.cpp (100%)
rename src/{ringdht => jamidht}/namedirectory.h (100%)
rename src/{ringdht => jamidht}/p2p.cpp (100%)
rename src/{ringdht => jamidht}/p2p.h (100%)
rename src/{ringdht => jamidht}/ringcontact.h (100%)
rename src/{ringdht => jamidht}/sips_transport_ice.cpp (100%)
rename src/{ringdht => jamidht}/sips_transport_ice.h (100%)
diff --git a/MSVC/ring-daemon.vcxproj b/MSVC/ring-daemon.vcxproj
index 5dde45cc04..e29eb765ff 100644
--- a/MSVC/ring-daemon.vcxproj
+++ b/MSVC/ring-daemon.vcxproj
@@ -244,7 +244,7 @@
<WarningLevel>TurnOffAllWarnings</WarningLevel>
<Optimization>Disabled</Optimization>
<SDLCheck>false</SDLCheck>
- <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)..\;$(ProjectDir)..\src;$(ProjectDir)..\src\client;$(ProjectDir)..\src\config;$(ProjectDir)..\src\dring;$(ProjectDir)..\src\hooks;$(ProjectDir)..\src\im;$(ProjectDir)..\src\media;$(ProjectDir)..\src\ringdht;$(ProjectDir)..\src\security;$(ProjectDir)..\src\sip;$(ProjectDir)..\src\upnp;$(ProjectDir)..\src\ringdht\eth;$(ProjectDir)..\contrib\msvc;$(ProjectDir)..\contrib\msvc\include;$(ProjectDir)..\contrib\build\msgpack-c\include;$(ProjectDir)..\contrib\build\jsoncpp\include;$(ProjectDir)..\contrib\build\yaml-cpp\include;$(ProjectDir)..\contrib\build\pjproject\pjlib\include;$(ProjectDir)..\contrib\build\pjproject\pjnath\include;$(ProjectDir)..\contrib\build\pjproject\pjlib-util\include;$(ProjectDir)..\contrib\build\pjproject\pjsip\include;$(ProjectDir)..\contrib\build\pjproject\third_party;$(ProjectDir)..\contrib\build\pjproject\pjmedia\include;$(ProjectDir)..\contrib\build\restbed\source;$(ProjectDir)..\contrib\build\ffmpeg\Build\Windows10\x86\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)..\;$(ProjectDir)..\src;$(ProjectDir)..\src\client;$(ProjectDir)..\src\config;$(ProjectDir)..\src\dring;$(ProjectDir)..\src\hooks;$(ProjectDir)..\src\im;$(ProjectDir)..\src\media;$(ProjectDir)..\src\jamidht;$(ProjectDir)..\src\security;$(ProjectDir)..\src\sip;$(ProjectDir)..\src\upnp;$(ProjectDir)..\src\jamidht\eth;$(ProjectDir)..\contrib\msvc;$(ProjectDir)..\contrib\msvc\include;$(ProjectDir)..\contrib\build\msgpack-c\include;$(ProjectDir)..\contrib\build\jsoncpp\include;$(ProjectDir)..\contrib\build\yaml-cpp\include;$(ProjectDir)..\contrib\build\pjproject\pjlib\include;$(ProjectDir)..\contrib\build\pjproject\pjnath\include;$(ProjectDir)..\contrib\build\pjproject\pjlib-util\include;$(ProjectDir)..\contrib\build\pjproject\pjsip\include;$(ProjectDir)..\contrib\build\pjproject\third_party;$(ProjectDir)..\contrib\build\pjproject\pjmedia\include;$(ProjectDir)..\contrib\build\restbed\source;$(ProjectDir)..\contrib\build\ffmpeg\Build\Windows10\x86\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>RING_UWP;_USE_MATH_DEFINES;DEBUG_FPS;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;NOMINMAX;HAVE_CONFIG_H;WIN32_LEAN_AND_MEAN;WIN32_NATIVE;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<CompileAsManaged>
</CompileAsManaged>
@@ -279,7 +279,7 @@
<WarningLevel>TurnOffAllWarnings</WarningLevel>
<Optimization>Disabled</Optimization>
<SDLCheck>false</SDLCheck>
- <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)..\;$(ProjectDir)..\src;$(ProjectDir)..\src\client;$(ProjectDir)..\src\config;$(ProjectDir)..\src\dring;$(ProjectDir)..\src\hooks;$(ProjectDir)..\src\im;$(ProjectDir)..\src\media;$(ProjectDir)..\src\ringdht;$(ProjectDir)..\src\security;$(ProjectDir)..\src\sip;$(ProjectDir)..\src\upnp;$(ProjectDir)..\src\ringdht\eth;$(ProjectDir)..\contrib\msvc;$(ProjectDir)..\contrib\msvc\include;$(ProjectDir)..\contrib\build\msgpack-c\include;$(ProjectDir)..\contrib\build\jsoncpp\include;$(ProjectDir)..\contrib\build\yaml-cpp\include;$(ProjectDir)..\contrib\build\pjproject\pjlib\include;$(ProjectDir)..\contrib\build\pjproject\pjnath\include;$(ProjectDir)..\contrib\build\pjproject\pjlib-util\include;$(ProjectDir)..\contrib\build\pjproject\pjsip\include;$(ProjectDir)..\contrib\build\pjproject\third_party;$(ProjectDir)..\contrib\build\pjproject\pjmedia\include;$(ProjectDir)..\contrib\build\restbed\source;$(ProjectDir)..\contrib\build\ffmpeg\Build\Windows10\x86\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)..\;$(ProjectDir)..\src;$(ProjectDir)..\src\client;$(ProjectDir)..\src\config;$(ProjectDir)..\src\dring;$(ProjectDir)..\src\hooks;$(ProjectDir)..\src\im;$(ProjectDir)..\src\media;$(ProjectDir)..\src\jamidht;$(ProjectDir)..\src\security;$(ProjectDir)..\src\sip;$(ProjectDir)..\src\upnp;$(ProjectDir)..\src\jamidht\eth;$(ProjectDir)..\contrib\msvc;$(ProjectDir)..\contrib\msvc\include;$(ProjectDir)..\contrib\build\msgpack-c\include;$(ProjectDir)..\contrib\build\jsoncpp\include;$(ProjectDir)..\contrib\build\yaml-cpp\include;$(ProjectDir)..\contrib\build\pjproject\pjlib\include;$(ProjectDir)..\contrib\build\pjproject\pjnath\include;$(ProjectDir)..\contrib\build\pjproject\pjlib-util\include;$(ProjectDir)..\contrib\build\pjproject\pjsip\include;$(ProjectDir)..\contrib\build\pjproject\third_party;$(ProjectDir)..\contrib\build\pjproject\pjmedia\include;$(ProjectDir)..\contrib\build\restbed\source;$(ProjectDir)..\contrib\build\ffmpeg\Build\Windows10\x86\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>RING_UWP;_USE_MATH_DEFINES;DEBUG_FPS;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;NOMINMAX;HAVE_CONFIG_H;WIN32_LEAN_AND_MEAN;WIN32_NATIVE;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<CompileAsManaged>
</CompileAsManaged>
@@ -322,7 +322,7 @@
<WarningLevel>TurnOffAllWarnings</WarningLevel>
<Optimization>Disabled</Optimization>
<SDLCheck>false</SDLCheck>
- <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)..\;$(ProjectDir)..\src;$(ProjectDir)..\src\client;$(ProjectDir)..\src\config;$(ProjectDir)..\src\dring;$(ProjectDir)..\src\hooks;$(ProjectDir)..\src\im;$(ProjectDir)..\src\media;$(ProjectDir)..\src\ringdht;$(ProjectDir)..\src\security;$(ProjectDir)..\src\sip;$(ProjectDir)..\src\upnp;$(ProjectDir)..\src\ringdht\eth;$(ProjectDir)..\contrib\msvc;$(ProjectDir)..\contrib\msvc\include;$(ProjectDir)..\contrib\build\msgpack-c\include;$(ProjectDir)..\contrib\build\jsoncpp\include;$(ProjectDir)..\contrib\build\yaml-cpp\include;$(ProjectDir)..\contrib\build\pjproject\pjlib\include;$(ProjectDir)..\contrib\build\pjproject\pjnath\include;$(ProjectDir)..\contrib\build\pjproject\pjlib-util\include;$(ProjectDir)..\contrib\build\pjproject\pjsip\include;$(ProjectDir)..\contrib\build\pjproject\third_party;$(ProjectDir)..\contrib\build\pjproject\pjmedia\include;$(ProjectDir)..\contrib\build\restbed\source;$(ProjectDir)..\contrib\build\ffmpeg\Build\Windows10\x86\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)..\;$(ProjectDir)..\src;$(ProjectDir)..\src\client;$(ProjectDir)..\src\config;$(ProjectDir)..\src\dring;$(ProjectDir)..\src\hooks;$(ProjectDir)..\src\im;$(ProjectDir)..\src\media;$(ProjectDir)..\src\jamidht;$(ProjectDir)..\src\security;$(ProjectDir)..\src\sip;$(ProjectDir)..\src\upnp;$(ProjectDir)..\src\jamidht\eth;$(ProjectDir)..\contrib\msvc;$(ProjectDir)..\contrib\msvc\include;$(ProjectDir)..\contrib\build\msgpack-c\include;$(ProjectDir)..\contrib\build\jsoncpp\include;$(ProjectDir)..\contrib\build\yaml-cpp\include;$(ProjectDir)..\contrib\build\pjproject\pjlib\include;$(ProjectDir)..\contrib\build\pjproject\pjnath\include;$(ProjectDir)..\contrib\build\pjproject\pjlib-util\include;$(ProjectDir)..\contrib\build\pjproject\pjsip\include;$(ProjectDir)..\contrib\build\pjproject\third_party;$(ProjectDir)..\contrib\build\pjproject\pjmedia\include;$(ProjectDir)..\contrib\build\restbed\source;$(ProjectDir)..\contrib\build\ffmpeg\Build\Windows10\x86\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>RING_UWP;_USE_MATH_DEFINES;DEBUG_FPS;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;NOMINMAX;HAVE_CONFIG_H;WIN32_LEAN_AND_MEAN;WIN32_NATIVE;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<CompileAsManaged>
</CompileAsManaged>
@@ -365,7 +365,7 @@
<WarningLevel>TurnOffAllWarnings</WarningLevel>
<Optimization>Disabled</Optimization>
<SDLCheck>false</SDLCheck>
- <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)..\;$(ProjectDir)..\src;$(ProjectDir)..\src\client;$(ProjectDir)..\src\config;$(ProjectDir)..\src\dring;$(ProjectDir)..\src\hooks;$(ProjectDir)..\src\im;$(ProjectDir)..\src\media;$(ProjectDir)..\src\ringdht;$(ProjectDir)..\src\security;$(ProjectDir)..\src\sip;$(ProjectDir)..\src\upnp;$(ProjectDir)..\src\ringdht\eth;$(ProjectDir)..\contrib\msvc;$(ProjectDir)..\contrib\msvc\include;$(ProjectDir)..\contrib\build\msgpack-c\include;$(ProjectDir)..\contrib\build\jsoncpp\include;$(ProjectDir)..\contrib\build\yaml-cpp\include;$(ProjectDir)..\contrib\build\pjproject\pjlib\include;$(ProjectDir)..\contrib\build\pjproject\pjnath\include;$(ProjectDir)..\contrib\build\pjproject\pjlib-util\include;$(ProjectDir)..\contrib\build\pjproject\pjsip\include;$(ProjectDir)..\contrib\build\pjproject\third_party;$(ProjectDir)..\contrib\build\pjproject\pjmedia\include;$(ProjectDir)..\contrib\build\restbed\source;$(ProjectDir)..\contrib\build\ffmpeg\Build\Windows10\x64\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)..\;$(ProjectDir)..\src;$(ProjectDir)..\src\client;$(ProjectDir)..\src\config;$(ProjectDir)..\src\dring;$(ProjectDir)..\src\hooks;$(ProjectDir)..\src\im;$(ProjectDir)..\src\media;$(ProjectDir)..\src\jamidht;$(ProjectDir)..\src\security;$(ProjectDir)..\src\sip;$(ProjectDir)..\src\upnp;$(ProjectDir)..\src\jamidht\eth;$(ProjectDir)..\contrib\msvc;$(ProjectDir)..\contrib\msvc\include;$(ProjectDir)..\contrib\build\msgpack-c\include;$(ProjectDir)..\contrib\build\jsoncpp\include;$(ProjectDir)..\contrib\build\yaml-cpp\include;$(ProjectDir)..\contrib\build\pjproject\pjlib\include;$(ProjectDir)..\contrib\build\pjproject\pjnath\include;$(ProjectDir)..\contrib\build\pjproject\pjlib-util\include;$(ProjectDir)..\contrib\build\pjproject\pjsip\include;$(ProjectDir)..\contrib\build\pjproject\third_party;$(ProjectDir)..\contrib\build\pjproject\pjmedia\include;$(ProjectDir)..\contrib\build\restbed\source;$(ProjectDir)..\contrib\build\ffmpeg\Build\Windows10\x64\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>RING_UWP;_USE_MATH_DEFINES;DEBUG_FPS;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;NOMINMAX;HAVE_CONFIG_H;WIN32_LEAN_AND_MEAN;WIN32_NATIVE;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<DisableSpecificWarnings>4996;4503;4180;4244;4267;</DisableSpecificWarnings>
<SuppressStartupBanner>true</SuppressStartupBanner>
@@ -392,7 +392,7 @@
<WarningLevel>TurnOffAllWarnings</WarningLevel>
<Optimization>Disabled</Optimization>
<SDLCheck>false</SDLCheck>
- <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)..\;$(ProjectDir)..\src;$(ProjectDir)..\src\client;$(ProjectDir)..\src\config;$(ProjectDir)..\src\dring;$(ProjectDir)..\src\hooks;$(ProjectDir)..\src\im;$(ProjectDir)..\src\media;$(ProjectDir)..\src\ringdht;$(ProjectDir)..\src\security;$(ProjectDir)..\src\sip;$(ProjectDir)..\src\upnp;$(ProjectDir)..\src\ringdht\eth;$(ProjectDir)..\contrib\msvc;$(ProjectDir)..\contrib\msvc\include;$(ProjectDir)..\contrib\build\msgpack-c\include;$(ProjectDir)..\contrib\build\jsoncpp\include;$(ProjectDir)..\contrib\build\yaml-cpp\include;$(ProjectDir)..\contrib\build\pjproject\pjlib\include;$(ProjectDir)..\contrib\build\pjproject\pjnath\include;$(ProjectDir)..\contrib\build\pjproject\pjlib-util\include;$(ProjectDir)..\contrib\build\pjproject\pjsip\include;$(ProjectDir)..\contrib\build\pjproject\third_party;$(ProjectDir)..\contrib\build\pjproject\pjmedia\include;$(ProjectDir)..\contrib\build\restbed\source;$(ProjectDir)..\contrib\build\ffmpeg\Build\Windows10\x64\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)..\;$(ProjectDir)..\src;$(ProjectDir)..\src\client;$(ProjectDir)..\src\config;$(ProjectDir)..\src\dring;$(ProjectDir)..\src\hooks;$(ProjectDir)..\src\im;$(ProjectDir)..\src\media;$(ProjectDir)..\src\jamidht;$(ProjectDir)..\src\security;$(ProjectDir)..\src\sip;$(ProjectDir)..\src\upnp;$(ProjectDir)..\src\jamidht\eth;$(ProjectDir)..\contrib\msvc;$(ProjectDir)..\contrib\msvc\include;$(ProjectDir)..\contrib\build\msgpack-c\include;$(ProjectDir)..\contrib\build\jsoncpp\include;$(ProjectDir)..\contrib\build\yaml-cpp\include;$(ProjectDir)..\contrib\build\pjproject\pjlib\include;$(ProjectDir)..\contrib\build\pjproject\pjnath\include;$(ProjectDir)..\contrib\build\pjproject\pjlib-util\include;$(ProjectDir)..\contrib\build\pjproject\pjsip\include;$(ProjectDir)..\contrib\build\pjproject\third_party;$(ProjectDir)..\contrib\build\pjproject\pjmedia\include;$(ProjectDir)..\contrib\build\restbed\source;$(ProjectDir)..\contrib\build\ffmpeg\Build\Windows10\x64\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>RING_UWP;_USE_MATH_DEFINES;DEBUG_FPS;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;NOMINMAX;HAVE_CONFIG_H;WIN32_LEAN_AND_MEAN;WIN32_NATIVE;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<DisableSpecificWarnings>4996;4503;4180;4244;4267;</DisableSpecificWarnings>
<SuppressStartupBanner>true</SuppressStartupBanner>
@@ -424,7 +424,7 @@
<WarningLevel>TurnOffAllWarnings</WarningLevel>
<Optimization>Disabled</Optimization>
<SDLCheck>false</SDLCheck>
- <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)..\;$(ProjectDir)..\src;$(ProjectDir)..\src\client;$(ProjectDir)..\src\config;$(ProjectDir)..\src\dring;$(ProjectDir)..\src\hooks;$(ProjectDir)..\src\im;$(ProjectDir)..\src\media;$(ProjectDir)..\src\ringdht;$(ProjectDir)..\src\security;$(ProjectDir)..\src\sip;$(ProjectDir)..\src\upnp;$(ProjectDir)..\src\ringdht\eth;$(ProjectDir)..\contrib\msvc;$(ProjectDir)..\contrib\msvc\include;$(ProjectDir)..\contrib\build\msgpack-c\include;$(ProjectDir)..\contrib\build\jsoncpp\include;$(ProjectDir)..\contrib\build\yaml-cpp\include;$(ProjectDir)..\contrib\build\pjproject\pjlib\include;$(ProjectDir)..\contrib\build\pjproject\pjnath\include;$(ProjectDir)..\contrib\build\pjproject\pjlib-util\include;$(ProjectDir)..\contrib\build\pjproject\pjsip\include;$(ProjectDir)..\contrib\build\pjproject\third_party;$(ProjectDir)..\contrib\build\pjproject\pjmedia\include;$(ProjectDir)..\contrib\build\restbed\source;$(ProjectDir)..\contrib\build\ffmpeg\Build\Windows10\x64\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)..\;$(ProjectDir)..\src;$(ProjectDir)..\src\client;$(ProjectDir)..\src\config;$(ProjectDir)..\src\dring;$(ProjectDir)..\src\hooks;$(ProjectDir)..\src\im;$(ProjectDir)..\src\media;$(ProjectDir)..\src\jamidht;$(ProjectDir)..\src\security;$(ProjectDir)..\src\sip;$(ProjectDir)..\src\upnp;$(ProjectDir)..\src\jamidht\eth;$(ProjectDir)..\contrib\msvc;$(ProjectDir)..\contrib\msvc\include;$(ProjectDir)..\contrib\build\msgpack-c\include;$(ProjectDir)..\contrib\build\jsoncpp\include;$(ProjectDir)..\contrib\build\yaml-cpp\include;$(ProjectDir)..\contrib\build\pjproject\pjlib\include;$(ProjectDir)..\contrib\build\pjproject\pjnath\include;$(ProjectDir)..\contrib\build\pjproject\pjlib-util\include;$(ProjectDir)..\contrib\build\pjproject\pjsip\include;$(ProjectDir)..\contrib\build\pjproject\third_party;$(ProjectDir)..\contrib\build\pjproject\pjmedia\include;$(ProjectDir)..\contrib\build\restbed\source;$(ProjectDir)..\contrib\build\ffmpeg\Build\Windows10\x64\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>RING_UWP;_USE_MATH_DEFINES;DEBUG_FPS;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;NOMINMAX;HAVE_CONFIG_H;WIN32_LEAN_AND_MEAN;WIN32_NATIVE;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<DisableSpecificWarnings>4996;4503;4180;4244;4267;</DisableSpecificWarnings>
<SuppressStartupBanner>true</SuppressStartupBanner>
@@ -458,7 +458,7 @@
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>false</SDLCheck>
- <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)..\;$(ProjectDir)..\src;$(ProjectDir)..\src\client;$(ProjectDir)..\src\config;$(ProjectDir)..\src\dring;$(ProjectDir)..\src\hooks;$(ProjectDir)..\src\im;$(ProjectDir)..\src\media;$(ProjectDir)..\src\ringdht;$(ProjectDir)..\src\security;$(ProjectDir)..\src\sip;$(ProjectDir)..\src\upnp;$(ProjectDir)..\src\ringdht\eth;$(ProjectDir)..\contrib\msvc;$(ProjectDir)..\contrib\msvc\include;$(ProjectDir)..\contrib\build\msgpack-c\include;$(ProjectDir)..\contrib\build\jsoncpp\include;$(ProjectDir)..\contrib\build\yaml-cpp\include;$(ProjectDir)..\contrib\build\pjproject\pjlib\include;$(ProjectDir)..\contrib\build\pjproject\pjnath\include;$(ProjectDir)..\contrib\build\pjproject\pjlib-util\include;$(ProjectDir)..\contrib\build\pjproject\pjsip\include;$(ProjectDir)..\contrib\build\pjproject\third_party;$(ProjectDir)..\contrib\build\pjproject\pjmedia\include;$(ProjectDir)..\contrib\build\restbed\source;$(ProjectDir)..\contrib\build\ffmpeg\Build\Windows10\x86\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)..\;$(ProjectDir)..\src;$(ProjectDir)..\src\client;$(ProjectDir)..\src\config;$(ProjectDir)..\src\dring;$(ProjectDir)..\src\hooks;$(ProjectDir)..\src\im;$(ProjectDir)..\src\media;$(ProjectDir)..\src\jamidht;$(ProjectDir)..\src\security;$(ProjectDir)..\src\sip;$(ProjectDir)..\src\upnp;$(ProjectDir)..\src\jamidht\eth;$(ProjectDir)..\contrib\msvc;$(ProjectDir)..\contrib\msvc\include;$(ProjectDir)..\contrib\build\msgpack-c\include;$(ProjectDir)..\contrib\build\jsoncpp\include;$(ProjectDir)..\contrib\build\yaml-cpp\include;$(ProjectDir)..\contrib\build\pjproject\pjlib\include;$(ProjectDir)..\contrib\build\pjproject\pjnath\include;$(ProjectDir)..\contrib\build\pjproject\pjlib-util\include;$(ProjectDir)..\contrib\build\pjproject\pjsip\include;$(ProjectDir)..\contrib\build\pjproject\third_party;$(ProjectDir)..\contrib\build\pjproject\pjmedia\include;$(ProjectDir)..\contrib\build\restbed\source;$(ProjectDir)..\contrib\build\ffmpeg\Build\Windows10\x86\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>RING_UWP;_USE_MATH_DEFINES;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;NOMINMAX;HAVE_CONFIG_H;WIN32_LEAN_AND_MEAN;WIN32_NATIVE;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<CompileAsManaged>
</CompileAsManaged>
@@ -494,7 +494,7 @@
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>false</SDLCheck>
- <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)..\;$(ProjectDir)..\src;$(ProjectDir)..\src\client;$(ProjectDir)..\src\config;$(ProjectDir)..\src\dring;$(ProjectDir)..\src\hooks;$(ProjectDir)..\src\im;$(ProjectDir)..\src\media;$(ProjectDir)..\src\ringdht;$(ProjectDir)..\src\security;$(ProjectDir)..\src\sip;$(ProjectDir)..\src\upnp;$(ProjectDir)..\src\ringdht\eth;$(ProjectDir)..\contrib\msvc;$(ProjectDir)..\contrib\msvc\include;$(ProjectDir)..\contrib\build\msgpack-c\include;$(ProjectDir)..\contrib\build\jsoncpp\include;$(ProjectDir)..\contrib\build\yaml-cpp\include;$(ProjectDir)..\contrib\build\pjproject\pjlib\include;$(ProjectDir)..\contrib\build\pjproject\pjnath\include;$(ProjectDir)..\contrib\build\pjproject\pjlib-util\include;$(ProjectDir)..\contrib\build\pjproject\pjsip\include;$(ProjectDir)..\contrib\build\pjproject\third_party;$(ProjectDir)..\contrib\build\pjproject\pjmedia\include;$(ProjectDir)..\contrib\build\restbed\source;$(ProjectDir)..\contrib\build\ffmpeg\Build\Windows10\x86\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)..\;$(ProjectDir)..\src;$(ProjectDir)..\src\client;$(ProjectDir)..\src\config;$(ProjectDir)..\src\dring;$(ProjectDir)..\src\hooks;$(ProjectDir)..\src\im;$(ProjectDir)..\src\media;$(ProjectDir)..\src\jamidht;$(ProjectDir)..\src\security;$(ProjectDir)..\src\sip;$(ProjectDir)..\src\upnp;$(ProjectDir)..\src\jamidht\eth;$(ProjectDir)..\contrib\msvc;$(ProjectDir)..\contrib\msvc\include;$(ProjectDir)..\contrib\build\msgpack-c\include;$(ProjectDir)..\contrib\build\jsoncpp\include;$(ProjectDir)..\contrib\build\yaml-cpp\include;$(ProjectDir)..\contrib\build\pjproject\pjlib\include;$(ProjectDir)..\contrib\build\pjproject\pjnath\include;$(ProjectDir)..\contrib\build\pjproject\pjlib-util\include;$(ProjectDir)..\contrib\build\pjproject\pjsip\include;$(ProjectDir)..\contrib\build\pjproject\third_party;$(ProjectDir)..\contrib\build\pjproject\pjmedia\include;$(ProjectDir)..\contrib\build\restbed\source;$(ProjectDir)..\contrib\build\ffmpeg\Build\Windows10\x86\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_USE_MATH_DEFINES;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;NOMINMAX;HAVE_CONFIG_H;WIN32_LEAN_AND_MEAN;WIN32_NATIVE;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<CompileAsManaged>
</CompileAsManaged>
@@ -536,7 +536,7 @@
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>false</SDLCheck>
- <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)..\;$(ProjectDir)..\src;$(ProjectDir)..\src\client;$(ProjectDir)..\src\config;$(ProjectDir)..\src\dring;$(ProjectDir)..\src\hooks;$(ProjectDir)..\src\im;$(ProjectDir)..\src\media;$(ProjectDir)..\src\ringdht;$(ProjectDir)..\src\security;$(ProjectDir)..\src\sip;$(ProjectDir)..\src\upnp;$(ProjectDir)..\src\ringdht\eth;$(ProjectDir)..\contrib\msvc;$(ProjectDir)..\contrib\msvc\include;$(ProjectDir)..\contrib\build\msgpack-c\include;$(ProjectDir)..\contrib\build\jsoncpp\include;$(ProjectDir)..\contrib\build\yaml-cpp\include;$(ProjectDir)..\contrib\build\pjproject\pjlib\include;$(ProjectDir)..\contrib\build\pjproject\pjnath\include;$(ProjectDir)..\contrib\build\pjproject\pjlib-util\include;$(ProjectDir)..\contrib\build\pjproject\pjsip\include;$(ProjectDir)..\contrib\build\pjproject\third_party;$(ProjectDir)..\contrib\build\pjproject\pjmedia\include;$(ProjectDir)..\contrib\build\restbed\source;$(ProjectDir)..\contrib\build\ffmpeg\Build\Windows10\x86\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)..\;$(ProjectDir)..\src;$(ProjectDir)..\src\client;$(ProjectDir)..\src\config;$(ProjectDir)..\src\dring;$(ProjectDir)..\src\hooks;$(ProjectDir)..\src\im;$(ProjectDir)..\src\media;$(ProjectDir)..\src\jamidht;$(ProjectDir)..\src\security;$(ProjectDir)..\src\sip;$(ProjectDir)..\src\upnp;$(ProjectDir)..\src\jamidht\eth;$(ProjectDir)..\contrib\msvc;$(ProjectDir)..\contrib\msvc\include;$(ProjectDir)..\contrib\build\msgpack-c\include;$(ProjectDir)..\contrib\build\jsoncpp\include;$(ProjectDir)..\contrib\build\yaml-cpp\include;$(ProjectDir)..\contrib\build\pjproject\pjlib\include;$(ProjectDir)..\contrib\build\pjproject\pjnath\include;$(ProjectDir)..\contrib\build\pjproject\pjlib-util\include;$(ProjectDir)..\contrib\build\pjproject\pjsip\include;$(ProjectDir)..\contrib\build\pjproject\third_party;$(ProjectDir)..\contrib\build\pjproject\pjmedia\include;$(ProjectDir)..\contrib\build\restbed\source;$(ProjectDir)..\contrib\build\ffmpeg\Build\Windows10\x86\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_USE_MATH_DEFINES;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;NOMINMAX;HAVE_CONFIG_H;WIN32_LEAN_AND_MEAN;WIN32_NATIVE;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<CompileAsManaged>
</CompileAsManaged>
@@ -578,7 +578,7 @@
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>false</SDLCheck>
- <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)..\;$(ProjectDir)..\src;$(ProjectDir)..\src\client;$(ProjectDir)..\src\config;$(ProjectDir)..\src\dring;$(ProjectDir)..\src\hooks;$(ProjectDir)..\src\im;$(ProjectDir)..\src\media;$(ProjectDir)..\src\ringdht;$(ProjectDir)..\src\security;$(ProjectDir)..\src\sip;$(ProjectDir)..\src\upnp;$(ProjectDir)..\src\ringdht\eth;$(ProjectDir)..\contrib\msvc;$(ProjectDir)..\contrib\msvc\include;$(ProjectDir)..\contrib\build\msgpack-c\include;$(ProjectDir)..\contrib\build\jsoncpp\include;$(ProjectDir)..\contrib\build\yaml-cpp\include;$(ProjectDir)..\contrib\build\pjproject\pjlib\include;$(ProjectDir)..\contrib\build\pjproject\pjnath\include;$(ProjectDir)..\contrib\build\pjproject\pjlib-util\include;$(ProjectDir)..\contrib\build\pjproject\pjsip\include;$(ProjectDir)..\contrib\build\pjproject\third_party;$(ProjectDir)..\contrib\build\pjproject\pjmedia\include;$(ProjectDir)..\contrib\build\restbed\source;$(ProjectDir)..\contrib\build\ffmpeg\Build\Windows10\x64\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)..\;$(ProjectDir)..\src;$(ProjectDir)..\src\client;$(ProjectDir)..\src\config;$(ProjectDir)..\src\dring;$(ProjectDir)..\src\hooks;$(ProjectDir)..\src\im;$(ProjectDir)..\src\media;$(ProjectDir)..\src\jamidht;$(ProjectDir)..\src\security;$(ProjectDir)..\src\sip;$(ProjectDir)..\src\upnp;$(ProjectDir)..\src\jamidht\eth;$(ProjectDir)..\contrib\msvc;$(ProjectDir)..\contrib\msvc\include;$(ProjectDir)..\contrib\build\msgpack-c\include;$(ProjectDir)..\contrib\build\jsoncpp\include;$(ProjectDir)..\contrib\build\yaml-cpp\include;$(ProjectDir)..\contrib\build\pjproject\pjlib\include;$(ProjectDir)..\contrib\build\pjproject\pjnath\include;$(ProjectDir)..\contrib\build\pjproject\pjlib-util\include;$(ProjectDir)..\contrib\build\pjproject\pjsip\include;$(ProjectDir)..\contrib\build\pjproject\third_party;$(ProjectDir)..\contrib\build\pjproject\pjmedia\include;$(ProjectDir)..\contrib\build\restbed\source;$(ProjectDir)..\contrib\build\ffmpeg\Build\Windows10\x64\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>RING_UWP;STATICLIB;_USE_MATH_DEFINES;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;NOMINMAX;HAVE_CONFIG_H;WIN32_LEAN_AND_MEAN;WIN32_NATIVE;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<DisableSpecificWarnings>4996;4503;4180;4244;4267;</DisableSpecificWarnings>
<SuppressStartupBanner>true</SuppressStartupBanner>
@@ -616,7 +616,7 @@
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>
</SDLCheck>
- <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)..\;$(ProjectDir)..\src;$(ProjectDir)..\src\client;$(ProjectDir)..\src\config;$(ProjectDir)..\src\dring;$(ProjectDir)..\src\hooks;$(ProjectDir)..\src\im;$(ProjectDir)..\src\media;$(ProjectDir)..\src\ringdht;$(ProjectDir)..\src\security;$(ProjectDir)..\src\sip;$(ProjectDir)..\src\upnp;$(ProjectDir)..\src\ringdht\eth;$(ProjectDir)..\contrib\msvc;$(ProjectDir)..\contrib\msvc\include;$(ProjectDir)..\contrib\build\msgpack-c\include;$(ProjectDir)..\contrib\build\jsoncpp\include;$(ProjectDir)..\contrib\build\yaml-cpp\include;$(ProjectDir)..\contrib\build\pjproject\pjlib\include;$(ProjectDir)..\contrib\build\pjproject\pjnath\include;$(ProjectDir)..\contrib\build\pjproject\pjlib-util\include;$(ProjectDir)..\contrib\build\pjproject\pjsip\include;$(ProjectDir)..\contrib\build\pjproject\third_party;$(ProjectDir)..\contrib\build\pjproject\pjmedia\include;$(ProjectDir)..\contrib\build\restbed\source;$(ProjectDir)..\contrib\build\ffmpeg\Build\Windows10\x64\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)..\;$(ProjectDir)..\src;$(ProjectDir)..\src\client;$(ProjectDir)..\src\config;$(ProjectDir)..\src\dring;$(ProjectDir)..\src\hooks;$(ProjectDir)..\src\im;$(ProjectDir)..\src\media;$(ProjectDir)..\src\jamidht;$(ProjectDir)..\src\security;$(ProjectDir)..\src\sip;$(ProjectDir)..\src\upnp;$(ProjectDir)..\src\jamidht\eth;$(ProjectDir)..\contrib\msvc;$(ProjectDir)..\contrib\msvc\include;$(ProjectDir)..\contrib\build\msgpack-c\include;$(ProjectDir)..\contrib\build\jsoncpp\include;$(ProjectDir)..\contrib\build\yaml-cpp\include;$(ProjectDir)..\contrib\build\pjproject\pjlib\include;$(ProjectDir)..\contrib\build\pjproject\pjnath\include;$(ProjectDir)..\contrib\build\pjproject\pjlib-util\include;$(ProjectDir)..\contrib\build\pjproject\pjsip\include;$(ProjectDir)..\contrib\build\pjproject\third_party;$(ProjectDir)..\contrib\build\pjproject\pjmedia\include;$(ProjectDir)..\contrib\build\restbed\source;$(ProjectDir)..\contrib\build\ffmpeg\Build\Windows10\x64\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>STATIC_GETOPT;_USE_MATH_DEFINES;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;NOMINMAX;HAVE_CONFIG_H;WIN32_LEAN_AND_MEAN;RING_UWP;WIN32_NATIVE;_MBCS;OPENDHT_PROXY_CLIENT;OPENDHT_PROXY_SERVER;OPENDHT_PUSH_NOTIFICATIONS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<DisableSpecificWarnings>4996;4503;4180;4244;4267;</DisableSpecificWarnings>
<SuppressStartupBanner>true</SuppressStartupBanner>
@@ -658,7 +658,7 @@
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>
</SDLCheck>
- <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)..\;$(ProjectDir)..\src;$(ProjectDir)..\src\client;$(ProjectDir)..\src\config;$(ProjectDir)..\src\dring;$(ProjectDir)..\src\hooks;$(ProjectDir)..\src\im;$(ProjectDir)..\src\media;$(ProjectDir)..\src\ringdht;$(ProjectDir)..\src\security;$(ProjectDir)..\src\sip;$(ProjectDir)..\src\upnp;$(ProjectDir)..\src\ringdht\eth;$(ProjectDir)..\contrib\msvc;$(ProjectDir)..\contrib\msvc\include;$(ProjectDir)..\contrib\build\msgpack-c\include;$(ProjectDir)..\contrib\build\jsoncpp\include;$(ProjectDir)..\contrib\build\yaml-cpp\include;$(ProjectDir)..\contrib\build\pjproject\pjlib\include;$(ProjectDir)..\contrib\build\pjproject\pjnath\include;$(ProjectDir)..\contrib\build\pjproject\pjlib-util\include;$(ProjectDir)..\contrib\build\pjproject\pjsip\include;$(ProjectDir)..\contrib\build\pjproject\third_party;$(ProjectDir)..\contrib\build\pjproject\pjmedia\include;$(ProjectDir)..\contrib\build\restbed\source;$(ProjectDir)..\contrib\build\ffmpeg\Build\win32\x64\include;$(ProjectDir)..\contrib\build\sndfile\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)..\;$(ProjectDir)..\src;$(ProjectDir)..\src\client;$(ProjectDir)..\src\config;$(ProjectDir)..\src\dring;$(ProjectDir)..\src\hooks;$(ProjectDir)..\src\im;$(ProjectDir)..\src\media;$(ProjectDir)..\src\jamidht;$(ProjectDir)..\src\security;$(ProjectDir)..\src\sip;$(ProjectDir)..\src\upnp;$(ProjectDir)..\src\jamidht\eth;$(ProjectDir)..\contrib\msvc;$(ProjectDir)..\contrib\msvc\include;$(ProjectDir)..\contrib\build\msgpack-c\include;$(ProjectDir)..\contrib\build\jsoncpp\include;$(ProjectDir)..\contrib\build\yaml-cpp\include;$(ProjectDir)..\contrib\build\pjproject\pjlib\include;$(ProjectDir)..\contrib\build\pjproject\pjnath\include;$(ProjectDir)..\contrib\build\pjproject\pjlib-util\include;$(ProjectDir)..\contrib\build\pjproject\pjsip\include;$(ProjectDir)..\contrib\build\pjproject\third_party;$(ProjectDir)..\contrib\build\pjproject\pjmedia\include;$(ProjectDir)..\contrib\build\restbed\source;$(ProjectDir)..\contrib\build\ffmpeg\Build\win32\x64\include;$(ProjectDir)..\contrib\build\sndfile\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>STATIC_GETOPT;_USE_MATH_DEFINES;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;NOMINMAX;HAVE_CONFIG_H;WIN32_LEAN_AND_MEAN;_MBCS;OPENDHT_PROXY_CLIENT;OPENDHT_PROXY_SERVER;OPENDHT_PUSH_NOTIFICATIONS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<DisableSpecificWarnings>4996;4503;4180;4244;4267;</DisableSpecificWarnings>
<SuppressStartupBanner>true</SuppressStartupBanner>
@@ -799,16 +799,16 @@
</ClCompile>
<ClCompile Include="..\src\peer_connection.cpp" />
<ClCompile Include="..\src\preferences.cpp" />
- <ClCompile Include="..\src\ringdht\accountarchive.cpp" />
- <ClCompile Include="..\src\ringdht\eth\libdevcore\Common.cpp" />
- <ClCompile Include="..\src\ringdht\eth\libdevcore\CommonData.cpp" />
- <ClCompile Include="..\src\ringdht\eth\libdevcore\FixedHash.cpp" />
- <ClCompile Include="..\src\ringdht\eth\libdevcore\SHA3.cpp" />
- <ClCompile Include="..\src\ringdht\eth\libdevcrypto\Common.cpp" />
- <ClCompile Include="..\src\ringdht\namedirectory.cpp" />
- <ClCompile Include="..\src\ringdht\p2p.cpp" />
- <ClCompile Include="..\src\ringdht\jamiaccount.cpp" />
- <ClCompile Include="..\src\ringdht\sips_transport_ice.cpp" />
+ <ClCompile Include="..\src\jamidht\accountarchive.cpp" />
+ <ClCompile Include="..\src\jamidht\eth\libdevcore\Common.cpp" />
+ <ClCompile Include="..\src\jamidht\eth\libdevcore\CommonData.cpp" />
+ <ClCompile Include="..\src\jamidht\eth\libdevcore\FixedHash.cpp" />
+ <ClCompile Include="..\src\jamidht\eth\libdevcore\SHA3.cpp" />
+ <ClCompile Include="..\src\jamidht\eth\libdevcrypto\Common.cpp" />
+ <ClCompile Include="..\src\jamidht\namedirectory.cpp" />
+ <ClCompile Include="..\src\jamidht\p2p.cpp" />
+ <ClCompile Include="..\src\jamidht\jamiaccount.cpp" />
+ <ClCompile Include="..\src\jamidht\sips_transport_ice.cpp" />
<ClCompile Include="..\src\ring_api.cpp" />
<ClCompile Include="..\src\scheduled_executor.cpp" />
<ClCompile Include="..\src\security\certstore.cpp" />
@@ -957,20 +957,20 @@
<ClInclude Include="..\src\preferences.h" />
<ClInclude Include="..\src\rational.h" />
<ClInclude Include="..\src\registration_states.h" />
- <ClInclude Include="..\src\ringdht\accountarchive.h" />
- <ClInclude Include="..\src\ringdht\configkeys.h" />
- <ClInclude Include="..\src\ringdht\eth\libdevcore\Address.h" />
- <ClInclude Include="..\src\ringdht\eth\libdevcore\Common.h" />
- <ClInclude Include="..\src\ringdht\eth\libdevcore\CommonData.h" />
- <ClInclude Include="..\src\ringdht\eth\libdevcore\FixedHash.h" />
- <ClInclude Include="..\src\ringdht\eth\libdevcore\SHA3.h" />
- <ClInclude Include="..\src\ringdht\eth\libdevcore\vector_ref.h" />
- <ClInclude Include="..\src\ringdht\eth\libdevcrypto\Common.h" />
- <ClInclude Include="..\src\ringdht\namedirectory.h" />
- <ClInclude Include="..\src\ringdht\p2p.h" />
- <ClInclude Include="..\src\ringdht\jamiaccount.h" />
- <ClInclude Include="..\src\ringdht\ringcontact.h" />
- <ClInclude Include="..\src\ringdht\sips_transport_ice.h" />
+ <ClInclude Include="..\src\jamidht\accountarchive.h" />
+ <ClInclude Include="..\src\jamidht\configkeys.h" />
+ <ClInclude Include="..\src\jamidht\eth\libdevcore\Address.h" />
+ <ClInclude Include="..\src\jamidht\eth\libdevcore\Common.h" />
+ <ClInclude Include="..\src\jamidht\eth\libdevcore\CommonData.h" />
+ <ClInclude Include="..\src\jamidht\eth\libdevcore\FixedHash.h" />
+ <ClInclude Include="..\src\jamidht\eth\libdevcore\SHA3.h" />
+ <ClInclude Include="..\src\jamidht\eth\libdevcore\vector_ref.h" />
+ <ClInclude Include="..\src\jamidht\eth\libdevcrypto\Common.h" />
+ <ClInclude Include="..\src\jamidht\namedirectory.h" />
+ <ClInclude Include="..\src\jamidht\p2p.h" />
+ <ClInclude Include="..\src\jamidht\jamiaccount.h" />
+ <ClInclude Include="..\src\jamidht\ringcontact.h" />
+ <ClInclude Include="..\src\jamidht\sips_transport_ice.h" />
<ClInclude Include="..\src\ring_types.h" />
<ClInclude Include="..\src\rw_mutex.h" />
<ClInclude Include="..\src\scheduled_executor.h" />
@@ -1003,7 +1003,7 @@
<ClInclude Include="..\src\winsyslog.h" />
</ItemGroup>
<ItemGroup>
- <None Include="..\src\ringdht\eth\libdevcore\Makefile.am" />
+ <None Include="..\src\jamidht\eth\libdevcore\Makefile.am" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
diff --git a/MSVC/ring-daemon.vcxproj.filters b/MSVC/ring-daemon.vcxproj.filters
index 7c02265830..5a0f068fa3 100644
--- a/MSVC/ring-daemon.vcxproj.filters
+++ b/MSVC/ring-daemon.vcxproj.filters
@@ -32,7 +32,7 @@
<Filter Include="Source Files\media\video">
<UniqueIdentifier>{79038082-1478-4202-923a-0af34dc8d704}</UniqueIdentifier>
</Filter>
- <Filter Include="Source Files\ringdht">
+ <Filter Include="Source Files\jamidht">
<UniqueIdentifier>{44a8a1a1-b597-480e-92d9-77c76445a0bd}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\security">
@@ -47,13 +47,13 @@
<Filter Include="Source Files\media\video\uwpvideo">
<UniqueIdentifier>{13ad5c25-d522-4562-8bab-f322fdd2a243}</UniqueIdentifier>
</Filter>
- <Filter Include="Source Files\ringdht\eth">
+ <Filter Include="Source Files\jamidht\eth">
<UniqueIdentifier>{a351b980-057f-4e56-9b7f-4cbf27b49a7e}</UniqueIdentifier>
</Filter>
- <Filter Include="Source Files\ringdht\eth\libdevcore">
+ <Filter Include="Source Files\jamidht\eth\libdevcore">
<UniqueIdentifier>{a39b6b13-7f71-4508-bbc8-20f69720f6af}</UniqueIdentifier>
</Filter>
- <Filter Include="Source Files\ringdht\eth\libdevcrypto">
+ <Filter Include="Source Files\jamidht\eth\libdevcrypto">
<UniqueIdentifier>{c9a4b0a8-0da9-41d6-bb80-3fc1d31a2986}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\dring">
@@ -169,11 +169,11 @@
<ClCompile Include="..\src\media\video\video_sender.cpp">
<Filter>Source Files\media\video</Filter>
</ClCompile>
- <ClCompile Include="..\src\ringdht\jamiaccount.cpp">
- <Filter>Source Files\ringdht</Filter>
+ <ClCompile Include="..\src\jamidht\jamiaccount.cpp">
+ <Filter>Source Files\jamidht</Filter>
</ClCompile>
- <ClCompile Include="..\src\ringdht\sips_transport_ice.cpp">
- <Filter>Source Files\ringdht</Filter>
+ <ClCompile Include="..\src\jamidht\sips_transport_ice.cpp">
+ <Filter>Source Files\jamidht</Filter>
</ClCompile>
<ClCompile Include="..\src\upnp\upnp_context.cpp">
<Filter>Source Files\upnp</Filter>
@@ -241,29 +241,29 @@
<ClCompile Include="..\src\media\video\uwpvideo\video_device_monitor_impl.cpp">
<Filter>Source Files\media\video\uwpvideo</Filter>
</ClCompile>
- <ClCompile Include="..\src\ringdht\eth\libdevcore\Common.cpp">
- <Filter>Source Files\ringdht\eth\libdevcore</Filter>
+ <ClCompile Include="..\src\jamidht\eth\libdevcore\Common.cpp">
+ <Filter>Source Files\jamidht\eth\libdevcore</Filter>
</ClCompile>
- <ClCompile Include="..\src\ringdht\eth\libdevcore\CommonData.cpp">
- <Filter>Source Files\ringdht\eth\libdevcore</Filter>
+ <ClCompile Include="..\src\jamidht\eth\libdevcore\CommonData.cpp">
+ <Filter>Source Files\jamidht\eth\libdevcore</Filter>
</ClCompile>
- <ClCompile Include="..\src\ringdht\eth\libdevcore\FixedHash.cpp">
- <Filter>Source Files\ringdht\eth\libdevcore</Filter>
+ <ClCompile Include="..\src\jamidht\eth\libdevcore\FixedHash.cpp">
+ <Filter>Source Files\jamidht\eth\libdevcore</Filter>
</ClCompile>
- <ClCompile Include="..\src\ringdht\eth\libdevcrypto\Common.cpp">
- <Filter>Source Files\ringdht\eth\libdevcrypto</Filter>
+ <ClCompile Include="..\src\jamidht\eth\libdevcrypto\Common.cpp">
+ <Filter>Source Files\jamidht\eth\libdevcrypto</Filter>
</ClCompile>
- <ClCompile Include="..\src\ringdht\namedirectory.cpp">
- <Filter>Source Files\ringdht</Filter>
+ <ClCompile Include="..\src\jamidht\namedirectory.cpp">
+ <Filter>Source Files\jamidht</Filter>
</ClCompile>
<ClCompile Include="..\src\security\memory.cpp">
<Filter>Source Files\security</Filter>
</ClCompile>
- <ClCompile Include="..\src\ringdht\accountarchive.cpp">
- <Filter>Source Files\ringdht</Filter>
+ <ClCompile Include="..\src\jamidht\accountarchive.cpp">
+ <Filter>Source Files\jamidht</Filter>
</ClCompile>
- <ClCompile Include="..\src\ringdht\eth\libdevcore\SHA3.cpp">
- <Filter>Source Files\ringdht\eth\libdevcore</Filter>
+ <ClCompile Include="..\src\jamidht\eth\libdevcore\SHA3.cpp">
+ <Filter>Source Files\jamidht\eth\libdevcore</Filter>
</ClCompile>
<ClCompile Include="..\src\account.cpp">
<Filter>Source Files</Filter>
@@ -364,8 +364,8 @@
<ClCompile Include="..\src\config\yamlparser.cpp">
<Filter>Source Files\config</Filter>
</ClCompile>
- <ClCompile Include="..\src\ringdht\p2p.cpp">
- <Filter>Source Files\ringdht</Filter>
+ <ClCompile Include="..\src\jamidht\p2p.cpp">
+ <Filter>Source Files\jamidht</Filter>
</ClCompile>
<ClCompile Include="..\src\media\video\accel.cpp">
<Filter>Source Files\media\video</Filter>
@@ -573,47 +573,47 @@
<ClInclude Include="..\src\dring\videomanager_interface.h">
<Filter>Source Files\dring</Filter>
</ClInclude>
- <ClInclude Include="..\src\ringdht\eth\libdevcore\Address.h">
- <Filter>Source Files\ringdht\eth\libdevcore</Filter>
+ <ClInclude Include="..\src\jamidht\eth\libdevcore\Address.h">
+ <Filter>Source Files\jamidht\eth\libdevcore</Filter>
</ClInclude>
- <ClInclude Include="..\src\ringdht\eth\libdevcore\Common.h">
- <Filter>Source Files\ringdht\eth\libdevcore</Filter>
+ <ClInclude Include="..\src\jamidht\eth\libdevcore\Common.h">
+ <Filter>Source Files\jamidht\eth\libdevcore</Filter>
</ClInclude>
- <ClInclude Include="..\src\ringdht\eth\libdevcore\CommonData.h">
- <Filter>Source Files\ringdht\eth\libdevcore</Filter>
+ <ClInclude Include="..\src\jamidht\eth\libdevcore\CommonData.h">
+ <Filter>Source Files\jamidht\eth\libdevcore</Filter>
</ClInclude>
- <ClInclude Include="..\src\ringdht\eth\libdevcore\FixedHash.h">
- <Filter>Source Files\ringdht\eth\libdevcore</Filter>
+ <ClInclude Include="..\src\jamidht\eth\libdevcore\FixedHash.h">
+ <Filter>Source Files\jamidht\eth\libdevcore</Filter>
</ClInclude>
- <ClInclude Include="..\src\ringdht\eth\libdevcore\SHA3.h">
- <Filter>Source Files\ringdht\eth\libdevcore</Filter>
+ <ClInclude Include="..\src\jamidht\eth\libdevcore\SHA3.h">
+ <Filter>Source Files\jamidht\eth\libdevcore</Filter>
</ClInclude>
- <ClInclude Include="..\src\ringdht\eth\libdevcore\vector_ref.h">
- <Filter>Source Files\ringdht\eth\libdevcore</Filter>
+ <ClInclude Include="..\src\jamidht\eth\libdevcore\vector_ref.h">
+ <Filter>Source Files\jamidht\eth\libdevcore</Filter>
</ClInclude>
- <ClInclude Include="..\src\ringdht\eth\libdevcrypto\Common.h">
- <Filter>Source Files\ringdht\eth\libdevcrypto</Filter>
+ <ClInclude Include="..\src\jamidht\eth\libdevcrypto\Common.h">
+ <Filter>Source Files\jamidht\eth\libdevcrypto</Filter>
</ClInclude>
- <ClInclude Include="..\src\ringdht\accountarchive.h">
- <Filter>Source Files\ringdht</Filter>
+ <ClInclude Include="..\src\jamidht\accountarchive.h">
+ <Filter>Source Files\jamidht</Filter>
</ClInclude>
- <ClInclude Include="..\src\ringdht\configkeys.h">
- <Filter>Source Files\ringdht</Filter>
+ <ClInclude Include="..\src\jamidht\configkeys.h">
+ <Filter>Source Files\jamidht</Filter>
</ClInclude>
- <ClInclude Include="..\src\ringdht\namedirectory.h">
- <Filter>Source Files\ringdht</Filter>
+ <ClInclude Include="..\src\jamidht\namedirectory.h">
+ <Filter>Source Files\jamidht</Filter>
</ClInclude>
- <ClInclude Include="..\src\ringdht\p2p.h">
- <Filter>Source Files\ringdht</Filter>
+ <ClInclude Include="..\src\jamidht\p2p.h">
+ <Filter>Source Files\jamidht</Filter>
</ClInclude>
- <ClInclude Include="..\src\ringdht\jamiaccount.h">
- <Filter>Source Files\ringdht</Filter>
+ <ClInclude Include="..\src\jamidht\jamiaccount.h">
+ <Filter>Source Files\jamidht</Filter>
</ClInclude>
- <ClInclude Include="..\src\ringdht\ringcontact.h">
- <Filter>Source Files\ringdht</Filter>
+ <ClInclude Include="..\src\jamidht\ringcontact.h">
+ <Filter>Source Files\jamidht</Filter>
</ClInclude>
- <ClInclude Include="..\src\ringdht\sips_transport_ice.h">
- <Filter>Source Files\ringdht</Filter>
+ <ClInclude Include="..\src\jamidht\sips_transport_ice.h">
+ <Filter>Source Files\jamidht</Filter>
</ClInclude>
<ClInclude Include="..\src\im\instant_messaging.h">
<Filter>Source Files\im</Filter>
@@ -842,8 +842,8 @@
</ClInclude>
</ItemGroup>
<ItemGroup>
- <None Include="..\src\ringdht\eth\libdevcore\Makefile.am">
- <Filter>Source Files\ringdht\eth\libdevcore</Filter>
+ <None Include="..\src\jamidht\eth\libdevcore\Makefile.am">
+ <Filter>Source Files\jamidht\eth\libdevcore</Filter>
</None>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/configure.ac b/configure.ac
index 3011b6cf23..6102bd3b2a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -652,9 +652,9 @@ AC_CONFIG_FILES([Makefile \
src/Makefile \
src/sip/Makefile \
src/im/Makefile \
- src/ringdht/Makefile \
- src/ringdht/eth/libdevcore/Makefile \
- src/ringdht/eth/libdevcrypto/Makefile \
+ src/jamidht/Makefile \
+ src/jamidht/eth/libdevcore/Makefile \
+ src/jamidht/eth/libdevcrypto/Makefile \
src/media/Makefile \
src/media/audio/Makefile \
src/media/audio/pulseaudio/Makefile \
diff --git a/src/Makefile.am b/src/Makefile.am
index bec1636cc2..73cca67a26 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -27,7 +27,7 @@ ENABLE_VIDEO_LIBS+= \
endif
endif
-SUBDIRS = client media config hooks sip upnp security ringdht im $(ENABLE_VIDEO_SUBDIR)
+SUBDIRS = client media config hooks sip upnp security jamidht im $(ENABLE_VIDEO_SUBDIR)
# libring
@@ -41,7 +41,7 @@ libring_la_LIBADD = \
./hooks/libhooks.la \
./security/libsecurity.la \
./upnp/libupnpcontrol.la \
- ./ringdht/libringacc.la \
+ ./jamidht/libringacc.la \
./im/libim.la \
$(ENABLE_VIDEO_LIBS)
diff --git a/src/account_factory.cpp b/src/account_factory.cpp
index ab92ddc80e..fa1b2a960c 100644
--- a/src/account_factory.cpp
+++ b/src/account_factory.cpp
@@ -25,7 +25,7 @@
#include "account_factory.h"
#include "sip/sipaccount.h"
-#include "ringdht/jamiaccount.h"
+#include "jamidht/jamiaccount.h"
#include <stdexcept>
diff --git a/src/client/configurationmanager.cpp b/src/client/configurationmanager.cpp
index 2dda41eaf8..671195b5d4 100644
--- a/src/client/configurationmanager.cpp
+++ b/src/client/configurationmanager.cpp
@@ -35,7 +35,7 @@
#include "archiver.h"
#include "ip_utils.h"
#include "sip/sipaccount.h"
-#include "ringdht/jamiaccount.h"
+#include "jamidht/jamiaccount.h"
#include "audio/audiolayer.h"
#include "system_codec_container.h"
#include "account_const.h"
diff --git a/src/client/presencemanager.cpp b/src/client/presencemanager.cpp
index 94ce8ead71..9a735de5ba 100644
--- a/src/client/presencemanager.cpp
+++ b/src/client/presencemanager.cpp
@@ -38,7 +38,7 @@
#include "client/ring_signal.h"
#include "compiler_intrinsics.h"
-#include "ringdht/jamiaccount.h"
+#include "jamidht/jamiaccount.h"
namespace DRing {
diff --git a/src/data_transfer.cpp b/src/data_transfer.cpp
index e9a5c937e4..ececf80f2d 100644
--- a/src/data_transfer.cpp
+++ b/src/data_transfer.cpp
@@ -21,7 +21,7 @@
#include "data_transfer.h"
#include "manager.h"
-#include "ringdht/jamiaccount.h"
+#include "jamidht/jamiaccount.h"
#include "peer_connection.h"
#include "fileutils.h"
#include "string_utils.h"
diff --git a/src/ringdht/Makefile.am b/src/jamidht/Makefile.am
similarity index 92%
rename from src/ringdht/Makefile.am
rename to src/jamidht/Makefile.am
index c3c7da0cde..36014ec785 100644
--- a/src/ringdht/Makefile.am
+++ b/src/jamidht/Makefile.am
@@ -2,7 +2,7 @@ include $(top_srcdir)/globals.mk
SUBDIRS = eth/libdevcore eth/libdevcrypto
-AM_CPPFLAGS += -I$(top_srcdir)/src/ringdht/eth
+AM_CPPFLAGS += -I$(top_srcdir)/src/jamidht/eth
noinst_LTLIBRARIES = libringacc.la
libringacc_la_CXXFLAGS = @CXXFLAGS@ @JSONCPP_CFLAGS@
diff --git a/src/ringdht/accountarchive.cpp b/src/jamidht/accountarchive.cpp
similarity index 100%
rename from src/ringdht/accountarchive.cpp
rename to src/jamidht/accountarchive.cpp
diff --git a/src/ringdht/accountarchive.h b/src/jamidht/accountarchive.h
similarity index 100%
rename from src/ringdht/accountarchive.h
rename to src/jamidht/accountarchive.h
diff --git a/src/ringdht/configkeys.h b/src/jamidht/configkeys.h
similarity index 100%
rename from src/ringdht/configkeys.h
rename to src/jamidht/configkeys.h
diff --git a/src/ringdht/eth/libdevcore/Address.h b/src/jamidht/eth/libdevcore/Address.h
similarity index 100%
rename from src/ringdht/eth/libdevcore/Address.h
rename to src/jamidht/eth/libdevcore/Address.h
diff --git a/src/ringdht/eth/libdevcore/Common.cpp b/src/jamidht/eth/libdevcore/Common.cpp
similarity index 100%
rename from src/ringdht/eth/libdevcore/Common.cpp
rename to src/jamidht/eth/libdevcore/Common.cpp
diff --git a/src/ringdht/eth/libdevcore/Common.h b/src/jamidht/eth/libdevcore/Common.h
similarity index 100%
rename from src/ringdht/eth/libdevcore/Common.h
rename to src/jamidht/eth/libdevcore/Common.h
diff --git a/src/ringdht/eth/libdevcore/CommonData.cpp b/src/jamidht/eth/libdevcore/CommonData.cpp
similarity index 100%
rename from src/ringdht/eth/libdevcore/CommonData.cpp
rename to src/jamidht/eth/libdevcore/CommonData.cpp
diff --git a/src/ringdht/eth/libdevcore/CommonData.h b/src/jamidht/eth/libdevcore/CommonData.h
similarity index 100%
rename from src/ringdht/eth/libdevcore/CommonData.h
rename to src/jamidht/eth/libdevcore/CommonData.h
diff --git a/src/ringdht/eth/libdevcore/FixedHash.cpp b/src/jamidht/eth/libdevcore/FixedHash.cpp
similarity index 100%
rename from src/ringdht/eth/libdevcore/FixedHash.cpp
rename to src/jamidht/eth/libdevcore/FixedHash.cpp
diff --git a/src/ringdht/eth/libdevcore/FixedHash.h b/src/jamidht/eth/libdevcore/FixedHash.h
similarity index 100%
rename from src/ringdht/eth/libdevcore/FixedHash.h
rename to src/jamidht/eth/libdevcore/FixedHash.h
diff --git a/src/ringdht/eth/libdevcore/Makefile.am b/src/jamidht/eth/libdevcore/Makefile.am
similarity index 100%
rename from src/ringdht/eth/libdevcore/Makefile.am
rename to src/jamidht/eth/libdevcore/Makefile.am
diff --git a/src/ringdht/eth/libdevcore/SHA3.cpp b/src/jamidht/eth/libdevcore/SHA3.cpp
similarity index 100%
rename from src/ringdht/eth/libdevcore/SHA3.cpp
rename to src/jamidht/eth/libdevcore/SHA3.cpp
diff --git a/src/ringdht/eth/libdevcore/SHA3.h b/src/jamidht/eth/libdevcore/SHA3.h
similarity index 100%
rename from src/ringdht/eth/libdevcore/SHA3.h
rename to src/jamidht/eth/libdevcore/SHA3.h
diff --git a/src/ringdht/eth/libdevcore/vector_ref.h b/src/jamidht/eth/libdevcore/vector_ref.h
similarity index 100%
rename from src/ringdht/eth/libdevcore/vector_ref.h
rename to src/jamidht/eth/libdevcore/vector_ref.h
diff --git a/src/ringdht/eth/libdevcrypto/Common.cpp b/src/jamidht/eth/libdevcrypto/Common.cpp
similarity index 100%
rename from src/ringdht/eth/libdevcrypto/Common.cpp
rename to src/jamidht/eth/libdevcrypto/Common.cpp
diff --git a/src/ringdht/eth/libdevcrypto/Common.h b/src/jamidht/eth/libdevcrypto/Common.h
similarity index 100%
rename from src/ringdht/eth/libdevcrypto/Common.h
rename to src/jamidht/eth/libdevcrypto/Common.h
diff --git a/src/ringdht/eth/libdevcrypto/Makefile.am b/src/jamidht/eth/libdevcrypto/Makefile.am
similarity index 74%
rename from src/ringdht/eth/libdevcrypto/Makefile.am
rename to src/jamidht/eth/libdevcrypto/Makefile.am
index 30ab35b3db..425659f877 100644
--- a/src/ringdht/eth/libdevcrypto/Makefile.am
+++ b/src/jamidht/eth/libdevcrypto/Makefile.am
@@ -1,6 +1,6 @@
include $(top_srcdir)/globals.mk
-AM_CPPFLAGS += -I$(top_srcdir)/src/ringdht/eth
+AM_CPPFLAGS += -I$(top_srcdir)/src/jamidht/eth
noinst_LTLIBRARIES = libdevcrypto.la
libdevcrypto_la_SOURCES = Common.cpp
diff --git a/src/ringdht/jamiaccount.cpp b/src/jamidht/jamiaccount.cpp
similarity index 100%
rename from src/ringdht/jamiaccount.cpp
rename to src/jamidht/jamiaccount.cpp
diff --git a/src/ringdht/jamiaccount.h b/src/jamidht/jamiaccount.h
similarity index 100%
rename from src/ringdht/jamiaccount.h
rename to src/jamidht/jamiaccount.h
diff --git a/src/ringdht/namedirectory.cpp b/src/jamidht/namedirectory.cpp
similarity index 100%
rename from src/ringdht/namedirectory.cpp
rename to src/jamidht/namedirectory.cpp
diff --git a/src/ringdht/namedirectory.h b/src/jamidht/namedirectory.h
similarity index 100%
rename from src/ringdht/namedirectory.h
rename to src/jamidht/namedirectory.h
diff --git a/src/ringdht/p2p.cpp b/src/jamidht/p2p.cpp
similarity index 100%
rename from src/ringdht/p2p.cpp
rename to src/jamidht/p2p.cpp
diff --git a/src/ringdht/p2p.h b/src/jamidht/p2p.h
similarity index 100%
rename from src/ringdht/p2p.h
rename to src/jamidht/p2p.h
diff --git a/src/ringdht/ringcontact.h b/src/jamidht/ringcontact.h
similarity index 100%
rename from src/ringdht/ringcontact.h
rename to src/jamidht/ringcontact.h
diff --git a/src/ringdht/sips_transport_ice.cpp b/src/jamidht/sips_transport_ice.cpp
similarity index 100%
rename from src/ringdht/sips_transport_ice.cpp
rename to src/jamidht/sips_transport_ice.cpp
diff --git a/src/ringdht/sips_transport_ice.h b/src/jamidht/sips_transport_ice.h
similarity index 100%
rename from src/ringdht/sips_transport_ice.h
rename to src/jamidht/sips_transport_ice.h
diff --git a/src/manager.cpp b/src/manager.cpp
index 2609b99cc7..f82ce65b87 100644
--- a/src/manager.cpp
+++ b/src/manager.cpp
@@ -40,7 +40,7 @@
#include "map_utils.h"
#include "account.h"
#include "string_utils.h"
-#include "ringdht/jamiaccount.h"
+#include "jamidht/jamiaccount.h"
#include <opendht/rng.h>
using random_device = dht::crypto::random_device;
diff --git a/src/sip/siptransport.cpp b/src/sip/siptransport.cpp
index 8883983e64..bfa574484a 100644
--- a/src/sip/siptransport.cpp
+++ b/src/sip/siptransport.cpp
@@ -25,7 +25,7 @@
#include "ice_transport.h"
#include "security/tls_session.h"
-#include "ringdht/sips_transport_ice.h"
+#include "jamidht/sips_transport_ice.h"
#include "array_size.h"
#include "compiler_intrinsics.h"
diff --git a/src/sip/sipvoiplink.cpp b/src/sip/sipvoiplink.cpp
index 8c16937804..47bd7e0ef9 100644
--- a/src/sip/sipvoiplink.cpp
+++ b/src/sip/sipvoiplink.cpp
@@ -32,7 +32,7 @@
#include "sipcall.h"
#include "sipaccount.h"
-#include "ringdht/jamiaccount.h"
+#include "jamidht/jamiaccount.h"
#include "manager.h"
--
GitLab