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

Timestamp:

2024-10-13T08:23:40Z (8 weeks 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/inetsrv.c (modified) (4 diffs)

uspace/srv/net/inetsrv/inetsrv.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2023 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -79 +79 @@
 };
 
+static const char *inet_cfg_path = "/w/cfg/inetsrv.sif";
+
 static FIBRIL_MUTEX_INITIALIZE(client_list_lock);
 static LIST_INITIALIZE(client_list);
+inet_cfg_t *cfg;
 
 static void inet_default_conn(ipc_call_t *, void *);
@@ -86 +89 @@
 static errno_t inet_init(void)
 {
+        port_id_t port;
+        errno_t rc;
         loc_srv_t *srv;
 
         log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_init()");
 
-        port_id_t port;
-        errno_t rc = async_create_port(INTERFACE_INET,
+        rc = inet_link_discovery_start();
+        if (rc != EOK)
+                return rc;
+
+        rc = inet_cfg_open(inet_cfg_path, &cfg);
+        if (rc != EOK)
+                return rc;
+
+        rc = async_create_port(INTERFACE_INET,
             inet_default_conn, NULL, &port);
         if (rc != EOK)
@@ -556 +568 @@
 
         printf(NAME ": Accepting connections.\n");
+
         task_retval(0);
+
+        (void)inet_link_autoconf();
         async_manager();