Skip to content

Prevent rate limiting when client maxflood is > default client flood sendq #69

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
empus wants to merge 2 commits into
base: u2_10_12_branch
Choose a base branch
from
Open

Prevent rate limiting when client maxflood is > default client flood sendq #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dd635f6
Avoid throttling for flood exempt clients
empus Nov 9, 2024
adf8691
Move FLAG_EXEMPTFLOOD to before FLAG_LAST_FLAG
empus Oct 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions include/client.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,7 @@ enum Flag
FLAG_DEBUG, /**< send global debug/anti-hack info */
FLAG_ACCOUNT, /**< account name has been set */
FLAG_HIDDENHOST, /**< user's host is hidden */
FLAG_EXEMPTFLOOD, /**< Client is exempt from flood limits */
FLAG_LAST_FLAG, /**< number of flags */
FLAG_LOCAL_UMODES = FLAG_LOCOP, /**< First local mode flag */
FLAG_GLOBAL_UMODES = FLAG_OPER /**< First global mode flag */
Expand Down Expand Up @@ -599,6 +600,8 @@ struct Client {
#define IsHiddenHost(x) HasFlag(x, FLAG_HIDDENHOST)
/** Return non-zero if the client has an active PING request. */
#define IsPingSent(x) HasFlag(x, FLAG_PINGSENT)
/** Return non-zero if the client is exempt from flood limits. */
#define IsExemptFlood(x) HasFlag(x, FLAG_EXEMPTFLOOD)

/** Return non-zero if the client has operator or server privileges. */
#define IsPrivileged(x) (IsAnOper(x) || IsServer(x))
Expand Down Expand Up @@ -645,6 +648,8 @@ struct Client {
#define SetHiddenHost(x) SetFlag(x, FLAG_HIDDENHOST)
/** Mark a client as having a pending PING. */
#define SetPingSent(x) SetFlag(x, FLAG_PINGSENT)
/** Mark a client as being exempt from flood limits. */
#define SetExemptFlood(x) SetFlag(x, FLAG_EXEMPTFLOOD)

/** Return non-zero if \a sptr sees \a acptr as an operator. */
#define SeeOper(sptr,acptr) (IsAnOper(acptr) && (HasPriv(acptr, PRIV_DISPLAY) \
Expand Down
17 changes: 13 additions & 4 deletions ircd/s_bsd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -631,8 +631,15 @@ static int read_packet(struct Client *cptr, int socket_ready)
if (DBufLength(&(cli_recvQ(cptr))) > GetMaxFlood(cptr))
return exit_client(cptr, cptr, &me, "Excess Flood");

/* If client has a higher sendq limit than default,
* mark them flood exempt to avoid throttling
*/
if (GetMaxFlood(cptr) > feature_int(FEAT_CLIENT_FLOOD)) {
SetExemptFlood(cptr);
}

while (DBufLength(&(cli_recvQ(cptr))) && !NoNewLine(cptr) &&
(IsTrusted(cptr) || cli_since(cptr) - CurrentTime < 10))
(IsTrusted(cptr) || IsExemptFlood(cptr) || cli_since(cptr) - CurrentTime < 10))
{
dolen = dbuf_getmsg(&(cli_recvQ(cptr)), cli_buffer(cptr), BUFSIZE);
/*
Expand Down Expand Up @@ -677,14 +684,16 @@ static int read_packet(struct Client *cptr, int socket_ready)
}
}

/* If there's still data to process, wait 2 seconds first */
/* If there's still data to process, wait 2 seconds first,
* unless the user is exempt from throttling
*/
if (DBufLength(&(cli_recvQ(cptr))) && !NoNewLine(cptr) &&
!t_onqueue(&(cli_proc(cptr))))
!IsExemptFlood(cptr) && !t_onqueue(&(cli_proc(cptr))))
{
Debug((DEBUG_LIST, "Adding client process timer for %C", cptr));
cli_freeflag(cptr) |= FREEFLAG_TIMER;
timer_add(&(cli_proc(cptr)), client_timer_callback, cli_connect(cptr),
TT_RELATIVE, 2);
TT_RELATIVE, 2);
}
}
return 1;
Expand Down