From patchwork Thu May 4 10:48:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cornelia Huck X-Patchwork-Id: 9711423 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 32A6E60387 for ; Thu, 4 May 2017 10:54:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 33FB528678 for ; Thu, 4 May 2017 10:54:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2902628682; Thu, 4 May 2017 10:54:13 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id B77F128678 for ; Thu, 4 May 2017 10:54:12 +0000 (UTC) Received: from localhost ([::1]:40990 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d6EOh-0003D9-V0 for patchwork-qemu-devel@patchwork.kernel.org; Thu, 04 May 2017 06:54:11 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60176) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d6EJD-0006zZ-7h for qemu-devel@nongnu.org; Thu, 04 May 2017 06:48:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d6EJ7-0006AG-VG for qemu-devel@nongnu.org; Thu, 04 May 2017 06:48:31 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:58477) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d6EJ7-00069P-MK for qemu-devel@nongnu.org; Thu, 04 May 2017 06:48:25 -0400 Received: from pps.filterd (m0098410.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.20/8.16.0.20) with SMTP id v44AiODM119687 for ; Thu, 4 May 2017 06:48:24 -0400 Received: from e06smtp12.uk.ibm.com (e06smtp12.uk.ibm.com [195.75.94.108]) by mx0a-001b2d01.pphosted.com with ESMTP id 2a7vsy7sse-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Thu, 04 May 2017 06:48:24 -0400 Received: from localhost by e06smtp12.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 4 May 2017 11:48:21 +0100 Received: from b06cxnps4076.portsmouth.uk.ibm.com (9.149.109.198) by e06smtp12.uk.ibm.com (192.168.101.142) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Thu, 4 May 2017 11:48:17 +0100 Received: from d06av24.portsmouth.uk.ibm.com (d06av24.portsmouth.uk.ibm.com [9.149.105.60]) by b06cxnps4076.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id v44AmGlr40828952; Thu, 4 May 2017 10:48:16 GMT Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id F16E44203F; Thu, 4 May 2017 11:46:55 +0100 (BST) Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id C584942041; Thu, 4 May 2017 11:46:55 +0100 (BST) Received: from gondolin.boeblingen.de.ibm.com (unknown [9.152.224.119]) by d06av24.portsmouth.uk.ibm.com (Postfix) with ESMTPS; Thu, 4 May 2017 11:46:55 +0100 (BST) From: Cornelia Huck To: peter.maydell@linaro.org Date: Thu, 4 May 2017 12:48:05 +0200 X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170504104806.8120-1-cornelia.huck@de.ibm.com> References: <20170504104806.8120-1-cornelia.huck@de.ibm.com> X-TM-AS-GCONF: 00 x-cbid: 17050410-0008-0000-0000-0000043B95C2 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17050410-0009-0000-0000-00001D870B42 Message-Id: <20170504104806.8120-8-cornelia.huck@de.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2017-05-04_07:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=1 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1703280000 definitions=main-1705040177 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] [fuzzy] X-Received-From: 148.163.156.1 Subject: [Qemu-devel] [PULL 7/8] s390x/3270: Detect for continued presence of a 3270 client X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Cornelia Huck , borntraeger@de.ibm.com, Jing Liu , agraf@suse.de, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Jing Liu To ensure that we do not keep any 3270 sockets where the client is not connected anymore, we send a packet with the timing mark option after ten minutes of client inactivity. If the client does not answer it, then the socket will be closed automatically. This helps to ensure that there is no half-open situation on the 3270 socket. Signed-off-by: Jing Liu Reviewed-by: QingFeng Hao Reviewed-by: Dong Jia Shi Signed-off-by: Cornelia Huck --- hw/char/terminal3270.c | 37 ++++++++++++++++++++++++++++++++----- 1 file changed, 32 insertions(+), 5 deletions(-) diff --git a/hw/char/terminal3270.c b/hw/char/terminal3270.c index 450608e3c3..58bcc4be15 100644 --- a/hw/char/terminal3270.c +++ b/hw/char/terminal3270.c @@ -32,6 +32,7 @@ typedef struct Terminal3270 { int in_len; int out_len; bool handshake_done; + guint timer_tag; } Terminal3270; #define TYPE_TERMINAL_3270 "x-terminal3270" @@ -60,6 +61,19 @@ static void TN3270_handshake_done(Terminal3270 *t) } /* + * Called when the interval is timeout to detect + * if the client is still alive by Timing Mark. + */ +static gboolean send_timing_mark_cb(gpointer opaque) +{ + Terminal3270 *t = opaque; + const uint8_t timing[] = {0xff, 0xfd, 0x06}; + + qemu_chr_fe_write_all(&t->chr, timing, sizeof(timing)); + return true; +} + +/* * Receive inbound data from socket. * For data given to guest, drop the data boundary IAC, IAC_EOR. * TODO: @@ -77,6 +91,12 @@ static void terminal_read(void *opaque, const uint8_t *buf, int size) assert(size <= (INPUT_BUFFER_SIZE - t->in_len)); + if (t->timer_tag) { + g_source_remove(t->timer_tag); + t->timer_tag = 0; + } + t->timer_tag = g_timeout_add_seconds(600, send_timing_mark_cb, t); + memcpy(&t->inv[t->in_len], buf, size); t->in_len += size; if (t->in_len < 2) { @@ -127,6 +147,10 @@ static void chr_event(void *opaque, int event) t->in_len = 0; t->out_len = 0; t->handshake_done = false; + if (t->timer_tag) { + g_source_remove(t->timer_tag); + t->timer_tag = 0; + } switch (event) { case CHR_EVENT_OPENED: @@ -135,6 +159,7 @@ static void chr_event(void *opaque, int event) * char-socket.c. Once qemu receives the terminal-type of the * client, mark handshake done and trigger everything rolling again. */ + t->timer_tag = g_timeout_add_seconds(600, send_timing_mark_cb, t); break; case CHR_EVENT_CLOSED: sch->curr_status.scsw.dstat = SCSW_DSTAT_DEVICE_END; @@ -206,11 +231,13 @@ static int write_payload_3270(EmulatedCcw3270Device *dev, uint8_t cmd, assert(count <= (OUTPUT_BUFFER_SIZE - 3) / 2); if (!t->handshake_done) { - /* - * Before having finished 3270 negotiation, - * sending outbound data is prohibited. - */ - return 0; + if (!(t->outv[0] == IAC && t->outv[1] != IAC)) { + /* + * Before having finished 3270 negotiation, + * sending outbound data except protocol options is prohibited. + */ + return 0; + } } if (!qemu_chr_fe_get_driver(&t->chr)) { /* We just say we consumed all data if there's no backend. */