* generic/udp_tcl.c: Deal with bug #1178996 by changing the code

	used to cleanup sockets under Windows.

diff --git a/ChangeLog b/ChangeLog
index b7e61fb6f9c4303eaa2b1386ece06d7b87a5b057..b1c3496c56e9055466616df3fecc2a25fdee5902 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-19  Pat Thoyts  <patthoyts@users.sourceforge.net>
+
+       * generic/udp_tcl.c: Deal with bug #1178996 by changing the code
+       used to cleanup sockets under Windows.
+
 2005-05-17  Pat Thoyts  <patthoyts@users.sourceforge.net>
 
        * win/rules.vc: Applied patch 1092432 by westrick85 to handle

diff --git a/generic/udp_tcl.c b/generic/udp_tcl.c
index d76d20ac608c00bfb76c948b7e615b5ba7450864..e42773163f26faf02bb8e00658725696c4803db1 100644 (file)
--- a/generic/udp_tcl.c
+++ b/generic/udp_tcl.c
@@ -99,7 +99,6 @@ static HANDLE waitForSock;
 static HANDLE waitSockRead;
 static HANDLE sockListLock;
 static UdpState *sockList;
-static UdpState *sockTail;
 
 #endif /* ! WIN32 */
 
@@ -284,15 +283,10 @@ udpOpen(ClientData clientData, Tcl_Interp *interp,
     Tcl_AppendResult(interp, channelName, (char *)NULL);
 #ifdef WIN32
     WaitForSingleObject(sockListLock, INFINITE);
-    if (sockList == NULL) {
-        sockList = statePtr;
-        sockTail = statePtr;
-    } else {
-        sockTail->next = statePtr;
-        sockTail = statePtr;
-    }
+    statePtr->next = sockList;
+    sockList = statePtr;
 
-    UDPTRACE("Append %d to sockList\n", statePtr->sock);
+    UDPTRACE("Added %d to sockList\n", statePtr->sock);
     SetEvent(sockListLock);
     SetEvent(waitForSock);
 #endif
@@ -490,7 +484,7 @@ UDP_SetupProc(ClientData data, int flags)
     UdpState *statePtr;
     Tcl_Time blockTime = { 0, 0 };
     
-    UDPTRACE("setupProc\n");
+    /* UDPTRACE("setupProc\n"); */
     
     if (!(flags & TCL_FILE_EVENTS)) {
         return;
@@ -529,7 +523,7 @@ UDP_CheckProc(ClientData data, int flags)
 #endif
     PacketList *p;
     
-    UDPTRACE("checkProc\n");
+    /* UDPTRACE("checkProc\n"); */
     
     /* synchronized */
     WaitForSingleObject(sockListLock, INFINITE);
@@ -750,7 +744,6 @@ Udp_WinHasSockets(Tcl_Interp *interp)
          */
         
         sockList = NULL;
-        sockTail = NULL;
         waitForSock = CreateEvent(NULL, FALSE, FALSE, NULL);
         waitSockRead = CreateEvent(NULL, FALSE, FALSE, NULL);
         sockListLock = CreateEvent(NULL, FALSE, TRUE, NULL);
@@ -799,7 +792,7 @@ udpClose(ClientData instanceData, Tcl_Interp *interp)
     Tcl_Obj **objv;
     UdpState *statePtr = (UdpState *) instanceData;
 #ifdef WIN32
-    UdpState *statePre, *searchPtr;
+    UdpState *tmp, *p;
     
     WaitForSingleObject(sockListLock, INFINITE);
 #endif /* ! WIN32 */
@@ -807,21 +800,19 @@ udpClose(ClientData instanceData, Tcl_Interp *interp)
     sock = statePtr->sock;
 
 #ifdef WIN32
+
     /* remove the statePtr from the list */
-    for (searchPtr = sockList, statePre = sockList;
-         searchPtr != NULL;
-         statePre=statePtr, searchPtr=searchPtr->next) {
-        if (searchPtr->sock == sock) {
-            UDPTRACE("Remove %d from the list\n", sock);
-            if (searchPtr == sockList) {
-                sockList = sockList->next;
-            } else {
-                statePre->next = searchPtr->next;
-                if (sockTail == searchPtr)
-                    sockTail = statePre;
-            }
-        }
+    for (tmp = p = sockList; p != NULL; tmp = p, p = p->next) {
+       if (p->sock == sock) {
+            UDPTRACE("Remove %d from the list\n", p->sock);
+           if (p == sockList) {
+               sockList = sockList->next;
+           } else {
+               tmp->next = p->next;
+           }
+       }
     }
+
 #endif /* ! WIN32 */
 
     /*