Added SILC Thread Queue API

[crypto.git] / apps / irssi / src / core / servers-reconnect.c

diff --git a/apps/irssi/src/core/servers-reconnect.c b/apps/irssi/src/core/servers-reconnect.c
index cc053150dc012ee7ae27bd6befdee133bd6ec229..5f53368c70900215214c411f64145df9d9092b1d 100644 (file)
--- a/apps/irssi/src/core/servers-reconnect.c
+++ b/apps/irssi/src/core/servers-reconnect.c
@@ -34,6 +34,7 @@ GSList *reconnects;
 static int last_reconnect_tag;
 static int reconnect_timeout_tag;
 static int reconnect_time;
+static int connect_timeout;
 
 void reconnect_save_status(SERVER_CONNECT_REC *conn, SERVER_REC *server)
 {
@@ -70,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);
@@ -92,14 +94,28 @@ void server_reconnect_destroy(RECONNECT_REC *rec)
 static int server_reconnect_timeout(void)
 {
        SERVER_CONNECT_REC *conn;
-       GSList *list, *tmp;
+       GSList *list, *tmp, *next;
        time_t now;
 
+       now = time(NULL);
+
+       /* timeout any connections that haven't gotten to connected-stage */
+       for (tmp = servers; tmp != NULL; tmp = next) {
+               SERVER_REC *server = tmp->data;
+
+               next = tmp->next;
+               if (!server->connected &&
+                   server->connect_time + connect_timeout < now &&
+                   connect_timeout > 0) {
+                       server->connection_lost = TRUE;
+                       server_disconnect(server);
+               }
+       }
+
        /* If server_connect() removes the next reconnection in queue,
           we're screwed. I don't think this should happen anymore, but just
           to be sure we don't crash, do this safely. */
        list = g_slist_copy(reconnects);
-       now = time(NULL);
        for (tmp = list; tmp != NULL; tmp = tmp->next) {
                RECONNECT_REC *rec = tmp->data;
 
@@ -176,6 +192,11 @@ server_connect_copy_skeleton(SERVER_CONNECT_REC *src, int connect_info)
         dest->no_autojoin_channels = src->no_autojoin_channels;
 
        dest->use_ssl = src->use_ssl;
+       dest->ssl_cert = g_strdup(src->ssl_cert);
+       dest->ssl_pkey = g_strdup(src->ssl_pkey);
+       dest->ssl_verify = src->ssl_verify;
+       dest->ssl_cafile = g_strdup(src->ssl_cafile);
+       dest->ssl_capath = g_strdup(src->ssl_capath);
 
        return dest;
 }
@@ -392,7 +413,7 @@ static void cmd_reconnect(const char *data, SERVER_REC *server)
        if (*data == '\0') {
                /* reconnect to first server in reconnection list */
                if (reconnects == NULL)
-                       cmd_return_error(CMDERR_NOT_CONNECTED);
+                       cmd_param_error(CMDERR_NOT_CONNECTED);
                 rec = reconnects->data;
        } else {
                if (g_strncasecmp(data, "RECON-", 6) == 0)
@@ -446,12 +467,14 @@ static void sig_chat_protocol_deinit(CHAT_PROTOCOL_REC *proto)
 
 static void read_settings(void)
 {
-       reconnect_time = settings_get_int("server_reconnect_time");
+       reconnect_time = settings_get_time("server_reconnect_time")/1000;
+        connect_timeout = settings_get_time("server_connect_timeout")/1000;
 }
 
 void servers_reconnect_init(void)
 {
-       settings_add_int("server", "server_reconnect_time", 300);
+       settings_add_time("server", "server_reconnect_time", "5min");
+       settings_add_time("server", "server_connect_timeout", "5min");
 
        reconnects = NULL;
        last_reconnect_tag = 0;