-/* +------------------------------------+
- * | Inspire Internet Relay Chat Daemon |
- * +------------------------------------+
+/* ---------------------------------------------------------------------
+ *
+ * +------------------------------------+
+ * | Inspire Internet Relay Chat Daemon |
+ * +------------------------------------+
*
- * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- * E-mail:
- * <brain@chatspike.net>
- * <Craig@chatspike.net>
+ * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
+ * E-mail:
+ * <brain@chatspike.net>
+ * <Craig@chatspike.net>
*
- * Written by Craig Edwards, Craig McLure, and others.
- * This program is free but copyrighted software; see
- * the file COPYING for details.
+ * Written by Craig Edwards, Craig McLure, and others.
+ * This program is free but copyrighted software; you can redistribute
+ * it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2
+ * (two) ONLY.
*
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * ---------------------------------------------------------------------
*/
-/* Now with added unF! ;) */
-
#include <algorithm>
#include "inspircd_config.h"
#include "inspircd.h"
#include <fstream>
#include <vector>
#include <deque>
-#ifdef THREADED_DNS
-#include <pthread.h>
-#endif
-#ifdef HAS_EXECINFO
-#include <execinfo.h>
-#endif
#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 "commands.h"
#include "xline.h"
#include "inspstring.h"
-#include "dnsqueue.h"
#include "helperfuncs.h"
#include "hashcomp.h"
#include "socketengine.h"
+#include "inspircd_se_config.h"
#include "userprocess.h"
#include "socket.h"
#include "typedefs.h"
#include "command_parse.h"
-InspIRCd* ServerInstance;
-
-int WHOWAS_STALE = 48; // default WHOWAS Entries last 2 days before they go 'stale'
-int WHOWAS_MAX = 100; // default 100 people maximum in the WHOWAS list
+using irc::sockets::BindPorts;
+using irc::sockets::NonBlocking;
+using irc::sockets::insp_ntoa;
+using irc::sockets::insp_inaddr;
+using irc::sockets::insp_sockaddr;
-extern ModuleList modules;
-extern FactoryList factory;
+InspIRCd* ServerInstance = NULL;
-std::vector<InspSocket*> module_sockets;
-std::vector<userrec*> local_users;
-
-extern int MODCOUNT;
-extern char LOG_FILE[MAXBUF];
-int openSockfd[MAX_DESCRIPTORS];
-int yield_depth;
int iterations = 0;
insp_sockaddr client, server;
-
socklen_t length;
-extern InspSocket* socket_ref[MAX_DESCRIPTORS];
-
time_t TIME = time(NULL), OLDTIME = time(NULL);
-// This table references users by file descriptor.
-// its an array to make it VERY fast, as all lookups are referenced
-// by an integer, meaning there is no need for a scan/search operation.
-userrec* fd_ref_table[MAX_DESCRIPTORS];
-
Server* MyServer = new Server;
-ServerConfig *Config = new ServerConfig;
-
-user_hash clientlist;
-chan_hash chanlist;
-
-servernamelist servernames;
char lowermap[255];
-void AddServerName(const std::string &servername)
+void InspIRCd::AddServerName(const std::string &servername)
{
log(DEBUG,"Adding server name: %s",servername.c_str());
servernames.push_back(servername); /* Wasn't already there. */
}
-const char* FindServerNamePtr(const std::string &servername)
+const char* InspIRCd::FindServerNamePtr(const std::string &servername)
{
servernamelist::iterator iter = find(servernames.begin(), servernames.end(), servername);
return iter->c_str();
}
-bool FindServerName(const std::string &servername)
+bool InspIRCd::FindServerName(const std::string &servername)
{
return (find(servernames.begin(), servernames.end(), servername) != servernames.end());
}
-void Exit(int status)
+void InspIRCd::Exit(int status)
{
- if (Config->log_file)
- fclose(Config->log_file);
- send_error("Server shutdown.");
+ if (ServerInstance->Config->log_file)
+ fclose(ServerInstance->Config->log_file);
+ ServerInstance->SendError("Server shutdown.");
exit (status);
}
-void Start()
+void InspIRCd::Start()
{
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\033[0m\n");
+ printf("Developers:\t\t\033[1;32mBrain, FrostyCoolSlug, w00t, Om, Special\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");
}
-void Killed(int status)
-{
- if (Config->log_file)
- fclose(Config->log_file);
- send_error("Server terminated.");
- exit(status);
-}
-
-void Rehash(int status)
+void InspIRCd::Rehash(int status)
{
- WriteOpers("Rehashing config file %s due to SIGHUP",CleanFilename(CONFIG_FILE));
- fclose(Config->log_file);
- OpenLog(NULL,0);
- Config->Read(false,NULL);
+ ServerInstance->WriteOpers("Rehashing config file %s due to SIGHUP",ServerConfig::CleanFilename(CONFIG_FILE));
+ fclose(ServerInstance->Config->log_file);
+ ServerInstance->OpenLog(NULL,0);
+ ServerInstance->Config->Read(false,NULL);
FOREACH_MOD(I_OnRehash,OnRehash(""));
}
-void SetSignals()
+void InspIRCd::SetSignals(bool SEGVHandler)
{
signal (SIGALRM, SIG_IGN);
- signal (SIGHUP, Rehash);
+ signal (SIGHUP, InspIRCd::Rehash);
signal (SIGPIPE, SIG_IGN);
- signal (SIGTERM, Exit);
- signal (SIGSEGV, Error);
+ signal (SIGTERM, InspIRCd::Exit);
+ if (SEGVHandler)
+ signal (SIGSEGV, InspIRCd::Error);
}
-bool DaemonSeed()
+bool InspIRCd::DaemonSeed()
{
int childpid;
if ((childpid = fork ()) < 0)
return true;
}
-void WritePID(const std::string &filename)
+void InspIRCd::WritePID(const std::string &filename)
{
std::ofstream outfile(filename.c_str());
if (outfile.is_open())
lowermap[(unsigned)'\\'] = '|';
}
-InspIRCd::InspIRCd(int argc, char** argv)
+InspIRCd::InspIRCd(int argc, char** argv) : ModCount(-1)
{
- Start();
- module_sockets.clear();
+ bool SEGVHandler = false;
+ ServerInstance = this;
+
+ modules.resize(255);
+ factory.resize(255);
+
+ this->Config = new ServerConfig(this);
+ this->Start();
+ this->module_sockets.clear();
this->startup_time = time(NULL);
srand(time(NULL));
log(DEBUG,"*** InspIRCd starting up!");
- if (!FileExists(CONFIG_FILE))
+ if (!ServerConfig::FileExists(CONFIG_FILE))
{
printf("ERROR: Cannot open config file: %s\nExiting...\n",CONFIG_FILE);
log(DEFAULT,"main: no config");
printf("ERROR: Your config file is missing, this IRCd will self destruct in 10 seconds!\n");
Exit(ERROR);
}
- *LOG_FILE = 0;
+ *this->LogFileName = 0;
if (argc > 1) {
for (int i = 1; i < argc; i++)
{
{
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)
{
- strlcpy(LOG_FILE,argv[i+1],MAXBUF);
- printf("LOG: Setting logfile to %s\n",LOG_FILE);
+ strlcpy(LogFileName,argv[i+1],MAXBUF);
+ printf("LOG: Setting logfile to %s\n",LogFileName);
}
else
{
printf("ERROR: The -logfile parameter must be followed by a log file name and path.\n");
Exit(ERROR);
}
+ i++;
+ }
+ else
+ {
+ printf("Usage: %s [-nofork] [-nolog] [-debug] [-wait] [-nolimit] [-notraceback] [-logfile <filename>]\n",argv[0]);
+ Exit(ERROR);
}
}
}
OpenLog(argv, argc);
this->stats = new serverstats();
+ this->Parser = new CommandParser();
+ this->Timers = new TimerManager();
Config->ClearStack();
- Config->Read(true,NULL);
+ Config->Read(true, NULL);
CheckRoot();
this->ModeGrok = new ModeParser();
- this->Parser = new CommandParser();
- AddServerName(Config->ServerName);
+ this->AddServerName(Config->ServerName);
CheckDie();
+ InitializeDisabledCommands(Config->DisabledCommands, this);
stats->BoundPortCount = BindPorts(true);
for(int t = 0; t < 255; t++)
memset(&Config->implement_lists,0,sizeof(Config->implement_lists));
printf("\n");
- SetSignals();
+ this->SetSignals(SEGVHandler);
if (!Config->nofork)
{
- if (!DaemonSeed())
+ if (!this->DaemonSeed())
{
printf("ERROR: could not go into daemon mode. Shutting down.\n");
Exit(ERROR);
/* Because of limitations in kqueue on freebsd, we must fork BEFORE we
* initialize the socket engine.
*/
- SE = new SocketEngine();
+ SocketEngineFactory* SEF = new SocketEngineFactory();
+ SE = SEF->Create();
+ delete SEF;
/* We must load the modules AFTER initializing the socket engine, now */
std::string InspIRCd::GetVersionString()
{
char versiondata[MAXBUF];
-#ifdef THREADED_DNS
- char dnsengine[] = "multithread";
-#else
- char dnsengine[] = "singlethread";
-#endif
+ char dnsengine[] = "singlethread-object";
if (*Config->CustomVersion)
{
snprintf(versiondata,MAXBUF,"%s %s :%s",VERSION,Config->ServerName,Config->CustomVersion);
return MODERR;
}
-void InspIRCd::erase_factory(int j)
+void InspIRCd::EraseFactory(int j)
{
int v = 0;
for (std::vector<ircd_module*>::iterator t = factory.begin(); t != factory.end(); t++)
}
}
-void InspIRCd::erase_module(int j)
+void InspIRCd::EraseModule(int j)
{
int v1 = 0;
- for (std::vector<Module*>::iterator m = modules.begin(); m!= modules.end(); m++)
+ for (ModuleList::iterator m = modules.begin(); m!= modules.end(); m++)
{
if (v1 == j)
{
- delete *m;
+ DELETE(*m);
modules.erase(m);
modules.push_back(NULL);
break;
{
if (Config->module_names[v] == modulename)
{
- // found an instance, swap it with the item at MODCOUNT
+ // found an instance, swap it with the item at the end
v2 = v;
break;
}
void InspIRCd::MoveToLast(std::string modulename)
{
- MoveTo(modulename,MODCOUNT);
+ MoveTo(modulename,this->GetModuleCount());
}
void InspIRCd::BuildISupport()
return false;
}
/* Give the module a chance to tidy out all its metadata */
- for (chan_hash::iterator c = chanlist.begin(); c != chanlist.end(); c++)
+ for (chan_hash::iterator c = this->chanlist.begin(); c != this->chanlist.end(); c++)
{
modules[j]->OnCleanup(TYPE_CHANNEL,c->second);
}
- for (user_hash::iterator u = clientlist.begin(); u != clientlist.end(); u++)
+ for (user_hash::iterator u = this->clientlist.begin(); u != this->clientlist.end(); u++)
{
modules[j]->OnCleanup(TYPE_USER,u->second);
}
}
// found the module
- log(DEBUG,"Deleting module...");
- erase_module(j);
- log(DEBUG,"Erasing module entry...");
- erase_factory(j);
log(DEBUG,"Removing dependent commands...");
Parser->RemoveCommands(filename);
+ log(DEBUG,"Deleting module...");
+ this->EraseModule(j);
+ log(DEBUG,"Erasing module entry...");
+ this->EraseFactory(j);
log(DEFAULT,"Module %s unloaded",filename);
- MODCOUNT--;
+ this->ModCount--;
BuildISupport();
return true;
}
std::string filename_str = filename;
#ifndef STATIC_LINK
#ifndef IS_CYGWIN
- if (!DirValid(modfile))
+ if (!ServerConfig::DirValid(modfile))
{
log(DEFAULT,"Module %s is not within the modules directory.",modfile);
snprintf(MODERR,MAXBUF,"Module %s is not within the modules directory.",modfile);
#endif
log(DEBUG,"Loading module: %s",modfile);
#ifndef STATIC_LINK
- if (FileExists(modfile))
+ if (ServerConfig::FileExists(modfile))
{
#endif
for (unsigned int j = 0; j < Config->module_names.size(); j++)
return false;
}
}
- ircd_module* a = new ircd_module(modfile);
- factory[MODCOUNT+1] = a;
- if (factory[MODCOUNT+1]->LastError())
- {
- log(DEFAULT,"Unable to load %s: %s",modfile,factory[MODCOUNT+1]->LastError());
- snprintf(MODERR,MAXBUF,"Loader/Linker error: %s",factory[MODCOUNT+1]->LastError());
- return false;
- }
try
{
- if (factory[MODCOUNT+1]->factory)
+ ircd_module* a = new ircd_module(modfile);
+ factory[this->ModCount+1] = a;
+ if (factory[this->ModCount+1]->LastError())
+ {
+ log(DEFAULT,"Unable to load %s: %s",modfile,factory[this->ModCount+1]->LastError());
+ snprintf(MODERR,MAXBUF,"Loader/Linker error: %s",factory[this->ModCount+1]->LastError());
+ return false;
+ }
+ if ((long)factory[this->ModCount+1]->factory != -1)
{
- Module* m = factory[MODCOUNT+1]->factory->CreateModule(MyServer);
- modules[MODCOUNT+1] = m;
+ Module* m = factory[this->ModCount+1]->factory->CreateModule(MyServer);
+ modules[this->ModCount+1] = m;
/* save the module and the module's classfactory, if
* this isnt done, random crashes can occur :/ */
Config->module_names.push_back(filename);
- char* x = &Config->implement_lists[MODCOUNT+1][0];
+ char* x = &Config->implement_lists[this->ModCount+1][0];
for(int t = 0; t < 255; t++)
x[t] = 0;
- modules[MODCOUNT+1]->Implements(x);
+ modules[this->ModCount+1]->Implements(x);
for(int t = 0; t < 255; t++)
- Config->global_implementation[t] += Config->implement_lists[MODCOUNT+1][t];
+ Config->global_implementation[t] += Config->implement_lists[this->ModCount+1][t];
}
else
{
log(DEFAULT,"Unable to load %s",modfile);
- snprintf(MODERR,MAXBUF,"Factory function failed!");
+ snprintf(MODERR,MAXBUF,"Factory function failed: Probably missing init_module() entrypoint.");
return false;
}
}
return false;
}
#endif
- MODCOUNT++;
- FOREACH_MOD(I_OnLoadModule,OnLoadModule(modules[MODCOUNT],filename_str));
+ this->ModCount++;
+ FOREACH_MOD(I_OnLoadModule,OnLoadModule(modules[this->ModCount],filename_str));
// now work out which modules, if any, want to move to the back of the queue,
// and if they do, move them there.
std::vector<std::string> put_to_back;
insp_sockaddr sock_us; // our port number
socklen_t uslen; // length of our port number
- if (yield_depth > 100)
- return;
-
- yield_depth++;
-
/* time() seems to be a pretty expensive syscall, so avoid calling it too much.
* Once per loop iteration is pleanty.
*/
expire_lines();
if (process_module_sockets)
{
- /* Fix by brain - the addition of DoOneIteration means that this
- * can end up getting called recursively in the following pattern:
- *
- * m_spanningtree DoPingChecks
- * (server pings out and is squit)
- * (squit causes call to DoOneIteration)
- * DoOneIteration enters here
- * calls DoBackground timer
- * enters m_spanningtree DoPingChecks... see step 1.
- *
- * This should do the job and fix the bug.
- */
FOREACH_MOD(I_OnBackgroundTimer,OnBackgroundTimer(TIME));
}
- TickMissedTimers(TIME);
+ Timers->TickMissedTimers(TIME);
expire_run = true;
- yield_depth--;
return;
}
else if ((TIME % 5) == 1)
if (iterations++ == 15)
{
iterations = 0;
- DoBackgroundUserStuff(TIME);
+ this->DoBackgroundUserStuff(TIME);
}
/* Once a second, do the background processing */
WriteOpers("*** \002EH?!\002 -- Time is flowing BACKWARDS in this dimension! Clock drifted backwards %d secs.",abs(OLDTIME-TIME));
if ((TIME % 3600) == 0)
{
- MaintainWhoWas(TIME);
+ irc::whowas::MaintainWhoWas(TIME);
}
}
* hit at all.
*/
if (process_module_sockets)
- DoSocketTimeouts(TIME);
+ this->DoSocketTimeouts(TIME);
- TickTimers(TIME);
+ Timers->TickTimers(TIME);
/* Call the socket engine to wait on the active
* file descriptors. The socket engine has everything's
* servers... so its nice and easy, just one call.
*/
if (!(numberactive = SE->Wait(activefds)))
- {
- yield_depth--;
return;
- }
/**
* Now process each of the fd's. For users, we have a fast
case X_ESTAB_CLIENT:
log(DEBUG,"Type: X_ESTAB_CLIENT: fd=%d",activefds[activefd]);
- cu = fd_ref_table[activefds[activefd]];
+ cu = this->fd_ref_table[activefds[activefd]];
if (cu)
- ProcessUser(cu);
+ this->ProcessUser(cu);
break;
* Modules are encouraged to inherit their sockets from
* InspSocket so we can process them neatly like this.
*/
- s = socket_ref[activefds[activefd]];
+ s = this->socket_ref[activefds[activefd]];
if ((s) && (!s->Poll()))
{
- log(DEBUG,"inspircd.cpp: Socket poll returned false, close and bail");
+ log(DEBUG,"Socket poll returned false, close and bail");
SE->DelFd(s->GetFd());
- socket_ref[activefds[activefd]] = NULL;
+ this->socket_ref[activefds[activefd]] = NULL;
for (std::vector<InspSocket*>::iterator a = module_sockets.begin(); a < module_sockets.end(); a++)
{
- s_del = (InspSocket*)*a;
+ s_del = *a;
if ((s_del) && (s_del->GetFd() == activefds[activefd]))
{
module_sockets.erase(a);
}
}
s->Close();
- delete s;
+ DELETE(s);
}
else if (!s)
{
break;
case X_ESTAB_DNS:
- /* When we are using single-threaded dns,
- * the sockets for dns end up in our mainloop.
- * When we are using multi-threaded dns,
- * each thread has its own basic poll() loop
- * within it, making them 'fire and forget'
- * and independent of the mainloop.
+ /* Handles instances of the Resolver class,
+ * a simple class extended by modules and the core for
+ * nonblocking resolving of addresses.
*/
-#ifndef THREADED_DNS
- log(DEBUG,"Type: X_ESTAB_DNS: fd=%d",activefds[activefd]);
- dns_poll(activefds[activefd]);
-#endif
+ this->Res->MarshallReads(activefds[activefd]);
break;
case X_LISTEN:
- log(DEBUG,"Type: X_LISTEN_MODULE: fd=%d",activefds[activefd]);
+ log(DEBUG,"Type: X_LISTEN: fd=%d",activefds[activefd]);
/* It's a listener */
uslen = sizeof(sock_us);
if ((incomingSockfd > -1) && (!getsockname(incomingSockfd,(sockaddr*)&sock_us,&uslen)))
{
+#ifdef IPV6
+ in_port = ntohs(sock_us.sin6_port);
+#else
in_port = ntohs(sock_us.sin_port);
+#endif
log(DEBUG,"Accepted socket %d",incomingSockfd);
/* Years and years ago, we used to resolve here
* using gethostbyaddr(). That is sucky and we
{
try
{
- Config->GetIOHook(in_port)->OnRawSocketAccept(incomingSockfd, (char*)inet_ntoa(client.sin_addr), in_port);
+#ifdef IPV6
+ Config->GetIOHook(in_port)->OnRawSocketAccept(incomingSockfd, insp_ntoa(client.sin6_addr), in_port);
+#else
+ Config->GetIOHook(in_port)->OnRawSocketAccept(incomingSockfd, insp_ntoa(client.sin_addr), in_port);
+#endif
}
catch (ModuleException& modexcept)
{
}
}
stats->statsAccept++;
- AddClient(incomingSockfd, in_port, false, client.sin_addr);
- log(DEBUG,"Adding client on port %lu fd=%lu",(unsigned long)in_port,(unsigned long)incomingSockfd);
+#ifdef IPV6
+ log(DEBUG,"Add ipv6 client");
+ userrec::AddClient(this, incomingSockfd, in_port, false, client.sin6_addr);
+#else
+ log(DEBUG,"Add ipv4 client");
+ userrec::AddClient(this, incomingSockfd, in_port, false, client.sin_addr);
+#endif
+ log(DEBUG,"Adding client on port %d fd=%d",in_port,incomingSockfd);
}
else
{
- log(DEBUG,"Accept failed on fd %lu: %s",(unsigned long)incomingSockfd,strerror(errno));
+ log(DEBUG,"Accept failed on fd %d: %s",incomingSockfd,strerror(errno));
shutdown(incomingSockfd,2);
close(incomingSockfd);
stats->statsRefused++;
break;
}
}
- yield_depth--;
+}
+
+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;
+}
+
+
+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()
{
- /* Until THIS point, ServerInstance == NULL */
-
- LoadAllModules(this);
+ this->Res = new DNS(this);
+
+ log(DEBUG,"RES: %08x",this->Res);
+
+ this->LoadAllModules();
/* Just in case no modules were loaded - fix for bug #101 */
this->BuildISupport();
- printf("\nInspIRCd is now running!\n");
-
+ if (!stats->BoundPortCount)
+ {
+ printf("\nI couldn't bind any ports! Are you sure you didn't start InspIRCd twice?\n");
+ Exit(ERROR);
+ }
+
+ /* Add the listening sockets used for client inbound connections
+ * to the socket engine
+ */
+ log(DEBUG,"%d listeners",stats->BoundPortCount);
+ for (unsigned long count = 0; count < stats->BoundPortCount; count++)
+ {
+ log(DEBUG,"Add listener: %d",Config->openSockfd[count]);
+ if (!SE->AddFd(Config->openSockfd[count],true,X_LISTEN))
+ {
+ printf("\nEH? Could not add listener to socketengine. You screwed up, aborting.\n");
+ Exit(ERROR);
+ }
+ }
+
if (!Config->nofork)
{
fclose(stdout);
fclose(stdin);
}
- /* Add the listening sockets used for client inbound connections
- * to the socket engine
- */
- for (int count = 0; count < stats->BoundPortCount; count++)
- SE->AddFd(openSockfd[count],true,X_LISTEN);
+ printf("\nInspIRCd is now running!\n");
- WritePID(Config->PID);
+ this->WritePID(Config->PID);
/* main loop, this never returns */
expire_run = false;
- yield_depth = 0;
iterations = 0;
while (true)
int main(int argc, char** argv)
{
+ /* This is a MatchCIDR() test suite -
+ printf("Should be 0: %d\n",MatchCIDR("127.0.0.1","1.2.3.4/8"));
+ printf("Should be 1: %d\n",MatchCIDR("127.0.0.1","127.0.0.0/8"));
+ printf("Should be 1: %d\n",MatchCIDR("127.0.0.1","127.0.0.0/18"));
+ printf("Should be 0: %d\n",MatchCIDR("3ffe::0","2fc9::0/16"));
+ printf("Should be 1: %d\n",MatchCIDR("3ffe:1:3::0", "3ffe:1::0/32"));
+ exit(0); */
+
try
{
- ServerInstance = new InspIRCd(argc, argv);
- ServerInstance->Run();
- delete ServerInstance;
+ try
+ {
+ ServerInstance = new InspIRCd(argc, argv);
+ ServerInstance->Run();
+ DELETE(ServerInstance);
+ }
+ catch (std::bad_alloc&)
+ {
+ log(SPARSE,"You are out of memory! (got exception std::bad_alloc!)");
+ ServerInstance->SendError("**** OUT OF MEMORY **** We're gonna need a bigger boat!");
+ }
}
- catch (std::bad_alloc)
+ catch (...)
{
- log(DEFAULT,"You are out of memory! (got exception std::bad_alloc!)");
- send_error("**** OUT OF MEMORY **** We're gonna need a bigger boat!");
- printf("Out of memory! (got exception std::bad_alloc!");
+ log(SPARSE,"Uncaught exception, aborting.");
+ ServerInstance->SendError("Server terminating due to uncaught exception.");
}
return 0;
}
+
+/* this returns true 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 InspIRCd::AllModulesReportReady(userrec* user)
+{
+ if (!Config->global_implementation[I_OnCheckReady])
+ return true;
+
+ for (int i = 0; i <= this->GetModuleCount(); i++)
+ {
+ if (Config->implement_lists[i][I_OnCheckReady])
+ {
+ int res = modules[i]->OnCheckReady(user);
+ if (!res)
+ return false;
+ }
+ }
+ return true;
+}
+
+int InspIRCd::GetModuleCount()
+{
+ return this->ModCount;
+}
+
projects / user / henk / code / inspircd.git / blobdiff