X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fhelperfuncs.cpp;h=c09b714f17f708d3f0260436c0e7588757df4185;hb=b0b809d0003099876ec8c89c939695ef00afe294;hp=50d9b06318323c440bbaf594267afed55f9a4a46;hpb=24b1fbeec8e61e9636daaf606778c324d3ae3042;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp index 50d9b0631..c09b714f1 100644 --- a/src/helperfuncs.cpp +++ b/src/helperfuncs.cpp @@ -15,36 +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 "mode.h" #include "xline.h" -#include "commands.h" -#include "inspstring.h" -#include "helperfuncs.h" -#include "hashcomp.h" -#include "typedefs.h" #include "inspircd.h" -extern time_t TIME; - static char TIMESTR[26]; static time_t LAST = 0; @@ -61,36 +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) { - extern InspIRCd* ServerInstance; - - 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()); } @@ -193,9 +170,9 @@ void InspIRCd::WriteMode(const char* modes, int flags, const char* text, ...) int modelen; va_list argsPtr; - if ((!text) || (!modes) || (!flags)) + if (!text || !modes || !flags) { - log(DEFAULT,"*** BUG *** WriteMode was given an invalid parameter"); + this->Log(DEFAULT,"*** BUG *** WriteMode was given an invalid parameter"); return; } @@ -204,14 +181,12 @@ void InspIRCd::WriteMode(const char* modes, int flags, const char* text, ...) va_end(argsPtr); modelen = strlen(modes); - for (std::vector::const_iterator i = local_users.begin(); i != local_users.end(); i++) + if (flags == WM_AND) { - userrec* t = (userrec*)(*i); - bool send_to_user = false; - - if (flags == WM_AND) + for (std::vector::const_iterator i = local_users.begin(); i != local_users.end(); i++) { - send_to_user = true; + userrec* t = *i; + bool send_to_user = true; for (int n = 0; n < modelen; n++) { @@ -221,10 +196,17 @@ void InspIRCd::WriteMode(const char* modes, int flags, const char* text, ...) break; } } + if (send_to_user) + t->WriteServ("NOTICE %s :%s",t->nick,textbuffer); } - else if (flags == WM_OR) + } + else + if (flags == WM_OR) + { + for (std::vector::const_iterator i = local_users.begin(); i != local_users.end(); i++) { - send_to_user = false; + userrec* t = *i; + bool send_to_user = false; for (int n = 0; n < modelen; n++) { @@ -234,11 +216,8 @@ void InspIRCd::WriteMode(const char* modes, int flags, const char* text, ...) break; } } - } - - if (send_to_user) - { - t->WriteServ("NOTICE %s :%s",t->nick,textbuffer); + if (send_to_user) + t->WriteServ("NOTICE %s :%s",t->nick,textbuffer); } } } @@ -322,47 +301,14 @@ void InspIRCd::SendError(const char *s) } } -void InspIRCd::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); -#else - log(DEFAULT,"You do not have execinfo.h so i could not backtrace -- on FreeBSD, please install the libexecinfo port."); -#endif - 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; @@ -374,7 +320,7 @@ int InspIRCd::registered_usercount() return c; } -int InspIRCd::usercount_invisible() +int InspIRCd::InvisibleUserCount() { int c = 0; @@ -386,7 +332,7 @@ int InspIRCd::usercount_invisible() return c; } -int InspIRCd::usercount_opers() +int InspIRCd::OperCount() { int c = 0; @@ -398,7 +344,7 @@ int InspIRCd::usercount_opers() return c; } -int InspIRCd::usercount_unknown() +int InspIRCd::UnregisteredUserCount() { int c = 0; @@ -412,12 +358,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; @@ -464,6 +410,34 @@ bool InspIRCd::IsChannel(const char *chname) return true; } +bool InspIRCd::IsNick(const char* n) +{ + if (!n || !*n) + return false; + + int p = 0; + for (char* i = (char*)n; *i; i++, p++) + { + if ((*i >= 'A') && (*i <= '}')) + { + /* "A"-"}" can occur anywhere in a nickname */ + continue; + } + + if ((((*i >= '0') && (*i <= '9')) || (*i == '-')) && (i > n)) + { + /* "0"-"9", "-" can occur anywhere BUT the first char of a nickname */ + continue; + } + + /* invalid character! abort */ + return false; + } + + /* too long? or not -- pointer arithmetic rocks */ + return (p < NICKMAX - 1); +} + void InspIRCd::OpenLog(char** argv, int argc) { if (!*this->LogFileName) @@ -472,26 +446,21 @@ void InspIRCd::OpenLog(char** argv, int argc) { Config->logpath = ServerConfig::GetFullProgDir(argv,argc) + "/ircd.log"; } + + Config->log_file = fopen(Config->logpath.c_str(),"a+"); } else { Config->log_file = fopen(this->LogFileName,"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()); + printf("ERROR: Could not write to logfile %s: %s\n\n", Config->logpath.c_str(), strerror(errno)); Exit(ERROR); } + + this->Logger = new FileLogger(this, Config->log_file); } void InspIRCd::CheckRoot() @@ -499,7 +468,7 @@ 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); } } @@ -509,7 +478,7 @@ void InspIRCd::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); + this->Log(DEFAULT,"Died because of tag: %s",Config->DieValue); Exit(ERROR); } } @@ -528,12 +497,12 @@ void InspIRCd::LoadAllModules() if (!this->LoadModule(configToken)) { - log(DEFAULT,"Exiting due to a module loader error."); + 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); } } 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"); - log(DEFAULT,"Total loaded modules: %d", this->ModCount+1); + this->Log(DEFAULT,"Total loaded modules: %d", this->ModCount+1); }