aboutsummaryrefslogtreecommitdiffstats
path: root/asn1
diff options
context:
space:
mode:
authorAnders Broman <anders.broman@ericsson.com>2005-12-16 07:05:50 +0000
committerAnders Broman <anders.broman@ericsson.com>2005-12-16 07:05:50 +0000
commit8d05164bece975e5b78d00169020f83956052c5e (patch)
tree39b24697420c6c57996563ee01ac06216be63206 /asn1
parent483ec5bd0548f9720551737670c163fba32c3a8e (diff)
Get rid of duplicted dissector tables for MTP3 Service indicator and SCCP ssn:s
svn path=/trunk/; revision=16815
Diffstat (limited to 'asn1')
-rw-r--r--asn1/h248/Makefile.nmake4
-rw-r--r--asn1/h248/packet-h248-template.c1
-rw-r--r--asn1/tcap/packet-tcap-template.c2
3 files changed, 2 insertions, 5 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);
}
}