refactor

markaren · Aug 9, 2024 · d102bb3 · d102bb3
1 parent ffd7f5a
commit d102bb3
Show file tree

Hide file tree

Showing 10 changed files with 27 additions and 25 deletions.
diff --git a/include/AvailablePortQuery.hpp b/include/AvailablePortQuery.hpp
diff --git a/include/port_query.hpp b/include/port_query.hpp
@@ -0,0 +1,9 @@
+
+#ifndef SIMPLE_SOCKET_PORT_QUERY_HPP
+#define SIMPLE_SOCKET_PORT_QUERY_HPP
+
+#include <vector>
+
+int getAvailablePort(int startPort, int endPort, const std::vector<int>& excludePorts = {});
+
+#endif//SIMPLE_SOCKET_PORT_QUERY_HPP
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -1,21 +1,23 @@
 
 set(sources
-        AvailablePortQuery.cpp
-        TCPSocket.cpp
-        UDPSocket.cpp
-        WebSocket.cpp
+        "port_query.cpp"
+        "TCPSocket.cpp"
+        "UDPSocket.cpp"
+        "WebSocket.cpp"
 )
 
-add_library(simple_socket ${sources})
+add_library(simple_socket "${sources}")
 target_compile_features(simple_socket PUBLIC "cxx_std_17")
 
 if (WIN32)
-    target_link_libraries(simple_socket ws2_32)
+    target_link_libraries(simple_socket "ws2_32")
 endif ()
 
 
 target_include_directories(simple_socket
         PUBLIC
         "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include>"
         "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
+        PRIVATE
+        "${CMAKE_CURRENT_SOURCE_DIR}"
 )
diff --git a/src/TCPSocket.cpp b/src/TCPSocket.cpp
@@ -1,7 +1,7 @@
 
 #include "TCPSocket.hpp"
 
-#include "SocketIncludes.hpp"
+#include "common.hpp"
 
 
 struct TCPSocket::Impl {

diff --git a/src/UDPSocket.cpp b/src/UDPSocket.cpp
@@ -1,7 +1,7 @@
 
 #include "UDPSocket.hpp"
 
-#include "SocketIncludes.hpp"
+#include "common.hpp"
 
 
 struct UDPSocket::Impl {

diff --git a/src/WebSocket.cpp b/src/WebSocket.cpp
@@ -1,8 +1,8 @@
 
 #include "WebSocket.hpp"
-#include "SocketIncludes.hpp"
 #include "TCPSocket.hpp"
 #include "WebSocketHandshake.hpp"
+#include "common.hpp"
 
 #include <algorithm>
 #include <atomic>

diff --git a/src/SocketIncludes.hpp → src/common.hpp b/src/SocketIncludes.hpp → src/common.hpp
@@ -1,6 +1,6 @@
 
-#ifndef SIMPLE_SOCKET_SOCKETINCLUDES_HPP
-#define SIMPLE_SOCKET_SOCKETINCLUDES_HPP
+#ifndef SIMPLE_SOCKET_COMMON_HPP
+#define SIMPLE_SOCKET_COMMON_HPP
 
 
 #ifdef _WIN32
@@ -42,4 +42,4 @@ inline void closeSocket(SOCKET socket) {
 }
 
 
-#endif//SIMPLE_SOCKET_SOCKETINCLUDES_HPP
+#endif//SIMPLE_SOCKET_COMMON_HPP
diff --git a/src/AvailablePortQuery.cpp → src/port_query.cpp b/src/AvailablePortQuery.cpp → src/port_query.cpp
@@ -1,7 +1,7 @@
 
-#include "AvailablePortQuery.hpp"
+#include "port_query.hpp"
 
-#include "SocketIncludes.hpp"
+#include "common.hpp"
 
 #include <algorithm>
 

diff --git a/tests/test_tcp.cpp b/tests/test_tcp.cpp
@@ -1,6 +1,6 @@
 
 #include "TCPSocket.hpp"
-#include "AvailablePortQuery.hpp"
+#include "port_query.hpp"
 
 #include <thread>
 #include <vector>

diff --git a/tests/test_udp.cpp b/tests/test_udp.cpp
@@ -1,6 +1,6 @@
 
 #include "UDPSocket.hpp"
-#include "AvailablePortQuery.hpp"
+#include "port_query.hpp"
 
 #include <catch2/catch_test_macros.hpp>