diff options
| author | Peter Wu <peter@lekensteyn.nl> | 2018-08-12 18:51:10 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2018-08-13 08:20:35 +0000 |
| commit | ca75c14f05777f2aa35f3c69aa547822bcc6081b (patch) | |
| tree | fdca5559015d8e266af1a5c719de7fba4a4a6668 /epan/dissectors/packet-http.h | |
| parent | 3a9f1717634a331507e9ccae74108fd9e3c1222a (diff) | |
HTTP: create dissector table for HTTP Upgrade
Based on an idea from David M. Lloyd, let subdissectors register
themselves with the HTTP dissector based on the Upgrade header instead
of the other way round.
Tested with SSTP (bug 82390), WebSocket (bug 13889), HTTP2 PRI without
Upgrade (bug 11331), h2c (from HTTP2 wiki), spdy/3.1 (bug 12874).
Change-Id: I1425b7119d4d85e626032408504fc2c6b2f2eeb8
Reviewed-on: https://code.wireshark.org/review/29112
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-http.h')
| -rw-r--r-- | epan/dissectors/packet-http.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/dissectors/packet-http.h b/epan/dissectors/packet-http.h index 129cfc67c3..ae42aa3f2b 100644 --- a/epan/dissectors/packet-http.h +++ b/epan/dissectors/packet-http.h @@ -63,7 +63,7 @@ typedef struct _http_conv_t { /* Fields related to proxied/tunneled/Upgraded connections. */ guint32 startframe; /* First frame of proxied connection */ int startoffset; /* Offset within the frame where the new protocol begins. */ - guint8 upgrade; + dissector_handle_t next_handle; /* New protocol */ gchar *websocket_protocol; /* Negotiated WebSocket protocol */ gchar *websocket_extensions; /* Negotiated WebSocket extensions */ |