更新libuv到1.46.0调试器支持ipv6

Author: CppCXY

CMakeLists.txt

@@ -2,10 +2,6 @@ cmake_minimum_required(VERSION 3.11)
 
 project (emmy)
 
-if (NOT CMAKE_INSTALL_PREFIX)
-    set(CMAKE_INSTALL_PREFIX install)
-endif()
-
 set(CMAKE_CXX_STANDARD 11)
 
 set(EMMY_LUA_VERSION "54" CACHE STRING "Lua version: jit/51/52/53/54")
@@ -45,7 +41,7 @@ if(EMMY_USE_LUA_SOURCE)
     endif()
 endif()
 
-add_subdirectory(third-party/libuv-1.29.0)
+add_subdirectory(third-party/libuv-1.46.0)
 add_subdirectory(emmy_debugger)
 add_subdirectory(emmy_core)
 

emmy_debugger/src/transporter/socket_client_transporter.cpp

@@ -56,10 +56,15 @@ int SocketClientTransporter::Stop() {
 }
 
 bool SocketClientTransporter::Connect(const std::string& host, int port, std::string& err) {
-	sockaddr_in addr{};
 	uvClient.data = this;
 	uv_tcp_init(loop, &uvClient);
-	uv_ip4_addr(host.c_str(), port, &addr);
+	struct sockaddr_storage addr;
+	uv_ip6_addr(host.c_str(), port, (struct sockaddr_in6 *) &addr);// 尝试使用IPv6地址
+
+	if (addr.ss_family == AF_UNSPEC) {
+		uv_ip4_addr(host.c_str(), port, (struct sockaddr_in *) &addr);// 如果失败，改用IPv4地址
+	}
+
 	connect_req.data = this;
 	const int r = uv_tcp_connect(&connect_req, &uvClient, reinterpret_cast<const struct sockaddr*>(&addr), OnConnectCB);
 	if (r) {

emmy_debugger/src/transporter/socket_server_transporter.cpp

@@ -46,10 +46,15 @@ SocketServerTransporter::~SocketServerTransporter() {
 }
 
 bool SocketServerTransporter::Listen(const std::string& host, int port, std::string& err) {
-	sockaddr_in addr{};
 	uvServer.data = this;
 	uv_tcp_init(loop, &uvServer);
-	uv_ip4_addr(host.c_str(), port, &addr);
+	struct sockaddr_storage addr;
+	uv_ip6_addr(host.c_str(), port, (struct sockaddr_in6 *) &addr);// 尝试使用IPv6地址
+
+	if (addr.ss_family == AF_UNSPEC) {
+		uv_ip4_addr(host.c_str(), port, (struct sockaddr_in *) &addr);// 如果失败，改用IPv4地址
+	}
+
 	uv_tcp_bind(&uvServer, reinterpret_cast<const struct sockaddr*>(&addr), 0);
 	const int r = uv_listen(reinterpret_cast<uv_stream_t*>(&uvServer), SOMAXCONN, on_new_connection);
 	if (r) {