diff options
| author | Peter Wu <peter@lekensteyn.nl> | 2015-09-14 00:33:27 +0200 |
|---|---|---|
| committer | Peter Wu <peter@lekensteyn.nl> | 2015-10-30 09:21:08 +0000 |
| commit | 8daac4af93a6676a240dd39e601e30e47be5352f (patch) | |
| tree | e4a506fddfe35ee981b1de8e905119ee09e643c5 | |
| parent | 3690d133625b661eb9c64ec6b988e25be62630b1 (diff) | |
| download | wireshark-8daac4af93a6676a240dd39e601e30e47be5352f.tar.gz | |
spdy: do not overwrite HTTPS registration
Setting a zero port still allows it for selection in the UAT dialog
while not breaking HTTPS dissection.
(In theory the UAT setting would work. In practice it would still call
ssl_dissector_add and take over the SSL registration for all tcp/443
traffic. On removal with ssl_dissector_remove, the HTTPS port is not
added back again until a restart (or until the HTTPS ports list is
changed from the default) because the spdy registration overwrites the
HTTP one...)
Also note that NPN detection for SPDY is not implemented, only ALPN
detection is supported.
Bug: 10984
Change-Id: I6e84aa6408abf40bb860abee4845731ce55ce254
Reviewed-on: https://code.wireshark.org/review/10517
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
(cherry picked from commit bb7f7d32688abcbc05e954bf380d5759a0b9bf47)
Reviewed-on: https://code.wireshark.org/review/11422
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Tested-by: Peter Wu <peter@lekensteyn.nl>
| -rw-r--r-- | epan/dissectors/packet-spdy.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-spdy.c b/epan/dissectors/packet-spdy.c index 0b11a4fc3a..31406854cc 100644 --- a/epan/dissectors/packet-spdy.c +++ b/epan/dissectors/packet-spdy.c @@ -92,7 +92,6 @@ typedef struct _spdy_conv_t { #define SPDY_FLAG_SETTINGS_PERSISTED 0x02 #define TCP_PORT_SPDY 6121 -#define SSL_PORT_SPDY 443 static const value_string frame_type_names[] = { { SPDY_DATA, "DATA" }, @@ -1940,7 +1939,8 @@ void proto_register_spdy(void) void proto_reg_handoff_spdy(void) { dissector_add_uint("tcp.port", TCP_PORT_SPDY, spdy_handle); - ssl_dissector_add(SSL_PORT_SPDY, "spdy", TRUE); + /* Use "0" to avoid overwriting HTTPS port and still offer support over SSL */ + ssl_dissector_add(0, "spdy", TRUE); data_handle = find_dissector("data"); media_handle = find_dissector("media"); |