mirror of
https://github.com/genodelabs/genode.git
synced 2024-12-20 14:13:09 +00:00
812fdec27c
With this commit, the NIC router DHCP client reads out the first DNS domain name (DHCP option 15) if any from a DHCP reply that generates an IPv4 config for a domain and stores the name together with the IPv4 config for that domain. DNS domain names are reported via the new report tag '<dns-domain>' if the 'config' attribute in the config tag '<report>' is set. Furthermore, the NIC router DHCP server becomes able to obtain a DNS domain name from another domain that has a DHCP client dynamically (given the config attribute 'dns_config_from' is set and no static DNS config is given) or statically from its configuration (new config tag '<dns-domain>') and propagate this name with DHCP replies (DHCP option 15). The 'nic_router_dhcp_*' tests are adapted to test the new feautures. The commit also gets rid of some mirrored files in 'test/nic_router_dhcp/manager'. Fixes #4246
322 lines
7.8 KiB
PHP
322 lines
7.8 KiB
PHP
#
|
|
# See os/src/test/nic_router_dhcp/README for a documentation.
|
|
#
|
|
|
|
create_boot_directory
|
|
|
|
import_from_depot [depot_user]/src/[base_src]
|
|
|
|
set build_components {
|
|
|
|
init
|
|
server/dynamic_rom
|
|
test/nic_router_dhcp/client
|
|
server/nic_router
|
|
}
|
|
|
|
lappend_if [nic_router_2_managed] build_components test/nic_router_dhcp/manager
|
|
lappend_if [nic_router_2_managed] build_components server/report_rom
|
|
|
|
build $build_components
|
|
|
|
append config {
|
|
|
|
<config>
|
|
|
|
<parent-provides>
|
|
<service name="ROM"/>
|
|
<service name="IRQ"/>
|
|
<service name="IO_MEM"/>
|
|
<service name="IO_PORT"/>
|
|
<service name="PD"/>
|
|
<service name="RM"/>
|
|
<service name="CPU"/>
|
|
<service name="LOG"/>
|
|
</parent-provides>
|
|
|
|
<default-route>
|
|
<any-service> <parent/> <any-child/> </any-service>
|
|
</default-route>
|
|
<default caps="200"/>
|
|
|
|
<start name="timer">
|
|
<resource name="RAM" quantum="1M"/>
|
|
<provides><service name="Timer"/></provides>
|
|
</start>
|
|
|
|
<start name="dynamic_rom">
|
|
<resource name="RAM" quantum="4M"/>
|
|
<provides><service name="ROM"/> </provides>
|
|
<config verbose="yes">
|
|
<rom name="nic_router_1.config">
|
|
<inline>
|
|
|
|
<config>
|
|
|
|
<policy label="nic_router_2 -> " domain="downlink"/>
|
|
|
|
<domain name="downlink" interface="10.2.3.1/24">
|
|
|
|
<dhcp-server ip_first="10.2.3.2"
|
|
ip_last="10.2.3.2">
|
|
|
|
<dns-server ip="1.2.3.4"/>
|
|
<dns-server ip="2.3.4.5"/>
|
|
<dns-server ip="3.4.5.6"/>
|
|
<dns-domain name="genode.org"/>
|
|
|
|
</dhcp-server>
|
|
|
|
</domain>
|
|
|
|
</config>
|
|
|
|
</inline>
|
|
<sleep milliseconds="2000"/>
|
|
<inline>
|
|
|
|
<config>
|
|
|
|
<policy label="nic_router_2 -> " domain="downlink"/>
|
|
|
|
<domain name="downlink" interface="10.2.3.1/24">
|
|
|
|
<dhcp-server ip_first="10.2.3.2"
|
|
ip_last="10.2.3.2">
|
|
|
|
<dns-server ip="4.5.6.7"/>
|
|
<dns-server ip="5.6.7.8"/>
|
|
|
|
</dhcp-server>
|
|
|
|
</domain>
|
|
|
|
</config>
|
|
|
|
</inline>
|
|
<sleep milliseconds="2000"/>
|
|
<inline>
|
|
|
|
<config verbose="yes">
|
|
|
|
<policy label="nic_router_2 -> " domain="downlink"/>
|
|
|
|
<domain name="downlink" interface="10.2.4.1/24">
|
|
|
|
<dhcp-server ip_first="10.2.4.2"
|
|
ip_last="10.2.4.2">
|
|
|
|
<dns-server ip="6.7.8.9"/>
|
|
<dns-domain name="this_is_a_way_to_long_dns_domain_name_that_should_be_rejected_by_the_router_and_cause_the_corresponding_dhcp_option_to_disappear_but_you_never_know_and_so_we_better_test_it"/>
|
|
|
|
</dhcp-server>
|
|
|
|
</domain>
|
|
|
|
</config>
|
|
|
|
</inline>
|
|
<sleep milliseconds="2000"/>
|
|
<inline>
|
|
|
|
<config>
|
|
|
|
<policy label="nic_router_2 -> " domain="downlink"/>
|
|
|
|
<domain name="downlink" interface="10.2.4.1/24">
|
|
|
|
<dhcp-server ip_first="10.2.4.200"
|
|
ip_last="10.2.4.200">
|
|
|
|
<dns-domain name="genodians.org"/>
|
|
|
|
</dhcp-server>
|
|
|
|
</domain>
|
|
|
|
</config>
|
|
|
|
</inline>
|
|
<sleep milliseconds="2000"/>
|
|
<inline>
|
|
|
|
<config>
|
|
|
|
<policy label="nic_router_2 -> " domain="downlink"/>
|
|
|
|
<domain name="downlink" interface="10.2.3.1/24">
|
|
|
|
<dhcp-server ip_first="10.2.3.2"
|
|
ip_last="10.2.3.2">
|
|
|
|
<dns-domain name="genodians.org"/>
|
|
|
|
</dhcp-server>
|
|
|
|
</domain>
|
|
|
|
</config>
|
|
|
|
</inline>
|
|
<sleep milliseconds="2000"/>
|
|
|
|
</rom>
|
|
</config>
|
|
</start>
|
|
|
|
<start name="nic_router_1">
|
|
<binary name="nic_router"/>
|
|
<resource name="RAM" quantum="10M"/>
|
|
<provides>
|
|
<service name="Nic"/>
|
|
<service name="Uplink"/>
|
|
</provides>
|
|
<route>
|
|
<service name="ROM" label="config">
|
|
<child name="dynamic_rom" label="nic_router_1.config"/>
|
|
</service>
|
|
<any-service> <parent/> <any-child/> </any-service>
|
|
</route>
|
|
</start>
|
|
|
|
<start name="nic_router_2">
|
|
<binary name="nic_router"/>
|
|
<resource name="RAM" quantum="10M"/>
|
|
<provides>
|
|
<service name="Nic"/>
|
|
<service name="Uplink"/>
|
|
</provides>}
|
|
|
|
append_if [expr ![nic_router_2_managed]] config {
|
|
|
|
<config verbose_packets="no">
|
|
|
|
<policy label="test_client -> " domain="downlink"/>
|
|
<nic-client domain="uplink"/>
|
|
|
|
<domain name="uplink"/>
|
|
<domain name="downlink" interface="10.0.3.1/24">
|
|
|
|
<dhcp-server ip_first="10.0.3.2"
|
|
ip_last="10.0.3.2"
|
|
dns_config_from="uplink"/>
|
|
|
|
</domain>
|
|
|
|
</config>}
|
|
|
|
append config {
|
|
|
|
<route>
|
|
<service name="Nic"> <child name="nic_router_1"/> </service>}
|
|
|
|
append_if [nic_router_2_managed] config {
|
|
|
|
<service name="ROM" label="config">
|
|
<child name="report_rom"/>
|
|
</service>}
|
|
|
|
append config {
|
|
|
|
<any-service> <parent/> <any-child/> </any-service>
|
|
</route>
|
|
</start>
|
|
|
|
<start name="test_client">
|
|
<binary name="test-nic_router_dhcp-client"/>
|
|
<resource name="RAM" quantum="10M"/>
|
|
<config verbose="no"/>
|
|
<route>
|
|
<service name="Nic"> <child name="nic_router_2"/> </service>
|
|
<any-service> <parent/> <any-child/> </any-service>
|
|
</route>
|
|
</start>}
|
|
|
|
append_if [nic_router_2_managed] config {
|
|
|
|
<start name="report_rom">
|
|
<resource name="RAM" quantum="1M"/>
|
|
<provides> <service name="Report"/> <service name="ROM"/> </provides>
|
|
<config verbose="no">
|
|
<policy label="test_manager -> router_state"
|
|
report="nic_router_2 -> state"/>
|
|
|
|
<policy label="nic_router_2 -> config"
|
|
report="test_manager -> router_config"/>
|
|
</config>
|
|
</start>
|
|
|
|
<start name="test_manager">
|
|
<binary name="test-nic_router_dhcp-manager"/>
|
|
<resource name="RAM" quantum="1M"/>
|
|
<route>
|
|
<service name="ROM" label="router_state">
|
|
<child name="report_rom"/>
|
|
</service>
|
|
<service name="Report"> <child name="report_rom"/> </service>
|
|
<any-service> <parent/> <any-child/> </any-service>
|
|
</route>
|
|
</start>}
|
|
|
|
append config {
|
|
|
|
</config>}
|
|
|
|
install_config $config
|
|
|
|
set boot_modules {
|
|
|
|
init
|
|
dynamic_rom
|
|
nic_router
|
|
test-nic_router_dhcp-client
|
|
}
|
|
|
|
lappend_if [nic_router_2_managed] boot_modules test-nic_router_dhcp-manager
|
|
lappend_if [nic_router_2_managed] boot_modules report_rom
|
|
|
|
build_boot_image $boot_modules
|
|
|
|
append qemu_args " -nographic "
|
|
append_qemu_nic_args
|
|
|
|
append done_string ".*DHCP request completed:.*\n"
|
|
append done_string ".* IP lease time: 3600 seconds.*\n"
|
|
append done_string ".* Interface: 10.0.3.2/24.*\n"
|
|
append done_string ".* Router: 10.0.3.1.*\n"
|
|
append done_string ".* DNS server #1: 1.2.3.4.*\n"
|
|
append done_string ".* DNS server #2: 2.3.4.5.*\n"
|
|
append done_string ".* DNS server #3: 3.4.5.6.*\n"
|
|
append done_string ".* DNS domain name: genode.org.*\n"
|
|
append done_string ".*DHCP request completed:.*\n"
|
|
append done_string ".* IP lease time: 3600 seconds.*\n"
|
|
append done_string ".* Interface: 10.0.3.2/24.*\n"
|
|
append done_string ".* Router: 10.0.3.1.*\n"
|
|
append done_string ".* DNS server #1: 4.5.6.7.*\n"
|
|
append done_string ".* DNS server #2: 5.6.7.8.*\n"
|
|
append done_string ".*DHCP request completed:.*\n"
|
|
append done_string ".* IP lease time: 3600 seconds.*\n"
|
|
append done_string ".* Interface: 10.0.3.2/24.*\n"
|
|
append done_string ".* Router: 10.0.3.1.*\n"
|
|
append done_string ".* DNS server #1: 6.7.8.9.*\n"
|
|
append done_string ".*DHCP request completed:.*\n"
|
|
append done_string ".* IP lease time: 3600 seconds.*\n"
|
|
append done_string ".* Interface: 10.0.3.2/24.*\n"
|
|
append done_string ".* Router: 10.0.3.1.*\n"
|
|
append done_string ".* DNS domain name: genodians.org.*\n"
|
|
append done_string ".*DHCP request completed:.*\n"
|
|
append done_string ".* IP lease time: 3600 seconds.*\n"
|
|
append done_string ".* Interface: 10.0.3.2/24.*\n"
|
|
append done_string ".* Router: 10.0.3.1.*\n"
|
|
append done_string ".* DNS domain name: genodians.org.*\n"
|
|
append done_string ".*DHCP request completed:.*\n"
|
|
append done_string ".* IP lease time: 3600 seconds.*\n"
|
|
append done_string ".* Interface: 10.0.3.2/24.*\n"
|
|
append done_string ".* Router: 10.0.3.1.*\n"
|
|
append done_string ".* DNS server #1: 1.2.3.4.*\n"
|
|
append done_string ".* DNS server #2: 2.3.4.5.*\n"
|
|
append done_string ".* DNS server #3: 3.4.5.6.*\n"
|
|
append done_string ".* DNS domain name: genode.org.*\n"
|
|
|
|
run_genode_until $done_string 30
|