#include "common.h"
#include "s_conf.h"
#include "s_newconf.h"
-#include "tools.h"
#include "client.h"
-#include "memory.h"
#include "s_serv.h"
#include "send.h"
#include "hostmask.h"
#include "newconf.h"
#include "hash.h"
-#include "balloc.h"
-#include "event.h"
#include "sprintf_irc.h"
#include "irc_dictionary.h"
rb_dlink_list nd_list; /* nick delay */
rb_dlink_list tgchange_list;
-patricia_tree_t *tgchange_tree;
+rb_patricia_tree_t *tgchange_tree;
static BlockHeap *nd_heap = NULL;
rb_dlink_node *ptr;
rb_dlink_node *next_ptr;
- DLINK_FOREACH_SAFE(ptr, next_ptr, shared_conf_list.head)
+ RB_DLINK_FOREACH_SAFE(ptr, next_ptr, shared_conf_list.head)
{
/* ptr here is ptr->data->node */
rb_dlinkDelete(ptr, &shared_conf_list);
free_remote_conf(ptr->data);
}
- DLINK_FOREACH_SAFE(ptr, next_ptr, cluster_conf_list.head)
+ RB_DLINK_FOREACH_SAFE(ptr, next_ptr, cluster_conf_list.head)
{
rb_dlinkDelete(ptr, &cluster_conf_list);
free_remote_conf(ptr->data);
}
- DLINK_FOREACH_SAFE(ptr, next_ptr, hubleaf_conf_list.head)
+ RB_DLINK_FOREACH_SAFE(ptr, next_ptr, hubleaf_conf_list.head)
{
rb_dlinkDelete(ptr, &hubleaf_conf_list);
free_remote_conf(ptr->data);
}
- DLINK_FOREACH_SAFE(ptr, next_ptr, oper_conf_list.head)
+ RB_DLINK_FOREACH_SAFE(ptr, next_ptr, oper_conf_list.head)
{
free_oper_conf(ptr->data);
rb_dlinkDestroy(ptr, &oper_conf_list);
}
- DLINK_FOREACH_SAFE(ptr, next_ptr, server_conf_list.head)
+ RB_DLINK_FOREACH_SAFE(ptr, next_ptr, server_conf_list.head)
{
server_p = ptr->data;
struct ConfItem *aconf;
rb_dlink_node *ptr, *next_ptr;
- DLINK_FOREACH_SAFE(ptr, next_ptr, xline_conf_list.head)
+ RB_DLINK_FOREACH_SAFE(ptr, next_ptr, xline_conf_list.head)
{
aconf = ptr->data;
rb_dlinkDestroy(ptr, &xline_conf_list);
}
- DLINK_FOREACH_SAFE(ptr, next_ptr, resv_conf_list.head)
+ RB_DLINK_FOREACH_SAFE(ptr, next_ptr, resv_conf_list.head)
{
aconf = ptr->data;
struct remote_conf *
make_remote_conf(void)
{
- struct remote_conf *remote_p = MyMalloc(sizeof(struct remote_conf));
+ struct remote_conf *remote_p = rb_malloc(sizeof(struct remote_conf));
return remote_p;
}
if(remote_p == NULL)
return;
- MyFree(remote_p->username);
- MyFree(remote_p->host);
- MyFree(remote_p->server);
- MyFree(remote_p);
+ rb_free(remote_p->username);
+ rb_free(remote_p->host);
+ rb_free(remote_p->server);
+ rb_free(remote_p);
}
int
struct remote_conf *shared_p;
rb_dlink_node *ptr;
- DLINK_FOREACH(ptr, shared_conf_list.head)
+ RB_DLINK_FOREACH(ptr, shared_conf_list.head)
{
shared_p = ptr->data;
ircvsnprintf(buffer, sizeof(buffer), format, args);
va_end(args);
- DLINK_FOREACH(ptr, cluster_conf_list.head)
+ RB_DLINK_FOREACH(ptr, cluster_conf_list.head)
{
shared_p = ptr->data;
struct oper_conf *
make_oper_conf(void)
{
- struct oper_conf *oper_p = MyMalloc(sizeof(struct oper_conf));
+ struct oper_conf *oper_p = rb_malloc(sizeof(struct oper_conf));
return oper_p;
}
if(oper_p == NULL)
return;
- MyFree(oper_p->username);
- MyFree(oper_p->host);
- MyFree(oper_p->name);
+ rb_free(oper_p->username);
+ rb_free(oper_p->host);
+ rb_free(oper_p->name);
if(oper_p->passwd)
{
memset(oper_p->passwd, 0, strlen(oper_p->passwd));
- MyFree(oper_p->passwd);
+ rb_free(oper_p->passwd);
}
#ifdef HAVE_LIBCRYPTO
- MyFree(oper_p->rsa_pubkey_file);
+ rb_free(oper_p->rsa_pubkey_file);
if(oper_p->rsa_pubkey)
RSA_free(oper_p->rsa_pubkey);
#endif
- MyFree(oper_p);
+ rb_free(oper_p);
}
struct oper_conf *
parse_netmask(locip, (struct sockaddr *)&cip, &cbits);
- DLINK_FOREACH(ptr, oper_conf_list.head)
+ RB_DLINK_FOREACH(ptr, oper_conf_list.head)
{
oper_p = ptr->data;
struct server_conf *
make_server_conf(void)
{
- struct server_conf *server_p = MyMalloc(sizeof(struct server_conf));
+ struct server_conf *server_p = rb_malloc(sizeof(struct server_conf));
server_p->aftype = AF_INET;
return server_p;
}
if(!EmptyString(server_p->passwd))
{
memset(server_p->passwd, 0, strlen(server_p->passwd));
- MyFree(server_p->passwd);
+ rb_free(server_p->passwd);
}
if(!EmptyString(server_p->spasswd))
{
memset(server_p->spasswd, 0, strlen(server_p->spasswd));
- MyFree(server_p->spasswd);
+ rb_free(server_p->spasswd);
}
- MyFree(server_p->name);
- MyFree(server_p->host);
- MyFree(server_p->class_name);
- MyFree(server_p);
+ rb_free(server_p->name);
+ rb_free(server_p->host);
+ rb_free(server_p->class_name);
+ rb_free(server_p);
}
void
conf_report_error("Warning connect::class invalid for %s",
server_p->name);
- MyFree(server_p->class_name);
+ rb_free(server_p->class_name);
DupString(server_p->class_name, "default");
}
struct server_conf *server_p;
rb_dlink_node *ptr;
- DLINK_FOREACH(ptr, server_conf_list.head)
+ RB_DLINK_FOREACH(ptr, server_conf_list.head)
{
server_p = ptr->data;
struct ConfItem *aconf;
rb_dlink_node *ptr;
- DLINK_FOREACH(ptr, xline_conf_list.head)
+ RB_DLINK_FOREACH(ptr, xline_conf_list.head)
{
aconf = ptr->data;
struct ConfItem *aconf;
rb_dlink_node *ptr;
- DLINK_FOREACH(ptr, xline_conf_list.head)
+ RB_DLINK_FOREACH(ptr, xline_conf_list.head)
{
aconf = ptr->data;
struct ConfItem *aconf;
rb_dlink_node *ptr;
- DLINK_FOREACH(ptr, resv_conf_list.head)
+ RB_DLINK_FOREACH(ptr, resv_conf_list.head)
{
aconf = ptr->data;
struct ConfItem *aconf;
rb_dlink_node *ptr;
- DLINK_FOREACH(ptr, resv_conf_list.head)
+ RB_DLINK_FOREACH(ptr, resv_conf_list.head)
{
aconf = ptr->data;
}
HASH_WALK_END
- DLINK_FOREACH_SAFE(ptr, next_ptr, resv_conf_list.head)
+ RB_DLINK_FOREACH_SAFE(ptr, next_ptr, resv_conf_list.head)
{
aconf = ptr->data;
}
}
- DLINK_FOREACH_SAFE(ptr, next_ptr, xline_conf_list.head)
+ RB_DLINK_FOREACH_SAFE(ptr, next_ptr, xline_conf_list.head)
{
aconf = ptr->data;
rb_dlink_node *ptr;
rb_dlink_node *next_ptr;
- DLINK_FOREACH_SAFE(ptr, next_ptr, nd_list.head)
+ RB_DLINK_FOREACH_SAFE(ptr, next_ptr, nd_list.head)
{
nd = ptr->data;
if(find_tgchange(host))
return;
- target = MyMalloc(sizeof(tgchange));
+ target = rb_malloc(sizeof(tgchange));
pnode = make_and_lookup(tgchange_tree, host);
pnode->data = target;