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.

diff --git a/modules/m_info.c b/modules/m_info.c
index 0224fa29c543ddb5bfb5390c768fbb9d7da66696..5ee13253caabd929ae1d6078af17ff919f6725b8 100644 (file)
--- a/modules/m_info.c
+++ b/modules/m_info.c
@@ -131,13 +131,13 @@ static struct InfoStruct info_table[] = {
                "client_flood_burst_rate",
                OUTPUT_DECIMAL,
                &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",
                OUTPUT_DECIMAL,
                &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",

diff --git a/src/packet.c b/src/packet.c
index d6988aebfe516284e9680f90d7bbaf47c171d25e..0fe061a7d6cd5020da9101569bb925c3fd5f4e25 100644 (file)
--- a/src/packet.c
+++ b/src/packet.c
@@ -101,6 +101,7 @@ parse_client_queued(struct Client *client_p)
                        allow_read = ConfigFileEntry.client_flood_burst_max;
                else
                        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?
                 * why not. :) --fl_
                 */