Changes in uspace/srv/net/ethip/ethip_nic.c [fafb8e5:e82b37e] in mainline

File:

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

uspace/srv/net/ethip/ethip_nic.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2012 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -37 +37 @@
 #include <adt/list.h>
 #include <async.h>
-#include <stdbool.h>
 #include <errno.h>
-#include <str_error.h>
 #include <fibril_synch.h>
+#include <inet/eth_addr.h>
 #include <inet/iplink_srv.h>
 #include <io/log.h>
 #include <loc.h>
+#include <mem.h>
 #include <nic_iface.h>
+#include <stdbool.h>
 #include <stdlib.h>
-#include <mem.h>
+#include <str_error.h>
 #include "ethip.h"
 #include "ethip_nic.h"
@@ -193 +194 @@
         }
 
-        addr48(nic_address.address, nic->mac_addr);
+        eth_addr_decode(nic_address.address, &nic->mac_addr);
 
         rc = nic_set_state(nic->sess, NIC_STATE_ACTIVE);
@@ -233 +234 @@
         uint8_t *addr;
         size_t size;
+        eth_addr_str_t saddr;
         errno_t rc;
 
@@ -241 +243 @@
         }
 
+        eth_addr_decode(addr, &nic->mac_addr);
+        eth_addr_format(&nic->mac_addr, &saddr);
+
         log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_nic_addr_changed(): "
-            "new addr=%02x:%02x:%02x:%02x:%02x:%02x",
-            addr[0], addr[1], addr[2], addr[3], addr[4], addr[5]);
-
-        memcpy(&nic->mac_addr, addr, sizeof(nic->mac_addr));
+            "new addr=%s", saddr.str);
 
         rc = iplink_ev_change_addr(&nic->iplink, &nic->mac_addr);
@@ -399 +401 @@
                 assert(i < count);
 
-                addr48_t mac;
-                addr48_solicited_node(v6, mac);
+                eth_addr_t mac;
+                eth_addr_solicited_node(v6, &mac);
 
                 /* Avoid duplicate addresses in the list */
@@ -407 +409 @@
 
                 for (size_t j = 0; j < i; j++) {
-                        if (addr48_compare(mac_list[j].address, mac)) {
+                        eth_addr_t mac_entry;
+                        eth_addr_decode(mac_list[j].address, &mac_entry);
+                        if (eth_addr_compare(&mac_entry, &mac)) {
                                 found = true;
                                 break;
@@ -414 +418 @@
 
                 if (!found) {
-                        addr48(mac, mac_list[i].address);
+                        eth_addr_encode(&mac, mac_list[i].address);
                         i++;
-                } else
+                } else {
                         count--;
+                }
         }