From 045a30865aeee9181e89bd485f73af44e498e3ca Mon Sep 17 00:00:00 2001 From: Martin Stein Date: Thu, 22 Dec 2016 01:02:50 +0100 Subject: [PATCH] NIC router: read Strings also with attribute_value Ref #2193 --- repos/os/src/server/nic_router/component.cc | 3 +-- repos/os/src/server/nic_router/domain.cc | 5 +---- repos/os/src/server/nic_router/leaf_rule.cc | 3 +-- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/repos/os/src/server/nic_router/component.cc b/repos/os/src/server/nic_router/component.cc index 9d5a529b4a..4734ecb9ab 100644 --- a/repos/os/src/server/nic_router/component.cc +++ b/repos/os/src/server/nic_router/component.cc @@ -110,8 +110,7 @@ Session_component *Net::Root::_create_session(char const *args) try { Session_label const label = label_from_args(args); Session_policy policy(label, _config.node()); - Domain_name domain_name(Cstring(policy.attribute("domain").value_base(), - policy.attribute("domain").value_size())); + Domain_name domain_name(policy.attribute_value("domain", Domain_name())); Domain &domain = _config.domains().find_by_name(domain_name); diff --git a/repos/os/src/server/nic_router/domain.cc b/repos/os/src/server/nic_router/domain.cc index 7b4f6577d1..7361083103 100644 --- a/repos/os/src/server/nic_router/domain.cc +++ b/repos/os/src/server/nic_router/domain.cc @@ -40,10 +40,7 @@ Domain_avl_member::Domain_avl_member(Domain_name const &name, *****************/ Domain_base::Domain_base(Xml_node const node) -: - _name(Cstring(node.attribute("name").value_base(), - node.attribute("name").value_size())) -{ } +: _name(node.attribute_value("name", Domain_name())) { } /************ diff --git a/repos/os/src/server/nic_router/leaf_rule.cc b/repos/os/src/server/nic_router/leaf_rule.cc index 41d9a2a070..4af97adaea 100644 --- a/repos/os/src/server/nic_router/leaf_rule.cc +++ b/repos/os/src/server/nic_router/leaf_rule.cc @@ -24,8 +24,7 @@ Domain &Leaf_rule::_find_domain(Domain_tree &domains, { try { return domains.find_by_name( - Cstring(node.attribute("domain").value_base(), - node.attribute("domain").value_size())); + node.attribute_value("domain", Domain_name())); } catch (Domain_tree::No_match) { throw Invalid(); } }