osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

From Pascal Quantin: 

3GPP dissectors: do not go back to tree root when decoding an encapsulated message
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3132

svn path=/trunk/; revision=27081
This commit is contained in:
Anders Broman 2008-12-22 12:44:40 +00:00
parent 9781112aaa
commit d7cd8b410b
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asn1/lte-rrc/lte-rrc.cnf
View File

@ -27,5 +27,5 @@ UL-DCCH-Message @ul.dcch
%(DEFAULT_BODY)s
if ((nas_eps_tvb)&&(nas_eps_handle))
call_dissector(nas_eps_handle,nas_eps_tvb,%(ACTX)s->pinfo, proto_tree_get_root(tree));
call_dissector(nas_eps_handle,nas_eps_tvb,%(ACTX)s->pinfo, tree);

4
asn1/rrc/rrc.cnf
View File

@ -76,7 +76,7 @@ UE-RadioAccessCapabilityInfo @ue_radio_access_cap_info
%(DEFAULT_BODY)s
if (nas_message_tvb)
call_dissector(gsm_a_dtap_handle,nas_message_tvb,%(ACTX)s->pinfo, proto_tree_get_root(tree));
call_dissector(gsm_a_dtap_handle,nas_message_tvb,%(ACTX)s->pinfo, tree);
#.FN_BODY InterRATHandoverInfo/ue-CapabilityContainer/present VAL_PTR = &ue_radio_access_cap_info_tvb
tvbuff_t *ue_radio_access_cap_info_tvb=NULL;
@ -84,7 +84,7 @@ UE-RadioAccessCapabilityInfo @ue_radio_access_cap_info
%(DEFAULT_BODY)s
if (ue_radio_access_cap_info_tvb)
call_dissector(rrc_ue_radio_access_cap_info_handle,ue_radio_access_cap_info_tvb,%(ACTX)s->pinfo, proto_tree_get_root(tree));
call_dissector(rrc_ue_radio_access_cap_info_handle,ue_radio_access_cap_info_tvb,%(ACTX)s->pinfo, tree);
#.END

2
asn1/s1ap/s1ap.cnf
View File

@ -197,7 +197,7 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound")
%(DEFAULT_BODY)s
if ((tvb_length(parameter_tvb)>0)&&(nas_eps_handle))
call_dissector(nas_eps_handle,parameter_tvb,%(ACTX)s->pinfo, proto_tree_get_root(tree));
call_dissector(nas_eps_handle,parameter_tvb,%(ACTX)s->pinfo, tree);
#.TYPE_ATTR
ProtocolExtensionID TYPE = FT_UINT8 DISPLAY = BASE_DEC STRINGS = VALS(s1ap_ProtocolIE_ID_vals)

2
epan/dissectors/packet-lte-rrc.c
View File

@ -8789,7 +8789,7 @@ dissect_lte_rrc_NAS_DedicatedInformation(tvbuff_t *tvb _U_, int offset _U_, asn1
if ((nas_eps_tvb)&&(nas_eps_handle))
call_dissector(nas_eps_handle,nas_eps_tvb,actx->pinfo, proto_tree_get_root(tree));
call_dissector(nas_eps_handle,nas_eps_tvb,actx->pinfo, tree);
return offset;

4
epan/dissectors/packet-rrc.c
View File

@ -39741,7 +39741,7 @@ dissect_rrc_NAS_Message(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_,
if (nas_message_tvb)
call_dissector(gsm_a_dtap_handle,nas_message_tvb,actx->pinfo, proto_tree_get_root(tree));
call_dissector(gsm_a_dtap_handle,nas_message_tvb,actx->pinfo, tree);
@ -80094,7 +80094,7 @@ dissect_rrc_T_present(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, p
if (ue_radio_access_cap_info_tvb)
call_dissector(rrc_ue_radio_access_cap_info_handle,ue_radio_access_cap_info_tvb,actx->pinfo, proto_tree_get_root(tree));
call_dissector(rrc_ue_radio_access_cap_info_handle,ue_radio_access_cap_info_tvb,actx->pinfo, tree);

2
epan/dissectors/packet-s1ap.c
View File

@ -2818,7 +2818,7 @@ dissect_s1ap_NAS_PDU(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, pr
if ((tvb_length(parameter_tvb)>0)&&(nas_eps_handle))
call_dissector(nas_eps_handle,parameter_tvb,actx->pinfo, proto_tree_get_root(tree));
call_dissector(nas_eps_handle,parameter_tvb,actx->pinfo, tree);