Changeset 4c14b88 in mainline for uspace/srv/net/dnsrsrv/query.c

Timestamp:

2013-12-31T07:57:14Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

1b973dc

Parents:

6297465 (diff), 208b5f5 (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:

mainline changes

File:

• uspace/srv/net/dnsrsrv/query.c (modified) (4 diffs)

uspace/srv/net/dnsrsrv/query.c

@@ -39 +39 @@
 #include <stdlib.h>
 #include <str.h>
-#include <net/socket_codes.h>
 #include "dns_msg.h"
 #include "dns_std.h"
@@ -190 +189 @@
 }
 
-int dns_name2host(const char *name, dns_host_info_t **rinfo, uint16_t af)
+int dns_name2host(const char *name, dns_host_info_t **rinfo, ip_ver_t ver)
 {
         dns_host_info_t *info = calloc(1, sizeof(dns_host_info_t));
@@ -198 +197 @@
         int rc;
         
-        switch (af) {
-        case AF_NONE:
+        switch (ver) {
+        case ip_any:
                 rc = dns_name_query(name, DTYPE_AAAA, info);
                 
@@ -206 +205 @@
                 
                 break;
-        case AF_INET:
+        case ip_v4:
                 rc = dns_name_query(name, DTYPE_A, info);
                 break;
-        case AF_INET6:
+        case ip_v6:
                 rc = dns_name_query(name, DTYPE_AAAA, info);
                 break;