From 61a23cd017465cd2bff5f037cf54e051a6318b37 Mon Sep 17 00:00:00 2001 From: "dane dane@31f1291d-b8d6-0310-a050-a5561fc1590b" Date: Mon, 23 Aug 2004 18:36:58 +0000 Subject: BUILD : 1.7.5 (327) BUGS : none NOTES : Merged anope-capab into main trunk... git-svn-id: svn://svn.anope.org/anope/trunk@327 31f1291d-b8d6-0310-a050-a5561fc1590b git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@203 5417fbe8-f217-4b02-8779-1006273d7864 --- src/Makefile | 15 +- src/actions.c | 163 +++-- src/bahamut.c | 1299 +++++++++++++++++++++++++++++++++++++++ src/botserv.c | 237 +++----- src/channels.c | 648 ++++---------------- src/chanserv.c | 939 ++++++++++++----------------- src/commands.c | 18 +- src/datafiles.c | 11 +- src/dreamforge.c | 1123 ++++++++++++++++++++++++++++++++++ src/hostserv.c | 157 ++--- src/hybrid.c | 1154 +++++++++++++++++++++++++++++++++++ src/init.c | 207 ++----- src/language.c | 3 +- src/log.c | 5 +- src/main.c | 41 +- src/messages.c | 1203 +++++-------------------------------- src/misc.c | 2 + src/modules.c | 6 +- src/modules/ircd_catserv.c | 2 +- src/mysql.c | 31 +- src/news.c | 4 +- src/nickserv.c | 350 +++++------ src/operserv.c | 680 ++++++++++----------- src/proxy.c | 36 +- src/ptlink.c | 1217 +++++++++++++++++++++++++++++++++++++ src/rageircd.c | 1273 +++++++++++++++++++++++++++++++++++++++ src/send.c | 118 ++-- src/servers.c | 167 ++++-- src/sessions.c | 30 +- src/ultimate2.c | 1318 ++++++++++++++++++++++++++++++++++++++++ src/ultimate3.c | 1427 +++++++++++++++++++++++++++++++++++++++++++ src/unreal31.c | 1340 +++++++++++++++++++++++++++++++++++++++++ src/unreal32.c | 1434 ++++++++++++++++++++++++++++++++++++++++++++ src/users.c | 519 +++++----------- src/viagra.c | 1349 +++++++++++++++++++++++++++++++++++++++++ 35 files changed, 14781 insertions(+), 3745 deletions(-) create mode 100644 src/bahamut.c create mode 100644 src/dreamforge.c create mode 100644 src/hybrid.c create mode 100644 src/ptlink.c create mode 100644 src/rageircd.c create mode 100644 src/ultimate2.c create mode 100644 src/ultimate3.c create mode 100644 src/unreal31.c create mode 100644 src/unreal32.c create mode 100644 src/viagra.c (limited to 'src') diff --git a/src/Makefile b/src/Makefile index aa2303268..3465c8e47 100644 --- a/src/Makefile +++ b/src/Makefile @@ -3,13 +3,16 @@ RDB_OBJ = $(RDB:.c=.o) OBJS = actions.o botserv.o channels.o chanserv.o commands.o compat.o converter.o \ config.o datafiles.o encrypt.o helpserv.o hostserv.o init.o language.o list.o log.o mail.o main.o \ memory.o memoserv.o messages.o misc.o modules.o news.o nickserv.o operserv.o \ - process.o protocol.o proxy.o send.o servers.o sessions.o slist.o sockutil.o \ - timeout.o users.o \ + process.o proxy.o send.o servers.o sessions.o slist.o sockutil.o \ + timeout.o users.o dreamforge.o bahamut.o unreal31.o ultimate2.o ultimate3.o \ + hybrid.o ptlink.o viagra.o rageircd.o unreal32.o \ $(VSNPRINTF_O) $(RDB_OBJ) $(MYSQL_OBJ) SRCS = actions.c botserv.c channels.c chanserv.c commands.c compat.c converter.c \ config.c datafiles.c encrypt.c helpserv.c hostserv.c init.c language.c list.c log.c mail.c main.c \ memory.c memoserv.c messages.c misc.c modules.c news.c nickserv.c operserv.c \ - process.c protocol.c proxy.c send.c servers.c sessions.c slist.c sockutil.c \ + process.c proxy.c send.c servers.c sessions.c slist.c sockutil.c \ + dreamforge.c bahamut.c unreal31.c ultimate2.c ultimate3.c \ + hybrid.c ptlink.c viagra.c rageircd.c unreal32.c \ timeout.c users.c \ $(VSNPRINTF_C) $(RDB) $(MYSQL) @@ -17,7 +20,11 @@ INCLUDES = ../include/commands.h ../include/defs.h ../include/language.h \ ../include/pseudo.h ../include/sysconf.h ../include/config.h \ ../include/encrypt.h ../include/messages.h ../include/services.h \ ../include/timeout.h ../include/datafiles.h ../include/extern.h \ - ../include/modules.h ../include/slist.h ../include/version.h + ../include/modules.h ../include/slist.h ../include/version.h \ + ../include/dreamforge.h ../include/bahamut.h ../include/ultimate2.h \ + ../include/ultimate3.h ../include/hybrid.h ../include/ptlink.h ../include/unreal31.h \ + ../include/viagra.h ../include/rageircd.h ../include/unreal32.h + MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}' 'ANOPELIBS=${ANOPELIBS}' \ 'LDFLAGS=${LDFLAGS}' 'BINDEST=${BINDEST}' 'INSTALL=${INSTALL}' \ diff --git a/src/actions.c b/src/actions.c index cb7fd0851..a863eae76 100644 --- a/src/actions.c +++ b/src/actions.c @@ -38,43 +38,12 @@ void bad_password(User * u) /*************************************************************************/ -void change_user_mode(User * u, char *modes, char *arg) -{ -#ifndef IRC_HYBRID - int ac = 1; - char *av[2]; - - av[0] = modes; - if (arg) { - av[1] = arg; - ac++; - } -#ifdef IRC_BAHAMUT - send_cmd(ServerName, "SVSMODE %s %ld %s%s%s", u->nick, u->timestamp, - av[0], (ac == 2 ? " " : ""), (ac == 2 ? av[1] : "")); -#else - send_cmd(ServerName, "SVSMODE %s %s%s%s", u->nick, av[0], - (ac == 2 ? " " : ""), (ac == 2 ? av[1] : "")); -#endif - set_umode(u, ac, av); -#endif -} - -/*************************************************************************/ - /* Remove a user from the IRC network. `source' is the nick which should * generate the kill, or NULL for a server-generated kill. */ -void kill_user(const char *source, const char *user, const char *reason) +void kill_user(char *source, char *user, char *reason) { -#ifdef IRC_BAHAMUT - /* Bahamut uses SVSKILL as a better way to kill users. It sends back - * a QUIT message that Anope uses to clean up after the kill is done. - */ - send_cmd(NULL, "SVSKILL %s :%s", user, reason); -#else - char *av[2]; char buf[BUFSIZE]; if (!user || !*user) @@ -83,13 +52,131 @@ void kill_user(const char *source, const char *user, const char *reason) source = ServerName; if (!reason) reason = ""; + snprintf(buf, sizeof(buf), "%s (%s)", source, reason); - av[0] = sstrdup(user); - av[1] = buf; - send_cmd(source, "KILL %s :%s", user, av[1]); - do_kill(source, 2, av); - free(av[0]); -#endif + + anope_cmd_svskill(source, user, buf); + + if (!ircd->quitonkill) { + do_kill(user, buf); + } +} + +/*************************************************************************/ + +void sqline(char *mask, char *reason) +{ + if (ircd->chansqline) { + if (*mask == '#') { + int i; + Channel *c, *next; + + char *av[3]; + struct c_userlist *cu, *cunext; + + anope_cmd_sqline(mask, reason); + + for (i = 0; i < 1024; i++) { + for (c = chanlist[i]; c; c = next) { + next = c->next; + + if (!match_wild_nocase(mask, c->name)) + continue; + + for (cu = c->users; cu; cu = cunext) { + cunext = cu->next; + + if (is_oper(cu->user)) + continue; + + av[0] = c->name; + av[1] = cu->user->nick; + av[2] = reason; + anope_cmd_kick(s_OperServ, av[0], av[1], + "Q-Lined: %s", av[2]); + do_kick(s_ChanServ, 3, av); + } + } + } + } else { + anope_cmd_sqline(mask, reason); + } + } else { + anope_cmd_sqline(mask, reason); + } +} + +/*************************************************************************/ + +void common_unban(ChannelInfo * ci, char *nick) +{ + int count, i; + char *av[3], **bans; + User *u; + + if (!ci || !ci->c || !ci->bi || !nick) + return; + if (!(u = finduser(nick))) + return; + + if (ircd->svsmode_unban) { + anope_cmd_unban(ci->name, nick); + } else { + av[0] = ci->name; + av[1] = sstrdup("-b"); + count = ci->c->bancount; + bans = scalloc(sizeof(char *) * count, 1); + memcpy(bans, ci->c->bans, sizeof(char *) * count); + for (i = 0; i < count; i++) { + if (match_usermask(bans[i], u)) { + anope_cmd_mode(whosends(ci), ci->name, "-b %s", bans[i]); + av[2] = bans[i]; + do_cmode(ci->bi->nick, 3, av); + } + } + free(bans); + free(av[1]); + } +} + +/*************************************************************************/ + +void common_svsmode(User * u, char *modes, char *arg) +{ + int ac = 1; + char *av[2]; + + av[0] = modes; + if (arg) { + av[1] = arg; + ac++; + } + anope_cmd_svsmode(u, ac, av); + anope_set_umode(u, ac, av); +} + +/*************************************************************************/ + +char *common_get_vhost(User * u) +{ + if (u->mode & ircd->vhostmode) { + return u->vhost; + } else { + return u->host; + } } /*************************************************************************/ + +char *common_get_vident(User * u) +{ + if (u->mode & ircd->vhostmode) { + if (u->vident) { + return u->vident; + } else { + return u->username; + } + } else { + return u->username; + } +} diff --git a/src/bahamut.c b/src/bahamut.c new file mode 100644 index 000000000..b605924d7 --- /dev/null +++ b/src/bahamut.c @@ -0,0 +1,1299 @@ +/* Bahamut functions + * + * (C) 2003 Anope Team + * Contact us at info@anope.org + * + * 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. + * + * + */ + +/*************************************************************************/ + +#include "services.h" +#include "pseudo.h" + +#ifdef IRC_BAHAMUT + +const char version_protocol[] = "BahamutIRCd 1.4.*/1.8.*"; + +IRCDVar ircd[] = { + {"BahamutIRCd 1.4.*/1.8.*", /* ircd name */ + "+o", /* nickserv mode */ + "+o", /* chanserv mode */ + "+o", /* memoserv mode */ + "+", /* hostserv mode */ + "+io", /* operserv mode */ + "+o", /* botserv mode */ + "+h", /* helpserv mode */ + "+i", /* Dev/Null mode */ + "+io", /* Global mode */ + "+o", /* nickserv alias mode */ + "+o", /* chanserv alias mode */ + "+o", /* memoserv alias mode */ + "+", /* hostserv alias mode */ + "+io", /* operserv alias mode */ + "+o", /* botserv alias mode */ + "+h", /* helpserv alias mode */ + "+i", /* Dev/Null alias mode */ + "+io", /* Global alias mode */ + "+", /* Used by BotServ Bots */ + 2, /* Chan Max Symbols */ + "-ciklmnpstOR", /* Modes to Remove */ + "+o", /* Channel Umode used by Botserv bots */ + 1, /* SVSNICK */ + 0, /* Vhost */ + 0, /* Has Owner */ + NULL, /* Mode to set for an owner */ + NULL, /* Mode to unset for an owner */ + "+rd", /* Mode On Reg */ + "-r+d", /* Mode on UnReg */ + "+d", /* Mode on Nick Change */ + 1, /* Supports SGlines */ + 1, /* Supports SQlines */ + 1, /* Supports SZlines */ + 0, /* 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 */ + 1, /* Quit on Kill */ + 1, /* SVSMODE unban */ + 0, /* Has Protect */ + 0, /* Reverse */ + 1, /* Chan Reg */ + CMODE_r, /* Channel Mode */ + 0, /* vidents */ + 1, /* svshold */ + 1, /* time stamp on mode */ + 1, /* NICKIP */ + 0, /* UMODE */ + 0, /* O:LINE */ + 0, /* VHOST ON NICK */ + 0, /* Change RealName */ + 0, /* ChanServ extra */ + 0, /* No Knock */ + 0, /* Admin Only */ + DEFAULT_MLOCK, /* Default MLOCK */ + 0, /* Vhost Mode */ + 0, /* +f */ + 0, /* +L */ + 0, /* Mode */ + 0, /* Mode */ + 1, + + } + , + {NULL} +}; + +IRCDCAPAB ircdcap[] = { + { + CAPAB_NOQUIT, /* NOQUIT */ + CAPAB_TSMODE, /* TSMODE */ + CAPAB_UNCONNECT, /* UNCONNECT */ + 0, /* NICKIP */ + 0, /* SJOIN */ + 0, /* ZIP */ + CAPAB_BURST, /* BURST */ + 0, /* TS5 */ + 0, /* TS3 */ + CAPAB_DKEY, /* DKEY */ + 0, /* PT4 */ + 0, /* SCS */ + 0, /* QS */ + 0, /* UID */ + 0, /* 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 */ + CAPAB_DOZIP /* DOZIP */ + } +}; + + +void anope_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) { + + add ? (user->mode |= umodes[(int) *modes]) : (user->mode &= + ~umodes[(int) + *modes]); + + switch (*modes++) { + case '+': + add = 1; + break; + case '-': + add = 0; + break; + case 'a': + if (add && !is_services_admin(user)) { + send_cmd(ServerName, "SVSMODE %s -a", user->nick); + user->mode &= ~UMODE_a; + } + break; + case 'd': + if (ac == 0) { + alog("user: umode +d with no parameter (?) for user %s", + user->nick); + break; + } + + ac--; + av++; + user->svid = strtoul(*av, NULL, 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': + if (add && !nick_identified(user)) { + send_cmd(ServerName, "SVSMODE %s -r", user->nick); + user->mode &= ~UMODE_r; + } + break; + } + } +} + + + + +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, UMODE_A, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, + 0, + UMODE_R, + 0, 0, 0, 0, 0, 0, 0, + 0, + 0, 0, 0, 0, 0, + 0, UMODE_a, 0, 0, 0, 0, 0, + 0, + UMODE_h, UMODE_i, 0, 0, 0, 0, 0, UMODE_o, + 0, + 0, UMODE_r, 0, 0, 0, 0, UMODE_w, + 0, + 0, + 0, + 0, 0, 0, 0, 0 +}; + +char csmodes[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, + + '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, + + 0, 0, 0, 0, 0, 0, 0, 0, 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 cmmodes[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}, {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}, + {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 cbmodes[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}, /* N */ + {CMODE_O, CBM_NO_USER_MLOCK, NULL, NULL}, + {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 */ + {CMODE_c, 0, NULL, NULL}, + {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 */ + {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}, /* z */ + {0}, {0}, {0}, {0} +}; + +CBModeInfo cbmodeinfos[] = { + {'c', CMODE_c, 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}, + {'r', CMODE_r, 0, NULL, NULL}, + {'s', CMODE_s, 0, NULL, NULL}, + {'t', CMODE_t, 0, NULL, NULL}, + {'M', CMODE_M, 0, NULL, NULL}, + {'O', CMODE_O, 0, NULL, NULL}, + {0} +}; + +CUMode cumodes[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} +}; + + + +void anope_cmd_mode(char *source, char *dest, const char *fmt, ...) +{ + va_list args; + char buf[BUFSIZE]; + + va_start(args, fmt); + vsnprintf(buf, sizeof(buf), fmt, args); + + if (ircdcap->tsmode) { + if (uplink_capab & ircdcap->tsmode) { + send_cmd(source, "MODE %s 0 %s", dest, buf); + } else { + send_cmd(source, "MODE %s %s", dest, buf); + } + } else { + send_cmd(source, "MODE %s %s", dest, buf); + } +} + +/* SVSHOLD - set */ +void anope_cmd_svshold(char *nick) +{ + send_cmd(ServerName, "SVSHOLD %s %d :%s", nick, NSReleaseTimeout, + "Being held for registered user"); +} + +/* SVSHOLD - release */ +void anope_cmd_relase_svshold(char *nick) +{ + send_cmd(ServerName, "SVSHOLD %s 0", nick); +} + +/* SVSMODE -b */ +void anope_cmd_unban(char *name, char *nick) +{ + send_cmd(ServerName, "SVSMODE %s -b %s", name, nick); +} + +void anope_cmd_bot_chan_mode(char *nick, char *chan) +{ + anope_cmd_mode(nick, chan, "%s %s", ircd->botchanumode, nick); +} + +/* EVENT: SJOIN */ +int anope_event_sjoin(char *source, int ac, char **av) +{ + do_sjoin(source, ac, av); + return MOD_CONT; +} + +/* +** NICK - new +** source = NULL +** parv[0] = nickname +** parv[1] = hopcount +** parv[2] = timestamp +** parv[3] = modes +** parv[4] = username +** parv[5] = hostname +** parv[6] = server +** parv[7] = servicestamp +** parv[8] = IP +** parv[9] = info +** NICK - change +** source = oldnick +** parv[0] = new nickname +** parv[1] = hopcount +*/ +int anope_event_nick(char *source, int ac, char **av) +{ + User *user; + + if (ac != 2) { + user = do_nick(source, av[0], av[4], av[5], av[6], av[9], + strtoul(av[2], NULL, 10), strtoul(av[7], NULL, 0), + strtoul(av[8], NULL, 0), NULL, 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); + } + return MOD_CONT; +} + +/* EVENT : CAPAB */ +int anope_event_capab(char *source, int ac, char **av) +{ + capab_parse(ac, av); + return MOD_CONT; +} + +/* EVENT : OS */ +int anope_event_os(char *source, int ac, char **av) +{ + if (ac < 1) + return MOD_CONT; + m_privmsg(source, av[0], av[1]); + return MOD_CONT; +} + +/* EVENT : NS */ +int anope_event_ns(char *source, int ac, char **av) +{ + if (ac < 1) + return MOD_CONT; + m_privmsg(source, av[0], av[1]); + return MOD_CONT; +} + +/* EVENT : MS */ +int anope_event_ms(char *source, int ac, char **av) +{ + if (ac < 1) + return MOD_CONT; + m_privmsg(source, av[0], av[1]); + return MOD_CONT; +} + +/* EVENT : HS */ +int anope_event_hs(char *source, int ac, char **av) +{ + if (ac < 1) + return MOD_CONT; + m_privmsg(source, av[0], av[1]); + return MOD_CONT; +} + +/* EVENT : CS */ +int anope_event_cs(char *source, int ac, char **av) +{ + if (ac < 1) + return MOD_CONT; + m_privmsg(source, av[0], av[1]); + return MOD_CONT; +} + +int anope_event_436(char *source, int ac, char **av) +{ + if (ac < 1) + return MOD_CONT; + + m_nickcoll(av[0]); + return MOD_CONT; +} + +/* *INDENT-OFF* */ +void moduleAddIRCDMsgs(void) { + Message *m; + + m = createMessage("401", 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", 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", NULL); addCoreMessage(IRCD,m); + m = createMessage("PART", anope_event_part); addCoreMessage(IRCD,m); + m = createMessage("PASS", NULL); 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("USER", NULL); addCoreMessage(IRCD,m); + m = createMessage("WALLOPS", NULL); addCoreMessage(IRCD,m); + m = createMessage("WHOIS", anope_event_whois); addCoreMessage(IRCD,m); + m = createMessage("AKILL", NULL); addCoreMessage(IRCD,m); + m = createMessage("GLOBOPS", NULL); addCoreMessage(IRCD,m); + m = createMessage("GNOTICE", NULL); addCoreMessage(IRCD,m); + m = createMessage("GOPER", NULL); addCoreMessage(IRCD,m); + m = createMessage("RAKILL", NULL); addCoreMessage(IRCD,m); + m = createMessage("SILENCE", NULL); addCoreMessage(IRCD,m); + m = createMessage("SVSKILL", NULL); addCoreMessage(IRCD,m); + m = createMessage("SVSMODE", NULL); addCoreMessage(IRCD,m); + m = createMessage("SVSNICK", NULL); addCoreMessage(IRCD,m); + m = createMessage("SVSNOOP", NULL); addCoreMessage(IRCD,m); + m = createMessage("SQLINE", NULL); addCoreMessage(IRCD,m); + m = createMessage("UNSQLINE", NULL); addCoreMessage(IRCD,m); + m = createMessage("CAPAB", anope_event_capab); addCoreMessage(IRCD,m); + m = createMessage("CS", anope_event_cs); addCoreMessage(IRCD,m); + m = createMessage("HS", anope_event_hs); addCoreMessage(IRCD,m); + m = createMessage("MS", anope_event_ms); addCoreMessage(IRCD,m); + m = createMessage("NS", anope_event_ns); addCoreMessage(IRCD,m); + m = createMessage("OS", anope_event_os); addCoreMessage(IRCD,m); + m = createMessage("RS", NULL); addCoreMessage(IRCD,m); + m = createMessage("SGLINE", NULL); addCoreMessage(IRCD,m); + m = createMessage("SJOIN", anope_event_sjoin); addCoreMessage(IRCD,m); + m = createMessage("SS", NULL); addCoreMessage(IRCD,m); + m = createMessage("SVINFO", anope_event_svinfo); addCoreMessage(IRCD,m); + m = createMessage("SZLINE", NULL); addCoreMessage(IRCD,m); + m = createMessage("UNSGLINE", NULL); addCoreMessage(IRCD,m); + m = createMessage("UNSZLINE", NULL); addCoreMessage(IRCD,m); +} + +/* *INDENT-ON* */ + +/* SQLINE */ +void anope_cmd_sqline(char *mask, char *reason) +{ + if (!mask || !reason) { + return; + } + + send_cmd(NULL, "SQLINE %s :%s", mask, reason); +} + +/* UNSGLINE */ +void anope_cmd_unsgline(char *mask) +{ + send_cmd(NULL, "UNSGLINE 0 :%s", mask); +} + +/* UNSZLINE */ +void anope_cmd_unszline(char *mask) +{ + send_cmd(NULL, "UNSZLINE 0 %s", mask); +} + +/* SZLINE */ +void anope_cmd_szline(char *mask, char *reason) +{ + send_cmd(NULL, "SZLINE %s :%s", mask, reason); +} + +/* SVSNOOP */ +void anope_cmd_svsnoop(char *server, int set) +{ + send_cmd(NULL, "SVSNOOP %s %s", server, (set ? "+" : "-")); +} + +/* SGLINE */ +void anope_cmd_sgline(char *mask, char *reason) +{ + send_cmd(NULL, "SGLINE %d :%s:%s", strlen(mask), mask, reason); +} + +/* RAKILL */ +void anope_cmd_remove_akill(char *user, char *host) +{ + send_cmd(NULL, "RAKILL %s %s", host, user); +} + +/* PART */ +void anope_cmd_part(char *nick, char *chan, const char *fmt, ...) +{ + va_list args; + char buf[BUFSIZE]; + + va_start(args, fmt); + vsnprintf(buf, sizeof(buf), fmt, args); + + if (!nick || !chan) { + return; + } + + if (buf) { + send_cmd(nick, "PART %s :%s", chan, buf); + } else { + send_cmd(nick, "PART %s", chan); + } +} + +/* TOPIC */ +void anope_cmd_topic(char *whosets, char *chan, char *whosetit, + char *topic, time_t when) +{ + send_cmd(whosets, "TOPIC %s %s %lu :%s", chan, whosetit, when, topic); +} + +/* UNSQLINE */ +void anope_cmd_unsqline(char *user) +{ + send_cmd(NULL, "UNSQLINE %s", user); +} + +/* JOIN - SJOIN */ +void anope_cmd_join(char *user, char *channel, time_t chantime) +{ + send_cmd(user, "SJOIN %ld %s", chantime, channel); +} + +/* AKILL */ +/* parv[1]=host + * parv[2]=user + * parv[3]=length + * parv[4]=akiller + * parv[5]=time set + * parv[6]=reason + */ +void anope_cmd_akill(char *user, char *host, char *who, time_t when, + time_t expires, char *reason) +{ + send_cmd(NULL, "AKILL %s %s %d %s %ld :%s", host, user, 86400 * 2, who, + time(NULL), reason); +} + +/* SVSKILL */ +/* parv[0] = servername + * parv[1] = client + * parv[2] = nick stamp + * parv[3] = kill message + */ +/* + Note: if the stamp is null 0, the below usage is correct of Bahamut +*/ +void anope_cmd_svskill(char *source, char *user, const char *fmt, ...) +{ + va_list args; + char buf[BUFSIZE]; + + if (!source || !user) { + return; + } + + va_start(args, fmt); + vsnprintf(buf, sizeof(buf), fmt, args); + + send_cmd(source, "SVSKILL %s :%s", user, buf); +} + +/* SVSMODE */ +/* parv[0] - sender + * parv[1] - nick + * parv[2] - TS (or mode, depending on svs version) + * parv[3] - mode (or services id if old svs version) + * parv[4] - optional arguement (services id) + */ +void anope_cmd_svsmode(User * u, int ac, char **av) +{ + send_cmd(ServerName, "SVSMODE %s %ld %s%s%s", u->nick, u->timestamp, + av[0], (ac == 2 ? " " : ""), (ac == 2 ? av[1] : "")); +} + +/* SQUIT */ +void anope_cmd_squit(char *servname, char *message) +{ + send_cmd(servname, "SQUIT %s :%s", servname, message); +} + +/* PONG */ +void anope_cmd_pong(char *servname, char *who) +{ + send_cmd(servname, "PONG %s", who); +} + +void anope_cmd_connect(int servernum) +{ + if (servernum == 1) { + anope_cmd_pass(RemotePassword); + } else if (servernum == 2) { + anope_cmd_pass(RemotePassword2); + } else if (servernum == 3) { + anope_cmd_pass(RemotePassword3); + } + anope_cmd_capab(); + anope_cmd_server(ServerName, 1, ServerDesc); + anope_cmd_svinfo(); +} + +/* SVINFO */ +void anope_cmd_svinfo() +{ + send_cmd(NULL, "SVINFO 3 1 0 :%ld", time(NULL)); +} + +/* PASS */ +void anope_cmd_pass(char *pass) +{ + send_cmd(NULL, "PASS %s :TS", pass); +} + +/* SERVER */ +void anope_cmd_server(char *servname, int hop, char *descript) +{ + send_cmd(NULL, "SERVER %s %d :%s", ServerName, hop, ServerDesc); +} + +/* CAPAB */ +void anope_cmd_capab() +{ + send_cmd(NULL, "CAPAB NICKIP SSJOIN TS3 NOQUIT TSMODE UNCONNECT"); +} + +/* EVENT : SERVER */ +int anope_event_server(char *source, int ac, char **av) +{ + char *uplink; + + if (!stricmp(av[1], "1")) { + uplink = sstrdup(av[0]); + } + + do_server(source, ac, av); + return MOD_CONT; +} + +/* EVENT : PRIVMSG */ +int anope_event_privmsg(char *source, int ac, char **av) +{ + if (ac != 2) + return MOD_CONT; + m_privmsg(source, av[0], av[1]); + return MOD_CONT; +} + +/* EVENT : SVINFO */ +/* + * parv[0] = sender prefix + * parv[1] = TS_CURRENT for the server + * parv[2] = TS_MIN for the server + * parv[3] = server is standalone or connected to non-TS only + * parv[4] = server's idea of UTC time + */ +int anope_event_svinfo(char *source, int ac, char **av) +{ + return MOD_CONT; +} + + +int anope_event_part(char *source, int ac, char **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) +{ + if (source && ac >= 1) { + m_whois(source, av[0]); + } + return MOD_CONT; +} + +int anope_event_topic(char *source, int ac, char **av) +{ + if (ac != 4) + return MOD_CONT; + do_topic(source, ac, av); + return MOD_CONT; +} + +int anope_event_squit(char *source, int ac, char **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) +{ + if (ac != 1) + return MOD_CONT; + do_quit(source, ac, av); + return MOD_CONT; +} + +/* EVENT: MODE */ +int anope_event_mode(char *source, int ac, char **av) +{ + if (ac < 2) + return MOD_CONT; + + if (*av[0] == '#' || *av[0] == '&') { + do_cmode(source, ac, av); + } else { + do_umode(source, ac, av); + } + return MOD_CONT; +} + +/* EVENT: KILL */ +int anope_event_kill(char *source, int ac, char **av) +{ + if (ac != 2) + return MOD_CONT; + + m_kill(av[0], av[1]); + return MOD_CONT; +} + +/* EVENT: KICK */ +int anope_event_kick(char *source, int ac, char **av) +{ + if (ac != 3) + return MOD_CONT; + do_kick(source, ac, av); + return MOD_CONT; +} + +/* EVENT: JOIN */ +int anope_event_join(char *source, int ac, char **av) +{ + if (ac != 1) + return MOD_CONT; + do_join(source, ac, av); + return MOD_CONT; +} + +/* EVENT: MOTD */ +int anope_event_motd(char *source, int ac, char **av) +{ + if (!source) { + return MOD_CONT; + } + + m_motd(source); + return MOD_CONT; +} + +void anope_cmd_notice_ops(char *source, char *dest, const char *fmt, ...) +{ + va_list args; + char buf[BUFSIZE]; + + va_start(args, fmt); + vsnprintf(buf, sizeof(buf), fmt, args); + send_cmd(NULL, "NOTICE @%s :%s", dest, buf); +} + +/* NOTICE */ +void anope_cmd_notice(char *source, char *dest, const char *fmt, ...) +{ + va_list args; + char buf[BUFSIZE]; + + va_start(args, fmt); + vsnprintf(buf, sizeof(buf), fmt, args); + + if (UsePrivmsg) { + anope_cmd_privmsg2(source, dest, buf); + } else { + send_cmd(source, "NOTICE %s :%s", dest, buf); + } +} + +void anope_cmd_notice2(char *source, char *dest, char *msg) +{ + send_cmd(source, "NOTICE %s :%s", dest, msg); +} + +void anope_cmd_privmsg(char *source, char *dest, const char *fmt, ...) +{ + va_list args; + char buf[BUFSIZE]; + + va_start(args, fmt); + vsnprintf(buf, sizeof(buf), fmt, args); + + send_cmd(source, "PRIVMSG %s :%s", dest, buf); +} + +void anope_cmd_privmsg2(char *source, char *dest, char *msg) +{ + send_cmd(source, "PRIVMSG %s :%s", dest, msg); +} + +void anope_cmd_serv_notice(char *source, char *dest, char *msg) +{ + send_cmd(source, "NOTICE $%s :%s", dest, msg); +} + +void anope_cmd_serv_privmsg(char *source, char *dest, char *msg) +{ + send_cmd(source, "PRIVMSG $%s :%s", dest, msg); +} + +/* GLOBOPS */ +void anope_cmd_global(char *source, const char *fmt, ...) +{ + va_list args; + char buf[BUFSIZE]; + + va_start(args, fmt); + vsnprintf(buf, sizeof(buf), fmt, args); + + send_cmd(source ? source : ServerName, "GLOBOPS :%s", buf); +} + +/* 391 */ +void anope_cmd_391(char *source, char *timestr) +{ + if (!timestr) { + return; + } + send_cmd(NULL, "391 :%s %s :%s", source, ServerName, timestr); +} + +/* 250 */ +void anope_cmd_250(const char *fmt, ...) +{ + va_list args; + char buf[BUFSIZE]; + + va_start(args, fmt); + vsnprintf(buf, sizeof(buf), fmt, args); + + send_cmd(NULL, "250 %s ", buf); +} + +/* 307 */ +void anope_cmd_307(const char *fmt, ...) +{ + va_list args; + char buf[BUFSIZE]; + + va_start(args, fmt); + vsnprintf(buf, sizeof(buf), fmt, args); + + send_cmd(ServerName, "307 %s ", buf); +} + +/* 311 */ +void anope_cmd_311(const char *fmt, ...) +{ + va_list args; + char buf[BUFSIZE]; + + va_start(args, fmt); + vsnprintf(buf, sizeof(buf), fmt, args); + + send_cmd(ServerName, "311 %s ", buf); +} + +/* 312 */ +void anope_cmd_312(const char *fmt, ...) +{ + va_list args; + char buf[BUFSIZE]; + + va_start(args, fmt); + vsnprintf(buf, sizeof(buf), fmt, args); + + send_cmd(ServerName, "312 %s ", buf); +} + +/* 317 */ +void anope_cmd_317(const char *fmt, ...) +{ + va_list args; + char buf[BUFSIZE]; + + va_start(args, fmt); + vsnprintf(buf, sizeof(buf), fmt, args); + + send_cmd(ServerName, "317 %s ", buf); +} + +/* 219 */ +void anope_cmd_219(char *source, char *letter) +{ + if (!source) { + return; + } + + if (letter) { + send_cmd(NULL, "219 %s %c :End of /STATS report.", source, + *letter); + } else { + send_cmd(NULL, "219 %s l :End of /STATS report.", source); + } +} + +/* 401 */ +void anope_cmd_401(char *source, char *who) +{ + if (!source || !who) { + return; + } + send_cmd(ServerName, "401 %s %s :No such service.", source, who); +} + +/* 318 */ +void anope_cmd_318(char *source, char *who) +{ + if (!source || !who) { + return; + } + + send_cmd(ServerName, "318 %s %s :End of /WHOIS list.", source, who); +} + +/* 242 */ +void anope_cmd_242(const char *fmt, ...) +{ + va_list args; + char buf[BUFSIZE]; + + va_start(args, fmt); + vsnprintf(buf, sizeof(buf), fmt, args); + send_cmd(NULL, "242 %s ", buf); +} + +/* 243 */ +void anope_cmd_243(const char *fmt, ...) +{ + va_list args; + char buf[BUFSIZE]; + + va_start(args, fmt); + vsnprintf(buf, sizeof(buf), fmt, args); + + send_cmd(NULL, "243 %s ", buf); +} + +/* 211 */ +void anope_cmd_211(const char *fmt, ...) +{ + va_list args; + char buf[BUFSIZE]; + + va_start(args, fmt); + vsnprintf(buf, sizeof(buf), fmt, args); + send_cmd(NULL, "211 %s ", buf); +} + +void anope_cmd_nick(char *nick, char *name, char *modes) +{ + send_cmd(NULL, "NICK %s 1 %ld %s %s %s %s 0 0 :%s", nick, time(NULL), + modes, ServiceUser, ServiceHost, ServerName, name); + anope_cmd_sqline(nick, "Reserved for services"); +} + +void anope_cmd_kick(char *source, char *chan, char *user, const char *fmt, + ...) +{ + va_list args; + char buf[BUFSIZE]; + + va_start(args, fmt); + vsnprintf(buf, sizeof(buf), fmt, args); + + if (buf) { + send_cmd(source, "KICK %s %s :%s", chan, user, buf); + } else { + send_cmd(source, "KICK %s %s", chan, user); + } +} + +void anope_cmd_372(char *source, char *msg) +{ + send_cmd(ServerName, "372 %s :- %s", source, msg); +} + +void anope_cmd_372_error(char *source) +{ + send_cmd(ServerName, "372 %s :- MOTD file not found! Please " + "contact your IRC administrator.", source); +} + +void anope_cmd_375(char *source) +{ + send_cmd(ServerName, "375 %s :- %s Message of the Day", + source, ServerName); +} + +void anope_cmd_376(char *source) +{ + send_cmd(ServerName, "376 %s :End of /MOTD command.", source); +} + +/* INVITE */ +void anope_cmd_invite(char *source, char *chan, char *nick) +{ + if (!source || !chan || !nick) { + return; + } + + send_cmd(source, "INVITE %s %s", nick, chan); +} + +/* QUIT */ +void anope_cmd_quit(char *source, const char *fmt, ...) +{ + va_list args; + char buf[BUFSIZE]; + + va_start(args, fmt); + vsnprintf(buf, sizeof(buf), fmt, args); + + if (buf) { + send_cmd(source, "QUIT :%s", buf); + } else { + send_cmd(source, "QUIT"); + } +} + +int anope_event_away(char *source, int ac, char **av) +{ + if (ac < 1) + return MOD_CONT; + + if (!source) { + return MOD_CONT; + } + m_away(source, av[0]); + return MOD_CONT; +} + +int anope_event_ping(char *source, int ac, char **av) +{ + if (ac < 1) + return MOD_CONT; + anope_cmd_pong(ac > 1 ? av[1] : ServerName, av[0]); + return MOD_CONT; +} + +void anope_cmd_351(char *source) +{ + send_cmd(ServerName, "351 %s Anope-%s %s :%s - %s -- %s", + source, version_number, ServerName, ircd->name, version_flags, + version_build); +} + +void anope_cmd_bot_nick(char *nick, char *user, char *host, char *real, + char *modes) +{ + send_cmd(NULL, "NICK %s 1 %ld %s %s %s %s 0 0 :%s", nick, time(NULL), + modes, user, host, ServerName, real); + anope_cmd_sqline(nick, "Reserved for services"); +} + +/* SVSNICK */ +/* parv[0] = sender + * parv[1] = old nickname + * parv[2] = new nickname + * parv[3] = timestamp + */ +void anope_cmd_svsnick(char *source, char *guest, time_t when) +{ + if (!source || !guest) { + return; + } + send_cmd(NULL, "SVSNICK %s %s :%ld", source, guest, when); +} + +void anope_cmd_guest_nick(char *nick, char *user, char *host, char *real, + char *modes) +{ + send_cmd(NULL, "NICK %s 1 %ld %s %s %s %s 0 0 :%s", nick, time(NULL), + modes, user, host, ServerName, real); +} + +void anope_cmd_svso(char *source, char *nick, char *flag) +{ + /* Not Supported by this IRCD */ +} + +void anope_cmd_vhost_on(char *nick, char *vIdent, char *vhost) +{ + /* Not Supported by this IRCD */ +} + +void anope_cmd_vhost_off(char *nick) +{ + /* Not Supported by this IRCD */ +} + +/* SVSMODE +d */ +/* sent if svid is something weird */ +void anope_cmd_svid_umode(char *nick, time_t ts) +{ + send_cmd(ServerName, "SVSMODE %s %lu +d 1", nick, ts); +} + + +/* SVSMODE +d */ +/* nc_change was = 1, and there is no na->status */ +void anope_cmd_nc_change(User * u) +{ + common_svsmode(u, "+d", "1"); +} + +/* SVSMODE +d */ +void anope_cmd_svid_umode2(User * u, char *ts) +{ + // not used by bahamut ircds +} + + +void anope_cmd_svid_umode3(User * u, char *ts) +{ + if (u->svid != u->timestamp) { + common_svsmode(u, "+rd", ts); + } else { + common_svsmode(u, "+r", NULL); + } +} + +#endif diff --git a/src/botserv.c b/src/botserv.c index b8710672b..361662a31 100644 --- a/src/botserv.c +++ b/src/botserv.c @@ -46,7 +46,6 @@ static void bot_raw_kick(User * requester, ChannelInfo * ci, char *nick, char *reason); static void bot_raw_mode(User * requester, ChannelInfo * ci, char *mode, char *nick); -static void bot_raw_unban(ChannelInfo * ci, char *nick); static int do_help(User * u); static int do_bot(User * u); @@ -222,20 +221,9 @@ void botchanmsgs(User * u, ChannelInfo * ci, char *buf) cstatus = chan_get_user_status(ci->c, u); if (buf && !check_access(u, ci, CA_NOKICK) && -#ifdef HAS_HALFOP -#if defined(IRC_UNREAL) || defined (IRC_VIAGRA) (!(ci->botflags & BS_DONTKICKOPS) || !(cstatus & (CUS_HALFOP | CUS_OP | CUS_OWNER | CUS_PROTECT))) -# elif defined (IRC_ULTIMATE3) || defined(IRC_RAGE2) - (!(ci->botflags & BS_DONTKICKOPS) - || !(cstatus & (CUS_HALFOP | CUS_OP | CUS_PROTECT))) -# else - (!(ci->botflags & BS_DONTKICKOPS) - || !(cstatus & (CUS_HALFOP | CUS_OP))) -# endif -#else - (!(ci->botflags & BS_DONTKICKOPS) || !(cstatus & CUS_OP)) -#endif + && (!(ci->botflags & BS_DONTKICKVOICES) || !(cstatus & CUS_VOICE))) { /* Bolds kicker */ if ((ci->botflags & BS_KICK_BOLDS) && strchr(buf, 2)) { @@ -466,13 +454,10 @@ void botchanmsgs(User * u, ChannelInfo * ci, char *buf) cmd = strtok(buf, " "); if (cmd) { -#if defined(IRC_UNREAL) || defined (IRC_VIAGRA) - if (!stricmp(cmd, "!deowner")) { + if (!stricmp(cmd, "!deowner") && ircd->owner) { if (is_founder(u, ci)) bot_raw_mode(u, ci, "-q", u->nick); - } else -#endif - if (!stricmp(cmd, "!kb")) { + } else if (!stricmp(cmd, "!kb")) { char *target = strtok(NULL, " "); char *reason = strtok(NULL, ""); @@ -502,11 +487,9 @@ void botchanmsgs(User * u, ChannelInfo * ci, char *buf) else bot_raw_kick(u, ci, target, reason); } -#if defined(IRC_UNREAL) || defined (IRC_VIAGRA) - } else if (!stricmp(cmd, "!owner")) { + } else if (!stricmp(cmd, "!owner") && ircd->owner) { if (is_founder(u, ci)) bot_raw_mode(u, ci, "+q", u->nick); -#endif } else if (!stricmp(cmd, "!seen")) { char *target = strtok(NULL, " "); char buf[BUFSIZE]; @@ -520,16 +503,16 @@ void botchanmsgs(User * u, ChannelInfo * ci, char *buf) /* If we look for the bot */ snprintf(buf, sizeof(buf), getstring(u->na, BOT_SEEN_BOT), u->nick); - send_cmd(ci->bi->nick, "PRIVMSG %s :%s", ci->name, - buf); + anope_cmd_privmsg(ci->bi->nick, ci->name, "%s", + buf); } else if (!(na = findnick(target)) || (na->status & NS_VERBOTEN)) { /* If the nick is not registered or forbidden */ snprintf(buf, sizeof(buf), getstring(u->na, BOT_SEEN_UNKNOWN), target); - send_cmd(ci->bi->nick, "PRIVMSG %s :%s", ci->name, - buf); + anope_cmd_privmsg(ci->bi->nick, ci->name, "%s", + buf); } else if ((u2 = nc_on_chan(ci->c, na->nc))) { /* If the nick we're looking for is on the channel, * there are three possibilities: it's yourself, @@ -549,8 +532,8 @@ void botchanmsgs(User * u, ChannelInfo * ci, char *buf) getstring(u->na, BOT_SEEN_ON_CHANNEL_AS), target, u2->nick); - send_cmd(ci->bi->nick, "PRIVMSG %s :%s", ci->name, - buf); + anope_cmd_privmsg(ci->bi->nick, ci->name, "%s", + buf); } else if ((access = get_access_entry(na->nc, ci))) { /* User is on the access list but not present actually. Special case: if access->last_seen is 0 it's that we @@ -568,15 +551,15 @@ void botchanmsgs(User * u, ChannelInfo * ci, char *buf) getstring(u->na, BOT_SEEN_NEVER), target); } - send_cmd(ci->bi->nick, "PRIVMSG %s :%s", ci->name, - buf); + anope_cmd_privmsg(ci->bi->nick, ci->name, "%s", + buf); } else { /* All other cases */ snprintf(buf, sizeof(buf), getstring(u->na, BOT_SEEN_UNKNOWN), target); - send_cmd(ci->bi->nick, "PRIVMSG %s :%s", ci->name, - buf); + anope_cmd_privmsg(ci->bi->nick, ci->name, "%s", + buf); } } } else if (!stricmp(cmd, "!unban") @@ -584,9 +567,9 @@ void botchanmsgs(User * u, ChannelInfo * ci, char *buf) char *target = strtok(NULL, " "); if (!target) - bot_raw_unban(ci, u->nick); + common_unban(ci, u->nick); else - bot_raw_unban(ci, target); + common_unban(ci, target); } else { CSModeUtil *util = csmodeutils; @@ -669,7 +652,7 @@ void load_bs_dbase(void) restore_db(f); \ log_perror("Write error on %s", BotDBName); \ if (time(NULL) - lastwarn > WarningTimeout) { \ - wallops(NULL, "Write error on %s: %s", BotDBName, \ + anope_cmd_global(NULL, "Write error on %s: %s", BotDBName, \ strerror(errno)); \ lastwarn = time(NULL); \ } \ @@ -830,8 +813,8 @@ BotInfo *findbot(char *nick) static void unassign(User * u, ChannelInfo * ci) { if (ci->c && ci->c->usercount >= BSMinUsers) { - send_cmd(ci->bi->nick, "PART %s :UNASSIGN from %s", ci->name, - u->nick); + anope_cmd_part(ci->bi->nick, ci->name, "UNASSIGN from %s", + u->nick); } ci->bi->chancount--; ci->bi = NULL; @@ -851,7 +834,8 @@ static BanData *get_ban_data(Channel * c, User * u) if (!c || !u) return NULL; - snprintf(mask, sizeof(mask), "%s@%s", u->username, GetHost(u)); + snprintf(mask, sizeof(mask), "%s@%s", u->username, + common_get_vhost(u)); for (bd = c->bd; bd; bd = next) { if (now - bd->last_use > BSKeepData) { @@ -955,7 +939,7 @@ void bot_join(ChannelInfo * ci) av[1] = sstrdup("-b"); for (i = 0; i < count; i++) { if (match_wild_nocase(ci->c->bans[i], botmask)) { - send_mode(ci->bi->nick, ci->name, "%s", bans[i]); + anope_cmd_mode(ci->bi->nick, ci->name, "%s", bans[i]); av[2] = sstrdup(bans[i]); do_cmode(ci->bi->nick, 3, av); free(av[2]); @@ -968,29 +952,12 @@ void bot_join(ChannelInfo * ci) /* Should we be invited? */ if ((ci->c->mode & CMODE_i) || (ci->c->limit && ci->c->usercount >= ci->c->limit)) - send_cmd(NULL, "NOTICE @%s :%s invited %s into the channel.", - ci->c->name, ci->bi->nick, ci->bi->nick); + anope_cmd_notice_ops(NULL, ci->c->name, + "%s invited %s into the channel.", + ci->bi->nick, ci->bi->nick); } -#ifdef IRC_BAHAMUT - send_cmd(ci->bi->nick, "SJOIN %ld %s", ci->c->creation_time, - ci->c->name); -#elif defined(IRC_HYBRID) - send_cmd(NULL, "SJOIN %ld %s + :%s", time(NULL), ci->c->name, - ci->bi->nick); -#else - send_cmd(ci->bi->nick, "JOIN %s", ci->c->name); -#endif - -#if defined(IRC_UNREAL) || defined (IRC_VIAGRA) - send_mode(ci->bi->nick, ci->c->name, "+ao %s %s", ci->bi->nick, - ci->bi->nick); -#elif defined(IRC_PTLINK) - /* PTLinks requieres an IRCop to u-line changes, so use ChanServ */ - send_mode(s_ChanServ, ci->c->name, "+ao %s %s", ci->bi->nick, - ci->bi->nick); -#else - send_mode(ci->bi->nick, ci->c->name, "+o %s", ci->bi->nick); -#endif + anope_cmd_join(ci->bi->nick, ci->c->name, ci->c->creation_time); + anope_cmd_bot_chan_mode(ci->bi->nick, ci->c->name); } /*************************************************************************/ @@ -1033,7 +1000,7 @@ static void check_ban(ChannelInfo * ci, User * u, int ttbtype) av[1] = sstrdup("+b"); get_idealban(ci, u, mask, sizeof(mask)); av[2] = mask; - send_mode(ci->bi->nick, av[0], "+b %s", av[2]); + anope_cmd_mode(ci->bi->nick, av[0], "+b %s", av[2]); do_cmode(ci->bi->nick, 3, av); free(av[1]); } @@ -1062,7 +1029,7 @@ static void bot_kick(ChannelInfo * ci, User * u, int message, ...) av[0] = ci->name; av[1] = u->nick; av[2] = buf; - send_cmd(ci->bi->nick, "KICK %s %s :%s", av[0], av[1], av[2]); + anope_cmd_kick(ci->bi->nick, av[0], av[1], "%s", av[2]); do_kick(ci->bi->nick, 3, av); } @@ -1080,31 +1047,31 @@ static void bot_raw_ban(User * requester, ChannelInfo * ci, char *nick, if (!u) return; -#if defined(IRC_ULTIMATE) || defined(IRC_ULTIMATE3) - if (is_protected(u) && (requester != u)) { - send_cmd(ci->bi->nick, "PRIVMSG %s :%s", ci->name, - getstring2(NULL, PERMISSION_DENIED)); - return; + if (ircd->protectedumode) { + if (is_protected(u) && (requester != u)) { + anope_cmd_privmsg(ci->bi->nick, ci->name, "%s", + getstring2(NULL, PERMISSION_DENIED)); + return; + } } -#endif if ((ci->flags & CI_PEACE) && stricmp(requester->nick, nick) && (get_access(u, ci) >= get_access(requester, ci))) return; -#ifdef HAS_EXCEPT - if (is_excepted(ci, u) == 1) { - send_cmd(ci->bi->nick, "PRIVMSG %s :%s", ci->name, - getstring2(NULL, BOT_EXCEPT)); - return; + if (ircd->except) { + if (is_excepted(ci, u) == 1) { + anope_cmd_privmsg(ci->bi->nick, ci->name, "%s", + getstring2(NULL, BOT_EXCEPT)); + return; + } } -#endif av[0] = ci->name; av[1] = sstrdup("+b"); get_idealban(ci, u, mask, sizeof(mask)); av[2] = mask; - send_mode(ci->bi->nick, av[0], "+b %s", av[2]); + anope_cmd_mode(ci->bi->nick, av[0], "+b %s", av[2]); do_cmode(ci->bi->nick, 3, av); free(av[1]); @@ -1119,7 +1086,7 @@ static void bot_raw_ban(User * requester, ChannelInfo * ci, char *nick, av[2] = reason; } - send_cmd(ci->bi->nick, "KICK %s %s :%s", av[0], av[1], av[2]); + anope_cmd_kick(ci->bi->nick, av[0], av[1], "%s", av[2]); do_kick(ci->bi->nick, 3, av); } @@ -1136,13 +1103,13 @@ static void bot_raw_kick(User * requester, ChannelInfo * ci, char *nick, if (!u || !is_on_chan(ci->c, u)) return; -#if defined(IRC_ULTIMATE) || defined(IRC_ULTIMATE3) - if (is_protected(u) && (requester != u)) { - send_cmd(ci->bi->nick, "PRIVMSG %s :%s", ci->name, - getstring2(NULL, PERMISSION_DENIED)); - return; + if (ircd->protectedumode) { + if (is_protected(u) && (requester != u)) { + anope_cmd_privmsg(ci->bi->nick, ci->name, "%s", + getstring2(NULL, PERMISSION_DENIED)); + return; + } } -#endif if ((ci->flags & CI_PEACE) && stricmp(requester->nick, nick) && (get_access(u, ci) >= get_access(requester, ci))) @@ -1159,7 +1126,7 @@ static void bot_raw_kick(User * requester, ChannelInfo * ci, char *nick, av[2] = reason; } - send_cmd(ci->bi->nick, "KICK %s %s :%s", av[0], av[1], av[2]); + anope_cmd_kick(ci->bi->nick, av[0], av[1], "%s", av[2]); do_kick(ci->bi->nick, 3, av); } @@ -1176,13 +1143,13 @@ static void bot_raw_mode(User * requester, ChannelInfo * ci, char *mode, if (!u || !is_on_chan(ci->c, u)) return; -#if defined(IRC_ULTIMATE) || defined(IRC_ULTIMATE3) - if (is_protected(u) && *mode == '-' && (requester != u)) { - send_cmd(ci->bi->nick, "PRIVMSG %s :%s", ci->name, - getstring2(NULL, PERMISSION_DENIED)); - return; + if (ircd->protectedumode) { + if (is_protected(u) && *mode == '-' && (requester != u)) { + anope_cmd_privmsg(ci->bi->nick, ci->name, "%s", + getstring2(NULL, PERMISSION_DENIED)); + return; + } } -#endif if (*mode == '-' && (ci->flags & CI_PEACE) && stricmp(requester->nick, nick) @@ -1193,57 +1160,12 @@ static void bot_raw_mode(User * requester, ChannelInfo * ci, char *mode, av[1] = mode; av[2] = nick; - send_mode(ci->bi->nick, av[0], "%s %s", av[1], av[2]); + anope_cmd_mode(ci->bi->nick, av[0], "%s %s", av[1], av[2]); do_cmode(ci->bi->nick, 3, av); } /*************************************************************************/ -/* Removes all bans for a nick on a channel */ - -static void bot_raw_unban(ChannelInfo * ci, char *nick) -{ -#ifndef IRC_BAHAMUT - int count, i; - char *av[3], **bans; - User *u; -#endif - - if (!ci || !ci->c || !ci->bi || !nick) - return; -#ifndef IRC_BAHAMUT - if (!(u = finduser(nick))) - return; -#else - if (!finduser(nick)) - return; -#endif - -#ifndef IRC_BAHAMUT - av[0] = ci->name; - av[1] = sstrdup("-b"); - - count = ci->c->bancount; - bans = scalloc(sizeof(char *) * count, 1); - memcpy(bans, ci->c->bans, sizeof(char *) * count); - - for (i = 0; i < count; i++) { - if (match_usermask(bans[i], u)) { - send_mode(ci->bi->nick, ci->name, "-b %s", bans[i]); - av[2] = bans[i]; - do_cmode(ci->bi->nick, 3, av); - } - } - free(bans); - free(av[1]); -#else - send_cmd(ServerName, "SVSMODE %s -b %s", ci->name, nick); -#endif -} - -/*************************************************************************/ -/*************************************************************************/ - static int do_help(User * u) { char *cmd = strtok(NULL, ""); @@ -1383,8 +1305,8 @@ static int do_bot(User * u) EnforceQlinedNick(nick, s_BotServ); /* We make the bot online, ready to serve */ - NEWNICK(bi->nick, bi->user, bi->host, bi->real, - BOTSERV_BOTS_MODE, 1); + anope_cmd_bot_nick(bi->nick, bi->user, bi->host, bi->real, + ircd->botserv_bot_mode); notice_lang(s_BotServ, u, BOT_BOT_ADDED, bi->nick, bi->user, bi->host, bi->real); @@ -1493,9 +1415,9 @@ static int do_bot(User * u) if (stricmp(bi->nick, nick)) { /* The new nick is really different, so we remove the Q line for the old nick. */ -#ifndef IRC_HYBRID - send_cmd(NULL, "UNSQLINE %s", bi->nick); -#endif + if (ircd->sqline) { + anope_cmd_unsqline(bi->nick); + } /* We check whether the nick is registered, and drop it if so */ if ((na = findnick(nick))) @@ -1524,12 +1446,12 @@ static int do_bot(User * u) /* If only the nick changes, we just make the bot change his nick, else we must make it quit and rejoin. */ if (!user) - send_cmd(oldnick, "NICK %s", bi->nick); + anope_cmd_chg_nick(oldnick, bi->nick); else { - send_cmd(oldnick, "QUIT :Quit: Be right back"); + anope_cmd_quit(oldnick, "Quit: Be right back"); - NEWNICK(bi->nick, bi->user, bi->host, bi->real, - BOTSERV_BOTS_MODE, 1); + anope_cmd_bot_nick(bi->nick, bi->user, bi->host, bi->real, + ircd->botserv_bot_mode); bot_rejoin_all(bi); } @@ -1546,12 +1468,12 @@ static int do_bot(User * u) else if (!(bi = findbot(nick))) notice_lang(s_BotServ, u, BOT_DOES_NOT_EXIST, nick); else { - send_cmd(bi->nick, - "QUIT :Quit: Help! I'm being deleted by %s!", - u->nick); -#ifndef IRC_HYBRID - send_cmd(NULL, "UNSQLINE %s", bi->nick); -#endif + anope_cmd_quit(bi->nick, + "Quit: Help! I'm being deleted by %s!", + u->nick); + if (ircd->sqline) { + anope_cmd_unsqline(bi->nick); + } delbot(bi); notice_lang(s_BotServ, u, BOT_BOT_DELETED, nick); @@ -2494,11 +2416,12 @@ static int do_say(User * u) notice_lang(s_BotServ, u, ACCESS_DENIED); else { if (text[0] != '\001') { - send_cmd(ci->bi->nick, "PRIVMSG %s :%s", ci->name, text); + anope_cmd_privmsg(ci->bi->nick, ci->name, "%s", text); ci->bi->lastmsg = time(NULL); if (logchan && LogBot) - send_cmd(ci->bi->nick, "PRIVMSG %s :SAY %s %s %s", - LogChannel, u->nick, ci->name, text); + anope_cmd_privmsg(ci->bi->nick, LogChannel, + ":SAY %s %s %s", u->nick, ci->name, + text);