rfbProcessEvents() has to iterate also over clients with sock < 0 to close them

ChangeLog

@@ -1,3 +1,8 @@
+2006-01-10  Johannes E. Schindelin  <Johannes.Schindelin@gmx.de>
+	* libvncserver/{main.c,rfbserver.c}: fix timely closing of clients;
+	  the client iterator in rfbProcessEvents() has to iterate also
+	  over clients whose sock < 0. Noticed by Karl.
+
 2006-01-08  Karl Runge <runge@karlrunge.com>
 	* x11vnc: the big split. (and -afteraccept and -passwdfile read:..)
 	* examples/pnmshow24.c: fix typo.

libvncserver/main.c

@@ -904,6 +904,8 @@ rfbProcessEvents(rfbScreenInfoPtr screen,long usec)
   rfbClientPtr cl,clPrev;
   struct timeval tv;
   rfbBool result=FALSE;
+  extern rfbClientIteratorPtr
+    rfbGetClientIteratorWithClosed(rfbScreenInfoPtr rfbScreen);
 
   if(usec<0)
     usec=screen->deferUpdateTime*1000;
@@ -914,7 +916,7 @@ rfbProcessEvents(rfbScreenInfoPtr screen,long usec)
   corbaCheckFds(screen);
 #endif
 
-  i = rfbGetClientIterator(screen);
+  i = rfbGetClientIteratorWithClosed(screen);
   cl=rfbClientIteratorHead(i);
   while(cl) {
     if (cl->sock >= 0 && !cl->onHold && FB_UPDATE_PENDING(cl) &&

libvncserver/rfbserver.c

@@ -98,6 +98,7 @@ static MUTEX(rfbClientListMutex);
 struct rfbClientIterator {
   rfbClientPtr next;
   rfbScreenInfoPtr screen;
+  rfbBool closedToo;
 };
 
 void
@@ -120,6 +121,18 @@ rfbGetClientIterator(rfbScreenInfoPtr rfbScreen)
     (rfbClientIteratorPtr)malloc(sizeof(struct rfbClientIterator));
   i->next = NULL;
   i->screen = rfbScreen;
+  i->closedToo = FALSE;
+  return i;
+}
+
+rfbClientIteratorPtr
+rfbGetClientIteratorWithClosed(rfbScreenInfoPtr rfbScreen)
+{
+  rfbClientIteratorPtr i =
+    (rfbClientIteratorPtr)malloc(sizeof(struct rfbClientIterator));
+  i->next = NULL;
+  i->screen = rfbScreen;
+  i->closedToo = TRUE;
   return i;
 }
 
@@ -152,8 +165,9 @@ rfbClientIteratorNext(rfbClientIteratorPtr i)
   }
 
 #ifdef LIBVNCSERVER_HAVE_LIBPTHREAD
-    while(i->next && i->next->sock<0)
-      i->next = i->next->next;
+    if(!i->closedToo)
+      while(i->next && i->next->sock<0)
+        i->next = i->next->next;
     if(i->next)
       rfbIncrClientRef(i->next);
 #endif