9pfs/solanum-vs-hackint-and-charybdis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add a configuration option for ident_timeout.

Browse source
This commit is contained in:
JD Horelick 2010-04-05 15:28:44 -04:00
parent 19716b9fd6
commit 0ffb810660
7 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
doc/example.conf
View file

@ -475,6 +475,7 @@ general {
short_motd = no; short_motd = no;
ping_cookie = no; ping_cookie = no;
connect_timeout = 30 seconds; connect_timeout = 30 seconds;
ident_timeout = 5;
disable_auth = no; disable_auth = no;
no_oper_flood = yes; no_oper_flood = yes;
max_targets = 4; max_targets = 4;

5
doc/reference.conf
View file

@ -1116,6 +1116,11 @@ general {
*/ */
connect_timeout = 30 seconds; connect_timeout = 30 seconds;
/* ident timeout: Amount of time (in seconds) that the IRCd will
* wait for a user to respond to an ident request.
*/
ident_timeout = 5;
/* disable auth: disables identd checking */ /* disable auth: disables identd checking */
disable_auth = no; disable_auth = no;

1
include/s_conf.h
View file

@ -206,6 +206,7 @@ struct config_file_entry
int min_nonwildcard_simple; int min_nonwildcard_simple;
int default_floodcount; int default_floodcount;
int client_flood; int client_flood;
int ident_timeout;
int use_egd; int use_egd;
int ping_cookie; int ping_cookie;
int tkline_expire_notices; int tkline_expire_notices;

6
modules/m_info.c
View file

@ -133,6 +133,12 @@ static struct InfoStruct info_table[] = {
&ConfigFileEntry.connect_timeout, &ConfigFileEntry.connect_timeout,
"Connect timeout for connections to servers" "Connect timeout for connections to servers"
}, },
{
"ident_timeout",
OUTPUT_DECIMAL,
&ConfigFileEntry.ident_timeout,
"Amount of time the server waits for ident responses from clients",
},
{ {
"default_floodcount", "default_floodcount",
OUTPUT_DECIMAL, OUTPUT_DECIMAL,

3
src/ircd.c
View file

@ -324,6 +324,9 @@ initialize_global_set_options(void)
splitchecking = 1; splitchecking = 1;
} }
if(ConfigFileEntry.ident_timeout)
GlobalSetOptions.ident_timeout = ConfigFileEntry.ident_timeout;
else
GlobalSetOptions.ident_timeout = IDENT_TIMEOUT; GlobalSetOptions.ident_timeout = IDENT_TIMEOUT;
rb_strlcpy(GlobalSetOptions.operstring, rb_strlcpy(GlobalSetOptions.operstring,

1
src/newconf.c
View file

@ -2136,6 +2136,7 @@ static struct ConfEntry conf_general_table[] =
{ "collision_fnc", CF_YESNO, NULL, 0, &ConfigFileEntry.collision_fnc }, { "collision_fnc", CF_YESNO, NULL, 0, &ConfigFileEntry.collision_fnc },
{ "connect_timeout", CF_TIME, NULL, 0, &ConfigFileEntry.connect_timeout }, { "connect_timeout", CF_TIME, NULL, 0, &ConfigFileEntry.connect_timeout },
{ "default_floodcount", CF_INT, NULL, 0, &ConfigFileEntry.default_floodcount }, { "default_floodcount", CF_INT, NULL, 0, &ConfigFileEntry.default_floodcount },
{ "ident_timeout", CF_INT, NULL, 0, &ConfigFileEntry.ident_timeout },
{ "disable_auth", CF_YESNO, NULL, 0, &ConfigFileEntry.disable_auth }, { "disable_auth", CF_YESNO, NULL, 0, &ConfigFileEntry.disable_auth },
{ "dots_in_ident", CF_INT, NULL, 0, &ConfigFileEntry.dots_in_ident }, { "dots_in_ident", CF_INT, NULL, 0, &ConfigFileEntry.dots_in_ident },
{ "failed_oper_notice", CF_YESNO, NULL, 0, &ConfigFileEntry.failed_oper_notice }, { "failed_oper_notice", CF_YESNO, NULL, 0, &ConfigFileEntry.failed_oper_notice },

1
src/s_conf.c
View file

@ -782,6 +782,7 @@ set_default_conf(void)
ConfigFileEntry.min_nonwildcard = 4; ConfigFileEntry.min_nonwildcard = 4;
ConfigFileEntry.min_nonwildcard_simple = 3; ConfigFileEntry.min_nonwildcard_simple = 3;
ConfigFileEntry.default_floodcount = 8; ConfigFileEntry.default_floodcount = 8;
ConfigFileEntry.ident_timeout = 5;
ConfigFileEntry.client_flood = CLIENT_FLOOD_DEFAULT; ConfigFileEntry.client_flood = CLIENT_FLOOD_DEFAULT;
ConfigFileEntry.tkline_expire_notices = 0; ConfigFileEntry.tkline_expire_notices = 0;