Move various checksum routines and headers to epan.

svn path=/trunk/; revision=12117

Makefile.common

@@ -26,7 +26,6 @@
 # Header files for dissector helpers
 # XXX - these should be moved to epan/dissectors
 DISSECTOR_SUPPORT_INCLUDES =	\
-	adler32.h	\
 	afn.h	\
 	aftypes.h	\
 	arcnet_pids.h	\
@@ -34,15 +33,12 @@ DISSECTOR_SUPPORT_INCLUDES =	\
 	bridged_pids.h	\
 	chdlctypes.h	\
 	column.h	\
-	crc16.h	\
-	crc32.h	\
 	etypes.h	\
 	follow.h	\
 	format-oid.h	\
 	greproto.h	\
 	h225-persistentdata.h	\
 	iax2_codec_type.h	\
-	in_cksum.h	\
 	ip_opts.h	\
 	ipproto.h	\
 	isprint.h	\

epan/Makefile.common

@@ -26,6 +26,7 @@
 LIBETHEREAL_SRC = 		\
 	addr_and_mask.c		\
 	addr_resolv.c		\
+	adler32.c		\
 	atalk-utils.c		\
 	base64.c		\
 	bitswap.c		\
@@ -33,6 +34,8 @@ LIBETHEREAL_SRC = 		\
 	circuit.c		\
 	column-utils.c		\
 	conversation.c		\
+	crc16.c			\
+	crc32.c			\
 	crypt-des.c		\
 	crypt-md4.c		\
 	crypt-md5.c		\
@@ -41,6 +44,7 @@ LIBETHEREAL_SRC = 		\
 	except.c		\
 	filesystem.c		\
 	frame_data.c		\
+	in_cksum.c		\
 	ipv4.c			\
 	osi-utils.c		\
 	packet.c		\
@@ -59,6 +63,7 @@ LIBETHEREAL_INCLUDES = 		\
 	addr_and_mask.h		\
 	addr_resolv.h		\
 	address.h		\
+	adler32.h		\
 	atalk-utils.h		\
 	base64.h		\
 	bitswap.h		\
@@ -67,6 +72,8 @@ LIBETHEREAL_INCLUDES = 		\
 	column_info.h		\
 	conversation.h		\
 	column-utils.h		\
+	crc16.h			\
+	crc32.h			\
 	crypt-des.h		\
 	crypt-md4.h		\
 	crypt-md5.h		\
@@ -78,6 +85,7 @@ LIBETHEREAL_INCLUDES = 		\
 	filesystem.h		\
 	frame_data.h		\
 	gdebug.h		\
+	in_cksum.h		\
 	ipv4.h			\
 	ipv6-utils.h		\
 	nstime.h		\
@@ -100,15 +108,11 @@ LIBETHEREAL_INCLUDES = 		\
 
 # dissector helpers (needed from the dissectors, but not a dissector itself)
 DISSECTOR_SUPPORT_SRC =	\
-	../adler32.c	\
 	../afn.c	\
 	../asn1.c	\
 	../column.c	\
-	../crc16.c	\
-	../crc32.c	\
 	../follow.c	\
 	../h225-persistentdata.c	\
-	../in_cksum.c	\
 	../ipproto.c	\
 	../ptvcursor.c	\
 	../reassemble.c	\

epan/adler32.c

@@ -26,7 +26,7 @@
 
 #include <string.h>
 
-#include "adler32.h"
+#include <epan/adler32.h>
 
 #define BASE 65521 /* largest prime smaller than 65536 */
 

epan/crc16.c

@@ -35,7 +35,7 @@
 
 #include <glib.h>
 #include <epan/tvbuff.h>
-#include "crc16.h"
+#include <epan/crc16.h>
 
 
 /*****************************************************************/

epan/crc32.c

@@ -31,7 +31,7 @@
 
 #include <glib.h>
 #include <epan/tvbuff.h>
-#include "crc32.h"
+#include <epan/crc32.h>
 
 /*
  * Table for the AUTODIN/HDLC/802.x CRC.

epan/dissectors/packet-eth.c

@@ -36,7 +36,7 @@
 #include "packet-ipx.h"
 #include "packet-isl.h"
 #include "packet-llc.h"
-#include "crc32.h"
+#include <epan/crc32.h>
 #include "tap.h"
 
 /* Interpret capture file as FW1 monitor file */

epan/dissectors/packet-gre.c

@@ -30,7 +30,7 @@
 #include <glib.h>
 #include <epan/packet.h>
 #include "packet-wccp.h"
-#include "in_cksum.h"
+#include <epan/in_cksum.h>
 #include "etypes.h"
 #include "greproto.h"
 #include "ipproto.h"

epan/dissectors/packet-icmpv6.c

@@ -48,7 +48,7 @@
 #include <epan/packet.h>
 #include "packet-ipv6.h"
 #include "packet-dns.h"
-#include "in_cksum.h"
+#include <epan/in_cksum.h>
 #include <epan/addr_resolv.h>
 #include "ipproto.h"
 

epan/dissectors/packet-ieee80211.c

@@ -67,7 +67,7 @@
 #include "packet-llc.h"
 #include "packet-ieee80211.h"
 #include "etypes.h"
-#include "crc32.h"
+#include <epan/crc32.h>
 
 /* Defragment fragmented 802.11 datagrams */
 static gboolean wlan_defragment = TRUE;

epan/dissectors/packet-igmp.c

@@ -109,7 +109,7 @@
 
 #include <epan/packet.h>
 #include "ipproto.h"
-#include "in_cksum.h"
+#include <epan/in_cksum.h>
 #include "packet-dvmrp.h"
 #include "packet-pim.h"
 #include "packet-mrdisc.h"

epan/dissectors/packet-ip.c

@@ -48,7 +48,7 @@
 #include "arcnet_pids.h"
 #include "packet-ip.h"
 #include "packet-ipsec.h"
-#include "in_cksum.h"
+#include <epan/in_cksum.h>
 #include "nlpid.h"
 #include "tap.h"
 

epan/dissectors/packet-ipvs-syncd.c

@@ -36,7 +36,7 @@
 
 #include <epan/packet.h>
 #include "ipproto.h"
-#include "in_cksum.h"
+#include <epan/in_cksum.h>
 
 static int proto_ipvs_syncd = -1;
 static int hf_conn_count = -1;

epan/dissectors/packet-lmp.c

@@ -51,7 +51,7 @@
 #include <epan/tvbuff.h>
 #include <epan/packet.h>
 #include <prefs.h>
-#include "in_cksum.h"
+#include <epan/in_cksum.h>
 #include "etypes.h"
 #include "ipproto.h"
 

epan/dissectors/packet-ospf.c

@@ -45,7 +45,7 @@
 #include <glib.h>
 #include <epan/packet.h>
 #include "ipproto.h"
-#include "in_cksum.h"
+#include <epan/in_cksum.h>
 #include "packet-rsvp.h"
 
 #define OSPF_VERSION_2 2

epan/dissectors/packet-pgm.c

@@ -36,7 +36,7 @@
 #include <epan/packet.h>
 #include "afn.h"
 #include "ipproto.h"
-#include "in_cksum.h"
+#include <epan/in_cksum.h>
 #include <epan/addr_resolv.h>
 #include <epan/strutil.h>
 #include <epan/prefs.h>

epan/dissectors/packet-pim.c

@@ -39,7 +39,7 @@
 #include "ipproto.h"
 #include "afn.h"
 #include "packet-ipv6.h"
-#include "in_cksum.h"
+#include <epan/in_cksum.h>
 
 #define PIM_TYPE(x)	((x) & 0x0f)
 #define PIM_VER(x)	(((x) & 0xf0) >> 4)

epan/dissectors/packet-ppp.c

@@ -43,8 +43,8 @@
 #include "packet-ipx.h"
 #include "packet-vines.h"
 #include "nlpid.h"
-#include "crc16.h"
-#include "crc32.h"
+#include <epan/crc16.h>
+#include <epan/crc32.h>
 
 #define ppp_min(a, b)  ((a<b) ? a : b)
 

epan/dissectors/packet-rsvp.c

@@ -69,7 +69,7 @@
 #include <epan/tvbuff.h>
 #include <epan/packet.h>
 #include <prefs.h>
-#include "in_cksum.h"
+#include <epan/in_cksum.h>
 #include "etypes.h"
 #include "ipproto.h"
 

epan/dissectors/packet-tcp.c

@@ -29,7 +29,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <glib.h>
-#include "in_cksum.h"
+#include <epan/in_cksum.h>
 
 #include <epan/packet.h>
 #include <epan/addr_resolv.h>

epan/dissectors/packet-udp.c

@@ -37,7 +37,7 @@
 #include <epan/packet.h>
 #include <epan/addr_resolv.h>
 #include "ipproto.h"
-#include "in_cksum.h"
+#include <epan/in_cksum.h>
 #include <epan/prefs.h>
 
 #include "packet-udp.h"

epan/dissectors/packet-vj.c

@@ -70,7 +70,7 @@
 #include "packet-ppp.h"
 #include "ppptypes.h"
 #include "ipproto.h"
-#include "in_cksum.h"
+#include <epan/in_cksum.h>
 
 /* Define relevant IP/TCP parameters */
 #define IP_FIELD_TOT_LEN      2 /* Total length field in IP hdr           */

epan/dissectors/packet-vrrp.c

@@ -33,7 +33,7 @@
 #include <glib.h>
 #include <epan/packet.h>
 #include "ipproto.h"
-#include "in_cksum.h"
+#include <epan/in_cksum.h>
 
 static gint proto_vrrp = -1;
 static gint ett_vrrp = -1;

epan/in_cksum.c

@@ -42,7 +42,7 @@
 
 #include <glib.h>
 
-#include "in_cksum.h"
+#include <epan/in_cksum.h>
 
 /*
  * Checksum routine for Internet Protocol family headers (Portable Version).

epan/plugins.c

@@ -73,7 +73,7 @@
 #include <epan/dissectors/packet-rtp.h>
 #include <epan/dissectors/packet-rtcp.h>
 #include "xdlc.h"
-#include "crc16.h"
+#include <epan/crc16.h>
 #include "report_err.h"
 #include "plugins/plugin_table.h"
 static plugin_address_table_t	patable = {

plugins/irda/packet-sir.c

@@ -23,7 +23,7 @@
 #endif
 #include "moduleinfo.h"
 #include "plugins/plugin_api.h"
-#include "crc16.h"
+#include <epan/crc16.h>
 
 #include <gmodule.h>
 

plugins/plugin_api.h

@@ -59,7 +59,7 @@
 #include <epan/dissectors/packet-rtp.h>
 #include <epan/dissectors/packet-rtcp.h>
 #include "xdlc.h"
-#include "crc16.h"
+#include <epan/crc16.h>
 #include "epan/except.h"
 #include "epan/filesystem.h"
 

plugins/plugin_api_list.c

@@ -44,7 +44,7 @@
 #include "tap.h"
 #include "asn1.h"
 #include "xdlc.h"
-#include "crc16.h"
+#include <epan/crc16.h>
 
 gint check_col(column_info*, gint);
 void col_clear(column_info*, gint);