From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55091) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eiieP-0005cz-Oy for qemu-devel@nongnu.org; Mon, 05 Feb 2018 10:25:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eiieL-0000tU-Li for qemu-devel@nongnu.org; Mon, 05 Feb 2018 10:25:45 -0500 Received: from mx1.redhat.com ([209.132.183.28]:53268) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eiieL-0000sJ-F7 for qemu-devel@nongnu.org; Mon, 05 Feb 2018 10:25:41 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B75F649018 for ; Mon, 5 Feb 2018 15:25:40 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Mon, 5 Feb 2018 15:24:47 +0000 Message-Id: <20180205152455.12088-2-berrange@redhat.com> In-Reply-To: <20180205152455.12088-1-berrange@redhat.com> References: <20180205152455.12088-1-berrange@redhat.com> Subject: [Qemu-devel] [PATCH v4 1/9] char: don't silently skip tn3270 protocol init when TLS is enabled List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , "Dr. David Alan Gilbert" , Markus Armbruster , Eric Blake , "Daniel P. Berrange" From: "Daniel P. Berrange" Even if common tn3270 implementations do not support TLS, it is trivial to have them proxied over a proxy like stunnel which adds TLS at the sockets layer. We should thus not silently skip tn3270 protocol initialization when TLS is enabled. Signed-off-by: Daniel P. Berrange --- chardev/char-socket.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/chardev/char-socket.c b/chardev/char-socket.c index 77cdf487eb..5c46a89200 100644 --- a/chardev/char-socket.c +++ b/chardev/char-socket.c @@ -634,8 +634,7 @@ static void tcp_chr_tls_handshake(QIOTask *task, if (qio_task_propagate_error(task, NULL)) { tcp_chr_disconnect(chr); } else { - /* tn3270 does not support TLS yet */ - if (s->do_telnetopt && !s->is_tn3270) { + if (s->do_telnetopt) { tcp_chr_telnet_init(chr); } else { tcp_chr_connect(chr); -- 2.14.3