X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fhelperfuncs.cpp;h=66a84bbceca06aec9649d2e95e7d1bfacc1316d4;hb=4498f1abd163b140efcbbd9e75173665c9b1c29f;hp=8e9f4dfd5c8c6289d732f6b60a97f19f38e28cfd;hpb=5db1d322be106c8462dc691072f9415dc0766ed4;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp index 8e9f4dfd5..66a84bbce 100644 --- a/src/helperfuncs.cpp +++ b/src/helperfuncs.cpp @@ -2,49 +2,26 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2008 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * InspIRCd: (C) 2002-2010 InspIRCd Development Team + * See: http://wiki.inspircd.org/Credits * * This program is free but copyrighted software; see - * the file COPYING for details. + * the file COPYING for details. * * --------------------------------------------------- */ -/* $Core: libIRCDhelper */ +/* $Core */ #include "inspircd.h" -#include "wildcard.h" #include "xline.h" #include "exitcodes.h" -/** 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 InspIRCd::Log(int level, const char* text, ...) -{ - va_list argsPtr; - char textbuffer[65536]; - - va_start(argsPtr, text); - vsnprintf(textbuffer, 65536, text, argsPtr); - va_end(argsPtr); - - this->Log(level, std::string(textbuffer)); -} - -void InspIRCd::Log(int level, const std::string &text) -{ - this->Logs->Log("WARNING", DEFAULT, "Deprecated call to InspIRCd::Log()! - log message follows"); - this->Logs->Log("DEPRECATED", level, text); -} - -std::string InspIRCd::GetServerDescription(const char* servername) +std::string InspIRCd::GetServerDescription(const std::string& servername) { std::string description; - FOREACH_MOD_I(this,I_OnGetServerDescription,OnGetServerDescription(servername,description)); + FOREACH_MOD(I_OnGetServerDescription,OnGetServerDescription(servername,description)); if (!description.empty()) { @@ -78,7 +55,7 @@ User* InspIRCd::FindNick(const char* nick) return FindUUID(nick); user_hash::iterator iter = this->Users->clientlist->find(nick); - + if (iter == this->Users->clientlist->end()) return NULL; @@ -146,22 +123,18 @@ Channel* InspIRCd::FindChan(const std::string &chan) /* Send an error notice to all users, registered or not */ void InspIRCd::SendError(const std::string &s) { - for (std::vector::const_iterator i = this->Users->local_users.begin(); i != this->Users->local_users.end(); i++) + for (std::vector::const_iterator i = this->Users->local_users.begin(); i != this->Users->local_users.end(); i++) { - if ((*i)->registered == REG_ALL) + User* u = *i; + if (u->registered == REG_ALL) { - (*i)->WriteServ("NOTICE %s :%s",(*i)->nick,s.c_str()); + u->WriteServ("NOTICE %s :%s",u->nick.c_str(),s.c_str()); } else { /* Unregistered connections receive ERROR, not a NOTICE */ - (*i)->Write("ERROR :" + s); + u->Write("ERROR :" + s); } - /* This might generate a whole load of EAGAIN, but we dont really - * care about this, as if we call SendError something catastrophic - * has occured anyway, and we wont receive the events for these. - */ - (*i)->FlushWriteBuf(); } } @@ -173,11 +146,11 @@ long InspIRCd::ChannelCount() bool InspIRCd::IsValidMask(const std::string &mask) { - char* dest = (char*)mask.c_str(); + const char* dest = mask.c_str(); int exclamation = 0; int atsign = 0; - for (char* i = dest; *i; i++) + for (const char* i = dest; *i; i++) { /* out of range character, bad mask */ if (*i < 32 || *i > 126) @@ -204,9 +177,9 @@ bool InspIRCd::IsValidMask(const std::string &mask) } /* true for valid channel name, false else */ -bool InspIRCd::IsChannel(const char *chname) +bool IsChannelHandler::Call(const char *chname, size_t max) { - char *c; + const char *c = chname + 1; /* check for no name - don't check for !*chname, as if it is empty, it won't be '#'! */ if (!chname || *chname != '#') @@ -214,7 +187,6 @@ bool InspIRCd::IsChannel(const char *chname) return false; } - c = (char *)chname + 1; while (*c) { switch (*c) @@ -227,9 +199,10 @@ bool InspIRCd::IsChannel(const char *chname) c++; } - + + size_t len = c - chname; /* too long a name - note funky pointer arithmetic here. */ - if ((c - chname) > CHANMAX) + if (len > max) { return false; } @@ -238,13 +211,13 @@ bool InspIRCd::IsChannel(const char *chname) } /* true for valid nickname, false else */ -bool IsNickHandler::Call(const char* n) +bool IsNickHandler::Call(const char* n, size_t max) { if (!n || !*n) return false; - - int p = 0; - for (char* i = (char*)n; *i; i++, p++) + + unsigned int p = 0; + for (const char* i = n; *i; i++, p++) { if ((*i >= 'A') && (*i <= '}')) { @@ -263,7 +236,7 @@ bool IsNickHandler::Call(const char* n) } /* too long? or not -- pointer arithmetic rocks */ - return (p < NICKMAX - 1); + return (p < max); } /* return true for good ident, false else */ @@ -272,7 +245,7 @@ bool IsIdentHandler::Call(const char* n) if (!n || !*n) return false; - for (char* i = (char*)n; *i; i++) + for (const char* i = n; *i; i++) { if ((*i >= 'A') && (*i <= '}')) { @@ -290,7 +263,7 @@ bool IsIdentHandler::Call(const char* n) return true; } -bool InspIRCd::IsSID(const std::string &str) +bool IsSIDHandler::Call(const std::string &str) { /* Returns true if the string given is exactly 3 characters long, * starts with a digit, and the other two characters are A-Z or digits @@ -303,31 +276,22 @@ bool InspIRCd::IsSID(const std::string &str) /* open the proper logfile */ bool InspIRCd::OpenLog(char**, int) { - Config->MyDir = Config->GetFullProgDir(); - - if (!*this->LogFileName) - { - if (Config->logpath.empty()) - { - Config->logpath = Config->MyDir + "/ircd.log"; - } + if (!Config->cmdline.writelog) return true; // Skip opening default log if -nolog - Config->log_file = fopen(Config->logpath.c_str(),"a+"); - } - else - { - Config->log_file = fopen(this->LogFileName,"a+"); - } + if (Config->cmdline.startup_log.empty()) + Config->cmdline.startup_log = "logs/startup.log"; + FILE* startup = fopen(Config->cmdline.startup_log.c_str(), "a+"); - if (!Config->log_file) + if (!startup) { return false; } - FileWriter* fw = new FileWriter(this, Config->log_file); - FileLogStream *f = new FileLogStream(this, Config->LogLevel, fw); + FileWriter* fw = new FileWriter(startup); + FileLogStream *f = new FileLogStream((Config->cmdline.forcedebug ? DEBUG : DEFAULT), fw); + + this->Logs->AddLogType("*", f, true); - this->Logs->AddLogType("*", f); return true; } @@ -336,29 +300,19 @@ void InspIRCd::CheckRoot() if (geteuid() == 0) { printf("WARNING!!! You are running an irc server as ROOT!!! DO NOT DO THIS!!!\n\n"); - this->Log(DEFAULT,"Cant start as root"); + this->Logs->Log("STARTUP",DEFAULT,"Cant start as root"); Exit(EXIT_STATUS_ROOT); } } -void InspIRCd::CheckDie() -{ - if (*Config->DieValue) - { - printf("WARNING: %s\n\n",Config->DieValue); - this->Log(DEFAULT,"Died because of tag: %s",Config->DieValue); - Exit(EXIT_STATUS_DIETAG); - } -} - void InspIRCd::SendWhoisLine(User* user, User* dest, int numeric, const std::string &text) { std::string copy_text = text; - int MOD_RESULT = 0; - FOREACH_RESULT_I(this, I_OnWhoisLine, OnWhoisLine(user, dest, numeric, copy_text)); + ModResult MOD_RESULT; + FIRST_MOD_RESULT(OnWhoisLine, MOD_RESULT, (user, dest, numeric, copy_text)); - if (!MOD_RESULT) + if (MOD_RESULT != MOD_RES_DENY) user->WriteServ("%d %s", numeric, copy_text.c_str()); } @@ -373,7 +327,7 @@ void InspIRCd::SendWhoisLine(User* user, User* dest, int numeric, const char* fo this->SendWhoisLine(user, dest, numeric, std::string(textbuffer)); } -/** Refactored by Brain, Jun 2008. Much faster with some clever O(1) array +/** Refactored by Brain, Jun 2009. Much faster with some clever O(1) array * lookups and pointer maths. */ long InspIRCd::Duration(const std::string &str) @@ -416,22 +370,21 @@ long InspIRCd::Duration(const std::string &str) return total + subtotal; } -bool InspIRCd::ULine(const char* sserver) +bool InspIRCd::ULine(const std::string& sserver) { - if (!sserver) - return false; - if (!*sserver) + if (sserver.empty()) return true; - return (Config->ulines.find(sserver) != Config->ulines.end()); + return (Config->ulines.find(sserver.c_str()) != Config->ulines.end()); } -bool InspIRCd::SilentULine(const char* sserver) +bool InspIRCd::SilentULine(const std::string& sserver) { - std::map::iterator n = Config->ulines.find(sserver); + std::map::iterator n = Config->ulines.find(sserver.c_str()); if (n != Config->ulines.end()) return n->second; - else return false; + else + return false; } std::string InspIRCd::TimeString(time_t curtime) @@ -439,3 +392,50 @@ std::string InspIRCd::TimeString(time_t curtime) return std::string(ctime(&curtime),24); } +// You should only pass a single character to this. +void InspIRCd::AddExtBanChar(char c) +{ + std::string &tok = Config->data005; + std::string::size_type ebpos = tok.find(" EXTBAN=,"); + + if (ebpos == std::string::npos) + { + tok.append(" EXTBAN=,"); + tok.push_back(c); + } + else + { + ebpos += 9; + while (isalpha(tok[ebpos]) && tok[ebpos] < c) + ebpos++; + tok.insert(ebpos, 1, c); + } +} + +std::string InspIRCd::GenRandomStr(int length, bool printable) +{ + char* buf = new char[length]; + GenRandom(buf, length); + std::string rv; + rv.resize(length); + for(int i=0; i < length; i++) + rv[i] = printable ? 0x3F + (buf[i] & 0x3F) : buf[i]; + delete[] buf; + return rv; +} + +// NOTE: this has a slight bias for lower values if max is not a power of 2. +// Don't use it if that matters. +unsigned long InspIRCd::GenRandomInt(unsigned long max) +{ + unsigned long rv; + GenRandom((char*)&rv, sizeof(rv)); + return rv % max; +} + +// This is overridden by a higher-quality algorithm when SSL support is loaded +void GenRandomHandler::Call(char *output, size_t max) +{ + for(unsigned int i=0; i < max; i++) + output[i] = random(); +}