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