ip: make -resolve addr to print names rather than addresses

As a system admin I occasionally want to be able to check that all
interfaces has a name in DNS or /etc/hosts file.

Signed-off-by: Sami Kerola <kerolasa@iki.fi>

diff --git a/ip/ipaddress.c b/ip/ipaddress.c
index 1c3e4da0d0dae050c50a6b99d74af3f2d46d7adc..d02eaaf89a2c3cd96c3f4e63f81a9b9b4daa5971 100644 (file)
--- a/ip/ipaddress.c
+++ b/ip/ipaddress.c
@@ -636,7 +636,7 @@ int print_addrinfo(const struct sockaddr_nl *who, struct nlmsghdr *n,
                fprintf(fp, "    family %d ", ifa->ifa_family);
 
        if (rta_tb[IFA_LOCAL]) {
-               fprintf(fp, "%s", rt_addr_n2a(ifa->ifa_family,
+               fprintf(fp, "%s", format_host(ifa->ifa_family,
                                              RTA_PAYLOAD(rta_tb[IFA_LOCAL]),
                                              RTA_DATA(rta_tb[IFA_LOCAL]),
                                              abuf, sizeof(abuf)));
@@ -647,7 +647,7 @@ int print_addrinfo(const struct sockaddr_nl *who, struct nlmsghdr *n,
                        fprintf(fp, "/%d ", ifa->ifa_prefixlen);
                } else {
                        fprintf(fp, " peer %s/%d ",
-                               rt_addr_n2a(ifa->ifa_family,
+                               format_host(ifa->ifa_family,
                                            RTA_PAYLOAD(rta_tb[IFA_ADDRESS]),
                                            RTA_DATA(rta_tb[IFA_ADDRESS]),
                                            abuf, sizeof(abuf)),
@@ -657,14 +657,14 @@ int print_addrinfo(const struct sockaddr_nl *who, struct nlmsghdr *n,
 
        if (rta_tb[IFA_BROADCAST]) {
                fprintf(fp, "brd %s ",
-                       rt_addr_n2a(ifa->ifa_family,
+                       format_host(ifa->ifa_family,
                                    RTA_PAYLOAD(rta_tb[IFA_BROADCAST]),
                                    RTA_DATA(rta_tb[IFA_BROADCAST]),
                                    abuf, sizeof(abuf)));
        }
        if (rta_tb[IFA_ANYCAST]) {
                fprintf(fp, "any %s ",
-                       rt_addr_n2a(ifa->ifa_family,
+                       format_host(ifa->ifa_family,
                                    RTA_PAYLOAD(rta_tb[IFA_ANYCAST]),
                                    RTA_DATA(rta_tb[IFA_ANYCAST]),
                                    abuf, sizeof(abuf)));