osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Target Identification shall be coded as TLV IE where value is 

coded as TargetRNC-ID.
Proposed fix to
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3974
(The enclosed trace dioes not decode properly but may be wrongly encoded).

svn path=/trunk/; revision=29816
This commit is contained in:
Anders Broman 2009-09-09 07:29:41 +00:00
parent b30cc51638
commit 0c5dfd7698
4 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asn1/ranap/ranap.cnf
View File

@ -9,7 +9,7 @@ ALIGNED
#.END
#.EXPORTS
TargetID
TargetRNC-ID
Service-Handover
IntegrityProtectionInformation
EncryptionInformation

12
epan/dissectors/packet-gtp.c
View File

@ -213,7 +213,7 @@ static int hf_gtp_ext_rat_type = -1;
static int hf_gtp_ext_geo_loc_type = -1;
static int hf_gtp_ext_sac = -1;
static int hf_gtp_ext_imeisv = -1;
static int hf_gtp_targetid = -1;
static int hf_gtp_targetRNC_ID = -1;
static int hf_gtp_bssgp_cause = -1;
static int hf_gtp_sapi = -1;
static int hf_gtp_xid_par_len = -1;
@ -4659,7 +4659,7 @@ static int decode_gtp_target_id(tvbuff_t * tvb, int offset, packet_info * pinfo
proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, FALSE);
offset = offset + 2;
next_tvb = tvb_new_subset(tvb, offset, length, length);
dissect_ranap_TargetID(next_tvb, 0, &asn1_ctx, ext_tree, hf_gtp_targetid);
dissect_ranap_TargetRNC_ID(next_tvb, 0, &asn1_ctx, ext_tree, hf_gtp_targetRNC_ID);
return 3 + length;
}
@ -6867,10 +6867,10 @@ void proto_register_gtp(void)
FT_STRING, BASE_NONE, NULL, 0x0,
NULL, HFILL}
},
{&hf_gtp_targetid,
{"TargetID", "gtp.targetid",
FT_UINT32, BASE_DEC, VALS(ranap_TargetID_vals), 0,
NULL, HFILL}},
{ &hf_gtp_targetRNC_ID,
{ "targetRNC-ID", "gtp.targetRNC_ID",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
{&hf_gtp_bssgp_cause,
{"BSSGP Cause", "gtp.bssgp_cause",
FT_UINT8, BASE_DEC, VALS(tab_cause), 0,

6
epan/dissectors/packet-ranap.c
View File

@ -4562,7 +4562,7 @@ static const per_sequence_t TargetRNC_ID_sequence[] = {
{ NULL, 0, 0, NULL }
};
static int
int
dissect_ranap_TargetRNC_ID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
ett_ranap_TargetRNC_ID, TargetRNC_ID_sequence);
@ -6390,7 +6390,7 @@ dissect_ranap_TargetBSS_ToSourceBSS_TransparentContainer(tvbuff_t *tvb _U_, int
}
const value_string ranap_TargetID_vals[] = {
static const value_string ranap_TargetID_vals[] = {
{ 0, "targetRNC-ID" },
{ 1, "cGI" },
{ 2, "targeteNB-ID" },
@ -6404,7 +6404,7 @@ static const per_choice_t TargetID_choice[] = {
{ 0, NULL, 0, NULL }
};
int
static int
dissect_ranap_TargetID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
ett_ranap_TargetID, TargetID_choice,

3
epan/dissectors/packet-ranap.h
View File

@ -35,11 +35,10 @@
/*--- Included file: packet-ranap-exp.h ---*/
#line 1 "packet-ranap-exp.h"
extern const value_string ranap_Service_Handover_vals[];
extern const value_string ranap_TargetID_vals[];
int dissect_ranap_EncryptionInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_ranap_IntegrityProtectionInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_ranap_Service_Handover(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_ranap_TargetID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_ranap_TargetRNC_ID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
/*--- End of included file: packet-ranap-exp.h ---*/
#line 27 "packet-ranap-template.h"