* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * Inspire is copyright (C) 2002-2005 ChatSpike-Dev.
+ * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
* E-mail:
* <brain@chatspike.net>
* <Craig@chatspike.net>
#include "inspircd_config.h"
#include "inspircd.h"
#include "inspircd_io.h"
-#include <unistd.h>
#include <fcntl.h>
#include <sys/errno.h>
#include <sys/ioctl.h>
-#include <sys/utsname.h>
#include <time.h>
#include <string>
#ifdef GCC3
sockaddr_in client,server;
socklen_t length;
-extern InspSocket* socket_ref[65535];
+extern InspSocket* socket_ref[MAX_DESCRIPTORS];
time_t TIME = time(NULL), OLDTIME = time(NULL);
-SocketEngine* SE = 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[65536];
+userrec* fd_ref_table[MAX_DESCRIPTORS];
Server* MyServer = new Server;
ServerConfig *Config = new ServerConfig;
return FindServerNamePtr(servername);
}
+bool FindServerName(std::string servername)
+{
+ for (servernamelist::iterator a = servernames.begin(); a < servernames.end(); a++)
+ {
+ if (*a == servername)
+ return true;
+ }
+ return false;
+}
+
std::string InspIRCd::GetRevision()
{
/* w00t got me to replace a bunch of strtok_r
* into the same variable twice, the first word
* is discarded, and the second one returned.
*/
+
+ /* XXX - this revision ID is NOT bumping automatically -- w00t */
std::stringstream Revision("$Revision$");
std::string single;
Revision >> single >> single;
for(int t = 0; t < 255; t++)
Config->global_implementation[t] = 0;
+ memset(&Config->implement_lists,0,sizeof(Config->implement_lists));
+
printf("\n");
+ SetSignals();
if (!Config->nofork)
{
if (DaemonSeed() == ERROR)
#else
char dnsengine[] = "singlethread";
#endif
- snprintf(versiondata,MAXBUF,"%s Rev. %s %s :%s [FLAGS=%lu,%s,%s]",VERSION,GetRevision().c_str(),Config->ServerName,SYSTEM,(unsigned long)OPTIMISATION,SE->GetName().c_str(),dnsengine);
+ if (*Config->CustomVersion)
+ {
+ snprintf(versiondata,MAXBUF,"%s Rev. %s %s :%s",VERSION,GetRevision().c_str(),Config->ServerName,Config->CustomVersion);
+ }
+ else
+ {
+ snprintf(versiondata,MAXBUF,"%s Rev. %s %s :%s [FLAGS=%lu,%s,%s]",VERSION,GetRevision().c_str(),Config->ServerName,SYSTEM,(unsigned long)OPTIMISATION,SE->GetName().c_str(),dnsengine);
+ }
return versiondata;
}
}
+void InspIRCd::MoveTo(std::string modulename,int slot)
+{
+ unsigned int v2 = 256;
+ log(DEBUG,"Moving %s to slot %d",modulename.c_str(),slot);
+ for (unsigned int v = 0; v < Config->module_names.size(); v++)
+ {
+ if (Config->module_names[v] == modulename)
+ {
+ // found an instance, swap it with the item at MODCOUNT
+ v2 = v;
+ break;
+ }
+ }
+ if (v2 == (unsigned int)slot)
+ {
+ log(DEBUG,"Item %s already in slot %d!",modulename.c_str(),slot);
+ }
+ else if (v2 < 256)
+ {
+ // Swap the module names over
+ Config->module_names[v2] = Config->module_names[slot];
+ Config->module_names[slot] = modulename;
+ // now swap the module factories
+ ircd_module* temp = factory[v2];
+ factory[v2] = factory[slot];
+ factory[slot] = temp;
+ // now swap the module objects
+ Module* temp_module = modules[v2];
+ modules[v2] = modules[slot];
+ modules[slot] = temp_module;
+ // now swap the implement lists (we dont
+ // need to swap the global or recount it)
+ for (int n = 0; n < 255; n++)
+ {
+ char x = Config->implement_lists[v2][n];
+ Config->implement_lists[v2][n] = Config->implement_lists[slot][n];
+ Config->implement_lists[slot][n] = x;
+ }
+ log(DEBUG,"Moved %s to slot successfully",modulename.c_str());
+ }
+ else
+ {
+ log(DEBUG,"Move of %s to slot failed!",modulename.c_str());
+ }
+}
+
+void InspIRCd::MoveAfter(std::string modulename, std::string after)
+{
+ log(DEBUG,"Move %s after %s...",modulename.c_str(),after.c_str());
+ for (unsigned int v = 0; v < Config->module_names.size(); v++)
+ {
+ if (Config->module_names[v] == after)
+ {
+ MoveTo(modulename, v);
+ return;
+ }
+ }
+}
+
+void InspIRCd::MoveBefore(std::string modulename, std::string before)
+{
+ log(DEBUG,"Move %s before %s...",modulename.c_str(),before.c_str());
+ for (unsigned int v = 0; v < Config->module_names.size(); v++)
+ {
+ if (Config->module_names[v] == before)
+ {
+ if (v > 0)
+ {
+ MoveTo(modulename, v-1);
+ }
+ else
+ {
+ MoveTo(modulename, v);
+ }
+ return;
+ }
+ }
+}
+
+void InspIRCd::MoveToFirst(std::string modulename)
+{
+ MoveTo(modulename,0);
+}
+
+void InspIRCd::MoveToLast(std::string modulename)
+{
+ MoveTo(modulename,MODCOUNT);
+}
+
+void InspIRCd::BuildISupport()
+{
+ // the neatest way to construct the initial 005 numeric, considering the number of configure constants to go in it...
+ std::stringstream v;
+ v << "WALLCHOPS WALLVOICES MODES=" << MAXMODES << " CHANTYPES=# PREFIX=(ohv)@%+ MAP MAXCHANNELS=" << MAXCHANS << " MAXBANS=60 VBANLIST NICKLEN=" << NICKMAX-1;
+ v << " CASEMAPPING=rfc1459 STATUSMSG=@%+ CHARSET=ascii TOPICLEN=" << MAXTOPIC << " KICKLEN=" << MAXKICK << " MAXTARGETS=" << Config->MaxTargets << " AWAYLEN=";
+ v << MAXAWAY << " CHANMODES=b,k,l,psmnti FNC NETWORK=" << Config->Network << " MAXPARA=32";
+ Config->data005 = v.str();
+ FOREACH_MOD(I_On005Numeric,On005Numeric(Config->data005));
+}
+
bool InspIRCd::UnloadModule(const char* filename)
{
std::string filename_str = filename;
modules[j]->OnCleanup(TYPE_USER,u->second);
}
+ FOREACH_MOD(I_OnUnloadModule,OnUnloadModule(modules[j],Config->module_names[j]));
+
for(int t = 0; t < 255; t++)
+ {
Config->global_implementation[t] -= Config->implement_lists[j][t];
+ }
+
+ /* We have to renumber implement_lists after unload because the module numbers change!
+ */
+ for(int j2 = j; j2 < 254; j2++)
+ {
+ for(int t = 0; t < 255; t++)
+ {
+ Config->implement_lists[j2][t] = Config->implement_lists[j2+1][t];
+ }
+ }
- FOREACH_MOD(I_OnUnloadModule,OnUnloadModule(modules[j],Config->module_names[j]));
// found the module
log(DEBUG,"Deleting module...");
erase_module(j);
Parser->RemoveCommands(filename);
log(DEFAULT,"Module %s unloaded",filename);
MODCOUNT--;
+ BuildISupport();
return true;
}
}
{
char modfile[MAXBUF];
#ifdef STATIC_LINK
- snprintf(modfile,MAXBUF,"%s",filename);
+ 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 (!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);
return false;
}
+#endif
#endif
log(DEBUG,"Loading module: %s",modfile);
#ifndef STATIC_LINK
{
log(DEFAULT,"Unable to load %s: %s",modfile,factory[MODCOUNT+1]->LastError());
snprintf(MODERR,MAXBUF,"Loader/Linker error: %s",factory[MODCOUNT+1]->LastError());
- MODCOUNT--;
return false;
}
- if (factory[MODCOUNT+1]->factory)
- {
- Module* m = factory[MODCOUNT+1]->factory->CreateModule(MyServer);
- modules[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];
- for(int t = 0; t < 255; t++)
- x[t] = 0;
-
- modules[MODCOUNT+1]->Implements(x);
-
- for(int t = 0; t < 255; t++)
- Config->global_implementation[t] += Config->implement_lists[MODCOUNT+1][t];
- }
- else
- {
- log(DEFAULT,"Unable to load %s",modfile);
- snprintf(MODERR,MAXBUF,"Factory function failed!");
+ try
+ {
+ if (factory[MODCOUNT+1]->factory)
+ {
+ Module* m = factory[MODCOUNT+1]->factory->CreateModule(MyServer);
+ modules[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];
+ for(int t = 0; t < 255; t++)
+ x[t] = 0;
+
+ modules[MODCOUNT+1]->Implements(x);
+
+ for(int t = 0; t < 255; t++)
+ {
+ Config->global_implementation[t] += Config->implement_lists[MODCOUNT+1][t];
+ if (Config->implement_lists[MODCOUNT+1][t])
+ {
+ log(DEBUG,"Add global implementation: %d %d => %d",MODCOUNT+1,t,Config->global_implementation[t]);
+ }
+ }
+ }
+ else
+ {
+ log(DEFAULT,"Unable to load %s",modfile);
+ snprintf(MODERR,MAXBUF,"Factory function failed!");
+ return false;
+ }
+ }
+ catch (ModuleException& modexcept)
+ {
+ log(DEFAULT,"Unable to load %s: ",modfile,modexcept.GetReason());
+ snprintf(MODERR,MAXBUF,"Factory function threw an exception: %s",modexcept.GetReason());
return false;
- }
+ }
#ifndef STATIC_LINK
}
else
#endif
MODCOUNT++;
FOREACH_MOD(I_OnLoadModule,OnLoadModule(modules[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;
+ std::vector<std::string> put_to_front;
+ std::map<std::string,std::string> put_before;
+ std::map<std::string,std::string> put_after;
+ for (unsigned int j = 0; j < Config->module_names.size(); j++)
+ {
+ if (modules[j]->Prioritize() == PRIORITY_LAST)
+ {
+ put_to_back.push_back(Config->module_names[j]);
+ }
+ else if (modules[j]->Prioritize() == PRIORITY_FIRST)
+ {
+ put_to_front.push_back(Config->module_names[j]);
+ }
+ else if ((modules[j]->Prioritize() & 0xFF) == PRIORITY_BEFORE)
+ {
+ log(DEBUG,"Module %d wants PRIORITY_BEFORE",j);
+ put_before[Config->module_names[j]] = Config->module_names[modules[j]->Prioritize() >> 8];
+ log(DEBUG,"Before: %s",Config->module_names[modules[j]->Prioritize() >> 8].c_str());
+ }
+ else if ((modules[j]->Prioritize() & 0xFF) == PRIORITY_AFTER)
+ {
+ log(DEBUG,"Module %d wants PRIORITY_AFTER",j);
+ put_after[Config->module_names[j]] = Config->module_names[modules[j]->Prioritize() >> 8];
+ log(DEBUG,"After: %s",Config->module_names[modules[j]->Prioritize() >> 8].c_str());
+ }
+ }
+ for (unsigned int j = 0; j < put_to_back.size(); j++)
+ {
+ MoveToLast(put_to_back[j]);
+ }
+ for (unsigned int j = 0; j < put_to_front.size(); j++)
+ {
+ MoveToFirst(put_to_front[j]);
+ }
+ for (std::map<std::string,std::string>::iterator j = put_before.begin(); j != put_before.end(); j++)
+ {
+ MoveBefore(j->first,j->second);
+ }
+ for (std::map<std::string,std::string>::iterator j = put_after.begin(); j != put_after.end(); j++)
+ {
+ MoveAfter(j->first,j->second);
+ }
+ BuildISupport();
return true;
}
int InspIRCd::Run()
{
bool expire_run = false;
- std::vector<int> activefds;
+ int activefds[MAX_DESCRIPTORS];
int incomingSockfd;
int in_port;
userrec* cu = NULL;
InspSocket* s = NULL;
InspSocket* s_del = NULL;
- char* target;
unsigned int numberactive;
sockaddr_in sock_us; // our port number
socklen_t uslen; // length of our port number
* timing using this event, so we dont have to
* time this exactly).
*/
- if (((TIME % 8) == 0) && (!expire_run))
+ if (((TIME % 5) == 0) && (!expire_run))
{
expire_lines();
FOREACH_MOD(I_OnBackgroundTimer,OnBackgroundTimer(TIME));
+ TickMissedTimers(TIME);
expire_run = true;
continue;
}
- if ((TIME % 8) == 1)
+ else if ((TIME % 5) == 1)
+ {
expire_run = false;
+ }
/* Once a second, do the background processing */
if (TIME != OLDTIME)
- while (DoBackgroundUserStuff(TIME));
+ {
+ if (TIME < OLDTIME)
+ WriteOpers("*** \002EH?!\002 -- Time is flowing BACKWARDS in this dimension! Clock drifted backwards %d secs.",abs(OLDTIME-TIME));
+ DoBackgroundUserStuff(TIME);
+
+ /*
+ * Trigger all InspTimers that are pending
+ */
+ }
+
+ /* Process timeouts on module sockets each time around
+ * the loop. There shouldnt be many module sockets, at
+ * most, 20 or so, so this won't be much of a performance
+ * hit at all.
+ */
+ DoSocketTimeouts(TIME);
+
+ TickTimers(TIME);
/* Call the socket engine to wait on the active
* file descriptors. The socket engine has everything's
* descriptors in its list... dns, modules, users,
* servers... so its nice and easy, just one call.
*/
- SE->Wait(activefds);
+ if (!(numberactive = SE->Wait(activefds)))
+ continue;
/**
* Now process each of the fd's. For users, we have a fast
* listening ports or module sockets though, things could get
* ugly.
*/
- numberactive = activefds.size();
for (unsigned int activefd = 0; activefd < numberactive; activefd++)
{
int socket_type = SE->GetType(activefds[activefd]);
uslen = sizeof(sock_us);
length = sizeof(client);
incomingSockfd = accept (activefds[activefd],(struct sockaddr*)&client,&length);
- if (!getsockname(incomingSockfd,(sockaddr*)&sock_us,&uslen))
+
+ if ((incomingSockfd > -1) && (!getsockname(incomingSockfd,(sockaddr*)&sock_us,&uslen)))
{
in_port = ntohs(sock_us.sin_port);
log(DEBUG,"Accepted socket %d",incomingSockfd);
- target = (char*)inet_ntoa(client.sin_addr);
/* Years and years ago, we used to resolve here
* using gethostbyaddr(). That is sucky and we
* don't do that any more...
*/
- if (incomingSockfd >= 0)
+ NonBlocking(incomingSockfd);
+ if (Config->GetIOHook(in_port))
{
- NonBlocking(incomingSockfd);
- if (Config->GetIOHook(in_port))
+ try
{
- Config->GetIOHook(in_port)->OnRawSocketAccept(incomingSockfd, target, in_port);
+ Config->GetIOHook(in_port)->OnRawSocketAccept(incomingSockfd, (char*)inet_ntoa(client.sin_addr), in_port);
}
- stats->statsAccept++;
- AddClient(incomingSockfd, target, in_port, false, target);
- log(DEBUG,"Adding client on port %lu fd=%lu",(unsigned long)in_port,(unsigned long)incomingSockfd);
- }
- else
- {
- WriteOpers("*** WARNING: accept() failed on port %lu (%s)",(unsigned long)in_port,target);
- log(DEBUG,"accept failed: %lu",(unsigned long)in_port);
- stats->statsRefused++;
+ catch (ModuleException& modexcept)
+ {
+ log(DEBUG,"Module exception cought: %s",modexcept.GetReason()); \
+ }
}
+ 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);
}
else
{
- log(DEBUG,"Couldnt look up the port number for fd %lu (OS BROKEN?!)",incomingSockfd);
+ log(DEBUG,"Accept failed on fd %lu: %s",(unsigned long)incomingSockfd,strerror(errno));
shutdown(incomingSockfd,2);
close(incomingSockfd);
+ stats->statsRefused++;
}
break;
projects / user / henk / code / inspircd.git / blobdiff