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

Dissect more containers etc. 

svn path=/trunk/; revision=31076
This commit is contained in:
Anders Broman 2009-11-25 21:31:55 +00:00
parent e1afd4d4f7
commit 6966220a7c
3 changed files with 82 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
asn1/rrc/packet-rrc-template.c
View File

@ -24,7 +24,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* Ref: 3GPP TS 25.423 version 6.7.0 Release 6
* Ref: 3GPP TS 25.331 V8.8.0 (2009-09)
*/
#ifdef HAVE_CONFIG_H
@ -40,6 +40,8 @@
#include "packet-ber.h"
#include "packet-per.h"
#include "packet-rrc.h"
#include "packet-gsm_a_common.h"
#ifdef _MSC_VER
/* disable: "warning C4049: compiler limit : terminating line number emission" */
@ -60,6 +62,9 @@ static dissector_handle_t rrc_dl_ccch_handle=NULL;
static dissector_handle_t rrc_ul_dcch_handle=NULL;
static dissector_handle_t rrc_dl_dcch_handle=NULL;
/* Forward declarations */
static void dissect_UE_RadioAccessCapabilityInfo_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
/* Include constants */
#include "packet-rrc-val.h"

30
asn1/rrc/rrc.cnf
View File

@ -464,5 +464,35 @@ HandoverFromUTRANCommand-GSM-r6-IEs/gsm-message/single-GSM-Message single-GSM-Me
if (gsm_message_tvb)
call_dissector(gsm_a_dtap_handle,gsm_message_tvb,actx->pinfo, tree);
#.FN_BODY GSM-Classmark2 VAL_PTR = &parameter_tvb
tvbuff_t *parameter_tvb=NULL;
%(DEFAULT_BODY)s
if (parameter_tvb){
de_ms_cm_2(parameter_tvb, tree, 2, tvb_get_guint8(parameter_tvb,1), NULL, 0);
}
#.FN_BODY GSM-Classmark3 VAL_PTR = &parameter_tvb
tvbuff_t *parameter_tvb=NULL;
%(DEFAULT_BODY)s
if (parameter_tvb){
de_ms_cm_3(parameter_tvb, tree, 0, tvb_length(parameter_tvb), NULL, 0);
}
#.FN_BODY InterRATHandoverInfoWithInterRATCapabilities-r3-IEs/interRATHandoverInfo VAL_PTR = &parameter_tvb
tvbuff_t *parameter_tvb=NULL;
%(DEFAULT_BODY)s
if (parameter_tvb){
dissect_rrc_InterRATHandoverInfo_PDU(parameter_tvb, actx->pinfo, tree);
}
#.FN_BODY ue-CapabilityContainer/present VAL_PTR = &parameter_tvb
tvbuff_t *parameter_tvb=NULL;
%(DEFAULT_BODY)s
if (parameter_tvb){
dissect_UE_RadioAccessCapabilityInfo_PDU(parameter_tvb, actx->pinfo, tree);
}
#.END

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

@ -32,7 +32,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* Ref: 3GPP TS 25.423 version 6.7.0 Release 6
* Ref: 3GPP TS 25.331 V8.8.0 (2009-09)
*/
#ifdef HAVE_CONFIG_H
@ -48,6 +48,8 @@
#include "packet-ber.h"
#include "packet-per.h"
#include "packet-rrc.h"
#include "packet-gsm_a_common.h"
#ifdef _MSC_VER
/* disable: "warning C4049: compiler limit : terminating line number emission" */
@ -68,6 +70,9 @@ static dissector_handle_t rrc_dl_ccch_handle=NULL;
static dissector_handle_t rrc_ul_dcch_handle=NULL;
static dissector_handle_t rrc_dl_dcch_handle=NULL;
/* Forward declarations */
static void dissect_UE_RadioAccessCapabilityInfo_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
/* Include constants */
/*--- Included file: packet-rrc-val.h ---*/
@ -219,7 +224,7 @@ static dissector_handle_t rrc_dl_dcch_handle=NULL;
#define maxURNTI_Group 8
/*--- End of included file: packet-rrc-val.h ---*/
#line 65 "packet-rrc-template.c"
#line 70 "packet-rrc-template.c"
/* Initialize the protocol and registered fields */
int proto_rrc = -1;
@ -7506,7 +7511,7 @@ static int hf_rrc_v860NonCriticalExtensions_35 = -1; /* T_v860NonCriticalExtens
static int hf_rrc_interRATHandoverInfoWithInterRATCapabilities_v860ext = -1; /* InterRATHandoverInfoWithInterRATCapabilities_v860ext_IEs */
static int hf_rrc_nonCriticalExtensions_195 = -1; /* T_nonCriticalExtensions_195 */
static int hf_rrc_criticalExtensions_100 = -1; /* T_criticalExtensions_100 */
static int hf_rrc_interRATHandoverInfo_01 = -1; /* OCTET_STRING_SIZE_0_255 */
static int hf_rrc_interRATHandoverInfo_01 = -1; /* T_interRATHandoverInfo */
static int hf_rrc_ue_RATSpecificCapability_01 = -1; /* InterRAT_UE_RadioAccessCapability_v860ext */
static int hf_rrc_r5_14 = -1; /* T_r5_14 */
static int hf_rrc_rFC3095_ContextInfoList_r5 = -1; /* RFC3095_ContextInfoList_r5 */
@ -8017,7 +8022,7 @@ static int hf_rrc_GsmSecurityCapability_a5_2 = -1;
static int hf_rrc_GsmSecurityCapability_a5_1 = -1;
/*--- End of included file: packet-rrc-hf.c ---*/
#line 70 "packet-rrc-template.c"
#line 75 "packet-rrc-template.c"
/* Initialize the subtree pointers */
static int ett_rrc = -1;
@ -12817,7 +12822,7 @@ static gint ett_rrc_UE_RadioAccessCapability_r6 = -1;
static gint ett_rrc_UL_RFC3095_Context = -1;
/*--- End of included file: packet-rrc-ett.c ---*/
#line 75 "packet-rrc-template.c"
#line 80 "packet-rrc-template.c"
/* Global variables */
static proto_tree *top_tree;
@ -75593,8 +75598,17 @@ dissect_rrc_UE_RadioAccessCapability(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx
static int
dissect_rrc_GSM_Classmark2(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 468 "rrc.cnf"
tvbuff_t *parameter_tvb=NULL;
offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
5, 5, FALSE, NULL);
5, 5, FALSE, &parameter_tvb);
if (parameter_tvb){
de_ms_cm_2(parameter_tvb, tree, 2, tvb_get_guint8(parameter_tvb,1), NULL, 0);
}
return offset;
}
@ -75603,8 +75617,16 @@ dissect_rrc_GSM_Classmark2(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _
static int
dissect_rrc_GSM_Classmark3(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 476 "rrc.cnf"
tvbuff_t *parameter_tvb=NULL;
offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
1, 32, FALSE, NULL);
1, 32, FALSE, &parameter_tvb);
if (parameter_tvb){
de_ms_cm_3(parameter_tvb, tree, 0, tvb_length(parameter_tvb), NULL, 0);
}
return offset;
}
@ -107595,9 +107617,18 @@ dissect_rrc_UE_HistoryInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t
static int
dissect_rrc_OCTET_STRING_SIZE_0_255(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
dissect_rrc_T_interRATHandoverInfo(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 483 "rrc.cnf"
tvbuff_t *parameter_tvb=NULL;
offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
0, 255, FALSE, NULL);
0, 255, FALSE, &parameter_tvb);
if (parameter_tvb){
dissect_rrc_InterRATHandoverInfo_PDU(parameter_tvb, actx->pinfo, tree);
}
return offset;
}
@ -107605,7 +107636,7 @@ dissect_rrc_OCTET_STRING_SIZE_0_255(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_
static const per_sequence_t InterRATHandoverInfoWithInterRATCapabilities_r3_IEs_sequence[] = {
{ &hf_rrc_ue_RATSpecificCapability, ASN1_NO_EXTENSIONS , ASN1_OPTIONAL , dissect_rrc_InterRAT_UE_RadioAccessCapabilityList },
{ &hf_rrc_interRATHandoverInfo_01, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_rrc_OCTET_STRING_SIZE_0_255 },
{ &hf_rrc_interRATHandoverInfo_01, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_rrc_T_interRATHandoverInfo },
{ NULL, 0, 0, NULL }
};
@ -112098,7 +112129,7 @@ static int dissect_MeasurementReport_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _
/*--- End of included file: packet-rrc-fn.c ---*/
#line 80 "packet-rrc-template.c"
#line 85 "packet-rrc-template.c"
#include "packet-rrc.h"
@ -141296,7 +141327,7 @@ void proto_register_rrc(void) {
{ &hf_rrc_interRATHandoverInfo_01,
{ "interRATHandoverInfo", "rrc.interRATHandoverInfo",
FT_BYTES, BASE_NONE, NULL, 0,
"rrc.OCTET_STRING_SIZE_0_255", HFILL }},
"rrc.T_interRATHandoverInfo", HFILL }},
{ &hf_rrc_ue_RATSpecificCapability_01,
{ "ue-RATSpecificCapability", "rrc.ue_RATSpecificCapability",
FT_NONE, BASE_NONE, NULL, 0,
@ -143327,7 +143358,7 @@ void proto_register_rrc(void) {
NULL, HFILL }},
/*--- End of included file: packet-rrc-hfarr.c ---*/
#line 156 "packet-rrc-template.c"
#line 161 "packet-rrc-template.c"
{ &hf_test,
{ "RAB Test", "rrc.RAB.test",
FT_UINT8, BASE_DEC, NULL, 0,
@ -148133,7 +148164,7 @@ void proto_register_rrc(void) {
&ett_rrc_UL_RFC3095_Context,
/*--- End of included file: packet-rrc-ettarr.c ---*/
#line 167 "packet-rrc-template.c"
#line 172 "packet-rrc-template.c"
};
@ -148207,7 +148238,7 @@ void proto_register_rrc(void) {
/*--- End of included file: packet-rrc-dis-reg.c ---*/
#line 179 "packet-rrc-template.c"
#line 184 "packet-rrc-template.c"
}