#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
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
}
}
+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);
{
// the neatest way to construct the initial 005 numeric, considering the number of configure constants to go in it...
std::stringstream v;
- v << "WALLCHOPS MODES=13 CHANTYPES=# PREFIX=(ohv)@%+ MAP SAFELIST MAXCHANNELS=" << MAXCHANS << " MAXBANS=60 NICKLEN=" << NICKMAX;
- v << " CASEMAPPING=rfc1459 STATUSMSG=@+ CHARSET=ascii TOPICLEN=" << MAXTOPIC << " KICKLEN=" << MAXKICK << " MAXTARGETS=20 AWAYLEN=";
- v << MAXAWAY << " CHANMODES=ohvb,k,l,psmnti NETWORK=" << Config->Network;
+ v << "WALLCHOPS MODES=" << MAXMODES << " CHANTYPES=# PREFIX=(ohv)@%+ MAP SAFELIST MAXCHANNELS=" << MAXCHANS << " MAXBANS=60 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 WALLVOICES WALLCHOPS NETWORK=" << Config->Network;
Config->data005 = v.str();
FOREACH_MOD(I_On005Numeric,On005Numeric(Config->data005));
}
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];
}
}
- FOREACH_MOD(I_OnUnloadModule,OnUnloadModule(modules[j],Config->module_names[j]));
// found the module
log(DEBUG,"Deleting module...");
erase_module(j);
#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)
// 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_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++)
{
{
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;
}
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
/* Once a second, do the background processing */
if (TIME != OLDTIME)
+ {
+ if (TIME < OLDTIME)
+ WriteOpers("*** \002EH?!\002 -- Time is flowing BACKWARDS in this dimension! Clock drifted backwards %d secs.",abs(OLDTIME-TIME));
DoBackgroundUserStuff(TIME);
+ }
/* Call the socket engine to wait on the active
* file descriptors. The socket engine has everything's
{
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...
NonBlocking(incomingSockfd);
if (Config->GetIOHook(in_port))
{
- 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);
+ 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