components/wireshark/patches/Bug7784.patch
author Petr Sumbera <petr.sumbera@oracle.com>
Mon, 03 Dec 2012 05:42:49 -0800
branchs11u1-sru
changeset 2439 1b98009fab53
permissions -rw-r--r--
15819915 SUNBT7202384 Upgrade Wireshark to version 1.8.3 15813148 problem in UTILITY/WIRESHARK

See:

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7784
http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=44511

--- epan/dissectors/packet-dtls.c	2012/08/14 22:12:31	44510
+++ epan/dissectors/packet-dtls.c	2012/08/15 06:14:10	44511
@@ -2724,7 +2724,6 @@
 
   register_dissector("dtls", dissect_dtls, proto_dtls);
   dtls_handle = find_dissector("dtls");
-  dissector_add_uint("sctp.ppi", DIAMETER_DTLS_PROTOCOL_ID, dtls_handle);
   dtls_associations = g_tree_new(ssl_association_cmp);
 
   register_init_routine(dtls_init);
@@ -2750,8 +2749,10 @@
   dtls_parse_uat();
   dtls_parse_old_keys();
 
-  if (initialized == FALSE)
+  if (initialized == FALSE) {
     heur_dissector_add("udp", dissect_dtls_heur, proto_dtls);
+    dissector_add_uint("sctp.ppi", DIAMETER_DTLS_PROTOCOL_ID, find_dissector("dtls"));
+  }
 
   initialized = TRUE;
 }