X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fhelperfuncs.cpp;h=77a74c32c111d6b2ceea501d2f2d15fff28b8158;hb=9dd72b7003963d868a23da930a91300b49ab4959;hp=52f365fb2430f69fec8ba253542f9bc419f93ea9;hpb=f0ad6011a36b17b42223bf78f62fd252cc858941;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp index 52f365fb2..77a74c32c 100644 --- a/src/helperfuncs.cpp +++ b/src/helperfuncs.cpp @@ -14,25 +14,20 @@ * --------------------------------------------------- */ -using namespace std; - +#include #include "inspircd_config.h" #include "inspircd.h" -#include "inspircd_io.h" +#include "configreader.h" #include #include #include +#include #include #include -#ifdef GCC3 -#include -#else -#include -#endif #include -#include -#include -#include +#ifdef HAS_EXECINFO +#include +#endif #include "connection.h" #include "users.h" #include "ctables.h" @@ -50,18 +45,19 @@ using namespace std; #include "typedefs.h" extern int MODCOUNT; -extern std::vector modules; +extern ModuleList modules; extern ServerConfig *Config; extern InspIRCd* ServerInstance; extern time_t TIME; extern char lowermap[255]; -static char list[MAXBUF]; extern userrec* fd_ref_table[MAX_DESCRIPTORS]; static char already_sent[MAX_DESCRIPTORS]; extern std::vector all_opers; extern user_hash clientlist; extern chan_hash chanlist; +char LOG_FILE[MAXBUF]; + extern std::vector local_users; static char TIMESTR[26]; @@ -71,12 +67,13 @@ static time_t LAST = 0; * Write a line of text `text' to the logfile (and stdout, if in nofork) if the level `level' * is greater than the configured loglevel. */ -void log(int level, char *text, ...) +void do_log(int level, const char *text, ...) { va_list argsPtr; char textbuffer[MAXBUF]; - if (level < Config->LogLevel) + /* If we were given -debug we output all messages, regardless of configured loglevel */ + if ((level < Config->LogLevel) && !Config->forcedebug) return; if (TIME != LAST) @@ -94,14 +91,17 @@ void log(int level, char *text, ...) vsnprintf(textbuffer, MAXBUF, text, argsPtr); va_end(argsPtr); - if (Config->log_file) - fprintf(Config->log_file,"%s %s\n",TIMESTR,textbuffer); - - if (Config->nofork) + if (Config->writelog) { - printf("%s %s\n", TIMESTR, textbuffer); + fprintf(Config->log_file,"%s %s\n",TIMESTR,textbuffer); + fflush(Config->log_file); } } + + if (Config->nofork) + { + printf("%s %s\n", TIMESTR, textbuffer); + } } /** readfile() @@ -158,11 +158,11 @@ void Write_NoFormat(int sock, const char *text) if ((sock < 0) || (!text) || (sock > MAX_DESCRIPTORS)) return; - bytes = snprintf(tb,MAXBUF,"%s\r\n",text); - chop(tb); - if (fd_ref_table[sock]) { + bytes = snprintf(tb,MAXBUF,"%s\r\n",text); + chop(tb); + if (Config->GetIOHook(fd_ref_table[sock]->port)) { try @@ -203,14 +203,15 @@ void Write(int sock, char *text, ...) return; } - va_start(argsPtr, text); - vsnprintf(textbuffer, MAXBUF, text, argsPtr); - va_end(argsPtr); - bytes = snprintf(tb,MAXBUF,"%s\r\n",textbuffer); - chop(tb); - if (fd_ref_table[sock]) { + + va_start(argsPtr, text); + vsnprintf(textbuffer, MAXBUF, text, argsPtr); + va_end(argsPtr); + bytes = snprintf(tb,MAXBUF,"%s\r\n",textbuffer); + chop(tb); + if (Config->GetIOHook(fd_ref_table[sock]->port)) { try @@ -243,11 +244,11 @@ void WriteServ_NoFormat(int sock, const char* text) if ((sock < 0) || (!text) || (sock > MAX_DESCRIPTORS)) return; - bytes = snprintf(tb,MAXBUF,":%s %s\r\n",Config->ServerName,text); - chop(tb); - if (fd_ref_table[sock]) { + bytes = snprintf(tb,MAXBUF,":%s %s\r\n",Config->ServerName,text); + chop(tb); + if (Config->GetIOHook(fd_ref_table[sock]->port)) { try @@ -276,8 +277,6 @@ void WriteServ(int sock, char* text, ...) { va_list argsPtr; char textbuffer[MAXBUF]; - char tb[MAXBUF]; - int bytes; if ((sock < 0) || (sock > MAX_DESCRIPTORS)) return; @@ -288,34 +287,14 @@ void WriteServ(int sock, char* text, ...) return; } + if (!fd_ref_table[sock]) + return; + va_start(argsPtr, text); vsnprintf(textbuffer, MAXBUF, text, argsPtr); va_end(argsPtr); - bytes = snprintf(tb,MAXBUF,":%s %s\r\n",Config->ServerName,textbuffer); - chop(tb); - - if (fd_ref_table[sock]) - { - if (Config->GetIOHook(fd_ref_table[sock]->port)) - { - try - { - Config->GetIOHook(fd_ref_table[sock]->port)->OnRawSocketWrite(sock,tb,bytes); - } - catch (ModuleException& modexcept) - { - log(DEBUG,"Module exception caught: %s",modexcept.GetReason()); - } - } - else - { - fd_ref_table[sock]->AddWriteBuf(tb); - } - - ServerInstance->stats->statsSent += bytes; - } - else - log(DEFAULT,"ERROR! attempted write to a user with no fd_ref_table entry!!!"); + + WriteServ_NoFormat(sock, textbuffer); } /** WriteFrom_NoFormat() @@ -330,11 +309,11 @@ void WriteFrom_NoFormat(int sock, userrec *user, const char* text) if ((sock < 0) || (!text) || (!user) || (sock > MAX_DESCRIPTORS)) return; - bytes = snprintf(tb,MAXBUF,":%s %s\r\n",user->GetFullHost(),text); - chop(tb); - if (fd_ref_table[sock]) { + bytes = snprintf(tb,MAXBUF,":%s %s\r\n",user->GetFullHost(),text); + chop(tb); + if (Config->GetIOHook(fd_ref_table[sock]->port)) { try @@ -374,14 +353,15 @@ void WriteFrom(int sock, userrec *user,char* text, ...) return; } - va_start(argsPtr, text); - vsnprintf(textbuffer, MAXBUF, text, argsPtr); - va_end(argsPtr); - bytes = snprintf(tb,MAXBUF,":%s %s\r\n",user->GetFullHost(),textbuffer); - chop(tb); - if (fd_ref_table[sock]) { + + va_start(argsPtr, text); + vsnprintf(textbuffer, MAXBUF, text, argsPtr); + va_end(argsPtr); + bytes = snprintf(tb,MAXBUF,":%s %s\r\n",user->GetFullHost(),textbuffer); + chop(tb); + if (Config->GetIOHook(fd_ref_table[sock]->port)) { try @@ -458,7 +438,7 @@ void WriteChannel(chanrec* Ptr, userrec* user, char* text, ...) { char textbuffer[MAXBUF]; va_list argsPtr; - std::map *ulist; + CUList *ulist; if ((!Ptr) || (!user) || (!text)) { @@ -472,20 +452,16 @@ void WriteChannel(chanrec* Ptr, userrec* user, char* text, ...) ulist = Ptr->GetUsers(); - for (std::map::iterator i = ulist->begin(); i != ulist->end(); i++) + for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++) { - /* XXX - WHAT THE HELL are we doing here? :P --w00t */ - char* o = i->second; - userrec* otheruser = (userrec*)o; - - if (otheruser->fd != FD_MAGIC_NUMBER) - WriteTo_NoFormat(user,otheruser,textbuffer); + if (i->second->fd != FD_MAGIC_NUMBER) + WriteTo_NoFormat(user,i->second,textbuffer); } } void WriteChannel_NoFormat(chanrec* Ptr, userrec* user, const char* text) { - std::map *ulist; + CUList *ulist; if ((!Ptr) || (!user) || (!text)) { @@ -495,14 +471,10 @@ void WriteChannel_NoFormat(chanrec* Ptr, userrec* user, const char* text) ulist = Ptr->GetUsers(); - for (std::map::iterator i = ulist->begin(); i != ulist->end(); i++) + for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++) { - /* XXX - .....and here! --w00t */ - char* o = i->second; - userrec* otheruser = (userrec*)o; - - if (otheruser->fd != FD_MAGIC_NUMBER) - WriteTo_NoFormat(user,otheruser,text); + if (i->second->fd != FD_MAGIC_NUMBER) + WriteTo_NoFormat(user,i->second,text); } } @@ -515,7 +487,7 @@ void WriteChannelLocal(chanrec* Ptr, userrec* user, char* text, ...) { char textbuffer[MAXBUF]; va_list argsPtr; - std::map *ulist; + CUList *ulist; if ((!Ptr) || (!text)) { @@ -529,21 +501,17 @@ void WriteChannelLocal(chanrec* Ptr, userrec* user, char* text, ...) ulist = Ptr->GetUsers(); - for (std::map::iterator i = ulist->begin(); i != ulist->end(); i++) + for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++) { - /* XXX -- w00t */ - char* o = i->second; - userrec* otheruser = (userrec*)o; - - if ((otheruser->fd != FD_MAGIC_NUMBER) && (otheruser != user)) + if ((i->second->fd != FD_MAGIC_NUMBER) && (i->second != user)) { if (!user) { - WriteServ_NoFormat(otheruser->fd,textbuffer); + WriteServ_NoFormat(i->second->fd,textbuffer); } else { - WriteTo_NoFormat(user,otheruser,textbuffer); + WriteTo_NoFormat(user,i->second,textbuffer); } } } @@ -551,7 +519,7 @@ void WriteChannelLocal(chanrec* Ptr, userrec* user, char* text, ...) void WriteChannelLocal_NoFormat(chanrec* Ptr, userrec* user, const char* text) { - std::map *ulist; + CUList *ulist; if ((!Ptr) || (!text)) { @@ -561,21 +529,17 @@ void WriteChannelLocal_NoFormat(chanrec* Ptr, userrec* user, const char* text) ulist = Ptr->GetUsers(); - for (std::map::iterator i = ulist->begin(); i != ulist->end(); i++) + for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++) { - /* XXX -- w00t */ - char* o = i->second; - userrec* otheruser = (userrec*)o; - - if ((otheruser->fd != FD_MAGIC_NUMBER) && (otheruser != user)) + if ((i->second->fd != FD_MAGIC_NUMBER) && (i->second != user)) { if (!user) { - WriteServ_NoFormat(otheruser->fd,text); + WriteServ_NoFormat(i->second->fd,text); } else { - WriteTo_NoFormat(user,otheruser,text); + WriteTo_NoFormat(user,i->second,text); } } } @@ -583,11 +547,11 @@ void WriteChannelLocal_NoFormat(chanrec* Ptr, userrec* user, const char* text) -void WriteChannelWithServ(char* ServName, chanrec* Ptr, char* text, ...) +void WriteChannelWithServ(const char* ServName, chanrec* Ptr, const char* text, ...) { char textbuffer[MAXBUF]; va_list argsPtr; - std::map *ulist; + CUList *ulist; if ((!Ptr) || (!text)) { @@ -601,20 +565,16 @@ void WriteChannelWithServ(char* ServName, chanrec* Ptr, char* text, ...) ulist = Ptr->GetUsers(); - for (std::map::iterator i = ulist->begin(); i != ulist->end(); i++) + for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++) { - /* XXX */ - char* o = i->second; - userrec* otheruser = (userrec*)o; - - if (IS_LOCAL(otheruser)) - WriteServ_NoFormat(otheruser->fd,textbuffer); + if (IS_LOCAL(i->second)) + WriteServ_NoFormat(i->second->fd,textbuffer); } } -void WriteChannelWithServ_NoFormat(char* ServName, chanrec* Ptr, const char* text) +void WriteChannelWithServ_NoFormat(const char* ServName, chanrec* Ptr, const char* text) { - std::map *ulist; + CUList *ulist; if ((!Ptr) || (!text)) { @@ -624,14 +584,10 @@ void WriteChannelWithServ_NoFormat(char* ServName, chanrec* Ptr, const char* tex ulist = Ptr->GetUsers(); - for (std::map::iterator i = ulist->begin(); i != ulist->end(); i++) + for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++) { - /* XXX */ - char* o = i->second; - userrec* otheruser = (userrec*)o; - - if (IS_LOCAL(otheruser)) - WriteServ_NoFormat(otheruser->fd,text); + if (IS_LOCAL(i->second)) + WriteServ_NoFormat(i->second->fd,text); } } @@ -644,7 +600,7 @@ void ChanExceptSender(chanrec* Ptr, userrec* user, char status, char* text, ...) { char textbuffer[MAXBUF]; va_list argsPtr; - std::map *ulist; + CUList *ulist; if ((!Ptr) || (!user) || (!text)) { @@ -674,20 +630,16 @@ void ChanExceptSender(chanrec* Ptr, userrec* user, char status, char* text, ...) log(DEBUG,"%d users to write to",ulist->size()); - for (std::map::iterator i = ulist->begin(); i != ulist->end(); i++) + for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++) { - /* XXX */ - char* o = i->second; - userrec* otheruser = (userrec*)o; - - if ((IS_LOCAL(otheruser)) && (user != otheruser)) - WriteFrom_NoFormat(otheruser->fd,user,textbuffer); + if ((IS_LOCAL(i->second)) && (user != i->second)) + WriteFrom_NoFormat(i->second->fd,user,textbuffer); } } void ChanExceptSender_NoFormat(chanrec* Ptr, userrec* user, char status, const char* text) { - std::map *ulist; + CUList *ulist; if ((!Ptr) || (!user) || (!text)) { @@ -711,18 +663,14 @@ void ChanExceptSender_NoFormat(chanrec* Ptr, userrec* user, char status, const c break; } - for (std::map::iterator i = ulist->begin(); i != ulist->end(); i++) + for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++) { - /* XXX */ - char* o = i->second; - userrec* otheruser = (userrec*)o; - - if ((IS_LOCAL(otheruser)) && (user != otheruser)) - WriteFrom_NoFormat(otheruser->fd,user,text); + if ((IS_LOCAL(i->second)) && (user != i->second)) + WriteFrom_NoFormat(i->second->fd,user,text); } } -std::string GetServerDescription(char* servername) +std::string GetServerDescription(const char* servername) { std::string description = ""; @@ -747,7 +695,6 @@ void WriteCommon(userrec *u, char* text, ...) char textbuffer[MAXBUF]; va_list argsPtr; bool sent_to_at_least_one = false; - unsigned int y; if (!u) { @@ -767,23 +714,19 @@ void WriteCommon(userrec *u, char* text, ...) // FIX: Stops a message going to the same person more than once memset(&already_sent,0,MAX_DESCRIPTORS); - y = u->chans.size(); - for (unsigned int i = 0; i < y; i++) + for (std::vector::const_iterator v = u->chans.begin(); v != u->chans.end(); v++) { - if (u->chans[i].channel) + if (((ucrec*)(*v))->channel) { - std::map *ulist= u->chans[i].channel->GetUsers(); + CUList *ulist= ((ucrec*)(*v))->channel->GetUsers(); - for (std::map::iterator i = ulist->begin(); i != ulist->end(); i++) + for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++) { - char* o = i->second; - userrec* otheruser = (userrec*)o; - - if ((otheruser->fd > -1) && (!already_sent[otheruser->fd])) + if ((i->second->fd > -1) && (!already_sent[i->second->fd])) { - already_sent[otheruser->fd] = 1; - WriteFrom_NoFormat(otheruser->fd,u,textbuffer); + already_sent[i->second->fd] = 1; + WriteFrom_NoFormat(i->second->fd,u,textbuffer); sent_to_at_least_one = true; } } @@ -803,7 +746,6 @@ void WriteCommon(userrec *u, char* text, ...) void WriteCommon_NoFormat(userrec *u, const char* text) { bool sent_to_at_least_one = false; - unsigned int y; if (!u) { @@ -819,23 +761,19 @@ void WriteCommon_NoFormat(userrec *u, const char* text) // FIX: Stops a message going to the same person more than once memset(&already_sent,0,MAX_DESCRIPTORS); - y = u->chans.size(); - for (unsigned int i = 0; i < y; i++) + for (std::vector::const_iterator v = u->chans.begin(); v != u->chans.end(); v++) { - if (u->chans[i].channel) + if (((ucrec*)(*v))->channel) { - std::map *ulist= u->chans[i].channel->GetUsers(); + CUList *ulist= ((ucrec*)(*v))->channel->GetUsers(); - for (std::map::iterator i = ulist->begin(); i != ulist->end(); i++) + for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++) { - char* o = i->second; - userrec* otheruser = (userrec*)o; - - if ((otheruser->fd > -1) && (!already_sent[otheruser->fd])) + if ((i->second->fd > -1) && (!already_sent[i->second->fd])) { - already_sent[otheruser->fd] = 1; - WriteFrom_NoFormat(otheruser->fd,u,text); + already_sent[i->second->fd] = 1; + WriteFrom_NoFormat(i->second->fd,u,text); sent_to_at_least_one = true; } } @@ -864,7 +802,6 @@ void WriteCommonExcept(userrec *u, char* text, ...) bool quit_munge = false; va_list argsPtr; int total; - unsigned int y; if (!u) { @@ -887,7 +824,6 @@ void WriteCommonExcept(userrec *u, char* text, ...) /* Yeah yeah, this is ugly. But its fast, live with it. */ char* check = textbuffer; - /* XXX - don't mean to be picky, but I think this could be done better */ if ((*check++ == 'Q') && (*check++ == 'U') && (*check++ == 'I') && (*check++ == 'T') && (*check++ == ' ') && (*check++ == ':')) { std::stringstream split(check); @@ -925,31 +861,27 @@ void WriteCommonExcept(userrec *u, char* text, ...) } memset(&already_sent,0,MAX_DESCRIPTORS); - y = u->chans.size(); - for (unsigned int i = 0; i < y; i++) + for (std::vector::const_iterator v = u->chans.begin(); v != u->chans.end(); v++) { - if (u->chans[i].channel) + if (((ucrec*)(*v))->channel) { - std::map *ulist= u->chans[i].channel->GetUsers(); + CUList *ulist= ((ucrec*)(*v))->channel->GetUsers(); - for (std::map::iterator i = ulist->begin(); i != ulist->end(); i++) + for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++) { - char* o = i->second; - userrec* otheruser = (userrec*)o; - - if (u != otheruser) + if (u != i->second) { - if ((otheruser->fd > -1) && (!already_sent[otheruser->fd])) + if ((i->second->fd > -1) && (!already_sent[i->second->fd])) { - already_sent[otheruser->fd] = 1; + already_sent[i->second->fd] = 1; if (quit_munge) { - WriteFrom_NoFormat(otheruser->fd,u,*otheruser->oper ? oper_quit : textbuffer); + WriteFrom_NoFormat(i->second->fd,u,*i->second->oper ? oper_quit : textbuffer); } else - WriteFrom_NoFormat(otheruser->fd,u,textbuffer); + WriteFrom_NoFormat(i->second->fd,u,textbuffer); } } } @@ -959,8 +891,6 @@ void WriteCommonExcept(userrec *u, char* text, ...) void WriteCommonExcept_NoFormat(userrec *u, const char* text) { - unsigned int y; - if (!u) { log(DEFAULT,"*** BUG *** WriteCommon was given an invalid parameter"); @@ -974,25 +904,21 @@ void WriteCommonExcept_NoFormat(userrec *u, const char* text) } memset(&already_sent,0,MAX_DESCRIPTORS); - y = u->chans.size(); - for (unsigned int i = 0; i < y; i++) + for (std::vector::const_iterator v = u->chans.begin(); v != u->chans.end(); v++) { - if (u->chans[i].channel) + if (((ucrec*)(*v))->channel) { - std::map *ulist= u->chans[i].channel->GetUsers(); + CUList *ulist= ((ucrec*)(*v))->channel->GetUsers(); - for (std::map::iterator i = ulist->begin(); i != ulist->end(); i++) + for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++) { - char* o = i->second; - userrec* otheruser = (userrec*)o; - - if (u != otheruser) + if (u != i->second) { - if ((otheruser->fd > -1) && (!already_sent[otheruser->fd])) + if ((i->second->fd > -1) && (!already_sent[i->second->fd])) { - already_sent[otheruser->fd] = 1; - WriteFrom_NoFormat(otheruser->fd,u,text); + already_sent[i->second->fd] = 1; + WriteFrom_NoFormat(i->second->fd,u,text); } } } @@ -1001,8 +927,14 @@ void WriteCommonExcept_NoFormat(userrec *u, const char* text) } -/* XXX - replace with a call to WriteMode() ? -- w00t */ -void WriteOpers(char* text, ...) +/* XXX - We don't use WriteMode for this because WriteMode is very slow and + * this isnt. Basically WriteMode has to iterate ALL the users 'n' times for + * the number of modes provided, e.g. if you send WriteMode 'og' to write to + * opers with globops, and you have 2000 users, thats 4000 iterations. WriteOpers + * uses the oper list, which means if you have 2000 users but only 5 opers, + * it iterates 5 times. + */ +void WriteOpers(const char* text, ...) { char textbuffer[MAXBUF]; va_list argsPtr; @@ -1017,16 +949,27 @@ void WriteOpers(char* text, ...) vsnprintf(textbuffer, MAXBUF, text, argsPtr); va_end(argsPtr); + WriteOpers_NoFormat(textbuffer); +} + +void WriteOpers_NoFormat(const char* text) +{ + if (!text) + { + log(DEFAULT,"*** BUG *** WriteOpers_NoFormat was given an invalid parameter"); + return; + } + for (std::vector::iterator i = all_opers.begin(); i != all_opers.end(); i++) { userrec* a = *i; if (IS_LOCAL(a)) { - if (strchr(a->modes,'s')) + if (a->modes[UM_SERVERNOTICE]) { // send server notices to all with +s - WriteServ(a->fd,"NOTICE %s :%s",a->nick,textbuffer); + WriteServ(a->fd,"NOTICE %s :%s",a->nick,text); } } } @@ -1038,15 +981,18 @@ void ServerNoticeAll(char* text, ...) return; char textbuffer[MAXBUF]; + char formatbuffer[MAXBUF]; va_list argsPtr; va_start (argsPtr, text); vsnprintf(textbuffer, MAXBUF, text, argsPtr); va_end(argsPtr); + snprintf(formatbuffer,MAXBUF,"NOTICE $%s :%s",Config->ServerName,textbuffer); + for (std::vector::const_iterator i = local_users.begin(); i != local_users.end(); i++) { userrec* t = (userrec*)(*i); - WriteServ(t->fd,"NOTICE $%s :%s",Config->ServerName,textbuffer); + WriteServ_NoFormat(t->fd,formatbuffer); } } @@ -1056,15 +1002,18 @@ void ServerPrivmsgAll(char* text, ...) return; char textbuffer[MAXBUF]; + char formatbuffer[MAXBUF]; va_list argsPtr; va_start (argsPtr, text); vsnprintf(textbuffer, MAXBUF, text, argsPtr); va_end(argsPtr); + snprintf(formatbuffer,MAXBUF,"PRIVMSG $%s :%s",Config->ServerName,textbuffer); + for (std::vector::const_iterator i = local_users.begin(); i != local_users.end(); i++) { userrec* t = (userrec*)(*i); - WriteServ(t->fd,"PRIVMSG $%s :%s",Config->ServerName,textbuffer); + WriteServ_NoFormat(t->fd,formatbuffer); } } @@ -1096,7 +1045,7 @@ void WriteMode(const char* modes, int flags, const char* text, ...) for (int n = 0; n < modelen; n++) { - if (!hasumode(t,modes[n])) + if (!t->modes[modes[n]-65]) { send_to_user = false; break; @@ -1109,7 +1058,7 @@ void WriteMode(const char* modes, int flags, const char* text, ...) for (int n = 0; n < modelen; n++) { - if (hasumode(t,modes[n])) + if (t->modes[modes[n]-65]) { send_to_user = true; break; @@ -1127,6 +1076,7 @@ void WriteMode(const char* modes, int flags, const char* text, ...) void NoticeAll(userrec *source, bool local_only, char* text, ...) { char textbuffer[MAXBUF]; + char formatbuffer[MAXBUF]; va_list argsPtr; if ((!text) || (!source)) @@ -1139,10 +1089,12 @@ void NoticeAll(userrec *source, bool local_only, char* text, ...) vsnprintf(textbuffer, MAXBUF, text, argsPtr); va_end(argsPtr); + snprintf(formatbuffer,MAXBUF,"NOTICE $* :%s",textbuffer); + for (std::vector::const_iterator i = local_users.begin(); i != local_users.end(); i++) { userrec* t = (userrec*)(*i); - WriteFrom(t->fd,source,"NOTICE $* :%s",textbuffer); + WriteFrom_NoFormat(t->fd,source,formatbuffer); } } @@ -1150,6 +1102,7 @@ void NoticeAll(userrec *source, bool local_only, char* text, ...) void WriteWallOps(userrec *source, bool local_only, char* text, ...) { char textbuffer[MAXBUF]; + char formatbuffer[MAXBUF]; va_list argsPtr; if ((!text) || (!source)) @@ -1162,13 +1115,15 @@ void WriteWallOps(userrec *source, bool local_only, char* text, ...) vsnprintf(textbuffer, MAXBUF, text, argsPtr); va_end(argsPtr); + snprintf(formatbuffer,MAXBUF,"WALLOPS :%s",textbuffer); + for (std::vector::const_iterator i = local_users.begin(); i != local_users.end(); i++) { userrec* t = (userrec*)(*i); - if ((IS_LOCAL(t)) && (strchr(t->modes,'w'))) + if ((IS_LOCAL(t)) && (t->modes[UM_WALLOPS])) { - WriteTo(source,t,"WALLOPS :%s",textbuffer); + WriteTo_NoFormat(source,t,formatbuffer); } } } @@ -1187,13 +1142,13 @@ void strlower(char *n) if (n) { for (char* t = n; *t; t++) - *t = lowermap[(unsigned)*t]; + *t = lowermap[(unsigned char)*t]; } } /* Find a user record by nickname and return a pointer to it */ -userrec* Find(std::string nick) +userrec* Find(const std::string &nick) { user_hash::iterator iter = clientlist.find(nick); @@ -1257,50 +1212,38 @@ long GetMaxBans(char* name) void purge_empty_chans(userrec* u) { - int purge = 0; + std::vector to_delete; // firstly decrement the count on each channel - for (unsigned int f = 0; f < u->chans.size(); f++) + for (std::vector::iterator f = u->chans.begin(); f != u->chans.end(); f++) { - if (u->chans[f].channel) + if (((ucrec*)(*f))->channel) { - u->chans[f].channel->DelUser((char*)u); + if (((ucrec*)(*f))->channel->DelUser(u) == 0) + { + /* No users left in here, mark it for deletion */ + to_delete.push_back(((ucrec*)(*f))->channel); + ((ucrec*)(*f))->channel = NULL; + } } } - for (unsigned int i = 0; i < u->chans.size(); i++) + log(DEBUG,"purge_empty_chans: %d channels to delete",to_delete.size()); + + for (std::vector::iterator n = to_delete.begin(); n != to_delete.end(); n++) { - if (u->chans[i].channel) + chanrec* thischan = (chanrec*)*n; + chan_hash::iterator i2 = chanlist.find(thischan->name); + if (i2 != chanlist.end()) { - if (!usercount(u->chans[i].channel)) - { - chan_hash::iterator i2 = chanlist.find(u->chans[i].channel->name); - - /* kill the record */ - if (i2 != chanlist.end()) - { - log(DEBUG,"del_channel: destroyed: %s",i2->second->name); - - if (i2->second) - { - FOREACH_MOD(I_OnChannelDelete,OnChannelDelete(i2->second)); - delete i2->second; - } - - chanlist.erase(i2); - purge++; - u->chans[i].channel = NULL; - } - } - else - { - log(DEBUG,"skipped purge for %s",u->chans[i].channel->name); - } + FOREACH_MOD(I_OnChannelDelete,OnChannelDelete(i2->second)); + DELETE(i2->second); + chanlist.erase(i2); } } - log(DEBUG,"completed channel purge, killed %lu",(unsigned long)purge); - DeleteOper(u); + if (*u->oper) + DeleteOper(u); } @@ -1309,6 +1252,7 @@ char* chanmodes(chanrec *chan, bool showkey) static char scratch[MAXBUF]; static char sparam[MAXBUF]; char* offset = scratch; + std::string extparam = ""; if (!chan) { @@ -1320,42 +1264,33 @@ char* chanmodes(chanrec *chan, bool showkey) *scratch = '\0'; *sparam = '\0'; - if (chan->binarymodes & CM_NOEXTERNAL) - *offset++ = 'n'; - if (chan->binarymodes & CM_TOPICLOCK) - *offset++ = 't'; - if (*chan->key) - *offset++ = 'k'; - if (chan->limit) - *offset++ = 'l'; - if (chan->binarymodes & CM_INVITEONLY) - *offset++ = 'i'; - if (chan->binarymodes & CM_MODERATED) - *offset++ = 'm'; - if (chan->binarymodes & CM_SECRET) - *offset++ = 's'; - if (chan->binarymodes & CM_PRIVATE) - *offset++ = 'p'; - - if (*chan->key) + /* This was still iterating up to 190, chanrec::custom_modes is only 64 elements -- Om */ + for(int n = 0; n < 64; n++) { - snprintf(sparam,MAXBUF," %s",showkey ? chan->key : ""); - } - - if (chan->limit) - { - char foo[24]; - sprintf(foo," %lu",(unsigned long)chan->limit); - strlcat(sparam,foo,MAXBUF); - } - - for (int n = 0; n < 190; n++) - { - if (chan->custom_modes[n]) + if(chan->modes[n]) { *offset++ = n+65; - std::string extparam = chan->GetModeParameter(n+65); - + extparam = ""; + switch (n) + { + case CM_KEY: + extparam = (showkey ? chan->key : ""); + break; + case CM_LIMIT: + extparam = ConvToStr(chan->limit); + break; + case CM_NOEXTERNAL: + case CM_TOPICLOCK: + case CM_INVITEONLY: + case CM_MODERATED: + case CM_SECRET: + case CM_PRIVATE: + /* We know these have no parameters */ + break; + default: + extparam = chan->GetModeParameter(n+65); + break; + } if (extparam != "") { charlcat(sparam,' ',MAXBUF); @@ -1366,7 +1301,7 @@ char* chanmodes(chanrec *chan, bool showkey) /* Null terminate scratch */ *offset = '\0'; - strlcat(scratch,sparam,MAXMODES); + strlcat(scratch,sparam,MAXBUF); return scratch; } @@ -1382,17 +1317,24 @@ void userlist(userrec *user,chanrec *c) return; } - size_t dlen = snprintf(list,MAXBUF,"353 %s = %s :", user->nick, c->name); - size_t initial = dlen; + char list[MAXBUF]; + size_t dlen, curlen; - std::map *ulist= c->GetUsers(); + dlen = curlen = snprintf(list,MAXBUF,"353 %s = %s :", user->nick, c->name); - for (std::map::iterator i = ulist->begin(); i != ulist->end(); i++) - { - char* o = i->second; - userrec* otheruser = (userrec*)o; + int numusers = 0; + char* ptr = list + dlen; + + CUList *ulist= c->GetUsers(); + + /* Improvement by Brain - this doesnt change in value, so why was it inside + * the loop? + */ + bool has_user = c->HasUser(user); - if ((!has_channel(user,c)) && (strchr(otheruser->modes,'i'))) + for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++) + { + if ((!has_user) && (i->second->modes[UM_INVISIBLE])) { /* * user is +i, and source not on the channel, does not show @@ -1401,21 +1343,29 @@ void userlist(userrec *user,chanrec *c) continue; } - dlen += strlcat(list,cmode(otheruser,c),MAXBUF); - dlen += strlcat(list,otheruser->nick,MAXBUF); - charlcat(list,' ',MAXBUF); - dlen++; + size_t ptrlen = snprintf(ptr, MAXBUF, "%s%s ", cmode(i->second, c), i->second->nick); + + curlen += ptrlen; + ptr += ptrlen; + + numusers++; - if (dlen > (480-NICKMAX)) + if (curlen > (480-NICKMAX)) { /* list overflowed into multiple numerics */ WriteServ_NoFormat(user->fd,list); - dlen = snprintf(list,MAXBUF,"353 %s = %s :", user->nick, c->name); + + /* reset our lengths */ + dlen = curlen = snprintf(list,MAXBUF,"353 %s = %s :", user->nick, c->name); + ptr = list + dlen; + + ptrlen = 0; + numusers = 0; } } /* if whats left in the list isnt empty, send it */ - if (dlen != initial) + if (numusers) { WriteServ_NoFormat(user->fd,list); } @@ -1432,12 +1382,10 @@ int usercount_i(chanrec *c) if (!c) return 0; - std::map *ulist= c->GetUsers(); - for (std::map::iterator i = ulist->begin(); i != ulist->end(); i++) + CUList *ulist= c->GetUsers(); + for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++) { - char* o = i->second; - userrec* user = (userrec*)o; - if (!strchr(user->modes,'i')) + if (!(i->second->modes[UM_INVISIBLE])) count++; } @@ -1450,12 +1398,16 @@ int usercount(chanrec *c) } -/* looks up a users password for their connection class (/ tags) */ +/* looks up a users password for their connection class (/ tags) + * NOTE: If the or tag specifies an ip, and this user resolves, + * then their ip will be taken as 'priority' anyway, so for example, + * will match joe!bloggs@localhost + */ ConnectClass GetClass(userrec *user) { for (ClassVector::iterator i = Config->Classes.begin(); i != Config->Classes.end(); i++) { - if (match(user->host,i->host.c_str())) + if ((match(inet_ntoa(user->ip4),i->host.c_str())) || (match(user->host,i->host.c_str()))) { return *i; } @@ -1489,6 +1441,10 @@ void send_error(char *s) void Error(int status) { + void *array[300]; + size_t size; + char **strings; + signal(SIGALRM, SIG_IGN); signal(SIGPIPE, SIG_IGN); signal(SIGTERM, SIG_IGN); @@ -1497,7 +1453,24 @@ void Error(int status) 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!*"); +#ifdef HAS_EXECINFO + log(DEFAULT,"Please report the backtrace lines shown below with any bugreport to the bugtracker at http://www.inspircd.org/bugtrack/"); + size = backtrace(array, 30); + strings = backtrace_symbols(array, size); + for (size_t i = 0; i < size; i++) { + log(DEFAULT,"[%d] %s", i, strings[i]); + } + free(strings); + WriteOpers("*** SIGSEGV: Please see the ircd.log for backtrace and report the error to http://www.inspircd.org/bugtrack/"); +#else + log(DEFAULT,"You do not have execinfo.h so i could not backtrace -- on FreeBSD, please install the libexecinfo port."); +#endif + send_error("Somebody screwed up... Whoops. IRC Server terminating."); + signal(SIGSEGV, SIG_DFL); + if (raise(SIGSEGV) == -1) + { + log(DEFAULT,"What the hell, i couldnt re-raise SIGSEGV! Error: %s",strerror(errno)); + } Exit(status); } @@ -1526,7 +1499,7 @@ int usercount_invisible(void) for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++) { - if ((i->second->registered == 7) && (strchr(i->second->modes,'i'))) + if ((i->second->registered == 7) && (i->second->modes[UM_INVISIBLE])) c++; } @@ -1539,7 +1512,7 @@ int usercount_opers(void) for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++) { - if (i->second->oper) + if (*(i->second->oper)) c++; } return c; @@ -1656,6 +1629,34 @@ bool AllModulesReportReady(userrec* user) return true; } +/* Make Sure Modules Are Avaliable! + * (BugFix By Craig.. See? I do work! :p) + * Modified by brain, requires const char* + * to work with other API functions + */ + +/* XXX - Needed? */ +bool FileExists (const char* file) +{ + FILE *input; + if ((input = fopen (file, "r")) == NULL) + { + return(false); + } + else + { + fclose (input); + return(true); + } +} + +char* CleanFilename(char* name) +{ + char* p = name + strlen(name); + while ((p != name) && (*p != '/')) p--; + return (p != name ? ++p : p); +} + bool DirValid(char* dirandfile) { char work[MAXBUF]; @@ -1830,9 +1831,82 @@ bool charremove(char* mp, char remove) if (shift_down) *mptr = *(mptr+1); - *mptr++; + mptr++; } return shift_down; } +void OpenLog(char** argv, int argc) +{ + if (!*LOG_FILE) + { + if (Config->logpath == "") + { + Config->logpath = GetFullProgDir(argv,argc) + "/ircd.log"; + } + } + else + { + Config->log_file = fopen(LOG_FILE,"a+"); + + if (!Config->log_file) + { + printf("ERROR: Could not write to logfile %s, bailing!\n\n",Config->logpath.c_str()); + Exit(ERROR); + } + + return; + } + + Config->log_file = fopen(Config->logpath.c_str(),"a+"); + + if (!Config->log_file) + { + printf("ERROR: Could not write to logfile %s, bailing!\n\n",Config->logpath.c_str()); + Exit(ERROR); + } +} + +void CheckRoot() +{ + if (geteuid() == 0) + { + printf("WARNING!!! You are running an irc server as ROOT!!! DO NOT DO THIS!!!\n\n"); + log(DEFAULT,"InspIRCd: startup: not starting with UID 0!"); + Exit(ERROR); + } +} + +void CheckDie() +{ + if (*Config->DieValue) + { + printf("WARNING: %s\n\n",Config->DieValue); + log(DEFAULT,"Uh-Oh, somebody didn't read their config file: '%s'",Config->DieValue); + Exit(ERROR); + } +} + +/* We must load the modules AFTER initializing the socket engine, now */ +void LoadAllModules(InspIRCd* ServerInstance) +{ + char configToken[MAXBUF]; + Config->module_names.clear(); + MODCOUNT = -1; + + for (int count = 0; count < Config->ConfValueEnum(Config->config_data, "module"); count++) + { + Config->ConfValue(Config->config_data, "module","name",count,configToken,MAXBUF); + printf("[\033[1;32m*\033[0m] Loading module:\t\033[1;32m%s\033[0m\n",configToken); + + if (!ServerInstance->LoadModule(configToken)) + { + log(DEFAULT,"Exiting due to a module loader error."); + printf("\nThere was an error loading a module: %s\n\n",ServerInstance->ModuleError()); + Exit(0); + } + } + + log(DEFAULT,"Total loaded modules: %lu",(unsigned long)MODCOUNT+1); +}