Changeset 94e46c9 in mainline for uspace/srv/net/dhcp/dhcp.c

Timestamp:

2015-05-23T04:09:11Z (10 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

b5143bd

Parents:

a25d893 (diff), 0683992 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Mainline changes

File:

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

uspace/srv/net/dhcp/dhcp.c

@@ -418 +418 @@
 }
 
+static int dhcp_discover_proc(dhcp_link_t *dlink)
+{
+        dlink->state = ds_selecting;
+
+        int rc = dhcp_send_discover(dlink);
+        if (rc != EOK)
+                return EIO;
+
+        dlink->retries_left = dhcp_discover_retries;
+        
+        if ((dlink->timeout->state == fts_not_set) ||
+            (dlink->timeout->state == fts_fired))
+                fibril_timer_set(dlink->timeout, dhcp_discover_timeout_val,
+                    dhcpsrv_discover_timeout, dlink);
+        
+        return rc;
+}
+
 int dhcpsrv_link_add(service_id_t link_id)
 {
@@ -459 +477 @@
         }
 
-        dlink->state = ds_selecting;
-
         log_msg(LOG_DEFAULT, LVL_DEBUG, "Send DHCPDISCOVER");
-        rc = dhcp_send_discover(dlink);
+        rc = dhcp_discover_proc(dlink);
         if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Error sending DHCPDISCOVER.");
@@ -469 +485 @@
                 goto error;
         }
-
-        dlink->retries_left = dhcp_discover_retries;
-        fibril_timer_set(dlink->timeout, dhcp_discover_timeout_val,
-            dhcpsrv_discover_timeout, dlink);
 
         list_append(&dlink->links, &dhcp_links);
@@ -489 +501 @@
 }
 
+int dhcpsrv_discover(service_id_t link_id)
+{
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "dhcpsrv_link_add(%zu)", link_id);
+        
+        dhcp_link_t *dlink = dhcpsrv_link_find(link_id);
+        
+        if (dlink == NULL) {
+                log_msg(LOG_DEFAULT, LVL_NOTE, "Link %zu doesn't exist",
+                    link_id);
+                return EINVAL;
+        }
+        
+        return dhcp_discover_proc(dlink);
+}
+
 static void dhcpsrv_recv_offer(dhcp_link_t *dlink, dhcp_offer_t *offer)
 {
@@ -534 +561 @@
                 return;
         }
+
+        /* XXX Work around multiple simultaneous sessions issue */
+        dhcp_transport_fini(&dlink->dt);
 
         log_msg(LOG_DEFAULT, LVL_NOTE, "%s: Successfully configured.",