Changeset f05edcb in mainline for uspace/srv/net/inetsrv/ndp.c

Timestamp:

2021-08-08T08:28:24Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d5ed54b

Parents:

98a935e

Message:

Make addr48_t a structure

File:

• uspace/srv/net/inetsrv/ndp.c (modified) (6 diffs)

uspace/srv/net/inetsrv/ndp.c

@@ -69 +69 @@
         ndp_pdu_encode(packet, &dgram);
 
-        inet_link_send_dgram6(link, packet->target_hw_addr, &dgram,
+        inet_link_send_dgram6(link, &packet->target_hw_addr, &dgram,
             IP_PROTO_ICMPV6, INET6_HOP_LIMIT_MAX, 0);
 
@@ -108 +108 @@
                 if (laddr != NULL) {
                         rc = ntrans_add(packet.sender_proto_addr,
-                            packet.sender_hw_addr);
+                            &packet.sender_hw_addr);
                         if (rc != EOK)
                                 return rc;
@@ -115 +115 @@
 
                         reply.opcode = ICMPV6_NEIGHBOUR_ADVERTISEMENT;
-                        addr48(laddr->ilink->mac, reply.sender_hw_addr);
+                        addr48(&laddr->ilink->mac, &reply.sender_hw_addr);
                         addr128(packet.target_proto_addr, reply.sender_proto_addr);
-                        addr48(packet.sender_hw_addr, reply.target_hw_addr);
+                        addr48(&packet.sender_hw_addr, &reply.target_hw_addr);
                         addr128(packet.sender_proto_addr, reply.target_proto_addr);
 
@@ -128 +128 @@
                 if (laddr != NULL)
                         return ntrans_add(packet.sender_proto_addr,
-                            packet.sender_hw_addr);
+                            &packet.sender_hw_addr);
 
                 break;
@@ -151 +151 @@
  *
  */
-errno_t ndp_translate(addr128_t src_addr, addr128_t ip_addr, addr48_t mac_addr,
+errno_t ndp_translate(addr128_t src_addr, addr128_t ip_addr, addr48_t *mac_addr,
     inet_link_t *ilink)
 {
@@ -167 +167 @@
 
         packet.opcode = ICMPV6_NEIGHBOUR_SOLICITATION;
-        addr48(ilink->mac, packet.sender_hw_addr);
+        addr48(&ilink->mac, &packet.sender_hw_addr);
         addr128(src_addr, packet.sender_proto_addr);
         addr128(ip_addr, packet.solicited_ip);
-        addr48_solicited_node(ip_addr, packet.target_hw_addr);
+        addr48_solicited_node(ip_addr, &packet.target_hw_addr);
         ndp_solicited_node_ip(ip_addr, packet.target_proto_addr);