From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:56187) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S2PwT-0004Qu-G1 for qemu-devel@nongnu.org; Tue, 28 Feb 2012 11:30:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S2PwL-0003h8-NK for qemu-devel@nongnu.org; Tue, 28 Feb 2012 11:30:21 -0500 Received: from mx1.redhat.com ([209.132.183.28]:17591) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S2PwL-0003gk-FH for qemu-devel@nongnu.org; Tue, 28 Feb 2012 11:30:13 -0500 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q1SGUCfK023220 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 28 Feb 2012 11:30:12 -0500 From: Gerd Hoffmann Date: Tue, 28 Feb 2012 17:30:01 +0100 Message-Id: <1330446602-10743-11-git-send-email-kraxel@redhat.com> In-Reply-To: <1330446602-10743-1-git-send-email-kraxel@redhat.com> References: <1330446602-10743-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 10/11] Error out when tls-channel option is used without TLS List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann , Christophe Fergeau From: Christophe Fergeau It's currently possible to setup spice channels using TLS when no TLS port has been specified (ie TLS is disabled). This cannot work, so better to error out in such a situation. Signed-off-by: Gerd Hoffmann --- ui/spice-core.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/ui/spice-core.c b/ui/spice-core.c index e761813..c1091e1 100644 --- a/ui/spice-core.c +++ b/ui/spice-core.c @@ -511,6 +511,12 @@ static int add_channel(const char *name, const char *value, void *opaque) int rc; if (strcmp(name, "tls-channel") == 0) { + int *tls_port = opaque; + if (!*tls_port) { + error_report("spice: tried to setup tls-channel" + " without specifying a TLS port"); + exit(1); + } security = SPICE_CHANNEL_SECURITY_SSL; } if (strcmp(name, "plaintext-channel") == 0) { @@ -680,7 +686,7 @@ void qemu_spice_init(void) spice_server_set_playback_compression (spice_server, qemu_opt_get_bool(opts, "playback-compression", 1)); - qemu_opt_foreach(opts, add_channel, NULL, 0); + qemu_opt_foreach(opts, add_channel, &tls_port, 0); if (0 != spice_server_init(spice_server, &core_interface)) { error_report("failed to initialize spice server"); -- 1.7.1