Changeset e948fde in mainline for uspace/srv

Timestamp:

2013-09-29T21:43:49Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

5a324d99

Parents:

f023251

Message:

dnsr_name2host should use ip_ver_t instead of AF.

Location:

uspace/srv/net/dnsrsrv

Files:

• dnsrsrv.c (modified) (2 diffs)
• query.c (modified) (3 diffs)
• query.h (modified) (1 diff)

uspace/srv/net/dnsrsrv/dnsrsrv.c

@@ -89 +89 @@
         log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_get_srvaddr_srv()");
         
-        uint16_t af = IPC_GET_ARG1(*icall);
+        ip_ver_t ver = IPC_GET_ARG1(*icall);
         
         char *name;
@@ -100 +100 @@
         
         dns_host_info_t *hinfo;
-        rc = dns_name2host(name, &hinfo, af);
+        rc = dns_name2host(name, &hinfo, ver);
         if (rc != EOK) {
                 async_answer_0(iid, rc);

uspace/srv/net/dnsrsrv/query.c

@@ -190 +190 @@
 }
 
-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 +198 @@
         int rc;
         
-        switch (af) {
-        case AF_NONE:
+        switch (ver) {
+        case ip_any:
                 rc = dns_name_query(name, DTYPE_AAAA, info);
                 
@@ -206 +206 @@
                 
                 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;

uspace/srv/net/dnsrsrv/query.h

@@ -37 +37 @@
 #define QUERY_H
 
+#include <inet/addr.h>
 #include "dns_type.h"
 
-extern int dns_name2host(const char *, dns_host_info_t **, uint16_t);
+extern int dns_name2host(const char *, dns_host_info_t **, ip_ver_t);
 extern void dns_hostinfo_destroy(dns_host_info_t *);