From: Aaron Lipinski <aaron.lipinski@roboticsplus.co.nz>
Date: Tue, 6 Apr 2021 04:12:36 +0000 (+1200)
Subject: remove conversion function
X-Git-Tag: v0.95~6^2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5a45ca9cc2fb5d1e0d85b7421b938ee01204ab7e;p=thirdparty%2Fmtr.git

remove conversion function
---

diff --git a/ui/mtr.c b/ui/mtr.c
index 253861b..8edca64 100644
--- a/ui/mtr.c
+++ b/ui/mtr.c
@@ -696,31 +696,6 @@ static void init_rand(
     srand((getpid() << 16) ^ getuid() ^ tv.tv_sec ^ tv.tv_usec);
 }
 
-static int convert_addrinfo_to_hostent(struct hostent *host, struct addrinfo *res)
-{
-    host->h_name = res->ai_canonname;
-    host->h_aliases = NULL;
-    host->h_addrtype = res->ai_family;
-    host->h_length = res->ai_addrlen;
-    switch (res->ai_family) {
-    case AF_INET:
-        host->h_addr_list[0] = (char*)&((struct sockaddr_in *)res->ai_addr)->sin_addr;
-        break;
-#ifdef ENABLE_IPV6
-    case AF_INET6:
-        host->h_addr_list[0] = (char*)&((struct sockaddr_in6 *)res->ai_addr)->sin6_addr;
-        break;
-#endif
-    default:
-        error(0, 0, "unknown address type");
-
-        errno = EINVAL;
-        return -1;
-    }
-    host->h_addr_list[1] = NULL;
-    return 0;
-}
-
 /*
     For historical reasons, we need a hostent structure to represent
     our remote target for probing.  The obsolete way of doing this
@@ -759,9 +734,6 @@ int main(
     int argc,
     char **argv)
 {
-    char *alptr[2];
-    struct hostent trhost = { .h_addr_list = alptr };
-    struct hostent *host = &trhost;
     names_t *names_head = NULL;
     names_t *names_walk;
 
@@ -831,9 +803,7 @@ int main(
         }
 
         struct addrinfo *res = NULL;
-        if (get_hostent_from_name(&ctl, &res, ctl.Hostname) != 0 ||
-            /* Convert the first addrinfo into a hostent. */
-            convert_addrinfo_to_hostent(host, res) != 0) {
+        if (get_hostent_from_name(&ctl, &res, ctl.Hostname) != 0) {
             if (ctl.Interactive)
                 exit(EXIT_FAILURE);
             else {