Argh, wrong replace caused by MS VS 2005 interface.

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

diff --git a/src/reject.c b/src/reject.c
index f763c41d305abbaeb7005d02e2a200decec6a0df..aaf8fab009f54459953a1aa1489d33040e63c535 100644 (file)
--- a/src/reject.c
+++ b/src/reject.c
@@ -28,22 +28,20 @@
 #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;
@@ -55,9 +53,9 @@ 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))
@@ -81,7 +79,7 @@ reject_exit(void *unused)
                }
                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;
@@ -91,11 +89,11 @@ reject_exit(void *unused)
 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;            
@@ -103,8 +101,8 @@ reject_expires(void *unused)
                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);
        }
 }
@@ -151,7 +149,7 @@ add_reject(struct Client *client_p, const char *mask1, const char *mask2)
 #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);
+               rb_dlinkAddTail(pnode, &rdata->rnode, &reject_list);
                rdata->time = CurrentTime;
                rdata->count = 1;
        }
@@ -179,9 +177,9 @@ check_reject(struct Client *client_p)
                {
                        ServerStats->is_rej++;
                        SetReject(client_p);
-                       comm_setselect(client_p->localClient->F->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;
                }
        }       
@@ -192,16 +190,16 @@ check_reject(struct Client *client_p)
 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);
        }
 }
@@ -219,8 +217,8 @@ remove_reject_ip(const char *ip)
        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;
        }
@@ -230,7 +228,7 @@ remove_reject_ip(const char *ip)
 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;
@@ -241,14 +239,14 @@ remove_reject_mask(const char *mask1, const char *mask2)
                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++;
                }
@@ -277,9 +275,9 @@ add_unknown_ip(struct Client *client_p)
        {
                SetExUnknown(client_p);
                SetReject(client_p);
-               comm_setselect(client_p->localClient->F->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;
        }