]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/helperfuncs.cpp
Passing invalid instance to dns isnt a good idea
[user/henk/code/inspircd.git] / src / helperfuncs.cpp
index a30a669ae25a8d38dd506860e713e35be6ba663a..1f2a6646b5ea838ef952f77feaa25dad8656ab50 100644 (file)
@@ -3,20 +3,19 @@
  *       +------------------------------------+
  *
  *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *                <Craig@chatspike.net>
+ *                    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.
+ *         the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
 #include <stdarg.h>
 #include "inspircd_config.h"
-#include "inspircd.h"
 #include "configreader.h"
 #include <unistd.h>
 #include <fcntl.h>
 #include "helperfuncs.h"
 #include "hashcomp.h"
 #include "typedefs.h"
+#include "inspircd.h"
 
 extern int MODCOUNT;
 extern ModuleList modules;
-extern ServerConfig *Config;
 extern InspIRCd* ServerInstance;
 extern time_t TIME;
 extern char lowermap[255];
-extern userrec* fd_ref_table[MAX_DESCRIPTORS];
-static char already_sent[MAX_DESCRIPTORS];
 extern std::vector<userrec*> all_opers;
-extern user_hash clientlist;
-extern chan_hash chanlist;
 
 char LOG_FILE[MAXBUF];
 
-extern std::vector<userrec*> local_users;
-
 static char TIMESTR[26];
 static time_t LAST = 0;
 
-/** log()
- *  Write a line of text `text' to the logfile (and stdout, if in nofork) if the level `level'
- *  is greater than the configured loglevel.
- */
-void do_log(int level, const char *text, ...)
-{
-       va_list argsPtr;
-       char textbuffer[MAXBUF];
-
-       /* If we were given -debug we output all messages, regardless of configured loglevel */
-       if ((level < Config->LogLevel) && !Config->forcedebug)
-               return;
-
-       if (TIME != LAST)
-       {
-               struct tm *timeinfo = localtime(&TIME);
-
-               strlcpy(TIMESTR,asctime(timeinfo),26);
-               TIMESTR[24] = ':';
-               LAST = TIME;
-       }
-
-       if (Config->log_file)
-       {
-               va_start(argsPtr, text);
-               vsnprintf(textbuffer, MAXBUF, text, argsPtr);
-               va_end(argsPtr);
-
-               if (Config->writelog)
-               {
-                       fprintf(Config->log_file,"%s %s\n",TIMESTR,textbuffer);
-                       fflush(Config->log_file);
-               }
-       }
-       
-       if (Config->nofork)
-       {
-               printf("%s %s\n", TIMESTR, textbuffer);
-       }
-}
-
-/** readfile()
- *  Read the contents of a file located by `fname' into a file_cache pointed at by `F'.
- *
- *  XXX - we may want to consider returning a file_cache or pointer to one, less confusing.
- */
-void readfile(file_cache &F, const char* fname)
-{
-       FILE* file;
-       char linebuf[MAXBUF];
-
-       log(DEBUG,"readfile: loading %s",fname);
-       F.clear();
-       file =  fopen(fname,"r");
-
-       if (file)
-       {
-               while (!feof(file))
-               {
-                       fgets(linebuf,sizeof(linebuf),file);
-                       linebuf[strlen(linebuf)-1]='\0';
-
-                       if (!*linebuf)
-                       {
-                               strcpy(linebuf,"  ");
-                       }
-
-                       if (!feof(file))
-                       {
-                               F.push_back(linebuf);
-                       }
-               }
-
-               fclose(file);
-       }
-       else
-       {
-               log(DEBUG,"readfile: failed to load file: %s",fname);
-       }
-
-       log(DEBUG,"readfile: loaded %s, %lu lines",fname,(unsigned long)F.size());
-}
-
-/** Write_NoFormat()
- *  Writes a given string in `text' to the socket on fd `sock' - only if the socket
- *  is a valid entry in the local FD table.
- */
-void Write_NoFormat(int sock, const char *text)
-{
-       char tb[MAXBUF];
-       int bytes;
-
-       if ((sock < 0) || (!text) || (sock > MAX_DESCRIPTORS))
-               return;
-
-       if (fd_ref_table[sock])
-       {
-               bytes = snprintf(tb,MAXBUF,"%s\r\n",text);
-               chop(tb);
-
-               if (Config->GetIOHook(fd_ref_table[sock]->port))
-               {
-                       try
-                       {
-                               Config->GetIOHook(fd_ref_table[sock]->port)->OnRawSocketWrite(sock,tb,bytes);
-                       }
-                       catch (ModuleException& modexcept)
-                       {
-                               log(DEBUG,"Module exception caught: %s",modexcept.GetReason());
-                       }
-               }
-               else
-               {
-                       fd_ref_table[sock]->AddWriteBuf(tb);
-               }
-               ServerInstance->stats->statsSent += bytes;
-       }
-       else
-               log(DEFAULT,"ERROR! attempted write to a user with no fd_ref_table entry!!!");
-}
-
-/** Write()
- *  Same as Write_NoFormat(), but formatted printf() style first.
- */
-void Write(int sock, char *text, ...)
-{
-       va_list argsPtr;
-       char textbuffer[MAXBUF];
-       char tb[MAXBUF];
-       int bytes;
-
-       if ((sock < 0) || (sock > MAX_DESCRIPTORS))
-               return;
-
-       if (!text)
-       {
-               log(DEFAULT,"*** BUG *** Write was given an invalid parameter");
-               return;
-       }
-
-       if (fd_ref_table[sock])
-       {
-
-               va_start(argsPtr, text);
-               vsnprintf(textbuffer, MAXBUF, text, argsPtr);
-               va_end(argsPtr);
-               bytes = snprintf(tb,MAXBUF,"%s\r\n",textbuffer);
-               chop(tb);
-
-               if (Config->GetIOHook(fd_ref_table[sock]->port))
-               {
-                       try
-                       {
-                               Config->GetIOHook(fd_ref_table[sock]->port)->OnRawSocketWrite(sock,tb,bytes);
-                       }
-                       catch (ModuleException& modexcept)
-                       {
-                               log(DEBUG,"Module exception caught: %s",modexcept.GetReason());
-                       }                                               
-               }
-               else
-               {
-                       fd_ref_table[sock]->AddWriteBuf(tb);
-               }
-               ServerInstance->stats->statsSent += bytes;
-       }
-       else
-               log(DEFAULT,"ERROR! attempted write to a user with no fd_ref_table entry!!!");
-}
-
-/** WriteServ_NoFormat()
- *  Same as Write_NoFormat(), except prefixes `text' with `:server.name '.
- */
-void WriteServ_NoFormat(int sock, const char* text)
-{
-       char tb[MAXBUF];
-       int bytes;
-
-       if ((sock < 0) || (!text) || (sock > MAX_DESCRIPTORS))
-               return;
-
-       if (fd_ref_table[sock])
-       {
-               bytes = snprintf(tb,MAXBUF,":%s %s\r\n",Config->ServerName,text);
-               chop(tb);
-
-               if (Config->GetIOHook(fd_ref_table[sock]->port))
-               {
-                       try
-                       {
-                               Config->GetIOHook(fd_ref_table[sock]->port)->OnRawSocketWrite(sock,tb,bytes);
-                       }
-                       catch (ModuleException& modexcept)
-                       {
-                               log(DEBUG,"Module exception caught: %s",modexcept.GetReason());
-                       }
-               }
-               else
-               {
-                       fd_ref_table[sock]->AddWriteBuf(tb);
-               }
-               ServerInstance->stats->statsSent += bytes;
-       }
-       else
-               log(DEFAULT,"ERROR! attempted write to a user with no fd_ref_table entry!!!");
-}
-
-/** WriteServ()
- *  Same as Write(), except `text' is prefixed with `:server.name '.
- */
-void WriteServ(int sock, char* text, ...)
-{
-       va_list argsPtr;
-       char textbuffer[MAXBUF];
-
-       if ((sock < 0) || (sock > MAX_DESCRIPTORS))
-               return;
-
-       if (!text)
-       {
-               log(DEFAULT,"*** BUG *** WriteServ was given an invalid parameter");
-               return;
-       }
-
-       if (!fd_ref_table[sock])
-               return;
-
-       va_start(argsPtr, text);
-       vsnprintf(textbuffer, MAXBUF, text, argsPtr);
-       va_end(argsPtr);
-       
-       WriteServ_NoFormat(sock, textbuffer);
-}
-
-/** WriteFrom_NoFormat()
- * Write `text' to a socket with fd `sock' prefixed with `:n!u@h' - taken from
- * the nick, user, and host of `user'.
- */
-void WriteFrom_NoFormat(int sock, userrec *user, const char* text)
-{
-       char tb[MAXBUF];
-       int bytes;
-
-       if ((sock < 0) || (!text) || (!user) || (sock > MAX_DESCRIPTORS))
-               return;
-
-       if (fd_ref_table[sock])
-       {
-               bytes = snprintf(tb,MAXBUF,":%s %s\r\n",user->GetFullHost(),text);
-               chop(tb);
-
-               if (Config->GetIOHook(fd_ref_table[sock]->port))
-               {
-                       try
-                       {
-                               Config->GetIOHook(fd_ref_table[sock]->port)->OnRawSocketWrite(sock,tb,bytes);
-                       }
-                       catch (ModuleException& modexcept)
-                       {
-                               log(DEBUG,"Module exception caught: %s",modexcept.GetReason());
-                       }
-               }
-               else
-               {
-                       fd_ref_table[sock]->AddWriteBuf(tb);
-               }
-               ServerInstance->stats->statsSent += bytes;
-       }
-       else
-               log(DEFAULT,"ERROR! attempted write to a user with no fd_ref_table entry!!!");
-}
-
-/* write text from an originating user to originating user */
-
-void WriteFrom(int sock, userrec *user,char* text, ...)
-{
-       va_list argsPtr;
-       char textbuffer[MAXBUF];
-       char tb[MAXBUF];
-       int bytes;
-
-       if ((sock < 0) || (sock > MAX_DESCRIPTORS))
-               return;
-
-       if ((!text) || (!user))
-       {
-               log(DEFAULT,"*** BUG *** WriteFrom was given an invalid parameter");
-               return;
-       }
-
-       if (fd_ref_table[sock])
-       {
-
-               va_start(argsPtr, text);
-               vsnprintf(textbuffer, MAXBUF, text, argsPtr);
-               va_end(argsPtr);
-               bytes = snprintf(tb,MAXBUF,":%s %s\r\n",user->GetFullHost(),textbuffer);
-               chop(tb);
-
-               if (Config->GetIOHook(fd_ref_table[sock]->port))
-               {
-                       try
-                       {
-                               Config->GetIOHook(fd_ref_table[sock]->port)->OnRawSocketWrite(sock,tb,bytes);
-                       }
-                       catch (ModuleException& modexcept)
-                       {
-                               log(DEBUG,"Module exception caught: %s",modexcept.GetReason());
-                       }
-               }
-               else
-               {
-                       fd_ref_table[sock]->AddWriteBuf(tb);
-               }
-
-               ServerInstance->stats->statsSent += bytes;
-       }
-       else
-               log(DEFAULT,"ERROR! attempted write to a user with no fd_ref_table entry!!!");
-}
-
-/* write text to an destination user from a source user (e.g. user privmsg) */
-
-void WriteTo(userrec *source, userrec *dest,char *data, ...)
-{
-       char textbuffer[MAXBUF];
-       va_list argsPtr;
-
-       if ((!dest) || (!data))
-       {
-               log(DEFAULT,"*** BUG *** WriteTo was given an invalid parameter");
-               return;
-       }
-
-       if (!IS_LOCAL(dest))
-               return;
-
-       va_start(argsPtr, data);
-       vsnprintf(textbuffer, MAXBUF, data, argsPtr);
-       va_end(argsPtr);
-       chop(textbuffer);
-
-       // if no source given send it from the server.
-       if (!source)
-       {
-               WriteServ_NoFormat(dest->fd,textbuffer);
-       }
-       else
-       {
-               WriteFrom_NoFormat(dest->fd,source,textbuffer);
-       }
-}
-
-void WriteTo_NoFormat(userrec *source, userrec *dest, const char *data)
-{
-       if ((!dest) || (!data))
-               return;
-
-       if (!source)
-       {
-               WriteServ_NoFormat(dest->fd,data);
-       }
-       else
-       {
-               WriteFrom_NoFormat(dest->fd,source,data);
-       }
-}
-
-/* write formatted text from a source user to all users on a channel
- * including the sender (NOT for privmsg, notice etc!) */
-
-void WriteChannel(chanrec* Ptr, userrec* user, char* text, ...)
-{
-       char textbuffer[MAXBUF];
-       va_list argsPtr;
-       CUList *ulist;
-
-       if ((!Ptr) || (!user) || (!text))
-       {
-               log(DEFAULT,"*** BUG *** WriteChannel was given an invalid parameter");
-               return;
-       }
-
-       va_start(argsPtr, text);
-       vsnprintf(textbuffer, MAXBUF, text, argsPtr);
-       va_end(argsPtr);
-
-       ulist = Ptr->GetUsers();
-
-       for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
-       {
-               if (i->second->fd != FD_MAGIC_NUMBER)
-                       WriteTo_NoFormat(user,i->second,textbuffer);
-       }
-}
-
-void WriteChannel_NoFormat(chanrec* Ptr, userrec* user, const char* text)
-{
-       CUList *ulist;
-
-       if ((!Ptr) || (!user) || (!text))
-       {
-               log(DEFAULT,"*** BUG *** WriteChannel was given an invalid parameter");
-               return;
-       }
-
-       ulist = Ptr->GetUsers();
-
-       for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
-       {
-               if (i->second->fd != FD_MAGIC_NUMBER)
-                       WriteTo_NoFormat(user,i->second,text);
-       }
-}
-
-
-/* write formatted text from a source user to all users on a channel
- * including the sender (NOT for privmsg, notice etc!) doesnt send to
- * users on remote servers */
-
-void WriteChannelLocal(chanrec* Ptr, userrec* user, char* text, ...)
-{
-       char textbuffer[MAXBUF];
-       va_list argsPtr;
-       CUList *ulist;
-
-       if ((!Ptr) || (!text))
-       {
-               log(DEFAULT,"*** BUG *** WriteChannel was given an invalid parameter");
-               return;
-       }
-
-       va_start(argsPtr, text);
-       vsnprintf(textbuffer, MAXBUF, text, argsPtr);
-       va_end(argsPtr);
-
-       ulist = Ptr->GetUsers();
-
-       for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
-       {
-               if ((i->second->fd != FD_MAGIC_NUMBER) && (i->second != user))
-               {
-                       if (!user)
-                       {
-                               WriteServ_NoFormat(i->second->fd,textbuffer);
-                       }
-                       else
-                       {
-                               WriteTo_NoFormat(user,i->second,textbuffer);
-                       }
-               }
-       }
-}
-
-void WriteChannelLocal_NoFormat(chanrec* Ptr, userrec* user, const char* text)
-{
-       CUList *ulist;
-
-       if ((!Ptr) || (!text))
-       {
-               log(DEFAULT,"*** BUG *** WriteChannel was given an invalid parameter");
-               return;
-       }
-
-       ulist = Ptr->GetUsers();
-
-       for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
-       {
-               if ((i->second->fd != FD_MAGIC_NUMBER) && (i->second != user))
-               {
-                       if (!user)
-                       {
-                               WriteServ_NoFormat(i->second->fd,text);
-                       }
-                       else
-                       {
-                               WriteTo_NoFormat(user,i->second,text);
-                       }
-               }
-       }
-}
-
-
-
-void WriteChannelWithServ(char* ServName, chanrec* Ptr, char* text, ...)
+/** Log()
+ *  Write a line of text `text' to the logfile (and stdout, if in nofork) if the level `level'
+ *  is greater than the configured loglevel.
+ */
+void InspIRCd::Log(int level, const char* text, ...)
 {
-       char textbuffer[MAXBUF];
        va_list argsPtr;
-       CUList *ulist;
-
-       if ((!Ptr) || (!text))
-       {
-               log(DEFAULT,"*** BUG *** WriteChannelWithServ was given an invalid parameter");
-               return;
-       }
+       char textbuffer[MAXBUF];
 
        va_start(argsPtr, text);
        vsnprintf(textbuffer, MAXBUF, text, argsPtr);
        va_end(argsPtr);
 
-       ulist = Ptr->GetUsers();
-
-       for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
-       {
-               if (IS_LOCAL(i->second))
-                       WriteServ_NoFormat(i->second->fd,textbuffer);
-       }
+       InspIRCd::Log(level, std::string(textbuffer));
 }
 
-void WriteChannelWithServ_NoFormat(char* ServName, chanrec* Ptr, const char* text)
+void InspIRCd::Log(int level, const std::string &text)
 {
-       CUList *ulist;
-
-       if ((!Ptr) || (!text))
-       {
-               log(DEFAULT,"*** BUG *** WriteChannelWithServ was given an invalid parameter");
+       if (!ServerInstance || !ServerInstance->Config)
                return;
-       }
 
-       ulist = Ptr->GetUsers();
-
-       for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
-       {
-               if (IS_LOCAL(i->second))
-                       WriteServ_NoFormat(i->second->fd,text);
-       }
-}
-
-
-
-/* write formatted text from a source user to all users on a channel except
- * for the sender (for privmsg etc) */
-
-void ChanExceptSender(chanrec* Ptr, userrec* user, char status, char* text, ...)
-{
-       char textbuffer[MAXBUF];
-       va_list argsPtr;
-       CUList *ulist;
-
-       if ((!Ptr) || (!user) || (!text))
-       {
-               log(DEFAULT,"*** BUG *** ChanExceptSender was given an invalid parameter");
+       /* If we were given -debug we output all messages, regardless of configured loglevel */
+       if ((level < ServerInstance->Config->LogLevel) && !ServerInstance->Config->forcedebug)
                return;
-       }
 
-       va_start(argsPtr, text);
-       vsnprintf(textbuffer, MAXBUF, text, argsPtr);
-       va_end(argsPtr);
-
-       switch (status)
-       {
-               case '@':
-                       ulist = Ptr->GetOppedUsers();
-                       break;
-               case '%':
-                       ulist = Ptr->GetHalfoppedUsers();
-                       break;
-               case '+':
-                       ulist = Ptr->GetVoicedUsers();
-                       break;
-               default:
-                       ulist = Ptr->GetUsers();
-                       break;
-       }
-
-       log(DEBUG,"%d users to write to",ulist->size());
-
-       for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
+       if (TIME != LAST)
        {
-               if ((IS_LOCAL(i->second)) && (user != i->second))
-                       WriteFrom_NoFormat(i->second->fd,user,textbuffer);
-       }
-}
-
-void ChanExceptSender_NoFormat(chanrec* Ptr, userrec* user, char status, const char* text)
-{
-       CUList *ulist;
+               struct tm *timeinfo = localtime(&TIME);
 
-       if ((!Ptr) || (!user) || (!text))
-       {
-               log(DEFAULT,"*** BUG *** ChanExceptSender was given an invalid parameter");
-               return;
+               strlcpy(TIMESTR,asctime(timeinfo),26);
+               TIMESTR[24] = ':';
+               LAST = TIME;
        }
 
-       switch (status)
+       if (ServerInstance->Config->log_file && ServerInstance->Config->writelog)
        {
-               case '@':
-                       ulist = Ptr->GetOppedUsers();
-                       break;  
-               case '%':
-                       ulist = Ptr->GetHalfoppedUsers();
-                       break;
-               case '+':
-                       ulist = Ptr->GetVoicedUsers();
-                       break;
-               default:
-                       ulist = Ptr->GetUsers();
-                       break;
+               fprintf(ServerInstance->Config->log_file,"%s %s\n",TIMESTR,text.c_str());
+               fflush(ServerInstance->Config->log_file);
        }
 
-       for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
+       if (ServerInstance->Config->nofork)
        {
-               if ((IS_LOCAL(i->second)) && (user != i->second))
-                       WriteFrom_NoFormat(i->second->fd,user,text);
+               printf("%s %s\n", TIMESTR, text.c_str());
        }
 }
 
@@ -683,250 +115,10 @@ std::string GetServerDescription(const char* servername)
        else
        {
                // not a remote server that can be found, it must be me.
-               return Config->ServerDesc;
-       }
-}
-
-/* write a formatted string to all users who share at least one common
- * channel, including the source user e.g. for use in NICK */
-
-void WriteCommon(userrec *u, char* text, ...)
-{
-       char textbuffer[MAXBUF];
-       va_list argsPtr;
-       bool sent_to_at_least_one = false;
-
-       if (!u)
-       {
-               log(DEFAULT,"*** BUG *** WriteCommon was given an invalid parameter");
-               return;
-       }
-
-       if (u->registered != 7)
-       {
-               log(DEFAULT,"*** BUG *** WriteCommon on an unregistered user");
-               return;
-       }
-
-       va_start(argsPtr, text);
-       vsnprintf(textbuffer, MAXBUF, text, argsPtr);
-       va_end(argsPtr);
-
-       // FIX: Stops a message going to the same person more than once
-       memset(&already_sent,0,MAX_DESCRIPTORS);
-
-       for (std::vector<ucrec*>::const_iterator v = u->chans.begin(); v != u->chans.end(); v++)
-       {
-               if (((ucrec*)(*v))->channel)
-               {
-                       CUList *ulist= ((ucrec*)(*v))->channel->GetUsers();
-
-                       for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
-                       {
-                               if ((i->second->fd > -1) && (!already_sent[i->second->fd]))
-                               {
-                                       already_sent[i->second->fd] = 1;
-                                       WriteFrom_NoFormat(i->second->fd,u,textbuffer);
-                                       sent_to_at_least_one = true;
-                               }
-                       }
-               }
-       }
-
-       /*
-        * if the user was not in any channels, no users will receive the text. Make sure the user
-        * receives their OWN message for WriteCommon
-        */
-       if (!sent_to_at_least_one)
-       {
-               WriteFrom_NoFormat(u->fd,u,textbuffer);
-       }
-}
-
-void WriteCommon_NoFormat(userrec *u, const char* text)
-{
-       bool sent_to_at_least_one = false;
-
-       if (!u)
-       {
-               log(DEFAULT,"*** BUG *** WriteCommon was given an invalid parameter");
-               return;
-       }
-
-       if (u->registered != 7)
-       {
-               log(DEFAULT,"*** BUG *** WriteCommon on an unregistered user");
-               return;
-       }
-
-       // FIX: Stops a message going to the same person more than once
-       memset(&already_sent,0,MAX_DESCRIPTORS);
-
-       for (std::vector<ucrec*>::const_iterator v = u->chans.begin(); v != u->chans.end(); v++)
-       {
-               if (((ucrec*)(*v))->channel)
-               {
-                       CUList *ulist= ((ucrec*)(*v))->channel->GetUsers();
-
-                       for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
-                       {
-                               if ((i->second->fd > -1) && (!already_sent[i->second->fd]))
-                               {
-                                       already_sent[i->second->fd] = 1;
-                                       WriteFrom_NoFormat(i->second->fd,u,text);
-                                       sent_to_at_least_one = true;
-                               }
-                       }
-               }
-       }
-
-       /*
-        * if the user was not in any channels, no users will receive the text. Make sure the user
-        * receives their OWN message for WriteCommon
-        */
-       if (!sent_to_at_least_one)
-       {
-               WriteFrom_NoFormat(u->fd,u,text);
-       }
-}
-
-
-/* write a formatted string to all users who share at least one common
- * channel, NOT including the source user e.g. for use in QUIT
- */
-
-void WriteCommonExcept(userrec *u, char* text, ...)
-{
-       char textbuffer[MAXBUF];
-       char oper_quit[MAXBUF];
-       bool quit_munge = false;
-       va_list argsPtr;
-       int total;
-
-       if (!u)
-       {
-               log(DEFAULT,"*** BUG *** WriteCommon was given an invalid parameter");
-               return;
-       }
-
-       if (u->registered != 7)
-       {
-               log(DEFAULT,"*** BUG *** WriteCommon on an unregistered user");
-               return;
-       }
-
-       va_start(argsPtr, text);
-       total = vsnprintf(textbuffer, MAXBUF, text, argsPtr);
-       va_end(argsPtr);
-
-       if ((Config->HideSplits) && (total > 6))
-       {
-               /* Yeah yeah, this is ugly. But its fast, live with it. */
-               char* check = textbuffer;
-
-               if ((*check++ == 'Q') && (*check++ == 'U') && (*check++ == 'I') && (*check++ == 'T') && (*check++ == ' ') && (*check++ == ':'))
-               {
-                       std::stringstream split(check);
-                       std::string server_one;
-                       std::string server_two;
-
-                       split >> server_one;
-                       split >> server_two;
-
-                       if ((FindServerName(server_one)) && (FindServerName(server_two)))
-                       {
-                               strlcpy(oper_quit,textbuffer,MAXQUIT);
-                               strlcpy(check,"*.net *.split",MAXQUIT);
-                               quit_munge = true;
-                       }
-               }
-       }
-
-       if ((Config->HideBans) && (total > 13) && (!quit_munge))
-       {
-               char* check = textbuffer;
-
-               /* XXX - as above */
-               if ((*check++ == 'Q') && (*check++ == 'U') && (*check++ == 'I') && (*check++ == 'T') && (*check++ == ' ') && (*check++ == ':'))
-               {
-                       check++;
-
-                       if ((*check++ == '-') && (*check++ == 'L') && (*check++ == 'i') && (*check++ == 'n') && (*check++ == 'e') && (*check++ == 'd') && (*check++ == ':'))
-                       {
-                               strlcpy(oper_quit,textbuffer,MAXQUIT);
-                               *(--check) = 0;         // We don't need to strlcpy, we just chop it from the :
-                               quit_munge = true;
-                       }
-               }
-       }
-
-       memset(&already_sent,0,MAX_DESCRIPTORS);
-
-       for (std::vector<ucrec*>::const_iterator v = u->chans.begin(); v != u->chans.end(); v++)
-       {
-               if (((ucrec*)(*v))->channel)
-               {
-                       CUList *ulist= ((ucrec*)(*v))->channel->GetUsers();
-
-                       for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
-                       {
-                               if (u != i->second)
-                               {
-                                       if ((i->second->fd > -1) && (!already_sent[i->second->fd]))
-                                       {
-                                               already_sent[i->second->fd] = 1;
-
-                                               if (quit_munge)
-                                               {
-                                                       WriteFrom_NoFormat(i->second->fd,u,*i->second->oper ? oper_quit : textbuffer);
-                                               }
-                                               else
-                                                       WriteFrom_NoFormat(i->second->fd,u,textbuffer);
-                                       }
-                               }
-                       }
-               }
-       }
-}
-
-void WriteCommonExcept_NoFormat(userrec *u, const char* text)
-{
-       if (!u)
-       {
-               log(DEFAULT,"*** BUG *** WriteCommon was given an invalid parameter");
-               return;
-       }
-       if (u->registered != 7)
-       {
-               log(DEFAULT,"*** BUG *** WriteCommon on an unregistered user");
-               return;
-       }
-
-       memset(&already_sent,0,MAX_DESCRIPTORS);
-
-       for (std::vector<ucrec*>::const_iterator v = u->chans.begin(); v != u->chans.end(); v++)
-       {
-               if (((ucrec*)(*v))->channel)
-               {
-                       CUList *ulist= ((ucrec*)(*v))->channel->GetUsers();
-
-                       for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
-                       {
-                               if (u != i->second)
-                               {
-                                       if ((i->second->fd > -1) && (!already_sent[i->second->fd]))
-                                       {
-                                               already_sent[i->second->fd] = 1;
-                                               WriteFrom_NoFormat(i->second->fd,u,text);
-                                       }
-                               }
-                       }
-               }
+               return ServerInstance->Config->ServerDesc;
        }
 }
 
-
 /* XXX - We don't use WriteMode for this because WriteMode is very slow and
  * this isnt. Basically WriteMode has to iterate ALL the users 'n' times for
  * the number of modes provided, e.g. if you send WriteMode 'og' to write to
@@ -966,16 +158,16 @@ void WriteOpers_NoFormat(const char* text)
 
                if (IS_LOCAL(a))
                {
-                       if (a->modebits & UM_SERVERNOTICE)
+                       if (a->modes[UM_SERVERNOTICE])
                        {
                                // send server notices to all with +s
-                               WriteServ(a->fd,"NOTICE %s :%s",a->nick,text);
+                               a->WriteServ("NOTICE %s :%s",a->nick,text);
                        }
                }
        }
 }
 
-void ServerNoticeAll(char* text, ...)
+void InspIRCd::ServerNoticeAll(char* text, ...)
 {
        if (!text)
                return;
@@ -987,16 +179,16 @@ void ServerNoticeAll(char* text, ...)
        vsnprintf(textbuffer, MAXBUF, text, argsPtr);
        va_end(argsPtr);
 
-       snprintf(formatbuffer,MAXBUF,"NOTICE $%s :%s",Config->ServerName,textbuffer);
+       snprintf(formatbuffer,MAXBUF,"NOTICE $%s :%s",ServerInstance->Config->ServerName,textbuffer);
 
        for (std::vector<userrec*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
        {
-               userrec* t = (userrec*)(*i);
-               WriteServ_NoFormat(t->fd,formatbuffer);
+               userrec* t = *i;
+               t->WriteServ(std::string(formatbuffer));
        }
 }
 
-void ServerPrivmsgAll(char* text, ...)
+void InspIRCd::ServerPrivmsgAll(char* text, ...)
 {
        if (!text)
                return;
@@ -1008,16 +200,16 @@ void ServerPrivmsgAll(char* text, ...)
        vsnprintf(textbuffer, MAXBUF, text, argsPtr);
        va_end(argsPtr);
 
-       snprintf(formatbuffer,MAXBUF,"PRIVMSG $%s :%s",Config->ServerName,textbuffer);
+       snprintf(formatbuffer,MAXBUF,"PRIVMSG $%s :%s",ServerInstance->Config->ServerName,textbuffer);
 
        for (std::vector<userrec*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
        {
-               userrec* t = (userrec*)(*i);
-               WriteServ_NoFormat(t->fd,formatbuffer);
+               userrec* t = *i;
+               t->WriteServ(std::string(formatbuffer));
        }
 }
 
-void WriteMode(const char* modes, int flags, const char* text, ...)
+void InspIRCd::WriteMode(const char* modes, int flags, const char* text, ...)
 {
        char textbuffer[MAXBUF];
        int modelen;
@@ -1045,7 +237,7 @@ void WriteMode(const char* modes, int flags, const char* text, ...)
 
                        for (int n = 0; n < modelen; n++)
                        {
-                               if (!hasumode(t,modes[n]))
+                               if (!t->modes[modes[n]-65])
                                {
                                        send_to_user = false;
                                        break;
@@ -1058,7 +250,7 @@ void WriteMode(const char* modes, int flags, const char* text, ...)
 
                        for (int n = 0; n < modelen; n++)
                        {
-                               if (hasumode(t,modes[n]))
+                               if (t->modes[modes[n]-65])
                                {
                                        send_to_user = true;
                                        break;
@@ -1068,62 +260,7 @@ void WriteMode(const char* modes, int flags, const char* text, ...)
 
                if (send_to_user)
                {
-                       WriteServ(t->fd,"NOTICE %s :%s",t->nick,textbuffer);
-               }
-       }
-}
-
-void NoticeAll(userrec *source, bool local_only, char* text, ...)
-{
-       char textbuffer[MAXBUF];
-       char formatbuffer[MAXBUF];
-       va_list argsPtr;
-
-       if ((!text) || (!source))
-       {
-               log(DEFAULT,"*** BUG *** NoticeAll was given an invalid parameter");
-               return;
-       }
-
-       va_start(argsPtr, text);
-       vsnprintf(textbuffer, MAXBUF, text, argsPtr);
-       va_end(argsPtr);
-
-       snprintf(formatbuffer,MAXBUF,"NOTICE $* :%s",textbuffer);
-
-       for (std::vector<userrec*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
-       {
-               userrec* t = (userrec*)(*i);
-               WriteFrom_NoFormat(t->fd,source,formatbuffer);
-       }
-}
-
-
-void WriteWallOps(userrec *source, bool local_only, char* text, ...)
-{
-       char textbuffer[MAXBUF];
-       char formatbuffer[MAXBUF];
-       va_list argsPtr;
-
-       if ((!text) || (!source))
-       {
-               log(DEFAULT,"*** BUG *** WriteOpers was given an invalid parameter");
-               return;
-       }
-
-       va_start(argsPtr, text);
-       vsnprintf(textbuffer, MAXBUF, text, argsPtr);
-       va_end(argsPtr);
-
-       snprintf(formatbuffer,MAXBUF,"WALLOPS :%s",textbuffer);
-
-       for (std::vector<userrec*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
-       {
-               userrec* t = (userrec*)(*i);
-
-               if ((IS_LOCAL(t)) && (t->modebits & UM_WALLOPS))
-               {
-                       WriteTo_NoFormat(source,t,formatbuffer);
+                       t->WriteServ("NOTICE %s :%s",t->nick,textbuffer);
                }
        }
 }
@@ -1150,9 +287,9 @@ void strlower(char *n)
 
 userrec* Find(const std::string &nick)
 {
-       user_hash::iterator iter = clientlist.find(nick);
+       user_hash::iterator iter = ServerInstance->clientlist.find(nick);
 
-       if (iter == clientlist.end())
+       if (iter == ServerInstance->clientlist.end())
                /* Couldn't find it */
                return NULL;
 
@@ -1166,9 +303,9 @@ userrec* Find(const char* nick)
        if (!nick)
                return NULL;
 
-       iter = clientlist.find(nick);
+       iter = ServerInstance->clientlist.find(nick);
        
-       if (iter == clientlist.end())
+       if (iter == ServerInstance->clientlist.end())
                return NULL;
 
        return iter->second;
@@ -1186,9 +323,9 @@ chanrec* FindChan(const char* chan)
                return NULL;
        }
 
-       iter = chanlist.find(chan);
+       iter = ServerInstance->chanlist.find(chan);
 
-       if (iter == chanlist.end())
+       if (iter == ServerInstance->chanlist.end())
                /* Couldn't find it */
                return NULL;
 
@@ -1199,7 +336,7 @@ chanrec* FindChan(const char* chan)
 long GetMaxBans(char* name)
 {
        std::string x;
-       for (std::map<std::string,int>::iterator n = Config->maxbans.begin(); n != Config->maxbans.end(); n++)
+       for (std::map<std::string,int>::iterator n = ServerInstance->Config->maxbans.begin(); n != ServerInstance->Config->maxbans.end(); n++)
        {
                x = n->first;
                if (match(name,x.c_str()))
@@ -1217,13 +354,14 @@ void purge_empty_chans(userrec* u)
        // firstly decrement the count on each channel
        for (std::vector<ucrec*>::iterator f = u->chans.begin(); f != u->chans.end(); f++)
        {
-               if (((ucrec*)(*f))->channel)
+               ucrec* uc = (ucrec*)(*f);
+               if (uc->channel)
                {
-                       if (((ucrec*)(*f))->channel->DelUser(u) == 0)
+                       if (uc->channel->DelUser(u) == 0)
                        {
                                /* No users left in here, mark it for deletion */
-                               to_delete.push_back(((ucrec*)(*f))->channel);
-                               ((ucrec*)(*f))->channel = NULL;
+                               to_delete.push_back(uc->channel);
+                               uc->channel = NULL;
                        }
                }
        }
@@ -1233,17 +371,16 @@ void purge_empty_chans(userrec* u)
        for (std::vector<chanrec*>::iterator n = to_delete.begin(); n != to_delete.end(); n++)
        {
                chanrec* thischan = (chanrec*)*n;
-               chan_hash::iterator i2 = chanlist.find(thischan->name);
-               if (i2 != chanlist.end())
+               chan_hash::iterator i2 = ServerInstance->chanlist.find(thischan->name);
+               if (i2 != ServerInstance->chanlist.end())
                {
                        FOREACH_MOD(I_OnChannelDelete,OnChannelDelete(i2->second));
                        DELETE(i2->second);
-                       chanlist.erase(i2);
+                       ServerInstance->chanlist.erase(i2);
                }
        }
 
-       if (*u->oper)
-               DeleteOper(u);
+       u->UnOper();
 }
 
 
@@ -1334,7 +471,7 @@ void userlist(userrec *user,chanrec *c)
 
        for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
        {
-               if ((!has_user) && (i->second->modebits & UM_INVISIBLE))
+               if ((!has_user) && (i->second->modes[UM_INVISIBLE]))
                {
                        /*
                         * user is +i, and source not on the channel, does not show
@@ -1353,7 +490,7 @@ void userlist(userrec *user,chanrec *c)
                if (curlen > (480-NICKMAX))
                {
                        /* list overflowed into multiple numerics */
-                       WriteServ_NoFormat(user->fd,list);
+                       user->WriteServ(list);
 
                        /* reset our lengths */
                        dlen = curlen = snprintf(list,MAXBUF,"353 %s = %s :", user->nick, c->name);
@@ -1367,7 +504,7 @@ void userlist(userrec *user,chanrec *c)
        /* if whats left in the list isnt empty, send it */
        if (numusers)
        {
-               WriteServ_NoFormat(user->fd,list);
+               user->WriteServ(list);
        }
 }
 
@@ -1385,19 +522,13 @@ int usercount_i(chanrec *c)
        CUList *ulist= c->GetUsers();
        for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
        {
-               if (!(i->second->modebits & UM_INVISIBLE))
+               if (!(i->second->modes[UM_INVISIBLE]))
                        count++;
        }
 
        return count;
 }
 
-int usercount(chanrec *c)
-{
-       return (c ? c->GetUserCounter() : 0);
-}
-
-
 /* looks up a users password for their connection class (<ALLOW>/<DENY> tags)
  * NOTE: If the <ALLOW> or <DENY> tag specifies an ip, and this user resolves,
  * then their ip will be taken as 'priority' anyway, so for example,
@@ -1405,36 +536,34 @@ int usercount(chanrec *c)
  */
 ConnectClass GetClass(userrec *user)
 {
-       for (ClassVector::iterator i = Config->Classes.begin(); i != Config->Classes.end(); i++)
+       for (ClassVector::iterator i = ServerInstance->Config->Classes.begin(); i != ServerInstance->Config->Classes.end(); i++)
        {
-               if ((match(inet_ntoa(user->ip4),i->host.c_str())) || (match(user->host,i->host.c_str())))
+               if ((match(user->GetIPString(),i->host.c_str(),true)) || (match(user->host,i->host.c_str())))
                {
                        return *i;
                }
        }
 
-       return *(Config->Classes.begin());
+       return *(ServerInstance->Config->Classes.begin());
 }
 
 /*
  * sends out an error notice to all connected clients (not to be used
  * lightly!)
  */
-void send_error(char *s)
+void InspIRCd::SendError(const char *s)
 {
-       log(DEBUG,"send_error: %s",s);
-
-       for (std::vector<userrec*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
+       for (std::vector<userrec*>::const_iterator i = this->local_users.begin(); i != this->local_users.end(); i++)
        {
                userrec* t = (userrec*)(*i);
-               if (t->registered == 7)
+               if (t->registered == REG_ALL)
                {
-                       WriteServ(t->fd,"NOTICE %s :%s",t->nick,s);
+                       t->WriteServ("NOTICE %s :%s",t->nick,s);
                }
                else
                {
                        // fix - unregistered connections receive ERROR, not NOTICE
-                       Write(t->fd,"ERROR :%s",s);
+                       t->Write("ERROR :%s",s);
                }
        }
 }
@@ -1465,7 +594,7 @@ void Error(int status)
 #else
        log(DEFAULT,"You do not have execinfo.h so i could not backtrace -- on FreeBSD, please install the libexecinfo port.");
 #endif
-       send_error("Somebody screwed up... Whoops. IRC Server terminating.");
+       ServerInstance->SendError("Somebody screwed up... Whoops. IRC Server terminating.");
        signal(SIGSEGV, SIG_DFL);
        if (raise(SIGSEGV) == -1)
        {
@@ -1475,38 +604,37 @@ void Error(int status)
 }
 
 // this function counts all users connected, wether they are registered or NOT.
-int usercnt(void)
+int InspIRCd::usercnt()
 {
        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 InspIRCd::registered_usercount()
 {
        int c = 0;
 
        for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
        {
-               if (i->second->registered == 7) c++;
+               c += (i->second->registered == REG_ALL);
        }
 
        return c;
 }
 
-int usercount_invisible(void)
+int InspIRCd::usercount_invisible()
 {
        int c = 0;
 
        for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
        {
-               if ((i->second->registered == 7) && (i->second->modebits & UM_INVISIBLE))
-                       c++;
+               c += ((i->second->registered == REG_ALL) && (i->second->modes[UM_INVISIBLE]));
        }
 
        return c;
 }
 
-int usercount_opers(void)
+int InspIRCd::usercount_opers()
 {
        int c = 0;
 
@@ -1518,33 +646,33 @@ int usercount_opers(void)
        return c;
 }
 
-int usercount_unknown(void)
+int InspIRCd::usercount_unknown()
 {
        int c = 0;
 
        for (std::vector<userrec*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
        {
                userrec* t = (userrec*)(*i);
-               if (t->registered != 7)
+               if (t->registered != REG_ALL)
                        c++;
        }
 
        return c;
 }
 
-long chancount(void)
+long InspIRCd::chancount()
 {
        return chanlist.size();
 }
 
-long local_count()
+long InspIRCd::local_count()
 {
        int c = 0;
 
        for (std::vector<userrec*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
        {
                userrec* t = (userrec*)(*i);
-               if (t->registered == 7)
+               if (t->registered == REG_ALL)
                        c++;
        }
 
@@ -1553,59 +681,32 @@ long local_count()
 
 void ShowMOTD(userrec *user)
 {
-       static char mbuf[MAXBUF];
-       static char crud[MAXBUF];
-       std::string WholeMOTD = "";
-
-       if (!Config->MOTD.size())
+       if (!ServerInstance->Config->MOTD.size())
        {
-               WriteServ(user->fd,"422 %s :Message of the day file is missing.",user->nick);
+               user->WriteServ("422 %s :Message of the day file is missing.",user->nick);
                return;
        }
+       user->WriteServ("375 %s :%s message of the day", user->nick, ServerInstance->Config->ServerName);
 
-       snprintf(crud,MAXBUF,":%s 372 %s :- ", Config->ServerName, user->nick);
-       snprintf(mbuf,MAXBUF,":%s 375 %s :- %s message of the day\r\n", Config->ServerName, user->nick, Config->ServerName);
-       WholeMOTD = WholeMOTD + mbuf;
-
-       for (unsigned int i = 0; i < Config->MOTD.size(); i++)
-               WholeMOTD = WholeMOTD + std::string(crud) + Config->MOTD[i].c_str() + std::string("\r\n");
-
-       snprintf(mbuf,MAXBUF,":%s 376 %s :End of message of the day.\r\n", Config->ServerName, user->nick);
-       WholeMOTD = WholeMOTD + mbuf;
-
-       // only one write operation
-       if (Config->GetIOHook(user->port))
-       {
-               try
-               {
-                       Config->GetIOHook(user->port)->OnRawSocketWrite(user->fd,(char*)WholeMOTD.c_str(),WholeMOTD.length());
-               }
-               catch (ModuleException& modexcept)
-               {
-                       log(DEBUG,"Module exception caught: %s",modexcept.GetReason());
-               }
-       }
-       else
-       {
-               user->AddWriteBuf(WholeMOTD);
-       }
+       for (unsigned int i = 0; i < ServerInstance->Config->MOTD.size(); i++)
+               user->WriteServ("372 %s :- %s",user->nick,ServerInstance->Config->MOTD[i].c_str());
 
-       ServerInstance->stats->statsSent += WholeMOTD.length();
+       user->WriteServ("376 %s :End of message of the day.", user->nick);
 }
 
 void ShowRULES(userrec *user)
 {
-       if (!Config->RULES.size())
+       if (!ServerInstance->Config->RULES.size())
        {
-               WriteServ(user->fd,"NOTICE %s :Rules file is missing.",user->nick);
+               user->WriteServ("NOTICE %s :Rules file is missing.",user->nick);
                return;
        }
-       WriteServ(user->fd,"NOTICE %s :%s rules",user->nick,Config->ServerName);
+       user->WriteServ("NOTICE %s :%s rules",user->nick,ServerInstance->Config->ServerName);
 
-       for (unsigned int i = 0; i < Config->RULES.size(); i++)
-               WriteServ(user->fd,"NOTICE %s :%s",user->nick,Config->RULES[i].c_str());
+       for (unsigned int i = 0; i < ServerInstance->Config->RULES.size(); i++)
+               user->WriteServ("NOTICE %s :%s",user->nick,ServerInstance->Config->RULES[i].c_str());
 
-       WriteServ(user->fd,"NOTICE %s :End of %s rules.",user->nick,Config->ServerName);
+       user->WriteServ("NOTICE %s :End of %s rules.",user->nick,ServerInstance->Config->ServerName);
 }
 
 // this returns 1 when all modules are satisfied that the user should be allowed onto the irc server
@@ -1613,12 +714,12 @@ void ShowRULES(userrec *user)
 // registration timeout maximum seconds)
 bool AllModulesReportReady(userrec* user)
 {
-       if (!Config->global_implementation[I_OnCheckReady])
+       if (!ServerInstance->Config->global_implementation[I_OnCheckReady])
                return true;
 
        for (int i = 0; i <= MODCOUNT; i++)
        {
-               if (Config->implement_lists[i][I_OnCheckReady])
+               if (ServerInstance->Config->implement_lists[i][I_OnCheckReady])
                {
                        int res = modules[i]->OnCheckReady(user);
                        if (!res)
@@ -1841,29 +942,29 @@ void OpenLog(char** argv, int argc)
 {
        if (!*LOG_FILE)
        {
-               if (Config->logpath == "")
+               if (ServerInstance->Config->logpath == "")
                {
-                       Config->logpath = GetFullProgDir(argv,argc) + "/ircd.log";
+                       ServerInstance->Config->logpath = GetFullProgDir(argv,argc) + "/ircd.log";
                }
        }
        else
        {
-               Config->log_file = fopen(LOG_FILE,"a+");
+               ServerInstance->Config->log_file = fopen(LOG_FILE,"a+");
 
-               if (!Config->log_file)
+               if (!ServerInstance->Config->log_file)
                {
-                       printf("ERROR: Could not write to logfile %s, bailing!\n\n",Config->logpath.c_str());
+                       printf("ERROR: Could not write to logfile %s, bailing!\n\n",ServerInstance->Config->logpath.c_str());
                        Exit(ERROR);
                }
                
                return;
        }
 
-       Config->log_file = fopen(Config->logpath.c_str(),"a+");
+       ServerInstance->Config->log_file = fopen(ServerInstance->Config->logpath.c_str(),"a+");
 
-       if (!Config->log_file)
+       if (!ServerInstance->Config->log_file)
        {
-               printf("ERROR: Could not write to logfile %s, bailing!\n\n",Config->logpath.c_str());
+               printf("ERROR: Could not write to logfile %s, bailing!\n\n",ServerInstance->Config->logpath.c_str());
                Exit(ERROR);
        }
 }
@@ -1880,10 +981,10 @@ void CheckRoot()
 
 void CheckDie()
 {
-       if (*Config->DieValue)
+       if (*ServerInstance->Config->DieValue)
        {
-               printf("WARNING: %s\n\n",Config->DieValue);
-               log(DEFAULT,"Uh-Oh, somebody didn't read their config file: '%s'",Config->DieValue);
+               printf("WARNING: %s\n\n",ServerInstance->Config->DieValue);
+               log(DEFAULT,"Uh-Oh, somebody didn't read their config file: '%s'",ServerInstance->Config->DieValue);
                Exit(ERROR);
        }
 }
@@ -1892,15 +993,15 @@ void CheckDie()
 void LoadAllModules(InspIRCd* ServerInstance)
 {
        char configToken[MAXBUF];
-       Config->module_names.clear();
+       ServerInstance->Config->module_names.clear();
        MODCOUNT = -1;
 
-       for (int count = 0; count < Config->ConfValueEnum(Config->config_data, "module"); count++)
+       for (int count = 0; count < ServerInstance->Config->ConfValueEnum(ServerInstance->Config->config_data, "module"); count++)
        {
-               Config->ConfValue(Config->config_data, "module","name",count,configToken,MAXBUF);
+               ServerInstance->Config->ConfValue(ServerInstance->Config->config_data, "module","name",count,configToken,MAXBUF);
                printf("[\033[1;32m*\033[0m] Loading module:\t\033[1;32m%s\033[0m\n",configToken);
                
-               if (!ServerInstance->LoadModule(configToken))                
+               if (!ServerInstance->LoadModule(configToken))           
                {
                        log(DEFAULT,"Exiting due to a module loader error.");
                        printf("\nThere was an error loading a module: %s\n\n",ServerInstance->ModuleError());