* ---------------------------------------------------
*/
-using namespace std;
-
-#include "inspircd_config.h"
+#include "inspircd_config.h"
+#include "configreader.h"
#include "channels.h"
#include "connection.h"
#include "users.h"
if (n->second)
delete[] n->second;
}
+
opertypes.clear();
return true;
}
if (n->second)
delete[] n->second;
}
+
operclass.clear();
return true;
}
{
char* TypeName = (char*)values[0];
char* Classes = (char*)values[1];
+
opertypes[TypeName] = strdup(Classes);
log(DEBUG,"Read oper TYPE '%s' with classes '%s'",TypeName,Classes);
return true;
{
char* ClassName = (char*)values[0];
char* CommandList = (char*)values[1];
+
operclass[ClassName] = strdup(CommandList);
log(DEBUG,"Read oper CLASS '%s' with commands '%s'",ClassName,CommandList);
return true;
sendq = "";
chans.clear();
invites.clear();
- chans.resize(MAXCHANS);
- for (unsigned int n = 0; n < MAXCHANS; n++)
- {
+ chans.resize(MAXCHANS);
+
+ for (unsigned int n = 0; n < MAXCHANS; n++)
+ {
ucrec* x = new ucrec();
chans[n] = x;
x->channel = NULL;
x->uc_modes = 0;
- }
+ }
}
userrec::~userrec()
}
}
+/* XXX - minor point, other *Host functions return a char *, this one creates it. Might be nice to be consistant? */
void userrec::MakeHost(char* nhost)
{
/* This is much faster than snprintf */
{
return read(this->fd, buffer, size);
}
- else return 0;
+ else
+ return 0;
}
for (InvitedList::iterator i = invites.begin(); i != invites.end(); i++)
{
irc::string compare = i->channel;
+
if (compare == channel)
{
return true;
}
}
+
return false;
}
void userrec::InviteTo(irc::string &channel)
{
Invited i;
+
i.channel = channel;
invites.push_back(i);
}
void userrec::RemoveInvite(irc::string &channel)
{
log(DEBUG,"Removing invites");
+
if (invites.size())
{
for (InvitedList::iterator i = invites.begin(); i != invites.end(); i++)
{
irc::string compare = i->channel;
+
if (compare == channel)
{
invites.erase(i);
return;
- }
+ }
}
}
}
char* savept;
char* savept2;
- // users on remote servers can completely bypass
- // all permissions based checks.
- // This prevents desyncs when one server has different
- // type/class tags to another.
+ /*
+ * users on remote servers can completely bypass all permissions based checks.
+ * This prevents desyncs when one server has different type/class tags to another.
+ * That having been said, this does open things up to the possibility of source changes
+ * allowing remote kills, etc - but if they have access to the src, they most likely have
+ * access to the conf - so it's an end to a means either way.
+ */
if (!IS_LOCAL(this))
return true;
bool userrec::AddBuffer(const std::string &a)
{
- std::string b = "";
+ std::string b = "";
char* n = (char*)a.c_str();
- for (char* i = n; *i; i++)
+
+ for (char* i = n; *i; i++)
{
- if ((*i != '\r') && (*i != '\0') && (*i != 7))
- b = b + *i;
+ if ((*i != '\r') && (*i != '\0') && (*i != 7))
+ b = b + *i;
}
- std::stringstream stream(recvq);
- stream << b;
- recvq = stream.str();
+
+ recvq.append(b);
unsigned int i = 0;
+
// count the size of the first line in the buffer.
while (i < recvq.length())
{
this->SetWriteError("RecvQ exceeded");
WriteOpers("*** User %s RecvQ of %d exceeds connect class maximum of %d",this->nick,recvq.length(),this->recvqmax);
}
- // return false if we've had more than 600 characters WITHOUT
- // a carriage return (this is BAD, drop the socket)
+
+ /*
+ * return false if we've had more than 600 characters WITHOUT
+ * a carriage return (this is BAD, drop the socket)
+ */
return (i < 600);
}
bool userrec::BufferIsReady()
{
unsigned int t = recvq.length();
- for (unsigned int i = 0; i < t; i++)
+
+ for (unsigned int i = 0; i < t; i++)
if (recvq[i] == '\n')
return true;
- return false;
+ return false;
}
void userrec::ClearBuffer()
{
- recvq = "";
+ recvq = "";
}
std::string userrec::GetBuffer()
{
if (recvq == "")
return "";
- char* line = (char*)recvq.c_str();
- std::string ret = "";
- while ((*line != '\n') && (*line))
- {
- ret = ret + *line;
- line++;
- }
- if ((*line == '\n') || (*line == '\r'))
- line++;
- recvq = line;
- return ret;
+
+ char* line = (char*)recvq.c_str();
+
+ std::string ret = "";
+
+ while ((*line != '\n') && (*line))
+ {
+ ret = ret + *line;
+ line++;
+ }
+
+ while ((*line == '\n') || (*line == '\r'))
+ line++;
+
+ recvq = line;
+
+ return ret;
}
void userrec::AddWriteBuf(const std::string &data)
{
if (*this->GetWriteError())
return;
+
if (sendq.length() + data.length() > (unsigned)this->sendqmax)
{
- /* Fix by brain - Set the error text BEFORE calling writeopers, because
+ /*
+ * Fix by brain - Set the error text BEFORE calling writeopers, because
* if we dont it'll recursively call here over and over again trying
* to repeatedly add the text to the sendq!
*/
WriteOpers("*** User %s SendQ of %d exceeds connect class maximum of %d",this->nick,sendq.length() + data.length(),this->sendqmax);
return;
}
- std::stringstream stream;
- stream << sendq << data;
- sendq = stream.str();
+
+ sendq.append(data);
}
// send AS MUCH OF THE USERS SENDQ as we are able to (might not be all of it)
void AddOper(userrec* user)
{
- log(DEBUG,"Oper added to optimization list");
- all_opers.push_back(user);
+ log(DEBUG,"Oper added to optimization list");
+ all_opers.push_back(user);
}
void DeleteOper(userrec* user)
{
- for (std::vector<userrec*>::iterator a = all_opers.begin(); a < all_opers.end(); a++)
- {
- if (*a == user)
- {
- log(DEBUG,"Oper removed from optimization list");
- all_opers.erase(a);
- return;
- }
- }
+ for (std::vector<userrec*>::iterator a = all_opers.begin(); a < all_opers.end(); a++)
+ {
+ if (*a == user)
+ {
+ log(DEBUG,"Oper removed from optimization list");
+ all_opers.erase(a);
+ return;
+ }
+ }
}
void kill_link(userrec *user,const char* r)
{
- user_hash::iterator iter = clientlist.find(user->nick);
+ user_hash::iterator iter = clientlist.find(user->nick);
- char reason[MAXBUF];
+/*
+ * I'm pretty sure returning here is causing a desync when part of the net thinks a user is gone,
+ * and another part doesn't. We want to broadcast the quit/kill before bailing so the net stays in sync.
+ *
+ * I can't imagine this blowing up, so I'm commenting it out. We still check
+ * before playing with a bad iterator below in our if(). DISCUSS THIS BEFORE YOU DO ANYTHING. --w00t
+ *
+ * if (iter == clientlist.end())
+ * return;
+ */
- strlcpy(reason,r,MAXQUIT-1);
+ char reason[MAXBUF];
- log(DEBUG,"kill_link: %s '%s'",user->nick,reason);
- Write(user->fd,"ERROR :Closing link (%s@%s) [%s]",user->ident,user->host,reason);
- log(DEBUG,"closing fd %d",user->fd);
+ strlcpy(reason,r,MAXQUIT-1);
+ log(DEBUG,"kill_link: %s '%s'",user->nick,reason);
+
+ if (IS_LOCAL(user))
+ Write(user->fd,"ERROR :Closing link (%s@%s) [%s]",user->ident,user->host,reason);
- if (user->registered == 7) {
+ if (user->registered == 7)
+ {
purge_empty_chans(user);
- FOREACH_MOD(I_OnUserQuit,OnUserQuit(user,reason));
- WriteCommonExcept(user,"QUIT :%s",reason);
- }
+ FOREACH_MOD(I_OnUserQuit,OnUserQuit(user,reason));
+ WriteCommonExcept(user,"QUIT :%s",reason);
+ }
- user->FlushWriteBuf();
+ if (IS_LOCAL(user))
+ user->FlushWriteBuf();
- FOREACH_MOD(I_OnUserDisconnect,OnUserDisconnect(user));
+ FOREACH_MOD(I_OnUserDisconnect,OnUserDisconnect(user));
- if (user->fd > -1)
- {
+ if (IS_LOCAL(user))
+ {
if (Config->GetIOHook(user->port))
{
try
{
- Config->GetIOHook(user->port)->OnRawSocketClose(user->fd);
+ Config->GetIOHook(user->port)->OnRawSocketClose(user->fd);
+ }
+ catch (ModuleException& modexcept)
+ {
+ log(DEBUG,"Module exception cought: %s",modexcept.GetReason());
}
- catch (ModuleException& modexcept)
- {
- log(DEBUG,"Module exception cought: %s",modexcept.GetReason());
- }
}
- ServerInstance->SE->DelFd(user->fd);
- user->CloseSocket();
- }
-
- // this must come before the WriteOpers so that it doesnt try to fill their buffer with anything
- // if they were an oper with +s.
- if (user->registered == 7) {
- // fix by brain: only show local quits because we only show local connects (it just makes SENSE)
- if (user->fd > -1)
- WriteOpers("*** Client exiting: %s!%s@%s [%s]",user->nick,user->ident,user->host,reason);
- AddWhoWas(user);
- }
-
- if (iter != clientlist.end())
- {
- log(DEBUG,"deleting user hash value %lx",(unsigned long)user);
- if (user->fd > -1)
+
+ ServerInstance->SE->DelFd(user->fd);
+ user->CloseSocket();
+ }
+
+ /*
+ * this must come before the 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.
+ */
+ if (user->registered == 7)
+ {
+ if (IS_LOCAL(user))
+ WriteOpers("*** Client exiting: %s!%s@%s [%s]",user->nick,user->ident,user->host,reason);
+ AddWhoWas(user);
+ }
+
+ if (iter != clientlist.end())
+ {
+ log(DEBUG,"deleting user hash value %lx",(unsigned long)user);
+ if (IS_LOCAL(user))
{
- fd_ref_table[user->fd] = NULL;
+ fd_ref_table[user->fd] = NULL;
if (find(local_users.begin(),local_users.end(),user) != local_users.end())
{
local_users.erase(find(local_users.begin(),local_users.end(),user));
log(DEBUG,"Delete local user");
}
}
- clientlist.erase(iter);
- }
- delete user;
+ clientlist.erase(iter);
+ delete user;
+ }
}
WhoWasGroup::WhoWasGroup(userrec* user) : host(NULL), dhost(NULL), ident(NULL), server(NULL), gecos(NULL), signon(user->signon)
/* adds or updates an entry in the whowas list */
void AddWhoWas(userrec* u)
{
- whowas_users::iterator iter = whowas.find(u->nick);
+ whowas_users::iterator iter = whowas.find(u->nick);
+
if (iter == whowas.end())
{
whowas_set* n = new whowas_set;
else
{
whowas_set* group = (whowas_set*)iter->second;
+
if (group->size() > 10)
{
WhoWasGroup *a = (WhoWasGroup*)*(group->begin());
delete a;
group->pop_front();
}
+
WhoWasGroup *a = new WhoWasGroup(u);
group->push_back(a);
}
const char *ipaddr = inet_ntoa(ip4);
int j = 0;
- // fix by brain.
- // as these nicknames are 'RFC impossible', we can be sure nobody is going to be
- // using one as a registered connection. As theyre per fd, we can also safely assume
- // that we wont have collisions. Therefore, if the nick exists in the list, its only
- // used by a dead socket, erase the iterator so that the new client may reclaim it.
- // this was probably the cause of 'server ignores me when i hammer it with reconnects'
- // issue in earlier alphas/betas
- if (iter != clientlist.end())
- {
- userrec* goner = iter->second;
- delete goner;
- clientlist.erase(iter);
- }
+ /*
+ * fix by brain.
+ * as these nicknames are 'RFC impossible', we can be sure nobody is going to be
+ * using one as a registered connection. As they are per fd, we can also safely assume
+ * that we wont have collisions. Therefore, if the nick exists in the list, its only
+ * used by a dead socket, erase the iterator so that the new client may reclaim it.
+ * this was probably the cause of 'server ignores me when i hammer it with reconnects'
+ * issue in earlier alphas/betas
+ */
+ if (iter != clientlist.end())
+ {
+ userrec* goner = iter->second;
+ delete goner;
+ clientlist.erase(iter);
+ }
log(DEBUG,"AddClient: %d %d %s",socket,port,ipaddr);
- clientlist[tempnick] = new userrec();
- clientlist[tempnick]->fd = socket;
- strlcpy(clientlist[tempnick]->nick,tempnick.c_str(),NICKMAX-1);
+ clientlist[tempnick] = new userrec();
+ clientlist[tempnick]->fd = socket;
+ strlcpy(clientlist[tempnick]->nick,tempnick.c_str(),NICKMAX-1);
/* Smarter than your average bear^H^H^H^Hset of strlcpys. */
for (char* temp = (char*)ipaddr; *temp && j < 64; temp++, j++)
clientlist[tempnick]->dhost[j] = clientlist[tempnick]->host[j] = *temp;
clientlist[tempnick]->dhost[j] = clientlist[tempnick]->host[j] = 0;
- clientlist[tempnick]->server = (char*)FindServerNamePtr(Config->ServerName);
+ clientlist[tempnick]->server = (char*)FindServerNamePtr(Config->ServerName);
/* We don't need range checking here, we KNOW 'unknown\0' will fit into the ident field. */
- strcpy(clientlist[tempnick]->ident, "unknown");
+ strcpy(clientlist[tempnick]->ident, "unknown");
- clientlist[tempnick]->registered = 0;
- clientlist[tempnick]->signon = TIME + Config->dns_timeout;
- clientlist[tempnick]->lastping = 1;
+ clientlist[tempnick]->registered = 0;
+ clientlist[tempnick]->signon = TIME + Config->dns_timeout;
+ clientlist[tempnick]->lastping = 1;
clientlist[tempnick]->ip4 = ip4;
- clientlist[tempnick]->port = port;
-
- // set the registration timeout for this user
- unsigned long class_regtimeout = 90;
- int class_flood = 0;
- long class_threshold = 5;
- long class_sqmax = 262144; // 256kb
- long class_rqmax = 4096; // 4k
-
- for (ClassVector::iterator i = Config->Classes.begin(); i != Config->Classes.end(); i++)
- {
- if ((i->type == CC_ALLOW) && (match(ipaddr,i->host.c_str())))
- {
- class_regtimeout = (unsigned long)i->registration_timeout;
- class_flood = i->flood;
- clientlist[tempnick]->pingmax = i->pingtime;
- class_threshold = i->threshold;
- class_sqmax = i->sendqmax;
- class_rqmax = i->recvqmax;
- break;
- }
- }
-
- clientlist[tempnick]->nping = TIME+clientlist[tempnick]->pingmax + Config->dns_timeout;
- clientlist[tempnick]->timeout = TIME+class_regtimeout;
- clientlist[tempnick]->flood = class_flood;
- clientlist[tempnick]->threshold = class_threshold;
- clientlist[tempnick]->sendqmax = class_sqmax;
- clientlist[tempnick]->recvqmax = class_rqmax;
+ clientlist[tempnick]->port = port;
+
+ // set the registration timeout for this user
+ unsigned long class_regtimeout = 90;
+ int class_flood = 0;
+ long class_threshold = 5;
+ long class_sqmax = 262144; // 256kb
+ long class_rqmax = 4096; // 4k
+
+ for (ClassVector::iterator i = Config->Classes.begin(); i != Config->Classes.end(); i++)
+ {
+ if ((i->type == CC_ALLOW) && (match(ipaddr,i->host.c_str())))
+ {
+ class_regtimeout = (unsigned long)i->registration_timeout;
+ class_flood = i->flood;
+ clientlist[tempnick]->pingmax = i->pingtime;
+ class_threshold = i->threshold;
+ class_sqmax = i->sendqmax;
+ class_rqmax = i->recvqmax;
+ break;
+ }
+ }
+
+ clientlist[tempnick]->nping = TIME+clientlist[tempnick]->pingmax + Config->dns_timeout;
+ clientlist[tempnick]->timeout = TIME+class_regtimeout;
+ clientlist[tempnick]->flood = class_flood;
+ clientlist[tempnick]->threshold = class_threshold;
+ clientlist[tempnick]->sendqmax = class_sqmax;
+ clientlist[tempnick]->recvqmax = class_rqmax;
fd_ref_table[socket] = clientlist[tempnick];
local_users.push_back(clientlist[tempnick]);
- if (local_users.size() > Config->SoftLimit)
- {
- kill_link(clientlist[tempnick],"No more connections allowed");
- return;
- }
-
- if (local_users.size() >= MAXCLIENTS)
- {
- kill_link(clientlist[tempnick],"No more connections allowed");
- return;
- }
-
- // this is done as a safety check to keep the file descriptors within range of fd_ref_table.
- // its a pretty big but for the moment valid assumption:
- // file descriptors are handed out starting at 0, and are recycled as theyre freed.
- // therefore if there is ever an fd over 65535, 65536 clients must be connected to the
- // irc server at once (or the irc server otherwise initiating this many connections, files etc)
- // which for the time being is a physical impossibility (even the largest networks dont have more
- // than about 10,000 users on ONE server!)
- if ((unsigned)socket >= MAX_DESCRIPTORS)
- {
- kill_link(clientlist[tempnick],"Server is full");
- return;
- }
- char* e = matches_exception(ipaddr);
- if (!e)
- {
- char* r = matches_zline(ipaddr);
- if (r)
- {
- char reason[MAXBUF];
- snprintf(reason,MAXBUF,"Z-Lined: %s",r);
- kill_link(clientlist[tempnick],reason);
- return;
- }
- }
-
- ServerInstance->SE->AddFd(socket,true,X_ESTAB_CLIENT);
+ if (local_users.size() > Config->SoftLimit)
+ {
+ kill_link(clientlist[tempnick],"No more connections allowed");
+ return;
+ }
+
+ if (local_users.size() >= MAXCLIENTS)
+ {
+ kill_link(clientlist[tempnick],"No more connections allowed");
+ return;
+ }
+
+ /*
+ * XXX -
+ * this is done as a safety check to keep the file descriptors within range of fd_ref_table.
+ * its a pretty big but for the moment valid assumption:
+ * file descriptors are handed out starting at 0, and are recycled as theyre freed.
+ * therefore if there is ever an fd over 65535, 65536 clients must be connected to the
+ * irc server at once (or the irc server otherwise initiating this many connections, files etc)
+ * which for the time being is a physical impossibility (even the largest networks dont have more
+ * than about 10,000 users on ONE server!)
+ */
+ if ((unsigned)socket >= MAX_DESCRIPTORS)
+ {
+ kill_link(clientlist[tempnick],"Server is full");
+ return;
+ }
+ char* e = matches_exception(ipaddr);
+ if (!e)
+ {
+ char* r = matches_zline(ipaddr);
+ if (r)
+ {
+ char reason[MAXBUF];
+ snprintf(reason,MAXBUF,"Z-Lined: %s",r);
+ kill_link(clientlist[tempnick],reason);
+ return;
+ }
+ }
+
+ ServerInstance->SE->AddFd(socket,true,X_ESTAB_CLIENT);
WriteServ(clientlist[tempnick]->fd,"NOTICE Auth :*** Looking up your hostname...");
}
void FullConnectUser(userrec* user, CullList* Goners)
{
- ServerInstance->stats->statsConnects++;
- user->idle_lastmsg = TIME;
- log(DEBUG,"ConnectUser: %s",user->nick);
+ ServerInstance->stats->statsConnects++;
+ user->idle_lastmsg = TIME;
+ log(DEBUG,"ConnectUser: %s",user->nick);
ConnectClass a = GetClass(user);
Goners->AddItem(user,"Unauthorised connection");
return;
}
+
if ((*(a.pass.c_str())) && (!user->haspassed))
- {
+ {
Goners->AddItem(user,"Invalid password");
- return;
- }
+ return;
+ }
+
if (FindMatchingLocal(user) > a.maxlocal)
{
Goners->AddItem(user,"No more connections allowed from your host via this connect class (local)");
return;
}
- char match_against[MAXBUF];
- snprintf(match_against,MAXBUF,"%s@%s",user->ident,user->host);
- char* e = matches_exception(match_against);
- if (!e)
- {
- char* r = matches_gline(match_against);
- if (r)
- {
- char reason[MAXBUF];
- snprintf(reason,MAXBUF,"G-Lined: %s",r);
+ char match_against[MAXBUF];
+ snprintf(match_against,MAXBUF,"%s@%s",user->ident,user->host);
+ char* e = matches_exception(match_against);
+
+ if (!e)
+ {
+ char* r = matches_gline(match_against);
+
+ if (r)
+ {
+ char reason[MAXBUF];
+ snprintf(reason,MAXBUF,"G-Lined: %s",r);
Goners->AddItem(user,reason);
- return;
- }
- r = matches_kline(user->host);
- if (r)
- {
- char reason[MAXBUF];
- snprintf(reason,MAXBUF,"K-Lined: %s",r);
- Goners->AddItem(user,reason);
- return;
- }
- }
-
-
- WriteServ(user->fd,"NOTICE Auth :Welcome to \002%s\002!",Config->Network);
- WriteServ(user->fd,"001 %s :Welcome to the %s IRC Network %s!%s@%s",user->nick,Config->Network,user->nick,user->ident,user->host);
- WriteServ(user->fd,"002 %s :Your host is %s, running version %s",user->nick,Config->ServerName,VERSION);
- WriteServ(user->fd,"003 %s :This server was created %s %s",user->nick,__TIME__,__DATE__);
- WriteServ(user->fd,"004 %s %s %s iowghrasxRVSCWBG lvhopsmntikrcaqbegIOLQRSKVHGCNT vhobeIaqglk",user->nick,Config->ServerName,VERSION);
- // anfl @ #ratbox, efnet reminded me that according to the RFC this cant contain more than 13 tokens per line...
- // so i'd better split it :)
- std::stringstream out(Config->data005);
- std::string token = "";
- std::string line5 = "";
- int token_counter = 0;
- while (!out.eof())
- {
- out >> token;
- line5 = line5 + token + " ";
- token_counter++;
- if ((token_counter >= 13) || (out.eof() == true))
- {
- WriteServ(user->fd,"005 %s %s:are supported by this server",user->nick,line5.c_str());
- line5 = "";
- token_counter = 0;
- }
- }
- ShowMOTD(user);
-
- // fix 3 by brain, move registered = 7 below these so that spurious modes and host changes dont go out
- // onto the network and produce 'fake direction'
- FOREACH_MOD(I_OnUserConnect,OnUserConnect(user));
- FOREACH_MOD(I_OnGlobalConnect,OnGlobalConnect(user));
- user->registered = 7;
- WriteOpers("*** Client connecting on port %lu: %s!%s@%s [%s]",(unsigned long)user->port,user->nick,user->ident,user->host,(char*)inet_ntoa(user->ip4));
-}
-
-/* re-allocates a nick in the user_hash after they change nicknames,
- * returns a pointer to the new user as it may have moved */
+ return;
+ }
+
+ r = matches_kline(user->host);
+
+ if (r)
+ {
+ char reason[MAXBUF];
+ snprintf(reason,MAXBUF,"K-Lined: %s",r);
+ Goners->AddItem(user,reason);
+ return;
+ }
+ }
+
+ WriteServ(user->fd,"NOTICE Auth :Welcome to \002%s\002!",Config->Network);
+ WriteServ(user->fd,"001 %s :Welcome to the %s IRC Network %s!%s@%s",user->nick,Config->Network,user->nick,user->ident,user->host);
+ WriteServ(user->fd,"002 %s :Your host is %s, running version %s",user->nick,Config->ServerName,VERSION);
+ WriteServ(user->fd,"003 %s :This server was created %s %s",user->nick,__TIME__,__DATE__);
+ WriteServ(user->fd,"004 %s %s %s iowghrasxRVSCWBG lvhopsmntikrcaqbegIOLQRSKVHGCNT vhobeIaqglk",user->nick,Config->ServerName,VERSION);
+
+ // anfl @ #ratbox, efnet reminded me that according to the RFC this cant contain more than 13 tokens per line...
+ // so i'd better split it :)
+ std::stringstream out(Config->data005);
+ std::string token = "";
+ std::string line5 = "";
+ int token_counter = 0;
+
+ while (!out.eof())
+ {
+ out >> token;
+ line5 = line5 + token + " ";
+ token_counter++;
+
+ if ((token_counter >= 13) || (out.eof() == true))
+ {
+ WriteServ(user->fd,"005 %s %s:are supported by this server",user->nick,line5.c_str());
+ line5 = "";
+ token_counter = 0;
+ }
+ }
+
+ ShowMOTD(user);
+
+ /*
+ * fix 3 by brain, move registered = 7 below these so that spurious modes and host
+ * changes dont go out onto the network and produce 'fake direction'.
+ */
+ FOREACH_MOD(I_OnUserConnect,OnUserConnect(user));
+ FOREACH_MOD(I_OnGlobalConnect,OnGlobalConnect(user));
+ user->registered = 7;
+ WriteOpers("*** Client connecting on port %lu: %s!%s@%s [%s]",(unsigned long)user->port,user->nick,user->ident,user->host,(char*)inet_ntoa(user->ip4));
+}
+
+/** ReHashNick()
+ * re-allocates a nick in the user_hash after they change nicknames,
+ * returns a pointer to the new user as it may have moved
+ */
userrec* ReHashNick(char* Old, char* New)
{
- //user_hash::iterator newnick;
- user_hash::iterator oldnick = clientlist.find(Old);
+ //user_hash::iterator newnick;
+ user_hash::iterator oldnick = clientlist.find(Old);
- log(DEBUG,"ReHashNick: %s %s",Old,New);
+ log(DEBUG,"ReHashNick: %s %s",Old,New);
- if (!strcasecmp(Old,New))
- {
- log(DEBUG,"old nick is new nick, skipping");
- return oldnick->second;
- }
+ if (!strcasecmp(Old,New))
+ {
+ log(DEBUG,"old nick is new nick, skipping");
+ return oldnick->second;
+ }
- if (oldnick == clientlist.end()) return NULL; /* doesnt exist */
+ if (oldnick == clientlist.end())
+ return NULL; /* doesnt exist */
- log(DEBUG,"ReHashNick: Found hashed nick %s",Old);
+ log(DEBUG,"ReHashNick: Found hashed nick %s",Old);
- userrec* olduser = oldnick->second;
- clientlist[New] = olduser;
- clientlist.erase(oldnick);
+ userrec* olduser = oldnick->second;
+ clientlist[New] = olduser;
+ clientlist.erase(oldnick);
- log(DEBUG,"ReHashNick: Nick rehashed as %s",New);
+ log(DEBUG,"ReHashNick: Nick rehashed as %s",New);
- return clientlist[New];
+ return clientlist[New];
}
void force_nickchange(userrec* user,const char* newnick)
{
- char nick[MAXBUF];
- int MOD_RESULT = 0;
+ char nick[MAXBUF];
+ int MOD_RESULT = 0;
- *nick = 0;
+ *nick = 0;
- FOREACH_RESULT(I_OnUserPreNick,OnUserPreNick(user,newnick));
- if (MOD_RESULT) {
- ServerInstance->stats->statsCollisions++;
- kill_link(user,"Nickname collision");
- return;
- }
- if (matches_qline(newnick))
- {
+ FOREACH_RESULT(I_OnUserPreNick,OnUserPreNick(user,newnick));
+
+ if (MOD_RESULT)
+ {
ServerInstance->stats->statsCollisions++;
- kill_link(user,"Nickname collision");
- return;
- }
-
- if (user)
- {
- if (newnick)
- {
- strlcpy(nick,newnick,MAXBUF-1);
- }
- if (user->registered == 7)
- {
- char* pars[1];
- pars[0] = nick;
+ kill_link(user,"Nickname collision");
+ return;
+ }
+
+ if (matches_qline(newnick))
+ {
+ ServerInstance->stats->statsCollisions++;
+ kill_link(user,"Nickname collision");
+ return;
+ }
+
+ if (user)
+ {
+ if (newnick)
+ {
+ strlcpy(nick,newnick,MAXBUF-1);
+ }
+
+ if (user->registered == 7)
+ {
+ char* pars[1];
+
+ pars[0] = nick;
std::string cmd = "NICK";
- ServerInstance->Parser->CallHandler(cmd,pars,1,user);
- }
- }
+ ServerInstance->Parser->CallHandler(cmd,pars,1,user);
+ }
+ }
}
projects / user / henk / code / inspircd.git / blobdiff