Changeset 8a9a41e in mainline for uspace/srv/net/ethip/arp.c

Timestamp:

2021-10-24T08:28:43Z (2 years ago)

Author:

GitHub <noreply@…>

Children:

f628215

Parents:

2ce943a (diff), cd981f2a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Erik Kučák <35500848+Riko196@…> (2021-10-24 08:28:43)

git-committer:

GitHub <noreply@…> (2021-10-24 08:28:43)

Message:

Merge branch 'HelenOS:master' into master

File:

• uspace/srv/net/ethip/arp.c (modified) (7 diffs)

uspace/srv/net/ethip/arp.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2012 Jiri Svoboda
+ * Copyright (c) 2021 Jiri Svoboda
  * All rights reserved.
  *
@@ -36 +36 @@
 
 #include <errno.h>
-#include <io/log.h>
 #include <inet/iplink_srv.h>
 #include <inet/addr.h>
+#include <inet/eth_addr.h>
+#include <io/log.h>
 #include <stdlib.h>
 #include "arp.h"
@@ -79 +80 @@
 
         (void) atrans_add(packet.sender_proto_addr,
-            packet.sender_hw_addr);
+            &packet.sender_hw_addr);
 
         if (packet.opcode == aop_request) {
@@ -85 +86 @@
 
                 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;
 
@@ -95 +96 @@
 
 errno_t arp_translate(ethip_nic_t *nic, addr32_t src_addr, addr32_t ip_addr,
-    addr48_t mac_addr)
+    eth_addr_t *mac_addr)
 {
         /* Broadcast address */
         if (ip_addr == addr32_broadcast_all_hosts) {
-                addr48(addr48_broadcast, mac_addr);
+                *mac_addr = eth_addr_broadcast;
                 return EOK;
         }
@@ -110 +111 @@
 
         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 = eth_addr_broadcast;
         packet.target_proto_addr = ip_addr;
 
@@ -138 +139 @@
                 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;