summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2005-05-15 03:03:23 +0000
committerbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2005-05-15 03:03:23 +0000
commiteb4229deed0281ae566ef7e55a144e5d3183a4b2 (patch)
treeb99c2b78da26b68e04dcccba5bc6efb55706d237 /src
parent84b6d82413c71c845c97279ea9150089cd9f8b5a (diff)
Moved a ton of functions into helperfuncs.h to speed up recompiles
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@1383 e03df62e-2008-0410-955e-edbf42e46eb7
Diffstat (limited to 'src')
-rw-r--r--src/Makefile8
-rw-r--r--src/base.cpp1
-rw-r--r--src/channels.cpp1
-rw-r--r--src/commands.cpp73
-rw-r--r--src/connection.cpp1
-rw-r--r--src/dns.cpp1
-rw-r--r--src/dnsqueue.cpp73
-rw-r--r--src/dynamic.cpp1
-rw-r--r--src/helperfuncs.cpp1591
-rw-r--r--src/inspircd.cpp1556
-rw-r--r--src/inspircd_io.cpp1
-rw-r--r--src/inspircd_util.cpp1
-rw-r--r--src/message.cpp1
-rw-r--r--src/mode.cpp1
-rw-r--r--src/modules.cpp72
-rw-r--r--src/modules/extra/m_filter_pcre.cpp1
-rw-r--r--src/modules/extra/m_sql.cpp1
-rw-r--r--src/modules/extra/m_sqlauth.cpp1
-rw-r--r--src/modules/extra/m_sqloper.cpp1
-rw-r--r--src/modules/m_blockcolor.cpp1
-rw-r--r--src/modules/m_censor.cpp1
-rw-r--r--src/modules/m_chanfilter.cpp1
-rw-r--r--src/modules/m_chanprotect.cpp1
-rw-r--r--src/modules/m_filter.cpp1
-rw-r--r--src/modules/m_helpop.cpp1
-rw-r--r--src/modules/m_knock.cpp1
-rw-r--r--src/modules/m_nicklock.cpp1
-rw-r--r--src/modules/m_noctcp.cpp1
-rw-r--r--src/modules/m_noinvite.cpp1
-rw-r--r--src/modules/m_nokicks.cpp1
-rw-r--r--src/modules/m_nonicks.cpp1
-rw-r--r--src/modules/m_nonotice.cpp1
-rw-r--r--src/modules/m_operchans.cpp1
-rw-r--r--src/modules/m_operjoin.cpp1
-rw-r--r--src/modules/m_operlevels.cpp1
-rw-r--r--src/modules/m_opermd5.cpp1
-rw-r--r--src/modules/m_opermotd.cpp1
-rw-r--r--src/modules/m_override.cpp1
-rw-r--r--src/modules/m_park.cpp1
-rw-r--r--src/modules/m_randquote.cpp1
-rw-r--r--src/modules/m_redirect.cpp1
-rw-r--r--src/modules/m_restrictchans.cpp1
-rw-r--r--src/modules/m_restrictmsg.cpp1
-rw-r--r--src/modules/m_sethost.cpp1
-rw-r--r--src/modules/m_setidle.cpp1
-rw-r--r--src/modules/m_setname.cpp1
-rw-r--r--src/modules/m_showwhois.cpp1
-rw-r--r--src/modules/m_silence.cpp1
-rw-r--r--src/modules/m_timedbans.cpp1
-rw-r--r--src/modules/m_userip.cpp1
-rw-r--r--src/servers.cpp1
-rw-r--r--src/users.cpp1
-rw-r--r--src/wildcard.cpp1
-rw-r--r--src/xline.cpp74
54 files changed, 1654 insertions, 1840 deletions
diff --git a/src/Makefile b/src/Makefile
index b182aab6b..91d3333f1 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -9,10 +9,14 @@ CC = im a cheezeball
CXXFLAGS = -I$../include ${FLAGS}
-all: libIRCDchannels.so libIRCDmode.so libIRCDxline.so libIRCDstring.so libIRCDasyncdns.so libIRCDbase.so libIRCDutil.so libIRCDio.so libIRCDconnection.so libIRCDmessage.so libIRCDcommands.so libIRCDdnsqueue.so libIRCDdynamic.so libIRCDusers.so libIRCDmodules.so libIRCDwildcard.so libIRCDservers.so inspircd
+all: libIRCDchannels.so libIRCDmode.so libIRCDxline.so libIRCDstring.so libIRCDasyncdns.so libIRCDbase.so libIRCDutil.so libIRCDio.so libIRCDconnection.so libIRCDmessage.so libIRCDcommands.so libIRCDdnsqueue.so libIRCDdynamic.so libIRCDusers.so libIRCDmodules.so libIRCDwildcard.so libIRCDservers.so libIRCDhelper.so inspircd
inspircd: inspircd.cpp ../include/base.h ../include/channels.h ../include/inspircd.h ../include/channels.h ../include/globals.h ../include/inspircd_config.h
- $(CXX) -I../include $(FLAGS) -rdynamic -L. inspircd.cpp -o inspircd $(LDLIBS) libIRCDchannels.so libIRCDmode.so libIRCDxline.so libIRCDstring.so libIRCDasyncdns.so libIRCDbase.so libIRCDutil.so libIRCDio.so libIRCDconnection.so libIRCDmessage.so libIRCDcommands.so libIRCDdnsqueue.so libIRCDdynamic.so libIRCDusers.so libIRCDmodules.so libIRCDwildcard.so libIRCDservers.so
+ $(CXX) -I../include $(FLAGS) -rdynamic -L. inspircd.cpp -o inspircd $(LDLIBS) libIRCDchannels.so libIRCDmode.so libIRCDxline.so libIRCDstring.so libIRCDasyncdns.so libIRCDbase.so libIRCDutil.so libIRCDio.so libIRCDconnection.so libIRCDmessage.so libIRCDcommands.so libIRCDdnsqueue.so libIRCDdynamic.so libIRCDusers.so libIRCDmodules.so libIRCDwildcard.so libIRCDservers.so libIRCDhelper.so
+
+libIRCDhelper.so: helperfuncs.cpp ../include/base.h ../include/helperfuncs.h ../include/inspircd.h ../include/users.h ../include/globals.h ../include/inspircd_config.h
+ $(CC) -pipe -I../include $(FLAGS) -export-dynamic -c helperfuncs.cpp
+ $(CC) -shared -o libIRCDhelper.so helperfuncs.o
libIRCDchannels.so: channels.cpp ../include/base.h ../include/channels.h ../include/inspircd.h ../include/users.h ../include/globals.h ../include/inspircd_config.h
$(CC) -pipe -I../include $(FLAGS) -export-dynamic -c channels.cpp
diff --git a/src/base.cpp b/src/base.cpp
index 9cecc71f2..1dc4705b8 100644
--- a/src/base.cpp
+++ b/src/base.cpp
@@ -21,6 +21,7 @@
#include <string>
#include "inspircd.h"
#include "modules.h"
+#include "helperfuncs.h"
extern time_t TIME;
diff --git a/src/channels.cpp b/src/channels.cpp
index 7962665b7..b8ad3d95a 100644
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -51,6 +51,7 @@
#include "mode.h"
#include "xline.h"
#include "inspstring.h"
+#include "helperfuncs.h"
#ifdef GCC3
#define nspace __gnu_cxx
diff --git a/src/commands.cpp b/src/commands.cpp
index d81f493a6..e327aa712 100644
--- a/src/commands.cpp
+++ b/src/commands.cpp
@@ -64,12 +64,8 @@
#include "xline.h"
#include "inspstring.h"
#include "dnsqueue.h"
-
-#ifdef GCC3
-#define nspace __gnu_cxx
-#else
-#define nspace std
-#endif
+#include "helperfuncs.h"
+#include "hashcomp.h"
using namespace std;
@@ -133,71 +129,6 @@ const long duration_d = duration_h * 24;
const long duration_w = duration_d * 7;
const long duration_y = duration_w * 52;
-namespace nspace
-{
-#ifdef GCC34
- template<> struct hash<in_addr>
-#else
- template<> struct nspace::hash<in_addr>
-#endif
- {
- size_t operator()(const struct in_addr &a) const
- {
- size_t q;
- memcpy(&q,&a,sizeof(size_t));
- return q;
- }
- };
-#ifdef GCC34
- template<> struct hash<string>
-#else
- template<> struct nspace::hash<string>
-#endif
- {
- size_t operator()(const string &s) const
- {
- char a[MAXBUF];
- static struct hash<const char *> strhash;
- strlcpy(a,s.c_str(),MAXBUF);
- strlower(a);
- return strhash(a);
- }
- };
-}
-
-
-struct StrHashComp
-{
-
- bool operator()(const string& s1, const string& s2) const
- {
- char a[MAXBUF],b[MAXBUF];
- strlcpy(a,s1.c_str(),MAXBUF);
- strlcpy(b,s2.c_str(),MAXBUF);
- strlower(a);
- strlower(b);
- return (strcasecmp(a,b) == 0);
- }
-
-};
-
-struct InAddr_HashComp
-{
-
- bool operator()(const in_addr &s1, const in_addr &s2) const
- {
- size_t q;
- size_t p;
-
- memcpy(&q,&s1,sizeof(size_t));
- memcpy(&p,&s2,sizeof(size_t));
-
- return (q == p);
- }
-
-};
-
-
typedef nspace::hash_map<std::string, userrec*, nspace::hash<string>, StrHashComp> user_hash;
typedef nspace::hash_map<std::string, chanrec*, nspace::hash<string>, StrHashComp> chan_hash;
typedef nspace::hash_map<in_addr,string*, nspace::hash<in_addr>, InAddr_HashComp> address_cache;
diff --git a/src/connection.cpp b/src/connection.cpp
index 031feba02..384f626e2 100644
--- a/src/connection.cpp
+++ b/src/connection.cpp
@@ -28,6 +28,7 @@
#include "inspircd.h"
#include "modules.h"
#include "inspstring.h"
+#include "helperfuncs.h"
using namespace std;
diff --git a/src/dns.cpp b/src/dns.cpp
index 73566cf89..368aa485d 100644
--- a/src/dns.cpp
+++ b/src/dns.cpp
@@ -34,6 +34,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include <netinet/in.h>
#include <arpa/inet.h>
#include "dns.h"
+#include "helperfuncs.h"
extern int statsAccept,statsRefused,statsUnknown,statsCollisions,statsDns,statsDnsGood,statsDnsBad,statsConnects,statsSent,statsRecv;
diff --git a/src/dnsqueue.cpp b/src/dnsqueue.cpp
index c05b12549..2198d0bed 100644
--- a/src/dnsqueue.cpp
+++ b/src/dnsqueue.cpp
@@ -70,12 +70,8 @@ using namespace std;
#include <errno.h>
#include <fcntl.h>
#include "dns.h"
-
-#ifdef GCC3
-#define nspace __gnu_cxx
-#else
-#define nspace std
-#endif
+#include "helperfuncs.h"
+#include "hashcomp.h"
extern int MaxWhoResults;
@@ -86,71 +82,6 @@ extern std::vector<int> fd_reap;
extern int MODCOUNT;
-namespace nspace
-{
-#ifdef GCC34
- template<> struct hash<in_addr>
-#else
- template<> struct nspace::hash<in_addr>
-#endif
- {
- size_t operator()(const struct in_addr &a) const
- {
- size_t q;
- memcpy(&q,&a,sizeof(size_t));
- return q;
- }
- };
-#ifdef GCC34
- template<> struct hash<string>
-#else
- template<> struct nspace::hash<string>
-#endif
- {
- size_t operator()(const string &s) const
- {
- char a[MAXBUF];
- static struct hash<const char *> strhash;
- strlcpy(a,s.c_str(),MAXBUF);
- strlower(a);
- return strhash(a);
- }
- };
-}
-
-
-struct StrHashComp
-{
-
- bool operator()(const string& s1, const string& s2) const
- {
- char a[MAXBUF],b[MAXBUF];
- strlcpy(a,s1.c_str(),MAXBUF);
- strlcpy(b,s2.c_str(),MAXBUF);
- strlower(a);
- strlower(b);
- return (strcasecmp(a,b) == 0);
- }
-
-};
-
-struct InAddr_HashComp
-{
-
- bool operator()(const in_addr &s1, const in_addr &s2) const
- {
- size_t q;
- size_t p;
-
- memcpy(&q,&s1,sizeof(size_t));
- memcpy(&p,&s2,sizeof(size_t));
-
- return (q == p);
- }
-
-};
-
-
typedef nspace::hash_map<std::string, userrec*, nspace::hash<string>, StrHashComp> user_hash;
typedef nspace::hash_map<std::string, chanrec*, nspace::hash<string>, StrHashComp> chan_hash;
typedef nspace::hash_map<in_addr,string*, nspace::hash<in_addr>, InAddr_HashComp> address_cache;
diff --git a/src/dynamic.cpp b/src/dynamic.cpp
index 9cc68fc5f..2aa309ad3 100644
--- a/src/dynamic.cpp
+++ b/src/dynamic.cpp
@@ -18,6 +18,7 @@
#include <dlfcn.h>
#include "dynamic.h"
#include "inspstring.h"
+#include "helperfuncs.h"
DLLManager::DLLManager(const char *fname)
{
diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp
new file mode 100644
index 000000000..98e26ff69
--- /dev/null
+++ b/src/helperfuncs.cpp
@@ -0,0 +1,1591 @@
+#include "inspircd.h"
+#include "inspircd_io.h"
+#include "inspircd_util.h"
+#include "inspircd_config.h"
+#include <unistd.h>
+#include <fcntl.h>
+#include <sys/errno.h>
+#include <sys/ioctl.h>
+#include <sys/utsname.h>
+#ifdef USE_KQUEUE
+#include <sys/types.h>
+#include <sys/event.h>
+#include <sys/time.h>
+#endif
+#include <cstdio>
+#include <time.h>
+#include <string>
+#ifdef GCC3
+#include <ext/hash_map>
+#else
+#include <hash_map>
+#endif
+#include <map>
+#include <sstream>
+#include <vector>
+#include <errno.h>
+#include <deque>
+#include <errno.h>
+#include <unistd.h>
+#include <sched.h>
+#include "connection.h"
+#include "users.h"
+#include "servers.h"
+#include "ctables.h"
+#include "globals.h"
+#include "modules.h"
+#include "dynamic.h"
+#include "wildcard.h"
+#include "message.h"
+#include "mode.h"
+#include "xline.h"
+#include "commands.h"
+#include "inspstring.h"
+#include "helperfuncs.h"
+#include "hashcomp.h"
+
+using namespace std;
+
+#ifdef USE_KQUEUE
+extern int kq;
+#endif
+
+extern int MODCOUNT;
+extern std::vector<Module*> modules;
+extern std::vector<ircd_module*> factory;
+
+extern time_t TIME;
+
+extern bool nofork;
+
+extern char lowermap[255];
+
+extern int LogLevel;
+extern char ServerName[MAXBUF];
+extern char Network[MAXBUF];
+extern char ServerDesc[MAXBUF];
+extern char AdminName[MAXBUF];
+extern char AdminEmail[MAXBUF];
+extern char AdminNick[MAXBUF];
+extern char diepass[MAXBUF];
+extern char restartpass[MAXBUF];
+extern char motd[MAXBUF];
+extern char rules[MAXBUF];
+extern char list[MAXBUF];
+extern char PrefixQuit[MAXBUF];
+extern char DieValue[MAXBUF];
+
+extern int debugging;
+extern int WHOWAS_STALE;
+extern int WHOWAS_MAX;
+extern int DieDelay;
+extern time_t startup_time;
+extern int NetBufferSize;
+extern int MaxWhoResults;
+extern time_t nb_start;
+
+extern std::vector<int> fd_reap;
+extern std::vector<std::string> module_names;
+
+extern int boundPortCount;
+extern int portCount;
+extern int SERVERportCount;
+extern int ports[MAXSOCKS];
+extern int defaultRoute;
+
+extern std::vector<long> auth_cookies;
+extern std::stringstream config_f;
+
+extern serverrec* me[32];
+
+extern FILE *log_file;
+extern userrec* fd_ref_table[65536];
+
+extern int statsAccept, statsRefused, statsUnknown, statsCollisions, statsDns, statsDnsGood, statsDnsBad, statsConnects, statsSent, statsRecv;
+
+static char already_sent[65536];
+extern std::vector<userrec*> all_opers;
+
+extern ClassVector Classes;
+
+
+typedef nspace::hash_map<std::string, userrec*, nspace::hash<string>, StrHashComp> user_hash;
+typedef nspace::hash_map<std::string, chanrec*, nspace::hash<string>, StrHashComp> chan_hash;
+typedef nspace::hash_map<in_addr,string*, nspace::hash<in_addr>, InAddr_HashComp> address_cache;
+typedef nspace::hash_map<std::string, WhoWasUser*, nspace::hash<string>, StrHashComp> whowas_hash;
+typedef std::deque<command_t> command_table;
+
+
+extern user_hash clientlist;
+extern chan_hash chanlist;
+extern whowas_hash whowas;
+extern command_table cmdlist;
+extern file_cache MOTD;
+extern file_cache RULES;
+extern address_cache IP;
+
+void log(int level,char *text, ...)
+{
+ char textbuffer[MAXBUF];
+ va_list argsPtr;
+ time_t rawtime;
+ struct tm * timeinfo;
+ if (level < LogLevel)
+ return;
+
+ time(&rawtime);
+ timeinfo = localtime (&rawtime);
+
+ if (log_file)
+ {
+ char b[MAXBUF];
+ va_start (argsPtr, text);
+ vsnprintf(textbuffer, MAXBUF, text, argsPtr);
+ va_end(argsPtr);
+ strlcpy(b,asctime(timeinfo),MAXBUF);
+ b[24] = ':'; // we know this is the end of the time string
+ fprintf(log_file,"%s %s\n",b,textbuffer);
+ if (nofork)
+ {
+ // nofork enabled? display it on terminal too
+ printf("%s %s\n",b,textbuffer);
+ }
+ }
+}
+
+void readfile(file_cache &F, const char* fname)
+{
+ FILE* file;
+ char linebuf[MAXBUF];
+
+ log(DEBUG,"readfile: loading %s",fname);
+ F.clear();
+ file = fopen(fname,"r");
+ if (file)
+ {
+ while (!feof(file))
+ {
+ fgets(linebuf,sizeof(linebuf),file);
+ linebuf[strlen(linebuf)-1]='\0';
+ if (linebuf[0] == 0)
+ {
+ strcpy(linebuf," ");
+ }
+ if (!feof(file))
+ {
+ F.push_back(linebuf);
+ }
+ }
+ fclose(file);
+ }
+ else
+ {
+ log(DEBUG,"readfile: failed to load file: %s",fname);
+ }
+ log(DEBUG,"readfile: loaded %s, %lu lines",fname,(unsigned long)F.size());
+}
+
+void Write(int sock,char *text, ...)
+{
+ if (sock < 0)
+ return;
+ if (!text)
+ {
+ log(DEFAULT,"*** BUG *** Write was given an invalid parameter");
+ return;
+ }
+ char textbuffer[MAXBUF];
+ va_list argsPtr;
+ char tb[MAXBUF];
+ int res;
+
+ va_start (argsPtr, text);
+ vsnprintf(textbuffer, MAXBUF, text, argsPtr);
+ va_end(argsPtr);
+ int bytes = snprintf(tb,MAXBUF,"%s\r\n",textbuffer);
+ chop(tb);
+ if (fd_ref_table[sock])
+ {
+ int MOD_RESULT = 0;
+ FOREACH_RESULT(OnRawSocketWrite(sock,tb,bytes));
+ fd_ref_table[sock]->AddWriteBuf(tb);
+ statsSent += bytes;
+ }
+ else log(DEFAULT,"ERROR! attempted write to a user with no fd_ref_table entry!!!");
+}
+
+/* write a server formatted numeric response to a single socket */
+
+void WriteServ(int sock, char* text, ...)
+{
+ if (sock < 0)
+ return;
+ if (!text)
+ {
+ log(DEFAULT,"*** BUG *** WriteServ was given an invalid parameter");
+ return;
+ }
+ char textbuffer[MAXBUF],tb[MAXBUF];
+ int res;
+ va_list argsPtr;
+ va_start (argsPtr, text);
+
+ vsnprintf(textbuffer, MAXBUF, text, argsPtr);
+ va_end(argsPtr);
+ int bytes = snprintf(tb,MAXBUF,":%s %s\r\n",ServerName,textbuffer);
+ chop(tb);
+ if (fd_ref_table[sock])
+ {
+ int MOD_RESULT = 0;
+ FOREACH_RESULT(OnRawSocketWrite(sock,tb,bytes));
+ fd_ref_table[sock]->AddWriteBuf(tb);
+ statsSent += bytes;
+ }
+ else log(DEFAULT,"ERROR! attempted write to a user with no fd_ref_table entry!!!");
+}
+
+/* write text from an originating user to originating user */
+
+void WriteFrom(int sock, userrec *user,char* text, ...)
+{
+ if (sock < 0)
+ return;
+ if ((!text) || (!user))
+ {
+ log(DEFAULT,"*** BUG *** WriteFrom was given an invalid parameter");
+ return;
+ }
+ char textbuffer[MAXBUF],tb[MAXBUF];
+ va_list argsPtr;
+ int res;
+ va_start (argsPtr, text);
+
+ vsnprintf(textbuffer, MAXBUF, text, argsPtr);
+ va_end(argsPtr);
+ int bytes = snprintf(tb,MAXBUF,":%s!%s@%s %s\r\n",user->nick,user->ident,user->dhost,textbuffer);
+ chop(tb);
+ if (fd_ref_table[sock])
+ {
+ int MOD_RESULT = 0;
+ FOREACH_RESULT(OnRawSocketWrite(sock,tb,bytes));
+ fd_ref_table[sock]->AddWriteBuf(tb);
+ statsSent += bytes;
+ }
+ else log(DEFAULT,"ERROR! attempted write to a user with no fd_ref_table entry!!!");
+}
+
+/* write text to an destination user from a source user (e.g. user privmsg) */
+
+void WriteTo(userrec *source, userrec *dest,char *data, ...)
+{
+ if ((!dest) || (!data))
+ {
+ log(DEFAULT,"*** BUG *** WriteTo was given an invalid parameter");
+ return;
+ }
+ if (dest->fd == FD_MAGIC_NUMBER)
+ return;
+ char textbuffer[MAXBUF],tb[MAXBUF];
+ va_list argsPtr;
+ va_start (argsPtr, data);
+ vsnprintf(textbuffer, MAXBUF, data, argsPtr);
+ va_end(argsPtr);
+ chop(tb);
+
+ // if no source given send it from the server.
+ if (!source)
+ {
+ WriteServ(dest->fd,":%s %s",ServerName,textbuffer);
+ }
+ else
+ {
+ WriteFrom(dest->fd,source,"%s",textbuffer);
+ }
+}
+
+/* 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, ...)
+{
+ if ((!Ptr) || (!user) || (!text))
+ {
+ log(DEFAULT,"*** BUG *** WriteChannel was given an invalid parameter");
+ return;
+ }
+ char textbuffer[MAXBUF];
+ va_list argsPtr;
+ va_start (argsPtr, text);
+ vsnprintf(textbuffer, MAXBUF, text, argsPtr);
+ va_end(argsPtr);
+
+ std::vector<char*> *ulist = Ptr->GetUsers();
+ for (int j = 0; j < ulist->size(); j++)
+ {
+ char* o = (*ulist)[j];
+ userrec* otheruser = (userrec*)o;
+ if (otheruser->fd != FD_MAGIC_NUMBER)
+ WriteTo(user,otheruser,"%s",textbuffer);
+ }
+}
+
+/* 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, ...)
+{
+ if ((!Ptr) || (!text))
+ {
+ log(DEFAULT,"*** BUG *** WriteChannel was given an invalid parameter");
+ return;
+ }
+ char textbuffer[MAXBUF];
+ va_list argsPtr;
+ va_start (argsPtr, text);
+ vsnprintf(textbuffer, MAXBUF, text, argsPtr);
+ va_end(argsPtr);
+
+ std::vector<char*> *ulist = Ptr->GetUsers();
+ for (int j = 0; j < ulist->size(); j++)
+ {
+ char* o = (*ulist)[j];
+ userrec* otheruser = (userrec*)o;
+ if ((otheruser->fd != FD_MAGIC_NUMBER) && (otheruser->fd != -1) && (otheruser != user))
+ {
+ if (!user)
+ {
+ WriteServ(otheruser->fd,"%s",textbuffer);
+ }
+ else
+ {
+ WriteTo(user,otheruser,"%s",textbuffer);
+ }
+ }
+ }
+}
+
+void WriteChannelWithServ(char* ServName, chanrec* Ptr, char* text, ...)
+{
+ if ((!Ptr) || (!text))
+ {
+ log(DEFAULT,"*** BUG *** WriteChannelWithServ was given an invalid parameter");
+ return;
+ }
+ char textbuffer[MAXBUF];
+ va_list argsPtr;
+ va_start (argsPtr, text);
+ vsnprintf(textbuffer, MAXBUF, text, argsPtr);
+ va_end(argsPtr);
+
+
+ std::vector<char*> *ulist = Ptr->GetUsers();
+ for (int j = 0; j < ulist->size(); j++)
+ {
+ char* o = (*ulist)[j];
+ userrec* otheruser = (userrec*)o;
+ if (otheruser->fd != FD_MAGIC_NUMBER)
+ WriteServ(otheruser->fd,"%s",textbuffer);
+ }
+}
+
+/* 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* text, ...)
+{
+ if ((!Ptr) || (!user) || (!text))
+ {
+ log(DEFAULT,"*** BUG *** ChanExceptSender was given an invalid parameter");
+ return;
+ }
+ char textbuffer[MAXBUF];
+ va_list argsPtr;
+ va_start (argsPtr, text);
+ vsnprintf(textbuffer, MAXBUF, text, argsPtr);
+ va_end(argsPtr);
+
+ std::vector<char*> *ulist = Ptr->GetUsers();
+ for (int j = 0; j < ulist->size(); j++)
+ {
+ char* o = (*ulist)[j];
+ userrec* otheruser = (userrec*)o;
+ if ((otheruser->fd != FD_MAGIC_NUMBER) && (user != otheruser))
+ WriteFrom(otheruser->fd,user,"%s",textbuffer);
+ }
+}
+
+std::string GetServerDescription(char* servername)
+{
+ for (int j = 0; j < 32; j++)
+ {
+ if (me[j] != NULL)
+ {
+ for (int k = 0; k < me[j]->connectors.size(); k++)
+ {
+ if (!strcasecmp(me[j]->connectors[k].GetServerName().c_str(),servername))
+ {
+ return me[j]->connectors[k].GetDescription();
+ }
+ }
+ }
+ return ServerDesc; // not a remote server that can be found, it must be me.
+ }
+}
+
+/* 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, ...)
+{
+ if (!u)
+ {
+ log(DEFAULT,"*** BUG *** WriteCommon was given an invalid parameter");
+ return;
+ }
+
+ if (u->registered != 7) {
+ log(DEFAULT,"*** BUG *** WriteCommon on an unregistered user");
+ return;
+ }
+
+ char textbuffer[MAXBUF];
+ va_list argsPtr;
+ va_start (argsPtr, text);
+ vsnprintf(textbuffer, MAXBUF, text, argsPtr);
+ va_end(argsPtr);
+
+ // FIX: Stops a message going to the same person more than once
+ bzero(&already_sent,65536);
+
+ bool sent_to_at_least_one = false;
+
+ for (int i = 0; i < MAXCHANS; i++)
+ {
+ if (u->chans[i].channel)
+ {
+ std::vector<char*> *ulist = u->chans[i].channel->GetUsers();
+ for (int j = 0; j < ulist->size(); j++)
+ {
+ char* o = (*ulist)[j];
+ userrec* otheruser = (userrec*)o;
+ if ((otheruser->fd > 0) && (!already_sent[otheruser->fd]))
+ {
+ already_sent[otheruser->fd] = 1;
+ WriteFrom(otheruser->fd,u,"%s",textbuffer);
+ sent_to_at_least_one = true;
+ }
+ }
+ }
+ }
+ // if the user was not in any channels, no users will receive the text. Make sure the user
+ // receives their OWN message for WriteCommon
+ if (!sent_to_at_least_one)
+ {
+ WriteFrom(u->fd,u,"%s",textbuffer);
+ }
+}
+
+/* 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, ...)
+{
+ if (!u)
+ {
+ log(DEFAULT,"*** BUG *** WriteCommon was given an invalid parameter");
+ return;
+ }
+
+ if (u->registered != 7) {
+ log(DEFAULT,"*** BUG *** WriteCommon on an unregistered user");
+ return;
+ }
+
+ char textbuffer[MAXBUF];
+ va_list argsPtr;
+ va_start (argsPtr, text);
+ vsnprintf(textbuffer, MAXBUF, text, argsPtr);
+ va_end(argsPtr);
+
+ bzero(&already_sent,65536);
+
+ for (int i = 0; i < MAXCHANS; i++)
+ {
+ if (u->chans[i].channel)
+ {
+ std::vector<char*> *ulist = u->chans[i].channel->GetUsers();
+ for (int j = 0; j < ulist->size(); j++)
+ {
+ char* o = (*ulist)[j];
+ userrec* otheruser = (userrec*)o;
+ if (u != otheruser)
+ {
+ if ((otheruser->fd > 0) && (!already_sent[otheruser->fd]))
+ {
+ already_sent[otheruser->fd] = 1;
+ WriteFrom(otheruser->fd,u,"%s",textbuffer);
+ }
+ }
+ }
+ }
+ }
+}
+
+void WriteOpers(char* text, ...)
+{
+ if (!text)
+ {
+ log(DEFAULT,"*** BUG *** WriteOpers was given an invalid parameter");
+ return;
+ }
+
+ char textbuffer[MAXBUF];
+ va_list argsPtr;
+ va_start (argsPtr, text);
+ vsnprintf(textbuffer, MAXBUF, text, argsPtr);
+ va_end(argsPtr);
+
+ for (std::vector<userrec*>::iterator i = all_opers.begin(); i != all_opers.end(); i++)
+ {
+ userrec* a = *i;
+ if ((a) && (a->fd != FD_MAGIC_NUMBER))
+ {
+ if (strchr(a->modes,'s'))
+ {
+ // send server notices to all with +s
+ WriteServ(a->fd,"NOTICE %s :%s",a->nick,textbuffer);
+ }
+ }
+ }
+}
+
+void NoticeAllOpers(userrec *source, bool local_only, char* text, ...)
+{
+ if ((!text) || (!source))
+ {
+ log(DEFAULT,"*** BUG *** NoticeAllOpers was given an invalid parameter");
+ return;
+ }
+
+ char textbuffer[MAXBUF];
+ va_list argsPtr;
+ va_start (argsPtr, text);
+ vsnprintf(textbuffer, MAXBUF, text, argsPtr);
+ va_end(argsPtr);
+
+ for (std::vector<userrec*>::iterator i = all_opers.begin(); i != all_opers.end(); i++)
+ {
+ userrec* a = *i;
+ if ((a) && (a->fd != FD_MAGIC_NUMBER))
+ {
+ if (strchr(a->modes,'s'))
+ {
+ // send server notices to all with +s
+ WriteServ(a->fd,"NOTICE %s :*** Notice From %s: %s",a->nick,source->nick,textbuffer);
+ }
+ }
+ }
+
+ if (!local_only)
+ {
+ char buffer[MAXBUF];
+ snprintf(buffer,MAXBUF,"V %s @* :%s",source->nick,textbuffer);
+ NetSendToAll(buffer);
+ }
+}
+// returns TRUE of any users on channel C occupy server 'servername'.
+
+bool ChanAnyOnThisServer(chanrec *c,char* servername)
+{
+ log(DEBUG,"ChanAnyOnThisServer");
+
+ std::vector<char*> *ulist = c->GetUsers();
+ for (int j = 0; j < ulist->size(); j++)
+ {
+ char* o = (*ulist)[j];
+ userrec* user = (userrec*)o;
+ if (!strcasecmp(user->server,servername))
+ return true;
+ }
+ return false;
+}
+
+// returns true if user 'u' shares any common channels with any users on server 'servername'
+
+bool CommonOnThisServer(userrec* u,const char* servername)
+{
+ log(DEBUG,"ChanAnyOnThisServer");
+
+ for (int i = 0; i < MAXCHANS; i++)
+ {
+ if (u->chans[i].channel)
+ {
+ std::vector<char*> *ulist = u->chans[i].channel->GetUsers();
+ for (int j = 0; j < ulist->size(); j++)
+ {
+ char* o = (*ulist)[j];
+ userrec* user = (userrec*)o;
+ if (!strcasecmp(user->server,servername))
+ return true;
+ }
+ }
+ }
+ return false;
+}
+
+void NetSendToCommon(userrec* u, char* s)
+{
+ char buffer[MAXBUF];
+ snprintf(buffer,MAXBUF,"%s %s",CreateSum().c_str(),s);
+
+ log(DEBUG,"NetSendToCommon: '%s' '%s'",u->nick,s);
+
+ std::string msg = buffer;
+ FOREACH_MOD OnPacketTransmit(msg,s);
+ strlcpy(buffer,msg.c_str(),MAXBUF);
+
+ for (int j = 0; j < 32; j++)
+ {
+ if (me[j] != NULL)
+ {
+ for (int k = 0; k < me[j]->connectors.size(); k++)
+ {
+ if (CommonOnThisServer(u,me[j]->connectors[k].GetServerName().c_str()))
+ {
+ me[j]->SendPacket(buffer,me[j]->connectors[k].GetServerName().c_str());
+ }
+ }
+ }
+ }
+}
+
+
+void NetSendToAll(char* s)
+{
+ char buffer[MAXBUF];
+ snprintf(buffer,MAXBUF,"%s %s",CreateSum().c_str(),s);
+
+ log(DEBUG,"NetSendToAll: '%s'",s);
+
+ std::string msg = buffer;
+ FOREACH_MOD OnPacketTransmit(msg,s);
+ strlcpy(buffer,msg.c_str(),MAXBUF);
+
+ for (int j = 0; j < 32; j++)
+ {
+ if (me[j] != NULL)
+ {
+ for (int k = 0; k < me[j]->connectors.size(); k++)
+ {
+ me[j]->SendPacket(buffer,me[j]->connectors[k].GetServerName().c_str());
+ }
+ }
+ }
+}
+
+
+void NetSendToAll_WithSum(char* s,char* u)
+{
+ char buffer[MAXBUF];
+ snprintf(buffer,MAXBUF,":%s %s",u,s);
+
+ log(DEBUG,"NetSendToAll: '%s'",s);
+
+ std::string msg = buffer;
+ FOREACH_MOD OnPacketTransmit(msg,s);
+ strlcpy(buffer,msg.c_str(),MAXBUF);
+
+ for (int j = 0; j < 32; j++)
+ {
+ if (me[j] != NULL)
+ {
+ for (int k = 0; k < me[j]->connectors.size(); k++)
+ {
+ me[j]->SendPacket(buffer,me[j]->connectors[k].GetServerName().c_str());
+ }
+ }
+ }
+}
+
+void NetSendToAllAlive(char* s)
+{
+ char buffer[MAXBUF];
+ snprintf(buffer,MAXBUF,"%s %s",CreateSum().c_str(),s);
+
+ log(DEBUG,"NetSendToAllAlive: '%s'",s);
+
+ std::string msg = buffer;
+ FOREACH_MOD OnPacketTransmit(msg,s);
+ strlcpy(buffer,msg.c_str(),MAXBUF);
+
+ for (int j = 0; j < 32; j++)
+ {
+ if (me[j] != NULL)
+ {
+ for (int k = 0; k < me[j]->connectors.size(); k++)
+ {
+ if (me[j]->connectors[k].GetState() != STATE_DISCONNECTED)
+ {
+ me[j]->SendPacket(buffer,me[j]->connectors[k].GetServerName().c_str());
+ }
+ else
+ {
+ log(DEBUG,"%s is dead, not sending to it.",me[j]->connectors[k].GetServerName().c_str());
+ }
+ }
+ }
+ }
+}
+
+
+void NetSendToOne(char* target,char* s)
+{
+ char buffer[MAXBUF];
+ snprintf(buffer,MAXBUF,"%s %s",CreateSum().c_str(),s);
+
+ log(DEBUG,"NetSendToOne: '%s' '%s'",target,s);
+
+ std::string msg = buffer;
+ FOREACH_MOD OnPacketTransmit(msg,s);
+ strlcpy(buffer,msg.c_str(),MAXBUF);
+
+ for (int j = 0; j < 32; j++)
+ {
+ if (me[j] != NULL)
+ {
+ for (int k = 0; k < me[j]->connectors.size(); k++)
+ {
+ if (!strcasecmp(me[j]->connectors[k].GetServerName().c_str(),target))
+ {
+ me[j]->SendPacket(buffer,me[j]->connectors[k].GetServerName().c_str());
+ }
+ }
+ }
+ }
+}
+
+void NetSendToAllExcept(const char* target,char* s)
+{
+ char buffer[MAXBUF];
+ snprintf(buffer,MAXBUF,"%s %s",CreateSum().c_str(),s);
+
+ log(DEBUG,"NetSendToAllExcept: '%s' '%s'",target,s);
+
+ std::string msg = buffer;
+ FOREACH_MOD OnPacketTransmit(msg,s);
+ strlcpy(buffer,msg.c_str(),MAXBUF);
+
+ for (int j = 0; j < 32; j++)
+ {
+ if (me[j] != NULL)
+ {
+ for (int k = 0; k < me[j]->connectors.size(); k++)
+ {
+ if (strcasecmp(me[j]->connectors[k].GetServerName().c_str(),target))
+ {
+ me[j]->SendPacket(buffer,me[j]->connectors[k].GetServerName().c_str());
+ }
+ }
+ }
+ }
+}
+
+void NetSendToAllExcept_WithSum(const char* target,char* s,char* u)
+{
+ char buffer[MAXBUF];
+ snprintf(buffer,MAXBUF,":%s %s",u,s);
+
+ log(DEBUG,"NetSendToAllExcept: '%s' '%s'",target,s);
+
+ std::string msg = buffer;
+ FOREACH_MOD OnPacketTransmit(msg,s);
+ strlcpy(buffer,msg.c_str(),MAXBUF);
+
+ for (int j = 0; j < 32; j++)
+ {
+ if (me[j] != NULL)
+ {
+ for (int k = 0; k < me[j]->connectors.size(); k++)
+ {
+ if (strcasecmp(me[j]->connectors[k].GetServerName().c_str(),target))
+ {
+ me[j]->SendPacket(buffer,me[j]->connectors[k].GetServerName().c_str());
+ }
+ }
+ }
+ }
+}
+
+
+void WriteMode(const char* modes, int flags, const char* text, ...)
+{
+ if ((!text) || (!modes) || (!flags))
+ {
+ log(DEFAULT,"*** BUG *** WriteMode was given an invalid parameter");
+ return;
+ }
+
+ char textbuffer[MAXBUF];
+ va_list argsPtr;
+ va_start (argsPtr, text);
+ vsnprintf(textbuffer, MAXBUF, text, argsPtr);
+ va_end(argsPtr);
+ int modelen = strlen(modes);
+
+ for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
+ {
+ if ((i->second) && (i->second->fd != FD_MAGIC_NUMBER))
+ {
+ bool send_to_user = false;
+
+ if (flags == WM_AND)
+ {
+ send_to_user = true;
+ for (int n = 0; n < modelen; n++)
+ {
+ if (!hasumode(i->second,modes[n]))
+ {
+ send_to_user = false;
+ break;
+ }
+ }
+ }
+ else if (flags == WM_OR)
+ {
+ send_to_user = false;
+ for (int n = 0; n < modelen; n++)
+ {
+ if (hasumode(i->second,modes[n]))
+ {
+ send_to_user = true;
+ break;
+ }
+ }
+ }
+
+ if (send_to_user)
+ {
+ WriteServ(i->second->fd,"NOTICE %s :%s",i->second->nick,textbuffer);
+ }
+ }
+ }
+}
+
+void NoticeAll(userrec *source, bool local_only, char* text, ...)
+{
+ if ((!text) || (!source))
+ {
+ log(DEFAULT,"*** BUG *** NoticeAll was given an invalid parameter");
+ return;
+ }
+
+ char textbuffer[MAXBUF];
+ va_list argsPtr;
+ va_start (argsPtr, text);
+ vsnprintf(textbuffer, MAXBUF, text, argsPtr);
+ va_end(argsPtr);
+
+ for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
+ {
+ if ((i->second) && (i->second->fd != FD_MAGIC_NUMBER))
+ {
+ WriteFrom(i->second->fd,source,"NOTICE $* :%s",textbuffer);
+ }
+ }
+
+ if (!local_only)
+ {
+ char buffer[MAXBUF];
+ snprintf(buffer,MAXBUF,"V %s * :%s",source->nick,textbuffer);
+ NetSendToAll(buffer);
+ }
+
+}
+
+
+void WriteWallOps(userrec *source, bool local_only, char* text, ...)
+{
+ if ((!text) || (!source))
+ {
+ log(DEFAULT,"*** BUG *** WriteOpers was given an invalid parameter");
+ return;
+ }
+
+ char textbuffer[MAXBUF];
+ va_list argsPtr;
+ va_start (argsPtr, text);
+ vsnprintf(textbuffer, MAXBUF, text, argsPtr);
+ va_end(argsPtr);
+
+ for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
+ {
+ if ((i->second) && (i->second->fd != FD_MAGIC_NUMBER))
+ {
+ if (strchr(i->second->modes,'w'))
+ {
+ WriteTo(source,i->second,"WALLOPS :%s",textbuffer);
+ }
+ }
+ }
+
+ if (!local_only)
+ {
+ char buffer[MAXBUF];
+ snprintf(buffer,MAXBUF,"@ %s :%s",source->nick,textbuffer);
+ NetSendToAll(buffer);
+ }
+}
+
+/* convert a string to lowercase. Note following special circumstances
+ * taken from RFC 1459. Many "official" server branches still hold to this
+ * rule so i will too;
+ *
+ * Because of IRC's scandanavian origin, the characters {}| are
+ * considered to be the lower case equivalents of the characters []\,
+ * respectively. This is a critical issue when determining the
+ * equivalence of two nicknames.
+ */
+
+void strlower(char *n)
+{
+ if (n)
+ {
+ for (char* t = n; *t; t++)
+ *t = lowermap[*t];
+ }
+}
+
+/* Find a user record by nickname and return a pointer to it */
+
+userrec* Find(std::string nick)
+{
+ user_hash::iterator iter = clientlist.find(nick);
+
+ if (iter == clientlist.end())
+ /* Couldn't find it */
+ return NULL;
+
+ return iter->second;
+}
+
+/* find a channel record by channel name and return a pointer to it */
+
+chanrec* FindChan(const char* chan)
+{
+ if (!chan)
+ {
+ log(DEFAULT,"*** BUG *** Findchan was given an invalid parameter");
+ return NULL;
+ }
+
+ chan_hash::iterator iter = chanlist.find(chan);
+
+ if (iter == chanlist.end())
+ /* Couldn't find it */
+ return NULL;
+
+ return iter->second;
+}
+
+
+long GetMaxBans(char* name)
+{
+ char CM[MAXBUF];
+ for (int count = 0; count < ConfValueEnum("banlist",&config_f); count++)
+ {
+ ConfValue("banlist","chan",count,CM,&config_f);
+ if (match(name,CM))
+ {
+ ConfValue("banlist","limit",count,CM,&config_f);
+ return atoi(CM);
+ }
+ }
+ return 64;
+}
+
+void purge_empty_chans(userrec* u)
+{
+
+ int go_again = 1, purge = 0;
+
+ // firstly decrement the count on each channel
+ for (int f = 0; f < MAXCHANS; f++)
+ {
+ if (u->chans[f].channel)
+ {
+ u->chans[f].channel->DelUser((char*)u);
+ }
+ }
+
+ for (int i = 0; i < MAXCHANS; i++)
+ {
+ if (u->chans[i].channel)
+ {
+ if (!usercount(u->chans[i].channel))
+ {
+ chan_hash::iterator i2 = chanlist.find(u->chans[i].channel->name);
+ /* kill the record */
+ if (i2 != chanlist.end())
+ {
+ log(DEBUG,"del_channel: destroyed: %s",i2->second->name);
+ if (i2->second)
+ delete i2->second;
+ chanlist.erase(i2);
+ go_again = 1;
+ purge++;
+ u->chans[i].channel = NULL;
+ }
+ }
+ else
+ {
+ log(DEBUG,"skipped purge for %s",u->chans[i].channel->name);
+ }
+ }
+ }
+ log(DEBUG,"completed channel purge, killed %lu",(unsigned long)purge);
+
+ DeleteOper(u);
+}
+
+
+char scratch[MAXBUF];
+char sparam[MAXBUF];
+
+char* chanmodes(chanrec *chan)
+{
+ if (!chan)
+ {
+ log(DEFAULT,"*** BUG *** chanmodes was given an invalid parameter");
+ strcpy(scratch,"");
+ return scratch;
+ }
+
+ strcpy(scratch,"");
+ strcpy(sparam,"");
+ if (chan->binarymodes & CM_NOEXTERNAL)
+ {
+ strlcat(scratch,"n",MAXMODES);
+ }
+ if (chan->binarymodes & CM_TOPICLOCK)
+ {
+ strlcat(scratch,"t",MAXMODES);
+ }
+ if (chan->key[0])
+ {
+ strlcat(scratch,"k",MAXMODES);
+ }
+ if (chan->limit)
+ {
+ strlcat(scratch,"l",MAXMODES);
+ }
+ if (chan->binarymodes & CM_INVITEONLY)
+ {
+ strlcat(scratch,"i",MAXMODES);
+ }
+ if (chan->binarymodes & CM_MODERATED)
+ {
+ strlcat(scratch,"m",MAXMODES);
+ }
+ if (chan->binarymodes & CM_SECRET)
+ {
+ strlcat(scratch,"s",MAXMODES);
+ }
+ if (chan->binarymodes & CM_PRIVATE)
+ {
+ strlcat(scratch,"p",MAXMODES);
+ }
+ if (chan->key[0])
+ {
+ strlcat(sparam," ",MAXBUF);
+ strlcat(sparam,chan->key,MAXBUF);
+ }
+ if (chan->limit)
+ {
+ char foo[24];
+ sprintf(foo," %lu",(unsigned long)chan->limit);
+ strlcat(sparam,foo,MAXBUF);
+ }
+ if (*chan->custom_modes)
+ {
+ strlcat(scratch,chan->custom_modes,MAXMODES);
+ for (int z = 0; chan->custom_modes[z] != 0; z++)
+ {
+ std::string extparam = chan->GetModeParameter(chan->custom_modes[z]);
+ if (extparam != "")
+ {
+ strlcat(sparam," ",MAXBUF);
+ strlcat(sparam,extparam.c_str(),MAXBUF);
+ }
+ }
+ }
+ log(DEBUG,"chanmodes: %s %s%s",chan->name,scratch,sparam);
+ strlcat(scratch,sparam,MAXMODES);
+ return scratch;
+}
+
+
+/* compile a userlist of a channel into a string, each nick seperated by
+ * spaces and op, voice etc status shown as @ and + */
+
+void userlist(userrec *user,chanrec *c)
+{
+ if ((!c) || (!user))
+ {
+ log(DEFAULT,"*** BUG *** userlist was given an invalid parameter");
+ return;
+ }
+
+ snprintf(list,MAXBUF,"353 %s = %s :", user->nick, c->name);
+
+ std::vector<char*> *ulist = c->GetUsers();
+ for (int i = 0; i < ulist->size(); i++)
+ {
+ char* o = (*ulist)[i];
+ userrec* otheruser = (userrec*)o;
+ if ((!has_channel(user,c)) && (strchr(otheruser->modes,'i')))
+ {
+ /* user is +i, and source not on the channel, does not show
+ * nick in NAMES list */
+ continue;
+ }
+ strlcat(list,cmode(otheruser,c),MAXBUF);
+ strlcat(list,otheruser->nick,MAXBUF);
+ strlcat(list," ",MAXBUF);
+ if (strlen(list)>(480-NICKMAX))
+ {
+ /* list overflowed into
+ * multiple numerics */
+ WriteServ(user->fd,"%s",list);
+ snprintf(list,MAXBUF,"353 %s = %s :", user->nick, c->name);
+ }
+ }
+ /* if whats left in the list isnt empty, send it */
+ if (list[strlen(list)-1] != ':')
+ {
+ WriteServ(user->fd,"%s",list);
+ }
+}
+
+/* return a count of the users on a specific channel accounting for
+ * invisible users who won't increase the count. e.g. for /LIST */
+
+int usercount_i(chanrec *c)
+{
+ int count = 0;
+
+ if (!c)
+ {
+ log(DEFAULT,"*** BUG *** usercount_i was given an invalid parameter");
+ return 0;
+ }
+
+ strcpy(list,"");
+ for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
+ {
+ if (i->second)
+ {
+ if (has_channel(i->second,c))
+ {
+ if (isnick(i->second->nick))
+ {
+ if ((!has_channel(i->second,c)) && (strchr(i->second->modes,'i')))
+ {
+ /* user is +i, and source not on the channel, does not show
+ * nick in NAMES list */
+ continue;
+ }
+ count++;
+ }
+ }
+ }
+ }
+ log(DEBUG,"usercount_i: %s %lu",c->name,(unsigned long)count);
+ return count;
+}
+
+
+int usercount(chanrec *c)
+{
+ if (!c)
+ {
+ log(DEFAULT,"*** BUG *** usercount was given an invalid parameter");
+ return 0;
+ }
+ int count = c->GetUserCounter();
+ log(DEBUG,"usercount: %s %lu",c->name,(unsigned long)count);
+ return count;
+}
+
+
+// looks up a users password for their connection class (<ALLOW>/<DENY> tags)
+
+char* Passwd(userrec *user)
+{
+ for (ClassVector::iterator i = Classes.begin(); i != Classes.end(); i++)
+ {
+ if (match(user->host,i->host) && (i->type == CC_ALLOW))
+ {
+ return i->pass;
+ }
+ }
+ return "";
+}
+
+bool IsDenied(userrec *user)
+{
+ for (ClassVector::iterator i = Classes.begin(); i != Classes.end(); i++)
+ {
+ if (match(user->host,i->host) && (i->type == CC_DENY))
+ {
+ return true;
+ }
+ }
+ return false;
+}
+
+
+
+
+/* sends out an error notice to all connected clients (not to be used
+ * lightly!) */
+
+void send_error(char *s)
+{
+ log(DEBUG,"send_error: %s",s);
+ for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
+ {
+ if (isnick(i->second->nick))
+ {
+ WriteServ(i->second->fd,"NOTICE %s :%s",i->second->nick,s);
+ }
+ else
+ {
+ // fix - unregistered connections receive ERROR, not NOTICE
+ Write(i->second->fd,"ERROR :%s",s);
+ }
+ }
+}
+
+void Error(int status)
+{
+ signal (SIGALRM, SIG_IGN);
+ signal (SIGPIPE, SIG_IGN);
+ signal (SIGTERM, SIG_IGN);
+ signal (SIGABRT, SIG_IGN);
+ signal (SIGSEGV, SIG_IGN);
+ signal (SIGURG, SIG_IGN);
+ signal (SIGKILL, SIG_IGN);
+ log(DEFAULT,"*** fell down a pothole in the road to perfection ***");
+ send_error("Error! Segmentation fault! save meeeeeeeeeeeeee *splat!*");
+ Exit(status);
+}
+
+// this function counts all users connected, wether they are registered or NOT.
+int usercnt(void)
+{
+ return clientlist.size();
+}
+
+// this counts only registered users, so that the percentages in /MAP don't mess up when users are sitting in an unregistered state
+int registered_usercount(void)
+{
+ int c = 0;
+ for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
+ {
+ if ((i->second->fd) && (isnick(i->second->nick))) c++;
+ }
+ return c;
+}
+
+int usercount_invisible(void)
+{
+ int c = 0;
+
+ for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
+ {
+ if ((i->second->fd) && (isnick(i->second->nick)) && (strchr(i->second->modes,'i'))) c++;
+ }
+ return c;
+}
+
+int usercount_opers(void)
+{
+ int c = 0;
+
+ for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
+ {
+ if ((i->second->fd) && (isnick(i->second->nick)) && (strchr(i->second->modes,'o'))) c++;
+ }
+ return c;
+}
+
+int usercount_unknown(void)
+{
+ int c = 0;
+
+ for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
+ {
+ if ((i->second->fd) && (i->second->registered != 7))
+ c++;
+ }
+ return c;
+}
+
+long chancount(void)
+{
+ return chanlist.size();
+}
+
+long count_servs(void)
+{
+ int c = 0;
+ for (int i = 0; i < 32; i++)
+ {
+ if (me[i] != NULL)
+ {
+ for (vector<ircd_connector>::iterator j = me[i]->connectors.begin(); j != me[i]->connectors.end(); j++)
+ {
+ if (strcasecmp(j->GetServerName().c_str(),ServerName))
+ {
+ c++;
+ }
+ }
+ }
+ }
+ return c;
+}
+
+long servercount(void)
+{
+ return count_servs()+1;
+}
+
+long local_count()
+{
+ int c = 0;
+ for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
+ {
+ if ((i->second->fd) && (isnick(i->second->nick)) && (!strcasecmp(i->second->server,ServerName))) c++;
+ }
+ return c;
+}
+
+void ShowMOTD(userrec *user)
+{
+ char buf[65536];
+ std::string WholeMOTD = "";
+ if (!MOTD.size())
+ {
+ WriteServ(user->fd,"422 %s :Message of the day file is missing.",user->nick);
+ return;
+ }
+ snprintf(buf,65535,":%s 375 %s :- %s message of the day\r\n", ServerName, user->nick, ServerName);
+ WholeMOTD = WholeMOTD + buf;
+ for (int i = 0; i != MOTD.size(); i++)
+ {
+ snprintf(buf,65535,":%s 372 %s :- %s\r\n", ServerName, user->nick, MOTD[i].c_str());
+ WholeMOTD = WholeMOTD + buf;
+ }
+ snprintf(buf,65535,":%s 376 %s :End of message of the day.\r\n", ServerName, user->nick);
+ WholeMOTD = WholeMOTD + buf;
+ // only one write operation
+ user->AddWriteBuf(WholeMOTD);
+ statsSent += WholeMOTD.length();
+}
+
+void ShowRULES(userrec *user)
+{
+ if (!RULES.size())
+ {
+ WriteServ(user->fd,"NOTICE %s :Rules file is missing.",user->nick);
+ return;
+ }
+ WriteServ(user->fd,"NOTICE %s :%s rules",user->nick,ServerName);
+ for (int i = 0; i != RULES.size(); i++)
+ {
+ WriteServ(user->fd,"NOTICE %s :%s",user->nick,RULES[i].c_str());
+ }
+ WriteServ(user->fd,"NOTICE %s :End of %s rules.",user->nick,ServerName);
+}
+
+// this returns 1 when all modules are satisfied that the user should be allowed onto the irc server
+// (until this returns true, a user will block in the waiting state, waiting to connect up to the
+// registration timeout maximum seconds)
+bool AllModulesReportReady(userrec* user)
+{
+ for (int i = 0; i <= MODCOUNT; i++)
+ {
+ int res = modules[i]->OnCheckReady(user);
+ if (!res)
+ return false;
+ }
+ return true;
+}
+
+char islast(const char* s)
+{
+ char c = '`';
+ for (int j = 0; j < 32; j++)
+ {
+ if (me[j] != NULL)
+ {
+ for (int k = 0; k < me[j]->connectors.size(); k++)
+ {
+ if (strcasecmp(me[j]->connectors[k].GetServerName().c_str(),s))
+ {
+ c = '|';
+ }
+ if (!strcasecmp(me[j]->connectors[k].GetServerName().c_str(),s))
+ {
+ c = '`';
+ }
+ }
+ }
+ }
+ return c;
+}
+
+long map_count(const char* s)
+{
+ int c = 0;
+ for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
+ {
+ if ((i->second->fd) && (isnick(i->second->nick)) && (!strcasecmp(i->second->server,s))) c++;
+ }
+ return c;
+}
+
+void createcommand(char* cmd, handlerfunc f, char flags, int minparams,char* source)
+{
+ command_t comm;
+ /* create the command and push it onto the table */
+ strlcpy(comm.command,cmd,MAXBUF);
+ strlcpy(comm.source,source,MAXBUF);
+ comm.handler_function = f;
+ comm.flags_needed = flags;
+ comm.min_params = minparams;
+ comm.use_count = 0;
+ comm.total_bytes = 0;
+ cmdlist.push_back(comm);
+ log(DEBUG,"Added command %s (%lu parameters)",cmd,(unsigned long)minparams);
+}
+
+
+void SetupCommandTable(void)
+{
+ createcommand("USER",handle_user,0,4,"<core>");
+ createcommand("NICK",handle_nick,0,1,"<core>");
+ createcommand("QUIT",handle_quit,0,0,"<core>");
+ createcommand("VERSION",handle_version,0,0,"<core>");
+ createcommand("PING",handle_ping,0,1,"<core>");
+ createcommand("PONG",handle_pong,0,1,"<core>");
+ createcommand("ADMIN",handle_admin,0,0,"<core>");
+ createcommand("PRIVMSG",handle_privmsg,0,2,"<core>");
+ createcommand("INFO",handle_info,0,0,"<core>");
+ createcommand("TIME",handle_time,0,0,"<core>");
+ createcommand("WHOIS",handle_whois,0,1,"<core>");
+ createcommand("WALLOPS",handle_wallops,'o',1,"<core>");
+ createcommand("NOTICE",handle_notice,0,2,"<core>");
+ createcommand("JOIN",handle_join,0,1,"<core>");
+ createcommand("NAMES",handle_names,0,0,"<core>");
+ createcommand("PART",handle_part,0,1,"<core>");
+ createcommand("KICK",handle_kick,0,2,"<core>");
+ createcommand("MODE",handle_mode,0,1,"<core>");
+ createcommand("TOPIC",handle_topic,0,1,"<core>");
+ createcommand("WHO",handle_who,0,1,"<core>");
+ createcommand("MOTD",handle_motd,0,0,"<core>");
+ createcommand("RULES",handle_rules,0,0,"<core>");
+ createcommand("OPER",handle_oper,0,2,"<core>");
+ createcommand("LIST",handle_list,0,0,"<core>");
+ createcommand("DIE",handle_die,'o',1,"<core>");
+ createcommand("RESTART",handle_restart,'o',1,"<core>");
+ createcommand("KILL",handle_kill,'o',2,"<core>");
+ createcommand("REHASH",handle_rehash,'o',0,"<core>");
+ createcommand("LUSERS",handle_lusers,0,0,"<core>");
+ createcommand("STATS",handle_stats,0,1,"<core>");
+ createcommand("USERHOST",handle_userhost,0,1,"<core>");
+ createcommand("AWAY",handle_away,0,0,"<core>");
+ createcommand("ISON",handle_ison,0,0,"<core>");
+ createcommand("SUMMON",handle_summon,0,0,"<core>");
+ createcommand("USERS",handle_users,0,0,"<core>");
+ createcommand("INVITE",handle_invite,0,0,"<core>");
+ createcommand("PASS",handle_pass,0,1,"<core>");
+ createcommand("TRACE",handle_trace,'o',0,"<core>");
+ createcommand("WHOWAS",handle_whowas,0,1,"<core>");
+ createcommand("CONNECT",handle_connect,'o',1,"<core>");
+ createcommand("SQUIT",handle_squit,'o',0,"<core>");
+ createcommand("MODULES",handle_modules,0,0,"<core>");
+ createcommand("LINKS",handle_links,0,0,"<core>");
+ createcommand("MAP",handle_map,0,0,"<core>");
+ createcommand("KLINE",handle_kline,'o',1,"<core>");
+ createcommand("GLINE",handle_gline,'o',1,"<core>");
+ createcommand("ZLINE",handle_zline,'o',1,"<core>");
+ createcommand("QLINE",handle_qline,'o',1,"<core>");
+ createcommand("ELINE",handle_eline,'o',1,"<core>");
+ createcommand("LOADMODULE",handle_loadmodule,'o',1,"<core>");
+ createcommand("UNLOADMODULE",handle_unloadmodule,'o',1,"<core>");
+ createcommand("SERVER",handle_server,0,0,"<core>");
+}
+
+bool DirValid(char* dirandfile)
+{
+ char work[MAXBUF];
+ strlcpy(work,dirandfile,MAXBUF);
+ int p = strlen(work);
+ // we just want the dir
+ while (strlen(work))
+ {
+ if (work[p] == '/')
+ {
+ work[p] = '\0';
+ break;
+ }
+ work[p--] = '\0';
+ }
+ char buffer[MAXBUF], otherdir[MAXBUF];
+ // Get the current working directory
+ if( getcwd( buffer, MAXBUF ) == NULL )
+ return false;
+ chdir(work);
+ if( getcwd( otherdir, MAXBUF ) == NULL )
+ return false;
+ chdir(buffer);
+ if (strlen(otherdir) >= strlen(work))
+ {
+ otherdir[strlen(work)] = '\0';
+ if (!strcmp(otherdir,work))
+ {
+ return true;
+ }
+ return false;
+ }
+ else return false;
+}
+
+std::string GetFullProgDir(char** argv, int argc)
+{
+ char work[MAXBUF];
+ strlcpy(work,argv[0],MAXBUF);
+ int p = strlen(work);
+ // we just want the dir
+ while (strlen(work))
+ {
+ if (work[p] == '/')
+ {
+ work[p] = '\0';
+ break;
+ }
+ work[p--] = '\0';
+ }
+ char buffer[MAXBUF], otherdir[MAXBUF];
+ // Get the current working directory
+ if( getcwd( buffer, MAXBUF ) == NULL )
+ return "";
+ chdir(work);
+ if( getcwd( otherdir, MAXBUF ) == NULL )
+ return "";
+ chdir(buffer);
+ return otherdir;
+}
+
diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index 3430990eb..9a71c3a92 100644
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -62,12 +62,8 @@ using namespace std;
#include "xline.h"
#include "inspstring.h"
#include "dnsqueue.h"
-
-#ifdef GCC3
-#define nspace __gnu_cxx
-#else
-#define nspace std
-#endif
+#include "helperfuncs.h"
+#include "hashcomp.h"
int LogLevel = DEFAULT;
char ServerName[MAXBUF];
@@ -115,71 +111,6 @@ time_t TIME = time(NULL), OLDTIME = time(NULL);
int kq, lkq, skq;
#endif
-namespace nspace
-{
-#ifdef GCC34
- template<> struct hash<in_addr>
-#else
- template<> struct nspace::hash<in_addr>
-#endif
- {
- size_t operator()(const struct in_addr &a) const
- {
- size_t q;
- memcpy(&q,&a,sizeof(size_t));
- return q;
- }
- };
-#ifdef GCC34
- template<> struct hash<string>
-#else
- template<> struct nspace::hash<string>
-#endif
- {
- size_t operator()(const string &s) const
- {
- char a[MAXBUF];
- static struct hash<const char *> strhash;
- strlcpy(a,s.c_str(),MAXBUF);
- strlower(a);
- return strhash(a);
- }
- };
-}
-
-
-struct StrHashComp
-{
-
- bool operator()(const string& s1, const string& s2) const
- {
- char a[MAXBUF],b[MAXBUF];
- strlcpy(a,s1.c_str(),MAXBUF);
- strlcpy(b,s2.c_str(),MAXBUF);
- strlower(a);
- strlower(b);
- return (strcasecmp(a,b) == 0);
- }
-
-};
-
-struct InAddr_HashComp
-{
-
- bool operator()(const in_addr &s1, const in_addr &s2) const
- {
- size_t q;
- size_t p;
-
- memcpy(&q,&s1,sizeof(size_t));
- memcpy(&p,&s2,sizeof(size_t));
-
- return (q == p);
- }
-
-};
-
-
typedef nspace::hash_map<std::string, userrec*, nspace::hash<string>, StrHashComp> user_hash;
typedef nspace::hash_map<std::string, chanrec*, nspace::hash<string>, StrHashComp> chan_hash;
typedef nspace::hash_map<in_addr,string*, nspace::hash<in_addr>, InAddr_HashComp> address_cache;
@@ -228,8 +159,6 @@ std::stringstream config_f(stringstream::in | stringstream::out);
std::vector<userrec*> all_opers;
-static char already_sent[65536];
-
char lowermap[255];
void AddOper(userrec* user)
@@ -294,67 +223,6 @@ std::string getadminnick()
return AdminNick;
}
-void log(int level,char *text, ...)
-{
- char textbuffer[MAXBUF];
- va_list argsPtr;
- time_t rawtime;
- struct tm * timeinfo;
- if (level < LogLevel)
- return;
-
- time(&rawtime);
- timeinfo = localtime (&rawtime);
-
- if (log_file)
- {
- char b[MAXBUF];
- va_start (argsPtr, text);
- vsnprintf(textbuffer, MAXBUF, text, argsPtr);
- va_end(argsPtr);
- strlcpy(b,asctime(timeinfo),MAXBUF);
- b[24] = ':'; // we know this is the end of the time string
- fprintf(log_file,"%s %s\n",b,textbuffer);
- if (nofork)
- {
- // nofork enabled? display it on terminal too
- printf("%s %s\n",b,textbuffer);
- }
- }
-}
-
-void readfile(file_cache &F, const char* fname)
-{
- FILE* file;
- char linebuf[MAXBUF];
-
- log(DEBUG,"readfile: loading %s",fname);
- F.clear();
- file = fopen(fname,"r");
- if (file)
- {
- while (!feof(file))
- {
- fgets(linebuf,sizeof(linebuf),file);
- linebuf[strlen(linebuf)-1]='\0';
- if (linebuf[0] == 0)
- {
- strcpy(linebuf," ");
- }
- if (!feof(file))
- {
- F.push_back(linebuf);
- }
- }
- fclose(file);
- }
- else
- {
- log(DEBUG,"readfile: failed to load file: %s",fname);
- }
- log(DEBUG,"readfile: loaded %s, %lu lines",fname,(unsigned long)F.size());
-}
-
void ReadConfig(bool bail, userrec* user)
{
char dbg[MAXBUF],pauseval[MAXBUF],Value[MAXBUF],timeout[MAXBUF],NB[MAXBUF],flood[MAXBUF],MW[MAXBUF];
@@ -595,1052 +463,6 @@ void ReadConfig(bool bail, userrec* user)
}
}
-/* write formatted text to a socket, in same format as printf
- * New in 1.0 Beta 5 - Nothing is written directly to a users fd any more.
- * Instead, data builds up in the users sendq and each time around the mainloop
- * this data is flushed to the user's socket (see userrec::FlushWriteBuf).
- */
-
-void Write(int sock,char *text, ...)
-{
- if (sock < 0)
- return;
- if (!text)
- {
- log(DEFAULT,"*** BUG *** Write was given an invalid parameter");
- return;
- }
- char textbuffer[MAXBUF];
- va_list argsPtr;
- char tb[MAXBUF];
- int res;
-
- va_start (argsPtr, text);
- vsnprintf(textbuffer, MAXBUF, text, argsPtr);
- va_end(argsPtr);
- int bytes = snprintf(tb,MAXBUF,"%s\r\n",textbuffer);
- chop(tb);
- if (fd_ref_table[sock])
- {
- int MOD_RESULT = 0;
- FOREACH_RESULT(OnRawSocketWrite(sock,tb,bytes));
- fd_ref_table[sock]->AddWriteBuf(tb);
- statsSent += bytes;
- }
- else log(DEFAULT,"ERROR! attempted write to a user with no fd_ref_table entry!!!");
-}
-
-/* write a server formatted numeric response to a single socket */
-
-void WriteServ(int sock, char* text, ...)
-{
- if (sock < 0)
- return;
- if (!text)
- {
- log(DEFAULT,"*** BUG *** WriteServ was given an invalid parameter");
- return;
- }
- char textbuffer[MAXBUF],tb[MAXBUF];
- int res;
- va_list argsPtr;
- va_start (argsPtr, text);
-
- vsnprintf(textbuffer, MAXBUF, text, argsPtr);
- va_end(argsPtr);
- int bytes = snprintf(tb,MAXBUF,":%s %s\r\n",ServerName,textbuffer);
- chop(tb);
- if (fd_ref_table[sock])
- {
- int MOD_RESULT = 0;
- FOREACH_RESULT(OnRawSocketWrite(sock,tb,bytes));
- fd_ref_table[sock]->AddWriteBuf(tb);
- statsSent += bytes;
- }
- else log(DEFAULT,"ERROR! attempted write to a user with no fd_ref_table entry!!!");
-}
-
-/* write text from an originating user to originating user */
-
-void WriteFrom(int sock, userrec *user,char* text, ...)
-{
- if (sock < 0)
- return;
- if ((!text) || (!user))
- {
- log(DEFAULT,"*** BUG *** WriteFrom was given an invalid parameter");
- return;
- }
- char textbuffer[MAXBUF],tb[MAXBUF];
- va_list argsPtr;
- int res;
- va_start (argsPtr, text);
-
- vsnprintf(textbuffer, MAXBUF, text, argsPtr);
- va_end(argsPtr);
- int bytes = snprintf(tb,MAXBUF,":%s!%s@%s %s\r\n",user->nick,user->ident,user->dhost,textbuffer);
- chop(tb);
- if (fd_ref_table[sock])
- {
- int MOD_RESULT = 0;
- FOREACH_RESULT(OnRawSocketWrite(sock,tb,bytes));
- fd_ref_table[sock]->AddWriteBuf(tb);
- statsSent += bytes;
- }
- else log(DEFAULT,"ERROR! attempted write to a user with no fd_ref_table entry!!!");
-}
-
-/* write text to an destination user from a source user (e.g. user privmsg) */
-
-void WriteTo(userrec *source, userrec *dest,char *data, ...)
-{
- if ((!dest) || (!data))
- {
- log(DEFAULT,"*** BUG *** WriteTo was given an invalid parameter");
- return;
- }
- if (dest->fd == FD_MAGIC_NUMBER)
- return;
- char textbuffer[MAXBUF],tb[MAXBUF];
- va_list argsPtr;
- va_start (argsPtr, data);
- vsnprintf(textbuffer, MAXBUF, data, argsPtr);
- va_end(argsPtr);
- chop(tb);
-
- // if no source given send it from the server.
- if (!source)
- {
- WriteServ(dest->fd,":%s %s",ServerName,textbuffer);
- }
- else
- {
- WriteFrom(dest->fd,source,"%s",textbuffer);
- }
-}
-
-/* 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, ...)
-{
- if ((!Ptr) || (!user) || (!text))
- {
- log(DEFAULT,"*** BUG *** WriteChannel was given an invalid parameter");
- return;
- }
- char textbuffer[MAXBUF];
- va_list argsPtr;
- va_start (argsPtr, text);
- vsnprintf(textbuffer, MAXBUF, text, argsPtr);
- va_end(argsPtr);
-
- std::vector<char*> *ulist = Ptr->GetUsers();
- for (int j = 0; j < ulist->size(); j++)
- {
- char* o = (*ulist)[j];
- userrec* otheruser = (userrec*)o;
- if (otheruser->fd != FD_MAGIC_NUMBER)
- WriteTo(user,otheruser,"%s",textbuffer);
- }
-}
-
-/* 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, ...)
-{
- if ((!Ptr) || (!text))
- {
- log(DEFAULT,"*** BUG *** WriteChannel was given an invalid parameter");
- return;
- }
- char textbuffer[MAXBUF];
- va_list argsPtr;
- va_start (argsPtr, text);
- vsnprintf(textbuffer, MAXBUF, text, argsPtr);
- va_end(argsPtr);
-
- std::vector<char*> *ulist = Ptr->GetUsers();
- for (int j = 0; j < ulist->size(); j++)
- {
- char* o = (*ulist)[j];
- userrec* otheruser = (userrec*)o;
- if ((otheruser->fd != FD_MAGIC_NUMBER) && (otheruser->fd != -1) && (otheruser != user))
- {
- if (!user)
- {
- WriteServ(otheruser->fd,"%s",textbuffer);
- }
- else
- {
- WriteTo(user,otheruser,"%s",textbuffer);
- }
- }
- }
-}
-
-
-void WriteChannelWithServ(char* ServName, chanrec* Ptr, char* text, ...)
-{
- if ((!Ptr) || (!text))
- {
- log(DEFAULT,"*** BUG *** WriteChannelWithServ was given an invalid parameter");
- return;
- }
- char textbuffer[MAXBUF];
- va_list argsPtr;
- va_start (argsPtr, text);
- vsnprintf(textbuffer, MAXBUF, text, argsPtr);
- va_end(argsPtr);
-
-
- std::vector<char*> *ulist = Ptr->GetUsers();
- for (int j = 0; j < ulist->size(); j++)
- {
- char* o = (*ulist)[j];
- userrec* otheruser = (userrec*)o;
- if (otheruser->fd != FD_MAGIC_NUMBER)
- WriteServ(otheruser->fd,"%s",textbuffer);
- }
-}
-
-
-/* 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* text, ...)
-{
- if ((!Ptr) || (!user) || (!text))
- {
- log(DEFAULT,"*** BUG *** ChanExceptSender was given an invalid parameter");
- return;
- }
- char textbuffer[MAXBUF];
- va_list argsPtr;
- va_start (argsPtr, text);
- vsnprintf(textbuffer, MAXBUF, text, argsPtr);
- va_end(argsPtr);
-
- std::vector<char*> *ulist = Ptr->GetUsers();
- for (int j = 0; j < ulist->size(); j++)
- {
- char* o = (*ulist)[j];
- userrec* otheruser = (userrec*)o;
- if ((otheruser->fd != FD_MAGIC_NUMBER) && (user != otheruser))
- WriteFrom(otheruser->fd,user,"%s",textbuffer);
- }
-}
-
-
-std::string GetServerDescription(char* servername)
-{
- for (int j = 0; j < 32; j++)
- {
- if (me[j] != NULL)
- {
- for (int k = 0; k < me[j]->connectors.size(); k++)
- {
- if (!strcasecmp(me[j]->connectors[k].GetServerName().c_str(),servername))
- {
- return me[j]->connectors[k].GetDescription();
- }
- }
- }
- return ServerDesc; // not a remote server that can be found, it must be me.
- }
-}
-
-
-/* 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, ...)
-{
- if (!u)
- {
- log(DEFAULT,"*** BUG *** WriteCommon was given an invalid parameter");
- return;
- }
-
- if (u->registered != 7) {
- log(DEFAULT,"*** BUG *** WriteCommon on an unregistered user");
- return;
- }
-
- char textbuffer[MAXBUF];
- va_list argsPtr;
- va_start (argsPtr, text);
- vsnprintf(textbuffer, MAXBUF, text, argsPtr);
- va_end(argsPtr);
-
- // FIX: Stops a message going to the same person more than once
- bzero(&already_sent,65536);
-
- bool sent_to_at_least_one = false;
-
- for (int i = 0; i < MAXCHANS; i++)
- {
- if (u->chans[i].channel)
- {
- std::vector<char*> *ulist = u->chans[i].channel->GetUsers();
- for (int j = 0; j < ulist->size(); j++)
- {
- char* o = (*ulist)[j];
- userrec* otheruser = (userrec*)o;
- if ((otheruser->fd > 0) && (!already_sent[otheruser->fd]))
- {
- already_sent[otheruser->fd] = 1;
- WriteFrom(otheruser->fd,u,"%s",textbuffer);
- sent_to_at_least_one = true;
- }
- }
- }
- }
- // if the user was not in any channels, no users will receive the text. Make sure the user
- // receives their OWN message for WriteCommon
- if (!sent_to_at_least_one)
- {
- WriteFrom(u->fd,u,"%s",textbuffer);
- }
-}
-
-/* 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, ...)
-{
- if (!u)
- {
- log(DEFAULT,"*** BUG *** WriteCommon was given an invalid parameter");
- return;
- }
-
- if (u->registered != 7) {
- log(DEFAULT,"*** BUG *** WriteCommon on an unregistered user");
- return;
- }
-
- char textbuffer[MAXBUF];
- va_list argsPtr;
- va_start (argsPtr, text);
- vsnprintf(textbuffer, MAXBUF, text, argsPtr);
- va_end(argsPtr);
-
- bzero(&already_sent,65536);
-
- for (int i = 0; i < MAXCHANS; i++)
- {
- if (u->chans[i].channel)
- {
- std::vector<char*> *ulist = u->chans[i].channel->GetUsers();
- for (int j = 0; j < ulist->size(); j++)
- {
- char* o = (*ulist)[j];
- userrec* otheruser = (userrec*)o;
- if (u != otheruser)
- {
- if ((otheruser->fd > 0) && (!already_sent[otheruser->fd]))
- {
- already_sent[otheruser->fd] = 1;
- WriteFrom(otheruser->fd,u,"%s",textbuffer);
- }
- }
- }
- }
- }
-}
-
-void WriteOpers(char* text, ...)
-{
- if (!text)
- {
- log(DEFAULT,"*** BUG *** WriteOpers was given an invalid parameter");
- return;
- }
-
- char textbuffer[MAXBUF];
- va_list argsPtr;
- va_start (argsPtr, text);
- vsnprintf(textbuffer, MAXBUF, text, argsPtr);
- va_end(argsPtr);
-
- for (std::vector<userrec*>::iterator i = all_opers.begin(); i != all_opers.end(); i++)
- {
- userrec* a = *i;
- if ((a) && (a->fd != FD_MAGIC_NUMBER))
- {
- if (strchr(a->modes,'s'))
- {
- // send server notices to all with +s
- WriteServ(a->fd,"NOTICE %s :%s",a->nick,textbuffer);
- }
- }
- }
-}
-
-void NoticeAllOpers(userrec *source, bool local_only, char* text, ...)
-{
- if ((!text) || (!source))
- {
- log(DEFAULT,"*** BUG *** NoticeAllOpers was given an invalid parameter");
- return;
- }
-
- char textbuffer[MAXBUF];
- va_list argsPtr;
- va_start (argsPtr, text);
- vsnprintf(textbuffer, MAXBUF, text, argsPtr);
- va_end(argsPtr);
-
- for (std::vector<userrec*>::iterator i = all_opers.begin(); i != all_opers.end(); i++)
- {
- userrec* a = *i;
- if ((a) && (a->fd != FD_MAGIC_NUMBER))
- {
- if (strchr(a->modes,'s'))
- {
- // send server notices to all with +s
- WriteServ(a->fd,"NOTICE %s :*** Notice From %s: %s",a->nick,source->nick,textbuffer);
- }
- }
- }
-
- if (!local_only)
- {
- char buffer[MAXBUF];
- snprintf(buffer,MAXBUF,"V %s @* :%s",source->nick,textbuffer);
- NetSendToAll(buffer);
- }
-}
-
-// returns TRUE of any users on channel C occupy server 'servername'.
-
-bool ChanAnyOnThisServer(chanrec *c,char* servername)
-{
- log(DEBUG,"ChanAnyOnThisServer");
-
- std::vector<char*> *ulist = c->GetUsers();
- for (int j = 0; j < ulist->size(); j++)
- {
- char* o = (*ulist)[j];
- userrec* user = (userrec*)o;
- if (!strcasecmp(user->server,servername))
- return true;
- }
- return false;
-}
-
-// returns true if user 'u' shares any common channels with any users on server 'servername'
-
-bool CommonOnThisServer(userrec* u,const char* servername)
-{
- log(DEBUG,"ChanAnyOnThisServer");
-
- for (int i = 0; i < MAXCHANS; i++)
- {
- if (u->chans[i].channel)
- {
- std::vector<char*> *ulist = u->chans[i].channel->GetUsers();
- for (int j = 0; j < ulist->size(); j++)
- {
- char* o = (*ulist)[j];
- userrec* user = (userrec*)o;
- if (!strcasecmp(user->server,servername))
- return true;
- }
- }
- }
- return false;
-}
-
-
-void NetSendToCommon(userrec* u, char* s)
-{
- char buffer[MAXBUF];
- snprintf(buffer,MAXBUF,"%s %s",CreateSum().c_str(),s);
-
- log(DEBUG,"NetSendToCommon: '%s' '%s'",u->nick,s);
-
- std::string msg = buffer;
- FOREACH_MOD OnPacketTransmit(msg,s);
- strlcpy(buffer,msg.c_str(),MAXBUF);
-
- for (int j = 0; j < 32; j++)
- {
- if (me[j] != NULL)
- {
- for (int k = 0; k < me[j]->connectors.size(); k++)
- {
- if (CommonOnThisServer(u,me[j]->connectors[k].GetServerName().c_str()))
- {
- me[j]->SendPacket(buffer,me[j]->connectors[k].GetServerName().c_str());
- }
- }
- }
- }
-}
-
-
-void NetSendToAll(char* s)
-{
- char buffer[MAXBUF];
- snprintf(buffer,MAXBUF,"%s %s",CreateSum().c_str(),s);
-
- log(DEBUG,"NetSendToAll: '%s'",s);
-
- std::string msg = buffer;
- FOREACH_MOD OnPacketTransmit(msg,s);
- strlcpy(buffer,msg.c_str(),MAXBUF);
-
- for (int j = 0; j < 32; j++)
- {
- if (me[j] != NULL)
- {
- for (int k = 0; k < me[j]->connectors.size(); k++)
- {
- me[j]->SendPacket(buffer,me[j]->connectors[k].GetServerName().c_str());
- }
- }
- }
-}
-
-void NetSendToAll_WithSum(char* s,char* u)
-{
- char buffer[MAXBUF];
- snprintf(buffer,MAXBUF,":%s %s",u,s);
-
- log(DEBUG,"NetSendToAll: '%s'",s);
-
- std::string msg = buffer;
- FOREACH_MOD OnPacketTransmit(msg,s);
- strlcpy(buffer,msg.c_str(),MAXBUF);
-
- for (int j = 0; j < 32; j++)
- {
- if (me[j] != NULL)
- {
- for (int k = 0; k < me[j]->connectors.size(); k++)
- {
- me[j]->SendPacket(buffer,me[j]->connectors[k].GetServerName().c_str());
- }
- }
- }
-}
-
-void NetSendToAllAlive(char* s)
-{
- char buffer[MAXBUF];
- snprintf(buffer,MAXBUF,"%s %s",CreateSum().c_str(),s);
-
- log(DEBUG,"NetSendToAllAlive: '%s'",s);
-
- std::string msg = buffer;
- FOREACH_MOD OnPacketTransmit(msg,s);
- strlcpy(buffer,msg.c_str(),MAXBUF);
-
- for (int j = 0; j < 32; j++)
- {
- if (me[j] != NULL)
- {
- for (int k = 0; k < me[j]->connectors.size(); k++)
- {
- if (me[j]->connectors[k].GetState() != STATE_DISCONNECTED)
- {
- me[j]->SendPacket(buffer,me[j]->connectors[k].GetServerName().c_str());
- }
- else
- {
- log(DEBUG,"%s is dead, not sending to it.",me[j]->connectors[k].GetServerName().c_str());
- }
- }
- }
- }
-}
-
-
-void NetSendToOne(char* target,char* s)
-{
- char buffer[MAXBUF];
- snprintf(buffer,MAXBUF,"%s %s",CreateSum().c_str(),s);
-
- log(DEBUG,"NetSendToOne: '%s' '%s'",target,s);
-
- std::string msg = buffer;
- FOREACH_MOD OnPacketTransmit(msg,s);
- strlcpy(buffer,msg.c_str(),MAXBUF);
-
- for (int j = 0; j < 32; j++)
- {
- if (me[j] != NULL)
- {
- for (int k = 0; k < me[j]->connectors.size(); k++)
- {
- if (!strcasecmp(me[j]->connectors[k].GetServerName().c_str(),target))
- {
- me[j]->SendPacket(buffer,me[j]->connectors[k].GetServerName().c_str());
- }
- }
- }
- }
-}
-
-void NetSendToAllExcept(const char* target,char* s)
-{
- char buffer[MAXBUF];
- snprintf(buffer,MAXBUF,"%s %s",CreateSum().c_str(),s);
-
- log(DEBUG,"NetSendToAllExcept: '%s' '%s'",target,s);
-
- std::string msg = buffer;
- FOREACH_MOD OnPacketTransmit(msg,s);
- strlcpy(buffer,msg.c_str(),MAXBUF);
-
- for (int j = 0; j < 32; j++)
- {
- if (me[j] != NULL)
- {
- for (int k = 0; k < me[j]->connectors.size(); k++)
- {
- if (strcasecmp(me[j]->connectors[k].GetServerName().c_str(),target))
- {
- me[j]->SendPacket(buffer,me[j]->connectors[k].GetServerName().c_str());
- }
- }
- }
- }
-}
-
-void NetSendToAllExcept_WithSum(const char* target,char* s,char* u)
-{
- char buffer[MAXBUF];
- snprintf(buffer,MAXBUF,":%s %s",u,s);
-
- log(DEBUG,"NetSendToAllExcept: '%s' '%s'",target,s);
-
- std::string msg = buffer;
- FOREACH_MOD OnPacketTransmit(msg,s);
- strlcpy(buffer,msg.c_str(),MAXBUF);
-
- for (int j = 0; j < 32; j++)
- {
- if (me[j] != NULL)
- {
- for (int k = 0; k < me[j]->connectors.size(); k++)
- {
- if (strcasecmp(me[j]->connectors[k].GetServerName().c_str(),target))
- {
- me[j]->SendPacket(buffer,me[j]->connectors[k].GetServerName().c_str());
- }
- }
- }
- }
-}
-
-
-void WriteMode(const char* modes, int flags, const char* text, ...)
-{
- if ((!text) || (!modes) || (!flags))
- {
- log(DEFAULT,"*** BUG *** WriteMode was given an invalid parameter");
- return;
- }
-
- char textbuffer[MAXBUF];
- va_list argsPtr;
- va_start (argsPtr, text);
- vsnprintf(textbuffer, MAXBUF, text, argsPtr);
- va_end(argsPtr);
- int modelen = strlen(modes);
-
- for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
- {
- if ((i->second) && (i->second->fd != FD_MAGIC_NUMBER))
- {
- bool send_to_user = false;
-
- if (flags == WM_AND)
- {
- send_to_user = true;
- for (int n = 0; n < modelen; n++)
- {
- if (!hasumode(i->second,modes[n]))
- {
- send_to_user = false;
- break;
- }
- }
- }
- else if (flags == WM_OR)
- {
- send_to_user = false;
- for (int n = 0; n < modelen; n++)
- {
- if (hasumode(i->second,modes[n]))
- {
- send_to_user = true;
- break;
- }
- }
- }
-
- if (send_to_user)
- {
- WriteServ(i->second->fd,"NOTICE %s :%s",i->second->nick,textbuffer);
- }
- }
- }
-}
-
-
-void NoticeAll(userrec *source, bool local_only, char* text, ...)
-{
- if ((!text) || (!source))
- {
- log(DEFAULT,"*** BUG *** NoticeAll was given an invalid parameter");
- return;
- }
-
- char textbuffer[MAXBUF];
- va_list argsPtr;
- va_start (argsPtr, text);
- vsnprintf(textbuffer, MAXBUF, text, argsPtr);
- va_end(argsPtr);
-
- for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
- {
- if ((i->second) && (i->second->fd != FD_MAGIC_NUMBER))
- {
- WriteFrom(i->second->fd,source,"NOTICE $* :%s",textbuffer);
- }
- }
-
- if (!local_only)
- {
- char buffer[MAXBUF];
- snprintf(buffer,MAXBUF,"V %s * :%s",source->nick,textbuffer);
- NetSendToAll(buffer);
- }
-
-}
-
-void WriteWallOps(userrec *source, bool local_only, char* text, ...)
-{
- if ((!text) || (!source))
- {
- log(DEFAULT,"*** BUG *** WriteOpers was given an invalid parameter");
- return;
- }
-
- char textbuffer[MAXBUF];
- va_list argsPtr;
- va_start (argsPtr, text);
- vsnprintf(textbuffer, MAXBUF, text, argsPtr);
- va_end(argsPtr);
-
- for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
- {
- if ((i->second) && (i->second->fd != FD_MAGIC_NUMBER))
- {
- if (strchr(i->second->modes,'w'))
- {
- WriteTo(source,i->second,"WALLOPS :%s",textbuffer);
- }
- }
- }
-
- if (!local_only)
- {
- char buffer[MAXBUF];
- snprintf(buffer,MAXBUF,"@ %s :%s",source->nick,textbuffer);
- NetSendToAll(buffer);
- }
-}
-
-/* convert a string to lowercase. Note following special circumstances
- * taken from RFC 1459. Many "official" server branches still hold to this
- * rule so i will too;
- *
- * Because of IRC's scandanavian origin, the characters {}| are
- * considered to be the lower case equivalents of the characters []\,
- * respectively. This is a critical issue when determining the
- * equivalence of two nicknames.
- */
-
-void strlower(char *n)
-{
- if (n)
- {
- for (char* t = n; *t; t++)
- *t = lowermap[*t];
- }
-}
-
-
-
-/* Find a user record by nickname and return a pointer to it */
-
-userrec* Find(std::string nick)
-{
- user_hash::iterator iter = clientlist.find(nick);
-
- if (iter == clientlist.end())
- /* Couldn't find it */
- return NULL;
-
- return iter->second;
-}
-
-/* find a channel record by channel name and return a pointer to it */
-
-chanrec* FindChan(const char* chan)
-{
- if (!chan)
- {
- log(DEFAULT,"*** BUG *** Findchan was given an invalid parameter");
- return NULL;
- }
-
- chan_hash::iterator iter = chanlist.find(chan);
-
- if (iter == chanlist.end())
- /* Couldn't find it */
- return NULL;
-
- return iter->second;
-}
-
-
-long GetMaxBans(char* name)
-{
- char CM[MAXBUF];
- for (int count = 0; count < ConfValueEnum("banlist",&config_f); count++)
- {
- ConfValue("banlist","chan",count,CM,&config_f);
- if (match(name,CM))
- {
- ConfValue("banlist","limit",count,CM,&config_f);
- return atoi(CM);
- }
- }
- return 64;
-}
-
-
-void purge_empty_chans(userrec* u)
-{
-
- int go_again = 1, purge = 0;
-
- // firstly decrement the count on each channel
- for (int f = 0; f < MAXCHANS; f++)
- {
- if (u->chans[f].channel)
- {
- u->chans[f].channel->DelUser((char*)u);
- }
- }
-
- for (int i = 0; i < MAXCHANS; i++)
- {
- if (u->chans[i].channel)
- {
- if (!usercount(u->chans[i].channel))
- {
- chan_hash::iterator i2 = chanlist.find(u->chans[i].channel->name);
- /* kill the record */
- if (i2 != chanlist.end())
- {
- log(DEBUG,"del_channel: destroyed: %s",i2->second->name);
- if (i2->second)
- delete i2->second;
- chanlist.erase(i2);
- go_again = 1;
- purge++;
- u->chans[i].channel = NULL;
- }
- }
- else
- {
- log(DEBUG,"skipped purge for %s",u->chans[i].channel->name);
- }
- }
- }
- log(DEBUG,"completed channel purge, killed %lu",(unsigned long)purge);
-
- DeleteOper(u);
-}
-
-
-char scratch[MAXBUF];
-char sparam[MAXBUF];
-
-char* chanmodes(chanrec *chan)
-{
- if (!chan)
- {
- log(DEFAULT,"*** BUG *** chanmodes was given an invalid parameter");
- strcpy(scratch,"");
- return scratch;
- }
-
- strcpy(scratch,"");
- strcpy(sparam,"");
- if (chan->binarymodes & CM_NOEXTERNAL)
- {
- strlcat(scratch,"n",MAXMODES);
- }
- if (chan->binarymodes & CM_TOPICLOCK)
- {
- strlcat(scratch,"t",MAXMODES);
- }
- if (chan->key[0])
- {
- strlcat(scratch,"k",MAXMODES);
- }
- if (chan->limit)
- {
- strlcat(scratch,"l",MAXMODES);
- }
- if (chan->binarymodes & CM_INVITEONLY)
- {
- strlcat(scratch,"i",MAXMODES);
- }
- if (chan->binarymodes & CM_MODERATED)
- {
- strlcat(scratch,"m",MAXMODES);
- }
- if (chan->binarymodes & CM_SECRET)
- {
- strlcat(scratch,"s",MAXMODES);
- }
- if (chan->binarymodes & CM_PRIVATE)
- {
- strlcat(scratch,"p",MAXMODES);
- }
- if (chan->key[0])
- {
- strlcat(sparam," ",MAXBUF);
- strlcat(sparam,chan->key,MAXBUF);
- }
- if (chan->limit)
- {
- char foo[24];
- sprintf(foo," %lu",(unsigned long)chan->limit);
- strlcat(sparam,foo,MAXBUF);
- }
- if (*chan->custom_modes)
- {
- strlcat(scratch,chan->custom_modes,MAXMODES);
- for (int z = 0; chan->custom_modes[z] != 0; z++)
- {
- std::string extparam = chan->GetModeParameter(chan->custom_modes[z]);
- if (extparam != "")
- {
- strlcat(sparam," ",MAXBUF);
- strlcat(sparam,extparam.c_str(),MAXBUF);
- }
- }
- }
- log(DEBUG,"chanmodes: %s %s%s",chan->name,scratch,sparam);
- strlcat(scratch,sparam,MAXMODES);
- return scratch;
-}
-
-
-/* compile a userlist of a channel into a string, each nick seperated by
- * spaces and op, voice etc status shown as @ and + */
-
-void userlist(userrec *user,chanrec *c)
-{
- if ((!c) || (!user))
- {
- log(DEFAULT,"*** BUG *** userlist was given an invalid parameter");
- return;
- }
-
- snprintf(list,MAXBUF,"353 %s = %s :", user->nick, c->name);
-
- std::vector<char*> *ulist = c->GetUsers();
- for (int i = 0; i < ulist->size(); i++)
- {
- char* o = (*ulist)[i];
- userrec* otheruser = (userrec*)o;
- if ((!has_channel(user,c)) && (strchr(otheruser->modes,'i')))
- {
- /* user is +i, and source not on the channel, does not show
- * nick in NAMES list */
- continue;
- }
- strlcat(list,cmode(otheruser,c),MAXBUF);
- strlcat(list,otheruser->nick,MAXBUF);
- strlcat(list," ",MAXBUF);
- if (strlen(list)>(480-NICKMAX))
- {
- /* list overflowed into
- * multiple numerics */
- WriteServ(user->fd,"%s",list);
- snprintf(list,MAXBUF,"353 %s = %s :", user->nick, c->name);
- }
- }
- /* if whats left in the list isnt empty, send it */
- if (list[strlen(list)-1] != ':')
- {
- WriteServ(user->fd,"%s",list);
- }
-}
-
-/* return a count of the users on a specific channel accounting for
- * invisible users who won't increase the count. e.g. for /LIST */
-
-int usercount_i(chanrec *c)
-{
- int count = 0;
-
- if (!c)
- {
- log(DEFAULT,"*** BUG *** usercount_i was given an invalid parameter");
- return 0;
- }
-
- strcpy(list,"");
- for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
- {
- if (i->second)
- {
- if (has_channel(i->second,c))
- {
- if (isnick(i->second->nick))
- {
- if ((!has_channel(i->second,c)) && (strchr(i->second->modes,'i')))
- {
- /* user is +i, and source not on the channel, does not show
- * nick in NAMES list */
- continue;
- }
- count++;
- }
- }
- }
- }
- log(DEBUG,"usercount_i: %s %lu",c->name,(unsigned long)count);
- return count;
-}
-
-
-int usercount(chanrec *c)
-{
- if (!c)
- {
- log(DEFAULT,"*** BUG *** usercount was given an invalid parameter");
- return 0;
- }
- int count = c->GetUserCounter();
- log(DEBUG,"usercount: %s %lu",c->name,(unsigned long)count);
- return count;
-}
-
/* add a channel to a user, creating the record for it if needed and linking
* it to the user record */
@@ -2342,71 +1164,6 @@ void kill_link_silent(userrec *user,const char* r)
}
-
-// looks up a users password for their connection class (<ALLOW>/<DENY> tags)
-
-char* Passwd(userrec *user)
-{
- for (ClassVector::iterator i = Classes.begin(); i != Classes.end(); i++)
- {
- if (match(user->host,i->host) && (i->type == CC_ALLOW))
- {
- return i->pass;
- }
- }
- return "";
-}
-
-bool IsDenied(userrec *user)
-{
- for (ClassVector::iterator i = Classes.begin(); i != Classes.end(); i++)
- {
- if (match(user->host,i->host) && (i->type == CC_DENY))
- {
- return true;
- }
- }
- return false;
-}
-
-
-
-
-/* sends out an error notice to all connected clients (not to be used
- * lightly!) */
-
-void send_error(char *s)
-{
- log(DEBUG,"send_error: %s",s);
- for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
- {
- if (isnick(i->second->nick))
- {
- WriteServ(i->second->fd,"NOTICE %s :%s",i->second->nick,s);
- }
- else
- {
- // fix - unregistered connections receive ERROR, not NOTICE
- Write(i->second->fd,"ERROR :%s",s);
- }
- }
-}
-
-void Error(int status)
-{
- signal (SIGALRM, SIG_IGN);
- signal (SIGPIPE, SIG_IGN);
- signal (SIGTERM, SIG_IGN);
- signal (SIGABRT, SIG_IGN);
- signal (SIGSEGV, SIG_IGN);
- signal (SIGURG, SIG_IGN);
- signal (SIGKILL, SIG_IGN);
- log(DEFAULT,"*** fell down a pothole in the road to perfection ***");
- send_error("Error! Segmentation fault! save meeeeeeeeeeeeee *splat!*");
- Exit(status);
-}
-
-
int main(int argc, char** argv)
{
Start();
@@ -2707,135 +1464,6 @@ void AddClient(int socket, char* host, int port, bool iscached, char* ip)
#endif
}
-// this function counts all users connected, wether they are registered or NOT.
-int usercnt(void)
-{
- return clientlist.size();
-}
-
-// this counts only registered users, so that the percentages in /MAP don't mess up when users are sitting in an unregistered state
-int registered_usercount(void)
-{
- int c = 0;
- for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
- {
- if ((i->second->fd) && (isnick(i->second->nick))) c++;
- }
- return c;
-}
-
-int usercount_invisible(void)
-{
- int c = 0;
-
- for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
- {
- if ((i->second->fd) && (isnick(i->second->nick)) && (strchr(i->second->modes,'i'))) c++;
- }
- return c;
-}
-
-int usercount_opers(void)
-{
- int c = 0;
-
- for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
- {
- if ((i->second->fd) && (isnick(i->second->nick)) && (strchr(i->second->modes,'o'))) c++;
- }
- return c;
-}
-
-int usercount_unknown(void)
-{
- int c = 0;
-
- for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
- {
- if ((i->second->fd) && (i->second->registered != 7))
- c++;
- }
- return c;
-}
-
-long chancount(void)
-{
- return chanlist.size();
-}
-
-long count_servs(void)
-{
- int c = 0;
- for (int i = 0; i < 32; i++)
- {
- if (me[i] != NULL)
- {
- for (vector<ircd_connector>::iterator j = me[i]->connectors.begin(); j != me[i]->connectors.end(); j++)
- {
- if (strcasecmp(j->GetServerName().c_str(),ServerName))
- {
- c++;
- }
- }
- }
- }
- return c;
-}
-
-long servercount(void)
-{
- return count_servs()+1;
-}
-
-long local_count()
-{
- int c = 0;
- for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
- {
- if ((i->second->fd) && (isnick(i->second->nick)) && (!strcasecmp(i->second->server,ServerName))) c++;
- }
- return c;
-}
-
-
-void ShowMOTD(userrec *user)
-{
- char buf[65536];
- std::string WholeMOTD = "";
- if (!MOTD.size())
- {
- WriteServ(user->fd,"422 %s :Message of the day file is missing.",user->nick);
- return;
- }
- snprintf(buf,65535,":%s 375 %s :- %s message of the day\r\n", ServerName, user->nick, ServerName);
- WholeMOTD = WholeMOTD + buf;
- for (int i = 0; i != MOTD.size(); i++)
- {
- snprintf(buf,65535,":%s 372 %s :- %s\r\n", ServerName, user->nick, MOTD[i].c_str());
- WholeMOTD = WholeMOTD + buf;
- }
- snprintf(buf,65535,":%s 376 %s :End of message of the day.\r\n", ServerName, user->nick);
- WholeMOTD = WholeMOTD + buf;
- // only one write operation
- user->AddWriteBuf(WholeMOTD);
- statsSent += WholeMOTD.length();
-}
-
-void ShowRULES(userrec *user)
-{
- if (!RULES.size())
- {
- WriteServ(user->fd,"NOTICE %s :Rules file is missing.",user->nick);
- return;
- }
- WriteServ(user->fd,"NOTICE %s :%s rules",user->nick,ServerName);
- for (int i = 0; i != RULES.size(); i++)
- {
- WriteServ(user->fd,"NOTICE %s :%s",user->nick,RULES[i].c_str());
- }
- WriteServ(user->fd,"NOTICE %s :End of %s rules.",user->nick,ServerName);
-}
-
/* shows the message of the day, and any other on-logon stuff */
void FullConnectUser(userrec* user)
{
@@ -2923,20 +1551,6 @@ void FullConnectUser(userrec* user)
}
-// this returns 1 when all modules are satisfied that the user should be allowed onto the irc server
-// (until this returns true, a user will block in the waiting state, waiting to connect up to the
-// registration timeout maximum seconds)
-bool AllModulesReportReady(userrec* user)
-{
- for (int i = 0; i <= MODCOUNT; i++)
- {
- int res = modules[i]->OnCheckReady(user);
- if (!res)
- return false;
- }
- return true;
-}
-
/* shows the message of the day, and any other on-logon stuff */
void ConnectUser(userrec *user)
{
@@ -3096,40 +1710,6 @@ void DoSplitEveryone()
-char islast(const char* s)
-{
- char c = '`';
- for (int j = 0; j < 32; j++)
- {
- if (me[j] != NULL)
- {
- for (int k = 0; k < me[j]->connectors.size(); k++)
- {
- if (strcasecmp(me[j]->connectors[k].GetServerName().c_str(),s))
- {
- c = '|';
- }
- if (!strcasecmp(me[j]->connectors[k].GetServerName().c_str(),s))
- {
- c = '`';
- }
- }
- }
- }
- return c;
-}
-
-long map_count(const char* s)
-{
- int c = 0;
- for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
- {
- if ((i->second->fd) && (isnick(i->second->nick)) && (!strcasecmp(i->second->server,s))) c++;
- }
- return c;
-}
-
-
void force_nickchange(userrec* user,const char* newnick)
{
char nick[MAXBUF];
@@ -3480,22 +2060,6 @@ void process_command(userrec *user, char* cmd)
}
}
-
-void createcommand(char* cmd, handlerfunc f, char flags, int minparams,char* source)
-{
- command_t comm;
- /* create the command and push it onto the table */
- strlcpy(comm.command,cmd,MAXBUF);
- strlcpy(comm.source,source,MAXBUF);
- comm.handler_function = f;
- comm.flags_needed = flags;
- comm.min_params = minparams;
- comm.use_count = 0;
- comm.total_bytes = 0;
- cmdlist.push_back(comm);
- log(DEBUG,"Added command %s (%lu parameters)",cmd,(unsigned long)minparams);
-}
-
bool removecommands(const char* source)
{
bool go_again = true;
@@ -3516,61 +2080,6 @@ bool removecommands(const char* source)
return true;
}
-void SetupCommandTable(void)
-{
- createcommand("USER",handle_user,0,4,"<core>");
- createcommand("NICK",handle_nick,0,1,"<core>");
- createcommand("QUIT",handle_quit,0,0,"<core>");
- createcommand("VERSION",handle_version,0,0,"<core>");
- createcommand("PING",handle_ping,0,1,"<core>");
- createcommand("PONG",handle_pong,0,1,"<core>");
- createcommand("ADMIN",handle_admin,0,0,"<core>");
- createcommand("PRIVMSG",handle_privmsg,0,2,"<core>");
- createcommand("INFO",handle_info,0,0,"<core>");
- createcommand("TIME",handle_time,0,0,"<core>");
- createcommand("WHOIS",handle_whois,0,1,"<core>");
- createcommand("WALLOPS",handle_wallops,'o',1,"<core>");
- createcommand("NOTICE",handle_notice,0,2,"<core>");
- createcommand("JOIN",handle_join,0,1,"<core>");
- createcommand("NAMES",handle_names,0,0,"<core>");
- createcommand("PART",handle_part,0,1,"<core>");
- createcommand("KICK",handle_kick,0,2,"<core>");
- createcommand("MODE",handle_mode,0,1,"<core>");
- createcommand("TOPIC",handle_topic,0,1,"<core>");
- createcommand("WHO",handle_who,0,1,"<core>");
- createcommand("MOTD",handle_motd,0,0,"<core>");
- createcommand("RULES",handle_rules,0,0,"<core>");
- createcommand("OPER",handle_oper,0,2,"<core>");
- createcommand("LIST",handle_list,0,0,"<core>");
- createcommand("DIE",handle_die,'o',1,"<core>");
- createcommand("RESTART",handle_restart,'o',1,"<core>");
- createcommand("KILL",handle_kill,'o',2,"<core>");
- createcommand("REHASH",handle_rehash,'o',0,"<core>");
- createcommand("LUSERS",handle_lusers,0,0,"<core>");
- createcommand("STATS",handle_stats,0,1,"<core>");
- createcommand("USERHOST",handle_userhost,0,1,"<core>");
- createcommand("AWAY",handle_away,0,0,"<core>");
- createcommand("ISON",handle_ison,0,0,"<core>");
- createcommand("SUMMON",handle_summon,0,0,"<core>");
- createcommand("USERS",handle_users,0,0,"<core>");
- createcommand("INVITE",handle_invite,0,0,"<core>");
- createcommand("PASS",handle_pass,0,1,"<core>");
- createcommand("TRACE",handle_trace,'o',0,"<core>");
- createcommand("WHOWAS",handle_whowas,0,1,"<core>");
- createcommand("CONNECT",handle_connect,'o',1,"<core>");
- createcommand("SQUIT",handle_squit,'o',0,"<core>");
- createcommand("MODULES",handle_modules,0,0,"<core>");
- createcommand("LINKS",handle_links,0,0,"<core>");
- createcommand("MAP",handle_map,0,0,"<core>");
- createcommand("KLINE",handle_kline,'o',1,"<core>");
- createcommand("GLINE",handle_gline,'o',1,"<core>");
- createcommand("ZLINE",handle_zline,'o',1,"<core>");
- createcommand("QLINE",handle_qline,'o',1,"<core>");
- createcommand("ELINE",handle_eline,'o',1,"<core>");
- createcommand("LOADMODULE",handle_loadmodule,'o',1,"<core>");
- createcommand("UNLOADMODULE",handle_unloadmodule,'o',1,"<core>");
- createcommand("SERVER",handle_server,0,0,"<core>");
-}
void process_buffer(const char* cmdbuf,userrec *user)
{
@@ -3906,67 +2415,6 @@ bool UnloadModule(const char* filename)
return false;
}
-bool DirValid(char* dirandfile)
-{
- char work[MAXBUF];
- strlcpy(work,dirandfile,MAXBUF);
- int p = strlen(work);
- // we just want the dir
- while (strlen(work))
- {
- if (work[p] == '/')
- {
- work[p] = '\0';
- break;
- }
- work[p--] = '\0';
- }
- char buffer[MAXBUF], otherdir[MAXBUF];
- // Get the current working directory
- if( getcwd( buffer, MAXBUF ) == NULL )
- return false;
- chdir(work);
- if( getcwd( otherdir, MAXBUF ) == NULL )
- return false;
- chdir(buffer);
- if (strlen(otherdir) >= strlen(work))
- {
- otherdir[strlen(work)] = '\0';
- if (!strcmp(otherdir,work))
- {
- return true;
- }
- return false;
- }
- else return false;
-}
-
-std::string GetFullProgDir(char** argv, int argc)
-{
- char work[MAXBUF];
- strlcpy(work,argv[0],MAXBUF);
- int p = strlen(work);
- // we just want the dir
- while (strlen(work))
- {
- if (work[p] == '/')
- {
- work[p] = '\0';
- break;
- }
- work[p--] = '\0';
- }
- char buffer[MAXBUF], otherdir[MAXBUF];
- // Get the current working directory
- if( getcwd( buffer, MAXBUF ) == NULL )
- return "";
- chdir(work);
- if( getcwd( otherdir, MAXBUF ) == NULL )
- return "";
- chdir(buffer);
- return otherdir;
-}
-
bool LoadModule(const char* filename)
{
char modfile[MAXBUF];
diff --git a/src/inspircd_io.cpp b/src/inspircd_io.cpp
index f1b122fa1..fcbb83aae 100644
--- a/src/inspircd_io.cpp
+++ b/src/inspircd_io.cpp
@@ -26,6 +26,7 @@
#include "inspircd_io.h"
#include "inspircd_util.h"
#include "inspstring.h"
+#include "helperfuncs.h"
using namespace std;
diff --git a/src/inspircd_util.cpp b/src/inspircd_util.cpp
index f90c4867e..6238a5cf4 100644
--- a/src/inspircd_util.cpp
+++ b/src/inspircd_util.cpp
@@ -18,6 +18,7 @@
#include "inspircd_io.h"
#include "inspircd_util.h"
#include "inspstring.h"
+#include "helperfuncs.h"
extern time_t TIME;
diff --git a/src/message.cpp b/src/message.cpp
index 2f372b5d8..7cf64a757 100644
--- a/src/message.cpp
+++ b/src/message.cpp
@@ -50,6 +50,7 @@
#include "message.h"
#include "inspstring.h"
#include "dns.h"
+#include "helperfuncs.h"
using namespace std;
diff --git a/src/mode.cpp b/src/mode.cpp
index 67f3785d8..990c6e591 100644
--- a/src/mode.cpp
+++ b/src/mode.cpp
@@ -51,6 +51,7 @@
#include "commands.h"
#include "xline.h"
#include "inspstring.h"
+#include "helperfuncs.h"
using namespace std;
diff --git a/src/modules.cpp b/src/modules.cpp
index d4b4a2a69..731bff6b9 100644
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -57,12 +57,8 @@
#include "xline.h"
#include "commands.h"
#include "inspstring.h"
-
-#ifdef GCC3
-#define nspace __gnu_cxx
-#else
-#define nspace std
-#endif
+#include "helperfuncs.h"
+#include "hashcomp.h"
using namespace std;
@@ -118,70 +114,6 @@ extern FILE *log_file;
extern userrec* fd_ref_table[65536];
-namespace nspace
-{
-#ifdef GCC34
- template<> struct hash<in_addr>
-#else
- template<> struct nspace::hash<in_addr>
-#endif
- {
- size_t operator()(const struct in_addr &a) const
- {
- size_t q;
- memcpy(&q,&a,sizeof(size_t));
- return q;
- }
- };
-#ifdef GCC34
- template<> struct hash<string>
-#else
- template<> struct nspace::hash<string>
-#endif
- {
- size_t operator()(const string &s) const
- {
- char a[MAXBUF];
- static struct hash<const char *> strhash;
- strlcpy(a,s.c_str(),MAXBUF);
- strlower(a);
- return strhash(a);
- }
- };
-}
-
-struct StrHashComp
-{
-
- bool operator()(const string& s1, const string& s2) const
- {
- char a[MAXBUF],b[MAXBUF];
- strlcpy(a,s1.c_str(),MAXBUF);
- strlcpy(b,s2.c_str(),MAXBUF);
- strlower(a);
- strlower(b);
- return (strcasecmp(a,b) == 0);
- }
-
-};
-
-struct InAddr_HashComp
-{
-
- bool operator()(const in_addr &s1, const in_addr &s2) const
- {
- size_t q;
- size_t p;
-
- memcpy(&q,&s1,sizeof(size_t));
- memcpy(&p,&s2,sizeof(size_t));
-
- return (q == p);
- }
-
-};
-
-
typedef nspace::hash_map<std::string, userrec*, nspace::hash<string>, StrHashComp> user_hash;
typedef nspace::hash_map<std::string, chanrec*, nspace::hash<string>, StrHashComp> chan_hash;
typedef nspace::hash_map<in_addr,string*, nspace::hash<in_addr>, InAddr_HashComp> address_cache;
diff --git a/src/modules/extra/m_filter_pcre.cpp b/src/modules/extra/m_filter_pcre.cpp
index 3e2d10b6c..559bb686a 100644
--- a/src/modules/extra/m_filter_pcre.cpp
+++ b/src/modules/extra/m_filter_pcre.cpp
@@ -24,6 +24,7 @@
#include "users.h"
#include "channels.h"
#include "modules.h"
+#include "helperfuncs.h"
/* $ModDesc: m_filter with regexps */
/* $CompileFlags: -I/usr/local/include -L/usr/local/lib -lpcre */
diff --git a/src/modules/extra/m_sql.cpp b/src/modules/extra/m_sql.cpp
index 0ba80278d..28d24bc48 100644
--- a/src/modules/extra/m_sql.cpp
+++ b/src/modules/extra/m_sql.cpp
@@ -21,6 +21,7 @@
#include "users.h"
#include "channels.h"
#include "modules.h"
+#include "helperfuncs.h"
#include "m_sql.h"
/* $ModDesc: SQL Service Provider module for all other m_sql* modules */
diff --git a/src/modules/extra/m_sqlauth.cpp b/src/modules/extra/m_sqlauth.cpp
index 157fcf11a..46721e098 100644
--- a/src/modules/extra/m_sqlauth.cpp
+++ b/src/modules/extra/m_sqlauth.cpp
@@ -30,6 +30,7 @@
#include "channels.h"
#include "modules.h"
#include "inspircd.h"
+#include "helperfuncs.h"
#include "m_sql.h"
/* $ModDesc: Allow/Deny connections based upon an arbitary SQL table */
diff --git a/src/modules/extra/m_sqloper.cpp b/src/modules/extra/m_sqloper.cpp
index 881e04877..6ba379fac 100644
--- a/src/modules/extra/m_sqloper.cpp
+++ b/src/modules/extra/m_sqloper.cpp
@@ -30,6 +30,7 @@
#include "channels.h"
#include "modules.h"
#include "inspircd.h"
+#include "helperfuncs.h"
#include "m_sql.h"
/* $ModDesc: Allows storage of oper credentials in an SQL table */
diff --git a/src/modules/m_blockcolor.cpp b/src/modules/m_blockcolor.cpp
index 5f30b18b5..6ba86e595 100644
--- a/src/modules/m_blockcolor.cpp
+++ b/src/modules/m_blockcolor.cpp
@@ -19,6 +19,7 @@
#include "users.h"
#include "channels.h"
#include "modules.h"
+#include "helperfuncs.h"
/* $ModDesc: Provides support for unreal-style channel mode +c */
diff --git a/src/modules/m_censor.cpp b/src/modules/m_censor.cpp
index 2d81b98f6..64a01b8fc 100644
--- a/src/modules/m_censor.cpp
+++ b/src/modules/m_censor.cpp
@@ -19,6 +19,7 @@
#include "users.h"
#include "channels.h"
#include "modules.h"
+#include "helperfuncs.h"
/* $ModDesc: Provides user and channel +G mode */
diff --git a/src/modules/m_chanfilter.cpp b/src/modules/m_chanfilter.cpp
index 44027b1fe..c8896cf0a 100644
--- a/src/modules/m_chanfilter.cpp
+++ b/src/modules/m_chanfilter.cpp
@@ -20,6 +20,7 @@
#include "users.h"
#include "channels.h"
#include "modules.h"
+#include "helperfuncs.h"
/* $ModDesc: Provides channel-specific censor lists (like mode +G but varies from channel to channel) */
diff --git a/src/modules/m_chanprotect.cpp b/src/modules/m_chanprotect.cpp
index 035658f8e..66457b928 100644
--- a/src/modules/m_chanprotect.cpp
+++ b/src/modules/m_chanprotect.cpp
@@ -18,6 +18,7 @@
#include "users.h"
#include "channels.h"
#include "modules.h"
+#include "helperfuncs.h"
/* $ModDesc: Provides channel modes +a and +q */
diff --git a/src/modules/m_filter.cpp b/src/modules/m_filter.cpp
index 054d77963..59a82d610 100644
--- a/src/modules/m_filter.cpp
+++ b/src/modules/m_filter.cpp
@@ -23,6 +23,7 @@
#include "users.h"
#include "channels.h"
#include "modules.h"
+#include "helperfuncs.h"
/* $ModDesc: An enhanced version of the unreal m_filter.so used by chatspike.net */
diff --git a/src/modules/m_helpop.cpp b/src/modules/m_helpop.cpp
index 7287204bb..bae4e73ae 100644
--- a/src/modules/m_helpop.cpp
+++ b/src/modules/m_helpop.cpp
@@ -17,6 +17,7 @@
#include "users.h"
#include "channels.h"
#include "modules.h"
+#include "helperfuncs.h"
// Global Vars
ConfigReader *helpop;
diff --git a/src/modules/m_knock.cpp b/src/modules/m_knock.cpp
index e1654c181..9553b619e 100644
--- a/src/modules/m_knock.cpp
+++ b/src/modules/m_knock.cpp
@@ -19,6 +19,7 @@
#include "users.h"
#include "channels.h"
#include "modules.h"
+#include "helperfuncs.h"
/* $ModDesc: Provides support for /KNOCK and mode +K */
diff --git a/src/modules/m_nicklock.cpp b/src/modules/m_nicklock.cpp
index f6a5749e4..b96105af7 100644
--- a/src/modules/m_nicklock.cpp
+++ b/src/modules/m_nicklock.cpp
@@ -19,6 +19,7 @@
#include "users.h"
#include "channels.h"
#include "modules.h"
+#include "helperfuncs.h"
/* $ModDesc: Provides the NICKLOCK command, allows an oper to chage a users nick and lock them to it until they quit */
diff --git a/src/modules/m_noctcp.cpp b/src/modules/m_noctcp.cpp
index 11c4778ab..a3c82bd15 100644
--- a/src/modules/m_noctcp.cpp
+++ b/src/modules/m_noctcp.cpp
@@ -18,6 +18,7 @@
#include "users.h"
#include "channels.h"
#include "modules.h"
+#include "helperfuncs.h"
/* $ModDesc: Provides support for unreal-style channel mode +c */
diff --git a/src/modules/m_noinvite.cpp b/src/modules/m_noinvite.cpp
index 30f313a92..868af242b 100644
--- a/src/modules/m_noinvite.cpp
+++ b/src/modules/m_noinvite.cpp
@@ -18,6 +18,7 @@
#include "users.h"
#include "channels.h"
#include "modules.h"
+#include "helperfuncs.h"
/* $ModDesc: Provides support for unreal-style channel mode +V */
diff --git a/src/modules/m_nokicks.cpp b/src/modules/m_nokicks.cpp
index 121bb63eb..df2f98c84 100644
--- a/src/modules/m_nokicks.cpp
+++ b/src/modules/m_nokicks.cpp
@@ -18,6 +18,7 @@
#include "users.h"
#include "channels.h"
#include "modules.h"
+#include "helperfuncs.h"
/* $ModDesc: Provides support for unreal-style channel mode +Q */
diff --git a/src/modules/m_nonicks.cpp b/src/modules/m_nonicks.cpp
index a0a6dabc8..582a87626 100644
--- a/src/modules/m_nonicks.cpp
+++ b/src/modules/m_nonicks.cpp
@@ -19,6 +19,7 @@
#include "users.h"
#include "channels.h"
#include "modules.h"
+#include "helperfuncs.h"
/* $ModDesc: Provides support for unreal-style GLOBOPS and umode +g */
diff --git a/src/modules/m_nonotice.cpp b/src/modules/m_nonotice.cpp
index 38b8292ea..85aa9b913 100644
--- a/src/modules/m_nonotice.cpp
+++ b/src/modules/m_nonotice.cpp
@@ -18,6 +18,7 @@
#include "users.h"
#include "channels.h"
#include "modules.h"
+#include "helperfuncs.h"
/* $ModDesc: Provides support for unreal-style channel mode +T */
diff --git a/src/modules/m_operchans.cpp b/src/modules/m_operchans.cpp
index 2c6d9276d..236c277f9 100644
--- a/src/modules/m_operchans.cpp
+++ b/src/modules/m_operchans.cpp
@@ -18,6 +18,7 @@
#include "users.h"
#include "channels.h"
#include "modules.h"
+#include "helperfuncs.h"
/* $ModDesc: Provides support for oper-only chans via the +O channel mode */
diff --git a/src/modules/m_operjoin.cpp b/src/modules/m_operjoin.cpp
index 02a42b977..5a4eebccf 100644
--- a/src/modules/m_operjoin.cpp
+++ b/src/modules/m_operjoin.cpp
@@ -3,6 +3,7 @@
#include "users.h"
#include "channels.h"
#include "modules.h"
+#include "helperfuncs.h"
/* $ModDesc: Forces opers to join a specified channel on oper-up */
diff --git a/src/modules/m_operlevels.cpp b/src/modules/m_operlevels.cpp
index ad9331a26..271c3cb45 100644
--- a/src/modules/m_operlevels.cpp
+++ b/src/modules/m_operlevels.cpp
@@ -2,6 +2,7 @@
#include "channels.h"
#include "modules.h"
#include <string>
+#include "helperfuncs.h"
/* $ModDesc: Gives each oper type a 'level', cannot kill opers 'above' your level. */
diff --git a/src/modules/m_opermd5.cpp b/src/modules/m_opermd5.cpp
index 661ed3ef5..d7951d153 100644
--- a/src/modules/m_opermd5.cpp
+++ b/src/modules/m_opermd5.cpp
@@ -20,6 +20,7 @@
#include "users.h"
#include "channels.h"
#include "modules.h"
+#include "helperfuncs.h"
/* The four core functions - F1 is optimized somewhat */
diff --git a/src/modules/m_opermotd.cpp b/src/modules/m_opermotd.cpp
index aa8627090..d52bb0162 100644
--- a/src/modules/m_opermotd.cpp
+++ b/src/modules/m_opermotd.cpp
@@ -4,6 +4,7 @@
#include "users.h"
#include "channels.h"
#include "modules.h"
+#include "helperfuncs.h"
/* $ModDesc: Shows a message to opers after oper-up, adds /opermotd */
diff --git a/src/modules/m_override.cpp b/src/modules/m_override.cpp
index 916acb36e..80066bb0f 100644
--- a/src/modules/m_override.cpp
+++ b/src/modules/m_override.cpp
@@ -18,6 +18,7 @@
#include "users.h"
#include "channels.h"
#include "modules.h"
+#include "helperfuncs.h"
/* $ModDesc: Provides support for unreal-style oper-override */
diff --git a/src/modules/m_park.cpp b/src/modules/m_park.cpp
index 123a4dbe2..1cf69b46f 100644
--- a/src/modules/m_park.cpp
+++ b/src/modules/m_park.cpp
@@ -19,6 +19,7 @@
#include <vector>
#include "users.h"
#include "channels.h"
+#include "helperfuncs.h"
#include "modules.h"
/* $ModDesc: Provides support for user parking/unparking */
diff --git a/src/modules/m_randquote.cpp b/src/modules/m_randquote.cpp
index 98160bda0..5cd8a8572 100644
--- a/src/modules/m_randquote.cpp
+++ b/src/modules/m_randquote.cpp
@@ -20,6 +20,7 @@
#include "users.h"
#include "channels.h"
#include "modules.h"
+#include "helperfuncs.h"
Server *Srv = NULL;
FileReader *quotes = NULL;
diff --git a/src/modules/m_redirect.cpp b/src/modules/m_redirect.cpp
index 77011c72f..f5df15945 100644
--- a/src/modules/m_redirect.cpp
+++ b/src/modules/m_redirect.cpp
@@ -18,6 +18,7 @@
#include "users.h"
#include "channels.h"
#include "modules.h"
+#include "helperfuncs.h"
/* $ModDesc: Provides channel mode +L (limit redirection) */
diff --git a/src/modules/m_restrictchans.cpp b/src/modules/m_restrictchans.cpp
index 704e41851..a56df6177 100644
--- a/src/modules/m_restrictchans.cpp
+++ b/src/modules/m_restrictchans.cpp
@@ -18,6 +18,7 @@
#include "users.h"
#include "channels.h"
#include "modules.h"
+#include "helperfuncs.h"
/* $ModDesc: Only opers may create new channels if this module is loaded */
diff --git a/src/modules/m_restrictmsg.cpp b/src/modules/m_restrictmsg.cpp
index 68c842ae8..5d6453555 100644
--- a/src/modules/m_restrictmsg.cpp
+++ b/src/modules/m_restrictmsg.cpp
@@ -20,6 +20,7 @@
#include "users.h"
#include "channels.h"
#include "modules.h"
+#include "helperfuncs.h"
/* $ModDesc: Forbids users from messaging each other. Users may still message opers and opers may message other opers. */
diff --git a/src/modules/m_sethost.cpp b/src/modules/m_sethost.cpp
index f82cec034..0afffd6c1 100644
--- a/src/modules/m_sethost.cpp
+++ b/src/modules/m_sethost.cpp
@@ -19,6 +19,7 @@
#include "users.h"
#include "channels.h"
#include "modules.h"
+#include "helperfuncs.h"
/* $ModDesc: Provides support for the SETHOST command */
diff --git a/src/modules/m_setidle.cpp b/src/modules/m_setidle.cpp
index e255d3fe2..208635009 100644
--- a/src/modules/m_setidle.cpp
+++ b/src/modules/m_setidle.cpp
@@ -19,6 +19,7 @@
#include "users.h"
#include "channels.h"
#include "modules.h"
+#include "helperfuncs.h"
/* $ModDesc: Allows opers to set their idle time */
diff --git a/src/modules/m_setname.cpp b/src/modules/m_setname.cpp
index 80352a629..8a481a3b4 100644
--- a/src/modules/m_setname.cpp
+++ b/src/modules/m_setname.cpp
@@ -19,6 +19,7 @@
#include "users.h"
#include "channels.h"
#include "modules.h"
+#include "helperfuncs.h"
/* $ModDesc: Provides support for the SETNAME command */
diff --git a/src/modules/m_showwhois.cpp b/src/modules/m_showwhois.cpp
index 01563b44f..6d3220658 100644
--- a/src/modules/m_showwhois.cpp
+++ b/src/modules/m_showwhois.cpp
@@ -3,6 +3,7 @@
#include "users.h"
#include "channels.h"
#include "modules.h"
+#include "helperfuncs.h"
/* $ModDesc: Allows opers to set +W to see when a user uses WHOIS on them */
diff --git a/src/modules/m_silence.cpp b/src/modules/m_silence.cpp
index a67fb41ba..e38638cd0 100644
--- a/src/modules/m_silence.cpp
+++ b/src/modules/m_silence.cpp
@@ -20,6 +20,7 @@
#include "users.h"
#include "channels.h"
#include "modules.h"
+#include "helperfuncs.h"
/* $ModDesc: Provides support for the /SILENCE command */
diff --git a/src/modules/m_timedbans.cpp b/src/modules/m_timedbans.cpp
index 8082831f0..2eab8b872 100644
--- a/src/modules/m_timedbans.cpp
+++ b/src/modules/m_timedbans.cpp
@@ -26,6 +26,7 @@
#include "users.h"
#include "channels.h"
#include "modules.h"
+#include "helperfuncs.h"
Server *Srv;
diff --git a/src/modules/m_userip.cpp b/src/modules/m_userip.cpp
index be0f07699..a077625c8 100644
--- a/src/modules/m_userip.cpp
+++ b/src/modules/m_userip.cpp
@@ -19,6 +19,7 @@
#include "users.h"
#include "channels.h"
#include "modules.h"
+#include "helperfuncs.h"
/* $ModDesc: Provides support for USERIP command */
diff --git a/src/servers.cpp b/src/servers.cpp
index 889709977..e95d8e7c0 100644
--- a/src/servers.cpp
+++ b/src/servers.cpp
@@ -20,6 +20,7 @@
#include <stdio.h>
#include <map>
#include "inspstring.h"
+#include "helperfuncs.h"
extern time_t TIME;
diff --git a/src/users.cpp b/src/users.cpp
index 6fca08abc..91542985a 100644
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -20,6 +20,7 @@
#include "inspircd.h"
#include <stdio.h>
#include "inspstring.h"
+#include "helperfuncs.h"
extern std::stringstream config_f;
diff --git a/src/wildcard.cpp b/src/wildcard.cpp
index d0cd504fa..bf20ec782 100644
--- a/src/wildcard.cpp
+++ b/src/wildcard.cpp
@@ -17,6 +17,7 @@
#include <string>
#include "inspircd_config.h"
#include "inspircd.h"
+#include "helperfuncs.h"
#include "inspstring.h"
// Wed 27 Apr 2005 - Brain
diff --git a/src/xline.cpp b/src/xline.cpp
index a7a5d0f30..768950e15 100644
--- a/src/xline.cpp
+++ b/src/xline.cpp
@@ -51,13 +51,8 @@
#include "commands.h"
#include "xline.h"
#include "inspstring.h"
-
-#ifdef GCC3
-#define nspace __gnu_cxx
-#else
-#define nspace std
-#endif
-
+#include "helperfuncs.h"
+#include "hashcomp.h"
using namespace std;
@@ -104,71 +99,6 @@ extern serverrec* me[32];
extern FILE *log_file;
-namespace nspace
-{
-#ifdef GCC34
- template<> struct hash<in_addr>
-#else
- template<> struct nspace::hash<in_addr>
-#endif
- {
- size_t operator()(const struct in_addr &a) const
- {
- size_t q;
- memcpy(&q,&a,sizeof(size_t));
- return q;
- }
- };
-#ifdef GCC34
- template<> struct hash<string>
-#else
- template<> struct nspace::hash<string>
-#endif
- {
- size_t operator()(const string &s) const
- {
- char a[MAXBUF];
- static struct hash<const char *> strhash;
- strlcpy(a,s.c_str(),MAXBUF);
- strlower(a);
- return strhash(a);
- }
- };
-}
-
-
-struct StrHashComp
-{
-
- bool operator()(const string& s1, const string& s2) const
- {
- char a[MAXBUF],b[MAXBUF];
- strlcpy(a,s1.c_str(),MAXBUF);
- strlcpy(b,s2.c_str(),MAXBUF);
- strlower(a);
- strlower(b);
- return (strcasecmp(a,b) == 0);
- }
-
-};
-
-struct InAddr_HashComp
-{
-
- bool operator()(const in_addr &s1, const in_addr &s2) const
- {
- size_t q;
- size_t p;
-
- memcpy(&q,&s1,sizeof(size_t));
- memcpy(&p,&s2,sizeof(size_t));
-
- return (q == p);
- }
-
-};
-
-
typedef nspace::hash_map<std::string, userrec*, nspace::hash<string>, StrHashComp> user_hash;
typedef nspace::hash_map<std::string, chanrec*, nspace::hash<string>, StrHashComp> chan_hash;
typedef nspace::hash_map<in_addr,string*, nspace::hash<in_addr>, InAddr_HashComp> address_cache;