From 80c14e142b6ed3b5bcf80e4a6d8266d85b538aa2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Tue, 18 Jul 2023 16:13:15 -0400
Subject: [PATCH] build ip utils
Change-Id: Ie4a7482794298204b6137ea8367cb183fdbc23d2
---
CMakeLists.txt | 3 ++-
src/ip_utils.cpp | 9 +++++----
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5da7472..08c248f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,6 +36,7 @@ list (APPEND dhtnet_SOURCES
src/peer_connection.cpp
src/string_utils.cpp
src/fileutils.cpp
+ src/ip_utils.cpp
src/security/tls_session.cpp
src/security/certstore.cpp
src/security/threadloop.cpp
@@ -46,7 +47,7 @@ list (APPEND dhtnet_SOURCES
src/upnp/protocol/mapping.cpp
src/upnp/upnp_context.cpp
src/upnp/upnp_control.cpp
- src/upnp/protocol/igd.cpp
+ src/upnp/protocol/igd.cpp
)
list (APPEND dhtnet_HEADERS
diff --git a/src/ip_utils.cpp b/src/ip_utils.cpp
index e3fd748..8bda174 100644
--- a/src/ip_utils.cpp
+++ b/src/ip_utils.cpp
@@ -15,9 +15,10 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
#include "ip_utils.h"
-#include "logger.h"
+#include "sip_utils.h"
+#include "string_utils.h"
-#include "connectivity/sip_utils.h"
+#include <fmt/format.h>
#include <sys/types.h>
#include <unistd.h>
@@ -52,7 +53,7 @@ std::string_view
sip_strerror(pj_status_t code)
{
thread_local char err_msg[PJ_ERR_MSG_SIZE];
- return as_view(pj_strerror(code, err_msg, sizeof err_msg));
+ return sip_utils::as_view(pj_strerror(code, err_msg, sizeof err_msg));
}
@@ -185,7 +186,7 @@ ip_utils::getGateway(char* localHost, ip_utils::subnet_mask prefix)
std::vector<std::string_view> tokens = split_string(localHostStr, '.');
// Build a gateway address from the individual ip components.
for (unsigned i = 0; i <= (unsigned) prefix; i++)
- defaultGw += tokens[i] + ".";
+ defaultGw = fmt::format("{:s}{:s}.", defaultGw, tokens[i]);
for (unsigned i = (unsigned) ip_utils::subnet_mask::prefix_32bit;
i > (unsigned) prefix + 1;
i--)
--
GitLab