diff options
author | Guy Harris <guy@alum.mit.edu> | 2016-01-24 17:10:20 -0800 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2016-01-25 02:24:34 +0000 |
commit | 099698445b5cd60b00777ae47f68fba620fa975e (patch) | |
tree | 8c37921e0fa9893dd0c00e3b66f287c4d7d1a78d /epan/dissectors/packet-lte-rrc.c | |
parent | 6beb19af8e86c17d9b2d69bf1cc0b2e24fbc111b (diff) |
Move the proto data stuff out of frame_data.[ch].
It's not tied to the frame_data structure any more, so it belongs by
itself.
Clean up some #includes while we're at it; in particular, frame_data.h
doesn't use anything related to tvbuffs, so don't have it gratuitiously
include tvbuff.h.
Change-Id: Ic32922d4a3840bac47007c5d4c546b8842245e0c
Reviewed-on: https://code.wireshark.org/review/13518
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/dissectors/packet-lte-rrc.c')
-rw-r--r-- | epan/dissectors/packet-lte-rrc.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/epan/dissectors/packet-lte-rrc.c b/epan/dissectors/packet-lte-rrc.c index 61a129f127..1c24f18a52 100644 --- a/epan/dissectors/packet-lte-rrc.c +++ b/epan/dissectors/packet-lte-rrc.c @@ -44,6 +44,7 @@ #include <epan/reassemble.h> #include <epan/exceptions.h> #include <epan/show_exception.h> +#include <epan/proto_data.h> #include <wsutil/str_util.h> @@ -224,7 +225,7 @@ typedef enum _SI_OrPSI_GERAN_enum { } SI_OrPSI_GERAN_enum; /*--- End of included file: packet-lte-rrc-val.h ---*/ -#line 81 "../../asn1/lte-rrc/packet-lte-rrc-template.c" +#line 82 "../../asn1/lte-rrc/packet-lte-rrc-template.c" /* Initialize the protocol and registered fields */ static int proto_lte_rrc = -1; @@ -3698,7 +3699,7 @@ static int hf_lte_rrc_reserved_r12 = -1; /* BIT_STRING_SIZE_19 */ static int dummy_hf_lte_rrc_eag_field = -1; /* never registered */ /*--- End of included file: packet-lte-rrc-hf.c ---*/ -#line 86 "../../asn1/lte-rrc/packet-lte-rrc-template.c" +#line 87 "../../asn1/lte-rrc/packet-lte-rrc-template.c" static int hf_lte_rrc_eutra_cap_feat_group_ind_1 = -1; static int hf_lte_rrc_eutra_cap_feat_group_ind_2 = -1; @@ -5540,7 +5541,7 @@ static gint ett_lte_rrc_SBCCH_SL_BCH_Message = -1; static gint ett_lte_rrc_MasterInformationBlock_SL = -1; /*--- End of included file: packet-lte-rrc-ett.c ---*/ -#line 270 "../../asn1/lte-rrc/packet-lte-rrc-template.c" +#line 271 "../../asn1/lte-rrc/packet-lte-rrc-template.c" static gint ett_lte_rrc_featureGroupIndicators = -1; static gint ett_lte_rrc_featureGroupIndRel9Add = -1; @@ -53379,7 +53380,7 @@ static int dissect_UE_EUTRA_Capability_v9a0_IEs_PDU(tvbuff_t *tvb _U_, packet_in /*--- End of included file: packet-lte-rrc-fn.c ---*/ -#line 2762 "../../asn1/lte-rrc/packet-lte-rrc-template.c" +#line 2763 "../../asn1/lte-rrc/packet-lte-rrc-template.c" static int dissect_lte_rrc_DL_CCCH(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) @@ -67437,7 +67438,7 @@ void proto_register_lte_rrc(void) { "BIT_STRING_SIZE_19", HFILL }}, /*--- End of included file: packet-lte-rrc-hfarr.c ---*/ -#line 2963 "../../asn1/lte-rrc/packet-lte-rrc-template.c" +#line 2964 "../../asn1/lte-rrc/packet-lte-rrc-template.c" { &hf_lte_rrc_eutra_cap_feat_group_ind_1, { "Indicator 1", "lte-rrc.eutra_cap_feat_group_ind_1", @@ -69814,7 +69815,7 @@ void proto_register_lte_rrc(void) { &ett_lte_rrc_MasterInformationBlock_SL, /*--- End of included file: packet-lte-rrc-ettarr.c ---*/ -#line 3682 "../../asn1/lte-rrc/packet-lte-rrc-template.c" +#line 3683 "../../asn1/lte-rrc/packet-lte-rrc-template.c" &ett_lte_rrc_featureGroupIndicators, &ett_lte_rrc_featureGroupIndRel9Add, @@ -69896,7 +69897,7 @@ void proto_register_lte_rrc(void) { /*--- End of included file: packet-lte-rrc-dis-reg.c ---*/ -#line 3746 "../../asn1/lte-rrc/packet-lte-rrc-template.c" +#line 3747 "../../asn1/lte-rrc/packet-lte-rrc-template.c" register_init_routine(<e_rrc_init_protocol); register_cleanup_routine(<e_rrc_cleanup_protocol); |