From: Oliver Kurth <okurth@vmware.com>
Date: Wed, 4 Mar 2020 20:07:12 +0000 (-0800)
Subject: Common source file changes not directly applicable to open-vm-tools.
X-Git-Tag: stable-11.1.0~53
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=042d34dbc9b4e8932a71fb1be9341aa5bb70f2f0;p=thirdparty%2Fopen-vm-tools.git

Common source file changes not directly applicable to open-vm-tools.

Add a new error ASOCKERR_WEBSOCK_UPGRADE_NOT_FOUND in asyncsocket
---

diff --git a/open-vm-tools/lib/asyncsocket/asyncSocketBase.c b/open-vm-tools/lib/asyncsocket/asyncSocketBase.c
index 6298489e9..d214e9e11 100644
--- a/open-vm-tools/lib/asyncsocket/asyncSocketBase.c
+++ b/open-vm-tools/lib/asyncsocket/asyncSocketBase.c
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 2016-2019 VMware, Inc. All rights reserved.
+ * Copyright (C) 2016-2020 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
@@ -788,6 +788,10 @@ AsyncSocket_MsgError(int asyncSockError)   // IN
       result = MSGID(asyncsocket.proxyconnectfailed)
                      "Connection failed through proxy";
       break;
+   case ASOCKERR_WEBSOCK_UPGRADE_NOT_FOUND:
+      result = MSGID(asyncsocket.websocketupgradefailed)
+                     "Upgrade to websocket error: NOT FOUND, status code 404";
+      break;
    }
 
    if (!result) {
diff --git a/open-vm-tools/lib/include/asyncsocket.h b/open-vm-tools/lib/include/asyncsocket.h
index 11b8c70d2..299118857 100644
--- a/open-vm-tools/lib/include/asyncsocket.h
+++ b/open-vm-tools/lib/include/asyncsocket.h
@@ -83,6 +83,7 @@ extern "C" {
 #define ASOCKERR_BUSY              16
 #define ASOCKERR_PROXY_NEEDS_AUTHENTICATION 17
 #define ASOCKERR_PROXY_CONNECT_FAILED       18
+#define ASOCKERR_WEBSOCK_UPGRADE_NOT_FOUND  19
 
 /*
  * Cross-platform codes for AsyncSocket_GetGenericError():