Changes in uspace/srv/net/inetsrv/ndp.c [b4edc96:1433ecda] in mainline

File:

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

uspace/srv/net/inetsrv/ndp.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2021 Jiri Svoboda
  * Copyright (c) 2013 Antonin Steinhauser
  * All rights reserved.
@@ -37 +36 @@
 
 #include <errno.h>
-#include <inet/eth_addr.h>
-#include <io/log.h>
 #include <mem.h>
 #include <stdlib.h>
+#include <io/log.h>
 #include "ntrans.h"
 #include "addrobj.h"
@@ -71 +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);
 
@@ -110 +108 @@
                 if (laddr != NULL) {
                         rc = ntrans_add(packet.sender_proto_addr,
-                            &packet.sender_hw_addr);
+                            packet.sender_hw_addr);
                         if (rc != EOK)
                                 return rc;
@@ -117 +115 @@
 
                         reply.opcode = ICMPV6_NEIGHBOUR_ADVERTISEMENT;
-                        reply.sender_hw_addr = laddr->ilink->mac;
+                        addr48(laddr->ilink->mac, reply.sender_hw_addr);
                         addr128(packet.target_proto_addr, reply.sender_proto_addr);
-                        reply.target_hw_addr = packet.sender_hw_addr;
+                        addr48(packet.sender_hw_addr, reply.target_hw_addr);
                         addr128(packet.sender_proto_addr, reply.target_proto_addr);
 
@@ -130 +128 @@
                 if (laddr != NULL)
                         return ntrans_add(packet.sender_proto_addr,
-                            &packet.sender_hw_addr);
+                            packet.sender_hw_addr);
 
                 break;
@@ -153 +151 @@
  *
  */
-errno_t ndp_translate(addr128_t src_addr, addr128_t ip_addr, eth_addr_t *mac_addr,
+errno_t ndp_translate(addr128_t src_addr, addr128_t ip_addr, addr48_t mac_addr,
     inet_link_t *ilink)
 {
@@ -169 +167 @@
 
         packet.opcode = ICMPV6_NEIGHBOUR_SOLICITATION;
-        packet.sender_hw_addr = ilink->mac;
+        addr48(ilink->mac, packet.sender_hw_addr);
         addr128(src_addr, packet.sender_proto_addr);
         addr128(ip_addr, packet.solicited_ip);
-        eth_addr_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);