Changeset 6f7ac17

Timestamp:

2007-12-28T23:27:45Z (17 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

debc281, f394500

Parents:

fb4ebcc5

Message:

Fixed return value check in proxy_connect(), since on some systems
a non-blocking connect() can return immediately (when connecting to
localhost, for example). Closes bug #233 and #340.

File:

• lib/proxy.c (modified) (1 diff)

lib/proxy.c

@@ -130 +130 @@
         event_debug("proxy_connect_none( \"%s\", %d ) = %d\n", host, port, fd);
         
-        if (connect(fd, (struct sockaddr *)sin, sizeof(*sin)) < 0) {
-                if (sockerr_again()) {
-                        phb->inpa = b_input_add(fd, GAIM_INPUT_WRITE, gaim_io_connected, phb);
-                        phb->fd = fd;
-                } else {
-                        closesocket(fd);
-                        g_free(phb);
-                        return -1;
-                }
-        }
-
-        return fd;
+        if (connect(fd, (struct sockaddr *)sin, sizeof(*sin)) < 0 && !sockerr_again()) {
+                closesocket(fd);
+                g_free(phb);
+                
+                return -1;
+        } else {
+                phb->inpa = b_input_add(fd, GAIM_INPUT_WRITE, gaim_io_connected, phb);
+                phb->fd = fd;
+                
+                return fd;
+        }
 }