diff options
| author | attilamolnar <attilamolnar@hush.com> | 2013-08-15 16:15:26 +0200 |
|---|---|---|
| committer | attilamolnar <attilamolnar@hush.com> | 2013-08-17 18:27:14 +0200 |
| commit | e950f568d0f571e9475aa38177486468714de4d3 (patch) | |
| tree | 783059ff0b0e1d421250510fe080a26db377bc2a /src/modules/m_spanningtree/utils.cpp | |
| parent | 68afa315fccf5d741103137cb65d613a4e9bfef1 (diff) | |
m_spanningtree Remove SpanningTreeUtilities* fields and parameters
Diffstat (limited to 'src/modules/m_spanningtree/utils.cpp')
| -rw-r--r-- | src/modules/m_spanningtree/utils.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/modules/m_spanningtree/utils.cpp b/src/modules/m_spanningtree/utils.cpp index 79cd74505..5330d2eb3 100644 --- a/src/modules/m_spanningtree/utils.cpp +++ b/src/modules/m_spanningtree/utils.cpp @@ -28,6 +28,8 @@ #include "treesocket.h" #include "resolvers.h" +SpanningTreeUtilities* Utils = NULL; + /* Create server sockets off a listener. */ ModResult ModuleSpanningTree::OnAcceptConnection(int newsock, ListenSocket* from, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server) { @@ -41,7 +43,7 @@ ModResult ModuleSpanningTree::OnAcceptConnection(int newsock, ListenSocket* from if (*i == "*" || *i == incomingip || irc::sockets::cidr_mask(*i).match(*client)) { /* we don't need to do anything with the pointer, creating it stores it in the necessary places */ - new TreeSocket(Utils, newsock, from, client, server); + new TreeSocket(newsock, from, client, server); return MOD_RES_ALLOW; } } @@ -127,11 +129,10 @@ TreeServer* SpanningTreeUtilities::FindServerID(const std::string &id) } SpanningTreeUtilities::SpanningTreeUtilities(ModuleSpanningTree* C) - : RefreshTimer(this), Creator(C) + : Creator(C), TreeRoot(NULL) { ServerInstance->Timers->AddTimer(&RefreshTimer); - this->TreeRoot = new TreeServer(this); this->ReadConfiguration(); } @@ -288,7 +289,7 @@ void SpanningTreeUtilities::RefreshIPCache() ValidIPs.push_back(L->IPAddr); else if (this->Creator->DNS) { - SecurityIPResolver* sr = new SecurityIPResolver(Creator, this, *this->Creator->DNS, L->IPAddr, L, DNS::QUERY_AAAA); + SecurityIPResolver* sr = new SecurityIPResolver(Creator, *this->Creator->DNS, L->IPAddr, L, DNS::QUERY_AAAA); try { this->Creator->DNS->Process(sr); |