X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fhelperfuncs.cpp;h=e7ecb56a14f5594712219440d9242ec1868af511;hb=6ab1d0dffb8084bf6a2ad8a446a3836fa3760c8a;hp=cae073ff421aa0f29b181a80e7e22da2a4411adb;hpb=f5defd93b72e5467e2cb899a63d1695601e41673;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp index cae073ff4..e7ecb56a1 100644 --- a/src/helperfuncs.cpp +++ b/src/helperfuncs.cpp @@ -3,36 +3,31 @@ * +------------------------------------+ * * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. - * E-mail: - * - * + * E-mail: + * + * * * Written by Craig Edwards, Craig McLure, and others. * This program is free but copyrighted software; see - * the file COPYING for details. + * the file COPYING for details. * * --------------------------------------------------- */ -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,32 +45,38 @@ 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]; extern userrec* fd_ref_table[MAX_DESCRIPTORS]; -static char already_sent[MAX_DESCRIPTORS]; +static unsigned long already_sent[MAX_DESCRIPTORS] = {0}; 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]; static time_t LAST = 0; +/* XXX: Used for speeding up WriteCommon operations */ +unsigned long uniq_id = 0; + /** log() * 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) @@ -93,14 +94,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() @@ -157,16 +161,15 @@ 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]) { - if (Config->GetIOHook(fd_ref_table[sock]->port)) + bytes = snprintf(tb,MAXBUF,"%s\r\n",text); + + if (Config->GetIOHook(fd_ref_table[sock]->GetPort())) { try { - Config->GetIOHook(fd_ref_table[sock]->port)->OnRawSocketWrite(sock,tb,bytes); + Config->GetIOHook(fd_ref_table[sock]->GetPort())->OnRawSocketWrite(sock,tb,bytes); } catch (ModuleException& modexcept) { @@ -202,19 +205,19 @@ 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]) { - if (Config->GetIOHook(fd_ref_table[sock]->port)) + + va_start(argsPtr, text); + vsnprintf(textbuffer, MAXBUF, text, argsPtr); + va_end(argsPtr); + bytes = snprintf(tb,MAXBUF,"%s\r\n",textbuffer); + + if (Config->GetIOHook(fd_ref_table[sock]->GetPort())) { try { - Config->GetIOHook(fd_ref_table[sock]->port)->OnRawSocketWrite(sock,tb,bytes); + Config->GetIOHook(fd_ref_table[sock]->GetPort())->OnRawSocketWrite(sock,tb,bytes); } catch (ModuleException& modexcept) { @@ -242,16 +245,15 @@ 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]) { - if (Config->GetIOHook(fd_ref_table[sock]->port)) + bytes = snprintf(tb,MAXBUF,":%s %s\r\n",Config->ServerName,text); + + if (Config->GetIOHook(fd_ref_table[sock]->GetPort())) { try { - Config->GetIOHook(fd_ref_table[sock]->port)->OnRawSocketWrite(sock,tb,bytes); + Config->GetIOHook(fd_ref_table[sock]->GetPort())->OnRawSocketWrite(sock,tb,bytes); } catch (ModuleException& modexcept) { @@ -275,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; @@ -287,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() @@ -329,16 +309,15 @@ 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]) { - if (Config->GetIOHook(fd_ref_table[sock]->port)) + bytes = snprintf(tb,MAXBUF,":%s %s\r\n",user->GetFullHost(),text); + + if (Config->GetIOHook(fd_ref_table[sock]->GetPort())) { try { - Config->GetIOHook(fd_ref_table[sock]->port)->OnRawSocketWrite(sock,tb,bytes); + Config->GetIOHook(fd_ref_table[sock]->GetPort())->OnRawSocketWrite(sock,tb,bytes); } catch (ModuleException& modexcept) { @@ -373,19 +352,19 @@ 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]) { - if (Config->GetIOHook(fd_ref_table[sock]->port)) + + va_start(argsPtr, text); + vsnprintf(textbuffer, MAXBUF, text, argsPtr); + va_end(argsPtr); + bytes = snprintf(tb,MAXBUF,":%s %s\r\n",user->GetFullHost(),textbuffer); + + if (Config->GetIOHook(fd_ref_table[sock]->GetPort())) { try { - Config->GetIOHook(fd_ref_table[sock]->port)->OnRawSocketWrite(sock,tb,bytes); + Config->GetIOHook(fd_ref_table[sock]->GetPort())->OnRawSocketWrite(sock,tb,bytes); } catch (ModuleException& modexcept) { @@ -422,7 +401,6 @@ void WriteTo(userrec *source, userrec *dest,char *data, ...) va_start(argsPtr, data); vsnprintf(textbuffer, MAXBUF, data, argsPtr); va_end(argsPtr); - chop(textbuffer); // if no source given send it from the server. if (!source) @@ -450,246 +428,7 @@ void WriteTo_NoFormat(userrec *source, userrec *dest, const char *data) } } -/* 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, ...) -{ - char textbuffer[MAXBUF]; - va_list argsPtr; - CUList *ulist; - - if ((!Ptr) || (!user) || (!text)) - { - log(DEFAULT,"*** BUG *** WriteChannel was given an invalid parameter"); - return; - } - - va_start(argsPtr, text); - vsnprintf(textbuffer, MAXBUF, text, argsPtr); - va_end(argsPtr); - - ulist = Ptr->GetUsers(); - - for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++) - { - if (i->second->fd != FD_MAGIC_NUMBER) - WriteTo_NoFormat(user,i->second,textbuffer); - } -} - -void WriteChannel_NoFormat(chanrec* Ptr, userrec* user, const char* text) -{ - CUList *ulist; - - if ((!Ptr) || (!user) || (!text)) - { - log(DEFAULT,"*** BUG *** WriteChannel was given an invalid parameter"); - return; - } - - ulist = Ptr->GetUsers(); - - for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++) - { - if (i->second->fd != FD_MAGIC_NUMBER) - WriteTo_NoFormat(user,i->second,text); - } -} - - -/* 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, ...) -{ - char textbuffer[MAXBUF]; - va_list argsPtr; - CUList *ulist; - - if ((!Ptr) || (!text)) - { - log(DEFAULT,"*** BUG *** WriteChannel was given an invalid parameter"); - return; - } - - va_start(argsPtr, text); - vsnprintf(textbuffer, MAXBUF, text, argsPtr); - va_end(argsPtr); - - ulist = Ptr->GetUsers(); - - for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++) - { - if ((i->second->fd != FD_MAGIC_NUMBER) && (i->second != user)) - { - if (!user) - { - WriteServ_NoFormat(i->second->fd,textbuffer); - } - else - { - WriteTo_NoFormat(user,i->second,textbuffer); - } - } - } -} - -void WriteChannelLocal_NoFormat(chanrec* Ptr, userrec* user, const char* text) -{ - CUList *ulist; - - if ((!Ptr) || (!text)) - { - log(DEFAULT,"*** BUG *** WriteChannel was given an invalid parameter"); - return; - } - - ulist = Ptr->GetUsers(); - - for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++) - { - if ((i->second->fd != FD_MAGIC_NUMBER) && (i->second != user)) - { - if (!user) - { - WriteServ_NoFormat(i->second->fd,text); - } - else - { - WriteTo_NoFormat(user,i->second,text); - } - } - } -} - - - -void WriteChannelWithServ(char* ServName, chanrec* Ptr, char* text, ...) -{ - char textbuffer[MAXBUF]; - va_list argsPtr; - CUList *ulist; - - if ((!Ptr) || (!text)) - { - log(DEFAULT,"*** BUG *** WriteChannelWithServ was given an invalid parameter"); - return; - } - - va_start(argsPtr, text); - vsnprintf(textbuffer, MAXBUF, text, argsPtr); - va_end(argsPtr); - - ulist = Ptr->GetUsers(); - - for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++) - { - if (IS_LOCAL(i->second)) - WriteServ_NoFormat(i->second->fd,textbuffer); - } -} - -void WriteChannelWithServ_NoFormat(char* ServName, chanrec* Ptr, const char* text) -{ - CUList *ulist; - - if ((!Ptr) || (!text)) - { - log(DEFAULT,"*** BUG *** WriteChannelWithServ was given an invalid parameter"); - return; - } - - ulist = Ptr->GetUsers(); - - for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++) - { - if (IS_LOCAL(i->second)) - WriteServ_NoFormat(i->second->fd,text); - } -} - - - -/* 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 status, char* text, ...) -{ - char textbuffer[MAXBUF]; - va_list argsPtr; - CUList *ulist; - - if ((!Ptr) || (!user) || (!text)) - { - log(DEFAULT,"*** BUG *** ChanExceptSender was given an invalid parameter"); - return; - } - - va_start(argsPtr, text); - vsnprintf(textbuffer, MAXBUF, text, argsPtr); - va_end(argsPtr); - - switch (status) - { - case '@': - ulist = Ptr->GetOppedUsers(); - break; - case '%': - ulist = Ptr->GetHalfoppedUsers(); - break; - case '+': - ulist = Ptr->GetVoicedUsers(); - break; - default: - ulist = Ptr->GetUsers(); - break; - } - - log(DEBUG,"%d users to write to",ulist->size()); - - for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++) - { - 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) -{ - CUList *ulist; - - if ((!Ptr) || (!user) || (!text)) - { - log(DEFAULT,"*** BUG *** ChanExceptSender was given an invalid parameter"); - return; - } - - switch (status) - { - case '@': - ulist = Ptr->GetOppedUsers(); - break; - case '%': - ulist = Ptr->GetHalfoppedUsers(); - break; - case '+': - ulist = Ptr->GetVoicedUsers(); - break; - default: - ulist = Ptr->GetUsers(); - break; - } - - for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++) - { - 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 = ""; @@ -721,7 +460,7 @@ void WriteCommon(userrec *u, char* text, ...) return; } - if (u->registered != 7) + if (u->registered != REG_ALL) { log(DEFAULT,"*** BUG *** WriteCommon on an unregistered user"); return; @@ -731,8 +470,8 @@ void WriteCommon(userrec *u, char* text, ...) vsnprintf(textbuffer, MAXBUF, text, argsPtr); va_end(argsPtr); - // FIX: Stops a message going to the same person more than once - memset(&already_sent,0,MAX_DESCRIPTORS); + // XXX: Save on memset calls by using an ID. This clever trick thought of during discussion with nazzy and w00t. + uniq_id++; for (std::vector::const_iterator v = u->chans.begin(); v != u->chans.end(); v++) { @@ -742,9 +481,9 @@ void WriteCommon(userrec *u, char* text, ...) for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++) { - if ((i->second->fd > -1) && (!already_sent[i->second->fd])) + if ((IS_LOCAL(i->second)) && (already_sent[i->second->fd] != uniq_id)) { - already_sent[i->second->fd] = 1; + already_sent[i->second->fd] = uniq_id; WriteFrom_NoFormat(i->second->fd,u,textbuffer); sent_to_at_least_one = true; } @@ -772,14 +511,14 @@ void WriteCommon_NoFormat(userrec *u, const char* text) return; } - if (u->registered != 7) + if (u->registered != REG_ALL) { log(DEFAULT,"*** BUG *** WriteCommon on an unregistered user"); return; } - // FIX: Stops a message going to the same person more than once - memset(&already_sent,0,MAX_DESCRIPTORS); + // XXX: See comment in WriteCommon + uniq_id++; for (std::vector::const_iterator v = u->chans.begin(); v != u->chans.end(); v++) { @@ -789,9 +528,9 @@ void WriteCommon_NoFormat(userrec *u, const char* text) for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++) { - if ((i->second->fd > -1) && (!already_sent[i->second->fd])) + if ((IS_LOCAL(i->second)) && (already_sent[i->second->fd] != uniq_id)) { - already_sent[i->second->fd] = 1; + already_sent[i->second->fd] = uniq_id; WriteFrom_NoFormat(i->second->fd,u,text); sent_to_at_least_one = true; } @@ -828,7 +567,7 @@ void WriteCommonExcept(userrec *u, char* text, ...) return; } - if (u->registered != 7) + if (u->registered != REG_ALL) { log(DEFAULT,"*** BUG *** WriteCommon on an unregistered user"); return; @@ -879,7 +618,7 @@ void WriteCommonExcept(userrec *u, char* text, ...) } } - memset(&already_sent,0,MAX_DESCRIPTORS); + uniq_id++; for (std::vector::const_iterator v = u->chans.begin(); v != u->chans.end(); v++) { @@ -891,9 +630,9 @@ void WriteCommonExcept(userrec *u, char* text, ...) { if (u != i->second) { - if ((i->second->fd > -1) && (!already_sent[i->second->fd])) + if ((IS_LOCAL(i->second)) && (already_sent[i->second->fd] != uniq_id)) { - already_sent[i->second->fd] = 1; + already_sent[i->second->fd] = uniq_id; if (quit_munge) { @@ -916,13 +655,13 @@ void WriteCommonExcept_NoFormat(userrec *u, const char* text) return; } - if (u->registered != 7) + if (u->registered != REG_ALL) { log(DEFAULT,"*** BUG *** WriteCommon on an unregistered user"); return; } - memset(&already_sent,0,MAX_DESCRIPTORS); + uniq_id++; for (std::vector::const_iterator v = u->chans.begin(); v != u->chans.end(); v++) { @@ -934,9 +673,9 @@ void WriteCommonExcept_NoFormat(userrec *u, const char* text) { if (u != i->second) { - if ((i->second->fd > -1) && (!already_sent[i->second->fd])) + if ((IS_LOCAL(i->second)) && (already_sent[i->second->fd] != uniq_id)) { - already_sent[i->second->fd] = 1; + already_sent[i->second->fd] = uniq_id; WriteFrom_NoFormat(i->second->fd,u,text); } } @@ -953,7 +692,7 @@ void WriteCommonExcept_NoFormat(userrec *u, const char* text) * uses the oper list, which means if you have 2000 users but only 5 opers, * it iterates 5 times. */ -void WriteOpers(char* text, ...) +void WriteOpers(const char* text, ...) { char textbuffer[MAXBUF]; va_list argsPtr; @@ -968,16 +707,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 (a->modebits & UM_SERVERNOTICE) + 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); } } } @@ -989,15 +739,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); } } @@ -1007,15 +760,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); } } @@ -1047,7 +803,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; @@ -1060,7 +816,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; @@ -1078,6 +834,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)) @@ -1090,10 +847,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); } } @@ -1101,6 +860,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)) @@ -1113,13 +873,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)) && (t->modebits & UM_WALLOPS)) + if ((IS_LOCAL(t)) && (t->modes[UM_WALLOPS])) { - WriteTo(source,t,"WALLOPS :%s",textbuffer); + WriteTo_NoFormat(source,t,formatbuffer); } } } @@ -1138,13 +900,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); @@ -1213,13 +975,14 @@ void purge_empty_chans(userrec* u) // firstly decrement the count on each channel for (std::vector::iterator f = u->chans.begin(); f != u->chans.end(); f++) { - if (((ucrec*)(*f))->channel) + ucrec* uc = (ucrec*)(*f); + if (uc->channel) { - if (((ucrec*)(*f))->channel->DelUser(u) == 0) + if (uc->channel->DelUser(u) == 0) { /* No users left in here, mark it for deletion */ - to_delete.push_back(((ucrec*)(*f))->channel); - ((ucrec*)(*f))->channel = NULL; + to_delete.push_back(uc->channel); + uc->channel = NULL; } } } @@ -1233,7 +996,7 @@ void purge_empty_chans(userrec* u) if (i2 != chanlist.end()) { FOREACH_MOD(I_OnChannelDelete,OnChannelDelete(i2->second)); - delete i2->second; + DELETE(i2->second); chanlist.erase(i2); } } @@ -1248,6 +1011,7 @@ char* chanmodes(chanrec *chan, bool showkey) static char scratch[MAXBUF]; static char sparam[MAXBUF]; char* offset = scratch; + std::string extparam = ""; if (!chan) { @@ -1259,43 +1023,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) - { - snprintf(sparam,MAXBUF," %s",showkey ? chan->key : ""); - } - - if (chan->limit) - { - char foo[24]; - sprintf(foo," %lu",(unsigned long)chan->limit); - strlcat(sparam,foo,MAXBUF); - } - /* This was still iterating up to 190, chanrec::custom_modes is only 64 elements -- Om */ for(int n = 0; n < 64; 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); @@ -1306,7 +1060,7 @@ char* chanmodes(chanrec *chan, bool showkey) /* Null terminate scratch */ *offset = '\0'; - strlcat(scratch,sparam,MAXMODES); + strlcat(scratch,sparam,MAXBUF); return scratch; } @@ -1323,9 +1077,12 @@ void userlist(userrec *user,chanrec *c) } char list[MAXBUF]; - size_t dlen = snprintf(list,MAXBUF,"353 %s = %s :", user->nick, c->name); + size_t dlen, curlen; + + dlen = curlen = snprintf(list,MAXBUF,"353 %s = %s :", user->nick, c->name); + int numusers = 0; - char* ptr = list + dlen - 1; + char* ptr = list + dlen; CUList *ulist= c->GetUsers(); @@ -1336,7 +1093,7 @@ void userlist(userrec *user,chanrec *c) for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++) { - if ((!has_user) && (i->second->modebits & UM_INVISIBLE)) + if ((!has_user) && (i->second->modes[UM_INVISIBLE])) { /* * user is +i, and source not on the channel, does not show @@ -1345,25 +1102,26 @@ void userlist(userrec *user,chanrec *c) continue; } - const char* n = cmode(i->second,c); - if (*n) - *ptr++ = *n; - for (char* t = i->second->nick; *t; t++) - *ptr++ = *t; - *ptr++ = ' '; + size_t ptrlen = snprintf(ptr, MAXBUF, "%s%s ", cmode(i->second, c), i->second->nick); + + curlen += ptrlen; + ptr += ptrlen; + numusers++; - if ((ptr - list) > (480-NICKMAX)) + if (curlen > (480-NICKMAX)) { /* list overflowed into multiple numerics */ - *--ptr = 0; WriteServ_NoFormat(user->fd,list); - dlen = snprintf(list,MAXBUF,"353 %s = %s :", user->nick, c->name); - ptr = list + dlen - 1; + + /* reset our lengths */ + dlen = curlen = snprintf(list,MAXBUF,"353 %s = %s :", user->nick, c->name); + ptr = list + dlen; + + ptrlen = 0; numusers = 0; } } - *--ptr = 0; /* if whats left in the list isnt empty, send it */ if (numusers) @@ -1386,7 +1144,7 @@ int usercount_i(chanrec *c) CUList *ulist= c->GetUsers(); for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++) { - if (!(i->second->modebits & UM_INVISIBLE)) + if (!(i->second->modes[UM_INVISIBLE])) count++; } @@ -1399,12 +1157,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(user->GetIPString(),i->host.c_str(),true)) || (match(user->host,i->host.c_str()))) { return *i; } @@ -1424,7 +1186,7 @@ void send_error(char *s) for (std::vector::const_iterator i = local_users.begin(); i != local_users.end(); i++) { userrec* t = (userrec*)(*i); - if (t->registered == 7) + if (t->registered == REG_ALL) { WriteServ(t->fd,"NOTICE %s :%s",t->nick,s); } @@ -1438,6 +1200,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); @@ -1446,7 +1212,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); } @@ -1463,7 +1246,7 @@ int registered_usercount(void) for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++) { - if (i->second->registered == 7) c++; + c += (i->second->registered == REG_ALL); } return c; @@ -1475,8 +1258,7 @@ int usercount_invisible(void) for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++) { - if ((i->second->registered == 7) && (i->second->modebits & UM_INVISIBLE)) - c++; + c += ((i->second->registered == REG_ALL) && (i->second->modes[UM_INVISIBLE])); } return c; @@ -1488,7 +1270,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; @@ -1501,7 +1283,7 @@ int usercount_unknown(void) for (std::vector::const_iterator i = local_users.begin(); i != local_users.end(); i++) { userrec* t = (userrec*)(*i); - if (t->registered != 7) + if (t->registered != REG_ALL) c++; } @@ -1520,7 +1302,7 @@ long local_count() for (std::vector::const_iterator i = local_users.begin(); i != local_users.end(); i++) { userrec* t = (userrec*)(*i); - if (t->registered == 7) + if (t->registered == REG_ALL) c++; } @@ -1529,44 +1311,17 @@ long local_count() void ShowMOTD(userrec *user) { - static char mbuf[MAXBUF]; - static char crud[MAXBUF]; - std::string WholeMOTD = ""; - if (!Config->MOTD.size()) { WriteServ(user->fd,"422 %s :Message of the day file is missing.",user->nick); return; } - - snprintf(crud,MAXBUF,":%s 372 %s :- ", Config->ServerName, user->nick); - snprintf(mbuf,MAXBUF,":%s 375 %s :- %s message of the day\r\n", Config->ServerName, user->nick, Config->ServerName); - WholeMOTD = WholeMOTD + mbuf; + WriteServ(user->fd,"375 %s :%s message of the day", user->nick, Config->ServerName); for (unsigned int i = 0; i < Config->MOTD.size(); i++) - WholeMOTD = WholeMOTD + std::string(crud) + Config->MOTD[i].c_str() + std::string("\r\n"); - - snprintf(mbuf,MAXBUF,":%s 376 %s :End of message of the day.\r\n", Config->ServerName, user->nick); - WholeMOTD = WholeMOTD + mbuf; - - // only one write operation - if (Config->GetIOHook(user->port)) - { - try - { - Config->GetIOHook(user->port)->OnRawSocketWrite(user->fd,(char*)WholeMOTD.c_str(),WholeMOTD.length()); - } - catch (ModuleException& modexcept) - { - log(DEBUG,"Module exception caught: %s",modexcept.GetReason()); - } - } - else - { - user->AddWriteBuf(WholeMOTD); - } + WriteServ(user->fd,"372 %s :- %s",user->nick,Config->MOTD[i].c_str()); - ServerInstance->stats->statsSent += WholeMOTD.length(); + WriteServ(user->fd,"376 %s :End of message of the day.", user->nick); } void ShowRULES(userrec *user) @@ -1605,6 +1360,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]; @@ -1784,3 +1567,77 @@ bool charremove(char* mp, char remove) 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); +}