diff options
35 files changed, 328 insertions, 327 deletions
diff --git a/epan/dissectors/packet-acse.c b/epan/dissectors/packet-acse.c index e31914aad8..000df46c37 100644 --- a/epan/dissectors/packet-acse.c +++ b/epan/dissectors/packet-acse.c @@ -2181,7 +2181,7 @@ void proto_register_acse(void) { NULL, HFILL }}, /*--- End of included file: packet-acse-hfarr.c ---*/ -#line 251 "packet-acse-template.c" +#line 249 "packet-acse-template.c" }; /* List of subtrees */ @@ -2227,7 +2227,7 @@ void proto_register_acse(void) { &ett_acse_Authentication_value, /*--- End of included file: packet-acse-ettarr.c ---*/ -#line 257 "packet-acse-template.c" +#line 255 "packet-acse-template.c" }; /* Register protocol */ diff --git a/epan/dissectors/packet-camel.c b/epan/dissectors/packet-camel.c index 5b77c5f392..b8958d7e72 100644 --- a/epan/dissectors/packet-camel.c +++ b/epan/dissectors/packet-camel.c @@ -7276,7 +7276,7 @@ void proto_reg_handoff_camel(void) { /*--- End of included file: packet-camel-dis-tab.c ---*/ -#line 524 "packet-camel-template.c" +#line 522 "packet-camel-template.c" } else { range_foreach(ssn_range, range_delete_callback); g_free(ssn_range); @@ -9326,7 +9326,7 @@ void proto_register_camel(void) { "camel.InvokeId_present", HFILL }}, /*--- End of included file: packet-camel-hfarr.c ---*/ -#line 697 "packet-camel-template.c" +#line 695 "packet-camel-template.c" }; /* List of subtrees */ @@ -9529,7 +9529,7 @@ void proto_register_camel(void) { &ett_camel_InvokeId, /*--- End of included file: packet-camel-ettarr.c ---*/ -#line 710 "packet-camel-template.c" +#line 708 "packet-camel-template.c" }; /* Register protocol */ proto_camel = proto_register_protocol(PNAME, PSNAME, PFNAME); diff --git a/epan/dissectors/packet-cmip.c b/epan/dissectors/packet-cmip.c index f813241f51..2d17ad3924 100644 --- a/epan/dissectors/packet-cmip.c +++ b/epan/dissectors/packet-cmip.c @@ -659,7 +659,7 @@ static int dissect_cmip_CMISFilter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, static int dissect_cmip_T_attributeId_globalForm(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 284 "cmip.cnf" +#line 280 "cmip.cnf" attributeform = ATTRIBUTE_GLOBAL_FORM; offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_index, &attribute_identifier_id); @@ -673,7 +673,7 @@ dissect_cmip_T_attributeId_globalForm(gboolean implicit_tag _U_, tvbuff_t *tvb _ static int dissect_cmip_T_attributeIdlocalForm(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 288 "cmip.cnf" +#line 284 "cmip.cnf" attributeform = ATTRIBUTE_LOCAL_FORM; offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_cmip_localForm, NULL); @@ -730,7 +730,7 @@ dissect_cmip_AccessControl(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off static int dissect_cmip_T_objectClass_globalForm(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 444 "cmip.cnf" +#line 440 "cmip.cnf" objectclassform = OBJECTCLASS_GLOBAL_FORM; offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_index, &objectclass_identifier_id); @@ -742,7 +742,7 @@ dissect_cmip_T_objectClass_globalForm(gboolean implicit_tag _U_, tvbuff_t *tvb _ static int dissect_cmip_T_objectClasslocalForm(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 449 "cmip.cnf" +#line 445 "cmip.cnf" objectclassform = OBJECTCLASS_LOCAL_FORM; @@ -787,7 +787,7 @@ dissect_cmip_T_id(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, static int dissect_cmip_T_attributeValueAssertionvalue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 300 "cmip.cnf" +#line 296 "cmip.cnf" offset=call_ber_oid_callback(attributevalueassertion_id, tvb, offset, actx->pinfo, tree); @@ -950,7 +950,7 @@ dissect_cmip_Scope(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, static int dissect_cmip_AttributeValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 292 "cmip.cnf" +#line 288 "cmip.cnf" /*XXX handle local form here */ if(attributeform==ATTRIBUTE_GLOBAL_FORM){ offset=call_ber_oid_callback(attribute_identifier_id, tvb, offset, actx->pinfo, tree); @@ -1120,7 +1120,7 @@ dissect_cmip_ActionTypeId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs static int dissect_cmip_T_actionInfoArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 455 "cmip.cnf" +#line 451 "cmip.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); @@ -1277,7 +1277,7 @@ dissect_cmip_NoSuchArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of static int dissect_cmip_T_eventInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 479 "cmip.cnf" +#line 475 "cmip.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); @@ -1382,7 +1382,7 @@ dissect_cmip_ActionError(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse static int dissect_cmip_T_actionReplyInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 482 "cmip.cnf" +#line 478 "cmip.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); @@ -1464,7 +1464,7 @@ dissect_cmip_ModifyOperator(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of static int dissect_cmip_T_attributeValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 476 "cmip.cnf" +#line 472 "cmip.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); @@ -1692,7 +1692,7 @@ dissect_cmip_DeleteResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs static int dissect_cmip_T_eventReplyInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 464 "cmip.cnf" +#line 460 "cmip.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); @@ -1719,7 +1719,7 @@ dissect_cmip_EventReply(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset static int dissect_cmip_EventReportArgumentEventInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 461 "cmip.cnf" +#line 457 "cmip.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); @@ -1986,7 +1986,7 @@ dissect_cmip_T_errorId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset static int dissect_cmip_T_errorInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 473 "cmip.cnf" +#line 469 "cmip.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); @@ -2095,7 +2095,7 @@ dissect_cmip_NoSuchEventType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o static int dissect_cmip_T_attributevalue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 467 "cmip.cnf" +#line 463 "cmip.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); @@ -2162,7 +2162,7 @@ static const value_string cmip_CMIPAbortSource_vals[] = { static int dissect_cmip_CMIPAbortSource(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 234 "cmip.cnf" +#line 230 "cmip.cnf" guint32 value; offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, @@ -2249,7 +2249,7 @@ static const ber_sequence_t CMIPUserInfo_sequence[] = { int dissect_cmip_CMIPUserInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 228 "cmip.cnf" +#line 226 "cmip.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "CMIP-A-ASSOCIATE"); offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, @@ -2335,7 +2335,7 @@ dissect_cmip_BOOLEAN(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U static int dissect_cmip_T_information(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 489 "cmip.cnf" +#line 485 "cmip.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); @@ -2432,7 +2432,7 @@ dissect_cmip_AttributeList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off static int dissect_cmip_T_oldAttributeValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 492 "cmip.cnf" +#line 488 "cmip.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); @@ -2444,7 +2444,7 @@ dissect_cmip_T_oldAttributeValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i static int dissect_cmip_T_newAttributeValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 495 "cmip.cnf" +#line 491 "cmip.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); @@ -3220,7 +3220,7 @@ dissect_cmip_T_serviceUseridentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U static int dissect_cmip_T_details(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 500 "cmip.cnf" +#line 496 "cmip.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); @@ -3343,7 +3343,7 @@ dissect_cmip_T_featureIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i static int dissect_cmip_T_featureInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 505 "cmip.cnf" +#line 501 "cmip.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); @@ -3593,7 +3593,7 @@ dissect_cmip_WeekMask(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _ static int dissect_cmip_T_local(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 243 "cmip.cnf" +#line 239 "cmip.cnf" offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, &opcode); @@ -3678,7 +3678,7 @@ dissect_cmip_T_linkedId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset static int dissect_cmip_InvokeArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 303 "cmip.cnf" +#line 299 "cmip.cnf" switch(opcode){ case 0: /* M-eventreport */ offset = dissect_cmip_EventReportArgument(FALSE, tvb, offset, actx, tree, -1); @@ -3732,7 +3732,7 @@ static const ber_sequence_t Invoke_sequence[] = { static int dissect_cmip_Invoke(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 256 "cmip.cnf" +#line 252 "cmip.cnf" opcode_type=OPCODE_INVOKE; if(check_col(actx->pinfo->cinfo, COL_INFO)){ col_prepend_fstr(actx->pinfo->cinfo, COL_INFO, "Invoke "); @@ -3748,7 +3748,7 @@ dissect_cmip_Invoke(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_ static int dissect_cmip_ResultArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 341 "cmip.cnf" +#line 337 "cmip.cnf" switch(opcode){ case 0: /* M-eventreport*/ @@ -3811,7 +3811,7 @@ static const ber_sequence_t ReturnResult_sequence[] = { static int dissect_cmip_ReturnResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 263 "cmip.cnf" +#line 259 "cmip.cnf" opcode_type=OPCODE_RETURN_RESULT; if(check_col(actx->pinfo->cinfo, COL_INFO)){ col_prepend_fstr(actx->pinfo->cinfo, COL_INFO, "ReturnResult "); @@ -3827,7 +3827,7 @@ dissect_cmip_ReturnResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs static int dissect_cmip_T_parameter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 375 "cmip.cnf" +#line 371 "cmip.cnf" switch(opcode){ case 19: /* classInstanceConflict */ @@ -3911,7 +3911,7 @@ static const ber_sequence_t ReturnError_sequence[] = { static int dissect_cmip_ReturnError(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 270 "cmip.cnf" +#line 266 "cmip.cnf" opcode_type=OPCODE_RETURN_ERROR; if(check_col(actx->pinfo->cinfo, COL_INFO)){ col_prepend_fstr(actx->pinfo->cinfo, COL_INFO, "ReturnError "); @@ -4033,7 +4033,7 @@ static const ber_sequence_t Reject_sequence[] = { static int dissect_cmip_Reject(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 277 "cmip.cnf" +#line 273 "cmip.cnf" opcode_type=OPCODE_REJECT; if(check_col(actx->pinfo->cinfo, COL_INFO)){ col_prepend_fstr(actx->pinfo->cinfo, COL_INFO, "Reject "); diff --git a/epan/dissectors/packet-cmp.c b/epan/dissectors/packet-cmp.c index f0060775e9..f6a198199a 100644 --- a/epan/dissectors/packet-cmp.c +++ b/epan/dissectors/packet-cmp.c @@ -2358,7 +2358,7 @@ void proto_register_cmp(void) { NULL, HFILL }}, /*--- End of included file: packet-cmp-hfarr.c ---*/ -#line 352 "packet-cmp-template.c" +#line 343 "packet-cmp-template.c" }; /* List of subtrees */ @@ -2416,7 +2416,7 @@ void proto_register_cmp(void) { &ett_cmp_PollRepContent_item, /*--- End of included file: packet-cmp-ettarr.c ---*/ -#line 358 "packet-cmp-template.c" +#line 349 "packet-cmp-template.c" }; module_t *cmp_module; @@ -2510,7 +2510,7 @@ void proto_reg_handoff_cmp(void) { /*--- End of included file: packet-cmp-dis-tab.c ---*/ -#line 430 "packet-cmp-template.c" +#line 421 "packet-cmp-template.c" inited = TRUE; } diff --git a/epan/dissectors/packet-disp.c b/epan/dissectors/packet-disp.c index 25ec6d1e73..0e346892da 100644 --- a/epan/dissectors/packet-disp.c +++ b/epan/dissectors/packet-disp.c @@ -2077,7 +2077,7 @@ void proto_register_disp(void) { "disp.ShadowErrorData", HFILL }}, /*--- End of included file: packet-disp-hfarr.c ---*/ -#line 209 "packet-disp-template.c" +#line 207 "packet-disp-template.c" }; /* List of subtrees */ @@ -2142,7 +2142,7 @@ void proto_register_disp(void) { &ett_disp_T_signedShadowError, /*--- End of included file: packet-disp-ettarr.c ---*/ -#line 215 "packet-disp-template.c" +#line 213 "packet-disp-template.c" }; module_t *disp_module; @@ -2181,7 +2181,7 @@ void proto_reg_handoff_disp(void) { /*--- End of included file: packet-disp-dis-tab.c ---*/ -#line 243 "packet-disp-template.c" +#line 241 "packet-disp-template.c" /* APPLICATION CONTEXT */ diff --git a/epan/dissectors/packet-dop.c b/epan/dissectors/packet-dop.c index 39efd67102..b76f5c0e22 100644 --- a/epan/dissectors/packet-dop.c +++ b/epan/dissectors/packet-dop.c @@ -2963,7 +2963,7 @@ void proto_register_dop(void) { NULL, HFILL }}, /*--- End of included file: packet-dop-hfarr.c ---*/ -#line 250 "packet-dop-template.c" +#line 248 "packet-dop-template.c" }; /* List of subtrees */ @@ -3042,7 +3042,7 @@ void proto_register_dop(void) { &ett_dop_GrantsAndDenials, /*--- End of included file: packet-dop-ettarr.c ---*/ -#line 257 "packet-dop-template.c" +#line 255 "packet-dop-template.c" }; module_t *dop_module; @@ -3098,7 +3098,7 @@ void proto_reg_handoff_dop(void) { /*--- End of included file: packet-dop-dis-tab.c ---*/ -#line 290 "packet-dop-template.c" +#line 288 "packet-dop-template.c" /* APPLICATION CONTEXT */ oid_add_from_string("id-ac-directory-operational-binding-management","2.5.3.3"); diff --git a/epan/dissectors/packet-dsp.c b/epan/dissectors/packet-dsp.c index 5f4233d3a5..871f52e7fa 100644 --- a/epan/dissectors/packet-dsp.c +++ b/epan/dissectors/packet-dsp.c @@ -2458,7 +2458,7 @@ void proto_register_dsp(void) { "dsp.EXTERNAL", HFILL }}, /*--- End of included file: packet-dsp-hfarr.c ---*/ -#line 280 "packet-dsp-template.c" +#line 278 "packet-dsp-template.c" }; /* List of subtrees */ @@ -2539,7 +2539,7 @@ void proto_register_dsp(void) { &ett_dsp_T_basicLevels, /*--- End of included file: packet-dsp-ettarr.c ---*/ -#line 286 "packet-dsp-template.c" +#line 284 "packet-dsp-template.c" }; module_t *dsp_module; @@ -2582,7 +2582,7 @@ void proto_reg_handoff_dsp(void) { /*--- End of included file: packet-dsp-dis-tab.c ---*/ -#line 319 "packet-dsp-template.c" +#line 317 "packet-dsp-template.c" /* APPLICATION CONTEXT */ diff --git a/epan/dissectors/packet-ftam.c b/epan/dissectors/packet-ftam.c index fb14b38fb2..5931a6507d 100644 --- a/epan/dissectors/packet-ftam.c +++ b/epan/dissectors/packet-ftam.c @@ -6481,7 +6481,7 @@ void proto_register_ftam(void) { NULL, HFILL }}, /*--- End of included file: packet-ftam-hfarr.c ---*/ -#line 133 "packet-ftam-template.c" +#line 131 "packet-ftam-template.c" }; /* List of subtrees */ @@ -6654,7 +6654,7 @@ void proto_register_ftam(void) { &ett_ftam_AE_title, /*--- End of included file: packet-ftam-ettarr.c ---*/ -#line 139 "packet-ftam-template.c" +#line 137 "packet-ftam-template.c" }; /* Register protocol */ diff --git a/epan/dissectors/packet-goose.c b/epan/dissectors/packet-goose.c index f6ece0b3ad..5e4860490d 100644 --- a/epan/dissectors/packet-goose.c +++ b/epan/dissectors/packet-goose.c @@ -948,7 +948,7 @@ void proto_register_goose(void) { "goose.BIT_STRING", HFILL }}, /*--- End of included file: packet-goose-hfarr.c ---*/ -#line 136 "packet-goose-template.c" +#line 135 "packet-goose-template.c" }; /* List of subtrees */ @@ -976,7 +976,7 @@ void proto_register_goose(void) { &ett_goose_Data, /*--- End of included file: packet-goose-ettarr.c ---*/ -#line 142 "packet-goose-template.c" +#line 141 "packet-goose-template.c" }; /* Register protocol */ diff --git a/epan/dissectors/packet-h225.c b/epan/dissectors/packet-h225.c index 589c0a16b0..717babe7d3 100644 --- a/epan/dissectors/packet-h225.c +++ b/epan/dissectors/packet-h225.c @@ -1182,7 +1182,7 @@ dissect_h225_ProtocolIdentifier(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *a static int dissect_h225_T_h245Ip(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 325 "h225.cnf" +#line 322 "h225.cnf" tvbuff_t *value_tvb; ipv4_address = 0; @@ -1422,7 +1422,7 @@ static const per_sequence_t H221NonStandard_sequence[] = { static int dissect_h225_H221NonStandard(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 615 "h225.cnf" +#line 612 "h225.cnf" t35CountryCode = 0; t35Extension = 0; manufacturerCode = 0; @@ -1430,7 +1430,7 @@ dissect_h225_H221NonStandard(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h225_H221NonStandard, H221NonStandard_sequence); -#line 619 "h225.cnf" +#line 616 "h225.cnf" h221NonStandard = ((t35CountryCode * 256) + t35Extension) * 65536 + manufacturerCode; proto_tree_add_uint(tree, hf_h221Manufacturer, tvb, (offset>>3)-4, 4, h221NonStandard); @@ -1452,7 +1452,7 @@ static const per_choice_t NonStandardIdentifier_choice[] = { static int dissect_h225_NonStandardIdentifier(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 596 "h225.cnf" +#line 593 "h225.cnf" gint32 value; nsiOID = ""; @@ -1481,7 +1481,7 @@ dissect_h225_NonStandardIdentifier(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t static int dissect_h225_T_nsp_data(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 630 "h225.cnf" +#line 627 "h225.cnf" tvbuff_t *next_tvb = NULL; offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, @@ -1504,7 +1504,7 @@ static const per_sequence_t NonStandardParameter_sequence[] = { int dissect_h225_NonStandardParameter(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 628 "h225.cnf" +#line 625 "h225.cnf" nsp_handle = NULL; offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -1538,7 +1538,7 @@ static const per_choice_t H245TransportAddress_choice[] = { static int dissect_h225_H245TransportAddress(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 435 "h225.cnf" +#line 432 "h225.cnf" ipv4_address=0; ipv4_port=0; @@ -1547,7 +1547,7 @@ dissect_h225_H245TransportAddress(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t ett_h225_H245TransportAddress, H245TransportAddress_choice, NULL); -#line 441 "h225.cnf" +#line 438 "h225.cnf" /* we need this info for TAPing */ h225_pi->is_h245 = TRUE; h225_pi->h245_address = ipv4_address; @@ -1576,7 +1576,7 @@ dissect_h225_H245TransportAddress(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t static int dissect_h225_DialedDigits(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 307 "h225.cnf" +#line 304 "h225.cnf" tvbuff_t *value_tvb = NULL; guint len = 0; @@ -1893,7 +1893,7 @@ dissect_h225_PartyNumber(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_ static int dissect_h225_TBCD_STRING(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 711 "h225.cnf" +#line 708 "h225.cnf" int min_len, max_len; gboolean has_extension; @@ -2692,13 +2692,13 @@ static const per_sequence_t TunnelledProtocol_sequence[] = { int dissect_h225_TunnelledProtocol(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 573 "h225.cnf" +#line 570 "h225.cnf" tpOID = ""; offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h225_TunnelledProtocol, TunnelledProtocol_sequence); -#line 575 "h225.cnf" +#line 572 "h225.cnf" tp_handle = dissector_get_string_handle(tp_dissector_table, tpOID); return offset; @@ -2876,7 +2876,7 @@ dissect_h225_CallType(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, p static int dissect_h225_T_guid(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 547 "h225.cnf" +#line 544 "h225.cnf" tvbuff_t *guid_tvb = NULL; actx->value_ptr = &guid_tvb; @@ -3090,7 +3090,7 @@ dissect_h225_SEQUENCE_OF_CryptoH323Token(tvbuff_t *tvb _U_, int offset _U_, asn1 static int dissect_h225_FastStart_item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 274 "h225.cnf" +#line 271 "h225.cnf" tvbuff_t *value_tvb = NULL; char codec_str[50]; @@ -3678,7 +3678,7 @@ dissect_h225_CircuitIdentifier(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *ac static int dissect_h225_T_standard(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 687 "h225.cnf" +#line 684 "h225.cnf" guint32 value_int = (guint32)-1; gef_ctx_t *gefx; @@ -3696,7 +3696,7 @@ dissect_h225_T_standard(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, static int dissect_h225_T_oid(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 696 "h225.cnf" +#line 693 "h225.cnf" const gchar *oid_str = NULL; gef_ctx_t *gefx; @@ -3726,14 +3726,14 @@ static const per_choice_t GenericIdentifier_choice[] = { int dissect_h225_GenericIdentifier(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 673 "h225.cnf" +#line 670 "h225.cnf" gef_ctx_t *gefx; offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_h225_GenericIdentifier, GenericIdentifier_choice, NULL); -#line 675 "h225.cnf" +#line 672 "h225.cnf" gef_ctx_update_key(gef_ctx_get(actx->private_data)); /* DEBUG */ /*proto_tree_add_text(tree, tvb, offset>>3, 0, "*** DEBUG GenericIdentifier: %s", gef_ctx_get(actx->private_data)->key);*/ gefx = gef_ctx_get(actx->private_data); @@ -3866,7 +3866,7 @@ dissect_h225_EnumeratedParameter(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t * static int dissect_h225_T_parameters_item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 655 "h225.cnf" +#line 652 "h225.cnf" gef_ctx_t *parent_gefx; parent_gefx = gef_ctx_get(actx->private_data); @@ -3874,7 +3874,7 @@ dissect_h225_T_parameters_item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *ac offset = dissect_h225_EnumeratedParameter(tvb, offset, actx, tree, hf_index); -#line 660 "h225.cnf" +#line 657 "h225.cnf" actx->private_data = parent_gefx; return offset; @@ -3903,7 +3903,7 @@ static const per_sequence_t GenericData_sequence[] = { int dissect_h225_GenericData(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 641 "h225.cnf" +#line 638 "h225.cnf" void *priv_data = actx->private_data; gef_ctx_t *gefx; @@ -3917,7 +3917,7 @@ dissect_h225_GenericData(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_ offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h225_GenericData, GenericData_sequence); -#line 651 "h225.cnf" +#line 648 "h225.cnf" actx->private_data = priv_data; return offset; @@ -3956,13 +3956,13 @@ dissect_h225_CircuitInfo(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_ static int dissect_h225_FeatureDescriptor(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 665 "h225.cnf" +#line 662 "h225.cnf" void *priv_data = actx->private_data; actx->private_data = gef_ctx_alloc(NULL, "FeatureDescriptor"); offset = dissect_h225_GenericData(tvb, offset, actx, tree, hf_index); -#line 668 "h225.cnf" +#line 665 "h225.cnf" actx->private_data = priv_data; return offset; @@ -3985,7 +3985,7 @@ dissect_h225_SEQUENCE_OF_FeatureDescriptor(tvbuff_t *tvb _U_, int offset _U_, as static int dissect_h225_ParallelH245Control_item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 336 "h225.cnf" +#line 333 "h225.cnf" tvbuff_t *h245_tvb = NULL; offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, @@ -4096,13 +4096,13 @@ static const per_sequence_t Setup_UUIE_sequence[] = { static int dissect_h225_Setup_UUIE(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 389 "h225.cnf" +#line 386 "h225.cnf" contains_faststart = FALSE; offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h225_Setup_UUIE, Setup_UUIE_sequence); -#line 393 "h225.cnf" +#line 390 "h225.cnf" /* Add to packet info */ h225_pi->cs_type = H225_SETUP; if (contains_faststart == TRUE ) @@ -4152,7 +4152,7 @@ dissect_h225_CallProceeding_UUIE(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t * offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h225_CallProceeding_UUIE, CallProceeding_UUIE_sequence); -#line 402 "h225.cnf" +#line 399 "h225.cnf" /* Add to packet info */ h225_pi->cs_type = H225_CALL_PROCEDING; if (contains_faststart == TRUE ) @@ -4192,7 +4192,7 @@ dissect_h225_Connect_UUIE(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h225_Connect_UUIE, Connect_UUIE_sequence); -#line 426 "h225.cnf" +#line 423 "h225.cnf" /* Add to packet info */ h225_pi->cs_type = H225_CONNECT; if (contains_faststart == TRUE ) @@ -4230,7 +4230,7 @@ dissect_h225_Alerting_UUIE(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _ offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h225_Alerting_UUIE, Alerting_UUIE_sequence); -#line 411 "h225.cnf" +#line 408 "h225.cnf" /* Add to packet info */ h225_pi->cs_type = H225_ALERTING; if (contains_faststart == TRUE ) @@ -4258,7 +4258,7 @@ dissect_h225_Information_UUIE(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h225_Information_UUIE, Information_UUIE_sequence); -#line 360 "h225.cnf" +#line 357 "h225.cnf" /* Add to packet info */ h225_pi->cs_type = H225_INFORMATION; g_snprintf(h225_pi->frame_label, 50, "%s", val_to_str(h225_pi->cs_type, T_h323_message_body_vals, "<unknown>")); @@ -4377,7 +4377,7 @@ static const per_choice_t ReleaseCompleteReason_choice[] = { int dissect_h225_ReleaseCompleteReason(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 540 "h225.cnf" +#line 537 "h225.cnf" gint32 value; offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, @@ -4411,7 +4411,7 @@ dissect_h225_ReleaseComplete_UUIE(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h225_ReleaseComplete_UUIE, ReleaseComplete_UUIE_sequence); -#line 420 "h225.cnf" +#line 417 "h225.cnf" /* Add to packet info */ h225_pi->cs_type = H225_RELEASE_COMPLET; g_snprintf(h225_pi->frame_label, 50, "%s", val_to_str(h225_pi->cs_type, T_h323_message_body_vals, "<unknown>")); @@ -4452,7 +4452,7 @@ static const per_choice_t FacilityReason_choice[] = { static int dissect_h225_FacilityReason(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 464 "h225.cnf" +#line 461 "h225.cnf" gint32 value; offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, @@ -4525,7 +4525,7 @@ dissect_h225_Facility_UUIE(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _ offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h225_Facility_UUIE, Facility_UUIE_sequence); -#line 381 "h225.cnf" +#line 378 "h225.cnf" /* Add to packet info */ h225_pi->cs_type = H225_FACILITY; g_snprintf(h225_pi->frame_label, 50, "%s", val_to_str(h225_pi->cs_type, T_h323_message_body_vals, "<unknown>")); @@ -4554,7 +4554,7 @@ dissect_h225_Progress_UUIE(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _ offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h225_Progress_UUIE, Progress_UUIE_sequence); -#line 366 "h225.cnf" +#line 363 "h225.cnf" /* Add to packet info */ h225_pi->cs_type = H225_PROGRESS; if (contains_faststart == TRUE ) @@ -4571,7 +4571,7 @@ static int dissect_h225_T_empty_flg(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_null(tvb, offset, actx, tree, hf_index); -#line 350 "h225.cnf" +#line 347 "h225.cnf" h225_pi->cs_type = H225_EMPTY; return offset; @@ -4591,7 +4591,7 @@ dissect_h225_Status_UUIE(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_ offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h225_Status_UUIE, Status_UUIE_sequence); -#line 354 "h225.cnf" +#line 351 "h225.cnf" /* Add to packet info */ h225_pi->cs_type = H225_STATUS; g_snprintf(h225_pi->frame_label, 50, "%s", val_to_str(h225_pi->cs_type, T_h323_message_body_vals, "<unknown>")); @@ -4630,7 +4630,7 @@ dissect_h225_SetupAcknowledge_UUIE(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h225_SetupAcknowledge_UUIE, SetupAcknowledge_UUIE_sequence); -#line 375 "h225.cnf" +#line 372 "h225.cnf" /* Add to packet info */ h225_pi->cs_type = H225_SETUP_ACK; g_snprintf(h225_pi->frame_label, 50, "%s", val_to_str(h225_pi->cs_type, T_h323_message_body_vals, "<unknown>")); @@ -4734,7 +4734,7 @@ dissect_h225_T_h323_message_body(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t * static int dissect_h225_T_h4501SupplementaryService_item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 561 "h225.cnf" +#line 558 "h225.cnf" tvbuff_t *h4501_tvb = NULL; offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, @@ -4774,7 +4774,7 @@ dissect_h225_T_h245Tunneling(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx static int dissect_h225_H245Control_item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 343 "h225.cnf" +#line 340 "h225.cnf" tvbuff_t *h245_tvb = NULL; offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, @@ -4831,7 +4831,7 @@ dissect_h225_CallLinkage(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_ static int dissect_h225_T_messageContent_item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 583 "h225.cnf" +#line 580 "h225.cnf" tvbuff_t *next_tvb = NULL; offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, @@ -4867,7 +4867,7 @@ static const per_sequence_t T_tunnelledSignallingMessage_sequence[] = { static int dissect_h225_T_tunnelledSignallingMessage(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 581 "h225.cnf" +#line 578 "h225.cnf" tp_handle = NULL; offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -5705,7 +5705,7 @@ static const per_choice_t GatekeeperRejectReason_choice[] = { static int dissect_h225_GatekeeperRejectReason(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 471 "h225.cnf" +#line 468 "h225.cnf" gint32 value; offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, @@ -6007,7 +6007,7 @@ static const per_choice_t RegistrationRejectReason_choice[] = { static int dissect_h225_RegistrationRejectReason(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 526 "h225.cnf" +#line 523 "h225.cnf" gint32 value; offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, @@ -6070,7 +6070,7 @@ static const per_choice_t UnregRequestReason_choice[] = { static int dissect_h225_UnregRequestReason(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 478 "h225.cnf" +#line 475 "h225.cnf" gint32 value; offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, @@ -6155,7 +6155,7 @@ static const per_choice_t UnregRejectReason_choice[] = { static int dissect_h225_UnregRejectReason(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 485 "h225.cnf" +#line 482 "h225.cnf" gint32 value; offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, @@ -6215,7 +6215,7 @@ dissect_h225_CallModel(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, static int dissect_h225_DestinationInfo_item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 302 "h225.cnf" +#line 299 "h225.cnf" h225_pi->is_destinationInfo = TRUE; @@ -6423,7 +6423,7 @@ static const per_choice_t AdmissionRejectReason_choice[] = { static int dissect_h225_AdmissionRejectReason(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 512 "h225.cnf" +#line 509 "h225.cnf" gint32 value; offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, @@ -6555,7 +6555,7 @@ static const per_choice_t BandRejectReason_choice[] = { static int dissect_h225_BandRejectReason(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 492 "h225.cnf" +#line 489 "h225.cnf" gint32 value; offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, @@ -6607,7 +6607,7 @@ static const per_choice_t DisengageReason_choice[] = { static int dissect_h225_DisengageReason(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 499 "h225.cnf" +#line 496 "h225.cnf" gint32 value; offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, @@ -6694,7 +6694,7 @@ static const per_choice_t DisengageRejectReason_choice[] = { static int dissect_h225_DisengageRejectReason(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 505 "h225.cnf" +#line 502 "h225.cnf" gint32 value; offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, @@ -6840,7 +6840,7 @@ static const per_choice_t LocationRejectReason_choice[] = { static int dissect_h225_LocationRejectReason(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 519 "h225.cnf" +#line 516 "h225.cnf" gint32 value; offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, @@ -7211,7 +7211,7 @@ static const per_choice_t InfoRequestNakReason_choice[] = { static int dissect_h225_InfoRequestNakReason(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 533 "h225.cnf" +#line 530 "h225.cnf" gint32 value; offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, @@ -7422,7 +7422,7 @@ static const per_choice_t RasMessage_choice[] = { int dissect_h225_RasMessage(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 290 "h225.cnf" +#line 287 "h225.cnf" gint32 rasmessage_value; offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, @@ -10635,7 +10635,7 @@ void proto_register_h225(void) { "h225.NULL", HFILL }}, /*--- End of included file: packet-h225-hfarr.c ---*/ -#line 243 "packet-h225-template.c" +#line 241 "packet-h225-template.c" }; /* List of subtrees */ @@ -10884,7 +10884,7 @@ void proto_register_h225(void) { &ett_h225_T_result, /*--- End of included file: packet-h225-ettarr.c ---*/ -#line 249 "packet-h225-template.c" +#line 247 "packet-h225-template.c" }; module_t *h225_module; diff --git a/epan/dissectors/packet-h245.c b/epan/dissectors/packet-h245.c index cbc6641411..8033e56392 100644 --- a/epan/dissectors/packet-h245.c +++ b/epan/dissectors/packet-h245.c @@ -4067,7 +4067,7 @@ dissect_h245_Application(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_ &value); codec_type = val_to_str(value, h245_Application_vals, "<unknown>"); - if (h245_pi != NULL) + if (h245_pi != NULL) g_snprintf(h245_pi->frame_label, 50, "%s %s", h245_pi->frame_label, codec_type); @@ -5726,7 +5726,7 @@ dissect_h245_VideoCapability(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx &value); codec_type = val_to_str(value, h245_VideoCapability_vals, "<unknown>"); - if (h245_pi != NULL) + if (h245_pi != NULL) g_snprintf(h245_pi->frame_label, 50, "%s %s", h245_pi->frame_label, codec_type); @@ -6623,7 +6623,7 @@ dissect_h245_T_subMessageIdentifier(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_ #line 630 "h245.cnf" guint32 subMessageIdentifer; gef_ctx_t *gefx; - + offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, 0U, 127U, &subMessageIdentifer, FALSE); @@ -8454,7 +8454,7 @@ dissect_h245_OLC_reverseLogicalChannelParameters(tvbuff_t *tvb _U_, int offset _ offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h245_OLC_reverseLogicalChannelParameters, OLC_reverseLogicalChannelParameters_sequence); - + if (upcoming_channel && codec_type) { g_strlcpy(upcoming_channel->data_type_str, codec_type, sizeof(upcoming_channel->data_type_str)); } @@ -8685,8 +8685,8 @@ dissect_h245_OpenLogicalChannel(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *a if (fast_start) { h245_setup_channels(actx->pinfo, &upcoming_olc->rev_lc); } else { - g_hash_table_insert(h245_pending_olc_reqs, - se_strdup(gen_olc_key(upcoming_olc->fwd_lc_num, &actx->pinfo->dst, &actx->pinfo->src)), + g_hash_table_insert(h245_pending_olc_reqs, + se_strdup(gen_olc_key(upcoming_olc->fwd_lc_num, &actx->pinfo->dst, &actx->pinfo->src)), upcoming_olc); } } @@ -9264,7 +9264,7 @@ dissect_h245_VideoMode(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, &value); codec_type = val_to_str(value, h245_VideoMode_vals, "<unknown>"); - if (h245_pi != NULL) + if (h245_pi != NULL) g_snprintf(h245_pi->frame_label, 50, "%s %s", h245_pi->frame_label, val_to_str(value, h245_VideoMode_vals, "ukn")); @@ -9592,7 +9592,7 @@ dissect_h245_AudioMode(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, &value); codec_type = val_to_str(value, h245_AudioMode_vals, "<unknown>"); - if (h245_pi != NULL) + if (h245_pi != NULL) g_snprintf(h245_pi->frame_label, 50, "%s %s", h245_pi->frame_label, val_to_str(value, h245_AudioMode_vals, "ukn")); @@ -9661,7 +9661,7 @@ dissect_h245_DataModeApplication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t * &value); codec_type = val_to_str(value, h245_DataModeApplication_vals, "<unknown>"); - if (h245_pi != NULL) + if (h245_pi != NULL) g_snprintf(h245_pi->frame_label, 50, "%s %s", h245_pi->frame_label, val_to_str(value, h245_DataModeApplication_vals, "ukn")); @@ -10996,7 +10996,7 @@ dissect_h245_T_forwardMultiplexAckParameters(tvbuff_t *tvb _U_, int offset _U_, ett_h245_T_forwardMultiplexAckParameters, T_forwardMultiplexAckParameters_choice, NULL); - + upcoming_channel = NULL; @@ -11027,14 +11027,14 @@ dissect_h245_OpenLogicalChannelAck(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t h223_fw_lc_num = 0; h223_rev_lc_num = 0; - + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_h245_OpenLogicalChannelAck, OpenLogicalChannelAck_sequence); temp = h223_fw_lc_num; p2p_dir = actx->pinfo->p2p_dir; - + if(actx->pinfo->p2p_dir == P2P_DIR_SENT) actx->pinfo->p2p_dir = P2P_DIR_RECV; else diff --git a/epan/dissectors/packet-h248.c b/epan/dissectors/packet-h248.c index 6f301652b3..f1546ec4e0 100644 --- a/epan/dissectors/packet-h248.c +++ b/epan/dissectors/packet-h248.c @@ -395,7 +395,7 @@ static int hf_h248_NotifyCompletion_otherReason = -1; static int hf_h248_NotifyCompletion_onIteration = -1; /*--- End of included file: packet-h248-hf.c ---*/ -#line 70 "packet-h248-template.c" +#line 74 "packet-h248-template.c" /* Initialize the subtree pointers */ static gint ett_h248 = -1; @@ -562,7 +562,7 @@ static gint ett_h248_T_value = -1; static gint ett_h248_T_extraInfo_01 = -1; /*--- End of included file: packet-h248-ett.c ---*/ -#line 87 "packet-h248-template.c" +#line 91 "packet-h248-template.c" static dissector_handle_t h248_term_handle; @@ -1042,9 +1042,9 @@ static const value_string h248_reasons[] = { { 474, "Invalid SDP Syntax"}, /*[H.248.49] */ { 475, "Unable to pause the playout of the signal"}, /*[H.248.66] */ { 476, "Unable to adjust the data delivery speed of the Signal"}, /*[H.248.66] */ - + { 477, "Unable to adjust the playback relative scale of the signal"}, /*[H.248.66] */ - + { 478, "Behaviour Contradicts Resource Rule"}, /*[H.248.63] */ { 500, "Internal software Failure in MG"}, @@ -1979,13 +1979,13 @@ dissect_h248_T_errorCode(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse #line 292 "h248.cnf" offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_h248_error_code, &error_code); expert_add_info_format(actx->pinfo, actx->created_item, PI_RESPONSE_CODE, PI_WARN, "Errored Command"); - + if (curr_info.cmd) { gcp_cmd_set_error(curr_info.cmd,error_code); } else if (curr_info.trx) { gcp_trx_set_error(curr_info.trx,error_code); } - + return offset; @@ -2092,7 +2092,7 @@ dissect_h248_WildcardField(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off wild_term = tvb_get_guint8(new_tvb,0) & 0x80 ? GCP_WILDCARD_CHOOSE : GCP_WILDCARD_ALL; /* limitation: assume only one wildcard is used */ wild_card = tvb_get_guint8(new_tvb,0); - + return offset; @@ -2118,7 +2118,7 @@ dissect_h248_T_terminationId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o #line 324 "h248.cnf" tvbuff_t* new_tvb; offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, &new_tvb); - + if (new_tvb) { curr_info.term->len = tvb_length(new_tvb); curr_info.term->type = 0; /* unknown */ @@ -2131,9 +2131,9 @@ dissect_h248_T_terminationId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o curr_info.term = gcp_cmd_add_term(curr_info.msg, curr_info.trx, curr_info.cmd, curr_info.term, wild_term, keep_persistent_data); if (h248_term_handle) { - actx->pinfo->private_data = &wild_card; + actx->pinfo->private_data = &wild_card; call_dissector(h248_term_handle, new_tvb, actx->pinfo, tree); - wild_card = 0xFF; + wild_card = 0xFF; } } else { curr_info.term->len = 0; @@ -4288,16 +4288,16 @@ static int dissect_h248_SCreasonValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 351 "h248.cnf" /* H248 v1 support */ - if ( h248_version >1 ) { + if ( h248_version >1 ) { /* Not V1, so call "standard" function */ offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset, SCreasonValue_sequence_of, hf_index, ett_h248_SCreasonValue); - + } else { /* V1 so Value == octet string */ offset = dissect_h248_ValueV1( implicit_tag, tvb, offset, actx, tree, hf_index); }; - + return offset; @@ -5122,7 +5122,7 @@ dissect_h248_Message(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U #line 90 "h248.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)) col_add_str(actx->pinfo->cinfo, COL_INFO, gcp_msg_to_str(curr_info.msg,keep_persistent_data)); - + if (keep_persistent_data) gcp_analyze_msg(h248_tree, h248_tvb, curr_info.msg, &h248_arrel); @@ -5275,7 +5275,7 @@ dissect_h248_PropertyParmV1(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of /*--- End of included file: packet-h248-fn.c ---*/ -#line 1302 "packet-h248-template.c" +#line 1306 "packet-h248-template.c" static void dissect_h248_tpkt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { dissect_tpkt_encap(tvb, pinfo, tree, h248_desegment, h248_handle); @@ -6664,7 +6664,7 @@ void proto_register_h248(void) { NULL, HFILL }}, /*--- End of included file: packet-h248-hfarr.c ---*/ -#line 1442 "packet-h248-template.c" +#line 1446 "packet-h248-template.c" GCP_HF_ARR_ELEMS("h248",h248_arrel) @@ -6832,7 +6832,7 @@ void proto_register_h248(void) { &ett_h248_T_extraInfo_01, /*--- End of included file: packet-h248-ettarr.c ---*/ -#line 1460 "packet-h248-template.c" +#line 1464 "packet-h248-template.c" }; module_t *h248_module; diff --git a/epan/dissectors/packet-inap.c b/epan/dissectors/packet-inap.c index f18a1cfa48..21b4ae16cf 100644 --- a/epan/dissectors/packet-inap.c +++ b/epan/dissectors/packet-inap.c @@ -11394,7 +11394,7 @@ void proto_register_inap(void) { "inap.InvokeId_present", HFILL }}, /*--- End of included file: packet-inap-hfarr.c ---*/ -#line 196 "packet-inap-template.c" +#line 193 "packet-inap-template.c" }; @@ -11644,7 +11644,7 @@ void proto_register_inap(void) { &ett_inap_InvokeId, /*--- End of included file: packet-inap-ettarr.c ---*/ -#line 208 "packet-inap-template.c" +#line 205 "packet-inap-template.c" }; /* Register protocol */ diff --git a/epan/dissectors/packet-ldap.c b/epan/dissectors/packet-ldap.c index 93282caa92..ac94ebe292 100644 --- a/epan/dissectors/packet-ldap.c +++ b/epan/dissectors/packet-ldap.c @@ -106,6 +106,7 @@ #include <epan/dissectors/packet-dcerpc.h> #include <epan/asn1.h> +#include "packet-frame.h" #include "packet-ldap.h" #include "packet-ntlmssp.h" #include "packet-ssl.h" @@ -935,7 +936,7 @@ dissect_ldap_INTEGER_1_127(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off static int dissect_ldap_LDAPString(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 322 "ldap.cnf" +#line 321 "ldap.cnf" tvbuff_t *parameter_tvb = NULL; char *ldapstring = NULL; gchar *sc = NULL; /* semi-colon pointer */ @@ -1046,7 +1047,7 @@ dissect_ldap_LDAPDN(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_ static int dissect_ldap_Simple(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 165 "ldap.cnf" +#line 164 "ldap.cnf" ldap_conv_info_t *ldap_info; offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, @@ -1067,7 +1068,7 @@ ldap_conv_info_t *ldap_info; static int dissect_ldap_Mechanism(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 175 "ldap.cnf" +#line 174 "ldap.cnf" ldap_conv_info_t *ldap_info; tvbuff_t *parameter_tvb; @@ -1115,7 +1116,7 @@ char *mechanism = NULL; static int dissect_ldap_Credentials(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 212 "ldap.cnf" +#line 211 "ldap.cnf" tvbuff_t *parameter_tvb; ldap_conv_info_t *ldap_info; @@ -1181,7 +1182,7 @@ dissect_ldap_SaslCredentials(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o static int dissect_ldap_T_ntlmsspNegotiate(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 691 "ldap.cnf" +#line 690 "ldap.cnf" /* make sure the protocol op comes first */ ldap_do_protocolop(actx->pinfo); @@ -1197,7 +1198,7 @@ dissect_ldap_T_ntlmsspNegotiate(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in static int dissect_ldap_T_ntlmsspAuth(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 698 "ldap.cnf" +#line 697 "ldap.cnf" /* make sure the protocol op comes first */ ldap_do_protocolop(actx->pinfo); @@ -1228,7 +1229,7 @@ static const ber_choice_t AuthenticationChoice_choice[] = { static int dissect_ldap_AuthenticationChoice(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 497 "ldap.cnf" +#line 496 "ldap.cnf" gint branch = -1; gint auth = -1; const gchar *valstr; @@ -1335,7 +1336,7 @@ static const value_string ldap_BindResponse_resultCode_vals[] = { static int dissect_ldap_BindResponse_resultCode(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 447 "ldap.cnf" +#line 446 "ldap.cnf" const gchar *valstr; @@ -1363,7 +1364,7 @@ dissect_ldap_BindResponse_resultCode(gboolean implicit_tag _U_, tvbuff_t *tvb _U static int dissect_ldap_T_bindResponse_matchedDN(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 705 "ldap.cnf" +#line 704 "ldap.cnf" tvbuff_t *new_tvb=NULL; offset = dissect_ber_octet_string(FALSE, actx, tree, tvb, offset, hf_ldap_matchedDN, &new_tvb); @@ -1424,7 +1425,7 @@ dissect_ldap_Referral(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _ static int dissect_ldap_ServerSaslCreds(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 252 "ldap.cnf" +#line 251 "ldap.cnf" tvbuff_t *parameter_tvb; ldap_conv_info_t *ldap_info; @@ -1542,7 +1543,7 @@ dissect_ldap_NULL(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, static int dissect_ldap_UnbindRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 519 "ldap.cnf" +#line 518 "ldap.cnf" implicit_tag = TRUE; /* correct problem with asn2wrs */ @@ -1572,7 +1573,7 @@ static const value_string ldap_T_scope_vals[] = { static int dissect_ldap_T_scope(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 413 "ldap.cnf" +#line 412 "ldap.cnf" gint scope; const gchar *valstr; @@ -1639,7 +1640,7 @@ static int dissect_ldap_T_and_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ldap_Filter(implicit_tag, tvb, offset, actx, tree, hf_index); -#line 561 "ldap.cnf" +#line 560 "ldap.cnf" if(and_filter_string){ and_filter_string=ep_strdup_printf("(&%s%s)",and_filter_string,Filter_string); } else { @@ -1657,7 +1658,7 @@ static const ber_sequence_t T_and_set_of[1] = { static int dissect_ldap_T_and(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 568 "ldap.cnf" +#line 567 "ldap.cnf" proto_tree *tr=NULL; proto_item *it=NULL; char *old_and_filter_string=and_filter_string; @@ -1690,7 +1691,7 @@ static int dissect_ldap_T_or_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ldap_Filter(implicit_tag, tvb, offset, actx, tree, hf_index); -#line 588 "ldap.cnf" +#line 587 "ldap.cnf" if(or_filter_string){ or_filter_string=ep_strdup_printf("(|%s%s)",or_filter_string,Filter_string); } else { @@ -1709,7 +1710,7 @@ static const ber_sequence_t T_or_set_of[1] = { static int dissect_ldap_T_or(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 596 "ldap.cnf" +#line 595 "ldap.cnf" proto_tree *tr=NULL; proto_item *it=NULL; char *old_or_filter_string=or_filter_string; @@ -1740,7 +1741,7 @@ static int dissect_ldap_T_not(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ldap_Filter(implicit_tag, tvb, offset, actx, tree, hf_index); -#line 617 "ldap.cnf" +#line 616 "ldap.cnf" Filter_string=ep_strdup_printf("(!%s)",string_or_null(Filter_string)); @@ -1778,7 +1779,7 @@ static int dissect_ldap_T_equalityMatch(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ldap_AttributeValueAssertion(implicit_tag, tvb, offset, actx, tree, hf_index); -#line 538 "ldap.cnf" +#line 537 "ldap.cnf" Filter_string=ep_strdup_printf("(%s=%s)", string_or_null(attributedesc_string), string_or_null(ldapvalue_string)); @@ -1809,7 +1810,7 @@ dissect_ldap_T_substringFilter_substrings_item(gboolean implicit_tag _U_, tvbuff T_substringFilter_substrings_item_choice, hf_index, ett_ldap_T_substringFilter_substrings_item, NULL); -#line 643 "ldap.cnf" +#line 642 "ldap.cnf" if (substring_item_final) { substring_value=ep_strdup_printf("%s%s", (substring_value?substring_value:"*"), @@ -1849,7 +1850,7 @@ static const ber_sequence_t SubstringFilter_sequence[] = { static int dissect_ldap_SubstringFilter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 657 "ldap.cnf" +#line 656 "ldap.cnf" proto_tree *tr=NULL; proto_item *it=NULL; char *old_substring_value=substring_value; @@ -1883,7 +1884,7 @@ static int dissect_ldap_T_greaterOrEqual(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ldap_AttributeValueAssertion(implicit_tag, tvb, offset, actx, tree, hf_index); -#line 544 "ldap.cnf" +#line 543 "ldap.cnf" Filter_string=ep_strdup_printf("(%s>=%s)", string_or_null(attributedesc_string), string_or_null(ldapvalue_string)); @@ -1899,7 +1900,7 @@ static int dissect_ldap_T_lessOrEqual(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ldap_AttributeValueAssertion(implicit_tag, tvb, offset, actx, tree, hf_index); -#line 550 "ldap.cnf" +#line 549 "ldap.cnf" Filter_string=ep_strdup_printf("(%s<=%s)", string_or_null(attributedesc_string), string_or_null(ldapvalue_string)); @@ -1915,7 +1916,7 @@ static int dissect_ldap_T_present(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ldap_AttributeDescription(implicit_tag, tvb, offset, actx, tree, hf_index); -#line 614 "ldap.cnf" +#line 613 "ldap.cnf" Filter_string=ep_strdup_printf("(%s=*)",string_or_null(Filter_string)); @@ -1928,7 +1929,7 @@ static int dissect_ldap_T_approxMatch(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ldap_AttributeValueAssertion(implicit_tag, tvb, offset, actx, tree, hf_index); -#line 556 "ldap.cnf" +#line 555 "ldap.cnf" Filter_string=ep_strdup_printf("(%s~=%s)", string_or_null(attributedesc_string), string_or_null(ldapvalue_string)); @@ -1950,7 +1951,7 @@ dissect_ldap_MatchingRuleId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of static int dissect_ldap_T_dnAttributes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 620 "ldap.cnf" +#line 619 "ldap.cnf" gboolean val; offset = dissect_ber_boolean(implicit_tag, actx, tree, tvb, offset, hf_index, &val); @@ -1985,7 +1986,7 @@ dissect_ldap_MatchingRuleAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, static int dissect_ldap_T_extensibleMatch(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 629 "ldap.cnf" +#line 628 "ldap.cnf" attr_type=NULL; matching_rule_string=NULL; ldapvalue_string=NULL; @@ -1994,7 +1995,7 @@ dissect_ldap_T_extensibleMatch(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset = dissect_ldap_MatchingRuleAssertion(implicit_tag, tvb, offset, actx, tree, hf_index); -#line 635 "ldap.cnf" +#line 634 "ldap.cnf" Filter_string=ep_strdup_printf("(%s:%s%s%s=%s)", (attr_type?attr_type:""), (matching_rule_dnattr?"dn:":""), @@ -2037,7 +2038,7 @@ static const ber_choice_t Filter_choice[] = { static int dissect_ldap_Filter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 678 "ldap.cnf" +#line 677 "ldap.cnf" proto_tree *tr=NULL; proto_item *it=NULL; @@ -2062,13 +2063,13 @@ dissect_ldap_Filter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_ static int dissect_ldap_T_filter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 531 "ldap.cnf" +#line 530 "ldap.cnf" Filter_string=NULL; offset = dissect_ldap_Filter(implicit_tag, tvb, offset, actx, tree, hf_index); -#line 534 "ldap.cnf" +#line 533 "ldap.cnf" Filter_string=NULL; and_filter_string=NULL; @@ -2124,7 +2125,7 @@ dissect_ldap_SearchRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off static int dissect_ldap_AttributeValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 464 "ldap.cnf" +#line 463 "ldap.cnf" tvbuff_t *next_tvb; gchar *string; @@ -2281,7 +2282,7 @@ static const value_string ldap_T_resultCode_vals[] = { static int dissect_ldap_T_resultCode(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 430 "ldap.cnf" +#line 429 "ldap.cnf" const gchar *valstr; @@ -2349,7 +2350,7 @@ dissect_ldap_SEQUENCE_OF_LDAPURL(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i static int dissect_ldap_SearchResultReference(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 748 "ldap.cnf" +#line 747 "ldap.cnf" offset = dissect_ber_tagged_type(implicit_tag, actx, tree, tvb, offset, hf_index, BER_CLASS_APP, 19, TRUE, dissect_ldap_SEQUENCE_OF_LDAPURL); @@ -2626,7 +2627,7 @@ dissect_ldap_CompareResponse(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o static int dissect_ldap_AbandonRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 755 "ldap.cnf" +#line 754 "ldap.cnf" offset = dissect_ber_tagged_type(implicit_tag, actx, tree, tvb, offset, hf_index, BER_CLASS_APP, 16, TRUE, dissect_ldap_MessageID); @@ -2700,7 +2701,7 @@ dissect_ldap_LDAPOID(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U static int dissect_ldap_T_requestValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 740 "ldap.cnf" +#line 739 "ldap.cnf" if((object_identifier_id != NULL) && oid_has_dissector(object_identifier_id)) { offset = call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); @@ -2980,7 +2981,7 @@ dissect_ldap_ControlType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse static int dissect_ldap_T_controlValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 721 "ldap.cnf" +#line 720 "ldap.cnf" gint8 class; gboolean pc, ind; gint32 tag; diff --git a/epan/dissectors/packet-mms.c b/epan/dissectors/packet-mms.c index 8cce5eb039..72ae21e2a3 100644 --- a/epan/dissectors/packet-mms.c +++ b/epan/dissectors/packet-mms.c @@ -9559,7 +9559,7 @@ void proto_register_mms(void) { NULL, HFILL }}, /*--- End of included file: packet-mms-hfarr.c ---*/ -#line 97 "packet-mms-template.c" +#line 95 "packet-mms-template.c" }; /* List of subtrees */ @@ -9775,7 +9775,7 @@ void proto_register_mms(void) { &ett_mms_FileAttributes, /*--- End of included file: packet-mms-ettarr.c ---*/ -#line 103 "packet-mms-template.c" +#line 101 "packet-mms-template.c" }; /* Register protocol */ diff --git a/epan/dissectors/packet-mpeg-audio.c b/epan/dissectors/packet-mpeg-audio.c index 5723e8e620..6bac61b113 100644 --- a/epan/dissectors/packet-mpeg-audio.c +++ b/epan/dissectors/packet-mpeg-audio.c @@ -667,7 +667,7 @@ proto_register_mpeg_audio(void) "mpeg_audio.T_genre", HFILL }}, /*--- End of included file: packet-mpeg-audio-hfarr.c ---*/ -#line 170 "packet-mpeg-audio-template.c" +#line 166 "packet-mpeg-audio-template.c" { &hf_mpeg_audio, { "MPEG Audio", "mpeg.audio", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, @@ -694,7 +694,7 @@ proto_register_mpeg_audio(void) &ett_mpeg_audio_ID3v1, /*--- End of included file: packet-mpeg-audio-ettarr.c ---*/ -#line 190 "packet-mpeg-audio-template.c" +#line 186 "packet-mpeg-audio-template.c" }; proto_mpeg_audio = proto_register_protocol( diff --git a/epan/dissectors/packet-mpeg-pes.c b/epan/dissectors/packet-mpeg-pes.c index 0ef4ead71d..38a8ce71bf 100644 --- a/epan/dissectors/packet-mpeg-pes.c +++ b/epan/dissectors/packet-mpeg-pes.c @@ -1121,7 +1121,7 @@ proto_register_mpeg_pes(void) "mpeg_pes.BIT_STRING_SIZE_16", HFILL }}, /*--- End of included file: packet-mpeg-pes-hfarr.c ---*/ -#line 483 "packet-mpeg-pes-template.c" +#line 479 "packet-mpeg-pes-template.c" { &hf_mpeg_pes_pack_header, { "Pack header", "mpeg-pes.pack", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, @@ -1217,7 +1217,7 @@ proto_register_mpeg_pes(void) &ett_mpeg_pes_Picture, /*--- End of included file: packet-mpeg-pes-ettarr.c ---*/ -#line 568 "packet-mpeg-pes-template.c" +#line 564 "packet-mpeg-pes-template.c" &ett_mpeg_pes_pack_header, &ett_mpeg_pes_header_data, }; diff --git a/epan/dissectors/packet-ocsp.c b/epan/dissectors/packet-ocsp.c index 9108c0a675..14c0a724a1 100644 --- a/epan/dissectors/packet-ocsp.c +++ b/epan/dissectors/packet-ocsp.c @@ -914,7 +914,7 @@ void proto_register_ocsp(void) { "ocsp.GeneralizedTime", HFILL }}, /*--- End of included file: packet-ocsp-hfarr.c ---*/ -#line 126 "packet-ocsp-template.c" +#line 116 "packet-ocsp-template.c" }; /* List of subtrees */ @@ -944,7 +944,7 @@ void proto_register_ocsp(void) { &ett_ocsp_CrlID, /*--- End of included file: packet-ocsp-ettarr.c ---*/ -#line 132 "packet-ocsp-template.c" +#line 122 "packet-ocsp-template.c" }; /* Register protocol */ @@ -979,6 +979,6 @@ void proto_reg_handoff_ocsp(void) { /*--- End of included file: packet-ocsp-dis-tab.c ---*/ -#line 155 "packet-ocsp-template.c" +#line 145 "packet-ocsp-template.c" } diff --git a/epan/dissectors/packet-pcap.c b/epan/dissectors/packet-pcap.c index f1ef727fa9..64b5cf7388 100644 --- a/epan/dissectors/packet-pcap.c +++ b/epan/dissectors/packet-pcap.c @@ -11213,7 +11213,7 @@ proto_reg_handoff_pcap(void) /*--- End of included file: packet-pcap-dis-tab.c ---*/ -#line 174 "packet-pcap-template.c" +#line 173 "packet-pcap-template.c" } else { range_foreach(ssn_range, range_delete_callback); g_free(ssn_range); @@ -14650,7 +14650,7 @@ void proto_register_pcap(void) { NULL, HFILL }}, /*--- End of included file: packet-pcap-hfarr.c ---*/ -#line 190 "packet-pcap-template.c" +#line 189 "packet-pcap-template.c" }; /* List of subtrees */ @@ -14983,7 +14983,7 @@ void proto_register_pcap(void) { &ett_pcap_Outcome, /*--- End of included file: packet-pcap-ettarr.c ---*/ -#line 196 "packet-pcap-template.c" +#line 195 "packet-pcap-template.c" }; module_t *pcap_module; diff --git a/epan/dissectors/packet-pkixtsp.c b/epan/dissectors/packet-pkixtsp.c index bb64a51de1..e07fee910a 100644 --- a/epan/dissectors/packet-pkixtsp.c +++ b/epan/dissectors/packet-pkixtsp.c @@ -544,7 +544,7 @@ void proto_register_pkixtsp(void) { NULL, HFILL }}, /*--- End of included file: packet-pkixtsp-hfarr.c ---*/ -#line 118 "packet-pkixtsp-template.c" +#line 108 "packet-pkixtsp-template.c" }; /* List of subtrees */ @@ -562,7 +562,7 @@ void proto_register_pkixtsp(void) { &ett_pkixtsp_Accuracy, /*--- End of included file: packet-pkixtsp-ettarr.c ---*/ -#line 124 "packet-pkixtsp-template.c" +#line 114 "packet-pkixtsp-template.c" }; /* Register protocol */ @@ -593,6 +593,6 @@ void proto_reg_handoff_pkixtsp(void) { /*--- End of included file: packet-pkixtsp-dis-tab.c ---*/ -#line 148 "packet-pkixtsp-template.c" +#line 138 "packet-pkixtsp-template.c" } diff --git a/epan/dissectors/packet-rnsap.c b/epan/dissectors/packet-rnsap.c index 0786c2be95..6591132650 100644 --- a/epan/dissectors/packet-rnsap.c +++ b/epan/dissectors/packet-rnsap.c @@ -44268,7 +44268,7 @@ void proto_register_rnsap(void) { "rnsap.Outcome_value", HFILL }}, /*--- End of included file: packet-rnsap-hfarr.c ---*/ -#line 143 "packet-rnsap-template.c" +#line 142 "packet-rnsap-template.c" }; /* List of subtrees */ @@ -45332,7 +45332,7 @@ void proto_register_rnsap(void) { &ett_rnsap_Outcome, /*--- End of included file: packet-rnsap-ettarr.c ---*/ -#line 149 "packet-rnsap-template.c" +#line 148 "packet-rnsap-template.c" }; @@ -46042,7 +46042,7 @@ proto_reg_handoff_rnsap(void) /*--- End of included file: packet-rnsap-dis-tab.c ---*/ -#line 188 "packet-rnsap-template.c" +#line 187 "packet-rnsap-template.c" } diff --git a/epan/dissectors/packet-ros.c b/epan/dissectors/packet-ros.c index c11047c860..4d60d1d305 100644 --- a/epan/dissectors/packet-ros.c +++ b/epan/dissectors/packet-ros.c @@ -1240,7 +1240,7 @@ void proto_register_ros(void) { "ros.OBJECT_IDENTIFIER", HFILL }}, /*--- End of included file: packet-ros-hfarr.c ---*/ -#line 505 "packet-ros-template.c" +#line 503 "packet-ros-template.c" }; /* List of subtrees */ @@ -1261,7 +1261,7 @@ void proto_register_ros(void) { &ett_ros_Code, /*--- End of included file: packet-ros-ettarr.c ---*/ -#line 512 "packet-ros-template.c" +#line 510 "packet-ros-template.c" }; /* Register protocol */ diff --git a/epan/dissectors/packet-rrc.c b/epan/dissectors/packet-rrc.c index 9998ce64fc..4fbb53914e 100644 --- a/epan/dissectors/packet-rrc.c +++ b/epan/dissectors/packet-rrc.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-rrc.c */ -/* ../../tools/asn2wrs.py -p rrc -c rrc.cnf -s packet-rrc-template Class-definitions.asn PDU-definitions.asn InformationElements.asn Constant-definitions.asn Internode-definitions.asn */ +/* ../../tools/asn2wrs.py -p rrc -c ./rrc.cnf -s ./packet-rrc-template -D . Class-definitions.asn PDU-definitions.asn InformationElements.asn Constant-definitions.asn Internode-definitions.asn */ /* Input file: packet-rrc-template.c */ @@ -21972,7 +21972,7 @@ static const per_choice_t AssistanceDataDelivery_choice[] = { static int dissect_rrc_AssistanceDataDelivery(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 125 "rrc.cnf" +#line 119 "rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "AssistanceDataDelivery"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_AssistanceDataDelivery, AssistanceDataDelivery_choice, @@ -22370,7 +22370,7 @@ static const per_choice_t CellChangeOrderFromUTRAN_choice[] = { static int dissect_rrc_CellChangeOrderFromUTRAN(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 131 "rrc.cnf" +#line 123 "rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "CellChangeOrderFromUTRAN"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_CellChangeOrderFromUTRAN, CellChangeOrderFromUTRAN_choice, @@ -39592,7 +39592,7 @@ static const per_choice_t CellUpdateConfirm_choice[] = { static int dissect_rrc_CellUpdateConfirm(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 155 "rrc.cnf" +#line 139 "rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "CellUpdateConfirm"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_CellUpdateConfirm, CellUpdateConfirm_choice, @@ -39745,7 +39745,7 @@ static const per_choice_t CounterCheck_choice[] = { static int dissect_rrc_CounterCheck(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 161 "rrc.cnf" +#line 143 "rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "CounterCheck"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_CounterCheck, CounterCheck_choice, @@ -39878,7 +39878,7 @@ static const per_choice_t DownlinkDirectTransfer_choice[] = { static int dissect_rrc_DownlinkDirectTransfer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 173 "rrc.cnf" +#line 151 "rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "DownlinkDirectTransfer"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_DownlinkDirectTransfer, DownlinkDirectTransfer_choice, @@ -39897,7 +39897,7 @@ static const per_sequence_t T_single_GSM_Message_r3_sequence[] = { static int dissect_rrc_T_single_GSM_Message_r3(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 597 "rrc.cnf" +#line 439 "rrc.cnf" tvbuff_t *gsm_message_tvb=NULL; guint bits_remaining, whole_octets_remaining; @@ -39922,7 +39922,7 @@ dissect_rrc_T_single_GSM_Message_r3(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_ static int dissect_rrc_GSM_MessageList_item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 589 "rrc.cnf" +#line 431 "rrc.cnf" tvbuff_t *gsm_messagelist_tvb=NULL; offset = dissect_per_bit_string(tvb, offset, actx, tree, hf_index, @@ -40148,7 +40148,7 @@ static const per_sequence_t T_single_GSM_Message_r6_sequence[] = { static int dissect_rrc_T_single_GSM_Message_r6(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 611 "rrc.cnf" +#line 453 "rrc.cnf" tvbuff_t *gsm_message_tvb=NULL; guint bits_remaining, whole_octets_remaining; @@ -40339,7 +40339,7 @@ static const per_choice_t HandoverFromUTRANCommand_GSM_choice[] = { static int dissect_rrc_HandoverFromUTRANCommand_GSM(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 191 "rrc.cnf" +#line 163 "rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "HandoverFromUTRANCommand-GSM"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_HandoverFromUTRANCommand_GSM, HandoverFromUTRANCommand_GSM_choice, @@ -40493,7 +40493,7 @@ static const per_choice_t HandoverFromUTRANCommand_CDMA2000_choice[] = { static int dissect_rrc_HandoverFromUTRANCommand_CDMA2000(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 197 "rrc.cnf" +#line 167 "rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "HandoverFromUTRANCommand-CDMA2000"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_HandoverFromUTRANCommand_CDMA2000, HandoverFromUTRANCommand_CDMA2000_choice, @@ -47651,7 +47651,7 @@ static const per_choice_t MeasurementControl_choice[] = { static int dissect_rrc_MeasurementControl(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 275 "rrc.cnf" +#line 219 "rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "MeasurementControl"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_MeasurementControl, MeasurementControl_choice, @@ -47743,7 +47743,7 @@ static const per_sequence_t PagingType2_sequence[] = { static int dissect_rrc_PagingType2(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 299 "rrc.cnf" +#line 235 "rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "PagingType2"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_PagingType2, PagingType2_sequence); @@ -48772,7 +48772,7 @@ static const per_choice_t PhysicalChannelReconfiguration_choice[] = { static int dissect_rrc_PhysicalChannelReconfiguration(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 305 "rrc.cnf" +#line 239 "rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "PhysicalChannelReconfiguration"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_PhysicalChannelReconfiguration, PhysicalChannelReconfiguration_choice, @@ -50076,7 +50076,7 @@ static const per_choice_t PhysicalSharedChannelAllocation_choice[] = { static int dissect_rrc_PhysicalSharedChannelAllocation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 323 "rrc.cnf" +#line 251 "rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "PhysicalSharedChannelAllocation"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_PhysicalSharedChannelAllocation, PhysicalSharedChannelAllocation_choice, @@ -51944,7 +51944,7 @@ static const per_choice_t RadioBearerReconfiguration_choice[] = { static int dissect_rrc_RadioBearerReconfiguration(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 335 "rrc.cnf" +#line 259 "rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "RadioBearerReconfiguration"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_RadioBearerReconfiguration, RadioBearerReconfiguration_choice, @@ -53126,7 +53126,7 @@ static const per_choice_t RadioBearerRelease_choice[] = { static int dissect_rrc_RadioBearerRelease(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 353 "rrc.cnf" +#line 271 "rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "RadioBearerRelease"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_RadioBearerRelease, RadioBearerRelease_choice, @@ -55331,7 +55331,7 @@ static const per_choice_t RadioBearerSetup_choice[] = { static int dissect_rrc_RadioBearerSetup(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 371 "rrc.cnf" +#line 283 "rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "RadioBearerSetup"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_RadioBearerSetup, RadioBearerSetup_choice, @@ -55850,7 +55850,7 @@ static const per_choice_t RRCConnectionRelease_choice[] = { static int dissect_rrc_RRCConnectionRelease(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 395 "rrc.cnf" +#line 299 "rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionRelease"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_RRCConnectionRelease, RRCConnectionRelease_choice, @@ -56129,7 +56129,7 @@ static const per_choice_t SecurityModeCommand_choice[] = { static int dissect_rrc_SecurityModeCommand(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 437 "rrc.cnf" +#line 327 "rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "SecurityModeCommand"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_SecurityModeCommand, SecurityModeCommand_choice, @@ -56242,7 +56242,7 @@ static const per_choice_t SignallingConnectionRelease_choice[] = { static int dissect_rrc_SignallingConnectionRelease(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 455 "rrc.cnf" +#line 339 "rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "SignallingConnectionRelease"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_SignallingConnectionRelease, SignallingConnectionRelease_choice, @@ -57417,7 +57417,7 @@ static const per_choice_t TransportChannelReconfiguration_choice[] = { static int dissect_rrc_TransportChannelReconfiguration(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 485 "rrc.cnf" +#line 359 "rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "TransportChannelReconfiguration"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_TransportChannelReconfiguration, TransportChannelReconfiguration_choice, @@ -57562,7 +57562,7 @@ static const per_sequence_t TransportFormatCombinationControl_sequence[] = { static int dissect_rrc_TransportFormatCombinationControl(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 503 "rrc.cnf" +#line 371 "rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "TransportFormatCombinationControl"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_TransportFormatCombinationControl, TransportFormatCombinationControl_sequence); @@ -57849,7 +57849,7 @@ static const per_choice_t UECapabilityEnquiry_choice[] = { static int dissect_rrc_UECapabilityEnquiry(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 515 "rrc.cnf" +#line 379 "rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "UECapabilityEnquiry"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_UECapabilityEnquiry, UECapabilityEnquiry_choice, @@ -58007,7 +58007,7 @@ static const per_choice_t UECapabilityInformationConfirm_choice[] = { static int dissect_rrc_UECapabilityInformationConfirm(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 527 "rrc.cnf" +#line 387 "rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "UECapabilityInformationConfirm"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_UECapabilityInformationConfirm, UECapabilityInformationConfirm_choice, @@ -58771,7 +58771,7 @@ static const per_choice_t UplinkPhysicalChannelControl_choice[] = { static int dissect_rrc_UplinkPhysicalChannelControl(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 539 "rrc.cnf" +#line 395 "rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "UplinkPhysicalChannelControl"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_UplinkPhysicalChannelControl, UplinkPhysicalChannelControl_choice, @@ -59083,7 +59083,7 @@ static const per_choice_t URAUpdateConfirm_choice[] = { static int dissect_rrc_URAUpdateConfirm(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 551 "rrc.cnf" +#line 403 "rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "URAUpdateConfirm"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_URAUpdateConfirm, URAUpdateConfirm_choice, @@ -60077,7 +60077,7 @@ static const per_choice_t UTRANMobilityInformation_choice[] = { static int dissect_rrc_UTRANMobilityInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 563 "rrc.cnf" +#line 411 "rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "UTRANMobilityInformation"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_UTRANMobilityInformation, UTRANMobilityInformation_choice, @@ -60264,7 +60264,7 @@ static const per_sequence_t HandoverFromUTRANCommand_GERANIu_sequence[] = { static int dissect_rrc_HandoverFromUTRANCommand_GERANIu(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 185 "rrc.cnf" +#line 159 "rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "HandoverFromUTRANCommand-GERANIu"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_HandoverFromUTRANCommand_GERANIu, HandoverFromUTRANCommand_GERANIu_sequence); @@ -60633,7 +60633,7 @@ static const per_sequence_t MBMSModifiedServicesInformation_sequence[] = { static int dissect_rrc_MBMSModifiedServicesInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 251 "rrc.cnf" +#line 203 "rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "MBMSModifiedServicesInformation"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_MBMSModifiedServicesInformation, MBMSModifiedServicesInformation_sequence); @@ -60835,7 +60835,7 @@ static const per_sequence_t ActiveSetUpdateComplete_sequence[] = { static int dissect_rrc_ActiveSetUpdateComplete(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 113 "rrc.cnf" +#line 111 "rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "ActiveSetUpdateComplete"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_ActiveSetUpdateComplete, ActiveSetUpdateComplete_sequence); @@ -61006,7 +61006,7 @@ static const per_sequence_t ActiveSetUpdateFailure_sequence[] = { static int dissect_rrc_ActiveSetUpdateFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 119 "rrc.cnf" +#line 115 "rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "ActiveSetUpdateFailure"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_ActiveSetUpdateFailure, ActiveSetUpdateFailure_sequence); @@ -61153,7 +61153,7 @@ static const per_choice_t CellChangeOrderFromUTRANFailure_choice[] = { static int dissect_rrc_CellChangeOrderFromUTRANFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 137 "rrc.cnf" +#line 127 "rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "CellChangeOrderFromUTRANFailure"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_CellChangeOrderFromUTRANFailure, CellChangeOrderFromUTRANFailure_choice, @@ -61243,7 +61243,7 @@ static const per_sequence_t CounterCheckResponse_sequence[] = { static int dissect_rrc_CounterCheckResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 167 "rrc.cnf" +#line 147 "rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "CounterCheckResponse"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_CounterCheckResponse, CounterCheckResponse_sequence); @@ -61292,7 +61292,7 @@ static const per_sequence_t HandoverToUTRANComplete_sequence[] = { static int dissect_rrc_HandoverToUTRANComplete(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 179 "rrc.cnf" +#line 155 "rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "HandoverToUTRANComplete"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_HandoverToUTRANComplete, HandoverToUTRANComplete_sequence); @@ -62175,7 +62175,7 @@ static const per_sequence_t InitialDirectTransfer_sequence[] = { static int dissect_rrc_InitialDirectTransfer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 209 "rrc.cnf" +#line 175 "rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "InitialDirectTransfer"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_InitialDirectTransfer, InitialDirectTransfer_sequence); @@ -62354,7 +62354,7 @@ static const per_sequence_t HandoverFromUTRANFailure_sequence[] = { static int dissect_rrc_HandoverFromUTRANFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 203 "rrc.cnf" +#line 171 "rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "HandoverFromUTRANFailure"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_HandoverFromUTRANFailure, HandoverFromUTRANFailure_sequence); @@ -62432,7 +62432,7 @@ static const per_sequence_t MeasurementControlFailure_sequence[] = { static int dissect_rrc_MeasurementControlFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 281 "rrc.cnf" +#line 223 "rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "MeasurementControlFailure"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_MeasurementControlFailure, MeasurementControlFailure_sequence); @@ -65781,7 +65781,7 @@ static const per_sequence_t MeasurementReport_sequence[] = { static int dissect_rrc_MeasurementReport(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 287 "rrc.cnf" +#line 227 "rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "MeasurementReport"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_MeasurementReport, MeasurementReport_sequence); @@ -65879,7 +65879,7 @@ static const per_sequence_t PhysicalChannelReconfigurationComplete_sequence[] = static int dissect_rrc_PhysicalChannelReconfigurationComplete(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 311 "rrc.cnf" +#line 243 "rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "PhysicalChannelReconfigurationComplete"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_PhysicalChannelReconfigurationComplete, PhysicalChannelReconfigurationComplete_sequence); @@ -65928,7 +65928,7 @@ static const per_sequence_t PhysicalChannelReconfigurationFailure_sequence[] = { static int dissect_rrc_PhysicalChannelReconfigurationFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 317 "rrc.cnf" +#line 247 "rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "PhysicalChannelReconfigurationFailure"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_PhysicalChannelReconfigurationFailure, PhysicalChannelReconfigurationFailure_sequence); @@ -66026,7 +66026,7 @@ static const per_sequence_t RadioBearerReconfigurationComplete_sequence[] = { static int dissect_rrc_RadioBearerReconfigurationComplete(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 341 "rrc.cnf" +#line 263 "rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "RadioBearerReconfigurationComplete"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_RadioBearerReconfigurationComplete, RadioBearerReconfigurationComplete_sequence); @@ -66090,7 +66090,7 @@ static const per_sequence_t RadioBearerReconfigurationFailure_sequence[] = { static int dissect_rrc_RadioBearerReconfigurationFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 347 "rrc.cnf" +#line 267 "rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "RadioBearerReconfigurationFailure"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_RadioBearerReconfigurationFailure, RadioBearerReconfigurationFailure_sequence); @@ -66188,7 +66188,7 @@ static const per_sequence_t RadioBearerReleaseComplete_sequence[] = { static int dissect_rrc_RadioBearerReleaseComplete(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 359 "rrc.cnf" +#line 275 "rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "RadioBearerReleaseComplete"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_RadioBearerReleaseComplete, RadioBearerReleaseComplete_sequence); @@ -66238,7 +66238,7 @@ static const per_sequence_t RadioBearerReleaseFailure_sequence[] = { static int dissect_rrc_RadioBearerReleaseFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 365 "rrc.cnf" +#line 279 "rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "RadioBearerReleaseFailure"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_RadioBearerReleaseFailure, RadioBearerReleaseFailure_sequence); @@ -66337,7 +66337,7 @@ static const per_sequence_t RadioBearerSetupComplete_sequence[] = { static int dissect_rrc_RadioBearerSetupComplete(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 377 "rrc.cnf" +#line 287 "rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "RadioBearerSetupComplete"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_RadioBearerSetupComplete, RadioBearerSetupComplete_sequence); @@ -66387,7 +66387,7 @@ static const per_sequence_t RadioBearerSetupFailure_sequence[] = { static int dissect_rrc_RadioBearerSetupFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 383 "rrc.cnf" +#line 291 "rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "RadioBearerSetupFailure"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_RadioBearerSetupFailure, RadioBearerSetupFailure_sequence); @@ -66436,7 +66436,7 @@ static const per_sequence_t RRCConnectionReleaseComplete_sequence[] = { static int dissect_rrc_RRCConnectionReleaseComplete(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 407 "rrc.cnf" +#line 307 "rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionReleaseComplete"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_RRCConnectionReleaseComplete, RRCConnectionReleaseComplete_sequence); @@ -68862,7 +68862,7 @@ static const per_sequence_t RRCConnectionSetupComplete_sequence[] = { static int dissect_rrc_RRCConnectionSetupComplete(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 425 "rrc.cnf" +#line 319 "rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionSetupComplete"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_RRCConnectionSetupComplete, RRCConnectionSetupComplete_sequence); @@ -69041,7 +69041,7 @@ static const per_sequence_t RRCStatus_sequence[] = { static int dissect_rrc_RRCStatus(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 431 "rrc.cnf" +#line 323 "rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCStatus"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_RRCStatus, RRCStatus_sequence); @@ -69091,7 +69091,7 @@ static const per_sequence_t SecurityModeComplete_sequence[] = { static int dissect_rrc_SecurityModeComplete(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 443 "rrc.cnf" +#line 331 "rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "SecurityModeComplete"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_SecurityModeComplete, SecurityModeComplete_sequence); @@ -69140,7 +69140,7 @@ static const per_sequence_t SecurityModeFailure_sequence[] = { static int dissect_rrc_SecurityModeFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 449 "rrc.cnf" +#line 335 "rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "SecurityModeFailure"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_SecurityModeFailure, SecurityModeFailure_sequence); @@ -69188,7 +69188,7 @@ static const per_sequence_t SignallingConnectionReleaseIndication_sequence[] = { static int dissect_rrc_SignallingConnectionReleaseIndication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 461 "rrc.cnf" +#line 343 "rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "SignallingConnectionReleaseIndication"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_SignallingConnectionReleaseIndication, SignallingConnectionReleaseIndication_sequence); @@ -69286,7 +69286,7 @@ static const per_sequence_t TransportChannelReconfigurationComplete_sequence[] = static int dissect_rrc_TransportChannelReconfigurationComplete(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 491 "rrc.cnf" +#line 363 "rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "TransportChannelReconfigurationComplete"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_TransportChannelReconfigurationComplete, TransportChannelReconfigurationComplete_sequence); @@ -69335,7 +69335,7 @@ static const per_sequence_t TransportChannelReconfigurationFailure_sequence[] = static int dissect_rrc_TransportChannelReconfigurationFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 497 "rrc.cnf" +#line 367 "rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "TransportChannelReconfigurationFailure"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_TransportChannelReconfigurationFailure, TransportChannelReconfigurationFailure_sequence); @@ -69384,7 +69384,7 @@ static const per_sequence_t TransportFormatCombinationControlFailure_sequence[] static int dissect_rrc_TransportFormatCombinationControlFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 509 "rrc.cnf" +#line 375 "rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "TransportFormatCombinationControlFailure"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_TransportFormatCombinationControlFailure, TransportFormatCombinationControlFailure_sequence); @@ -69660,7 +69660,7 @@ static const per_sequence_t UECapabilityInformation_sequence[] = { static int dissect_rrc_UECapabilityInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 521 "rrc.cnf" +#line 383 "rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "UECapabilityInformation"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_UECapabilityInformation, UECapabilityInformation_sequence); @@ -69739,7 +69739,7 @@ static const per_sequence_t UplinkDirectTransfer_sequence[] = { static int dissect_rrc_UplinkDirectTransfer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 533 "rrc.cnf" +#line 391 "rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "UplinkDirectTransfer"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_UplinkDirectTransfer, UplinkDirectTransfer_sequence); @@ -69835,7 +69835,7 @@ static const per_sequence_t UTRANMobilityInformationConfirm_sequence[] = { static int dissect_rrc_UTRANMobilityInformationConfirm(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 569 "rrc.cnf" +#line 415 "rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "UTRANMobilityInformationConfirm"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_UTRANMobilityInformationConfirm, UTRANMobilityInformationConfirm_sequence); @@ -69884,7 +69884,7 @@ static const per_sequence_t UTRANMobilityInformationFailure_sequence[] = { static int dissect_rrc_UTRANMobilityInformationFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 575 "rrc.cnf" +#line 419 "rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "UTRANMobilityInformationFailure"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_UTRANMobilityInformationFailure, UTRANMobilityInformationFailure_sequence); @@ -70041,7 +70041,7 @@ static const per_sequence_t MBMSModificationRequest_sequence[] = { static int dissect_rrc_MBMSModificationRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 245 "rrc.cnf" +#line 199 "rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "MBMSModificationRequest"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_MBMSModificationRequest, MBMSModificationRequest_sequence); @@ -70685,7 +70685,7 @@ static const per_choice_t CellUpdateConfirm_CCCH_choice[] = { static int dissect_rrc_CellUpdateConfirm_CCCH(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 149 "rrc.cnf" +#line 135 "rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "CellUpdateConfirm-CCCH"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_CellUpdateConfirm_CCCH, CellUpdateConfirm_CCCH_choice, @@ -71110,7 +71110,7 @@ static const per_choice_t RRCConnectionReject_choice[] = { static int dissect_rrc_RRCConnectionReject(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 389 "rrc.cnf" +#line 295 "rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionReject"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_RRCConnectionReject, RRCConnectionReject_choice, @@ -71652,7 +71652,7 @@ static const per_choice_t RRCConnectionRelease_CCCH_choice[] = { static int dissect_rrc_RRCConnectionRelease_CCCH(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 401 "rrc.cnf" +#line 303 "rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionRelease-CCCH"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_RRCConnectionRelease_CCCH, RRCConnectionRelease_CCCH_choice, @@ -72985,7 +72985,7 @@ static const per_choice_t RRCConnectionSetup_choice[] = { static int dissect_rrc_RRCConnectionSetup(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 419 "rrc.cnf" +#line 315 "rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionSetup"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_RRCConnectionSetup, RRCConnectionSetup_choice, @@ -73114,7 +73114,7 @@ static const per_choice_t URAUpdateConfirm_CCCH_choice[] = { static int dissect_rrc_URAUpdateConfirm_CCCH(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 557 "rrc.cnf" +#line 407 "rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "URAUpdateConfirm-CCCH"); offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_rrc_URAUpdateConfirm_CCCH, URAUpdateConfirm_CCCH_choice, @@ -73528,7 +73528,7 @@ static const per_sequence_t CellUpdate_sequence[] = { static int dissect_rrc_CellUpdate(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 143 "rrc.cnf" +#line 131 "rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "CellUpdate"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_CellUpdate, CellUpdate_sequence); @@ -73928,7 +73928,7 @@ static const per_sequence_t RRCConnectionRequest_sequence[] = { static int dissect_rrc_RRCConnectionRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 413 "rrc.cnf" +#line 311 "rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionRequest"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_RRCConnectionRequest, RRCConnectionRequest_sequence); @@ -74093,7 +74093,7 @@ static const per_sequence_t URAUpdate_sequence[] = { static int dissect_rrc_URAUpdate(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 545 "rrc.cnf" +#line 399 "rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "URAUpdate"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_URAUpdate, URAUpdate_sequence); @@ -74487,7 +74487,7 @@ static const per_sequence_t PagingType1_sequence[] = { static int dissect_rrc_PagingType1(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 293 "rrc.cnf" +#line 231 "rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "PagingType1"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_PagingType1, PagingType1_sequence); @@ -74692,7 +74692,7 @@ static const per_sequence_t PUSCHCapacityRequest_sequence[] = { static int dissect_rrc_PUSCHCapacityRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 329 "rrc.cnf" +#line 255 "rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "PUSCHCapacityRequest"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_PUSCHCapacityRequest, PUSCHCapacityRequest_sequence); @@ -75068,7 +75068,7 @@ static const per_sequence_t SystemInformation_FACH_sequence[] = { static int dissect_rrc_SystemInformation_FACH(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 473 "rrc.cnf" +#line 351 "rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "SystemInformation-FACH"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_SystemInformation_FACH, SystemInformation_FACH_sequence); @@ -75116,7 +75116,7 @@ static const per_sequence_t SystemInformationChangeIndication_sequence[] = { static int dissect_rrc_SystemInformationChangeIndication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 479 "rrc.cnf" +#line 355 "rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "SystemInformationChangeIndication"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_SystemInformationChangeIndication, SystemInformationChangeIndication_sequence); @@ -75297,7 +75297,7 @@ static const per_sequence_t SystemInformation_BCH_sequence[] = { static int dissect_rrc_SystemInformation_BCH(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 467 "rrc.cnf" +#line 347 "rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "SystemInformation-BCH"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_SystemInformation_BCH, SystemInformation_BCH_sequence); @@ -75437,7 +75437,7 @@ static const per_sequence_t MBMSAccessInformation_sequence[] = { static int dissect_rrc_MBMSAccessInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 215 "rrc.cnf" +#line 179 "rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "MBMSAccessInformation"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_MBMSAccessInformation, MBMSAccessInformation_sequence); @@ -76171,7 +76171,7 @@ static const per_sequence_t MBMSCommonPTMRBInformation_sequence[] = { static int dissect_rrc_MBMSCommonPTMRBInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 221 "rrc.cnf" +#line 183 "rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "MBMSCommonPTMRBInformation"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_MBMSCommonPTMRBInformation, MBMSCommonPTMRBInformation_sequence); @@ -76559,7 +76559,7 @@ static const per_sequence_t MBMSCurrentCellPTMRBInformation_sequence[] = { static int dissect_rrc_MBMSCurrentCellPTMRBInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 227 "rrc.cnf" +#line 187 "rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "MBMSCurrentCellPTMRBInformation"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_MBMSCurrentCellPTMRBInformation, MBMSCurrentCellPTMRBInformation_sequence); @@ -77143,7 +77143,7 @@ static const per_sequence_t MBMSGeneralInformation_sequence[] = { static int dissect_rrc_MBMSGeneralInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 239 "rrc.cnf" +#line 195 "rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "MBMSGeneralInformation"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_MBMSGeneralInformation, MBMSGeneralInformation_sequence); @@ -77817,7 +77817,7 @@ static const per_sequence_t MBMSNeighbouringCellPTMRBInformation_sequence[] = { static int dissect_rrc_MBMSNeighbouringCellPTMRBInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 257 "rrc.cnf" +#line 207 "rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "MBMSNeighbouringCellPTMRBInformation"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_MBMSNeighbouringCellPTMRBInformation, MBMSNeighbouringCellPTMRBInformation_sequence); @@ -77954,7 +77954,7 @@ static const per_sequence_t MBMSUnmodifiedServicesInformation_sequence[] = { static int dissect_rrc_MBMSUnmodifiedServicesInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 269 "rrc.cnf" +#line 215 "rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "MBMSUnmodifiedServicesInformation"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_MBMSUnmodifiedServicesInformation, MBMSUnmodifiedServicesInformation_sequence); @@ -78110,7 +78110,7 @@ static const per_sequence_t MBMSSchedulingInformation_sequence[] = { static int dissect_rrc_MBMSSchedulingInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 263 "rrc.cnf" +#line 211 "rrc.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, "MBMSSchedulingInformation"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rrc_MBMSSchedulingInformation, MBMSSchedulingInformation_sequence); @@ -98763,7 +98763,7 @@ dissect_rrc_ToTargetRNC_Container(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t static int dissect_rrc_T_dL_DCCHmessage(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 581 "rrc.cnf" +#line 423 "rrc.cnf" tvbuff_t *dl_dcch_message_tvb=NULL; offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, @@ -126433,7 +126433,7 @@ void proto_register_rrc(void) { NULL, HFILL }}, /*--- End of included file: packet-rrc-hfarr.c ---*/ -#line 128 "packet-rrc-template.c" +#line 127 "packet-rrc-template.c" { &hf_test, { "RAB Test", "rrc.RAB.test", FT_UINT8, BASE_DEC, NULL, 0, @@ -130698,7 +130698,7 @@ void proto_register_rrc(void) { &ett_rrc_UL_RFC3095_Context, /*--- End of included file: packet-rrc-ettarr.c ---*/ -#line 139 "packet-rrc-template.c" +#line 138 "packet-rrc-template.c" }; @@ -130772,7 +130772,7 @@ void proto_register_rrc(void) { /*--- End of included file: packet-rrc-dis-reg.c ---*/ -#line 151 "packet-rrc-template.c" +#line 150 "packet-rrc-template.c" } diff --git a/epan/dissectors/packet-rrc.h b/epan/dissectors/packet-rrc.h index 997a94dd6b..853db90cf5 100644 --- a/epan/dissectors/packet-rrc.h +++ b/epan/dissectors/packet-rrc.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-rrc.h */ -/* ../../tools/asn2wrs.py -p rrc -c rrc.cnf -s packet-rrc-template Class-definitions.asn PDU-definitions.asn InformationElements.asn Constant-definitions.asn Internode-definitions.asn */ +/* ../../tools/asn2wrs.py -p rrc -c ./rrc.cnf -s ./packet-rrc-template -D . Class-definitions.asn PDU-definitions.asn InformationElements.asn Constant-definitions.asn Internode-definitions.asn */ /* Input file: packet-rrc-template.h */ diff --git a/epan/dissectors/packet-rrlp.c b/epan/dissectors/packet-rrlp.c index 5790f2684d..877fafb0d3 100644 --- a/epan/dissectors/packet-rrlp.c +++ b/epan/dissectors/packet-rrlp.c @@ -762,7 +762,7 @@ dissect_rrlp_ExtensionContainer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *a static int dissect_rrlp_Ext_GeographicalInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 35 "rrlp.cnf" +#line 34 "rrlp.cnf" tvbuff_t *parameter_tvb = NULL; diff --git a/epan/dissectors/packet-rtse.c b/epan/dissectors/packet-rtse.c index d1a999d44c..e1013406e2 100644 --- a/epan/dissectors/packet-rtse.c +++ b/epan/dissectors/packet-rtse.c @@ -953,7 +953,7 @@ void proto_register_rtse(void) { "rtse.T_octetString", HFILL }}, /*--- End of included file: packet-rtse-hfarr.c ---*/ -#line 348 "packet-rtse-template.c" +#line 346 "packet-rtse-template.c" }; /* List of subtrees */ @@ -975,7 +975,7 @@ void proto_register_rtse(void) { &ett_rtse_CallingSSuserReference, /*--- End of included file: packet-rtse-ettarr.c ---*/ -#line 357 "packet-rtse-template.c" +#line 355 "packet-rtse-template.c" }; module_t *rtse_module; diff --git a/epan/dissectors/packet-s4406.c b/epan/dissectors/packet-s4406.c index c948837ace..1b54301c81 100644 --- a/epan/dissectors/packet-s4406.c +++ b/epan/dissectors/packet-s4406.c @@ -1144,7 +1144,7 @@ void proto_register_s4406(void) { NULL, HFILL }}, /*--- End of included file: packet-s4406-hfarr.c ---*/ -#line 95 "packet-s4406-template.c" +#line 93 "packet-s4406-template.c" }; /* List of subtrees */ @@ -1176,7 +1176,7 @@ void proto_register_s4406(void) { &ett_s4406_BodyPartSecurityLabel, /*--- End of included file: packet-s4406-ettarr.c ---*/ -#line 101 "packet-s4406-template.c" +#line 99 "packet-s4406-template.c" }; /* Register protocol */ @@ -1218,7 +1218,7 @@ void proto_reg_handoff_s4406(void) { /*--- End of included file: packet-s4406-dis-tab.c ---*/ -#line 116 "packet-s4406-template.c" +#line 114 "packet-s4406-template.c" register_ber_oid_dissector("1.3.26.0.4406.0.4.1", dissect_s4406, proto_s4406, "Military Message"); diff --git a/epan/dissectors/packet-smrse.c b/epan/dissectors/packet-smrse.c index 7f6e9471b2..abb5a313f9 100644 --- a/epan/dissectors/packet-smrse.c +++ b/epan/dissectors/packet-smrse.c @@ -699,7 +699,7 @@ void proto_register_smrse(void) { "smrse.SMS_Address", HFILL }}, /*--- End of included file: packet-smrse-hfarr.c ---*/ -#line 167 "packet-smrse-template.c" +#line 166 "packet-smrse-template.c" }; /* List of subtrees */ @@ -721,7 +721,7 @@ void proto_register_smrse(void) { &ett_smrse_RPAlertSC, /*--- End of included file: packet-smrse-ettarr.c ---*/ -#line 173 "packet-smrse-template.c" +#line 172 "packet-smrse-template.c" }; /* Register protocol */ diff --git a/epan/dissectors/packet-t125.c b/epan/dissectors/packet-t125.c index 82d4f6c2a1..b1cbeccc9e 100644 --- a/epan/dissectors/packet-t125.c +++ b/epan/dissectors/packet-t125.c @@ -2627,7 +2627,7 @@ void proto_register_t125(void) { NULL, HFILL }}, /*--- End of included file: packet-t125-hfarr.c ---*/ -#line 95 "packet-t125-template.c" +#line 89 "packet-t125-template.c" }; /* List of subtrees */ @@ -2705,7 +2705,7 @@ void proto_register_t125(void) { &ett_t125_DomainMCSPDU, /*--- End of included file: packet-t125-ettarr.c ---*/ -#line 101 "packet-t125-template.c" +#line 95 "packet-t125-template.c" }; /* Register protocol */ diff --git a/epan/dissectors/packet-t38.c b/epan/dissectors/packet-t38.c index 3583901b6d..00882688ec 100644 --- a/epan/dissectors/packet-t38.c +++ b/epan/dissectors/packet-t38.c @@ -669,7 +669,7 @@ dissect_t38_T_field_type(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_ static int dissect_t38_T_field_data(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 155 "t38.cnf" +#line 152 "t38.cnf" tvbuff_t *value_tvb = NULL; guint32 value_len; @@ -680,7 +680,7 @@ dissect_t38_T_field_data(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_ -#line 162 "t38.cnf" +#line 159 "t38.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO) && primary_part){ if(value_len < 8){ col_append_fstr(actx->pinfo->cinfo, COL_INFO, "[%s]", @@ -798,7 +798,7 @@ dissect_t38_T_seq_number(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_ offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, 0U, 65535U, &seq_number, FALSE); -#line 232 "t38.cnf" +#line 229 "t38.cnf" /* info for tap */ if (primary_part) t38_info->seq_num = seq_number; @@ -814,12 +814,12 @@ dissect_t38_T_seq_number(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_ static int dissect_t38_T_primary_ifp_packet(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 242 "t38.cnf" +#line 239 "t38.cnf" primary_part = TRUE; offset = dissect_per_open_type(tvb, offset, actx, tree, hf_index, dissect_t38_IFPPacket); -#line 244 "t38.cnf" +#line 241 "t38.cnf" /* if is a valid t38 packet, add to tap */ if (p_t38_packet_conv && (!actx->pinfo->in_error_pkt) && ((gint32) seq_number != p_t38_packet_conv_info->last_seqnum)) tap_queue_packet(t38_tap, actx->pinfo, t38_info); @@ -913,14 +913,14 @@ static const per_choice_t T_error_recovery_choice[] = { static int dissect_t38_T_error_recovery(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 252 "t38.cnf" +#line 249 "t38.cnf" primary_part = FALSE; offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_t38_T_error_recovery, T_error_recovery_choice, NULL); -#line 254 "t38.cnf" +#line 251 "t38.cnf" primary_part = TRUE; return offset; @@ -936,7 +936,7 @@ static const per_sequence_t UDPTLPacket_sequence[] = { static int dissect_t38_UDPTLPacket(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 226 "t38.cnf" +#line 223 "t38.cnf" /* Initialize to something else than data type */ Data_Field_field_type_value = 1; @@ -1322,7 +1322,7 @@ proto_register_t38(void) "t38.OCTET_STRING", HFILL }}, /*--- End of included file: packet-t38-hfarr.c ---*/ -#line 679 "packet-t38-template.c" +#line 671 "packet-t38-template.c" { &hf_t38_setup, { "Stream setup", "t38.setup", FT_STRING, BASE_NONE, NULL, 0x0, "Stream setup, method and frame number", HFILL }}, @@ -1377,7 +1377,7 @@ proto_register_t38(void) &ett_t38_T_fec_data, /*--- End of included file: packet-t38-ettarr.c ---*/ -#line 720 "packet-t38-template.c" +#line 712 "packet-t38-template.c" &ett_t38_setup, &ett_data_fragment, &ett_data_fragments diff --git a/epan/dissectors/packet-tcap.c b/epan/dissectors/packet-tcap.c index 613958d786..6939f02391 100644 --- a/epan/dissectors/packet-tcap.c +++ b/epan/dissectors/packet-tcap.c @@ -1538,7 +1538,7 @@ proto_reg_handoff_tcap(void) /*--- End of included file: packet-tcap-dis-tab.c ---*/ -#line 257 "packet-tcap-template.c" +#line 254 "packet-tcap-template.c" } static void init_tcap(void); @@ -1869,7 +1869,7 @@ proto_register_tcap(void) NULL, HFILL }}, /*--- End of included file: packet-tcap-hfarr.c ---*/ -#line 319 "packet-tcap-template.c" +#line 316 "packet-tcap-template.c" }; /* Setup protocol subtree array */ @@ -1918,7 +1918,7 @@ proto_register_tcap(void) &ett_tcap_Associate_source_diagnostic, /*--- End of included file: packet-tcap-ettarr.c ---*/ -#line 329 "packet-tcap-template.c" +#line 326 "packet-tcap-template.c" }; /*static enum_val_t tcap_options[] = { diff --git a/epan/dissectors/packet-x2ap.c b/epan/dissectors/packet-x2ap.c index d00170a2f3..523446d976 100644 --- a/epan/dissectors/packet-x2ap.c +++ b/epan/dissectors/packet-x2ap.c @@ -4690,7 +4690,7 @@ void proto_register_x2ap(void) { "x2ap.UnsuccessfulOutcome_value", HFILL }}, /*--- End of included file: packet-x2ap-hfarr.c ---*/ -#line 140 "packet-x2ap-template.c" +#line 139 "packet-x2ap-template.c" }; /* List of subtrees */ @@ -4801,7 +4801,7 @@ void proto_register_x2ap(void) { &ett_x2ap_UnsuccessfulOutcome, /*--- End of included file: packet-x2ap-ettarr.c ---*/ -#line 146 "packet-x2ap-template.c" +#line 145 "packet-x2ap-template.c" }; @@ -4900,7 +4900,7 @@ proto_reg_handoff_x2ap(void) /*--- End of included file: packet-x2ap-dis-tab.c ---*/ -#line 178 "packet-x2ap-template.c" +#line 177 "packet-x2ap-template.c" } diff --git a/epan/dissectors/packet-x411.c b/epan/dissectors/packet-x411.c index 045dfefc2c..bfc5e93837 100644 --- a/epan/dissectors/packet-x411.c +++ b/epan/dissectors/packet-x411.c @@ -502,7 +502,7 @@ static int hf_x411_UniversalOrganizationalUnitNames_item = -1; /* UniversalOrga static int hf_x411_character_encoding = -1; /* T_character_encoding */ static int hf_x411_two_octets = -1; /* BMPString_SIZE_1_ub_string_length */ static int hf_x411_four_octets = -1; /* UniversalString_SIZE_1_ub_string_length */ -static int hf_x411_iso_639_language_code = -1; /* PrintableString_SIZE_CONSTR5416640 */ +static int hf_x411_iso_639_language_code = -1; /* PrintableString_SIZE_CONSTR13894040 */ static int hf_x411_numeric_code = -1; /* AddrNumericString */ static int hf_x411_printable_code = -1; /* PrintableString_SIZE_1_ub_postal_code_length */ static int hf_x411_printable_address = -1; /* T_printable_address */ @@ -6419,7 +6419,7 @@ dissect_x411_T_character_encoding(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, static int -dissect_x411_PrintableString_SIZE_CONSTR5416640(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x411_PrintableString_SIZE_CONSTR13894040(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_restricted_string(implicit_tag, BER_UNI_TAG_PrintableString, actx, tree, tvb, offset, hf_index, NULL); @@ -6430,7 +6430,7 @@ dissect_x411_PrintableString_SIZE_CONSTR5416640(gboolean implicit_tag _U_, tvbuf static const ber_sequence_t UniversalOrBMPString_set[] = { { &hf_x411_character_encoding, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_x411_T_character_encoding }, - { &hf_x411_iso_639_language_code, BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_x411_PrintableString_SIZE_CONSTR5416640 }, + { &hf_x411_iso_639_language_code, BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_x411_PrintableString_SIZE_CONSTR13894040 }, { NULL, 0, 0, 0, NULL } }; @@ -10125,7 +10125,7 @@ void proto_register_x411(void) { { &hf_x411_iso_639_language_code, { "iso-639-language-code", "x411.iso_639_language_code", FT_STRING, BASE_NONE, NULL, 0, - "x411.PrintableString_SIZE_CONSTR5416640", HFILL }}, + "x411.PrintableString_SIZE_CONSTR13894040", HFILL }}, { &hf_x411_numeric_code, { "numeric-code", "x411.numeric_code", FT_STRING, BASE_NONE, NULL, 0, @@ -10776,7 +10776,7 @@ void proto_register_x411(void) { NULL, HFILL }}, /*--- End of included file: packet-x411-hfarr.c ---*/ -#line 256 "packet-x411-template.c" +#line 252 "packet-x411-template.c" }; /* List of subtrees */ @@ -10980,7 +10980,7 @@ void proto_register_x411(void) { &ett_x411_SEQUENCE_SIZE_1_ub_recipients_OF_PerRecipientProbeSubmissionFields, /*--- End of included file: packet-x411-ettarr.c ---*/ -#line 269 "packet-x411-template.c" +#line 265 "packet-x411-template.c" }; module_t *x411_module; @@ -11172,7 +11172,7 @@ void proto_reg_handoff_x411(void) { /*--- End of included file: packet-x411-dis-tab.c ---*/ -#line 304 "packet-x411-template.c" +#line 300 "packet-x411-template.c" /* APPLICATION CONTEXT */ diff --git a/epan/dissectors/packet-x420.c b/epan/dissectors/packet-x420.c index 806e3d7537..4ab5bb973f 100644 --- a/epan/dissectors/packet-x420.c +++ b/epan/dissectors/packet-x420.c @@ -980,7 +980,7 @@ dissect_x420_RelatedIPMsField(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int static int dissect_x420_SubjectField(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 238 "x420.cnf" +#line 236 "x420.cnf" tvbuff_t *subject=NULL; offset = dissect_ber_restricted_string(implicit_tag, BER_UNI_TAG_TeletexString, @@ -1246,7 +1246,7 @@ dissect_x420_G3FacsimileBodyPart(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i static int dissect_x420_Interchange_Data_Element(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 256 "x420.cnf" +#line 254 "x420.cnf" /* XXX Not implemented yet */ @@ -1487,7 +1487,7 @@ dissect_x420_BilaterallyDefinedBodyPart(gboolean implicit_tag _U_, tvbuff_t *tvb static int dissect_x420_NationallyDefinedBodyPart(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 259 "x420.cnf" +#line 257 "x420.cnf" /* XXX Not implemented yet */ @@ -1872,7 +1872,7 @@ static const ber_sequence_t IPN_set[] = { int dissect_x420_IPN(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 228 "x420.cnf" +#line 227 "x420.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, " Notification"); @@ -2474,7 +2474,7 @@ dissect_x420_Precedence(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset static int dissect_x420_CharacterSetRegistration(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 249 "x420.cnf" +#line 247 "x420.cnf" guint32 crs; offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, &crs); @@ -2715,7 +2715,7 @@ dissect_x420_Document_Type_Name(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in static int dissect_x420_T_parameter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 262 "x420.cnf" +#line 260 "x420.cnf" /* XXX: Not implemented yet */ @@ -2871,7 +2871,7 @@ dissect_x420_EnvironmentParameter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, static int dissect_x420_T_compression_algorithm_id(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 265 "x420.cnf" +#line 263 "x420.cnf" offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_index, &object_identifier_id); @@ -2883,7 +2883,7 @@ dissect_x420_T_compression_algorithm_id(gboolean implicit_tag _U_, tvbuff_t *tvb static int dissect_x420_T_compression_algorithm_param(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 268 "x420.cnf" +#line 266 "x420.cnf" /* XXX: Not implemented yet */ @@ -5822,7 +5822,7 @@ void proto_register_x420(void) { NULL, HFILL }}, /*--- End of included file: packet-x420-hfarr.c ---*/ -#line 129 "packet-x420-template.c" +#line 127 "packet-x420-template.c" }; /* List of subtrees */ @@ -5958,7 +5958,7 @@ void proto_register_x420(void) { &ett_x420_T_choice, /*--- End of included file: packet-x420-ettarr.c ---*/ -#line 135 "packet-x420-template.c" +#line 133 "packet-x420-template.c" }; /* Register protocol */ @@ -6078,7 +6078,7 @@ void proto_reg_handoff_x420(void) { /*--- End of included file: packet-x420-dis-tab.c ---*/ -#line 151 "packet-x420-template.c" +#line 149 "packet-x420-template.c" register_ber_oid_dissector("2.6.1.10.0", dissect_x420, proto_x420, "InterPersonal Message (1984)"); register_ber_oid_dissector("2.6.1.10.1", dissect_x420, proto_x420, "InterPersonal Message (1988)"); diff --git a/epan/dissectors/packet-x509af.c b/epan/dissectors/packet-x509af.c index 990ccc1a03..6c3cbcc8b9 100644 --- a/epan/dissectors/packet-x509af.c +++ b/epan/dissectors/packet-x509af.c @@ -1234,7 +1234,7 @@ void proto_register_x509af(void) { "x509af.INTEGER", HFILL }}, /*--- End of included file: packet-x509af-hfarr.c ---*/ -#line 109 "packet-x509af-template.c" +#line 104 "packet-x509af-template.c" }; /* List of subtrees */ @@ -1277,7 +1277,7 @@ void proto_register_x509af(void) { &ett_x509af_DSS_Params, /*--- End of included file: packet-x509af-ettarr.c ---*/ -#line 115 "packet-x509af-template.c" +#line 110 "packet-x509af-template.c" }; /* Register protocol */ @@ -1311,7 +1311,7 @@ void proto_reg_handoff_x509af(void) { /*--- End of included file: packet-x509af-dis-tab.c ---*/ -#line 135 "packet-x509af-template.c" +#line 130 "packet-x509af-template.c" /*XXX these should really go to a better place but since that I have not that ITU standard, ill put it here for the time |