From 965460400b271a178cc415783414de43c89341bf Mon Sep 17 00:00:00 2001 From: Peter Powell Date: Fri, 29 Nov 2019 11:11:11 +0000 Subject: WebSocket: move the OriginList typedef inside WebSocketConfig. --- src/modules/m_websocket.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/modules/m_websocket.cpp') diff --git a/src/modules/m_websocket.cpp b/src/modules/m_websocket.cpp index ee1c00e97..5f0f9bcc8 100644 --- a/src/modules/m_websocket.cpp +++ b/src/modules/m_websocket.cpp @@ -25,14 +25,13 @@ #include -typedef std::vector OriginList; - static const char MagicGUID[] = "258EAFA5-E914-47DA-95CA-C5AB0DC85B11"; static const char whitespace[] = " \t\r\n"; static dynamic_reference_nocheck* sha1; struct WebSocketConfig { + typedef std::vector OriginList; typedef std::vector ProxyRanges; // The HTTP origins that can connect to the server. @@ -329,7 +328,7 @@ class WebSocketHook : public IOHookMiddle if (originheader.Find(recvq, "Origin:", 7, reqend)) { const std::string origin = originheader.ExtractValue(recvq); - for (OriginList::const_iterator iter = config.allowedorigins.begin(); iter != config.allowedorigins.end(); ++iter) + for (WebSocketConfig::OriginList::const_iterator iter = config.allowedorigins.begin(); iter != config.allowedorigins.end(); ++iter) { if (InspIRCd::Match(origin, *iter, ascii_case_insensitive_map)) { -- cgit v1.3.1-10-gc9f91