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

Timestamp:

2021-08-08T08:28:24Z (3 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/ethip/arp.c (modified) (6 diffs)

uspace/srv/net/ethip/arp.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2012 Jiri Svoboda
+ * Copyright (c) 2021 Jiri Svoboda
  * All rights reserved.
  *
@@ -79 +79 @@
 
         (void) atrans_add(packet.sender_proto_addr,
-            packet.sender_hw_addr);
+            &packet.sender_hw_addr);
 
         if (packet.opcode == aop_request) {
@@ -85 +85 @@
 
                 reply.opcode = aop_reply;
-                addr48(nic->mac_addr, reply.sender_hw_addr);
+                addr48(&nic->mac_addr, &reply.sender_hw_addr);
                 reply.sender_proto_addr = laddr_v4;
-                addr48(packet.sender_hw_addr, reply.target_hw_addr);
+                addr48(&packet.sender_hw_addr, &reply.target_hw_addr);
                 reply.target_proto_addr = packet.sender_proto_addr;
 
@@ -95 +95 @@
 
 errno_t arp_translate(ethip_nic_t *nic, addr32_t src_addr, addr32_t ip_addr,
-    addr48_t mac_addr)
+    addr48_t *mac_addr)
 {
         /* Broadcast address */
         if (ip_addr == addr32_broadcast_all_hosts) {
-                addr48(addr48_broadcast, mac_addr);
+                addr48(&addr48_broadcast, mac_addr);
                 return EOK;
         }
@@ -110 +110 @@
 
         packet.opcode = aop_request;
-        addr48(nic->mac_addr, packet.sender_hw_addr);
+        addr48(&nic->mac_addr, &packet.sender_hw_addr);
         packet.sender_proto_addr = src_addr;
-        addr48(addr48_broadcast, packet.target_hw_addr);
+        addr48(&addr48_broadcast, &packet.target_hw_addr);
         packet.target_proto_addr = ip_addr;
 
@@ -138 +138 @@
                 return rc;
 
-        addr48(packet->target_hw_addr, frame.dest);
-        addr48(packet->sender_hw_addr, frame.src);
+        addr48(&packet->target_hw_addr, &frame.dest);
+        addr48(&packet->sender_hw_addr, &frame.src);
         frame.etype_len = ETYPE_ARP;
         frame.data = pdata;