#include "patricia.h"
#include "client.h"
#include "s_conf.h"
-#include "event.h"
-#include "tools.h"
#include "reject.h"
#include "s_stats.h"
#include "msg.h"
#include "hash.h"
static patricia_tree_t *reject_tree;
-dlink_list delay_exit;
-static dlink_list reject_list;
+rb_dlink_list delay_exit;
+static rb_dlink_list reject_list;
static patricia_tree_t *unknown_tree;
struct reject_data
{
- dlink_node rnode;
+ rb_dlink_node rnode;
time_t time;
unsigned int count;
uint32_t mask_hashv;
reject_exit(void *unused)
{
struct Client *client_p;
- dlink_node *ptr, *ptr_next;
+ rb_dlink_node *ptr, *ptr_next;
- DLINK_FOREACH_SAFE(ptr, ptr_next, delay_exit.head)
+ RB_DLINK_FOREACH_SAFE(ptr, ptr_next, delay_exit.head)
{
client_p = ptr->data;
if(IsDead(client_p))
}
close_connection(client_p);
SetDead(client_p);
- dlinkAddAlloc(client_p, &dead_list);
+ rb_dlinkAddAlloc(client_p, &dead_list);
}
delay_exit.head = delay_exit.tail = NULL;
static void
reject_expires(void *unused)
{
- dlink_node *ptr, *next;
+ rb_dlink_node *ptr, *next;
patricia_node_t *pnode;
struct reject_data *rdata;
- DLINK_FOREACH_SAFE(ptr, next, reject_list.head)
+ RB_DLINK_FOREACH_SAFE(ptr, next, reject_list.head)
{
pnode = ptr->data;
rdata = pnode->data;
if(rdata->time + ConfigFileEntry.reject_duration > CurrentTime)
continue;
- dlinkDelete(ptr, &reject_list);
- MyFree(rdata);
+ rb_dlinkDelete(ptr, &reject_list);
+ rb_free(rdata);
patricia_remove(reject_tree, pnode);
}
}
bitlen = 128;
#endif
pnode = make_and_lookup_ip(reject_tree, (struct sockaddr *)&client_p->localClient->ip, bitlen);
- pnode->data = rdata = MyMalloc(sizeof(struct reject_data));
- dlinkAddTail(pnode, &rdata->rnode, &reject_list);
+ pnode->data = rdata = rb_malloc(sizeof(struct reject_data));
+ rb_dlinkAddTail(pnode, &rdata->rnode, &reject_list);
rdata->time = CurrentTime;
rdata->count = 1;
}
{
ServerStats->is_rej++;
SetReject(client_p);
- comm_setselect(client_p->localClient->fd, FDLIST_NONE, COMM_SELECT_WRITE | COMM_SELECT_READ, NULL, NULL, 0);
+ rb_setselect(client_p->localClient->F->fd, FDLIST_NONE, COMM_SELECT_WRITE | COMM_SELECT_READ, NULL, NULL, 0);
SetClosing(client_p);
- dlinkMoveNode(&client_p->localClient->tnode, &unknown_list, &delay_exit);
+ rb_dlinkMoveNode(&client_p->localClient->tnode, &unknown_list, &delay_exit);
return 1;
}
}
void
flush_reject(void)
{
- dlink_node *ptr, *next;
+ rb_dlink_node *ptr, *next;
patricia_node_t *pnode;
struct reject_data *rdata;
- DLINK_FOREACH_SAFE(ptr, next, reject_list.head)
+ RB_DLINK_FOREACH_SAFE(ptr, next, reject_list.head)
{
pnode = ptr->data;
rdata = pnode->data;
- dlinkDelete(ptr, &reject_list);
- MyFree(rdata);
+ rb_dlinkDelete(ptr, &reject_list);
+ rb_free(rdata);
patricia_remove(reject_tree, pnode);
}
}
if((pnode = match_string(reject_tree, ip)) != NULL)
{
struct reject_data *rdata = pnode->data;
- dlinkDelete(&rdata->rnode, &reject_list);
- MyFree(rdata);
+ rb_dlinkDelete(&rdata->rnode, &reject_list);
+ rb_free(rdata);
patricia_remove(reject_tree, pnode);
return 1;
}
int
remove_reject_mask(const char *mask1, const char *mask2)
{
- dlink_node *ptr, *next;
+ rb_dlink_node *ptr, *next;
patricia_node_t *pnode;
struct reject_data *rdata;
uint32_t hashv;
hashv ^= fnv_hash_upper(mask1, 32);
if (mask2 != NULL)
hashv ^= fnv_hash_upper(mask2, 32);
- DLINK_FOREACH_SAFE(ptr, next, reject_list.head)
+ RB_DLINK_FOREACH_SAFE(ptr, next, reject_list.head)
{
pnode = ptr->data;
rdata = pnode->data;
if (rdata->mask_hashv == hashv)
{
- dlinkDelete(ptr, &reject_list);
- MyFree(rdata);
+ rb_dlinkDelete(ptr, &reject_list);
+ rb_free(rdata);
patricia_remove(reject_tree, pnode);
n++;
}
{
SetExUnknown(client_p);
SetReject(client_p);
- comm_setselect(client_p->localClient->fd, FDLIST_NONE, COMM_SELECT_WRITE | COMM_SELECT_READ, NULL, NULL, 0);
+ rb_setselect(client_p->localClient->F->fd, FDLIST_NONE, COMM_SELECT_WRITE | COMM_SELECT_READ, NULL, NULL, 0);
SetClosing(client_p);
- dlinkMoveNode(&client_p->localClient->tnode, &unknown_list, &delay_exit);
+ rb_dlinkMoveNode(&client_p->localClient->tnode, &unknown_list, &delay_exit);
return 1;
}