Changes in uspace/srv/net/dnsrsrv/dns_msg.c [9f029aa:feeac0d] in mainline

File:

• uspace/srv/net/dnsrsrv/dns_msg.c (modified) (5 diffs)

uspace/srv/net/dnsrsrv/dns_msg.c

@@ -296 +296 @@
 uint32_t dns_uint32_t_decode(uint8_t *buf, size_t buf_size)
 {
-        uint32_t w;
         assert(buf_size >= 4);
-
-        w = ((uint32_t)buf[0] << 24) +
-            ((uint32_t)buf[1] << 16) +
-            ((uint32_t)buf[2] << 8) +
+        
+        uint32_t w = ((uint32_t) buf[0] << 24) +
+            ((uint32_t) buf[1] << 16) +
+            ((uint32_t) buf[2] << 8) +
             buf[3];
-
+        
         return w;
+}
+
+/** Decode unaligned big-endian 128-bit integer */
+void dns_addr128_t_decode(uint8_t *buf, size_t buf_size, addr128_t addr)
+{
+        assert(buf_size >= 16);
+        
+        addr128_t_be2host(buf, addr);
 }
 
@@ -400 +407 @@
         int rc;
 
-        rr = calloc(1, sizeof (dns_rr_t));
+        rr = calloc(1, sizeof(dns_rr_t));
         if (rr == NULL)
                 return ENOMEM;
@@ -427 +434 @@
 
         rr->rtype = dns_uint16_t_decode(bp, bsz);
-        bp += sizeof(uint16_t); bsz -= sizeof(uint16_t);
+        bp += sizeof(uint16_t);
+        bsz -= sizeof(uint16_t);
 
         rr->rclass = dns_uint16_t_decode(bp, bsz);
-        bp += sizeof(uint16_t); bsz -= sizeof(uint16_t);
+        bp += sizeof(uint16_t);
+        bsz -= sizeof(uint16_t);
 
         rr->ttl = dns_uint32_t_decode(bp, bsz);
-        bp += sizeof(uint32_t); bsz -= sizeof(uint32_t);
+        bp += sizeof(uint32_t);
+        bsz -= sizeof(uint32_t);
 
         rdlength = dns_uint16_t_decode(bp, bsz);
-        bp += sizeof(uint16_t); bsz -= sizeof(uint16_t);
+        bp += sizeof(uint16_t);
+        bsz -= sizeof(uint16_t);
 
         if (rdlength > bsz) {
@@ -499 +510 @@
         size = sizeof(dns_header_t);
 
-        list_foreach(msg->question, link) {
-                dns_question_t *q = list_get_instance(link, dns_question_t, msg);
+        list_foreach(msg->question, msg, dns_question_t, q) {
                 rc = dns_question_encode(q, NULL, 0, &q_size);
                 if (rc != EOK)
@@ -515 +525 @@
         di = sizeof(dns_header_t);
 
-        list_foreach(msg->question, link) {
-                dns_question_t *q = list_get_instance(link, dns_question_t, msg);
+        list_foreach(msg->question, msg, dns_question_t, q) {
                 rc = dns_question_encode(q, data + di, size - di, &q_size);
                 if (rc != EOK) {