/* modules/m_testline.c
- *
+ *
* Copyright (C) 2004 Lee Hardy <lee@leeh.co.uk>
* Copyright (C) 2004-2005 ircd-ratbox development team
*
#include "numeric.h"
#include "s_conf.h"
#include "s_newconf.h"
+#include "reject.h"
-static int mo_testline(struct Client *, struct Client *, int, const char **);
-static int mo_testgecos(struct Client *, struct Client *, int, const char **);
+static int mo_testline(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static int mo_testgecos(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
struct Message testline_msgtab = {
- "TESTLINE", 0, 0, 0, MFLG_SLOW,
- {mg_unreg, mg_ignore, mg_ignore, mg_ignore, mg_ignore, {mo_testline, 2}}
+ "TESTLINE", 0, 0, 0, 0,
+ {mg_unreg, mg_not_oper, mg_ignore, mg_ignore, mg_ignore, {mo_testline, 2}}
};
struct Message testgecos_msgtab = {
- "TESTGECOS", 0, 0, 0, MFLG_SLOW,
- {mg_unreg, mg_ignore, mg_ignore, mg_ignore, mg_ignore, {mo_testgecos, 2}}
+ "TESTGECOS", 0, 0, 0, 0,
+ {mg_unreg, mg_not_oper, mg_ignore, mg_ignore, mg_ignore, {mo_testgecos, 2}}
};
mapi_clist_av1 testline_clist[] = { &testline_msgtab, &testgecos_msgtab, NULL };
DECLARE_MODULE_AV1(testline, NULL, NULL, testline_clist, NULL, NULL, "$Revision: 3303 $");
static int
-mo_testline(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+mo_testline(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
{
struct ConfItem *aconf;
struct ConfItem *resv_p;
char *p;
int host_mask;
int type;
+ int duration;
+ char *puser, *phost, *reason, *operreason;
+ char reasonbuf[BUFSIZE];
mask = LOCAL_COPY(parv[1]);
me.name, source_p->name,
resv_p->hold ? 'q' : 'Q',
resv_p->hold ? (long) ((resv_p->hold - rb_current_time()) / 60) : 0L,
- resv_p->name, resv_p->passwd);
+ resv_p->host, resv_p->passwd);
/* this is a false positive, so make sure it isn't counted in stats q
* --nenolod
*/
host = mask;
/* parses as an IP, check for a dline */
- if((type = parse_netmask(host, (struct sockaddr *)&ip, &host_mask)) != HM_HOST)
+ if((type = parse_netmask(host, &ip, &host_mask)) != HM_HOST)
{
#ifdef RB_IPV6
if(type == HM_IPV6)
if(aconf && aconf->status & CONF_DLINE)
{
+ get_printable_kline(source_p, aconf, &phost, &reason, &puser, &operreason);
+ snprintf(reasonbuf, sizeof(reasonbuf), "%s%s%s", reason,
+ operreason ? "|" : "", operreason ? operreason : "");
sendto_one(source_p, form_str(RPL_TESTLINE),
me.name, source_p->name,
(aconf->flags & CONF_FLAGS_TEMPORARY) ? 'd' : 'D',
- (aconf->flags & CONF_FLAGS_TEMPORARY) ?
- (long) ((aconf->hold - rb_current_time()) / 60) : 0L,
- aconf->host, aconf->passwd);
+ (aconf->flags & CONF_FLAGS_TEMPORARY) ?
+ (long) ((aconf->hold - rb_current_time()) / 60) : 0L,
+ phost, reasonbuf);
return 0;
}
+ /* Otherwise, aconf is an exempt{} */
+ if(aconf == NULL &&
+ (duration = is_reject_ip((struct sockaddr *)&ip)))
+ sendto_one(source_p, form_str(RPL_TESTLINE),
+ me.name, source_p->name,
+ '!',
+ duration / 60L,
+ host, "Reject cache");
+ if(aconf == NULL &&
+ (duration = is_throttle_ip((struct sockaddr *)&ip)))
+ sendto_one(source_p, form_str(RPL_TESTLINE),
+ me.name, source_p->name,
+ '!',
+ duration / 60L,
+ host, "Throttled");
}
if (username != NULL)
(type != HM_HOST) ? (struct sockaddr *)&ip : NULL,
(type != HM_HOST) ? (
#ifdef RB_IPV6
- (type == HM_IPV6) ? AF_INET6 :
+ (type == HM_IPV6) ? AF_INET6 :
#endif
AF_INET) : 0, NULL)))
{
if(aconf->status & CONF_KILL)
{
- rb_snprintf(buf, sizeof(buf), "%s@%s",
- aconf->user, aconf->host);
+ get_printable_kline(source_p, aconf, &phost, &reason, &puser, &operreason);
+ snprintf(buf, sizeof(buf), "%s@%s",
+ puser, phost);
+ snprintf(reasonbuf, sizeof(reasonbuf), "%s%s%s", reason,
+ operreason ? "|" : "", operreason ? operreason : "");
sendto_one(source_p, form_str(RPL_TESTLINE),
me.name, source_p->name,
(aconf->flags & CONF_FLAGS_TEMPORARY) ? 'k' : 'K',
- (aconf->flags & CONF_FLAGS_TEMPORARY) ?
+ (aconf->flags & CONF_FLAGS_TEMPORARY) ?
(long) ((aconf->hold - rb_current_time()) / 60) : 0L,
- buf, aconf->passwd);
+ buf, reasonbuf);
return 0;
}
}
me.name, source_p->name,
resv_p->hold ? 'q' : 'Q',
resv_p->hold ? (long) ((resv_p->hold - rb_current_time()) / 60) : 0L,
- resv_p->name, resv_p->passwd);
+ resv_p->host, resv_p->passwd);
/* this is a false positive, so make sure it isn't counted in stats q
* --nenolod
if(aconf && aconf->status & CONF_CLIENT)
{
sendto_one_numeric(source_p, RPL_STATSILINE, form_str(RPL_STATSILINE),
- aconf->name, show_iline_prefix(source_p, aconf, aconf->user),
+ aconf->info.name, EmptyString(aconf->spasswd) ? "<NULL>" : aconf->spasswd,
+ show_iline_prefix(source_p, aconf, aconf->user),
aconf->host, aconf->port, aconf->className);
return 0;
}
}
static int
-mo_testgecos(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+mo_testgecos(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
{
struct ConfItem *aconf;
me.name, source_p->name,
aconf->hold ? 'x' : 'X',
aconf->hold ? (long) ((aconf->hold - rb_current_time()) / 60) : 0L,
- aconf->name, aconf->passwd);
+ aconf->host, aconf->passwd);
return 0;
}