diff mbox series

[v4,1/9] char: don't silently skip tn3270 protocol init when TLS is enabled

Message ID 20180205152455.12088-2-berrange@redhat.com
State New
Headers show
Series Enable passing pre-opened chardev socket FD | expand

Commit Message

Daniel P. Berrangé Feb. 5, 2018, 3:24 p.m. UTC
From: "Daniel P. Berrange" <berrange@redhat.com>

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 <berrange@redhat.com>
---
 chardev/char-socket.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Comments

Cornelia Huck Feb. 5, 2018, 4:10 p.m. UTC | #1
On Mon,  5 Feb 2018 15:24:47 +0000
Daniel P. Berrangé <berrange@redhat.com> wrote:

> From: "Daniel P. Berrange" <berrange@redhat.com>
> 
> 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 <berrange@redhat.com>
> ---
>  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);

Acked-by: Cornelia Huck <cohuck@redhat.com>
diff mbox series

Patch

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);