Changeset 5469952

Timestamp:

2008-12-14T15:04:48Z (16 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

72b6783e

Parents:

71d45c2

Message:

Detect disconnects caused by concurrent logins or rate limiting, and disable
auto-reconnect in those cases to prevent loops.

File:

• protocols/oscar/oscar.c (modified) (6 diffs)

protocols/oscar/oscar.c

@@ -91 +91 @@
         GSList *oscar_chats;
 
-        gboolean killme;
+        gboolean killme, no_reconnect;
         gboolean icq;
         GSList *evilhack;
@@ -181 +181 @@
 static int gaim_parse_auth_resp  (aim_session_t *, aim_frame_t *, ...);
 static int gaim_parse_login      (aim_session_t *, aim_frame_t *, ...);
+static int gaim_parse_logout     (aim_session_t *, aim_frame_t *, ...);
 static int gaim_handle_redirect  (aim_session_t *, aim_frame_t *, ...);
 static int gaim_parse_oncoming   (aim_session_t *, aim_frame_t *, ...);
@@ -294 +295 @@
                         aim_rxdispatch(odata->sess);
                                if (odata->killme)
-                                       imc_logout(ic, TRUE);
+                                       imc_logout(ic, !odata->no_reconnect);
                 } else {
                         if ((conn->type == AIM_CONN_TYPE_BOS) ||
@@ -520 +521 @@
                 case 0x18:
                         /* connecting too frequently */
+                        od->no_reconnect = TRUE;
                         imcb_error(ic, _("You have been connecting and disconnecting too frequently. Wait ten minutes and try again. If you continue to try, you will need to wait even longer."));
                         break;
@@ -572 +574 @@
         aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_LOC, AIM_CB_LOC_USERINFO, gaim_parseaiminfo, 0);
         aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_MSG, AIM_CB_MSG_MTN, gaim_parsemtn, 0);
+        aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_SPECIAL, AIM_CB_SPECIAL_CONNERR, gaim_parse_logout, 0);
 
         ((struct oscar_data *)ic->proto_data)->conn = bosconn;
@@ -747 +750 @@
 
         aim_send_login(sess, fr->conn, ic->acc->user, ic->acc->pass, &info, key);
+
+        return 1;
+}
+
+static int gaim_parse_logout(aim_session_t *sess, aim_frame_t *fr, ...) {
+        struct im_connection *ic = sess->aux_data;
+        struct oscar_data *odata = ic->proto_data;
+        int code;
+        va_list ap;
+
+        va_start(ap, fr);
+        code = va_arg(ap, int);
+        va_end(ap);
+        
+        imcb_error( ic, "Connection aborted by server: %s", code == 1 ?
+                        "someone else logged in with your account" :
+                        "unknown reason" );
+        
+        /* Tell BitlBee to disable auto_reconnect if code == 1, since that
+           means a concurrent login somewhere else. */
+        odata->no_reconnect = code == 1;
+        
+        /* DO NOT log out here! Just tell the callback to do it. */
+        odata->killme = TRUE;
 
         return 1;