Various inet* -> rb_inet_*

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

diff --git a/src/s_newconf.c b/src/s_newconf.c
index 061a9f65f9e53de4acff15b6ca54bd23cd58e2be..6da826cab0ffc77325eae8c58ae7bc9ffd1ef31f 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)
@@ -281,7 +284,7 @@ struct oper_conf *
 find_oper_conf(const char *username, const char *host, const char *locip, const char *name)
 {
        struct oper_conf *oper_p;
-       struct irc_sockaddr_storage ip, cip;
+       struct rb_sockaddr_storage ip, cip;
        char addr[HOSTLEN+1];
        int bits, cbits;
        rb_dlink_node *ptr;
@@ -296,7 +299,7 @@ find_oper_conf(const char *username, const char *host, const char *locip, const
                if(irccmp(oper_p->name, name) || !match(oper_p->username, username))
                        continue;
 
-               strlcpy(addr, oper_p->host, sizeof(addr));
+               rb_strlcpy(addr, oper_p->host, sizeof(addr));
 
                if(parse_netmask(addr, (struct sockaddr *)&ip, &bits) != HM_HOST)
                {
@@ -324,7 +327,6 @@ struct oper_flags
 };
 static struct oper_flags oper_flagtable[] =
 {
-       { OPER_GLINE,           'G', 'g' },
        { OPER_KLINE,           'K', 'k' },
        { OPER_XLINE,           'X', 'x' },
        { OPER_RESV,            'Q', 'q' },
@@ -751,9 +753,9 @@ 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));
+       rb_strlcpy(nd->name, name, sizeof(nd->name));
        nd->expire = rb_current_time() + ConfigFileEntry.nick_delay;
 
        /* this list is ordered */
@@ -768,7 +770,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
@@ -796,7 +798,7 @@ void
 add_tgchange(const char *host)
 {
        tgchange *target;
-       patricia_node_t *pnode;
+       rb_patricia_node_t *pnode;
 
        if(find_tgchange(host))
                return;
@@ -816,9 +818,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;