alex/genode-world
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

eigentor.run: update to new NIC router

Browse Source 
Fix #56
This commit is contained in:
Martin Stein
2016-12-20 16:21:33 +01:00
committed by Norman Feske
parent 405f787525
commit 3499858ad8
1 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
run/eigentor.run
View File

@@ -70,17 +70,24 @@ append config {
<resource name="RAM" quantum="10M"/>
<provides><service name="Nic"/></provides>
<config rtt_sec="3">
<policy label="uplink" src="10.1.1.2"/>
<policy label_prefix="tor" src="10.1.2.1" nat="yes" nat-tcp-ports="100">
<ip dst="0.0.0.0/0" label="uplink" via="10.1.1.1"/>
</policy>
<policy label_prefix="tor" domain="tor" />
<policy label_prefix="web-client -> fetchurl" domain="fetchurl" />
<domain name="uplink" interface="10.1.1.2/24" gateway="10.1.1.1">
<nat domain="tor" tcp-ports="100" />
</domain>
<domain name="tor" interface="10.1.2.1/24">
<tcp dst="0.0.0.0/0">
<permit-any domain="uplink" />
</tcp>
</domain>
<domain name="fetchurl" interface="10.1.3.1/24">
<tcp-forward port="9050" domain="tor" to="10.1.2.2" />
</domain>
<policy label_prefix="web-client -> fetchurl" src="10.1.3.1" nat="yes" nat-tcp-ports="100">
<ip dst="10.1.3.1/32">
<tcp dst="9050" label="tor" to="10.1.2.2"/>
</ip>
</policy>
</config>
<route>
<service name="Nic"> <child name="nic_drv"/> </service>
@@ -137,7 +144,7 @@ DataDirectory /tor
<inline description="initial state">
<config />
</inline>
<sleep milliseconds="10000" />
<sleep milliseconds="5000" />
<inline description="start web client">
<config>
<parent-provides>
@@ -164,7 +171,7 @@ DataDirectory /tor
</start>
</config>
</inline>
<sleep milliseconds="30000" />
<sleep milliseconds="40000" />
</rom>
</config>
@@ -243,7 +250,7 @@ if {[have_include power_on/qemu]} {
# Execute test case
#
run_genode_until {.*Congratulations. This browser is configured to use Tor.*/n} 200
run_genode_until {.*Congratulations. This browser is configured to use Tor.*/n} 300
set serial_id [output_spawn_id]
set core_pid [exp_pid -i $serial_id]
exec kill -9 $core_pid