X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fhelperfuncs.cpp;h=155e29dd465b7ec6e664f580c6a32b8f3ad0b92f;hb=18aae91d9336b204ac252ad83008bfd0e78595e4;hp=4a9ca7f19bc7cd24d81c1dcc83553a0e32eadce7;hpb=6a869d0701bbfe3c7a5e370793adfda4b5b45c65;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp index 4a9ca7f19..155e29dd4 100644 --- a/src/helperfuncs.cpp +++ b/src/helperfuncs.cpp @@ -2,8 +2,8 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2008 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * InspIRCd: (C) 2002-2009 InspIRCd Development Team + * See: http://wiki.inspircd.org/Credits * * This program is free but copyrighted software; see * the file COPYING for details. @@ -14,7 +14,6 @@ /* $Core */ #include "inspircd.h" -#include "wildcard.h" #include "xline.h" #include "exitcodes.h" @@ -22,7 +21,7 @@ std::string InspIRCd::GetServerDescription(const char* servername) { std::string description; - FOREACH_MOD_I(this,I_OnGetServerDescription,OnGetServerDescription(servername,description)); + FOREACH_MOD(I_OnGetServerDescription,OnGetServerDescription(servername,description)); if (!description.empty()) { @@ -56,7 +55,7 @@ User* InspIRCd::FindNick(const char* nick) return FindUUID(nick); user_hash::iterator iter = this->Users->clientlist->find(nick); - + if (iter == this->Users->clientlist->end()) return NULL; @@ -126,20 +125,16 @@ void InspIRCd::SendError(const std::string &s) { for (std::vector::const_iterator i = this->Users->local_users.begin(); i != this->Users->local_users.end(); i++) { - if ((*i)->registered == REG_ALL) + User* u = *i; + if (u->registered == REG_ALL) { - (*i)->WriteServ("NOTICE %s :%s",(*i)->nick.c_str(),s.c_str()); + u->WriteServ("NOTICE %s :%s",u->nick.c_str(),s.c_str()); } else { /* Unregistered connections receive ERROR, not a NOTICE */ - (*i)->Write("ERROR :" + s); + u->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(); } } @@ -151,11 +146,11 @@ long InspIRCd::ChannelCount() bool InspIRCd::IsValidMask(const std::string &mask) { - char* dest = (char*)mask.c_str(); + const char* dest = mask.c_str(); int exclamation = 0; int atsign = 0; - for (char* i = dest; *i; i++) + for (const char* i = dest; *i; i++) { /* out of range character, bad mask */ if (*i < 32 || *i > 126) @@ -205,7 +200,7 @@ bool IsChannelHandler::Call(const char *chname, size_t max) c++; } - size_t len = c - chname; + size_t len = c - chname; /* too long a name - note funky pointer arithmetic here. */ if (len > max) { @@ -220,7 +215,7 @@ bool IsNickHandler::Call(const char* n, size_t max) { if (!n || !*n) return false; - + unsigned int p = 0; for (const char* i = n; *i; i++, p++) { @@ -307,37 +302,7 @@ bool InspIRCd::OpenLog(char**, int) { if (Config->logpath.empty()) { - std::string path = std::string(home) + "/.inspircd"; - // This tries to create the ~/.inspircd. If it succeeds, then we go ahead and use it. - // If it fails due to an existing target, then we use it anyway. - // Either way, we make sure we can get write access to the log at this point. - if (!mkdir(path.c_str(), 0700) || errno == EEXIST) - { - /* Log to ~/.inspircd/ircd.log */ - Config->logpath = path + "/startup.log"; - FILE* fd = fopen(Config->logpath.c_str(), "a+"); - if (!fd) - { - // Could not get write access... Why? - if (errno == ENOTDIR) - // ~/.inspircd is not actually a directory! - printf("\nWARNING: Unable to create directory: %s (Exists and is not a directory)\n", path.c_str()); - else - // Not writable for some other reason (no +w access, readonly fs, file too big, whatever). - printf("\nWARNING: No write access to %s (%s)\n", Config->logpath.c_str(), strerror(errno)); - Config->logpath = "./startup.log"; - } - else - { - Config->log_file = fd; - } - } - else - { - /* Couldn't make ~/.inspircd directory, log to current dir */ - Config->logpath = "./startup.log"; - printf("\nWARNING: Unable to create directory: %s (%s)\n", path.c_str(), strerror(errno)); - } + Config->logpath = "./startup.log"; } if (!Config->log_file) @@ -353,8 +318,8 @@ bool InspIRCd::OpenLog(char**, int) return false; } - FileWriter* fw = new FileWriter(this, Config->log_file); - FileLogStream *f = new FileLogStream(this, (Config->forcedebug ? DEBUG : DEFAULT), fw); + FileWriter* fw = new FileWriter(Config->log_file); + FileLogStream *f = new FileLogStream((Config->forcedebug ? DEBUG : DEFAULT), fw); this->Logs->AddLogType("*", f, true); @@ -371,24 +336,14 @@ void InspIRCd::CheckRoot() } } -void InspIRCd::CheckDie() -{ - if (*Config->DieValue) - { - printf("WARNING: %s\n\n",Config->DieValue); - this->Logs->Log("CONFIG",DEFAULT,"Died because of tag: %s",Config->DieValue); - Exit(EXIT_STATUS_DIETAG); - } -} - void InspIRCd::SendWhoisLine(User* user, User* 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)); + ModResult MOD_RESULT; + FIRST_MOD_RESULT(OnWhoisLine, MOD_RESULT, (user, dest, numeric, copy_text)); - if (!MOD_RESULT) + if (MOD_RESULT != MOD_RES_DENY) user->WriteServ("%d %s", numeric, copy_text.c_str()); } @@ -403,7 +358,7 @@ void InspIRCd::SendWhoisLine(User* user, User* dest, int numeric, const char* fo this->SendWhoisLine(user, dest, numeric, std::string(textbuffer)); } -/** Refactored by Brain, Jun 2008. Much faster with some clever O(1) array +/** Refactored by Brain, Jun 2009. Much faster with some clever O(1) array * lookups and pointer maths. */ long InspIRCd::Duration(const std::string &str) @@ -474,10 +429,10 @@ void InspIRCd::AddExtBanChar(char c) { std::string &tok = Config->data005; std::string::size_type ebpos; - - if ((ebpos = tok.find(" EXTBAN=:")) == std::string::npos) + + if ((ebpos = tok.find(" EXTBAN=,")) == std::string::npos) { - tok.append(" EXTBAN=:"); + tok.append(" EXTBAN=,"); tok.push_back(c); } else