Changes in lib/proxy.c [242f280:dbca297]

File:

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

lib/proxy.c

@@ -87 +87 @@
 }
 
-/* calls phb->func safely by ensuring that the phb struct doesn't exist in the
- * case that proxy_disconnect() is called down there */
-static gboolean phb_connected(struct PHB *phb, gint source)
-{
-        /* save func and data here */
-        b_event_handler func = phb->func;
-        gpointer data = phb->data;
-
-        /* free the struct so that it can't be freed by the callback */
-        phb_free(phb, TRUE);
-
-        /* if any proxy_disconnect() call happens here, it will use the
-         * fd (still open), look it up in the hash table, get NULL, and
-         * proceed to close the fd and do nothing else */
-        func(data, source, B_EV_IO_READ);
-
-        return FALSE;
-}
-
 static gboolean proxy_connected(gpointer data, gint source, b_input_condition cond)
 {
@@ -144 +125 @@
                 phb->proxy_func(phb->proxy_data, source, B_EV_IO_READ);
         } else {
-                phb_connected(phb, source);
+                phb->func(phb->data, source, B_EV_IO_READ);
+                phb_free(phb, TRUE);
         }
 
@@ -240 +222 @@
         if ((memcmp(HTTP_GOODSTRING, inputline, strlen(HTTP_GOODSTRING)) == 0) ||
             (memcmp(HTTP_GOODSTRING2, inputline, strlen(HTTP_GOODSTRING2)) == 0)) {
-                return phb_connected(phb, source);
+                phb->func(phb->data, source, B_EV_IO_READ);
+                return phb_free(phb, TRUE);
         }
 
@@ -312 +295 @@
         memset(packet, 0, sizeof(packet));
         if (read(source, packet, 9) >= 4 && packet[1] == 90) {
-                return phb_connected(phb, source);
+                phb->func(phb->data, source, B_EV_IO_READ);
+                return phb_free(phb, TRUE);
         }
 
@@ -400 +384 @@
         }
 
-        return phb_connected(phb, source);
+        phb->func(phb->data, source, B_EV_IO_READ);
+        return phb_free(phb, TRUE);
 }