Note: connect() cant time out for inspsockets in this commit. They'll sit in memory forever -- if you want something actually working properly wait for the next commit

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@5040 e03df62e-2008-0410-955e-edbf42e46eb7

1 files changed, 1 insertions, 23 deletions

diff --git a/src/modules/m_ident.cpp b/src/modules/m_ident.cpp
index eab8f537a..669e9edbe 100644
--- a/src/modules/m_ident.cpp
+++ b/src/modules/m_ident.cpp
@@ -212,16 +212,7 @@ class ModuleIdent : public Module
 		 */
 		user->WriteServ("NOTICE "+std::string(user->nick)+" :*** Looking up your ident...");
 		RFC1413* ident = new RFC1413(ServerInstance, user, IdentTimeout);
-		if (ident->GetState() != I_ERROR)
-		{
-			user->Extend("ident_data", (char*)ident);
-			ServerInstance->AddSocket(ident);
-		}
-		else
-		{
-			user->WriteServ("NOTICE "+std::string(user->nick)+" :*** Could not find your ident, using "+std::string(user->ident)+" instead.");
-			DELETE(ident);
-		}
+		user->Extend("ident_data", (char*)ident);
 	}
 
 	virtual bool OnCheckReady(userrec* user)
@@ -232,17 +223,6 @@ class ModuleIdent : public Module
 		 * have an ident field any more.
 		 */
 		RFC1413* ident;
-		if (user->GetExt("ident_data", ident))
-		{
-			/*ServerInstance->Log(DEBUG,"TIMES: %lu %lu",ident->timeout_end, ServerInstance->Time());*/
-			if (ServerInstance->Time() > ident->timeout_end)
-			{
-				ident->u = NULL;
-				ServerInstance->RemoveSocket(ident);
-				user->Shrink("ident_data");
-				return true;
-			}
-		}
 		return (!user->GetExt("ident_data", ident));
 	}
 
@@ -259,7 +239,6 @@ class ModuleIdent : public Module
 				// a user which has now vanished! To prevent this, set ident::u
 				// to NULL and check it so that we dont write users who have gone away.
 				ident->u = NULL;
-				ServerInstance->RemoveSocket(ident);
 			}
 		}
 	}
@@ -278,7 +257,6 @@ class ModuleIdent : public Module
 		if (user->GetExt("ident_data", ident))
 		{
 			ident->u = NULL;
-			ServerInstance->RemoveSocket(ident);
 		}
 	}