* ---------------------------------------------------
*/
-using namespace std;
-
-#include "inspircd_config.h"
+#include "inspircd_config.h"
+#include "configreader.h"
#include "channels.h"
#include "connection.h"
#include "users.h"
extern userrec* fd_ref_table[MAX_DESCRIPTORS];
extern ServerConfig *Config;
extern user_hash clientlist;
-extern whowas_hash whowas;
+
+whowas_users whowas;
+
extern std::vector<userrec*> local_users;
std::vector<userrec*> all_opers;
-template<typename T> inline string ConvToStr(const T &in)
+typedef std::map<irc::string,char*> opertype_t;
+typedef opertype_t operclass_t;
+
+opertype_t opertypes;
+operclass_t operclass;
+
+bool InitTypes(const char* tag)
+{
+ for (opertype_t::iterator n = opertypes.begin(); n != opertypes.end(); n++)
+ {
+ if (n->second)
+ delete[] n->second;
+ }
+
+ opertypes.clear();
+ return true;
+}
+
+bool InitClasses(const char* tag)
+{
+ for (operclass_t::iterator n = operclass.begin(); n != operclass.end(); n++)
+ {
+ if (n->second)
+ delete[] n->second;
+ }
+
+ operclass.clear();
+ return true;
+}
+
+bool DoType(const char* tag, char** entries, void** values, int* types)
+{
+ 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;
+}
+
+bool DoClass(const char* tag, char** entries, void** values, int* types)
+{
+ 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;
+}
+
+bool DoneClassesAndTypes(const char* tag)
{
- stringstream tmp;
- if (!(tmp << in)) return string();
- return tmp.str();
+ return true;
+}
+
+bool userrec::HasMode(unsigned char m)
+{
+ return (modes[m-65]);
+}
+
+const char* userrec::FormatModes()
+{
+ static char data[MAXBUF];
+ int offset = 0;
+ for (int n = 0; n < 64; n++)
+ {
+ if (modes[n])
+ data[offset++] = n+65;
+ }
+ data[offset] = 0;
+ return data;
}
userrec::userrec()
{
// the PROPER way to do it, AVOID bzero at *ALL* costs
- *password = *nick = *ident = *host = *dhost = *fullname = *modes = *awaymsg = *oper = 0;
+ *password = *nick = *ident = *host = *dhost = *fullname = *awaymsg = *oper = 0;
server = (char*)FindServerNamePtr(Config->ServerName);
reset_due = TIME;
lines_in = fd = lastping = signon = idle_lastmsg = nping = registered = 0;
sendq = "";
chans.clear();
invites.clear();
+ chans.resize(MAXCHANS);
+ memset(modes,0,sizeof(modes));
+
+ for (unsigned int n = 0; n < MAXCHANS; n++)
+ {
+ ucrec* x = new ucrec();
+ chans[n] = x;
+ x->channel = NULL;
+ x->uc_modes = 0;
+ }
}
userrec::~userrec()
{
+ for (std::vector<ucrec*>::iterator n = chans.begin(); n != chans.end(); n++)
+ {
+ ucrec* x = (ucrec*)*n;
+ DELETE(x);
+ }
}
+/* 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;
- }
+ }
}
}
}
-bool userrec::HasPermission(std::string &command)
+bool userrec::HasPermission(const std::string &command)
{
- char TypeName[MAXBUF],Classes[MAXBUF],ClassName[MAXBUF],CommandList[MAXBUF];
char* mycmd;
char* savept;
char* savept2;
- // users on u-lined servers can completely bypass
- // all permissions based checks.
- //
- // of course, if this is sent to a remote server and this
- // server is not ulined there, then that other server
- // silently drops the command.
- if (is_uline(this->server))
+ /*
+ * 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;
// are they even an oper at all?
if (*this->oper)
{
- for (int j =0; j < Config->ConfValueEnum("type",&Config->config_f); j++)
+ opertype_t::iterator iter_opertype = opertypes.find(this->oper);
+ if (iter_opertype != opertypes.end())
{
- Config->ConfValue("type","name",j,TypeName,&Config->config_f);
- if (!strcmp(TypeName,this->oper))
+ char* Classes = strdup(iter_opertype->second);
+ char* myclass = strtok_r(Classes," ",&savept);
+ while (myclass)
{
- Config->ConfValue("type","classes",j,Classes,&Config->config_f);
- char* myclass = strtok_r(Classes," ",&savept);
- while (myclass)
+ operclass_t::iterator iter_operclass = operclass.find(myclass);
+ if (iter_operclass != operclass.end())
{
- for (int k =0; k < Config->ConfValueEnum("class",&Config->config_f); k++)
+ char* CommandList = strdup(iter_operclass->second);
+ mycmd = strtok_r(CommandList," ",&savept2);
+ while (mycmd)
{
- Config->ConfValue("class","name",k,ClassName,&Config->config_f);
- if (!strcmp(ClassName,myclass))
+ if ((!strcasecmp(mycmd,command.c_str())) || (*mycmd == '*'))
{
- Config->ConfValue("class","commands",k,CommandList,&Config->config_f);
- mycmd = strtok_r(CommandList," ",&savept2);
- while (mycmd)
- {
- if ((!strcasecmp(mycmd,command.c_str())) || (*mycmd == '*'))
- {
- return true;
- }
- mycmd = strtok_r(NULL," ",&savept2);
- }
+ free(Classes);
+ free(CommandList);
+ return true;
}
+ mycmd = strtok_r(NULL," ",&savept2);
}
- myclass = strtok_r(NULL," ",&savept);
+ free(CommandList);
}
+ myclass = strtok_r(NULL," ",&savept);
}
+ free(Classes);
}
}
return false;
}
-bool userrec::AddBuffer(std::string a)
+bool userrec::AddBuffer(const std::string &a)
{
- std::string b = "";
- for (unsigned int i = 0; i < a.length(); i++)
- if ((a[i] != '\r') && (a[i] != '\0') && (a[i] != 7))
- b = b + a[i];
- std::stringstream stream(recvq);
- stream << b;
- recvq = stream.str();
+ std::string b = "";
+ char* n = (char*)a.c_str();
+
+ for (char* i = n; *i; i++)
+ {
+ if ((*i != '\r') && (*i != '\0') && (*i != 7))
+ b = b + *i;
+ }
+
+ 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;
-}
-
-void userrec::AddWriteBuf(std::string data)
-{
- if (this->GetWriteError() != "")
+
+ 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)
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
{
}
}
-void userrec::SetWriteError(std::string error)
+void userrec::SetWriteError(const std::string &error)
{
log(DEBUG,"Setting error string for %s to '%s'",this->nick,error.c_str());
// don't try to set the error twice, its already set take the first string.
this->WriteError = error;
}
-std::string userrec::GetWriteError()
+const char* userrec::GetWriteError()
{
- return this->WriteError;
+ return this->WriteError.c_str();
}
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);
-
- char reason[MAXBUF];
+ user_hash::iterator iter = clientlist.find(user->nick);
- strlcpy(reason,r,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;
+ */
- if (strlen(reason)>MAXQUIT)
- {
- reason[MAXQUIT-1] = '\0';
- }
+ 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 %lu",(unsigned long)user->fd);
+ strlcpy(reason,r,MAXQUIT-1);
+ 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);
- 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 %lu",(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);
+ }
}
-void kill_link_silent(userrec *user,const char* r)
+WhoWasGroup::WhoWasGroup(userrec* user) : host(NULL), dhost(NULL), ident(NULL), server(NULL), gecos(NULL), signon(user->signon)
{
- user_hash::iterator iter = clientlist.find(user->nick);
-
- char reason[MAXBUF];
-
- strlcpy(reason,r,MAXBUF);
-
- if (strlen(reason)>MAXQUIT)
- {
- reason[MAXQUIT-1] = '\0';
- }
-
- 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 %lu",(unsigned long)user->fd);
-
- user->FlushWriteBuf();
-
- if (user->registered == 7) {
- FOREACH_MOD(I_OnUserQuit,OnUserQuit(user,reason));
- WriteCommonExcept(user,"QUIT :%s",reason);
- }
+ this->host = strdup(user->host);
+ this->dhost = strdup(user->dhost);
+ this->ident = strdup(user->ident);
+ this->server = user->server;
+ this->gecos = strdup(user->fullname);
+}
- FOREACH_MOD(I_OnUserDisconnect,OnUserDisconnect(user));
+WhoWasGroup::~WhoWasGroup()
+{
+ if (host)
+ free(host);
+ if (dhost)
+ free(dhost);
+ if (ident)
+ free(ident);
+ if (gecos)
+ free(gecos);
+}
- if (user->fd > -1)
- {
- if (Config->GetIOHook(user->port))
+/* adds or updates an entry in the whowas list */
+void AddWhoWas(userrec* u)
+{
+ whowas_users::iterator iter = whowas.find(u->nick);
+
+ if (iter == whowas.end())
+ {
+ whowas_set* n = new whowas_set;
+ WhoWasGroup *a = new WhoWasGroup(u);
+ n->push_back(a);
+ whowas[u->nick] = n;
+ }
+ else
+ {
+ whowas_set* group = (whowas_set*)iter->second;
+
+ if (group->size() > 10)
{
- try
- {
- Config->GetIOHook(user->port)->OnRawSocketClose(user->fd);
- }
- catch (ModuleException& modexcept)
- {
- log(DEBUG,"Module exception cought: %s",modexcept.GetReason()); \
- }
+ WhoWasGroup *a = (WhoWasGroup*)*(group->begin());
+ DELETE(a);
+ group->pop_front();
}
- ServerInstance->SE->DelFd(user->fd);
- user->CloseSocket();
- }
-
- if (user->registered == 7) {
- purge_empty_chans(user);
- }
-
- if (iter != clientlist.end())
- {
- log(DEBUG,"deleting user hash value %lu",(unsigned long)user);
- if (user->fd > -1)
+
+ WhoWasGroup *a = new WhoWasGroup(u);
+ group->push_back(a);
+ }
+}
+
+/* every hour, run this function which removes all entries over 3 days */
+void MaintainWhoWas(time_t TIME)
+{
+ for (whowas_users::iterator iter = whowas.begin(); iter != whowas.end(); iter++)
+ {
+ whowas_set* n = (whowas_set*)iter->second;
+ if (n->size())
{
- fd_ref_table[user->fd] = NULL;
- if (find(local_users.begin(),local_users.end(),user) != local_users.end())
+ while ((n->begin() != n->end()) && ((*n->begin())->signon < TIME - 259200)) // 3 days
{
- log(DEBUG,"Delete local user");
- local_users.erase(find(local_users.begin(),local_users.end(),user));
+ WhoWasGroup *a = *(n->begin());
+ DELETE(a);
+ n->erase(n->begin());
}
}
- clientlist.erase(iter);
- }
- delete user;
-}
-
-
-/* adds or updates an entry in the whowas list */
-void AddWhoWas(userrec* u)
-{
- whowas_hash::iterator iter = whowas.find(u->nick);
- WhoWasUser *a = new WhoWasUser();
- strlcpy(a->nick,u->nick,NICKMAX-1);
- strlcpy(a->ident,u->ident,IDENTMAX);
- strlcpy(a->dhost,u->dhost,160);
- strlcpy(a->host,u->host,160);
- strlcpy(a->fullname,u->fullname,MAXGECOS);
- if (u->server)
- strlcpy(a->server,u->server,256);
- a->signon = u->signon;
-
- /* MAX_WHOWAS: max number of /WHOWAS items
- * WHOWAS_STALE: number of hours before a WHOWAS item is marked as stale and
- * can be replaced by a newer one
- */
-
- if (iter == whowas.end())
- {
- if (whowas.size() >= (unsigned)WHOWAS_MAX)
- {
- for (whowas_hash::iterator i = whowas.begin(); i != whowas.end(); i++)
- {
- // 3600 seconds in an hour ;)
- if ((i->second->signon)<(TIME-(WHOWAS_STALE*3600)))
- {
- // delete the old one
- if (i->second) delete i->second;
- // replace with new one
- i->second = a;
- log(DEBUG,"added WHOWAS entry, purged an old record");
- return;
- }
- }
- // no space left and user doesnt exist. Don't leave ram in use!
- log(DEBUG,"Not able to update whowas (list at WHOWAS_MAX entries and trying to add new?), freeing excess ram");
- delete a;
- }
- else
- {
- log(DEBUG,"added fresh WHOWAS entry");
- whowas[a->nick] = a;
- }
- }
- else
- {
- log(DEBUG,"updated WHOWAS entry");
- if (iter->second) delete iter->second;
- iter->second = a;
- }
+ }
}
/* add a client connection to the sockets list */
void AddClient(int socket, int port, bool iscached, in_addr ip4)
{
- string tempnick;
- char tn2[MAXBUF];
- user_hash::iterator iter;
-
- tempnick = ConvToStr(socket) + "-unknown";
- sprintf(tn2,"%d-unknown",socket);
-
- iter = clientlist.find(tempnick);
-
- // 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);
- }
-
- /*
- * It is OK to access the value here this way since we know
- * it exists, we just created it above.
- *
- * At NO other time should you access a value in a map or a
- * hash_map this way.
- */
- clientlist[tempnick] = new userrec();
-
- char *ipaddr = (char*)inet_ntoa(ip4);
-
- log(DEBUG,"AddClient: %d %d %s",socket,port,ipaddr);
-
- clientlist[tempnick]->fd = socket;
- strlcpy(clientlist[tempnick]->nick, tn2,NICKMAX-1);
- /* We don't know the host yet, dns lookup could still be going on,
- * so instead we just put the ip address here, for now.
+ std::string tempnick = ConvToStr(socket) + "-unknown";
+ user_hash::iterator iter = clientlist.find(tempnick);
+ 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 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
*/
- strlcpy(clientlist[tempnick]->host, ipaddr, 160);
- strlcpy(clientlist[tempnick]->dhost, ipaddr, 160);
- clientlist[tempnick]->server = (char*)FindServerNamePtr(Config->ServerName);
- strlcpy(clientlist[tempnick]->ident, "unknown",IDENTMAX);
- clientlist[tempnick]->registered = 0;
- clientlist[tempnick]->signon = TIME + Config->dns_timeout;
- clientlist[tempnick]->lastping = 1;
+ 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);
+
+ /* 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);
+ /* We don't need range checking here, we KNOW 'unknown\0' will fit into the ident field. */
+ strcpy(clientlist[tempnick]->ident, "unknown");
+
+ 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 (match(ipaddr,i->host.c_str()) && (i->type == CC_ALLOW))
- {
- 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;
-
- ucrec a;
- a.channel = NULL;
- a.uc_modes = 0;
- for (int i = 0; i < MAXCHANS; i++)
- clientlist[tempnick]->chans.push_back(a);
-
- 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;
- }
- }
- fd_ref_table[socket] = clientlist[tempnick];
+ 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]);
- 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;
+ }
+ }
+
+ if (socket > -1)
+ {
+ 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(match_against);
+
+ 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 (matches_qline(newnick))
+ {
ServerInstance->stats->statsCollisions++;
- kill_link(user,"Nickname collision");
- return;
- }
-
- if (user)
- {
- if (newnick)
- {
- strlcpy(nick,newnick,MAXBUF);
- }
- if (user->registered == 7)
- {
- char* pars[1];
- pars[0] = nick;
+ 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);
+ }
+ }
}
-