|
 |
4a2fec |
From 8043361fbb2617010aeb3d4009cd05636e2ff715 Mon Sep 17 00:00:00 2001
|
|
|
4a2fec |
From: "Daniel P. Berrange" <berrange@redhat.com>
|
|
|
4a2fec |
Date: Wed, 20 Dec 2017 17:57:00 +0100
|
|
|
4a2fec |
Subject: [PATCH 20/42] io: add trace points for websocket HTTP protocol
|
|
|
4a2fec |
headers
|
|
|
4a2fec |
|
|
|
4a2fec |
RH-Author: Daniel P. Berrange <berrange@redhat.com>
|
|
|
4a2fec |
Message-id: <20171220175702.29663-19-berrange@redhat.com>
|
|
|
4a2fec |
Patchwork-id: 78471
|
|
|
4a2fec |
O-Subject: [RHV-7.5 qemu-kvm-rhev PATCH v2 18/20] io: add trace points for websocket HTTP protocol headers
|
|
|
4a2fec |
Bugzilla: 1518649
|
|
|
4a2fec |
RH-Acked-by: John Snow <jsnow@redhat.com>
|
|
|
4a2fec |
RH-Acked-by: Jeffrey Cody <jcody@redhat.com>
|
|
|
4a2fec |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
4a2fec |
|
|
|
4a2fec |
Reviewed-by: Eric Blake <eblake@redhat.com>
|
|
|
4a2fec |
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
|
|
|
4a2fec |
(cherry picked from commit 0efd6c9ec19a1ea6c413424fbea54e1dfe471026)
|
|
|
4a2fec |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
4a2fec |
---
|
|
|
4a2fec |
io/channel-websock.c | 4 ++++
|
|
|
4a2fec |
io/trace-events | 2 ++
|
|
|
4a2fec |
2 files changed, 6 insertions(+)
|
|
|
4a2fec |
|
|
|
4a2fec |
diff --git a/io/channel-websock.c b/io/channel-websock.c
|
|
|
4a2fec |
index 0354845..aa35ef3 100644
|
|
|
4a2fec |
--- a/io/channel-websock.c
|
|
|
4a2fec |
+++ b/io/channel-websock.c
|
|
|
4a2fec |
@@ -224,6 +224,7 @@ qio_channel_websock_extract_headers(QIOChannelWebsock *ioc,
|
|
|
4a2fec |
goto bad_request;
|
|
|
4a2fec |
}
|
|
|
4a2fec |
*nl = '\0';
|
|
|
4a2fec |
+ trace_qio_channel_websock_http_greeting(ioc, buffer);
|
|
|
4a2fec |
|
|
|
4a2fec |
tmp = strchr(buffer, ' ');
|
|
|
4a2fec |
if (!tmp) {
|
|
|
4a2fec |
@@ -425,6 +426,9 @@ static void qio_channel_websock_handshake_process(QIOChannelWebsock *ioc,
|
|
|
4a2fec |
goto bad_request;
|
|
|
4a2fec |
}
|
|
|
4a2fec |
|
|
|
4a2fec |
+ trace_qio_channel_websock_http_request(ioc, protocols, version,
|
|
|
4a2fec |
+ host, connection, upgrade, key);
|
|
|
4a2fec |
+
|
|
|
4a2fec |
if (!g_strrstr(protocols, QIO_CHANNEL_WEBSOCK_PROTOCOL_BINARY)) {
|
|
|
4a2fec |
error_setg(errp, "No '%s' protocol is supported by client '%s'",
|
|
|
4a2fec |
QIO_CHANNEL_WEBSOCK_PROTOCOL_BINARY, protocols);
|
|
|
4a2fec |
diff --git a/io/trace-events b/io/trace-events
|
|
|
4a2fec |
index 801b5dc..f70bad7 100644
|
|
|
4a2fec |
--- a/io/trace-events
|
|
|
4a2fec |
+++ b/io/trace-events
|
|
|
4a2fec |
@@ -48,6 +48,8 @@ qio_channel_websock_handshake_pending(void *ioc, int status) "Websock handshake
|
|
|
4a2fec |
qio_channel_websock_handshake_reply(void *ioc) "Websock handshake reply ioc=%p"
|
|
|
4a2fec |
qio_channel_websock_handshake_fail(void *ioc, const char *msg) "Websock handshake fail ioc=%p err=%s"
|
|
|
4a2fec |
qio_channel_websock_handshake_complete(void *ioc) "Websock handshake complete ioc=%p"
|
|
|
4a2fec |
+qio_channel_websock_http_greeting(void *ioc, const char *greeting) "Websocket HTTP request ioc=%p greeting='%s'"
|
|
|
4a2fec |
+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'"
|
|
|
4a2fec |
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"
|
|
|
4a2fec |
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"
|
|
|
4a2fec |
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"
|
|
|
4a2fec |
--
|
|
|
4a2fec |
1.8.3.1
|
|
|
4a2fec |
|