X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fhelperfuncs.cpp;h=4afe7afeba1fcdfcdd4774666c3261609b3d795a;hb=dc7927e17cffb2ee3c50ef9f037ed873d378f679;hp=8bfba1ca5f2c3aedc70b92ca98827c03fc8779e1;hpb=396c9ef9f7a96934d3227bb7d1d091315e3d4fa8;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp index 8bfba1ca5..4afe7afeb 100644 --- a/src/helperfuncs.cpp +++ b/src/helperfuncs.cpp @@ -15,44 +15,14 @@ */ #include -#include "inspircd_config.h" #include "configreader.h" -#include -#include -#include -#include -#include -#include -#include -#ifdef HAS_EXECINFO -#include -#endif -#include "connection.h" #include "users.h" -#include "ctables.h" -#include "globals.h" #include "modules.h" -#include "dynamic.h" #include "wildcard.h" -#include "message.h" #include "mode.h" #include "xline.h" -#include "commands.h" -#include "inspstring.h" -#include "helperfuncs.h" -#include "hashcomp.h" -#include "typedefs.h" #include "inspircd.h" -extern int MODCOUNT; -extern ModuleList modules; -extern InspIRCd* ServerInstance; -extern time_t TIME; -extern char lowermap[255]; -extern std::vector all_opers; - -char LOG_FILE[MAXBUF]; - static char TIMESTR[26]; static time_t LAST = 0; @@ -69,34 +39,35 @@ void InspIRCd::Log(int level, const char* text, ...) vsnprintf(textbuffer, MAXBUF, text, argsPtr); va_end(argsPtr); - InspIRCd::Log(level, std::string(textbuffer)); + this->Log(level, std::string(textbuffer)); } void InspIRCd::Log(int level, const std::string &text) { - if (!ServerInstance || !ServerInstance->Config) + if (!this->Config) return; /* If we were given -debug we output all messages, regardless of configured loglevel */ - if ((level < ServerInstance->Config->LogLevel) && !ServerInstance->Config->forcedebug) + if ((level < Config->LogLevel) && !Config->forcedebug) return; - if (TIME != LAST) + if (Time() != LAST) { - struct tm *timeinfo = localtime(&TIME); + time_t local = Time(); + struct tm *timeinfo = localtime(&local); strlcpy(TIMESTR,asctime(timeinfo),26); TIMESTR[24] = ':'; - LAST = TIME; + LAST = Time(); } - if (ServerInstance->Config->log_file && ServerInstance->Config->writelog) + if (Config->log_file && Config->writelog) { - fprintf(ServerInstance->Config->log_file,"%s %s\n",TIMESTR,text.c_str()); - fflush(ServerInstance->Config->log_file); + std::string out = std::string(TIMESTR) + " " + text.c_str() + "\n"; + this->Logger->WriteLogLine(out); } - if (ServerInstance->Config->nofork) + if (Config->nofork) { printf("%s %s\n", TIMESTR, text.c_str()); } @@ -106,7 +77,7 @@ std::string InspIRCd::GetServerDescription(const char* servername) { std::string description = ""; - FOREACH_MOD(I_OnGetServerDescription,OnGetServerDescription(servername,description)); + FOREACH_MOD_I(this,I_OnGetServerDescription,OnGetServerDescription(servername,description)); if (description != "") { @@ -140,7 +111,7 @@ void InspIRCd::WriteOpers(const char* text, ...) void InspIRCd::WriteOpers(const std::string &text) { - for (std::vector::iterator i = all_opers.begin(); i != all_opers.end(); i++) + for (std::vector::iterator i = this->all_opers.begin(); i != this->all_opers.end(); i++) { userrec* a = *i; if (IS_LOCAL(a) && a->modes[UM_SERVERNOTICE]) @@ -163,7 +134,7 @@ void InspIRCd::ServerNoticeAll(char* text, ...) vsnprintf(textbuffer, MAXBUF, text, argsPtr); va_end(argsPtr); - snprintf(formatbuffer,MAXBUF,"NOTICE $%s :%s",ServerInstance->Config->ServerName,textbuffer); + snprintf(formatbuffer,MAXBUF,"NOTICE $%s :%s",Config->ServerName,textbuffer); for (std::vector::const_iterator i = local_users.begin(); i != local_users.end(); i++) { @@ -184,7 +155,7 @@ void InspIRCd::ServerPrivmsgAll(char* text, ...) vsnprintf(textbuffer, MAXBUF, text, argsPtr); va_end(argsPtr); - snprintf(formatbuffer,MAXBUF,"PRIVMSG $%s :%s",ServerInstance->Config->ServerName,textbuffer); + snprintf(formatbuffer,MAXBUF,"PRIVMSG $%s :%s",Config->ServerName,textbuffer); for (std::vector::const_iterator i = local_users.begin(); i != local_users.end(); i++) { @@ -201,7 +172,7 @@ void InspIRCd::WriteMode(const char* modes, int flags, const char* text, ...) if ((!text) || (!modes) || (!flags)) { - log(DEFAULT,"*** BUG *** WriteMode was given an invalid parameter"); + this->Log(DEFAULT,"*** BUG *** WriteMode was given an invalid parameter"); return; } @@ -249,24 +220,6 @@ void InspIRCd::WriteMode(const char* modes, int flags, const char* text, ...) } } -/* 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[(unsigned char)*t]; - } -} - /* Find a user record by nickname and return a pointer to it */ userrec* InspIRCd::FindNick(const std::string &nick) @@ -346,49 +299,14 @@ void InspIRCd::SendError(const 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); - 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 ***"); -#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); - ServerInstance->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 - ServerInstance->SendError("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); -} - // this function counts all users connected, wether they are registered or NOT. -int InspIRCd::usercnt() +int InspIRCd::UserCount() { 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 InspIRCd::registered_usercount() +int InspIRCd::RegisteredUserCount() { int c = 0; @@ -400,7 +318,7 @@ int InspIRCd::registered_usercount() return c; } -int InspIRCd::usercount_invisible() +int InspIRCd::InvisibleUserCount() { int c = 0; @@ -412,7 +330,7 @@ int InspIRCd::usercount_invisible() return c; } -int InspIRCd::usercount_opers() +int InspIRCd::OperCount() { int c = 0; @@ -424,7 +342,7 @@ int InspIRCd::usercount_opers() return c; } -int InspIRCd::usercount_unknown() +int InspIRCd::UnregisteredUserCount() { int c = 0; @@ -438,12 +356,12 @@ int InspIRCd::usercount_unknown() return c; } -long InspIRCd::chancount() +long InspIRCd::ChannelCount() { return chanlist.size(); } -long InspIRCd::local_count() +long InspIRCd::LocalUserCount() { int c = 0; @@ -457,197 +375,7 @@ long InspIRCd::local_count() return c; } -void ShowMOTD(userrec *user) -{ - 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, ServerInstance->Config->ServerName); - - 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 (!ServerInstance->Config->RULES.size()) - { - user->WriteServ("NOTICE %s :Rules file is missing.",user->nick); - return; - } - user->WriteServ("NOTICE %s :%s rules",user->nick,ServerInstance->Config->ServerName); - - 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,ServerInstance->Config->ServerName); -} - -// 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) -{ - if (!ServerInstance->Config->global_implementation[I_OnCheckReady]) - return true; - - for (int i = 0; i <= MODCOUNT; i++) - { - if (ServerInstance->Config->implement_lists[i][I_OnCheckReady]) - { - int res = modules[i]->OnCheckReady(user); - if (!res) - return false; - } - } - - 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]; - char buffer[MAXBUF]; - char otherdir[MAXBUF]; - int p; - - strlcpy(work, dirandfile, MAXBUF); - p = strlen(work); - - // we just want the dir - while (*work) - { - if (work[p] == '/') - { - work[p] = '\0'; - break; - } - - work[p--] = '\0'; - } - - // Get the current working directory - if (getcwd(buffer, MAXBUF ) == NULL ) - return false; - - chdir(work); - - if (getcwd(otherdir, MAXBUF ) == NULL ) - return false; - - chdir(buffer); - - size_t t = strlen(work); - - if (strlen(otherdir) >= t) - { - otherdir[t] = '\0'; - - if (!strcmp(otherdir,work)) - { - return true; - } - - return false; - } - else - { - return false; - } -} - -std::string GetFullProgDir(char** argv, int argc) -{ - char work[MAXBUF]; - char buffer[MAXBUF]; - char otherdir[MAXBUF]; - int p; - - strlcpy(work,argv[0],MAXBUF); - p = strlen(work); - - // we just want the dir - while (*work) - { - if (work[p] == '/') - { - work[p] = '\0'; - break; - } - - work[p--] = '\0'; - } - - // Get the current working directory - if (getcwd(buffer, MAXBUF) == NULL) - return ""; - - chdir(work); - - if (getcwd(otherdir, MAXBUF) == NULL) - return ""; - - chdir(buffer); - return otherdir; -} - -int InsertMode(std::string &output, const char* mode, unsigned short section) -{ - unsigned short currsection = 1; - unsigned int pos = output.find("CHANMODES=", 0) + 10; // +10 for the length of "CHANMODES=" - - if(section > 4 || section == 0) - { - log(DEBUG, "InsertMode: CHANMODES doesn't have a section %dh :/", section); - return 0; - } - - for(; pos < output.size(); pos++) - { - if(section == currsection) - break; - - if(output[pos] == ',') - currsection++; - } - - output.insert(pos, mode); - return 1; -} - -bool IsValidChannelName(const char *chname) +bool InspIRCd::IsChannel(const char *chname) { char *c; @@ -680,76 +408,80 @@ bool IsValidChannelName(const char *chname) return true; } -void OpenLog(char** argv, int argc) +void InspIRCd::OpenLog(char** argv, int argc) { - if (!*LOG_FILE) + if (!*this->LogFileName) { - if (ServerInstance->Config->logpath == "") + if (Config->logpath == "") { - ServerInstance->Config->logpath = GetFullProgDir(argv,argc) + "/ircd.log"; + Config->logpath = ServerConfig::GetFullProgDir(argv,argc) + "/ircd.log"; } } else { - ServerInstance->Config->log_file = fopen(LOG_FILE,"a+"); + Config->log_file = fopen(this->LogFileName,"a+"); - if (!ServerInstance->Config->log_file) + if (!Config->log_file) { - printf("ERROR: Could not write to logfile %s, bailing!\n\n",ServerInstance->Config->logpath.c_str()); + printf("ERROR: Could not write to logfile %s, bailing!\n\n",Config->logpath.c_str()); Exit(ERROR); } - + + this->Logger = new FileLogger(this, Config->log_file); return; } - ServerInstance->Config->log_file = fopen(ServerInstance->Config->logpath.c_str(),"a+"); + Config->log_file = fopen(Config->logpath.c_str(),"a+"); - if (!ServerInstance->Config->log_file) + if (!Config->log_file) { - printf("ERROR: Could not write to logfile %s, bailing!\n\n",ServerInstance->Config->logpath.c_str()); + printf("ERROR: Could not write to logfile %s, bailing!\n\n",Config->logpath.c_str()); Exit(ERROR); } + + this->Logger = new FileLogger(this, Config->log_file); } -void CheckRoot() +void InspIRCd::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!"); + this->Log(DEFAULT,"Cant start as root"); Exit(ERROR); } } -void CheckDie() +void InspIRCd::CheckDie() { - if (*ServerInstance->Config->DieValue) + if (*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); + printf("WARNING: %s\n\n",Config->DieValue); + this->Log(DEFAULT,"Died because of tag: %s",Config->DieValue); Exit(ERROR); } } /* We must load the modules AFTER initializing the socket engine, now */ -void LoadAllModules(InspIRCd* ServerInstance) +void InspIRCd::LoadAllModules() { char configToken[MAXBUF]; - ServerInstance->Config->module_names.clear(); - MODCOUNT = -1; + Config->module_names.clear(); + this->ModCount = -1; - for (int count = 0; count < ServerInstance->Config->ConfValueEnum(ServerInstance->Config->config_data, "module"); count++) + for (int count = 0; count < Config->ConfValueEnum(Config->config_data, "module"); count++) { - ServerInstance->Config->ConfValue(ServerInstance->Config->config_data, "module","name",count,configToken,MAXBUF); + 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)) + if (!this->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); + this->Log(DEFAULT,"There was an error loading a module: %s", this->ModuleError()); + printf("\nThere was an error loading a module: %s\n\n",this->ModuleError()); + Exit(ERROR); } } - - log(DEFAULT,"Total loaded modules: %lu",(unsigned long)MODCOUNT+1); + printf("\nA total of \033[1;32m%d\033[0m module%s been loaded.\n", this->ModCount+1, this->ModCount+1 == 1 ? " has" : "s have"); + this->Log(DEFAULT,"Total loaded modules: %d", this->ModCount+1); } +