diff options
| -rw-r--r-- | meson.build | 1 | ||||
| -rw-r--r-- | redfish-core/include/utils/stl_utils.hpp | 39 | ||||
| -rw-r--r-- | redfish-core/lib/network_protocol.hpp | 23 | ||||
| -rw-r--r-- | redfish-core/ut/stl_utils_test.cpp | 21 |
4 files changed, 76 insertions, 8 deletions
diff --git a/meson.build b/meson.build index 76731129fe..863cad1d20 100644 --- a/meson.build +++ b/meson.build @@ -359,6 +359,7 @@ srcfiles_unittest = [ 'redfish-core/ut/lock_test.cpp', 'redfish-core/ut/configfile_test.cpp', 'redfish-core/ut/time_utils_test.cpp', + 'redfish-core/ut/stl_utils_test.cpp', 'redfish-core/ut/hex_utils_test.cpp', 'http/ut/utility_test.cpp' ] diff --git a/redfish-core/include/utils/stl_utils.hpp b/redfish-core/include/utils/stl_utils.hpp new file mode 100644 index 0000000000..04d02cbada --- /dev/null +++ b/redfish-core/include/utils/stl_utils.hpp @@ -0,0 +1,39 @@ +#pragma once + +#include <algorithm> +#include <string> + +namespace redfish +{ + +namespace stl_utils +{ + +template <typename ForwardIterator> +ForwardIterator firstDuplicate(ForwardIterator first, ForwardIterator last) +{ + auto newLast = first; + + for (auto current = first; current != last; ++current) + { + if (std::find(first, newLast, *current) == newLast) + { + if (newLast != current) + { + *newLast = *current; + } + ++newLast; + } + } + + return newLast; +} + +template <typename T> +void removeDuplicate(T& t) +{ + t.erase(firstDuplicate(t.begin(), t.end()), t.end()); +} + +} // namespace stl_utils +} // namespace redfish diff --git a/redfish-core/lib/network_protocol.hpp b/redfish-core/lib/network_protocol.hpp index a06611fa5a..0d93102e02 100644 --- a/redfish-core/lib/network_protocol.hpp +++ b/redfish-core/lib/network_protocol.hpp @@ -22,6 +22,7 @@ #include <app.hpp> #include <registries/privilege_registry.hpp> #include <utils/json_utils.hpp> +#include <utils/stl_utils.hpp> #include <optional> #include <variant> @@ -237,9 +238,19 @@ inline void handleNTPProtocolEnabled( } inline void - handleNTPServersPatch(const std::vector<std::string>& ntpServers, - const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) + handleNTPServersPatch(const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, + std::vector<std::string>& ntpServers) { + auto iter = stl_utils::firstDuplicate(ntpServers.begin(), ntpServers.end()); + if (iter != ntpServers.end()) + { + std::string pointer = + "NTPServers/" + + std::to_string(std::distance(ntpServers.begin(), iter)); + messages::propertyValueIncorrect(asyncResp->res, pointer, *iter); + return; + } + crow::connections::systemBus->async_method_call( [asyncResp](const boost::system::error_code ec) { if (ec) @@ -393,12 +404,8 @@ inline void requestRoutesNetworkProtocol(App& app) if (ntpServers) { - std::sort((*ntpServers).begin(), (*ntpServers).end()); - (*ntpServers) - .erase(std::unique((*ntpServers).begin(), - (*ntpServers).end()), - (*ntpServers).end()); - handleNTPServersPatch(*ntpServers, asyncResp); + stl_utils::removeDuplicate(*ntpServers); + handleNTPServersPatch(asyncResp, *ntpServers); } } diff --git a/redfish-core/ut/stl_utils_test.cpp b/redfish-core/ut/stl_utils_test.cpp new file mode 100644 index 0000000000..a5115bd910 --- /dev/null +++ b/redfish-core/ut/stl_utils_test.cpp @@ -0,0 +1,21 @@ +#include "utils/stl_utils.hpp" + +#include <gmock/gmock.h> + +TEST(STLUtilesTest, RemoveDuplicates) +{ + std::vector<std::string> strVec = {"s1", "s4", "s1", "s2", "", "s3", "s3"}; + + auto iter = + redfish::stl_utils::firstDuplicate(strVec.begin(), strVec.end()); + EXPECT_EQ(*iter, "s3"); + + redfish::stl_utils::removeDuplicate(strVec); + + EXPECT_EQ(strVec.size(), 5); + EXPECT_EQ(strVec[0], "s1"); + EXPECT_EQ(strVec[1], "s4"); + EXPECT_EQ(strVec[2], "s2"); + EXPECT_EQ(strVec[3], ""); + EXPECT_EQ(strVec[4], "s3"); +} |