Changeset 72d661e

Timestamp:

2015-10-21T08:46:02Z (9 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

2b0c05c

Parents:

5307e88

Message:

yahoo: Fix handling of proxy connection failures

Fixes trac ticket 135, ​https://bugs.bitlbee.org/bitlbee/ticket/135

The ticket mentions 100% cpu usage when failing to connect to a socks
proxy. It also provides a patch that just checks source == -1 and
disconnects cleanly instead of trying to continue logging in.

This commit is pretty much the same thing, adapted to the API we're
currently using, since the original patch was for bitlbee 1.0.1 and it
looks like the old api was terrible back then.

That ticket was almost 10 years old. The yahoo code didn't change a lot
in that time.

File:

• protocols/yahoo/yahoo.c (modified) (1 diff)

protocols/yahoo/yahoo.c

@@ -440 +440 @@
 {
         struct byahoo_connect_callback_data *d = data;
-
-        if (!byahoo_get_ic_by_id(d->id)) {
+        struct im_connection *ic;
+
+        if (!(ic = byahoo_get_ic_by_id(d->id))) {
+                g_free(d);
+                return;
+        }
+
+        if (source == -1) {
+                imcb_error(ic, "Could not connect to server");
+                imc_logout(ic, TRUE);
                 g_free(d);
                 return;