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

Simplify LAMEIDENT code and remove unused variable.

Browse Source 
Replace open-coded loop with strpbrk(), make the constant lame_chars string
static const and remove the unused variable 'user'.

I think LAMEIDENT might be obsolete now anyway - I can't find a server that
allows control chars in usernames these days.
This commit is contained in:
Kevin Easton
2015-05-08 23:25:41 +10:00
parent a497d3ab09
commit 32659b9998
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
source/parse.c
View File

@@ -1160,8 +1160,6 @@ static void p_channel(char *from, char **ArgList)
if (!its_me && chan && chan->have_op) if (!its_me && chan && chan->have_op)
{ {
char lame_chars[] = "\x01\x02\x03\x04\x05\x06\x07\x08\x0b\x0c\x0d\x0e\x0f\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a";
register char *p;
if (get_cset_int_var(chan->csets, LAMELIST_CSET)) if (get_cset_int_var(chan->csets, LAMELIST_CSET))
{ {
if (lame_list && find_in_list((List **)&lame_list, from, 0)) if (lame_list && find_in_list((List **)&lame_list, from, 0))
@@ -1174,16 +1172,13 @@ static void p_channel(char *from, char **ArgList)
} }
if (get_cset_int_var(chan->csets, LAMEIDENT_CSET)) if (get_cset_int_var(chan->csets, LAMEIDENT_CSET))
{ {
for (p = FromUserHost; *p; p++) /* This may be obsolete, I don't know of any servers that allow this */
static const char lame_chars[] =
"\x01\x02\x03\x04\x05\x06\x07\x08\x0b\x0c\x0d\x0e\x0f\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a";
if (strpbrk(FromUserHost, lame_chars))
{ {
char *user, *host; char *host = strchr(FromUserHost, '@') + 1;
if (!strchr(lame_chars, *p))
continue;
user = LOCAL_COPY(FromUserHost);
host = strchr(FromUserHost, '@');
host++;
send_to_server("MODE %s +b *!*@%s\r\nKICK %s %s :\002Lame Ident detected\002", chan->channel, cluster(host), chan->channel, from); send_to_server("MODE %s +b *!*@%s\r\nKICK %s %s :\002Lame Ident detected\002", chan->channel, cluster(host), chan->channel, from);
break;
} }
} }
} }