X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fhelperfuncs.cpp;h=94ba6a03728e42d989f313b33abf49d8d141bd12;hb=0f87ad0d4b97874823c94a5168a06dcd444ad559;hp=f38b3e6b569174fd40fb706b69d701a1feaae8cd;hpb=a3fb932831ca09b2a931616f1701ea39429356c2;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp index f38b3e6b5..94ba6a037 100644 --- a/src/helperfuncs.cpp +++ b/src/helperfuncs.cpp @@ -3,7 +3,7 @@ * +------------------------------------+ * * InspIRCd: (C) 2002-2009 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * See: http://wiki.inspircd.org/Credits * * This program is free but copyrighted software; see * the file COPYING for details. @@ -17,11 +17,11 @@ #include "xline.h" #include "exitcodes.h" -std::string InspIRCd::GetServerDescription(const char* servername) +std::string InspIRCd::GetServerDescription(const std::string& servername) { std::string description; - FOREACH_MOD_I(this,I_OnGetServerDescription,OnGetServerDescription(servername,description)); + FOREACH_MOD(I_OnGetServerDescription,OnGetServerDescription(servername,description)); if (!description.empty()) { @@ -55,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; @@ -123,22 +123,18 @@ Channel* InspIRCd::FindChan(const std::string &chan) /* Send an error notice to all users, registered or not */ 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++) + 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(); } } @@ -150,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) @@ -204,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) { @@ -219,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++) { @@ -280,50 +276,19 @@ bool IsSIDHandler::Call(const std::string &str) /* open the proper logfile */ bool InspIRCd::OpenLog(char**, int) { - /* This function only happens at startup now */ - if (Config->nofork) - { - this->Logs->SetupNoFork(); - } - Config->MyDir = Config->GetFullProgDir(); + if (!Config->cmdline.writelog) return true; // Skip opening default log if -nolog - /* Attempt to find home directory, portable to windows */ - const char* home = getenv("HOME"); - if (!home) - { - /* No $HOME, log to %USERPROFILE% */ - home = getenv("USERPROFILE"); - if (!home) - { - /* Nothing could be found at all, log to current dir */ - Config->logpath = "./startup.log"; - } - } - - if (!Config->writelog) return true; // Skip opening default log if -nolog - - if (!*this->LogFileName) - { - if (Config->logpath.empty()) - { - Config->logpath = "./startup.log"; - } - - if (!Config->log_file) - Config->log_file = fopen(Config->logpath.c_str(),"a+"); - } - else - { - Config->log_file = fopen(this->LogFileName,"a+"); - } + if (Config->cmdline.startup_log.empty()) + Config->cmdline.startup_log = "logs/startup.log"; + FILE* startup = fopen(Config->cmdline.startup_log.c_str(), "a+"); - if (!Config->log_file) + if (!startup) { return false; } - FileWriter* fw = new FileWriter(this, Config->log_file); - FileLogStream *f = new FileLogStream(this, (Config->forcedebug ? DEBUG : DEFAULT), fw); + FileWriter* fw = new FileWriter(startup); + FileLogStream *f = new FileLogStream((Config->cmdline.forcedebug ? DEBUG : DEFAULT), fw); this->Logs->AddLogType("*", f, true); @@ -340,24 +305,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()); } @@ -415,22 +370,21 @@ long InspIRCd::Duration(const std::string &str) return total + subtotal; } -bool InspIRCd::ULine(const char* sserver) +bool InspIRCd::ULine(const std::string& sserver) { - if (!sserver) - return false; - if (!*sserver) + if (sserver.empty()) return true; - return (Config->ulines.find(sserver) != Config->ulines.end()); + return (Config->ulines.find(sserver.c_str()) != Config->ulines.end()); } -bool InspIRCd::SilentULine(const char* sserver) +bool InspIRCd::SilentULine(const std::string& sserver) { - std::map::iterator n = Config->ulines.find(sserver); + std::map::iterator n = Config->ulines.find(sserver.c_str()); if (n != Config->ulines.end()) return n->second; - else return false; + else + return false; } std::string InspIRCd::TimeString(time_t curtime) @@ -443,7 +397,7 @@ void InspIRCd::AddExtBanChar(char c) { std::string &tok = Config->data005; std::string::size_type ebpos; - + if ((ebpos = tok.find(" EXTBAN=,")) == std::string::npos) { tok.append(" EXTBAN=,"); @@ -452,6 +406,3 @@ void InspIRCd::AddExtBanChar(char c) else tok.insert(ebpos + 9, 1, c); } - - -