X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fhelperfuncs.cpp;h=1f2a6646b5ea838ef952f77feaa25dad8656ab50;hb=eb28eaea35d9d109a0b7b890de9d957d562da675;hp=6cf969a827b41ae19d77e64c264458b1bd34486f;hpb=a318eee150eb0e1a862d362a5e9011431f0595d6;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp index 6cf969a82..1f2a6646b 100644 --- a/src/helperfuncs.cpp +++ b/src/helperfuncs.cpp @@ -16,7 +16,6 @@ #include #include "inspircd_config.h" -#include "inspircd.h" #include "configreader.h" #include #include @@ -43,36 +42,43 @@ #include "helperfuncs.h" #include "hashcomp.h" #include "typedefs.h" +#include "inspircd.h" extern int MODCOUNT; extern ModuleList modules; -extern ServerConfig *Config; extern InspIRCd* ServerInstance; extern time_t TIME; extern char lowermap[255]; -extern userrec* fd_ref_table[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]; static time_t LAST = 0; -/** log() +/** 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 do_log(int level, const char *text, ...) +void InspIRCd::Log(int level, const char* text, ...) { va_list argsPtr; char textbuffer[MAXBUF]; + va_start(argsPtr, text); + vsnprintf(textbuffer, MAXBUF, text, argsPtr); + va_end(argsPtr); + + InspIRCd::Log(level, std::string(textbuffer)); +} + +void InspIRCd::Log(int level, const std::string &text) +{ + if (!ServerInstance || !ServerInstance->Config) + return; + /* If we were given -debug we output all messages, regardless of configured loglevel */ - if ((level < Config->LogLevel) && !Config->forcedebug) + if ((level < ServerInstance->Config->LogLevel) && !ServerInstance->Config->forcedebug) return; if (TIME != LAST) @@ -84,68 +90,18 @@ void do_log(int level, const char *text, ...) LAST = TIME; } - if (Config->log_file) + if (ServerInstance->Config->log_file && ServerInstance->Config->writelog) { - va_start(argsPtr, text); - vsnprintf(textbuffer, MAXBUF, text, argsPtr); - va_end(argsPtr); - - if (Config->writelog) - { - fprintf(Config->log_file,"%s %s\n",TIMESTR,textbuffer); - fflush(Config->log_file); - } - } - - if (Config->nofork) - { - printf("%s %s\n", TIMESTR, textbuffer); + fprintf(ServerInstance->Config->log_file,"%s %s\n",TIMESTR,text.c_str()); + fflush(ServerInstance->Config->log_file); } -} - -/** readfile() - * Read the contents of a file located by `fname' into a file_cache pointed at by `F'. - * - * XXX - we may want to consider returning a file_cache or pointer to one, less confusing. - */ -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) - { - strcpy(linebuf," "); - } - - if (!feof(file)) - { - F.push_back(linebuf); - } - } - - fclose(file); - } - else + if (ServerInstance->Config->nofork) { - log(DEBUG,"readfile: failed to load file: %s",fname); + printf("%s %s\n", TIMESTR, text.c_str()); } - - log(DEBUG,"readfile: loaded %s, %lu lines",fname,(unsigned long)F.size()); } - std::string GetServerDescription(const char* servername) { std::string description = ""; @@ -159,7 +115,7 @@ std::string GetServerDescription(const char* servername) else { // not a remote server that can be found, it must be me. - return Config->ServerDesc; + return ServerInstance->Config->ServerDesc; } } @@ -211,7 +167,7 @@ void WriteOpers_NoFormat(const char* text) } } -void ServerNoticeAll(char* text, ...) +void InspIRCd::ServerNoticeAll(char* text, ...) { if (!text) return; @@ -223,7 +179,7 @@ void ServerNoticeAll(char* text, ...) vsnprintf(textbuffer, MAXBUF, text, argsPtr); va_end(argsPtr); - snprintf(formatbuffer,MAXBUF,"NOTICE $%s :%s",Config->ServerName,textbuffer); + snprintf(formatbuffer,MAXBUF,"NOTICE $%s :%s",ServerInstance->Config->ServerName,textbuffer); for (std::vector::const_iterator i = local_users.begin(); i != local_users.end(); i++) { @@ -232,7 +188,7 @@ void ServerNoticeAll(char* text, ...) } } -void ServerPrivmsgAll(char* text, ...) +void InspIRCd::ServerPrivmsgAll(char* text, ...) { if (!text) return; @@ -244,7 +200,7 @@ void ServerPrivmsgAll(char* text, ...) vsnprintf(textbuffer, MAXBUF, text, argsPtr); va_end(argsPtr); - snprintf(formatbuffer,MAXBUF,"PRIVMSG $%s :%s",Config->ServerName,textbuffer); + snprintf(formatbuffer,MAXBUF,"PRIVMSG $%s :%s",ServerInstance->Config->ServerName,textbuffer); for (std::vector::const_iterator i = local_users.begin(); i != local_users.end(); i++) { @@ -253,7 +209,7 @@ void ServerPrivmsgAll(char* text, ...) } } -void WriteMode(const char* modes, int flags, const char* text, ...) +void InspIRCd::WriteMode(const char* modes, int flags, const char* text, ...) { char textbuffer[MAXBUF]; int modelen; @@ -309,61 +265,6 @@ 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)) - { - log(DEFAULT,"*** BUG *** NoticeAll was given an invalid parameter"); - return; - } - - va_start(argsPtr, 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 = *i; - t->WriteFrom(source,std::string(formatbuffer)); - } -} - - -void WriteWallOps(userrec *source, bool local_only, char* text, ...) -{ - char textbuffer[MAXBUF]; - char formatbuffer[MAXBUF]; - va_list argsPtr; - - if ((!text) || (!source)) - { - log(DEFAULT,"*** BUG *** WriteOpers was given an invalid parameter"); - return; - } - - va_start(argsPtr, 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->modes[UM_WALLOPS])) - { - source->WriteTo(t,std::string(formatbuffer)); - } - } -} - /* 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; @@ -386,9 +287,9 @@ void strlower(char *n) userrec* Find(const std::string &nick) { - user_hash::iterator iter = clientlist.find(nick); + user_hash::iterator iter = ServerInstance->clientlist.find(nick); - if (iter == clientlist.end()) + if (iter == ServerInstance->clientlist.end()) /* Couldn't find it */ return NULL; @@ -402,9 +303,9 @@ userrec* Find(const char* nick) if (!nick) return NULL; - iter = clientlist.find(nick); + iter = ServerInstance->clientlist.find(nick); - if (iter == clientlist.end()) + if (iter == ServerInstance->clientlist.end()) return NULL; return iter->second; @@ -422,9 +323,9 @@ chanrec* FindChan(const char* chan) return NULL; } - iter = chanlist.find(chan); + iter = ServerInstance->chanlist.find(chan); - if (iter == chanlist.end()) + if (iter == ServerInstance->chanlist.end()) /* Couldn't find it */ return NULL; @@ -435,7 +336,7 @@ chanrec* FindChan(const char* chan) long GetMaxBans(char* name) { std::string x; - for (std::map::iterator n = Config->maxbans.begin(); n != Config->maxbans.end(); n++) + for (std::map::iterator n = ServerInstance->Config->maxbans.begin(); n != ServerInstance->Config->maxbans.end(); n++) { x = n->first; if (match(name,x.c_str())) @@ -470,12 +371,12 @@ void purge_empty_chans(userrec* u) for (std::vector::iterator n = to_delete.begin(); n != to_delete.end(); n++) { chanrec* thischan = (chanrec*)*n; - chan_hash::iterator i2 = chanlist.find(thischan->name); - if (i2 != chanlist.end()) + chan_hash::iterator i2 = ServerInstance->chanlist.find(thischan->name); + if (i2 != ServerInstance->chanlist.end()) { FOREACH_MOD(I_OnChannelDelete,OnChannelDelete(i2->second)); DELETE(i2->second); - chanlist.erase(i2); + ServerInstance->chanlist.erase(i2); } } @@ -628,12 +529,6 @@ int usercount_i(chanrec *c) return count; } -int usercount(chanrec *c) -{ - return (c ? c->GetUserCounter() : 0); -} - - /* 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, @@ -641,7 +536,7 @@ int usercount(chanrec *c) */ ConnectClass GetClass(userrec *user) { - for (ClassVector::iterator i = Config->Classes.begin(); i != Config->Classes.end(); i++) + for (ClassVector::iterator i = ServerInstance->Config->Classes.begin(); i != ServerInstance->Config->Classes.end(); i++) { if ((match(user->GetIPString(),i->host.c_str(),true)) || (match(user->host,i->host.c_str()))) { @@ -649,18 +544,16 @@ ConnectClass GetClass(userrec *user) } } - return *(Config->Classes.begin()); + return *(ServerInstance->Config->Classes.begin()); } /* * sends out an error notice to all connected clients (not to be used * lightly!) */ -void send_error(char *s) +void InspIRCd::SendError(const char *s) { - log(DEBUG,"send_error: %s",s); - - for (std::vector::const_iterator i = local_users.begin(); i != local_users.end(); i++) + for (std::vector::const_iterator i = this->local_users.begin(); i != this->local_users.end(); i++) { userrec* t = (userrec*)(*i); if (t->registered == REG_ALL) @@ -701,7 +594,7 @@ void Error(int status) #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."); + ServerInstance->SendError("Somebody screwed up... Whoops. IRC Server terminating."); signal(SIGSEGV, SIG_DFL); if (raise(SIGSEGV) == -1) { @@ -711,13 +604,13 @@ void Error(int status) } // this function counts all users connected, wether they are registered or NOT. -int usercnt(void) +int InspIRCd::usercnt() { 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 InspIRCd::registered_usercount() { int c = 0; @@ -729,7 +622,7 @@ int registered_usercount(void) return c; } -int usercount_invisible(void) +int InspIRCd::usercount_invisible() { int c = 0; @@ -741,7 +634,7 @@ int usercount_invisible(void) return c; } -int usercount_opers(void) +int InspIRCd::usercount_opers() { int c = 0; @@ -753,7 +646,7 @@ int usercount_opers(void) return c; } -int usercount_unknown(void) +int InspIRCd::usercount_unknown() { int c = 0; @@ -767,12 +660,12 @@ int usercount_unknown(void) return c; } -long chancount(void) +long InspIRCd::chancount() { return chanlist.size(); } -long local_count() +long InspIRCd::local_count() { int c = 0; @@ -788,32 +681,32 @@ long local_count() void ShowMOTD(userrec *user) { - if (!Config->MOTD.size()) + if (!ServerInstance->Config->MOTD.size()) { user->WriteServ("422 %s :Message of the day file is missing.",user->nick); return; } - user->WriteServ("375 %s :%s message of the day", user->nick, Config->ServerName); + user->WriteServ("375 %s :%s message of the day", user->nick, ServerInstance->Config->ServerName); - for (unsigned int i = 0; i < Config->MOTD.size(); i++) - user->WriteServ("372 %s :- %s",user->nick,Config->MOTD[i].c_str()); + for (unsigned int i = 0; i < ServerInstance->Config->MOTD.size(); i++) + user->WriteServ("372 %s :- %s",user->nick,ServerInstance->Config->MOTD[i].c_str()); user->WriteServ("376 %s :End of message of the day.", user->nick); } void ShowRULES(userrec *user) { - if (!Config->RULES.size()) + if (!ServerInstance->Config->RULES.size()) { user->WriteServ("NOTICE %s :Rules file is missing.",user->nick); return; } - user->WriteServ("NOTICE %s :%s rules",user->nick,Config->ServerName); + user->WriteServ("NOTICE %s :%s rules",user->nick,ServerInstance->Config->ServerName); - for (unsigned int i = 0; i < Config->RULES.size(); i++) - user->WriteServ("NOTICE %s :%s",user->nick,Config->RULES[i].c_str()); + for (unsigned int i = 0; i < ServerInstance->Config->RULES.size(); i++) + user->WriteServ("NOTICE %s :%s",user->nick,ServerInstance->Config->RULES[i].c_str()); - user->WriteServ("NOTICE %s :End of %s rules.",user->nick,Config->ServerName); + user->WriteServ("NOTICE %s :End of %s rules.",user->nick,ServerInstance->Config->ServerName); } // this returns 1 when all modules are satisfied that the user should be allowed onto the irc server @@ -821,12 +714,12 @@ void ShowRULES(userrec *user) // registration timeout maximum seconds) bool AllModulesReportReady(userrec* user) { - if (!Config->global_implementation[I_OnCheckReady]) + if (!ServerInstance->Config->global_implementation[I_OnCheckReady]) return true; for (int i = 0; i <= MODCOUNT; i++) { - if (Config->implement_lists[i][I_OnCheckReady]) + if (ServerInstance->Config->implement_lists[i][I_OnCheckReady]) { int res = modules[i]->OnCheckReady(user); if (!res) @@ -1049,29 +942,29 @@ void OpenLog(char** argv, int argc) { if (!*LOG_FILE) { - if (Config->logpath == "") + if (ServerInstance->Config->logpath == "") { - Config->logpath = GetFullProgDir(argv,argc) + "/ircd.log"; + ServerInstance->Config->logpath = GetFullProgDir(argv,argc) + "/ircd.log"; } } else { - Config->log_file = fopen(LOG_FILE,"a+"); + ServerInstance->Config->log_file = fopen(LOG_FILE,"a+"); - if (!Config->log_file) + if (!ServerInstance->Config->log_file) { - printf("ERROR: Could not write to logfile %s, bailing!\n\n",Config->logpath.c_str()); + printf("ERROR: Could not write to logfile %s, bailing!\n\n",ServerInstance->Config->logpath.c_str()); Exit(ERROR); } return; } - Config->log_file = fopen(Config->logpath.c_str(),"a+"); + ServerInstance->Config->log_file = fopen(ServerInstance->Config->logpath.c_str(),"a+"); - if (!Config->log_file) + if (!ServerInstance->Config->log_file) { - printf("ERROR: Could not write to logfile %s, bailing!\n\n",Config->logpath.c_str()); + printf("ERROR: Could not write to logfile %s, bailing!\n\n",ServerInstance->Config->logpath.c_str()); Exit(ERROR); } } @@ -1088,10 +981,10 @@ void CheckRoot() void CheckDie() { - if (*Config->DieValue) + if (*ServerInstance->Config->DieValue) { - printf("WARNING: %s\n\n",Config->DieValue); - log(DEFAULT,"Uh-Oh, somebody didn't read their config file: '%s'",Config->DieValue); + printf("WARNING: %s\n\n",ServerInstance->Config->DieValue); + log(DEFAULT,"Uh-Oh, somebody didn't read their config file: '%s'",ServerInstance->Config->DieValue); Exit(ERROR); } } @@ -1100,12 +993,12 @@ void CheckDie() void LoadAllModules(InspIRCd* ServerInstance) { char configToken[MAXBUF]; - Config->module_names.clear(); + ServerInstance->Config->module_names.clear(); MODCOUNT = -1; - for (int count = 0; count < Config->ConfValueEnum(Config->config_data, "module"); count++) + for (int count = 0; count < ServerInstance->Config->ConfValueEnum(ServerInstance->Config->config_data, "module"); count++) { - Config->ConfValue(Config->config_data, "module","name",count,configToken,MAXBUF); + ServerInstance->Config->ConfValue(ServerInstance->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))