* ---------------------------------------------------
*/
+#include "inspircd.h"
#include <stdarg.h>
-#include "configreader.h"
-#include "users.h"
-#include "modules.h"
#include "wildcard.h"
-#include "mode.h"
#include "xline.h"
-#include "inspircd.h"
#include "exitcodes.h"
static char TIMESTR[26];
*/
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;
void InspIRCd::Log(int level, const std::string &text)
{
- if (!this->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 */
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 = this->all_opers.begin(); i != this->all_opers.end(); i++)
+ for (std::list<User*>::iterator i = this->all_opers.begin(); i != this->all_opers.end(); i++)
{
- userrec* a = *i;
- if (IS_LOCAL(a) && a->modes[UM_SERVERNOTICE])
+ User* a = *i;
+ if (IS_LOCAL(a) && a->IsModeSet('s'))
{
// send server notices to all with +s
a->WriteServ("NOTICE %s :%s",a->nick,text.c_str());
snprintf(formatbuffer,MAXBUF,"NOTICE $%s :%s",Config->ServerName,textbuffer);
- for (std::vector<userrec*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
+ for (std::vector<User*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
{
- userrec* t = *i;
+ User* t = *i;
t->WriteServ(std::string(formatbuffer));
}
}
snprintf(formatbuffer,MAXBUF,"PRIVMSG $%s :%s",Config->ServerName,textbuffer);
- for (std::vector<userrec*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
+ for (std::vector<User*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
{
- userrec* t = *i;
+ User* t = *i;
t->WriteServ(std::string(formatbuffer));
}
}
if (flags == WM_AND)
{
- for (std::vector<userrec*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
+ for (std::vector<User*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
{
- userrec* t = *i;
+ User* 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);
+ {
+ 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++)
+ for (std::vector<User*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
{
- userrec* t = *i;
+ User* 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);
+ {
+ t->WriteServ("NOTICE %s :%s", t->nick, textbuffer);
+ }
}
}
}
/* Find a user record by nickname and return a pointer to it */
-
-userrec* InspIRCd::FindNick(const std::string &nick)
+User* InspIRCd::FindNick(const std::string &nick)
{
+ if (!nick.empty() && isdigit(*nick.begin()))
+ return FindUUID(nick);
+
user_hash::iterator iter = clientlist->find(nick);
if (iter == clientlist->end())
return iter->second;
}
-userrec* InspIRCd::FindNick(const char* nick)
+User* InspIRCd::FindNick(const char* nick)
{
+ if (isdigit(*nick))
+ return FindUUID(nick);
+
user_hash::iterator iter = clientlist->find(nick);
if (iter == clientlist->end())
return iter->second;
}
-/* find a channel record by channel name and return a pointer to it */
+User* InspIRCd::FindNickOnly(const std::string &nick)
+{
+ user_hash::iterator iter = clientlist->find(nick);
+
+ if (iter == clientlist->end())
+ return NULL;
+
+ return iter->second;
+}
-chanrec* InspIRCd::FindChan(const char* chan)
+User* InspIRCd::FindNickOnly(const char* nick)
+{
+ user_hash::iterator iter = clientlist->find(nick);
+
+ if (iter == clientlist->end())
+ return NULL;
+
+ return iter->second;
+}
+
+User *InspIRCd::FindUUID(const std::string &uid)
+{
+ return FindUUID(uid.c_str());
+}
+
+User *InspIRCd::FindUUID(const char *uid)
+{
+ user_hash::iterator finduuid = uuidlist->find(uid);
+
+ if (finduuid == uuidlist->end())
+ return NULL;
+
+ return finduuid->second;
+}
+
+/* find a channel record by channel name and return a pointer to it */
+Channel* InspIRCd::FindChan(const char* chan)
{
chan_hash::iterator iter = chanlist->find(chan);
return iter->second;
}
-chanrec* InspIRCd::FindChan(const std::string &chan)
+Channel* InspIRCd::FindChan(const std::string &chan)
{
chan_hash::iterator iter = chanlist->find(chan);
return iter->second;
}
-/*
- * sends out an error notice to all connected clients (not to be used
- * lightly!)
- */
+/* 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++)
+ for (std::vector<User*>::const_iterator i = this->local_users.begin(); i != this->local_users.end(); i++)
{
if ((*i)->registered == REG_ALL)
{
}
}
-// this function counts all users connected, wether they are registered or NOT.
+/* this function counts all users connected, wether they are registered or NOT. */
int InspIRCd::UserCount()
{
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
+/* 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()
{
return clientlist->size() - this->UnregisteredUserCount();
}
+/* return how many users have a given mode e.g. 'a' */
int InspIRCd::ModeCount(const char mode)
{
ModeHandler* mh = this->Modes->FindMode(mode, MODETYPE_USER);
return 0;
}
+/* wrapper for readability */
int InspIRCd::InvisibleUserCount()
{
return ModeCount('i');
}
+/* return how many users are opered */
int InspIRCd::OperCount()
{
return this->all_opers.size();
}
+/* return how many users are unregistered */
int InspIRCd::UnregisteredUserCount()
{
return this->unregistered_count;
}
+/* return channel count */
long InspIRCd::ChannelCount()
{
return chanlist->size();
}
+/* return how many local registered users there are */
long InspIRCd::LocalUserCount()
{
/* Doesnt count unregistered clients */
return (local_users.size() - this->UnregisteredUserCount());
}
-
+
+/* true for valid channel name, false else */
bool InspIRCd::IsChannel(const char *chname)
{
char *c;
return true;
}
-bool InspIRCd::IsNick(const char* n)
+/* true for valid nickname, false else */
+bool IsNickHandler::Call(const char* n)
{
if (!n || !*n)
return false;
return (p < NICKMAX - 1);
}
-
-bool InspIRCd::IsIdent(const char* n)
+/* return true for good ident, false else */
+bool IsIdentHandler::Call(const char* n)
{
if (!n || !*n)
return false;
return true;
}
-void InspIRCd::OpenLog(char** argv, int argc)
+/* open the proper logfile */
+bool InspIRCd::OpenLog(char** argv, int argc)
{
- Config->MyDir = ServerConfig::GetFullProgDir(argv,argc);
+ Config->MyDir = Config->GetFullProgDir();
if (!*this->LogFileName)
{
- if (Config->logpath == "")
+ if (Config->logpath.empty())
{
Config->logpath = Config->MyDir + "/ircd.log";
}
if (!Config->log_file)
{
- printf("ERROR: Could not write to logfile %s: %s\n\n", Config->logpath.c_str(), strerror(errno));
- Exit(EXIT_STATUS_LOG);
+ this->Logger = NULL;
+ return false;
}
this->Logger = new FileLogger(this, Config->log_file);
+ return true;
}
void InspIRCd::CheckRoot()
}
}
-/* We must load the modules AFTER initializing the socket engine, now */
-void InspIRCd::LoadAllModules()
-{
- char configToken[MAXBUF];
- Config->module_names.clear();
- this->ModCount = -1;
-
- for (int count = 0; count < Config->ConfValueEnum(Config->config_data, "module"); count++)
- {
- Config->ConfValue(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 (!this->LoadModule(configToken))
- {
- this->Log(DEFAULT,"There was an error loading the module '%s': %s", configToken, this->ModuleError());
- printf("\n[\033[1;31m*\033[0m] There was an error loading the module '%s': %s\n\n", configToken, this->ModuleError());
- Exit(EXIT_STATUS_MODULE);
- }
- }
- printf("\nA total of \033[1;32m%d\033[0m module%s been loaded.\n", this->ModCount+1, this->ModCount+1 == 1 ? " has" : "s have");
- this->Log(DEFAULT,"Total loaded modules: %d", this->ModCount+1);
-}
-
-void InspIRCd::SendWhoisLine(userrec* user, userrec* dest, int numeric, const std::string &text)
+void InspIRCd::SendWhoisLine(User* user, User* dest, int numeric, const std::string &text)
{
std::string copy_text = text;
user->WriteServ("%d %s", numeric, copy_text.c_str());
}
-void InspIRCd::SendWhoisLine(userrec* user, userrec* dest, int numeric, const char* format, ...)
+void InspIRCd::SendWhoisLine(User* user, User* dest, int numeric, const char* format, ...)
{
char textbuffer[MAXBUF];
va_list argsPtr;
this->SendWhoisLine(user, dest, numeric, std::string(textbuffer));
}
-
projects / user / henk / code / inspircd.git / blobdiff