ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-06-10 19:31:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

nic_router: do DHCP when re-config to dynamic IP

Browse Source 
When re-configuring a domain from using a static IP config to using a dynamic
IP config, attached interfaces didn't react with doing DHCP discover. This bug
is fixed now and the nic_router_flood test was adapted in a way that it tests
the described behavior.

Fix #3518
This commit is contained in:
Martin Stein 2019-10-08 10:57:22 +02:00 committed by Christian Helmuth
parent 87a6368ba1
commit 0ed5655086
2 changed files with 84 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
repos/os/run/nic_router_flood.run
View File

@ -24,10 +24,9 @@ create_boot_directory
import_from_depot [depot_user]/src/[base_src] \ import_from_depot [depot_user]/src/[base_src] \
[depot_user]/pkg/[drivers_nic_pkg] \ [depot_user]/pkg/[drivers_nic_pkg] \
[depot_user]/src/init \ [depot_user]/src/init
[depot_user]/src/nic_router
build { app/ping test/net_flood } build { app/ping test/net_flood server/nic_router server/dynamic_rom }
install_config { install_config {
<config> <config>
@ -63,9 +62,13 @@ install_config {
<provides> <service name="Nic"/> </provides> <provides> <service name="Nic"/> </provides>
</start> </start>
<start name="nic_router" caps="200"> <start name="dynamic_rom">
<resource name="RAM" quantum="10M"/> <resource name="RAM" quantum="4M"/>
<provides><service name="Nic"/></provides> <provides><service name="ROM"/> </provides>
<config verbose="yes">
<rom name="nic_router.config">
<inline>
<config verbose="no" <config verbose="no"
verbose_packets="no" verbose_packets="no"
verbose_packet_drop="yes" verbose_packet_drop="yes"
@ -79,6 +82,40 @@ install_config {
<policy label_prefix="ping" domain="flood_links"/> <policy label_prefix="ping" domain="flood_links"/>
<uplink domain="uplink"/> <uplink domain="uplink"/>
<domain name="uplink" interface="10.0.2.15/24" gateway="10.0.2.2" verbose_packets="no">
<nat domain="flood_links" udp-ports="16384"
tcp-ports="16384"
icmp-ids="16384"/>
</domain>
<domain name="flood_links" interface="10.0.1.1/24">
<dhcp-server ip_first="10.0.1.100"
ip_last="10.0.1.200"/>
<icmp dst="0.0.0.0/0" domain="uplink"/>
<udp dst="0.0.0.0/0"><permit-any domain="uplink"/></udp>
<tcp dst="0.0.0.0/0"><permit-any domain="uplink"/></tcp>
</domain>
</config>
</inline>
<sleep milliseconds="10000"/>
<inline>
<config verbose="no"
verbose_packets="no"
verbose_packet_drop="no"
verbose_domain_state="yes"
dhcp_discover_timeout_sec="1"
tcp_idle_timeout_sec="3600"
udp_idle_timeout_sec="3600"
icmp_idle_timeout_sec="3600">
<policy label_prefix="flood_links" domain="flood_links"/>
<policy label_prefix="ping" domain="flood_links"/>
<uplink domain="uplink"/>
<domain name="uplink" verbose_packets="no"> <domain name="uplink" verbose_packets="no">
<nat domain="flood_links" udp-ports="16384" <nat domain="flood_links" udp-ports="16384"
tcp-ports="16384" tcp-ports="16384"
@ -95,7 +132,19 @@ install_config {
</domain> </domain>
</config> </config>
</inline>
<sleep milliseconds="10000"/>
</rom>
</config>
</start>
<start name="nic_router" caps="200">
<resource name="RAM" quantum="10M"/>
<provides><service name="Nic"/></provides>
<route> <route>
<service name="ROM" label="config"> <child name="dynamic_rom" label="nic_router.config"/> </service>
<service name="Nic"> <child name="drivers"/> </service> <service name="Nic"> <child name="drivers"/> </service>
<any-service> <parent/> <any-child/> </any-service> <any-service> <parent/> <any-child/> </any-service>
</route> </route>
@ -149,7 +198,7 @@ install_config {
</config>} </config>}
build_boot_image { test-net_flood ping } build_boot_image { test-net_flood ping nic_router dynamic_rom }
proc qemu_nic_model {} { proc qemu_nic_model {} {
if [have_spec x86] { return e1000 } if [have_spec x86] { return e1000 }

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

@ -858,7 +858,7 @@ void Interface::handle_link_state()
try { try {
attach_to_domain_finish(); attach_to_domain_finish();
/* if the wholde domain became down, discard IP config */ /* if the whole domain is down, discard IP config */
Domain &domain_ = domain(); Domain &domain_ = domain();
if (!link_state() && domain_.ip_config().valid) { if (!link_state() && domain_.ip_config().valid) {
domain_.interfaces().for_each([&] (Interface &interface) { domain_.interfaces().for_each([&] (Interface &interface) {
@ -1956,6 +1956,7 @@ void Interface::handle_config_3()
/* if the IP configs differ, detach completely from the IP config */ /* if the IP configs differ, detach completely from the IP config */
if (old_domain.ip_config() != new_domain.ip_config()) { if (old_domain.ip_config() != new_domain.ip_config()) {
detach_from_ip_config(); detach_from_ip_config();
attach_to_domain_finish();
return; return;
} }
/* if there was/is no IP config, there is nothing more to update */ /* if there was/is no IP config, there is nothing more to update */