*
* $Id$
*/
+#include "config.h"
+
#include "parse.h"
#include "client.h"
#include "channel.h"
#include "ircd.h"
#include "ircd_alloc.h"
#include "ircd_chattr.h"
+#include "ircd_features.h"
+#include "ircd_policy.h"
#include "ircd_reply.h"
#include "ircd_string.h"
#include "msg.h"
/* UNREG, CLIENT, SERVER, OPER, SERVICE */
{ m_unregistered, m_not_oper, ms_wallops, mo_wallops, m_ignore }
},
+ {
+ MSG_WALLUSERS,
+ TOK_WALLUSERS,
+ 0, MAXPARA, MFLG_SLOW, 0,
+ /* UNREG, CLIENT, SERVER, OPER, SERVICE */
+ { m_unregistered, m_not_oper, ms_wallusers, mo_wallusers, m_ignore }
+ },
{
MSG_DESYNCH,
TOK_DESYNCH,
TOK_PING,
0, MAXPARA, MFLG_SLOW, 0,
/* UNREG, CLIENT, SERVER, OPER, SERVICE */
- { m_unregistered, m_ping, ms_ping, m_ping, m_ignore }
+ { m_unregistered, m_ping, ms_ping, mo_ping, m_ignore }
},
{
MSG_PONG,
TOK_ERROR,
0, MAXPARA, MFLG_SLOW | MFLG_UNREG, 0,
/* UNREG, CLIENT, SERVER, OPER, SERVICE */
- { m_ignore, m_ignore, ms_error, m_ignore, m_ignore }
+ { mr_error, m_ignore, ms_error, m_ignore, m_ignore }
},
{
MSG_KILL,
TOK_WHOIS,
0, MAXPARA, MFLG_SLOW, 0,
/* UNREG, CLIENT, SERVER, OPER, SERVICE */
- { m_unregistered, m_whois, m_whois, m_whois, m_ignore }
+ { m_unregistered, m_whois, ms_whois, m_whois, m_ignore }
},
{
MSG_WHO,
TOK_TRACE,
0, MAXPARA, MFLG_SLOW, 0,
/* UNREG, CLIENT, SERVER, OPER, SERVICE */
+#ifdef HEAD_IN_SAND_TRACE
+ { m_unregistered, m_not_oper, ms_trace, mo_trace, m_ignore }
+#else
{ m_unregistered, m_trace, ms_trace, mo_trace, m_ignore }
+#endif
},
{
MSG_PASS,
TOK_OPER,
0, MAXPARA, MFLG_SLOW, 0,
/* UNREG, CLIENT, SERVER, OPER, SERVICE */
-#ifndef NOOPER
{ m_unregistered, m_oper, ms_oper, mo_oper, m_ignore }
-#else
- { m_unregistered, m_oper, m_ignore, m_ignore, m_ignore }
-#endif
},
{
MSG_CONNECT,
TOK_MAP,
0, MAXPARA, MFLG_SLOW, 0,
/* UNREG, CLIENT, SERVER, OPER, SERVICE */
+#ifdef HEAD_IN_SAND_MAP
+ { m_unregistered, m_map_redirect, m_ignore, m_map, m_ignore }
+#else
{ m_unregistered, m_map, m_ignore, m_map, m_ignore }
+#endif
},
{
MSG_VERSION,
TOK_VERSION,
0, MAXPARA, MFLG_SLOW | MFLG_UNREG, 0,
/* UNREG, CLIENT, SERVER, OPER, SERVICE */
- { m_version, m_version, ms_version, m_version, m_ignore }
+ { m_version, m_version, ms_version, mo_version, m_ignore }
},
{
MSG_STATS,
TOK_LINKS,
0, MAXPARA, MFLG_SLOW, 0,
/* UNREG, CLIENT, SERVER, OPER, SERVICE */
+#ifdef HEAD_IN_SAND_LINKS
+ { m_unregistered, m_links_redirect, ms_links, m_links, m_ignore }
+#else
{ m_unregistered, m_links, ms_links, m_links, m_ignore }
+#endif
},
{
MSG_ADMIN,
TOK_ADMIN,
0, MAXPARA, MFLG_SLOW | MFLG_UNREG, 0,
/* UNREG, CLIENT, SERVER, OPER, SERVICE */
- { m_admin, m_admin, ms_admin, m_admin, m_ignore }
+ { m_admin, m_admin, ms_admin, mo_admin, m_ignore }
},
{
MSG_HELP,
TOK_JUPE,
0, MAXPARA, MFLG_SLOW, 0,
/* UNREG, CLIENT, SERVER, OPER, SERVICE */
-#ifdef CONFIG_OPERCMDS
{ m_unregistered, m_jupe, ms_jupe, mo_jupe, m_ignore }
-#else
- { m_unregistered, m_jupe, ms_jupe, m_jupe, m_ignore }
-#endif /* CONFIG_OPERCMDS */
},
{
MSG_OPMODE,
/* UNREG, CLIENT, SERVER, OPER, SERVICE */
{ m_unregistered, m_not_oper, m_ignore, mo_get, m_ignore }
},
+ {
+ MSG_PRIVS,
+ TOK_PRIVS,
+ 0, MAXPARA, MFLG_SLOW, 0,
+ /* UNREG, CLIENT, SERVER, OPER, SERVICE */
+ { m_unregistered, m_not_oper, m_ignore, mo_privs, m_ignore }
+ },
+ {
+ MSG_ACCOUNT,
+ TOK_ACCOUNT,
+ 0, MAXPARA, MFLG_SLOW, 0,
+ /* UNREG, CLIENT, SERVER, OPER, SERVICE */
+ { m_ignore, m_ignore, ms_account, m_ignore, m_ignore }
+ },
/* This command is an alias for QUIT during the unregistered part of
* of the server. This is because someone jumping via a broken web
* proxy will send a 'POST' as their first command - which we will
0, MAXPARA, MFLG_SLOW, 0,
/* UNREG, CLIENT, SERVER, OPER, SERVICE */
{ m_quit, m_ignore, m_ignore, m_ignore, m_ignore }
- },
+ },
{ 0 }
-};
-
+};
-#ifdef GODMODE
-extern int sdbflag;
-#endif /* GODMODE */
static char *para[MAXPARA + 2]; /* leave room for prefix and null */
}
return mptr;
}
- /*
+ /*
* This should never happen
*/
assert(0);
int ii;
struct Message **msgtab_tok;
struct Message **msgtok;
-
+
for (i = 0; msg->cmd; ++i, ++msg)
continue;
qsort(msgtab, i, sizeof(struct Message),
handler = mptr->handlers[cli_handler(cptr)];
assert(0 != handler);
-#ifndef IDLE_FROM_MSG
- if (IsUser(cptr) && handler != m_ping && handler != m_ignore)
+ if (!feature_bool(FEAT_IDLE_FROM_MSG) && IsUser(cptr) &&
+ handler != m_ping && handler != m_ignore)
cli_user(from)->last = CurrentTime;
-#endif
return (*handler) (cptr, from, i, para);
}
return 0;
}
}
- else if (Protocol(cptr) > 9) /* Well, not ALWAYS, 2.9 can send no prefix */
- {
+ else {
char numeric_prefix[6];
int i;
for (i = 0; i < 5; ++i) {
}
}
numeric_prefix[i] = '\0';
+
/*
* We got a numeric nick as prefix
* 1 or 2 character prefixes are from servers
* 3 or 5 chars are from clients
*/
- if (' ' == ch[1] || ' ' == ch[2])
+ if (0 == i) {
+ protocol_violation(cptr,"Missing Prefix");
+ from = cptr;
+ }
+ else if (' ' == ch[1] || ' ' == ch[2])
from = FindNServer(numeric_prefix);
- else
+ else
from = findNUser(numeric_prefix);
do