Changeset 3f199fc

Timestamp:

2006-05-13T23:28:31Z (19 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

df70eafa

Parents:

0356ae3

Message:

Added a closesocket() that properly removes event handlers before closing a socket.

Files:

• protocols/events.h (modified) (1 diff)
• protocols/events_libevent.c (modified) (2 diffs)
• sock.h (modified) (1 diff)

protocols/events.h

@@ -61 +61 @@
 G_MODULE_EXPORT gboolean b_event_remove_by_data(gpointer data);
 
+#ifdef EVENTS_LIBEVENT
+G_MODULE_EXPORT void closesocket(int fd);
+#endif
+
 #endif /* _EVENTS_H_ */

protocols/events_libevent.c

@@ -30 +30 @@
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 #include <sys/types.h>
 #include "proxy.h"
@@ -217 +218 @@
         return FALSE;
 }
+
+void closesocket( int fd )
+{
+        struct b_event_data *b_ev;
+        
+        /* Since epoll() (the main reason we use libevent) automatically removes sockets from
+           the epoll() list when a socket gets closed and some modules have a habit of
+           closing sockets before removing event handlers, our and libevent's administration
+           get a little bit messed up. So this little function will remove the handlers
+           properly before closing a socket. */
+        
+        if( ( b_ev = g_hash_table_lookup( read_hash, &fd ) ) || ( b_ev = g_hash_table_lookup( write_hash, &fd ) ) )
+                b_event_remove( b_ev->id );
+        
+        close( fd );
+}

sock.h

@@ -18 +18 @@
 #define sock_make_blocking(fd) fcntl(fd, F_SETFL, 0)
 #define sockerr_again() (errno == EINPROGRESS || errno == EINTR)
+#ifndef EVENTS_LIBEVENT
 #define closesocket(a) close(a)
+#endif
 #else
 # include <winsock2.h>