* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- * E-mail:
- * <brain@chatspike.net>
- * <Craig@chatspike.net>
+ * 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.
*
* ---------------------------------------------------
*/
+#include "inspircd.h"
#include <stdarg.h>
-#include "inspircd_config.h"
-#include "configreader.h"
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/errno.h>
-#include <signal.h>
-#include <time.h>
-#include <string>
-#include <sstream>
-#ifdef HAS_EXECINFO
-#include <execinfo.h>
-#endif
-#include "connection.h"
-#include "users.h"
-#include "ctables.h"
-#include "globals.h"
-#include "modules.h"
-#include "dynamic.h"
#include "wildcard.h"
-#include "message.h"
-#include "mode.h"
#include "xline.h"
-#include "commands.h"
-#include "inspstring.h"
-#include "helperfuncs.h"
-#include "hashcomp.h"
-#include "typedefs.h"
-#include "inspircd.h"
-
-extern int MODCOUNT;
-extern ModuleList modules;
-extern InspIRCd* ServerInstance;
-extern time_t TIME;
-extern char lowermap[255];
-extern std::vector<userrec*> all_opers;
-
-char LOG_FILE[MAXBUF];
+#include "exitcodes.h"
static char TIMESTR[26];
static time_t LAST = 0;
*/
void InspIRCd::Log(int level, const char* text, ...)
{
+ /* sanity check, just in case */
+ if (!this->Config || !this->Logger)
+ return;
+
+ /* 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);
- InspIRCd::Log(level, std::string(textbuffer));
+ this->Log(level, std::string(textbuffer));
}
void InspIRCd::Log(int level, const std::string &text)
{
- if (!ServerInstance || !ServerInstance->Config)
+ /* sanity check, just in case */
+ if (!this->Config || !this->Logger)
return;
/* If we were given -debug we output all messages, regardless of configured loglevel */
- if ((level < ServerInstance->Config->LogLevel) && !ServerInstance->Config->forcedebug)
+ if ((level < Config->LogLevel) && !Config->forcedebug)
return;
- if (TIME != LAST)
+ if (Time() != LAST)
{
- struct tm *timeinfo = localtime(&TIME);
+ time_t local = Time();
+ struct tm *timeinfo = localtime(&local);
strlcpy(TIMESTR,asctime(timeinfo),26);
TIMESTR[24] = ':';
- LAST = TIME;
+ LAST = Time();
}
- if (ServerInstance->Config->log_file && ServerInstance->Config->writelog)
+ if (Config->log_file && Config->writelog)
{
- fprintf(ServerInstance->Config->log_file,"%s %s\n",TIMESTR,text.c_str());
- fflush(ServerInstance->Config->log_file);
+ std::string out = std::string(TIMESTR) + " " + text.c_str() + "\n";
+ this->Logger->WriteLogLine(out);
}
- if (ServerInstance->Config->nofork)
+ if (Config->nofork)
{
printf("%s %s\n", TIMESTR, text.c_str());
}
std::string InspIRCd::GetServerDescription(const char* servername)
{
- std::string description = "";
+ std::string description;
- FOREACH_MOD(I_OnGetServerDescription,OnGetServerDescription(servername,description));
+ FOREACH_MOD_I(this,I_OnGetServerDescription,OnGetServerDescription(servername,description));
- if (description != "")
+ if (!description.empty())
{
return description;
}
void InspIRCd::WriteOpers(const std::string &text)
{
- for (std::vector<userrec*>::iterator i = all_opers.begin(); i != all_opers.end(); i++)
+ for (std::list<userrec*>::iterator i = this->all_opers.begin(); i != this->all_opers.end(); i++)
{
userrec* a = *i;
- if (IS_LOCAL(a) && a->modes[UM_SERVERNOTICE])
+ if (IS_LOCAL(a) && a->IsModeSet('s'))
{
// send server notices to all with +s
a->WriteServ("NOTICE %s :%s",a->nick,text.c_str());
vsnprintf(textbuffer, MAXBUF, text, argsPtr);
va_end(argsPtr);
- snprintf(formatbuffer,MAXBUF,"NOTICE $%s :%s",ServerInstance->Config->ServerName,textbuffer);
+ snprintf(formatbuffer,MAXBUF,"NOTICE $%s :%s",Config->ServerName,textbuffer);
for (std::vector<userrec*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
{
vsnprintf(textbuffer, MAXBUF, text, argsPtr);
va_end(argsPtr);
- snprintf(formatbuffer,MAXBUF,"PRIVMSG $%s :%s",ServerInstance->Config->ServerName,textbuffer);
+ snprintf(formatbuffer,MAXBUF,"PRIVMSG $%s :%s",Config->ServerName,textbuffer);
for (std::vector<userrec*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
{
int modelen;
va_list argsPtr;
- if ((!text) || (!modes) || (!flags))
+ if (!text || !modes || !flags)
{
- log(DEFAULT,"*** BUG *** WriteMode was given an invalid parameter");
+ this->Log(DEFAULT,"*** BUG *** WriteMode was given an invalid parameter");
return;
}
va_end(argsPtr);
modelen = strlen(modes);
- for (std::vector<userrec*>::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<userrec*>::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++)
{
- if (!t->modes[modes[n]-65])
+ if (!t->IsModeSet(modes[n]))
{
send_to_user = false;
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<userrec*>::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++)
{
- if (t->modes[modes[n]-65])
+ if (t->IsModeSet(modes[n]))
{
send_to_user = true;
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);
+ }
}
}
}
-/* convert a string to lowercase. Note following special circumstances
- * taken from RFC 1459. Many "official" server branches still hold to this
- * rule so i will too;
- *
- * Because of IRC's scandanavian origin, the characters {}| are
- * considered to be the lower case equivalents of the characters []\,
- * respectively. This is a critical issue when determining the
- * equivalence of two nicknames.
- */
-void strlower(char *n)
-{
- if (n)
- {
- for (char* t = n; *t; t++)
- *t = lowermap[(unsigned char)*t];
- }
-}
-
/* Find a user record by nickname and return a pointer to it */
-
userrec* InspIRCd::FindNick(const std::string &nick)
{
- user_hash::iterator iter = clientlist.find(nick);
+ if (!nick.empty() && isdigit(*nick.begin()))
+ return FindUUID(nick);
+
+ user_hash::iterator iter = clientlist->find(nick);
- if (iter == clientlist.end())
+ if (iter == clientlist->end())
/* Couldn't find it */
return NULL;
userrec* InspIRCd::FindNick(const char* nick)
{
- user_hash::iterator iter;
+ if (isdigit(*nick))
+ return FindUUID(nick);
- if (!nick)
+ user_hash::iterator iter = clientlist->find(nick);
+
+ if (iter == clientlist->end())
return NULL;
- iter = clientlist.find(nick);
-
- if (iter == clientlist.end())
+ return iter->second;
+}
+
+userrec* InspIRCd::FindNickOnly(const std::string &nick)
+{
+ user_hash::iterator iter = clientlist->find(nick);
+
+ if (iter == clientlist->end())
return NULL;
return iter->second;
}
-/* find a channel record by channel name and return a pointer to it */
+userrec* InspIRCd::FindNickOnly(const char* nick)
+{
+ user_hash::iterator iter = clientlist->find(nick);
-chanrec* InspIRCd::FindChan(const char* chan)
+ if (iter == clientlist->end())
+ return NULL;
+
+ return iter->second;
+}
+
+userrec *InspIRCd::FindUUID(const std::string &uid)
+{
+ return FindUUID(uid.c_str());
+}
+
+userrec *InspIRCd::FindUUID(const char *uid)
{
- chan_hash::iterator iter;
+ user_hash::iterator finduuid = uuidlist->find(uid);
- if (!chan)
+ if (finduuid == uuidlist->end())
return NULL;
- iter = chanlist.find(chan);
+ return finduuid->second;
+}
+
+/* find a channel record by channel name and return a pointer to it */
+chanrec* InspIRCd::FindChan(const char* chan)
+{
+ chan_hash::iterator iter = chanlist->find(chan);
- if (iter == chanlist.end())
+ if (iter == chanlist->end())
/* Couldn't find it */
return NULL;
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)
+/* Send an error notice to all users, registered or not */
+void InspIRCd::SendError(const std::string &s)
{
for (std::vector<userrec*>::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();
}
}
-void Error(int status)
-{
- void *array[300];
- size_t size;
- char **strings;
-
- signal(SIGALRM, SIG_IGN);
- signal(SIGPIPE, SIG_IGN);
- signal(SIGTERM, SIG_IGN);
- signal(SIGABRT, SIG_IGN);
- signal(SIGSEGV, SIG_IGN);
- signal(SIGURG, SIG_IGN);
- signal(SIGKILL, SIG_IGN);
- log(DEFAULT,"*** fell down a pothole in the road to perfection ***");
-#ifdef HAS_EXECINFO
- log(DEFAULT,"Please report the backtrace lines shown below with any bugreport to the bugtracker at http://www.inspircd.org/bugtrack/");
- size = backtrace(array, 30);
- strings = backtrace_symbols(array, size);
- for (size_t i = 0; i < size; i++) {
- log(DEFAULT,"[%d] %s", i, strings[i]);
- }
- free(strings);
- ServerInstance->WriteOpers("*** SIGSEGV: Please see the ircd.log for backtrace and report the error to http://www.inspircd.org/bugtrack/");
-#else
- log(DEFAULT,"You do not have execinfo.h so i could not backtrace -- on FreeBSD, please install the libexecinfo port.");
-#endif
- ServerInstance->SendError("Somebody screwed up... Whoops. IRC Server terminating.");
- signal(SIGSEGV, SIG_DFL);
- if (raise(SIGSEGV) == -1)
- {
- log(DEFAULT,"What the hell, i couldnt re-raise SIGSEGV! Error: %s",strerror(errno));
- }
- Exit(status);
-}
-
-// this function counts all users connected, wether they are registered or NOT.
-int InspIRCd::usercnt()
+/* 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::registered_usercount()
+/* 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;
-
- for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
- {
- c += (i->second->registered == REG_ALL);
- }
-
- return c;
+ return clientlist->size() - this->UnregisteredUserCount();
}
-int InspIRCd::usercount_invisible()
+/* return how many users have a given mode e.g. 'a' */
+int InspIRCd::ModeCount(const char mode)
{
- 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]));
- }
+ ModeHandler* mh = this->Modes->FindMode(mode, MODETYPE_USER);
- return c;
+ if (mh)
+ return mh->GetCount();
+ else
+ return 0;
}
-int InspIRCd::usercount_opers()
+/* wrapper for readability */
+int InspIRCd::InvisibleUserCount()
{
- int c = 0;
-
- for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
- {
- if (*(i->second->oper))
- c++;
- }
- return c;
+ return ModeCount('i');
}
-int InspIRCd::usercount_unknown()
+/* return how many users are opered */
+int InspIRCd::OperCount()
{
- int c = 0;
-
- for (std::vector<userrec*>::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->all_opers.size();
}
-long InspIRCd::chancount()
+/* return how many users are unregistered */
+int InspIRCd::UnregisteredUserCount()
{
- return chanlist.size();
+ return this->unregistered_count;
}
-long InspIRCd::local_count()
+/* return channel count */
+long InspIRCd::ChannelCount()
{
- int c = 0;
-
- for (std::vector<userrec*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
- {
- userrec* t = (userrec*)(*i);
- if (t->registered == REG_ALL)
- c++;
- }
-
- return c;
+ return chanlist->size();
}
-void ShowMOTD(userrec *user)
+/* return how many local registered users there are */
+long InspIRCd::LocalUserCount()
{
- if (!ServerInstance->Config->MOTD.size())
- {
- user->WriteServ("422 %s :Message of the day file is missing.",user->nick);
- return;
- }
- user->WriteServ("375 %s :%s message of the day", user->nick, ServerInstance->Config->ServerName);
-
- for (unsigned int i = 0; i < ServerInstance->Config->MOTD.size(); i++)
- user->WriteServ("372 %s :- %s",user->nick,ServerInstance->Config->MOTD[i].c_str());
-
- user->WriteServ("376 %s :End of message of the day.", user->nick);
+ /* Doesnt count unregistered clients */
+ return (local_users.size() - this->UnregisteredUserCount());
}
-void ShowRULES(userrec *user)
+/* true for valid channel name, false else */
+bool InspIRCd::IsChannel(const char *chname)
{
- if (!ServerInstance->Config->RULES.size())
+ char *c;
+
+ /* check for no name - don't check for !*chname, as if it is empty, it won't be '#'! */
+ if (!chname || *chname != '#')
{
- user->WriteServ("NOTICE %s :Rules file is missing.",user->nick);
- return;
+ return false;
}
- user->WriteServ("NOTICE %s :%s rules",user->nick,ServerInstance->Config->ServerName);
- for (unsigned int i = 0; i < ServerInstance->Config->RULES.size(); i++)
- user->WriteServ("NOTICE %s :%s",user->nick,ServerInstance->Config->RULES[i].c_str());
-
- user->WriteServ("NOTICE %s :End of %s rules.",user->nick,ServerInstance->Config->ServerName);
-}
-
-// this returns 1 when all modules are satisfied that the user should be allowed onto the irc server
-// (until this returns true, a user will block in the waiting state, waiting to connect up to the
-// registration timeout maximum seconds)
-bool AllModulesReportReady(userrec* user)
-{
- if (!ServerInstance->Config->global_implementation[I_OnCheckReady])
- return true;
-
- for (int i = 0; i <= MODCOUNT; i++)
+ c = (char *)chname + 1;
+ while (*c)
{
- if (ServerInstance->Config->implement_lists[i][I_OnCheckReady])
+ switch (*c)
{
- int res = modules[i]->OnCheckReady(user);
- if (!res)
+ case ' ':
+ case ',':
+ case 7:
return false;
}
- }
- return true;
-}
-
-/* Make Sure Modules Are Avaliable!
- * (BugFix By Craig.. See? I do work! :p)
- * Modified by brain, requires const char*
- * to work with other API functions
- */
-
-/* XXX - Needed? */
-bool FileExists (const char* file)
-{
- FILE *input;
- if ((input = fopen (file, "r")) == NULL)
- {
- return(false);
+ c++;
}
- else
+
+ /* too long a name - note funky pointer arithmetic here. */
+ if ((c - chname) > CHANMAX)
{
- fclose (input);
- return(true);
+ return false;
}
-}
-char* CleanFilename(char* name)
-{
- char* p = name + strlen(name);
- while ((p != name) && (*p != '/')) p--;
- return (p != name ? ++p : p);
+ return true;
}
-bool DirValid(char* dirandfile)
+/* true for valid nickname, false else */
+bool IsNickHandler::Call(const char* n)
{
- char work[MAXBUF];
- char buffer[MAXBUF];
- char otherdir[MAXBUF];
- int p;
-
- strlcpy(work, dirandfile, MAXBUF);
- p = strlen(work);
-
- // we just want the dir
- while (*work)
+ if (!n || !*n)
+ return false;
+
+ int p = 0;
+ for (char* i = (char*)n; *i; i++, p++)
{
- if (work[p] == '/')
+ if ((*i >= 'A') && (*i <= '}'))
{
- work[p] = '\0';
- break;
+ /* "A"-"}" can occur anywhere in a nickname */
+ continue;
}
- work[p--] = '\0';
- }
-
- // Get the current working directory
- if (getcwd(buffer, MAXBUF ) == NULL )
- return false;
-
- chdir(work);
-
- if (getcwd(otherdir, MAXBUF ) == NULL )
- return false;
-
- chdir(buffer);
-
- size_t t = strlen(work);
-
- if (strlen(otherdir) >= t)
- {
- otherdir[t] = '\0';
-
- if (!strcmp(otherdir,work))
+ if ((((*i >= '0') && (*i <= '9')) || (*i == '-')) && (i > n))
{
- return true;
+ /* "0"-"9", "-" can occur anywhere BUT the first char of a nickname */
+ continue;
}
+ /* invalid character! abort */
return false;
}
- else
- {
- return false;
- }
+
+ /* too long? or not -- pointer arithmetic rocks */
+ return (p < NICKMAX - 1);
}
-std::string GetFullProgDir(char** argv, int argc)
+/* return true for good ident, false else */
+bool IsIdentHandler::Call(const char* n)
{
- char work[MAXBUF];
- char buffer[MAXBUF];
- char otherdir[MAXBUF];
- int p;
-
- strlcpy(work,argv[0],MAXBUF);
- p = strlen(work);
+ if (!n || !*n)
+ return false;
- // we just want the dir
- while (*work)
+ for (char* i = (char*)n; *i; i++)
{
- if (work[p] == '/')
+ if ((*i >= 'A') && (*i <= '}'))
{
- work[p] = '\0';
- break;
+ continue;
}
- work[p--] = '\0';
- }
-
- // Get the current working directory
- if (getcwd(buffer, MAXBUF) == NULL)
- return "";
-
- chdir(work);
-
- if (getcwd(otherdir, MAXBUF) == NULL)
- return "";
-
- chdir(buffer);
- return otherdir;
-}
-
-int InsertMode(std::string &output, const char* mode, unsigned short section)
-{
- unsigned short currsection = 1;
- unsigned int pos = output.find("CHANMODES=", 0) + 10; // +10 for the length of "CHANMODES="
-
- if(section > 4 || section == 0)
- {
- log(DEBUG, "InsertMode: CHANMODES doesn't have a section %dh :/", section);
- return 0;
- }
-
- for(; pos < output.size(); pos++)
- {
- if(section == currsection)
- break;
-
- if(output[pos] == ',')
- currsection++;
- }
-
- output.insert(pos, mode);
- return 1;
-}
-
-bool IsValidChannelName(const char *chname)
-{
- char *c;
-
- /* 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)
+ if (((*i >= '0') && (*i <= '9')) || (*i == '-') || (*i == '.'))
{
- case ' ':
- case ',':
- case 7:
- return false;
+ continue;
}
- c++;
- }
-
- /* too long a name - note funky pointer arithmetic here. */
- if ((c - chname) > CHANMAX)
- {
- return false;
+ return false;
}
return true;
}
-void OpenLog(char** argv, int argc)
+/* open the proper logfile */
+bool InspIRCd::OpenLog(char** argv, int argc)
{
- if (!*LOG_FILE)
+ Config->MyDir = Config->GetFullProgDir();
+
+ if (!*this->LogFileName)
{
- if (ServerInstance->Config->logpath == "")
+ if (Config->logpath.empty())
{
- ServerInstance->Config->logpath = GetFullProgDir(argv,argc) + "/ircd.log";
+ Config->logpath = Config->MyDir + "/ircd.log";
}
+
+ Config->log_file = fopen(Config->logpath.c_str(),"a+");
}
else
{
- ServerInstance->Config->log_file = fopen(LOG_FILE,"a+");
-
- if (!ServerInstance->Config->log_file)
- {
- printf("ERROR: Could not write to logfile %s, bailing!\n\n",ServerInstance->Config->logpath.c_str());
- Exit(ERROR);
- }
-
- return;
+ Config->log_file = fopen(this->LogFileName,"a+");
}
- ServerInstance->Config->log_file = fopen(ServerInstance->Config->logpath.c_str(),"a+");
-
- if (!ServerInstance->Config->log_file)
+ if (!Config->log_file)
{
- printf("ERROR: Could not write to logfile %s, bailing!\n\n",ServerInstance->Config->logpath.c_str());
- Exit(ERROR);
+ this->Logger = NULL;
+ return false;
}
+
+ this->Logger = new FileLogger(this, Config->log_file);
+ return true;
}
-void CheckRoot()
+void InspIRCd::CheckRoot()
{
if (geteuid() == 0)
{
printf("WARNING!!! You are running an irc server as ROOT!!! DO NOT DO THIS!!!\n\n");
- log(DEFAULT,"InspIRCd: startup: not starting with UID 0!");
- Exit(ERROR);
+ this->Log(DEFAULT,"Cant start as root");
+ Exit(EXIT_STATUS_ROOT);
}
}
-void CheckDie()
+void InspIRCd::CheckDie()
{
- if (*ServerInstance->Config->DieValue)
+ if (*Config->DieValue)
{
- printf("WARNING: %s\n\n",ServerInstance->Config->DieValue);
- log(DEFAULT,"Uh-Oh, somebody didn't read their config file: '%s'",ServerInstance->Config->DieValue);
- Exit(ERROR);
+ printf("WARNING: %s\n\n",Config->DieValue);
+ this->Log(DEFAULT,"Died because of <die> tag: %s",Config->DieValue);
+ Exit(EXIT_STATUS_DIETAG);
}
}
-/* We must load the modules AFTER initializing the socket engine, now */
-void LoadAllModules(InspIRCd* ServerInstance)
+void InspIRCd::SendWhoisLine(userrec* user, userrec* dest, int numeric, const std::string &text)
{
- char configToken[MAXBUF];
- ServerInstance->Config->module_names.clear();
- MODCOUNT = -1;
+ std::string copy_text = text;
- for (int count = 0; count < ServerInstance->Config->ConfValueEnum(ServerInstance->Config->config_data, "module"); count++)
- {
- ServerInstance->Config->ConfValue(ServerInstance->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);
-
- if (!ServerInstance->LoadModule(configToken))
- {
- log(DEFAULT,"Exiting due to a module loader error.");
- printf("\nThere was an error loading a module: %s\n\n",ServerInstance->ModuleError());
- Exit(0);
- }
- }
-
- log(DEFAULT,"Total loaded modules: %lu",(unsigned long)MODCOUNT+1);
+ 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));
}