Changeset f85ed4b in mainline

Timestamp:

2012-08-12T17:51:26Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

08a6382

Parents:

adae30d

Message:

Fixes: initialize off, increment lsize.

Location:

uspace/srv/net/dnsres

Files:

• dns_msg.c (modified) (5 diffs)
• dns_type.h (modified) (1 diff)
• dnsres.c (modified) (2 diffs)
• query.c (modified) (2 diffs)
• query.h (modified) (1 diff)

uspace/srv/net/dnsres/dns_msg.c

@@ -45 +45 @@
 #define NAME  "dnsres"
 
+#include <stdio.h>
 static int dns_name_encode(char *name, uint8_t *buf, size_t buf_size,
     size_t *act_size)
@@ -55 +56 @@
         pi = 0;
         di = 1;
-
+        off = 0;
+
+        printf("dns_name_encode(name='%s', buf=%p, buf_size=%zu, act_size=%p\n",
+            name, buf, buf_size, act_size);
         lsize = 0;
         while (true) {
+                printf("off=%zu\n", off);
                 c = str_decode(name, &off, STR_NO_LIMIT);
+                printf("c=%d\n", (int)c);
                 if (c > 127) {
                         /* Non-ASCII character */
+                        printf("non-ascii character\n");
                         return EINVAL;
                 }
@@ -66 +73 @@
                 if (c == '.' || c == '\0') {
                         /* Empty string, starting with period or two consecutive periods. */
-                        if (lsize == 0)
+                        if (lsize == 0) {
+                                printf("empty token\n");
                                 return EINVAL;
+                        }
 
                         if (lsize > DNS_LABEL_MAX_SIZE) {
                                 /* Label too long */
+                                printf("label too long\n");
                                 return EINVAL;
                         }
@@ -83 +93 @@
                         ++di;
                 } else {
+                        ++lsize;
                         if (buf != NULL && di < buf_size)
                                 buf[di++] = c;
@@ -116 +127 @@
 
         *act_size = name_size + sizeof(uint16_t) + sizeof(uint16_t);
+        if (buf == NULL)
+                return EOK;
+
         di = name_size;
 

uspace/srv/net/dnsres/dns_type.h

@@ -69 +69 @@
 /** Unencoded DNS message question section */
 typedef struct {
-        link_t *msg;
+        link_t msg;
         /** Domain name in text format (dot notation) */
         char *qname;

uspace/srv/net/dnsres/dnsres.c

@@ -39 +39 @@
 #include "dns_msg.h"
 #include "dns_std.h"
+#include "query.h"
 
 #define NAME  "dnsres"
@@ -44 +45 @@
 int main(int argc, char *argv[])
 {
+        dns_host_info_t hinfo;
+        int rc;
+
         printf("%s: DNS Resolution Service\n", NAME);
+        rc = dns_name2host("helenos.org", &hinfo);
+        printf("dns_name2host() -> rc = %d\n", rc);
+
         return 0;
 }

uspace/srv/net/dnsres/query.c

@@ -39 +39 @@
 #include "dns_type.h"
 #include "query.h"
+#include "transport.h"
 
 static uint16_t msg_id;
 
-int dns_name2host(char *name, dns_host_info_t *info)
+int dns_name2host(const char *name, dns_host_info_t *info)
 {
         dns_message_t msg;
+        dns_message_t *amsg;
         dns_question_t question;
+        int rc;
 
-        question.qname = name;
+        question.qname = (char *)name;
         question.qtype = DTYPE_A;
         question.qclass = DC_IN;
 
         list_initialize(&msg.question);
-        list_append(question.msg, &msg.question);
+        list_append(&question.msg, &msg.question);
 
         msg.id = msg_id++;
@@ -62 +65 @@
         msg.ra = false;
 
+        rc = dns_request(&msg, &amsg);
+        if (rc != EOK)
+                return rc;
+
         return EOK;
 }

uspace/srv/net/dnsres/query.h

@@ -39 +39 @@
 #include "dns_type.h"
 
-extern int dns_name2host(char *, dns_host_info_t *);
+extern int dns_name2host(const char *, dns_host_info_t *);
 
 #endif