* ---------------------------------------------------
*/
+#include "inspircd.h"
#include <stdarg.h>
#include "configreader.h"
#include "users.h"
#include "wildcard.h"
#include "mode.h"
#include "xline.h"
-#include "inspircd.h"
#include "exitcodes.h"
static char TIMESTR[26];
FOREACH_MOD_I(this,I_OnGetServerDescription,OnGetServerDescription(servername,description));
- if (description != "")
+ if (!description.empty())
{
return description;
}
int InspIRCd::ModeCount(const char mode)
{
- ModeHandler* mh = this->Modes->GetHandler(mode, MODETYPE_USER);
+ ModeHandler* mh = this->Modes->FindMode(mode, MODETYPE_USER);
if (mh)
return mh->GetCount();
int InspIRCd::OperCount()
{
- return ModeCount('o');
+ return this->all_opers.size();
}
int InspIRCd::UnregisteredUserCount()
{
- 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->unregistered_count;
}
long InspIRCd::ChannelCount()
long InspIRCd::LocalUserCount()
{
- 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;
+ /* Doesnt count unregistered clients */
+ return (local_users.size() - this->UnregisteredUserCount());
}
-
+
bool InspIRCd::IsChannel(const char *chname)
{
char *c;
return (p < NICKMAX - 1);
}
+
+bool InspIRCd::IsIdent(const char* n)
+{
+ if (!n || !*n)
+ return false;
+
+ for (char* i = (char*)n; *i; i++)
+ {
+ if ((*i >= 'A') && (*i <= '}'))
+ {
+ continue;
+ }
+
+ if (((*i >= '0') && (*i <= '9')) || (*i == '-') || (*i == '.'))
+ {
+ continue;
+ }
+
+ return false;
+ }
+
+ return true;
+}
+
void 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())
{
+#ifndef DARWIN
Config->logpath = Config->MyDir + "/ircd.log";
+#else
+ Config->logpath = "/var/log/ircd.log";
+#endif
}
Config->log_file = fopen(Config->logpath.c_str(),"a+");
void InspIRCd::CheckRoot()
{
+#ifndef DARWIN
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");
+#else
+ if (geteuid() != 16)
+ {
+ printf("WARNING!!! You are not running inspircd as the ircdaemon user!!! YOU CAN NOT DO THIS!!!\n\n");
+ this->Log(DEFAULT,"Must start as user ircdaemon");
+#endif
Exit(EXIT_STATUS_ROOT);
}
}
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);
+ Config->ConfValue(Config->config_data, "module", "name", count, configToken, MAXBUF);
+ printf_c("[\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 a module: %s", this->ModuleError());
- printf("\nThere was an error loading a module: %s\n\n",this->ModuleError());
+ this->Log(DEFAULT,"There was an error loading the module '%s': %s", configToken, this->ModuleError());
+ printf_c("\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");
+ printf_c("\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);
}