Merge branch '2.0.x'

Change-Id: Id31a80511f1a5f6ae9f832247b2c56b14f18a389

src/arch/win32/win32socketinterf.cpp

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2020 ACIN, Profactor GmbH, AIT, fortiss GmbH, OFFIS e.V.
+ * Copyright (c) 2010, 2021 ACIN, Profactor GmbH, AIT, fortiss GmbH, OFFIS e.V., HIT robot group
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0.
@@ -10,6 +10,7 @@
  *   Alois Zoitl, Ingo Hegny, Gerhard Ebenhofer, Thomas Strasser
  *     - initial API and implementation and/or initial documentation
  *  Jörg Walter - Windows XP compatibility
+ *  Zhao Xin - fix socket resource leakage
  *******************************************************************************/
 
 #include <sockhand.h>      //needs to be first pulls in the platform specific includes
@@ -88,6 +89,7 @@ CWin32SocketInterface::TSocketDescriptor CWin32SocketInterface::openTCPClientCon
       LPSTR pacErrorMessage = getErrorMessage(nLastError);
       DEVLOG_ERROR("CWin32SocketInterface: connect() failed: %d - %s\n", nLastError, pacErrorMessage);
       LocalFree(pacErrorMessage);
+      closeSocket(nSocket);
     }
     else{
       nRetVal = nSocket;

src/com/opc_ua/opcua_local_handler.cpp

@@ -98,7 +98,7 @@ void COPC_UA_Local_Handler::run() {
             timeToSleepMs = scmMinimumIterationWaitTime;
           }
 
-          mServerNeedsIteration.timedWait(static_cast<unsigned int>(timeToSleepMs));
+          mServerNeedsIteration.timedWait(static_cast<TForteUInt64>(timeToSleepMs) * 1E6);
         }
         retVal = UA_Server_run_shutdown(mUaServer);
         if(UA_STATUSCODE_GOOD == retVal) {