Add some OID:s as we now use the Presentation context and use FN_PARS.

svn path=/trunk/; revision=15688
This commit is contained in:
Anders Broman 2005-09-05 16:41:11 +00:00
parent 4e9a8fc4fa
commit 1888e9439c
3 changed files with 23 additions and 13 deletions

View File

@ -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)) {

View File

@ -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");
}

View File

@ -114,7 +114,7 @@ void proto_register_mms(void) {
/*--- proto_reg_handoff_mms --- */
void proto_reg_handoff_mms(void) {
register_ber_oid_dissector("1.0.9506.2.3", dissect_mms, proto_mms,
"mms");
register_ber_oid_dissector("1.0.9506.2.3", dissect_mms, proto_mms,"MMS");
register_ber_oid_dissector("1.0.9506.2.1", dissect_mms, proto_mms,"mms-abstract-syntax-version1(1)");
}