From 1d7764cbc14a53c4b0222edefae23df5d9b4bdc8 Mon Sep 17 00:00:00 2001 From: attilamolnar Date: Sun, 1 Jul 2012 21:44:02 +0200 Subject: m_spanningtree Handle ? wildcard as well when processing an incoming ENCAP --- src/modules/m_spanningtree/encap.cpp | 2 +- src/modules/m_spanningtree/protocolinterface.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/modules') diff --git a/src/modules/m_spanningtree/encap.cpp b/src/modules/m_spanningtree/encap.cpp index 51194e6d7..0cc293fa5 100644 --- a/src/modules/m_spanningtree/encap.cpp +++ b/src/modules/m_spanningtree/encap.cpp @@ -38,7 +38,7 @@ void TreeSocket::Encap(User* who, parameterlist ¶ms) params[params.size() - 1] = ":" + params[params.size() - 1]; - if (params[0].find('*') != std::string::npos) + if (params[0].find_first_of("*?") != std::string::npos) { Utils->DoOneToAllButSender(who->uuid, "ENCAP", params, who->server); } diff --git a/src/modules/m_spanningtree/protocolinterface.cpp b/src/modules/m_spanningtree/protocolinterface.cpp index efc00334d..9c489fcb4 100644 --- a/src/modules/m_spanningtree/protocolinterface.cpp +++ b/src/modules/m_spanningtree/protocolinterface.cpp @@ -48,7 +48,7 @@ void SpanningTreeProtocolInterface::GetServerList(ProtoServerList &sl) bool SpanningTreeProtocolInterface::SendEncapsulatedData(const parameterlist &encap) { - if (encap[0].find('*') != std::string::npos) + if (encap[0].find_first_of("*?") != std::string::npos) { Utils->DoOneToMany(ServerInstance->Config->GetSID(), "ENCAP", encap); return true; -- cgit v1.2.3