Changeset 1b0602a3 in mainline

Timestamp:

2013-09-24T21:11:46Z (11 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

ee20e8a

Parents:

b417559

Message:

Limit the number of retries.

File:

• uspace/srv/net/dhcp/dhcp.c (modified) (7 diffs)

uspace/srv/net/dhcp/dhcp.c

@@ -53 +53 @@
 #include "transport.h"
 
-#define DHCP_DISCOVER_TIMEOUT_VAL (5 * 1000 * 1000)
-#define DHCP_REQUEST_TIMEOUT_VAL (1 * 1000 * 1000)
+enum {
+        /** In microseconds */
+        dhcp_discover_timeout_val = 5 * 1000 * 1000,
+        /** In microseconds */
+        dhcp_request_timeout_val = 1 * 1000 * 1000,
+        dhcp_discover_retries = 5,
+        dhcp_request_retries = 3
+};
 
 #define MAX_MSG_SIZE 1024
@@ -67 +73 @@
 typedef enum {
         ds_bound,
+        ds_fail,
         ds_init,
         ds_init_reboot,
@@ -99 +106 @@
         /** Transport timeout */
         fibril_timer_t *timeout;
+        /** Number of retries */
+        int retries_left;
         /** Link state */
         dhcp_state_t state;
@@ -455 +464 @@
         rc = dhcp_send_discover(dlink);
         if (rc != EOK) {
+                dlink->state = ds_fail;
                 rc = EIO;
                 goto error;
         }
 
-        fibril_timer_set(dlink->timeout, DHCP_DISCOVER_TIMEOUT_VAL,
+        dlink->retries_left = dhcp_discover_retries;
+        fibril_timer_set(dlink->timeout, dhcp_discover_timeout_val,
             dhcpsrv_discover_timeout, dlink);
 
@@ -498 +509 @@
         }
 
-        fibril_timer_set(dlink->timeout, DHCP_REQUEST_TIMEOUT_VAL,
+        dlink->retries_left = dhcp_request_retries;
+        fibril_timer_set(dlink->timeout, dhcp_request_timeout_val,
             dhcpsrv_request_timeout, dlink);
 }
@@ -559 +571 @@
         log_msg(LOG_DEFAULT, LVL_NOTE, "dcpsrv_discover_timeout");
 
+        if (dlink->retries_left == 0) {
+                log_msg(LOG_DEFAULT, LVL_NOTE, "Retries exhausted");
+                dlink->state = ds_fail;
+                return;
+        }
+        --dlink->retries_left;
+
         log_msg(LOG_DEFAULT, LVL_DEBUG, "Send DHCPDISCOVER");
         rc = dhcp_send_discover(dlink);
         if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Error sending DHCPDISCOVER");
-                return;
-        }
-
-        fibril_timer_set(dlink->timeout, DHCP_DISCOVER_TIMEOUT_VAL,
+                dlink->state = ds_fail;
+                return;
+        }
+
+        fibril_timer_set(dlink->timeout, dhcp_discover_timeout_val,
             dhcpsrv_discover_timeout, dlink);
 }
@@ -578 +598 @@
         log_msg(LOG_DEFAULT, LVL_NOTE, "dcpsrv_request_timeout");
 
+        if (dlink->retries_left == 0) {
+                log_msg(LOG_DEFAULT, LVL_NOTE, "Retries exhausted");
+                dlink->state = ds_fail;
+                return;
+        }
+        --dlink->retries_left;
+
         log_msg(LOG_DEFAULT, LVL_DEBUG, "Send DHCPREQUEST");
         rc = dhcp_send_request(dlink, &dlink->offer);
         if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_DEBUG, "Error sending request.");
-                return;
-        }
-
-        fibril_timer_set(dlink->timeout, DHCP_REQUEST_TIMEOUT_VAL,
+                dlink->state = ds_fail;
+                return;
+        }
+
+        fibril_timer_set(dlink->timeout, dhcp_request_timeout_val,
             dhcpsrv_request_timeout, dlink);
 }