Changeset 8a9a41e in mainline for uspace/srv/net/inetsrv/ndp.c
- Timestamp:
- 2021-10-24T08:28:43Z (2 years ago)
- Children:
- fcb4e15
- 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)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/srv/net/inetsrv/ndp.c
r2ce943a r8a9a41e 1 1 /* 2 * Copyright (c) 2021 Jiri Svoboda 2 3 * Copyright (c) 2013 Antonin Steinhauser 3 4 * All rights reserved. … … 36 37 37 38 #include <errno.h> 39 #include <inet/eth_addr.h> 40 #include <io/log.h> 38 41 #include <mem.h> 39 42 #include <stdlib.h> 40 #include <io/log.h>41 43 #include "ntrans.h" 42 44 #include "addrobj.h" … … 69 71 ndp_pdu_encode(packet, &dgram); 70 72 71 inet_link_send_dgram6(link, packet->target_hw_addr, &dgram,73 inet_link_send_dgram6(link, &packet->target_hw_addr, &dgram, 72 74 IP_PROTO_ICMPV6, INET6_HOP_LIMIT_MAX, 0); 73 75 … … 108 110 if (laddr != NULL) { 109 111 rc = ntrans_add(packet.sender_proto_addr, 110 packet.sender_hw_addr);112 &packet.sender_hw_addr); 111 113 if (rc != EOK) 112 114 return rc; … … 115 117 116 118 reply.opcode = ICMPV6_NEIGHBOUR_ADVERTISEMENT; 117 addr48(laddr->ilink->mac, reply.sender_hw_addr);119 reply.sender_hw_addr = laddr->ilink->mac; 118 120 addr128(packet.target_proto_addr, reply.sender_proto_addr); 119 addr48(packet.sender_hw_addr, reply.target_hw_addr);121 reply.target_hw_addr = packet.sender_hw_addr; 120 122 addr128(packet.sender_proto_addr, reply.target_proto_addr); 121 123 … … 128 130 if (laddr != NULL) 129 131 return ntrans_add(packet.sender_proto_addr, 130 packet.sender_hw_addr);132 &packet.sender_hw_addr); 131 133 132 134 break; … … 151 153 * 152 154 */ 153 errno_t ndp_translate(addr128_t src_addr, addr128_t ip_addr, addr48_tmac_addr,155 errno_t ndp_translate(addr128_t src_addr, addr128_t ip_addr, eth_addr_t *mac_addr, 154 156 inet_link_t *ilink) 155 157 { … … 167 169 168 170 packet.opcode = ICMPV6_NEIGHBOUR_SOLICITATION; 169 addr48(ilink->mac, packet.sender_hw_addr);171 packet.sender_hw_addr = ilink->mac; 170 172 addr128(src_addr, packet.sender_proto_addr); 171 173 addr128(ip_addr, packet.solicited_ip); 172 addr48_solicited_node(ip_addr,packet.target_hw_addr);174 eth_addr_solicited_node(ip_addr, &packet.target_hw_addr); 173 175 ndp_solicited_node_ip(ip_addr, packet.target_proto_addr); 174 176
Note:
See TracChangeset
for help on using the changeset viewer.