diff options
-rw-r--r-- | epan/dissectors/asn1/gsm_map/gsm_map.cnf | 9 | ||||
-rw-r--r-- | epan/dissectors/asn1/hnbap/hnbap.cnf | 27 | ||||
-rw-r--r-- | epan/dissectors/asn1/nrppa/nrppa.cnf | 9 | ||||
-rw-r--r-- | epan/dissectors/asn1/ranap/ranap.cnf | 45 | ||||
-rw-r--r-- | epan/dissectors/asn1/rnsap/rnsap.cnf | 35 | ||||
-rw-r--r-- | epan/dissectors/asn1/sbc-ap/sbc-ap.cnf | 19 | ||||
-rw-r--r-- | epan/dissectors/packet-gsm_map.c | 14 | ||||
-rw-r--r-- | epan/dissectors/packet-hnbap.c | 46 | ||||
-rw-r--r-- | epan/dissectors/packet-nrppa.c | 16 | ||||
-rw-r--r-- | epan/dissectors/packet-ranap.c | 80 | ||||
-rw-r--r-- | epan/dissectors/packet-rnsap.c | 57 | ||||
-rw-r--r-- | epan/dissectors/packet-sbc-ap.c | 57 |
12 files changed, 343 insertions, 71 deletions
diff --git a/epan/dissectors/asn1/gsm_map/gsm_map.cnf b/epan/dissectors/asn1/gsm_map/gsm_map.cnf index 654e229aa5..2064549460 100644 --- a/epan/dissectors/asn1/gsm_map/gsm_map.cnf +++ b/epan/dissectors/asn1/gsm_map/gsm_map.cnf @@ -1192,6 +1192,15 @@ MAP interfaces subtree = proto_item_add_subtree(actx->created_item, ett_gsm_map_GeodeticInformation); dissect_isup_calling_geodetic_location_parameter(parameter_tvb, actx->pinfo, subtree, NULL); +#.TYPE_ATTR +LAC TYPE = FT_UINT16 DISPLAY = BASE_DEC_HEX +#.FN_BODY LAC VAL_PTR = ¶meter_tvb HF_INDEX = -1 + tvbuff_t *parameter_tvb = NULL; +%(DEFAULT_BODY)s + if (parameter_tvb) { + actx->created_item = proto_tree_add_item(tree, hf_index, parameter_tvb, 0, 2, ENC_BIG_ENDIAN); + } + # Make dissector table for V3 messages #.REGISTER diff --git a/epan/dissectors/asn1/hnbap/hnbap.cnf b/epan/dissectors/asn1/hnbap/hnbap.cnf index c721c76b46..14c0fdac2b 100644 --- a/epan/dissectors/asn1/hnbap/hnbap.cnf +++ b/epan/dissectors/asn1/hnbap/hnbap.cnf @@ -170,6 +170,33 @@ AccessResult } #.END +#.TYPE_ATTR +LAC TYPE = FT_UINT16 DISPLAY = BASE_DEC_HEX +#.FN_BODY LAC VAL_PTR = ¶meter_tvb HF_INDEX = -1 + tvbuff_t *parameter_tvb = NULL; +%(DEFAULT_BODY)s + if (parameter_tvb) { + actx->created_item = proto_tree_add_item(tree, hf_index, parameter_tvb, 0, 2, ENC_BIG_ENDIAN); + } + +#.TYPE_ATTR +RAC TYPE = FT_UINT8 DISPLAY = BASE_DEC_HEX +#.FN_BODY RAC VAL_PTR = ¶meter_tvb HF_INDEX = -1 + tvbuff_t *parameter_tvb = NULL; +%(DEFAULT_BODY)s + if (parameter_tvb) { + actx->created_item = proto_tree_add_item(tree, hf_index, parameter_tvb, 0, 1, ENC_BIG_ENDIAN); + } + +#.TYPE_ATTR +SAC TYPE = FT_UINT16 DISPLAY = BASE_DEC_HEX +#.FN_BODY SAC VAL_PTR = ¶meter_tvb HF_INDEX = -1 + tvbuff_t *parameter_tvb = NULL; +%(DEFAULT_BODY)s + if (parameter_tvb) { + actx->created_item = proto_tree_add_item(tree, hf_index, parameter_tvb, 0, 2, ENC_BIG_ENDIAN); + } + #.ASSIGN_VALUE_TO_TYPE # HNBAP ASN.1 does not have constants assigned to types # ProcedureCode id-HNBRegister ProcedureCode diff --git a/epan/dissectors/asn1/nrppa/nrppa.cnf b/epan/dissectors/asn1/nrppa/nrppa.cnf index 594fccf86f..9c9b5928dc 100644 --- a/epan/dissectors/asn1/nrppa/nrppa.cnf +++ b/epan/dissectors/asn1/nrppa/nrppa.cnf @@ -67,6 +67,15 @@ ProtocolExtensionField/id ext_id #.END #.TYPE_ATTR +TAC TYPE = FT_UINT24 DISPLAY = BASE_DEC_HEX +#.FN_BODY TAC VAL_PTR = ¶meter_tvb HF_INDEX = -1 + tvbuff_t *parameter_tvb = NULL; +%(DEFAULT_BODY)s + if (parameter_tvb) { + actx->created_item = proto_tree_add_item(tree, hf_index, parameter_tvb, 0, 3, ENC_BIG_ENDIAN); + } + +#.TYPE_ATTR #.TYPE_ATTR diff --git a/epan/dissectors/asn1/ranap/ranap.cnf b/epan/dissectors/asn1/ranap/ranap.cnf index 5ba5b7fdb2..99ea0f9930 100644 --- a/epan/dissectors/asn1/ranap/ranap.cnf +++ b/epan/dissectors/asn1/ranap/ranap.cnf @@ -812,6 +812,51 @@ col_set_str(actx->pinfo->cinfo, COL_INFO,"RerouteNASRequest "); ProtocolExtensionID TYPE = FT_UINT8 DISPLAY = BASE_DEC|BASE_EXT_STRING STRINGS = &ranap_ProtocolIE_ID_vals_ext GTP-TEI TYPE = FT_UINT32 DISPLAY = BASE_HEX_DEC STRINGS = NULL +#.TYPE_ATTR +Port-Number TYPE = FT_UINT16 DISPLAY = BASE_DEC +#.FN_BODY Port-Number VAL_PTR = ¶meter_tvb HF_INDEX = -1 + tvbuff_t *parameter_tvb = NULL; +%(DEFAULT_BODY)s + if (parameter_tvb) { + actx->created_item = proto_tree_add_item(tree, hf_index, parameter_tvb, 0, 2, ENC_BIG_ENDIAN); + } + +#.TYPE_ATTR +LAC TYPE = FT_UINT16 DISPLAY = BASE_DEC_HEX +#.FN_BODY LAC VAL_PTR = ¶meter_tvb HF_INDEX = -1 + tvbuff_t *parameter_tvb = NULL; +%(DEFAULT_BODY)s + if (parameter_tvb) { + actx->created_item = proto_tree_add_item(tree, hf_index, parameter_tvb, 0, 2, ENC_BIG_ENDIAN); + } + +#.TYPE_ATTR +RAC TYPE = FT_UINT8 DISPLAY = BASE_DEC_HEX +#.FN_BODY RAC VAL_PTR = ¶meter_tvb HF_INDEX = -1 + tvbuff_t *parameter_tvb = NULL; +%(DEFAULT_BODY)s + if (parameter_tvb) { + actx->created_item = proto_tree_add_item(tree, hf_index, parameter_tvb, 0, 1, ENC_BIG_ENDIAN); + } + +#.TYPE_ATTR +SAC TYPE = FT_UINT16 DISPLAY = BASE_DEC_HEX +#.FN_BODY SAC VAL_PTR = ¶meter_tvb HF_INDEX = -1 + tvbuff_t *parameter_tvb = NULL; +%(DEFAULT_BODY)s + if (parameter_tvb) { + actx->created_item = proto_tree_add_item(tree, hf_index, parameter_tvb, 0, 2, ENC_BIG_ENDIAN); + } + +#.TYPE_ATTR +TAC TYPE = FT_UINT16 DISPLAY = BASE_DEC_HEX +#.FN_BODY TAC VAL_PTR = ¶meter_tvb HF_INDEX = -1 + tvbuff_t *parameter_tvb = NULL; +%(DEFAULT_BODY)s + if (parameter_tvb) { + actx->created_item = proto_tree_add_item(tree, hf_index, parameter_tvb, 0, 2, ENC_BIG_ENDIAN); + } + #.ASSIGN_VALUE_TO_TYPE # RANAP does not have constants assigned to types, they are pure INTEGER # ProcedureCode id-RAB-Assignment ProcedureCode diff --git a/epan/dissectors/asn1/rnsap/rnsap.cnf b/epan/dissectors/asn1/rnsap/rnsap.cnf index 2b7bdac998..060d6ee68a 100644 --- a/epan/dissectors/asn1/rnsap/rnsap.cnf +++ b/epan/dissectors/asn1/rnsap/rnsap.cnf @@ -211,6 +211,41 @@ BLER TYPE = FT_INT32 DISPLAY = BASE_DEC STRINGS = NULL dissect_nsap(nsap_tvb, 0, 20, nsap_tree); } +#.TYPE_ATTR +LAC TYPE = FT_UINT16 DISPLAY = BASE_DEC_HEX +#.FN_BODY LAC VAL_PTR = ¶meter_tvb HF_INDEX = -1 + tvbuff_t *parameter_tvb = NULL; +%(DEFAULT_BODY)s + if (parameter_tvb) { + actx->created_item = proto_tree_add_item(tree, hf_index, parameter_tvb, 0, 2, ENC_BIG_ENDIAN); + } + +#.TYPE_ATTR +RAC TYPE = FT_UINT8 DISPLAY = BASE_DEC_HEX +#.FN_BODY RAC VAL_PTR = ¶meter_tvb HF_INDEX = -1 + tvbuff_t *parameter_tvb = NULL; +%(DEFAULT_BODY)s + if (parameter_tvb) { + actx->created_item = proto_tree_add_item(tree, hf_index, parameter_tvb, 0, 1, ENC_BIG_ENDIAN); + } + +#.TYPE_ATTR +SAC TYPE = FT_UINT16 DISPLAY = BASE_DEC_HEX +#.FN_BODY SAC VAL_PTR = ¶meter_tvb HF_INDEX = -1 + tvbuff_t *parameter_tvb = NULL; +%(DEFAULT_BODY)s + if (parameter_tvb) { + actx->created_item = proto_tree_add_item(tree, hf_index, parameter_tvb, 0, 2, ENC_BIG_ENDIAN); + } + +#.TYPE_ATTR +TAC TYPE = FT_UINT16 DISPLAY = BASE_DEC_HEX +#.FN_BODY TAC VAL_PTR = ¶meter_tvb HF_INDEX = -1 + tvbuff_t *parameter_tvb = NULL; +%(DEFAULT_BODY)s + if (parameter_tvb) { + actx->created_item = proto_tree_add_item(tree, hf_index, parameter_tvb, 0, 2, ENC_BIG_ENDIAN); + } #.REGISTER diff --git a/epan/dissectors/asn1/sbc-ap/sbc-ap.cnf b/epan/dissectors/asn1/sbc-ap/sbc-ap.cnf index eb4a219257..0fd5dd08f2 100644 --- a/epan/dissectors/asn1/sbc-ap/sbc-ap.cnf +++ b/epan/dissectors/asn1/sbc-ap/sbc-ap.cnf @@ -110,6 +110,25 @@ ProtocolIE-Field/value ie_field_value #.TYPE_ATTR ProtocolExtensionID TYPE = FT_UINT8 DISPLAY = BASE_DEC STRINGS = VALS(sbc_ap_ProtocolIE_ID_vals) +#.TYPE_ATTR +TAC TYPE = FT_UINT16 DISPLAY = BASE_DEC_HEX +#.FN_BODY TAC VAL_PTR = ¶meter_tvb HF_INDEX = -1 + tvbuff_t *parameter_tvb = NULL; +%(DEFAULT_BODY)s + if (parameter_tvb) { + actx->created_item = proto_tree_add_item(tree, hf_index, parameter_tvb, 0, 2, ENC_BIG_ENDIAN); + } + +#.TYPE_ATTR +TAC-5GS TYPE = FT_UINT24 DISPLAY = BASE_DEC_HEX +#.FN_BODY TAC-5GS VAL_PTR = ¶meter_tvb HF_INDEX = -1 + tvbuff_t *parameter_tvb = NULL; +%(DEFAULT_BODY)s + if (parameter_tvb) { + actx->created_item = proto_tree_add_item(tree, hf_index, parameter_tvb, 0, 3, ENC_BIG_ENDIAN); + } + + #.ASSIGN_VALUE_TO_TYPE # SBC-AP does not have constants assigned to types, they are pure INTEGER # ProcedureCode id-Write-Replace-Warning ProcedureCode diff --git a/epan/dissectors/packet-gsm_map.c b/epan/dissectors/packet-gsm_map.c index 00de07240c..a46a671a49 100644 --- a/epan/dissectors/packet-gsm_map.c +++ b/epan/dissectors/packet-gsm_map.c @@ -8553,8 +8553,16 @@ dissect_gsm_map_ms_ADD_Info(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of static int dissect_gsm_map_ms_LAC(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); +#line 1198 "./asn1/gsm_map/gsm_map.cnf" + tvbuff_t *parameter_tvb = NULL; + offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, -1, + ¶meter_tvb); + + if (parameter_tvb) { + actx->created_item = proto_tree_add_item(tree, hf_index, parameter_tvb, 0, 2, ENC_BIG_ENDIAN); + } + + return offset; } @@ -26396,7 +26404,7 @@ void proto_register_gsm_map(void) { NULL, HFILL }}, { &hf_gsm_map_ms_lac, { "lac", "gsm_map.ms.lac", - FT_BYTES, BASE_NONE, NULL, 0, + FT_UINT16, BASE_DEC_HEX, NULL, 0, NULL, HFILL }}, { &hf_gsm_map_ms_identity, { "identity", "gsm_map.ms.identity", diff --git a/epan/dissectors/packet-hnbap.c b/epan/dissectors/packet-hnbap.c index 12b14b2b10..26b260e216 100644 --- a/epan/dissectors/packet-hnbap.c +++ b/epan/dissectors/packet-hnbap.c @@ -957,8 +957,16 @@ dissect_hnbap_PLMNidentity(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _ static int dissect_hnbap_LAC(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, - 2, 2, FALSE, NULL); +#line 176 "./asn1/hnbap/hnbap.cnf" + tvbuff_t *parameter_tvb = NULL; + offset = dissect_per_octet_string(tvb, offset, actx, tree, -1, + 2, 2, FALSE, ¶meter_tvb); + + if (parameter_tvb) { + actx->created_item = proto_tree_add_item(tree, hf_index, parameter_tvb, 0, 2, ENC_BIG_ENDIAN); + } + + return offset; } @@ -1304,8 +1312,16 @@ dissect_hnbap_HNBConfigInfo(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx static int dissect_hnbap_RAC(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, - 1, 1, FALSE, NULL); +#line 185 "./asn1/hnbap/hnbap.cnf" + tvbuff_t *parameter_tvb = NULL; + offset = dissect_per_octet_string(tvb, offset, actx, tree, -1, + 1, 1, FALSE, ¶meter_tvb); + + if (parameter_tvb) { + actx->created_item = proto_tree_add_item(tree, hf_index, parameter_tvb, 0, 1, ENC_BIG_ENDIAN); + } + + return offset; } @@ -1689,8 +1705,16 @@ dissect_hnbap_RNC_ID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, pr static int dissect_hnbap_SAC(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, - 2, 2, FALSE, NULL); +#line 194 "./asn1/hnbap/hnbap.cnf" + tvbuff_t *parameter_tvb = NULL; + offset = dissect_per_octet_string(tvb, offset, actx, tree, -1, + 2, 2, FALSE, ¶meter_tvb); + + if (parameter_tvb) { + actx->created_item = proto_tree_add_item(tree, hf_index, parameter_tvb, 0, 2, ENC_BIG_ENDIAN); + } + + return offset; } @@ -2714,7 +2738,7 @@ module_t *hnbap_module; NULL, HFILL }}, { &hf_hnbap_LAC_PDU, { "LAC", "hnbap.LAC", - FT_BYTES, BASE_NONE, NULL, 0, + FT_UINT16, BASE_DEC_HEX, NULL, 0, NULL, HFILL }}, { &hf_hnbap_MuxPortNumber_PDU, { "MuxPortNumber", "hnbap.MuxPortNumber", @@ -2742,7 +2766,7 @@ module_t *hnbap_module; NULL, HFILL }}, { &hf_hnbap_RAC_PDU, { "RAC", "hnbap.RAC", - FT_BYTES, BASE_NONE, NULL, 0, + FT_UINT8, BASE_DEC_HEX, NULL, 0, NULL, HFILL }}, { &hf_hnbap_Registration_Cause_PDU, { "Registration-Cause", "hnbap.Registration_Cause", @@ -2754,7 +2778,7 @@ module_t *hnbap_module; NULL, HFILL }}, { &hf_hnbap_SAC_PDU, { "SAC", "hnbap.SAC", - FT_BYTES, BASE_NONE, NULL, 0, + FT_UINT16, BASE_DEC_HEX, NULL, 0, NULL, HFILL }}, { &hf_hnbap_UE_Capabilities_PDU, { "UE-Capabilities", "hnbap.UE_Capabilities_element", @@ -2954,7 +2978,7 @@ module_t *hnbap_module; NULL, HFILL }}, { &hf_hnbap_lAC, { "lAC", "hnbap.lAC", - FT_BYTES, BASE_NONE, NULL, 0, + FT_UINT16, BASE_DEC_HEX, NULL, 0, NULL, HFILL }}, { &hf_hnbap_cI, { "cI", "hnbap.cI", @@ -3118,7 +3142,7 @@ module_t *hnbap_module; NULL, HFILL }}, { &hf_hnbap_rAC, { "rAC", "hnbap.rAC", - FT_BYTES, BASE_NONE, NULL, 0, + FT_UINT8, BASE_DEC_HEX, NULL, 0, NULL, HFILL }}, { &hf_hnbap_tMSI, { "tMSI", "hnbap.tMSI", diff --git a/epan/dissectors/packet-nrppa.c b/epan/dissectors/packet-nrppa.c index 7c5146d0db..dda027b616 100644 --- a/epan/dissectors/packet-nrppa.c +++ b/epan/dissectors/packet-nrppa.c @@ -4145,8 +4145,16 @@ dissect_nrppa_DLPRSResourceCoordinates(tvbuff_t *tvb _U_, int offset _U_, asn1_c static int dissect_nrppa_TAC(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, - 3, 3, FALSE, NULL); +#line 72 "./asn1/nrppa/nrppa.cnf" + tvbuff_t *parameter_tvb = NULL; + offset = dissect_per_octet_string(tvb, offset, actx, tree, -1, + 3, 3, FALSE, ¶meter_tvb); + + if (parameter_tvb) { + actx->created_item = proto_tree_add_item(tree, hf_index, parameter_tvb, 0, 3, ENC_BIG_ENDIAN); + } + + return offset; } @@ -9684,7 +9692,7 @@ void proto_register_nrppa(void) { "NG_RAN_CGI", HFILL }}, { &hf_nrppa_servingCellTAC, { "servingCellTAC", "nrppa.servingCellTAC", - FT_BYTES, BASE_NONE, NULL, 0, + FT_UINT24, BASE_DEC_HEX, NULL, 0, "TAC", HFILL }}, { &hf_nrppa_nG_RANAccessPointPosition, { "nG-RANAccessPointPosition", "nrppa.nG_RANAccessPointPosition_element", @@ -9952,7 +9960,7 @@ void proto_register_nrppa(void) { NULL, HFILL }}, { &hf_nrppa_tAC, { "tAC", "nrppa.tAC", - FT_BYTES, BASE_NONE, NULL, 0, + FT_UINT24, BASE_DEC_HEX, NULL, 0, NULL, HFILL }}, { &hf_nrppa_eARFCN, { "eARFCN", "nrppa.eARFCN", diff --git a/epan/dissectors/packet-ranap.c b/epan/dissectors/packet-ranap.c index f1b8407f90..c78ee1c6c9 100644 --- a/epan/dissectors/packet-ranap.c +++ b/epan/dissectors/packet-ranap.c @@ -2467,8 +2467,16 @@ dissect_ranap_PLMNidentity(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _ static int dissect_ranap_LAC(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, - 2, 2, FALSE, NULL); +#line 827 "./asn1/ranap/ranap.cnf" + tvbuff_t *parameter_tvb = NULL; + offset = dissect_per_octet_string(tvb, offset, actx, tree, -1, + 2, 2, FALSE, ¶meter_tvb); + + if (parameter_tvb) { + actx->created_item = proto_tree_add_item(tree, hf_index, parameter_tvb, 0, 2, ENC_BIG_ENDIAN); + } + + return offset; } @@ -2493,8 +2501,16 @@ dissect_ranap_LAI(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto static int dissect_ranap_RAC(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, - 1, 1, FALSE, NULL); +#line 836 "./asn1/ranap/ranap.cnf" + tvbuff_t *parameter_tvb = NULL; + offset = dissect_per_octet_string(tvb, offset, actx, tree, -1, + 1, 1, FALSE, ¶meter_tvb); + + if (parameter_tvb) { + actx->created_item = proto_tree_add_item(tree, hf_index, parameter_tvb, 0, 1, ENC_BIG_ENDIAN); + } + + return offset; } @@ -3389,8 +3405,16 @@ dissect_ranap_APN(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto static int dissect_ranap_SAC(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, - 2, 2, FALSE, NULL); +#line 845 "./asn1/ranap/ranap.cnf" + tvbuff_t *parameter_tvb = NULL; + offset = dissect_per_octet_string(tvb, offset, actx, tree, -1, + 2, 2, FALSE, ¶meter_tvb); + + if (parameter_tvb) { + actx->created_item = proto_tree_add_item(tree, hf_index, parameter_tvb, 0, 2, ENC_BIG_ENDIAN); + } + + return offset; } @@ -5865,8 +5889,16 @@ dissect_ranap_TargetRNC_ID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _ static int dissect_ranap_TAC(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, - 2, 2, FALSE, NULL); +#line 854 "./asn1/ranap/ranap.cnf" + tvbuff_t *parameter_tvb = NULL; + offset = dissect_per_octet_string(tvb, offset, actx, tree, -1, + 2, 2, FALSE, ¶meter_tvb); + + if (parameter_tvb) { + actx->created_item = proto_tree_add_item(tree, hf_index, parameter_tvb, 0, 2, ENC_BIG_ENDIAN); + } + + return offset; } @@ -7240,8 +7272,16 @@ dissect_ranap_PLMNs_in_shared_network(tvbuff_t *tvb _U_, int offset _U_, asn1_ct static int dissect_ranap_Port_Number(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, - 2, 2, FALSE, NULL); +#line 818 "./asn1/ranap/ranap.cnf" + tvbuff_t *parameter_tvb = NULL; + offset = dissect_per_octet_string(tvb, offset, actx, tree, -1, + 2, 2, FALSE, ¶meter_tvb); + + if (parameter_tvb) { + actx->created_item = proto_tree_add_item(tree, hf_index, parameter_tvb, 0, 2, ENC_BIG_ENDIAN); + } + + return offset; } @@ -15674,7 +15714,7 @@ void proto_register_ranap(void) { NULL, HFILL }}, { &hf_ranap_RAC_PDU, { "RAC", "ranap.RAC", - FT_BYTES, BASE_NONE, NULL, 0, + FT_UINT8, BASE_DEC_HEX, NULL, 0, NULL, HFILL }}, { &hf_ranap_RAListofIdleModeUEs_PDU, { "RAListofIdleModeUEs", "ranap.RAListofIdleModeUEs", @@ -16638,7 +16678,7 @@ void proto_register_ranap(void) { "LAI", HFILL }}, { &hf_ranap_old_RAC, { "old-RAC", "ranap.old_RAC", - FT_BYTES, BASE_NONE, NULL, 0, + FT_UINT8, BASE_DEC_HEX, NULL, 0, "RAC", HFILL }}, { &hf_ranap_nRI, { "nRI", "ranap.nRI", @@ -16970,7 +17010,7 @@ void proto_register_ranap(void) { "RepetitionNumber1", HFILL }}, { &hf_ranap_lAC, { "lAC", "ranap.lAC", - FT_BYTES, BASE_NONE, NULL, 0, + FT_UINT16, BASE_DEC_HEX, NULL, 0, NULL, HFILL }}, { &hf_ranap_cI, { "cI", "ranap.cI", @@ -16990,11 +17030,11 @@ void proto_register_ranap(void) { NULL, HFILL }}, { &hf_ranap_NewRAListofIdleModeUEs_item, { "RAC", "ranap.RAC", - FT_BYTES, BASE_NONE, NULL, 0, + FT_UINT8, BASE_DEC_HEX, NULL, 0, NULL, HFILL }}, { &hf_ranap_RAListwithNoIdleModeUEsAnyMore_item, { "RAC", "ranap.RAC", - FT_BYTES, BASE_NONE, NULL, 0, + FT_UINT8, BASE_DEC_HEX, NULL, 0, NULL, HFILL }}, { &hf_ranap_macroENB_ID, { "macroENB-ID", "ranap.macroENB_ID", @@ -17162,7 +17202,7 @@ void proto_register_ranap(void) { NULL, HFILL }}, { &hf_ranap_rAC, { "rAC", "ranap.rAC", - FT_BYTES, BASE_NONE, NULL, 0, + FT_UINT8, BASE_DEC_HEX, NULL, 0, NULL, HFILL }}, { &hf_ranap_cN_ID, { "cN-ID", "ranap.cN_ID", @@ -17646,7 +17686,7 @@ void proto_register_ranap(void) { NULL, HFILL }}, { &hf_ranap_RAofIdleModeUEs_item, { "RAC", "ranap.RAC", - FT_BYTES, BASE_NONE, NULL, 0, + FT_UINT8, BASE_DEC_HEX, NULL, 0, NULL, HFILL }}, { &hf_ranap_LAListofIdleModeUEs_item, { "LAI", "ranap.LAI_element", @@ -17770,7 +17810,7 @@ void proto_register_ranap(void) { "OCTET_STRING_SIZE_1_maxSizeOfIMSInfo", HFILL }}, { &hf_ranap_sAC, { "sAC", "ranap.sAC", - FT_BYTES, BASE_NONE, NULL, 0, + FT_UINT16, BASE_DEC_HEX, NULL, 0, NULL, HFILL }}, { &hf_ranap_pLMNs_in_shared_network, { "pLMNs-in-shared-network", "ranap.pLMNs_in_shared_network", @@ -17946,7 +17986,7 @@ void proto_register_ranap(void) { NULL, HFILL }}, { &hf_ranap_tAC, { "tAC", "ranap.tAC", - FT_BYTES, BASE_NONE, NULL, 0, + FT_UINT16, BASE_DEC_HEX, NULL, 0, NULL, HFILL }}, { &hf_ranap_cGI, { "cGI", "ranap.cGI_element", @@ -18010,7 +18050,7 @@ void proto_register_ranap(void) { NULL, HFILL }}, { &hf_ranap_uDP_Port_Number, { "uDP-Port-Number", "ranap.uDP_Port_Number", - FT_BYTES, BASE_NONE, NULL, 0, + FT_UINT16, BASE_DEC, NULL, 0, "Port_Number", HFILL }}, { &hf_ranap_uE_AggregateMaximumBitRateDownlink, { "uE-AggregateMaximumBitRateDownlink", "ranap.uE_AggregateMaximumBitRateDownlink", diff --git a/epan/dissectors/packet-rnsap.c b/epan/dissectors/packet-rnsap.c index 7cdea464f1..b44238d141 100644 --- a/epan/dissectors/packet-rnsap.c +++ b/epan/dissectors/packet-rnsap.c @@ -7887,7 +7887,6 @@ dissect_rnsap_TransportLayerAddress(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_ - return offset; } @@ -9691,8 +9690,16 @@ dissect_rnsap_RNC_ID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, pr static int dissect_rnsap_LAC(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, - 2, 2, FALSE, NULL); +#line 217 "./asn1/rnsap/rnsap.cnf" + tvbuff_t *parameter_tvb = NULL; + offset = dissect_per_octet_string(tvb, offset, actx, tree, -1, + 2, 2, FALSE, ¶meter_tvb); + + if (parameter_tvb) { + actx->created_item = proto_tree_add_item(tree, hf_index, parameter_tvb, 0, 2, ENC_BIG_ENDIAN); + } + + return offset; } @@ -9701,8 +9708,16 @@ dissect_rnsap_LAC(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto static int dissect_rnsap_RAC(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, - 1, 1, FALSE, NULL); +#line 226 "./asn1/rnsap/rnsap.cnf" + tvbuff_t *parameter_tvb = NULL; + offset = dissect_per_octet_string(tvb, offset, actx, tree, -1, + 1, 1, FALSE, ¶meter_tvb); + + if (parameter_tvb) { + actx->created_item = proto_tree_add_item(tree, hf_index, parameter_tvb, 0, 1, ENC_BIG_ENDIAN); + } + + return offset; } @@ -28942,8 +28957,16 @@ dissect_rnsap_Rx_Timing_Deviation_Value_768(tvbuff_t *tvb _U_, int offset _U_, a static int dissect_rnsap_SAC(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, - 2, 2, FALSE, NULL); +#line 235 "./asn1/rnsap/rnsap.cnf" + tvbuff_t *parameter_tvb = NULL; + offset = dissect_per_octet_string(tvb, offset, actx, tree, -1, + 2, 2, FALSE, ¶meter_tvb); + + if (parameter_tvb) { + actx->created_item = proto_tree_add_item(tree, hf_index, parameter_tvb, 0, 2, ENC_BIG_ENDIAN); + } + + return offset; } @@ -29914,8 +29937,16 @@ dissect_rnsap_SYNC_UL_ProcParameters(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx static int dissect_rnsap_TAC(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, - 2, 2, FALSE, NULL); +#line 244 "./asn1/rnsap/rnsap.cnf" + tvbuff_t *parameter_tvb = NULL; + offset = dissect_per_octet_string(tvb, offset, actx, tree, -1, + 2, 2, FALSE, ¶meter_tvb); + + if (parameter_tvb) { + actx->created_item = proto_tree_add_item(tree, hf_index, parameter_tvb, 0, 2, ENC_BIG_ENDIAN); + } + + return offset; } @@ -50939,7 +50970,7 @@ void proto_register_rnsap(void) { NULL, HFILL }}, { &hf_rnsap_TAC_PDU, { "TAC", "rnsap.TAC", - FT_BYTES, BASE_NONE, NULL, 0, + FT_UINT16, BASE_DEC_HEX, NULL, 0, NULL, HFILL }}, { &hf_rnsap_TargetID_PDU, { "TargetID", "rnsap.TargetID_element", @@ -53187,11 +53218,11 @@ void proto_register_rnsap(void) { NULL, HFILL }}, { &hf_rnsap_lAC, { "lAC", "rnsap.lAC", - FT_BYTES, BASE_NONE, NULL, 0, + FT_UINT16, BASE_DEC_HEX, NULL, 0, NULL, HFILL }}, { &hf_rnsap_rAC, { "rAC", "rnsap.rAC", - FT_BYTES, BASE_NONE, NULL, 0, + FT_UINT8, BASE_DEC_HEX, NULL, 0, NULL, HFILL }}, { &hf_rnsap_aNR_FDD_CellInformation, { "aNR-FDD-CellInformation", "rnsap.aNR_FDD_CellInformation_element", @@ -58643,7 +58674,7 @@ void proto_register_rnsap(void) { "INTEGER_0_100", HFILL }}, { &hf_rnsap_sAC, { "sAC", "rnsap.sAC", - FT_BYTES, BASE_NONE, NULL, 0, + FT_UINT16, BASE_DEC_HEX, NULL, 0, NULL, HFILL }}, { &hf_rnsap_SecondaryServingCells_item, { "SecondaryServingCellsItem", "rnsap.SecondaryServingCellsItem_element", diff --git a/epan/dissectors/packet-sbc-ap.c b/epan/dissectors/packet-sbc-ap.c index 6820f951ce..37bb7f1c6e 100644 --- a/epan/dissectors/packet-sbc-ap.c +++ b/epan/dissectors/packet-sbc-ap.c @@ -736,8 +736,16 @@ dissect_sbc_ap_CellId_Broadcast_List(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx static int dissect_sbc_ap_TAC(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, - 2, 2, FALSE, NULL); +#line 116 "./asn1/sbc-ap/sbc-ap.cnf" + tvbuff_t *parameter_tvb = NULL; + offset = dissect_per_octet_string(tvb, offset, actx, tree, -1, + 2, 2, FALSE, ¶meter_tvb); + + if (parameter_tvb) { + actx->created_item = proto_tree_add_item(tree, hf_index, parameter_tvb, 0, 2, ENC_BIG_ENDIAN); + } + + return offset; } @@ -962,8 +970,17 @@ dissect_sbc_ap_CellId_Broadcast_List_5GS(tvbuff_t *tvb _U_, int offset _U_, asn1 static int dissect_sbc_ap_TAC_5GS(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, - 3, 3, FALSE, NULL); +#line 125 "./asn1/sbc-ap/sbc-ap.cnf" + tvbuff_t *parameter_tvb = NULL; + offset = dissect_per_octet_string(tvb, offset, actx, tree, -1, + 3, 3, FALSE, ¶meter_tvb); + + if (parameter_tvb) { + actx->created_item = proto_tree_add_item(tree, hf_index, parameter_tvb, 0, 3, ENC_BIG_ENDIAN); + } + + + return offset; } @@ -1655,7 +1672,7 @@ dissect_sbc_ap_Criticality_Diagnostics(tvbuff_t *tvb _U_, int offset _U_, asn1_c static int dissect_sbc_ap_Data_Coding_Scheme(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 304 "./asn1/sbc-ap/sbc-ap.cnf" +#line 323 "./asn1/sbc-ap/sbc-ap.cnf" tvbuff_t *parameter_tvb = NULL; offset = dissect_per_bit_string(tvb, offset, actx, tree, hf_index, 8, 8, FALSE, NULL, 0, ¶meter_tvb, NULL); @@ -1841,7 +1858,7 @@ dissect_sbc_ap_List_of_5GS_TAI_for_Restart(tvbuff_t *tvb _U_, int offset _U_, as static int dissect_sbc_ap_Message_Identifier(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 270 "./asn1/sbc-ap/sbc-ap.cnf" +#line 289 "./asn1/sbc-ap/sbc-ap.cnf" tvbuff_t *parameter_tvb = NULL; offset = dissect_per_bit_string(tvb, offset, actx, tree, -1, 16, 16, FALSE, NULL, 0, ¶meter_tvb, NULL); @@ -1976,7 +1993,7 @@ dissect_sbc_ap_Send_Stop_Warning_Indication(tvbuff_t *tvb _U_, int offset _U_, a static int dissect_sbc_ap_Serial_Number(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 277 "./asn1/sbc-ap/sbc-ap.cnf" +#line 296 "./asn1/sbc-ap/sbc-ap.cnf" tvbuff_t *parameter_tvb = NULL; offset = dissect_per_bit_string(tvb, offset, actx, tree, hf_index, 16, 16, FALSE, NULL, 0, ¶meter_tvb, NULL); @@ -2064,7 +2081,7 @@ dissect_sbc_ap_Warning_Area_List(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t * static int dissect_sbc_ap_Warning_Message_Content(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 315 "./asn1/sbc-ap/sbc-ap.cnf" +#line 334 "./asn1/sbc-ap/sbc-ap.cnf" tvbuff_t *parameter_tvb = NULL; offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, 1, 9600, FALSE, ¶meter_tvb); @@ -2105,7 +2122,7 @@ dissect_sbc_ap_Warning_Security_Information(tvbuff_t *tvb _U_, int offset _U_, a static int dissect_sbc_ap_Warning_Type(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 293 "./asn1/sbc-ap/sbc-ap.cnf" +#line 312 "./asn1/sbc-ap/sbc-ap.cnf" tvbuff_t *parameter_tvb = NULL; offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, 2, 2, FALSE, ¶meter_tvb); @@ -2158,7 +2175,7 @@ static const per_sequence_t Write_Replace_Warning_Request_sequence[] = { static int dissect_sbc_ap_Write_Replace_Warning_Request(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 251 "./asn1/sbc-ap/sbc-ap.cnf" +#line 270 "./asn1/sbc-ap/sbc-ap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "Write-Replace-Warning-Request"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -2176,7 +2193,7 @@ static const per_sequence_t Write_Replace_Warning_Response_sequence[] = { static int dissect_sbc_ap_Write_Replace_Warning_Response(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 253 "./asn1/sbc-ap/sbc-ap.cnf" +#line 272 "./asn1/sbc-ap/sbc-ap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "Write-Replace-Warning-Response"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -2194,7 +2211,7 @@ static const per_sequence_t Stop_Warning_Request_sequence[] = { static int dissect_sbc_ap_Stop_Warning_Request(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 255 "./asn1/sbc-ap/sbc-ap.cnf" +#line 274 "./asn1/sbc-ap/sbc-ap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "Stop-Warning-Request"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -2212,7 +2229,7 @@ static const per_sequence_t Stop_Warning_Response_sequence[] = { static int dissect_sbc_ap_Stop_Warning_Response(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 257 "./asn1/sbc-ap/sbc-ap.cnf" +#line 276 "./asn1/sbc-ap/sbc-ap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "Stop-Warning-Response"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -2230,7 +2247,7 @@ static const per_sequence_t Write_Replace_Warning_Indication_sequence[] = { static int dissect_sbc_ap_Write_Replace_Warning_Indication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 261 "./asn1/sbc-ap/sbc-ap.cnf" +#line 280 "./asn1/sbc-ap/sbc-ap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "Write-Replace-Warning-Indication"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -2248,7 +2265,7 @@ static const per_sequence_t Stop_Warning_Indication_sequence[] = { static int dissect_sbc_ap_Stop_Warning_Indication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 263 "./asn1/sbc-ap/sbc-ap.cnf" +#line 282 "./asn1/sbc-ap/sbc-ap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "Stop-Warning-Indication"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -2266,7 +2283,7 @@ static const per_sequence_t PWS_Restart_Indication_sequence[] = { static int dissect_sbc_ap_PWS_Restart_Indication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 265 "./asn1/sbc-ap/sbc-ap.cnf" +#line 284 "./asn1/sbc-ap/sbc-ap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "PWS-Restart-Indication"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -2284,7 +2301,7 @@ static const per_sequence_t PWS_Failure_Indication_sequence[] = { static int dissect_sbc_ap_PWS_Failure_Indication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 267 "./asn1/sbc-ap/sbc-ap.cnf" +#line 286 "./asn1/sbc-ap/sbc-ap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "PWS-Failure-Indication"); @@ -2302,7 +2319,7 @@ static const per_sequence_t Error_Indication_sequence[] = { static int dissect_sbc_ap_Error_Indication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 259 "./asn1/sbc-ap/sbc-ap.cnf" +#line 278 "./asn1/sbc-ap/sbc-ap.cnf" col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "Error-Indication"); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -3434,11 +3451,11 @@ void proto_register_sbc_ap(void) { NULL, HFILL }}, { &hf_sbc_ap_tAC, { "tAC", "sbc-ap.tAC", - FT_BYTES, BASE_NONE, NULL, 0, + FT_UINT16, BASE_DEC_HEX, NULL, 0, NULL, HFILL }}, { &hf_sbc_ap_tAC_5GS, { "tAC-5GS", "sbc-ap.tAC_5GS", - FT_BYTES, BASE_NONE, NULL, 0, + FT_UINT24, BASE_DEC_HEX, NULL, 0, NULL, HFILL }}, { &hf_sbc_ap_Unknown_5GS_Tracking_Area_List_item, { "TAI-5GS", "sbc-ap.TAI_5GS_element", |