#include "ircd.h"
#include "parse.h"
#include "packet.h"
-#include "irc_string.h"
+#include "match.h"
#include "hook.h"
#include "send.h"
static char readBuf[READBUF_SIZE];
static void client_dopacket(struct Client *client_p, char *buffer, size_t length);
-
/*
* parse_client_queued - parse client queued messages
*/
parse_client_queued(struct Client *client_p)
{
int dolen = 0;
- int checkflood = 1;
+ int allow_read;
if(IsAnyDead(client_p))
return;
if(IsUnknown(client_p))
{
+ allow_read = ConfigFileEntry.client_flood_burst_max;
for (;;)
{
- if(client_p->localClient->sent_parsed >= client_p->localClient->allow_read)
+ if(client_p->localClient->sent_parsed >= allow_read)
break;
dolen = rb_linebuf_get(&client_p->localClient->
}
}
+ /* If sent_parsed is impossibly high, drop it down.
+ * This is useful if the configuration is changed.
+ */
+ if(client_p->localClient->sent_parsed > allow_read)
+ client_p->localClient->sent_parsed = allow_read;
}
if(IsAnyServer(client_p) || IsExemptFlood(client_p))
}
else if(IsClient(client_p))
{
-
+ if(IsFloodDone(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_
+ */
if(IsOper(client_p) && ConfigFileEntry.no_oper_flood)
- checkflood = 0;
+ allow_read *= 4;
/*
* Handle flood protection here - if we exceed our flood limit on
* messages in this loop, we simply drop out of the loop prematurely.
* as sent_parsed will always hover around the allow_read limit
* and no 'bursts' will be permitted.
*/
- if(checkflood)
- {
- if(client_p->localClient->sent_parsed >= client_p->localClient->allow_read)
- break;
- }
-
- /* allow opers 4 times the amount of messages as users. why 4?
- * why not. :) --fl_
- */
- else if(client_p->localClient->sent_parsed >= (4 * client_p->localClient->allow_read))
+ if(client_p->localClient->sent_parsed >= allow_read)
break;
dolen = rb_linebuf_get(&client_p->localClient->
client_dopacket(client_p, readBuf, dolen);
if(IsAnyDead(client_p))
return;
- client_p->localClient->sent_parsed++;
+
+ client_p->localClient->sent_parsed += ConfigFileEntry.client_flood_message_time;
}
+ /* If sent_parsed is impossibly high, drop it down.
+ * This is useful if the configuration is changed.
+ */
+ if(client_p->localClient->sent_parsed > allow_read +
+ ConfigFileEntry.client_flood_message_time - 1)
+ client_p->localClient->sent_parsed = allow_read +
+ ConfigFileEntry.client_flood_message_time - 1;
}
}
{
SetFloodDone(client_p);
- /* Drop their flood limit back down */
- client_p->localClient->allow_read = MAX_FLOOD;
-
- /* sent_parsed could be way over MAX_FLOOD but under MAX_FLOOD_BURST,
- * so reset it.
+ /* sent_parsed could be way over client_flood_burst_max but under
+ * client_flood_burst_rate so reset it.
*/
client_p->localClient->sent_parsed = 0;
}
{
client_p = ptr->data;
- if(unlikely(IsMe(client_p)))
+ if(rb_unlikely(IsMe(client_p)))
continue;
- if(unlikely(client_p->localClient == NULL))
+ if(rb_unlikely(client_p->localClient == NULL))
continue;
if(IsFloodDone(client_p))
- client_p->localClient->sent_parsed -= 2;
+ client_p->localClient->sent_parsed -= ConfigFileEntry.client_flood_message_num;
else
client_p->localClient->sent_parsed = 0;
if(client_p->localClient->sent_parsed < 0)
client_p->localClient->sent_parsed = 0;
- if(--client_p->localClient->actually_read < 0)
- client_p->localClient->actually_read = 0;
-
parse_client_queued(client_p);
- if(unlikely(IsAnyDead(client_p)))
+ if(rb_unlikely(IsAnyDead(client_p)))
continue;
}
if(client_p->localClient->sent_parsed < 0)
client_p->localClient->sent_parsed = 0;
- if(--client_p->localClient->actually_read < 0)
- client_p->localClient->actually_read = 0;
-
parse_client_queued(client_p);
}
}
read_packet(rb_fde_t * F, void *data)
{
struct Client *client_p = data;
- struct LocalUser *lclient_p = client_p->localClient;
int length = 0;
int lbuf_len;
*/
length = rb_read(client_p->localClient->F, readBuf, READBUF_SIZE);
- if(length <= 0)
+ if(length < 0)
{
- if(length < 0 && rb_ignore_errno(errno))
- {
+ if(rb_ignore_errno(errno))
rb_setselect(client_p->localClient->F,
RB_SELECT_READ, read_packet, client_p);
- } else
+ else
error_exit_client(client_p, length);
return;
}
- if(length == 0)
+ else if(length == 0)
{
error_exit_client(client_p, length);
return;
lbuf_len = rb_linebuf_parse(&client_p->localClient->buf_recvq, readBuf, length, binary);
- lclient_p->actually_read += lbuf_len;
-
if(IsAnyDead(client_p))
return;
/* Check to make sure we're not flooding */
if(!IsAnyServer(client_p) &&
- (rb_linebuf_alloclen(&client_p->localClient->buf_recvq) > ConfigFileEntry.client_flood))
+ (rb_linebuf_alloclen(&client_p->localClient->buf_recvq) > ConfigFileEntry.client_flood_max_lines))
{
if(!(ConfigFileEntry.no_oper_flood && IsOper(client_p)))
{