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 | |
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>
149 files changed, 494 insertions, 206 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" diff --git a/doc/README.dissector b/doc/README.dissector index 964c4b0bc5..59fced396d 100644 --- a/doc/README.dissector +++ b/doc/README.dissector @@ -2874,6 +2874,8 @@ persistent data about the packet for the lifetime of the capture (file scope) and to exchange data between dissectors across a single packet (packet scope). It is also used to provide packet data for Decode As dialog (packet scope). +These functions are delcared in <epan/proto_data.h>. + void p_add_proto_data(wmem_allocator_t *scope, packet_info *pinfo, int proto, guint32 key, void *proto_data) void * @@ -2986,6 +2988,8 @@ Where: module - Returned by the prefs_register_protocol routine menu max_value - The maximum allowed value for a range (0 is the minimum). +These functions are declared in <epan/prefs.h>. + An example from packet-beep.c - proto_beep = proto_register_protocol("Blocks Extensible Exchange Protocol", diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt index 08bb351515..46c1850396 100644 --- a/epan/CMakeLists.txt +++ b/epan/CMakeLists.txt @@ -1643,6 +1643,7 @@ set(LIBWIRESHARK_FILES print_stream.c prefs.c proto.c + proto_data.c ps.c range.c reassemble.c diff --git a/epan/Makefile.common b/epan/Makefile.common index f05552dca4..51e4581a57 100644 --- a/epan/Makefile.common +++ b/epan/Makefile.common @@ -76,6 +76,7 @@ LIBWIRESHARK_SRC = \ print.c \ print_stream.c \ proto.c \ + proto_data.c \ range.c \ reassemble.c \ reedsolomon.c \ @@ -229,6 +230,7 @@ LIBWIRESHARK_INCLUDES = \ prefs.h \ prefs-int.h \ proto.h \ + proto_data.h \ ps.h \ ptvcursor.h \ range.h \ diff --git a/epan/conversation_table.c b/epan/conversation_table.c index a7e7cb1943..1aaeabc4b3 100644 --- a/epan/conversation_table.c +++ b/epan/conversation_table.c @@ -25,8 +25,8 @@ #include <string.h> -#include "packet_info.h" #include "proto.h" +#include "packet_info.h" #include "conversation_table.h" #include "addr_resolv.h" diff --git a/epan/dissectors/file-file.c b/epan/dissectors/file-file.c index ee06ab49d3..d15890de94 100644 --- a/epan/dissectors/file-file.c +++ b/epan/dissectors/file-file.c @@ -36,6 +36,8 @@ #include <epan/to_str.h> #include <epan/tap.h> #include <epan/expert.h> +#include <epan/proto_data.h> + #include <wsutil/md5.h> #include <wsutil/str_util.h> diff --git a/epan/dissectors/packet-6lowpan.c b/epan/dissectors/packet-6lowpan.c index 88d302c16e..06f7af4bf0 100644 --- a/epan/dissectors/packet-6lowpan.c +++ b/epan/dissectors/packet-6lowpan.c @@ -29,6 +29,7 @@ #include <epan/reassemble.h> #include <epan/ipproto.h> #include <epan/addr_resolv.h> +#include <epan/proto_data.h> #include "packet-ipv6.h" #include "packet-6lowpan.h" #include "packet-btl2cap.h" diff --git a/epan/dissectors/packet-ajp13.c b/epan/dissectors/packet-ajp13.c index 54e6de2f17..6acb54b902 100644 --- a/epan/dissectors/packet-ajp13.c +++ b/epan/dissectors/packet-ajp13.c @@ -26,6 +26,7 @@ #include <stdlib.h> #include <epan/packet.h> +#include <epan/proto_data.h> #include "packet-tcp.h" void proto_register_ajp13(void); diff --git a/epan/dissectors/packet-amqp.c b/epan/dissectors/packet-amqp.c index 3d7cfb1401..5dda13ac55 100644 --- a/epan/dissectors/packet-amqp.c +++ b/epan/dissectors/packet-amqp.c @@ -44,6 +44,7 @@ #include <epan/expert.h> #include <epan/prefs.h> #include <epan/to_str.h> +#include <epan/proto_data.h> #include "packet-tcp.h" #include "packet-ssl.h" diff --git a/epan/dissectors/packet-arp.c b/epan/dissectors/packet-arp.c index 7f82ec15cc..5253499e1b 100644 --- a/epan/dissectors/packet-arp.c +++ b/epan/dissectors/packet-arp.c @@ -35,6 +35,7 @@ #include <epan/ax25_pids.h> #include <epan/prefs.h> #include <epan/expert.h> +#include <epan/proto_data.h> void proto_register_arp(void); void proto_reg_handoff_arp(void); diff --git a/epan/dissectors/packet-beep.c b/epan/dissectors/packet-beep.c index 2269409fcb..948c4b7a85 100644 --- a/epan/dissectors/packet-beep.c +++ b/epan/dissectors/packet-beep.c @@ -33,6 +33,7 @@ #include <epan/prefs.h> #include <epan/conversation.h> #include <epan/expert.h> +#include <epan/proto_data.h> #define TCP_PORT_BEEP 10288 diff --git a/epan/dissectors/packet-bluetooth.c b/epan/dissectors/packet-bluetooth.c index e9e2787cae..d07500da33 100644 --- a/epan/dissectors/packet-bluetooth.c +++ b/epan/dissectors/packet-bluetooth.c @@ -29,6 +29,7 @@ #include <epan/to_str.h> #include <epan/conversation_table.h> #include <epan/decode_as.h> +#include <epan/proto_data.h> #include <wiretap/wtap.h> #include "packet-bluetooth.h" diff --git a/epan/dissectors/packet-brdwlk.c b/epan/dissectors/packet-brdwlk.c index ca89c9b28a..aaf538f173 100644 --- a/epan/dissectors/packet-brdwlk.c +++ b/epan/dissectors/packet-brdwlk.c @@ -25,6 +25,7 @@ #include <epan/packet.h> #include <epan/etypes.h> +#include <epan/proto_data.h> #include "packet-fc.h" #define BRDWLK_MAX_PACKET_CNT 0xFFFF diff --git a/epan/dissectors/packet-btatt.c b/epan/dissectors/packet-btatt.c index f266001311..bd07e28942 100644 --- a/epan/dissectors/packet-btatt.c +++ b/epan/dissectors/packet-btatt.c @@ -35,6 +35,7 @@ #include <epan/oui.h> #include <epan/decode_as.h> #include <epan/tap.h> +#include <epan/proto_data.h> #include "packet-bluetooth.h" #include "packet-btatt.h" diff --git a/epan/dissectors/packet-btavctp.c b/epan/dissectors/packet-btavctp.c index a66f606bb5..288d337fb7 100644 --- a/epan/dissectors/packet-btavctp.c +++ b/epan/dissectors/packet-btavctp.c @@ -28,6 +28,7 @@ #include <epan/prefs.h> #include <epan/expert.h> #include <epan/decode_as.h> +#include <epan/proto_data.h> #include "packet-bluetooth.h" #include "packet-btl2cap.h" diff --git a/epan/dissectors/packet-bthci_acl.c b/epan/dissectors/packet-bthci_acl.c index 4d01bce794..76f388380c 100644 --- a/epan/dissectors/packet-bthci_acl.c +++ b/epan/dissectors/packet-bthci_acl.c @@ -31,6 +31,7 @@ #include <epan/prefs.h> #include <epan/addr_resolv.h> #include <epan/expert.h> +#include <epan/proto_data.h> #include "packet-bluetooth.h" #include "packet-bthci_acl.h" diff --git a/epan/dissectors/packet-bthci_cmd.c b/epan/dissectors/packet-bthci_cmd.c index 2cb0cb8d69..86b61ed1cc 100644 --- a/epan/dissectors/packet-bthci_cmd.c +++ b/epan/dissectors/packet-bthci_cmd.c @@ -38,6 +38,8 @@ #include <epan/prefs.h> #include <epan/decode_as.h> #include <epan/tap.h> +#include <epan/proto_data.h> + #include <wsutil/utf8_entities.h> #include "packet-bluetooth.h" diff --git a/epan/dissectors/packet-bthci_evt.c b/epan/dissectors/packet-bthci_evt.c index 081e2cda28..b99ad06d99 100644 --- a/epan/dissectors/packet-bthci_evt.c +++ b/epan/dissectors/packet-bthci_evt.c @@ -38,6 +38,8 @@ #include <epan/prefs.h> #include <epan/decode_as.h> #include <epan/tap.h> +#include <epan/proto_data.h> + #include <wsutil/utf8_entities.h> #include "packet-bluetooth.h" diff --git a/epan/dissectors/packet-btl2cap.c b/epan/dissectors/packet-btl2cap.c index 689462e858..888c283df3 100644 --- a/epan/dissectors/packet-btl2cap.c +++ b/epan/dissectors/packet-btl2cap.c @@ -31,6 +31,8 @@ #include <epan/exceptions.h> #include <epan/expert.h> #include <epan/decode_as.h> +#include <epan/proto_data.h> + #include <wiretap/wtap.h> #include "packet-bluetooth.h" diff --git a/epan/dissectors/packet-btle.c b/epan/dissectors/packet-btle.c index d3a8bcee1e..5a48b143d4 100644 --- a/epan/dissectors/packet-btle.c +++ b/epan/dissectors/packet-btle.c @@ -30,6 +30,8 @@ #include <epan/packet.h> #include <epan/prefs.h> #include <epan/expert.h> +#include <epan/proto_data.h> + #include <wiretap/wtap.h> #include "packet-btle.h" diff --git a/epan/dissectors/packet-btobex.c b/epan/dissectors/packet-btobex.c index 5fc706eab3..1399f076b1 100644 --- a/epan/dissectors/packet-btobex.c +++ b/epan/dissectors/packet-btobex.c @@ -30,6 +30,7 @@ #include <epan/reassemble.h> #include <epan/expert.h> #include <epan/decode_as.h> +#include <epan/proto_data.h> #include "packet-bluetooth.h" #include "packet-btrfcomm.h" #include "packet-btl2cap.h" diff --git a/epan/dissectors/packet-btrfcomm.c b/epan/dissectors/packet-btrfcomm.c index f398582da9..5c12b890dd 100644 --- a/epan/dissectors/packet-btrfcomm.c +++ b/epan/dissectors/packet-btrfcomm.c @@ -36,6 +36,7 @@ #include <epan/expert.h> #include <epan/uat.h> #include <epan/decode_as.h> +#include <epan/proto_data.h> #include "packet-bluetooth.h" #include "packet-btsdp.h" diff --git a/epan/dissectors/packet-catapult-dct2000.c b/epan/dissectors/packet-catapult-dct2000.c index 349dd9645b..fec375a9b8 100644 --- a/epan/dissectors/packet-catapult-dct2000.c +++ b/epan/dissectors/packet-catapult-dct2000.c @@ -30,6 +30,7 @@ #include <epan/expert.h> #include <epan/prefs.h> #include <epan/addr_resolv.h> +#include <epan/proto_data.h> #include <wiretap/catapult_dct2000.h> #include "packet-umts_fp.h" diff --git a/epan/dissectors/packet-ceph.c b/epan/dissectors/packet-ceph.c index a50c8226a8..b2e82c3dea 100644 --- a/epan/dissectors/packet-ceph.c +++ b/epan/dissectors/packet-ceph.c @@ -27,6 +27,7 @@ #include <epan/expert.h> #include <epan/conversation.h> #include <epan/to_str.h> +#include <epan/proto_data.h> void proto_reg_handoff_ceph(void); void proto_register_ceph(void); diff --git a/epan/dissectors/packet-cip.c b/epan/dissectors/packet-cip.c index 0b1ffc41d3..c7af0c4d91 100644 --- a/epan/dissectors/packet-cip.c +++ b/epan/dissectors/packet-cip.c @@ -40,6 +40,7 @@ #include <epan/packet.h> #include <epan/expert.h> +#include <epan/proto_data.h> #include "packet-cip.h" #include "packet-cipsafety.h" #include "packet-mbtcp.h" diff --git a/epan/dissectors/packet-cipsafety.c b/epan/dissectors/packet-cipsafety.c index 927d8eec03..7ac1265472 100644 --- a/epan/dissectors/packet-cipsafety.c +++ b/epan/dissectors/packet-cipsafety.c @@ -28,6 +28,8 @@ #include <epan/packet.h> #include <epan/expert.h> +#include <epan/proto_data.h> + #include <wsutil/pint.h> #include "packet-cip.h" #include "packet-cipsafety.h" diff --git a/epan/dissectors/packet-cp2179.c b/epan/dissectors/packet-cp2179.c index 69499153c4..3751175a12 100644 --- a/epan/dissectors/packet-cp2179.c +++ b/epan/dissectors/packet-cp2179.c @@ -54,6 +54,7 @@ F = 16-bit CRC #include <epan/packet.h> #include <epan/conversation.h> #include <epan/prefs.h> +#include <epan/proto_data.h> void proto_reg_handoff_cp2179(void); void proto_register_cp2179(void); diff --git a/epan/dissectors/packet-dcerpc.c b/epan/dissectors/packet-dcerpc.c index 84ac1a68c2..253f695856 100644 --- a/epan/dissectors/packet-dcerpc.c +++ b/epan/dissectors/packet-dcerpc.c @@ -40,6 +40,8 @@ #include <epan/addr_resolv.h> #include <epan/show_exception.h> #include <epan/decode_as.h> +#include <epan/proto_data.h> + #include <wsutil/str_util.h> #include "packet-tcp.h" #include "packet-dcerpc.h" diff --git a/epan/dissectors/packet-dmp.c b/epan/dissectors/packet-dmp.c index b5ee4c722f..373ac98bd7 100644 --- a/epan/dissectors/packet-dmp.c +++ b/epan/dissectors/packet-dmp.c @@ -46,6 +46,7 @@ #include <epan/asn1.h> #include <epan/strutil.h> #include <epan/uat.h> +#include <epan/proto_data.h> #include <wsutil/str_util.h> diff --git a/epan/dissectors/packet-eap.c b/epan/dissectors/packet-eap.c index 2c38f3bb50..63b74f302f 100644 --- a/epan/dissectors/packet-eap.c +++ b/epan/dissectors/packet-eap.c @@ -29,6 +29,7 @@ #include <epan/reassemble.h> #include <epan/eap.h> #include <epan/expert.h> +#include <epan/proto_data.h> #include "packet-wps.h" diff --git a/epan/dissectors/packet-enip.c b/epan/dissectors/packet-enip.c index bb7eadc1f4..f412005422 100644 --- a/epan/dissectors/packet-enip.c +++ b/epan/dissectors/packet-enip.c @@ -41,6 +41,7 @@ #include <epan/etypes.h> #include <epan/expert.h> #include <epan/decode_as.h> +#include <epan/proto_data.h> #include "packet-tcp.h" #include "packet-cip.h" #include "packet-enip.h" diff --git a/epan/dissectors/packet-epl.c b/epan/dissectors/packet-epl.c index d0b4d56226..0b096a32c5 100644 --- a/epan/dissectors/packet-epl.c +++ b/epan/dissectors/packet-epl.c @@ -54,6 +54,7 @@ #include <epan/prefs.h> #include <epan/expert.h> #include <epan/reassemble.h> +#include <epan/proto_data.h> void proto_register_epl(void); void proto_reg_handoff_epl(void); diff --git a/epan/dissectors/packet-ethertype.c b/epan/dissectors/packet-ethertype.c index 1d7709aef2..9f4de890b0 100644 --- a/epan/dissectors/packet-ethertype.c +++ b/epan/dissectors/packet-ethertype.c @@ -33,6 +33,7 @@ #include <epan/show_exception.h> #include <epan/decode_as.h> #include <epan/capture_dissectors.h> +#include <epan/proto_data.h> #include "packet-eth.h" void proto_register_ethertype(void); diff --git a/epan/dissectors/packet-fcp.c b/epan/dissectors/packet-fcp.c index 0001281e29..45b20d55a4 100644 --- a/epan/dissectors/packet-fcp.c +++ b/epan/dissectors/packet-fcp.c @@ -25,6 +25,7 @@ #include <epan/packet.h> #include <epan/conversation.h> +#include <epan/proto_data.h> #include "packet-scsi.h" #include "packet-fc.h" #include "packet-fcp.h" diff --git a/epan/dissectors/packet-fp_hint.c b/epan/dissectors/packet-fp_hint.c index 8bb3350fed..57340e77bb 100644 --- a/epan/dissectors/packet-fp_hint.c +++ b/epan/dissectors/packet-fp_hint.c @@ -26,6 +26,7 @@ #include <wiretap/wtap.h> #include <epan/conversation.h> #include <epan/expert.h> +#include <epan/proto_data.h> #include "packet-umts_fp.h" #include "packet-umts_mac.h" #include "packet-rlc.h" diff --git a/epan/dissectors/packet-gfp.c b/epan/dissectors/packet-gfp.c index 90d5612fd5..57b441dc4f 100644 --- a/epan/dissectors/packet-gfp.c +++ b/epan/dissectors/packet-gfp.c @@ -40,6 +40,8 @@ #include <epan/crc16-tvb.h> #include <epan/crc32-tvb.h> #include <epan/decode_as.h> +#include <epan/proto_data.h> + #include <wiretap/wtap.h> /* Prototypes */ diff --git a/epan/dissectors/packet-gsm_map.c b/epan/dissectors/packet-gsm_map.c index 9be6a9c525..4e525c6bc3 100644 --- a/epan/dissectors/packet-gsm_map.c +++ b/epan/dissectors/packet-gsm_map.c @@ -60,6 +60,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" @@ -1901,7 +1902,7 @@ static int hf_NokiaMAP_Extensions_AccessSubscriptionListExt_item = -1; /* Acces static int hf_NokiaMAP_Extensions_AllowedServiceData_amr_wb_allowed = -1; /*--- End of included file: packet-gsm_map-hf.c ---*/ -#line 151 "../../asn1/gsm_map/packet-gsm_map-template.c" +#line 152 "../../asn1/gsm_map/packet-gsm_map-template.c" /* Initialize the subtree pointers */ static gint ett_gsm_map = -1; @@ -2614,7 +2615,7 @@ static gint ett_NokiaMAP_Extensions_AccessSubscriptionListExt = -1; static gint ett_NokiaMAP_Extensions_AllowedServiceData = -1; /*--- End of included file: packet-gsm_map-ett.c ---*/ -#line 183 "../../asn1/gsm_map/packet-gsm_map-template.c" +#line 184 "../../asn1/gsm_map/packet-gsm_map-template.c" static expert_field ei_gsm_map_unknown_sequence3 = EI_INIT; static expert_field ei_gsm_map_unknown_sequence = EI_INIT; @@ -20415,7 +20416,7 @@ dissect_NokiaMAP_Extensions_AllowedServiceData(gboolean implicit_tag _U_, tvbuff /*--- End of included file: packet-gsm_map-fn.c ---*/ -#line 830 "../../asn1/gsm_map/packet-gsm_map-template.c" +#line 831 "../../asn1/gsm_map/packet-gsm_map-template.c" /* Specific translation for MAP V3 */ const value_string gsm_map_V1V2_opr_code_strings[] = { @@ -20637,7 +20638,7 @@ const value_string gsm_map_opr_code_strings[] = { /* Unknown or empty loop list OPERATION */ /*--- End of included file: packet-gsm_map-table.c ---*/ -#line 841 "../../asn1/gsm_map/packet-gsm_map-template.c" +#line 842 "../../asn1/gsm_map/packet-gsm_map-template.c" { 0, NULL } }; @@ -20854,7 +20855,7 @@ static const value_string gsm_map_err_code_string_vals[] = { /* Unknown or empty loop list OPERATION */ /*--- End of included file: packet-gsm_map-table.c ---*/ -#line 847 "../../asn1/gsm_map/packet-gsm_map-template.c" +#line 848 "../../asn1/gsm_map/packet-gsm_map-template.c" { 0, NULL } }; #endif @@ -29864,7 +29865,7 @@ void proto_register_gsm_map(void) { NULL, HFILL }}, /*--- End of included file: packet-gsm_map-hfarr.c ---*/ -#line 3051 "../../asn1/gsm_map/packet-gsm_map-template.c" +#line 3052 "../../asn1/gsm_map/packet-gsm_map-template.c" }; /* List of subtrees */ @@ -30579,7 +30580,7 @@ void proto_register_gsm_map(void) { &ett_NokiaMAP_Extensions_AllowedServiceData, /*--- End of included file: packet-gsm_map-ettarr.c ---*/ -#line 3085 "../../asn1/gsm_map/packet-gsm_map-template.c" +#line 3086 "../../asn1/gsm_map/packet-gsm_map-template.c" }; static ei_register_info ei[] = { @@ -30701,7 +30702,7 @@ void proto_register_gsm_map(void) { /*--- End of included file: packet-gsm_map-dis-tab.c ---*/ -#line 3141 "../../asn1/gsm_map/packet-gsm_map-template.c" +#line 3142 "../../asn1/gsm_map/packet-gsm_map-template.c" oid_add_from_string("ericsson-gsm-Map-Ext","1.2.826.0.1249.58.1.0" ); oid_add_from_string("accessTypeNotAllowed-id","1.3.12.2.1107.3.66.1.2"); /*oid_add_from_string("map-ac networkLocUp(1) version3(3)","0.4.0.0.1.0.1.3" ); diff --git a/epan/dissectors/packet-gssapi.c b/epan/dissectors/packet-gssapi.c index 47c4fcd392..c9dc7fccd5 100644 --- a/epan/dissectors/packet-gssapi.c +++ b/epan/dissectors/packet-gssapi.c @@ -32,6 +32,7 @@ #include <epan/prefs.h> #include <epan/reassemble.h> #include <epan/show_exception.h> +#include <epan/proto_data.h> #include "packet-ber.h" #include "packet-dcerpc.h" diff --git a/epan/dissectors/packet-http.c b/epan/dissectors/packet-http.c index 2e8d7de9ae..5bd023117f 100644 --- a/epan/dissectors/packet-http.c +++ b/epan/dissectors/packet-http.c @@ -42,6 +42,8 @@ #include <epan/stats_tree.h> #include <epan/to_str.h> #include <epan/req_resp_hdrs.h> +#include <epan/proto_data.h> + #include <wsutil/base64.h> #include "packet-http.h" #include "packet-tcp.h" diff --git a/epan/dissectors/packet-http2.c b/epan/dissectors/packet-http2.c index 3a9171a998..d48a54b461 100644 --- a/epan/dissectors/packet-http2.c +++ b/epan/dissectors/packet-http2.c @@ -40,6 +40,7 @@ #include <epan/packet.h> #include <epan/prefs.h> +#include <epan/proto_data.h> #include <epan/nghttp2/nghttp2.h> diff --git a/epan/dissectors/packet-iax2.c b/epan/dissectors/packet-iax2.c index e36e054cfc..9a65371a9a 100644 --- a/epan/dissectors/packet-iax2.c +++ b/epan/dissectors/packet-iax2.c @@ -38,6 +38,7 @@ #include <epan/expert.h> #include <epan/aftypes.h> #include <epan/tap.h> +#include <epan/proto_data.h> #include <wsutil/str_util.h> diff --git a/epan/dissectors/packet-icmp.c b/epan/dissectors/packet-icmp.c index 890e011e93..c798afdab3 100644 --- a/epan/dissectors/packet-icmp.c +++ b/epan/dissectors/packet-icmp.c @@ -42,6 +42,7 @@ #include <epan/tap.h> #include <epan/ipproto.h> #include <epan/capture_dissectors.h> +#include <epan/proto_data.h> #include "packet-ip.h" #include "packet-icmp.h" diff --git a/epan/dissectors/packet-icmpv6.c b/epan/dissectors/packet-icmpv6.c index bbb0bc3c47..cfc6144452 100644 --- a/epan/dissectors/packet-icmpv6.c +++ b/epan/dissectors/packet-icmpv6.c @@ -44,6 +44,7 @@ #include <epan/conversation.h> #include <epan/tap.h> #include <epan/capture_dissectors.h> +#include <epan/proto_data.h> #include "packet-ber.h" #include "packet-dns.h" diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c index bf14a8667e..deca2f1127 100644 --- a/epan/dissectors/packet-ieee80211.c +++ b/epan/dissectors/packet-ieee80211.c @@ -102,6 +102,7 @@ #include <epan/uat.h> #include <epan/eapol_keydes_types.h> #include <epan/to_str.h> +#include <epan/proto_data.h> #include "packet-wps.h" #include "packet-e212.h" diff --git a/epan/dissectors/packet-ieee802154.c b/epan/dissectors/packet-ieee802154.c index c3f3688f64..1509988517 100644 --- a/epan/dissectors/packet-ieee802154.c +++ b/epan/dissectors/packet-ieee802154.c @@ -72,6 +72,8 @@ #include <epan/strutil.h> #include <epan/to_str.h> #include <epan/show_exception.h> +#include <epan/proto_data.h> + #include <wsutil/pint.h> /* Use libgcrypt for cipher libraries. */ diff --git a/epan/dissectors/packet-ip.c b/epan/dissectors/packet-ip.c index 229a927105..3d67c51def 100644 --- a/epan/dissectors/packet-ip.c +++ b/epan/dissectors/packet-ip.c @@ -46,6 +46,8 @@ #include <epan/nlpid.h> #include <epan/ax25_pids.h> #include <epan/decode_as.h> +#include <epan/proto_data.h> + #include <wiretap/erf.h> #include <wsutil/str_util.h> diff --git a/epan/dissectors/packet-ipsec.c b/epan/dissectors/packet-ipsec.c index 7bd18c59ef..efdcd78bae 100644 --- a/epan/dissectors/packet-ipsec.c +++ b/epan/dissectors/packet-ipsec.c @@ -77,6 +77,7 @@ ADD: Additional generic (non-checked) ICV length of 128, 192 and 256. #include <epan/expert.h> #include <epan/tap.h> #include <epan/exported_pdu.h> +#include <epan/proto_data.h> /* If you want to be able to decrypt or Check Authentication of ESP packets you MUST define this : */ #ifdef HAVE_LIBGCRYPT diff --git a/epan/dissectors/packet-ipv6.c b/epan/dissectors/packet-ipv6.c index e7280e0568..ac94521350 100644 --- a/epan/dissectors/packet-ipv6.c +++ b/epan/dissectors/packet-ipv6.c @@ -44,6 +44,8 @@ #include <epan/arcnet_pids.h> #include <epan/in_cksum.h> #include <epan/decode_as.h> +#include <epan/proto_data.h> + #include <wiretap/erf.h> #include <wsutil/str_util.h> #include "packet-ipv6.h" diff --git a/epan/dissectors/packet-ipx.c b/epan/dissectors/packet-ipx.c index 7c684f8174..592fa6266d 100644 --- a/epan/dissectors/packet-ipx.c +++ b/epan/dissectors/packet-ipx.c @@ -39,6 +39,8 @@ #include <epan/arcnet_pids.h> #include <epan/conversation.h> #include <epan/conversation_table.h> +#include <epan/proto_data.h> + void proto_register_ipx(void); void proto_reg_handoff_ipx(void); diff --git a/epan/dissectors/packet-iso14443.c b/epan/dissectors/packet-iso14443.c index 18c1736f74..92009accac 100644 --- a/epan/dissectors/packet-iso14443.c +++ b/epan/dissectors/packet-iso14443.c @@ -38,8 +38,8 @@ #include "config.h" #include <math.h> -#include <epan/expert.h> #include <epan/packet.h> +#include <epan/expert.h> #include <epan/tfs.h> #include <wiretap/wtap.h> diff --git a/epan/dissectors/packet-ixveriwave.c b/epan/dissectors/packet-ixveriwave.c index 7fb247c7ce..66139151f6 100644 --- a/epan/dissectors/packet-ixveriwave.c +++ b/epan/dissectors/packet-ixveriwave.c @@ -25,6 +25,8 @@ #include "config.h" #include <epan/packet.h> +#include <epan/proto_data.h> + #include <wiretap/wtap.h> void proto_register_ixveriwave(void); diff --git a/epan/dissectors/packet-k12.c b/epan/dissectors/packet-k12.c index f8aa15675c..1b9fdf8025 100644 --- a/epan/dissectors/packet-k12.c +++ b/epan/dissectors/packet-k12.c @@ -30,6 +30,8 @@ #include <epan/uat.h> #include <epan/expert.h> #include <epan/strutil.h> +#include <epan/proto_data.h> + #include <wiretap/wtap.h> #include <wsutil/pint.h> #include <wsutil/str_util.h> diff --git a/epan/dissectors/packet-kafka.c b/epan/dissectors/packet-kafka.c index 9f8a29569f..91caa6b731 100644 --- a/epan/dissectors/packet-kafka.c +++ b/epan/dissectors/packet-kafka.c @@ -28,6 +28,7 @@ #include <epan/packet.h> #include <epan/expert.h> #include <epan/prefs.h> +#include <epan/proto_data.h> #include "packet-tcp.h" void proto_register_kafka(void); diff --git a/epan/dissectors/packet-l2tp.c b/epan/dissectors/packet-l2tp.c index 19d4058f7e..6e665c08fe 100644 --- a/epan/dissectors/packet-l2tp.c +++ b/epan/dissectors/packet-l2tp.c @@ -61,6 +61,8 @@ #include <epan/conversation.h> #include <epan/expert.h> #include <epan/decode_as.h> +#include <epan/proto_data.h> + #include <wsutil/md5.h> #include <wsutil/sha1.h> diff --git a/epan/dissectors/packet-lapd.c b/epan/dissectors/packet-lapd.c index 070a2d909b..eb8612df52 100644 --- a/epan/dissectors/packet-lapd.c +++ b/epan/dissectors/packet-lapd.c @@ -45,6 +45,7 @@ #include <wiretap/wtap.h> #include <epan/lapd_sapi.h> #include <epan/expert.h> +#include <epan/proto_data.h> #include "packet-l2tp.h" void proto_register_lapd(void); 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); diff --git a/epan/dissectors/packet-mac-lte-framed.c b/epan/dissectors/packet-mac-lte-framed.c index 4d671f2a2b..1ad5189407 100644 --- a/epan/dissectors/packet-mac-lte-framed.c +++ b/epan/dissectors/packet-mac-lte-framed.c @@ -24,6 +24,7 @@ #include "config.h" #include <epan/packet.h> +#include <epan/proto_data.h> #include "packet-mac-lte.h" void proto_register_mac_lte_framed(void); diff --git a/epan/dissectors/packet-mac-lte.c b/epan/dissectors/packet-mac-lte.c index be2993e52f..870edd8c50 100644 --- a/epan/dissectors/packet-mac-lte.c +++ b/epan/dissectors/packet-mac-lte.c @@ -26,6 +26,7 @@ #include <epan/prefs.h> #include <epan/tap.h> #include <epan/uat.h> +#include <epan/proto_data.h> #include "packet-mac-lte.h" #include "packet-rlc-lte.h" diff --git a/epan/dissectors/packet-mbtcp.c b/epan/dissectors/packet-mbtcp.c index 8b2f3a423d..dbc2058a5f 100644 --- a/epan/dissectors/packet-mbtcp.c +++ b/epan/dissectors/packet-mbtcp.c @@ -69,6 +69,7 @@ #include <epan/prefs.h> #include <epan/expert.h> #include <epan/crc16-tvb.h> /* For CRC verification */ +#include <epan/proto_data.h> void proto_register_modbus(void); void proto_reg_handoff_mbtcp(void); diff --git a/epan/dissectors/packet-meta.c b/epan/dissectors/packet-meta.c index 263ad4a5fa..16759baf0d 100644 --- a/epan/dissectors/packet-meta.c +++ b/epan/dissectors/packet-meta.c @@ -25,6 +25,7 @@ #include <epan/packet.h> #include <wiretap/wtap.h> #include <epan/expert.h> +#include <epan/proto_data.h> #include "packet-sscop.h" #include "packet-gsm_a_common.h" diff --git a/epan/dissectors/packet-mikey.c b/epan/dissectors/packet-mikey.c index 5d2cfec5d2..d0da79454e 100644 --- a/epan/dissectors/packet-mikey.c +++ b/epan/dissectors/packet-mikey.c @@ -40,6 +40,7 @@ #include <epan/packet.h> #include <epan/prefs.h> #include <epan/asn1.h> +#include <epan/proto_data.h> #include "packet-x509af.h" void proto_register_mikey(void); diff --git a/epan/dissectors/packet-mp2t.c b/epan/dissectors/packet-mp2t.c index 10cf9b126b..d1236d430f 100644 --- a/epan/dissectors/packet-mp2t.c +++ b/epan/dissectors/packet-mp2t.c @@ -35,6 +35,7 @@ #include <epan/expert.h> #include <epan/reassemble.h> #include <epan/address_types.h> +#include <epan/proto_data.h> #include "packet-l2tp.h" #include <epan/tvbuff-int.h> /* XXX, for tvb_new_proxy() */ diff --git a/epan/dissectors/packet-mpls.c b/epan/dissectors/packet-mpls.c index 130a688d18..4d8aa0af27 100644 --- a/epan/dissectors/packet-mpls.c +++ b/epan/dissectors/packet-mpls.c @@ -58,6 +58,7 @@ #include <epan/prefs.h> #include <epan/ipproto.h> #include <epan/decode_as.h> +#include <epan/proto_data.h> #include "packet-ppp.h" #include "packet-mpls.h" diff --git a/epan/dissectors/packet-msrp.c b/epan/dissectors/packet-msrp.c index 274218a2a4..4fe1801ffb 100644 --- a/epan/dissectors/packet-msrp.c +++ b/epan/dissectors/packet-msrp.c @@ -31,6 +31,8 @@ #include <epan/packet.h> #include <epan/conversation.h> #include <epan/prefs.h> +#include <epan/proto_data.h> + #include <wsutil/str_util.h> #include "packet-msrp.h" diff --git a/epan/dissectors/packet-mswsp.c b/epan/dissectors/packet-mswsp.c index e38a3f36b1..e74a909d38 100644 --- a/epan/dissectors/packet-mswsp.c +++ b/epan/dissectors/packet-mswsp.c @@ -26,6 +26,7 @@ #include <epan/packet.h> #include <epan/expert.h> +#include <epan/proto_data.h> #include "packet-smb.h" #include "packet-smb2.h" diff --git a/epan/dissectors/packet-mysql.c b/epan/dissectors/packet-mysql.c index fe79babaab..bf5b3f9721 100644 --- a/epan/dissectors/packet-mysql.c +++ b/epan/dissectors/packet-mysql.c @@ -41,6 +41,7 @@ #include <epan/prefs.h> #include <epan/expert.h> #include <epan/strutil.h> +#include <epan/proto_data.h> #include "packet-tcp.h" #include "packet-ssl-utils.h" diff --git a/epan/dissectors/packet-ndps.c b/epan/dissectors/packet-ndps.c index ba80dfc0a3..552524963b 100644 --- a/epan/dissectors/packet-ndps.c +++ b/epan/dissectors/packet-ndps.c @@ -30,6 +30,7 @@ #include <epan/reassemble.h> #include <epan/expert.h> #include <epan/strutil.h> +#include <epan/proto_data.h> #include "packet-ipx.h" #include "packet-tcp.h" diff --git a/epan/dissectors/packet-ntlmssp.c b/epan/dissectors/packet-ntlmssp.c index 1a9df88865..aa24bf73e9 100644 --- a/epan/dissectors/packet-ntlmssp.c +++ b/epan/dissectors/packet-ntlmssp.c @@ -37,6 +37,8 @@ #include <epan/tap.h> #include <epan/expert.h> #include <epan/show_exception.h> +#include <epan/proto_data.h> + #include <wsutil/rc4.h> #include <wsutil/md4.h> #include <wsutil/md5.h> diff --git a/epan/dissectors/packet-ositp.c b/epan/dissectors/packet-ositp.c index 9f6a8d6287..47f3851883 100644 --- a/epan/dissectors/packet-ositp.c +++ b/epan/dissectors/packet-ositp.c @@ -32,6 +32,8 @@ #include <epan/conversation.h> #include <epan/ipproto.h> #include <epan/expert.h> +#include <epan/proto_data.h> + #include <wsutil/str_util.h> #include "packet-frame.h" #include "packet-osi.h" diff --git a/epan/dissectors/packet-p_mul.c b/epan/dissectors/packet-p_mul.c index b0f7da9181..6061e4b610 100644 --- a/epan/dissectors/packet-p_mul.c +++ b/epan/dissectors/packet-p_mul.c @@ -42,6 +42,7 @@ #include <epan/expert.h> #include <epan/asn1.h> #include <epan/in_cksum.h> +#include <epan/proto_data.h> #include <wsutil/str_util.h> diff --git a/epan/dissectors/packet-pdcp-lte.c b/epan/dissectors/packet-pdcp-lte.c index 23f04134f2..7e2ed7f5f5 100644 --- a/epan/dissectors/packet-pdcp-lte.c +++ b/epan/dissectors/packet-pdcp-lte.c @@ -29,6 +29,8 @@ #include <epan/prefs.h> #include <epan/expert.h> #include <epan/uat.h> +#include <epan/proto_data.h> + #include <wsutil/wsgcrypt.h> /* Define this symbol if you have a working implementation of SNOW3G f8() and f9() available. diff --git a/epan/dissectors/packet-pop.c b/epan/dissectors/packet-pop.c index c2ab6c0e7b..adce23484e 100644 --- a/epan/dissectors/packet-pop.c +++ b/epan/dissectors/packet-pop.c @@ -33,6 +33,8 @@ #include <epan/conversation.h> #include <epan/prefs.h> #include <epan/reassemble.h> +#include <epan/proto_data.h> + #include <wsutil/str_util.h> #include "packet-ssl.h" #include "packet-ssl-utils.h" diff --git a/epan/dissectors/packet-ranap.c b/epan/dissectors/packet-ranap.c index 1fa0521c14..51face76aa 100644 --- a/epan/dissectors/packet-ranap.c +++ b/epan/dissectors/packet-ranap.c @@ -38,6 +38,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" @@ -408,7 +409,7 @@ typedef enum _ProtocolIE_ID_enum { } ProtocolIE_ID_enum; /*--- End of included file: packet-ranap-val.h ---*/ -#line 59 "../../asn1/ranap/packet-ranap-template.c" +#line 60 "../../asn1/ranap/packet-ranap-template.c" void proto_register_ranap(void); void proto_reg_handoff_ranap(void); @@ -1146,7 +1147,7 @@ static int hf_ranap_unsuccessfulOutcome_value = -1; /* UnsuccessfulOutcome_valu static int hf_ranap_value = -1; /* T_value */ /*--- End of included file: packet-ranap-hf.c ---*/ -#line 76 "../../asn1/ranap/packet-ranap-template.c" +#line 77 "../../asn1/ranap/packet-ranap-template.c" /* Initialize the subtree pointers */ static int ett_ranap = -1; @@ -1482,7 +1483,7 @@ static gint ett_ranap_UnsuccessfulOutcome = -1; static gint ett_ranap_Outcome = -1; /*--- End of included file: packet-ranap-ett.c ---*/ -#line 83 "../../asn1/ranap/packet-ranap-template.c" +#line 84 "../../asn1/ranap/packet-ranap-template.c" /* Global variables */ static guint32 ProcedureCode; @@ -13090,7 +13091,7 @@ static int dissect_RANAP_PDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, prot /*--- End of included file: packet-ranap-fn.c ---*/ -#line 142 "../../asn1/ranap/packet-ranap-template.c" +#line 143 "../../asn1/ranap/packet-ranap-template.c" static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) @@ -16144,7 +16145,7 @@ void proto_register_ranap(void) { NULL, HFILL }}, /*--- End of included file: packet-ranap-hfarr.c ---*/ -#line 327 "../../asn1/ranap/packet-ranap-template.c" +#line 328 "../../asn1/ranap/packet-ranap-template.c" }; /* List of subtrees */ @@ -16481,7 +16482,7 @@ void proto_register_ranap(void) { &ett_ranap_Outcome, /*--- End of included file: packet-ranap-ettarr.c ---*/ -#line 335 "../../asn1/ranap/packet-ranap-template.c" +#line 336 "../../asn1/ranap/packet-ranap-template.c" }; @@ -16864,7 +16865,7 @@ proto_reg_handoff_ranap(void) /*--- End of included file: packet-ranap-dis-tab.c ---*/ -#line 385 "../../asn1/ranap/packet-ranap-template.c" +#line 386 "../../asn1/ranap/packet-ranap-template.c" } else { dissector_delete_uint("sccp.ssn", local_ranap_sccp_ssn, ranap_handle); } diff --git a/epan/dissectors/packet-rdt.c b/epan/dissectors/packet-rdt.c index d35bd137d7..38675a4f47 100644 --- a/epan/dissectors/packet-rdt.c +++ b/epan/dissectors/packet-rdt.c @@ -36,6 +36,7 @@ #include <epan/expert.h> #include <epan/conversation.h> #include <epan/prefs.h> +#include <epan/proto_data.h> #include "packet-rdt.h" static dissector_handle_t rdt_handle; diff --git a/epan/dissectors/packet-rlc-lte.c b/epan/dissectors/packet-rlc-lte.c index 50f4411dcb..2a51be33c7 100644 --- a/epan/dissectors/packet-rlc-lte.c +++ b/epan/dissectors/packet-rlc-lte.c @@ -28,6 +28,7 @@ #include <epan/expert.h> #include <epan/prefs.h> #include <epan/tap.h> +#include <epan/proto_data.h> #include "packet-mac-lte.h" #include "packet-rlc-lte.h" #include "packet-pdcp-lte.h" diff --git a/epan/dissectors/packet-rlc.c b/epan/dissectors/packet-rlc.c index d29ecff8be..70e178ef32 100644 --- a/epan/dissectors/packet-rlc.c +++ b/epan/dissectors/packet-rlc.c @@ -27,6 +27,8 @@ #include <epan/conversation.h> #include <epan/expert.h> #include <epan/prefs.h> +#include <epan/proto_data.h> + #include <wiretap/wtap.h> /* diff --git a/epan/dissectors/packet-rmt-fec.c b/epan/dissectors/packet-rmt-fec.c index 7089d98ad7..1fbb77b206 100644 --- a/epan/dissectors/packet-rmt-fec.c +++ b/epan/dissectors/packet-rmt-fec.c @@ -40,6 +40,7 @@ #include <epan/packet.h> #include <epan/expert.h> +#include <epan/proto_data.h> #include "packet-rmt-common.h" void proto_register_rmt_fec(void); diff --git a/epan/dissectors/packet-rmt-norm.c b/epan/dissectors/packet-rmt-norm.c index dff6766351..56606a70e1 100644 --- a/epan/dissectors/packet-rmt-norm.c +++ b/epan/dissectors/packet-rmt-norm.c @@ -44,6 +44,7 @@ #include <epan/packet.h> #include <epan/prefs.h> #include <epan/expert.h> +#include <epan/proto_data.h> #include "packet-rmt-common.h" void proto_register_norm(void); diff --git a/epan/dissectors/packet-rohc.c b/epan/dissectors/packet-rohc.c index f0eecaa8ec..f055ebcc8a 100644 --- a/epan/dissectors/packet-rohc.c +++ b/epan/dissectors/packet-rohc.c @@ -36,6 +36,7 @@ #include <epan/addr_resolv.h> #include <epan/rtp_pt.h> #include <epan/expert.h> +#include <epan/proto_data.h> #include "packet-rohc.h" void proto_register_rohc(void); diff --git a/epan/dissectors/packet-rrc.c b/epan/dissectors/packet-rrc.c index 54b44488fa..8a6a76a91f 100644 --- a/epan/dissectors/packet-rrc.c +++ b/epan/dissectors/packet-rrc.c @@ -45,6 +45,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" @@ -299,7 +300,7 @@ static int dissect_SysInfoType22_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tr #define maxWLANs 64 /*--- End of included file: packet-rrc-val.h ---*/ -#line 96 "../../asn1/rrc/packet-rrc-template.c" +#line 97 "../../asn1/rrc/packet-rrc-template.c" /* Initialize the protocol and registered fields */ int proto_rrc = -1; @@ -11004,7 +11005,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 101 "../../asn1/rrc/packet-rrc-template.c" +#line 102 "../../asn1/rrc/packet-rrc-template.c" /* Initialize the subtree pointers */ static int ett_rrc = -1; @@ -17825,7 +17826,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 106 "../../asn1/rrc/packet-rrc-template.c" +#line 107 "../../asn1/rrc/packet-rrc-template.c" static gint ett_rrc_eutraFeatureGroupIndicators = -1; static gint ett_rrc_cn_CommonGSM_MAP_NAS_SysInfo = -1; @@ -160254,7 +160255,7 @@ static int dissect_MeasurementReport_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _ /*--- End of included file: packet-rrc-fn.c ---*/ -#line 194 "../../asn1/rrc/packet-rrc-template.c" +#line 195 "../../asn1/rrc/packet-rrc-template.c" @@ -203117,7 +203118,7 @@ void proto_register_rrc(void) { NULL, HFILL }}, /*--- End of included file: packet-rrc-hfarr.c ---*/ -#line 276 "../../asn1/rrc/packet-rrc-template.c" +#line 277 "../../asn1/rrc/packet-rrc-template.c" { &hf_test, { "RAB Test", "rrc.RAB.test", FT_UINT8, BASE_DEC, NULL, 0, @@ -209975,7 +209976,7 @@ void proto_register_rrc(void) { &ett_rrc_UL_RFC3095_Context, /*--- End of included file: packet-rrc-ettarr.c ---*/ -#line 318 "../../asn1/rrc/packet-rrc-template.c" +#line 319 "../../asn1/rrc/packet-rrc-template.c" &ett_rrc_eutraFeatureGroupIndicators, &ett_rrc_cn_CommonGSM_MAP_NAS_SysInfo, &ett_rrc_ims_info, @@ -210073,7 +210074,7 @@ void proto_register_rrc(void) { /*--- End of included file: packet-rrc-dis-reg.c ---*/ -#line 340 "../../asn1/rrc/packet-rrc-template.c" +#line 341 "../../asn1/rrc/packet-rrc-template.c" diff --git a/epan/dissectors/packet-rsync.c b/epan/dissectors/packet-rsync.c index 4b483b1bb1..a849ed88f7 100644 --- a/epan/dissectors/packet-rsync.c +++ b/epan/dissectors/packet-rsync.c @@ -30,6 +30,7 @@ #include <epan/packet.h> #include <epan/conversation.h> #include <epan/prefs.h> +#include <epan/proto_data.h> void proto_register_rsync(void); diff --git a/epan/dissectors/packet-rtcp.c b/epan/dissectors/packet-rtcp.c index eb1e6fb5bf..311a523f51 100644 --- a/epan/dissectors/packet-rtcp.c +++ b/epan/dissectors/packet-rtcp.c @@ -76,6 +76,7 @@ #include <epan/prefs.h> #include <epan/expert.h> #include <epan/to_str.h> +#include <epan/proto_data.h> void proto_register_rtcp(void); void proto_reg_handoff_rtcp(void); diff --git a/epan/dissectors/packet-rtp-events.c b/epan/dissectors/packet-rtp-events.c index 808ef04ce0..387c86a165 100644 --- a/epan/dissectors/packet-rtp-events.c +++ b/epan/dissectors/packet-rtp-events.c @@ -37,6 +37,7 @@ #include <epan/packet.h> #include <epan/prefs.h> +#include <epan/proto_data.h> #include "packet-rtp-events.h" #include "packet-rtp.h" diff --git a/epan/dissectors/packet-rtp.c b/epan/dissectors/packet-rtp.c index 91f84bd990..f6568ed9f7 100644 --- a/epan/dissectors/packet-rtp.c +++ b/epan/dissectors/packet-rtp.c @@ -59,6 +59,7 @@ #include <epan/packet.h> #include <epan/exceptions.h> #include <epan/expert.h> +#include <epan/proto_data.h> #include "packet-rtp.h" diff --git a/epan/dissectors/packet-sctp.c b/epan/dissectors/packet-sctp.c index 1a0380093e..c3c2826b4e 100644 --- a/epan/dissectors/packet-sctp.c +++ b/epan/dissectors/packet-sctp.c @@ -66,6 +66,8 @@ #include <epan/conversation_table.h> #include <epan/show_exception.h> #include <epan/decode_as.h> +#include <epan/proto_data.h> + #include <wsutil/crc32.h> #include <wsutil/adler32.h> #include <wsutil/utf8_entities.h> diff --git a/epan/dissectors/packet-selfm.c b/epan/dissectors/packet-selfm.c index 7bf58b039a..6b1a74fec9 100644 --- a/epan/dissectors/packet-selfm.c +++ b/epan/dissectors/packet-selfm.c @@ -69,6 +69,7 @@ #include <epan/reassemble.h> #include <epan/expert.h> #include <epan/crc16-tvb.h> +#include <epan/proto_data.h> void proto_register_selfm(void); diff --git a/epan/dissectors/packet-ses.c b/epan/dissectors/packet-ses.c index 1882b892f3..5a6b880259 100644 --- a/epan/dissectors/packet-ses.c +++ b/epan/dissectors/packet-ses.c @@ -30,6 +30,7 @@ #include <epan/prefs.h> #include <epan/conversation.h> #include <epan/reassemble.h> +#include <epan/proto_data.h> #include <wsutil/str_util.h> diff --git a/epan/dissectors/packet-sip.c b/epan/dissectors/packet-sip.c index 5281bd45b0..629ec361a8 100644 --- a/epan/dissectors/packet-sip.c +++ b/epan/dissectors/packet-sip.c @@ -42,6 +42,7 @@ #include <epan/req_resp_hdrs.h> #include <epan/stat_tap_ui.h> #include <epan/tap.h> +#include <epan/proto_data.h> #include <wsutil/str_util.h> diff --git a/epan/dissectors/packet-smb-direct.c b/epan/dissectors/packet-smb-direct.c index 9f6122c47e..35e28374d4 100644 --- a/epan/dissectors/packet-smb-direct.c +++ b/epan/dissectors/packet-smb-direct.c @@ -29,6 +29,7 @@ #include <epan/packet.h> #include <epan/reassemble.h> #include <epan/prefs.h> +#include <epan/proto_data.h> #include "packet-windows-common.h" #include "packet-iwarp-ddp-rdmap.h" #include "packet-infiniband.h" diff --git a/epan/dissectors/packet-smtp.c b/epan/dissectors/packet-smtp.c index 0daaf0d2c6..06c31f2d2d 100644 --- a/epan/dissectors/packet-smtp.c +++ b/epan/dissectors/packet-smtp.c @@ -34,6 +34,8 @@ #include <epan/prefs.h> #include <epan/strutil.h> #include <epan/reassemble.h> +#include <epan/proto_data.h> + #include <wsutil/base64.h> #include <wsutil/str_util.h> #include "packet-ssl.h" diff --git a/epan/dissectors/packet-socks.c b/epan/dissectors/packet-socks.c index 5556caaa1a..1d7e02982f 100644 --- a/epan/dissectors/packet-socks.c +++ b/epan/dissectors/packet-socks.c @@ -61,6 +61,7 @@ #include <epan/packet.h> #include <epan/exceptions.h> +#include <epan/proto_data.h> #include "packet-tcp.h" #include "packet-udp.h" diff --git a/epan/dissectors/packet-soupbintcp.c b/epan/dissectors/packet-soupbintcp.c index dfc3a1b9b1..84c7f0366b 100644 --- a/epan/dissectors/packet-soupbintcp.c +++ b/epan/dissectors/packet-soupbintcp.c @@ -58,6 +58,7 @@ #include <epan/packet.h> #include <epan/prefs.h> +#include <epan/proto_data.h> /* For tcp_dissect_pdus() */ #include "packet-tcp.h" diff --git a/epan/dissectors/packet-spice.c b/epan/dissectors/packet-spice.c index ea11eda16a..916e7ef577 100644 --- a/epan/dissectors/packet-spice.c +++ b/epan/dissectors/packet-spice.c @@ -31,6 +31,7 @@ #include <epan/packet.h> #include <epan/conversation.h> #include <epan/expert.h> +#include <epan/proto_data.h> /* NOTE: * packet-spice.h is auto-generated from a Spice protocol definition by a tool * included in the spice-common repository diff --git a/epan/dissectors/packet-spnego.c b/epan/dissectors/packet-spnego.c index a23fa9813d..30a1d2cfd8 100644 --- a/epan/dissectors/packet-spnego.c +++ b/epan/dissectors/packet-spnego.c @@ -43,6 +43,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" @@ -108,7 +109,7 @@ static int hf_spnego_ContextFlags_confFlag = -1; static int hf_spnego_ContextFlags_integFlag = -1; /*--- End of included file: packet-spnego-hf.c ---*/ -#line 75 "../../asn1/spnego/packet-spnego-template.c" +#line 76 "../../asn1/spnego/packet-spnego-template.c" /* Global variables */ static const char *MechType_oid; @@ -135,7 +136,7 @@ static gint ett_spnego_NegTokenTarg = -1; static gint ett_spnego_InitialContextToken_U = -1; /*--- End of included file: packet-spnego-ett.c ---*/ -#line 89 "../../asn1/spnego/packet-spnego-template.c" +#line 90 "../../asn1/spnego/packet-spnego-template.c" static expert_field ei_spnego_decrypted_keytype = EI_INIT; static expert_field ei_spnego_unknown_header = EI_INIT; @@ -554,7 +555,7 @@ dissect_spnego_InitialContextToken(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, /*--- End of included file: packet-spnego-fn.c ---*/ -#line 106 "../../asn1/spnego/packet-spnego-template.c" +#line 107 "../../asn1/spnego/packet-spnego-template.c" /* * This is the SPNEGO KRB5 dissector. It is not true KRB5, but some ASN.1 * wrapped blob with an OID, USHORT token ID, and a Ticket, that is also @@ -1961,7 +1962,7 @@ void proto_register_spnego(void) { NULL, HFILL }}, /*--- End of included file: packet-spnego-hfarr.c ---*/ -#line 1416 "../../asn1/spnego/packet-spnego-template.c" +#line 1417 "../../asn1/spnego/packet-spnego-template.c" }; /* List of subtrees */ @@ -1984,7 +1985,7 @@ void proto_register_spnego(void) { &ett_spnego_InitialContextToken_U, /*--- End of included file: packet-spnego-ettarr.c ---*/ -#line 1426 "../../asn1/spnego/packet-spnego-template.c" +#line 1427 "../../asn1/spnego/packet-spnego-template.c" }; static ei_register_info ei[] = { diff --git a/epan/dissectors/packet-sscop.c b/epan/dissectors/packet-sscop.c index 67b2494bd1..353ed41bc6 100644 --- a/epan/dissectors/packet-sscop.c +++ b/epan/dissectors/packet-sscop.c @@ -26,6 +26,8 @@ #include <epan/packet.h> #include <epan/prefs.h> +#include <epan/proto_data.h> + #include <wiretap/wtap.h> #include "packet-sscop.h" diff --git a/epan/dissectors/packet-ssl-utils.c b/epan/dissectors/packet-ssl-utils.c index 1806da3cd2..a72e350fbe 100644 --- a/epan/dissectors/packet-ssl-utils.c +++ b/epan/dissectors/packet-ssl-utils.c @@ -40,6 +40,8 @@ #include <epan/ipv6.h> #include <epan/expert.h> #include <epan/asn1.h> +#include <epan/proto_data.h> + #include <wsutil/filesystem.h> #include <wsutil/file_util.h> #include <wsutil/str_util.h> diff --git a/epan/dissectors/packet-ssl.c b/epan/dissectors/packet-ssl.c index b5956b47f6..5394e34150 100644 --- a/epan/dissectors/packet-ssl.c +++ b/epan/dissectors/packet-ssl.c @@ -91,6 +91,8 @@ #include <epan/addr_resolv.h> #include <epan/follow.h> #include <epan/exported_pdu.h> +#include <epan/proto_data.h> + #include <wsutil/str_util.h> #include "packet-tcp.h" #include "packet-x509af.h" diff --git a/epan/dissectors/packet-stt.c b/epan/dissectors/packet-stt.c index 58db28597c..74611450dc 100644 --- a/epan/dissectors/packet-stt.c +++ b/epan/dissectors/packet-stt.c @@ -27,10 +27,10 @@ #include "config.h" +#include <epan/packet.h> #include <epan/expert.h> #include <epan/in_cksum.h> #include <epan/ipproto.h> -#include <epan/packet.h> #include <epan/prefs.h> #include <epan/reassemble.h> #include <epan/to_str.h> diff --git a/epan/dissectors/packet-synphasor.c b/epan/dissectors/packet-synphasor.c index 0a1d92552b..d4b56d4423 100644 --- a/epan/dissectors/packet-synphasor.c +++ b/epan/dissectors/packet-synphasor.c @@ -30,6 +30,7 @@ #include <epan/crc16-tvb.h> #include <epan/prefs.h> #include <epan/expert.h> +#include <epan/proto_data.h> #include "packet-tcp.h" #include <wsutil/utf8_entities.h> 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 diff --git a/epan/dissectors/packet-tcp.c b/epan/dissectors/packet-tcp.c index 3a79a9ba15..e3617fbf7d 100644 --- a/epan/dissectors/packet-tcp.c +++ b/epan/dissectors/packet-tcp.c @@ -38,6 +38,7 @@ #include <epan/reassemble.h> #include <epan/decode_as.h> #include <epan/in_cksum.h> +#include <epan/proto_data.h> #include <wsutil/utf8_entities.h> #include <wsutil/str_util.h> diff --git a/epan/dissectors/packet-teamspeak2.c b/epan/dissectors/packet-teamspeak2.c index a0b0dbb8f9..cdbe67abf4 100644 --- a/epan/dissectors/packet-teamspeak2.c +++ b/epan/dissectors/packet-teamspeak2.c @@ -29,6 +29,7 @@ #include <epan/crc32-tvb.h> #include <epan/reassemble.h> #include <epan/conversation.h> +#include <epan/proto_data.h> /* Packet Classes */ #define TS2C_STANDARD 0xbef0 diff --git a/epan/dissectors/packet-udp.c b/epan/dissectors/packet-udp.c index aaf8e4e536..5ce9e2d6a2 100644 --- a/epan/dissectors/packet-udp.c +++ b/epan/dissectors/packet-udp.c @@ -38,6 +38,8 @@ #include <epan/expert.h> #include <epan/exceptions.h> #include <epan/show_exception.h> +#include <epan/proto_data.h> + #include <wsutil/utf8_entities.h> #include <wsutil/pint.h> diff --git a/epan/dissectors/packet-umts_fp.c b/epan/dissectors/packet-umts_fp.c index 50470e5cf4..6e3a5eb59b 100644 --- a/epan/dissectors/packet-umts_fp.c +++ b/epan/dissectors/packet-umts_fp.c @@ -30,6 +30,8 @@ #include <epan/uat.h> #include <epan/conversation.h> #include <epan/addr_resolv.h> +#include <epan/proto_data.h> + #include <wsutil/crc7.h> /* For FP data header and control frame CRC. */ #include <wsutil/crc16-plain.h> /* For FP Payload CRC. */ #include <wsutil/crc11.h> /* For FP EDCH header CRC. */ diff --git a/epan/dissectors/packet-umts_mac.c b/epan/dissectors/packet-umts_mac.c index 24c16757c8..2dc0c4fe0f 100644 --- a/epan/dissectors/packet-umts_mac.c +++ b/epan/dissectors/packet-umts_mac.c @@ -26,6 +26,7 @@ #include <epan/conversation.h> #include <epan/expert.h> #include <epan/prefs.h> +#include <epan/proto_data.h> #include "packet-rrc.h" #include "packet-umts_fp.h" diff --git a/epan/dissectors/packet-usb.c b/epan/dissectors/packet-usb.c index 6daa47529f..52668c5bc6 100644 --- a/epan/dissectors/packet-usb.c +++ b/epan/dissectors/packet-usb.c @@ -35,6 +35,7 @@ #include <epan/expert.h> #include <epan/prefs.h> #include <epan/decode_as.h> +#include <epan/proto_data.h> #include "packet-usb.h" #include "packet-mausb.h" diff --git a/epan/dissectors/packet-vnc.c b/epan/dissectors/packet-vnc.c index 79e1dd9a5e..73e0b91c98 100644 --- a/epan/dissectors/packet-vnc.c +++ b/epan/dissectors/packet-vnc.c @@ -83,6 +83,7 @@ #include <epan/conversation.h> #include <epan/prefs.h> #include <epan/expert.h> +#include <epan/proto_data.h> #include "packet-x11.h" /* This contains the extern for the X11 value_string_ext * "x11_keysym_vals_source_ext" that VNC uses. */ diff --git a/epan/dissectors/packet-wcp.c b/epan/dissectors/packet-wcp.c index a0290012a2..ae483120fe 100644 --- a/epan/dissectors/packet-wcp.c +++ b/epan/dissectors/packet-wcp.c @@ -98,6 +98,8 @@ #include <epan/packet.h> +#include <epan/proto_data.h> + #include <wiretap/wtap.h> #include <wsutil/pint.h> #include <epan/circuit.h> diff --git a/epan/dissectors/packet-xml.c b/epan/dissectors/packet-xml.c index 9faecd793b..0f07252da9 100644 --- a/epan/dissectors/packet-xml.c +++ b/epan/dissectors/packet-xml.c @@ -33,6 +33,7 @@ #include <epan/packet.h> #include <epan/tvbparse.h> #include <epan/dtd.h> +#include <epan/proto_data.h> #include <wsutil/filesystem.h> #include <epan/prefs.h> #include <epan/expert.h> diff --git a/epan/dissectors/packet-xmpp.c b/epan/dissectors/packet-xmpp.c index 9f37fe907b..1eadaa41e6 100644 --- a/epan/dissectors/packet-xmpp.c +++ b/epan/dissectors/packet-xmpp.c @@ -28,6 +28,7 @@ #include <epan/packet.h> #include <epan/conversation.h> #include <epan/prefs.h> +#include <epan/proto_data.h> #include "packet-xmpp.h" #include "packet-xmpp-core.h" diff --git a/epan/dissectors/packet-zbee-aps.c b/epan/dissectors/packet-zbee-aps.c index aa3fed8737..015d7bba53 100644 --- a/epan/dissectors/packet-zbee-aps.c +++ b/epan/dissectors/packet-zbee-aps.c @@ -30,6 +30,7 @@ #include <epan/prefs.h> /* req'd for packet-zbee-security.h */ #include <epan/expert.h> #include <epan/reassemble.h> +#include <epan/proto_data.h> #include "packet-zbee.h" #include "packet-zbee-nwk.h" diff --git a/epan/dissectors/packet-zbee-nwk.c b/epan/dissectors/packet-zbee-nwk.c index b311215b94..a8ee83f646 100644 --- a/epan/dissectors/packet-zbee-nwk.c +++ b/epan/dissectors/packet-zbee-nwk.c @@ -31,6 +31,7 @@ #include <epan/prefs.h> #include <epan/addr_resolv.h> #include <epan/expert.h> +#include <epan/proto_data.h> #include "packet-zbee.h" #include "packet-zbee-nwk.h" #include "packet-zbee-security.h" diff --git a/epan/dissectors/packet-zbee-security.c b/epan/dissectors/packet-zbee-security.c index c060c8ca3f..590badb971 100644 --- a/epan/dissectors/packet-zbee-security.c +++ b/epan/dissectors/packet-zbee-security.c @@ -32,6 +32,7 @@ #include <epan/prefs.h> #include <epan/expert.h> #include <epan/uat.h> +#include <epan/proto_data.h> /* We require libgcrpyt in order to decrypt ZigBee packets. Without it the best * we can do is parse the security header and give up. diff --git a/epan/epan.h b/epan/epan.h index 1c743e80f3..e1dacdc390 100644 --- a/epan/epan.h +++ b/epan/epan.h @@ -27,7 +27,8 @@ extern "C" { #endif /* __cplusplus */ #include <glib.h> -#include "frame_data.h" +#include <epan/tvbuff.h> +#include <epan/frame_data.h> #include "register.h" #include "ws_symbol_export.h" diff --git a/epan/frame_data.c b/epan/frame_data.c index 3108d35774..f9bb8b47b5 100644 --- a/epan/frame_data.c +++ b/epan/frame_data.c @@ -28,131 +28,8 @@ #include <epan/epan.h> #include <wiretap/wtap.h> #include <epan/frame_data.h> -#include <epan/packet.h> -#include <epan/wmem/wmem.h> +#include <epan/column-utils.h> #include <epan/timestamp.h> -#include <epan/packet_info.h> - - -/* Protocol-specific data attached to a frame_data structure - protocol - index and opaque pointer. */ -typedef struct _frame_proto_data { - int proto; - guint32 key; - void *proto_data; -} frame_proto_data; - -/* XXX - I declared this static, because it only seems to be used by - * p_get_proto_data and p_add_proto_data - */ -static gint -p_compare(gconstpointer a, gconstpointer b) -{ - const frame_proto_data *ap = (const frame_proto_data *)a; - const frame_proto_data *bp = (const frame_proto_data *)b; - - if (ap -> proto > bp -> proto){ - return 1; - }else if (ap -> proto == bp -> proto){ - if (ap -> key > bp -> key){ - return 1; - }else if (ap -> key == bp -> key){ - return 0; - } - return -1; - }else{ - return -1; - } -} - -void -p_add_proto_data(wmem_allocator_t *tmp_scope, struct _packet_info* pinfo, int proto, guint32 key, void *proto_data) -{ - frame_proto_data *p1; - GSList** proto_list; - wmem_allocator_t *scope; - - if (tmp_scope == pinfo->pool) { - scope = tmp_scope; - proto_list = &pinfo->proto_data; - } else { - scope = wmem_file_scope(); - proto_list = &pinfo->fd->pfd; - } - - p1 = (frame_proto_data *)wmem_alloc(scope, sizeof(frame_proto_data)); - - p1->proto = proto; - p1->key = key; - p1->proto_data = proto_data; - - /* Add it to the GSLIST */ - *proto_list = g_slist_prepend(*proto_list, - (gpointer *)p1); -} - -void * -p_get_proto_data(wmem_allocator_t *scope, struct _packet_info* pinfo, int proto, guint32 key) -{ - frame_proto_data temp, *p1; - GSList *item; - - temp.proto = proto; - temp.key = key; - temp.proto_data = NULL; - - if (scope == pinfo->pool) { - item = g_slist_find_custom(pinfo->proto_data, (gpointer *)&temp, p_compare); - } else { - item = g_slist_find_custom(pinfo->fd->pfd, (gpointer *)&temp, p_compare); - } - - if (item) { - p1 = (frame_proto_data *)item->data; - return p1->proto_data; - } - - return NULL; - -} - -void -p_remove_proto_data(wmem_allocator_t *scope, struct _packet_info* pinfo, int proto, guint32 key) -{ - frame_proto_data temp; - GSList *item; - GSList** proto_list; - - temp.proto = proto; - temp.key = key; - temp.proto_data = NULL; - - if (scope == pinfo->pool) { - item = g_slist_find_custom(pinfo->fd->pfd, (gpointer *)&temp, p_compare); - proto_list = &pinfo->proto_data; - } else { - item = g_slist_find_custom(pinfo->fd->pfd, (gpointer *)&temp, p_compare); - proto_list = &pinfo->fd->pfd; - } - - if (item) { - *proto_list = g_slist_remove(*proto_list, item->data); - } - -} - -gchar * -p_get_proto_name_and_key(wmem_allocator_t *scope, struct _packet_info* pinfo, guint pfd_index){ - frame_proto_data *temp; - - if (scope == pinfo->pool) { - temp = (frame_proto_data*)g_slist_nth_data(pinfo->proto_data, pfd_index); - } else { - temp = (frame_proto_data*)g_slist_nth_data(pinfo->fd->pfd, pfd_index); - } - - return wmem_strdup_printf(wmem_packet_scope(),"[%s, key %u]",proto_get_protocol_name(temp->proto), temp->key); -} #define COMPARE_FRAME_NUM() ((fdata1->num < fdata2->num) ? -1 : \ (fdata1->num > fdata2->num) ? 1 : \ diff --git a/epan/frame_data.h b/epan/frame_data.h index 6f10ff9ad3..a282c882fb 100644 --- a/epan/frame_data.h +++ b/epan/frame_data.h @@ -27,7 +27,6 @@ extern "C" { #endif /* __cplusplus */ -#include <epan/tvbuff.h> #include <wsutil/nstime.h> #include <wsutil/ws_diag_control.h> #include "ws_symbol_export.h" @@ -95,12 +94,6 @@ typedef struct _frame_data { } frame_data; DIAG_ON(pedantic) -/* Utility routines used by packet*.c */ -WS_DLL_PUBLIC void p_add_proto_data(wmem_allocator_t *scope, struct _packet_info* pinfo, int proto, guint32 key, void *proto_data); -WS_DLL_PUBLIC void *p_get_proto_data(wmem_allocator_t *scope, struct _packet_info* pinfo, int proto, guint32 key); -WS_DLL_PUBLIC void p_remove_proto_data(wmem_allocator_t *scope, struct _packet_info* pinfo, int proto, guint32 key); -gchar *p_get_proto_name_and_key(wmem_allocator_t *scope, struct _packet_info* pinfo, guint pfd_index); - /** compare two frame_datas */ WS_DLL_PUBLIC gint frame_data_compare(const struct epan_session *epan, const frame_data *fdata1, const frame_data *fdata2, int field); diff --git a/epan/proto_data.c b/epan/proto_data.c new file mode 100644 index 0000000000..bee7ad41db --- /dev/null +++ b/epan/proto_data.c @@ -0,0 +1,167 @@ +/* proto_data.c + * Protocol-specific data + * + * Wireshark - Network traffic analyzer + * By Gerald Combs <gerald@wireshark.org> + * Copyright 1998 Gerald Combs + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#include "config.h" + +#include <glib.h> + +#if 0 +#include <epan/epan.h> +#include <wiretap/wtap.h> +#endif +#include <epan/wmem/wmem.h> +#include <epan/packet_info.h> +#include <epan/proto_data.h> +#include <epan/proto.h> +#if 0 +#include <epan/packet.h> +#endif +#if 0 +#include <epan/timestamp.h> +#endif + +/* Protocol-specific data attached to a frame_data structure - protocol + index and opaque pointer. */ +typedef struct _proto_data { + int proto; + guint32 key; + void *proto_data; +} proto_data_t; + +static gint +p_compare(gconstpointer a, gconstpointer b) +{ + const proto_data_t *ap = (const proto_data_t *)a; + const proto_data_t *bp = (const proto_data_t *)b; + + if (ap -> proto > bp -> proto) { + return 1; + } else if (ap -> proto == bp -> proto) { + if (ap->key > bp->key){ + return 1; + } else if (ap -> key == bp -> key) { + return 0; + } + return -1; + } else { + return -1; + } +} + +void +p_add_proto_data(wmem_allocator_t *tmp_scope, struct _packet_info* pinfo, int proto, guint32 key, void *proto_data) +{ + proto_data_t *p1; + GSList **proto_list; + wmem_allocator_t *scope; + + if (tmp_scope == pinfo->pool) { + scope = tmp_scope; + proto_list = &pinfo->proto_data; + } else { + scope = wmem_file_scope(); + proto_list = &pinfo->fd->pfd; + } + + p1 = (proto_data_t *)wmem_alloc(scope, sizeof(proto_data_t)); + + p1->proto = proto; + p1->key = key; + p1->proto_data = proto_data; + + /* Add it to the GSLIST */ + *proto_list = g_slist_prepend(*proto_list, (gpointer *)p1); +} + +void * +p_get_proto_data(wmem_allocator_t *scope, struct _packet_info* pinfo, int proto, guint32 key) +{ + proto_data_t temp, *p1; + GSList *item; + + temp.proto = proto; + temp.key = key; + temp.proto_data = NULL; + + if (scope == pinfo->pool) { + item = g_slist_find_custom(pinfo->proto_data, (gpointer *)&temp, p_compare); + } else { + item = g_slist_find_custom(pinfo->fd->pfd, (gpointer *)&temp, p_compare); + } + + if (item) { + p1 = (proto_data_t *)item->data; + return p1->proto_data; + } + + return NULL; +} + +void +p_remove_proto_data(wmem_allocator_t *scope, struct _packet_info* pinfo, int proto, guint32 key) +{ + proto_data_t temp; + GSList *item; + GSList **proto_list; + + temp.proto = proto; + temp.key = key; + temp.proto_data = NULL; + + if (scope == pinfo->pool) { + item = g_slist_find_custom(pinfo->fd->pfd, (gpointer *)&temp, p_compare); + proto_list = &pinfo->proto_data; + } else { + item = g_slist_find_custom(pinfo->fd->pfd, (gpointer *)&temp, p_compare); + proto_list = &pinfo->fd->pfd; + } + + if (item) { + *proto_list = g_slist_remove(*proto_list, item->data); + } +} + +gchar * +p_get_proto_name_and_key(wmem_allocator_t *scope, struct _packet_info* pinfo, guint pfd_index){ + proto_data_t *temp; + + if (scope == pinfo->pool) { + temp = (proto_data_t *)g_slist_nth_data(pinfo->proto_data, pfd_index); + } else { + temp = (proto_data_t *)g_slist_nth_data(pinfo->fd->pfd, pfd_index); + } + + return wmem_strdup_printf(wmem_packet_scope(),"[%s, key %u]",proto_get_protocol_name(temp->proto), temp->key); +} + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 2 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=2 tabstop=8 expandtab: + * :indentSize=2:tabSize=8:noTabs=true: + */ diff --git a/epan/proto_data.h b/epan/proto_data.h new file mode 100644 index 0000000000..987eca7b9e --- /dev/null +++ b/epan/proto_data.h @@ -0,0 +1,54 @@ +/* proto_data.h + * Definitions for protocol-specific data + * + * Wireshark - Network traffic analyzer + * By Gerald Combs <gerald@wireshark.org> + * Copyright 1998 Gerald Combs + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifndef __PROTO_DATA_H__ +#define __PROTO_DATA_H__ + +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + +#include "ws_symbol_export.h" + +WS_DLL_PUBLIC void p_add_proto_data(wmem_allocator_t *scope, struct _packet_info* pinfo, int proto, guint32 key, void *proto_data); +WS_DLL_PUBLIC void *p_get_proto_data(wmem_allocator_t *scope, struct _packet_info* pinfo, int proto, guint32 key); +WS_DLL_PUBLIC void p_remove_proto_data(wmem_allocator_t *scope, struct _packet_info* pinfo, int proto, guint32 key); +gchar *p_get_proto_name_and_key(wmem_allocator_t *scope, struct _packet_info* pinfo, guint pfd_index); + +#ifdef __cplusplus +} +#endif /* __cplusplus */ + +#endif /* __PROTO_DATA__ */ + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 2 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=2 tabstop=8 expandtab: + * :indentSize=2:tabSize=8:noTabs=true: + */ diff --git a/epan/rtd_table.c b/epan/rtd_table.c index 2b17f80607..a93bb18815 100644 --- a/epan/rtd_table.c +++ b/epan/rtd_table.c @@ -25,8 +25,8 @@ #include <string.h> -#include "packet_info.h" #include "proto.h" +#include "packet_info.h" #include "rtd_table.h" struct register_rtd { diff --git a/epan/srt_table.c b/epan/srt_table.c index a01388d24b..af7278f85a 100644 --- a/epan/srt_table.c +++ b/epan/srt_table.c @@ -24,8 +24,8 @@ #include <string.h> -#include "packet_info.h" #include "proto.h" +#include "packet_info.h" #include "srt_table.h" struct register_srt { diff --git a/epan/tap.c b/epan/tap.c index 455a331e4e..16db81d619 100644 --- a/epan/tap.c +++ b/epan/tap.c @@ -33,9 +33,13 @@ #endif #include <string.h> + +#include <glib.h> + #include <epan/packet_info.h> #include <epan/dfilter/dfilter.h> #include <epan/tap.h> + #include <wsutil/ws_diag_control.h> static gboolean tapping_is_active=FALSE; diff --git a/plugins/profinet/packet-dcerpc-pn-io.c b/plugins/profinet/packet-dcerpc-pn-io.c index 2af7ca741c..6fa46b24df 100644 --- a/plugins/profinet/packet-dcerpc-pn-io.c +++ b/plugins/profinet/packet-dcerpc-pn-io.c @@ -51,6 +51,7 @@ #include <epan/to_str.h> #include <epan/expert.h> #include <epan/dissector_filters.h> +#include <epan/proto_data.h> #include <epan/dissectors/packet-dcerpc.h> #include "packet-pn.h" diff --git a/plugins/profinet/packet-dcom-cba-acco.c b/plugins/profinet/packet-dcom-cba-acco.c index 5f6a92fa70..6c49c03a01 100644 --- a/plugins/profinet/packet-dcom-cba-acco.c +++ b/plugins/profinet/packet-dcom-cba-acco.c @@ -28,6 +28,7 @@ #include <epan/expert.h> #include <epan/addr_resolv.h> #include <epan/dissector_filters.h> +#include <epan/proto_data.h> #include <epan/dissectors/packet-dcerpc.h> #include <epan/dissectors/packet-dcom.h> #include "packet-dcom-cba-acco.h" diff --git a/tools/ncp2222.py b/tools/ncp2222.py index d25fbd0887..0951c72506 100755 --- a/tools/ncp2222.py +++ b/tools/ncp2222.py @@ -5895,6 +5895,7 @@ def produce_code(): #include <epan/strutil.h> #include <epan/reassemble.h> #include <epan/tap.h> +#include <epan/proto_data.h> #include "packet-ncp-int.h" #include "packet-ncp-nmas.h" #include "packet-ncp-sss.h" diff --git a/ui/cli/tap-comparestat.c b/ui/cli/tap-comparestat.c index c76f4ece50..992666f443 100644 --- a/ui/cli/tap-comparestat.c +++ b/ui/cli/tap-comparestat.c @@ -37,13 +37,15 @@ #include <string.h> #include <math.h> -#include "epan/packet_info.h" +#include <glib.h> + +#include <epan/packet_info.h> #include <epan/in_cksum.h> #include <epan/packet.h> #include <epan/tap.h> #include <epan/stat_tap_ui.h> #include <epan/dissectors/packet-ip.h> -#include "epan/timestats.h" +#include <epan/timestats.h> /* For checksum */ diff --git a/ui/cli/tap-diameter-avp.c b/ui/cli/tap-diameter-avp.c index efa9d3e478..bb3602fc6e 100644 --- a/ui/cli/tap-diameter-avp.c +++ b/ui/cli/tap-diameter-avp.c @@ -40,13 +40,15 @@ #include <stdlib.h> #include <string.h> -#include "epan/packet_info.h" +#include <glib.h> + +#include <epan/packet_info.h> #include <epan/tap.h> #include <epan/epan_dissect.h> #include <epan/stat_tap_ui.h> -#include "epan/value_string.h" -#include "epan/to_str.h" -#include "epan/dissectors/packet-diameter.h" +#include <epan/value_string.h> +#include <epan/to_str.h> +#include <epan/dissectors/packet-diameter.h> void register_tap_listener_diameteravp(void); diff --git a/ui/cli/tap-gsm_astat.c b/ui/cli/tap-gsm_astat.c index 33905269ba..4454f12863 100644 --- a/ui/cli/tap-gsm_astat.c +++ b/ui/cli/tap-gsm_astat.c @@ -32,8 +32,10 @@ #include <stdlib.h> #include <string.h> -#include "epan/packet_info.h" -#include "epan/value_string.h" +#include <glib.h> + +#include <epan/packet_info.h> +#include <epan/value_string.h> #include <epan/tap.h> #include <epan/stat_tap_ui.h> #include <epan/dissectors/packet-bssap.h> diff --git a/ui/cli/tap-httpstat.c b/ui/cli/tap-httpstat.c index f986f6cd21..6b7334b223 100644 --- a/ui/cli/tap-httpstat.c +++ b/ui/cli/tap-httpstat.c @@ -26,8 +26,10 @@ #include <stdlib.h> #include <string.h> -#include "epan/packet_info.h" -#include "epan/value_string.h" +#include <glib.h> + +#include <epan/packet_info.h> +#include <epan/value_string.h> #include <epan/tap.h> #include <epan/stat_tap_ui.h> #include <epan/dissectors/packet-http.h> diff --git a/ui/cli/tap-icmpstat.c b/ui/cli/tap-icmpstat.c index 106e79b7ec..9102cf32fe 100644 --- a/ui/cli/tap-icmpstat.c +++ b/ui/cli/tap-icmpstat.c @@ -31,12 +31,14 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <math.h> + +#include <glib.h> -#include "epan/packet_info.h" +#include <epan/packet_info.h> #include <epan/tap.h> #include <epan/stat_tap_ui.h> #include <epan/dissectors/packet-icmp.h> -#include <math.h> void register_tap_listener_icmpstat(void); diff --git a/ui/cli/tap-icmpv6stat.c b/ui/cli/tap-icmpv6stat.c index 909405629d..6c2a59d0d7 100644 --- a/ui/cli/tap-icmpv6stat.c +++ b/ui/cli/tap-icmpv6stat.c @@ -32,12 +32,14 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <math.h> + +#include <glib.h> -#include "epan/packet_info.h" +#include <epan/packet_info.h> #include <epan/tap.h> #include <epan/stat_tap_ui.h> #include <epan/dissectors/packet-icmp.h> -#include <math.h> void register_tap_listener_icmpv6stat(void); diff --git a/ui/cli/tap-rpcprogs.c b/ui/cli/tap-rpcprogs.c index bfc4a196e4..798062087d 100644 --- a/ui/cli/tap-rpcprogs.c +++ b/ui/cli/tap-rpcprogs.c @@ -30,7 +30,9 @@ #include <stdlib.h> #include <string.h> -#include "epan/packet_info.h" +#include <glib.h> + +#include <epan/packet_info.h> #include <epan/tap.h> #include <epan/stat_tap_ui.h> #include <epan/dissectors/packet-rpc.h> diff --git a/ui/cli/tap-rtp.c b/ui/cli/tap-rtp.c index c7a87214f0..17fd2b740a 100644 --- a/ui/cli/tap-rtp.c +++ b/ui/cli/tap-rtp.c @@ -37,12 +37,15 @@ #include <string.h> #include <locale.h> -#include "epan/packet_info.h" -#include "epan/value_string.h" +#include <glib.h> + +#include <epan/packet_info.h> +#include <epan/value_string.h> #include <epan/tap.h> #include <epan/rtp_pt.h> #include <epan/stat_tap_ui.h> #include <epan/addr_resolv.h> + #include "ui/rtp_stream.h" #include "ui/tap-rtp-common.h" diff --git a/ui/cli/tap-rtspstat.c b/ui/cli/tap-rtspstat.c index 81f74e503c..20d15e4640 100644 --- a/ui/cli/tap-rtspstat.c +++ b/ui/cli/tap-rtspstat.c @@ -29,8 +29,10 @@ #include <stdlib.h> #include <string.h> -#include "epan/packet_info.h" -#include "epan/value_string.h" +#include <glib.h> + +#include <epan/packet_info.h> +#include <epan/value_string.h> #include <epan/tap.h> #include <epan/stat_tap_ui.h> #include <epan/dissectors/packet-rtsp.h> diff --git a/ui/cli/tap-sctpchunkstat.c b/ui/cli/tap-sctpchunkstat.c index 2fe6dc03ff..2d41d362ae 100644 --- a/ui/cli/tap-sctpchunkstat.c +++ b/ui/cli/tap-sctpchunkstat.c @@ -27,10 +27,12 @@ #include <stdlib.h> #include <string.h> -#include "epan/packet_info.h" +#include <glib.h> + +#include <epan/packet_info.h> #include <epan/tap.h> #include <epan/stat_tap_ui.h> -#include "epan/value_string.h" +#include <epan/value_string.h> #include <epan/dissectors/packet-sctp.h> #include <epan/to_str.h> diff --git a/ui/cli/tap-sipstat.c b/ui/cli/tap-sipstat.c index 3a1936ad4a..a7936102db 100644 --- a/ui/cli/tap-sipstat.c +++ b/ui/cli/tap-sipstat.c @@ -28,10 +28,12 @@ #include <stdlib.h> #include <string.h> -#include "epan/packet_info.h" +#include <glib.h> + +#include <epan/packet_info.h> #include <epan/tap.h> #include <epan/stat_tap_ui.h> -#include "epan/value_string.h" +#include <epan/value_string.h> #include <epan/dissectors/packet-sip.h> void register_tap_listener_sipstat(void); diff --git a/ui/cli/tap-smbsids.c b/ui/cli/tap-smbsids.c index 7508b648a3..0234281e28 100644 --- a/ui/cli/tap-smbsids.c +++ b/ui/cli/tap-smbsids.c @@ -26,11 +26,13 @@ #include <stdlib.h> #include <string.h> -#include "epan/packet_info.h" +#include <glib.h> + +#include <epan/packet_info.h> #include <epan/dissectors/packet-smb-sidsnooping.h> #include <epan/tap.h> #include <epan/stat_tap_ui.h> -#include "epan/value_string.h" +#include <epan/value_string.h> #include <epan/dissectors/packet-smb.h> void register_tap_listener_smbsids(void); diff --git a/ui/cli/tap-sv.c b/ui/cli/tap-sv.c index 1b41e0c1a8..c7a43ef294 100644 --- a/ui/cli/tap-sv.c +++ b/ui/cli/tap-sv.c @@ -25,8 +25,10 @@ #include <stdio.h> #include <stdlib.h> - #include <string.h> + +#include <glib.h> + #include <epan/packet_info.h> #include <epan/tap.h> #include <epan/stat_tap_ui.h> diff --git a/ui/cli/tap-wspstat.c b/ui/cli/tap-wspstat.c index 77bd455e90..b2a0ba46a8 100644 --- a/ui/cli/tap-wspstat.c +++ b/ui/cli/tap-wspstat.c @@ -31,10 +31,12 @@ #include <stdlib.h> #include <string.h> -#include "epan/packet_info.h" +#include <glib.h> + +#include <epan/packet_info.h> #include <epan/tap.h> #include <epan/stat_tap_ui.h> -#include "epan/value_string.h" +#include <epan/value_string.h> #include <epan/dissectors/packet-wsp.h> void register_tap_listener_wspstat(void); diff --git a/ui/export_object.c b/ui/export_object.c index 65c478ea9c..67e883f056 100644 --- a/ui/export_object.c +++ b/ui/export_object.c @@ -28,10 +28,13 @@ #include <errno.h> +#include <glib.h> + #include <epan/packet_info.h> -#include <wiretap/wtap.h> #include <epan/tap.h> +#include <wiretap/wtap.h> + #include <wsutil/file_util.h> #include <ui/alert_box.h> diff --git a/ui/gtk/expert_comp_table.c b/ui/gtk/expert_comp_table.c index 3766b5513f..1456c65caa 100644 --- a/ui/gtk/expert_comp_table.c +++ b/ui/gtk/expert_comp_table.c @@ -29,12 +29,13 @@ #include <stdlib.h> #include <math.h> +#include <glib.h> #include "epan/packet_info.h" #include "epan/strutil.h" - #include "ui/simple_dialog.h" + #include <wsutil/utf8_entities.h> #include "ui/gtk/expert_comp_table.h" diff --git a/ui/tap-rtp-common.c b/ui/tap-rtp-common.c index b523b198bd..e5ae415d99 100644 --- a/ui/tap-rtp-common.c +++ b/ui/tap-rtp-common.c @@ -37,6 +37,7 @@ #include <string.h> #include <epan/rtp_pt.h> #include <epan/addr_resolv.h> +#include <epan/proto_data.h> #include <epan/dissectors/packet-rtp.h> #include "rtp_stream.h" #include "tap-rtp-common.h" diff --git a/ui/tap-sctp-analysis.c b/ui/tap-sctp-analysis.c index 75375bdb03..be81646d27 100644 --- a/ui/tap-sctp-analysis.c +++ b/ui/tap-sctp-analysis.c @@ -21,12 +21,16 @@ */ #include "config.h" + #include <string.h> #include <math.h> +#include <glib.h> + #include "epan/packet_info.h" #include "epan/tap.h" #include "epan/value_string.h" + #include "ui/tap-sctp-analysis.h" #include "ui/simple_dialog.h" diff --git a/ui/tap-sequence-analysis.c b/ui/tap-sequence-analysis.c index 696ab3b14d..84f2a0f228 100644 --- a/ui/tap-sequence-analysis.c +++ b/ui/tap-sequence-analysis.c @@ -31,6 +31,7 @@ #include "epan/addr_resolv.h" #include "epan/packet.h" #include "epan/tap.h" +#include "epan/proto_data.h" #include "epan/dissectors/packet-tcp.h" #include "epan/dissectors/packet-icmp.h" diff --git a/ui/voip_calls.c b/ui/voip_calls.c index 49060fb20b..3fae9edc3c 100644 --- a/ui/voip_calls.c +++ b/ui/voip_calls.c @@ -38,6 +38,7 @@ #include "epan/epan_dissect.h" #include "epan/packet.h" +#include "epan/proto_data.h" #include "epan/dissectors/packet-sip.h" #include "epan/dissectors/packet-h225.h" #include "epan/dissectors/packet-h245.h" |