enh: add support for IPv6 dual-stack in transport layer and related tests (#34370)

Author: yihaoDeng

source/libs/transport/CMakeLists.txt

@@ -45,3 +45,8 @@ if(${BUILD_WITH_UV_TRANS})
     add_definitions(-DUSE_UV)
   endif(${BUILD_WITH_UV})
 endif(${BUILD_WITH_UV_TRANS})
+
+
+# if(${BUILD_TEST})
+#     add_subdirectory(test)
+# endif(${BUILD_TEST})

source/libs/transport/src/transCli.c

@@ -1691,7 +1691,7 @@ int32_t cliBatchSend(SCliConn* pConn, int8_t direct) {
     if (pReq->pCont == 0) {
       pReq->pCont = (void*)rpcMallocCont(0);
       if (pReq->pCont == NULL) {
-        return TSDB_CODE_OUT_OF_MEMORY;
+        return terrno;
       }
       pReq->contLen = 0;
     }
@@ -2143,12 +2143,9 @@ static FORCE_INLINE int32_t cliGetIpFromFqdnCache(SHashObj* cache, char* fqdn, S
       code = TSDB_CODE_RPC_FQDN_ERROR;
       tError("ipv6Enable(%d), failed to get ip from fqdn:%s since %s", enableIpv6, fqdn, tstrerror(code));
       return code;
-    } else {
-      if (enableIpv6 && ipAddr.type != 1) {
-        tWarn("get ipv4 addr from fqdn:%s, but ipv6 is enabled", fqdn);
-        return TSDB_CODE_RPC_FQDN_ERROR;
-      }
     }
+    // when enableIpv6=1, both IPv4 and IPv6 addresses are accepted
+    // taosGetIpFromFqdn uses AF_UNSPEC and returns first available address
     if ((code = taosHashPut(cache, fqdn, len, &ipAddr, sizeof(ipAddr)) != 0)) {
       return code;
     }

source/libs/transport/src/transSvr.c

@@ -1611,11 +1611,25 @@ void uvGetSockInfo(struct sockaddr* addr, SIpAddr* ip) {
   } else if (addr->sa_family == AF_INET6) {
     struct sockaddr_in6* addr_in = (struct sockaddr_in6*)addr;
     ip->port = ntohs(addr_in->sin6_port);
-    if (inet_ntop(AF_INET6, &addr_in->sin6_addr, ip->ipv6, INET6_ADDRSTRLEN) == NULL) {
-      uInfo("failed to convert ipv6 address");
+
+    // Check for IPv4-mapped IPv6 address (::ffff:x.x.x.x)
+    if (IN6_IS_ADDR_V4MAPPED(&addr_in->sin6_addr)) {
+      // Convert IPv4-mapped IPv6 address to IPv4
+      struct in_addr ipv4_addr;
+      memcpy(&ipv4_addr, ((const uint8_t*)&addr_in->sin6_addr) + 12, sizeof(ipv4_addr));
+      if (inet_ntop(AF_INET, &ipv4_addr, ip->ipv4, INET_ADDRSTRLEN) == NULL) {
+        uInfo("failed to convert ipv4-mapped ipv6 address to ipv4");
+      }
+      ip->type = 0;
+      ip->mask = 32;
+    } else {
+      // Pure IPv6 address
+      if (inet_ntop(AF_INET6, &addr_in->sin6_addr, ip->ipv6, INET6_ADDRSTRLEN) == NULL) {
+        uInfo("failed to convert ipv6 address");
+      }
+      ip->type = 1;
+      ip->mask = 128;
     }
-    ip->type = 1;
-    ip->mask = 128;
   }
 }
 void uvOnConnectionCb(uv_stream_t* q, ssize_t nread, const uv_buf_t* buf) {
@@ -1859,11 +1873,21 @@ static int32_t addHandleToAcceptloop(void* arg) {
       return TSDB_CODE_THIRDPARTY_ERROR;
     }
 
-    if ((code = uv_tcp_bind(&srv->server, (const struct sockaddr*)&bind_addr, 1)) != 0) {
+    if ((code = uv_tcp_bind(&srv->server, (const struct sockaddr*)&bind_addr, 0)) != 0) {
       tError("failed to bind since %s", uv_err_name(code));
       return TSDB_CODE_THIRDPARTY_ERROR;
     }
-    tInfo("bind to ipv6 addr");
+
+    // set IPV6_V6ONLY to 0 to allow both IPv4 and IPv6 connections
+    uv_os_fd_t fd;
+    if ((code = uv_fileno((const uv_handle_t*)&srv->server, &fd)) == 0) {
+      int opt = 0;
+      if (setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &opt, sizeof(opt)) < 0) {
+        tWarn("failed to set IPV6_V6ONLY=0: %s, continue with default setting", strerror(errno));
+      } else {
+        tInfo("successfully set IPV6_V6ONLY=0 (dual-stack enabled)");
+      }
+    }
   } else {
     struct sockaddr_in bind_addr;
     if ((code = uv_ip4_addr("0.0.0.0", srv->port, &bind_addr)) != 0) {

source/libs/transport/test/CMakeLists.txt

@@ -1,6 +1,7 @@
 add_executable(transportTest "")
 add_executable(transUT "")
 add_executable(transUT2 "")
+add_executable(transUTIPv6 "")
 add_executable(svrBench "")
 add_executable(cliBench "")
 add_executable(httpBench "")
@@ -14,6 +15,10 @@ target_sources(transUT2
   PRIVATE
   "transUT2.cpp"
 )
+target_sources(transUTIPv6
+  PRIVATE
+  "transUTIPv6.cpp"
+)
 target_sources(transportTest
   PRIVATE
   "transportTests.cpp"
@@ -75,6 +80,21 @@ target_include_directories(transUT2
   "${CMAKE_CURRENT_SOURCE_DIR}/../inc"
 )
 
+
+DEP_ext_gtest(transUTIPv6)
+target_link_libraries(transUTIPv6 PRIVATE
+  os
+  util
+  common
+  transport
+)
+
+target_include_directories(transUTIPv6
+  PUBLIC
+  "${TD_SOURCE_DIR}/include/libs/transport"
+  "${CMAKE_CURRENT_SOURCE_DIR}/../inc"
+)
+
 target_include_directories(svrBench
   PUBLIC
   "${TD_SOURCE_DIR}/include/libs/transport"
@@ -125,3 +145,7 @@ add_test(
   NAME transUtilUt
   COMMAND transportTest
 )
+add_test(
+  NAME transUTIPv6
+  COMMAND transUTIPv6
+)

source/libs/transport/test/transUT2.cpp

@@ -618,7 +618,7 @@ TEST_F(TransEnv, http) {
 #if 1
     STelemAddrMgmt mgt;
     taosTelemetryMgtInit(&mgt, "telemetry.taosdata.com");
-    int32_t code = taosSendTelemReport(&mgt,tsTelemUri, tsTelemPort, "test", strlen("test"),HTTP_FLAT); 
+    code = taosSendTelemReport(&mgt, tsTelemUri, tsTelemPort, "test", strlen("test"), HTTP_FLAT);
     printf("old addr:%s new addr:%s\n",mgt.defaultAddr, mgt.cachedAddr); 
 
     taosMsleep(2000);