All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Daniel P. Berrange" <berrange@redhat.com>
To: qemu-devel@nongnu.org
Subject: [Qemu-devel] [PATCH v1 7/7] io: add trace points for websocket HTTP protocol headers
Date: Tue, 10 Oct 2017 16:43:28 +0100	[thread overview]
Message-ID: <20171010154328.8419-8-berrange@redhat.com> (raw)
In-Reply-To: <20171010154328.8419-1-berrange@redhat.com>

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---
 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 a21915881d..003d467715 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 = '\0';
+    trace_qio_channel_websock_http_greeting(ioc, buffer);
 
     tmp = strchr(buffer, ' ');
     if (!tmp) {
@@ -425,6 +426,9 @@ static void qio_channel_websock_handshake_process(QIOChannelWebsock *ioc,
         goto bad_request;
     }
 
+    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 status) "Websock handshake
 qio_channel_websock_handshake_reply(void *ioc) "Websock handshake reply ioc=%p"
 qio_channel_websock_handshake_fail(void *ioc, const char *msg) "Websock handshake fail ioc=%p err=%s"
 qio_channel_websock_handshake_complete(void *ioc) "Websock handshake complete ioc=%p"
+qio_channel_websock_http_greeting(void *ioc, const char *greeting) "Websocket HTTP request ioc=%p greeting='%s'"
+qio_channel_websock_http_request(void *ioc, const char *protocols, const char *version, const char *host, const char *connection, const char *upgrade, const char *key) "Websocket HTTP request ioc=%p protocols='%s' version='%s' host='%s' connection='%s' upgrade='%s' key='%s'"
 qio_channel_websock_header_partial_decode(void *ioc, size_t payloadlen, unsigned char fin, unsigned char opcode, unsigned char has_mask) "Websocket header decoded ioc=%p payload-len=%zu fin=0x%x opcode=0x%x has_mask=0x%x"
 qio_channel_websock_header_full_decode(void *ioc, size_t headerlen, size_t payloadlen, uint32_t mask) "Websocket header decoded ioc=%p header-len=%zu payload-len=%zu mask=0x%x"
 qio_channel_websock_payload_decode(void *ioc, uint8_t opcode, size_t payload_remain) "Websocket header decoded ioc=%p opcode=0x%x payload-remain=%zu"
-- 
2.13.5

  parent reply	other threads:[~2017-10-10 15:43 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-10-10 15:43 [Qemu-devel] [PATCH v1 0/7] Limit websockets memory usage & other bug fixes Daniel P. Berrange
2017-10-10 15:43 ` [Qemu-devel] [PATCH v1 1/7] io: monitor encoutput buffer size from websocket GSource Daniel P. Berrange
2017-10-10 16:51   ` Eric Blake
2017-10-10 17:34     ` Daniel P. Berrange
2017-10-10 15:43 ` [Qemu-devel] [PATCH v1 2/7] io: simplify websocket ping reply handling Daniel P. Berrange
2017-10-10 16:55   ` Eric Blake
2017-10-10 17:34     ` Daniel P. Berrange
2017-10-10 15:43 ` [Qemu-devel] [PATCH v1 3/7] io: get rid of qio_channel_websock_encode helper method Daniel P. Berrange
2017-10-10 16:59   ` Eric Blake
2017-10-10 15:43 ` [Qemu-devel] [PATCH v1 4/7] io: pass a struct iovec into qio_channel_websock_encode Daniel P. Berrange
2017-10-10 17:18   ` Eric Blake
2017-10-10 17:36     ` Daniel P. Berrange
2017-10-10 15:43 ` [Qemu-devel] [PATCH v1 5/7] io: get rid of bounce buffering in websock write path Daniel P. Berrange
2017-10-10 17:29   ` Eric Blake
2017-10-10 15:43 ` [Qemu-devel] [PATCH v1 6/7] io: cope with websock 'Connection' header having multiple values Daniel P. Berrange
2017-10-10 17:42   ` Eric Blake
2017-10-11  9:18     ` Daniel P. Berrange
2017-10-10 15:43 ` Daniel P. Berrange [this message]
2017-10-10 17:43   ` [Qemu-devel] [PATCH v1 7/7] io: add trace points for websocket HTTP protocol headers Eric Blake

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20171010154328.8419-8-berrange@redhat.com \
    --to=berrange@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.