Changeset 8b863a62 in mainline for uspace/app/dnsres/dnsres.c

Timestamp:

2014-04-16T17:14:06Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

f857e8b

Parents:

dba3e2c (diff), 70b570c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

• uspace/app/dnsres/dnsres.c (modified) (1 diff)

uspace/app/dnsres/dnsres.c

@@ -39 +39 @@
 #include <stdlib.h>
 
-#define NAME "dnsres"
+#define NAME  "dnsres"
 
 static void print_syntax(void)
 {
-        printf("syntax: " NAME " <host-name>\n");
+        printf("Syntax: %s [-4|-6] <host-name>\n", NAME);
 }
 
 int main(int argc, char *argv[])
 {
-        int rc;
-        dnsr_hostinfo_t *hinfo;
-        char *hname;
-        char *saddr;
-
-        if (argc != 2) {
+        if ((argc < 2) || (argc > 3)) {
                 print_syntax();
                 return 1;
         }
-
-        hname = argv[1];
-
-        rc = dnsr_name2host(hname, &hinfo);
+        
+        uint16_t ver;
+        char *hname;
+        
+        if (str_cmp(argv[1], "-4") == 0) {
+                if (argc < 3) {
+                        print_syntax();
+                        return 1;
+                }
+                
+                ver = ip_v4;
+                hname = argv[2];
+        } else if (str_cmp(argv[1], "-6") == 0) {
+                if (argc < 3) {
+                        print_syntax();
+                        return 1;
+                }
+                
+                ver = ip_v6;
+                hname = argv[2];
+        } else {
+                ver = ip_any;
+                hname = argv[1];
+        }
+        
+        dnsr_hostinfo_t *hinfo;
+        int rc = dnsr_name2host(hname, &hinfo, ver);
         if (rc != EOK) {
-                printf(NAME ": Error resolving '%s'.\n", argv[1]);
-                return 1;
+                printf("%s: Error resolving '%s'.\n", NAME, hname);
+                return rc;
         }
-
+        
+        char *saddr;
         rc = inet_addr_format(&hinfo->addr, &saddr);
         if (rc != EOK) {
                 dnsr_hostinfo_destroy(hinfo);
-                printf(NAME ": Out of memory.\n");
-                return 1;
+                printf("%s: Error formatting address.\n", NAME);
+                return rc;
         }
-
+        
         printf("Host name: %s\n", hname);
+        
         if (str_cmp(hname, hinfo->cname) != 0)
                 printf("Canonical name: %s\n", hinfo->cname);
+        
         printf("Address: %s\n", saddr);
-
+        
         dnsr_hostinfo_destroy(hinfo);
         free(saddr);
-
+        
         return 0;
 }