philippelh/bitchx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Test sent_kick instead of kickcount for JOINFLOOD kicking

Browse Source 
kickcount is for counting KICKs sent by the user to detect KICK floods.
This commit is contained in:
Kevin Easton
2017-06-11 00:23:39 +10:00
parent 6b1fcf9c75
commit 3caf308ea0
1 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/misc.c
View File

@@ -720,11 +720,8 @@ int t = 0;
chan->maxnicks = chan->totalnicks; chan->maxnicks = chan->totalnicks;
chan->maxnickstime = this_time; chan->maxnickstime = this_time;
} }
if (!splitter) if (!splitter && chan->have_op && is_other_flood(chan, nick, JOIN_FLOOD, &t) &&
{ get_cset_int_var(chan->csets, KICK_ON_JOINFLOOD_CSET) && !nick->sent_kick++)
if (chan->have_op && is_other_flood(chan, nick, JOIN_FLOOD, &t))
{
if (get_cset_int_var(chan->csets, JOINFLOOD_CSET) && get_cset_int_var(chan->csets, KICK_ON_JOINFLOOD_CSET) && !nick->kickcount++)
{ {
char *t1, *host, *banstr; char *t1, *host, *banstr;
t1 = LOCAL_COPY(nick->host); t1 = LOCAL_COPY(nick->host);
@@ -732,12 +729,10 @@ int t = 0;
*host++ = 0; *host++ = 0;
banstr = ban_it(nick->nick, t1, host, nick->ip); banstr = ban_it(nick->nick, t1, host, nick->ip);
send_to_server("MODE %s -o+b %s %s", chan->channel, nick->nick, banstr); send_to_server("MODE %s -o+b %s %s", chan->channel, nick->nick, banstr);
send_to_server("KICK %s %s :\002Join flood\002 (%d joins in %dsecs of %dsecs)", chan->channel, nick->nick, get_cset_int_var(chan->csets, KICK_ON_JOINFLOOD_CSET)/*chan->set_kick_on_joinflood*/, t, get_cset_int_var(chan->csets, JOINFLOOD_TIME_CSET)); send_to_server("KICK %s %s :\002Join flood\002 (%d joins in %dsecs of %dsecs)", chan->channel, nick->nick, get_cset_int_var(chan->csets, KICK_ON_JOINFLOOD_CSET), t, get_cset_int_var(chan->csets, JOINFLOOD_TIME_CSET));
if (get_int_var(AUTO_UNBAN_VAR)) if (get_int_var(AUTO_UNBAN_VAR))
add_timer(0, empty_string, get_int_var(AUTO_UNBAN_VAR) * 1000, 1, timer_unban, m_sprintf("%d %s %s", from_server, chan->channel, banstr), NULL, current_window->refnum, "join-flood"); add_timer(0, empty_string, get_int_var(AUTO_UNBAN_VAR) * 1000, 1, timer_unban, m_sprintf("%d %s %s", from_server, chan->channel, banstr), NULL, current_window->refnum, "join-flood");
} }
}
}
break; break;
} }
case CHANNELSIGNOFFLIST: case CHANNELSIGNOFFLIST: