X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Finspircd.cpp;h=3e70d27f543eeaecca9f4ffe747ce4272ef1beed;hb=dcb36d77333ce02a792075b6dc51937445bc9852;hp=00e48317b3c3a323d0f8771d39e46b311e355077;hpb=786dfff31131d844e27e700b289c3070258de084;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index 00e48317b..3e70d27f5 100644
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -89,6 +89,8 @@ extern int MaxWhoResults;
 time_t nb_start = 0;
 int dns_timeout = 5;
 
+char DisabledCommands[MAXBUF];
+
 bool AllowHalfop = true;
 bool AllowProtect = true;
 bool AllowFounder = true;
@@ -99,8 +101,11 @@ extern std::vector<ircd_module*> factory;
 std::vector<int> fd_reap;
 
 extern int MODCOUNT;
-
+int openSockfd[MAXSOCKS];
 bool nofork = false;
+bool unlimitcore = false;
+
+time_t TIME = time(NULL);
 
 namespace nspace
 {
@@ -189,6 +194,7 @@ char MyExecutable[1024];
 int boundPortCount = 0;
 int portCount = 0, UDPportCount = 0, ports[MAXSOCKS];
 int defaultRoute = 0;
+char ModPath[MAXBUF];
 
 connection C;
 
@@ -315,7 +321,7 @@ void readfile(file_cache &F, const char* fname)
 void ReadConfig(bool bail, userrec* user)
 {
 	char dbg[MAXBUF],pauseval[MAXBUF],Value[MAXBUF],timeout[MAXBUF],NB[MAXBUF],flood[MAXBUF],MW[MAXBUF];
-	char AH[MAXBUF],AP[MAXBUF],AF[MAXBUF],DNT[MAXBUF];
+	char AH[MAXBUF],AP[MAXBUF],AF[MAXBUF],DNT[MAXBUF],pfreq[MAXBUF];
 	ConnectClass c;
 	std::stringstream errstr;
 	
@@ -325,7 +331,7 @@ void ReadConfig(bool bail, userrec* user)
 		if (bail)
 		{
 			printf("There were errors in your configuration:\n%s",errstr.str().c_str());
-			exit(0);
+			Exit(0);
 		}
 		else
 		{
@@ -373,6 +379,9 @@ void ReadConfig(bool bail, userrec* user)
 	ConfValue("options","allowfounder",0,AF,&config_f);
 	ConfValue("dns","server",0,DNSServer,&config_f);
 	ConfValue("dns","timeout",0,DNT,&config_f);
+	ConfValue("options","moduledir",0,ModPath,&config_f);
+        ConfValue("disabled","commands",0,DisabledCommands,&config_f);
+
 	NetBufferSize = atoi(NB);
 	MaxWhoResults = atoi(MW);
 	dns_timeout = atoi(DNT);
@@ -380,6 +389,8 @@ void ReadConfig(bool bail, userrec* user)
 		dns_timeout = 5;
 	if (!strcmp(DNSServer,""))
 		strlcpy(DNSServer,"127.0.0.1",MAXBUF);
+	if (!strcmp(ModPath,""))
+		strlcpy(ModPath,MOD_PATH,MAXBUF);
 	AllowHalfop = ((!strcasecmp(AH,"true")) || (!strcasecmp(AH,"1")) || (!strcasecmp(AH,"yes")));
 	AllowProtect = ((!strcasecmp(AP,"true")) || (!strcasecmp(AP,"1")) || (!strcasecmp(AP,"yes")));
 	AllowFounder = ((!strcasecmp(AF,"true")) || (!strcasecmp(AF,"1")) || (!strcasecmp(AF,"yes")));
@@ -414,6 +425,7 @@ void ReadConfig(bool bail, userrec* user)
 		ConfValue("connect","allow",i,Value,&config_f);
 		ConfValue("connect","timeout",i,timeout,&config_f);
 		ConfValue("connect","flood",i,flood,&config_f);
+		ConfValue("connect","pingfreq",i,pfreq,&config_f);
 		if (strcmp(Value,""))
 		{
 			strlcpy(c.host,Value,MAXBUF);
@@ -422,11 +434,16 @@ void ReadConfig(bool bail, userrec* user)
 			ConfValue("connect","password",i,Value,&config_f);
 			strlcpy(c.pass,Value,MAXBUF);
 			c.registration_timeout = 90; // default is 2 minutes
+			c.pingtime = 120;
 			c.flood = atoi(flood);
 			if (atoi(timeout)>0)
 			{
 				c.registration_timeout = atoi(timeout);
 			}
+			if (atoi(pfreq)>0)
+			{
+				c.pingtime = atoi(pfreq);
+			}
 			Classes.push_back(c);
 			log(DEBUG,"Read connect class type ALLOW, host=%s password=%s timeout=%d flood=%d",c.host,c.pass,c.registration_timeout,c.flood);
 		}
@@ -445,12 +462,90 @@ void ReadConfig(bool bail, userrec* user)
 	log(DEFAULT,"Applying K lines, Q lines and Z lines...");
 	apply_lines();
 	log(DEFAULT,"Done reading configuration file, InspIRCd is now running.");
+	if (!bail)
+	{
+		log(DEFAULT,"Adding and removing modules due to rehash...");
+
+		std::vector<std::string> old_module_names, new_module_names, added_modules, removed_modules;
+
+		// store the old module names
+		for (std::vector<std::string>::iterator t = module_names.begin(); t != module_names.end(); t++)
+		{
+			old_module_names.push_back(*t);
+		}
+
+		// get the new module names
+		for (int count2 = 0; count2 < ConfValueEnum("module",&config_f); count2++)
+		{
+			ConfValue("module","name",count2,Value,&config_f);
+			new_module_names.push_back(Value);
+		}
+
+		// now create a list of new modules that are due to be loaded
+		// and a seperate list of modules which are due to be unloaded
+		for (std::vector<std::string>::iterator _new = new_module_names.begin(); _new != new_module_names.end(); _new++)
+		{
+			bool added = true;
+			for (std::vector<std::string>::iterator old = old_module_names.begin(); old != old_module_names.end(); old++)
+			{
+				if (*old == *_new)
+					added = false;
+			}
+			if (added)
+				added_modules.push_back(*_new);
+		}
+		for (std::vector<std::string>::iterator oldm = old_module_names.begin(); oldm != old_module_names.end(); oldm++)
+		{
+			bool removed = true;
+			for (std::vector<std::string>::iterator newm = new_module_names.begin(); newm != new_module_names.end(); newm++)
+			{
+				if (*newm == *oldm)
+					removed = false;
+			}
+			if (removed)
+				removed_modules.push_back(*oldm);
+		}
+		// now we have added_modules, a vector of modules to be loaded, and removed_modules, a vector of modules
+		// to be removed.
+		int rem = 0, add = 0;
+		if (!removed_modules.empty())
+		for (std::vector<std::string>::iterator removing = removed_modules.begin(); removing != removed_modules.end(); removing++)
+		{
+			if (UnloadModule(removing->c_str()))
+			{
+				WriteOpers("*** REHASH UNLOADED MODULE: %s",removing->c_str());
+				WriteServ(user->fd,"973 %s %s :Module %s successfully unloaded.",user->nick, removing->c_str(), removing->c_str());
+				rem++;
+			}
+			else
+			{
+				WriteServ(user->fd,"972 %s %s :Failed to unload module %s: %s",user->nick, removing->c_str(), removing->c_str(), ModuleError());
+			}
+		}
+		if (!added_modules.empty())
+		for (std::vector<std::string>::iterator adding = added_modules.begin(); adding != added_modules.end(); adding++)
+		{
+			if (LoadModule(adding->c_str()))
+			{
+				WriteOpers("*** REHASH LOADED MODULE: %s",adding->c_str());
+				WriteServ(user->fd,"975 %s %s :Module %s successfully loaded.",user->nick, adding->c_str(), adding->c_str());
+				add++;
+			}
+			else
+			{
+				WriteServ(user->fd,"974 %s %s :Failed to load module %s: %s",user->nick, adding->c_str(), adding->c_str(), ModuleError());
+			}
+		}
+		log(DEFAULT,"Successfully unloaded %d of %d modules and loaded %d of %d modules.",rem,removed_modules.size(),add,added_modules.size());
+	}
 }
 
 /* write formatted text to a socket, in same format as printf */
 
 void Write(int sock,char *text, ...)
 {
+	if (sock == FD_MAGIC_NUMBER)
+		return;
 	if (!text)
 	{
 		log(DEFAULT,"*** BUG *** Write was given an invalid parameter");
@@ -475,6 +570,8 @@ void Write(int sock,char *text, ...)
 
 void WriteServ(int sock, char* text, ...)
 {
+        if (sock == FD_MAGIC_NUMBER)
+                return;
 	if (!text)
 	{
 		log(DEFAULT,"*** BUG *** WriteServ was given an invalid parameter");
@@ -498,6 +595,8 @@ void WriteServ(int sock, char* text, ...)
 
 void WriteFrom(int sock, userrec *user,char* text, ...)
 {
+        if (sock == FD_MAGIC_NUMBER)
+                return;
 	if ((!text) || (!user))
 	{
 		log(DEFAULT,"*** BUG *** WriteFrom was given an invalid parameter");
@@ -526,6 +625,8 @@ void WriteTo(userrec *source, userrec *dest,char *data, ...)
 		log(DEFAULT,"*** BUG *** WriteTo was given an invalid parameter");
 		return;
 	}
+        if (dest->fd == FD_MAGIC_NUMBER)
+                return;
 	char textbuffer[MAXBUF],tb[MAXBUF];
 	va_list argsPtr;
 	va_start (argsPtr, data);
@@ -563,7 +664,8 @@ void WriteChannel(chanrec* Ptr, userrec* user, char* text, ...)
 	{
 		if (has_channel(i->second,Ptr))
 		{
-			WriteTo(user,i->second,"%s",textbuffer);
+			if (i->second->fd != FD_MAGIC_NUMBER)
+				WriteTo(user,i->second,"%s",textbuffer);
 		}
 	}
 }
@@ -588,7 +690,7 @@ void WriteChannelLocal(chanrec* Ptr, userrec* user, char* text, ...)
 	{
 		if (has_channel(i->second,Ptr))
 		{
-			if (i->second->fd != -1)
+			if ((i->second->fd != -1) && (i->second->fd != FD_MAGIC_NUMBER))
 			{
 				if (!user)
 				{
@@ -620,7 +722,7 @@ void WriteChannelWithServ(char* ServerName, chanrec* Ptr, userrec* user, char* t
 	{
 		if (i->second)
 		{
-			if (has_channel(i->second,Ptr))
+			if ((has_channel(i->second,Ptr)) && (i->second->fd != FD_MAGIC_NUMBER))
 			{
 				WriteServ(i->second->fd,"%s",textbuffer);
 			}
@@ -649,7 +751,7 @@ void ChanExceptSender(chanrec* Ptr, userrec* user, char* text, ...)
 	{
 		if (i->second)
 		{
-			if (has_channel(i->second,Ptr) && (user != i->second))
+			if ((has_channel(i->second,Ptr)) && (user != i->second) && (i->second->fd != FD_MAGIC_NUMBER))
 			{
 				WriteTo(user,i->second,"%s",textbuffer);
 			}
@@ -705,7 +807,7 @@ void WriteCommon(userrec *u, char* text, ...)
 	{
 		if (i->second)
 		{
-			if (common_channels(u,i->second) && (i->second != u))
+			if ((common_channels(u,i->second) && (i->second != u)) && (i->second->fd != FD_MAGIC_NUMBER))
 			{
 				WriteFrom(i->second->fd,u,"%s",textbuffer);
 			}
@@ -763,7 +865,7 @@ void WriteOpers(char* text, ...)
 
 	for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
 	{
-		if (i->second)
+		if ((i->second) && (i->second->fd != FD_MAGIC_NUMBER))
 		{
 			if (strchr(i->second->modes,'o'))
 			{
@@ -823,6 +925,10 @@ void NetSendToCommon(userrec* u, char* s)
 	
 	log(DEBUG,"NetSendToCommon: '%s' '%s'",u->nick,s);
 
+        std::string msg = buffer;
+        FOREACH_MOD OnPacketTransmit(msg,s);
+        strlcpy(buffer,msg.c_str(),MAXBUF);
+
 	for (int j = 0; j < 32; j++)
 	{
 		if (me[j] != NULL)
@@ -846,6 +952,10 @@ void NetSendToAll(char* s)
 	
 	log(DEBUG,"NetSendToAll: '%s'",s);
 
+        std::string msg = buffer;
+        FOREACH_MOD OnPacketTransmit(msg,s);
+        strlcpy(buffer,msg.c_str(),MAXBUF);
+
 	for (int j = 0; j < 32; j++)
 	{
 		if (me[j] != NULL)
@@ -865,6 +975,10 @@ void NetSendToAllAlive(char* s)
 	
 	log(DEBUG,"NetSendToAllAlive: '%s'",s);
 
+        std::string msg = buffer;
+        FOREACH_MOD OnPacketTransmit(msg,s);
+        strlcpy(buffer,msg.c_str(),MAXBUF);
+
 	for (int j = 0; j < 32; j++)
 	{
 		if (me[j] != NULL)
@@ -892,6 +1006,10 @@ void NetSendToOne(char* target,char* s)
 	
 	log(DEBUG,"NetSendToOne: '%s' '%s'",target,s);
 
+        std::string msg = buffer;
+        FOREACH_MOD OnPacketTransmit(msg,s);
+        strlcpy(buffer,msg.c_str(),MAXBUF);
+
 	for (int j = 0; j < 32; j++)
 	{
 		if (me[j] != NULL)
@@ -914,6 +1032,10 @@ void NetSendToAllExcept(const char* target,char* s)
 	
 	log(DEBUG,"NetSendToAllExcept: '%s' '%s'",target,s);
 	
+        std::string msg = buffer;
+        FOREACH_MOD OnPacketTransmit(msg,s);
+        strlcpy(buffer,msg.c_str(),MAXBUF);
+
 	for (int j = 0; j < 32; j++)
 	{
 		if (me[j] != NULL)
@@ -946,7 +1068,7 @@ void WriteMode(const char* modes, int flags, const char* text, ...)
 
 	for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
 	{
-		if (i->second)
+		if ((i->second) && (i->second->fd != FD_MAGIC_NUMBER))
 		{
 			bool send_to_user = false;
 			
@@ -1001,7 +1123,7 @@ void WriteWallOps(userrec *source, bool local_only, char* text, ...)
   
   	for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
         {
-        	if (i->second)
+        	if ((i->second) && (i->second->fd != FD_MAGIC_NUMBER))
         	{
                 	if (strchr(i->second->modes,'w'))
                 	{
@@ -1081,6 +1203,22 @@ chanrec* FindChan(const char* chan)
 }
 
 
+long GetMaxBans(char* name)
+{
+	char CM[MAXBUF];
+	for (int count = 0; count < ConfValueEnum("banlist",&config_f); count++)
+	{
+		ConfValue("banlist","chan",count,CM,&config_f);
+		if (match(name,CM))
+		{
+			ConfValue("banlist","limit",count,CM,&config_f);
+			return atoi(CM);
+		}
+	}
+	return 64;
+}
+
+
 void purge_empty_chans(void)
 {
 	int go_again = 1, purge = 0;
@@ -1097,7 +1235,8 @@ void purge_empty_chans(void)
 					if (i != chanlist.end())
 					{
 						log(DEBUG,"del_channel: destroyed: %s",i->second->name);
-						if (i->second) delete i->second;
+						if (i->second)
+							delete i->second;
 						chanlist.erase(i);
 						go_again = 1;
 						purge++;
@@ -1353,7 +1492,7 @@ chanrec* add_channel(userrec *user, const char* cn, const char* key, bool overri
 			strlcpy(chanlist[cname]->name, cname,CHANMAX);
 			chanlist[cname]->topiclock = 1;
 			chanlist[cname]->noexternal = 1;
-			chanlist[cname]->created = time(NULL);
+			chanlist[cname]->created = TIME;
 			strcpy(chanlist[cname]->topic, "");
 			strncpy(chanlist[cname]->setby, user->nick,NICKMAX);
 			chanlist[cname]->topicset = 0;
@@ -1375,17 +1514,19 @@ chanrec* add_channel(userrec *user, const char* cn, const char* key, bool overri
 			
 			// the override flag allows us to bypass channel modes
 			// and bans (used by servers)
-			if (!override)
+			if ((!override) || (!strcasecmp(user->server,ServerName)))
 			{
+				log(DEBUG,"Not overriding...");
 				int MOD_RESULT = 0;
 				FOREACH_RESULT(OnUserPreJoin(user,Ptr,cname));
 				if (MOD_RESULT == 1) {
 					return NULL;
 				}
+				log(DEBUG,"MOD_RESULT=%d",MOD_RESULT);
 				
-				if (MOD_RESULT == 0) 
+				if (!MOD_RESULT) 
 				{
-					
+					log(DEBUG,"add_channel: checking key, invite, etc");
 					if (strcmp(Ptr->key,""))
 					{
 						log(DEBUG,"add_channel: %s has key %s",Ptr->name,Ptr->key);
@@ -1426,7 +1567,7 @@ chanrec* add_channel(userrec *user, const char* cn, const char* key, bool overri
 		
 					if (Ptr->limit)
 					{
-						if (usercount(Ptr) == Ptr->limit)
+						if (usercount(Ptr) >= Ptr->limit)
 						{
 							WriteServ(user->fd,"471 %s %s :Cannot join channel (Channel is full)",user->nick, Ptr->name);
 							return NULL;
@@ -1639,7 +1780,6 @@ void kick_channel(userrec *src,userrec *user, chanrec *Ptr, char* reason)
 
 	int MOD_RESULT = 0;
 	FOREACH_RESULT(OnAccessCheck(src,user,Ptr,AC_KICK));
-	
 	if (MOD_RESULT == ACR_DENY)
 		return;
 
@@ -1659,7 +1799,14 @@ void kick_channel(userrec *src,userrec *user, chanrec *Ptr, char* reason)
 			return;
 		}
 	}
-	
+
+	MOD_RESULT = 0;
+	FOREACH_RESULT(OnUserPreKick(src,user,Ptr,reason));
+	if (MOD_RESULT)
+		return;
+
+	FOREACH_MOD OnUserKick(src,user,Ptr,reason);
+
 	for (int i =0; i != MAXCHANS; i++)
 	{
 		/* zap it from the channel list of the user */
@@ -1673,7 +1820,7 @@ void kick_channel(userrec *src,userrec *user, chanrec *Ptr, char* reason)
 			break;
 		}
 	}
-	
+
 	/* if there are no users left on the channel */
 	if (!usercount(Ptr))
 	{
@@ -1911,7 +2058,7 @@ void kill_link(userrec *user,const char* r)
 	if (user->registered == 7) {
 		purge_empty_chans();
 	}
-	user = NULL;
+	//user = NULL;
 }
 
 void kill_link_silent(userrec *user,const char* r)
@@ -2024,9 +2171,9 @@ void Error(int status)
 	signal (SIGSEGV, SIG_IGN);
 	signal (SIGURG, SIG_IGN);
 	signal (SIGKILL, SIG_IGN);
-	log(DEBUG,"*** fell down a pothole in the road to perfection ***");
+	log(DEFAULT,"*** fell down a pothole in the road to perfection ***");
 	send_error("Error! Segmentation fault! save meeeeeeeeeeeeee *splat!*");
-	exit(status);
+	Exit(status);
 }
 
 
@@ -2038,7 +2185,7 @@ int main(int argc, char **argv)
 	if (!FileExists(CONFIG_FILE))
 	{
 		printf("ERROR: Cannot open config file: %s\nExiting...\n",CONFIG_FILE);
-		log(DEBUG,"main: no config");
+		log(DEFAULT,"main: no config");
 		printf("ERROR: Your config file is missing, this IRCd will self destruct in 10 seconds!\n");
 		Exit(ERROR);
 	}
@@ -2051,13 +2198,16 @@ int main(int argc, char **argv)
 			if (!strcmp(argv[i],"-wait")) {
 				sleep(6);
 			}
+			if (!strcmp(argv[i],"-nolimit")) {
+				unlimitcore = true;
+			}
 		}
 	}
 	strlcpy(MyExecutable,argv[0],MAXBUF);
 	
 	if (InspIRCd() == ERROR)
 	{
-		log(DEBUG,"main: daemon function bailed");
+		log(DEFAULT,"main: daemon function bailed");
 		printf("ERROR: could not initialise. Shutting down.\n");
 		Exit(ERROR);
 	}
@@ -2126,7 +2276,7 @@ void AddWhoWas(userrec* u)
 			for (user_hash::iterator i = whowas.begin(); i != whowas.end(); i++)
 			{
 				// 3600 seconds in an hour ;)
-				if ((i->second->signon)<(time(NULL)-(WHOWAS_STALE*3600)))
+				if ((i->second->signon)<(TIME-(WHOWAS_STALE*3600)))
 				{
 					if (i->second) delete i->second;
 					i->second = a;
@@ -2184,36 +2334,30 @@ void AddClient(int socket, char* host, int port, bool iscached, char* ip)
 	strncpy(clientlist[tempnick]->host, host,160);
 	strncpy(clientlist[tempnick]->dhost, host,160);
 	strncpy(clientlist[tempnick]->server, ServerName,256);
-	strncpy(clientlist[tempnick]->ident, "unknown",9);
+	strncpy(clientlist[tempnick]->ident, "unknown",12);
 	clientlist[tempnick]->registered = 0;
-	clientlist[tempnick]->signon = time(NULL)+dns_timeout;
-	clientlist[tempnick]->nping = time(NULL)+240+dns_timeout;
+	clientlist[tempnick]->signon = TIME+dns_timeout;
 	clientlist[tempnick]->lastping = 1;
 	clientlist[tempnick]->port = port;
 	strncpy(clientlist[tempnick]->ip,ip,32);
 
 	// set the registration timeout for this user
 	unsigned long class_regtimeout = 90;
-	for (ClassVector::iterator i = Classes.begin(); i != Classes.end(); i++)
-	{
-		if (match(clientlist[tempnick]->host,i->host) && (i->type == CC_ALLOW))
-		{
-			class_regtimeout = (unsigned long)i->registration_timeout;
-			break;
-		}
-	}
-
 	int class_flood = 0;
+
 	for (ClassVector::iterator i = Classes.begin(); i != Classes.end(); i++)
 	{
 		if (match(clientlist[tempnick]->host,i->host) && (i->type == CC_ALLOW))
 		{
+			class_regtimeout = (unsigned long)i->registration_timeout;
 			class_flood = i->flood;
+			clientlist[tempnick]->pingmax = i->pingtime;
 			break;
 		}
 	}
 
-	clientlist[tempnick]->timeout = time(NULL)+class_regtimeout;
+	clientlist[tempnick]->nping = TIME+clientlist[tempnick]->pingmax+dns_timeout;
+	clientlist[tempnick]->timeout = TIME+class_regtimeout;
 	clientlist[tempnick]->flood = class_flood;
 
 	for (int i = 0; i < MAXCHANS; i++)
@@ -2225,21 +2369,36 @@ void AddClient(int socket, char* host, int port, bool iscached, char* ip)
 	if (clientlist.size() == MAXCLIENTS)
 		kill_link(clientlist[tempnick],"No more connections allowed in this class");
 		
-	char* r = matches_zline(ip);
-	if (r)
+
+        char* e = matches_exception(ip);
+	if (!e)
 	{
-		char reason[MAXBUF];
-		snprintf(reason,MAXBUF,"Z-Lined: %s",r);
-		kill_link(clientlist[tempnick],reason);
+		char* r = matches_zline(ip);
+		if (r)
+		{
+			char reason[MAXBUF];
+			snprintf(reason,MAXBUF,"Z-Lined: %s",r);
+			kill_link(clientlist[tempnick],reason);
+		}
 	}
 }
 
-
+// this function counts all users connected, wether they are registered or NOT.
 int usercnt(void)
 {
 	return clientlist.size();
 }
 
+// this counts only registered users, so that the percentages in /MAP don't mess up when users are sitting in an unregistered state
+int registered_usercount(void)
+{
+        int c = 0;
+        for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
+        {
+                if ((i->second->fd) && (isnick(i->second->nick))) c++;
+        }
+        return c;
+}
 
 int usercount_invisible(void)
 {
@@ -2309,17 +2468,21 @@ long local_count()
 
 void ShowMOTD(userrec *user)
 {
-	if (!MOTD.size())
-	{
-		WriteServ(user->fd,"422 %s :Message of the day file is missing.",user->nick);
-		return;
-	}
-  	WriteServ(user->fd,"375 %s :- %s message of the day",user->nick,ServerName);
-	for (int i = 0; i != MOTD.size(); i++)
-	{
-				WriteServ(user->fd,"372 %s :- %s",user->nick,MOTD[i].c_str());
-	}
-	WriteServ(user->fd,"376 %s :End of %s message of the day.",user->nick,ServerName);
+        std::string WholeMOTD = "";
+        if (!MOTD.size())
+        {
+                WriteServ(user->fd,"422 %s :Message of the day file is missing.",user->nick);
+                return;
+        }
+        WholeMOTD = std::string(":") + std::string(ServerName) + std::string(" 375 ") + std::string(user->nick) + std::string(" :- ") + std::string(ServerName) + " message of the day\r\n";
+        for (int i = 0; i != MOTD.size(); i++)
+        {
+                WholeMOTD = WholeMOTD + std::string(":") + std::string(ServerName) + std::string(" 372 ") + std::string(user->nick) + std::string(" :- ") + MOTD[i] + std::string("\r\n");
+        }
+        WholeMOTD = WholeMOTD + std::string(":") + std::string(ServerName) + std::string(" 376 ") + std::string(user->nick) + std::string(" :End of message of the day.\r\n");
+        // only one write operation
+        send(user->fd,WholeMOTD.c_str(),WholeMOTD.length(),0);
+
 }
 
 void ShowRULES(userrec *user)
@@ -2341,7 +2504,7 @@ void ShowRULES(userrec *user)
 void FullConnectUser(userrec* user)
 {
         user->registered = 7;
-        user->idle_lastmsg = time(NULL);
+        user->idle_lastmsg = TIME;
         log(DEBUG,"ConnectUser: %s",user->nick);
 
         if (strcmp(Passwd(user),"") && (!user->haspassed))
@@ -2357,23 +2520,26 @@ void FullConnectUser(userrec* user)
 
         char match_against[MAXBUF];
         snprintf(match_against,MAXBUF,"%s@%s",user->ident,user->host);
-        char* r = matches_gline(match_against);
-        if (r)
-        {
-                char reason[MAXBUF];
-                snprintf(reason,MAXBUF,"G-Lined: %s",r);
-                kill_link_silent(user,reason);
-                return;
-        }
-
-        r = matches_kline(user->host);
-        if (r)
-        {
-                char reason[MAXBUF];
-                snprintf(reason,MAXBUF,"K-Lined: %s",r);
-                kill_link_silent(user,reason);
-                return;
-        }
+	char* e = matches_exception(match_against);
+	if (!e)
+	{
+        	char* r = matches_gline(match_against);
+        	if (r)
+        	{
+                	char reason[MAXBUF];
+                	snprintf(reason,MAXBUF,"G-Lined: %s",r);
+                	kill_link_silent(user,reason);
+                	return;
+        	}
+        	r = matches_kline(user->host);
+        	if (r)
+        	{
+                	char reason[MAXBUF];
+                	snprintf(reason,MAXBUF,"K-Lined: %s",r);
+                	kill_link_silent(user,reason);
+                	return;
+	        }
+	}
 
         WriteServ(user->fd,"NOTICE Auth :Welcome to \002%s\002!",Network);
         WriteServ(user->fd,"001 %s :Welcome to the %s IRC Network %s!%s@%s",user->nick,Network,user->nick,user->ident,user->host);
@@ -2415,11 +2581,26 @@ void FullConnectUser(userrec* user)
         NetSendToAll(buffer);
 }
 
+
+// this returns 1 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 AllModulesReportReady(userrec* user)
+{
+	for (int i = 0; i <= MODCOUNT; i++)
+	{
+		int res = modules[i]->OnCheckReady(user);
+			if (!res)
+				return false;
+	}
+	return true;
+}
+
 /* shows the message of the day, and any other on-logon stuff */
 void ConnectUser(userrec *user)
 {
 	// dns is already done, things are fast. no need to wait for dns to complete just pass them straight on
-	if ((user->dns_done) && (user->registered >= 3))
+	if ((user->dns_done) && (user->registered >= 3) && (AllModulesReportReady(user)))
 	{
 		FullConnectUser(user);
 	}
@@ -2667,17 +2848,17 @@ void process_command(userrec *user, char* cmd)
 				total_params++;
 		}
 	}
-	
+
 	// another phidjit bug...
 	if (total_params > 126)
 	{
-		//kill_link(user,"Protocol violation (1)");
-		WriteServ(user->fd,"421 %s * :Unknown command",user->nick);
+		*(strchr(cmd,' ')) = '\0';
+		WriteServ(user->fd,"421 %s %s :Too many parameters given",user->nick,cmd);
 		return;
 	}
-	
-	strlcpy(temp,cmd,MAXBUF);
 
+	strlcpy(temp,cmd,MAXBUF);
+	
 	std::string tmp = cmd;
 	for (int i = 0; i <= MODCOUNT; i++)
 	{
@@ -2755,8 +2936,7 @@ void process_command(userrec *user, char* cmd)
 	
 	if (strlen(command)>MAXCOMMAND)
 	{
-		//kill_link(user,"Protocol violation (2)");
-		WriteServ(user->fd,"421 %s * :Unknown command",user->nick);
+		WriteServ(user->fd,"421 %s %s :Command too long",user->nick,command);
 		return;
 	}
 	
@@ -2768,8 +2948,7 @@ void process_command(userrec *user, char* cmd)
 			{
 				if (strchr("@!\"$%^&*(){}[]_=+;:'#~,<>/?\\|`",command[x]))
 				{
-					//kill_link(user,"Protocol violation (3)");
-					WriteServ(user->fd,"421 %s * :Unknown command",user->nick);
+					WriteServ(user->fd,"421 %s %s :Unknown command",user->nick,command);
 					return;
 				}
 			}
@@ -2807,7 +2986,7 @@ void process_command(userrec *user, char* cmd)
 					log(DEBUG,"Processing command");
 					
 					/* activity resets the ping pending timer */
-					user->nping = time(NULL) + 120;
+					user->nping = TIME + user->pingmax;
 					if ((items) < cmdlist[i].min_params)
 					{
 					        log(DEBUG,"process_command: not enough parameters: %s %s",user->nick,command);
@@ -2838,12 +3017,31 @@ void process_command(userrec *user, char* cmd)
 							WriteServ(user->fd,"451 %s :You have not registered",command);
 							return;
 						}
+					}
+					if ((user->registered == 7) && (!strchr(user->modes,'o')))
+					{
+						char* mycmd;
+						char* savept2;
+						mycmd = strtok_r(DisabledCommands," ",&savept2);
+						while (mycmd)
+						{
+							if (!strcasecmp(mycmd,command))
+							{
+								// command is disabled!
+								WriteServ(user->fd,"421 %s %s :This command has been disabled.",user->nick,command);
+								return;
+							}
+							mycmd = strtok_r(NULL," ",&savept2);
+						}
+        
+
 					}
 					if ((user->registered == 7) || (!strcmp(command,"USER")) || (!strcmp(command,"NICK")) || (!strcmp(command,"PASS")))
 					{
 					        log(DEBUG,"process_command: handler: %s %s %d",user->nick,command,items);
 						if (cmdlist[i].handler_function)
 						{
+							
 							/* ikky /stats counters */
 							if (temp)
 							{
@@ -2858,6 +3056,12 @@ void process_command(userrec *user, char* cmd)
 								cmdlist[i].total_bytes+=strlen(temp);
 							}
 
+							int MOD_RESULT = 0;
+							FOREACH_RESULT(OnPreCommand(command,command_p,items,user));
+							if (MOD_RESULT == 1) {
+								return;
+							}
+
 							/* WARNING: nothing may come after the
 							 * command handler call, as the handler
 							 * may free the user structure! */
@@ -2885,11 +3089,12 @@ void process_command(userrec *user, char* cmd)
 }
 
 
-void createcommand(char* cmd, handlerfunc f, char flags, int minparams)
+void createcommand(char* cmd, handlerfunc f, char flags, int minparams,char* source)
 {
 	command_t comm;
 	/* create the command and push it onto the table */	
 	strlcpy(comm.command,cmd,MAXBUF);
+	strlcpy(comm.source,source,MAXBUF);
 	comm.handler_function = f;
 	comm.flags_needed = flags;
 	comm.min_params = minparams;
@@ -2899,57 +3104,80 @@ void createcommand(char* cmd, handlerfunc f, char flags, int minparams)
 	log(DEBUG,"Added command %s (%d parameters)",cmd,minparams);
 }
 
+bool removecommands(const char* source)
+{
+	bool go_again = true;
+	while (go_again)
+	{
+		go_again = false;
+		for (std::deque<command_t>::iterator i = cmdlist.begin(); i != cmdlist.end(); i++)
+		{
+			if (!strcmp(i->source,source))
+			{
+				log(DEBUG,"removecommands(%s) Removing dependent command: %s",i->source,i->command);
+				cmdlist.erase(i);
+				go_again = true;
+				break;
+			}
+		}
+	}
+	return true;
+}
+
 void SetupCommandTable(void)
 {
-	createcommand("USER",handle_user,0,4);
-	createcommand("NICK",handle_nick,0,1);
-	createcommand("QUIT",handle_quit,0,0);
-	createcommand("VERSION",handle_version,0,0);
-	createcommand("PING",handle_ping,0,1);
-	createcommand("PONG",handle_pong,0,1);
-	createcommand("ADMIN",handle_admin,0,0);
-	createcommand("PRIVMSG",handle_privmsg,0,2);
-	createcommand("INFO",handle_info,0,0);
-	createcommand("TIME",handle_time,0,0);
-	createcommand("WHOIS",handle_whois,0,1);
-	createcommand("WALLOPS",handle_wallops,'o',1);
-	createcommand("NOTICE",handle_notice,0,2);
-	createcommand("JOIN",handle_join,0,1);
-	createcommand("NAMES",handle_names,0,1);
-	createcommand("PART",handle_part,0,1);
-	createcommand("KICK",handle_kick,0,2);
-	createcommand("MODE",handle_mode,0,1);
-	createcommand("TOPIC",handle_topic,0,1);
-	createcommand("WHO",handle_who,0,1);
-	createcommand("MOTD",handle_motd,0,0);
-	createcommand("RULES",handle_rules,0,0);
-	createcommand("OPER",handle_oper,0,2);
-	createcommand("LIST",handle_list,0,0);
-	createcommand("DIE",handle_die,'o',1);
-	createcommand("RESTART",handle_restart,'o',1);
-	createcommand("KILL",handle_kill,'o',2);
-	createcommand("REHASH",handle_rehash,'o',0);
-	createcommand("LUSERS",handle_lusers,0,0);
-	createcommand("STATS",handle_stats,0,1);
-	createcommand("USERHOST",handle_userhost,0,1);
-	createcommand("AWAY",handle_away,0,0);
-	createcommand("ISON",handle_ison,0,0);
-	createcommand("SUMMON",handle_summon,0,0);
-	createcommand("USERS",handle_users,0,0);
-	createcommand("INVITE",handle_invite,0,2);
-	createcommand("PASS",handle_pass,0,1);
-	createcommand("TRACE",handle_trace,'o',0);
-	createcommand("WHOWAS",handle_whowas,0,1);
-	createcommand("CONNECT",handle_connect,'o',1);
-	createcommand("SQUIT",handle_squit,'o',0);
-	createcommand("MODULES",handle_modules,'o',0);
-	createcommand("LINKS",handle_links,0,0);
-	createcommand("MAP",handle_map,0,0);
-	createcommand("KLINE",handle_kline,'o',1);
-	createcommand("GLINE",handle_gline,'o',1);
-	createcommand("ZLINE",handle_zline,'o',1);
-	createcommand("QLINE",handle_qline,'o',1);
-	createcommand("SERVER",handle_server,0,0);
+	createcommand("USER",handle_user,0,4,"<core>");
+	createcommand("NICK",handle_nick,0,1,"<core>");
+	createcommand("QUIT",handle_quit,0,0,"<core>");
+	createcommand("VERSION",handle_version,0,0,"<core>");
+	createcommand("PING",handle_ping,0,1,"<core>");
+	createcommand("PONG",handle_pong,0,1,"<core>");
+	createcommand("ADMIN",handle_admin,0,0,"<core>");
+	createcommand("PRIVMSG",handle_privmsg,0,2,"<core>");
+	createcommand("INFO",handle_info,0,0,"<core>");
+	createcommand("TIME",handle_time,0,0,"<core>");
+	createcommand("WHOIS",handle_whois,0,1,"<core>");
+	createcommand("WALLOPS",handle_wallops,'o',1,"<core>");
+	createcommand("NOTICE",handle_notice,0,2,"<core>");
+	createcommand("JOIN",handle_join,0,1,"<core>");
+	createcommand("NAMES",handle_names,0,0,"<core>");
+	createcommand("PART",handle_part,0,1,"<core>");
+	createcommand("KICK",handle_kick,0,2,"<core>");
+	createcommand("MODE",handle_mode,0,1,"<core>");
+	createcommand("TOPIC",handle_topic,0,1,"<core>");
+	createcommand("WHO",handle_who,0,1,"<core>");
+	createcommand("MOTD",handle_motd,0,0,"<core>");
+	createcommand("RULES",handle_rules,0,0,"<core>");
+	createcommand("OPER",handle_oper,0,2,"<core>");
+	createcommand("LIST",handle_list,0,0,"<core>");
+	createcommand("DIE",handle_die,'o',1,"<core>");
+	createcommand("RESTART",handle_restart,'o',1,"<core>");
+	createcommand("KILL",handle_kill,'o',2,"<core>");
+	createcommand("REHASH",handle_rehash,'o',0,"<core>");
+	createcommand("LUSERS",handle_lusers,0,0,"<core>");
+	createcommand("STATS",handle_stats,0,1,"<core>");
+	createcommand("USERHOST",handle_userhost,0,1,"<core>");
+	createcommand("AWAY",handle_away,0,0,"<core>");
+	createcommand("ISON",handle_ison,0,0,"<core>");
+	createcommand("SUMMON",handle_summon,0,0,"<core>");
+	createcommand("USERS",handle_users,0,0,"<core>");
+	createcommand("INVITE",handle_invite,0,2,"<core>");
+	createcommand("PASS",handle_pass,0,1,"<core>");
+	createcommand("TRACE",handle_trace,'o',0,"<core>");
+	createcommand("WHOWAS",handle_whowas,0,1,"<core>");
+	createcommand("CONNECT",handle_connect,'o',1,"<core>");
+	createcommand("SQUIT",handle_squit,'o',0,"<core>");
+	createcommand("MODULES",handle_modules,0,0,"<core>");
+	createcommand("LINKS",handle_links,0,0,"<core>");
+	createcommand("MAP",handle_map,0,0,"<core>");
+	createcommand("KLINE",handle_kline,'o',1,"<core>");
+	createcommand("GLINE",handle_gline,'o',1,"<core>");
+	createcommand("ZLINE",handle_zline,'o',1,"<core>");
+	createcommand("QLINE",handle_qline,'o',1,"<core>");
+	createcommand("ELINE",handle_eline,'o',1,"<core>");
+	createcommand("LOADMODULE",handle_loadmodule,'o',1,"<core>");
+	createcommand("UNLOADMODULE",handle_unloadmodule,'o',1,"<core>");
+	createcommand("SERVER",handle_server,0,0,"<core>");
 }
 
 void process_buffer(const char* cmdbuf,userrec *user)
@@ -3010,7 +3238,7 @@ void DoSync(serverrec* serv, char* tcp_host)
 	// send start of sync marker: Y <timestamp>
 	// at this point the ircd receiving it starts broadcasting this netburst to all ircds
 	// except the ones its receiving it from.
-	snprintf(data,MAXBUF,"Y %d",time(NULL));
+	snprintf(data,MAXBUF,"Y %d",TIME);
 	serv->SendPacket(data,tcp_host);
 	// send users and channels
 	for (user_hash::iterator u = clientlist.begin(); u != clientlist.end(); u++)
@@ -3083,7 +3311,7 @@ void DoSync(serverrec* serv, char* tcp_host)
 		}
 	}
 
-	snprintf(data,MAXBUF,"F %d",time(NULL));
+	snprintf(data,MAXBUF,"F %d",TIME);
 	serv->SendPacket(data,tcp_host);
 	log(DEBUG,"Sent sync");
 	// ircd sends its serverlist after the end of sync here
@@ -3197,19 +3425,192 @@ void RemoveServer(const char* name)
 
 
 int reap_counter = 0;
+char MODERR[MAXBUF];
+
+char* ModuleError()
+{
+	return MODERR;
+}
+
+void erase_factory(int j)
+{
+	int v = 0;
+	for (std::vector<ircd_module*>::iterator t = factory.begin(); t != factory.end(); t++)
+	{
+		if (v == j)
+		{
+                	factory.erase(t);
+                 	factory.push_back(NULL);
+                 	return;
+           	}
+		v++;
+     	}
+}
+
+void erase_module(int j)
+{
+	int v = 0;
+	for (std::vector<Module*>::iterator m = modules.begin(); m!= modules.end(); m++)
+        {
+                if (v == j)
+                {
+			delete *m;
+                        modules.erase(m);
+                        modules.push_back(NULL);
+			break;
+                }
+		v++;
+        }
+	int v2 = 0;
+        for (std::vector<std::string>::iterator v = module_names.begin(); v != module_names.end(); v++)
+        {
+                if (v2 == j)
+                {
+                       module_names.erase(v);
+                       break;
+                }
+		v2++;
+        }
+
+}
+
+bool UnloadModule(const char* filename)
+{
+	for (int j = 0; j != module_names.size(); j++)
+	{
+		if (module_names[j] == std::string(filename))
+		{
+			if (modules[j]->GetVersion().Flags & VF_STATIC)
+			{
+				log(DEFAULT,"Failed to unload STATIC module %s",filename);
+				snprintf(MODERR,MAXBUF,"Module not unloadable (marked static)");
+				return false;
+			}
+			// found the module
+			log(DEBUG,"Deleting module...");
+			erase_module(j);
+			log(DEBUG,"Erasing module entry...");
+			erase_factory(j);
+                        log(DEBUG,"Removing dependent commands...");
+                        removecommands(filename);
+			log(DEFAULT,"Module %s unloaded",filename);
+			MODCOUNT--;
+			return true;
+		}
+	}
+	log(DEFAULT,"Module %s is not loaded, cannot unload it!",filename);
+	snprintf(MODERR,MAXBUF,"Module not loaded");
+	return false;
+}
+
+bool DirValid(char* dirandfile)
+{
+	char work[MAXBUF];
+	strlcpy(work,dirandfile,MAXBUF);
+	int p = strlen(work);
+	// we just want the dir
+	while (strlen(work))
+	{
+		if (work[p] == '/')
+		{
+			work[p] = '\0';
+			break;
+		}
+		work[p--] = '\0';
+	}
+	log(DEBUG,"Dir valid: %s",work);
+	char buffer[MAXBUF], otherdir[MAXBUF];
+	// Get the current working directory
+	if( getcwd( buffer, MAXBUF ) == NULL )
+		return false;
+	chdir(work);
+	if( getcwd( otherdir, MAXBUF ) == NULL )
+		return false;
+	chdir(buffer);
+	log(DEBUG,"Dir is really: %s",otherdir);
+	if (strlen(otherdir) >= strlen(work))
+	{
+		otherdir[strlen(work)] = '\0';
+		log(DEBUG,"Compare: '%s' -> '%s'",otherdir,work);
+		if (!strcmp(otherdir,work))
+		{
+			log(DEBUG,"Match ok");
+			return true;
+		}
+		log(DEBUG,"No match");
+		return false;
+	}
+	else return false;
+}
+
+bool LoadModule(const char* filename)
+{
+	char modfile[MAXBUF];
+	snprintf(modfile,MAXBUF,"%s/%s",ModPath,filename);
+	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;
+	}
+	log(DEBUG,"Loading module: %s",modfile);
+        if (FileExists(modfile))
+        {
+		for (int j = 0; j < module_names.size(); j++)
+		{
+			if (module_names[j] == std::string(filename))
+			{
+				log(DEFAULT,"Module %s is already loaded, cannot load a module twice!",modfile);
+				snprintf(MODERR,MAXBUF,"Module already loaded");
+				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());
+			MODCOUNT--;
+			return false;
+                }
+                if (factory[MODCOUNT+1]->factory)
+                {
+			Module* m = factory[MODCOUNT+1]->factory->CreateModule();
+                        modules[MODCOUNT+1] = m;
+                        /* save the module and the module's classfactory, if
+                         * this isnt done, random crashes can occur :/ */
+                        module_names.push_back(filename);
+                }
+		else
+                {
+                        log(DEFAULT,"Unable to load %s",modfile);
+			snprintf(MODERR,MAXBUF,"Factory function failed!");
+			return false;
+                }
+        }
+        else
+        {
+                log(DEFAULT,"InspIRCd: startup: Module Not Found %s",modfile);
+		snprintf(MODERR,MAXBUF,"Module file could not be found");
+		return false;
+        }
+	MODCOUNT++;
+	return true;
+}
 
 int InspIRCd(void)
 {
 	struct sockaddr_in client,server;
 	char addrs[MAXBUF][255];
-	int openSockfd[MAXSOCKS], incomingSockfd, result = TRUE;
+	int incomingSockfd, result = TRUE;
 	socklen_t length;
 	int count = 0;
 	int selectResult = 0, selectResult2 = 0;
 	char *temp, configToken[MAXBUF], stuff[MAXBUF], Addr[MAXBUF], Type[MAXBUF];
 	char resolvedHost[MAXBUF];
 	fd_set selectFds;
-	struct timeval tv;
+	timeval tv;
 
 	log_file = fopen("ircd.log","a+");
 	if (!log_file)
@@ -3224,7 +3625,7 @@ int InspIRCd(void)
 	{
 		printf("WARNING!!! You are running an irc server as ROOT!!! DO NOT DO THIS!!!\n\n");
 		Exit(ERROR);
-		log(DEBUG,"InspIRCd: startup: not starting with UID 0!");
+		log(DEFAULT,"InspIRCd: startup: not starting with UID 0!");
 	}
 	SetupCommandTable();
 	log(DEBUG,"InspIRCd: startup: default command table set up");
@@ -3233,6 +3634,7 @@ int InspIRCd(void)
 	if (strcmp(DieValue,"")) 
 	{ 
 		printf("WARNING: %s\n\n",DieValue);
+		log(DEFAULT,"Ut-Oh, somebody didn't read their config file: '%s'",DieValue);
 		exit(0); 
 	}  
 	log(DEBUG,"InspIRCd: startup: read config");
@@ -3282,49 +3684,18 @@ int InspIRCd(void)
 	printf("\n");
 	
 	/* BugFix By Craig! :p */
-	count = 0;
+	MODCOUNT = -1;
 	for (count2 = 0; count2 < ConfValueEnum("module",&config_f); count2++)
 	{
-		char modfile[MAXBUF];
 		ConfValue("module","name",count2,configToken,&config_f);
-		snprintf(modfile,MAXBUF,"%s/%s",MOD_PATH,configToken,&config_f);
-		printf("Loading module... \033[1;37m%s\033[0;37m\n",modfile);
-		log(DEBUG,"InspIRCd: startup: Loading module: %s",modfile);
-		/* If The File Doesnt exist, Trying to load it
-	 	 * Will Segfault the IRCd.. So, check to see if
-		 * it Exists, Before Proceeding. */
-		if (FileExists(modfile))
-		{
-			factory[count] = new ircd_module(modfile);
-			if (factory[count]->LastError())
-			{
-				log(DEBUG,"Unable to load %s: %s",modfile,factory[count]->LastError());
-				printf("Unable to load %s: %s\nExiting...\n",modfile,factory[count]->LastError());
-				Exit(ERROR);
-			}
-			if (factory[count]->factory)
-			{
-				modules[count] = factory[count]->factory->CreateModule();
-				/* save the module and the module's classfactory, if
-				 * this isnt done, random crashes can occur :/ */
-				module_names.push_back(modfile);	
-			}
-			else
-			{
-				log(DEBUG,"Unable to load %s",modfile);
-				printf("Unable to load %s\nExiting...\n",modfile);
-				Exit(ERROR);
-			}
-			/* Increase the Count */
-			count++;
-		}
-		else
+		printf("Loading module... \033[1;37m%s\033[0;37m\n",configToken);
+		if (!LoadModule(configToken))
 		{
-			log(DEBUG,"InspIRCd: startup: Module Not Found %s",modfile);
-			printf("Module Not Found: \033[1;37m%s\033[0;37m, Skipping\n",modfile);
+			log(DEBUG,"Exiting due to a module loader error.");
+			printf("There was an error loading a module: %s\n",ModuleError());
+			Exit(0);
 		}
 	}
-	MODCOUNT = count - 1;
 	log(DEBUG,"Total loaded modules: %d",MODCOUNT+1);
 	
 	printf("\nInspIRCd is now running!\n");
@@ -3339,7 +3710,7 @@ int InspIRCd(void)
 	{
 		if (DaemonSeed() == ERROR)
 		{
-			log(DEBUG,"InspIRCd: startup: can't daemonise");
+			log(DEFAULT,"InspIRCd: startup: can't daemonise");
 	  		printf("ERROR: could not go into daemon mode. Shutting down.\n");
 			Exit(ERROR);
 	  	}
@@ -3364,7 +3735,7 @@ int InspIRCd(void)
 		}
 		if (BindSocket(openSockfd[boundPortCount],client,server,ports[count],addrs[count]) == ERROR)
 		{
-			log(DEBUG,"InspIRCd: startup: failed to bind port %d",ports[count]);
+			log(DEFAULT,"InspIRCd: startup: failed to bind port %d",ports[count]);
 		}
 		else	/* well we at least bound to one socket so we'll continue */
 		{
@@ -3377,13 +3748,28 @@ int InspIRCd(void)
 	/* if we didn't bind to anything then abort */
 	if (boundPortCount == 0)
 	{
-		log(DEBUG,"InspIRCd: startup: no ports bound, bailing!");
+		log(DEFAULT,"InspIRCd: startup: no ports bound, bailing!");
 		return (ERROR);
 	}
 	
 
 	length = sizeof (client);
 	char udp_msg[MAXBUF], tcp_host[MAXBUF];
+
+        fd_set serverfds;
+        timeval tvs;
+        tvs.tv_usec = 7000L;
+        tvs.tv_sec = 0;
+	tv.tv_sec = 0;
+	tv.tv_usec = 7000L;
+        char data[10240];
+	timeval tval;
+	fd_set sfd;
+        tval.tv_usec = 7000L;
+        tval.tv_sec = 0;
+        int total_in_this_set = 0;
+	int v = 0;
+	bool expire_run = false;
 	  
 	/* main loop, this never returns */
 	for (;;)
@@ -3393,45 +3779,44 @@ int InspIRCd(void)
 #endif
                 // poll dns queue
                 dns_poll();
-
-		fd_set sfd;
-		timeval tval;
 		FD_ZERO(&sfd);
 
-		user_hash::iterator count2 = clientlist.begin();
+		// we only read time() once per iteration rather than tons of times!
+		TIME = time(NULL);
 
 		// *FIX* Instead of closing sockets in kill_link when they receive the ERROR :blah line, we should queue
 		// them in a list, then reap the list every second or so.
-		if ((reap_counter % 50) == 0)
+		if (((TIME % 5) == 0) && (!expire_run))
 		{
-			// These functions eat cpu, and should not be done so often!
-
-        	        // update the status of klines, etc
-	                expire_lines();
-#ifdef _POSIX_PRIORITY_SCHEDULING
-			sched_yield();
-#endif
+			expire_lines();
+			FOREACH_MOD OnBackgroundTimer(TIME);
+			expire_run = true;
+			continue;
 		}
+		if ((TIME % 5) == 1)
+			expire_run = false;
 		if (reap_counter>300)
   		{
 			if (fd_reap.size() > 0)
    			{
 				for( int n = 0; n < fd_reap.size(); n++)
 				{
-					//Blocking(fd_reap[n]);
-					close(fd_reap[n]);
-					shutdown (fd_reap[n],2);
-					//NonBlocking(fd_reap[n]);
+					if ((fd_reap[n] > -1))
+					{
+						close(fd_reap[n]);
+						shutdown (fd_reap[n],2);
+					}
 				}
 			}
 			fd_reap.clear();
 			reap_counter=0;
 		}
 		reap_counter++;
+		
+		// fix by brain - this must be below any manipulation of the hashmap by modules
+		user_hash::iterator count2 = clientlist.begin();
 
-		fd_set serverfds;
 		FD_ZERO(&serverfds);
-		timeval tvs;
 		
 		for (int x = 0; x != UDPportCount; x++)
 		{
@@ -3439,9 +3824,10 @@ int InspIRCd(void)
 				FD_SET(me[x]->fd, &serverfds);
 		}
 		
-		tvs.tv_usec = 5000;
-		tvs.tv_sec = 0;
+		// serverFds timevals went here
 		
+		tvs.tv_usec = 7000L;
+		tvs.tv_sec = 0;
 		int servresult = select(32767, &serverfds, NULL, NULL, &tvs);
 		if (servresult > 0)
 		{
@@ -3452,14 +3838,17 @@ int InspIRCd(void)
 					char remotehost[MAXBUF],resolved[MAXBUF];
 					length = sizeof (client);
 					incomingSockfd = accept (me[x]->fd, (sockaddr *) &client, &length);
-					strlcpy(remotehost,(char *)inet_ntoa(client.sin_addr),MAXBUF);
-					if(CleanAndResolve(resolved, remotehost) != TRUE)
+					if (incomingSockfd != -1)
 					{
-						strlcpy(resolved,remotehost,MAXBUF);
+						strlcpy(remotehost,(char *)inet_ntoa(client.sin_addr),MAXBUF);
+						if(CleanAndResolve(resolved, remotehost) != TRUE)
+						{
+							strlcpy(resolved,remotehost,MAXBUF);
+						}
+						// add to this connections ircd_connector vector
+						// *FIX* - we need the LOCAL port not the remote port in &client!
+						me[x]->AddIncoming(incomingSockfd,resolved,me[x]->port);
 					}
-					// add to this connections ircd_connector vector
-					// *FIX* - we need the LOCAL port not the remote port in &client!
-					me[x]->AddIncoming(incomingSockfd,resolved,me[x]->port);
 				}
 			}
 		}
@@ -3474,6 +3863,7 @@ int InspIRCd(void)
 				{
 					char udp_msg[MAXBUF];
 					strlcpy(udp_msg,msgs[ctr].c_str(),MAXBUF);
+					log(DEBUG,"Processing: %s",udp_msg);
 					if (strlen(udp_msg)<1)
     					{
 						log(DEBUG,"Invalid string from %s [route%d]",tcp_host,x);
@@ -3492,7 +3882,9 @@ int InspIRCd(void)
 						else
 							NetSendToAllExcept(tcp_host,udp_msg);
 					}
-					FOREACH_MOD OnPacketReceive(udp_msg);
+		                        std::string msg = udp_msg;
+		                        FOREACH_MOD OnPacketReceive(msg,tcp_host);
+		                        strlcpy(udp_msg,msg.c_str(),MAXBUF);
 					handle_link_packet(udp_msg, tcp_host, me[x]);
 				}
 				goto label;
@@ -3502,17 +3894,14 @@ int InspIRCd(void)
 
 	while (count2 != clientlist.end())
 	{
-		char data[10240];
-		tval.tv_usec = 5000;
-		tval.tv_sec = 0;
 		FD_ZERO(&sfd);
-		int total_in_this_set = 0;
+		total_in_this_set = 0;
 
 		user_hash::iterator xcount = count2;
 		user_hash::iterator endingiter = count2;
 
-		if (!count2->second) break;
-		
+		if (count2 == clientlist.end()) break;
+
 		if (count2->second)
 		if (count2->second->fd != 0)
 		{
@@ -3526,31 +3915,32 @@ int InspIRCd(void)
 				if (count2 != clientlist.end())
 				{
 					// we don't check the state of remote users.
-					if (count2->second->fd > 0)
+					if ((count2->second->fd != -1) && (count2->second->fd != FD_MAGIC_NUMBER))
 					{
 						FD_SET (count2->second->fd, &sfd);
 
 						// registration timeout -- didnt send USER/NICK/HOST in the time specified in
 						// their connection class.
-						if ((time(NULL) > count2->second->timeout) && (count2->second->registered != 7)) 
+						if ((TIME > count2->second->timeout) && (count2->second->registered != 7)) 
 						{
 						  	log(DEBUG,"InspIRCd: registration timeout: %s",count2->second->nick);
 							kill_link(count2->second,"Registration timeout");
 							goto label;
 						}
-						if ((time(NULL) > count2->second->signon) && (count2->second->registered != 7))
+						if ((TIME > count2->second->signon) && (count2->second->registered == 3) && (AllModulesReportReady(count2->second)))
 						{
-								count2->second->dns_done = true;
-								FullConnectUser(count2->second);
-								goto label;
+							log(DEBUG,"signon exceed, registered=3, and modules ready, OK");
+							count2->second->dns_done = true;
+							FullConnectUser(count2->second);
+							goto label;
 						}
-		                                if ((count2->second->dns_done) && (count2->second->registered == 3)) // both NICK and USER... and DNS
+		                                if ((count2->second->dns_done) && (count2->second->registered == 3) && (AllModulesReportReady(count2->second))) // both NICK and USER... and DNS
 		                                {
-							WriteServ(count2->second->fd,"NOTICE Auth :Timed out when looking up your hostname!",ServerName);
+							log(DEBUG,"dns done, registered=3, and modules ready, OK");
 		                                        FullConnectUser(count2->second);
 							goto label;
 		                                }
-						if (((time(NULL)) > count2->second->nping) && (isnick(count2->second->nick)) && (count2->second->registered == 7))
+						if ((TIME > count2->second->nping) && (isnick(count2->second->nick)) && (count2->second->registered == 7))
 						{
 							if ((!count2->second->lastping) && (count2->second->registered == 7))
 							{
@@ -3561,7 +3951,7 @@ int InspIRCd(void)
 							Write(count2->second->fd,"PING :%s",ServerName);
 						  	log(DEBUG,"InspIRCd: pinging: %s",count2->second->nick);
 							count2->second->lastping = 0;
-							count2->second->nping = time(NULL)+120;
+							count2->second->nping = TIME+count2->second->pingmax;	// was hard coded to 120
 						}
 					}
 					count2++;
@@ -3573,10 +3963,11 @@ int InspIRCd(void)
 	       		endingiter = count2;
        			count2 = xcount; // roll back to where we were
         
-        		int v = 0;
+        		v = 0;
 
-			tval.tv_usec = 5000;
-			tval.tv_sec = 0;
+			// tvals defined here
+
+			tval.tv_usec = 7000L;
 			selectResult2 = select(65535, &sfd, NULL, NULL, &tval);
 			
 			// now loop through all of the items in this pool if any are waiting
@@ -3589,13 +3980,21 @@ int InspIRCd(void)
 #endif
 
 				result = EAGAIN;
-				if ((count2a->second->fd != -1) && (FD_ISSET (count2a->second->fd, &sfd)))
+				if ((count2a->second->fd != FD_MAGIC_NUMBER) && (count2a->second->fd != -1) && (FD_ISSET (count2a->second->fd, &sfd)))
 				{
 					memset(data, 0, 10240);
 					result = read(count2a->second->fd, data, 10240);
 					
 					if (result)
 					{
+						// perform a check on the raw buffer as an array (not a string!) to remove
+						// characters 0 and 7 which are illegal in the RFC - replace them with spaces.
+						// hopefully this should stop even more people whining about "Unknown command: *"
+						for (int checker = 0; checker < result; checker++)
+						{
+							if ((data[checker] == 0) || (data[checker] == 7))
+								data[checker] = ' ';
+						}
 						userrec* current = count2a->second;
 						int currfd = current->fd;
 						char* l = strtok(data,"\n");
@@ -3694,7 +4093,7 @@ int InspIRCd(void)
 		FD_SET (openSockfd[count], &selectFds);
 	}
 
-	tv.tv_usec = 5000;
+	tv.tv_usec = 7000L;
 	selectResult = select(MAXSOCKS, &selectFds, NULL, NULL, &tv);
 
 	/* select is reporting a waiting socket. Poll them all to find out which */
@@ -3726,7 +4125,7 @@ int InspIRCd(void)
 		}
 	}
 	label:
-	if(0) {}; // "Label must be followed by a statement"... so i gave it one.
+	if (0) {};
 }
 /* not reached */
 close (incomingSockfd);