From 0ed5655086737f44a986e5c0955a4b841df1672d Mon Sep 17 00:00:00 2001
From: Martin Stein <martin.stein@genode-labs.com>
Date: Tue, 8 Oct 2019 10:57:22 +0200
Subject: [PATCH] nic_router: do DHCP when re-config to dynamic IP

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
---
 repos/os/run/nic_router_flood.run           | 115 ++++++++++++++------
 repos/os/src/server/nic_router/interface.cc |   3 +-
 2 files changed, 84 insertions(+), 34 deletions(-)

diff --git a/repos/os/run/nic_router_flood.run b/repos/os/run/nic_router_flood.run
index aaa2bde00c..2acb1c8ba1 100644
--- a/repos/os/run/nic_router_flood.run
+++ b/repos/os/run/nic_router_flood.run
@@ -24,10 +24,9 @@ create_boot_directory
 
 import_from_depot [depot_user]/src/[base_src] \
                   [depot_user]/pkg/[drivers_nic_pkg] \
-                  [depot_user]/src/init \
-                  [depot_user]/src/nic_router
+                  [depot_user]/src/init
 
-build { app/ping test/net_flood }
+build { app/ping test/net_flood server/nic_router server/dynamic_rom }
 
 install_config {
 <config>
@@ -63,39 +62,89 @@ install_config {
 		<provides> <service name="Nic"/> </provides>
 	</start>
 
+	<start name="dynamic_rom">
+		<resource name="RAM" quantum="4M"/>
+		<provides><service name="ROM"/> </provides>
+		<config verbose="yes">
+			<rom name="nic_router.config">
+				<inline>
+
+<config verbose="no"
+        verbose_packets="no"
+        verbose_packet_drop="yes"
+        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" 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">
+		<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"/>
+
+			</rom>
+		</config>
+	</start>
+
 	<start name="nic_router" caps="200">
 		<resource name="RAM" quantum="10M"/>
 		<provides><service name="Nic"/></provides>
-		<config verbose="no"
-		        verbose_packets="no"
-		        verbose_packet_drop="yes"
-		        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">
-				<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>
 		<route>
+			<service name="ROM" label="config"> <child name="dynamic_rom" label="nic_router.config"/> </service>
 			<service name="Nic"> <child name="drivers"/> </service>
 			<any-service> <parent/> <any-child/> </any-service>
 		</route>
@@ -149,7 +198,7 @@ install_config {
 
 </config>}
 
-build_boot_image { test-net_flood ping }
+build_boot_image { test-net_flood ping nic_router dynamic_rom }
 
 proc qemu_nic_model {} {
 	if [have_spec x86]         { return e1000 }
diff --git a/repos/os/src/server/nic_router/interface.cc b/repos/os/src/server/nic_router/interface.cc
index 3a5f695ea7..4d5e44339d 100644
--- a/repos/os/src/server/nic_router/interface.cc
+++ b/repos/os/src/server/nic_router/interface.cc
@@ -858,7 +858,7 @@ void Interface::handle_link_state()
 	try {
 		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();
 		if (!link_state() && domain_.ip_config().valid) {
 			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 (old_domain.ip_config() != new_domain.ip_config()) {
 			detach_from_ip_config();
+			attach_to_domain_finish();
 			return;
 		}
 		/* if there was/is no IP config, there is nothing more to update */