From 86d318230d9dde04c77dc3b7d7a665fbbed096c7 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Thu, 24 Apr 2025 17:02:02 -0400 Subject: [PATCH] Replace use of property_tree::ptree::get_child Convert configuration file parsing code from relying on get_child to using the plain "get" method since get_child is obsoleted in newer versions of Boost. Bug-AGL: SPEC-5425 Change-Id: I149e0b2ebbac593114ea84a14b889d57392c0c6e Signed-off-by: Scott Murray --- src/KuksaConfig.cpp | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/src/KuksaConfig.cpp b/src/KuksaConfig.cpp index ffb2162..bcc786f 100644 --- a/src/KuksaConfig.cpp +++ b/src/KuksaConfig.cpp @@ -66,18 +66,16 @@ KuksaConfig::KuksaConfig(const std::string &appname) : } std::cout << "Using configuration " << config << std::endl; - property_tree::ptree pt; + property_tree::ptree settings; try { - property_tree::ini_parser::read_ini(config, pt); + property_tree::ini_parser::read_ini(config, settings); } catch (std::exception &ex) { std::cerr << "Could not read " << config << std::endl; return; } - const property_tree::ptree &settings = - pt.get_child("kuksa-client", property_tree::ptree()); - m_hostname = settings.get("hostname", "localhost"); + m_hostname = settings.get("kuksa-client.hostname", "localhost"); std::stringstream ss; ss << m_hostname; ss >> std::quoted(m_hostname); @@ -86,15 +84,15 @@ KuksaConfig::KuksaConfig(const std::string &appname) : return; } - m_port = settings.get("port", 55555); + m_port = settings.get("kuksa-client.port", 55555); if (m_port == 0) { std::cerr << "Invalid server port" << std::endl; return; } - m_useTls = settings.get("use-tls", false); + m_useTls = settings.get("kuksa-client.use-tls", false); - std::string caCertFileName = settings.get("ca-certificate", ""); + std::string caCertFileName = settings.get("kuksa-client.ca-certificate", ""); std::stringstream().swap(ss); ss << caCertFileName; ss >> std::quoted(caCertFileName); @@ -107,9 +105,9 @@ KuksaConfig::KuksaConfig(const std::string &appname) : } } - m_tlsServerName = settings.get("tls-server-name", ""); + m_tlsServerName = settings.get("kuksa-client.tls-server-name", ""); - std::string authTokenFileName = settings.get("authorization", ""); + std::string authTokenFileName = settings.get("kuksa-client.authorization", ""); std::stringstream().swap(ss); ss << authTokenFileName; ss >> std::quoted(authTokenFileName); @@ -124,7 +122,7 @@ KuksaConfig::KuksaConfig(const std::string &appname) : } m_verbose = 0; - std::string verbose = settings.get("verbose", ""); + std::string verbose = settings.get("kuksa-client.verbose", ""); std::stringstream().swap(ss); ss << verbose; ss >> std::quoted(verbose); -- 2.16.6