migrate to dhtnet namespace
Change-Id: I7143a010bd83e8cfa7a3c8c3072ed23f6f0ba8e3
diff --git a/include/certstore.h b/include/certstore.h
index 6a608ef..06b5dc1 100644
--- a/include/certstore.h
+++ b/include/certstore.h
@@ -40,7 +40,7 @@
}
}
-namespace jami {
+namespace dhtnet {
using Logger = dht::log::Logger;
namespace tls {
diff --git a/include/connectionmanager.h b/include/connectionmanager.h
index 5d2db50..38cd963 100644
--- a/include/connectionmanager.h
+++ b/include/connectionmanager.h
@@ -30,7 +30,7 @@
#include <vector>
#include <string>
-namespace jami {
+namespace dhtnet {
class ChannelSocket;
class ConnectionManager;
@@ -253,7 +253,7 @@
* UPnP IGD controller and the mutex to access it
*/
bool upnpEnabled;
- std::shared_ptr<jami::upnp::Controller> upnpCtrl;
+ std::shared_ptr<dhtnet::upnp::Controller> upnpCtrl;
std::shared_ptr<dht::log::Logger> logger;
diff --git a/include/diffie-hellman.h b/include/diffie-hellman.h
index e7f8429..56fc064 100644
--- a/include/diffie-hellman.h
+++ b/include/diffie-hellman.h
@@ -28,7 +28,7 @@
#include <cstdint>
#include <string>
-namespace jami {
+namespace dhtnet {
namespace tls {
class DhParams
diff --git a/include/fileutils.h b/include/fileutils.h
index 6264af6..c2dcdc9 100644
--- a/include/fileutils.h
+++ b/include/fileutils.h
@@ -39,7 +39,7 @@
#define DIR_SEPARATOR_STR_ESC "//*" // Escaped directory separator string
#endif
-namespace jami {
+namespace dhtnet {
namespace fileutils {
/**
diff --git a/include/generic_io.h b/include/generic_io.h
index cd8d0e9..db0ce33 100644
--- a/include/generic_io.h
+++ b/include/generic_io.h
@@ -29,7 +29,7 @@
using ssize_t = SSIZE_T;
#endif
-namespace jami {
+namespace dhtnet {
template<typename T>
class GenericSocket
diff --git a/include/ice_options.h b/include/ice_options.h
index e7aee6d..1bdc760 100644
--- a/include/ice_options.h
+++ b/include/ice_options.h
@@ -6,7 +6,7 @@
#include "ip_utils.h"
-namespace jami {
+namespace dhtnet {
namespace upnp {
class UPnPContext;
diff --git a/include/ice_transport.h b/include/ice_transport.h
index 2615939..8fc447d 100644
--- a/include/ice_transport.h
+++ b/include/ice_transport.h
@@ -38,7 +38,7 @@
}
}
-namespace jami {
+namespace dhtnet {
using Logger = dht::log::Logger;
diff --git a/include/ip_utils.h b/include/ip_utils.h
index c720aa1..f37e80a 100644
--- a/include/ip_utils.h
+++ b/include/ip_utils.h
@@ -59,7 +59,7 @@
#define INVALID_SOCKET (-1)
-namespace jami {
+namespace dhtnet {
/**
* Binary representation of an IP address.
diff --git a/include/multiplexed_socket.h b/include/multiplexed_socket.h
index 9e254bb..23c1ba1 100644
--- a/include/multiplexed_socket.h
+++ b/include/multiplexed_socket.h
@@ -34,7 +34,7 @@
}
}
-namespace jami {
+namespace dhtnet {
using Logger = dht::log::Logger;
class IceTransport;
@@ -358,4 +358,4 @@
} // namespace jami
-MSGPACK_ADD_ENUM(jami::ChannelRequestState);
+MSGPACK_ADD_ENUM(dhtnet::ChannelRequestState);
diff --git a/include/string_utils.h b/include/string_utils.h
index 75661a2..5d7e2eb 100644
--- a/include/string_utils.h
+++ b/include/string_utils.h
@@ -34,7 +34,7 @@
#include <WTypes.h>
#endif
-namespace jami {
+namespace dhtnet {
constexpr static const char TRUE_STR[] = "true";
constexpr static const char FALSE_STR[] = "false";
@@ -183,12 +183,12 @@
inline string
operator+(const string& s, const string_view& sv)
{
- return jami::concat(s, sv);
+ return dhtnet::concat(s, sv);
}
inline string
operator+(const string_view& sv, const string& s)
{
- return jami::concat(sv, s);
+ return dhtnet::concat(sv, s);
}
using svmatch = match_results<string_view::const_iterator>;
using svsub_match = sub_match<string_view::const_iterator>;
diff --git a/include/tls_session.h b/include/tls_session.h
index 4a4b994..19db4fc 100644
--- a/include/tls_session.h
+++ b/include/tls_session.h
@@ -46,7 +46,7 @@
} // namespace crypto
} // namespace dht
-namespace jami {
+namespace dhtnet {
namespace tls {
enum class TlsSessionState {
diff --git a/include/upnp/mapping.h b/include/upnp/mapping.h
index a781022..ebcbdaa 100644
--- a/include/upnp/mapping.h
+++ b/include/upnp/mapping.h
@@ -30,7 +30,7 @@
#include <mutex>
#include <memory>
-namespace jami {
+namespace dhtnet {
namespace upnp {
using sys_clock = std::chrono::system_clock;
diff --git a/include/upnp/upnp_context.h b/include/upnp/upnp_context.h
index b9a5d26..57b45d6 100644
--- a/include/upnp/upnp_context.h
+++ b/include/upnp/upnp_context.h
@@ -56,11 +56,11 @@
using IgdFoundCallback = std::function<void()>;
-namespace jami {
+namespace dhtnet {
class IpAddr;
}
-namespace jami {
+namespace dhtnet {
namespace upnp {
class UPnPProtocol;
diff --git a/include/upnp/upnp_control.h b/include/upnp/upnp_control.h
index e68cada..c9949b4 100644
--- a/include/upnp/upnp_control.h
+++ b/include/upnp/upnp_control.h
@@ -28,11 +28,11 @@
#include <memory>
#include <chrono>
-namespace jami {
+namespace dhtnet {
class IpAddr;
}
-namespace jami {
+namespace dhtnet {
namespace upnp {
class UPnPContext;
diff --git a/include/upnp/upnp_thread_util.h b/include/upnp/upnp_thread_util.h
index 6bc5271..564a6eb 100644
--- a/include/upnp/upnp_thread_util.h
+++ b/include/upnp/upnp_thread_util.h
@@ -13,7 +13,7 @@
/*JAMI_ERR() << "The calling thread " << getCurrentThread() \
<< " is not the expected thread: " << threadId_;*/
-namespace jami {
+namespace dhtnet {
namespace upnp {
class UpnpThreadUtil
diff --git a/src/connectionmanager.cpp b/src/connectionmanager.cpp
index f60b7d2..87fcae2 100644
--- a/src/connectionmanager.cpp
+++ b/src/connectionmanager.cpp
@@ -37,12 +37,12 @@
#include <charconv>
#include <fstream>
-namespace jami {
+namespace dhtnet {
static constexpr std::chrono::seconds DHT_MSG_TIMEOUT {30};
static constexpr uint64_t ID_MAX_VAL = 9007199254740992;
using ValueIdDist = std::uniform_int_distribution<dht::Value::Id>;
-using CallbackId = std::pair<jami::DeviceId, dht::Value::Id>;
+using CallbackId = std::pair<dhtnet::DeviceId, dht::Value::Id>;
struct ConnectionInfo
{
diff --git a/src/fileutils.cpp b/src/fileutils.cpp
index f3633ed..1067963 100644
--- a/src/fileutils.cpp
+++ b/src/fileutils.cpp
@@ -83,7 +83,7 @@
#define PIDFILE ".ring.pid"
#define ERASE_BLOCK 4096
-namespace jami {
+namespace dhtnet {
namespace fileutils {
// returns true if directory exists
@@ -169,10 +169,10 @@
#ifdef _WIN32
if (resolveSymlink) {
struct _stat64i32 s;
- if (_wstat(jami::to_wstring(path).c_str(), &s) == 0)
+ if (_wstat(dhtnet::to_wstring(path).c_str(), &s) == 0)
return S_ISREG(s.st_mode);
} else {
- DWORD attr = GetFileAttributes(jami::to_wstring(path).c_str());
+ DWORD attr = GetFileAttributes(dhtnet::to_wstring(path).c_str());
if ((attr != INVALID_FILE_ATTRIBUTES) && !(attr & FILE_ATTRIBUTE_DIRECTORY)
&& !(attr & FILE_ATTRIBUTE_REPARSE_POINT))
return true;
@@ -226,7 +226,7 @@
if (lstat(path.c_str(), &s) == 0)
return S_ISLNK(s.st_mode);
#elif !defined(_MSC_VER)
- DWORD attr = GetFileAttributes(jami::to_wstring(path).c_str());
+ DWORD attr = GetFileAttributes(dhtnet::to_wstring(path).c_str());
if (attr & FILE_ATTRIBUTE_REPARSE_POINT)
return true;
#endif
@@ -251,13 +251,13 @@
ext_params.dwSecurityQosFlags = SECURITY_ANONYMOUS;
ext_params.lpSecurityAttributes = nullptr;
ext_params.hTemplateFile = nullptr;
- HANDLE h = CreateFile2(jami::to_wstring(path).c_str(),
+ HANDLE h = CreateFile2(dhtnet::to_wstring(path).c_str(),
GENERIC_READ,
FILE_SHARE_READ,
OPEN_EXISTING,
&ext_params);
#elif _WIN32
- HANDLE h = CreateFileW(jami::to_wstring(path).c_str(),
+ HANDLE h = CreateFileW(dhtnet::to_wstring(path).c_str(),
GENERIC_READ,
FILE_SHARE_READ,
nullptr,
@@ -571,14 +571,14 @@
#ifndef _WIN32
if (mkdir(path.data(), mode) != 0) {
#else
- if (_wmkdir(jami::to_wstring(path.data()).c_str()) != 0) {
+ if (_wmkdir(dhtnet::to_wstring(path.data()).c_str()) != 0) {
#endif
if (errno == ENOENT) {
recursive_mkdir(path.substr(0, path.find_last_of(DIR_SEPARATOR_CH)), mode);
#ifndef _WIN32
if (mkdir(path.data(), mode) != 0) {
#else
- if (_wmkdir(jami::to_wstring(path.data()).c_str()) != 0) {
+ if (_wmkdir(dhtnet::to_wstring(path.data()).c_str()) != 0) {
#endif
//JAMI_ERR("Could not create directory.");
return false;
@@ -712,7 +712,7 @@
#ifdef _WIN32
// use Win32 api since std::remove will not unlink directory in use
if (isDirectory(path))
- return !RemoveDirectory(jami::to_wstring(path).c_str());
+ return !RemoveDirectory(dhtnet::to_wstring(path).c_str());
#endif
return std::remove(path.c_str());
@@ -737,7 +737,7 @@
openStream(std::ifstream& file, const std::string& path, std::ios_base::openmode mode)
{
#ifdef _WIN32
- file.open(jami::to_wstring(path), mode);
+ file.open(dhtnet::to_wstring(path), mode);
#else
file.open(path, mode);
#endif
@@ -747,7 +747,7 @@
openStream(std::ofstream& file, const std::string& path, std::ios_base::openmode mode)
{
#ifdef _WIN32
- file.open(jami::to_wstring(path), mode);
+ file.open(dhtnet::to_wstring(path), mode);
#else
file.open(path, mode);
#endif
@@ -757,7 +757,7 @@
ifstream(const std::string& path, std::ios_base::openmode mode)
{
#ifdef _WIN32
- return std::ifstream(jami::to_wstring(path), mode);
+ return std::ifstream(dhtnet::to_wstring(path), mode);
#else
return std::ifstream(path, mode);
#endif
@@ -767,7 +767,7 @@
ofstream(const std::string& path, std::ios_base::openmode mode)
{
#ifdef _WIN32
- return std::ofstream(jami::to_wstring(path), mode);
+ return std::ofstream(dhtnet::to_wstring(path), mode);
#else
return std::ofstream(path, mode);
#endif
@@ -845,7 +845,7 @@
accessFile(const std::string& file, int mode)
{
#ifdef _WIN32
- return _waccess(jami::to_wstring(file).c_str(), mode);
+ return _waccess(dhtnet::to_wstring(file).c_str(), mode);
#else
return access(file.c_str(), mode);
#endif
diff --git a/src/ice_socket.h b/src/ice_socket.h
index 795185d..5692a7c 100644
--- a/src/ice_socket.h
+++ b/src/ice_socket.h
@@ -29,7 +29,7 @@
using ssize_t = SSIZE_T;
#endif
-namespace jami {
+namespace dhtnet {
class IceTransport;
using IceRecvCb = std::function<ssize_t(unsigned char* buf, size_t len)>;
diff --git a/src/ice_transport.cpp b/src/ice_transport.cpp
index 1271649..b47353b 100644
--- a/src/ice_transport.cpp
+++ b/src/ice_transport.cpp
@@ -61,7 +61,7 @@
throw std::runtime_error("Invalid component ID " + (std::to_string(compId))); \
} while (0)
-namespace jami {
+namespace dhtnet {
static constexpr unsigned STUN_MAX_PACKET_SIZE {8192};
static constexpr uint16_t IPV6_HEADER_SIZE = 40; ///< Size in bytes of IPV6 packet header
@@ -1766,7 +1766,7 @@
ICESDP res;
int nr = 0;
- for (std::string_view line; jami::getline(sdp_msg, line); nr++) {
+ for (std::string_view line; dhtnet::getline(sdp_msg, line); nr++) {
if (nr == 0) {
res.rem_ufrag = line;
} else if (nr == 1) {
diff --git a/src/ice_transport_factory.h b/src/ice_transport_factory.h
index 97a2194..0292192 100644
--- a/src/ice_transport_factory.h
+++ b/src/ice_transport_factory.h
@@ -31,7 +31,7 @@
#include <memory>
#include <vector>
-namespace jami {
+namespace dhtnet {
class IceTransportFactory
{
diff --git a/src/ip_utils.cpp b/src/ip_utils.cpp
index 0b2ded5..2d8f098 100644
--- a/src/ip_utils.cpp
+++ b/src/ip_utils.cpp
@@ -50,7 +50,7 @@
#endif
#endif
-namespace jami {
+namespace dhtnet {
std::string_view
sip_strerror(pj_status_t code)
diff --git a/src/multiplexed_socket.cpp b/src/multiplexed_socket.cpp
index dd6c298..faf680e 100644
--- a/src/multiplexed_socket.cpp
+++ b/src/multiplexed_socket.cpp
@@ -51,7 +51,7 @@
MSGPACK_DEFINE_MAP(v)
};
-namespace jami {
+namespace dhtnet {
using clock = std::chrono::steady_clock;
using time_point = clock::time_point;
diff --git a/src/peer_connection.cpp b/src/peer_connection.cpp
index 0b4ede5..8b6b8a9 100644
--- a/src/peer_connection.cpp
+++ b/src/peer_connection.cpp
@@ -49,7 +49,7 @@
static constexpr int ICE_COMP_ID_SIP_TRANSPORT {1};
-namespace jami {
+namespace dhtnet {
int
init_crt(gnutls_session_t session, dht::crypto::Certificate& crt)
diff --git a/src/peer_connection.h b/src/peer_connection.h
index 3798f0c..484562a 100644
--- a/src/peer_connection.h
+++ b/src/peer_connection.h
@@ -43,7 +43,7 @@
} // namespace crypto
} // namespace dht
-namespace jami {
+namespace dhtnet {
namespace tls {
class DhParams;
}
diff --git a/src/security/certstore.cpp b/src/security/certstore.cpp
index acaa07d..f9876ef 100644
--- a/src/security/certstore.cpp
+++ b/src/security/certstore.cpp
@@ -33,7 +33,7 @@
#include <sstream>
#include <fmt/format.h>
-namespace jami {
+namespace dhtnet {
namespace tls {
CertificateStore::CertificateStore(const std::string& path, std::shared_ptr<Logger> logger)
@@ -290,7 +290,7 @@
if (logger_) logger_->d("CertificateStore: loaded %zu certificates from %s.", certs.size(), path.c_str());
if (cb)
cb(ids);
- //emitSignal<libjami::ConfigurationSignal::CertificatePathPinned>(path, ids);
+ //emitSignal<libdhtnet::ConfigurationSignal::CertificatePathPinned>(path, ids);
});
}
@@ -363,7 +363,7 @@
}
}
//for (const auto& id : ids)
- // emitSignal<libjami::ConfigurationSignal::CertificatePinned>(id);
+ // emitSignal<libdhtnet::ConfigurationSignal::CertificatePinned>(id);
return ids;
}
@@ -471,9 +471,9 @@
TrustStore::PermissionStatus
TrustStore::statusFromStr(const char* str)
{
- if (!std::strcmp(str, libjami::Certificate::Status::ALLOWED))
+ if (!std::strcmp(str, libdhtnet::Certificate::Status::ALLOWED))
return PermissionStatus::ALLOWED;
- if (!std::strcmp(str, libjami::Certificate::Status::BANNED))
+ if (!std::strcmp(str, libdhtnet::Certificate::Status::BANNED))
return PermissionStatus::BANNED;
return PermissionStatus::UNDEFINED;
}
@@ -483,19 +483,19 @@
{
switch (s) {
case PermissionStatus::ALLOWED:
- return libjami::Certificate::Status::ALLOWED;
+ return libdhtnet::Certificate::Status::ALLOWED;
case PermissionStatus::BANNED:
- return libjami::Certificate::Status::BANNED;
+ return libdhtnet::Certificate::Status::BANNED;
case PermissionStatus::UNDEFINED:
default:
- return libjami::Certificate::Status::UNDEFINED;
+ return libdhtnet::Certificate::Status::UNDEFINED;
}
}
TrustStatus
trustStatusFromStr(const char* str)
{
- if (!std::strcmp(str, libjami::Certificate::TrustStatus::TRUSTED))
+ if (!std::strcmp(str, libdhtnet::Certificate::TrustStatus::TRUSTED))
return TrustStatus::TRUSTED;
return TrustStatus::UNTRUSTED;
}
@@ -505,10 +505,10 @@
{
switch (s) {
case TrustStatus::TRUSTED:
- return libjami::Certificate::TrustStatus::TRUSTED;
+ return libdhtnet::Certificate::TrustStatus::TRUSTED;
case TrustStatus::UNTRUSTED:
default:
- return libjami::Certificate::TrustStatus::UNTRUSTED;
+ return libdhtnet::Certificate::TrustStatus::UNTRUSTED;
}
}
diff --git a/src/security/diffie-hellman.cpp b/src/security/diffie-hellman.cpp
index dfe1d75..450a7a0 100644
--- a/src/security/diffie-hellman.cpp
+++ b/src/security/diffie-hellman.cpp
@@ -25,7 +25,7 @@
#include <chrono>
#include <ciso646>
-namespace jami {
+namespace dhtnet {
namespace tls {
DhParams::DhParams(const std::vector<uint8_t>& data)
diff --git a/src/security/security_const.h b/src/security/security_const.h
index fb9541b..0160e36 100644
--- a/src/security/security_const.h
+++ b/src/security/security_const.h
@@ -19,7 +19,7 @@
*/
#pragma once
-namespace libjami {
+namespace libdhtnet {
namespace Certificate {
@@ -118,4 +118,4 @@
constexpr static char TLS_CIPHER[] = "TLS_CIPHER";
} // namespace TlsTransport
-} // namespace libjami
+} // namespace libdhtnet
diff --git a/src/security/threadloop.cpp b/src/security/threadloop.cpp
index 88db725..5db493e 100644
--- a/src/security/threadloop.cpp
+++ b/src/security/threadloop.cpp
@@ -22,7 +22,7 @@
#include <ciso646> // fix windows compiler bug
-namespace jami {
+namespace dhtnet {
void
ThreadLoop::mainloop(std::thread::id& tid,
diff --git a/src/security/threadloop.h b/src/security/threadloop.h
index 8a7a0c6..de4e475 100644
--- a/src/security/threadloop.h
+++ b/src/security/threadloop.h
@@ -30,7 +30,7 @@
#include <opendht/logger.h>
-namespace jami {
+namespace dhtnet {
struct ThreadLoopException : public std::runtime_error
{
diff --git a/src/security/tls_session.cpp b/src/security/tls_session.cpp
index e84d277..94078a3 100644
--- a/src/security/tls_session.cpp
+++ b/src/security/tls_session.cpp
@@ -47,7 +47,7 @@
#include <cstdlib>
#include <unistd.h>
-namespace jami {
+namespace dhtnet {
namespace tls {
static constexpr const char* DTLS_CERT_PRIORITY_STRING {
diff --git a/src/sip_utils.h b/src/sip_utils.h
index 6460b70..453344e 100644
--- a/src/sip_utils.h
+++ b/src/sip_utils.h
@@ -33,7 +33,7 @@
#include <pjsip/sip_endpoint.h>
#include <pjsip/sip_dialog.h>
-namespace jami {
+namespace dhtnet {
namespace sip_utils {
using namespace std::literals;
diff --git a/src/string_utils.cpp b/src/string_utils.cpp
index 934ff23..3ab4359 100644
--- a/src/string_utils.cpp
+++ b/src/string_utils.cpp
@@ -40,7 +40,7 @@
#include <ciso646> // fix windows compiler bug
-namespace jami {
+namespace dhtnet {
#ifdef _WIN32
std::wstring
diff --git a/src/transport/peer_channel.h b/src/transport/peer_channel.h
index 5f25123..a2a910f 100644
--- a/src/transport/peer_channel.h
+++ b/src/transport/peer_channel.h
@@ -23,7 +23,7 @@
#include <deque>
#include <algorithm>
-namespace jami {
+namespace dhtnet {
class PeerChannel
{
diff --git a/src/upnp/protocol/igd.cpp b/src/upnp/protocol/igd.cpp
index 862e908..e816fb8 100644
--- a/src/upnp/protocol/igd.cpp
+++ b/src/upnp/protocol/igd.cpp
@@ -23,7 +23,7 @@
#include "igd.h"
//#include "logger.h"
-namespace jami {
+namespace dhtnet {
namespace upnp {
IGD::IGD(NatProtocolType proto)
diff --git a/src/upnp/protocol/igd.h b/src/upnp/protocol/igd.h
index 4ed9ed3..7e1d211 100644
--- a/src/upnp/protocol/igd.h
+++ b/src/upnp/protocol/igd.h
@@ -30,7 +30,7 @@
typedef uint16_t in_port_t;
#endif
-namespace jami {
+namespace dhtnet {
namespace upnp {
enum class NatProtocolType { UNKNOWN, PUPNP, NAT_PMP };
diff --git a/src/upnp/protocol/mapping.cpp b/src/upnp/protocol/mapping.cpp
index bb09441..9b285e9 100644
--- a/src/upnp/protocol/mapping.cpp
+++ b/src/upnp/protocol/mapping.cpp
@@ -24,7 +24,7 @@
// #include "logger.h"
#include "igd.h"
-namespace jami {
+namespace dhtnet {
namespace upnp {
Mapping::Mapping(PortType type, uint16_t portExternal, uint16_t portInternal, bool available)
diff --git a/src/upnp/protocol/natpmp/nat_pmp.cpp b/src/upnp/protocol/natpmp/nat_pmp.cpp
index 68dfee0..8f04a19 100644
--- a/src/upnp/protocol/natpmp/nat_pmp.cpp
+++ b/src/upnp/protocol/natpmp/nat_pmp.cpp
@@ -23,7 +23,7 @@
#if HAVE_LIBNATPMP
-namespace jami {
+namespace dhtnet {
namespace upnp {
NatPmp::NatPmp()
diff --git a/src/upnp/protocol/natpmp/nat_pmp.h b/src/upnp/protocol/natpmp/nat_pmp.h
index 68fd28b..1ecf90e 100644
--- a/src/upnp/protocol/natpmp/nat_pmp.h
+++ b/src/upnp/protocol/natpmp/nat_pmp.h
@@ -37,11 +37,11 @@
#include <atomic>
#include <thread>
-namespace jami {
+namespace dhtnet {
class IpAddr;
}
-namespace jami {
+namespace dhtnet {
namespace upnp {
// Requested lifetime in seconds. The actual lifetime might be different.
diff --git a/src/upnp/protocol/natpmp/pmp_igd.cpp b/src/upnp/protocol/natpmp/pmp_igd.cpp
index ac8b698..41f25dd 100644
--- a/src/upnp/protocol/natpmp/pmp_igd.cpp
+++ b/src/upnp/protocol/natpmp/pmp_igd.cpp
@@ -24,7 +24,7 @@
#include <algorithm>
-namespace jami {
+namespace dhtnet {
namespace upnp {
PMPIGD::PMPIGD()
diff --git a/src/upnp/protocol/natpmp/pmp_igd.h b/src/upnp/protocol/natpmp/pmp_igd.h
index a70e7ee..b627462 100644
--- a/src/upnp/protocol/natpmp/pmp_igd.h
+++ b/src/upnp/protocol/natpmp/pmp_igd.h
@@ -31,7 +31,7 @@
#include <chrono>
#include <functional>
-namespace jami {
+namespace dhtnet {
namespace upnp {
class PMPIGD : public IGD
diff --git a/src/upnp/protocol/pupnp/pupnp.cpp b/src/upnp/protocol/pupnp/pupnp.cpp
index 6ea5563..4df8621 100644
--- a/src/upnp/protocol/pupnp/pupnp.cpp
+++ b/src/upnp/protocol/pupnp/pupnp.cpp
@@ -26,7 +26,7 @@
#include <opendht/thread_pool.h>
#include <opendht/http.h>
-namespace jami {
+namespace dhtnet {
namespace upnp {
// Action identifiers.
diff --git a/src/upnp/protocol/pupnp/pupnp.h b/src/upnp/protocol/pupnp/pupnp.h
index a77f30f..7c5939c 100644
--- a/src/upnp/protocol/pupnp/pupnp.h
+++ b/src/upnp/protocol/pupnp/pupnp.h
@@ -53,11 +53,11 @@
#include <memory>
#include <future>
-namespace jami {
+namespace dhtnet {
class IpAddr;
}
-namespace jami {
+namespace dhtnet {
namespace upnp {
class PUPnP : public UPnPProtocol
diff --git a/src/upnp/protocol/pupnp/upnp_igd.cpp b/src/upnp/protocol/pupnp/upnp_igd.cpp
index 2f8a332..18be2d4 100644
--- a/src/upnp/protocol/pupnp/upnp_igd.cpp
+++ b/src/upnp/protocol/pupnp/upnp_igd.cpp
@@ -22,7 +22,7 @@
#include "upnp_igd.h"
-namespace jami {
+namespace dhtnet {
namespace upnp {
UPnPIGD::UPnPIGD(std::string&& UDN,
diff --git a/src/upnp/protocol/pupnp/upnp_igd.h b/src/upnp/protocol/pupnp/upnp_igd.h
index 2ad213b..da6b400 100644
--- a/src/upnp/protocol/pupnp/upnp_igd.h
+++ b/src/upnp/protocol/pupnp/upnp_igd.h
@@ -32,7 +32,7 @@
#include <chrono>
#include <functional>
-namespace jami {
+namespace dhtnet {
namespace upnp {
class UPnPIGD : public IGD
diff --git a/src/upnp/protocol/upnp_protocol.h b/src/upnp/protocol/upnp_protocol.h
index 048f385..9ab8339 100644
--- a/src/upnp/protocol/upnp_protocol.h
+++ b/src/upnp/protocol/upnp_protocol.h
@@ -32,7 +32,7 @@
#include <condition_variable>
#include <list>
-namespace jami {
+namespace dhtnet {
namespace upnp {
// UPnP device descriptions.
diff --git a/src/upnp/upnp_context.cpp b/src/upnp/upnp_context.cpp
index a36e56f..35fdb50 100644
--- a/src/upnp/upnp_context.cpp
+++ b/src/upnp/upnp_context.cpp
@@ -26,7 +26,7 @@
#include <asio/steady_timer.hpp>
#include <fmt/std.h>
-namespace jami {
+namespace dhtnet {
namespace upnp {
constexpr static auto MAP_UPDATE_INTERVAL = std::chrono::seconds(30);
diff --git a/src/upnp/upnp_control.cpp b/src/upnp/upnp_control.cpp
index bba37d3..2c7f07a 100644
--- a/src/upnp/upnp_control.cpp
+++ b/src/upnp/upnp_control.cpp
@@ -23,7 +23,7 @@
#include "upnp/upnp_control.h"
#include "upnp/upnp_context.h"
-namespace jami {
+namespace dhtnet {
namespace upnp {
Controller::Controller(const std::shared_ptr<UPnPContext>& ctx)
diff --git a/tests/certstore.cpp b/tests/certstore.cpp
index 7d6b75f..43967c6 100644
--- a/tests/certstore.cpp
+++ b/tests/certstore.cpp
@@ -25,7 +25,7 @@
#include "test_runner.h"
#include "certstore.h"
-namespace jami {
+namespace dhtnet {
namespace test {
class CertStoreTest : public CppUnit::TestFixture
@@ -85,26 +85,26 @@
// Test certificate status
auto certAllowed = aliceAccount->accountManager()->getCertificatesByStatus(
- jami::tls::TrustStore::PermissionStatus::ALLOWED);
+ dhtnet::tls::TrustStore::PermissionStatus::ALLOWED);
CPPUNIT_ASSERT(
std::find_if(certAllowed.begin(), certAllowed.end(), [&](auto v) { return v == id; })
== certAllowed.end());
CPPUNIT_ASSERT(aliceAccount->accountManager()->getCertificateStatus(id)
- == jami::tls::TrustStore::PermissionStatus::UNDEFINED);
- aliceAccount->setCertificateStatus(ca.second, jami::tls::TrustStore::PermissionStatus::ALLOWED);
+ == dhtnet::tls::TrustStore::PermissionStatus::UNDEFINED);
+ aliceAccount->setCertificateStatus(ca.second, dhtnet::tls::TrustStore::PermissionStatus::ALLOWED);
certAllowed = aliceAccount->accountManager()->getCertificatesByStatus(
- jami::tls::TrustStore::PermissionStatus::ALLOWED);
+ dhtnet::tls::TrustStore::PermissionStatus::ALLOWED);
CPPUNIT_ASSERT(
std::find_if(certAllowed.begin(), certAllowed.end(), [&](auto v) { return v == id; })
!= certAllowed.end());
CPPUNIT_ASSERT(aliceAccount->accountManager()->getCertificateStatus(id)
- == jami::tls::TrustStore::PermissionStatus::ALLOWED);
- aliceAccount->setCertificateStatus(ca.second, jami::tls::TrustStore::PermissionStatus::UNDEFINED);
+ == dhtnet::tls::TrustStore::PermissionStatus::ALLOWED);
+ aliceAccount->setCertificateStatus(ca.second, dhtnet::tls::TrustStore::PermissionStatus::UNDEFINED);
CPPUNIT_ASSERT(aliceAccount->accountManager()->getCertificateStatus(id)
- == jami::tls::TrustStore::PermissionStatus::UNDEFINED);
- aliceAccount->setCertificateStatus(ca.second, jami::tls::TrustStore::PermissionStatus::ALLOWED);
+ == dhtnet::tls::TrustStore::PermissionStatus::UNDEFINED);
+ aliceAccount->setCertificateStatus(ca.second, dhtnet::tls::TrustStore::PermissionStatus::ALLOWED);
CPPUNIT_ASSERT(aliceAccount->accountManager()->getCertificateStatus(id)
- == jami::tls::TrustStore::PermissionStatus::ALLOWED);
+ == dhtnet::tls::TrustStore::PermissionStatus::ALLOWED);
// Test getPinnedCertificates
pinned = aliceAccount->certStore().getPinnedCertificates();
@@ -126,44 +126,44 @@
CPPUNIT_ASSERT(aliceAccount->accountManager()->isAllowed(*device.second));
// Ban device
- aliceAccount->setCertificateStatus(device.second, jami::tls::TrustStore::PermissionStatus::BANNED);
+ aliceAccount->setCertificateStatus(device.second, dhtnet::tls::TrustStore::PermissionStatus::BANNED);
CPPUNIT_ASSERT(aliceAccount->accountManager()->getCertificateStatus(device.second->getId().toString())
- == jami::tls::TrustStore::PermissionStatus::BANNED);
+ == dhtnet::tls::TrustStore::PermissionStatus::BANNED);
CPPUNIT_ASSERT(aliceAccount->accountManager()->getCertificateStatus(id)
- == jami::tls::TrustStore::PermissionStatus::ALLOWED);
+ == dhtnet::tls::TrustStore::PermissionStatus::ALLOWED);
CPPUNIT_ASSERT(aliceAccount->accountManager()->isAllowed(*ca.second));
CPPUNIT_ASSERT(aliceAccount->accountManager()->isAllowed(*account.second));
CPPUNIT_ASSERT(not aliceAccount->accountManager()->isAllowed(*device.second));
// Ban account
- aliceAccount->setCertificateStatus(account.second, jami::tls::TrustStore::PermissionStatus::BANNED);
+ aliceAccount->setCertificateStatus(account.second, dhtnet::tls::TrustStore::PermissionStatus::BANNED);
CPPUNIT_ASSERT(aliceAccount->accountManager()->getCertificateStatus(account.second->getId().toString())
- == jami::tls::TrustStore::PermissionStatus::BANNED);
+ == dhtnet::tls::TrustStore::PermissionStatus::BANNED);
CPPUNIT_ASSERT(aliceAccount->accountManager()->isAllowed(*ca.second));
CPPUNIT_ASSERT(not aliceAccount->accountManager()->isAllowed(*account.second));
CPPUNIT_ASSERT(not aliceAccount->accountManager()->isAllowed(*device2.second));
// Unban account
aliceAccount->setCertificateStatus(account.second,
- jami::tls::TrustStore::PermissionStatus::ALLOWED);
+ dhtnet::tls::TrustStore::PermissionStatus::ALLOWED);
CPPUNIT_ASSERT(aliceAccount->accountManager()->getCertificateStatus(account.second->getId().toString())
- == jami::tls::TrustStore::PermissionStatus::ALLOWED);
+ == dhtnet::tls::TrustStore::PermissionStatus::ALLOWED);
CPPUNIT_ASSERT(aliceAccount->accountManager()->isAllowed(*ca.second));
CPPUNIT_ASSERT(aliceAccount->accountManager()->isAllowed(*account.second));
CPPUNIT_ASSERT(aliceAccount->accountManager()->isAllowed(*device2.second));
// Ban CA
- aliceAccount->setCertificateStatus(ca.second, jami::tls::TrustStore::PermissionStatus::BANNED);
+ aliceAccount->setCertificateStatus(ca.second, dhtnet::tls::TrustStore::PermissionStatus::BANNED);
CPPUNIT_ASSERT(aliceAccount->accountManager()->getCertificateStatus(ca.second->getId().toString())
- == jami::tls::TrustStore::PermissionStatus::BANNED);
+ == dhtnet::tls::TrustStore::PermissionStatus::BANNED);
CPPUNIT_ASSERT(not aliceAccount->accountManager()->isAllowed(*ca.second));
CPPUNIT_ASSERT(not aliceAccount->accountManager()->isAllowed(*account.second));
CPPUNIT_ASSERT(not aliceAccount->accountManager()->isAllowed(*device2.second));
- aliceAccount->setCertificateStatus(ca.second, jami::tls::TrustStore::PermissionStatus::BANNED);
+ aliceAccount->setCertificateStatus(ca.second, dhtnet::tls::TrustStore::PermissionStatus::BANNED);
CPPUNIT_ASSERT(aliceAccount->accountManager()->getCertificateStatus(ca.second->getId().toString())
- == jami::tls::TrustStore::PermissionStatus::BANNED);
+ == dhtnet::tls::TrustStore::PermissionStatus::BANNED);
// Test unpin
aliceAccount->certStore().unpinCertificate(id);
@@ -172,11 +172,11 @@
== pinned.end());
// Test statusToStr
- CPPUNIT_ASSERT(strcmp(jami::tls::statusToStr(jami::tls::TrustStatus::TRUSTED),
- libjami::Certificate::TrustStatus::TRUSTED)
+ CPPUNIT_ASSERT(strcmp(dhtnet::tls::statusToStr(dhtnet::tls::TrustStatus::TRUSTED),
+ libdhtnet::Certificate::TrustStatus::TRUSTED)
== 0);
- CPPUNIT_ASSERT(strcmp(jami::tls::statusToStr(jami::tls::TrustStatus::UNTRUSTED),
- libjami::Certificate::TrustStatus::UNTRUSTED)
+ CPPUNIT_ASSERT(strcmp(dhtnet::tls::statusToStr(dhtnet::tls::TrustStatus::UNTRUSTED),
+ libdhtnet::Certificate::TrustStatus::UNTRUSTED)
== 0);*/
}
@@ -206,4 +206,4 @@
} // namespace test
} // namespace jami
-JAMI_TEST_RUNNER(jami::test::CertStoreTest::name());
+JAMI_TEST_RUNNER(dhtnet::test::CertStoreTest::name());
diff --git a/tests/connectionManager.cpp b/tests/connectionManager.cpp
index 504f49f..90321f8 100644
--- a/tests/connectionManager.cpp
+++ b/tests/connectionManager.cpp
@@ -28,7 +28,7 @@
using namespace std::literals::chrono_literals;
-namespace jami {
+namespace dhtnet {
namespace test {
class ConnectionManagerTest : public CppUnit::TestFixture
@@ -1274,4 +1274,4 @@
} // namespace test
} // namespace jami
-JAMI_TEST_RUNNER(jami::test::ConnectionManagerTest::name())
+JAMI_TEST_RUNNER(dhtnet::test::ConnectionManagerTest::name())
diff --git a/tests/testFileutils.cpp b/tests/testFileutils.cpp
index ba95e33..34ca646 100644
--- a/tests/testFileutils.cpp
+++ b/tests/testFileutils.cpp
@@ -29,7 +29,7 @@
#include <cstdlib>
#include <unistd.h>
-namespace jami { namespace fileutils { namespace test {
+namespace dhtnet { namespace fileutils { namespace test {
class FileutilsTest : public CppUnit::TestFixture {
public:
@@ -150,7 +150,7 @@
CPPUNIT_ASSERT(removeAll(NON_EXISTANT_PATH_BASE) == 0);
}
-}}} // namespace jami::test::fileutils
+}}} // namespace dhtnet::test::fileutils
-JAMI_TEST_RUNNER(jami::fileutils::test::FileutilsTest::name());
+JAMI_TEST_RUNNER(dhtnet::fileutils::test::FileutilsTest::name());
diff --git a/tests/testString_utils.cpp b/tests/testString_utils.cpp
index ba4b163..60c1363 100644
--- a/tests/testString_utils.cpp
+++ b/tests/testString_utils.cpp
@@ -29,7 +29,7 @@
using namespace std::literals;
-namespace jami {
+namespace dhtnet {
namespace test {
class StringUtilsTest : public CppUnit::TestFixture
@@ -89,10 +89,10 @@
StringUtilsTest::to_number_test()
{
// test with int
- CPPUNIT_ASSERT(jami::stoi(PI_42) == INT);
+ CPPUNIT_ASSERT(dhtnet::stoi(PI_42) == INT);
// test with double
- CPPUNIT_ASSERT(jami::stod(PI_DOUBLE) == DOUBLE);
+ CPPUNIT_ASSERT(dhtnet::stod(PI_DOUBLE) == DOUBLE);
}
void
@@ -111,7 +111,7 @@
std::string_view line;
split_string_result.clear();
- while (jami::getline(data, line, '*')) {
+ while (dhtnet::getline(data, line, '*')) {
split_string_result.emplace_back(line);
}
CPPUNIT_ASSERT(split_string_result.size() == 2);
@@ -122,4 +122,4 @@
} // namespace test
} // namespace jami
-JAMI_TEST_RUNNER(jami::test::StringUtilsTest::name());
+JAMI_TEST_RUNNER(dhtnet::test::StringUtilsTest::name());