std::string* cloak;
+ if (!dest->GetExt("cloaked_host", cloak))
+ {
+ /* Force creation of missing cloak */
+ Sender->OnUserConnect(dest);
+ }
if (dest->GetExt("cloaked_host", cloak))
{
- /* Cloaked host has been set before on this user, don't bother to recalculate and waste cpu */
dest->ChangeDisplayedHost(cloak->c_str());
dest->SetMode('x',true);
return MODEACTION_ALLOW;
ServerInstance->Modules->UseInterface("HashRequest");
- Implementation eventlist[] = { I_OnRehash, I_OnUserDisconnect, I_OnCleanup, I_OnCheckBan, I_OnUserConnect, I_OnSyncUserMetaData };
+ Implementation eventlist[] = { I_OnRehash, I_OnUserDisconnect, I_OnCleanup, I_OnCheckBan, I_OnUserConnect, I_OnSyncUserMetaData, I_OnCleanup };
ServerInstance->Modules->Attach(eventlist, this, 6);
+
+ CloakExistingUsers();
}
void OnSyncUserMetaData(User* user, Module* proto,void* opaque, const std::string &extname, bool displayable)
}
}
+ void CloakExistingUsers()
+ {
+ std::string* cloak;
+ for (std::vector<User*>::iterator u = ServerInstance->Users->local_users.begin(); u != ServerInstance->Users->local_users.end(); u++)
+ {
+ if (!(*u)->GetExt("cloaked_host", cloak))
+ {
+ OnUserConnect(*u);
+ }
+ }
+ }
virtual int OnCheckBan(User* user, Channel* chan)
{
{
/* Needs to be after m_banexception etc. */
ServerInstance->Modules->SetPriority(this, I_OnCheckBan, PRIO_LAST);
+
+ /* but before m_conn_umodes, so host is generated ready to apply */
+ Module *um = ServerInstance->Modules->Find("m_conn_umodes.so");
+ ServerInstance->Modules->SetPriority(this, I_OnUserConnect, PRIO_AFTER, &um);
}
virtual void OnUserDisconnect(User* user)
{
std::string* tofree;
if (user->GetExt("cloaked_host", tofree))
+ {
delete tofree;
+ user->Shrink("cloaked_host");
+ }
}
virtual void OnCleanup(int target_type, void* item)
{
// returns the version number of the module to be
// listed in /MODULES
- return Version(1,2,0,2,VF_COMMON|VF_VENDOR,API_VERSION);
+ return Version("$Id$", VF_COMMON|VF_VENDOR,API_VERSION);
}
virtual void OnRehash(User* user, const std::string ¶meter)
virtual void OnUserConnect(User* dest)
{
+ std::string* tofree;
+ if (dest->GetExt("cloaked_host", tofree))
+ return;
+
if (dest->host.find('.') != std::string::npos || dest->host.find(':') != std::string::npos)
{
unsigned int iv[] = { cu->key1, cu->key2, cu->key3, cu->key4 };