diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2015-11-04 15:19:00 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-11-04 17:24:26 +0000 |
| commit | df487145ee062735a460dd3948c13d5188e5bac9 (patch) | |
| tree | 6580833a9605c8fb2218f4a40d01772383381c1b | |
| parent | 02dcf3cc72c1156a72bc6f86f07702382ff0d22e (diff) | |
| download | wireshark-df487145ee062735a460dd3948c13d5188e5bac9.tar.gz | |
Skinny: fix dissector registration for SSL
Change-Id: Ia3f29b703b8271f52dfed9d8b46e18f405785d3a
Reviewed-on: https://code.wireshark.org/review/11559
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
| -rw-r--r-- | epan/dissectors/packet-skinny.c | 3 | ||||
| -rw-r--r-- | epan/dissectors/packet-skinny.c.in | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/epan/dissectors/packet-skinny.c b/epan/dissectors/packet-skinny.c index 2edae7b931..9883ee8c27 100644 --- a/epan/dissectors/packet-skinny.c +++ b/epan/dissectors/packet-skinny.c @@ -9721,6 +9721,8 @@ proto_register_skinny(void) " \"Allow subdissectors to reassemble TCP streams\" in the TCP protocol settings.", &skinny_desegment); + skinny_handle = new_register_dissector("skinny", dissect_skinny, proto_skinny); + skinny_tap = register_tap("skinny"); } @@ -9729,7 +9731,6 @@ proto_reg_handoff_skinny(void) { /* Skinny content type and internet media type used by other dissectors are the same */ media_type_dissector_table = find_dissector_table("media_type"); - skinny_handle = new_create_dissector_handle(dissect_skinny, proto_skinny); dissector_add_uint("tcp.port", TCP_PORT_SKINNY, skinny_handle); ssl_dissector_add(SSL_PORT_SKINNY, "skinny", TRUE); } diff --git a/epan/dissectors/packet-skinny.c.in b/epan/dissectors/packet-skinny.c.in index 1d0c97654e..464cd4b076 100644 --- a/epan/dissectors/packet-skinny.c.in +++ b/epan/dissectors/packet-skinny.c.in @@ -532,6 +532,8 @@ proto_register_skinny(void) " \"Allow subdissectors to reassemble TCP streams\" in the TCP protocol settings.", &skinny_desegment); + skinny_handle = new_register_dissector("skinny", dissect_skinny, proto_skinny); + skinny_tap = register_tap("skinny"); } @@ -540,7 +542,6 @@ proto_reg_handoff_skinny(void) { /* Skinny content type and internet media type used by other dissectors are the same */ media_type_dissector_table = find_dissector_table("media_type"); - skinny_handle = new_create_dissector_handle(dissect_skinny, proto_skinny); dissector_add_uint("tcp.port", TCP_PORT_SKINNY, skinny_handle); ssl_dissector_add(SSL_PORT_SKINNY, "skinny", TRUE); } |