From 1f58f3e2ec39d4190f3912aea6fa938f98adac42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stig=20Bj=C3=B8rlykke?= Date: Sat, 25 Aug 2007 09:57:12 +0000 Subject: [PATCH] Removed duplicate entry of OID 1.0.8571.2.4 in FTAM svn path=/trunk/; revision=22655 --- asn1/ftam/packet-ftam-template.c | 3 +-- epan/dissectors/packet-ftam.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/asn1/ftam/packet-ftam-template.c b/asn1/ftam/packet-ftam-template.c index e8af2164df..155a0edbcc 100644 --- a/asn1/ftam/packet-ftam-template.c +++ b/asn1/ftam/packet-ftam-template.c @@ -160,12 +160,11 @@ void proto_reg_handoff_ftam(void) { register_ber_oid_dissector("1.0.8571.5.1", dissect_ftam_unstructured_text, proto_ftam,"ISO FTAM unstructured text"); add_oid_str_name("1.0.8571.5.2","ISO FTAM sequential text"); add_oid_str_name("1.0.8571.2.3","FTAM unstructured text abstract syntax"); - add_oid_str_name("1.0.8571.2.4","FTAM sequential text abstract syntax"); add_oid_str_name("1.0.8571.2.5","FTAM simple-hierarchy"); add_oid_str_name("1.0.8571.3.1","FTAM hierarchical file model"); add_oid_str_name("1.0.8571.4.1","FTAM unstructured constraint set"); - /* Unstructured text file document type FTAM-3 */ + /* Unstructured binary file document type FTAM-3 */ register_ber_oid_dissector("1.0.8571.5.3", dissect_ftam_unstructured_binary, proto_ftam,"ISO FTAM unstructured binary"); add_oid_str_name("1.0.8571.2.4","FTAM unstructured binary abstract syntax"); diff --git a/epan/dissectors/packet-ftam.c b/epan/dissectors/packet-ftam.c index 14cee681cb..6454418ea6 100644 --- a/epan/dissectors/packet-ftam.c +++ b/epan/dissectors/packet-ftam.c @@ -6741,12 +6741,11 @@ void proto_reg_handoff_ftam(void) { register_ber_oid_dissector("1.0.8571.5.1", dissect_ftam_unstructured_text, proto_ftam,"ISO FTAM unstructured text"); add_oid_str_name("1.0.8571.5.2","ISO FTAM sequential text"); add_oid_str_name("1.0.8571.2.3","FTAM unstructured text abstract syntax"); - add_oid_str_name("1.0.8571.2.4","FTAM sequential text abstract syntax"); add_oid_str_name("1.0.8571.2.5","FTAM simple-hierarchy"); add_oid_str_name("1.0.8571.3.1","FTAM hierarchical file model"); add_oid_str_name("1.0.8571.4.1","FTAM unstructured constraint set"); - /* Unstructured text file document type FTAM-3 */ + /* Unstructured binary file document type FTAM-3 */ register_ber_oid_dissector("1.0.8571.5.3", dissect_ftam_unstructured_binary, proto_ftam,"ISO FTAM unstructured binary"); add_oid_str_name("1.0.8571.2.4","FTAM unstructured binary abstract syntax");