Changes in uspace/srv/net/dnsrsrv/transport.c [26de91a:06fe3b6] in mainline

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 {
@@ -74 +72 @@
 static fid_t recv_fid;
 static int transport_fd = -1;
+inet_addr_t dns_server_addr;
 
 /** Outstanding requests */
@@ -158 +157 @@
         assert(fibril_mutex_is_locked(&treq_lock));
 
-        list_foreach(treq_list, lreq, trans_req_t, treq) {
+        list_foreach(treq_list, link) {
+                trans_req_t *treq = list_get_instance(link, trans_req_t, lreq);
+
                 if (treq->req->id == resp->id) {
                         /* Match */
@@ -181 +182 @@
 int dns_request(dns_message_t *req, dns_message_t **rresp)
 {
-        trans_req_t *treq = NULL;
-        struct sockaddr *saddr = NULL;
-        socklen_t saddrlen;
-        
+        int rc;
         void *req_data;
         size_t req_size;
-        int rc = dns_message_encode(req, &req_data, &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);
         if (rc != EOK)
                 goto error;
-        
-        rc = inet_addr_sockaddr(&dns_server_addr, DNS_SERVER_PORT,
-            &saddr, &saddrlen);
-        if (rc != EOK) {
-                assert(rc == ENOMEM);
-                goto error;
-        }
-        
-        size_t ntry = 0;
-        
+
+        ntry = 0;
+
         while (ntry < REQ_RETRY_MAX) {
                 rc = sendto(transport_fd, req_data, req_size, 0,
-                    saddr, saddrlen);
+                    (struct sockaddr *)&addr, sizeof(addr));
                 if (rc != EOK)
                         goto error;
-                
+
                 treq = treq_create(req);
                 if (treq == NULL) {
@@ -211 +213 @@
                         goto error;
                 }
-                
+
+
                 fibril_mutex_lock(&treq->done_lock);
                 while (treq->done != true) {
@@ -221 +224 @@
                         }
                 }
-                
+
                 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;
 }