Changeset 3e6bca8 in mainline for uspace/srv

Timestamp:

2021-08-08T17:30:29Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

a7f7b9c3

Parents:

b4edc96

Message:

Represent Ethernet address as a number instead of an array

Carefully document the design since this breaks the principle of least
surprise. Also add unit tests.

Location:

uspace/srv/net

Files:

• dhcp/dhcp.c (modified) (2 diffs)
• inetsrv/inet_link.c (modified) (2 diffs)

uspace/srv/net/dhcp/dhcp.c

@@ -162 +162 @@
         hdr->flags = flag_broadcast;
 
-        memcpy(dlink->link_info.mac_addr.b, hdr->chaddr,
-            sizeof(dlink->link_info.mac_addr.b));
+        eth_addr_encode(&dlink->link_info.mac_addr, hdr->chaddr);
         hdr->opt_magic = host2uint32_t_be(dhcp_opt_magic);
 
@@ -187 +186 @@
         hdr->flags = flag_broadcast;
         hdr->ciaddr = host2uint32_t_be(offer->oaddr.addr);
-        memcpy(hdr->chaddr, dlink->link_info.mac_addr.b, 6);
+        eth_addr_encode(&dlink->link_info.mac_addr, hdr->chaddr);
         hdr->opt_magic = host2uint32_t_be(dhcp_opt_magic);
 

uspace/srv/net/inetsrv/inet_link.c

@@ -74 +74 @@
     addr128_t ip_addr)
 {
+        uint8_t b[ETH_ADDR_SIZE];
+
         memcpy(ip_addr, link_local_node_ip, 16);
-
-        ip_addr[8] = mac_addr->b[0] ^ 0x02;
-        ip_addr[9] = mac_addr->b[1];
-        ip_addr[10] = mac_addr->b[2];
-        ip_addr[13] = mac_addr->b[3];
-        ip_addr[14] = mac_addr->b[4];
-        ip_addr[15] = mac_addr->b[5];
+        eth_addr_encode(mac_addr, b);
+
+        ip_addr[8] = b[0] ^ 0x02;
+        ip_addr[9] = b[1];
+        ip_addr[10] = b[2];
+        ip_addr[13] = b[3];
+        ip_addr[14] = b[4];
+        ip_addr[15] = b[5];
 }
 
@@ -124 +127 @@
 static errno_t inet_iplink_change_addr(iplink_t *iplink, eth_addr_t *mac)
 {
+        eth_addr_str_t saddr;
+
+        eth_addr_format(mac, &saddr);
         log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_iplink_change_addr(): "
-            "new addr=%02x:%02x:%02x:%02x:%02x:%02x",
-            mac->b[0], mac->b[1], mac->b[2], mac->b[3], mac->b[4], mac->b[5]);
+            "new addr=%s", saddr.str);
 
         list_foreach(inet_links, link_list, inet_link_t, ilink) {