Changeset 330df83 in mainline for uspace/srv/net/dnsrsrv/dnsrsrv.c

Timestamp:

2013-07-19T20:42:57Z (11 years ago)

Author:

Manuele Conti <conti.ma@…>

Branches:

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

Children:

f4cbf9dd

Parents:

8a8a08d1 (diff), cd18cd1 (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 with mainline changes.

File:

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

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);
+        
         char *name;
         int rc = async_data_write_accept((void **) &name, true, 0,
@@ -98 +100 @@
         
         dns_host_info_t *hinfo;
-        rc = dns_name2host(name, &hinfo);
+        rc = dns_name2host(name, &hinfo, af);
         if (rc != EOK) {
                 async_answer_0(iid, rc);