If we implement new style dissectors, register them as such.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@23861 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/asn1/h282/packet-h282-template.c b/asn1/h282/packet-h282-template.c
index ef1733e3ee6497114bcb73497a9e0ea9441b724d..3b21ecf0ba2a701d114f98257b5d3ecea41b412d 100644 (file)
--- a/asn1/h282/packet-h282-template.c
+++ b/asn1/h282/packet-h282-template.c
@@ -93,8 +93,8 @@ void proto_register_h282(void) {
   proto_register_field_array(proto_h282, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));
 
-  register_dissector(PFNAME, dissect_h282, proto_h282);
-  register_dissector(PFNAME".device_list", dissect_NonCollapsingCapabilities_PDU, proto_h282);
+  new_register_dissector(PFNAME, dissect_h282, proto_h282);
+  new_register_dissector(PFNAME".device_list", dissect_NonCollapsingCapabilities_PDU, proto_h282);
 
 }
 

diff --git a/asn1/h283/packet-h283-template.c b/asn1/h283/packet-h283-template.c
index c47ad76836cb605964f0819a3caa4e284aabc6ee..62fddfd4435d5567448c56b94233c980bfb0cf9b 100644 (file)
--- a/asn1/h283/packet-h283-template.c
+++ b/asn1/h283/packet-h283-template.c
@@ -101,7 +101,7 @@ void proto_register_h283(void) {
   proto_register_field_array(proto_h283, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));
 
-  register_dissector(PFNAME, dissect_h283_udp, proto_h283);
+  new_register_dissector(PFNAME, dissect_h283_udp, proto_h283);
   h283_udp_handle = find_dissector(PFNAME);
 
 }

diff --git a/asn1/h501/packet-h501-template.c b/asn1/h501/packet-h501-template.c
index 49a77c313b88dd660c5a392b4f54a88c6dbdbc4a..4c40ecf86879cf0281b07e413a1f759df5c9913c 100644 (file)
--- a/asn1/h501/packet-h501-template.c
+++ b/asn1/h501/packet-h501-template.c
@@ -123,7 +123,7 @@ void proto_register_h501(void) {
   proto_register_field_array(proto_h501, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));
 
-  register_dissector(PFNAME, dissect_h501_pdu, proto_h501);
+  new_register_dissector(PFNAME, dissect_h501_pdu, proto_h501);
   h501_pdu_handle = find_dissector(PFNAME);
 
   h501_udp_handle = new_create_dissector_handle(dissect_h501_udp, proto_h501);

diff --git a/epan/dissectors/packet-h282.c b/epan/dissectors/packet-h282.c
index 81dec444bda134a471c9c813cf5c57003dc49e4f..90bcc0723b044dfe46abc704a340bbeac8cb55a8 100644 (file)
--- a/epan/dissectors/packet-h282.c
+++ b/epan/dissectors/packet-h282.c
@@ -1,7 +1,7 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Wireshark dissector compiler   */
 /* packet-h282.c                                                              */
-/* ../../tools/asn2wrs.py -p h282 -c h282.cnf -s packet-h282-template RDC-PROTOCOL.asn */
+/* ../../../svn/trunk/tools/asn2wrs.py -p h282 -c ../../../svn/trunk/asn1/h282/h282.cnf -s ../../../svn/trunk/asn1/h282/packet-h282-template -D ../../../svn/trunk/asn1/h282 RDC-PROTOCOL.asn */
 
 /* Input file: packet-h282-template.c */
 
@@ -6385,8 +6385,8 @@ void proto_register_h282(void) {
   proto_register_field_array(proto_h282, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));
 
-  register_dissector(PFNAME, dissect_h282, proto_h282);
-  register_dissector(PFNAME".device_list", dissect_NonCollapsingCapabilities_PDU, proto_h282);
+  new_register_dissector(PFNAME, dissect_h282, proto_h282);
+  new_register_dissector(PFNAME".device_list", dissect_NonCollapsingCapabilities_PDU, proto_h282);
 
 }
 

diff --git a/epan/dissectors/packet-h283.c b/epan/dissectors/packet-h283.c
index 9a3cd4df276f4b98aba52d8637b236d3002fc26d..567c43fb12799fde49eae182688a35ef709830d8 100644 (file)
--- a/epan/dissectors/packet-h283.c
+++ b/epan/dissectors/packet-h283.c
@@ -1,7 +1,7 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Wireshark dissector compiler   */
 /* packet-h283.c                                                              */
-/* ../../tools/asn2wrs.py -p h283 -c h283.cnf -s packet-h283-template LCT-PROTOCOL.asn */
+/* ../../../svn/trunk/tools/asn2wrs.py -p h283 -c ../../../svn/trunk/asn1/h283/h283.cnf -s ../../../svn/trunk/asn1/h283/packet-h283-template -D ../../../svn/trunk/asn1/h283 LCT-PROTOCOL.asn */
 
 /* Input file: packet-h283-template.c */
 
@@ -766,7 +766,7 @@ void proto_register_h283(void) {
   proto_register_field_array(proto_h283, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));
 
-  register_dissector(PFNAME, dissect_h283_udp, proto_h283);
+  new_register_dissector(PFNAME, dissect_h283_udp, proto_h283);
   h283_udp_handle = find_dissector(PFNAME);
 
 }

diff --git a/epan/dissectors/packet-h501.c b/epan/dissectors/packet-h501.c
index 366b897869aff96386ca2b7f5d293066886e3f0c..fef28cd15ecb366767e617f59f03c80b1968b296 100644 (file)
--- a/epan/dissectors/packet-h501.c
+++ b/epan/dissectors/packet-h501.c
@@ -1,7 +1,7 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Wireshark dissector compiler   */
 /* packet-h501.c                                                              */
-/* ../../tools/asn2wrs.py -p h501 -c h501.cnf -s packet-h501-template H501-MESSAGES.asn */
+/* ../../../svn/trunk/tools/asn2wrs.py -p h501 -c ../../../svn/trunk/asn1/h501/h501.cnf -s ../../../svn/trunk/asn1/h501/packet-h501-template -D ../../../svn/trunk/asn1/h501 H501-MESSAGES.asn */
 
 /* Input file: packet-h501-template.c */
 
@@ -3689,7 +3689,7 @@ void proto_register_h501(void) {
   proto_register_field_array(proto_h501, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));
 
-  register_dissector(PFNAME, dissect_h501_pdu, proto_h501);
+  new_register_dissector(PFNAME, dissect_h501_pdu, proto_h501);
   h501_pdu_handle = find_dissector(PFNAME);
 
   h501_udp_handle = new_create_dissector_handle(dissect_h501_udp, proto_h501);