* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: m_testline.c 2757 2006-11-10 22:58:15Z jilles $
*/
#include "stdinc.h"
-#include "tools.h"
#include "send.h"
#include "client.h"
#include "modules.h"
#include "msg.h"
+#include "hash.h"
#include "hostmask.h"
#include "numeric.h"
#include "s_conf.h"
#include "s_newconf.h"
-#include "sprintf_irc.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 **);
struct Message testline_msgtab = {
"TESTLINE", 0, 0, 0, MFLG_SLOW,
- {mg_unreg, mg_ignore, mg_ignore, mg_ignore, mg_ignore, {mo_testline, 2}}
+ {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}}
+ {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: 2757 $");
+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[])
{
struct ConfItem *aconf;
struct ConfItem *resv_p;
- struct irc_sockaddr_storage ip;
+ struct rb_sockaddr_storage ip;
char user_trunc[USERLEN + 1], notildeuser_trunc[USERLEN + 1];
const char *name = NULL;
const char *username = NULL;
char *p;
int host_mask;
int type;
+ int duration;
+ char *puser, *phost, *reason, *operreason;
+ char reasonbuf[BUFSIZE];
mask = LOCAL_COPY(parv[1]);
+ if (IsChannelName(mask))
+ {
+ resv_p = hash_find_resv(mask);
+ if (resv_p != NULL)
+ {
+ sendto_one(source_p, form_str(RPL_TESTLINE),
+ me.name, source_p->name,
+ resv_p->hold ? 'q' : 'Q',
+ resv_p->hold ? (long) ((resv_p->hold - rb_current_time()) / 60) : 0L,
+ resv_p->host, resv_p->passwd);
+ /* this is a false positive, so make sure it isn't counted in stats q
+ * --nenolod
+ */
+ resv_p->port--;
+ }
+ else
+ sendto_one(source_p, form_str(RPL_NOTESTLINE),
+ me.name, source_p->name, parv[1]);
+ return 0;
+ }
+
if((p = strchr(mask, '!')))
{
*p++ = '\0';
/* parses as an IP, check for a dline */
if((type = parse_netmask(host, (struct sockaddr *)&ip, &host_mask)) != HM_HOST)
{
-#ifdef IPV6
+#ifdef RB_IPV6
if(type == HM_IPV6)
aconf = find_dline((struct sockaddr *)&ip, AF_INET6);
else
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 - CurrentTime) / 60) : 0L,
- aconf->host, aconf->passwd);
+ (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 / 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)
{
- strlcpy(user_trunc, username, sizeof user_trunc);
- strlcpy(notildeuser_trunc, *username == '~' ? username + 1 : username, sizeof notildeuser_trunc);
+ rb_strlcpy(user_trunc, username, sizeof user_trunc);
+ rb_strlcpy(notildeuser_trunc, *username == '~' ? username + 1 : username, sizeof notildeuser_trunc);
}
else
{
- strlcpy(user_trunc, "dummy", sizeof user_trunc);
- strlcpy(notildeuser_trunc, "dummy", sizeof notildeuser_trunc);
+ rb_strlcpy(user_trunc, "dummy", sizeof user_trunc);
+ rb_strlcpy(notildeuser_trunc, "dummy", sizeof notildeuser_trunc);
}
/* now look for a matching I/K/G */
if((aconf = find_address_conf(host, NULL, user_trunc, notildeuser_trunc,
(type != HM_HOST) ? (struct sockaddr *)&ip : NULL,
(type != HM_HOST) ? (
-#ifdef IPV6
+#ifdef RB_IPV6
(type == HM_IPV6) ? AF_INET6 :
#endif
- AF_INET) : 0)))
+ AF_INET) : 0, NULL)))
{
static char buf[HOSTLEN+USERLEN+2];
if(aconf->status & CONF_KILL)
{
- ircsnprintf(buf, sizeof(buf), "%s@%s",
- aconf->user, aconf->host);
+ get_printable_kline(source_p, aconf, &phost, &reason, &puser, &operreason);
+ rb_snprintf(buf, sizeof(buf), "%s@%s",
+ 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 - CurrentTime) / 60) : 0L,
- buf, aconf->passwd);
- return 0;
- }
- else if(aconf->status & CONF_GLINE)
- {
- ircsnprintf(buf, sizeof(buf), "%s@%s",
- aconf->user, aconf->host);
- sendto_one(source_p, form_str(RPL_TESTLINE),
- me.name, source_p->name,
- 'G', (long) ((aconf->hold - CurrentTime) / 60),
- buf, aconf->passwd);
+ (long) ((aconf->hold - rb_current_time()) / 60) : 0L,
+ buf, reasonbuf);
return 0;
}
}
sendto_one(source_p, form_str(RPL_TESTLINE),
me.name, source_p->name,
resv_p->hold ? 'q' : 'Q',
- resv_p->hold ? (long) ((resv_p->hold - CurrentTime) / 60) : 0L,
- resv_p->name, resv_p->passwd);
+ resv_p->hold ? (long) ((resv_p->hold - rb_current_time()) / 60) : 0L,
+ 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;
}
sendto_one(source_p, form_str(RPL_TESTLINE),
me.name, source_p->name,
aconf->hold ? 'x' : 'X',
- aconf->hold ? (long) ((aconf->hold - CurrentTime) / 60) : 0L,
- aconf->name, aconf->passwd);
+ aconf->hold ? (long) ((aconf->hold - rb_current_time()) / 60) : 0L,
+ aconf->host, aconf->passwd);
return 0;
}
projects / irc / rqf / shadowircd.git / blobdiff