DBus REST: Fix array and dict handling
The bmcweb DBus REST API cannot currently handle array or dictionary
data types correctly. This commit is meant to fix that.
Tested: get/set DBus attributes (consisting of array and/or dictionary)
via bmcweb DBus REST API.
Change-Id: I9694cb888375c90d7a8fb1a10e53bdb5c0bce3bb
Signed-off-by: Mikhail Zhvakin <striker_1993@mail.ru>
diff --git a/include/openbmc_dbus_rest.hpp b/include/openbmc_dbus_rest.hpp
index e0c16d9..6bd3920 100644
--- a/include/openbmc_dbus_rest.hpp
+++ b/include/openbmc_dbus_rest.hpp
@@ -863,7 +863,7 @@
}
else if (argCode.starts_with("(") && argCode.ends_with(")"))
{
- std::string containedType = argCode.substr(1, argCode.size() - 1);
+ std::string containedType = argCode.substr(1, argCode.size() - 2);
r = sd_bus_message_open_container(m, SD_BUS_TYPE_STRUCT,
containedType.c_str());
if (r < 0)
@@ -872,7 +872,7 @@
}
nlohmann::json::const_iterator it = j->begin();
- for (const std::string& argCode2 : dbusArgSplit(argType))
+ for (const std::string& argCode2 : dbusArgSplit(containedType))
{
if (it == j->end())
{
@@ -889,7 +889,7 @@
}
else if (argCode.starts_with("{") && argCode.ends_with("}"))
{
- std::string containedType = argCode.substr(1, argCode.size() - 1);
+ std::string containedType = argCode.substr(1, argCode.size() - 2);
r = sd_bus_message_open_container(m, SD_BUS_TYPE_DICT_ENTRY,
containedType.c_str());
if (r < 0)