Update: Merge branch 'jgrpp_master_cmake' into jgrpp_cmake

src/network/CMakeLists.txt

@@ -0,0 +1,28 @@
+add_subdirectory(core)
+
+add_files(
+    network.cpp
+    network.h
+    network_admin.cpp
+    network_admin.h
+    network_base.h
+    network_chat_gui.cpp
+    network_client.cpp
+    network_client.h
+    network_command.cpp
+    network_content.cpp
+    network_content.h
+    network_content_gui.cpp
+    network_content_gui.h
+    network_func.h
+    network_gamelist.cpp
+    network_gamelist.h
+    network_gui.cpp
+    network_gui.h
+    network_internal.h
+    network_server.cpp
+    network_server.h
+    network_type.h
+    network_udp.cpp
+    network_udp.h
+)

src/network/core/CMakeLists.txt

@@ -0,0 +1,27 @@
+add_files(
+    address.cpp
+    address.h
+    config.h
+    core.cpp
+    core.h
+    game.h
+    host.cpp
+    host.h
+    os_abstraction.h
+    packet.cpp
+    packet.h
+    tcp.cpp
+    tcp.h
+    tcp_admin.cpp
+    tcp_admin.h
+    tcp_connect.cpp
+    tcp_content.cpp
+    tcp_content.h
+    tcp_game.cpp
+    tcp_game.h
+    tcp_http.cpp
+    tcp_http.h
+    tcp_listen.h
+    udp.cpp
+    udp.h
+)

src/network/core/address.cpp

@@ -96,7 +96,6 @@ void NetworkAddress::GetAddressAsString(char *buffer, const char *last, bool wit
  * Get the address as a string, e.g. 127.0.0.1:12345.
  * @param with_family whether to add the family (e.g. IPvX).
  * @return the address
- * @note NOT thread safe
  */
 const char *NetworkAddressDumper::GetAddressAsString(NetworkAddress *addr, bool with_family)
 {

src/network/core/address.h

@@ -15,6 +15,8 @@
 #include "../../string_func.h"
 #include "../../core/smallmap_type.hpp"
 
+#include <string>
+
 class NetworkAddress;
 typedef std::vector<NetworkAddress> NetworkAddressList; ///< Type for a list of addresses.
 typedef SmallMap<NetworkAddress, SOCKET> SocketList;    ///< Type for a mapping between address and socket.
@@ -91,6 +93,7 @@ public:
 
 	const char *GetHostname();
 	void GetAddressAsString(char *buffer, const char *last, bool with_family = true);
+	std::string GetAddressAsString(bool with_family = true);
 	const sockaddr_storage *GetAddress();
 
 	/**