From 495664805304ec7532f4ae58e50299eb415079c8 Mon Sep 17 00:00:00 2001 From: Nicolas Vazquez Date: Fri, 17 Feb 2023 07:13:46 -0300 Subject: [PATCH] Fix console proxy on XCPng/Xen (#7243) --- .../src/main/java/com/cloud/consoleproxy/vnc/NoVncClient.java | 3 ++- .../src/main/java/com/cloud/consoleproxy/vnc/RfbConstants.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/NoVncClient.java b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/NoVncClient.java index 991a56415fa..c8318de1e35 100644 --- a/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/NoVncClient.java +++ b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/NoVncClient.java @@ -155,7 +155,8 @@ public class NoVncClient { } // Proxy that we support RFB 3.3 only - return RfbConstants.RFB_PROTOCOL_VERSION + "\n"; + return String.format("%s%s\n", RfbConstants.RFB_PROTOCOL_VERSION_MAJOR, + RfbConstants.VNC_PROTOCOL_VERSION_MINOR_TUNNEL); } /** diff --git a/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/RfbConstants.java b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/RfbConstants.java index 3e44ce7d1a6..85442a4d6a5 100644 --- a/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/RfbConstants.java +++ b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/RfbConstants.java @@ -21,8 +21,8 @@ import java.nio.charset.Charset; public interface RfbConstants { public static final String RFB_PROTOCOL_VERSION_MAJOR = "RFB 003."; - // public static final String VNC_PROTOCOL_VERSION_MINOR = "003"; public static final String VNC_PROTOCOL_VERSION_MINOR = "008"; + public static final String VNC_PROTOCOL_VERSION_MINOR_TUNNEL = "003"; public static final String RFB_PROTOCOL_VERSION = RFB_PROTOCOL_VERSION_MAJOR + VNC_PROTOCOL_VERSION_MINOR; /**