Changeset a0d97f83 in mainline

Timestamp:

2013-05-03T08:44:14Z (11 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

ef904895

Parents:

48171fc4

Message:

Fix message allocation/deallocation.

Location:

uspace/srv/net/dnsrsrv

Files:

• dns_msg.c (modified) (3 diffs)
• dns_msg.h (modified) (1 diff)
• query.c (modified) (2 diffs)

uspace/srv/net/dnsrsrv/dns_msg.c

@@ -517 +517 @@
         int rc;
 
-        msg = calloc(1, sizeof(dns_message_t));
+        msg = dns_message_new();
         if (msg == NULL)
                 return ENOMEM;
@@ -537 +537 @@
             hdr->opbits);
 
-        list_initialize(&msg->question);
-        list_initialize(&msg->answer);
-        list_initialize(&msg->authority);
-        list_initialize(&msg->additional);
-
         doff = sizeof(dns_header_t);
 
@@ -599 +594 @@
 }
 
+dns_message_t *dns_message_new(void)
+{
+        dns_message_t *msg;
+
+        msg = calloc(1, sizeof(dns_message_t));
+        if (msg == NULL)
+                return NULL;
+
+        list_initialize(&msg->question);
+        list_initialize(&msg->answer);
+        list_initialize(&msg->authority);
+        list_initialize(&msg->additional);
+
+        return msg;
+}
+
 void dns_message_destroy(dns_message_t *msg)
 {

uspace/srv/net/dnsrsrv/dns_msg.h

@@ -45 +45 @@
 extern int dns_message_encode(dns_message_t *, void **, size_t *);
 extern int dns_message_decode(void *, size_t, dns_message_t **);
+extern dns_message_t *dns_message_new(void);
 extern void dns_message_destroy(dns_message_t *);
 extern uint32_t dns_uint32_t_decode(uint8_t *, size_t);

uspace/srv/net/dnsrsrv/query.c

@@ -52 +52 @@
         dns_message_t *msg;
         dns_message_t *amsg;
-        dns_question_t question;
+        dns_question_t *question;
         dns_host_info_t *info;
         int rc;
 
-        question.qname = (char *)name;
-        question.qtype = DTYPE_A;
-        question.qclass = DC_IN;
+        question = calloc(1, sizeof(dns_question_t));
+        if (question == NULL)
+                return ENOMEM;
 
-        msg = calloc(1, sizeof(dns_message_t));
+        question->qname = (char *)name;
+        question->qtype = DTYPE_A;
+        question->qclass = DC_IN;
+
+        msg = dns_message_new();
         if (msg == NULL)
                 return ENOMEM;
 
-        list_initialize(&msg->question);
-        list_append(&question.msg, &msg->question);
+        list_append(&question->msg, &msg->question);
 
         msg->id = msg_id++;
@@ -100 +103 @@
                             info->addr.ipv4);
 
+                        dns_message_destroy(msg);
                         dns_message_destroy(amsg);
                         *rinfo = info;