From c4ee6e511452bd1c1fc40d998876dc535fcfbf73 Mon Sep 17 00:00:00 2001 From: codemastr Date: Wed, 23 Jun 2004 19:47:40 +0000 Subject: [PATCH] Converted a bunch of notices to numerics --- Changes | 3 + include/numeric.h | 4 + src/channel.c | 151 +++++++--------------- src/modules/m_kick.c | 36 +++--- src/s_err.c | 302 +++++++++++++++++++++---------------------- src/version.c.SH | 2 +- 6 files changed, 221 insertions(+), 277 deletions(-) diff --git a/Changes b/Changes index c29e87ae1..8cef42c8e 100644 --- a/Changes +++ b/Changes @@ -3299,3 +3299,6 @@ This is the 3.2 fixes branch. - Added HOOKTYPE_LOG [int type, char *timebuf, char *logbuf] - Updated the release notes. - Fixed a CIDR bug reported by poisoner (#0001892) +- Documented numerics in use by other IRCds +- Converted several notices to numerics (#0001599) suggested by olene +- Added a donator to /credits diff --git a/include/numeric.h b/include/numeric.h index b0907ff3b..7aec7d7e4 100644 --- a/include/numeric.h +++ b/include/numeric.h @@ -127,6 +127,8 @@ #define ERR_NOOPERHOST 491 #define ERR_NOCTCP 492 +#define ERR_CHANOWNPRIVNEEDED 499 + #define ERR_UMODEUNKNOWNFLAG 501 #define ERR_USERSDONTMATCH 502 @@ -344,4 +346,6 @@ #define RPL_DUMPRPL 641 #define RPL_EODUMP 642 +#define ERR_CANNOTDOCOMMAND 972 +#define ERR_CANNOTCHANGECHANMODE 974 #define ERR_NUMERICERR 999 diff --git a/src/channel.c b/src/channel.c index 383a50b1f..ae0f20b87 100644 --- a/src/channel.c +++ b/src/channel.c @@ -1818,7 +1818,6 @@ int do_mode_char(aChannel *chptr, long modetype, char modechar, char *param, char tc = ' '; /* */ int chasing, x; int xxi, xyi, xzi, hascolon; - char *xxx; char *xp; int notsecure; chasing = 0; @@ -1853,10 +1852,9 @@ int do_mode_char(aChannel *chptr, long modetype, char modechar, char *param, goto auditorium_ok; if (!IsNetAdmin(cptr) && !is_chanowner(cptr, chptr)) { - sendto_one(cptr, - ":%s %s %s :*** Auditorium mode (+u) can only be set by the channel owner.", - me.name, IsWebTV(cptr) ? "PRIVMSG" : "NOTICE", cptr->name); - break; + sendto_one(cptr, err_str(ERR_CHANOWNPRIVNEEDED), me.name, cptr->name, + chptr->chname); + break; } auditorium_ok: @@ -1865,29 +1863,24 @@ int do_mode_char(aChannel *chptr, long modetype, char modechar, char *param, if (!IsAnOper(cptr) && !IsServer(cptr) && !IsULine(cptr)) { - sendto_one(cptr, - ":%s %s %s :*** Opers Only mode (+O) can only be set by IRC Operators.", - me.name, IsWebTV(cptr) ? "PRIVMSG" : "NOTICE", cptr->name); - break; + sendto_one(cptr, err_str(ERR_NOPRIVILEGES), me.name, cptr->name); + break; } goto setthephuckingmode; case MODE_ADMONLY: if (!IsSkoAdmin(cptr) && !IsServer(cptr) && !IsULine(cptr)) { - sendto_one(cptr, - ":%s %s %s :*** Admins Only mode (+A) can only be set by Administrators.", - me.name, IsWebTV(cptr) ? "PRIVMSG" : "NOTICE", cptr->name); - break; + sendto_one(cptr, err_str(ERR_NOPRIVILEGES), me.name, cptr->name); + break; } goto setthephuckingmode; case MODE_RGSTR: if (!IsServer(cptr) && !IsULine(cptr)) { - sendto_one(cptr, - ":%s %s %s :*** Registered mode (+r) can only be set by Services.", - me.name, IsWebTV(cptr) ? "PRIVMSG" : "NOTICE", cptr->name); - break; + sendto_one(cptr, err_str(ERR_ONLYSERVERSCANCHANGE), me.name, cptr->name, + chptr->chname); + break; } goto setthephuckingmode; case MODE_SECRET: @@ -1901,6 +1894,7 @@ int do_mode_char(aChannel *chptr, long modetype, char modechar, char *param, case MODE_NOKICKS: case MODE_STRIP: goto setthephuckingmode; + case MODE_INVITEONLY: if (what == MODE_DEL && modetype == MODE_INVITEONLY && (chptr->mode.mode & MODE_NOKNOCK)) chptr->mode.mode &= ~MODE_NOKNOCK; @@ -1908,9 +1902,8 @@ int do_mode_char(aChannel *chptr, long modetype, char modechar, char *param, case MODE_NOKNOCK: if (what == MODE_ADD && modetype == MODE_NOKNOCK && !(chptr->mode.mode & MODE_INVITEONLY)) { - sendto_one(cptr, - ":%s %s %s :*** No Knocks mode (+K) can only be set when the channel is invite only (+i)", - me.name, IsWebTV(cptr) ? "PRIVMSG" : "NOTICE", cptr->name); + sendto_one(cptr, err_str(ERR_CANNOTCHANGECHANMODE), + me.name, cptr->name, 'K', "+i must be set"); break; } goto setthephuckingmode; @@ -1922,11 +1915,11 @@ int do_mode_char(aChannel *chptr, long modetype, char modechar, char *param, { if (!IsSecureConnect(member->cptr) && !IsULine(member->cptr)) { - sendto_one(cptr, - ":%s %s %s :*** Secure Mode (+z) can only be set when all members of the channel are connected via SSL.", - me.name, IsWebTV(cptr) ? "PRIVMSG" : "NOTICE", cptr->name); - notsecure = 1; - break; + sendto_one(cptr, err_str(ERR_CANNOTCHANGECHANMODE), + me.name, cptr->name, 'z', + "all members must be connected via SSL"); + notsecure = 1; + break; } } member = NULL; @@ -2017,7 +2010,7 @@ int do_mode_char(aChannel *chptr, long modetype, char modechar, char *param, } else if (MyClient(cptr)) { - sendto_one(cptr, err_str(ERR_ONLYSERVERSCANCHANGE), + sendto_one(cptr, err_str(ERR_CHANOWNPRIVNEEDED), me.name, cptr->name, chptr->chname); break; } @@ -2033,10 +2026,9 @@ int do_mode_char(aChannel *chptr, long modetype, char modechar, char *param, } else if (MyClient(cptr)) { - sendto_one(cptr, - ":%s %s %s :*** Channel admins (+a) can only be set by the channel owner", - me.name, IsWebTV(cptr) ? "PRIVMSG" : "NOTICE", cptr->name); - break; + sendto_one(cptr, err_str(ERR_CHANOWNPRIVNEEDED), me.name, cptr->name, + chptr->chname); + break; } } @@ -2044,26 +2036,6 @@ int do_mode_char(aChannel *chptr, long modetype, char modechar, char *param, case MODE_HALFOP: case MODE_CHANOP: case MODE_VOICE: - switch (modetype) - { - case MODE_CHANOWNER: - xxx = "dechannelown"; - break; - case MODE_CHANPROT: - xxx = "deadmin"; - break; - case MODE_HALFOP: - xxx = "dehalfop"; - break; - case MODE_CHANOP: - xxx = "deop"; - break; - case MODE_VOICE: - xxx = "devoice"; - break; - default: - xxx = "whatthefuckisthatmode?"; - } if (!param || *pcount >= MAXMODEPARAMS) { retval = 0; @@ -2096,10 +2068,8 @@ int do_mode_char(aChannel *chptr, long modetype, char modechar, char *param, /* Services are special! */ if (IsServices(member->cptr) && MyClient(cptr) && !IsNetAdmin(cptr) && (what == MODE_DEL)) { - sendto_one(cptr, - ":%s %s %s :*** You cannot %s %s in %s, it is a network service", - me.name, IsWebTV(cptr) ? "PRIVMSG" : "NOTICE", - cptr->name, xxx, member->cptr->name, chptr->chname); + sendto_one(cptr, err_str(ERR_CANNOTCHANGECHANMODE), me.name, cptr->name, + modechar, "user is a network service"); break; } @@ -2110,11 +2080,9 @@ int do_mode_char(aChannel *chptr, long modetype, char modechar, char *param, { if (MyClient(cptr)) { - sendto_one(cptr, - ":%s %s %s :*** You cannot %s %s in %s, (s)he is the channel owner (+q).", - me.name, IsWebTV(cptr) ? "PRIVMSG" : "NOTICE", cptr->name, xxx, - member->cptr->name, chptr->chname); - break; + sendto_one(cptr, err_str(ERR_CANNOTCHANGECHANMODE), me.name, cptr->name, + modechar, "user is a channel owner"); + break; } else if (IsOper(cptr)) opermode = 1; @@ -2126,11 +2094,9 @@ int do_mode_char(aChannel *chptr, long modetype, char modechar, char *param, { if (MyClient(cptr)) { - sendto_one(cptr, - ":%s %s %s :*** You cannot %s %s in %s, (s)he is a channel admin (+a).", - me.name, IsWebTV(cptr) ? "PRIVMSG" : "NOTICE", cptr->name, xxx, - member->cptr->name, chptr->chname); - break; + sendto_one(cptr, err_str(ERR_CANNOTCHANGECHANMODE), me.name, cptr->name, + modechar, "user is a channel admin"); + break; } else if (IsOper(cptr)) opermode = 1; @@ -2332,18 +2298,16 @@ int do_mode_char(aChannel *chptr, long modetype, char modechar, char *param, if (!IsNetAdmin(cptr) && !is_chanowner(cptr, chptr)) { - sendto_one(cptr, - ":%s %s %s :*** Channel Linking (+L) can only be set by the channel owner.", - me.name, IsWebTV(cptr) ? "PRIVMSG" : "NOTICE", cptr->name); - break; + sendto_one(cptr, err_str(ERR_CHANOWNPRIVNEEDED), me.name, cptr->name, + chptr->chname); + break; } if (!chptr->mode.limit && what == MODE_ADD) { - sendto_one(cptr, - ":%s %s %s :*** A Channel Limit (+l ) is required for +L to be set.", - me.name, IsWebTV(cptr) ? "PRIVMSG" : "NOTICE", cptr->name); - break; + sendto_one(cptr, err_str(ERR_CANNOTCHANGECHANMODE), + me.name, cptr->name, 'L', "+l must be set"); + break; } linkok: retval = 1; @@ -2367,13 +2331,7 @@ int do_mode_char(aChannel *chptr, long modetype, char modechar, char *param, break; } if (strchr(param, ',')) - { - if (MyClient(cptr)) - sendto_one(cptr, - ":%s %s %s :*** Only one channel may be specified for linking.", - me.name, IsWebTV(cptr) ? "PRIVMSG" : "NOTICE", cptr->name); break; - } if (!IsChannelName(param)) { if (MyClient(cptr)) @@ -2396,12 +2354,11 @@ int do_mode_char(aChannel *chptr, long modetype, char modechar, char *param, break; if (!stricmp(tmpbuf, chptr->chname)) { - if (MyClient(cptr)) - sendto_one(cptr, - ":%s %s %s :*** %s cannot be linked to itself.", - me.name, IsWebTV(cptr) ? "PRIVMSG" : "NOTICE", cptr->name, - chptr->chname); - break; + if (MyClient(cptr)) + sendto_one(cptr, err_str(ERR_CANNOTCHANGECHANMODE), + me.name, cptr->name, 'L', + "a channel cannot be linked to itself"); + break; } if (!bounce) /* don't do the mode at all. */ { @@ -2618,18 +2575,10 @@ int do_mode_char(aChannel *chptr, long modetype, char modechar, char *param, strlcpy(xbuf, param, sizeof(xbuf)); p2 = strchr(xbuf+1, ']'); if (!p2) - { - if (MyClient(cptr)) - sendto_one(cptr, ":%s NOTICE %s :bad syntax for channelmode +f", me.name, cptr->name); break; - } *p2 = '\0'; if (*(p2+1) != ':') - { - if (MyClient(cptr)) - sendto_one(cptr, ":%s NOTICE %s :bad syntax for channelmode +f", me.name, cptr->name); break; - } breakit = 0; for (x = strtok(xbuf+1, ","); x; x = strtok(NULL, ",")) { @@ -2652,8 +2601,9 @@ int do_mode_char(aChannel *chptr, long modetype, char modechar, char *param, { if (MyClient(cptr)) { - sendto_one(cptr, ":%s NOTICE %s :channelmode +f: floodtype '%c', value should be 1-999", - me.name, cptr->name, c); + sendto_one(cptr, err_str(ERR_CANNOTCHANGECHANMODE), + me.name, cptr->name, + 'f', "value should be from 1-999"); breakit = 1; break; } else @@ -2736,24 +2686,17 @@ int do_mode_char(aChannel *chptr, long modetype, char modechar, char *param, /* parse 'per' */ p2++; if (*p2 != ':') - { - if (MyClient(cptr)) - sendto_one(cptr, ":%s NOTICE %s :bad syntax for channelmode +f", me.name, cptr->name); break; - } p2++; if (!*p2) - { - if (MyClient(cptr)) - sendto_one(cptr, ":%s NOTICE %s :bad syntax for channelmode +f", me.name, cptr->name); break; - } v = atoi(p2); if ((v < 1) || (v > 999)) /* 'per' out of range */ { if (MyClient(cptr)) - sendto_one(cptr, ":%s NOTICE %s :error: channelmode +f: time range should be 1-999", - me.name, cptr->name); + sendto_one(cptr, err_str(ERR_CANNOTCHANGECHANMODE), + me.name, cptr->name, 'f', + "time range should be 1-999"); break; } newf.per = v; diff --git a/src/modules/m_kick.c b/src/modules/m_kick.c index 20ec1de0b..1b8138a72 100644 --- a/src/modules/m_kick.c +++ b/src/modules/m_kick.c @@ -161,10 +161,9 @@ CMD_FUNC(m_kick) { if (!IsNetAdmin(sptr)) { - sendto_one(sptr, - ":%s %s %s :*** Cannot kick %s from channel %s (usermode +q)", - me.name, IsWebTV(sptr) ? "PRIVMSG" : "NOTICE", sptr->name, - who->name, chptr->chname); + sendto_one(sptr, err_str(ERR_CANNOTDOCOMMAND), + me.name, sptr->name, "KICK", + "user is +q"); sendto_one(who, ":%s %s %s :*** Q: %s tried to kick you from channel %s (%s)", me.name, IsWebTV(who) ? "PRIVMSG" : "NOTICE", who->name, @@ -178,10 +177,9 @@ CMD_FUNC(m_kick) { if (!op_can_override(sptr)) { - sendto_one(sptr, - ":%s %s %s :*** You cannot kick people on %s", - me.name, IsWebTV(sptr) ? "PRIVMSG" : "NOTICE", sptr->name, - chptr->chname); + sendto_one(sptr, err_str(ERR_CANNOTDOCOMMAND), + me.name, sptr->name, "KICK", + "channel is +Q"); goto deny; } sendto_snomask(SNO_EYES, @@ -235,10 +233,9 @@ CMD_FUNC(m_kick) } else if (!IsULine(sptr) && (who != sptr) && MyClient(sptr)) { - sendto_one(sptr, - ":%s %s %s :*** You cannot kick %s from %s because %s is channel admin", - me.name, IsWebTV(sptr) ? "PRIVMSG" : "NOTICE", sptr->name, - who->name, chptr->chname, who->name); + sendto_one(sptr, err_str(ERR_CANNOTDOCOMMAND), + me.name, sptr->name, "KICK", + "user is a channel admin"); goto deny; continue; } /* chanprot/chanowner */ @@ -248,9 +245,9 @@ CMD_FUNC(m_kick) if ((who_flags & CHFL_ISOP) && (sptr_flags & CHFL_HALFOP) && !(sptr_flags & CHFL_ISOP) && !IsULine(sptr) && MyClient(sptr)) { - sendto_one(sptr, - ":%s %s %s :*** You cannot kick channel operators on %s if you only are halfop", - me.name, IsWebTV(sptr) ? "PRIVMSG" : "NOTICE", sptr->name, chptr->chname); + sendto_one(sptr, err_str(ERR_CANNOTDOCOMMAND), + me.name, sptr->name, "KICK", + "user is a channel operator"); goto deny; } @@ -258,9 +255,9 @@ CMD_FUNC(m_kick) if ((who_flags & CHFL_HALFOP) && (sptr_flags & CHFL_HALFOP) && !(sptr_flags & CHFL_ISOP) && MyClient(sptr)) { - sendto_one(sptr, - ":%s %s %s :*** You cannot kick channel halfops on %s if you only are halfop", - me.name, IsWebTV(sptr) ? "PRIVMSG" : "NOTICE", sptr->name, chptr->chname); + sendto_one(sptr, err_str(ERR_CANNOTDOCOMMAND), + me.name, sptr->name, "KICK", + "user is a halfop"); goto deny; } /* halfop */ @@ -268,9 +265,6 @@ CMD_FUNC(m_kick) goto attack; deny: - sendto_one(sptr, - err_str(ERR_ATTACKDENY), me.name, - parv[0], chptr->chname, user); continue; attack: diff --git a/src/s_err.c b/src/s_err.c index a1ba0a2ff..97ece99c7 100644 --- a/src/s_err.c +++ b/src/s_err.c @@ -38,12 +38,12 @@ static char *replies[] = { /* 006 RPL_MAP */ ":%s 006 %s :%s%-*s(%d) %s", /* 007 RPL_MAPEND */ ":%s 007 %s :End of /MAP", /* 008 RPL_SNOMASK */ ":%s 008 %s :Server notice mask (%s)", -/* 009 */ NULL, +/* 009 */ NULL, /* ircu */ /* 010 RPL_REDIR */ ":%s 010 %s %s %d :Please use this Server/Port instead", /* 011 */ NULL, /* 012 */ NULL, /* 013 */ NULL, -/* 014 */ NULL, +/* 014 */ NULL, /* hybrid */ /* 015 */ NULL, /* 016 */ NULL, /* 017 */ NULL, @@ -71,16 +71,16 @@ static char *replies[] = { /* 039 */ NULL, /* 040 */ NULL, /* 041 */ NULL, -/* 042 */ NULL, -/* 043 */ NULL, +/* 042 */ NULL, /* ircnet */ +/* 043 */ NULL, /* ircnet */ /* 044 */ NULL, /* 045 */ NULL, /* 046 */ NULL, /* 047 */ NULL, /* 048 */ NULL, /* 049 */ NULL, -/* 050 */ NULL, -/* 051 */ NULL, +/* 050 */ NULL, /* aircd */ +/* 051 */ NULL, /* aircd */ /* 052 */ NULL, /* 053 */ NULL, /* 054 */ NULL, @@ -264,25 +264,25 @@ static char *replies[] = { /* 228 RPL_STATSBANVER */ ":%s 228 %s %s %s", /* 229 RPL_STATSSPAMF */ ":%s 229 %s %c %s %s %li %li %li %s %s :%s", /* 230 */ NULL, -/* 231 */ NULL, +/* 231 */ NULL, /* rfc1459 */ /* 232 RPL_RULES */ ":%s 232 %s :- %s", -/* 233 */ NULL, /* Used */ -/* 234 */ NULL, /* Used */ -/* 235 */ NULL, /* Used */ -/* 236 */ NULL, -/* 237 */ NULL, -/* 238 */ NULL, -/* 239 */ NULL, -/* 240 */ NULL, +/* 233 */ NULL, /* rfc1459 */ +/* 234 */ NULL, /* rfc2812 */ +/* 235 */ NULL, /* rfc2812 */ +/* 236 */ NULL, /* ircu */ +/* 237 */ NULL, /* ircu */ +/* 238 */ NULL, /* ircu, ircnet */ +/* 239 */ NULL, /* ircnet */ +/* 240 */ NULL, /* rfc2812, austhex */ /* 241 RPL_STATSLLINE */ ":%s 241 %s %c %s * %s %d %d", /* 242 RPL_STATSUPTIME */ ":%s 242 %s :Server Up %d days, %d:%02d:%02d", /* 243 RPL_STATSOLINE */ ":%s 243 %s %c %s * %s %s %s", /* 244 RPL_STATSHLINE */ ":%s 244 %s %c %s * %s %d %d", /* 245 RPL_STATSSLINE */ ":%s 245 %s %c %s * %s %d %d", -/* 246 */ NULL, +/* 246 */ NULL, /* rfc2812 */ /* 247 RPL_STATSXLINE */ ":%s 247 %s X %s %d", /* 248 RPL_STATSULINE */ ":%s 248 %s U %s", -/* 249 */ NULL, +/* 249 */ NULL, /* hybrid */ /* 250 RPL_STATSCONN */ ":%s 250 %s :Highest connection count: %d (%d clients)", /* 251 RPL_LUSERCLIENT */ ":%s 251 %s :There are %d users and %d invisible on %d servers", /* 252 RPL_LUSEROP */ ":%s 252 %s %d :operator(s) online", @@ -295,49 +295,49 @@ static char *replies[] = { /* 259 RPL_ADMINEMAIL */ ":%s 259 %s :%s", /* 260 */ NULL, /* 261 RPL_TRACELOG */ ":%s 261 %s File %s %d", -/* 262 */ NULL, -/* 263 */ NULL, +/* 262 */ NULL, /* rfc2812 */ +/* 263 */ NULL, /* rfc2812 */ /* 264 */ NULL, /* 265 RPL_LOCALUSERS */ ":%s 265 %s :Current Local Users: %d Max: %d", /* 266 RPL_GLOBALUSERS */ ":%s 266 %s :Current Global Users: %d Max: %d", -/* 267 */ NULL, -/* 268 */ NULL, -/* 269 */ NULL, -/* 270 */ NULL, +/* 267 */ NULL, /* aircd */ +/* 268 */ NULL, /* aircd */ +/* 269 */ NULL, /* aircd */ +/* 270 */ NULL, /* ircu */ /* 271 RPL_SILELIST */ ":%s 271 %s %s %s", /* 272 RPL_ENDOFSILELIST */ ":%s 272 %s :End of Silence List", -/* 273 */ NULL, -/* 274 */ NULL, +/* 273 */ NULL, /* aircd */ +/* 274 */ NULL, /* ircnet */ /* 275 RPL_STATSDLINE */ ":%s 275 %s %c %s %s", -/* 276 */ NULL, -/* 277 */ NULL, -/* 278 */ NULL, +/* 276 */ NULL, /* hybrid */ +/* 277 */ NULL, /* hybrid */ +/* 278 */ NULL, /* hybrid */ /* 279 */ NULL, -/* 280 */ NULL, -/* 281 */ NULL, -/* 282 */ NULL, -/* 283 */ NULL, -/* 284 */ NULL, -/* 285 */ NULL, -/* 286 */ NULL, -/* 287 */ NULL, -/* 288 */ NULL, -/* 289 */ NULL, -/* 290 */ NULL, -/* 291 */ NULL, -/* 292 */ NULL, -/* 293 */ NULL, +/* 280 */ NULL, /* ircu */ +/* 281 */ NULL, /* ircu, hybrid */ +/* 282 */ NULL, /* ircu, hybrid */ +/* 283 */ NULL, /* ircu, hybrid */ +/* 284 */ NULL, /* hybrid, quakenet */ +/* 285 */ NULL, /* ircu, aircd, quakenet */ +/* 286 */ NULL, /* aircd, quakenet */ +/* 287 */ NULL, /* aircd, quakenet */ +/* 288 */ NULL, /* aircd, quakenet */ +/* 289 */ NULL, /* aircd, quakenet */ +/* 290 */ NULL, /* aircd, quakenet */ +/* 291 */ NULL, /* aircd, quakenet */ +/* 292 */ NULL, /* aircd */ +/* 293 */ NULL, /* aircd */ /* 294 RPL_HELPFWD */ ":%s 294 %s :Your help-request has been forwarded to Help Operators", /* 295 RPL_HELPIGN */ ":%s 295 %s :Your address has been ignored from forwarding", -/* 296 */ NULL, +/* 296 */ NULL, /* aircd */ /* 297 */ NULL, /* 298 */ NULL, -/* 299 */ NULL, -/* 300 */ NULL, /* Used */ +/* 299 */ NULL, /* aircd */ +/* 300 */ NULL, /* rfc1459 */ /* 301 RPL_AWAY */ ":%s 301 %s %s :%s", /* 302 RPL_USERHOST */ ":%s 302 %s :%s %s %s %s %s", /* 303 RPL_ISON */ ":%s 303 %s :", -/* 304 */ NULL, /* Used */ +/* 304 */ NULL, /* RPL_TEXT */ /* 305 RPL_UNAWAY */ ":%s 305 %s :You are no longer marked as being away", /* 306 RPL_NOWAWAY */ ":%s 306 %s :You have been marked as being away", /* 307 RPL_WHOISREGNICK */ ":%s 307 %s %s :is a registered nick", @@ -349,7 +349,7 @@ static char *replies[] = { /* 313 RPL_WHOISOPERATOR */ ":%s 313 %s %s :is %s", /* 314 RPL_WHOWASUSER */ ":%s 314 %s %s %s %s * :%s", /* 315 RPL_ENDOFWHO */ ":%s 315 %s %s :End of /WHO list.", -/* 316 */ NULL, /* Used */ +/* 316 */ NULL, /* rfc1459 */ /* 317 RPL_WHOISIDLE */ ":%s 317 %s %s %ld %ld :seconds idle, signon time", /* 318 RPL_ENDOFWHOIS */ ":%s 318 %s %s :End of /WHOIS list.", /* 319 RPL_WHOISCHANNELS */ ":%s 319 %s %s :%s", @@ -362,12 +362,12 @@ static char *replies[] = { #endif /* 323 RPL_LISTEND */ ":%s 323 %s :End of /LIST", /* 324 RPL_CHANNELMODEIS */ ":%s 324 %s %s %s %s", -/* 325 */ NULL, -/* 326 */ NULL, -/* 327 */ NULL, -/* 328 */ NULL, +/* 325 */ NULL, /* rfc2812 */ +/* 326 */ NULL, /* Used */ +/* 327 */ NULL, /* Used */ +/* 328 */ NULL, /* bahamut, austhex */ /* 329 RPL_CREATIONTIME */ ":%s 329 %s %s %lu", -/* 330 */ NULL, +/* 330 */ NULL, /* Used */ /* 331 RPL_NOTOPIC */ ":%s 331 %s %s :No topic is set.", /* 332 RPL_TOPIC */ ":%s 332 %s %s :%s", /* 333 RPL_TOPICWHOTIME */ ":%s 333 %s %s %s %lu", @@ -375,14 +375,14 @@ static char *replies[] = { /* 335 RPL_WHOISBOT */ ":%s 335 %s %s :is a \2Bot\2 on %s", /* 336 */ NULL, /* 337 */ NULL, -/* 338 */ NULL, -/* 339 */ NULL, -/* 340 */ NULL, +/* 338 */ NULL, /* ircu, bahamut */ +/* 339 */ NULL, /* Used */ +/* 340 */ NULL, /* ircu */ /* 341 RPL_INVITING */ ":%s 341 %s %s %s", /* 342 RPL_SUMMONING */ ":%s 342 %s %s :User summoned to irc", /* 343 */ NULL, /* 344 */ NULL, -/* 345 */ NULL, +/* 345 */ NULL, /* gamesurge */ /* 346 RPL_INVITELIST */ ":%s 346 %s %s %s", /* 347 RPL_ENDOFINVITELIST */ ":%s 347 %s %s :End of Channel Invite List", /* 348 RPL_EXLIST */ ":%s 348 %s %s %s %s %lu", @@ -391,14 +391,14 @@ static char *replies[] = { /* 351 RPL_VERSION */ ":%s 351 %s %s.%s %s :%s%s%s [%s=%li]", /* 352 RPL_WHOREPLY */ ":%s 352 %s %s %s %s %s %s %s :%d %s", /* 353 RPL_NAMREPLY */ ":%s 353 %s %s", -/* 354 */ NULL, /* Reserved for Undernet */ -/* 355 */ NULL, +/* 354 */ NULL, /* ircu */ +/* 355 */ NULL, /* quakenet */ /* 356 */ NULL, -/* 357 */ NULL, -/* 358 */ NULL, -/* 359 */ NULL, +/* 357 */ NULL, /* austhex */ +/* 358 */ NULL, /* austhex */ +/* 359 */ NULL, /* austhex */ /* 360 */ NULL, -/* 361 */ NULL, +/* 361 */ NULL, /* rfc1459 */ /* 362 RPL_CLOSING */ ":%s 362 %s %s :Closed. Status = %d", /* 363 RPL_CLOSEEND */ ":%s 363 %s %d: Connections Closed", /* 364 RPL_LINKS */ ":%s 364 %s %s %s :%d %s", @@ -414,15 +414,15 @@ static char *replies[] = { /* 374 RPL_ENDOFINFO */ ":%s 374 %s :End of /INFO list.", /* 375 RPL_MOTDSTART */ ":%s 375 %s :- %s Message of the Day - ", /* 376 RPL_ENDOFMOTD */ ":%s 376 %s :End of /MOTD command.", -/* 377 */ NULL, +/* 377 */ NULL, /* aircd, austhex */ /* 378 RPL_WHOISHOST */ ":%s 378 %s %s :is connecting from *@%s %s", /* 379 RPL_WHOISMODES */ ":%s 379 %s %s :is using modes %s", -/* 380 */ NULL, +/* 380 */ NULL, /* aircd, austhex */ /* 381 RPL_YOUREOPER */ ":%s 381 %s :You are now an IRC Operator", /* 382 RPL_REHASHING */ ":%s 382 %s %s :Rehashing", -/* 383 */ NULL, /* Used */ +/* 383 */ NULL, /* rfc2812 */ /* 384 RPL_MYPORTIS */ ":%s 384 %s %d :Port to local server is\r\n", -/* 385 */ NULL, /* Used */ +/* 385 */ NULL, /* austhex, hybrid */ /* 386 RPL_QLIST */ ":%s 386 %s %s %s", /* 387 RPL_ENDOFQLIST */ ":%s 387 %s %s :End of Channel Owner List", /* 388 RPL_ALIST */ ":%s 388 %s %s %s", @@ -440,11 +440,11 @@ static char *replies[] = { /* 394 */ NULL, /* 395 */ NULL, #endif -/* 396 */ NULL, +/* 396 */ NULL, /* ircu */ /* 397 */ NULL, /* 398 */ NULL, /* 399 */ NULL, -/* 400 */ NULL, +/* 400 */ NULL, /* Used */ /* 401 ERR_NOSUCHNICK */ ":%s 401 %s %s :No such nick/channel", /* 402 ERR_NOSUCHSERVER */ ":%s 402 %s %s :No such server", /* 403 ERR_NOSUCHCHANNEL */ ":%s 403 %s %s :No such channel", @@ -452,18 +452,18 @@ static char *replies[] = { /* 405 ERR_TOOMANYCHANNELS */ ":%s 405 %s %s :You have joined too many channels", /* 406 ERR_WASNOSUCHNICK */ ":%s 406 %s %s :There was no such nickname", /* 407 ERR_TOOMANYTARGETS */ ":%s 407 %s %s :Duplicate recipients. No message delivered", -/* 408 */ NULL, /* Used */ +/* 408 */ NULL, /* rfc2812, bahamut */ /* 409 ERR_NOORIGIN */ ":%s 409 %s :No origin specified", /* 410 */ NULL, /* 411 ERR_NORECIPIENT */ ":%s 411 %s :No recipient given (%s)", /* 412 ERR_NOTEXTTOSEND */ ":%s 412 %s :No text to send", /* 413 ERR_NOTOPLEVEL */ ":%s 413 %s %s :No toplevel domain specified", /* 414 ERR_WILDTOPLEVEL */ ":%s 414 %s %s :Wildcard in toplevel Domain", -/* 415 */ NULL, -/* 416 */ NULL, +/* 415 */ NULL, /* rfc2812 */ +/* 416 */ NULL, /* ircnet, ircu */ /* 417 */ NULL, /* 418 */ NULL, -/* 419 */ NULL, +/* 419 */ NULL, /* aircd */ /* 420 */ NULL, /* 421 ERR_UNKNOWNCOMMAND */ ":%s 421 %s %s :Unknown command", /* 422 ERR_NOMOTD */ ":%s 422 %s :MOTD File is missing", @@ -478,12 +478,12 @@ static char *replies[] = { #else /* 429 */ NULL, #endif -/* 430 */ NULL, +/* 430 */ NULL, /* austhex */ /* 431 ERR_NONICKNAMEGIVEN */ ":%s 431 %s :No nickname given", /* 432 ERR_ERRONEUSNICKNAME */ ":%s 432 %s %s :Erroneous Nickname: %s", /* 433 ERR_NICKNAMEINUSE */ ":%s 433 %s %s :Nickname is already in use.", /* 434 ERR_NORULES */ ":%s 434 %s :RULES File is missing", -/* 435 */ NULL, /* Used */ +/* 435 */ NULL, /* bahamut */ /* 436 ERR_NICKCOLLISION */ ":%s 436 %s %s :Nickname collision KILL", /* 437 ERR_BANNICKCHANGE */ ":%s 437 %s %s :Cannot change nickname while banned on channel", /* 438 ERR_NCHANGETOOFAST */ ":%s 438 %s %s :Nick change too fast. Please wait %d seconds", @@ -497,11 +497,11 @@ static char *replies[] = { /* 446 ERR_USERSDISABLED */ ":%s 446 %s :USERS has been disabled", /* 447 ERR_NONICKCHANGE */ ":%s 447 %s :Can not change nickname while on %s (+N)", /* 448 */ NULL, -/* 449 */ NULL, +/* 449 */ NULL, /* ircu */ /* 450 */ NULL, /* 451 ERR_NOTREGISTERED */ ":%s 451 %s :You have not registered", -/* 452 */ NULL, -/* 453 */ NULL, +/* 452 */ NULL, /* Used */ +/* 453 */ NULL, /* Used */ /* 454 */ NULL, #ifdef HOSTILENAME /* 455 ERR_HOSTILENAME */ ":%s 455 %s :Your username %s contained the invalid " @@ -512,9 +512,9 @@ static char *replies[] = { #else /* 455 */ NULL, #endif -/* 456 */ NULL, -/* 457 */ NULL, -/* 458 */ NULL, +/* 456 */ NULL, /* hybrid */ +/* 457 */ NULL, /* hybrid */ +/* 458 */ NULL, /* hybrid */ /* 459 ERR_NOHIDING */ ":%s 459 %s %s :Cannot join channel (+H)", /* 460 ERR_NOTFORHALFOPS */ ":%s 460 %s :Halfops cannot set mode %c", /* 461 ERR_NEEDMOREPARAMS */ ":%s 461 %s %s :Not enough parameters", @@ -522,7 +522,7 @@ static char *replies[] = { /* 463 ERR_NOPERMFORHOST */ ":%s 463 %s :Your host isn't among the privileged", /* 464 ERR_PASSWDMISMATCH */ ":%s 464 %s :Password Incorrect", /* 465 ERR_YOUREBANNEDCREEP */ ":%s 465 %s :You are banned from this server. Mail %s for more information", -/* 466 */ NULL, /* Used */ +/* 466 */ NULL, /* rfc1459 */ /* 467 ERR_KEYSET */ ":%s 467 %s %s :Channel key already set", /* 468 ERR_ONLYSERVERSCANCHANGE */ ":%s 468 %s %s :Only servers can change that mode", /* 469 ERR_LINKSET */ ":%s 469 %s %s :Channel link already set", @@ -549,18 +549,18 @@ static char *replies[] = { /* 490 ERR_NOSWEAR */ ":%s 490 %s :%s does not accept private messages containing swearing.", /* 491 ERR_NOOPERHOST */ ":%s 491 %s :No O-lines for your host", /* 492 ERR_NOCTCP */ ":%s 492 %s :%s does not accept CTCPs", -/* 493 */ NULL, -/* 494 */ NULL, -/* 495 */ NULL, -/* 496 */ NULL, -/* 497 */ NULL, -/* 498 */ NULL, -/* 499 */ NULL, +/* 493 */ NULL, /* ircu */ +/* 494 */ NULL, /* ircu */ +/* 495 */ NULL, /* ircu */ +/* 496 */ NULL, /* ircu */ +/* 497 */ NULL, /* ircu */ +/* 498 */ NULL, /* ircu */ +/* 499 ERR_CHANOWNPRIVNEEDED */ ":%s 499 %s %s :You're not a channel owner", /* 500 */ NULL, /* 501 ERR_UMODEUNKNOWNFLAG */ ":%s 501 %s :Unknown MODE flag", /* 502 ERR_USERSDONTMATCH */ ":%s 502 %s :Cant change mode for other users", -/* 503 */ NULL, -/* 504 */ NULL, +/* 503 */ NULL, /* austhex */ +/* 504 */ NULL, /* Used */ /* 505 */ NULL, /* 506 */ NULL, /* 507 */ NULL, @@ -571,9 +571,9 @@ static char *replies[] = { /* 512 ERR_TOOMANYWATCH */ ":%s 512 %s %s :Maximum size for WATCH-list is 128 entries", /* 513 ERR_NEEDPONG */ ":%s 513 %s :To connect, type /QUOTE PONG %lX", /* 514 ERR_TOOMANYDCC */ ":%s 514 %s %s :Your dcc allow list is full. Maximum size is %d entries", -/* 515 */ NULL, -/* 516 */ NULL, -/* 517 */ NULL, +/* 515 */ NULL, /* ircu */ +/* 516 */ NULL, /* ircu */ +/* 517 */ NULL, /* ircu */ /* 518 518 */ ":%s 518 %s :Cannot invite (+V) at channel %s", /* 519 519 */ ":%s 519 %s :Cannot join channel %s (Admin only)", /* 520 520 */ ":%s 520 %s :Cannot join channel %s (IRCops only)", @@ -581,8 +581,8 @@ static char *replies[] = { /* 522 ERR_WHOSYNTAX */ ":%s 522 %s :/WHO Syntax incorrect, use /who ? for help", /* 523 ERR_WHOLIMEXCEED */ ":%s 523 %s :Error, /who limit of %d exceeded. Please narrow your search down and try again", /* 524 ERR_OPERSPVERIFY */ ":%s 524 %s :Trying to join +s or +p channel as an oper. Please invite yourself first.", -/* 525 */ NULL, -/* 526 */ NULL, +/* 525 */ NULL, /* draft-brocklesby-irc-usercmdpfx */ +/* 526 */ NULL, /* draft-brocklesby-irc-usercmdpfx */ /* 527 */ NULL, /* 528 */ NULL, /* 529 */ NULL, @@ -606,10 +606,10 @@ static char *replies[] = { /* 547 */ NULL, /* 548 */ NULL, /* 549 */ NULL, -/* 550 */ NULL, -/* 551 */ NULL, -/* 552 */ NULL, -/* 553 */ NULL, +/* 550 */ NULL, /* quakenet */ +/* 551 */ NULL, /* quakenet */ +/* 552 */ NULL, /* quakenet */ +/* 553 */ NULL, /* quakenet */ /* 554 */ NULL, /* 555 */ NULL, /* 556 */ NULL, @@ -667,27 +667,27 @@ static char *replies[] = { /* 608 */ NULL, /* 609 */ NULL, /* 610 RPL_MAPMORE */ ":%s 610 %s :%s%-*s --> *more*", -/* 611 */ NULL, -/* 612 */ NULL, -/* 613 */ NULL, +/* 611 */ NULL, /* ultimate */ +/* 612 */ NULL, /* ultimate */ +/* 613 */ NULL, /* ultimate */ /* 614 */ NULL, -/* 615 */ NULL, -/* 616 */ NULL, +/* 615 */ NULL, /* ptlink, ultimate */ +/* 616 */ NULL, /* ultimate */ /* 617 RPL_DCCSTATUS */ ":%s 617 %s :%s has been %s your DCC allow list", /* 618 RPL_DCCLIST */ ":%s 618 %s :%s", /* 619 RPL_ENDOFDCCLIST */ ":%s 619 %s :End of DCCALLOW %s", /* 620 RPL_DCCINFO */ ":%s 620 %s :%s", -/* 621 */ NULL, -/* 622 */ NULL, -/* 623 */ NULL, -/* 624 */ NULL, -/* 625 */ NULL, -/* 626 */ NULL, +/* 621 */ NULL, /* ultimate */ +/* 622 */ NULL, /* ultimate */ +/* 623 */ NULL, /* ultimate */ +/* 624 */ NULL, /* ultimate */ +/* 625 */ NULL, /* ultimate */ +/* 626 */ NULL, /* ultimate */ /* 627 */ NULL, /* 628 */ NULL, /* 629 */ NULL, -/* 630 */ NULL, -/* 631 */ NULL, +/* 630 */ NULL, /* ultimate */ +/* 631 */ NULL, /* ultimate */ /* 632 */ NULL, /* 633 */ NULL, /* 634 */ NULL, @@ -696,9 +696,9 @@ static char *replies[] = { /* 637 */ NULL, /* 638 */ NULL, /* 639 */ NULL, -/* 640 RPL_DUMPING */ ":%s 640 %s :Dumping clients matching %s", -/* 641 RPL_DUMPRPL */ ":%s 641 %s %s %s %s %s %s%s%s%s", -/* 642 RPL_EODUMP */ ":%s 642 %s :End of /dusers - %i", +/* 640 */ NULL, +/* 641 */ NULL, +/* 642 */ NULL, /* 643 */ NULL, /* 644 */ NULL, /* 645 */ NULL, @@ -716,37 +716,37 @@ static char *replies[] = { /* 657 */ NULL, /* 658 */ NULL, /* 659 */ NULL, -/* 660 */ NULL, -/* 661 */ NULL, -/* 662 */ NULL, -/* 663 */ NULL, -/* 664 */ NULL, -/* 665 */ NULL, -/* 666 */ NULL, +/* 660 */ NULL, /* kineircd */ +/* 661 */ NULL, /* kineircd */ +/* 662 */ NULL, /* kineircd */ +/* 663 */ NULL, /* kineircd */ +/* 664 */ NULL, /* kineircd */ +/* 665 */ NULL, /* kineircd */ +/* 666 */ NULL, /* kineircd */ /* 667 */ NULL, /* 668 */ NULL, /* 669 */ NULL, -/* 670 */ NULL, -/* 671 */ NULL, -/* 672 */ NULL, -/* 673 */ NULL, +/* 670 */ NULL, /* kineircd */ +/* 671 */ NULL, /* kineircd */ +/* 672 */ NULL, /* ithildin */ +/* 673 */ NULL, /* ithildin */ /* 674 */ NULL, /* 675 */ NULL, /* 676 */ NULL, /* 677 */ NULL, -/* 678 */ NULL, -/* 679 */ NULL, +/* 678 */ NULL, /* kineircd */ +/* 679 */ NULL, /* kineircd */ /* 680 */ NULL, /* 681 */ NULL, -/* 682 */ NULL, +/* 682 */ NULL, /* kineircd */ /* 683 */ NULL, /* 684 */ NULL, /* 685 */ NULL, /* 686 */ NULL, -/* 687 */ NULL, -/* 688 */ NULL, -/* 689 */ NULL, -/* 690 */ NULL, +/* 687 */ NULL, /* kineircd */ +/* 688 */ NULL, /* kineircd */ +/* 689 */ NULL, /* kineircd */ +/* 690 */ NULL, /* kineircd */ /* 691 */ NULL, /* 692 */ NULL, /* 693 */ NULL, @@ -772,9 +772,9 @@ static char *replies[] = { /* 713 */ NULL, /* 714 */ NULL, /* 715 */ NULL, -/* 716 */ NULL, -/* 717 */ NULL, -/* 718 */ NULL, +/* 716 */ NULL, /* ratbox */ +/* 717 */ NULL, /* ratbox */ +/* 718 */ NULL, /* ratbox */ /* 719 */ NULL, /* 720 */ NULL, /* 721 */ NULL, @@ -827,10 +827,10 @@ static char *replies[] = { /* 768 */ NULL, /* 769 */ NULL, /* 770 */ NULL, -/* 771 */ NULL, +/* 771 */ NULL, /* ithildin */ /* 772 */ NULL, -/* 773 */ NULL, -/* 774 */ NULL, +/* 773 */ NULL, /* ithildin */ +/* 774 */ NULL, /* ithildin */ /* 775 */ NULL, /* 776 */ NULL, /* 777 */ NULL, @@ -1028,18 +1028,18 @@ static char *replies[] = { /* 969 */ NULL, /* 970 */ NULL, /* 971 */ NULL, -/* 972 */ NULL, -/* 973 */ NULL, -/* 974 */ NULL, -/* 975 */ NULL, -/* 976 */ NULL, -/* 977 */ NULL, -/* 978 */ NULL, -/* 979 */ NULL, -/* 980 */ NULL, -/* 981 */ NULL, -/* 982 */ NULL, -/* 983 */ NULL, +/* 972 ERR_CANNOTDOCOMMAND */ ":%s 972 %s %s :%s", +/* 973 */ NULL, /* kineircd */ +/* 974 ERR_CANNOTCHANGECHANMODE */ ":%s 974 %s %c :%s", +/* 975 */ NULL, /* kineircd */ +/* 976 */ NULL, /* kineircd */ +/* 977 */ NULL, /* kineircd */ +/* 978 */ NULL, /* kineircd */ +/* 979 */ NULL, /* kineircd */ +/* 980 */ NULL, /* kineircd */ +/* 981 */ NULL, /* kineircd */ +/* 982 */ NULL, /* kineircd */ +/* 983 */ NULL, /* kineircd */ /* 984 */ NULL, /* 985 */ NULL, /* 986 */ NULL, diff --git a/src/version.c.SH b/src/version.c.SH index 8f2b93a40..04a629744 100644 --- a/src/version.c.SH +++ b/src/version.c.SH @@ -97,7 +97,7 @@ char *unrealcredits[] = "Devin Reams, Cleggo - irc.ugcentral.net, Tillo - irc.OSirc.net,", "Matthew Burdine - irc.owns.us, Philip Veale - flame.tiefighter.org,", "Latinus - irc.lokanova.com, Vincent Guesnard - irc.rs2i.net,", - "Windfyre IRC Network - irc.windfyre.net", + "Windfyre IRC Network - irc.windfyre.net, SetNine - www.setnine.com", "=-=-=-=-=-=-=-=-=-=-=-=-=-=-[Hosting]=-=-=-=-=-=-=-=-=-=-=-=-=-=-=", "Phil Veale - email@phillipveale.com - http://www.tiefighter.org", "- Donating webhosting for the project amongst other things",