ok, trying to work on blockheap's stuff

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

diff --git a/src/s_auth.c b/src/s_auth.c
index 124a3c1ca995985bffb4d00fc11862015feb738a..dc3aecd0fec85ab1b17ddc28ba887e93e204703c 100644 (file)
--- a/src/s_auth.c
+++ b/src/s_auth.c
@@ -35,23 +35,19 @@
  */
 #include "stdinc.h"
 #include "config.h"
-#include "tools.h"
 #include "s_auth.h"
 #include "s_conf.h"
 #include "client.h"
 #include "common.h"
-#include "event.h"
 #include "irc_string.h"
 #include "sprintf_irc.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "packet.h"
 #include "res.h"
-#include "commio.h"
 #include "s_log.h"
 #include "s_stats.h"
 #include "send.h"
-#include "memory.h"
 #include "hook.h"
 #include "blacklist.h"
 
@@ -90,7 +86,7 @@ ReportType;
 #define sendheader(c, r) sendto_one_notice(c, HeaderMessages[(r)]) 
 
 static rb_dlink_list auth_poll_list;
-static BlockHeap *auth_heap;
+static rb_bh *auth_heap;
 static EVH timeout_auth_queries_event;
 
 static PF read_auth_reply;
@@ -107,7 +103,7 @@ init_auth(void)
        /* This hook takes a struct Client for its argument */
        memset(&auth_poll_list, 0, sizeof(auth_poll_list));
        eventAddIsh("timeout_auth_queries_event", timeout_auth_queries_event, NULL, 1);
-       auth_heap = BlockHeapCreate(sizeof(struct AuthRequest), LCLIENT_HEAP_SIZE);
+       auth_heap = rb_bh_create(sizeof(struct AuthRequest), LCLIENT_HEAP_SIZE);
 }
 
 /*
@@ -116,11 +112,11 @@ init_auth(void)
 static struct AuthRequest *
 make_auth_request(struct Client *client)
 {
-       struct AuthRequest *request = BlockHeapAlloc(auth_heap);
+       struct AuthRequest *request = rb_bh_alloc(auth_heap);
        client->localClient->auth_request = request;
        request->fd = -1;
        request->client = client;
-       request->timeout = CurrentTime + ConfigFileEntry.connect_timeout;
+       request->timeout = rb_current_time() + ConfigFileEntry.connect_timeout;
        return request;
 }
 
@@ -130,7 +126,7 @@ make_auth_request(struct Client *client)
 static void
 free_auth_request(struct AuthRequest *request)
 {
-       BlockHeapFree(auth_heap, request);
+       rb_bh_free(auth_heap, request);
 }
 
 /*
@@ -433,11 +429,11 @@ timeout_auth_queries_event(void *notused)
        rb_dlink_node *next_ptr;
        struct AuthRequest *auth;
 
-       DLINK_FOREACH_SAFE(ptr, next_ptr, auth_poll_list.head)
+       RB_DLINK_FOREACH_SAFE(ptr, next_ptr, auth_poll_list.head)
        {
                auth = ptr->data;
 
-               if(auth->timeout < CurrentTime)
+               if(auth->timeout < rb_current_time())
                {
                        if(auth->fd >= 0)
                                rb_close(auth->fd);
@@ -456,7 +452,7 @@ timeout_auth_queries_event(void *notused)
                                sendheader(auth->client, REPORT_FAIL_DNS);
                        }
 
-                       auth->client->localClient->lasttime = CurrentTime;
+                       auth->client->localClient->lasttime = rb_current_time();
                        release_auth_client(auth);
                }
        }