#include "s_conf.h"
#include "s_newconf.h"
#include "send.h"
-#include "irc_string.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;
if(tmp->ip_limits)
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);
{
struct Class *cltmp;
rb_dlink_node *ptr;
- rb_dlink_node *rb_free(;
+ rb_dlink_node *next_ptr;
- RB_DLINK_FOREACH_SAFE(ptr, rb_free(, class_list.head)
+ RB_DLINK_FOREACH_SAFE(ptr, next_ptr, class_list.head)
{
cltmp = ptr->data;
initclass()
{
default_class = make_class();
- DupString(ClassName(default_class), "default");
+ ClassName(default_class) = rb_strdup("default");
}
/*