From: John Wolfe <jwolfe@vmware.com>
Date: Mon, 7 Jun 2021 15:25:08 +0000 (-0700)
Subject: Common source file change not applicable to open-vm-tools.
X-Git-Tag: stable-12.0.0~190
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9ff3c61c5d5ab58922c55db77704bab56bac75d6;p=thirdparty%2Fopen-vm-tools.git

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

diff --git a/open-vm-tools/services/vmtoolsd/mainLoop.c b/open-vm-tools/services/vmtoolsd/mainLoop.c
index e68b908d1..119f974d6 100644
--- a/open-vm-tools/services/vmtoolsd/mainLoop.c
+++ b/open-vm-tools/services/vmtoolsd/mainLoop.c
@@ -62,6 +62,7 @@
 #if defined(_WIN32)
 #  include "codeset.h"
 #  include "toolsNotify.h"
+#  include "vsockets.h"
 #  include "windowsu.h"
 #else
 #  include "posix.h"
@@ -433,6 +434,16 @@ ToolsCoreResetSignalCb(gpointer src,          // IN
 static int
 ToolsCoreRunLoop(ToolsServiceState *state)
 {
+#if defined(_WIN32)
+   /*
+    * Verify VSockets are fully initialized before any real work.
+    * For example, this can be broken by OS upgrades, see PR 2743009.
+    */
+   if (state->mainService) {
+      VSockets_Initialized();
+   }
+#endif
+
    if (!ToolsCore_InitRpc(state)) {
       return 1;
    }