Changeset d5ed54b in mainline for uspace/srv/net/inetsrv

Timestamp:

2021-08-08T08:31:02Z (4 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/srv/net/inetsrv

Files:

• inet_link.c (modified) (1 diff)
• inetcfg.c (modified) (1 diff)
• ndp.c (modified) (2 diffs)
• ntrans.c (modified) (2 diffs)

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;
 }