#include "inspircd.h"
#include "configreader.h"
#include <signal.h>
+#include <dirent.h>
#include <exception>
#include <fstream>
#include "modules.h"
{
printf("\033[1;32mInspire Internet Relay Chat Server, compiled %s at %s\n",__DATE__,__TIME__);
printf("(C) ChatSpike Development team.\033[0m\n\n");
- printf("Developers:\t\t\033[1;32mBrain, FrostyCoolSlug, w00t, Om, Special\033[0m\n");
+ printf("Developers:\t\t\033[1;32mBrain, FrostyCoolSlug, w00t, Om, Special, pippijn, jamie\033[0m\n");
printf("Others:\t\t\t\033[1;32mSee /INFO Output\033[0m\n");
printf("Name concept:\t\t\033[1;32mLord_Zathras\033[0m\n\n");
}
FOREACH_MOD_I(SI,I_OnRehash,OnRehash(""));
}
-void InspIRCd::SetSignals(bool SEGVHandler)
+void InspIRCd::SetSignals()
{
signal(SIGALRM, SIG_IGN);
signal(SIGHUP, InspIRCd::Rehash);
void InspIRCd::WritePID(const std::string &filename)
{
- std::ofstream outfile(filename.c_str());
+ std::string fname = (filename.empty() ? "inspircd.pid" : filename);
+ if (*(fname.begin()) != '/')
+ {
+ std::string::size_type pos;
+ std::string confpath = CONFIG_FILE;
+ if ((pos = confpath.find("/inspircd.conf")) != std::string::npos)
+ {
+ /* Leaves us with just the path */
+ fname = confpath.substr(0, pos) + std::string("/") + fname;
+ }
+ }
+ std::ofstream outfile(fname.c_str());
if (outfile.is_open())
{
outfile << getpid();
}
else
{
- printf("Failed to write PID-file '%s', exiting.\n",filename.c_str());
- this->Log(DEFAULT,"Failed to write PID-file '%s', exiting.",filename.c_str());
+ printf("Failed to write PID-file '%s', exiting.\n",fname.c_str());
+ this->Log(DEFAULT,"Failed to write PID-file '%s', exiting.",fname.c_str());
Exit(0);
}
}
InspIRCd::InspIRCd(int argc, char** argv)
: ModCount(-1), duration_m(60), duration_h(60*60), duration_d(60*60*24), duration_w(60*60*24*7), duration_y(60*60*24*365)
{
- bool SEGVHandler = false;
+ int found_ports = 0;
modules.resize(255);
factory.resize(255);
this->Config = new ServerConfig(this);
+ this->Config->opertypes.clear();
+ this->Config->operclass.clear();
this->SNO = new SnomaskManager(this);
this->Start();
this->TIME = this->OLDTIME = this->startup_time = time(NULL);
+ this->time_delta = 0;
+ this->next_call = this->TIME + 3;
srand(this->TIME);
this->Log(DEBUG,"*** InspIRCd starting up!");
if (!ServerConfig::FileExists(CONFIG_FILE))
{
sleep(6);
}
- else if (!strcmp(argv[i],"-nolimit"))
- {
- printf("WARNING: The `-nolimit' option is deprecated, and now on by default. This behaviour may change in the future.\n");
- }
- else if (!strcmp(argv[i],"-notraceback"))
- {
- SEGVHandler = false;
- }
else if (!strcmp(argv[i],"-logfile"))
{
if (argc > i+1)
}
else
{
- printf("Usage: %s [-nofork] [-nolog] [-debug] [-wait] [-nolimit] [-notraceback] [-logfile <filename>]\n",argv[0]);
+ printf("Usage: %s [-nofork] [-nolog] [-debug] [-wait] [-logfile <filename>]\n",argv[0]);
Exit(ERROR);
}
}
this->AddServerName(Config->ServerName);
CheckDie();
InitializeDisabledCommands(Config->DisabledCommands, this);
- stats->BoundPortCount = BindPorts(true);
+ stats->BoundPortCount = BindPorts(true, found_ports);
for(int t = 0; t < 255; t++)
Config->global_implementation[t] = 0;
memset(&Config->implement_lists,0,sizeof(Config->implement_lists));
printf("\n");
- this->SetSignals(SEGVHandler);
+ this->SetSignals();
if (!Config->nofork)
{
if (!this->DaemonSeed())
/* Just in case no modules were loaded - fix for bug #101 */
this->BuildISupport();
- if (!stats->BoundPortCount)
+ if ((stats->BoundPortCount == 0) && (found_ports > 0))
{
printf("\nERROR: I couldn't bind any ports! Are you sure you didn't start InspIRCd twice?\n");
Exit(ERROR);
}
+
+ if (stats->BoundPortCount != (unsigned int)found_ports)
+ {
+ printf("\nWARNING: Not all your client ports could be bound --\n starting anyway with %ld of %d client ports bound.\n", stats->BoundPortCount, found_ports);
+ }
/* Add the listening sockets used for client inbound connections
* to the socket engine
bool InspIRCd::LoadModule(const char* filename)
{
+ /* Do we have a glob pattern in the filename?
+ * The user wants to load multiple modules which
+ * match the pattern.
+ */
+ if (strchr(filename,'*') || (strchr(filename,'?')))
+ {
+ int n_match = 0;
+ DIR* library = opendir(Config->ModPath);
+ if (library)
+ {
+ /* Try and locate and load all modules matching the pattern */
+ dirent* entry = NULL;
+ while ((entry = readdir(library)))
+ {
+ if (this->MatchText(entry->d_name, filename))
+ {
+ if (!this->LoadModule(entry->d_name))
+ n_match++;
+ }
+ }
+ closedir(library);
+ }
+ /* Loadmodule will now return false if any one of the modules failed
+ * to load (but wont abort when it encounters a bad one) and when 1 or
+ * more modules were actually loaded.
+ */
+ return (n_match > 0);
+ }
+
char modfile[MAXBUF];
-#ifdef STATIC_LINK
- strlcpy(modfile,filename,MAXBUF);
-#else
snprintf(modfile,MAXBUF,"%s/%s",Config->ModPath,filename);
-#endif
std::string filename_str = filename;
-#ifndef STATIC_LINK
-#ifndef IS_CYGWIN
+
if (!ServerConfig::DirValid(modfile))
{
this->Log(DEFAULT,"Module %s is not within the modules directory.",modfile);
snprintf(MODERR,MAXBUF,"Module %s is not within the modules directory.",modfile);
return false;
}
-#endif
-#endif
this->Log(DEBUG,"Loading module: %s",modfile);
-#ifndef STATIC_LINK
+
if (ServerConfig::FileExists(modfile))
{
-#endif
+
for (unsigned int j = 0; j < Config->module_names.size(); j++)
{
if (Config->module_names[j] == filename_str)
if ((long)factory[this->ModCount+1]->factory != -1)
{
Module* m = factory[this->ModCount+1]->factory->CreateModule(this);
+
+ Version v = m->GetVersion();
+
+ if (v.API != API_VERSION)
+ {
+ delete m;
+ delete a;
+ this->Log(DEFAULT,"Unable to load %s: Incorrect module API version: %d (our version: %d)",modfile,v.API,API_VERSION);
+ snprintf(MODERR,MAXBUF,"Loader/Linker error: Incorrect module API version: %d (our version: %d)",v.API,API_VERSION);
+ return false;
+ }
+ else
+ {
+ this->Log(DEFAULT,"New module introduced: %s (API version %d, Module version %d.%d.%d.%d)%s", filename, v.API, v.Major, v.Minor, v.Revision, v.Build, (!(v.Flags & VF_VENDOR) ? " [3rd Party]" : " [Vendor]"));
+ }
+
modules[this->ModCount+1] = m;
/* save the module and the module's classfactory, if
* this isnt done, random crashes can occur :/ */
snprintf(MODERR,MAXBUF,"Factory function threw an exception: %s",modexcept.GetReason());
return false;
}
-#ifndef STATIC_LINK
}
else
{
snprintf(MODERR,MAXBUF,"Module file could not be found");
return false;
}
-#endif
this->ModCount++;
FOREACH_MOD_I(this,I_OnLoadModule,OnLoadModule(modules[this->ModCount],filename_str));
// now work out which modules, if any, want to move to the back of the queue,
WriteOpers("*** \002EH?!\002 -- Time is flowing BACKWARDS in this dimension! Clock drifted backwards %d secs.",abs(OLDTIME-TIME));
if ((TIME % 3600) == 0)
{
- irc::whowas::MaintainWhoWas(TIME);
+ irc::whowas::MaintainWhoWas(this, TIME);
}
Timers->TickTimers(TIME);
this->DoBackgroundUserStuff(TIME);
}
-bool InspIRCd::IsNick(const char* n)
-{
- if (!n || !*n)
- return false;
-
- int p = 0;
- for (char* i = (char*)n; *i; i++, p++)
- {
- /* "A"-"}" can occur anywhere in a nickname */
- if ((*i >= 'A') && (*i <= '}'))
- {
- continue;
- }
- /* "0"-"9", "-" can occur anywhere BUT the first char of a nickname */
- if ((((*i >= '0') && (*i <= '9')) || (*i == '-')) && (i > n))
- {
- continue;
- }
- /* invalid character! abort */
- return false;
- }
- return (p < NICKMAX - 1);
-}
-
int InspIRCd::Run()
{
while (true)
return this->ModCount;
}
-time_t InspIRCd::Time()
+time_t InspIRCd::Time(bool delta)
{
+ if (delta)
+ return TIME + time_delta;
return TIME;
}
+int InspIRCd::SetTimeDelta(int delta)
+{
+ int old = time_delta;
+ time_delta += delta;
+ this->Log(DEBUG, "Time delta set to %d (was %d)", time_delta, old);
+ return old;
+}
+
bool FileLogger::Readable()
{
return false;
}
-void FileLogger::HandleEvent(EventType et)
+void FileLogger::HandleEvent(EventType et, int errornum)
{
this->WriteLogLine("");
ServerInstance->SE->DelFd(this);
projects / user / henk / code / inspircd.git / blobdiff