From nobody Sun Feb 8 21:33:36 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 1507716886886285.5813253995502; Wed, 11 Oct 2017 03:14:46 -0700 (PDT) Received: from localhost ([::1]:40010 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e2E2C-0007ph-4l for importer@patchew.org; Wed, 11 Oct 2017 06:14:40 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60391) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e2Dxu-0004om-LX for qemu-devel@nongnu.org; Wed, 11 Oct 2017 06:10:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e2Dxt-00022i-7l for qemu-devel@nongnu.org; Wed, 11 Oct 2017 06:10:14 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48796) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e2Dxs-00020c-OJ for qemu-devel@nongnu.org; Wed, 11 Oct 2017 06:10:12 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id DC1FF3DBD1 for ; Wed, 11 Oct 2017 10:10:11 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.42.22.189]) by smtp.corp.redhat.com (Postfix) with ESMTP id 228C668B2C; Wed, 11 Oct 2017 10:10:11 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com DC1FF3DBD1 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: Wed, 11 Oct 2017 11:09:59 +0100 Message-Id: <20171011100959.29326-8-berrange@redhat.com> In-Reply-To: <20171011100959.29326-1-berrange@redhat.com> References: <20171011100959.29326-1-berrange@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Wed, 11 Oct 2017 10:10:12 +0000 (UTC) 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 v2 7/7] io: add trace points for websocket HTTP protocol headers 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Reviewed-by: Eric Blake Signed-off-by: Daniel P. Berrange --- io/channel-websock.c | 4 ++++ io/trace-events | 2 ++ 2 files changed, 6 insertions(+) diff --git a/io/channel-websock.c b/io/channel-websock.c index 3e3d0953c4..afe9db4c28 100644 --- a/io/channel-websock.c +++ b/io/channel-websock.c @@ -224,6 +224,7 @@ qio_channel_websock_extract_headers(QIOChannelWebsock *= ioc, goto bad_request; } *nl =3D '\0'; + trace_qio_channel_websock_http_greeting(ioc, buffer); =20 tmp =3D strchr(buffer, ' '); if (!tmp) { @@ -425,6 +426,9 @@ static void qio_channel_websock_handshake_process(QIOCh= annelWebsock *ioc, goto bad_request; } =20 + trace_qio_channel_websock_http_request(ioc, protocols, version, + host, connection, upgrade, key); + if (!g_strrstr(protocols, QIO_CHANNEL_WEBSOCK_PROTOCOL_BINARY)) { error_setg(errp, "No '%s' protocol is supported by client '%s'", QIO_CHANNEL_WEBSOCK_PROTOCOL_BINARY, protocols); diff --git a/io/trace-events b/io/trace-events index 801b5dcb61..f70bad7cbe 100644 --- a/io/trace-events +++ b/io/trace-events @@ -48,6 +48,8 @@ qio_channel_websock_handshake_pending(void *ioc, int stat= us) "Websock handshake qio_channel_websock_handshake_reply(void *ioc) "Websock handshake reply io= c=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" +qio_channel_websock_http_greeting(void *ioc, const char *greeting) "Websoc= ket HTTP request ioc=3D%p greeting=3D'%s'" +qio_channel_websock_http_request(void *ioc, const char *protocols, const c= har *version, const char *host, const char *connection, const char *upgrade= , const char *key) "Websocket HTTP request ioc=3D%p protocols=3D'%s' versio= n=3D'%s' host=3D'%s' connection=3D'%s' upgrade=3D'%s' key=3D'%s'" qio_channel_websock_header_partial_decode(void *ioc, size_t payloadlen, un= signed char fin, unsigned char opcode, unsigned char has_mask) "Websocket h= eader decoded ioc=3D%p payload-len=3D%zu fin=3D0x%x opcode=3D0x%x has_mask= =3D0x%x" qio_channel_websock_header_full_decode(void *ioc, size_t headerlen, size_t= payloadlen, uint32_t mask) "Websocket header decoded ioc=3D%p header-len= =3D%zu payload-len=3D%zu mask=3D0x%x" qio_channel_websock_payload_decode(void *ioc, uint8_t opcode, size_t paylo= ad_remain) "Websocket header decoded ioc=3D%p opcode=3D0x%x payload-remain= =3D%zu" --=20 2.13.5