sorted hashcomp etc

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@1387 e03df62e-2008-0410-955e-edbf42e46eb7

diff --git a/include/hashcomp.h b/include/hashcomp.h
index 42954fc37886f9937a614353c382b9decd979a92..e75e84ef4f9d88695e60b8eb0fd75a1f4ebe2e3c 100644 (file)
--- a/include/hashcomp.h
+++ b/include/hashcomp.h
@@ -1,3 +1,19 @@
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  Inspire is copyright (C) 2002-2005 ChatSpike-Dev.
+ *                       E-mail:
+ *                <brain@chatspike.net>
+ *                <Craig@chatspike.net>
+ *
+ * Written by Craig Edwards, Craig McLure, and others.
+ * This program is free but copyrighted software; see
+ *            the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
+

 #ifndef _HASHCOMP_H_
 #define _HASHCOMP_H_
 
 #ifndef _HASHCOMP_H_
 #define _HASHCOMP_H_
 

diff --git a/include/helperfuncs.h b/include/helperfuncs.h
index b7078f56af7c130dfc35d9653c669150fe0192f6..0e8ba33ff16046f7ac42b92e1b2ad92168162583 100644 (file)
--- a/include/helperfuncs.h
+++ b/include/helperfuncs.h
@@ -1,3 +1,19 @@
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  Inspire is copyright (C) 2002-2005 ChatSpike-Dev.
+ *                       E-mail:
+ *                <brain@chatspike.net>
+ *                <Craig@chatspike.net>
+ *
+ * Written by Craig Edwards, Craig McLure, and others.
+ * This program is free but copyrighted software; see
+ *            the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
+

 #ifndef _HELPER_H_
 #define _HELPER_H_
 
 #ifndef _HELPER_H_
 #define _HELPER_H_
 

diff --git a/include/inspircd.h b/include/inspircd.h
index 27c90cce8d83522ffd02083893928e7f74bed6f6..6cd4c635098c032d79c8fec355fa17fd5de0c751 100644 (file)
--- a/include/inspircd.h
+++ b/include/inspircd.h
@@ -16,18 +16,12 @@
 
 #include <string>
 #include <stdio.h>
 
 #include <string>
 #include <stdio.h>

-#include <syslog.h>
-#include <stdlib.h>

 #include <unistd.h>
 #include <signal.h>
 #include <time.h>
 #include <netdb.h>
 #include <string.h>
 #include <unistd.h>
 #include <signal.h>
 #include <time.h>
 #include <netdb.h>
 #include <string.h>

-#include <ctype.h>

 #include <errno.h>
 #include <errno.h>

-#include <stdarg.h>
-#include <assert.h>
-#include <sys/param.h>

 #include <sys/types.h>
 
 #ifndef _LINUX_C_LIB_VERSION
 #include <sys/types.h>
 
 #ifndef _LINUX_C_LIB_VERSION

diff --git a/src/channels.cpp b/src/channels.cpp
index b8ad3d95aab6b11b4616477689b03e354d7488da..1904bfa26c561e2a367138174c4705cbbdc5281f 100644 (file)
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -19,11 +19,9 @@
 #include "inspircd_util.h"
 #include "inspircd_config.h"
 #include <unistd.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>
 #include <sys/errno.h>
 #include <sys/ioctl.h>
 #include <sys/utsname.h>

-#include <cstdio>

 #include <time.h>
 #include <string>
 #ifdef GCC3
 #include <time.h>
 #include <string>
 #ifdef GCC3


@@ -34,11 +32,7 @@
 #include <map>
 #include <sstream>
 #include <vector>
 #include <map>
 #include <sstream>
 #include <vector>

-#include <errno.h>

 #include <deque>
 #include <deque>

-#include <errno.h>
-#include <unistd.h>
-#include <sched.h>

 #include "connection.h"
 #include "users.h"
 #include "servers.h"
 #include "connection.h"
 #include "users.h"
 #include "servers.h"

diff --git a/src/commands.cpp b/src/commands.cpp
index e327aa712b476052aed2bee7a1d61aca7db1c0a0..3dfa44d9fc0651d067530adc57ff50284c7d4305 100644 (file)
--- a/src/commands.cpp
+++ b/src/commands.cpp
@@ -19,7 +19,6 @@
 #include "inspircd_util.h"
 #include "inspircd_config.h"
 #include <unistd.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>
 #include <sys/errno.h>
 #include <sys/ioctl.h>
 #include <sys/utsname.h>


@@ -39,11 +38,7 @@
 #include <map>
 #include <sstream>
 #include <vector>
 #include <map>
 #include <sstream>
 #include <vector>

-#include <errno.h>

 #include <deque>
 #include <deque>

-#include <errno.h>
-#include <unistd.h>
-#include <sched.h>

 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/resource.h>
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/resource.h>

diff --git a/src/dnsqueue.cpp b/src/dnsqueue.cpp
index 2198d0bed2e19677b98a8fbb5e791b57703d7eba..9d77543e90213f85433815ddd11e4aad80b77743 100644 (file)
--- a/src/dnsqueue.cpp
+++ b/src/dnsqueue.cpp
@@ -23,7 +23,6 @@ using namespace std;
 #include "inspircd_util.h"
 #include "inspircd_config.h"
 #include <unistd.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>
 #include <sys/errno.h>
 #include <sys/ioctl.h>
 #include <sys/utsname.h>


@@ -38,11 +37,7 @@ using namespace std;
 #include <map>
 #include <sstream>
 #include <vector>
 #include <map>
 #include <sstream>
 #include <vector>

-#include <errno.h>

 #include <deque>
 #include <deque>

-#include <errno.h>
-#include <unistd.h>
-#include <sched.h>

 #include "connection.h"
 #include "users.h"
 #include "servers.h"
 #include "connection.h"
 #include "users.h"
 #include "servers.h"


@@ -57,7 +52,6 @@ using namespace std;
 #include "xline.h"
 #include "inspstring.h"
 #include "dnsqueue.h"
 #include "xline.h"
 #include "inspstring.h"
 #include "dnsqueue.h"

-#include <stdlib.h>

 #include <time.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <time.h>
 #include <sys/types.h>
 #include <sys/socket.h>


@@ -65,10 +59,6 @@ using namespace std;
 #include <sys/time.h>
 #include <netinet/in.h>
 #include <string.h>
 #include <sys/time.h>
 #include <netinet/in.h>
 #include <string.h>

-#include <unistd.h>
-#include <stdio.h>
-#include <errno.h>
-#include <fcntl.h>

 #include "dns.h"
 #include "helperfuncs.h"
 #include "hashcomp.h"
 #include "dns.h"
 #include "helperfuncs.h"
 #include "hashcomp.h"

diff --git a/src/hashcomp.cpp b/src/hashcomp.cpp
index e8ab857f6ca67186e98de7b5dc99967ffb93be17..1122c3867598eb1b16d9d13ae27578730473c52a 100644 (file)
--- a/src/hashcomp.cpp
+++ b/src/hashcomp.cpp
@@ -1,3 +1,19 @@
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  Inspire is copyright (C) 2002-2005 ChatSpike-Dev.
+ *                       E-mail:
+ *                <brain@chatspike.net>
+ *                <Craig@chatspike.net>
+ *
+ * Written by Craig Edwards, Craig McLure, and others.
+ * This program is free but copyrighted software; see
+ *            the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
+

 #include <string>
 #include "inspircd.h"
 #include "hashcomp.h"
 #include <string>
 #include "inspircd.h"
 #include "hashcomp.h"

diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp
index 98e26ff697faf1268ed536022604d7cf8aeacdab..20b924013eeaa0a14f8a5b7e01e3c80265b54bac 100644 (file)
--- a/src/helperfuncs.cpp
+++ b/src/helperfuncs.cpp
@@ -1,3 +1,19 @@
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
+ *                       E-mail:
+ *                <brain@chatspike.net>
+ *                <Craig@chatspike.net>
+ *
+ * Written by Craig Edwards, Craig McLure, and others.
+ * This program is free but copyrighted software; see
+ *            the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
+

 #include "inspircd.h"
 #include "inspircd_io.h"
 #include "inspircd_util.h"
 #include "inspircd.h"
 #include "inspircd_io.h"
 #include "inspircd_util.h"


@@ -5,14 +21,6 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/errno.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 <time.h>
 #include <string>
 #ifdef GCC3


@@ -20,14 +28,10 @@
 #else
 #include <hash_map>
 #endif
 #else
 #include <hash_map>
 #endif

-#include <map>

 #include <sstream>
 #include <vector>
 #include <sstream>
 #include <vector>

-#include <errno.h>

 #include <deque>
 #include <deque>

-#include <errno.h>
-#include <unistd.h>
-#include <sched.h>
+#include <stdarg.h>

 #include "connection.h"
 #include "users.h"
 #include "servers.h"
 #include "connection.h"
 #include "users.h"
 #include "servers.h"


@@ -46,54 +50,20 @@
 
 using namespace std;
 
 
 using namespace std;
 

-#ifdef USE_KQUEUE
-extern int kq;
-#endif
-

 extern int MODCOUNT;
 extern std::vector<Module*> modules;
 extern int MODCOUNT;
 extern std::vector<Module*> modules;

-extern std::vector<ircd_module*> factory;

 
 extern time_t TIME;
 
 extern time_t TIME;

-

 extern bool nofork;
 extern bool nofork;

-

 extern char lowermap[255];
 extern char lowermap[255];

-
-extern int LogLevel;

 extern char ServerName[MAXBUF];
 extern char Network[MAXBUF];
 extern char ServerDesc[MAXBUF];
 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 list[MAXBUF];

-extern char PrefixQuit[MAXBUF];
-extern char DieValue[MAXBUF];

 
 extern int debugging;
 
 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 int LogLevel;
+

 extern std::stringstream config_f;
 
 extern serverrec* me[32];
 extern std::stringstream config_f;
 
 extern serverrec* me[32];


@@ -108,21 +78,15 @@ extern std::vector<userrec*> all_opers;
 
 extern ClassVector Classes;
 
 
 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<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;
 
 typedef std::deque<command_t> command_table;
 

-

 extern user_hash clientlist;
 extern chan_hash chanlist;
 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 command_table cmdlist;
 extern file_cache MOTD;
 extern file_cache RULES;

-extern address_cache IP;

 
 void log(int level,char *text, ...)
 {
 
 void log(int level,char *text, ...)
 {

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index 9a71c3a920b0a9d48f67bb59a9edf135fc7d1c8b..56d476c48c60091e2180f051fde580273a9120d3 100644 (file)
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -32,7 +32,6 @@ using namespace std;
 #include <sys/event.h>
 #include <sys/time.h>
 #endif
 #include <sys/event.h>
 #include <sys/time.h>
 #endif

-#include <cstdio>

 #include <time.h>
 #include <string>
 #ifdef GCC3
 #include <time.h>
 #include <string>
 #ifdef GCC3


@@ -43,10 +42,7 @@ using namespace std;
 #include <map>
 #include <sstream>
 #include <vector>
 #include <map>
 #include <sstream>
 #include <vector>

-#include <errno.h>

 #include <deque>
 #include <deque>

-#include <errno.h>
-#include <unistd.h>

 #include <sched.h>
 #include "connection.h"
 #include "users.h"
 #include <sched.h>
 #include "connection.h"
 #include "users.h"

diff --git a/src/message.cpp b/src/message.cpp
index 7cf64a75775b94b215dd5672eea09c7cdb9290a2..1aeee4ae457554dc519ad60dea2c2b4e4b10aeb6 100644 (file)
--- a/src/message.cpp
+++ b/src/message.cpp
@@ -21,9 +21,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/errno.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/errno.h>

-#include <sys/ioctl.h>

 #include <sys/utsname.h>
 #include <sys/utsname.h>

-#include <cstdio>

 #include <time.h>
 #include <string>
 #ifdef GCC3
 #include <time.h>
 #include <string>
 #ifdef GCC3


@@ -34,11 +32,7 @@
 #include <map>
 #include <sstream>
 #include <vector>
 #include <map>
 #include <sstream>
 #include <vector>

-#include <errno.h>

 #include <deque>
 #include <deque>

-#include <errno.h>
-#include <unistd.h>
-#include <sched.h>

 #include "connection.h"
 #include "users.h"
 #include "servers.h"
 #include "connection.h"
 #include "users.h"
 #include "servers.h"

diff --git a/src/mode.cpp b/src/mode.cpp
index 990c6e591d997f35ccb4348a516d4a26b5049fe7..9af80bb003ab3df1a92eac907000cfce85ded3c9 100644 (file)
--- a/src/mode.cpp
+++ b/src/mode.cpp
@@ -19,11 +19,7 @@
 #include "inspircd_util.h"
 #include "inspircd_config.h"
 #include <unistd.h>
 #include "inspircd_util.h"
 #include "inspircd_config.h"
 #include <unistd.h>

-#include <fcntl.h>

 #include <sys/errno.h>
 #include <sys/errno.h>

-#include <sys/ioctl.h>
-#include <sys/utsname.h>
-#include <cstdio>

 #include <time.h>
 #include <string>
 #ifdef GCC3
 #include <time.h>
 #include <string>
 #ifdef GCC3


@@ -34,11 +30,7 @@
 #include <map>
 #include <sstream>
 #include <vector>
 #include <map>
 #include <sstream>
 #include <vector>

-#include <errno.h>

 #include <deque>
 #include <deque>

-#include <errno.h>
-#include <unistd.h>
-#include <sched.h>

 #include "connection.h"
 #include "users.h"
 #include "servers.h"
 #include "connection.h"
 #include "users.h"
 #include "servers.h"

diff --git a/src/modules.cpp b/src/modules.cpp
index 731bff6b924aeca6527430a5998bf533febf5079..fba0db10a2c01a0d24ceacb2aa63e4469f12dca7 100644 (file)
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -19,16 +19,12 @@
 #include "inspircd_util.h"
 #include "inspircd_config.h"
 #include <unistd.h>
 #include "inspircd_util.h"
 #include "inspircd_config.h"
 #include <unistd.h>

-#include <fcntl.h>

 #include <sys/errno.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
 #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 <time.h>
 #include <string>
 #ifdef GCC3


@@ -39,11 +35,7 @@
 #include <map>
 #include <sstream>
 #include <vector>
 #include <map>
 #include <sstream>
 #include <vector>

-#include <errno.h>

 #include <deque>
 #include <deque>

-#include <errno.h>
-#include <unistd.h>
-#include <sched.h>

 #include "connection.h"
 #include "users.h"
 #include "servers.h"
 #include "connection.h"
 #include "users.h"
 #include "servers.h"

diff --git a/src/xline.cpp b/src/xline.cpp
index 768950e15c37c5617b81e9192b1a894be2edb97a..1d0bcf7754eeeb8b28407ec5ff7f373d6aa15ebb 100644 (file)
--- a/src/xline.cpp
+++ b/src/xline.cpp
@@ -21,9 +21,6 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/errno.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/errno.h>

-#include <sys/ioctl.h>
-#include <sys/utsname.h>
-#include <cstdio>

 #include <time.h>
 #include <string>
 #ifdef GCC3
 #include <time.h>
 #include <string>
 #ifdef GCC3


@@ -34,11 +31,7 @@
 #include <map>
 #include <sstream>
 #include <vector>
 #include <map>
 #include <sstream>
 #include <vector>

-#include <errno.h>

 #include <deque>
 #include <deque>

-#include <errno.h>
-#include <unistd.h>
-#include <sched.h>

 #include "connection.h"
 #include "users.h"
 #include "servers.h"
 #include "connection.h"
 #include "users.h"
 #include "servers.h"