diff options
author | Piotr Tulpan <piotr.tulpan@netscan.pl> | 2019-05-20 17:32:43 +0200 |
---|---|---|
committer | Anders Broman <a.broman58@gmail.com> | 2019-05-27 08:34:21 +0000 |
commit | bc5b71c00bbba559615877730a8da6ebb93606d3 (patch) | |
tree | 9d824f3cf130cf039fd76493fe9127b44e15bde6 | |
parent | 76785a12b3d2ca8a0e7d4e5e4edf3ea6ac4aa2e4 (diff) |
RANAP: Handle 7 byte NSAP address in transportLayerAddress
Handle NSAP 7 byte IPv4 address in transportLayerAddress field which aren't padded to 20 bytes.
Change-Id: Ied9a9549612fe8e9ec511419ee0d7e5ae06bcedf
Reviewed-on: https://code.wireshark.org/review/33278
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
-rw-r--r-- | epan/dissectors/asn1/ranap/packet-ranap-template.c | 8 | ||||
-rw-r--r-- | epan/dissectors/asn1/ranap/ranap.cnf | 39 | ||||
-rw-r--r-- | epan/dissectors/packet-ranap.c | 235 |
3 files changed, 155 insertions, 127 deletions
diff --git a/epan/dissectors/asn1/ranap/packet-ranap-template.c b/epan/dissectors/asn1/ranap/packet-ranap-template.c index ed6977f8bc..7aef928fc8 100644 --- a/epan/dissectors/asn1/ranap/packet-ranap-template.c +++ b/epan/dissectors/asn1/ranap/packet-ranap-template.c @@ -67,8 +67,8 @@ static int hf_ranap_transportLayerAddress_nsap = -1; /* Initialize the subtree pointers */ static int ett_ranap = -1; -static int ett_ranap_TransportLayerAddress = -1; -static int ett_ranap_TransportLayerAddress_nsap = -1; +static int ett_ranap_transportLayerAddress = -1; +static int ett_ranap_transportLayerAddress_nsap = -1; #include "packet-ranap-ett.c" @@ -412,8 +412,8 @@ void proto_register_ranap(void) { /* List of subtrees */ static gint *ett[] = { &ett_ranap, - &ett_ranap_TransportLayerAddress, - &ett_ranap_TransportLayerAddress_nsap, + &ett_ranap_transportLayerAddress, + &ett_ranap_transportLayerAddress_nsap, #include "packet-ranap-ettarr.c" }; diff --git a/epan/dissectors/asn1/ranap/ranap.cnf b/epan/dissectors/asn1/ranap/ranap.cnf index 7606c31850..f4eb8272f6 100644 --- a/epan/dissectors/asn1/ranap/ranap.cnf +++ b/epan/dissectors/asn1/ranap/ranap.cnf @@ -310,37 +310,50 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound") # 3GPP TS 25.414: "UTRAN Iu interface data transport and transport signalling". # #.FN_BODY TransportLayerAddress VAL_PTR = ¶meter_tvb - tvbuff_t *parameter_tvb=NULL; + tvbuff_t *parameter_tvb = NULL; proto_item *item; proto_tree *subtree, *nsap_tree; + guint8 *padded_nsap_bytes; + tvbuff_t *nsap_tvb; gint tvb_len; %(DEFAULT_BODY)s if (!parameter_tvb) return offset; -# TransportLayerAddress ::= BIT STRING (SIZE (1..160, ...)) -# Asume 4 bytes used in case of IPv4 + /* Get the length */ tvb_len = tvb_reported_length(parameter_tvb); - subtree = proto_item_add_subtree(actx->created_item, ett_ranap_TransportLayerAddress); - if (tvb_len==4){ + subtree = proto_item_add_subtree(actx->created_item, ett_ranap_transportLayerAddress); + if (tvb_len == 4){ /* IPv4 */ proto_tree_add_item(subtree, hf_ranap_transportLayerAddress_ipv4, parameter_tvb, 0, tvb_len, ENC_BIG_ENDIAN); private_data_set_transportLayerAddress_ipv4(actx, tvb_get_ipv4(parameter_tvb, 0)); } - if (tvb_len==16){ + if (tvb_len == 16){ /* IPv6 */ proto_tree_add_item(subtree, hf_ranap_transportLayerAddress_ipv6, parameter_tvb, 0, tvb_len, ENC_NA); } - /* Length will be 25 if optional bearerId is present */ - if ((tvb_len==20) || (tvb_len==25)) { - item = proto_tree_add_item(subtree, hf_ranap_transportLayerAddress_nsap, parameter_tvb, 0, 20, ENC_NA); - nsap_tree = proto_item_add_subtree(item, ett_ranap_TransportLayerAddress_nsap); + if (tvb_len == 20 || tvb_len == 7){ + /* NSAP */ + if (tvb_len == 7){ + /* Unpadded IPv4 NSAP */ + /* Creating a new TVB with padding */ + padded_nsap_bytes = (guint8*) wmem_alloc0(actx->pinfo->pool, 20); + tvb_memcpy(parameter_tvb, padded_nsap_bytes, 0, tvb_len); + nsap_tvb = tvb_new_child_real_data(tvb, padded_nsap_bytes, 20, 20); + add_new_data_source(actx->pinfo, nsap_tvb, "Padded NSAP Data"); + } else { + /* Padded NSAP*/ + nsap_tvb = parameter_tvb; + } + item = proto_tree_add_item(subtree, hf_ranap_transportLayerAddress_nsap, parameter_tvb, 0, tvb_len, ENC_NA); + nsap_tree = proto_item_add_subtree(item, ett_ranap_transportLayerAddress_nsap); + if(tvb_get_ntoh24(parameter_tvb,0) == 0x350001){ - /* IPv4 */ - private_data_set_transportLayerAddress_ipv4(actx, tvb_get_ipv4(parameter_tvb, 3)); + /* IPv4 */ + private_data_set_transportLayerAddress_ipv4(actx, tvb_get_ipv4(parameter_tvb, 3)); } - dissect_nsap(parameter_tvb, 0, tvb_len, nsap_tree); + dissect_nsap(nsap_tvb, 0, 20, nsap_tree); } #.FN_BODY GTP-TEI VAL_PTR = ¶meter_tvb diff --git a/epan/dissectors/packet-ranap.c b/epan/dissectors/packet-ranap.c index 0e28c1d959..f1b8407f90 100644 --- a/epan/dissectors/packet-ranap.c +++ b/epan/dissectors/packet-ranap.c @@ -1263,8 +1263,8 @@ static int hf_ranap_value = -1; /* T_value */ /* Initialize the subtree pointers */ static int ett_ranap = -1; -static int ett_ranap_TransportLayerAddress = -1; -static int ett_ranap_TransportLayerAddress_nsap = -1; +static int ett_ranap_transportLayerAddress = -1; +static int ett_ranap_transportLayerAddress_nsap = -1; /*--- Included file: packet-ranap-ett.c ---*/ @@ -3305,9 +3305,11 @@ dissect_ranap_TracePropagationParameters(tvbuff_t *tvb _U_, int offset _U_, asn1 static int dissect_ranap_TransportLayerAddress(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 313 "./asn1/ranap/ranap.cnf" - tvbuff_t *parameter_tvb=NULL; + tvbuff_t *parameter_tvb = NULL; proto_item *item; proto_tree *subtree, *nsap_tree; + guint8 *padded_nsap_bytes; + tvbuff_t *nsap_tvb; gint tvb_len; offset = dissect_per_bit_string(tvb, offset, actx, tree, hf_index, @@ -3315,27 +3317,40 @@ dissect_ranap_TransportLayerAddress(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_ if (!parameter_tvb) return offset; + /* Get the length */ tvb_len = tvb_reported_length(parameter_tvb); - subtree = proto_item_add_subtree(actx->created_item, ett_ranap_TransportLayerAddress); - if (tvb_len==4){ + subtree = proto_item_add_subtree(actx->created_item, ett_ranap_transportLayerAddress); + if (tvb_len == 4){ /* IPv4 */ proto_tree_add_item(subtree, hf_ranap_transportLayerAddress_ipv4, parameter_tvb, 0, tvb_len, ENC_BIG_ENDIAN); private_data_set_transportLayerAddress_ipv4(actx, tvb_get_ipv4(parameter_tvb, 0)); } - if (tvb_len==16){ + if (tvb_len == 16){ /* IPv6 */ proto_tree_add_item(subtree, hf_ranap_transportLayerAddress_ipv6, parameter_tvb, 0, tvb_len, ENC_NA); } - /* Length will be 25 if optional bearerId is present */ - if ((tvb_len==20) || (tvb_len==25)) { - item = proto_tree_add_item(subtree, hf_ranap_transportLayerAddress_nsap, parameter_tvb, 0, 20, ENC_NA); - nsap_tree = proto_item_add_subtree(item, ett_ranap_TransportLayerAddress_nsap); + if (tvb_len == 20 || tvb_len == 7){ + /* NSAP */ + if (tvb_len == 7){ + /* Unpadded IPv4 NSAP */ + /* Creating a new TVB with padding */ + padded_nsap_bytes = (guint8*) wmem_alloc0(actx->pinfo->pool, 20); + tvb_memcpy(parameter_tvb, padded_nsap_bytes, 0, tvb_len); + nsap_tvb = tvb_new_child_real_data(tvb, padded_nsap_bytes, 20, 20); + add_new_data_source(actx->pinfo, nsap_tvb, "Padded NSAP Data"); + } else { + /* Padded NSAP*/ + nsap_tvb = parameter_tvb; + } + item = proto_tree_add_item(subtree, hf_ranap_transportLayerAddress_nsap, parameter_tvb, 0, tvb_len, ENC_NA); + nsap_tree = proto_item_add_subtree(item, ett_ranap_transportLayerAddress_nsap); + if(tvb_get_ntoh24(parameter_tvb,0) == 0x350001){ - /* IPv4 */ - private_data_set_transportLayerAddress_ipv4(actx, tvb_get_ipv4(parameter_tvb, 3)); + /* IPv4 */ + private_data_set_transportLayerAddress_ipv4(actx, tvb_get_ipv4(parameter_tvb, 3)); } - dissect_nsap(parameter_tvb, 0, tvb_len, nsap_tree); + dissect_nsap(nsap_tvb, 0, 20, nsap_tree); } @@ -3853,7 +3868,7 @@ dissect_ranap_BarometricPressure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t * static int dissect_ranap_BindingID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 397 "./asn1/ranap/ranap.cnf" +#line 410 "./asn1/ranap/ranap.cnf" tvbuff_t *value_tvb = NULL; offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, 4, 4, FALSE, &value_tvb); @@ -5293,7 +5308,7 @@ dissect_ranap_GlobalRNC_ID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _ static int dissect_ranap_GTP_TEI(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 347 "./asn1/ranap/ranap.cnf" +#line 360 "./asn1/ranap/ranap.cnf" tvbuff_t *parameter_tvb=NULL; int saved_hf; @@ -5814,7 +5829,7 @@ dissect_ranap_IntegrityProtectionInformation(tvbuff_t *tvb _U_, int offset _U_, static int dissect_ranap_RIMInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 450 "./asn1/ranap/ranap.cnf" +#line 463 "./asn1/ranap/ranap.cnf" tvbuff_t *value_tvb = NULL; offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, @@ -8438,7 +8453,7 @@ dissect_ranap_Service_Handover(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *ac static int dissect_ranap_Source_ToTarget_TransparentContainer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 382 "./asn1/ranap/ranap.cnf" +#line 395 "./asn1/ranap/ranap.cnf" dissect_ranap_SourceRNC_ToTargetRNC_TransparentContainer(tvb , offset, actx ,tree , hf_ranap_ranap_SourceRNC_ToTargetRNC_TransparentContainer_PDU ); @@ -8515,7 +8530,7 @@ static const per_sequence_t SourceRNC_ToTargetRNC_TransparentContainer_sequence[ static int dissect_ranap_SourceRNC_ToTargetRNC_TransparentContainer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 359 "./asn1/ranap/ranap.cnf" +#line 372 "./asn1/ranap/ranap.cnf" /* If SourceRNC-ToTargetRNC-TransparentContainer is called through dissect_ranap_SourceRNC_ToTargetRNC_TransparentContainer_PDU ProtocolIE_ID may be unset @@ -8778,7 +8793,7 @@ dissect_ranap_SRVCC_Operation_Possible(tvbuff_t *tvb _U_, int offset _U_, asn1_c static int dissect_ranap_Target_ToSource_TransparentContainer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 392 "./asn1/ranap/ranap.cnf" +#line 405 "./asn1/ranap/ranap.cnf" dissect_ranap_TargetRNC_ToSourceRNC_TransparentContainer(tvb , offset, actx ,tree , hf_ranap_ranap_TargetRNC_ToSourceRNC_TransparentContainer_PDU ); @@ -8832,7 +8847,7 @@ static const per_sequence_t TargetRNC_ToSourceRNC_TransparentContainer_sequence[ static int dissect_ranap_TargetRNC_ToSourceRNC_TransparentContainer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 368 "./asn1/ranap/ranap.cnf" +#line 381 "./asn1/ranap/ranap.cnf" /* If TargetRNC-ToSourceRNC-TransparentContainer is called through dissect_ranap_TargetRNC_ToSourceRNC_TransparentContainer_PDU ProtocolIE_ID may be unset @@ -9017,7 +9032,7 @@ dissect_ranap_UE_AggregateMaximumBitRate(tvbuff_t *tvb _U_, int offset _U_, asn1 static int dissect_ranap_UE_History_Information(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 408 "./asn1/ranap/ranap.cnf" +#line 421 "./asn1/ranap/ranap.cnf" tvbuff_t *value_tvb = NULL; offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, @@ -9432,7 +9447,7 @@ static const per_sequence_t Iu_ReleaseCommand_sequence[] = { static int dissect_ranap_Iu_ReleaseCommand(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 460 "./asn1/ranap/ranap.cnf" +#line 473 "./asn1/ranap/ranap.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO,"Iu-ReleaseCommand "); @@ -9451,7 +9466,7 @@ static const per_sequence_t Iu_ReleaseComplete_sequence[] = { static int dissect_ranap_Iu_ReleaseComplete(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 464 "./asn1/ranap/ranap.cnf" +#line 477 "./asn1/ranap/ranap.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO,"Iu-ReleaseComplete "); @@ -9551,7 +9566,7 @@ static const per_sequence_t RelocationRequired_sequence[] = { static int dissect_ranap_RelocationRequired(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 468 "./asn1/ranap/ranap.cnf" +#line 481 "./asn1/ranap/ranap.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO,"RelocationRequired "); @@ -9570,7 +9585,7 @@ static const per_sequence_t RelocationCommand_sequence[] = { static int dissect_ranap_RelocationCommand(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 472 "./asn1/ranap/ranap.cnf" +#line 485 "./asn1/ranap/ranap.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO,"RelocationCommand "); @@ -9639,7 +9654,7 @@ static const per_sequence_t RelocationPreparationFailure_sequence[] = { static int dissect_ranap_RelocationPreparationFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 476 "./asn1/ranap/ranap.cnf" +#line 489 "./asn1/ranap/ranap.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO,"RelocationPreparationFailure "); @@ -9658,7 +9673,7 @@ static const per_sequence_t RelocationRequest_sequence[] = { static int dissect_ranap_RelocationRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 480 "./asn1/ranap/ranap.cnf" +#line 493 "./asn1/ranap/ranap.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO,"RelocationRequest "); @@ -9770,7 +9785,7 @@ static const per_sequence_t RelocationRequestAcknowledge_sequence[] = { static int dissect_ranap_RelocationRequestAcknowledge(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 484 "./asn1/ranap/ranap.cnf" +#line 497 "./asn1/ranap/ranap.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO,"RelocationRequestAcknowledge "); @@ -9840,7 +9855,7 @@ static const per_sequence_t RelocationFailure_sequence[] = { static int dissect_ranap_RelocationFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 488 "./asn1/ranap/ranap.cnf" +#line 501 "./asn1/ranap/ranap.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO,"RelocationFailure "); @@ -9859,7 +9874,7 @@ static const per_sequence_t RelocationCancel_sequence[] = { static int dissect_ranap_RelocationCancel(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 492 "./asn1/ranap/ranap.cnf" +#line 505 "./asn1/ranap/ranap.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO,"RelocationCancel "); @@ -9878,7 +9893,7 @@ static const per_sequence_t RelocationCancelAcknowledge_sequence[] = { static int dissect_ranap_RelocationCancelAcknowledge(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 496 "./asn1/ranap/ranap.cnf" +#line 509 "./asn1/ranap/ranap.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO,"RelocationCancelAcknowledge "); @@ -9897,7 +9912,7 @@ static const per_sequence_t SRNS_ContextRequest_sequence[] = { static int dissect_ranap_SRNS_ContextRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 500 "./asn1/ranap/ranap.cnf" +#line 513 "./asn1/ranap/ranap.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO,"SRNS-ContextRequest "); @@ -9940,7 +9955,7 @@ static const per_sequence_t SRNS_ContextResponse_sequence[] = { static int dissect_ranap_SRNS_ContextResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 504 "./asn1/ranap/ranap.cnf" +#line 517 "./asn1/ranap/ranap.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO,"SRNS-ContextResponse "); @@ -10012,7 +10027,7 @@ static const per_sequence_t SecurityModeCommand_sequence[] = { static int dissect_ranap_SecurityModeCommand(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 508 "./asn1/ranap/ranap.cnf" +#line 521 "./asn1/ranap/ranap.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO,"SecurityModeCommand "); @@ -10031,7 +10046,7 @@ static const per_sequence_t SecurityModeComplete_sequence[] = { static int dissect_ranap_SecurityModeComplete(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 512 "./asn1/ranap/ranap.cnf" +#line 525 "./asn1/ranap/ranap.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO,"SecurityModeComplete "); @@ -10050,7 +10065,7 @@ static const per_sequence_t SecurityModeReject_sequence[] = { static int dissect_ranap_SecurityModeReject(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 516 "./asn1/ranap/ranap.cnf" +#line 529 "./asn1/ranap/ranap.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO,"SecurityModeReject "); @@ -10069,7 +10084,7 @@ static const per_sequence_t DataVolumeReportRequest_sequence[] = { static int dissect_ranap_DataVolumeReportRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 520 "./asn1/ranap/ranap.cnf" +#line 533 "./asn1/ranap/ranap.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO,"DataVolumeReportRequest "); @@ -10112,7 +10127,7 @@ static const per_sequence_t DataVolumeReport_sequence[] = { static int dissect_ranap_DataVolumeReport(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 524 "./asn1/ranap/ranap.cnf" +#line 537 "./asn1/ranap/ranap.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO,"DataVolumeReport "); @@ -10156,7 +10171,7 @@ static const per_sequence_t Reset_sequence[] = { static int dissect_ranap_Reset(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 528 "./asn1/ranap/ranap.cnf" +#line 541 "./asn1/ranap/ranap.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO,"Reset "); @@ -10175,7 +10190,7 @@ static const per_sequence_t ResetAcknowledge_sequence[] = { static int dissect_ranap_ResetAcknowledge(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 532 "./asn1/ranap/ranap.cnf" +#line 545 "./asn1/ranap/ranap.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO,"ResetAcknowledge "); @@ -10194,7 +10209,7 @@ static const per_sequence_t ResetResource_sequence[] = { static int dissect_ranap_ResetResource(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 612 "./asn1/ranap/ranap.cnf" +#line 625 "./asn1/ranap/ranap.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO,"ResetResource "); @@ -10237,7 +10252,7 @@ static const per_sequence_t ResetResourceAcknowledge_sequence[] = { static int dissect_ranap_ResetResourceAcknowledge(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 616 "./asn1/ranap/ranap.cnf" +#line 629 "./asn1/ranap/ranap.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO,"ResetResourceAcknowledge "); @@ -10280,7 +10295,7 @@ static const per_sequence_t RAB_ReleaseRequest_sequence[] = { static int dissect_ranap_RAB_ReleaseRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 536 "./asn1/ranap/ranap.cnf" +#line 549 "./asn1/ranap/ranap.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO,"RAB-ReleaseRequest "); @@ -10324,7 +10339,7 @@ static const per_sequence_t Iu_ReleaseRequest_sequence[] = { static int dissect_ranap_Iu_ReleaseRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 540 "./asn1/ranap/ranap.cnf" +#line 553 "./asn1/ranap/ranap.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO,"Iu-ReleaseRequest "); @@ -10343,7 +10358,7 @@ static const per_sequence_t RelocationDetect_sequence[] = { static int dissect_ranap_RelocationDetect(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 544 "./asn1/ranap/ranap.cnf" +#line 557 "./asn1/ranap/ranap.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO,"RelocationDetect "); @@ -10362,7 +10377,7 @@ static const per_sequence_t RelocationComplete_sequence[] = { static int dissect_ranap_RelocationComplete(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 548 "./asn1/ranap/ranap.cnf" +#line 561 "./asn1/ranap/ranap.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO,"RelocationComplete "); @@ -10381,7 +10396,7 @@ static const per_sequence_t EnhancedRelocationCompleteRequest_sequence[] = { static int dissect_ranap_EnhancedRelocationCompleteRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 748 "./asn1/ranap/ranap.cnf" +#line 761 "./asn1/ranap/ranap.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO,"EnhancedRelocationCompleteRequest "); @@ -10427,7 +10442,7 @@ static const per_sequence_t EnhancedRelocationCompleteResponse_sequence[] = { static int dissect_ranap_EnhancedRelocationCompleteResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 752 "./asn1/ranap/ranap.cnf" +#line 765 "./asn1/ranap/ranap.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO,"EnhancedRelocationCompleteResponse "); @@ -10500,7 +10515,7 @@ static const per_sequence_t EnhancedRelocationCompleteFailure_sequence[] = { static int dissect_ranap_EnhancedRelocationCompleteFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 756 "./asn1/ranap/ranap.cnf" +#line 769 "./asn1/ranap/ranap.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO,"EnhancedRelocationCompleteFailure "); @@ -10519,7 +10534,7 @@ static const per_sequence_t EnhancedRelocationCompleteConfirm_sequence[] = { static int dissect_ranap_EnhancedRelocationCompleteConfirm(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 760 "./asn1/ranap/ranap.cnf" +#line 773 "./asn1/ranap/ranap.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO,"EnhancedRelocationCompleteConfirm "); @@ -10538,7 +10553,7 @@ static const per_sequence_t Paging_sequence[] = { static int dissect_ranap_Paging(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 552 "./asn1/ranap/ranap.cnf" +#line 565 "./asn1/ranap/ranap.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO,"Paging "); @@ -10557,7 +10572,7 @@ static const per_sequence_t CommonID_sequence[] = { static int dissect_ranap_CommonID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 556 "./asn1/ranap/ranap.cnf" +#line 569 "./asn1/ranap/ranap.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO,"CommonID "); @@ -10576,7 +10591,7 @@ static const per_sequence_t CN_InvokeTrace_sequence[] = { static int dissect_ranap_CN_InvokeTrace(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 560 "./asn1/ranap/ranap.cnf" +#line 573 "./asn1/ranap/ranap.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO,"CN-InvokeTrace "); @@ -10595,7 +10610,7 @@ static const per_sequence_t CN_DeactivateTrace_sequence[] = { static int dissect_ranap_CN_DeactivateTrace(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 564 "./asn1/ranap/ranap.cnf" +#line 577 "./asn1/ranap/ranap.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO,"CN-DeactivateTrace "); @@ -10614,7 +10629,7 @@ static const per_sequence_t LocationReportingControl_sequence[] = { static int dissect_ranap_LocationReportingControl(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 568 "./asn1/ranap/ranap.cnf" +#line 581 "./asn1/ranap/ranap.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO,"LocationReportingControl "); @@ -10633,7 +10648,7 @@ static const per_sequence_t LocationReport_sequence[] = { static int dissect_ranap_LocationReport(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 572 "./asn1/ranap/ranap.cnf" +#line 585 "./asn1/ranap/ranap.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO,"LocationReport "); @@ -10652,7 +10667,7 @@ static const per_sequence_t InitialUE_Message_sequence[] = { static int dissect_ranap_InitialUE_Message(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 576 "./asn1/ranap/ranap.cnf" +#line 589 "./asn1/ranap/ranap.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO,"InitialUE-Message "); @@ -10671,7 +10686,7 @@ static const per_sequence_t DirectTransfer_sequence[] = { static int dissect_ranap_DirectTransfer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 580 "./asn1/ranap/ranap.cnf" +#line 593 "./asn1/ranap/ranap.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO,"DirectTransfer "); @@ -10699,7 +10714,7 @@ static const per_sequence_t Overload_sequence[] = { static int dissect_ranap_Overload(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 584 "./asn1/ranap/ranap.cnf" +#line 597 "./asn1/ranap/ranap.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO,"Overload "); @@ -10718,7 +10733,7 @@ static const per_sequence_t ErrorIndication_sequence[] = { static int dissect_ranap_ErrorIndication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 588 "./asn1/ranap/ranap.cnf" +#line 601 "./asn1/ranap/ranap.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO,"ErrorIndication "); @@ -10737,7 +10752,7 @@ static const per_sequence_t SRNS_DataForwardCommand_sequence[] = { static int dissect_ranap_SRNS_DataForwardCommand(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 592 "./asn1/ranap/ranap.cnf" +#line 605 "./asn1/ranap/ranap.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO,"SRNS-DataForwardCommand "); @@ -10756,7 +10771,7 @@ static const per_sequence_t ForwardSRNS_Context_sequence[] = { static int dissect_ranap_ForwardSRNS_Context(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 596 "./asn1/ranap/ranap.cnf" +#line 609 "./asn1/ranap/ranap.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO,"ForwardSRNS-Context "); @@ -10775,7 +10790,7 @@ static const per_sequence_t RAB_AssignmentRequest_sequence[] = { static int dissect_ranap_RAB_AssignmentRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 600 "./asn1/ranap/ranap.cnf" +#line 613 "./asn1/ranap/ranap.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO,"RAB-AssignmentRequest "); @@ -10824,7 +10839,7 @@ static const per_sequence_t RAB_SetupOrModifyItemFirst_sequence[] = { static int dissect_ranap_RAB_SetupOrModifyItemFirst(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 415 "./asn1/ranap/ranap.cnf" +#line 428 "./asn1/ranap/ranap.cnf" address ipv4_addr; guint32 transportLayerAddress_ipv4; guint16 binding_id; @@ -10877,7 +10892,7 @@ static const per_sequence_t RAB_AssignmentResponse_sequence[] = { static int dissect_ranap_RAB_AssignmentResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 604 "./asn1/ranap/ranap.cnf" +#line 617 "./asn1/ranap/ranap.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO,"RAB-AssignmentResponse "); @@ -10908,7 +10923,7 @@ static const per_sequence_t RAB_SetupOrModifiedItem_sequence[] = { static int dissect_ranap_RAB_SetupOrModifiedItem(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 432 "./asn1/ranap/ranap.cnf" +#line 445 "./asn1/ranap/ranap.cnf" address ipv4_addr; guint32 transportLayerAddress_ipv4; guint16 binding_id; @@ -11026,7 +11041,7 @@ static const per_sequence_t PrivateMessage_sequence[] = { static int dissect_ranap_PrivateMessage(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 608 "./asn1/ranap/ranap.cnf" +#line 621 "./asn1/ranap/ranap.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO,"PrivateMessage "); @@ -11045,7 +11060,7 @@ static const per_sequence_t RANAP_RelocationInformation_sequence[] = { static int dissect_ranap_RANAP_RelocationInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 620 "./asn1/ranap/ranap.cnf" +#line 633 "./asn1/ranap/ranap.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO,"RANAP-RelocationInformation "); @@ -11118,7 +11133,7 @@ static const per_sequence_t RANAP_EnhancedRelocationInformationRequest_sequence[ static int dissect_ranap_RANAP_EnhancedRelocationInformationRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 764 "./asn1/ranap/ranap.cnf" +#line 777 "./asn1/ranap/ranap.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO,"RANAP-EnhancedRelocationInformationRequest "); @@ -11186,7 +11201,7 @@ static const per_sequence_t RANAP_EnhancedRelocationInformationResponse_sequence static int dissect_ranap_RANAP_EnhancedRelocationInformationResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 768 "./asn1/ranap/ranap.cnf" +#line 781 "./asn1/ranap/ranap.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO,"RANAP-EnhancedRelocationInformationResponse "); @@ -11274,7 +11289,7 @@ static const per_sequence_t RAB_ModifyRequest_sequence[] = { static int dissect_ranap_RAB_ModifyRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 624 "./asn1/ranap/ranap.cnf" +#line 637 "./asn1/ranap/ranap.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO,"RAB-ModifyRequest "); @@ -11318,7 +11333,7 @@ static const per_sequence_t LocationRelatedDataRequest_sequence[] = { static int dissect_ranap_LocationRelatedDataRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 628 "./asn1/ranap/ranap.cnf" +#line 641 "./asn1/ranap/ranap.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO,"LocationRelatedDataRequest "); @@ -11337,7 +11352,7 @@ static const per_sequence_t LocationRelatedDataResponse_sequence[] = { static int dissect_ranap_LocationRelatedDataResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 632 "./asn1/ranap/ranap.cnf" +#line 645 "./asn1/ranap/ranap.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO,"LocationRelatedDataResponse "); @@ -11356,7 +11371,7 @@ static const per_sequence_t LocationRelatedDataFailure_sequence[] = { static int dissect_ranap_LocationRelatedDataFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 636 "./asn1/ranap/ranap.cnf" +#line 649 "./asn1/ranap/ranap.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO,"LocationRelatedDataFailure "); @@ -11375,7 +11390,7 @@ static const per_sequence_t InformationTransferIndication_sequence[] = { static int dissect_ranap_InformationTransferIndication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 640 "./asn1/ranap/ranap.cnf" +#line 653 "./asn1/ranap/ranap.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO,"InformationTransferIndication "); @@ -11394,7 +11409,7 @@ static const per_sequence_t InformationTransferConfirmation_sequence[] = { static int dissect_ranap_InformationTransferConfirmation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 644 "./asn1/ranap/ranap.cnf" +#line 657 "./asn1/ranap/ranap.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO,"InformationTransferConfirmation "); @@ -11413,7 +11428,7 @@ static const per_sequence_t InformationTransferFailure_sequence[] = { static int dissect_ranap_InformationTransferFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 648 "./asn1/ranap/ranap.cnf" +#line 661 "./asn1/ranap/ranap.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO,"InformationTransferFailure "); @@ -11432,7 +11447,7 @@ static const per_sequence_t UESpecificInformationIndication_sequence[] = { static int dissect_ranap_UESpecificInformationIndication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 652 "./asn1/ranap/ranap.cnf" +#line 665 "./asn1/ranap/ranap.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO,"UESpecificInformationIndication "); @@ -11451,7 +11466,7 @@ static const per_sequence_t DirectInformationTransfer_sequence[] = { static int dissect_ranap_DirectInformationTransfer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 656 "./asn1/ranap/ranap.cnf" +#line 669 "./asn1/ranap/ranap.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO,"DirectInformationTransfer "); @@ -11470,7 +11485,7 @@ static const per_sequence_t UplinkInformationExchangeRequest_sequence[] = { static int dissect_ranap_UplinkInformationExchangeRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 660 "./asn1/ranap/ranap.cnf" +#line 673 "./asn1/ranap/ranap.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO,"UplinkInformationExchangeRequest "); @@ -11489,7 +11504,7 @@ static const per_sequence_t UplinkInformationExchangeResponse_sequence[] = { static int dissect_ranap_UplinkInformationExchangeResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 664 "./asn1/ranap/ranap.cnf" +#line 677 "./asn1/ranap/ranap.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO,"UplinkInformationExchangeResponse "); @@ -11508,7 +11523,7 @@ static const per_sequence_t UplinkInformationExchangeFailure_sequence[] = { static int dissect_ranap_UplinkInformationExchangeFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 668 "./asn1/ranap/ranap.cnf" +#line 681 "./asn1/ranap/ranap.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO,"UplinkInformationExchangeFailure "); @@ -11527,7 +11542,7 @@ static const per_sequence_t MBMSSessionStart_sequence[] = { static int dissect_ranap_MBMSSessionStart(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 672 "./asn1/ranap/ranap.cnf" +#line 685 "./asn1/ranap/ranap.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO,"MBMSSessionStart "); @@ -11563,7 +11578,7 @@ static const per_sequence_t MBMSSessionStartResponse_sequence[] = { static int dissect_ranap_MBMSSessionStartResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 676 "./asn1/ranap/ranap.cnf" +#line 689 "./asn1/ranap/ranap.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO,"MBMSSessionStartResponse "); @@ -11582,7 +11597,7 @@ static const per_sequence_t MBMSSessionStartFailure_sequence[] = { static int dissect_ranap_MBMSSessionStartFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 680 "./asn1/ranap/ranap.cnf" +#line 693 "./asn1/ranap/ranap.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO,"MBMSSessionStartFailure "); @@ -11601,7 +11616,7 @@ static const per_sequence_t MBMSSessionUpdate_sequence[] = { static int dissect_ranap_MBMSSessionUpdate(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 684 "./asn1/ranap/ranap.cnf" +#line 697 "./asn1/ranap/ranap.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO,"MBMSSessionUpdate "); @@ -11620,7 +11635,7 @@ static const per_sequence_t MBMSSessionUpdateResponse_sequence[] = { static int dissect_ranap_MBMSSessionUpdateResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 688 "./asn1/ranap/ranap.cnf" +#line 701 "./asn1/ranap/ranap.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO,"MBMSSessionUpdateResponse "); @@ -11639,7 +11654,7 @@ static const per_sequence_t MBMSSessionUpdateFailure_sequence[] = { static int dissect_ranap_MBMSSessionUpdateFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 692 "./asn1/ranap/ranap.cnf" +#line 705 "./asn1/ranap/ranap.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO,"MBMSSessionUpdateFailure "); @@ -11658,7 +11673,7 @@ static const per_sequence_t MBMSSessionStop_sequence[] = { static int dissect_ranap_MBMSSessionStop(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 696 "./asn1/ranap/ranap.cnf" +#line 709 "./asn1/ranap/ranap.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO,"MBMSSessionStop "); @@ -11677,7 +11692,7 @@ static const per_sequence_t MBMSSessionStopResponse_sequence[] = { static int dissect_ranap_MBMSSessionStopResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 700 "./asn1/ranap/ranap.cnf" +#line 713 "./asn1/ranap/ranap.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO,"MBMSSessionStopResponse "); @@ -11696,7 +11711,7 @@ static const per_sequence_t MBMSUELinkingRequest_sequence[] = { static int dissect_ranap_MBMSUELinkingRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 704 "./asn1/ranap/ranap.cnf" +#line 717 "./asn1/ranap/ranap.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO,"MBMSUELinkingRequest "); @@ -11744,7 +11759,7 @@ static const per_sequence_t MBMSUELinkingResponse_sequence[] = { static int dissect_ranap_MBMSUELinkingResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 708 "./asn1/ranap/ranap.cnf" +#line 721 "./asn1/ranap/ranap.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO,"MBMSUELinkingResponse "); @@ -11793,7 +11808,7 @@ static const per_sequence_t MBMSRegistrationRequest_sequence[] = { static int dissect_ranap_MBMSRegistrationRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 712 "./asn1/ranap/ranap.cnf" +#line 725 "./asn1/ranap/ranap.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO,"MBMSRegistrationRequest "); @@ -11812,7 +11827,7 @@ static const per_sequence_t MBMSRegistrationResponse_sequence[] = { static int dissect_ranap_MBMSRegistrationResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 716 "./asn1/ranap/ranap.cnf" +#line 729 "./asn1/ranap/ranap.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO,"MBMSRegistrationResponse "); @@ -11831,7 +11846,7 @@ static const per_sequence_t MBMSRegistrationFailure_sequence[] = { static int dissect_ranap_MBMSRegistrationFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 720 "./asn1/ranap/ranap.cnf" +#line 733 "./asn1/ranap/ranap.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO,"MBMSRegistrationFailure "); @@ -11850,7 +11865,7 @@ static const per_sequence_t MBMSCNDe_RegistrationRequest_sequence[] = { static int dissect_ranap_MBMSCNDe_RegistrationRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 724 "./asn1/ranap/ranap.cnf" +#line 737 "./asn1/ranap/ranap.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO,"MBMSCNDe-RegistrationRequest "); @@ -11869,7 +11884,7 @@ static const per_sequence_t MBMSCNDe_RegistrationResponse_sequence[] = { static int dissect_ranap_MBMSCNDe_RegistrationResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 728 "./asn1/ranap/ranap.cnf" +#line 741 "./asn1/ranap/ranap.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO,"MBMSCNDe-RegistrationResponse "); @@ -11888,7 +11903,7 @@ static const per_sequence_t MBMSRABEstablishmentIndication_sequence[] = { static int dissect_ranap_MBMSRABEstablishmentIndication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 732 "./asn1/ranap/ranap.cnf" +#line 745 "./asn1/ranap/ranap.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO,"MBMSRABEstablishmentIndication "); @@ -11907,7 +11922,7 @@ static const per_sequence_t MBMSRABReleaseRequest_sequence[] = { static int dissect_ranap_MBMSRABReleaseRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 736 "./asn1/ranap/ranap.cnf" +#line 749 "./asn1/ranap/ranap.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO,"MBMSRABReleaseRequest "); @@ -11926,7 +11941,7 @@ static const per_sequence_t MBMSRABRelease_sequence[] = { static int dissect_ranap_MBMSRABRelease(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 740 "./asn1/ranap/ranap.cnf" +#line 753 "./asn1/ranap/ranap.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO,"MBMSRABRelease "); @@ -11945,7 +11960,7 @@ static const per_sequence_t MBMSRABReleaseFailure_sequence[] = { static int dissect_ranap_MBMSRABReleaseFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 744 "./asn1/ranap/ranap.cnf" +#line 757 "./asn1/ranap/ranap.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO,"MBMSRABReleaseFailure "); @@ -11964,7 +11979,7 @@ static const per_sequence_t SRVCC_CSKeysRequest_sequence[] = { static int dissect_ranap_SRVCC_CSKeysRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 772 "./asn1/ranap/ranap.cnf" +#line 785 "./asn1/ranap/ranap.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO,"SRVCC-CSKeysRequest "); @@ -11983,7 +11998,7 @@ static const per_sequence_t SRVCC_CSKeysResponse_sequence[] = { static int dissect_ranap_SRVCC_CSKeysResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 776 "./asn1/ranap/ranap.cnf" +#line 789 "./asn1/ranap/ranap.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO,"SRVCC-CSKeysResponse "); @@ -12002,7 +12017,7 @@ static const per_sequence_t UeRadioCapabilityMatchRequest_sequence[] = { static int dissect_ranap_UeRadioCapabilityMatchRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 780 "./asn1/ranap/ranap.cnf" +#line 793 "./asn1/ranap/ranap.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO,"UeRadioCapabilityMatchRequest "); @@ -12021,7 +12036,7 @@ static const per_sequence_t UeRadioCapabilityMatchResponse_sequence[] = { static int dissect_ranap_UeRadioCapabilityMatchResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 784 "./asn1/ranap/ranap.cnf" +#line 797 "./asn1/ranap/ranap.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO,"UeRadioCapabilityMatchResponse "); @@ -12040,7 +12055,7 @@ static const per_sequence_t UeRegistrationQueryRequest_sequence[] = { static int dissect_ranap_UeRegistrationQueryRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 788 "./asn1/ranap/ranap.cnf" +#line 801 "./asn1/ranap/ranap.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO,"UeRegistrationQueryRequest "); @@ -12059,7 +12074,7 @@ static const per_sequence_t UeRegistrationQueryResponse_sequence[] = { static int dissect_ranap_UeRegistrationQueryResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 792 "./asn1/ranap/ranap.cnf" +#line 805 "./asn1/ranap/ranap.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO,"UeRegistrationQueryResponse "); @@ -12078,7 +12093,7 @@ static const per_sequence_t RerouteNASRequest_sequence[] = { static int dissect_ranap_RerouteNASRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 796 "./asn1/ranap/ranap.cnf" +#line 809 "./asn1/ranap/ranap.cnf" col_set_str(actx->pinfo->cinfo, COL_INFO,"RerouteNASRequest "); @@ -18345,8 +18360,8 @@ void proto_register_ranap(void) { /* List of subtrees */ static gint *ett[] = { &ett_ranap, - &ett_ranap_TransportLayerAddress, - &ett_ranap_TransportLayerAddress_nsap, + &ett_ranap_transportLayerAddress, + &ett_ranap_transportLayerAddress_nsap, /*--- Included file: packet-ranap-ettarr.c ---*/ #line 1 "./asn1/ranap/packet-ranap-ettarr.c" |