aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2025-02-02 15:08:01 -05:00
Code

Only use registered start events to begin a server redirection - not those

Browse Source 
that are just given in server_redirect() (fixes a small problem of /MSG nick
who is away + /WHOIS nick, then receiving the first away reply from server
to /MSG command irssi thinks it's a reply to /WHOIS)


git-svn-id: http://svn.irssi.org/repos/irssi/trunk@2175 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 2001-12-01 20:17:57 +00:00 committed by cras
parent ed7d5addc9
commit 348461aa08
1 changed files with 27 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/irc/core/servers-redirect.c
View File

@ -28,10 +28,10 @@
#define DEFAULT_REDIRECT_TIMEOUT 60 #define DEFAULT_REDIRECT_TIMEOUT 60
/* Allow 2 non-expected redirections to come before the expected one /* Allow one non-expected redirections to come before the expected one
before aborting it. Some IRC bouncers/proxies reply to eg. PINGs before aborting it. Some IRC bouncers/proxies reply to eg. PINGs
immediately. */ immediately. */
#define MAX_FAILURE_COUNT 2 #define MAX_FAILURE_COUNT 1
typedef struct { typedef struct {
char *name; char *name;
@ -329,12 +329,16 @@ static GSList *redirect_cmd_list_find(GSList *list, const char *event)
return list; return list;
} }
#define MATCH_NONE 0
#define MATCH_START 1
#define MATCH_STOP 2
static const char *redirect_match(REDIRECT_REC *redirect, const char *event, static const char *redirect_match(REDIRECT_REC *redirect, const char *event,
const char *args, int *match_stop) const char *args, int *match)
{ {
GSList *tmp, *cmdpos; GSList *tmp, *cmdpos;
const char *signal; const char *signal;
int stop_signal; int match_list;
if (redirect->aborted) if (redirect->aborted)
return NULL; return NULL;
@ -357,16 +361,16 @@ static const char *redirect_match(REDIRECT_REC *redirect, const char *event,
if (cmdpos == NULL) if (cmdpos == NULL)
return NULL; return NULL;
stop_signal = TRUE; match_list = MATCH_STOP;
} else { } else {
/* look from start/stop lists */ /* look from start/stop lists */
cmdpos = redirect_cmd_list_find(redirect->cmd->start, event); cmdpos = redirect_cmd_list_find(redirect->cmd->start, event);
if (cmdpos != NULL) if (cmdpos != NULL)
stop_signal = FALSE; match_list = MATCH_START;
else { else {
cmdpos = redirect_cmd_list_find(redirect->cmd->stop, cmdpos = redirect_cmd_list_find(redirect->cmd->stop,
event); event);
stop_signal = cmdpos != NULL; match_list = cmdpos != NULL ? MATCH_STOP : MATCH_NONE;
} }
} }
@ -382,7 +386,7 @@ static const char *redirect_match(REDIRECT_REC *redirect, const char *event,
GPOINTER_TO_INT(cmdpos->next->data))) GPOINTER_TO_INT(cmdpos->next->data)))
return NULL; return NULL;
*match_stop = stop_signal; *match = match_list;
return signal != NULL ? signal : redirect->default_signal; return signal != NULL ? signal : redirect->default_signal;
} }
@ -409,20 +413,22 @@ static void redirect_abort(IRC_SERVER_REC *server, REDIRECT_REC *rec)
static REDIRECT_REC *redirect_find(IRC_SERVER_REC *server, const char *event, static REDIRECT_REC *redirect_find(IRC_SERVER_REC *server, const char *event,
const char *args, const char **signal, const char *args, const char **signal,
int *match_stop) int *match)
{ {
REDIRECT_REC *redirect; REDIRECT_REC *redirect;
GSList *tmp, *next; GSList *tmp, *next;
time_t now; time_t now;
const char *match_signal;
/* find the redirection */ /* find the redirection */
*signal = NULL; redirect = NULL; *signal = NULL; redirect = NULL;
for (tmp = server->redirects; tmp != NULL; tmp = tmp->next) { for (tmp = server->redirects; tmp != NULL; tmp = tmp->next) {
REDIRECT_REC *rec = tmp->data; REDIRECT_REC *rec = tmp->data;
*signal = redirect_match(rec, event, args, match_stop); match_signal = redirect_match(rec, event, args, match);
if (*signal != NULL) { if (match_signal != NULL && *match != MATCH_NONE) {
redirect = rec; redirect = rec;
*signal = match_signal;
break; break;
} }
} }
@ -451,25 +457,24 @@ static REDIRECT_REC *redirect_find(IRC_SERVER_REC *server, const char *event,
static const char * static const char *
server_redirect_get(IRC_SERVER_REC *server, const char *event, server_redirect_get(IRC_SERVER_REC *server, const char *event,
const char *args, REDIRECT_REC **redirect, int *match_stop) const char *args, REDIRECT_REC **redirect, int *match)
{ {
const char *signal; const char *signal;
*redirect = NULL; *redirect = NULL;
*match_stop = FALSE; *match = MATCH_NONE;
if (server->redirects == NULL) if (server->redirects == NULL)
return NULL; return NULL;
if (server->redirect_continue == NULL) { if (server->redirect_continue == NULL) {
/* find the redirection */ /* find the redirection */
*redirect = redirect_find(server, event, args, *redirect = redirect_find(server, event, args, &signal, match);
&signal, match_stop);
} else { } else {
/* redirection is already started, now we'll just need to /* redirection is already started, now we'll just need to
keep redirecting until stop-event is found. */ keep redirecting until stop-event is found. */
*redirect = server->redirect_continue; *redirect = server->redirect_continue;
signal = redirect_match(*redirect, event, NULL, match_stop); signal = redirect_match(*redirect, event, NULL, match);
if (signal == NULL) { if (signal == NULL) {
/* unknown event - redirect to the default signal. */ /* unknown event - redirect to the default signal. */
if (strncmp(event, "event ", 6) == 0 && if (strncmp(event, "event ", 6) == 0 &&
@ -496,12 +501,10 @@ const char *server_redirect_get_signal(IRC_SERVER_REC *server,
{ {
REDIRECT_REC *redirect; REDIRECT_REC *redirect;
const char *signal; const char *signal;
int match_stop; int match;
signal = server_redirect_get(server, event, args, signal = server_redirect_get(server, event, args, &redirect, &match);
&redirect, &match_stop); if (match != MATCH_STOP || redirect == NULL)
if (!match_stop || redirect == NULL)
server->redirect_continue = redirect; server->redirect_continue = redirect;
else { else {
/* stop event - remove this redirection next time this /* stop event - remove this redirection next time this
@ -520,10 +523,9 @@ const char *server_redirect_peek_signal(IRC_SERVER_REC *server,
const char *args) const char *args)
{ {
REDIRECT_REC *redirect; REDIRECT_REC *redirect;
int match_stop; int match;
return server_redirect_get(server, event, args, return server_redirect_get(server, event, args, &redirect, &match);
&redirect, &match_stop);
} }
static void sig_disconnected(IRC_SERVER_REC *server) static void sig_disconnected(IRC_SERVER_REC *server)