mirror of
https://github.com/inspircd/inspircd.git
synced 2025-03-28 03:40:03 -04:00
Removing from here too.
The goal is to have basically only stuff of use left, e.g.: BUG: xxx doodad shouldnt be NULL but it is or raw socket i/o git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@6357 e03df62e-2008-0410-955e-edbf42e46eb7
This commit is contained in:
parent
d769fef63f
commit
60009a99aa
@ -84,10 +84,7 @@ CmdResult cmd_quit::Handle (const char** parameters, int pcnt, userrec *user)
|
|||||||
ServerInstance->SE->DelFd(user);
|
ServerInstance->SE->DelFd(user);
|
||||||
std::vector<userrec*>::iterator x = find(ServerInstance->local_users.begin(),ServerInstance->local_users.end(),user);
|
std::vector<userrec*>::iterator x = find(ServerInstance->local_users.begin(),ServerInstance->local_users.end(),user);
|
||||||
if (x != ServerInstance->local_users.end())
|
if (x != ServerInstance->local_users.end())
|
||||||
{
|
|
||||||
ServerInstance->Log(DEBUG,"Delete local user");
|
|
||||||
ServerInstance->local_users.erase(x);
|
ServerInstance->local_users.erase(x);
|
||||||
}
|
|
||||||
user->CloseSocket();
|
user->CloseSocket();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -39,24 +39,19 @@ CmdResult cmd_whowas::Handle (const char** parameters, int pcnt, userrec* user)
|
|||||||
|
|
||||||
whowas_users::iterator i = whowas.find(parameters[0]);
|
whowas_users::iterator i = whowas.find(parameters[0]);
|
||||||
|
|
||||||
ServerInstance->Log(DEBUG,"Entered cmd_whowas");
|
|
||||||
|
|
||||||
if (i == whowas.end())
|
if (i == whowas.end())
|
||||||
{
|
{
|
||||||
ServerInstance->Log(DEBUG,"No such nick in whowas");
|
|
||||||
user->WriteServ("406 %s %s :There was no such nickname",user->nick,parameters[0]);
|
user->WriteServ("406 %s %s :There was no such nickname",user->nick,parameters[0]);
|
||||||
user->WriteServ("369 %s %s :End of WHOWAS",user->nick,parameters[0]);
|
user->WriteServ("369 %s %s :End of WHOWAS",user->nick,parameters[0]);
|
||||||
return CMD_FAILURE;
|
return CMD_FAILURE;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
ServerInstance->Log(DEBUG,"Whowas set found");
|
|
||||||
whowas_set* grp = i->second;
|
whowas_set* grp = i->second;
|
||||||
if (grp->size())
|
if (grp->size())
|
||||||
{
|
{
|
||||||
for (whowas_set::iterator ux = grp->begin(); ux != grp->end(); ux++)
|
for (whowas_set::iterator ux = grp->begin(); ux != grp->end(); ux++)
|
||||||
{
|
{
|
||||||
ServerInstance->Log(DEBUG,"Spool whowas entry");
|
|
||||||
WhoWasGroup* u = *ux;
|
WhoWasGroup* u = *ux;
|
||||||
time_t rawtime = u->signon;
|
time_t rawtime = u->signon;
|
||||||
tm *timeinfo;
|
tm *timeinfo;
|
||||||
@ -81,7 +76,6 @@ CmdResult cmd_whowas::Handle (const char** parameters, int pcnt, userrec* user)
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
ServerInstance->Log(DEBUG,"Oops, empty whowas set found");
|
|
||||||
user->WriteServ("406 %s %s :There was no such nickname",user->nick,parameters[0]);
|
user->WriteServ("406 %s %s :There was no such nickname",user->nick,parameters[0]);
|
||||||
user->WriteServ("369 %s %s :End of WHOWAS",user->nick,parameters[0]);
|
user->WriteServ("369 %s %s :End of WHOWAS",user->nick,parameters[0]);
|
||||||
return CMD_FAILURE;
|
return CMD_FAILURE;
|
||||||
@ -145,12 +139,8 @@ void cmd_whowas::AddToWhoWas(userrec* user)
|
|||||||
|
|
||||||
whowas_users::iterator iter = whowas.find(user->nick);
|
whowas_users::iterator iter = whowas.find(user->nick);
|
||||||
|
|
||||||
ServerInstance->Log(DEBUG,"Add to whowas lists");
|
|
||||||
|
|
||||||
if (iter == whowas.end())
|
if (iter == whowas.end())
|
||||||
{
|
{
|
||||||
ServerInstance->Log(DEBUG,"Adding new whowas set for %s",user->nick);
|
|
||||||
|
|
||||||
whowas_set* n = new whowas_set;
|
whowas_set* n = new whowas_set;
|
||||||
WhoWasGroup *a = new WhoWasGroup(user);
|
WhoWasGroup *a = new WhoWasGroup(user);
|
||||||
n->push_back(a);
|
n->push_back(a);
|
||||||
@ -159,8 +149,6 @@ void cmd_whowas::AddToWhoWas(userrec* user)
|
|||||||
|
|
||||||
if ((int)(whowas.size()) > ServerInstance->Config->WhoWasMaxGroups)
|
if ((int)(whowas.size()) > ServerInstance->Config->WhoWasMaxGroups)
|
||||||
{
|
{
|
||||||
ServerInstance->Log(DEBUG,"Maxgroups of %d reached deleting oldest group '%s'",ServerInstance->Config->WhoWasMaxGroups, whowas_fifo[0].second.c_str());
|
|
||||||
|
|
||||||
whowas_users::iterator iter = whowas.find(whowas_fifo[0].second);
|
whowas_users::iterator iter = whowas.find(whowas_fifo[0].second);
|
||||||
if (iter != whowas.end())
|
if (iter != whowas.end())
|
||||||
{
|
{
|
||||||
@ -183,15 +171,11 @@ void cmd_whowas::AddToWhoWas(userrec* user)
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
whowas_set* group = (whowas_set*)iter->second;
|
whowas_set* group = (whowas_set*)iter->second;
|
||||||
|
|
||||||
ServerInstance->Log(DEBUG,"Using existing whowas group for %s",user->nick);
|
|
||||||
|
|
||||||
WhoWasGroup *a = new WhoWasGroup(user);
|
WhoWasGroup *a = new WhoWasGroup(user);
|
||||||
group->push_back(a);
|
group->push_back(a);
|
||||||
|
|
||||||
if ((int)(group->size()) > ServerInstance->Config->WhoWasGroupSize)
|
if ((int)(group->size()) > ServerInstance->Config->WhoWasGroupSize)
|
||||||
{
|
{
|
||||||
ServerInstance->Log(DEBUG,"Trimming existing group '%s' to %d entries",user->nick, ServerInstance->Config->WhoWasGroupSize);
|
|
||||||
WhoWasGroup *a = (WhoWasGroup*)*(group->begin());
|
WhoWasGroup *a = (WhoWasGroup*)*(group->begin());
|
||||||
DELETE(a);
|
DELETE(a);
|
||||||
group->pop_front();
|
group->pop_front();
|
||||||
@ -219,7 +203,7 @@ void cmd_whowas::PruneWhoWas(time_t t)
|
|||||||
if (iter == whowas.end())
|
if (iter == whowas.end())
|
||||||
{
|
{
|
||||||
/* this should never happen, if it does maps are corrupt */
|
/* this should never happen, if it does maps are corrupt */
|
||||||
ServerInstance->Log(DEBUG, "Whowas maps got corrupted! (1)");
|
ServerInstance->Log(DEBUG, "BUG: Whowas maps got corrupted! (1)");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
whowas_set* n = (whowas_set*)iter->second;
|
whowas_set* n = (whowas_set*)iter->second;
|
||||||
@ -249,7 +233,7 @@ void cmd_whowas::PruneWhoWas(time_t t)
|
|||||||
if (iter == whowas.end())
|
if (iter == whowas.end())
|
||||||
{
|
{
|
||||||
/* this should never happen, if it does maps are corrupt */
|
/* this should never happen, if it does maps are corrupt */
|
||||||
ServerInstance->Log(DEBUG, "Whowas maps got corrupted! (2)");
|
ServerInstance->Log(DEBUG, "BUG: Whowas maps got corrupted! (2)");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
whowas_set* n = (whowas_set*)iter->second;
|
whowas_set* n = (whowas_set*)iter->second;
|
||||||
@ -301,7 +285,7 @@ cmd_whowas::~cmd_whowas()
|
|||||||
if (iter == whowas.end())
|
if (iter == whowas.end())
|
||||||
{
|
{
|
||||||
/* this should never happen, if it does maps are corrupt */
|
/* this should never happen, if it does maps are corrupt */
|
||||||
ServerInstance->Log(DEBUG, "Whowas maps got corrupted! (3)");
|
ServerInstance->Log(DEBUG, "BUG: Whowas maps got corrupted! (3)");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
whowas_set* n = (whowas_set*)iter->second;
|
whowas_set* n = (whowas_set*)iter->second;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user