Changeset a62ceaf in mainline for uspace/app/ping/ping.c

Timestamp:

2016-02-29T19:19:19Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

129b92c6

Parents:

5147ff1

Message:

Need better interfaces for handling internet host and host:port specifications.

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;
         
@@ -260 +261 @@
         }
         
-        /* 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;
+        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;
         }
         
@@ -292 +289 @@
         }
         
-        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;
+        rc = asprintf(&sdest, "%s (%s)", host, adest);
+        if (rc < 0) {
+                printf("Out of memory.\n");
+                goto error;
         }
         
@@ -330 +322 @@
         free(adest);
         free(sdest);
-        dnsr_hostinfo_destroy(hinfo);
         return 0;
         
@@ -337 +328 @@
         free(adest);
         free(sdest);
-        dnsr_hostinfo_destroy(hinfo);
         return 1;
 }