X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fhelperfuncs.cpp;h=608ed2f1bf953186ac20fa0b1ff8a250adeff138;hb=19157777c5f977fddbcfdc8cdad78e12bf0d6bbb;hp=fd69a9a49bcbd8e4afb57a661c35e1bcaef24e55;hpb=cd73452f53c331f42c97861546197285b7c3010e;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp index fd69a9a49..608ed2f1b 100644 --- a/src/helperfuncs.cpp +++ b/src/helperfuncs.cpp @@ -11,14 +11,10 @@ * --------------------------------------------------- */ +#include "inspircd.h" #include -#include "configreader.h" -#include "users.h" -#include "modules.h" #include "wildcard.h" -#include "mode.h" #include "xline.h" -#include "inspircd.h" #include "exitcodes.h" static char TIMESTR[26]; @@ -30,6 +26,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 +46,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 */ @@ -81,7 +82,7 @@ std::string InspIRCd::GetServerDescription(const char* servername) FOREACH_MOD_I(this,I_OnGetServerDescription,OnGetServerDescription(servername,description)); - if (description != "") + if (!description.empty()) { return description; } @@ -116,7 +117,7 @@ void InspIRCd::WriteOpers(const std::string &text) for (std::vector::iterator i = this->all_opers.begin(); i != this->all_opers.end(); i++) { userrec* a = *i; - if (IS_LOCAL(a) && a->modes[UM_SERVERNOTICE]) + if (IS_LOCAL(a) && a->IsModeSet('s')) { // send server notices to all with +s a->WriteServ("NOTICE %s :%s",a->nick,text.c_str()); @@ -192,18 +193,19 @@ void InspIRCd::WriteMode(const char* modes, int flags, const char* text, ...) for (int n = 0; n < modelen; n++) { - if (!t->modes[modes[n]-65]) + if (!t->IsModeSet(modes[n])) { send_to_user = false; break; } } 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++) { @@ -212,22 +214,27 @@ void InspIRCd::WriteMode(const char* modes, int flags, const char* text, ...) for (int n = 0; n < modelen; n++) { - if (t->modes[modes[n]-65]) + if (t->IsModeSet(modes[n])) { send_to_user = true; 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) { + if (!nick.empty() && isdigit(*nick.begin())) + return FindUUID(nick); + user_hash::iterator iter = clientlist->find(nick); if (iter == clientlist->end()) @@ -239,6 +246,9 @@ userrec* InspIRCd::FindNick(const std::string &nick) userrec* InspIRCd::FindNick(const char* nick) { + if (isdigit(*nick)) + return FindUUID(nick); + user_hash::iterator iter = clientlist->find(nick); if (iter == clientlist->end()) @@ -247,8 +257,42 @@ userrec* InspIRCd::FindNick(const char* nick) return iter->second; } -/* find a channel record by channel name and return a pointer to it */ +userrec* InspIRCd::FindNickOnly(const std::string &nick) +{ + user_hash::iterator iter = clientlist->find(nick); + + if (iter == clientlist->end()) + return NULL; + + return iter->second; +} + +userrec* InspIRCd::FindNickOnly(const char* nick) +{ + user_hash::iterator iter = clientlist->find(nick); + + if (iter == clientlist->end()) + return NULL; + + return iter->second; +} + +userrec *InspIRCd::FindUUID(const std::string &uid) +{ + return FindUUID(uid.c_str()); +} + +userrec *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 */ chanrec* InspIRCd::FindChan(const char* chan) { chan_hash::iterator iter = chanlist->find(chan); @@ -271,10 +315,7 @@ 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++) @@ -296,18 +337,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 +360,38 @@ int InspIRCd::ModeCount(const char mode) return 0; } +/* wrapper for readability */ int InspIRCd::InvisibleUserCount() { return ModeCount('i'); } +/* return how many users are opered */ int InspIRCd::OperCount() { - return this->all_opers.count(); + 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()); } - + +/* true for valid channel name, false else */ bool InspIRCd::IsChannel(const char *chname) { char *c; @@ -377,7 +425,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,13 +454,38 @@ bool InspIRCd::IsNick(const char* n) return (p < NICKMAX - 1); } -void InspIRCd::OpenLog(char** argv, int argc) +/* return true for good ident, false else */ +bool IsIdentHandler::Call(const char* n) { - Config->MyDir = ServerConfig::GetFullProgDir(argv,argc); + if (!n || !*n) + return false; + + for (char* i = (char*)n; *i; i++) + { + if ((*i >= 'A') && (*i <= '}')) + { + continue; + } + + if (((*i >= '0') && (*i <= '9')) || (*i == '-') || (*i == '.')) + { + continue; + } + + return false; + } + + return true; +} + +/* open the proper logfile */ +bool InspIRCd::OpenLog(char** argv, int argc) +{ + Config->MyDir = Config->GetFullProgDir(); if (!*this->LogFileName) { - if (Config->logpath == "") + if (Config->logpath.empty()) { Config->logpath = Config->MyDir + "/ircd.log"; } @@ -425,11 +499,12 @@ 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() @@ -461,17 +536,17 @@ void InspIRCd::LoadAllModules() for (int count = 0; count < Config->ConfValueEnum(Config->config_data, "module"); count++) { - Config->ConfValue(Config->config_data, "module","name",count,configToken,MAXBUF); - printf("[\033[1;32m*\033[0m] Loading module:\t\033[1;32m%s\033[0m\n",configToken); + 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 a module: %s", this->ModuleError()); - printf("\nThere was an error loading a module: %s\n\n",this->ModuleError()); + 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("\nA total of \033[1;32m%d\033[0m module%s been loaded.\n", this->ModCount+1, this->ModCount+1 == 1 ? " has" : "s have"); + 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); }