Merged branch 'master' of git://git.tokkee.org/sysdb.

[sysdb.git] / src / frontend / sock.c

diff --git a/src/frontend/sock.c b/src/frontend/sock.c
index aa7cab068b115d07d2008eceb78347b99c5c19cd..90aeab1406a6a6389f8ce083dbab72a624b4a936 100644 (file)
--- a/src/frontend/sock.c
+++ b/src/frontend/sock.c
@@ -25,6 +25,10 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#if HAVE_CONFIG_H
+#      include "config.h"
+#endif /* HAVE_CONFIG_H */
+
 #include "sysdb.h"
 #include "core/object.h"
 #include "frontend/connection-private.h"
@@ -270,6 +274,20 @@ listener_create(sdb_fe_socket_t *sock, const char *address)
        return listener;
 } /* listener_create */
 
+static void
+socket_clear(sdb_fe_socket_t *sock)
+{
+       size_t i;
+
+       assert(sock);
+       for (i = 0; i < sock->listeners_num; ++i)
+               listener_destroy(sock->listeners + i);
+       if (sock->listeners)
+               free(sock->listeners);
+       sock->listeners = NULL;
+       sock->listeners_num = 0;
+} /* socket_clear */
+
 static void
 socket_close(sdb_fe_socket_t *sock)
 {
@@ -377,9 +395,14 @@ socket_handle_incoming(sdb_fe_socket_t *sock,
        while (sdb_llist_iter_has_next(iter)) {
                sdb_object_t *obj = sdb_llist_iter_get_next(iter);
 
-               if (FD_ISSET(CONN(obj)->fd, exceptions))
+               if (FD_ISSET(CONN(obj)->fd, exceptions)) {
                        sdb_log(SDB_LOG_INFO, "Exception on fd %d",
                                        CONN(obj)->fd);
+                       /* close the connection */
+                       sdb_llist_iter_remove_current(iter);
+                       sdb_object_deref(obj);
+                       continue;
+               }
 
                if (FD_ISSET(CONN(obj)->fd, ready)) {
                        sdb_llist_iter_remove_current(iter);
@@ -414,17 +437,10 @@ sdb_fe_sock_create(void)
 void
 sdb_fe_sock_destroy(sdb_fe_socket_t *sock)
 {
-       size_t i;
-
        if (! sock)
                return;
 
-       for (i = 0; i < sock->listeners_num; ++i) {
-               listener_destroy(sock->listeners + i);
-       }
-       if (sock->listeners)
-               free(sock->listeners);
-       sock->listeners = NULL;
+       socket_clear(sock);
 
        sdb_llist_destroy(sock->open_connections);
        sock->open_connections = NULL;
@@ -445,6 +461,15 @@ sdb_fe_sock_add_listener(sdb_fe_socket_t *sock, const char *address)
        return 0;
 } /* sdb_fe_sock_add_listener */
 
+void
+sdb_fe_sock_clear_listeners(sdb_fe_socket_t *sock)
+{
+       if (! sock)
+               return;
+
+       socket_clear(sock);
+} /* sdb_fe_sock_clear_listeners */
+
 int
 sdb_fe_sock_listen_and_serve(sdb_fe_socket_t *sock, sdb_fe_loop_t *loop)
 {
@@ -525,6 +550,13 @@ sdb_fe_sock_listen_and_serve(sdb_fe_socket_t *sock, sdb_fe_loop_t *loop)
 
                while (sdb_llist_iter_has_next(iter)) {
                        sdb_object_t *obj = sdb_llist_iter_get_next(iter);
+
+                       if (CONN(obj)->fd < 0) {
+                               sdb_llist_iter_remove_current(iter);
+                               sdb_object_deref(obj);
+                               continue;
+                       }
+
                        FD_SET(CONN(obj)->fd, &ready);
                        FD_SET(CONN(obj)->fd, &exceptions);