* ---------------------------------------------------
*/
-#include <stdio.h>
-#include <string>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
#include "inspircd.h"
/* $ModDesc: Provides support for RFC 1413 ident lookups */
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)
+ RFC1413(InspIRCd* SI, userrec* user, int maxtime, const std::string &bindto) : InspSocket(SI, user->GetIPString(), 113, false, maxtime, bindto), u(user)
{
ufd = user->GetFd();
}
// 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();
}
}
{
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));
}
{
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");
}
{
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);
{
themlen = sizeof(sockaddr_in6);
uslen = sizeof(sockaddr_in6);
- success = ((getsockname(this->u->GetFd(),sock_us,&uslen) || getpeername(this->u->GetFd(), sock_them, &themlen)));
}
- else
- success = ((getsockname(this->u->GetFd(),sock_us,&uslen) || getpeername(this->u->GetFd(), sock_them, &themlen)));
-#else
- success = ((getsockname(this->u->GetFd(),sock_us,&uslen) || getpeername(this->u->GetFd(), sock_them, &themlen)));
#endif
+ success = ((getsockname(this->u->GetFd(),sock_us,&uslen) || getpeername(this->u->GetFd(), sock_them, &themlen)));
if (success)
{
- Instance->Log(DEBUG,"BUG: Ident: failed to get socket names");
- delete sock_us;
- delete sock_them;
+ delete[] sock_us;
+ delete[] sock_them;
return false;
}
else
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));
-#else
- snprintf(ident_request,127,"%d,%d\r\n",ntohs(((sockaddr_in*)sock_them)->sin_port),ntohs(((sockaddr_in*)sock_us)->sin_port));
#endif
+ snprintf(ident_request,127,"%d,%d\r\n",ntohs(((sockaddr_in*)sock_them)->sin_port),ntohs(((sockaddr_in*)sock_us)->sin_port));
this->Write(ident_request);
- delete sock_us;
- delete sock_them;
+ delete[] sock_us;
+ delete[] sock_them;
return true;
}
}
{
ConfigReader* Conf;
-
int IdentTimeout;
+ std::string PortBind;
public:
void ReadSettings()
{
Conf = new ConfigReader(ServerInstance);
- IdentTimeout = Conf->ReadInteger("ident","timeout",0,true);
+ IdentTimeout = Conf->ReadInteger("ident", "timeout", 0, true);
+ PortBind = Conf->ReadValue("ident", "bind", 0);
if (!IdentTimeout)
IdentTimeout = 1;
DELETE(Conf);
}
ModuleIdent(InspIRCd* Me)
- : Module::Module(Me)
+ : Module(Me)
{
ReadSettings();
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();
* 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);
+ RFC1413* ident = new RFC1413(ServerInstance, user, IdentTimeout, PortBind);
if ((ident->GetState() == I_CONNECTING) || (ident->GetState() == I_CONNECTED))
{
user->Extend("ident_data", (char*)ident);
}
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);
+ 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;
{
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
// to NULL and check it so that we dont write users who have gone away.
ident->u = NULL;
ServerInstance->SE->DelFd(ident);
- //delete ident;
+ }
+ if (user->GetExt("IDENT", identstr))
+ {
+ delete identstr;
}
}
}
* 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);
}
+ if (user->GetExt("IDENT", identstr))
+ {
+ delete identstr;
+ }
}
virtual ~ModuleIdent()
};
-class ModuleIdentFactory : public ModuleFactory
-{
- public:
- ModuleIdentFactory()
- {
- }
-
- ~ModuleIdentFactory()
- {
- }
-
- virtual Module * CreateModule(InspIRCd* Me)
- {
- return new ModuleIdent(Me);
- }
-
-};
-
-
-extern "C" void * init_module( void )
-{
- return new ModuleIdentFactory;
-}
-
+MODULE_INIT(ModuleIdent)
projects / user / henk / code / inspircd.git / blobdiff