Changeset 4c6fd56 in mainline for uspace/srv/net/ethip/ethip.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/ethip/ethip.c (modified) (4 diffs)

uspace/srv/net/ethip/ethip.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2021 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * All rights reserved.
  *
@@ -78 +78 @@
 };
 
+static loc_srv_t *ethip_srv;
+
 static errno_t ethip_init(void)
 {
         async_set_fallback_port_handler(ethip_client_conn, NULL);
 
-        errno_t rc = loc_server_register(NAME);
+        errno_t rc = loc_server_register(NAME, &ethip_srv);
         if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering server.");
@@ -115 +117 @@
         }
 
-        rc = loc_service_register(svc_name, &sid);
+        rc = loc_service_register(ethip_srv, svc_name, &sid);
         if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering service %s.", svc_name);
@@ -129 +131 @@
         }
 
-        rc = loc_service_add_to_cat(sid, iplink_cat);
+        rc = loc_service_add_to_cat(ethip_srv, sid, iplink_cat);
         if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Failed adding %s to category.", svc_name);