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

Timestamp:

2013-06-20T16:45:58Z (11 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

08bb73b

Parents:

19a4f73

Message:

use new network address infrastructure (towards IPv6 support)

File:

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

uspace/srv/net/ethip/arp.c

@@ -66 +66 @@
 
         log_msg(LOG_DEFAULT, LVL_DEBUG, "ARP PDU decoded, opcode=%d, tpa=%x",
-            packet.opcode, packet.target_proto_addr.ipv4);
+            packet.opcode, packet.target_proto_addr);
 
-        laddr = ethip_nic_addr_find(nic, &packet.target_proto_addr);
+        laddr = ethip_nic_addr_find(nic, packet.target_proto_addr);
         if (laddr != NULL) {
                 log_msg(LOG_DEFAULT, LVL_DEBUG, "Request/reply to my address");
 
-                (void) atrans_add(&packet.sender_proto_addr,
+                (void) atrans_add(packet.sender_proto_addr,
                     &packet.sender_hw_addr);
 
@@ -87 +87 @@
 }
 
-int arp_translate(ethip_nic_t *nic, iplink_srv_addr_t *src_addr,
-    iplink_srv_addr_t *ip_addr, mac48_addr_t *mac_addr)
+int arp_translate(ethip_nic_t *nic, uint32_t src_addr, uint32_t ip_addr,
+    mac48_addr_t *mac_addr)
 {
         int rc;
@@ -99 +99 @@
         packet.opcode = aop_request;
         packet.sender_hw_addr = nic->mac_addr;
-        packet.sender_proto_addr = *src_addr;
+        packet.sender_proto_addr = src_addr;
         packet.target_hw_addr.addr = MAC48_BROADCAST;
-        packet.target_proto_addr = *ip_addr;
+        packet.target_proto_addr = ip_addr;
 
         rc = arp_send_packet(nic, &packet);