diff options
| author | Attila Molnar <attilamolnar@hush.com> | 2015-02-22 20:42:12 +0100 |
|---|---|---|
| committer | Attila Molnar <attilamolnar@hush.com> | 2015-02-22 20:42:12 +0100 |
| commit | 71f93ea1b3e5091620dd3a3faa04389447272223 (patch) | |
| tree | 60f10499114fd175a9113bdb201cf86d65b2f91d /src/modules/m_spanningtree | |
| parent | bdefe32944c2fa2d27dd00ba6eec8863d72d2dbd (diff) | |
| parent | 76608ff23d515fbf5fcdbdc17b7f261339b2a276 (diff) | |
Merge pull request #916 from ShutterQuick/master+kickrejoinbound
Advertise m_kicknorejoin's upper bound. Closes #913
Diffstat (limited to 'src/modules/m_spanningtree')
| -rw-r--r-- | src/modules/m_spanningtree/capab.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/modules/m_spanningtree/capab.cpp b/src/modules/m_spanningtree/capab.cpp index 047808c29..9035d89c9 100644 --- a/src/modules/m_spanningtree/capab.cpp +++ b/src/modules/m_spanningtree/capab.cpp @@ -33,6 +33,11 @@ std::string TreeSocket::MyModules(int filter) std::string capabilities; for (ModuleManager::ModuleMap::const_iterator i = modlist.begin(); i != modlist.end(); ++i) { + // 2.2 advertises its settings for the benefit of services + // 2.0 would bork on this + if (proto_version < 1205 && i->second->ModuleSourceFile == "m_kicknorejoin.so") + continue; + Version v = i->second->GetVersion(); if (!(v.Flags & filter)) continue; |