* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * Inspire is copyright (C) 2002-2006 ChatSpike-Dev.
+ * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
* E-mail:
* <brain@chatspike.net>
* <Craig@chatspike.net>
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;
+typedef std::map<irc::string,char*> opertype_t;
+typedef opertype_t operclass_t;
+
+opertype_t opertypes;
+operclass_t operclass;
+
+void ReadClassesAndTypes()
+{
+ char TypeName[MAXBUF],Classes[MAXBUF],ClassName[MAXBUF],CommandList[MAXBUF];
+ for (opertype_t::iterator n = opertypes.begin(); n != opertypes.end(); n++)
+ {
+ if (n->second)
+ delete[] n->second;
+ }
+ for (operclass_t::iterator n = operclass.begin(); n != operclass.end(); n++)
+ {
+ if (n->second)
+ delete[] n->second;
+ }
+ opertypes.clear();
+ operclass.clear();
+ for (int j =0; j < Config->ConfValueEnum("type",&Config->config_f); j++)
+ {
+ Config->ConfValue("type","name",j,TypeName,&Config->config_f);
+ Config->ConfValue("type","classes",j,Classes,&Config->config_f);
+ opertypes[TypeName] = strdup(Classes);
+ log(DEBUG,"Read oper TYPE '%s' with classes '%s'",TypeName,Classes);
+ }
+ for (int k =0; k < Config->ConfValueEnum("class",&Config->config_f); k++)
+ {
+ Config->ConfValue("class","name",k,ClassName,&Config->config_f);
+ Config->ConfValue("class","commands",k,CommandList,&Config->config_f);
+ operclass[ClassName] = strdup(CommandList);
+ log(DEBUG,"Read oper CLASS '%s' with commands '%s'",ClassName,CommandList);
+ }
+}
+
template<typename T> inline string ConvToStr(const T &in)
{
stringstream tmp;
userrec::userrec()
{
// the PROPER way to do it, AVOID bzero at *ALL* costs
- *nick = *ident = *host = *dhost = *fullname = *modes = *awaymsg = *oper = *ip = 0;
+ *password = *nick = *ident = *host = *dhost = *fullname = *modes = *awaymsg = *oper = 0;
server = (char*)FindServerNamePtr(Config->ServerName);
reset_due = TIME;
lines_in = fd = lastping = signon = idle_lastmsg = nping = registered = 0;
- timeout = flood = port = bytes_in = bytes_out = cmds_in = cmds_out = 0;
+ modebits = timeout = flood = port = bytes_in = bytes_out = cmds_in = cmds_out = 0;
haspassed = dns_done = false;
recvq = "";
sendq = "";
chans.clear();
invites.clear();
+ 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()
{
+ for (std::vector<ucrec*>::iterator n = chans.begin(); n != chans.end(); n++)
+ {
+ ucrec* x = (ucrec*)*n;
+ delete x;
+ }
+}
+
+void userrec::MakeHost(char* nhost)
+{
+ /* This is much faster than snprintf */
+ char* t = nhost;
+ for(char* n = ident; *n; n++)
+ *t++ = *n;
+ *t++ = '@';
+ for(char* n = host; *n; n++)
+ *t++ = *n;
+ *t = 0;
}
void userrec::CloseSocket()
char* userrec::GetFullHost()
{
static char result[MAXBUF];
- snprintf(result,MAXBUF,"%s!%s@%s",nick,ident,dhost);
+ char* t = result;
+ for(char* n = nick; *n; n++)
+ *t++ = *n;
+ *t++ = '!';
+ for(char* n = ident; *n; n++)
+ *t++ = *n;
+ *t++ = '@';
+ for(char* n = dhost; *n; n++)
+ *t++ = *n;
+ *t = 0;
return result;
}
+char* userrec::MakeWildHost()
+{
+ static char nresult[MAXBUF];
+ char* t = nresult;
+ *t++ = '*'; *t++ = '!';
+ *t++ = '*'; *t++ = '@';
+ for(char* n = dhost; *n; n++)
+ *t++ = *n;
+ *t = 0;
+ return nresult;
+}
+
int userrec::ReadData(void* buffer, size_t size)
{
if (this->fd > -1)
char* userrec::GetFullRealHost()
{
static char fresult[MAXBUF];
- snprintf(fresult,MAXBUF,"%s!%s@%s",nick,ident,host);
+ char* t = fresult;
+ for(char* n = nick; *n; n++)
+ *t++ = *n;
+ *t++ = '!';
+ for(char* n = ident; *n; n++)
+ *t++ = *n;
+ *t++ = '@';
+ for(char* n = host; *n; n++)
+ *t++ = *n;
+ *t = 0;
return fresult;
}
}
}
-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
+ // users on remote 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))
+ // This prevents desyncs when one server has different
+ // type/class tags to another.
+ if (!IS_LOCAL(this))
return true;
// are they even an oper at all?
- if (strchr(this->modes,'o'))
+ 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];
+ char* n = (char*)a.c_str();
+ for (char* i = n; *i; i++)
+ {
+ if ((*i != '\r') && (*i != '\0') && (*i != 7))
+ b = b + *i;
+ }
std::stringstream stream(recvq);
stream << b;
recvq = stream.str();
bool userrec::BufferIsReady()
{
- for (unsigned int i = 0; i < recvq.length(); i++)
+ unsigned int t = recvq.length();
+ for (unsigned int i = 0; i < t; i++)
if (recvq[i] == '\n')
return true;
return false;
return "";
char* line = (char*)recvq.c_str();
std::string ret = "";
- while ((*line != '\n') && (strlen(line)))
+ while ((*line != '\n') && (*line))
{
ret = ret + *line;
line++;
return ret;
}
-void userrec::AddWriteBuf(std::string data)
+void userrec::AddWriteBuf(const std::string &data)
{
- if (this->GetWriteError() != "")
+ if (*this->GetWriteError())
return;
if (sendq.length() + data.length() > (unsigned)this->sendqmax)
{
// send AS MUCH OF THE USERS SENDQ as we are able to (might not be all of it)
void userrec::FlushWriteBuf()
{
- if (sendq.length())
+ if ((sendq.length()) && (this->fd != FD_MAGIC_NUMBER))
{
char* tb = (char*)this->sendq.c_str();
int n_sent = write(this->fd,tb,this->sendq.length());
}
}
-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)
char reason[MAXBUF];
- strncpy(reason,r,MAXBUF);
-
- if (strlen(reason)>MAXQUIT)
- {
- reason[MAXQUIT-1] = '\0';
- }
+ strlcpy(reason,r,MAXQUIT-1);
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);
+ log(DEBUG,"closing fd %d",user->fd);
if (user->registered == 7) {
+ purge_empty_chans(user);
FOREACH_MOD(I_OnUserQuit,OnUserQuit(user,reason));
WriteCommonExcept(user,"QUIT :%s",reason);
}
{
if (Config->GetIOHook(user->port))
{
- Config->GetIOHook(user->port)->OnRawSocketClose(user->fd);
+ try
+ {
+ Config->GetIOHook(user->port)->OnRawSocketClose(user->fd);
+ }
+ 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) {
- purge_empty_chans(user);
// 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);
if (iter != clientlist.end())
{
- log(DEBUG,"deleting user hash value %lu",(unsigned long)user);
+ log(DEBUG,"deleting user hash value %lx",(unsigned long)user);
if (user->fd > -1)
{
fd_ref_table[user->fd] = NULL;
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];
-
- strncpy(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)
{
- Config->GetIOHook(user->port)->OnRawSocketClose(user->fd);
+ 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);
- }
+ WhoWasGroup *a = new WhoWasGroup(u);
+ group->push_back(a);
+ }
+}
- if (iter != clientlist.end())
- {
- log(DEBUG,"deleting user hash value %lu",(unsigned long)user);
- if (user->fd > -1)
+/* 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);
- strlcpy(a->ident,u->ident,IDENTMAX);
- strlcpy(a->dhost,u->dhost,160);
- strlcpy(a->host,u->host,160);
- strlcpy(a->fullname,u->fullname,MAXGECOS);
- 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, char* host, int port, bool iscached, char* ip)
+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,"%lu-unknown",(unsigned long)socket);
-
- iter = clientlist.find(tempnick);
+ 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
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.
- */
+ 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);
- log(DEBUG,"AddClient: %lu %s %d %s",(unsigned long)socket,host,port,ip);
+ /* 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]->fd = socket;
- strlcpy(clientlist[tempnick]->nick, tn2,NICKMAX);
- strlcpy(clientlist[tempnick]->host, host,160);
- strlcpy(clientlist[tempnick]->dhost, host,160);
clientlist[tempnick]->server = (char*)FindServerNamePtr(Config->ServerName);
- strlcpy(clientlist[tempnick]->ident, "unknown",IDENTMAX);
+ /* 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;
- strlcpy(clientlist[tempnick]->ip,ip,16);
// set the registration timeout for this user
unsigned long class_regtimeout = 90;
for (ClassVector::iterator i = Config->Classes.begin(); i != Config->Classes.end(); i++)
{
- if (match(clientlist[tempnick]->host,i->host.c_str()) && (i->type == CC_ALLOW))
+ if ((i->type == CC_ALLOW) && (match(ipaddr,i->host.c_str())))
{
class_regtimeout = (unsigned long)i->registration_timeout;
class_flood = i->flood;
class_rqmax = i->recvqmax;
break;
}
- }
+ }
clientlist[tempnick]->nping = TIME+clientlist[tempnick]->pingmax + Config->dns_timeout;
clientlist[tempnick]->timeout = TIME+class_regtimeout;
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);
+ fd_ref_table[socket] = clientlist[tempnick];
+ local_users.push_back(clientlist[tempnick]);
if (local_users.size() > Config->SoftLimit)
{
// 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)
+ if ((unsigned)socket >= MAX_DESCRIPTORS)
{
kill_link(clientlist[tempnick],"Server is full");
return;
}
- char* e = matches_exception(ip);
+ char* e = matches_exception(ipaddr);
if (!e)
{
- char* r = matches_zline(ip);
+ char* r = matches_zline(ipaddr);
if (r)
{
char reason[MAXBUF];
return;
}
}
- fd_ref_table[socket] = clientlist[tempnick];
- local_users.push_back(clientlist[tempnick]);
+
ServerInstance->SE->AddFd(socket,true,X_ESTAB_CLIENT);
WriteServ(clientlist[tempnick]->fd,"NOTICE Auth :*** Looking up your hostname...");
}
+long FindMatchingGlobal(userrec* user)
+{
+ long x = 0;
+ for (user_hash::const_iterator a = clientlist.begin(); a != clientlist.end(); a++)
+ {
+ if (a->second->ip4.s_addr == user->ip4.s_addr)
+ x++;
+ }
+ return x;
+}
+
+long FindMatchingLocal(userrec* user)
+{
+ long x = 0;
+ for (std::vector<userrec*>::const_iterator a = local_users.begin(); a != local_users.end(); a++)
+ {
+ userrec* comp = (userrec*)(*a);
+ if (comp->ip4.s_addr == user->ip4.s_addr)
+ x++;
+ }
+ return x;
+}
+
void FullConnectUser(userrec* user, CullList* Goners)
{
ServerInstance->stats->statsConnects++;
user->idle_lastmsg = TIME;
log(DEBUG,"ConnectUser: %s",user->nick);
- if ((*(Passwd(user))) && (!user->haspassed))
+ ConnectClass a = GetClass(user);
+
+ if (a.type == CC_DENY)
+ {
+ Goners->AddItem(user,"Unauthorised connection");
+ return;
+ }
+ if ((*(a.pass.c_str())) && (!user->haspassed))
{
Goners->AddItem(user,"Invalid password");
return;
}
- if (IsDenied(user))
- {
- Goners->AddItem(user,"Unauthorised connection");
- return;
- }
+ if (FindMatchingLocal(user) > a.maxlocal)
+ {
+ Goners->AddItem(user,"No more connections allowed from your host via this connect class (local)");
+ WriteOpers("*** WARNING: maximum LOCAL connections (%ld) exceeded for IP %s",a.maxlocal,(char*)inet_ntoa(user->ip4));
+ return;
+ }
+ else if (FindMatchingGlobal(user) > a.maxglobal)
+ {
+ Goners->AddItem(user,"No more connections allowed from your host via this connect class (global)");
+ WriteOpers("*** WARNING: maximum GLOBAL connections (%ld) exceeded for IP %s",a.maxglobal,(char*)inet_ntoa(user->ip4));
+ return;
+ }
char match_against[MAXBUF];
snprintf(match_against,MAXBUF,"%s@%s",user->ident,user->host);
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 iowghraAsORVSxNCWqBzvdHtGI lvhopsmntikrRcaqOALQbSeKVfHGCuzN",user->nick,Config->ServerName,VERSION);
+ 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);
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,user->ip);
+ 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,
{
if (newnick)
{
- strncpy(nick,newnick,MAXBUF);
+ strlcpy(nick,newnick,MAXBUF-1);
}
if (user->registered == 7)
{
}
}
}
-
projects / user / henk / code / inspircd.git / blobdiff