ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2024-12-28 09:38:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

nic_router: avoid use of old term "IP allocation"

Browse Source 
IP allocations were renamed DHCP allocations without fixing the according
places in log messages and comments. This commit rectifies this omission.

Issue #2609
This commit is contained in:
Martin Stein 2017-11-13 14:15:35 +01:00 committed by Christian Helmuth
parent 54532b99f9
commit bfddad17a3
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -403,7 +403,7 @@ void Interface::_send_dhcp_reply(Dhcp_server const &dhcp_srv,
void Interface::_release_dhcp_allocation(Dhcp_allocation &allocation) void Interface::_release_dhcp_allocation(Dhcp_allocation &allocation)
{ {
if (_config().verbose()) { if (_config().verbose()) {
log("Release IP allocation: ", allocation, " at ", *this); log("Release DHCP allocation: ", allocation, " at ", *this);
} }
_dhcp_allocations.remove(&allocation); _dhcp_allocations.remove(&allocation);
} }
@ -420,7 +420,7 @@ void Interface::_new_dhcp_allocation(Ethernet_frame &eth,
_dhcp_allocations.insert(&allocation); _dhcp_allocations.insert(&allocation);
if (_config().verbose()) { if (_config().verbose()) {
log("Offer IP allocation: ", allocation, log("Offer DHCP allocation: ", allocation,
" at ", *this); " at ", *this);
} }
_send_dhcp_reply(dhcp_srv, eth.src(), _send_dhcp_reply(dhcp_srv, eth.src(),
@ -485,7 +485,7 @@ void Interface::_handle_dhcp_request(Ethernet_frame &eth,
allocation.set_bound(); allocation.set_bound();
allocation.lifetime(dhcp_srv.ip_lease_time()); allocation.lifetime(dhcp_srv.ip_lease_time());
if (_config().verbose()) { if (_config().verbose()) {
log("Bind IP allocation: ", allocation, log("Bind DHCP allocation: ", allocation,
" at ", *this); " at ", *this);
} }
_send_dhcp_reply(dhcp_srv, eth.src(), _send_dhcp_reply(dhcp_srv, eth.src(),
@ -826,7 +826,7 @@ void Interface::_handle_eth(void *const eth_base,
size_t const eth_size, size_t const eth_size,
Packet_descriptor const &pkt) Packet_descriptor const &pkt)
{ {
/* do garbage collection over transport-layer links and IP allocations */ /* do garbage collection over transport-layer links and DHCP allocations */
_destroy_closed_links<Udp_link>(_closed_udp_links, _alloc); _destroy_closed_links<Udp_link>(_closed_udp_links, _alloc);
_destroy_closed_links<Tcp_link>(_closed_tcp_links, _alloc); _destroy_closed_links<Tcp_link>(_closed_tcp_links, _alloc);
_destroy_released_dhcp_allocations(); _destroy_released_dhcp_allocations();
@ -974,7 +974,7 @@ Interface::~Interface()
_destroy_links<Tcp_link>(_tcp_links, _closed_tcp_links, _alloc); _destroy_links<Tcp_link>(_tcp_links, _closed_tcp_links, _alloc);
_destroy_links<Udp_link>(_udp_links, _closed_udp_links, _alloc); _destroy_links<Udp_link>(_udp_links, _closed_udp_links, _alloc);
/* destroy IP allocations */ /* destroy DHCP allocations */
_destroy_released_dhcp_allocations(); _destroy_released_dhcp_allocations();
while (Dhcp_allocation *allocation = _dhcp_allocations.first()) { while (Dhcp_allocation *allocation = _dhcp_allocations.first()) {
_dhcp_allocations.remove(allocation); _dhcp_allocations.remove(allocation);