From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:51032) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S0yKW-0001vX-VZ for qemu-devel@nongnu.org; Fri, 24 Feb 2012 11:49:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S0yKS-00017U-Ns for qemu-devel@nongnu.org; Fri, 24 Feb 2012 11:49:12 -0500 Received: from mx1.redhat.com ([209.132.183.28]:27618) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S0yKS-00017Q-GA for qemu-devel@nongnu.org; Fri, 24 Feb 2012 11:49:08 -0500 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q1OGn7iH031250 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 24 Feb 2012 11:49:07 -0500 Message-ID: <4F47BF80.2020203@redhat.com> Date: Fri, 24 Feb 2012 17:49:04 +0100 From: Gerd Hoffmann MIME-Version: 1.0 References: <1330079874-5818-1-git-send-email-cfergeau@redhat.com> <1330079874-5818-2-git-send-email-cfergeau@redhat.com> In-Reply-To: <1330079874-5818-2-git-send-email-cfergeau@redhat.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 2/2] Error out when tls-channel option is used without TLS List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Christophe Fergeau Cc: qemu-devel@nongnu.org On 02/24/12 11:37, Christophe Fergeau wrote: > 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. > --- > 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 6d240a3..5e644c9 100644 > --- a/ui/spice-core.c > +++ b/ui/spice-core.c > @@ -524,8 +524,11 @@ static int add_channel(const char *name, const char *value, void *opaque) > { > int security = 0; > int rc; > + int *tls_port = opaque; > > if (strcmp(name, "tls-channel") == 0) { > + if (!*tls_port) The error message should be printed here ... > + return 1; > security = SPICE_CHANNEL_SECURITY_SSL; > } > if (strcmp(name, "plaintext-channel") == 0) { > @@ -697,7 +700,10 @@ 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); > + if (qemu_opt_foreach(opts, add_channel, &tls_port, 1) != 0) { > + fprintf(stderr, "tried to setup tls-channel without specifying a TLS port\n"); > + exit(1); ... otherwise we'll get a misleading error message in case add_channel() happens fail for another reason. cheers, Gerd