Changeset 1bbc6dc in mainline for uspace/srv/net/dhcp

Timestamp:

2024-09-17T06:44:46Z (10 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

Location:

uspace/srv/net/dhcp

Files:

• dhcp.c (modified) (3 diffs)
• main.c (modified) (3 diffs)

uspace/srv/net/dhcp/dhcp.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2022 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -71 +71 @@
 static list_t dhcp_links;
 
+bool inetcfg_inited = false;
+
 static void dhcpsrv_discover_timeout(void *);
 static void dhcpsrv_request_timeout(void *);
@@ -468 +470 @@
         log_msg(LOG_DEFAULT, LVL_DEBUG, "dhcpsrv_link_add(%zu)", link_id);
 
+        if (!inetcfg_inited) {
+                rc = inetcfg_init();
+                if (rc != EOK) {
+                        log_msg(LOG_DEFAULT, LVL_ERROR, "Error contacting "
+                            "inet configuration service.\n");
+                        return EIO;
+                }
+
+                inetcfg_inited = true;
+        }
+
         if (dhcpsrv_link_find(link_id) != NULL) {
                 log_msg(LOG_DEFAULT, LVL_NOTE, "Link %zu already added",

uspace/srv/net/dhcp/main.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2023 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -38 +38 @@
 #include <str_error.h>
 #include <io/log.h>
-#include <inet/inetcfg.h>
 #include <ipc/dhcp.h>
 #include <ipc/services.h>
@@ -60 +59 @@
 
         dhcpsrv_links_init();
-
-        rc = inetcfg_init();
-        if (rc != EOK) {
-                log_msg(LOG_DEFAULT, LVL_ERROR, "Error contacting inet configuration service.\n");
-                return EIO;
-        }
 
         async_set_fallback_port_handler(dhcp_client_conn, NULL);