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

File:

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

uspace/srv/net/dnsrsrv/transport.c

@@ -54 +54 @@
 #define REQ_TIMEOUT (5*1000*1000)
 
-/** Maximum number of retries */
-#define REQ_RETRY_MAX 3
-
 typedef struct {
         link_t lreq;
@@ -187 +184 @@
         struct sockaddr_in addr;
         trans_req_t *treq;
-        int ntry;
 
         req_data = NULL;
@@ -200 +196 @@
                 goto error;
 
-        ntry = 0;
-
-        while (ntry < REQ_RETRY_MAX) {
-                rc = sendto(transport_fd, req_data, req_size, 0,
-                    (struct sockaddr *)&addr, sizeof(addr));
-                if (rc != EOK)
-                        goto error;
-
-                treq = treq_create(req);
-                if (treq == NULL) {
-                        rc = ENOMEM;
+        rc = sendto(transport_fd, req_data, req_size, 0,
+            (struct sockaddr *)&addr, sizeof(addr));
+        if (rc != EOK)
+                goto error;
+
+        treq = treq_create(req);
+        if (treq == NULL) {
+                rc = ENOMEM;
+                goto error;
+        }
+
+        fibril_mutex_lock(&treq->done_lock);
+        while (treq->done != true) {
+                rc = fibril_condvar_wait_timeout(&treq->done_cv, &treq->done_lock,
+                    REQ_TIMEOUT);
+                if (rc == ETIMEOUT) {
+                        fibril_mutex_unlock(&treq->done_lock);
+                        rc = EIO;
                         goto error;
                 }
-
-
-                fibril_mutex_lock(&treq->done_lock);
-                while (treq->done != true) {
-                        rc = fibril_condvar_wait_timeout(&treq->done_cv, &treq->done_lock,
-                            REQ_TIMEOUT);
-                        if (rc == ETIMEOUT) {
-                                ++ntry;
-                                break;
-                        }
-                }
-
-                fibril_mutex_unlock(&treq->done_lock);
-
-                if (rc != ETIMEOUT)
-                        break;
-        }
-
-        if (ntry >= REQ_RETRY_MAX) {
-                rc = EIO;
-                goto error;
-        }
+        }
+
+        fibril_mutex_unlock(&treq->done_lock);
 
         if (treq->status != EOK) {