Changeset dc95342 in mainline for uspace/srv/net/dnsres/query.c

Timestamp:

2013-04-22T06:45:49Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

31e9fe0

Parents:

7262f89

Message:

Memory freeing, error paths.

File:

• uspace/srv/net/dnsres/query.c (modified) (6 diffs)

uspace/srv/net/dnsres/query.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2012 Jiri Svoboda
+ * Copyright (c) 2013 Jiri Svoboda
  * All rights reserved.
  *
@@ -36 +36 @@
 #include <errno.h>
 #include <mem.h>
+#include <stdlib.h>
 #include <str.h>
 
@@ -47 +48 @@
 
 #include <stdio.h>
-int dns_name2host(const char *name, dns_host_info_t *info)
+int dns_name2host(const char *name, dns_host_info_t **rinfo)
 {
         dns_message_t msg;
         dns_message_t *amsg;
         dns_question_t question;
+        dns_host_info_t *info;
         int rc;
 
@@ -81 +83 @@
                         rr->name, rr->rtype, rr->rclass, rr->rdata_size);
 
-                if (rr->rtype == DTYPE_A && rr->rclass == DC_IN) {
-                        if (rr->rdata_size != sizeof(uint32_t)) {
-                                printf("rdata_size = %u - fail\n", rr->rdata_size);
-                                return EIO;
+                if (rr->rtype == DTYPE_A && rr->rclass == DC_IN &&
+                        rr->rdata_size == sizeof(uint32_t)) {
+
+                        info = calloc(1, sizeof(dns_host_info_t));
+                        if (info == NULL) {
+                                dns_message_destroy(amsg);
+                                return ENOMEM;
                         }
 
@@ -90 +95 @@
                         info->addr.ipv4 = dns_uint32_t_decode(rr->rdata, rr->rdata_size);
                         printf("info->addr = %x\n", info->addr.ipv4);
+
+                        dns_message_destroy(amsg);
+                        *rinfo = info;
                         return EOK;
                 }
         }
 
+        dns_message_destroy(amsg);
         printf("no A/IN found, fail\n");
 
@@ -99 +108 @@
 }
 
+void dns_hostinfo_destroy(dns_host_info_t *info)
+{
+        free(info->name);
+        free(info);
+}
+
 /** @}
  */