Get rid of duplicted dissector tables for MTP3 Service indicator and SCCP ssn:s

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

11 files changed, 13 insertions, 20 deletions

diff --git a/asn1/h248/Makefile.nmake b/asn1/h248/Makefile.nmake
index 522db38a20..42e34f8a68 100644
--- a/asn1/h248/Makefile.nmake
+++ b/asn1/h248/Makefile.nmake
@@ -37,5 +37,5 @@ fix_eol: generate_dissector
 	del /f packet-$(PROTOCOL_NAME).c.tmp packet-$(PROTOCOL_NAME).h.tmp
 
 copy_files: generate_dissector fix_eol
-	xcopy packet-$(PROTOCOL_NAME).c ..\..\epan\dissectors /d
-	xcopy packet-$(PROTOCOL_NAME).h ..\..\epan\dissectors /d
+	xcopy packet-$(PROTOCOL_NAME).c ..\..\epan\dissectors /d /y
+	xcopy packet-$(PROTOCOL_NAME).h ..\..\epan\dissectors /d /y
diff --git a/asn1/h248/packet-h248-template.c b/asn1/h248/packet-h248-template.c
index f997767fbe..a41910933b 100644
--- a/asn1/h248/packet-h248-template.c
+++ b/asn1/h248/packet-h248-template.c
@@ -1635,7 +1635,6 @@ void proto_reg_handoff_h248(void) {
   h248_handle = find_dissector("h248");
   h248_term_handle = find_dissector("h248term");
 
-  dissector_add("m3ua.protocol_data_si", GATEWAY_CONTROL_PROTOCOL_USER_ID, h248_handle);
   dissector_add("mtp3.service_indicator", GATEWAY_CONTROL_PROTOCOL_USER_ID, h248_handle);
   dissector_add("sctp.ppi", H248_PAYLOAD_PROTOCOL_ID, h248_handle);
 }
diff --git a/asn1/tcap/packet-tcap-template.c b/asn1/tcap/packet-tcap-template.c
index dd1879bfe4..049c976c15 100644
--- a/asn1/tcap/packet-tcap-template.c
+++ b/asn1/tcap/packet-tcap-template.c
@@ -229,7 +229,6 @@ static void range_delete_callback(guint32 ssn)
 {
     if (ssn) {
 	dissector_delete("sccp.ssn", ssn, tcap_handle);
-	dissector_delete("sua.ssn", ssn, tcap_handle);
     }
 }
 
@@ -237,7 +236,6 @@ static void range_add_callback(guint32 ssn)
 {
     if (ssn) {
 	dissector_add("sccp.ssn", ssn, tcap_handle);
-	dissector_add("sua.ssn", ssn, tcap_handle);
     }
 }
 
diff --git a/epan/dissectors/packet-h248.c b/epan/dissectors/packet-h248.c
index a7a3b84aa4..69cb014c28 100644
--- a/epan/dissectors/packet-h248.c
+++ b/epan/dissectors/packet-h248.c
@@ -1,6 +1,6 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* ./packet-h248.c                                                            */
+/* .\packet-h248.c                                                            */
 /* ../../tools/asn2eth.py -X -b -e -p h248 -c h248.cnf -s packet-h248-template MEGACO.asn */
 
 /* Input file: packet-h248-template.c */
@@ -6828,7 +6828,6 @@ void proto_reg_handoff_h248(void) {
   h248_handle = find_dissector("h248");
   h248_term_handle = find_dissector("h248term");
 
-  dissector_add("m3ua.protocol_data_si", GATEWAY_CONTROL_PROTOCOL_USER_ID, h248_handle);
   dissector_add("mtp3.service_indicator", GATEWAY_CONTROL_PROTOCOL_USER_ID, h248_handle);
   dissector_add("sctp.ppi", H248_PAYLOAD_PROTOCOL_ID, h248_handle);
 }
diff --git a/epan/dissectors/packet-h248.h b/epan/dissectors/packet-h248.h
index 2d84f63f81..64b8082217 100644
--- a/epan/dissectors/packet-h248.h
+++ b/epan/dissectors/packet-h248.h
@@ -1,6 +1,6 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* ./packet-h248.h                                                            */
+/* .\packet-h248.h                                                            */
 /* ../../tools/asn2eth.py -X -b -e -p h248 -c h248.cnf -s packet-h248-template MEGACO.asn */
 
 /* Input file: packet-h248-template.h */
diff --git a/epan/dissectors/packet-isup.c b/epan/dissectors/packet-isup.c
index 2fd59ae7ac..858dfa43f2 100644
--- a/epan/dissectors/packet-isup.c
+++ b/epan/dissectors/packet-isup.c
@@ -6828,7 +6828,6 @@ proto_reg_handoff_isup(void)
   isup_handle = create_dissector_handle(dissect_isup, proto_isup);
   application_isup_handle = create_dissector_handle(dissect_application_isup, proto_isup);
   dissector_add("mtp3.service_indicator", MTP3_ISUP_SERVICE_INDICATOR, isup_handle);
-  dissector_add("m3ua.protocol_data_si", MTP3_ISUP_SERVICE_INDICATOR, isup_handle);
   dissector_add_string("media_type","application/isup", application_isup_handle);
   dissector_add_string("tali.opcode", "isot", isup_handle);
 
@@ -6868,6 +6867,5 @@ proto_reg_handoff_bicc(void)
 
   bicc_handle = create_dissector_handle(dissect_bicc, proto_bicc);
   dissector_add("mtp3.service_indicator", MTP3_BICC_SERVICE_INDICATOR, bicc_handle);
-  dissector_add("m3ua.protocol_data_si", MTP3_BICC_SERVICE_INDICATOR, bicc_handle);
   dissector_add("sctp.ppi", BICC_PAYLOAD_PROTOCOL_ID, bicc_handle);
 }
diff --git a/epan/dissectors/packet-m3ua.c b/epan/dissectors/packet-m3ua.c
index 08d0687f1b..dce84ec981 100644
--- a/epan/dissectors/packet-m3ua.c
+++ b/epan/dissectors/packet-m3ua.c
@@ -2007,7 +2007,6 @@ proto_register_m3ua(void)
   /* Required function calls to register the header fields and subtrees used */
   proto_register_field_array(proto_m3ua, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));
-  si_dissector_table = register_dissector_table("m3ua.protocol_data_si", "MTP3 Service indicator", FT_UINT8, BASE_HEX);
 
 }
 
@@ -2024,4 +2023,6 @@ proto_reg_handoff_m3ua(void)
   m3ua_handle = create_dissector_handle(dissect_m3ua, proto_m3ua);
   dissector_add("sctp.ppi",  M3UA_PAYLOAD_PROTOCOL_ID, m3ua_handle);
   dissector_add("sctp.port", SCTP_PORT_M3UA, m3ua_handle);
+
+  si_dissector_table = find_dissector_table("mtp3.service_indicator");
 }
diff --git a/epan/dissectors/packet-sccp.c b/epan/dissectors/packet-sccp.c
index 4e2787faf1..d190c39d63 100644
--- a/epan/dissectors/packet-sccp.c
+++ b/epan/dissectors/packet-sccp.c
@@ -2533,7 +2533,6 @@ proto_reg_handoff_sccp(void)
   sccp_handle = find_dissector("sccp");
 
   dissector_add("mtp3.service_indicator", SCCP_SI, sccp_handle);
-  dissector_add("m3ua.protocol_data_si", SCCP_SI, sccp_handle);
   dissector_add_string("tali.opcode", "sccp", sccp_handle);
 
   data_handle = find_dissector("data");
diff --git a/epan/dissectors/packet-sua.c b/epan/dissectors/packet-sua.c
index 4b8a540a66..0467d8ab0d 100644
--- a/epan/dissectors/packet-sua.c
+++ b/epan/dissectors/packet-sua.c
@@ -328,7 +328,7 @@ static gint ett_sua_return_on_error_bit_and_protocol_class = -1;
 static gint ett_sua_protcol_classes = -1;
 
 static dissector_handle_t data_handle;
-static dissector_table_t sua_ssn_dissector_table;
+static dissector_table_t sccp_ssn_dissector_table;
 
 /* stuff for supporting multiple versions */
 typedef enum {
@@ -1825,9 +1825,9 @@ dissect_sua_message(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *sua_t
   {
     /* Try subdissectors (if we found a valid SSN on the current message) */
     if ((dest_ssn == INVALID_SSN ||
-       !dissector_try_port(sua_ssn_dissector_table, dest_ssn, data_tvb, pinfo, tree))
+       !dissector_try_port(sccp_ssn_dissector_table, dest_ssn, data_tvb, pinfo, tree))
        && (source_ssn == INVALID_SSN ||
-       !dissector_try_port(sua_ssn_dissector_table, source_ssn, data_tvb, pinfo, tree)))
+       !dissector_try_port(sccp_ssn_dissector_table, source_ssn, data_tvb, pinfo, tree)))
     {
       /* No sub-dissection occured, treat it as raw data */
       call_dissector(data_handle, data_tvb, pinfo, sua_tree);
@@ -2010,7 +2010,6 @@ proto_register_sua(void)
   prefs_register_obsolete_preference(sua_module, "sua_version");
   prefs_register_enum_preference(sua_module, "version", "SUA Version", "Version used by Ethereal", &version, options, FALSE);
 
-  sua_ssn_dissector_table = register_dissector_table("sua.ssn", "SUA SSN", FT_UINT8, BASE_DEC);
 }
 
 void
@@ -2023,4 +2022,6 @@ proto_reg_handoff_sua(void)
   dissector_add("sctp.port", SCTP_PORT_SUA,           sua_handle);
 
   data_handle = find_dissector("data");
+  sccp_ssn_dissector_table = find_dissector_table("sccp.ssn");
+ 
 }
diff --git a/epan/dissectors/packet-tcap.c b/epan/dissectors/packet-tcap.c
index 072356c0de..22bce30bda 100644
--- a/epan/dissectors/packet-tcap.c
+++ b/epan/dissectors/packet-tcap.c
@@ -1,6 +1,6 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* ./packet-tcap.c                                                            */
+/* .\packet-tcap.c                                                            */
 /* ../../tools/asn2eth.py -X -b -e -p tcap -c tcap.cnf -s packet-tcap-template tcap.asn */
 
 /* Input file: packet-tcap-template.c */
@@ -2957,7 +2957,6 @@ static void range_delete_callback(guint32 ssn)
 {
     if (ssn) {
 	dissector_delete("sccp.ssn", ssn, tcap_handle);
-	dissector_delete("sua.ssn", ssn, tcap_handle);
     }
 }
 
@@ -2965,7 +2964,6 @@ static void range_add_callback(guint32 ssn)
 {
     if (ssn) {
 	dissector_add("sccp.ssn", ssn, tcap_handle);
-	dissector_add("sua.ssn", ssn, tcap_handle);
     }
 }
 
diff --git a/epan/dissectors/packet-tcap.h b/epan/dissectors/packet-tcap.h
index 7b3f85926a..0663e66a57 100644
--- a/epan/dissectors/packet-tcap.h
+++ b/epan/dissectors/packet-tcap.h
@@ -1,6 +1,6 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* ./packet-tcap.h                                                            */
+/* .\packet-tcap.h                                                            */
 /* ../../tools/asn2eth.py -X -b -e -p tcap -c tcap.cnf -s packet-tcap-template tcap.asn */
 
 /* Input file: packet-tcap-template.h */