diff options
| author | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2005-06-26 05:48:50 +0000 |
|---|---|---|
| committer | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2005-06-26 05:48:50 +0000 |
| commit | 3a51ba4293f6d98309471aeee7f2b1010c96b7cb (patch) | |
| tree | 1bfaf8b92a640262162e7f0432a43a84d0381e6d | |
| parent | cc3b0df4caeb0c7ba1e168e5b91837e1c5243929 (diff) | |
make dissect_ber_choice take a guint* that will return the
index of the branch taken or -1 to make prettifications easier to implement.
change the signature of dissect_ber_choice and rename it to dissect_ber_CHOICE to catch all
occurences of the use of this function
update asn2eth to use the new name/signature
update all occurences of this function to the new name and new signature.
svn path=/trunk/; revision=14758
39 files changed, 1101 insertions, 995 deletions
diff --git a/asn1/camel/packet-camel-template.c b/asn1/camel/packet-camel-template.c index 0f8226b6b3..0b27b2e865 100644 --- a/asn1/camel/packet-camel-template.c +++ b/asn1/camel/packet-camel-template.c @@ -421,8 +421,8 @@ static const ber_choice_t InvokeId_choice[] = { static int dissect_camel_InvokeId(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - InvokeId_choice, hf_index, ett_camel_InvokeId); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + InvokeId_choice, hf_index, ett_camel_InvokeId, NULL); return offset; } @@ -524,8 +524,8 @@ dissect_camel_camelPDU(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, pac col_append_fstr(pinfo->cinfo, COL_INFO, val_to_str(camel_pdu_type, camelPDU_vals, "Unknown Camel (%u)")); } - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - camelPDU_choice, hf_index, ett_camel_camelPDU); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + camelPDU_choice, hf_index, ett_camel_camelPDU, NULL); return offset; } diff --git a/asn1/ftam/ftam.cnf b/asn1/ftam/ftam.cnf index 4a8df93ae6..935058fefe 100755 --- a/asn1/ftam/ftam.cnf +++ b/asn1/ftam/ftam.cnf @@ -629,8 +629,8 @@ Legal-Qualification-Attribute/actual-values actual_values9 offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); offset = get_ber_length(tree, tvb, offset, &len1, &ind_field); - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - Password_choice, hf_index, ett_ftam_Password); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + Password_choice, hf_index, ett_ftam_Password, NULL); #.FN_BODY FADU-Identity @@ -645,8 +645,8 @@ Legal-Qualification-Attribute/actual-values actual_values9 offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); offset = get_ber_length(tree, tvb, offset, &len1, &ind_field); - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - FADU_Identity_choice, hf_index, ett_ftam_FADU_Identity); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + FADU_Identity_choice, hf_index, ett_ftam_FADU_Identity, NULL); #.FN_BODY Operation-Result gint8 class; @@ -660,6 +660,6 @@ Legal-Qualification-Attribute/actual-values actual_values9 offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); offset = get_ber_length(tree, tvb, offset, &len1, &ind_field); - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - Operation_Result_choice, hf_index, ett_ftam_Operation_Result); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + Operation_Result_choice, hf_index, ett_ftam_Operation_Result, NULL); diff --git a/asn1/gsmmap/packet-gsm_map-template.c b/asn1/gsmmap/packet-gsm_map-template.c index 514fc3e89b..22b8dd0f1a 100644 --- a/asn1/gsmmap/packet-gsm_map-template.c +++ b/asn1/gsmmap/packet-gsm_map-template.c @@ -874,8 +874,8 @@ static const ber_choice_t InvokeId_choice[] = { static int dissect_gsm_map_InvokeId(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - InvokeId_choice, hf_index, ett_gsm_map_InvokeId); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + InvokeId_choice, hf_index, ett_gsm_map_InvokeId, NULL); return offset; } @@ -952,8 +952,8 @@ static const ber_choice_t ReturnError_result_choice[] = { static int dissect_ReturnError_result(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - ReturnError_result_choice, hf_gsm_map_returnError_result, ett_gsm_map_ReturnError_result); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + ReturnError_result_choice, hf_gsm_map_returnError_result, ett_gsm_map_ReturnError_result, NULL); return offset; } @@ -1020,8 +1020,8 @@ dissect_gsm_map_GSMMAPPDU(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, col_set_str(pinfo->cinfo, COL_INFO, val_to_str(gsmmap_pdu_type, GSMMAPPDU_vals, "Unknown GSM-MAP PDU (%u)")); } - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - GSMMAPPDU_choice, hf_index, ett_gsm_map_GSMMAPPDU); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + GSMMAPPDU_choice, hf_index, ett_gsm_map_GSMMAPPDU, NULL); return offset; diff --git a/asn1/inap/packet-inap-template.c b/asn1/inap/packet-inap-template.c index 2df60d5d2f..82f7affe97 100644 --- a/asn1/inap/packet-inap-template.c +++ b/asn1/inap/packet-inap-template.c @@ -265,8 +265,8 @@ static const ber_choice_t InvokeId_choice[] = { static int dissect_inap_InvokeId(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - InvokeId_choice, hf_index, ett_inap_InvokeId); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + InvokeId_choice, hf_index, ett_inap_InvokeId, NULL); return offset; } @@ -374,8 +374,8 @@ dissect_inap_INAPPDU(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packe /* Get the length and add 2 */ inap_pdu_size = tvb_get_guint8(tvb, offset+1)+2; - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - INAPPDU_choice, hf_index, ett_inap_INAPPDU); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + INAPPDU_choice, hf_index, ett_inap_INAPPDU, NULL); if (check_col(pinfo->cinfo, COL_INFO)){ col_prepend_fstr(pinfo->cinfo, COL_INFO, val_to_str(opcode, inap_opr_code_strings, "Unknown INAP (%u)")); diff --git a/asn1/pkixcmp/cmp-exp.cnf b/asn1/pkixcmp/cmp-exp.cnf index 4ad3ae82dc..1217f8ea23 100644 --- a/asn1/pkixcmp/cmp-exp.cnf +++ b/asn1/pkixcmp/cmp-exp.cnf @@ -41,7 +41,7 @@ ErrorMsgContent BER_CLASS_UNI BER_UNI_TAG_SEQUENCE PKIMessage TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 PKIHeader TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 PKIFreeText TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 -PKIBody TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(PKIBody_vals) BITMASK = 0 +PKIBody TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(cmp_PKIBody_vals) BITMASK = 0 PKIProtection TYPE = FT_BYTES DISPLAY = BASE_HEX STRINGS = NULL BITMASK = 0 ProtectedPart TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 PasswordBasedMac TYPE = FT_STRING DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 @@ -49,7 +49,7 @@ PBMParameter TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL DHBasedMac TYPE = FT_STRING DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 DHBMParameter TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 NestedMessageContent TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 -PKIStatus TYPE = FT_INT32 DISPLAY = BASE_DEC STRINGS = VALS(PKIStatus_vals) BITMASK = 0 +PKIStatus TYPE = FT_INT32 DISPLAY = BASE_DEC STRINGS = VALS(cmp_PKIStatus_vals) BITMASK = 0 PKIFailureInfo TYPE = FT_BYTES DISPLAY = BASE_HEX STRINGS = NULL BITMASK = 0 PKIStatusInfo TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 OOBCert TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 @@ -60,7 +60,7 @@ POPODecKeyRespContent TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL CertRepMessage TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 CertResponse TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 CertifiedKeyPair TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 -CertOrEncCert TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(CertOrEncCert_vals) BITMASK = 0 +CertOrEncCert TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(cmp_CertOrEncCert_vals) BITMASK = 0 KeyRecRepContent TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 RevReqContent TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 RevDetails TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 diff --git a/asn1/tcap/tcap.cnf b/asn1/tcap/tcap.cnf index d2cdea9797..38543d6c03 100644 --- a/asn1/tcap/tcap.cnf +++ b/asn1/tcap/tcap.cnf @@ -122,14 +122,14 @@ if (ber_oid_dissector_table && cur_oid){ if(!dissector_try_string(ber_oid_dissector_table, cur_oid, next_tvb, pinfo, tcap_top_tree)) { if (!dissector_try_port(tcap_itu_ssn_dissector_table, pinfo->match_port, next_tvb,pinfo, tcap_top_tree)) - dissect_ber_choice(pinfo, tree, next_tvb, 0, - Component_choice, hf_index, ett_tcap_Component); + dissect_ber_CHOICE(pinfo, tree, next_tvb, 0, + Component_choice, hf_index, ett_tcap_Component, NULL); } } else if (!dissector_try_port(tcap_itu_ssn_dissector_table, pinfo->match_port, next_tvb, pinfo, tcap_top_tree)) - dissect_ber_choice(pinfo, tree, next_tvb, 0, - Component_choice, hf_index, ett_tcap_Component); + dissect_ber_CHOICE(pinfo, tree, next_tvb, 0, + Component_choice, hf_index, ett_tcap_Component, NULL); offset+=len; @@ -189,8 +189,8 @@ next_tvb = tvb_new_subset(tvb, offset, -1, -1); if (!dissector_try_port(tcap_ansi_ssn_dissector_table, pinfo->match_port, next_tvb, pinfo, tcap_top_tree)) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - ComponentPDU_choice, hf_index, ett_tcap_ComponentPDU); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + ComponentPDU_choice, hf_index, ett_tcap_ComponentPDU, NULL); } diff --git a/epan/dissectors/packet-MAP_DialoguePDU.c b/epan/dissectors/packet-MAP_DialoguePDU.c index 1b45e96b13..baee96ca6d 100644 --- a/epan/dissectors/packet-MAP_DialoguePDU.c +++ b/epan/dissectors/packet-MAP_DialoguePDU.c @@ -205,12 +205,10 @@ static int dissect_map_refuse_impl(packet_info *pinfo, proto_tree *tree, tvbuff_ } + static int dissect_MAP_DialoguePDU_NULL(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - { proto_item *ti_tmp; - ti_tmp = proto_tree_add_item(tree, hf_index, tvb, offset>>8, 0, FALSE); - proto_item_append_text(ti_tmp, ": NULL"); - } + offset = dissect_ber_null(implicit_tag, pinfo, tree, tvb, offset, hf_index); return offset; } @@ -281,8 +279,8 @@ static const ber_choice_t MAP_UserAbortChoice_choice[] = { static int dissect_MAP_DialoguePDU_MAP_UserAbortChoice(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - MAP_UserAbortChoice_choice, hf_index, ett_MAP_DialoguePDU_MAP_UserAbortChoice); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + MAP_UserAbortChoice_choice, hf_index, ett_MAP_DialoguePDU_MAP_UserAbortChoice, NULL); return offset; } @@ -363,8 +361,8 @@ static const ber_choice_t MAP_DialoguePDU_choice[] = { static int dissect_MAP_DialoguePDU_MAP_DialoguePDU(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - MAP_DialoguePDU_choice, hf_index, ett_MAP_DialoguePDU_MAP_DialoguePDU); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + MAP_DialoguePDU_choice, hf_index, ett_MAP_DialoguePDU_MAP_DialoguePDU, NULL); return offset; } diff --git a/epan/dissectors/packet-acse.c b/epan/dissectors/packet-acse.c index 8d9d156571..3c8da9f4c3 100644 --- a/epan/dissectors/packet-acse.c +++ b/epan/dissectors/packet-acse.c @@ -422,8 +422,8 @@ static const ber_choice_t T_encoding_choice[] = { static int dissect_acse_T_encoding(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - T_encoding_choice, hf_index, ett_acse_T_encoding); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + T_encoding_choice, hf_index, ett_acse_T_encoding, NULL); return offset; } @@ -565,8 +565,8 @@ static const ber_choice_t AP_title_choice[] = { static int dissect_acse_AP_title(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - AP_title_choice, hf_index, ett_acse_AP_title); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + AP_title_choice, hf_index, ett_acse_AP_title, NULL); return offset; } @@ -637,8 +637,8 @@ static const ber_choice_t ASO_qualifier_choice[] = { static int dissect_acse_ASO_qualifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - ASO_qualifier_choice, hf_index, ett_acse_ASO_qualifier); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + ASO_qualifier_choice, hf_index, ett_acse_ASO_qualifier, NULL); return offset; } @@ -816,8 +816,8 @@ static const ber_choice_t Authentication_value_choice[] = { static int dissect_acse_Authentication_value(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - Authentication_value_choice, hf_index, ett_acse_Authentication_value); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + Authentication_value_choice, hf_index, ett_acse_Authentication_value, NULL); return offset; } @@ -1002,8 +1002,8 @@ static const ber_choice_t Syntactic_context_list_choice[] = { static int dissect_acse_Syntactic_context_list(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - Syntactic_context_list_choice, hf_index, ett_acse_Syntactic_context_list); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + Syntactic_context_list_choice, hf_index, ett_acse_Syntactic_context_list, NULL); return offset; } @@ -1240,8 +1240,8 @@ static const ber_choice_t Associate_source_diagnostic_choice[] = { static int dissect_acse_Associate_source_diagnostic(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - Associate_source_diagnostic_choice, hf_index, ett_acse_Associate_source_diagnostic); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + Associate_source_diagnostic_choice, hf_index, ett_acse_Associate_source_diagnostic, NULL); return offset; } @@ -1561,8 +1561,8 @@ static const ber_choice_t T_presentation_data_values_choice[] = { static int dissect_acse_T_presentation_data_values(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - T_presentation_data_values_choice, hf_index, ett_acse_T_presentation_data_values); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + T_presentation_data_values_choice, hf_index, ett_acse_T_presentation_data_values, NULL); return offset; } @@ -1605,8 +1605,8 @@ static const ber_choice_t User_Data_choice[] = { static int dissect_acse_User_Data(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - User_Data_choice, hf_index, ett_acse_User_Data); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + User_Data_choice, hf_index, ett_acse_User_Data, NULL); return offset; } @@ -1735,8 +1735,8 @@ static const ber_choice_t ACSE_apdu_choice[] = { static int dissect_acse_ACSE_apdu(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - ACSE_apdu_choice, hf_index, ett_acse_ACSE_apdu); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + ACSE_apdu_choice, hf_index, ett_acse_ACSE_apdu, NULL); return offset; } @@ -1788,8 +1788,8 @@ static const ber_choice_t AE_title_choice[] = { static int dissect_acse_AE_title(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - AE_title_choice, hf_index, ett_acse_AE_title); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + AE_title_choice, hf_index, ett_acse_AE_title, NULL); return offset; } diff --git a/epan/dissectors/packet-ber.c b/epan/dissectors/packet-ber.c index 11e13729c3..ffce260143 100644 --- a/epan/dissectors/packet-ber.c +++ b/epan/dissectors/packet-ber.c @@ -1067,7 +1067,7 @@ printf("SEQUENCE dissect_ber_sequence(%s) subdissector ate %d bytes\n",name,coun * in case it was a CHOICE { } OPTIONAL */ int -dissect_ber_choice(packet_info *pinfo, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_choice_t *choice, gint hf_id, gint ett_id) +dissect_ber_CHOICE(packet_info *pinfo, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_choice_t *choice, gint hf_id, gint ett_id, gint *branch_taken) { gint8 class; gboolean pc, ind; @@ -1093,9 +1093,9 @@ name=hfinfo->name; name="unnamed"; } if(tvb_length_remaining(tvb,offset)>3){ -printf("CHOICE dissect_ber_choice(%s) entered offset:%d len:%d %02x:%02x:%02x\n",name,offset,tvb_length_remaining(tvb,offset),tvb_get_guint8(tvb,offset),tvb_get_guint8(tvb,offset+1),tvb_get_guint8(tvb,offset+2)); +printf("CHOICE dissect_ber_CHOICE(%s) entered offset:%d len:%d %02x:%02x:%02x\n",name,offset,tvb_length_remaining(tvb,offset),tvb_get_guint8(tvb,offset),tvb_get_guint8(tvb,offset+1),tvb_get_guint8(tvb,offset+2)); }else{ -printf("CHOICE dissect_ber_choice(%s) entered len:%d\n",name,tvb_length_remaining(tvb,offset)); +printf("CHOICE dissect_ber_CHOICE(%s) entered len:%d\n",name,tvb_length_remaining(tvb,offset)); } } #endif @@ -1127,8 +1127,8 @@ printf("CHOICE dissect_ber_choice(%s) entered len:%d\n",name,tvb_length_remainin case FT_UINT32: break; default: - proto_tree_add_text(tree, tvb, offset, len,"dissect_ber_choice(): Was passed a HF field that was not integer type : %s",hfinfo->abbrev); - fprintf(stderr,"dissect_ber_choice(): frame:%d offset:%d Was passed a HF field that was not integer type : %s\n",pinfo->fd->num,offset,hfinfo->abbrev); + proto_tree_add_text(tree, tvb, offset, len,"dissect_ber_CHOICE(): Was passed a HF field that was not integer type : %s",hfinfo->abbrev); + fprintf(stderr,"dissect_ber_CHOICE(): frame:%d offset:%d Was passed a HF field that was not integer type : %s\n",pinfo->fd->num,offset,hfinfo->abbrev); return end_offset; } } @@ -1138,8 +1138,14 @@ printf("CHOICE dissect_ber_choice(%s) entered len:%d\n",name,tvb_length_remainin /* loop over all entries until we find the right choice or run out of entries */ ch = choice; + if(branch_taken){ + branch_taken=-1; + } while(ch->func){ choice_try_again: + if(branch_taken){ + branch_taken++; + } #ifdef DEBUG_BER printf("CHOICE testing potential subdissector class:%d:(expected)%d tag:%d:(expected)%d flags:%d\n",class,ch->class,tag,ch->tag,ch->flags); #endif @@ -1177,9 +1183,9 @@ name=hfinfo->name; name="unnamed"; } if(tvb_length_remaining(next_tvb,0)>3){ -printf("CHOICE dissect_ber_choice(%s) calling subdissector start_offset:%d offset:%d len:%d %02x:%02x:%02x\n",name,start_offset,offset,tvb_length_remaining(next_tvb,0),tvb_get_guint8(next_tvb,0),tvb_get_guint8(next_tvb,1),tvb_get_guint8(next_tvb,2)); +printf("CHOICE dissect_ber_CHOICE(%s) calling subdissector start_offset:%d offset:%d len:%d %02x:%02x:%02x\n",name,start_offset,offset,tvb_length_remaining(next_tvb,0),tvb_get_guint8(next_tvb,0),tvb_get_guint8(next_tvb,1),tvb_get_guint8(next_tvb,2)); }else{ -printf("CHOICE dissect_ber_choice(%s) calling subdissector len:%d\n",name,tvb_length(next_tvb)); +printf("CHOICE dissect_ber_CHOICE(%s) calling subdissector len:%d\n",name,tvb_length(next_tvb)); } } #endif @@ -1194,7 +1200,7 @@ name=hfinfo->name; } else { name="unnamed"; } -printf("CHOICE dissect_ber_choice(%s) subdissector ate %d bytes\n",name,count); +printf("CHOICE dissect_ber_CHOICE(%s) subdissector ate %d bytes\n",name,count); } #endif if((count==0)&&(ch->class==class)&&(ch->tag==-1)&&(ch->flags&BER_FLAGS_NOOWNTAG)){ @@ -1217,6 +1223,12 @@ printf("CHOICE dissect_ber_choice(%s) subdissector ate %d bytes\n",name,count); } ch++; } + + if(branch_taken){ + /* none of the branches were taken so set the param + back to -1 */ + branch_taken=-1; + } #ifdef REMOVED /*XXX here we should have another flag to the CHOICE to distinguish * between teh case when we know it is a mandatory or if the CHOICE is optional == no arm matched */ diff --git a/epan/dissectors/packet-ber.h b/epan/dissectors/packet-ber.h index ac2302348c..ed0337c136 100644 --- a/epan/dissectors/packet-ber.h +++ b/epan/dissectors/packet-ber.h @@ -124,7 +124,7 @@ typedef struct _ber_choice_t { /* this function dissects a BER choice */ -extern int dissect_ber_choice(packet_info *pinfo, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_choice_t *ch, gint hf_id, gint ett_id); +extern int dissect_ber_CHOICE(packet_info *pinfo, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_choice_t *ch, gint hf_id, gint ett_id, gint *branch_taken); /* this function dissects a BER strings diff --git a/epan/dissectors/packet-camel.c b/epan/dissectors/packet-camel.c index 6766954712..f60e87ad8e 100644 --- a/epan/dissectors/packet-camel.c +++ b/epan/dissectors/packet-camel.c @@ -712,7 +712,8 @@ static const value_string camel_number_plan_values[] = { static int dissect_camel_INTEGER(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -851,7 +852,8 @@ dissect_camel_PBIPSSPCapabilities(gboolean implicit_tag _U_, tvbuff_t *tvb, int static int dissect_camel_INTEGER_1(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -996,7 +998,8 @@ dissect_camel_PBGeographicalInformation(gboolean implicit_tag _U_, tvbuff_t *tvb static int dissect_camel_INTEGER_4_16(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -1035,7 +1038,8 @@ dissect_camel_PBGSNAddress(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, static int dissect_camel_INTEGER_0(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -1284,7 +1288,8 @@ static int dissect_accessPointName_impl(packet_info *pinfo, proto_tree *tree, tv static int dissect_camel_INTEGER_1_864000(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -1334,7 +1339,8 @@ static int dissect_active_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *t static int dissect_camel_INTEGER_1_86400(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -1346,10 +1352,11 @@ static int dissect_maxElapsedTime_impl(packet_info *pinfo, proto_tree *tree, tvb } + static int dissect_camel_OBJECT_IDENTIFIER(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_object_identifier(implicit_tag, pinfo, tree, tvb, offset, - hf_index, NULL); + offset = dissect_ber_object_identifier(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -1372,8 +1379,8 @@ static const ber_choice_t Code_choice[] = { static int dissect_camel_Code(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - Code_choice, hf_index, ett_camel_Code); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + Code_choice, hf_index, ett_camel_Code, NULL); return offset; } @@ -1408,12 +1415,10 @@ static int dissect_criticality(packet_info *pinfo, proto_tree *tree, tvbuff_t *t } + static int dissect_camel_NULL(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - { proto_item *ti_tmp; - ti_tmp = proto_tree_add_item(tree, hf_index, tvb, offset>>8, 0, FALSE); - proto_item_append_text(ti_tmp, ": NULL"); - } + offset = dissect_ber_null(implicit_tag, pinfo, tree, tvb, offset, hf_index); return offset; } @@ -1485,8 +1490,8 @@ static const ber_choice_t SupportedExtensionsExtensionType_choice[] = { static int dissect_camel_SupportedExtensionsExtensionType(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - SupportedExtensionsExtensionType_choice, hf_index, ett_camel_SupportedExtensionsExtensionType); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + SupportedExtensionsExtensionType_choice, hf_index, ett_camel_SupportedExtensionsExtensionType, NULL); return offset; } @@ -1563,8 +1568,8 @@ static const ber_choice_t AChBillingChargingCharacteristics_choice[] = { static int dissect_camel_AChBillingChargingCharacteristics(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - AChBillingChargingCharacteristics_choice, hf_index, ett_camel_AChBillingChargingCharacteristics); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + AChBillingChargingCharacteristics_choice, hf_index, ett_camel_AChBillingChargingCharacteristics, NULL); return offset; } @@ -1620,7 +1625,8 @@ static int dissect_alertingPattern_impl(packet_info *pinfo, proto_tree *tree, tv static int dissect_camel_INTEGER_0_8191(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -1747,7 +1753,8 @@ static int dissect_appendFreeFormatData_impl(packet_info *pinfo, proto_tree *tre static int dissect_camel_ApplicationTimer(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -1787,7 +1794,8 @@ static int dissect_backwardServiceInteractionInd_impl(packet_info *pinfo, proto_ static int dissect_camel_ServiceKey(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -1864,8 +1872,8 @@ static const ber_choice_t BasicGapCriteria_choice[] = { static int dissect_camel_BasicGapCriteria(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - BasicGapCriteria_choice, hf_index, ett_camel_BasicGapCriteria); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + BasicGapCriteria_choice, hf_index, ett_camel_BasicGapCriteria, NULL); return offset; } @@ -1955,8 +1963,8 @@ static const ber_choice_t LegID_choice[] = { static int dissect_camel_LegID(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - LegID_choice, hf_index, ett_camel_LegID); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + LegID_choice, hf_index, ett_camel_LegID, NULL); return offset; } @@ -1977,8 +1985,8 @@ static const ber_choice_t DpSpecificCriteria_choice[] = { static int dissect_camel_DpSpecificCriteria(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - DpSpecificCriteria_choice, hf_index, ett_camel_DpSpecificCriteria); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + DpSpecificCriteria_choice, hf_index, ett_camel_DpSpecificCriteria, NULL); return offset; } @@ -2030,8 +2038,8 @@ static const ber_choice_t BearerCapability_choice[] = { static int dissect_camel_BearerCapability(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - BearerCapability_choice, hf_index, ett_camel_BearerCapability); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + BearerCapability_choice, hf_index, ett_camel_BearerCapability, NULL); return offset; } @@ -2173,8 +2181,8 @@ static const ber_choice_t ReceivingSideID_choice[] = { static int dissect_camel_ReceivingSideID(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - ReceivingSideID_choice, hf_index, ett_camel_ReceivingSideID); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + ReceivingSideID_choice, hf_index, ett_camel_ReceivingSideID, NULL); return offset; } @@ -2189,7 +2197,8 @@ static int dissect_legID2_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *t static int dissect_camel_TimeIfNoTariffSwitch(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -2201,7 +2210,8 @@ static int dissect_timeIfNoTariffSwitch_impl(packet_info *pinfo, proto_tree *tre static int dissect_camel_INTEGER_0_864000(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -2241,8 +2251,8 @@ static const ber_choice_t TimeInformation_choice[] = { static int dissect_camel_TimeInformation(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - TimeInformation_choice, hf_index, ett_camel_TimeInformation); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + TimeInformation_choice, hf_index, ett_camel_TimeInformation, NULL); return offset; } @@ -2283,8 +2293,8 @@ static const ber_choice_t CamelCallResult_choice[] = { static int dissect_camel_CamelCallResult(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - CamelCallResult_choice, hf_index, ett_camel_CamelCallResult); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + CamelCallResult_choice, hf_index, ett_camel_CamelCallResult, NULL); return offset; } @@ -2330,8 +2340,8 @@ static const ber_choice_t CamelAChBillingChargingCharacteristics_choice[] = { static int dissect_camel_CamelAChBillingChargingCharacteristics(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - CamelAChBillingChargingCharacteristics_choice, hf_index, ett_camel_CamelAChBillingChargingCharacteristics); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + CamelAChBillingChargingCharacteristics_choice, hf_index, ett_camel_CamelAChBillingChargingCharacteristics, NULL); return offset; } @@ -2361,8 +2371,8 @@ static const ber_choice_t SendingSideID_choice[] = { static int dissect_camel_SendingSideID(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - SendingSideID_choice, hf_index, ett_camel_SendingSideID); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + SendingSideID_choice, hf_index, ett_camel_SendingSideID, NULL); return offset; } @@ -2404,8 +2414,8 @@ static const ber_choice_t CamelFCIBillingChargingCharacteristics_choice[] = { static int dissect_camel_CamelFCIBillingChargingCharacteristics(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - CamelFCIBillingChargingCharacteristics_choice, hf_index, ett_camel_CamelFCIBillingChargingCharacteristics); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + CamelFCIBillingChargingCharacteristics_choice, hf_index, ett_camel_CamelFCIBillingChargingCharacteristics, NULL); return offset; } @@ -2486,8 +2496,8 @@ static const ber_choice_t CamelFCISMSBillingChargingCharacteristics_choice[] = { static int dissect_camel_CamelFCISMSBillingChargingCharacteristics(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - CamelFCISMSBillingChargingCharacteristics_choice, hf_index, ett_camel_CamelFCISMSBillingChargingCharacteristics); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + CamelFCISMSBillingChargingCharacteristics_choice, hf_index, ett_camel_CamelFCISMSBillingChargingCharacteristics, NULL); return offset; } @@ -2507,8 +2517,8 @@ static const ber_choice_t CamelSCIBillingChargingCharacteristics_choice[] = { static int dissect_camel_CamelSCIBillingChargingCharacteristics(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - CamelSCIBillingChargingCharacteristics_choice, hf_index, ett_camel_CamelSCIBillingChargingCharacteristics); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + CamelSCIBillingChargingCharacteristics_choice, hf_index, ett_camel_CamelSCIBillingChargingCharacteristics, NULL); return offset; } @@ -2585,7 +2595,8 @@ static int dissect_chargeNumber_impl(packet_info *pinfo, proto_tree *tree, tvbuf static int dissect_camel_INTEGER_1_2147483647(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -2608,8 +2619,8 @@ static const ber_choice_t ChargingCharacteristics_choice[] = { static int dissect_camel_ChargingCharacteristics(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - ChargingCharacteristics_choice, hf_index, ett_camel_ChargingCharacteristics); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + ChargingCharacteristics_choice, hf_index, ett_camel_ChargingCharacteristics, NULL); return offset; } @@ -2621,7 +2632,8 @@ static int dissect_chargingCharacteristics_impl(packet_info *pinfo, proto_tree * static int dissect_camel_INTEGER_0_2147483647(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -2667,8 +2679,8 @@ static const ber_choice_t TransferredVolume_choice[] = { static int dissect_camel_TransferredVolume(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - TransferredVolume_choice, hf_index, ett_camel_TransferredVolume); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + TransferredVolume_choice, hf_index, ett_camel_TransferredVolume, NULL); return offset; } @@ -2680,7 +2692,8 @@ static int dissect_transferredVolume_impl(packet_info *pinfo, proto_tree *tree, static int dissect_camel_INTEGER_0_86400(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -2726,8 +2739,8 @@ static const ber_choice_t ElapsedTime_choice[] = { static int dissect_camel_ElapsedTime(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - ElapsedTime_choice, hf_index, ett_camel_ElapsedTime); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + ElapsedTime_choice, hf_index, ett_camel_ElapsedTime, NULL); return offset; } @@ -2750,8 +2763,8 @@ static const ber_choice_t ChargingResult_choice[] = { static int dissect_camel_ChargingResult(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - ChargingResult_choice, hf_index, ett_camel_ChargingResult); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + ChargingResult_choice, hf_index, ett_camel_ChargingResult, NULL); return offset; } @@ -2763,7 +2776,8 @@ static int dissect_chargingResult_impl(packet_info *pinfo, proto_tree *tree, tvb static int dissect_camel_INTEGER_0_255(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -2821,8 +2835,8 @@ static const ber_choice_t TransferredVolumeRollOver_choice[] = { static int dissect_camel_TransferredVolumeRollOver(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - TransferredVolumeRollOver_choice, hf_index, ett_camel_TransferredVolumeRollOver); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + TransferredVolumeRollOver_choice, hf_index, ett_camel_TransferredVolumeRollOver, NULL); return offset; } @@ -2862,8 +2876,8 @@ static const ber_choice_t ElapsedTimeRollOver_choice[] = { static int dissect_camel_ElapsedTimeRollOver(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - ElapsedTimeRollOver_choice, hf_index, ett_camel_ElapsedTimeRollOver); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + ElapsedTimeRollOver_choice, hf_index, ett_camel_ElapsedTimeRollOver, NULL); return offset; } @@ -2886,8 +2900,8 @@ static const ber_choice_t ChargingRollOver_choice[] = { static int dissect_camel_ChargingRollOver(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - ChargingRollOver_choice, hf_index, ett_camel_ChargingRollOver); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + ChargingRollOver_choice, hf_index, ett_camel_ChargingRollOver, NULL); return offset; } @@ -2899,7 +2913,8 @@ static int dissect_chargingRollOver_impl(packet_info *pinfo, proto_tree *tree, t static int dissect_camel_INTEGER_1_30(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -2932,7 +2947,8 @@ static int dissect_startDigit_impl(packet_info *pinfo, proto_tree *tree, tvbuff_ static int dissect_camel_INTEGER_1_127(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -3004,8 +3020,8 @@ static const ber_choice_t CollectedInfo_choice[] = { static int dissect_camel_CollectedInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - CollectedInfo_choice, hf_index, ett_camel_CollectedInfo); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + CollectedInfo_choice, hf_index, ett_camel_CollectedInfo, NULL); return offset; } @@ -3437,8 +3453,8 @@ static const ber_choice_t EventSpecificInformationBCSM_choice[] = { static int dissect_camel_EventSpecificInformationBCSM(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - EventSpecificInformationBCSM_choice, hf_index, ett_camel_EventSpecificInformationBCSM); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + EventSpecificInformationBCSM_choice, hf_index, ett_camel_EventSpecificInformationBCSM, NULL); return offset; } @@ -3514,8 +3530,8 @@ static const ber_choice_t EventSpecificInformationSMS_choice[] = { static int dissect_camel_EventSpecificInformationSMS(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - EventSpecificInformationSMS_choice, hf_index, ett_camel_EventSpecificInformationSMS); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + EventSpecificInformationSMS_choice, hf_index, ett_camel_EventSpecificInformationSMS, NULL); return offset; } @@ -3612,8 +3628,8 @@ static const ber_choice_t GapCriteria_choice[] = { static int dissect_camel_GapCriteria(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - GapCriteria_choice, hf_index, ett_camel_GapCriteria); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + GapCriteria_choice, hf_index, ett_camel_GapCriteria, NULL); return offset; } @@ -3625,7 +3641,8 @@ static int dissect_gapCriteria_impl(packet_info *pinfo, proto_tree *tree, tvbuff static int dissect_camel_Duration(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -3637,7 +3654,8 @@ static int dissect_duration_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t static int dissect_camel_Interval(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -3666,7 +3684,8 @@ static int dissect_gapIndicators_impl(packet_info *pinfo, proto_tree *tree, tvbu static int dissect_camel_Integer4(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -3800,8 +3819,8 @@ static const ber_choice_t VariablePart_choice[] = { static int dissect_camel_VariablePart(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - VariablePart_choice, hf_index, ett_camel_VariablePart); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + VariablePart_choice, hf_index, ett_camel_VariablePart, NULL); return offset; } @@ -3860,8 +3879,8 @@ static const ber_choice_t MessageID_choice[] = { static int dissect_camel_MessageID(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - MessageID_choice, hf_index, ett_camel_MessageID); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + MessageID_choice, hf_index, ett_camel_MessageID, NULL); return offset; } @@ -3873,7 +3892,8 @@ static int dissect_messageID_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t static int dissect_camel_INTEGER_0_32767(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -3935,8 +3955,8 @@ static const ber_choice_t InformationToSend_choice[] = { static int dissect_camel_InformationToSend(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - InformationToSend_choice, hf_index, ett_camel_InformationToSend); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + InformationToSend_choice, hf_index, ett_camel_InformationToSend, NULL); return offset; } @@ -3959,8 +3979,8 @@ static const ber_choice_t GapTreatment_choice[] = { static int dissect_camel_GapTreatment(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - GapTreatment_choice, hf_index, ett_camel_GapTreatment); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + GapTreatment_choice, hf_index, ett_camel_GapTreatment, NULL); return offset; } @@ -4034,8 +4054,8 @@ static const ber_choice_t GPRS_QoS_choice[] = { static int dissect_camel_GPRS_QoS(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - GPRS_QoS_choice, hf_index, ett_camel_GPRS_QoS); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + GPRS_QoS_choice, hf_index, ett_camel_GPRS_QoS, NULL); return offset; } @@ -4168,10 +4188,11 @@ static int dissect_selectedLSA_Id_impl(packet_info *pinfo, proto_tree *tree, tvb } + static int dissect_camel_ExtensionSetextensionId(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_object_identifier(implicit_tag, pinfo, tree, tvb, offset, - hf_index, NULL); + offset = dissect_ber_object_identifier(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -4505,8 +4526,8 @@ static const ber_choice_t GPRSEventSpecificInformation_choice[] = { static int dissect_camel_GPRSEventSpecificInformation(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - GPRSEventSpecificInformation_choice, hf_index, ett_camel_GPRSEventSpecificInformation); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + GPRSEventSpecificInformation_choice, hf_index, ett_camel_GPRSEventSpecificInformation, NULL); return offset; } @@ -4559,7 +4580,8 @@ static int dissect_gPRSMSClass_impl(packet_info *pinfo, proto_tree *tree, tvbuff static int dissect_camel_TCInvokeIdSet(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -4626,12 +4648,10 @@ static int dissect_originalCalledPartyID_impl(packet_info *pinfo, proto_tree *tr } + static int dissect_camel_OCSIApplicable(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - { proto_item *ti_tmp; - ti_tmp = proto_tree_add_item(tree, hf_index, tvb, offset>>8, 0, FALSE); - proto_item_append_text(ti_tmp, ": NULL"); - } + offset = dissect_ber_null(implicit_tag, pinfo, tree, tvb, offset, hf_index); return offset; } @@ -4693,8 +4713,8 @@ static const ber_choice_t RequestedInformationValue_choice[] = { static int dissect_camel_RequestedInformationValue(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - RequestedInformationValue_choice, hf_index, ett_camel_RequestedInformationValue); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + RequestedInformationValue_choice, hf_index, ett_camel_RequestedInformationValue, NULL); return offset; } @@ -4947,12 +4967,10 @@ dissect_camel_UnavailableNetworkResource(gboolean implicit_tag _U_, tvbuff_t *tv } + static int dissect_camel_SpecializedResourceReportArg(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - { proto_item *ti_tmp; - ti_tmp = proto_tree_add_item(tree, hf_index, tvb, offset>>8, 0, FALSE); - proto_item_append_text(ti_tmp, ": NULL"); - } + offset = dissect_ber_null(implicit_tag, pinfo, tree, tvb, offset, hf_index); return offset; } @@ -4961,7 +4979,8 @@ dissect_camel_SpecializedResourceReportArg(gboolean implicit_tag _U_, tvbuff_t * static int dissect_camel_Priority(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -4982,7 +5001,8 @@ static int dissect_cug_Interlock_impl(packet_info *pinfo, proto_tree *tree, tvbu static int dissect_camel_CUG_Index(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -5006,12 +5026,10 @@ static int dissect_smsReferenceNumber_impl(packet_info *pinfo, proto_tree *tree, } + static int dissect_camel_SuppressionOfAnnouncement(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - { proto_item *ti_tmp; - ti_tmp = proto_tree_add_item(tree, hf_index, tvb, offset>>8, 0, FALSE); - proto_item_append_text(ti_tmp, ": NULL"); - } + offset = dissect_ber_null(implicit_tag, pinfo, tree, tvb, offset, hf_index); return offset; } @@ -5043,7 +5061,8 @@ static int dissect_netDetNotReachable(packet_info *pinfo, proto_tree *tree, tvbu static int dissect_camel_AgeOfLocationInformation(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -5250,8 +5269,8 @@ static const ber_choice_t CancelArg_choice[] = { static int dissect_camel_CancelArg(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - CancelArg_choice, hf_index, ett_camel_CancelArg); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + CancelArg_choice, hf_index, ett_camel_CancelArg, NULL); return offset; } @@ -5301,8 +5320,8 @@ static const ber_choice_t ReceivedInformationArg_choice[] = { static int dissect_camel_ReceivedInformationArg(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - ReceivedInformationArg_choice, hf_index, ett_camel_ReceivedInformationArg); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + ReceivedInformationArg_choice, hf_index, ett_camel_ReceivedInformationArg, NULL); return offset; } @@ -5427,8 +5446,8 @@ static const ber_choice_t SubscriberState_choice[] = { static int dissect_camel_SubscriberState(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - SubscriberState_choice, hf_index, ett_camel_SubscriberState); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + SubscriberState_choice, hf_index, ett_camel_SubscriberState, NULL); return offset; } @@ -5451,8 +5470,8 @@ static const ber_choice_t CellIdOrLAI_choice[] = { static int dissect_camel_CellIdOrLAI(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - CellIdOrLAI_choice, hf_index, ett_camel_CellIdOrLAI); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + CellIdOrLAI_choice, hf_index, ett_camel_CellIdOrLAI, NULL); return offset; } @@ -5475,8 +5494,8 @@ static const ber_choice_t Ext_BasicServiceCode_choice[] = { static int dissect_camel_Ext_BasicServiceCode(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - Ext_BasicServiceCode_choice, hf_index, ett_camel_Ext_BasicServiceCode); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + Ext_BasicServiceCode_choice, hf_index, ett_camel_Ext_BasicServiceCode, NULL); return offset; } @@ -5645,8 +5664,8 @@ static const ber_choice_t T_resourceAddress_choice[] = { static int dissect_camel_T_resourceAddress(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - T_resourceAddress_choice, hf_index, ett_camel_T_resourceAddress); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + T_resourceAddress_choice, hf_index, ett_camel_T_resourceAddress, NULL); return offset; } @@ -6451,8 +6470,8 @@ static const ber_choice_t InvokeId_choice[] = { static int dissect_camel_InvokeId(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - InvokeId_choice, hf_index, ett_camel_InvokeId); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + InvokeId_choice, hf_index, ett_camel_InvokeId, NULL); return offset; } @@ -6554,8 +6573,8 @@ dissect_camel_camelPDU(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, pac col_append_fstr(pinfo->cinfo, COL_INFO, val_to_str(camel_pdu_type, camelPDU_vals, "Unknown Camel (%u)")); } - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - camelPDU_choice, hf_index, ett_camel_camelPDU); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + camelPDU_choice, hf_index, ett_camel_camelPDU, NULL); return offset; } diff --git a/epan/dissectors/packet-camel.h b/epan/dissectors/packet-camel.h index 75109f93c9..a993167156 100644 --- a/epan/dissectors/packet-camel.h +++ b/epan/dissectors/packet-camel.h @@ -1,6 +1,6 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Ethereal dissector compiler */ -/* .\packet-camel.h */ +/* ./packet-camel.h */ /* ../../tools/asn2eth.py -X -b -e -p camel -c camel.cnf -s packet-camel-template camel.asn */ /* Input file: packet-camel-template.h */ diff --git a/epan/dissectors/packet-cmip.c b/epan/dissectors/packet-cmip.c index 2df0585a59..2867667c19 100644 --- a/epan/dissectors/packet-cmip.c +++ b/epan/dissectors/packet-cmip.c @@ -431,8 +431,8 @@ static const ber_choice_t ObjectClass_choice[] = { static int dissect_cmip_ObjectClass(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - ObjectClass_choice, hf_index, ett_cmip_ObjectClass); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + ObjectClass_choice, hf_index, ett_cmip_ObjectClass, NULL); return offset; } @@ -472,8 +472,8 @@ static const ber_choice_t ObjectInstance_choice[] = { static int dissect_cmip_ObjectInstance(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - ObjectInstance_choice, hf_index, ett_cmip_ObjectInstance); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + ObjectInstance_choice, hf_index, ett_cmip_ObjectInstance, NULL); return offset; } @@ -565,8 +565,8 @@ static const ber_choice_t AttributeId_choice[] = { static int dissect_cmip_AttributeId(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - AttributeId_choice, hf_index, ett_cmip_AttributeId); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + AttributeId_choice, hf_index, ett_cmip_AttributeId, NULL); return offset; } @@ -678,8 +678,8 @@ static const ber_choice_t GetInfoStatus_choice[] = { static int dissect_cmip_GetInfoStatus(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - GetInfoStatus_choice, hf_index, ett_cmip_GetInfoStatus); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + GetInfoStatus_choice, hf_index, ett_cmip_GetInfoStatus, NULL); return offset; } @@ -803,8 +803,8 @@ static const ber_choice_t SetInfoStatus_choice[] = { static int dissect_cmip_SetInfoStatus(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - SetInfoStatus_choice, hf_index, ett_cmip_SetInfoStatus); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + SetInfoStatus_choice, hf_index, ett_cmip_SetInfoStatus, NULL); return offset; } @@ -954,8 +954,8 @@ static const ber_choice_t NoSuchArgument_choice[] = { static int dissect_cmip_NoSuchArgument(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - NoSuchArgument_choice, hf_index, ett_cmip_NoSuchArgument); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + NoSuchArgument_choice, hf_index, ett_cmip_NoSuchArgument, NULL); return offset; } @@ -1068,8 +1068,8 @@ static const ber_choice_t InvalidArgumentValue_choice[] = { static int dissect_cmip_InvalidArgumentValue(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - InvalidArgumentValue_choice, hf_index, ett_cmip_InvalidArgumentValue); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + InvalidArgumentValue_choice, hf_index, ett_cmip_InvalidArgumentValue, NULL); return offset; } @@ -1094,8 +1094,8 @@ static const ber_choice_t ErrorInfo_choice[] = { static int dissect_cmip_ErrorInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - ErrorInfo_choice, hf_index, ett_cmip_ErrorInfo); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + ErrorInfo_choice, hf_index, ett_cmip_ErrorInfo, NULL); return offset; } @@ -1351,8 +1351,8 @@ static const ber_choice_t Scope_choice[] = { static int dissect_cmip_Scope(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - Scope_choice, hf_index, ett_cmip_Scope); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + Scope_choice, hf_index, ett_cmip_Scope, NULL); return offset; } @@ -1377,8 +1377,8 @@ static const ber_choice_t T_substrings_item_choice[] = { static int dissect_cmip_T_substrings_item(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - T_substrings_item_choice, hf_index, ett_cmip_T_substrings_item); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + T_substrings_item_choice, hf_index, ett_cmip_T_substrings_item, NULL); return offset; } @@ -1428,8 +1428,8 @@ static const ber_choice_t FilterItem_choice[] = { static int dissect_cmip_FilterItem(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - FilterItem_choice, hf_index, ett_cmip_FilterItem); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + FilterItem_choice, hf_index, ett_cmip_FilterItem, NULL); return offset; } @@ -1474,8 +1474,8 @@ static const ber_choice_t CMISFilter_choice[] = { static int dissect_cmip_CMISFilter(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - CMISFilter_choice, hf_index, ett_cmip_CMISFilter); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + CMISFilter_choice, hf_index, ett_cmip_CMISFilter, NULL); return offset; } @@ -1642,8 +1642,8 @@ static const ber_choice_t LinkedReplyArgument_choice[] = { static int dissect_cmip_LinkedReplyArgument(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - LinkedReplyArgument_choice, hf_index, ett_cmip_LinkedReplyArgument); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + LinkedReplyArgument_choice, hf_index, ett_cmip_LinkedReplyArgument, NULL); return offset; } @@ -1784,8 +1784,8 @@ static const ber_choice_t T_managedOrSuperiorObjectInstance_choice[] = { static int dissect_cmip_T_managedOrSuperiorObjectInstance(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - T_managedOrSuperiorObjectInstance_choice, hf_index, ett_cmip_T_managedOrSuperiorObjectInstance); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + T_managedOrSuperiorObjectInstance_choice, hf_index, ett_cmip_T_managedOrSuperiorObjectInstance, NULL); return offset; } @@ -2070,8 +2070,8 @@ static const ber_choice_t InvokeId_choice[] = { static int dissect_cmip_InvokeId(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - InvokeId_choice, hf_index, ett_cmip_InvokeId); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + InvokeId_choice, hf_index, ett_cmip_InvokeId, NULL); return offset; } @@ -2097,8 +2097,8 @@ static const ber_choice_t InvokeLinkedId_choice[] = { static int dissect_cmip_InvokeLinkedId(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - InvokeLinkedId_choice, hf_index, ett_cmip_InvokeLinkedId); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + InvokeLinkedId_choice, hf_index, ett_cmip_InvokeLinkedId, NULL); return offset; } @@ -2313,8 +2313,8 @@ static const ber_choice_t RejectProb_choice[] = { static int dissect_cmip_RejectProb(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - RejectProb_choice, hf_index, ett_cmip_RejectProb); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + RejectProb_choice, hf_index, ett_cmip_RejectProb, NULL); return offset; } @@ -2362,8 +2362,8 @@ static const ber_choice_t ROS_choice[] = { int dissect_cmip_ROS(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - ROS_choice, hf_index, ett_cmip_ROS); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + ROS_choice, hf_index, ett_cmip_ROS, NULL); return offset; } diff --git a/epan/dissectors/packet-cmp.c b/epan/dissectors/packet-cmp.c index c39f53f237..3f48f45a89 100644 --- a/epan/dissectors/packet-cmp.c +++ b/epan/dissectors/packet-cmp.c @@ -60,7 +60,7 @@ static int hf_cmp_type_oid = -1; static int hf_cmp_header = -1; /* PKIHeader */ static int hf_cmp_body = -1; /* PKIBody */ static int hf_cmp_protection = -1; /* PKIProtection */ -static int hf_cmp_extraCerts = -1; /* SEQUNCE_SIZE_1_MAX_OF_Certificate */ +static int hf_cmp_extraCerts = -1; /* SEQUENCE_SIZE_1_MAX_OF_Certificate */ static int hf_cmp_extraCerts_item = -1; /* Certificate */ static int hf_cmp_pvno = -1; /* T_pvno */ static int hf_cmp_sender = -1; /* GeneralName */ @@ -73,7 +73,7 @@ static int hf_cmp_transactionID = -1; /* OCTET_STRING */ static int hf_cmp_senderNonce = -1; /* OCTET_STRING */ static int hf_cmp_recipNonce = -1; /* OCTET_STRING */ static int hf_cmp_freeText = -1; /* PKIFreeText */ -static int hf_cmp_generalInfo = -1; /* SEQUNCE_SIZE_1_MAX_OF_InfoTypeAndValue */ +static int hf_cmp_generalInfo = -1; /* SEQUENCE_SIZE_1_MAX_OF_InfoTypeAndValue */ static int hf_cmp_generalInfo_item = -1; /* InfoTypeAndValue */ static int hf_cmp_PKIFreeText_item = -1; /* UTF8String */ static int hf_cmp_ir = -1; /* CertReqMessages */ @@ -113,9 +113,9 @@ static int hf_cmp_POPODecKeyChallContent_item = -1; /* Challenge */ static int hf_cmp_witness = -1; /* OCTET_STRING */ static int hf_cmp_challenge = -1; /* OCTET_STRING */ static int hf_cmp_POPODecKeyRespContent_item = -1; /* INTEGER */ -static int hf_cmp_caPubs = -1; /* SEQUNCE_SIZE_1_MAX_OF_Certificate */ +static int hf_cmp_caPubs = -1; /* SEQUENCE_SIZE_1_MAX_OF_Certificate */ static int hf_cmp_caPubs_item = -1; /* Certificate */ -static int hf_cmp_response = -1; /* SEQUNCE_OF_CertResponse */ +static int hf_cmp_response = -1; /* SEQUENCE_OF_CertResponse */ static int hf_cmp_response_item = -1; /* CertResponse */ static int hf_cmp_certReqId = -1; /* INTEGER */ static int hf_cmp_status1 = -1; /* PKIStatusInfo */ @@ -127,20 +127,20 @@ static int hf_cmp_publicationInfo = -1; /* PKIPublicationInfo */ static int hf_cmp_certificate = -1; /* Certificate */ static int hf_cmp_encryptedCert = -1; /* EncryptedValue */ static int hf_cmp_newSigCert = -1; /* Certificate */ -static int hf_cmp_caCerts = -1; /* SEQUNCE_SIZE_1_MAX_OF_Certificate */ +static int hf_cmp_caCerts = -1; /* SEQUENCE_SIZE_1_MAX_OF_Certificate */ static int hf_cmp_caCerts_item = -1; /* Certificate */ -static int hf_cmp_keyPairHist = -1; /* SEQUNCE_SIZE_1_MAX_OF_CertifiedKeyPair */ +static int hf_cmp_keyPairHist = -1; /* SEQUENCE_SIZE_1_MAX_OF_CertifiedKeyPair */ static int hf_cmp_keyPairHist_item = -1; /* CertifiedKeyPair */ static int hf_cmp_RevReqContent_item = -1; /* RevDetails */ static int hf_cmp_certDetails = -1; /* CertTemplate */ static int hf_cmp_revocationReason = -1; /* ReasonFlags */ static int hf_cmp_badSinceDate = -1; /* GeneralizedTime */ static int hf_cmp_crlEntryDetails = -1; /* Extensions */ -static int hf_cmp_status2 = -1; /* SEQUNCE_SIZE_1_MAX_OF_PKIStatusInfo */ +static int hf_cmp_status2 = -1; /* SEQUENCE_SIZE_1_MAX_OF_PKIStatusInfo */ static int hf_cmp_status_item = -1; /* PKIStatusInfo */ -static int hf_cmp_revCerts = -1; /* SEQUNCE_SIZE_1_MAX_OF_CertId */ +static int hf_cmp_revCerts = -1; /* SEQUENCE_SIZE_1_MAX_OF_CertId */ static int hf_cmp_revCerts_item = -1; /* CertId */ -static int hf_cmp_crls = -1; /* SEQUNCE_SIZE_1_MAX_OF_CertificateList */ +static int hf_cmp_crls = -1; /* SEQUENCE_SIZE_1_MAX_OF_CertificateList */ static int hf_cmp_crls_item = -1; /* CertificateList */ static int hf_cmp_oldWithNew = -1; /* Certificate */ static int hf_cmp_newWithOld = -1; /* Certificate */ @@ -176,9 +176,9 @@ static gint ett_cmp = -1; /*--- Included file: packet-cmp-ett.c ---*/ static gint ett_cmp_PKIMessage = -1; -static gint ett_cmp_SEQUNCE_SIZE_1_MAX_OF_Certificate = -1; +static gint ett_cmp_SEQUENCE_SIZE_1_MAX_OF_Certificate = -1; static gint ett_cmp_PKIHeader = -1; -static gint ett_cmp_SEQUNCE_SIZE_1_MAX_OF_InfoTypeAndValue = -1; +static gint ett_cmp_SEQUENCE_SIZE_1_MAX_OF_InfoTypeAndValue = -1; static gint ett_cmp_PKIFreeText = -1; static gint ett_cmp_PKIBody = -1; static gint ett_cmp_ProtectedPart = -1; @@ -191,18 +191,18 @@ static gint ett_cmp_POPODecKeyChallContent = -1; static gint ett_cmp_Challenge = -1; static gint ett_cmp_POPODecKeyRespContent = -1; static gint ett_cmp_CertRepMessage = -1; -static gint ett_cmp_SEQUNCE_OF_CertResponse = -1; +static gint ett_cmp_SEQUENCE_OF_CertResponse = -1; static gint ett_cmp_CertResponse = -1; static gint ett_cmp_CertifiedKeyPair = -1; static gint ett_cmp_CertOrEncCert = -1; static gint ett_cmp_KeyRecRepContent = -1; -static gint ett_cmp_SEQUNCE_SIZE_1_MAX_OF_CertifiedKeyPair = -1; +static gint ett_cmp_SEQUENCE_SIZE_1_MAX_OF_CertifiedKeyPair = -1; static gint ett_cmp_RevReqContent = -1; static gint ett_cmp_RevDetails = -1; static gint ett_cmp_RevRepContent = -1; -static gint ett_cmp_SEQUNCE_SIZE_1_MAX_OF_PKIStatusInfo = -1; -static gint ett_cmp_SEQUNCE_SIZE_1_MAX_OF_CertId = -1; -static gint ett_cmp_SEQUNCE_SIZE_1_MAX_OF_CertificateList = -1; +static gint ett_cmp_SEQUENCE_SIZE_1_MAX_OF_PKIStatusInfo = -1; +static gint ett_cmp_SEQUENCE_SIZE_1_MAX_OF_CertId = -1; +static gint ett_cmp_SEQUENCE_SIZE_1_MAX_OF_CertificateList = -1; static gint ett_cmp_CAKeyUpdAnnContent = -1; static gint ett_cmp_RevAnnContent = -1; static gint ett_cmp_CRLAnnContent = -1; @@ -268,11 +268,9 @@ static int dissect_hashAlg(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, static int dissect_certId(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { return dissect_crmf_CertId(FALSE, tvb, offset, pinfo, tree, hf_cmp_certId); } -#if 0
static int dissect_caPubs_item(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { return dissect_pkix1explicit_Certificate(FALSE, tvb, offset, pinfo, tree, hf_cmp_caPubs_item); -}
-#endif +} static int dissect_privateKey(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { return dissect_crmf_EncryptedValue(FALSE, tvb, offset, pinfo, tree, hf_cmp_privateKey); } @@ -287,12 +285,10 @@ static int dissect_encryptedCert(packet_info *pinfo, proto_tree *tree, tvbuff_t } static int dissect_newSigCert(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { return dissect_pkix1explicit_Certificate(FALSE, tvb, offset, pinfo, tree, hf_cmp_newSigCert); -}
-#if 0 +} static int dissect_caCerts_item(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { return dissect_pkix1explicit_Certificate(FALSE, tvb, offset, pinfo, tree, hf_cmp_caCerts_item); -}
-#endif +} static int dissect_certDetails(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { return dissect_crmf_CertTemplate(FALSE, tvb, offset, pinfo, tree, hf_cmp_certDetails); } @@ -340,7 +336,7 @@ static int dissect_recipKID(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, } -static const value_string T_pvno_vals[] = { +static const value_string cmp_T_pvno_vals[] = { { 1, "ietf-version2" }, { 0, NULL } }; @@ -348,7 +344,8 @@ static const value_string T_pvno_vals[] = { static int dissect_cmp_T_pvno(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -438,6 +435,7 @@ static int dissect_errorDetails(packet_info *pinfo, proto_tree *tree, tvbuff_t * } + static int dissect_cmp_T_infoType(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_object_identifier(FALSE, pinfo, tree, tvb, offset, @@ -486,19 +484,19 @@ static int dissect_GenRepContent_item(packet_info *pinfo, proto_tree *tree, tvbu return dissect_cmp_InfoTypeAndValue(FALSE, tvb, offset, pinfo, tree, hf_cmp_GenRepContent_item); } -static const ber_sequence_t SEQUNCE_SIZE_1_MAX_OF_InfoTypeAndValue_sequence_of[1] = { +static const ber_sequence_t SEQUENCE_SIZE_1_MAX_OF_InfoTypeAndValue_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_generalInfo_item }, }; static int -dissect_cmp_SEQUNCE_SIZE_1_MAX_OF_InfoTypeAndValue(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { +dissect_cmp_SEQUENCE_SIZE_1_MAX_OF_InfoTypeAndValue(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUNCE_SIZE_1_MAX_OF_InfoTypeAndValue_sequence_of, hf_index, ett_cmp_SEQUNCE_SIZE_1_MAX_OF_InfoTypeAndValue); + SEQUENCE_SIZE_1_MAX_OF_InfoTypeAndValue_sequence_of, hf_index, ett_cmp_SEQUENCE_SIZE_1_MAX_OF_InfoTypeAndValue); return offset; } static int dissect_generalInfo(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - return dissect_cmp_SEQUNCE_SIZE_1_MAX_OF_InfoTypeAndValue(FALSE, tvb, offset, pinfo, tree, hf_cmp_generalInfo); + return dissect_cmp_SEQUENCE_SIZE_1_MAX_OF_InfoTypeAndValue(FALSE, tvb, offset, pinfo, tree, hf_cmp_generalInfo); } static const ber_sequence_t PKIHeader_sequence[] = { @@ -528,32 +526,33 @@ static int dissect_header(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i return dissect_cmp_PKIHeader(FALSE, tvb, offset, pinfo, tree, hf_cmp_header); } -static const ber_sequence_t SEQUNCE_SIZE_1_MAX_OF_Certificate_sequence_of[1] = { +static const ber_sequence_t SEQUENCE_SIZE_1_MAX_OF_Certificate_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_extraCerts_item }, }; static int -dissect_cmp_SEQUNCE_SIZE_1_MAX_OF_Certificate(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { +dissect_cmp_SEQUENCE_SIZE_1_MAX_OF_Certificate(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUNCE_SIZE_1_MAX_OF_Certificate_sequence_of, hf_index, ett_cmp_SEQUNCE_SIZE_1_MAX_OF_Certificate); + SEQUENCE_SIZE_1_MAX_OF_Certificate_sequence_of, hf_index, ett_cmp_SEQUENCE_SIZE_1_MAX_OF_Certificate); return offset; } static int dissect_extraCerts(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - return dissect_cmp_SEQUNCE_SIZE_1_MAX_OF_Certificate(FALSE, tvb, offset, pinfo, tree, hf_cmp_extraCerts); + return dissect_cmp_SEQUENCE_SIZE_1_MAX_OF_Certificate(FALSE, tvb, offset, pinfo, tree, hf_cmp_extraCerts); } static int dissect_caPubs(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - return dissect_cmp_SEQUNCE_SIZE_1_MAX_OF_Certificate(FALSE, tvb, offset, pinfo, tree, hf_cmp_caPubs); + return dissect_cmp_SEQUENCE_SIZE_1_MAX_OF_Certificate(FALSE, tvb, offset, pinfo, tree, hf_cmp_caPubs); } static int dissect_caCerts(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - return dissect_cmp_SEQUNCE_SIZE_1_MAX_OF_Certificate(FALSE, tvb, offset, pinfo, tree, hf_cmp_caCerts); + return dissect_cmp_SEQUENCE_SIZE_1_MAX_OF_Certificate(FALSE, tvb, offset, pinfo, tree, hf_cmp_caCerts); } static int dissect_cmp_INTEGER(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -571,7 +570,7 @@ static int dissect_errorCode(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb } -const value_string PKIStatus_vals[] = { +const value_string cmp_PKIStatus_vals[] = { { 0, "granted" }, { 1, "grantedWithMods" }, { 2, "rejection" }, @@ -585,7 +584,8 @@ const value_string PKIStatus_vals[] = { int dissect_cmp_PKIStatus(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -594,16 +594,16 @@ static int dissect_status(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i } static const asn_namedbit PKIFailureInfo_bits[] = { - { 0, &hf_cmp_PKIFailureInfo_badAlg, -1, -1, NULL, NULL }, - { 1, &hf_cmp_PKIFailureInfo_badMessageCheck, -1, -1, NULL, NULL }, - { 2, &hf_cmp_PKIFailureInfo_badRequest, -1, -1, NULL, NULL }, - { 3, &hf_cmp_PKIFailureInfo_badTime, -1, -1, NULL, NULL }, - { 4, &hf_cmp_PKIFailureInfo_badCertId, -1, -1, NULL, NULL }, - { 5, &hf_cmp_PKIFailureInfo_badDataFormat, -1, -1, NULL, NULL }, - { 6, &hf_cmp_PKIFailureInfo_wrongAuthority, -1, -1, NULL, NULL }, - { 7, &hf_cmp_PKIFailureInfo_incorrectData, -1, -1, NULL, NULL }, - { 8, &hf_cmp_PKIFailureInfo_missingTimeStamp, -1, -1, NULL, NULL }, - { 9, &hf_cmp_PKIFailureInfo_badPOP, -1, -1, NULL, NULL }, + { 0, &hf_cmp_PKIFailureInfo_badAlg, -1, -1, "badAlg", NULL }, + { 1, &hf_cmp_PKIFailureInfo_badMessageCheck, -1, -1, "badMessageCheck", NULL }, + { 2, &hf_cmp_PKIFailureInfo_badRequest, -1, -1, "badRequest", NULL }, + { 3, &hf_cmp_PKIFailureInfo_badTime, -1, -1, "badTime", NULL }, + { 4, &hf_cmp_PKIFailureInfo_badCertId, -1, -1, "badCertId", NULL }, + { 5, &hf_cmp_PKIFailureInfo_badDataFormat, -1, -1, "badDataFormat", NULL }, + { 6, &hf_cmp_PKIFailureInfo_wrongAuthority, -1, -1, "wrongAuthority", NULL }, + { 7, &hf_cmp_PKIFailureInfo_incorrectData, -1, -1, "incorrectData", NULL }, + { 8, &hf_cmp_PKIFailureInfo_missingTimeStamp, -1, -1, "missingTimeStamp", NULL }, + { 9, &hf_cmp_PKIFailureInfo_badPOP, -1, -1, "badPOP", NULL }, { 0, NULL, 0, 0, NULL, NULL } }; @@ -644,7 +644,7 @@ static int dissect_pKIStatusInfo(packet_info *pinfo, proto_tree *tree, tvbuff_t } -const value_string CertOrEncCert_vals[] = { +const value_string cmp_CertOrEncCert_vals[] = { { 0, "certificate" }, { 1, "encryptedCert" }, { 0, NULL } @@ -658,8 +658,8 @@ static const ber_choice_t CertOrEncCert_choice[] = { int dissect_cmp_CertOrEncCert(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - CertOrEncCert_choice, hf_index, ett_cmp_CertOrEncCert); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + CertOrEncCert_choice, hf_index, ett_cmp_CertOrEncCert, NULL); return offset; } @@ -707,19 +707,19 @@ static int dissect_response_item(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_cmp_CertResponse(FALSE, tvb, offset, pinfo, tree, hf_cmp_response_item); } -static const ber_sequence_t SEQUNCE_OF_CertResponse_sequence_of[1] = { +static const ber_sequence_t SEQUENCE_OF_CertResponse_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_response_item }, }; static int -dissect_cmp_SEQUNCE_OF_CertResponse(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { +dissect_cmp_SEQUENCE_OF_CertResponse(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUNCE_OF_CertResponse_sequence_of, hf_index, ett_cmp_SEQUNCE_OF_CertResponse); + SEQUENCE_OF_CertResponse_sequence_of, hf_index, ett_cmp_SEQUENCE_OF_CertResponse); return offset; } static int dissect_response(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - return dissect_cmp_SEQUNCE_OF_CertResponse(FALSE, tvb, offset, pinfo, tree, hf_cmp_response); + return dissect_cmp_SEQUENCE_OF_CertResponse(FALSE, tvb, offset, pinfo, tree, hf_cmp_response); } static const ber_sequence_t CertRepMessage_sequence[] = { @@ -796,19 +796,19 @@ static int dissect_popdecr(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, return dissect_cmp_POPODecKeyRespContent(FALSE, tvb, offset, pinfo, tree, hf_cmp_popdecr); } -static const ber_sequence_t SEQUNCE_SIZE_1_MAX_OF_CertifiedKeyPair_sequence_of[1] = { +static const ber_sequence_t SEQUENCE_SIZE_1_MAX_OF_CertifiedKeyPair_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_keyPairHist_item }, }; static int -dissect_cmp_SEQUNCE_SIZE_1_MAX_OF_CertifiedKeyPair(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { +dissect_cmp_SEQUENCE_SIZE_1_MAX_OF_CertifiedKeyPair(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUNCE_SIZE_1_MAX_OF_CertifiedKeyPair_sequence_of, hf_index, ett_cmp_SEQUNCE_SIZE_1_MAX_OF_CertifiedKeyPair); + SEQUENCE_SIZE_1_MAX_OF_CertifiedKeyPair_sequence_of, hf_index, ett_cmp_SEQUENCE_SIZE_1_MAX_OF_CertifiedKeyPair); return offset; } static int dissect_keyPairHist(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - return dissect_cmp_SEQUNCE_SIZE_1_MAX_OF_CertifiedKeyPair(FALSE, tvb, offset, pinfo, tree, hf_cmp_keyPairHist); + return dissect_cmp_SEQUENCE_SIZE_1_MAX_OF_CertifiedKeyPair(FALSE, tvb, offset, pinfo, tree, hf_cmp_keyPairHist); } static const ber_sequence_t KeyRecRepContent_sequence[] = { @@ -864,49 +864,49 @@ static int dissect_rr(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int o return dissect_cmp_RevReqContent(FALSE, tvb, offset, pinfo, tree, hf_cmp_rr); } -static const ber_sequence_t SEQUNCE_SIZE_1_MAX_OF_PKIStatusInfo_sequence_of[1] = { +static const ber_sequence_t SEQUENCE_SIZE_1_MAX_OF_PKIStatusInfo_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_status_item }, }; static int -dissect_cmp_SEQUNCE_SIZE_1_MAX_OF_PKIStatusInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { +dissect_cmp_SEQUENCE_SIZE_1_MAX_OF_PKIStatusInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUNCE_SIZE_1_MAX_OF_PKIStatusInfo_sequence_of, hf_index, ett_cmp_SEQUNCE_SIZE_1_MAX_OF_PKIStatusInfo); + SEQUENCE_SIZE_1_MAX_OF_PKIStatusInfo_sequence_of, hf_index, ett_cmp_SEQUENCE_SIZE_1_MAX_OF_PKIStatusInfo); return offset; } static int dissect_status2(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - return dissect_cmp_SEQUNCE_SIZE_1_MAX_OF_PKIStatusInfo(FALSE, tvb, offset, pinfo, tree, hf_cmp_status2); + return dissect_cmp_SEQUENCE_SIZE_1_MAX_OF_PKIStatusInfo(FALSE, tvb, offset, pinfo, tree, hf_cmp_status2); } -static const ber_sequence_t SEQUNCE_SIZE_1_MAX_OF_CertId_sequence_of[1] = { +static const ber_sequence_t SEQUENCE_SIZE_1_MAX_OF_CertId_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_revCerts_item }, }; static int -dissect_cmp_SEQUNCE_SIZE_1_MAX_OF_CertId(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { +dissect_cmp_SEQUENCE_SIZE_1_MAX_OF_CertId(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUNCE_SIZE_1_MAX_OF_CertId_sequence_of, hf_index, ett_cmp_SEQUNCE_SIZE_1_MAX_OF_CertId); + SEQUENCE_SIZE_1_MAX_OF_CertId_sequence_of, hf_index, ett_cmp_SEQUENCE_SIZE_1_MAX_OF_CertId); return offset; } static int dissect_revCerts(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - return dissect_cmp_SEQUNCE_SIZE_1_MAX_OF_CertId(FALSE, tvb, offset, pinfo, tree, hf_cmp_revCerts); + return dissect_cmp_SEQUENCE_SIZE_1_MAX_OF_CertId(FALSE, tvb, offset, pinfo, tree, hf_cmp_revCerts); } -static const ber_sequence_t SEQUNCE_SIZE_1_MAX_OF_CertificateList_sequence_of[1] = { +static const ber_sequence_t SEQUENCE_SIZE_1_MAX_OF_CertificateList_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_crls_item }, }; static int -dissect_cmp_SEQUNCE_SIZE_1_MAX_OF_CertificateList(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { +dissect_cmp_SEQUENCE_SIZE_1_MAX_OF_CertificateList(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUNCE_SIZE_1_MAX_OF_CertificateList_sequence_of, hf_index, ett_cmp_SEQUNCE_SIZE_1_MAX_OF_CertificateList); + SEQUENCE_SIZE_1_MAX_OF_CertificateList_sequence_of, hf_index, ett_cmp_SEQUENCE_SIZE_1_MAX_OF_CertificateList); return offset; } static int dissect_crls(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - return dissect_cmp_SEQUNCE_SIZE_1_MAX_OF_CertificateList(FALSE, tvb, offset, pinfo, tree, hf_cmp_crls); + return dissect_cmp_SEQUENCE_SIZE_1_MAX_OF_CertificateList(FALSE, tvb, offset, pinfo, tree, hf_cmp_crls); } static const ber_sequence_t RevRepContent_sequence[] = { @@ -992,12 +992,10 @@ static int dissect_crlann(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i } + int dissect_cmp_PKIConfirmContent(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - { proto_item *ti_tmp; - ti_tmp = proto_tree_add_item(tree, hf_index, tvb, offset>>8, 0, FALSE); - proto_item_append_text(ti_tmp, ": NULL"); - } + offset = dissect_ber_null(implicit_tag, pinfo, tree, tvb, offset, hf_index); return offset; } @@ -1065,7 +1063,7 @@ static int dissect_error(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, in } -const value_string PKIBody_vals[] = { +const value_string cmp_PKIBody_vals[] = { { 0, "ir" }, { 1, "ip" }, { 2, "cr" }, @@ -1121,8 +1119,8 @@ static const ber_choice_t PKIBody_choice[] = { int dissect_cmp_PKIBody(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - PKIBody_choice, hf_index, ett_cmp_PKIBody); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + PKIBody_choice, hf_index, ett_cmp_PKIBody, NULL); return offset; } @@ -1174,10 +1172,11 @@ dissect_cmp_ProtectedPart(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, } + int dissect_cmp_PasswordBasedMac(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_object_identifier(implicit_tag, pinfo, tree, tvb, offset, - hf_index, NULL); + offset = dissect_ber_object_identifier(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -1199,10 +1198,11 @@ dissect_cmp_PBMParameter(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, p } + int dissect_cmp_DHBasedMac(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_object_identifier(implicit_tag, pinfo, tree, tvb, offset, - hf_index, NULL); + offset = dissect_ber_object_identifier(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -1303,7 +1303,7 @@ void proto_register_cmp(void) { "", HFILL }}, { &hf_cmp_body, { "body", "cmp.body", - FT_UINT32, BASE_DEC, VALS(PKIBody_vals), 0, + FT_UINT32, BASE_DEC, VALS(cmp_PKIBody_vals), 0, "", HFILL }}, { &hf_cmp_protection, { "protection", "cmp.protection", @@ -1319,7 +1319,7 @@ void proto_register_cmp(void) { "PKIMessage/extraCerts/_item", HFILL }}, { &hf_cmp_pvno, { "pvno", "cmp.pvno", - FT_INT32, BASE_DEC, VALS(T_pvno_vals), 0, + FT_INT32, BASE_DEC, VALS(cmp_T_pvno_vals), 0, "PKIHeader/pvno", HFILL }}, { &hf_cmp_sender, { "sender", "cmp.sender", @@ -1483,7 +1483,7 @@ void proto_register_cmp(void) { "", HFILL }}, { &hf_cmp_status, { "status", "cmp.status", - FT_INT32, BASE_DEC, VALS(PKIStatus_vals), 0, + FT_INT32, BASE_DEC, VALS(cmp_PKIStatus_vals), 0, "", HFILL }}, { &hf_cmp_statusString, { "statusString", "cmp.statusString", @@ -1555,7 +1555,7 @@ void proto_register_cmp(void) { "CertResponse/rspInfo", HFILL }}, { &hf_cmp_certOrEncCert, { "certOrEncCert", "cmp.certOrEncCert", - FT_UINT32, BASE_DEC, VALS(CertOrEncCert_vals), 0, + FT_UINT32, BASE_DEC, VALS(cmp_CertOrEncCert_vals), 0, "CertifiedKeyPair/certOrEncCert", HFILL }}, { &hf_cmp_privateKey, { "privateKey", "cmp.privateKey", @@ -1741,9 +1741,9 @@ void proto_register_cmp(void) { /*--- Included file: packet-cmp-ettarr.c ---*/ &ett_cmp_PKIMessage, - &ett_cmp_SEQUNCE_SIZE_1_MAX_OF_Certificate, + &ett_cmp_SEQUENCE_SIZE_1_MAX_OF_Certificate, &ett_cmp_PKIHeader, - &ett_cmp_SEQUNCE_SIZE_1_MAX_OF_InfoTypeAndValue, + &ett_cmp_SEQUENCE_SIZE_1_MAX_OF_InfoTypeAndValue, &ett_cmp_PKIFreeText, &ett_cmp_PKIBody, &ett_cmp_ProtectedPart, @@ -1756,18 +1756,18 @@ void proto_register_cmp(void) { &ett_cmp_Challenge, &ett_cmp_POPODecKeyRespContent, &ett_cmp_CertRepMessage, - &ett_cmp_SEQUNCE_OF_CertResponse, + &ett_cmp_SEQUENCE_OF_CertResponse, &ett_cmp_CertResponse, &ett_cmp_CertifiedKeyPair, &ett_cmp_CertOrEncCert, &ett_cmp_KeyRecRepContent, - &ett_cmp_SEQUNCE_SIZE_1_MAX_OF_CertifiedKeyPair, + &ett_cmp_SEQUENCE_SIZE_1_MAX_OF_CertifiedKeyPair, &ett_cmp_RevReqContent, &ett_cmp_RevDetails, &ett_cmp_RevRepContent, - &ett_cmp_SEQUNCE_SIZE_1_MAX_OF_PKIStatusInfo, - &ett_cmp_SEQUNCE_SIZE_1_MAX_OF_CertId, - &ett_cmp_SEQUNCE_SIZE_1_MAX_OF_CertificateList, + &ett_cmp_SEQUENCE_SIZE_1_MAX_OF_PKIStatusInfo, + &ett_cmp_SEQUENCE_SIZE_1_MAX_OF_CertId, + &ett_cmp_SEQUENCE_SIZE_1_MAX_OF_CertificateList, &ett_cmp_CAKeyUpdAnnContent, &ett_cmp_RevAnnContent, &ett_cmp_CRLAnnContent, diff --git a/epan/dissectors/packet-cmp.h b/epan/dissectors/packet-cmp.h index 27eb32abeb..cc80c98395 100644 --- a/epan/dissectors/packet-cmp.h +++ b/epan/dissectors/packet-cmp.h @@ -36,9 +36,9 @@ /*--- Included file: packet-cmp-exp.h ---*/ -extern const value_string PKIBody_vals[]; -extern const value_string PKIStatus_vals[]; -extern const value_string CertOrEncCert_vals[]; +extern const value_string cmp_PKIBody_vals[]; +extern const value_string cmp_PKIStatus_vals[]; +extern const value_string cmp_CertOrEncCert_vals[]; int dissect_cmp_PKIMessage(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index); int dissect_cmp_PKIHeader(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index); int dissect_cmp_PKIFreeText(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index); diff --git a/epan/dissectors/packet-cms.c b/epan/dissectors/packet-cms.c index 4e5fe33a6f..85331238c6 100644 --- a/epan/dissectors/packet-cms.c +++ b/epan/dissectors/packet-cms.c @@ -9,7 +9,7 @@ * Routines for RFC2630 Cryptographic Message Syntax packet dissection * Ronnie Sahlberg 2004 * - * $Id: packet-cms-template.c 12740 2004-12-13 08:15:34Z sahlberg $ + * $Id: packet-cms-template.c 14169 2005-04-22 21:17:13Z gerald $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -213,10 +213,11 @@ static int dissect_serialNumber(packet_info *pinfo, proto_tree *tree, tvbuff_t * } + int dissect_cms_ContentType(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_object_identifier(implicit_tag, pinfo, tree, tvb, offset, - hf_index, NULL); + offset = dissect_ber_object_identifier(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -277,7 +278,8 @@ static const value_string cms_CMSVersion_vals[] = { static int dissect_cms_CMSVersion(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -370,10 +372,11 @@ static int dissect_encapContentInfo(packet_info *pinfo, proto_tree *tree, tvbuff } + static int dissect_cms_OBJECT_IDENTIFIER(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_object_identifier(implicit_tag, pinfo, tree, tvb, offset, - hf_index, NULL); + offset = dissect_ber_object_identifier(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -504,8 +507,8 @@ static const ber_choice_t CertificateChoices_choice[] = { static int dissect_cms_CertificateChoices(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - CertificateChoices_choice, hf_index, ett_cms_CertificateChoices); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + CertificateChoices_choice, hf_index, ett_cms_CertificateChoices, NULL); return offset; } @@ -593,8 +596,8 @@ static const ber_choice_t SignerIdentifier_choice[] = { int dissect_cms_SignerIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - SignerIdentifier_choice, hf_index, ett_cms_SignerIdentifier); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + SignerIdentifier_choice, hf_index, ett_cms_SignerIdentifier, NULL); return offset; } @@ -731,8 +734,8 @@ static const ber_choice_t RecipientIdentifier_choice[] = { static int dissect_cms_RecipientIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - RecipientIdentifier_choice, hf_index, ett_cms_RecipientIdentifier); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + RecipientIdentifier_choice, hf_index, ett_cms_RecipientIdentifier, NULL); return offset; } @@ -829,8 +832,8 @@ static const ber_choice_t OriginatorIdentifierOrKey_choice[] = { static int dissect_cms_OriginatorIdentifierOrKey(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - OriginatorIdentifierOrKey_choice, hf_index, ett_cms_OriginatorIdentifierOrKey); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + OriginatorIdentifierOrKey_choice, hf_index, ett_cms_OriginatorIdentifierOrKey, NULL); return offset; } @@ -862,6 +865,7 @@ static int dissect_date(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int } + static int dissect_cms_T_keyAttrId(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_object_identifier(FALSE, pinfo, tree, tvb, offset, @@ -937,8 +941,8 @@ static const ber_choice_t KeyAgreeRecipientIdentifier_choice[] = { static int dissect_cms_KeyAgreeRecipientIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - KeyAgreeRecipientIdentifier_choice, hf_index, ett_cms_KeyAgreeRecipientIdentifier); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + KeyAgreeRecipientIdentifier_choice, hf_index, ett_cms_KeyAgreeRecipientIdentifier, NULL); return offset; } @@ -1064,8 +1068,8 @@ static const ber_choice_t RecipientInfo_choice[] = { static int dissect_cms_RecipientInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - RecipientInfo_choice, hf_index, ett_cms_RecipientInfo); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + RecipientInfo_choice, hf_index, ett_cms_RecipientInfo, NULL); return offset; } diff --git a/epan/dissectors/packet-crmf.c b/epan/dissectors/packet-crmf.c index f1e8cb0d5c..bfaa8c09ed 100644 --- a/epan/dissectors/packet-crmf.c +++ b/epan/dissectors/packet-crmf.c @@ -223,7 +223,8 @@ static const value_string crmf_Version_vals[] = { static int dissect_crmf_Version(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -286,8 +287,8 @@ static const ber_choice_t Time_choice[] = { static int dissect_crmf_Time(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - Time_choice, hf_index, ett_crmf_Time); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + Time_choice, hf_index, ett_crmf_Time, NULL); return offset; } @@ -302,7 +303,8 @@ static int dissect_notAfter_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t static int dissect_crmf_INTEGER(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -362,6 +364,7 @@ static int dissect_certTemplate(packet_info *pinfo, proto_tree *tree, tvbuff_t * } + static int dissect_crmf_T_type(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_object_identifier(FALSE, pinfo, tree, tvb, offset, @@ -441,12 +444,10 @@ static int dissect_certReq(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, } + static int dissect_crmf_NULL(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - { proto_item *ti_tmp; - ti_tmp = proto_tree_add_item(tree, hf_index, tvb, offset>>8, 0, FALSE); - proto_item_append_text(ti_tmp, ": NULL"); - } + offset = dissect_ber_null(implicit_tag, pinfo, tree, tvb, offset, hf_index); return offset; } @@ -514,8 +515,8 @@ static const ber_choice_t T_authInfo_choice[] = { static int dissect_crmf_T_authInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - T_authInfo_choice, hf_index, ett_crmf_T_authInfo); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + T_authInfo_choice, hf_index, ett_crmf_T_authInfo, NULL); return offset; } @@ -568,7 +569,8 @@ const value_string crmf_SubsequentMessage_vals[] = { int dissect_crmf_SubsequentMessage(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -593,8 +595,8 @@ static const ber_choice_t POPOPrivKey_choice[] = { int dissect_crmf_POPOPrivKey(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - POPOPrivKey_choice, hf_index, ett_crmf_POPOPrivKey); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + POPOPrivKey_choice, hf_index, ett_crmf_POPOPrivKey, NULL); return offset; } @@ -624,8 +626,8 @@ static const ber_choice_t ProofOfPossession_choice[] = { int dissect_crmf_ProofOfPossession(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - ProofOfPossession_choice, hf_index, ett_crmf_ProofOfPossession); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + ProofOfPossession_choice, hf_index, ett_crmf_ProofOfPossession, NULL); return offset; } @@ -739,7 +741,8 @@ static const value_string crmf_T_action_vals[] = { static int dissect_crmf_T_action(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -759,7 +762,8 @@ static const value_string crmf_T_pubMethod_vals[] = { static int dissect_crmf_T_pubMethod(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -849,8 +853,8 @@ static const ber_choice_t EncryptedKey_choice[] = { int dissect_crmf_EncryptedKey(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - EncryptedKey_choice, hf_index, ett_crmf_EncryptedKey); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + EncryptedKey_choice, hf_index, ett_crmf_EncryptedKey, NULL); return offset; } @@ -898,8 +902,8 @@ static const ber_choice_t PKIArchiveOptions_choice[] = { int dissect_crmf_PKIArchiveOptions(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - PKIArchiveOptions_choice, hf_index, ett_crmf_PKIArchiveOptions); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + PKIArchiveOptions_choice, hf_index, ett_crmf_PKIArchiveOptions, NULL); return offset; } diff --git a/epan/dissectors/packet-ess.c b/epan/dissectors/packet-ess.c index 070d394e58..ad40ed76af 100644 --- a/epan/dissectors/packet-ess.c +++ b/epan/dissectors/packet-ess.c @@ -66,10 +66,10 @@ static int hf_ess_MLExpansionHistory_PDU = -1; /* MLExpansionHistory */ static int hf_ess_SigningCertificate_PDU = -1; /* SigningCertificate */ static int hf_ess_signedContentIdentifier = -1; /* ContentIdentifier */ static int hf_ess_receiptsFrom = -1; /* ReceiptsFrom */ -static int hf_ess_receiptsTo = -1; /* SEQUNCE_OF_GeneralNames */ +static int hf_ess_receiptsTo = -1; /* SEQUENCE_OF_GeneralNames */ static int hf_ess_receiptsTo_item = -1; /* GeneralNames */ static int hf_ess_allOrFirstTier = -1; /* AllOrFirstTier */ -static int hf_ess_receiptList = -1; /* SEQUNCE_OF_GeneralNames */ +static int hf_ess_receiptList = -1; /* SEQUENCE_OF_GeneralNames */ static int hf_ess_receiptList_item = -1; /* GeneralNames */ static int hf_ess_version = -1; /* ESSVersion */ static int hf_ess_contentType = -1; /* ContentType */ @@ -87,13 +87,13 @@ static int hf_ess_mlReceiptPolicy = -1; /* MLReceiptPolicy */ static int hf_ess_issuerAndSerialNumber = -1; /* IssuerAndSerialNumber */ static int hf_ess_subjectKeyIdentifier = -1; /* SubjectKeyIdentifier */ static int hf_ess_none = -1; /* NULL */ -static int hf_ess_insteadOf = -1; /* SEQUNCE_OF_GeneralNames */ +static int hf_ess_insteadOf = -1; /* SEQUENCE_OF_GeneralNames */ static int hf_ess_insteadOf_item = -1; /* GeneralNames */ -static int hf_ess_inAdditionTo = -1; /* SEQUNCE_OF_GeneralNames */ +static int hf_ess_inAdditionTo = -1; /* SEQUENCE_OF_GeneralNames */ static int hf_ess_inAdditionTo_item = -1; /* GeneralNames */ -static int hf_ess_certs = -1; /* SEQUNCE_OF_ESSCertID */ +static int hf_ess_certs = -1; /* SEQUENCE_OF_ESSCertID */ static int hf_ess_certs_item = -1; /* ESSCertID */ -static int hf_ess_policies = -1; /* SEQUNCE_OF_PolicyInformation */ +static int hf_ess_policies = -1; /* SEQUENCE_OF_PolicyInformation */ static int hf_ess_policies_item = -1; /* PolicyInformation */ static int hf_ess_certHash = -1; /* Hash */ static int hf_ess_issuerSerial = -1; /* IssuerSerial */ @@ -108,7 +108,7 @@ static int hf_ess_serialNumber = -1; /* CertificateSerialNumber */ /*--- Included file: packet-ess-ett.c ---*/ static gint ett_ess_ReceiptRequest = -1; -static gint ett_ess_SEQUNCE_OF_GeneralNames = -1; +static gint ett_ess_SEQUENCE_OF_GeneralNames = -1; static gint ett_ess_ReceiptsFrom = -1; static gint ett_ess_Receipt = -1; static gint ett_ess_ContentHints = -1; @@ -121,8 +121,8 @@ static gint ett_ess_MLData = -1; static gint ett_ess_EntityIdentifier = -1; static gint ett_ess_MLReceiptPolicy = -1; static gint ett_ess_SigningCertificate = -1; -static gint ett_ess_SEQUNCE_OF_ESSCertID = -1; -static gint ett_ess_SEQUNCE_OF_PolicyInformation = -1; +static gint ett_ess_SEQUENCE_OF_ESSCertID = -1; +static gint ett_ess_SEQUENCE_OF_PolicyInformation = -1; static gint ett_ess_ESSCertID = -1; static gint ett_ess_IssuerSerial = -1; @@ -180,7 +180,7 @@ static int dissect_signedContentIdentifier(packet_info *pinfo, proto_tree *tree, } -static const value_string AllOrFirstTier_vals[] = { +static const value_string ess_AllOrFirstTier_vals[] = { { 0, "allReceipts" }, { 1, "firstTierRecipients" }, { 0, NULL } @@ -189,7 +189,8 @@ static const value_string AllOrFirstTier_vals[] = { static int dissect_ess_AllOrFirstTier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -197,32 +198,32 @@ static int dissect_allOrFirstTier_impl(packet_info *pinfo, proto_tree *tree, tvb return dissect_ess_AllOrFirstTier(TRUE, tvb, offset, pinfo, tree, hf_ess_allOrFirstTier); } -static const ber_sequence_t SEQUNCE_OF_GeneralNames_sequence_of[1] = { +static const ber_sequence_t SEQUENCE_OF_GeneralNames_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_receiptsTo_item }, }; static int -dissect_ess_SEQUNCE_OF_GeneralNames(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { +dissect_ess_SEQUENCE_OF_GeneralNames(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUNCE_OF_GeneralNames_sequence_of, hf_index, ett_ess_SEQUNCE_OF_GeneralNames); + SEQUENCE_OF_GeneralNames_sequence_of, hf_index, ett_ess_SEQUENCE_OF_GeneralNames); return offset; } static int dissect_receiptsTo(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - return dissect_ess_SEQUNCE_OF_GeneralNames(FALSE, tvb, offset, pinfo, tree, hf_ess_receiptsTo); + return dissect_ess_SEQUENCE_OF_GeneralNames(FALSE, tvb, offset, pinfo, tree, hf_ess_receiptsTo); } static int dissect_receiptList_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - return dissect_ess_SEQUNCE_OF_GeneralNames(TRUE, tvb, offset, pinfo, tree, hf_ess_receiptList); + return dissect_ess_SEQUENCE_OF_GeneralNames(TRUE, tvb, offset, pinfo, tree, hf_ess_receiptList); } static int dissect_insteadOf_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - return dissect_ess_SEQUNCE_OF_GeneralNames(TRUE, tvb, offset, pinfo, tree, hf_ess_insteadOf); + return dissect_ess_SEQUENCE_OF_GeneralNames(TRUE, tvb, offset, pinfo, tree, hf_ess_insteadOf); } static int dissect_inAdditionTo_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - return dissect_ess_SEQUNCE_OF_GeneralNames(TRUE, tvb, offset, pinfo, tree, hf_ess_inAdditionTo); + return dissect_ess_SEQUENCE_OF_GeneralNames(TRUE, tvb, offset, pinfo, tree, hf_ess_inAdditionTo); } -static const value_string ReceiptsFrom_vals[] = { +static const value_string ess_ReceiptsFrom_vals[] = { { 0, "allOrFirstTier" }, { 1, "receiptList" }, { 0, NULL } @@ -236,8 +237,8 @@ static const ber_choice_t ReceiptsFrom_choice[] = { static int dissect_ess_ReceiptsFrom(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - ReceiptsFrom_choice, hf_index, ett_ess_ReceiptsFrom); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + ReceiptsFrom_choice, hf_index, ett_ess_ReceiptsFrom, NULL); return offset; } @@ -261,7 +262,7 @@ dissect_ess_ReceiptRequest(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, } -static const value_string ESSVersion_vals[] = { +static const value_string ess_ESSVersion_vals[] = { { 1, "v1" }, { 0, NULL } }; @@ -269,7 +270,8 @@ static const value_string ESSVersion_vals[] = { static int dissect_ess_ESSVersion(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -360,16 +362,17 @@ dissect_ess_ContentReference(gboolean implicit_tag _U_, tvbuff_t *tvb, int offse } + static int dissect_ess_SecurityPolicyIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_object_identifier(implicit_tag, pinfo, tree, tvb, offset, - hf_index, NULL); + offset = dissect_ber_object_identifier(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } -static const value_string SecurityClassification_vals[] = { +static const value_string ess_SecurityClassification_vals[] = { { 0, "unmarked" }, { 1, "unclassified" }, { 2, "restricted" }, @@ -382,7 +385,8 @@ static const value_string SecurityClassification_vals[] = { static int dissect_ess_SecurityClassification(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -401,7 +405,7 @@ static int dissect_pString(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, } -static const value_string ESSPrivacyMark_vals[] = { +static const value_string ess_ESSPrivacyMark_vals[] = { { 0, "pString" }, { 1, "utf8String" }, { 0, NULL } @@ -415,13 +419,14 @@ static const ber_choice_t ESSPrivacyMark_choice[] = { static int dissect_ess_ESSPrivacyMark(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - ESSPrivacyMark_choice, hf_index, ett_ess_ESSPrivacyMark); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + ESSPrivacyMark_choice, hf_index, ett_ess_ESSPrivacyMark, NULL); return offset; } + static int dissect_ess_T_type(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_object_identifier(FALSE, pinfo, tree, tvb, offset, @@ -477,7 +482,7 @@ dissect_ess_SecurityCategories(gboolean implicit_tag _U_, tvbuff_t *tvb, int off } -static const value_string EntityIdentifier_vals[] = { +static const value_string ess_EntityIdentifier_vals[] = { { 0, "issuerAndSerialNumber" }, { 1, "subjectKeyIdentifier" }, { 0, NULL } @@ -491,8 +496,8 @@ static const ber_choice_t EntityIdentifier_choice[] = { static int dissect_ess_EntityIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - EntityIdentifier_choice, hf_index, ett_ess_EntityIdentifier); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + EntityIdentifier_choice, hf_index, ett_ess_EntityIdentifier, NULL); return offset; } @@ -512,12 +517,10 @@ static int dissect_expansionTime(packet_info *pinfo, proto_tree *tree, tvbuff_t } + static int dissect_ess_NULL(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - { proto_item *ti_tmp; - ti_tmp = proto_tree_add_item(tree, hf_index, tvb, offset>>8, 0, FALSE); - proto_item_append_text(ti_tmp, ": NULL"); - } + offset = dissect_ber_null(implicit_tag, pinfo, tree, tvb, offset, hf_index); return offset; } @@ -526,7 +529,7 @@ static int dissect_none_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb } -static const value_string MLReceiptPolicy_vals[] = { +static const value_string ess_MLReceiptPolicy_vals[] = { { 0, "none" }, { 1, "insteadOf" }, { 2, "inAdditionTo" }, @@ -542,8 +545,8 @@ static const ber_choice_t MLReceiptPolicy_choice[] = { static int dissect_ess_MLReceiptPolicy(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - MLReceiptPolicy_choice, hf_index, ett_ess_MLReceiptPolicy); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + MLReceiptPolicy_choice, hf_index, ett_ess_MLReceiptPolicy, NULL); return offset; } @@ -627,34 +630,34 @@ static int dissect_certs_item(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv return dissect_ess_ESSCertID(FALSE, tvb, offset, pinfo, tree, hf_ess_certs_item); } -static const ber_sequence_t SEQUNCE_OF_ESSCertID_sequence_of[1] = { +static const ber_sequence_t SEQUENCE_OF_ESSCertID_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_certs_item }, }; static int -dissect_ess_SEQUNCE_OF_ESSCertID(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { +dissect_ess_SEQUENCE_OF_ESSCertID(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUNCE_OF_ESSCertID_sequence_of, hf_index, ett_ess_SEQUNCE_OF_ESSCertID); + SEQUENCE_OF_ESSCertID_sequence_of, hf_index, ett_ess_SEQUENCE_OF_ESSCertID); return offset; } static int dissect_certs(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - return dissect_ess_SEQUNCE_OF_ESSCertID(FALSE, tvb, offset, pinfo, tree, hf_ess_certs); + return dissect_ess_SEQUENCE_OF_ESSCertID(FALSE, tvb, offset, pinfo, tree, hf_ess_certs); } -static const ber_sequence_t SEQUNCE_OF_PolicyInformation_sequence_of[1] = { +static const ber_sequence_t SEQUENCE_OF_PolicyInformation_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_policies_item }, }; static int -dissect_ess_SEQUNCE_OF_PolicyInformation(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { +dissect_ess_SEQUENCE_OF_PolicyInformation(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUNCE_OF_PolicyInformation_sequence_of, hf_index, ett_ess_SEQUNCE_OF_PolicyInformation); + SEQUENCE_OF_PolicyInformation_sequence_of, hf_index, ett_ess_SEQUENCE_OF_PolicyInformation); return offset; } static int dissect_policies(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - return dissect_ess_SEQUNCE_OF_PolicyInformation(FALSE, tvb, offset, pinfo, tree, hf_ess_policies); + return dissect_ess_SEQUENCE_OF_PolicyInformation(FALSE, tvb, offset, pinfo, tree, hf_ess_policies); } static const ber_sequence_t SigningCertificate_sequence[] = { @@ -752,7 +755,7 @@ void proto_register_ess(void) { "", HFILL }}, { &hf_ess_receiptsFrom, { "receiptsFrom", "ess.receiptsFrom", - FT_UINT32, BASE_DEC, VALS(ReceiptsFrom_vals), 0, + FT_UINT32, BASE_DEC, VALS(ess_ReceiptsFrom_vals), 0, "ReceiptRequest/receiptsFrom", HFILL }}, { &hf_ess_receiptsTo, { "receiptsTo", "ess.receiptsTo", @@ -764,7 +767,7 @@ void proto_register_ess(void) { "ReceiptRequest/receiptsTo/_item", HFILL }}, { &hf_ess_allOrFirstTier, { "allOrFirstTier", "ess.allOrFirstTier", - FT_INT32, BASE_DEC, VALS(AllOrFirstTier_vals), 0, + FT_INT32, BASE_DEC, VALS(ess_AllOrFirstTier_vals), 0, "ReceiptsFrom/allOrFirstTier", HFILL }}, { &hf_ess_receiptList, { "receiptList", "ess.receiptList", @@ -776,7 +779,7 @@ void proto_register_ess(void) { "ReceiptsFrom/receiptList/_item", HFILL }}, { &hf_ess_version, { "version", "ess.version", - FT_INT32, BASE_DEC, VALS(ESSVersion_vals), 0, + FT_INT32, BASE_DEC, VALS(ess_ESSVersion_vals), 0, "Receipt/version", HFILL }}, { &hf_ess_contentType, { "contentType", "ess.contentType", @@ -816,7 +819,7 @@ void proto_register_ess(void) { "MLExpansionHistory/_item", HFILL }}, { &hf_ess_mailListIdentifier, { "mailListIdentifier", "ess.mailListIdentifier", - FT_UINT32, BASE_DEC, VALS(EntityIdentifier_vals), 0, + FT_UINT32, BASE_DEC, VALS(ess_EntityIdentifier_vals), 0, "MLData/mailListIdentifier", HFILL }}, { &hf_ess_expansionTime, { "expansionTime", "ess.expansionTime", @@ -824,7 +827,7 @@ void proto_register_ess(void) { "MLData/expansionTime", HFILL }}, { &hf_ess_mlReceiptPolicy, { "mlReceiptPolicy", "ess.mlReceiptPolicy", - FT_UINT32, BASE_DEC, VALS(MLReceiptPolicy_vals), 0, + FT_UINT32, BASE_DEC, VALS(ess_MLReceiptPolicy_vals), 0, "MLData/mlReceiptPolicy", HFILL }}, { &hf_ess_issuerAndSerialNumber, { "issuerAndSerialNumber", "ess.issuerAndSerialNumber", @@ -897,7 +900,7 @@ void proto_register_ess(void) { /*--- Included file: packet-ess-ettarr.c ---*/ &ett_ess_ReceiptRequest, - &ett_ess_SEQUNCE_OF_GeneralNames, + &ett_ess_SEQUENCE_OF_GeneralNames, &ett_ess_ReceiptsFrom, &ett_ess_Receipt, &ett_ess_ContentHints, @@ -910,8 +913,8 @@ void proto_register_ess(void) { &ett_ess_EntityIdentifier, &ett_ess_MLReceiptPolicy, &ett_ess_SigningCertificate, - &ett_ess_SEQUNCE_OF_ESSCertID, - &ett_ess_SEQUNCE_OF_PolicyInformation, + &ett_ess_SEQUENCE_OF_ESSCertID, + &ett_ess_SEQUENCE_OF_PolicyInformation, &ett_ess_ESSCertID, &ett_ess_IssuerSerial, diff --git a/epan/dissectors/packet-ftam.c b/epan/dissectors/packet-ftam.c index 57c34cfd81..5a517ed184 100644 --- a/epan/dissectors/packet-ftam.c +++ b/epan/dissectors/packet-ftam.c @@ -978,8 +978,8 @@ static const ber_choice_t Contents_Type_List_item_choice[] = { static int dissect_ftam_Contents_Type_List_item(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - Contents_Type_List_item_choice, hf_index, ett_ftam_Contents_Type_List_item); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + Contents_Type_List_item_choice, hf_index, ett_ftam_Contents_Type_List_item, NULL); return offset; } @@ -1144,8 +1144,8 @@ dissect_ftam_Password(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, pack offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); offset = get_ber_length(tree, tvb, offset, &len1, &ind_field); - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - Password_choice, hf_index, ett_ftam_Password); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + Password_choice, hf_index, ett_ftam_Password, NULL); @@ -1648,8 +1648,8 @@ static const ber_choice_t FTAM_Regime_PDU_choice[] = { static int dissect_ftam_FTAM_Regime_PDU(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - FTAM_Regime_PDU_choice, hf_index, ett_ftam_FTAM_Regime_PDU); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + FTAM_Regime_PDU_choice, hf_index, ett_ftam_FTAM_Regime_PDU, NULL); return offset; } @@ -1693,8 +1693,8 @@ static const ber_choice_t Pathname_Attribute_choice[] = { static int dissect_ftam_Pathname_Attribute(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - Pathname_Attribute_choice, hf_index, ett_ftam_Pathname_Attribute); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + Pathname_Attribute_choice, hf_index, ett_ftam_Pathname_Attribute, NULL); return offset; } @@ -2226,8 +2226,8 @@ static const ber_choice_t Contents_Type_Attribute_choice[] = { static int dissect_ftam_Contents_Type_Attribute(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - Contents_Type_Attribute_choice, hf_index, ett_ftam_Contents_Type_Attribute); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + Contents_Type_Attribute_choice, hf_index, ett_ftam_Contents_Type_Attribute, NULL); return offset; } @@ -2274,8 +2274,8 @@ static const ber_choice_t Account_Attribute_choice[] = { static int dissect_ftam_Account_Attribute(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - Account_Attribute_choice, hf_index, ett_ftam_Account_Attribute); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + Account_Attribute_choice, hf_index, ett_ftam_Account_Attribute, NULL); return offset; } @@ -2317,8 +2317,8 @@ static const ber_choice_t Object_Availability_Attribute_choice[] = { static int dissect_ftam_Object_Availability_Attribute(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - Object_Availability_Attribute_choice, hf_index, ett_ftam_Object_Availability_Attribute); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + Object_Availability_Attribute_choice, hf_index, ett_ftam_Object_Availability_Attribute, NULL); return offset; } @@ -2341,8 +2341,8 @@ static const ber_choice_t Object_Size_Attribute_choice[] = { static int dissect_ftam_Object_Size_Attribute(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - Object_Size_Attribute_choice, hf_index, ett_ftam_Object_Size_Attribute); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + Object_Size_Attribute_choice, hf_index, ett_ftam_Object_Size_Attribute, NULL); return offset; } @@ -2529,8 +2529,8 @@ static const ber_choice_t Access_Control_Attribute_choice[] = { static int dissect_ftam_Access_Control_Attribute(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - Access_Control_Attribute_choice, hf_index, ett_ftam_Access_Control_Attribute); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + Access_Control_Attribute_choice, hf_index, ett_ftam_Access_Control_Attribute, NULL); return offset; } @@ -2559,8 +2559,8 @@ static const ber_choice_t Legal_Qualification_Attribute_choice[] = { static int dissect_ftam_Legal_Qualification_Attribute(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - Legal_Qualification_Attribute_choice, hf_index, ett_ftam_Legal_Qualification_Attribute); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + Legal_Qualification_Attribute_choice, hf_index, ett_ftam_Legal_Qualification_Attribute, NULL); return offset; } @@ -2585,8 +2585,8 @@ static const ber_choice_t Private_Use_Attribute_choice[] = { static int dissect_ftam_Private_Use_Attribute(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - Private_Use_Attribute_choice, hf_index, ett_ftam_Private_Use_Attribute); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + Private_Use_Attribute_choice, hf_index, ett_ftam_Private_Use_Attribute, NULL); return offset; } @@ -2976,8 +2976,8 @@ static const ber_choice_t Date_and_Time_Attribute_choice[] = { static int dissect_ftam_Date_and_Time_Attribute(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - Date_and_Time_Attribute_choice, hf_index, ett_ftam_Date_and_Time_Attribute); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + Date_and_Time_Attribute_choice, hf_index, ett_ftam_Date_and_Time_Attribute, NULL); return offset; } @@ -3009,8 +3009,8 @@ static const ber_choice_t User_Identity_Attribute_choice[] = { static int dissect_ftam_User_Identity_Attribute(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - User_Identity_Attribute_choice, hf_index, ett_ftam_User_Identity_Attribute); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + User_Identity_Attribute_choice, hf_index, ett_ftam_User_Identity_Attribute, NULL); return offset; } @@ -3134,8 +3134,8 @@ static const ber_choice_t Access_Control_Change_Attribute_choice[] = { static int dissect_ftam_Access_Control_Change_Attribute(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - Access_Control_Change_Attribute_choice, hf_index, ett_ftam_Access_Control_Change_Attribute); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + Access_Control_Change_Attribute_choice, hf_index, ett_ftam_Access_Control_Change_Attribute, NULL); return offset; } @@ -3253,8 +3253,8 @@ static const ber_choice_t T_contents_type_choice[] = { static int dissect_ftam_T_contents_type(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - T_contents_type_choice, hf_index, ett_ftam_T_contents_type); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + T_contents_type_choice, hf_index, ett_ftam_T_contents_type, NULL); return offset; } @@ -3697,8 +3697,8 @@ dissect_ftam_FADU_Identity(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); offset = get_ber_length(tree, tvb, offset, &len1, &ind_field); - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - FADU_Identity_choice, hf_index, ett_ftam_FADU_Identity); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + FADU_Identity_choice, hf_index, ett_ftam_FADU_Identity, NULL); return offset; @@ -3868,8 +3868,8 @@ static const ber_choice_t File_PDU_choice[] = { static int dissect_ftam_File_PDU(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - File_PDU_choice, hf_index, ett_ftam_File_PDU); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + File_PDU_choice, hf_index, ett_ftam_File_PDU, NULL); return offset; } @@ -4197,8 +4197,8 @@ static const ber_choice_t Bulk_Data_PDU_choice[] = { static int dissect_ftam_Bulk_Data_PDU(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - Bulk_Data_PDU_choice, hf_index, ett_ftam_Bulk_Data_PDU); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + Bulk_Data_PDU_choice, hf_index, ett_ftam_Bulk_Data_PDU, NULL); return offset; } @@ -4292,8 +4292,8 @@ static const ber_choice_t T_string_value_item_choice[] = { static int dissect_ftam_T_string_value_item(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - T_string_value_item_choice, hf_index, ett_ftam_T_string_value_item); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + T_string_value_item_choice, hf_index, ett_ftam_T_string_value_item, NULL); return offset; } @@ -4354,8 +4354,8 @@ static const ber_choice_t T_pathname_value_item_choice[] = { static int dissect_ftam_T_pathname_value_item(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - T_pathname_value_item_choice, hf_index, ett_ftam_T_pathname_value_item); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + T_pathname_value_item_choice, hf_index, ett_ftam_T_pathname_value_item, NULL); return offset; } @@ -4552,8 +4552,8 @@ static const ber_choice_t Contents_Type_Pattern_choice[] = { static int dissect_ftam_Contents_Type_Pattern(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - Contents_Type_Pattern_choice, hf_index, ett_ftam_Contents_Type_Pattern); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + Contents_Type_Pattern_choice, hf_index, ett_ftam_Contents_Type_Pattern, NULL); return offset; } @@ -4754,8 +4754,8 @@ static const ber_choice_t AND_Set_item_choice[] = { static int dissect_ftam_AND_Set_item(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - AND_Set_item_choice, hf_index, ett_ftam_AND_Set_item); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + AND_Set_item_choice, hf_index, ett_ftam_AND_Set_item, NULL); return offset; } @@ -5070,8 +5070,8 @@ dissect_ftam_Operation_Result(gboolean implicit_tag _U_, tvbuff_t *tvb, int offs offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); offset = get_ber_length(tree, tvb, offset, &len1, &ind_field); - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - Operation_Result_choice, hf_index, ett_ftam_Operation_Result); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + Operation_Result_choice, hf_index, ett_ftam_Operation_Result, NULL); return offset; @@ -5657,8 +5657,8 @@ static const ber_choice_t FSM_PDU_choice[] = { static int dissect_ftam_FSM_PDU(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - FSM_PDU_choice, hf_index, ett_ftam_FSM_PDU); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + FSM_PDU_choice, hf_index, ett_ftam_FSM_PDU, NULL); return offset; } @@ -5685,8 +5685,8 @@ static const ber_choice_t PDU_choice[] = { static int dissect_ftam_PDU(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - PDU_choice, hf_index, ett_ftam_PDU); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + PDU_choice, hf_index, ett_ftam_PDU, NULL); return offset; } diff --git a/epan/dissectors/packet-gsm_map.c b/epan/dissectors/packet-gsm_map.c index 1dc1cdf177..67efd33611 100644 --- a/epan/dissectors/packet-gsm_map.c +++ b/epan/dissectors/packet-gsm_map.c @@ -1,6 +1,6 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Ethereal dissector compiler */ -/* .\packet-gsm_map.c */ +/* ./packet-gsm_map.c */ /* ../../tools/asn2eth.py -X -b -e -p gsm_map -c gsmmap.cnf -s packet-gsm_map-template GSMMAP.asn */ /* Input file: packet-gsm_map-template.c */ @@ -2141,8 +2141,8 @@ static const ber_choice_t SuperChargerInfo_choice[] = { static int dissect_gsm_map_SuperChargerInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - SuperChargerInfo_choice, hf_index, ett_gsm_map_SuperChargerInfo); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + SuperChargerInfo_choice, hf_index, ett_gsm_map_SuperChargerInfo, NULL); return offset; } @@ -2451,8 +2451,8 @@ static const ber_choice_t Identity_choice[] = { static int dissect_gsm_map_Identity(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - Identity_choice, hf_index, ett_gsm_map_Identity); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + Identity_choice, hf_index, ett_gsm_map_Identity, NULL); return offset; } @@ -2779,8 +2779,8 @@ static const ber_choice_t AuthenticationSetList_choice[] = { static int dissect_gsm_map_AuthenticationSetList(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - AuthenticationSetList_choice, hf_index, ett_gsm_map_AuthenticationSetList); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + AuthenticationSetList_choice, hf_index, ett_gsm_map_AuthenticationSetList, NULL); return offset; } @@ -2862,8 +2862,8 @@ static const ber_choice_t CurrentSecurityContext_choice[] = { static int dissect_gsm_map_CurrentSecurityContext(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - CurrentSecurityContext_choice, hf_index, ett_gsm_map_CurrentSecurityContext); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + CurrentSecurityContext_choice, hf_index, ett_gsm_map_CurrentSecurityContext, NULL); return offset; } @@ -3995,8 +3995,8 @@ static const ber_choice_t BasicService_choice[] = { static int dissect_gsm_map_BasicService(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - BasicService_choice, hf_index, ett_gsm_map_BasicService); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + BasicService_choice, hf_index, ett_gsm_map_BasicService, NULL); return offset; } @@ -4413,8 +4413,8 @@ static const ber_choice_t Ext_BasicServiceCode_choice[] = { static int dissect_gsm_map_Ext_BasicServiceCode(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - Ext_BasicServiceCode_choice, hf_index, ett_gsm_map_Ext_BasicServiceCode); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + Ext_BasicServiceCode_choice, hf_index, ett_gsm_map_Ext_BasicServiceCode, NULL); return offset; } @@ -4857,8 +4857,8 @@ static const ber_choice_t SS_SubscriptionOption_choice[] = { static int dissect_gsm_map_SS_SubscriptionOption(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - SS_SubscriptionOption_choice, hf_index, ett_gsm_map_SS_SubscriptionOption); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + SS_SubscriptionOption_choice, hf_index, ett_gsm_map_SS_SubscriptionOption, NULL); return offset; } @@ -4950,8 +4950,8 @@ static const ber_choice_t Ext_SS_Info_choice[] = { static int dissect_gsm_map_Ext_SS_Info(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - Ext_SS_Info_choice, hf_index, ett_gsm_map_Ext_SS_Info); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + Ext_SS_Info_choice, hf_index, ett_gsm_map_Ext_SS_Info, NULL); return offset; } @@ -6803,8 +6803,8 @@ static const ber_choice_t GPRSSubscriptionDataWithdraw_choice[] = { static int dissect_gsm_map_GPRSSubscriptionDataWithdraw(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - GPRSSubscriptionDataWithdraw_choice, hf_index, ett_gsm_map_GPRSSubscriptionDataWithdraw); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + GPRSSubscriptionDataWithdraw_choice, hf_index, ett_gsm_map_GPRSSubscriptionDataWithdraw, NULL); return offset; } @@ -6842,8 +6842,8 @@ static const ber_choice_t LSAInformationWithdraw_choice[] = { static int dissect_gsm_map_LSAInformationWithdraw(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - LSAInformationWithdraw_choice, hf_index, ett_gsm_map_LSAInformationWithdraw); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + LSAInformationWithdraw_choice, hf_index, ett_gsm_map_LSAInformationWithdraw, NULL); return offset; } @@ -6998,8 +6998,8 @@ static const ber_choice_t BasicServiceCode_choice[] = { static int dissect_gsm_map_BasicServiceCode(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - BasicServiceCode_choice, hf_index, ett_gsm_map_BasicServiceCode); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + BasicServiceCode_choice, hf_index, ett_gsm_map_BasicServiceCode, NULL); return offset; } @@ -7652,8 +7652,8 @@ static const ber_choice_t RoutingInfo_choice[] = { static int dissect_gsm_map_RoutingInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - RoutingInfo_choice, hf_index, ett_gsm_map_RoutingInfo); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + RoutingInfo_choice, hf_index, ett_gsm_map_RoutingInfo, NULL); return offset; } @@ -7718,8 +7718,8 @@ static const ber_choice_t ExtendedRoutingInfo_choice[] = { static int dissect_gsm_map_ExtendedRoutingInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - ExtendedRoutingInfo_choice, hf_index, ett_gsm_map_ExtendedRoutingInfo); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + ExtendedRoutingInfo_choice, hf_index, ett_gsm_map_ExtendedRoutingInfo, NULL); return offset; } @@ -7797,8 +7797,8 @@ static const ber_choice_t CellGlobalIdOrServiceAreaIdOrLAI_choice[] = { static int dissect_gsm_map_CellGlobalIdOrServiceAreaIdOrLAI(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - CellGlobalIdOrServiceAreaIdOrLAI_choice, hf_index, ett_gsm_map_CellGlobalIdOrServiceAreaIdOrLAI); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + CellGlobalIdOrServiceAreaIdOrLAI_choice, hf_index, ett_gsm_map_CellGlobalIdOrServiceAreaIdOrLAI, NULL); return offset; } @@ -7870,8 +7870,8 @@ static const ber_choice_t SubscriberState_choice[] = { static int dissect_gsm_map_SubscriberState(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - SubscriberState_choice, hf_index, ett_gsm_map_SubscriberState); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + SubscriberState_choice, hf_index, ett_gsm_map_SubscriberState, NULL); return offset; } @@ -8070,8 +8070,8 @@ static const ber_choice_t PS_SubscriberState_choice[] = { static int dissect_gsm_map_PS_SubscriberState(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - PS_SubscriberState_choice, hf_index, ett_gsm_map_PS_SubscriberState); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + PS_SubscriberState_choice, hf_index, ett_gsm_map_PS_SubscriberState, NULL); return offset; } @@ -8319,8 +8319,8 @@ static const ber_choice_t SubscriberId_choice[] = { static int dissect_gsm_map_SubscriberId(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - SubscriberId_choice, hf_index, ett_gsm_map_SubscriberId); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + SubscriberId_choice, hf_index, ett_gsm_map_SubscriberId, NULL); return offset; } @@ -8340,8 +8340,8 @@ static const ber_choice_t SubscriberIdentity_choice[] = { static int dissect_gsm_map_SubscriberIdentity(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - SubscriberIdentity_choice, hf_index, ett_gsm_map_SubscriberIdentity); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + SubscriberIdentity_choice, hf_index, ett_gsm_map_SubscriberIdentity, NULL); return offset; } @@ -9060,8 +9060,8 @@ static const ber_choice_t SS_Info_choice[] = { static int dissect_gsm_map_SS_Info(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - SS_Info_choice, hf_index, ett_gsm_map_SS_Info); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + SS_Info_choice, hf_index, ett_gsm_map_SS_Info, NULL); return offset; } @@ -9132,8 +9132,8 @@ static const ber_choice_t InterrogateSS_Res_choice[] = { static int dissect_gsm_map_InterrogateSS_Res(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - InterrogateSS_Res_choice, hf_index, ett_gsm_map_InterrogateSS_Res); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + InterrogateSS_Res_choice, hf_index, ett_gsm_map_InterrogateSS_Res, NULL); return offset; } @@ -9514,8 +9514,8 @@ static const ber_choice_t Additional_Number_choice[] = { static int dissect_gsm_map_Additional_Number(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - Additional_Number_choice, hf_index, ett_gsm_map_Additional_Number); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + Additional_Number_choice, hf_index, ett_gsm_map_Additional_Number, NULL); return offset; } @@ -9577,8 +9577,8 @@ static const ber_choice_t Sm_RP_DA_choice[] = { static int dissect_gsm_map_Sm_RP_DA(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - Sm_RP_DA_choice, hf_index, ett_gsm_map_Sm_RP_DA); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + Sm_RP_DA_choice, hf_index, ett_gsm_map_Sm_RP_DA, NULL); return offset; } @@ -9603,8 +9603,8 @@ static const ber_choice_t Sm_RP_OA_choice[] = { static int dissect_gsm_map_Sm_RP_OA(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - Sm_RP_OA_choice, hf_index, ett_gsm_map_Sm_RP_OA); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + Sm_RP_OA_choice, hf_index, ett_gsm_map_Sm_RP_OA, NULL); return offset; } @@ -10450,8 +10450,8 @@ static const ber_choice_t Ext_SS_InfoFor_CSE_choice[] = { static int dissect_gsm_map_Ext_SS_InfoFor_CSE(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - Ext_SS_InfoFor_CSE_choice, hf_index, ett_gsm_map_Ext_SS_InfoFor_CSE); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + Ext_SS_InfoFor_CSE_choice, hf_index, ett_gsm_map_Ext_SS_InfoFor_CSE, NULL); return offset; } @@ -11562,8 +11562,8 @@ static const ber_choice_t TargetMS_choice[] = { static int dissect_gsm_map_TargetMS(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - TargetMS_choice, hf_index, ett_gsm_map_TargetMS); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + TargetMS_choice, hf_index, ett_gsm_map_TargetMS, NULL); return offset; } @@ -11776,8 +11776,8 @@ static const ber_choice_t OperationCode_choice[] = { static int dissect_gsm_map_OperationCode(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - OperationCode_choice, hf_index, ett_gsm_map_OperationCode); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + OperationCode_choice, hf_index, ett_gsm_map_OperationCode, NULL); return offset; } @@ -11800,8 +11800,8 @@ static const ber_choice_t ErrorCode_choice[] = { static int dissect_gsm_map_ErrorCode(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - ErrorCode_choice, hf_index, ett_gsm_map_ErrorCode); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + ErrorCode_choice, hf_index, ett_gsm_map_ErrorCode, NULL); return offset; } @@ -11826,8 +11826,8 @@ static const ber_choice_t OriginalComponentIdentifier_choice[] = { static int dissect_gsm_map_OriginalComponentIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - OriginalComponentIdentifier_choice, hf_index, ett_gsm_map_OriginalComponentIdentifier); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + OriginalComponentIdentifier_choice, hf_index, ett_gsm_map_OriginalComponentIdentifier, NULL); return offset; } @@ -11961,8 +11961,8 @@ static const ber_choice_t SystemFailureParam_choice[] = { static int dissect_gsm_map_SystemFailureParam(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - SystemFailureParam_choice, hf_index, ett_gsm_map_SystemFailureParam); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + SystemFailureParam_choice, hf_index, ett_gsm_map_SystemFailureParam, NULL); return offset; } @@ -12312,8 +12312,8 @@ static const ber_choice_t CallBarredParam_choice[] = { static int dissect_gsm_map_CallBarredParam(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - CallBarredParam_choice, hf_index, ett_gsm_map_CallBarredParam); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + CallBarredParam_choice, hf_index, ett_gsm_map_CallBarredParam, NULL); return offset; } @@ -13391,8 +13391,8 @@ static const ber_choice_t InvokeId_choice[] = { static int dissect_gsm_map_InvokeId(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - InvokeId_choice, hf_index, ett_gsm_map_InvokeId); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + InvokeId_choice, hf_index, ett_gsm_map_InvokeId, NULL); return offset; } @@ -13469,8 +13469,8 @@ static const ber_choice_t ReturnError_result_choice[] = { static int dissect_ReturnError_result(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - ReturnError_result_choice, hf_gsm_map_returnError_result, ett_gsm_map_ReturnError_result); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + ReturnError_result_choice, hf_gsm_map_returnError_result, ett_gsm_map_ReturnError_result, NULL); return offset; } @@ -13537,8 +13537,8 @@ dissect_gsm_map_GSMMAPPDU(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, col_set_str(pinfo->cinfo, COL_INFO, val_to_str(gsmmap_pdu_type, GSMMAPPDU_vals, "Unknown GSM-MAP PDU (%u)")); } - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - GSMMAPPDU_choice, hf_index, ett_gsm_map_GSMMAPPDU); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + GSMMAPPDU_choice, hf_index, ett_gsm_map_GSMMAPPDU, NULL); return offset; diff --git a/epan/dissectors/packet-gsm_map.h b/epan/dissectors/packet-gsm_map.h index 6a257f3535..49a863319a 100644 --- a/epan/dissectors/packet-gsm_map.h +++ b/epan/dissectors/packet-gsm_map.h @@ -1,6 +1,6 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Ethereal dissector compiler */ -/* .\packet-gsm_map.h */ +/* ./packet-gsm_map.h */ /* ../../tools/asn2eth.py -X -b -e -p gsm_map -c gsmmap.cnf -s packet-gsm_map-template GSMMAP.asn */ /* Input file: packet-gsm_map-template.h */ diff --git a/epan/dissectors/packet-h248.c b/epan/dissectors/packet-h248.c index 885e84fed4..c94223b6c9 100644 --- a/epan/dissectors/packet-h248.c +++ b/epan/dissectors/packet-h248.c @@ -1358,8 +1358,8 @@ static const ber_choice_t MId_choice[] = { static int dissect_h248_MId(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - MId_choice, hf_index, ett_h248_MId); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + MId_choice, hf_index, ett_h248_MId, NULL); return offset; } @@ -1821,8 +1821,8 @@ static const ber_choice_t ExtraInfo_choice[] = { static int dissect_h248_ExtraInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - ExtraInfo_choice, hf_index, ett_h248_ExtraInfo); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + ExtraInfo_choice, hf_index, ett_h248_ExtraInfo, NULL); return offset; } @@ -2081,8 +2081,8 @@ static const ber_choice_t T_streams_choice[] = { static int dissect_h248_T_streams(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - T_streams_choice, hf_index, ett_h248_T_streams); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + T_streams_choice, hf_index, ett_h248_T_streams, NULL); return offset; } @@ -2234,8 +2234,8 @@ static const ber_choice_t NonStandardIdentifier_choice[] = { static int dissect_h248_NonStandardIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - NonStandardIdentifier_choice, hf_index, ett_h248_NonStandardIdentifier); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + NonStandardIdentifier_choice, hf_index, ett_h248_NonStandardIdentifier, NULL); return offset; } @@ -2434,8 +2434,8 @@ static const ber_choice_t EventDM_choice[] = { static int dissect_h248_EventDM(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - EventDM_choice, hf_index, ett_h248_EventDM); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + EventDM_choice, hf_index, ett_h248_EventDM, NULL); return offset; } @@ -2612,8 +2612,8 @@ static const ber_choice_t SignalRequest_choice[] = { static int dissect_h248_SignalRequest(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - SignalRequest_choice, hf_index, ett_h248_SignalRequest); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + SignalRequest_choice, hf_index, ett_h248_SignalRequest, NULL); return offset; } @@ -3061,8 +3061,8 @@ static const ber_choice_t indAudMediaDescriptorStreams_choice[] = { static int dissect_h248_indAudMediaDescriptorStreams(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - indAudMediaDescriptorStreams_choice, hf_index, ett_h248_indAudMediaDescriptorStreams); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + indAudMediaDescriptorStreams_choice, hf_index, ett_h248_indAudMediaDescriptorStreams, NULL); return offset; } @@ -3174,8 +3174,8 @@ static const ber_choice_t IndAudSignalsDescriptor_choice[] = { static int dissect_h248_IndAudSignalsDescriptor(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - IndAudSignalsDescriptor_choice, hf_index, ett_h248_IndAudSignalsDescriptor); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + IndAudSignalsDescriptor_choice, hf_index, ett_h248_IndAudSignalsDescriptor, NULL); return offset; } @@ -3257,8 +3257,8 @@ static const ber_choice_t IndAuditParameter_choice[] = { static int dissect_h248_IndAuditParameter(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - IndAuditParameter_choice, hf_index, ett_h248_IndAuditParameter); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + IndAuditParameter_choice, hf_index, ett_h248_IndAuditParameter, NULL); return offset; } @@ -3331,8 +3331,8 @@ static const ber_choice_t AmmDescriptor_choice[] = { static int dissect_h248_AmmDescriptor(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - AmmDescriptor_choice, hf_index, ett_h248_AmmDescriptor); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + AmmDescriptor_choice, hf_index, ett_h248_AmmDescriptor, NULL); return offset; } @@ -3615,8 +3615,8 @@ static const ber_choice_t ServiceChangeAddress_choice[] = { static int dissect_h248_ServiceChangeAddress(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - ServiceChangeAddress_choice, hf_index, ett_h248_ServiceChangeAddress); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + ServiceChangeAddress_choice, hf_index, ett_h248_ServiceChangeAddress, NULL); return offset; } @@ -3735,8 +3735,8 @@ static const ber_choice_t Command_choice[] = { static int dissect_h248_Command(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - Command_choice, hf_index, ett_h248_Command); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + Command_choice, hf_index, ett_h248_Command, NULL); return offset; } @@ -3945,8 +3945,8 @@ static const ber_choice_t AuditReturnParameter_choice[] = { static int dissect_h248_AuditReturnParameter(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - AuditReturnParameter_choice, hf_index, ett_h248_AuditReturnParameter); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + AuditReturnParameter_choice, hf_index, ett_h248_AuditReturnParameter, NULL); return offset; } @@ -4069,8 +4069,8 @@ static const ber_choice_t AuditReply_choice[] = { static int dissect_h248_AuditReply(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - AuditReply_choice, hf_index, ett_h248_AuditReply); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + AuditReply_choice, hf_index, ett_h248_AuditReply, NULL); return offset; } @@ -4160,8 +4160,8 @@ static const ber_choice_t ServiceChangeResult_choice[] = { static int dissect_h248_ServiceChangeResult(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - ServiceChangeResult_choice, hf_index, ett_h248_ServiceChangeResult); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + ServiceChangeResult_choice, hf_index, ett_h248_ServiceChangeResult, NULL); return offset; } @@ -4213,8 +4213,8 @@ static const ber_choice_t CommandReply_choice[] = { static int dissect_h248_CommandReply(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - CommandReply_choice, hf_index, ett_h248_CommandReply); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + CommandReply_choice, hf_index, ett_h248_CommandReply, NULL); return offset; } @@ -4286,8 +4286,8 @@ static const ber_choice_t T_transactionResult_choice[] = { static int dissect_h248_T_transactionResult(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - T_transactionResult_choice, hf_index, ett_h248_T_transactionResult); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + T_transactionResult_choice, hf_index, ett_h248_T_transactionResult, NULL); return offset; } @@ -4365,8 +4365,8 @@ static const ber_choice_t Transaction_choice[] = { static int dissect_h248_Transaction(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - Transaction_choice, hf_index, ett_h248_Transaction); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + Transaction_choice, hf_index, ett_h248_Transaction, NULL); return offset; } @@ -4404,8 +4404,8 @@ static const ber_choice_t T_messageBody_choice[] = { static int dissect_h248_T_messageBody(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - T_messageBody_choice, hf_index, ett_h248_T_messageBody); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + T_messageBody_choice, hf_index, ett_h248_T_messageBody, NULL); return offset; } diff --git a/epan/dissectors/packet-inap.c b/epan/dissectors/packet-inap.c index 0fe8069bc8..71f6999666 100644 --- a/epan/dissectors/packet-inap.c +++ b/epan/dissectors/packet-inap.c @@ -1,6 +1,6 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Ethereal dissector compiler */ -/* .\packet-inap.c */ +/* ./packet-inap.c */ /* ../../tools/asn2eth.py -X -b -e -p inap -c inap.cnf -s packet-inap-template inap.asn */ /* Input file: packet-inap-template.c */ @@ -456,7 +456,8 @@ static int dissect_invokeCmd(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv static int dissect_inap_CallID(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -717,8 +718,8 @@ static const ber_choice_t LegID_choice[] = { static int dissect_inap_LegID(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - LegID_choice, hf_index, ett_inap_LegID); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + LegID_choice, hf_index, ett_inap_LegID, NULL); return offset; } @@ -875,7 +876,8 @@ dissect_inap_ReleaseCallPartyConnectionArg(gboolean implicit_tag _U_, tvbuff_t * static int dissect_inap_INTEGER_0_2147483647(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -934,8 +936,8 @@ static const ber_choice_t VariableParts_item_choice[] = { static int dissect_inap_VariableParts_item(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - VariableParts_item_choice, hf_index, ett_inap_VariableParts_item); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + VariableParts_item_choice, hf_index, ett_inap_VariableParts_item, NULL); return offset; } @@ -1097,8 +1099,8 @@ static const ber_choice_t MessageID_choice[] = { static int dissect_inap_MessageID(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - MessageID_choice, hf_index, ett_inap_MessageID); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + MessageID_choice, hf_index, ett_inap_MessageID, NULL); return offset; } @@ -1110,7 +1112,8 @@ static int dissect_messageID_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t static int dissect_inap_INTEGER_1_127(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -1134,7 +1137,8 @@ static int dissect_interDigitTimeOut_impl(packet_info *pinfo, proto_tree *tree, static int dissect_inap_INTEGER_0_32767(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -1181,8 +1185,8 @@ static const ber_choice_t InformationToSend_choice[] = { static int dissect_inap_InformationToSend(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - InformationToSend_choice, hf_index, ett_inap_InformationToSend); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + InformationToSend_choice, hf_index, ett_inap_InformationToSend, NULL); return offset; } @@ -1228,8 +1232,8 @@ static const ber_choice_t FilteringCriteria_choice[] = { static int dissect_inap_FilteringCriteria(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - FilteringCriteria_choice, hf_index, ett_inap_FilteringCriteria); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + FilteringCriteria_choice, hf_index, ett_inap_FilteringCriteria, NULL); return offset; } @@ -1241,7 +1245,8 @@ static int dissect_filteringCriteria_impl(packet_info *pinfo, proto_tree *tree, static int dissect_inap_INTEGER(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -1352,8 +1357,8 @@ static const ber_choice_t T_filteringCharacteristics_choice[] = { static int dissect_inap_T_filteringCharacteristics(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - T_filteringCharacteristics_choice, hf_index, ett_inap_T_filteringCharacteristics); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + T_filteringCharacteristics_choice, hf_index, ett_inap_T_filteringCharacteristics, NULL); return offset; } @@ -1365,7 +1370,8 @@ static int dissect_filteringCharacteristics_impl(packet_info *pinfo, proto_tree static int dissect_inap_INTEGER_M2_86400(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -1412,8 +1418,8 @@ static const ber_choice_t T_filteringTimeOut_choice[] = { static int dissect_inap_T_filteringTimeOut(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - T_filteringTimeOut_choice, hf_index, ett_inap_T_filteringTimeOut); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + T_filteringTimeOut_choice, hf_index, ett_inap_T_filteringTimeOut, NULL); return offset; } @@ -1582,8 +1588,8 @@ static const ber_choice_t BearerCapability_choice[] = { static int dissect_inap_BearerCapability(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - BearerCapability_choice, hf_index, ett_inap_BearerCapability); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + BearerCapability_choice, hf_index, ett_inap_BearerCapability, NULL); return offset; } @@ -1640,8 +1646,8 @@ static const ber_choice_t CallingFacilityGroup_choice[] = { static int dissect_inap_CallingFacilityGroup(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - CallingFacilityGroup_choice, hf_index, ett_inap_CallingFacilityGroup); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + CallingFacilityGroup_choice, hf_index, ett_inap_CallingFacilityGroup, NULL); return offset; } @@ -1772,8 +1778,8 @@ static const ber_choice_t PartyToCharge_choice[] = { static int dissect_inap_PartyToCharge(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - PartyToCharge_choice, hf_index, ett_inap_PartyToCharge); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + PartyToCharge_choice, hf_index, ett_inap_PartyToCharge, NULL); return offset; } @@ -1925,8 +1931,8 @@ static const ber_choice_t T_gapCriteria_choice[] = { static int dissect_inap_T_gapCriteria(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - T_gapCriteria_choice, hf_index, ett_inap_T_gapCriteria); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + T_gapCriteria_choice, hf_index, ett_inap_T_gapCriteria, NULL); return offset; } @@ -1938,7 +1944,8 @@ static int dissect_gapCriteria_impl(packet_info *pinfo, proto_tree *tree, tvbuff static int dissect_inap_INTEGER_M1_60000(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -2016,8 +2023,8 @@ static const ber_choice_t T_gapTreatment_choice[] = { static int dissect_inap_T_gapTreatment(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - T_gapTreatment_choice, hf_index, ett_inap_T_gapTreatment); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + T_gapTreatment_choice, hf_index, ett_inap_T_gapTreatment, NULL); return offset; } @@ -2067,7 +2074,8 @@ static int dissect_requestedInformationType_impl(packet_info *pinfo, proto_tree static int dissect_inap_INTEGER_0_255(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -2096,8 +2104,8 @@ static const ber_choice_t T_requestedInformationValue_choice[] = { static int dissect_inap_T_requestedInformationValue(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - T_requestedInformationValue_choice, hf_index, ett_inap_T_requestedInformationValue); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + T_requestedInformationValue_choice, hf_index, ett_inap_T_requestedInformationValue, NULL); return offset; } @@ -2208,7 +2216,8 @@ dissect_inap_CallInformationRequestarg(gboolean implicit_tag _U_, tvbuff_t *tvb, static int dissect_inap_INTEGER_M128_127(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -2220,12 +2229,10 @@ static int dissect_operation_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t } + static int dissect_inap_NULL(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - { proto_item *ti_tmp; - ti_tmp = proto_tree_add_item(tree, hf_index, tvb, offset>>8, 0, FALSE); - proto_item_append_text(ti_tmp, ": NULL"); - } + offset = dissect_ber_null(implicit_tag, pinfo, tree, tvb, offset, hf_index); return offset; } @@ -2257,8 +2264,8 @@ static const ber_choice_t Cancelarg_choice[] = { static int dissect_inap_Cancelarg(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - Cancelarg_choice, hf_index, ett_inap_Cancelarg); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + Cancelarg_choice, hf_index, ett_inap_Cancelarg, NULL); return offset; } @@ -2282,8 +2289,8 @@ static const ber_choice_t FacilityGroupID_choice[] = { static int dissect_inap_FacilityGroupID(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - FacilityGroupID_choice, hf_index, ett_inap_FacilityGroupID); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + FacilityGroupID_choice, hf_index, ett_inap_FacilityGroupID, NULL); return offset; } @@ -2310,8 +2317,8 @@ static const ber_choice_t ResourceID_choice[] = { static int dissect_inap_ResourceID(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - ResourceID_choice, hf_index, ett_inap_ResourceID); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + ResourceID_choice, hf_index, ett_inap_ResourceID, NULL); return offset; } @@ -2383,7 +2390,8 @@ dissect_inap_CollectInformationarg(gboolean implicit_tag _U_, tvbuff_t *tvb, int static int dissect_inap_INTEGER_0_22(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -2457,8 +2465,8 @@ static const ber_choice_t T_resourceAddress_choice[] = { static int dissect_inap_T_resourceAddress(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - T_resourceAddress_choice, hf_index, ett_inap_T_resourceAddress); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + T_resourceAddress_choice, hf_index, ett_inap_T_resourceAddress, NULL); return offset; } @@ -2827,8 +2835,8 @@ static const ber_choice_t T_eventSpecificInformationBCSM_choice[] = { static int dissect_inap_T_eventSpecificInformationBCSM(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - T_eventSpecificInformationBCSM_choice, hf_index, ett_inap_T_eventSpecificInformationBCSM); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + T_eventSpecificInformationBCSM_choice, hf_index, ett_inap_T_eventSpecificInformationBCSM, NULL); return offset; } @@ -2878,8 +2886,8 @@ static const ber_choice_t HoldCallInNetworkarg_choice[] = { static int dissect_inap_HoldCallInNetworkarg(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - HoldCallInNetworkarg_choice, hf_index, ett_inap_HoldCallInNetworkarg); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + HoldCallInNetworkarg_choice, hf_index, ett_inap_HoldCallInNetworkarg, NULL); return offset; } @@ -3218,8 +3226,8 @@ static const ber_choice_t T_collectedInfo_choice[] = { static int dissect_inap_T_collectedInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - T_collectedInfo_choice, hf_index, ett_inap_T_collectedInfo); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + T_collectedInfo_choice, hf_index, ett_inap_T_collectedInfo, NULL); return offset; } @@ -3258,8 +3266,8 @@ static const ber_choice_t PromptAndCollectUserInformationres_choice[] = { static int dissect_inap_PromptAndCollectUserInformationres(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - PromptAndCollectUserInformationres_choice, hf_index, ett_inap_PromptAndCollectUserInformationres); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + PromptAndCollectUserInformationres_choice, hf_index, ett_inap_PromptAndCollectUserInformationres, NULL); return offset; } @@ -3322,8 +3330,8 @@ static const ber_choice_t ReleaseCallArg_choice[] = { static int dissect_inap_ReleaseCallArg(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - ReleaseCallArg_choice, hf_index, ett_inap_ReleaseCallArg); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + ReleaseCallArg_choice, hf_index, ett_inap_ReleaseCallArg, NULL); return offset; } @@ -3347,8 +3355,8 @@ static const ber_choice_t RequestCurrentStatusReportarg_choice[] = { static int dissect_inap_RequestCurrentStatusReportarg(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - RequestCurrentStatusReportarg_choice, hf_index, ett_inap_RequestCurrentStatusReportarg); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + RequestCurrentStatusReportarg_choice, hf_index, ett_inap_RequestCurrentStatusReportarg, NULL); return offset; } @@ -3436,7 +3444,8 @@ dissect_inap_RequestNotificationChargingEvent(gboolean implicit_tag _U_, tvbuff_ static int dissect_inap_INTEGER_1_255(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -3448,7 +3457,8 @@ static int dissect_numberOfDigits_impl(packet_info *pinfo, proto_tree *tree, tvb static int dissect_inap_INTEGER_0_2047(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -3471,8 +3481,8 @@ static const ber_choice_t T_dpSpecificCriteria_choice[] = { static int dissect_inap_T_dpSpecificCriteria(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - T_dpSpecificCriteria_choice, hf_index, ett_inap_T_dpSpecificCriteria); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + T_dpSpecificCriteria_choice, hf_index, ett_inap_T_dpSpecificCriteria, NULL); return offset; } @@ -3607,8 +3617,8 @@ static const ber_choice_t CalledFacilityGroup_choice[] = { static int dissect_inap_CalledFacilityGroup(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - CalledFacilityGroup_choice, hf_index, ett_inap_CalledFacilityGroup); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + CalledFacilityGroup_choice, hf_index, ett_inap_CalledFacilityGroup, NULL); return offset; } @@ -3676,7 +3686,8 @@ dissect_inap_SendChargingInformation(gboolean implicit_tag _U_, tvbuff_t *tvb, i static int dissect_inap_INTEGER_0_99(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -3996,7 +4007,8 @@ dissect_inap_TaskRefused(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, p static int dissect_inap_InvokeIDType(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -4019,8 +4031,8 @@ static const ber_choice_t T_rinvokeID_choice[] = { static int dissect_inap_T_rinvokeID(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - T_rinvokeID_choice, hf_index, ett_inap_T_rinvokeID); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + T_rinvokeID_choice, hf_index, ett_inap_T_rinvokeID, NULL); return offset; } @@ -4039,7 +4051,8 @@ static const value_string inap_GeneralProblem_vals[] = { static int dissect_inap_GeneralProblem(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -4063,7 +4076,8 @@ static const value_string inap_InvokeProblem_vals[] = { static int dissect_inap_InvokeProblem(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -4082,7 +4096,8 @@ static const value_string inap_ReturnResultProblem_vals[] = { static int dissect_inap_ReturnResultProblem(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -4103,7 +4118,8 @@ static const value_string inap_ReturnErrorProblem_vals[] = { static int dissect_inap_ReturnErrorProblem(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -4130,8 +4146,8 @@ static const ber_choice_t T_rproblem_choice[] = { static int dissect_inap_T_rproblem(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - T_rproblem_choice, hf_index, ett_inap_T_rproblem); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + T_rproblem_choice, hf_index, ett_inap_T_rproblem, NULL); return offset; } @@ -4340,8 +4356,8 @@ static const ber_choice_t InvokeId_choice[] = { static int dissect_inap_InvokeId(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - InvokeId_choice, hf_index, ett_inap_InvokeId); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + InvokeId_choice, hf_index, ett_inap_InvokeId, NULL); return offset; } @@ -4449,8 +4465,8 @@ dissect_inap_INAPPDU(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packe /* Get the length and add 2 */ inap_pdu_size = tvb_get_guint8(tvb, offset+1)+2; - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - INAPPDU_choice, hf_index, ett_inap_INAPPDU); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + INAPPDU_choice, hf_index, ett_inap_INAPPDU, NULL); if (check_col(pinfo->cinfo, COL_INFO)){ col_prepend_fstr(pinfo->cinfo, COL_INFO, val_to_str(opcode, inap_opr_code_strings, "Unknown INAP (%u)")); diff --git a/epan/dissectors/packet-inap.h b/epan/dissectors/packet-inap.h index 354c49fb34..f8579f5856 100644 --- a/epan/dissectors/packet-inap.h +++ b/epan/dissectors/packet-inap.h @@ -1,6 +1,6 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Ethereal dissector compiler */ -/* .\packet-inap.h */ +/* ./packet-inap.h */ /* ../../tools/asn2eth.py -X -b -e -p inap -c inap.cnf -s packet-inap-template inap.asn */ /* Input file: packet-inap-template.h */ diff --git a/epan/dissectors/packet-kerberos.c b/epan/dissectors/packet-kerberos.c index 7f9d0ff975..9d5334235f 100644 --- a/epan/dissectors/packet-kerberos.c +++ b/epan/dissectors/packet-kerberos.c @@ -1336,7 +1336,7 @@ static const ber_choice_t kerberos_applications_choice[] = { static int dissect_krb5_application_choice(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - offset=dissect_ber_choice(pinfo, tree, tvb, offset, kerberos_applications_choice, -1, -1); + offset=dissect_ber_CHOICE(pinfo, tree, tvb, offset, kerberos_applications_choice, -1, -1, NULL); return offset; } @@ -2914,7 +2914,7 @@ dissect_krb5_decrypt_PRIV (packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, /* Add the decrypted data to the data source list. */ add_new_data_source(pinfo, next_tvb, "Decrypted Krb5"); - offset=dissect_ber_choice(pinfo, tree, next_tvb, 0, kerberos_applications_choice, -1, -1); + offset=dissect_ber_CHOICE(pinfo, tree, next_tvb, 0, kerberos_applications_choice, -1, -1, NULL); } return offset; @@ -3184,7 +3184,7 @@ dissect_krb5_decrypt_authenticator_data (packet_info *pinfo, proto_tree *tree, t add_new_data_source(pinfo, next_tvb, "Decrypted Krb5"); - offset=dissect_ber_choice(pinfo, tree, next_tvb, 0, kerberos_applications_choice, -1, -1); + offset=dissect_ber_CHOICE(pinfo, tree, next_tvb, 0, kerberos_applications_choice, -1, -1, NULL); } return offset; @@ -3261,7 +3261,7 @@ dissect_krb5_decrypt_Ticket_data (packet_info *pinfo, proto_tree *tree, tvbuff_t add_new_data_source(pinfo, next_tvb, "Decrypted Krb5"); - offset=dissect_ber_choice(pinfo, tree, next_tvb, 0, kerberos_applications_choice, -1, -1); + offset=dissect_ber_CHOICE(pinfo, tree, next_tvb, 0, kerberos_applications_choice, -1, -1, NULL); } return offset; @@ -3324,7 +3324,7 @@ static const ber_choice_t Ticket_choice[] = { static int dissect_krb5_Ticket(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - offset=dissect_ber_choice(pinfo, tree, tvb, offset, Ticket_choice, -1, -1); + offset=dissect_ber_CHOICE(pinfo, tree, tvb, offset, Ticket_choice, -1, -1, NULL); return offset; } @@ -3395,7 +3395,7 @@ dissect_krb5_decrypt_AP_REP_data(packet_info *pinfo, proto_tree *tree, tvbuff_t add_new_data_source(pinfo, next_tvb, "Decrypted Krb5"); - offset=dissect_ber_choice(pinfo, tree, next_tvb, 0, kerberos_applications_choice, -1, -1); + offset=dissect_ber_CHOICE(pinfo, tree, next_tvb, 0, kerberos_applications_choice, -1, -1, NULL); } return offset; @@ -3508,7 +3508,7 @@ dissect_krb5_decrypt_KDC_REP_data (packet_info *pinfo, proto_tree *tree, tvbuff_ add_new_data_source(pinfo, next_tvb, "Decrypted Krb5"); - offset=dissect_ber_choice(pinfo, tree, next_tvb, 0, kerberos_applications_choice, -1, -1); + offset=dissect_ber_CHOICE(pinfo, tree, next_tvb, 0, kerberos_applications_choice, -1, -1, NULL); } return offset; @@ -3837,7 +3837,7 @@ dissect_kerberos_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, offset += 4; } - offset=dissect_ber_choice(pinfo, kerberos_tree, tvb, offset, kerberos_applications_choice, -1, -1); + offset=dissect_ber_CHOICE(pinfo, kerberos_tree, tvb, offset, kerberos_applications_choice, -1, -1, NULL); proto_item_set_len(item, offset); pinfo->private_data=saved_private_data; diff --git a/epan/dissectors/packet-logotypecertextn.c b/epan/dissectors/packet-logotypecertextn.c index 1bf2c0118a..9a2af76554 100644 --- a/epan/dissectors/packet-logotypecertextn.c +++ b/epan/dissectors/packet-logotypecertextn.c @@ -54,26 +54,26 @@ static int proto_logotypecertextn = -1; /*--- Included file: packet-logotypecertextn-hf.c ---*/ static int hf_logotypecertextn_LogotypeExtn_PDU = -1; /* LogotypeExtn */ -static int hf_logotypecertextn_communityLogos = -1; /* SEQUNCE_OF_LogotypeInfo */ +static int hf_logotypecertextn_communityLogos = -1; /* SEQUENCE_OF_LogotypeInfo */ static int hf_logotypecertextn_communityLogos_item = -1; /* LogotypeInfo */ static int hf_logotypecertextn_issuerLogo = -1; /* LogotypeInfo */ static int hf_logotypecertextn_subjectLogo = -1; /* LogotypeInfo */ -static int hf_logotypecertextn_otherLogos = -1; /* SEQUNCE_OF_OtherLogotypeInfo */ +static int hf_logotypecertextn_otherLogos = -1; /* SEQUENCE_OF_OtherLogotypeInfo */ static int hf_logotypecertextn_otherLogos_item = -1; /* OtherLogotypeInfo */ static int hf_logotypecertextn_direct = -1; /* LogotypeData */ static int hf_logotypecertextn_indirect = -1; /* LogotypeReference */ -static int hf_logotypecertextn_image = -1; /* SEQUNCE_OF_LogotypeImage */ +static int hf_logotypecertextn_image = -1; /* SEQUENCE_OF_LogotypeImage */ static int hf_logotypecertextn_image_item = -1; /* LogotypeImage */ -static int hf_logotypecertextn_audio = -1; /* SEQUNCE_OF_LogotypeAudio */ +static int hf_logotypecertextn_audio = -1; /* SEQUENCE_OF_LogotypeAudio */ static int hf_logotypecertextn_audio_item = -1; /* LogotypeAudio */ static int hf_logotypecertextn_imageDetails = -1; /* LogotypeDetails */ static int hf_logotypecertextn_imageInfo = -1; /* LogotypeImageInfo */ static int hf_logotypecertextn_audioDetails = -1; /* LogotypeDetails */ static int hf_logotypecertextn_audioInfo = -1; /* LogotypeAudioInfo */ static int hf_logotypecertextn_mediaType = -1; /* IA5String */ -static int hf_logotypecertextn_logotypeHash = -1; /* SEQUNCE_SIZE_1_MAX_OF_HashAlgAndValue */ +static int hf_logotypecertextn_logotypeHash = -1; /* SEQUENCE_SIZE_1_MAX_OF_HashAlgAndValue */ static int hf_logotypecertextn_logotypeHash_item = -1; /* HashAlgAndValue */ -static int hf_logotypecertextn_logotypeURI = -1; /* SEQUNCE_SIZE_1_MAX_OF_IA5String */ +static int hf_logotypecertextn_logotypeURI = -1; /* T_logotypeURI */ static int hf_logotypecertextn_logotypeURI_item = -1; /* IA5String */ static int hf_logotypecertextn_type = -1; /* LogotypeImageType */ static int hf_logotypecertextn_fileSize = -1; /* INTEGER */ @@ -88,9 +88,9 @@ static int hf_logotypecertextn_channels = -1; /* INTEGER */ static int hf_logotypecertextn_sampleRate = -1; /* INTEGER */ static int hf_logotypecertextn_logotypeType = -1; /* OBJECT_IDENTIFIER */ static int hf_logotypecertextn_info = -1; /* LogotypeInfo */ -static int hf_logotypecertextn_refStructHash = -1; /* SEQUNCE_SIZE_1_MAX_OF_HashAlgAndValue */ +static int hf_logotypecertextn_refStructHash = -1; /* SEQUENCE_SIZE_1_MAX_OF_HashAlgAndValue */ static int hf_logotypecertextn_refStructHash_item = -1; /* HashAlgAndValue */ -static int hf_logotypecertextn_refStructURI = -1; /* SEQUNCE_SIZE_1_MAX_OF_IA5String */ +static int hf_logotypecertextn_refStructURI = -1; /* T_refStructURI */ static int hf_logotypecertextn_refStructURI_item = -1; /* IA5String */ static int hf_logotypecertextn_hashAlg = -1; /* AlgorithmIdentifier */ static int hf_logotypecertextn_hashValue = -1; /* OCTET_STRING */ @@ -103,22 +103,23 @@ static int hf_logotypecertextn_hashValue = -1; /* OCTET_STRING */ /*--- Included file: packet-logotypecertextn-ett.c ---*/ static gint ett_logotypecertextn_LogotypeExtn = -1; -static gint ett_logotypecertextn_SEQUNCE_OF_LogotypeInfo = -1; -static gint ett_logotypecertextn_SEQUNCE_OF_OtherLogotypeInfo = -1; +static gint ett_logotypecertextn_SEQUENCE_OF_LogotypeInfo = -1; +static gint ett_logotypecertextn_SEQUENCE_OF_OtherLogotypeInfo = -1; static gint ett_logotypecertextn_LogotypeInfo = -1; static gint ett_logotypecertextn_LogotypeData = -1; -static gint ett_logotypecertextn_SEQUNCE_OF_LogotypeImage = -1; -static gint ett_logotypecertextn_SEQUNCE_OF_LogotypeAudio = -1; +static gint ett_logotypecertextn_SEQUENCE_OF_LogotypeImage = -1; +static gint ett_logotypecertextn_SEQUENCE_OF_LogotypeAudio = -1; static gint ett_logotypecertextn_LogotypeImage = -1; static gint ett_logotypecertextn_LogotypeAudio = -1; static gint ett_logotypecertextn_LogotypeDetails = -1; -static gint ett_logotypecertextn_SEQUNCE_SIZE_1_MAX_OF_HashAlgAndValue = -1; -static gint ett_logotypecertextn_SEQUNCE_SIZE_1_MAX_OF_IA5String = -1; +static gint ett_logotypecertextn_SEQUENCE_SIZE_1_MAX_OF_HashAlgAndValue = -1; +static gint ett_logotypecertextn_T_logotypeURI = -1; static gint ett_logotypecertextn_LogotypeImageInfo = -1; static gint ett_logotypecertextn_LogotypeImageResolution = -1; static gint ett_logotypecertextn_LogotypeAudioInfo = -1; static gint ett_logotypecertextn_OtherLogotypeInfo = -1; static gint ett_logotypecertextn_LogotypeReference = -1; +static gint ett_logotypecertextn_T_refStructURI = -1; static gint ett_logotypecertextn_HashAlgAndValue = -1; /*--- End of included file: packet-logotypecertextn-ett.c ---*/ @@ -188,40 +189,37 @@ static int dissect_refStructHash_item(packet_info *pinfo, proto_tree *tree, tvbu return dissect_logotypecertextn_HashAlgAndValue(FALSE, tvb, offset, pinfo, tree, hf_logotypecertextn_refStructHash_item); } -static const ber_sequence_t SEQUNCE_SIZE_1_MAX_OF_HashAlgAndValue_sequence_of[1] = { +static const ber_sequence_t SEQUENCE_SIZE_1_MAX_OF_HashAlgAndValue_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_logotypeHash_item }, }; static int -dissect_logotypecertextn_SEQUNCE_SIZE_1_MAX_OF_HashAlgAndValue(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { +dissect_logotypecertextn_SEQUENCE_SIZE_1_MAX_OF_HashAlgAndValue(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUNCE_SIZE_1_MAX_OF_HashAlgAndValue_sequence_of, hf_index, ett_logotypecertextn_SEQUNCE_SIZE_1_MAX_OF_HashAlgAndValue); + SEQUENCE_SIZE_1_MAX_OF_HashAlgAndValue_sequence_of, hf_index, ett_logotypecertextn_SEQUENCE_SIZE_1_MAX_OF_HashAlgAndValue); return offset; } static int dissect_logotypeHash(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - return dissect_logotypecertextn_SEQUNCE_SIZE_1_MAX_OF_HashAlgAndValue(FALSE, tvb, offset, pinfo, tree, hf_logotypecertextn_logotypeHash); + return dissect_logotypecertextn_SEQUENCE_SIZE_1_MAX_OF_HashAlgAndValue(FALSE, tvb, offset, pinfo, tree, hf_logotypecertextn_logotypeHash); } static int dissect_refStructHash(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - return dissect_logotypecertextn_SEQUNCE_SIZE_1_MAX_OF_HashAlgAndValue(FALSE, tvb, offset, pinfo, tree, hf_logotypecertextn_refStructHash); + return dissect_logotypecertextn_SEQUENCE_SIZE_1_MAX_OF_HashAlgAndValue(FALSE, tvb, offset, pinfo, tree, hf_logotypecertextn_refStructHash); } -static const ber_sequence_t SEQUNCE_SIZE_1_MAX_OF_IA5String_sequence_of[1] = { +static const ber_sequence_t T_logotypeURI_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_IA5String, BER_FLAGS_NOOWNTAG, dissect_logotypeURI_item }, }; static int -dissect_logotypecertextn_SEQUNCE_SIZE_1_MAX_OF_IA5String(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { +dissect_logotypecertextn_T_logotypeURI(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUNCE_SIZE_1_MAX_OF_IA5String_sequence_of, hf_index, ett_logotypecertextn_SEQUNCE_SIZE_1_MAX_OF_IA5String); + T_logotypeURI_sequence_of, hf_index, ett_logotypecertextn_T_logotypeURI); return offset; } static int dissect_logotypeURI(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - return dissect_logotypecertextn_SEQUNCE_SIZE_1_MAX_OF_IA5String(FALSE, tvb, offset, pinfo, tree, hf_logotypecertextn_logotypeURI); -} -static int dissect_refStructURI(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - return dissect_logotypecertextn_SEQUNCE_SIZE_1_MAX_OF_IA5String(FALSE, tvb, offset, pinfo, tree, hf_logotypecertextn_refStructURI); + return dissect_logotypecertextn_T_logotypeURI(FALSE, tvb, offset, pinfo, tree, hf_logotypecertextn_logotypeURI); } static const ber_sequence_t LogotypeDetails_sequence[] = { @@ -246,7 +244,7 @@ static int dissect_audioDetails(packet_info *pinfo, proto_tree *tree, tvbuff_t * } -static const value_string LogotypeImageType_vals[] = { +static const value_string logotypecertextn_LogotypeImageType_vals[] = { { 0, "grayScale" }, { 1, "color" }, { 0, NULL } @@ -255,7 +253,8 @@ static const value_string LogotypeImageType_vals[] = { static int dissect_logotypecertextn_LogotypeImageType(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -267,7 +266,8 @@ static int dissect_type_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb static int dissect_logotypecertextn_INTEGER(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -297,7 +297,7 @@ static int dissect_sampleRate_impl(packet_info *pinfo, proto_tree *tree, tvbuff_ } -static const value_string LogotypeImageResolution_vals[] = { +static const value_string logotypecertextn_LogotypeImageResolution_vals[] = { { 1, "numBits" }, { 2, "tableSize" }, { 0, NULL } @@ -311,8 +311,8 @@ static const ber_choice_t LogotypeImageResolution_choice[] = { static int dissect_logotypecertextn_LogotypeImageResolution(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - LogotypeImageResolution_choice, hf_index, ett_logotypecertextn_LogotypeImageResolution); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + LogotypeImageResolution_choice, hf_index, ett_logotypecertextn_LogotypeImageResolution, NULL); return offset; } @@ -358,19 +358,19 @@ static int dissect_image_item(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv return dissect_logotypecertextn_LogotypeImage(FALSE, tvb, offset, pinfo, tree, hf_logotypecertextn_image_item); } -static const ber_sequence_t SEQUNCE_OF_LogotypeImage_sequence_of[1] = { +static const ber_sequence_t SEQUENCE_OF_LogotypeImage_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_image_item }, }; static int -dissect_logotypecertextn_SEQUNCE_OF_LogotypeImage(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { +dissect_logotypecertextn_SEQUENCE_OF_LogotypeImage(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUNCE_OF_LogotypeImage_sequence_of, hf_index, ett_logotypecertextn_SEQUNCE_OF_LogotypeImage); + SEQUENCE_OF_LogotypeImage_sequence_of, hf_index, ett_logotypecertextn_SEQUENCE_OF_LogotypeImage); return offset; } static int dissect_image(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - return dissect_logotypecertextn_SEQUNCE_OF_LogotypeImage(FALSE, tvb, offset, pinfo, tree, hf_logotypecertextn_image); + return dissect_logotypecertextn_SEQUENCE_OF_LogotypeImage(FALSE, tvb, offset, pinfo, tree, hf_logotypecertextn_image); } static const ber_sequence_t LogotypeAudioInfo_sequence[] = { @@ -410,19 +410,19 @@ static int dissect_audio_item(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv return dissect_logotypecertextn_LogotypeAudio(FALSE, tvb, offset, pinfo, tree, hf_logotypecertextn_audio_item); } -static const ber_sequence_t SEQUNCE_OF_LogotypeAudio_sequence_of[1] = { +static const ber_sequence_t SEQUENCE_OF_LogotypeAudio_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_audio_item }, }; static int -dissect_logotypecertextn_SEQUNCE_OF_LogotypeAudio(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { +dissect_logotypecertextn_SEQUENCE_OF_LogotypeAudio(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUNCE_OF_LogotypeAudio_sequence_of, hf_index, ett_logotypecertextn_SEQUNCE_OF_LogotypeAudio); + SEQUENCE_OF_LogotypeAudio_sequence_of, hf_index, ett_logotypecertextn_SEQUENCE_OF_LogotypeAudio); return offset; } static int dissect_audio_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - return dissect_logotypecertextn_SEQUNCE_OF_LogotypeAudio(TRUE, tvb, offset, pinfo, tree, hf_logotypecertextn_audio); + return dissect_logotypecertextn_SEQUENCE_OF_LogotypeAudio(TRUE, tvb, offset, pinfo, tree, hf_logotypecertextn_audio); } static const ber_sequence_t LogotypeData_sequence[] = { @@ -442,6 +442,21 @@ static int dissect_direct_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *t return dissect_logotypecertextn_LogotypeData(TRUE, tvb, offset, pinfo, tree, hf_logotypecertextn_direct); } +static const ber_sequence_t T_refStructURI_sequence_of[1] = { + { BER_CLASS_UNI, BER_UNI_TAG_IA5String, BER_FLAGS_NOOWNTAG, dissect_refStructURI_item }, +}; + +static int +dissect_logotypecertextn_T_refStructURI(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { + offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, + T_refStructURI_sequence_of, hf_index, ett_logotypecertextn_T_refStructURI); + + return offset; +} +static int dissect_refStructURI(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { + return dissect_logotypecertextn_T_refStructURI(FALSE, tvb, offset, pinfo, tree, hf_logotypecertextn_refStructURI); +} + static const ber_sequence_t LogotypeReference_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_refStructHash }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_refStructURI }, @@ -460,7 +475,7 @@ static int dissect_indirect_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t } -static const value_string LogotypeInfo_vals[] = { +static const value_string logotypecertextn_LogotypeInfo_vals[] = { { 0, "direct" }, { 1, "indirect" }, { 0, NULL } @@ -474,8 +489,8 @@ static const ber_choice_t LogotypeInfo_choice[] = { static int dissect_logotypecertextn_LogotypeInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - LogotypeInfo_choice, hf_index, ett_logotypecertextn_LogotypeInfo); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + LogotypeInfo_choice, hf_index, ett_logotypecertextn_LogotypeInfo, NULL); return offset; } @@ -492,26 +507,27 @@ static int dissect_info(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int return dissect_logotypecertextn_LogotypeInfo(FALSE, tvb, offset, pinfo, tree, hf_logotypecertextn_info); } -static const ber_sequence_t SEQUNCE_OF_LogotypeInfo_sequence_of[1] = { +static const ber_sequence_t SEQUENCE_OF_LogotypeInfo_sequence_of[1] = { { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_communityLogos_item }, }; static int -dissect_logotypecertextn_SEQUNCE_OF_LogotypeInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { +dissect_logotypecertextn_SEQUENCE_OF_LogotypeInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUNCE_OF_LogotypeInfo_sequence_of, hf_index, ett_logotypecertextn_SEQUNCE_OF_LogotypeInfo); + SEQUENCE_OF_LogotypeInfo_sequence_of, hf_index, ett_logotypecertextn_SEQUENCE_OF_LogotypeInfo); return offset; } static int dissect_communityLogos(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - return dissect_logotypecertextn_SEQUNCE_OF_LogotypeInfo(FALSE, tvb, offset, pinfo, tree, hf_logotypecertextn_communityLogos); + return dissect_logotypecertextn_SEQUENCE_OF_LogotypeInfo(FALSE, tvb, offset, pinfo, tree, hf_logotypecertextn_communityLogos); } + static int dissect_logotypecertextn_OBJECT_IDENTIFIER(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_object_identifier(implicit_tag, pinfo, tree, tvb, offset, - hf_index, NULL); + offset = dissect_ber_object_identifier(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -536,19 +552,19 @@ static int dissect_otherLogos_item(packet_info *pinfo, proto_tree *tree, tvbuff_ return dissect_logotypecertextn_OtherLogotypeInfo(FALSE, tvb, offset, pinfo, tree, hf_logotypecertextn_otherLogos_item); } -static const ber_sequence_t SEQUNCE_OF_OtherLogotypeInfo_sequence_of[1] = { +static const ber_sequence_t SEQUENCE_OF_OtherLogotypeInfo_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_otherLogos_item }, }; static int -dissect_logotypecertextn_SEQUNCE_OF_OtherLogotypeInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { +dissect_logotypecertextn_SEQUENCE_OF_OtherLogotypeInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUNCE_OF_OtherLogotypeInfo_sequence_of, hf_index, ett_logotypecertextn_SEQUNCE_OF_OtherLogotypeInfo); + SEQUENCE_OF_OtherLogotypeInfo_sequence_of, hf_index, ett_logotypecertextn_SEQUENCE_OF_OtherLogotypeInfo); return offset; } static int dissect_otherLogos(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - return dissect_logotypecertextn_SEQUNCE_OF_OtherLogotypeInfo(FALSE, tvb, offset, pinfo, tree, hf_logotypecertextn_otherLogos); + return dissect_logotypecertextn_SEQUENCE_OF_OtherLogotypeInfo(FALSE, tvb, offset, pinfo, tree, hf_logotypecertextn_otherLogos); } static const ber_sequence_t LogotypeExtn_sequence[] = { @@ -596,15 +612,15 @@ void proto_register_logotypecertextn(void) { "LogotypeExtn/communityLogos", HFILL }}, { &hf_logotypecertextn_communityLogos_item, { "Item", "logotypecertextn.communityLogos_item", - FT_UINT32, BASE_DEC, VALS(LogotypeInfo_vals), 0, + FT_UINT32, BASE_DEC, VALS(logotypecertextn_LogotypeInfo_vals), 0, "LogotypeExtn/communityLogos/_item", HFILL }}, { &hf_logotypecertextn_issuerLogo, { "issuerLogo", "logotypecertextn.issuerLogo", - FT_UINT32, BASE_DEC, VALS(LogotypeInfo_vals), 0, + FT_UINT32, BASE_DEC, VALS(logotypecertextn_LogotypeInfo_vals), 0, "LogotypeExtn/issuerLogo", HFILL }}, { &hf_logotypecertextn_subjectLogo, { "subjectLogo", "logotypecertextn.subjectLogo", - FT_UINT32, BASE_DEC, VALS(LogotypeInfo_vals), 0, + FT_UINT32, BASE_DEC, VALS(logotypecertextn_LogotypeInfo_vals), 0, "LogotypeExtn/subjectLogo", HFILL }}, { &hf_logotypecertextn_otherLogos, { "otherLogos", "logotypecertextn.otherLogos", @@ -676,7 +692,7 @@ void proto_register_logotypecertextn(void) { "LogotypeDetails/logotypeURI/_item", HFILL }}, { &hf_logotypecertextn_type, { "type", "logotypecertextn.type", - FT_INT32, BASE_DEC, VALS(LogotypeImageType_vals), 0, + FT_INT32, BASE_DEC, VALS(logotypecertextn_LogotypeImageType_vals), 0, "LogotypeImageInfo/type", HFILL }}, { &hf_logotypecertextn_fileSize, { "fileSize", "logotypecertextn.fileSize", @@ -692,7 +708,7 @@ void proto_register_logotypecertextn(void) { "LogotypeImageInfo/ySize", HFILL }}, { &hf_logotypecertextn_resolution, { "resolution", "logotypecertextn.resolution", - FT_UINT32, BASE_DEC, VALS(LogotypeImageResolution_vals), 0, + FT_UINT32, BASE_DEC, VALS(logotypecertextn_LogotypeImageResolution_vals), 0, "LogotypeImageInfo/resolution", HFILL }}, { &hf_logotypecertextn_language, { "language", "logotypecertextn.language", @@ -724,7 +740,7 @@ void proto_register_logotypecertextn(void) { "OtherLogotypeInfo/logotypeType", HFILL }}, { &hf_logotypecertextn_info, { "info", "logotypecertextn.info", - FT_UINT32, BASE_DEC, VALS(LogotypeInfo_vals), 0, + FT_UINT32, BASE_DEC, VALS(logotypecertextn_LogotypeInfo_vals), 0, "OtherLogotypeInfo/info", HFILL }}, { &hf_logotypecertextn_refStructHash, { "refStructHash", "logotypecertextn.refStructHash", @@ -761,22 +777,23 @@ void proto_register_logotypecertextn(void) { /*--- Included file: packet-logotypecertextn-ettarr.c ---*/ &ett_logotypecertextn_LogotypeExtn, - &ett_logotypecertextn_SEQUNCE_OF_LogotypeInfo, - &ett_logotypecertextn_SEQUNCE_OF_OtherLogotypeInfo, + &ett_logotypecertextn_SEQUENCE_OF_LogotypeInfo, + &ett_logotypecertextn_SEQUENCE_OF_OtherLogotypeInfo, &ett_logotypecertextn_LogotypeInfo, &ett_logotypecertextn_LogotypeData, - &ett_logotypecertextn_SEQUNCE_OF_LogotypeImage, - &ett_logotypecertextn_SEQUNCE_OF_LogotypeAudio, + &ett_logotypecertextn_SEQUENCE_OF_LogotypeImage, + &ett_logotypecertextn_SEQUENCE_OF_LogotypeAudio, &ett_logotypecertextn_LogotypeImage, &ett_logotypecertextn_LogotypeAudio, &ett_logotypecertextn_LogotypeDetails, - &ett_logotypecertextn_SEQUNCE_SIZE_1_MAX_OF_HashAlgAndValue, - &ett_logotypecertextn_SEQUNCE_SIZE_1_MAX_OF_IA5String, + &ett_logotypecertextn_SEQUENCE_SIZE_1_MAX_OF_HashAlgAndValue, + &ett_logotypecertextn_T_logotypeURI, &ett_logotypecertextn_LogotypeImageInfo, &ett_logotypecertextn_LogotypeImageResolution, &ett_logotypecertextn_LogotypeAudioInfo, &ett_logotypecertextn_OtherLogotypeInfo, &ett_logotypecertextn_LogotypeReference, + &ett_logotypecertextn_T_refStructURI, &ett_logotypecertextn_HashAlgAndValue, /*--- End of included file: packet-logotypecertextn-ettarr.c ---*/ diff --git a/epan/dissectors/packet-ocsp.c b/epan/dissectors/packet-ocsp.c index fb4144f251..e6341078ae 100644 --- a/epan/dissectors/packet-ocsp.c +++ b/epan/dissectors/packet-ocsp.c @@ -196,7 +196,8 @@ static const value_string ocsp_Version_vals[] = { static int dissect_ocsp_Version(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -375,6 +376,7 @@ static int dissect_responseStatus(packet_info *pinfo, proto_tree *tree, tvbuff_t } + static int dissect_ocsp_T_responseType(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_object_identifier(FALSE, pinfo, tree, tvb, offset, @@ -464,8 +466,8 @@ static const ber_choice_t ResponderID_choice[] = { static int dissect_ocsp_ResponderID(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - ResponderID_choice, hf_index, ett_ocsp_ResponderID); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + ResponderID_choice, hf_index, ett_ocsp_ResponderID, NULL); return offset; } @@ -497,12 +499,10 @@ static int dissect_crlTime(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, } + static int dissect_ocsp_NULL(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - { proto_item *ti_tmp; - ti_tmp = proto_tree_add_item(tree, hf_index, tvb, offset>>8, 0, FALSE); - proto_item_append_text(ti_tmp, ": NULL"); - } + offset = dissect_ber_null(implicit_tag, pinfo, tree, tvb, offset, hf_index); return offset; } @@ -528,12 +528,10 @@ static int dissect_revoked_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t * } + static int dissect_ocsp_UnknownInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - { proto_item *ti_tmp; - ti_tmp = proto_tree_add_item(tree, hf_index, tvb, offset>>8, 0, FALSE); - proto_item_append_text(ti_tmp, ": NULL"); - } + offset = dissect_ber_null(implicit_tag, pinfo, tree, tvb, offset, hf_index); return offset; } @@ -558,8 +556,8 @@ static const ber_choice_t CertStatus_choice[] = { static int dissect_ocsp_CertStatus(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - CertStatus_choice, hf_index, ett_ocsp_CertStatus); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + CertStatus_choice, hf_index, ett_ocsp_CertStatus, NULL); return offset; } @@ -647,10 +645,11 @@ dissect_ocsp_ArchiveCutoff(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, } + static int dissect_ocsp_OBJECT_IDENTIFIER(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_object_identifier(implicit_tag, pinfo, tree, tvb, offset, - hf_index, NULL); + offset = dissect_ber_object_identifier(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -701,7 +700,8 @@ static int dissect_crlUrl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i static int dissect_ocsp_INTEGER(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } diff --git a/epan/dissectors/packet-pkinit.c b/epan/dissectors/packet-pkinit.c index bff82fedf4..4c3c5a4de9 100644 --- a/epan/dissectors/packet-pkinit.c +++ b/epan/dissectors/packet-pkinit.c @@ -59,14 +59,14 @@ static int proto_pkinit = -1; static int hf_pkinit_AuthPack_PDU = -1; /* AuthPack */ static int hf_pkinit_KDCDHKeyInfo_PDU = -1; /* KDCDHKeyInfo */ static int hf_pkinit_signedAuthPack = -1; /* ContentInfo */ -static int hf_pkinit_trustedCertifiers = -1; /* SEQUNCE_OF_TrustedCA */ +static int hf_pkinit_trustedCertifiers = -1; /* SEQUENCE_OF_TrustedCA */ static int hf_pkinit_trustedCertifiers_item = -1; /* TrustedCA */ static int hf_pkinit_kdcCert = -1; /* IssuerAndSerialNumber */ static int hf_pkinit_caName = -1; /* Name */ static int hf_pkinit_issuerAndSerial = -1; /* IssuerAndSerialNumber */ static int hf_pkinit_pkAuthenticator = -1; /* PKAuthenticator */ static int hf_pkinit_clientPublicValue = -1; /* SubjectPublicKeyInfo */ -static int hf_pkinit_supportedCMSTypes = -1; /* SEQUNCE_OF_AlgorithmIdentifier */ +static int hf_pkinit_supportedCMSTypes = -1; /* SEQUENCE_OF_AlgorithmIdentifier */ static int hf_pkinit_supportedCMSTypes_item = -1; /* AlgorithmIdentifier */ static int hf_pkinit_cusec = -1; /* INTEGER */ static int hf_pkinit_ctime = -1; /* KerberosTime */ @@ -86,10 +86,10 @@ static int hf_pkinit_dhKeyExpiration = -1; /* KerberosTime */ /*--- Included file: packet-pkinit-ett.c ---*/ static gint ett_pkinit_PaPkAsReq = -1; -static gint ett_pkinit_SEQUNCE_OF_TrustedCA = -1; +static gint ett_pkinit_SEQUENCE_OF_TrustedCA = -1; static gint ett_pkinit_TrustedCA = -1; static gint ett_pkinit_AuthPack = -1; -static gint ett_pkinit_SEQUNCE_OF_AlgorithmIdentifier = -1; +static gint ett_pkinit_SEQUENCE_OF_AlgorithmIdentifier = -1; static gint ett_pkinit_PKAuthenticator = -1; static gint ett_pkinit_PaPkAsRep = -1; static gint ett_pkinit_KDCDHKeyInfo = -1; @@ -140,7 +140,7 @@ static int dissect_dhKeyExpiration(packet_info *pinfo, proto_tree *tree, tvbuff_ } -static const value_string TrustedCA_vals[] = { +static const value_string pkinit_TrustedCA_vals[] = { { 0, "caName" }, { 2, "issuerAndSerial" }, { 0, NULL } @@ -154,8 +154,8 @@ static const ber_choice_t TrustedCA_choice[] = { static int dissect_pkinit_TrustedCA(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - TrustedCA_choice, hf_index, ett_pkinit_TrustedCA); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + TrustedCA_choice, hf_index, ett_pkinit_TrustedCA, NULL); return offset; } @@ -163,19 +163,19 @@ static int dissect_trustedCertifiers_item(packet_info *pinfo, proto_tree *tree, return dissect_pkinit_TrustedCA(FALSE, tvb, offset, pinfo, tree, hf_pkinit_trustedCertifiers_item); } -static const ber_sequence_t SEQUNCE_OF_TrustedCA_sequence_of[1] = { +static const ber_sequence_t SEQUENCE_OF_TrustedCA_sequence_of[1] = { { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_trustedCertifiers_item }, }; static int -dissect_pkinit_SEQUNCE_OF_TrustedCA(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { +dissect_pkinit_SEQUENCE_OF_TrustedCA(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUNCE_OF_TrustedCA_sequence_of, hf_index, ett_pkinit_SEQUNCE_OF_TrustedCA); + SEQUENCE_OF_TrustedCA_sequence_of, hf_index, ett_pkinit_SEQUENCE_OF_TrustedCA); return offset; } static int dissect_trustedCertifiers(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - return dissect_pkinit_SEQUNCE_OF_TrustedCA(FALSE, tvb, offset, pinfo, tree, hf_pkinit_trustedCertifiers); + return dissect_pkinit_SEQUENCE_OF_TrustedCA(FALSE, tvb, offset, pinfo, tree, hf_pkinit_trustedCertifiers); } static const ber_sequence_t PaPkAsReq_sequence[] = { @@ -197,7 +197,8 @@ dissect_pkinit_PaPkAsReq(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, p static int dissect_pkinit_INTEGER(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -212,7 +213,8 @@ static int dissect_dhNonce(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, static int dissect_pkinit_INTEGER_0_4294967295(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -239,19 +241,19 @@ static int dissect_pkAuthenticator(packet_info *pinfo, proto_tree *tree, tvbuff_ return dissect_pkinit_PKAuthenticator(FALSE, tvb, offset, pinfo, tree, hf_pkinit_pkAuthenticator); } -static const ber_sequence_t SEQUNCE_OF_AlgorithmIdentifier_sequence_of[1] = { +static const ber_sequence_t SEQUENCE_OF_AlgorithmIdentifier_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_supportedCMSTypes_item }, }; static int -dissect_pkinit_SEQUNCE_OF_AlgorithmIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { +dissect_pkinit_SEQUENCE_OF_AlgorithmIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUNCE_OF_AlgorithmIdentifier_sequence_of, hf_index, ett_pkinit_SEQUNCE_OF_AlgorithmIdentifier); + SEQUENCE_OF_AlgorithmIdentifier_sequence_of, hf_index, ett_pkinit_SEQUENCE_OF_AlgorithmIdentifier); return offset; } static int dissect_supportedCMSTypes(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - return dissect_pkinit_SEQUNCE_OF_AlgorithmIdentifier(FALSE, tvb, offset, pinfo, tree, hf_pkinit_supportedCMSTypes); + return dissect_pkinit_SEQUENCE_OF_AlgorithmIdentifier(FALSE, tvb, offset, pinfo, tree, hf_pkinit_supportedCMSTypes); } static const ber_sequence_t AuthPack_sequence[] = { @@ -270,7 +272,7 @@ dissect_pkinit_AuthPack(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, pa } -static const value_string PaPkAsRep_vals[] = { +static const value_string pkinit_PaPkAsRep_vals[] = { { 0, "dhSignedData" }, { 1, "encKeyPack" }, { 0, NULL } @@ -284,8 +286,8 @@ static const ber_choice_t PaPkAsRep_choice[] = { static int dissect_pkinit_PaPkAsRep(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - PaPkAsRep_choice, hf_index, ett_pkinit_PaPkAsRep); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + PaPkAsRep_choice, hf_index, ett_pkinit_PaPkAsRep, NULL); return offset; } @@ -382,7 +384,7 @@ void proto_register_pkinit(void) { "PaPkAsReq/trustedCertifiers", HFILL }}, { &hf_pkinit_trustedCertifiers_item, { "Item", "pkinit.trustedCertifiers_item", - FT_UINT32, BASE_DEC, VALS(TrustedCA_vals), 0, + FT_UINT32, BASE_DEC, VALS(pkinit_TrustedCA_vals), 0, "PaPkAsReq/trustedCertifiers/_item", HFILL }}, { &hf_pkinit_kdcCert, { "kdcCert", "pkinit.kdcCert", @@ -459,10 +461,10 @@ void proto_register_pkinit(void) { /*--- Included file: packet-pkinit-ettarr.c ---*/ &ett_pkinit_PaPkAsReq, - &ett_pkinit_SEQUNCE_OF_TrustedCA, + &ett_pkinit_SEQUENCE_OF_TrustedCA, &ett_pkinit_TrustedCA, &ett_pkinit_AuthPack, - &ett_pkinit_SEQUNCE_OF_AlgorithmIdentifier, + &ett_pkinit_SEQUENCE_OF_AlgorithmIdentifier, &ett_pkinit_PKAuthenticator, &ett_pkinit_PaPkAsRep, &ett_pkinit_KDCDHKeyInfo, diff --git a/epan/dissectors/packet-pkix1implicit.c b/epan/dissectors/packet-pkix1implicit.c index 9e5756ea5b..03c9d296e8 100644 --- a/epan/dissectors/packet-pkix1implicit.c +++ b/epan/dissectors/packet-pkix1implicit.c @@ -8,7 +8,7 @@ /* packet-pkix1implicit.c * Routines for PKIX1Implitic packet dissection * - * $Id: packet-pkix1implicit-template.c 12669 2004-12-05 21:47:49Z sahlberg $ + * $Id: packet-pkix1implicit-template.c 12827 2004-12-24 12:22:52Z sahlberg $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -64,7 +64,7 @@ static int hf_pkix1implicit_accessLocation = -1; /* GeneralName */ static int hf_pkix1implicit_noticeRef = -1; /* NoticeReference */ static int hf_pkix1implicit_explicitText = -1; /* DisplayText */ static int hf_pkix1implicit_organization = -1; /* DisplayText */ -static int hf_pkix1implicit_noticeNumbers = -1; /* SEQUNCE_OF_INTEGER */ +static int hf_pkix1implicit_noticeNumbers = -1; /* T_noticeNumbers */ static int hf_pkix1implicit_noticeNumbers_item = -1; /* INTEGER */ static int hf_pkix1implicit_visibleString = -1; /* VisibleString */ static int hf_pkix1implicit_bmpString = -1; /* BMPString */ @@ -82,7 +82,7 @@ static gint ett_pkix1implicit_AuthorityInfoAccessSyntax = -1; static gint ett_pkix1implicit_AccessDescription = -1; static gint ett_pkix1implicit_UserNotice = -1; static gint ett_pkix1implicit_NoticeReference = -1; -static gint ett_pkix1implicit_SEQUNCE_OF_INTEGER = -1; +static gint ett_pkix1implicit_T_noticeNumbers = -1; static gint ett_pkix1implicit_DisplayText = -1; /*--- End of included file: packet-pkix1implicit-ett.c ---*/ @@ -118,12 +118,10 @@ static int dissect_accessLocation(packet_info *pinfo, proto_tree *tree, tvbuff_t } + static int dissect_pkix1implicit_Dummy(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - { proto_item *ti_tmp; - ti_tmp = proto_tree_add_item(tree, hf_index, tvb, offset>>8, 0, FALSE); - proto_item_append_text(ti_tmp, ": NULL"); - } + offset = dissect_ber_null(implicit_tag, pinfo, tree, tvb, offset, hf_index); return offset; } @@ -143,10 +141,11 @@ dissect_pkix1implicit_EDIPartyName(gboolean implicit_tag _U_, tvbuff_t *tvb, int } + static int dissect_pkix1implicit_OBJECT_IDENTIFIER(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_object_identifier(implicit_tag, pinfo, tree, tvb, offset, - hf_index, NULL); + offset = dissect_ber_object_identifier(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -223,7 +222,7 @@ static int dissect_utf8String(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv } -static const value_string DisplayText_vals[] = { +static const value_string pkix1implicit_DisplayText_vals[] = { { 0, "visibleString" }, { 1, "bmpString" }, { 2, "utf8String" }, @@ -239,8 +238,8 @@ static const ber_choice_t DisplayText_choice[] = { static int dissect_pkix1implicit_DisplayText(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - DisplayText_choice, hf_index, ett_pkix1implicit_DisplayText); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + DisplayText_choice, hf_index, ett_pkix1implicit_DisplayText, NULL); return offset; } @@ -255,7 +254,8 @@ static int dissect_organization(packet_info *pinfo, proto_tree *tree, tvbuff_t * static int dissect_pkix1implicit_INTEGER(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -263,19 +263,19 @@ static int dissect_noticeNumbers_item(packet_info *pinfo, proto_tree *tree, tvbu return dissect_pkix1implicit_INTEGER(FALSE, tvb, offset, pinfo, tree, hf_pkix1implicit_noticeNumbers_item); } -static const ber_sequence_t SEQUNCE_OF_INTEGER_sequence_of[1] = { +static const ber_sequence_t T_noticeNumbers_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_noticeNumbers_item }, }; static int -dissect_pkix1implicit_SEQUNCE_OF_INTEGER(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { +dissect_pkix1implicit_T_noticeNumbers(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset, - SEQUNCE_OF_INTEGER_sequence_of, hf_index, ett_pkix1implicit_SEQUNCE_OF_INTEGER); + T_noticeNumbers_sequence_of, hf_index, ett_pkix1implicit_T_noticeNumbers); return offset; } static int dissect_noticeNumbers(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - return dissect_pkix1implicit_SEQUNCE_OF_INTEGER(FALSE, tvb, offset, pinfo, tree, hf_pkix1implicit_noticeNumbers); + return dissect_pkix1implicit_T_noticeNumbers(FALSE, tvb, offset, pinfo, tree, hf_pkix1implicit_noticeNumbers); } static const ber_sequence_t NoticeReference_sequence[] = { @@ -365,11 +365,11 @@ void proto_register_pkix1implicit(void) { "UserNotice/noticeRef", HFILL }}, { &hf_pkix1implicit_explicitText, { "explicitText", "pkix1implicit.explicitText", - FT_UINT32, BASE_DEC, VALS(DisplayText_vals), 0, + FT_UINT32, BASE_DEC, VALS(pkix1implicit_DisplayText_vals), 0, "UserNotice/explicitText", HFILL }}, { &hf_pkix1implicit_organization, { "organization", "pkix1implicit.organization", - FT_UINT32, BASE_DEC, VALS(DisplayText_vals), 0, + FT_UINT32, BASE_DEC, VALS(pkix1implicit_DisplayText_vals), 0, "NoticeReference/organization", HFILL }}, { &hf_pkix1implicit_noticeNumbers, { "noticeNumbers", "pkix1implicit.noticeNumbers", @@ -406,7 +406,7 @@ void proto_register_pkix1implicit(void) { &ett_pkix1implicit_AccessDescription, &ett_pkix1implicit_UserNotice, &ett_pkix1implicit_NoticeReference, - &ett_pkix1implicit_SEQUNCE_OF_INTEGER, + &ett_pkix1implicit_T_noticeNumbers, &ett_pkix1implicit_DisplayText, /*--- End of included file: packet-pkix1implicit-ettarr.c ---*/ diff --git a/epan/dissectors/packet-pkix1implicit.h b/epan/dissectors/packet-pkix1implicit.h index 8d0eed3851..9f7869b2ea 100644 --- a/epan/dissectors/packet-pkix1implicit.h +++ b/epan/dissectors/packet-pkix1implicit.h @@ -8,7 +8,7 @@ /* packet-pkix1implicit.h * Routines for PKIX1Implicit packet dissection * - * $Id: packet-pkix1implicit-template.h 12669 2004-12-05 21:47:49Z sahlberg $ + * $Id: packet-pkix1implicit-template.h 12827 2004-12-24 12:22:52Z sahlberg $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> diff --git a/epan/dissectors/packet-pkixqualified.c b/epan/dissectors/packet-pkixqualified.c index 9ef95d6171..b5d87e402e 100644 --- a/epan/dissectors/packet-pkixqualified.c +++ b/epan/dissectors/packet-pkixqualified.c @@ -144,7 +144,8 @@ static const value_string pkixqualified_PredefinedBiometricType_vals[] = { static int dissect_pkixqualified_PredefinedBiometricType(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -153,10 +154,11 @@ static int dissect_predefinedBiometricType(packet_info *pinfo, proto_tree *tree, } + static int dissect_pkixqualified_OBJECT_IDENTIFIER(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_object_identifier(implicit_tag, pinfo, tree, tvb, offset, - hf_index, NULL); + offset = dissect_ber_object_identifier(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -182,8 +184,8 @@ static const ber_choice_t TypeOfBiometricData_choice[] = { static int dissect_pkixqualified_TypeOfBiometricData(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - TypeOfBiometricData_choice, hf_index, ett_pkixqualified_TypeOfBiometricData); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + TypeOfBiometricData_choice, hf_index, ett_pkixqualified_TypeOfBiometricData, NULL); return offset; } @@ -248,6 +250,7 @@ dissect_pkixqualified_BiometricSyntax(gboolean implicit_tag _U_, tvbuff_t *tvb, } + static int dissect_pkixqualified_T_statementId(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_object_identifier(FALSE, pinfo, tree, tvb, offset, diff --git a/epan/dissectors/packet-smrse.c b/epan/dissectors/packet-smrse.c index 8948b21c32..bddce33c1e 100644 --- a/epan/dissectors/packet-smrse.c +++ b/epan/dissectors/packet-smrse.c @@ -129,7 +129,8 @@ static const value_string smrse_T_address_type_vals[] = { static int dissect_smrse_T_address_type(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -151,7 +152,8 @@ static const value_string smrse_T_numbering_plan_vals[] = { static int dissect_smrse_T_numbering_plan(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -219,8 +221,8 @@ static const ber_choice_t T_address_value_choice[] = { static int dissect_smrse_T_address_value(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - T_address_value_choice, hf_index, ett_smrse_T_address_value); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + T_address_value_choice, hf_index, ett_smrse_T_address_value, NULL); return offset; } @@ -332,7 +334,8 @@ static const value_string smrse_Connect_fail_vals[] = { static int dissect_smrse_Connect_fail(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -386,7 +389,8 @@ static int dissect_msg_waiting_set(packet_info *pinfo, proto_tree *tree, tvbuff_ static int dissect_smrse_RP_MR(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -422,7 +426,8 @@ static int dissect_sm_diag_info_impl(packet_info *pinfo, proto_tree *tree, tvbuf static int dissect_smrse_SM_TC(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -507,7 +512,8 @@ static const value_string smrse_Error_reason_vals[] = { static int dissect_smrse_Error_reason(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } diff --git a/epan/dissectors/packet-tcap.c b/epan/dissectors/packet-tcap.c index bf23870935..e7540cf3a8 100644 --- a/epan/dissectors/packet-tcap.c +++ b/epan/dissectors/packet-tcap.c @@ -1,6 +1,6 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Ethereal dissector compiler */ -/* .\packet-tcap.c */ +/* ./packet-tcap.c */ /* ../../tools/asn2eth.py -X -b -e -p tcap -c tcap.cnf -s packet-tcap-template tcap.asn */ /* Input file: packet-tcap-template.c */ @@ -449,8 +449,8 @@ static const ber_choice_t Associate_source_diagnostic_choice[] = { static int dissect_tcap_Associate_source_diagnostic(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - Associate_source_diagnostic_choice, hf_index, ett_tcap_Associate_source_diagnostic); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + Associate_source_diagnostic_choice, hf_index, ett_tcap_Associate_source_diagnostic, NULL); return offset; } @@ -531,8 +531,8 @@ static const ber_choice_t DialoguePDU_choice[] = { static int dissect_tcap_DialoguePDU(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - DialoguePDU_choice, hf_index, ett_tcap_DialoguePDU); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + DialoguePDU_choice, hf_index, ett_tcap_DialoguePDU, NULL); return offset; } @@ -788,8 +788,8 @@ static const ber_choice_t UniDialoguePDU_choice[] = { static int dissect_tcap_UniDialoguePDU(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - UniDialoguePDU_choice, hf_index, ett_tcap_UniDialoguePDU); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + UniDialoguePDU_choice, hf_index, ett_tcap_UniDialoguePDU, NULL); return offset; } @@ -896,8 +896,8 @@ static const ber_choice_t OPERATION_choice[] = { static int dissect_tcap_OPERATION(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - OPERATION_choice, hf_index, ett_tcap_OPERATION); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + OPERATION_choice, hf_index, ett_tcap_OPERATION, NULL); return offset; } @@ -1020,8 +1020,8 @@ static const ber_choice_t ErrorCode_choice[] = { static int dissect_tcap_ErrorCode(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - ErrorCode_choice, hf_index, ett_tcap_ErrorCode); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + ErrorCode_choice, hf_index, ett_tcap_ErrorCode, NULL); return offset; } @@ -1074,8 +1074,8 @@ static const ber_choice_t T_invokeIDRej_choice[] = { static int dissect_tcap_T_invokeIDRej(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - T_invokeIDRej_choice, hf_index, ett_tcap_T_invokeIDRej); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + T_invokeIDRej_choice, hf_index, ett_tcap_T_invokeIDRej, NULL); return offset; } @@ -1189,8 +1189,8 @@ static const ber_choice_t T_problem_choice[] = { static int dissect_tcap_T_problem(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - T_problem_choice, hf_index, ett_tcap_T_problem); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + T_problem_choice, hf_index, ett_tcap_T_problem, NULL); return offset; } @@ -1255,14 +1255,14 @@ if (ber_oid_dissector_table && cur_oid){ if(!dissector_try_string(ber_oid_dissector_table, cur_oid, next_tvb, pinfo, tcap_top_tree)) { if (!dissector_try_port(tcap_itu_ssn_dissector_table, pinfo->match_port, next_tvb,pinfo, tcap_top_tree)) - dissect_ber_choice(pinfo, tree, next_tvb, 0, - Component_choice, hf_index, ett_tcap_Component); + dissect_ber_CHOICE(pinfo, tree, next_tvb, 0, + Component_choice, hf_index, ett_tcap_Component, NULL); } } else if (!dissector_try_port(tcap_itu_ssn_dissector_table, pinfo->match_port, next_tvb, pinfo, tcap_top_tree)) - dissect_ber_choice(pinfo, tree, next_tvb, 0, - Component_choice, hf_index, ett_tcap_Component); + dissect_ber_CHOICE(pinfo, tree, next_tvb, 0, + Component_choice, hf_index, ett_tcap_Component, NULL); offset+=len; @@ -1451,8 +1451,8 @@ static const ber_choice_t Reason_choice[] = { static int dissect_tcap_Reason(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - Reason_choice, hf_index, ett_tcap_Reason); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + Reason_choice, hf_index, ett_tcap_Reason, NULL); return offset; } @@ -1544,8 +1544,8 @@ static const ber_choice_t T_applicationContext_choice[] = { static int dissect_tcap_T_applicationContext(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - T_applicationContext_choice, hf_index, ett_tcap_T_applicationContext); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + T_applicationContext_choice, hf_index, ett_tcap_T_applicationContext, NULL); return offset; } @@ -1568,8 +1568,8 @@ static const ber_choice_t T_securityContext_choice[] = { static int dissect_tcap_T_securityContext(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - T_securityContext_choice, hf_index, ett_tcap_T_securityContext); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + T_securityContext_choice, hf_index, ett_tcap_T_securityContext, NULL); return offset; } @@ -1592,8 +1592,8 @@ static const ber_choice_t T_confidentialityId_choice[] = { static int dissect_tcap_T_confidentialityId(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - T_confidentialityId_choice, hf_index, ett_tcap_T_confidentialityId); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + T_confidentialityId_choice, hf_index, ett_tcap_T_confidentialityId, NULL); return offset; } @@ -1664,8 +1664,8 @@ static const ber_choice_t OperationCode_choice[] = { static int dissect_tcap_OperationCode(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - OperationCode_choice, hf_index, ett_tcap_OperationCode); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + OperationCode_choice, hf_index, ett_tcap_OperationCode, NULL); return offset; } @@ -1941,8 +1941,8 @@ next_tvb = tvb_new_subset(tvb, offset, -1, -1); if (!dissector_try_port(tcap_ansi_ssn_dissector_table, pinfo->match_port, next_tvb, pinfo, tcap_top_tree)) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - ComponentPDU_choice, hf_index, ett_tcap_ComponentPDU); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + ComponentPDU_choice, hf_index, ett_tcap_ComponentPDU, NULL); } @@ -2074,8 +2074,8 @@ static const ber_choice_t T_causeInformation_choice[] = { static int dissect_tcap_T_causeInformation(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - T_causeInformation_choice, hf_index, ett_tcap_T_causeInformation); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + T_causeInformation_choice, hf_index, ett_tcap_T_causeInformation, NULL); return offset; } @@ -2138,8 +2138,8 @@ static const ber_choice_t MessageType_choice[] = { static int dissect_tcap_MessageType(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - MessageType_choice, hf_index, ett_tcap_MessageType); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + MessageType_choice, hf_index, ett_tcap_MessageType, NULL); return offset; } @@ -2159,8 +2159,8 @@ static const ber_choice_t ERROR_choice[] = { static int dissect_tcap_ERROR(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - ERROR_choice, hf_index, ett_tcap_ERROR); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + ERROR_choice, hf_index, ett_tcap_ERROR, NULL); return offset; } diff --git a/epan/dissectors/packet-tcap.h b/epan/dissectors/packet-tcap.h index bcae96da9b..fb328fcabc 100644 --- a/epan/dissectors/packet-tcap.h +++ b/epan/dissectors/packet-tcap.h @@ -1,6 +1,6 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Ethereal dissector compiler */ -/* .\packet-tcap.h */ +/* ./packet-tcap.h */ /* ../../tools/asn2eth.py -X -b -e -p tcap -c tcap.cnf -s packet-tcap-template tcap.asn */ /* Input file: packet-tcap-template.h */ diff --git a/epan/dissectors/packet-x509af.c b/epan/dissectors/packet-x509af.c index 172177ad40..84faf800c0 100644 --- a/epan/dissectors/packet-x509af.c +++ b/epan/dissectors/packet-x509af.c @@ -9,7 +9,7 @@ * Routines for X.509 Authentication Framework packet dissection * Ronnie Sahlberg 2004 * - * $Id: packet-x509af-template.c 12624 2004-11-30 04:08:16Z sahlberg $ + * $Id: packet-x509af-template.c 14169 2005-04-22 21:17:13Z gerald $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -229,7 +229,8 @@ const value_string x509af_Version_vals[] = { int dissect_x509af_Version(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -241,7 +242,8 @@ static int dissect_version(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int dissect_x509af_CertificateSerialNumber(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -256,6 +258,7 @@ static int dissect_serial(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i } + static int dissect_x509af_T_algorithmId(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_object_identifier(FALSE, pinfo, tree, tvb, offset, @@ -352,8 +355,8 @@ static const ber_choice_t Time_choice[] = { int dissect_x509af_Time(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - Time_choice, hf_index, ett_x509af_Time); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + Time_choice, hf_index, ett_x509af_Time, NULL); return offset; } @@ -424,6 +427,7 @@ static int dissect_subjectPublicKeyInfo(packet_info *pinfo, proto_tree *tree, tv } + static int dissect_x509af_T_extnId(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_object_identifier(FALSE, pinfo, tree, tvb, offset, @@ -753,8 +757,8 @@ static const ber_choice_t InfoSubject_choice[] = { static int dissect_x509af_InfoSubject(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - InfoSubject_choice, hf_index, ett_x509af_InfoSubject); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + InfoSubject_choice, hf_index, ett_x509af_InfoSubject, NULL); return offset; } @@ -897,8 +901,8 @@ static const ber_choice_t AssertionSubject_choice[] = { static int dissect_x509af_AssertionSubject(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - AssertionSubject_choice, hf_index, ett_x509af_AssertionSubject); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + AssertionSubject_choice, hf_index, ett_x509af_AssertionSubject, NULL); return offset; } diff --git a/epan/dissectors/packet-x509ce.c b/epan/dissectors/packet-x509ce.c index 54712d5294..c4eb84ef59 100644 --- a/epan/dissectors/packet-x509ce.c +++ b/epan/dissectors/packet-x509ce.c @@ -9,7 +9,7 @@ * Routines for X.509 Certificate Extensions packet dissection * Ronnie Sahlberg 2004 * - * $Id: packet-x509ce-template.c 12603 2004-11-25 21:00:17Z sahlberg $ + * $Id: packet-x509ce-template.c 14169 2005-04-22 21:17:13Z gerald $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -372,10 +372,11 @@ static int dissect_iPAddress_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t } + static int dissect_x509ce_OBJECT_IDENTIFIER(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_object_identifier(implicit_tag, pinfo, tree, tvb, offset, - hf_index, NULL); + offset = dissect_ber_object_identifier(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -414,8 +415,8 @@ static const ber_choice_t GeneralName_choice[] = { int dissect_x509ce_GeneralName(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - GeneralName_choice, hf_index, ett_x509ce_GeneralName); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + GeneralName_choice, hf_index, ett_x509ce_GeneralName, NULL); return offset; } @@ -492,15 +493,15 @@ static int dissect_subjectKeyIdentifier_impl(packet_info *pinfo, proto_tree *tre } static const asn_namedbit KeyUsage_bits[] = { - { 0, &hf_x509ce_KeyUsage_digitalSignature, -1, -1, NULL, NULL }, - { 1, &hf_x509ce_KeyUsage_nonRepudiation, -1, -1, NULL, NULL }, - { 2, &hf_x509ce_KeyUsage_keyEncipherment, -1, -1, NULL, NULL }, - { 3, &hf_x509ce_KeyUsage_dataEncipherment, -1, -1, NULL, NULL }, - { 4, &hf_x509ce_KeyUsage_keyAgreement, -1, -1, NULL, NULL }, - { 5, &hf_x509ce_KeyUsage_keyCertSign, -1, -1, NULL, NULL }, - { 6, &hf_x509ce_KeyUsage_cRLSign, -1, -1, NULL, NULL }, - { 7, &hf_x509ce_KeyUsage_encipherOnly, -1, -1, NULL, NULL }, - { 8, &hf_x509ce_KeyUsage_decipherOnly, -1, -1, NULL, NULL }, + { 0, &hf_x509ce_KeyUsage_digitalSignature, -1, -1, "digitalSignature", NULL }, + { 1, &hf_x509ce_KeyUsage_nonRepudiation, -1, -1, "nonRepudiation", NULL }, + { 2, &hf_x509ce_KeyUsage_keyEncipherment, -1, -1, "keyEncipherment", NULL }, + { 3, &hf_x509ce_KeyUsage_dataEncipherment, -1, -1, "dataEncipherment", NULL }, + { 4, &hf_x509ce_KeyUsage_keyAgreement, -1, -1, "keyAgreement", NULL }, + { 5, &hf_x509ce_KeyUsage_keyCertSign, -1, -1, "keyCertSign", NULL }, + { 6, &hf_x509ce_KeyUsage_cRLSign, -1, -1, "cRLSign", NULL }, + { 7, &hf_x509ce_KeyUsage_encipherOnly, -1, -1, "encipherOnly", NULL }, + { 8, &hf_x509ce_KeyUsage_decipherOnly, -1, -1, "decipherOnly", NULL }, { 0, NULL, 0, 0, NULL, NULL } }; @@ -517,10 +518,11 @@ static int dissect_keyUsage_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t } + int dissect_x509ce_KeyPurposeId(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_object_identifier(implicit_tag, pinfo, tree, tvb, offset, - hf_index, NULL); + offset = dissect_ber_object_identifier(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -587,10 +589,11 @@ dissect_x509ce_PrivateKeyUsagePeriod(gboolean implicit_tag _U_, tvbuff_t *tvb, i } + static int dissect_x509ce_CertPolicyId(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_object_identifier(implicit_tag, pinfo, tree, tvb, offset, - hf_index, NULL); + offset = dissect_ber_object_identifier(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -608,6 +611,7 @@ static int dissect_CertPolicySet_item(packet_info *pinfo, proto_tree *tree, tvbu } + static int dissect_x509ce_PolicyQualifierId(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_object_identifier(FALSE, pinfo, tree, tvb, offset, @@ -768,7 +772,8 @@ static int dissect_containsSOAPublicKeyCerts_impl(packet_info *pinfo, proto_tree static int dissect_x509ce_INTEGER(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -803,7 +808,8 @@ dissect_x509ce_BasicConstraintsSyntax(gboolean implicit_tag _U_, tvbuff_t *tvb, int dissect_x509ce_BaseDistance(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -871,7 +877,8 @@ static int dissect_nameConstraints_impl(packet_info *pinfo, proto_tree *tree, tv int dissect_x509ce_SkipCerts(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -900,7 +907,8 @@ dissect_x509ce_PolicyConstraintsSyntax(gboolean implicit_tag _U_, tvbuff_t *tvb, int dissect_x509ce_CRLNumber(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -938,10 +946,11 @@ dissect_x509ce_CRLReason(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, p } + int dissect_x509ce_HoldInstruction(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_object_identifier(implicit_tag, pinfo, tree, tvb, offset, - hf_index, NULL); + offset = dissect_ber_object_identifier(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -961,8 +970,8 @@ static const ber_choice_t DistributionPointName_choice[] = { int dissect_x509ce_DistributionPointName(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - DistributionPointName_choice, hf_index, ett_x509ce_DistributionPointName); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + DistributionPointName_choice, hf_index, ett_x509ce_DistributionPointName, NULL); return offset; } @@ -974,11 +983,11 @@ static int dissect_distributionPoint_impl(packet_info *pinfo, proto_tree *tree, } static const asn_namedbit OnlyCertificateTypes_bits[] = { - { 0, &hf_x509ce_OnlyCertificateTypes_userPublicKey, -1, -1, NULL, NULL }, - { 1, &hf_x509ce_OnlyCertificateTypes_cA, -1, -1, NULL, NULL }, - { 2, &hf_x509ce_OnlyCertificateTypes_userAttribute, -1, -1, NULL, NULL }, - { 3, &hf_x509ce_OnlyCertificateTypes_aA, -1, -1, NULL, NULL }, - { 4, &hf_x509ce_OnlyCertificateTypes_sOAPublicKey, -1, -1, NULL, NULL }, + { 0, &hf_x509ce_OnlyCertificateTypes_userPublicKey, -1, -1, "userPublicKey", NULL }, + { 1, &hf_x509ce_OnlyCertificateTypes_cA, -1, -1, "cA", NULL }, + { 2, &hf_x509ce_OnlyCertificateTypes_userAttribute, -1, -1, "userAttribute", NULL }, + { 3, &hf_x509ce_OnlyCertificateTypes_aA, -1, -1, "aA", NULL }, + { 4, &hf_x509ce_OnlyCertificateTypes_sOAPublicKey, -1, -1, "sOAPublicKey", NULL }, { 0, NULL, 0, 0, NULL, NULL } }; @@ -995,15 +1004,15 @@ static int dissect_onlyContains_impl(packet_info *pinfo, proto_tree *tree, tvbuf } static const asn_namedbit ReasonFlags_bits[] = { - { 0, &hf_x509ce_ReasonFlags_unused, -1, -1, NULL, NULL }, - { 1, &hf_x509ce_ReasonFlags_keyCompromise, -1, -1, NULL, NULL }, - { 2, &hf_x509ce_ReasonFlags_cACompromise, -1, -1, NULL, NULL }, - { 3, &hf_x509ce_ReasonFlags_affiliationChanged, -1, -1, NULL, NULL }, - { 4, &hf_x509ce_ReasonFlags_superseded, -1, -1, NULL, NULL }, - { 5, &hf_x509ce_ReasonFlags_cessationOfOperation, -1, -1, NULL, NULL }, - { 6, &hf_x509ce_ReasonFlags_certificateHold, -1, -1, NULL, NULL }, - { 7, &hf_x509ce_ReasonFlags_privilegeWithdrawn, -1, -1, NULL, NULL }, - { 8, &hf_x509ce_ReasonFlags_aACompromise, -1, -1, NULL, NULL }, + { 0, &hf_x509ce_ReasonFlags_unused, -1, -1, "unused", NULL }, + { 1, &hf_x509ce_ReasonFlags_keyCompromise, -1, -1, "keyCompromise", NULL }, + { 2, &hf_x509ce_ReasonFlags_cACompromise, -1, -1, "cACompromise", NULL }, + { 3, &hf_x509ce_ReasonFlags_affiliationChanged, -1, -1, "affiliationChanged", NULL }, + { 4, &hf_x509ce_ReasonFlags_superseded, -1, -1, "superseded", NULL }, + { 5, &hf_x509ce_ReasonFlags_cessationOfOperation, -1, -1, "cessationOfOperation", NULL }, + { 6, &hf_x509ce_ReasonFlags_certificateHold, -1, -1, "certificateHold", NULL }, + { 7, &hf_x509ce_ReasonFlags_privilegeWithdrawn, -1, -1, "privilegeWithdrawn", NULL }, + { 8, &hf_x509ce_ReasonFlags_aACompromise, -1, -1, "aACompromise", NULL }, { 0, NULL, 0, 0, NULL, NULL } }; @@ -1050,7 +1059,8 @@ static int dissect_subjectKeyIdRange_impl(packet_info *pinfo, proto_tree *tree, int dissect_x509ce_CRLStreamIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -1165,8 +1175,8 @@ static const ber_choice_t StatusReferral_choice[] = { int dissect_x509ce_StatusReferral(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - StatusReferral_choice, hf_index, ett_x509ce_StatusReferral); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + StatusReferral_choice, hf_index, ett_x509ce_StatusReferral, NULL); return offset; } @@ -1332,8 +1342,8 @@ static const ber_choice_t AltNameType_choice[] = { int dissect_x509ce_AltNameType(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - AltNameType_choice, hf_index, ett_x509ce_AltNameType); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + AltNameType_choice, hf_index, ett_x509ce_AltNameType, NULL); return offset; } diff --git a/epan/dissectors/packet-x509if.c b/epan/dissectors/packet-x509if.c index c2ae943f53..ad8656f0fc 100644 --- a/epan/dissectors/packet-x509if.c +++ b/epan/dissectors/packet-x509if.c @@ -9,7 +9,7 @@ * Routines for X.509 Information Framework packet dissection * Ronnie Sahlberg 2004 * - * $Id: packet-x509if-template.c 12744 2004-12-13 12:43:48Z sahlberg $ + * $Id: packet-x509if-template.c 14169 2005-04-22 21:17:13Z gerald $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -344,6 +344,7 @@ static int dissect_description(packet_info *pinfo, proto_tree *tree, tvbuff_t *t } + static int dissect_x509if_AttributeId(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_object_identifier(FALSE, pinfo, tree, tvb, offset, @@ -554,12 +555,10 @@ static int dissect_attribute(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb } + static int dissect_x509if_NULL(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - { proto_item *ti_tmp; - ti_tmp = proto_tree_add_item(tree, hf_index, tvb, offset>>8, 0, FALSE); - proto_item_append_text(ti_tmp, ": NULL"); - } + offset = dissect_ber_null(implicit_tag, pinfo, tree, tvb, offset, hf_index); return offset; } @@ -571,6 +570,7 @@ static int dissect_matchedValuesOnly(packet_info *pinfo, proto_tree *tree, tvbuf } + static int dissect_x509if_ContextId(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_object_identifier(FALSE, pinfo, tree, tvb, offset, @@ -661,8 +661,8 @@ static const ber_choice_t T_assertedContexts_choice[] = { static int dissect_x509if_T_assertedContexts(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - T_assertedContexts_choice, hf_index, ett_x509if_T_assertedContexts); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + T_assertedContexts_choice, hf_index, ett_x509if_T_assertedContexts, NULL); return offset; } @@ -808,8 +808,8 @@ static const ber_choice_t Name_choice[] = { int dissect_x509if_Name(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - Name_choice, hf_index, ett_x509if_Name); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + Name_choice, hf_index, ett_x509if_Name, NULL); return offset; } @@ -854,8 +854,8 @@ static const ber_choice_t T_specificExclusions_item_choice[] = { static int dissect_x509if_T_specificExclusions_item(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - T_specificExclusions_item_choice, hf_index, ett_x509if_T_specificExclusions_item); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + T_specificExclusions_item_choice, hf_index, ett_x509if_T_specificExclusions_item, NULL); return offset; } @@ -882,7 +882,8 @@ static int dissect_specificExclusions(packet_info *pinfo, proto_tree *tree, tvbu int dissect_x509if_BaseDistance(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -894,10 +895,11 @@ static int dissect_maximum(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, } + static int dissect_x509if_OBJECT_IDENTIFIER(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_object_identifier(implicit_tag, pinfo, tree, tvb, offset, - hf_index, NULL); + offset = dissect_ber_object_identifier(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -975,8 +977,8 @@ static const ber_choice_t Refinement_choice[] = { int dissect_x509if_Refinement(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - Refinement_choice, hf_index, ett_x509if_Refinement); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + Refinement_choice, hf_index, ett_x509if_Refinement, NULL); return offset; } @@ -1013,8 +1015,8 @@ static const ber_choice_t T_chopSpecificExclusions_item_choice[] = { static int dissect_x509if_T_chopSpecificExclusions_item(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - T_chopSpecificExclusions_item_choice, hf_index, ett_x509if_T_chopSpecificExclusions_item); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + T_chopSpecificExclusions_item_choice, hf_index, ett_x509if_T_chopSpecificExclusions_item, NULL); return offset; } @@ -1089,7 +1091,8 @@ dissect_x509if_AttributeUsage(gboolean implicit_tag _U_, tvbuff_t *tvb, int offs int dissect_x509if_RuleIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -1232,7 +1235,8 @@ dissect_x509if_DITContextUse(gboolean implicit_tag _U_, tvbuff_t *tvb, int offse static int dissect_x509if_INTEGER(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -1287,6 +1291,7 @@ static int dissect_ra_selectedValues(packet_info *pinfo, proto_tree *tree, tvbuf } + static int dissect_x509if_DefaultValueType(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_object_identifier(FALSE, pinfo, tree, tvb, offset, @@ -1446,8 +1451,8 @@ static const ber_choice_t ContextCombination_choice[] = { int dissect_x509if_ContextCombination(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - ContextCombination_choice, hf_index, ett_x509if_ContextCombination); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + ContextCombination_choice, hf_index, ett_x509if_ContextCombination, NULL); return offset; } @@ -1558,8 +1563,8 @@ static const ber_choice_t AttributeCombination_choice[] = { int dissect_x509if_AttributeCombination(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - AttributeCombination_choice, hf_index, ett_x509if_AttributeCombination); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + AttributeCombination_choice, hf_index, ett_x509if_AttributeCombination, NULL); return offset; } @@ -1579,8 +1584,8 @@ static const ber_choice_t T_outputValues_choice[] = { static int dissect_x509if_T_outputValues(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - T_outputValues_choice, hf_index, ett_x509if_T_outputValues); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + T_outputValues_choice, hf_index, ett_x509if_T_outputValues, NULL); return offset; } @@ -1784,9 +1789,9 @@ static int dissect_additionalControl(packet_info *pinfo, proto_tree *tree, tvbuf } static const asn_namedbit AllowedSubset_bits[] = { - { 0, &hf_x509if_AllowedSubset_baseObject, -1, -1, NULL, NULL }, - { 1, &hf_x509if_AllowedSubset_oneLevel, -1, -1, NULL, NULL }, - { 2, &hf_x509if_AllowedSubset_wholeSubtree, -1, -1, NULL, NULL }, + { 0, &hf_x509if_AllowedSubset_baseObject, -1, -1, "baseObject", NULL }, + { 1, &hf_x509if_AllowedSubset_oneLevel, -1, -1, "oneLevel", NULL }, + { 2, &hf_x509if_AllowedSubset_wholeSubtree, -1, -1, "wholeSubtree", NULL }, { 0, NULL, 0, 0, NULL, NULL } }; @@ -1939,8 +1944,8 @@ static const ber_choice_t OutputValues_choice[] = { int dissect_x509if_OutputValues(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - OutputValues_choice, hf_index, ett_x509if_OutputValues); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + OutputValues_choice, hf_index, ett_x509if_OutputValues, NULL); return offset; } diff --git a/epan/dissectors/packet-x509sat.c b/epan/dissectors/packet-x509sat.c index 9a756c8c64..d6106ab30e 100644 --- a/epan/dissectors/packet-x509sat.c +++ b/epan/dissectors/packet-x509sat.c @@ -360,8 +360,8 @@ static const ber_choice_t CriteriaItem_choice[] = { static int dissect_x509sat_CriteriaItem(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - CriteriaItem_choice, hf_index, ett_x509sat_CriteriaItem); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + CriteriaItem_choice, hf_index, ett_x509sat_CriteriaItem, NULL); return offset; } @@ -406,17 +406,18 @@ static const ber_choice_t Criteria_choice[] = { int dissect_x509sat_Criteria(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - Criteria_choice, hf_index, ett_x509sat_Criteria); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + Criteria_choice, hf_index, ett_x509sat_Criteria, NULL); return offset; } + static int dissect_x509sat_OBJECT_IDENTIFIER(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_object_identifier(implicit_tag, pinfo, tree, tvb, offset, - hf_index, NULL); + offset = dissect_ber_object_identifier(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -444,7 +445,8 @@ static const value_string x509sat_T_subset_vals[] = { static int dissect_x509sat_T_subset(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -587,7 +589,8 @@ static const value_string x509sat_PreferredDeliveryMethod_item_vals[] = { static int dissect_x509sat_PreferredDeliveryMethod_item(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -762,8 +765,8 @@ static const ber_choice_t SubstringAssertion_item_choice[] = { static int dissect_x509sat_SubstringAssertion_item(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - SubstringAssertion_item_choice, hf_index, ett_x509sat_SubstringAssertion_item); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + SubstringAssertion_item_choice, hf_index, ett_x509sat_SubstringAssertion_item, NULL); return offset; } @@ -812,8 +815,8 @@ static const ber_choice_t OctetSubstringAssertion_item_choice[] = { static int dissect_x509sat_OctetSubstringAssertion_item(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - OctetSubstringAssertion_item_choice, hf_index, ett_x509sat_OctetSubstringAssertion_item); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + OctetSubstringAssertion_item_choice, hf_index, ett_x509sat_OctetSubstringAssertion_item, NULL); return offset; } @@ -909,7 +912,8 @@ static int dissect_absolute(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, static int dissect_x509sat_INTEGER(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -1004,13 +1008,13 @@ static int dissect_intDay(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i } static const asn_namedbit T_bitDay_bits[] = { - { 0, &hf_x509sat_T_bitDay_sunday, -1, -1, NULL, NULL }, - { 1, &hf_x509sat_T_bitDay_monday, -1, -1, NULL, NULL }, - { 2, &hf_x509sat_T_bitDay_tuesday, -1, -1, NULL, NULL }, - { 3, &hf_x509sat_T_bitDay_wednesday, -1, -1, NULL, NULL }, - { 4, &hf_x509sat_T_bitDay_thursday, -1, -1, NULL, NULL }, - { 5, &hf_x509sat_T_bitDay_friday, -1, -1, NULL, NULL }, - { 6, &hf_x509sat_T_bitDay_saturday, -1, -1, NULL, NULL }, + { 0, &hf_x509sat_T_bitDay_sunday, -1, -1, "sunday", NULL }, + { 1, &hf_x509sat_T_bitDay_monday, -1, -1, "monday", NULL }, + { 2, &hf_x509sat_T_bitDay_tuesday, -1, -1, "tuesday", NULL }, + { 3, &hf_x509sat_T_bitDay_wednesday, -1, -1, "wednesday", NULL }, + { 4, &hf_x509sat_T_bitDay_thursday, -1, -1, "thursday", NULL }, + { 5, &hf_x509sat_T_bitDay_friday, -1, -1, "friday", NULL }, + { 6, &hf_x509sat_T_bitDay_saturday, -1, -1, "saturday", NULL }, { 0, NULL, 0, 0, NULL, NULL } }; @@ -1050,13 +1054,13 @@ static int dissect_intNamedDays(packet_info *pinfo, proto_tree *tree, tvbuff_t * } static const asn_namedbit T_bitNamedDays_bits[] = { - { 0, &hf_x509sat_T_bitNamedDays_sunday, -1, -1, NULL, NULL }, - { 1, &hf_x509sat_T_bitNamedDays_monday, -1, -1, NULL, NULL }, - { 2, &hf_x509sat_T_bitNamedDays_tuesday, -1, -1, NULL, NULL }, - { 3, &hf_x509sat_T_bitNamedDays_wednesday, -1, -1, NULL, NULL }, - { 4, &hf_x509sat_T_bitNamedDays_thursday, -1, -1, NULL, NULL }, - { 5, &hf_x509sat_T_bitNamedDays_friday, -1, -1, NULL, NULL }, - { 6, &hf_x509sat_T_bitNamedDays_saturday, -1, -1, NULL, NULL }, + { 0, &hf_x509sat_T_bitNamedDays_sunday, -1, -1, "sunday", NULL }, + { 1, &hf_x509sat_T_bitNamedDays_monday, -1, -1, "monday", NULL }, + { 2, &hf_x509sat_T_bitNamedDays_tuesday, -1, -1, "tuesday", NULL }, + { 3, &hf_x509sat_T_bitNamedDays_wednesday, -1, -1, "wednesday", NULL }, + { 4, &hf_x509sat_T_bitNamedDays_thursday, -1, -1, "thursday", NULL }, + { 5, &hf_x509sat_T_bitNamedDays_friday, -1, -1, "friday", NULL }, + { 6, &hf_x509sat_T_bitNamedDays_saturday, -1, -1, "saturday", NULL }, { 0, NULL, 0, 0, NULL, NULL } }; @@ -1087,8 +1091,8 @@ static const ber_choice_t NamedDay_choice[] = { int dissect_x509sat_NamedDay(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - NamedDay_choice, hf_index, ett_x509sat_NamedDay); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + NamedDay_choice, hf_index, ett_x509sat_NamedDay, NULL); return offset; } @@ -1129,8 +1133,8 @@ static const ber_choice_t XDayOf_choice[] = { int dissect_x509sat_XDayOf(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - XDayOf_choice, hf_index, ett_x509sat_XDayOf); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + XDayOf_choice, hf_index, ett_x509sat_XDayOf, NULL); return offset; } @@ -1155,8 +1159,8 @@ static const ber_choice_t T_days_choice[] = { static int dissect_x509sat_T_days(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - T_days_choice, hf_index, ett_x509sat_T_days); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + T_days_choice, hf_index, ett_x509sat_T_days, NULL); return offset; } @@ -1165,12 +1169,10 @@ static int dissect_days(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int } + static int dissect_x509sat_NULL(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - { proto_item *ti_tmp; - ti_tmp = proto_tree_add_item(tree, hf_index, tvb, offset>>8, 0, FALSE); - proto_item_append_text(ti_tmp, ": NULL"); - } + offset = dissect_ber_null(implicit_tag, pinfo, tree, tvb, offset, hf_index); return offset; } @@ -1200,11 +1202,11 @@ static int dissect_intWeek(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, } static const asn_namedbit T_bitWeek_bits[] = { - { 0, &hf_x509sat_T_bitWeek_week1, -1, -1, NULL, NULL }, - { 1, &hf_x509sat_T_bitWeek_week2, -1, -1, NULL, NULL }, - { 2, &hf_x509sat_T_bitWeek_week3, -1, -1, NULL, NULL }, - { 3, &hf_x509sat_T_bitWeek_week4, -1, -1, NULL, NULL }, - { 4, &hf_x509sat_T_bitWeek_week5, -1, -1, NULL, NULL }, + { 0, &hf_x509sat_T_bitWeek_week1, -1, -1, "week1", NULL }, + { 1, &hf_x509sat_T_bitWeek_week2, -1, -1, "week2", NULL }, + { 2, &hf_x509sat_T_bitWeek_week3, -1, -1, "week3", NULL }, + { 3, &hf_x509sat_T_bitWeek_week4, -1, -1, "week4", NULL }, + { 4, &hf_x509sat_T_bitWeek_week5, -1, -1, "week5", NULL }, { 0, NULL, 0, 0, NULL, NULL } }; @@ -1237,8 +1239,8 @@ static const ber_choice_t T_weeks_choice[] = { static int dissect_x509sat_T_weeks(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - T_weeks_choice, hf_index, ett_x509sat_T_weeks); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + T_weeks_choice, hf_index, ett_x509sat_T_weeks, NULL); return offset; } @@ -1262,18 +1264,18 @@ static int dissect_intMonth(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, } static const asn_namedbit T_bitMonth_bits[] = { - { 0, &hf_x509sat_T_bitMonth_january, -1, -1, NULL, NULL }, - { 1, &hf_x509sat_T_bitMonth_february, -1, -1, NULL, NULL }, - { 2, &hf_x509sat_T_bitMonth_march, -1, -1, NULL, NULL }, - { 3, &hf_x509sat_T_bitMonth_april, -1, -1, NULL, NULL }, - { 4, &hf_x509sat_T_bitMonth_may, -1, -1, NULL, NULL }, - { 5, &hf_x509sat_T_bitMonth_june, -1, -1, NULL, NULL }, - { 6, &hf_x509sat_T_bitMonth_july, -1, -1, NULL, NULL }, - { 7, &hf_x509sat_T_bitMonth_august, -1, -1, NULL, NULL }, - { 8, &hf_x509sat_T_bitMonth_september, -1, -1, NULL, NULL }, - { 9, &hf_x509sat_T_bitMonth_october, -1, -1, NULL, NULL }, - { 10, &hf_x509sat_T_bitMonth_november, -1, -1, NULL, NULL }, - { 11, &hf_x509sat_T_bitMonth_december, -1, -1, NULL, NULL }, + { 0, &hf_x509sat_T_bitMonth_january, -1, -1, "january", NULL }, + { 1, &hf_x509sat_T_bitMonth_february, -1, -1, "february", NULL }, + { 2, &hf_x509sat_T_bitMonth_march, -1, -1, "march", NULL }, + { 3, &hf_x509sat_T_bitMonth_april, -1, -1, "april", NULL }, + { 4, &hf_x509sat_T_bitMonth_may, -1, -1, "may", NULL }, + { 5, &hf_x509sat_T_bitMonth_june, -1, -1, "june", NULL }, + { 6, &hf_x509sat_T_bitMonth_july, -1, -1, "july", NULL }, + { 7, &hf_x509sat_T_bitMonth_august, -1, -1, "august", NULL }, + { 8, &hf_x509sat_T_bitMonth_september, -1, -1, "september", NULL }, + { 9, &hf_x509sat_T_bitMonth_october, -1, -1, "october", NULL }, + { 10, &hf_x509sat_T_bitMonth_november, -1, -1, "november", NULL }, + { 11, &hf_x509sat_T_bitMonth_december, -1, -1, "december", NULL }, { 0, NULL, 0, 0, NULL, NULL } }; @@ -1306,8 +1308,8 @@ static const ber_choice_t T_months_choice[] = { static int dissect_x509sat_T_months(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - T_months_choice, hf_index, ett_x509sat_T_months); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + T_months_choice, hf_index, ett_x509sat_T_months, NULL); return offset; } @@ -1380,8 +1382,8 @@ static const ber_choice_t T_time_choice[] = { static int dissect_x509sat_T_time(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - T_time_choice, hf_index, ett_x509sat_T_time); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + T_time_choice, hf_index, ett_x509sat_T_time, NULL); return offset; } @@ -1407,7 +1409,8 @@ static int dissect_entirely(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int dissect_x509sat_TimeZone(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -1465,8 +1468,8 @@ static const ber_choice_t TimeAssertion_choice[] = { int dissect_x509sat_TimeAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - TimeAssertion_choice, hf_index, ett_x509sat_TimeAssertion); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + TimeAssertion_choice, hf_index, ett_x509sat_TimeAssertion, NULL); return offset; } @@ -1486,8 +1489,8 @@ static const ber_choice_t LocaleContextSyntax_choice[] = { int dissect_x509sat_LocaleContextSyntax(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - LocaleContextSyntax_choice, hf_index, ett_x509sat_LocaleContextSyntax); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + LocaleContextSyntax_choice, hf_index, ett_x509sat_LocaleContextSyntax, NULL); return offset; } diff --git a/tools/asn2eth.py b/tools/asn2eth.py index e7280a6f22..cf9e248043 100644 --- a/tools/asn2eth.py +++ b/tools/asn2eth.py @@ -2514,9 +2514,9 @@ class ChoiceType (Type): out += " { 0, NULL, 0, NULL }\n};\n" out += ectx.eth_type_fn_hdr(tname) if (ectx.Ber()): - body = ectx.eth_fn_call('dissect_ber_choice', ret='offset', + body = ectx.eth_fn_call('dissect_ber_CHOICE', ret='offset', par=(('pinfo', 'tree', 'tvb', 'offset'), - (tname+'_choice', 'hf_index', ectx.eth_type[tname]['tree']))) + (tname+'_choice', 'hf_index', ectx.eth_type[tname]['tree'], 'NULL'))) elif (ectx.NPer()): body = ectx.eth_fn_call('dissect_pern_choice', ret='offset', par=(('tvb', 'offset', 'pinfo', 'tree'), |