ehmry/genode
ehmry
/
genode
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

nic_router: fix log when updating ARP waiters 

Give the correct reason why an ARP waiter was dismissed.

Issue #2840
This commit is contained in:
Martin Stein 2018-06-15 12:56:16 +02:00 committed by Norman Feske
parent fec223016f
commit 9b619e95b2
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1598,27 +1598,33 @@ void Interface::_update_dhcp_allocations(Domain &old_domain,
void Interface::_update_own_arp_waiters(Domain &domain)
{
bool const verbose = _config().verbose();
_own_arp_waiters.for_each([&] (Arp_waiter_list_element &le) {
Arp_waiter &arp_waiter = *le.object();
try {
Domain &dst = _config().domains().find_by_name(arp_waiter.dst().name());
if (dst.ip_config() != arp_waiter.dst().ip_config()) {
throw Dismiss_arp_waiter(); }
if (verbose) {
log("[", domain, "] dismiss ARP waiter: ", arp_waiter,
" (IP config changed)");
}
throw Dismiss_arp_waiter();
}
/* keep ARP waiter */
arp_waiter.handle_config(dst);
if (_config().verbose()) {
if (verbose) {
log("[", domain, "] update ARP waiter: ", arp_waiter);
}
return;
}
catch (Domain_tree::No_match) { }
catch (Dismiss_arp_waiter) { }
/* dismiss ARP waiter */
if (_config().verbose()) {
log("[", domain, "] dismiss ARP waiter: ", arp_waiter, " (no domain)");
catch (Domain_tree::No_match) {
if (verbose) {
log("[", domain, "] dismiss ARP waiter: ", arp_waiter,
" (domain disappeared)");
}
}
catch (Dismiss_arp_waiter) { }
cancel_arp_waiting(*_own_arp_waiters.first()->object());
});
}