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

/UPGRADE broke reconnections to server.

git-svn-id: http://svn.irssi.org/repos/irssi/trunk@2204 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 2001-12-06 23:05:54 +00:00 committed by cras
parent 6e2b0d41d9
commit 6be1390303
4 changed files with 4 additions and 3 deletions

View File

@ -13,6 +13,7 @@ char *nick; /* current nick */
unsigned int connected:1; /* connected to server */ unsigned int connected:1; /* connected to server */
unsigned int connection_lost:1; /* Connection lost unintentionally */ unsigned int connection_lost:1; /* Connection lost unintentionally */
unsigned int session_reconnect:1; /* Connected to this server with /UPGRADE */ unsigned int session_reconnect:1; /* Connected to this server with /UPGRADE */
unsigned int no_reconnect:1; /* Don't reconnect to server */
NET_SENDBUF_REC *handle; NET_SENDBUF_REC *handle;
int readtag; /* input tag */ int readtag; /* input tag */

View File

@ -172,7 +172,7 @@ server_connect_copy_skeleton(SERVER_CONNECT_REC *src, int connect_info)
} }
#define server_should_reconnect(server) \ #define server_should_reconnect(server) \
((server)->connection_lost && !(server)->session_reconnect && \ ((server)->connection_lost && !(server)->no_reconnect && \
((server)->connrec->chatnet != NULL || \ ((server)->connrec->chatnet != NULL || \
(!(server)->banned && !(server)->dns_error))) (!(server)->banned && !(server)->dns_error)))

View File

@ -189,7 +189,7 @@ static void session_save_server(SERVER_REC *server, CONFIG_REC *config,
server->handle = NULL; server->handle = NULL;
server->connection_lost = TRUE; server->connection_lost = TRUE;
server->session_reconnect = TRUE; server->no_reconnect = TRUE;
server_disconnect(server); server_disconnect(server);
} }

View File

@ -22,4 +22,4 @@ extern PerlInterpreter *my_perl; /* must be called my_perl or some perl implemen
/* Change this every time when some API changes between irssi's perl module /* Change this every time when some API changes between irssi's perl module
(or irssi itself) and irssi's perl libraries. */ (or irssi itself) and irssi's perl libraries. */
#define IRSSI_PERL_API_VERSION 20011111 #define IRSSI_PERL_API_VERSION 20011204