Changes in uspace/srv/net/ethip/ethip.c [fafb8e5:4c6fd56] in mainline

File:

• uspace/srv/net/ethip/ethip.c (modified) (10 diffs)

uspace/srv/net/ethip/ethip.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2012 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * All rights reserved.
  *
@@ -39 +39 @@
 #include <async.h>
 #include <errno.h>
+#include <inet/eth_addr.h>
 #include <inet/iplink_srv.h>
 #include <io/log.h>
@@ -58 +59 @@
 static errno_t ethip_send6(iplink_srv_t *srv, iplink_sdu6_t *sdu);
 static errno_t ethip_get_mtu(iplink_srv_t *srv, size_t *mtu);
-static errno_t ethip_get_mac48(iplink_srv_t *srv, addr48_t *mac);
-static errno_t ethip_set_mac48(iplink_srv_t *srv, addr48_t *mac);
+static errno_t ethip_get_mac48(iplink_srv_t *srv, eth_addr_t *mac);
+static errno_t ethip_set_mac48(iplink_srv_t *srv, eth_addr_t *mac);
 static errno_t ethip_addr_add(iplink_srv_t *srv, inet_addr_t *addr);
 static errno_t ethip_addr_remove(iplink_srv_t *srv, inet_addr_t *addr);
@@ -77 +78 @@
 };
 
+static loc_srv_t *ethip_srv;
+
 static errno_t ethip_init(void)
 {
         async_set_fallback_port_handler(ethip_client_conn, NULL);
 
-        errno_t rc = loc_server_register(NAME);
+        errno_t rc = loc_server_register(NAME, &ethip_srv);
         if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering server.");
@@ -114 +117 @@
         }
 
-        rc = loc_service_register(svc_name, &sid);
+        rc = loc_service_register(ethip_srv, svc_name, &sid);
         if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering service %s.", svc_name);
@@ -128 +131 @@
         }
 
-        rc = loc_service_add_to_cat(sid, iplink_cat);
+        rc = loc_service_add_to_cat(ethip_srv, sid, iplink_cat);
         if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Failed adding %s to category.", svc_name);
@@ -177 +180 @@
         eth_frame_t frame;
 
-        errno_t rc = arp_translate(nic, sdu->src, sdu->dest, frame.dest);
+        errno_t rc = arp_translate(nic, sdu->src, sdu->dest, &frame.dest);
         if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_WARN, "Failed to look up IPv4 address 0x%"
@@ -184 +187 @@
         }
 
-        addr48(nic->mac_addr, frame.src);
+        frame.src = nic->mac_addr;
         frame.etype_len = ETYPE_IP;
         frame.data = sdu->data;
@@ -208 +211 @@
         eth_frame_t frame;
 
-        addr48(sdu->dest, frame.dest);
-        addr48(nic->mac_addr, frame.src);
+        frame.dest = sdu->dest;
+        frame.src = nic->mac_addr;
         frame.etype_len = ETYPE_IPV6;
         frame.data = sdu->data;
@@ -276 +279 @@
 }
 
-static errno_t ethip_get_mac48(iplink_srv_t *srv, addr48_t *mac)
+static errno_t ethip_get_mac48(iplink_srv_t *srv, eth_addr_t *mac)
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_get_mac48()");
 
         ethip_nic_t *nic = (ethip_nic_t *) srv->arg;
-        addr48(nic->mac_addr, *mac);
-
-        return EOK;
-}
-
-static errno_t ethip_set_mac48(iplink_srv_t *srv, addr48_t *mac)
+        *mac = nic->mac_addr;
+
+        return EOK;
+}
+
+static errno_t ethip_set_mac48(iplink_srv_t *srv, eth_addr_t *mac)
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_set_mac48()");
 
         ethip_nic_t *nic = (ethip_nic_t *) srv->arg;
-        addr48(*mac, nic->mac_addr);
+        nic->mac_addr = *mac;
 
         return EOK;