Changeset ca48672 in mainline for uspace/srv/net/inetsrv/inetsrv.c

Timestamp:

2025-06-20T15:18:27Z (35 hours ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

cb20b05

Parents:

3951046

Message:

loc_service_register() needs to take a port ID argument.

File:

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

uspace/srv/net/inetsrv/inetsrv.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2024 Jiri Svoboda
+ * Copyright (c) 2025 Jiri Svoboda
  * All rights reserved.
  *
@@ -108 +108 @@
                 return rc;
 
-        rc = async_create_port(INTERFACE_INETCFG,
-            inet_cfg_conn, NULL, &port);
-        if (rc != EOK)
-                return rc;
-
-        rc = async_create_port(INTERFACE_INETPING,
-            inetping_conn, NULL, &port);
-        if (rc != EOK)
-                return rc;
+        rc = async_port_create_interface(port, INTERFACE_INETCFG,
+            inet_cfg_conn, NULL);
+        if (rc != EOK) {
+                async_port_destroy(port);
+                return rc;
+        }
+
+        rc = async_port_create_interface(port, INTERFACE_INETPING,
+            inetping_conn, NULL);
+        if (rc != EOK) {
+                async_port_destroy(port);
+                return rc;
+        }
 
         rc = loc_server_register(NAME, &srv);
         if (rc != EOK) {
+                async_port_destroy(port);
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering server: %s.", str_error(rc));
                 return EEXIST;
@@ -125 +130 @@
 
         service_id_t sid;
-        rc = loc_service_register(srv, SERVICE_NAME_INET, &sid);
-        if (rc != EOK) {
+        rc = loc_service_register(srv, SERVICE_NAME_INET, port, &sid);
+        if (rc != EOK) {
+                async_port_destroy(port);
                 loc_server_unregister(srv);
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering service: %s.", str_error(rc));