From 7ba8c232126b0887b6a3f0454aee2f01f824c4ef Mon Sep 17 00:00:00 2001
From: freemine <freemine@yeah.net>
Date: Sun, 7 Jun 2020 10:23:18 +0800
Subject: [PATCH] replace gethostbyname with getaddrinfo

---
 src/util/src/tsocket.c | 34 +++++++++++++++++++++++-----------
 1 file changed, 23 insertions(+), 11 deletions(-)

diff --git a/src/util/src/tsocket.c b/src/util/src/tsocket.c
index 86ae77b54c..00c8bba94e 100644
--- a/src/util/src/tsocket.c
+++ b/src/util/src/tsocket.c
@@ -24,25 +24,37 @@ int taosGetFqdn(char *fqdn) {
   hostname[1023] = '\0';
   gethostname(hostname, 1023);
 
-  struct hostent* h;
-  h = gethostbyname(hostname);
-  if (h != NULL) {
-    strcpy(fqdn, h->h_name);
+  struct addrinfo hints = {0};
+  struct addrinfo *result = NULL;
+
+  hints.ai_flags = AI_CANONNAME;
+
+  getaddrinfo(hostname, NULL, &hints, &result);
+  if (result) {
+    strcpy(fqdn, result->ai_canonname);
+    freeaddrinfo(result);
   } else {
-    uError("failed to get host name(%s)", strerror(errno));
     code = -1;
   }
 
-  // to do: free the resources
-  // free(h);
-
   return code;
 }
 
 uint32_t taosGetIpFromFqdn(const char *fqdn) {
-  struct hostent * record = gethostbyname(fqdn);
-  if(record == NULL) return -1;
-  return ((struct in_addr *)record->h_addr)->s_addr;
+  struct addrinfo hints = {0};
+  struct addrinfo *result = NULL;
+
+  getaddrinfo(fqdn, NULL, &hints, &result);
+  if (result) {
+    struct sockaddr *sa = result->ai_addr;
+    struct sockaddr_in *si = (struct sockaddr_in*)sa;
+    struct in_addr ia = si->sin_addr;
+    uint32_t ip = ia.s_addr;
+    freeaddrinfo(result);
+    return ip;
+  } else {
+    return -1;
+  }
 }
 
 // Function converting an IP address string to an unsigned int.