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

Timestamp:

2023-10-22T17:55:33Z (21 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/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;