aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-12-04 14:46:39 -05:00
Code

quitmsg_is_split() fix - the hosts must contain the domain part now (ie.

Browse Source 
"word1 word2" isn't a netsplit)


git-svn-id: http://svn.irssi.org/repos/irssi/trunk@1758 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 2001-08-14 13:17:11 +00:00 committed by cras
parent 6c022b0a5e
commit 295d16536e
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/irc/core/netsplit.c
View File

@ -217,7 +217,7 @@ NICK_REC *netsplit_find_channel(IRC_SERVER_REC *server, const char *nick,
int quitmsg_is_split(const char *msg) int quitmsg_is_split(const char *msg)
{ {
const char *host1, *host2; const char *host1, *host2;
int prev, len; int prev, len, host1_dot, host2_dot;
g_return_val_if_fail(msg != NULL, FALSE); g_return_val_if_fail(msg != NULL, FALSE);
@ -232,14 +232,14 @@ int quitmsg_is_split(const char *msg)
domains which breaks that code too. domains which breaks that code too.
So, the check is currently just: So, the check is currently just:
- host1[.domain1] host2[.domain2] - host1.domain1 host2.domain2
- only 1 space - only 1 space
- no double-dots (".." - probably useless check) - no double-dots (".." - probably useless check)
- hosts/domains can't start or end with a dot - hosts/domains can't start or end with a dot
- the two hosts can't be identical (probably useless check) - the two hosts can't be identical (probably useless check)
*/ */
host1 = msg; host1 = msg; host2 = NULL;
host2 = NULL; prev = '\0'; len = 0; prev = '\0'; len = 0; host1_dot = host2_dot = 0;
while (*msg != '\0') { while (*msg != '\0') {
if (*msg == ' ') { if (*msg == ' ') {
if (prev == '.' || prev == '\0') { if (prev == '.' || prev == '\0') {
@ -249,6 +249,8 @@ int quitmsg_is_split(const char *msg)
} }
if (host2 != NULL) if (host2 != NULL)
return FALSE; /* only one space allowed */ return FALSE; /* only one space allowed */
if (!host1_dot)
return FALSE; /* host1 didn't have domain */
host2 = msg+1; len = -1; host2 = msg+1; len = -1;
} else if (*msg == '.') { } else if (*msg == '.') {
if (prev == '\0' || prev == ' ' || prev == '.') { if (prev == '\0' || prev == ' ' || prev == '.') {
@ -256,13 +258,18 @@ int quitmsg_is_split(const char *msg)
and can't have ".." */ and can't have ".." */
return FALSE; return FALSE;
} }
if (host2 != NULL)
host2_dot = TRUE;
else
host1_dot = TRUE;
} }
prev = *msg; prev = *msg;
msg++; len++; msg++; len++;
} }
if (host2 == NULL || prev == '.') if (!host2_dot || prev == '.')
return FALSE; return FALSE;
if (len == (int) (host2-host1)-1 && if (len == (int) (host2-host1)-1 &&