X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fhelperfuncs.cpp;h=8e6627d1f5c8f35c5c0089c01c9ee3edce787668;hb=d49e33b22c2cbb22bad71fb07ce8003dec8270cf;hp=5662c691419980b10801fbd0c966b8d1c56c203f;hpb=fce2d243c023660a9afbf01143cde6eda2ec7a88;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp index 5662c6914..8e6627d1f 100644 --- a/src/helperfuncs.cpp +++ b/src/helperfuncs.cpp @@ -11,6 +11,7 @@ * --------------------------------------------------- */ +#include "inspircd.h" #include #include "configreader.h" #include "users.h" @@ -18,7 +19,6 @@ #include "wildcard.h" #include "mode.h" #include "xline.h" -#include "inspircd.h" #include "exitcodes.h" static char TIMESTR[26]; @@ -30,6 +30,10 @@ static time_t LAST = 0; */ void InspIRCd::Log(int level, const char* text, ...) { + /* sanity check, just in case */ + if (!this->Config) + return; + /* Do this check again here so that we save pointless vsnprintf calls */ if ((level < Config->LogLevel) && !Config->forcedebug) return; @@ -46,6 +50,7 @@ void InspIRCd::Log(int level, const char* text, ...) void InspIRCd::Log(int level, const std::string &text) { + /* sanity check, just in case */ if (!this->Config) return; @@ -81,7 +86,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 +121,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 +197,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,20 +218,22 @@ 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) { user_hash::iterator iter = clientlist->find(nick); @@ -248,7 +256,6 @@ userrec* InspIRCd::FindNick(const char* nick) } /* 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 +278,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 +300,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 +323,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 ModeCount('o'); + 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 +388,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 +417,38 @@ bool InspIRCd::IsNick(const char* n) return (p < NICKMAX - 1); } +/* return true for good ident, false else */ +bool InspIRCd::IsIdent(const char* n) +{ + 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 */ void InspIRCd::OpenLog(char** argv, int argc) { - Config->MyDir = ServerConfig::GetFullProgDir(argv,argc); + Config->MyDir = Config->GetFullProgDir(); if (!*this->LogFileName) { - if (Config->logpath == "") + if (Config->logpath.empty()) { Config->logpath = Config->MyDir + "/ircd.log"; } @@ -461,17 +498,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); }