X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_ident.cpp;h=3e87b8c5a3f0479d536aa63d529769ce41268427;hb=f535b1ef72eb4c298ce999bac791acb48665dc66;hp=bea4c28030b85eabf74db8f052454944d7df7861;hpb=efe77ba63b1e519fc4d563bd9b599277c4bd96e5;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_ident.cpp b/src/modules/m_ident.cpp
index bea4c2803..3e87b8c5a 100644
--- a/src/modules/m_ident.cpp
+++ b/src/modules/m_ident.cpp
@@ -195,9 +195,7 @@ class IdentRequestSocket : public EventHandler
 		if (GetFd() > -1)
 		{
 			ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Close ident socket %d", GetFd());
-			SocketEngine::DelFd(this);
-			SocketEngine::Close(GetFd());
-			this->SetFd(-1);
+			SocketEngine::Close(this);
 		}
 	}
 
@@ -265,12 +263,19 @@ class IdentRequestSocket : public EventHandler
 			}
 		}
 	}
+
+	CullResult cull() CXX11_OVERRIDE
+	{
+		Close();
+		return EventHandler::cull();
+	}
 };
 
 class ModuleIdent : public Module
 {
 	int RequestTimeout;
-	SimpleExtItem<IdentRequestSocket> ext;
+	bool NoLookupPrefix;
+	SimpleExtItem<IdentRequestSocket, stdalgo::culldeleter> ext;
  public:
 	ModuleIdent() : ext("ident_socket", this)
 	{
@@ -283,9 +288,9 @@ class ModuleIdent : public Module
 
 	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
 	{
-		RequestTimeout = ServerInstance->Config->ConfValue("ident")->getInt("timeout", 5);
-		if (!RequestTimeout)
-			RequestTimeout = 5;
+		ConfigTag* tag = ServerInstance->Config->ConfValue("ident");
+		RequestTimeout = tag->getInt("timeout", 5, 1);
+		NoLookupPrefix = tag->getBool("nolookupprefix", false);
 	}
 
 	void OnUserInit(LocalUser *user) CXX11_OVERRIDE
@@ -298,7 +303,7 @@ class ModuleIdent : public Module
 
 		try
 		{
-			IdentRequestSocket *isock = new IdentRequestSocket(IS_LOCAL(user));
+			IdentRequestSocket *isock = new IdentRequestSocket(user);
 			ext.set(user, isock);
 		}
 		catch (ModuleException &e)
@@ -316,7 +321,11 @@ class ModuleIdent : public Module
 		/* Does user have an ident socket attached at all? */
 		IdentRequestSocket *isock = ext.get(user);
 		if (!isock)
+		{
+			if ((NoLookupPrefix) && (user->ident[0] != '~'))
+				user->ident.insert(user->ident.begin(), 1, '~');
 			return MOD_RES_PASSTHRU;
+		}
 
 		time_t compare = isock->age;
 		compare += RequestTimeout;
@@ -357,28 +366,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)