X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fhelperfuncs.cpp;h=b0c96645736c543047004e9ef9dbc80fd4c0c43b;hb=67c9b1ba8404a3c7c7c1b223c188d56a3ae7d9e1;hp=048de75caa182db7b700c801fb4692aabc960c93;hpb=1e5728d84c1b4b0d86bf745ce253aa458575df20;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp index 048de75ca..b0c966457 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. * * --------------------------------------------------- */ @@ -14,70 +14,10 @@ /* $Core: libIRCDhelper */ #include "inspircd.h" -#include #include "wildcard.h" #include "xline.h" #include "exitcodes.h" -static char TIMESTR[26]; -static time_t LAST = 0; - -/** 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, ...) -{ - /* sanity check, just in case */ - if (!this->Config || !this->Logger) - return; - - /* Do this check again here so that we save pointless vsnprintf calls */ - if ((level < Config->LogLevel) && !Config->forcedebug) - return; - - 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) -{ - /* sanity check, just in case */ - if (!this->Config || !this->Logger) - return; - - /* If we were given -debug we output all messages, regardless of configured loglevel */ - if ((level < Config->LogLevel) && !Config->forcedebug) - return; - - if (Time() != LAST) - { - time_t local = Time(); - struct tm *timeinfo = localtime(&local); - - strlcpy(TIMESTR,asctime(timeinfo),26); - TIMESTR[24] = ':'; - LAST = Time(); - } - - if (Config->log_file && Config->writelog) - { - std::string out = std::string(TIMESTR) + " " + text.c_str() + "\n"; - this->Logger->WriteLogLine(out); - } - - if (Config->nofork) - { - printf("%s %s\n", TIMESTR, text.c_str()); - } -} - std::string InspIRCd::GetServerDescription(const char* servername) { std::string description; @@ -95,151 +35,15 @@ std::string InspIRCd::GetServerDescription(const char* servername) } } -/* XXX - We don't use WriteMode for this because WriteMode is very slow and - * this isnt. Basically WriteMode has to iterate ALL the users 'n' times for - * the number of modes provided, e.g. if you send WriteMode 'og' to write to - * opers with globops, and you have 2000 users, thats 4000 iterations. WriteOpers - * uses the oper list, which means if you have 2000 users but only 5 opers, - * it iterates 5 times. - */ -void InspIRCd::WriteOpers(const char* text, ...) -{ - char textbuffer[MAXBUF]; - va_list argsPtr; - - va_start(argsPtr, text); - vsnprintf(textbuffer, MAXBUF, text, argsPtr); - va_end(argsPtr); - - this->WriteOpers(std::string(textbuffer)); -} - -void InspIRCd::WriteOpers(const std::string &text) -{ - for (std::list::iterator i = this->all_opers.begin(); i != this->all_opers.end(); i++) - { - User* a = *i; - if (IS_LOCAL(a) && a->IsModeSet('s')) - { - // send server notices to all with +s - a->WriteServ("NOTICE %s :%s",a->nick,text.c_str()); - } - } -} - -void InspIRCd::ServerNoticeAll(char* text, ...) -{ - if (!text) - return; - - char textbuffer[MAXBUF]; - char formatbuffer[MAXBUF]; - va_list argsPtr; - va_start (argsPtr, text); - vsnprintf(textbuffer, MAXBUF, text, argsPtr); - va_end(argsPtr); - - snprintf(formatbuffer,MAXBUF,"NOTICE $%s :%s",Config->ServerName,textbuffer); - - for (std::vector::const_iterator i = local_users.begin(); i != local_users.end(); i++) - { - User* t = *i; - t->WriteServ(std::string(formatbuffer)); - } -} - -void InspIRCd::ServerPrivmsgAll(char* text, ...) -{ - if (!text) - return; - - char textbuffer[MAXBUF]; - char formatbuffer[MAXBUF]; - va_list argsPtr; - va_start (argsPtr, text); - vsnprintf(textbuffer, MAXBUF, text, argsPtr); - va_end(argsPtr); - - snprintf(formatbuffer,MAXBUF,"PRIVMSG $%s :%s",Config->ServerName,textbuffer); - - for (std::vector::const_iterator i = local_users.begin(); i != local_users.end(); i++) - { - User* t = *i; - t->WriteServ(std::string(formatbuffer)); - } -} - -void InspIRCd::WriteMode(const char* modes, int flags, const char* text, ...) -{ - char textbuffer[MAXBUF]; - int modelen; - va_list argsPtr; - - if (!text || !modes || !flags) - { - this->Log(DEFAULT,"*** BUG *** WriteMode was given an invalid parameter"); - return; - } - - va_start(argsPtr, text); - vsnprintf(textbuffer, MAXBUF, text, argsPtr); - va_end(argsPtr); - modelen = strlen(modes); - - if (flags == WM_AND) - { - for (std::vector::const_iterator i = local_users.begin(); i != local_users.end(); i++) - { - User* t = *i; - bool send_to_user = true; - - for (int n = 0; n < modelen; n++) - { - if (!t->IsModeSet(modes[n])) - { - send_to_user = false; - break; - } - } - if (send_to_user) - { - t->WriteServ("NOTICE %s :%s", t->nick, textbuffer); - } - } - } - else if (flags == WM_OR) - { - for (std::vector::const_iterator i = local_users.begin(); i != local_users.end(); i++) - { - User* t = *i; - bool send_to_user = false; - - for (int n = 0; n < modelen; n++) - { - if (t->IsModeSet(modes[n])) - { - send_to_user = true; - break; - } - } - - if (send_to_user) - { - t->WriteServ("NOTICE %s :%s", t->nick, textbuffer); - } - } - } -} - /* Find a user record by nickname and return a pointer to it */ User* InspIRCd::FindNick(const std::string &nick) { if (!nick.empty() && isdigit(*nick.begin())) return FindUUID(nick); - user_hash::iterator iter = clientlist->find(nick); + user_hash::iterator iter = this->Users->clientlist->find(nick); - if (iter == clientlist->end()) + if (iter == this->Users->clientlist->end()) /* Couldn't find it */ return NULL; @@ -251,9 +55,9 @@ User* InspIRCd::FindNick(const char* nick) if (isdigit(*nick)) return FindUUID(nick); - user_hash::iterator iter = clientlist->find(nick); + user_hash::iterator iter = this->Users->clientlist->find(nick); - if (iter == clientlist->end()) + if (iter == this->Users->clientlist->end()) return NULL; return iter->second; @@ -261,9 +65,9 @@ User* InspIRCd::FindNick(const char* nick) User* InspIRCd::FindNickOnly(const std::string &nick) { - user_hash::iterator iter = clientlist->find(nick); + user_hash::iterator iter = this->Users->clientlist->find(nick); - if (iter == clientlist->end()) + if (iter == this->Users->clientlist->end()) return NULL; return iter->second; @@ -271,9 +75,9 @@ User* InspIRCd::FindNickOnly(const std::string &nick) User* InspIRCd::FindNickOnly(const char* nick) { - user_hash::iterator iter = clientlist->find(nick); + user_hash::iterator iter = this->Users->clientlist->find(nick); - if (iter == clientlist->end()) + if (iter == this->Users->clientlist->end()) return NULL; return iter->second; @@ -286,9 +90,9 @@ User *InspIRCd::FindUUID(const std::string &uid) User *InspIRCd::FindUUID(const char *uid) { - user_hash::iterator finduuid = uuidlist->find(uid); + user_hash::iterator finduuid = this->Users->uuidlist->find(uid); - if (finduuid == uuidlist->end()) + if (finduuid == this->Users->uuidlist->end()) return NULL; return finduuid->second; @@ -320,7 +124,7 @@ 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->local_users.begin(); i != this->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) { @@ -339,17 +143,6 @@ void InspIRCd::SendError(const std::string &s) } } -/* return how many users have a given mode e.g. 'a' */ -int InspIRCd::ModeCount(const char mode) -{ - ModeHandler* mh = this->Modes->FindMode(mode, MODETYPE_USER); - - if (mh) - return mh->GetCount(); - else - return 0; -} - /* return channel count */ long InspIRCd::ChannelCount() { @@ -389,7 +182,7 @@ 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) { char *c; @@ -475,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 @@ -488,13 +281,44 @@ 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"; + if (!mkdir(path.c_str(), 0700) && errno != EEXIST) + { + /* Log to ~/.inspircd/ircd.log */ + Config->logpath = path + "/startup.log"; + } + 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+"); @@ -506,11 +330,14 @@ bool InspIRCd::OpenLog(char**, int) if (!Config->log_file) { - this->Logger = NULL; return false; } - this->Logger = new FileLogger(this, Config->log_file); + 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; } @@ -519,7 +346,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); } } @@ -529,7 +356,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); } } @@ -599,19 +426,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;