From d0b4bb3811458aa335857514e4cbb95d5c84f433 Mon Sep 17 00:00:00 2001 From: brain Date: Thu, 10 Aug 2006 23:53:48 +0000 Subject: Last of Server:: methods moved to InspIRCd::. Server:: removed. This will need a real good tidyup later, because now everything is in the right place, but its a mess because for now i threw them into place (e.g. space indenting, etc) Next on the todo: Make command handlers have a ServerInstance (gank!) git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@4861 e03df62e-2008-0410-955e-edbf42e46eb7 --- src/modules/m_ident.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/modules/m_ident.cpp') diff --git a/src/modules/m_ident.cpp b/src/modules/m_ident.cpp index 781661c48..df6078c1d 100644 --- a/src/modules/m_ident.cpp +++ b/src/modules/m_ident.cpp @@ -34,7 +34,7 @@ extern userrec* fd_ref_table[MAX_DESCRIPTORS]; class RFC1413 : public InspSocket { protected: - Server* Srv; // Server* class used for core communications + // Server* class used for core communications insp_sockaddr sock_us; // our port number insp_sockaddr sock_them; // their port number socklen_t uslen; // length of our port number @@ -45,7 +45,7 @@ class RFC1413 : public InspSocket userrec* u; // user record that the lookup is associated with int ufd; - RFC1413(InspIRCd* SI, userrec* user, int maxtime, Server* S) : InspSocket(SI, user->GetIPString(), 113, false, maxtime), Srv(S), u(user), ufd(user->fd) + RFC1413(InspIRCd* SI, userrec* user, int maxtime) : InspSocket(SI, user->GetIPString(), 113, false, maxtime), u(user), ufd(user->fd) { log(DEBUG,"Ident: associated."); } @@ -175,7 +175,7 @@ class ModuleIdent : public Module { ConfigReader* Conf; - Server* Srv; + int IdentTimeout; public: @@ -214,11 +214,11 @@ class ModuleIdent : public Module * Server::AddSocket() call. */ user->WriteServ("NOTICE "+std::string(user->nick)+" :*** Looking up your ident..."); - RFC1413* ident = new RFC1413(ServerInstance, user, IdentTimeout, Srv); + RFC1413* ident = new RFC1413(ServerInstance, user, IdentTimeout); if (ident->GetState() != I_ERROR) { user->Extend("ident_data", (char*)ident); - Srv->AddSocket(ident); + ServerInstance->AddSocket(ident); } else { @@ -251,7 +251,7 @@ 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; - Srv->RemoveSocket(ident); + ServerInstance->RemoveSocket(ident); } } } @@ -270,7 +270,7 @@ class ModuleIdent : public Module if (user->GetExt("ident_data", ident)) { ident->u = NULL; - Srv->RemoveSocket(ident); + ServerInstance->RemoveSocket(ident); } } -- cgit v1.2.3