/* This code is in the public domain.
- * $Id: newconf.c 3131 2007-01-21 15:36:31Z jilles $
+ * $Id: newconf.c 3550 2007-08-09 06:47:26Z nenolod $
*/
#include "stdinc.h"
#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));
- DupString(tc->tc_name, name);
+ 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->tc_name);
- MyFree(tc);
+ rb_dlinkDestroy(ptr, &conf_items);
+ 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
{NULL, 0}
};
-static struct mode_table flag_table[] = {
+static struct mode_table oper_table[] = {
{"encrypted", OPER_ENCRYPTED },
{"local_kill", OPER_LOCKILL },
{"global_kill", OPER_GLOBKILL|OPER_LOCKILL },
{"admin", OPER_ADMIN },
{"hidden_admin", OPER_HADMIN },
{"xline", OPER_XLINE },
+ {"resv", OPER_RESV },
{"operwall", OPER_OPERWALL },
{"oper_spy", OPER_SPY },
{"hidden_oper", OPER_INVIS },
{"remoteban", OPER_REMOTEBAN },
+ {"mass_notice", OPER_MASSNOTICE },
{NULL, 0}
};
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();
- yy_oper->flags |= OPER_ENCRYPTED|OPER_OPERWALL|OPER_REMOTEBAN;
+ yy_oper->flags |= OPER_ENCRYPTED|OPER_RESV|OPER_OPERWALL|OPER_REMOTEBAN|OPER_MASSNOTICE;
return 0;
}
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)
{
* 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;
yy_tmpoper->rsa_pubkey =
(RSA *) PEM_read_bio_RSA_PUBKEY(file, NULL, 0, NULL);
- BIO_set_close(file, BIO_CLOSE);
+ (void)BIO_set_close(file, BIO_CLOSE);
BIO_free(file);
if(yy_tmpoper->rsa_pubkey == NULL)
#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);
{
conf_parm_t *args = data;
- set_modes_from_table(&yy_oper->flags, "flag", flag_table, args);
+ set_modes_from_table(&yy_oper->flags, "flag", oper_table, args);
}
static void
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);
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);
}
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");
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;
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;
}
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);
+ 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);
}
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)
else
DupString(yy_shared->username, 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 = make_server_conf();
yy_server->port = PORTNUM;
+ yy_server->flags |= SERVER_TB;
if(conf_cur_block_name != NULL)
DupString(yy_server->name, conf_cur_block_name);
#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);
+ 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);
}
DupString(yy_hub->host, data);
DupString(yy_hub->server, yy_server->name);
- dlinkAdd(yy_hub, &yy_hub->node, &hubleaf_conf_list);
+ rb_dlinkAdd(yy_hub, &yy_hub->node, &hubleaf_conf_list);
}
static void
DupString(yy_leaf->host, data);
DupString(yy_leaf->server, yy_server->name);
- dlinkAdd(yy_leaf, &yy_leaf->node, &hubleaf_conf_list);
+ rb_dlinkAdd(yy_leaf, &yy_leaf->node, &hubleaf_conf_list);
}
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);
}
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)
yy_shared = make_remote_conf();
DupString(yy_shared->server, data);
- dlinkAddAlloc(yy_shared, &yy_cluster_list);
+ 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;
{
int val = *(unsigned int *) data;
- if((val > 0) && ConfigServerHide.links_disabled == 1)
- {
- eventAddIsh("cache_links", cache_links, NULL, val);
- ConfigServerHide.links_disabled = 0;
- }
- else if(val != ConfigServerHide.links_delay)
- eventUpdate("cache_links", val);
-
ConfigServerHide.links_delay = val;
}
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;
}
DupString(tmp, data);
- dlinkAddAlloc(tmp, &service_list);
+ rb_dlinkAddAlloc(tmp, &service_list);
if((target_p = find_server(NULL, tmp)))
target_p->flags |= FLAGS_SERVICE;
}
-static int
-alias_hash(const char *p)
-{
- int hash_val = 0;
-
- while (*p)
- {
- hash_val += ((int) (*p) & 0xDF);
- p++;
- }
-
- return (hash_val % MAX_MSG_HASH);
-}
-
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);
static int
conf_end_alias(struct TopConf *tc)
{
- int hashval;
-
if (yy_alias == NULL)
return -1;
{
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;
}
- hashval = alias_hash(yy_alias->name);
+ if (!alias_dict)
+ alias_dict = irc_dictionary_create(strcasecmp);
- dlinkAddAlloc(yy_alias, &alias_hash_table[hashval]);
+ irc_dictionary_add(alias_dict, yy_alias->name, yy_alias);
return 0;
}
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);
}
if((cf = find_conf_item(tc, name)) != NULL)
return -1;
- cf = MyMalloc(sizeof(struct ConfEntry));
+ cf = rb_malloc(sizeof(struct ConfEntry));
- DupString(cf->cf_name, name);
+ 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;
}
{ "description", CF_QSTRING, NULL, 0, &ServerInfo.description },
{ "network_desc", CF_QSTRING, NULL, 0, &ServerInfo.network_desc },
{ "hub", CF_YESNO, NULL, 0, &ServerInfo.hub },
- { "use_ts6", CF_YESNO, NULL, 0, &ServerInfo.use_ts6 },
{ "network_name", CF_QSTRING, conf_set_serverinfo_network_name, 0, NULL },
{ "name", CF_QSTRING, conf_set_serverinfo_name, 0, NULL },
{ "vhost", CF_QSTRING, conf_set_serverinfo_vhost, 0, NULL },
{ "vhost6", CF_QSTRING, conf_set_serverinfo_vhost6, 0, NULL },
+ { "max_clients", CF_INT, NULL, 0, &ServerInfo.max_clients },
+
{ "\0", 0, NULL, 0, NULL }
};
{ "connect_timeout", CF_TIME, NULL, 0, &ConfigFileEntry.connect_timeout },
{ "default_floodcount", CF_INT, NULL, 0, &ConfigFileEntry.default_floodcount },
{ "disable_auth", CF_YESNO, NULL, 0, &ConfigFileEntry.disable_auth },
- { "dot_in_ip6_addr", CF_YESNO, NULL, 0, &ConfigFileEntry.dot_in_ip6_addr },
{ "dots_in_ident", CF_INT, NULL, 0, &ConfigFileEntry.dots_in_ident },
{ "failed_oper_notice", CF_YESNO, NULL, 0, &ConfigFileEntry.failed_oper_notice },
{ "glines", CF_YESNO, NULL, 0, &ConfigFileEntry.glines },
{ "gline_min_cidr6", CF_INT, NULL, 0, &ConfigFileEntry.gline_min_cidr6 },
{ "gline_time", CF_TIME, NULL, 0, &ConfigFileEntry.gline_time },
{ "global_snotices", CF_YESNO, NULL, 0, &ConfigFileEntry.global_snotices },
- { "idletime", CF_TIME, NULL, 0, &ConfigFileEntry.idletime },
{ "hide_spoof_ips", CF_YESNO, NULL, 0, &ConfigFileEntry.hide_spoof_ips },
{ "dline_with_reason", CF_YESNO, NULL, 0, &ConfigFileEntry.dline_with_reason },
{ "kline_with_reason", CF_YESNO, NULL, 0, &ConfigFileEntry.kline_with_reason },
{ "max_nick_time", CF_TIME, NULL, 0, &ConfigFileEntry.max_nick_time },
{ "max_nick_changes", CF_INT, NULL, 0, &ConfigFileEntry.max_nick_changes },
{ "max_targets", CF_INT, NULL, 0, &ConfigFileEntry.max_targets },
+ { "max_unknown_ip", CF_INT, NULL, 0, &ConfigFileEntry.max_unknown_ip },
{ "min_nonwildcard", CF_INT, NULL, 0, &ConfigFileEntry.min_nonwildcard },
{ "nick_delay", CF_TIME, NULL, 0, &ConfigFileEntry.nick_delay },
{ "no_oper_flood", CF_YESNO, NULL, 0, &ConfigFileEntry.no_oper_flood },
{ "default_split_user_count", CF_INT, NULL, 0, &ConfigChannel.default_split_user_count },
{ "default_split_server_count", CF_INT, NULL, 0, &ConfigChannel.default_split_server_count },
{ "burst_topicwho", CF_YESNO, NULL, 0, &ConfigChannel.burst_topicwho },
- { "invite_ops_only", CF_YESNO, NULL, 0, &ConfigChannel.invite_ops_only },
{ "kick_on_split_riding", CF_YESNO, NULL, 0, &ConfigChannel.kick_on_split_riding },
{ "knock_delay", CF_TIME, NULL, 0, &ConfigChannel.knock_delay },
{ "knock_delay_channel",CF_TIME, NULL, 0, &ConfigChannel.knock_delay_channel },
projects / irc / rqf / shadowircd.git / blobdiff