X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fhelperfuncs.cpp;h=ffa30fb840799e8f4cdc025f1cbfd8a1170a3290;hb=cd712c40e1b352c05e7ae0f72e0a5e84cdf64323;hp=1cad143c510c207479f56a3ab631f9cb8d73c39f;hpb=2be86e1958ca8de8aaad54f75a8d6afec59d49af;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp index 1cad143c5..ffa30fb84 100644 --- a/src/helperfuncs.cpp +++ b/src/helperfuncs.cpp @@ -2,85 +2,26 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2007 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 */ + #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 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()) { @@ -93,207 +34,71 @@ 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++) - { - userrec* 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++) - { - userrec* 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++) - { - userrec* 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++) - { - userrec* 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++) - { - userrec* 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 */ -userrec* InspIRCd::FindNick(const std::string &nick) +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; return iter->second; } -userrec* InspIRCd::FindNick(const char* nick) +User* InspIRCd::FindNick(const char* nick) { if (isdigit(*nick)) return FindUUID(nick); - user_hash::iterator iter = clientlist->find(nick); - - if (iter == clientlist->end()) + user_hash::iterator iter = this->Users->clientlist->find(nick); + + if (iter == this->Users->clientlist->end()) return NULL; return iter->second; } -userrec* InspIRCd::FindNickOnly(const std::string &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; } -userrec* InspIRCd::FindNickOnly(const char* 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; } -userrec *InspIRCd::FindUUID(const std::string &uid) +User *InspIRCd::FindUUID(const std::string &uid) { return FindUUID(uid.c_str()); } -userrec *InspIRCd::FindUUID(const char *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; } /* find a channel record by channel name and return a pointer to it */ -chanrec* InspIRCd::FindChan(const char* chan) +Channel* InspIRCd::FindChan(const char* chan) { chan_hash::iterator iter = chanlist->find(chan); @@ -304,7 +109,7 @@ chanrec* InspIRCd::FindChan(const char* chan) return iter->second; } -chanrec* InspIRCd::FindChan(const std::string &chan) +Channel* InspIRCd::FindChan(const std::string &chan) { chan_hash::iterator iter = chanlist->find(chan); @@ -318,83 +123,63 @@ chanrec* 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) + 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(); } } -/* this function counts all users connected, wether they are registered or NOT. */ -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::RegisteredUserCount() +/* return channel count */ +long InspIRCd::ChannelCount() { - return clientlist->size() - this->UnregisteredUserCount(); + return chanlist->size(); } -/* return how many users have a given mode e.g. 'a' */ -int InspIRCd::ModeCount(const char mode) +bool InspIRCd::IsValidMask(const std::string &mask) { - ModeHandler* mh = this->Modes->FindMode(mode, MODETYPE_USER); + const char* dest = mask.c_str(); + int exclamation = 0; + int atsign = 0; - if (mh) - return mh->GetCount(); - else - return 0; -} - -/* wrapper for readability */ -int InspIRCd::InvisibleUserCount() -{ - return ModeCount('i'); -} - -/* return how many users are opered */ -int InspIRCd::OperCount() -{ - return this->all_opers.size(); -} + for (const char* i = dest; *i; i++) + { + /* out of range character, bad mask */ + if (*i < 32 || *i > 126) + { + return false; + } -/* return how many users are unregistered */ -int InspIRCd::UnregisteredUserCount() -{ - return this->unregistered_count; -} + switch (*i) + { + case '!': + exclamation++; + break; + case '@': + atsign++; + break; + } + } -/* return channel count */ -long InspIRCd::ChannelCount() -{ - return chanlist->size(); -} + /* valid masks only have 1 ! and @ */ + if (exclamation != 1 || atsign != 1) + return false; -/* return how many local registered users there are */ -long InspIRCd::LocalUserCount() -{ - /* Doesnt count unregistered clients */ - return (local_users.size() - this->UnregisteredUserCount()); + return true; } /* 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 != '#') @@ -402,7 +187,6 @@ bool InspIRCd::IsChannel(const char *chname) return false; } - c = (char *)chname + 1; while (*c) { switch (*c) @@ -415,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; } @@ -426,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 <= '}')) { @@ -451,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 */ @@ -460,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 <= '}')) { @@ -478,32 +263,35 @@ bool IsIdentHandler::Call(const char* n) return true; } -/* open the proper logfile */ -bool InspIRCd::OpenLog(char** argv, int argc) +bool IsSIDHandler::Call(const std::string &str) { - Config->MyDir = Config->GetFullProgDir(); + /* 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 + */ + return ((str.length() == 3) && isdigit(str[0]) && + ((str[1] >= 'A' && str[1] <= 'Z') || isdigit(str[1])) && + ((str[2] >= 'A' && str[2] <= 'Z') || isdigit(str[2]))); +} - if (!*this->LogFileName) - { - if (Config->logpath.empty()) - { - Config->logpath = Config->MyDir + "/ircd.log"; - } +/* open the proper logfile */ +bool InspIRCd::OpenLog(char**, int) +{ + 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) { - this->Logger = NULL; return false; } - this->Logger = new FileLogger(this, Config->log_file); + FileWriter* fw = new FileWriter(startup); + FileLogStream *f = new FileLogStream((Config->cmdline.forcedebug ? DEBUG : DEFAULT), fw); + + this->Logs->AddLogType("*", f, true); + return true; } @@ -512,33 +300,23 @@ 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(userrec* user, userrec* dest, int numeric, const std::string &text) +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()); } -void InspIRCd::SendWhoisLine(userrec* user, userrec* dest, int numeric, const char* format, ...) +void InspIRCd::SendWhoisLine(User* user, User* dest, int numeric, const char* format, ...) { char textbuffer[MAXBUF]; va_list argsPtr; @@ -548,3 +326,83 @@ void InspIRCd::SendWhoisLine(userrec* user, userrec* dest, int numeric, const ch this->SendWhoisLine(user, dest, numeric, std::string(textbuffer)); } + +/** Refactored by Brain, Jun 2009. Much faster with some clever O(1) array + * lookups and pointer maths. + */ +long InspIRCd::Duration(const std::string &str) +{ + unsigned char multiplier = 0; + long total = 0; + long times = 1; + long subtotal = 0; + + /* Iterate each item in the string, looking for number or multiplier */ + for (std::string::const_reverse_iterator i = str.rbegin(); i != str.rend(); ++i) + { + /* Found a number, queue it onto the current number */ + if ((*i >= '0') && (*i <= '9')) + { + subtotal = subtotal + ((*i - '0') * times); + times = times * 10; + } + else + { + /* Found something thats not a number, find out how much + * it multiplies the built up number by, multiply the total + * and reset the built up number. + */ + if (subtotal) + total += subtotal * duration_multi[multiplier]; + + /* Next subtotal please */ + subtotal = 0; + multiplier = *i; + times = 1; + } + } + if (multiplier) + { + total += subtotal * duration_multi[multiplier]; + subtotal = 0; + } + /* Any trailing values built up are treated as raw seconds */ + return total + subtotal; +} + +bool InspIRCd::ULine(const std::string& sserver) +{ + if (sserver.empty()) + return true; + + return (Config->ulines.find(sserver.c_str()) != Config->ulines.end()); +} + +bool InspIRCd::SilentULine(const std::string& sserver) +{ + std::map::iterator n = Config->ulines.find(sserver.c_str()); + if (n != Config->ulines.end()) + return n->second; + else + return false; +} + +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); +}