Changeset 0773396 in mainline for uspace/app/dnsres/dnsres.c

Timestamp:

2013-12-25T13:05:25Z (10 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

bc54126c

Parents:

f4a47e52 (diff), 6946f23 (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) (4 diffs)

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>
@@ -54 +53 @@
         }
         
-        uint16_t af;
+        uint16_t ver;
         char *hname;
         
@@ -63 +62 @@
                 }
                 
-                af = AF_INET;
+                ver = ip_v4;
                 hname = argv[2];
         } else if (str_cmp(argv[1], "-6") == 0) {
@@ -71 +70 @@
                 }
                 
-                af = AF_INET6;
+                ver = ip_v6;
                 hname = argv[2];
         } else {
-                af = 0;
+                ver = ip_any;
                 hname = argv[1];
         }
         
         dnsr_hostinfo_t *hinfo;
-        int rc = dnsr_name2host(hname, &hinfo, af);
+        int rc = dnsr_name2host(hname, &hinfo, ver);
         if (rc != EOK) {
                 printf("%s: Error resolving '%s'.\n", NAME, hname);