Changeset 4e365ce

Timestamp:

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

Author:

dequis <dx@…>

Branches:

master

Children:

0db6618

Parents:

f710673

git-author:

dequis <dx@…> (25-10-15 04:06:22)

git-committer:

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

Message:

Add proxy_disconnect() to interrupt possibly pending connections

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

This function can be used as a safe drop-in replacement to closesocket()

If a proxy connection is pending (connected callback still not called),
it looks up the PHB in a hash table indexed by fd. If it is there, it
closes, frees the phb and avoids further calls to the callback.
If it is not in there, it just does closesocket()

Location:

lib

Files:

• proxy.c (modified) (5 diffs)
• proxy.h (modified) (1 diff)

lib/proxy.c

@@ -51 +51 @@
 #endif
 
+static GHashTable *phb_hash = NULL;
+
 struct PHB {
         b_event_handler func, proxy_func;
@@ -67 +69 @@
 static gboolean phb_free(struct PHB *phb, gboolean success)
 {
+        g_hash_table_remove(phb_hash, &phb->fd);
+
         if (!success) {
                 if (phb->fd > 0) {
@@ -100 +104 @@
                                 dup2(new_fd, source);
                                 closesocket(new_fd);
+                                phb->fd = source;
                                 phb->inpa = b_input_add(source, B_EV_IO_WRITE, proxy_connected, phb);
                                 return FALSE;
@@ -523 +528 @@
         struct PHB *phb;
         proxy_connect_func fun;
+        int fd;
+
+        if (!phb_hash) {
+                phb_hash = g_hash_table_new(g_int_hash, g_int_equal);
+        }
 
         if (!host || port <= 0 || !func || strlen(host) > 128) {
@@ -538 +548 @@
         }
 
-        return fun(host, port, phb);
-}
+        fd = fun(host, port, phb);
+
+        if (fd != -1) {
+                g_hash_table_insert(phb_hash, &phb->fd, phb);
+        }
+
+        return fd;
+}
+
+void proxy_disconnect(int fd)
+{
+        struct PHB *phb = g_hash_table_lookup(phb_hash, &fd);
+
+        if (!phb) {
+                /* not in the early part of the connection - just close the fd */
+                closesocket(fd);
+                return;
+        }
+
+        if (phb->inpa) {
+                b_event_remove(phb->inpa);
+                phb->inpa = 0;
+        }
+
+        /* avoid calling the callback, which might result in double-free */
+        phb->func = NULL;
+
+        /* close and free */
+        phb_free(phb, FALSE);
+}

lib/proxy.h

@@ -49 +49 @@
 
 G_MODULE_EXPORT int proxy_connect(const char *host, int port, b_event_handler func, gpointer data);
+G_MODULE_EXPORT void proxy_disconnect(int fd);
 
 #endif /* _PROXY_H_ */