diff options
Diffstat (limited to 'epan/dissectors/asn1/ranap')
| -rw-r--r-- | epan/dissectors/asn1/ranap/RANAP-IEs.asn | 4 | ||||
| -rw-r--r-- | epan/dissectors/asn1/ranap/RANAP-PDU-Contents.asn | 12 | ||||
| -rw-r--r-- | epan/dissectors/asn1/ranap/packet-ranap-template.c | 105 | ||||
| -rw-r--r-- | epan/dissectors/asn1/ranap/ranap.cnf | 34 |
4 files changed, 77 insertions, 78 deletions
diff --git a/epan/dissectors/asn1/ranap/RANAP-IEs.asn b/epan/dissectors/asn1/ranap/RANAP-IEs.asn index 3b47d012..7774c6f9 100644 --- a/epan/dissectors/asn1/ranap/RANAP-IEs.asn +++ b/epan/dissectors/asn1/ranap/RANAP-IEs.asn @@ -1207,8 +1207,8 @@ LoadValue ::= INTEGER (0..100) LocationRelatedDataRequestType ::= SEQUENCE { requestedLocationRelatedDataType RequestedLocationRelatedDataType, requestedGPSAssistanceData RequestedGPSAssistanceData OPTIONAL, - -- This IE shall be present if the Requested Location Related Data Type IE is set to ‘Dedicated Assistance Data for Assisted GPS’ or - -- `Dedicated Assistance Data for Assisted GPS and GANSS’ + -- This IE shall be present if the Requested Location Related Data Type IE is set to ‘Dedicated Assistance Data for Assisted GPS’ or + -- `Dedicated Assistance Data for Assisted GPS and GANSS’ ... } diff --git a/epan/dissectors/asn1/ranap/RANAP-PDU-Contents.asn b/epan/dissectors/asn1/ranap/RANAP-PDU-Contents.asn index 840fd695..f41d6555 100644 --- a/epan/dissectors/asn1/ranap/RANAP-PDU-Contents.asn +++ b/epan/dissectors/asn1/ranap/RANAP-PDU-Contents.asn @@ -802,7 +802,7 @@ RelocationRequestExtensions RANAP-PROTOCOL-EXTENSION ::= { { ID id-CSG-Membership-Status CRITICALITY ignore EXTENSION CSG-Membership-Status PRESENCE optional}| -- Extension for Release 10 to enable offload at Iu-PS for UTRAN -- { ID id-MSISDN CRITICALITY ignore EXTENSION MSISDN PRESENCE optional}| --- Extension for Release 11 to support rSRVCC in case of network sharing – +-- Extension for Release 11 to support rSRVCC in case of network sharing – { ID id-AnchorPLMN-ID CRITICALITY ignore EXTENSION PLMNidentity PRESENCE optional}| { ID id-PowerSavingIndicator CRITICALITY ignore EXTENSION PowerSavingIndicator PRESENCE optional}| -- Extension for Release 14 to support QoE function -- @@ -1590,7 +1590,7 @@ EnhancedRelocationCompleteRequestExtensions RANAP-PROTOCOL-EXTENSION ::= { { ID id-ChosenEncryptionAlgorithm CRITICALITY ignore EXTENSION ChosenEncryptionAlgorithm PRESENCE optional}| -- Extension for Release 9 to enable the CN to handle potential UE NAS QoS issues related to higher bitrates -- { ID id-HigherBitratesThan16MbpsFlag CRITICALITY ignore EXTENSION HigherBitratesThan16MbpsFlag PRESENCE optional}| --- Extensions for Release 11 to enable enhanced relocation from RNC to hybrid cell – +-- Extensions for Release 11 to enable enhanced relocation from RNC to hybrid cell – { ID id-CSG-Id CRITICALITY reject EXTENSION CSG-Id PRESENCE optional}| { ID id-Cell-Access-Mode CRITICALITY reject EXTENSION Cell-Access-Mode PRESENCE optional}| -- Extension for Release 11 to support BBAI -- @@ -1665,7 +1665,7 @@ EnhancedRelocationCompleteResponseExtensions RANAP-PROTOCOL-EXTENSION ::= { { ID id-UE-AggregateMaximumBitRate CRITICALITY ignore EXTENSION UE-AggregateMaximumBitRate PRESENCE optional}| -- Extension for Release 10 to enable Offload at Iu-ps for UTRAN -- { ID id-MSISDN CRITICALITY ignore EXTENSION MSISDN PRESENCE optional}| --- Extension for Release 11 to enable ehnahced relocation from RNC to hybrid cell – +-- Extension for Release 11 to enable ehnahced relocation from RNC to hybrid cell – { ID id-CSG-Membership-Status CRITICALITY ignore EXTENSION CSG-Membership-Status PRESENCE optional}, ... } @@ -2586,7 +2586,7 @@ RANAP-EnhancedRelocationInformationRequestExtensions RANAP-PROTOCOL-EXTENSION :: { ID id-RABParametersList CRITICALITY reject EXTENSION RABParametersList PRESENCE optional} | { ID id-CSG-Id CRITICALITY reject EXTENSION CSG-Id PRESENCE optional} | { ID id-CSG-Membership-Status CRITICALITY reject EXTENSION CSG-Membership-Status PRESENCE optional} | --- Extension for Release 11 to support rSRVCC in case of network sharing – +-- Extension for Release 11 to support rSRVCC in case of network sharing – { ID id-AnchorPLMN-ID CRITICALITY ignore EXTENSION PLMNidentity PRESENCE optional}, ... } @@ -2729,7 +2729,7 @@ LocationRelatedDataRequest ::= SEQUENCE { LocationRelatedDataRequestIEs RANAP-PROTOCOL-IES ::= { { ID id-LocationRelatedDataRequestType CRITICALITY reject TYPE LocationRelatedDataRequestType PRESENCE optional }, - -- This IE is mandatory for UTRAN, optional for GERAN Iu Mode –- + -- This IE is mandatory for UTRAN, optional for GERAN Iu Mode –- ... } @@ -2738,7 +2738,7 @@ LocationRelatedDataRequestExtensions RANAP-PROTOCOL-EXTENSION ::= { { ID id-LocationRelatedDataRequestTypeSpecificToGERANIuMode CRITICALITY reject EXTENSION LocationRelatedDataRequestTypeSpecificToGERANIuMode PRESENCE optional }| -- The previous extension is optional for GERAN Iu Mode only, not applicable for UTRAN -- -- Extension for Release 7 to request GANSS Assistance Data. This IE shall be present if the Requested Location Related Data Type IE is set to - -- ‘Dedicated Assistance Data for Assisted GANSS’ or `Dedicated Assistance Data for Assisted GPS and GANSS’-- + -- ‘Dedicated Assistance Data for Assisted GANSS’ or `Dedicated Assistance Data for Assisted GPS and GANSS’-- { ID id-RequestedGANSSAssistanceData CRITICALITY reject EXTENSION RequestedGANSSAssistanceData PRESENCE conditional }, ... } diff --git a/epan/dissectors/asn1/ranap/packet-ranap-template.c b/epan/dissectors/asn1/ranap/packet-ranap-template.c index ce8f0e14..f576345b 100644 --- a/epan/dissectors/asn1/ranap/packet-ranap-template.c +++ b/epan/dissectors/asn1/ranap/packet-ranap-template.c @@ -19,6 +19,7 @@ #include <epan/asn1.h> #include <epan/prefs.h> #include <epan/proto_data.h> +#include <wsutil/array.h> #include "packet-ber.h" #include "packet-per.h" @@ -51,24 +52,24 @@ void proto_register_ranap(void); void proto_reg_handoff_ranap(void); /* Initialize the protocol and registered fields */ -static int proto_ranap = -1; +static int proto_ranap; /* initialise sub-dissector handles */ -static dissector_handle_t rrc_s_to_trnc_handle = NULL; -static dissector_handle_t rrc_t_to_srnc_handle = NULL; -static dissector_handle_t rrc_ho_to_utran_cmd = NULL; -static dissector_handle_t bssgp_handle = NULL; +static dissector_handle_t rrc_s_to_trnc_handle; +static dissector_handle_t rrc_t_to_srnc_handle; +static dissector_handle_t rrc_ho_to_utran_cmd; +static dissector_handle_t bssgp_handle; -static int hf_ranap_transportLayerAddress_ipv4 = -1; -static int hf_ranap_transportLayerAddress_ipv6 = -1; -static int hf_ranap_transportLayerAddress_nsap = -1; +static int hf_ranap_transportLayerAddress_ipv4; +static int hf_ranap_transportLayerAddress_ipv6; +static int hf_ranap_transportLayerAddress_nsap; #include "packet-ranap-hf.c" /* 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; +static int ett_ranap_transportLayerAddress; +static int ett_ranap_transportLayerAddress_nsap; #include "packet-ranap-ett.c" @@ -81,8 +82,8 @@ static int ett_ranap_transportLayerAddress_nsap = -1; typedef struct ranap_private_data_t { - guint32 transportLayerAddress_ipv4; - guint16 binding_id_port; + uint32_t transportLayerAddress_ipv4; + uint16_t binding_id_port; e212_number_type_t number_type; } ranap_private_data_t; @@ -105,25 +106,25 @@ static void ranap_reset_private_data(packet_info *pinfo) p_remove_proto_data(pinfo->pool, pinfo, proto_ranap, 0); } -static guint32 private_data_get_transportLayerAddress_ipv4(asn1_ctx_t *actx) +static uint32_t private_data_get_transportLayerAddress_ipv4(asn1_ctx_t *actx) { ranap_private_data_t *private_data = (ranap_private_data_t*)ranap_get_private_data(actx); return private_data->transportLayerAddress_ipv4; } -static void private_data_set_transportLayerAddress_ipv4(asn1_ctx_t *actx, guint32 transportLayerAddress_ipv4) +static void private_data_set_transportLayerAddress_ipv4(asn1_ctx_t *actx, uint32_t transportLayerAddress_ipv4) { ranap_private_data_t *private_data = (ranap_private_data_t*)ranap_get_private_data(actx); private_data->transportLayerAddress_ipv4 = transportLayerAddress_ipv4; } -static guint16 private_data_get_binding_id_port(asn1_ctx_t *actx) +static uint16_t private_data_get_binding_id_port(asn1_ctx_t *actx) { ranap_private_data_t *private_data = (ranap_private_data_t*)ranap_get_private_data(actx); return private_data->binding_id_port; } -static void private_data_set_binding_id_port(asn1_ctx_t *actx, guint16 binding_id_port) +static void private_data_set_binding_id_port(asn1_ctx_t *actx, uint16_t binding_id_port) { ranap_private_data_t *private_data = (ranap_private_data_t*)ranap_get_private_data(actx); private_data->binding_id_port = binding_id_port; @@ -133,10 +134,10 @@ static void private_data_set_binding_id_port(asn1_ctx_t *actx, guint16 binding_i /* Global variables */ -static guint32 ProcedureCode; -static guint32 ProtocolIE_ID; -static guint32 ProtocolExtensionID; -static gboolean glbl_dissect_container = FALSE; +static uint32_t ProcedureCode; +static uint32_t ProtocolIE_ID; +static uint32_t ProtocolExtensionID; +static bool glbl_dissect_container; static dissector_handle_t ranap_handle; @@ -163,7 +164,7 @@ static dissector_handle_t ranap_handle; #define SOUT (2U<<16) #define SPECIAL (4U<<16) -int pdu_type = 0; /* 0 means wildcard */ +int pdu_type; /* 0 means wildcard */ /* Dissector tables */ static dissector_table_t ranap_ies_dissector_table; @@ -203,16 +204,16 @@ dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree case id_RelocationPreparation: if((ProtocolIE_ID == id_Source_ToTarget_TransparentContainer)||(ProtocolIE_ID == id_Target_ToSource_TransparentContainer)){ key = SPECIAL | ProtocolIE_ID; - ret = (dissector_try_uint_new(ranap_ies_dissector_table, key, tvb, pinfo, tree, FALSE, NULL)) ? tvb_captured_length(tvb) : 0; + ret = (dissector_try_uint_new(ranap_ies_dissector_table, key, tvb, pinfo, tree, false, NULL)) ? tvb_captured_length(tvb) : 0; break; } /* Fall through */ default: /* no special handling */ - ret = (dissector_try_uint_new(ranap_ies_dissector_table, ProtocolIE_ID, tvb, pinfo, tree, FALSE, NULL)) ? tvb_captured_length(tvb) : 0; + ret = (dissector_try_uint_new(ranap_ies_dissector_table, ProtocolIE_ID, tvb, pinfo, tree, false, NULL)) ? tvb_captured_length(tvb) : 0; if (ret == 0) { key = pdu_type | ProtocolIE_ID; - ret = (dissector_try_uint_new(ranap_ies_dissector_table, key, tvb, pinfo, tree, FALSE, NULL)) ? tvb_captured_length(tvb) : 0; + ret = (dissector_try_uint_new(ranap_ies_dissector_table, key, tvb, pinfo, tree, false, NULL)) ? tvb_captured_length(tvb) : 0; } break; } @@ -222,28 +223,28 @@ dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree static int dissect_ProtocolIEFieldPairFirstValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { - return (dissector_try_uint_new(ranap_ies_p1_dissector_table, ProtocolIE_ID, tvb, pinfo, tree, FALSE, NULL)) ? tvb_captured_length(tvb) : 0; + return (dissector_try_uint_new(ranap_ies_p1_dissector_table, ProtocolIE_ID, tvb, pinfo, tree, false, NULL)) ? tvb_captured_length(tvb) : 0; } static int dissect_ProtocolIEFieldPairSecondValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { - return (dissector_try_uint_new(ranap_ies_p2_dissector_table, ProtocolIE_ID, tvb, pinfo, tree, FALSE, NULL)) ? tvb_captured_length(tvb) : 0; + return (dissector_try_uint_new(ranap_ies_p2_dissector_table, ProtocolIE_ID, tvb, pinfo, tree, false, NULL)) ? tvb_captured_length(tvb) : 0; } static int dissect_ProtocolExtensionFieldExtensionValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { - return (dissector_try_uint_new(ranap_extension_dissector_table, ProtocolExtensionID, tvb, pinfo, tree, FALSE, NULL)) ? tvb_captured_length(tvb) : 0; + return (dissector_try_uint_new(ranap_extension_dissector_table, ProtocolExtensionID, tvb, pinfo, tree, false, NULL)) ? tvb_captured_length(tvb) : 0; } static int dissect_InitiatingMessageValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { - gboolean ret; + bool ret; pdu_type = IMSG; - ret = dissector_try_uint_new(ranap_proc_imsg_dissector_table, ProcedureCode, tvb, pinfo, tree, FALSE, NULL); + ret = dissector_try_uint_new(ranap_proc_imsg_dissector_table, ProcedureCode, tvb, pinfo, tree, false, NULL); pdu_type = 0; return ret ? tvb_captured_length(tvb) : 0; } @@ -251,10 +252,10 @@ dissect_InitiatingMessageValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr static int dissect_SuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { - gboolean ret; + bool ret; pdu_type = SOUT; - ret = dissector_try_uint_new(ranap_proc_sout_dissector_table, ProcedureCode, tvb, pinfo, tree, FALSE, NULL); + ret = dissector_try_uint_new(ranap_proc_sout_dissector_table, ProcedureCode, tvb, pinfo, tree, false, NULL); pdu_type = 0; return ret ? tvb_captured_length(tvb) : 0; } @@ -262,13 +263,13 @@ dissect_SuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr static int dissect_UnsuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { - return (dissector_try_uint_new(ranap_proc_uout_dissector_table, ProcedureCode, tvb, pinfo, tree, FALSE, NULL)) ? tvb_captured_length(tvb) : 0; + return (dissector_try_uint_new(ranap_proc_uout_dissector_table, ProcedureCode, tvb, pinfo, tree, false, NULL)) ? tvb_captured_length(tvb) : 0; } static int dissect_OutcomeValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { - return (dissector_try_uint_new(ranap_proc_out_dissector_table, ProcedureCode, tvb, pinfo, tree, FALSE, NULL)) ? tvb_captured_length(tvb) : 0; + return (dissector_try_uint_new(ranap_proc_out_dissector_table, ProcedureCode, tvb, pinfo, tree, false, NULL)) ? tvb_captured_length(tvb) : 0; } static int @@ -302,7 +303,7 @@ dissect_ranap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) sccp_msg_lcl->data.co.assoc->payload = SCCP_PLOAD_RANAP; if (! sccp_msg_lcl->data.co.label && ProcedureCode != 0xFFFFFFFF) { - const gchar* str = val_to_str_const(ProcedureCode, ranap_ProcedureCode_vals, "Unknown RANAP"); + const char* str = val_to_str_const(ProcedureCode, ranap_ProcedureCode_vals, "Unknown RANAP"); sccp_msg_lcl->data.co.label = wmem_strdup(wmem_file_scope(), str); } } @@ -311,12 +312,12 @@ dissect_ranap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) } #define RANAP_MSG_MIN_LENGTH 7 -static gboolean +static bool dissect_sccp_ranap_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) { - guint8 temp; - guint16 word; - guint length; + uint8_t temp; + uint16_t word; + unsigned length; int offset; /* Is it a ranap packet? @@ -334,53 +335,53 @@ dissect_sccp_ranap_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi #define CRIT_OFFSET 2 #define MSG_TYPE_OFFSET 1 #define PDU_TYPE_OFFSET 0 - if (tvb_captured_length(tvb) < RANAP_MSG_MIN_LENGTH) { return FALSE; } + if (tvb_captured_length(tvb) < RANAP_MSG_MIN_LENGTH) { return false; } - temp = tvb_get_guint8(tvb, PDU_TYPE_OFFSET); + temp = tvb_get_uint8(tvb, PDU_TYPE_OFFSET); if (temp & 0x1F) { /* PDU Type byte is not 0x00 (initiatingMessage), 0x20 (succesfulOutcome), 0x40 (unsuccesfulOutcome) or 0x60 (outcome), ignore extension bit (0x80) */ - return FALSE; + return false; } - temp = tvb_get_guint8(tvb, CRIT_OFFSET); + temp = tvb_get_uint8(tvb, CRIT_OFFSET); if (temp == 0xC0 || temp & 0x3F) { /* Criticality byte is not 0x00 (reject), 0x40 (ignore) or 0x80 (notify) */ - return FALSE; + return false; } /* compute aligned PER length determinant without calling dissect_per_length_determinant() to avoid exceptions and info added to tree, info column and expert info */ offset = LENGTH_OFFSET; - length = tvb_get_guint8(tvb, offset); + length = tvb_get_uint8(tvb, offset); offset += 1; if ((length & 0x80) == 0x80) { if ((length & 0xc0) == 0x80) { length &= 0x3f; length <<= 8; - length += tvb_get_guint8(tvb, offset); + length += tvb_get_uint8(tvb, offset); offset += 1; } else { length = 0; } } if (length!= (tvb_reported_length(tvb) - offset)){ - return FALSE; + return false; } - temp = tvb_get_guint8(tvb, MSG_TYPE_OFFSET); - if (temp > RANAP_MAX_PC) { return FALSE; } + temp = tvb_get_uint8(tvb, MSG_TYPE_OFFSET); + if (temp > RANAP_MAX_PC) { return false; } /* Try to strengthen the heuristic further, by checking the byte following the length and the bitfield indicating extensions etc * which usually is a sequence-of length */ word = tvb_get_ntohs(tvb, offset + 1); if (word > 0x1ff){ - return FALSE; + return false; } dissect_ranap(tvb, pinfo, tree, data); - return TRUE; + return true; } /*--- proto_register_ranap -------------------------------------------*/ @@ -408,7 +409,7 @@ void proto_register_ranap(void) { }; /* List of subtrees */ - static gint *ett[] = { + static int *ett[] = { &ett_ranap, &ett_ranap_transportLayerAddress, &ett_ranap_transportLayerAddress_nsap, diff --git a/epan/dissectors/asn1/ranap/ranap.cnf b/epan/dissectors/asn1/ranap/ranap.cnf index 29b7bd1e..342a8940 100644 --- a/epan/dissectors/asn1/ranap/ranap.cnf +++ b/epan/dissectors/asn1/ranap/ranap.cnf @@ -190,13 +190,13 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound") const char *digit_str; sccp_msg_info_t *sccp_info; offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, - 3, 8, FALSE, &imsi_tvb); + 3, 8, false, &imsi_tvb); if(!imsi_tvb) return offset; /* Hide the octet string default printout */ proto_item_set_hidden(actx->created_item); - digit_str = dissect_e212_imsi(imsi_tvb, actx->pinfo, tree, 0, tvb_reported_length(imsi_tvb), FALSE); + digit_str = dissect_e212_imsi(imsi_tvb, actx->pinfo, tree, 0, tvb_reported_length(imsi_tvb), false); sccp_info = (sccp_msg_info_t *)p_get_proto_data(actx->pinfo->pool, actx->pinfo, proto_ranap, actx->pinfo->curr_layer_num); @@ -221,7 +221,7 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound") #.FN_BODY RRC-Container VAL_PTR = &rrc_message_tvb tvbuff_t *rrc_message_tvb=NULL; - guint8 container_choice=0; + uint8_t container_choice=0; %(DEFAULT_BODY)s @@ -243,7 +243,7 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound") */ /* Assume a TargetRNC-ToSourceRNC-Container. Peek the RRC octetstream to guess the choice*/ - container_choice = tvb_get_guint8(rrc_message_tvb, 0) >> 5; + container_choice = tvb_get_uint8(rrc_message_tvb, 0) >> 5; if (container_choice < 7) { /* Normal case (0-6): dissect as TargetRNC-ToSourceRNC-Container */ call_dissector(rrc_t_to_srnc_handle,rrc_message_tvb,%(ACTX)s->pinfo, proto_tree_get_root(tree)); @@ -293,11 +293,11 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound") private_data->number_type = E212_NONE; offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, - 3, 3, FALSE, ¶meter_tvb); + 3, 3, false, ¶meter_tvb); if (!parameter_tvb) return offset; - dissect_e212_mcc_mnc(parameter_tvb, actx->pinfo, tree, 0, number_type, FALSE); + dissect_e212_mcc_mnc(parameter_tvb, actx->pinfo, tree, 0, number_type, false); #.END #.FN_BODY CGI @@ -352,9 +352,9 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound") tvbuff_t *parameter_tvb = NULL; proto_item *item; proto_tree *subtree, *nsap_tree; - guint8 *padded_nsap_bytes; + uint8_t *padded_nsap_bytes; tvbuff_t *nsap_tvb; - gint tvb_len; + int tvb_len; %(DEFAULT_BODY)s if (!parameter_tvb) @@ -377,7 +377,7 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound") if (tvb_len == 7){ /* Unpadded IPv4 NSAP */ /* Creating a new TVB with padding */ - padded_nsap_bytes = (guint8*) wmem_alloc0(actx->pinfo->pool, 20); + padded_nsap_bytes = (uint8_t*) 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"); @@ -451,7 +451,7 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound") /* N.B. value_tvb is 4 bytes of OCTET STRING */ if (tvb_get_ntohs(value_tvb, 2) == 0) { /* Will show first 2 bytes as an integer, as very likely to be a UDP port number */ - guint16 port_number = tvb_get_ntohs(value_tvb, 0); + uint16_t port_number = tvb_get_ntohs(value_tvb, 0); private_data_set_binding_id_port(actx, port_number); proto_item_append_text(actx->created_item, " (%%u)", port_number); } @@ -465,8 +465,8 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound") #.FN_BODY RAB-SetupOrModifyItemFirst address ipv4_addr; - guint32 transportLayerAddress_ipv4; - guint16 binding_id; + uint32_t transportLayerAddress_ipv4; + uint16_t binding_id; private_data_set_transportLayerAddress_ipv4(actx, 0); private_data_set_binding_id_port(actx, 0); @@ -478,12 +478,12 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound") } set_address(&ipv4_addr, AT_IPv4, 4, &transportLayerAddress_ipv4); /* Set RTP dissector for the UDP stream of this RAB */ - rtp_add_address(actx->pinfo, PT_UDP, &ipv4_addr, binding_id, 0, "RANAP", actx->pinfo->num, FALSE, 0); + rtp_add_address(actx->pinfo, PT_UDP, &ipv4_addr, binding_id, 0, "RANAP", actx->pinfo->num, false, 0); #.FN_BODY RAB-SetupOrModifiedItem address ipv4_addr; - guint32 transportLayerAddress_ipv4; - guint16 binding_id; + uint32_t transportLayerAddress_ipv4; + uint16_t binding_id; private_data_set_transportLayerAddress_ipv4(actx, 0); private_data_set_binding_id_port(actx, 0); @@ -495,7 +495,7 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound") } set_address(&ipv4_addr, AT_IPv4, 4, &transportLayerAddress_ipv4); /* Set RTP dissector for the UDP stream of this RAB */ - rtp_add_address(actx->pinfo, PT_UDP, &ipv4_addr, binding_id, 0, "RANAP", actx->pinfo->num, FALSE, 0); + rtp_add_address(actx->pinfo, PT_UDP, &ipv4_addr, binding_id, 0, "RANAP", actx->pinfo->num, false, 0); # Contains the BSSGP RIM PDU as defined in TS 48.018 [36]. #.FN_BODY RIMInformation VAL_PTR=&value_tvb @@ -1198,8 +1198,6 @@ id-Correlation-ID ProtocolIE-ID id-IRAT-Measurement-Configuration ProtocolIE-ID id-MDT-Configuration ProtocolIE-ID id-Priority-Class-Indicator ProtocolIE-ID -# Ws Extension -id-Not-Used-246 ProtocolIE-ID id-RNSAPRelocationParameters ProtocolIE-ID id-RABParametersList ProtocolIE-ID id-Management-Based-MDT-Allowed ProtocolIE-ID |