ice, tls: add logs
Change-Id: Ie0e79bf41803e256c1d6d300acfd6caf30079311
diff --git a/include/ice_transport.h b/include/ice_transport.h
index ca4b086..c5047b3 100644
--- a/include/ice_transport.h
+++ b/include/ice_transport.h
@@ -78,7 +78,7 @@
/**
* Constructor
*/
- IceTransport(std::string_view name);
+ IceTransport(std::string_view name, const std::shared_ptr<Logger>& logger = {});
~IceTransport();
const std::shared_ptr<Logger>& logger() const;
diff --git a/include/ice_transport_factory.h b/include/ice_transport_factory.h
index ecb04b0..03aef10 100644
--- a/include/ice_transport_factory.h
+++ b/include/ice_transport_factory.h
@@ -33,7 +33,7 @@
class IceTransportFactory
{
public:
- IceTransportFactory();
+ IceTransportFactory(const std::shared_ptr<Logger>& logger = {});
~IceTransportFactory();
std::shared_ptr<IceTransport> createTransport(std::string_view name);
@@ -50,6 +50,7 @@
private:
std::shared_ptr<pj_caching_pool> cp_;
pj_ice_strans_cfg ice_cfg_;
+ std::shared_ptr<Logger> logger_ {};
};
}; // namespace jami
diff --git a/src/ice_transport.cpp b/src/ice_transport.cpp
index 602347d..58e722d 100644
--- a/src/ice_transport.cpp
+++ b/src/ice_transport.cpp
@@ -95,7 +95,7 @@
class IceTransport::Impl
{
public:
- Impl(std::string_view name);
+ Impl(std::string_view name, const std::shared_ptr<Logger>& logger);
~Impl();
void initIceInstance(const IceTransportOptions& options);
@@ -327,8 +327,8 @@
//==============================================================================
-IceTransport::Impl::Impl(std::string_view name)
- : sessionName_(name)
+IceTransport::Impl::Impl(std::string_view name, const std::shared_ptr<Logger>& logger)
+ : logger_(logger), sessionName_(name)
{
if (logger_)
logger_->debug("[ice:{}] Creating IceTransport session for \"{:s}\"", fmt::ptr(this), name);
@@ -1161,8 +1161,8 @@
//==============================================================================
-IceTransport::IceTransport(std::string_view name)
- : pimpl_ {std::make_unique<Impl>(name)}
+IceTransport::IceTransport(std::string_view name, const std::shared_ptr<dht::log::Logger>& logger)
+ : pimpl_ {std::make_unique<Impl>(name, logger)}
{}
IceTransport::~IceTransport()
@@ -1795,13 +1795,14 @@
//==============================================================================
-IceTransportFactory::IceTransportFactory()
+IceTransportFactory::IceTransportFactory(const std::shared_ptr<Logger>& logger)
: cp_(new pj_caching_pool(),
[](pj_caching_pool* p) {
pj_caching_pool_destroy(p);
delete p;
})
, ice_cfg_()
+ , logger_(logger)
{
pj_caching_pool_init(cp_.get(), NULL, 0);
@@ -1826,7 +1827,7 @@
IceTransportFactory::createTransport(std::string_view name)
{
try {
- return std::make_shared<IceTransport>(name);
+ return std::make_shared<IceTransport>(name, logger_);
} catch (const std::exception& e) {
//JAMI_ERR("%s", e.what());
return nullptr;
@@ -1837,7 +1838,7 @@
IceTransportFactory::createUTransport(std::string_view name)
{
try {
- return std::make_unique<IceTransport>(name);
+ return std::make_unique<IceTransport>(name, logger_);
} catch (const std::exception& e) {
//JAMI_ERR("%s", e.what());
return nullptr;
diff --git a/tests/connectionManager.cpp b/tests/connectionManager.cpp
index ef843ef..a4e3759 100644
--- a/tests/connectionManager.cpp
+++ b/tests/connectionManager.cpp
@@ -197,7 +197,7 @@
//print the error;
}
});
- factory = std::make_unique<IceTransportFactory>();
+ factory = std::make_unique<IceTransportFactory>(logger);
alice = setupHandler("alice");
bob = setupHandler("bob");
}