aboutsummaryrefslogtreecommitdiffstats
path: root/epan
diff options
context:
space:
mode:
authorBalint Reczey <balint.reczey@ericsson.com>2012-01-19 22:55:37 +0000
committerBalint Reczey <balint.reczey@ericsson.com>2012-01-19 22:55:37 +0000
commit26503be7dcdd4536006d0f5e8f32a0de8caca206 (patch)
tree64be874a256e5b25ff747b5af6d65ab6ebcfc7d0 /epan
parent7b97eb7de29a2de913df29a338cfcd16aeb52741 (diff)
fix compile errors found by dumpabi target
svn path=/trunk/; revision=40595
Diffstat (limited to 'epan')
-rw-r--r--epan/Makefile.am7
-rw-r--r--epan/crypt/airpdcap_int.h1
-rw-r--r--epan/dissectors/packet-alcap.h4
-rw-r--r--epan/dissectors/packet-fc.h2
-rw-r--r--epan/dissectors/packet-fix.c7
-rw-r--r--epan/dissectors/packet-fix.h6
-rw-r--r--epan/dissectors/packet-iax2.h2
-rw-r--r--epan/dissectors/packet-ses.h3
-rw-r--r--epan/dissectors/packet-xmpp-conference.h2
-rw-r--r--epan/dissectors/packet-xmpp-core.h2
-rw-r--r--epan/dissectors/packet-xmpp-gtalk.h2
-rw-r--r--epan/dissectors/packet-xmpp-jingle.h2
-rw-r--r--epan/dissectors/packet-xmpp-other.h2
-rw-r--r--epan/dissectors/rpc_defrag.h2
-rw-r--r--epan/reassemble.h5
15 files changed, 41 insertions, 8 deletions
diff --git a/epan/Makefile.am b/epan/Makefile.am
index edcf1a1722..ef204dd22e 100644
--- a/epan/Makefile.am
+++ b/epan/Makefile.am
@@ -313,8 +313,13 @@ dumpabi: all abi-descriptor.xml
mkdir abi-check-headers; cp ../color.h ../config.h ../register.h abi-check-headers/; \
mkdir abi-check-headers/epan; cp *.h abi-check-headers/epan; \
mkdir abi-check-headers/crypt; cp crypt/*.h abi-check-headers/crypt; \
- mkdir abi-check-headers/dfilter; cp dfilter/*.h abi-check-headers/dfilter; \
+ mkdir abi-check-headers/dfilter; cp dfilter/*.h ../tools/lemon/cppmagic.h abi-check-headers/dfilter; \
mkdir abi-check-headers/dissectors; cp dissectors/*.h abi-check-headers/dissectors; \
+ rm abi-check-headers/dissectors/x11-extension-implementation.h \
+ abi-check-headers/dissectors/packet-rtps2.h \
+ abi-check-headers/dissectors/x11-glx-render-enum.h \
+ abi-check-headers/dissectors/x11-register-info.h \
+ abi-check-headers/dissectors/packet-idmp.h; \
mkdir abi-check-headers/ftypes; cp ftypes/*.h abi-check-headers/ftypes; \
abi-compliance-checker -l libwireshark -v1 `ls .libs/libwireshark.so.?.?.?|sed 's/.*\.so\.//'` \
-relpath $(abs_srcdir) -dump-abi abi-descriptor.xml && \
diff --git a/epan/crypt/airpdcap_int.h b/epan/crypt/airpdcap_int.h
index e6c1b20a61..14f1763ffc 100644
--- a/epan/crypt/airpdcap_int.h
+++ b/epan/crypt/airpdcap_int.h
@@ -41,6 +41,7 @@
/* File includes */
#include "airpdcap_interop.h"
+#include "airpdcap_system.h"
/****************************************************************************/
diff --git a/epan/dissectors/packet-alcap.h b/epan/dissectors/packet-alcap.h
index 2cc34ae775..cc14ff68c9 100644
--- a/epan/dissectors/packet-alcap.h
+++ b/epan/dissectors/packet-alcap.h
@@ -21,6 +21,9 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#ifndef PACKET_ALCAP_H
+#define PACKET_ALCAP_H
+
#include <epan/dissectors/packet-e164.h>
extern void alcap_tree_from_bearer_key(proto_tree* tree, tvbuff_t* tvb, const gchar* key);
@@ -57,3 +60,4 @@ typedef struct _alcap_message_info_t {
guint release_cause;
} alcap_message_info_t;
+#endif
diff --git a/epan/dissectors/packet-fc.h b/epan/dissectors/packet-fc.h
index 8ff57135e3..7281b7a295 100644
--- a/epan/dissectors/packet-fc.h
+++ b/epan/dissectors/packet-fc.h
@@ -26,6 +26,8 @@
#ifndef __PACKET_FC_H_
#define __PACKET_FC_H_
+#include "packet-scsi.h"
+
/* R_CTL upper bits creates a classification tree */
#define FC_RCTL_DEV_DATA 0x00
#define FC_RCTL_ELS 0x20
diff --git a/epan/dissectors/packet-fix.c b/epan/dissectors/packet-fix.c
index 0b5fe19ad1..e57070a69c 100644
--- a/epan/dissectors/packet-fix.c
+++ b/epan/dissectors/packet-fix.c
@@ -43,13 +43,6 @@
#include "packet-tcp.h"
-typedef struct _fix_field {
- int tag; /* FIX tag */
- int hf_id;
- int type; /* */
- const void *table;
-} fix_field;
-
typedef struct _fix_parameter {
int field_len;
int tag_len;
diff --git a/epan/dissectors/packet-fix.h b/epan/dissectors/packet-fix.h
index a3be424236..c290777257 100644
--- a/epan/dissectors/packet-fix.h
+++ b/epan/dissectors/packet-fix.h
@@ -5,6 +5,12 @@
*
*/
+typedef struct _fix_field {
+ int tag; /* FIX tag */
+ int hf_id;
+ int type; /* */
+ const void *table;
+} fix_field;
static const string_string messages_val[] = {
{ "0", "Heartbeat" },
diff --git a/epan/dissectors/packet-iax2.h b/epan/dissectors/packet-iax2.h
index 2d99440dac..b1000c5f1f 100644
--- a/epan/dissectors/packet-iax2.h
+++ b/epan/dissectors/packet-iax2.h
@@ -27,6 +27,8 @@
#ifndef _PACKET_IAX2_H
#define _PACKET_IAX2_H
+#include <tap-voip.h>
+
/* Max version of IAX protocol we support */
#define IAX_PROTO_VERSION 2
diff --git a/epan/dissectors/packet-ses.h b/epan/dissectors/packet-ses.h
index be010c4697..10b7cae79c 100644
--- a/epan/dissectors/packet-ses.h
+++ b/epan/dissectors/packet-ses.h
@@ -25,6 +25,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#ifndef PACKET_SES_H
+#define PACKET_SES_H
#define PROTO_STRING_SES "ISO 8327-1 OSI Session Protocol"
#define PROTO_STRING_SES_INFO "ISO 8327-1 OSI Session Protocol."
@@ -207,3 +209,4 @@ struct SESSION_DATA_STRUCTURE
extern const value_string ses_vals[];
+#endif
diff --git a/epan/dissectors/packet-xmpp-conference.h b/epan/dissectors/packet-xmpp-conference.h
index 9972f7f467..30c5847842 100644
--- a/epan/dissectors/packet-xmpp-conference.h
+++ b/epan/dissectors/packet-xmpp-conference.h
@@ -26,6 +26,8 @@
#ifndef XMPP_CONFERENCE_H
#define XMPP_CONFERENCE_H
+#include "packet-xmpp-utils.h"
+
extern void xmpp_conferece_info_advert(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t *element);
extern void xmpp_conference_info(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t *element);
diff --git a/epan/dissectors/packet-xmpp-core.h b/epan/dissectors/packet-xmpp-core.h
index ee81443fd7..1f36c385da 100644
--- a/epan/dissectors/packet-xmpp-core.h
+++ b/epan/dissectors/packet-xmpp-core.h
@@ -26,6 +26,8 @@
#ifndef XMPP_CORE_H
#define XMPP_CORE_H
+#include "packet-xmpp-utils.h"
+
extern void xmpp_iq(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t *packet);
extern void xmpp_presence(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t *packet);
extern void xmpp_message(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t *packet);
diff --git a/epan/dissectors/packet-xmpp-gtalk.h b/epan/dissectors/packet-xmpp-gtalk.h
index cc708835b9..af58e6aaf6 100644
--- a/epan/dissectors/packet-xmpp-gtalk.h
+++ b/epan/dissectors/packet-xmpp-gtalk.h
@@ -26,6 +26,8 @@
#ifndef XMPP_GTALK_H
#define XMPP_GTALK_H
+#include "packet-xmpp-utils.h"
+
extern void xmpp_gtalk_session(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, xmpp_element_t* element);
extern void xmpp_gtalk_jingleinfo_query(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, xmpp_element_t* element);
extern void xmpp_gtalk_usersetting(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, xmpp_element_t* element);
diff --git a/epan/dissectors/packet-xmpp-jingle.h b/epan/dissectors/packet-xmpp-jingle.h
index 3edc872b25..076359ff23 100644
--- a/epan/dissectors/packet-xmpp-jingle.h
+++ b/epan/dissectors/packet-xmpp-jingle.h
@@ -26,6 +26,8 @@
#ifndef XMPP_JINGLE_H
#define XMPP_JINGLE_H
+#include "packet-xmpp-utils.h"
+
extern void xmpp_jingle(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t *element);
extern void xmpp_jinglenodes_services(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t *element);
extern void xmpp_jinglenodes_channel(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t *element);
diff --git a/epan/dissectors/packet-xmpp-other.h b/epan/dissectors/packet-xmpp-other.h
index 0dbe96c3e1..ad9eccfab3 100644
--- a/epan/dissectors/packet-xmpp-other.h
+++ b/epan/dissectors/packet-xmpp-other.h
@@ -26,6 +26,8 @@
#ifndef XMPP_OTHER_H
#define XMPP_OTHER_H
+#include "packet-xmpp-utils.h"
+
extern void xmpp_iq_bind(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t *element);
extern void xmpp_session(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t *element);
extern void xmpp_vcard(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t *element);
diff --git a/epan/dissectors/rpc_defrag.h b/epan/dissectors/rpc_defrag.h
index 45052c22aa..7e67910327 100644
--- a/epan/dissectors/rpc_defrag.h
+++ b/epan/dissectors/rpc_defrag.h
@@ -25,6 +25,8 @@
#ifndef __RPC_DEFRAG_H__
#define __RPC_DEFRAG_H__
+#include "reassemble.h"
+
/*
* RPC-over-TCP fragmentation.
*/
diff --git a/epan/reassemble.h b/epan/reassemble.h
index 12e93a199c..8d8f7cff7b 100644
--- a/epan/reassemble.h
+++ b/epan/reassemble.h
@@ -26,6 +26,9 @@
* the flags field of fd_head !!!
*/
+#ifndef REASSEMBLE_H
+#define REASSEMBLE_H
+
/* only in fd_head: packet is defragmented */
#define FD_DEFRAGMENTED 0x0001
@@ -314,3 +317,5 @@ show_fragment_tree(fragment_data *ipfd_head, const fragment_items *fit,
extern gboolean
show_fragment_seq_tree(fragment_data *ipfd_head, const fragment_items *fit,
proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, proto_item **fi);
+
+#endif