From 7ac6f93838101a242bde97e0dc5536bb2aa95ee0 Mon Sep 17 00:00:00 2001 From: Martin Stein Date: Thu, 12 Nov 2020 09:38:03 +0100 Subject: [PATCH] nic_router: clean up init of configuration members Ref #3931 --- .../os/src/server/nic_router/configuration.cc | 33 +++++++++----- .../os/src/server/nic_router/configuration.h | 44 +++++++------------ 2 files changed, 40 insertions(+), 37 deletions(-) diff --git a/repos/os/src/server/nic_router/configuration.cc b/repos/os/src/server/nic_router/configuration.cc index 93f8c54edf..03a4f5666a 100644 --- a/repos/os/src/server/nic_router/configuration.cc +++ b/repos/os/src/server/nic_router/configuration.cc @@ -30,8 +30,21 @@ using namespace Genode; Configuration::Configuration(Xml_node const node, Allocator &alloc) : - _alloc(alloc), - _node(node) + _alloc { alloc }, + _max_packets_per_signal { 0 }, + _verbose { false }, + _verbose_packets { false }, + _verbose_packet_drop { false }, + _verbose_domain_state { false }, + _icmp_echo_server { false }, + _dhcp_discover_timeout { 0 }, + _dhcp_request_timeout { 0 }, + _dhcp_offer_timeout { 0 }, + _icmp_idle_timeout { 0 }, + _udp_idle_timeout { 0 }, + _tcp_idle_timeout { 0 }, + _tcp_max_segm_lifetime { 0 }, + _node { node } { } @@ -66,19 +79,19 @@ Configuration::Configuration(Env &env, Interface_list &interfaces) : _alloc { alloc }, - _max_packets_per_signal { node.attribute_value("max_packets_per_signal", (unsigned long)DEFAULT_MAX_PACKETS_PER_SIGNAL) }, + _max_packets_per_signal { node.attribute_value("max_packets_per_signal", (unsigned long)32) }, _verbose { node.attribute_value("verbose", false) }, _verbose_packets { node.attribute_value("verbose_packets", false) }, _verbose_packet_drop { node.attribute_value("verbose_packet_drop", false) }, _verbose_domain_state { node.attribute_value("verbose_domain_state", false) }, _icmp_echo_server { node.attribute_value("icmp_echo_server", true) }, - _dhcp_discover_timeout { read_sec_attr(node, "dhcp_discover_timeout_sec", DEFAULT_DHCP_DISCOVER_TIMEOUT_SEC) }, - _dhcp_request_timeout { read_sec_attr(node, "dhcp_request_timeout_sec", DEFAULT_DHCP_REQUEST_TIMEOUT_SEC ) }, - _dhcp_offer_timeout { read_sec_attr(node, "dhcp_offer_timeout_sec", DEFAULT_DHCP_OFFER_TIMEOUT_SEC ) }, - _icmp_idle_timeout { read_sec_attr(node, "icmp_idle_timeout_sec", DEFAULT_ICMP_IDLE_TIMEOUT_SEC ) }, - _udp_idle_timeout { read_sec_attr(node, "udp_idle_timeout_sec", DEFAULT_UDP_IDLE_TIMEOUT_SEC ) }, - _tcp_idle_timeout { read_sec_attr(node, "tcp_idle_timeout_sec", DEFAULT_TCP_IDLE_TIMEOUT_SEC ) }, - _tcp_max_segm_lifetime { read_sec_attr(node, "tcp_max_segm_lifetime_sec", DEFAULT_TCP_MAX_SEGM_LIFETIME_SEC) }, + _dhcp_discover_timeout { read_sec_attr(node, "dhcp_discover_timeout_sec", 10) }, + _dhcp_request_timeout { read_sec_attr(node, "dhcp_request_timeout_sec", 10) }, + _dhcp_offer_timeout { read_sec_attr(node, "dhcp_offer_timeout_sec", 10) }, + _icmp_idle_timeout { read_sec_attr(node, "icmp_idle_timeout_sec", 10) }, + _udp_idle_timeout { read_sec_attr(node, "udp_idle_timeout_sec", 30) }, + _tcp_idle_timeout { read_sec_attr(node, "tcp_idle_timeout_sec", 600) }, + _tcp_max_segm_lifetime { read_sec_attr(node, "tcp_max_segm_lifetime_sec", 30) }, _node { node } { /* do parts of domain initialization that do not lookup other domains */ diff --git a/repos/os/src/server/nic_router/configuration.h b/repos/os/src/server/nic_router/configuration.h index a3d389fd6f..c7fe50a98e 100644 --- a/repos/os/src/server/nic_router/configuration.h +++ b/repos/os/src/server/nic_router/configuration.h @@ -34,23 +34,23 @@ class Net::Configuration using Mac_string = Genode::String<17>; Genode::Allocator &_alloc; - unsigned long const _max_packets_per_signal { 0 }; - bool const _verbose { false }; - bool const _verbose_packets { false }; - bool const _verbose_packet_drop { false }; - bool const _verbose_domain_state { false }; - bool const _icmp_echo_server { true }; - Genode::Microseconds const _dhcp_discover_timeout { DEFAULT_DHCP_DISCOVER_TIMEOUT_SEC }; - Genode::Microseconds const _dhcp_request_timeout { DEFAULT_DHCP_REQUEST_TIMEOUT_SEC }; - Genode::Microseconds const _dhcp_offer_timeout { DEFAULT_DHCP_OFFER_TIMEOUT_SEC }; - Genode::Microseconds const _icmp_idle_timeout { DEFAULT_ICMP_IDLE_TIMEOUT_SEC }; - Genode::Microseconds const _udp_idle_timeout { DEFAULT_UDP_IDLE_TIMEOUT_SEC }; - Genode::Microseconds const _tcp_idle_timeout { DEFAULT_TCP_IDLE_TIMEOUT_SEC }; - Genode::Microseconds const _tcp_max_segm_lifetime { DEFAULT_TCP_MAX_SEGM_LIFETIME_SEC }; - Pointer _report { }; - Pointer _reporter { }; - Domain_tree _domains { }; - Uplink_tree _uplinks { }; + unsigned long const _max_packets_per_signal; + bool const _verbose; + bool const _verbose_packets; + bool const _verbose_packet_drop; + bool const _verbose_domain_state; + bool const _icmp_echo_server; + Genode::Microseconds const _dhcp_discover_timeout; + Genode::Microseconds const _dhcp_request_timeout; + Genode::Microseconds const _dhcp_offer_timeout; + Genode::Microseconds const _icmp_idle_timeout; + Genode::Microseconds const _udp_idle_timeout; + Genode::Microseconds const _tcp_idle_timeout; + Genode::Microseconds const _tcp_max_segm_lifetime; + Pointer _report { }; + Pointer _reporter { }; + Domain_tree _domains { }; + Uplink_tree _uplinks { }; Genode::Xml_node const _node; void _invalid_uplink(Uplink &uplink, @@ -61,16 +61,6 @@ class Net::Configuration public: - enum { DEFAULT_REPORT_INTERVAL_SEC = 5 }; - enum { DEFAULT_DHCP_DISCOVER_TIMEOUT_SEC = 10 }; - enum { DEFAULT_DHCP_REQUEST_TIMEOUT_SEC = 10 }; - enum { DEFAULT_DHCP_OFFER_TIMEOUT_SEC = 10 }; - enum { DEFAULT_ICMP_IDLE_TIMEOUT_SEC = 10 }; - enum { DEFAULT_UDP_IDLE_TIMEOUT_SEC = 30 }; - enum { DEFAULT_TCP_IDLE_TIMEOUT_SEC = 600 }; - enum { DEFAULT_TCP_MAX_SEGM_LIFETIME_SEC = 30 }; - enum { DEFAULT_MAX_PACKETS_PER_SIGNAL = 32 }; - Configuration(Genode::Xml_node const node, Genode::Allocator &alloc);