From 9c13ceb3cc368c6ea87b9a0c3106ea4d26fb5ace Mon Sep 17 00:00:00 2001
From: Michael Mueller <michael.mueller@uos.de>
Date: Fri, 29 Aug 2025 17:20:59 +0200
Subject: [PATCH] =?UTF-8?q?ealanos:=20Fixed=20broken=20network=20configura?=
 =?UTF-8?q?tion=20and=20brick=20placement=20in=20runscript=20for=20Eal?=
 =?UTF-8?q?=C3=A1nOS.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 repos/ealanos/run/ealanos.run | 97 ++++++++++++-----------------------
 1 file changed, 32 insertions(+), 65 deletions(-)

diff --git a/repos/ealanos/run/ealanos.run b/repos/ealanos/run/ealanos.run
index 37872bd736..f176ad3bd6 100644
--- a/repos/ealanos/run/ealanos.run
+++ b/repos/ealanos/run/ealanos.run
@@ -1,5 +1,5 @@
 create_boot_directory
-import_from_depot 	[depot_user]/pkg/[drivers_nic_pkg] \
+import_from_depot [depot_user]/pkg/[drivers_nic_pkg] \
 					[depot_user]/src/lighttpd \
 					[depot_user]/src/openssl \
 					[depot_user]/src/zlib \
@@ -9,7 +9,8 @@ import_from_depot 	[depot_user]/pkg/[drivers_nic_pkg] \
 					[depot_user]/src/vfs_import
 
 append config {
-<config prio_levels="32" verbose="yes">
+<config verbose="yes" prio_levels="32">
+
 	<parent-provides>
 		<service name="ROM"/>
 		<service name="IRQ"/>
@@ -22,7 +23,6 @@ append config {
 	</parent-provides>
 
 	<default-route>
-		<service name="Timer"> <child name="timer"/> </service>
 		<any-service> <parent/> <any-child/> </any-service>
 	</default-route>
 
@@ -37,7 +37,7 @@ append config {
 
 	<start name="drivers" caps="1500" managing_system="yes" brick="yes">
 		<resource name="RAM" quantum="512M"/>
-		<affinity xpos="1" ypos="0" width="1" height="1"/>
+		<affinity xpos="0" width="1" height="1" ypos="0"/>
 		<binary name="init"/>
 		<route>
 			<service name="ROM" label="config"> <parent label="drivers.config"/> </service>
@@ -49,65 +49,34 @@ append config {
 
 	<start name="nic_router" caps="200" brick="yes">
 		<resource name="RAM" quantum="2G"/>
-		<affinity xpos="2" ypos="0" width="1" height="1"/>
 		<provides>
 			<service name="Nic"/>
 			<service name="Uplink"/>
 		</provides>
-		<config verbose_domain_state="false" max_packets_per_signal="1">
+		<affinity xpos="0" ypos="0" height="1" width="1"/>
+		<config verbose_domain_state="true">
 
-			<policy label_prefix="echo" domain="downlink"/>
-			<policy label_prefix="kuori" domain="console"/> 
-			<policy label_prefix="lighttpd" domain="upload"/>
+			<policy label_prefix="rawnic" domain="downlink"/>
 			<policy label_prefix="drivers"   domain="uplink"/>
-			<domain name="uplink" interface="10.0.2.55/24" gateway="10.0.2.1">
+			<policy label_prefix="kuori" domain="downlink"/>
+			<policy label_prefix="lighttpd" domain="downlink"/>
 			<!--
-			<domain name="uplink" interface="192.168.0.2/24" gateway="192.168.0.2" verbose_packets="no">
+			<domain name="uplink" interface="10.0.2.55/24" gateway="10.0.2.1">
 			-->
+			<domain name="uplink" interface="192.168.0.2/24" gateway="192.168.0.2" verbose_packets="no">
 
 				<nat domain="downlink"
 				     tcp-ports="16384"
 				     udp-ports="16384"
 				     icmp-ids="16384"/>
 
-				<nat domain="console"
-				 tcp-ports="16384"
-				 udp-ports="16384"
-				 icmp-ids="16384"/>
-
-				<nat domain="upload"
-				 tcp-ports="16384"
-				 udp-ports="16384"
-				 icmp-ids="16384"/>
-
+				<tcp-forward port="8080"   domain="downlink" to="10.0.3.57"/>
 				<tcp-forward port="12345" domain="downlink" to="10.0.3.55"/>
-				<tcp-forward port="8080" domain="console" to="10.0.1.55"/>
 
 				<udp-forward port="7"    domain="downlink" to="10.0.3.55"/>
 				<udp-forward port="7070" domain="downlink" to="10.0.3.55"/>
+				<tcp-forward port="80" domain="downlink" to="10.0.3.56"/>
 
-				<tcp-forward port="80" domain="upload" to="10.0.4.55"/>
-
-			</domain>
-
-			<domain name="console" interface="10.0.1.1/24">
-				<dhcp-server ip_first="10.0.1.55" ip_last="10.0.1.55">
-					<dns-server ip="8.8.8.8"/>
-				</dhcp-server>
-
-				<tcp dst="0.0.0.0/0"><permit-any domain="uplink" /></tcp>
-				<udp dst="0.0.0.0/0"><permit-any domain="uplink" /></udp>
-				<icmp dst="0.0.0.0/0" domain="uplink"/>
-			</domain>
-			
-			<domain name="upload" interface="10.0.4.1/24">
-				<dhcp-server ip_first="10.0.4.55" ip_last="10.0.4.55">
-					<dns-server ip="8.8.8.8"/>
-				</dhcp-server>
-
-				<tcp dst="0.0.0.0/0"><permit-any domain="uplink" /></tcp>
-				<udp dst="0.0.0.0/0"><permit-any domain="uplink" /></udp>
-				<icmp dst="0.0.0.0/0" domain="uplink"/>
 			</domain>
 
 			<domain name="downlink" interface="10.0.3.1/24" verbose_packets="no">
@@ -125,11 +94,11 @@ append config {
 
 		</config>
 	</start>
-    
+
 	<start name="kuori" caps="200" brick="yes">
-		<affinity xpos="3" ypos="0" width="1" height="1"/>
+		<affinity xpos="1" ypos="0" width="1" height="1"/>
         <binary name="kuori"/>
-        <resource name="RAM" quantum="512M"/>
+        <resource name="RAM" quantum="128M"/>
 		<route>
             <service name="Shell"><local/></service>
 			<service name="Nic"> <child name="nic_router"/> </service>
@@ -140,17 +109,17 @@ append config {
 		<config>
 			<vfs>
 				<dir name="dev">
-					<log/> <null/> <rtc/>
+					<inline name="rtc">2022-07-20 14:30</inline> 
+					<log/> <null/>
 				</dir>
-				<dir name="socket"> <lwip dhcp="yes"/> </dir>
+				<dir name="socket"> <lwip ip_addr="10.0.3.57"/> </dir>
 			</vfs>
 			<libc stdin="/dev/null" stdout="/dev/log" stderr="/dev/log"
 			      rtc="/dev/rtc" rng="/dev/random" socket="/socket"/>
 		</config>
     </start>
-
 	<start name="pc_rtc" brick="yes">
-			<affinity xpos="0" ypos="0" width="1" height="1"/>
+			<affinity xpos="1" ypos="0" width="1" height="1"/>
 			<resource name="RAM" quantum="4M"/>
 			<provides> <service name="Rtc"/> </provides>
 			<config/>
@@ -160,7 +129,7 @@ append config {
 	</start>
 
 	<start name="system_rtc" brick="yes">
-			<affinity xpos="0" ypos="0" width="1" height="1"/>
+			<affinity xpos="1" ypos="0" width="1" height="1"/>
 			<resource name="RAM" quantum="4M"/>
 			<provides> <service name="Rtc"/> </provides>
 			<config/>
@@ -170,11 +139,9 @@ append config {
 					<any-service> <parent/> </any-service>
 			</route>
     </start>
-	
-
 	<start name="vfs" brick="yes">
-		<affinity xpos="0" ypos="0" width="1" height="1"/>
-		<resource name="RAM" quantum="200M"/>
+		<affinity xpos="1" ypos="0" width="1" height="1"/>
+		<resource name="RAM" quantum="2G"/>
 		<provides><service name="File_system"/></provides>
 		<config>
 			<vfs>
@@ -191,8 +158,9 @@ append config {
 		</config>
 	</start>
 
-	<start name="cached_fs_rom">
-		<resource name="RAM" quantum="200M"/>
+	<start name="fs_rom" brick="yes">
+		<affinity xpos="1" ypos="0" width="1" height="1"/>
+		<resource name="RAM" quantum="16G"/>
 		<provides><service name="ROM"/> </provides>
 		<config/>
 		<route>
@@ -200,11 +168,10 @@ append config {
 			<any-service><parent/></any-service>
 		</route>
 	</start>
-	
 	<start name="lighttpd" caps="400" brick="yes">
-		<affinity xpos="3" ypos="0" width="1" height="1"/>
+		<affinity xpos="1" ypos="0" width="1" height="1"/>
 
-		<resource name="RAM" quantum="200M"/>
+		<resource name="RAM" quantum="4G"/>
 		<config>
 			<arg value="lighttpd"/>
 			<arg value="-f"/>
@@ -215,7 +182,7 @@ append config {
 					<log/> <null/> <rtc/>
 					<jitterentropy name="random"/>
 				</dir>
-				<dir name="socket"> <lwip dhcp="yes"/> </dir>
+				<dir name="socket"> <lwip ip_addr="10.0.3.56"/> </dir>
 				<dir name="etc">
 					<dir name="lighttpd">
 						<rom name="lighttpd.conf"/>
@@ -235,15 +202,15 @@ append config {
 			<any-service> <parent/> </any-service>
 		</route>
 	</start>
-	
 </config>
 }
 
 append qemu_args " -nographic "
-append_qemu_nic_args "host=10.0.2.1,dhcpstart=10.0.2.55,hostfwd=tcp::12345-:12345,hostfwd=tcp::10080-:80,hostfwd=tcp::18080-:8080,hostfwd=udp::10007-:7,hostfwd=udp::17070-:7070"
+append_qemu_nic_args "host=10.0.2.1,dhcpstart=10.0.2.55,hostfwd=tcp::10080-:80,hostfwd=tcp::18080-:8080,hostfwd=tcp::12345-:12345,hostfwd=udp::10007-:7,hostfwd=udp::17070-:7070"
 
-build { core init hoitaja timer lib/ld lib/vfs lib/libm lib/libc lib/stdcxx lib/posix server/nic_router server/vfs server/cached_fs_rom app/kuori lib/vfs_lwip }
+build { core init hoitaja timer lib/ld lib/vfs lib/libm lib/libc lib/stdcxx lib/posix server/nic_router server/nic_uplink app/kuori server/vfs lib/vfs_lwip server/fs_rom }
 
 install_config $config
 build_boot_image [build_artifacts]
+#build_boot_image { core hoitaja timer ld.lib.so libm.lib.so libc.lib.so stdcxx.lib.so nic_router nic_uplink lwip_raw kuori }
 run_genode_until forever
\ No newline at end of file