From: John Wolfe <jwolfe@vmware.com>
Date: Mon, 19 Apr 2021 18:08:11 +0000 (-0700)
Subject: Common source file change not applicable to open-vm-tools.
X-Git-Tag: stable-11.3.0~51
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=48c0a778d94c99ebb0e51a284aa8ea1f6a8d6338;p=thirdparty%2Fopen-vm-tools.git

Common source file change not applicable to open-vm-tools.
---

diff --git a/open-vm-tools/lib/asyncsocket/asyncsocket.c b/open-vm-tools/lib/asyncsocket/asyncsocket.c
index c29d0c026..e413961e2 100644
--- a/open-vm-tools/lib/asyncsocket/asyncsocket.c
+++ b/open-vm-tools/lib/asyncsocket/asyncsocket.c
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 2003-2020 VMware, Inc. All rights reserved.
+ * Copyright (C) 2003-2021 VMware, Inc. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as published
@@ -2010,14 +2010,14 @@ AsyncTCPSocketConnectErrorCheck(void *data)  // IN: AsyncTCPSocket *
                  Err_Errno2String(asock->genericErrno));
       /* Remove connect callback. */
       removed = AsyncTCPSocketPollRemove(asock, TRUE, POLL_FLAG_WRITE,
-                                      asock->internalConnectFn);
+                                         asock->internalConnectFn);
       ASSERT(removed);
       func = asock->internalConnectFn;
    }
 
    /* Remove this callback. */
    removed = AsyncTCPSocketPollRemove(asock, FALSE, POLL_FLAG_PERIODIC,
-                                   AsyncTCPSocketConnectErrorCheck);
+                                      AsyncTCPSocketConnectErrorCheck);
    ASSERT(removed);
    asock->internalConnectFn = NULL;
 
@@ -5181,6 +5181,14 @@ AsyncTCPSocketConnectCallback(void *clientData)         // IN
              retval == ASOCKERR_CONNECT);
       AsyncTCPSocketHandleError(asock, retval);
    }
+   if (vmx86_win32 && asock->internalConnectFn != NULL) {
+      Bool removed;
+
+      removed = AsyncTCPSocketPollRemove(asock, FALSE, POLL_FLAG_PERIODIC,
+                                         AsyncTCPSocketConnectErrorCheck);
+      ASSERT(removed);
+      asock->internalConnectFn = NULL;
+   }
    AsyncTCPSocketRelease(asock);
 }