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>

diff --git a/epan/dissectors/packet-skinny.c b/epan/dissectors/packet-skinny.c
index 2edae7b931be34cfc5f77469428c6c3a3e985968..9883ee8c27d05ebad0bdc8debb354e82e345ee49 100644 (file)
--- 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 1d0c97654e7d900b6d3283a61166127de96cba47..464cd4b076ca51a53a31951904ca0813cd0376b9 100644 (file)
--- 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);
 }