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

/RECONNECT reconnects now to server with identical settings.

Browse Source 
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@1247 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 2001-02-19 02:27:10 +00:00 committed by cras
parent 1ee25967d8
commit 42634d83bc
1 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -117,7 +117,7 @@ static void sserver_connect(SERVER_SETUP_REC *rec, SERVER_CONNECT_REC *conn)
} }
static SERVER_CONNECT_REC * static SERVER_CONNECT_REC *
server_connect_copy_skeleton(SERVER_CONNECT_REC *src) server_connect_copy_skeleton(SERVER_CONNECT_REC *src, int connect_info)
{ {
SERVER_CONNECT_REC *dest; SERVER_CONNECT_REC *dest;
@ -131,6 +131,12 @@ server_connect_copy_skeleton(SERVER_CONNECT_REC *src)
dest->proxy_port = src->proxy_port; dest->proxy_port = src->proxy_port;
dest->proxy_string = g_strdup(src->proxy_string); dest->proxy_string = g_strdup(src->proxy_string);
if (connect_info) {
dest->address = g_strdup(src->address);
dest->port = src->port;
dest->password = g_strdup(src->password);
}
dest->chatnet = g_strdup(src->chatnet); dest->chatnet = g_strdup(src->chatnet);
dest->nick = g_strdup(src->nick); dest->nick = g_strdup(src->nick);
dest->username = g_strdup(src->username); dest->username = g_strdup(src->username);
@ -164,7 +170,7 @@ static void sig_reconnect(SERVER_REC *server)
if (reconnect_time == -1 || !server_should_reconnect(server)) if (reconnect_time == -1 || !server_should_reconnect(server))
return; return;
conn = server_connect_copy_skeleton(server->connrec); conn = server_connect_copy_skeleton(server->connrec, FALSE);
g_return_if_fail(conn != NULL); g_return_if_fail(conn != NULL);
/* save the server status */ /* save the server status */
@ -189,8 +195,7 @@ static void sig_reconnect(SERVER_REC *server)
/* not in any chatnet, just reconnect back to same server */ /* not in any chatnet, just reconnect back to same server */
conn->address = g_strdup(server->connrec->address); conn->address = g_strdup(server->connrec->address);
conn->port = server->connrec->port; conn->port = server->connrec->port;
conn->password = server->connrec->password == NULL ? NULL : conn->password = g_strdup(server->connrec->password);
g_strdup(server->connrec->password);
if (server->connect_time != 0 && if (server->connect_time != 0 &&
time(NULL)-server->connect_time > reconnect_time) { time(NULL)-server->connect_time > reconnect_time) {
@ -293,19 +298,21 @@ static void cmd_reconnect(const char *data, SERVER_REC *server)
{ {
SERVER_CONNECT_REC *conn; SERVER_CONNECT_REC *conn;
RECONNECT_REC *rec; RECONNECT_REC *rec;
char *str;
int tag; int tag;
if (*data == '\0' && server != NULL) { if (*data == '\0' && server != NULL) {
/* reconnect back to same server */ /* reconnect back to same server */
str = g_strdup_printf("%s %d %s %s", server->connrec->address, conn = server_connect_copy_skeleton(server->connrec, TRUE);
server->connrec->port,
server->connrec->password == NULL ? "-" : if (server->connected) {
server->connrec->password, reconnect_save_status(conn, server);
server->connrec->nick); signal_emit("command disconnect", 2,
signal_emit("command server", 2, str, server); "* Reconnecting", server);
g_free(str); }
return;
conn->reconnection = TRUE;
CHAT_PROTOCOL(conn)->server_connect(conn);
return;
} }
if (*data == '\0') { if (*data == '\0') {