Changeset 0c2d9bb in mainline for uspace/srv/net/dnsrsrv/query.c

Timestamp:

2013-12-25T22:54:29Z (10 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

b51cf2c

Parents:

f7a33de (diff), ac36aed (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/srv/net/dnsrsrv/query.c (modified) (5 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"
@@ -99 +98 @@
         }
         
-        list_foreach(amsg->answer, link) {
-                dns_rr_t *rr = list_get_instance(link, dns_rr_t, msg);
-                
+        list_foreach(amsg->answer, msg, dns_rr_t, rr) {
                 log_msg(LOG_DEFAULT, LVL_DEBUG, " - '%s' %u/%u, dsize %zu",
                     rr->name, rr->rtype, rr->rclass, rr->rdata_size);
@@ -192 +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));
@@ -200 +197 @@
         int rc;
         
-        switch (af) {
-        case AF_NONE:
+        switch (ver) {
+        case ip_any:
                 rc = dns_name_query(name, DTYPE_AAAA, info);
                 
@@ -208 +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;