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-t38.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-t38.c')
| -rw-r--r-- | epan/dissectors/packet-t38.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/epan/dissectors/packet-t38.c b/epan/dissectors/packet-t38.c index 4b2155dbbd..8a3a49f284 100644 --- a/epan/dissectors/packet-t38.c +++ b/epan/dissectors/packet-t38.c @@ -61,6 +61,7 @@ #include <epan/prefs.h> #include <epan/ipproto.h> #include <epan/asn1.h> +#include <epan/proto_data.h> #include "packet-t38.h" #include "packet-per.h" @@ -141,7 +142,7 @@ static int hf_t38_fec_data = -1; /* T_fec_data */ static int hf_t38_fec_data_item = -1; /* OCTET_STRING */ /*--- End of included file: packet-t38-hf.c ---*/ -#line 114 "../../asn1/t38/packet-t38-template.c" +#line 115 "../../asn1/t38/packet-t38-template.c" /* T38 setup fields */ static int hf_t38_setup = -1; @@ -175,7 +176,7 @@ static gint ett_t38_T_fec_info = -1; static gint ett_t38_T_fec_data = -1; /*--- End of included file: packet-t38-ett.c ---*/ -#line 134 "../../asn1/t38/packet-t38-template.c" +#line 135 "../../asn1/t38/packet-t38-template.c" static gint ett_t38_setup = -1; static gint ett_data_fragment = -1; @@ -978,7 +979,7 @@ static int dissect_UDPTLPacket_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pr /*--- End of included file: packet-t38-fn.c ---*/ -#line 393 "../../asn1/t38/packet-t38-template.c" +#line 394 "../../asn1/t38/packet-t38-template.c" /* initialize the tap t38_info and the conversation */ static void @@ -1319,7 +1320,7 @@ proto_register_t38(void) "OCTET_STRING", HFILL }}, /*--- End of included file: packet-t38-hfarr.c ---*/ -#line 657 "../../asn1/t38/packet-t38-template.c" +#line 658 "../../asn1/t38/packet-t38-template.c" { &hf_t38_setup, { "Stream setup", "t38.setup", FT_STRING, BASE_NONE, NULL, 0x0, "Stream setup, method and frame number", HFILL }}, @@ -1380,7 +1381,7 @@ proto_register_t38(void) &ett_t38_T_fec_data, /*--- End of included file: packet-t38-ettarr.c ---*/ -#line 704 "../../asn1/t38/packet-t38-template.c" +#line 705 "../../asn1/t38/packet-t38-template.c" &ett_t38_setup, &ett_data_fragment, &ett_data_fragments |