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

Timestamp:

2014-04-16T17:14:06Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

f857e8b

Parents:

dba3e2c (diff), 70b570c (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:

Merge mainline changes

File:

• uspace/srv/net/dnsrsrv/transport.c (modified) (6 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 */
@@ -157 +158 @@
         assert(fibril_mutex_is_locked(&treq_lock));
 
-        list_foreach(treq_list, link) {
-                trans_req_t *treq = list_get_instance(link, trans_req_t, lreq);
-
+        list_foreach(treq_list, lreq, trans_req_t, treq) {
                 if (treq->req->id == resp->id) {
                         /* Match */
@@ -182 +181 @@
 int dns_request(dns_message_t *req, dns_message_t **rresp)
 {
-        int rc;
+        trans_req_t *treq = NULL;
+        struct sockaddr *saddr = NULL;
+        socklen_t saddrlen;
+        
         void *req_data;
         size_t req_size;
-        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);
+        int rc = dns_message_encode(req, &req_data, &req_size);
         if (rc != EOK)
                 goto error;
-
-        ntry = 0;
-
+        
+        rc = inet_addr_sockaddr(&dns_server_addr, DNS_SERVER_PORT,
+            &saddr, &saddrlen);
+        if (rc != EOK) {
+                assert(rc == ENOMEM);
+                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));
+                    saddr, saddrlen);
                 if (rc != EOK)
                         goto error;
-
+                
                 treq = treq_create(req);
                 if (treq == NULL) {
@@ -213 +211 @@
                         goto error;
                 }
-
-
+                
                 fibril_mutex_lock(&treq->done_lock);
                 while (treq->done != true) {
@@ -224 +221 @@
                         }
                 }
-
+                
                 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);
+        free(saddr);
         return EOK;
+        
 error:
         if (treq != NULL)
                 treq_destroy(treq);
+        
         free(req_data);
+        free(saddr);
         return rc;
 }