X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fhelperfuncs.cpp;h=da3fa5e1bc38f184e465e80cc893b907fa73000b;hb=df0c429e4b1d177335a23770999cf4b00dd532d6;hp=4f303d32c5bfaac9a4549aa28a75efcffc55800e;hpb=de3978c580edabe667d0845ed6027c9ff25e461b;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp index 4f303d32c..da3fa5e1b 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]; @@ -81,7 +81,7 @@ std::string InspIRCd::GetServerDescription(const char* servername) FOREACH_MOD_I(this,I_OnGetServerDescription,OnGetServerDescription(servername,description)); - if (description != "") + if (!description.empty()) { return description; } @@ -228,9 +228,9 @@ void InspIRCd::WriteMode(const char* modes, int flags, const char* text, ...) userrec* InspIRCd::FindNick(const std::string &nick) { - user_hash::iterator iter = clientlist.find(nick); + user_hash::iterator iter = clientlist->find(nick); - if (iter == clientlist.end()) + if (iter == clientlist->end()) /* Couldn't find it */ return NULL; @@ -239,9 +239,9 @@ userrec* InspIRCd::FindNick(const std::string &nick) userrec* InspIRCd::FindNick(const char* nick) { - user_hash::iterator iter = clientlist.find(nick); + user_hash::iterator iter = clientlist->find(nick); - if (iter == clientlist.end()) + if (iter == clientlist->end()) return NULL; return iter->second; @@ -251,9 +251,9 @@ userrec* InspIRCd::FindNick(const char* nick) chanrec* InspIRCd::FindChan(const char* chan) { - chan_hash::iterator iter = chanlist.find(chan); + chan_hash::iterator iter = chanlist->find(chan); - if (iter == chanlist.end()) + if (iter == chanlist->end()) /* Couldn't find it */ return NULL; @@ -262,9 +262,9 @@ chanrec* InspIRCd::FindChan(const char* chan) chanrec* InspIRCd::FindChan(const std::string &chan) { - chan_hash::iterator iter = chanlist.find(chan); + chan_hash::iterator iter = chanlist->find(chan); - if (iter == chanlist.end()) + if (iter == chanlist->end()) /* Couldn't find it */ return NULL; @@ -299,72 +299,51 @@ void InspIRCd::SendError(const std::string &s) // this function counts all users connected, wether they are registered or NOT. int InspIRCd::UserCount() { - return clientlist.size(); + 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 clientlist.size() - this->UnregisteredUserCount(); + return clientlist->size() - this->UnregisteredUserCount(); } -int InspIRCd::InvisibleUserCount() +int InspIRCd::ModeCount(const char mode) { - int c = 0; + ModeHandler* mh = this->Modes->FindMode(mode, MODETYPE_USER); - for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++) - { - c += ((i->second->registered == REG_ALL) && (i->second->modes[UM_INVISIBLE])); - } + if (mh) + return mh->GetCount(); + else + return 0; +} - return c; +int InspIRCd::InvisibleUserCount() +{ + return ModeCount('i'); } int InspIRCd::OperCount() { - int c = 0; - - for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++) - { - if (*(i->second->oper)) - c++; - } - return c; + return this->all_opers.size(); } int InspIRCd::UnregisteredUserCount() { - int c = 0; - - for (std::vector::const_iterator i = local_users.begin(); i != local_users.end(); i++) - { - userrec* t = (userrec*)(*i); - if (t->registered != REG_ALL) - c++; - } - - return c; + return this->unregistered_count; } long InspIRCd::ChannelCount() { - return chanlist.size(); + return chanlist->size(); } long InspIRCd::LocalUserCount() { - int c = 0; - - for (std::vector::const_iterator i = local_users.begin(); i != local_users.end(); i++) - { - userrec* t = (userrec*)(*i); - if (t->registered == REG_ALL) - c++; - } - - return c; + /* Doesnt count unregistered clients */ + return (local_users.size() - this->UnregisteredUserCount()); } - + bool InspIRCd::IsChannel(const char *chname) { char *c; @@ -426,17 +405,43 @@ bool InspIRCd::IsNick(const char* n) return (p < NICKMAX - 1); } + +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; +} + void InspIRCd::OpenLog(char** argv, int argc) { - Config->MyDir = ServerConfig::GetFullProgDir(argv,argc); - Config->argv = argv; - Config->argc = argc; + Config->MyDir = Config->GetFullProgDir(); if (!*this->LogFileName) { - if (Config->logpath == "") + 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+"); @@ -457,10 +462,17 @@ void InspIRCd::OpenLog(char** argv, int argc) 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); } } @@ -484,17 +496,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); }