Reverting some changed related not to moving on libratbox3 but using ratbox3 source!

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

diff --git a/src/s_newconf.c b/src/s_newconf.c
index c4ba39d6adbd6f9d77539da728a25dca4bbf3ee0..222a32e0739c6e1979d0e62c01477ff7e3904cc2 100644 (file)
--- a/src/s_newconf.c
+++ b/src/s_newconf.c
@@ -58,18 +58,21 @@ rb_dlink_list tgchange_list;
 
 rb_patricia_tree_t *tgchange_tree;
 
-static BlockHeap *nd_heap = NULL;
+static rb_bh *nd_heap = NULL;
 
 static void expire_temp_rxlines(void *unused);
 static void expire_nd_entries(void *unused);
 
+struct ev_entry *expire_nd_entries_ev = NULL;
+struct ev_entry *expire_temp_rxlines_ev = NULL;
+
 void
 init_s_newconf(void)
 {
-       tgchange_tree = New_Patricia(PATRICIA_BITS);
-       nd_heap = BlockHeapCreate(sizeof(struct nd_entry), ND_HEAP_SIZE);
-       eventAddIsh("expire_nd_entries", expire_nd_entries, NULL, 30);
-       eventAddIsh("expire_temp_rxlines", expire_temp_rxlines, NULL, 60);
+       tgchange_tree = rb_new_patricia(PATRICIA_BITS);
+       nd_heap = rb_bh_create(sizeof(struct nd_entry), ND_HEAP_SIZE, "nd_heap");
+       expire_nd_entries_ev = rb_event_addish("expire_nd_entries", expire_nd_entries, NULL, 30);
+       expire_temp_rxlines_ev = rb_event_addish("expire_temp_rxlines", expire_temp_rxlines, NULL, 60);
 }
 
 void
@@ -203,7 +206,7 @@ propagate_generic(struct Client *source_p, const char *command,
        va_list args;
 
        va_start(args, format);
-       ircvsnprintf(buffer, sizeof(buffer), format, args);
+       rb_vsnprintf(buffer, sizeof(buffer), format, args);
        va_end(args);
 
        sendto_match_servs(source_p, target, cap, NOCAPS,
@@ -224,7 +227,7 @@ cluster_generic(struct Client *source_p, const char *command,
        rb_dlink_node *ptr;
 
        va_start(args, format);
-       ircvsnprintf(buffer, sizeof(buffer), format, args);
+       rb_vsnprintf(buffer, sizeof(buffer), format, args);
        va_end(args);
 
        RB_DLINK_FOREACH(ptr, cluster_conf_list.head)
@@ -693,7 +696,7 @@ expire_temp_rxlines(void *unused)
        {
                aconf = ptr->data;
 
-               if(aconf->hold && aconf->hold <= CurrentTime)
+               if(aconf->hold && aconf->hold <= rb_current_time())
                {
                        if(ConfigFileEntry.tkline_expire_notices)
                                sendto_realops_snomask(SNO_GENERAL, L_ALL,
@@ -710,7 +713,7 @@ expire_temp_rxlines(void *unused)
        {
                aconf = ptr->data;
 
-               if(aconf->hold && aconf->hold <= CurrentTime)
+               if(aconf->hold && aconf->hold <= rb_current_time())
                {
                        if(ConfigFileEntry.tkline_expire_notices)
                                sendto_realops_snomask(SNO_GENERAL, L_ALL,
@@ -725,7 +728,7 @@ expire_temp_rxlines(void *unused)
        {
                aconf = ptr->data;
 
-               if(aconf->hold && aconf->hold <= CurrentTime)
+               if(aconf->hold && aconf->hold <= rb_current_time())
                {
                        if(ConfigFileEntry.tkline_expire_notices)
                                sendto_realops_snomask(SNO_GENERAL, L_ALL,
@@ -751,10 +754,10 @@ add_nd_entry(const char *name)
        if(irc_dictionary_find(nd_dict, name) != NULL)
                return;
 
-       nd = BlockHeapAlloc(nd_heap);
+       nd = rb_bh_alloc(nd_heap);
        
        strlcpy(nd->name, name, sizeof(nd->name));
-       nd->expire = CurrentTime + ConfigFileEntry.nick_delay;
+       nd->expire = rb_current_time() + ConfigFileEntry.nick_delay;
 
        /* this list is ordered */
        rb_dlinkAddTail(nd, &nd->lnode, &nd_list);
@@ -768,7 +771,7 @@ free_nd_entry(struct nd_entry *nd)
        irc_dictionary_delete(nd_dict, nd->name);
 
        rb_dlinkDelete(&nd->lnode, &nd_list);
-       BlockHeapFree(nd_heap, nd);
+       rb_bh_free(nd_heap, nd);
 }
 
 void
@@ -785,7 +788,7 @@ expire_nd_entries(void *unused)
                /* this list is ordered - we can stop when we hit the first
                 * entry that doesnt expire..
                 */
-               if(nd->expire > CurrentTime)
+               if(nd->expire > rb_current_time())
                        return;
 
                free_nd_entry(nd);
@@ -796,7 +799,7 @@ void
 add_tgchange(const char *host)
 {
        tgchange *target;
-       patricia_node_t *pnode;
+       rb_patricia_node_t *pnode;
 
        if(find_tgchange(host))
                return;
@@ -808,7 +811,7 @@ add_tgchange(const char *host)
        target->pnode = pnode;
 
        target->ip = rb_strdup(host);
-       target->expiry = CurrentTime + (60*60*12);
+       target->expiry = rb_current_time() + (60*60*12);
 
        rb_dlinkAdd(target, &target->node, &tgchange_list);
 }
@@ -816,9 +819,9 @@ add_tgchange(const char *host)
 tgchange *
 find_tgchange(const char *host)
 {
-       patricia_node_t *pnode;
+       rb_patricia_node_t *pnode;
 
-       if((pnode = match_exact_string(tgchange_tree, host)))
+       if((pnode = rb_match_exact_string(tgchange_tree, host)))
                return pnode->data;
 
        return NULL;