Changes in uspace/srv/net/inetsrv/inet_link.c [b417559:b8b1adb1] in mainline

File:

• uspace/srv/net/inetsrv/inet_link.c (modified) (9 diffs)

uspace/srv/net/inetsrv/inet_link.c

@@ -55 +55 @@
 static uint16_t ip_ident = 0;
 
+static int inet_link_open(service_id_t);
 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 = {
@@ -62 +62 @@
 };
 
-static LIST_INITIALIZE(inet_links);
-static FIBRIL_MUTEX_INITIALIZE(inet_links_lock);
+static LIST_INITIALIZE(inet_link_list);
+static FIBRIL_MUTEX_INITIALIZE(inet_discovery_lock);
 
 static addr128_t link_local_node_ip =
@@ -113 +113 @@
 }
 
+static int inet_link_check_new(void)
+{
+        bool already_known;
+        category_id_t iplink_cat;
+        service_id_t *svcs;
+        size_t count, i;
+        int rc;
+
+        fibril_mutex_lock(&inet_discovery_lock);
+
+        rc = loc_category_get_id("iplink", &iplink_cat, IPC_FLAG_BLOCKING);
+        if (rc != EOK) {
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed resolving category 'iplink'.");
+                fibril_mutex_unlock(&inet_discovery_lock);
+                return ENOENT;
+        }
+
+        rc = loc_category_get_svcs(iplink_cat, &svcs, &count);
+        if (rc != EOK) {
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed getting list of IP links.");
+                fibril_mutex_unlock(&inet_discovery_lock);
+                return EIO;
+        }
+
+        for (i = 0; i < count; i++) {
+                already_known = false;
+
+                list_foreach(inet_link_list, link_list, inet_link_t, ilink) {
+                        if (ilink->svc_id == svcs[i]) {
+                                already_known = true;
+                                break;
+                        }
+                }
+
+                if (!already_known) {
+                        log_msg(LOG_DEFAULT, LVL_DEBUG, "Found IP link '%lu'",
+                            (unsigned long) svcs[i]);
+                        rc = inet_link_open(svcs[i]);
+                        if (rc != EOK)
+                                log_msg(LOG_DEFAULT, LVL_ERROR, "Could not open IP link.");
+                }
+        }
+
+        fibril_mutex_unlock(&inet_discovery_lock);
+        return EOK;
+}
+
 static inet_link_t *inet_link_new(void)
 {
@@ -136 +183 @@
 }
 
-int inet_link_open(service_id_t sid)
+static int inet_link_open(service_id_t sid)
 {
         inet_link_t *ilink;
@@ -184 +231 @@
 
         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);
+        list_append(&ilink->link_list, &inet_link_list);
 
         inet_addrobj_t *addr = NULL;
@@ -264 +299 @@
         }
         
-        log_msg(LOG_DEFAULT, LVL_DEBUG, "Configured link '%s'.", ilink->svc_name);
         return EOK;
         
@@ -273 +307 @@
         inet_link_delete(ilink);
         return rc;
+}
+
+static void inet_link_cat_change_cb(void)
+{
+        (void) inet_link_check_new();
+}
+
+int inet_link_discovery_start(void)
+{
+        int rc;
+
+        rc = loc_register_cat_change_cb(inet_link_cat_change_cb);
+        if (rc != EOK) {
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering callback for IP link "
+                    "discovery (%d).", rc);
+                return rc;
+        }
+
+        return inet_link_check_new();
 }
 
@@ -425 +478 @@
 }
 
-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)
+inet_link_t *inet_link_get_by_id(sysarg_t link_id)
+{
+        fibril_mutex_lock(&inet_discovery_lock);
+
+        list_foreach(inet_link_list, link_list, inet_link_t, ilink) {
+                if (ilink->svc_id == link_id) {
+                        fibril_mutex_unlock(&inet_discovery_lock);
                         return ilink;
-        }
-
+                }
+        }
+
+        fibril_mutex_unlock(&inet_discovery_lock);
         return NULL;
-}
-
-inet_link_t *inet_link_get_by_id(sysarg_t link_id)
-{
-        inet_link_t *ilink;
-
-        fibril_mutex_lock(&inet_links_lock);
-        ilink = inet_link_get_by_id_locked(link_id);
-        fibril_mutex_unlock(&inet_links_lock);
-
-        return ilink;
 }
 
@@ -454 +499 @@
         size_t count, i;
 
-        fibril_mutex_lock(&inet_links_lock);
-        count = list_count(&inet_links);
+        fibril_mutex_lock(&inet_discovery_lock);
+        count = list_count(&inet_link_list);
 
         id_list = calloc(count, sizeof(sysarg_t));
         if (id_list == NULL) {
-                fibril_mutex_unlock(&inet_links_lock);
+                fibril_mutex_unlock(&inet_discovery_lock);
                 return ENOMEM;
         }
 
         i = 0;
-        list_foreach(inet_links, link_list, inet_link_t, ilink) {
+        list_foreach(inet_link_list, link_list, inet_link_t, ilink) {
                 id_list[i++] = ilink->svc_id;
                 log_msg(LOG_DEFAULT, LVL_NOTE, "add link to list");
         }
 
-        fibril_mutex_unlock(&inet_links_lock);
+        fibril_mutex_unlock(&inet_discovery_lock);
 
         log_msg(LOG_DEFAULT, LVL_NOTE, "return %zu links", count);