osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Guy Harris 2016-01-24 17:10:20 -08:00
parent 6beb19af8e
commit 099698445b
149 changed files with 494 additions and 206 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
asn1/gsm_map/packet-gsm_map-template.c
View File

@ -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"

1
asn1/lte-rrc/packet-lte-rrc-template.c
View File

@ -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>

1
asn1/ranap/packet-ranap-template.c
View File

@ -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"

1
asn1/rrc/packet-rrc-template.c
View File

@ -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"

1
asn1/spnego/packet-spnego-template.c
View File

@ -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"

1
asn1/t38/packet-t38-template.c
View File

@ -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"

4
doc/README.dissector
View File

@ -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",

1
epan/CMakeLists.txt
View File

@ -1643,6 +1643,7 @@ set(LIBWIRESHARK_FILES
print_stream.c
prefs.c
proto.c
proto_data.c
ps.c
range.c
reassemble.c

2
epan/Makefile.common
View File

@ -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 \

2
epan/conversation_table.c
View File

@ -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"

2
epan/dissectors/file-file.c
View File

@ -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>

1
epan/dissectors/packet-6lowpan.c
View File

@ -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"

1
epan/dissectors/packet-ajp13.c
View File

@ -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);

1
epan/dissectors/packet-amqp.c
View File

@ -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"

1
epan/dissectors/packet-arp.c
View File

@ -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);

1
epan/dissectors/packet-beep.c
View File

@ -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

1
epan/dissectors/packet-bluetooth.c
View File

@ -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"

1
epan/dissectors/packet-brdwlk.c
View File

@ -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

1
epan/dissectors/packet-btatt.c
View File

@ -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"

1
epan/dissectors/packet-btavctp.c
View File

@ -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"

1
epan/dissectors/packet-bthci_acl.c
View File

@ -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"

2
epan/dissectors/packet-bthci_cmd.c
View File

@ -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"

2
epan/dissectors/packet-bthci_evt.c
View File

@ -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"

2
epan/dissectors/packet-btl2cap.c
View File

@ -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"

2
epan/dissectors/packet-btle.c
View File

@ -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"

1
epan/dissectors/packet-btobex.c
View File

@ -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"

1
epan/dissectors/packet-btrfcomm.c
View File

@ -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"

1
epan/dissectors/packet-catapult-dct2000.c
View File

@ -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"

1
epan/dissectors/packet-ceph.c
View File

@ -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);

1
epan/dissectors/packet-cip.c
View File

@ -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"

2
epan/dissectors/packet-cipsafety.c
View File

@ -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"

1
epan/dissectors/packet-cp2179.c
View File

@ -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);

2
epan/dissectors/packet-dcerpc.c
View File

@ -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"

1
epan/dissectors/packet-dmp.c
View File

@ -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>

1
epan/dissectors/packet-eap.c
View File

@ -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"

1
epan/dissectors/packet-enip.c
View File

@ -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"

1
epan/dissectors/packet-epl.c
View File

@ -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);

1
epan/dissectors/packet-ethertype.c
View File

@ -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);

1
epan/dissectors/packet-fcp.c
View File

@ -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"

1
epan/dissectors/packet-fp_hint.c
View File

@ -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"

2
epan/dissectors/packet-gfp.c
View File

@ -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 */

17
epan/dissectors/packet-gsm_map.c
View File

@ -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" );

1
epan/dissectors/packet-gssapi.c
View File

@ -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"

2
epan/dissectors/packet-http.c
View File

@ -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"

1
epan/dissectors/packet-http2.c
View File

@ -40,6 +40,7 @@
#include <epan/packet.h>
#include <epan/prefs.h>
#include <epan/proto_data.h>
#include <epan/nghttp2/nghttp2.h>

1
epan/dissectors/packet-iax2.c
View File

@ -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>

1
epan/dissectors/packet-icmp.c
View File

@ -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"

1
epan/dissectors/packet-icmpv6.c
View File

@ -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"

1
epan/dissectors/packet-ieee80211.c
View File

@ -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"

2
epan/dissectors/packet-ieee802154.c
View File

@ -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. */

2
epan/dissectors/packet-ip.c
View File

@ -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>

1
epan/dissectors/packet-ipsec.c
View File

@ -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

2
epan/dissectors/packet-ipv6.c
View File

@ -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"

2
epan/dissectors/packet-ipx.c
View File

@ -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);

2
epan/dissectors/packet-iso14443.c
View File

@ -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>

2
epan/dissectors/packet-ixveriwave.c
View File

@ -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);

2
epan/dissectors/packet-k12.c
View File

@ -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>

1
epan/dissectors/packet-kafka.c
View File

@ -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);

2
epan/dissectors/packet-l2tp.c
View File

@ -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>

1
epan/dissectors/packet-lapd.c
View File

@ -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);

15
epan/dissectors/packet-lte-rrc.c
View File

@ -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(&lte_rrc_init_protocol);
register_cleanup_routine(&lte_rrc_cleanup_protocol);

1
epan/dissectors/packet-mac-lte-framed.c
View File

@ -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);

1
epan/dissectors/packet-mac-lte.c
View File

@ -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"

1
epan/dissectors/packet-mbtcp.c
View File

@ -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);

1
epan/dissectors/packet-meta.c
View File

@ -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"

1
epan/dissectors/packet-mikey.c
View File

@ -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);

1
epan/dissectors/packet-mp2t.c
View File

@ -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() */

1
epan/dissectors/packet-mpls.c
View File

@ -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"

2
epan/dissectors/packet-msrp.c
View File

@ -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"

1
epan/dissectors/packet-mswsp.c
View File

@ -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"

1
epan/dissectors/packet-mysql.c
View File

@ -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"

1
epan/dissectors/packet-ndps.c
View File

@ -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"

2
epan/dissectors/packet-ntlmssp.c
View File

@ -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>

2
epan/dissectors/packet-ositp.c
View File

@ -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"

1
epan/dissectors/packet-p_mul.c
View File

@ -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>

2
epan/dissectors/packet-pdcp-lte.c
View File

@ -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.

2
epan/dissectors/packet-pop.c
View File

@ -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"

15
epan/dissectors/packet-ranap.c
View File

@ -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);
}

1
epan/dissectors/packet-rdt.c
View File

@ -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;

1
epan/dissectors/packet-rlc-lte.c
View File

@ -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"

2
epan/dissectors/packet-rlc.c
View File

@ -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>
/*

1
epan/dissectors/packet-rmt-fec.c
View File

@ -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);

1
epan/dissectors/packet-rmt-norm.c
View File

@ -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);

1
epan/dissectors/packet-rohc.c
View File

@ -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);

15
epan/dissectors/packet-rrc.c
View File

@ -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"

1
epan/dissectors/packet-rsync.c
View File

@ -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);

1
epan/dissectors/packet-rtcp.c
View File

@ -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);

1
epan/dissectors/packet-rtp-events.c
View File

@ -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"

1
epan/dissectors/packet-rtp.c
View File

@ -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"

2
epan/dissectors/packet-sctp.c
View File

@ -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>

1
epan/dissectors/packet-selfm.c
View File

@ -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);

1
epan/dissectors/packet-ses.c
View File

@ -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>

1
epan/dissectors/packet-sip.c
View File

@ -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>

1
epan/dissectors/packet-smb-direct.c
View File

@ -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"

2
epan/dissectors/packet-smtp.c
View File

@ -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"

1
epan/dissectors/packet-socks.c
View File

@ -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"

1
epan/dissectors/packet-soupbintcp.c
View File

@ -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"

1
epan/dissectors/packet-spice.c
View File

@ -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

11
epan/dissectors/packet-spnego.c
View File

@ -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[] = {

2
epan/dissectors/packet-sscop.c
View File

@ -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"

Some files were not shown because too many files have changed in this diff Show More