Fix weirdness with client_flood_burst_rate and client_flood_burst_max.

They are now in messages, even if client_flood_message_time is not 1.

If client_flood_message_time is not 1 (by default it is), this needs a
configuration change to maintain the same behaviour.
This commit is contained in:
Jilles Tjoelker 2011-10-04 00:57:49 +02:00
parent d182b85454
commit a75bf40dad
2 changed files with 3 additions and 2 deletions

View file

@ -131,13 +131,13 @@ static struct InfoStruct info_table[] = {
"client_flood_burst_rate", "client_flood_burst_rate",
OUTPUT_DECIMAL, OUTPUT_DECIMAL,
&ConfigFileEntry.client_flood_burst_rate, &ConfigFileEntry.client_flood_burst_rate,
"Maximum lines per second during flood grace period, times client_flood_message_time", "Maximum lines per second during flood grace period",
}, },
{ {
"client_flood_burst_max", "client_flood_burst_max",
OUTPUT_DECIMAL, OUTPUT_DECIMAL,
&ConfigFileEntry.client_flood_burst_max, &ConfigFileEntry.client_flood_burst_max,
"Number of lines to process at once before delaying, times client_flood_message_time", "Number of lines to process at once before delaying",
}, },
{ {
"client_flood_message_num", "client_flood_message_num",

View file

@ -101,6 +101,7 @@ parse_client_queued(struct Client *client_p)
allow_read = ConfigFileEntry.client_flood_burst_max; allow_read = ConfigFileEntry.client_flood_burst_max;
else else
allow_read = ConfigFileEntry.client_flood_burst_rate; allow_read = ConfigFileEntry.client_flood_burst_rate;
allow_read *= ConfigFileEntry.client_flood_message_time;
/* allow opers 4 times the amount of messages as users. why 4? /* allow opers 4 times the amount of messages as users. why 4?
* why not. :) --fl_ * why not. :) --fl_
*/ */