diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2005-09-05 16:41:11 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2005-09-05 16:41:11 +0000 |
| commit | 1888e9439cf5c2c98a17eb0e8daf0a2ad924cdc5 (patch) | |
| tree | 6a6ef21379c1182c66fadc40e77adfc60c6bd844 /asn1/ftam | |
| parent | 4e9a8fc4fa3c2dd48a754aab595ac98f163ff832 (diff) | |
| download | wireshark-1888e9439cf5c2c98a17eb0e8daf0a2ad924cdc5.tar.gz | |
Add some OID:s as we now use the Presentation context and use FN_PARS.
svn path=/trunk/; revision=15688
Diffstat (limited to 'asn1/ftam')
| -rw-r--r-- | asn1/ftam/ftam.cnf | 23 | ||||
| -rw-r--r-- | asn1/ftam/packet-ftam-template.c | 9 |
2 files changed, 21 insertions, 11 deletions
diff --git a/asn1/ftam/ftam.cnf b/asn1/ftam/ftam.cnf index a3a17a9cdf..558397c502 100644 --- a/asn1/ftam/ftam.cnf +++ b/asn1/ftam/ftam.cnf @@ -701,12 +701,13 @@ Legal-Qualification-Attribute/actual-values actual_values9 } offset = dissect_ber_choice(pinfo, tree, tvb, offset, Operation_Result_choice, hf_index, ett_ftam_Operation_Result, NULL); +#.FN_PARS FTAM-Regime-PDU + VAL_PTR = &branch_taken #.FN_BODY FTAM-Regime-PDU gint branch_taken; - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - FTAM_Regime_PDU_choice, hf_index, ett_ftam_FTAM_Regime_PDU, &branch_taken); + %(DEFAULT_BODY)s if( (branch_taken!=-1) && ftam_FTAM_Regime_PDU_vals[branch_taken].strptr ){ if (check_col(pinfo->cinfo, COL_INFO)) { @@ -714,11 +715,13 @@ Legal-Qualification-Attribute/actual-values actual_values9 } } +#.FN_PARS File-PDU + VAL_PTR = &branch_taken + #.FN_BODY File-PDU gint branch_taken; - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - File_PDU_choice, hf_index, ett_ftam_File_PDU, &branch_taken); + %(DEFAULT_BODY)s if( (branch_taken!=-1) && ftam_File_PDU_vals[branch_taken].strptr ){ if (check_col(pinfo->cinfo, COL_INFO)) { @@ -726,11 +729,13 @@ Legal-Qualification-Attribute/actual-values actual_values9 } } +#.FN_PARS Bulk-Data-PDU + VAL_PTR = &branch_taken + #.FN_BODY Bulk-Data-PDU gint branch_taken; - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - Bulk_Data_PDU_choice, hf_index, ett_ftam_Bulk_Data_PDU, &branch_taken); + %(DEFAULT_BODY)s if( (branch_taken!=-1) && ftam_Bulk_Data_PDU_vals[branch_taken].strptr ){ if (check_col(pinfo->cinfo, COL_INFO)) { @@ -738,11 +743,13 @@ Legal-Qualification-Attribute/actual-values actual_values9 } } +#.FN_PARS FSM-PDU + VAL_PTR = &branch_taken + #.FN_BODY FSM-PDU gint branch_taken; - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - FSM_PDU_choice, hf_index, ett_ftam_FSM_PDU, &branch_taken); + %(DEFAULT_BODY)s if( (branch_taken!=-1) && ftam_FSM_PDU_vals[branch_taken].strptr ){ if (check_col(pinfo->cinfo, COL_INFO)) { diff --git a/asn1/ftam/packet-ftam-template.c b/asn1/ftam/packet-ftam-template.c index 3703daeae9..c737a6a297 100644 --- a/asn1/ftam/packet-ftam-template.c +++ b/asn1/ftam/packet-ftam-template.c @@ -43,7 +43,7 @@ #include "packet-acse.h" #include "packet-ftam.h" -#define PNAME "FTAM" +#define PNAME "ISO 8571 FTAM" #define PSNAME "FTAM" #define PFNAME "ftam" @@ -121,7 +121,10 @@ void proto_register_ftam(void) { /*--- proto_reg_handoff_ftam --- */ void proto_reg_handoff_ftam(void) { - register_ber_oid_dissector("1.0.8571.1.1", dissect_ftam, proto_ftam, - "ftam"); + register_ber_oid_dissector("1.0.8571.1.1", dissect_ftam, proto_ftam,"iso-ftam(1)"); + register_ber_oid_dissector("1.0.8571.2.1", dissect_ftam, proto_ftam,"ftam-pci(1)"); + register_ber_oid_name("1.3.14.5.5.9","NBS-9 FTAM file directory file"); + 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"); } |