Fixes for some errors in the Win32 code in udpClose provided in patch #820255.

diff --git a/ChangeLog b/ChangeLog
index 4d795a476a1d91cce7d47067cb9a83c0a6ef209d..0610340568077eb9d498702d66b4c015f09f32ec 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-02-09  Pat Thoyts  <patthoyts@users.sourceforge.net>
 
+       * generic/udp_tcl.c: Fixes for some errors in the Win32 code
+       in udpClose provided in patch #820255.
+
        * all:        INCREMENTED VERSION TO 1.0.6
 
        * generic/udp_tcl.c: Applied fix from bug #833700 to close a

diff --git a/generic/udp_tcl.c b/generic/udp_tcl.c
index e06e890cde65fe6920783c756c68ef8acd5e58bd..fe3ce65e2a0f9203dc9510626dec80083f696f59 100644 (file)
--- a/generic/udp_tcl.c
+++ b/generic/udp_tcl.c
@@ -151,6 +151,8 @@ Udp_Init(Tcl_Interp *interp)
     Tcl_CreateCommand(interp, "udp_peek", udpPeek , 
                       (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
     
+    Tcl_CreateEventSource(UDP_SetupProc, UDP_CheckProc, NULL);
+
     r = Tcl_PkgProvide(interp, TCLUDP_PACKAGE_NAME, TCLUDP_PACKAGE_VERSION);
     return r;
 }
@@ -206,27 +208,6 @@ udpOpen(ClientData clientData, Tcl_Interp *interp,
     unsigned long status = 1;
     int len;
     
-    /*
-     *    Tcl_ChannelType *Udp_ChannelType;
-     *    Udp_ChannelType = (Tcl_ChannelType *) ckalloc((unsigned) sizeof(Tcl_ChannelType));
-     *    memset(Udp_ChannelType, 0, sizeof(Tcl_ChannelType));
-     * #ifdef SIPC_IPV6
-     *    Udp_ChannelType->typeName = strdup("udp6");
-     *#else 
-     *    Udp_ChannelType->typeName = strdup("udp");
-     *#endif
-     *    Udp_ChannelType->blockModeProc = NULL;
-     *    Udp_ChannelType->closeProc = udpClose;
-     *    Udp_ChannelType->inputProc = udpInput;
-     *    Udp_ChannelType->outputProc = udpOutput;
-     *    Udp_ChannelType->seekProc = NULL;
-     *    Udp_ChannelType->setOptionProc = udpSetOption;
-     *    Udp_ChannelType->getOptionProc = udpGetOption;
-     *    Udp_ChannelType->watchProc = udpWatch;
-     *    Udp_ChannelType->getHandleProc = udpGetHandle;
-     *    Udp_ChannelType->close2Proc = NULL;
-     */
-
     if (argc >= 2) {
         if (udpGetService(interp, argv[1], &localport) != TCL_OK)
             return TCL_ERROR;
@@ -292,7 +273,6 @@ udpOpen(ClientData clientData, Tcl_Interp *interp,
     statePtr->next = NULL;
     statePtr->packets = NULL;
     statePtr->packetsTail = NULL;
-    Tcl_CreateEventSource(UDP_SetupProc, UDP_CheckProc, NULL);
 #endif
     /* Tcl_SetChannelOption(interp, statePtr->channel, "-blocking", "0"); */
     Tcl_AppendResult(interp, channelName, (char *)NULL);
@@ -829,35 +809,36 @@ udpClose(ClientData instanceData, Tcl_Interp *interp)
     int errorCode = 0;
     UdpState *statePtr = (UdpState *) instanceData;
 #ifdef WIN32
-    UdpState *statePre;
+    UdpState *statePre, *searchPtr;
     
     WaitForSingleObject(sockListLock, INFINITE);
 #endif /* ! WIN32 */
     
     sock = statePtr->sock;
-    
+
 #ifdef WIN32
     /* remove the statePtr from the list */
-    for (statePtr = sockList, statePre = sockList;
-         statePtr != NULL;
-         statePre=statePtr, statePtr=statePtr->next) {
-        if (statePtr->sock == sock) {
+    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 (statePtr == sockList) {
-                sockList = statePtr->next;
+            if (searchPtr == sockList) {
+                sockList = sockList->next;
             } else {
-                statePre->next = statePtr->next;
-                if (sockTail == statePtr)
+                statePre->next = searchPtr->next;
+                if (sockTail == searchPtr)
                     sockTail = statePre;
             }
         }
     }
 #endif /* ! WIN32 */
     
-    ckfree((char *) statePtr);
+    Tcl_UnregisterChannel(interp, statePtr->channel);
     if (closesocket(sock) < 0) {
         errorCode = errno;
     }
+    ckfree((char *) statePtr);
     if (errorCode != 0) {
 #ifndef WIN32
         sprintf(errBuf, "udpClose: %d, error: %d\n", sock, errorCode);