Changes in uspace/srv/net/dhcp/main.c [fafb8e5:1bbc6dc] in mainline

File:

• uspace/srv/net/dhcp/main.c (modified) (5 diffs)

uspace/srv/net/dhcp/main.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2013 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>
@@ -54 +53 @@
 static errno_t dhcp_init(void)
 {
+        loc_srv_t *srv;
         errno_t rc;
 
@@ -60 +60 @@
         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);
 
-        rc = loc_server_register(NAME);
+        rc = loc_server_register(NAME, &srv);
         if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering server: %s.", str_error(rc));
@@ -75 +69 @@
 
         service_id_t sid;
-        rc = loc_service_register(SERVICE_NAME_DHCP, &sid);
+        rc = loc_service_register(srv, SERVICE_NAME_DHCP, &sid);
         if (rc != EOK) {
+                loc_server_unregister(srv);
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering service: %s.", str_error(rc));
                 return EEXIST;