BUILD : 1.7.5 (340) BUGS : none NOTES : Applied patch 830 provided by Trystan to resolve several issues.

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


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

3 files changed, 20 insertions, 13 deletions

diff --git a/include/extern.h b/include/extern.h
index d7d9b71a4..69edc638b 100644
--- a/include/extern.h
+++ b/include/extern.h
@@ -493,8 +493,6 @@ E char *DefconMessage;
 E char *DefConAkillReason;
 E char *DefConOffMessage;
 
-E int Numeric;
-
 /**** converter.c ****/
 
 E int convert_ircservices_44(void);
@@ -644,11 +642,6 @@ E void doCleanBuffer(char *str);
 E void EnforceQlinedNick(char *nick, char *killer);
 E int nickIsServices(char *nick);
 
-
-E const char* inttobase64(char* buf, unsigned int v, unsigned int count);
-E unsigned int base64toIP(const char* s);
-E unsigned int base64toint(const char* s);
-
 /**** modules.c ****/
 E void moduleCallBackRun(void);
 E void moduleCleanStruct(ModuleData * moduleData[]);
@@ -851,7 +844,6 @@ E void get_user_stats(long *nusers, long *memuse);
 E User *finduser(const char *nick);
 E User *firstuser(void);
 E User *nextuser(void);
-E User *finduser_uid(const char *uid);
 
 E void update_host(User * user);
 E void change_user_host(User * user, const char *host);
@@ -1003,6 +995,7 @@ extern int anope_event_whois(char *source, int ac, char **av);
 extern int anope_event_part(char *source, int ac, char **av);
 extern int anope_event_server(char *source, int ac, char **av);
 extern int anope_event_nick(char *source, int ac, char **av);
+extern int anope_event_gnotice(char *source, int ac, char **av);
 extern int anope_event_privmsg(char *source, int ac, char **av);
 extern int anope_event_capab(char *source, int ac, char **av);
 extern int anope_event_sjoin(char *source, int ac, char **av);
@@ -1021,13 +1014,22 @@ extern int anope_event_chgname(char *source, int ac, char **av);
 extern int anope_event_setname(char *source, int ac, char **av);
 extern int anope_event_svsinfo(char *source, int ac, char **av);
 extern int anope_event_snick(char *source, int ac, char **av);
-extern int anope_event_vhost(char *source, int ac, char **av);   /* Rage IRCD Only */
+extern int anope_event_vhost(char *source, int ac, char **av);
 extern int anope_event_tkl(char *source, int ac, char **av);
 extern int anope_event_eos(char *source, int ac, char **av);
 extern int anope_event_pass(char *source, int ac, char **av);
 extern int anope_event_netinfo(char *source, int ac, char **av);
 extern int anope_event_error(char *source, int ac, char **av);
 extern int anope_event_eb(char *source, int ac, char **av);
+extern int anope_event_netctrl(char *source, int ac, char **av);
+extern int anope_event_notice(char *source, int ac, char **av);
+extern int anope_event_sqline(char *source, int ac, char **av);
+extern int anope_event_error(char *source, int ac, char **av);
+extern int anope_event_smo(char *source, int ac, char **av);
+extern int anope_event_myid(char *source, int ac, char **av);
+extern int anope_event_vctrl(char *source, int ac, char **av);
+extern int anope_event_netinfo(char *source, int ac, char **av);
+extern int anope_event_snetinfo(char *source, int ac, char **av);
 
 extern void anope_set_umode(User * user, int ac, char **av);
 extern void anope_cmd_svid_umode(char *nick, time_t ts);
diff --git a/include/services.h b/include/services.h
index 52cd43a1c..c63fd8d81 100644
--- a/include/services.h
+++ b/include/services.h
@@ -240,11 +240,13 @@ struct ircdvars_ {
 	uint32 adminmode;			/* Admin Only Channel Mode	*/
 	uint32 defmlock;			/* Default mlock modes		*/
 	uint32 vhostmode;			/* Vhost mode			*/
-	int fmode;				/* +f				*/
-	int Lmode;				/* +L				*/
+	int fmode;					/* +f				*/
+	int Lmode;					/* +L				*/
 	uint32 chan_fmode;			/* Mode 			*/
 	uint32 chan_lmode;			/* Mode				*/
 	int check_nick_id;			/* On nick change check if they could be identified */
+	int knock_needs_i;			/* Check if we needed +i when setting NOKNOCK */
+	char *chanmodes;				/* If the ircd sends CHANMODE in CAPAB this is where we store it */
 };
 
 struct ircdcapab_ {
@@ -276,6 +278,7 @@ struct ircdcapab_ {
   uint32 tlkext;
   uint32 dodkey;
   uint32 dozip;
+  uint32 chanmodes;
 };
 
 /*************************************************************************/
@@ -1074,6 +1077,7 @@ struct hostcache_ {
 #define CAPAB_UMODE2    0x02000000
 #define CAPAB_VL        0x04000000
 #define CAPAB_TLKEXT    0x08000000
+#define CAPAB_CHANMODE  0x10000000
 
 
 /*************************************************************************/
diff --git a/include/unreal32.h b/include/unreal32.h
index 02df21643..8c84d54f4 100644
--- a/include/unreal32.h
+++ b/include/unreal32.h
@@ -39,6 +39,8 @@
 #define CMODE_t 0x00000020
 #define CMODE_k 0x00000040		/* These two used only by ChanServ */
 #define CMODE_l 0x00000080
+#define CMODE_R 0x00000100		/* Only identified users can join */
+#define CMODE_r 0x00000200		/* Set for all registered channels */
 #define CMODE_c 0x00000400
 #define CMODE_A 0x00000800
 #define CMODE_H 0x00001000
@@ -54,8 +56,7 @@
 #define CMODE_u 0x00400000
 #define CMODE_z 0x00800000
 #define CMODE_N 0x01000000
-#define CMODE_R 0x00000100		/* Only identified users can join */
-#define CMODE_r 0x00000200		/* Set for all registered channels */
+#define CMODE_T 0x02000000
 
 /*************************************************************************/