Changes in uspace/srv/net/loopip/loopip.c [984a9ba:4c6fd56] in mainline

File:

• uspace/srv/net/loopip/loopip.c (modified) (8 diffs)

uspace/srv/net/loopip/loopip.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2012 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * All rights reserved.
  *
@@ -41 +41 @@
 #include <inet/iplink_srv.h>
 #include <inet/addr.h>
+#include <inet/eth_addr.h>
 #include <io/log.h>
 #include <loc.h>
@@ -55 +56 @@
 static errno_t loopip_send6(iplink_srv_t *srv, iplink_sdu6_t *sdu);
 static errno_t loopip_get_mtu(iplink_srv_t *srv, size_t *mtu);
-static errno_t loopip_get_mac48(iplink_srv_t *srv, addr48_t *mac);
+static errno_t loopip_get_mac48(iplink_srv_t *srv, eth_addr_t *mac);
 static errno_t loopip_addr_add(iplink_srv_t *srv, inet_addr_t *addr);
 static errno_t loopip_addr_remove(iplink_srv_t *srv, inet_addr_t *addr);
@@ -102 +103 @@
 static errno_t loopip_init(void)
 {
+        loc_srv_t *srv;
+
         async_set_fallback_port_handler(loopip_client_conn, NULL);
 
-        errno_t rc = loc_server_register(NAME);
+        errno_t rc = loc_server_register(NAME, &srv);
         if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering server.");
@@ -118 +121 @@
         const char *svc_name = "net/loopback";
         service_id_t sid;
-        rc = loc_service_register(svc_name, &sid);
-        if (rc != EOK) {
+        rc = loc_service_register(srv, svc_name, &sid);
+        if (rc != EOK) {
+                loc_server_unregister(srv);
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering service %s.",
                     svc_name);
@@ -128 +132 @@
         rc = loc_category_get_id("iplink", &iplink_cat, IPC_FLAG_BLOCKING);
         if (rc != EOK) {
+                loc_service_unregister(srv, sid);
+                loc_server_unregister(srv);
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Failed resolving category 'iplink'.");
                 return rc;
         }
 
-        rc = loc_service_add_to_cat(sid, iplink_cat);
-        if (rc != EOK) {
+        rc = loc_service_add_to_cat(srv, sid, iplink_cat);
+        if (rc != EOK) {
+                loc_service_unregister(srv, sid);
+                loc_server_unregister(srv);
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Failed adding %s to category.",
                     svc_name);
@@ -140 +148 @@
 
         fid_t fid = fibril_create(loopip_recv_fibril, NULL);
-        if (fid == 0)
-                return ENOMEM;
+        if (fid == 0) {
+                loc_service_unregister(srv, sid);
+                loc_server_unregister(srv);
+                return ENOMEM;
+        }
 
         fibril_add_ready(fid);
@@ -231 +242 @@
 }
 
-static errno_t loopip_get_mac48(iplink_srv_t *src, addr48_t *mac)
+static errno_t loopip_get_mac48(iplink_srv_t *src, eth_addr_t *mac)
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG, "loopip_get_mac48()");