Changeset f710673

Timestamp:

2015-10-26T03:42:12Z (9 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

4e365ce

Parents:

5756890

git-author:

dequis <dx@…> (24-10-15 21:41:38)

git-committer:

dequis <dx@…> (26-10-15 03:42:12)

Message:

proxy: Turn phb_close() into phb_free(), use it for all g_free(phb)

More cleanup.

File:

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

lib/proxy.c

@@ -65 +65 @@
 static int proxy_connect_none(const char *host, unsigned short port_, struct PHB *phb);
 
-static gboolean phb_close(struct PHB *phb)
-{
-        close(phb->fd);
-        phb->func(phb->data, -1, B_EV_IO_READ);
+static gboolean phb_free(struct PHB *phb, gboolean success)
+{
+        if (!success) {
+                if (phb->fd > 0) {
+                        closesocket(phb->fd);
+                }
+                if (phb->func) {
+                        phb->func(phb->data, -1, B_EV_IO_READ);
+                }
+        }
+        if (phb->gai) {
+                freeaddrinfo(phb->gai);
+        }
         g_free(phb->host);
         g_free(phb);
@@ -103 +112 @@
 
         freeaddrinfo(phb->gai);
+        phb->gai = NULL;
+
         b_event_remove(phb->inpa);
         phb->inpa = 0;
+
         if (phb->proxy_func) {
                 phb->proxy_func(phb->proxy_data, source, B_EV_IO_READ);
         } else {
                 phb->func(phb->data, source, B_EV_IO_READ);
-                g_free(phb);
+                phb_free(phb, TRUE);
         }
 
@@ -173 +185 @@
 
         if (fd < 0 && host) {
-                g_free(phb);
+                phb_free(phb, TRUE);
         }
 
@@ -206 +218 @@
             (memcmp(HTTP_GOODSTRING2, inputline, strlen(HTTP_GOODSTRING2)) == 0)) {
                 phb->func(phb->data, source, B_EV_IO_READ);
-                g_free(phb->host);
-                g_free(phb);
-                return FALSE;
-        }
-
-        return phb_close(phb);
+                return phb_free(phb, TRUE);
+        }
+
+        return phb_free(phb, FALSE);
 }
 
@@ -226 +236 @@
         len = sizeof(error);
         if (getsockopt(source, SOL_SOCKET, SO_ERROR, &error, &len) < 0) {
-                return phb_close(phb);
+                return phb_free(phb, FALSE);
         }
         sock_make_blocking(source);
@@ -233 +243 @@
                    phb->host, phb->port);
         if (send(source, cmd, strlen(cmd), 0) < 0) {
-                return phb_close(phb);
+                return phb_free(phb, FALSE);
         }
 
@@ -244 +254 @@
                 g_free(t2);
                 if (send(source, cmd, strlen(cmd), 0) < 0) {
-                        return phb_close(phb);
+                        return phb_free(phb, FALSE);
                 }
         }
@@ -250 +260 @@
         g_snprintf(cmd, sizeof(cmd), "\r\n");
         if (send(source, cmd, strlen(cmd), 0) < 0) {
-                return phb_close(phb);
+                return phb_free(phb, FALSE);
         }
 
@@ -281 +291 @@
         if (read(source, packet, 9) >= 4 && packet[1] == 90) {
                 phb->func(phb->data, source, B_EV_IO_READ);
-                g_free(phb->host);
-                g_free(phb);
-                return FALSE;
-        }
-
-        return phb_close(phb);
+                return phb_free(phb, TRUE);
+        }
+
+        return phb_free(phb, FALSE);
 }
 
@@ -303 +311 @@
         len = sizeof(error);
         if (getsockopt(source, SOL_SOCKET, SO_ERROR, &error, &len) < 0) {
-                return phb_close(phb);
+                return phb_free(phb, FALSE);
         }
         sock_make_blocking(source);
 
         if (!is_socks4a && !(hp = gethostbyname(phb->host))) {
-                return phb_close(phb);
+                return phb_free(phb, FALSE);
         }
 
@@ -328 +336 @@
         packet[8] = 0;
         if (write(source, packet, 9) != 9) {
-                return phb_close(phb);
+                return phb_free(phb, FALSE);
         }
 
@@ -335 +343 @@
 
                 if (write(source, phb->host, host_len) != host_len) {
-                        return phb_close(phb);
+                        return phb_free(phb, FALSE);
                 }
         }
@@ -365 +373 @@
 
         if (read(source, buf, 10) < 10) {
-                return phb_close(phb);
+                return phb_free(phb, FALSE);
         }
         if ((buf[0] != 0x05) || (buf[1] != 0x00)) {
-                return phb_close(phb);
+                return phb_free(phb, FALSE);
         }
 
         phb->func(phb->data, source, B_EV_IO_READ);
-        g_free(phb->host);
-        g_free(phb);
-
-        return FALSE;
+        return phb_free(phb, TRUE);
 }
 
@@ -394 +399 @@
 
         if (write(source, buf, (5 + strlen(phb->host) + 2)) < (5 + strlen(phb->host) + 2)) {
-                phb_close(phb);
+                phb_free(phb, FALSE);
                 return;
         }
@@ -409 +414 @@
 
         if (read(source, buf, 2) < 2) {
-                return phb_close(phb);
+                return phb_free(phb, FALSE);
         }
 
         if ((buf[0] != 0x01) || (buf[1] != 0x00)) {
-                return phb_close(phb);
+                return phb_free(phb, FALSE);
         }
 
@@ -429 +434 @@
 
         if (read(source, buf, 2) < 2) {
-                return phb_close(phb);
+                return phb_free(phb, FALSE);
         }
 
         if ((buf[0] != 0x05) || (buf[1] == 0xff)) {
-                return phb_close(phb);
+                return phb_free(phb, FALSE);
         }
 
@@ -444 +449 @@
                 memcpy(buf + 2 + i + 1, proxypass, j);
                 if (write(source, buf, 3 + i + j) < 3 + i + j) {
-                        return phb_close(phb);
+                        return phb_free(phb, FALSE);
                 }
 
@@ -468 +473 @@
         len = sizeof(error);
         if (getsockopt(source, SOL_SOCKET, SO_ERROR, &error, &len) < 0) {
-                return phb_close(phb);
+                return phb_free(phb, FALSE);
         }
         sock_make_blocking(source);
@@ -486 +491 @@
 
         if (write(source, buf, i) < i) {
-                return phb_close(phb);
+                return phb_free(phb, FALSE);
         }