#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"
struct TopConf *conf_cur_block;
static char *conf_cur_block_name;
-static dlink_list conf_items;
+static rb_dlink_list conf_items;
static struct ConfItem *yy_aconf = NULL;
static struct remote_conf *yy_shared = NULL;
static struct server_conf *yy_server = NULL;
-static dlink_list yy_aconf_list;
-static dlink_list yy_oper_list;
-static dlink_list yy_shared_list;
-static dlink_list yy_cluster_list;
+static rb_dlink_list yy_aconf_list;
+static rb_dlink_list yy_oper_list;
+static rb_dlink_list yy_shared_list;
+static rb_dlink_list yy_cluster_list;
static struct oper_conf *yy_oper = NULL;
static struct alias_entry *yy_alias = NULL;
{
struct TopConf *tc;
- tc = MyMalloc(sizeof(struct TopConf));
+ tc = rb_malloc(sizeof(struct TopConf));
tc->tc_name = name;
tc->tc_sfunc = sfunc;
tc->tc_efunc = efunc;
tc->tc_entries = items;
- dlinkAddAlloc(tc, &conf_items);
+ rb_dlinkAddAlloc(tc, &conf_items);
return 0;
}
struct TopConf *
find_top_conf(const char *name)
{
- dlink_node *d;
+ 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)
find_conf_item(const struct TopConf *top, const char *name)
{
struct ConfEntry *cf;
- dlink_node *d;
+ rb_dlink_node *d;
if(top->tc_entries)
{
}
}
- 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)
remove_top_conf(char *name)
{
struct TopConf *tc;
- dlink_node *ptr;
+ rb_dlink_node *ptr;
if((tc = find_top_conf(name)) == NULL)
return -1;
- if((ptr = dlinkFind(tc, &conf_items)) == NULL)
+ if((ptr = rb_dlinkFind(tc, &conf_items)) == NULL)
return -1;
- dlinkDestroy(ptr, &conf_items);
- MyFree(tc);
+ rb_dlinkDestroy(ptr, &conf_items);
+ rb_free(tc);
return 0;
}
/* the ircd will exit() in main() if we dont set one */
if(strlen(s) <= HOSTLEN)
- DupString(ServerInfo.name, (char *) data);
+ ServerInfo.name = rb_strdup((char *) data);
}
}
if((p = strchr((char *) data, ' ')))
*p = '\0';
- MyFree(ServerInfo.network_name);
- DupString(ServerInfo.network_name, (char *) data);
+ rb_free(ServerInfo.network_name);
+ ServerInfo.network_name = rb_strdup((char *) data);
}
static void
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
static int
conf_begin_oper(struct TopConf *tc)
{
- dlink_node *ptr;
- dlink_node *next_ptr;
+ rb_dlink_node *ptr;
+ rb_dlink_node *next_ptr;
if(yy_oper != NULL)
{
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);
- dlinkDestroy(ptr, &yy_oper_list);
+ rb_dlinkDestroy(ptr, &yy_oper_list);
}
yy_oper = make_oper_conf();
conf_end_oper(struct TopConf *tc)
{
struct oper_conf *yy_tmpoper;
- dlink_node *ptr;
- dlink_node *next_ptr;
+ rb_dlink_node *ptr;
+ rb_dlink_node *next_ptr;
if(conf_cur_block_name != NULL)
{
if(strlen(conf_cur_block_name) > OPERNICKLEN)
conf_cur_block_name[OPERNICKLEN] = '\0';
- DupString(yy_oper->name, conf_cur_block_name);
+ yy_oper->name = rb_strdup(conf_cur_block_name);
}
if(EmptyString(yy_oper->name))
* 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;
- DupString(yy_tmpoper->name, yy_oper->name);
+ yy_tmpoper->name = rb_strdup(yy_oper->name);
/* could be an rsa key instead.. */
if(!EmptyString(yy_oper->passwd))
- DupString(yy_tmpoper->passwd, yy_oper->passwd);
+ yy_tmpoper->passwd = rb_strdup(yy_oper->passwd);
yy_tmpoper->flags = yy_oper->flags;
yy_tmpoper->umodes = yy_oper->umodes;
#endif
/* all is ok, put it on oper_conf_list */
- dlinkMoveNode(ptr, &yy_oper_list, &oper_conf_list);
+ rb_dlinkMoveNode(ptr, &yy_oper_list, &oper_conf_list);
}
free_oper_conf(yy_oper);
{
*p++ = '\0';
- DupString(yy_tmpoper->username, host);
- DupString(yy_tmpoper->host, p);
+ yy_tmpoper->username = rb_strdup(host);
+ yy_tmpoper->host = rb_strdup(p);
}
else
{
- DupString(yy_tmpoper->username, "*");
- DupString(yy_tmpoper->host, host);
+ yy_tmpoper->username = rb_strdup("*");
+ yy_tmpoper->host = rb_strdup(host);
}
if(EmptyString(yy_tmpoper->username) || EmptyString(yy_tmpoper->host))
return;
}
- dlinkAddAlloc(yy_tmpoper, &yy_oper_list);
+ rb_dlinkAddAlloc(yy_tmpoper, &yy_oper_list);
}
static void
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);
+ yy_oper->passwd = rb_strdup((char *) data);
}
static void
conf_set_oper_rsa_public_key_file(void *data)
{
#ifdef HAVE_LIBCRYPTO
- MyFree(yy_oper->rsa_pubkey_file);
- DupString(yy_oper->rsa_pubkey_file, (char *) data);
+ rb_free(yy_oper->rsa_pubkey_file);
+ yy_oper->rsa_pubkey_file = rb_strdup((char *) data);
#else
conf_report_error("Warning -- ignoring rsa_public_key_file (OpenSSL support not available");
#endif
conf_end_class(struct TopConf *tc)
{
if(conf_cur_block_name != NULL)
- DupString(yy_class->class_name, conf_cur_block_name);
+ yy_class->class_name = rb_strdup(conf_cur_block_name);
if(EmptyString(yy_class->class_name))
{
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);
- DupString(listener_address, data);
+ rb_free(listener_address);
+ listener_address = rb_strdup(data);
}
static int
conf_begin_auth(struct TopConf *tc)
{
- dlink_node *ptr;
- dlink_node *next_ptr;
+ rb_dlink_node *ptr;
+ rb_dlink_node *next_ptr;
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);
- dlinkDestroy(ptr, &yy_aconf_list);
+ rb_dlinkDestroy(ptr, &yy_aconf_list);
}
yy_aconf = make_conf();
conf_end_auth(struct TopConf *tc)
{
struct ConfItem *yy_tmp;
- dlink_node *ptr;
- dlink_node *next_ptr;
+ rb_dlink_node *ptr;
+ rb_dlink_node *next_ptr;
if(EmptyString(yy_aconf->name))
- DupString(yy_aconf->name, "NOMATCH");
+ yy_aconf->name = rb_strdup("NOMATCH");
/* didnt even get one ->host? */
if(EmptyString(yy_aconf->host))
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)
- DupString(yy_tmp->passwd, yy_aconf->passwd);
+ yy_tmp->passwd = rb_strdup(yy_aconf->passwd);
/* this will always exist.. */
- DupString(yy_tmp->name, yy_aconf->name);
+ yy_tmp->name = rb_strdup(yy_aconf->name);
if(yy_aconf->className)
- DupString(yy_tmp->className, yy_aconf->className);
+ yy_tmp->className = rb_strdup(yy_aconf->className);
yy_tmp->flags = yy_aconf->flags;
yy_tmp->port = yy_aconf->port;
conf_add_class_to_conf(yy_tmp);
add_conf_by_address(yy_tmp->host, CONF_CLIENT, yy_tmp->user, yy_tmp);
- dlinkDestroy(ptr, &yy_aconf_list);
+ rb_dlinkDestroy(ptr, &yy_aconf_list);
}
yy_aconf = NULL;
{
*p++ = '\0';
- DupString(yy_tmp->user, data);
- DupString(yy_tmp->host, p);
+ yy_tmp->user = rb_strdup(data);
+ yy_tmp->host = rb_strdup(p);
}
else
{
- DupString(yy_tmp->user, "*");
- DupString(yy_tmp->host, data);
+ yy_tmp->user = rb_strdup("*");
+ yy_tmp->host = rb_strdup(data);
}
if(yy_aconf != yy_tmp)
- dlinkAddAlloc(yy_tmp, &yy_aconf_list);
+ rb_dlinkAddAlloc(yy_tmp, &yy_aconf_list);
}
static void
{
if(yy_aconf->passwd)
memset(yy_aconf->passwd, 0, strlen(yy_aconf->passwd));
- MyFree(yy_aconf->passwd);
- DupString(yy_aconf->passwd, data);
+ rb_free(yy_aconf->passwd);
+ yy_aconf->passwd = rb_strdup(data);
}
static void
return;
}
- MyFree(yy_aconf->name);
- DupString(yy_aconf->name, data);
+ rb_free(yy_aconf->name);
+ yy_aconf->name = rb_strdup(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);
- DupString(yy_aconf->name, data);
+ rb_free(yy_aconf->name);
+ yy_aconf->name = rb_strdup(data);
}
static void
static void
conf_set_auth_class(void *data)
{
- MyFree(yy_aconf->className);
- DupString(yy_aconf->className, data);
+ rb_free(yy_aconf->className);
+ yy_aconf->className = rb_strdup(data);
}
/* ok, shared_oper handles the stacking, shared_flags handles adding
static int
conf_cleanup_shared(struct TopConf *tc)
{
- dlink_node *ptr, *next_ptr;
+ 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);
- dlinkDestroy(ptr, &yy_shared_list);
+ rb_dlinkDestroy(ptr, &yy_shared_list);
}
if(yy_shared != NULL)
return;
}
- DupString(yy_shared->server, args->v.string);
+ yy_shared->server = rb_strdup(args->v.string);
args = args->next;
}
else
- DupString(yy_shared->server, "*");
+ yy_shared->server = rb_strdup("*");
if((args->type & CF_MTYPE) != CF_QSTRING)
{
*p++ = '\0';
if(EmptyString(p))
- DupString(yy_shared->host, "*");
+ yy_shared->host = rb_strdup("*");
else
- DupString(yy_shared->host, p);
+ yy_shared->host = rb_strdup(p);
if(EmptyString(username))
- DupString(yy_shared->username, "*");
+ yy_shared->username = rb_strdup("*");
else
- DupString(yy_shared->username, username);
+ yy_shared->username = rb_strdup(username);
- dlinkAddAlloc(yy_shared, &yy_shared_list);
+ rb_dlinkAddAlloc(yy_shared, &yy_shared_list);
yy_shared = NULL;
}
{
conf_parm_t *args = data;
int flags = 0;
- dlink_node *ptr, *next_ptr;
+ rb_dlink_node *ptr, *next_ptr;
if(yy_shared != NULL)
free_remote_conf(yy_shared);
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;
yy_shared->flags = flags;
- dlinkDestroy(ptr, &yy_shared_list);
- dlinkAddTail(yy_shared, &yy_shared->node, &shared_conf_list);
+ rb_dlinkDestroy(ptr, &yy_shared_list);
+ rb_dlinkAddTail(yy_shared, &yy_shared->node, &shared_conf_list);
}
yy_shared = NULL;
yy_server->flags |= SERVER_TB;
if(conf_cur_block_name != NULL)
- DupString(yy_server->name, conf_cur_block_name);
+ yy_server->name = rb_strdup(conf_cur_block_name);
return 0;
}
#endif
add_server_conf(yy_server);
- dlinkAdd(yy_server, &yy_server->node, &server_conf_list);
+ rb_dlinkAdd(yy_server, &yy_server->node, &server_conf_list);
yy_server = NULL;
return 0;
static void
conf_set_connect_host(void *data)
{
- MyFree(yy_server->host);
- DupString(yy_server->host, data);
+ rb_free(yy_server->host);
+ yy_server->host = rb_strdup(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);
+ yy_server->spasswd = rb_strdup(data);
}
static void
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);
+ yy_server->passwd = rb_strdup(data);
}
static void
yy_hub = make_remote_conf();
yy_hub->flags = CONF_HUB;
- DupString(yy_hub->host, data);
- DupString(yy_hub->server, yy_server->name);
- dlinkAdd(yy_hub, &yy_hub->node, &hubleaf_conf_list);
+ yy_hub->host = rb_strdup(data);
+ yy_hub->server = rb_strdup(yy_server->name);
+ rb_dlinkAdd(yy_hub, &yy_hub->node, &hubleaf_conf_list);
}
static void
yy_leaf = make_remote_conf();
yy_leaf->flags = CONF_LEAF;
- DupString(yy_leaf->host, data);
- DupString(yy_leaf->server, yy_server->name);
- dlinkAdd(yy_leaf, &yy_leaf->node, &hubleaf_conf_list);
+ yy_leaf->host = rb_strdup(data);
+ yy_leaf->server = rb_strdup(yy_server->name);
+ rb_dlinkAdd(yy_leaf, &yy_leaf->node, &hubleaf_conf_list);
}
static void
conf_set_connect_class(void *data)
{
- MyFree(yy_server->class_name);
- DupString(yy_server->class_name, data);
+ rb_free(yy_server->class_name);
+ yy_server->class_name = rb_strdup(data);
}
static void
}
yy_tmp = make_conf();
- DupString(yy_tmp->passwd, "*");
- DupString(yy_tmp->host, data);
+ yy_tmp->passwd = rb_strdup("*");
+ yy_tmp->host = rb_strdup(data);
yy_tmp->status = CONF_EXEMPTDLINE;
add_conf_by_address(yy_tmp->host, CONF_EXEMPTDLINE, NULL, yy_tmp);
}
static int
conf_cleanup_cluster(struct TopConf *tc)
{
- dlink_node *ptr, *next_ptr;
+ 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);
- dlinkDestroy(ptr, &yy_cluster_list);
+ rb_dlinkDestroy(ptr, &yy_cluster_list);
}
if(yy_shared != NULL)
free_remote_conf(yy_shared);
yy_shared = make_remote_conf();
- DupString(yy_shared->server, data);
- dlinkAddAlloc(yy_shared, &yy_cluster_list);
+ yy_shared->server = rb_strdup(data);
+ rb_dlinkAddAlloc(yy_shared, &yy_cluster_list);
yy_shared = NULL;
}
{
conf_parm_t *args = data;
int flags = 0;
- dlink_node *ptr, *next_ptr;
+ rb_dlink_node *ptr, *next_ptr;
if(yy_shared != NULL)
free_remote_conf(yy_shared);
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;
- dlinkAddTail(yy_shared, &yy_shared->node, &cluster_conf_list);
- dlinkDestroy(ptr, &yy_cluster_list);
+ rb_dlinkAddTail(yy_shared, &yy_shared->node, &cluster_conf_list);
+ rb_dlinkDestroy(ptr, &yy_cluster_list);
}
yy_shared = NULL;
conf_begin_service(struct TopConf *tc)
{
struct Client *target_p;
- dlink_node *ptr;
+ rb_dlink_node *ptr;
- DLINK_FOREACH(ptr, global_serv_list.head)
+ RB_DLINK_FOREACH(ptr, global_serv_list.head)
{
target_p = ptr->data;
return;
}
- DupString(tmp, data);
- dlinkAddAlloc(tmp, &service_list);
+ tmp = rb_strdup(data);
+ rb_dlinkAddAlloc(tmp, &service_list);
if((target_p = find_server(NULL, tmp)))
target_p->flags |= FLAGS_SERVICE;
static int
conf_begin_alias(struct TopConf *tc)
{
- yy_alias = MyMalloc(sizeof(struct alias_entry));
+ yy_alias = rb_malloc(sizeof(struct alias_entry));
if (conf_cur_block_name != NULL)
- DupString(yy_alias->name, conf_cur_block_name);
+ yy_alias->name = rb_strdup(conf_cur_block_name);
yy_alias->flags = 0;
yy_alias->hits = 0;
{
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 (data == NULL || yy_alias == NULL) /* this shouldn't ever happen */
return;
- DupString(yy_alias->name, data);
+ yy_alias->name = rb_strdup(data);
}
static void
if (data == NULL || yy_alias == NULL) /* this shouldn't ever happen */
return;
- DupString(yy_alias->target, data);
+ yy_alias->target = rb_strdup(data);
}
static void
conf_set_blacklist_host(void *data)
{
- DupString(yy_blacklist_host, data);
+ yy_blacklist_host = rb_strdup(data);
}
static void
conf_set_blacklist_reason(void *data)
{
- DupString(yy_blacklist_reason, data);
+ yy_blacklist_reason = rb_strdup(data);
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;
}
char msg[IRCD_BUFSIZE + 1] = { 0 };
va_start(ap, fmt);
- ircvsnprintf(msg, IRCD_BUFSIZE, fmt, ap);
+ rb_vsnprintf(msg, IRCD_BUFSIZE, fmt, ap);
va_end(ap);
if (testing_conf)
}
if(name)
- DupString(conf_cur_block_name, name);
+ conf_cur_block_name = rb_strdup(name);
else
conf_cur_block_name = 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);
- DupString(*loc, input);
+ rb_free(*loc);
+ *loc = rb_strdup(input);
}
int
value->v.list->type = CF_STRING;
if(cp->v.number == 1)
- DupString(cp->v.string, "yes");
+ cp->v.string = rb_strdup("yes");
else
- DupString(cp->v.string, "no");
+ cp->v.string = rb_strdup("no");
}
/* maybe it's a CF_TIME and they passed CF_INT --
if((cf = find_conf_item(tc, name)) != NULL)
return -1;
- cf = MyMalloc(sizeof(struct ConfEntry));
+ cf = rb_malloc(sizeof(struct ConfEntry));
cf->cf_name = name;
cf->cf_type = type;
cf->cf_func = func;
cf->cf_arg = NULL;
- dlinkAddAlloc(cf, &tc->tc_items);
+ rb_dlinkAddAlloc(cf, &tc->tc_items);
return 0;
}
{
struct TopConf *tc;
struct ConfEntry *cf;
- dlink_node *ptr;
+ rb_dlink_node *ptr;
if((tc = find_top_conf(topconf)) == NULL)
return -1;
if((cf = find_conf_item(tc, name)) == NULL)
return -1;
- if((ptr = dlinkFind(cf, &tc->tc_items)) == NULL)
+ if((ptr = rb_dlinkFind(cf, &tc->tc_items)) == NULL)
return -1;
- dlinkDestroy(ptr, &tc->tc_items);
- MyFree(cf);
+ rb_dlinkDestroy(ptr, &tc->tc_items);
+ rb_free(cf);
return 0;
}