Move various tables into the epan directory.

svn path=/trunk/; revision=12130

Makefile.common

@@ -26,7 +26,6 @@
 # Header files for dissector helpers
 # XXX - these should be moved to epan/dissectors
 DISSECTOR_SUPPORT_INCLUDES =	\
-	afn.h	\
 	aftypes.h	\
 	arcnet_pids.h	\
 	asn1.h	\
@@ -40,7 +39,6 @@ DISSECTOR_SUPPORT_INCLUDES =	\
 	h225-persistentdata.h	\
 	iax2_codec_type.h	\
 	ip_opts.h	\
-	ipproto.h	\
 	isprint.h	\
 	lapd_sapi.h	\
 	llcsaps.h	\
@@ -54,7 +52,6 @@ DISSECTOR_SUPPORT_INCLUDES =	\
 	rtp_pt.h	\
 	sctpppids.h	\
 	smb.h	\
-	t35.h	\
 	x264_prt_id.h	\
 	xmlstub.h
 

epan/Makefile.common

@@ -27,6 +27,7 @@ LIBETHEREAL_SRC = 		\
 	addr_and_mask.c		\
 	addr_resolv.c		\
 	adler32.c		\
+	afn.c			\
 	atalk-utils.c		\
 	base64.c		\
 	bitswap.c		\
@@ -45,6 +46,7 @@ LIBETHEREAL_SRC = 		\
 	filesystem.c		\
 	frame_data.c		\
 	in_cksum.c		\
+	ipproto.c		\
 	ipv4.c			\
 	osi-utils.c		\
 	packet.c		\
@@ -56,6 +58,7 @@ LIBETHEREAL_SRC = 		\
 	sha1.c			\
 	sna-utils.c		\
 	strutil.c		\
+	t35.c			\
 	tap.c			\
 	timestamp.c		\
 	to_str.c		\
@@ -68,6 +71,7 @@ LIBETHEREAL_INCLUDES = 		\
 	addr_resolv.h		\
 	address.h		\
 	adler32.h		\
+	afn.h			\
 	atalk-utils.h		\
 	base64.h		\
 	bitswap.h		\
@@ -90,6 +94,7 @@ LIBETHEREAL_INCLUDES = 		\
 	frame_data.h		\
 	gdebug.h		\
 	in_cksum.h		\
+	ipproto.h		\
 	ipv4.h			\
 	ipv6-utils.h		\
 	nstime.h		\
@@ -107,6 +112,7 @@ LIBETHEREAL_INCLUDES = 		\
 	slab.h			\
 	sna-utils.h		\
 	strutil.h		\
+	t35.h			\
 	tap.h			\
 	timestamp.h    		\
 	to_str.h		\
@@ -116,14 +122,11 @@ LIBETHEREAL_INCLUDES = 		\
 
 # dissector helpers (needed from the dissectors, but not a dissector itself)
 DISSECTOR_SUPPORT_SRC =	\
-	../afn.c	\
 	../asn1.c	\
 	../column.c	\
 	../follow.c	\
 	../h225-persistentdata.c	\
-	../ipproto.c	\
 	../ptvcursor.c	\
 	../reassemble.c	\
-	../t35.c	\
 	../xmlstub.c
 

epan/afn.c

@@ -27,7 +27,7 @@
 #endif
 
 #include <epan/packet.h>
-#include "afn.h"
+#include <epan/afn.h>
 
 const value_string afn_vals[] = {
     { 0, "Reserved" },

epan/dissectors/packet-bgp.c

@@ -60,7 +60,7 @@
 #include "packet-bgp.h"
 #include "packet-ipv6.h"
 #include "packet-frame.h"
-#include "afn.h"
+#include <epan/afn.h>
 #include <epan/prefs.h>
 
 static const value_string bgptypevals[] = {

epan/dissectors/packet-clnp.c

@@ -39,7 +39,7 @@
 #include "packet-isis.h"
 #include "packet-esis.h"
 #include "nlpid.h"
-#include "ipproto.h"
+#include <epan/ipproto.h>
 
 /* protocols and fields */
 

epan/dissectors/packet-cpha.c

@@ -37,7 +37,7 @@
 #endif
 
 #include <epan/packet.h>
-#include "ipproto.h"
+#include <epan/ipproto.h>
 
 static int proto_cphap = -1;
 

epan/dissectors/packet-dns.c

@@ -37,7 +37,7 @@
 #include <glib.h>
 #include <epan/ipv6-utils.h>
 #include <epan/packet.h>
-#include "ipproto.h"
+#include <epan/ipproto.h>
 #include <epan/addr_resolv.h>
 #include "packet-dns.h"
 #include "packet-tcp.h"

epan/dissectors/packet-dvmrp.c

@@ -60,7 +60,7 @@
 #include <glib.h>
 
 #include <epan/packet.h>
-#include "ipproto.h"
+#include <epan/ipproto.h>
 #include "packet-igmp.h"
 #include "packet-dvmrp.h"
 

epan/dissectors/packet-eigrp.c

@@ -33,7 +33,7 @@
 
 #include <epan/atalk-utils.h>
 #include <epan/addr_and_mask.h>
-#include "ipproto.h"
+#include <epan/ipproto.h>
 #include "packet-ipx.h"
 
 /*

epan/dissectors/packet-etherip.c

@@ -30,7 +30,7 @@
 #include <string.h>
 #include <glib.h>
 #include <epan/packet.h>
-#include "ipproto.h"
+#include <epan/ipproto.h>
 
 static int proto_etherip = -1;
 static int hf_etherip_ver = -1;

epan/dissectors/packet-gre.c

@@ -33,7 +33,7 @@
 #include <epan/in_cksum.h>
 #include "etypes.h"
 #include "greproto.h"
-#include "ipproto.h"
+#include <epan/ipproto.h>
 #include "llcsaps.h"
 
 /*

epan/dissectors/packet-h225.c

@@ -43,7 +43,7 @@
 #include "packet-h225.h"
 #include "packet-h235.h"
 #include "packet-h245.h"
-#include "t35.h"
+#include <epan/t35.h>
 #include "h225-persistentdata.h"
 
 #define UDP_PORT_RAS1 1718

epan/dissectors/packet-h245.c

@@ -41,7 +41,7 @@
 #include <epan/prefs.h>
 #include "packet-tpkt.h"
 #include "packet-per.h"
-#include "t35.h"
+#include <epan/t35.h>
 #include "packet-rtp.h"
 #include "packet-rtcp.h"
 

epan/dissectors/packet-icmpv6.c

@@ -50,7 +50,7 @@
 #include "packet-dns.h"
 #include <epan/in_cksum.h>
 #include <epan/addr_resolv.h>
-#include "ipproto.h"
+#include <epan/ipproto.h>
 
 #ifndef offsetof
 #define	offsetof(type, member)	((size_t)(&((type *)0)->member))

epan/dissectors/packet-igmp.c

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

epan/dissectors/packet-igrp.c

@@ -36,7 +36,7 @@
 #include <string.h>
 #include <glib.h>
 #include <epan/packet.h>
-#include "ipproto.h"
+#include <epan/ipproto.h>
 
 #define IGRP_HEADER_LENGTH 12
 #define IGRP_ENTRY_LENGTH 14

epan/dissectors/packet-ip.c

@@ -36,7 +36,7 @@
 
 #include <epan/packet.h>
 #include <epan/addr_resolv.h>
-#include "ipproto.h"
+#include <epan/ipproto.h>
 #include "ip_opts.h"
 #include <epan/prefs.h>
 #include "reassemble.h"

epan/dissectors/packet-ipdc.c

@@ -45,7 +45,7 @@
 #include "packet-ipdc.h"
 #include "packet-tcp.h"
 #include <epan/packet.h>
-#include "ipproto.h"
+#include <epan/ipproto.h>
 #include <epan/prefs.h>
 
 static int proto_ipdc = -1;

epan/dissectors/packet-ipsec.c

@@ -33,7 +33,7 @@
 #include <epan/packet.h>
 #include "packet-ipsec.h"
 #include <epan/addr_resolv.h>
-#include "ipproto.h"
+#include <epan/ipproto.h>
 #include <epan/prefs.h>
 
 /* Place AH payload in sub tree */

epan/dissectors/packet-ipv6.c

@@ -38,7 +38,7 @@
 #include <epan/addr_resolv.h>
 #include <epan/prefs.h>
 #include "reassemble.h"
-#include "ipproto.h"
+#include <epan/ipproto.h>
 #include "etypes.h"
 #include "ppptypes.h"
 #include "aftypes.h"

epan/dissectors/packet-ipvs-syncd.c

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

epan/dissectors/packet-isakmp.c

@@ -40,7 +40,7 @@
 
 #include <epan/packet.h>
 #include <epan/ipv6-utils.h>
-#include "ipproto.h"
+#include <epan/ipproto.h>
 #include <epan/dissectors/packet-x509if.h>
 
 #define isakmp_min(a, b)  ((a<b) ? a : b)

epan/dissectors/packet-ldp.c

@@ -40,7 +40,7 @@
 #include <epan/packet.h>
 #include <epan/addr_resolv.h>
 #include <epan/prefs.h>
-#include "afn.h"
+#include <epan/afn.h>
 
 #include "packet-frame.h"
 #include "packet-diffserv-mpls-common.h"

epan/dissectors/packet-lmp.c

@@ -53,7 +53,7 @@
 #include <prefs.h>
 #include <epan/in_cksum.h>
 #include "etypes.h"
-#include "ipproto.h"
+#include <epan/ipproto.h>
 
 #include "packet-ip.h"
 #include "packet-rsvp.h"

epan/dissectors/packet-mip6.c

@@ -30,7 +30,7 @@
 
 #include <epan/packet.h>
 
-#include "ipproto.h"
+#include <epan/ipproto.h>
 #include "ip_opts.h"
 #include "packet-mip6.h"
 

epan/dissectors/packet-ospf.c

@@ -44,7 +44,7 @@
 
 #include <glib.h>
 #include <epan/packet.h>
-#include "ipproto.h"
+#include <epan/ipproto.h>
 #include <epan/in_cksum.h>
 #include "packet-rsvp.h"
 

epan/dissectors/packet-pgm.c

@@ -34,8 +34,8 @@
 #include <time.h>
 #include <string.h>
 #include <epan/packet.h>
-#include "afn.h"
-#include "ipproto.h"
+#include <epan/afn.h>
+#include <epan/ipproto.h>
 #include <epan/in_cksum.h>
 #include <epan/addr_resolv.h>
 #include <epan/strutil.h>

epan/dissectors/packet-pim.c

@@ -36,8 +36,8 @@
 #endif
 
 #include <epan/packet.h>
-#include "ipproto.h"
-#include "afn.h"
+#include <epan/ipproto.h>
+#include <epan/afn.h>
 #include "packet-ipv6.h"
 #include <epan/in_cksum.h>
 

epan/dissectors/packet-portmap.c

@@ -32,7 +32,7 @@
 
 #include "packet-rpc.h"
 #include "packet-portmap.h"
-#include "ipproto.h"
+#include <epan/ipproto.h>
 #include "epan/conversation.h"
 #include "epan/packet_info.h"
 

epan/dissectors/packet-rsvp.c

@@ -71,7 +71,7 @@
 #include <prefs.h>
 #include <epan/in_cksum.h>
 #include "etypes.h"
-#include "ipproto.h"
+#include <epan/ipproto.h>
 
 #include "packet-rsvp.h"
 #include "packet-ip.h"

epan/dissectors/packet-sctp.c

@@ -49,7 +49,7 @@
 #include <epan/prefs.h>
 #include <epan/packet.h>
 #include <epan/tap.h>
-#include "ipproto.h"
+#include <epan/ipproto.h>
 #include "packet-sctp.h"
 #include "sctpppids.h"
 

epan/dissectors/packet-t38.c

@@ -55,7 +55,7 @@
 #include <string.h>
 
 #include <epan/prefs.h>
-#include "ipproto.h"
+#include <epan/ipproto.h>
 #include "packet-per.h"
 #include <epan/prefs.h>
 #include "packet-tpkt.h"

epan/dissectors/packet-tcp.c

@@ -33,7 +33,7 @@
 
 #include <epan/packet.h>
 #include <epan/addr_resolv.h>
-#include "ipproto.h"
+#include <epan/ipproto.h>
 #include "ip_opts.h"
 #include "follow.h"
 #include <epan/prefs.h>

epan/dissectors/packet-teredo.c

@@ -38,7 +38,7 @@
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/addr_resolv.h>
-#include "ipproto.h"
+#include <epan/ipproto.h>
 #include <epan/prefs.h>
 
 #include "packet-ip.h"

epan/dissectors/packet-udp.c

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

epan/dissectors/packet-vines.c

@@ -35,7 +35,7 @@
 #include "packet-vines.h"
 #include "etypes.h"
 #include "ppptypes.h"
-#include "ipproto.h"
+#include <epan/ipproto.h>
 #include "arcnet_pids.h"
 #include "llcsaps.h"
 

epan/dissectors/packet-vj.c

@@ -69,7 +69,7 @@
 #include <epan/prefs.h>
 #include "packet-ppp.h"
 #include "ppptypes.h"
-#include "ipproto.h"
+#include <epan/ipproto.h>
 #include <epan/in_cksum.h>
 
 /* Define relevant IP/TCP parameters */

epan/dissectors/packet-vrrp.c

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

epan/ipproto.c

@@ -32,7 +32,7 @@
 
 #include <glib.h>
 
-#include "ipproto.h"
+#include <epan/ipproto.h>
 #include <epan/packet.h>
 #include <epan/addr_resolv.h>
 #include <epan/dissectors/packet-ip.h>

epan/t35.c

@@ -23,7 +23,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-#include "t35.h"
+#include <epan/t35.h>
 
 /* Recommendation T.35 (02/2000) */
 /* Annex to ITU Operational Bulletin No. 766 - 15.VI.2002 */

gtk/decode_as_dcerpc.c

@@ -33,7 +33,7 @@
 #include "globals.h"
 #include "simple_dialog.h"
 #include <epan/packet.h>
-#include "ipproto.h"
+#include <epan/ipproto.h>
 #include "ui_util.h"
 #include <epan/epan_dissect.h>
 #include "compat_macros.h"

gtk/decode_as_dlg.c

@@ -34,7 +34,7 @@
 #include "globals.h"
 #include "simple_dialog.h"
 #include <epan/packet.h>
-#include "ipproto.h"
+#include <epan/ipproto.h>
 #include "ui_util.h"
 #include <epan/epan_dissect.h>
 #include "compat_macros.h"

gtk/follow_dlg.c

@@ -62,7 +62,7 @@
 #include <epan/epan_dissect.h>
 #include <epan/filesystem.h>
 #include "compat_macros.h"
-#include "ipproto.h"
+#include <epan/ipproto.h>
 #include "tap_menu.h"
 #include "print_mswin.h"
 #include "font_utils.h"

gtk/menu.c

@@ -38,6 +38,7 @@
 #include <epan/prefs.h>
 #include <epan/tap.h>
 #include <epan/timestamp.h>
+#include <epan/ipproto.h>
 
 #include "about_dlg.h"
 #include "capture_dlg.h"
@@ -65,7 +66,6 @@
 #include "gtkglobals.h"
 #include "register.h"
 #include "../menu.h"
-#include "../ipproto.h"
 #include "packet_list.h"
 #include "ethclist.h"
 #include "recent.h"

gtk/tcp_graph.c

@@ -33,7 +33,7 @@
 #include <math.h>		/* rint() */
 #include <string.h>
 
-#include "ipproto.h"
+#include <epan/ipproto.h>
 #include "globals.h" 		/* cfile */
 #include <epan/packet.h>	/* frame_data */
 #include "gtkglobals.h"		/* packet_list */

plugins/asn1/packet-asn1.c

@@ -92,7 +92,7 @@
 #include <gtk/gtk.h>
 #endif
 
-#include <ipproto.h>
+#include <epan/ipproto.h>
 
 /* Define version if we are not building ethereal statically */