Changes in uspace/srv/net/dhcp/dhcp.c [e3811c9:fab2746] in mainline

File:

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

uspace/srv/net/dhcp/dhcp.c

@@ -37 +37 @@
 #include <adt/list.h>
 #include <bitops.h>
+#include <byteorder.h>
 #include <errno.h>
 #include <fibril_synch.h>
@@ -418 +419 @@
 }
 
-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)
 {
@@ -477 +460 @@
         }
 
+        dlink->state = ds_selecting;
+
         log_msg(LOG_DEFAULT, LVL_DEBUG, "Send DHCPDISCOVER");
-        rc = dhcp_discover_proc(dlink);
+        rc = dhcp_send_discover(dlink);
         if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Error sending DHCPDISCOVER.");
@@ -485 +470 @@
                 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);
@@ -501 +490 @@
 }
 
-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)
 {
@@ -561 +535 @@
                 return;
         }
-
-        /* XXX Work around multiple simultaneous sessions issue */
-        dhcp_transport_fini(&dlink->dt);
 
         log_msg(LOG_DEFAULT, LVL_NOTE, "%s: Successfully configured.",