]> 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 7c0d371969e36bbcaeaa1e73f26f72a8ad86162b..1f2a6646b5ea838ef952f77feaa25dad8656ab50 100644 (file)
@@ -3,36 +3,30 @@
  *       +------------------------------------+
  *
  *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *                <Craig@chatspike.net>
+ *                    E-mail:
+ *             <brain@chatspike.net>
+ *             <Craig@chatspike.net>
  *
  * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ *         the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-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"
@@ -42,920 +36,89 @@ using namespace std;
 #include "wildcard.h"
 #include "message.h"
 #include "mode.h"
-#include "xline.h"
-#include "commands.h"
-#include "inspstring.h"
-#include "helperfuncs.h"
-#include "hashcomp.h"
-#include "typedefs.h"
-
-extern int MODCOUNT;
-extern std::vector<Module*> 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;
-
-extern std::vector<userrec*> local_users;
-
-static char TIMESTR[26];
-static time_t LAST = 0;
-
-/** log()
- *  Write a line of text `text' to the logfile (and stdout, if in nofork) if the level `level'
- *  is greater than the configured loglevel.
- */
-void log(int level, char *text, ...)
-{
-       va_list argsPtr;
-       char textbuffer[MAXBUF];
-
-       if (level < Config->LogLevel)
-               return;
-
-       if (TIME != LAST)
-       {
-               struct tm *timeinfo = localtime(&TIME);
-
-               strlcpy(TIMESTR,asctime(timeinfo),26);
-               TIMESTR[24] = ':';
-               LAST = TIME;
-       }
-
-       if (Config->log_file)
-       {
-               va_start(argsPtr, text);
-               vsnprintf(textbuffer, MAXBUF, text, argsPtr);
-               va_end(argsPtr);
-
-               if (Config->log_file)
-                       fprintf(Config->log_file,"%s %s\n",TIMESTR,textbuffer);
-
-               if (Config->nofork)
-               {
-                       printf("%s %s\n", TIMESTR, textbuffer);
-               }
-       }
-}
-
-/** readfile()
- *  Read the contents of a file located by `fname' into a file_cache pointed at by `F'.
- *
- *  XXX - we may want to consider returning a file_cache or pointer to one, less confusing.
- */
-void readfile(file_cache &F, const char* fname)
-{
-       FILE* file;
-       char linebuf[MAXBUF];
-
-       log(DEBUG,"readfile: loading %s",fname);
-       F.clear();
-       file =  fopen(fname,"r");
-
-       if (file)
-       {
-               while (!feof(file))
-               {
-                       fgets(linebuf,sizeof(linebuf),file);
-                       linebuf[strlen(linebuf)-1]='\0';
-
-                       if (!*linebuf)
-                       {
-                               strcpy(linebuf,"  ");
-                       }
-
-                       if (!feof(file))
-                       {
-                               F.push_back(linebuf);
-                       }
-               }
-
-               fclose(file);
-       }
-       else
-       {
-               log(DEBUG,"readfile: failed to load file: %s",fname);
-       }
-
-       log(DEBUG,"readfile: loaded %s, %lu lines",fname,(unsigned long)F.size());
-}
-
-/** Write_NoFormat()
- *  Writes a given string in `text' to the socket on fd `sock' - only if the socket
- *  is a valid entry in the local FD table.
- */
-void Write_NoFormat(int sock, const char *text)
-{
-       char tb[MAXBUF];
-       int bytes;
-
-       if ((sock < 0) || (!text) || (sock > MAX_DESCRIPTORS))
-               return;
-
-       bytes = snprintf(tb,MAXBUF,"%s\r\n",text);
-       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!!!");
-}
-
-/** Write()
- *  Same as Write_NoFormat(), but formatted printf() style first.
- */
-void Write(int sock, char *text, ...)
-{
-       va_list argsPtr;
-       char textbuffer[MAXBUF];
-       char tb[MAXBUF];
-       int bytes;
-
-       if ((sock < 0) || (sock > MAX_DESCRIPTORS))
-               return;
-
-       if (!text)
-       {
-               log(DEFAULT,"*** BUG *** Write was given an invalid parameter");
-               return;
-       }
-
-       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])
-       {
-               if (Config->GetIOHook(fd_ref_table[sock]->port))
-               {
-                       try
-                       {
-                               Config->GetIOHook(fd_ref_table[sock]->port)->OnRawSocketWrite(sock,tb,bytes);
-                       }
-                       catch (ModuleException& modexcept)
-                       {
-                               log(DEBUG,"Module exception caught: %s",modexcept.GetReason());
-                       }                                               
-               }
-               else
-               {
-                       fd_ref_table[sock]->AddWriteBuf(tb);
-               }
-               ServerInstance->stats->statsSent += bytes;
-       }
-       else
-               log(DEFAULT,"ERROR! attempted write to a user with no fd_ref_table entry!!!");
-}
-
-/** WriteServ_NoFormat()
- *  Same as Write_NoFormat(), except prefixes `text' with `:server.name '.
- */
-void WriteServ_NoFormat(int sock, const char* text)
-{
-       char tb[MAXBUF];
-       int bytes;
-
-       if ((sock < 0) || (!text) || (sock > MAX_DESCRIPTORS))
-               return;
-
-       bytes = snprintf(tb,MAXBUF,":%s %s\r\n",Config->ServerName,text);
-       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()
- *  Same as Write(), except `text' is prefixed with `:server.name '.
- */
-void WriteServ(int sock, char* text, ...)
-{
-       va_list argsPtr;
-       char textbuffer[MAXBUF];
-       char tb[MAXBUF];
-       int bytes;
-
-       if ((sock < 0) || (sock > MAX_DESCRIPTORS))
-               return;
-
-       if (!text)
-       {
-               log(DEFAULT,"*** BUG *** WriteServ was given an invalid parameter");
-               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!!!");
-}
-
-/** WriteFrom_NoFormat()
- * Write `text' to a socket with fd `sock' prefixed with `:n!u@h' - taken from
- * the nick, user, and host of `user'.
- */
-void WriteFrom_NoFormat(int sock, userrec *user, const char* text)
-{
-       char tb[MAXBUF];
-       int bytes;
-
-       if ((sock < 0) || (!text) || (!user) || (sock > MAX_DESCRIPTORS))
-               return;
-
-       bytes = snprintf(tb,MAXBUF,":%s %s\r\n",user->GetFullHost(),text);
-       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!!!");
-}
-
-/* write text from an originating user to originating user */
-
-void WriteFrom(int sock, userrec *user,char* text, ...)
-{
-       va_list argsPtr;
-       char textbuffer[MAXBUF];
-       char tb[MAXBUF];
-       int bytes;
-
-       if ((sock < 0) || (sock > MAX_DESCRIPTORS))
-               return;
-
-       if ((!text) || (!user))
-       {
-               log(DEFAULT,"*** BUG *** WriteFrom was given an invalid parameter");
-               return;
-       }
-
-       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])
-       {
-               if (Config->GetIOHook(fd_ref_table[sock]->port))
-               {
-                       try
-                       {
-                               Config->GetIOHook(fd_ref_table[sock]->port)->OnRawSocketWrite(sock,tb,bytes);
-                       }
-                       catch (ModuleException& modexcept)
-                       {
-                               log(DEBUG,"Module exception caught: %s",modexcept.GetReason());
-                       }
-               }
-               else
-               {
-                       fd_ref_table[sock]->AddWriteBuf(tb);
-               }
-
-               ServerInstance->stats->statsSent += bytes;
-       }
-       else
-               log(DEFAULT,"ERROR! attempted write to a user with no fd_ref_table entry!!!");
-}
-
-/* write text to an destination user from a source user (e.g. user privmsg) */
-
-void WriteTo(userrec *source, userrec *dest,char *data, ...)
-{
-       char textbuffer[MAXBUF];
-       va_list argsPtr;
-
-       if ((!dest) || (!data))
-       {
-               log(DEFAULT,"*** BUG *** WriteTo was given an invalid parameter");
-               return;
-       }
-
-       if (!IS_LOCAL(dest))
-               return;
-
-       va_start(argsPtr, data);
-       vsnprintf(textbuffer, MAXBUF, data, argsPtr);
-       va_end(argsPtr);
-       chop(textbuffer);
-
-       // if no source given send it from the server.
-       if (!source)
-       {
-               WriteServ_NoFormat(dest->fd,textbuffer);
-       }
-       else
-       {
-               WriteFrom_NoFormat(dest->fd,source,textbuffer);
-       }
-}
-
-void WriteTo_NoFormat(userrec *source, userrec *dest, const char *data)
-{
-       if ((!dest) || (!data))
-               return;
-
-       if (!source)
-       {
-               WriteServ_NoFormat(dest->fd,data);
-       }
-       else
-       {
-               WriteFrom_NoFormat(dest->fd,source,data);
-       }
-}
-
-/* write formatted text from a source user to all users on a channel
- * including the sender (NOT for privmsg, notice etc!) */
-
-void WriteChannel(chanrec* Ptr, userrec* user, char* text, ...)
-{
-       char textbuffer[MAXBUF];
-       va_list argsPtr;
-       CUList *ulist;
-
-       if ((!Ptr) || (!user) || (!text))
-       {
-               log(DEFAULT,"*** BUG *** WriteChannel was given an invalid parameter");
-               return;
-       }
-
-       va_start(argsPtr, text);
-       vsnprintf(textbuffer, MAXBUF, text, argsPtr);
-       va_end(argsPtr);
-
-       ulist = Ptr->GetUsers();
-
-       for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
-       {
-               if (i->second->fd != FD_MAGIC_NUMBER)
-                       WriteTo_NoFormat(user,i->second,textbuffer);
-       }
-}
-
-void WriteChannel_NoFormat(chanrec* Ptr, userrec* user, const char* text)
-{
-       CUList *ulist;
-
-       if ((!Ptr) || (!user) || (!text))
-       {
-               log(DEFAULT,"*** BUG *** WriteChannel was given an invalid parameter");
-               return;
-       }
-
-       ulist = Ptr->GetUsers();
-
-       for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
-       {
-               if (i->second->fd != FD_MAGIC_NUMBER)
-                       WriteTo_NoFormat(user,i->second,text);
-       }
-}
-
-
-/* write formatted text from a source user to all users on a channel
- * including the sender (NOT for privmsg, notice etc!) doesnt send to
- * users on remote servers */
-
-void WriteChannelLocal(chanrec* Ptr, userrec* user, char* text, ...)
-{
-       char textbuffer[MAXBUF];
-       va_list argsPtr;
-       CUList *ulist;
-
-       if ((!Ptr) || (!text))
-       {
-               log(DEFAULT,"*** BUG *** WriteChannel was given an invalid parameter");
-               return;
-       }
-
-       va_start(argsPtr, text);
-       vsnprintf(textbuffer, MAXBUF, text, argsPtr);
-       va_end(argsPtr);
-
-       ulist = Ptr->GetUsers();
-
-       for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
-       {
-               if ((i->second->fd != FD_MAGIC_NUMBER) && (i->second != user))
-               {
-                       if (!user)
-                       {
-                               WriteServ_NoFormat(i->second->fd,textbuffer);
-                       }
-                       else
-                       {
-                               WriteTo_NoFormat(user,i->second,textbuffer);
-                       }
-               }
-       }
-}
-
-void WriteChannelLocal_NoFormat(chanrec* Ptr, userrec* user, const char* text)
-{
-       CUList *ulist;
-
-       if ((!Ptr) || (!text))
-       {
-               log(DEFAULT,"*** BUG *** WriteChannel was given an invalid parameter");
-               return;
-       }
-
-       ulist = Ptr->GetUsers();
-
-       for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
-       {
-               if ((i->second->fd != FD_MAGIC_NUMBER) && (i->second != user))
-               {
-                       if (!user)
-                       {
-                               WriteServ_NoFormat(i->second->fd,text);
-                       }
-                       else
-                       {
-                               WriteTo_NoFormat(user,i->second,text);
-                       }
-               }
-       }
-}
-
-
-
-void WriteChannelWithServ(char* ServName, chanrec* Ptr, char* text, ...)
-{
-       char textbuffer[MAXBUF];
-       va_list argsPtr;
-       CUList *ulist;
-
-       if ((!Ptr) || (!text))
-       {
-               log(DEFAULT,"*** BUG *** WriteChannelWithServ was given an invalid parameter");
-               return;
-       }
-
-       va_start(argsPtr, text);
-       vsnprintf(textbuffer, MAXBUF, text, argsPtr);
-       va_end(argsPtr);
-
-       ulist = Ptr->GetUsers();
-
-       for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
-       {
-               if (IS_LOCAL(i->second))
-                       WriteServ_NoFormat(i->second->fd,textbuffer);
-       }
-}
-
-void WriteChannelWithServ_NoFormat(char* ServName, chanrec* Ptr, const char* text)
-{
-       CUList *ulist;
-
-       if ((!Ptr) || (!text))
-       {
-               log(DEFAULT,"*** BUG *** WriteChannelWithServ was given an invalid parameter");
-               return;
-       }
-
-       ulist = Ptr->GetUsers();
-
-       for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
-       {
-               if (IS_LOCAL(i->second))
-                       WriteServ_NoFormat(i->second->fd,text);
-       }
-}
-
-
-
-/* write formatted text from a source user to all users on a channel except
- * for the sender (for privmsg etc) */
-
-void ChanExceptSender(chanrec* Ptr, userrec* user, char status, char* text, ...)
-{
-       char textbuffer[MAXBUF];
-       va_list argsPtr;
-       CUList *ulist;
-
-       if ((!Ptr) || (!user) || (!text))
-       {
-               log(DEFAULT,"*** BUG *** ChanExceptSender was given an invalid parameter");
-               return;
-       }
-
-       va_start(argsPtr, text);
-       vsnprintf(textbuffer, MAXBUF, text, argsPtr);
-       va_end(argsPtr);
-
-       switch (status)
-       {
-               case '@':
-                       ulist = Ptr->GetOppedUsers();
-                       break;
-               case '%':
-                       ulist = Ptr->GetHalfoppedUsers();
-                       break;
-               case '+':
-                       ulist = Ptr->GetVoicedUsers();
-                       break;
-               default:
-                       ulist = Ptr->GetUsers();
-                       break;
-       }
-
-       log(DEBUG,"%d users to write to",ulist->size());
-
-       for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
-       {
-               if ((IS_LOCAL(i->second)) && (user != i->second))
-                       WriteFrom_NoFormat(i->second->fd,user,textbuffer);
-       }
-}
-
-void ChanExceptSender_NoFormat(chanrec* Ptr, userrec* user, char status, const char* text)
-{
-       CUList *ulist;
-
-       if ((!Ptr) || (!user) || (!text))
-       {
-               log(DEFAULT,"*** BUG *** ChanExceptSender was given an invalid parameter");
-               return;
-       }
-
-       switch (status)
-       {
-               case '@':
-                       ulist = Ptr->GetOppedUsers();
-                       break;  
-               case '%':
-                       ulist = Ptr->GetHalfoppedUsers();
-                       break;
-               case '+':
-                       ulist = Ptr->GetVoicedUsers();
-                       break;
-               default:
-                       ulist = Ptr->GetUsers();
-                       break;
-       }
-
-       for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
-       {
-               if ((IS_LOCAL(i->second)) && (user != i->second))
-                       WriteFrom_NoFormat(i->second->fd,user,text);
-       }
-}
-
-std::string GetServerDescription(char* servername)
-{
-       std::string description = "";
-
-       FOREACH_MOD(I_OnGetServerDescription,OnGetServerDescription(servername,description));
-
-       if (description != "")
-       {
-               return description;
-       }
-       else
-       {
-               // not a remote server that can be found, it must be me.
-               return Config->ServerDesc;
-       }
-}
-
-/* write a formatted string to all users who share at least one common
- * channel, including the source user e.g. for use in NICK */
-
-void WriteCommon(userrec *u, char* text, ...)
-{
-       char textbuffer[MAXBUF];
-       va_list argsPtr;
-       bool sent_to_at_least_one = false;
-       unsigned int y;
-
-       if (!u)
-       {
-               log(DEFAULT,"*** BUG *** WriteCommon was given an invalid parameter");
-               return;
-       }
-
-       if (u->registered != 7)
-       {
-               log(DEFAULT,"*** BUG *** WriteCommon on an unregistered user");
-               return;
-       }
-
-       va_start(argsPtr, text);
-       vsnprintf(textbuffer, MAXBUF, text, argsPtr);
-       va_end(argsPtr);
-
-       // FIX: Stops a message going to the same person more than once
-       memset(&already_sent,0,MAX_DESCRIPTORS);
-       y = u->chans.size();
-
-       for (unsigned int i = 0; i < y; i++)
-       {
-               if (u->chans[i].channel)
-               {
-                       CUList *ulist= u->chans[i].channel->GetUsers();
-
-                       for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
-                       {
-                               if ((i->second->fd > -1) && (!already_sent[i->second->fd]))
-                               {
-                                       already_sent[i->second->fd] = 1;
-                                       WriteFrom_NoFormat(i->second->fd,u,textbuffer);
-                                       sent_to_at_least_one = true;
-                               }
-                       }
-               }
-       }
-
-       /*
-        * if the user was not in any channels, no users will receive the text. Make sure the user
-        * receives their OWN message for WriteCommon
-        */
-       if (!sent_to_at_least_one)
-       {
-               WriteFrom_NoFormat(u->fd,u,textbuffer);
-       }
-}
-
-void WriteCommon_NoFormat(userrec *u, const char* text)
-{
-       bool sent_to_at_least_one = false;
-       unsigned int y;
+#include "xline.h"
+#include "commands.h"
+#include "inspstring.h"
+#include "helperfuncs.h"
+#include "hashcomp.h"
+#include "typedefs.h"
+#include "inspircd.h"
 
-       if (!u)
-       {
-               log(DEFAULT,"*** BUG *** WriteCommon was given an invalid parameter");
-               return;
-       }
+extern int MODCOUNT;
+extern ModuleList modules;
+extern InspIRCd* ServerInstance;
+extern time_t TIME;
+extern char lowermap[255];
+extern std::vector<userrec*> all_opers;
 
-       if (u->registered != 7)
-       {
-               log(DEFAULT,"*** BUG *** WriteCommon on an unregistered user");
-               return;
-       }
+char LOG_FILE[MAXBUF];
 
-       // FIX: Stops a message going to the same person more than once
-       memset(&already_sent,0,MAX_DESCRIPTORS);
-       y = u->chans.size();
+static char TIMESTR[26];
+static time_t LAST = 0;
 
-       for (unsigned int i = 0; i < y; i++)
-       {
-               if (u->chans[i].channel)
-               {
-                       CUList *ulist= u->chans[i].channel->GetUsers();
+/** 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, ...)
+{
+       va_list argsPtr;
+       char textbuffer[MAXBUF];
 
-                       for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
-                       {
-                               if ((i->second->fd > -1) && (!already_sent[i->second->fd]))
-                               {
-                                       already_sent[i->second->fd] = 1;
-                                       WriteFrom_NoFormat(i->second->fd,u,text);
-                                       sent_to_at_least_one = true;
-                               }
-                       }
-               }
-       }
+       va_start(argsPtr, text);
+       vsnprintf(textbuffer, MAXBUF, text, argsPtr);
+       va_end(argsPtr);
 
-       /*
-        * if the user was not in any channels, no users will receive the text. Make sure the user
-        * receives their OWN message for WriteCommon
-        */
-       if (!sent_to_at_least_one)
-       {
-               WriteFrom_NoFormat(u->fd,u,text);
-       }
+       InspIRCd::Log(level, std::string(textbuffer));
 }
 
-
-/* write a formatted string to all users who share at least one common
- * channel, NOT including the source user e.g. for use in QUIT
- */
-
-void WriteCommonExcept(userrec *u, char* text, ...)
+void InspIRCd::Log(int level, const std::string &text)
 {
-       char textbuffer[MAXBUF];
-       char oper_quit[MAXBUF];
-       bool quit_munge = false;
-       va_list argsPtr;
-       int total;
-       unsigned int y;
-
-       if (!u)
-       {
-               log(DEFAULT,"*** BUG *** WriteCommon was given an invalid parameter");
+       if (!ServerInstance || !ServerInstance->Config)
                return;
-       }
 
-       if (u->registered != 7)
-       {
-               log(DEFAULT,"*** BUG *** WriteCommon on an unregistered user");
+       /* If we were given -debug we output all messages, regardless of configured loglevel */
+       if ((level < ServerInstance->Config->LogLevel) && !ServerInstance->Config->forcedebug)
                return;
-       }
-
-       va_start(argsPtr, text);
-       total = vsnprintf(textbuffer, MAXBUF, text, argsPtr);
-       va_end(argsPtr);
 
-       if ((Config->HideSplits) && (total > 6))
+       if (TIME != LAST)
        {
-               /* Yeah yeah, this is ugly. But its fast, live with it. */
-               char* check = textbuffer;
-
-               if ((*check++ == 'Q') && (*check++ == 'U') && (*check++ == 'I') && (*check++ == 'T') && (*check++ == ' ') && (*check++ == ':'))
-               {
-                       std::stringstream split(check);
-                       std::string server_one;
-                       std::string server_two;
-
-                       split >> server_one;
-                       split >> server_two;
+               struct tm *timeinfo = localtime(&TIME);
 
-                       if ((FindServerName(server_one)) && (FindServerName(server_two)))
-                       {
-                               strlcpy(oper_quit,textbuffer,MAXQUIT);
-                               strlcpy(check,"*.net *.split",MAXQUIT);
-                               quit_munge = true;
-                       }
-               }
+               strlcpy(TIMESTR,asctime(timeinfo),26);
+               TIMESTR[24] = ':';
+               LAST = TIME;
        }
 
-       if ((Config->HideBans) && (total > 13) && (!quit_munge))
+       if (ServerInstance->Config->log_file && ServerInstance->Config->writelog)
        {
-               char* check = textbuffer;
-
-               /* XXX - as above */
-               if ((*check++ == 'Q') && (*check++ == 'U') && (*check++ == 'I') && (*check++ == 'T') && (*check++ == ' ') && (*check++ == ':'))
-               {
-                       check++;
-
-                       if ((*check++ == '-') && (*check++ == 'L') && (*check++ == 'i') && (*check++ == 'n') && (*check++ == 'e') && (*check++ == 'd') && (*check++ == ':'))
-                       {
-                               strlcpy(oper_quit,textbuffer,MAXQUIT);
-                               *(--check) = 0;         // We don't need to strlcpy, we just chop it from the :
-                               quit_munge = true;
-                       }
-               }
+               fprintf(ServerInstance->Config->log_file,"%s %s\n",TIMESTR,text.c_str());
+               fflush(ServerInstance->Config->log_file);
        }
 
-       memset(&already_sent,0,MAX_DESCRIPTORS);
-       y = u->chans.size();
-
-       for (unsigned int i = 0; i < y; i++)
+       if (ServerInstance->Config->nofork)
        {
-               if (u->chans[i].channel)
-               {
-                       CUList *ulist= u->chans[i].channel->GetUsers();
-
-                       for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
-                       {
-                               if (u != i->second)
-                               {
-                                       if ((i->second->fd > -1) && (!already_sent[i->second->fd]))
-                                       {
-                                               already_sent[i->second->fd] = 1;
-
-                                               if (quit_munge)
-                                               {
-                                                       WriteFrom_NoFormat(i->second->fd,u,*i->second->oper ? oper_quit : textbuffer);
-                                               }
-                                               else
-                                                       WriteFrom_NoFormat(i->second->fd,u,textbuffer);
-                                       }
-                               }
-                       }
-               }
+               printf("%s %s\n", TIMESTR, text.c_str());
        }
 }
 
-void WriteCommonExcept_NoFormat(userrec *u, const char* text)
+std::string GetServerDescription(const char* servername)
 {
-       unsigned int y;
+       std::string description = "";
 
-       if (!u)
-       {
-               log(DEFAULT,"*** BUG *** WriteCommon was given an invalid parameter");
-               return;
-       }
-       if (u->registered != 7)
+       FOREACH_MOD(I_OnGetServerDescription,OnGetServerDescription(servername,description));
+
+       if (description != "")
        {
-               log(DEFAULT,"*** BUG *** WriteCommon on an unregistered user");
-               return;
+               return description;
        }
-
-       memset(&already_sent,0,MAX_DESCRIPTORS);
-       y = u->chans.size();
-
-       for (unsigned int i = 0; i < y; i++)
+       else
        {
-               if (u->chans[i].channel)
-               {
-                       CUList *ulist= u->chans[i].channel->GetUsers();
-
-                       for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
-                       {
-                               if (u != i->second)
-                               {
-                                       if ((i->second->fd > -1) && (!already_sent[i->second->fd]))
-                                       {
-                                               already_sent[i->second->fd] = 1;
-                                               WriteFrom_NoFormat(i->second->fd,u,text);
-                                       }
-                               }
-                       }
-               }
+               // not a remote server that can be found, it must be me.
+               return ServerInstance->Config->ServerDesc;
        }
 }
 
-
 /* XXX - We don't use WriteMode for this because WriteMode is very slow and
  * this isnt. Basically WriteMode has to iterate ALL the users 'n' times for
  * the number of modes provided, e.g. if you send WriteMode 'og' to write to
@@ -963,7 +126,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,58 +141,75 @@ 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);
+                               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);
 
+       snprintf(formatbuffer,MAXBUF,"NOTICE $%s :%s",ServerInstance->Config->ServerName,textbuffer);
+
        for (std::vector<userrec*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
        {
-               userrec* t = (userrec*)(*i);
-               WriteServ(t->fd,"NOTICE $%s :%s",Config->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);
 
+       snprintf(formatbuffer,MAXBUF,"PRIVMSG $%s :%s",ServerInstance->Config->ServerName,textbuffer);
+
        for (std::vector<userrec*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
        {
-               userrec* t = (userrec*)(*i);
-               WriteServ(t->fd,"PRIVMSG $%s :%s",Config->ServerName,textbuffer);
+               userrec* t = *i;
+               t->WriteServ(std::string(formatbuffer));
        }
 }
 
-void WriteMode(const char* modes, int flags, const char* text, ...)
+void InspIRCd::WriteMode(const char* modes, int flags, const char* text, ...)
 {
        char textbuffer[MAXBUF];
        int modelen;
@@ -1057,7 +237,7 @@ void WriteMode(const char* modes, int flags, const char* text, ...)
 
                        for (int n = 0; n < modelen; n++)
                        {
-                               if (!hasumode(t,modes[n]))
+                               if (!t->modes[modes[n]-65])
                                {
                                        send_to_user = false;
                                        break;
@@ -1070,7 +250,7 @@ void WriteMode(const char* modes, int flags, const char* text, ...)
 
                        for (int n = 0; n < modelen; n++)
                        {
-                               if (hasumode(t,modes[n]))
+                               if (t->modes[modes[n]-65])
                                {
                                        send_to_user = true;
                                        break;
@@ -1080,56 +260,7 @@ void WriteMode(const char* modes, int flags, const char* text, ...)
 
                if (send_to_user)
                {
-                       WriteServ(t->fd,"NOTICE %s :%s",t->nick,textbuffer);
-               }
-       }
-}
-
-void NoticeAll(userrec *source, bool local_only, char* text, ...)
-{
-       char textbuffer[MAXBUF];
-       va_list argsPtr;
-
-       if ((!text) || (!source))
-       {
-               log(DEFAULT,"*** BUG *** NoticeAll was given an invalid parameter");
-               return;
-       }
-
-       va_start(argsPtr, text);
-       vsnprintf(textbuffer, MAXBUF, text, argsPtr);
-       va_end(argsPtr);
-
-       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);
-       }
-}
-
-
-void WriteWallOps(userrec *source, bool local_only, char* text, ...)
-{
-       char textbuffer[MAXBUF];
-       va_list argsPtr;
-
-       if ((!text) || (!source))
-       {
-               log(DEFAULT,"*** BUG *** WriteOpers was given an invalid parameter");
-               return;
-       }
-
-       va_start(argsPtr, text);
-       vsnprintf(textbuffer, MAXBUF, text, argsPtr);
-       va_end(argsPtr);
-
-       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')))
-               {
-                       WriteTo(source,t,"WALLOPS :%s",textbuffer);
+                       t->WriteServ("NOTICE %s :%s",t->nick,textbuffer);
                }
        }
 }
@@ -1148,17 +279,17 @@ 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);
+       user_hash::iterator iter = ServerInstance->clientlist.find(nick);
 
-       if (iter == clientlist.end())
+       if (iter == ServerInstance->clientlist.end())
                /* Couldn't find it */
                return NULL;
 
@@ -1172,9 +303,9 @@ userrec* Find(const char* nick)
        if (!nick)
                return NULL;
 
-       iter = clientlist.find(nick);
+       iter = ServerInstance->clientlist.find(nick);
        
-       if (iter == clientlist.end())
+       if (iter == ServerInstance->clientlist.end())
                return NULL;
 
        return iter->second;
@@ -1192,9 +323,9 @@ chanrec* FindChan(const char* chan)
                return NULL;
        }
 
-       iter = chanlist.find(chan);
+       iter = ServerInstance->chanlist.find(chan);
 
-       if (iter == chanlist.end())
+       if (iter == ServerInstance->chanlist.end())
                /* Couldn't find it */
                return NULL;
 
@@ -1205,7 +336,7 @@ chanrec* FindChan(const char* chan)
 long GetMaxBans(char* name)
 {
        std::string x;
-       for (std::map<std::string,int>::iterator n = Config->maxbans.begin(); n != Config->maxbans.end(); n++)
+       for (std::map<std::string,int>::iterator n = ServerInstance->Config->maxbans.begin(); n != ServerInstance->Config->maxbans.end(); n++)
        {
                x = n->first;
                if (match(name,x.c_str()))
@@ -1218,50 +349,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)
+               ucrec* uc = (ucrec*)(*f);
+               if (uc->channel)
                {
-                       u->chans[f].channel->DelUser(u);
+                       if (uc->channel->DelUser(u) == 0)
+                       {
+                               /* No users left in here, mark it for deletion */
+                               to_delete.push_back(uc->channel);
+                               uc->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 = ServerInstance->chanlist.find(thischan->name);
+               if (i2 != ServerInstance->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);
+                       ServerInstance->chanlist.erase(i2);
                }
        }
 
-       log(DEBUG,"completed channel purge, killed %lu",(unsigned long)purge);
-       DeleteOper(u);
+       u->UnOper();
 }
 
 
@@ -1270,6 +389,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 +401,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)
-       {
-               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++)
+       /* This was still iterating up to 190, chanrec::custom_modes is only 64 elements -- Om */
+       for(int n = 0; n < 64; 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 +438,7 @@ char* chanmodes(chanrec *chan, bool showkey)
 
        /* Null terminate scratch */
        *offset = '\0';
-       strlcat(scratch,sparam,MAXMODES);
+       strlcat(scratch,sparam,MAXBUF);
        return scratch;
 }
 
@@ -1343,8 +454,13 @@ 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();
 
@@ -1355,7 +471,7 @@ void userlist(userrec *user,chanrec *c)
 
        for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
        {
-               if ((!has_user) && (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
@@ -1364,23 +480,31 @@ 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);
+                       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 (dlen != initial)
+       if (numusers)
        {
-               WriteServ_NoFormat(user->fd,list);
+               user->WriteServ(list);
        }
 }
 
@@ -1398,58 +522,58 @@ 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++;
        }
 
        return count;
 }
 
-int usercount(chanrec *c)
-{
-       return (c ? c->GetUserCounter() : 0);
-}
-
-
-/* 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++)
+       for (ClassVector::iterator i = ServerInstance->Config->Classes.begin(); i != ServerInstance->Config->Classes.end(); i++)
        {
-               if (match(user->host,i->host.c_str()))
+               if ((match(user->GetIPString(),i->host.c_str(),true)) || (match(user->host,i->host.c_str())))
                {
                        return *i;
                }
        }
 
-       return *(Config->Classes.begin());
+       return *(ServerInstance->Config->Classes.begin());
 }
 
 /*
  * sends out an error notice to all connected clients (not to be used
  * lightly!)
  */
-void send_error(char *s)
+void InspIRCd::SendError(const char *s)
 {
-       log(DEBUG,"send_error: %s",s);
-
-       for (std::vector<userrec*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
+       for (std::vector<userrec*>::const_iterator i = this->local_users.begin(); i != this->local_users.end(); i++)
        {
                userrec* t = (userrec*)(*i);
-               if (t->registered == 7)
+               if (t->registered == REG_ALL)
                {
-                       WriteServ(t->fd,"NOTICE %s :%s",t->nick,s);
+                       t->WriteServ("NOTICE %s :%s",t->nick,s);
                }
                else
                {
                        // fix - unregistered connections receive ERROR, not NOTICE
-                       Write(t->fd,"ERROR :%s",s);
+                       t->Write("ERROR :%s",s);
                }
        }
 }
 
 void Error(int status)
 {
+       void *array[300];
+       size_t size;
+       char **strings;
+
        signal(SIGALRM, SIG_IGN);
        signal(SIGPIPE, SIG_IGN);
        signal(SIGTERM, SIG_IGN);
@@ -1458,81 +582,97 @@ 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
+       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();
 }
 
 // this counts only registered users, so that the percentages in /MAP don't mess up when users are sitting in an unregistered state
-int registered_usercount(void)
+int InspIRCd::registered_usercount()
 {
        int c = 0;
 
        for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
        {
-               if (i->second->registered == 7) c++;
+               c += (i->second->registered == REG_ALL);
        }
 
        return c;
 }
 
-int usercount_invisible(void)
+int InspIRCd::usercount_invisible()
 {
        int c = 0;
 
        for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
        {
-               if ((i->second->registered == 7) && (strchr(i->second->modes,'i')))
-                       c++;
+               c += ((i->second->registered == REG_ALL) && (i->second->modes[UM_INVISIBLE]));
        }
 
        return c;
 }
 
-int usercount_opers(void)
+int InspIRCd::usercount_opers()
 {
        int c = 0;
 
        for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
        {
-               if (i->second->oper)
+               if (*(i->second->oper))
                        c++;
        }
        return c;
 }
 
-int usercount_unknown(void)
+int InspIRCd::usercount_unknown()
 {
        int c = 0;
 
        for (std::vector<userrec*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
        {
                userrec* t = (userrec*)(*i);
-               if (t->registered != 7)
+               if (t->registered != REG_ALL)
                        c++;
        }
 
        return c;
 }
 
-long chancount(void)
+long InspIRCd::chancount()
 {
        return chanlist.size();
 }
 
-long local_count()
+long InspIRCd::local_count()
 {
        int c = 0;
 
        for (std::vector<userrec*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
        {
                userrec* t = (userrec*)(*i);
-               if (t->registered == 7)
+               if (t->registered == REG_ALL)
                        c++;
        }
 
@@ -1541,59 +681,32 @@ long local_count()
 
 void ShowMOTD(userrec *user)
 {
-       static char mbuf[MAXBUF];
-       static char crud[MAXBUF];
-       std::string WholeMOTD = "";
-
-       if (!Config->MOTD.size())
+       if (!ServerInstance->Config->MOTD.size())
        {
-               WriteServ(user->fd,"422 %s :Message of the day file is missing.",user->nick);
+               user->WriteServ("422 %s :Message of the day file is missing.",user->nick);
                return;
        }
+       user->WriteServ("375 %s :%s message of the day", user->nick, ServerInstance->Config->ServerName);
 
-       snprintf(crud,MAXBUF,":%s 372 %s :- ", Config->ServerName, user->nick);
-       snprintf(mbuf,MAXBUF,":%s 375 %s :- %s message of the day\r\n", Config->ServerName, user->nick, Config->ServerName);
-       WholeMOTD = WholeMOTD + mbuf;
-
-       for (unsigned int i = 0; i < Config->MOTD.size(); i++)
-               WholeMOTD = WholeMOTD + std::string(crud) + Config->MOTD[i].c_str() + std::string("\r\n");
-
-       snprintf(mbuf,MAXBUF,":%s 376 %s :End of message of the day.\r\n", Config->ServerName, user->nick);
-       WholeMOTD = WholeMOTD + mbuf;
-
-       // only one write operation
-       if (Config->GetIOHook(user->port))
-       {
-               try
-               {
-                       Config->GetIOHook(user->port)->OnRawSocketWrite(user->fd,(char*)WholeMOTD.c_str(),WholeMOTD.length());
-               }
-               catch (ModuleException& modexcept)
-               {
-                       log(DEBUG,"Module exception caught: %s",modexcept.GetReason());
-               }
-       }
-       else
-       {
-               user->AddWriteBuf(WholeMOTD);
-       }
+       for (unsigned int i = 0; i < ServerInstance->Config->MOTD.size(); i++)
+               user->WriteServ("372 %s :- %s",user->nick,ServerInstance->Config->MOTD[i].c_str());
 
-       ServerInstance->stats->statsSent += WholeMOTD.length();
+       user->WriteServ("376 %s :End of message of the day.", user->nick);
 }
 
 void ShowRULES(userrec *user)
 {
-       if (!Config->RULES.size())
+       if (!ServerInstance->Config->RULES.size())
        {
-               WriteServ(user->fd,"NOTICE %s :Rules file is missing.",user->nick);
+               user->WriteServ("NOTICE %s :Rules file is missing.",user->nick);
                return;
        }
-       WriteServ(user->fd,"NOTICE %s :%s rules",user->nick,Config->ServerName);
+       user->WriteServ("NOTICE %s :%s rules",user->nick,ServerInstance->Config->ServerName);
 
-       for (unsigned int i = 0; i < Config->RULES.size(); i++)
-               WriteServ(user->fd,"NOTICE %s :%s",user->nick,Config->RULES[i].c_str());
+       for (unsigned int i = 0; i < ServerInstance->Config->RULES.size(); i++)
+               user->WriteServ("NOTICE %s :%s",user->nick,ServerInstance->Config->RULES[i].c_str());
 
-       WriteServ(user->fd,"NOTICE %s :End of %s rules.",user->nick,Config->ServerName);
+       user->WriteServ("NOTICE %s :End of %s rules.",user->nick,ServerInstance->Config->ServerName);
 }
 
 // this returns 1 when all modules are satisfied that the user should be allowed onto the irc server
@@ -1601,12 +714,12 @@ void ShowRULES(userrec *user)
 // registration timeout maximum seconds)
 bool AllModulesReportReady(userrec* user)
 {
-       if (!Config->global_implementation[I_OnCheckReady])
+       if (!ServerInstance->Config->global_implementation[I_OnCheckReady])
                return true;
 
        for (int i = 0; i <= MODCOUNT; i++)
        {
-               if (Config->implement_lists[i][I_OnCheckReady])
+               if (ServerInstance->Config->implement_lists[i][I_OnCheckReady])
                {
                        int res = modules[i]->OnCheckReady(user);
                        if (!res)
@@ -1617,6 +730,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];
@@ -1791,9 +932,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 (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);
+}