#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
{
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);
}
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);
if(classname == NULL)
return default_class;
- DLINK_FOREACH(ptr, class_list.head)
+ RB_DLINK_FOREACH(ptr, class_list.head)
{
cltmp = ptr->data;
*
* inputs - NONE
* output - NONE
- * side effects -
+ * side effects -
*/
void
check_class()
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;
*
* inputs - NONE
* output - NONE
- * side effects -
+ * side effects -
*/
void
initclass()
{
default_class = make_class();
- DupString(ClassName(default_class), "default");
+ ClassName(default_class) = rb_strdup("default");
}
/*
struct Class *cltmp;
rb_dlink_node *ptr;
- DLINK_FOREACH(ptr, class_list.head)
+ RB_DLINK_FOREACH(ptr, class_list.head)
{
cltmp = ptr->data;
- sendto_one_numeric(source_p, RPL_STATSYLINE,
+ sendto_one_numeric(source_p, RPL_STATSYLINE,
form_str(RPL_STATSYLINE),
- ClassName(cltmp), PingFreq(cltmp),
- ConFreq(cltmp), MaxUsers(cltmp),
- MaxSendq(cltmp),
+ ClassName(cltmp), PingFreq(cltmp),
+ ConFreq(cltmp), MaxUsers(cltmp),
+ MaxSendq(cltmp),
MaxLocal(cltmp), MaxIdent(cltmp),
MaxGlobal(cltmp), MaxIdent(cltmp),
CurrUsers(cltmp));
/* also output the default class */
sendto_one_numeric(source_p, RPL_STATSYLINE, form_str(RPL_STATSYLINE),
- ClassName(default_class), PingFreq(default_class),
- ConFreq(default_class), MaxUsers(default_class),
- MaxSendq(default_class),
+ ClassName(default_class), PingFreq(default_class),
+ ConFreq(default_class), MaxUsers(default_class),
+ MaxSendq(default_class),
MaxLocal(default_class), MaxIdent(default_class),
MaxGlobal(default_class), MaxIdent(default_class),
CurrUsers(default_class));