cadey
/
elemental-ircd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

target change: Overwrite the least recently used target with a new one.

This commit is contained in:
Jilles Tjoelker 2010-02-15 00:31:17 +01:00
parent d29b1834c3
commit 3002877654
4 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/client.h
View File

@ -54,6 +54,8 @@ struct Blacklist;
#define IDLEN 10 #define IDLEN 10
#define TGCHANGE_NUM 10 /* how many targets we keep track of */ #define TGCHANGE_NUM 10 /* how many targets we keep track of */
#define TGCHANGE_INITIAL 10 /* initial free targets (normal) */
#define TGCHANGE_INITIAL_LOW 4 /* initial free targets (possible spambot) */
/* /*
* pre declare structs * pre declare structs
@ -258,7 +260,7 @@ struct LocalUser
/* target change stuff */ /* target change stuff */
uint32_t targets[TGCHANGE_NUM]; /* targets were aware of (fnv32(use_id(target_p))) */ uint32_t targets[TGCHANGE_NUM]; /* targets were aware of (fnv32(use_id(target_p))) */
unsigned int targinfo[2]; /* cyclic array, no in use */ unsigned int targets_free; /* free targets */
time_t target_last; /* last time we cleared a slot */ time_t target_last; /* last time we cleared a slot */
struct ListClient *safelist_data; struct ListClient *safelist_data;

3
include/s_newconf.h
View File

@ -60,9 +60,6 @@ extern void init_s_newconf(void);
extern void clear_s_newconf(void); extern void clear_s_newconf(void);
extern void clear_s_newconf_bans(void); extern void clear_s_newconf_bans(void);
#define FREE_TARGET(x) ((x)->localClient->targinfo[0])
#define USED_TARGETS(x) ((x)->localClient->targinfo[1])
typedef struct typedef struct
{ {
char *ip; char *ip;

35
modules/core/m_message.c
View File

@ -642,10 +642,6 @@ msg_channel_flags(int p_or_n, const char *command, struct Client *client_p,
command, c, chptr->chname, text); command, c, chptr->chname, text);
} }
#define PREV_FREE_TARGET(x) ((FREE_TARGET(x) == 0) ? TGCHANGE_NUM - 1 : FREE_TARGET(x) - 1)
#define PREV_TARGET(i) ((i == 0) ? i = TGCHANGE_NUM - 1 : --i)
#define NEXT_TARGET(i) ((i == TGCHANGE_NUM - 1) ? i = 0 : ++i)
static void static void
expire_tgchange(void *unused) expire_tgchange(void *unused)
{ {
@ -671,6 +667,7 @@ add_target(struct Client *source_p, struct Client *target_p)
{ {
int i, j; int i, j;
uint32_t hashv; uint32_t hashv;
uint32_t *targets;
/* can msg themselves or services without using any target slots */ /* can msg themselves or services without using any target slots */
if(source_p == target_p || IsService(target_p)) if(source_p == target_p || IsService(target_p))
@ -685,17 +682,22 @@ add_target(struct Client *source_p, struct Client *target_p)
return 1; return 1;
hashv = fnv_hash_upper((const unsigned char *)use_id(target_p), 32); hashv = fnv_hash_upper((const unsigned char *)use_id(target_p), 32);
targets = source_p->localClient->targets;
if(USED_TARGETS(source_p)) /* check for existing target, and move it to the head */
for(i = 0; i < TGCHANGE_NUM; i++)
{ {
/* hunt for an existing target */ if(targets[i] == hashv)
for(i = PREV_FREE_TARGET(source_p), j = USED_TARGETS(source_p);
j; --j, PREV_TARGET(i))
{ {
if(source_p->localClient->targets[i] == hashv) for(j = i; j > 0; j--)
targets[j] = targets[j - 1];
targets[0] = hashv;
return 1; return 1;
} }
}
if(source_p->localClient->targets_free < TGCHANGE_NUM)
{
/* first message after connect, we may only start clearing /* first message after connect, we may only start clearing
* slots after this message --anfl * slots after this message --anfl
*/ */
@ -707,15 +709,15 @@ add_target(struct Client *source_p, struct Client *target_p)
/* clear as many targets as we can */ /* clear as many targets as we can */
else if((i = (rb_current_time() - source_p->localClient->target_last) / 60)) else if((i = (rb_current_time() - source_p->localClient->target_last) / 60))
{ {
if(i > USED_TARGETS(source_p)) if(i + source_p->localClient->targets_free > TGCHANGE_NUM)
USED_TARGETS(source_p) = 0; source_p->localClient->targets_free = TGCHANGE_NUM;
else else
USED_TARGETS(source_p) -= i; source_p->localClient->targets_free += i;
source_p->localClient->target_last = rb_current_time(); source_p->localClient->target_last = rb_current_time();
} }
/* cant clear any, full target list */ /* cant clear any, full target list */
else if(USED_TARGETS(source_p) == TGCHANGE_NUM) else if(source_p->localClient->targets_free == 0)
{ {
ServerStats.is_tgch++; ServerStats.is_tgch++;
add_tgchange(source_p->sockhost); add_tgchange(source_p->sockhost);
@ -731,9 +733,10 @@ add_target(struct Client *source_p, struct Client *target_p)
SetTGChange(source_p); SetTGChange(source_p);
} }
source_p->localClient->targets[FREE_TARGET(source_p)] = hashv; for(i = TGCHANGE_NUM - 1; i > 0; i--)
NEXT_TARGET(FREE_TARGET(source_p)); targets[i] = targets[i - 1];
++USED_TARGETS(source_p); targets[0] = hashv;
source_p->localClient->targets_free--;
return 1; return 1;
} }

4
src/s_user.c
View File

@ -561,7 +561,9 @@ register_local_user(struct Client *client_p, struct Client *source_p, const char
/* they get a reduced limit */ /* they get a reduced limit */
if(find_tgchange(source_p->sockhost)) if(find_tgchange(source_p->sockhost))
USED_TARGETS(source_p) = 6; source_p->localClient->targets_free = TGCHANGE_INITIAL_LOW;
else
source_p->localClient->targets_free = TGCHANGE_INITIAL;
monitor_signon(source_p); monitor_signon(source_p);
user_welcome(source_p); user_welcome(source_p);