X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fhelperfuncs.cpp;h=03d6879baf814540367909f9070d1e5f56677b6e;hb=6ab38d48cad06633bfe5a118c1c5a6877fba6d5a;hp=3fce34c77b39aeab247038d1c95dafe50670ed9a;hpb=8b9664a6af2edaa3a51dacb9fb5cfca178241289;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp index 3fce34c77..03d6879ba 100644 --- a/src/helperfuncs.cpp +++ b/src/helperfuncs.cpp @@ -2,14 +2,11 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. - * E-mail: - * - * + * InspIRCd: (C) 2002-2007 InspIRCd Development Team + * See: http://www.inspircd.org/wiki/index.php/Credits * - * Written by Craig Edwards, Craig McLure, and others. * This program is free but copyrighted software; see - * the file COPYING for details. + * the file COPYING for details. * * --------------------------------------------------- */ @@ -22,6 +19,7 @@ #include "mode.h" #include "xline.h" #include "inspircd.h" +#include "exitcodes.h" static char TIMESTR[26]; static time_t LAST = 0; @@ -32,11 +30,15 @@ static time_t LAST = 0; */ void InspIRCd::Log(int level, const char* text, ...) { + /* Do this check again here so that we save pointless vsnprintf calls */ + if ((level < Config->LogLevel) && !Config->forcedebug) + return; + va_list argsPtr; - char textbuffer[MAXBUF]; + char textbuffer[65536]; va_start(argsPtr, text); - vsnprintf(textbuffer, MAXBUF, text, argsPtr); + vsnprintf(textbuffer, 65536, text, argsPtr); va_end(argsPtr); this->Log(level, std::string(textbuffer)); @@ -75,7 +77,7 @@ void InspIRCd::Log(int level, const std::string &text) std::string InspIRCd::GetServerDescription(const char* servername) { - std::string description = ""; + std::string description; FOREACH_MOD_I(this,I_OnGetServerDescription,OnGetServerDescription(servername,description)); @@ -170,7 +172,7 @@ void InspIRCd::WriteMode(const char* modes, int flags, const char* text, ...) int modelen; va_list argsPtr; - if ((!text) || (!modes) || (!flags)) + if (!text || !modes || !flags) { this->Log(DEFAULT,"*** BUG *** WriteMode was given an invalid parameter"); return; @@ -181,14 +183,12 @@ void InspIRCd::WriteMode(const char* modes, int flags, const char* text, ...) va_end(argsPtr); modelen = strlen(modes); - for (std::vector::const_iterator i = local_users.begin(); i != local_users.end(); i++) + if (flags == WM_AND) { - userrec* t = (userrec*)(*i); - bool send_to_user = false; - - if (flags == WM_AND) + for (std::vector::const_iterator i = local_users.begin(); i != local_users.end(); i++) { - send_to_user = true; + userrec* t = *i; + bool send_to_user = true; for (int n = 0; n < modelen; n++) { @@ -198,10 +198,17 @@ void InspIRCd::WriteMode(const char* modes, int flags, const char* text, ...) break; } } + if (send_to_user) + 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++) { - send_to_user = false; + userrec* t = *i; + bool send_to_user = false; for (int n = 0; n < modelen; n++) { @@ -211,11 +218,8 @@ void InspIRCd::WriteMode(const char* modes, int flags, const char* text, ...) break; } } - } - - if (send_to_user) - { - t->WriteServ("NOTICE %s :%s",t->nick,textbuffer); + if (send_to_user) + t->WriteServ("NOTICE %s :%s",t->nick,textbuffer); } } } @@ -224,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; @@ -235,14 +239,9 @@ userrec* InspIRCd::FindNick(const std::string &nick) userrec* InspIRCd::FindNick(const char* nick) { - user_hash::iterator iter; - - if (!nick) - return NULL; - - iter = clientlist.find(nick); + user_hash::iterator iter = clientlist->find(nick); - if (iter == clientlist.end()) + if (iter == clientlist->end()) return NULL; return iter->second; @@ -252,14 +251,9 @@ userrec* InspIRCd::FindNick(const char* nick) chanrec* InspIRCd::FindChan(const char* chan) { - chan_hash::iterator iter; + chan_hash::iterator iter = chanlist->find(chan); - if (!chan) - return NULL; - - iter = chanlist.find(chan); - - if (iter == chanlist.end()) + if (iter == chanlist->end()) /* Couldn't find it */ return NULL; @@ -268,113 +262,88 @@ 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; return iter->second; } - /* * sends out an error notice to all connected clients (not to be used * lightly!) */ -void InspIRCd::SendError(const char *s) +void InspIRCd::SendError(const std::string &s) { for (std::vector::const_iterator i = this->local_users.begin(); i != this->local_users.end(); i++) { - userrec* t = (userrec*)(*i); - if (t->registered == REG_ALL) + if ((*i)->registered == REG_ALL) { - t->WriteServ("NOTICE %s :%s",t->nick,s); + (*i)->WriteServ("NOTICE %s :%s",(*i)->nick,s.c_str()); } else { - // fix - unregistered connections receive ERROR, not NOTICE - t->Write("ERROR :%s",s); + /* Unregistered connections receive ERROR, not a NOTICE */ + (*i)->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(); + 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() { - int c = 0; + return clientlist->size() - this->UnregisteredUserCount(); +} - for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++) - { - c += (i->second->registered == REG_ALL); - } +int InspIRCd::ModeCount(const char mode) +{ + ModeHandler* mh = this->Modes->FindMode(mode, MODETYPE_USER); - return c; + if (mh) + return mh->GetCount(); + else + return 0; } int InspIRCd::InvisibleUserCount() { - int c = 0; - - for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++) - { - c += ((i->second->registered == REG_ALL) && (i->second->modes[UM_INVISIBLE])); - } - - return c; + 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; @@ -436,35 +405,52 @@ 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(); + if (!*this->LogFileName) { if (Config->logpath == "") { - Config->logpath = ServerConfig::GetFullProgDir(argv,argc) + "/ircd.log"; + Config->logpath = Config->MyDir + "/ircd.log"; } + + Config->log_file = fopen(Config->logpath.c_str(),"a+"); } else { Config->log_file = fopen(this->LogFileName,"a+"); - - if (!Config->log_file) - { - printf("ERROR: Could not write to logfile %s, bailing!\n\n",Config->logpath.c_str()); - Exit(ERROR); - } - - this->Logger = new FileLogger(this, Config->log_file); - return; } - Config->log_file = fopen(Config->logpath.c_str(),"a+"); - if (!Config->log_file) { - printf("ERROR: Could not write to logfile %s, bailing!\n\n",Config->logpath.c_str()); - Exit(ERROR); + printf("ERROR: Could not write to logfile %s: %s\n\n", Config->logpath.c_str(), strerror(errno)); + Exit(EXIT_STATUS_LOG); } this->Logger = new FileLogger(this, Config->log_file); @@ -476,7 +462,7 @@ void InspIRCd::CheckRoot() { printf("WARNING!!! You are running an irc server as ROOT!!! DO NOT DO THIS!!!\n\n"); this->Log(DEFAULT,"Cant start as root"); - Exit(ERROR); + Exit(EXIT_STATUS_ROOT); } } @@ -486,7 +472,7 @@ void InspIRCd::CheckDie() { printf("WARNING: %s\n\n",Config->DieValue); this->Log(DEFAULT,"Died because of tag: %s",Config->DieValue); - Exit(ERROR); + Exit(EXIT_STATUS_DIETAG); } } @@ -499,17 +485,39 @@ 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()); - Exit(ERROR); + 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); } +void InspIRCd::SendWhoisLine(userrec* user, userrec* 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)); + + if (!MOD_RESULT) + user->WriteServ("%d %s", numeric, copy_text.c_str()); +} + +void InspIRCd::SendWhoisLine(userrec* user, userrec* dest, int numeric, const char* format, ...) +{ + char textbuffer[MAXBUF]; + va_list argsPtr; + va_start (argsPtr, format); + vsnprintf(textbuffer, MAXBUF, format, argsPtr); + va_end(argsPtr); + + this->SendWhoisLine(user, dest, numeric, std::string(textbuffer)); +} +