From 6de3f884747373be66c4492ae5ab4f6d1aaf5494 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Thu, 6 Jul 2023 12:56:29 -0400
Subject: [PATCH] split ice_transport/ice_transport_factory
Change-Id: I9b06786da37773bb57c199dd7b7f94f1f58af27d
---
CMakeLists.txt | 1 +
{src => include}/ice_transport.h | 31 +++--------------
src/connectionmanager.cpp | 1 +
src/ice_transport.cpp | 1 +
src/ice_transport_factory.h | 58 ++++++++++++++++++++++++++++++++
src/security/tls_session.cpp | 2 +-
6 files changed, 66 insertions(+), 28 deletions(-)
rename {src => include}/ice_transport.h (88%)
create mode 100644 src/ice_transport_factory.h
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 31c3947..7086126 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -43,6 +43,7 @@ list (APPEND dhtnet_HEADERS
include/tls_session.h
include/certstore.h
include/ice_options.h
+ include/ice_transport.h
include/fileutils.h
include/string_utils.h
include/ip_utils.h
diff --git a/src/ice_transport.h b/include/ice_transport.h
similarity index 88%
rename from src/ice_transport.h
rename to include/ice_transport.h
index 0bf6432..2615939 100644
--- a/src/ice_transport.h
+++ b/include/ice_transport.h
@@ -21,18 +21,17 @@
#pragma once
#include "ice_options.h"
-#include "ice_socket.h"
#include "ip_utils.h"
-#include <pjnath.h>
-#include <pjlib.h>
-#include <pjlib-util.h>
-
#include <functional>
#include <memory>
#include <msgpack.hpp>
#include <vector>
+extern "C" {
+struct pj_ice_sess_cand;
+}
+
namespace dht {
namespace log {
class Logger;
@@ -194,26 +193,4 @@ private:
std::unique_ptr<Impl> pimpl_;
};
-class IceTransportFactory
-{
-public:
- IceTransportFactory();
- ~IceTransportFactory();
-
- std::shared_ptr<IceTransport> createTransport(std::string_view name);
-
- std::unique_ptr<IceTransport> createUTransport(std::string_view name);
-
- /**
- * PJSIP specifics
- */
- pj_ice_strans_cfg getIceCfg() const { return ice_cfg_; }
- pj_pool_factory* getPoolFactory() { return &cp_->factory; }
- std::shared_ptr<pj_caching_pool> getPoolCaching() { return cp_; }
-
-private:
- std::shared_ptr<pj_caching_pool> cp_;
- pj_ice_strans_cfg ice_cfg_;
-};
-
}; // namespace jami
diff --git a/src/connectionmanager.cpp b/src/connectionmanager.cpp
index 5313096..f60b7d2 100644
--- a/src/connectionmanager.cpp
+++ b/src/connectionmanager.cpp
@@ -17,6 +17,7 @@
*/
#include "connectionmanager.h"
#include "peer_connection.h"
+#include "ice_transport_factory.h"
#include "upnp/upnp_control.h"
#include "certstore.h"
#include "fileutils.h"
diff --git a/src/ice_transport.cpp b/src/ice_transport.cpp
index ff0b51f..1271649 100644
--- a/src/ice_transport.cpp
+++ b/src/ice_transport.cpp
@@ -19,6 +19,7 @@
*/
#include "ice_transport.h"
+#include "ice_transport_factory.h"
#include "ice_socket.h"
#include "sip_utils.h"
#include "string_utils.h"
diff --git a/src/ice_transport_factory.h b/src/ice_transport_factory.h
new file mode 100644
index 0000000..97a2194
--- /dev/null
+++ b/src/ice_transport_factory.h
@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2004-2023 Savoir-faire Linux Inc.
+ *
+ * Author: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#pragma once
+
+#include "ice_options.h"
+#include "ip_utils.h"
+
+#include <pjnath.h>
+#include <pjlib.h>
+#include <pjlib-util.h>
+
+#include <functional>
+#include <memory>
+#include <vector>
+
+namespace jami {
+
+class IceTransportFactory
+{
+public:
+ IceTransportFactory();
+ ~IceTransportFactory();
+
+ std::shared_ptr<IceTransport> createTransport(std::string_view name);
+
+ std::unique_ptr<IceTransport> createUTransport(std::string_view name);
+
+ /**
+ * PJSIP specifics
+ */
+ pj_ice_strans_cfg getIceCfg() const { return ice_cfg_; }
+ pj_pool_factory* getPoolFactory() { return &cp_->factory; }
+ std::shared_ptr<pj_caching_pool> getPoolCaching() { return cp_; }
+
+private:
+ std::shared_ptr<pj_caching_pool> cp_;
+ pj_ice_strans_cfg ice_cfg_;
+};
+
+}; // namespace jami
diff --git a/src/security/tls_session.cpp b/src/security/tls_session.cpp
index 43f623d..e84d277 100644
--- a/src/security/tls_session.cpp
+++ b/src/security/tls_session.cpp
@@ -1269,7 +1269,7 @@ TlsSession::TlsSessionImpl::handleStateHandshake(TlsSessionState state)
} else if (cred != GNUTLS_CRD_CERTIFICATE) {
if (params_.logger)
- params_.logger->error("[TLS] spurious session credential ({})", cred);
+ params_.logger->error("[TLS] spurious session credential ({})", (int)cred);
return TlsSessionState::SHUTDOWN;
}
--
GitLab