ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-05-30 06:04:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

nic_router: fix dst and client MAC in DHCP replies

Browse Source 
The Ethernet destination MAC address of a DHCP reply is not the same as the
DHCP client MAC address. The DHCP server of the NIC router did not take care
of this by now.

Issue #2837
This commit is contained in:
Martin Stein 2018-05-17 17:45:10 +02:00 committed by Christian Helmuth
parent bbc73e96ac
commit 0d5ed994e2
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
repos/os/src/server/nic_router/interface.cc
View File

@ -451,6 +451,7 @@ void Interface::_nat_link_and_pass(Ethernet_frame &eth,
void Interface::_send_dhcp_reply(Dhcp_server const &dhcp_srv, void Interface::_send_dhcp_reply(Dhcp_server const &dhcp_srv,
Mac_address const &eth_dst,
Mac_address const &client_mac, Mac_address const &client_mac,
Ipv4_address const &client_ip, Ipv4_address const &client_ip,
Dhcp_packet::Message_type msg_type, Dhcp_packet::Message_type msg_type,
@ -462,7 +463,10 @@ void Interface::_send_dhcp_reply(Dhcp_server const &dhcp_srv,
/* create ETH header of the reply */ /* create ETH header of the reply */
Ethernet_frame &eth = Ethernet_frame::construct_at(pkt_base, size_guard); Ethernet_frame &eth = Ethernet_frame::construct_at(pkt_base, size_guard);
eth.dst(client_mac); if (msg_type == Dhcp_packet::Message_type::OFFER) {
eth.dst(Ethernet_frame::broadcast()); }
else {
eth.dst(eth_dst); }
eth.src(_router_mac); eth.src(_router_mac);
eth.type(Ethernet_frame::Type::IPV4); eth.type(Ethernet_frame::Type::IPV4);
@ -543,7 +547,7 @@ void Interface::_new_dhcp_allocation(Ethernet_frame &eth,
log("Offer DHCP allocation: ", allocation, log("Offer DHCP allocation: ", allocation,
" at ", local_domain); " at ", local_domain);
} }
_send_dhcp_reply(dhcp_srv, eth.src(), _send_dhcp_reply(dhcp_srv, eth.src(), dhcp.client_mac(),
allocation.ip(), allocation.ip(),
Dhcp_packet::Message_type::OFFER, Dhcp_packet::Message_type::OFFER,
dhcp.xid(), dhcp.xid(),
@ -584,7 +588,7 @@ void Interface::_handle_dhcp_request(Ethernet_frame &eth,
} else { } else {
allocation.lifetime(_config().dhcp_offer_timeout()); allocation.lifetime(_config().dhcp_offer_timeout());
_send_dhcp_reply(dhcp_srv, eth.src(), _send_dhcp_reply(dhcp_srv, eth.src(), dhcp.client_mac(),
allocation.ip(), allocation.ip(),
Dhcp_packet::Message_type::OFFER, Dhcp_packet::Message_type::OFFER,
dhcp.xid(), local_intf); dhcp.xid(), local_intf);
@ -594,7 +598,7 @@ void Interface::_handle_dhcp_request(Ethernet_frame &eth,
if (allocation.bound()) { if (allocation.bound()) {
allocation.lifetime(dhcp_srv.ip_lease_time()); allocation.lifetime(dhcp_srv.ip_lease_time());
_send_dhcp_reply(dhcp_srv, eth.src(), _send_dhcp_reply(dhcp_srv, eth.src(), dhcp.client_mac(),
allocation.ip(), allocation.ip(),
Dhcp_packet::Message_type::ACK, Dhcp_packet::Message_type::ACK,
dhcp.xid(), local_intf); dhcp.xid(), local_intf);
@ -612,7 +616,7 @@ void Interface::_handle_dhcp_request(Ethernet_frame &eth,
log("Bind DHCP allocation: ", allocation, log("Bind DHCP allocation: ", allocation,
" at ", local_domain); " at ", local_domain);
} }
_send_dhcp_reply(dhcp_srv, eth.src(), _send_dhcp_reply(dhcp_srv, eth.src(), dhcp.client_mac(),
allocation.ip(), allocation.ip(),
Dhcp_packet::Message_type::ACK, Dhcp_packet::Message_type::ACK,
dhcp.xid(), local_intf); dhcp.xid(), local_intf);
@ -627,7 +631,7 @@ void Interface::_handle_dhcp_request(Ethernet_frame &eth,
} }
case Dhcp_packet::Message_type::INFORM: case Dhcp_packet::Message_type::INFORM:
_send_dhcp_reply(dhcp_srv, eth.src(), _send_dhcp_reply(dhcp_srv, eth.src(), dhcp.client_mac(),
allocation.ip(), allocation.ip(),
Dhcp_packet::Message_type::ACK, Dhcp_packet::Message_type::ACK,
dhcp.xid(), local_intf); dhcp.xid(), local_intf);

1
repos/os/src/server/nic_router/interface.h
View File

@ -120,6 +120,7 @@ class Net::Interface : private Interface_list::Element
Domain &local_domain); Domain &local_domain);
void _send_dhcp_reply(Dhcp_server const &dhcp_srv, void _send_dhcp_reply(Dhcp_server const &dhcp_srv,
Mac_address const &eth_dst,
Mac_address const &client_mac, Mac_address const &client_mac,
Ipv4_address const &client_ip, Ipv4_address const &client_ip,
Dhcp_packet::Message_type msg_type, Dhcp_packet::Message_type msg_type,