Changeset 1bbc6dc in mainline for uspace/srv/net/inetsrv/inetsrv.c

Timestamp:

2024-09-17T06:44:46Z (5 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

9aa51406

Parents:

096c0786

git-author:

Jiri Svoboda <jiri@…> (2024-09-16 18:44:38)

git-committer:

Jiri Svoboda <jiri@…> (2024-09-17 06:44:46)

Message:

Network configuration persistence.

nconfsrv is folded into inetsrv
DHCP is disabled when a static address is configured on a link

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();