From ca7e8620b09085e6096b959665dc0fd77e57ce86 Mon Sep 17 00:00:00 2001 From: fishwaldo <> Date: Wed, 23 Jul 2003 12:45:51 +0000 Subject: [PATCH] cleaned up Bahamut code --- Bahamut.c | 149 +++++++++++----------------------------------- Bahamut.h | 175 +----------------------------------------------------- 2 files changed, 38 insertions(+), 286 deletions(-) diff --git a/Bahamut.c b/Bahamut.c index 20cad1a0..82b61f04 100644 --- a/Bahamut.c +++ b/Bahamut.c @@ -20,7 +20,7 @@ ** USA ** ** NeoStats CVS Identification -** $Id: Bahamut.c,v 1.3 2003/07/23 10:35:47 fishwaldo Exp $ +** $Id: Bahamut.c,v 1.4 2003/07/23 12:45:51 fishwaldo Exp $ */ #include "stats.h" @@ -35,76 +35,40 @@ IntCommands cmd_list[] = { /* Command Function srvmsg */ {MSG_STATS, Usr_Stats, 1, 0} , - {TOK_STATS, Usr_Stats, 1, 0} - , {MSG_VERSION, Usr_Version, 1, 0} , - {TOK_VERSION, Usr_Version, 1, 0} - , {MSG_MOTD, Usr_ShowMOTD, 1, 0} , - {TOK_MOTD, Usr_ShowMOTD, 1, 0} - , {MSG_CREDITS, Usr_Showcredits, 1, 0} , - {TOK_CREDITS, Usr_Showcredits, 1, 0} - , {MSG_SERVER, Usr_AddServer, 1, 0} , - {TOK_SERVER, Usr_AddServer, 1, 0} - , {MSG_SQUIT, Usr_DelServer, 1, 0} , - {TOK_SQUIT, Usr_DelServer, 1, 0} - , {MSG_QUIT, Usr_DelUser, 1, 0} , - {TOK_QUIT, Usr_DelUser, 1, 0} - , {MSG_MODE, Usr_Mode, 1, 0} , - {TOK_MODE, Usr_Mode, 1, 0} - , {MSG_SVSMODE, Usr_Smode, 1, 0} , - {TOK_SVSMODE, Usr_Smode, 1, 0} - , {MSG_KILL, Usr_Kill, 1, 0} , - {TOK_KILL, Usr_Kill, 1, 0} - , {MSG_PONG, Usr_Pong, 1, 0} , - {TOK_PONG, Usr_Pong, 1, 0} - , {MSG_AWAY, Usr_Away, 1, 0} , - {TOK_AWAY, Usr_Away, 1, 0} - , {MSG_NICK, Usr_Nick, 1, 0} , - {TOK_NICK, Usr_Nick, 1, 0} - , {MSG_TOPIC, Usr_Topic, 1, 0} , - {TOK_TOPIC, Usr_Topic, 1, 0} - , {MSG_KICK, Usr_Kick, 1, 0} , - {TOK_KICK, Usr_Kick, 1, 0} - , {MSG_JOIN, Usr_Join, 1, 0} , - {TOK_JOIN, Usr_Join, 1, 0} - , {MSG_PART, Usr_Part, 1, 0} , - {TOK_PART, Usr_Part, 1, 0} - , {MSG_PING, Srv_Ping, 0, 0} , - {TOK_PING, Srv_Ping, 0, 0} - , {MSG_SVINFO, Srv_Svinfo, 0, 0} , {MSG_CAPAB, Srv_Connect, 0, 0} @@ -115,28 +79,16 @@ IntCommands cmd_list[] = { , {MSG_PASS, Srv_Pass, 0, 0} , - {TOK_PASS, Srv_Pass, 0, 0} - , {MSG_SERVER, Srv_Server, 0, 0} , - {TOK_SERVER, Srv_Server, 0, 0} - , {MSG_SQUIT, Srv_Squit, 0, 0} , - {TOK_SQUIT, Srv_Squit, 0, 0} - , {MSG_NICK, Srv_Nick, 0, 0} , - {TOK_NICK, Srv_Nick, 0, 0} - , {MSG_SVSNICK, Srv_Svsnick, 0, 0} , - {TOK_SVSNICK, Srv_Svsnick, 0, 0} - , {MSG_KILL, Srv_Kill, 0, 0} , - {TOK_KILL, Srv_Kill, 0, 0} - , {NULL, NULL, 0, 0} }; @@ -182,46 +134,16 @@ aCtab cFlagTab[] = { Oper_Modes usr_mds[] = { {UMODE_OPER, 'o', 50} , - {UMODE_LOCOP, 'O', 40} - , {UMODE_INVISIBLE, 'i', 0} , - {UMODE_WALLOP, 'w', 0} - , - {UMODE_SERVNOTICE, 's', 0} - , - {UMODE_CLIENT, 'c', 0} - , {UMODE_REGNICK, 'r', 10} , - {UMODE_KILLS, 'k', 0} - , - {UMODE_HELPOP, 'h', 30} - , - {UMODE_FLOOD, 'f', 0} - , - {UMODE_SPY, 'y', 0} - , - {UMODE_DCC, 'D', 0} - , - {UMODE_GLOBOPS, 'g', 0} - , - {UMODE_CHATOP, 'c', 0} - , {UMODE_SERVICESADMIN, 'a', 200} , - {UMODE_REJ, 'j', 0} - , - {UMODE_ROUTE, 'n', 0} - , - {UMODE_SPAM, 'm', 0} - , - {UMODE_HIDE, 'x', 0} - , - {UMODE_DEBUG, 'd', 0} - , {UMODE_SERVADMIN, 'A', 100} , + {UMODE_REGONLY, 'R', 0} + , /* this is needed for bot support */ {UMODE_SERVICES, 'S', 200} , @@ -237,23 +159,23 @@ void init_ircd() int sserver_cmd(const char *name, const int numeric, const char *infoline) { sts(":%s %s %s %d :%s", me.name, - (me.token ? TOK_SERVER : MSG_SERVER), name, numeric, infoline); + MSG_SERVER, name, numeric, infoline); return 1; } int slogin_cmd(const char *name, const int numeric, const char *infoline, const char *pass) { - sts("%s %s :TS", (me.token ? TOK_PASS : MSG_PASS), pass); - sts("CAPAB TS5 SSJOIN BURST NICKIP CLIENT"); - sts("%s %s %d :%s", (me.token ? TOK_SERVER : MSG_SERVER), name, + sts("%s %s :TS", MSG_PASS, pass); + sts("CAPAB TS3 SSJOIN BURST NICKIP"); + sts("%s %s %d :%s", MSG_SERVER, name, numeric, infoline); return 1; } int ssquit_cmd(const char *server) { - sts("%s %s", (me.token ? TOK_SQUIT : MSG_SQUIT), server); + sts("%s %s", MSG_SQUIT, server); return 1; } @@ -264,14 +186,14 @@ int sprotocol_cmd(const char *option) int squit_cmd(const char *who, const char *quitmsg) { - sts(":%s %s :%s", who, (me.token ? TOK_QUIT : MSG_QUIT), quitmsg); + sts(":%s %s :%s", who, MSG_QUIT, quitmsg); DelUser(who); return 1; } int spart_cmd(const char *who, const char *chan) { - sts(":%s %s %s", who, (me.token ? TOK_PART : MSG_PART), chan); + sts(":%s %s %s", who, MSG_PART, chan); part_chan(finduser(who), (char *) chan); return 1; } @@ -322,7 +244,7 @@ int schmode_cmd(const char *who, const char *chan, const char *mode, char tmp[512]; sts(":%s %s %s %s %s %lu", me.name, - (me.token ? TOK_MODE : MSG_MODE), chan, mode, args, + MSG_MODE, chan, mode, args, time(NULL)); snprintf(tmp, 512, "%s %s %s", chan, mode, args); ac = split_buf(tmp, &av, 0); @@ -347,7 +269,7 @@ int snewnick_cmd(const char *nick, const char *ident, const char *host, } newmode[j] = '\0'; sts("%s %s 1 %lu %s %s %s %s 0 %lu :%s", - (me.token ? TOK_NICK : MSG_NICK), nick, time(NULL), newmode, + MSG_NICK, nick, time(NULL), newmode, ident, host, me.name, time(NULL), realname); AddUser(nick, ident, host, me.name, 0, time(NULL)); UserMode(nick, newmode, 0); @@ -356,7 +278,7 @@ int snewnick_cmd(const char *nick, const char *ident, const char *host, int sping_cmd(const char *from, const char *reply, const char *to) { - sts(":%s %s %s :%s", from, (me.token ? TOK_PING : MSG_PING), reply, + sts(":%s %s %s :%s", from, MSG_PING, reply, to); return 1; } @@ -375,7 +297,7 @@ int sumode_cmd(const char *who, const char *target, long mode) } newmode[j] = '\0'; - sts(":%s %s %s :%s", who, (me.token ? TOK_MODE : MSG_MODE), target, + sts(":%s %s %s :%s", who, MSG_MODE, target, newmode); UserMode(target, newmode, 0); return 1; @@ -395,17 +317,17 @@ int snumeric_cmd(const int numeric, const char *target, const char *data, int spong_cmd(const char *reply) { - sts("%s %s", (me.token ? TOK_PONG : MSG_PONG), reply); + sts("%s %s", MSG_PONG, reply); return 1; } - +#if 0 int snetinfo_cmd() { sts(":%s %s 0 %d %d %s 0 0 0 :%s", me.name, MSG_SNETINFO, time(NULL), ircd_srv.uprot, ircd_srv.cloak, me.netname); return 1; } - +#endif int skill_cmd(const char *from, const char *target, const char *reason, ...) { @@ -413,7 +335,7 @@ int skill_cmd(const char *from, const char *target, const char *reason, char buf[512]; va_start(ap, reason); vsnprintf(buf, 512, reason, ap); - sts(":%s %s %s :%s", from, (me.token ? TOK_KILL : MSG_KILL), + sts(":%s %s %s :%s", from, MSG_KILL, target, buf); va_end(ap); DelUser(target); @@ -435,10 +357,10 @@ int ssvskill_cmd(const char *who, const char *reason, ...) int ssmo_cmd(const char *from, const char *umodetarget, const char *msg) { chanalert(s_Services, - "Warning, Module %s tried to SMO, which is not supported in Ultimate", + "Warning, Module %s tried to SMO, which is not supported in Bahamut", segvinmodule); nlog(LOG_NOTICE, LOG_CORE, - "Warning, Module %s tried to SMO, which is not supported in Ultimate", + "Warning, Module %s tried to SMO, which is not supported in Bahamut", segvinmodule); return 1; } @@ -446,23 +368,23 @@ int ssmo_cmd(const char *from, const char *umodetarget, const char *msg) int snick_cmd(const char *oldnick, const char *newnick) { Change_User(finduser(oldnick), newnick); - sts(":%s %s %s %d", oldnick, (me.token ? TOK_NICK : MSG_NICK), + sts(":%s %s %s %d", oldnick, MSG_NICK, newnick, time(NULL)); return 1; } int sswhois_cmd(const char *target, const char *swhois) { chanalert(s_Services, - "Warning Module %s tried to SWHOIS, which is not supported in Ultimate", + "Warning Module %s tried to SWHOIS, which is not supported in Bahamut", segvinmodule); nlog(LOG_NOTICE, LOG_CORE, - "Warning. Module %s tried to SWHOIS, which is not supported in Ultimate", + "Warning. Module %s tried to SWHOIS, which is not supported in Bahamut", segvinmodule); return 1; } int ssvsnick_cmd(const char *target, const char *newnick) { - sts("%s %s %s :%d", (me.token ? TOK_SVSNICK : MSG_SVSNICK), target, + sts("%s %s %s :%d", MSG_SVSNICK, target, newnick, time(NULL)); return 1; } @@ -470,10 +392,10 @@ int ssvsnick_cmd(const char *target, const char *newnick) int ssvsjoin_cmd(const char *target, const char *chan) { chanalert(s_Services, - "Warning Module %s tried to SVSJOIN, which is not supported in Ultimate", + "Warning Module %s tried to SVSJOIN, which is not supported in Bahamut", segvinmodule); nlog(LOG_NOTICE, LOG_CORE, - "Warning. Module %s tried to SVSJOIN, which is not supported in Ultimate", + "Warning. Module %s tried to SVSJOIN, which is not supported in Bahamut", segvinmodule); return 1; } @@ -481,10 +403,10 @@ int ssvsjoin_cmd(const char *target, const char *chan) int ssvspart_cmd(const char *target, const char *chan) { chanalert(s_Services, - "Warning Module %s tried to SVSPART, which is not supported in Ultimate", + "Warning Module %s tried to SVSPART, which is not supported in Bahamut", segvinmodule); nlog(LOG_NOTICE, LOG_CORE, - "Warning. Module %s tried to SVSPART, which is not supported in Ultimate", + "Warning. Module %s tried to SVSPART, which is not supported in Bahamut", segvinmodule); return 1; } @@ -492,7 +414,7 @@ int ssvspart_cmd(const char *target, const char *chan) int skick_cmd(const char *who, const char *target, const char *chan, const char *reason) { - sts(":%s %s %s %s :%s", who, (me.token ? TOK_KICK : MSG_KICK), + sts(":%s %s %s %s :%s", who, MSG_KICK, chan, target, (reason ? reason : "No Reason Given")); part_chan(finduser(target), (char *) chan); return 1; @@ -503,7 +425,7 @@ int swallops_cmd(const char *who, const char *msg, ...) char buf[512]; va_start(ap, msg); vsnprintf(buf, 512, msg, ap); - sts(":%s %s :%s", who, (me.token ? TOK_WALLOPS : MSG_WALLOPS), + sts(":%s %s :%s", who, MSG_WALLOPS, buf); va_end(ap); return 1; @@ -512,10 +434,10 @@ int swallops_cmd(const char *who, const char *msg, ...) int ssvshost_cmd(const char *who, const char *vhost) { chanalert(s_Services, - "Warning Module %s tried to SVSHOST, which is not supported in Ultimate", + "Warning Module %s tried to SVSHOST, which is not supported in Bahamut", segvinmodule); nlog(LOG_NOTICE, LOG_CORE, - "Warning. Module %s tried to SVSHOST, which is not supported in Ultimate", + "Warning. Module %s tried to SVSHOST, which is not supported in Bahamut", segvinmodule); return 1; } @@ -527,7 +449,7 @@ int sakill_cmd(const char *host, const char *ident, const char *setby, va_start(ap, reason); vsnprintf(buf, 512, reason, ap); sts(":%s %s %s %s %d %s %d :%s", me.name, - (me.token ? TOK_AKILL : MSG_AKILL), host, ident, length, setby, + MSG_AKILL, host, ident, length, setby, time(NULL), buf); va_end(ap); return 1; @@ -535,7 +457,7 @@ int sakill_cmd(const char *host, const char *ident, const char *setby, int srakill_cmd(const char *host, const char *ident) { - sts(":%s %s %s %s", me.name, (me.token ? TOK_RAKILL : MSG_RAKILL), + sts(":%s %s %s %s", me.name, MSG_RAKILL, host, ident); return 1; } @@ -543,7 +465,7 @@ int srakill_cmd(const char *host, const char *ident) int ssvinfo_cmd() { - sts("SVINFO 5 3 0 :%d", time(NULL)); + sts("SVINFO 3 3 0 :%d", time(NULL)); return 1; } int sburst_cmd(int b) @@ -569,7 +491,6 @@ void chanalert(char *who, char *buf, ...) if (me.onchan) { snprintf(out, 512, ":%s PRIVMSG %s :%s", who, me.chan, tmp); - nlog(LOG_DEBUG3, LOG_CORE, "SENT: %s", out); sts("%s", out); } va_end(ap); diff --git a/Bahamut.h b/Bahamut.h index a8826abc..60f2ca20 100644 --- a/Bahamut.h +++ b/Bahamut.h @@ -20,7 +20,7 @@ ** USA ** ** NeoStats CVS Identification -** $Id: Bahamut.h,v 1.3 2003/07/23 10:35:47 fishwaldo Exp $ +** $Id: Bahamut.h,v 1.4 2003/07/23 12:45:51 fishwaldo Exp $ */ #ifndef BAHAMUT_H #define BAHAMUT_H @@ -30,285 +30,138 @@ #define MSG_PRIVATE "PRIVMSG" /* PRIV */ -#define TOK_PRIVATE "!" /* 33 */ #define MSG_WHO "WHO" /* WHO -> WHOC */ -#define TOK_WHO "\"" /* 34 */ #define MSG_WHOIS "WHOIS" /* WHOI */ -#define TOK_WHOIS "#" /* 35 */ #define MSG_WHOWAS "WHOWAS" /* WHOW */ -#define TOK_WHOWAS "$" /* 36 */ #define MSG_USER "USER" /* USER */ -#define TOK_USER "%" /* 37 */ #define MSG_NICK "NICK" /* NICK */ -#define TOK_NICK "&" /* 38 */ #define MSG_SERVER "SERVER" /* SERV */ -#define TOK_SERVER "'" /* 39 */ #define MSG_LIST "LIST" /* LIST */ -#define TOK_LIST "(" /* 40 */ #define MSG_TOPIC "TOPIC" /* TOPI */ -#define TOK_TOPIC ")" /* 41 */ #define MSG_INVITE "INVITE" /* INVI */ -#define TOK_INVITE "*" /* 42 */ #define MSG_VERSION "VERSION" /* VERS */ -#define TOK_VERSION "+" /* 43 */ #define MSG_QUIT "QUIT" /* QUIT */ -#define TOK_QUIT "," /* 44 */ #define MSG_SQUIT "SQUIT" /* SQUI */ -#define TOK_SQUIT "-" /* 45 */ #define MSG_KILL "KILL" /* KILL */ -#define TOK_KILL "." /* 46 */ #define MSG_INFO "INFO" /* INFO */ -#define TOK_INFO "/" /* 47 */ #define MSG_LINKS "LINKS" /* LINK */ -#define TOK_LINKS "0" /* 48 */ #define MSG_WATCH "WATCH" /* WATCH */ -#define TOK_WATCH "1" /* 49 */ #define MSG_STATS "STATS" /* STAT */ -#define TOK_STATS "2" /* 50 */ #define MSG_HELP "HELP" /* HELP */ #define MSG_HELPOP "HELPOP" /* HELP */ -#define TOK_HELP "4" /* 52 */ #define MSG_ERROR "ERROR" /* ERRO */ -#define TOK_ERROR "5" /* 53 */ #define MSG_AWAY "AWAY" /* AWAY */ -#define TOK_AWAY "6" /* 54 */ #define MSG_CONNECT "CONNECT" /* CONN */ -#define TOK_CONNECT "7" /* 55 */ #define MSG_PING "PING" /* PING */ -#define TOK_PING "8" /* 56 */ #define MSG_PONG "PONG" /* PONG */ -#define TOK_PONG "9" /* 57 */ #define MSG_OPER "OPER" /* OPER */ -#define TOK_OPER ";" /* 59 */ #define MSG_PASS "PASS" /* PASS */ -#define TOK_PASS "<" /* 60 */ #define MSG_WALLOPS "WALLOPS" /* WALL */ -#define TOK_WALLOPS "=" /* 61 */ #define MSG_TIME "TIME" /* TIME */ -#define TOK_TIME ">" /* 62 */ #define MSG_NAMES "NAMES" /* NAME */ -#define TOK_NAMES "?" /* 63 */ #define MSG_ADMIN "ADMIN" /* ADMI */ -#define TOK_ADMIN "@" /* 64 */ #define MSG_NOTICE "NOTICE" /* NOTI */ -#define TOK_NOTICE "B" /* 66 */ #define MSG_JOIN "JOIN" /* JOIN */ -#define TOK_JOIN "C" /* 67 */ #define MSG_PART "PART" /* PART */ -#define TOK_PART "D" /* 68 */ #define MSG_LUSERS "LUSERS" /* LUSE */ -#define TOK_LUSERS "E" /* 69 */ #define MSG_MOTD "MOTD" /* MOTD */ -#define TOK_MOTD "F" /* 70 */ #define MSG_MODE "MODE" /* MODE */ -#define TOK_MODE "G" /* 71 */ #define MSG_KICK "KICK" /* KICK */ -#define TOK_KICK "H" /* 72 */ #define MSG_SERVICE "SERVICE" /* SERV -> SRVI */ -#define TOK_SERVICE "I" /* 73 */ #define MSG_USERHOST "USERHOST" /* USER -> USRH */ -#define TOK_USERHOST "J" /* 74 */ #define MSG_ISON "ISON" /* ISON */ -#define TOK_ISON "K" /* 75 */ #define MSG_SQUERY "SQUERY" /* SQUE */ -#define TOK_SQUERY "L" /* 76 */ #define MSG_SERVLIST "SERVLIST" /* SERV -> SLIS */ -#define TOK_SERVLIST "M" /* 77 */ #define MSG_SERVSET "SERVSET" /* SERV -> SSET */ -#define TOK_SERVSET "N" /* 78 */ #define MSG_REHASH "REHASH" /* REHA */ -#define TOK_REHASH "O" /* 79 */ #define MSG_RESTART "RESTART" /* REST */ -#define TOK_RESTART "P" /* 80 */ #define MSG_CLOSE "CLOSE" /* CLOS */ -#define TOK_CLOSE "Q" /* 81 */ #define MSG_DIE "DIE" /* DIE */ -#define TOK_DIE "R" /* 82 */ #define MSG_HASH "HASH" /* HASH */ -#define TOK_HASH "S" /* 83 */ #define MSG_DNS "DNS" /* DNS -> DNSS */ -#define TOK_DNS "T" /* 84 */ #define MSG_SILENCE "SILENCE" /* SILE */ -#define TOK_SILENCE "U" /* 85 */ #define MSG_AKILL "AKILL" /* AKILL */ -#define TOK_AKILL "V" /* 86 */ #define MSG_KLINE "KLINE" /* KLINE */ -#define TOK_KLINE "W" /* 87 */ #define MSG_UNKLINE "UNKLINE" /* UNKLINE */ -#define TOK_UNKLINE "X" /* 88 */ #define MSG_RAKILL "RAKILL" /* RAKILL */ -#define TOK_RAKILL "Y" /* 89 */ #define MSG_GNOTICE "GNOTICE" /* GNOTICE */ -#define TOK_GNOTICE "Z" /* 90 */ #define MSG_GOPER "GOPER" /* GOPER */ -#define TOK_GOPER "[" /* 91 */ #define MSG_GLOBOPS "GLOBOPS" /* GLOBOPS */ -#define TOK_GLOBOPS "]" /* 93 */ #define MSG_LOCOPS "LOCOPS" /* LOCOPS */ -#define TOK_LOCOPS "^" /* 94 */ #define MSG_PROTOCTL "PROTOCTL" /* PROTOCTL */ -#define TOK_PROTOCTL "_" /* 95 */ #define MSG_TRACE "TRACE" /* TRAC */ -#define TOK_TRACE "b" /* 98 */ #define MSG_SQLINE "SQLINE" /* SQLINE */ -#define TOK_SQLINE "c" /* 99 */ #define MSG_UNSQLINE "UNSQLINE" /* UNSQLINE */ -#define TOK_UNSQLINE "d" /* 100 */ #define MSG_SVSNICK "SVSNICK" /* SVSNICK */ -#define TOK_SVSNICK "e" /* 101 */ #define MSG_SVSNOOP "SVSNOOP" /* SVSNOOP */ -#define TOK_SVSNOOP "f" /* 101 */ #define MSG_IDENTIFY "IDENTIFY" /* IDENTIFY */ -#define TOK_IDENTIFY "g" /* 103 */ #define MSG_SVSKILL "SVSKILL" /* SVSKILL */ -#define TOK_SVSKILL "h" /* 104 */ -#define MSG_NICKSERV "NICKSERV" /* NICKSERV */ -#define MSG_NS "NS" -#define TOK_NICKSERV "i" /* 105 */ -#define MSG_CHANSERV "CHANSERV" /* CHANSERV */ -#define MSG_CS "CS" -#define TOK_CHANSERV "j" /* 106 */ -#define MSG_OPERSERV "OPERSERV" /* OPERSERV */ -#define MSG_OS "OS" -#define TOK_OPERSERV "k" /* 107 */ -#define MSG_MEMOSERV "MEMOSERV" /* MEMOSERV */ -#define MSG_MS "MS" -#define TOK_MEMOSERV "l" /* 108 */ -#define MSG_SERVICES "SERVICES" /* SERVICES */ -#define TOK_SERVICES "m" /* 109 */ #define MSG_SVSMODE "SVSMODE" /* SVSMODE */ -#define TOK_SVSMODE "n" /* 110 */ #define MSG_SAMODE "SAMODE" /* SAMODE */ -#define TOK_SAMODE "o" /* 111 */ #define MSG_CHATOPS "CHATOPS" /* CHATOPS */ -#define TOK_CHATOPS "p" /* 112 */ #define MSG_HELPSERV "HELPSERV" /* HELPSERV */ -#define TOK_HELPSERV "r" /* 114 */ #define MSG_ZLINE "ZLINE" /* ZLINE */ -#define TOK_ZLINE "s" /* 115 */ #define MSG_UNZLINE "UNZLINE" /* UNZLINE */ -#define TOK_UNZLINE "t" /* 116 */ #define MSG_NETINFO "NETINFO" /* NETINFO */ -#define TOK_NETINFO "u" /* 117 */ #define MSG_RULES "RULES" /* RULES */ -#define TOK_RULES "v" /* 118 */ #define MSG_MAP "MAP" /* MAP */ -#define TOK_MAP "w" /* 119 */ #define MSG_NETG "NETG" /* NETG */ -#define TOK_NETG "x" /* 120 */ #define MSG_ADCHAT "ADCHAT" /* Adchat */ -#define TOK_ADCHAT "y" /* 121 */ #define MSG_MAKEPASS "MAKEPASS" /* MAKEPASS */ -#define TOK_MAKEPASS "z" /* 122 */ #define MSG_ADDHUB "ADDHUB" /* ADDHUB */ -#define TOK_ADDHUB "{" /* 123 */ #define MSG_DELHUB "DELHUB" /* DELHUB */ -#define TOK_DELHUB "|" /* 124 */ #define MSG_ADDCNLINE "ADDCNLINE" /* ADDCNLINE */ -#define TOK_ADDCNLINE "}" /* 125 */ #define MSG_DELCNLINE "DELCNLINE" /* DELCNLINE */ -#define TOK_DELCNLINE "~" /* 126 */ #define MSG_ADDOPER "ADDOPER" /* ADDOPER */ -#define TOK_ADDOPER "" /* 127 */ #define MSG_DELOPER "DELOPER" /* DELOPER */ -#define TOK_DELOPER "!!" /* 33 + 33 */ #define MSG_ADDQLINE "ADDQLINE" /* ADDQLINE */ -#define TOK_ADDQLINE "!\"" /* 33 + 34 */ #define MSG_DELQLINE "DELQLINE" /* DELQLINE */ -#define TOK_DELQLINE "!#" /* 33 + 35 */ #define MSG_GSOP "GSOP" /* GSOP */ -#define TOK_GSOP "!$" /* 33 + 36 */ #define MSG_ISOPER "ISOPER" /* ISOPER */ -#define TOK_ISOPER "!%" /* 33 + 37 */ #define MSG_ADG "ADG" /* ADG */ -#define TOK_ADG "!&" /* 33 + 38 */ #define MSG_NMON "NMON" /* NMON */ -#define TOK_NMON "!'" /* 33 + 39 */ #define MSG_DALINFO "DALINFO" /* DALnet Credits */ -#define TOK_DALINFO "!(" /* 33 + 40 */ #define MSG_CREDITS "CREDITS" /* UltimateIRCd Credits and "Thanks To" */ -#define TOK_CREDITS "!)" /* 33 + 41 */ #define MSG_OPERMOTD "OPERMOTD" /* OPERMOTD */ -#define TOK_OPERMOTD "!*" /* 33 + 42 */ #define MSG_REMREHASH "REMREHASH" /* Remote Rehash */ -#define TOK_REMREHASH "!+" /* 33 + 43 */ #define MSG_MONITOR "MONITOR" /* MONITOR */ -#define TOK_MONITOR "!," /* 33 + 44 */ #define MSG_GLINE "GLINE" /* The awesome g-line */ -#define TOK_GLINE "!-" /* 33 + 45 */ #define MSG_REMGLINE "REMGLINE" /* remove g-line */ -#define TOK_REMGLINE "!." /* 33 + 46 */ #define MSG_STATSERV "STATSERV" /* StatServ */ -#define TOK_STATSERV "!/" /* 33 + 47 */ #define MSG_RULESERV "RULESERV" /* RuleServ */ -#define TOK_RULESERV "!0" /* 33 + 48 */ #define MSG_SNETINFO "SNETINFO" /* SNetInfo */ -#define TOK_SNETINFO "!1" /* 33 + 49 */ #define MSG_TSCTL "TSCTL" /* TSCTL */ -#define TOK_TSCTL "!3" /* 33 + 51 */ #define MSG_SVSJOIN "SVSJOIN" /* SVSJOIN */ -#define TOK_SVSJOIN "!4" /* 33 + 52 */ #define MSG_SAJOIN "SAJOIN" /* SAJOIN */ -#define TOK_SAJOIN "!5" /* 33 + 53 */ #define MSG_SDESC "SDESC" /* SDESC */ -#define TOK_SDESC "!6" /* 33 + 54 */ #define MSG_UNREALINFO "UNREALINFO" /* Unreal Info */ -#define TOK_UNREALINFO "!7" /* 33 + 55 */ #define MSG_SETHOST "SETHOST" /* sethost */ -#define TOK_SETHOST "!8" /* 33 + 56 */ #define MSG_SETIDENT "SETIDENT" /* set ident */ -#define TOK_SETIDENT "!9" /* 33 + 57 */ #define MSG_SETNAME "SETNAME" /* set Realname */ -#define TOK_SETNAME "!;" /* 33 + 59 */ #define MSG_CHGHOST "CHGHOST" /* Changehost */ -#define TOK_CHGHOST "!<" /* 33 + 60 */ #define MSG_CHGIDENT "CHGIDENT" /* Change Ident */ -#define TOK_CHGIDENT "!=" /* 33 + 61 */ #define MSG_RANDQUOTE "RANDQUOTE" /* Random Quote */ -#define TOK_RANDQUOTE "!>" /* 33 + 62 */ #define MSG_ADDQUOTE "ADDQUOTE" /* Add Quote */ -#define TOK_ADDQUOTE "!?" /* 33 + 63 */ #define MSG_ADDGQUOTE "ADDGQUOTE" /* Add Global Quote */ -#define TOK_ADDGQUOTE "!@" /* 33 + 64 */ #define MSG_ADDULINE "ADDULINE" /* Adds an U Line to ircd.conf file */ -#define TOK_ADDULINE "!B" /* 33 + 66 */ #define MSG_DELULINE "DELULINE" /* Removes an U line from the ircd.conf */ -#define TOK_DELULINE "!C" /* 33 + 67 */ #define MSG_KNOCK "KNOCK" /* Knock Knock - Who's there? */ -#define TOK_KNOCK "!D" /* 33 + 68 */ #define MSG_SETTINGS "SETTINGS" /* Settings */ -#define TOK_SETTINGS "!E" /* 33 + 69 */ #define MSG_IRCOPS "IRCOPS" /* Shows Online IRCOps */ -#define TOK_IRCOPS "!F" /* 33 + 70 */ #define MSG_SVSPART "SVSPART" /* SVSPART */ -#define TOK_SVSPART "!G" /* 33 + 71 */ #define MSG_SAPART "SAPART" /* SAPART */ -#define TOK_SAPART "!H" /* 33 + 72 */ #define MSG_VCTRL "VCTRL" /* VCTRL */ -#define TOK_VCTRL "!I" /* 33 + 73 */ #define MSG_GCLIENT "GCLIENT" /* GLIENT */ -#define TOK_GCLIENT "!J" /* 33 + 74 */ #define MSG_CHANNEL "CHANNEL" /* CHANNEL */ -#define TOK_CHANNEL "!K" /* 33 + 75 */ #define MSG_UPTIME "UPTIME" /* UPTIME */ -#define TOK_UPTIME "!L" /* 33 + 76 */ #define MSG_FAILOPS "FAILOPS" /* FAILOPS */ -#define TOK_FAILOPS "!M" /* 33 + 77 */ - #define MSG_RPING "RPING" /* RPING */ -#define TOK_RPING "!P" /* 33 + 80 */ #define MSG_RPONG "RPONG" /* RPONG */ -#define TOK_RPONG "!Q" /* 33 + 81 */ #define MSG_UPING "UPING" /* UPING */ -#define TOK_UPING "!R" /* 33 + 82 */ #define MSG_COPYRIGHT "COPYRIGHT" /* Copyright */ -#define TOK_COPYRIGHT "!S" /* 33 + 83 */ #define MSG_BOTSERV "BOTSERV" /* BOTSERV */ -#define MSG_BS "BS" -#define TOK_BOTSERV "!T" /* 33 + 84 */ #define MSG_ROOTSERV "ROOTSERV" /* ROOTSERV */ #define MSG_RS "RS" -#define TOK_ROOTSERV "!U" /* 33 + 85 */ #define MSG_SVINFO "SVINFO" #define MSG_CAPAB "CAPAB" #define MSG_BURST "BURST" @@ -322,32 +175,10 @@ #define UMODE_OPER 0x0002 /* Operator */ /* UMODE_SERVICES is actually UMODE_OPER on Bahamut !*/ #define UMODE_SERVICES UMODE_OPER - -#define UMODE_WALLOP 0x0004 /* send wallops to them */ -#define UMODE_FAILOP 0x0008 /* Shows some global messages */ -#define UMODE_HELPOP 0x0010 /* Help system operator */ +#define UMODE_REGONLY 0x0010 /* only registered nicks may PM */ #define UMODE_REGNICK 0x0020 /* Nick set by services as registered */ #define UMODE_SERVADMIN 0x0040 /* server admin */ -#define UMODE_SPY 0x0080 /* Oper Spy */ -#define UMODE_DCC 0x10000 /* Oper DCC Notices */ -#define UMODE_GLOBOPS 0x20000 /* send/recv global notices */ -#define UMODE_REJ 0x40000 /* see DCC reject notices */ -#define UMODE_ROUTE 0x80000 /* see Routing Notices */ -#define UMODE_SPAM 0x100000 /* see spambot warnings */ -#define UMODE_PROT 0x400000 /* protected IRC op */ -#define UMODE_GLOBCON 0x800000 /* Global Connect notices */ -#define UMODE_DEBUG 0x4000000 /* see debug notices */ -#define UMODE_DCCWARN 0x8000000 /* see DCC warnings */ -#define UMODE_SERVNOTICE 0x0100 /* server notices such as kill */ -#define UMODE_LOCOP 0x0200 /* Local operator -- SRB */ -#define UMODE_KILLS 0x0400 /* Show server-kills... */ -#define UMODE_CLIENT 0x0800 /* Show client information */ -#define UMODE_FLOOD 0x1000 /* Receive flood warnings */ -#define UMODE_CHATOP 0x2000 /* can receive chatops */ -#define UMODE_HIDE 0x8000 /* Hide from Nukes */ -#define UMODE_WHOIS 0x200000 /* Lets Opers see when people do a /WhoIs on them */ -#define UMODE_IRCADMIN 0x1000000 /* Marks the client as an IRC Administrator */ -#define UMODE_SERVICESADMIN 0x2000000 /* Marks the client as a Services Administrator */ +#define UMODE_SERVICESADMIN 0x0080 /* Marks the client as a Services Administrator */