forked from osmocom/wireshark
When including <epan/prefs.h> don't force inclusion of <epan/uat.h>
svn path=/trunk/; revision=53769
This commit is contained in:
parent
dbd9c134fa
commit
65db82872c
|
@ -43,6 +43,7 @@
|
|||
#include <epan/asn1.h>
|
||||
#include <epan/expert.h>
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "packet-ber.h"
|
||||
|
|
|
@ -54,6 +54,7 @@
|
|||
#include <epan/oids.h>
|
||||
#include <epan/expert.h>
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
#include <epan/asn1.h>
|
||||
|
|
|
@ -31,6 +31,7 @@
|
|||
#endif
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
#include <glib.h>
|
||||
|
|
|
@ -25,6 +25,7 @@
|
|||
#include "config.h"
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#ifdef HAVE_LIBPCAP
|
||||
|
||||
|
|
|
@ -28,6 +28,7 @@
|
|||
|
||||
#include <glib.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <ctype.h>
|
||||
#include <string.h>
|
||||
|
||||
|
|
|
@ -30,6 +30,7 @@
|
|||
#include <glib.h>
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <ctype.h>
|
||||
#include <string.h>
|
||||
|
||||
|
|
|
@ -24,6 +24,8 @@
|
|||
|
||||
#include "config.h"
|
||||
|
||||
#include <stdlib.h>
|
||||
|
||||
#include <glib.h>
|
||||
|
||||
#include "decode_as.h"
|
||||
|
|
|
@ -28,6 +28,8 @@
|
|||
|
||||
#include "config.h"
|
||||
|
||||
#include <stdlib.h>
|
||||
|
||||
#include <epan/packet.h>
|
||||
#include <epan/conversation.h>
|
||||
#include <epan/prefs.h>
|
||||
|
|
|
@ -51,6 +51,7 @@
|
|||
#include <epan/asn1.h>
|
||||
#include <epan/expert.h>
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "packet-ber.h"
|
||||
|
@ -602,7 +603,7 @@ static int hf_camel_present = -1; /* INTEGER */
|
|||
static int hf_camel_InvokeId_present = -1; /* InvokeId_present */
|
||||
|
||||
/*--- End of included file: packet-camel-hf.c ---*/
|
||||
#line 109 "../../asn1/camel/packet-camel-template.c"
|
||||
#line 110 "../../asn1/camel/packet-camel-template.c"
|
||||
|
||||
static struct camelsrt_info_t * gp_camelsrt_info;
|
||||
|
||||
|
@ -829,7 +830,7 @@ static gint ett_camel_T_problem = -1;
|
|||
static gint ett_camel_InvokeId = -1;
|
||||
|
||||
/*--- End of included file: packet-camel-ett.c ---*/
|
||||
#line 137 "../../asn1/camel/packet-camel-template.c"
|
||||
#line 138 "../../asn1/camel/packet-camel-template.c"
|
||||
|
||||
static expert_field ei_camel_unknown_invokeData = EI_INIT;
|
||||
static expert_field ei_camel_unknown_returnResultData = EI_INIT;
|
||||
|
@ -1157,7 +1158,7 @@ static const value_string camel_ectTreatmentIndicator_values[] = {
|
|||
#define noInvokeId NULL
|
||||
|
||||
/*--- End of included file: packet-camel-val.h ---*/
|
||||
#line 280 "../../asn1/camel/packet-camel-template.c"
|
||||
#line 281 "../../asn1/camel/packet-camel-template.c"
|
||||
|
||||
|
||||
/*--- Included file: packet-camel-table.c ---*/
|
||||
|
@ -1247,7 +1248,7 @@ static const value_string camel_err_code_string_vals[] = {
|
|||
|
||||
|
||||
/*--- End of included file: packet-camel-table.c ---*/
|
||||
#line 282 "../../asn1/camel/packet-camel-template.c"
|
||||
#line 283 "../../asn1/camel/packet-camel-template.c"
|
||||
|
||||
static char camel_number_to_char(int number)
|
||||
{
|
||||
|
@ -7010,7 +7011,7 @@ static void dissect_CAP_U_ABORT_REASON_PDU(tvbuff_t *tvb _U_, packet_info *pinfo
|
|||
|
||||
|
||||
/*--- End of included file: packet-camel-fn.c ---*/
|
||||
#line 329 "../../asn1/camel/packet-camel-template.c"
|
||||
#line 330 "../../asn1/camel/packet-camel-template.c"
|
||||
|
||||
|
||||
/*--- Included file: packet-camel-table2.c ---*/
|
||||
|
@ -7217,7 +7218,7 @@ static int dissect_returnErrorData(proto_tree *tree, tvbuff_t *tvb, int offset,a
|
|||
|
||||
|
||||
/*--- End of included file: packet-camel-table2.c ---*/
|
||||
#line 331 "../../asn1/camel/packet-camel-template.c"
|
||||
#line 332 "../../asn1/camel/packet-camel-template.c"
|
||||
|
||||
|
||||
static guint8 camel_pdu_type = 0;
|
||||
|
@ -7416,7 +7417,7 @@ void proto_reg_handoff_camel(void) {
|
|||
|
||||
|
||||
/*--- End of included file: packet-camel-dis-tab.c ---*/
|
||||
#line 522 "../../asn1/camel/packet-camel-template.c"
|
||||
#line 523 "../../asn1/camel/packet-camel-template.c"
|
||||
} else {
|
||||
range_foreach(ssn_range, range_delete_callback);
|
||||
g_free(ssn_range);
|
||||
|
@ -9530,7 +9531,7 @@ void proto_register_camel(void) {
|
|||
"InvokeId_present", HFILL }},
|
||||
|
||||
/*--- End of included file: packet-camel-hfarr.c ---*/
|
||||
#line 695 "../../asn1/camel/packet-camel-template.c"
|
||||
#line 696 "../../asn1/camel/packet-camel-template.c"
|
||||
};
|
||||
|
||||
/* List of subtrees */
|
||||
|
@ -9745,7 +9746,7 @@ void proto_register_camel(void) {
|
|||
&ett_camel_InvokeId,
|
||||
|
||||
/*--- End of included file: packet-camel-ettarr.c ---*/
|
||||
#line 711 "../../asn1/camel/packet-camel-template.c"
|
||||
#line 712 "../../asn1/camel/packet-camel-template.c"
|
||||
};
|
||||
|
||||
static ei_register_info ei[] = {
|
||||
|
|
|
@ -27,6 +27,7 @@
|
|||
#include <glib.h>
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <ctype.h>
|
||||
|
||||
#include <epan/packet.h>
|
||||
|
|
|
@ -62,6 +62,7 @@
|
|||
#include <epan/oids.h>
|
||||
#include <epan/expert.h>
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
#include <epan/asn1.h>
|
||||
|
|
|
@ -34,6 +34,8 @@
|
|||
|
||||
#include "config.h"
|
||||
|
||||
#include <stdlib.h>
|
||||
|
||||
#include <glib.h>
|
||||
#include <time.h>
|
||||
|
||||
|
|
|
@ -33,6 +33,7 @@
|
|||
#include "config.h"
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#include <glib.h>
|
||||
|
||||
|
|
|
@ -30,6 +30,7 @@
|
|||
|
||||
#include "config.h"
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <ctype.h>
|
||||
#include <glib.h>
|
||||
|
||||
|
|
|
@ -32,6 +32,7 @@
|
|||
#include "config.h"
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <ctype.h>
|
||||
|
||||
#include <glib.h>
|
||||
|
|
|
@ -56,6 +56,8 @@
|
|||
|
||||
#include "config.h"
|
||||
|
||||
#include <stdlib.h>
|
||||
|
||||
#include <epan/conversation.h>
|
||||
#include <epan/packet.h>
|
||||
#include <epan/prefs.h>
|
||||
|
|
|
@ -121,7 +121,7 @@ struct preference {
|
|||
gint *enump;
|
||||
const char **string;
|
||||
range_t **range;
|
||||
uat_t* uat;
|
||||
struct epan_uat* uat;
|
||||
color_t *colorp;
|
||||
GList** list;
|
||||
} varp; /**< pointer to variable storing the value */
|
||||
|
|
|
@ -36,7 +36,6 @@ extern "C" {
|
|||
#include <epan/addr_resolv.h>
|
||||
#include <epan/params.h>
|
||||
#include <epan/range.h>
|
||||
#include <epan/uat.h>
|
||||
|
||||
#include "ws_symbol_export.h"
|
||||
|
||||
|
@ -55,6 +54,8 @@ extern "C" {
|
|||
#define ST_MAX_BURSTRES 600000 /* somewhat arbirary limit of 10 minutes */
|
||||
#define ST_MAX_BURSTBUCKETS 100 /* somewhat arbirary limit - more buckets degrade performance */
|
||||
|
||||
struct epan_uat;
|
||||
|
||||
/*
|
||||
* Convert a string listing name resolution types to a bitmask of
|
||||
* those types.
|
||||
|
@ -455,7 +456,7 @@ WS_DLL_PUBLIC void prefs_register_uat_preference(module_t *module,
|
|||
const char *name,
|
||||
const char* title,
|
||||
const char *description,
|
||||
uat_t* uat);
|
||||
struct epan_uat* uat);
|
||||
|
||||
/*
|
||||
* Register a color preference. Currently does not have any "GUI Dialog" support
|
||||
|
|
|
@ -31,6 +31,7 @@
|
|||
#include "config.h"
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <ctype.h>
|
||||
|
||||
#include <glib.h>
|
||||
|
|
|
@ -27,8 +27,9 @@
|
|||
#include "config.h"
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "epan/packet_info.h"
|
||||
#include <epan/tap.h>
|
||||
#include <epan/stat_cmd_args.h>
|
||||
|
|
|
@ -27,9 +27,9 @@
|
|||
|
||||
#ifdef HAVE_LIBPCAP
|
||||
|
||||
#include <string.h>
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
#include <gtk/gtk.h>
|
||||
|
||||
|
|
|
@ -26,6 +26,7 @@
|
|||
|
||||
#include "config.h"
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <locale.h>
|
||||
|
||||
|
|
|
@ -29,6 +29,7 @@
|
|||
#include "config.h"
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
#include <gtk/gtk.h>
|
||||
|
|
|
@ -26,6 +26,7 @@
|
|||
#include <gtk/gtk.h>
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
#include <wsutil/u3.h>
|
||||
|
|
|
@ -27,9 +27,10 @@
|
|||
|
||||
#include "config.h"
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
#include <stdio.h>
|
||||
#include <gtk/gtk.h>
|
||||
#include <glib.h>
|
||||
|
||||
|
|
|
@ -24,6 +24,7 @@
|
|||
|
||||
#include "config.h"
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
#include <gtk/gtk.h>
|
||||
|
|
|
@ -26,6 +26,7 @@
|
|||
|
||||
#include <gtk/gtk.h>
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
#include <epan/packet.h>
|
||||
|
|
|
@ -24,6 +24,8 @@
|
|||
|
||||
#include "config.h"
|
||||
|
||||
#include <stdlib.h>
|
||||
|
||||
#include <gtk/gtk.h>
|
||||
|
||||
#include <epan/proto.h>
|
||||
|
|
|
@ -23,6 +23,8 @@
|
|||
*/
|
||||
|
||||
#include "config.h"
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
#include <gtk/gtk.h>
|
||||
|
|
|
@ -25,6 +25,8 @@
|
|||
|
||||
#include "config.h"
|
||||
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "globals.h"
|
||||
|
||||
#include <gtk/gtk.h>
|
||||
|
|
|
@ -34,6 +34,8 @@
|
|||
*/
|
||||
|
||||
#include "config.h"
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
#include <epan/epan.h>
|
||||
|
|
|
@ -26,6 +26,7 @@
|
|||
#include "config.h"
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <ctype.h>
|
||||
#include <errno.h>
|
||||
|
|
Loading…
Reference in New Issue