Changeset dc5c303 in mainline for uspace/srv/net/slip/slip.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/slip/slip.c (modified) (10 diffs)

uspace/srv/net/slip/slip.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2021 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * Copyright (c) 2013 Jakub Jermar
  * All rights reserved.
@@ -307 +307 @@
         chardev_t *chardev_out = NULL;
         fid_t fid;
+        loc_srv_t *srv;
         errno_t rc;
 
@@ -314 +315 @@
         async_set_fallback_port_handler(slip_client_conn, NULL);
 
-        rc = loc_server_register(NAME);
+        rc = loc_server_register(NAME, &srv);
         if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_ERROR,
@@ -323 +324 @@
         rc = loc_service_get_id(svcstr, &svcid, 0);
         if (rc != EOK) {
+                loc_server_unregister(srv);
                 log_msg(LOG_DEFAULT, LVL_ERROR,
                     "Failed getting ID for service %s", svcstr);
@@ -330 +332 @@
         rc = loc_category_get_id(CAT_IPLINK, &iplinkcid, 0);
         if (rc != EOK) {
+                loc_server_unregister(srv);
                 log_msg(LOG_DEFAULT, LVL_ERROR,
                     "Failed to get category ID for %s",
@@ -342 +345 @@
         sess_out = loc_service_connect(svcid, INTERFACE_DDF, 0);
         if (!sess_out) {
+                loc_server_unregister(srv);
                 log_msg(LOG_DEFAULT, LVL_ERROR,
                     "Failed to connect to service %s (ID=%d)",
@@ -350 +354 @@
         rc = chardev_open(sess_out, &chardev_out);
         if (rc != EOK) {
+                loc_server_unregister(srv);
                 log_msg(LOG_DEFAULT, LVL_ERROR,
                     "Failed opening character device.");
@@ -373 +378 @@
         }
 
-        rc = loc_service_register(linkstr, &linksid);
+        rc = loc_service_register(srv, linkstr, &linksid);
         if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_ERROR,
@@ -381 +386 @@
         }
 
-        rc = loc_service_add_to_cat(linksid, iplinkcid);
-        if (rc != EOK) {
+        rc = loc_service_add_to_cat(srv, linksid, iplinkcid);
+        if (rc != EOK) {
+                loc_service_unregister(srv, linksid);
                 log_msg(LOG_DEFAULT, LVL_ERROR,
                     "Failed to add service %d (%s) to category %d (%s).",
@@ -401 +407 @@
 
 fail:
+        loc_server_unregister(srv);
         chardev_close(chardev_out);
         if (sess_out)