diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:14:53 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:14:53 +0000 |
| commit | a86c5f7cae7ec9a3398300555a0b644689d946a1 (patch) | |
| tree | 39fe4b107c71174fd1e8a8ceb9a4d2aa14116248 /epan/dissectors/asn1/rnsap/rnsap.cnf | |
| parent | Releasing progress-linux version 4.2.6-1~progress7.99u1. (diff) | |
| download | wireshark-a86c5f7cae7ec9a3398300555a0b644689d946a1.tar.xz wireshark-a86c5f7cae7ec9a3398300555a0b644689d946a1.zip | |
Merging upstream version 4.4.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'epan/dissectors/asn1/rnsap/rnsap.cnf')
| -rw-r--r-- | epan/dissectors/asn1/rnsap/rnsap.cnf | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/epan/dissectors/asn1/rnsap/rnsap.cnf b/epan/dissectors/asn1/rnsap/rnsap.cnf index 060d6ee6..dc1f5aef 100644 --- a/epan/dissectors/asn1/rnsap/rnsap.cnf +++ b/epan/dissectors/asn1/rnsap/rnsap.cnf @@ -118,7 +118,7 @@ ProtocolIE-ContainerPairList switch (pdata->ProcedureCode) { case RNSAP_ID_DOWNLINKSIGNALLINGTRANSFER: - /* TODO: seperate into Iur and Iur-g cases: */ + /* TODO: separate into Iur and Iur-g cases: */ /* For the Iur-g interface, L3 message is a GERAN-RRC message for which a dissector does not currently exist */ /* For the Iur interface, L3 message is a UMTS RRC DL-CCCH message */ parameter_handle = rrc_dl_ccch_handle; @@ -146,9 +146,9 @@ ProtocolIE-ContainerPairList return offset; /* Calling RANAP dissector but preventing changes to the protocol column */ - col_set_writable(actx->pinfo->cinfo, COL_PROTOCOL, FALSE); + col_set_writable(actx->pinfo->cinfo, COL_PROTOCOL, false); call_dissector_only(ranap_handle, parameter_tvb, actx->pinfo, tree, NULL); - col_set_writable(actx->pinfo->cinfo, COL_PROTOCOL, TRUE); + col_set_writable(actx->pinfo->cinfo, COL_PROTOCOL, true); #.TYPE_ATTR BLER TYPE = FT_INT32 DISPLAY = BASE_DEC STRINGS = NULL @@ -156,7 +156,7 @@ BLER TYPE = FT_INT32 DISPLAY = BASE_DEC STRINGS = NULL #.FN_BODY BindingID VAL_PTR = ¶meter_tvb tvbuff_t *parameter_tvb=NULL; - guint16 binding_id_port; + uint16_t binding_id_port; %(DEFAULT_BODY)s @@ -174,9 +174,9 @@ BLER TYPE = FT_INT32 DISPLAY = BASE_DEC STRINGS = NULL 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) @@ -198,7 +198,7 @@ BLER TYPE = FT_INT32 DISPLAY = BASE_DEC STRINGS = NULL 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"); @@ -247,6 +247,14 @@ TAC TYPE = FT_UINT16 DISPLAY = BASE_DEC_HEX actx->created_item = proto_tree_add_item(tree, hf_index, parameter_tvb, 0, 2, ENC_BIG_ENDIAN); } +#.FN_BODY IMSI VAL_PTR = ¶meter_tvb + tvbuff_t *parameter_tvb; +%(DEFAULT_BODY)s + if (parameter_tvb) { + proto_tree *subtree = proto_item_add_subtree(actx->created_item, ett_rnsap_IMSI); + dissect_e212_imsi(parameter_tvb, actx->pinfo, subtree, 0, tvb_reported_length(parameter_tvb), false); + } + #.REGISTER #RNSAP-PROTOCOL-IES |