#include "stdinc.h"
#include "config.h"
-#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;
+static rb_patricia_tree_t *reject_tree;
+rb_dlink_list delay_exit;
+static rb_dlink_list reject_list;
-static patricia_tree_t *unknown_tree;
+static rb_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;
};
-static patricia_tree_t *unknown_tree;
+static rb_patricia_tree_t *unknown_tree;
static void
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;
- patricia_node_t *pnode;
+ rb_dlink_node *ptr, *next;
+ rb_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)
+ if(rdata->time + ConfigFileEntry.reject_duration > rb_current_time())
continue;
- dlinkDelete(ptr, &reject_list);
- MyFree(rdata);
- patricia_remove(reject_tree, pnode);
+ rb_dlinkDelete(ptr, &reject_list);
+ rb_free(rdata);
+ rb_patricia_remove(reject_tree, pnode);
}
}
void
init_reject(void)
{
- reject_tree = New_Patricia(PATRICIA_BITS);
- unknown_tree = New_Patricia(PATRICIA_BITS);
- eventAdd("reject_exit", reject_exit, NULL, DELAYED_EXIT_TIME);
- eventAdd("reject_expires", reject_expires, NULL, 60);
+ reject_tree = rb_new_patricia(PATRICIA_BITS);
+ unknown_tree = rb_new_patricia(PATRICIA_BITS);
+ rb_event_add("reject_exit", reject_exit, NULL, DELAYED_EXIT_TIME);
+ rb_event_add("reject_expires", reject_expires, NULL, 60);
}
void
-add_reject(struct Client *client_p)
+add_reject(struct Client *client_p, const char *mask1, const char *mask2)
{
- patricia_node_t *pnode;
+ rb_patricia_node_t *pnode;
struct reject_data *rdata;
+ uint32_t hashv;
/* Reject is disabled */
if(ConfigFileEntry.reject_after_count == 0 || ConfigFileEntry.reject_ban_time == 0)
return;
- if((pnode = match_ip(reject_tree, (struct sockaddr *)&client_p->localClient->ip)) != NULL)
+ hashv = 0;
+ if (mask1 != NULL)
+ hashv ^= fnv_hash_upper(mask1, 32);
+ if (mask2 != NULL)
+ hashv ^= fnv_hash_upper(mask2, 32);
+
+ if((pnode = rb_match_ip(reject_tree, (struct sockaddr *)&client_p->localClient->ip)) != NULL)
{
rdata = pnode->data;
- rdata->time = CurrentTime;
+ rdata->time = rb_current_time();
rdata->count++;
}
else
{
int bitlen = 32;
-#ifdef IPV6
+#ifdef RB_IPV6
if(client_p->localClient->ip.ss_family == AF_INET6)
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);
- rdata->time = CurrentTime;
+ pnode->data = rdata = rb_malloc(sizeof(struct reject_data));
+ rb_dlinkAddTail(pnode, &rdata->rnode, &reject_list);
+ rdata->time = rb_current_time();
rdata->count = 1;
}
+ rdata->mask_hashv = hashv;
}
int
check_reject(struct Client *client_p)
{
- patricia_node_t *pnode;
+ rb_patricia_node_t *pnode;
struct reject_data *rdata;
/* Reject is disabled */
ConfigFileEntry.reject_duration == 0)
return 0;
- pnode = match_ip(reject_tree, (struct sockaddr *)&client_p->localClient->ip);
+ pnode = rb_match_ip(reject_tree, (struct sockaddr *)&client_p->localClient->ip);
if(pnode != NULL)
{
rdata = pnode->data;
- rdata->time = CurrentTime;
+ rdata->time = rb_current_time();
if(rdata->count > ConfigFileEntry.reject_after_count)
{
- ServerStats->is_rej++;
+ 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, RB_SELECT_WRITE | RB_SELECT_READ, NULL, NULL);
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;
- patricia_node_t *pnode;
+ rb_dlink_node *ptr, *next;
+ rb_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);
- patricia_remove(reject_tree, pnode);
+ rb_dlinkDelete(ptr, &reject_list);
+ rb_free(rdata);
+ rb_patricia_remove(reject_tree, pnode);
}
}
int
-remove_reject(const char *ip)
+remove_reject_ip(const char *ip)
{
- patricia_node_t *pnode;
+ rb_patricia_node_t *pnode;
/* Reject is disabled */
if(ConfigFileEntry.reject_after_count == 0 || ConfigFileEntry.reject_ban_time == 0 ||
ConfigFileEntry.reject_duration == 0)
return -1;
- if((pnode = match_string(reject_tree, ip)) != NULL)
+ if((pnode = rb_match_string(reject_tree, ip)) != NULL)
{
struct reject_data *rdata = pnode->data;
- dlinkDelete(&rdata->rnode, &reject_list);
- MyFree(rdata);
- patricia_remove(reject_tree, pnode);
+ rb_dlinkDelete(&rdata->rnode, &reject_list);
+ rb_free(rdata);
+ rb_patricia_remove(reject_tree, pnode);
return 1;
}
return 0;
}
+int
+remove_reject_mask(const char *mask1, const char *mask2)
+{
+ rb_dlink_node *ptr, *next;
+ rb_patricia_node_t *pnode;
+ struct reject_data *rdata;
+ uint32_t hashv;
+ int n = 0;
+
+ hashv = 0;
+ if (mask1 != NULL)
+ hashv ^= fnv_hash_upper(mask1, 32);
+ if (mask2 != NULL)
+ hashv ^= fnv_hash_upper(mask2, 32);
+ RB_DLINK_FOREACH_SAFE(ptr, next, reject_list.head)
+ {
+ pnode = ptr->data;
+ rdata = pnode->data;
+ if (rdata->mask_hashv == hashv)
+ {
+ rb_dlinkDelete(ptr, &reject_list);
+ rb_free(rdata);
+ rb_patricia_remove(reject_tree, pnode);
+ n++;
+ }
+ }
+ return n;
+}
+
int
add_unknown_ip(struct Client *client_p)
{
- patricia_node_t *pnode;
+ rb_patricia_node_t *pnode;
- if((pnode = match_ip(unknown_tree, (struct sockaddr *)&client_p->localClient->ip)) == NULL)
+ if((pnode = rb_match_ip(unknown_tree, (struct sockaddr *)&client_p->localClient->ip)) == NULL)
{
int bitlen = 32;
-#ifdef IPV6
+#ifdef RB_IPV6
if(client_p->localClient->ip.ss_family == AF_INET6)
bitlen = 128;
#endif
{
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, RB_SELECT_WRITE | RB_SELECT_READ, NULL, NULL);
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
del_unknown_ip(struct Client *client_p)
{
- patricia_node_t *pnode;
+ rb_patricia_node_t *pnode;
- if((pnode = match_ip(unknown_tree, (struct sockaddr *)&client_p->localClient->ip)) != NULL)
+ if((pnode = rb_match_ip(unknown_tree, (struct sockaddr *)&client_p->localClient->ip)) != NULL)
{
pnode->data = (void *)((unsigned long)pnode->data - 1);
if((unsigned long)pnode->data <= 0)
{
- patricia_remove(unknown_tree, pnode);
+ rb_patricia_remove(unknown_tree, pnode);
}
}
/* this can happen due to m_webirc.c's manipulations, for example */
projects / irc / rqf / shadowircd.git / blobdiff