Merge branch '1.8' of git.sigterm.info:gitroot/anope/anope into 1.8

4 files changed, 2918 insertions, 6 deletions

diff --git a/src/protocol/Makefile.win32 b/src/protocol/Makefile.win32
index e2c99925f..ae74cbe08 100644
--- a/src/protocol/Makefile.win32
+++ b/src/protocol/Makefile.win32
@@ -1,6 +1,6 @@
 include ../../Makefile.inc.win32
 
-SRCS=bahamut.c charybdis.c dreamforge.c hybrid.c inspircd11.c inspircd12.c plexus2.c plexus3.c ptlink.c rageircd.c \
+SRCS=bahamut.c charybdis.c dreamforge.c hybrid.c inspircd11.c inspircd12.c inspircd20.c plexus2.c plexus3.c ptlink.c rageircd.c \
      ratbox.c shadowircd.c solidircd.c ultimate2.c ultimate3.c unreal31.c unreal32.c viagra.c
 
 OBJECTS= $(SRCS:.c=.dll)
diff --git a/src/protocol/inspircd12.c b/src/protocol/inspircd12.c
index 221ec928a..c6262e966 100644
--- a/src/protocol/inspircd12.c
+++ b/src/protocol/inspircd12.c
@@ -1882,8 +1882,7 @@ int anope_event_whois(char *source, int ac, char **av)
 
 int anope_event_capab(char *source, int ac, char **av)
 {
-    int argc;
-    char **argv;
+    char *argv[6];
     CBModeInfo *cbmi;
 
     if (strcasecmp(av[0], "START") == 0) {
@@ -2248,8 +2247,6 @@ int anope_event_capab(char *source, int ac, char **av)
         /* Generate a fake capabs parsing call so things like NOQUIT work
          * fine. It's ugly, but it works....
          */
-        argc = 6;
-        argv = scalloc(argc, sizeof(char *));
         argv[0] = "NOQUIT";
         argv[1] = "SSJ3";
         argv[2] = "NICK2";
@@ -2257,7 +2254,16 @@ int anope_event_capab(char *source, int ac, char **av)
         argv[4] = "TLKEXT";
         argv[5] = "UNCONNECT";
 
-        capab_parse(argc, argv);
+        capab_parse(6, argv);
+
+	/* check defcon */
+	if (DefConLevel && !defconParseModeString(DefConChanModes))
+	{
+		send_cmd(TS6SID, "ERROR :Defcon modes failed to validate");
+		quitmsg = "Defcon modes failed to validate";
+		quitting = 1;		
+		return MOD_CONT;
+	}
 
         /* We have received our CAPAB, now we can introduce our clients. */
         init_tertiary();
diff --git a/src/protocol/inspircd20.c b/src/protocol/inspircd20.c
new file mode 100644
index 000000000..330fc99fc
--- /dev/null
+++ b/src/protocol/inspircd20.c
@@ -0,0 +1,2683 @@
+/* inspircd 2.0 + functions
+ *
+ * (C) 2009  Jan Milants <Viper@Anope.org>
+ * (C) 2010 Adam <Adam@anope.org>
+ * (C) 2003-2010 Anope Team
+ * Contact us at team@anope.org
+ *
+ * Please read COPYING and README for further details.
+ *
+ * Partially based on code of Denora IRC Stats.
+ * Based on InspIRCd 1.1 code of Anope by Anope Team.
+ * Based on the original code of Epona by Lara.
+ * Based on the original code of Services by Andy Church. 
+ * 
+ *
+ */
+
+
+/*************************************************************************/
+
+#include "services.h"
+#include "pseudo.h"
+#include "inspircd20.h"
+#include "version.h"
+
+#ifndef _WIN32
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#endif
+
+#ifdef _WIN32
+#include "winsock.h"
+int inet_aton(const char *name, struct in_addr *addr)
+{
+	uint32 a = inet_addr(name);
+	addr->s_addr = a;
+	return a != (uint32) - 1;
+}
+#endif
+
+static int16 get_new_statusmode()
+{
+	static int16 last_mode = CUS_PROTECT; // highest value in services.h
+	if (last_mode == 0x8000)
+		return 0;
+	last_mode = last_mode << 1;
+	if (last_mode == CUS_DEOPPED)
+		last_mode = last_mode << 1; // get around CUS_DEOPPED
+	return last_mode;
+};
+
+static char flood_mode_set[3];
+static char flood_mode_unset[3];
+
+static void do_nothing(Channel *c, char *mask) { }
+
+IRCDVar myIrcd[] = {
+	{"InspIRCd 2.0",			/* ircd name */
+	 "+oI",					 /* nickserv mode */
+	 "+oI",					 /* chanserv mode */
+	 "+I",					  /* memoserv mode */
+	 "+oI",					 /* hostserv mode */
+	 "+ioI",					/* operserv mode */
+	 "+I",					  /* botserv mode  */
+	 "+I",					  /* helpserv mode */
+	 "+iI",					 /* Dev/Null mode */
+	 "+iI",					 /* Global mode   */
+	 "+oI",					 /* nickserv alias mode */
+	 "+oI",					 /* chanserv alias mode */
+	 "+I",					  /* memoserv alias mode */
+	 "+oI",					 /* hostserv alias mode */
+	 "+ioI",					/* operserv alias mode */
+	 "+I",					  /* botserv alias mode  */
+	 "+I",					  /* helpserv alias mode */
+	 "+iI",					 /* Dev/Null alias mode */
+	 "+iI",					 /* Global alias mode   */
+	 "+I",					  /* Used by BotServ Bots */
+	 5,						 /* Chan Max Symbols	 */
+	 "-cijlmnpstuzACGHKNOQRSV", /* Modes to Remove */
+	 "+oa",					 /* Channel Umode used by Botserv bots */
+	 1,						 /* SVSNICK */
+	 1,						 /* Vhost  */
+	 0,						 /* Has Owner */
+	 "+q",					  /* Mode to set for an owner */
+	 "-q",					  /* Mode to unset for an owner */
+	 "+a",					  /* Mode to set for channel admin */
+	 "-a",					  /* Mode to unset for channel admin */
+	 "+r",					  /* Mode On Reg		  */
+	 NULL,					  /* Mode on ID for Roots */
+	 NULL,					  /* Mode on ID for Admins */
+	 NULL,					  /* Mode on ID for Opers */
+	 "-r",					  /* Mode on UnReg		*/
+	 "-r",					  /* Mode on Nick Change  */
+	 0,						 /* Supports SGlines	 */
+	 1,						 /* Supports SQlines	 */
+	 1,						 /* Supports SZlines	 */
+	 0,						 /* Supports Halfop +h   */
+	 4,						 /* Number of server args */
+	 0,						 /* Join 2 Set		   */
+	 0,						 /* Join 2 Message	   */
+	 0,						 /* Has exceptions +e	*/
+	 1,						 /* TS Topic Forward	 */
+	 0,						 /* TS Topic Backward	*/
+	 0,						 /* Protected Umode	  */
+	 0,						 /* Has Admin			*/
+	 0,						 /* Chan SQlines		 */
+	 0,						 /* Quit on Kill		 */
+	 0,						 /* SVSMODE unban		*/
+	 0,						 /* Has Protect		  */
+	 1,						 /* Reverse			  */
+	 1,						 /* Chan Reg			 */
+	 CMODE_r,				   /* Channel Mode		 */
+	 1,						 /* vidents			  */
+	 0,						 /* svshold			  */
+	 0,						 /* time stamp on mode   */
+	 0,						 /* NICKIP			   */
+	 0,						 /* O:LINE			   */
+	 1,						 /* UMODE			   */
+	 1,						 /* VHOST ON NICK		*/
+	 0,						 /* Change RealName	  */
+	 0,						 /* No Knock			 */
+	 0,						 /* Admin Only		   */
+	 DEFAULT_MLOCK,			 /* Default MLOCK	   */
+	 UMODE_x,				   /* Vhost Mode		   */
+	 0,						 /* +f				   */
+	 0,						 /* +L				   */
+	 CMODE_f,
+	 CMODE_L,
+	 0,
+	 1,						 /* No Knock requires +i */
+	 NULL,					  /* CAPAB Chan Modes			 */
+	 0,						 /* We support inspircd TOKENS */
+	 1,						 /* TOKENS are CASE inSensitive */
+	 0,						 /* TIME STAMPS are BASE64 */
+	 0,						 /* +I support */
+	 0,						 /* SJOIN ban char */
+	 0,						 /* SJOIN except char */
+	 0,						 /* SJOIN invite char */
+	 0,						 /* Can remove User Channel Modes with SVSMODE */
+	 0,						 /* Sglines are not enforced until user reconnects */
+	 "x",					   /* vhost char */
+	 1,						 /* ts6 */
+	 1,						 /* support helper umode */
+	 0,						 /* p10 */
+	 NULL,					  /* character set */
+	 0,						 /* reports sync state */
+	 1,						 /* CIDR channelbans */
+	 0,						 /* +j */
+	 CMODE_j,				   /* +j Mode */
+	 1,						 /* Use delayed client introduction. */
+	 }
+	,
+	{NULL}
+};
+
+
+IRCDCAPAB myIrcdcap[] = {
+	{
+	 CAPAB_NOQUIT,			  /* NOQUIT	   */
+	 0,						 /* TSMODE	   */
+	 1,						 /* UNCONNECT	*/
+	 0,						 /* NICKIP	   */
+	 0,						 /* SJOIN		*/
+	 0,						 /* ZIP		  */
+	 0,						 /* BURST		*/
+	 0,						 /* TS5		  */
+	 0,						 /* TS3		  */
+	 0,						 /* DKEY		 */
+	 0,						 /* PT4		  */
+	 0,						 /* SCS		  */
+	 0,						 /* QS		   */
+	 0,						 /* UID		  */
+	 0,						 /* KNOCK		*/
+	 0,						 /* CLIENT	   */
+	 0,						 /* IPV6		 */
+	 0,						 /* SSJ5		 */
+	 0,						 /* SN2		  */
+	 0,						 /* TOKEN		*/
+	 0,						 /* VHOST		*/
+	 CAPAB_SSJ3,				/* SSJ3		 */
+	 CAPAB_NICK2,			   /* NICK2		*/
+	 0,						 /* UMODE2	   */
+	 CAPAB_VL,				  /* VL		   */
+	 CAPAB_TLKEXT,			  /* TLKEXT	   */
+	 0,						 /* DODKEY	   */
+	 0,						 /* DOZIP		*/
+	 0,
+	 0, 0}
+};
+
+unsigned long umodes[128] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 
+	0, UMODE_B, 0, 0, 0,			   /* A - E */
+	0, UMODE_G, UMODE_H, UMODE_I, 0,   /* F - J */
+	0, 0, 0, 0, 0,					 /* K - O */
+	0, UMODE_Q, UMODE_R, UMODE_S, 0,   /* P - T */
+	0, 0, UMODE_W, 0, 0,			   /* U - Y */
+	0,								 /* Z */
+	0, 0, 0, 0, 0, 0,
+	0, 0, UMODE_c, UMODE_d, 0,		 /* a - e */
+	0, UMODE_g, UMODE_h, UMODE_i, 0,   /* f - j */
+	UMODE_k, 0, 0, 0, UMODE_o,		 /* k - o */
+	0, 0, UMODE_r, UMODE_s, 0,		 /* p - t */
+	0, 0, UMODE_w, UMODE_x, 0,		 /* u - y */
+	0,								 /* z */
+	0, 0, 0, 0, 0
+};
+
+
+char myCsmodes[128] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+
+	0,
+	0,
+	0, 0, 0,
+	0,
+	0,
+	0, 0, 0, 0,
+
+	0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+};
+
+static inline char sym_from_char(const char c)
+{
+	int i;
+	for (i = 0; i < 128; ++i)
+		if (myCsmodes[i] == c)
+			return i;
+	return 0;
+}
+
+CMMode myCmmodes[128] = {
+	{NULL}, {NULL}, {NULL}, {NULL}, {NULL}, {NULL}, {NULL}, {NULL}, /* 0-7 */
+	{NULL}, {NULL}, {NULL}, {NULL}, {NULL}, {NULL}, {NULL}, {NULL}, /* 8-15 */
+	{NULL}, {NULL}, {NULL}, {NULL}, {NULL}, {NULL}, {NULL}, {NULL}, /* 16-23 */
+	{NULL}, {NULL}, {NULL}, {NULL}, {NULL}, {NULL}, {NULL}, {NULL}, /* 24-31 */
+	{NULL}, {NULL}, {NULL}, {NULL}, {NULL}, {NULL}, {NULL}, {NULL}, /* 32-39 */
+	{NULL}, {NULL}, {NULL}, {NULL}, {NULL}, {NULL}, {NULL}, {NULL}, /* 40-47 */
+	{NULL}, {NULL}, {NULL}, {NULL}, {NULL}, {NULL}, {NULL}, {NULL}, /* 48-55 */
+	{NULL}, {NULL}, {NULL}, {NULL}, {NULL}, {NULL}, {NULL}, {NULL}, /* 56-63 */
+	{NULL}, {NULL}, {NULL}, {NULL}, {NULL}, {NULL}, {NULL}, {NULL}, /* 64-71 @-G */
+	{NULL}, {NULL}, {NULL}, {NULL}, {NULL}, {NULL}, {NULL}, {NULL}, /* 72-79 H-O */
+	{NULL}, {NULL}, {NULL}, {NULL}, {NULL}, {NULL}, {NULL}, {NULL}, /* 80-87 P-W */
+	{NULL}, {NULL}, {NULL}, {NULL}, {NULL}, {NULL}, {NULL}, {NULL}, /* 88-95 X-_ */
+	{NULL}, /* 96 */
+	{NULL}, /* 97 a */
+	{NULL}, /* 98 b */
+	{NULL}, /* c */
+	{NULL}, /* d */
+	{NULL}, /* e */
+	{NULL}, /* f */
+	{NULL}, /* g */
+	{NULL}, {NULL}, {NULL}, {NULL}, {NULL}, {NULL}, {NULL}, {NULL}, /* h-o */
+	{NULL}, {NULL}, {NULL}, {NULL}, {NULL}, {NULL}, {NULL}, {NULL}, /* p-w */
+	{NULL}, {NULL}, {NULL}, {NULL}, {NULL}, {NULL}, {NULL}, {NULL} /* z,y,z... */
+};
+
+
+
+CBMode myCbmodes[128] = {
+	{0}, {0}, {0}, {0}, {0}, {0}, {0}, {0},
+	{0}, {0}, {0}, {0}, {0}, {0}, {0}, {0},
+	{0}, {0}, {0}, {0}, {0}, {0}, {0}, {0},
+	{0}, {0}, {0}, {0}, {0}, {0}, {0}, {0},
+	{0}, {0}, {0}, {0}, {0}, {0}, {0}, {0},
+	{0}, {0}, {0}, {0}, {0}, {0}, {0}, {0},
+	{0}, {0}, {0}, {0}, {0}, {0}, {0}, {0},
+	{0}, {0}, {0}, {0}, {0}, {0}, {0}, {0},
+	{0},
+	{0},						/* A */
+	{0},						/* B */
+	{0},						/* C */
+	{0},						/* D */
+	{0},						/* E */
+	{0},						/* F */
+	{0},						/* G */
+	{0},						/* H */
+	{0},						/* I */
+	{0},						/* J */
+	{0},						/* K */
+	{0},						/* L */
+	{CMODE_M, 0, NULL, NULL},   /* M */
+	{0},						/* N */
+	{0},						/* O */
+	{0},						/* P */
+	{0},						/* Q */
+	{CMODE_R, 0, NULL, NULL},   /* R */
+	{0},						/* S */
+	{0},						/* T */
+	{0},						/* U */
+	{0},						/* V */
+	{0},						/* W */
+	{0},						/* X */
+	{0},						/* Y */
+	{0},						/* Z */
+	{0}, {0}, {0}, {0}, {0}, {0},
+	{0},						/* a */
+	{0},						/* b */
+	{0},						/* c */
+	{0},						/* d */
+	{0},						/* e */
+	{0},						/* f */
+	{0},						/* g */
+	{0},						/* h */
+	{CMODE_i, 0, NULL, NULL},
+	{0},						/* j */
+	{CMODE_k, 0, chan_set_key, cs_set_key},
+	{CMODE_l, CBM_MINUS_NO_ARG, set_limit, cs_set_limit},
+	{CMODE_m, 0, NULL, NULL},
+	{CMODE_n, 0, NULL, NULL},
+	{0},						/* o */
+	{CMODE_p, 0, NULL, NULL},
+	{0},						/* q */
+	{CMODE_r, CBM_NO_MLOCK, NULL, NULL},
+	{CMODE_s, 0, NULL, NULL},
+	{CMODE_t, 0, NULL, NULL},
+	{0},
+	{0},						/* v */
+	{0},						/* w */
+	{0},						/* x */
+	{0},						/* y */
+	{0},
+	{0}, {0}, {0}, {0}
+};
+
+CBModeInfo myCbmodeinfos[] = {
+	{'a', 0, 0, NULL, NULL},
+	{'c', CMODE_c, 0, NULL, NULL},
+	{'d', 0, 0, NULL, NULL},
+	{'f', CMODE_f, 0, NULL, NULL},
+	{'g', 0, 0, NULL, NULL},
+	{'i', CMODE_i, 0, NULL, NULL},
+	{'j', CMODE_j, 0, NULL, NULL},
+	{'k', CMODE_k, 0, get_key, cs_get_key},
+	{'l', CMODE_l, CBM_MINUS_NO_ARG, get_limit, cs_get_limit},
+	{'m', CMODE_m, 0, NULL, NULL},
+	{'n', CMODE_n, 0, NULL, NULL},
+	{'p', CMODE_p, 0, NULL, NULL},
+	{'r', CMODE_r, 0, NULL, NULL},
+	{'s', CMODE_s, 0, NULL, NULL},
+	{'t', CMODE_t, 0, NULL, NULL},
+	{'u', CMODE_u, 0, NULL, NULL},
+	{'v', 0, 0, NULL, NULL},
+	{'w', 0, 0, NULL, NULL},
+	{'x', 0, 0, NULL, NULL},
+	{'y', 0, 0, NULL, NULL},
+	{'z', CMODE_z, 0, NULL, NULL},
+	{'A', CMODE_A, 0, NULL, NULL},
+	{'B', 0, 0, NULL, NULL},
+	{'C', CMODE_C, 0, NULL, NULL},
+	{'D', 0, 0, NULL, NULL},
+	{'E', 0, 0, NULL, NULL},
+	{'F', CMODE_F, 0, NULL, NULL},
+	{'G', CMODE_G, 0, NULL, NULL},
+	{'H', 0, 0, NULL, NULL},
+	{'J', CMODE_J, 0, NULL, NULL},
+	{'K', CMODE_K, 0, NULL, NULL},
+	{'L', CMODE_L, 0, NULL, NULL},
+	{'M', CMODE_M, 0, NULL, NULL},
+	{'N', CMODE_N, 0, NULL, NULL},
+	{'O', CMODE_O, 0, NULL, NULL},
+	{'P', CMODE_P, 0, NULL, NULL},
+	{'Q', CMODE_Q, 0, NULL, NULL},
+	{'R', CMODE_R, 0, NULL, NULL},
+	{'S', CMODE_S, 0, NULL, NULL},
+	{'T', CMODE_T, 0, NULL, NULL},
+	{'U', 0, 0, NULL, NULL},
+	{'V', 0, 0, NULL, NULL},
+	{'W', 0, 0, NULL, NULL},
+	{'X', 0, 0, NULL, NULL},
+	{'Y', 0, 0, NULL, NULL},
+	{'Z', 0, 0, NULL, NULL},
+	{0}
+};
+
+static CBModeInfo *find_cbinfo(const char mode)
+{
+	CBModeInfo *p = myCbmodeinfos;
+
+	while (p->flag != 0)
+	{
+		if (p->mode == mode)
+		{
+			return p;
+		}
+		++p;
+	}
+
+	return NULL;
+}
+
+CUMode myCumodes[128] = {
+	{0}, {0}, {0}, {0}, {0}, {0}, {0}, {0},
+	{0}, {0}, {0}, {0}, {0}, {0}, {0}, {0},
+	{0}, {0}, {0}, {0}, {0}, {0}, {0}, {0},
+	{0}, {0}, {0}, {0}, {0}, {0}, {0}, {0},
+
+	{0}, {0}, {0}, {0}, {0}, {0}, {0}, {0},
+	{0}, {0}, {0}, {0}, {0}, {0}, {0}, {0},
+	{0}, {0}, {0}, {0}, {0}, {0}, {0}, {0},
+	{0}, {0}, {0}, {0}, {0}, {0}, {0}, {0},
+
+	{0}, {0}, {0}, {0}, {0}, {0}, {0}, {0},
+	{0}, {0}, {0}, {0}, {0}, {0}, {0}, {0},
+	{0}, {0}, {0}, {0}, {0}, {0}, {0}, {0},
+	{0}, {0}, {0}, {0}, {0}, {0}, {0}, {0},
+
+	{0},
+
+	{0},						/* a */
+	{0},						/* b */
+	{0},						/* c */
+	{0},						/* d */
+	{0},						/* e */
+	{0},						/* f */
+	{0},						/* g */
+	{0},						/* h */
+	{0},						/* i */
+	{0},						/* j */
+	{0},						/* k */
+	{0},						/* l */
+	{0},						/* m */
+	{0},						/* n */
+	{CUS_OP, CUF_PROTECT_BOTSERV, check_valid_op},
+	{0},						/* p */
+	{0},						/* q */
+	{0},						/* r */
+	{0},						/* s */
+	{0},						/* t */
+	{0},						/* u */
+	{CUS_VOICE, 0, NULL},
+	{0},						/* w */
+	{0},						/* x */
+	{0},						/* y */
+	{0},						/* z */
+	{0}, {0}, {0}, {0}, {0}
+};
+
+/* This will be set to 1 if a burst is in progess. */
+static int burst = 0;
+/* Here we store for which user we last got a UID with +r. */
+User *u_intro_regged = NULL;
+
+static int has_servicesmod = 0;
+static int has_chghostmod = 0;
+static int has_chgidentmod = 0;
+static int has_servprotectmod = 0;
+static int has_hidechansmod = 0;
+
+void inspircd_set_umode(User *user, int ac, char **av)
+{
+	int add = 1;				/* 1 if adding modes, 0 if deleting */
+	char *modes = av[0];
+
+	ac--;
+
+	if (debug)
+		alog("debug: Changing mode for %s to %s", user->nick, modes);
+
+	while (*modes) {
+
+		/* This looks better, much better than "add ? (do_add) : (do_remove)".
+		 * At least this is readable without paying much attention :) -GD
+		 */
+		if (add)
+			user->mode |= umodes[(int) *modes];
+		else
+			user->mode &= ~umodes[(int) *modes];
+
+		switch (*modes++) {
+		case '+':
+			add = 1;
+			break;
+		case '-':
+			add = 0;
+			break;
+		case 'o':
+			if (add) {
+				opcnt++;
+				if (WallOper) {
+					anope_cmd_global(s_OperServ, "\2%s\2 is now an IRC operator.",
+							user->nick);
+				}
+				display_news(user, NEWS_OPER);
+			} else {
+				opcnt--;
+			}
+			break;
+		case 'r':
+			user->svid = (add ? user->timestamp : 0);
+			if (burst && user == u_intro_regged)
+				break;
+			if (add && !nick_identified(user)) {
+				common_svsmode(user, "-r", NULL);
+				user->mode &= ~UMODE_r;
+			}
+			break;
+		case 'x':
+			update_host(user);
+			break;
+		}
+	}
+}
+
+
+/* *INDENT-OFF* */
+void moduleAddIRCDMsgs(void) {
+	Message *m;
+
+	updateProtectDetails("PROTECT","PROTECTME","protect","deprotect","AUTOPROTECT","+a","-a");
+
+	m = createMessage("436",	   anope_event_436); addCoreMessage(IRCD,m);
+	m = createMessage("AWAY",	  anope_event_away); addCoreMessage(IRCD,m);
+	m = createMessage("INVITE",	anope_event_null); addCoreMessage(IRCD,m);
+	m = createMessage("JOIN",	  anope_event_join); addCoreMessage(IRCD,m);
+	m = createMessage("KICK",	  anope_event_kick); addCoreMessage(IRCD,m);
+	m = createMessage("KILL",	  anope_event_kill); addCoreMessage(IRCD,m);
+	m = createMessage("MODE",	  anope_event_mode); addCoreMessage(IRCD,m);
+	m = createMessage("MOTD",	  anope_event_motd); addCoreMessage(IRCD,m);
+	m = createMessage("NICK",	  anope_event_nick); addCoreMessage(IRCD,m);
+	m = createMessage("NOTICE",	anope_event_null); addCoreMessage(IRCD,m);
+	m = createMessage("BURST",	 anope_event_burst); addCoreMessage(IRCD,m);
+	m = createMessage("ENDBURST",  anope_event_eob); addCoreMessage(IRCD,m);
+	m = createMessage("CAPAB",	 anope_event_capab); addCoreMessage(IRCD,m);
+	m = createMessage("PART",	  anope_event_part); addCoreMessage(IRCD,m);
+	m = createMessage("PING",	  anope_event_ping); addCoreMessage(IRCD,m);
+	m = createMessage("PRIVMSG",   anope_event_privmsg); addCoreMessage(IRCD,m);
+	m = createMessage("QUIT",	  anope_event_quit); addCoreMessage(IRCD,m);
+	m = createMessage("SERVER",	anope_event_server); addCoreMessage(IRCD,m);
+	m = createMessage("SQUIT",	 anope_event_squit); addCoreMessage(IRCD,m);
+	m = createMessage("RSQUIT",	anope_event_rsquit); addCoreMessage(IRCD,m);
+	m = createMessage("TOPIC",	 anope_event_topic); addCoreMessage(IRCD,m);
+	m = createMessage("WALLOPS",   anope_event_null); addCoreMessage(IRCD,m);
+	m = createMessage("WHOIS",	 anope_event_whois); addCoreMessage(IRCD,m);
+	m = createMessage("GLOBOPS",   anope_event_null); addCoreMessage(IRCD,m);
+	m = createMessage("SILENCE",   anope_event_null); addCoreMessage(IRCD,m);
+	m = createMessage("SVSMODE",   anope_event_mode) ;addCoreMessage(IRCD,m);
+	m = createMessage("QLINE",	 anope_event_null); addCoreMessage(IRCD,m);
+	m = createMessage("GLINE",	 anope_event_null); addCoreMessage(IRCD,m);
+	m = createMessage("ELINE",	 anope_event_null); addCoreMessage(IRCD,m);
+	m = createMessage("ZLINE",	 anope_event_null); addCoreMessage(IRCD,m);
+	m = createMessage("ADDLINE",   anope_event_null); addCoreMessage(IRCD,m);
+	m = createMessage("DELLINE",   anope_event_null); addCoreMessage(IRCD,m);
+	m = createMessage("FHOST",	 anope_event_chghost); addCoreMessage(IRCD,m);
+	m = createMessage("FIDENT",  anope_event_chgident); addCoreMessage(IRCD,m);
+	m = createMessage("FNAME",	 anope_event_chgname); addCoreMessage(IRCD,m);
+	m = createMessage("METADATA",  anope_event_metadata); addCoreMessage(IRCD,m);
+	m = createMessage("SETHOST",   anope_event_sethost); addCoreMessage(IRCD,m);
+	m = createMessage("SETIDENT",  anope_event_setident); addCoreMessage(IRCD,m);
+	m = createMessage("SETNAME",   anope_event_setname); addCoreMessage(IRCD,m);
+	m = createMessage("REHASH",	anope_event_rehash); addCoreMessage(IRCD,m);
+	m = createMessage("ADMIN",	 anope_event_admin); addCoreMessage(IRCD,m);
+	m = createMessage("CREDITS",   anope_event_credits); addCoreMessage(IRCD,m);
+	m = createMessage("FJOIN",	 anope_event_fjoin); addCoreMessage(IRCD,m);
+	m = createMessage("FMODE",	 anope_event_fmode); addCoreMessage(IRCD,m);
+	m = createMessage("FTOPIC",	anope_event_ftopic); addCoreMessage(IRCD,m);
+	m = createMessage("VERSION",   anope_event_version); addCoreMessage(IRCD,m);
+	m = createMessage("OPERTYPE",  anope_event_opertype); addCoreMessage(IRCD,m);
+	m = createMessage("IDLE",	  anope_event_idle); addCoreMessage(IRCD,m);
+	m = createMessage("ENCAP",	 anope_event_null); addCoreMessage(IRCD,m);
+	m = createMessage("UID",	   anope_event_uid); addCoreMessage(IRCD,m);
+	m = createMessage("SVSWATCH",  anope_event_null); addCoreMessage(IRCD,m);
+	m = createMessage("SVSSILENCE",anope_event_null); addCoreMessage(IRCD,m);
+	m = createMessage("PUSH",	  anope_event_null); addCoreMessage(IRCD,m);
+	m = createMessage("TIME",	  anope_event_time); addCoreMessage(IRCD,m);
+}
+
+/* *INDENT-ON* */
+
+void inspircd_cmd_svsnoop(char *server, int set)
+{
+	/* Not Supported by this IRCD */
+}
+
+void inspircd_cmd_svsadmin(char *server, int set)
+{
+	/* Not Supported by this IRCD */
+}
+
+void inspircd_cmd_remove_akill(char *user, char *host)
+{
+	Uid *ud = find_uid(s_OperServ);
+	send_cmd(ud->uid, "GLINE %s@%s", user, host);
+}
+
+void inspircd_cmd_topic(char *whosets, char *chan, char *whosetit,
+		char *topic, time_t when)
+{
+	Uid *ud;
+	if (!whosets) return;
+	ud = find_uid(whosets);
+	send_cmd(ud ? ud->uid : whosets, "FTOPIC %s %lu %s :%s", chan,
+			 (unsigned long int) when, whosetit, topic);
+}
+
+void inspircd_cmd_vhost_off(User * u)
+{
+	Uid *ud = find_uid(s_OperServ);
+	send_cmd(ud->uid,  "MODE %s -%s",  u->nick,  myIrcd->vhostchar);
+	inspircd_cmd_chghost(u->nick, u->host);
+
+	if (has_chgidentmod && u->username && u->vident && strcmp(u->username, u->vident) > 0)
+	{
+		inspircd_cmd_chgident(u->nick, u->username);
+	}
+}
+
+void inspircd_cmd_akill(char *user, char *host, char *who, time_t when,
+		time_t expires, char *reason)
+{
+	/* Calculate the time left before this would expire, capping it at 2 days */
+	time_t timeleft = expires - time(NULL);
+	if (timeleft > 172800 || timeleft < 0)
+		timeleft = 172800;
+	send_cmd(TS6SID, "ADDLINE G %s@%s %s %ld %ld :%s", user, host, who,
+			 (long int) time(NULL), (long int) timeleft, reason);
+}
+
+void inspircd_cmd_svskill(char *source, char *user, char *buf)
+{
+	Uid *ud1;
+	User *u;
+
+	if (!buf || !source || !user)
+		return;
+
+	ud1 = find_uid(source);
+	u = finduser(user);
+	send_cmd(ud1 ? ud1->uid : TS6SID, "KILL %s :%s", u ? u->uid : user, buf);
+}
+
+void inspircd_cmd_svsmode(User * u, int ac, char **av)
+{
+	Uid *ud = find_uid(s_NickServ);
+	send_cmd(ud->uid, "MODE %s %s", u->nick, merge_args(ac, av));
+
+	if (strstr(av[0], "+r") && u->na) {
+		send_cmd(TS6SID, "METADATA %s accountname :%s", u->uid, u->na->nc->display);
+	} else if (strstr(av[0], "-r")) {
+		send_cmd(TS6SID, "METADATA %s accountname :", u->uid);
+	}
+}
+
+
+void inspircd_cmd_372(char *source, char *msg)
+{
+	User *u = finduser(source);
+
+	send_cmd(TS6SID, "PUSH %s ::%s 372 %s :- %s", u ? u->uid : source, ServerName, source, msg);
+}
+
+void inspircd_cmd_372_error(char *source)
+{
+	User *u = finduser(source);
+
+	send_cmd(TS6SID, "PUSH %s ::%s 422 %s :- MOTD file not found!  Please "
+			"contact your IRC administrator.", u ? u->uid : source, ServerName, source);
+}
+
+void inspircd_cmd_375(char *source)
+{
+	User *u = finduser(source);
+
+	send_cmd(TS6SID, "PUSH %s ::%s 375 %s :- %s Message of the Day", u ? u->uid : source,
+			ServerName, source, ServerName);
+}
+
+void inspircd_cmd_376(char *source)
+{
+	User *u = finduser(source);
+
+	send_cmd(TS6SID, "PUSH %s ::%s 376 %s :End of /MOTD command.", u ? u->uid : source, ServerName, source);
+}
+
+void inspircd_cmd_nick(char *nick, char *name, char *modes)
+{
+	char *nicknumbuf = ts6_uid_retrieve();
+	send_cmd(TS6SID, "KILL %s :Services enforced kill", nick);
+	send_cmd(TS6SID, "UID %s %ld %s %s %s %s 0.0.0.0 %ld +%s :%s",
+			 nicknumbuf, (long int) time(NULL), nick, ServiceHost,
+			 ServiceHost, ServiceUser, (long int) time(NULL), modes, name);
+	new_uid(nick, nicknumbuf);
+	send_cmd(nicknumbuf, "OPERTYPE Service");
+}
+
+void inspircd_cmd_guest_nick(char *nick, char *user, char *host,
+						char *real, char *modes)
+{
+	char *nicknumbuf = ts6_uid_retrieve();
+	send_cmd(TS6SID, "UID %s %ld %s %s %s %s 0.0.0.0 %ld +%s :%s", nicknumbuf,
+			 (long int) time(NULL), nick, host, host, user, (long int) time(NULL), modes, real);
+	new_uid(nick, nicknumbuf);
+}
+
+void inspircd_cmd_mode(char *source, char *dest, char *buf)
+{
+	Channel *c;
+	Uid *ud = NULL;
+
+	if (!buf)
+		return;
+
+	c = findchan(dest);
+	if (source) ud = find_uid(source);
+	send_cmd(ud ? ud->uid : TS6SID, "FMODE %s %u %s", dest, (unsigned int)((c) ? c->creation_time : time(NULL)), buf);
+}
+
+int anope_event_version(char *source, int ac, char **av)
+{
+	return MOD_CONT;
+}
+
+int anope_event_idle(char *source, int ac, char **av)
+{
+	Uid *ud;
+	BotInfo *bi;
+	if (ac == 1) {
+		ud = find_nickuid(av[0]);
+		if (ud) {
+			bi = findbot(ud->nick);
+			send_cmd(ud->uid, "IDLE %s %ld %ld", source, start_time, bi ? time(NULL) - bi->lastmsg : 0);
+		}
+	}
+	return MOD_CONT;
+}
+
+int anope_event_ftopic(char *source, int ac, char **av)
+{
+	/* :source FTOPIC channel ts setby :topic */
+	char *temp;
+	if (ac < 4)
+		return MOD_CONT;
+	temp = av[1];			   /* temp now holds ts */
+	av[1] = av[2];			  /* av[1] now holds set by */
+	av[2] = temp;			   /* av[2] now holds ts */
+	do_topic(source, ac, av);
+	return MOD_CONT;
+}
+
+int anope_event_opertype(char *source, int ac, char **av)
+{
+	/* opertype is equivalent to mode +o because servers
+	   dont do this directly */
+	User *u;
+	u = find_byuid(source);
+	if (u && !is_oper(u)) {
+		char *newav[2];
+		newav[0] = source;
+		newav[1] = "+o";
+		return anope_event_mode(source, 2, newav);
+	} else
+		return MOD_CONT;
+}
+
+int anope_event_fmode(char *source, int ac, char **av)
+{
+	char *newav[128];
+	int n, o;
+	Channel *c;
+
+	/* :source FMODE #test 12345678 +nto foo */
+	if (ac < 3)
+		return MOD_CONT;
+
+	/* Checking the TS for validity to avoid desyncs */
+	if ((c = findchan(av[0]))) {
+		if (c->creation_time > strtol(av[1], NULL, 10)) {
+			/* Our TS is bigger, we should lower it */
+			c->creation_time = strtol(av[1], NULL, 10);
+		} else if (c->creation_time < strtol(av[1], NULL, 10)) {
+			/* The TS we got is bigger, we should ignore this message. */
+			return MOD_CONT;
+		}
+	} else {
+		/* Got FMODE for a non-existing channel */
+		return MOD_CONT;
+	}
+
+	/* TS's are equal now, so we can proceed with parsing */
+	n = o = 0;
+	while (n < ac) {
+		if (n != 1) {
+			newav[o] = av[n];
+			o++;
+			if (debug)
+				alog("Param: %s", newav[o - 1]);
+		}
+		n++;
+	}
+
+	return anope_event_mode(source, ac - 1, newav);
+}
+
+/*
+ * [Nov 03 22:31:57.695076 2009] debug: Received: :964 FJOIN #test 1223763723 +BPSnt :,964AAAAAB ,964AAAAAC ,966AAAAAA
+ *
+ * 0: name
+ * 1: channel ts (when it was created, see protocol docs for more info)
+ * 2: channel modes + params (NOTE: this may definitely be more than one param!)
+ * last: users
+ */
+int anope_event_fjoin(char *source, int ac, char **av)
+{
+	char *newav[64];
+	char nicklist[4096] = ""; // inspircd thing
+
+	char **argv;
+	int i, argc;
+
+	if (ac <= 3)
+		return MOD_CONT;
+	
+	argc = split_buf(av[ac - 1], &argv, 1);
+	for (i = 0; i < argc; ++i)
+	{
+		char *nick = argv[i];
+
+		while (*nick != ',')
+		{
+			nicklist[strlen(nicklist)] = sym_from_char(*nick);
+			nick++;
+		}
+		nick++;
+
+		strlcat(nicklist, nick, sizeof(nicklist));
+		strlcat(nicklist, " ", sizeof(nicklist));
+	}
+
+	newav[0] = av[1];		   /* timestamp */
+	newav[1] = av[0];		   /* channel name */
+	for (i = 2; i < ac - 1; i++)
+		newav[i] = av[i];	   /* Modes */
+	newav[i] = nicklist;		/* Nicknames */
+	i++;
+
+	if (debug)
+		alog("Final FJOIN string: %s", merge_args(i, newav));
+
+	do_sjoin(source, i, newav);
+	return MOD_CONT;
+}
+
+void inspircd_cmd_bot_nick(char *nick, char *user, char *host, char *real,
+					  char *modes)
+{
+	char *nicknumbuf = ts6_uid_retrieve();
+	send_cmd(TS6SID, "UID %s %ld %s %s %s %s 0.0.0.0 %ld +%s :%s",
+			 nicknumbuf, (long int) time(NULL), nick, host, host, user,
+			 (long int) time(NULL), modes, real);
+	new_uid(nick, nicknumbuf);
+	send_cmd(nicknumbuf, "OPERTYPE Bot");
+}
+
+void inspircd_cmd_kick(char *source, char *chan, char *user, char *buf)
+{
+	User *u = finduser(user);
+	Uid *ud = (source ? find_uid(source) : NULL), *ud2 = NULL;
+	if (!u) ud2 = (user ? find_uid(user) : NULL);
+
+	if (buf) {
+		send_cmd(ud ? ud->uid : source, "KICK %s %s :%s", chan, u ? u->uid : ud2 ? ud2->uid : user, buf);
+	} else {
+		send_cmd(ud ? ud->uid : source, "KICK %s %s :%s", chan, u ? u->uid : ud2 ? ud2->uid : user, user);
+	}
+}
+
+void inspircd_cmd_notice_ops(char *source, char *dest, char *buf)
+{
+	Uid *ud = (source ? find_uid(source) : NULL);
+	if (!buf)
+		return;
+
+	send_cmd(ud ? ud->uid : TS6SID, "NOTICE @%s :%s", dest, buf);
+}
+
+
+void inspircd_cmd_notice(char *source, char *dest, char *buf)
+{
+	if (!buf)
+		return;
+
+	if (NSDefFlags & NI_MSG) {
+		inspircd_cmd_privmsg2(source, dest, buf);
+	} else {
+		Uid *ud = (source ? find_uid(source) : NULL);
+		User *u = finduser(dest);
+
+		send_cmd(ud ? ud->uid : TS6SID, "NOTICE %s :%s", u ? u->uid : dest, buf);
+	}
+}
+
+void inspircd_cmd_notice2(char *source, char *dest, char *msg)
+{
+	Uid *ud = (source ? find_uid(source) : NULL);
+	User *u = finduser(dest);
+
+	send_cmd(ud ? ud->uid : TS6SID, "NOTICE %s :%s", u ? u->uid : dest, msg);
+}
+
+void inspircd_cmd_privmsg(char *source, char *dest, char *buf)
+{
+	Uid *ud;
+	User *u;
+
+	if (!buf)
+		return;
+
+	ud = (source ? find_uid(source) : NULL);
+	u = finduser(dest);
+
+	send_cmd(ud ? ud->uid : TS6SID, "PRIVMSG %s :%s", u ? u->uid : dest, buf);
+}
+
+void inspircd_cmd_privmsg2(char *source, char *dest, char *msg)
+{
+	Uid *ud = (source ? find_uid(source) : NULL);
+	User *u = finduser(dest);
+
+	send_cmd(ud ? ud->uid : TS6SID, "PRIVMSG %s :%s", u ? u->uid : dest, msg);
+}
+
+void inspircd_cmd_serv_notice(char *source, char *dest, char *msg)
+{
+	Uid *ud = (source ? find_uid(source) : NULL);
+	send_cmd(ud ? ud->uid : TS6SID, "NOTICE $%s :%s", dest, msg);
+}
+
+void inspircd_cmd_serv_privmsg(char *source, char *dest, char *msg)
+{
+	Uid *ud = (source ? find_uid(source) : NULL);
+	send_cmd(ud ? ud->uid : TS6SID, "PRIVMSG $%s :%s", dest, msg);
+}
+
+
+void inspircd_cmd_bot_chan_mode(char *nick, char *chan)
+{
+	anope_cmd_mode(nick, chan, "%s %s %s", ircd->botchanumode, GET_BOT(nick), GET_BOT(nick));
+}
+
+void inspircd_cmd_351(char *source)
+{
+	User *u = finduser(source);
+	if (!u) return;
+
+	send_cmd(TS6SID, "PUSH %s ::%s 351 %s Anope-%s %s :%s - %s (%s) -- %s",
+			u->uid, ServerName, source, version_number, ServerName, ircd->name,
+			version_flags, EncModule, version_build);
+}
+
+/* QUIT */
+void inspircd_cmd_quit(char *source, char *buf)
+{
+	Uid *ud= NULL;
+	if (source) ud = find_uid(source);
+	if (buf) {
+		send_cmd(ud ? ud->uid : source, "QUIT :%s", buf);
+	} else {
+		send_cmd(ud ? ud->uid : source, "QUIT :Exiting");
+	}
+}
+
+/* PROTOCTL */
+void inspircd_cmd_protoctl()
+{
+}
+
+static char currentpass[1024];
+
+/* PASS */
+void inspircd_cmd_pass(char *pass)
+{
+	strncpy(currentpass, pass, 1024);
+}
+
+/* SERVER services-dev.chatspike.net password 0 :Description here */
+void inspircd_cmd_server(char *servname, int hop, char *descript, char *sid)
+{
+	send_cmd(NULL, "SERVER %s %s %d %s :%s", servname, currentpass, hop,
+			sid ? sid : TS6SID, descript);
+}
+
+/* PONG */
+void inspircd_cmd_pong(char *servname, char *who)
+{
+	send_cmd(servname, "PONG %s", who);
+}
+
+/* JOIN */
+void inspircd_cmd_join(char *user, char *channel, time_t chantime)
+{
+	Uid *ud = (user ? find_uid(user) : NULL);
+	send_cmd(TS6SID, "FJOIN %s %ud + :,%s", channel, (unsigned int)chantime, ud ? ud->uid : user);
+}
+
+/* UNSQLINE */
+void inspircd_cmd_unsqline(char *user)
+{
+	if (!user)
+		return;
+
+	send_cmd(TS6SID, "DELLINE Q %s", user);
+}
+
+/* CHGHOST */
+void inspircd_cmd_chghost(char *nick, char *vhost)
+{
+	Uid *ud;
+
+	if (has_chghostmod != 1) {
+		anope_cmd_global(s_OperServ, "CHGHOST not loaded!");
+		return;
+	}
+	if (!nick || !vhost)
+		return;
+
+	ud = find_uid(s_OperServ);
+	send_cmd(ud->uid, "CHGHOST %s %s", nick, vhost);
+}
+
+/* CHGIDENT */
+void inspircd_cmd_chgident(char *nick, char *vIdent)
+{
+	Uid *ud;
+
+	if (has_chgidentmod != 1) {
+		anope_cmd_global(s_OperServ, "CHGIDENT not loaded!");
+		return;
+	}
+	if (!nick || !vIdent || !*vIdent)
+		return;
+
+	ud = find_uid(s_OperServ);
+	send_cmd(ud->uid, "CHGIDENT %s %s", nick, vIdent);
+}
+
+/* INVITE */