Changes in uspace/srv/net/ethip/arp.c [b4edc96:a35b458] in mainline
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/srv/net/ethip/arp.c
rb4edc96 ra35b458 1 1 /* 2 * Copyright (c) 20 21Jiri Svoboda2 * Copyright (c) 2012 Jiri Svoboda 3 3 * All rights reserved. 4 4 * … … 36 36 37 37 #include <errno.h> 38 #include <io/log.h> 38 39 #include <inet/iplink_srv.h> 39 40 #include <inet/addr.h> 40 #include <inet/eth_addr.h>41 #include <io/log.h>42 41 #include <stdlib.h> 43 42 #include "arp.h" … … 80 79 81 80 (void) atrans_add(packet.sender_proto_addr, 82 &packet.sender_hw_addr);81 packet.sender_hw_addr); 83 82 84 83 if (packet.opcode == aop_request) { … … 86 85 87 86 reply.opcode = aop_reply; 88 reply.sender_hw_addr = nic->mac_addr;87 addr48(nic->mac_addr, reply.sender_hw_addr); 89 88 reply.sender_proto_addr = laddr_v4; 90 reply.target_hw_addr = packet.sender_hw_addr;89 addr48(packet.sender_hw_addr, reply.target_hw_addr); 91 90 reply.target_proto_addr = packet.sender_proto_addr; 92 91 … … 96 95 97 96 errno_t arp_translate(ethip_nic_t *nic, addr32_t src_addr, addr32_t ip_addr, 98 eth_addr_t *mac_addr)97 addr48_t mac_addr) 99 98 { 100 99 /* Broadcast address */ 101 100 if (ip_addr == addr32_broadcast_all_hosts) { 102 *mac_addr = eth_addr_broadcast;101 addr48(addr48_broadcast, mac_addr); 103 102 return EOK; 104 103 } … … 111 110 112 111 packet.opcode = aop_request; 113 packet.sender_hw_addr = nic->mac_addr;112 addr48(nic->mac_addr, packet.sender_hw_addr); 114 113 packet.sender_proto_addr = src_addr; 115 packet.target_hw_addr = eth_addr_broadcast;114 addr48(addr48_broadcast, packet.target_hw_addr); 116 115 packet.target_proto_addr = ip_addr; 117 116 … … 139 138 return rc; 140 139 141 frame.dest = packet->target_hw_addr;142 frame.src = packet->sender_hw_addr;140 addr48(packet->target_hw_addr, frame.dest); 141 addr48(packet->sender_hw_addr, frame.src); 143 142 frame.etype_len = ETYPE_ARP; 144 143 frame.data = pdata;
Note:
See TracChangeset
for help on using the changeset viewer.