Changeset dcba819 in mainline for uspace/srv

Timestamp:

2015-04-23T23:42:32Z (11 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

055a68a, 86cf96d, bf1733d3

Parents:

749fe15b (diff), 8a64320e (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:

initial merge of the AR9271 USB WiFi driver (e.g. TL-WN722N)
initial merge of the IEEE 802.11 stack
(thx Jan Kolarik)

Location:

uspace/srv

Files:

• locsrv/locsrv.c (modified) (1 diff)
• net/dhcp/dhcp.c (modified) (4 diffs)
• net/dhcp/dhcp.h (modified) (1 diff)
• net/dhcp/main.c (modified) (2 diffs)

uspace/srv/locsrv/locsrv.c

@@ -1357 +1357 @@
         cat = category_new("nic");
         categ_dir_add_cat(&cdir, cat);
+        
+        cat = category_new("ieee80211");
+        categ_dir_add_cat(&cdir, cat);
 
         cat = category_new("visualizer");

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);
@@ -487 +499 @@
 {
         return ENOTSUP;
+}
+
+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);
 }
 

uspace/srv/net/dhcp/dhcp.h

@@ -43 +43 @@
 extern int dhcpsrv_link_add(service_id_t);
 extern int dhcpsrv_link_remove(service_id_t);
+extern int dhcpsrv_discover(service_id_t);
 
 #endif

uspace/srv/net/dhcp/main.c

@@ -109 +109 @@
 }
 
+static void dhcp_discover_srv(ipc_callid_t callid, ipc_call_t *call)
+{
+        sysarg_t link_id;
+        int rc;
+
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "dhcp_discover_srv()");
+
+        link_id = IPC_GET_ARG1(*call);
+
+        rc = dhcpsrv_discover(link_id);
+        async_answer_0(callid, rc);
+}
+
 static void dhcp_client_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg)
 {
@@ -133 +146 @@
                 case DHCP_LINK_REMOVE:
                         dhcp_link_remove_srv(callid, &call);
+                        break;
+                case DHCP_DISCOVER:
+                        dhcp_discover_srv(callid, &call);
                         break;
                 default: