#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 **);
char *p;
int host_mask;
int type;
+ int duration;
+ char *puser, *phost, *reason, *operreason;
+ char reasonbuf[BUFSIZE];
mask = LOCAL_COPY(parv[1]);
if(aconf && aconf->status & CONF_DLINE)
{
+ get_printable_kline(source_p, aconf, &phost, &reason, &puser, &operreason);
+ rb_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);
+ 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 / 60,
+ 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 / 60,
+ host, "Throttled");
}
if (username != NULL)
if(aconf->status & CONF_KILL)
{
+ get_printable_kline(source_p, aconf, &phost, &reason, &puser, &operreason);
rb_snprintf(buf, sizeof(buf), "%s@%s",
- aconf->user, aconf->host);
+ puser, phost);
+ rb_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) ?
(long) ((aconf->hold - rb_current_time()) / 60) : 0L,
- buf, aconf->passwd);
+ buf, reasonbuf);
return 0;
}
}