From cee0c86c3cb13dd6a21831491aebcea44bc72060 Mon Sep 17 00:00:00 2001 From: Martin Stein Date: Thu, 17 May 2018 17:55:13 +0200 Subject: [PATCH] nic_bridge: fix reading of 'mac' attribute Read as full MAC address and not as decimal uint8_t. Issue #2837 --- repos/os/src/server/nic_bridge/component.cc | 10 ++++++++++ repos/os/src/server/nic_bridge/component.h | 5 +---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/repos/os/src/server/nic_bridge/component.cc b/repos/os/src/server/nic_bridge/component.cc index 3d55346963..6eb114381e 100644 --- a/repos/os/src/server/nic_bridge/component.cc +++ b/repos/os/src/server/nic_bridge/component.cc @@ -155,3 +155,13 @@ Session_component::~Session_component() { vlan().mac_list.remove(&_mac_node); _unset_ipv4_node(); } + + +Net::Root::Root(Genode::Env &env, Net::Nic &nic, Genode::Allocator &md_alloc, + Genode::Xml_node config) +: + Genode::Root_component(env.ep(), md_alloc), + _mac_alloc(Mac_address(config.attribute_value("mac", Mac_address(DEFAULT_MAC)))), + _env(env), + _nic(nic), + _config(config) { } diff --git a/repos/os/src/server/nic_bridge/component.h b/repos/os/src/server/nic_bridge/component.h index 335537097d..0f717dcd81 100644 --- a/repos/os/src/server/nic_bridge/component.h +++ b/repos/os/src/server/nic_bridge/component.h @@ -245,10 +245,7 @@ class Net::Root : public Genode::Root_component public: Root(Genode::Env &env, Net::Nic &nic, Genode::Allocator &md_alloc, - Genode::Xml_node config) - : Genode::Root_component(env.ep(), md_alloc), - _mac_alloc(Mac_address(config.attribute_value("mac", (Genode::uint8_t)DEFAULT_MAC))), - _env(env), _nic(nic), _config(config) { } + Genode::Xml_node config); }; #endif /* _COMPONENT_H_ */