]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/helperfuncs.cpp
Fix all typos (not as fun as 'kill all humans' but meh, beggers cant be choosers)
[user/henk/code/inspircd.git] / src / helperfuncs.cpp
index c313b5456f748a87b19a44e2ddb0328dd1668ffc..77a74c32c111d6b2ceea501d2f2d15fff28b8158 100644 (file)
  * ---------------------------------------------------
  */
 
-using namespace std;
-
+#include <stdarg.h>
 #include "inspircd_config.h"
 #include "inspircd.h"
-#include "inspircd_io.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"
@@ -50,18 +45,19 @@ using namespace std;
 #include "typedefs.h"
 
 extern int MODCOUNT;
-extern std::vector<Module*> modules;
+extern ModuleList modules;
 extern ServerConfig *Config;
 extern InspIRCd* ServerInstance;
 extern time_t TIME;
 extern char lowermap[255];
-static char list[MAXBUF];
 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];
@@ -71,12 +67,13 @@ static time_t LAST = 0;
  *  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 log(int level, char *text, ...)
+void do_log(int level, const char *text, ...)
 {
        va_list argsPtr;
        char textbuffer[MAXBUF];
 
-       if (level < Config->LogLevel)
+       /* If we were given -debug we output all messages, regardless of configured loglevel */
+       if ((level < Config->LogLevel) && !Config->forcedebug)
                return;
 
        if (TIME != LAST)
@@ -94,14 +91,17 @@ void log(int level, char *text, ...)
                vsnprintf(textbuffer, MAXBUF, text, argsPtr);
                va_end(argsPtr);
 
-               if (Config->log_file)
-                       fprintf(Config->log_file,"%s %s\n",TIMESTR,textbuffer);
-
-               if (Config->nofork)
+               if (Config->writelog)
                {
-                       printf("%s %s\n", TIMESTR, textbuffer);
+                       fprintf(Config->log_file,"%s %s\n",TIMESTR,textbuffer);
+                       fflush(Config->log_file);
                }
        }
+       
+       if (Config->nofork)
+       {
+               printf("%s %s\n", TIMESTR, textbuffer);
+       }
 }
 
 /** readfile()
@@ -158,11 +158,11 @@ void Write_NoFormat(int sock, const char *text)
        if ((sock < 0) || (!text) || (sock > MAX_DESCRIPTORS))
                return;
 
-       bytes = snprintf(tb,MAXBUF,"%s\r\n",text);
-       chop(tb);
-
        if (fd_ref_table[sock])
        {
+               bytes = snprintf(tb,MAXBUF,"%s\r\n",text);
+               chop(tb);
+
                if (Config->GetIOHook(fd_ref_table[sock]->port))
                {
                        try
@@ -203,14 +203,15 @@ void Write(int sock, char *text, ...)
                return;
        }
 
-       va_start(argsPtr, text);
-       vsnprintf(textbuffer, MAXBUF, text, argsPtr);
-       va_end(argsPtr);
-       bytes = snprintf(tb,MAXBUF,"%s\r\n",textbuffer);
-       chop(tb);
-
        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
@@ -243,11 +244,11 @@ void WriteServ_NoFormat(int sock, const char* text)
        if ((sock < 0) || (!text) || (sock > MAX_DESCRIPTORS))
                return;
 
-       bytes = snprintf(tb,MAXBUF,":%s %s\r\n",Config->ServerName,text);
-       chop(tb);
-
        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
@@ -276,8 +277,6 @@ void WriteServ(int sock, char* text, ...)
 {
        va_list argsPtr;
        char textbuffer[MAXBUF];
-       char tb[MAXBUF];
-       int bytes;
 
        if ((sock < 0) || (sock > MAX_DESCRIPTORS))
                return;
@@ -288,34 +287,14 @@ void WriteServ(int sock, char* text, ...)
                return;
        }
 
+       if (!fd_ref_table[sock])
+               return;
+
        va_start(argsPtr, text);
        vsnprintf(textbuffer, MAXBUF, text, argsPtr);
        va_end(argsPtr);
-       bytes = snprintf(tb,MAXBUF,":%s %s\r\n",Config->ServerName,textbuffer);
-       chop(tb);
-
-       if (fd_ref_table[sock])
-       {
-               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(sock, textbuffer);
 }
 
 /** WriteFrom_NoFormat()
@@ -330,11 +309,11 @@ void WriteFrom_NoFormat(int sock, userrec *user, const char* text)
        if ((sock < 0) || (!text) || (!user) || (sock > MAX_DESCRIPTORS))
                return;
 
-       bytes = snprintf(tb,MAXBUF,":%s %s\r\n",user->GetFullHost(),text);
-       chop(tb);
-
        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
@@ -374,14 +353,15 @@ void WriteFrom(int sock, userrec *user,char* text, ...)
                return;
        }
 
-       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 (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
@@ -567,7 +547,7 @@ void WriteChannelLocal_NoFormat(chanrec* Ptr, userrec* user, const char* text)
 
 
 
-void WriteChannelWithServ(char* ServName, chanrec* Ptr, char* text, ...)
+void WriteChannelWithServ(const char* ServName, chanrec* Ptr, const char* text, ...)
 {
        char textbuffer[MAXBUF];
        va_list argsPtr;
@@ -592,7 +572,7 @@ void WriteChannelWithServ(char* ServName, chanrec* Ptr, char* text, ...)
        }
 }
 
-void WriteChannelWithServ_NoFormat(char* ServName, chanrec* Ptr, const char* text)
+void WriteChannelWithServ_NoFormat(const char* ServName, chanrec* Ptr, const char* text)
 {
        CUList *ulist;
 
@@ -690,7 +670,7 @@ void ChanExceptSender_NoFormat(chanrec* Ptr, userrec* user, char status, const c
        }
 }
 
-std::string GetServerDescription(char* servername)
+std::string GetServerDescription(const char* servername)
 {
        std::string description = "";
 
@@ -715,7 +695,6 @@ void WriteCommon(userrec *u, char* text, ...)
        char textbuffer[MAXBUF];
        va_list argsPtr;
        bool sent_to_at_least_one = false;
-       unsigned int y;
 
        if (!u)
        {
@@ -735,13 +714,12 @@ void WriteCommon(userrec *u, char* text, ...)
 
        // FIX: Stops a message going to the same person more than once
        memset(&already_sent,0,MAX_DESCRIPTORS);
-       y = u->chans.size();
 
-       for (unsigned int i = 0; i < y; i++)
+       for (std::vector<ucrec*>::const_iterator v = u->chans.begin(); v != u->chans.end(); v++)
        {
-               if (u->chans[i].channel)
+               if (((ucrec*)(*v))->channel)
                {
-                       CUList *ulist= u->chans[i].channel->GetUsers();
+                       CUList *ulist= ((ucrec*)(*v))->channel->GetUsers();
 
                        for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
                        {
@@ -768,7 +746,6 @@ void WriteCommon(userrec *u, char* text, ...)
 void WriteCommon_NoFormat(userrec *u, const char* text)
 {
        bool sent_to_at_least_one = false;
-       unsigned int y;
 
        if (!u)
        {
@@ -784,13 +761,12 @@ void WriteCommon_NoFormat(userrec *u, const char* text)
 
        // FIX: Stops a message going to the same person more than once
        memset(&already_sent,0,MAX_DESCRIPTORS);
-       y = u->chans.size();
 
-       for (unsigned int i = 0; i < y; i++)
+       for (std::vector<ucrec*>::const_iterator v = u->chans.begin(); v != u->chans.end(); v++)
        {
-               if (u->chans[i].channel)
+               if (((ucrec*)(*v))->channel)
                {
-                       CUList *ulist= u->chans[i].channel->GetUsers();
+                       CUList *ulist= ((ucrec*)(*v))->channel->GetUsers();
 
                        for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
                        {
@@ -826,7 +802,6 @@ void WriteCommonExcept(userrec *u, char* text, ...)
        bool quit_munge = false;
        va_list argsPtr;
        int total;
-       unsigned int y;
 
        if (!u)
        {
@@ -886,13 +861,12 @@ void WriteCommonExcept(userrec *u, char* text, ...)
        }
 
        memset(&already_sent,0,MAX_DESCRIPTORS);
-       y = u->chans.size();
 
-       for (unsigned int i = 0; i < y; i++)
+       for (std::vector<ucrec*>::const_iterator v = u->chans.begin(); v != u->chans.end(); v++)
        {
-               if (u->chans[i].channel)
+               if (((ucrec*)(*v))->channel)
                {
-                       CUList *ulist= u->chans[i].channel->GetUsers();
+                       CUList *ulist= ((ucrec*)(*v))->channel->GetUsers();
 
                        for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
                        {
@@ -917,8 +891,6 @@ void WriteCommonExcept(userrec *u, char* text, ...)
 
 void WriteCommonExcept_NoFormat(userrec *u, const char* text)
 {
-       unsigned int y;
-
        if (!u)
        {
                log(DEFAULT,"*** BUG *** WriteCommon was given an invalid parameter");
@@ -932,13 +904,12 @@ void WriteCommonExcept_NoFormat(userrec *u, const char* text)
        }
 
        memset(&already_sent,0,MAX_DESCRIPTORS);
-       y = u->chans.size();
 
-       for (unsigned int i = 0; i < y; i++)
+       for (std::vector<ucrec*>::const_iterator v = u->chans.begin(); v != u->chans.end(); v++)
        {
-               if (u->chans[i].channel)
+               if (((ucrec*)(*v))->channel)
                {
-                       CUList *ulist= u->chans[i].channel->GetUsers();
+                       CUList *ulist= ((ucrec*)(*v))->channel->GetUsers();
 
                        for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
                        {
@@ -963,7 +934,7 @@ void WriteCommonExcept_NoFormat(userrec *u, const char* text)
  * uses the oper list, which means if you have 2000 users but only 5 opers,
  * it iterates 5 times.
  */
-void WriteOpers(char* text, ...)
+void WriteOpers(const char* text, ...)
 {
        char textbuffer[MAXBUF];
        va_list argsPtr;
@@ -978,16 +949,27 @@ void WriteOpers(char* text, ...)
        vsnprintf(textbuffer, MAXBUF, text, argsPtr);
        va_end(argsPtr);
 
+       WriteOpers_NoFormat(textbuffer);
+}
+
+void WriteOpers_NoFormat(const char* text)
+{
+       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 (strchr(a->modes,'s'))
+                       if (a->modes[UM_SERVERNOTICE])
                        {
                                // send server notices to all with +s
-                               WriteServ(a->fd,"NOTICE %s :%s",a->nick,textbuffer);
+                               WriteServ(a->fd,"NOTICE %s :%s",a->nick,text);
                        }
                }
        }
@@ -999,15 +981,18 @@ void ServerNoticeAll(char* text, ...)
                return;
 
        char textbuffer[MAXBUF];
+       char formatbuffer[MAXBUF];
        va_list argsPtr;
        va_start (argsPtr, text);
        vsnprintf(textbuffer, MAXBUF, text, argsPtr);
        va_end(argsPtr);
 
+       snprintf(formatbuffer,MAXBUF,"NOTICE $%s :%s",Config->ServerName,textbuffer);
+
        for (std::vector<userrec*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
        {
                userrec* t = (userrec*)(*i);
-               WriteServ(t->fd,"NOTICE $%s :%s",Config->ServerName,textbuffer);
+               WriteServ_NoFormat(t->fd,formatbuffer);
        }
 }
 
@@ -1017,15 +1002,18 @@ void ServerPrivmsgAll(char* text, ...)
                return;
 
        char textbuffer[MAXBUF];
+       char formatbuffer[MAXBUF];
        va_list argsPtr;
        va_start (argsPtr, text);
        vsnprintf(textbuffer, MAXBUF, text, argsPtr);
        va_end(argsPtr);
 
+       snprintf(formatbuffer,MAXBUF,"PRIVMSG $%s :%s",Config->ServerName,textbuffer);
+
        for (std::vector<userrec*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
        {
                userrec* t = (userrec*)(*i);
-               WriteServ(t->fd,"PRIVMSG $%s :%s",Config->ServerName,textbuffer);
+               WriteServ_NoFormat(t->fd,formatbuffer);
        }
 }
 
@@ -1057,7 +1045,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;
@@ -1070,7 +1058,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;
@@ -1088,6 +1076,7 @@ void WriteMode(const char* modes, int flags, const char* text, ...)
 void NoticeAll(userrec *source, bool local_only, char* text, ...)
 {
        char textbuffer[MAXBUF];
+       char formatbuffer[MAXBUF];
        va_list argsPtr;
 
        if ((!text) || (!source))
@@ -1100,10 +1089,12 @@ void NoticeAll(userrec *source, bool local_only, char* 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(t->fd,source,"NOTICE $* :%s",textbuffer);
+               WriteFrom_NoFormat(t->fd,source,formatbuffer);
        }
 }
 
@@ -1111,6 +1102,7 @@ void NoticeAll(userrec *source, bool local_only, char* text, ...)
 void WriteWallOps(userrec *source, bool local_only, char* text, ...)
 {
        char textbuffer[MAXBUF];
+       char formatbuffer[MAXBUF];
        va_list argsPtr;
 
        if ((!text) || (!source))
@@ -1123,13 +1115,15 @@ void WriteWallOps(userrec *source, bool local_only, char* 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)) && (strchr(t->modes,'w')))
+               if ((IS_LOCAL(t)) && (t->modes[UM_WALLOPS]))
                {
-                       WriteTo(source,t,"WALLOPS :%s",textbuffer);
+                       WriteTo_NoFormat(source,t,formatbuffer);
                }
        }
 }
@@ -1148,13 +1142,13 @@ void strlower(char *n)
        if (n)
        {
                for (char* t = n; *t; t++)
-                       *t = lowermap[(unsigned)*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 = clientlist.find(nick);
 
@@ -1218,50 +1212,38 @@ long GetMaxBans(char* name)
 
 void purge_empty_chans(userrec* u)
 {
-       int purge = 0;
+       std::vector<chanrec*> to_delete;
 
        // firstly decrement the count on each channel
-       for (unsigned int f = 0; f < u->chans.size(); f++)
+       for (std::vector<ucrec*>::iterator f = u->chans.begin(); f != u->chans.end(); f++)
        {
-               if (u->chans[f].channel)
+               if (((ucrec*)(*f))->channel)
                {
-                       u->chans[f].channel->DelUser(u);
+                       if (((ucrec*)(*f))->channel->DelUser(u) == 0)
+                       {
+                               /* No users left in here, mark it for deletion */
+                               to_delete.push_back(((ucrec*)(*f))->channel);
+                               ((ucrec*)(*f))->channel = NULL;
+                       }
                }
        }
 
-       for (unsigned int i = 0; i < u->chans.size(); i++)
+       log(DEBUG,"purge_empty_chans: %d channels to delete",to_delete.size());
+
+       for (std::vector<chanrec*>::iterator n = to_delete.begin(); n != to_delete.end(); n++)
        {
-               if (u->chans[i].channel)
+               chanrec* thischan = (chanrec*)*n;
+               chan_hash::iterator i2 = chanlist.find(thischan->name);
+               if (i2 != chanlist.end())
                {
-                       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)
-                                       {
-                                               FOREACH_MOD(I_OnChannelDelete,OnChannelDelete(i2->second));
-                                               delete i2->second;
-                                       }
-
-                                       chanlist.erase(i2);
-                                       purge++;
-                                       u->chans[i].channel = NULL;
-                               }
-                       }
-                       else
-                       {
-                               log(DEBUG,"skipped purge for %s",u->chans[i].channel->name);
-                       }
+                       FOREACH_MOD(I_OnChannelDelete,OnChannelDelete(i2->second));
+                       DELETE(i2->second);
+                       chanlist.erase(i2);
                }
        }
 
-       log(DEBUG,"completed channel purge, killed %lu",(unsigned long)purge);
-       DeleteOper(u);
+       if (*u->oper)
+               DeleteOper(u);
 }
 
 
@@ -1270,6 +1252,7 @@ char* chanmodes(chanrec *chan, bool showkey)
        static char scratch[MAXBUF];
        static char sparam[MAXBUF];
        char* offset = scratch;
+       std::string extparam = "";
 
        if (!chan)
        {
@@ -1281,42 +1264,33 @@ char* chanmodes(chanrec *chan, bool showkey)
        *scratch = '\0';
        *sparam = '\0';
 
-       if (chan->binarymodes & CM_NOEXTERNAL)
-               *offset++ = 'n';
-       if (chan->binarymodes & CM_TOPICLOCK)
-               *offset++ = 't';
-       if (*chan->key)
-               *offset++ = 'k';
-       if (chan->limit)
-               *offset++ = 'l';
-       if (chan->binarymodes & CM_INVITEONLY)
-               *offset++ = 'i';
-       if (chan->binarymodes & CM_MODERATED)
-               *offset++ = 'm';
-       if (chan->binarymodes & CM_SECRET)
-               *offset++ = 's';
-       if (chan->binarymodes & CM_PRIVATE)
-               *offset++ = 'p';
-
-       if (*chan->key)
+       /* This was still iterating up to 190, chanrec::custom_modes is only 64 elements -- Om */
+       for(int n = 0; n < 64; n++)
        {
-               snprintf(sparam,MAXBUF," %s",showkey ? chan->key : "<key>");
-       }
-
-       if (chan->limit)
-       {
-               char foo[24];
-               sprintf(foo," %lu",(unsigned long)chan->limit);
-               strlcat(sparam,foo,MAXBUF);
-       }
-
-       for (int n = 0; n < 190; n++)
-       {
-               if (chan->custom_modes[n])
+               if(chan->modes[n])
                {
                        *offset++ = n+65;
-                       std::string extparam = chan->GetModeParameter(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);
@@ -1327,7 +1301,7 @@ char* chanmodes(chanrec *chan, bool showkey)
 
        /* Null terminate scratch */
        *offset = '\0';
-       strlcat(scratch,sparam,MAXMODES);
+       strlcat(scratch,sparam,MAXBUF);
        return scratch;
 }
 
@@ -1343,14 +1317,24 @@ void userlist(userrec *user,chanrec *c)
                return;
        }
 
-       size_t dlen = snprintf(list,MAXBUF,"353 %s = %s :", user->nick, c->name);
-       size_t initial = dlen;
+       char list[MAXBUF];
+       size_t dlen, curlen;
+
+       dlen = curlen = snprintf(list,MAXBUF,"353 %s = %s :", user->nick, c->name);
+
+       int numusers = 0;
+       char* ptr = list + dlen;
 
        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);
+
        for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
        {
-               if ((!has_channel(user,c)) && (strchr(i->second->modes,'i')))
+               if ((!has_user) && (i->second->modes[UM_INVISIBLE]))
                {
                        /*
                         * user is +i, and source not on the channel, does not show
@@ -1359,21 +1343,29 @@ void userlist(userrec *user,chanrec *c)
                        continue;
                }
 
-               dlen += strlcat(list,cmode(i->second,c),MAXBUF);
-               dlen += strlcat(list,i->second->nick,MAXBUF);
-               charlcat(list,' ',MAXBUF);
-               dlen++;
+               size_t ptrlen = snprintf(ptr, MAXBUF, "%s%s ", cmode(i->second, c), i->second->nick);
+
+               curlen += ptrlen;
+               ptr += ptrlen;
 
-               if (dlen > (480-NICKMAX))
+               numusers++;
+
+               if (curlen > (480-NICKMAX))
                {
                        /* list overflowed into multiple numerics */
                        WriteServ_NoFormat(user->fd,list);
-                       dlen = snprintf(list,MAXBUF,"353 %s = %s :", user->nick, c->name);
+
+                       /* 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 (dlen != initial)
+       if (numusers)
        {
                WriteServ_NoFormat(user->fd,list);
        }
@@ -1393,7 +1385,7 @@ int usercount_i(chanrec *c)
        CUList *ulist= c->GetUsers();
        for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
        {
-               if (!strchr(i->second->modes,'i'))
+               if (!(i->second->modes[UM_INVISIBLE]))
                        count++;
        }
 
@@ -1406,12 +1398,16 @@ int usercount(chanrec *c)
 }
 
 
-/* looks up a users password for their connection class (<ALLOW>/<DENY> tags) */
+/* 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 = Config->Classes.begin(); i != Config->Classes.end(); i++)
        {
-               if (match(user->host,i->host.c_str()))
+               if ((match(inet_ntoa(user->ip4),i->host.c_str())) || (match(user->host,i->host.c_str())))
                {
                        return *i;
                }
@@ -1445,6 +1441,10 @@ void send_error(char *s)
 
 void Error(int status)
 {
+       void *array[300];
+       size_t size;
+       char **strings;
+
        signal(SIGALRM, SIG_IGN);
        signal(SIGPIPE, SIG_IGN);
        signal(SIGTERM, SIG_IGN);
@@ -1453,7 +1453,24 @@ void Error(int status)
        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!*");
+#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
+       send_error("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);
 }
 
@@ -1482,7 +1499,7 @@ int usercount_invisible(void)
 
        for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
        {
-               if ((i->second->registered == 7) && (strchr(i->second->modes,'i')))
+               if ((i->second->registered == 7) && (i->second->modes[UM_INVISIBLE]))
                        c++;
        }
 
@@ -1495,7 +1512,7 @@ int usercount_opers(void)
 
        for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
        {
-               if (i->second->oper)
+               if (*(i->second->oper))
                        c++;
        }
        return c;
@@ -1612,6 +1629,34 @@ bool AllModulesReportReady(userrec* user)
        return true;
 }
 
+/* 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)
+{
+       FILE *input;
+       if ((input = fopen (file, "r")) == NULL)
+       {
+               return(false);
+       }
+       else
+       {
+               fclose (input);
+               return(true);
+       }
+}
+
+char* CleanFilename(char* name)
+{
+       char* p = name + strlen(name);
+       while ((p != name) && (*p != '/')) p--;
+       return (p != name ? ++p : p);
+}
+
 bool DirValid(char* dirandfile)
 {
        char work[MAXBUF];
@@ -1786,9 +1831,82 @@ bool charremove(char* mp, char remove)
                if (shift_down)
                        *mptr = *(mptr+1);
 
-               *mptr++;
+               mptr++;
        }
 
        return shift_down;
 }
 
+void OpenLog(char** argv, int argc)
+{
+       if (!*LOG_FILE)
+       {
+               if (Config->logpath == "")
+               {
+                       Config->logpath = GetFullProgDir(argv,argc) + "/ircd.log";
+               }
+       }
+       else
+       {
+               Config->log_file = fopen(LOG_FILE,"a+");
+
+               if (!Config->log_file)
+               {
+                       printf("ERROR: Could not write to logfile %s, bailing!\n\n",Config->logpath.c_str());
+                       Exit(ERROR);
+               }
+               
+               return;
+       }
+
+       Config->log_file = fopen(Config->logpath.c_str(),"a+");
+
+       if (!Config->log_file)
+       {
+               printf("ERROR: Could not write to logfile %s, bailing!\n\n",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 (*Config->DieValue)
+       {
+               printf("WARNING: %s\n\n",Config->DieValue);
+               log(DEFAULT,"Uh-Oh, somebody didn't read their config file: '%s'",Config->DieValue);
+               Exit(ERROR);
+       }
+}
+
+/* We must load the modules AFTER initializing the socket engine, now */
+void LoadAllModules(InspIRCd* ServerInstance)
+{
+       char configToken[MAXBUF];
+       Config->module_names.clear();
+       MODCOUNT = -1;
+
+       for (int count = 0; count < Config->ConfValueEnum(Config->config_data, "module"); count++)
+       {
+               Config->ConfValue(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);
+}