From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60092) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d6EJ4-0006tQ-Jm for qemu-devel@nongnu.org; Thu, 04 May 2017 06:48:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d6EIz-00061i-Vs for qemu-devel@nongnu.org; Thu, 04 May 2017 06:48:22 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:58127 helo=mx0a-001b2d01.pphosted.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d6EIz-00060t-Pa for qemu-devel@nongnu.org; Thu, 04 May 2017 06:48:17 -0400 Received: from pps.filterd (m0098416.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.20/8.16.0.20) with SMTP id v44AiNJf151396 for ; Thu, 4 May 2017 06:48:17 -0400 Received: from e06smtp13.uk.ibm.com (e06smtp13.uk.ibm.com [195.75.94.109]) by mx0b-001b2d01.pphosted.com with ESMTP id 2a7m0rav4c-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Thu, 04 May 2017 06:48:16 -0400 Received: from localhost by e06smtp13.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 4 May 2017 11:48:12 +0100 From: Cornelia Huck Date: Thu, 4 May 2017 12:47:59 +0200 In-Reply-To: <20170504104806.8120-1-cornelia.huck@de.ibm.com> References: <20170504104806.8120-1-cornelia.huck@de.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Message-Id: <20170504104806.8120-2-cornelia.huck@de.ibm.com> Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 1/8] chardev: Basic support for TN3270 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: peter.maydell@linaro.org Cc: borntraeger@de.ibm.com, agraf@suse.de, qemu-devel@nongnu.org, Jing Liu , Yang Chen , Cornelia Huck From: Jing Liu This introduces basic support for TN3270, which needs to negotiate three Telnet options during handshake: - End of Record - Binary Transmission - Terminal-Type As a basic implementation, this simply ignores NOP and Interrupt Process(IP) commands. More work should be done for them later. For more details, please refer to RFC 854 and 1576. Signed-off-by: Jing Liu Signed-off-by: Yang Chen Reviewed-by: QingFeng Hao Acked-by: Dong Jia Shi Signed-off-by: Cornelia Huck Reviewed-by: Marc-Andr=C3=A9 Lureau --- chardev/char-socket.c | 76 +++++++++++++++++++++++++++++++++++++--------= ------ chardev/char.c | 11 ++++++-- include/sysemu/char.h | 8 ++++++ qapi-schema.json | 3 ++ 4 files changed, 76 insertions(+), 22 deletions(-) diff --git a/chardev/char-socket.c b/chardev/char-socket.c index 36ab0d633a..175fb8c3ec 100644 --- a/chardev/char-socket.c +++ b/chardev/char-socket.c @@ -55,6 +55,7 @@ typedef struct { SocketAddress *addr; bool is_listen; bool is_telnet; + bool is_tn3270; =20 guint reconnect_timer; int64_t reconnect_time; @@ -141,19 +142,25 @@ static int tcp_chr_read_poll(void *opaque) return s->max_size; } =20 -#define IAC 255 -#define IAC_BREAK 243 static void tcp_chr_process_IAC_bytes(Chardev *chr, SocketChardev *s, uint8_t *buf, int *size) { - /* Handle any telnet client's basic IAC options to satisfy char by - * char mode with no echo. All IAC options will be removed from - * the buf and the do_telnetopt variable will be used to track the - * state of the width of the IAC information. + /* Handle any telnet or tn3270 client's basic IAC options. + * For telnet options, it satisfies char by char mode with no echo. + * For tn3270 options, it satisfies binary mode with EOR. + * All IAC options will be removed from the buf and the do_opt + * pointer will be used to track the state of the width of the + * IAC information. * - * IAC commands come in sets of 3 bytes with the exception of the - * "IAC BREAK" command and the double IAC. + * RFC854: "All TELNET commands consist of at least a two byte seque= nce. + * The commands dealing with option negotiation are three byte seque= nces, + * the third byte being the code for the option referenced." + * "IAC BREAK", "IAC IP", "IAC NOP" and the double IAC are two bytes. + * "IAC SB", "IAC SE" and "IAC EOR" are saved to split up data bound= ary + * for tn3270. + * NOP, Break and Interrupt Process(IP) might be encountered during = a TN3270 + * session, and NOP and IP need to be done later. */ =20 int i; @@ -174,6 +181,18 @@ static void tcp_chr_process_IAC_bytes(Chardev *chr, /* Handle IAC break commands by sending a serial bre= ak */ qemu_chr_be_event(chr, CHR_EVENT_BREAK); s->do_telnetopt++; + } else if (s->is_tn3270 && ((unsigned char)buf[i] =3D=3D= IAC_EOR + || (unsigned char)buf[i] =3D=3D IAC_SB + || (unsigned char)buf[i] =3D=3D IAC_SE) + && s->do_telnetopt =3D=3D 2) { + buf[j++] =3D IAC; + buf[j++] =3D buf[i]; + s->do_telnetopt++; + } else if (s->is_tn3270 && ((unsigned char)buf[i] =3D=3D= IAC_IP + || (unsigned char)buf[i] =3D=3D IAC_NOP) + && s->do_telnetopt =3D=3D 2) { + /* TODO: IP and NOP need to be implemented later. */ + s->do_telnetopt++; } s->do_telnetopt++; } @@ -512,7 +531,7 @@ static void tcp_chr_update_read_handler(Chardev *chr, =20 typedef struct { Chardev *chr; - char buf[12]; + char buf[21]; size_t buflen; } TCPChardevTelnetInit; =20 @@ -550,9 +569,6 @@ static void tcp_chr_telnet_init(Chardev *chr) TCPChardevTelnetInit *init =3D g_new0(TCPChardevTelnetInit, 1); size_t n =3D 0; =20 - init->chr =3D chr; - init->buflen =3D 12; - #define IACSET(x, a, b, c) \ do { \ x[n++] =3D a; \ @@ -560,12 +576,26 @@ static void tcp_chr_telnet_init(Chardev *chr) x[n++] =3D c; \ } while (0) =20 - /* Prep the telnet negotion to put telnet in binary, - * no echo, single char mode */ - IACSET(init->buf, 0xff, 0xfb, 0x01); /* IAC WILL ECHO */ - IACSET(init->buf, 0xff, 0xfb, 0x03); /* IAC WILL Suppress go ahead = */ - IACSET(init->buf, 0xff, 0xfb, 0x00); /* IAC WILL Binary */ - IACSET(init->buf, 0xff, 0xfd, 0x00); /* IAC DO Binary */ + init->chr =3D chr; + if (!s->is_tn3270) { + init->buflen =3D 12; + /* Prep the telnet negotion to put telnet in binary, + * no echo, single char mode */ + IACSET(init->buf, 0xff, 0xfb, 0x01); /* IAC WILL ECHO */ + IACSET(init->buf, 0xff, 0xfb, 0x03); /* IAC WILL Suppress go ah= ead */ + IACSET(init->buf, 0xff, 0xfb, 0x00); /* IAC WILL Binary */ + IACSET(init->buf, 0xff, 0xfd, 0x00); /* IAC DO Binary */ + } else { + init->buflen =3D 21; + /* Prep the TN3270 negotion based on RFC1576 */ + IACSET(init->buf, 0xff, 0xfd, 0x19); /* IAC DO EOR */ + IACSET(init->buf, 0xff, 0xfb, 0x19); /* IAC WILL EOR */ + IACSET(init->buf, 0xff, 0xfd, 0x00); /* IAC DO BINARY */ + IACSET(init->buf, 0xff, 0xfb, 0x00); /* IAC WILL BINARY */ + IACSET(init->buf, 0xff, 0xfd, 0x18); /* IAC DO TERMINAL TYPE */ + IACSET(init->buf, 0xff, 0xfa, 0x18); /* IAC SB TERMINAL TYPE */ + IACSET(init->buf, 0x01, 0xff, 0xf0); /* SEND IAC SE */ + } =20 #undef IACSET =20 @@ -585,7 +615,8 @@ static void tcp_chr_tls_handshake(QIOTask *task, if (qio_task_propagate_error(task, NULL)) { tcp_chr_disconnect(chr); } else { - if (s->do_telnetopt) { + /* tn3270 does not support TLS yet */ + if (s->do_telnetopt && !s->is_tn3270) { tcp_chr_telnet_init(chr); } else { tcp_chr_connect(chr); @@ -824,12 +855,14 @@ static void qmp_chardev_open_socket(Chardev *chr, bool do_nodelay =3D sock->has_nodelay ? sock->nodelay : false; bool is_listen =3D sock->has_server ? sock->server : true; bool is_telnet =3D sock->has_telnet ? sock->telnet : false; + bool is_tn3270 =3D sock->has_tn3270 ? sock->tn3270 : false; bool is_waitconnect =3D sock->has_wait ? sock->wait : false; int64_t reconnect =3D sock->has_reconnect ? sock->reconnect : 0; QIOChannelSocket *sioc =3D NULL; =20 s->is_listen =3D is_listen; s->is_telnet =3D is_telnet; + s->is_tn3270 =3D is_tn3270; s->do_nodelay =3D do_nodelay; if (sock->tls_creds) { Object *creds; @@ -879,7 +912,7 @@ static void qmp_chardev_open_socket(Chardev *chr, addr, is_listen, is_telnet); =20 if (is_listen) { - if (is_telnet) { + if (is_telnet || is_tn3270) { s->do_telnetopt =3D 1; } } else if (reconnect > 0) { @@ -933,6 +966,7 @@ static void qemu_chr_parse_socket(QemuOpts *opts, Cha= rdevBackend *backend, bool is_listen =3D qemu_opt_get_bool(opts, "server", false); bool is_waitconnect =3D is_listen && qemu_opt_get_bool(opts, "wait",= true); bool is_telnet =3D qemu_opt_get_bool(opts, "telnet", false); + bool is_tn3270 =3D qemu_opt_get_bool(opts, "tn3270", false); bool do_nodelay =3D !qemu_opt_get_bool(opts, "delay", true); int64_t reconnect =3D qemu_opt_get_number(opts, "reconnect", 0); const char *path =3D qemu_opt_get(opts, "path"); @@ -968,6 +1002,8 @@ static void qemu_chr_parse_socket(QemuOpts *opts, Ch= ardevBackend *backend, sock->server =3D is_listen; sock->has_telnet =3D true; sock->telnet =3D is_telnet; + sock->has_tn3270 =3D true; + sock->tn3270 =3D is_tn3270; sock->has_wait =3D true; sock->wait =3D is_waitconnect; sock->has_reconnect =3D true; diff --git a/chardev/char.c b/chardev/char.c index 3df116350b..309734f2b7 100644 --- a/chardev/char.c +++ b/chardev/char.c @@ -696,7 +696,8 @@ QemuOpts *qemu_chr_parse_compat(const char *label, co= nst char *filename) return opts; } if (strstart(filename, "tcp:", &p) || - strstart(filename, "telnet:", &p)) { + strstart(filename, "telnet:", &p) || + strstart(filename, "tn3270:", &p)) { if (sscanf(p, "%64[^:]:%32[^,]%n", host, port, &pos) < 2) { host[0] =3D 0; if (sscanf(p, ":%32[^,]%n", port, &pos) < 1) @@ -712,8 +713,11 @@ QemuOpts *qemu_chr_parse_compat(const char *label, c= onst char *filename) goto fail; } } - if (strstart(filename, "telnet:", &p)) + if (strstart(filename, "telnet:", &p)) { qemu_opt_set(opts, "telnet", "on", &error_abort); + } else if (strstart(filename, "tn3270:", &p)) { + qemu_opt_set(opts, "tn3270", "on", &error_abort); + } return opts; } if (strstart(filename, "udp:", &p)) { @@ -1177,6 +1181,9 @@ QemuOptsList qemu_chardev_opts =3D { .name =3D "telnet", .type =3D QEMU_OPT_BOOL, },{ + .name =3D "tn3270", + .type =3D QEMU_OPT_BOOL, + },{ .name =3D "tls-creds", .type =3D QEMU_OPT_STRING, },{ diff --git a/include/sysemu/char.h b/include/sysemu/char.h index 450881d42c..f6d5cd0c9b 100644 --- a/include/sysemu/char.h +++ b/include/sysemu/char.h @@ -7,6 +7,14 @@ #include "qemu/bitmap.h" #include "qom/object.h" =20 +#define IAC_EOR 239 +#define IAC_SE 240 +#define IAC_NOP 241 +#define IAC_BREAK 243 +#define IAC_IP 244 +#define IAC_SB 250 +#define IAC 255 + /* character device */ =20 typedef enum { diff --git a/qapi-schema.json b/qapi-schema.json index 01b087fa16..5bb8cb79fb 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -4877,6 +4877,8 @@ # @nodelay: set TCP_NODELAY socket option (default: false) # @telnet: enable telnet protocol on server # sockets (default: false) +# @tn3270: enable tn3270 protocol on server +# sockets (default: false) (Since: 2.10) # @reconnect: For a client socket, if a socket is disconnected, # then attempt a reconnect after the given number of seconds. # Setting this to zero disables this function. (default: 0) @@ -4890,6 +4892,7 @@ '*wait' : 'bool', '*nodelay' : 'bool', '*telnet' : 'bool', + '*tn3270' : 'bool', '*reconnect' : 'int' }, 'base': 'ChardevCommon' } =20 --=20 2.11.0