diff options
author | danieldg <danieldg@e03df62e-2008-0410-955e-edbf42e46eb7> | 2009-11-16 17:59:06 +0000 |
---|---|---|
committer | danieldg <danieldg@e03df62e-2008-0410-955e-edbf42e46eb7> | 2009-11-16 17:59:06 +0000 |
commit | 54fb0cd5aa7d090d5c3da5ab54988c86ba8a2e8e (patch) | |
tree | bc20ce6dca41b2d16349ae4c8212861c10e3685e /src/modules/m_spanningtree/treesocket1.cpp | |
parent | 3bfd0db65ff01c026e968af4de074cc1155a4061 (diff) |
Use ServiceProvider for inter-module dependencies
This will stop dependency chains from preventing module reloads when
it is not actually needed; however, it removes some failsafes that will
need to be reimplemented in order to avoid unmapped vtables.
This deprecates Request as an inter-module signaling mechanism, although
SQL still uses it.
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@12140 e03df62e-2008-0410-955e-edbf42e46eb7
Diffstat (limited to 'src/modules/m_spanningtree/treesocket1.cpp')
-rw-r--r-- | src/modules/m_spanningtree/treesocket1.cpp | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/src/modules/m_spanningtree/treesocket1.cpp b/src/modules/m_spanningtree/treesocket1.cpp index e41b53583..abed5fc25 100644 --- a/src/modules/m_spanningtree/treesocket1.cpp +++ b/src/modules/m_spanningtree/treesocket1.cpp @@ -40,26 +40,14 @@ TreeSocket::TreeSocket(SpanningTreeUtilities* Util, const std::string& shost, in LinkState = CONNECTING; if (!hook.empty()) { - modulelist* ml = ServerInstance->Modules->FindInterface("BufferedSocketHook"); - if (ml) + ServiceProvider* prov = ServerInstance->Modules->FindService(SERVICE_IOHOOK, hook); + if (!prov) { - for(modulelist::iterator i = ml->begin(); i != ml->end(); ++i) - { - std::string name = (**i).ModuleSourceFile; - int a = name.rfind('_'); - int b = name.rfind('.'); - name = name.substr(a+1, b-a-1); - if (name == hook) - { - AddIOHook(*i); - goto found; - } - } + SetError("Could not find hook '" + hook + "' for connection to " + ServerName); + return; } - SetError("Could not find hook '" + hook + "' for connection to " + ServerName); - return; + AddIOHook(prov->creator); } -found: DoConnect(shost, iport, maxtime, bindto); Utils->timeoutlist[this] = std::pair<std::string, int>(ServerName, maxtime); SendCapabilities(1); |