Changeset 4c6fd56 in mainline for uspace/srv/net/nconfsrv

Timestamp:

2023-09-16T19:58:18Z (3 years 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/nconfsrv/nconfsrv.c (modified) (5 diffs)

uspace/srv/net/nconfsrv/nconfsrv.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2013 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * All rights reserved.
  *
@@ -59 +59 @@
 {
         service_id_t sid;
+        loc_srv_t *srv;
         errno_t rc;
 
@@ -79 +80 @@
         async_set_fallback_port_handler(ncs_client_conn, NULL);
 
-        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));
@@ -85 +86 @@
         }
 
-        rc = loc_service_register(SERVICE_NAME_NETCONF, &sid);
+        rc = loc_service_register(srv, SERVICE_NAME_NETCONF, &sid);
         if (rc != EOK) {
+                loc_server_unregister(srv);
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering service: %s.", str_error(rc));
                 return EEXIST;
@@ -92 +94 @@
 
         rc = ncs_link_discovery_start();
-        if (rc != EOK)
+        if (rc != EOK) {
+                loc_service_unregister(srv, sid);
+                loc_server_unregister(srv);
                 return EEXIST;
+        }
 
         return EOK;