X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_ident.cpp;h=3f3399d3c604682b7eacda235b828706701b5b08;hb=cd7657bddc7a6dc2e7326077d173a874bf71f6bd;hp=6c7d36974d4a726138527ee6c2b21b98d791fec4;hpb=0b460e6f324aa72cdbfb4143918971d582f62a77;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_ident.cpp b/src/modules/m_ident.cpp index 6c7d36974..3f3399d3c 100644 --- a/src/modules/m_ident.cpp +++ b/src/modules/m_ident.cpp @@ -11,12 +11,10 @@ * --------------------------------------------------- */ -#include -#include +#include "inspircd.h" #include "users.h" #include "channels.h" #include "modules.h" -#include "inspircd.h" /* $ModDesc: Provides support for RFC 1413 ident lookups */ @@ -46,12 +44,8 @@ class RFC1413 : public InspSocket // so we just display a notice, and tidy off the ident_data. if (u && (Instance->SE->GetRef(ufd) == u)) { - char newident[MAXBUF]; u->Shrink("ident_data"); - u->WriteServ("NOTICE "+std::string(u->nick)+" :*** Could not find your ident, using ~"+std::string(u->ident)+" instead."); - strcpy(newident,"~"); - strlcat(newident,u->ident,IDENTMAX); - strlcpy(u->ident,newident,IDENTMAX); + Instance->next_call = Instance->Time(); } } @@ -83,6 +77,7 @@ class RFC1413 : public InspSocket { if (this->Instance->IsIdent(section)) { + u->Extend("IDENT", new std::string(std::string(section) + "," + std::string(u->ident))); strlcpy(u->ident,section,IDENTMAX); u->WriteServ("NOTICE "+std::string(u->nick)+" :*** Found your ident: "+std::string(u->ident)); } @@ -121,6 +116,7 @@ class RFC1413 : public InspSocket // Fixes issue reported by webs, 7 Jun 2006 if (u && (Instance->SE->GetRef(ufd) == u)) { + Instance->next_call = Instance->Time(); u->Shrink("ident_data"); } } @@ -129,6 +125,10 @@ class RFC1413 : public InspSocket { if (u && (Instance->SE->GetRef(ufd) == u)) { + if (*u->ident == '~') + u->WriteServ("NOTICE "+std::string(u->nick)+" :*** Could not find your ident, using "+std::string(u->ident)+" instead."); + + Instance->next_call = Instance->Time(); u->Shrink("ident_data"); } } @@ -137,13 +137,13 @@ class RFC1413 : public InspSocket { if (u && (Instance->SE->GetRef(ufd) == u)) { - sockaddr* sock_us = new sockaddr; - sockaddr* sock_them = new sockaddr; + sockaddr* sock_us = new sockaddr[2]; + sockaddr* sock_them = new sockaddr[2]; bool success = false; uslen = sizeof(sockaddr_in); themlen = sizeof(sockaddr_in); #ifdef IPV6 - if (this->u->GetAddressFamily() == AF_INET6) + if (this->u->GetProtocolFamily() == AF_INET6) { themlen = sizeof(sockaddr_in6); uslen = sizeof(sockaddr_in6); @@ -156,14 +156,15 @@ class RFC1413 : public InspSocket #endif if (success) { - Instance->Log(DEBUG,"BUG: Ident: failed to get socket names"); + delete[] sock_us; + delete[] sock_them; return false; } else { // send the request in the following format: theirsocket,oursocket #ifdef IPV6 - if (this->u->GetAddressFamily() == AF_INET6) + if (this->u->GetProtocolFamily() == AF_INET6) snprintf(ident_request,127,"%d,%d\r\n",ntohs(((sockaddr_in6*)sock_them)->sin6_port),ntohs(((sockaddr_in6*)sock_us)->sin6_port)); else snprintf(ident_request,127,"%d,%d\r\n",ntohs(((sockaddr_in*)sock_them)->sin_port),ntohs(((sockaddr_in*)sock_us)->sin_port)); @@ -171,11 +172,14 @@ class RFC1413 : public InspSocket snprintf(ident_request,127,"%d,%d\r\n",ntohs(((sockaddr_in*)sock_them)->sin_port),ntohs(((sockaddr_in*)sock_us)->sin_port)); #endif this->Write(ident_request); + delete[] sock_us; + delete[] sock_them; return true; } } else { + Instance->next_call = Instance->Time(); return true; } } @@ -185,7 +189,7 @@ class ModuleIdent : public Module { ConfigReader* Conf; - + int IdentTimeout; public: @@ -199,9 +203,9 @@ class ModuleIdent : public Module } ModuleIdent(InspIRCd* Me) - : Module::Module(Me) + : Module(Me) { - + ReadSettings(); } @@ -210,6 +214,17 @@ class ModuleIdent : public Module List[I_OnCleanup] = List[I_OnRehash] = List[I_OnUserRegister] = List[I_OnCheckReady] = List[I_OnUserDisconnect] = 1; } + void OnSyncUserMetaData(userrec* user, Module* proto,void* opaque, const std::string &extname, bool displayable) + { + if ((displayable) && (extname == "IDENT")) + { + std::string* ident; + if (GetExt("IDENT", ident)) + proto->ProtoSendMetaData(opaque, TYPE_USER, user, extname, *ident); + } + } + + virtual void OnRehash(userrec* user, const std::string ¶meter) { ReadSettings(); @@ -223,6 +238,12 @@ class ModuleIdent : public Module * is derived from InspSocket, and inserting it into the socket engine using the * Server::AddSocket() call. */ + char newident[MAXBUF]; + strcpy(newident,"~"); + strlcat(newident,user->ident,IDENTMAX); + strlcpy(user->ident,newident,IDENTMAX); + + user->WriteServ("NOTICE "+std::string(user->nick)+" :*** Looking up your ident..."); RFC1413* ident = new RFC1413(ServerInstance, user, IdentTimeout); if ((ident->GetState() == I_CONNECTING) || (ident->GetState() == I_CONNECTED)) @@ -231,12 +252,8 @@ class ModuleIdent : public Module } else { - char newident[MAXBUF]; - user->WriteServ("NOTICE "+std::string(user->nick)+" :*** Could not find your ident, using ~"+std::string(user->ident)+" instead."); - strcpy(newident,"~"); - strlcat(newident,user->ident,IDENTMAX); - strlcpy(user->ident,newident,IDENTMAX); - delete ident; + user->WriteServ("NOTICE "+std::string(user->nick)+" :*** Could not find your ident, using "+std::string(user->ident)+" instead."); + ServerInstance->next_call = ServerInstance->Time(); } return 0; } @@ -258,6 +275,7 @@ class ModuleIdent : public Module { userrec* user = (userrec*)item; RFC1413* ident; + std::string* identstr; if (user->GetExt("ident_data", ident)) { // FIX: If the user record is deleted, the socket wont be removed @@ -266,7 +284,11 @@ class ModuleIdent : public Module // to NULL and check it so that we dont write users who have gone away. ident->u = NULL; ServerInstance->SE->DelFd(ident); - delete ident; + //delete ident; + } + if (user->GetExt("IDENT", identstr)) + { + delete identstr; } } } @@ -282,23 +304,28 @@ class ModuleIdent : public Module * and this would leave at least one of the invalid ;) */ RFC1413* ident; + std::string* identstr; if (user->GetExt("ident_data", ident)) { ident->u = NULL; ServerInstance->SE->DelFd(ident); - delete ident; + } + if (user->GetExt("IDENT", identstr)) + { + delete identstr; } } - + virtual ~ModuleIdent() { + ServerInstance->next_call = ServerInstance->Time(); } - + virtual Version GetVersion() { return Version(1,1,0,0,VF_VENDOR,API_VERSION); } - + }; class ModuleIdentFactory : public ModuleFactory @@ -307,20 +334,20 @@ class ModuleIdentFactory : public ModuleFactory ModuleIdentFactory() { } - + ~ModuleIdentFactory() { } - + virtual Module * CreateModule(InspIRCd* Me) { return new ModuleIdent(Me); } - + }; -extern "C" void * init_module( void ) +extern "C" DllExport void * init_module( void ) { return new ModuleIdentFactory; }