* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA
*
- * $Id: s_conf.c 3131 2007-01-21 15:36:31Z jilles $
+ * $Id: s_conf.c 3550 2007-08-09 06:47:26Z nenolod $
*/
#include "stdinc.h"
#include "ircd_defs.h"
-#include "tools.h"
#include "s_conf.h"
#include "s_newconf.h"
#include "s_serv.h"
#include "class.h"
#include "client.h"
#include "common.h"
-#include "event.h"
#include "hash.h"
#include "irc_string.h"
#include "sprintf_irc.h"
#include "hostmask.h"
#include "modules.h"
#include "numeric.h"
-#include "commio.h"
#include "s_log.h"
#include "send.h"
#include "s_gline.h"
-#include "memory.h"
-#include "balloc.h"
#include "patricia.h"
#include "reject.h"
#include "cache.h"
static BlockHeap *confitem_heap = NULL;
-dlink_list temp_klines[LAST_TEMP_TYPE];
-dlink_list temp_dlines[LAST_TEMP_TYPE];
-dlink_list service_list;
+rb_dlink_list temp_klines[LAST_TEMP_TYPE];
+rb_dlink_list temp_dlines[LAST_TEMP_TYPE];
+rb_dlink_list service_list;
/* internally defined functions */
static void set_default_conf(void);
if(aconf->spasswd)
memset(aconf->spasswd, 0, strlen(aconf->spasswd));
- MyFree(aconf->passwd);
- MyFree(aconf->spasswd);
- MyFree(aconf->name);
- MyFree(aconf->className);
- MyFree(aconf->user);
- MyFree(aconf->host);
+ rb_free(aconf->passwd);
+ rb_free(aconf->spasswd);
+ rb_free(aconf->name);
+ rb_free(aconf->className);
+ rb_free(aconf->user);
+ rb_free(aconf->host);
BlockHeapFree(confitem_heap, aconf);
}
{
int i;
- ClearAccess(source_p);
-
if((i = verify_access(source_p, username)))
{
ilog(L_FUSER, "Access denied: %s[%s]",
break;
case TOO_MANY_LOCAL:
+ /* Note that these notices are sent to opers on other
+ * servers also, so even if local opers are allowed to
+ * see the IP, we still cannot send it.
+ */
sendto_realops_snomask(SNO_FULL, L_NETWIDE,
"Too many local connections for %s!%s%s@%s",
source_p->name, IsGotId(source_p) ? "" : "~",
- source_p->username, source_p->sockhost);
+ source_p->username,
+ show_ip(NULL, source_p) && !IsIPSpoof(source_p) ? source_p->sockhost : source_p->host);
ilog(L_FUSER, "Too many local connections from %s!%s%s@%s",
source_p->name, IsGotId(source_p) ? "" : "~",
sendto_realops_snomask(SNO_FULL, L_NETWIDE,
"Too many global connections for %s!%s%s@%s",
source_p->name, IsGotId(source_p) ? "" : "~",
- source_p->username, source_p->sockhost);
+ source_p->username,
+ show_ip(NULL, source_p) && !IsIPSpoof(source_p) ? source_p->sockhost : source_p->host);
ilog(L_FUSER, "Too many global connections from %s!%s%s@%s",
source_p->name, IsGotId(source_p) ? "" : "~",
source_p->username, source_p->sockhost);
sendto_realops_snomask(SNO_FULL, L_NETWIDE,
"Too many user connections for %s!%s%s@%s",
source_p->name, IsGotId(source_p) ? "" : "~",
- source_p->username, source_p->sockhost);
+ source_p->username,
+ show_ip(NULL, source_p) && !IsIPSpoof(source_p) ? source_p->sockhost : source_p->host);
ilog(L_FUSER, "Too many user connections from %s!%s%s@%s",
source_p->name, IsGotId(source_p) ? "" : "~",
source_p->username, source_p->sockhost);
"I-line is full for %s!%s%s@%s (%s).",
source_p->name, IsGotId(source_p) ? "" : "~",
source_p->username, source_p->host,
- source_p->sockhost);
+ show_ip(NULL, source_p) && !IsIPSpoof(source_p) ? source_p->sockhost : "255.255.255.255");
ilog(L_FUSER, "Too many connections from %s!%s%s@%s.",
source_p->name, IsGotId(source_p) ? "" : "~",
source_p->name, IsGotId(source_p) ? "" : "~",
source_p->username, source_p->sockhost,
source_p->localClient->listener->name, port);
- add_reject(client_p);
+ add_reject(client_p, NULL, NULL);
exit_client(client_p, source_p, &me,
"You are not authorised to use this server");
break;
}
case BANNED_CLIENT:
- add_reject(client_p);
exit_client(client_p, client_p, &me, "*** Banned ");
ServerStats->is_ref++;
break;
{
if(aconf->flags & CONF_FLAGS_REDIR)
{
- sendto_one(client_p, form_str(RPL_REDIR),
- me.name, client_p->name,
+ sendto_one_numeric(client_p, RPL_REDIR, form_str(RPL_REDIR),
aconf->name ? aconf->name : "", aconf->port);
return (NOT_AUTHORISED);
}
-
- if(IsConfDoIdentd(aconf))
- SetNeedId(client_p);
-
/* Thanks for spoof idea amm */
if(IsConfDoSpoofIp(aconf))
{
if(ConfigFileEntry.kline_with_reason)
{
sendto_one(client_p,
- ":%s NOTICE %s :*** Banned %s",
+ form_str(ERR_YOUREBANNEDCREEP),
me.name, client_p->name, aconf->passwd);
}
+ add_reject(client_p, aconf->user, aconf->host);
return (BANNED_CLIENT);
}
else if(aconf->status & CONF_GLINE)
{
- sendto_one(client_p, ":%s NOTICE %s :*** G-lined", me.name, client_p->name);
+ sendto_one_notice(client_p, ":*** G-lined");
if(ConfigFileEntry.kline_with_reason)
sendto_one(client_p,
- ":%s NOTICE %s :*** Banned %s",
+ form_str(ERR_YOUREBANNEDCREEP),
me.name, client_p->name, aconf->passwd);
+ add_reject(client_p, aconf->user, aconf->host);
return (BANNED_CLIENT);
}
attach_iline(struct Client *client_p, struct ConfItem *aconf)
{
struct Client *target_p;
- dlink_node *ptr;
+ rb_dlink_node *ptr;
int local_count = 0;
int global_count = 0;
int ident_count = 0;
/* find_hostname() returns the head of the list to search */
- DLINK_FOREACH(ptr, find_hostname(client_p->host))
+ RB_DLINK_FOREACH(ptr, find_hostname(client_p->host))
{
target_p = ptr->data;
}
else
{
- sendto_one(client_p, ":%s NOTICE %s :*** I: line is full, but you have an >I: line!",
- me.name, client_p->name);
- SetExemptLimits(client_p);
+ sendto_one_notice(client_p, ":*** I: line is full, but you have an >I: line!");
}
}
/* ServerInfo.name is not rehashable */
/* ServerInfo.name = ServerInfo.name; */
ServerInfo.description = NULL;
- DupString(ServerInfo.network_name, NETWORK_NAME_DEFAULT);
- DupString(ServerInfo.network_desc, NETWORK_DESC_DEFAULT);
+ ServerInfo.network_name = rb_strdup(NETWORK_NAME_DEFAULT);
+ ServerInfo.network_desc = rb_strdup(NETWORK_DESC_DEFAULT);
memset(&ServerInfo.ip, 0, sizeof(ServerInfo.ip));
ServerInfo.specific_ipv4_vhost = 0;
memset(&ServerInfo.ip6, 0, sizeof(ServerInfo.ip6));
ServerInfo.specific_ipv6_vhost = 0;
#endif
- ServerInfo.use_ts6 = YES;
/* Don't reset hub, as that will break lazylinks */
/* ServerInfo.hub = NO; */
AdminInfo.email = NULL;
AdminInfo.description = NULL;
- DupString(ConfigFileEntry.default_operstring, "is an IRC operator");
- DupString(ConfigFileEntry.default_adminstring, "is a Server Administrator");
- DupString(ConfigFileEntry.servicestring, "is a Network Service");
+ ConfigFileEntry.default_operstring = rb_strdup("is an IRC operator");
+ ConfigFileEntry.default_adminstring = rb_strdup("is a Server Administrator");
+ ConfigFileEntry.servicestring = rb_strdup("is a Network Service");
ConfigFileEntry.default_umodes = UMODE_INVISIBLE;
ConfigFileEntry.failed_oper_notice = YES;
ConfigFileEntry.gline_min_cidr6 = 48;
ConfigFileEntry.hide_spoof_ips = YES;
ConfigFileEntry.hide_error_messages = 1;
- ConfigFileEntry.idletime = 0;
ConfigFileEntry.dots_in_ident = 0;
ConfigFileEntry.max_targets = MAX_TARGETS_DEFAULT;
- DupString(ConfigFileEntry.servlink_path, SLPATH);
+ ConfigFileEntry.servlink_path = rb_strdup(SLPATH);
ConfigFileEntry.egdpool_path = NULL;
ConfigFileEntry.use_whois_actually = YES;
ConfigFileEntry.burst_away = NO;
ConfigChannel.max_bans = 25;
ConfigChannel.max_bans_large = 500;
ConfigChannel.burst_topicwho = NO;
- ConfigChannel.invite_ops_only = YES;
ConfigChannel.kick_on_split_riding = NO;
ConfigChannel.default_split_user_count = 15000;
ConfigFileEntry.reject_after_count = 5;
ConfigFileEntry.reject_ban_time = 300;
ConfigFileEntry.reject_duration = 120;
-
+ ConfigFileEntry.max_unknown_ip = 2;
+
+ ServerInfo.max_clients = rb_get_maxconnections() - MAX_BUFFER;
}
#undef YES
ConfigFileEntry.ts_max_delta = TS_MAX_DELTA_DEFAULT;
if(ConfigFileEntry.servlink_path == NULL)
- DupString(ConfigFileEntry.servlink_path, SLPATH);
+ ConfigFileEntry.servlink_path = rb_strdup(SLPATH);
if(ServerInfo.network_name == NULL)
- DupString(ServerInfo.network_name, NETWORK_NAME_DEFAULT);
+ ServerInfo.network_name = rb_strdup(NETWORK_NAME_DEFAULT);
if(ServerInfo.network_desc == NULL)
- DupString(ServerInfo.network_desc, NETWORK_DESC_DEFAULT);
+ ServerInfo.network_desc = rb_strdup(NETWORK_DESC_DEFAULT);
if((ConfigFileEntry.client_flood < CLIENT_FLOOD_MIN) ||
(ConfigFileEntry.client_flood > CLIENT_FLOOD_MAX))
ConfigFileEntry.client_flood = CLIENT_FLOOD_MAX;
- GlobalSetOptions.idletime = (ConfigFileEntry.idletime * 60);
-
if(!split_users || !split_servers ||
(!ConfigChannel.no_create_on_split && !ConfigChannel.no_join_on_split))
{
void
add_temp_kline(struct ConfItem *aconf)
{
- if(aconf->hold >= CurrentTime + (10080 * 60))
+ if(aconf->hold >= rb_current_time() + (10080 * 60))
{
- dlinkAddAlloc(aconf, &temp_klines[TEMP_WEEK]);
+ rb_dlinkAddAlloc(aconf, &temp_klines[TEMP_WEEK]);
aconf->port = TEMP_WEEK;
}
- else if(aconf->hold >= CurrentTime + (1440 * 60))
+ else if(aconf->hold >= rb_current_time() + (1440 * 60))
{
- dlinkAddAlloc(aconf, &temp_klines[TEMP_DAY]);
+ rb_dlinkAddAlloc(aconf, &temp_klines[TEMP_DAY]);
aconf->port = TEMP_DAY;
}
- else if(aconf->hold >= CurrentTime + (60 * 60))
+ else if(aconf->hold >= rb_current_time() + (60 * 60))
{
- dlinkAddAlloc(aconf, &temp_klines[TEMP_HOUR]);
+ rb_dlinkAddAlloc(aconf, &temp_klines[TEMP_HOUR]);
aconf->port = TEMP_HOUR;
}
else
{
- dlinkAddAlloc(aconf, &temp_klines[TEMP_MIN]);
+ rb_dlinkAddAlloc(aconf, &temp_klines[TEMP_MIN]);
aconf->port = TEMP_MIN;
}
void
add_temp_dline(struct ConfItem *aconf)
{
- if(aconf->hold >= CurrentTime + (10080 * 60))
+ if(aconf->hold >= rb_current_time() + (10080 * 60))
{
- dlinkAddAlloc(aconf, &temp_dlines[TEMP_WEEK]);
+ rb_dlinkAddAlloc(aconf, &temp_dlines[TEMP_WEEK]);
aconf->port = TEMP_WEEK;
}
- else if(aconf->hold >= CurrentTime + (1440 * 60))
+ else if(aconf->hold >= rb_current_time() + (1440 * 60))
{
- dlinkAddAlloc(aconf, &temp_dlines[TEMP_DAY]);
+ rb_dlinkAddAlloc(aconf, &temp_dlines[TEMP_DAY]);
aconf->port = TEMP_DAY;
}
- else if(aconf->hold >= CurrentTime + (60 * 60))
+ else if(aconf->hold >= rb_current_time() + (60 * 60))
{
- dlinkAddAlloc(aconf, &temp_dlines[TEMP_HOUR]);
+ rb_dlinkAddAlloc(aconf, &temp_dlines[TEMP_HOUR]);
aconf->port = TEMP_HOUR;
}
else
{
- dlinkAddAlloc(aconf, &temp_dlines[TEMP_MIN]);
+ rb_dlinkAddAlloc(aconf, &temp_dlines[TEMP_MIN]);
aconf->port = TEMP_MIN;
}
static void
expire_temp_kd(void *list)
{
- dlink_node *ptr;
- dlink_node *next_ptr;
+ rb_dlink_node *ptr;
+ rb_dlink_node *next_ptr;
struct ConfItem *aconf;
- DLINK_FOREACH_SAFE(ptr, next_ptr, ((dlink_list *) list)->head)
+ RB_DLINK_FOREACH_SAFE(ptr, next_ptr, ((rb_dlink_list *) list)->head)
{
aconf = ptr->data;
- if(aconf->hold <= CurrentTime)
+ if(aconf->hold <= rb_current_time())
{
/* Alert opers that a TKline expired - Hwy */
if(ConfigFileEntry.tkline_expire_notices)
user : "*", (aconf->host) ? aconf->host : "*");
delete_one_address_conf(aconf->host, aconf);
- dlinkDestroy(ptr, list);
+ rb_dlinkDestroy(ptr, list);
}
}
}
reorganise_temp_kd(void *list)
{
struct ConfItem *aconf;
- dlink_node *ptr, *next_ptr;
+ rb_dlink_node *ptr, *next_ptr;
- DLINK_FOREACH_SAFE(ptr, next_ptr, ((dlink_list *) list)->head)
+ RB_DLINK_FOREACH_SAFE(ptr, next_ptr, ((rb_dlink_list *) list)->head)
{
aconf = ptr->data;
- if(aconf->hold < (CurrentTime + (60 * 60)))
+ if(aconf->hold < (rb_current_time() + (60 * 60)))
{
- dlinkMoveNode(ptr, list, (aconf->status == CONF_KILL) ?
+ rb_dlinkMoveNode(ptr, list, (aconf->status == CONF_KILL) ?
&temp_klines[TEMP_MIN] : &temp_dlines[TEMP_MIN]);
aconf->port = TEMP_MIN;
}
else if(aconf->port > TEMP_HOUR)
{
- if(aconf->hold < (CurrentTime + (1440 * 60)))
+ if(aconf->hold < (rb_current_time() + (1440 * 60)))
{
- dlinkMoveNode(ptr, list, (aconf->status == CONF_KILL) ?
+ rb_dlinkMoveNode(ptr, list, (aconf->status == CONF_KILL) ?
&temp_klines[TEMP_HOUR] : &temp_dlines[TEMP_HOUR]);
aconf->port = TEMP_HOUR;
}
else if(aconf->port > TEMP_DAY &&
- (aconf->hold < (CurrentTime + (10080 * 60))))
+ (aconf->hold < (rb_current_time() + (10080 * 60))))
{
- dlinkMoveNode(ptr, list, (aconf->status == CONF_KILL) ?
+ rb_dlinkMoveNode(ptr, list, (aconf->status == CONF_KILL) ?
&temp_klines[TEMP_DAY] : &temp_dlines[TEMP_DAY]);
aconf->port = TEMP_DAY;
}
if(MyOper(client_p))
{
- ircsnprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}",
+ rb_snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}",
client_p->name, client_p->username,
client_p->host, client_p->localClient->opername);
return buffer;
}
- ircsnprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}",
+ rb_snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}",
client_p->name, client_p->username,
client_p->host, client_p->servptr->name);
return buffer;
fclose(conf_fbfile_in);
}
+/*
+ * free an alias{} entry.
+ */
+static void
+free_alias_cb(struct DictionaryElement *ptr, void *unused)
+{
+ struct alias_entry *aptr = ptr->data;
+
+ rb_free(aptr->name);
+ rb_free(aptr->target);
+ rb_free(aptr);
+}
+
/*
* clear_out_old_conf
*
clear_out_old_conf(void)
{
struct Class *cltmp;
- dlink_node *ptr;
- dlink_node *next_ptr;
- int i;
+ rb_dlink_node *ptr;
+ rb_dlink_node *next_ptr;
/*
* don't delete the class table, rather mark all entries
* for deletion. The table is cleaned up by check_class. - avalon
*/
- DLINK_FOREACH(ptr, class_list.head)
+ RB_DLINK_FOREACH(ptr, class_list.head)
{
cltmp = ptr->data;
MaxUsers(cltmp) = -1;
#endif
/* clean out ServerInfo */
- MyFree(ServerInfo.description);
+ rb_free(ServerInfo.description);
ServerInfo.description = NULL;
- MyFree(ServerInfo.network_name);
+ rb_free(ServerInfo.network_name);
ServerInfo.network_name = NULL;
- MyFree(ServerInfo.network_desc);
+ rb_free(ServerInfo.network_desc);
ServerInfo.network_desc = NULL;
/* clean out AdminInfo */
- MyFree(AdminInfo.name);
+ rb_free(AdminInfo.name);
AdminInfo.name = NULL;
- MyFree(AdminInfo.email);
+ rb_free(AdminInfo.email);
AdminInfo.email = NULL;
- MyFree(AdminInfo.description);
+ rb_free(AdminInfo.description);
AdminInfo.description = NULL;
/* operator{} and class{} blocks are freed above */
*/
/* clean out general */
- MyFree(ConfigFileEntry.servlink_path);
+ rb_free(ConfigFileEntry.servlink_path);
ConfigFileEntry.servlink_path = NULL;
- DLINK_FOREACH_SAFE(ptr, next_ptr, service_list.head)
+ RB_DLINK_FOREACH_SAFE(ptr, next_ptr, service_list.head)
{
- MyFree(ptr->data);
- dlinkDestroy(ptr, &service_list);
+ rb_free(ptr->data);
+ rb_dlinkDestroy(ptr, &service_list);
}
/* remove any aliases... -- nenolod */
- for (i = 0; i < MAX_MSG_HASH; i++)
- {
- DLINK_FOREACH_SAFE(ptr, next_ptr, alias_hash_table[i].head)
- {
- struct alias_entry *aptr = ptr->data;
-
- MyFree(aptr->name);
- MyFree(aptr->target);
- MyFree(aptr);
-
- dlinkDestroy(ptr, &alias_hash_table[i]);
- }
- }
+ irc_dictionary_destroy(alias_dict, free_alias_cb, NULL);
+ alias_dict = NULL;
destroy_blacklists();
reason, oper_reason);
}
- sendto_one(source_p,
- ":%s NOTICE %s :Added D-Line [%s] to %s", me.name,
- source_p->name, host, filename);
+ sendto_one_notice(source_p, ":Added D-Line [%s] to %s", host, filename);
}
else if(type == RESV_TYPE)
if(type == KLINE_TYPE)
{
- ircsnprintf(buffer, sizeof(buffer),
+ rb_snprintf(buffer, sizeof(buffer),
"\"%s\",\"%s\",\"%s\",\"%s\",\"%s\",\"%s\",%ld\n",
user, host, reason, oper_reason, current_date,
- get_oper_name(source_p), CurrentTime);
+ get_oper_name(source_p), rb_current_time());
}
else if(type == DLINE_TYPE)
{
- ircsnprintf(buffer, sizeof(buffer),
+ rb_snprintf(buffer, sizeof(buffer),
"\"%s\",\"%s\",\"%s\",\"%s\",\"%s\",%ld\n", host,
- reason, oper_reason, current_date, get_oper_name(source_p), CurrentTime);
+ reason, oper_reason, current_date, get_oper_name(source_p), rb_current_time());
}
else if(type == RESV_TYPE)
{
- ircsnprintf(buffer, sizeof(buffer), "\"%s\",\"%s\",\"%s\",%ld\n",
- host, reason, get_oper_name(source_p), CurrentTime);
+ rb_snprintf(buffer, sizeof(buffer), "\"%s\",\"%s\",\"%s\",%ld\n",
+ host, reason, get_oper_name(source_p), rb_current_time());
}
if(fputs(buffer, out) == -1)
{
if(aconf->className == NULL)
{
- DupString(aconf->className, "default");
+ aconf->className = rb_strdup("default");
ClassPtr(aconf) = default_class;
return;
}
aconf->className, aconf->user, aconf->host);
}
- MyFree(aconf->className);
- DupString(aconf->className, "default");
+ rb_free(aconf->className);
+ aconf->className = rb_strdup("default");
return;
}
if(ConfMaxUsers(aconf) < 0)
{
ClassPtr(aconf) = default_class;
- MyFree(aconf->className);
- DupString(aconf->className, "default");
+ rb_free(aconf->className);
+ aconf->className = rb_strdup("default");
return;
}
}
projects / irc / rqf / shadowircd.git / blobdiff