9pfs/solanum-vs-hackint-and-charybdis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Show rejectcache/throttle in /testline output.

Browse source 
This adds more RPL_TESTLINE numerics with code '!'.
Different from the other results, the I/K line or
RESV will be shown as well.
This commit is contained in:
Jilles Tjoelker 2008-12-19 19:24:12 +01:00
parent 16ef24cf38
commit 83235e9ed5
3 changed files with 63 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/reject.h
View file

@ -32,12 +32,14 @@
void init_reject(void); void init_reject(void);
int check_reject(rb_fde_t *F, struct sockaddr *addr); int check_reject(rb_fde_t *F, struct sockaddr *addr);
void add_reject(struct Client *, const char *mask1, const char *mask2); void add_reject(struct Client *, const char *mask1, const char *mask2);
int is_reject_ip(struct sockaddr *addr);
void flush_reject(void); void flush_reject(void);
int remove_reject_ip(const char *ip); int remove_reject_ip(const char *ip);
int remove_reject_mask(const char *mask1, const char *mask2); int remove_reject_mask(const char *mask1, const char *mask2);
unsigned long delay_exit_length(void); unsigned long delay_exit_length(void);
int throttle_add(struct sockaddr *addr); int throttle_add(struct sockaddr *addr);
int is_throttle_ip(struct sockaddr *addr);
unsigned long throttle_size(void); unsigned long throttle_size(void);

17
modules/m_testline.c
View file

@ -39,6 +39,7 @@
#include "numeric.h" #include "numeric.h"
#include "s_conf.h" #include "s_conf.h"
#include "s_newconf.h" #include "s_newconf.h"
#include "reject.h"
static int mo_testline(struct Client *, struct Client *, int, const char **); 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_testgecos(struct Client *, struct Client *, int, const char **);
@ -69,6 +70,7 @@ mo_testline(struct Client *client_p, struct Client *source_p, int parc, const ch
char *p; char *p;
int host_mask; int host_mask;
int type; int type;
int duration;
mask = LOCAL_COPY(parv[1]); mask = LOCAL_COPY(parv[1]);
@ -136,6 +138,21 @@ mo_testline(struct Client *client_p, struct Client *source_p, int parc, const ch
return 0; 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 (username != NULL)

44
src/reject.c
View file

@ -211,6 +211,31 @@ check_reject(rb_fde_t *F, struct sockaddr *addr)
return 0; return 0;
} }
int
is_reject_ip(struct sockaddr *addr)
{
rb_patricia_node_t *pnode;
reject_t *rdata;
int duration;
/* Reject is disabled */
if(ConfigFileEntry.reject_after_count == 0 || ConfigFileEntry.reject_duration == 0)
return 0;
pnode = rb_match_ip(reject_tree, addr);
if(pnode != NULL)
{
rdata = pnode->data;
if(rdata->count > (unsigned long)ConfigFileEntry.reject_after_count)
{
duration = rdata->time + ConfigFileEntry.reject_duration - rb_current_time();
return duration > 0 ? duration : 1;
}
}
return 0;
}
void void
flush_reject(void) flush_reject(void)
{ {
@ -312,6 +337,25 @@ throttle_add(struct sockaddr *addr)
return 0; return 0;
} }
int
is_throttle_ip(struct sockaddr *addr)
{
throttle_t *t;
rb_patricia_node_t *pnode;
int duration;
if((pnode = rb_match_ip(throttle_tree, addr)) != NULL)
{
t = pnode->data;
if(t->count > ConfigFileEntry.throttle_count)
{
duration = t->last + ConfigFileEntry.throttle_duration - rb_current_time();
return duration > 0 ? duration : 1;
}
}
return 0;
}
static void static void
throttle_expires(void *unused) throttle_expires(void *unused)
{ {