From a0b268dab3ed358bb24f78389a6d7e21f0809102 Mon Sep 17 00:00:00 2001 From: "rob rob@31f1291d-b8d6-0310-a050-a5561fc1590b" Date: Tue, 17 May 2005 20:04:58 +0000 Subject: using svn commit to try and avoid indent bug thing git-svn-id: svn://svn.anope.org/anope/trunk@800 31f1291d-b8d6-0310-a050-a5561fc1590b git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@557 5417fbe8-f217-4b02-8779-1006273d7864 --- src/protocol/Makefile | 5 +- src/protocol/Makefile.sub | 5 +- src/protocol/inspircd.c | 19 +- src/protocol/plexus.c | 2270 +++++++++++++++++++++++++-------------------- src/protocol/ptlink.c | 5 +- 5 files changed, 1254 insertions(+), 1050 deletions(-) (limited to 'src/protocol') diff --git a/src/protocol/Makefile b/src/protocol/Makefile index e73fd7e7c..602d43bec 100644 --- a/src/protocol/Makefile +++ b/src/protocol/Makefile @@ -5,12 +5,11 @@ MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}' 'ANOPELIBS=${ANOPELIBS}' \ 'INCLUDEDIR=${INCLUDEDIR}' 'RM=${RM}' 'CP=${CP}' \ 'TOUCH=${TOUCH}' 'SHELL=${SHELL}' 'DATDEST=${DATDEST}' \ 'RUNGROUP=${RUNGROUP}' 'MODULE_PATH=${MODULE_PATH}' \ - 'PROFILE=${PROFILE}' 'SHARED=${SHARED}' + 'PROFILE=${PROFILE}' 'SHARED=${SHARED}' 'MODULEFLAGS=${MODULEFLAGS}' OBJECTS= $(SRCS:.c=.o) SO_FILES=$(OBJECTS:.o=.s) CDEFS= -g -rdynamic -Wall -CFLAGS=$(CFLAGS) $(CDEFS) all: modules subs @@ -22,7 +21,7 @@ install: distclean: clean spotless .c.o: - $(CC) $(CFLAGS) -I../${INCLUDEDIR} -c $< + $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -c $< .o.s: $(CC) ${SHARED} $< -o $*.so ${PROFILE} diff --git a/src/protocol/Makefile.sub b/src/protocol/Makefile.sub index b060ca5b6..7c4744ce8 100644 --- a/src/protocol/Makefile.sub +++ b/src/protocol/Makefile.sub @@ -3,12 +3,11 @@ MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}' 'ANOPELIBS=${ANOPELIBS}' \ 'INCLUDEDIR=${INCLUDEDIR}' 'RM=${RM}' 'CP=${CP}' \ 'TOUCH=${TOUCH}' 'SHELL=${SHELL}' 'DATDEST=${DATDEST}' \ 'RUNGROUP=${RUNGROUP}' 'MODULE_PATH=${MODULE_PATH}' \ - 'PROFILE=${PROFILE}' 'SHARED=${SHARED}' + 'PROFILE=${PROFILE}' 'SHARED=${SHARED}' 'MODULEFLAGS=${MODULEFLAGS}' OBJECTS= $(SRCS:.c=.o) SO_FILES=$(OBJECTS:.o=.s) CDEFS= -g -rdynamic -Wall -CFLAGS=$(CFLAGS) $(CDEFS) all: module @@ -17,7 +16,7 @@ module: $(OBJECTS) so distclean: clean spotless .c.o: - $(CC) $(CFLAGS) -I../ -I../../${INCLUDEDIR} -c $< + $(CC) $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../ -I../../${INCLUDEDIR} -c $< so: $(CC) ${SHARED} $(OBJECTS) -o ../$(TARGET).so ${PROFILE} diff --git a/src/protocol/inspircd.c b/src/protocol/inspircd.c index e16f38e9d..762c2260c 100644 --- a/src/protocol/inspircd.c +++ b/src/protocol/inspircd.c @@ -522,7 +522,7 @@ void inspircd_cmd_vhost_off(User * u) void inspircd_cmd_akill(char *user, char *host, char *who, time_t when, time_t expires, char *reason) { - send_cmd(CreateSum(), "# %s@%s %s %lu %lu :%s", user, host, who, (long int)when, 86400 * 2, reason); + send_cmd(CreateSum(), "# %s@%s %s %lu %lu :%s", user, host, who, (unsigned long)when, (unsigned long)86400 * 2, reason); } void inspircd_cmd_svskill(char *source, char *user, char *buf) @@ -586,9 +586,9 @@ void inspircd_cmd_bot_nick(char *nick, char *user, char *host, char *real, void inspircd_cmd_kick(char *source, char *chan, char *user, char *buf) { if (buf) { - send_cmd(CreateSum(), "k %s %s :%s", source, user, chan, buf); + send_cmd(CreateSum(), "k %s %s %s :%s", source, user, chan, buf); } else { - send_cmd(CreateSum(), "k %s %s :", source, user, chan); + send_cmd(CreateSum(), "k %s %s %s :", source, user, chan); } } @@ -682,7 +682,6 @@ int anope_event_eob(char *source, int ac, char **av) /* SERVER name hop descript */ void inspircd_cmd_server(char *servname, int hop, char *descript) { - Server *newserv; if (hop == 0) { send_cmd(CreateSum(), "H %s",servname); @@ -758,7 +757,7 @@ void inspircd_cmd_part(char *nick, char *chan, char *buf) return; } if (buf) { - send_cmd(CreateSum(), "L %s :%s", nick, chan, buf); + send_cmd(CreateSum(), "L %s %s :%s", nick, chan, buf); } else { send_cmd(CreateSum(), "L %s %s :", nick, chan); } @@ -1037,17 +1036,9 @@ int anope_event_kick(char *source, int ac, char **av) int anope_event_join(char *source, int ac, char **av) { - //if (ac != 2) - // return MOD_CONT; - //char *v[32]; - //v[0] = av[1]; - //do_join(av[0], 1, v); - //return MOD_CONT; - User *u; Channel *c; int i; - int32 modes = 0, thismode; char* new_av[32]; char* cumodes[3]; char thismodes[256]; @@ -1295,7 +1286,7 @@ void inspircd_cmd_unszline(char *mask) void inspircd_cmd_szline(char *mask, char *reason, char *whom) { // } : - send_cmd(CreateSum(), "} %s %s %lu %lu :%s",mask,whom,(long int) time(NULL),86400 * 2, reason); + send_cmd(CreateSum(), "} %s %s %lu %lu :%s",mask,whom,(unsigned long)time(NULL),(unsigned long)86400 * 2, reason); } /* SGLINE */ diff --git a/src/protocol/plexus.c b/src/protocol/plexus.c index 32f9feea3..c85b38eb3 100644 --- a/src/protocol/plexus.c +++ b/src/protocol/plexus.c @@ -1,5 +1,3 @@ -/* PlexusIRCD IRCD functions -/* PlexusIRCD IRCD functions /* PlexusIRCD IRCD functions * * (C) 2003-2005 Anope Team @@ -8,194 +6,199 @@ * Please read COPYING and README for furhter details. * * Based on the original code of Epona by Lara. - * Based on the original code of Services by Andy Church. - * - * - */ + * Based on the original code of Services by Andy Church. + **/ #include "services.h" #include "pseudo.h" #include "plexus.h" IRCDVar myIrcd[] = { - {"PleXusIRCd 2.0+", /* ircd name */ - "+oiSR", /* nickserv mode */ - "+oiSR", /* chanserv mode */ - "+oiSR", /* memoserv mode */ - "+oiSR", /* hostserv mode */ - "+oaiSR", /* operserv mode */ - "+oiSR", /* botserv mode */ - "+oiSR", /* helpserv mode */ - "+oiSR", /* Dev/Null mode */ - "+oiSR", /* Global mode */ - "+oiSR", /* nickserv alias mode */ - "+oiSR", /* chanserv alias mode */ - "+oiSR", /* memoserv alias mode */ - "+oiSR", /* hostserv alias mode */ - "+oaiSR", /* operserv alias mode */ - "+oiSR", /* botserv alias mode */ - "+oiSR", /* helpserv alias mode */ - "+oiSR", /* Dev/Null alias mode */ - "+oiSR", /* Global alias mode */ - "+iSR", /* Used by BotServ Bots */ - 3, /* Chan Max Symbols */ - "-acilmnpstMNORZ", /* Modes to Remove */ - "+o", /* Channel Umode used by Botserv bots */ - 1, /* SVSNICK */ - 1, /* Vhost */ - 0, /* Has Owner */ - NULL, /* Mode to set for an owner */ - NULL, /* Mode to unset for an owner */ - NULL, /* Mode to set for chan admin */ - NULL, /* Mode to unset for chan admin */ - "+R", /* Mode On Reg */ - "-R", /* Mode on UnReg */ - "-R", /* Mode on Nick Change */ - 0, /* Supports SGlines */ - 1, /* Supports SQlines */ - 0, /* Supports SZlines */ - 1, /* Supports Halfop +h */ - 3, /* Number of server args */ - 0, /* Join 2 Set */ - 0, /* Join 2 Message */ - 1, /* Has exceptions +e */ - 0, /* TS Topic Forward */ - 0, /* TS Topci Backward */ - 0, /* Protected Umode */ - 0, /* Has Admin */ - 1, /* Chan SQlines */ - 0, /* Quit on Kill */ - 0, /* SVSMODE unban */ - 0, /* Has Protect */ - 0, /* Reverse */ - 0, /* Chan Reg */ - 0, /* Channel Mode */ - 0, /* vidents */ - 0, /* svshold */ - 1, /* time stamp on mode */ - 0, /* NICKIP */ - 0, /* UMODE */ - 0, /* O:LINE */ - 1, /* VHOST ON NICK */ - 0, /* Change RealName */ - CMODE_p, /* No Knock */ - 0, /* Admin Only */ - DEFAULT_MLOCK, /* Default MLOCK */ - UMODE_h, /* Vhost Mode */ - 0, /* +f */ - 0, /* +L */ - 0, /* +f Mode */ - 0, /* +L Mode */ - 0, /* On nick change check if they could be identified */ - 0, /* No Knock requires +i */ - NULL, /* CAPAB Chan Modes */ - 0, /* We support TOKENS */ - 1, /* TOKENS are CASE inSensitive */ - 0, /* TIME STAMPS are BASE64 */ - 1, /* +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 */ - "h", /* vhost char */ - 0, /* ts6 */ - 0, /* support helper umode */ - 0, /* p10 */ - NULL, /* character set */ - 1, /* reports sync state */ - } - , - {NULL} + {"PleXusIRCd 2.0+", /* ircd name */ + "+oiSR", /* nickserv mode */ + "+oiSR", /* chanserv mode */ + "+oiSR", /* memoserv mode */ + "+oiSR", /* hostserv mode */ + "+oaiSR", /* operserv mode */ + "+oiSR", /* botserv mode */ + "+oiSR", /* helpserv mode */ + "+oiSR", /* Dev/Null mode */ + "+oiSR", /* Global mode */ + "+oiSR", /* nickserv alias mode */ + "+oiSR", /* chanserv alias mode */ + "+oiSR", /* memoserv alias mode */ + "+oiSR", /* hostserv alias mode */ + "+oaiSR", /* operserv alias mode */ + "+oiSR", /* botserv alias mode */ + "+oiSR", /* helpserv alias mode */ + "+oiSR", /* Dev/Null alias mode */ + "+oiSR", /* Global alias mode */ + "+iSR", /* Used by BotServ Bots */ + 3, /* Chan Max Symbols */ + "-acilmnpstMNORZ", /* Modes to Remove */ + "+o", /* Channel Umode used by Botserv bots */ + 1, /* SVSNICK */ + 1, /* Vhost */ + 0, /* Has Owner */ + NULL, /* Mode to set for an owner */ + NULL, /* Mode to unset for an owner */ + NULL, /* Mode to set for chan admin */ + NULL, /* Mode to unset for chan admin */ + "+R", /* Mode On Reg */ + "-R", /* Mode on UnReg */ + "-R", /* Mode on Nick Change */ + 0, /* Supports SGlines */ + 1, /* Supports SQlines */ + 0, /* Supports SZlines */ + 1, /* Supports Halfop +h */ + 3, /* Number of server args */ + 0, /* Join 2 Set */ + 0, /* Join 2 Message */ + 1, /* Has exceptions +e */ + 0, /* TS Topic Forward */ + 0, /* TS Topci Backward */ + 0, /* Protected Umode */ + 0, /* Has Admin */ + 1, /* Chan SQlines */ + 0, /* Quit on Kill */ + 0, /* SVSMODE unban */ + 0, /* Has Protect */ + 0, /* Reverse */ + 0, /* Chan Reg */ + 0, /* Channel Mode */ + 0, /* vidents */ + 0, /* svshold */ + 1, /* time stamp on mode */ + 0, /* NICKIP */ + 0, /* UMODE */ + 0, /* O:LINE */ + 1, /* VHOST ON NICK */ + 0, /* Change RealName */ + CMODE_p, /* No Knock */ + 0, /* Admin Only */ + DEFAULT_MLOCK, /* Default MLOCK */ + UMODE_h, /* Vhost Mode */ + 0, /* +f */ + 0, /* +L */ + 0, /* +f Mode */ + 0, /* +L Mode */ + 0, /* On nick change check if they could be identified */ + 0, /* No Knock requires +i */ + NULL, /* CAPAB Chan Modes */ + 0, /* We support TOKENS */ + 1, /* TOKENS are CASE inSensitive */ + 0, /* TIME STAMPS are BASE64 */ + 1, /* +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 */ + "h", /* vhost char */ + 0, /* ts6 */ + 0, /* support helper umode */ + 0, /* p10 */ + NULL, /* character set */ + 1, /* reports sync state */ + } + , + {NULL} }; IRCDCAPAB myIrcdcap[] = { - { - 0, /* NOQUIT */ - 0, /* TSMODE */ - 0, /* UNCONNECT */ - 0, /* NICKIP */ - 0, /* SJOIN */ - CAPAB_ZIP, /* ZIP */ - 0, /* BURST */ - CAPAB_TS5, /* TS5 */ - 0, /* TS3 */ - 0, /* DKEY */ - 0, /* PT4 */ - 0, /* SCS */ - CAPAB_QS, /* QS */ - CAPAB_UID, /* UID */ - CAPAB_KNOCK, /* KNOCK */ - 0, /* CLIENT */ - 0, /* IPV6 */ - 0, /* SSJ5 */ - 0, /* SN2 */ - 0, /* TOKEN */ - 0, /* VHOST */ - 0, /* SSJ3 */ - 0, /* NICK2 */ - 0, /* UMODE2 */ - 0, /* VL */ - 0, /* TLKEXT */ - 0, /* DODKEY */ - 0, /* DOZIP */ - 0, 0, 0} + { + 0, /* NOQUIT */ + 0, /* TSMODE */ + 0, /* UNCONNECT */ + 0, /* NICKIP */ + 0, /* SJOIN */ + CAPAB_ZIP, /* ZIP */ + 0, /* BURST */ + CAPAB_TS5, /* TS5 */ + 0, /* TS3 */ + 0, /* DKEY */ + 0, /* PT4 */ + 0, /* SCS */ + CAPAB_QS, /* QS */ + CAPAB_UID, /* UID */ + CAPAB_KNOCK, /* KNOCK */ + 0, /* CLIENT */ + 0, /* IPV6 */ + 0, /* SSJ5 */ + 0, /* SN2 */ + 0, /* TOKEN */ + 0, /* VHOST */ + 0, /* SSJ3 */ + 0, /* NICK2 */ + 0, /* UMODE2 */ + 0, /* VL */ + 0, /* TLKEXT */ + 0, /* DODKEY */ + 0, /* DOZIP */ + 0, 0, 0} }; -void plexus_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 'h': - update_host(user); - 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': - if (add && !nick_identified(user)) { - common_svsmode(user, "-R", NULL); - user->mode &= ~UMODE_R; - } - break; - - } +void +plexus_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 'h': + update_host (user); + 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': + if (add && !nick_identified (user)) + { + common_svsmode (user, "-R", NULL); + user->mode &= ~UMODE_R; + } + break; + + } } } @@ -207,565 +210,647 @@ void plexus_set_umode(User * user, int ac, char **av) * is_valid_op, as it always sends a -o. Breaking up the routines corrects this problem. - ThaPrince */ -int plexus_check_valid_halfop(User * user, Channel * chan, int servermode) +int +plexus_check_valid_halfop (User * user, Channel * chan, int servermode) { - if (!chan || !chan->ci) - return 1; + if (!chan || !chan->ci) + return 1; - /* They will be kicked; no need to deop, no need to update our internal struct too */ - if (chan->ci->flags & CI_VERBOTEN) - return 0; + /* They will be kicked; no need to deop, no need to update our internal struct too */ + if (chan->ci->flags & CI_VERBOTEN) + return 0; - if (servermode && !check_access(user, chan->ci, CA_AUTOHALFOP)) { - notice_lang(s_ChanServ, user, CHAN_IS_REGISTERED, s_ChanServ); - anope_cmd_mode(whosends(chan->ci), chan->name, "-h %s", - user->nick); - return 0; + if (servermode && !check_access (user, chan->ci, CA_AUTOHALFOP)) + { + notice_lang (s_ChanServ, user, CHAN_IS_REGISTERED, s_ChanServ); + anope_cmd_mode (whosends (chan->ci), chan->name, "-h %s", user->nick); + return 0; } - if (check_access(user, chan->ci, CA_AUTODEOP)) { - anope_cmd_mode(whosends(chan->ci), chan->name, "-h %s", - user->nick); - return 0; + if (check_access (user, chan->ci, CA_AUTODEOP)) + { + anope_cmd_mode (whosends (chan->ci), chan->name, "-h %s", user->nick); + return 0; } - return 1; + return 1; } -int plexus_check_valid_op(User * user, Channel * chan, int servermode) +int +plexus_check_valid_op (User * user, Channel * chan, int servermode) { - if (!chan || !chan->ci) - return 1; + if (!chan || !chan->ci) + return 1; - /* They will be kicked; no need to deop, no need to update our internal struct too */ - if (chan->ci->flags & CI_VERBOTEN) - return 0; + /* They will be kicked; no need to deop, no need to update our internal struct too */ + if (chan->ci->flags & CI_VERBOTEN) + return 0; - if (servermode && !check_access(user, chan->ci, CA_AUTOOP)) { - notice_lang(s_ChanServ, user, CHAN_IS_REGISTERED, s_ChanServ); - if (check_access(user, chan->ci, CA_AUTOHALFOP)) { - anope_cmd_mode(whosends(chan->ci), chan->name, - "-o+h %s %s", user->nick, user->nick); - } else { - anope_cmd_mode(whosends(chan->ci), chan->name, "-o %s", - user->nick); - } - return 0; + if (servermode && !check_access (user, chan->ci, CA_AUTOOP)) + { + notice_lang (s_ChanServ, user, CHAN_IS_REGISTERED, s_ChanServ); + if (check_access (user, chan->ci, CA_AUTOHALFOP)) + { + anope_cmd_mode (whosends (chan->ci), chan->name, + "-o+h %s %s", user->nick, user->nick); + } + else + { + anope_cmd_mode (whosends (chan->ci), chan->name, "-o %s", + user->nick); + } + return 0; } - if (check_access(user, chan->ci, CA_AUTODEOP)) { - anope_cmd_mode(whosends(chan->ci), chan->name, "-o %s", - user->nick); - return 0; + if (check_access (user, chan->ci, CA_AUTODEOP)) + { + anope_cmd_mode (whosends (chan->ci), chan->name, "-o %s", user->nick); + return 0; } - return 1; + return 1; } unsigned long umodes[128] = { - 0, 0, 0, /* Unused */ - 0, 0, 0, /* Unused */ - 0, 0, 0, /* Unused, Unused, Horzontal Tab */ - 0, 0, 0, /* Line Feed, Unused, Unused */ - 0, 0, 0, /* Carriage Return, Unused, Unused */ - 0, 0, 0, /* Unused */ - 0, 0, 0, /* Unused */ - 0, 0, 0, /* Unused */ - 0, 0, 0, /* Unused */ - 0, 0, 0, /* Unused */ - 0, 0, 0, /* Unused, Unused, Space */ - 0, 0, 0, /* ! " # */ - 0, 0, 0, /* $ % & */ - 0, 0, 0, /* ! ( ) */ - 0, 0, 0, /* * + , */ - 0, 0, 0, /* - . / */ - 0, 0, /* 0 1 */ - 0, 0, /* 2 3 */ - 0, 0, /* 4 5 */ - 0, 0, /* 6 7 */ - 0, 0, /* 8 9 */ - 0, 0, /* : ; */ - 0, 0, 0, /* < = > */ - 0, 0, /* ? @ */ - 0, 0, 0, /* A B C */ - 0, 0, 0, /* D E F */ - 0, 0, 0, /* G H I */ - 0, 0, 0, /* J K L */ - 0, 0, 0, /* M N O */ - 0, 0, UMODE_R, /* P Q R */ - UMODE_S, 0, 0, /* S T U */ - 0, 0, 0, /* V W X */ - 0, /* Y */ - 0, /* Z */ - 0, 0, 0, /* [ \ ] */ - 0, 0, 0, /* ^ _ ` */ - UMODE_a, UMODE_b, 0, /* a b c */ - UMODE_d, 0, 0, /* d e f */ - 0, UMODE_h, UMODE_i, /* g h i */ - 0, 0, UMODE_l, /* j k l */ - UMODE_g, UMODE_n, UMODE_o, /* m n o */ - 0, 0, 0, /* p q r */ - 0, 0, UMODE_u, /* s t u */ - 0, UMODE_w, UMODE_x, /* v w x */ - 0, /* y */ - 0, /* z */ - 0, 0, 0, /* { | } */ - 0, 0 /* ~ ‚ */ + 0, 0, 0, /* Unused */ + 0, 0, 0, /* Unused */ + 0, 0, 0, /* Unused, Unused, Horzontal Tab */ + 0, 0, 0, /* Line Feed, Unused, Unused */ + 0, 0, 0, /* Carriage Return, Unused, Unused */ + 0, 0, 0, /* Unused */ + 0, 0, 0, /* Unused */ + 0, 0, 0, /* Unused */ + 0, 0, 0, /* Unused */ + 0, 0, 0, /* Unused */ + 0, 0, 0, /* Unused, Unused, Space */ + 0, 0, 0, /* ! " # */ + 0, 0, 0, /* $ % & */ + 0, 0, 0, /* ! ( ) */ + 0, 0, 0, /* * + , */ + 0, 0, 0, /* - . / */ + 0, 0, /* 0 1 */ + 0, 0, /* 2 3 */ + 0, 0, /* 4 5 */ + 0, 0, /* 6 7 */ + 0, 0, /* 8 9 */ + 0, 0, /* : ; */ + 0, 0, 0, /* < = > */ + 0, 0, /* ? @ */ + 0, 0, 0, /* A B C */ + 0, 0, 0, /* D E F */ + 0, 0, 0, /* G H I */ + 0, 0, 0, /* J K L */ + 0, 0, 0, /* M N O */ + 0, 0, UMODE_R, /* P Q R */ + UMODE_S, 0, 0, /* S T U */ + 0, 0, 0, /* V W X */ + 0, /* Y */ + 0, /* Z */ + 0, 0, 0, /* [ \ ] */ + 0, 0, 0, /* ^ _ ` */ + UMODE_a, UMODE_b, 0, /* a b c */ + UMODE_d, 0, 0, /* d e f */ + 0, UMODE_h, UMODE_i, /* g h i */ + 0, 0, UMODE_l, /* j k l */ + UMODE_g, UMODE_n, UMODE_o, /* m n o */ + 0, 0, 0, /* p q r */ + 0, 0, UMODE_u, /* s t u */ + 0, UMODE_w, UMODE_x, /* v w x */ + 0, /* 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, - 'h', - 0, 0, 0, 0, - 0, + 0, + 0, + 0, 0, 0, + 'h', + 0, 0, 0, 0, + 0, - 'v', 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 'v', 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 'o', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 'o', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; CMMode myCmmodes[128] = { - {NULL}, {NULL}, {NULL}, - {NULL}, {NULL}, {NULL}, - {NULL}, {NULL}, {NULL}, - {NULL}, {NULL}, {NULL}, - {NULL}, {NULL}, {NULL}, - {NULL}, {NULL}, {NULL}, - {NULL}, {NULL}, {NULL}, - {NULL}, {NULL}, {NULL}, - {NULL}, {NULL}, {NULL}, - {NULL}, {NULL}, {NULL}, - {NULL}, {NULL}, {NULL}, - {NULL}, {NULL}, {NULL}, - {NULL}, {NULL}, {NULL}, - {NULL}, {NULL}, {NULL}, - {NULL}, {NULL}, {NULL}, - {NULL}, {NULL}, {NULL}, - {NULL}, {NULL}, {NULL}, - {NULL}, {NULL}, {NULL}, - {NULL}, {NULL}, {NULL}, - {NULL}, {NULL}, {NULL}, - {NULL}, {NULL}, {NULL}, - {NULL}, {NULL}, {NULL}, - {NULL}, {NULL}, {NULL}, /* BCD */ - {NULL}, {NULL}, {NULL}, /* EFG */ - {NULL}, /* H */ - {add_invite, del_invite}, - {NULL}, /* J */ - {NULL}, {NULL}, {NULL}, /* KLM */ - {NULL}, {NULL}, {NULL}, /* NOP */ - {NULL}, {NULL}, {NULL}, /* QRS */ - {NULL}, {NULL}, {NULL}, /* TUV */ - {NULL}, {NULL}, {NULL}, /* WXY */ - {NULL}, /* Z */ - {NULL}, {NULL}, /* (char 91 - 92) */ - {NULL}, {NULL}, {NULL}, /* (char 93 - 95) */ - {NULL}, /* ` (char 96) */ - {NULL}, /* a (char 97) */ - {add_ban, del_ban}, - {NULL}, - {NULL}, - {add_exception, del_exception}, - {NULL}, - {NULL}, - {NULL}, {NULL}, {NULL}, {NULL}, {NULL}, {NULL}, {NULL}, {NULL}, - {NULL}, {NULL}, {NULL}, {NULL}, {NULL}, {NULL}, {NULL}, {NULL}, - {NULL}, {NULL}, {NULL}, {NULL}, {NULL}, {NULL}, {NULL}, {NULL} + {NULL}, {NULL}, {NULL}, + {NULL}, {NULL}, {NULL}, + {NULL}, {NULL}, {NULL}, + {NULL}, {NULL}, {NULL}, + {NULL}, {NULL}, {NULL}, + {NULL}, {NULL}, {NULL}, + {NULL}, {NULL}, {NULL}, + {NULL}, {NULL}, {NULL}, + {NULL}, {NULL}, {NULL}, + {NULL}, {NULL}, {NULL}, + {NULL}, {NULL}, {NULL}, + {NULL}, {NULL}, {NULL}, + {NULL}, {NULL}, {NULL}, + {NULL}, {NULL}, {NULL}, + {NULL}, {NULL}, {NULL}, + {NULL}, {NULL}, {NULL}, + {NULL}, {NULL}, {NULL}, + {NULL}, {NULL}, {NULL}, + {NULL}, {NULL}, {NULL}, + {NULL}, {NULL}, {NULL}, + {NULL}, {NULL}, {NULL}, + {NULL}, {NULL}, {NULL}, + {NULL}, {NULL}, {NULL}, /* BCD */ + {NULL}, {NULL}, {NULL}, /* EFG */ + {NULL}, /* H */ + {add_invite, del_invite}, + {NULL}, /* J */ + {NULL}, {NULL}, {NULL}, /* KLM */ + {NULL}, {NULL}, {NULL}, /* NOP */ + {NULL}, {NULL}, {NULL}, /* QRS */ + {NULL}, {NULL}, {NULL}, /* TUV */ + {NULL}, {NULL}, {NULL}, /* WXY */ + {NULL}, /* Z */ + {NULL}, {NULL}, /* (char 91 - 92) */ + {NULL}, {NULL}, {NULL}, /* (char 93 - 95) */ + {NULL}, /* ` (char 96) */ + {NULL}, /* a (char 97) */ + {add_ban, del_ban}, + {NULL}, + {NULL}, + {add_exception, del_exception}, + {NULL}, + {NULL}, + {NULL}, {NULL}, {NULL}, {NULL}, {NULL}, {NULL}, {NULL}, {NULL}, + {NULL}, {NULL}, {NULL}, {NULL}, {NULL}, {NULL}, {NULL}, {NULL}, + {NULL}, {NULL}, {NULL}, {NULL}, {NULL}, {NULL}, {NULL}, {NULL} }; 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 */ - {CMODE_N, 0, NULL, NULL}, /* N */ - {CMODE_O, CBM_NO_USER_MLOCK, NULL, NULL}, /* 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 */ - {CMODE_Z, 0, NULL, NULL}, /* Z */ - {0}, {0}, {0}, {0}, {0}, {0}, - {CMODE_a, 0, NULL, NULL}, - {0}, /* b */ - {CMODE_c, 0, NULL, NULL}, /* c */ - {0}, /* d */ - {0}, /* e */ - {0}, /* f */ - {0}, /* g */ - {0}, /* h */ - {CMODE_i, 0, NULL, NULL}, - {0}, /* j */ - {CMODE_k, 0, 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 */ - {0}, - {CMODE_s, 0, NULL, NULL}, - {CMODE_t, 0, NULL, NULL}, - {0}, - {0}, /* v */ - {0}, /* w */ - {0}, /* x */ - {0}, /* y */ - {0}, /* z */ - {0}, {0}, {0}, {0} + {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, + {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, + {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, + {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, + {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, + {0}, {0}, {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 */ + {CMODE_N, 0, NULL, NULL}, /* N */ + {CMODE_O, CBM_NO_USER_MLOCK, NULL, NULL}, /* 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 */ + {CMODE_Z, 0, NULL, NULL}, /* Z */ + {0}, {0}, {0}, {0}, {0}, {0}, + {CMODE_a, 0, NULL, NULL}, + {0}, /* b */ + {CMODE_c, 0, NULL, NULL}, /* c */ + {0}, /* d */ + {0}, /* e */ + {0}, /* f */ + {0}, /* g */ + {0}, /* h */ + {CMODE_i, 0, NULL, NULL}, + {0}, /* j */ + {CMODE_k, 0, 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 */ + {0}, + {CMODE_s, 0, NULL, NULL}, + {CMODE_t, 0, NULL, NULL}, + {0}, + {0}, /* v */ + {0}, /* w */ + {0}, /* x */ + {0}, /* y */ + {0}, /* z */ + {0}, {0}, {0}, {0} }; CBModeInfo myCbmodeinfos[] = { - {'a', CMODE_a, 0, NULL, NULL}, - {'i', CMODE_i, 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}, - {'s', CMODE_s, 0, NULL, NULL}, - {'t', CMODE_t, 0, NULL, NULL}, - {'M', CMODE_M, 0, NULL, NULL}, - {'N', CMODE_N, 0, NULL, NULL}, - {'O', CMODE_O, 0, NULL, NULL}, - {'R', CMODE_R, 0, NULL, NULL}, - {'Z', CMODE_Z, 0, NULL, NULL}, - {0} + {'a', CMODE_a, 0, NULL, NULL}, + {'i', CMODE_i, 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}, + {'s', CMODE_s, 0, NULL, NULL}, + {'t', CMODE_t, 0, NULL, NULL}, + {'M', CMODE_M, 0, NULL, NULL}, + {'N', CMODE_N, 0, NULL, NULL}, + {'O', CMODE_O, 0, NULL, NULL}, + {'R', CMODE_R, 0, NULL, NULL}, + {'Z', CMODE_Z, 0, NULL, NULL}, + {0} }; 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 */ - {CUS_HALFOP, 0, plexus_check_valid_halfop}, - {0}, /* i */ - {0}, /* j */ - {0}, /* k */ - {0}, /* l */ - {0}, /* m */ - {0}, /* n */ - {CUS_OP, CUF_PROTECT_BOTSERV, plexus_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} + {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, + {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, + {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, + {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, + + {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, + {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, + {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, + {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, + + {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, + {0}, {0}, {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 */ + {CUS_HALFOP, 0, plexus_check_valid_halfop}, + {0}, /* i */ + {0}, /* j */ + {0}, /* k */ + {0}, /* l */ + {0}, /* m */ + {0}, /* n */ + {CUS_OP, CUF_PROTECT_BOTSERV, plexus_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} }; -void plexus_cmd_notice(char *source, char *dest, char *buf) +void +plexus_cmd_notice (char *source, char *dest, char *buf) { - if (!buf) { - return; + if (!buf) + { + return; } - if (UsePrivmsg) { - plexus_cmd_privmsg2(source, dest, buf); - } else { - send_cmd(source, "NOTICE %s :%s", dest, buf); + if (UsePrivmsg) + { + plexus_cmd_privmsg2 (source, dest, buf); + } + else + { + send_cmd (source, "NOTICE %s :%s", dest, buf); } } -void plexus_cmd_notice2(char *source, char *dest, char *msg) +void +plexus_cmd_notice2 (char *source, char *dest, char *msg) { - send_cmd(source, "NOTICE %s :%s", dest, msg); + send_cmd (source, "NOTICE %s :%s", dest, msg); } -void plexus_cmd_privmsg(char *source, char *dest, char *buf) +void +plexus_cmd_privmsg (char *source, char *dest, char *buf) { - if (!buf) { - return; + if (!buf) + { + return; } - send_cmd(source, "PRIVMSG %s :%s", dest, buf); + send_cmd (source, "PRIVMSG %s :%s", dest, buf); } -void plexus_cmd_privmsg2(char *source, char *dest, char *msg) +void +plexus_cmd_privmsg2 (char *source, char *dest, char *msg) { - send_cmd(source, "PRIVMSG %s :%s", dest, msg); + send_cmd (source, "PRIVMSG %s :%s", dest, msg); } -void plexus_cmd_serv_notice(char *source, char *dest, char *msg) +void +plexus_cmd_serv_notice (char *source, char *dest, char *msg) { - send_cmd(source, "NOTICE $$%s :%s", dest, msg); + send_cmd (source, "NOTICE $$%s :%s", dest, msg); } -void plexus_cmd_serv_privmsg(char *source, char *dest, char *msg) +void +plexus_cmd_serv_privmsg (char *source, char *dest, char *msg) { - send_cmd(source, "PRIVMSG $$%s :%s", dest, msg); + send_cmd (source, "PRIVMSG $$%s :%s", dest, msg); } -void plexus_cmd_global(char *source, char *buf) +void +plexus_cmd_global (char *source, char *buf) { - if (!buf) { - return; + if (!buf) + { + return; } - send_cmd(source ? source : ServerName, "OPERWALL :%s", buf); + send_cmd (source ? source : ServerName, "OPERWALL :%s", buf); } /* GLOBOPS - to handle old WALLOPS */ -void plexus_cmd_global_legacy(char *source, char *fmt) +void +plexus_cmd_global_legacy (char *source, char *fmt) { - send_cmd(source ? source : ServerName, "OPERWALL :%s", fmt); + send_cmd (source ? source : ServerName, "OPERWALL :%s", fmt); } -int anope_event_sjoin(char *source, int ac, char **av) +int +anope_event_sjoin (char *source, int ac, char **av) { - do_sjoin(source, ac, av); - return MOD_CONT; + do_sjoin (source, ac, av); + return MOD_CONT; } -int anope_event_nick(char *source, int ac, char **av) +int +anope_event_nick (char *source, int ac, char **av) { - if (ac != 2) { - User *user = do_nick(source, av[0], av[4], av[5], av[7], av[9], - strtoul(av[2], NULL, 10), - strtoul(av[8], NULL, 0), 0, av[6], NULL); - if (user) - anope_set_umode(user, 1, &av[3]); - } else { - do_nick(source, av[0], NULL, NULL, NULL, NULL, - strtoul(av[1], NULL, 10), 0, 0, NULL, NULL); + if (ac != 2) + { + User *user = do_nick (source, av[0], av[4], av[5], av[7], av[9], + strtoul (av[2], NULL, 10), + strtoul (av[8], NULL, 0), 0, av[6], NULL); + if (user) + anope_set_umode (user, 1, &av[3]); } - return MOD_CONT; + else + { + do_nick (source, av[0], NULL, NULL, NULL, NULL, + strtoul (av[1], NULL, 10), 0, 0, NULL, NULL); + } + return MOD_CONT; } -int anope_event_topic(char *source, int ac, char **av) +int +anope_event_topic (char *source, int ac, char **av) { - if (ac == 4) { - do_topic(source, ac, av); - } else { - Channel *c = findchan(av[0]); - time_t topic_time = time(NULL); - - if (!c) { - if (debug) { - alog("debug: TOPIC %s for nonexistent channel %s", - merge_args(ac - 1, av + 1), av[0]); - } - return MOD_CONT; - } - - if (check_topiclock(c, topic_time)) - return MOD_CONT; - - if (c->topic) { - free(c->topic); - c->topic = NULL; - } - if (ac > 1 && *av[1]) - c->topic = sstrdup(av[1]); - - strscpy(c->topic_setter, source, sizeof(c->topic_setter)); - c->topic_time = topic_time; - - record_topic(av[0]); + if (ac == 4) + { + do_topic (source, ac, av); } - return MOD_CONT; + else + { + Channel *c = findchan (av[0]); + time_t topic_time = time (NULL); + + if (!c) + { + if (debug) + { + alog ("debug: TOPIC %s for nonexistent channel %s", + merge_args (ac - 1, av + 1), av[0]); + } + return MOD_CONT; + } + + if (check_topiclock (c, topic_time)) + return MOD_CONT; + + if (c->topic) + { + free (c->topic); + c->topic = NULL; + } + if (ac > 1 && *av[1]) + c->topic = sstrdup (av[1]); + + strscpy (c->topic_setter, source, sizeof (c->topic_setter)); + c->topic_time = topic_time; + + record_topic (av[0]); + } + return MOD_CONT; } -int anope_event_tburst(char *source, int ac, char **av) +int +anope_event_tburst (char *source, int ac, char **av) { - if (ac != 5) - return MOD_CONT; - - av[0] = av[1]; - av[1] = av[3]; - av[3] = av[4]; - do_topic(source, 4, av); + if (ac != 5) return MOD_CONT; + + av[0] = av[1]; + av[1] = av[3]; + av[3] = av[4]; + do_topic (source, 4, av); + return MOD_CONT; } -int anope_event_436(char *source, int ac, char **av) +int +anope_event_436 (char *source, int ac, char **av) { - if (ac < 1) - return MOD_CONT; - - m_nickcoll(av[0]); + if (ac < 1) return MOD_CONT; -} - -/* *INDENT-OFF* */ -void moduleAddIRCDMsgs(void) { - Message *m; - - updateProtectDetails("PROTECT","PROTECTME","!protect","!deprotect","AUTOPROTECT","+","-"); - - m = createMessage("401", anope_event_null); addCoreMessage(IRCD,m); - m = createMessage("402", anope_event_null); addCoreMessage(IRCD,m); - m = createMessage("436", anope_event_436); addCoreMessage(IRCD,m); - m = createMessage("AWAY", anope_event_away); addCoreMessage(IRCD,m); - m = createMessage("INVITE", anope_event_invite); 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_notice); addCoreMessage(IRCD,m); - m = createMessage("PART", anope_event_part); addCoreMessage(IRCD,m); - m = createMessage("PASS", anope_event_pass); 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("TOPIC", anope_event_topic); addCoreMessage(IRCD,m); - m = createMessage("TBURST", anope_event_tburst); addCoreMessage(IRCD,m); - m = createMessage("USER", anope_event_null); addCoreMessage(IRCD,m); - m = createMessage("WALLOPS", anope_event_null); addCoreMessage(IRCD,m); - m = createMessage("WHOIS", anope_event_whois); addCoreMessage(IRCD,m); - m = createMessage("SVSMODE", anope_event_null); addCoreMessage(IRCD,m); - m = createMessage("SVSNICK", anope_event_null); addCoreMessage(IRCD,m); - m = createMessage("CAPAB", anope_event_capab); addCoreMessage(IRCD,m); - m = createMessage("SJOIN", anope_event_sjoin); addCoreMessage(IRCD,m); - m = createMessage("SVINFO", anope_event_svinfo); addCoreMessage(IRCD,m); - m = createMessage("EOB", anope_event_eob); addCoreMessage(IRCD,m); - m = createMessage("ADMIN", anope_event_admin); addCoreMessage(IRCD,m); - m = createMessage("ERROR", anope_event_error); addCoreMessage(IRCD,m); - m = createMessage("SETHOST", anope_event_sethost); addCoreMessage(IRCD,m); + m_nickcoll (av[0]); + return MOD_CONT; +} + + +void +moduleAddIRCDMsgs (void) +{ + Message *m; + + updateProtectDetails ("PROTECT", "PROTECTME", "!protect", "!deprotect", + "AUTOPROTECT", "+", "-"); + + m = createMessage ("401", anope_event_null); + addCoreMessage (IRCD, m); + m = createMessage ("402", anope_event_null); + addCoreMessage (IRCD, m); + m = createMessage ("436", anope_event_436); + addCoreMessage (IRCD, m); + m = createMessage ("AWAY", anope_event_away); + addCoreMessage (IRCD, m); + m = createMessage ("INVITE", anope_event_invite); + 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_notice); + addCoreMessage (IRCD, m); + m = createMessage ("PART", anope_event_part); + addCoreMessage (IRCD, m); + m = createMessage ("PASS", anope_event_pass); + 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 ("TOPIC", anope_event_topic); + addCoreMessage (IRCD, m); + m = createMessage ("TBURST", anope_event_tburst); + addCoreMessage (IRCD, m); + m = createMessage ("USER", anope_event_null); + addCoreMessage (IRCD, m); + m = createMessage ("WALLOPS", anope_event_null); + addCoreMessage (IRCD, m); + m = createMessage ("WHOIS", anope_event_whois); + addCoreMessage (IRCD, m); + m = createMessage ("SVSMODE", anope_event_null); + addCoreMessage (IRCD, m); + m = createMessage ("SVSNICK", anope_event_null); + addCoreMessage (IRCD, m); + m = createMessage ("CAPAB", anope_event_capab); + addCoreMessage (IRCD, m); + m = createMessage ("SJOIN", anope_event_sjoin); + addCoreMessage (IRCD, m); + m = createMessage ("SVINFO", anope_event_svinfo); + addCoreMessage (IRCD, m); + m = createMessage ("EOB", anope_event_eob); + addCoreMessage (IRCD, m); + m = createMessage ("ADMIN", anope_event_admin); + addCoreMessage (IRCD, m); + m = createMessage ("ERROR", anope_event_error); + addCoreMessage (IRCD, m); + m = createMessage ("SETHOST", anope_event_sethost); + addCoreMessage (IRCD, m); } -/* *INDENT-ON* */ -void plexus_cmd_sqline(char *mask, char *reason) +void +plexus_cmd_sqline (char *mask, char *reason) { - send_cmd(NULL, "RESV * %s :%s", mask, reason); + send_cmd (NULL, "RESV * %s :%s", mask, reason); } -void plexus_cmd_unsgline(char *mask) +void +plexus_cmd_unsgline (char *mask) { - /* Does not support */ + /* Does not support */ } -void plexus_cmd_unszline(char *mask) +void +plexus_cmd_unszline (char *mask) { - /* Does not support */ + /* Does not support */ } -void plexus_cmd_szline(char *mask, char *reason, char *whom) +void +plexus_cmd_szline (char *mask, char *reason, char *whom) { - /* Does not support */ + /* Does not support */ } -void plexus_cmd_svsnoop(char *server, int set) +void +plexus_cmd_svsnoop (char *server, int set) { - /* does not support */ + /* does not support */ } -void plexus_cmd_svsadmin(char *server, int set) +void +plexus_cmd_svsadmin (char *server, int set) { - plexus_cmd_svsnoop(server, set); + plexus_cmd_svsnoop (server, set); } -void plexus_cmd_sgline(char *mask, char *reason) +void +plexus_cmd_sgline (char *mask, char *reason) { - /* does not support */ + /* does not support */ } -void plexus_cmd_remove_akill(char *user, char *host) +void +plexus_cmd_remove_akill (char *user, char *host) { - send_cmd(s_OperServ, "UNKLINE * %s %s", user, host); + send_cmd (s_OperServ, "UNKLINE * %s %s", user, host); } -void plexus_cmd_topic(char *whosets, char *chan, char *whosetit, - char *topic, time_t when) +void +plexus_cmd_topic (char *whosets, char *chan, char *whosetit, + char *topic, time_t when) { - send_cmd(whosets, "SVSTOPIC %s %s %lu :%s", chan, whosetit, - (unsigned long int) when, topic); + send_cmd (whosets, "SVSTOPIC %s %s %lu :%s", chan, whosetit, + (unsigned long int) when, topic); } -void plexus_cmd_vhost_off(User * u) +void +plexus_cmd_vhost_off (User * u) { - send_cmd(NULL, "SVSMODE %s -h", u->nick); + send_cmd (NULL, "SVSMODE %s -h", u->nick); } -void plexus_cmd_vhost_on(char *nick, char *vIdent, char *vhost) +void +plexus_cmd_vhost_on (char *nick, char *vIdent, char *vhost) { - if (!nick) { - return; + if (!nick) + { + return; } - send_cmd(NULL, "SVSMODE %s +h", nick); - send_cmd(NULL, "SVSHOST %s %s", nick, vhost); + send_cmd (NULL, "SVSMODE %s +h", nick); + send_cmd (NULL, "SVSHOST %s %s", nick, vhost); } -void plexus_cmd_unsqline(char *user) +void +plexus_cmd_unsqline (char *user) { - send_cmd(NULL, "UNRESV * %s", user); + send_cmd (NULL, "UNRESV * %s", user); } -void plexus_cmd_join(char *user, char *channel, time_t chantime) +void +plexus_cmd_join (char *user, char *channel, time_t chantime) { - send_cmd(NULL, "SJOIN %ld %s + :%s", (long int) time(NULL), channel, - user); + send_cmd (NULL, "SJOIN %ld %s + :%s", (long int) time (NULL), channel, + user); } /* @@ -777,32 +862,37 @@ host: the 'host' portion of the kline reason: the reason for the kline. */ -void plexus_cmd_akill(char *user, char *host, char *who, time_t when, - time_t expires, char *reason) +void +plexus_cmd_akill (char *user, char *host, char *who, time_t when, + time_t expires, char *reason) { - send_cmd(s_OperServ, "KLINE * %ld %s %s :%s", - (long int) (expires - (long) time(NULL)), user, host, reason); + send_cmd (s_OperServ, "KLINE * %ld %s %s :%s", + (long int) (expires - (long) time (NULL)), user, host, reason); } -void plexus_cmd_svskill(char *source, char *user, char *buf) +void +plexus_cmd_svskill (char *source, char *user, char *buf) { - if (!buf) { - return; + if (!buf) + { + return; } - if (!source || !user) { - return; + if (!source || !user) + { + return; } - send_cmd(source, "KILL %s :%s", user, buf); + send_cmd (source, "KILL %s :%s", user, buf); } -void plexus_cmd_svsmode(User * u, int ac, char **av) +void +plexus_cmd_svsmode (User * u, int ac, char **av) { - send_cmd(ServerName, "SVSMODE %s %s", u->nick, av[0]); + send_cmd (ServerName, "SVSMODE %s %s", u->nick, av[0]); - if ((ac == 2) && isdigit(*av[1])) - send_cmd(ServerName, "SVSID %s %s", u->nick, av[1]); + if ((ac == 2) && isdigit (*av[1])) + send_cmd (ServerName, "SVSID %s %s", u->nick, av[1]); } /* @@ -813,9 +903,10 @@ void plexus_cmd_svsmode(User * u, int ac, char **av) * parv[3] = server is standalone or connected to non-TS only * parv[4] = server's idea of UTC time */ -void plexus_cmd_svinfo() +void +plexus_cmd_svinfo () { - send_cmd(NULL, "SVINFO 5 5 0 :%ld", (long int) time(NULL)); + send_cmd (NULL, "SVINFO 5 5 0 :%ld", (long int) time (NULL)); } /* CAPAB */ @@ -839,549 +930,652 @@ void plexus_cmd_svinfo() PARA - supports invite broadcasting for +p ENCAP - ? */ -void plexus_cmd_capab() +void +plexus_cmd_capab () { - send_cmd(NULL, - "CAPAB :QS EX CHW IE EOB KLN GLN HOPS HUB KNOCK TBURST PARA"); + send_cmd (NULL, + "CAPAB :QS EX CHW IE EOB KLN GLN HOPS HUB KNOCK TBURST PARA"); } /* PASS */ -void plexus_cmd_pass(char *pass) +void +plexus_cmd_pass (char *pass) { - send_cmd(NULL, "PASS %s :TS", pass); + send_cmd (NULL, "PASS %s :TS", pass); } /* SERVER name hop descript */ -void plexus_cmd_server(char *servname, int hop, char *descript) +void +plexus_cmd_server (char *servname, int hop, char *descript) { - send_cmd(NULL, "SERVER %s %d :%s", servname, hop, descript); + send_cmd (NULL, "SERVER %s %d :%s", servname, hop, descript); } -void plexus_cmd_connect(int servernum) +void +plexus_cmd_connect (int servernum) { - me_server = - new_server(NULL, ServerName, ServerDesc, SERVER_ISME, NULL); + me_server = new_server (NULL, ServerName, ServerDesc, SERVER_ISME, NULL); - if (servernum == 1) - plexus_cmd_pass(RemotePassword); - else if (servernum == 2) - plexus_cmd_pass(RemotePassword2); - else if (servernum == 3) - plexus_cmd_pass(RemotePassword3); + if (servernum == 1) + plexus_cmd_pass (RemotePassword); + else if (servernum == 2) + plexus_cmd_pass (RemotePassword2); + else if (servernum == 3) + plexus_cmd_pass (RemotePassword3); - plexus_cmd_capab(); - plexus_cmd_server(ServerName, 1, ServerDesc); - plexus_cmd_svinfo(); + plexus_cmd_capab (); + plexus_cmd_server (ServerName, 1, ServerDesc); + plexus_cmd_svinfo (); } -void plexus_cmd_svsinfo() +void +plexus_cmd_svsinfo () { - /* not used */ + /* not used */ } -void plexus_cmd_bot_nick(char *nick, char *user, char *host, char *real, - char *modes) +void +plexus_cmd_bot_nick (char *nick, char *user, char *host, char *real, + char *modes) { - EnforceQlinedNick(nick, NULL); - send_cmd(NULL, "NICK %s 1 %ld %s %s %s %s %s 0 :%s", nick, - (long int) time(NULL), modes, user, host, "*", ServerName, - real); - plexus_cmd_sqline(nick, "Reserved for services"); + EnforceQlinedNick (nick, NULL); + send_cmd (NULL, "NICK %s 1 %ld %s %s %s %s %s 0 :%s", nick, + (long int) time (NULL), modes, user, host, "*", ServerName, real); + plexus_cmd_sqline (nick, "Reserved for services"); } -void plexus_cmd_part(char *nick, char *chan, char *buf) +void +plexus_cmd_part (char *nick, char *chan, char *buf) { - if (buf) { - send_cmd(nick, "PART %s :%s", chan, buf); - } else { - send_cmd(nick, "PART %s", chan); + if (buf) + { + send_cmd (nick, "PART %s :%s", chan, buf); + } + else + { + send_cmd (nick, "PART %s", chan); } } -int anope_event_sethost(char *source, int ac, char **av) +int +anope_event_sethost (char *source, int ac, char **av) { - User *u; + User *u; - if (ac != 1) - return MOD_CONT; + if (ac != 1) + return MOD_CONT; - u = finduser(source); - if (!u) { - if (debug) { - alog("debug: SETHOST for nonexistent user %s", source); - } - return MOD_CONT; + u = finduser (source); + if (!u) + { + if (debug) + { + alog ("debug: SETHOST for nonexistent user %s", source); + } + return MOD_CONT; } - change_user_host(u, av[0]); - return MOD_CONT; + change_user_host (u, av[0]); + return MOD_CONT; } -int anope_event_ping(char *source, int ac, char **av) +int +anope_event_ping (char *source, int ac, char **av) { - if (ac < 1) - return MOD_CONT; - plexus_cmd_pong(ac > 1 ? av[1] : ServerName, av[0]); + if (ac < 1) return MOD_CONT; + plexus_cmd_pong (ac > 1 ? av[1] : ServerName, av[0]); + return MOD_CONT; } -int anope_event_away(char *source, int ac, char **av) +int +anope_event_away (char *source, int ac, char **av) { - if (!source) { - return MOD_CONT; + if (!source) + { + return MOD_CONT; } - m_away(source, (ac ? av[0] : NULL)); - return MOD_CONT; + m_away (source, (ac ? av[0] : NULL)); + return MOD_CONT; } -int anope_event_kill(char *source, int ac, char **av) +int +anope_event_kill (char *source, int ac, char **av) { - if (ac != 2) - return MOD_CONT; - - m_kill(av[0], av[1]); + if (ac != 2) return MOD_CONT; + + m_kill (av[0], av[1]); + return MOD_CONT; } -int anope_event_kick(char *source, int ac, char **av) +int +anope_event_kick (char *source, int ac, char **av) { - if (ac != 3) - return MOD_CONT; - do_kick(source, ac, av); + if (ac != 3) return MOD_CONT; + do_kick (source, ac, av); + return MOD_CONT; } -int anope_event_eob(char *source, int ac, char **av) +int +anope_event_eob (char *source, int ac, char **av) { - Server *s; - s = findserver(servlist, source); - /* If we found a server with the given source, that one just - * finished bursting. If there was no source, then our uplink - * server finished bursting. -GD - */ - if (!s && serv_uplink) - s = serv_uplink; - finish_sync(s, 1); + Server *s; + s = findserver (servlist, source); + /* If we found a server with the given source, that one just + * finished bursting. If there was no source, then our uplink + * server finished bursting. -GD + */ + if (!s && serv_uplink) + s = serv_uplink; + finish_sync (s, 1); - return MOD_CONT; + return MOD_CONT; } -void plexus_cmd_eob() +void +plexus_cmd_eob () { - send_cmd(ServerName, "EOB"); + send_cmd (ServerName, "EOB"); } -int anope_event_join(char *source, int ac, char **av) +int +anope_event_join (char *source, int ac, char **av) { - if (ac != 1) - return MOD_CONT; - do_join(source, ac, av); + if (ac != 1) return MOD_CONT; + do_join (source, ac, av); + return MOD_CONT; } -int anope_event_motd(char *source, int ac, char **av) +int +anope_event_motd (char *source, int ac, char **av) { - if (!source) { - return MOD_CONT; + if (!source) + { + return MOD_CONT; } - m_motd(source); - return MOD_CONT; + m_motd (source); + return MOD_CONT; } -int anope_event_privmsg(char *source, int ac, char **av) +int +anope_event_privmsg (char *source, int ac, char **av) { - if (ac != 2) - return MOD_CONT; - m_privmsg(source, av[0], av[1]); + if (ac != 2) return MOD_CONT; + m_privmsg (source, av[0], av[1]); + return MOD_CONT; } -int anope_event_part(char *source, int ac, char **av) +int +anope_event_part (char *source, int ac, char **av) { - if (ac < 1 || ac > 2) - return MOD_CONT; - do_part(source, ac, av); + if (ac < 1 || ac > 2) return MOD_CONT; + do_part (source, ac, av); + return MOD_CONT; } -int anope_event_whois(char *source, int ac, char **av) +int +anope_event_whois (char *source, int ac, char **av) { - if (source && ac >= 1) { - m_whois(source, av[0]); + if (source && ac >= 1) + { + m_whois (source, av[0]); } - return MOD_CONT; + return MOD_CONT; } /* EVENT: SERVER */ -int anope_event_server(char *source, int ac, char **av) +int +anope_event_server (char *source, int ac, char **av) { - if (!stricmp(av[1], "1")) { - uplink = sstrdup(av[0]); + if (!stricmp (av[1], "1")) + { + uplink = sstrdup (av[0]); } - do_server(source, av[0], av[1], av[2], NULL); - return MOD_CONT; + do_server (source, av[0], av[1], av[2], NULL); + return MOD_CONT; } -int anope_event_squit(char *source, int ac, char **av) +int +anope_event_squit (char *source, int ac, char **av) { - if (ac != 2) - return MOD_CONT; - do_squit(source, ac, av); + if (ac != 2) return MOD_CONT; + do_squit (source, ac, av); + return MOD_CONT; } -int anope_event_quit(char *source, int ac, char **av) +int +anope_event_quit (char *source, int ac, char **av) { - if (ac != 1) - return MOD_CONT; - do_quit(source, ac, av); + if (ac != 1) return MOD_CONT; + do_quit (source, ac, av); + return MOD_CONT; } -void plexus_cmd_372(char *source, char *msg) +void +plexus_cmd_372 (char *source, char *msg) { - send_cmd(ServerName, "372 %s :- %s", source, msg); + send_cmd (ServerName, "372 %s :- %s", source, msg); } -void plexus_cmd_372_error(char *source) +void +plexus_cmd_372_error (char *source) { - send_cmd(ServerName, "422 %s :- MOTD file not found! Please " - "contact your IRC administrator.", source); + send_cmd (ServerName, "422 %s :- MOTD file not found! Please " + "contact your IRC administrator.", source); } -void plexus_cmd_375(char *source) +void +plexus_cmd_375 (char *source) { - send_cmd(ServerName, "375 %s :- %s Message of the Day", - source, ServerName); + send_cmd (ServerName, "375 %s :- %s Message of the Day", + source, ServerName); } -void plexus_cmd_376(char *source) +void +plexus_cmd_376 (char *source) { - send_cmd(ServerName, "376 %s :End of /MOTD command.", source); + send_cmd (ServerName, "376 %s :End of /MOTD command.", source); } /* 391 */ -void plexus_cmd_391(char *source, char *timestr) +void +plexus_cmd_391 (char *source, char *timestr) { - if (!timestr) { - return; + if (!timestr) + { + return; } - send_cmd(NULL, "391 :%s %s :%s", source, ServerName, timestr); + send_cmd (NULL, "391 :%s %s :%s", source, ServerName, timestr); } /* 250 */ -void plexus_cmd_250(char *buf) +void +plexus_cmd_250 (char *buf) { - if (!buf) { - return; + if (!buf) + { + return; } - send_cmd(NULL, "250 %s ", buf); + send_cmd (NULL, "250 %s ", buf); } /* 307 */ -void plexus_cmd_307(char *buf) +void +plexus_cmd_307 (char *buf) { - if (!buf) { - return; + if (!buf) + { + return; } - send_cmd(ServerName, "307 %s ", buf); + send_cmd (ServerName, "307 %s ", buf); } /* 311 */ -void plexus_cmd_311(char *buf) +void +plexus_cmd_311 (char *buf) { - if (!buf) { - return; + if (!buf) + { + return; } - send_cmd(ServerName, "311 %s ", buf); + send_cmd (ServerName, "311 %s ", buf); } /* 312 */ -void plexus_cmd_312(char *buf) +void +plexus_cmd_312 (char *buf) { - if (!buf) { - return; + if (!buf) + { + return; } - send_cmd(ServerName, "312 %s ", buf); + send_cmd (ServerName, "312 %s ", buf); } /