diff options
| author | Tomas Kukosa <tomas.kukosa@siemens.com> | 2006-06-28 14:19:08 +0000 |
|---|---|---|
| committer | Tomas Kukosa <tomas.kukosa@siemens.com> | 2006-06-28 14:19:08 +0000 |
| commit | 56d7db0c08d734d672c64d6c5c566ae3d70b7ed7 (patch) | |
| tree | 8630f1f8a3129f886a07f432a88db41cad2af16d /asn1/ftam | |
| parent | 45aac4eb43f1c822625dd95551f4b694ee770e20 (diff) | |
remove functions register_ber_oid_name() and get_ber_oid_name() from packet-ber.c, they were only OID but not BER related
use add_oid_str_name() and get_oid_str_name() instead of them
svn path=/trunk/; revision=18595
Diffstat (limited to 'asn1/ftam')
| -rw-r--r-- | asn1/ftam/packet-ftam-template.c | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/asn1/ftam/packet-ftam-template.c b/asn1/ftam/packet-ftam-template.c index 66d33238ef..5a5fe32280 100644 --- a/asn1/ftam/packet-ftam-template.c +++ b/asn1/ftam/packet-ftam-template.c @@ -35,6 +35,7 @@ #include <glib.h> #include <epan/packet.h> #include <epan/conversation.h> +#include <epan/oid_resolv.h> #include <stdio.h> #include <string.h> @@ -126,22 +127,22 @@ void proto_reg_handoff_ftam(void) { register_ber_oid_dissector("1.3.14.5.2.2", dissect_ftam, proto_ftam,"NIST file directory entry abstract syntax"); /* Unstructured text file document type FTAM-1 */ - register_ber_oid_name("1.0.8571.5.1","ISO FTAM unstructured text"); - register_ber_oid_name("1.0.8571.5.2","ISO FTAM sequential text"); - register_ber_oid_name("1.0.8571.2.3","FTAM unstructured text abstract syntax"); - register_ber_oid_name("1.0.8571.2.4","FTAM sequential text abstract syntax"); - register_ber_oid_name("1.0.8571.2.5","FTAM simple-hierarchy"); - register_ber_oid_name("1.0.8571.3.1","FTAM hierarchical file model"); - register_ber_oid_name("1.0.8571.4.1","FTAM unstructured constraint set"); + add_oid_str_name("1.0.8571.5.1","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 */ - register_ber_oid_name("1.0.8571.5.3","ISO FTAM unstructured binary"); - register_ber_oid_name("1.0.8571.2.4","FTAM unstructured binary abstract syntax"); + add_oid_str_name("1.0.8571.5.3","ISO FTAM unstructured binary"); + add_oid_str_name("1.0.8571.2.4","FTAM unstructured binary abstract syntax"); /* Filedirectory file document type NBS-9 */ - register_ber_oid_name("1.3.14.5.5.9","NBS-9 FTAM file directory file"); + add_oid_str_name("1.3.14.5.5.9","NBS-9 FTAM file directory file"); /* Filedirectory file document type NBS-9 (WITH OLD NIST OIDs)*/ - register_ber_oid_name("1.3.9999.1.5.9","NBS-9-OLD FTAM file directory file"); - register_ber_oid_name("1.3.9999.1.2.2","NIST file directory entry abstract syntax"); + add_oid_str_name("1.3.9999.1.5.9","NBS-9-OLD FTAM file directory file"); + add_oid_str_name("1.3.9999.1.2.2","NIST file directory entry abstract syntax"); } |