Changes in uspace/srv/net/dnsrsrv/transport.c [06fe3b6:257feec] 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 {
@@ -72 +74 @@
 static fid_t recv_fid;
 static int transport_fd = -1;
-inet_addr_t dns_server_addr;
 
 /** Outstanding requests */
@@ -194 +195 @@
         addr.sin_family = AF_INET;
         addr.sin_port = htons(DNS_SERVER_PORT);
-        addr.sin_addr.s_addr = host2uint32_t_be(dns_server_addr.ipv4);
+        inet_addr_sockaddr_in(&dns_server_addr, &addr);
 
         rc = dns_message_encode(req, &req_data, &req_size);
@@ -204 +205 @@
         while (ntry < REQ_RETRY_MAX) {
                 rc = sendto(transport_fd, req_data, req_size, 0,
-                    (struct sockaddr *)&addr, sizeof(addr));
+                    (struct sockaddr *) &addr, sizeof(addr));
                 if (rc != EOK)
                         goto error;
-
+                
                 treq = treq_create(req);
                 if (treq == NULL) {
@@ -213 +214 @@
                         goto error;
                 }
-
-
+                
                 fibril_mutex_lock(&treq->done_lock);
                 while (treq->done != true) {
@@ -224 +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);
         return EOK;
+        
 error:
         if (treq != NULL)
                 treq_destroy(treq);
+        
         free(req_data);
         return rc;