[NeoStats-Devel] [Commits] r2547 - in trunk/src: . protocol

[email protected]
Newsgroups gmane.comp.neostats.devel
Message-ID <[email protected]> 
Author: Mark
Date: Tue Apr 19 06:11:52 2005
New Revision: 2547

Modified:
   trunk/src/ircd.c
   trunk/src/protocol/asuka.c
   trunk/src/protocol/ircup10.c
   trunk/src/protocol/nefarious.c
Log:
contine ircu split

Modified: trunk/src/ircd.c
==============================================================================
--- trunk/src/ircd.c	(original)
+++ trunk/src/ircd.c	Tue Apr 19 06:11:52 2005
@@ -1216,12 +1216,16 @@
 	}
 	intrinsic_cmd_ptr = intrinsic_cmd_list;
 	while( intrinsic_cmd_ptr->handler ) {
-		if( *intrinsic_cmd_ptr->name && !ircstrcasecmp( *intrinsic_cmd_ptr->name, cmd ) || 
-		 ( ( ircd_srv.protocol & PROTOCOL_TOKEN ) && *intrinsic_cmd_ptr->token && !ircstrcasecmp( *intrinsic_cmd_ptr->token, cmd ) ) ) {
-			dlog( DEBUG3, "process_ircd_cmd: running command %s", *intrinsic_cmd_ptr->name );
-			intrinsic_cmd_ptr->handler( origin, av, ac, cmdptr );
-			intrinsic_cmd_ptr->usage++;
-			return;
+		if( *intrinsic_cmd_ptr->name )
+		{
+			if( !ircstrcasecmp( *intrinsic_cmd_ptr->name, cmd ) || 
+			  ( ( ircd_srv.protocol & PROTOCOL_TOKEN ) && *intrinsic_cmd_ptr->token && !ircstrcasecmp( *intrinsic_cmd_ptr->token, cmd ) ) ) 
+			{
+				dlog( DEBUG3, "process_ircd_cmd: running command %s", *intrinsic_cmd_ptr->name );
+				intrinsic_cmd_ptr->handler( origin, av, ac, cmdptr );
+				intrinsic_cmd_ptr->usage++;
+				return;
+			}
 		}
 		intrinsic_cmd_ptr ++;
 	}

Modified: trunk/src/protocol/asuka.c
==============================================================================
--- trunk/src/protocol/asuka.c	(original)
+++ trunk/src/protocol/asuka.c	Tue Apr 19 06:11:52 2005
@@ -30,18 +30,7 @@
 #include <arpa/inet.h>
 #endif
 
-/* IRCu modification support 
- * Currently we only support modifications for Nefarious and Asuka
- * To enable support uncomment the appropriate line below.
- */
-/* Nefarious IRCu - http://evilnet.sourceforge.net */
-/* #define NEFARIOUS */
-/* ...... */
-/* Nefarious IRCu with F:HOST_HIDING_STYLE:2 */
-/* #define NEFARIOUS_CLOAKHOST */
-/* ...... */
 /* QuakeNet Asuka - http://dev.quakenet.org */
-/* #define ASUKA */
 
 /* Messages/Tokens */
 
@@ -233,33 +222,16 @@
  /* User modes: */
 #define UMODE_SERVNOTICE        0x00800000	/* See server notices */
 #define UMODE_DEBUG             0x01000000	/* See hack notices */
-#ifdef NEFARIOUS
-#define UMODE_FAKEHOST		0x02000000	/* */
-#define UMODE_WHOIS		0x04000000	/* */
-#endif
-#if ( defined NEFARIOUS ) || (defined ASUKA )
 #define UMODE_SETHOST		0x08000000	/* */
 #define UMODE_NOCHAN		0x10000000	/* */
 #define UMODE_NOIDLE		0x20000000	/* */
 #define UMODE_XTRAOP		0x40000000	/* */
-#endif
 
 /* Cmodes */
-#if ( defined NEFARIOUS ) || (defined ASUKA )
 #define CMODE_NOCTCP		0x02000000
 #define CMODE_NONOTICE		0x04000000
 #define CMODE_NOQUITPARTS	0x08000000
-#endif
-#ifdef ASUKA
 #define CMODE_DELJOINS		0x10000000
-#endif
-#ifdef NEFARIOUS
-#define CMODE_PERSIST		0x20000000
-#define CMODE_NOLISTMODES	0x40000000
-#define CMODE_MODREG		0x80000000
-#define CMODE_NOAMSG		0x100000000
-#define CMODE_ONLYSECURE	0x200000000
-#endif
 
 static void m_private( char *origin, char **argv, int argc, int srv );
 static void m_notice( char *origin, char **argv, int argc, int srv );
@@ -379,27 +351,11 @@
 
 mode_init chan_modes[] = 
 {
-#if( defined NEFARIOUS ) ||( defined ASUKA )
 	{'c', CMODE_NOCOLOR, 0},
 	{'C', CMODE_NOCTCP, 0},
 	{'N', CMODE_NONOTICE, 0},
-#endif
-#ifdef ASUKA
 	{'D', CMODE_DELJOINS, 0},
 	{'u', CMODE_NOQUITPARTS, 0},
-#endif
-#ifdef NEFARIOUS
-	{'a', CMODE_ADMONLY, 0},
-	{'e', CMODE_EXCEPT, MODEPARAM},
-	{'z', CMODE_PERSIST, 0},
-	{'L', CMODE_NOLISTMODES, 0},
-	{'M', CMODE_MODREG, 0},
-	{'O', CMODE_OPERONLY, 0},
-	{'Q', CMODE_NOQUITPARTS, 0},
-	{'S', CMODE_STRIP, 0},
-	{'T', CMODE_NOAMSG, 0},
-	{'Z', CMODE_ONLYSECURE, 0},
-#endif
 	{'r', CMODE_RGSTRONLY, 0},
 	{0, 0, 0},
 };
@@ -414,19 +370,11 @@
 	{'k', UMODE_SERVICES},
 	{'r', UMODE_REGNICK},
 	{'x', UMODE_HIDE},
-#ifdef NEFARIOUS
-	{'a', UMODE_ADMIN},
-	{'f', UMODE_FAKEHOST},
-	{'B', UMODE_BOT},
-	{'W', UMODE_WHOIS},
-#endif
-#if( defined NEFARIOUS ) ||( defined ASUKA )
 	{'h', UMODE_SETHOST},
 	{'n', UMODE_NOCHAN},
 	{'I', UMODE_NOIDLE},
 	{'R', UMODE_RGSTRONLY},
 	{'X', UMODE_XTRAOP},
-#endif
 	{0, 0},
 };
 

Modified: trunk/src/protocol/ircup10.c
==============================================================================
--- trunk/src/protocol/ircup10.c	(original)
+++ trunk/src/protocol/ircup10.c	Tue Apr 19 06:11:52 2005
@@ -30,19 +30,6 @@
 #include <arpa/inet.h>
 #endif
 
-/* IRCu modification support 
- * Currently we only support modifications for Nefarious and Asuka
- * To enable support uncomment the appropriate line below.
- */
-/* Nefarious IRCu - http://evilnet.sourceforge.net */
-/* #define NEFARIOUS */
-/* ...... */
-/* Nefarious IRCu with F:HOST_HIDING_STYLE:2 */
-/* #define NEFARIOUS_CLOAKHOST */
-/* ...... */
-/* QuakeNet Asuka - http://dev.quakenet.org */
-/* #define ASUKA */
-
 /* Messages/Tokens */
 
 const char MSG_PRIVATE[] = "PRIVMSG";
@@ -233,33 +220,8 @@
  /* User modes: */
 #define UMODE_SERVNOTICE        0x00800000	/* See server notices */
 #define UMODE_DEBUG             0x01000000	/* See hack notices */
-#ifdef NEFARIOUS
-#define UMODE_FAKEHOST		0x02000000	/* */
-#define UMODE_WHOIS		0x04000000	/* */
-#endif
-#if ( defined NEFARIOUS ) || (defined ASUKA )
-#define UMODE_SETHOST		0x08000000	/* */
-#define UMODE_NOCHAN		0x10000000	/* */
-#define UMODE_NOIDLE		0x20000000	/* */
-#define UMODE_XTRAOP		0x40000000	/* */
-#endif
 
 /* Cmodes */
-#if ( defined NEFARIOUS ) || (defined ASUKA )
-#define CMODE_NOCTCP		0x02000000
-#define CMODE_NONOTICE		0x04000000
-#define CMODE_NOQUITPARTS	0x08000000
-#endif
-#ifdef ASUKA
-#define CMODE_DELJOINS		0x10000000
-#endif
-#ifdef NEFARIOUS
-#define CMODE_PERSIST		0x20000000
-#define CMODE_NOLISTMODES	0x40000000
-#define CMODE_MODREG		0x80000000
-#define CMODE_NOAMSG		0x100000000
-#define CMODE_ONLYSECURE	0x200000000
-#endif
 
 static void m_private( char *origin, char **argv, int argc, int srv );
 static void m_notice( char *origin, char **argv, int argc, int srv );
@@ -379,27 +341,6 @@
 
 mode_init chan_modes[] = 
 {
-#if( defined NEFARIOUS ) ||( defined ASUKA )
-	{'c', CMODE_NOCOLOR, 0},
-	{'C', CMODE_NOCTCP, 0},
-	{'N', CMODE_NONOTICE, 0},
-#endif
-#ifdef ASUKA
-	{'D', CMODE_DELJOINS, 0},
-	{'u', CMODE_NOQUITPARTS, 0},
-#endif
-#ifdef NEFARIOUS
-	{'a', CMODE_ADMONLY, 0},
-	{'e', CMODE_EXCEPT, MODEPARAM},
-	{'z', CMODE_PERSIST, 0},
-	{'L', CMODE_NOLISTMODES, 0},
-	{'M', CMODE_MODREG, 0},
-	{'O', CMODE_OPERONLY, 0},
-	{'Q', CMODE_NOQUITPARTS, 0},
-	{'S', CMODE_STRIP, 0},
-	{'T', CMODE_NOAMSG, 0},
-	{'Z', CMODE_ONLYSECURE, 0},
-#endif
 	{'r', CMODE_RGSTRONLY, 0},
 	{0, 0, 0},
 };
@@ -414,19 +355,6 @@
 	{'k', UMODE_SERVICES},
 	{'r', UMODE_REGNICK},
 	{'x', UMODE_HIDE},
-#ifdef NEFARIOUS
-	{'a', UMODE_ADMIN},
-	{'f', UMODE_FAKEHOST},
-	{'B', UMODE_BOT},
-	{'W', UMODE_WHOIS},
-#endif
-#if( defined NEFARIOUS ) ||( defined ASUKA )
-	{'h', UMODE_SETHOST},
-	{'n', UMODE_NOCHAN},
-	{'I', UMODE_NOIDLE},
-	{'R', UMODE_RGSTRONLY},
-	{'X', UMODE_XTRAOP},
-#endif
 	{0, 0},
 };
 

Modified: trunk/src/protocol/nefarious.c
==============================================================================
--- trunk/src/protocol/nefarious.c	(original)
+++ trunk/src/protocol/nefarious.c	Tue Apr 19 06:11:52 2005
@@ -30,18 +30,12 @@
 #include <arpa/inet.h>
 #endif
 
-/* IRCu modification support 
- * Currently we only support modifications for Nefarious and Asuka
- * To enable support uncomment the appropriate line below.
- */
 /* Nefarious IRCu - http://evilnet.sourceforge.net */
 /* #define NEFARIOUS */
 /* ...... */
 /* Nefarious IRCu with F:HOST_HIDING_STYLE:2 */
 /* #define NEFARIOUS_CLOAKHOST */
 /* ...... */
-/* QuakeNet Asuka - http://dev.quakenet.org */
-/* #define ASUKA */
 
 /* Messages/Tokens */
 
@@ -233,33 +227,22 @@
  /* User modes: */
 #define UMODE_SERVNOTICE        0x00800000	/* See server notices */
 #define UMODE_DEBUG             0x01000000	/* See hack notices */
-#ifdef NEFARIOUS
 #define UMODE_FAKEHOST		0x02000000	/* */
 #define UMODE_WHOIS		0x04000000	/* */
-#endif
-#if ( defined NEFARIOUS ) || (defined ASUKA )
 #define UMODE_SETHOST		0x08000000	/* */
 #define UMODE_NOCHAN		0x10000000	/* */
 #define UMODE_NOIDLE		0x20000000	/* */
 #define UMODE_XTRAOP		0x40000000	/* */
-#endif
 
 /* Cmodes */
-#if ( defined NEFARIOUS ) || (defined ASUKA )
 #define CMODE_NOCTCP		0x02000000
 #define CMODE_NONOTICE		0x04000000
 #define CMODE_NOQUITPARTS	0x08000000
-#endif
-#ifdef ASUKA
-#define CMODE_DELJOINS		0x10000000
-#endif
-#ifdef NEFARIOUS
 #define CMODE_PERSIST		0x20000000
 #define CMODE_NOLISTMODES	0x40000000
 #define CMODE_MODREG		0x80000000
 #define CMODE_NOAMSG		0x100000000
 #define CMODE_ONLYSECURE	0x200000000
-#endif
 
 static void m_private( char *origin, char **argv, int argc, int srv );
 static void m_notice( char *origin, char **argv, int argc, int srv );
@@ -302,12 +285,10 @@
 	/* Protocol options negotiated at link by this IRCd */
 	0,
 	/* Features supported by this IRCd */
-#ifdef NEFARIOUS
 	FEATURE_SVSJOIN|FEATURE_SVSPART|FEATURE_SVSNICK|FEATURE_SVSHOST|FEATURE_SWHOIS|
 # ifdef NEFARIOUS_CLOAKHOST
 	FEATURE_UMODECLOAK|
 # endif /* NEFARIOUS_CLOAKHOST */
-#endif /* NEFARIOUS */
 	FEATURE_SVSTIME,
 	/* Max host length */
 	63 ,
@@ -379,16 +360,9 @@
 
 mode_init chan_modes[] = 
 {
-#if( defined NEFARIOUS ) ||( defined ASUKA )
 	{'c', CMODE_NOCOLOR, 0},
 	{'C', CMODE_NOCTCP, 0},
 	{'N', CMODE_NONOTICE, 0},
-#endif
-#ifdef ASUKA
-	{'D', CMODE_DELJOINS, 0},
-	{'u', CMODE_NOQUITPARTS, 0},
-#endif
-#ifdef NEFARIOUS
 	{'a', CMODE_ADMONLY, 0},
 	{'e', CMODE_EXCEPT, MODEPARAM},
 	{'z', CMODE_PERSIST, 0},
@@ -399,7 +373,6 @@
 	{'S', CMODE_STRIP, 0},
 	{'T', CMODE_NOAMSG, 0},
 	{'Z', CMODE_ONLYSECURE, 0},
-#endif
 	{'r', CMODE_RGSTRONLY, 0},
 	{0, 0, 0},
 };
@@ -414,19 +387,15 @@
 	{'k', UMODE_SERVICES},
 	{'r', UMODE_REGNICK},
 	{'x', UMODE_HIDE},
-#ifdef NEFARIOUS
 	{'a', UMODE_ADMIN},
 	{'f', UMODE_FAKEHOST},
 	{'B', UMODE_BOT},
 	{'W', UMODE_WHOIS},
-#endif
-#if( defined NEFARIOUS ) ||( defined ASUKA )
 	{'h', UMODE_SETHOST},
 	{'n', UMODE_NOCHAN},
 	{'I', UMODE_NOIDLE},
 	{'R', UMODE_RGSTRONLY},
 	{'X', UMODE_XTRAOP},
-#endif
 	{0, 0},
 };
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.