* See: http://www.inspircd.org/wiki/index.php/Credits
*
* This program is free but copyrighted software; see
- * the file COPYING for details.
+ * the file COPYING for details.
*
* ---------------------------------------------------
*/
-/* $Core: libIRCDhelper */
+/* $Core */
#include "inspircd.h"
-#include "wildcard.h"
#include "xline.h"
#include "exitcodes.h"
-/** Log()
- * Write a line of text `text' to the logfile (and stdout, if in nofork) if the level `level'
- * is greater than the configured loglevel.
- */
-void InspIRCd::Log(int level, const char* text, ...)
-{
- va_list argsPtr;
- char textbuffer[65536];
-
- va_start(argsPtr, text);
- vsnprintf(textbuffer, 65536, text, argsPtr);
- va_end(argsPtr);
-
- this->Log(level, std::string(textbuffer));
-}
-
-void InspIRCd::Log(int level, const std::string &text)
-{
- this->Logs->Log("WARNING", DEFAULT, "Deprecated call to InspIRCd::Log()! - log message follows");
- this->Logs->Log("DEPRECATED", level, text);
-}
-
std::string InspIRCd::GetServerDescription(const char* servername)
{
std::string description;
{
if ((*i)->registered == REG_ALL)
{
- (*i)->WriteServ("NOTICE %s :%s",(*i)->nick,s.c_str());
+ (*i)->WriteServ("NOTICE %s :%s",(*i)->nick.c_str(),s.c_str());
}
else
{
}
/* true for valid channel name, false else */
-bool InspIRCd::IsChannel(const char *chname)
+bool IsChannelHandler::Call(const char *chname, size_t max)
{
- char *c;
+ const char *c = chname + 1;
/* check for no name - don't check for !*chname, as if it is empty, it won't be '#'! */
if (!chname || *chname != '#')
return false;
}
- c = (char *)chname + 1;
while (*c)
{
switch (*c)
c++;
}
-
+
+ size_t len = c - chname;
/* too long a name - note funky pointer arithmetic here. */
- if ((c - chname) > CHANMAX)
+ if (len > max)
{
return false;
}
}
/* true for valid nickname, false else */
-bool IsNickHandler::Call(const char* n)
+bool IsNickHandler::Call(const char* n, size_t max)
{
if (!n || !*n)
return false;
- int p = 0;
- for (char* i = (char*)n; *i; i++, p++)
+ unsigned int p = 0;
+ for (const char* i = n; *i; i++, p++)
{
if ((*i >= 'A') && (*i <= '}'))
{
}
/* too long? or not -- pointer arithmetic rocks */
- return (p < NICKMAX - 1);
+ return (p < max);
}
/* return true for good ident, false else */
if (!n || !*n)
return false;
- for (char* i = (char*)n; *i; i++)
+ for (const char* i = n; *i; i++)
{
if ((*i >= 'A') && (*i <= '}'))
{
return true;
}
-bool InspIRCd::IsSID(const std::string &str)
+bool IsSIDHandler::Call(const std::string &str)
{
/* Returns true if the string given is exactly 3 characters long,
* starts with a digit, and the other two characters are A-Z or digits
/* 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->writelog) return true; // Skip opening default log if -nolog
+
if (!*this->LogFileName)
{
if (Config->logpath.empty())
{
- Config->logpath = Config->MyDir + "/ircd.log";
+ 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->log_file = fopen(Config->logpath.c_str(),"a+");
+ if (!Config->log_file)
+ Config->log_file = fopen(Config->logpath.c_str(),"a+");
}
else
{
}
FileWriter* fw = new FileWriter(this, Config->log_file);
- FileLogStream *f = new FileLogStream(this, Config->LogLevel, fw);
+ FileLogStream *f = new FileLogStream(this, (Config->forcedebug ? DEBUG : DEFAULT), fw);
+
+ this->Logs->AddLogType("*", f, true);
- this->Logs->AddLogType("*", f);
return true;
}
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");
+ this->Logs->Log("STARTUP",DEFAULT,"Cant start as root");
Exit(EXIT_STATUS_ROOT);
}
}
if (*Config->DieValue)
{
printf("WARNING: %s\n\n",Config->DieValue);
- this->Log(DEFAULT,"Died because of <die> tag: %s",Config->DieValue);
+ this->Logs->Log("CONFIG",DEFAULT,"Died because of <die> tag: %s",Config->DieValue);
Exit(EXIT_STATUS_DIETAG);
}
}
return total + subtotal;
}
-bool InspIRCd::ULine(const char* server)
+bool InspIRCd::ULine(const char* sserver)
{
- if (!server)
+ if (!sserver)
return false;
- if (!*server)
+ if (!*sserver)
return true;
- return (Config->ulines.find(server) != Config->ulines.end());
+ return (Config->ulines.find(sserver) != Config->ulines.end());
}
-bool InspIRCd::SilentULine(const char* server)
+bool InspIRCd::SilentULine(const char* sserver)
{
- std::map<irc::string,bool>::iterator n = Config->ulines.find(server);
+ std::map<irc::string,bool>::iterator n = Config->ulines.find(sserver);
if (n != Config->ulines.end())
return n->second;
else return false;
return std::string(ctime(&curtime),24);
}
+// You should only pass a single character to this.
+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=,");
+ tok.push_back(c);
+ }
+ else
+ tok.insert(ebpos + 9, 1, c);
+}
projects / user / henk / code / inspircd.git / blobdiff