diff options
author | Anders Broman <anders.broman@ericsson.com> | 2012-07-16 07:02:29 +0000 |
---|---|---|
committer | Anders Broman <anders.broman@ericsson.com> | 2012-07-16 07:02:29 +0000 |
commit | ac335fc5f41896ec65978e5d896e1449aeca4b49 (patch) | |
tree | 3f75a66ca02d15b6fb199ecc308671e4dce15846 /epan | |
parent | 2d38d90b3e7d6f5c2154ecdcea272a1caf2896d3 (diff) |
From Jacob Nordgren and Rishie Sharma:
Handle RRC_MESSAGE_TYPE_BCCH_FACH.
svn path=/trunk/; revision=43741
Diffstat (limited to 'epan')
-rw-r--r-- | epan/dissectors/packet-rrc.c | 19 | ||||
-rw-r--r-- | epan/dissectors/packet-rrc.h | 6 |
2 files changed, 16 insertions, 9 deletions
diff --git a/epan/dissectors/packet-rrc.c b/epan/dissectors/packet-rrc.c index b0004f523f..8cf92b2311 100644 --- a/epan/dissectors/packet-rrc.c +++ b/epan/dissectors/packet-rrc.c @@ -66,6 +66,7 @@ static dissector_handle_t rrc_ul_ccch_handle=NULL; 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; +static dissector_handle_t rrc_bcch_fach_handle=NULL; static dissector_handle_t lte_rrc_ue_eutra_cap_handle=NULL; static dissector_handle_t lte_rrc_dl_dcch_handle=NULL; @@ -253,7 +254,7 @@ static int dissect_SysInfoType11bis_PDU(tvbuff_t *tvb, packet_info *pinfo, proto #define maxURNTI_Group 8 /*--- End of included file: packet-rrc-val.h ---*/ -#line 82 "../../asn1/rrc/packet-rrc-template.c" +#line 83 "../../asn1/rrc/packet-rrc-template.c" /* Initialize the protocol and registered fields */ int proto_rrc = -1; @@ -9136,7 +9137,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 87 "../../asn1/rrc/packet-rrc-template.c" +#line 88 "../../asn1/rrc/packet-rrc-template.c" /* Initialize the subtree pointers */ static int ett_rrc = -1; @@ -14755,7 +14756,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 92 "../../asn1/rrc/packet-rrc-template.c" +#line 93 "../../asn1/rrc/packet-rrc-template.c" static gint ett_rrc_eutraFeatureGroupIndicators = -1; static gint ett_rrc_cn_CommonGSM_MAP_NAS_SysInfo = -1; @@ -130826,7 +130827,7 @@ static int dissect_MeasurementReport_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _ /*--- End of included file: packet-rrc-fn.c ---*/ -#line 122 "../../asn1/rrc/packet-rrc-template.c" +#line 123 "../../asn1/rrc/packet-rrc-template.c" #include "packet-rrc.h" @@ -130867,6 +130868,9 @@ dissect_rrc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case RRC_MESSAGE_TYPE_DL_DCCH: call_dissector(rrc_dl_dcch_handle, tvb, pinfo, rrc_tree); break; + case RRC_MESSAGE_TYPE_BCCH_FACH: + call_dissector(rrc_bcch_fach_handle, tvb, pinfo, rrc_tree); + break; default: ; } @@ -166371,7 +166375,7 @@ void proto_register_rrc(void) { NULL, HFILL }}, /*--- End of included file: packet-rrc-hfarr.c ---*/ -#line 174 "../../asn1/rrc/packet-rrc-template.c" +#line 178 "../../asn1/rrc/packet-rrc-template.c" { &hf_test, { "RAB Test", "rrc.RAB.test", FT_UINT8, BASE_DEC, NULL, 0, @@ -172011,7 +172015,7 @@ void proto_register_rrc(void) { &ett_rrc_UL_RFC3095_Context, /*--- End of included file: packet-rrc-ettarr.c ---*/ -#line 200 "../../asn1/rrc/packet-rrc-template.c" +#line 204 "../../asn1/rrc/packet-rrc-template.c" &ett_rrc_eutraFeatureGroupIndicators, &ett_rrc_cn_CommonGSM_MAP_NAS_SysInfo, }; @@ -172091,7 +172095,7 @@ void proto_register_rrc(void) { /*--- End of included file: packet-rrc-dis-reg.c ---*/ -#line 214 "../../asn1/rrc/packet-rrc-template.c" +#line 218 "../../asn1/rrc/packet-rrc-template.c" } @@ -172110,6 +172114,7 @@ proto_reg_handoff_rrc(void) rrc_dl_dcch_handle = find_dissector("rrc.dl.dcch"); lte_rrc_ue_eutra_cap_handle = find_dissector("lte-rrc.ue_eutra_cap"); lte_rrc_dl_dcch_handle = find_dissector("lte-rrc.dl.dcch"); + rrc_bcch_fach_handle = find_dissector("rrc.bcch.fach"); } diff --git a/epan/dissectors/packet-rrc.h b/epan/dissectors/packet-rrc.h index 924faa7d0b..041df54664 100644 --- a/epan/dissectors/packet-rrc.h +++ b/epan/dissectors/packet-rrc.h @@ -33,6 +33,7 @@ #ifndef PACKET_RRC_H #define PACKET_RRC_H +#include <epan/asn1.h> /* Needed for non asn1 dissectors?*/ extern int proto_rrc; /*--- Included file: packet-rrc-exp.h ---*/ @@ -50,7 +51,7 @@ int dissect_rrc_ToTargetRNC_Container_PDU(tvbuff_t *tvb _U_, packet_info *pinfo int dissect_rrc_TargetRNC_ToSourceRNC_Container_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_); /*--- End of included file: packet-rrc-exp.h ---*/ -#line 30 "../../asn1/rrc/packet-rrc-template.h" +#line 31 "../../asn1/rrc/packet-rrc-template.h" enum rrc_message_type { RRC_MESSAGE_TYPE_INVALID = 0, @@ -58,7 +59,8 @@ enum rrc_message_type { RRC_MESSAGE_TYPE_UL_CCCH, RRC_MESSAGE_TYPE_DL_CCCH, RRC_MESSAGE_TYPE_UL_DCCH, - RRC_MESSAGE_TYPE_DL_DCCH + RRC_MESSAGE_TYPE_DL_DCCH, + RRC_MESSAGE_TYPE_BCCH_FACH }; #define MAX_RRC_FRAMES 64 |