Changeset 08a6382 in mainline for uspace/srv/net/dnsres/dns_msg.c

Timestamp:

2012-08-12T20:17:31Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

e5e73af

Parents:

f85ed4b

Message:

Fixes to get DNS query acceptable by looking at analyzer output. Fix assertion failure in UDP.

File:

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

uspace/srv/net/dnsres/dns_msg.c

@@ -35 +35 @@
 
 #include <bitops.h>
+#include <byteorder.h>
 #include <errno.h>
 #include <stdint.h>
@@ -87 +88 @@
                                 buf[pi] = (uint8_t)lsize;
 
+                        lsize = 0;
+                        pi = di;
+                        ++di;
+
                         if (c == '\0')
                                 break;
-
-                        pi = di;
+                } else {
+                        if (buf != NULL && di < buf_size)
+                                buf[di] = c;
                         ++di;
-                } else {
                         ++lsize;
-                        if (buf != NULL && di < buf_size)
-                                buf[di++] = c;
                 }
         }
@@ -126 +129 @@
                 return rc;
 
+        printf("name_size=%zu\n", name_size);
+
         *act_size = name_size + sizeof(uint16_t) + sizeof(uint16_t);
+        printf("act_size=%zu\n", *act_size);
         if (buf == NULL)
                 return EOK;
@@ -138 +144 @@
         di += sizeof(uint16_t);
 
-        *act_size = di;
         return EOK;
 }
@@ -151 +156 @@
         int rc;
 
-        hdr.id = msg->id;
-
-        hdr.opbits =
+        hdr.id = host2uint16_t_be(msg->id);
+
+        hdr.opbits = host2uint16_t_be(
             (msg->qr << OPB_QR) |
             (msg->opcode << OPB_OPCODE_l) |
@@ -160 +165 @@
             (msg->rd ? BIT_V(uint16_t, OPB_RD) : 0) |
             (msg->ra ? BIT_V(uint16_t, OPB_RA) : 0) |
-            msg->rcode;
-
-        hdr.qd_count = list_count(&msg->question);
+            msg->rcode
+        );
+
+        hdr.qd_count = host2uint16_t_be(list_count(&msg->question));
         hdr.an_count = 0;
         hdr.ns_count = 0;
@@ -168 +174 @@
 
         size = sizeof(dns_header_t);
+        printf("dns header size=%zu\n", size);
 
         list_foreach(msg->question, link) {
@@ -175 +182 @@
                         return rc;
 
+                printf("q_size=%zu\n", q_size);
                 size += q_size;
         }
@@ -193 +201 @@
         }
 
+        printf("-> size=%zu, di=%zu\n", size, di);
         *rdata = data;
         *rsize = size;