Fix bug 5848, "https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5848", which was apparently introduced with r27287 (http://anonsvn.wireshark.org/viewvc/trunk/epan/dissectors/packet-h225.c?r1=26698&r2=27287). Regenerate the packet-h225.c dissector. Patch from ericn1234@yahoo.com.
Reference: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5848 svn path=/trunk/; revision=38399
This commit is contained in:
Chris Maynard
parent
c98835cc92
commit
352cc7a410
|
|
@ -284,11 +284,15 @@ IsupNumber/nationalStandardPartyNumber isupNationalStandardPartyNumber
|
|||
#.FN_BODY RasMessage VAL_PTR = &rasmessage_value
|
||||
gint32 rasmessage_value;
|
||||
|
||||
call_id_guid = NULL;
|
||||
%(DEFAULT_BODY)s
|
||||
col_add_fstr(%(ACTX)s->pinfo->cinfo, COL_INFO, "RAS: %%s ",
|
||||
val_to_str(rasmessage_value, h225_RasMessage_vals, "<unknown>"));
|
||||
|
||||
h225_pi->msg_tag = rasmessage_value;
|
||||
if (call_id_guid) {
|
||||
h225_pi->guid = *call_id_guid;
|
||||
}
|
||||
#.END
|
||||
#----------------------------------------------------------------------------------------
|
||||
#.FN_HDR DestinationInfo/_item
|
||||
|
|
|
|||
|
|
@ -1186,7 +1186,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 318 "../../asn1/h225/h225.cnf"
|
||||
#line 322 "../../asn1/h225/h225.cnf"
|
||||
tvbuff_t *value_tvb;
|
||||
|
||||
ipv4_address = 0;
|
||||
|
|
@ -1426,7 +1426,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 608 "../../asn1/h225/h225.cnf"
|
||||
#line 612 "../../asn1/h225/h225.cnf"
|
||||
t35CountryCode = 0;
|
||||
t35Extension = 0;
|
||||
manufacturerCode = 0;
|
||||
|
|
@ -1434,7 +1434,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 612 "../../asn1/h225/h225.cnf"
|
||||
#line 616 "../../asn1/h225/h225.cnf"
|
||||
h221NonStandard = ((t35CountryCode * 256) + t35Extension) * 65536 + manufacturerCode;
|
||||
proto_tree_add_uint(tree, hf_h221Manufacturer, tvb, (offset>>3)-4, 4, h221NonStandard);
|
||||
|
||||
|
|
@ -1456,7 +1456,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 589 "../../asn1/h225/h225.cnf"
|
||||
#line 593 "../../asn1/h225/h225.cnf"
|
||||
gint32 value;
|
||||
|
||||
nsiOID = "";
|
||||
|
|
@ -1485,7 +1485,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 623 "../../asn1/h225/h225.cnf"
|
||||
#line 627 "../../asn1/h225/h225.cnf"
|
||||
tvbuff_t *next_tvb = NULL;
|
||||
|
||||
offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
|
||||
|
|
@ -1508,7 +1508,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 621 "../../asn1/h225/h225.cnf"
|
||||
#line 625 "../../asn1/h225/h225.cnf"
|
||||
nsp_handle = NULL;
|
||||
|
||||
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
|
||||
|
|
@ -1542,7 +1542,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 428 "../../asn1/h225/h225.cnf"
|
||||
#line 432 "../../asn1/h225/h225.cnf"
|
||||
ipv4_address=0;
|
||||
ipv4_port=0;
|
||||
|
||||
|
|
@ -1551,7 +1551,7 @@ dissect_h225_H245TransportAddress(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t
|
|||
ett_h225_H245TransportAddress, H245TransportAddress_choice,
|
||||
NULL);
|
||||
|
||||
#line 434 "../../asn1/h225/h225.cnf"
|
||||
#line 438 "../../asn1/h225/h225.cnf"
|
||||
/* we need this info for TAPing */
|
||||
h225_pi->is_h245 = TRUE;
|
||||
h225_pi->h245_address = ipv4_address;
|
||||
|
|
@ -1580,7 +1580,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 300 "../../asn1/h225/h225.cnf"
|
||||
#line 304 "../../asn1/h225/h225.cnf"
|
||||
tvbuff_t *value_tvb = NULL;
|
||||
guint len = 0;
|
||||
|
||||
|
|
@ -1897,7 +1897,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 704 "../../asn1/h225/h225.cnf"
|
||||
#line 708 "../../asn1/h225/h225.cnf"
|
||||
int min_len, max_len;
|
||||
gboolean has_extension;
|
||||
|
||||
|
|
@ -2696,13 +2696,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 566 "../../asn1/h225/h225.cnf"
|
||||
#line 570 "../../asn1/h225/h225.cnf"
|
||||
tpOID = "";
|
||||
|
||||
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
|
||||
ett_h225_TunnelledProtocol, TunnelledProtocol_sequence);
|
||||
|
||||
#line 568 "../../asn1/h225/h225.cnf"
|
||||
#line 572 "../../asn1/h225/h225.cnf"
|
||||
tp_handle = dissector_get_string_handle(tp_dissector_table, tpOID);
|
||||
|
||||
return offset;
|
||||
|
|
@ -2880,7 +2880,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 540 "../../asn1/h225/h225.cnf"
|
||||
#line 544 "../../asn1/h225/h225.cnf"
|
||||
tvbuff_t *guid_tvb = NULL;
|
||||
|
||||
actx->value_ptr = &guid_tvb;
|
||||
|
|
@ -3682,7 +3682,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 680 "../../asn1/h225/h225.cnf"
|
||||
#line 684 "../../asn1/h225/h225.cnf"
|
||||
guint32 value_int = (guint32)-1;
|
||||
gef_ctx_t *gefx;
|
||||
|
||||
|
|
@ -3700,7 +3700,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 689 "../../asn1/h225/h225.cnf"
|
||||
#line 693 "../../asn1/h225/h225.cnf"
|
||||
const gchar *oid_str = NULL;
|
||||
gef_ctx_t *gefx;
|
||||
|
||||
|
|
@ -3730,14 +3730,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 666 "../../asn1/h225/h225.cnf"
|
||||
#line 670 "../../asn1/h225/h225.cnf"
|
||||
gef_ctx_t *gefx;
|
||||
|
||||
offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
|
||||
ett_h225_GenericIdentifier, GenericIdentifier_choice,
|
||||
NULL);
|
||||
|
||||
#line 668 "../../asn1/h225/h225.cnf"
|
||||
#line 672 "../../asn1/h225/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);
|
||||
|
|
@ -3870,7 +3870,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 648 "../../asn1/h225/h225.cnf"
|
||||
#line 652 "../../asn1/h225/h225.cnf"
|
||||
gef_ctx_t *parent_gefx;
|
||||
|
||||
parent_gefx = gef_ctx_get(actx->private_data);
|
||||
|
|
@ -3878,7 +3878,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 653 "../../asn1/h225/h225.cnf"
|
||||
#line 657 "../../asn1/h225/h225.cnf"
|
||||
actx->private_data = parent_gefx;
|
||||
|
||||
return offset;
|
||||
|
|
@ -3907,7 +3907,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 634 "../../asn1/h225/h225.cnf"
|
||||
#line 638 "../../asn1/h225/h225.cnf"
|
||||
void *priv_data = actx->private_data;
|
||||
gef_ctx_t *gefx;
|
||||
|
||||
|
|
@ -3921,7 +3921,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 644 "../../asn1/h225/h225.cnf"
|
||||
#line 648 "../../asn1/h225/h225.cnf"
|
||||
actx->private_data = priv_data;
|
||||
|
||||
return offset;
|
||||
|
|
@ -3960,13 +3960,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 658 "../../asn1/h225/h225.cnf"
|
||||
#line 662 "../../asn1/h225/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 661 "../../asn1/h225/h225.cnf"
|
||||
#line 665 "../../asn1/h225/h225.cnf"
|
||||
actx->private_data = priv_data;
|
||||
|
||||
return offset;
|
||||
|
|
@ -3989,7 +3989,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 329 "../../asn1/h225/h225.cnf"
|
||||
#line 333 "../../asn1/h225/h225.cnf"
|
||||
tvbuff_t *h245_tvb = NULL;
|
||||
|
||||
offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
|
||||
|
|
@ -4139,13 +4139,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 382 "../../asn1/h225/h225.cnf"
|
||||
#line 386 "../../asn1/h225/h225.cnf"
|
||||
contains_faststart = FALSE;
|
||||
|
||||
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
|
||||
ett_h225_Setup_UUIE, Setup_UUIE_sequence);
|
||||
|
||||
#line 386 "../../asn1/h225/h225.cnf"
|
||||
#line 390 "../../asn1/h225/h225.cnf"
|
||||
/* Add to packet info */
|
||||
h225_pi->cs_type = H225_SETUP;
|
||||
if (contains_faststart == TRUE )
|
||||
|
|
@ -4195,7 +4195,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 395 "../../asn1/h225/h225.cnf"
|
||||
#line 399 "../../asn1/h225/h225.cnf"
|
||||
/* Add to packet info */
|
||||
h225_pi->cs_type = H225_CALL_PROCEDING;
|
||||
if (contains_faststart == TRUE )
|
||||
|
|
@ -4236,7 +4236,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 419 "../../asn1/h225/h225.cnf"
|
||||
#line 423 "../../asn1/h225/h225.cnf"
|
||||
/* Add to packet info */
|
||||
h225_pi->cs_type = H225_CONNECT;
|
||||
if (contains_faststart == TRUE )
|
||||
|
|
@ -4275,7 +4275,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 404 "../../asn1/h225/h225.cnf"
|
||||
#line 408 "../../asn1/h225/h225.cnf"
|
||||
/* Add to packet info */
|
||||
h225_pi->cs_type = H225_ALERTING;
|
||||
if (contains_faststart == TRUE )
|
||||
|
|
@ -4303,7 +4303,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 353 "../../asn1/h225/h225.cnf"
|
||||
#line 357 "../../asn1/h225/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>"));
|
||||
|
|
@ -4422,7 +4422,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 533 "../../asn1/h225/h225.cnf"
|
||||
#line 537 "../../asn1/h225/h225.cnf"
|
||||
gint32 value;
|
||||
|
||||
offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
|
||||
|
|
@ -4458,7 +4458,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 413 "../../asn1/h225/h225.cnf"
|
||||
#line 417 "../../asn1/h225/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>"));
|
||||
|
|
@ -4499,7 +4499,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 457 "../../asn1/h225/h225.cnf"
|
||||
#line 461 "../../asn1/h225/h225.cnf"
|
||||
gint32 value;
|
||||
|
||||
offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
|
||||
|
|
@ -4572,7 +4572,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 374 "../../asn1/h225/h225.cnf"
|
||||
#line 378 "../../asn1/h225/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>"));
|
||||
|
|
@ -4601,7 +4601,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 359 "../../asn1/h225/h225.cnf"
|
||||
#line 363 "../../asn1/h225/h225.cnf"
|
||||
/* Add to packet info */
|
||||
h225_pi->cs_type = H225_PROGRESS;
|
||||
if (contains_faststart == TRUE )
|
||||
|
|
@ -4618,7 +4618,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 343 "../../asn1/h225/h225.cnf"
|
||||
#line 347 "../../asn1/h225/h225.cnf"
|
||||
h225_pi->cs_type = H225_EMPTY;
|
||||
|
||||
return offset;
|
||||
|
|
@ -4638,7 +4638,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 347 "../../asn1/h225/h225.cnf"
|
||||
#line 351 "../../asn1/h225/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>"));
|
||||
|
|
@ -4677,7 +4677,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 368 "../../asn1/h225/h225.cnf"
|
||||
#line 372 "../../asn1/h225/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>"));
|
||||
|
|
@ -4781,7 +4781,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 554 "../../asn1/h225/h225.cnf"
|
||||
#line 558 "../../asn1/h225/h225.cnf"
|
||||
tvbuff_t *h4501_tvb = NULL;
|
||||
|
||||
offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
|
||||
|
|
@ -4821,7 +4821,7 @@ dissect_h225_T_h245Tunnelling(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act
|
|||
|
||||
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 336 "../../asn1/h225/h225.cnf"
|
||||
#line 340 "../../asn1/h225/h225.cnf"
|
||||
tvbuff_t *h245_tvb = NULL;
|
||||
|
||||
offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
|
||||
|
|
@ -4878,7 +4878,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 576 "../../asn1/h225/h225.cnf"
|
||||
#line 580 "../../asn1/h225/h225.cnf"
|
||||
tvbuff_t *next_tvb = NULL;
|
||||
|
||||
offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
|
||||
|
|
@ -4914,7 +4914,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 574 "../../asn1/h225/h225.cnf"
|
||||
#line 578 "../../asn1/h225/h225.cnf"
|
||||
tp_handle = NULL;
|
||||
|
||||
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
|
||||
|
|
@ -5752,7 +5752,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 464 "../../asn1/h225/h225.cnf"
|
||||
#line 468 "../../asn1/h225/h225.cnf"
|
||||
gint32 value;
|
||||
|
||||
offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
|
||||
|
|
@ -6054,7 +6054,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 519 "../../asn1/h225/h225.cnf"
|
||||
#line 523 "../../asn1/h225/h225.cnf"
|
||||
gint32 value;
|
||||
|
||||
offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
|
||||
|
|
@ -6117,7 +6117,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 471 "../../asn1/h225/h225.cnf"
|
||||
#line 475 "../../asn1/h225/h225.cnf"
|
||||
gint32 value;
|
||||
|
||||
offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
|
||||
|
|
@ -6202,7 +6202,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 478 "../../asn1/h225/h225.cnf"
|
||||
#line 482 "../../asn1/h225/h225.cnf"
|
||||
gint32 value;
|
||||
|
||||
offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
|
||||
|
|
@ -6262,7 +6262,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 295 "../../asn1/h225/h225.cnf"
|
||||
#line 299 "../../asn1/h225/h225.cnf"
|
||||
|
||||
h225_pi->is_destinationInfo = TRUE;
|
||||
|
||||
|
|
@ -6470,7 +6470,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 505 "../../asn1/h225/h225.cnf"
|
||||
#line 509 "../../asn1/h225/h225.cnf"
|
||||
gint32 value;
|
||||
|
||||
offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
|
||||
|
|
@ -6602,7 +6602,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 485 "../../asn1/h225/h225.cnf"
|
||||
#line 489 "../../asn1/h225/h225.cnf"
|
||||
gint32 value;
|
||||
|
||||
offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
|
||||
|
|
@ -6654,7 +6654,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 492 "../../asn1/h225/h225.cnf"
|
||||
#line 496 "../../asn1/h225/h225.cnf"
|
||||
gint32 value;
|
||||
|
||||
offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
|
||||
|
|
@ -6741,7 +6741,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 498 "../../asn1/h225/h225.cnf"
|
||||
#line 502 "../../asn1/h225/h225.cnf"
|
||||
gint32 value;
|
||||
|
||||
offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
|
||||
|
|
@ -6887,7 +6887,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 512 "../../asn1/h225/h225.cnf"
|
||||
#line 516 "../../asn1/h225/h225.cnf"
|
||||
gint32 value;
|
||||
|
||||
offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
|
||||
|
|
@ -7258,7 +7258,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 526 "../../asn1/h225/h225.cnf"
|
||||
#line 530 "../../asn1/h225/h225.cnf"
|
||||
gint32 value;
|
||||
|
||||
offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
|
||||
|
|
@ -7472,6 +7472,7 @@ dissect_h225_RasMessage(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_,
|
|||
#line 285 "../../asn1/h225/h225.cnf"
|
||||
gint32 rasmessage_value;
|
||||
|
||||
call_id_guid = NULL;
|
||||
offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
|
||||
ett_h225_RasMessage, RasMessage_choice,
|
||||
&rasmessage_value);
|
||||
|
|
@ -7480,6 +7481,9 @@ dissect_h225_RasMessage(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_,
|
|||
val_to_str(rasmessage_value, h225_RasMessage_vals, "<unknown>"));
|
||||
|
||||
h225_pi->msg_tag = rasmessage_value;
|
||||
if (call_id_guid) {
|
||||
h225_pi->guid = *call_id_guid;
|
||||
}
|
||||
|
||||
|
||||
return offset;
|
||||
|
|
|
|||
Loading…
Reference in New Issue