BUILD : 1.7.7 (555) BUGS : N/A NOTES : TS6 support, Ratbox support, lots of little bug fixes, updated documentation

git-svn-id: svn://svn.anope.org/anope/trunk@555 31f1291d-b8d6-0310-a050-a5561fc1590b


git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@408 5417fbe8-f217-4b02-8779-1006273d7864

38 files changed, 2989 insertions, 376 deletions

diff --git a/Changes b/Changes
index 9ed5d9188..a1dc94b1a 100644
--- a/Changes
+++ b/Changes
@@ -1,9 +1,19 @@
 Anope Version S V N
 -------------------
 Provided by Anope Dev. <dev@anope.org> - 2005
+01/23 A Support for Ratbox IRCD (With and Without TS6)                    [ #00]
+01/23 A Support for TS6 protocol                                          [ #00]
 01/19 A Add simple smtp client, read the README in src/tools for info     [ #00]
 01/16 A Support for PTlinks VHOST (NEWMASK) command.                      [ #00]
 01/16 A Ulines Servers are now except from NOJOIN bans                    [#281]
+01/23 F Fixed u_char warnings under OpenBSD.                              [ #00]
+01/23 F anope_cmd_ctcp() fixed it was setup wrong.                        [ #00]
+01/23 F Checks to make sure Services and Services Alias are not the same  [ #00]
+01/23 F SIGINT now shuts down Anope correctly when running with -nofork   [ #00]
+01/23 F Attempting to set +h (helper) modes on ircd where there is no +h  [ #00]
+01/23 F Fixed problem when dealing with non-existant user privmsg         [ #00]
+01/23 F Updated IRCD, FAQ, README to be more current                      [ #00]
+01/23 F Free's memory on shutdown that is in the User and Channel structs [ #00]
 01/20 F Misplaced MEMO_NO_RSEND_SELF in es.l reordered.                   [ #00]
 01/19 F OperServ HELP does not show commands not usable on that ircd      [ #25]
 01/16 F Help messages restricted to the right access level.               [#272]
diff --git a/Changes.conf b/Changes.conf
index 37cdf1ede..19eba34d9 100644
--- a/Changes.conf
+++ b/Changes.conf
@@ -2,6 +2,14 @@ Anope Version S V N
 -------------------
 ** ADDED    CONFIGURATION DIRECTIVES **
 
+# UseTS6  [OPTIONAL]
+#
+# Modern hybrid ircd like Ratbox 2.0.x support a protocol called TS6. 
+# However this protocol is optional thus our default support is for without 
+# TS6, if you want to take advantage of TS6, enable this option.
+
+#UseTS6
+
 ** MODIFIED CONFIGURATION DIRECTIVES **
 
 ** DELETED  CONFIGURATION DIRECTIVES ** 
diff --git a/Config b/Config
index 8d6c05751..4fc79594a 100755
--- a/Config
+++ b/Config
@@ -224,6 +224,7 @@ echo "    9) RageIRCd 2.0.0     [beta-6 or later]"
 echo "   10) Unreal 3.2         [Unreal 3.2 beta19 or later]"
 echo "   11) Solid IRCD 3.4.x   [Solid IRCD 3.4.6 or later]"
 echo "   12) Plexus 2.0         [or later]"
+echo "   13) Ratbox 2.0.6       [or later]"
 
 while [ $ok -eq 0 ] ; do
         echo2 "[$IRCTYPE] "
@@ -286,6 +287,10 @@ while [ $ok -eq 0 ] ; do
 			IRCTYPE_DEF="IRC_PLEXUS"
 			ok=1;
 			;;
+		13)
+			IRCTYPE_DEF="IRC_RATBOX"
+			ok=1;
+			;;
 
                 *)
                         echo "Please enter a valid option number."
diff --git a/configure b/configure
index a8b674cfe..3649da9d8 100755
--- a/configure
+++ b/configure
@@ -4557,6 +4557,7 @@ esac
 
 fi
 
+
 fi
 echo "$as_me:$LINENO: result: $ac_cv_pic" >&5
 echo "${ECHO_T}$ac_cv_pic" >&6
@@ -8609,6 +8610,14 @@ _ACEOF
 
 		IRCDFILE=" plexus.c "
 
+    elif test "$withval" = "IRC_RATBOX"; then
+
+cat >>confdefs.h <<\_ACEOF
+#define IRC_RATBOX 1
+_ACEOF
+
+		IRCDFILE=" ratbox.c "
+
 
     fi
 
diff --git a/configure.in b/configure.in
index ffe7e5e64..cc9e62507 100644
--- a/configure.in
+++ b/configure.in
@@ -114,6 +114,7 @@ case `uname -s` in
 esac
 
 fi
+
 ])
 AC_CACHE_CHECK(if your system prepends an underscore on symbols,ac_cv_underscore,[
 cat >uscore.c << __EOF__
@@ -241,6 +242,10 @@ AC_ARG_WITH(ircd, [ --with-ircd=ircd     Specify the first ircd type], [
 		AC_DEFINE(IRC_PLEXUS,1,"First IRCD type")
 		IRCDFILE=" plexus.c "
 		AC_SUBST(IRCDFILE)
+    elif test "$withval" = "IRC_RATBOX"; then
+		AC_DEFINE(IRC_RATBOX,1,"First IRCD type")
+		IRCDFILE=" ratbox.c "
+		AC_SUBST(IRCDFILE)
 
     fi
 ])
diff --git a/data/example.conf b/data/example.conf
index 6c2e5b19d..923528531 100644
--- a/data/example.conf
+++ b/data/example.conf
@@ -240,6 +240,8 @@ NetworkName "LocalNet"
 # Numeric [OPTIONAL]
 #     Many ircd identify themselves with a Numeric ID when using this option
 #     consult your ircds documentation before using this
+#	  - With TS6 ircd this must be 2 numbers, Anope will append X to this to
+#     make the numeric ##X
 #Numeric 0
 
 ###########################################################################
@@ -480,6 +482,14 @@ GlobalOnCycleUP "Services are now back online - have a nice day"
 
 UlineServers "stats.your.network proxy.your.network"
 
+# UseTS6  [OPTIONAL]
+#
+# Modern hybrid ircd like Ratbox 2.0.x support a protocol called TS6. 
+# However this protocol is optional thus our default support is for without 
+# TS6, if you want to take advantage of TS6, enable this option.
+
+#UseTS6
+
 ###########################################################################
 #
 # Mail-related options
diff --git a/docs/FAQ b/docs/FAQ
index 6f567e0f4..fa042c779 100644
--- a/docs/FAQ
+++ b/docs/FAQ
@@ -92,6 +92,8 @@ Index:
 
 33. What is a Super-Admin? How does it work? Why might it not work?
 
+34. How to auto voice all those whom join my #channel?
+
 ---------------------------------------------------------------------------
 
 1. What is Anope?
@@ -114,20 +116,9 @@ Index:
 
 3. Does Anope run under Windows?
 
-	Well... not officially. Bu there is a cygwin based patch that makes
-	Anope work on Windows. Note, however, that some features might not
-	work, and you should take that into consideration when answering
-	the questions of ./configure (i.e. MySQL, Modules). 
-
-	You can obtain a pre-build copy of Anope for Windows from 
-	http://www.wircds.net/ although we have "blessed" that port,
-	we do not provide support for it. If you can't get it work,
-	go to wIRCds.net forum.
-
-	If you feel capable of taking ownership of an official windows
-	port, and to keep it current, please let the current Development 
-	team know.
-
+	Well... not officially. Bu there is a port branch of services that will
+	work on Windows. Visit http://windows.anope.org for more information on
+    this port.
 
 4. Can I send you questions without reading the FAQ, INSTALL or README 
    files?
@@ -421,3 +412,9 @@ Index:
 	It only works if SuperAdmin is uncommented in the services
 	configuration file. This is commented by default.
 	Read /msg OperServ HELP SET SUPERADMIN for further help.
+
+34. How to auto voice all those whom join my #channel?
+
+    /cs set #channel secure off
+    /cs set #channel xop off
+    /cs levels #channel set AUTOVOICE -1
diff --git a/docs/IRCD b/docs/IRCD
index 50e0659b4..27f329e2e 100644
--- a/docs/IRCD
+++ b/docs/IRCD
@@ -1,9 +1,12 @@
 HOW TO ADD IRCD SUPPORT
 
 1. Files to edit
-2. Structure
-3. Functions / Events
-4. CAPAB/PROTOCTL 
+2. Modifing the header file
+3. The code
+4. Functions / Events
+5. CAPAB/PROTOCTL 
+
+=============================================================================================
 
 1. FILES TO EDIT
 
@@ -12,14 +15,123 @@ following files.
 
 A. Make a copy of the .c and .h file of the IRCD that closely matches the ircd
    that you are attempting to add support for.
-B. Make a backup copy of services.h 
-C. Make a backup copy of Config, and src/Makefile
+B. Make a backup copy of include/services.h, include/sysconf.h.in
+C. Make a backup copy of Config and configure.in
+
+First step in this process is to rename the .c and .h file after the IRCD that you are going
+to be adding support for. Its recommened that you come up with a name that is clear and easy
+to understand.
+
+Now that you have the files that you will need to create your own ircd support. Starting with
+Config, this file is a shell script file, scroll down till you find the list of ircds for the
+user to select. Indicate the based ircd version which is supported such as a series 1.x or 2.2.x, 
+placing in the comment side an exact version that the support is for or "experimental" if you
+are not the ircd developer. The next step is to decide how the IRCD will be defined, following
+the existing examples edit " IRCTYPE_DEF="IRC_RATBOX" " to be the descriptive define for your
+ircd. 
+
+With the Config file ready to go, edit configure.in and find in there the reference to 
+--with-ircd, you should see see the various other ircd, and you will want to add yours in there
+using the same IRC_ name you came up with above. Important in this step is to make sure that you
+set the IRCDFILE to the name of the .c file you set in step 1. Once you have the configure.in 
+created you can remove the old configure and at the command prompt type "autconf", this will
+generate the configure file.
+
+Getting close to actually modify code. Open sysconf.h.in and add two lines for your given ircd
+which is similar to this
+
+/* "First IRCD type" */
+#undef IRC_RATBOX
+
+Open services.h and add a line with the rest of the ircd include files to match the name of the
+.h file you set in step 1. 
+
+#include "ratbox.h"
+
+Taking the .c and .h file open them and replace the #ifdef IRC_* with the IRC_ name you set in
+step two. Ensure that the code comments at the top of the file match the ircd that the code
+will be for.
+
+You are now ready to start getting into the code.
+
+=============================================================================================
+
+2. Modifing the header file
+
+Now that you have gotten past the first part of the creation process. You are into the code 
+this part is the harder and more complex part. You will need a general understanding of C
+code to continue. Here are the step by step instructions required to make this work.
+
+Open the .h file and find the section of code with
+
+#define PROTECT_SET_MODE "+"
+#define PROTECT_UNSET_MODE "-"
+#define CS_CMD_PROTECT "PROTECT"
+#define CS_CMD_DEPROTECT "DEPROTECT"
+#define FANT_PROTECT_ADD "!protect"
+#define FANT_PROTECT_DEL "!deprotect"
+#define LEVEL_PROTECT_WORD "AUTOPROTECT"
+#define LEVELINFO_PROTECT_WORD "PROTECT"
+#define LEVELINFO_PROTECTME_WORD "PROTECTME"
+
+If the ircd supports a protective/admin (not owner) mode, set the PROTECT_SET_MODE and 
+PROTECT_UNSET_MODE to be that mode. On most ircd its the mode of "a" so you setting it
+to "+a" and "-a". The next to are based more on what this mode is called, when you 
+message ChanServ to get this mode, this is the command you will be using. Following 
+that comes the fantasy commands which can be used in channel to get these modes. The next
+three relate to the ACCESS LEVEL list system, again these are the words to gain these
+levels in the ACCESS LEVEL system. If your ircd does not have these functions, leave
+them at what ever value is currently set, the core code will handle ignore the request
+of the user.
+
+Now that this is set, you can define the MODES, all user modes are stored with UMODE_
+followed by a letter matching the modes case, be careful to use the correct case as this
+will make it clear when you setup MODES in the .c in a few. Use hex values for the modes
+so starting at 0x00000001 to 0x8000000, in most cases you want to list all modes. If you
+run out of values look at removing any modes that do not impact services.
+
+Channel modes are done much like user modes, with the exception that, bans, exceptions,
+invites, and modes that are applied to a user such as op, voice are not defined here. All
+other modes are defined in here. Again be clear and use the correct case and use hex values
+as done with user modes.
+
+Finally we come to DEFAULT_MLOCK, this is the mode that services will set by default on channels
+when they are registered. In general you want this to be whats acceptable by the ircd, in most
+cause this is "+nt"
+
+=============================================================================================
+
+3. The Code
+
+	Here is where the code of the .c file comes in. be prepared to spend at least an hour if
+not longer going over the code and getting it right especially if you are setting up an ircd
+that is completely different then that which your adding support for. This section goes over
+the majority of the code that is in use. 
+
+	First bit of code you will face is 
+
+const char version_protocol[] = "Ratbox IRCD";
 
+	This the protocol name which will appear in various places especially when you do -version
+at the command prompt, this where you state the server name, the version is not always needed
+unless you are showing that the support is for one branch of a ircd family, such as Unreal 3.1
+and Unreal 3.2
 
-2. STRUCTURE 
-To allow for easy code change to support your ircd. There are two structs that 
-make up the simplest variables to allow you to quickly change out your ircd
-without much work.
+	Once you have decided on this little piece of code, you will come to flood mode characters
+being used for setting and removing. If your IRCD does not support flood modes, you can just
+use "", we will be setting if your IRCD supports flooding in a little bit.
+
+const char flood_mode_char_set[] = "+f";
+const char flood_mode_char_remove[] = "-f";
+
+	The next task that you will face is setting whether the IRCD sends time stamps on modes but
+does not tell us that it will do so. If it does set UseTSMODE to 1, if it does not set it to be 0,
+if your not sure refer to your IRCD's documentation on how MODE is sent
+
+int UseTSMODE = 0;
+
+	Now you come to the part where you setup your ircd, there are two struct which hold this 
+information. This allows you to quickly setup your specific ircd.
 
 IRCDVar ircd[] = { }
 
@@ -214,15 +326,47 @@ usage of each.
 
 77. SGline Enforce : the ircd enforces sglines for us we don't need to, 1 = yes  0 = no
 
-
-
 IRCDCAPAB ircdcap[] = { } 
 
 This struct is based of the CAPAB defines, you should review the the CAPAB table
 below for how this to be done.
 
+Define Table
+======================================================================================================
+DEFINE WORD     |  VALUE      |  TOKEN       |  IRCD Meaning
+======================================================================================================
+CAPAB_NOQUIT    | 0x00000001  |  NOQUIT      |  Supports NOQUIT
+CAPAB_TSMODE    | 0x00000002  |  TS	         |  Channel modes are TimeStamped (normal sent during PASS)
+CAPAB_UNCONNECT | 0x00000004  |  UNCONNECT   |  Supports UNCONNECT
+CAPAB_NICKIP    | 0x00000008  |  NICKIP      |  IP in the NICK line
+CAPAB_NSJOIN    | 0x00000010  |  SSJOIN      |  smart sjoin  SSJOIN
+CAPAB_ZIP	    | 0x00000020  |  ZIP	     |  server supports gz'd links
+CAPAB_BURST     | 0x00000040  |  BURST       |  server supports BURST command
+CAPAB_TS3       | 0x00000080  |  TS3         |  Supports the TS3 Protocol
+CAPAB_TS5       | 0x00000100  |  TS5         |  Supports the TS5 Protocol
+CAPAB_DKEY      | 0x00000200  |  DKEY        |  server supports dh-key exchange using "DKEY"
+CAPAB_DOZIP	    | 0x00000400  |  ZIP	     |  output to this link shall be gzipped
+CAPAB_DODKEY    | 0x00000800  |  DKEY        |  do I do dkey with this link?
+CAPAB_QS        | 0x00001000  |  QS          |  Can handle quit storm removal
+CAPAB_SCS       | 0x00002000  |  SCS         |  Supports String Cache System
+CAPAB_PT4       | 0x00004000  |  PT4         |  PT4 Protocol Support
+CAPAB_UID       | 0x00008000  |  UID         |  Can do UIDs
+CAPAB_KNOCK     | 0x00010000  |  KNOCK       |  supports KNOCK
+CAPAB_CLIENT    | 0x00020000  |  CLIENT      |  Supports CLIENT
+CAPAB_IPV6      | 0x00040000  |  IPV6        |  Server is able to handle ipv6 address masks
+CAPAB_SSJ5      | 0x00080000  |  SSJ5        |  Server supports smart join protocol 5
+CAPAB_SN2       | 0x00100000  |  SN2         |  Supports SN2 protocol (SNICK 2)
+CAPAB_VHOST     | 0x00200000  |  VHOST       |  Supports VHOST protocol
+CAPAB_TOKEN     | 0x00400000  |  TOKEN       |  Supports tokenized server<->server commands
+CAPAB_SSJ3      | 0x00800000  |  SSJ3        |  Server supports smart join protocol 3
+CAPAB_NICK2     | 0x01000000  |  NICK2       |  supports the extended NICK command (version 2)
+CAPAB_UMODE2    | 0x02000000  |  UMODE2      |  support for the UMODE2 command
+CAPAB_VL        | 0x04000000  |  VL          |  Vline information is included in the info field
+CAPAB_TLKEXT    | 0x08000000  |  TLKEXT      |  This allows 10 instead of 8 parameters in TKL's
+
+===================================================================================================
 
-3. FUNCTIONS AND EVENTS
+4. FUNCTIONS AND EVENTS
 
 A brief word about functions and events. All events are captured via the 
 
@@ -298,35 +442,3 @@ following steps
 
 
 
-Define Table
-======================================================================================================
-DEFINE WORD     |  VALUE      |  TOKEN       |  IRCD Meaning
-======================================================================================================
-CAPAB_NOQUIT    | 0x00000001  |  NOQUIT      |  Supports NOQUIT
-CAPAB_TSMODE    | 0x00000002  |  TS	         |  Channel modes are TimeStamped (normal sent during PASS)
-CAPAB_UNCONNECT | 0x00000004  |  UNCONNECT   |  Supports UNCONNECT
-CAPAB_NICKIP    | 0x00000008  |  NICKIP      |  IP in the NICK line
-CAPAB_NSJOIN    | 0x00000010  |  SSJOIN      |  smart sjoin  SSJOIN
-CAPAB_ZIP	    | 0x00000020  |  ZIP	     |  server supports gz'd links
-CAPAB_BURST     | 0x00000040  |  BURST       |  server supports BURST command
-CAPAB_TS3       | 0x00000080  |  TS3         |  Supports the TS3 Protocol
-CAPAB_TS5       | 0x00000100  |  TS5         |  Supports the TS5 Protocol
-CAPAB_DKEY      | 0x00000200  |  DKEY        |  server supports dh-key exchange using "DKEY"
-CAPAB_DOZIP	    | 0x00000400  |  ZIP	     |  output to this link shall be gzipped
-CAPAB_DODKEY    | 0x00000800  |  DKEY        |  do I do dkey with this link?
-CAPAB_QS        | 0x00001000  |  QS          |  Can handle quit storm removal
-CAPAB_SCS       | 0x00002000  |  SCS         |  Supports String Cache System
-CAPAB_PT4       | 0x00004000  |  PT4         |  PT4 Protocol Support
-CAPAB_UID       | 0x00008000  |  UID         |  Can do UIDs
-CAPAB_KNOCK     | 0x00010000  |  KNOCK       |  supports KNOCK
-CAPAB_CLIENT    | 0x00020000  |  CLIENT      |  Supports CLIENT
-CAPAB_IPV6      | 0x00040000  |  IPV6        |  Server is able to handle ipv6 address masks
-CAPAB_SSJ5      | 0x00080000  |  SSJ5        |  Server supports smart join protocol 5
-CAPAB_SN2       | 0x00100000  |  SN2         |  Supports SN2 protocol (SNICK 2)
-CAPAB_VHOST     | 0x00200000  |  VHOST       |  Supports VHOST protocol
-CAPAB_TOKEN     | 0x00400000  |  TOKEN       |  Supports tokenized server<->server commands
-CAPAB_SSJ3      | 0x00800000  |  SSJ3        |  Server supports smart join protocol 3
-CAPAB_NICK2     | 0x01000000  |  NICK2       |  supports the extended NICK command (version 2)
-CAPAB_UMODE2    | 0x02000000  |  UMODE2      |  support for the UMODE2 command
-CAPAB_VL        | 0x04000000  |  VL          |  Vline information is included in the info field
-CAPAB_TLKEXT    | 0x08000000  |  TLKEXT      |  This allows 10 instead of 8 parameters in TKL's
diff --git a/docs/README b/docs/README
index 2a803acb5..040abf360 100644
--- a/docs/README
+++ b/docs/README
@@ -10,7 +10,7 @@ details.
 
 Information about Anope may be found at http://www.anope.org/
 Information about Epona may be found at http://www.epona.org/
-Information about Services may be found at http://www.ircservices.za.net/
+Information about Services may be found at http://www.ircservices.esper.net/
 
 TABLE OF CONTENTS
 -----------------
@@ -133,6 +133,10 @@ Anope currently works with:
   - Hybrid 7 or later
   - PTlink 6.15 or later
   - RageIRCd 2.0 beta-6 or later
+  - Solid IRCD 3.4.6 or later
+  - Plexus 2.0 or later
+  - Ratbox 2.0 or later
+
 
 Anope could also work with some of the daemons derived by the ones 
 listed above, but there's no support for them if they work or don't
diff --git a/include/extern.h b/include/extern.h
index 30cbe07a2..0fb04b781 100644
--- a/include/extern.h
+++ b/include/extern.h
@@ -27,12 +27,12 @@ E IRCDCAPAB ircdcap[];
 E const char flood_mode_char_set[];
 E const char flood_mode_char_remove[];
 E int UseTSMODE; /* hack to get around bahamut clones that don't send TSMODE */
-extern unsigned long umodes[128];
-extern char csmodes[128];
-extern CMMode cmmodes[128];
-extern CBMode cbmodes[128];
-extern CBModeInfo cbmodeinfos[];
-extern CUMode cumodes[128];
+E unsigned long umodes[128];
+E char csmodes[128];
+E CMMode cmmodes[128];
+E CBMode cbmodes[128];
+E CBModeInfo cbmodeinfos[];
+E CUMode cumodes[128];
 
 /**** actions.c ****/
 
@@ -69,25 +69,25 @@ E CMMode cmmodes[128];
 E unsigned long umodes[128];
 E char csmodes[128];
 
-extern void add_ban(Channel * chan, char *mask);
-extern void chan_adduser2(User * user, Channel * c);
-extern void add_invite(Channel * chan, char *mask);
-extern void chan_delete(Channel * c);
-extern void del_ban(Channel * chan, char *mask);
-extern void set_key(Channel * chan, char *value);
-extern void set_limit(Channel * chan, char *value);
-extern void del_invite(Channel * chan, char *mask);
-extern char *get_key(Channel * chan);
-extern char *get_limit(Channel * chan);
-extern Channel *chan_create(char *chan);
-extern Channel *join_user_update(User * user, Channel * chan, char *name);
-
-extern void add_exception(Channel * chan, char *mask);
-extern void del_exception(Channel * chan, char *mask);
-extern char *get_flood(Channel * chan);
-extern void set_flood(Channel * chan, char *value);
-extern char *get_redirect(Channel * chan);
-extern void set_redirect(Channel * chan, char *value);
+E void add_ban(Channel * chan, char *mask);
+E void chan_adduser2(User * user, Channel * c);
+E void add_invite(Channel * chan, char *mask);
+E void chan_delete(Channel * c);
+E void del_ban(Channel * chan, char *mask);
+E void set_key(Channel * chan, char *value);
+E void set_limit(Channel * chan, char *value);
+E void del_invite(Channel * chan, char *mask);
+E char *get_key(Channel * chan);
+E char *get_limit(Channel * chan);
+E Channel *chan_create(char *chan);
+E Channel *join_user_update(User * user, Channel * chan, char *name);
+
+E void add_exception(Channel * chan, char *mask);
+E void del_exception(Channel * chan, char *mask);
+E char *get_flood(Channel * chan);
+E void set_flood(Channel * chan, char *value);
+E char *get_redirect(Channel * chan);
+E void set_redirect(Channel * chan, char *value);
 
 
 E void get_channel_stats(long *nrec, long *memuse);
@@ -232,7 +232,6 @@ E char *s_BotServ;
 E char *s_HelpServ;
 E char *s_OperServ;
 E char *s_GlobalNoticer;
-E char *s_IrcIIHelp;
 E char *s_DevNull;
 E char *desc_NickServ;
 E char *desc_ChanServ;
@@ -241,7 +240,6 @@ E char *desc_BotServ;
 E char *desc_HelpServ;
 E char *desc_OperServ;
 E char *desc_GlobalNoticer;
-E char *desc_IrcIIHelp;
 E char *desc_DevNull;
 
 E char *HostDBName;
@@ -306,6 +304,7 @@ E int   UseTokens;
 E int   NewsCount;
 E int   Numeric;
 E int   UnRestrictSAdmin;
+E int   UseTS6;
 
 E char **HostSetters;
 E int HostNumber;
@@ -676,11 +675,11 @@ E int nickIsServices(char *nick, int bot);
 
 E void add_entropy_userkeys(void);
 E void rand_init(void);
-E u_char getrandom8(void);
+E unsigned char getrandom8(void);
 E u_int16_t getrandom16(void);
 E u_int32_t getrandom32(void);
 
-E char *str_signed(u_char *str);
+E char *str_signed(unsigned char *str);
 
 /**** modules.c ****/
 E void moduleCallBackRun(void);
@@ -902,6 +901,16 @@ E User *finduser(const char *nick);
 E User *firstuser(void);
 E User *nextuser(void);
 
+E User *find_byuid(const char *uid);
+E User *first_uid(void);
+E User *next_uid(void);
+E Uid *new_uid(const char *nick, char *uid);
+E Uid *find_uid(const char *nick);
+E Uid *find_nickuid(const char *uid);
+E Server *findserver_uid(Server * s, const char *name);
+E char *TS6SID;
+E char *TS6UPLINK;
+
 E void update_host(User * user);
 E void change_user_host(User * user, const char *host);
 E void change_user_username(User * user, const char *username);
@@ -962,7 +971,7 @@ E unsigned int mysql_rand(void);
 #endif
 
 #ifdef USE_ENCRYPTION
-extern int encrypt_in_place(char *buf, int size);
+E int encrypt_in_place(char *buf, int size);
 #endif
 
 
@@ -971,178 +980,182 @@ E void notice(char *source, char *dest, const char *fmt, ...);
 
 /******************************************************************************/
 
-extern void anope_cmd_211(const char *fmt, ...);                          	  		  /* 211 */
-extern void anope_cmd_219(char *source, char *who); 			  	  		  /* 219 */
-extern void anope_cmd_242(const char *fmt, ...);                          	  		  /* 242 */
-extern void anope_cmd_243(const char *fmt, ...);                          	  		  /* 243 */
-extern void anope_cmd_250(const char *fmt, ...);			  	  		  /* 250 */
-extern void anope_cmd_307(const char *fmt, ...);			    	  		  /* 307 */
-extern void anope_cmd_311(const char *fmt, ...);                          	  		  /* 311 */
-extern void anope_cmd_312(const char *fmt, ...);                          	  		  /* 312 */
-extern void anope_cmd_317(const char *fmt, ...);                          	  		  /* 317 */
-extern void anope_cmd_318(char *source, char *who);           		  	  		  /* 318 */
-extern void anope_cmd_351(char *source);				  	  		  /* 351 */
-extern void anope_cmd_372(char *source, char *msg);			 	  		  /* 372 */
-extern void anope_cmd_372_error(char *source);				  	  		  /* 372 */
-extern void anope_cmd_375(char *source);				 	  		  /* 375 */
-extern void anope_cmd_376(char *source);				 	  		  /* 376 */
-extern void anope_cmd_391(char *source, char *timestr);                             		  /* 391 */
-extern void anope_cmd_401(char *source, char *who);			  	  		  /* 401 */
-extern void anope_cmd_akill(char *user, char *host, char *who, time_t when, time_t expires, char *reason); /* AKILL */
-extern void anope_cmd_capab();						  	  		  /* CAPAB */
-extern void anope_cmd_chghost(char *nick, char *vhost);                   			  /* CHGHOST */
-extern void anope_cmd_chgident(char *nick, char *vIdent);                 			  /* CHGIDENT */
-extern void anope_cmd_vhost_on(char *nick, char *vIdent, char *vhost);    			  /* CHGHOST + CHGIDENT */
-extern void anope_cmd_vhost_off(User *u);
-extern void anope_cmd_connect(int servernum);                             	           	  /* Connect */
-extern void anope_cmd_ea();									  /* EA      */
-extern void anope_cmd_global(char *source, const char *fmt, ...);         	  		  /* GLOBOPS */
-extern void anope_cmd_invite(char *source, char *chan, char *nick);       	  		  /* INVITE */
-extern void anope_cmd_join(char *user, char *channel, time_t chantime);   	  		  /* JOIN */
-extern void anope_cmd_kick(char *source, char *chan, char *user, const char *fmt, ...);		  /* KICK */
-extern void anope_cmd_mode(char *source, char *dest, const char *fmt, ...);   	  		  /* MODE */
-extern void anope_cmd_unban(char *name, char *nick);				  		  /* MODE -b */
-extern void anope_cmd_bot_chan_mode(char *nick, char *chan);			  		  /* MODE BotServ */
-extern void anope_cmd_netinfo(int ac, char **av);						  /* NETINFO */
-extern void anope_cmd_nick(char *nick, char *name, char *mode);			  		  /* NICK */
-extern void anope_cmd_chg_nick(char *oldnick, char *newnick);             	  		  /* NICK */
-extern void anope_cmd_bot_nick(char *nick, char *user,char *host,char *real,char *modes);	  /* NICK */
-extern void anope_cmd_guest_nick(char *nick, char *user,char *host,char *real,char *modes);	  /* NICK */
-extern void anope_cmd_notice(char *source, char *dest, const char *fmt, ...);     		  /* NOTICE */
-extern void anope_cmd_notice_ops(char *source, char *dest, const char *fmt, ...); 		  /* NOTICE */
-extern void anope_cmd_notice2(char *source, char *dest, char *msg);		  		  /* NOTICE */
-extern void anope_cmd_serv_notice(char *source, char *dest, char *msg);		  		  /* NOTICE */
-extern void anope_cmd_part(char *nick, char *chan, const char *fmt, ...); 	  		  /* PART */
-extern void anope_cmd_pass(char *pass);                                   	  		  /* PASS */
-extern void anope_cmd_pong(char *servname, char *who);                    	  		  /* PONG */
-extern void anope_cmd_privmsg(char *source, char *dest, const char *fmt, ...);    		  /* PRIVMSG */
-extern void anope_cmd_privmsg2(char *source, char *dest, char *msg);		  		  /* PRIVMSG */
-extern void anope_cmd_serv_privmsg(char *source, char *dest, char *msg);	  		  /* PRIVMSG */
-extern void anope_cmd_protoctl();                                         			  /* PROTOCTL */
-extern void anope_cmd_quit(char *source, const char *fmt, ...);           	  		  /* QUIT */
-extern void anope_cmd_remove_akill(char *user, char *host);			  		  /* RAKILL */
-extern void anope_cmd_server(char *servname, int hop, char *descript);    	  		  /* SERVER */
-extern void anope_cmd_sgline(char *mask, char *reason);			  	  		  /* SGLINE */