ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-01-29 15:44:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

run/nic_router_dhcp: DHCP RENEW and some fixes

Browse Source 
* Test DHCP RENEW by the test client in the unmanaged variant.
* Add event IDs to log output of test client in order to prevent false positive
  result in the managed variant.
* Let managed and unmanaged variant have separate string patterns for
  'run_genode_until' because they already had different output and it will
  differ even more as we don't want to test DHCP RENEW with the managed
  variant.
* Delay first test client DHCP in order to fix unexpected sporadic initial IP
  config.
* Remove some unnecessary code from the run script

Fixes #4460
This commit is contained in:
Martin Stein 2022-03-28 16:16:48 +02:00 committed by Christian Helmuth
parent 7fc20e9ae8
commit 9de4ecf8b6
4 changed files with 137 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
repos/os/run/nic_router_dhcp.inc
View File

@ -58,7 +58,7 @@ append config {
<domain name="downlink" interface="10.2.3.1/24">
<dhcp-server ip_first="10.2.3.2"
ip_last="10.2.3.2">
ip_last="10.2.3.2">
<dns-server ip="1.2.3.4"/>
<dns-server ip="2.3.4.5"/>
@ -82,7 +82,7 @@ append config {
<domain name="downlink" interface="10.2.3.1/24">
<dhcp-server ip_first="10.2.3.2"
ip_last="10.2.3.2">
ip_last="10.2.3.2">
<dns-server ip="4.5.6.7"/>
<dns-server ip="5.6.7.8"/>
@ -94,10 +94,10 @@ append config {
</config>
</inline>
<sleep milliseconds="2000"/>
<sleep milliseconds="4000"/>
<inline>
<config verbose="yes">
<config>
<policy label="nic_router_2 -> " domain="downlink"/>
@ -199,6 +199,7 @@ append_if [expr ![nic_router_2_managed]] config {
<dhcp-server ip_first="10.0.3.2"
ip_last="10.0.3.2"
ip_lease_time_sec="6"
dns_config_from="uplink"/>
</domain>
@ -280,7 +281,9 @@ build_boot_image $boot_modules
append qemu_args " -nographic "
append_qemu_nic_args
append done_string ".*DHCP request completed:.*\n"
if {[nic_router_2_managed]} {
append done_string ".*Event 1, 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"
@ -288,28 +291,23 @@ 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 ".*Event 2, 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 ".*Event 3, 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 ".*Event 4, 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 ".*Event 5, 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"
@ -318,4 +316,52 @@ 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"
} else {
append done_string ".*Event 1, DHCP request completed:.*\n"
append done_string ".* IP lease time: 6 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 ".*Event 2, DHCP request completed:.*\n"
append done_string ".* IP lease time: 6 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 ".*Event 3, DHCP renew completed:.*\n"
append done_string ".* IP lease time: 6 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 ".*Event 4, DHCP request completed:.*\n"
append done_string ".* IP lease time: 6 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 ".*Event 5, DHCP request completed:.*\n"
append done_string ".* IP lease time: 6 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 ".*Event 6, DHCP request completed:.*\n"
append done_string ".* IP lease time: 6 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 ".*Event 7, DHCP request completed:.*\n"
append done_string ".* IP lease time: 6 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

125
repos/os/src/test/nic_router_dhcp/client/dhcp_client.cc
View File

@ -75,6 +75,7 @@ void Dhcp_client::_discover()
void Dhcp_client::_rerequest(State next_state)
{
_handler.ip_config(Ipv4_config { });
_set_state(next_state, _rerequest_timeout(2));
Ipv4_address const client_ip = _handler.ip_config().interface.address;
_send(Message_type::REQUEST, client_ip, Ipv4_address(), client_ip);
@ -91,14 +92,14 @@ void Dhcp_client::_set_state(State state, Microseconds timeout)
Microseconds Dhcp_client::_rerequest_timeout(unsigned lease_time_div_log2)
{
/* FIXME limit the time because of shortcomings in timeout framework */
enum { MAX_TIMEOUT_SEC = 3600 };
uint64_t timeout_sec = _lease_time_sec >> lease_time_div_log2;
enum : uint64_t { MAX_TIMEOUT_US = (uint64_t)3600 * 1000 * 1000 };
uint64_t timeout_us = (_lease_time_sec * 1000 * 1000) >> lease_time_div_log2;
if (timeout_sec > MAX_TIMEOUT_SEC) {
timeout_sec = MAX_TIMEOUT_SEC;
if (timeout_us > MAX_TIMEOUT_US) {
timeout_us = MAX_TIMEOUT_US;
warning("Had to prune the state timeout of DHCP client");
}
return Microseconds(timeout_sec * 1000 * 1000);
return Microseconds(timeout_us);
}
@ -140,6 +141,59 @@ void Dhcp_client::handle_eth(Ethernet_frame &eth, Size_guard &size_guard)
}
void
Dhcp_client::_handle_dhcp_reply_in_request_state(Message_type msg_type,
Dhcp_packet &dhcp,
char const *request_state)
{
if (msg_type != Message_type::ACK) {
throw Drop_packet_inform("DHCP client expects an acknowledgement");
}
_lease_time_sec = dhcp.option<Dhcp_packet::Ip_lease_time>().value();
_set_state(State::BOUND, _rerequest_timeout(1));
static unsigned long event_idx { 0 };
log("Event ", ++event_idx, ", DHCP ", request_state, " completed:");
log(" IP lease time: ", _lease_time_sec, " seconds");
log(" Interface: ", Ipv4_address_prefix(dhcp.yiaddr(), dhcp.option<Dhcp_packet::Subnet_mask>().value()));
log(" Router: ", dhcp.option<Dhcp_packet::Router_ipv4>().value());
Ipv4_address dns_server_addr { };
unsigned idx { 1 };
try {
Dhcp_packet::Dns_server const &dns_server {
dhcp.option<Dhcp_packet::Dns_server>() };
dns_server.for_each_address([&] (Ipv4_address const &addr) {
if (!dns_server_addr.valid()) {
dns_server_addr = addr;
}
log(" DNS server #", idx++, ": ", addr);
});
}
catch (Dhcp_packet::Option_not_found) { }
try {
Dhcp_packet::Domain_name const &domain_name {
dhcp.option<Dhcp_packet::Domain_name>() };
domain_name.with_string([&] (char const *base, size_t size) {
log(" DNS domain name: ", Cstring { base, size });
});
}
catch (Dhcp_packet::Option_not_found) { }
Ipv4_config ip_config(
Ipv4_address_prefix(
dhcp.yiaddr(),
dhcp.option<Dhcp_packet::Subnet_mask>().value()),
dhcp.option<Dhcp_packet::Router_ipv4>().value(),
dns_server_addr);
_handler.ip_config(ip_config);
}
void Dhcp_client::_handle_dhcp_reply(Dhcp_packet &dhcp)
{
Message_type const msg_type =
@ -157,64 +211,9 @@ void Dhcp_client::_handle_dhcp_reply(Dhcp_packet &dhcp)
dhcp.yiaddr());
break;
case State::REQUEST:
{
if (msg_type != Message_type::ACK) {
throw Drop_packet_inform("DHCP client expects an acknowledgement");
}
_lease_time_sec = dhcp.option<Dhcp_packet::Ip_lease_time>().value();
_set_state(State::BOUND, _rerequest_timeout(1));
log("DHCP request completed:");
log(" IP lease time: ", _lease_time_sec, " seconds");
log(" Interface: ", Ipv4_address_prefix(dhcp.yiaddr(), dhcp.option<Dhcp_packet::Subnet_mask>().value()));
log(" Router: ", dhcp.option<Dhcp_packet::Router_ipv4>().value());
Ipv4_address dns_server_addr { };
unsigned idx { 1 };
try {
Dhcp_packet::Dns_server const &dns_server {
dhcp.option<Dhcp_packet::Dns_server>() };
dns_server.for_each_address([&] (Ipv4_address const &addr) {
if (!dns_server_addr.valid()) {
dns_server_addr = addr;
}
log(" DNS server #", idx++, ": ", addr);
});
}
catch (Dhcp_packet::Option_not_found) { }
try {
Dhcp_packet::Domain_name const &domain_name {
dhcp.option<Dhcp_packet::Domain_name>() };
domain_name.with_string([&] (char const *base, size_t size) {
log(" DNS domain name: ", Cstring { base, size });
});
}
catch (Dhcp_packet::Option_not_found) { }
Ipv4_config ip_config(
Ipv4_address_prefix(
dhcp.yiaddr(),
dhcp.option<Dhcp_packet::Subnet_mask>().value()),
dhcp.option<Dhcp_packet::Router_ipv4>().value(),
dns_server_addr);
_handler.ip_config(ip_config);
break;
}
case State::RENEW:
case State::REBIND:
if (msg_type != Message_type::ACK) {
throw Drop_packet_inform("DHCP client expects an acknowledgement");
}
_set_state(State::BOUND, _rerequest_timeout(1));
_lease_time_sec = dhcp.option<Dhcp_packet::Ip_lease_time>().value();
break;
case State::REQUEST: _handle_dhcp_reply_in_request_state(msg_type, dhcp, "request"); break;
case State::RENEW: _handle_dhcp_reply_in_request_state(msg_type, dhcp, "renew"); break;
case State::REBIND: _handle_dhcp_reply_in_request_state(msg_type, dhcp, "rebind"); break;
default: throw Drop_packet_inform("DHCP client doesn't expect a packet");
}
}

5
repos/os/src/test/nic_router_dhcp/client/dhcp_client.h
View File

@ -73,6 +73,11 @@ class Net::Dhcp_client
Nic &_nic;
Dhcp_client_handler &_handler;
void
_handle_dhcp_reply_in_request_state(Dhcp_packet::Message_type msg_type,
Dhcp_packet &dhcp,
char const *request_state);
void _handle_dhcp_reply(Dhcp_packet &dhcp);
void _handle_timeout(Genode::Duration);

11
repos/os/src/test/nic_router_dhcp/client/main.cc
View File

@ -42,6 +42,9 @@ class Main : public Nic_handler,
Constructible<Dhcp_client> _dhcp_client { };
bool _link_state { false };
Reconstructible<Ipv4_config> _ip_config { };
Timer::One_shot_timeout<Main> _initial_delay { _timer, *this, &Main::_handle_initial_delay };
void _handle_initial_delay(Duration);
public:
@ -88,13 +91,19 @@ void Main::ip_config(Ipv4_config const &ip_config)
}
Main::Main(Env &env) : _env(env)
void Main::_handle_initial_delay(Duration)
{
log("Initialized");
_nic.handle_link_state();
}
Main::Main(Env &env) : _env(env)
{
_initial_delay.schedule(Microseconds { 1000000 });
}
void Main::handle_eth(Ethernet_frame &eth,
Size_guard &size_guard)
{