Merge pull request #7 from Kilemonn/add-localhostname-arg-to-server-socket-constructor

Add localhostname arg to server socket constructor

Author: Kilemonn

CMakeLists.txt

@@ -4,7 +4,7 @@ set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(PROJECT_NAME CppSocketLibrary)
 
-project(${PROJECT_NAME} VERSION 0.5.1)
+project(${PROJECT_NAME} VERSION 0.5.2)
 
 set(HEADERS
         src/serversocket/ServerSocket.h

src/serversocket/ServerSocket.cpp

@@ -52,7 +52,7 @@ namespace kt
      * @throw SocketException - If the ServerSocket is unable to be instanciated or begin listening.
      * @throw BindingException - If the ServerSocket is unable to bind to the specific port specified.
      */
-    kt::ServerSocket::ServerSocket(const kt::SocketType type, const unsigned short& port, const unsigned int& connectionBacklogSize, const kt::InternetProtocolVersion protocolVersion)
+    kt::ServerSocket::ServerSocket(const kt::SocketType type, const std::optional<std::string>& localHostname, const unsigned short& port, const unsigned int& connectionBacklogSize, const kt::InternetProtocolVersion protocolVersion)
     {
         this->socketDescriptor = getInvalidSocketValue();
         this->port = port;
@@ -64,7 +64,7 @@ namespace kt
             throw SocketException("Failed to create ServerSocket with 'None' SocketType.");
         }
 
-        this->constructSocket(connectionBacklogSize);
+        this->constructSocket(localHostname, connectionBacklogSize);
     }
 
     /**
@@ -99,11 +99,11 @@ namespace kt
         return *this;
     }
 
-    void kt::ServerSocket::constructSocket(const unsigned int& connectionBacklogSize)
+    void kt::ServerSocket::constructSocket(const std::optional<std::string>& localHostname, const unsigned int& connectionBacklogSize)
     {
         if (this->type == kt::SocketType::Wifi)
         {
-            this->constructWifiSocket(connectionBacklogSize);
+            this->constructWifiSocket(localHostname, connectionBacklogSize);
         }
         else if (this->type == kt::SocketType::Bluetooth)
         {
@@ -170,7 +170,7 @@ namespace kt
 
     }
 
-    void kt::ServerSocket::constructWifiSocket(const unsigned int& connectionBacklogSize)
+    void kt::ServerSocket::constructWifiSocket(const std::optional<std::string>& localHostname, const unsigned int& connectionBacklogSize)
     {
 
 #ifdef _WIN32
@@ -182,7 +182,7 @@ namespace kt
 #endif
 
         addrinfo hints = kt::createTcpHints(this->protocolVersion, AI_PASSIVE);
-        std::pair<std::vector<kt::SocketAddress>, int> resolveAddresses = kt::resolveToAddresses(kt::getLocalAddress(protocolVersion), this->port, hints);
+        std::pair<std::vector<kt::SocketAddress>, int> resolveAddresses = kt::resolveToAddresses(localHostname.has_value() ? localHostname.value().c_str() : kt::getLocalAddress(protocolVersion), this->port, hints);
 
         if (resolveAddresses.second != 0 || resolveAddresses.first.empty())
         {

src/serversocket/ServerSocket.h

@@ -48,14 +48,14 @@ namespace kt
 			SOCKET socketDescriptor = getInvalidSocketValue();
 
 			void setDiscoverable();
-			void constructSocket(const unsigned int&);
+			void constructSocket(const std::optional<std::string>&, const unsigned int&);
 			void constructBluetoothSocket(const unsigned int&);
-			void constructWifiSocket(const unsigned int&);
+			void constructWifiSocket(const std::optional<std::string>& localHostname, const unsigned int&);
 			void initialisePortNumber();
 
 		public:
 			ServerSocket() = default;
-			ServerSocket(const kt::SocketType, const unsigned short& = 0, const unsigned int& = 20, const kt::InternetProtocolVersion = kt::InternetProtocolVersion::Any);
+			ServerSocket(const kt::SocketType, const std::optional<std::string>& = std::nullopt, const unsigned short& = 0, const unsigned int& = 20, const kt::InternetProtocolVersion = kt::InternetProtocolVersion::Any);
 			ServerSocket(const kt::ServerSocket&);
 			kt::ServerSocket& operator=(const kt::ServerSocket&);
 

tests/serversocket/ServerSocketTCPTest.cpp

@@ -39,7 +39,7 @@ namespace kt
     TEST_F(ServerSocketTCPTest, TestConstructors)
     {
         EXPECT_THROW({
-            ServerSocket server2(SocketType::Wifi, serverSocket.getPort());
+            ServerSocket server2(SocketType::Wifi, std::nullopt, serverSocket.getPort());
         }, BindingException);
     }
 
@@ -83,7 +83,7 @@ namespace kt
      */
     TEST_F(ServerSocketTCPTest, TestServerSocketAsIPV6)
     {
-        ServerSocket ipv6Server(SocketType::Wifi, 0, 20, InternetProtocolVersion::IPV6);
+        ServerSocket ipv6Server(SocketType::Wifi, std::nullopt, 0, 20, InternetProtocolVersion::IPV6);
 
         TCPSocket client("0000:0000:0000:0000:0000:0000:0000:0001", ipv6Server.getPort());
         TCPSocket serverClient = ipv6Server.acceptTCPConnection();
@@ -105,7 +105,7 @@ namespace kt
     {
         serverSocket.close();
 
-        ServerSocket ipv4Server(SocketType::Wifi, 0, 20, InternetProtocolVersion::IPV4);
+        ServerSocket ipv4Server(SocketType::Wifi, std::nullopt, 0, 20, InternetProtocolVersion::IPV4);
         ASSERT_EQ(InternetProtocolVersion::IPV4, ipv4Server.getInternetProtocolVersion());
 
         // Attempt to connect to a local server using a IPV6 address (which is not being hosted)

tests/socket/TCPSocketTest.cpp

@@ -23,7 +23,7 @@ namespace kt
         TCPSocket socket;
 
     protected:
-        TCPSocketTest() : serverSocket(SocketType::Wifi, 0), socket(LOCALHOST, serverSocket.getPort()) { }
+        TCPSocketTest() : serverSocket(SocketType::Wifi), socket(LOCALHOST, serverSocket.getPort()) { }
         void TearDown() override
         {
             socket.close();
@@ -297,7 +297,7 @@ namespace kt
 
     TEST_F(TCPSocketTest, IPV6Address)
     {
-        ServerSocket ipv6ServerSocket(SocketType::Wifi, 0, 20, InternetProtocolVersion::IPV6);
+        ServerSocket ipv6ServerSocket(SocketType::Wifi, std::nullopt, 0, 20, InternetProtocolVersion::IPV6);
 
         TCPSocket ipv6Socket("0:0:0:0:0:0:0:1", ipv6ServerSocket.getPort());