Changeset 959d2ec in mainline for uspace/srv/net/dnsrsrv

Timestamp:

2013-05-08T10:29:45Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d242cb6

Parents:

9f029aa

Message:

Return canonical name to caller.

Location:

uspace/srv/net/dnsrsrv

Files:

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

uspace/srv/net/dnsrsrv/dns_type.h

@@ -113 +113 @@
 typedef struct {
         /** Host name */
-        char *name;
+        char *cname;
         /** Host address */
         inet_addr_t addr;

uspace/srv/net/dnsrsrv/dnsrsrv.c

@@ -89 +89 @@
         char *name;
         dns_host_info_t *hinfo;
+        ipc_callid_t rcallid;
+        size_t size;
+        sysarg_t retval;
+        size_t act_size;
         int rc;
 
@@ -100 +104 @@
         }
 
+        if (!async_data_read_receive(&rcallid, &size)) {
+                async_answer_0(rcallid, EREFUSED);
+                async_answer_0(callid, EREFUSED);
+                return;
+        }
+
         rc = dns_name2host(name, &hinfo);
         if (rc != EOK) {
+                async_answer_0(rcallid, rc);
                 async_answer_0(callid, rc);
                 return;
         }
 
-        async_answer_1(callid, EOK, hinfo->addr.ipv4);
+        act_size = str_size(hinfo->cname);
+        if (act_size > size) {
+                async_answer_0(rcallid, EOVERFLOW);
+                async_answer_0(callid, EOVERFLOW);
+                return;
+        }
+
+        retval = async_data_read_finalize(rcallid, hinfo->cname, act_size);
+        async_answer_1(callid, retval, hinfo->addr.ipv4);
 
         dns_hostinfo_destroy(hinfo);

uspace/srv/net/dnsrsrv/query.c

@@ -127 +127 @@
                         }
 
-                        info->name = str_dup(rr->name);
+                        info->cname = str_dup(rr->name);
                         info->addr.ipv4 = dns_uint32_t_decode(rr->rdata, rr->rdata_size);
                         log_msg(LOG_DEFAULT, LVL_DEBUG, "info->name = '%s' "
-                            "info->addr = %x", info->name, info->addr.ipv4);
+                            "info->addr = %x", info->cname, info->addr.ipv4);
 
                         dns_message_destroy(msg);
@@ -148 +148 @@
 void dns_hostinfo_destroy(dns_host_info_t *info)
 {
-        free(info->name);
+        free(info->cname);
         free(info);
 }