#include "patricia.h"
#include "client.h"
#include "s_conf.h"
+#include "event.h"
+#include "rb_tools.h"
#include "reject.h"
#include "s_stats.h"
#include "msg.h"
pnode = ptr->data;
rdata = pnode->data;
- if(rdata->time + ConfigFileEntry.reject_duration > rb_current_time())
+ if(rdata->time + ConfigFileEntry.reject_duration > CurrentTime)
continue;
rb_dlinkDelete(ptr, &reject_list);
- rb_free(rdata);
+ MyFree(rdata);
patricia_remove(reject_tree, pnode);
}
}
{
reject_tree = New_Patricia(PATRICIA_BITS);
unknown_tree = New_Patricia(PATRICIA_BITS);
- rb_event_add("reject_exit", reject_exit, NULL, DELAYED_EXIT_TIME);
- rb_event_add("reject_expires", reject_expires, NULL, 60);
+ eventAdd("reject_exit", reject_exit, NULL, DELAYED_EXIT_TIME);
+ eventAdd("reject_expires", reject_expires, NULL, 60);
}
if((pnode = match_ip(reject_tree, (struct sockaddr *)&client_p->localClient->ip)) != NULL)
{
rdata = pnode->data;
- rdata->time = rb_current_time();
+ rdata->time = CurrentTime;
rdata->count++;
}
else
bitlen = 128;
#endif
pnode = make_and_lookup_ip(reject_tree, (struct sockaddr *)&client_p->localClient->ip, bitlen);
- pnode->data = rdata = rb_malloc(sizeof(struct reject_data));
+ pnode->data = rdata = MyMalloc(sizeof(struct reject_data));
rb_dlinkAddTail(pnode, &rdata->rnode, &reject_list);
- rdata->time = rb_current_time();
+ rdata->time = CurrentTime;
rdata->count = 1;
}
rdata->mask_hashv = hashv;
{
rdata = pnode->data;
- rdata->time = rb_current_time();
+ rdata->time = CurrentTime;
if(rdata->count > ConfigFileEntry.reject_after_count)
{
ServerStats->is_rej++;
pnode = ptr->data;
rdata = pnode->data;
rb_dlinkDelete(ptr, &reject_list);
- rb_free(rdata);
+ MyFree(rdata);
patricia_remove(reject_tree, pnode);
}
}
{
struct reject_data *rdata = pnode->data;
rb_dlinkDelete(&rdata->rnode, &reject_list);
- rb_free(rdata);
+ MyFree(rdata);
patricia_remove(reject_tree, pnode);
return 1;
}
if (rdata->mask_hashv == hashv)
{
rb_dlinkDelete(ptr, &reject_list);
- rb_free(rdata);
+ MyFree(rdata);
patricia_remove(reject_tree, pnode);
n++;
}