vulpineawoo/solanum
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

src/channel.c: don't use the bancache in is_banned()/is_quieted()

Browse source 
The bancache will be re-architected onto clients in future for easier
invalidation, but this is a good-enough temporary fix for issue #243

Fixes #243
This commit is contained in:
Aaron Jones 2017-07-05 17:35:28 +00:00 committed by Simon Arlott
parent be9fb5ac00
commit ed9f6a6565
No known key found for this signature in database
GPG key ID: C8975F2043CA5D24
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ircd/channel.c
View file

@ -667,6 +667,7 @@ int
is_banned(struct Channel *chptr, struct Client *who, struct membership *msptr, is_banned(struct Channel *chptr, struct Client *who, struct membership *msptr,
const char *s, const char *s2, const char **forward) const char *s, const char *s2, const char **forward)
{ {
#if 0
if (chptr->last_checked_client != NULL && if (chptr->last_checked_client != NULL &&
who == chptr->last_checked_client && who == chptr->last_checked_client &&
chptr->last_checked_type == CHFL_BAN && chptr->last_checked_type == CHFL_BAN &&
@ -679,6 +680,9 @@ is_banned(struct Channel *chptr, struct Client *who, struct membership *msptr,
chptr->last_checked_ts = rb_current_time(); chptr->last_checked_ts = rb_current_time();
return chptr->last_checked_result; return chptr->last_checked_result;
#else
return is_banned_list(chptr, &chptr->banlist, who, msptr, s, s2, forward);
#endif
} }
/* is_quieted() /* is_quieted()
@ -692,6 +696,7 @@ int
is_quieted(struct Channel *chptr, struct Client *who, struct membership *msptr, is_quieted(struct Channel *chptr, struct Client *who, struct membership *msptr,
const char *s, const char *s2) const char *s, const char *s2)
{ {
#if 0
if (chptr->last_checked_client != NULL && if (chptr->last_checked_client != NULL &&
who == chptr->last_checked_client && who == chptr->last_checked_client &&
chptr->last_checked_type == CHFL_QUIET && chptr->last_checked_type == CHFL_QUIET &&
@ -704,6 +709,9 @@ is_quieted(struct Channel *chptr, struct Client *who, struct membership *msptr,
chptr->last_checked_ts = rb_current_time(); chptr->last_checked_ts = rb_current_time();
return chptr->last_checked_result; return chptr->last_checked_result;
#else
return is_banned_list(chptr, &chptr->quietlist, who, msptr, s, s2, NULL);
#endif
} }
/* can_join() /* can_join()