Changeset cd18cd1 in mainline

Timestamp:

2013-07-19T14:40:24Z (11 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

330df83, a5756bc

Parents:

0aa70f4

Message:

add switches for IPv6-only and IPv4-only lookups

File:

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

uspace/app/dnsres/dnsres.c

@@ -36 +36 @@
 #include <inet/addr.h>
 #include <inet/dnsr.h>
+#include <net/socket_codes.h>
 #include <stdio.h>
 #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, 0);
+        
+        uint16_t af;
+        char *hname;
+        
+        if (str_cmp(argv[1], "-4") == 0) {
+                if (argc < 3) {
+                        print_syntax();
+                        return 1;
+                }
+                
+                af = AF_INET;
+                hname = argv[2];
+        } else if (str_cmp(argv[1], "-6") == 0) {
+                if (argc < 3) {
+                        print_syntax();
+                        return 1;
+                }
+                
+                af = AF_INET6;
+                hname = argv[2];
+        } else {
+                af = 0;
+                hname = argv[1];
+        }
+        
+        dnsr_hostinfo_t *hinfo;
+        int rc = dnsr_name2host(hname, &hinfo, af);
         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;
 }