From: VMware, Inc <>
Date: Wed, 18 Sep 2013 03:17:44 +0000 (-0700)
Subject: Changes in shared code that don't affect open-vm-tools functionality.
X-Git-Tag: 2013.09.16-1328054~100
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d0acf1b782efc1477ae216979a6984531f13ce52;p=thirdparty%2Fopen-vm-tools.git

Changes in shared code that don't affect open-vm-tools functionality.

Signed-off-by: Dmitry Torokhov <dtor@vmware.com>
---

diff --git a/open-vm-tools/lib/asyncsocket/asyncSocketInt.h b/open-vm-tools/lib/asyncsocket/asyncSocketInt.h
index b637627a1..4bdd4afd0 100644
--- a/open-vm-tools/lib/asyncsocket/asyncSocketInt.h
+++ b/open-vm-tools/lib/asyncsocket/asyncSocketInt.h
@@ -218,6 +218,7 @@ struct AsyncSocket {
    struct {
       char *origin;
       char *host;
+      char *hostname;
       char *protocol;
       char *uri;
       char *cookie;
@@ -243,6 +244,7 @@ struct AsyncSocket {
       size_t hybiCurrentFrameSize;
       WebSocketHybiDecodeState hybiCurrentDecodeState;
       Bool useSSL;
+      Bool permitUnverifiedSSL;
       char *upgradeNonceBase64;
       rqContext *randomContext;
    } webSocket;
diff --git a/open-vm-tools/lib/include/asyncsocket.h b/open-vm-tools/lib/include/asyncsocket.h
index 6c4c2ba9b..c684d4dd8 100644
--- a/open-vm-tools/lib/include/asyncsocket.h
+++ b/open-vm-tools/lib/include/asyncsocket.h
@@ -289,6 +289,7 @@ AsyncSocket_ConnectNamedPipe(char *pipeName,
                              int *outError);
 #endif
 AsyncSocket *AsyncSocket_ConnectWebSocket(const char *url,
+                                          Bool permitUnverifiedSSL,
                                           const char *cookies,
                                           AsyncSocketConnectFn connectFn,
                                           void *clientData,