[svn] Repair operspy who !#channel, broken by me in r3283.

[irc/rqf/shadowircd.git] / libcharybdis / commio.c

diff --git a/libcharybdis/commio.c b/libcharybdis/commio.c
index 4b397e1e6b055ee856a3dc6fda018a72446cfd8a..2985fc2f001320bd3ac786300ca96f96b146329c 100644 (file)
--- a/libcharybdis/commio.c
+++ b/libcharybdis/commio.c
@@ -21,7 +21,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: commio.c 3237 2007-03-05 17:35:17Z nenolod $
+ *  $Id: commio.c 3247 2007-03-05 18:42:24Z nenolod $
  */
 
 #include "libcharybdis.h"
@@ -740,7 +740,7 @@ fdlist_update_biggest(int fd, int opening)
         * re-opening it
         */
        s_assert(!opening);
-       while (highest_fd >= 0 && comm_locate_fd(fd)->flags.open) /* XXX */
+       while (highest_fd >= 0 && comm_locate_fd(fd) != NULL)
                highest_fd--;
 }
 
@@ -801,6 +801,7 @@ comm_close(int fd)
        }
        comm_setselect(F->fd, FDLIST_NONE, COMM_SELECT_WRITE | COMM_SELECT_READ, NULL, NULL, 0);
        comm_setflush(F->fd, 0, NULL, NULL);
+       F->timeout = 0;
        
        if (F->dns_query != NULL)
        {
@@ -814,7 +815,6 @@ comm_close(int fd)
        number_fd--;
        comm_remove_fd(fd);
 
-       F->timeout = 0;
        /* Unlike squid, we're actually closing the FD here! -- adrian */
        close(fd);
 }