Changeset dc5c303 in mainline for uspace/srv/net/inetsrv/inetsrv.c

Timestamp:

2023-12-28T13:59:23Z (14 months ago)

Author:

GitHub <noreply@…>

Children:

6b66de6b

Parents:

42c2e65 (diff), f87ff8e (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.

git-author:

boba-buba <120932204+boba-buba@…> (2023-12-28 13:59:23)

git-committer:

GitHub <noreply@…> (2023-12-28 13:59:23)

Message:

Merge branch 'master' into topic/packet-capture

File:

• uspace/srv/net/inetsrv/inetsrv.c (modified) (4 diffs)

uspace/srv/net/inetsrv/inetsrv.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2012 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * All rights reserved.
  *
@@ -86 +86 @@
 static errno_t inet_init(void)
 {
+        loc_srv_t *srv;
+
         log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_init()");
 
@@ -104 +106 @@
                 return rc;
 
-        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));
@@ -111 +113 @@
 
         service_id_t sid;
-        rc = loc_service_register(SERVICE_NAME_INET, &sid);
-        if (rc != EOK) {
+        rc = loc_service_register(srv, SERVICE_NAME_INET, &sid);
+        if (rc != EOK) {
+                loc_server_unregister(srv);
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering service: %s.", str_error(rc));
                 return EEXIST;