From a78b98ac56a2aac2408e562bc9fe81225bd815a4 Mon Sep 17 00:00:00 2001 From: DcruBro Date: Tue, 18 Nov 2025 20:12:45 +0100 Subject: [PATCH] rename iptostring --- include/columnlynx/common/net/virtual_interface.hpp | 2 +- src/common/virtual_interface.cpp | 12 ++++++------ src/server/main.cpp | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/columnlynx/common/net/virtual_interface.hpp b/include/columnlynx/common/net/virtual_interface.hpp index 321b742..cf3d2d4 100644 --- a/include/columnlynx/common/net/virtual_interface.hpp +++ b/include/columnlynx/common/net/virtual_interface.hpp @@ -49,7 +49,7 @@ namespace ColumnLynx::Net { const std::string& getName() const; int getFd() const; // For ASIO integration (on POSIX) - static inline std::string ipToString(uint32_t ip) { + static inline std::string ipv4ToString(uint32_t ip) { struct in_addr addr; addr.s_addr = htonl(ip); diff --git a/src/common/virtual_interface.cpp b/src/common/virtual_interface.cpp index 369ffa6..42ad8bd 100644 --- a/src/common/virtual_interface.cpp +++ b/src/common/virtual_interface.cpp @@ -161,8 +161,8 @@ namespace ColumnLynx::Net { { char cmd[512]; - std::string ipStr = ipToString(clientIP); - std::string peerStr = ipToString(serverIP); + std::string ipStr = ipv4ToString(clientIP); + std::string peerStr = ipv4ToString(serverIP); snprintf(cmd, sizeof(cmd), "ip addr add %s/%d peer %s dev %s", @@ -184,8 +184,8 @@ namespace ColumnLynx::Net { { char cmd[512]; - std::string ipStr = ipToString(clientIP); - std::string peerStr = ipToString(serverIP); + std::string ipStr = ipv4ToString(clientIP); + std::string peerStr = ipv4ToString(serverIP); // Set netmask (/24 CIDR temporarily with raw command, improve later) snprintf(cmd, sizeof(cmd), @@ -206,8 +206,8 @@ namespace ColumnLynx::Net { { #ifdef _WIN32 char ip[32], gw[32]; - strcpy(ip, ipToString(clientIP).c_str()); - strcpy(gw, ipToString(serverIP).c_str()); + strcpy(ip, ipv4ToString(clientIP).c_str()); + strcpy(gw, ipv4ToString(serverIP).c_str()); char cmd[256]; snprintf(cmd, sizeof(cmd), diff --git a/src/server/main.cpp b/src/server/main.cpp index c32074e..75dff3b 100644 --- a/src/server/main.cpp +++ b/src/server/main.cpp @@ -107,7 +107,7 @@ int main(int argc, char** argv) { auto session = SessionRegistry::getInstance().getByIP(dstIP); if (!session) { - Utils::warn("TUN: No session found for destination IP " + VirtualInterface::ipToString(dstIP)); + Utils::warn("TUN: No session found for destination IP " + VirtualInterface::ipv4ToString(dstIP)); continue; }