X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Finspircd.cpp;h=c780b8bf1c33c21cf9ca653ae9ac3aeaec32dc4f;hb=c2624f71e1260881610dc6109f0b3ad61ae4f31a;hp=e3162830580df72798b9856b54023ba1b7e7cacc;hpb=a81394b65dc366a9650fe05edf1c0f18d0ac700a;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/inspircd.cpp b/src/inspircd.cpp index e31628305..c780b8bf1 100644 --- a/src/inspircd.cpp +++ b/src/inspircd.cpp @@ -18,16 +18,27 @@ using namespace std; +#include "inspircd_config.h" #include "inspircd.h" #include "inspircd_io.h" #include "inspircd_util.h" -#include "inspircd_config.h" #include #include #include #include #include -#include + +#ifdef USE_KQUEUE +#include +#include +#include +#endif + +#ifdef USE_EPOLL +#include +#define EP_DELAY 50 +#endif + #include #include #ifdef GCC3 @@ -38,10 +49,7 @@ using namespace std; #include #include #include -#include #include -#include -#include #include #include "connection.h" #include "users.h" @@ -57,12 +65,8 @@ using namespace std; #include "xline.h" #include "inspstring.h" #include "dnsqueue.h" - -#ifdef GCC3 -#define nspace __gnu_cxx -#else -#define nspace std -#endif +#include "helperfuncs.h" +#include "hashcomp.h" int LogLevel = DEFAULT; char ServerName[MAXBUF]; @@ -84,7 +88,8 @@ int WHOWAS_STALE = 48; // default WHOWAS Entries last 2 days before they go 'sta int WHOWAS_MAX = 100; // default 100 people maximum in the WHOWAS list int DieDelay = 5; time_t startup_time = time(NULL); -int NetBufferSize = 10240; // NetBufferSize used as the buffer size for all read() ops +int NetBufferSize = 10240; // NetBufferSize used as the buffer size for all read() ops +int MaxConn = SOMAXCONN; // size of accept() backlog (128 by default on *BSD) extern int MaxWhoResults; time_t nb_start = 0; int dns_timeout = 5; @@ -104,77 +109,26 @@ int openSockfd[MAXSOCKS]; bool nofork = false; bool unlimitcore = false; -time_t TIME = time(NULL); +time_t TIME = time(NULL), OLDTIME = time(NULL); -namespace nspace -{ -#ifdef GCC34 - template<> struct hash -#else - template<> struct nspace::hash -#endif - { - size_t operator()(const struct in_addr &a) const - { - size_t q; - memcpy(&q,&a,sizeof(size_t)); - return q; - } - }; -#ifdef GCC34 - template<> struct hash -#else - template<> struct nspace::hash +#ifdef USE_KQUEUE +int kq, lkq, skq; #endif - { - size_t operator()(const string &s) const - { - char a[MAXBUF]; - static struct hash strhash; - strlcpy(a,s.c_str(),MAXBUF); - strlower(a); - return strhash(a); - } - }; -} - - -struct StrHashComp -{ - - bool operator()(const string& s1, const string& s2) const - { - char a[MAXBUF],b[MAXBUF]; - strlcpy(a,s1.c_str(),MAXBUF); - strlcpy(b,s2.c_str(),MAXBUF); - strlower(a); - strlower(b); - return (strcasecmp(a,b) == 0); - } - -}; - -struct InAddr_HashComp -{ - bool operator()(const in_addr &s1, const in_addr &s2) const - { - size_t q; - size_t p; - - memcpy(&q,&s1,sizeof(size_t)); - memcpy(&p,&s2,sizeof(size_t)); - - return (q == p); - } - -}; +#ifdef USE_EPOLL +int ep, lep, sep; +#endif +bool has_been_netsplit = false; +extern std::vector include_stack; -typedef nspace::hash_map, StrHashComp> user_hash; -typedef nspace::hash_map, StrHashComp> chan_hash; -typedef nspace::hash_map, InAddr_HashComp> address_cache; +typedef nspace::hash_map, irc::StrHashComp> user_hash; +typedef nspace::hash_map, irc::StrHashComp> chan_hash; +typedef nspace::hash_map, irc::InAddr_HashComp> address_cache; +typedef nspace::hash_map, irc::StrHashComp> whowas_hash; typedef std::deque command_table; +typedef std::map autoconnects; +typedef std::vector servernamelist; // This table references users by file descriptor. // its an array to make it VERY fast, as all lookups are referenced @@ -189,13 +143,15 @@ FILE *log_file; user_hash clientlist; chan_hash chanlist; -user_hash whowas; +whowas_hash whowas; command_table cmdlist; +autoconnects autoconns; file_cache MOTD; file_cache RULES; address_cache IP; ClassVector Classes; +servernamelist servernames; struct linger linger = { 0 }; char MyExecutable[1024]; @@ -218,7 +174,7 @@ std::stringstream config_f(stringstream::in | stringstream::out); std::vector all_opers; -static char already_sent[65536]; +char lowermap[255]; void AddOper(userrec* user) { @@ -226,6 +182,26 @@ void AddOper(userrec* user) all_opers.push_back(user); } +void AddServerName(std::string servername) +{ + for (servernamelist::iterator a = servernames.begin(); a < servernames.end(); a++) + { + if (*a == servername) + return; + } + servernames.push_back(servername); +} + +const char* FindServerNamePtr(std::string servername) +{ + for (servernamelist::iterator a = servernames.begin(); a < servernames.end(); a++) + { + if (*a == servername) + return a->c_str(); + } + return ""; +} + void DeleteOper(userrec* user) { for (std::vector::iterator a = all_opers.begin(); a < all_opers.end(); a++) @@ -239,7 +215,7 @@ void DeleteOper(userrec* user) } } -long GetRevision() +std::string GetRevision() { char Revision[] = "$Revision$"; char *s1 = Revision; @@ -248,7 +224,7 @@ long GetRevision() s1 = savept; v2 = strtok_r(s1," ",&savept); s1 = savept; - return (long)(atof(v2)*10000); + return std::string(v2); } @@ -282,73 +258,13 @@ std::string getadminnick() return AdminNick; } -void log(int level,char *text, ...) -{ - char textbuffer[MAXBUF]; - va_list argsPtr; - time_t rawtime; - struct tm * timeinfo; - if (level < LogLevel) - return; - - time(&rawtime); - timeinfo = localtime (&rawtime); - - if (log_file) - { - char b[MAXBUF]; - va_start (argsPtr, text); - vsnprintf(textbuffer, MAXBUF, text, argsPtr); - va_end(argsPtr); - strlcpy(b,asctime(timeinfo),MAXBUF); - b[24] = ':'; // we know this is the end of the time string - fprintf(log_file,"%s %s\n",b,textbuffer); - if (nofork) - { - // nofork enabled? display it on terminal too - printf("%s %s\n",b,textbuffer); - } - } -} - -void readfile(file_cache &F, const char* fname) -{ - FILE* file; - char linebuf[MAXBUF]; - - log(DEBUG,"readfile: loading %s",fname); - F.clear(); - file = fopen(fname,"r"); - if (file) - { - while (!feof(file)) - { - fgets(linebuf,sizeof(linebuf),file); - linebuf[strlen(linebuf)-1]='\0'; - if (linebuf[0] == 0) - { - strcpy(linebuf," "); - } - if (!feof(file)) - { - F.push_back(linebuf); - } - } - fclose(file); - } - else - { - log(DEBUG,"readfile: failed to load file: %s",fname); - } - log(DEBUG,"readfile: loaded %s, %lu lines",fname,(unsigned long)F.size()); -} - void ReadConfig(bool bail, userrec* user) { - char dbg[MAXBUF],pauseval[MAXBUF],Value[MAXBUF],timeout[MAXBUF],NB[MAXBUF],flood[MAXBUF],MW[MAXBUF]; - char AH[MAXBUF],AP[MAXBUF],AF[MAXBUF],DNT[MAXBUF],pfreq[MAXBUF],thold[MAXBUF]; + char dbg[MAXBUF],pauseval[MAXBUF],Value[MAXBUF],timeout[MAXBUF],NB[MAXBUF],flood[MAXBUF],MW[MAXBUF],MCON[MAXBUF]; + char AH[MAXBUF],AP[MAXBUF],AF[MAXBUF],DNT[MAXBUF],pfreq[MAXBUF],thold[MAXBUF],sqmax[MAXBUF],rqmax[MAXBUF]; ConnectClass c; std::stringstream errstr; + include_stack.clear(); if (!LoadConf(CONFIG_FILE,&config_f,&errstr)) { @@ -406,12 +322,18 @@ void ReadConfig(bool bail, userrec* user) ConfValue("dns","timeout",0,DNT,&config_f); ConfValue("options","moduledir",0,ModPath,&config_f); ConfValue("disabled","commands",0,DisabledCommands,&config_f); + ConfValue("options","somaxconn",0,MCON,&config_f); + MaxConn = atoi(MCON); + if (MaxConn > SOMAXCONN) + log(DEFAULT,"WARNING: value may be higher than the system-defined SOMAXCONN value!"); NetBufferSize = atoi(NB); MaxWhoResults = atoi(MW); dns_timeout = atoi(DNT); if (!dns_timeout) dns_timeout = 5; + if (!MaxConn) + MaxConn = SOMAXCONN; if (!DNSServer[0]) strlcpy(DNSServer,"127.0.0.1",MAXBUF); if (!ModPath[0]) @@ -452,6 +374,8 @@ void ReadConfig(bool bail, userrec* user) ConfValue("connect","flood",i,flood,&config_f); ConfValue("connect","pingfreq",i,pfreq,&config_f); ConfValue("connect","threshold",i,thold,&config_f); + ConfValue("connect","sendq",i,sqmax,&config_f); + ConfValue("connect","recvq",i,rqmax,&config_f); if (Value[0]) { strlcpy(c.host,Value,MAXBUF); @@ -463,10 +387,20 @@ void ReadConfig(bool bail, userrec* user) c.pingtime = 120; c.flood = atoi(flood); c.threshold = 5; + c.sendqmax = 262144; // 256k + c.recvqmax = 4096; // 4k if (atoi(thold)>0) { c.threshold = atoi(thold); } + if (atoi(sqmax)>0) + { + c.sendqmax = atoi(sqmax); + } + if (atoi(rqmax)>0) + { + c.recvqmax = atoi(rqmax); + } if (atoi(timeout)>0) { c.registration_timeout = atoi(timeout); @@ -479,1112 +413,110 @@ void ReadConfig(bool bail, userrec* user) log(DEBUG,"Read connect class type ALLOW, host=%s password=%s timeout=%lu flood=%lu",c.host,c.pass,(unsigned long)c.registration_timeout,(unsigned long)c.flood); } else - { - ConfValue("connect","deny",i,Value,&config_f); - strlcpy(c.host,Value,MAXBUF); - c.type = CC_DENY; - Classes.push_back(c); - log(DEBUG,"Read connect class type DENY, host=%s",c.host); - } - - } - log(DEFAULT,"Reading K lines,Q lines and Z lines from config..."); - read_xline_defaults(); - log(DEFAULT,"Applying K lines, Q lines and Z lines..."); - apply_lines(); - log(DEFAULT,"Done reading configuration file, InspIRCd is now starting."); - if (!bail) - { - log(DEFAULT,"Adding and removing modules due to rehash..."); - - std::vector old_module_names, new_module_names, added_modules, removed_modules; - - // store the old module names - for (std::vector::iterator t = module_names.begin(); t != module_names.end(); t++) - { - old_module_names.push_back(*t); - } - - // get the new module names - for (int count2 = 0; count2 < ConfValueEnum("module",&config_f); count2++) - { - ConfValue("module","name",count2,Value,&config_f); - new_module_names.push_back(Value); - } - - // now create a list of new modules that are due to be loaded - // and a seperate list of modules which are due to be unloaded - for (std::vector::iterator _new = new_module_names.begin(); _new != new_module_names.end(); _new++) - { - bool added = true; - for (std::vector::iterator old = old_module_names.begin(); old != old_module_names.end(); old++) - { - if (*old == *_new) - added = false; - } - if (added) - added_modules.push_back(*_new); - } - for (std::vector::iterator oldm = old_module_names.begin(); oldm != old_module_names.end(); oldm++) - { - bool removed = true; - for (std::vector::iterator newm = new_module_names.begin(); newm != new_module_names.end(); newm++) - { - if (*newm == *oldm) - removed = false; - } - if (removed) - removed_modules.push_back(*oldm); - } - // now we have added_modules, a vector of modules to be loaded, and removed_modules, a vector of modules - // to be removed. - int rem = 0, add = 0; - if (!removed_modules.empty()) - for (std::vector::iterator removing = removed_modules.begin(); removing != removed_modules.end(); removing++) - { - if (UnloadModule(removing->c_str())) - { - WriteOpers("*** REHASH UNLOADED MODULE: %s",removing->c_str()); - WriteServ(user->fd,"973 %s %s :Module %s successfully unloaded.",user->nick, removing->c_str(), removing->c_str()); - rem++; - } - else - { - WriteServ(user->fd,"972 %s %s :Failed to unload module %s: %s",user->nick, removing->c_str(), removing->c_str(), ModuleError()); - } - } - if (!added_modules.empty()) - for (std::vector::iterator adding = added_modules.begin(); adding != added_modules.end(); adding++) - { - if (LoadModule(adding->c_str())) - { - WriteOpers("*** REHASH LOADED MODULE: %s",adding->c_str()); - WriteServ(user->fd,"975 %s %s :Module %s successfully loaded.",user->nick, adding->c_str(), adding->c_str()); - add++; - } - else - { - WriteServ(user->fd,"974 %s %s :Failed to load module %s: %s",user->nick, adding->c_str(), adding->c_str(), ModuleError()); - } - } - log(DEFAULT,"Successfully unloaded %lu of %lu modules and loaded %lu of %lu modules.",(unsigned long)rem,(unsigned long)removed_modules.size(),(unsigned long)add,(unsigned long)added_modules.size()); - } -} - -/* write formatted text to a socket, in same format as printf */ - -void Write(int sock,char *text, ...) -{ - if (sock == FD_MAGIC_NUMBER) - return; - if (!text) - { - log(DEFAULT,"*** BUG *** Write was given an invalid parameter"); - return; - } - char textbuffer[MAXBUF]; - va_list argsPtr; - char tb[MAXBUF]; - - va_start (argsPtr, text); - vsnprintf(textbuffer, MAXBUF, text, argsPtr); - va_end(argsPtr); - int bytes = snprintf(tb,MAXBUF,"%s\r\n",textbuffer); - chop(tb); - if ((sock != -1) && (sock != FD_MAGIC_NUMBER)) - { - int MOD_RESULT = 0; - FOREACH_RESULT(OnRawSocketWrite(sock,tb,bytes > 512 ? 512 : bytes)); - if (!MOD_RESULT) - write(sock,tb,bytes > 512 ? 512 : bytes); - if (fd_ref_table[sock]) - { - fd_ref_table[sock]->bytes_out += (bytes > 512 ? 512 : bytes); - fd_ref_table[sock]->cmds_out++; - } - statsSent += (bytes > 512 ? 512 : bytes); - } -} - -/* write a server formatted numeric response to a single socket */ - -void WriteServ(int sock, char* text, ...) -{ - if (sock == FD_MAGIC_NUMBER) - return; - if (!text) - { - log(DEFAULT,"*** BUG *** WriteServ was given an invalid parameter"); - return; - } - char textbuffer[MAXBUF],tb[MAXBUF]; - va_list argsPtr; - va_start (argsPtr, text); - - vsnprintf(textbuffer, MAXBUF, text, argsPtr); - va_end(argsPtr); - int bytes = snprintf(tb,MAXBUF,":%s %s\r\n",ServerName,textbuffer); - chop(tb); - if ((sock != -1) && (sock != FD_MAGIC_NUMBER)) - { - int MOD_RESULT = 0; - FOREACH_RESULT(OnRawSocketWrite(sock,tb,bytes > 512 ? 512 : bytes)); - if (!MOD_RESULT) - write(sock,tb,bytes > 512 ? 512 : bytes); - if (fd_ref_table[sock]) - { - fd_ref_table[sock]->bytes_out += (bytes > 512 ? 512 : bytes); - fd_ref_table[sock]->cmds_out++; - } - statsSent += (bytes > 512 ? 512 : bytes); - } -} - -/* write text from an originating user to originating user */ - -void WriteFrom(int sock, userrec *user,char* text, ...) -{ - if (sock == FD_MAGIC_NUMBER) - return; - if ((!text) || (!user)) - { - log(DEFAULT,"*** BUG *** WriteFrom was given an invalid parameter"); - return; - } - char textbuffer[MAXBUF],tb[MAXBUF]; - va_list argsPtr; - va_start (argsPtr, text); - - vsnprintf(textbuffer, MAXBUF, text, argsPtr); - va_end(argsPtr); - int bytes = snprintf(tb,MAXBUF,":%s!%s@%s %s\r\n",user->nick,user->ident,user->dhost,textbuffer); - chop(tb); - if ((sock != -1) && (sock != FD_MAGIC_NUMBER)) - { - int MOD_RESULT = 0; - FOREACH_RESULT(OnRawSocketWrite(sock,tb,bytes > 512 ? 512 : bytes)); - if (!MOD_RESULT) - write(sock,tb,bytes > 512 ? 512 : bytes); - if (fd_ref_table[sock]) - { - fd_ref_table[sock]->bytes_out += (bytes > 512 ? 512 : bytes); - fd_ref_table[sock]->cmds_out++; - } - statsSent += (bytes > 512 ? 512 : bytes); - } -} - -/* write text to an destination user from a source user (e.g. user privmsg) */ - -void WriteTo(userrec *source, userrec *dest,char *data, ...) -{ - if ((!dest) || (!data)) - { - log(DEFAULT,"*** BUG *** WriteTo was given an invalid parameter"); - return; - } - if (dest->fd == FD_MAGIC_NUMBER) - return; - char textbuffer[MAXBUF],tb[MAXBUF]; - va_list argsPtr; - va_start (argsPtr, data); - vsnprintf(textbuffer, MAXBUF, data, argsPtr); - va_end(argsPtr); - chop(tb); - - // if no source given send it from the server. - if (!source) - { - WriteServ(dest->fd,":%s %s",ServerName,textbuffer); - } - else - { - WriteFrom(dest->fd,source,"%s",textbuffer); - } -} - -/* write formatted text from a source user to all users on a channel - * including the sender (NOT for privmsg, notice etc!) */ - -void WriteChannel(chanrec* Ptr, userrec* user, char* text, ...) -{ - if ((!Ptr) || (!user) || (!text)) - { - log(DEFAULT,"*** BUG *** WriteChannel was given an invalid parameter"); - return; - } - char textbuffer[MAXBUF]; - va_list argsPtr; - va_start (argsPtr, text); - vsnprintf(textbuffer, MAXBUF, text, argsPtr); - va_end(argsPtr); - - std::vector *ulist = Ptr->GetUsers(); - for (int j = 0; j < ulist->size(); j++) - { - char* o = (*ulist)[j]; - userrec* otheruser = (userrec*)o; - if (otheruser->fd != FD_MAGIC_NUMBER) - WriteTo(user,otheruser,"%s",textbuffer); - } -} - -/* write formatted text from a source user to all users on a channel - * including the sender (NOT for privmsg, notice etc!) doesnt send to - * users on remote servers */ - -void WriteChannelLocal(chanrec* Ptr, userrec* user, char* text, ...) -{ - if ((!Ptr) || (!text)) - { - log(DEFAULT,"*** BUG *** WriteChannel was given an invalid parameter"); - return; - } - char textbuffer[MAXBUF]; - va_list argsPtr; - va_start (argsPtr, text); - vsnprintf(textbuffer, MAXBUF, text, argsPtr); - va_end(argsPtr); - - std::vector *ulist = Ptr->GetUsers(); - for (int j = 0; j < ulist->size(); j++) - { - char* o = (*ulist)[j]; - userrec* otheruser = (userrec*)o; - if ((otheruser->fd != FD_MAGIC_NUMBER) && (otheruser->fd != -1) && (otheruser != user)) - { - if (!user) - { - WriteServ(otheruser->fd,"%s",textbuffer); - } - else - { - WriteTo(user,otheruser,"%s",textbuffer); - } - } - } -} - - -void WriteChannelWithServ(char* ServName, chanrec* Ptr, char* text, ...) -{ - if ((!Ptr) || (!text)) - { - log(DEFAULT,"*** BUG *** WriteChannelWithServ was given an invalid parameter"); - return; - } - char textbuffer[MAXBUF]; - va_list argsPtr; - va_start (argsPtr, text); - vsnprintf(textbuffer, MAXBUF, text, argsPtr); - va_end(argsPtr); - - - std::vector *ulist = Ptr->GetUsers(); - for (int j = 0; j < ulist->size(); j++) - { - char* o = (*ulist)[j]; - userrec* otheruser = (userrec*)o; - if (otheruser->fd != FD_MAGIC_NUMBER) - WriteServ(otheruser->fd,"%s",textbuffer); - } -} - - -/* write formatted text from a source user to all users on a channel except - * for the sender (for privmsg etc) */ - -void ChanExceptSender(chanrec* Ptr, userrec* user, char* text, ...) -{ - if ((!Ptr) || (!user) || (!text)) - { - log(DEFAULT,"*** BUG *** ChanExceptSender was given an invalid parameter"); - return; - } - char textbuffer[MAXBUF]; - va_list argsPtr; - va_start (argsPtr, text); - vsnprintf(textbuffer, MAXBUF, text, argsPtr); - va_end(argsPtr); - - std::vector *ulist = Ptr->GetUsers(); - for (int j = 0; j < ulist->size(); j++) - { - char* o = (*ulist)[j]; - userrec* otheruser = (userrec*)o; - if ((otheruser->fd != FD_MAGIC_NUMBER) && (user != otheruser)) - WriteFrom(otheruser->fd,user,"%s",textbuffer); - } -} - - -std::string GetServerDescription(char* servername) -{ - for (int j = 0; j < 32; j++) - { - if (me[j] != NULL) - { - for (int k = 0; k < me[j]->connectors.size(); k++) - { - if (!strcasecmp(me[j]->connectors[k].GetServerName().c_str(),servername)) - { - return me[j]->connectors[k].GetDescription(); - } - } - } - return ServerDesc; // not a remote server that can be found, it must be me. - } -} - - -/* write a formatted string to all users who share at least one common - * channel, including the source user e.g. for use in NICK */ - -void WriteCommon(userrec *u, char* text, ...) -{ - if (!u) - { - log(DEFAULT,"*** BUG *** WriteCommon was given an invalid parameter"); - return; - } - - if (u->registered != 7) { - log(DEFAULT,"*** BUG *** WriteCommon on an unregistered user"); - return; - } - - char textbuffer[MAXBUF]; - va_list argsPtr; - va_start (argsPtr, text); - vsnprintf(textbuffer, MAXBUF, text, argsPtr); - va_end(argsPtr); - - // FIX: Stops a message going to the same person more than once - bzero(&already_sent,65536); - - bool sent_to_at_least_one = false; - - for (int i = 0; i < MAXCHANS; i++) - { - if (u->chans[i].channel) - { - std::vector *ulist = u->chans[i].channel->GetUsers(); - for (int j = 0; j < ulist->size(); j++) - { - char* o = (*ulist)[j]; - userrec* otheruser = (userrec*)o; - if ((otheruser->fd > 0) && (!already_sent[otheruser->fd])) - { - already_sent[otheruser->fd] = 1; - WriteFrom(otheruser->fd,u,"%s",textbuffer); - 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) - { - WriteFrom(u->fd,u,"%s",textbuffer); - } -} - -/* write a formatted string to all users who share at least one common - * channel, NOT including the source user e.g. for use in QUIT */ - -void WriteCommonExcept(userrec *u, char* text, ...) -{ - if (!u) - { - log(DEFAULT,"*** BUG *** WriteCommon was given an invalid parameter"); - return; - } - - if (u->registered != 7) { - log(DEFAULT,"*** BUG *** WriteCommon on an unregistered user"); - return; - } - - char textbuffer[MAXBUF]; - va_list argsPtr; - va_start (argsPtr, text); - vsnprintf(textbuffer, MAXBUF, text, argsPtr); - va_end(argsPtr); - - bzero(&already_sent,65536); - - for (int i = 0; i < MAXCHANS; i++) - { - if (u->chans[i].channel) - { - std::vector *ulist = u->chans[i].channel->GetUsers(); - for (int j = 0; j < ulist->size(); j++) - { - char* o = (*ulist)[j]; - userrec* otheruser = (userrec*)o; - if (u != otheruser) - { - if ((otheruser->fd > 0) && (!already_sent[otheruser->fd])) - { - already_sent[otheruser->fd] = 1; - WriteFrom(otheruser->fd,u,"%s",textbuffer); - } - } - } - } - } -} - -void WriteOpers(char* text, ...) -{ - if (!text) - { - log(DEFAULT,"*** BUG *** WriteOpers was given an invalid parameter"); - return; - } - - char textbuffer[MAXBUF]; - va_list argsPtr; - va_start (argsPtr, text); - vsnprintf(textbuffer, MAXBUF, text, argsPtr); - va_end(argsPtr); - - for (std::vector::iterator i = all_opers.begin(); i != all_opers.end(); i++) - { - userrec* a = *i; - if ((a) && (a->fd != FD_MAGIC_NUMBER)) - { - if (strchr(a->modes,'s')) - { - // send server notices to all with +s - WriteServ(a->fd,"NOTICE %s :%s",a->nick,textbuffer); - } - } - } -} - -void NoticeAllOpers(userrec *source, bool local_only, char* text, ...) -{ - if ((!text) || (!source)) - { - log(DEFAULT,"*** BUG *** NoticeAllOpers was given an invalid parameter"); - return; - } - - char textbuffer[MAXBUF]; - va_list argsPtr; - va_start (argsPtr, text); - vsnprintf(textbuffer, MAXBUF, text, argsPtr); - va_end(argsPtr); - - for (std::vector::iterator i = all_opers.begin(); i != all_opers.end(); i++) - { - userrec* a = *i; - if ((a) && (a->fd != FD_MAGIC_NUMBER)) - { - if (strchr(a->modes,'s')) - { - // send server notices to all with +s - WriteServ(a->fd,"NOTICE %s :*** Notice From %s: %s",a->nick,source->nick,textbuffer); - } - } - } - - if (!local_only) - { - char buffer[MAXBUF]; - snprintf(buffer,MAXBUF,"V %s @* :%s",source->nick,textbuffer); - NetSendToAll(buffer); - } -} - -// returns TRUE of any users on channel C occupy server 'servername'. - -bool ChanAnyOnThisServer(chanrec *c,char* servername) -{ - log(DEBUG,"ChanAnyOnThisServer"); - - std::vector *ulist = c->GetUsers(); - for (int j = 0; j < ulist->size(); j++) - { - char* o = (*ulist)[j]; - userrec* user = (userrec*)o; - if (!strcasecmp(user->server,servername)) - return true; - } - return false; -} - -// returns true if user 'u' shares any common channels with any users on server 'servername' - -bool CommonOnThisServer(userrec* u,const char* servername) -{ - log(DEBUG,"ChanAnyOnThisServer"); - - for (int i = 0; i < MAXCHANS; i++) - { - if (u->chans[i].channel) - { - std::vector *ulist = u->chans[i].channel->GetUsers(); - for (int j = 0; j < ulist->size(); j++) - { - char* o = (*ulist)[j]; - userrec* user = (userrec*)o; - if (!strcasecmp(user->server,servername)) - return true; - } - } - } - return false; -} - - -void NetSendToCommon(userrec* u, char* s) -{ - char buffer[MAXBUF]; - snprintf(buffer,MAXBUF,"%s",s); - - log(DEBUG,"NetSendToCommon: '%s' '%s'",u->nick,s); - - std::string msg = buffer; - FOREACH_MOD OnPacketTransmit(msg,s); - strlcpy(buffer,msg.c_str(),MAXBUF); - - for (int j = 0; j < 32; j++) - { - if (me[j] != NULL) - { - for (int k = 0; k < me[j]->connectors.size(); k++) - { - if (CommonOnThisServer(u,me[j]->connectors[k].GetServerName().c_str())) - { - me[j]->SendPacket(buffer,me[j]->connectors[k].GetServerName().c_str()); - } - } - } - } -} - - -void NetSendToAll(char* s) -{ - char buffer[MAXBUF]; - snprintf(buffer,MAXBUF,"%s",s); - - log(DEBUG,"NetSendToAll: '%s'",s); - - std::string msg = buffer; - FOREACH_MOD OnPacketTransmit(msg,s); - strlcpy(buffer,msg.c_str(),MAXBUF); - - for (int j = 0; j < 32; j++) - { - if (me[j] != NULL) - { - for (int k = 0; k < me[j]->connectors.size(); k++) - { - me[j]->SendPacket(buffer,me[j]->connectors[k].GetServerName().c_str()); - } - } - } -} - -void NetSendToAllAlive(char* s) -{ - char buffer[MAXBUF]; - snprintf(buffer,MAXBUF,"%s",s); - - log(DEBUG,"NetSendToAllAlive: '%s'",s); - - std::string msg = buffer; - FOREACH_MOD OnPacketTransmit(msg,s); - strlcpy(buffer,msg.c_str(),MAXBUF); - - for (int j = 0; j < 32; j++) - { - if (me[j] != NULL) - { - for (int k = 0; k < me[j]->connectors.size(); k++) - { - if (me[j]->connectors[k].GetState() != STATE_DISCONNECTED) - { - me[j]->SendPacket(buffer,me[j]->connectors[k].GetServerName().c_str()); - } - else - { - log(DEBUG,"%s is dead, not sending to it.",me[j]->connectors[k].GetServerName().c_str()); - } - } - } - } -} - - -void NetSendToOne(char* target,char* s) -{ - char buffer[MAXBUF]; - snprintf(buffer,MAXBUF,"%s",s); - - log(DEBUG,"NetSendToOne: '%s' '%s'",target,s); - - std::string msg = buffer; - FOREACH_MOD OnPacketTransmit(msg,s); - strlcpy(buffer,msg.c_str(),MAXBUF); - - for (int j = 0; j < 32; j++) - { - if (me[j] != NULL) - { - for (int k = 0; k < me[j]->connectors.size(); k++) - { - if (!strcasecmp(me[j]->connectors[k].GetServerName().c_str(),target)) - { - me[j]->SendPacket(buffer,me[j]->connectors[k].GetServerName().c_str()); - } - } - } - } -} - -void NetSendToAllExcept(const char* target,char* s) -{ - char buffer[MAXBUF]; - snprintf(buffer,MAXBUF,"%s",s); - - log(DEBUG,"NetSendToAllExcept: '%s' '%s'",target,s); - - std::string msg = buffer; - FOREACH_MOD OnPacketTransmit(msg,s); - strlcpy(buffer,msg.c_str(),MAXBUF); - - for (int j = 0; j < 32; j++) - { - if (me[j] != NULL) - { - for (int k = 0; k < me[j]->connectors.size(); k++) - { - if (strcasecmp(me[j]->connectors[k].GetServerName().c_str(),target)) - { - me[j]->SendPacket(buffer,me[j]->connectors[k].GetServerName().c_str()); - } - } - } - } -} - - -void WriteMode(const char* modes, int flags, const char* text, ...) -{ - if ((!text) || (!modes) || (!flags)) - { - log(DEFAULT,"*** BUG *** WriteMode was given an invalid parameter"); - return; - } - - char textbuffer[MAXBUF]; - va_list argsPtr; - va_start (argsPtr, text); - vsnprintf(textbuffer, MAXBUF, text, argsPtr); - va_end(argsPtr); - int modelen = strlen(modes); - - for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++) - { - if ((i->second) && (i->second->fd != FD_MAGIC_NUMBER)) - { - bool send_to_user = false; - - if (flags == WM_AND) - { - send_to_user = true; - for (int n = 0; n < modelen; n++) - { - if (!hasumode(i->second,modes[n])) - { - send_to_user = false; - break; - } - } - } - else if (flags == WM_OR) - { - send_to_user = false; - for (int n = 0; n < modelen; n++) - { - if (hasumode(i->second,modes[n])) - { - send_to_user = true; - break; - } - } - } - - if (send_to_user) - { - WriteServ(i->second->fd,"NOTICE %s :%s",i->second->nick,textbuffer); - } - } - } -} - - -void NoticeAll(userrec *source, bool local_only, char* text, ...) -{ - if ((!text) || (!source)) - { - log(DEFAULT,"*** BUG *** NoticeAll was given an invalid parameter"); - return; - } - - char textbuffer[MAXBUF]; - va_list argsPtr; - va_start (argsPtr, text); - vsnprintf(textbuffer, MAXBUF, text, argsPtr); - va_end(argsPtr); - - for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++) - { - if ((i->second) && (i->second->fd != FD_MAGIC_NUMBER)) - { - WriteFrom(i->second->fd,source,"NOTICE $* :%s",textbuffer); - } - } - - if (!local_only) - { - char buffer[MAXBUF]; - snprintf(buffer,MAXBUF,"V %s * :%s",source->nick,textbuffer); - NetSendToAll(buffer); - } - -} - -void WriteWallOps(userrec *source, bool local_only, char* text, ...) -{ - if ((!text) || (!source)) - { - log(DEFAULT,"*** BUG *** WriteOpers was given an invalid parameter"); - return; - } - - char textbuffer[MAXBUF]; - va_list argsPtr; - va_start (argsPtr, text); - vsnprintf(textbuffer, MAXBUF, text, argsPtr); - va_end(argsPtr); - - for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++) - { - if ((i->second) && (i->second->fd != FD_MAGIC_NUMBER)) - { - if (strchr(i->second->modes,'w')) - { - WriteTo(source,i->second,"WALLOPS :%s",textbuffer); - } - } - } - - if (!local_only) - { - char buffer[MAXBUF]; - snprintf(buffer,MAXBUF,"@ %s :%s",source->nick,textbuffer); - NetSendToAll(buffer); - } -} - -/* convert a string to lowercase. Note following special circumstances - * taken from RFC 1459. Many "official" server branches still hold to this - * rule so i will too; - * - * Because of IRC's scandanavian origin, the characters {}| are - * considered to be the lower case equivalents of the characters []\, - * respectively. This is a critical issue when determining the - * equivalence of two nicknames. - */ - -void strlower(char *n) -{ - if (!n) - { - return; - } - for (int i = 0; n[i] != 0; i++) - { - n[i] = tolower(n[i]); - if (n[i] == '[') - n[i] = '{'; - if (n[i] == ']') - n[i] = '}'; - if (n[i] == '\\') - n[i] = '|'; - } -} - - - -/* Find a user record by nickname and return a pointer to it */ - -userrec* Find(std::string nick) -{ - user_hash::iterator iter = clientlist.find(nick); - - if (iter == clientlist.end()) - /* Couldn't find it */ - return NULL; - - return iter->second; -} - -/* find a channel record by channel name and return a pointer to it */ - -chanrec* FindChan(const char* chan) -{ - if (!chan) - { - log(DEFAULT,"*** BUG *** Findchan was given an invalid parameter"); - return NULL; + { + ConfValue("connect","deny",i,Value,&config_f); + strlcpy(c.host,Value,MAXBUF); + c.type = CC_DENY; + Classes.push_back(c); + log(DEBUG,"Read connect class type DENY, host=%s",c.host); + } + } + log(DEFAULT,"Reading K lines,Q lines and Z lines from config..."); + read_xline_defaults(); + log(DEFAULT,"Applying K lines, Q lines and Z lines..."); + apply_lines(); - chan_hash::iterator iter = chanlist.find(chan); + autoconns.clear(); + for (int i = 0; i < ConfValueEnum("link",&config_f); i++) + { + char Link_ServerName[MAXBUF],Link_AConn[MAXBUF]; + ConfValue("link","name",i,Link_ServerName,&config_f); + ConfValue("link","autoconnect",i,Link_AConn,&config_f); + if (strcmp(Link_AConn,"")) + { + autoconns[std::string(Link_ServerName)] = atoi(Link_AConn) + time(NULL); + } + } - if (iter == chanlist.end()) - /* Couldn't find it */ - return NULL; - return iter->second; -} + log(DEFAULT,"Done reading configuration file, InspIRCd is now starting."); + if (!bail) + { + log(DEFAULT,"Adding and removing modules due to rehash..."); + std::vector old_module_names, new_module_names, added_modules, removed_modules; -long GetMaxBans(char* name) -{ - char CM[MAXBUF]; - for (int count = 0; count < ConfValueEnum("banlist",&config_f); count++) - { - ConfValue("banlist","chan",count,CM,&config_f); - if (match(name,CM)) + // store the old module names + for (std::vector::iterator t = module_names.begin(); t != module_names.end(); t++) { - ConfValue("banlist","limit",count,CM,&config_f); - return atoi(CM); + old_module_names.push_back(*t); } - } - return 64; -} - - -void purge_empty_chans(userrec* u) -{ - - int go_again = 1, purge = 0; - // firstly decrement the count on each channel - for (int f = 0; f < MAXCHANS; f++) - { - if (u->chans[f].channel) + // get the new module names + for (int count2 = 0; count2 < ConfValueEnum("module",&config_f); count2++) { - u->chans[f].channel->DecUserCounter(); - u->chans[f].channel->DelUser((char*)u); + ConfValue("module","name",count2,Value,&config_f); + new_module_names.push_back(Value); } - } - for (int i = 0; i < MAXCHANS; i++) - { - if (u->chans[i].channel) + // now create a list of new modules that are due to be loaded + // and a seperate list of modules which are due to be unloaded + for (std::vector::iterator _new = new_module_names.begin(); _new != new_module_names.end(); _new++) { - if (!usercount(u->chans[i].channel)) - { - chan_hash::iterator i2 = chanlist.find(u->chans[i].channel->name); - /* kill the record */ - if (i2 != chanlist.end()) - { - log(DEBUG,"del_channel: destroyed: %s",i2->second->name); - if (i2->second) - delete i2->second; - chanlist.erase(i2); - go_again = 1; - purge++; - u->chans[i].channel = NULL; - } - } - else + bool added = true; + for (std::vector::iterator old = old_module_names.begin(); old != old_module_names.end(); old++) { - log(DEBUG,"skipped purge for %s",u->chans[i].channel->name); + if (*old == *_new) + added = false; } + if (added) + added_modules.push_back(*_new); } - } - log(DEBUG,"completed channel purge, killed %lu",(unsigned long)purge); - - DeleteOper(u); -} - - -char scratch[MAXBUF]; -char sparam[MAXBUF]; - -char* chanmodes(chanrec *chan) -{ - if (!chan) - { - log(DEFAULT,"*** BUG *** chanmodes was given an invalid parameter"); - strcpy(scratch,""); - return scratch; - } - - strcpy(scratch,""); - strcpy(sparam,""); - if (chan->noexternal) - { - strlcat(scratch,"n",MAXMODES); - } - if (chan->topiclock) - { - strlcat(scratch,"t",MAXMODES); - } - if (chan->key[0]) - { - strlcat(scratch,"k",MAXMODES); - } - if (chan->limit) - { - strlcat(scratch,"l",MAXMODES); - } - if (chan->inviteonly) - { - strlcat(scratch,"i",MAXMODES); - } - if (chan->moderated) - { - strlcat(scratch,"m",MAXMODES); - } - if (chan->secret) - { - strlcat(scratch,"s",MAXMODES); - } - if (chan->c_private) - { - strlcat(scratch,"p",MAXMODES); - } - if (chan->key[0]) - { - strlcat(sparam," ",MAXBUF); - strlcat(sparam,chan->key,MAXBUF); - } - if (chan->limit) - { - char foo[24]; - sprintf(foo," %lu",(unsigned long)chan->limit); - strlcat(sparam,foo,MAXBUF); - } - if (*chan->custom_modes) - { - strlcat(scratch,chan->custom_modes,MAXMODES); - for (int z = 0; chan->custom_modes[z] != 0; z++) + for (std::vector::iterator oldm = old_module_names.begin(); oldm != old_module_names.end(); oldm++) { - std::string extparam = chan->GetModeParameter(chan->custom_modes[z]); - if (extparam != "") + bool removed = true; + for (std::vector::iterator newm = new_module_names.begin(); newm != new_module_names.end(); newm++) { - strlcat(sparam," ",MAXBUF); - strlcat(sparam,extparam.c_str(),MAXBUF); + if (*newm == *oldm) + removed = false; } + if (removed) + removed_modules.push_back(*oldm); } - } - log(DEBUG,"chanmodes: %s %s%s",chan->name,scratch,sparam); - strlcat(scratch,sparam,MAXMODES); - return scratch; -} - - -/* compile a userlist of a channel into a string, each nick seperated by - * spaces and op, voice etc status shown as @ and + */ - -void userlist(userrec *user,chanrec *c) -{ - if ((!c) || (!user)) - { - log(DEFAULT,"*** BUG *** userlist was given an invalid parameter"); - return; - } - - snprintf(list,MAXBUF,"353 %s = %s :", user->nick, c->name); - for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++) - { - if (has_channel(i->second,c)) + // now we have added_modules, a vector of modules to be loaded, and removed_modules, a vector of modules + // to be removed. + int rem = 0, add = 0; + if (!removed_modules.empty()) + for (std::vector::iterator removing = removed_modules.begin(); removing != removed_modules.end(); removing++) { - if (isnick(i->second->nick)) + if (UnloadModule(removing->c_str())) { - if ((!has_channel(i->second,c)) && (strchr(i->second->modes,'i'))) - { - /* user is +i, and source not on the channel, does not show - * nick in NAMES list */ - continue; - } - strlcat(list,cmode(i->second,c),MAXBUF); - strlcat(list,i->second->nick,MAXBUF); - strlcat(list," ",MAXBUF); - if (strlen(list)>(480-NICKMAX)) - { - /* list overflowed into - * multiple numerics */ - WriteServ(user->fd,"%s",list); - snprintf(list,MAXBUF,"353 %s = %s :", user->nick, c->name); - } + WriteOpers("*** REHASH UNLOADED MODULE: %s",removing->c_str()); + WriteServ(user->fd,"973 %s %s :Module %s successfully unloaded.",user->nick, removing->c_str(), removing->c_str()); + rem++; + } + else + { + WriteServ(user->fd,"972 %s %s :Failed to unload module %s: %s",user->nick, removing->c_str(), removing->c_str(), ModuleError()); } } - } - /* if whats left in the list isnt empty, send it */ if (list[strlen(list)-1] != ':') - { - WriteServ(user->fd,"%s",list); - } -} - -/* return a count of the users on a specific channel accounting for - * invisible users who won't increase the count. e.g. for /LIST */ - -int usercount_i(chanrec *c) -{ - int count = 0; - - if (!c) - { - log(DEFAULT,"*** BUG *** usercount_i was given an invalid parameter"); - return 0; - } - - strcpy(list,""); - for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++) - { - if (i->second) + if (!added_modules.empty()) + for (std::vector::iterator adding = added_modules.begin(); adding != added_modules.end(); adding++) { - if (has_channel(i->second,c)) + if (LoadModule(adding->c_str())) { - if (isnick(i->second->nick)) - { - if ((!has_channel(i->second,c)) && (strchr(i->second->modes,'i'))) - { - /* user is +i, and source not on the channel, does not show - * nick in NAMES list */ - continue; - } - count++; - } + WriteOpers("*** REHASH LOADED MODULE: %s",adding->c_str()); + WriteServ(user->fd,"975 %s %s :Module %s successfully loaded.",user->nick, adding->c_str(), adding->c_str()); + add++; + } + else + { + WriteServ(user->fd,"974 %s %s :Failed to load module %s: %s",user->nick, adding->c_str(), adding->c_str(), ModuleError()); } } + log(DEFAULT,"Successfully unloaded %lu of %lu modules and loaded %lu of %lu modules.",(unsigned long)rem,(unsigned long)removed_modules.size(),(unsigned long)add,(unsigned long)added_modules.size()); } - log(DEBUG,"usercount_i: %s %lu",c->name,(unsigned long)count); - return count; -} - - -int usercount(chanrec *c) -{ - if (!c) - { - log(DEFAULT,"*** BUG *** usercount was given an invalid parameter"); - return 0; - } - int count = c->GetUserCounter(); - log(DEBUG,"usercount: %s %lu",c->name,(unsigned long)count); - return count; } @@ -1608,9 +540,9 @@ chanrec* add_channel(userrec *user, const char* cn, const char* key, bool overri // we MUST declare this wherever we use FOREACH_RESULT int MOD_RESULT = 0; - if (strlen(cname) > CHANMAX-1) + if (strlen(cname) > CHANMAX) { - cname[CHANMAX-1] = '\0'; + cname[CHANMAX] = '\0'; } log(DEBUG,"add_channel: %s %s",user->nick,cname); @@ -1635,8 +567,7 @@ chanrec* add_channel(userrec *user, const char* cn, const char* key, bool overri chanlist[cname] = new chanrec(); strlcpy(chanlist[cname]->name, cname,CHANMAX); - chanlist[cname]->topiclock = 1; - chanlist[cname]->noexternal = 1; + chanlist[cname]->binarymodes = CM_TOPICLOCK | CM_NOEXTERNAL; chanlist[cname]->created = TIME; strcpy(chanlist[cname]->topic, ""); strncpy(chanlist[cname]->setby, user->nick,NICKMAX); @@ -1701,7 +632,7 @@ chanrec* add_channel(userrec *user, const char* cn, const char* key, bool overri FOREACH_RESULT(OnCheckInvite(user, Ptr)); if (MOD_RESULT == 0) { - if (Ptr->inviteonly) + if (Ptr->binarymodes & CM_INVITEONLY) { log(DEBUG,"add_channel: channel is +i"); if (user->IsInvited(Ptr->name)) @@ -1793,7 +724,6 @@ chanrec* add_channel(userrec *user, const char* cn, const char* key, bool overri user->chans[index].uc_modes = 0; } user->chans[index].channel = Ptr; - Ptr->IncUserCounter(); Ptr->AddUser((char*)user); WriteChannel(Ptr,user,"JOIN :%s",Ptr->name); @@ -1896,7 +826,6 @@ chanrec* del_channel(userrec *user, const char* cname, const char* reason, bool } } - Ptr->DecUserCounter(); Ptr->DelUser((char*)user); /* if there are no users left on the channel */ @@ -1981,7 +910,6 @@ void kick_channel(userrec *src,userrec *user, chanrec *Ptr, char* reason) } } - Ptr->DecUserCounter(); Ptr->DelUser((char*)user); /* if there are no users left on the channel */ @@ -2195,32 +1123,53 @@ void kill_link(userrec *user,const char* r) NetSendToAll(buffer); } + user->FlushWriteBuf(); + FOREACH_MOD OnUserDisconnect(user); if (user->fd > -1) { FOREACH_MOD OnRawSocketClose(user->fd); - shutdown(user->fd,2); - close(user->fd); - } - - if (user->registered == 7) { - WriteOpers("*** Client exiting: %s!%s@%s [%s]",user->nick,user->ident,user->host,reason); - AddWhoWas(user); +#ifdef USE_KQUEUE + struct kevent ke; + EV_SET(&ke, user->fd, EVFILT_READ, EV_DELETE, 0, 0, NULL); + int i = kevent(kq, &ke, 1, 0, 0, NULL); + if (i == -1) + { + log(DEBUG,"kqueue: Failed to remove user from queue!"); + } +#endif +#ifdef USE_EPOLL + struct epoll_event ev; + ev.events = EPOLLIN | EPOLLET; + ev.data.fd = user->fd; + int i = epoll_ctl(ep, EPOLL_CTL_DEL, user->fd, &ev); + if (i < 0) + { + log(DEBUG,"epoll: List deletion failure!"); + } +#endif + 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 (!strcmp(user->server,ServerName)) + 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) fd_ref_table[user->fd] = NULL; - delete user; clientlist.erase(iter); } + delete user; } void kill_link_silent(userrec *user,const char* r) @@ -2240,6 +1189,8 @@ void kill_link_silent(userrec *user,const char* r) 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 OnUserQuit(user); WriteCommonExcept(user,"QUIT :%s",reason); @@ -2255,8 +1206,26 @@ void kill_link_silent(userrec *user,const char* r) if (user->fd > -1) { FOREACH_MOD OnRawSocketClose(user->fd); - shutdown(user->fd,2); - close(user->fd); +#ifdef USE_KQUEUE + struct kevent ke; + EV_SET(&ke, user->fd, EVFILT_READ, EV_DELETE, 0, 0, NULL); + int i = kevent(kq, &ke, 1, 0, 0, NULL); + if (i == -1) + { + log(DEBUG,"kqueue: Failed to remove user from queue!"); + } +#endif +#ifdef USE_EPOLL + struct epoll_event ev; + ev.events = EPOLLIN | EPOLLET; + ev.data.fd = user->fd; + int i = epoll_ctl(ep, EPOLL_CTL_DEL, user->fd, &ev); + if (i < 0) + { + log(DEBUG,"epoll: List deletion failure!"); + } +#endif + user->CloseSocket(); } if (user->registered == 7) { @@ -2268,74 +1237,9 @@ void kill_link_silent(userrec *user,const char* r) log(DEBUG,"deleting user hash value %lu",(unsigned long)user); if (user->fd > -1) fd_ref_table[user->fd] = NULL; - delete user; clientlist.erase(iter); } -} - - - -// looks up a users password for their connection class (/ tags) - -char* Passwd(userrec *user) -{ - for (ClassVector::iterator i = Classes.begin(); i != Classes.end(); i++) - { - if (match(user->host,i->host) && (i->type == CC_ALLOW)) - { - return i->pass; - } - } - return ""; -} - -bool IsDenied(userrec *user) -{ - for (ClassVector::iterator i = Classes.begin(); i != Classes.end(); i++) - { - if (match(user->host,i->host) && (i->type == CC_DENY)) - { - return true; - } - } - return false; -} - - - - -/* sends out an error notice to all connected clients (not to be used - * lightly!) */ - -void send_error(char *s) -{ - log(DEBUG,"send_error: %s",s); - for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++) - { - if (isnick(i->second->nick)) - { - WriteServ(i->second->fd,"NOTICE %s :%s",i->second->nick,s); - } - else - { - // fix - unregistered connections receive ERROR, not NOTICE - Write(i->second->fd,"ERROR :%s",s); - } - } -} - -void Error(int status) -{ - signal (SIGALRM, SIG_IGN); - signal (SIGPIPE, SIG_IGN); - signal (SIGTERM, SIG_IGN); - signal (SIGABRT, SIG_IGN); - signal (SIGSEGV, SIG_IGN); - signal (SIGURG, SIG_IGN); - signal (SIGKILL, SIG_IGN); - log(DEFAULT,"*** fell down a pothole in the road to perfection ***"); - send_error("Error! Segmentation fault! save meeeeeeeeeeeeee *splat!*"); - Exit(status); + delete user; } @@ -2367,6 +1271,17 @@ int main(int argc, char** argv) } strlcpy(MyExecutable,argv[0],MAXBUF); + // initialize the lowercase mapping table + for (int cn = 0; cn < 256; cn++) + lowermap[cn] = cn; + // lowercase the uppercase chars + for (int cn = 65; cn < 91; cn++) + lowermap[cn] = tolower(cn); + // now replace the specific chars for scandanavian comparison + lowermap['['] = '{'; + lowermap[']'] = '}'; + lowermap['\\'] = '|'; + if (InspIRCd(argv,argc) == ERROR) { log(DEFAULT,"main: daemon function bailed"); @@ -2404,8 +1319,8 @@ userrec* ReHashNick(char* Old, char* New) log(DEBUG,"ReHashNick: Found hashed nick %s",Old); - clientlist[New] = new userrec(); - clientlist[New] = oldnick->second; + userrec* olduser = oldnick->second; + clientlist[New] = olduser; clientlist.erase(oldnick); log(DEBUG,"ReHashNick: Nick rehashed as %s",New); @@ -2416,13 +1331,13 @@ userrec* ReHashNick(char* Old, char* New) /* adds or updates an entry in the whowas list */ void AddWhoWas(userrec* u) { - user_hash::iterator iter = whowas.find(u->nick); - userrec *a = new userrec(); + whowas_hash::iterator iter = whowas.find(u->nick); + WhoWasUser *a = new WhoWasUser(); strlcpy(a->nick,u->nick,NICKMAX); - strlcpy(a->ident,u->ident,64); - strlcpy(a->dhost,u->dhost,256); - strlcpy(a->host,u->host,256); - strlcpy(a->fullname,u->fullname,128); + 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; @@ -2433,19 +1348,24 @@ void AddWhoWas(userrec* u) if (iter == whowas.end()) { - if (whowas.size() == WHOWAS_MAX) + if (whowas.size() >= WHOWAS_MAX) { - for (user_hash::iterator i = whowas.begin(); i != whowas.end(); i++) + 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 { @@ -2483,6 +1403,8 @@ void AddClient(int socket, char* host, int port, bool iscached, char* ip) // issue in earlier alphas/betas if (iter != clientlist.end()) { + userrec* goner = iter->second; + delete goner; clientlist.erase(iter); } @@ -2499,21 +1421,23 @@ void AddClient(int socket, char* host, int port, bool iscached, char* ip) log(DEBUG,"AddClient: %lu %s %d %s",(unsigned long)socket,host,port,ip); clientlist[tempnick]->fd = socket; - strncpy(clientlist[tempnick]->nick, tn2,NICKMAX); - strncpy(clientlist[tempnick]->host, host,160); - strncpy(clientlist[tempnick]->dhost, host,160); - strncpy(clientlist[tempnick]->server, ServerName,256); - strncpy(clientlist[tempnick]->ident, "unknown",12); + strlcpy(clientlist[tempnick]->nick, tn2,NICKMAX); + strlcpy(clientlist[tempnick]->host, host,160); + strlcpy(clientlist[tempnick]->dhost, host,160); + clientlist[tempnick]->server = (char*)FindServerNamePtr(ServerName); + strlcpy(clientlist[tempnick]->ident, "unknown",IDENTMAX); clientlist[tempnick]->registered = 0; clientlist[tempnick]->signon = TIME+dns_timeout; clientlist[tempnick]->lastping = 1; clientlist[tempnick]->port = port; - strncpy(clientlist[tempnick]->ip,ip,32); + strlcpy(clientlist[tempnick]->ip,ip,16); // 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 = Classes.begin(); i != Classes.end(); i++) { @@ -2523,6 +1447,8 @@ void AddClient(int socket, char* host, int port, bool iscached, char* ip) class_flood = i->flood; clientlist[tempnick]->pingmax = i->pingtime; class_threshold = i->threshold; + class_sqmax = i->sendqmax; + class_rqmax = i->recvqmax; break; } } @@ -2531,6 +1457,8 @@ void AddClient(int socket, char* host, int port, bool iscached, char* ip) 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; for (int i = 0; i < MAXCHANS; i++) { @@ -2551,151 +1479,49 @@ void AddClient(int socket, char* host, int port, bool iscached, char* ip) // 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 (socket > 65535) - { - kill_link(clientlist[tempnick],"Server is full"); - return; - } - - - char* e = matches_exception(ip); - if (!e) - { - char* r = matches_zline(ip); - if (r) - { - char reason[MAXBUF]; - snprintf(reason,MAXBUF,"Z-Lined: %s",r); - kill_link(clientlist[tempnick],reason); - return; - } - } - fd_ref_table[socket] = clientlist[tempnick]; -} - -// this function counts all users connected, wether they are registered or NOT. -int usercnt(void) -{ - return clientlist.size(); -} - -// this counts only registered users, so that the percentages in /MAP don't mess up when users are sitting in an unregistered state -int registered_usercount(void) -{ - int c = 0; - for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++) - { - if ((i->second->fd) && (isnick(i->second->nick))) c++; - } - return c; -} - -int usercount_invisible(void) -{ - int c = 0; - - for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++) - { - if ((i->second->fd) && (isnick(i->second->nick)) && (strchr(i->second->modes,'i'))) c++; - } - return c; -} - -int usercount_opers(void) -{ - int c = 0; - - for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++) + if (socket > 65534) { - if ((i->second->fd) && (isnick(i->second->nick)) && (strchr(i->second->modes,'o'))) c++; + kill_link(clientlist[tempnick],"Server is full"); + return; } - return c; -} - -int usercount_unknown(void) -{ - int c = 0; + - for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++) + char* e = matches_exception(ip); + if (!e) { - if ((i->second->fd) && (i->second->registered != 7)) - c++; + char* r = matches_zline(ip); + if (r) + { + char reason[MAXBUF]; + snprintf(reason,MAXBUF,"Z-Lined: %s",r); + kill_link(clientlist[tempnick],reason); + return; + } } - return c; -} - -long chancount(void) -{ - return chanlist.size(); -} - -long count_servs(void) -{ - int c = 0; - for (int i = 0; i < 32; i++) - { - if (me[i] != NULL) - { - for (vector::iterator j = me[i]->connectors.begin(); j != me[i]->connectors.end(); j++) - { - if (strcasecmp(j->GetServerName().c_str(),ServerName)) - { - c++; - } - } - } - } - return c; -} - -long servercount(void) -{ - return count_servs()+1; -} + fd_ref_table[socket] = clientlist[tempnick]; -long local_count() -{ - int c = 0; - for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++) +#ifdef USE_EPOLL + struct epoll_event ev; + log(DEBUG,"epoll: Adduser to events, ep=%d socket=%d",ep,socket); + ev.events = EPOLLIN | EPOLLET; + ev.data.fd = socket; + int i = epoll_ctl(ep, EPOLL_CTL_ADD, socket, &ev); + if (i < 0) { - if ((i->second->fd) && (isnick(i->second->nick)) && (!strcasecmp(i->second->server,ServerName))) c++; + log(DEBUG,"epoll: List insertion failure!"); } - return c; -} - - -void ShowMOTD(userrec *user) -{ - std::string WholeMOTD = ""; - if (!MOTD.size()) - { - WriteServ(user->fd,"422 %s :Message of the day file is missing.",user->nick); - return; - } - WholeMOTD = std::string(":") + std::string(ServerName) + std::string(" 375 ") + std::string(user->nick) + std::string(" :- ") + std::string(ServerName) + " message of the day\r\n"; - for (int i = 0; i != MOTD.size(); i++) +#endif +#ifdef USE_KQUEUE + struct kevent ke; + log(DEBUG,"kqueue: Add user to events, kq=%d socket=%d",kq,socket); + EV_SET(&ke, socket, EVFILT_READ, EV_ADD, 0, 0, NULL); + int i = kevent(kq, &ke, 1, 0, 0, NULL); + if (i == -1) { - WholeMOTD = WholeMOTD + std::string(":") + std::string(ServerName) + std::string(" 372 ") + std::string(user->nick) + std::string(" :- ") + MOTD[i] + std::string("\r\n"); + log(DEBUG,"kqueue: List insertion failure!"); } - WholeMOTD = WholeMOTD + std::string(":") + std::string(ServerName) + std::string(" 376 ") + std::string(user->nick) + std::string(" :End of message of the day.\r\n"); - // only one write operation - send(user->fd,WholeMOTD.c_str(),WholeMOTD.length(),0); - statsSent += WholeMOTD.length(); -} -void ShowRULES(userrec *user) -{ - if (!RULES.size()) - { - WriteServ(user->fd,"NOTICE %s :Rules file is missing.",user->nick); - return; - } - WriteServ(user->fd,"NOTICE %s :%s rules",user->nick,ServerName); - for (int i = 0; i != RULES.size(); i++) - { - WriteServ(user->fd,"NOTICE %s :%s",user->nick,RULES[i].c_str()); - } - WriteServ(user->fd,"NOTICE %s :End of %s rules.",user->nick,ServerName); +#endif } /* shows the message of the day, and any other on-logon stuff */ @@ -2752,7 +1578,7 @@ void FullConnectUser(userrec* user) v << "MESHED WALLCHOPS MODES=13 CHANTYPES=# PREFIX=(ohv)@%+ MAP SAFELIST MAXCHANNELS=" << MAXCHANS; v << " MAXBANS=60 NICKLEN=" << NICKMAX; v << " TOPICLEN=307 KICKLEN=307 MAXTARGETS=20 AWAYLEN=307 CHANMODES=ohvb,k,l,psmnti NETWORK="; - v << std::string(Network); + v << Network; std::string data005 = v.str(); FOREACH_MOD On005Numeric(data005); // anfl @ #ratbox, efnet reminded me that according to the RFC this cant contain more than 13 tokens per line... @@ -2781,24 +1607,11 @@ void FullConnectUser(userrec* user) // fix by brain: these should be AFTER the N token, so other servers know what the HELL we're on about... :) FOREACH_MOD OnUserConnect(user); + FOREACH_MOD OnGlobalConnect(user); WriteOpers("*** Client connecting on port %lu: %s!%s@%s [%s]",(unsigned long)user->port,user->nick,user->ident,user->host,user->ip); } -// this returns 1 when all modules are satisfied that the user should be allowed onto the irc server -// (until this returns true, a user will block in the waiting state, waiting to connect up to the -// registration timeout maximum seconds) -bool AllModulesReportReady(userrec* user) -{ - for (int i = 0; i <= MODCOUNT; i++) - { - int res = modules[i]->OnCheckReady(user); - if (!res) - return false; - } - return true; -} - /* shows the message of the day, and any other on-logon stuff */ void ConnectUser(userrec *user) { @@ -2819,7 +1632,16 @@ std::string GetVersionString() s1 = savept; v2 = strtok_r(s1," ",&savept); s1 = savept; - snprintf(versiondata,MAXBUF,"%s Rev. %s %s :%s (O=%lu)",VERSION,v2,ServerName,SYSTEM,(unsigned long)OPTIMISATION); +#ifdef USE_KQUEUE + char socketengine[] = "kqueue"; +#endif +#ifdef USE_SELECT + char socketengine[] = "select"; +#endif +#ifdef USE_EPOLL + char socketengine[] = "epoll"; +#endif + snprintf(versiondata,MAXBUF,"%s Rev. %s %s :%s (O=%lu) [SE=%s]",VERSION,v2,ServerName,SYSTEM,(unsigned long)OPTIMISATION,socketengine); return versiondata; } @@ -2949,44 +1771,11 @@ void DoSplitEveryone() } } } + has_been_netsplit = true; } -char islast(const char* s) -{ - char c = '`'; - for (int j = 0; j < 32; j++) - { - if (me[j] != NULL) - { - for (int k = 0; k < me[j]->connectors.size(); k++) - { - if (strcasecmp(me[j]->connectors[k].GetServerName().c_str(),s)) - { - c = '|'; - } - if (!strcasecmp(me[j]->connectors[k].GetServerName().c_str(),s)) - { - c = '`'; - } - } - } - } - return c; -} - -long map_count(const char* s) -{ - int c = 0; - for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++) - { - if ((i->second->fd) && (isnick(i->second->nick)) && (!strcasecmp(i->second->server,s))) c++; - } - return c; -} - - void force_nickchange(userrec* user,const char* newnick) { char nick[MAXBUF]; @@ -3278,21 +2067,18 @@ void process_command(userrec *user, char* cmd) } if ((user->registered == 7) && (!strchr(user->modes,'o'))) { - char* mycmd; - char* savept2; - mycmd = strtok_r(DisabledCommands," ",&savept2); - while (mycmd) + std::stringstream dcmds(DisabledCommands); + while (!dcmds.eof()) { - if (!strcasecmp(mycmd,command)) + std::string thiscmd; + dcmds >> thiscmd; + if (!strcasecmp(thiscmd.c_str(),command)) { // command is disabled! WriteServ(user->fd,"421 %s %s :This command has been disabled.",user->nick,command); return; } - mycmd = strtok_r(NULL," ",&savept2); } - - } if ((user->registered == 7) || (!strncmp(command,"USER",4)) || (!strncmp(command,"NICK",4)) || (!strncmp(command,"PASS",4))) { @@ -3337,22 +2123,6 @@ void process_command(userrec *user, char* cmd) } } - -void createcommand(char* cmd, handlerfunc f, char flags, int minparams,char* source) -{ - command_t comm; - /* create the command and push it onto the table */ - strlcpy(comm.command,cmd,MAXBUF); - strlcpy(comm.source,source,MAXBUF); - comm.handler_function = f; - comm.flags_needed = flags; - comm.min_params = minparams; - comm.use_count = 0; - comm.total_bytes = 0; - cmdlist.push_back(comm); - log(DEBUG,"Added command %s (%lu parameters)",cmd,(unsigned long)minparams); -} - bool removecommands(const char* source) { bool go_again = true; @@ -3373,61 +2143,6 @@ bool removecommands(const char* source) return true; } -void SetupCommandTable(void) -{ - createcommand("USER",handle_user,0,4,""); - createcommand("NICK",handle_nick,0,1,""); - createcommand("QUIT",handle_quit,0,0,""); - createcommand("VERSION",handle_version,0,0,""); - createcommand("PING",handle_ping,0,1,""); - createcommand("PONG",handle_pong,0,1,""); - createcommand("ADMIN",handle_admin,0,0,""); - createcommand("PRIVMSG",handle_privmsg,0,2,""); - createcommand("INFO",handle_info,0,0,""); - createcommand("TIME",handle_time,0,0,""); - createcommand("WHOIS",handle_whois,0,1,""); - createcommand("WALLOPS",handle_wallops,'o',1,""); - createcommand("NOTICE",handle_notice,0,2,""); - createcommand("JOIN",handle_join,0,1,""); - createcommand("NAMES",handle_names,0,0,""); - createcommand("PART",handle_part,0,1,""); - createcommand("KICK",handle_kick,0,2,""); - createcommand("MODE",handle_mode,0,1,""); - createcommand("TOPIC",handle_topic,0,1,""); - createcommand("WHO",handle_who,0,1,""); - createcommand("MOTD",handle_motd,0,0,""); - createcommand("RULES",handle_rules,0,0,""); - createcommand("OPER",handle_oper,0,2,""); - createcommand("LIST",handle_list,0,0,""); - createcommand("DIE",handle_die,'o',1,""); - createcommand("RESTART",handle_restart,'o',1,""); - createcommand("KILL",handle_kill,'o',2,""); - createcommand("REHASH",handle_rehash,'o',0,""); - createcommand("LUSERS",handle_lusers,0,0,""); - createcommand("STATS",handle_stats,0,1,""); - createcommand("USERHOST",handle_userhost,0,1,""); - createcommand("AWAY",handle_away,0,0,""); - createcommand("ISON",handle_ison,0,0,""); - createcommand("SUMMON",handle_summon,0,0,""); - createcommand("USERS",handle_users,0,0,""); - createcommand("INVITE",handle_invite,0,2,""); - createcommand("PASS",handle_pass,0,1,""); - createcommand("TRACE",handle_trace,'o',0,""); - createcommand("WHOWAS",handle_whowas,0,1,""); - createcommand("CONNECT",handle_connect,'o',1,""); - createcommand("SQUIT",handle_squit,'o',0,""); - createcommand("MODULES",handle_modules,0,0,""); - createcommand("LINKS",handle_links,0,0,""); - createcommand("MAP",handle_map,0,0,""); - createcommand("KLINE",handle_kline,'o',1,""); - createcommand("GLINE",handle_gline,'o',1,""); - createcommand("ZLINE",handle_zline,'o',1,""); - createcommand("QLINE",handle_qline,'o',1,""); - createcommand("ELINE",handle_eline,'o',1,""); - createcommand("LOADMODULE",handle_loadmodule,'o',1,""); - createcommand("UNLOADMODULE",handle_unloadmodule,'o',1,""); - createcommand("SERVER",handle_server,0,0,""); -} void process_buffer(const char* cmdbuf,userrec *user) { @@ -3489,7 +2204,7 @@ void DoSync(serverrec* serv, char* tcp_host) // send start of sync marker: Y // at this point the ircd receiving it starts broadcasting this netburst to all ircds // except the ones its receiving it from. - snprintf(data,MAXBUF,"Y %lu",(unsigned long)TIME); + snprintf(data,MAXBUF,"%s Y %lu",CreateSum().c_str(),(unsigned long)TIME); serv->SendPacket(data,tcp_host); // send users and channels @@ -3504,7 +2219,7 @@ void DoSync(serverrec* serv, char* tcp_host) { if (is_uline(me[j]->connectors[k].GetServerName().c_str())) { - snprintf(data,MAXBUF,"H %s",me[j]->connectors[k].GetServerName().c_str()); + snprintf(data,MAXBUF,"%s H %s",CreateSum().c_str(),me[j]->connectors[k].GetServerName().c_str()); serv->SendPacket(data,tcp_host); } } @@ -3512,17 +2227,17 @@ void DoSync(serverrec* serv, char* tcp_host) } // send our version for the remote side to cache - snprintf(data,MAXBUF,"v %s %s",ServerName,GetVersionString().c_str()); + snprintf(data,MAXBUF,"%s v %s %s",CreateSum().c_str(),ServerName,GetVersionString().c_str()); serv->SendPacket(data,tcp_host); // sync the users and channels, give the modules a look-in. for (user_hash::iterator u = clientlist.begin(); u != clientlist.end(); u++) { - snprintf(data,MAXBUF,"N %lu %s %s %s %s +%s %s %s :%s",(unsigned long)u->second->age,u->second->nick,u->second->host,u->second->dhost,u->second->ident,u->second->modes,u->second->ip,u->second->server,u->second->fullname); + snprintf(data,MAXBUF,"%s N %lu %s %s %s %s +%s %s %s :%s",CreateSum().c_str(),(unsigned long)u->second->age,u->second->nick,u->second->host,u->second->dhost,u->second->ident,u->second->modes,u->second->ip,u->second->server,u->second->fullname); serv->SendPacket(data,tcp_host); if (strchr(u->second->modes,'o')) { - snprintf(data,MAXBUF,"| %s %s",u->second->nick,u->second->oper); + snprintf(data,MAXBUF,"%s | %s %s",CreateSum().c_str(),u->second->nick,u->second->oper); serv->SendPacket(data,tcp_host); } for (int i = 0; i <= MODCOUNT; i++) @@ -3530,14 +2245,14 @@ void DoSync(serverrec* serv, char* tcp_host) string_list l = modules[i]->OnUserSync(u->second); for (int j = 0; j < l.size(); j++) { - strlcpy(data,l[j].c_str(),MAXBUF); + snprintf(data,MAXBUF,"%s %s",CreateSum().c_str(),l[j].c_str()); serv->SendPacket(data,tcp_host); } } char* chl = chlist(u->second,u->second); if (strcmp(chl,"")) { - snprintf(data,MAXBUF,"J %s %s",u->second->nick,chl); + snprintf(data,MAXBUF,"%s J %s %s",CreateSum().c_str(),u->second->nick,chl); serv->SendPacket(data,tcp_host); } } @@ -3551,27 +2266,27 @@ void DoSync(serverrec* serv, char* tcp_host) string_list l = modules[i]->OnChannelSync(c->second); for (int j = 0; j < l.size(); j++) { - strlcpy(data,l[j].c_str(),MAXBUF); + snprintf(data,MAXBUF,"%s %s",CreateSum().c_str(),l[j].c_str()); serv->SendPacket(data,tcp_host); } } if (c->second->topic[0]) { - snprintf(data,MAXBUF,"T %lu %s %s :%s",(unsigned long)c->second->topicset,c->second->setby,c->second->name,c->second->topic); + snprintf(data,MAXBUF,"%s T %lu %s %s :%s",CreateSum().c_str(),(unsigned long)c->second->topicset,c->second->setby,c->second->name,c->second->topic); serv->SendPacket(data,tcp_host); } // send current banlist for (BanList::iterator b = c->second->bans.begin(); b != c->second->bans.end(); b++) { - snprintf(data,MAXBUF,"M %s +b %s",c->second->name,b->data); + snprintf(data,MAXBUF,"%s M %s +b %s",CreateSum().c_str(),c->second->name,b->data); serv->SendPacket(data,tcp_host); } } // sync global zlines, glines, etc sync_xlines(serv,tcp_host); - snprintf(data,MAXBUF,"F %lu",(unsigned long)TIME); + snprintf(data,MAXBUF,"%s F %lu",CreateSum().c_str(),(unsigned long)TIME); serv->SendPacket(data,tcp_host); log(DEBUG,"Sent sync"); // ircd sends its serverlist after the end of sync here @@ -3653,6 +2368,7 @@ void DoSplit(const char* params) } } } + has_been_netsplit = true; } // removes a server. Will NOT remove its users! @@ -3735,9 +2451,10 @@ void erase_module(int j) bool UnloadModule(const char* filename) { + std::string filename_str = filename; for (int j = 0; j != module_names.size(); j++) { - if (module_names[j] == std::string(filename)) + if (module_names[j] == filename_str) { if (modules[j]->GetVersion().Flags & VF_STATIC) { @@ -3762,83 +2479,31 @@ bool UnloadModule(const char* filename) return false; } -bool DirValid(char* dirandfile) -{ - char work[MAXBUF]; - strlcpy(work,dirandfile,MAXBUF); - int p = strlen(work); - // we just want the dir - while (strlen(work)) - { - if (work[p] == '/') - { - work[p] = '\0'; - break; - } - work[p--] = '\0'; - } - char buffer[MAXBUF], otherdir[MAXBUF]; - // Get the current working directory - if( getcwd( buffer, MAXBUF ) == NULL ) - return false; - chdir(work); - if( getcwd( otherdir, MAXBUF ) == NULL ) - return false; - chdir(buffer); - if (strlen(otherdir) >= strlen(work)) - { - otherdir[strlen(work)] = '\0'; - if (!strcmp(otherdir,work)) - { - return true; - } - return false; - } - else return false; -} - -std::string GetFullProgDir(char** argv, int argc) -{ - char work[MAXBUF]; - strlcpy(work,argv[0],MAXBUF); - int p = strlen(work); - // we just want the dir - while (strlen(work)) - { - if (work[p] == '/') - { - work[p] = '\0'; - break; - } - work[p--] = '\0'; - } - char buffer[MAXBUF], otherdir[MAXBUF]; - // Get the current working directory - if( getcwd( buffer, MAXBUF ) == NULL ) - return ""; - chdir(work); - if( getcwd( otherdir, MAXBUF ) == NULL ) - return ""; - chdir(buffer); - return otherdir; -} - bool LoadModule(const char* filename) { char modfile[MAXBUF]; +#ifdef STATIC_LINK + snprintf(modfile,MAXBUF,"%s",filename); +#else snprintf(modfile,MAXBUF,"%s/%s",ModPath,filename); +#endif + std::string filename_str = filename; +#ifndef STATIC_LINK if (!DirValid(modfile)) { log(DEFAULT,"Module %s is not within the modules directory.",modfile); snprintf(MODERR,MAXBUF,"Module %s is not within the modules directory.",modfile); return false; } +#endif log(DEBUG,"Loading module: %s",modfile); +#ifndef STATIC_LINK if (FileExists(modfile)) { +#endif for (int j = 0; j < module_names.size(); j++) { - if (module_names[j] == std::string(filename)) + if (module_names[j] == filename_str) { log(DEFAULT,"Module %s is already loaded, cannot load a module twice!",modfile); snprintf(MODERR,MAXBUF,"Module already loaded"); @@ -3868,6 +2533,7 @@ bool LoadModule(const char* filename) snprintf(MODERR,MAXBUF,"Factory function failed!"); return false; } +#ifndef STATIC_LINK } else { @@ -3875,10 +2541,31 @@ bool LoadModule(const char* filename) snprintf(MODERR,MAXBUF,"Module file could not be found"); return false; } +#endif MODCOUNT++; return true; } + +bool GotServer(std::string name) +{ + for (int j = 0; j < 32; j++) + { + if (me[j] != NULL) + { + for (int k = 0; k < me[j]->connectors.size(); k++) + { + if (name == me[j]->connectors[k].GetServerName()) + { + return true; + } + } + } + } + return false; +} + + int InspIRCd(char** argv, int argc) { struct sockaddr_in client,server; @@ -3898,7 +2585,12 @@ int InspIRCd(char** argv, int argc) printf("ERROR: Could not write to logfile %s, bailing!\n\n",logpath.c_str()); Exit(ERROR); } + +#ifdef IS_CYGWIN + printf("Logging to ircd.log...\n"); +#else printf("Logging to %s...\n",logpath.c_str()); +#endif log(DEFAULT,"$Id$"); if (geteuid() == 0) @@ -3919,6 +2611,8 @@ int InspIRCd(char** argv, int argc) } log(DEBUG,"InspIRCd: startup: read config"); + AddServerName(ServerName); + int clientportcount = 0, serverportcount = 0; for (count = 0; count < ConfValueEnum("bind",&config_f); count++) @@ -3986,7 +2680,9 @@ int InspIRCd(char** argv, int argc) WritePID(PID); /* setup select call */ +#ifndef USE_KQUEUE FD_ZERO(&selectFds); +#endif log(DEBUG,"InspIRCd: startup: zero selects"); log(VERBOSE,"InspIRCd: startup: portCount = %lu", (unsigned long)portCount); @@ -4034,11 +2730,114 @@ int InspIRCd(char** argv, int argc) } } + // BUGFIX: We cannot initialize this before forking, as the kqueue data is not inherited by child processes! +#ifdef USE_KQUEUE + kq = kqueue(); + lkq = kqueue(); + skq = kqueue(); + if ((kq == -1) || (lkq == -1) || (skq == -1)) + { + log(DEFAULT,"main: kqueue() failed!"); + printf("ERROR: could not initialise kqueue event system. Shutting down.\n"); + Exit(ERROR); + } +#endif + +#ifdef USE_EPOLL + ep = epoll_create(MAXCLIENTS); + lep = epoll_create(32); + sep = epoll_create(128); + if ((ep == -1) || (lep == -1) || (sep == -1)) + { + log(DEFAULT,"main: epoll_create() failed!"); + printf("ERROR: could not initialise epoll event system. Shutting down.\n"); + Exit(ERROR); + } +#endif + +#ifdef USE_EPOLL + log(DEFAULT,"epoll socket engine is enabled. Filling listen list. boundPortcount=%d",boundPortCount); + for (count = 0; count < boundPortCount; count++) + { + struct epoll_event ev; + log(DEBUG,"epoll: Add listening socket to events, ep=%d socket=%d",lep,openSockfd[count]); + ev.events = EPOLLIN | EPOLLET; + ev.data.fd = openSockfd[count]; + int i = epoll_ctl(lep, EPOLL_CTL_ADD, openSockfd[count], &ev); + if (i < 0) + { + log(DEFAULT,"main: add listen ports, epoll_ctl failed!"); + printf("ERROR: could not initialise listening sockets in epoll list. Shutting down.\n"); + Exit(ERROR); + } + + } + for (int t = 0; t != SERVERportCount; t++) + { + struct epoll_event ev; + log(DEBUG,"epoll: Add listening server socket to events, ep=%d socket=%d",sep,me[t]->fd); + ev.events = EPOLLIN | EPOLLET; + ev.data.fd = me[t]->fd; + int i = epoll_ctl(sep, EPOLL_CTL_ADD, me[t]->fd, &ev); + if (i == -1) + { + log(DEFAULT,"main: add server listen ports, epoll_ctl failed!"); + printf("ERROR: could not initialise server listening sockets in epoll list. Shutting down.\n"); + Exit(ERROR); + } + } +#else +#ifdef USE_KQUEUE + log(DEFAULT,"kqueue socket engine is enabled. Filling listen list."); + for (count = 0; count < boundPortCount; count++) + { + struct kevent ke; + log(DEBUG,"kqueue: Add listening socket to events, kq=%d socket=%d",lkq,openSockfd[count]); + EV_SET(&ke, openSockfd[count], EVFILT_READ, EV_ADD, 0, MaxConn, NULL); + int i = kevent(lkq, &ke, 1, 0, 0, NULL); + if (i == -1) + { + log(DEFAULT,"main: add listen ports to kqueue failed!"); + printf("ERROR: could not initialise listening sockets in kqueue. Shutting down.\n"); + Exit(ERROR); + } + } + for (int t = 0; t != SERVERportCount; t++) + { + struct kevent ke; + if (me[t]) + { + log(DEBUG,"kqueue: Add listening SERVER socket to events, kq=%d socket=%d",skq,me[t]->fd); + EV_SET(&ke, me[t]->fd, EVFILT_READ, EV_ADD, 0, MaxConn, NULL); + int i = kevent(skq, &ke, 1, 0, 0, NULL); + if (i == -1) + { + log(DEFAULT,"main: add server listen ports to kqueue failed!"); + printf("ERROR: could not initialise listening server sockets in kqueue. Shutting down.\n"); + Exit(ERROR); + } + } + } + + +#else + log(DEFAULT,"Using standard select socket engine."); +#endif +#endif + WritePID(PID); length = sizeof (client); - char tcp_msg[MAXBUF],tcp_host[MAXBUF]; + char tcp_msg[MAXBUF],tcp_host[MAXBUF],tcp_sum[MAXBUF]; +#ifdef USE_KQUEUE + struct kevent ke; + struct kevent ke_list[33]; + struct timespec ts; +#endif +#ifdef USE_EPOLL + struct epoll_event event[33]; +#endif fd_set serverfds; timeval tvs; tvs.tv_usec = 10000L; @@ -4051,7 +2850,7 @@ int InspIRCd(char** argv, int argc) tval.tv_usec = 10000L; tval.tv_sec = 0; int total_in_this_set = 0; - int v = 0; + int i = 0, v = 0, j = 0, cycle_iter = 0; bool expire_run = false; /* main loop, this never returns */ @@ -4060,17 +2859,38 @@ int InspIRCd(char** argv, int argc) #ifdef _POSIX_PRIORITY_SCHEDULING sched_yield(); #endif - // poll dns queue - dns_poll(); +#ifdef USE_SELECT FD_ZERO(&sfd); - +#endif // we only read time() once per iteration rather than tons of times! + OLDTIME = TIME; TIME = time(NULL); + dns_poll(); + // *FIX* Instead of closing sockets in kill_link when they receive the ERROR :blah line, we should queue // them in a list, then reap the list every second or so. if (((TIME % 5) == 0) && (!expire_run)) { + for (int i = 0; i < ConfValueEnum("link",&config_f); i++) + { + char Link_ServerName[MAXBUF],Link_AConn[MAXBUF]; + ConfValue("link","name",i,Link_ServerName,&config_f); + ConfValue("link","autoconnect",i,Link_AConn,&config_f); + if ((Link_AConn[0]) && (!GotServer(Link_ServerName))) + { + autoconnects::iterator a = autoconns.find(std::string(Link_ServerName)); + if (a != autoconns.end()) + { + if (TIME > a->second) + { + ConnectServer(Link_ServerName,NULL); + a->second = TIME + atoi(Link_AConn); + } + } + } + } + expire_lines(); FOREACH_MOD OnBackgroundTimer(TIME); expire_run = true; @@ -4082,25 +2902,46 @@ int InspIRCd(char** argv, int argc) // fix by brain - this must be below any manipulation of the hashmap by modules user_hash::iterator count2 = clientlist.begin(); +#ifdef USE_EPOLL + i = epoll_wait(sep, event, 1, EP_DELAY); + if (i > 0) + { + log(DEBUG,"epoll: Listening server socket event, i=%d, event.data.fd=%d",i,event[0].data.fd); + for (int x = 0; x != SERVERportCount; x++) + { + if ((me[x]) && (event[0].data.fd == me[x]->fd)) + { +#endif +#ifdef USE_KQUEUE + ts.tv_sec = 0; + ts.tv_nsec = 30000L; + i = kevent(skq, NULL, 0, &ke, 1, &ts); + if (i > 0) + { + log(DEBUG,"kqueue: Listening server socket event, i=%d, ke.ident=%d",i,ke.ident); + for (int x = 0; x != SERVERportCount; x++) + { + if ((me[x]) && (ke.ident == me[x]->fd)) + { + +#endif +#ifdef USE_SELECT FD_ZERO(&serverfds); - for (int x = 0; x != SERVERportCount; x++) { if (me[x]) FD_SET(me[x]->fd, &serverfds); } - - // serverFds timevals went here - tvs.tv_usec = 30000L; tvs.tv_sec = 0; - int servresult = select(32767, &serverfds, NULL, NULL, &tvs); + int servresult = select(FD_SETSIZE, &serverfds, NULL, NULL, &tvs); if (servresult > 0) { for (int x = 0; x != SERVERportCount; x++) { if ((me[x]) && (FD_ISSET (me[x]->fd, &serverfds))) { +#endif char remotehost[MAXBUF],resolved[MAXBUF]; length = sizeof (client); incomingSockfd = accept (me[x]->fd, (sockaddr *) &client, &length); @@ -4119,18 +2960,24 @@ int InspIRCd(char** argv, int argc) } } + std::deque msgs; + std::deque sums; for (int x = 0; x < SERVERportCount; x++) { - std::deque msgs; + if (me[x]) + me[x]->FlushWriteBuffers(); + sums.clear(); msgs.clear(); - if ((me[x]) && (me[x]->RecvPacket(msgs, tcp_host))) + while ((me[x]) && (me[x]->RecvPacket(msgs, tcp_host, sums))) // returns 0 or more lines (can be multiple lines!) { + has_been_netsplit = false; for (int ctr = 0; ctr < msgs.size(); ctr++) { strlcpy(tcp_msg,msgs[ctr].c_str(),MAXBUF); + strlcpy(tcp_sum,sums[ctr].c_str(),MAXBUF); log(DEBUG,"Processing: %s",tcp_msg); if (!tcp_msg[0]) - { + { log(DEBUG,"Invalid string from %s [route%lu]",tcp_host,(unsigned long)x); break; } @@ -4141,25 +2988,33 @@ int InspIRCd(char** argv, int argc) { if ((tcp_msg[0] != 'Y') && (tcp_msg[0] != 'X') && (tcp_msg[0] != 'F')) { - NetSendToAllExcept(tcp_host,tcp_msg); + NetSendToAllExcept_WithSum(tcp_host,tcp_msg,tcp_sum); } } else - NetSendToAllExcept(tcp_host,tcp_msg); + NetSendToAllExcept_WithSum(tcp_host,tcp_msg,tcp_sum); } std::string msg = tcp_msg; FOREACH_MOD OnPacketReceive(msg,tcp_host); strlcpy(tcp_msg,msg.c_str(),MAXBUF); - handle_link_packet(tcp_msg, tcp_host, me[x]); + if (me[x]) + handle_link_packet(tcp_msg, tcp_host, me[x], tcp_sum); + if (!me[x]->FindHost(tcp_host)) + { + log(DEBUG,"Connector gone, bailing!"); + goto label; + } } goto label; } } - while (count2 != clientlist.end()) { +#ifdef USE_SELECT FD_ZERO(&sfd); +#endif + total_in_this_set = 0; user_hash::iterator xcount = count2; @@ -4172,6 +3027,9 @@ int InspIRCd(char** argv, int argc) if (count2->second) curr = count2->second; + if ((long)curr == -1) + goto label; + if ((curr) && (curr->fd != 0)) { #ifdef _POSIX_PRIORITY_SCHEDULING @@ -4182,14 +3040,26 @@ int InspIRCd(char** argv, int argc) // // This should be up to 64x faster than the // old implementation. - while (total_in_this_set < 64) +#ifdef USE_SELECT + while (total_in_this_set < 1024) { if (count2 != clientlist.end()) { curr = count2->second; + if ((long)curr == -1) + goto label; + int currfd = curr->fd; // we don't check the state of remote users. - if ((curr->fd != -1) && (curr->fd != FD_MAGIC_NUMBER)) + if ((currfd != -1) && (currfd != FD_MAGIC_NUMBER)) { + curr->FlushWriteBuf(); + if (curr->GetWriteError() != "") + { + log(DEBUG,"InspIRCd: write error: %s",curr->GetWriteError().c_str()); + kill_link(curr,curr->GetWriteError().c_str()); + goto label; + } + FD_SET (curr->fd, &sfd); // registration timeout -- didnt send USER/NICK/HOST in the time specified in @@ -4206,13 +3076,15 @@ int InspIRCd(char** argv, int argc) curr->dns_done = true; statsDnsBad++; FullConnectUser(curr); - goto label; + if (fd_ref_table[currfd] != curr) // something changed, bail pronto + goto label; } if ((curr->dns_done) && (curr->registered == 3) && (AllModulesReportReady(curr))) // both NICK and USER... and DNS { log(DEBUG,"dns done, registered=3, and modules ready, OK"); FullConnectUser(curr); - goto label; + if (fd_ref_table[currfd] != curr) // something changed, bail pronto + goto label; } if ((TIME > curr->nping) && (isnick(curr->nick)) && (curr->registered == 7)) { @@ -4233,28 +3105,129 @@ int InspIRCd(char** argv, int argc) } else break; } - endingiter = count2; count2 = xcount; // roll back to where we were - - v = 0; +#else + // KQUEUE and EPOLL: We don't go through a loop to fill the fd_set so instead we must manually do this loop every now and again. + // TODO: We dont need to do all this EVERY loop iteration, tone down the visits to this if we're using kqueue. + cycle_iter++; + if (cycle_iter > 20) while (count2 != clientlist.end()) + { + cycle_iter = 0; + if (count2 != clientlist.end()) + { + curr = count2->second; + if ((long)curr == -1) + goto label; + int currfd = curr->fd; + // we don't check the state of remote users. + if ((currfd != -1) && (currfd != FD_MAGIC_NUMBER)) + { - // tvals defined here + curr->FlushWriteBuf(); + if (curr->GetWriteError() != "") + { + log(DEBUG,"InspIRCd: write error: %s",curr->GetWriteError().c_str()); + kill_link(curr,curr->GetWriteError().c_str()); + goto label; + } + + // registration timeout -- didnt send USER/NICK/HOST in the time specified in + // their connection class. + if ((TIME > curr->timeout) && (curr->registered != 7)) + { + log(DEBUG,"InspIRCd: registration timeout: %s",curr->nick); + kill_link(curr,"Registration timeout"); + goto label; + } + if ((TIME > curr->signon) && (curr->registered == 3) && (AllModulesReportReady(curr))) + { + log(DEBUG,"signon exceed, registered=3, and modules ready, OK: %d %d",TIME,curr->signon); + curr->dns_done = true; + statsDnsBad++; + FullConnectUser(curr); + if (fd_ref_table[currfd] != curr) // something changed, bail pronto + goto label; + } + if ((curr->dns_done) && (curr->registered == 3) && (AllModulesReportReady(curr))) + { + log(DEBUG,"dns done, registered=3, and modules ready, OK"); + FullConnectUser(curr); + if (fd_ref_table[currfd] != curr) // something changed, bail pronto + goto label; + } + if ((TIME > curr->nping) && (isnick(curr->nick)) && (curr->registered == 7)) + { + if ((!curr->lastping) && (curr->registered == 7)) + { + log(DEBUG,"InspIRCd: ping timeout: %s",curr->nick); + kill_link(curr,"Ping timeout"); + goto label; + } + Write(curr->fd,"PING :%s",ServerName); + log(DEBUG,"InspIRCd: pinging: %s",curr->nick); + curr->lastping = 0; + curr->nping = TIME+curr->pingmax; // was hard coded to 120 + } + } + } + else break; + count2++; + } + // increment the counter right to the end of the list, as kqueue processes everything in one go +#endif + + v = 0; +#ifdef USE_EPOLL + int i = epoll_wait(ep, event, 1, 5); + if (i > 0) + { + log(DEBUG,"epoll_wait call: ep=%d, i=%d",ep,i); + // EPOLL: we asked epoll_wait for ONE fd which is ready. Do something. + userrec* cu = fd_ref_table[event[0].data.fd]; +#endif +#ifdef USE_KQUEUE + ts.tv_sec = 0; + ts.tv_nsec = 1000L; + // for now, we only read 1 event. We could read soooo many more :) + int i = kevent(kq, NULL, 0, &ke, 1, &ts); + if (i > 0) + { + log(DEBUG,"kevent call: kq=%d, i=%d",kq,i); + // KQUEUE: kevent gives us ONE fd which is ready to have something done to it. Do something to it. + userrec* cu = fd_ref_table[ke.ident]; +#endif +#ifdef USE_SELECT + tval.tv_sec = 0; tval.tv_usec = 1000L; - selectResult2 = select(65535, &sfd, NULL, NULL, &tval); - + selectResult2 = select(FD_SETSIZE, &sfd, NULL, NULL, &tval); // now loop through all of the items in this pool if any are waiting - if (selectResult2 > 0) + if ((selectResult2 > 0) && (xcount != clientlist.end())) for (user_hash::iterator count2a = xcount; count2a != endingiter; count2a++) { + // SELECT: we have to iterate... + if (count2a == clientlist.end()) + break; + userrec* cu = count2a->second; +#endif #ifdef _POSIX_PRIORITY_SCHEDULING sched_yield(); #endif - userrec* cu = count2a->second; result = EAGAIN; +#ifdef USE_EPOLL + // EPOLL: We already know we have a valid FD. No checks needed. + if ((cu->fd != FD_MAGIC_NUMBER) && (cu->fd != -1)) +#endif +#ifdef USE_KQUEUE + // KQUEUE: We already know we have a valid FD. No checks needed. + if ((cu->fd != FD_MAGIC_NUMBER) && (cu->fd != -1)) +#endif +#ifdef USE_SELECT + // SELECT: We don't know if our FD is valid. if ((cu->fd != FD_MAGIC_NUMBER) && (cu->fd != -1) && (FD_ISSET (cu->fd, &sfd))) +#endif { log(DEBUG,"Data waiting on socket %d",cu->fd); int MOD_RESULT = 0; @@ -4262,7 +3235,7 @@ int InspIRCd(char** argv, int argc) FOREACH_RESULT(OnRawSocketRead(cu->fd,data,65535,result2)); if (!MOD_RESULT) { - result = read(cu->fd, data, 65535); + result = cu->ReadData(data, 65535); } else result = result2; log(DEBUG,"Read result: %d",result); @@ -4283,6 +3256,7 @@ int InspIRCd(char** argv, int argc) int currfd = current->fd; int floodlines = 0; // add the data to the users buffer + if (result > 0) if (!current->AddBuffer(data)) { // AddBuffer returned false, theres too much data in the user's buffer and theyre up to no good. @@ -4392,14 +3366,18 @@ int InspIRCd(char** argv, int argc) else if (result == 0) { +#ifdef USE_SELECT if (count2->second) { +#endif log(DEBUG,"InspIRCd: Exited: %s",cu->nick); kill_link(cu,"Client exited"); // must bail here? kill_link removes the hash, corrupting the iterator log(DEBUG,"Bailing from client exit"); goto label; +#ifdef USE_SELECT } +#endif } else if (result > 0) { @@ -4416,6 +3394,7 @@ int InspIRCd(char** argv, int argc) sched_yield(); #endif +#ifdef USE_SELECT // set up select call for (count = 0; count < boundPortCount; count++) { @@ -4428,11 +3407,38 @@ int InspIRCd(char** argv, int argc) /* select is reporting a waiting socket. Poll them all to find out which */ if (selectResult > 0) { - char target[MAXBUF], resolved[MAXBUF]; - for (count = 0; count < boundPortCount; count++) + for (count = 0; count < boundPortCount; count++) { if (FD_ISSET (openSockfd[count], &selectFds)) { +#endif +#ifdef USE_KQUEUE + ts.tv_sec = 0; + ts.tv_nsec = 30000L; + i = kevent(lkq, NULL, 0, ke_list, 32, &ts); + if (i > 0) for (j = 0; j < i; j++) + { + log(DEBUG,"kqueue: Listening socket event, i=%d, ke.ident=%d",i,ke_list[j].ident); + // this isnt as efficient as it could be, we could create a reference table + // to reference bound ports by fd, but this isnt a big bottleneck as the actual + // number of listening ports on the average ircd is a small number (less than 20) + // compared to the number of clients (possibly over 2000) + for (count = 0; count < boundPortCount; count++) + { + if (ke_list[j].ident == openSockfd[count]) + { +#endif +#ifdef USE_EPOLL + i = epoll_wait(lep, event, 32, EP_DELAY); + if (i > 0) for (j = 0; j < i; j++) + { + log(DEBUG,"epoll: Listening socket event, i=%d,events[j].data.fd=%d",i,event[j].data.fd); + for (count = 0; count < boundPortCount; count++) + { + if (event[j].data.fd == openSockfd[count]) + { +#endif + char target[MAXBUF], resolved[MAXBUF]; length = sizeof (client); incomingSockfd = accept (openSockfd[count], (struct sockaddr *) &client, &length); @@ -4452,7 +3458,6 @@ int InspIRCd(char** argv, int argc) AddClient(incomingSockfd, resolved, ports[count], false, inet_ntoa (client.sin_addr)); log(DEBUG,"InspIRCd: adding client on port %lu fd=%lu",(unsigned long)ports[count],(unsigned long)incomingSockfd); } - goto label; } } }