X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Finspircd.cpp;h=b1aedde73132f856334235d52ce0967fff4b1969;hb=2df3ad5cfeaea6ca095695fa4b3c786ee8237080;hp=bd2828ec9770c377c4b66a34bbb630caa44fb176;hpb=5cce62f7d799f073ea6ca1793328c08c2df7c3ff;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/inspircd.cpp b/src/inspircd.cpp index bd2828ec9..b1aedde73 100644 --- a/src/inspircd.cpp +++ b/src/inspircd.cpp @@ -89,6 +89,8 @@ extern int MaxWhoResults; time_t nb_start = 0; int dns_timeout = 5; +char DisabledCommands[MAXBUF]; + bool AllowHalfop = true; bool AllowProtect = true; bool AllowFounder = true; @@ -96,11 +98,11 @@ 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); @@ -145,6 +147,8 @@ struct StrHashComp char a[MAXBUF],b[MAXBUF]; strlcpy(a,s1.c_str(),MAXBUF); strlcpy(b,s2.c_str(),MAXBUF); + strlower(a); + strlower(b); return (strcasecmp(a,b) == 0); } @@ -191,6 +195,7 @@ char MyExecutable[1024]; int boundPortCount = 0; int portCount = 0, UDPportCount = 0, ports[MAXSOCKS]; int defaultRoute = 0; +char ModPath[MAXBUF]; connection C; @@ -208,17 +213,36 @@ void AddWhoWas(userrec* u); std::vector auth_cookies; std::stringstream config_f(stringstream::in | stringstream::out); +std::vector all_opers; + +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); } @@ -272,7 +296,7 @@ void log(int level,char *text, ...) vsnprintf(textbuffer, MAXBUF, text, argsPtr); va_end(argsPtr); strlcpy(b,asctime(timeinfo),MAXBUF); - b[strlen(b)-1] = ':'; + b[24] = ':'; // we know this is the end of the time string fprintf(log_file,"%s %s\n",b,textbuffer); if (nofork) { @@ -296,7 +320,7 @@ void readfile(file_cache &F, const char* fname) { fgets(linebuf,sizeof(linebuf),file); linebuf[strlen(linebuf)-1]='\0'; - if (!strcmp(linebuf,"")) + if (linebuf[0] == 0) { strcpy(linebuf," "); } @@ -311,13 +335,13 @@ void readfile(file_cache &F, const char* fname) { log(DEBUG,"readfile: failed to load file: %s",fname); } - log(DEBUG,"readfile: loaded %s, %d lines",fname,F.size()); + log(DEBUG,"readfile: loaded %s, %lu lines",fname,(unsigned long)F.size()); } void ReadConfig(bool bail, userrec* user) { char dbg[MAXBUF],pauseval[MAXBUF],Value[MAXBUF],timeout[MAXBUF],NB[MAXBUF],flood[MAXBUF],MW[MAXBUF]; - char AH[MAXBUF],AP[MAXBUF],AF[MAXBUF],DNT[MAXBUF]; + char AH[MAXBUF],AP[MAXBUF],AF[MAXBUF],DNT[MAXBUF],pfreq[MAXBUF]; ConnectClass c; std::stringstream errstr; @@ -327,7 +351,7 @@ void ReadConfig(bool bail, userrec* user) if (bail) { printf("There were errors in your configuration:\n%s",errstr.str().c_str()); - exit(0); + Exit(0); } else { @@ -375,13 +399,18 @@ void ReadConfig(bool bail, userrec* user) ConfValue("options","allowfounder",0,AF,&config_f); ConfValue("dns","server",0,DNSServer,&config_f); ConfValue("dns","timeout",0,DNT,&config_f); + ConfValue("options","moduledir",0,ModPath,&config_f); + ConfValue("disabled","commands",0,DisabledCommands,&config_f); + NetBufferSize = atoi(NB); MaxWhoResults = atoi(MW); dns_timeout = atoi(DNT); if (!dns_timeout) dns_timeout = 5; - if (!strcmp(DNSServer,"")) + if (!DNSServer[0]) strlcpy(DNSServer,"127.0.0.1",MAXBUF); + 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"))); AllowFounder = ((!strcasecmp(AF,"true")) || (!strcasecmp(AF,"1")) || (!strcasecmp(AF,"yes"))); @@ -416,7 +445,8 @@ void ReadConfig(bool bail, userrec* user) ConfValue("connect","allow",i,Value,&config_f); ConfValue("connect","timeout",i,timeout,&config_f); ConfValue("connect","flood",i,flood,&config_f); - if (strcmp(Value,"")) + ConfValue("connect","pingfreq",i,pfreq,&config_f); + if (Value[0]) { strlcpy(c.host,Value,MAXBUF); c.type = CC_ALLOW; @@ -424,13 +454,18 @@ void ReadConfig(bool bail, userrec* user) ConfValue("connect","password",i,Value,&config_f); strlcpy(c.pass,Value,MAXBUF); c.registration_timeout = 90; // default is 2 minutes + c.pingtime = 120; c.flood = atoi(flood); if (atoi(timeout)>0) { c.registration_timeout = atoi(timeout); } + if (atoi(pfreq)>0) + { + 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 { @@ -446,13 +481,91 @@ 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..."); + + std::vector old_module_names, new_module_names, added_modules, removed_modules; + + // store the old module names + for (std::vector::iterator t = module_names.begin(); t != module_names.end(); t++) + { + old_module_names.push_back(*t); + } + + // get the new module names + for (int count2 = 0; count2 < ConfValueEnum("module",&config_f); count2++) + { + ConfValue("module","name",count2,Value,&config_f); + new_module_names.push_back(Value); + } + + // now create a list of new modules that are due to be loaded + // and a seperate list of modules which are due to be unloaded + for (std::vector::iterator _new = new_module_names.begin(); _new != new_module_names.end(); _new++) + { + bool added = true; + for (std::vector::iterator old = old_module_names.begin(); old != old_module_names.end(); old++) + { + if (*old == *_new) + added = false; + } + if (added) + added_modules.push_back(*_new); + } + for (std::vector::iterator oldm = old_module_names.begin(); oldm != old_module_names.end(); oldm++) + { + bool removed = true; + for (std::vector::iterator newm = new_module_names.begin(); newm != new_module_names.end(); newm++) + { + if (*newm == *oldm) + removed = false; + } + if (removed) + removed_modules.push_back(*oldm); + } + // now we have added_modules, a vector of modules to be loaded, and removed_modules, a vector of modules + // to be removed. + int rem = 0, add = 0; + if (!removed_modules.empty()) + for (std::vector::iterator removing = removed_modules.begin(); removing != removed_modules.end(); removing++) + { + if (UnloadModule(removing->c_str())) + { + WriteOpers("*** REHASH UNLOADED MODULE: %s",removing->c_str()); + WriteServ(user->fd,"973 %s %s :Module %s successfully unloaded.",user->nick, removing->c_str(), removing->c_str()); + rem++; + } + else + { + WriteServ(user->fd,"972 %s %s :Failed to unload module %s: %s",user->nick, removing->c_str(), removing->c_str(), ModuleError()); + } + } + if (!added_modules.empty()) + for (std::vector::iterator adding = added_modules.begin(); adding != added_modules.end(); adding++) + { + if (LoadModule(adding->c_str())) + { + WriteOpers("*** REHASH LOADED MODULE: %s",adding->c_str()); + WriteServ(user->fd,"975 %s %s :Module %s successfully loaded.",user->nick, adding->c_str(), adding->c_str()); + add++; + } + else + { + WriteServ(user->fd,"974 %s %s :Failed to load module %s: %s",user->nick, adding->c_str(), adding->c_str(), ModuleError()); + } + } + log(DEFAULT,"Successfully unloaded %lu of %lu modules and loaded %lu of %lu modules.",(unsigned long)rem,(unsigned long)removed_modules.size(),(unsigned long)add,(unsigned long)added_modules.size()); + } } /* write formatted text to a socket, in same format as printf */ void Write(int sock,char *text, ...) { + if (sock == FD_MAGIC_NUMBER) + return; if (!text) { log(DEFAULT,"*** BUG *** Write was given an invalid parameter"); @@ -465,11 +578,11 @@ void Write(int sock,char *text, ...) va_start (argsPtr, text); vsnprintf(textbuffer, MAXBUF, text, argsPtr); va_end(argsPtr); - snprintf(tb,MAXBUF,"%s\r\n",textbuffer); + int bytes = snprintf(tb,MAXBUF,"%s\r\n",textbuffer); chop(tb); if (sock != -1) { - write(sock,tb,strlen(tb)); + write(sock,tb,bytes > 514 ? 514 : bytes); } } @@ -477,6 +590,8 @@ void Write(int sock,char *text, ...) void WriteServ(int sock, char* text, ...) { + if (sock == FD_MAGIC_NUMBER) + return; if (!text) { log(DEFAULT,"*** BUG *** WriteServ was given an invalid parameter"); @@ -488,11 +603,11 @@ void WriteServ(int sock, char* text, ...) vsnprintf(textbuffer, MAXBUF, text, argsPtr); va_end(argsPtr); - snprintf(tb,MAXBUF,":%s %s\r\n",ServerName,textbuffer); + int bytes = snprintf(tb,MAXBUF,":%s %s\r\n",ServerName,textbuffer); chop(tb); if (sock != -1) { - write(sock,tb,strlen(tb)); + write(sock,tb,bytes > 514 ? 514 : bytes); } } @@ -500,6 +615,8 @@ void WriteServ(int sock, char* text, ...) 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"); @@ -511,11 +628,11 @@ void WriteFrom(int sock, userrec *user,char* 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); + int bytes = 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(sock,tb,bytes > 514 ? 514 : bytes); } } @@ -528,6 +645,8 @@ void WriteTo(userrec *source, userrec *dest,char *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); @@ -561,12 +680,14 @@ void WriteChannel(chanrec* Ptr, userrec* user, char* text, ...) va_start (argsPtr, text); vsnprintf(textbuffer, MAXBUF, text, argsPtr); va_end(argsPtr); - for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++) + + std::vector *ulist = Ptr->GetUsers(); + for (int j = 0; j < ulist->size(); j++) { - if (has_channel(i->second,Ptr)) - { - WriteTo(user,i->second,"%s",textbuffer); - } + char* o = (*ulist)[j]; + userrec* otheruser = (userrec*)o; + if (otheruser->fd != FD_MAGIC_NUMBER) + WriteTo(user,otheruser,"%s",textbuffer); } } @@ -586,29 +707,30 @@ void WriteChannelLocal(chanrec* Ptr, userrec* user, char* text, ...) 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)) + + std::vector *ulist = Ptr->GetUsers(); + for (int j = 0; j < ulist->size(); j++) + { + char* o = (*ulist)[j]; + userrec* otheruser = (userrec*)o; + if ((otheruser->fd != FD_MAGIC_NUMBER) && (otheruser->fd != -1) && (otheruser != user)) { - if (i->second->fd != -1) + if (!user) { - if (!user) - { - WriteServ(i->second->fd,"%s",textbuffer); - } - else - { - WriteTo(user,i->second,"%s",textbuffer); - } - } + WriteServ(otheruser->fd,"%s",textbuffer); + } + else + { + WriteTo(user,otheruser,"%s",textbuffer); + } } - } + } } -void WriteChannelWithServ(char* ServerName, chanrec* Ptr, userrec* user, char* text, ...) +void WriteChannelWithServ(char* ServName, chanrec* Ptr, char* text, ...) { - if ((!Ptr) || (!user) || (!text)) + if ((!Ptr) || (!text)) { log(DEFAULT,"*** BUG *** WriteChannelWithServ was given an invalid parameter"); return; @@ -618,16 +740,16 @@ void WriteChannelWithServ(char* ServerName, chanrec* Ptr, userrec* user, char* t 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)) - { - WriteServ(i->second->fd,"%s",textbuffer); - } - } - } + + + std::vector *ulist = Ptr->GetUsers(); + for (int j = 0; j < ulist->size(); j++) + { + char* o = (*ulist)[j]; + userrec* otheruser = (userrec*)o; + if (otheruser->fd != FD_MAGIC_NUMBER) + WriteServ(otheruser->fd,"%s",textbuffer); + } } @@ -647,16 +769,14 @@ void ChanExceptSender(chanrec* Ptr, userrec* user, char* 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)) - { - WriteTo(user,i->second,"%s",textbuffer); - } - } - } + std::vector *ulist = Ptr->GetUsers(); + for (int j = 0; j < ulist->size(); j++) + { + char* o = (*ulist)[j]; + userrec* otheruser = (userrec*)o; + if ((otheruser->fd != FD_MAGIC_NUMBER) && (user != otheruser)) + WriteFrom(otheruser->fd,user,"%s",textbuffer); + } } @@ -701,17 +821,40 @@ void WriteCommon(userrec *u, char* text, ...) vsnprintf(textbuffer, MAXBUF, text, argsPtr); va_end(argsPtr); - WriteFrom(u->fd,u,"%s",textbuffer); + // FIX: Stops a message going to the same person more than once + std::vector already_sent; - for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++) + for (int i = 0; i < MAXCHANS; i++) + { + if (u->chans[i].channel) + { + std::vector *ulist = u->chans[i].channel->GetUsers(); + for (int j = 0; j < ulist->size(); j++) + { + char* o = (*ulist)[j]; + userrec* otheruser = (userrec*)o; + bool do_send = true; + for (int t = 0; t < already_sent.size(); t++) + { + if (already_sent[t] == otheruser->fd) + { + do_send = false; + break; + } + } + if (do_send) + { + already_sent.push_back(otheruser->fd); + WriteFrom(otheruser->fd,u,"%s",textbuffer); + } + } + } + } + // if the user was not in any channels, no users will receive the text. Make sure the user + // receives their OWN message for WriteCommon + if (!already_sent.size()) { - if (i->second) - { - if (common_channels(u,i->second) && (i->second != u)) - { - WriteFrom(i->second->fd,u,"%s",textbuffer); - } - } + WriteFrom(u->fd,u,"%s",textbuffer); } } @@ -737,16 +880,37 @@ void WriteCommonExcept(userrec *u, char* 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); - } - } - } + std::vector already_sent; + + for (int i = 0; i < MAXCHANS; i++) + { + if (u->chans[i].channel) + { + std::vector *ulist = u->chans[i].channel->GetUsers(); + for (int j = 0; j < ulist->size(); j++) + { + char* o = (*ulist)[j]; + userrec* otheruser = (userrec*)o; + if (u != otheruser) + { + bool do_send = true; + for (int t = 0; t < already_sent.size(); t++) + { + if (already_sent[t] == otheruser->fd) + { + do_send = false; + break; + } + } + if (do_send) + { + already_sent.push_back(otheruser->fd); + WriteFrom(otheruser->fd,u,"%s",textbuffer); + } + } + } + } + } } void WriteOpers(char* text, ...) @@ -763,18 +927,15 @@ void WriteOpers(char* text, ...) vsnprintf(textbuffer, MAXBUF, text, argsPtr); va_end(argsPtr); - for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++) + for (std::vector::iterator i = all_opers.begin(); i != all_opers.end(); i++) { - if (i->second) + userrec* a = *i; + if ((a) && (a->fd != FD_MAGIC_NUMBER)) { - if (strchr(i->second->modes,'o')) + if (strchr(a->modes,'s')) { - 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); - } + // send server notices to all with +s + WriteServ(a->fd,"NOTICE %s :%s",a->nick,textbuffer); } } } @@ -785,16 +946,15 @@ void WriteOpers(char* text, ...) 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; - } - } - } + + std::vector *ulist = c->GetUsers(); + for (int j = 0; j < ulist->size(); j++) + { + char* o = (*ulist)[j]; + userrec* user = (userrec*)o; + if (!strcasecmp(user->server,servername)) + return true; + } return false; } @@ -803,17 +963,21 @@ bool ChanAnyOnThisServer(chanrec *c,char* 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; - } - } - } + + for (int i = 0; i < MAXCHANS; i++) + { + if (u->chans[i].channel) + { + std::vector *ulist = u->chans[i].channel->GetUsers(); + for (int j = 0; j < ulist->size(); j++) + { + char* o = (*ulist)[j]; + userrec* user = (userrec*)o; + if (!strcasecmp(user->server,servername)) + return true; + } + } + } return false; } @@ -825,6 +989,10 @@ void NetSendToCommon(userrec* u, char* 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) @@ -848,6 +1016,10 @@ void NetSendToAll(char* 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) @@ -867,6 +1039,10 @@ void NetSendToAllAlive(char* 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) @@ -894,6 +1070,10 @@ void NetSendToOne(char* target,char* 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) @@ -916,6 +1096,10 @@ void NetSendToAllExcept(const char* target,char* 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) @@ -945,17 +1129,18 @@ void WriteMode(const char* modes, int flags, const char* text, ...) va_start (argsPtr, text); vsnprintf(textbuffer, MAXBUF, text, argsPtr); va_end(argsPtr); + int modelen = strlen(modes); for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++) { - if (i->second) + 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++) + for (int n = 0; n < modelen; n++) { if (!hasumode(i->second,modes[n])) { @@ -967,7 +1152,7 @@ void WriteMode(const char* modes, int flags, const char* text, ...) else if (flags == WM_OR) { send_to_user = false; - for (int n = 0; n < strlen(modes); n++) + for (int n = 0; n < modelen; n++) { if (hasumode(i->second,modes[n])) { @@ -994,7 +1179,6 @@ void WriteWallOps(userrec *source, bool local_only, char* text, ...) return; } - int i = 0; char textbuffer[MAXBUF]; va_list argsPtr; va_start (argsPtr, text); @@ -1003,7 +1187,7 @@ void WriteWallOps(userrec *source, bool local_only, char* text, ...) for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++) { - if (i->second) + if ((i->second) && (i->second->fd != FD_MAGIC_NUMBER)) { if (strchr(i->second->modes,'w')) { @@ -1036,7 +1220,7 @@ void strlower(char *n) { return; } - for (int i = 0; i != strlen(n); i++) + for (int i = 0; n[i] != 0; i++) { n[i] = tolower(n[i]); if (n[i] == '[') @@ -1099,37 +1283,49 @@ long GetMaxBans(char* name) } -void purge_empty_chans(void) +void purge_empty_chans(userrec* u) { + int go_again = 1, purge = 0; - - while (go_again) + + // firstly decrement the count on each channel + for (int f = 0; f < MAXCHANS; f++) { - go_again = 0; - for (chan_hash::iterator i = chanlist.begin(); i != chanlist.end(); i++) + if (u->chans[f].channel) { - 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 + u->chans[f].channel->DecUserCounter(); + u->chans[f].channel->DelUser((char*)u); + } + } + + for (int i = 0; i < MAXCHANS; i++) + { + if (u->chans[i].channel) + { + if (!usercount(u->chans[i].channel)) + { + chan_hash::iterator i2 = chanlist.find(u->chans[i].channel->name); + /* kill the record */ + if (i2 != chanlist.end()) { - log(DEBUG,"skipped purge for %s",i->second->name); + log(DEBUG,"del_channel: destroyed: %s",i2->second->name); + if (i2->second) + delete i2->second; + chanlist.erase(i2); + go_again = 1; + purge++; + u->chans[i].channel = NULL; } } + else + { + log(DEBUG,"skipped purge for %s",u->chans[i].channel->name); + } } } - log(DEBUG,"completed channel purge, killed %d",purge); + log(DEBUG,"completed channel purge, killed %lu",(unsigned long)purge); + + DeleteOper(u); } @@ -1155,7 +1351,7 @@ char* chanmodes(chanrec *chan) { strlcat(scratch,"t",MAXMODES); } - if (strcmp(chan->key,"")) + if (chan->key[0]) { strlcat(scratch,"k",MAXMODES); } @@ -1179,7 +1375,7 @@ char* chanmodes(chanrec *chan) { strlcat(scratch,"p",MAXMODES); } - if (strcmp(chan->key,"")) + if (chan->key[0]) { strlcat(sparam," ",MAXBUF); strlcat(sparam,chan->key,MAXBUF); @@ -1187,13 +1383,13 @@ char* chanmodes(chanrec *chan) if (chan->limit) { char foo[24]; - sprintf(foo," %d",chan->limit); + sprintf(foo," %lu",(unsigned long)chan->limit); strlcat(sparam,foo,MAXBUF); } - if (strlen(chan->custom_modes)) + if (*chan->custom_modes) { strlcat(scratch,chan->custom_modes,MAXMODES); - for (int z = 0; z < strlen(chan->custom_modes); z++) + for (int z = 0; chan->custom_modes[z] != 0; z++) { std::string extparam = chan->GetModeParameter(chan->custom_modes[z]); if (extparam != "") @@ -1257,7 +1453,6 @@ void userlist(userrec *user,chanrec *c) int usercount_i(chanrec *c) { - int i = 0; int count = 0; if (!c) @@ -1286,37 +1481,20 @@ int usercount_i(chanrec *c) } } } - log(DEBUG,"usercount_i: %s %d",c->name,count); + log(DEBUG,"usercount_i: %s %lu",c->name,(unsigned long)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 (has_channel(i->second,c)) - { - if ((isnick(i->second->nick)) && (i->second->registered == 7)) - { - count++; - } - } - } - } - log(DEBUG,"usercount: %s %d",c->name,count); + int count = c->GetUserCounter(); + log(DEBUG,"usercount: %s %lu",c->name,(unsigned long)count); return count; } @@ -1332,7 +1510,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]; @@ -1357,7 +1534,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; @@ -1396,7 +1573,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; @@ -1406,72 +1583,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) + if (Ptr->key[0]) { - 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 - { - 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)) - { - /* user was invited to channel */ - /* there may be an optional channel NOTICE here */ - } - else + if (Ptr->inviteonly) { - 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"); } @@ -1496,23 +1687,25 @@ 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->IncUserCounter(); + 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. @@ -1535,12 +1728,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; } @@ -1562,7 +1755,6 @@ chanrec* del_channel(userrec *user, const char* cname, const char* reason, bool } chanrec* Ptr; - int created = 0; if ((!cname) || (!user)) { @@ -1614,6 +1806,9 @@ chanrec* del_channel(userrec *user, const char* cname, const char* reason, bool break; } } + + Ptr->DecUserCounter(); + Ptr->DelUser((char*)user); /* if there are no users left on the channel */ if (!usercount(Ptr)) @@ -1641,9 +1836,6 @@ void kick_channel(userrec *src,userrec *user, chanrec *Ptr, char* reason) return; } - int i = 0; - int created = 0; - if ((!Ptr) || (!user) || (!src)) { return; @@ -1659,7 +1851,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; @@ -1679,7 +1870,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 */ @@ -1693,7 +1891,10 @@ void kick_channel(userrec *src,userrec *user, chanrec *Ptr, char* reason) break; } } - + + Ptr->DecUserCounter(); + Ptr->DelUser((char*)user); + /* if there are no users left on the channel */ if (!usercount(Ptr)) { @@ -1739,7 +1940,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]; @@ -1893,7 +2094,7 @@ 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) { @@ -1906,32 +2107,31 @@ 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) + { + 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); + log(DEBUG,"deleting user hash value %lu",(unsigned long)iter->second); if ((iter->second) && (user->registered == 7)) { if (iter->second) delete iter->second; } clientlist.erase(iter); } - - if (user->registered == 7) { - purge_empty_chans(); - } - user = NULL; } void kill_link_silent(userrec *user,const char* r) @@ -1949,7 +2149,7 @@ 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) { @@ -1962,26 +2162,26 @@ 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) + { + 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); + log(DEBUG,"deleting user hash value %lu",(unsigned long)iter->second); if ((iter->second) && (user->registered == 7)) { if (iter->second) delete iter->second; } clientlist.erase(iter); } - - if (user->registered == 7) { - purge_empty_chans(); - } } @@ -2044,9 +2244,9 @@ void Error(int status) signal (SIGSEGV, SIG_IGN); signal (SIGURG, SIG_IGN); signal (SIGKILL, SIG_IGN); - log(DEBUG,"*** fell down a pothole in the road to perfection ***"); + log(DEFAULT,"*** fell down a pothole in the road to perfection ***"); send_error("Error! Segmentation fault! save meeeeeeeeeeeeee *splat!*"); - exit(status); + Exit(status); } @@ -2058,7 +2258,7 @@ int main(int argc, char **argv) if (!FileExists(CONFIG_FILE)) { printf("ERROR: Cannot open config file: %s\nExiting...\n",CONFIG_FILE); - log(DEBUG,"main: no config"); + log(DEFAULT,"main: no config"); printf("ERROR: Your config file is missing, this IRCd will self destruct in 10 seconds!\n"); Exit(ERROR); } @@ -2071,13 +2271,16 @@ int main(int argc, char **argv) if (!strcmp(argv[i],"-wait")) { sleep(6); } + if (!strcmp(argv[i],"-nolimit")) { + unlimitcore = true; + } } } strlcpy(MyExecutable,argv[0],MAXBUF); if (InspIRCd() == ERROR) { - log(DEBUG,"main: daemon function bailed"); + log(DEFAULT,"main: daemon function bailed"); printf("ERROR: could not initialise. Shutting down.\n"); Exit(ERROR); } @@ -2097,7 +2300,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); @@ -2173,15 +2376,12 @@ 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); @@ -2197,17 +2397,16 @@ 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",12); clientlist[tempnick]->registered = 0; clientlist[tempnick]->signon = TIME+dns_timeout; - clientlist[tempnick]->nping = TIME+240+dns_timeout; clientlist[tempnick]->lastping = 1; clientlist[tempnick]->port = port; strncpy(clientlist[tempnick]->ip,ip,32); @@ -2222,10 +2421,12 @@ 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; break; } } + clientlist[tempnick]->nping = TIME+clientlist[tempnick]->pingmax+dns_timeout; clientlist[tempnick]->timeout = TIME+class_regtimeout; clientlist[tempnick]->flood = class_flood; @@ -2252,12 +2453,22 @@ void AddClient(int socket, char* host, int port, bool iscached, char* ip) } } - +// 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) { @@ -2301,11 +2512,19 @@ long chancount(void) long count_servs(void) { int c = 0; - //for (int j = 0; j < 255; j++) - //{ - // if (servers[j] != NULL) - // c++; - //} + for (int i = 0; i < 32; i++) + { + if (me[i] != NULL) + { + for (vector::iterator j = me[i]->connectors.begin(); j != me[i]->connectors.end(); j++) + { + if (strcasecmp(j->GetServerName().c_str(),ServerName)) + { + c++; + } + } + } + } return c; } @@ -2340,7 +2559,7 @@ void ShowMOTD(userrec *user) } 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(),NULL); + send(user->fd,WholeMOTD.c_str(),WholeMOTD.length(),0); } @@ -2366,7 +2585,7 @@ void FullConnectUser(userrec* user) 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; @@ -2433,35 +2652,77 @@ 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); + WriteOpers("*** Client connecting on port %lu: %s!%s@%s [%s]",(unsigned long)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); } + +// this returns 1 when all modules are satisfied that the user should be allowed onto the irc server +// (until this returns true, a user will block in the waiting state, waiting to connect up to the +// registration timeout maximum seconds) +bool AllModulesReportReady(userrec* user) +{ + for (int i = 0; i <= MODCOUNT; i++) + { + int res = modules[i]->OnCheckReady(user); + if (!res) + return false; + } + return true; +} + /* shows the message of the day, and any other on-logon stuff */ void ConnectUser(userrec *user) { // 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; + snprintf(versiondata,MAXBUF,"%s Rev. %s %s :%s (O=%lu)",VERSION,v2,ServerName,SYSTEM,(unsigned long)OPTIMISATION); + 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 + { + 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])) + { + WriteServ(user->fd,"351 %s :%s",user->nick,me[j]->connectors[x].GetVersionString().c_str()); + return; + } + } + } + } + WriteServ(user->fd,"402 %s %s :No such server",user->nick,parameters[0]); + } + return; } @@ -2605,10 +2866,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! */ @@ -2659,7 +2918,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; @@ -2672,7 +2931,7 @@ void process_command(userrec *user, char* cmd) { return; } - if (!strcmp(cmd,"")) + if (!cmd[0]) { return; } @@ -2692,17 +2951,17 @@ void process_command(userrec *user, char* cmd) total_params++; } } - + // another phidjit bug... if (total_params > 126) { - //kill_link(user,"Protocol violation (1)"); - WriteServ(user->fd,"421 %s * :Unknown command",user->nick); + *(strchr(cmd,' ')) = '\0'; + WriteServ(user->fd,"421 %s %s :Too many parameters given",user->nick,cmd); return; } - - strlcpy(temp,cmd,MAXBUF); + strlcpy(temp,cmd,MAXBUF); + std::string tmp = cmd; for (int i = 0; i <= MODCOUNT; i++) { @@ -2731,7 +2990,6 @@ void process_command(userrec *user, char* cmd) { cmd[i] = toupper(cmd[i]); } - log(DEBUG,"Preprocess done length=%d",strlen(cmd)); command = cmd; } else @@ -2780,8 +3038,7 @@ void process_command(userrec *user, char* cmd) if (strlen(command)>MAXCOMMAND) { - //kill_link(user,"Protocol violation (2)"); - WriteServ(user->fd,"421 %s * :Unknown command",user->nick); + WriteServ(user->fd,"421 %s %s :Command too long",user->nick,command); return; } @@ -2793,8 +3050,7 @@ void process_command(userrec *user, char* cmd) { if (strchr("@!\"$%^&*(){}[]_=+;:'#~,<>/?\\|`",command[x])) { - //kill_link(user,"Protocol violation (3)"); - WriteServ(user->fd,"421 %s * :Unknown command",user->nick); + WriteServ(user->fd,"421 %s %s :Unknown command",user->nick,command); return; } } @@ -2803,15 +3059,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); } @@ -2829,10 +3083,8 @@ void process_command(userrec *user, char* cmd) if (user) { - log(DEBUG,"Processing command"); - /* activity resets the ping pending timer */ - user->nping = TIME + 120; + user->nping = TIME + user->pingmax; if ((items) < cmdlist[i].min_params) { log(DEBUG,"process_command: not enough parameters: %s %s",user->nick,command); @@ -2864,11 +3116,29 @@ void process_command(userrec *user, char* cmd) return; } } - if ((user->registered == 7) || (!strcmp(command,"USER")) || (!strcmp(command,"NICK")) || (!strcmp(command,"PASS"))) + if ((user->registered == 7) && (!strchr(user->modes,'o'))) + { + char* mycmd; + char* savept2; + mycmd = strtok_r(DisabledCommands," ",&savept2); + while (mycmd) + { + if (!strcasecmp(mycmd,command)) + { + // command is disabled! + WriteServ(user->fd,"421 %s %s :This command has been disabled.",user->nick,command); + return; + } + mycmd = strtok_r(NULL," ",&savept2); + } + + + } + if ((user->registered == 7) || (!strncmp(command,"USER",4)) || (!strncmp(command,"NICK",4)) || (!strncmp(command,"PASS",4))) { - log(DEBUG,"process_command: handler: %s %s %d",user->nick,command,items); if (cmdlist[i].handler_function) { + /* ikky /stats counters */ if (temp) { @@ -2883,6 +3153,12 @@ void process_command(userrec *user, char* cmd) cmdlist[i].total_bytes+=strlen(temp); } + int MOD_RESULT = 0; + FOREACH_RESULT(OnPreCommand(command,command_p,items,user)); + if (MOD_RESULT == 1) { + return; + } + /* WARNING: nothing may come after the * command handler call, as the handler * may free the user structure! */ @@ -2893,7 +3169,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; } @@ -2904,78 +3179,100 @@ void process_command(userrec *user, char* cmd) } if ((!cmd_found) && (user)) { - log(DEBUG,"process_command: not in table: %s %s",user->nick,command); WriteServ(user->fd,"421 %s %s :Unknown command",user->nick,command); } } -void createcommand(char* cmd, handlerfunc f, char flags, int minparams) +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); + log(DEBUG,"Added command %s (%lu parameters)",cmd,(unsigned long)minparams); +} + +bool removecommands(const char* source) +{ + bool go_again = true; + while (go_again) + { + go_again = false; + for (std::deque::iterator i = cmdlist.begin(); i != cmdlist.end(); i++) + { + if (!strcmp(i->source,source)) + { + log(DEBUG,"removecommands(%s) Removing dependent command: %s",i->source,i->command); + cmdlist.erase(i); + go_again = true; + break; + } + } + } + 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,1); - 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,'o',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("SERVER",handle_server,0,0); + 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) @@ -2986,42 +3283,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)) { @@ -3036,12 +3335,36 @@ 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,"Y %lu",(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,"H %s",me[j]->connectors[k].GetServerName().c_str()); + serv->SendPacket(data,tcp_host); + } + } + } + } + + // send our version for the remote side to cache + snprintf(data,MAXBUF,"v %s %s",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,"N %lu %s %s %s %s +%s %s %s :%s",(unsigned long)u->second->age,u->second->nick,u->second->host,u->second->dhost,u->second->ident,u->second->modes,u->second->ip,u->second->server,u->second->fullname); serv->SendPacket(data,tcp_host); if (strchr(u->second->modes,'o')) { @@ -3057,9 +3380,10 @@ void DoSync(serverrec* serv, char* tcp_host) serv->SendPacket(data,tcp_host); } } - if (strcmp(chlist(u->second),"")) + char* chl = chlist(u->second); + if (strcmp(chl,"")) { - snprintf(data,MAXBUF,"J %s %s",u->second->nick,chlist(u->second)); + snprintf(data,MAXBUF,"J %s %s",u->second->nick,chl); serv->SendPacket(data,tcp_host); } } @@ -3077,39 +3401,23 @@ void DoSync(serverrec* serv, char* tcp_host) 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,"T %lu %s %s :%s",(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,"M %s +b %s",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,"F %lu",(unsigned long)TIME); serv->SendPacket(data,tcp_host); log(DEBUG,"Sent sync"); // ircd sends its serverlist after the end of sync here @@ -3222,7 +3530,174 @@ void RemoveServer(const char* name) } -int reap_counter = 0; +char MODERR[MAXBUF]; + +char* ModuleError() +{ + return MODERR; +} + +void erase_factory(int j) +{ + int v = 0; + for (std::vector::iterator t = factory.begin(); t != factory.end(); t++) + { + if (v == j) + { + factory.erase(t); + factory.push_back(NULL); + return; + } + v++; + } +} + +void erase_module(int j) +{ + int v1 = 0; + for (std::vector::iterator m = modules.begin(); m!= modules.end(); m++) + { + if (v1 == j) + { + delete *m; + modules.erase(m); + modules.push_back(NULL); + break; + } + v1++; + } + int v2 = 0; + for (std::vector::iterator v = module_names.begin(); v != module_names.end(); v++) + { + if (v2 == j) + { + module_names.erase(v); + break; + } + v2++; + } + +} + +bool UnloadModule(const char* filename) +{ + for (int j = 0; j != module_names.size(); j++) + { + if (module_names[j] == std::string(filename)) + { + if (modules[j]->GetVersion().Flags & VF_STATIC) + { + log(DEFAULT,"Failed to unload STATIC module %s",filename); + snprintf(MODERR,MAXBUF,"Module not unloadable (marked static)"); + return false; + } + // found the module + log(DEBUG,"Deleting module..."); + erase_module(j); + log(DEBUG,"Erasing module entry..."); + erase_factory(j); + log(DEBUG,"Removing dependent commands..."); + removecommands(filename); + log(DEFAULT,"Module %s unloaded",filename); + MODCOUNT--; + return true; + } + } + log(DEFAULT,"Module %s is not loaded, cannot unload it!",filename); + snprintf(MODERR,MAXBUF,"Module not loaded"); + return false; +} + +bool DirValid(char* dirandfile) +{ + char work[MAXBUF]; + strlcpy(work,dirandfile,MAXBUF); + int p = strlen(work); + // we just want the dir + while (strlen(work)) + { + if (work[p] == '/') + { + work[p] = '\0'; + break; + } + work[p--] = '\0'; + } + char buffer[MAXBUF], otherdir[MAXBUF]; + // Get the current working directory + if( getcwd( buffer, MAXBUF ) == NULL ) + return false; + chdir(work); + if( getcwd( otherdir, MAXBUF ) == NULL ) + return false; + chdir(buffer); + if (strlen(otherdir) >= strlen(work)) + { + otherdir[strlen(work)] = '\0'; + if (!strcmp(otherdir,work)) + { + return true; + } + return false; + } + else return false; +} + +bool LoadModule(const char* filename) +{ + char modfile[MAXBUF]; + snprintf(modfile,MAXBUF,"%s/%s",ModPath,filename); + if (!DirValid(modfile)) + { + log(DEFAULT,"Module %s is not within the modules directory.",modfile); + snprintf(MODERR,MAXBUF,"Module %s is not within the modules directory.",modfile); + return false; + } + log(DEBUG,"Loading module: %s",modfile); + if (FileExists(modfile)) + { + for (int j = 0; j < module_names.size(); j++) + { + if (module_names[j] == std::string(filename)) + { + log(DEFAULT,"Module %s is already loaded, cannot load a module twice!",modfile); + snprintf(MODERR,MAXBUF,"Module already loaded"); + return false; + } + } + ircd_module* a = new ircd_module(modfile); + factory[MODCOUNT+1] = a; + if (factory[MODCOUNT+1]->LastError()) + { + log(DEFAULT,"Unable to load %s: %s",modfile,factory[MODCOUNT+1]->LastError()); + snprintf(MODERR,MAXBUF,"Loader/Linker error: %s",factory[MODCOUNT+1]->LastError()); + MODCOUNT--; + return false; + } + if (factory[MODCOUNT+1]->factory) + { + Module* m = factory[MODCOUNT+1]->factory->CreateModule(); + modules[MODCOUNT+1] = m; + /* save the module and the module's classfactory, if + * this isnt done, random crashes can occur :/ */ + module_names.push_back(filename); + } + else + { + log(DEFAULT,"Unable to load %s",modfile); + snprintf(MODERR,MAXBUF,"Factory function failed!"); + return false; + } + } + else + { + log(DEFAULT,"InspIRCd: startup: Module Not Found %s",modfile); + snprintf(MODERR,MAXBUF,"Module file could not be found"); + return false; + } + MODCOUNT++; + return true; +} int InspIRCd(void) { @@ -3232,8 +3707,7 @@ 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; @@ -3244,27 +3718,26 @@ int InspIRCd(void) Exit(ERROR); } - 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"); Exit(ERROR); - log(DEBUG,"InspIRCd: startup: not starting with UID 0!"); + log(DEFAULT,"InspIRCd: startup: not starting with UID 0!"); } SetupCommandTable(); 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++) { @@ -3278,120 +3751,73 @@ 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; + UDPportCount = 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)UDPportCount); + log(DEBUG,"InspIRCd: startup: InspIRCd is now starting!"); printf("\n"); /* BugFix By Craig! :p */ - count = 0; - for (count2 = 0; count2 < ConfValueEnum("module",&config_f); count2++) + MODCOUNT = -1; + for (count = 0; count < ConfValueEnum("module",&config_f); count++) { - char modfile[MAXBUF]; - ConfValue("module","name",count2,configToken,&config_f); - snprintf(modfile,MAXBUF,"%s/%s",MOD_PATH,configToken,&config_f); - printf("Loading module... \033[1;37m%s\033[0;37m\n",modfile); - log(DEBUG,"InspIRCd: startup: Loading module: %s",modfile); - /* If The File Doesnt exist, Trying to load it - * Will Segfault the IRCd.. So, check to see if - * it Exists, Before Proceeding. */ - if (FileExists(modfile)) - { - factory[count] = new ircd_module(modfile); - if (factory[count]->LastError()) - { - log(DEBUG,"Unable to load %s: %s",modfile,factory[count]->LastError()); - printf("Unable to load %s: %s\nExiting...\n",modfile,factory[count]->LastError()); - Exit(ERROR); - } - if (factory[count]->factory) - { - modules[count] = factory[count]->factory->CreateModule(); - /* save the module and the module's classfactory, if - * this isnt done, random crashes can occur :/ */ - module_names.push_back(modfile); - } - else - { - log(DEBUG,"Unable to load %s",modfile); - printf("Unable to load %s\nExiting...\n",modfile); - Exit(ERROR); - } - /* Increase the Count */ - count++; - } - else + ConfValue("module","name",count,configToken,&config_f); + printf("Loading module... \033[1;32m%s\033[0m\n",configToken); + if (!LoadModule(configToken)) { - log(DEBUG,"InspIRCd: startup: Module Not Found %s",modfile); - printf("Module Not Found: \033[1;37m%s\033[0;37m, Skipping\n",modfile); + 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); } } - MODCOUNT = count - 1; - 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(DEBUG,"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 */ FD_ZERO(&selectFds); 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(DEBUG,"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 */ { @@ -3399,29 +3825,48 @@ 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(DEBUG,"InspIRCd: startup: no ports bound, bailing!"); + 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); + } + } + + WritePID(PID); + length = sizeof (client); - char udp_msg[MAXBUF], tcp_host[MAXBUF]; + char udp_msg[MAXBUF],tcp_host[MAXBUF]; 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[65535]; 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; @@ -3440,33 +3885,20 @@ int InspIRCd(void) // we only read time() once per iteration rather than tons of times! TIME = time(NULL); - user_hash::iterator count2 = clientlist.begin(); - // *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)) { expire_lines(); + FOREACH_MOD OnBackgroundTimer(TIME); expire_run = true; + continue; } 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++) - { - //Blocking(fd_reap[n]); - close(fd_reap[n]); - shutdown (fd_reap[n],2); - //NonBlocking(fd_reap[n]); - } - } - 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(); FD_ZERO(&serverfds); @@ -3478,7 +3910,8 @@ int InspIRCd(void) // 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) { @@ -3489,14 +3922,17 @@ int InspIRCd(void) char remotehost[MAXBUF],resolved[MAXBUF]; length = sizeof (client); incomingSockfd = accept (me[x]->fd, (sockaddr *) &client, &length); - strlcpy(remotehost,(char *)inet_ntoa(client.sin_addr),MAXBUF); - if(CleanAndResolve(resolved, remotehost) != TRUE) + if (incomingSockfd != -1) { - strlcpy(resolved,remotehost,MAXBUF); + strlcpy(remotehost,(char *)inet_ntoa(client.sin_addr),MAXBUF); + if(CleanAndResolve(resolved, remotehost) != TRUE) + { + strlcpy(resolved,remotehost,MAXBUF); + } + // add to this connections ircd_connector vector + // *FIX* - we need the LOCAL port not the remote port in &client! + me[x]->AddIncoming(incomingSockfd,resolved,me[x]->port); } - // add to this connections ircd_connector vector - // *FIX* - we need the LOCAL port not the remote port in &client! - me[x]->AddIncoming(incomingSockfd,resolved,me[x]->port); } } } @@ -3509,11 +3945,11 @@ int InspIRCd(void) { for (int ctr = 0; ctr < msgs.size(); ctr++) { - char udp_msg[MAXBUF]; strlcpy(udp_msg,msgs[ctr].c_str(),MAXBUF); - if (strlen(udp_msg)<1) + log(DEBUG,"Processing: %s",udp_msg); + if (!udp_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 @@ -3529,7 +3965,9 @@ int InspIRCd(void) else NetSendToAllExcept(tcp_host,udp_msg); } - FOREACH_MOD OnPacketReceive(udp_msg); + std::string msg = udp_msg; + FOREACH_MOD OnPacketReceive(msg,tcp_host); + strlcpy(udp_msg,msg.c_str(),MAXBUF); handle_link_packet(udp_msg, tcp_host, me[x]); } goto label; @@ -3546,7 +3984,7 @@ int InspIRCd(void) user_hash::iterator endingiter = count2; if (count2 == clientlist.end()) break; - + if (count2->second) if (count2->second->fd != 0) { @@ -3560,7 +3998,7 @@ int InspIRCd(void) if (count2 != clientlist.end()) { // we don't check the state of remote users. - if (count2->second->fd > 0) + if ((count2->second->fd != -1) && (count2->second->fd != FD_MAGIC_NUMBER)) { FD_SET (count2->second->fd, &sfd); @@ -3572,14 +4010,16 @@ int InspIRCd(void) kill_link(count2->second,"Registration timeout"); goto label; } - if ((TIME > count2->second->signon) && (count2->second->registered == 3)) + if ((TIME > count2->second->signon) && (count2->second->registered == 3) && (AllModulesReportReady(count2->second))) { - count2->second->dns_done = true; - FullConnectUser(count2->second); - goto label; + log(DEBUG,"signon exceed, registered=3, and modules ready, OK"); + count2->second->dns_done = true; + FullConnectUser(count2->second); + goto label; } - if ((count2->second->dns_done) && (count2->second->registered == 3)) // both NICK and USER... and DNS + if ((count2->second->dns_done) && (count2->second->registered == 3) && (AllModulesReportReady(count2->second))) // both NICK and USER... and DNS { + log(DEBUG,"dns done, registered=3, and modules ready, OK"); FullConnectUser(count2->second); goto label; } @@ -3594,7 +4034,7 @@ int InspIRCd(void) Write(count2->second->fd,"PING :%s",ServerName); log(DEBUG,"InspIRCd: pinging: %s",count2->second->nick); count2->second->lastping = 0; - count2->second->nping = TIME+120; + count2->second->nping = TIME+count2->second->pingmax; // was hard coded to 120 } } count2++; @@ -3610,7 +4050,7 @@ int InspIRCd(void) // tvals defined here - tval.tv_usec = 7000L; + 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 @@ -3623,47 +4063,66 @@ int InspIRCd(void) #endif result = EAGAIN; - if ((count2a->second->fd != -1) && (FD_ISSET (count2a->second->fd, &sfd))) + if ((count2a->second->fd != FD_MAGIC_NUMBER) && (count2a->second->fd != -1) && (FD_ISSET (count2a->second->fd, &sfd))) { - memset(data, 0, 10240); - result = read(count2a->second->fd, data, 10240); - + result = read(count2a->second->fd, data, 65535); if (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: *" + for (int checker = 0; checker < result; checker++) + { + if ((data[checker] == 0) || (data[checker] == 7)) + data[checker] = ' '; + } + if (result > 0) + data[result] = '\0'; userrec* current = count2a->second; int currfd = current->fd; - char* l = strtok(data,"\n"); int floodlines = 0; - while (l) + current->AddBuffer(data); + if (current->recvq.length() > NetBufferSize) { - floodlines++; - if ((floodlines > current->flood) && (current->flood != 0)) + 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"); - goto label; + kill_link(current,"RecvQ exceeded"); } - char sanitized[NetBufferSize]; - memset(sanitized, 0, NetBufferSize); - int ptt = 0; - for (int pt = 0; pt < strlen(l); pt++) + else + { + 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 (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 + strlcpy(sanitized,current->GetBuffer().c_str(),MAXBUF); + if (*sanitized) { - - // 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++) { @@ -3679,7 +4138,6 @@ int InspIRCd(void) goto label; } - l = strtok(NULL,"\n"); } goto label; } @@ -3714,13 +4172,13 @@ 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 // set up select call for (count = 0; count < boundPortCount; count++) @@ -3728,7 +4186,7 @@ int InspIRCd(void) 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 */ @@ -3747,20 +4205,23 @@ 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]); } else { 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; } } } label: - if(0) {}; // "Label must be followed by a statement"... so i gave it one. + if (0) {}; +#ifdef _POSIX_PRIORITY_SCHEDULING + sched_yield(); +#endif } /* not reached */ close (incomingSockfd);