X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_ident.cpp;h=669e9edbeb6f6f568d35d67d0e6ddf757f0c52a3;hb=d54fd9b1e6b31f69332a9241b5f17330c0ad61e0;hp=df6078c1d67c7d8dbb5d6cb82349a626224aa9f7;hpb=d0b4bb3811458aa335857514e4cbb95d5c84f433;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_ident.cpp b/src/modules/m_ident.cpp
index df6078c1d..669e9edbe 100644
--- a/src/modules/m_ident.cpp
+++ b/src/modules/m_ident.cpp
@@ -23,10 +23,6 @@ using namespace std;
 #include "modules.h"
 #include "inspircd.h"
 
-extern InspIRCd* ServerInstance;
-
-extern userrec* fd_ref_table[MAX_DESCRIPTORS];
-
 /* $ModDesc: Provides support for RFC 1413 ident lookups */
 
 // Version 1.5.0.0 - Updated to use InspSocket, faster and neater.
@@ -45,16 +41,16 @@ class RFC1413 : public InspSocket
 	userrec* u;		 // user record that the lookup is associated with
 	int ufd;
 
-	RFC1413(InspIRCd* SI, userrec* user, int maxtime) : InspSocket(SI, user->GetIPString(), 113, false, maxtime), u(user), ufd(user->fd)
+	RFC1413(InspIRCd* SI, userrec* user, int maxtime) : InspSocket(SI, user->GetIPString(), 113, false, maxtime), u(user)
 	{
-		log(DEBUG,"Ident: associated.");
+		ufd = user->GetFd();
 	}
 
 	virtual void OnTimeout()
 	{
 		// When we timeout, the connection failed within the allowed timeframe,
 		// so we just display a notice, and tidy off the ident_data.
-		if (u && (fd_ref_table[ufd] == u))
+		if (u && (Instance->SE->GetRef(ufd) == u))
 		{
 			u->Shrink("ident_data");
 			u->WriteServ("NOTICE "+std::string(u->nick)+" :*** Could not find your ident, using "+std::string(u->ident)+" instead.");
@@ -85,12 +81,12 @@ class RFC1413 : public InspSocket
 								*j = '\0'; // truncate at invalid chars
 							if (*section)
 							{
-								if (u && (fd_ref_table[ufd] == u))
+								if (u && (Instance->SE->GetRef(ufd) == u))
 								{
-									if (ServerInstance->IsIdent(section))
+									if (this->Instance->IsIdent(section))
 									{
 										strlcpy(u->ident,section,IDENTMAX);
-										log(DEBUG,"IDENT SET: "+std::string(u->ident));
+										Instance->Log(DEBUG,"IDENT SET: "+std::string(u->ident));
 										u->WriteServ("NOTICE "+std::string(u->nick)+" :*** Found your ident: "+std::string(u->ident));
 									}
 								}
@@ -126,7 +122,7 @@ class RFC1413 : public InspSocket
 		// descriptor that they were when the lookup began.
 		//
 		// Fixes issue reported by webs, 7 Jun 2006
-		if (u && (fd_ref_table[ufd] == u))
+		if (u && (Instance->SE->GetRef(ufd) == u))
 		{
 			u->Shrink("ident_data");
 		}
@@ -134,7 +130,7 @@ class RFC1413 : public InspSocket
 
 	virtual void OnError(InspSocketError e)
 	{
-		if (u && (fd_ref_table[ufd] == u))
+		if (u && (Instance->SE->GetRef(ufd) == u))
 		{
 			u->Shrink("ident_data");
 		}
@@ -142,13 +138,14 @@ class RFC1413 : public InspSocket
 
 	virtual bool OnConnected()
 	{
-		if (u && (fd_ref_table[ufd] == u))
+		Instance->Log(DEBUG,"Ident: connected");
+		if (u && (Instance->SE->GetRef(ufd) == u))
 		{
 			uslen = sizeof(sock_us);
 			themlen = sizeof(sock_them);
-			if ((getsockname(this->u->fd,(sockaddr*)&sock_us,&uslen) || getpeername(this->u->fd, (sockaddr*)&sock_them, &themlen)))
+			if ((getsockname(this->u->GetFd(),(sockaddr*)&sock_us,&uslen) || getpeername(this->u->GetFd(), (sockaddr*)&sock_them, &themlen)))
 			{
-				log(DEBUG,"Ident: failed to get socket names, bailing");
+				Instance->Log(DEBUG,"Ident: failed to get socket names, bailing");
 				return false;
 			}
 			else
@@ -160,7 +157,7 @@ class RFC1413 : public InspSocket
 				snprintf(ident_request,127,"%d,%d\r\n",ntohs(sock_them.sin_port),ntohs(sock_us.sin_port));
 #endif
 				this->Write(ident_request);
-				log(DEBUG,"Sent ident request, waiting for reply");
+				Instance->Log(DEBUG,"Sent ident request, waiting for reply");
 				return true;
 			}
 		}
@@ -181,7 +178,7 @@ class ModuleIdent : public Module
  public:
 	void ReadSettings()
 	{
-		Conf = new ConfigReader;
+		Conf = new ConfigReader(ServerInstance);
 		IdentTimeout = Conf->ReadInteger("ident","timeout",0,true);
 		if (!IdentTimeout)
 			IdentTimeout = 1;
@@ -215,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)
@@ -251,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);
 			}
 		}
 	}
@@ -270,7 +257,6 @@ class ModuleIdent : public Module
 		if (user->GetExt("ident_data", ident))
 		{
 			ident->u = NULL;
-			ServerInstance->RemoveSocket(ident);
 		}
 	}