#include "stdinc.h"
#include "config.h"
-#include "tools.h"
#include "class.h"
#include "client.h"
#include "common.h"
#include "s_conf.h"
#include "s_newconf.h"
#include "send.h"
-#include "irc_string.h"
-#include "memory.h"
-#include "patricia.h"
+#include "match.h"
#define BAD_CONF_CLASS -1
#define BAD_PING -2
#define BAD_CLIENT_CLASS -3
-dlink_list class_list;
+rb_dlink_list class_list;
struct Class *default_class;
struct Class *
{
struct Class *tmp;
- tmp = (struct Class *) MyMalloc(sizeof(struct Class));
+ tmp = rb_malloc(sizeof(struct Class));
ConFreq(tmp) = DEFAULT_CONNECTFREQUENCY;
PingFreq(tmp) = DEFAULT_PINGFREQUENCY;
MaxUsers(tmp) = 1;
MaxSendq(tmp) = DEFAULT_SENDQ;
- tmp->ip_limits = New_Patricia(PATRICIA_BITS);
+ tmp->ip_limits = rb_new_patricia(PATRICIA_BITS);
return tmp;
}
free_class(struct Class *tmp)
{
if(tmp->ip_limits)
- Destroy_Patricia(tmp->ip_limits, NULL);
+ rb_destroy_patricia(tmp->ip_limits, NULL);
- MyFree(tmp->class_name);
- MyFree(tmp);
+ rb_free(tmp->class_name);
+ rb_free(tmp);
}
if(tmpptr == default_class)
{
- dlinkAddAlloc(classptr, &class_list);
+ rb_dlinkAddAlloc(classptr, &class_list);
CurrUsers(classptr) = 0;
}
else
PingFreq(tmpptr) = PingFreq(classptr);
MaxSendq(tmpptr) = MaxSendq(classptr);
ConFreq(tmpptr) = ConFreq(classptr);
- CidrBitlen(tmpptr) = CidrBitlen(classptr);
+ CidrIpv4Bitlen(tmpptr) = CidrIpv4Bitlen(classptr);
+ CidrIpv6Bitlen(tmpptr) = CidrIpv6Bitlen(classptr);
CidrAmount(tmpptr) = CidrAmount(classptr);
free_class(classptr);
find_class(const char *classname)
{
struct Class *cltmp;
- dlink_node *ptr;
+ rb_dlink_node *ptr;
if(classname == NULL)
return default_class;
- DLINK_FOREACH(ptr, class_list.head)
+ RB_DLINK_FOREACH(ptr, class_list.head)
{
cltmp = ptr->data;
check_class()
{
struct Class *cltmp;
- dlink_node *ptr;
- dlink_node *next_ptr;
+ rb_dlink_node *ptr;
+ rb_dlink_node *next_ptr;
- DLINK_FOREACH_SAFE(ptr, next_ptr, class_list.head)
+ RB_DLINK_FOREACH_SAFE(ptr, next_ptr, class_list.head)
{
cltmp = ptr->data;
if(MaxUsers(cltmp) < 0)
{
- dlinkDestroy(ptr, &class_list);
+ rb_dlinkDestroy(ptr, &class_list);
if(CurrUsers(cltmp) <= 0)
free_class(cltmp);
}
initclass()
{
default_class = make_class();
- DupString(ClassName(default_class), "default");
+ ClassName(default_class) = rb_strdup("default");
}
/*
report_classes(struct Client *source_p)
{
struct Class *cltmp;
- dlink_node *ptr;
+ rb_dlink_node *ptr;
- DLINK_FOREACH(ptr, class_list.head)
+ RB_DLINK_FOREACH(ptr, class_list.head)
{
cltmp = ptr->data;