From nobody Mon Feb 9 00:37:34 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1504879214095714.2289775665043; Fri, 8 Sep 2017 07:00:14 -0700 (PDT) Received: from localhost ([::1]:45568 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dqJpM-0003Ds-3O for importer@patchew.org; Fri, 08 Sep 2017 10:00:12 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42461) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dqJnw-00024p-LB for qemu-devel@nongnu.org; Fri, 08 Sep 2017 09:58:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dqJnv-0005g9-FF for qemu-devel@nongnu.org; Fri, 08 Sep 2017 09:58:44 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47792) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dqJnv-0005em-6j for qemu-devel@nongnu.org; Fri, 08 Sep 2017 09:58:43 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 279C0356E8; Fri, 8 Sep 2017 13:58:42 +0000 (UTC) Received: from t460.redhat.com (unknown [10.33.36.66]) by smtp.corp.redhat.com (Postfix) with ESMTP id A94DD619C4; Fri, 8 Sep 2017 13:58:37 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 279C0356E8 Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=berrange@redhat.com From: "Daniel P. Berrange" To: qemu-devel@nongnu.org Date: Fri, 8 Sep 2017 14:58:30 +0100 Message-Id: <20170908135831.10556-3-berrange@redhat.com> In-Reply-To: <20170908135831.10556-1-berrange@redhat.com> References: <20170908135831.10556-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Fri, 08 Sep 2017 13:58:42 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v3 2/3] io: include full error message in websocket handshake trace 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: Brian Rak , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" When the websocket handshake fails it is useful to log the real error message via the trace points for debugging purposes. Fixes bug: #1715186 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Daniel P. Berrange --- io/channel-websock.c | 7 ++++--- io/trace-events | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/io/channel-websock.c b/io/channel-websock.c index cc93a23f8b..5d2df95596 100644 --- a/io/channel-websock.c +++ b/io/channel-websock.c @@ -508,7 +508,7 @@ static gboolean qio_channel_websock_handshake_send(QIOC= hannel *ioc, &err); =20 if (ret < 0) { - trace_qio_channel_websock_handshake_fail(ioc); + trace_qio_channel_websock_handshake_fail(ioc, error_get_pretty(err= )); qio_task_set_error(task, err); qio_task_complete(task); return FALSE; @@ -517,7 +517,8 @@ static gboolean qio_channel_websock_handshake_send(QIOC= hannel *ioc, buffer_advance(&wioc->encoutput, ret); if (wioc->encoutput.offset =3D=3D 0) { if (wioc->io_err) { - trace_qio_channel_websock_handshake_fail(ioc); + trace_qio_channel_websock_handshake_fail( + ioc, error_get_pretty(wioc->io_err)); qio_task_set_error(task, wioc->io_err); wioc->io_err =3D NULL; qio_task_complete(task); @@ -548,7 +549,7 @@ static gboolean qio_channel_websock_handshake_io(QIOCha= nnel *ioc, * client connection, as most of the time we have an * HTTP 4xx err response to send instead */ - trace_qio_channel_websock_handshake_fail(ioc); + trace_qio_channel_websock_handshake_fail(ioc, error_get_pretty(err= )); qio_task_set_error(task, err); qio_task_complete(task); return FALSE; diff --git a/io/trace-events b/io/trace-events index 3d233698d0..6459f71f5b 100644 --- a/io/trace-events +++ b/io/trace-events @@ -46,7 +46,7 @@ qio_channel_websock_new_server(void *ioc, void *master) "= Websock new client ioc=3D qio_channel_websock_handshake_start(void *ioc) "Websock handshake start io= c=3D%p" qio_channel_websock_handshake_pending(void *ioc, int status) "Websock hand= shake pending ioc=3D%p status=3D%d" qio_channel_websock_handshake_reply(void *ioc) "Websock handshake reply io= c=3D%p" -qio_channel_websock_handshake_fail(void *ioc) "Websock handshake fail ioc= =3D%p" +qio_channel_websock_handshake_fail(void *ioc, const char *msg) "Websock ha= ndshake fail ioc=3D%p err=3D%s" qio_channel_websock_handshake_complete(void *ioc) "Websock handshake compl= ete ioc=3D%p" =20 # io/channel-command.c --=20 2.13.5