* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * InspIRCd: (C) 2002-2010 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
*
* This program is free but copyrighted software; see
* the file COPYING for details.
/* $Core */
#include "inspircd.h"
-#include "wildcard.h"
#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())
{
return FindUUID(nick);
user_hash::iterator iter = this->Users->clientlist->find(nick);
-
+
if (iter == this->Users->clientlist->end())
return NULL;
/* Send an error notice to all users, registered or not */
void InspIRCd::SendError(const std::string &s)
{
- for (std::vector<User*>::const_iterator i = this->Users->local_users.begin(); i != this->Users->local_users.end(); i++)
+ for (std::vector<LocalUser*>::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();
}
}
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)
c++;
}
- size_t len = c - chname;
+ size_t len = c - chname;
/* too long a name - note funky pointer arithmetic here. */
if (len > max)
{
{
if (!n || !*n)
return false;
-
+
unsigned int p = 0;
for (const char* i = n; *i; i++, p++)
{
/* 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();
-
- /* 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->cmdline.writelog) return true; // Skip opening default log if -nolog
- if (!Config->writelog) return true; // Skip opening default log if -nolog
+ if (Config->cmdline.startup_log.empty())
+ Config->cmdline.startup_log = "logs/startup.log";
+ FILE* startup = fopen(Config->cmdline.startup_log.c_str(), "a+");
- if (!*this->LogFileName)
- {
- 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));
- }
- }
-
- if (!Config->log_file)
- Config->log_file = fopen(Config->logpath.c_str(),"a+");
- }
- else
- {
- Config->log_file = fopen(this->LogFileName,"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);
}
}
-void InspIRCd::CheckDie()
-{
- if (*Config->DieValue)
- {
- printf("WARNING: %s\n\n",Config->DieValue);
- this->Logs->Log("CONFIG",DEFAULT,"Died because of <die> 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());
}
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)
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<irc::string,bool>::iterator n = Config->ulines.find(sserver);
+ std::map<irc::string,bool>::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)
{
std::string &tok = Config->data005;
std::string::size_type ebpos;
-
+
if ((ebpos = tok.find(" EXTBAN=,")) == std::string::npos)
{
tok.append(" EXTBAN=,");
projects / user / henk / code / inspircd.git / blobdiff