warning clean

[irc/rqf/shadowircd.git] / src / reject.c

diff --git a/src/reject.c b/src/reject.c
index afdfc856bf3a3c59b209a6c73e548d4a9a7ea59e..a4374490f6bbdfac2cd256a0d7ff5d5fd1acaa3f 100644 (file)
--- a/src/reject.c
+++ b/src/reject.c
@@ -28,8 +28,6 @@
 #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"
@@ -100,11 +98,11 @@ reject_expires(void *unused)
                pnode = ptr->data;
                rdata = pnode->data;            
 
-               if(rdata->time + ConfigFileEntry.reject_duration > CurrentTime)
+               if(rdata->time + ConfigFileEntry.reject_duration > rb_current_time())
                        continue;
 
                rb_dlinkDelete(ptr, &reject_list);
-               MyFree(rdata);
+               rb_free(rdata);
                patricia_remove(reject_tree, pnode);
        }
 }
@@ -139,7 +137,7 @@ add_reject(struct Client *client_p, const char *mask1, const char *mask2)
        if((pnode = 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
@@ -150,9 +148,9 @@ add_reject(struct Client *client_p, const char *mask1, const char *mask2)
                        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));
+               pnode->data = rdata = rb_malloc(sizeof(struct reject_data));
                rb_dlinkAddTail(pnode, &rdata->rnode, &reject_list);
-               rdata->time = CurrentTime;
+               rdata->time = rb_current_time();
                rdata->count = 1;
        }
        rdata->mask_hashv = hashv;
@@ -174,7 +172,7 @@ check_reject(struct Client *client_p)
        {
                rdata = pnode->data;
 
-               rdata->time = CurrentTime;
+               rdata->time = rb_current_time();
                if(rdata->count > ConfigFileEntry.reject_after_count)
                {
                        ServerStats->is_rej++;
@@ -201,7 +199,7 @@ flush_reject(void)
                pnode = ptr->data;
                rdata = pnode->data;
                rb_dlinkDelete(ptr, &reject_list);
-               MyFree(rdata);
+               rb_free(rdata);
                patricia_remove(reject_tree, pnode);
        }
 }
@@ -220,7 +218,7 @@ remove_reject_ip(const char *ip)
        {
                struct reject_data *rdata = pnode->data;
                rb_dlinkDelete(&rdata->rnode, &reject_list);
-               MyFree(rdata);
+               rb_free(rdata);
                patricia_remove(reject_tree, pnode);
                return 1;
        }
@@ -248,7 +246,7 @@ remove_reject_mask(const char *mask1, const char *mask2)
                if (rdata->mask_hashv == hashv)
                {
                        rb_dlinkDelete(ptr, &reject_list);
-                       MyFree(rdata);
+                       rb_free(rdata);
                        patricia_remove(reject_tree, pnode);
                        n++;
                }