for (std::vector<ucrec*>::iterator n = chans.begin(); n != chans.end(); n++)
{
ucrec* x = (ucrec*)*n;
- delete x;
+ DELETE(x);
}
}
int n_sent = write(this->fd,tb,this->sendq.length());
if (n_sent == -1)
{
- this->SetWriteError(strerror(errno));
+ if (errno != EAGAIN)
+ this->SetWriteError(strerror(errno));
}
else
{
char reason[MAXBUF];
strlcpy(reason,r,MAXQUIT-1);
- log(DEBUG,"kill_link: %s '%s'",user->nick,reason);
+ log(DEBUG,"kill_link: %s %d '%s'",user->nick,user->fd,reason);
if (IS_LOCAL(user))
Write(user->fd,"ERROR :Closing link (%s@%s) [%s]",user->ident,user->host,reason);
}
}
clientlist.erase(iter);
- delete user;
+ DELETE(user);
}
}
if (group->size() > 10)
{
WhoWasGroup *a = (WhoWasGroup*)*(group->begin());
- delete a;
+ DELETE(a);
group->pop_front();
}
while ((n->begin() != n->end()) && ((*n->begin())->signon < TIME - 259200)) // 3 days
{
WhoWasGroup *a = *(n->begin());
- delete a;
+ DELETE(a);
n->erase(n->begin());
}
}
if (iter != clientlist.end())
{
userrec* goner = iter->second;
- delete goner;
+ DELETE(goner);
clientlist.erase(iter);
}
}
}
- ServerInstance->SE->AddFd(socket,true,X_ESTAB_CLIENT);
+ if (socket > -1)
+ {
+ ServerInstance->SE->AddFd(socket,true,X_ESTAB_CLIENT);
+ }
WriteServ(clientlist[tempnick]->fd,"NOTICE Auth :*** Looking up your hostname...");
}
return;
}
- r = matches_kline(user->host);
+ r = matches_kline(match_against);
if (r)
{