X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fhelperfuncs.cpp;h=c56dc39aed54082a5e88ce870233bcd762988d01;hb=63bdb9171f19deb8483de0a521ed7a712543382d;hp=6118c9f8f6431d1f1fecfdf499db3f558df9dd0d;hpb=8a3c523307558aedb977ca90fab69650eff54e1c;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp index 6118c9f8f..c56dc39ae 100644 --- a/src/helperfuncs.cpp +++ b/src/helperfuncs.cpp @@ -2,44 +2,21 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2008 InspIRCd Development Team + * InspIRCd: (C) 2002-2009 InspIRCd Development Team * See: http://www.inspircd.org/wiki/index.php/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 description; @@ -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; @@ -150,7 +127,7 @@ void InspIRCd::SendError(const std::string &s) { if ((*i)->registered == REG_ALL) { - (*i)->WriteServ("NOTICE %s :%s",(*i)->nick,s.c_str()); + (*i)->WriteServ("NOTICE %s :%s",(*i)->nick.c_str(),s.c_str()); } else { @@ -204,9 +181,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 +191,6 @@ bool InspIRCd::IsChannel(const char *chname) return false; } - c = (char *)chname + 1; while (*c) { switch (*c) @@ -227,9 +203,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 +215,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 +240,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 +249,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 +267,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,16 +280,37 @@ bool InspIRCd::IsSID(const std::string &str) /* open the proper logfile */ bool InspIRCd::OpenLog(char**, int) { + /* This function only happens at startup now */ + if (Config->nofork) + { + this->Logs->SetupNoFork(); + } Config->MyDir = Config->GetFullProgDir(); + /* Attempt to find home directory, portable to windows */ + const char* home = getenv("HOME"); + if (!home) + { + /* No $HOME, log to %USERPROFILE% */ + home = getenv("USERPROFILE"); + if (!home) + { + /* Nothing could be found at all, log to current dir */ + Config->logpath = "./startup.log"; + } + } + + if (!Config->writelog) return true; // Skip opening default log if -nolog + if (!*this->LogFileName) { if (Config->logpath.empty()) { - Config->logpath = Config->MyDir + "/ircd.log"; + Config->logpath = "./startup.log"; } - Config->log_file = fopen(Config->logpath.c_str(),"a+"); + if (!Config->log_file) + Config->log_file = fopen(Config->logpath.c_str(),"a+"); } else { @@ -324,8 +322,11 @@ bool InspIRCd::OpenLog(char**, int) return false; } - FileLogStream *f = new FileLogStream(this, Config->log_file); - this->Logs->AddLogType("*", f); + FileWriter* fw = new FileWriter(this, Config->log_file); + FileLogStream *f = new FileLogStream(this, (Config->forcedebug ? DEBUG : DEFAULT), fw); + + this->Logs->AddLogType("*", f, true); + return true; } @@ -334,7 +335,7 @@ 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); } } @@ -344,7 +345,7 @@ void InspIRCd::CheckDie() if (*Config->DieValue) { printf("WARNING: %s\n\n",Config->DieValue); - this->Log(DEFAULT,"Died because of tag: %s",Config->DieValue); + this->Logs->Log("CONFIG",DEFAULT,"Died because of tag: %s",Config->DieValue); Exit(EXIT_STATUS_DIETAG); } } @@ -371,7 +372,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) @@ -414,19 +415,19 @@ long InspIRCd::Duration(const std::string &str) return total + subtotal; } -bool InspIRCd::ULine(const char* server) +bool InspIRCd::ULine(const char* sserver) { - if (!server) + if (!sserver) return false; - if (!*server) + if (!*sserver) return true; - return (Config->ulines.find(server) != Config->ulines.end()); + return (Config->ulines.find(sserver) != Config->ulines.end()); } -bool InspIRCd::SilentULine(const char* server) +bool InspIRCd::SilentULine(const char* sserver) { - std::map::iterator n = Config->ulines.find(server); + std::map::iterator n = Config->ulines.find(sserver); if (n != Config->ulines.end()) return n->second; else return false; @@ -437,3 +438,17 @@ 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; + + if ((ebpos = tok.find(" EXTBAN=,")) == std::string::npos) + { + tok.append(" EXTBAN=,"); + tok.push_back(c); + } + else + tok.insert(ebpos + 9, 1, c); +}