X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fhelperfuncs.cpp;h=d46f53ec7fa7c1c3567e6e42fecc467ee74f909b;hb=12ffb909a66401f540234aecbeeee6f94ef2fc6d;hp=8ae88e75245f8f38b844df645da8852e19842049;hpb=f63580a4eaa8d079200065dffa4d6a33b5577427;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp index 8ae88e752..d46f53ec7 100644 --- a/src/helperfuncs.cpp +++ b/src/helperfuncs.cpp @@ -6,7 +6,7 @@ * 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. * * --------------------------------------------------- */ @@ -18,28 +18,6 @@ #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; @@ -150,7 +128,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 +182,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 +192,6 @@ bool InspIRCd::IsChannel(const char *chname) return false; } - c = (char *)chname + 1; while (*c) { switch (*c) @@ -227,9 +204,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 +216,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 +241,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 +250,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 +268,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 +281,67 @@ 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"; + std::string path = std::string(home) + "/.inspircd"; + // This tries to create the ~/.inspircd. If it succeeds, then we go ahead and use it. + // If it fails due to an existing target, then we use it anyway. + // Either way, we make sure we can get write access to the log at this point. + if (!mkdir(path.c_str(), 0700) || errno == EEXIST) + { + /* Log to ~/.inspircd/ircd.log */ + Config->logpath = path + "/startup.log"; + FILE* fd = fopen(Config->logpath.c_str(), "a+"); + if (!fd) + { + // Could not get write access... Why? + if (errno == ENOTDIR) + // ~/.inspircd is not actually a directory! + printf("\nWARNING: Unable to create directory: %s (Exists and is not a directory)\n", path.c_str()); + else + // Not writable for some other reason (no +w access, readonly fs, file too big, whatever). + printf("\nWARNING: No write access to %s (%s)\n", Config->logpath.c_str(), strerror(errno)); + Config->logpath = "./startup.log"; + } + else + { + Config->log_file = fd; + } + } + else + { + /* Couldn't make ~/.inspircd directory, log to current dir */ + Config->logpath = "./startup.log"; + printf("\nWARNING: Unable to create directory: %s (%s)\n", path.c_str(), strerror(errno)); + } } - 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 +353,11 @@ bool InspIRCd::OpenLog(char**, int) return false; } - FileLogStream *f = new FileLogStream(this, Config->LogLevel, 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 +366,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 +376,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); } } @@ -414,19 +446,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;