aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors
diff options
context:
space:
mode:
Diffstat (limited to 'epan/dissectors')
-rw-r--r--epan/dissectors/packet-ajp13.c2
-rw-r--r--epan/dissectors/packet-ber.c1
-rw-r--r--epan/dissectors/packet-bootp.c3
-rw-r--r--epan/dissectors/packet-diameter.c5
-rw-r--r--epan/dissectors/packet-dpnss.c3
-rw-r--r--epan/dissectors/packet-edonkey.c2
-rw-r--r--epan/dissectors/packet-fix.c4
-rw-r--r--epan/dissectors/packet-ieee80211.c8
-rw-r--r--epan/dissectors/packet-ipsec.c4
-rw-r--r--epan/dissectors/packet-isakmp.c16
-rw-r--r--epan/dissectors/packet-ldss.c6
-rw-r--r--epan/dissectors/packet-megaco.c2
-rw-r--r--epan/dissectors/packet-msrp.c6
-rw-r--r--epan/dissectors/packet-nasdaq-itch.c4
-rw-r--r--epan/dissectors/packet-radius.c4
-rw-r--r--epan/dissectors/packet-rtsp.c18
-rw-r--r--epan/dissectors/packet-sdp.c11
-rw-r--r--epan/dissectors/packet-sip.c5
-rw-r--r--epan/dissectors/packet-smtp.c3
-rw-r--r--epan/dissectors/packet-telnet.c3
20 files changed, 77 insertions, 33 deletions
diff --git a/epan/dissectors/packet-ajp13.c b/epan/dissectors/packet-ajp13.c
index c16ec233f6..ce9e647736 100644
--- a/epan/dissectors/packet-ajp13.c
+++ b/epan/dissectors/packet-ajp13.c
@@ -27,6 +27,8 @@
# include "config.h"
#endif
+#include <stdlib.h>
+
#include <glib.h>
#include <epan/packet.h>
diff --git a/epan/dissectors/packet-ber.c b/epan/dissectors/packet-ber.c
index 7e3b5889dc..e5c20cf1d8 100644
--- a/epan/dissectors/packet-ber.c
+++ b/epan/dissectors/packet-ber.c
@@ -62,6 +62,7 @@
#endif
#include <stdio.h>
+#include <stdlib.h>
#include <string.h>
#include <ctype.h>
#include <errno.h>
diff --git a/epan/dissectors/packet-bootp.c b/epan/dissectors/packet-bootp.c
index a589b4ae20..6a321819ac 100644
--- a/epan/dissectors/packet-bootp.c
+++ b/epan/dissectors/packet-bootp.c
@@ -88,8 +88,11 @@
#endif
#include <stdio.h>
+#include <stdlib.h>
#include <string.h>
+
#include <glib.h>
+
#include <epan/packet.h>
#include "packet-arp.h"
#include "packet-dns.h" /* for get_dns_name() */
diff --git a/epan/dissectors/packet-diameter.c b/epan/dissectors/packet-diameter.c
index 3f76e7e156..c0c2e18ece 100644
--- a/epan/dissectors/packet-diameter.c
+++ b/epan/dissectors/packet-diameter.c
@@ -45,12 +45,15 @@
#endif
#include <stdio.h>
+#include <stdlib.h>
#include <string.h>
#include <errno.h>
#include <ctype.h>
+
#include <glib.h>
-#include <epan/filesystem.h>
+
#include <epan/packet.h>
+#include <epan/filesystem.h>
#include <epan/prefs.h>
#include <epan/sminmpec.h>
#include <epan/emem.h>
diff --git a/epan/dissectors/packet-dpnss.c b/epan/dissectors/packet-dpnss.c
index 93ad7c9778..16cbfd2dbe 100644
--- a/epan/dissectors/packet-dpnss.c
+++ b/epan/dissectors/packet-dpnss.c
@@ -33,10 +33,11 @@
# include "config.h"
#endif
+#include <stdlib.h>
+
#include <glib.h>
#include <epan/packet.h>
-#include <epan/proto.h>
/* Initialize the protocol and registered fields */
static int proto_dpnss = -1;
diff --git a/epan/dissectors/packet-edonkey.c b/epan/dissectors/packet-edonkey.c
index b0494667a4..b484dcfafd 100644
--- a/epan/dissectors/packet-edonkey.c
+++ b/epan/dissectors/packet-edonkey.c
@@ -36,6 +36,8 @@
#include "config.h"
#endif
+#include <stdlib.h>
+
#include <glib.h>
#include <epan/packet.h>
diff --git a/epan/dissectors/packet-fix.c b/epan/dissectors/packet-fix.c
index aac0822f5b..e645e61d98 100644
--- a/epan/dissectors/packet-fix.c
+++ b/epan/dissectors/packet-fix.c
@@ -31,7 +31,11 @@
# include "config.h"
#endif
+#include <stdlib.h>
#include <string.h>
+
+#include <glib.h>
+
#include <epan/packet.h>
#include <epan/expert.h>
#include <epan/prefs.h>
diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c
index bbc9af1a20..08be0c124c 100644
--- a/epan/dissectors/packet-ieee80211.c
+++ b/epan/dissectors/packet-ieee80211.c
@@ -88,12 +88,14 @@
# include "config.h"
#endif
+#include <stdlib.h>
#include <string.h>
-#include <glib.h>
#include <math.h>
-#include <epan/bitswap.h>
-#include <epan/proto.h>
+
+#include <glib.h>
+
#include <epan/packet.h>
+#include <epan/bitswap.h>
#include <epan/addr_resolv.h>
#include <epan/strutil.h>
#include <epan/prefs.h>
diff --git a/epan/dissectors/packet-ipsec.c b/epan/dissectors/packet-ipsec.c
index 81464d5661..82a7cc13d8 100644
--- a/epan/dissectors/packet-ipsec.c
+++ b/epan/dissectors/packet-ipsec.c
@@ -74,9 +74,11 @@ ADD: Additional generic (non-checked) ICV length of 128, 192 and 256.
#endif
#include <stdio.h>
-
+#include <stdlib.h>
#include <string.h>
+
#include <glib.h>
+
#include <epan/packet.h>
#include <epan/emem.h>
#include "packet-ipsec.h"
diff --git a/epan/dissectors/packet-isakmp.c b/epan/dissectors/packet-isakmp.c
index 223c03795e..7793d43ead 100644
--- a/epan/dissectors/packet-isakmp.c
+++ b/epan/dissectors/packet-isakmp.c
@@ -48,19 +48,13 @@
#endif
#include <stdio.h>
+#include <stdlib.h>
#include <string.h>
#include <glib.h>
-#ifdef HAVE_LIBGCRYPT
-#include <gcrypt.h>
-#include <epan/strutil.h>
-#include <wsutil/file_util.h>
-#include <epan/uat.h>
-#endif
-
-#include <epan/proto.h>
#include <epan/packet.h>
+
#include <epan/ipproto.h>
#include <epan/asn1.h>
#include <epan/reassemble.h>
@@ -70,6 +64,12 @@
#include <epan/prefs.h>
#include <epan/expert.h>
+#ifdef HAVE_LIBGCRYPT
+#include <gcrypt.h>
+#include <epan/strutil.h>
+#include <wsutil/file_util.h>
+#include <epan/uat.h>
+#endif
/* Struct for the byte_to_str, match_bytestr_idx, and match_bytestr functions */
diff --git a/epan/dissectors/packet-ldss.c b/epan/dissectors/packet-ldss.c
index 1c850c5795..def063472f 100644
--- a/epan/dissectors/packet-ldss.c
+++ b/epan/dissectors/packet-ldss.c
@@ -40,10 +40,12 @@
#include "config.h"
#endif
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
+
#include <glib.h>
-#include <math.h>
-#include <string.h>
#include <epan/packet.h>
#include <epan/conversation.h>
#include <epan/addr_resolv.h>
diff --git a/epan/dissectors/packet-megaco.c b/epan/dissectors/packet-megaco.c
index 4938860cb2..dc8812698e 100644
--- a/epan/dissectors/packet-megaco.c
+++ b/epan/dissectors/packet-megaco.c
@@ -44,9 +44,11 @@
#include "config.h"
#endif
+#include <stdlib.h>
#include <ctype.h>
#include <glib.h>
+
#include <epan/packet.h>
#include <epan/emem.h>
#include <epan/addr_resolv.h>
diff --git a/epan/dissectors/packet-msrp.c b/epan/dissectors/packet-msrp.c
index 008e7a4779..13b57fc17a 100644
--- a/epan/dissectors/packet-msrp.c
+++ b/epan/dissectors/packet-msrp.c
@@ -30,17 +30,17 @@
# include "config.h"
#endif
+#include <stdlib.h>
#include <ctype.h>
#include <glib.h>
-#include <wsutil/str_util.h>
-
+#include <epan/packet.h>
#include <epan/conversation.h>
#include <epan/strutil.h>
-#include <epan/packet.h>
#include <epan/emem.h>
#include <epan/prefs.h>
+#include <wsutil/str_util.h>
#include "packet-msrp.h"
diff --git a/epan/dissectors/packet-nasdaq-itch.c b/epan/dissectors/packet-nasdaq-itch.c
index 766172cca1..2ade00f750 100644
--- a/epan/dissectors/packet-nasdaq-itch.c
+++ b/epan/dissectors/packet-nasdaq-itch.c
@@ -37,7 +37,11 @@
# include "config.h"
#endif
+#include <stdlib.h>
#include <string.h>
+
+#include <glib.h>
+
#include <epan/packet.h>
#include <epan/prefs.h>
#include <wsutil/type_util.h>
diff --git a/epan/dissectors/packet-radius.c b/epan/dissectors/packet-radius.c
index 6ef2b41f8f..c474370f7f 100644
--- a/epan/dissectors/packet-radius.c
+++ b/epan/dissectors/packet-radius.c
@@ -51,9 +51,13 @@
#include "config.h"
#endif
+#include <stdlib.h>
#include <string.h>
#include <ctype.h>
#include <errno.h>
+
+#include <glib.h>
+
#include <epan/packet.h>
#include <epan/prefs.h>
#include <epan/report_err.h>
diff --git a/epan/dissectors/packet-rtsp.c b/epan/dissectors/packet-rtsp.c
index a3dd3f14c2..debbc2e260 100644
--- a/epan/dissectors/packet-rtsp.c
+++ b/epan/dissectors/packet-rtsp.c
@@ -29,29 +29,31 @@
* http://www.iana.org/assignments/rsvp-parameters
*/
+#ifdef HAVE_CONFIG_H
#include "config.h"
+#endif
#include <stdio.h>
+#include <stdlib.h>
#include <string.h>
#include <ctype.h>
-#include <epan/prefs.h>
-
#include <glib.h>
-#include <wsutil/str_util.h>
-
#include <epan/packet.h>
#include <epan/req_resp_hdrs.h>
-#include "packet-rtp.h"
-#include "packet-rtcp.h"
-#include "packet-rdt.h"
+#include <epan/prefs.h>
#include <epan/conversation.h>
#include <epan/strutil.h>
-#include "packet-e164.h"
#include <epan/emem.h>
#include <epan/tap.h>
#include <epan/tap-voip.h>
+#include <wsutil/str_util.h>
+
+#include "packet-rdt.h"
+#include "packet-rtp.h"
+#include "packet-rtcp.h"
+#include "packet-e164.h"
static int proto_rtsp = -1;
diff --git a/epan/dissectors/packet-sdp.c b/epan/dissectors/packet-sdp.c
index 498cf46392..14a579a400 100644
--- a/epan/dissectors/packet-sdp.c
+++ b/epan/dissectors/packet-sdp.c
@@ -26,8 +26,11 @@
* Ref http://www.ietf.org/rfc/rfc4566.txt?number=4566
*/
+#ifdef HAVE_CONFIG_H
#include "config.h"
+#endif
+#include <stdlib.h>
#include <ctype.h>
#ifdef HAVE_SYS_TYPES_H
@@ -52,21 +55,21 @@
#endif
#include <glib.h>
+
#include <epan/packet.h>
#include <epan/strutil.h>
#include <epan/emem.h>
#include <epan/base64.h>
#include <epan/asn1.h>
-
+#include <epan/prefs.h>
+#include <epan/expert.h>
#include <epan/tap.h>
+
#include "packet-sdp.h"
#include "packet-rtp.h"
#include <epan/rtp_pt.h>
-#include <epan/prefs.h>
-#include <epan/expert.h>
-
#include "packet-rtcp.h"
#include "packet-t38.h"
#include "packet-msrp.h"
diff --git a/epan/dissectors/packet-sip.c b/epan/dissectors/packet-sip.c
index 3f6dcea651..f18d609625 100644
--- a/epan/dissectors/packet-sip.c
+++ b/epan/dissectors/packet-sip.c
@@ -36,10 +36,11 @@
# include "config.h"
#endif
-#include <glib.h>
-
+#include <stdlib.h>
#include <ctype.h>
+#include <glib.h>
+
#include <epan/packet.h>
#include <epan/prefs.h>
#include <epan/req_resp_hdrs.h>
diff --git a/epan/dissectors/packet-smtp.c b/epan/dissectors/packet-smtp.c
index 017ef4605e..8856230989 100644
--- a/epan/dissectors/packet-smtp.c
+++ b/epan/dissectors/packet-smtp.c
@@ -28,8 +28,11 @@
#include "config.h"
#endif
+#include <stdlib.h>
#include <ctype.h>
+
#include <glib.h>
+
#include <epan/packet.h>
#include <epan/conversation.h>
#include <epan/prefs.h>
diff --git a/epan/dissectors/packet-telnet.c b/epan/dissectors/packet-telnet.c
index 1c2ca377d8..eb01556b4e 100644
--- a/epan/dissectors/packet-telnet.c
+++ b/epan/dissectors/packet-telnet.c
@@ -31,8 +31,11 @@
# include "config.h"
#endif
+#include <stdlib.h>
#include <string.h>
+
#include <glib.h>
+
#include <epan/packet.h>
#include <epan/strutil.h>
#include <epan/emem.h>