From 21ca0b49fc3c29bd7a2b3e9feada22d26092e1b4 Mon Sep 17 00:00:00 2001
From: Daniel Molina <dmolina@opennebula.org>
Date: Thu, 14 Nov 2013 17:31:25 +0100
Subject: [PATCH] feature #2454: Add ipv6 option to novnc

---
 src/sunstone/OpenNebulaVNC.rb         | 6 ++++++
 src/sunstone/etc/sunstone-server.conf | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/src/sunstone/OpenNebulaVNC.rb b/src/sunstone/OpenNebulaVNC.rb
index 15bd2c0061..2026cd0920 100644
--- a/src/sunstone/OpenNebulaVNC.rb
+++ b/src/sunstone/OpenNebulaVNC.rb
@@ -80,6 +80,8 @@ class OpenNebulaVNC
         @proxy_path   = File.join(SHARE_LOCATION, "websockify/websocketproxy.py")
         @proxy_port   = config[:vnc_proxy_port]
 
+        @proxy_ipv6   = config[:vnc_proxy_ipv6]
+
         @wss = config[:vnc_proxy_support_wss]
 
         @lock_file = NOVNC_LOCK_FILE
@@ -113,6 +115,10 @@ class OpenNebulaVNC
             proxy_options << " --ssl-only" if @wss == "only"
         end
 
+        if @proxy_ipv6
+            proxy_options << " -6"
+        end
+
         cmd ="python #{@proxy_path} #{proxy_options} #{@proxy_port}"
 
         begin
diff --git a/src/sunstone/etc/sunstone-server.conf b/src/sunstone/etc/sunstone-server.conf
index 26755ed0c2..ad8a4d05d1 100644
--- a/src/sunstone/etc/sunstone-server.conf
+++ b/src/sunstone/etc/sunstone-server.conf
@@ -81,10 +81,12 @@
 #                   supported.
 #   vnc_proxy_cert: Certificate to encrypt wss connections.
 #   vnc_proxy_key:  Key for wss connections. Only necessary if not included in cert.
+#   vnc_proxy_ipv6: Enable ipv6 support for novnc-server
 :vnc_proxy_port: 29876
 :vnc_proxy_support_wss: no
 :vnc_proxy_cert:
 :vnc_proxy_key:
+:vnc_proxy_ipv6: false
 
 
 # Default language setting