Changeset ebb1489 in mainline for uspace/srv/net/inetsrv/inet_link.c

Timestamp:

2024-10-13T08:23:40Z (2 months ago)

Author:

GitHub <noreply@…>

Children:

0472cf17

Parents:

2a0c827c (diff), b3b79981 (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.

git-author:

boba-buba <120932204+boba-buba@…> (2024-10-13 08:23:40)

git-committer:

GitHub <noreply@…> (2024-10-13 08:23:40)

Message:

Merge branch 'HelenOS:master' into topic/packet-capture

File:

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

uspace/srv/net/inetsrv/inet_link.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2021 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -37 +37 @@
 #include <errno.h>
 #include <fibril_synch.h>
+#include <inet/dhcp.h>
 #include <inet/eth_addr.h>
 #include <inet/iplink.h>
@@ -164 +165 @@
 }
 
-errno_t inet_link_open(service_id_t sid)
+/** Open new IP link while inet_links_lock is held.
+ *
+ * @param sid IP link service ID
+ * @return EOK on success or an error code
+ */
+static errno_t inet_link_open_locked(service_id_t sid)
 {
         inet_link_t *ilink;
@@ -170 +176 @@
         errno_t rc;
 
-        log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_link_open()");
+        assert(fibril_mutex_is_locked(&inet_links_lock));
+
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_link_open_locked()");
         ilink = inet_link_new();
         if (ilink == NULL)
@@ -213 +221 @@
         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);
@@ -224 +229 @@
 
         list_append(&ilink->link_list, &inet_links);
-        fibril_mutex_unlock(&inet_links_lock);
 
         inet_addrobj_t *addr = NULL;
@@ -239 +243 @@
                 addr->ilink = ilink;
                 addr->name = str_dup("v4a");
+                addr->temp = true;
 
                 rc = inet_addrobj_add(addr);
@@ -275 +280 @@
                 addr6->ilink = ilink;
                 addr6->name = str_dup("v6a");
+                addr6->temp = true;
 
                 rc = inet_addrobj_add(addr6);
@@ -303 +309 @@
 }
 
+/** Open new IP link..
+ *
+ * @param sid IP link service ID
+ * @return EOK on success or an error code
+ */
+errno_t inet_link_open(service_id_t sid)
+{
+        errno_t rc;
+
+        fibril_mutex_lock(&inet_links_lock);
+        rc = inet_link_open_locked(sid);
+        fibril_mutex_unlock(&inet_links_lock);
+
+        return rc;
+}
+
 /** Send IPv4 datagram over Internet link
  *
@@ -476 +498 @@
 }
 
+/** Find link by service name while inet_links_lock is held.
+ *
+ * @param svc_name Service name
+ * @return Link or @c NULL if not found
+ */
+static inet_link_t *inet_link_get_by_svc_name_locked(const char *svc_name)
+{
+        assert(fibril_mutex_is_locked(&inet_links_lock));
+
+        list_foreach(inet_links, link_list, inet_link_t, ilink) {
+                if (str_cmp(ilink->svc_name, svc_name) == 0)
+                        return ilink;
+        }
+
+        return NULL;
+}
+
+/** Find link by service name.
+ *
+ * @param svc_name Service name
+ * @return Link or @c NULL if not found
+ */
+inet_link_t *inet_link_get_by_svc_name(const char *svc_name)
+{
+        inet_link_t *ilink;
+
+        fibril_mutex_lock(&inet_links_lock);
+        ilink = inet_link_get_by_svc_name_locked(svc_name);
+        fibril_mutex_unlock(&inet_links_lock);
+
+        return ilink;
+}
+
 /** Get IDs of all links. */
 errno_t inet_link_get_id_list(sysarg_t **rid_list, size_t *rcount)
@@ -504 +559 @@
 }
 
+/** Check for new IP links.
+ *
+ * @return EOK on success or an error code
+ */
+static errno_t inet_link_check_new(void)
+{
+        bool already_known;
+        category_id_t iplink_cat;
+        service_id_t *svcs;
+        inet_link_cfg_info_t info;
+        size_t count, i;
+        errno_t rc;
+
+        fibril_mutex_lock(&inet_links_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_links_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_links_lock);
+                return EIO;
+        }
+
+        for (i = 0; i < count; i++) {
+                already_known = false;
+
+                list_foreach(inet_links, link_list, inet_link_t, ilink) {
+                        if (ilink->svc_id == svcs[i]) {
+                                already_known = true;
+                                break;
+                        }
+                }
+
+                if (!already_known) {
+                        log_msg(LOG_DEFAULT, LVL_NOTE, "Found IP link '%lu'",
+                            (unsigned long) svcs[i]);
+                        rc = inet_link_open_locked(svcs[i]);
+                        if (rc != EOK) {
+                                log_msg(LOG_DEFAULT, LVL_ERROR, "Could not "
+                                    "add IP link.");
+                        }
+                } else {
+                        /* Clear so it won't be autoconfigured below */
+                        svcs[i] = 0;
+                }
+        }
+
+        fibril_mutex_unlock(&inet_links_lock);
+
+        /*
+         * Auto-configure new links. Note that newly discovered links
+         * cannot have any configured address objects, because we only
+         * retain configuration for present links.
+         */
+        for (i = 0; i < count; i++) {
+                if (svcs[i] != 0) {
+                        info.svc_id = svcs[i];
+                        rc = loc_service_get_name(info.svc_id, &info.svc_name);
+                        if (rc != EOK) {
+                                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed "
+                                    "getting service name.");
+                                return rc;
+                        }
+
+                        inet_link_autoconf_link(&info);
+                        free(info.svc_name);
+                        info.svc_name = NULL;
+                }
+        }
+
+        return EOK;
+}
+
+/** IP link category change callback.
+ *
+ * @param arg Not used
+ */
+static void inet_link_cat_change_cb(void *arg)
+{
+        (void) inet_link_check_new();
+}
+
+/** Start IP link discovery.
+ *
+ * @return EOK on success or an error code
+ */
+errno_t inet_link_discovery_start(void)
+{
+        errno_t rc;
+
+        rc = loc_register_cat_change_cb(inet_link_cat_change_cb, NULL);
+        if (rc != EOK) {
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering callback "
+                    "for IP link discovery: %s.", str_error(rc));
+                return rc;
+        }
+
+        return inet_link_check_new();
+}
+
+/** Start DHCP autoconfiguration on IP link.
+ *
+ * @param info Link information
+ */
+void inet_link_autoconf_link(inet_link_cfg_info_t *info)
+{
+        errno_t rc;
+
+        log_msg(LOG_DEFAULT, LVL_NOTE, "inet_link_autoconf_link");
+
+        if (str_lcmp(info->svc_name, "net/eth", str_length("net/eth")) == 0) {
+                log_msg(LOG_DEFAULT, LVL_NOTE, "inet_link_autoconf_link : dhcp link add for link '%s' (%u)",
+                    info->svc_name, (unsigned)info->svc_id);
+                rc = dhcp_link_add(info->svc_id);
+                log_msg(LOG_DEFAULT, LVL_NOTE, "inet_link_autoconf_link : dhcp link add for link '%s' (%u) DONE",
+                    info->svc_name, (unsigned)info->svc_id);
+                if (rc != EOK) {
+                        log_msg(LOG_DEFAULT, LVL_WARN, "Failed configuring "
+                            "DHCP on  link '%s'.\n", info->svc_name);
+                }
+        }
+}
+
+/** Start DHCP autoconfiguration on IP links. */
+errno_t inet_link_autoconf(void)
+{
+        inet_link_cfg_info_t *link_info;
+        size_t link_cnt;
+        size_t acnt;
+        size_t i;
+        errno_t rc;
+
+        log_msg(LOG_DEFAULT, LVL_NOTE, "inet_link_autoconf : initialize DHCP");
+        rc = dhcp_init();
+        if (rc != EOK) {
+                log_msg(LOG_DEFAULT, LVL_WARN, "Failed initializing DHCP "
+                    "service.");
+                return rc;
+        }
+
+        log_msg(LOG_DEFAULT, LVL_NOTE, "inet_link_autoconf : initialize DHCP done");
+
+        fibril_mutex_lock(&inet_links_lock);
+        link_cnt = list_count(&inet_links);
+
+        link_info = calloc(link_cnt, sizeof(inet_link_cfg_info_t));
+        if (link_info == NULL) {
+                fibril_mutex_unlock(&inet_links_lock);
+                return ENOMEM;
+        }
+
+        i = 0;
+        list_foreach(inet_links, link_list, inet_link_t, ilink) {
+                assert(i < link_cnt);
+
+                acnt = inet_addrobj_cnt_by_link(ilink);
+                if (acnt != 0) {
+                        /*
+                         * No autoconfiguration if link has configured
+                         * addresses.
+                         */
+                        continue;
+                }
+
+                link_info[i].svc_id = ilink->svc_id;
+                link_info[i].svc_name = str_dup(ilink->svc_name);
+                if (link_info[i].svc_name == NULL) {
+                        fibril_mutex_unlock(&inet_links_lock);
+                        goto error;
+                }
+
+                ++i;
+        }
+
+        fibril_mutex_unlock(&inet_links_lock);
+
+        /* Update link_cnt to include only links slated for autoconfig. */
+        link_cnt = i;
+
+        log_msg(LOG_DEFAULT, LVL_NOTE, "inet_link_autoconf : autoconf links...");
+
+        for (i = 0; i < link_cnt; i++)
+                inet_link_autoconf_link(&link_info[i]);
+
+        for (i = 0; i < link_cnt; i++) {
+                if (link_info[i].svc_name != NULL)
+                        free(link_info[i].svc_name);
+        }
+
+        log_msg(LOG_DEFAULT, LVL_NOTE, "inet_link_autoconf : autoconf links done");
+        return EOK;
+error:
+        for (i = 0; i < link_cnt; i++) {
+                if (link_info[i].svc_name != NULL)
+                        free(link_info[i].svc_name);
+        }
+        free(link_info);
+        return ENOMEM;
+}
+
 /** @}
  */