Changeset d5ed54b in mainline

Timestamp:

2021-08-08T08:31:02Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

b4edc96

Parents:

f05edcb

Message:

Use assignment operator to copy Ethernet addresses

Location:

uspace

Files:

• lib/inet/include/inet/addr.h (modified) (1 diff)
• lib/inet/src/addr.c (modified) (1 diff)
• srv/net/ethip/arp.c (modified) (4 diffs)
• srv/net/ethip/atrans.c (modified) (2 diffs)
• srv/net/ethip/ethip.c (modified) (4 diffs)
• srv/net/inetsrv/inet_link.c (modified) (1 diff)
• srv/net/inetsrv/inetcfg.c (modified) (1 diff)
• srv/net/inetsrv/ndp.c (modified) (2 diffs)
• srv/net/inetsrv/ntrans.c (modified) (2 diffs)

uspace/lib/inet/include/inet/addr.h

@@ -86 +86 @@
 extern const addr48_t addr48_broadcast;
 
-extern void addr48(const addr48_t *, addr48_t *);
 extern void addr128(const addr128_t, addr128_t);
 

uspace/lib/inet/src/addr.c

@@ -71 +71 @@
         .addr6 = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
 };
-
-void addr48(const addr48_t *src, addr48_t *dst)
-{
-        memcpy(dst, src, sizeof(addr48_t));
-}
 
 void addr128(const addr128_t src, addr128_t dst)

uspace/srv/net/ethip/arp.c

@@ -85 +85 @@
 
                 reply.opcode = aop_reply;
-                addr48(&nic->mac_addr, &reply.sender_hw_addr);
+                reply.sender_hw_addr = nic->mac_addr;
                 reply.sender_proto_addr = laddr_v4;
-                addr48(&packet.sender_hw_addr, &reply.target_hw_addr);
+                reply.target_hw_addr = packet.sender_hw_addr;
                 reply.target_proto_addr = packet.sender_proto_addr;
 
@@ -99 +99 @@
         /* Broadcast address */
         if (ip_addr == addr32_broadcast_all_hosts) {
-                addr48(&addr48_broadcast, mac_addr);
+                *mac_addr = addr48_broadcast;
                 return EOK;
         }
@@ -110 +110 @@
 
         packet.opcode = aop_request;
-        addr48(&nic->mac_addr, &packet.sender_hw_addr);
+        packet.sender_hw_addr = nic->mac_addr;
         packet.sender_proto_addr = src_addr;
-        addr48(&addr48_broadcast, &packet.target_hw_addr);
+        packet.target_hw_addr = addr48_broadcast;
         packet.target_proto_addr = ip_addr;
 
@@ -138 +138 @@
                 return rc;
 
-        addr48(&packet->target_hw_addr, &frame.dest);
-        addr48(&packet->sender_hw_addr, &frame.src);
+        frame.dest = packet->target_hw_addr;
+        frame.src = packet->sender_hw_addr;
         frame.etype_len = ETYPE_ARP;
         frame.data = pdata;

uspace/srv/net/ethip/atrans.c

@@ -69 +69 @@
 
         atrans->ip_addr = ip_addr;
-        addr48(mac_addr, &atrans->mac_addr);
+        atrans->mac_addr = *mac_addr;
 
         fibril_mutex_lock(&atrans_list_lock);
@@ -109 +109 @@
                 return ENOENT;
 
-        addr48(&atrans->mac_addr, mac_addr);
+        *mac_addr = atrans->mac_addr;
         return EOK;
 }

uspace/srv/net/ethip/ethip.c

@@ -184 +184 @@
         }
 
-        addr48(&nic->mac_addr, &frame.src);
+        frame.src = nic->mac_addr;
         frame.etype_len = ETYPE_IP;
         frame.data = sdu->data;
@@ -208 +208 @@
         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;
@@ -281 +281 @@
 
         ethip_nic_t *nic = (ethip_nic_t *) srv->arg;
-        addr48(&nic->mac_addr, mac);
+        *mac = nic->mac_addr;
 
         return EOK;
@@ -291 +291 @@
 
         ethip_nic_t *nic = (ethip_nic_t *) srv->arg;
-        addr48(mac, &nic->mac_addr);
+        nic->mac_addr = *mac;
 
         return EOK;

uspace/srv/net/inetsrv/inet_link.c

@@ -401 +401 @@
 
         iplink_sdu6_t sdu6;
-        addr48(ldest, &sdu6.dest);
+        sdu6.dest = *ldest;
 
         /*

uspace/srv/net/inetsrv/inetcfg.c

@@ -177 +177 @@
         linfo->def_mtu = ilink->def_mtu;
         if (ilink->mac_valid) {
-                addr48(&ilink->mac, &linfo->mac_addr);
+                linfo->mac_addr = ilink->mac;
         } else {
                 memset(&linfo->mac_addr, 0, sizeof(linfo->mac_addr));

uspace/srv/net/inetsrv/ndp.c

@@ -115 +115 @@
 
                         reply.opcode = ICMPV6_NEIGHBOUR_ADVERTISEMENT;
-                        addr48(&laddr->ilink->mac, &reply.sender_hw_addr);
+                        reply.sender_hw_addr = laddr->ilink->mac;
                         addr128(packet.target_proto_addr, reply.sender_proto_addr);
-                        addr48(&packet.sender_hw_addr, &reply.target_hw_addr);
+                        reply.target_hw_addr = packet.sender_hw_addr;
                         addr128(packet.sender_proto_addr, reply.target_proto_addr);
 
@@ -167 +167 @@
 
         packet.opcode = ICMPV6_NEIGHBOUR_SOLICITATION;
-        addr48(&ilink->mac, &packet.sender_hw_addr);
+        packet.sender_hw_addr = ilink->mac;
         addr128(src_addr, packet.sender_proto_addr);
         addr128(ip_addr, packet.solicited_ip);

uspace/srv/net/inetsrv/ntrans.c

@@ -83 +83 @@
 
         addr128(ip_addr, ntrans->ip_addr);
-        addr48(mac_addr, &ntrans->mac_addr);
+        ntrans->mac_addr = *mac_addr;
 
         fibril_mutex_lock(&ntrans_list_lock);
@@ -144 +144 @@
 
         fibril_mutex_unlock(&ntrans_list_lock);
-        addr48(&ntrans->mac_addr, mac_addr);
+        *mac_addr = ntrans->mac_addr;
         return EOK;
 }