]> 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 068f83bd3bcfca2baf36a7f8af71378b37ceabc4..1f2a6646b5ea838ef952f77feaa25dad8656ab50 100644 (file)
@@ -2,38 +2,31 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *                <Craig@chatspike.net>
+ *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
+ *                    E-mail:
+ *             <brain@chatspike.net>
+ *             <Craig@chatspike.net>
  *
  * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ *         the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
+#include <stdarg.h>
 #include "inspircd_config.h"
-#include "inspircd.h"
-#include "inspircd_io.h"
-#include "inspircd_util.h"
+#include "configreader.h"
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/errno.h>
+#include <signal.h>
 #include <time.h>
 #include <string>
-#ifdef GCC3
-#include <ext/hash_map>
-#else
-#include <hash_map>
-#endif
 #include <sstream>
-#include <vector>
-#include <deque>
-#include <stdarg.h>
+#ifdef HAS_EXECINFO
+#include <execinfo.h>
+#endif
 #include "connection.h"
 #include "users.h"
 #include "ctables.h"
@@ -48,686 +41,228 @@ using namespace std;
 #include "inspstring.h"
 #include "helperfuncs.h"
 #include "hashcomp.h"
+#include "typedefs.h"
+#include "inspircd.h"
 
 extern int MODCOUNT;
-extern std::vector<Module*> modules;
-
+extern ModuleList modules;
+extern InspIRCd* ServerInstance;
 extern time_t TIME;
-extern bool nofork;
 extern char lowermap[255];
-extern char ServerName[MAXBUF];
-extern char Network[MAXBUF];
-extern char ServerDesc[MAXBUF];
-extern char list[MAXBUF];
-
-extern int debugging;
-extern int LogLevel;
-
-extern std::stringstream config_f;
-
-
-
-extern FILE *log_file;
-extern userrec* fd_ref_table[65536];
-
-extern int statsAccept, statsRefused, statsUnknown, statsCollisions, statsDns, statsDnsGood, statsDnsBad, statsConnects, statsSent, statsRecv;
-
-static char already_sent[65536];
 extern std::vector<userrec*> all_opers;
 
-extern ClassVector Classes;
-
-typedef nspace::hash_map<std::string, userrec*, nspace::hash<string>, irc::StrHashComp> user_hash;
-typedef nspace::hash_map<std::string, chanrec*, nspace::hash<string>, irc::StrHashComp> chan_hash;
-typedef std::deque<command_t> command_table;
+char LOG_FILE[MAXBUF];
 
-extern user_hash clientlist;
-extern chan_hash chanlist;
-extern command_table cmdlist;
-extern file_cache MOTD;
-extern file_cache RULES;
-
-void log(int level,char *text, ...)
-{
-        char textbuffer[MAXBUF];
-        va_list argsPtr;
-        time_t rawtime;
-        struct tm * timeinfo;
-        if (level < LogLevel)
-                return;
-
-        time(&rawtime);
-        timeinfo = localtime (&rawtime);
-
-        if (log_file)
-        {
-                char b[MAXBUF];
-                va_start (argsPtr, text);
-                vsnprintf(textbuffer, MAXBUF, text, argsPtr);
-                va_end(argsPtr);
-                strlcpy(b,asctime(timeinfo),MAXBUF);
-                b[24] = ':';    // we know this is the end of the time string
-                fprintf(log_file,"%s %s\n",b,textbuffer);
-                if (nofork)
-                {
-                        // nofork enabled? display it on terminal too
-                        printf("%s %s\n",b,textbuffer);
-                }
-        }
-}
-
-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[0] == 0)
-                        {
-                                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());
-}
+static char TIMESTR[26];
+static time_t LAST = 0;
 
-void Write(int sock,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, ...)
 {
-        if (sock < 0)
-                return;
-        if (!text)
-        {
-                log(DEFAULT,"*** BUG *** Write was given an invalid parameter");
-                return;
-        }
-        char textbuffer[MAXBUF];
-        va_list argsPtr;
-        char tb[MAXBUF];
-
-        va_start (argsPtr, text);
-        vsnprintf(textbuffer, MAXBUF, text, argsPtr);
-        va_end(argsPtr);
-        int bytes = snprintf(tb,MAXBUF,"%s\r\n",textbuffer);
-        chop(tb);
-        if (fd_ref_table[sock])
-        {
-                int MOD_RESULT = 0;
-                FOREACH_RESULT(OnRawSocketWrite(sock,tb,bytes));
-                fd_ref_table[sock]->AddWriteBuf(tb);
-                statsSent += bytes;
-        }
-        else log(DEFAULT,"ERROR! attempted write to a user with no fd_ref_table entry!!!");
-}
+       va_list argsPtr;
+       char textbuffer[MAXBUF];
 
-/* write a server formatted numeric response to a single socket */
+       va_start(argsPtr, text);
+       vsnprintf(textbuffer, MAXBUF, text, argsPtr);
+       va_end(argsPtr);
 
-void WriteServ(int sock, char* text, ...)
-{
-        if (sock < 0)
-                return;
-        if (!text)
-        {
-                log(DEFAULT,"*** BUG *** WriteServ was given an invalid parameter");
-                return;
-        }
-        char textbuffer[MAXBUF],tb[MAXBUF];
-        va_list argsPtr;
-        va_start (argsPtr, text);
-
-        vsnprintf(textbuffer, MAXBUF, text, argsPtr);
-        va_end(argsPtr);
-        int bytes = snprintf(tb,MAXBUF,":%s %s\r\n",ServerName,textbuffer);
-        chop(tb);
-        if (fd_ref_table[sock])
-        {
-                int MOD_RESULT = 0;
-                FOREACH_RESULT(OnRawSocketWrite(sock,tb,bytes));
-                fd_ref_table[sock]->AddWriteBuf(tb);
-                statsSent += bytes;
-        }
-        else log(DEFAULT,"ERROR! attempted write to a user with no fd_ref_table entry!!!");
+       InspIRCd::Log(level, std::string(textbuffer));
 }
 
-/* write text from an originating user to originating user */
-
-void WriteFrom(int sock, userrec *user,char* text, ...)
+void InspIRCd::Log(int level, const std::string &text)
 {
-        if (sock < 0)
-                return;
-        if ((!text) || (!user))
-        {
-                log(DEFAULT,"*** BUG *** WriteFrom was given an invalid parameter");
-                return;
-        }
-        char textbuffer[MAXBUF],tb[MAXBUF];
-        va_list argsPtr;
-        va_start (argsPtr, text);
-
-        vsnprintf(textbuffer, MAXBUF, text, argsPtr);
-        va_end(argsPtr);
-        int bytes = snprintf(tb,MAXBUF,":%s!%s@%s %s\r\n",user->nick,user->ident,user->dhost,textbuffer);
-        chop(tb);
-        if (fd_ref_table[sock])
-        {
-                int MOD_RESULT = 0;
-                FOREACH_RESULT(OnRawSocketWrite(sock,tb,bytes));
-                fd_ref_table[sock]->AddWriteBuf(tb);
-                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) */
+       if (!ServerInstance || !ServerInstance->Config)
+               return;
 
-void WriteTo(userrec *source, userrec *dest,char *data, ...)
-{
-        if ((!dest) || (!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);
-        vsnprintf(textbuffer, MAXBUF, data, argsPtr);
-        va_end(argsPtr);
-        chop(tb);
-
-        // if no source given send it from the server.
-        if (!source)
-        {
-                WriteServ(dest->fd,":%s %s",ServerName,textbuffer);
-        }
-        else
-        {
-                WriteFrom(dest->fd,source,"%s",textbuffer);
-        }
-}
+       /* If we were given -debug we output all messages, regardless of configured loglevel */
+       if ((level < ServerInstance->Config->LogLevel) && !ServerInstance->Config->forcedebug)
+               return;
 
-/* write formatted text from a source user to all users on a channel
- * including the sender (NOT for privmsg, notice etc!) */
+       if (TIME != LAST)
+       {
+               struct tm *timeinfo = localtime(&TIME);
 
-void WriteChannel(chanrec* Ptr, userrec* user, char* text, ...)
-{
-        if ((!Ptr) || (!user) || (!text))
-        {
-                log(DEFAULT,"*** BUG *** WriteChannel was given an invalid parameter");
-                return;
-        }
-        char textbuffer[MAXBUF];
-        va_list argsPtr;
-        va_start (argsPtr, text);
-        vsnprintf(textbuffer, MAXBUF, text, argsPtr);
-        va_end(argsPtr);
-
-        std::vector<char*> *ulist = Ptr->GetUsers();
-        for (unsigned int j = 0; j < ulist->size(); j++)
-        {
-                char* o = (*ulist)[j];
-                userrec* otheruser = (userrec*)o;
-                if (otheruser->fd != FD_MAGIC_NUMBER)
-                        WriteTo(user,otheruser,"%s",textbuffer);
-        }
-}
+               strlcpy(TIMESTR,asctime(timeinfo),26);
+               TIMESTR[24] = ':';
+               LAST = TIME;
+       }
 
-/* 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 */
+       if (ServerInstance->Config->log_file && ServerInstance->Config->writelog)
+       {
+               fprintf(ServerInstance->Config->log_file,"%s %s\n",TIMESTR,text.c_str());
+               fflush(ServerInstance->Config->log_file);
+       }
 
-void WriteChannelLocal(chanrec* Ptr, userrec* user, char* text, ...)
-{
-        if ((!Ptr) || (!text))
-        {
-                log(DEFAULT,"*** BUG *** WriteChannel was given an invalid parameter");
-                return;
-        }
-        char textbuffer[MAXBUF];
-        va_list argsPtr;
-        va_start (argsPtr, text);
-        vsnprintf(textbuffer, MAXBUF, text, argsPtr);
-        va_end(argsPtr);
-
-        std::vector<char*> *ulist = Ptr->GetUsers();
-        for (unsigned int j = 0; j < ulist->size(); j++)
-        {
-                char* o = (*ulist)[j];
-                userrec* otheruser = (userrec*)o;
-                if ((otheruser->fd != FD_MAGIC_NUMBER) && (otheruser->fd != -1) && (otheruser != user))
-                {
-                        if (!user)
-                        {
-                                WriteServ(otheruser->fd,"%s",textbuffer);
-                        }
-                        else
-                        {
-                                WriteTo(user,otheruser,"%s",textbuffer);
-                        }
-                }
-        }
+       if (ServerInstance->Config->nofork)
+       {
+               printf("%s %s\n", TIMESTR, text.c_str());
+       }
 }
 
-void WriteChannelWithServ(char* ServName, chanrec* Ptr, char* text, ...)
+std::string GetServerDescription(const char* servername)
 {
-        if ((!Ptr) || (!text))
-        {
-                log(DEFAULT,"*** BUG *** WriteChannelWithServ was given an invalid parameter");
-                return;
-        }
-        char textbuffer[MAXBUF];
-        va_list argsPtr;
-        va_start (argsPtr, text);
-        vsnprintf(textbuffer, MAXBUF, text, argsPtr);
-        va_end(argsPtr);
-
-
-        std::vector<char*> *ulist = Ptr->GetUsers();
-        for (unsigned int j = 0; j < ulist->size(); j++)
-        {
-                char* o = (*ulist)[j];
-                userrec* otheruser = (userrec*)o;
-                if (otheruser->fd != FD_MAGIC_NUMBER)
-                        WriteServ(otheruser->fd,"%s",textbuffer);
-        }
-}
+       std::string description = "";
 
-/* write formatted text from a source user to all users on a channel except
- * for the sender (for privmsg etc) */
+       FOREACH_MOD(I_OnGetServerDescription,OnGetServerDescription(servername,description));
 
-void ChanExceptSender(chanrec* Ptr, userrec* user, char* text, ...)
-{
-        if ((!Ptr) || (!user) || (!text))
-        {
-                log(DEFAULT,"*** BUG *** ChanExceptSender was given an invalid parameter");
-                return;
-        }
-        char textbuffer[MAXBUF];
-        va_list argsPtr;
-        va_start (argsPtr, text);
-        vsnprintf(textbuffer, MAXBUF, text, argsPtr);
-        va_end(argsPtr);
-
-        std::vector<char*> *ulist = Ptr->GetUsers();
-        for (unsigned int j = 0; j < ulist->size(); j++)
-        {
-                char* o = (*ulist)[j];
-                userrec* otheruser = (userrec*)o;
-                if ((otheruser->fd != FD_MAGIC_NUMBER) && (user != otheruser))
-                        WriteFrom(otheruser->fd,user,"%s",textbuffer);
-        }
-}
-
-std::string GetServerDescription(char* servername)
-{
-       std::string description = "";
-       FOREACH_MOD OnGetServerDescription(servername,description);
        if (description != "")
        {
                return description;
        }
        else
        {
-               return ServerDesc; // not a remote server that can be found, it must be me.
+               // not a remote server that can be found, it must be me.
+               return ServerInstance->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, ...)
+/* 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
+ * opers with globops, and you have 2000 users, thats 4000 iterations. WriteOpers
+ * uses the oper list, which means if you have 2000 users but only 5 opers,
+ * it iterates 5 times.
+ */
+void WriteOpers(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;
-        }
-
-        char textbuffer[MAXBUF];
-        va_list argsPtr;
-        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,65536);
-
-        bool sent_to_at_least_one = false;
-
-        for (int i = 0; i < MAXCHANS; i++)
-        {
-                if (u->chans[i].channel)
-                {
-                        std::vector<char*> *ulist = u->chans[i].channel->GetUsers();
-                        for (unsigned int j = 0; j < ulist->size(); j++)
-                        {
-                                char* o = (*ulist)[j];
-                                userrec* otheruser = (userrec*)o;
-                                if ((otheruser->fd > 0) && (!already_sent[otheruser->fd]))
-                                {
-                                        already_sent[otheruser->fd] = 1;
-                                        WriteFrom(otheruser->fd,u,"%s",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(u->fd,u,"%s",textbuffer);
-        }
-}
+       char textbuffer[MAXBUF];
+       va_list argsPtr;
 
-/* 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 */
+       if (!text)
+       {
+               log(DEFAULT,"*** BUG *** WriteOpers was given an invalid parameter");
+               return;
+       }
 
-void WriteCommonExcept(userrec *u, 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;
-        }
-
-        char textbuffer[MAXBUF];
-        va_list argsPtr;
-        va_start (argsPtr, text);
-        vsnprintf(textbuffer, MAXBUF, text, argsPtr);
-        va_end(argsPtr);
-
-        memset(&already_sent,0,65536);
-
-        for (int i = 0; i < MAXCHANS; i++)
-        {
-                if (u->chans[i].channel)
-                {
-                        std::vector<char*> *ulist = u->chans[i].channel->GetUsers();
-                        for (unsigned int j = 0; j < ulist->size(); j++)
-                        {
-                                char* o = (*ulist)[j];
-                                userrec* otheruser = (userrec*)o;
-                                if (u != otheruser)
-                                {
-                                        if ((otheruser->fd > 0) && (!already_sent[otheruser->fd]))
-                                        {
-                                                already_sent[otheruser->fd] = 1;
-                                                WriteFrom(otheruser->fd,u,"%s",textbuffer);
-                                        }
-                                }
-                        }
-                }
-        }
+       va_start(argsPtr, text);
+       vsnprintf(textbuffer, MAXBUF, text, argsPtr);
+       va_end(argsPtr);
+
+       WriteOpers_NoFormat(textbuffer);
 }
 
-void WriteOpers(char* text, ...)
+void WriteOpers_NoFormat(const char* text)
 {
-        if (!text)
-        {
-                log(DEFAULT,"*** BUG *** WriteOpers was given an invalid parameter");
-                return;
-        }
-
-        char textbuffer[MAXBUF];
-        va_list argsPtr;
-        va_start (argsPtr, text);
-        vsnprintf(textbuffer, MAXBUF, text, argsPtr);
-        va_end(argsPtr);
-
-        for (std::vector<userrec*>::iterator i = all_opers.begin(); i != all_opers.end(); i++)
-        {
-                userrec* a = *i;
-                if ((a) && (a->fd != FD_MAGIC_NUMBER))
-                {
-                        if (strchr(a->modes,'s'))
-                        {
-                                // send server notices to all with +s
-                                WriteServ(a->fd,"NOTICE %s :%s",a->nick,textbuffer);
-                        }
-                }
-        }
+       if (!text)
+       {
+               log(DEFAULT,"*** BUG *** WriteOpers_NoFormat was given an invalid parameter");
+               return;
+       }
+
+       for (std::vector<userrec*>::iterator i = all_opers.begin(); i != all_opers.end(); i++)
+       {
+               userrec* a = *i;
+
+               if (IS_LOCAL(a))
+               {
+                       if (a->modes[UM_SERVERNOTICE])
+                       {
+                               // send server notices to all with +s
+                               a->WriteServ("NOTICE %s :%s",a->nick,text);
+                       }
+               }
+       }
 }
 
-void ServerNoticeAll(char* text, ...)
+void InspIRCd::ServerNoticeAll(char* text, ...)
 {
        if (!text)
                return;
 
        char textbuffer[MAXBUF];
+       char formatbuffer[MAXBUF];
        va_list argsPtr;
        va_start (argsPtr, text);
        vsnprintf(textbuffer, MAXBUF, text, argsPtr);
        va_end(argsPtr);
 
-       for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
+       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++)
        {
-               if ((i->second) && (i->second->fd != FD_MAGIC_NUMBER))
-               {
-                       WriteServ(i->second->fd,"NOTICE $%s :%s",ServerName,textbuffer);
-               }
+               userrec* t = *i;
+               t->WriteServ(std::string(formatbuffer));
        }
 }
 
-void ServerPrivmsgAll(char* text, ...)
+void InspIRCd::ServerPrivmsgAll(char* text, ...)
 {
        if (!text)
                return;
 
        char textbuffer[MAXBUF];
+       char formatbuffer[MAXBUF];
        va_list argsPtr;
        va_start (argsPtr, text);
        vsnprintf(textbuffer, MAXBUF, text, argsPtr);
        va_end(argsPtr);
 
-       for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
+       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++)
        {
-               if ((i->second) && (i->second->fd != FD_MAGIC_NUMBER))
-               {
-                       WriteServ(i->second->fd,"PRIVMSG $%s :%s",ServerName,textbuffer);
-               }
+               userrec* t = *i;
+               t->WriteServ(std::string(formatbuffer));
        }
 }
 
-void NoticeAllOpers(userrec *source, bool local_only, char* text, ...)
-{
-        if ((!text) || (!source))
-        {
-                log(DEFAULT,"*** BUG *** NoticeAllOpers was given an invalid parameter");
-                return;
-        }
-
-        char textbuffer[MAXBUF];
-        va_list argsPtr;
-        va_start (argsPtr, text);
-        vsnprintf(textbuffer, MAXBUF, text, argsPtr);
-        va_end(argsPtr);
-
-        for (std::vector<userrec*>::iterator i = all_opers.begin(); i != all_opers.end(); i++)
-        {
-                userrec* a = *i;
-                if ((a) && (a->fd != FD_MAGIC_NUMBER))
-                {
-                        if (strchr(a->modes,'s'))
-                        {
-                                // send server notices to all with +s
-                                WriteServ(a->fd,"NOTICE %s :*** Notice From %s: %s",a->nick,source->nick,textbuffer);
-                        }
-                }
-        }
-
-}
-// returns TRUE of any users on channel C occupy server 'servername'.
-
-bool ChanAnyOnThisServer(chanrec *c,char* servername)
+void InspIRCd::WriteMode(const char* modes, int flags, const char* text, ...)
 {
-        log(DEBUG,"ChanAnyOnThisServer");
-
-        std::vector<char*> *ulist = c->GetUsers();
-        for (unsigned int j = 0; j < ulist->size(); j++)
-        {
-                char* o = (*ulist)[j];
-                userrec* user = (userrec*)o;
-                if (!strcasecmp(user->server,servername))
-                        return true;
-        }
-        return false;
-}
-
-// returns true if user 'u' shares any common channels with any users on server 'servername'
-
-bool CommonOnThisServer(userrec* u,const char* servername)
-{
-        log(DEBUG,"ChanAnyOnThisServer");
-
-        for (int i = 0; i < MAXCHANS; i++)
-        {
-                if (u->chans[i].channel)
-                {
-                        std::vector<char*> *ulist = u->chans[i].channel->GetUsers();
-                        for (unsigned int j = 0; j < ulist->size(); j++)
-                        {
-                                char* o = (*ulist)[j];
-                                userrec* user = (userrec*)o;
-                                if (!strcasecmp(user->server,servername))
-                                        return true;
-                        }
-                }
-        }
-        return false;
-}
-
+       char textbuffer[MAXBUF];
+       int modelen;
+       va_list argsPtr;
 
-void WriteMode(const char* modes, int flags, const char* text, ...)
-{
-        if ((!text) || (!modes) || (!flags))
-        {
-                log(DEFAULT,"*** BUG *** WriteMode was given an invalid parameter");
-                return;
-        }
-
-        char textbuffer[MAXBUF];
-        va_list argsPtr;
-        va_start (argsPtr, text);
-        vsnprintf(textbuffer, MAXBUF, text, argsPtr);
-        va_end(argsPtr);
-        int modelen = strlen(modes);
-
-        for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
-        {
-                if ((i->second) && (i->second->fd != FD_MAGIC_NUMBER))
-                {
-                        bool send_to_user = false;
-
-                        if (flags == WM_AND)
-                        {
-                                send_to_user = true;
-                                for (int n = 0; n < modelen; n++)
-                                {
-                                        if (!hasumode(i->second,modes[n]))
-                                        {
-                                                send_to_user = false;
-                                                break;
-                                        }
-                                }
-                        }
-                        else if (flags == WM_OR)
-                        {
-                                send_to_user = false;
-                                for (int n = 0; n < modelen; n++)
-                                {
-                                        if (hasumode(i->second,modes[n]))
-                                        {
-                                                send_to_user = true;
-                                                break;
-                                        }
-                                }
-                        }
-
-                        if (send_to_user)
-                        {
-                                WriteServ(i->second->fd,"NOTICE %s :%s",i->second->nick,textbuffer);
-                        }
-                }
-        }
-}
+       if ((!text) || (!modes) || (!flags))
+       {
+               log(DEFAULT,"*** BUG *** WriteMode was given an invalid parameter");
+               return;
+       }
 
-void NoticeAll(userrec *source, bool local_only, char* text, ...)
-{
-        if ((!text) || (!source))
-        {
-                log(DEFAULT,"*** BUG *** NoticeAll was given an invalid parameter");
-                return;
-        }
-
-        char textbuffer[MAXBUF];
-        va_list argsPtr;
-        va_start (argsPtr, text);
-        vsnprintf(textbuffer, MAXBUF, text, argsPtr);
-        va_end(argsPtr);
-
-        for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
-        {
-                if ((i->second) && (i->second->fd != FD_MAGIC_NUMBER))
-                {
-                        WriteFrom(i->second->fd,source,"NOTICE $* :%s",textbuffer);
-                }
-        }
+       va_start(argsPtr, text);
+       vsnprintf(textbuffer, MAXBUF, text, argsPtr);
+       va_end(argsPtr);
+       modelen = strlen(modes);
 
-}
+       for (std::vector<userrec*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
+       {
+               userrec* t = (userrec*)(*i);
+               bool send_to_user = false;
 
+               if (flags == WM_AND)
+               {
+                       send_to_user = true;
+
+                       for (int n = 0; n < modelen; n++)
+                       {
+                               if (!t->modes[modes[n]-65])
+                               {
+                                       send_to_user = false;
+                                       break;
+                               }
+                       }
+               }
+               else if (flags == WM_OR)
+               {
+                       send_to_user = false;
+
+                       for (int n = 0; n < modelen; n++)
+                       {
+                               if (t->modes[modes[n]-65])
+                               {
+                                       send_to_user = true;
+                                       break;
+                               }
+                       }
+               }
 
-void WriteWallOps(userrec *source, bool local_only, char* text, ...)
-{
-        if ((!text) || (!source))
-        {
-                log(DEFAULT,"*** BUG *** WriteOpers was given an invalid parameter");
-                return;
-        }
-
-        char textbuffer[MAXBUF];
-        va_list argsPtr;
-        va_start (argsPtr, text);
-        vsnprintf(textbuffer, MAXBUF, text, argsPtr);
-        va_end(argsPtr);
-
-        for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
-        {
-                if ((i->second) && (i->second->fd != FD_MAGIC_NUMBER))
-                {
-                        if (strchr(i->second->modes,'w'))
-                        {
-                                WriteTo(source,i->second,"WALLOPS :%s",textbuffer);
-                        }
-                }
-        }
+               if (send_to_user)
+               {
+                       t->WriteServ("NOTICE %s :%s",t->nick,textbuffer);
+               }
+       }
 }
 
 /* convert a string to lowercase. Note following special circumstances
@@ -739,182 +274,172 @@ void WriteWallOps(userrec *source, bool local_only, char* text, ...)
  *  respectively. This is a critical issue when determining the
  *  equivalence of two nicknames.
  */
-
 void strlower(char *n)
 {
-        if (n)
-        {
-                for (char* t = n; *t; t++)
-                        *t = lowermap[(unsigned)*t];
-        }
+       if (n)
+       {
+               for (char* t = n; *t; t++)
+                       *t = lowermap[(unsigned char)*t];
+       }
 }
 
 /* Find a user record by nickname and return a pointer to it */
 
-userrec* Find(std::string nick)
+userrec* Find(const std::string &nick)
+{
+       user_hash::iterator iter = ServerInstance->clientlist.find(nick);
+
+       if (iter == ServerInstance->clientlist.end())
+               /* Couldn't find it */
+               return NULL;
+
+       return iter->second;
+}
+
+userrec* Find(const char* nick)
 {
-        user_hash::iterator iter = clientlist.find(nick);
+       user_hash::iterator iter;
+
+       if (!nick)
+               return NULL;
 
-        if (iter == clientlist.end())
-                /* Couldn't find it */
-                return NULL;
+       iter = ServerInstance->clientlist.find(nick);
+       
+       if (iter == ServerInstance->clientlist.end())
+               return NULL;
 
-        return iter->second;
+       return iter->second;
 }
 
 /* find a channel record by channel name and return a pointer to it */
 
 chanrec* FindChan(const char* chan)
 {
-        if (!chan)
-        {
-                log(DEFAULT,"*** BUG *** Findchan was given an invalid parameter");
-                return NULL;
-        }
+       chan_hash::iterator iter;
+
+       if (!chan)
+       {
+               log(DEFAULT,"*** BUG *** Findchan was given an invalid parameter");
+               return NULL;
+       }
 
-        chan_hash::iterator iter = chanlist.find(chan);
+       iter = ServerInstance->chanlist.find(chan);
 
-        if (iter == chanlist.end())
-                /* Couldn't find it */
-                return NULL;
+       if (iter == ServerInstance->chanlist.end())
+               /* Couldn't find it */
+               return NULL;
 
-        return iter->second;
+       return iter->second;
 }
 
 
 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;
+       std::string x;
+       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()))
+               {
+                       return n->second;
+               }
+       }
+       return 64;
 }
 
 void purge_empty_chans(userrec* u)
 {
+       std::vector<chanrec*> to_delete;
 
-        int go_again = 1, purge = 0;
-
-        // firstly decrement the count on each channel
-        for (int f = 0; f < MAXCHANS; f++)
-        {
-                if (u->chans[f].channel)
-                {
-                        u->chans[f].channel->DelUser((char*)u);
-                }
-        }
-
-        for (int i = 0; i < MAXCHANS; i++)
-        {
-                if (u->chans[i].channel)
-                {
-                        if (!usercount(u->chans[i].channel))
-                        {
-                                chan_hash::iterator i2 = chanlist.find(u->chans[i].channel->name);
-                                /* kill the record */
-                                if (i2 != chanlist.end())
-                                {
-                                        log(DEBUG,"del_channel: destroyed: %s",i2->second->name);
-                                        if (i2->second)
-                                                delete i2->second;
-                                        chanlist.erase(i2);
-                                        go_again = 1;
-                                        purge++;
-                                        u->chans[i].channel = NULL;
-                                }
-                        }
-                        else
-                        {
-                                log(DEBUG,"skipped purge for %s",u->chans[i].channel->name);
-                        }
-                }
-        }
-        log(DEBUG,"completed channel purge, killed %lu",(unsigned long)purge);
-
-        DeleteOper(u);
-}
+       // firstly decrement the count on each channel
+       for (std::vector<ucrec*>::iterator f = u->chans.begin(); f != u->chans.end(); f++)
+       {
+               ucrec* uc = (ucrec*)(*f);
+               if (uc->channel)
+               {
+                       if (uc->channel->DelUser(u) == 0)
+                       {
+                               /* No users left in here, mark it for deletion */
+                               to_delete.push_back(uc->channel);
+                               uc->channel = NULL;
+                       }
+               }
+       }
 
+       log(DEBUG,"purge_empty_chans: %d channels to delete",to_delete.size());
 
-char scratch[MAXBUF];
-char sparam[MAXBUF];
+       for (std::vector<chanrec*>::iterator n = to_delete.begin(); n != to_delete.end(); n++)
+       {
+               chanrec* thischan = (chanrec*)*n;
+               chan_hash::iterator i2 = ServerInstance->chanlist.find(thischan->name);
+               if (i2 != ServerInstance->chanlist.end())
+               {
+                       FOREACH_MOD(I_OnChannelDelete,OnChannelDelete(i2->second));
+                       DELETE(i2->second);
+                       ServerInstance->chanlist.erase(i2);
+               }
+       }
+
+       u->UnOper();
+}
 
-char* chanmodes(chanrec *chan)
+
+char* chanmodes(chanrec *chan, bool showkey)
 {
-        if (!chan)
-        {
-                log(DEFAULT,"*** BUG *** chanmodes was given an invalid parameter");
-                strcpy(scratch,"");
-                return scratch;
-        }
-
-        strcpy(scratch,"");
-        strcpy(sparam,"");
-        if (chan->binarymodes & CM_NOEXTERNAL)
-        {
-                strlcat(scratch,"n",MAXMODES);
-        }
-        if (chan->binarymodes & CM_TOPICLOCK)
-        {
-                strlcat(scratch,"t",MAXMODES);
-        }
-        if (chan->key[0])
-        {
-                strlcat(scratch,"k",MAXMODES);
-        }
-        if (chan->limit)
-        {
-                strlcat(scratch,"l",MAXMODES);
-        }
-        if (chan->binarymodes & CM_INVITEONLY)
-        {
-                strlcat(scratch,"i",MAXMODES);
-        }
-        if (chan->binarymodes & CM_MODERATED)
-        {
-                strlcat(scratch,"m",MAXMODES);
-        }
-        if (chan->binarymodes & CM_SECRET)
-        {
-                strlcat(scratch,"s",MAXMODES);
-        }
-        if (chan->binarymodes & CM_PRIVATE)
-        {
-                strlcat(scratch,"p",MAXMODES);
-        }
-        if (chan->key[0])
-        {
-                strlcat(sparam," ",MAXBUF);
-                strlcat(sparam,chan->key,MAXBUF);
-        }
-        if (chan->limit)
-        {
-                char foo[24];
-                sprintf(foo," %lu",(unsigned long)chan->limit);
-                strlcat(sparam,foo,MAXBUF);
-        }
-        if (*chan->custom_modes)
-        {
-                strlcat(scratch,chan->custom_modes,MAXMODES);
-                for (int z = 0; chan->custom_modes[z] != 0; z++)
-                {
-                        std::string extparam = chan->GetModeParameter(chan->custom_modes[z]);
-                        if (extparam != "")
-                        {
-                                strlcat(sparam," ",MAXBUF);
-                                strlcat(sparam,extparam.c_str(),MAXBUF);
-                        }
-                }
-        }
-        log(DEBUG,"chanmodes: %s %s%s",chan->name,scratch,sparam);
-        strlcat(scratch,sparam,MAXMODES);
-        return scratch;
+       static char scratch[MAXBUF];
+       static char sparam[MAXBUF];
+       char* offset = scratch;
+       std::string extparam = "";
+
+       if (!chan)
+       {
+               log(DEFAULT,"*** BUG *** chanmodes was given an invalid parameter");
+               *scratch = '\0';
+               return scratch;
+       }
+
+       *scratch = '\0';
+       *sparam = '\0';
+
+       /* This was still iterating up to 190, chanrec::custom_modes is only 64 elements -- Om */
+       for(int n = 0; n < 64; n++)
+       {
+               if(chan->modes[n])
+               {
+                       *offset++ = n+65;
+                       extparam = "";
+                       switch (n)
+                       {
+                               case CM_KEY:
+                                       extparam = (showkey ? chan->key : "<key>");
+                               break;
+                               case CM_LIMIT:
+                                       extparam = ConvToStr(chan->limit);
+                               break;
+                               case CM_NOEXTERNAL:
+                               case CM_TOPICLOCK:
+                               case CM_INVITEONLY:
+                               case CM_MODERATED:
+                               case CM_SECRET:
+                               case CM_PRIVATE:
+                                       /* We know these have no parameters */
+                               break;
+                               default:
+                                       extparam = chan->GetModeParameter(n+65);
+                               break;
+                       }
+                       if (extparam != "")
+                       {
+                               charlcat(sparam,' ',MAXBUF);
+                               strlcat(sparam,extparam.c_str(),MAXBUF);
+                       }
+               }
+       }
+
+       /* Null terminate scratch */
+       *offset = '\0';
+       strlcat(scratch,sparam,MAXBUF);
+       return scratch;
 }
 
 
@@ -923,257 +448,265 @@ char* chanmodes(chanrec *chan)
 
 void userlist(userrec *user,chanrec *c)
 {
-        if ((!c) || (!user))
-        {
-                log(DEFAULT,"*** BUG *** userlist was given an invalid parameter");
-                return;
-        }
-
-        snprintf(list,MAXBUF,"353 %s = %s :", user->nick, c->name);
-
-        std::vector<char*> *ulist = c->GetUsers();
-        for (unsigned int i = 0; i < ulist->size(); i++)
-        {
-                char* o = (*ulist)[i];
-                userrec* otheruser = (userrec*)o;
-                if ((!has_channel(user,c)) && (strchr(otheruser->modes,'i')))
-                {
-                        /* user is +i, and source not on the channel, does not show
-                         * nick in NAMES list */
-                        continue;
-                }
-                strlcat(list,cmode(otheruser,c),MAXBUF);
-                strlcat(list,otheruser->nick,MAXBUF);
-                strlcat(list," ",MAXBUF);
-                if (strlen(list)>(480-NICKMAX))
-                {
-                        /* list overflowed into
-                         * multiple numerics */
-                        WriteServ(user->fd,"%s",list);
-                        snprintf(list,MAXBUF,"353 %s = %s :", user->nick, c->name);
-                }
-        }
-        /* if whats left in the list isnt empty, send it */
-        if (list[strlen(list)-1] != ':')
-        {
-                WriteServ(user->fd,"%s",list);
-        }
-}
+       if ((!c) || (!user))
+       {
+               log(DEFAULT,"*** BUG *** userlist was given an invalid parameter");
+               return;
+       }
 
-/* return a count of the users on a specific channel accounting for
- * invisible users who won't increase the count. e.g. for /LIST */
+       char list[MAXBUF];
+       size_t dlen, curlen;
 
-int usercount_i(chanrec *c)
-{
-        int count = 0;
-
-        if (!c)
-        {
-                log(DEFAULT,"*** BUG *** usercount_i was given an invalid parameter");
-                return 0;
-        }
-
-        strcpy(list,"");
-        for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
-        {
-                if (i->second)
-                {
-                        if (has_channel(i->second,c))
-                        {
-                                if (isnick(i->second->nick))
-                                {
-                                        if ((!has_channel(i->second,c)) && (strchr(i->second->modes,'i')))
-                                        {
-                                                /* user is +i, and source not on the channel, does not show
-                                                 * nick in NAMES list */
-                                                continue;
-                                        }
-                                        count++;
-                                }
-                        }
-                }
-        }
-        log(DEBUG,"usercount_i: %s %lu",c->name,(unsigned long)count);
-        return count;
-}
+       dlen = curlen = snprintf(list,MAXBUF,"353 %s = %s :", user->nick, c->name);
 
+       int numusers = 0;
+       char* ptr = list + dlen;
 
-int usercount(chanrec *c)
-{
-        if (!c)
-        {
-                log(DEFAULT,"*** BUG *** usercount was given an invalid parameter");
-                return 0;
-        }
-        int count = c->GetUserCounter();
-        log(DEBUG,"usercount: %s %lu",c->name,(unsigned long)count);
-        return count;
-}
+       CUList *ulist= c->GetUsers();
 
+       /* Improvement by Brain - this doesnt change in value, so why was it inside
+        * the loop?
+        */
+       bool has_user = c->HasUser(user);
 
-// looks up a users password for their connection class (<ALLOW>/<DENY> tags)
+       for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
+       {
+               if ((!has_user) && (i->second->modes[UM_INVISIBLE]))
+               {
+                       /*
+                        * user is +i, and source not on the channel, does not show
+                        * nick in NAMES list
+                        */
+                       continue;
+               }
 
-char* Passwd(userrec *user)
-{
-        for (ClassVector::iterator i = Classes.begin(); i != Classes.end(); i++)
-        {
-                if (match(user->host,i->host) && (i->type == CC_ALLOW))
-                {
-                        return i->pass;
-                }
-        }
-        return "";
+               size_t ptrlen = snprintf(ptr, MAXBUF, "%s%s ", cmode(i->second, c), i->second->nick);
+
+               curlen += ptrlen;
+               ptr += ptrlen;
+
+               numusers++;
+
+               if (curlen > (480-NICKMAX))
+               {
+                       /* list overflowed into multiple numerics */
+                       user->WriteServ(list);
+
+                       /* reset our lengths */
+                       dlen = curlen = snprintf(list,MAXBUF,"353 %s = %s :", user->nick, c->name);
+                       ptr = list + dlen;
+
+                       ptrlen = 0;
+                       numusers = 0;
+               }
+       }
+
+       /* if whats left in the list isnt empty, send it */
+       if (numusers)
+       {
+               user->WriteServ(list);
+       }
 }
 
-bool IsDenied(userrec *user)
+/*
+ * return a count of the users on a specific channel accounting for
+ * invisible users who won't increase the count. e.g. for /LIST
+ */
+int usercount_i(chanrec *c)
 {
-        for (ClassVector::iterator i = Classes.begin(); i != Classes.end(); i++)
-        {
-                if (match(user->host,i->host) && (i->type == CC_DENY))
-                {
-                        return true;
-                }
-        }
-        return false;
-}
+       int count = 0;
 
+       if (!c)
+               return 0;
 
+       CUList *ulist= c->GetUsers();
+       for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
+       {
+               if (!(i->second->modes[UM_INVISIBLE]))
+                       count++;
+       }
 
+       return count;
+}
+
+/* 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,
+ * <connect allow="127.0.0.1"> will match joe!bloggs@localhost
+ */
+ConnectClass GetClass(userrec *user)
+{
+       for (ClassVector::iterator i = ServerInstance->Config->Classes.begin(); i != ServerInstance->Config->Classes.end(); i++)
+       {
+               if ((match(user->GetIPString(),i->host.c_str(),true)) || (match(user->host,i->host.c_str())))
+               {
+                       return *i;
+               }
+       }
 
-/* sends out an error notice to all connected clients (not to be used
- * lightly!) */
+       return *(ServerInstance->Config->Classes.begin());
+}
 
-void send_error(char *s)
+/*
+ * sends out an error notice to all connected clients (not to be used
+ * lightly!)
+ */
+void InspIRCd::SendError(const char *s)
 {
-        log(DEBUG,"send_error: %s",s);
-        for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
-        {
-                if (isnick(i->second->nick))
-                {
-                        WriteServ(i->second->fd,"NOTICE %s :%s",i->second->nick,s);
-                }
-                else
-                {
-                        // fix - unregistered connections receive ERROR, not NOTICE
-                        Write(i->second->fd,"ERROR :%s",s);
-                }
-        }
+       for (std::vector<userrec*>::const_iterator i = this->local_users.begin(); i != this->local_users.end(); i++)
+       {
+               userrec* t = (userrec*)(*i);
+               if (t->registered == REG_ALL)
+               {
+                       t->WriteServ("NOTICE %s :%s",t->nick,s);
+               }
+               else
+               {
+                       // fix - unregistered connections receive ERROR, not NOTICE
+                       t->Write("ERROR :%s",s);
+               }
+       }
 }
 
 void Error(int status)
 {
-        signal (SIGALRM, SIG_IGN);
-        signal (SIGPIPE, SIG_IGN);
-        signal (SIGTERM, SIG_IGN);
-        signal (SIGABRT, SIG_IGN);
-        signal (SIGSEGV, SIG_IGN);
-        signal (SIGURG, SIG_IGN);
-        signal (SIGKILL, SIG_IGN);
-        log(DEFAULT,"*** fell down a pothole in the road to perfection ***");
-        send_error("Error! Segmentation fault! save meeeeeeeeeeeeee *splat!*");
-        Exit(status);
+       void *array[300];
+       size_t size;
+       char **strings;
+
+       signal(SIGALRM, SIG_IGN);
+       signal(SIGPIPE, SIG_IGN);
+       signal(SIGTERM, SIG_IGN);
+       signal(SIGABRT, SIG_IGN);
+       signal(SIGSEGV, SIG_IGN);
+       signal(SIGURG, SIG_IGN);
+       signal(SIGKILL, SIG_IGN);
+       log(DEFAULT,"*** fell down a pothole in the road to perfection ***");
+#ifdef HAS_EXECINFO
+       log(DEFAULT,"Please report the backtrace lines shown below with any bugreport to the bugtracker at http://www.inspircd.org/bugtrack/");
+       size = backtrace(array, 30);
+       strings = backtrace_symbols(array, size);
+       for (size_t i = 0; i < size; i++) {
+               log(DEFAULT,"[%d] %s", i, strings[i]);
+       }
+       free(strings);
+       WriteOpers("*** SIGSEGV: Please see the ircd.log for backtrace and report the error to http://www.inspircd.org/bugtrack/");
+#else
+       log(DEFAULT,"You do not have execinfo.h so i could not backtrace -- on FreeBSD, please install the libexecinfo port.");
+#endif
+       ServerInstance->SendError("Somebody screwed up... Whoops. IRC Server terminating.");
+       signal(SIGSEGV, SIG_DFL);
+       if (raise(SIGSEGV) == -1)
+       {
+               log(DEFAULT,"What the hell, i couldnt re-raise SIGSEGV! Error: %s",strerror(errno));
+       }
+       Exit(status);
 }
 
 // this function counts all users connected, wether they are registered or NOT.
-int usercnt(void)
+int InspIRCd::usercnt()
 {
-        return clientlist.size();
+       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++;
-        }
-        return c;
+       int c = 0;
+
+       for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
+       {
+               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 ((isnick(i->second->nick)) && (strchr(i->second->modes,'i'))) c++;
-        }
-        return c;
+       int c = 0;
+
+       for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
+       {
+               c += ((i->second->registered == REG_ALL) && (i->second->modes[UM_INVISIBLE]));
+       }
+
+       return c;
 }
 
-int usercount_opers(void)
+int InspIRCd::usercount_opers()
 {
-        int c = 0;
-        for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
-        {
-                if ((isnick(i->second->nick)) && (strchr(i->second->modes,'o'))) c++;
-        }
-        return c;
+       int c = 0;
+
+       for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
+       {
+               if (*(i->second->oper))
+                       c++;
+       }
+       return c;
 }
 
-int usercount_unknown(void)
+int InspIRCd::usercount_unknown()
 {
-        int c = 0;
-
-        for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
-        {
-                if ((i->second->fd) && (i->second->registered != 7))
-                        c++;
-        }
-        return c;
+       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 != REG_ALL)
+                       c++;
+       }
+
+       return c;
 }
 
-long chancount(void)
+long InspIRCd::chancount()
 {
-        return chanlist.size();
+       return chanlist.size();
 }
 
-long local_count()
+long InspIRCd::local_count()
 {
-        int c = 0;
-        for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
-        {
-                if ((i->second->fd) && (isnick(i->second->nick)) && (!strcasecmp(i->second->server,ServerName))) c++;
-        }
-        return c;
+       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 == REG_ALL)
+                       c++;
+       }
+
+       return c;
 }
 
 void ShowMOTD(userrec *user)
 {
-        char buf[65536];
-        std::string WholeMOTD = "";
-        if (!MOTD.size())
-        {
-                WriteServ(user->fd,"422 %s :Message of the day file is missing.",user->nick);
-                return;
-        }
-        snprintf(buf,65535,":%s 375 %s :- %s message of the day\r\n", ServerName, user->nick, ServerName);
-        WholeMOTD = WholeMOTD + buf;
-        for (unsigned int i = 0; i != MOTD.size(); i++)
-        {
-                snprintf(buf,65535,":%s 372 %s :- %s\r\n", ServerName, user->nick, MOTD[i].c_str());
-                WholeMOTD = WholeMOTD + buf;
-        }
-        snprintf(buf,65535,":%s 376 %s :End of message of the day.\r\n", ServerName, user->nick);
-        WholeMOTD = WholeMOTD + buf;
-        // only one write operation
-        user->AddWriteBuf(WholeMOTD);
-        statsSent += WholeMOTD.length();
+       if (!ServerInstance->Config->MOTD.size())
+       {
+               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);
+
+       for (unsigned int i = 0; i < ServerInstance->Config->MOTD.size(); i++)
+               user->WriteServ("372 %s :- %s",user->nick,ServerInstance->Config->MOTD[i].c_str());
+
+       user->WriteServ("376 %s :End of message of the day.", user->nick);
 }
 
 void ShowRULES(userrec *user)
 {
-        if (!RULES.size())
-        {
-                WriteServ(user->fd,"NOTICE %s :Rules file is missing.",user->nick);
-                return;
-        }
-        WriteServ(user->fd,"NOTICE %s :%s rules",user->nick,ServerName);
-        for (unsigned int i = 0; i != RULES.size(); i++)
-        {
-                                WriteServ(user->fd,"NOTICE %s :%s",user->nick,RULES[i].c_str());
-        }
-        WriteServ(user->fd,"NOTICE %s :End of %s rules.",user->nick,ServerName);
+       if (!ServerInstance->Config->RULES.size())
+       {
+               user->WriteServ("NOTICE %s :Rules file is missing.",user->nick);
+               return;
+       }
+       user->WriteServ("NOTICE %s :%s rules",user->nick,ServerInstance->Config->ServerName);
+
+       for (unsigned int i = 0; i < ServerInstance->Config->RULES.size(); i++)
+               user->WriteServ("NOTICE %s :%s",user->nick,ServerInstance->Config->RULES[i].c_str());
+
+       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
@@ -1181,161 +714,300 @@ void ShowRULES(userrec *user)
 // 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;
+       if (!ServerInstance->Config->global_implementation[I_OnCheckReady])
+               return true;
+
+       for (int i = 0; i <= MODCOUNT; i++)
+       {
+               if (ServerInstance->Config->implement_lists[i][I_OnCheckReady])
+               {
+                       int res = modules[i]->OnCheckReady(user);
+                       if (!res)
+                               return false;
+               }
+       }
+
+       return true;
 }
 
-char islast(const char* s)
+/* Make Sure Modules Are Avaliable!
+ * (BugFix By Craig.. See? I do work! :p)
+ * Modified by brain, requires const char*
+ * to work with other API functions
+ */
+
+/* XXX - Needed? */
+bool FileExists (const char* file)
 {
-        return '+';
+       FILE *input;
+       if ((input = fopen (file, "r")) == NULL)
+       {
+               return(false);
+       }
+       else
+       {
+               fclose (input);
+               return(true);
+       }
 }
 
-long map_count(const char* s)
+char* CleanFilename(char* name)
 {
-        int c = 0;
-        for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
-        {
-                if ((i->second->fd) && (isnick(i->second->nick)) && (!strcasecmp(i->second->server,s))) c++;
-        }
-        return c;
+       char* p = name + strlen(name);
+       while ((p != name) && (*p != '/')) p--;
+       return (p != name ? ++p : p);
 }
 
-void createcommand(char* cmd, handlerfunc f, char flags, int minparams,char* source)
+bool DirValid(char* dirandfile)
 {
-        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;
-        comm.use_count = 0;
-        comm.total_bytes = 0;
-        cmdlist.push_back(comm);
-        log(DEBUG,"Added command %s (%lu parameters)",cmd,(unsigned long)minparams);
+       char work[MAXBUF];
+       char buffer[MAXBUF];
+       char otherdir[MAXBUF];
+       int p;
+
+       strlcpy(work, dirandfile, MAXBUF);
+       p = strlen(work);
+
+       // we just want the dir
+       while (*work)
+       {
+               if (work[p] == '/')
+               {
+                       work[p] = '\0';
+                       break;
+               }
+
+               work[p--] = '\0';
+       }
+
+       // Get the current working directory
+       if (getcwd(buffer, MAXBUF ) == NULL )
+               return false;
+
+       chdir(work);
+
+       if (getcwd(otherdir, MAXBUF ) == NULL )
+               return false;
+
+       chdir(buffer);
+
+       size_t t = strlen(work);
+
+       if (strlen(otherdir) >= t)
+       {
+               otherdir[t] = '\0';
+
+               if (!strcmp(otherdir,work))
+               {
+                       return true;
+               }
+
+               return false;
+       }
+       else
+       {
+               return false;
+       }
 }
 
+std::string GetFullProgDir(char** argv, int argc)
+{
+       char work[MAXBUF];
+       char buffer[MAXBUF];
+       char otherdir[MAXBUF];
+       int p;
+
+       strlcpy(work,argv[0],MAXBUF);
+       p = strlen(work);
+
+       // we just want the dir
+       while (*work)
+       {
+               if (work[p] == '/')
+               {
+                       work[p] = '\0';
+                       break;
+               }
+
+               work[p--] = '\0';
+       }
+
+       // Get the current working directory
+       if (getcwd(buffer, MAXBUF) == NULL)
+               return "";
+
+       chdir(work);
 
-void SetupCommandTable(void)
+       if (getcwd(otherdir, MAXBUF) == NULL)
+               return "";
+
+       chdir(buffer);
+       return otherdir;
+}
+
+int InsertMode(std::string &output, const char* mode, unsigned short section)
 {
-        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,0,"<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>");
-       createcommand("COMMANDS",handle_commands,0,0,"<core>");
+       unsigned short currsection = 1;
+       unsigned int pos = output.find("CHANMODES=", 0) + 10; // +10 for the length of "CHANMODES="
+       
+       if(section > 4 || section == 0)
+       {
+               log(DEBUG, "InsertMode: CHANMODES doesn't have a section %dh :/", section);
+               return 0;
+       }
+       
+       for(; pos < output.size(); pos++)
+       {
+               if(section == currsection)
+                       break;
+                       
+               if(output[pos] == ',')
+                       currsection++;
+       }
+       
+       output.insert(pos, mode);
+       return 1;
 }
 
-bool DirValid(char* dirandfile)
+bool IsValidChannelName(const char *chname)
 {
-        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';
-        }
-        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);
-        if (strlen(otherdir) >= strlen(work))
-        {
-                otherdir[strlen(work)] = '\0';
-                if (!strcmp(otherdir,work))
-                {
-                        return true;
-                }
-                return false;
-        }
-        else return false;
+       char *c;
+
+       /* check for no name - don't check for !*chname, as if it is empty, it won't be '#'! */
+       if (!chname || *chname != '#')
+       {
+               return false;
+       }
+
+       c = (char *)chname + 1;
+       while (*c)
+       {
+               switch (*c)
+               {
+                       case ' ':
+                       case ',':
+                       case 7:
+                               return false;
+               }
+
+               c++;
+       }
+               
+       /* too long a name - note funky pointer arithmetic here. */
+       if ((c - chname) > CHANMAX)
+       {
+                       return false;
+       }
+
+       return true;
 }
 
-std::string GetFullProgDir(char** argv, int argc)
+inline int charlcat(char* x,char y,int z)
 {
-        char work[MAXBUF];
-        strlcpy(work,argv[0],MAXBUF);
-        int p = strlen(work);
-        // we just want the dir
-        while (strlen(work))
-        {
-                if (work[p] == '/')
-                {
-                        work[p] = '\0';
-                        break;
-                }
-                work[p--] = '\0';
-        }
-        char buffer[MAXBUF], otherdir[MAXBUF];
-        // Get the current working directory
-        if( getcwd( buffer, MAXBUF ) == NULL )
-                return "";
-        chdir(work);
-        if( getcwd( otherdir, MAXBUF ) == NULL )
-                return "";
-        chdir(buffer);
-        return otherdir;
+       char* x__n = x;
+       int v = 0;
+
+       while(*x__n++)
+               v++;
+
+       if (v < z - 1)
+       {
+               *--x__n = y;
+               *++x__n = 0;
+       }
+
+       return v;
 }
 
+bool charremove(char* mp, char remove)
+{
+       char* mptr = mp;
+       bool shift_down = false;
+
+       while (*mptr)
+       {
+               if (*mptr == remove)
+               shift_down = true;
+
+               if (shift_down)
+                       *mptr = *(mptr+1);
+
+               mptr++;
+       }
+
+       return shift_down;
+}
+
+void OpenLog(char** argv, int argc)
+{
+       if (!*LOG_FILE)
+       {
+               if (ServerInstance->Config->logpath == "")
+               {
+                       ServerInstance->Config->logpath = GetFullProgDir(argv,argc) + "/ircd.log";
+               }
+       }
+       else
+       {
+               ServerInstance->Config->log_file = fopen(LOG_FILE,"a+");
+
+               if (!ServerInstance->Config->log_file)
+               {
+                       printf("ERROR: Could not write to logfile %s, bailing!\n\n",ServerInstance->Config->logpath.c_str());
+                       Exit(ERROR);
+               }
+               
+               return;
+       }
+
+       ServerInstance->Config->log_file = fopen(ServerInstance->Config->logpath.c_str(),"a+");
+
+       if (!ServerInstance->Config->log_file)
+       {
+               printf("ERROR: Could not write to logfile %s, bailing!\n\n",ServerInstance->Config->logpath.c_str());
+               Exit(ERROR);
+       }
+}
+
+void CheckRoot()
+{
+       if (geteuid() == 0)
+       {
+               printf("WARNING!!! You are running an irc server as ROOT!!! DO NOT DO THIS!!!\n\n");
+               log(DEFAULT,"InspIRCd: startup: not starting with UID 0!");
+               Exit(ERROR);
+       }
+}
+
+void CheckDie()
+{
+       if (*ServerInstance->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);
+       }
+}
+
+/* We must load the modules AFTER initializing the socket engine, now */
+void LoadAllModules(InspIRCd* ServerInstance)
+{
+       char configToken[MAXBUF];
+       ServerInstance->Config->module_names.clear();
+       MODCOUNT = -1;
+
+       for (int count = 0; count < ServerInstance->Config->ConfValueEnum(ServerInstance->Config->config_data, "module"); count++)
+       {
+               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))           
+               {
+                       log(DEFAULT,"Exiting due to a module loader error.");
+                       printf("\nThere was an error loading a module: %s\n\n",ServerInstance->ModuleError());
+                       Exit(0);
+               }
+       }
+       
+       log(DEFAULT,"Total loaded modules: %lu",(unsigned long)MODCOUNT+1);
+}