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

Don't include "file.h" if you don't need it. 

It ends up dragging in libwireshark headers, which programs not linking
with libwireshark shouldn't do.  In particular, including
<epan/address.h> causes some functions that refer to libwireshark
functions to be defined if the compiler doesn't handle "static inline"
the way GCC does, and you end up requiring libwireshark even though you
shouldn't require it.

Move plurality() to wsutil/str_util.h, so that non-libwireshark code can
get it without include epan/packet.h.  Fix includes as necessary.

Change-Id: Ie4819719da4c2b349f61445112aa419e99b977d3
Reviewed-on: https://code.wireshark.org/review/11545
Reviewed-by: Guy Harris <guy@alum.mit.edu>
This commit is contained in:
Guy Harris 2015-11-04 00:45:54 -08:00
parent 321934f2ff
commit ff9f9fc431
92 changed files with 160 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asn1/idmp/packet-idmp-template.c
View File

@ -32,6 +32,8 @@
#include <epan/ipproto.h>
#include <epan/strutil.h>
#include <wsutil/str_util.h>
#include "packet-tcp.h"
#include "packet-ber.h"

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

@ -65,6 +65,7 @@
#include <epan/prefs.h>
#include <wsutil/file_util.h>
#include <wsutil/ws_diag_control.h>
#include <wsutil/str_util.h>
#include "packet-kerberos.h"
#include "packet-netbios.h"
#include "packet-tcp.h"

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

@ -94,6 +94,7 @@
#include <epan/asn1.h>
#include <epan/expert.h>
#include <epan/uat.h>
#include <wsutil/str_util.h>
#include "packet-frame.h"
#include "packet-tcp.h"
#include "packet-windows-common.h"

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

@ -37,6 +37,8 @@
#include <epan/exceptions.h>
#include <epan/show_exception.h>
#include <wsutil/str_util.h>
#include "packet-per.h"
#include "packet-rrc.h"
#include "packet-gsm_a_common.h"

2
asn1/rtse/packet-rtse-template.c
View File

@ -30,6 +30,8 @@
#include <epan/asn1.h>
#include <epan/expert.h>
#include <wsutil/str_util.h>
#include "packet-ber.h"
#include "packet-pres.h"
#include "packet-acse.h"

2
capture_opts.c
View File

@ -29,6 +29,8 @@
#include <string.h>
#include <errno.h>
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif

1
dumpcap.c
View File

@ -160,6 +160,7 @@
#include "log.h"
#include "wsutil/file_util.h"
#include "wsutil/os_version_info.h"
#include "wsutil/str_util.h"
#include "caputils/ws80211_utils.h"

1
editcap.c
View File

@ -84,6 +84,7 @@
#include <wsutil/privileges.h>
#include <wsutil/report_err.h>
#include <wsutil/strnatcmp.h>
#include <wsutil/str_util.h>
#include <wsutil/ws_diag_control.h>
#include <wsutil/ws_version_info.h>

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

@ -37,6 +37,7 @@
#include <epan/tap.h>
#include <epan/expert.h>
#include <wsutil/md5.h>
#include <wsutil/str_util.h>
#include "color.h"
#include "color_filters.h"

3
epan/dissectors/file-gif.c
View File

@ -37,9 +37,10 @@
#include "config.h"
#include <epan/packet.h>
#include <wsutil/str_util.h>
void proto_register_gif(void);
void proto_reg_handoff_gif(void);

3
epan/dissectors/packet-ansi_a.c
View File

@ -39,7 +39,6 @@
#include "config.h"
#include <epan/packet.h>
#include <epan/exceptions.h>
#include <epan/prefs.h>
@ -49,6 +48,8 @@
#include <epan/expert.h>
#include <epan/to_str.h>
#include <wsutil/str_util.h>
#include "packet-rtp.h"
#include "packet-bssap.h"
#include "packet-ansi_a.h"

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

@ -44,6 +44,8 @@
#include <epan/to_str.h>
#include <epan/sctpppids.h>
#include <wsutil/str_util.h>
void proto_register_asap(void);
void proto_reg_handoff_asap(void);

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

@ -28,6 +28,8 @@
#include <epan/packet.h>
#include <epan/to_str.h>
#include <wsutil/str_util.h>
void proto_register_auto_rp(void);
void proto_reg_handoff_auto_rp(void);

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

@ -59,7 +59,6 @@
#include "config.h"
#include <epan/packet.h>
#include <epan/exceptions.h>
#include <epan/addr_and_mask.h>
@ -69,6 +68,7 @@
#include <epan/expert.h>
#include <epan/etypes.h>
#include <epan/to_str.h>
#include <wsutil/str_util.h>
#include "packet-ip.h"
#include "packet-ldp.h"
#include "packet-bgp.h"

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

@ -121,6 +121,7 @@
#include <epan/expert.h>
#include <epan/uat.h>
#include <epan/oui.h>
#include <wsutil/str_util.h>
void proto_register_bootp(void);
void proto_reg_handoff_bootp(void);

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

@ -34,6 +34,7 @@
#include <epan/packet.h>
#include <epan/expert.h>
#include <epan/prefs.h>
#include <wsutil/str_util.h>
#include "packet-bssap.h"
#include "packet-gsm_a_common.h"
#include "packet-e212.h"

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

@ -31,6 +31,8 @@
#include <epan/stats_tree.h>
#include <epan/to_str.h>
#include <wsutil/str_util.h>
#define STR_NONNULL(str) ((str) ? (str) : "(null)")
#define TYPE_HOST 0x0000

4
epan/dissectors/packet-cops.c
View File

@ -54,12 +54,14 @@
#include "config.h"
#include <epan/packet.h>
#include "packet-tcp.h"
#include <epan/oids.h>
#include <epan/expert.h>
#include <wsutil/str_util.h>
#include "packet-ber.h"
/* XXX - The "plain" COPS port (3288) can be overridden in the prefs.

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

@ -25,6 +25,7 @@
#include <epan/packet.h>
#include <epan/exceptions.h>
#include <wsutil/str_util.h>
#include "packet-http.h"
#define TCP_PORT_DAAP 3689

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

@ -29,6 +29,7 @@
#include <epan/prefs.h>
#include <epan/to_str.h>
#include <wsutil/md5.h>
#include <wsutil/str_util.h>
/* proto_data cannot be static because it's referenced in the
* print routines

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

@ -56,6 +56,7 @@
#include <epan/expert.h>
#include <epan/conversation.h>
#include <epan/tap.h>
#include <wsutil/str_util.h>
#include <wsutil/utf8_entities.h>
#include "packet-dccp.h"

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

@ -40,6 +40,7 @@
#include <epan/addr_resolv.h>
#include <epan/show_exception.h>
#include <epan/decode_as.h>
#include <wsutil/str_util.h>
#include "packet-tcp.h"
#include "packet-dcerpc.h"
#include "packet-dcerpc-nt.h"

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

@ -58,6 +58,7 @@
#include <epan/prefs.h>
#include <epan/to_str.h>
#include <epan/arptypes.h>
#include <wsutil/str_util.h>
#include "packet-tcp.h"
#include "packet-arp.h"

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

@ -47,6 +47,8 @@
#include <epan/strutil.h>
#include <epan/uat.h>
#include <wsutil/str_util.h>
#include "packet-p1.h"
#include "packet-p22.h"
#include "packet-s5066sis.h"

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

@ -40,6 +40,7 @@
#include <epan/to_str.h>
#include <epan/crc16-tvb.h>
#include <wsutil/crc16.h>
#include <wsutil/str_util.h>
/*
* See

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

@ -56,6 +56,7 @@
#include <epan/uat.h>
#include <epan/sctpppids.h>
#include <epan/exported_pdu.h>
#include <wsutil/str_util.h>
#include "packet-ssl-utils.h"
void proto_register_dtls(void);

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

@ -34,6 +34,7 @@
#include <epan/packet.h>
#include <epan/sctpppids.h>
#include <wsutil/str_util.h>
void proto_register_dua(void);
void proto_reg_handoff_dua(void);

4
epan/dissectors/packet-ecp-oui.c
View File

@ -27,9 +27,11 @@
#include <epan/packet.h>
#include <epan/addr_resolv.h>
#include <epan/oui.h>
#include <wsutil/str_util.h>
#include "packet-ieee802a.h"
#include "oui.h"
void proto_register_ecp_oui(void);
void proto_reg_handoff_ecp(void);

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

@ -43,6 +43,8 @@
#include <epan/to_str.h>
#include <epan/sctpppids.h>
#include <wsutil/str_util.h>
void proto_register_enrp(void);
void proto_reg_handoff_enrp(void);

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

@ -42,6 +42,7 @@
#include <epan/prefs.h>
#include <epan/expert.h>
#include <wsutil/str_util.h>
/* PROTOTYPES/FORWARDS */

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

@ -38,6 +38,7 @@
#include <epan/tap.h>
#include <epan/expert.h>
#include <wsutil/md5.h>
#include <wsutil/str_util.h>
#include "packet-frame.h"
#include "log.h"

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

@ -43,6 +43,8 @@
#include <epan/expert.h>
#include <epan/asn1.h>
#include <wsutil/str_util.h>
#include "packet-bssgp.h"
#include "packet-gsm_a_common.h"
#include "packet-e212.h"

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

@ -34,6 +34,7 @@
#include <epan/expert.h>
#include <epan/tap.h>
#include <epan/stat_tap_ui.h>
#include <wsutil/str_util.h>
#include "packet-gsm_a_common.h"
#include "packet-bssap.h"
#include "packet-gmr1_common.h"

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

@ -39,6 +39,8 @@
#include <epan/aftypes.h>
#include <epan/tap.h>
#include <wsutil/str_util.h>
#include "packet-iax2.h"
#include <epan/iax2_codec_type.h>

12
epan/dissectors/packet-idmp.c
View File

@ -40,6 +40,8 @@
#include <epan/ipproto.h>
#include <epan/strutil.h>
#include <wsutil/str_util.h>
#include "packet-tcp.h"
#include "packet-ber.h"
@ -171,7 +173,7 @@ static int hf_idmp_present = -1; /* INTEGER */
static int hf_idmp_absent = -1; /* NULL */
/*--- End of included file: packet-idmp-hf.c ---*/
#line 130 "../../asn1/idmp/packet-idmp-template.c"
#line 132 "../../asn1/idmp/packet-idmp-template.c"
/* Initialize the subtree pointers */
static gint ett_idmp = -1;
@ -190,7 +192,7 @@ static gint ett_idmp_Code = -1;
static gint ett_idmp_InvokeId = -1;
/*--- End of included file: packet-idmp-ett.c ---*/
#line 134 "../../asn1/idmp/packet-idmp-template.c"
#line 136 "../../asn1/idmp/packet-idmp-template.c"
/*--- Included file: packet-idmp-fn.c ---*/
@ -618,7 +620,7 @@ dissect_idmp_IDM_PDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U
/*--- End of included file: packet-idmp-fn.c ---*/
#line 136 "../../asn1/idmp/packet-idmp-template.c"
#line 138 "../../asn1/idmp/packet-idmp-template.c"
void
register_idmp_protocol_info(const char *oid, const ros_info_t *rinfo, int proto _U_, const char *name)
@ -934,7 +936,7 @@ void proto_register_idmp(void)
NULL, HFILL }},
/*--- End of included file: packet-idmp-hfarr.c ---*/
#line 319 "../../asn1/idmp/packet-idmp-template.c"
#line 321 "../../asn1/idmp/packet-idmp-template.c"
};
/* List of subtrees */
@ -957,7 +959,7 @@ void proto_register_idmp(void)
&ett_idmp_InvokeId,
/*--- End of included file: packet-idmp-ettarr.c ---*/
#line 327 "../../asn1/idmp/packet-idmp-template.c"
#line 329 "../../asn1/idmp/packet-idmp-template.c"
};
module_t *idmp_module;

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

@ -83,6 +83,7 @@
#include <epan/packet.h>
#include <epan/exceptions.h>
#include <wsutil/pint.h>
#include <wsutil/str_util.h>
#include <epan/addr_resolv.h>
#include <epan/address_types.h>
#include <epan/strutil.h>

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

@ -113,6 +113,7 @@
#include <epan/to_str.h>
#include <epan/ipproto.h>
#include <epan/in_cksum.h>
#include <wsutil/str_util.h>
#include "packet-igmp.h"
void proto_register_igmp(void);

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

@ -46,6 +46,7 @@
#include <epan/ax25_pids.h>
#include <epan/decode_as.h>
#include <wiretap/erf.h>
#include <wsutil/str_util.h>
#include "packet-ip.h"
#include "packet-juniper.h"

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

@ -28,6 +28,7 @@
#include "config.h"
#include <epan/packet.h>
#include <wsutil/str_util.h>
void proto_register_ipars(void);
static int proto_ipars = -1;

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

@ -44,6 +44,7 @@
#include <epan/in_cksum.h>
#include <epan/decode_as.h>
#include <wiretap/erf.h>
#include <wsutil/str_util.h>
#include "packet-ipv6.h"
#include "packet-ip.h"
#include "packet-juniper.h"

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

@ -51,6 +51,7 @@
#include <epan/expert.h>
#include <epan/to_str.h>
#include <epan/conversation.h>
#include <wsutil/str_util.h>
#include "packet-x509if.h"
#include "packet-x509af.h"
#include "packet-isakmp.h"

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

@ -35,6 +35,7 @@
#include <epan/prefs.h>
#include <epan/sctpppids.h>
#include <epan/lapd_sapi.h>
#include <wsutil/str_util.h>
void proto_register_iua(void);
void proto_reg_handoff_iua(void);

14
epan/dissectors/packet-kerberos.c
View File

@ -73,6 +73,7 @@
#include <epan/prefs.h>
#include <wsutil/file_util.h>
#include <wsutil/ws_diag_control.h>
#include <wsutil/str_util.h>
#include "packet-kerberos.h"
#include "packet-netbios.h"
#include "packet-tcp.h"
@ -349,7 +350,7 @@ static int hf_kerberos_KDCOptions_renew = -1;
static int hf_kerberos_KDCOptions_validate = -1;
/*--- End of included file: packet-kerberos-hf.c ---*/
#line 172 "../../asn1/kerberos/packet-kerberos-template.c"
#line 173 "../../asn1/kerberos/packet-kerberos-template.c"
/* Initialize the subtree pointers */
static gint ett_kerberos = -1;
@ -425,7 +426,7 @@ static gint ett_kerberos_KERB_PA_PAC_REQUEST = -1;
static gint ett_kerberos_ChangePasswdData = -1;
/*--- End of included file: packet-kerberos-ett.c ---*/
#line 186 "../../asn1/kerberos/packet-kerberos-template.c"
#line 187 "../../asn1/kerberos/packet-kerberos-template.c"
static expert_field ei_kerberos_decrypted_keytype = EI_INIT;
static expert_field ei_kerberos_address = EI_INIT;
@ -454,7 +455,7 @@ static gboolean gbl_do_col_info;
#define KERBEROS_ADDR_TYPE_IPV6 24
/*--- End of included file: packet-kerberos-val.h ---*/
#line 199 "../../asn1/kerberos/packet-kerberos-template.c"
#line 200 "../../asn1/kerberos/packet-kerberos-template.c"
static void
call_kerberos_callbacks(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int tag, kerberos_callbacks *cb)
@ -3847,6 +3848,7 @@ dissect_kerberos_T_encKrbPrivPart_user_data(gboolean implicit_tag _U_, tvbuff_t
call_kerberos_callbacks(actx->pinfo, tree, new_tvb, KRB_CBTAG_PRIV_USER_DATA, (kerberos_callbacks*)actx->private_data);
}
return offset;
}
@ -4340,7 +4342,7 @@ dissect_kerberos_ChangePasswdData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
/*--- End of included file: packet-kerberos-fn.c ---*/
#line 1985 "../../asn1/kerberos/packet-kerberos-template.c"
#line 1986 "../../asn1/kerberos/packet-kerberos-template.c"
/* Make wrappers around exported functions for now */
int
@ -5394,7 +5396,7 @@ void proto_register_kerberos(void) {
NULL, HFILL }},
/*--- End of included file: packet-kerberos-hfarr.c ---*/
#line 2366 "../../asn1/kerberos/packet-kerberos-template.c"
#line 2367 "../../asn1/kerberos/packet-kerberos-template.c"
};
/* List of subtrees */
@ -5472,7 +5474,7 @@ void proto_register_kerberos(void) {
&ett_kerberos_ChangePasswdData,
/*--- End of included file: packet-kerberos-ettarr.c ---*/
#line 2382 "../../asn1/kerberos/packet-kerberos-template.c"
#line 2383 "../../asn1/kerberos/packet-kerberos-template.c"
};
static ei_register_info ei[] = {

13
epan/dissectors/packet-ldap.c
View File

@ -102,6 +102,7 @@
#include <epan/asn1.h>
#include <epan/expert.h>
#include <epan/uat.h>
#include <wsutil/str_util.h>
#include "packet-frame.h"
#include "packet-tcp.h"
#include "packet-windows-common.h"
@ -344,7 +345,7 @@ static int hf_ldap_graceAuthNsRemaining = -1; /* INTEGER_0_maxInt */
static int hf_ldap_error = -1; /* T_error */
/*--- End of included file: packet-ldap-hf.c ---*/
#line 194 "../../asn1/ldap/packet-ldap-template.c"
#line 195 "../../asn1/ldap/packet-ldap-template.c"
/* Initialize the subtree pointers */
static gint ett_ldap = -1;
@ -416,7 +417,7 @@ static gint ett_ldap_PasswordPolicyResponseValue = -1;
static gint ett_ldap_T_warning = -1;
/*--- End of included file: packet-ldap-ett.c ---*/
#line 206 "../../asn1/ldap/packet-ldap-template.c"
#line 207 "../../asn1/ldap/packet-ldap-template.c"
static expert_field ei_ldap_exceeded_filter_length = EI_INIT;
static expert_field ei_ldap_too_many_filter_elements = EI_INIT;
@ -3836,7 +3837,7 @@ static int dissect_PasswordPolicyResponseValue_PDU(tvbuff_t *tvb _U_, packet_inf
/*--- End of included file: packet-ldap-fn.c ---*/
#line 921 "../../asn1/ldap/packet-ldap-template.c"
#line 922 "../../asn1/ldap/packet-ldap-template.c"
static int dissect_LDAPMessage_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, ldap_conv_info_t *ldap_info) {
int offset = 0;
@ -5699,7 +5700,7 @@ void proto_register_ldap(void) {
NULL, HFILL }},
/*--- End of included file: packet-ldap-hfarr.c ---*/
#line 2215 "../../asn1/ldap/packet-ldap-template.c"
#line 2216 "../../asn1/ldap/packet-ldap-template.c"
};
/* List of subtrees */
@ -5773,7 +5774,7 @@ void proto_register_ldap(void) {
&ett_ldap_T_warning,
/*--- End of included file: packet-ldap-ettarr.c ---*/
#line 2229 "../../asn1/ldap/packet-ldap-template.c"
#line 2230 "../../asn1/ldap/packet-ldap-template.c"
};
/* UAT for header fields */
static uat_field_t custom_attribute_types_uat_fields[] = {
@ -5940,7 +5941,7 @@ proto_reg_handoff_ldap(void)
/*--- End of included file: packet-ldap-dis-tab.c ---*/
#line 2379 "../../asn1/ldap/packet-ldap-template.c"
#line 2380 "../../asn1/ldap/packet-ldap-template.c"
}

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

@ -45,6 +45,8 @@
#include <epan/exceptions.h>
#include <epan/show_exception.h>
#include <wsutil/str_util.h>
#include "packet-per.h"
#include "packet-rrc.h"
#include "packet-gsm_a_common.h"
@ -199,7 +201,7 @@ typedef enum _SI_OrPSI_GERAN_enum {
} SI_OrPSI_GERAN_enum;
/*--- End of included file: packet-lte-rrc-val.h ---*/
#line 79 "../../asn1/lte-rrc/packet-lte-rrc-template.c"
#line 81 "../../asn1/lte-rrc/packet-lte-rrc-template.c"
/* Initialize the protocol and registered fields */
static int proto_lte_rrc = -1;
@ -3076,7 +3078,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 84 "../../asn1/lte-rrc/packet-lte-rrc-template.c"
#line 86 "../../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;
@ -4667,7 +4669,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 266 "../../asn1/lte-rrc/packet-lte-rrc-template.c"
#line 268 "../../asn1/lte-rrc/packet-lte-rrc-template.c"
static gint ett_lte_rrc_featureGroupIndicators = -1;
static gint ett_lte_rrc_featureGroupIndRel9Add = -1;
@ -45261,7 +45263,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 2668 "../../asn1/lte-rrc/packet-lte-rrc-template.c"
#line 2670 "../../asn1/lte-rrc/packet-lte-rrc-template.c"
static void
dissect_lte_rrc_DL_CCCH(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
@ -56906,7 +56908,7 @@ void proto_register_lte_rrc(void) {
"BIT_STRING_SIZE_19", HFILL }},
/*--- End of included file: packet-lte-rrc-hfarr.c ---*/
#line 2844 "../../asn1/lte-rrc/packet-lte-rrc-template.c"
#line 2846 "../../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",
@ -59026,7 +59028,7 @@ void proto_register_lte_rrc(void) {
&ett_lte_rrc_MasterInformationBlock_SL,
/*--- End of included file: packet-lte-rrc-ettarr.c ---*/
#line 3555 "../../asn1/lte-rrc/packet-lte-rrc-template.c"
#line 3557 "../../asn1/lte-rrc/packet-lte-rrc-template.c"
&ett_lte_rrc_featureGroupIndicators,
&ett_lte_rrc_featureGroupIndRel9Add,
@ -59105,7 +59107,7 @@ void proto_register_lte_rrc(void) {
/*--- End of included file: packet-lte-rrc-dis-reg.c ---*/
#line 3617 "../../asn1/lte-rrc/packet-lte-rrc-template.c"
#line 3619 "../../asn1/lte-rrc/packet-lte-rrc-template.c"
register_init_routine(&lte_rrc_init_protocol);
register_cleanup_routine(&lte_rrc_cleanup_protocol);

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

@ -31,6 +31,8 @@
#include <epan/packet.h>
#include <wsutil/str_util.h>
#define M2TP_PAYLOAD_PROTOCOL_ID 99 /* s-link, not IANA-registered */
void proto_register_m2tp(void);

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

@ -33,6 +33,8 @@
#include <epan/prefs.h>
#include <epan/sctpppids.h>
#include <wsutil/str_util.h>
void proto_register_m2ua(void);
void proto_reg_handoff_m2ua(void);

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

@ -35,6 +35,7 @@
#include <epan/packet.h>
#include <epan/prefs.h>
#include <epan/sctpppids.h>
#include <wsutil/str_util.h>
#include "packet-mtp3.h"
#include "packet-sccp.h"
#include "packet-frame.h"

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

@ -30,6 +30,8 @@
#include <epan/packet.h>
#include <wsutil/str_util.h>
void proto_register_media(void);
/* proto_media cannot be static because it's referenced in the

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

@ -58,6 +58,8 @@
#include <epan/ip_opts.h>
#include <epan/sminmpec.h>
#include <wsutil/str_util.h>
#include "packet-ntp.h"
#include "packet-gtpv2.h"
#include "packet-e164.h"

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

@ -40,6 +40,8 @@
#include <epan/packet.h>
#include <epan/expert.h>
#include <wsutil/str_util.h>
#include "packet-mtp3.h"
void proto_register_mtp3mg(void);

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

@ -32,6 +32,7 @@
#include <epan/packet.h>
#include <epan/expert.h>
#include <wsutil/str_util.h>
#include "packet-rpc.h"
#include "packet-ndmp.h"
#include "packet-tcp.h"

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

@ -133,6 +133,7 @@
#include <epan/to_str.h>
#include <epan/expert.h>
#include <epan/addr_resolv.h>
#include <wsutil/str_util.h>
#include "packet-tcp.h"
#include "packet-udp.h"
#include "packet-ntp.h"

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

@ -36,6 +36,7 @@
#include <epan/decode_as.h>
#include <wsutil/crc16.h>
#include <wsutil/crc32.h>
#include <wsutil/str_util.h>
#include "packet-nfs.h"
void proto_register_nfs(void);

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

@ -42,6 +42,7 @@
#include <wsutil/md5.h>
#include <wsutil/des.h>
#include <wsutil/crc32.h>
#include <wsutil/str_util.h>
#include "packet-windows-common.h"
#include "packet-smb-common.h"

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

@ -32,6 +32,7 @@
#include <epan/conversation.h>
#include <epan/ipproto.h>
#include <epan/expert.h>
#include <wsutil/str_util.h>
#include "packet-frame.h"
#include "packet-osi.h"

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

@ -33,6 +33,8 @@
#include <epan/addr_resolv.h>
#include <epan/expert.h>
#include <wsutil/str_util.h>
/* General declarations */
void proto_register_ossp(void);
void proto_reg_handoff_ossp(void);

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

@ -43,6 +43,8 @@
#include <epan/asn1.h>
#include <epan/in_cksum.h>
#include <wsutil/str_util.h>
#include "packet-cdt.h"
#include "packet-ber.h"
#include "packet-s5066sis.h"

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

@ -36,6 +36,7 @@ proper helper routines
#include <epan/to_str.h>
#include <epan/asn1.h>
#include <epan/expert.h>
#include <wsutil/str_util.h>
#include "packet-per.h"
void proto_register_per(void);

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

@ -33,6 +33,7 @@
#include <epan/conversation.h>
#include <epan/prefs.h>
#include <epan/reassemble.h>
#include <wsutil/str_util.h>
#include "packet-ssl.h"
#include "packet-ssl-utils.h"

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

@ -53,6 +53,7 @@
#include <epan/reassemble.h>
#include <wsutil/frequency-utils.h>
#include <wsutil/pint.h>
#include <wsutil/str_util.h>
/* Needed for wtap_pcap_encap_to_wtap_encap(). */
#include <wiretap/pcap-encap.h>

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

@ -27,6 +27,7 @@
#include <epan/packet.h>
#include <wsutil/pint.h>
#include <wsutil/str_util.h>
#include <epan/prefs.h>
#include "packet-ppp.h"
#include <epan/ppptypes.h>

2
epan/dissectors/packet-pw-atm.c
View File

@ -40,6 +40,8 @@
#include <epan/expert.h>
#include <epan/prefs.h>
#include <wsutil/str_util.h>
#include <wiretap/wtap.h> /*for atm pseudo header*/
#include "packet-mpls.h"
#include "packet-atm.h"

1
epan/dissectors/packet-pw-common.c
View File

@ -24,6 +24,7 @@
#include "config.h"
#include <epan/packet.h>
#include <wsutil/str_util.h>
#include "packet-pw-common.h"
void proto_register_pw_padding(void);

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

@ -28,6 +28,7 @@
#include <epan/nlpid.h>
#include <epan/etypes.h>
#include <epan/expert.h>
#include <wsutil/str_util.h>
#include "packet-q931.h"
#include "packet-arp.h"

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

@ -30,6 +30,7 @@
#include <epan/expert.h>
#include <epan/exceptions.h>
#include <wsutil/pint.h>
#include <wsutil/str_util.h>
#include <epan/prefs.h>
#include <epan/reassemble.h>
#include <epan/tap.h>

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

@ -31,6 +31,7 @@
#include <epan/to_str.h>
#include <epan/expert.h>
#include <wiretap/wtap.h>
#include <wsutil/str_util.h>
#include "packet-frame.h"
#include "packet-tcp.h"

12
epan/dissectors/packet-rtse.c
View File

@ -38,6 +38,8 @@
#include <epan/asn1.h>
#include <epan/expert.h>
#include <wsutil/str_util.h>
#include "packet-ber.h"
#include "packet-pres.h"
#include "packet-acse.h"
@ -91,7 +93,7 @@ static int hf_rtse_t61String = -1; /* T_t61String */
static int hf_rtse_octetString = -1; /* T_octetString */
/*--- End of included file: packet-rtse-hf.c ---*/
#line 58 "../../asn1/rtse/packet-rtse-template.c"
#line 60 "../../asn1/rtse/packet-rtse-template.c"
/* Initialize the subtree pointers */
static gint ett_rtse = -1;
@ -108,7 +110,7 @@ static gint ett_rtse_SessionConnectionIdentifier = -1;
static gint ett_rtse_CallingSSuserReference = -1;
/*--- End of included file: packet-rtse-ett.c ---*/
#line 62 "../../asn1/rtse/packet-rtse-template.c"
#line 64 "../../asn1/rtse/packet-rtse-template.c"
static expert_field ei_rtse_dissector_oid_not_implemented = EI_INIT;
static expert_field ei_rtse_unknown_rtse_pdu = EI_INIT;
@ -735,7 +737,7 @@ dissect_rtse_RTSE_apdus(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
/*--- End of included file: packet-rtse-fn.c ---*/
#line 192 "../../asn1/rtse/packet-rtse-template.c"
#line 194 "../../asn1/rtse/packet-rtse-template.c"
/*
* Dissect RTSE PDUs inside a PPDU.
@ -1007,7 +1009,7 @@ void proto_register_rtse(void) {
NULL, HFILL }},
/*--- End of included file: packet-rtse-hfarr.c ---*/
#line 363 "../../asn1/rtse/packet-rtse-template.c"
#line 365 "../../asn1/rtse/packet-rtse-template.c"
};
/* List of subtrees */
@ -1029,7 +1031,7 @@ void proto_register_rtse(void) {
&ett_rtse_CallingSSuserReference,
/*--- End of included file: packet-rtse-ettarr.c ---*/
#line 372 "../../asn1/rtse/packet-rtse-template.c"
#line 374 "../../asn1/rtse/packet-rtse-template.c"
};
static ei_register_info ei[] = {

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

@ -46,6 +46,7 @@
#include <epan/tap.h>
#include <epan/to_str.h>
#include <wiretap/wtap.h>
#include <wsutil/str_util.h>
#include "packet-mtp3.h"
#include "packet-tcap.h"
#include "packet-sccp.h"

1
epan/dissectors/packet-scsi-ssc.c
View File

@ -33,6 +33,7 @@
#include <epan/packet.h>
#include <epan/conversation.h>
#include <wsutil/str_util.h>
#include "packet-scsi.h"
#include "packet-scsi-ssc.h"
#include "packet-scsi-smc.h"

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

@ -67,6 +67,7 @@
#include <wsutil/crc32.h>
#include <wsutil/adler32.h>
#include <wsutil/utf8_entities.h>
#include <wsutil/str_util.h>
#include "packet-sctp.h"

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

@ -31,6 +31,8 @@
#include <epan/conversation.h>
#include <epan/reassemble.h>
#include <wsutil/str_util.h>
#include "packet-ber.h"
#include "packet-ses.h"

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

@ -35,6 +35,8 @@ Short description of the SML protocol on the SML Wireshark Wiki page: https://w
#include <epan/crc16-tvb.h>
#include <epan/expert.h>
#include <wsutil/str_util.h>
#define TCP_PORT_SML 0
#define UDP_PORT_SML 0

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

@ -35,6 +35,7 @@
#include <epan/strutil.h>
#include <epan/reassemble.h>
#include <wsutil/base64.h>
#include <wsutil/str_util.h>
#include "packet-ssl.h"
#include "packet-ssl-utils.h"

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

@ -89,6 +89,7 @@
#include <epan/tap.h>
#include <epan/uat.h>
#include <epan/exported_pdu.h>
#include <wsutil/str_util.h>
#include "packet-tcp.h"
#include "packet-x509af.h"
#include "packet-ocsp.h"

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

@ -35,6 +35,8 @@
#include <epan/tap.h>
#include <epan/to_str.h>
#include <wsutil/str_util.h>
#include "packet-mtp3.h"
#include "packet-sccp.h"
void proto_register_sua(void);

3
epan/dissectors/packet-tcp.c
View File

@ -37,8 +37,9 @@
#include <epan/reassemble.h>
#include <epan/decode_as.h>
#include <epan/in_cksum.h>
#include <wsutil/utf8_entities.h>
#include <wsutil/utf8_entities.h>
#include <wsutil/str_util.h>
#include <wsutil/sha1.h>
#include "packet-tcp.h"

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

@ -29,6 +29,7 @@
#include <epan/packet.h>
#include <wiretap/wtap.h>
#include <wsutil/str_util.h>
#define SOH (0x01)
#define STX (0x02)

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

@ -44,6 +44,8 @@
#include <epan/packet.h>
#include <epan/sctpppids.h> /* include V5UA payload protocol ID */
#include <wsutil/str_util.h>
void proto_register_v5ua(void);
void proto_reg_handoff_v5ua(void);

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

@ -47,6 +47,8 @@
#include <epan/expert.h>
#include <epan/conversation.h>
#include <wsutil/str_util.h>
#include "packet-wap.h"
#include "packet-wsp.h"

2
epan/packet.c
View File

@ -50,6 +50,8 @@
#include <epan/range.h>
#include <epan/asm_utils.h>
#include <wsutil/str_util.h>
static gint proto_malformed = -1;
static dissector_handle_t frame_handle = NULL;
static dissector_handle_t file_handle = NULL;

3
epan/packet.h
View File

@ -56,9 +56,6 @@ struct epan_range;
((guint)(offset) + (guint)(len) > (guint)(offset) && \
(guint)(offset) + (guint)(len) <= (guint)(captured_len))
/* To pass one of two strings, singular or plural */
#define plurality(d,s,p) ((d) == 1 ? (s) : (p))
typedef struct _packet_counts {
gint sctp;
gint tcp;

2
epan/reassemble.c
View File

@ -29,6 +29,8 @@
#include <epan/reassemble.h>
#include <epan/tvbuff-int.h>
#include <wsutil/str_util.h>
/*
* Functions for reassembly tables where the endpoint addresses, and a
* fragment ID, are used as the key.

1
ringbuffer.h
View File

@ -24,7 +24,6 @@
#define __RINGBUFFER_H__
#include <stdio.h>
#include "file.h"
#include "wiretap/wtap.h"
#define RINGBUFFER_UNLIMITED_FILES 0

3
tshark.c
View File

@ -86,7 +86,6 @@
#ifdef HAVE_LUA
#include <epan/wslua/init_wslua.h>
#endif
#include "file.h"
#include "frame_tvbuff.h"
#include <epan/disabled_protos.h>
#include <epan/prefs.h>
@ -130,6 +129,8 @@
#include "log.h"
#include <epan/funnel.h>
#include <wsutil/str_util.h>
#ifdef HAVE_PLUGINS
#include <wsutil/plugins.h>
#endif

1
ui/capture.c
View File

@ -54,6 +54,7 @@
#include "ui/ui_util.h"
#include "wsutil/file_util.h"
#include "wsutil/str_util.h"
#include "log.h"
typedef struct if_stat_cache_item_s {

1
ui/gtk/expert_comp_dlg.c
View File

@ -31,6 +31,7 @@
#include <epan/tap.h>
#include <epan/stat_tap_ui.h>
#include <wsutil/str_util.h>
#include "ui/simple_dialog.h"

1
ui/gtk/export_sslkeys.c
View File

@ -35,6 +35,7 @@
#endif
#include <wsutil/file_util.h>
#include <wsutil/str_util.h>
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>

2
ui/gtk/fileset_dlg.c
View File

@ -30,8 +30,8 @@
#include <gtk/gtk.h>
#include "file.h"
#include <wsutil/filesystem.h>
#include <wsutil/str_util.h>
#include "../fileset.h"

1
ui/gtk/packet_panes.c
View File

@ -56,6 +56,7 @@
#include "ui/ui_util.h"
#include <wsutil/file_util.h>
#include <wsutil/str_util.h>
#include "ui/gtk/keys.h"
#include "ui/gtk/color_utils.h"

3
ui/gtk/voip_calls_dlg.c
View File

@ -35,13 +35,14 @@
#include <string.h>
#include <epan/packet.h>
#include <epan/stat_tap_ui.h>
#include <epan/addr_resolv.h>
#include <epan/dissectors/packet-h225.h>
#include <epan/dissectors/packet-h248.h>
#include <wsutil/str_util.h>
#include "../globals.h"
#include "ui/voip_calls.h"

3
wsutil/str_util.h
View File

@ -113,6 +113,9 @@ gchar *format_size(gint64 size, format_size_flags_e flags);
WS_DLL_PUBLIC
gchar printable_char_or_period(gchar c);
/* To pass one of two strings, singular or plural */
#define plurality(d,s,p) ((d) == 1 ? (s) : (p))
#ifdef __cplusplus
}