#include "hash.h"
#include "common.h"
#include "hash.h"
-#include "irc_string.h"
+#include "match.h"
#include "ircd.h"
#include "numeric.h"
#include "s_serv.h"
#include "msg.h"
#include "parse.h"
#include "modules.h"
+#include "logger.h"
-static int mo_scan(struct Client *, struct Client *, int, const char **);
-static int scan_umodes(struct Client *, struct Client *, int, const char **);
-/*static int scan_cmodes(struct Client *, struct Client *, int, const char **);*/
+static int mo_scan(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static int scan_umodes(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+/*static int scan_cmodes(struct MsgBuf *, struct Client *, struct Client *, int, const char **);*/
struct Message scan_msgtab = {
- "SCAN", 0, 0, 0, MFLG_SLOW,
+ "SCAN", 0, 0, 0, 0,
{mg_ignore, mg_not_oper, mg_ignore, mg_ignore, mg_ignore, {mo_scan, 2}}
};
mapi_clist_av1 scan_clist[] = { &scan_msgtab, NULL };
DECLARE_MODULE_AV1(scan, NULL, NULL, scan_clist, NULL, NULL, "$Revision: 1853 $");
-typedef int (*scan_handler)(struct Client *, struct Client *, int,
+typedef int (*scan_handler)(struct MsgBuf *, struct Client *, struct Client *, int,
const char **);
struct scan_cmd {
/*
* m_scan
- * parv[0] = sender prefix
* parv[1] = options [or target]
* parv[2] = [target]
*/
static int
-mo_scan(struct Client *client_p, struct Client *source_p, int parc,
+mo_scan(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc,
const char *parv[])
{
struct scan_cmd *sptr;
!IsOperAdmin(source_p))
return -1;
else
- return sptr->handler(client_p, source_p, parc, parv);
+ return sptr->handler(msgbuf_p, client_p, source_p, parc, parv);
}
}
}
static int
-scan_umodes(struct Client *client_p, struct Client *source_p, int parc,
+scan_umodes(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc,
const char *parv[])
{
unsigned int allowed_umodes = 0, disallowed_umodes = 0;
int what = MODE_ADD;
int mode;
int list_users = YES;
- int list_max = 0;
+ int list_max = 500;
int list_count = 0, count = 0;
const char *mask = NULL;
const char *c;
return -1;
}
+ if (parv[2][0] != '+' && parv[2][0] != '-')
+ {
+ sendto_one_notice(source_p, ":SCAN UMODES: umodes parameter must start with '+' or '-'");
+ return -1;
+ }
+
for (c = parv[2]; *c; c++)
{
switch(*c)
list_max = atoi(parv[++i]);
else if (!irccmp(parv[i], "mask"))
mask = parv[++i];
+ else
+ {
+ sendto_one_notice(source_p, ":SCAN UMODES: invalid parameters");
+ return -1;
+ }
+ }
+ else
+ {
+ sendto_one_notice(source_p, ":SCAN UMODES: invalid parameters");
+ return -1;
}
}
- if (target_list == &global_client_list && (list_users || mask))
+ if (target_list == &global_client_list && list_users)
{
if (IsOperSpy(source_p))
{
if (mask != NULL)
{
- rb_snprintf(maskbuf, BUFSIZE, "%s!%s@%s",
+ snprintf(maskbuf, BUFSIZE, "%s!%s@%s",
target_p->name, target_p->username, target_p->host);
if (!match(mask, maskbuf))
sendto_one_numeric(source_p, RPL_SCANUMODES,
form_str(RPL_SCANUMODES),
target_p->name, target_p->username,
- target_p->host, sockhost,
+ target_p->host, sockhost,
target_p->servptr->name, modebuf,
target_p->info);
}