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

nic_router: fix config update of ICMP links

Browse Source 
Previously, the update of ICMP links on a new router configuration lead to an
uncaught exception.

Issue #2795
This commit is contained in:
Martin Stein 2018-05-14 15:08:36 +02:00 committed by Christian Helmuth
parent 23f4acfabc
commit 3d480ec947
2 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1398,8 +1398,8 @@ void Interface::_update_link_check_nat(Link &link,
}
void Interface::_update_links(L3_protocol prot,
Domain &cln_dom)
void Interface::_update_udp_tcp_links(L3_protocol prot,
Domain &cln_dom)
{
links(prot).for_each([&] (Link &link) {
try {
@ -1440,6 +1440,24 @@ void Interface::_update_links(L3_protocol prot,
}
void Interface::_update_icmp_links(Domain &cln_dom)
{
L3_protocol const prot = L3_protocol::ICMP;
links(prot).for_each([&] (Link &link) {
try {
Ip_rule const &rule = cln_dom.icmp_rules().
longest_prefix_match(link.client().dst_ip());
_update_link_check_nat(link, rule.domain(), prot, cln_dom);
return;
}
catch (Ip_rule_list::No_match) { _dismiss_link_log(link, "no ICMP rule"); }
catch (Dismiss_link) { }
_destroy_link(link);
});
}
void Interface::_update_dhcp_allocations(Domain &old_domain,
Domain &new_domain)
{
@ -1554,9 +1572,9 @@ void Interface::handle_config(Configuration &config)
return;
}
/* update state objects */
_update_links(L3_protocol::TCP, new_domain);
_update_links(L3_protocol::UDP, new_domain);
_update_links(L3_protocol::ICMP, new_domain);
_update_udp_tcp_links(L3_protocol::TCP, new_domain);
_update_udp_tcp_links(L3_protocol::UDP, new_domain);
_update_icmp_links(new_domain);
_update_dhcp_allocations(old_domain, new_domain);
_update_own_arp_waiters(new_domain);
}

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

@ -245,8 +245,10 @@ class Net::Interface : private Interface_list::Element
void _update_own_arp_waiters(Domain &domain);
void _update_links(L3_protocol prot,
Domain &cln_dom);
void _update_udp_tcp_links(L3_protocol prot,
Domain &cln_dom);
void _update_icmp_links(Domain &cln_dom);
void _update_link_check_nat(Link &link,
Domain &new_srv_dom,