X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Finspircd.cpp;h=4464be7559dbab30c4a8bd7b1891baceb3f39f51;hb=55bd1494b060dba7c266b91824f3fcce64a4d7a8;hp=27325901931bc9b9acc11075bfd500a0902d4d9e;hpb=9a3475ed584b09c221219b306611c0b691161a08;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/inspircd.cpp b/src/inspircd.cpp index 273259019..4464be755 100644 --- a/src/inspircd.cpp +++ b/src/inspircd.cpp @@ -27,7 +27,11 @@ using namespace std; #include #include #include -#include +#ifdef USE_KQUEUE +#include +#include +#include +#endif #include #include #ifdef GCC3 @@ -38,10 +42,7 @@ using namespace std; #include #include #include -#include #include -#include -#include #include #include "connection.h" #include "users.h" @@ -57,12 +58,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]; @@ -98,82 +95,30 @@ bool AllowFounder = true; extern std::vector modules; std::vector module_names; extern std::vector factory; -std::vector fd_reap; extern int MODCOUNT; 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 +#ifdef USE_KQUEUE +int kq, lkq, skq; #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 -#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); - 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); - } - -}; +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; +// This table references users by file descriptor. +// its an array to make it VERY fast, as all lookups are referenced +// by an integer, meaning there is no need for a scan/search operation. +userrec* fd_ref_table[65536]; -typedef nspace::hash_map, StrHashComp> user_hash; -typedef nspace::hash_map, StrHashComp> chan_hash; -typedef nspace::hash_map, InAddr_HashComp> address_cache; -typedef std::deque command_table; +int statsAccept = 0, statsRefused = 0, statsUnknown = 0, statsCollisions = 0, statsDns = 0, statsDnsGood = 0, statsDnsBad = 0, statsConnects = 0, statsSent= 0, statsRecv = 0; serverrec* me[32]; @@ -181,7 +126,7 @@ FILE *log_file; user_hash clientlist; chan_hash chanlist; -user_hash whowas; +whowas_hash whowas; command_table cmdlist; file_cache MOTD; file_cache RULES; @@ -192,14 +137,10 @@ ClassVector Classes; struct linger linger = { 0 }; char MyExecutable[1024]; int boundPortCount = 0; -int portCount = 0, UDPportCount = 0, ports[MAXSOCKS]; +int portCount = 0, SERVERportCount = 0, ports[MAXSOCKS]; int defaultRoute = 0; char ModPath[MAXBUF]; -connection C; - -long MyKey = C.GenKey(); - /* prototypes */ int has_channel(userrec *u, chanrec *c); @@ -212,17 +153,38 @@ void AddWhoWas(userrec* u); std::vector auth_cookies; std::stringstream config_f(stringstream::in | stringstream::out); +std::vector all_opers; + +char lowermap[255]; +void AddOper(userrec* user) +{ + log(DEBUG,"Oper added to optimization list"); + all_opers.push_back(user); +} + +void DeleteOper(userrec* user) +{ + for (std::vector::iterator a = all_opers.begin(); a < all_opers.end(); a++) + { + if (*a == user) + { + log(DEBUG,"Oper removed from optimization list"); + all_opers.erase(a); + return; + } + } +} long GetRevision() { char Revision[] = "$Revision$"; char *s1 = Revision; char *savept; - char *v1 = strtok_r(s1," ",&savept); - s1 = savept; char *v2 = strtok_r(s1," ",&savept); s1 = savept; + v2 = strtok_r(s1," ",&savept); + s1 = savept; return (long)(atof(v2)*10000); } @@ -257,71 +219,10 @@ 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[strlen(b)-1] = ':'; - 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 (!strcmp(linebuf,"")) - { - 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, %d lines",fname,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]; + char AH[MAXBUF],AP[MAXBUF],AF[MAXBUF],DNT[MAXBUF],pfreq[MAXBUF],thold[MAXBUF],sqmax[MAXBUF],rqmax[MAXBUF]; ConnectClass c; std::stringstream errstr; @@ -387,9 +288,9 @@ void ReadConfig(bool bail, userrec* user) dns_timeout = atoi(DNT); if (!dns_timeout) dns_timeout = 5; - if (!strcmp(DNSServer,"")) + if (!DNSServer[0]) strlcpy(DNSServer,"127.0.0.1",MAXBUF); - if (!strcmp(ModPath,"")) + if (!ModPath[0]) strlcpy(ModPath,MOD_PATH,MAXBUF); AllowHalfop = ((!strcasecmp(AH,"true")) || (!strcasecmp(AH,"1")) || (!strcasecmp(AH,"yes"))); AllowProtect = ((!strcasecmp(AP,"true")) || (!strcasecmp(AP,"1")) || (!strcasecmp(AP,"yes"))); @@ -426,7 +327,10 @@ void ReadConfig(bool bail, userrec* user) ConfValue("connect","timeout",i,timeout,&config_f); ConfValue("connect","flood",i,flood,&config_f); ConfValue("connect","pingfreq",i,pfreq,&config_f); - if (strcmp(Value,"")) + 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); c.type = CC_ALLOW; @@ -436,6 +340,21 @@ void ReadConfig(bool bail, userrec* user) c.registration_timeout = 90; // default is 2 minutes 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); @@ -445,7 +364,7 @@ void ReadConfig(bool bail, userrec* user) c.pingtime = atoi(pfreq); } Classes.push_back(c); - log(DEBUG,"Read connect class type ALLOW, host=%s password=%s timeout=%d flood=%d",c.host,c.pass,c.registration_timeout,c.flood); + 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 { @@ -461,7 +380,7 @@ void ReadConfig(bool bail, userrec* user) read_xline_defaults(); log(DEFAULT,"Applying K lines, Q lines and Z lines..."); apply_lines(); - log(DEFAULT,"Done reading configuration file, InspIRCd is now running."); + log(DEFAULT,"Done reading configuration file, InspIRCd is now starting."); if (!bail) { log(DEFAULT,"Adding and removing modules due to rehash..."); @@ -480,965 +399,64 @@ void ReadConfig(bool bail, userrec* user) 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 %d of %d modules and loaded %d of %d modules.",rem,removed_modules.size(),add,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); - snprintf(tb,MAXBUF,"%s\r\n",textbuffer); - chop(tb); - if (sock != -1) - { - write(sock,tb,strlen(tb)); - } -} - -/* 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); - snprintf(tb,MAXBUF,":%s %s\r\n",ServerName,textbuffer); - chop(tb); - if (sock != -1) - { - write(sock,tb,strlen(tb)); - } -} - -/* 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); - snprintf(tb,MAXBUF,":%s!%s@%s %s\r\n",user->nick,user->ident,user->dhost,textbuffer); - chop(tb); - if (sock != -1) - { - write(sock,tb,strlen(tb)); - } -} - -/* 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); - for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++) - { - if (has_channel(i->second,Ptr)) - { - if (i->second->fd != FD_MAGIC_NUMBER) - WriteTo(user,i->second,"%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); - for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++) - { - if (has_channel(i->second,Ptr)) - { - if ((i->second->fd != -1) && (i->second->fd != FD_MAGIC_NUMBER)) - { - if (!user) - { - WriteServ(i->second->fd,"%s",textbuffer); - } - else - { - WriteTo(user,i->second,"%s",textbuffer); - } - } - } - } -} - - -void WriteChannelWithServ(char* ServerName, chanrec* Ptr, userrec* user, char* text, ...) -{ - if ((!Ptr) || (!user) || (!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); - for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++) - { - if (i->second) - { - if ((has_channel(i->second,Ptr)) && (i->second->fd != FD_MAGIC_NUMBER)) - { - WriteServ(i->second->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); - - for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++) - { - if (i->second) - { - if ((has_channel(i->second,Ptr)) && (user != i->second) && (i->second->fd != FD_MAGIC_NUMBER)) - { - WriteTo(user,i->second,"%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); - - WriteFrom(u->fd,u,"%s",textbuffer); - - for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++) - { - if (i->second) - { - if ((common_channels(u,i->second) && (i->second != u)) && (i->second->fd != FD_MAGIC_NUMBER)) - { - WriteFrom(i->second->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); - - for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++) - { - if (i->second) - { - if ((common_channels(u,i->second)) && (u != i->second)) - { - WriteFrom(i->second->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 (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,'o')) - { - if (strchr(i->second->modes,'s')) - { - // send server notices to all with +s - // (TODO: needs SNOMASKs) - WriteServ(i->second->fd,"NOTICE %s :%s",i->second->nick,textbuffer); - } - } - } - } -} - -// returns TRUE of any users on channel C occupy server 'servername'. - -bool ChanAnyOnThisServer(chanrec *c,char* servername) -{ - log(DEBUG,"ChanAnyOnThisServer"); - for (user_hash::iterator i = clientlist.begin(); i != clientlist.end(); i++) - { - if (has_channel(i->second,c)) - { - if (!strcasecmp(i->second->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 (user_hash::iterator i = clientlist.begin(); i != clientlist.end(); i++) - { - if ((common_channels(u,i->second)) && (u != i->second)) - { - if (!strcasecmp(i->second->server,servername)) - { - log(DEBUG,"%s is common to %s sharing with %s",i->second->nick,servername,u->nick); - 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); - - 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 < strlen(modes); 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 < strlen(modes); 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 WriteWallOps(userrec *source, bool local_only, char* text, ...) -{ - if ((!text) || (!source)) - { - log(DEFAULT,"*** BUG *** WriteOpers was given an invalid parameter"); - return; - } - - int i = 0; - 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; i != strlen(n); 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; - } - - chan_hash::iterator iter = chanlist.find(chan); - - if (iter == chanlist.end()) - /* Couldn't find it */ - return NULL; - - return iter->second; -} - - -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)) - { - ConfValue("banlist","limit",count,CM,&config_f); - return atoi(CM); - } - } - return 64; -} - - -void purge_empty_chans(void) -{ - int go_again = 1, purge = 0; - - while (go_again) - { - go_again = 0; - for (chan_hash::iterator i = chanlist.begin(); i != chanlist.end(); i++) - { - if (i->second) { - if (!usercount(i->second)) - { - /* kill the record */ - if (i != chanlist.end()) - { - log(DEBUG,"del_channel: destroyed: %s",i->second->name); - if (i->second) - delete i->second; - chanlist.erase(i); - go_again = 1; - purge++; - break; - } - } - else - { - log(DEBUG,"skipped purge for %s",i->second->name); - } - } - } - } - log(DEBUG,"completed channel purge, killed %d",purge); -} - - -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 (strcmp(chan->key,"")) - { - 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 (strcmp(chan->key,"")) - { - strlcat(sparam," ",MAXBUF); - strlcat(sparam,chan->key,MAXBUF); - } - if (chan->limit) - { - char foo[24]; - sprintf(foo," %d",chan->limit); - strlcat(sparam,foo,MAXBUF); - } - if (strlen(chan->custom_modes)) - { - strlcat(scratch,chan->custom_modes,MAXMODES); - for (int z = 0; z < strlen(chan->custom_modes); z++) + + // 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++) { - std::string extparam = chan->GetModeParameter(chan->custom_modes[z]); - if (extparam != "") + bool added = true; + for (std::vector::iterator old = old_module_names.begin(); old != old_module_names.end(); old++) { - strlcat(sparam," ",MAXBUF); - strlcat(sparam,extparam.c_str(),MAXBUF); + if (*old == *_new) + added = false; } + if (added) + added_modules.push_back(*_new); } - } - 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)) + for (std::vector::iterator oldm = old_module_names.begin(); oldm != old_module_names.end(); oldm++) { - if (isnick(i->second->nick)) + bool removed = true; + for (std::vector::iterator newm = new_module_names.begin(); newm != new_module_names.end(); newm++) { - 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); - } + if (*newm == *oldm) + removed = false; } + if (removed) + removed_modules.push_back(*oldm); } - } - /* 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 i = 0; - 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) + // 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 (has_channel(i->second,c)) + if (UnloadModule(removing->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 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()); } } - } - log(DEBUG,"usercount_i: %s %d",c->name,count); - return count; -} - - -int usercount(chanrec *c) -{ - int i = 0; - int count = 0; - - if (!c) - { - log(DEFAULT,"*** BUG *** usercount 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)) && (i->second->registered == 7)) - { - 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: %s %d",c->name,count); - return count; } @@ -1453,7 +471,6 @@ chanrec* add_channel(userrec *user, const char* cn, const char* key, bool overri return 0; } - int i = 0; chanrec* Ptr; int created = 0; char cname[MAXBUF]; @@ -1478,7 +495,7 @@ chanrec* add_channel(userrec *user, const char* cn, const char* key, bool overri if (!FindChan(cname)) { - int MOD_RESULT = 0; + MOD_RESULT = 0; FOREACH_RESULT(OnUserPreJoin(user,NULL,cname)); if (MOD_RESULT == 1) { return NULL; @@ -1490,8 +507,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); @@ -1517,7 +533,7 @@ chanrec* add_channel(userrec *user, const char* cn, const char* key, bool overri if ((!override) || (!strcasecmp(user->server,ServerName))) { log(DEBUG,"Not overriding..."); - int MOD_RESULT = 0; + MOD_RESULT = 0; FOREACH_RESULT(OnUserPreJoin(user,Ptr,cname)); if (MOD_RESULT == 1) { return NULL; @@ -1527,72 +543,86 @@ chanrec* add_channel(userrec *user, const char* cn, const char* key, bool overri if (!MOD_RESULT) { log(DEBUG,"add_channel: checking key, invite, etc"); - if (strcmp(Ptr->key,"")) + MOD_RESULT = 0; + FOREACH_RESULT(OnCheckKey(user, Ptr, key ? key : "")); + if (MOD_RESULT == 0) { - log(DEBUG,"add_channel: %s has key %s",Ptr->name,Ptr->key); - if (!key) - { - log(DEBUG,"add_channel: no key given in JOIN"); - WriteServ(user->fd,"475 %s %s :Cannot join channel (Requires key)",user->nick, Ptr->name); - return NULL; - } - else + if (Ptr->key[0]) { - log(DEBUG,"key at %p is %s",key,key); - if (strcasecmp(key,Ptr->key)) + log(DEBUG,"add_channel: %s has key %s",Ptr->name,Ptr->key); + if (!key) { - log(DEBUG,"add_channel: bad key given in JOIN"); - WriteServ(user->fd,"475 %s %s :Cannot join channel (Incorrect key)",user->nick, Ptr->name); + log(DEBUG,"add_channel: no key given in JOIN"); + WriteServ(user->fd,"475 %s %s :Cannot join channel (Requires key)",user->nick, Ptr->name); return NULL; } + else + { + if (strcasecmp(key,Ptr->key)) + { + log(DEBUG,"add_channel: bad key given in JOIN"); + WriteServ(user->fd,"475 %s %s :Cannot join channel (Incorrect key)",user->nick, Ptr->name); + return NULL; + } + } } + log(DEBUG,"add_channel: no key"); } - log(DEBUG,"add_channel: no key"); - - if (Ptr->inviteonly) + MOD_RESULT = 0; + FOREACH_RESULT(OnCheckInvite(user, Ptr)); + if (MOD_RESULT == 0) { - log(DEBUG,"add_channel: channel is +i"); - if (user->IsInvited(Ptr->name)) + if (Ptr->binarymodes & CM_INVITEONLY) { - /* user was invited to channel */ - /* there may be an optional channel NOTICE here */ - } - else - { - WriteServ(user->fd,"473 %s %s :Cannot join channel (Invite only)",user->nick, Ptr->name); - return NULL; + log(DEBUG,"add_channel: channel is +i"); + if (user->IsInvited(Ptr->name)) + { + /* user was invited to channel */ + /* there may be an optional channel NOTICE here */ + } + else + { + WriteServ(user->fd,"473 %s %s :Cannot join channel (Invite only)",user->nick, Ptr->name); + return NULL; + } } + log(DEBUG,"add_channel: channel is not +i"); } - log(DEBUG,"add_channel: channel is not +i"); - - if (Ptr->limit) + MOD_RESULT = 0; + FOREACH_RESULT(OnCheckLimit(user, Ptr)); + if (MOD_RESULT == 0) { - if (usercount(Ptr) == Ptr->limit) + if (Ptr->limit) { - WriteServ(user->fd,"471 %s %s :Cannot join channel (Channel is full)",user->nick, Ptr->name); - return NULL; + if (usercount(Ptr) >= Ptr->limit) + { + WriteServ(user->fd,"471 %s %s :Cannot join channel (Channel is full)",user->nick, Ptr->name); + return NULL; + } } } - log(DEBUG,"add_channel: about to walk banlist"); - - /* check user against the channel banlist */ - if (Ptr) + MOD_RESULT = 0; + FOREACH_RESULT(OnCheckBan(user, Ptr)); + if (MOD_RESULT == 0) { - if (Ptr->bans.size()) + /* check user against the channel banlist */ + if (Ptr) { - for (BanList::iterator i = Ptr->bans.begin(); i != Ptr->bans.end(); i++) + if (Ptr->bans.size()) { - if (match(user->GetFullHost(),i->data)) + for (BanList::iterator i = Ptr->bans.begin(); i != Ptr->bans.end(); i++) { - WriteServ(user->fd,"474 %s %s :Cannot join channel (You're banned)",user->nick, Ptr->name); - return NULL; + if (match(user->GetFullHost(),i->data)) + { + WriteServ(user->fd,"474 %s %s :Cannot join channel (You're banned)",user->nick, Ptr->name); + return NULL; + } } } } + log(DEBUG,"add_channel: bans checked"); } - - log(DEBUG,"add_channel: bans checked"); } @@ -1617,23 +647,24 @@ chanrec* add_channel(userrec *user, const char* cn, const char* key, bool overri log(DEBUG,"Passed channel checks"); - for (int i =0; i != MAXCHANS; i++) + for (int index =0; index != MAXCHANS; index++) { - log(DEBUG,"Check location %d",i); - if (user->chans[i].channel == NULL) + log(DEBUG,"Check location %d",index); + if (user->chans[index].channel == NULL) { - log(DEBUG,"Adding into their channel list at location %d",i); + log(DEBUG,"Adding into their channel list at location %d",index); if (created == 2) { /* first user in is given ops */ - user->chans[i].uc_modes = UCMODE_OP; + user->chans[index].uc_modes = UCMODE_OP; } else { - user->chans[i].uc_modes = 0; + user->chans[index].uc_modes = 0; } - user->chans[i].channel = Ptr; + user->chans[index].channel = Ptr; + Ptr->AddUser((char*)user); WriteChannel(Ptr,user,"JOIN :%s",Ptr->name); if (!override) // we're not overriding... so this isnt part of a netburst, broadcast it. @@ -1656,12 +687,12 @@ chanrec* add_channel(userrec *user, const char* cn, const char* key, bool overri if (Ptr->topicset) { WriteServ(user->fd,"332 %s %s :%s", user->nick, Ptr->name, Ptr->topic); - WriteServ(user->fd,"333 %s %s %s %d", user->nick, Ptr->name, Ptr->setby, Ptr->topicset); + WriteServ(user->fd,"333 %s %s %s %lu", user->nick, Ptr->name, Ptr->setby, (unsigned long)Ptr->topicset); } userlist(user,Ptr); WriteServ(user->fd,"366 %s %s :End of /NAMES list.", user->nick, Ptr->name); - WriteServ(user->fd,"324 %s %s +%s",user->nick, Ptr->name,chanmodes(Ptr)); - WriteServ(user->fd,"329 %s %s %d", user->nick, Ptr->name, Ptr->created); + //WriteServ(user->fd,"324 %s %s +%s",user->nick, Ptr->name,chanmodes(Ptr)); + //WriteServ(user->fd,"329 %s %s %lu", user->nick, Ptr->name, (unsigned long)Ptr->created); FOREACH_MOD OnUserJoin(user,Ptr); return Ptr; } @@ -1683,7 +714,6 @@ chanrec* del_channel(userrec *user, const char* cname, const char* reason, bool } chanrec* Ptr; - int created = 0; if ((!cname) || (!user)) { @@ -1735,6 +765,8 @@ chanrec* del_channel(userrec *user, const char* cname, const char* reason, bool break; } } + + Ptr->DelUser((char*)user); /* if there are no users left on the channel */ if (!usercount(Ptr)) @@ -1747,7 +779,7 @@ chanrec* del_channel(userrec *user, const char* cname, const char* reason, bool if (iter != chanlist.end()) { log(DEBUG,"del_channel: destroyed: %s",Ptr->name); - if (iter->second) delete iter->second; + delete Ptr; chanlist.erase(iter); } } @@ -1762,9 +794,6 @@ void kick_channel(userrec *src,userrec *user, chanrec *Ptr, char* reason) return; } - int i = 0; - int created = 0; - if ((!Ptr) || (!user) || (!src)) { return; @@ -1780,7 +809,6 @@ void kick_channel(userrec *src,userrec *user, chanrec *Ptr, char* reason) int MOD_RESULT = 0; FOREACH_RESULT(OnAccessCheck(src,user,Ptr,AC_KICK)); - if (MOD_RESULT == ACR_DENY) return; @@ -1800,7 +828,14 @@ void kick_channel(userrec *src,userrec *user, chanrec *Ptr, char* reason) return; } } - + + MOD_RESULT = 0; + FOREACH_RESULT(OnUserPreKick(src,user,Ptr,reason)); + if (MOD_RESULT) + return; + + FOREACH_MOD OnUserKick(src,user,Ptr,reason); + for (int i =0; i != MAXCHANS; i++) { /* zap it from the channel list of the user */ @@ -1814,7 +849,9 @@ void kick_channel(userrec *src,userrec *user, chanrec *Ptr, char* reason) break; } } - + + Ptr->DelUser((char*)user); + /* if there are no users left on the channel */ if (!usercount(Ptr)) { @@ -1826,7 +863,7 @@ void kick_channel(userrec *src,userrec *user, chanrec *Ptr, char* reason) if (iter != chanlist.end()) { log(DEBUG,"del_channel: destroyed: %s",Ptr->name); - if (iter->second) delete iter->second; + delete Ptr; chanlist.erase(iter); } } @@ -1860,7 +897,7 @@ int loop_call(handlerfunc fn, char **parameters, int pcnt, userrec *u, int start char *pars[32]; char blog[32][MAXBUF]; char blog2[32][MAXBUF]; - int i = 0, j = 0, q = 0, total = 0, t = 0, t2 = 0, total2 = 0; + int j = 0, q = 0, total = 0, t = 0, t2 = 0, total2 = 0; char keystr[MAXBUF]; char moo[MAXBUF]; @@ -2014,9 +1051,8 @@ void kill_link(userrec *user,const char* r) log(DEBUG,"kill_link: %s '%s'",user->nick,reason); Write(user->fd,"ERROR :Closing link (%s@%s) [%s]",user->ident,user->host,reason); - log(DEBUG,"closing fd %d",user->fd); + log(DEBUG,"closing fd %lu",(unsigned long)user->fd); - /* bugfix, cant close() a nonblocking socket (sux!) */ if (user->registered == 7) { FOREACH_MOD OnUserQuit(user); WriteCommonExcept(user,"QUIT :%s",reason); @@ -2027,32 +1063,41 @@ void kill_link(userrec *user,const char* r) NetSendToAll(buffer); } - /* push the socket on a stack of sockets due to be closed at the next opportunity - * 'Client exited' is an exception to this as it means the client side has already - * closed the socket, we don't need to do it. - */ - fd_reap.push_back(user->fd); - - bool do_purge = false; + FOREACH_MOD OnUserDisconnect(user); + + if (user->fd > -1) + { + FOREACH_MOD OnRawSocketClose(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 + 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); } + if (user->registered == 7) { + purge_empty_chans(user); + } + if (iter != clientlist.end()) { - log(DEBUG,"deleting user hash value %d",iter->second); - if ((iter->second) && (user->registered == 7)) { - if (iter->second) delete iter->second; - } + log(DEBUG,"deleting user hash value %lu",(unsigned long)user); + if (user->fd > -1) + fd_ref_table[user->fd] = NULL; clientlist.erase(iter); } - - if (user->registered == 7) { - purge_empty_chans(); - } - //user = NULL; + delete user; } void kill_link_silent(userrec *user,const char* r) @@ -2070,9 +1115,8 @@ void kill_link_silent(userrec *user,const char* r) log(DEBUG,"kill_link: %s '%s'",user->nick,reason); Write(user->fd,"ERROR :Closing link (%s@%s) [%s]",user->ident,user->host,reason); - log(DEBUG,"closing fd %d",user->fd); + log(DEBUG,"closing fd %lu",(unsigned long)user->fd); - /* bugfix, cant close() a nonblocking socket (sux!) */ if (user->registered == 7) { FOREACH_MOD OnUserQuit(user); WriteCommonExcept(user,"QUIT :%s",reason); @@ -2083,95 +1127,40 @@ void kill_link_silent(userrec *user,const char* r) NetSendToAll(buffer); } - /* push the socket on a stack of sockets due to be closed at the next opportunity - * 'Client exited' is an exception to this as it means the client side has already - * closed the socket, we don't need to do it. - */ - fd_reap.push_back(user->fd); - - bool do_purge = false; + FOREACH_MOD OnUserDisconnect(user); + + if (user->fd > -1) + { + FOREACH_MOD OnRawSocketClose(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 + shutdown(user->fd,2); + close(user->fd); + } + + if (user->registered == 7) { + purge_empty_chans(user); + } if (iter != clientlist.end()) { - log(DEBUG,"deleting user hash value %d",iter->second); - if ((iter->second) && (user->registered == 7)) { - if (iter->second) delete iter->second; - } + log(DEBUG,"deleting user hash value %lu",(unsigned long)user); + if (user->fd > -1) + fd_ref_table[user->fd] = NULL; clientlist.erase(iter); } - - if (user->registered == 7) { - purge_empty_chans(); - } -} - - - -// 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; } -int main(int argc, char **argv) +int main(int argc, char** argv) { Start(); srand(time(NULL)); @@ -2199,7 +1188,18 @@ int main(int argc, char **argv) } strlcpy(MyExecutable,argv[0],MAXBUF); - if (InspIRCd() == ERROR) + // 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"); printf("ERROR: could not initialise. Shutting down.\n"); @@ -2221,7 +1221,7 @@ template inline string ConvToStr(const T &in) userrec* ReHashNick(char* Old, char* New) { - user_hash::iterator newnick; + //user_hash::iterator newnick; user_hash::iterator oldnick = clientlist.find(Old); log(DEBUG,"ReHashNick: %s %s",Old,New); @@ -2236,8 +1236,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); @@ -2248,12 +1248,12 @@ 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->ident,u->ident,15); + strlcpy(a->dhost,u->dhost,160); + strlcpy(a->host,u->host,160); strlcpy(a->fullname,u->fullname,128); strlcpy(a->server,u->server,256); a->signon = u->signon; @@ -2265,19 +1265,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 { @@ -2297,19 +1302,28 @@ void AddWhoWas(userrec* u) /* add a client connection to the sockets list */ void AddClient(int socket, char* host, int port, bool iscached, char* ip) { - int i; - int blocking = 1; - char resolved[MAXBUF]; string tempnick; char tn2[MAXBUF]; user_hash::iterator iter; tempnick = ConvToStr(socket) + "-unknown"; - sprintf(tn2,"%d-unknown",socket); + sprintf(tn2,"%lu-unknown",(unsigned long)socket); iter = clientlist.find(tempnick); - if (iter != clientlist.end()) return; + // fix by brain. + // as these nicknames are 'RFC impossible', we can be sure nobody is going to be + // using one as a registered connection. As theyre per fd, we can also safely assume + // that we wont have collisions. Therefore, if the nick exists in the list, its only + // used by a dead socket, erase the iterator so that the new client may reclaim it. + // this was probably the cause of 'server ignores me when i hammer it with reconnects' + // issue in earlier alphas/betas + if (iter != clientlist.end()) + { + userrec* goner = iter->second; + delete goner; + clientlist.erase(iter); + } /* * It is OK to access the value here this way since we know @@ -2321,23 +1335,26 @@ void AddClient(int socket, char* host, int port, bool iscached, char* ip) clientlist[tempnick] = new userrec(); NonBlocking(socket); - log(DEBUG,"AddClient: %d %s %d %s",socket,host,port,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",9); + strncpy(clientlist[tempnick]->ident, "unknown",15); clientlist[tempnick]->registered = 0; clientlist[tempnick]->signon = TIME+dns_timeout; clientlist[tempnick]->lastping = 1; clientlist[tempnick]->port = port; - strncpy(clientlist[tempnick]->ip,ip,32); + strncpy(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++) { @@ -2346,6 +1363,9 @@ void AddClient(int socket, char* host, int port, bool iscached, char* ip) class_regtimeout = (unsigned long)i->registration_timeout; class_flood = i->flood; clientlist[tempnick]->pingmax = i->pingtime; + class_threshold = i->threshold; + class_sqmax = i->sendqmax; + class_rqmax = i->recvqmax; break; } } @@ -2353,6 +1373,9 @@ void AddClient(int socket, char* host, int port, bool iscached, char* ip) clientlist[tempnick]->nping = TIME+clientlist[tempnick]->pingmax+dns_timeout; clientlist[tempnick]->timeout = TIME+class_regtimeout; clientlist[tempnick]->flood = class_flood; + clientlist[tempnick]->threshold = class_threshold; + clientlist[tempnick]->sendqmax = class_sqmax; + clientlist[tempnick]->recvqmax = class_rqmax; for (int i = 0; i < MAXCHANS; i++) { @@ -2361,7 +1384,23 @@ void AddClient(int socket, char* host, int port, bool iscached, char* ip) } if (clientlist.size() == MAXCLIENTS) + { kill_link(clientlist[tempnick],"No more connections allowed in this class"); + return; + } + + // this is done as a safety check to keep the file descriptors within range of fd_ref_table. + // its a pretty big but for the moment valid assumption: + // file descriptors are handed out starting at 0, and are recycled as theyre freed. + // therefore if there is ever an fd over 65535, 65536 clients must be connected to the + // irc server at once (or the irc server otherwise initiating this many connections, files etc) + // which for the time being is a physical impossibility (even the largest networks dont have more + // than about 10,000 users on ONE server!) + if (socket > 65534) + { + kill_link(clientlist[tempnick],"Server is full"); + return; + } char* e = matches_exception(ip); @@ -2373,135 +1412,62 @@ void AddClient(int socket, char* host, int port, bool iscached, char* ip) char reason[MAXBUF]; snprintf(reason,MAXBUF,"Z-Lined: %s",r); kill_link(clientlist[tempnick],reason); + return; } } -} - -// 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 ((i->second->fd) && (isnick(i->second->nick)) && (strchr(i->second->modes,'o'))) c++; - } - return c; -} - -int usercount_unknown(void) -{ - int c = 0; - - for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++) - { - if ((i->second->fd) && (i->second->registered != 7)) - c++; - } - return c; -} - -long chancount(void) -{ - return chanlist.size(); -} - -long count_servs(void) -{ - int c = 0; - //for (int j = 0; j < 255; j++) - //{ - // if (servers[j] != NULL) - // 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++) - { - if ((i->second->fd) && (isnick(i->second->nick)) && (!strcasecmp(i->second->server,ServerName))) c++; - } - 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++) +#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"); + switch (errno) + { + case EACCES: + log(DEBUG,"kqueue: EACCES"); + break; + case EFAULT: + log(DEBUG,"kqueue: EFAULT"); + break; + case EBADF: + log(DEBUG,"kqueue: EBADF=%d",ke.ident); + break; + case EINTR: + log(DEBUG,"kqueue: EINTR"); + break; + case EINVAL: + log(DEBUG,"kqueue: EINVAL"); + break; + case ENOENT: + log(DEBUG,"kqueue: ENOENT"); + break; + case ENOMEM: + log(DEBUG,"kqueue: ENOMEM"); + break; + case ESRCH: + log(DEBUG,"kqueue: ESRCH"); + break; + default: + log(DEBUG,"kqueue: UNKNOWN!"); + break; + } + log(DEBUG,"kqueue: Failed to add user to queue!"); } - 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); - -} -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 */ void FullConnectUser(userrec* user) { - user->registered = 7; + statsConnects++; user->idle_lastmsg = TIME; log(DEBUG,"ConnectUser: %s",user->nick); - if (strcmp(Passwd(user),"") && (!user->haspassed)) + if ((strcmp(Passwd(user),"")) && (!user->haspassed)) { kill_link(user,"Invalid password"); return; @@ -2535,6 +1501,9 @@ void FullConnectUser(userrec* user) } } + // fix by brain: move this below the xline checks to prevent spurious quits going onto the net that dont belong + user->registered = 7; + WriteServ(user->fd,"NOTICE Auth :Welcome to \002%s\002!",Network); WriteServ(user->fd,"001 %s :Welcome to the %s IRC Network %s!%s@%s",user->nick,Network,user->nick,user->ident,user->host); WriteServ(user->fd,"002 %s :Your host is %s, running version %s",user->nick,ServerName,VERSION); @@ -2545,7 +1514,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... @@ -2567,36 +1536,103 @@ void FullConnectUser(userrec* user) } } ShowMOTD(user); - FOREACH_MOD OnUserConnect(user); - WriteOpers("*** Client connecting on port %d: %s!%s@%s [%s]",user->port,user->nick,user->ident,user->host,user->ip); char buffer[MAXBUF]; - snprintf(buffer,MAXBUF,"N %d %s %s %s %s +%s %s %s :%s",user->age,user->nick,user->host,user->dhost,user->ident,user->modes,user->ip,ServerName,user->fullname); + snprintf(buffer,MAXBUF,"N %lu %s %s %s %s +%s %s %s :%s",(unsigned long)user->age,user->nick,user->host,user->dhost,user->ident,user->modes,user->ip,ServerName,user->fullname); NetSendToAll(buffer); + + // 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); + WriteOpers("*** Client connecting on port %lu: %s!%s@%s [%s]",(unsigned long)user->port,user->nick,user->ident,user->host,user->ip); } + /* shows the message of the day, and any other on-logon stuff */ void ConnectUser(userrec *user) { // dns is already done, things are fast. no need to wait for dns to complete just pass them straight on - if ((user->dns_done) && (user->registered >= 3)) + if ((user->dns_done) && (user->registered >= 3) && (AllModulesReportReady(user))) { FullConnectUser(user); } } -void handle_version(char **parameters, int pcnt, userrec *user) +std::string GetVersionString() { - char Revision[] = "$Revision$"; + char Revision[] = "$Revision$"; + char versiondata[MAXBUF]; + char *s1 = Revision; + char *savept; + char *v2 = strtok_r(s1," ",&savept); + s1 = savept; + v2 = strtok_r(s1," ",&savept); + s1 = savept; +#ifdef USE_KQUEUE + char socketengine[] = "kqueue"; +#else + char socketengine[] = "select"; +#endif + snprintf(versiondata,MAXBUF,"%s Rev. %s %s :%s (O=%lu) [SE=%s]",VERSION,v2,ServerName,SYSTEM,(unsigned long)OPTIMISATION,socketengine); + return versiondata; +} - char *s1 = Revision; - char *savept; - char *v1 = strtok_r(s1," ",&savept); - s1 = savept; - char *v2 = strtok_r(s1," ",&savept); - s1 = savept; - - WriteServ(user->fd,"351 %s :%s Rev. %s %s :%s (O=%d)",user->nick,VERSION,v2,ServerName,SYSTEM,OPTIMISATION); +void handle_version(char **parameters, int pcnt, userrec *user) +{ + if (!pcnt) + { + WriteServ(user->fd,"351 %s :%s",user->nick,GetVersionString().c_str()); + } + else + { + if (!strcmp(parameters[0],"*")) + { + for (int j = 0; j < 32; j++) + { + if (me[j] != NULL) + { + for (int x = 0; x < me[j]->connectors.size(); x++) + { + WriteServ(user->fd,"351 %s :Server %d:%d (%s): %s",user->nick,j,x,me[j]->connectors[x].GetServerName().c_str(),me[j]->connectors[x].GetVersionString().c_str()); + } + } + } + return; + } + if (match(ServerName,parameters[0])) + { + WriteServ(user->fd,"351 %s :%s",user->nick,GetVersionString().c_str()); + return; + } + bool displayed = false, found = false; + for (int j = 0; j < 32; j++) + { + if (me[j] != NULL) + { + for (int x = 0; x < me[j]->connectors.size(); x++) + { + if (match(me[j]->connectors[x].GetServerName().c_str(),parameters[0])) + { + found = true; + if ((me[j]->connectors[x].GetVersionString() != "") && (!displayed)) + { + displayed = true; + WriteServ(user->fd,"351 %s :%s",user->nick,me[j]->connectors[x].GetVersionString().c_str()); + } + } + } + } + } + if ((!displayed) && (found)) + { + WriteServ(user->fd,"402 %s %s :Server %s has no version information",user->nick,parameters[0],parameters[0]); + return; + } + if (!found) + { + WriteServ(user->fd,"402 %s %s :No such server",user->nick,parameters[0]); + } + } + return; } @@ -2670,40 +1706,6 @@ void DoSplitEveryone() -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]; @@ -2713,11 +1715,13 @@ void force_nickchange(userrec* user,const char* newnick) FOREACH_RESULT(OnUserPreNick(user,newnick)); if (MOD_RESULT) { + statsCollisions++; kill_link(user,"Nickname collision"); return; } if (matches_qline(newnick)) { + statsCollisions++; kill_link(user,"Nickname collision"); return; } @@ -2740,10 +1744,8 @@ void force_nickchange(userrec* user,const char* newnick) int process_parameters(char **command_p,char *parameters) { - int i = 0; int j = 0; - int q = 0; - q = strlen(parameters); + int q = strlen(parameters); if (!q) { /* no parameters, command_p invalid! */ @@ -2794,7 +1796,7 @@ void process_command(userrec *user, char* cmd) char *command; char *command_p[127]; char p[MAXBUF], temp[MAXBUF]; - int i, j, items, cmd_found; + int j, items, cmd_found; for (int i = 0; i < 127; i++) command_p[i] = NULL; @@ -2807,7 +1809,7 @@ void process_command(userrec *user, char* cmd) { return; } - if (!strcmp(cmd,"")) + if (!cmd[0]) { return; } @@ -2866,7 +1868,6 @@ void process_command(userrec *user, char* cmd) { cmd[i] = toupper(cmd[i]); } - log(DEBUG,"Preprocess done length=%d",strlen(cmd)); command = cmd; } else @@ -2927,6 +1928,7 @@ void process_command(userrec *user, char* cmd) { if (strchr("@!\"$%^&*(){}[]_=+;:'#~,<>/?\\|`",command[x])) { + statsUnknown++; WriteServ(user->fd,"421 %s %s :Unknown command",user->nick,command); return; } @@ -2936,15 +1938,13 @@ void process_command(userrec *user, char* cmd) for (int i = 0; i != cmdlist.size(); i++) { - if (strcmp(cmdlist[i].command,"")) + if (cmdlist[i].command[0]) { if (strlen(command)>=(strlen(cmdlist[i].command))) if (!strncmp(command, cmdlist[i].command,MAXCOMMAND)) { - log(DEBUG,"Found matching command"); - if (parameters) { - if (strcmp(parameters,"")) + if (parameters[0]) { items = process_parameters(command_p,parameters); } @@ -2962,8 +1962,6 @@ void process_command(userrec *user, char* cmd) if (user) { - log(DEBUG,"Processing command"); - /* activity resets the ping pending timer */ user->nping = TIME + user->pingmax; if ((items) < cmdlist[i].min_params) @@ -3015,22 +2013,14 @@ void process_command(userrec *user, char* cmd) } - if ((user->registered == 7) || (!strcmp(command,"USER")) || (!strcmp(command,"NICK")) || (!strcmp(command,"PASS"))) + if ((user->registered == 7) || (!strncmp(command,"USER",4)) || (!strncmp(command,"NICK",4)) || (!strncmp(command,"PASS",4))) { - log(DEBUG,"process_command: handler: %s %s %d",user->nick,command,items); if (cmdlist[i].handler_function) { /* ikky /stats counters */ if (temp) { - if (user) - { - user->bytes_in += strlen(temp); - user->cmds_in++; - user->bytes_out+=strlen(temp); - user->cmds_out++; - } cmdlist[i].use_count++; cmdlist[i].total_bytes+=strlen(temp); } @@ -3051,7 +2041,6 @@ void process_command(userrec *user, char* cmd) } else { - log(DEBUG,"process_command: not registered: %s %s",user->nick,command); WriteServ(user->fd,"451 %s :You have not registered",command); return; } @@ -3062,27 +2051,11 @@ void process_command(userrec *user, char* cmd) } if ((!cmd_found) && (user)) { - log(DEBUG,"process_command: not in table: %s %s",user->nick,command); + statsUnknown++; WriteServ(user->fd,"421 %s %s :Unknown command",user->nick,command); } } - -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 (%d parameters)",cmd,minparams); -} - bool removecommands(const char* source) { bool go_again = true; @@ -3103,61 +2076,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) { @@ -3167,42 +2085,44 @@ void process_buffer(const char* cmdbuf,userrec *user) return; } char cmd[MAXBUF]; - int i; if (!cmdbuf) { log(DEFAULT,"*** BUG *** process_buffer was given an invalid parameter"); return; } - if (!strcmp(cmdbuf,"")) + if (!cmdbuf[0]) { return; } - while ((cmdbuf[0] == ' ') && (strlen(cmdbuf)>0)) cmdbuf++; // strip leading spaces + while (*cmdbuf == ' ') cmdbuf++; // strip leading spaces strlcpy(cmd,cmdbuf,MAXBUF); - if (!strcmp(cmd,"")) + if (!cmd[0]) { return; } - if ((cmd[strlen(cmd)-1] == 13) || (cmd[strlen(cmd)-1] == 10)) + int sl = strlen(cmd)-1; + if ((cmd[sl] == 13) || (cmd[sl] == 10)) { - cmd[strlen(cmd)-1] = '\0'; + cmd[sl] = '\0'; } - if ((cmd[strlen(cmd)-1] == 13) || (cmd[strlen(cmd)-1] == 10)) + sl = strlen(cmd)-1; + if ((cmd[sl] == 13) || (cmd[sl] == 10)) { - cmd[strlen(cmd)-1] = '\0'; + cmd[sl] = '\0'; } - - while ((cmd[strlen(cmd)-1] == ' ') && (strlen(cmd)>0)) // strip trailing spaces + sl = strlen(cmd)-1; + while (cmd[sl] == ' ') // strip trailing spaces { - cmd[strlen(cmd)-1] = '\0'; + cmd[sl] = '\0'; + sl = strlen(cmd)-1; } - if (!strcmp(cmd,"")) + if (!cmd[0]) { return; } - log(DEBUG,"InspIRCd: processing: %s %s",user->nick,cmd); + log(DEBUG,"CMDIN: %s %s",user->nick,cmd); tidystring(cmd); if ((user) && (cmd)) { @@ -3217,16 +2137,40 @@ 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 %d",TIME); + snprintf(data,MAXBUF,"%s Y %lu",CreateSum().c_str(),(unsigned long)TIME); serv->SendPacket(data,tcp_host); // send users and channels + + NetSendMyRoutingTable(); + + // send all routing table and uline voodoo. The ordering of these commands is IMPORTANT! + for (int j = 0; j < 32; j++) + { + if (me[j] != NULL) + { + for (int k = 0; k < me[j]->connectors.size(); k++) + { + if (is_uline(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); + } + } + } + } + + // send our version for the remote side to cache + 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 %d %s %s %s %s +%s %s %s :%s",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++) @@ -3234,13 +2178,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); } } - if (strcmp(chlist(u->second),"")) + char* chl = chlist(u->second,u->second); + if (strcmp(chl,"")) { - snprintf(data,MAXBUF,"J %s %s",u->second->nick,chlist(u->second)); + snprintf(data,MAXBUF,"%s J %s %s",CreateSum().c_str(),u->second->nick,chl); serv->SendPacket(data,tcp_host); } } @@ -3254,43 +2199,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 (strcmp(c->second->topic,"")) + if (c->second->topic[0]) { - snprintf(data,MAXBUF,"T %d %s %s :%s",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",b->set_time,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); - for (int j = 0; j < 32; j++) - { - if (me[j] != NULL) - { - for (int k = 0; k < me[j]->connectors.size(); k++) - { - if (is_uline(me[j]->connectors[k].GetServerName().c_str())) - { - snprintf(data,MAXBUF,"H %s",me[j]->connectors[k].GetServerName().c_str()); - serv->SendPacket(data,tcp_host); - NetSendMyRoutingTable(); - } - } - } - } - - snprintf(data,MAXBUF,"F %d",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 @@ -3403,7 +2332,6 @@ void RemoveServer(const char* name) } -int reap_counter = 0; char MODERR[MAXBUF]; char* ModuleError() @@ -3428,17 +2356,17 @@ void erase_factory(int j) void erase_module(int j) { - int v = 0; + int v1 = 0; for (std::vector::iterator m = modules.begin(); m!= modules.end(); m++) { - if (v == j) + if (v1 == j) { delete *m; modules.erase(m); modules.push_back(NULL); break; } - v++; + v1++; } int v2 = 0; for (std::vector::iterator v = module_names.begin(); v != module_names.end(); v++) @@ -3455,9 +2383,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) { @@ -3482,50 +2411,11 @@ 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'; - } - log(DEBUG,"Dir valid: %s",work); - 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); - log(DEBUG,"Dir is really: %s",otherdir); - if (strlen(otherdir) >= strlen(work)) - { - otherdir[strlen(work)] = '\0'; - log(DEBUG,"Compare: '%s' -> '%s'",otherdir,work); - if (!strcmp(otherdir,work)) - { - log(DEBUG,"Match ok"); - return true; - } - log(DEBUG,"No match"); - return false; - } - else return false; -} - bool LoadModule(const char* filename) { char modfile[MAXBUF]; snprintf(modfile,MAXBUF,"%s/%s",ModPath,filename); + std::string filename_str = filename; if (!DirValid(modfile)) { log(DEFAULT,"Module %s is not within the modules directory.",modfile); @@ -3537,7 +2427,7 @@ bool LoadModule(const char* filename) { 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"); @@ -3578,7 +2468,7 @@ bool LoadModule(const char* filename) return true; } -int InspIRCd(void) +int InspIRCd(char** argv, int argc) { struct sockaddr_in client,server; char addrs[MAXBUF][255]; @@ -3586,20 +2476,20 @@ int InspIRCd(void) socklen_t length; int count = 0; int selectResult = 0, selectResult2 = 0; - char *temp, configToken[MAXBUF], stuff[MAXBUF], Addr[MAXBUF], Type[MAXBUF]; - char resolvedHost[MAXBUF]; + char configToken[MAXBUF], Addr[MAXBUF], Type[MAXBUF]; fd_set selectFds; timeval tv; - log_file = fopen("ircd.log","a+"); + std::string logpath = GetFullProgDir(argv,argc) + "/ircd.log"; + log_file = fopen(logpath.c_str(),"a+"); if (!log_file) { - printf("ERROR: Could not write to logfile ircd.log, bailing!\n\n"); + printf("ERROR: Could not write to logfile %s, bailing!\n\n",logpath.c_str()); Exit(ERROR); } + printf("Logging to %s...\n",logpath.c_str()); - log(DEBUG,"InspIRCd: startup: begin"); - log(DEBUG,"$Id$"); + log(DEFAULT,"$Id$"); if (geteuid() == 0) { printf("WARNING!!! You are running an irc server as ROOT!!! DO NOT DO THIS!!!\n\n"); @@ -3610,15 +2500,15 @@ int InspIRCd(void) log(DEBUG,"InspIRCd: startup: default command table set up"); ReadConfig(true,NULL); - if (strcmp(DieValue,"")) + if (DieValue[0]) { printf("WARNING: %s\n\n",DieValue); log(DEFAULT,"Ut-Oh, somebody didn't read their config file: '%s'",DieValue); exit(0); } log(DEBUG,"InspIRCd: startup: read config"); - - int count2 = 0, count3 = 0; + + int clientportcount = 0, serverportcount = 0; for (count = 0; count < ConfValueEnum("bind",&config_f); count++) { @@ -3632,89 +2522,75 @@ int InspIRCd(void) ConfValue("bind","default",count,Default,&config_f); if (strchr(Default,'y')) { - defaultRoute = count3; + defaultRoute = serverportcount; log(DEBUG,"InspIRCd: startup: binding '%s:%s' is default server route",Addr,configToken); } - me[count3] = new serverrec(ServerName,100L,false); - if (!me[count3]->CreateListener(Addr,atoi(configToken))) + me[serverportcount] = new serverrec(ServerName,100L,false); + if (!me[serverportcount]->CreateListener(Addr,atoi(configToken))) { - log(DEFAULT,"Error! Failed to bind port %d",atoi(configToken)); + log(DEFAULT,"Warning: Failed to bind port %lu",(unsigned long)atoi(configToken)); + printf("Warning: Failed to bind port %lu\n",(unsigned long)atoi(configToken)); } else { - count3++; + serverportcount++; } } else { - ports[count2] = atoi(configToken); - strlcpy(addrs[count2],Addr,256); - count2++; + ports[clientportcount] = atoi(configToken); + strlcpy(addrs[clientportcount],Addr,256); + clientportcount++; } log(DEBUG,"InspIRCd: startup: read binding %s:%s [%s] from config",Addr,configToken, Type); } - portCount = count2; - UDPportCount = count3; + portCount = clientportcount; + SERVERportCount = serverportcount; - log(DEBUG,"InspIRCd: startup: read %d total client ports and %d total server ports",portCount,UDPportCount); - - log(DEBUG,"InspIRCd: startup: InspIRCd is now running!"); + log(DEBUG,"InspIRCd: startup: read %lu total client ports and %lu total server ports",(unsigned long)portCount,(unsigned long)SERVERportCount); + log(DEBUG,"InspIRCd: startup: InspIRCd is now starting!"); printf("\n"); /* BugFix By Craig! :p */ MODCOUNT = -1; - for (count2 = 0; count2 < ConfValueEnum("module",&config_f); count2++) + for (count = 0; count < ConfValueEnum("module",&config_f); count++) { - ConfValue("module","name",count2,configToken,&config_f); - printf("Loading module... \033[1;37m%s\033[0;37m\n",configToken); + ConfValue("module","name",count,configToken,&config_f); + printf("Loading module... \033[1;32m%s\033[0m\n",configToken); if (!LoadModule(configToken)) { - log(DEBUG,"Exiting due to a module loader error."); - printf("There was an error loading a module: %s\n",ModuleError()); + log(DEFAULT,"Exiting due to a module loader error."); + printf("\nThere was an error loading a module: %s\n\nYou might want to do './inspircd start' instead of 'bin/inspircd'\n\n",ModuleError()); Exit(0); } } - log(DEBUG,"Total loaded modules: %d",MODCOUNT+1); - - printf("\nInspIRCd is now running!\n"); + log(DEFAULT,"Total loaded modules: %lu",(unsigned long)MODCOUNT+1); startup_time = time(NULL); - if (nofork) - { - log(VERBOSE,"Not forking as -nofork was specified"); - } - else - { - if (DaemonSeed() == ERROR) - { - log(DEFAULT,"InspIRCd: startup: can't daemonise"); - printf("ERROR: could not go into daemon mode. Shutting down.\n"); - Exit(ERROR); - } - } - char PID[MAXBUF]; ConfValue("pid","file",0,PID,&config_f); + // write once here, to try it out and make sure its ok WritePID(PID); - /* setup select call */ +#ifndef USE_KQUEUE FD_ZERO(&selectFds); +#endif log(DEBUG,"InspIRCd: startup: zero selects"); - log(VERBOSE,"InspIRCd: startup: portCount = %d", portCount); + log(VERBOSE,"InspIRCd: startup: portCount = %lu", (unsigned long)portCount); for (count = 0; count < portCount; count++) { if ((openSockfd[boundPortCount] = OpenTCPSocket()) == ERROR) { - log(DEBUG,"InspIRCd: startup: bad fd %d",openSockfd[boundPortCount]); + log(DEBUG,"InspIRCd: startup: bad fd %lu",(unsigned long)openSockfd[boundPortCount]); return(ERROR); } if (BindSocket(openSockfd[boundPortCount],client,server,ports[count],addrs[count]) == ERROR) { - log(DEFAULT,"InspIRCd: startup: failed to bind port %d",ports[count]); + log(DEFAULT,"InspIRCd: startup: failed to bind port %lu",(unsigned long)ports[count]); } else /* well we at least bound to one socket so we'll continue */ { @@ -3722,32 +2598,105 @@ int InspIRCd(void) } } - log(DEBUG,"InspIRCd: startup: total bound ports %d",boundPortCount); + log(DEBUG,"InspIRCd: startup: total bound ports %lu",(unsigned long)boundPortCount); /* if we didn't bind to anything then abort */ if (boundPortCount == 0) { log(DEFAULT,"InspIRCd: startup: no ports bound, bailing!"); + printf("\nERROR: Was not able to bind any of %lu ports! Please check your configuration.\n\n", (unsigned long)portCount); return (ERROR); } + printf("\nInspIRCd is now running!\n"); + + if (nofork) + { + log(VERBOSE,"Not forking as -nofork was specified"); + } + else + { + if (DaemonSeed() == ERROR) + { + log(DEFAULT,"InspIRCd: startup: can't daemonise"); + printf("ERROR: could not go into daemon mode. Shutting down.\n"); + Exit(ERROR); + } + } + + // 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_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, 5, 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"); + } + } + 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, 5, 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"); + } + } + } + + +#else + log(DEFAULT,"Using standard select socket engine."); +#endif + + WritePID(PID); + length = sizeof (client); - char udp_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 fd_set serverfds; timeval tvs; - tvs.tv_usec = 7000L; + tvs.tv_usec = 10000L; tvs.tv_sec = 0; tv.tv_sec = 0; - tv.tv_usec = 7000L; - char data[10240]; + tv.tv_usec = 10000L; + char data[65536]; timeval tval; fd_set sfd; - tval.tv_usec = 7000L; + 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 */ @@ -3756,13 +2705,16 @@ int InspIRCd(void) #ifdef _POSIX_PRIORITY_SCHEDULING sched_yield(); #endif - // poll dns queue - dns_poll(); +#ifndef USE_KQUEUE 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)) @@ -3774,46 +2726,39 @@ int InspIRCd(void) } if ((TIME % 5) == 1) expire_run = false; - if (reap_counter>300) - { - if (fd_reap.size() > 0) - { - for( int n = 0; n < fd_reap.size(); n++) - { - if ((fd_reap[n] > -1)) - { - close(fd_reap[n]); - shutdown (fd_reap[n],2); - } - } - } - fd_reap.clear(); - reap_counter=0; - } - reap_counter++; // fix by brain - this must be below any manipulation of the hashmap by modules user_hash::iterator count2 = clientlist.begin(); +#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)) + { + +#else FD_ZERO(&serverfds); - - for (int x = 0; x != UDPportCount; x++) + for (int x = 0; x != SERVERportCount; x++) { if (me[x]) FD_SET(me[x]->fd, &serverfds); } - - // serverFds timevals went here - - tvs.tv_usec = 7000L; + tvs.tv_usec = 30000L; tvs.tv_sec = 0; int servresult = select(32767, &serverfds, NULL, NULL, &tvs); if (servresult > 0) { - for (int x = 0; x != UDPportCount; x++) + 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); @@ -3832,48 +2777,52 @@ int InspIRCd(void) } } - for (int x = 0; x < UDPportCount; x++) + for (int x = 0; x < SERVERportCount; x++) { std::deque msgs; + std::deque sums; msgs.clear(); - if ((me[x]) && (me[x]->RecvPacket(msgs, tcp_host))) + sums.clear(); + if ((me[x]) && (me[x]->RecvPacket(msgs, tcp_host, sums))) { for (int ctr = 0; ctr < msgs.size(); ctr++) { - char udp_msg[MAXBUF]; - strlcpy(udp_msg,msgs[ctr].c_str(),MAXBUF); - log(DEBUG,"Processing: %s",udp_msg); - if (strlen(udp_msg)<1) + strlcpy(tcp_msg,msgs[ctr].c_str(),MAXBUF); + strlcpy(tcp_sum,msgs[ctr].c_str(),MAXBUF); + log(DEBUG,"Processing: %s",tcp_msg); + if (!tcp_msg[0]) { - log(DEBUG,"Invalid string from %s [route%d]",tcp_host,x); + log(DEBUG,"Invalid string from %s [route%lu]",tcp_host,(unsigned long)x); break; } // during a netburst, send all data to all other linked servers - if ((((nb_start>0) && (udp_msg[0] != 'Y') && (udp_msg[0] != 'X') && (udp_msg[0] != 'F'))) || (is_uline(tcp_host))) + if ((((nb_start>0) && (tcp_msg[0] != 'Y') && (tcp_msg[0] != 'X') && (tcp_msg[0] != 'F'))) || (is_uline(tcp_host))) { if (is_uline(tcp_host)) { - if ((udp_msg[0] != 'Y') && (udp_msg[0] != 'X') && (udp_msg[0] != 'F')) + if ((tcp_msg[0] != 'Y') && (tcp_msg[0] != 'X') && (tcp_msg[0] != 'F')) { - NetSendToAllExcept(tcp_host,udp_msg); + NetSendToAllExcept_WithSum(tcp_host,tcp_msg,tcp_sum); } } else - NetSendToAllExcept(tcp_host,udp_msg); + NetSendToAllExcept_WithSum(tcp_host,tcp_msg,tcp_sum); } - std::string msg = udp_msg; + std::string msg = tcp_msg; FOREACH_MOD OnPacketReceive(msg,tcp_host); - strlcpy(udp_msg,msg.c_str(),MAXBUF); - handle_link_packet(udp_msg, tcp_host, me[x]); + strlcpy(tcp_msg,msg.c_str(),MAXBUF); + handle_link_packet(tcp_msg, tcp_host, me[x], tcp_sum); } goto label; } } - while (count2 != clientlist.end()) { +#ifndef USE_KQUEUE FD_ZERO(&sfd); +#endif + total_in_this_set = 0; user_hash::iterator xcount = count2; @@ -3881,54 +2830,74 @@ int InspIRCd(void) if (count2 == clientlist.end()) break; + userrec* curr = NULL; + if (count2->second) - if (count2->second->fd != 0) + curr = count2->second; + + if ((curr) && (curr->fd != 0)) { +#ifdef _POSIX_PRIORITY_SCHEDULING + sched_yield(); +#endif // assemble up to 64 sockets into an fd_set // to implement a pooling mechanism. // // This should be up to 64x faster than the // old implementation. - while (total_in_this_set < 64) +#ifndef USE_KQUEUE + while (total_in_this_set < 1024) { if (count2 != clientlist.end()) { + curr = count2->second; // we don't check the state of remote users. - if ((count2->second->fd != -1) && (count2->second->fd != FD_MAGIC_NUMBER)) + if ((curr->fd != -1) && (curr->fd != FD_MAGIC_NUMBER)) { - FD_SET (count2->second->fd, &sfd); + 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 // their connection class. - if ((TIME > count2->second->timeout) && (count2->second->registered != 7)) + if ((TIME > curr->timeout) && (curr->registered != 7)) { - log(DEBUG,"InspIRCd: registration timeout: %s",count2->second->nick); - kill_link(count2->second,"Registration timeout"); + log(DEBUG,"InspIRCd: registration timeout: %s",curr->nick); + kill_link(curr,"Registration timeout"); goto label; } - if ((TIME > count2->second->signon) && (count2->second->registered == 3)) + if ((TIME > curr->signon) && (curr->registered == 3) && (AllModulesReportReady(curr))) { - count2->second->dns_done = true; - FullConnectUser(count2->second); + log(DEBUG,"signon exceed, registered=3, and modules ready, OK"); + curr->dns_done = true; + statsDnsBad++; + FullConnectUser(curr); goto label; } - if ((count2->second->dns_done) && (count2->second->registered == 3)) // both NICK and USER... and DNS + if ((curr->dns_done) && (curr->registered == 3) && (AllModulesReportReady(curr))) // both NICK and USER... and DNS { - FullConnectUser(count2->second); + log(DEBUG,"dns done, registered=3, and modules ready, OK"); + FullConnectUser(curr); goto label; } - if ((TIME > count2->second->nping) && (isnick(count2->second->nick)) && (count2->second->registered == 7)) + if ((TIME > curr->nping) && (isnick(curr->nick)) && (curr->registered == 7)) { - if ((!count2->second->lastping) && (count2->second->registered == 7)) + if ((!curr->lastping) && (curr->registered == 7)) { - log(DEBUG,"InspIRCd: ping timeout: %s",count2->second->nick); - kill_link(count2->second,"Ping timeout"); + log(DEBUG,"InspIRCd: ping timeout: %s",curr->nick); + kill_link(curr,"Ping timeout"); goto label; } - Write(count2->second->fd,"PING :%s",ServerName); - log(DEBUG,"InspIRCd: pinging: %s",count2->second->nick); - count2->second->lastping = 0; - count2->second->nping = TIME+count2->second->pingmax; // was hard coded to 120 + 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 } } count2++; @@ -3936,34 +2905,122 @@ int InspIRCd(void) } else break; } - endingiter = count2; count2 = xcount; // roll back to where we were +#else + // KQUEUE: 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 > 10) while (count2 != clientlist.end()) + { + cycle_iter = 0; + if (count2 != clientlist.end()) + { + curr = count2->second; + // we don't check the state of remote users. + if ((curr->fd != -1) && (curr->fd != 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; + } + + // 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); + goto label; + } + if ((curr->dns_done) && (curr->registered == 3) && (AllModulesReportReady(curr))) + { + log(DEBUG,"dns done, registered=3, and modules ready, OK"); + FullConnectUser(curr); + 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; - // tvals defined here - - tval.tv_usec = 7000L; +#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]; +#else + tval.tv_usec = 1000L; selectResult2 = select(65535, &sfd, NULL, NULL, &tval); // now loop through all of the items in this pool if any are waiting - //if (selectResult2 > 0) + if (selectResult2 > 0) for (user_hash::iterator count2a = xcount; count2a != endingiter; count2a++) { + // SELECT: we have to iterate... + userrec* cu = count2a->second; +#endif #ifdef _POSIX_PRIORITY_SCHEDULING sched_yield(); #endif - result = EAGAIN; - if ((count2a->second->fd != FD_MAGIC_NUMBER) && (count2a->second->fd != -1) && (FD_ISSET (count2a->second->fd, &sfd))) +#ifdef USE_KQUEUE + // KQUEUE: We already know we have a valid FD. No checks needed. + if ((cu->fd != FD_MAGIC_NUMBER) && (cu->fd != -1)) +#else + // 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 { - memset(data, 0, 10240); - result = read(count2a->second->fd, data, 10240); - + log(DEBUG,"Data waiting on socket %d",cu->fd); + int MOD_RESULT = 0; + int result2 = 0; + FOREACH_RESULT(OnRawSocketRead(cu->fd,data,65535,result2)); + if (!MOD_RESULT) + { + result = read(cu->fd, data, 65535); + } + else result = result2; + log(DEBUG,"Read result: %d",result); if (result) { + statsRecv += result; // perform a check on the raw buffer as an array (not a string!) to remove // characters 0 and 7 which are illegal in the RFC - replace them with spaces. // hopefully this should stop even more people whining about "Unknown command: *" @@ -3972,64 +3029,112 @@ int InspIRCd(void) if ((data[checker] == 0) || (data[checker] == 7)) data[checker] = ' '; } - userrec* current = count2a->second; + if (result > 0) + data[result] = '\0'; + userrec* current = cu; int currfd = current->fd; - char* l = strtok(data,"\n"); int floodlines = 0; - while (l) + // 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. + if (current->registered == 7) + { + kill_link(current,"RecvQ exceeded"); + } + else + { + WriteOpers("*** Excess flood from %s",current->ip); + log(DEFAULT,"Excess flood from: %s",current->ip); + add_zline(120,ServerName,"Flood from unregistered connection",current->ip); + apply_lines(); + } + goto label; + } + if (current->recvq.length() > NetBufferSize) + { + if (current->registered == 7) + { + kill_link(current,"RecvQ exceeded"); + } + else + { + WriteOpers("*** Excess flood from %s",current->ip); + log(DEFAULT,"Excess flood from: %s",current->ip); + add_zline(120,ServerName,"Flood from unregistered connection",current->ip); + apply_lines(); + } + goto label; + } + // while there are complete lines to process... + while (current->BufferIsReady()) { floodlines++; - if ((floodlines > current->flood) && (current->flood != 0)) + if (TIME > current->reset_due) { - log(DEFAULT,"Excess flood from: %s!%s@%s",current->nick,current->ident,current->host); - WriteOpers("*** Excess flood from: %s!%s@%s",current->nick,current->ident,current->host); + current->reset_due = TIME + current->threshold; + current->lines_in = 0; + } + current->lines_in++; + if (current->lines_in > current->flood) + { + log(DEFAULT,"Excess flood from: %s!%s@%s",current->nick,current->ident,current->host); + WriteOpers("*** Excess flood from: %s!%s@%s",current->nick,current->ident,current->host); kill_link(current,"Excess flood"); goto label; } - char sanitized[NetBufferSize]; - memset(sanitized, 0, NetBufferSize); - int ptt = 0; - for (int pt = 0; pt < strlen(l); pt++) + if ((floodlines > current->flood) && (current->flood != 0)) { - if (l[pt] != '\r') + if (current->registered == 7) + { + log(DEFAULT,"Excess flood from: %s!%s@%s",current->nick,current->ident,current->host); + WriteOpers("*** Excess flood from: %s!%s@%s",current->nick,current->ident,current->host); + kill_link(current,"Excess flood"); + } + else { - sanitized[ptt++] = l[pt]; + add_zline(120,ServerName,"Flood from unregistered connection",current->ip); + apply_lines(); } + goto label; } - sanitized[ptt] = '\0'; - if (strlen(sanitized)) + char sanitized[MAXBUF]; + // use GetBuffer to copy single lines into the sanitized string + std::string single_line = current->GetBuffer(); + current->bytes_in += single_line.length(); + current->cmds_in++; + if (single_line.length()>512) { - - + log(DEFAULT,"Excess flood from: %s!%s@%s",current->nick,current->ident,current->host); + WriteOpers("*** Excess flood from: %s!%s@%s",current->nick,current->ident,current->host); + kill_link(current,"Excess flood"); + goto label; + } + strlcpy(sanitized,single_line.c_str(),MAXBUF); + if (*sanitized) + { + userrec* old_comp = fd_ref_table[currfd]; // we're gonna re-scan to check if the nick is gone, after every // command - if it has, we're gonna bail - bool find_again = false; process_buffer(sanitized,current); - - // look for the user's record in case it's changed - for (user_hash::iterator c2 = clientlist.begin(); c2 != clientlist.end(); c2++) - { - if (c2->second->fd == currfd) - { - // found again, update pointer - current == c2->second; - find_again = true; - break; - } - } - if (!find_again) + // look for the user's record in case it's changed... if theyve quit, + // we cant do anything more with their buffer, so bail. + // there used to be an ugly, slow loop here. Now we have a reference + // table, life is much easier (and FASTER) + userrec* new_comp = fd_ref_table[currfd]; + if ((currfd < 0) || (!fd_ref_table[currfd]) || (old_comp != new_comp)) goto label; } - l = strtok(NULL,"\n"); } goto label; } if ((result == -1) && (errno != EAGAIN) && (errno != EINTR)) { - log(DEBUG,"killing: %s",count2a->second->nick); - kill_link(count2a->second,strerror(errno)); + log(DEBUG,"killing: %s",cu->nick); + kill_link(cu,strerror(errno)); goto label; } } @@ -4040,14 +3145,18 @@ int InspIRCd(void) else if (result == 0) { +#ifndef USE_KQUEUE if (count2->second) { - log(DEBUG,"InspIRCd: Exited: %s",count2a->second->nick); - kill_link(count2a->second,"Client exited"); +#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; +#ifndef USE_KQUEUE } +#endif } else if (result > 0) { @@ -4056,31 +3165,48 @@ int InspIRCd(void) } for (int q = 0; q < total_in_this_set; q++) { - // there is no iterator += operator :( - //if (count2 != clientlist.end()) - //{ - count2++; - //} + count2++; } } + +#ifdef _POSIX_PRIORITY_SCHEDULING + sched_yield(); +#endif +#ifndef USE_KQUEUE // set up select call for (count = 0; count < boundPortCount; count++) { FD_SET (openSockfd[count], &selectFds); } - tv.tv_usec = 7000L; + tv.tv_usec = 30000L; selectResult = select(MAXSOCKS, &selectFds, NULL, NULL, &tv); /* 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)) { +#else + 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.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 + char target[MAXBUF], resolved[MAXBUF]; length = sizeof (client); incomingSockfd = accept (openSockfd[count], (struct sockaddr *) &client, &length); @@ -4089,20 +3215,27 @@ int InspIRCd(void) if (incomingSockfd < 0) { - WriteOpers("*** WARNING: Accept failed on port %d (%s)", ports[count],target); - log(DEBUG,"InspIRCd: accept failed: %d",ports[count]); + WriteOpers("*** WARNING: Accept failed on port %lu (%s)",(unsigned long)ports[count],target); + log(DEBUG,"InspIRCd: accept failed: %lu",(unsigned long)ports[count]); + statsRefused++; } else { + FOREACH_MOD OnRawSocketAccept(incomingSockfd, resolved, ports[count]); + statsAccept++; AddClient(incomingSockfd, resolved, ports[count], false, inet_ntoa (client.sin_addr)); - log(DEBUG,"InspIRCd: adding client on port %d fd=%d",ports[count],incomingSockfd); + log(DEBUG,"InspIRCd: adding client on port %lu fd=%lu",(unsigned long)ports[count],(unsigned long)incomingSockfd); } - goto label; + //goto label; } } } label: if (0) {}; +#ifdef _POSIX_PRIORITY_SCHEDULING + sched_yield(); + sched_yield(); +#endif } /* not reached */ close (incomingSockfd);