From 0147d878a54556a6d371fedb843ea2b27c31844c Mon Sep 17 00:00:00 2001
From: Likitha Shetty <likitha.shetty@citrix.com>
Date: Thu, 19 Apr 2012 14:18:02 +0530
Subject: [PATCH] Revert "CS-14546: Fixed bug Unable to view console in System
 and Guest VMs"

This reverts commit 5465edf02f04e598d5924ceced4b054b137510f4.
---
 .../vm/hypervisor/xenserver/upgrade_script.sh |  7 ----
 .../cloud/servlet/ConsoleProxyServlet.java    | 36 +++----------------
 2 files changed, 5 insertions(+), 38 deletions(-)
 delete mode 100644 scripts/vm/hypervisor/xenserver/upgrade_script.sh

diff --git a/scripts/vm/hypervisor/xenserver/upgrade_script.sh b/scripts/vm/hypervisor/xenserver/upgrade_script.sh
deleted file mode 100644
index 533bdaadd1a..00000000000
--- a/scripts/vm/hypervisor/xenserver/upgrade_script.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#removing iptables entry for vnc ports
-iptables -D RH-Firewall-1-INPUT -p tcp -m tcp --dport 5900:6099 -j ACCEPT 2>&1
-
-# remove listening vnc on all interface
-sed -i 's/0\.0\.0\.0/127\.0\.0\.1/' /opt/xensource/libexec/vncterm-wrapper 2>&1
-sed -i 's/0\.0\.0\.0/127\.0\.0\.1/' /opt/xensource/libexec/qemu-dm-wrapper 2>&1
-
diff --git a/server/src/com/cloud/servlet/ConsoleProxyServlet.java b/server/src/com/cloud/servlet/ConsoleProxyServlet.java
index 0362a2cf70b..007be540415 100644
--- a/server/src/com/cloud/servlet/ConsoleProxyServlet.java
+++ b/server/src/com/cloud/servlet/ConsoleProxyServlet.java
@@ -13,8 +13,6 @@
 package com.cloud.servlet;
 
 import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
 import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -317,8 +315,6 @@ public class ConsoleProxyServlet extends HttpServlet {
 		String tag = String.valueOf(vm.getId());
 		tag = _identityService.getIdentityUuid("vm_instance", tag);
 		String ticket = genAccessTicket(host, String.valueOf(portInfo.second()), sid, tag);
-		String consoleurl = null;
-		String sessionref= null;
 		
 		sb.append("/getscreen?host=").append(parsedHostInfo.first());
 		sb.append("&port=").append(portInfo.second());
@@ -326,20 +322,10 @@ public class ConsoleProxyServlet extends HttpServlet {
 		sb.append("&w=").append(w).append("&h=").append(h);
 		sb.append("&tag=").append(tag);
 		sb.append("&ticket=").append(ticket);
-		
+
 		if(parsedHostInfo.second() != null  && parsedHostInfo.third() != null) {
-			
-			try {
-				
-				consoleurl = URLEncoder.encode(parsedHostInfo.second(), "UTF-8");
-				sessionref = URLEncoder.encode(parsedHostInfo.third(), "UTF-8");
-				sb.append("&").append("consoleurl=").append(URLDecoder.decode(consoleurl, "UTF-8"));
-				sb.append("&").append("sessionref=").append(URLDecoder.decode(sessionref, "UTF-8"));
-				
-			} catch (UnsupportedEncodingException e) {
-				s_logger.error("Unexpected exception ", e);
-			}
-			
+			sb.append("&").append("consoleurl=").append(URLEncoder.encode(parsedHostInfo.second()));
+			sb.append("&").append("sessionref=").append(URLEncoder.encode(parsedHostInfo.third()));
 		}
 		
 		if(s_logger.isDebugEnabled()) {
@@ -362,8 +348,6 @@ public class ConsoleProxyServlet extends HttpServlet {
 		String tag = String.valueOf(vm.getId());
 		tag = _identityService.getIdentityUuid("vm_instance", tag);
 		String ticket = genAccessTicket(host, String.valueOf(portInfo.second()), sid, tag);
-		String consoleurl = null;
-		String sessionref= null;
 		
 		sb.append("/ajax?host=").append(parsedHostInfo.first());
 		sb.append("&port=").append(portInfo.second());
@@ -372,18 +356,8 @@ public class ConsoleProxyServlet extends HttpServlet {
 		sb.append("&ticket=").append(ticket);
 		
 		if(parsedHostInfo.second() != null  && parsedHostInfo.third() != null) {
-			
-			try {
-				
-				consoleurl = URLEncoder.encode(parsedHostInfo.second(), "UTF-8");
-				sessionref = URLEncoder.encode(parsedHostInfo.third(), "UTF-8");
-				sb.append("&").append("consoleurl=").append(URLDecoder.decode(consoleurl, "UTF-8"));
-				sb.append("&").append("sessionref=").append(URLDecoder.decode(sessionref, "UTF-8"));
-				
-			} catch (UnsupportedEncodingException e) {
-				s_logger.error("Unexpected exception ", e);
-			}
-			
+			sb.append("&").append("consoleurl=").append(URLEncoder.encode(parsedHostInfo.second()));
+			sb.append("&").append("sessionref=").append(URLEncoder.encode(parsedHostInfo.third()));
 		}
 		
 		// for console access, we need guest OS type to help implement keyboard