Changeset b417559 in mainline for uspace/srv/net/inetsrv/inet_link.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/inetsrv/inet_link.c (modified) (3 diffs)

uspace/srv/net/inetsrv/inet_link.c

@@ -56 +56 @@
 
 static int inet_iplink_recv(iplink_t *, iplink_recv_sdu_t *, uint16_t);
+static inet_link_t *inet_link_get_by_id_locked(sysarg_t);
 
 static iplink_ev_ops_t inet_iplink_ev_ops = {
@@ -183 +184 @@
 
         log_msg(LOG_DEFAULT, LVL_DEBUG, "Opened IP link '%s'", ilink->svc_name);
+
+        fibril_mutex_lock(&inet_links_lock);
+
+        if (inet_link_get_by_id_locked(sid) != NULL) {
+                fibril_mutex_unlock(&inet_links_lock);
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "Link %zu already open",
+                    sid);
+                rc = EEXIST;
+                goto error;
+        }
+
         list_append(&ilink->link_list, &inet_links);
+        fibril_mutex_unlock(&inet_links_lock);
 
         inet_addrobj_t *addr = NULL;
@@ -412 +425 @@
 }
 
+static inet_link_t *inet_link_get_by_id_locked(sysarg_t link_id)
+{
+        assert(fibril_mutex_is_locked(&inet_links_lock));
+
+        list_foreach(inet_links, link_list, inet_link_t, ilink) {
+                if (ilink->svc_id == link_id)
+                        return ilink;
+        }
+
+        return NULL;
+}
+
 inet_link_t *inet_link_get_by_id(sysarg_t link_id)
 {
+        inet_link_t *ilink;
+
         fibril_mutex_lock(&inet_links_lock);
-
-        list_foreach(inet_links, link_list, inet_link_t, ilink) {
-                if (ilink->svc_id == link_id) {
-                        fibril_mutex_unlock(&inet_links_lock);
-                        return ilink;
-                }
-        }
-
+        ilink = inet_link_get_by_id_locked(link_id);
         fibril_mutex_unlock(&inet_links_lock);
-        return NULL;
+
+        return ilink;
 }