Changes in uspace/app/ping/ping.c [a62ceaf:9749e47] in mainline

File:

• uspace/app/ping/ping.c (modified) (6 diffs)

uspace/app/ping/ping.c

@@ -37 +37 @@
 #include <errno.h>
 #include <fibril_synch.h>
+#include <inet/dnsr.h>
 #include <inet/addr.h>
-#include <inet/host.h>
 #include <inet/inetping.h>
 #include <io/console.h>
@@ -214 +214 @@
 int main(int argc, char *argv[])
 {
+        dnsr_hostinfo_t *hinfo = NULL;
         char *asrc = NULL;
         char *adest = NULL;
         char *sdest = NULL;
-        char *host;
-        const char *errmsg;
         ip_ver_t ip_ver = ip_any;
         
@@ -261 +260 @@
         }
         
-        host = argv[optind];
-        
-        /* Look up host */
-        rc = inet_host_plookup_one(host, ip_ver, &dest_addr, NULL, &errmsg);
-        if (rc != EOK) {
-                printf("Error resolving host '%s' (%s).\n", host, errmsg);
-                goto error;
+        /* Parse destination address */
+        rc = inet_addr_parse(argv[optind], &dest_addr);
+        if (rc != EOK) {
+                /* Try interpreting as a host name */
+                rc = dnsr_name2host(argv[optind], &hinfo, ip_ver);
+                if (rc != EOK) {
+                        printf("Error resolving host '%s'.\n", argv[optind]);
+                        goto error;
+                }
+                
+                dest_addr = hinfo->addr;
         }
         
@@ -289 +292 @@
         }
         
-        rc = asprintf(&sdest, "%s (%s)", host, adest);
-        if (rc < 0) {
-                printf("Out of memory.\n");
-                goto error;
+        if (hinfo != NULL) {
+                rc = asprintf(&sdest, "%s (%s)", hinfo->cname, adest);
+                if (rc < 0) {
+                        printf("Out of memory.\n");
+                        goto error;
+                }
+        } else {
+                sdest = adest;
+                adest = NULL;
         }
         
@@ -322 +330 @@
         free(adest);
         free(sdest);
+        dnsr_hostinfo_destroy(hinfo);
         return 0;
         
@@ -328 +337 @@
         free(adest);
         free(sdest);
+        dnsr_hostinfo_destroy(hinfo);
         return 1;
 }