Changeset 4c6fd56 in mainline for uspace/srv/net/loopip/loopip.c

Timestamp:

2023-09-16T19:58:18Z (20 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

7d7f5e3

Parents:

6a0b2cc

git-author:

Jiri Svoboda <jiri@…> (2023-09-16 19:48:07)

git-committer:

Jiri Svoboda <jiri@…> (2023-09-16 19:58:18)

Message:

loc_server_register() should be callable more than once (API only)

Now loc_server_register() returns a pointer to a loc_srv_t object,
that is then passed to loc_service_register() and
loc_service_add_to_cat().

Added loc_server_unregister() that unregisters the server
and frees the loc_srv_t object.

Updated all callers. The implementation, however, is a stub.
It is not actually possible to call loc_server_register() more
than once, yet.

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