Changeset b417559 in mainline for uspace/srv/net/dhcp/dhcp.c

Timestamp:

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

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

1b0602a3

Parents:

66ec63a

Message:

Retransmit DHCP discover and request messages on timeout. Introduce DHCP link states.

File:

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

uspace/srv/net/dhcp/dhcp.c

@@ -37 +37 @@
 #include <adt/list.h>
 #include <bitops.h>
+#include <fibril_synch.h>
 #include <inet/addr.h>
 #include <inet/dnsr.h>
@@ -52 +53 @@
 #include "transport.h"
 
+#define DHCP_DISCOVER_TIMEOUT_VAL (5 * 1000 * 1000)
+#define DHCP_REQUEST_TIMEOUT_VAL (1 * 1000 * 1000)
+
 #define MAX_MSG_SIZE 1024
 static uint8_t msgbuf[MAX_MSG_SIZE];
 
+/** List of registered links (of dhcp_link_t) */
 static list_t dhcp_links;
+
+static void dhcpsrv_discover_timeout(void *);
+static void dhcpsrv_request_timeout(void *);
+
+typedef enum {
+        ds_bound,
+        ds_init,
+        ds_init_reboot,
+        ds_rebinding,
+        ds_renewing,
+        ds_requesting,
+        ds_selecting
+} dhcp_state_t;
 
 typedef struct {
@@ -71 +89 @@
 
 typedef struct {
+        /** Link to dhcp_links list */
         link_t links;
+        /** Link service ID */
         service_id_t link_id;
+        /** Link info */
         inet_link_info_t link_info;
+        /** Transport */
         dhcp_transport_t dt;
+        /** Transport timeout */
+        fibril_timer_t *timeout;
+        /** Link state */
+        dhcp_state_t state;
+        /** Last received offer */
+        dhcp_offer_t offer;
 } dhcp_link_t;
 
@@ -366 +394 @@
 }
 
+void dhcpsrv_links_init(void)
+{
+        list_initialize(&dhcp_links);
+}
+
+static dhcp_link_t *dhcpsrv_link_find(service_id_t link_id)
+{
+        list_foreach(dhcp_links, links, dhcp_link_t, dlink) {
+                if (dlink->link_id == link_id)
+                        return dlink;
+        }
+
+        return NULL;
+}
+
 int dhcpsrv_link_add(service_id_t link_id)
 {
@@ -372 +415 @@
 
         log_msg(LOG_DEFAULT, LVL_DEBUG, "dhcpsrv_link_add(%zu)", link_id);
+
+        if (dhcpsrv_link_find(link_id) != NULL) {
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "Link %zu already added",
+                    link_id);
+                return EEXIST;
+        }
 
         dlink = calloc(1, sizeof(dhcp_link_t));
@@ -378 +427 @@
 
         dlink->link_id = link_id;
+        dlink->timeout = fibril_timer_create();
+        if (dlink->timeout == NULL) {
+                rc = ENOMEM;
+                goto error;
+        }
 
         /* Get link hardware address */
@@ -396 +450 @@
         }
 
+        dlink->state = ds_selecting;
+
         log_msg(LOG_DEFAULT, LVL_DEBUG, "Send DHCPDISCOVER");
         rc = dhcp_send_discover(dlink);
@@ -403 +459 @@
         }
 
-        if (0) list_append(&dlink->links, &dhcp_links);
+        fibril_timer_set(dlink->timeout, DHCP_DISCOVER_TIMEOUT_VAL,
+            dhcpsrv_discover_timeout, dlink);
+
+        list_append(&dlink->links, &dhcp_links);
 
         return EOK;
 error:
+        if (dlink != NULL && dlink->timeout != NULL)
+                fibril_timer_destroy(dlink->timeout);
         free(dlink);
         return rc;
@@ -416 +477 @@
 }
 
+static void dhcpsrv_recv_offer(dhcp_link_t *dlink, dhcp_offer_t *offer)
+{
+        int rc;
+
+        if (dlink->state != ds_selecting) {
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "Received offer in state "
+                    " %d, ignoring.", (int)dlink->state);
+                return;
+        }
+
+        fibril_timer_clear(dlink->timeout);
+        dlink->offer = *offer;
+        dlink->state = ds_requesting;
+
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "Send DHCPREQUEST");
+        rc = dhcp_send_request(dlink, offer);
+        if (rc != EOK) {
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "Error sending request.");
+                return;
+        }
+
+        fibril_timer_set(dlink->timeout, DHCP_REQUEST_TIMEOUT_VAL,
+            dhcpsrv_request_timeout, dlink);
+}
+
+static void dhcpsrv_recv_ack(dhcp_link_t *dlink, dhcp_offer_t *offer)
+{
+        int rc;
+
+        if (dlink->state != ds_requesting) {
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "Received ack in state "
+                    " %d, ignoring.", (int)dlink->state);
+                return;
+        }
+
+        fibril_timer_clear(dlink->timeout);
+        dlink->offer = *offer;
+        dlink->state = ds_bound;
+
+        rc = dhcp_cfg_create(dlink->link_id, offer);
+        if (rc != EOK) {
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "Error creating configuration.");
+                return;
+        }
+}
+
 static void dhcpsrv_recv(void *arg, void *msg, size_t size)
 {
@@ -430 +537 @@
         }
 
-        if (offer.msg_type == msg_dhcpoffer) {
-                rc = dhcp_send_request(dlink, &offer);
-                if (rc != EOK) {
-                        log_msg(LOG_DEFAULT, LVL_DEBUG, "Error sending request.");
-                        return;
-                }
-        }
-
-        if (offer.msg_type == msg_dhcpack) {
-                rc = dhcp_cfg_create(dlink->link_id, &offer);
-                if (rc != EOK) {
-                        log_msg(LOG_DEFAULT, LVL_DEBUG, "Error creating configuration.");
-                        return;
-                }
-        }
+        switch (offer.msg_type) {
+        case msg_dhcpoffer:
+                dhcpsrv_recv_offer(dlink, &offer);
+                break;
+        case msg_dhcpack:
+                dhcpsrv_recv_ack(dlink, &offer);
+                break;
+        default:
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "Received unexpected "
+                    "message type. %d", (int)offer.msg_type);
+                break;
+        }
+}
+
+static void dhcpsrv_discover_timeout(void *arg)
+{
+        dhcp_link_t *dlink = (dhcp_link_t *)arg;
+        int rc;
+
+        assert(dlink->state == ds_selecting);
+        log_msg(LOG_DEFAULT, LVL_NOTE, "dcpsrv_discover_timeout");
+
+        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,
+            dhcpsrv_discover_timeout, dlink);
+}
+
+static void dhcpsrv_request_timeout(void *arg)
+{
+        dhcp_link_t *dlink = (dhcp_link_t *)arg;
+        int rc;
+
+        assert(dlink->state == ds_requesting);
+        log_msg(LOG_DEFAULT, LVL_NOTE, "dcpsrv_request_timeout");
+
+        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,
+            dhcpsrv_request_timeout, dlink);
 }