Changeset 9d8bd3ac in mainline for uspace/srv/net/dnsres/dns_msg.c

Timestamp:

2013-04-20T09:15:42Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

f1dcf6d

Parents:

0041cd6d

Message:

Need entire message buffer in order to support pointers.

File:

• uspace/srv/net/dnsres/dns_msg.c (modified) (17 diffs)

uspace/srv/net/dnsres/dns_msg.c

@@ -110 +110 @@
 }
 
-static int dns_name_decode(uint8_t *buf, size_t size, char **rname,
-    size_t *act_size)
+static int dns_name_decode(uint8_t *buf, size_t size, size_t boff, char **rname,
+    size_t *eoff)
 {
         uint8_t *bp;
@@ -118 +118 @@
         size_t i;
 
-        bp = buf;
-        bsize = min(size, DNS_NAME_MAX_SIZE);
+        if (boff > size)
+                return EINVAL;
+
+        bp = buf + boff;
+        bsize = min(size - boff, DNS_NAME_MAX_SIZE);
 
         while (true) {
@@ -156 +159 @@
         printf("\n");
 
-        *act_size = bp - buf;
+        *eoff = bp - buf;
         return EOK;
 }
@@ -218 +221 @@
 }
 
-static int dns_question_decode(uint8_t *buf, size_t buf_size,
-    dns_question_t **rquestion, size_t *act_size)
+static int dns_question_decode(uint8_t *buf, size_t buf_size, size_t boff,
+    dns_question_t **rquestion, size_t *eoff)
 {
         dns_question_t *question;
-        size_t name_size;
+        size_t name_eoff;
         int rc;
 
@@ -230 +233 @@
 
         printf("decode name..\n");
-        rc = dns_name_decode(buf, buf_size, &question->qname, &name_size);
+        rc = dns_name_decode(buf, buf_size, boff, &question->qname, &name_eoff);
         if (rc != EOK) {
                 printf("error decoding name..\n");
@@ -238 +241 @@
 
         printf("ok decoding name..\n");
-        if (name_size + 2 * sizeof(uint16_t) > buf_size) {
-                printf("name_size + 2 * 2 = %d >  buf_size = %d\n",
-                    name_size + 2 * sizeof(uint16_t), buf_size);
+        if (name_eoff + 2 * sizeof(uint16_t) > buf_size) {
+                printf("name_eoff + 2 * 2 = %d >  buf_size = %d\n",
+                    name_eoff + 2 * sizeof(uint16_t), buf_size);
                 free(question);
                 return EINVAL;
         }
 
-        question->qtype = dns_uint16_t_decode(buf + name_size, buf_size - name_size);
-        question->qclass = dns_uint16_t_decode(buf + sizeof(uint16_t) + name_size,
-            buf_size - sizeof(uint16_t) - name_size);
-        *act_size = name_size + 2 * sizeof(uint16_t);
+        question->qtype = dns_uint16_t_decode(buf + name_eoff, buf_size - name_eoff);
+        question->qclass = dns_uint16_t_decode(buf + sizeof(uint16_t) + name_eoff,
+            buf_size - sizeof(uint16_t) - name_eoff);
+        *eoff = name_eoff + 2 * sizeof(uint16_t);
 
         *rquestion = question;
@@ -254 +257 @@
 }
 
-static int dns_rr_decode(uint8_t *buf, size_t buf_size,
-    dns_rr_t **retrr, size_t *act_size)
+static int dns_rr_decode(uint8_t *buf, size_t buf_size, size_t boff,
+    dns_rr_t **retrr, size_t *eoff)
 {
         dns_rr_t *rr;
-        size_t name_size;
+        size_t name_eoff;
         uint8_t *bp;
         size_t bsz;
@@ -269 +272 @@
 
         printf("decode name..\n");
-        rc = dns_name_decode(buf, buf_size, &rr->name, &name_size);
+        rc = dns_name_decode(buf, buf_size, boff, &rr->name, &name_eoff);
         if (rc != EOK) {
                 printf("error decoding name..\n");
@@ -277 +280 @@
 
         printf("ok decoding name..\n");
-        if (name_size + 2 * sizeof(uint16_t) > buf_size) {
-                printf("name_size + 2 * 2 = %d >  buf_size = %d\n",
-                    name_size + 2 * sizeof(uint16_t), buf_size);
+        if (name_eoff + 2 * sizeof(uint16_t) > buf_size) {
+                printf("name_eoff + 2 * 2 = %d >  buf_size = %d\n",
+                    name_eoff + 2 * sizeof(uint16_t), buf_size);
                 free(rr->name);
                 free(rr);
@@ -285 +288 @@
         }
 
-        bp = buf + name_size;
-        bsz = buf_size - name_size;
+        bp = buf + name_eoff;
+        bsz = buf_size - name_eoff;
 
         if (bsz < 3 * sizeof(uint16_t) + sizeof(uint32_t)) {
@@ -324 +327 @@
         bsz -= rdlength;
 
-        *act_size = bp - buf;
+        *eoff = bp - buf;
         *retrr = rr;
         return EOK;
@@ -393 +396 @@
         dns_message_t *msg;
         dns_header_t *hdr;
-        uint8_t *dp;
-        size_t dsize;
-        size_t field_size;
+        size_t doff;
+        size_t field_eoff;
         dns_question_t *question;
         dns_rr_t *rr;
@@ -428 +430 @@
         list_initialize(&msg->additional);
 
-        dp = (uint8_t *)data + sizeof(dns_header_t);
-        dsize = size - sizeof(dns_header_t);
+        doff = sizeof(dns_header_t);
 
         qd_count = uint16_t_be2host(hdr->qd_count);
@@ -436 +437 @@
         for (i = 0; i < qd_count; i++) {
                 printf("decode question..\n");
-                rc = dns_question_decode(dp, dsize, &question, &field_size);
+                rc = dns_question_decode(data, size, doff, &question, &field_eoff);
                 if (rc != EOK) {
                         printf("error decoding question\n");
@@ -443 +444 @@
                 printf("ok decoding question\n");
 
-                dp += field_size;
-                dsize -= field_size;
+                doff = field_eoff;
         }
 
@@ -452 +452 @@
         for (i = 0; i < an_count; i++) {
                 printf("decode answer..\n");
-                rc = dns_rr_decode(dp, dsize, &rr, &field_size);
+                rc = dns_rr_decode(data, size, doff, &rr, &field_eoff);
                 if (rc != EOK) {
                         printf("error decoding answer\n");
@@ -459 +459 @@
                 printf("ok decoding answer\n");
 
-                dp += field_size;
-                dsize -= field_size;
+                doff = field_eoff;
         }