From 441bd151da733d32e194de6e4a1744ae273b83ee Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Sat, 31 Oct 2020 20:03:19 +0000 Subject: Add stdalgo::iterator_range and switch config tag reading to use it. This allows us to use range-based for loops which were not possible with the previous config tag system. --- src/modules/m_websocket.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/modules/m_websocket.cpp') diff --git a/src/modules/m_websocket.cpp b/src/modules/m_websocket.cpp index 31124dede..8fd59fb1c 100644 --- a/src/modules/m_websocket.cpp +++ b/src/modules/m_websocket.cpp @@ -511,14 +511,12 @@ class ModuleWebSocket : public Module void ReadConfig(ConfigStatus& status) override { ConfigTagList tags = ServerInstance->Config->ConfTags("wsorigin"); - if (tags.first == tags.second) + if (tags.empty()) throw ModuleException("You have loaded the websocket module but not configured any allowed origins!"); WebSocketConfig config; - for (ConfigIter i = tags.first; i != tags.second; ++i) + for (auto& [_, tag] : tags) { - ConfigTag* tag = i->second; - // Ensure that we have the parameter. const std::string allow = tag->getString("allow"); if (allow.empty()) -- cgit v1.3.1-10-gc9f91