Changeset 1bbc6dc in mainline for uspace/srv/net/dhcp/main.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/dhcp/main.c (modified) (3 diffs)

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