Changeset 1c6c3e1d in mainline for uspace/srv/net/loopip/loopip.c

Timestamp:

2023-10-22T17:55:33Z (7 months ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

ticket/834-toolchain-update

Children:

350ec74

Parents:

315d487 (diff), 133461c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into ticket

File:

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

uspace/srv/net/loopip/loopip.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2021 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * All rights reserved.
  *
@@ -103 +103 @@
 static errno_t loopip_init(void)
 {
+        loc_srv_t *srv;
+
         async_set_fallback_port_handler(loopip_client_conn, NULL);
 
-        errno_t rc = loc_server_register(NAME);
+        errno_t rc = loc_server_register(NAME, &srv);
         if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering server.");
@@ -119 +121 @@
         const char *svc_name = "net/loopback";
         service_id_t sid;
-        rc = loc_service_register(svc_name, &sid);
-        if (rc != EOK) {
+        rc = loc_service_register(srv, svc_name, &sid);
+        if (rc != EOK) {
+                loc_server_unregister(srv);
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering service %s.",
                     svc_name);
@@ -129 +132 @@
         rc = loc_category_get_id("iplink", &iplink_cat, IPC_FLAG_BLOCKING);
         if (rc != EOK) {
+                loc_service_unregister(srv, sid);
+                loc_server_unregister(srv);
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Failed resolving category 'iplink'.");
                 return rc;
         }
 
-        rc = loc_service_add_to_cat(sid, iplink_cat);
-        if (rc != EOK) {
+        rc = loc_service_add_to_cat(srv, sid, iplink_cat);
+        if (rc != EOK) {
+                loc_service_unregister(srv, sid);
+                loc_server_unregister(srv);
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Failed adding %s to category.",
                     svc_name);
@@ -141 +148 @@
 
         fid_t fid = fibril_create(loopip_recv_fibril, NULL);
-        if (fid == 0)
-                return ENOMEM;
+        if (fid == 0) {
+                loc_service_unregister(srv, sid);
+                loc_server_unregister(srv);
+                return ENOMEM;
+        }
 
         fibril_add_ready(fid);