#include "sslproc.h"
#include "bandbi.h"
#include "operhash.h"
+#include "chmode.h"
+#include "hook.h"
+#include "s_assert.h"
struct config_server_hide ConfigServerHide;
int local_count = 0;
int global_count = 0;
int ident_count = 0;
- int unidented = 0;
+ int unidented;
if(IsConfExemptLimits(aconf))
return (attach_conf(client_p, aconf));
- if(*client_p->username == '~')
- unidented = 1;
-
+ unidented = !IsGotId(client_p) && !IsNoTilde(aconf) &&
+ (!IsConfDoSpoofIp(aconf) || !strchr(aconf->info.name, '@'));
/* find_hostname() returns the head of the list to search */
RB_DLINK_FOREACH(ptr, find_hostname(client_p->host))
ConfigFileEntry.use_whois_actually = YES;
ConfigFileEntry.burst_away = NO;
ConfigFileEntry.collision_fnc = YES;
+ ConfigFileEntry.resv_fnc = YES;
ConfigFileEntry.global_snotices = YES;
ConfigFileEntry.operspy_dont_care_user_info = NO;
ConfigFileEntry.use_propagated_bans = YES;
+ ConfigFileEntry.max_ratelimit_tokens = 30;
+ ConfigFileEntry.away_interval = 30;
#ifdef HAVE_LIBZ
ConfigFileEntry.compression_level = 4;
ConfigChannel.use_except = YES;
ConfigChannel.use_invex = YES;
- ConfigChannel.use_knock = YES;
ConfigChannel.use_forward = YES;
+ ConfigChannel.use_knock = YES;
ConfigChannel.knock_delay = 300;
ConfigChannel.knock_delay_channel = 60;
ConfigChannel.max_chans_per_user = 15;
ConfigChannel.no_join_on_split = NO;
ConfigChannel.no_create_on_split = YES;
ConfigChannel.resv_forcepart = YES;
+ ConfigChannel.channel_target_change = YES;
+ ConfigChannel.disable_local_channels = NO;
ConfigServerHide.flatten_links = 0;
ConfigServerHide.links_delay = 300;
ConfigFileEntry.min_nonwildcard = 4;
ConfigFileEntry.min_nonwildcard_simple = 3;
ConfigFileEntry.default_floodcount = 8;
- ConfigFileEntry.client_flood = CLIENT_FLOOD_DEFAULT;
+ ConfigFileEntry.default_ident_timeout = 5;
ConfigFileEntry.tkline_expire_notices = 0;
ConfigFileEntry.reject_after_count = 5;
ConfigFileEntry.throttle_count = 4;
ConfigFileEntry.throttle_duration = 60;
+ ConfigFileEntry.client_flood_max_lines = CLIENT_FLOOD_DEFAULT;
+ ConfigFileEntry.client_flood_burst_rate = 5;
+ ConfigFileEntry.client_flood_burst_max = 5;
+ ConfigFileEntry.client_flood_message_time = 1;
+ ConfigFileEntry.client_flood_message_num = 2;
+
ServerInfo.default_max_clients = MAXCONNECTIONS;
+ ConfigFileEntry.nicklen = NICKLEN;
+
if (!alias_dict)
alias_dict = irc_dictionary_create(strcasecmp);
}
/* Some global values are also loaded here. */
check_class(); /* Make sure classes are valid */
privilegeset_delete_all_illegal();
+ construct_cflags_strings();
}
static void
}
- if((ConfigFileEntry.client_flood < CLIENT_FLOOD_MIN) ||
- (ConfigFileEntry.client_flood > CLIENT_FLOOD_MAX))
- ConfigFileEntry.client_flood = CLIENT_FLOOD_MAX;
+ /* RFC 1459 says 1 message per 2 seconds on average and bursts of
+ * 5 messages are acceptable, so allow at least that.
+ */
+ if(ConfigFileEntry.client_flood_burst_rate < 5)
+ ConfigFileEntry.client_flood_burst_rate = 5;
+ if(ConfigFileEntry.client_flood_burst_max < 5)
+ ConfigFileEntry.client_flood_burst_max = 5;
+ if(ConfigFileEntry.client_flood_message_time >
+ ConfigFileEntry.client_flood_message_num * 2)
+ ConfigFileEntry.client_flood_message_time =
+ ConfigFileEntry.client_flood_message_num * 2;
+
+ if((ConfigFileEntry.client_flood_max_lines < CLIENT_FLOOD_MIN) ||
+ (ConfigFileEntry.client_flood_max_lines > CLIENT_FLOOD_MAX))
+ ConfigFileEntry.client_flood_max_lines = CLIENT_FLOOD_MAX;
if(!split_users || !split_servers ||
(!ConfigChannel.no_create_on_split && !ConfigChannel.no_join_on_split))
}
}
+/* Given a new ban ConfItem, look for any matching ban, update the lifetime
+ * from it and delete it.
+ */
+void
+replace_old_ban(struct ConfItem *aconf)
+{
+ rb_dlink_node *ptr;
+ struct ConfItem *oldconf;
+
+ ptr = find_prop_ban(aconf->status, aconf->user, aconf->host);
+ if(ptr != NULL)
+ {
+ oldconf = ptr->data;
+ /* Remember at least as long as the old one. */
+ if(oldconf->lifetime > aconf->lifetime)
+ aconf->lifetime = oldconf->lifetime;
+ /* Force creation time to increase. */
+ if(oldconf->created >= aconf->created)
+ aconf->created = oldconf->created + 1;
+ /* Leave at least one second of validity. */
+ if(aconf->hold <= aconf->created)
+ aconf->hold = aconf->created + 1;
+ if(aconf->lifetime < aconf->hold)
+ aconf->lifetime = aconf->hold;
+ /* Tell deactivate_conf() to destroy it. */
+ oldconf->lifetime = rb_current_time();
+ deactivate_conf(oldconf, ptr);
+ }
+}
+
static void
expire_prop_bans(void *list)
{
rb_snprintf(reasonbuf, sizeof reasonbuf,
"Temporary %c-line %d min. - ",
aconf->status == CONF_DLINE ? 'D' : 'K',
- (aconf->hold - aconf->created) / 60);
+ (int)((aconf->hold - aconf->created) / 60));
else
reasonbuf[0] = '\0';
if (aconf->passwd)
dont know anything else
- Gozem 2002-07-21
+
+
*/
rb_strlcpy(conffilebuf, filename, sizeof(conffilebuf));
{
if(cold)
{
+ inotice("Failed in reading configuration file %s, aborting", filename);
ilog(L_MAIN, "Failed in reading configuration file %s", filename);
+
+ int e;
+ e = errno;
+
+ inotice("FATAL: %s %s", strerror(e), filename);
+ ilog(L_MAIN, "FATAL: %s %s", strerror(e), filename);
+
exit(-1);
}
else
clear_out_old_conf();
}
+ call_hook(h_conf_read_start, NULL);
read_conf(conf_fbfile_in);
+ call_hook(h_conf_read_end, NULL);
+
fclose(conf_fbfile_in);
}
int
conf_fgets(char *lbuf, int max_size, FILE * fb)
{
- char *buff;
-
- if((buff = fgets(lbuf, max_size, fb)) == NULL)
+ if(fgets(lbuf, max_size, fb) == NULL)
return (0);
return (strlen(lbuf));
projects / solanum.git / blobdiff