summaryrefslogtreecommitdiff
path: root/src/modules/extra
diff options
context:
space:
mode:
authorw00t <w00t@e03df62e-2008-0410-955e-edbf42e46eb7>2009-05-06 22:27:51 +0000
committerw00t <w00t@e03df62e-2008-0410-955e-edbf42e46eb7>2009-05-06 22:27:51 +0000
commit71f7e47bcd7b72d7999daa9f061c8850b5a6521b (patch)
tree7302be21da0d2cf757644326d67770a9cd63fca2 /src/modules/extra
parent5a3d1bd4608b46fae23414822ad7512410dd773b (diff)
Remove FindDescriptor wrapper for GetRef, it doesn't do anything useful and in fact is a bit harmful in some ways as we've seen..
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11364 e03df62e-2008-0410-955e-edbf42e46eb7
Diffstat (limited to 'src/modules/extra')
-rw-r--r--src/modules/extra/m_ssl_gnutls.cpp6
-rw-r--r--src/modules/extra/m_ssl_openssl.cpp4
2 files changed, 5 insertions, 5 deletions
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);