#include <openssl/rsa.h>
#endif
-#include "memory.h"
#include "newconf.h"
-#include "tools.h"
#include "ircd_defs.h"
#include "sprintf_irc.h"
#include "common.h"
#include "listener.h"
#include "hostmask.h"
#include "s_serv.h"
-#include "event.h"
#include "hash.h"
#include "cache.h"
#include "ircd.h"
rb_dlink_node *d;
struct TopConf *tc;
- DLINK_FOREACH(d, conf_items.head)
+ RB_DLINK_FOREACH(d, conf_items.head)
{
tc = d->data;
if(strcasecmp(tc->tc_name, name) == 0)
}
}
- DLINK_FOREACH(d, top->tc_items.head)
+ RB_DLINK_FOREACH(d, top->tc_items.head)
{
cf = d->data;
if(strcasecmp(cf->cf_name, name) == 0)
return -1;
rb_dlinkDestroy(ptr, &conf_items);
- MyFree(tc);
+ rb_free(tc);
return 0;
}
if((p = strchr((char *) data, ' ')))
*p = '\0';
- MyFree(ServerInfo.network_name);
+ rb_free(ServerInfo.network_name);
DupString(ServerInfo.network_name, (char *) data);
}
load_one_module((char *) data, 0);
- MyFree(m_bn);
+ rb_free(m_bn);
#else
conf_report_error("Ignoring modules::module -- loadable module support not present.");
#endif
yy_oper = NULL;
}
- DLINK_FOREACH_SAFE(ptr, next_ptr, yy_oper_list.head)
+ RB_DLINK_FOREACH_SAFE(ptr, next_ptr, yy_oper_list.head)
{
free_oper_conf(ptr->data);
rb_dlinkDestroy(ptr, &yy_oper_list);
* and host in, yy_oper contains the rest of the information which
* we need to copy into each element in yy_oper_list
*/
- DLINK_FOREACH_SAFE(ptr, next_ptr, yy_oper_list.head)
+ RB_DLINK_FOREACH_SAFE(ptr, next_ptr, yy_oper_list.head)
{
yy_tmpoper = ptr->data;
if(yy_oper->passwd)
{
memset(yy_oper->passwd, 0, strlen(yy_oper->passwd));
- MyFree(yy_oper->passwd);
+ rb_free(yy_oper->passwd);
}
DupString(yy_oper->passwd, (char *) data);
conf_set_oper_rsa_public_key_file(void *data)
{
#ifdef HAVE_LIBCRYPTO
- MyFree(yy_oper->rsa_pubkey_file);
+ rb_free(yy_oper->rsa_pubkey_file);
DupString(yy_oper->rsa_pubkey_file, (char *) data);
#else
conf_report_error("Warning -- ignoring rsa_public_key_file (OpenSSL support not available");
static int
conf_begin_listen(struct TopConf *tc)
{
- MyFree(listener_address);
+ rb_free(listener_address);
listener_address = NULL;
return 0;
}
static int
conf_end_listen(struct TopConf *tc)
{
- MyFree(listener_address);
+ rb_free(listener_address);
listener_address = NULL;
return 0;
}
static void
conf_set_listen_address(void *data)
{
- MyFree(listener_address);
+ rb_free(listener_address);
DupString(listener_address, data);
}
if(yy_aconf)
free_conf(yy_aconf);
- DLINK_FOREACH_SAFE(ptr, next_ptr, yy_aconf_list.head)
+ RB_DLINK_FOREACH_SAFE(ptr, next_ptr, yy_aconf_list.head)
{
free_conf(ptr->data);
rb_dlinkDestroy(ptr, &yy_aconf_list);
conf_add_class_to_conf(yy_aconf);
add_conf_by_address(yy_aconf->host, CONF_CLIENT, yy_aconf->user, yy_aconf);
- DLINK_FOREACH_SAFE(ptr, next_ptr, yy_aconf_list.head)
+ RB_DLINK_FOREACH_SAFE(ptr, next_ptr, yy_aconf_list.head)
{
yy_tmp = ptr->data;
{
if(yy_aconf->passwd)
memset(yy_aconf->passwd, 0, strlen(yy_aconf->passwd));
- MyFree(yy_aconf->passwd);
+ rb_free(yy_aconf->passwd);
DupString(yy_aconf->passwd, data);
}
return;
}
- MyFree(yy_aconf->name);
+ rb_free(yy_aconf->name);
DupString(yy_aconf->name, data);
yy_aconf->flags |= CONF_FLAGS_SPOOF_IP;
}
conf_set_auth_redir_serv(void *data)
{
yy_aconf->flags |= CONF_FLAGS_REDIR;
- MyFree(yy_aconf->name);
+ rb_free(yy_aconf->name);
DupString(yy_aconf->name, data);
}
static void
conf_set_auth_class(void *data)
{
- MyFree(yy_aconf->className);
+ rb_free(yy_aconf->className);
DupString(yy_aconf->className, data);
}
{
rb_dlink_node *ptr, *next_ptr;
- DLINK_FOREACH_SAFE(ptr, next_ptr, yy_shared_list.head)
+ RB_DLINK_FOREACH_SAFE(ptr, next_ptr, yy_shared_list.head)
{
free_remote_conf(ptr->data);
rb_dlinkDestroy(ptr, &yy_shared_list);
set_modes_from_table(&flags, "flag", shared_table, args);
- DLINK_FOREACH_SAFE(ptr, next_ptr, yy_shared_list.head)
+ RB_DLINK_FOREACH_SAFE(ptr, next_ptr, yy_shared_list.head)
{
yy_shared = ptr->data;
static void
conf_set_connect_host(void *data)
{
- MyFree(yy_server->host);
+ rb_free(yy_server->host);
DupString(yy_server->host, data);
if (strchr(yy_server->host, ':'))
yy_server->aftype = AF_INET6;
if(yy_server->spasswd)
{
memset(yy_server->spasswd, 0, strlen(yy_server->spasswd));
- MyFree(yy_server->spasswd);
+ rb_free(yy_server->spasswd);
}
DupString(yy_server->spasswd, data);
if(yy_server->passwd)
{
memset(yy_server->passwd, 0, strlen(yy_server->passwd));
- MyFree(yy_server->passwd);
+ rb_free(yy_server->passwd);
}
DupString(yy_server->passwd, data);
}
static void
conf_set_connect_class(void *data)
{
- MyFree(yy_server->class_name);
+ rb_free(yy_server->class_name);
DupString(yy_server->class_name, data);
}
{
rb_dlink_node *ptr, *next_ptr;
- DLINK_FOREACH_SAFE(ptr, next_ptr, yy_cluster_list.head)
+ RB_DLINK_FOREACH_SAFE(ptr, next_ptr, yy_cluster_list.head)
{
free_remote_conf(ptr->data);
rb_dlinkDestroy(ptr, &yy_cluster_list);
set_modes_from_table(&flags, "flag", cluster_table, args);
- DLINK_FOREACH_SAFE(ptr, next_ptr, yy_cluster_list.head)
+ RB_DLINK_FOREACH_SAFE(ptr, next_ptr, yy_cluster_list.head)
{
yy_shared = ptr->data;
yy_shared->flags = flags;
struct Client *target_p;
rb_dlink_node *ptr;
- DLINK_FOREACH(ptr, global_serv_list.head)
+ RB_DLINK_FOREACH(ptr, global_serv_list.head)
{
target_p = ptr->data;
{
conf_report_error("Ignoring alias -- must have a name.");
- MyFree(yy_alias);
+ rb_free(yy_alias);
return -1;
}
{
conf_report_error("Ignoring alias -- must have a target.");
- MyFree(yy_alias);
+ rb_free(yy_alias);
return -1;
}
if (yy_blacklist_host && yy_blacklist_reason)
{
new_blacklist(yy_blacklist_host, yy_blacklist_reason);
- MyFree(yy_blacklist_host);
- MyFree(yy_blacklist_reason);
+ rb_free(yy_blacklist_host);
+ rb_free(yy_blacklist_reason);
yy_blacklist_host = NULL;
yy_blacklist_reason = NULL;
}
if(tc->tc_efunc)
return tc->tc_efunc(tc);
- MyFree(conf_cur_block_name);
+ rb_free(conf_cur_block_name);
return 0;
}
if(len && strlen(input) > len)
input[len] = '\0';
- MyFree(*loc);
+ rb_free(*loc);
DupString(*loc, input);
}
return -1;
rb_dlinkDestroy(ptr, &tc->tc_items);
- MyFree(cf);
+ rb_free(cf);
return 0;
}