* ---------------------------------------------------
*/
-#include "inspircd_config.h"
#include "configreader.h"
#include "channels.h"
-#include "connection.h"
#include "users.h"
#include "inspircd.h"
#include <stdarg.h>
-#include "inspstring.h"
-#include "commands.h"
-
-#include "typedefs.h"
#include "socketengine.h"
-#include "hashcomp.h"
#include "wildcard.h"
#include "xline.h"
#include "cull_list.h"
return true;
}
-bool userrec::ProcessNoticeMasks(const char *sm)
+std::string userrec::ProcessNoticeMasks(const char *sm)
{
- bool adding = true;
+ bool adding = true, oldadding = false;
const char *c = sm;
+ std::string output = "";
+
+ ServerInstance->Log(DEBUG,"Process notice masks");
while (c && *c)
{
+ ServerInstance->Log(DEBUG,"Process notice mask %c",*c);
+
switch (*c)
{
case '+':
adding = true;
- break;
+ break;
case '-':
adding = false;
- break;
+ break;
default:
- if ((*c >= 'A') && (*c <= 'z'))
- this->SetNoticeMask(*c, adding);
- break;
+ if ((*c >= 'A') && (*c <= 'z') && (ServerInstance->SNO->IsEnabled(*c)))
+ {
+ if ((!IsNoticeMaskSet(*c) && adding) || (IsNoticeMaskSet(*c) && !adding))
+ {
+ if ((oldadding != adding) || (!output.length()))
+ output += (adding ? '+' : '-');
+
+ this->SetNoticeMask(*c, adding);
+
+ output += *c;
+ }
+ }
+ oldadding = adding;
+ break;
}
*c++;
}
- return true;
+ return output;
}
void userrec::StartDNSLookup()
server = (char*)Instance->FindServerNamePtr(Instance->Config->ServerName);
reset_due = ServerInstance->Time();
lines_in = lastping = signon = idle_lastmsg = nping = registered = 0;
- timeout = flood = bytes_in = bytes_out = cmds_in = cmds_out = 0;
+ ChannelCount = timeout = flood = bytes_in = bytes_out = cmds_in = cmds_out = 0;
haspassed = dns_done = false;
fd = -1;
recvq = "";
invites.clear();
chans.resize(MAXCHANS);
memset(modes,0,sizeof(modes));
+ memset(snomasks,0,sizeof(snomasks));
for (unsigned int n = 0; n < MAXCHANS; n++)
{
*/
bool userrec::AddBuffer(std::string a)
{
- std::string::size_type i = a.rfind('\r');
-
- while (i != std::string::npos)
+ try
{
- a.erase(i, 1);
- i = a.rfind('\r');
- }
+ std::string::size_type i = a.rfind('\r');
+
+ while (i != std::string::npos)
+ {
+ a.erase(i, 1);
+ i = a.rfind('\r');
+ }
- if (a.length())
- recvq.append(a);
+ if (a.length())
+ recvq.append(a);
+
+ if (recvq.length() > (unsigned)this->recvqmax)
+ {
+ this->SetWriteError("RecvQ exceeded");
+ ServerInstance->WriteOpers("*** User %s RecvQ of %d exceeds connect class maximum of %d",this->nick,recvq.length(),this->recvqmax);
+ return false;
+ }
+
+ return true;
+ }
- if (recvq.length() > (unsigned)this->recvqmax)
+ catch (...)
{
- this->SetWriteError("RecvQ exceeded");
- ServerInstance->WriteOpers("*** User %s RecvQ of %d exceeds connect class maximum of %d",this->nick,recvq.length(),this->recvqmax);
+ ServerInstance->Log(DEBUG,"Exception in userrec::AddBuffer()");
return false;
}
-
- return true;
}
bool userrec::BufferIsReady()
std::string userrec::GetBuffer()
{
- if (!recvq.length())
- return "";
-
- /* Strip any leading \r or \n off the string.
- * Usually there are only one or two of these,
- * so its is computationally cheap to do.
- */
- while ((*recvq.begin() == '\r') || (*recvq.begin() == '\n'))
- recvq.erase(recvq.begin());
-
- for (std::string::iterator x = recvq.begin(); x != recvq.end(); x++)
+ try
{
- /* Find the first complete line, return it as the
- * result, and leave the recvq as whats left
+ if (!recvq.length())
+ return "";
+
+ /* Strip any leading \r or \n off the string.
+ * Usually there are only one or two of these,
+ * so its is computationally cheap to do.
*/
- if (*x == '\n')
+ while ((*recvq.begin() == '\r') || (*recvq.begin() == '\n'))
+ recvq.erase(recvq.begin());
+
+ for (std::string::iterator x = recvq.begin(); x != recvq.end(); x++)
{
- std::string ret = std::string(recvq.begin(), x);
- recvq.erase(recvq.begin(), x + 1);
- return ret;
+ /* Find the first complete line, return it as the
+ * result, and leave the recvq as whats left
+ */
+ if (*x == '\n')
+ {
+ std::string ret = std::string(recvq.begin(), x);
+ recvq.erase(recvq.begin(), x + 1);
+ return ret;
+ }
}
+ return "";
+ }
+
+ catch (...)
+ {
+ ServerInstance->Log(DEBUG,"Exception in userrec::GetBuffer()");
+ return "";
}
- return "";
}
void userrec::AddWriteBuf(const std::string &data)
ServerInstance->WriteOpers("*** User %s SendQ of %d exceeds connect class maximum of %d",this->nick,sendq.length() + data.length(),this->sendqmax);
return;
}
-
- if (data.length() > 512)
+
+ try
{
- std::string newdata(data);
- newdata.resize(510);
- newdata.append("\r\n");
- sendq.append(newdata);
+ if (data.length() > 512)
+ {
+ std::string newdata(data);
+ newdata.resize(510);
+ newdata.append("\r\n");
+ sendq.append(newdata);
+ }
+ else
+ {
+ sendq.append(data);
+ }
}
- else
+ catch (...)
{
- sendq.append(data);
+ this->SetWriteError("SendQ exceeded");
+ ServerInstance->WriteOpers("*** User %s SendQ got an exception",this->nick);
}
}
// send AS MUCH OF THE USERS SENDQ as we are able to (might not be all of it)
void userrec::FlushWriteBuf()
{
- if ((sendq.length()) && (this->fd != FD_MAGIC_NUMBER))
+ try
{
- const char* tb = this->sendq.c_str();
- int n_sent = write(this->fd,tb,this->sendq.length());
- if (n_sent == -1)
+ if (this->fd == FD_MAGIC_NUMBER)
{
- if (errno != EAGAIN)
- this->SetWriteError(strerror(errno));
+ sendq = "";
}
- else
+ if ((sendq.length()) && (this->fd != FD_MAGIC_NUMBER))
{
- // advance the queue
- tb += n_sent;
- this->sendq = tb;
- // update the user's stats counters
- this->bytes_out += n_sent;
- this->cmds_out++;
+ const char* tb = this->sendq.c_str();
+ int n_sent = write(this->fd,tb,this->sendq.length());
+ if (n_sent == -1)
+ {
+ if (errno != EAGAIN)
+ this->SetWriteError(strerror(errno));
+ }
+ else
+ {
+ // advance the queue
+ tb += n_sent;
+ this->sendq = tb;
+ // update the user's stats counters
+ this->bytes_out += n_sent;
+ this->cmds_out++;
+ }
}
}
+
+ catch (...)
+ {
+ ServerInstance->Log(DEBUG,"Exception in userrec::FlushWriteBuf()");
+ }
}
void userrec::SetWriteError(const std::string &error)
{
- ServerInstance->Log(DEBUG,"SetWriteError: %s",error.c_str());
- // don't try to set the error twice, its already set take the first string.
- if (!this->WriteError.length())
+ try
{
- ServerInstance->Log(DEBUG,"Setting error string for %s to '%s'",this->nick,error.c_str());
- this->WriteError = error;
+ ServerInstance->Log(DEBUG,"SetWriteError: %s",error.c_str());
+ // don't try to set the error twice, its already set take the first string.
+ if (!this->WriteError.length())
+ {
+ ServerInstance->Log(DEBUG,"Setting error string for %s to '%s'",this->nick,error.c_str());
+ this->WriteError = error;
+ }
+ }
+
+ catch (...)
+ {
+ ServerInstance->Log(DEBUG,"Exception in userrec::SetWriteError()");
}
}
void userrec::Oper(const std::string &opertype)
{
- this->modes[UM_OPERATOR] = 1;
- this->WriteServ("MODE %s :+o", this->nick);
- FOREACH_MOD(I_OnOper, OnOper(this, opertype));
- ServerInstance->Log(DEFAULT,"OPER: %s!%s@%s opered as type: %s", this->nick, this->ident, this->host, opertype.c_str());
- strlcpy(this->oper, opertype.c_str(), NICKMAX - 1);
- ServerInstance->all_opers.push_back(this);
- FOREACH_MOD(I_OnPostOper,OnPostOper(this, opertype));
+ try
+ {
+ this->modes[UM_OPERATOR] = 1;
+ this->WriteServ("MODE %s :+o", this->nick);
+ FOREACH_MOD(I_OnOper, OnOper(this, opertype));
+ ServerInstance->Log(DEFAULT,"OPER: %s!%s@%s opered as type: %s", this->nick, this->ident, this->host, opertype.c_str());
+ strlcpy(this->oper, opertype.c_str(), NICKMAX - 1);
+ ServerInstance->all_opers.push_back(this);
+ FOREACH_MOD(I_OnPostOper,OnPostOper(this, opertype));
+ }
+
+ catch (...)
+ {
+ ServerInstance->Log(DEBUG,"Exception in userrec::Oper()");
+ }
}
void userrec::UnOper()
{
- if (*this->oper)
+ try
{
- *this->oper = 0;
- this->modes[UM_OPERATOR] = 0;
- for (std::vector<userrec*>::iterator a = ServerInstance->all_opers.begin(); a < ServerInstance->all_opers.end(); a++)
+ if (*this->oper)
{
- if (*a == this)
+ *this->oper = 0;
+ this->modes[UM_OPERATOR] = 0;
+ for (std::vector<userrec*>::iterator a = ServerInstance->all_opers.begin(); a < ServerInstance->all_opers.end(); a++)
{
- ServerInstance->Log(DEBUG,"Oper removed from optimization list");
- ServerInstance->all_opers.erase(a);
- return;
+ if (*a == this)
+ {
+ ServerInstance->Log(DEBUG,"Oper removed from optimization list");
+ ServerInstance->all_opers.erase(a);
+ return;
+ }
}
}
}
+
+ catch (...)
+ {
+ ServerInstance->Log(DEBUG,"Exception in userrec::UnOper()");
+ }
}
void userrec::QuitUser(InspIRCd* Instance, userrec *user,const std::string &quitreason)
}
/*
- * this must come before the ServerInstance->WriteOpers so that it doesnt try to fill their buffer with anything
- * if they were an oper with +s.
- *
- * XXX -
- * In the current implementation, we only show local quits, as we only show local connects. With
- * the proposed implmentation of snomasks however, this will likely change in the (near?) future.
+ * this must come before the ServerInstance->SNO->WriteToSnoMaskso that it doesnt try to fill their buffer with anything
+ * if they were an oper with +sn +qQ.
*/
if (user->registered == REG_ALL)
{
if (IS_LOCAL(user))
- Instance->WriteOpers("*** Client exiting: %s!%s@%s [%s]",user->nick,user->ident,user->host,reason.c_str());
+ Instance->SNO->WriteToSnoMask('q',"Client exiting: %s!%s@%s [%s]",user->nick,user->ident,user->host,reason.c_str());
+ else
+ Instance->SNO->WriteToSnoMask('Q',"Client exiting on server %s: %s!%s@%s [%s]",user->server,user->nick,user->ident,user->host,reason.c_str());
user->AddToWhoWas();
}
userrec::QuitUser(Instance, _new,"Server is full");
return;
}
- char* e = Instance->XLines->matches_exception(ipaddr);
+ char* e = Instance->XLines->matches_exception(_new);
if (!e)
{
char* r = Instance->XLines->matches_zline(ipaddr);
long userrec::GlobalCloneCount()
{
- char u1[1024];
- char u2[1024];
+ char u1[1024] = {0};
+ char u2[1024] = {0};
long x = 0;
for (user_hash::const_iterator a = ServerInstance->clientlist.begin(); a != ServerInstance->clientlist.end(); a++)
{
return;
}
- char match_against[MAXBUF];
- snprintf(match_against,MAXBUF,"%s@%s", this->ident, this->host);
- char* e = ServerInstance->XLines->matches_exception(match_against);
+ char* e = ServerInstance->XLines->matches_exception(this);
if (!e)
{
- char* r = ServerInstance->XLines->matches_gline(match_against);
+ char* r = ServerInstance->XLines->matches_gline(this);
if (r)
{
return;
}
- r = ServerInstance->XLines->matches_kline(match_against);
+ r = ServerInstance->XLines->matches_kline(this);
if (r)
{
FOREACH_MOD(I_OnUserConnect,OnUserConnect(this));
FOREACH_MOD(I_OnPostConnect,OnPostConnect(this));
this->registered = REG_ALL;
- ServerInstance->WriteOpers("*** Client connecting on port %d: %s!%s@%s [%s]", this->GetPort(), this->nick, this->ident, this->host, this->GetIPString());
+ ServerInstance->SNO->WriteToSnoMask('c',"Client connecting on port %d: %s!%s@%s [%s]", this->GetPort(), this->nick, this->ident, this->host, this->GetIPString());
}
/** userrec::UpdateNick()
*/
userrec* userrec::UpdateNickHash(const char* New)
{
- //user_hash::iterator newnick;
- user_hash::iterator oldnick = ServerInstance->clientlist.find(this->nick);
+ try
+ {
+ //user_hash::iterator newnick;
+ user_hash::iterator oldnick = ServerInstance->clientlist.find(this->nick);
- if (!strcasecmp(this->nick,New))
- return oldnick->second;
+ if (!strcasecmp(this->nick,New))
+ return oldnick->second;
- if (oldnick == ServerInstance->clientlist.end())
- return NULL; /* doesnt exist */
+ if (oldnick == ServerInstance->clientlist.end())
+ return NULL; /* doesnt exist */
- userrec* olduser = oldnick->second;
- ServerInstance->clientlist[New] = olduser;
- ServerInstance->clientlist.erase(oldnick);
- return ServerInstance->clientlist[New];
+ userrec* olduser = oldnick->second;
+ ServerInstance->clientlist[New] = olduser;
+ ServerInstance->clientlist.erase(oldnick);
+ return ServerInstance->clientlist[New];
+ }
+
+ catch (...)
+ {
+ ServerInstance->Log(DEBUG,"Exception in userrec::UpdateNickHash()");
+ return NULL;
+ }
}
bool userrec::ForceNickChange(const char* newnick)
{
- char nick[MAXBUF];
- int MOD_RESULT = 0;
-
- *nick = 0;
-
- FOREACH_RESULT(I_OnUserPreNick,OnUserPreNick(this, newnick));
-
- if (MOD_RESULT)
+ try
{
- ServerInstance->stats->statsCollisions++;
- return false;
- }
+ int MOD_RESULT = 0;
- if (ServerInstance->XLines->matches_qline(newnick))
- {
- ServerInstance->stats->statsCollisions++;
+ FOREACH_RESULT(I_OnUserPreNick,OnUserPreNick(this, newnick));
+
+ if (MOD_RESULT)
+ {
+ ServerInstance->stats->statsCollisions++;
+ return false;
+ }
+
+ if (ServerInstance->XLines->matches_qline(newnick))
+ {
+ ServerInstance->stats->statsCollisions++;
+ return false;
+ }
+
+ if (this->registered == REG_ALL)
+ {
+ const char* pars[1];
+ pars[0] = newnick;
+ std::string cmd = "NICK";
+ return (ServerInstance->Parser->CallHandler(cmd, pars, 1, this) == CMD_SUCCESS);
+ }
return false;
}
- if (newnick)
- {
- strlcpy(this->nick, newnick, NICKMAX - 1);
- }
- if (this->registered == REG_ALL)
+ catch (...)
{
- const char* pars[1];
- pars[0] = nick;
- std::string cmd = "NICK";
- ServerInstance->Parser->CallHandler(cmd, pars, 1, this);
+ ServerInstance->Log(DEBUG,"Exception in userrec::ForceNickChange()");
+ return false;
}
- return true;
}
void userrec::SetSockAddr(int protocol_family, const char* ip, int port)
if ((this->fd < 0) || (this->fd > MAX_DESCRIPTORS))
return;
- text.append("\r\n");
+ try
+ {
+ text.append("\r\n");
+ }
+ catch (...)
+ {
+ ServerInstance->Log(DEBUG,"Exception in userrec::Write() std::string::append");
+ return;
+ }
if (ServerInstance->Config->GetIOHook(this->GetPort()))
{
void userrec::WriteCommon(const std::string &text)
{
- bool sent_to_at_least_one = false;
-
- if (this->registered != REG_ALL)
- return;
-
- uniq_id++;
-
- for (std::vector<ucrec*>::const_iterator v = this->chans.begin(); v != this->chans.end(); v++)
+ try
{
- ucrec *n = *v;
- if (n->channel)
+ bool sent_to_at_least_one = false;
+
+ if (this->registered != REG_ALL)
+ return;
+
+ uniq_id++;
+
+ for (std::vector<ucrec*>::const_iterator v = this->chans.begin(); v != this->chans.end(); v++)
{
- CUList *ulist= n->channel->GetUsers();
-
- for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
+ ucrec *n = *v;
+ if (n->channel)
{
- if ((IS_LOCAL(i->second)) && (already_sent[i->second->fd] != uniq_id))
+ CUList *ulist= n->channel->GetUsers();
+
+ for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
{
- already_sent[i->second->fd] = uniq_id;
- i->second->WriteFrom(this, std::string(text));
- sent_to_at_least_one = true;
+ if ((IS_LOCAL(i->second)) && (already_sent[i->second->fd] != uniq_id))
+ {
+ already_sent[i->second->fd] = uniq_id;
+ i->second->WriteFrom(this, std::string(text));
+ sent_to_at_least_one = true;
+ }
}
}
}
+
+ /*
+ * if the user was not in any channels, no users will receive the text. Make sure the user
+ * receives their OWN message for WriteCommon
+ */
+ if (!sent_to_at_least_one)
+ {
+ this->WriteFrom(this,std::string(text));
+ }
}
- /*
- * if the user was not in any channels, no users will receive the text. Make sure the user
- * receives their OWN message for WriteCommon
- */
- if (!sent_to_at_least_one)
+ catch (...)
{
- this->WriteFrom(this,std::string(text));
+ ServerInstance->Log(DEBUG,"Exception in userrec::WriteCommon()");
}
}
void userrec::WriteCommonExcept(const std::string &text)
{
- bool quit_munge = true;
+ bool quit_munge = false;
char oper_quit[MAXBUF];
char textbuffer[MAXBUF];
return;
std::string wallop = "WALLOPS :";
- wallop.append(text);
+
+ try
+ {
+ wallop.append(text);
+ }
+ catch (...)
+ {
+ ServerInstance->Log(DEBUG,"Exception in userrec::Write() std::string::append");
+ return;
+ }
for (std::vector<userrec*>::const_iterator i = ServerInstance->local_users.begin(); i != ServerInstance->local_users.end(); i++)
{
int userrec::CountChannels()
{
- int z = 0;
- for (std::vector<ucrec*>::const_iterator i = this->chans.begin(); i != this->chans.end(); i++)
- if ((*i)->channel)
- z++;
- return z;
+ return ChannelCount;
+}
+
+void userrec::ModChannelCount(int n)
+{
+ ChannelCount += n;
}
bool userrec::ChangeName(const char* gecos)
{
+ if (!strcmp(gecos, this->fullname))
+ return true;
+
if (IS_LOCAL(this))
{
int MOD_RESULT = 0;
bool userrec::ChangeDisplayedHost(const char* host)
{
+ if (!strcmp(host, this->dhost))
+ return true;
+
if (IS_LOCAL(this))
{
int MOD_RESULT = 0;
FOREACH_MOD(I_OnChangeHost,OnChangeHost(this,host));
}
if (this->ServerInstance->Config->CycleHosts)
- this->WriteCommonExcept("QUIT :Changing hosts");
+ this->WriteCommonExcept("%s","QUIT :Changing hosts");
strlcpy(this->dhost,host,63);
{
if ((*i)->channel)
{
- (*i)->channel->WriteAllExceptSender(this, 0, "JOIN %s", (*i)->channel->name);
- (*i)->channel->WriteChannelWithServ(this->ServerInstance->Config->ServerName, "MODE %s +%s",
- (*i)->channel->name, this->ServerInstance->Modes->ModeString(this, (*i)->channel).c_str());
+ (*i)->channel->WriteAllExceptSender(this, false, 0, "JOIN %s", (*i)->channel->name);
+ std::string n = this->ServerInstance->Modes->ModeString(this, (*i)->channel);
+ if (n.length() > 0)
+ (*i)->channel->WriteAllExceptSender(this, true, 0, "MODE %s +%s", (*i)->channel->name, n.c_str());
}
}
}
bool userrec::ChangeIdent(const char* newident)
{
+ if (!strcmp(newident, this->ident))
+ return true;
+
if (this->ServerInstance->Config->CycleHosts)
- this->WriteCommonExcept("QUIT :Changing ident");
+ this->WriteCommonExcept("%s","QUIT :Changing ident");
strlcpy(this->ident, newident, IDENTMAX+2);
{
if ((*i)->channel)
{
- (*i)->channel->WriteAllExceptSender(this, 0, "JOIN %s", (*i)->channel->name);
- (*i)->channel->WriteChannelWithServ(this->ServerInstance->Config->ServerName, "MODE %s +%s",
- (*i)->channel->name, this->ServerInstance->Modes->ModeString(this, (*i)->channel).c_str());
+ (*i)->channel->WriteAllExceptSender(this, false, 0, "JOIN %s", (*i)->channel->name);
+ std::string n = this->ServerInstance->Modes->ModeString(this, (*i)->channel);
+ if (n.length() > 0)
+ (*i)->channel->WriteAllExceptSender(this, true, 0, "MODE %s +%s", (*i)->channel->name, n.c_str());
}
}
}
std::string userrec::ChannelList(userrec* source)
{
- std::string list;
- for (std::vector<ucrec*>::const_iterator i = this->chans.begin(); i != this->chans.end(); i++)
+ try
{
- ucrec* rec = *i;
-
- if(rec->channel && rec->channel->name)
+ std::string list;
+ for (std::vector<ucrec*>::const_iterator i = this->chans.begin(); i != this->chans.end(); i++)
{
- /* If the target is the same as the sender, let them see all their channels.
- * If the channel is NOT private/secret OR the user shares a common channel
- * If the user is an oper, and the <options:operspywhois> option is set.
- */
- if ((source == this) || (*source->oper && ServerInstance->Config->OperSpyWhois) || (((!rec->channel->modes[CM_PRIVATE]) && (!rec->channel->modes[CM_SECRET])) || (rec->channel->HasUser(source))))
+ ucrec* rec = *i;
+
+ if(rec->channel && rec->channel->name)
{
- list.append(rec->channel->GetPrefixChar(this)).append(rec->channel->name).append(" ");
+ /* If the target is the same as the sender, let them see all their channels.
+ * If the channel is NOT private/secret OR the user shares a common channel
+ * If the user is an oper, and the <options:operspywhois> option is set.
+ */
+ if ((source == this) || (*source->oper && ServerInstance->Config->OperSpyWhois) || (((!rec->channel->modes[CM_PRIVATE]) && (!rec->channel->modes[CM_SECRET])) || (rec->channel->HasUser(source))))
+ {
+ list.append(rec->channel->GetPrefixChar(this)).append(rec->channel->name).append(" ");
+ }
}
}
+ return list;
+ }
+ catch (...)
+ {
+ ServerInstance->Log(DEBUG,"Exception in userrec::ChannelList()");
+ return "";
}
- return list;
}
void userrec::SplitChanList(userrec* dest, const std::string &cl)
std::ostringstream prefix;
std::string::size_type start, pos, length;
- prefix << ":" << ServerInstance->Config->ServerName << " 319 " << this->nick << " " << dest->nick << " :";
- line = prefix.str();
-
- for (start = 0; (pos = cl.find(' ', start)) != std::string::npos; start = pos+1)
+ try
{
- length = (pos == std::string::npos) ? cl.length() : pos;
-
- if (line.length() + length - start > 510)
- {
- this->Write(line);
- line = prefix.str();
- }
-
- if(pos == std::string::npos)
+ prefix << ":" << ServerInstance->Config->ServerName << " 319 " << this->nick << " " << dest->nick << " :";
+ line = prefix.str();
+
+ for (start = 0; (pos = cl.find(' ', start)) != std::string::npos; start = pos+1)
{
- line.append(cl.substr(start, length - start));
- break;
+ length = (pos == std::string::npos) ? cl.length() : pos;
+
+ if (line.length() + length - start > 510)
+ {
+ this->Write(line);
+ line = prefix.str();
+ }
+
+ if(pos == std::string::npos)
+ {
+ line.append(cl.substr(start, length - start));
+ break;
+ }
+ else
+ {
+ line.append(cl.substr(start, length - start + 1));
+ }
}
- else
+
+ if (line.length())
{
- line.append(cl.substr(start, length - start + 1));
+ this->Write(line);
}
}
- if (line.length())
+ catch (...)
{
- this->Write(line);
+ ServerInstance->Log(DEBUG,"Exception in userrec::SplitChanList()");
}
}
if (uc->channel->DelUser(this) == 0)
{
/* No users left in here, mark it for deletion */
- to_delete.push_back(uc->channel);
+ try
+ {
+ to_delete.push_back(uc->channel);
+ }
+ catch (...)
+ {
+ ServerInstance->Log(DEBUG,"Exception in userrec::PurgeEmptyChannels to_delete.push_back()");
+ }
uc->channel = NULL;
}
}
void userrec::HandleEvent(EventType et)
{
/* WARNING: May delete this user! */
- ServerInstance->ProcessUser(this);
+ try
+ {
+ ServerInstance->ProcessUser(this);
+ }
+ catch (...)
+ {
+ ServerInstance->Log(DEBUG,"Exception in userrec::HandleEvent intercepted");
+ }
}
projects / user / henk / code / inspircd.git / blobdiff