Changeset f3386d7 in mainline for uspace/srv/net/dnsrsrv/transport.c

Timestamp:

2013-07-15T20:44:54Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

f8d3df3

Parents:

273c976 (diff), a940f1d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

mainline changes

File:

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

uspace/srv/net/dnsrsrv/transport.c

@@ -52 +52 @@
 
 /** Request timeout (microseconds) */
-#define REQ_TIMEOUT (5*1000*1000)
+#define REQ_TIMEOUT (5 * 1000 * 1000)
 
 /** Maximum number of retries */
 #define REQ_RETRY_MAX 3
+
+inet_addr_t dns_server_addr;
 
 typedef struct {
@@ -72 +74 @@
 static fid_t recv_fid;
 static int transport_fd = -1;
-inet_addr_t dns_server_addr;
 
 /** Outstanding requests */
@@ -182 +183 @@
 int dns_request(dns_message_t *req, dns_message_t **rresp)
 {
-        int rc;
+        trans_req_t *treq = NULL;
+        
         void *req_data;
         size_t req_size;
+        int rc = dns_message_encode(req, &req_data, &req_size);
+        if (rc != EOK)
+                goto error;
+        
         struct sockaddr_in addr;
-        trans_req_t *treq;
-        int ntry;
-
-        req_data = NULL;
-        treq = NULL;
-
-        addr.sin_family = AF_INET;
-        addr.sin_port = htons(DNS_SERVER_PORT);
-        addr.sin_addr.s_addr = host2uint32_t_be(dns_server_addr.ipv4);
-
-        rc = dns_message_encode(req, &req_data, &req_size);
-        if (rc != EOK)
-                goto error;
-
-        ntry = 0;
-
+        struct sockaddr_in6 addr6;
+        uint16_t af =
+            inet_addr_sockaddr_in(&dns_server_addr, &addr, &addr6);
+        
+        struct sockaddr *address;
+        socklen_t addrlen;
+        
+        switch (af) {
+        case AF_INET:
+                addr.sin_port = htons(DNS_SERVER_PORT);
+                address = (struct sockaddr *) &addr;
+                addrlen = sizeof(addr);
+                break;
+        case AF_INET6:
+                addr6.sin6_port = htons(DNS_SERVER_PORT);
+                address = (struct sockaddr *) &addr6;
+                addrlen = sizeof(addr6);
+                break;
+        default:
+                rc = EAFNOSUPPORT;
+                goto error;
+        }
+        
+        size_t ntry = 0;
+        
         while (ntry < REQ_RETRY_MAX) {
                 rc = sendto(transport_fd, req_data, req_size, 0,
-                    (struct sockaddr *)&addr, sizeof(addr));
+                    (struct sockaddr *) address, addrlen);
                 if (rc != EOK)
                         goto error;
-
+                
                 treq = treq_create(req);
                 if (treq == NULL) {
@@ -213 +228 @@
                         goto error;
                 }
-
-
+                
                 fibril_mutex_lock(&treq->done_lock);
                 while (treq->done != true) {
@@ -224 +238 @@
                         }
                 }
-
+                
                 fibril_mutex_unlock(&treq->done_lock);
-
+                
                 if (rc != ETIMEOUT)
                         break;
         }
-
+        
         if (ntry >= REQ_RETRY_MAX) {
                 rc = EIO;
                 goto error;
         }
-
+        
         if (treq->status != EOK) {
                 rc = treq->status;
                 goto error;
         }
-
+        
         *rresp = treq->resp;
         treq_destroy(treq);
         free(req_data);
         return EOK;
+        
 error:
         if (treq != NULL)
                 treq_destroy(treq);
+        
         free(req_data);
         return rc;