X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fhelperfuncs.cpp;h=a1d40cc5fabe1932b4e05a7d4cb5bf3958fddead;hb=4be79b163029aae7f322bd9699bb8855a96e0547;hp=3591a2d89c54dcecabfb8f7d9fe70d02f3f316fb;hpb=10ef0fde2e1832f0684ae142a582cb5f032bfe6a;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp index 3591a2d89..a1d40cc5f 100644 --- a/src/helperfuncs.cpp +++ b/src/helperfuncs.cpp @@ -11,13 +11,11 @@ * --------------------------------------------------- */ +/* $Core: libIRCDhelper */ + #include "inspircd.h" #include -#include "configreader.h" -#include "users.h" -#include "modules.h" #include "wildcard.h" -#include "mode.h" #include "xline.h" #include "exitcodes.h" @@ -30,6 +28,10 @@ static time_t LAST = 0; */ 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; @@ -46,7 +48,8 @@ void InspIRCd::Log(int level, const char* text, ...) void InspIRCd::Log(int level, const std::string &text) { - if (!this->Config) + /* sanity check, just in case */ + if (!this->Config || !this->Logger) return; /* If we were given -debug we output all messages, regardless of configured loglevel */ @@ -113,9 +116,9 @@ void InspIRCd::WriteOpers(const char* text, ...) void InspIRCd::WriteOpers(const std::string &text) { - for (std::vector::iterator i = this->all_opers.begin(); i != this->all_opers.end(); i++) + for (std::list::iterator i = this->all_opers.begin(); i != this->all_opers.end(); i++) { - userrec* a = *i; + User* a = *i; if (IS_LOCAL(a) && a->IsModeSet('s')) { // send server notices to all with +s @@ -138,9 +141,9 @@ void InspIRCd::ServerNoticeAll(char* text, ...) snprintf(formatbuffer,MAXBUF,"NOTICE $%s :%s",Config->ServerName,textbuffer); - for (std::vector::const_iterator i = local_users.begin(); i != local_users.end(); i++) + for (std::vector::const_iterator i = local_users.begin(); i != local_users.end(); i++) { - userrec* t = *i; + User* t = *i; t->WriteServ(std::string(formatbuffer)); } } @@ -159,9 +162,9 @@ void InspIRCd::ServerPrivmsgAll(char* text, ...) snprintf(formatbuffer,MAXBUF,"PRIVMSG $%s :%s",Config->ServerName,textbuffer); - for (std::vector::const_iterator i = local_users.begin(); i != local_users.end(); i++) + for (std::vector::const_iterator i = local_users.begin(); i != local_users.end(); i++) { - userrec* t = *i; + User* t = *i; t->WriteServ(std::string(formatbuffer)); } } @@ -185,9 +188,9 @@ void InspIRCd::WriteMode(const char* modes, int flags, const char* text, ...) if (flags == WM_AND) { - for (std::vector::const_iterator i = local_users.begin(); i != local_users.end(); i++) + for (std::vector::const_iterator i = local_users.begin(); i != local_users.end(); i++) { - userrec* t = *i; + User* t = *i; bool send_to_user = true; for (int n = 0; n < modelen; n++) @@ -199,15 +202,16 @@ void InspIRCd::WriteMode(const char* modes, int flags, const char* text, ...) } } if (send_to_user) - t->WriteServ("NOTICE %s :%s",t->nick,textbuffer); + { + t->WriteServ("NOTICE %s :%s", t->nick, textbuffer); + } } } - else - if (flags == WM_OR) + else if (flags == WM_OR) { - for (std::vector::const_iterator i = local_users.begin(); i != local_users.end(); i++) + for (std::vector::const_iterator i = local_users.begin(); i != local_users.end(); i++) { - userrec* t = *i; + User* t = *i; bool send_to_user = false; for (int n = 0; n < modelen; n++) @@ -218,16 +222,21 @@ void InspIRCd::WriteMode(const char* modes, int flags, const char* text, ...) break; } } + if (send_to_user) - t->WriteServ("NOTICE %s :%s",t->nick,textbuffer); + { + 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); if (iter == clientlist->end()) @@ -237,8 +246,11 @@ userrec* InspIRCd::FindNick(const std::string &nick) 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()) @@ -247,9 +259,43 @@ userrec* InspIRCd::FindNick(const char* nick) return iter->second; } -/* find a channel record by channel name and return a pointer to it */ +User* InspIRCd::FindNickOnly(const std::string &nick) +{ + user_hash::iterator iter = clientlist->find(nick); + + if (iter == clientlist->end()) + return NULL; + + return iter->second; +} + +User* InspIRCd::FindNickOnly(const char* nick) +{ + user_hash::iterator iter = clientlist->find(nick); + + if (iter == clientlist->end()) + return NULL; -chanrec* InspIRCd::FindChan(const char* chan) + return iter->second; +} + +User *InspIRCd::FindUUID(const std::string &uid) +{ + return FindUUID(uid.c_str()); +} + +User *InspIRCd::FindUUID(const char *uid) +{ + user_hash::iterator finduuid = uuidlist->find(uid); + + if (finduuid == uuidlist->end()) + return NULL; + + return finduuid->second; +} + +/* find a channel record by channel name and return a pointer to it */ +Channel* InspIRCd::FindChan(const char* chan) { chan_hash::iterator iter = chanlist->find(chan); @@ -260,7 +306,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); @@ -271,13 +317,10 @@ chanrec* InspIRCd::FindChan(const std::string &chan) return iter->second; } -/* - * sends out an error notice to all connected clients (not to be used - * lightly!) - */ +/* 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->local_users.begin(); i != this->local_users.end(); i++) { if ((*i)->registered == REG_ALL) { @@ -296,18 +339,19 @@ void InspIRCd::SendError(const std::string &s) } } -// this function counts all users connected, wether they are registered or NOT. +/* 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 +/* 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 clientlist->size() - this->UnregisteredUserCount(); } +/* 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); @@ -318,32 +362,64 @@ int InspIRCd::ModeCount(const char mode) return 0; } -int InspIRCd::InvisibleUserCount() -{ - return ModeCount('i'); -} - +/* return how many users are opered */ int InspIRCd::OperCount() { return this->all_opers.size(); } +/* return how many users are unregistered */ int InspIRCd::UnregisteredUserCount() { return this->unregistered_count; } +/* return channel count */ long InspIRCd::ChannelCount() { return chanlist->size(); } +/* return how many local registered users there are */ long InspIRCd::LocalUserCount() { /* Doesnt count unregistered clients */ return (local_users.size() - this->UnregisteredUserCount()); } - + +bool InspIRCd::IsValidMask(const std::string &mask) +{ + char* dest = (char*)mask.c_str(); + int exclamation = 0; + int atsign = 0; + + for (char* i = dest; *i; i++) + { + /* out of range character, bad mask */ + if (*i < 32 || *i > 126) + { + return false; + } + + switch (*i) + { + case '!': + exclamation++; + break; + case '@': + atsign++; + break; + } + } + + /* valid masks only have 1 ! and @ */ + if (exclamation != 1 || atsign != 1) + return false; + + return true; +} + +/* true for valid channel name, false else */ bool InspIRCd::IsChannel(const char *chname) { char *c; @@ -377,7 +453,8 @@ bool InspIRCd::IsChannel(const char *chname) return true; } -bool InspIRCd::IsNick(const char* n) +/* true for valid nickname, false else */ +bool IsNickHandler::Call(const char* n) { if (!n || !*n) return false; @@ -405,8 +482,8 @@ bool InspIRCd::IsNick(const char* n) return (p < NICKMAX - 1); } - -bool InspIRCd::IsIdent(const char* n) +/* return true for good ident, false else */ +bool IsIdentHandler::Call(const char* n) { if (!n || !*n) return false; @@ -429,7 +506,8 @@ bool InspIRCd::IsIdent(const char* n) return true; } -void InspIRCd::OpenLog(char** argv, int argc) +/* open the proper logfile */ +bool InspIRCd::OpenLog(char**, int) { Config->MyDir = Config->GetFullProgDir(); @@ -437,11 +515,7 @@ void InspIRCd::OpenLog(char** argv, int argc) { if (Config->logpath.empty()) { -#ifndef DARWIN Config->logpath = Config->MyDir + "/ircd.log"; -#else - Config->logpath = "/var/log/ircd.log"; -#endif } Config->log_file = fopen(Config->logpath.c_str(),"a+"); @@ -453,26 +527,20 @@ void InspIRCd::OpenLog(char** argv, int argc) if (!Config->log_file) { - printf("ERROR: Could not write to logfile %s: %s\n\n", Config->logpath.c_str(), strerror(errno)); - Exit(EXIT_STATUS_LOG); + this->Logger = NULL; + return false; } this->Logger = new FileLogger(this, Config->log_file); + return true; } void InspIRCd::CheckRoot() { -#ifndef DARWIN 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"); -#else - if (geteuid() != 16) - { - printf("WARNING!!! You are not running inspircd as the ircdaemon user!!! YOU CAN NOT DO THIS!!!\n\n"); - this->Log(DEFAULT,"Must start as user ircdaemon"); -#endif Exit(EXIT_STATUS_ROOT); } } @@ -487,30 +555,7 @@ void InspIRCd::CheckDie() } } -/* We must load the modules AFTER initializing the socket engine, now */ -void InspIRCd::LoadAllModules() -{ - char configToken[MAXBUF]; - Config->module_names.clear(); - this->ModCount = -1; - - for (int count = 0; count < Config->ConfValueEnum(Config->config_data, "module"); count++) - { - Config->ConfValue(Config->config_data, "module", "name", count, configToken, MAXBUF); - printf_c("[\033[1;32m*\033[0m] Loading module:\t\033[1;32m%s\033[0m\n",configToken); - - if (!this->LoadModule(configToken)) - { - this->Log(DEFAULT,"There was an error loading the module '%s': %s", configToken, this->ModuleError()); - printf_c("\n[\033[1;31m*\033[0m] There was an error loading the module '%s': %s\n\n", configToken, this->ModuleError()); - Exit(EXIT_STATUS_MODULE); - } - } - printf_c("\nA total of \033[1;32m%d\033[0m module%s been loaded.\n", this->ModCount+1, this->ModCount+1 == 1 ? " has" : "s have"); - this->Log(DEFAULT,"Total loaded modules: %d", this->ModCount+1); -} - -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; @@ -521,7 +566,7 @@ void InspIRCd::SendWhoisLine(userrec* user, userrec* dest, int numeric, const st 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; @@ -532,3 +577,69 @@ void InspIRCd::SendWhoisLine(userrec* user, userrec* dest, int numeric, const ch this->SendWhoisLine(user, dest, numeric, std::string(textbuffer)); } +/** Refactored by Brain, Jun 2007. 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 char* server) +{ + if (!server) + return false; + if (!*server) + return true; + + return (Config->ulines.find(server) != Config->ulines.end()); +} + +bool InspIRCd::SilentULine(const char* server) +{ + std::map::iterator n = Config->ulines.find(server); + if (n != Config->ulines.end()) + return n->second; + else return false; +} + +std::string InspIRCd::TimeString(time_t curtime) +{ + return std::string(ctime(&curtime),24); +} +