vulpineawoo/solanum
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #304 from edk0/reject-expired

Browse source 
reject: Don't reject for expired K-lines
This commit is contained in:
Aaron Jones 2020-01-03 17:33:10 +00:00 • committed by GitHub
commit 673fd77dd1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 39 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

29
ircd/reject.c
View file

@ -233,28 +233,39 @@ check_reject(rb_fde_t *F, struct sockaddr *addr)
rb_patricia_node_t *pnode; rb_patricia_node_t *pnode;
reject_t *rdata; reject_t *rdata;
delay_t *ddata; delay_t *ddata;
/* Reject is disabled */ /* Reject is disabled */
if(ConfigFileEntry.reject_after_count == 0 || ConfigFileEntry.reject_duration == 0) if (ConfigFileEntry.reject_after_count == 0 || ConfigFileEntry.reject_duration == 0)
return 0; return 0;
pnode = rb_match_ip(reject_tree, addr); pnode = rb_match_ip(reject_tree, addr);
if(pnode != NULL) if (pnode == NULL)
{ return 0;
rdata = pnode->data;
rdata = pnode->data;
rdata->time = rb_current_time(); rdata->time = rb_current_time();
if(rdata->count > (unsigned long)ConfigFileEntry.reject_after_count)
if (rdata->count <= (unsigned long)ConfigFileEntry.reject_after_count)
return 0;
if (rdata->aconf != NULL && rdata->aconf->status & CONF_ILLEGAL)
{ {
rb_dlinkDelete(&rdata->rnode, &reject_list);
reject_free(rdata);
rb_patricia_remove(reject_tree, pnode);
return 0;
}
ddata = rb_malloc(sizeof(delay_t)); ddata = rb_malloc(sizeof(delay_t));
ServerStats.is_rej++; ServerStats.is_rej++;
rb_setselect(F, RB_SELECT_WRITE | RB_SELECT_READ, NULL, NULL); rb_setselect(F, RB_SELECT_WRITE | RB_SELECT_READ, NULL, NULL);
if(rdata->aconf) if (rdata->aconf)
{ {
ddata->aconf = rdata->aconf; ddata->aconf = rdata->aconf;
ddata->aconf->clients++; ddata->aconf->clients++;
ddata->reason = NULL; ddata->reason = NULL;
} }
else if(rdata->reason) else if (rdata->reason)
{ {
ddata->reason = rdata->reason; ddata->reason = rdata->reason;
ddata->aconf = NULL; ddata->aconf = NULL;
@ -267,10 +278,6 @@ check_reject(rb_fde_t *F, struct sockaddr *addr)
ddata->F = F; ddata->F = F;
rb_dlinkAdd(ddata, &ddata->node, &delay_exit); rb_dlinkAdd(ddata, &ddata->node, &delay_exit);
return 1; return 1;
}
}
/* Caller does what it wants */
return 0;
} }
int int