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 /asn1 | |
| parent | 6beb19af8e86c17d9b2d69bf1cc0b2e24fbc111b (diff) | |
| download | wireshark-099698445b5cd60b00777ae47f68fba620fa975e.tar.gz | |
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 'asn1')
| -rw-r--r-- | asn1/gsm_map/packet-gsm_map-template.c | 1 | ||||
| -rw-r--r-- | asn1/lte-rrc/packet-lte-rrc-template.c | 1 | ||||
| -rw-r--r-- | asn1/ranap/packet-ranap-template.c | 1 | ||||
| -rw-r--r-- | asn1/rrc/packet-rrc-template.c | 1 | ||||
| -rw-r--r-- | asn1/spnego/packet-spnego-template.c | 1 | ||||
| -rw-r--r-- | asn1/t38/packet-t38-template.c | 1 |
6 files changed, 6 insertions, 0 deletions
diff --git a/asn1/gsm_map/packet-gsm_map-template.c b/asn1/gsm_map/packet-gsm_map-template.c index 40aa00a1d8..763cf788f5 100644 --- a/asn1/gsm_map/packet-gsm_map-template.c +++ b/asn1/gsm_map/packet-gsm_map-template.c @@ -52,6 +52,7 @@ #include <epan/tap.h> #include <epan/oids.h> #include <epan/expert.h> +#include <epan/proto_data.h> #include <epan/asn1.h> #include "packet-ber.h" diff --git a/asn1/lte-rrc/packet-lte-rrc-template.c b/asn1/lte-rrc/packet-lte-rrc-template.c index b52fd3ff83..ae041491b4 100644 --- a/asn1/lte-rrc/packet-lte-rrc-template.c +++ b/asn1/lte-rrc/packet-lte-rrc-template.c @@ -36,6 +36,7 @@ #include <epan/reassemble.h> #include <epan/exceptions.h> #include <epan/show_exception.h> +#include <epan/proto_data.h> #include <wsutil/str_util.h> diff --git a/asn1/ranap/packet-ranap-template.c b/asn1/ranap/packet-ranap-template.c index c1d6cb09e9..1e455885fc 100644 --- a/asn1/ranap/packet-ranap-template.c +++ b/asn1/ranap/packet-ranap-template.c @@ -30,6 +30,7 @@ #include <epan/strutil.h> #include <epan/asn1.h> #include <epan/prefs.h> +#include <epan/proto_data.h> #include "packet-ber.h" #include "packet-per.h" diff --git a/asn1/rrc/packet-rrc-template.c b/asn1/rrc/packet-rrc-template.c index a8b500283d..cd31f61b41 100644 --- a/asn1/rrc/packet-rrc-template.c +++ b/asn1/rrc/packet-rrc-template.c @@ -37,6 +37,7 @@ #include <epan/asn1.h> #include <epan/conversation.h> #include <epan/expert.h> +#include <epan/proto_data.h> #include "packet-ber.h" #include "packet-per.h" diff --git a/asn1/spnego/packet-spnego-template.c b/asn1/spnego/packet-spnego-template.c index 08b87e6e52..86bac4880a 100644 --- a/asn1/spnego/packet-spnego-template.c +++ b/asn1/spnego/packet-spnego-template.c @@ -35,6 +35,7 @@ #include <epan/expert.h> #include <epan/asn1.h> #include <epan/conversation.h> +#include <epan/proto_data.h> #include <wsutil/rc4.h> #include "packet-dcerpc.h" #include "packet-gssapi.h" diff --git a/asn1/t38/packet-t38-template.c b/asn1/t38/packet-t38-template.c index 9866309247..41fa55d757 100644 --- a/asn1/t38/packet-t38-template.c +++ b/asn1/t38/packet-t38-template.c @@ -53,6 +53,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" |