Changeset 537d9b9 for protocols/oscar/conn.c

Timestamp:

2016-11-20T08:40:36Z (8 years ago)

Author:

dequis <dx@…>

Children:

3f44e43

Parents:

ba52ac5 (diff), 9f03c47 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge master up to commit '9f03c47' into parson

File:

• protocols/oscar/conn.c (modified) (2 diffs)

protocols/oscar/conn.c

@@ -383 +383 @@
 {
         aim_conn_t *connstruct;
-        guint16 port = AIM_LOGIN_PORT;
-        char *host;
-        int i;
 
         if (!(connstruct = aim_conn_getnext(sess))) {
@@ -400 +397 @@
         }
 
-        /*
-         * As of 23 Jul 1999, AOL now sends the port number, preceded by a
-         * colon, in the BOS redirect.  This fatally breaks all previous
-         * libfaims.  Bad, bad AOL.
-         *
-         * We put this here to catch every case.
-         *
-         */
-
-        for (i = 0; i < (int) strlen(dest); i++) {
-                if (dest[i] == ':') {
-                        port = atoi(&(dest[i + 1]));
-                        break;
-                }
-        }
-
-        host = (char *) g_malloc(i + 1);
-        strncpy(host, dest, i);
-        host[i] = '\0';
-
-        connstruct->fd = proxy_connect(host, port, NULL, NULL);
-
-        g_free(host);
+        /* The code that used to be here was very broken */
+        g_return_val_if_reached(connstruct);
 
         return connstruct;