Changes in uspace/srv/net/slip/slip.c [f2d88f3:4c6fd56] in mainline

File:

• uspace/srv/net/slip/slip.c (modified) (13 diffs)

uspace/srv/net/slip/slip.c

@@ -1 +1 @@
 /*
+ * Copyright (c) 2023 Jiri Svoboda
  * Copyright (c) 2013 Jakub Jermar
  * All rights reserved.
@@ -40 +41 @@
 #include <loc.h>
 #include <inet/addr.h>
+#include <inet/eth_addr.h>
 #include <inet/iplink_srv.h>
 #include <io/chardev.h>
@@ -62 +64 @@
 static errno_t slip_send6(iplink_srv_t *, iplink_sdu6_t *);
 static errno_t slip_get_mtu(iplink_srv_t *, size_t *);
-static errno_t slip_get_mac48(iplink_srv_t *, addr48_t *);
+static errno_t slip_get_mac48(iplink_srv_t *, eth_addr_t *);
 static errno_t slip_addr_add(iplink_srv_t *, inet_addr_t *);
 static errno_t slip_addr_remove(iplink_srv_t *, inet_addr_t *);
@@ -176 +178 @@
 }
 
-errno_t slip_get_mac48(iplink_srv_t *src, addr48_t *mac)
+errno_t slip_get_mac48(iplink_srv_t *src, eth_addr_t *mac)
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG, "slip_get_mac48()");
@@ -305 +307 @@
         chardev_t *chardev_out = NULL;
         fid_t fid;
+        loc_srv_t *srv;
         errno_t rc;
 
@@ -312 +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,
@@ -321 +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);
@@ -328 +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",
@@ -340 +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)",
@@ -348 +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.");
@@ -371 +378 @@
         }
 
-        rc = loc_service_register(linkstr, &linksid);
+        rc = loc_service_register(srv, linkstr, &linksid);
         if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_ERROR,
@@ -379 +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).",
@@ -399 +407 @@
 
 fail:
+        loc_server_unregister(srv);
         chardev_close(chardev_out);
         if (sess_out)