diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/inspircd.cpp | 2 | ||||
| -rw-r--r-- | src/modules.cpp | 5 | ||||
| -rw-r--r-- | src/modules/extra/m_ssl_gnutls.cpp | 6 | ||||
| -rw-r--r-- | src/modules/extra/m_ssl_openssl.cpp | 4 |
4 files changed, 5 insertions, 12 deletions
diff --git a/src/inspircd.cpp b/src/inspircd.cpp index 11ea679e7..f3662cb31 100644 --- a/src/inspircd.cpp +++ b/src/inspircd.cpp @@ -325,7 +325,6 @@ InspIRCd::InspIRCd(int argc, char** argv) HandleProcessUser(this), HandleIsNick(this), HandleIsIdent(this), - HandleFindDescriptor(this), HandleFloodQuitUser(this), HandleIsChannel(this), HandleIsSID(this), @@ -342,7 +341,6 @@ InspIRCd::InspIRCd(int argc, char** argv) Rehash(&HandleRehash), IsNick(&HandleIsNick), IsIdent(&HandleIsIdent), - FindDescriptor(&HandleFindDescriptor), FloodQuitUser(&HandleFloodQuitUser) { diff --git a/src/modules.cpp b/src/modules.cpp index 6ea939e50..5ffaf1203 100644 --- a/src/modules.cpp +++ b/src/modules.cpp @@ -771,11 +771,6 @@ void InspIRCd::DumpText(User* User, const std::string &LinePrefix, std::stringst User->WriteServ(CompleteLine); } -User* FindDescriptorHandler::Call(int socket) -{ - return reinterpret_cast<User*>(Server->SE->GetRef(socket)); -} - bool InspIRCd::AddResolver(Resolver* r, bool cached) { if (!cached) diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp index 36ee530a2..24c96117c 100644 --- a/src/modules/extra/m_ssl_gnutls.cpp +++ b/src/modules/extra/m_ssl_gnutls.cpp @@ -395,7 +395,7 @@ class ModuleSSLGnuTLS : public Module issl_session* session = &sessions[ISR->Sock->GetFd()]; if (session->sess) { - if ((Extensible*)ServerInstance->FindDescriptor(ISR->Sock->GetFd()) == (Extensible*)(ISR->Sock)) + if ((Extensible*)ServerInstance->SE->GetRef(ISR->Sock->GetFd()) == (Extensible*)(ISR->Sock)) { VerifyCertificate(session, (BufferedSocket*)ISR->Sock); return "OK"; @@ -684,7 +684,7 @@ class ModuleSSLGnuTLS : public Module { // Handshake complete. // This will do for setting the ssl flag...it could be done earlier if it's needed. But this seems neater. - User* extendme = ServerInstance->FindDescriptor(fd); + EventHandler *extendme = ServerInstance->SE->GetRef(fd); if (extendme) { if (!extendme->GetExt("ssl", dummy)) @@ -724,7 +724,7 @@ class ModuleSSLGnuTLS : public Module void MakePollWrite(int fd) { //OnRawSocketWrite(fd, NULL, 0); - EventHandler* eh = ServerInstance->FindDescriptor(fd); + EventHandler* eh = ServerInstance->ServerInstance->SE->GetRef(fd); if (eh) ServerInstance->SE->WantWrite(eh); } diff --git a/src/modules/extra/m_ssl_openssl.cpp b/src/modules/extra/m_ssl_openssl.cpp index 53e873641..4314ea043 100644 --- a/src/modules/extra/m_ssl_openssl.cpp +++ b/src/modules/extra/m_ssl_openssl.cpp @@ -758,7 +758,7 @@ class ModuleSSLOpenSSL : public Module { // Handshake complete. // This will do for setting the ssl flag...it could be done earlier if it's needed. But this seems neater. - User* u = ServerInstance->FindDescriptor(session->fd); + EventHandler *u = ServerInstance->SE->GetRef(session->fd); if (u) { if (!u->GetExt("ssl", dummy)) @@ -798,7 +798,7 @@ class ModuleSSLOpenSSL : public Module void MakePollWrite(issl_session* session) { //OnRawSocketWrite(session->fd, NULL, 0); - EventHandler* eh = ServerInstance->FindDescriptor(session->fd); + EventHandler* eh = ServerInstance->SE->GetRef(session->fd); if (eh) { ServerInstance->SE->WantWrite(eh); |