*/
#include "stdinc.h"
-#include "tools.h"
#include "channel.h"
#include "client.h"
#include "common.h"
#include "ircd.h"
#include "hostmask.h"
#include "numeric.h"
-#include "commio.h"
#include "s_conf.h"
#include "scache.h"
#include "send.h"
#include "s_serv.h"
#include "s_gline.h"
#include "hash.h"
-#include "event.h"
-#include "memory.h"
-dlink_list glines;
+rb_dlink_list glines;
static void expire_glines(void);
static void expire_pending_glines(void);
void
add_gline(struct ConfItem *aconf)
{
- dlinkAddTailAlloc(aconf, &glines);
+ rb_dlinkAddTailAlloc(aconf, &glines);
add_conf_by_address(aconf->host, CONF_GLINE, aconf->user, aconf);
}
struct ConfItem *
find_is_glined(const char *host, const char *user)
{
- dlink_node *gline_node;
+ rb_dlink_node *gline_node;
struct ConfItem *kill_ptr;
- DLINK_FOREACH(gline_node, glines.head)
+ RB_DLINK_FOREACH(gline_node, glines.head)
{
kill_ptr = gline_node->data;
if((kill_ptr->user && (!user || match(kill_ptr->user, user)))
static void
expire_glines()
{
- dlink_node *gline_node;
- dlink_node *next_node;
+ rb_dlink_node *gline_node;
+ rb_dlink_node *next_node;
struct ConfItem *kill_ptr;
- DLINK_FOREACH_SAFE(gline_node, next_node, glines.head)
+ RB_DLINK_FOREACH_SAFE(gline_node, next_node, glines.head)
{
kill_ptr = gline_node->data;
/* these are in chronological order */
- if(kill_ptr->hold > CurrentTime)
+ if(kill_ptr->hold > rb_current_time())
break;
- dlinkDestroy(gline_node, &glines);
+ rb_dlinkDestroy(gline_node, &glines);
delete_one_address_conf(kill_ptr->host, kill_ptr);
}
}
static void
expire_pending_glines()
{
- dlink_node *pending_node;
- dlink_node *next_node;
+ rb_dlink_node *pending_node;
+ rb_dlink_node *next_node;
struct gline_pending *glp_ptr;
- DLINK_FOREACH_SAFE(pending_node, next_node, pending_glines.head)
+ RB_DLINK_FOREACH_SAFE(pending_node, next_node, pending_glines.head)
{
glp_ptr = pending_node->data;
if(((glp_ptr->last_gline_time + GLINE_PENDING_EXPIRE) <=
- CurrentTime) || find_is_glined(glp_ptr->host, glp_ptr->user))
+ rb_current_time()) || find_is_glined(glp_ptr->host, glp_ptr->user))
{
- MyFree(glp_ptr->reason1);
- MyFree(glp_ptr->reason2);
- MyFree(glp_ptr);
- dlinkDestroy(pending_node, &pending_glines);
+ rb_free(glp_ptr->reason1);
+ rb_free(glp_ptr->reason2);
+ rb_free(glp_ptr);
+ rb_dlinkDestroy(pending_node, &pending_glines);
}
}
}