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

File:

• uspace/srv/net/inetsrv/inetsrv.c (modified) (6 diffs)

uspace/srv/net/inetsrv/inetsrv.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2012 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)
@@ -104 +118 @@
                 return rc;
 
-        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));
@@ -111 +125 @@
 
         service_id_t sid;
-        rc = loc_service_register(SERVICE_NAME_INET, &sid);
-        if (rc != EOK) {
+        rc = loc_service_register(srv, SERVICE_NAME_INET, &sid);
+        if (rc != EOK) {
+                loc_server_unregister(srv);
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering service: %s.", str_error(rc));
                 return EEXIST;
@@ -553 +568 @@
 
         printf(NAME ": Accepting connections.\n");
+
         task_retval(0);
+
+        (void)inet_link_autoconf();
         async_manager();