X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_ident.cpp;h=959e58a479d03c9d02e61c92cc74dec5a8b2075b;hb=9e64fb83aab4f4c0c6964fcdbef4bca0846e930a;hp=ae21c6940a4cf2d7a89230a6235d0fd3a43d65b8;hpb=9baeec44d07dd7894fbbdb85913337e418deff93;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_ident.cpp b/src/modules/m_ident.cpp
index ae21c6940..959e58a47 100644
--- a/src/modules/m_ident.cpp
+++ b/src/modules/m_ident.cpp
@@ -263,6 +263,12 @@ class IdentRequestSocket : public EventHandler
 			}
 		}
 	}
+
+	CullResult cull() CXX11_OVERRIDE
+	{
+		Close();
+		return EventHandler::cull();
+	}
 };
 
 class ModuleIdent : public Module
@@ -271,7 +277,8 @@ class ModuleIdent : public Module
 	bool NoLookupPrefix;
 	SimpleExtItem<IdentRequestSocket, stdalgo::culldeleter> ext;
  public:
-	ModuleIdent() : ext("ident_socket", this)
+	ModuleIdent()
+		: ext("ident_socket", ExtensionItem::EXT_USER, this)
 	{
 	}
 
@@ -283,9 +290,7 @@ class ModuleIdent : public Module
 	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
 	{
 		ConfigTag* tag = ServerInstance->Config->ConfValue("ident");
-		RequestTimeout = tag->getInt("timeout", 5);
-		if (!RequestTimeout)
-			RequestTimeout = 5;
+		RequestTimeout = tag->getInt("timeout", 5, 1);
 		NoLookupPrefix = tag->getBool("nolookupprefix", false);
 	}
 
@@ -362,28 +367,6 @@ class ModuleIdent : public Module
 			return MOD_RES_DENY;
 		return MOD_RES_PASSTHRU;
 	}
-
-	void OnCleanup(int target_type, void *item) CXX11_OVERRIDE
-	{
-		/* Module unloading, tidy up users */
-		if (target_type == TYPE_USER)
-		{
-			LocalUser* user = IS_LOCAL((User*) item);
-			if (user)
-				OnUserDisconnect(user);
-		}
-	}
-
-	void OnUserDisconnect(LocalUser *user) CXX11_OVERRIDE
-	{
-		/* User disconnect (generic socket detatch event) */
-		IdentRequestSocket *isock = ext.get(user);
-		if (isock)
-		{
-			isock->Close();
-			ext.unset(user);
-		}
-	}
 };
 
 MODULE_INIT(ModuleIdent)