X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Finspircd.cpp;h=4464be7559dbab30c4a8bd7b1891baceb3f39f51;hb=55bd1494b060dba7c266b91824f3fcce64a4d7a8;hp=714ab6a8a1cef60ac6659ed02bb5d1eb903f1153;hpb=16934ea87517d1b45419cadf2376a7da11a69b27;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/inspircd.cpp b/src/inspircd.cpp index 714ab6a8a..4464be755 100644 --- a/src/inspircd.cpp +++ b/src/inspircd.cpp @@ -32,7 +32,6 @@ using namespace std; #include #include #endif -#include #include #include #ifdef GCC3 @@ -43,10 +42,7 @@ using namespace std; #include #include #include -#include #include -#include -#include #include #include "connection.h" #include "users.h" @@ -62,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]; @@ -115,74 +107,10 @@ time_t TIME = time(NULL), OLDTIME = time(NULL); int kq, lkq, skq; #endif -namespace nspace -{ -#ifdef GCC34 - template<> struct hash -#else - template<> struct nspace::hash -#endif - { - size_t operator()(const struct in_addr &a) const - { - size_t q; - memcpy(&q,&a,sizeof(size_t)); - return q; - } - }; -#ifdef GCC34 - template<> struct hash -#else - template<> struct nspace::hash -#endif - { - size_t operator()(const string &s) const - { - char a[MAXBUF]; - static struct hash strhash; - strlcpy(a,s.c_str(),MAXBUF); - strlower(a); - return strhash(a); - } - }; -} - - -struct StrHashComp -{ - - bool operator()(const string& s1, const string& s2) const - { - char a[MAXBUF],b[MAXBUF]; - strlcpy(a,s1.c_str(),MAXBUF); - strlcpy(b,s2.c_str(),MAXBUF); - strlower(a); - strlower(b); - return (strcasecmp(a,b) == 0); - } - -}; - -struct InAddr_HashComp -{ - - bool operator()(const in_addr &s1, const in_addr &s2) const - { - size_t q; - size_t p; - - memcpy(&q,&s1,sizeof(size_t)); - memcpy(&p,&s2,sizeof(size_t)); - - return (q == p); - } - -}; - - -typedef nspace::hash_map, StrHashComp> user_hash; -typedef nspace::hash_map, StrHashComp> chan_hash; -typedef nspace::hash_map, InAddr_HashComp> address_cache; +typedef nspace::hash_map, irc::StrHashComp> user_hash; +typedef nspace::hash_map, irc::StrHashComp> chan_hash; +typedef nspace::hash_map, irc::InAddr_HashComp> address_cache; +typedef nspace::hash_map, irc::StrHashComp> whowas_hash; typedef std::deque command_table; // This table references users by file descriptor. @@ -198,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; @@ -227,8 +155,6 @@ std::stringstream config_f(stringstream::in | stringstream::out); std::vector all_opers; -static char already_sent[65536]; - char lowermap[255]; void AddOper(userrec* user) @@ -293,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[24] = ':'; // we know this is the end of the time string - fprintf(log_file,"%s %s\n",b,textbuffer); - if (nofork) - { - // nofork enabled? display it on terminal too - printf("%s %s\n",b,textbuffer); - } - } -} - -void readfile(file_cache &F, const char* fname) -{ - FILE* file; - char linebuf[MAXBUF]; - - log(DEBUG,"readfile: loading %s",fname); - F.clear(); - file = fopen(fname,"r"); - if (file) - { - while (!feof(file)) - { - fgets(linebuf,sizeof(linebuf),file); - linebuf[strlen(linebuf)-1]='\0'; - if (linebuf[0] == 0) - { - strcpy(linebuf," "); - } - if (!feof(file)) - { - F.push_back(linebuf); - } - } - fclose(file); - } - else - { - log(DEBUG,"readfile: failed to load file: %s",fname); - } - log(DEBUG,"readfile: loaded %s, %lu lines",fname,(unsigned long)F.size()); -} - void ReadConfig(bool bail, userrec* user) { char dbg[MAXBUF],pauseval[MAXBUF],Value[MAXBUF],timeout[MAXBUF],NB[MAXBUF],flood[MAXBUF],MW[MAXBUF]; - char AH[MAXBUF],AP[MAXBUF],AF[MAXBUF],DNT[MAXBUF],pfreq[MAXBUF],thold[MAXBUF],sqmax[MAXBUF]; + char AH[MAXBUF],AP[MAXBUF],AF[MAXBUF],DNT[MAXBUF],pfreq[MAXBUF],thold[MAXBUF],sqmax[MAXBUF],rqmax[MAXBUF]; ConnectClass c; std::stringstream errstr; @@ -464,6 +329,7 @@ void ReadConfig(bool bail, userrec* user) ConfValue("connect","pingfreq",i,pfreq,&config_f); ConfValue("connect","threshold",i,thold,&config_f); ConfValue("connect","sendq",i,sqmax,&config_f); + ConfValue("connect","recvq",i,rqmax,&config_f); if (Value[0]) { strlcpy(c.host,Value,MAXBUF); @@ -475,7 +341,8 @@ void ReadConfig(bool bail, userrec* user) c.pingtime = 120; c.flood = atoi(flood); c.threshold = 5; - c.sendqmax = 131072; + c.sendqmax = 262144; // 256k + c.recvqmax = 4096; // 4k if (atoi(thold)>0) { c.threshold = atoi(thold); @@ -484,6 +351,10 @@ void ReadConfig(bool bail, userrec* user) { c.sendqmax = atoi(sqmax); } + if (atoi(rqmax)>0) + { + c.recvqmax = atoi(rqmax); + } if (atoi(timeout)>0) { c.registration_timeout = atoi(timeout); @@ -553,1036 +424,39 @@ void ReadConfig(bool bail, userrec* user) 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 - * New in 1.0 Beta 5 - Nothing is written directly to a users fd any more. - * Instead, data builds up in the users sendq and each time around the mainloop - * this data is flushed to the user's socket (see userrec::FlushWriteBuf). - */ - -void Write(int sock,char *text, ...) -{ - if (sock < 0) - return; - if (!text) - { - log(DEFAULT,"*** BUG *** Write was given an invalid parameter"); - return; - } - char textbuffer[MAXBUF]; - va_list argsPtr; - char tb[MAXBUF]; - int res; - - va_start (argsPtr, text); - vsnprintf(textbuffer, MAXBUF, text, argsPtr); - va_end(argsPtr); - int bytes = snprintf(tb,MAXBUF,"%s\r\n",textbuffer); - chop(tb); - if (fd_ref_table[sock]) - { - int MOD_RESULT = 0; - FOREACH_RESULT(OnRawSocketWrite(sock,tb,bytes)); - fd_ref_table[sock]->AddWriteBuf(tb); - statsSent += bytes; - } - else log(DEFAULT,"ERROR! attempted write to a user with no fd_ref_table entry!!!"); -} - -/* write a server formatted numeric response to a single socket */ - -void WriteServ(int sock, char* text, ...) -{ - if (sock < 0) - return; - if (!text) - { - log(DEFAULT,"*** BUG *** WriteServ was given an invalid parameter"); - return; - } - char textbuffer[MAXBUF],tb[MAXBUF]; - int res; - va_list argsPtr; - va_start (argsPtr, text); - - vsnprintf(textbuffer, MAXBUF, text, argsPtr); - va_end(argsPtr); - int bytes = snprintf(tb,MAXBUF,":%s %s\r\n",ServerName,textbuffer); - chop(tb); - if (fd_ref_table[sock]) - { - int MOD_RESULT = 0; - FOREACH_RESULT(OnRawSocketWrite(sock,tb,bytes)); - fd_ref_table[sock]->AddWriteBuf(tb); - statsSent += bytes; - } - else log(DEFAULT,"ERROR! attempted write to a user with no fd_ref_table entry!!!"); -} - -/* write text from an originating user to originating user */ - -void WriteFrom(int sock, userrec *user,char* text, ...) -{ - if (sock < 0) - return; - if ((!text) || (!user)) - { - log(DEFAULT,"*** BUG *** WriteFrom was given an invalid parameter"); - return; - } - char textbuffer[MAXBUF],tb[MAXBUF]; - va_list argsPtr; - int res; - va_start (argsPtr, text); - - vsnprintf(textbuffer, MAXBUF, text, argsPtr); - va_end(argsPtr); - int bytes = snprintf(tb,MAXBUF,":%s!%s@%s %s\r\n",user->nick,user->ident,user->dhost,textbuffer); - chop(tb); - if (fd_ref_table[sock]) - { - int MOD_RESULT = 0; - FOREACH_RESULT(OnRawSocketWrite(sock,tb,bytes)); - fd_ref_table[sock]->AddWriteBuf(tb); - statsSent += bytes; - } - else log(DEFAULT,"ERROR! attempted write to a user with no fd_ref_table entry!!!"); -} - -/* write text to an destination user from a source user (e.g. user privmsg) */ - -void WriteTo(userrec *source, userrec *dest,char *data, ...) -{ - if ((!dest) || (!data)) - { - log(DEFAULT,"*** BUG *** WriteTo was given an invalid parameter"); - return; - } - if (dest->fd == FD_MAGIC_NUMBER) - return; - char textbuffer[MAXBUF],tb[MAXBUF]; - va_list argsPtr; - va_start (argsPtr, data); - vsnprintf(textbuffer, MAXBUF, data, argsPtr); - va_end(argsPtr); - chop(tb); - - // if no source given send it from the server. - if (!source) - { - WriteServ(dest->fd,":%s %s",ServerName,textbuffer); - } - else - { - WriteFrom(dest->fd,source,"%s",textbuffer); - } -} - -/* write formatted text from a source user to all users on a channel - * including the sender (NOT for privmsg, notice etc!) */ - -void WriteChannel(chanrec* Ptr, userrec* user, char* text, ...) -{ - if ((!Ptr) || (!user) || (!text)) - { - log(DEFAULT,"*** BUG *** WriteChannel was given an invalid parameter"); - return; - } - char textbuffer[MAXBUF]; - va_list argsPtr; - va_start (argsPtr, text); - vsnprintf(textbuffer, MAXBUF, text, argsPtr); - va_end(argsPtr); - - std::vector *ulist = Ptr->GetUsers(); - for (int j = 0; j < ulist->size(); j++) - { - char* o = (*ulist)[j]; - userrec* otheruser = (userrec*)o; - if (otheruser->fd != FD_MAGIC_NUMBER) - WriteTo(user,otheruser,"%s",textbuffer); - } -} - -/* write formatted text from a source user to all users on a channel - * including the sender (NOT for privmsg, notice etc!) doesnt send to - * users on remote servers */ - -void WriteChannelLocal(chanrec* Ptr, userrec* user, char* text, ...) -{ - if ((!Ptr) || (!text)) - { - log(DEFAULT,"*** BUG *** WriteChannel was given an invalid parameter"); - return; - } - char textbuffer[MAXBUF]; - va_list argsPtr; - va_start (argsPtr, text); - vsnprintf(textbuffer, MAXBUF, text, argsPtr); - va_end(argsPtr); - - std::vector *ulist = Ptr->GetUsers(); - for (int j = 0; j < ulist->size(); j++) - { - char* o = (*ulist)[j]; - userrec* otheruser = (userrec*)o; - if ((otheruser->fd != FD_MAGIC_NUMBER) && (otheruser->fd != -1) && (otheruser != user)) - { - if (!user) - { - WriteServ(otheruser->fd,"%s",textbuffer); - } - else - { - WriteTo(user,otheruser,"%s",textbuffer); - } - } - } -} - - -void WriteChannelWithServ(char* ServName, chanrec* Ptr, char* text, ...) -{ - if ((!Ptr) || (!text)) - { - log(DEFAULT,"*** BUG *** WriteChannelWithServ was given an invalid parameter"); - return; - } - char textbuffer[MAXBUF]; - va_list argsPtr; - va_start (argsPtr, text); - vsnprintf(textbuffer, MAXBUF, text, argsPtr); - va_end(argsPtr); - - - std::vector *ulist = Ptr->GetUsers(); - for (int j = 0; j < ulist->size(); j++) - { - char* o = (*ulist)[j]; - userrec* otheruser = (userrec*)o; - if (otheruser->fd != FD_MAGIC_NUMBER) - WriteServ(otheruser->fd,"%s",textbuffer); - } -} - - -/* write formatted text from a source user to all users on a channel except - * for the sender (for privmsg etc) */ - -void ChanExceptSender(chanrec* Ptr, userrec* user, char* text, ...) -{ - if ((!Ptr) || (!user) || (!text)) - { - log(DEFAULT,"*** BUG *** ChanExceptSender was given an invalid parameter"); - return; - } - char textbuffer[MAXBUF]; - va_list argsPtr; - va_start (argsPtr, text); - vsnprintf(textbuffer, MAXBUF, text, argsPtr); - va_end(argsPtr); - - std::vector *ulist = Ptr->GetUsers(); - for (int j = 0; j < ulist->size(); j++) - { - char* o = (*ulist)[j]; - userrec* otheruser = (userrec*)o; - if ((otheruser->fd != FD_MAGIC_NUMBER) && (user != otheruser)) - WriteFrom(otheruser->fd,user,"%s",textbuffer); - } -} - - -std::string GetServerDescription(char* servername) -{ - for (int j = 0; j < 32; j++) - { - if (me[j] != NULL) - { - for (int k = 0; k < me[j]->connectors.size(); k++) - { - if (!strcasecmp(me[j]->connectors[k].GetServerName().c_str(),servername)) - { - return me[j]->connectors[k].GetDescription(); - } - } - } - return ServerDesc; // not a remote server that can be found, it must be me. - } -} - - -/* write a formatted string to all users who share at least one common - * channel, including the source user e.g. for use in NICK */ - -void WriteCommon(userrec *u, char* text, ...) -{ - if (!u) - { - log(DEFAULT,"*** BUG *** WriteCommon was given an invalid parameter"); - return; - } - - if (u->registered != 7) { - log(DEFAULT,"*** BUG *** WriteCommon on an unregistered user"); - return; - } - - char textbuffer[MAXBUF]; - va_list argsPtr; - va_start (argsPtr, text); - vsnprintf(textbuffer, MAXBUF, text, argsPtr); - va_end(argsPtr); - - // FIX: Stops a message going to the same person more than once - bzero(&already_sent,65536); - - bool sent_to_at_least_one = false; - - for (int i = 0; i < MAXCHANS; i++) - { - if (u->chans[i].channel) - { - std::vector *ulist = u->chans[i].channel->GetUsers(); - for (int j = 0; j < ulist->size(); j++) - { - char* o = (*ulist)[j]; - userrec* otheruser = (userrec*)o; - if ((otheruser->fd > 0) && (!already_sent[otheruser->fd])) - { - already_sent[otheruser->fd] = 1; - WriteFrom(otheruser->fd,u,"%s",textbuffer); - sent_to_at_least_one = true; - } - } - } - } - // if the user was not in any channels, no users will receive the text. Make sure the user - // receives their OWN message for WriteCommon - if (!sent_to_at_least_one) - { - WriteFrom(u->fd,u,"%s",textbuffer); - } -} - -/* write a formatted string to all users who share at least one common - * channel, NOT including the source user e.g. for use in QUIT */ - -void WriteCommonExcept(userrec *u, char* text, ...) -{ - if (!u) - { - log(DEFAULT,"*** BUG *** WriteCommon was given an invalid parameter"); - return; - } - - if (u->registered != 7) { - log(DEFAULT,"*** BUG *** WriteCommon on an unregistered user"); - return; - } - - char textbuffer[MAXBUF]; - va_list argsPtr; - va_start (argsPtr, text); - vsnprintf(textbuffer, MAXBUF, text, argsPtr); - va_end(argsPtr); - - bzero(&already_sent,65536); - - for (int i = 0; i < MAXCHANS; i++) - { - if (u->chans[i].channel) - { - std::vector *ulist = u->chans[i].channel->GetUsers(); - for (int j = 0; j < ulist->size(); j++) - { - char* o = (*ulist)[j]; - userrec* otheruser = (userrec*)o; - if (u != otheruser) - { - if ((otheruser->fd > 0) && (!already_sent[otheruser->fd])) - { - already_sent[otheruser->fd] = 1; - WriteFrom(otheruser->fd,u,"%s",textbuffer); - } - } - } - } - } -} - -void WriteOpers(char* text, ...) -{ - if (!text) - { - log(DEFAULT,"*** BUG *** WriteOpers was given an invalid parameter"); - return; - } - - char textbuffer[MAXBUF]; - va_list argsPtr; - va_start (argsPtr, text); - vsnprintf(textbuffer, MAXBUF, text, argsPtr); - va_end(argsPtr); - - for (std::vector::iterator i = all_opers.begin(); i != all_opers.end(); i++) - { - userrec* a = *i; - if ((a) && (a->fd != FD_MAGIC_NUMBER)) - { - if (strchr(a->modes,'s')) - { - // send server notices to all with +s - WriteServ(a->fd,"NOTICE %s :%s",a->nick,textbuffer); - } - } - } -} - -void NoticeAllOpers(userrec *source, bool local_only, char* text, ...) -{ - if ((!text) || (!source)) - { - log(DEFAULT,"*** BUG *** NoticeAllOpers was given an invalid parameter"); - return; - } - - char textbuffer[MAXBUF]; - va_list argsPtr; - va_start (argsPtr, text); - vsnprintf(textbuffer, MAXBUF, text, argsPtr); - va_end(argsPtr); - - for (std::vector::iterator i = all_opers.begin(); i != all_opers.end(); i++) - { - userrec* a = *i; - if ((a) && (a->fd != FD_MAGIC_NUMBER)) - { - if (strchr(a->modes,'s')) - { - // send server notices to all with +s - WriteServ(a->fd,"NOTICE %s :*** Notice From %s: %s",a->nick,source->nick,textbuffer); - } - } - } - - if (!local_only) - { - char buffer[MAXBUF]; - snprintf(buffer,MAXBUF,"V %s @* :%s",source->nick,textbuffer); - NetSendToAll(buffer); - } -} - -// returns TRUE of any users on channel C occupy server 'servername'. - -bool ChanAnyOnThisServer(chanrec *c,char* servername) -{ - log(DEBUG,"ChanAnyOnThisServer"); - - std::vector *ulist = c->GetUsers(); - for (int j = 0; j < ulist->size(); j++) - { - char* o = (*ulist)[j]; - userrec* user = (userrec*)o; - if (!strcasecmp(user->server,servername)) - return true; - } - return false; -} - -// returns true if user 'u' shares any common channels with any users on server 'servername' - -bool CommonOnThisServer(userrec* u,const char* servername) -{ - log(DEBUG,"ChanAnyOnThisServer"); - - for (int i = 0; i < MAXCHANS; i++) - { - if (u->chans[i].channel) - { - std::vector *ulist = u->chans[i].channel->GetUsers(); - for (int j = 0; j < ulist->size(); j++) - { - char* o = (*ulist)[j]; - userrec* user = (userrec*)o; - if (!strcasecmp(user->server,servername)) - return true; - } - } - } - return false; -} - - -void NetSendToCommon(userrec* u, char* s) -{ - char buffer[MAXBUF]; - snprintf(buffer,MAXBUF,"%s",s); - - log(DEBUG,"NetSendToCommon: '%s' '%s'",u->nick,s); - - std::string msg = buffer; - FOREACH_MOD OnPacketTransmit(msg,s); - strlcpy(buffer,msg.c_str(),MAXBUF); - - for (int j = 0; j < 32; j++) - { - if (me[j] != NULL) - { - for (int k = 0; k < me[j]->connectors.size(); k++) - { - if (CommonOnThisServer(u,me[j]->connectors[k].GetServerName().c_str())) - { - me[j]->SendPacket(buffer,me[j]->connectors[k].GetServerName().c_str()); - } - } - } - } -} - - -void NetSendToAll(char* s) -{ - char buffer[MAXBUF]; - snprintf(buffer,MAXBUF,"%s",s); - - log(DEBUG,"NetSendToAll: '%s'",s); - - std::string msg = buffer; - FOREACH_MOD OnPacketTransmit(msg,s); - strlcpy(buffer,msg.c_str(),MAXBUF); - - for (int j = 0; j < 32; j++) - { - if (me[j] != NULL) - { - for (int k = 0; k < me[j]->connectors.size(); k++) - { - me[j]->SendPacket(buffer,me[j]->connectors[k].GetServerName().c_str()); - } - } - } -} - -void NetSendToAllAlive(char* s) -{ - char buffer[MAXBUF]; - snprintf(buffer,MAXBUF,"%s",s); - - log(DEBUG,"NetSendToAllAlive: '%s'",s); - - std::string msg = buffer; - FOREACH_MOD OnPacketTransmit(msg,s); - strlcpy(buffer,msg.c_str(),MAXBUF); - - for (int j = 0; j < 32; j++) - { - if (me[j] != NULL) - { - for (int k = 0; k < me[j]->connectors.size(); k++) - { - if (me[j]->connectors[k].GetState() != STATE_DISCONNECTED) - { - me[j]->SendPacket(buffer,me[j]->connectors[k].GetServerName().c_str()); - } - else - { - log(DEBUG,"%s is dead, not sending to it.",me[j]->connectors[k].GetServerName().c_str()); - } - } - } - } -} - - -void NetSendToOne(char* target,char* s) -{ - char buffer[MAXBUF]; - snprintf(buffer,MAXBUF,"%s",s); - - log(DEBUG,"NetSendToOne: '%s' '%s'",target,s); - - std::string msg = buffer; - FOREACH_MOD OnPacketTransmit(msg,s); - strlcpy(buffer,msg.c_str(),MAXBUF); - - for (int j = 0; j < 32; j++) - { - if (me[j] != NULL) - { - for (int k = 0; k < me[j]->connectors.size(); k++) - { - if (!strcasecmp(me[j]->connectors[k].GetServerName().c_str(),target)) - { - me[j]->SendPacket(buffer,me[j]->connectors[k].GetServerName().c_str()); - } - } - } - } -} - -void NetSendToAllExcept(const char* target,char* s) -{ - char buffer[MAXBUF]; - snprintf(buffer,MAXBUF,"%s",s); - - log(DEBUG,"NetSendToAllExcept: '%s' '%s'",target,s); - - std::string msg = buffer; - FOREACH_MOD OnPacketTransmit(msg,s); - strlcpy(buffer,msg.c_str(),MAXBUF); - - for (int j = 0; j < 32; j++) - { - if (me[j] != NULL) - { - for (int k = 0; k < me[j]->connectors.size(); k++) - { - if (strcasecmp(me[j]->connectors[k].GetServerName().c_str(),target)) - { - me[j]->SendPacket(buffer,me[j]->connectors[k].GetServerName().c_str()); - } - } - } - } -} - - -void WriteMode(const char* modes, int flags, const char* text, ...) -{ - if ((!text) || (!modes) || (!flags)) - { - log(DEFAULT,"*** BUG *** WriteMode was given an invalid parameter"); - return; - } - - char textbuffer[MAXBUF]; - va_list argsPtr; - va_start (argsPtr, text); - vsnprintf(textbuffer, MAXBUF, text, argsPtr); - va_end(argsPtr); - int modelen = strlen(modes); - - for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++) - { - if ((i->second) && (i->second->fd != FD_MAGIC_NUMBER)) - { - bool send_to_user = false; - - if (flags == WM_AND) - { - send_to_user = true; - for (int n = 0; n < modelen; n++) - { - if (!hasumode(i->second,modes[n])) - { - send_to_user = false; - break; - } - } - } - else if (flags == WM_OR) - { - send_to_user = false; - for (int n = 0; n < modelen; n++) - { - if (hasumode(i->second,modes[n])) - { - send_to_user = true; - break; - } - } - } - - if (send_to_user) - { - WriteServ(i->second->fd,"NOTICE %s :%s",i->second->nick,textbuffer); - } - } - } -} - - -void NoticeAll(userrec *source, bool local_only, char* text, ...) -{ - if ((!text) || (!source)) - { - log(DEFAULT,"*** BUG *** NoticeAll was given an invalid parameter"); - return; - } - - char textbuffer[MAXBUF]; - va_list argsPtr; - va_start (argsPtr, text); - vsnprintf(textbuffer, MAXBUF, text, argsPtr); - va_end(argsPtr); - - for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++) - { - if ((i->second) && (i->second->fd != FD_MAGIC_NUMBER)) - { - WriteFrom(i->second->fd,source,"NOTICE $* :%s",textbuffer); - } - } - - if (!local_only) - { - char buffer[MAXBUF]; - snprintf(buffer,MAXBUF,"V %s * :%s",source->nick,textbuffer); - NetSendToAll(buffer); - } - -} - -void WriteWallOps(userrec *source, bool local_only, char* text, ...) -{ - if ((!text) || (!source)) - { - log(DEFAULT,"*** BUG *** WriteOpers was given an invalid parameter"); - return; - } - - char textbuffer[MAXBUF]; - va_list argsPtr; - va_start (argsPtr, text); - vsnprintf(textbuffer, MAXBUF, text, argsPtr); - va_end(argsPtr); - - for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++) - { - if ((i->second) && (i->second->fd != FD_MAGIC_NUMBER)) - { - if (strchr(i->second->modes,'w')) - { - WriteTo(source,i->second,"WALLOPS :%s",textbuffer); - } - } - } - - if (!local_only) - { - char buffer[MAXBUF]; - snprintf(buffer,MAXBUF,"@ %s :%s",source->nick,textbuffer); - NetSendToAll(buffer); - } -} - -/* convert a string to lowercase. Note following special circumstances - * taken from RFC 1459. Many "official" server branches still hold to this - * rule so i will too; - * - * Because of IRC's scandanavian origin, the characters {}| are - * considered to be the lower case equivalents of the characters []\, - * respectively. This is a critical issue when determining the - * equivalence of two nicknames. - */ - -void strlower(char *n) -{ - if (n) - { - for (char* t = n; *t; t++) - *t = lowermap[*t]; - } -} - - - -/* 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(userrec* u) -{ - - int go_again = 1, purge = 0; - - // firstly decrement the count on each channel - for (int f = 0; f < MAXCHANS; f++) - { - if (u->chans[f].channel) - { - u->chans[f].channel->DelUser((char*)u); - } - } - - for (int i = 0; i < MAXCHANS; i++) - { - if (u->chans[i].channel) + // 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 (!usercount(u->chans[i].channel)) + if (UnloadModule(removing->c_str())) { - chan_hash::iterator i2 = chanlist.find(u->chans[i].channel->name); - /* kill the record */ - if (i2 != chanlist.end()) - { - log(DEBUG,"del_channel: destroyed: %s",i2->second->name); - if (i2->second) - delete i2->second; - chanlist.erase(i2); - go_again = 1; - purge++; - u->chans[i].channel = NULL; - } + 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 { - log(DEBUG,"skipped purge for %s",u->chans[i].channel->name); + WriteServ(user->fd,"972 %s %s :Failed to unload module %s: %s",user->nick, removing->c_str(), removing->c_str(), ModuleError()); } } - } - log(DEBUG,"completed channel purge, killed %lu",(unsigned long)purge); - - DeleteOper(u); -} - - -char scratch[MAXBUF]; -char sparam[MAXBUF]; - -char* chanmodes(chanrec *chan) -{ - if (!chan) - { - log(DEFAULT,"*** BUG *** chanmodes was given an invalid parameter"); - strcpy(scratch,""); - return scratch; - } - - strcpy(scratch,""); - strcpy(sparam,""); - if (chan->noexternal) - { - strlcat(scratch,"n",MAXMODES); - } - if (chan->topiclock) - { - strlcat(scratch,"t",MAXMODES); - } - if (chan->key[0]) - { - strlcat(scratch,"k",MAXMODES); - } - if (chan->limit) - { - strlcat(scratch,"l",MAXMODES); - } - if (chan->inviteonly) - { - strlcat(scratch,"i",MAXMODES); - } - if (chan->moderated) - { - strlcat(scratch,"m",MAXMODES); - } - if (chan->secret) - { - strlcat(scratch,"s",MAXMODES); - } - if (chan->c_private) - { - strlcat(scratch,"p",MAXMODES); - } - if (chan->key[0]) - { - strlcat(sparam," ",MAXBUF); - strlcat(sparam,chan->key,MAXBUF); - } - if (chan->limit) - { - char foo[24]; - sprintf(foo," %lu",(unsigned long)chan->limit); - strlcat(sparam,foo,MAXBUF); - } - if (*chan->custom_modes) - { - strlcat(scratch,chan->custom_modes,MAXMODES); - for (int z = 0; chan->custom_modes[z] != 0; z++) + if (!added_modules.empty()) + for (std::vector::iterator adding = added_modules.begin(); adding != added_modules.end(); adding++) { - std::string extparam = chan->GetModeParameter(chan->custom_modes[z]); - if (extparam != "") + if (LoadModule(adding->c_str())) { - strlcat(sparam," ",MAXBUF); - strlcat(sparam,extparam.c_str(),MAXBUF); + 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++; } - } - } - 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); - - std::vector *ulist = c->GetUsers(); - for (int i = 0; i < ulist->size(); i++) - { - char* o = (*ulist)[i]; - userrec* otheruser = (userrec*)o; - if ((!has_channel(user,c)) && (strchr(otheruser->modes,'i'))) - { - /* user is +i, and source not on the channel, does not show - * nick in NAMES list */ - continue; - } - strlcat(list,cmode(otheruser,c),MAXBUF); - strlcat(list,otheruser->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 whats left in the list isnt empty, send it */ - if (list[strlen(list)-1] != ':') - { - WriteServ(user->fd,"%s",list); - } -} - -/* return a count of the users on a specific channel accounting for - * invisible users who won't increase the count. e.g. for /LIST */ - -int usercount_i(chanrec *c) -{ - int count = 0; - - if (!c) - { - log(DEFAULT,"*** BUG *** usercount_i was given an invalid parameter"); - return 0; - } - - strcpy(list,""); - for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++) - { - if (i->second) - { - if (has_channel(i->second,c)) + else { - 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++; - } + WriteServ(user->fd,"974 %s %s :Failed to load module %s: %s",user->nick, adding->c_str(), adding->c_str(), ModuleError()); } } + log(DEFAULT,"Successfully unloaded %lu of %lu modules and loaded %lu of %lu modules.",(unsigned long)rem,(unsigned long)removed_modules.size(),(unsigned long)add,(unsigned long)added_modules.size()); } - log(DEBUG,"usercount_i: %s %lu",c->name,(unsigned long)count); - return count; -} - - -int usercount(chanrec *c) -{ - if (!c) - { - log(DEFAULT,"*** BUG *** usercount was given an invalid parameter"); - return 0; - } - int count = c->GetUserCounter(); - log(DEBUG,"usercount: %s %lu",c->name,(unsigned long)count); - return count; } @@ -1633,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); @@ -1699,7 +572,7 @@ chanrec* add_channel(userrec *user, const char* cn, const char* key, bool overri FOREACH_RESULT(OnCheckInvite(user, Ptr)); if (MOD_RESULT == 0) { - if (Ptr->inviteonly) + if (Ptr->binarymodes & CM_INVITEONLY) { log(DEBUG,"add_channel: channel is +i"); if (user->IsInvited(Ptr->name)) @@ -1791,7 +664,6 @@ chanrec* add_channel(userrec *user, const char* cn, const char* key, bool overri user->chans[index].uc_modes = 0; } user->chans[index].channel = Ptr; - Ptr->IncUserCounter(); Ptr->AddUser((char*)user); WriteChannel(Ptr,user,"JOIN :%s",Ptr->name); @@ -2223,9 +1095,9 @@ void kill_link(userrec *user,const char* r) log(DEBUG,"deleting user hash value %lu",(unsigned long)user); if (user->fd > -1) fd_ref_table[user->fd] = NULL; - delete user; clientlist.erase(iter); } + delete user; } void kill_link_silent(userrec *user,const char* r) @@ -2282,74 +1154,9 @@ void kill_link_silent(userrec *user,const char* r) log(DEBUG,"deleting user hash value %lu",(unsigned long)user); if (user->fd > -1) fd_ref_table[user->fd] = NULL; - delete user; clientlist.erase(iter); } -} - - - -// looks up a users password for their connection class (/ tags) - -char* Passwd(userrec *user) -{ - for (ClassVector::iterator i = Classes.begin(); i != Classes.end(); i++) - { - if (match(user->host,i->host) && (i->type == CC_ALLOW)) - { - return i->pass; - } - } - return ""; -} - -bool IsDenied(userrec *user) -{ - for (ClassVector::iterator i = Classes.begin(); i != Classes.end(); i++) - { - if (match(user->host,i->host) && (i->type == CC_DENY)) - { - return true; - } - } - return false; -} - - - - -/* sends out an error notice to all connected clients (not to be used - * lightly!) */ - -void send_error(char *s) -{ - log(DEBUG,"send_error: %s",s); - for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++) - { - if (isnick(i->second->nick)) - { - WriteServ(i->second->fd,"NOTICE %s :%s",i->second->nick,s); - } - else - { - // fix - unregistered connections receive ERROR, not NOTICE - Write(i->second->fd,"ERROR :%s",s); - } - } -} - -void Error(int status) -{ - signal (SIGALRM, SIG_IGN); - signal (SIGPIPE, SIG_IGN); - signal (SIGTERM, SIG_IGN); - signal (SIGABRT, SIG_IGN); - signal (SIGSEGV, SIG_IGN); - signal (SIGURG, SIG_IGN); - signal (SIGKILL, SIG_IGN); - log(DEFAULT,"*** fell down a pothole in the road to perfection ***"); - send_error("Error! Segmentation fault! save meeeeeeeeeeeeee *splat!*"); - Exit(status); + delete user; } @@ -2429,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); @@ -2441,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; @@ -2458,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 { @@ -2508,6 +1320,8 @@ void AddClient(int socket, char* host, int port, bool iscached, char* ip) // issue in earlier alphas/betas if (iter != clientlist.end()) { + userrec* goner = iter->second; + delete goner; clientlist.erase(iter); } @@ -2528,18 +1342,19 @@ void AddClient(int socket, char* host, int port, bool iscached, char* ip) strncpy(clientlist[tempnick]->host, host,160); strncpy(clientlist[tempnick]->dhost, host,160); strncpy(clientlist[tempnick]->server, ServerName,256); - strncpy(clientlist[tempnick]->ident, "unknown",12); + 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 = 131072; // 128kb + long class_sqmax = 262144; // 256kb + long class_rqmax = 4096; // 4k for (ClassVector::iterator i = Classes.begin(); i != Classes.end(); i++) { @@ -2550,6 +1365,7 @@ void AddClient(int socket, char* host, int port, bool iscached, char* ip) clientlist[tempnick]->pingmax = i->pingtime; class_threshold = i->threshold; class_sqmax = i->sendqmax; + class_rqmax = i->recvqmax; break; } } @@ -2559,6 +1375,7 @@ void AddClient(int socket, char* host, int port, bool iscached, char* ip) 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++) { @@ -2579,7 +1396,7 @@ void AddClient(int socket, char* host, int port, bool iscached, char* ip) // irc server at once (or the irc server otherwise initiating this many connections, files etc) // which for the time being is a physical impossibility (even the largest networks dont have more // than about 10,000 users on ONE server!) - if (socket > 65535) + if (socket > 65534) { kill_link(clientlist[tempnick],"Server is full"); return; @@ -2643,135 +1460,6 @@ void AddClient(int socket, char* host, int port, bool iscached, char* ip) #endif } -// 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 i = 0; i < 32; i++) - { - if (me[i] != NULL) - { - for (vector::iterator j = me[i]->connectors.begin(); j != me[i]->connectors.end(); j++) - { - if (strcasecmp(j->GetServerName().c_str(),ServerName)) - { - c++; - } - } - } - } - return c; -} - -long servercount(void) -{ - return count_servs()+1; -} - -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) -{ - char buf[65536]; - std::string WholeMOTD = ""; - if (!MOTD.size()) - { - WriteServ(user->fd,"422 %s :Message of the day file is missing.",user->nick); - return; - } - snprintf(buf,65535,":%s 375 %s :- %s message of the day\r\n", ServerName, user->nick, ServerName); - WholeMOTD = WholeMOTD + buf; - for (int i = 0; i != MOTD.size(); i++) - { - snprintf(buf,65535,":%s 372 %s :- %s\r\n", ServerName, user->nick, MOTD[i].c_str()); - WholeMOTD = WholeMOTD + buf; - } - snprintf(buf,65535,":%s 376 %s :End of message of the day.\r\n", ServerName, user->nick); - WholeMOTD = WholeMOTD + buf; - // only one write operation - user->AddWriteBuf(WholeMOTD); - statsSent += WholeMOTD.length(); -} - -void ShowRULES(userrec *user) -{ - if (!RULES.size()) - { - WriteServ(user->fd,"NOTICE %s :Rules file is missing.",user->nick); - return; - } - WriteServ(user->fd,"NOTICE %s :%s rules",user->nick,ServerName); - for (int i = 0; i != RULES.size(); i++) - { - WriteServ(user->fd,"NOTICE %s :%s",user->nick,RULES[i].c_str()); - } - WriteServ(user->fd,"NOTICE %s :End of %s rules.",user->nick,ServerName); -} - /* shows the message of the day, and any other on-logon stuff */ void FullConnectUser(userrec* user) { @@ -2859,20 +1547,6 @@ void FullConnectUser(userrec* user) } -// 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) { @@ -3032,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]; @@ -3416,22 +2056,6 @@ void process_command(userrec *user, char* cmd) } } - -void createcommand(char* cmd, handlerfunc f, char flags, int minparams,char* source) -{ - command_t comm; - /* create the command and push it onto the table */ - strlcpy(comm.command,cmd,MAXBUF); - strlcpy(comm.source,source,MAXBUF); - comm.handler_function = f; - comm.flags_needed = flags; - comm.min_params = minparams; - comm.use_count = 0; - comm.total_bytes = 0; - cmdlist.push_back(comm); - log(DEBUG,"Added command %s (%lu parameters)",cmd,(unsigned long)minparams); -} - bool removecommands(const char* source) { bool go_again = true; @@ -3452,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) { @@ -3568,7 +2137,7 @@ void DoSync(serverrec* serv, char* tcp_host) // send start of sync marker: Y // at this point the ircd receiving it starts broadcasting this netburst to all ircds // except the ones its receiving it from. - snprintf(data,MAXBUF,"Y %lu",(unsigned long)TIME); + snprintf(data,MAXBUF,"%s Y %lu",CreateSum().c_str(),(unsigned long)TIME); serv->SendPacket(data,tcp_host); // send users and channels @@ -3583,7 +2152,7 @@ void DoSync(serverrec* serv, char* tcp_host) { if (is_uline(me[j]->connectors[k].GetServerName().c_str())) { - snprintf(data,MAXBUF,"H %s",me[j]->connectors[k].GetServerName().c_str()); + snprintf(data,MAXBUF,"%s H %s",CreateSum().c_str(),me[j]->connectors[k].GetServerName().c_str()); serv->SendPacket(data,tcp_host); } } @@ -3591,17 +2160,17 @@ void DoSync(serverrec* serv, char* tcp_host) } // send our version for the remote side to cache - snprintf(data,MAXBUF,"v %s %s",ServerName,GetVersionString().c_str()); + snprintf(data,MAXBUF,"%s v %s %s",CreateSum().c_str(),ServerName,GetVersionString().c_str()); serv->SendPacket(data,tcp_host); // sync the users and channels, give the modules a look-in. for (user_hash::iterator u = clientlist.begin(); u != clientlist.end(); u++) { - snprintf(data,MAXBUF,"N %lu %s %s %s %s +%s %s %s :%s",(unsigned long)u->second->age,u->second->nick,u->second->host,u->second->dhost,u->second->ident,u->second->modes,u->second->ip,u->second->server,u->second->fullname); + snprintf(data,MAXBUF,"%s N %lu %s %s %s %s +%s %s %s :%s",CreateSum().c_str(),(unsigned long)u->second->age,u->second->nick,u->second->host,u->second->dhost,u->second->ident,u->second->modes,u->second->ip,u->second->server,u->second->fullname); serv->SendPacket(data,tcp_host); if (strchr(u->second->modes,'o')) { - snprintf(data,MAXBUF,"| %s %s",u->second->nick,u->second->oper); + snprintf(data,MAXBUF,"%s | %s %s",CreateSum().c_str(),u->second->nick,u->second->oper); serv->SendPacket(data,tcp_host); } for (int i = 0; i <= MODCOUNT; i++) @@ -3609,14 +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); } } char* chl = chlist(u->second,u->second); if (strcmp(chl,"")) { - snprintf(data,MAXBUF,"J %s %s",u->second->nick,chl); + snprintf(data,MAXBUF,"%s J %s %s",CreateSum().c_str(),u->second->nick,chl); serv->SendPacket(data,tcp_host); } } @@ -3630,27 +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 (c->second->topic[0]) { - snprintf(data,MAXBUF,"T %lu %s %s :%s",(unsigned long)c->second->topicset,c->second->setby,c->second->name,c->second->topic); + snprintf(data,MAXBUF,"%s T %lu %s %s :%s",CreateSum().c_str(),(unsigned long)c->second->topicset,c->second->setby,c->second->name,c->second->topic); serv->SendPacket(data,tcp_host); } // send current banlist for (BanList::iterator b = c->second->bans.begin(); b != c->second->bans.end(); b++) { - snprintf(data,MAXBUF,"M %s +b %s",c->second->name,b->data); + snprintf(data,MAXBUF,"%s M %s +b %s",CreateSum().c_str(),c->second->name,b->data); serv->SendPacket(data,tcp_host); } } // sync global zlines, glines, etc sync_xlines(serv,tcp_host); - snprintf(data,MAXBUF,"F %lu",(unsigned long)TIME); + snprintf(data,MAXBUF,"%s F %lu",CreateSum().c_str(),(unsigned long)TIME); serv->SendPacket(data,tcp_host); log(DEBUG,"Sent sync"); // ircd sends its serverlist after the end of sync here @@ -3842,67 +2411,6 @@ bool UnloadModule(const char* filename) return false; } -bool DirValid(char* dirandfile) -{ - char work[MAXBUF]; - strlcpy(work,dirandfile,MAXBUF); - int p = strlen(work); - // we just want the dir - while (strlen(work)) - { - if (work[p] == '/') - { - work[p] = '\0'; - break; - } - work[p--] = '\0'; - } - char buffer[MAXBUF], otherdir[MAXBUF]; - // Get the current working directory - if( getcwd( buffer, MAXBUF ) == NULL ) - return false; - chdir(work); - if( getcwd( otherdir, MAXBUF ) == NULL ) - return false; - chdir(buffer); - if (strlen(otherdir) >= strlen(work)) - { - otherdir[strlen(work)] = '\0'; - if (!strcmp(otherdir,work)) - { - return true; - } - return false; - } - else return false; -} - -std::string GetFullProgDir(char** argv, int argc) -{ - char work[MAXBUF]; - strlcpy(work,argv[0],MAXBUF); - int p = strlen(work); - // we just want the dir - while (strlen(work)) - { - if (work[p] == '/') - { - work[p] = '\0'; - break; - } - work[p--] = '\0'; - } - char buffer[MAXBUF], otherdir[MAXBUF]; - // Get the current working directory - if( getcwd( buffer, MAXBUF ) == NULL ) - return ""; - chdir(work); - if( getcwd( otherdir, MAXBUF ) == NULL ) - return ""; - chdir(buffer); - return otherdir; -} - bool LoadModule(const char* filename) { char modfile[MAXBUF]; @@ -4169,7 +2677,7 @@ int InspIRCd(char** argv, int argc) WritePID(PID); length = sizeof (client); - char tcp_msg[MAXBUF],tcp_host[MAXBUF]; + char tcp_msg[MAXBUF],tcp_host[MAXBUF],tcp_sum[MAXBUF]; #ifdef USE_KQUEUE struct kevent ke; @@ -4272,12 +2780,15 @@ int InspIRCd(char** argv, int argc) 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++) { 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]) { @@ -4291,16 +2802,16 @@ int InspIRCd(char** argv, int argc) { if ((tcp_msg[0] != 'Y') && (tcp_msg[0] != 'X') && (tcp_msg[0] != 'F')) { - NetSendToAllExcept(tcp_host,tcp_msg); + NetSendToAllExcept_WithSum(tcp_host,tcp_msg,tcp_sum); } } else - NetSendToAllExcept(tcp_host,tcp_msg); + NetSendToAllExcept_WithSum(tcp_host,tcp_msg,tcp_sum); } std::string msg = tcp_msg; FOREACH_MOD OnPacketReceive(msg,tcp_host); strlcpy(tcp_msg,msg.c_str(),MAXBUF); - handle_link_packet(tcp_msg, tcp_host, me[x]); + handle_link_packet(tcp_msg, tcp_host, me[x], tcp_sum); } goto label; }