aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-09-29 04:45:57 -04:00
Code

Say when we're reconnecting, and mention it can be aborted with /RMRECONNS

Browse Source 
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@3204 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 2004-01-19 17:52:08 +00:00 committed by cras
parent 623dbac5cf
commit e980500702
5 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/core/server-connect-rec.h
View File

@ -31,7 +31,8 @@ char *ssl_capath;
GIOChannel *connect_handle; /* connect using this handle */
/* when reconnecting, the old server status */
unsigned int reconnection:1; /* we're trying to reconnect */
unsigned int reconnection:1; /* we're trying to reconnect a connected server */
unsigned int reconnecting:1; /* we're trying to reconnect any connection */
unsigned int no_autojoin_channels:1; /* don't autojoin any channels */
unsigned int unix_socket:1; /* Connect using named unix socket */
unsigned int use_ssl:1; /* this connection uses SSL */

1
src/core/servers-reconnect.c
View File

@ -71,6 +71,7 @@ static void server_reconnect_add(SERVER_CONNECT_REC *conn,
rec->next_connect = next_connect;
rec->conn = conn;
conn->reconnecting = TRUE;
server_connect_ref(conn);
reconnects = g_slist_append(reconnects, rec);

4
src/fe-common/core/fe-server.c
View File

@ -284,7 +284,9 @@ static void sig_server_connecting(SERVER_REC *server, IPADDR *ip)
else
net_ip2host(ip, ipaddr);
printformat(server, NULL, MSGLEVEL_CLIENTNOTICE, TXT_CONNECTING,
printformat(server, NULL, MSGLEVEL_CLIENTNOTICE,
!server->connrec->reconnecting ?
TXT_CONNECTING : TXT_RECONNECTING,
server->connrec->address, ipaddr, server->connrec->port);
}

1
src/fe-common/core/module-formats.c
View File

@ -71,6 +71,7 @@ FORMAT_REC fecommon_core_formats[] = {
{ "looking_up", "Looking up {server $0}", 1, { 0 } },
{ "connecting", "Connecting to {server $0} [$1] port {hilight $2}", 3, { 0, 0, 1 } },
{ "reconnecting", "Reconnecting to {server $0} [$1] port {hilight $2} - use /RMRECONNS to abort", 3, { 0, 0, 1 } },
{ "connection_established", "Connection to {server $0} established", 1, { 0 } },
{ "cant_connect", "Unable to connect server {server $0} port {hilight $1} {reason $2}", 3, { 0, 1, 0 } },
{ "connection_lost", "Connection lost to {server $0}", 1, { 0 } },

3
src/fe-common/core/module-formats.h
View File

@ -48,7 +48,8 @@ enum {
TXT_LOOKING_UP,
TXT_CONNECTING,
TXT_CONNECTION_ESTABLISHED,
TXT_RECONNECTING,
TXT_CONNECTION_ESTABLISHED,
TXT_CANT_CONNECT,
TXT_CONNECTION_LOST,
TXT_LAG_DISCONNECTED,