Changeset 4022b68 for lib

Timestamp:

2010-08-21T22:42:01Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

fd424c8

Parents:

327af51 (diff), c00dd71 (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 mainline.

File:

• lib/proxy.c (modified) (5 diffs)

lib/proxy.c

@@ -49 +49 @@
 char proxypass[128] = "";
 
+/* Some systems don't know this one. It's not essential, so set it to 0 then. */
+#ifndef AI_NUMERICSERV
+#define AI_NUMERICSERV 0
+#endif
+
 struct PHB {
         b_event_handler func, proxy_func;
@@ -56 +61 @@
         int fd;
         gint inpa;
+        struct addrinfo *gai, *gai_cur;
 };
+
+static int proxy_connect_none(const char *host, unsigned short port_, struct PHB *phb);
 
 static gboolean gaim_io_connected(gpointer data, gint source, b_input_condition cond)
@@ -66 +74 @@
         
 #ifndef _WIN32
-        if (getsockopt(source, SOL_SOCKET, SO_ERROR, &error, &len) < 0) {
+        if (getsockopt(source, SOL_SOCKET, SO_ERROR, &error, &len) < 0 || error) {
+                if ((phb->gai_cur = phb->gai_cur->ai_next)) {
+                        int new_fd;
+                        b_event_remove(phb->inpa);
+                        if ((new_fd = proxy_connect_none(NULL, 0, phb))) {
+                                b_event_remove(phb->inpa);
+                                closesocket(source);
+                                dup2(new_fd, source);
+                                phb->inpa = b_input_add(source, B_EV_IO_WRITE, gaim_io_connected, phb);
+                                return FALSE;
+                        }
+                }
+                freeaddrinfo(phb->gai);
                 closesocket(source);
                 b_event_remove(phb->inpa);
@@ -78 +98 @@
         }
 #endif
+        freeaddrinfo(phb->gai);
         sock_make_blocking(source);
         b_event_remove(phb->inpa);
@@ -94 +115 @@
         struct sockaddr_in me;
         int fd = -1;
-        int ret;
-        char port[6];
-        struct addrinfo hints;
-        struct addrinfo* result;
-
-        g_snprintf(port, sizeof(port), "%d", port_);
-
-        memset(&hints, 0, sizeof(struct addrinfo));
-        hints.ai_family = AF_UNSPEC;
-        hints.ai_socktype = SOCK_STREAM;
-        hints.ai_flags = AI_ADDRCONFIG | AI_NUMERICSERV;
-
-        if (!(ret = getaddrinfo(host, port, &hints, &result)))
+        
+        if (phb->gai_cur == NULL)
         {
-                struct addrinfo* rp;
-
-                for (rp = result; rp; rp = rp->ai_next)
+                int ret;
+                char port[6];
+                struct addrinfo hints;
+        
+                g_snprintf(port, sizeof(port), "%d", port_);
+        
+                memset(&hints, 0, sizeof(struct addrinfo));
+                hints.ai_family = AF_UNSPEC;
+                hints.ai_socktype = SOCK_STREAM;
+                hints.ai_flags = AI_ADDRCONFIG | AI_NUMERICSERV;
+        
+                if (!(ret = getaddrinfo(host, port, &hints, &phb->gai)))
+                        phb->gai_cur = phb->gai;
+                else
+                        event_debug("gai(): %s\n", gai_strerror(ret));
+        }
+        
+        for (; phb->gai_cur; phb->gai_cur = phb->gai_cur->ai_next)
+        {
+                if ((fd = socket(phb->gai_cur->ai_family, phb->gai_cur->ai_socktype, phb->gai_cur->ai_protocol)) < 0) {
+                        event_debug( "socket failed: %d\n", errno);
+                        continue;
+                }
+
+                sock_make_nonblocking(fd);
+
+                if (global.conf->iface_out)
                 {
-                        if ((fd = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol)) < 0) {
-                                event_debug( "socket failed: %d\n", errno);
-                                continue;
-                        }
-
-                        sock_make_nonblocking(fd);
-
-                        if (global.conf->iface_out)
-                        {
-                                me.sin_family = AF_INET;
-                                me.sin_port = 0;
-                                me.sin_addr.s_addr = inet_addr( global.conf->iface_out );
+                        me.sin_family = AF_INET;
+                        me.sin_port = 0;
+                        me.sin_addr.s_addr = inet_addr( global.conf->iface_out );
                                 
-                                if (bind(fd, (struct sockaddr *) &me, sizeof(me)) != 0)
-                                        event_debug("bind( %d, \"%s\" ) failure\n", fd, global.conf->iface_out);
-                        }
-
-                        event_debug("proxy_connect_none( \"%s\", %d ) = %d\n", host, port, fd);
-        
-                        if (connect(fd, rp->ai_addr, rp->ai_addrlen) < 0 && !sockerr_again()) {
-                                event_debug( "connect failed: %s\n", strerror(errno));
-                                closesocket(fd);
-                                fd = -1;
-                                continue;
-                        } else {
-                                phb->inpa = b_input_add(fd, B_EV_IO_WRITE, gaim_io_connected, phb);
-                                phb->fd = fd;
-                                
-                                break;
-                        }
-                }
-
-                freeaddrinfo(result);
-        }
-        else
-        {
-                event_debug("gai(): %s\n", gai_strerror(ret));
-        }
-        
-        if(fd < 0)
+                        if (bind(fd, (struct sockaddr *) &me, sizeof(me)) != 0)
+                                event_debug("bind( %d, \"%s\" ) failure\n", fd, global.conf->iface_out);
+                }
+
+                event_debug("proxy_connect_none( \"%s\", %d ) = %d\n", host, port, fd);
+        
+                if (connect(fd, phb->gai_cur->ai_addr, phb->gai_cur->ai_addrlen) < 0 && !sockerr_again()) {
+                        event_debug( "connect failed: %s\n", strerror(errno));
+                        closesocket(fd);
+                        fd = -1;
+                        continue;
+                } else {
+                        phb->inpa = b_input_add(fd, B_EV_IO_WRITE, gaim_io_connected, phb);
+                        phb->fd = fd;
+                        
+                        break;
+                }
+        }
+        
+        if(fd < 0 && host)
                 g_free(phb);