Changeset 0c2d9bb in mainline for uspace/srv/net/dnsrsrv/dnsrsrv.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/dnsrsrv.c (modified) (3 diffs)

uspace/srv/net/dnsrsrv/dnsrsrv.c

@@ -60 +60 @@
         rc = transport_init();
         if (rc != EOK) {
-                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed initializing tarnsport.");
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed initializing transport.");
                 return EIO;
         }
@@ -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);