aboutsummaryrefslogtreecommitdiffstats
path: root/epan
diff options
context:
space:
mode:
Diffstat (limited to 'epan')
-rw-r--r--epan/Makefile.common19
-rw-r--r--epan/aftypes.h34
-rw-r--r--epan/arcnet_pids.h57
-rw-r--r--epan/bridged_pids.h50
-rw-r--r--epan/chdlctypes.h32
-rw-r--r--epan/dissectors/packet-3com-xns.c2
-rw-r--r--epan/dissectors/packet-aarp.c2
-rw-r--r--epan/dissectors/packet-ap1394.c2
-rw-r--r--epan/dissectors/packet-arcnet.c2
-rw-r--r--epan/dissectors/packet-arp.c4
-rw-r--r--epan/dissectors/packet-asap.c2
-rw-r--r--epan/dissectors/packet-atalk.c8
-rw-r--r--epan/dissectors/packet-atm.c2
-rw-r--r--epan/dissectors/packet-bacnet.c2
-rw-r--r--epan/dissectors/packet-bpdu.c6
-rw-r--r--epan/dissectors/packet-brdwlk.c2
-rw-r--r--epan/dissectors/packet-cdp.c4
-rw-r--r--epan/dissectors/packet-chdlc.c6
-rw-r--r--epan/dissectors/packet-cisco-oui.c2
-rw-r--r--epan/dissectors/packet-cisco-wireless.c4
-rw-r--r--epan/dissectors/packet-clnp.c2
-rw-r--r--epan/dissectors/packet-cops.c2
-rw-r--r--epan/dissectors/packet-dec-bpdu.c4
-rw-r--r--epan/dissectors/packet-dec-dnart.c4
-rw-r--r--epan/dissectors/packet-dua.c2
-rw-r--r--epan/dissectors/packet-eap.c2
-rw-r--r--epan/dissectors/packet-eapol.c2
-rw-r--r--epan/dissectors/packet-enc.c2
-rw-r--r--epan/dissectors/packet-enrp.c2
-rw-r--r--epan/dissectors/packet-esis.c2
-rw-r--r--epan/dissectors/packet-eth.c2
-rw-r--r--epan/dissectors/packet-ethertype.c4
-rw-r--r--epan/dissectors/packet-extreme.c2
-rw-r--r--epan/dissectors/packet-fc.c2
-rw-r--r--epan/dissectors/packet-fcct.c2
-rw-r--r--epan/dissectors/packet-fcdns.c2
-rw-r--r--epan/dissectors/packet-fcels.c2
-rw-r--r--epan/dissectors/packet-fcfcs.c2
-rw-r--r--epan/dissectors/packet-fcfzs.c2
-rw-r--r--epan/dissectors/packet-fclctl.c2
-rw-r--r--epan/dissectors/packet-fcp.c2
-rw-r--r--epan/dissectors/packet-fcsb3.c2
-rw-r--r--epan/dissectors/packet-fcsp.c2
-rw-r--r--epan/dissectors/packet-fcswils.c2
-rw-r--r--epan/dissectors/packet-fr.c8
-rw-r--r--epan/dissectors/packet-fw1.c2
-rw-r--r--epan/dissectors/packet-g723.c2
-rw-r--r--epan/dissectors/packet-gmrp.c2
-rw-r--r--epan/dissectors/packet-gre.c6
-rw-r--r--epan/dissectors/packet-gvrp.c2
-rw-r--r--epan/dissectors/packet-h248.c2
-rw-r--r--epan/dissectors/packet-h261.c2
-rw-r--r--epan/dissectors/packet-h263.c4
-rw-r--r--epan/dissectors/packet-hpext.c4
-rw-r--r--epan/dissectors/packet-hpsw.c2
-rw-r--r--epan/dissectors/packet-iapp.c2
-rw-r--r--epan/dissectors/packet-iax2.c2
-rw-r--r--epan/dissectors/packet-idp.c2
-rw-r--r--epan/dissectors/packet-ieee80211.c2
-rw-r--r--epan/dissectors/packet-ieee802a.c4
-rw-r--r--epan/dissectors/packet-ip.c16
-rw-r--r--epan/dissectors/packet-ipfc.c2
-rw-r--r--epan/dissectors/packet-ipv6.c12
-rw-r--r--epan/dissectors/packet-ipx.c10
-rw-r--r--epan/dissectors/packet-isis-clv.c2
-rw-r--r--epan/dissectors/packet-isis.c2
-rw-r--r--epan/dissectors/packet-isl.c2
-rw-r--r--epan/dissectors/packet-ismp.c2
-rw-r--r--epan/dissectors/packet-isup.c2
-rw-r--r--epan/dissectors/packet-iua.c2
-rw-r--r--epan/dissectors/packet-juniper.c6
-rw-r--r--epan/dissectors/packet-lapbether.c2
-rw-r--r--epan/dissectors/packet-lapd.c2
-rw-r--r--epan/dissectors/packet-llc.c12
-rw-r--r--epan/dissectors/packet-lldp.c4
-rw-r--r--epan/dissectors/packet-lmi.c2
-rw-r--r--epan/dissectors/packet-lmp.c2
-rw-r--r--epan/dissectors/packet-loop.c2
-rw-r--r--epan/dissectors/packet-m2pa.c2
-rw-r--r--epan/dissectors/packet-m2tp.c2
-rw-r--r--epan/dissectors/packet-m2ua.c2
-rw-r--r--epan/dissectors/packet-m3ua.c2
-rw-r--r--epan/dissectors/packet-maccontrol.c2
-rw-r--r--epan/dissectors/packet-mip6.c2
-rw-r--r--epan/dissectors/packet-mpeg1.c2
-rw-r--r--epan/dissectors/packet-mpls.c4
-rw-r--r--epan/dissectors/packet-ndmp.c2
-rw-r--r--epan/dissectors/packet-netbios.c2
-rw-r--r--epan/dissectors/packet-nt-oui.c2
-rw-r--r--epan/dissectors/packet-nt-sonmp.c2
-rw-r--r--epan/dissectors/packet-null.c4
-rw-r--r--epan/dissectors/packet-osi-options.c2
-rw-r--r--epan/dissectors/packet-osi.c10
-rw-r--r--epan/dissectors/packet-pagp.c6
-rw-r--r--epan/dissectors/packet-pflog.c2
-rw-r--r--epan/dissectors/packet-ppp.c8
-rw-r--r--epan/dissectors/packet-pppoe.c2
-rw-r--r--epan/dissectors/packet-q2931.c6
-rw-r--r--epan/dissectors/packet-q931.c4
-rw-r--r--epan/dissectors/packet-q933.c2
-rw-r--r--epan/dissectors/packet-redback.c2
-rw-r--r--epan/dissectors/packet-retix-bpdu.c6
-rw-r--r--epan/dissectors/packet-rmp.c2
-rw-r--r--epan/dissectors/packet-rpc.c2
-rw-r--r--epan/dissectors/packet-rpl.c2
-rw-r--r--epan/dissectors/packet-rsvp.c2
-rw-r--r--epan/dissectors/packet-rtp.c2
-rw-r--r--epan/dissectors/packet-sctp.c2
-rw-r--r--epan/dissectors/packet-sdp.c2
-rw-r--r--epan/dissectors/packet-sll.c2
-rw-r--r--epan/dissectors/packet-slowprotocols.c6
-rw-r--r--epan/dissectors/packet-smb-browse.c2
-rw-r--r--epan/dissectors/packet-smb-mailslot.c2
-rw-r--r--epan/dissectors/packet-smb-pipe.c2
-rw-r--r--epan/dissectors/packet-smb-sidsnooping.c2
-rw-r--r--epan/dissectors/packet-smb.c2
-rw-r--r--epan/dissectors/packet-sna.c4
-rw-r--r--epan/dissectors/packet-snaeth.c2
-rw-r--r--epan/dissectors/packet-snmp.c4
-rw-r--r--epan/dissectors/packet-sua.c2
-rw-r--r--epan/dissectors/packet-symantec.c2
-rw-r--r--epan/dissectors/packet-tcp.c2
-rw-r--r--epan/dissectors/packet-teimanagement.c2
-rw-r--r--epan/dissectors/packet-vines.c8
-rw-r--r--epan/dissectors/packet-vj.c2
-rw-r--r--epan/dissectors/packet-vlan.c2
-rw-r--r--epan/dissectors/packet-wcp.c4
-rw-r--r--epan/dissectors/packet-wfleet-hdlc.c2
-rw-r--r--epan/dissectors/packet-windows-common.c2
-rw-r--r--epan/dissectors/packet-x25.c6
-rw-r--r--epan/dissectors/packet-x29.c2
-rw-r--r--epan/etypes.h295
-rw-r--r--epan/format-oid.h32
-rw-r--r--epan/greproto.h34
-rw-r--r--epan/iax2_codec_type.h77
-rw-r--r--epan/ip_opts.h59
-rw-r--r--epan/lapd_sapi.h33
-rw-r--r--epan/llcsaps.h63
-rw-r--r--epan/nlpid.h60
-rw-r--r--epan/oui.h48
-rw-r--r--epan/ppptypes.h158
-rw-r--r--epan/rpc_defrag.h43
-rw-r--r--epan/rtp_pt.h68
-rw-r--r--epan/sctpppids.h47
-rw-r--r--epan/smb.h286
-rw-r--r--epan/x264_prt_id.h35
146 files changed, 1727 insertions, 197 deletions
diff --git a/epan/Makefile.common b/epan/Makefile.common
index 670bc3b668..d985485cca 100644
--- a/epan/Makefile.common
+++ b/epan/Makefile.common
@@ -92,12 +92,16 @@ LIBETHEREAL_INCLUDES = \
address.h \
adler32.h \
afn.h \
+ aftypes.h \
+ arcnet_pids.h \
arptypes.h \
asn1.h \
atalk-utils.h \
base64.h \
bitswap.h \
+ bridged_pids.h \
charsets.h \
+ chdlctypes.h \
circuit.h \
column.h \
column_info.h \
@@ -115,24 +119,34 @@ LIBETHEREAL_INCLUDES = \
emem.h \
epan.h \
epan_dissect.h \
+ etypes.h \
except.h \
exceptions.h \
expert.h \
filesystem.h \
follow.h \
+ format-oid.h \
frame_data.h \
gnuc_format_check.h \
+ greproto.h \
h225-persistentdata.h \
+ iax2_codec_type.h \
in_cksum.h \
+ ip_opts.h \
ipproto.h \
ipv4.h \
ipv6-utils.h \
+ lapd_sapi.h \
+ llcsaps.h \
+ nlpid.h \
nstime.h \
osi-utils.h \
+ oui.h \
packet.h \
packet_info.h \
pint.h \
plugins.h \
+ ppptypes.h \
prefs.h \
prefs-int.h \
proto.h \
@@ -141,10 +155,14 @@ LIBETHEREAL_INCLUDES = \
reassemble.h \
report_err.h \
req_resp_hdrs.h \
+ rpc_defrag.h \
+ rtp_pt.h \
+ sctpppids.h \
sha1.h \
sigcomp_state_hdlr.h \
sigcomp-udvm.h \
slab.h \
+ smb.h \
sminmpec.h \
sna-utils.h \
stat_cmd_args.h \
@@ -158,6 +176,7 @@ LIBETHEREAL_INCLUDES = \
tvbparse.h \
tvbuff.h \
value_string.h \
+ x264_prt_id.h \
xdlc.h \
xmlstub.h
diff --git a/epan/aftypes.h b/epan/aftypes.h
new file mode 100644
index 0000000000..d49cb10d59
--- /dev/null
+++ b/epan/aftypes.h
@@ -0,0 +1,34 @@
+/* aftypes.h
+ * AF_ values on various flavors of BSD
+ *
+ * $Id$
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@ethereal.com>
+ *
+ * This file created and by Mike Hall <mlh@io.com>
+ * Copyright 1998
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+/* BSD AF_ values. */
+#define BSD_AF_INET 2
+#define BSD_AF_ISO 7
+#define BSD_AF_APPLETALK 16
+#define BSD_AF_IPX 23
+#define BSD_AF_INET6_BSD 24 /* OpenBSD (and probably NetBSD), BSD/OS */
+#define BSD_AF_INET6_FREEBSD 28
+#define BSD_AF_INET6_DARWIN 30
diff --git a/epan/arcnet_pids.h b/epan/arcnet_pids.h
new file mode 100644
index 0000000000..59b815f29d
--- /dev/null
+++ b/epan/arcnet_pids.h
@@ -0,0 +1,57 @@
+/* arcnet_pids.h
+ * ARCNET protocol ID values
+ * Copyright 2001-2002, Peter Fales <ethereal@fales-lorenz.net>
+ *
+ * $Id$
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@ethereal.com>
+ * Copyright 1998 Gerald Combs
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+/* RFC 1051 */
+#define ARCNET_PROTO_IP_1051 240
+#define ARCNET_PROTO_ARP_1051 241
+
+/* RFC 1201 */
+#define ARCNET_PROTO_IP_1201 212
+#define ARCNET_PROTO_ARP_1201 213
+#define ARCNET_PROTO_RARP_1201 214
+
+#define ARCNET_PROTO_IPX 250
+#define ARCNET_PROTO_NOVELL_EC 236
+
+#define ARCNET_PROTO_IPv6 196 /* or so BSD's arcnet.h claims */
+
+/*
+ * Raw Ethernet over ARCNET - Linux's "if_arcnet.h" calls this
+ * "MS LanMan/WfWg 'NDIS' encapsuation".
+ */
+#define ARCNET_PROTO_ETHERNET 232
+
+#define ARCNET_PROTO_DATAPOINT_BOOT 0
+#define ARCNET_PROTO_DATAPOINT_MOUNT 1
+#define ARCNET_PROTO_POWERLAN_BEACON 8
+#define ARCNET_PROTO_POWERLAN_BEACON2 243
+#define ARCNET_PROTO_LANSOFT 251
+
+#define ARCNET_PROTO_APPLETALK 221
+#define ARCNET_PROTO_BANYAN 247 /* Banyan VINES */
+
+#define ARCNET_PROTO_DIAGNOSE 128 /* as per ANSI/ATA 878.1 */
+
+#define ARCNET_PROTO_BACNET 205
diff --git a/epan/bridged_pids.h b/epan/bridged_pids.h
new file mode 100644
index 0000000000..27e11bff0b
--- /dev/null
+++ b/epan/bridged_pids.h
@@ -0,0 +1,50 @@
+/* bridged_pids.h
+ * Definitions of protocol IDs for the 00-80-C2 OUI, used for
+ * bridging various networks over ATM (RFC 2684) or Frame Relay (RFC 2427).
+ *
+ * $Id$
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@ethereal.com>
+ * Copyright 1998 - 2000 Gerald Combs
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __BRIDGED_PID_H__
+#define __BRIDGED_PID_H__
+
+#define BPID_ETH_WITH_FCS 0x0001 /* 802.3/Ethernet with preserved FCS */
+#define BPID_ETH_WITHOUT_FCS 0x0007 /* 802.3/Ethernet without preserved FCS */
+
+#define BPID_802_4_WITH_FCS 0x0002 /* 802.4 with preserved FCS */
+#define BPID_802_4_WITHOUT_FCS 0x0008 /* 802.4 without preserved FCS */
+
+#define BPID_802_5_WITH_FCS 0x0003 /* 802.5 with preserved FCS */
+#define BPID_802_5_WITHOUT_FCS 0x0009 /* 802.5 without preserved FCS */
+
+#define BPID_FDDI_WITH_FCS 0x0004 /* FDDI with preserved FCS */
+#define BPID_FDDI_WITHOUT_FCS 0x000A /* FDDI without preserved FCS */
+
+#define BPID_802_6_WITH_FCS 0x0005 /* 802.6 with preserved FCS */
+#define BPID_802_6_WITHOUT_FCS 0x000B /* 802.6 without preserved FCS */
+
+#define BPID_FRAGMENTS 0x000D
+
+#define BPID_BPDU 0x000E /* 802.1(d) or 802.1(g) BPDUs */
+
+#define BPID_SR_BPDU 0x000F /* Source Routing BPDUs */
+
+#endif
diff --git a/epan/chdlctypes.h b/epan/chdlctypes.h
new file mode 100644
index 0000000000..4237cfe4ca
--- /dev/null
+++ b/epan/chdlctypes.h
@@ -0,0 +1,32 @@
+/* chdlctypes.h
+ * Defines Cisco HDLC packet types that aren't just Ethernet types
+ *
+ * $Id$
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@ethereal.com>
+ * Copyright 1998 Gerald Combs
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __CHDLCTYPES_H__
+#define __CHDLCTYPES_H__
+
+#define CHDLCTYPE_FRARP 0x0808 /* Frame Relay ARP */
+#define CHDLCTYPE_BPDU 0x4242 /* IEEE spanning tree protocol */
+#define CHDLCTYPE_OSI 0xfefe /* ISO network-layer protocols */
+
+#endif /* chdlctypes.h */
diff --git a/epan/dissectors/packet-3com-xns.c b/epan/dissectors/packet-3com-xns.c
index c604c55f85..cbbe699d56 100644
--- a/epan/dissectors/packet-3com-xns.c
+++ b/epan/dissectors/packet-3com-xns.c
@@ -29,7 +29,7 @@
#include <glib.h>
#include <epan/packet.h>
-#include "etypes.h"
+#include <epan/etypes.h>
static int proto_3com_xns = -1;
diff --git a/epan/dissectors/packet-aarp.c b/epan/dissectors/packet-aarp.c
index 01ecf3185f..22f080bb24 100644
--- a/epan/dissectors/packet-aarp.c
+++ b/epan/dissectors/packet-aarp.c
@@ -33,7 +33,7 @@
#include <epan/packet.h>
#include <epan/strutil.h>
#include <epan/emem.h>
-#include "etypes.h"
+#include <epan/etypes.h>
static int proto_aarp = -1;
static int hf_aarp_hard_type = -1;
diff --git a/epan/dissectors/packet-ap1394.c b/epan/dissectors/packet-ap1394.c
index c7b130203e..98866ef628 100644
--- a/epan/dissectors/packet-ap1394.c
+++ b/epan/dissectors/packet-ap1394.c
@@ -32,7 +32,7 @@
#include <epan/strutil.h>
#include "packet-ap1394.h"
-#include "etypes.h"
+#include <epan/etypes.h>
static int proto_ap1394 = -1;
static int hf_ap1394_dst = -1;
diff --git a/epan/dissectors/packet-arcnet.c b/epan/dissectors/packet-arcnet.c
index 9fe970b3e0..e030e755a3 100644
--- a/epan/dissectors/packet-arcnet.c
+++ b/epan/dissectors/packet-arcnet.c
@@ -35,7 +35,7 @@
#include <epan/packet.h>
#include "packet-arcnet.h"
-#include "arcnet_pids.h"
+#include <epan/arcnet_pids.h>
#include "packet-ip.h"
/* Initialize the protocol and registered fields */
diff --git a/epan/dissectors/packet-arp.c b/epan/dissectors/packet-arp.c
index 79eb542469..949f57cb79 100644
--- a/epan/dissectors/packet-arp.c
+++ b/epan/dissectors/packet-arp.c
@@ -34,8 +34,8 @@
#include <epan/addr_resolv.h>
#include <epan/emem.h>
#include "packet-arp.h"
-#include "etypes.h"
-#include "arcnet_pids.h"
+#include <epan/etypes.h>
+#include <epan/arcnet_pids.h>
static int proto_arp = -1;
static int hf_arp_hard_type = -1;
diff --git a/epan/dissectors/packet-asap.c b/epan/dissectors/packet-asap.c
index 7268caff99..8d3ff3b49f 100644
--- a/epan/dissectors/packet-asap.c
+++ b/epan/dissectors/packet-asap.c
@@ -41,7 +41,7 @@
#endif
#include <epan/packet.h>
-#include "sctpppids.h"
+#include <epan/sctpppids.h>
/* Initialize the protocol and registered fields */
static int proto_asap = -1;
diff --git a/epan/dissectors/packet-atalk.c b/epan/dissectors/packet-atalk.c
index 721357bf40..f2057e1281 100644
--- a/epan/dissectors/packet-atalk.c
+++ b/epan/dissectors/packet-atalk.c
@@ -33,10 +33,10 @@
#include <epan/packet.h>
#include <string.h>
-#include "etypes.h"
-#include "ppptypes.h"
-#include "aftypes.h"
-#include "arcnet_pids.h"
+#include <epan/etypes.h>
+#include <epan/ppptypes.h>
+#include <epan/aftypes.h>
+#include <epan/arcnet_pids.h>
#include <epan/atalk-utils.h>
#include <epan/conversation.h>
diff --git a/epan/dissectors/packet-atm.c b/epan/dissectors/packet-atm.c
index d73cb95a3b..0cf1c96728 100644
--- a/epan/dissectors/packet-atm.c
+++ b/epan/dissectors/packet-atm.c
@@ -29,7 +29,7 @@
#include <stdio.h>
#include <glib.h>
#include <epan/packet.h>
-#include "oui.h"
+#include <epan/oui.h>
#include <epan/addr_resolv.h>
#include "packet-atm.h"
diff --git a/epan/dissectors/packet-bacnet.c b/epan/dissectors/packet-bacnet.c
index 111faace52..47ae6cc767 100644
--- a/epan/dissectors/packet-bacnet.c
+++ b/epan/dissectors/packet-bacnet.c
@@ -38,7 +38,7 @@
#include <epan/packet.h>
-#include "llcsaps.h"
+#include <epan/llcsaps.h>
static dissector_handle_t bacapp_handle;
static dissector_handle_t data_handle;
diff --git a/epan/dissectors/packet-bpdu.c b/epan/dissectors/packet-bpdu.c
index a0d097a64b..676c4f5f6b 100644
--- a/epan/dissectors/packet-bpdu.c
+++ b/epan/dissectors/packet-bpdu.c
@@ -32,9 +32,9 @@
#include <string.h>
#include <glib.h>
#include <epan/packet.h>
-#include "llcsaps.h"
-#include "ppptypes.h"
-#include "chdlctypes.h"
+#include <epan/llcsaps.h>
+#include <epan/ppptypes.h>
+#include <epan/chdlctypes.h>
#include <epan/addr_resolv.h>
/* Offsets of fields within a BPDU */
diff --git a/epan/dissectors/packet-brdwlk.c b/epan/dissectors/packet-brdwlk.c
index 10545e8e53..2d90f9b5ed 100644
--- a/epan/dissectors/packet-brdwlk.c
+++ b/epan/dissectors/packet-brdwlk.c
@@ -42,7 +42,7 @@
#include <glib.h>
#include <epan/packet.h>
-#include "etypes.h"
+#include <epan/etypes.h>
#define BRDWLK_MAX_PACKET_CNT 0xFFFF
#define BRDWLK_TRUNCATED_BIT 0x8
diff --git a/epan/dissectors/packet-cdp.c b/epan/dissectors/packet-cdp.c
index a24e485058..91de552986 100644
--- a/epan/dissectors/packet-cdp.c
+++ b/epan/dissectors/packet-cdp.c
@@ -32,8 +32,8 @@
#include <epan/packet.h>
#include <epan/strutil.h>
-#include "oui.h"
-#include "nlpid.h"
+#include <epan/oui.h>
+#include <epan/nlpid.h>
/*
diff --git a/epan/dissectors/packet-chdlc.c b/epan/dissectors/packet-chdlc.c
index c000e0310e..8067feef35 100644
--- a/epan/dissectors/packet-chdlc.c
+++ b/epan/dissectors/packet-chdlc.c
@@ -28,10 +28,10 @@
#include <glib.h>
#include <epan/packet.h>
-#include "etypes.h"
+#include <epan/etypes.h>
#include <epan/prefs.h>
-#include "chdlctypes.h"
-#include "nlpid.h"
+#include <epan/chdlctypes.h>
+#include <epan/nlpid.h>
#include <epan/addr_resolv.h>
#include "packet-chdlc.h"
#include "packet-ppp.h"
diff --git a/epan/dissectors/packet-cisco-oui.c b/epan/dissectors/packet-cisco-oui.c
index 505f3ebbdb..276e160e20 100644
--- a/epan/dissectors/packet-cisco-oui.c
+++ b/epan/dissectors/packet-cisco-oui.c
@@ -26,7 +26,7 @@
#include <epan/packet.h>
#include "packet-llc.h"
-#include "oui.h"
+#include <epan/oui.h>
static int hf_llc_cisco_pid = -1;
diff --git a/epan/dissectors/packet-cisco-wireless.c b/epan/dissectors/packet-cisco-wireless.c
index a33e7efbdf..08d0ee64f9 100644
--- a/epan/dissectors/packet-cisco-wireless.c
+++ b/epan/dissectors/packet-cisco-wireless.c
@@ -73,8 +73,8 @@
#include <epan/packet.h>
#include <epan/strutil.h>
#include "packet-llc.h"
-#include "oui.h"
-#include "etypes.h"
+#include <epan/oui.h>
+#include <epan/etypes.h>
static int hf_llc_ciscowl_pid = -1;
diff --git a/epan/dissectors/packet-clnp.c b/epan/dissectors/packet-clnp.c
index f717a08dd2..974e832395 100644
--- a/epan/dissectors/packet-clnp.c
+++ b/epan/dissectors/packet-clnp.c
@@ -39,7 +39,7 @@
#include "packet-osi-options.h"
#include "packet-isis.h"
#include "packet-esis.h"
-#include "nlpid.h"
+#include <epan/nlpid.h>
#include <epan/ipproto.h>
#include <epan/expert.h>
diff --git a/epan/dissectors/packet-cops.c b/epan/dissectors/packet-cops.c
index ad115dd402..ea6e9cdedd 100644
--- a/epan/dissectors/packet-cops.c
+++ b/epan/dissectors/packet-cops.c
@@ -85,7 +85,7 @@
#endif /* HAVE_SOME_SNMP */
#include <epan/asn1.h>
-#include "format-oid.h"
+#include <epan/format-oid.h>
#include <epan/prefs.h>
#include <epan/emem.h>
diff --git a/epan/dissectors/packet-dec-bpdu.c b/epan/dissectors/packet-dec-bpdu.c
index 93dc6db819..f0347f4acc 100644
--- a/epan/dissectors/packet-dec-bpdu.c
+++ b/epan/dissectors/packet-dec-bpdu.c
@@ -33,8 +33,8 @@
#include <glib.h>
#include <epan/packet.h>
#include <epan/addr_resolv.h>
-#include "etypes.h"
-#include "ppptypes.h"
+#include <epan/etypes.h>
+#include <epan/ppptypes.h>
/* Offsets of fields within a BPDU */
diff --git a/epan/dissectors/packet-dec-dnart.c b/epan/dissectors/packet-dec-dnart.c
index 03fc21aac0..752f8bb3da 100644
--- a/epan/dissectors/packet-dec-dnart.c
+++ b/epan/dissectors/packet-dec-dnart.c
@@ -54,8 +54,8 @@
#include <epan/packet.h>
#include <epan/proto.h>
#include <epan/dissectors/packet-tcp.h>
-#include "etypes.h"
-#include "ppptypes.h"
+#include <epan/etypes.h>
+#include <epan/ppptypes.h>
typedef enum {
RT_CTL_INITIALIZATION,
diff --git a/epan/dissectors/packet-dua.c b/epan/dissectors/packet-dua.c
index 1337b2290a..89dd1b9992 100644
--- a/epan/dissectors/packet-dua.c
+++ b/epan/dissectors/packet-dua.c
@@ -38,7 +38,7 @@
#include <epan/packet.h>
#include <epan/prefs.h>
-#include "sctpppids.h"
+#include <epan/sctpppids.h>
#define NETWORK_BYTE_ORDER FALSE
diff --git a/epan/dissectors/packet-eap.c b/epan/dissectors/packet-eap.c
index defbf2573a..f82a093804 100644
--- a/epan/dissectors/packet-eap.c
+++ b/epan/dissectors/packet-eap.c
@@ -30,7 +30,7 @@
#include <glib.h>
#include <epan/packet.h>
#include <epan/conversation.h>
-#include "ppptypes.h"
+#include <epan/ppptypes.h>
#include <epan/reassemble.h>
#include <epan/emem.h>
diff --git a/epan/dissectors/packet-eapol.c b/epan/dissectors/packet-eapol.c
index f98827415b..d772c64784 100644
--- a/epan/dissectors/packet-eapol.c
+++ b/epan/dissectors/packet-eapol.c
@@ -31,7 +31,7 @@
#include <glib.h>
#include <epan/packet.h>
#include "packet-ieee80211.h"
-#include "etypes.h"
+#include <epan/etypes.h>
static int proto_eapol = -1;
static int hf_eapol_version = -1;
diff --git a/epan/dissectors/packet-enc.c b/epan/dissectors/packet-enc.c
index 4804eb3f3a..701e2294e9 100644
--- a/epan/dissectors/packet-enc.c
+++ b/epan/dissectors/packet-enc.c
@@ -30,7 +30,7 @@
#include <string.h>
#include <glib.h>
#include <epan/packet.h>
-#include "etypes.h"
+#include <epan/etypes.h>
#include <epan/addr_resolv.h>
#include "packet-ip.h"
#include "packet-ipv6.h"
diff --git a/epan/dissectors/packet-enrp.c b/epan/dissectors/packet-enrp.c
index 5e289cbc2b..a5af8602fe 100644
--- a/epan/dissectors/packet-enrp.c
+++ b/epan/dissectors/packet-enrp.c
@@ -41,7 +41,7 @@
#endif
#include <epan/packet.h>
-#include "sctpppids.h"
+#include <epan/sctpppids.h>
/* Initialize the protocol and registered fields */
static int proto_enrp = -1;
diff --git a/epan/dissectors/packet-esis.c b/epan/dissectors/packet-esis.c
index 793e86bcfb..b4f4c15d63 100644
--- a/epan/dissectors/packet-esis.c
+++ b/epan/dissectors/packet-esis.c
@@ -32,7 +32,7 @@
#include <string.h>
#include <glib.h>
#include <epan/packet.h>
-#include "nlpid.h"
+#include <epan/nlpid.h>
#include "packet-osi.h"
#include "packet-osi-options.h"
#include "packet-esis.h"
diff --git a/epan/dissectors/packet-eth.c b/epan/dissectors/packet-eth.c
index a50f3e89a9..06bbd86b6f 100644
--- a/epan/dissectors/packet-eth.c
+++ b/epan/dissectors/packet-eth.c
@@ -29,7 +29,7 @@
#include <glib.h>
#include <epan/packet.h>
#include <epan/prefs.h>
-#include "etypes.h"
+#include <epan/etypes.h>
#include <epan/addr_resolv.h>
#include "packet-eth.h"
#include "packet-ieee8023.h"
diff --git a/epan/dissectors/packet-ethertype.c b/epan/dissectors/packet-ethertype.c
index 0d76c7186d..ae795f85ac 100644
--- a/epan/dissectors/packet-ethertype.c
+++ b/epan/dissectors/packet-ethertype.c
@@ -37,8 +37,8 @@
#include "packet-ipx.h"
#include "packet-vlan.h"
#include "packet-vines.h"
-#include "etypes.h"
-#include "ppptypes.h"
+#include <epan/etypes.h>
+#include <epan/ppptypes.h>
static dissector_table_t ethertype_dissector_table;
diff --git a/epan/dissectors/packet-extreme.c b/epan/dissectors/packet-extreme.c
index 4df01180f9..c008df0c15 100644
--- a/epan/dissectors/packet-extreme.c
+++ b/epan/dissectors/packet-extreme.c
@@ -152,7 +152,7 @@ These are the structures you will see most often in EDP frames.
#include <epan/strutil.h>
#include <epan/in_cksum.h>
#include "packet-llc.h"
-#include "oui.h"
+#include <epan/oui.h>
static int hf_llc_extreme_pid = -1;
diff --git a/epan/dissectors/packet-fc.c b/epan/dissectors/packet-fc.c
index f9f46f9266..a71f0d5aaa 100644
--- a/epan/dissectors/packet-fc.c
+++ b/epan/dissectors/packet-fc.c
@@ -48,7 +48,7 @@
#include <epan/prefs.h>
#include <epan/reassemble.h>
#include <epan/conversation.h>
-#include "etypes.h"
+#include <epan/etypes.h>
#include "packet-fc.h"
#include "packet-fclctl.h"
#include "packet-fcbls.h"
diff --git a/epan/dissectors/packet-fcct.c b/epan/dissectors/packet-fcct.c
index 46c3361242..15f211ecfe 100644
--- a/epan/dissectors/packet-fcct.c
+++ b/epan/dissectors/packet-fcct.c
@@ -42,7 +42,7 @@
#include <glib.h>
#include <epan/packet.h>
-#include "etypes.h"
+#include <epan/etypes.h>
#include "packet-fc.h"
#include "packet-fcct.h"
diff --git a/epan/dissectors/packet-fcdns.c b/epan/dissectors/packet-fcdns.c
index bcb02dedd6..eb027f360f 100644
--- a/epan/dissectors/packet-fcdns.c
+++ b/epan/dissectors/packet-fcdns.c
@@ -50,7 +50,7 @@
#include <epan/packet.h>
#include <epan/emem.h>
#include <epan/conversation.h>
-#include "etypes.h"
+#include <epan/etypes.h>
#include "packet-fc.h"
#include "packet-fcct.h"
#include "packet-fcdns.h"
diff --git a/epan/dissectors/packet-fcels.c b/epan/dissectors/packet-fcels.c
index 53b482f56f..5218381289 100644
--- a/epan/dissectors/packet-fcels.c
+++ b/epan/dissectors/packet-fcels.c
@@ -49,7 +49,7 @@
#include <epan/packet.h>
#include <epan/emem.h>
#include <epan/conversation.h>
-#include "etypes.h"
+#include <epan/etypes.h>
#include "packet-fc.h"
#include "packet-fcels.h"
diff --git a/epan/dissectors/packet-fcfcs.c b/epan/dissectors/packet-fcfcs.c
index fc86218d8d..978a11ddbf 100644
--- a/epan/dissectors/packet-fcfcs.c
+++ b/epan/dissectors/packet-fcfcs.c
@@ -44,7 +44,7 @@
#include <epan/packet.h>
#include <epan/emem.h>
#include <epan/conversation.h>
-#include "etypes.h"
+#include <epan/etypes.h>
#include "packet-fc.h"
#include "packet-fcct.h"
#include "packet-fcfcs.h"
diff --git a/epan/dissectors/packet-fcfzs.c b/epan/dissectors/packet-fcfzs.c
index dbf5e8cc0a..ad34393645 100644
--- a/epan/dissectors/packet-fcfzs.c
+++ b/epan/dissectors/packet-fcfzs.c
@@ -50,7 +50,7 @@
#include <epan/packet.h>
#include <epan/emem.h>
#include <epan/conversation.h>
-#include "etypes.h"
+#include <epan/etypes.h>
#include "packet-fc.h"
#include "packet-fcct.h"
#include "packet-fcfzs.h"
diff --git a/epan/dissectors/packet-fclctl.c b/epan/dissectors/packet-fclctl.c
index f635c17f4d..8f87bb386b 100644
--- a/epan/dissectors/packet-fclctl.c
+++ b/epan/dissectors/packet-fclctl.c
@@ -42,7 +42,7 @@
#include <glib.h>
#include <epan/packet.h>
-#include "etypes.h"
+#include <epan/etypes.h>
#include "packet-fc.h"
#include "packet-fclctl.h"
diff --git a/epan/dissectors/packet-fcp.c b/epan/dissectors/packet-fcp.c
index df9604901d..225722508b 100644
--- a/epan/dissectors/packet-fcp.c
+++ b/epan/dissectors/packet-fcp.c
@@ -45,7 +45,7 @@
#include <epan/emem.h>
#include <epan/packet.h>
#include <epan/conversation.h>
-#include "etypes.h"
+#include <epan/etypes.h>
#include "packet-fc.h"
#include "packet-fcp.h"
#include "packet-scsi.h"
diff --git a/epan/dissectors/packet-fcsb3.c b/epan/dissectors/packet-fcsb3.c
index d3850119d5..c4cf169a55 100644
--- a/epan/dissectors/packet-fcsb3.c
+++ b/epan/dissectors/packet-fcsb3.c
@@ -51,7 +51,7 @@
#include <epan/prefs.h>
#include <epan/packet.h>
#include <epan/conversation.h>
-#include "etypes.h"
+#include <epan/etypes.h>
#include "packet-fc.h"
#include "packet-fcsb3.h"
diff --git a/epan/dissectors/packet-fcsp.c b/epan/dissectors/packet-fcsp.c
index 954e2518ff..d532220957 100644
--- a/epan/dissectors/packet-fcsp.c
+++ b/epan/dissectors/packet-fcsp.c
@@ -51,7 +51,7 @@
#include <epan/prefs.h>
#include <epan/packet.h>
#include <epan/conversation.h>
-#include "etypes.h"
+#include <epan/etypes.h>
#include "packet-fc.h"
/* Message Codes */
diff --git a/epan/dissectors/packet-fcswils.c b/epan/dissectors/packet-fcswils.c
index 8257810bd7..063c5528a8 100644
--- a/epan/dissectors/packet-fcswils.c
+++ b/epan/dissectors/packet-fcswils.c
@@ -44,7 +44,7 @@
#include <epan/packet.h>
#include <epan/emem.h>
#include <epan/conversation.h>
-#include "etypes.h"
+#include <epan/etypes.h>
#include "packet-fc.h"
#include "packet-fcswils.h"
#include "packet-fcct.h"
diff --git a/epan/dissectors/packet-fr.c b/epan/dissectors/packet-fr.c
index 9d0894adf3..a4158eeb74 100644
--- a/epan/dissectors/packet-fr.c
+++ b/epan/dissectors/packet-fr.c
@@ -54,10 +54,10 @@
#include "packet-ppp.h"
#include "packet-fr.h"
#include <epan/xdlc.h>
-#include "etypes.h"
-#include "oui.h"
-#include "nlpid.h"
-#include "greproto.h"
+#include <epan/etypes.h>
+#include <epan/oui.h>
+#include <epan/nlpid.h>
+#include <epan/greproto.h>
/*
* Bits in the address field.
diff --git a/epan/dissectors/packet-fw1.c b/epan/dissectors/packet-fw1.c
index 43f4bfe56e..a04bd39e33 100644
--- a/epan/dissectors/packet-fw1.c
+++ b/epan/dissectors/packet-fw1.c
@@ -92,7 +92,7 @@
#include <epan/packet.h>
#include <epan/prefs.h>
#include <epan/emem.h>
-#include "etypes.h"
+#include <epan/etypes.h>
/* Place FW1 summary in proto tree */
static gboolean fw1_summary_in_tree = TRUE;
diff --git a/epan/dissectors/packet-g723.c b/epan/dissectors/packet-g723.c
index d5598324c6..6bbdf2be31 100644
--- a/epan/dissectors/packet-g723.c
+++ b/epan/dissectors/packet-g723.c
@@ -36,7 +36,7 @@
#include <glib.h>
#include <epan/packet.h>
-#include "rtp_pt.h"
+#include <epan/rtp_pt.h>
/* Initialize the protocol and registered fields */
diff --git a/epan/dissectors/packet-gmrp.c b/epan/dissectors/packet-gmrp.c
index 872eb92a08..9b1a74e4c7 100644
--- a/epan/dissectors/packet-gmrp.c
+++ b/epan/dissectors/packet-gmrp.c
@@ -37,7 +37,7 @@
#include <glib.h>
#include <epan/packet.h>
-#include "llcsaps.h"
+#include <epan/llcsaps.h>
/* Initialize the protocol and registered fields */
static int proto_gmrp = -1;
diff --git a/epan/dissectors/packet-gre.c b/epan/dissectors/packet-gre.c
index 4e105cf337..13b6d984ab 100644
--- a/epan/dissectors/packet-gre.c
+++ b/epan/dissectors/packet-gre.c
@@ -31,10 +31,10 @@
#include <epan/packet.h>
#include "packet-wccp.h"
#include <epan/in_cksum.h>
-#include "etypes.h"
-#include "greproto.h"
+#include <epan/etypes.h>
+#include <epan/greproto.h>
#include <epan/ipproto.h>
-#include "llcsaps.h"
+#include <epan/llcsaps.h>
/*
* See RFC 1701 "Generic Routing Encapsulation (GRE)", RFC 1702
diff --git a/epan/dissectors/packet-gvrp.c b/epan/dissectors/packet-gvrp.c
index 80fd96ad05..d20d2fe489 100644
--- a/epan/dissectors/packet-gvrp.c
+++ b/epan/dissectors/packet-gvrp.c
@@ -34,7 +34,7 @@
#include <glib.h>
#include <epan/packet.h>
-#include "llcsaps.h"
+#include <epan/llcsaps.h>
/* Initialize the protocol and registered fields */
static int proto_gvrp = -1;
diff --git a/epan/dissectors/packet-h248.c b/epan/dissectors/packet-h248.c
index f6a0f7c36c..87710b71c9 100644
--- a/epan/dissectors/packet-h248.c
+++ b/epan/dissectors/packet-h248.c
@@ -47,7 +47,7 @@
#include "packet-isup.h"
#include "packet-q931.h"
-#include "sctpppids.h"
+#include <epan/sctpppids.h>
#define PNAME "H.248 MEGACO"
#define PSNAME "H248"
#define PFNAME "h248"
diff --git a/epan/dissectors/packet-h261.c b/epan/dissectors/packet-h261.c
index 8b291d2e9b..0061b215f0 100644
--- a/epan/dissectors/packet-h261.c
+++ b/epan/dissectors/packet-h261.c
@@ -42,7 +42,7 @@
#include <stdio.h>
#include <string.h>
-#include "rtp_pt.h"
+#include <epan/rtp_pt.h>
/* H.261 header fields */
static int proto_h261 = -1;
diff --git a/epan/dissectors/packet-h263.c b/epan/dissectors/packet-h263.c
index b44e11dc29..10b83a56e6 100644
--- a/epan/dissectors/packet-h263.c
+++ b/epan/dissectors/packet-h263.c
@@ -44,8 +44,8 @@
#include <stdio.h>
#include <string.h>
-#include "rtp_pt.h"
-#include "iax2_codec_type.h"
+#include <epan/rtp_pt.h>
+#include <epan/iax2_codec_type.h>
/* H.263 header fields */
static int proto_h263 = -1;
diff --git a/epan/dissectors/packet-hpext.c b/epan/dissectors/packet-hpext.c
index 8a461e028b..91b0c09da6 100644
--- a/epan/dissectors/packet-hpext.c
+++ b/epan/dissectors/packet-hpext.c
@@ -30,8 +30,8 @@
#include <glib.h>
#include <epan/packet.h>
#include <epan/xdlc.h>
-#include "etypes.h"
-#include "llcsaps.h"
+#include <epan/etypes.h>
+#include <epan/llcsaps.h>
#include "packet-hpext.h"
static dissector_table_t subdissector_table;
diff --git a/epan/dissectors/packet-hpsw.c b/epan/dissectors/packet-hpsw.c
index f05c8f9746..24c9886a52 100644
--- a/epan/dissectors/packet-hpsw.c
+++ b/epan/dissectors/packet-hpsw.c
@@ -29,7 +29,7 @@
#include <glib.h>
#include <epan/packet.h>
-#include "etypes.h"
+#include <epan/etypes.h>
#include "packet-hpext.h"
diff --git a/epan/dissectors/packet-iapp.c b/epan/dissectors/packet-iapp.c
index e95f77d4d9..a81362bafb 100644
--- a/epan/dissectors/packet-iapp.c
+++ b/epan/dissectors/packet-iapp.c
@@ -35,7 +35,7 @@
#include <glib.h>
#include <epan/packet.h>
-#include "oui.h"
+#include <epan/oui.h>
/* Initialize the protocol and registered fields */
static int proto_iapp = -1;
diff --git a/epan/dissectors/packet-iax2.c b/epan/dissectors/packet-iax2.c
index a7653ad110..7d6bc016fc 100644
--- a/epan/dissectors/packet-iax2.c
+++ b/epan/dissectors/packet-iax2.c
@@ -41,7 +41,7 @@
#include <epan/emem.h>
#include "packet-iax2.h"
-#include "iax2_codec_type.h"
+#include <epan/iax2_codec_type.h>
#define IAX2_PORT 4569
#define PROTO_TAG_IAX2 "IAX2"
diff --git a/epan/dissectors/packet-idp.c b/epan/dissectors/packet-idp.c
index 6a73bb7e5e..95f36fa64a 100644
--- a/epan/dissectors/packet-idp.c
+++ b/epan/dissectors/packet-idp.c
@@ -30,7 +30,7 @@
#include <glib.h>
#include <epan/packet.h>
#include "packet-idp.h"
-#include "etypes.h"
+#include <epan/etypes.h>
static int proto_idp = -1;
static int hf_idp_checksum = -1;
diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c
index 255600db18..b32e7aa727 100644
--- a/epan/dissectors/packet-ieee80211.c
+++ b/epan/dissectors/packet-ieee80211.c
@@ -66,7 +66,7 @@
#include "packet-ipx.h"
#include "packet-llc.h"
#include "packet-ieee80211.h"
-#include "etypes.h"
+#include <epan/etypes.h>
#include <epan/crc32.h>
#include <epan/tap.h>
#include <epan/emem.h>
diff --git a/epan/dissectors/packet-ieee802a.c b/epan/dissectors/packet-ieee802a.c
index a5929e2d31..4a28b56be4 100644
--- a/epan/dissectors/packet-ieee802a.c
+++ b/epan/dissectors/packet-ieee802a.c
@@ -28,8 +28,8 @@
#include <glib.h>
#include <epan/packet.h>
-#include "oui.h"
-#include "etypes.h"
+#include <epan/oui.h>
+#include <epan/etypes.h>
#include "packet-ieee802a.h"
diff --git a/epan/dissectors/packet-ip.c b/epan/dissectors/packet-ip.c
index 752b14ace9..299820704c 100644
--- a/epan/dissectors/packet-ip.c
+++ b/epan/dissectors/packet-ip.c
@@ -39,19 +39,19 @@
#include <epan/packet.h>
#include <epan/addr_resolv.h>
#include <epan/ipproto.h>
-#include "ip_opts.h"
+#include <epan/ip_opts.h>
#include <epan/prefs.h>
#include <epan/reassemble.h>
-#include "etypes.h"
-#include "greproto.h"
-#include "ppptypes.h"
-#include "llcsaps.h"
-#include "aftypes.h"
-#include "arcnet_pids.h"
+#include <epan/etypes.h>
+#include <epan/greproto.h>
+#include <epan/ppptypes.h>
+#include <epan/llcsaps.h>
+#include <epan/aftypes.h>
+#include <epan/arcnet_pids.h>
#include "packet-ip.h"
#include "packet-ipsec.h"
#include <epan/in_cksum.h>
-#include "nlpid.h"
+#include <epan/nlpid.h>
#include <epan/tap.h>
#include <epan/emem.h>
diff --git a/epan/dissectors/packet-ipfc.c b/epan/dissectors/packet-ipfc.c
index 2845dfe7ea..4a613ab24f 100644
--- a/epan/dissectors/packet-ipfc.c
+++ b/epan/dissectors/packet-ipfc.c
@@ -37,7 +37,7 @@
#include <glib.h>
#include <epan/packet.h>
-#include "etypes.h"
+#include <epan/etypes.h>
#include "packet-fc.h"
#include "packet-ipfc.h"
#include "packet-llc.h"
diff --git a/epan/dissectors/packet-ipv6.c b/epan/dissectors/packet-ipv6.c
index 45a73a4d1c..b8706d168d 100644
--- a/epan/dissectors/packet-ipv6.c
+++ b/epan/dissectors/packet-ipv6.c
@@ -34,16 +34,16 @@
#include <epan/packet.h>
#include "packet-ipsec.h"
#include "packet-ipv6.h"
-#include "ip_opts.h"
+#include <epan/ip_opts.h>
#include <epan/addr_resolv.h>
#include <epan/prefs.h>
#include <epan/reassemble.h>
#include <epan/ipproto.h>
-#include "etypes.h"
-#include "ppptypes.h"
-#include "aftypes.h"
-#include "nlpid.h"
-#include "arcnet_pids.h"
+#include <epan/etypes.h>
+#include <epan/ppptypes.h>
+#include <epan/aftypes.h>
+#include <epan/nlpid.h>
+#include <epan/arcnet_pids.h>
/*
* NOTE: ipv6.nxt is not very useful as we will have chained header.
diff --git a/epan/dissectors/packet-ipx.c b/epan/dissectors/packet-ipx.c
index 2952e26850..678ae15a13 100644
--- a/epan/dissectors/packet-ipx.c
+++ b/epan/dissectors/packet-ipx.c
@@ -37,11 +37,11 @@
#include <epan/packet.h>
#include "packet-ipx.h"
#include <epan/addr_resolv.h>
-#include "etypes.h"
-#include "ppptypes.h"
-#include "llcsaps.h"
-#include "aftypes.h"
-#include "arcnet_pids.h"
+#include <epan/etypes.h>
+#include <epan/ppptypes.h>
+#include <epan/llcsaps.h>
+#include <epan/aftypes.h>
+#include <epan/arcnet_pids.h>
#include <epan/conversation.h>
#include <epan/tap.h>
#include <epan/emem.h>
diff --git a/epan/dissectors/packet-isis-clv.c b/epan/dissectors/packet-isis-clv.c
index fb855d2aed..334c3a9643 100644
--- a/epan/dissectors/packet-isis-clv.c
+++ b/epan/dissectors/packet-isis-clv.c
@@ -36,7 +36,7 @@
#include "packet-osi.h"
#include "packet-isis.h"
#include "packet-isis-clv.h"
-#include "nlpid.h"
+#include <epan/nlpid.h>
/*
* Name: isis_dissect_area_address_clv()
diff --git a/epan/dissectors/packet-isis.c b/epan/dissectors/packet-isis.c
index 35486aedd9..3182521960 100644
--- a/epan/dissectors/packet-isis.c
+++ b/epan/dissectors/packet-isis.c
@@ -32,7 +32,7 @@
#include <string.h>
#include <glib.h>
#include <epan/packet.h>
-#include "nlpid.h"
+#include <epan/nlpid.h>
#include "packet-osi.h"
#include "packet-isis.h"
#include "packet-isis-lsp.h"
diff --git a/epan/dissectors/packet-isl.c b/epan/dissectors/packet-isl.c
index 66ef0c3984..e5bd09131f 100644
--- a/epan/dissectors/packet-isl.c
+++ b/epan/dissectors/packet-isl.c
@@ -32,7 +32,7 @@
#include "packet-eth.h"
#include "packet-tr.h"
#include "packet-frame.h"
-#include "etypes.h"
+#include <epan/etypes.h>
/*
* See
diff --git a/epan/dissectors/packet-ismp.c b/epan/dissectors/packet-ismp.c
index e5242ea794..f227610626 100644
--- a/epan/dissectors/packet-ismp.c
+++ b/epan/dissectors/packet-ismp.c
@@ -36,7 +36,7 @@
#include <epan/packet.h>
#include <epan/strutil.h>
-#include "etypes.h"
+#include <epan/etypes.h>
/* Initialize the protocol and registered fields */
diff --git a/epan/dissectors/packet-isup.c b/epan/dissectors/packet-isup.c
index 6c8321d931..a00ddd90bb 100644
--- a/epan/dissectors/packet-isup.c
+++ b/epan/dissectors/packet-isup.c
@@ -52,7 +52,7 @@
#include "packet-q931.h"
#include "packet-isup.h"
#include "packet-e164.h"
-#include "sctpppids.h"
+#include <epan/sctpppids.h>
#include <epan/emem.h>
#define MTP3_ISUP_SERVICE_INDICATOR 5
diff --git a/epan/dissectors/packet-iua.c b/epan/dissectors/packet-iua.c
index c4224cfe47..694cce1088 100644
--- a/epan/dissectors/packet-iua.c
+++ b/epan/dissectors/packet-iua.c
@@ -37,7 +37,7 @@
#include <epan/packet.h>
#include <epan/prefs.h>
-#include "sctpppids.h"
+#include <epan/sctpppids.h>
#define NETWORK_BYTE_ORDER FALSE
diff --git a/epan/dissectors/packet-juniper.c b/epan/dissectors/packet-juniper.c
index 450ad7c442..231758de28 100644
--- a/epan/dissectors/packet-juniper.c
+++ b/epan/dissectors/packet-juniper.c
@@ -29,13 +29,13 @@
#include <glib.h>
#include <epan/packet.h>
-#include "etypes.h"
+#include <epan/etypes.h>
#include <epan/prefs.h>
#include <epan/addr_resolv.h>
-#include "ppptypes.h"
+#include <epan/ppptypes.h>
#include "packet-ppp.h"
#include "packet-ip.h"
-#include "nlpid.h"
+#include <epan/nlpid.h>
#define JUNIPER_FLAG_PKT_OUT 0x00 /* Outgoing packet */
#define JUNIPER_FLAG_PKT_IN 0x01 /* Incoming packet */
diff --git a/epan/dissectors/packet-lapbether.c b/epan/dissectors/packet-lapbether.c
index 5257e7f383..d083d9ffb0 100644
--- a/epan/dissectors/packet-lapbether.c
+++ b/epan/dissectors/packet-lapbether.c
@@ -32,7 +32,7 @@
#include <glib.h>
#include <string.h>
#include <epan/packet.h>
-#include "etypes.h"
+#include <epan/etypes.h>
static int proto_lapbether = -1;
diff --git a/epan/dissectors/packet-lapd.c b/epan/dissectors/packet-lapd.c
index 328f5d273f..609f68af41 100644
--- a/epan/dissectors/packet-lapd.c
+++ b/epan/dissectors/packet-lapd.c
@@ -33,7 +33,7 @@
#include <epan/packet.h>
#include <epan/xdlc.h>
-#include "lapd_sapi.h"
+#include <epan/lapd_sapi.h>
/* ISDN/LAPD references:
*
diff --git a/epan/dissectors/packet-llc.c b/epan/dissectors/packet-llc.c
index 59a9b524d5..923250f8ca 100644
--- a/epan/dissectors/packet-llc.c
+++ b/epan/dissectors/packet-llc.c
@@ -29,13 +29,13 @@
#include <glib.h>
#include <epan/packet.h>
-#include "oui.h"
+#include <epan/oui.h>
#include <epan/xdlc.h>
-#include "etypes.h"
-#include "llcsaps.h"
-#include "bridged_pids.h"
-#include "ppptypes.h"
-#include "arcnet_pids.h"
+#include <epan/etypes.h>
+#include <epan/llcsaps.h>
+#include <epan/bridged_pids.h>
+#include <epan/ppptypes.h>
+#include <epan/arcnet_pids.h>
#include "packet-fc.h"
#include "packet-ip.h"
#include "packet-ipx.h"
diff --git a/epan/dissectors/packet-lldp.c b/epan/dissectors/packet-lldp.c
index e377ae7b0a..6b52d9c88d 100644
--- a/epan/dissectors/packet-lldp.c
+++ b/epan/dissectors/packet-lldp.c
@@ -39,8 +39,8 @@
#include <epan/packet.h>
#include <epan/prefs.h>
#include <epan/emem.h>
-#include "etypes.h"
-#include "oui.h"
+#include <epan/etypes.h>
+#include <epan/oui.h>
/* TLV Types */
#define END_OF_LLDPDU_TLV_TYPE 0x00 /* Mandatory */
diff --git a/epan/dissectors/packet-lmi.c b/epan/dissectors/packet-lmi.c
index 7a37bcb509..874d91718d 100644
--- a/epan/dissectors/packet-lmi.c
+++ b/epan/dissectors/packet-lmi.c
@@ -42,7 +42,7 @@
#include <glib.h>
#include <string.h>
#include <epan/packet.h>
-#include "nlpid.h"
+#include <epan/nlpid.h>
static int proto_lmi = -1;
static int hf_lmi_call_ref = -1;
diff --git a/epan/dissectors/packet-lmp.c b/epan/dissectors/packet-lmp.c
index 7dc51b05f7..3d2fd04638 100644
--- a/epan/dissectors/packet-lmp.c
+++ b/epan/dissectors/packet-lmp.c
@@ -53,7 +53,7 @@
#include <epan/packet.h>
#include <prefs.h>
#include <epan/in_cksum.h>
-#include "etypes.h"
+#include <epan/etypes.h>
#include <epan/ipproto.h>
#include "packet-ip.h"
diff --git a/epan/dissectors/packet-loop.c b/epan/dissectors/packet-loop.c
index 32c9e1ceb5..698c63bc7b 100644
--- a/epan/dissectors/packet-loop.c
+++ b/epan/dissectors/packet-loop.c
@@ -32,7 +32,7 @@
#include <glib.h>
#include <epan/packet.h>
-#include "etypes.h"
+#include <epan/etypes.h>
static int proto_loop = -1;
static int hf_loop_skipcount = -1;
diff --git a/epan/dissectors/packet-m2pa.c b/epan/dissectors/packet-m2pa.c
index ce1be95a63..42ce06f55a 100644
--- a/epan/dissectors/packet-m2pa.c
+++ b/epan/dissectors/packet-m2pa.c
@@ -38,7 +38,7 @@
#include <epan/packet.h>
#include <epan/prefs.h>
-#include "sctpppids.h"
+#include <epan/sctpppids.h>
#define NETWORK_BYTE_ORDER FALSE
#define SCTP_PORT_M2PA 3565
diff --git a/epan/dissectors/packet-m2tp.c b/epan/dissectors/packet-m2tp.c
index e17b80f31a..d05bd2fddb 100644
--- a/epan/dissectors/packet-m2tp.c
+++ b/epan/dissectors/packet-m2tp.c
@@ -36,7 +36,7 @@
#include <glib.h>
#include <epan/packet.h>
-#include "sctpppids.h"
+#include <epan/sctpppids.h>
#define SCTP_PORT_M2TP 9908 /* unassigned port number (not assigned by IANA) */
diff --git a/epan/dissectors/packet-m2ua.c b/epan/dissectors/packet-m2ua.c
index cea32ec0a6..337d4f595c 100644
--- a/epan/dissectors/packet-m2ua.c
+++ b/epan/dissectors/packet-m2ua.c
@@ -35,7 +35,7 @@
#include <epan/packet.h>
#include <epan/prefs.h>
-#include "sctpppids.h"
+#include <epan/sctpppids.h>
#define SCTP_PORT_M2UA 2904
#define NETWORK_BYTE_ORDER FALSE
diff --git a/epan/dissectors/packet-m3ua.c b/epan/dissectors/packet-m3ua.c
index a3f97e98b7..4f0862d23a 100644
--- a/epan/dissectors/packet-m3ua.c
+++ b/epan/dissectors/packet-m3ua.c
@@ -44,7 +44,7 @@
#include <epan/packet.h>
#include <epan/prefs.h>
-#include "sctpppids.h"
+#include <epan/sctpppids.h>
#include "packet-mtp3.h"
#define SCTP_PORT_M3UA 2905
diff --git a/epan/dissectors/packet-maccontrol.c b/epan/dissectors/packet-maccontrol.c
index 0d53d33a43..6fc2801b10 100644
--- a/epan/dissectors/packet-maccontrol.c
+++ b/epan/dissectors/packet-maccontrol.c
@@ -30,7 +30,7 @@
#include <epan/packet.h>
#include "packet-ieee8023.h"
#include "packet-llc.h"
-#include "etypes.h"
+#include <epan/etypes.h>
static int proto_macctrl = -1;
diff --git a/epan/dissectors/packet-mip6.c b/epan/dissectors/packet-mip6.c
index 779c2cc987..2c8339473e 100644
--- a/epan/dissectors/packet-mip6.c
+++ b/epan/dissectors/packet-mip6.c
@@ -31,7 +31,7 @@
#include <epan/packet.h>
#include <epan/ipproto.h>
-#include "ip_opts.h"
+#include <epan/ip_opts.h>
#include "packet-mip6.h"
/* Initialize the protocol and registered header fields */
diff --git a/epan/dissectors/packet-mpeg1.c b/epan/dissectors/packet-mpeg1.c
index e0a94920e1..b466676f7e 100644
--- a/epan/dissectors/packet-mpeg1.c
+++ b/epan/dissectors/packet-mpeg1.c
@@ -41,7 +41,7 @@
#include <stdio.h>
#include <string.h>
-#include "rtp_pt.h"
+#include <epan/rtp_pt.h>
#define RTP_MPG_MBZ(word) ( word >> 11)
#define RTP_MPG_T(word) ( (word >> 10) & 1 )
diff --git a/epan/dissectors/packet-mpls.c b/epan/dissectors/packet-mpls.c
index abad7c198c..6dbd90ff65 100644
--- a/epan/dissectors/packet-mpls.c
+++ b/epan/dissectors/packet-mpls.c
@@ -40,8 +40,8 @@
#include <glib.h>
#include <epan/packet.h>
-#include "ppptypes.h"
-#include "etypes.h"
+#include <epan/ppptypes.h>
+#include <epan/etypes.h>
#include <epan/prefs.h>
#include "packet-ppp.h"
#include "packet-mpls.h"
diff --git a/epan/dissectors/packet-ndmp.c b/epan/dissectors/packet-ndmp.c
index 1420f6eab5..12ddfa13b9 100644
--- a/epan/dissectors/packet-ndmp.c
+++ b/epan/dissectors/packet-ndmp.c
@@ -46,7 +46,7 @@
#include "packet-frame.h"
#include <epan/prefs.h>
#include <epan/reassemble.h>
-#include "rpc_defrag.h"
+#include <epan/rpc_defrag.h>
#define TCP_PORT_NDMP 10000
#define NDMP_RM_LASTFRAG 0x80000000
diff --git a/epan/dissectors/packet-netbios.c b/epan/dissectors/packet-netbios.c
index 4534364801..8b39fdea70 100644
--- a/epan/dissectors/packet-netbios.c
+++ b/epan/dissectors/packet-netbios.c
@@ -35,7 +35,7 @@
#include <glib.h>
#include <epan/packet.h>
-#include "llcsaps.h"
+#include <epan/llcsaps.h>
#include <epan/reassemble.h>
#include <epan/prefs.h>
#include "packet-netbios.h"
diff --git a/epan/dissectors/packet-nt-oui.c b/epan/dissectors/packet-nt-oui.c
index 5a471943cf..a6e19fd8a8 100644
--- a/epan/dissectors/packet-nt-oui.c
+++ b/epan/dissectors/packet-nt-oui.c
@@ -26,7 +26,7 @@
#include <epan/packet.h>
#include "packet-llc.h"
-#include "oui.h"
+#include <epan/oui.h>
static int hf_llc_nortel_pid = -1;
diff --git a/epan/dissectors/packet-nt-sonmp.c b/epan/dissectors/packet-nt-sonmp.c
index 7d129215a6..68c09c4af8 100644
--- a/epan/dissectors/packet-nt-sonmp.c
+++ b/epan/dissectors/packet-nt-sonmp.c
@@ -35,7 +35,7 @@
#include <glib.h>
#include <epan/packet.h>
/* #include "strutil.h" */
-#include "nlpid.h"
+#include <epan/nlpid.h>
/* Although this protocol is propietary it is documented in the SynOptics MIB's
* So I'm not giving anything away :-)
diff --git a/epan/dissectors/packet-null.c b/epan/dissectors/packet-null.c
index b302bf735c..722ecc627d 100644
--- a/epan/dissectors/packet-null.c
+++ b/epan/dissectors/packet-null.c
@@ -40,8 +40,8 @@
#include "packet-ipx.h"
#include "packet-osi.h"
#include "packet-ppp.h"
-#include "etypes.h"
-#include "aftypes.h"
+#include <epan/etypes.h>
+#include <epan/aftypes.h>
static dissector_table_t null_dissector_table;
diff --git a/epan/dissectors/packet-osi-options.c b/epan/dissectors/packet-osi-options.c
index 65c595c013..705ac9f55d 100644
--- a/epan/dissectors/packet-osi-options.c
+++ b/epan/dissectors/packet-osi-options.c
@@ -35,7 +35,7 @@
#include <string.h>
#include <glib.h>
#include <epan/packet.h>
-#include "nlpid.h"
+#include <epan/nlpid.h>
#include "packet-osi.h"
#include "packet-isis.h"
#include "packet-isis-clv.h"
diff --git a/epan/dissectors/packet-osi.c b/epan/dissectors/packet-osi.c
index 2223e42e01..892c213508 100644
--- a/epan/dissectors/packet-osi.c
+++ b/epan/dissectors/packet-osi.c
@@ -34,11 +34,11 @@
#include <ctype.h>
#include <glib.h>
#include <epan/packet.h>
-#include "llcsaps.h"
-#include "aftypes.h"
-#include "nlpid.h"
-#include "ppptypes.h"
-#include "chdlctypes.h"
+#include <epan/llcsaps.h>
+#include <epan/aftypes.h>
+#include <epan/nlpid.h>
+#include <epan/ppptypes.h>
+#include <epan/chdlctypes.h>
#include "packet-osi.h"
#include "packet-isis.h"
#include "packet-esis.h"
diff --git a/epan/dissectors/packet-pagp.c b/epan/dissectors/packet-pagp.c
index 60bf86f211..0df2ce41e1 100644
--- a/epan/dissectors/packet-pagp.c
+++ b/epan/dissectors/packet-pagp.c
@@ -34,9 +34,9 @@
#include <string.h>
#include <glib.h>
#include <epan/packet.h>
-#include "etypes.h"
-#include "llcsaps.h"
-#include "ppptypes.h"
+#include <epan/etypes.h>
+#include <epan/llcsaps.h>
+#include <epan/ppptypes.h>
#include <epan/address.h>
#include <epan/addr_resolv.h>
diff --git a/epan/dissectors/packet-pflog.c b/epan/dissectors/packet-pflog.c
index 197b166a6c..122eeb8e27 100644
--- a/epan/dissectors/packet-pflog.c
+++ b/epan/dissectors/packet-pflog.c
@@ -35,7 +35,7 @@
#include <string.h>
#include <glib.h>
#include <epan/packet.h>
-#include "etypes.h"
+#include <epan/etypes.h>
#include <epan/addr_resolv.h>
#include "packet-ip.h"
#include "packet-ipv6.h"
diff --git a/epan/dissectors/packet-ppp.c b/epan/dissectors/packet-ppp.c
index 962b68a19b..bc9c1a317f 100644
--- a/epan/dissectors/packet-ppp.c
+++ b/epan/dissectors/packet-ppp.c
@@ -34,15 +34,15 @@
#include <epan/prefs.h>
#include <epan/packet.h>
#include "packet-ppp.h"
-#include "ppptypes.h"
-#include "etypes.h"
-#include "ip_opts.h"
+#include <epan/ppptypes.h>
+#include <epan/etypes.h>
+#include <epan/ip_opts.h>
#include <epan/atalk-utils.h>
#include "packet-chdlc.h"
#include "packet-ip.h"
#include "packet-ipx.h"
#include "packet-vines.h"
-#include "nlpid.h"
+#include <epan/nlpid.h>
#include <epan/crc16.h>
#include <epan/crc32.h>
diff --git a/epan/dissectors/packet-pppoe.c b/epan/dissectors/packet-pppoe.c
index 9f540c58fe..3b6870cc72 100644
--- a/epan/dissectors/packet-pppoe.c
+++ b/epan/dissectors/packet-pppoe.c
@@ -29,7 +29,7 @@
#include <glib.h>
#include <epan/packet.h>
#include <epan/strutil.h>
-#include "etypes.h"
+#include <epan/etypes.h>
static int proto_pppoed = -1;
diff --git a/epan/dissectors/packet-q2931.c b/epan/dissectors/packet-q2931.c
index 167fbda1ee..5dcb48f71a 100644
--- a/epan/dissectors/packet-q2931.c
+++ b/epan/dissectors/packet-q2931.c
@@ -31,9 +31,9 @@
#include <glib.h>
#include <string.h>
#include <epan/packet.h>
-#include "oui.h"
-#include "nlpid.h"
-#include "etypes.h"
+#include <epan/oui.h>
+#include <epan/nlpid.h>
+#include <epan/etypes.h>
#include "packet-q931.h"
#include "packet-arp.h"
diff --git a/epan/dissectors/packet-q931.c b/epan/dissectors/packet-q931.c
index b3e5bf2b8e..3e34a32719 100644
--- a/epan/dissectors/packet-q931.c
+++ b/epan/dissectors/packet-q931.c
@@ -35,14 +35,14 @@
#include <epan/packet.h>
#include <epan/tap.h>
#include <epan/strutil.h>
-#include "nlpid.h"
+#include <epan/nlpid.h>
#include "packet-q931.h"
#include "packet-e164.h"
#include <epan/prefs.h>
#include <epan/reassemble.h>
#include <epan/emem.h>
-#include "lapd_sapi.h"
+#include <epan/lapd_sapi.h>
#include "packet-tpkt.h"
/* Q.931 references:
diff --git a/epan/dissectors/packet-q933.c b/epan/dissectors/packet-q933.c
index 5ed24804e9..351aa8039e 100644
--- a/epan/dissectors/packet-q933.c
+++ b/epan/dissectors/packet-q933.c
@@ -32,7 +32,7 @@
#include <string.h>
#include <epan/packet.h>
#include <epan/strutil.h>
-#include "nlpid.h"
+#include <epan/nlpid.h>
static int proto_q933 = -1;
static int hf_q933_discriminator = -1;
diff --git a/epan/dissectors/packet-redback.c b/epan/dissectors/packet-redback.c
index 6b684734f9..120b34d887 100644
--- a/epan/dissectors/packet-redback.c
+++ b/epan/dissectors/packet-redback.c
@@ -29,7 +29,7 @@
#include <glib.h>
#include <epan/packet.h>
-#include "etypes.h"
+#include <epan/etypes.h>
#include <epan/prefs.h>
#include <epan/addr_resolv.h>
#include "packet-ip.h"
diff --git a/epan/dissectors/packet-retix-bpdu.c b/epan/dissectors/packet-retix-bpdu.c
index 8cd7b35050..950247ed97 100644
--- a/epan/dissectors/packet-retix-bpdu.c
+++ b/epan/dissectors/packet-retix-bpdu.c
@@ -35,9 +35,9 @@
#include <glib.h>
#include <epan/packet.h>
#if 0
-#include "llcsaps.h"
-#include "ppptypes.h"
-#include "chdlctypes.h"
+#include <epan/llcsaps.h>
+#include <epan/ppptypes.h>
+#include <epan/chdlctypes.h>
#endif
#include <epan/addr_resolv.h>
diff --git a/epan/dissectors/packet-rmp.c b/epan/dissectors/packet-rmp.c
index bef7158581..9ee506b4cc 100644
--- a/epan/dissectors/packet-rmp.c
+++ b/epan/dissectors/packet-rmp.c
@@ -29,7 +29,7 @@
#include <glib.h>
#include <epan/packet.h>
-#include "etypes.h"
+#include <epan/etypes.h>
#include "packet-hpext.h"
diff --git a/epan/dissectors/packet-rpc.c b/epan/dissectors/packet-rpc.c
index 3a2edc817b..2676ac2525 100644
--- a/epan/dissectors/packet-rpc.c
+++ b/epan/dissectors/packet-rpc.c
@@ -40,7 +40,7 @@
#include "packet-tcp.h"
#include <epan/prefs.h>
#include <epan/reassemble.h>
-#include "rpc_defrag.h"
+#include <epan/rpc_defrag.h>
#include "packet-nfs.h"
#include <epan/tap.h>
#include <epan/emem.h>
diff --git a/epan/dissectors/packet-rpl.c b/epan/dissectors/packet-rpl.c
index 9fc84ac5af..8ed71b90ae 100644
--- a/epan/dissectors/packet-rpl.c
+++ b/epan/dissectors/packet-rpl.c
@@ -30,7 +30,7 @@
#include <glib.h>
#include <epan/packet.h>
-#include "llcsaps.h"
+#include <epan/llcsaps.h>
#include "packet-llc.h"
static int proto_rpl = -1;
diff --git a/epan/dissectors/packet-rsvp.c b/epan/dissectors/packet-rsvp.c
index ec7991803f..095240f8fb 100644
--- a/epan/dissectors/packet-rsvp.c
+++ b/epan/dissectors/packet-rsvp.c
@@ -77,7 +77,7 @@
#include <epan/packet.h>
#include <prefs.h>
#include <epan/in_cksum.h>
-#include "etypes.h"
+#include <epan/etypes.h>
#include <epan/ipproto.h>
#include <epan/conversation.h>
#include <epan/tap.h>
diff --git a/epan/dissectors/packet-rtp.c b/epan/dissectors/packet-rtp.c
index 5b5097b82f..aa7405a904 100644
--- a/epan/dissectors/packet-rtp.c
+++ b/epan/dissectors/packet-rtp.c
@@ -62,7 +62,7 @@
#include <string.h>
#include "packet-rtp.h"
-#include "rtp_pt.h"
+#include <epan/rtp_pt.h>
#include <epan/conversation.h>
#include <epan/tap.h>
diff --git a/epan/dissectors/packet-sctp.c b/epan/dissectors/packet-sctp.c
index 7f479d070b..6435e8142f 100644
--- a/epan/dissectors/packet-sctp.c
+++ b/epan/dissectors/packet-sctp.c
@@ -52,7 +52,7 @@
#include <epan/ipproto.h>
#include <epan/addr_resolv.h>
#include "packet-sctp.h"
-#include "sctpppids.h"
+#include <epan/sctpppids.h>
#define NETWORK_BYTE_ORDER FALSE
#define ADD_PADDING(x) ((((x) + 3) >> 2) << 2)
diff --git a/epan/dissectors/packet-sdp.c b/epan/dissectors/packet-sdp.c
index 4572dd8d0f..37755ca7cb 100644
--- a/epan/dissectors/packet-sdp.c
+++ b/epan/dissectors/packet-sdp.c
@@ -62,7 +62,7 @@
#include "packet-sdp.h"
#include "packet-rtp.h"
-#include "rtp_pt.h"
+#include <epan/rtp_pt.h>
#include "packet-rtcp.h"
#include "packet-t38.h"
diff --git a/epan/dissectors/packet-sll.c b/epan/dissectors/packet-sll.c
index 768e0c4a53..1f24276d05 100644
--- a/epan/dissectors/packet-sll.c
+++ b/epan/dissectors/packet-sll.c
@@ -34,7 +34,7 @@
#include "packet-ipx.h"
#include "packet-llc.h"
#include <epan/addr_resolv.h>
-#include "etypes.h"
+#include <epan/etypes.h>
static int proto_sll = -1;
static int hf_sll_pkttype = -1;
diff --git a/epan/dissectors/packet-slowprotocols.c b/epan/dissectors/packet-slowprotocols.c
index 5b666e582e..fc59f05d17 100644
--- a/epan/dissectors/packet-slowprotocols.c
+++ b/epan/dissectors/packet-slowprotocols.c
@@ -33,9 +33,9 @@
#include <string.h>
#include <glib.h>
#include <epan/packet.h>
-#include "etypes.h"
-#include "llcsaps.h"
-#include "ppptypes.h"
+#include <epan/etypes.h>
+#include <epan/llcsaps.h>
+#include <epan/ppptypes.h>
#include <epan/addr_resolv.h>
/* General declarations */
diff --git a/epan/dissectors/packet-smb-browse.c b/epan/dissectors/packet-smb-browse.c
index 7ad75984ba..0edf5f4322 100644
--- a/epan/dissectors/packet-smb-browse.c
+++ b/epan/dissectors/packet-smb-browse.c
@@ -36,7 +36,7 @@
#include <glib.h>
#include <ctype.h>
#include <epan/packet.h>
-#include "smb.h"
+#include <epan/smb.h>
#include "packet-smb-browse.h"
#include "packet-dcerpc.h"
diff --git a/epan/dissectors/packet-smb-mailslot.c b/epan/dissectors/packet-smb-mailslot.c
index 3dc01cb582..53e23435b5 100644
--- a/epan/dissectors/packet-smb-mailslot.c
+++ b/epan/dissectors/packet-smb-mailslot.c
@@ -34,7 +34,7 @@
#include <glib.h>
#include <epan/packet.h>
-#include "smb.h"
+#include <epan/smb.h>
#include "packet-smb-mailslot.h"
#include "packet-smb-browse.h"
#include "packet-smb-pipe.h"
diff --git a/epan/dissectors/packet-smb-pipe.c b/epan/dissectors/packet-smb-pipe.c
index c751317f83..77bf1340ad 100644
--- a/epan/dissectors/packet-smb-pipe.c
+++ b/epan/dissectors/packet-smb-pipe.c
@@ -42,7 +42,7 @@ XXX Fixme : shouldnt show [malformed frame] for long packets
#include <glib.h>
#include <ctype.h>
#include <epan/packet.h>
-#include "smb.h"
+#include <epan/smb.h>
#include "packet-smb-pipe.h"
#include "packet-smb-browse.h"
#include "packet-smb-common.h"
diff --git a/epan/dissectors/packet-smb-sidsnooping.c b/epan/dissectors/packet-smb-sidsnooping.c
index 89ac020002..d3dd921402 100644
--- a/epan/dissectors/packet-smb-sidsnooping.c
+++ b/epan/dissectors/packet-smb-sidsnooping.c
@@ -37,7 +37,7 @@
#include "packet-dcerpc.h"
#include "packet-dcerpc-nt.h"
#include "register.h"
-#include "smb.h"
+#include <epan/smb.h>
#include "packet-smb-sidsnooping.h"
static int hf_lsa = -1;
diff --git a/epan/dissectors/packet-smb.c b/epan/dissectors/packet-smb.c
index 74c85b6e51..3714429bdd 100644
--- a/epan/dissectors/packet-smb.c
+++ b/epan/dissectors/packet-smb.c
@@ -38,7 +38,7 @@
#include <ctype.h>
#include <epan/packet.h>
#include <epan/conversation.h>
-#include "smb.h"
+#include <epan/smb.h>
#include <epan/strutil.h>
#include <epan/prefs.h>
#include <epan/reassemble.h>
diff --git a/epan/dissectors/packet-sna.c b/epan/dissectors/packet-sna.c
index 7a29a2e758..f4a690d554 100644
--- a/epan/dissectors/packet-sna.c
+++ b/epan/dissectors/packet-sna.c
@@ -30,8 +30,8 @@
#include <glib.h>
#include <epan/packet.h>
-#include "llcsaps.h"
-#include "ppptypes.h"
+#include <epan/llcsaps.h>
+#include <epan/ppptypes.h>
#include <epan/sna-utils.h>
#include <epan/charsets.h>
#include <epan/prefs.h>
diff --git a/epan/dissectors/packet-snaeth.c b/epan/dissectors/packet-snaeth.c
index b4e055a917..b5abe93acf 100644
--- a/epan/dissectors/packet-snaeth.c
+++ b/epan/dissectors/packet-snaeth.c
@@ -28,7 +28,7 @@
#include <glib.h>
#include <epan/packet.h>
-#include "etypes.h"
+#include <epan/etypes.h>
/*
* See
diff --git a/epan/dissectors/packet-snmp.c b/epan/dissectors/packet-snmp.c
index b655a13f52..284bf96ff4 100644
--- a/epan/dissectors/packet-snmp.c
+++ b/epan/dissectors/packet-snmp.c
@@ -53,7 +53,7 @@
#include <epan/packet.h>
#include <epan/strutil.h>
#include <epan/conversation.h>
-#include "etypes.h"
+#include <epan/etypes.h>
#include <epan/prefs.h>
#include <epan/sminmpec.h>
#include <epan/emem.h>
@@ -112,7 +112,7 @@
#include <epan/asn1.h>
#include "packet-snmp.h"
-#include "format-oid.h"
+#include <epan/format-oid.h>
/* Take a pointer that may be null and return a pointer that's not null
by turning null pointers into pointers to the above null string,
diff --git a/epan/dissectors/packet-sua.c b/epan/dissectors/packet-sua.c
index 66f9e5530c..4b8a540a66 100644
--- a/epan/dissectors/packet-sua.c
+++ b/epan/dissectors/packet-sua.c
@@ -35,7 +35,7 @@
#include <epan/packet.h>
#include <epan/prefs.h>
-#include "sctpppids.h"
+#include <epan/sctpppids.h>
#include <packet-mtp3.h>
#define NETWORK_BYTE_ORDER FALSE
diff --git a/epan/dissectors/packet-symantec.c b/epan/dissectors/packet-symantec.c
index bece54d098..95e584e2dc 100644
--- a/epan/dissectors/packet-symantec.c
+++ b/epan/dissectors/packet-symantec.c
@@ -30,7 +30,7 @@
#include <epan/packet.h>
-#include "etypes.h"
+#include <epan/etypes.h>
static dissector_table_t ethertype_dissector_table;
diff --git a/epan/dissectors/packet-tcp.c b/epan/dissectors/packet-tcp.c
index 9d84cd4ff4..ba13eb7f76 100644
--- a/epan/dissectors/packet-tcp.c
+++ b/epan/dissectors/packet-tcp.c
@@ -34,7 +34,7 @@
#include <epan/packet.h>
#include <epan/addr_resolv.h>
#include <epan/ipproto.h>
-#include "ip_opts.h"
+#include <epan/ip_opts.h>
#include <epan/follow.h>
#include <epan/prefs.h>
#include "packet-tcp.h"
diff --git a/epan/dissectors/packet-teimanagement.c b/epan/dissectors/packet-teimanagement.c
index 8d6dab4d41..0a6bc86c65 100644
--- a/epan/dissectors/packet-teimanagement.c
+++ b/epan/dissectors/packet-teimanagement.c
@@ -32,7 +32,7 @@
#include <glib.h>
#include <string.h>
#include <epan/packet.h>
-#include "lapd_sapi.h"
+#include <epan/lapd_sapi.h>
/* ISDN/LAPD references:
*
diff --git a/epan/dissectors/packet-vines.c b/epan/dissectors/packet-vines.c
index c1a35516fb..c463e90957 100644
--- a/epan/dissectors/packet-vines.c
+++ b/epan/dissectors/packet-vines.c
@@ -33,11 +33,11 @@
#include <glib.h>
#include <epan/packet.h>
#include "packet-vines.h"
-#include "etypes.h"
-#include "ppptypes.h"
+#include <epan/etypes.h>
+#include <epan/ppptypes.h>
#include <epan/ipproto.h>
-#include "arcnet_pids.h"
-#include "llcsaps.h"
+#include <epan/arcnet_pids.h>
+#include <epan/llcsaps.h>
#define UDP_PORT_VINES 573
diff --git a/epan/dissectors/packet-vj.c b/epan/dissectors/packet-vj.c
index 203bc21459..79b2a60f61 100644
--- a/epan/dissectors/packet-vj.c
+++ b/epan/dissectors/packet-vj.c
@@ -68,7 +68,7 @@
#include <epan/packet.h>
#include <epan/prefs.h>
#include "packet-ppp.h"
-#include "ppptypes.h"
+#include <epan/ppptypes.h>
#include <epan/ipproto.h>
#include <epan/in_cksum.h>
#include <epan/emem.h>
diff --git a/epan/dissectors/packet-vlan.c b/epan/dissectors/packet-vlan.c
index bae7d8b03c..f2f14dc116 100644
--- a/epan/dissectors/packet-vlan.c
+++ b/epan/dissectors/packet-vlan.c
@@ -32,7 +32,7 @@
#include "packet-ipx.h"
#include "packet-llc.h"
#include "packet-vlan.h"
-#include "etypes.h"
+#include <epan/etypes.h>
static int proto_vlan = -1;
static int hf_vlan_priority = -1;
diff --git a/epan/dissectors/packet-wcp.c b/epan/dissectors/packet-wcp.c
index df464b85d3..ef7a4fe708 100644
--- a/epan/dissectors/packet-wcp.c
+++ b/epan/dissectors/packet-wcp.c
@@ -107,8 +107,8 @@
#include "packet-frame.h"
#include <epan/circuit.h>
#include <epan/emem.h>
-#include "etypes.h"
-#include "nlpid.h"
+#include <epan/etypes.h>
+#include <epan/nlpid.h>
#define MAX_WIN_BUF_LEN 0x7fff /* storage size for decompressed data */
#define MAX_WCP_BUF_LEN 2048 /* storage size for decompressed data */
diff --git a/epan/dissectors/packet-wfleet-hdlc.c b/epan/dissectors/packet-wfleet-hdlc.c
index 51f6712375..0511b362ac 100644
--- a/epan/dissectors/packet-wfleet-hdlc.c
+++ b/epan/dissectors/packet-wfleet-hdlc.c
@@ -29,7 +29,7 @@
#include <glib.h>
#include <epan/packet.h>
-#include "etypes.h"
+#include <epan/etypes.h>
#include <epan/addr_resolv.h>
#include "packet-chdlc.h"
#include "packet-ip.h"
diff --git a/epan/dissectors/packet-windows-common.c b/epan/dissectors/packet-windows-common.c
index 6c74c2f3fa..45d3098149 100644
--- a/epan/dissectors/packet-windows-common.c
+++ b/epan/dissectors/packet-windows-common.c
@@ -33,7 +33,7 @@
#include "packet-dcerpc.h"
#include "packet-smb-sidsnooping.h"
#include "packet-windows-common.h"
-#include "smb.h" /* for "sid_name_snooping" */
+#include <epan/smb.h> /* for "sid_name_snooping" */
static int hf_nt_sec_desc_revision = -1;
static int hf_nt_sec_desc_type_owner_defaulted = -1;
diff --git a/epan/dissectors/packet-x25.c b/epan/dissectors/packet-x25.c
index b07e108b46..8724b54a58 100644
--- a/epan/dissectors/packet-x25.c
+++ b/epan/dissectors/packet-x25.c
@@ -31,14 +31,14 @@
#include <glib.h>
#include <stdlib.h>
#include <string.h>
-#include "llcsaps.h"
+#include <epan/llcsaps.h>
#include <epan/packet.h>
#include <epan/circuit.h>
#include <epan/reassemble.h>
#include <epan/prefs.h>
#include <epan/emem.h>
-#include "nlpid.h"
-#include "x264_prt_id.h"
+#include <epan/nlpid.h>
+#include <epan/x264_prt_id.h>
/*
* Direction of packet.
diff --git a/epan/dissectors/packet-x29.c b/epan/dissectors/packet-x29.c
index 5d7b937b47..eabde3108b 100644
--- a/epan/dissectors/packet-x29.c
+++ b/epan/dissectors/packet-x29.c
@@ -32,7 +32,7 @@
#include <glib.h>
#include <epan/packet.h>
#include <epan/strutil.h>
-#include "nlpid.h"
+#include <epan/nlpid.h>
static int proto_x29 = -1;
static int hf_msg_code = -1;
diff --git a/epan/etypes.h b/epan/etypes.h
new file mode 100644
index 0000000000..3655f5111e
--- /dev/null
+++ b/epan/etypes.h
@@ -0,0 +1,295 @@
+/* etypes.h
+ * Defines ethernet packet types, similar to tcpdump's ethertype.h
+ *
+ * $Id$
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@ethereal.com>
+ * Copyright 1998 Gerald Combs
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __ETYPES_H__
+#define __ETYPES_H__
+
+/*
+ * Maximum length of an IEEE 802.3 frame; Ethernet type/length values
+ * greater than it are types, Ethernet type/length values less than or
+ * equal to it are lengths.
+ */
+#define IEEE_802_3_MAX_LEN 1500
+
+#ifndef ETHERTYPE_UNK
+#define ETHERTYPE_UNK 0x0000
+#endif
+
+/* Sources:
+ * http://www.iana.org/assignments/ethernet-numbers
+ * TCP/IP Illustrated, Volume 1
+ * RFCs 894, 1042, 826
+ * tcpdump's ethertype.h
+ * http://www.cavebear.com/CaveBear/Ethernet/
+ * http://standards.ieee.org/regauth/ethertype/type-pub.html
+ * http://standards.ieee.org/regauth/ethertype/eth.txt
+ * (The first of the two IEEE URLs is the one that the "EtherType Field
+ * Public Assignments" link on the page at
+ *
+ * http://standards.ieee.org/regauth/ethertype/index.shtml
+ *
+ * goes to, but it is redirected to the second of those - i.e., both
+ * of the IEEE URLs ultimately go to the same page.)
+ */
+
+#ifndef ETHERTYPE_VINES_IP
+#define ETHERTYPE_VINES_IP 0x0bad
+#endif
+
+#ifndef ETHERTYPE_VINES_ECHO
+#define ETHERTYPE_VINES_ECHO 0x0baf
+#endif
+
+#ifndef ETHERTYPE_TRAIN
+/*
+ * Created by Microsoft Network Monitor as a summary packet.
+ */
+#define ETHERTYPE_TRAIN 0x1984
+#endif
+
+#ifndef ETHERTYPE_CGMP
+#define ETHERTYPE_CGMP 0x2001
+#endif
+
+#ifndef ETHERTYPE_CENTRINO_PROMISC
+#define ETHERTYPE_CENTRINO_PROMISC 0x2452 /* Intel Centrino promiscuous packets */
+#endif
+
+#ifndef ETHERTYPE_3C_NBP_DGRAM
+#define ETHERTYPE_3C_NBP_DGRAM 0x3c07
+#endif
+
+#ifndef ETHERTYPE_XNS_IDP
+#define ETHERTYPE_XNS_IDP 0x0600
+#endif
+
+#ifndef ETHERTYPE_IP
+#define ETHERTYPE_IP 0x0800
+#endif
+
+#ifndef ETHERTYPE_X25L3
+#define ETHERTYPE_X25L3 0x0805
+#endif
+
+#ifndef ETHERTYPE_ARP
+#define ETHERTYPE_ARP 0x0806
+#endif
+
+#ifndef ETHERTYPE_DEC
+#define ETHERTYPE_DEC 0x6000
+#endif
+
+#ifndef ETHERTYPE_DNA_DL
+#define ETHERTYPE_DNA_DL 0x6001
+#endif
+
+#ifndef ETHERTYPE_DNA_RC
+#define ETHERTYPE_DNA_RC 0x6002
+#endif
+
+#ifndef ETHERTYPE_DNA_RT
+#define ETHERTYPE_DNA_RT 0x6003
+#endif
+
+#ifndef ETHERTYPE_LAT
+#define ETHERTYPE_LAT 0x6004
+#endif
+
+#ifndef ETHERTYPE_DEC_DIAG
+#define ETHERTYPE_DEC_DIAG 0x6005
+#endif
+
+#ifndef ETHERTYPE_DEC_CUST
+#define ETHERTYPE_DEC_CUST 0x6006
+#endif
+
+#ifndef ETHERTYPE_DEC_SCA
+#define ETHERTYPE_DEC_SCA 0x6007
+#endif
+
+#ifndef ETHERTYPE_ETHBRIDGE
+#define ETHERTYPE_ETHBRIDGE 0x6558 /* transparent Ethernet bridging [RFC1701]*/
+#endif
+
+#ifndef ETHERTYPE_RAW_FR
+#define ETHERTYPE_RAW_FR 0x6559 /* Raw Frame Relay [RFC1701] */
+#endif
+
+#ifndef ETHERTYPE_REVARP
+#define ETHERTYPE_REVARP 0x8035
+#endif
+
+#ifndef ETHERTYPE_DEC_LB
+#define ETHERTYPE_DEC_LB 0x8038
+#endif
+
+#ifndef ETHERTYPE_DEC_LAST
+#define ETHERTYPE_DEC_LAST 0x8041 /* DEC Local Area Systems Transport */
+#endif
+
+#ifndef ETHERTYPE_ATALK
+#define ETHERTYPE_ATALK 0x809b
+#endif
+
+#ifndef ETHERTYPE_SNA
+#define ETHERTYPE_SNA 0x80d5
+#endif
+
+#ifndef ETHERTYPE_AARP
+#define ETHERTYPE_AARP 0x80f3
+#endif
+
+#ifndef ETHERTYPE_IPX
+#define ETHERTYPE_IPX 0x8137
+#endif
+
+#ifndef ETHERTYPE_VLAN
+#define ETHERTYPE_VLAN 0x8100 /* 802.1Q Virtual LAN */
+#endif
+
+#ifndef ETHERTYPE_SNMP
+#define ETHERTYPE_SNMP 0x814c /* SNMP over Ethernet, RFC 1089 */
+#endif
+
+#ifndef ETHERTYPE_WCP
+#define ETHERTYPE_WCP 0x80ff /* Wellfleet Compression Protocol */
+#endif
+
+#ifndef ETHERTYPE_ISMP
+#define ETHERTYPE_ISMP 0x81fd /* Cabletron Interswitch Message Protocol */
+#endif
+
+#ifndef ETHERTYPE_ISMP_TBFLOOD
+#define ETHERTYPE_ISMP_TBFLOOD 0x81ff /* Cabletron Interswitch Message Protocol */
+#endif
+
+#ifndef ETHERTYPE_IPv6
+#define ETHERTYPE_IPv6 0x86dd
+#endif
+
+#ifndef ETHERTYPE_CISCOWL
+#define ETHERTYPE_CISCOWL 0x872d /* Cisco Wireless (Aironet) */
+#endif
+
+#ifndef ETHERTYPE_MAC_CONTROL
+#define ETHERTYPE_MAC_CONTROL 0x8808
+#endif
+
+#ifndef ETHERTYPE_SLOW_PROTOCOLS
+#define ETHERTYPE_SLOW_PROTOCOLS 0x8809
+#endif
+
+#ifndef ETHERTYPE_PPP
+#define ETHERTYPE_PPP 0x880b /* no, this is not PPPoE */
+#endif
+
+#ifndef ETHERTYPE_MPLS
+#define ETHERTYPE_MPLS 0x8847 /* MPLS unicast packet */
+#endif
+
+#ifndef ETHERTYPE_MPLS_MULTI
+#define ETHERTYPE_MPLS_MULTI 0x8848 /* MPLS multicast packet */
+#endif
+
+#ifndef ETHERTYPE_PPPOED
+#define ETHERTYPE_PPPOED 0x8863 /* PPPoE Discovery Protocol */
+#endif
+
+#ifndef ETHERTYPE_PPPOES
+#define ETHERTYPE_PPPOES 0x8864 /* PPPoE Session Protocol */
+#endif
+
+#ifndef ETHERTYPE_INTEL_ANS
+#define ETHERTYPE_INTEL_ANS 0x886d /* Intel ANS (NIC teaming) http://www.intel.com/support/network/adapter/ans/probes.htm */
+#endif
+
+#ifndef ETHERTYPE_MS_NLB_HEARTBEAT
+#define ETHERTYPE_MS_NLB_HEARTBEAT 0x886f /* MS Network Load Balancing heartbeat http://www.microsoft.com/technet/treeview/default.asp?url=/TechNet/prodtechnol/windows2000serv/deploy/confeat/nlbovw.asp */
+#endif
+
+#ifndef ETHERTYPE_CDMA2000_A10_UBS
+#define ETHERTYPE_CDMA2000_A10_UBS 0x8881 /* the byte stream protocol that is used for IP based micro-mobility bearer interfaces (A10) in CDMA2000(R)-based wireless networks */
+#endif
+
+#ifndef ETHERTYPE_EAPOL
+#define ETHERTYPE_EAPOL 0x888e /* 802.1x Authentication */
+#endif
+
+#ifndef ETHERTYPE_PROFINET
+#define ETHERTYPE_PROFINET 0x8892 /* PROFIBUS PROFInet protocol */
+#endif
+
+#ifndef ETHERTYPE_HYPERSCSI
+#define ETHERTYPE_HYPERSCSI 0x889A /* HyperSCSI */
+#endif
+
+#ifndef ETHERTYPE_CSM_ENCAPS
+#define ETHERTYPE_CSM_ENCAPS 0x889B /* Mindspeed Technologies www.mindspeed.com */
+#endif
+
+#ifndef ETHERTYPE_AOE
+#define ETHERTYPE_AOE 0x88A2
+#endif
+
+#ifndef ETHERTYPE_BRDWALK
+#define ETHERTYPE_BRDWALK 0x88AE
+#endif
+
+#ifndef ETHERTYPE_IEEE802_OUI_EXTENDED
+#define ETHERTYPE_IEEE802_OUI_EXTENDED 0x88B7 /* IEEE 802a OUI Extended Ethertype */
+#endif
+
+#ifndef ETHERTYPE_RSN_PREAUTH
+#define ETHERTYPE_RSN_PREAUTH 0x88c7 /* 802.11i Pre-Authentication */
+#endif
+
+#ifndef ETHERTYPE_LLDP
+#define ETHERTYPE_LLDP 0x88cc /* IEEE 802.1 Link Layer Discovery Protocol (LLDP) */
+#endif
+
+#ifndef ETHERTYPE_3GPP2
+#define ETHERTYPE_3GPP2 0x88d2 /* This will be used in a revision of the Interoperabi */
+#endif /* Specification (IOS) for cdma2000 Access Network Interfaces (document numbers A.S0011-B */
+ /* through A.S0017-B v1.0). This document already uses the Ether type 8881 */
+
+#ifndef ETHERTYPE_LOOP
+#define ETHERTYPE_LOOP 0x9000 /* used for layer 2 testing (do i see my own frames on the wire) */
+#endif
+
+#ifndef ETHERTYPE_RTMAC
+#define ETHERTYPE_RTMAC 0x9021 /* RTnet: Real-Time Media Access Control */
+#endif
+
+#ifndef ETHERTYPE_RTCFG
+#define ETHERTYPE_RTCFG 0x9022 /* RTnet: Real-Time Configuration Protocol */
+#endif
+
+#ifndef ETHERTYPE_FCFT
+/* type used to transport FC frames+MDS hdr internal to Cisco's MDS switch */
+#define ETHERTYPE_FCFT 0xFCFC
+#endif
+
+extern const value_string etype_vals[];
+
+#endif /* etypes.h */
diff --git a/epan/format-oid.h b/epan/format-oid.h
new file mode 100644
index 0000000000..07c33cb231
--- /dev/null
+++ b/epan/format-oid.h
@@ -0,0 +1,32 @@
+/* format-oid.h
+ * Declare routine for formatting OIDs
+ *
+ * $Id$
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@ethereal.com>
+ * Copyright 1998 Didier Jorand
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __FORMAT_OID_H__
+#define __FORMAT_OID_H__
+
+extern gchar *format_oid(subid_t *oid, guint oid_length);
+extern void new_format_oid(subid_t *oid, guint oid_length,
+ gchar **non_decoded, gchar **decoded);
+
+#endif
diff --git a/epan/greproto.h b/epan/greproto.h
new file mode 100644
index 0000000000..c52bd5355f
--- /dev/null
+++ b/epan/greproto.h
@@ -0,0 +1,34 @@
+/* greproto.h
+ * Protocol type values for for the Generic Routing Encapsulation (GRE)
+ * protocol
+ * Brad Robel-Forrest <brad.robel-forrest@watchguard.com>
+ *
+ * The protocol type in GRE is supposed to be an Ethernet type value;
+ * this file lists protocol type values for which nobody's found an
+ * official Ethernet type definition and put that in "etypes.h".
+ * Move these to "etypes.h" if you find an official Ethernet type
+ * definition for them; when this file is empty, get rid of all includes
+ * of it, and get rid of it.
+ *
+ * $Id$
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@ethereal.com>
+ * Copyright 1998 Gerald Combs
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#define GRE_WCCP 0x883E
diff --git a/epan/iax2_codec_type.h b/epan/iax2_codec_type.h
new file mode 100644
index 0000000000..c373a35bf8
--- /dev/null
+++ b/epan/iax2_codec_type.h
@@ -0,0 +1,77 @@
+/* iax2_codec_type.h
+ * Defines IAX2 codec types
+ *
+ * $Id$
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@ethereal.com>
+ * Copyright 1998 Gerald Combs
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __IAX2_CODEC_TYPE_H__
+#define __IAX2_CODEC_TYPE_H__
+
+
+/* Ref: frame.h from Asterisk source */
+
+/* Data formats for capabilities and frames alike */
+/* suitable for use in iax2.codec dissector table */
+/*! G.723.1 compression */
+#define AST_FORMAT_G723_1 (1 << 0)
+/*! GSM compression */
+#define AST_FORMAT_GSM (1 << 1)
+/*! Raw mu-law data (G.711) */
+#define AST_FORMAT_ULAW (1 << 2)
+/*! Raw A-law data (G.711) */
+#define AST_FORMAT_ALAW (1 << 3)
+/*! ADPCM (G.726, 32kbps) */
+#define AST_FORMAT_G726 (1 << 4)
+/*! ADPCM (IMA) */
+#define AST_FORMAT_ADPCM (1 << 5)
+/*! Raw 16-bit Signed Linear (8000 Hz) PCM */
+#define AST_FORMAT_SLINEAR (1 << 6)
+/*! LPC10, 180 samples/frame */
+#define AST_FORMAT_LPC10 (1 << 7)
+/*! G.729A audio */
+#define AST_FORMAT_G729A (1 << 8)
+/*! SpeeX Free Compression */
+#define AST_FORMAT_SPEEX (1 << 9)
+/*! iLBC Free Compression */
+#define AST_FORMAT_ILBC (1 << 10)
+/*! Maximum audio format */
+#define AST_FORMAT_MAX_AUDIO (1 << 15)
+/*! JPEG Images */
+#define AST_FORMAT_JPEG (1 << 16)
+/*! PNG Images */
+#define AST_FORMAT_PNG (1 << 17)
+/*! H.261 Video */
+#define AST_FORMAT_H261 (1 << 18)
+/*! H.263 Video */
+#define AST_FORMAT_H263 (1 << 19)
+/*! Max one */
+#define AST_FORMAT_MAX_VIDEO (1 << 24)
+
+
+/* data format for IAX_IE_DATAFORMAT ie */
+/* suitable for use in iax2.dataformat dissector table */
+typedef enum {
+ AST_DATAFORMAT_NULL, /* N/A: analogue call etc */
+ AST_DATAFORMAT_V110, /* ITU-T V.110 rate adaption */
+ AST_DATAFORMAT_H223_H245 /* ITU-T H.223/H.245 */
+} iax_dataformat_t;
+
+#endif
diff --git a/epan/ip_opts.h b/epan/ip_opts.h
new file mode 100644
index 0000000000..997983976a
--- /dev/null
+++ b/epan/ip_opts.h
@@ -0,0 +1,59 @@
+/* ip_opts.h
+ * Definitions of structures and routines for dissection of options that
+ * work like IPv4 or IPv6 options
+ *
+ * $Id$
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@ethereal.com>
+ * Copyright 1998 Gerald Combs
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __IP_OPTS_H__
+#define __IP_OPTS_H__
+
+typedef enum {
+ NO_LENGTH, /* option has no data, hence no length */
+ FIXED_LENGTH, /* option always has the same length */
+ VARIABLE_LENGTH /* option is variable-length - optlen is minimum */
+} opt_len_type;
+
+/* Member of table of IP or TCP options. */
+typedef struct ip_tcp_opt {
+ int optcode; /* code for option */
+ const char *name; /* name of option */
+ int *subtree_index; /* pointer to subtree index for option */
+ opt_len_type len_type; /* type of option length field */
+ int optlen; /* value length should be (minimum if VARIABLE) */
+ void (*dissect)(const struct ip_tcp_opt *, tvbuff_t *, int, guint,
+ packet_info *, proto_tree *);
+ /* routine to dissect option */
+} ip_tcp_opt;
+
+/* Routine to dissect options that work like IPv4 options, where the
+ length field in the option, if present, includes the type and
+ length bytes. */
+extern void dissect_ip_tcp_options(tvbuff_t *, int, guint,
+ const ip_tcp_opt *, int, int, packet_info *, proto_tree *);
+
+/* Routine to dissect options that work like IPv6 options, where the
+ length field in the option, if present, includes only the data, not
+ the type and length bytes. */
+extern void dissect_ipv6_options(tvbuff_t *, int, guint,
+ const ip_tcp_opt *, int, int, packet_info *, proto_tree *);
+
+#endif
diff --git a/epan/lapd_sapi.h b/epan/lapd_sapi.h
new file mode 100644
index 0000000000..7fe486dee5
--- /dev/null
+++ b/epan/lapd_sapi.h
@@ -0,0 +1,33 @@
+/* lapd_sapi.h
+ * Declarations of LAPD SAPI values.
+ *
+ * $Id$
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@ethereal.com>
+ * Copyright 2004 Gerald Combs
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __LAPD_SAPI_H__
+#define __LAPD_SAPI_H__
+
+#define LAPD_SAPI_Q931 0 /* Q.931 call control procedure */
+#define LAPD_SAPI_PM_Q931 1 /* Packet mode Q.931 call control procedure */
+#define LAPD_SAPI_X25 16 /* X.25 Level 3 procedures */
+#define LAPD_SAPI_L2 63 /* Layer 2 management procedures */
+
+#endif /* lapd_sapi.h */
diff --git a/epan/llcsaps.h b/epan/llcsaps.h
new file mode 100644
index 0000000000..43b336d144
--- /dev/null
+++ b/epan/llcsaps.h
@@ -0,0 +1,63 @@
+/* llcsaps.h
+ * Defines LLC SAP values.
+ *
+ * $Id$
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@ethereal.com>
+ * Copyright 1998 Gerald Combs
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __LLCSAPS_H__
+#define __LLCSAPS_H__
+
+#define SAP_NULL 0x00
+#define SAP_LLC_SLMGMT 0x02
+#define SAP_SNA_PATHCTRL 0x04
+#define SAP_IP 0x06
+#define SAP_SNA1 0x08
+#define SAP_SNA2 0x0C
+#define SAP_PROWAY_NM_INIT 0x0E
+#define SAP_NETWARE1 0x10
+#define SAP_OSINL1 0x14
+#define SAP_TI 0x18
+#define SAP_OSINL2 0x20
+#define SAP_OSINL3 0x34
+#define SAP_SNA3 0x40
+#define SAP_BPDU 0x42
+#define SAP_RS511 0x4E
+#define SAP_OSINL4 0x54
+#define SAP_X25 0x7E
+#define SAP_XNS 0x80
+#define SAP_BACNET 0x82
+#define SAP_NESTAR 0x86
+#define SAP_PROWAY_ASLM 0x8E
+#define SAP_ARP 0x98
+#define SAP_SNAP 0xAA
+#define SAP_ARP 0x98
+#define SAP_VINES1 0xBA
+#define SAP_VINES2 0xBC
+#define SAP_NETWARE2 0xE0
+#define SAP_NETBIOS 0xF0
+#define SAP_IBMNM 0xF4
+#define SAP_HPEXT 0xF8
+#define SAP_UB 0xFA
+#define SAP_RPL 0xFC
+#define SAP_OSINL5 0xFE
+#define SAP_GLOBAL 0xFF
+
+#endif /* llcsaps.h */
diff --git a/epan/nlpid.h b/epan/nlpid.h
new file mode 100644
index 0000000000..0b9370d9bf
--- /dev/null
+++ b/epan/nlpid.h
@@ -0,0 +1,60 @@
+/* nlpid.h
+ * Definitions of OSI NLPIDs (Network Layer Protocol IDs)
+ * Laurent Deniel <laurent.deniel@free.fr>
+ *
+ * $Id$
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@ethereal.com>
+ * Copyright 1998 Gerald Combs
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __NLPID_H__
+#define __NLPID_H__
+
+/* X.263 / ISO/IEC TR 9577 NLPID values. */
+
+#define NLPID_NULL 0x00
+#define NLPID_IPI_T_70 0x01 /* T.70, when an IPI */
+#define NLPID_SPI_X_29 0x01 /* X.29, when an SPI */
+#define NLPID_X_633 0x03 /* X.633 */
+#define NLPID_Q_931 0x08 /* Q.931, Q.932, X.36, ISO 11572, ISO 11582 */
+#define NLPID_Q_933 0x08 /* Q.933, on Frame Relay */
+#define NLPID_Q_2931 0x09 /* Q.2931 */
+#define NLPID_Q_2119 0x0c /* Q.2119 */
+#define NLPID_SNAP 0x80
+#define NLPID_ISO8473_CLNP 0x81 /* X.233 */
+#define NLPID_ISO9542_ESIS 0x82
+#define NLPID_ISO10589_ISIS 0x83
+#define NLPID_ISO10747_IDRP 0x85
+#define NLPID_ISO9542X25_ESIS 0x8a
+#define NLPID_ISO10030 0x8c
+#define NLPID_ISO11577 0x8d /* X.273 */
+#define NLPID_IP6 0x8e
+#define NLPID_COMPRESSED 0xb0 /* "Data compression protocol" */
+#define NLPID_SNDCF 0xc1 /* "SubNetwork Dependent Convergence Function */
+#define NLPID_IP 0xcc
+#define NLPID_PPP 0xcf
+
+extern const value_string nlpid_vals[];
+
+/*
+ * 0x09 is, in Frame Relay, LMI, Q.2931.
+ */
+#define NLPID_LMI 0x09 /* LMI */
+
+#endif
diff --git a/epan/oui.h b/epan/oui.h
new file mode 100644
index 0000000000..56277b9216
--- /dev/null
+++ b/epan/oui.h
@@ -0,0 +1,48 @@
+/* oui.h
+ * Definitions of OUIs
+ *
+ * $Id$
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@ethereal.com>
+ * Copyright 1998 - 2000 Gerald Combs
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __OUI_H__
+#define __OUI_H__
+
+#define OUI_ENCAP_ETHER 0x000000 /* encapsulated Ethernet */
+#define OUI_XEROX 0x000006 /* Xerox */
+#define OUI_CISCO 0x00000C /* Cisco (future use) */
+#define OUI_NORTEL 0x000081 /* Nortel SONMP */
+#define OUI_CISCO_90 0x0000F8 /* Cisco (IOS 9.0 and above?) */
+#define OUI_CISCOWL 0x004096 /* Cisco Wireless (Aironet) */
+#define OUI_BRIDGED 0x0080C2 /* Bridged Frame-Relay, RFC 2427 */
+ /* and Bridged ATM, RFC 2684 */
+#define OUI_ATM_FORUM 0x00A03E /* ATM Forum */
+#define OUI_EXTREME 0x00E02B /* Extreme EDP/ESRP */
+#define OUI_CABLE_BPDU 0x00E02F /* DOCSIS spanning tree BPDU */
+#define OUI_SIEMENS 0x080006 /* Siemens AG */
+#define OUI_APPLE_ATALK 0x080007 /* Appletalk */
+#define OUI_HP 0x080009 /* Hewlett-Packard */
+#define OUI_IEEE_802_1 0x0080C2 /* IEEE 802.1 Committee */
+#define OUI_IEEE_802_3 0x00120F /* IEEE 802.3 */
+#define OUI_MEDIA_ENDPOINT 0x0012BB /* Media (TIA TR-41 Committee) */
+
+extern const value_string oui_vals[];
+
+#endif
diff --git a/epan/ppptypes.h b/epan/ppptypes.h
new file mode 100644
index 0000000000..352470946b
--- /dev/null
+++ b/epan/ppptypes.h
@@ -0,0 +1,158 @@
+/* ppptypes.h
+ * Defines PPP packet types.
+ *
+ * $Id$
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@ethereal.com>
+ * Copyright 1998 Gerald Combs
+ *
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __PPPTYPES_H__
+#define __PPPTYPES_H__
+
+/* Protocol types, from Linux "ppp_defs.h" and
+
+ http://www.iana.org/assignments/ppp-numbers
+
+ */
+#define PPP_PADDING 0x1 /* Padding Protocol */
+#define PPP_ROHC_SCID 0x3 /* ROHC small-CID */
+#define PPP_ROHC_LCID 0x5 /* ROHC large-CID */
+#define PPP_IP 0x21 /* Internet Protocol */
+#define PPP_OSI 0x23 /* OSI Protocol */
+#define PPP_DEC4 0x25 /* DECnet Phase IV */
+#define PPP_AT 0x29 /* AppleTalk Protocol */
+#define PPP_IPX 0x2b /* IPX protocol */
+#define PPP_VJC_COMP 0x2d /* VJ compressed TCP */
+#define PPP_VJC_UNCOMP 0x2f /* VJ uncompressed TCP */
+#define PPP_BPDU 0x31 /* Bridging PDU (spanning tree BPDU?) */
+#define PPP_ST 0x33 /* Stream Protocol (ST-II) */
+#define PPP_VINES 0x35 /* Banyan Vines */
+#define PPP_AT_EDDP 0x39 /* AppleTalk EDDP */
+#define PPP_AT_SB 0x3b /* AppleTalk SmartBuffered */
+#define PPP_MP 0x3d /* Multilink PPP */
+#define PPP_NB 0x3f /* NETBIOS Framing */
+#define PPP_CISCO 0x41 /* Cisco Systems */
+#define PPP_ASCOM 0x43 /* Ascom Timeplex */
+#define PPP_LBLB 0x45 /* Fujitsu Link Backup and Load Balancing */
+#define PPP_RL 0x47 /* DCA Remote Lan */
+#define PPP_SDTP 0x49 /* Serial Data Transport Protocol */
+#define PPP_LLC 0x4b /* SNA over LLC */
+#define PPP_SNA 0x4d /* SNA */
+#define PPP_IPV6HC 0x4f /* IPv6 Header Compression */
+#define PPP_KNX 0x51 /* KNX Bridging Data */
+#define PPP_ENCRYPT 0x53 /* Encryption */
+#define PPP_ILE 0x55 /* Individual Link Encryption */
+#define PPP_IPV6 0x57 /* Internet Protocol Version 6 */
+#define PPP_MUX 0x59 /* PPP Multiplexing */
+#define PPP_RTP_FH 0x61 /* RTP IPHC Full Header */
+#define PPP_RTP_CTCP 0x63 /* RTP IPHC Compressed TCP */
+#define PPP_RTP_CNTCP 0x65 /* RTP IPHC Compressed Non TCP */
+#define PPP_RTP_CUDP8 0x67 /* RTP IPHC Compressed UDP 8 */
+#define PPP_RTP_CRTP8 0x69 /* RTP IPHC Compressed RTP 8 */
+#define PPP_STAMPEDE 0x6f /* Stampede Bridging */
+#define PPP_MPPLUS 0x73 /* MP+ Protocol */
+#define PPP_NTCITS_IPI 0xc1 /* NTCITS IPI */
+#define PPP_ML_SLCOMP 0xfb /* single link compression in multilink */
+#define PPP_COMP 0xfd /* compressed packet */
+#define PPP_STP_HELLO 0x0201 /* 802.1d Hello Packet */
+#define PPP_IBM_SR 0x0203 /* IBM Source Routing BPDU */
+#define PPP_DEC_LB 0x0205 /* DEC LANBridge100 Spanning Tree */
+#define PPP_CDP 0x0207 /* Cisco Discovery Protocol */
+#define PPP_NETCS 0x0209 /* Netcs Twin Routing */
+#define PPP_STP 0x020b /* Scheduled Transfer Protocol */
+#define PPP_EDP 0x020d /* Extreme Discovery Protocol */
+#define PPP_OSCP 0x0211 /* Optical Supervisory Channel Protocol */
+#define PPP_OSCP2 0x0213 /* Optical Supervisory Channel Protocol */
+#define PPP_LUXCOM 0x0231 /* Luxcom */
+#define PPP_SIGMA 0x0233 /* Sigma Network Systems */
+#define PPP_ACSP 0x0235 /* Apple Client Server Protocol */
+#define PPP_MPLS_UNI 0x0281 /* MPLS Unicast */
+#define PPP_MPLS_MULTI 0x0283 /* MPLS Multicast */
+#define PPP_P12844 0x0285 /* IEEE p1284.4 standard - data packets */
+#define PPP_ETSI 0x0287 /* ETSI TETRA Networks Procotol Type 1 */
+#define PPP_MFTP 0x0289 /* Multichannel Flow Treatment Protocol */
+#define PPP_RTP_CTCPND 0x2063 /* RTP IPHC Compressed TCP No Delta */
+#define PPP_RTP_CS 0x2065 /* RTP IPHC Context State */
+#define PPP_RTP_CUDP16 0x2067 /* RTP IPHC Compressed UDP 16 */
+#define PPP_RTP_CRDP16 0x2069 /* RTP IPHC Compressed RTP 16 */
+#define PPP_CCCP 0x4001 /* Cray Communications Control Protocol */
+#define PPP_CDPD_MNRP 0x4003 /* CDPD Mobile Network Registration Protocol */
+#define PPP_EXPANDAP 0x4005 /* Expand accelarator protocol */
+#define PPP_ODSICP 0x4007 /* ODSICP NCP */
+#define PPP_DOCSIS 0x4009 /* DOCSIS DLL */
+#define PPP_LZS 0x4021 /* Stacker LZS */
+#define PPP_REFTEK 0x4023 /* RefTek Protocol */
+#define PPP_FC 0x4025 /* Fibre Channel */
+#define PPP_EMIT 0x4027 /* EMIT Protocols */
+#define PPP_IPCP 0x8021 /* IP Control Protocol */
+#define PPP_OSICP 0x8023 /* OSI Control Protocol */
+#define PPP_XNSIDPCP 0x8025 /* Xerox NS IDP Control Protocol */
+#define PPP_DECNETCP 0x8027 /* DECnet Phase IV Control Protocol */
+#define PPP_ATCP 0x8029 /* AppleTalk Control Protocol */
+#define PPP_IPXCP 0x802b /* IPX Control Protocol */
+#define PPP_BRIDGENCP 0x8031 /* Bridging NCP */
+#define PPP_SPCP 0x8033 /* Stream Protocol Control Protocol */
+#define PPP_BVCP 0x8035 /* Banyan Vines Control Protocol */
+#define PPP_MLCP 0x803d /* Multi-Link Control Protocol */
+#define PPP_NBCP 0x803f /* NETBIOS Framing Control Protocol */
+#define PPP_CISCOCP 0x8041 /* Cisco Systems Control Protocol */
+#define PPP_ASCOMCP 0x8043 /* Ascom Timeplex Control Protocol (?) */
+#define PPP_LBLBCP 0x8045 /* Fujitsu LBLB Control Protocol */
+#define PPP_RLNCP 0x8047 /* DCA Remote Lan Network Control Protocol */
+#define PPP_SDCP 0x8049 /* Serial Data Control Protocol */
+#define PPP_LLCCP 0x804b /* SNA over LLC Control Protocol */
+#define PPP_SNACP 0x804d /* SNA Control Protocol */
+#define PPP_KNXCP 0x8051 /* KNX Bridging Control Protocol */
+#define PPP_ECP 0x8053 /* Encryption Control Protocol */
+#define PPP_ILECP 0x8055 /* Individual Encryption Control Protocol */
+#define PPP_IPV6CP 0x8057 /* IPv6 Control Protocol */
+#define PPP_MUXCP 0x8059 /* PPPMux Control Protocol */
+#define PPP_STAMPEDECP 0x806f /* Stampede Bridging Control Protocol */
+#define PPP_MPPCP 0x8073 /* MP+ Contorol Protocol */
+#define PPP_IPICP 0x80c1 /* NTCITS IPI Control Protocol */
+#define PPP_SLCC 0x80fb /* single link compression in multilink control */
+#define PPP_CCP 0x80fd /* Compression Control Protocol */
+#define PPP_CDPCP 0x8207 /* Cisco Discovery Protocol Control Protocol */
+#define PPP_NETCSCP 0x8209 /* Netcs Twin Routing */
+#define PPP_STPCP 0x820b /* STP - Control Protocol */
+#define PPP_EDPCP 0x820d /* Extreme Discovery Protocol Control Protocol */
+#define PPP_ACSPC 0x8235 /* Apple Client Server Protocol Control */
+#define PPP_MPLSCP 0x8281 /* MPLS Control Protocol */
+#define PPP_P12844CP 0x8285 /* IEEE p1284.4 standard - Protocol Control */
+#define PPP_ETSICP 0x8287 /* ETSI TETRA TNP1 Control Protocol */
+#define PPP_MFTPCP 0x8287 /* Multichannel Flow Treatment Protocol */
+#define PPP_LCP 0xc021 /* Link Control Protocol */
+#define PPP_PAP 0xc023 /* Password Authentication Protocol */
+#define PPP_LQR 0xc025 /* Link Quality Report protocol */
+#define PPP_SPAP 0xc027 /* Shiva Password Authentication Protocol */
+#define PPP_CBCP 0xc029 /* CallBack Control Protocol */
+#define PPP_BACP 0xc02b /* Bandwidth Allocation Control Protocol */
+#define PPP_BAP 0xc02d /* Bandwidth Allocation Protocol */
+#define PPP_CONTCP 0xc081 /* Container Control Protocol */
+#define PPP_CHAP 0xc223 /* Cryptographic Handshake Auth. Protocol */
+#define PPP_RSAAP 0xc225 /* RSA Authentication Protocol */
+#define PPP_EAP 0xc227 /* Extensible Authentication Protocol */
+#define PPP_SIEP 0xc229 /* Mitsubishi Security Information Exchange Protocol*/
+#define PPP_SBAP 0xc26f /* Stampede Bridging Authorization Protocol */
+#define PPP_PRPAP 0x281 /* Proprietary Authentication Protocol */
+#define PPP_PRPAP2 0x283 /* Proprietary Authentication Protocol */
+#define PPP_PRPNIAP 0x481 /* Proprietary Node ID Authentication Protocol */
+
+#endif /* ppptypes.h */
diff --git a/epan/rpc_defrag.h b/epan/rpc_defrag.h
new file mode 100644
index 0000000000..c84317c467
--- /dev/null
+++ b/epan/rpc_defrag.h
@@ -0,0 +1,43 @@
+/* rpc_defrag.h
+ * Declarations for RPC defragmentation
+ *
+ * $Id$
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@ethereal.com>
+ * Copyright 1998 Gerald Combs
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __RPC_DEFRAG_H__
+#define __RPC_DEFRAG_H__
+
+/*
+ * RPC-over-TCP fragmentation.
+ */
+#define RPC_RM_LASTFRAG 0x80000000L
+#define RPC_RM_FRAGLEN 0x7fffffffL
+
+typedef gboolean (*rec_dissector_t)(tvbuff_t *, packet_info *, proto_tree *,
+ tvbuff_t *, fragment_data *, gboolean, guint32, gboolean);
+
+extern void show_rpc_fraginfo(tvbuff_t *tvb, tvbuff_t *frag_tvb,
+ proto_tree *tree, guint32 rpc_rm, fragment_data *ipfd_head, packet_info *pinfo);
+extern int dissect_rpc_fragment(tvbuff_t *tvb, int offset, packet_info *pinfo,
+ proto_tree *tree, rec_dissector_t dissector, gboolean is_heur,
+ int proto, int ett, gboolean defragment, gboolean first_pdu);
+
+#endif /* __RPC_DEFRAG_H__ */
diff --git a/epan/rtp_pt.h b/epan/rtp_pt.h
new file mode 100644
index 0000000000..890c433707
--- /dev/null
+++ b/epan/rtp_pt.h
@@ -0,0 +1,68 @@
+/* rtp_pt.h
+ * Defines RTP payload types
+ *
+ * $Id$
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@ethereal.com>
+ * Copyright 1998 Gerald Combs
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __RTP_PT_H__
+#define __RTP_PT_H__
+
+#include "epan/value_string.h"
+
+/*
+ * RTP Payload types
+ * Table B.2 / H.225.0
+ * Also RFC 1890, and
+ *
+ * http://www.iana.org/assignments/rtp-parameters
+ */
+#define PT_PCMU 0 /* RFC 1890 */
+#define PT_1016 1 /* RFC 1890 */
+#define PT_G721 2 /* RFC 1890 */
+#define PT_GSM 3 /* RFC 1890 */
+#define PT_G723 4 /* From Vineet Kumar of Intel; see the Web page */
+#define PT_DVI4_8000 5 /* RFC 1890 */
+#define PT_DVI4_16000 6 /* RFC 1890 */
+#define PT_LPC 7 /* RFC 1890 */
+#define PT_PCMA 8 /* RFC 1890 */
+#define PT_G722 9 /* RFC 1890 */
+#define PT_L16_STEREO 10 /* RFC 1890 */
+#define PT_L16_MONO 11 /* RFC 1890 */
+#define PT_QCELP 12 /* Qualcomm Code Excited Linear Predictive coding? */
+#define PT_CN 13 /* RFC 3389 */
+#define PT_MPA 14 /* RFC 1890, RFC 2250 */
+#define PT_G728 15 /* RFC 1890 */
+#define PT_DVI4_11025 16 /* from Joseph Di Pol of Sun; see the Web page */
+#define PT_DVI4_22050 17 /* from Joseph Di Pol of Sun; see the Web page */
+#define PT_G729 18
+#define PT_CN_OLD 19 /* Payload type reserved (old version Comfort Noise) */
+#define PT_CELB 25 /* RFC 2029 */
+#define PT_JPEG 26 /* RFC 2435 */
+#define PT_NV 28 /* RFC 1890 */
+#define PT_H261 31 /* RFC 2032 */
+#define PT_MPV 32 /* RFC 2250 */
+#define PT_MP2T 33 /* RFC 2250 */
+#define PT_H263 34 /* from Chunrong Zhu of Intel; see the Web page */
+
+ETH_VAR_IMPORT const value_string rtp_payload_type_vals[];
+ETH_VAR_IMPORT const value_string rtp_payload_type_short_vals[];
+
+#endif
diff --git a/epan/sctpppids.h b/epan/sctpppids.h
new file mode 100644
index 0000000000..dc74f18882
--- /dev/null
+++ b/epan/sctpppids.h
@@ -0,0 +1,47 @@
+/* sctpppids.h
+ * Declarations of SCTP payload protocol IDs.
+ *
+ * $Id$
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@ethereal.com>
+ * Copyright 1998 Gerald Combs
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __SCTPPPIDS_H__
+#define __SCTPPPIDS_H__
+
+/*
+ * SCTP payload protocol IDs.
+ */
+#define NOT_SPECIFIED_PROTOCOL_ID 0
+#define IUA_PAYLOAD_PROTOCOL_ID 1
+#define M2UA_PAYLOAD_PROTOCOL_ID 2
+#define M3UA_PAYLOAD_PROTOCOL_ID 3
+#define SUA_PAYLOAD_PROTOCOL_ID 4
+#define M2PA_PAYLOAD_PROTOCOL_ID 5
+#define V5UA_PAYLOAD_PROTOCOL_ID 6
+#define H248_PAYLOAD_PROTOCOL_ID 7
+#define BICC_PAYLOAD_PROTOCOL_ID 8
+#define TALI_PAYLOAD_PROTOCOL_ID 9
+#define DUA_PAYLOAD_PROTOCOL_ID 10
+#define ASAP_PAYLOAD_PROTOCOL_ID 11
+#define ENRP_PAYLOAD_PROTOCOL_ID 12
+#define H323_PAYLOAD_PROTOCOL_ID 13
+#define M2TP_PAYLOAD_PROTOCOL_ID 99 /* s-link */
+
+#endif /* sctpppids.h */
diff --git a/epan/smb.h b/epan/smb.h
new file mode 100644
index 0000000000..a7d825643a
--- /dev/null
+++ b/epan/smb.h
@@ -0,0 +1,286 @@
+/* smb.h
+ * Defines for smb packet dissection
+ * Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com>
+ *
+ * $Id$
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@ethereal.com>
+ * Copyright 1998, 1999 Gerald Combs
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef _SMB_H
+#define _SMB_H
+
+ETH_VAR_IMPORT gboolean sid_name_snooping;
+
+/* SMB command codes, from the SNIA CIFS spec. With MSVC and a
+ * libethereal.dll, we need a special declaration.
+ */
+ETH_VAR_IMPORT const value_string smb_cmd_vals[];
+ETH_VAR_IMPORT const value_string trans2_cmd_vals[];
+ETH_VAR_IMPORT const value_string nt_cmd_vals[];
+
+
+#define SMB_COM_CREATE_DIRECTORY 0x00
+#define SMB_COM_DELETE_DIRECTORY 0x01
+#define SMB_COM_OPEN 0x02
+#define SMB_COM_CREATE 0x03
+#define SMB_COM_CLOSE 0x04
+#define SMB_COM_FLUSH 0x05
+#define SMB_COM_DELETE 0x06
+#define SMB_COM_RENAME 0x07
+#define SMB_COM_QUERY_INFORMATION 0x08
+#define SMB_COM_SET_INFORMATION 0x09
+#define SMB_COM_READ 0x0A
+#define SMB_COM_WRITE 0x0B
+#define SMB_COM_LOCK_BYTE_RANGE 0x0C
+#define SMB_COM_UNLOCK_BYTE_RANGE 0x0D
+#define SMB_COM_CREATE_TEMPORARY 0x0E
+#define SMB_COM_CREATE_NEW 0x0F
+#define SMB_COM_CHECK_DIRECTORY 0x10
+#define SMB_COM_PROCESS_EXIT 0x11
+#define SMB_COM_SEEK 0x12
+#define SMB_COM_LOCK_AND_READ 0x13
+#define SMB_COM_WRITE_AND_UNLOCK 0x14
+#define SMB_COM_READ_RAW 0x1A
+#define SMB_COM_READ_MPX 0x1B
+#define SMB_COM_READ_MPX_SECONDARY 0x1C
+#define SMB_COM_WRITE_RAW 0x1D
+#define SMB_COM_WRITE_MPX 0x1E
+#define SMB_COM_WRITE_MPX_SECONDARY 0x1F
+#define SMB_COM_WRITE_COMPLETE 0x20
+#define SMB_COM_QUERY_SERVER 0x21
+#define SMB_COM_SET_INFORMATION2 0x22
+#define SMB_COM_QUERY_INFORMATION2 0x23
+#define SMB_COM_LOCKING_ANDX 0x24
+#define SMB_COM_TRANSACTION 0x25
+#define SMB_COM_TRANSACTION_SECONDARY 0x26
+#define SMB_COM_IOCTL 0x27
+#define SMB_COM_IOCTL_SECONDARY 0x28
+#define SMB_COM_COPY 0x29
+#define SMB_COM_MOVE 0x2A
+#define SMB_COM_ECHO 0x2B
+#define SMB_COM_WRITE_AND_CLOSE 0x2C
+#define SMB_COM_OPEN_ANDX 0x2D
+#define SMB_COM_READ_ANDX 0x2E
+#define SMB_COM_WRITE_ANDX 0x2F
+#define SMB_COM_NEW_FILE_SIZE 0x30
+#define SMB_COM_CLOSE_AND_TREE_DISC 0x31
+#define SMB_COM_TRANSACTION2 0x32
+#define SMB_COM_TRANSACTION2_SECONDARY 0x33
+#define SMB_COM_FIND_CLOSE2 0x34
+#define SMB_COM_FIND_NOTIFY_CLOSE 0x35
+/* Used by Xenix/Unix 0x60-0x6E */
+#define SMB_COM_TREE_CONNECT 0x70
+#define SMB_COM_TREE_DISCONNECT 0x71
+#define SMB_COM_NEGOTIATE 0x72
+#define SMB_COM_SESSION_SETUP_ANDX 0x73
+#define SMB_COM_LOGOFF_ANDX 0x74
+#define SMB_COM_TREE_CONNECT_ANDX 0x75
+#define SMB_COM_QUERY_INFORMATION_DISK 0x80
+#define SMB_COM_SEARCH 0x81
+#define SMB_COM_FIND 0x82
+#define SMB_COM_FIND_UNIQUE 0x83
+#define SMB_COM_FIND_CLOSE 0x84
+#define SMB_COM_NT_TRANSACT 0xA0
+#define SMB_COM_NT_TRANSACT_SECONDARY 0xA1
+#define SMB_COM_NT_CREATE_ANDX 0xA2
+#define SMB_COM_NT_CANCEL 0xA4
+#define SMB_COM_NT_RENAME 0xA5
+#define SMB_COM_OPEN_PRINT_FILE 0xC0
+#define SMB_COM_WRITE_PRINT_FILE 0xC1
+#define SMB_COM_CLOSE_PRINT_FILE 0xC2
+#define SMB_COM_GET_PRINT_QUEUE 0xC3
+#define SMB_COM_READ_BULK 0xD8
+#define SMB_COM_WRITE_BULK 0xD9
+#define SMB_COM_WRITE_BULK_DATA 0xDA
+
+/* Error codes */
+
+#define SMB_SUCCESS 0x00 /* All OK */
+#define SMB_ERRDOS 0x01 /* DOS based error */
+#define SMB_ERRSRV 0x02 /* server error, network file manager */
+#define SMB_ERRHRD 0x03 /* Hardware style error */
+#define SMB_ERRCMD 0x04 /* Not an SMB format command */
+
+/* Error codes for the ERRSRV class */
+
+#define SMBE_error 1 /* Non specific error code */
+#define SMBE_badpw 2 /* Bad password */
+#define SMBE_badtype 3 /* reserved */
+#define SMBE_access 4 /* No permissions to do the requested operation */
+#define SMBE_invnid 5 /* tid invalid */
+#define SMBE_invnetname 6 /* Invalid servername */
+#define SMBE_invdevice 7 /* Invalid device */
+#define SMBE_qfull 49 /* Print queue full */
+#define SMBE_qtoobig 50 /* Queued item too big */
+#define SMBE_qeof 51 /* EOF in print queue dump */
+#define SMBE_invpfid 52 /* Invalid print file in smb_fid */
+#define SMBE_smbcmd 64 /* Unrecognised command */
+#define SMBE_srverror 65 /* smb server internal error */
+#define SMBE_filespecs 67 /* fid and pathname invalid combination */
+#define SMBE_badlink 68
+#define SMBE_badpermits 69 /* Access specified for a file is not valid */
+#define SMBE_badpid 70
+#define SMBE_setattrmode 71 /* attribute mode invalid */
+#define SMBE_paused 81 /* Message server paused */
+#define SMBE_msgoff 82 /* Not receiving messages */
+#define SMBE_noroom 83 /* No room for message */
+#define SMBE_rmuns 87 /* too many remote usernames */
+#define SMBE_timeout 88 /* operation timed out */
+#define SMBE_noresource 89 /* No resources currently available for request. */
+#define SMBE_toomanyuids 90 /* too many userids */
+#define SMBE_baduid 91 /* bad userid */
+#define SMBE_useMPX 250 /* temporarily unable to use raw mode, use MPX mode */
+#define SMBE_useSTD 251 /* temporarily unable to use raw mode, use standard mode */
+#define SMBE_contMPX 252 /* resume MPX mode */
+#define SMBE_badPW 253 /* Check this out ... */
+#define SMBE_nosupport 0xFFFF
+#define SMBE_unknownsmb 22 /* from NT 3.5 response */
+
+/* Error codes for the ERRHRD class */
+
+#define SMBE_nowrite 19 /* read only media */
+#define SMBE_badunit 20 /* Unknown device */
+#define SMBE_notready 21 /* Drive not ready */
+#define SMBE_badcmd 22 /* Unknown command */
+#define SMBE_data 23 /* Data (CRC) error */
+#define SMBE_badreq 24 /* Bad request structure length */
+#define SMBE_seek 25 /* Seek error */
+#define SMBE_badmedia 26 /* Unknown media type */
+#define SMBE_badsector 27 /* Sector not found */
+#define SMBE_nopaper 28 /* Printer out of paper */
+#define SMBE_write 29 /* Write fault */
+#define SMBE_read 30 /* Read fault */
+#define SMBE_general 31 /* General failure */
+#define SMBE_badshare 32 /* An open conflicts with an existing open */
+#define SMBE_lock 33 /* Lock conflict or invalid mode, or unlock of
+ lock held by another process */
+#define SMBE_wrongdisk 34 /* The wrong disk was found in a drive */
+#define SMBE_FCBunavail 35 /* No FCBs are available to process request */
+#define SMBE_sharebufexc 36 /* A sharing buffer has been exceeded */
+#define SMBE_diskfull 39
+
+/* the information we need to keep around for NT transatcion commands */
+typedef struct {
+ int subcmd;
+} smb_nt_transact_info_t;
+
+/* the information we need to keep around for transaction2 commands */
+typedef struct {
+ int subcmd;
+ int info_level;
+ gboolean resume_keys; /* if "return resume" keys set in T2 FIND_FIRST request */
+} smb_transact2_info_t;
+
+/*
+ * The information we need to save about a request in order to show the
+ * frame number of the request in the dissection of the reply.
+ */
+#define SMB_SIF_TID_IS_IPC 0x0001
+#define SMB_SIF_IS_CONTINUED 0x0002
+typedef enum {
+ SMB_EI_NONE, /* Unassigned / NULL */
+ SMB_EI_FID, /* FID */
+ SMB_EI_NTI, /* smb_nt_transact_info_t * */
+ SMB_EI_TRI, /* smb_transact_info_t * */
+ SMB_EI_T2I /* smb_transact2_info_t * */
+} smb_extra_info_t;
+typedef struct {
+ guint32 frame_req, frame_res;
+ nstime_t req_time;
+ guint16 flags;
+ guint8 cmd;
+ void *extra_info;
+ smb_extra_info_t extra_info_type;
+} smb_saved_info_t;
+
+/*
+ * The information we need to save about a Transaction request in order
+ * to dissect the reply; this includes information for use by the
+ * Remote API and Mailslot dissectors.
+ * XXX - have an additional data structure hung off of this by the
+ * subdissectors?
+ */
+typedef struct {
+ int subcmd;
+ int trans_subcmd;
+ int function;
+ int fid;
+ guint16 lanman_cmd;
+ guchar *param_descrip; /* Keep these descriptors around */
+ guchar *data_descrip;
+ guchar *aux_data_descrip;
+ int info_level;
+} smb_transact_info_t;
+
+/*
+ * Subcommand type.
+ */
+#define TRANSACTION_PIPE 0
+#define TRANSACTION_MAILSLOT 1
+
+/* these are defines used to represent different types of TIDs.
+ dont use the value 0 for any of these */
+#define TID_NORMAL 1
+#define TID_IPC 2
+
+/* this is the structure which is associated with each conversation */
+typedef struct conv_tables {
+ /* these two tables are used to match requests with responses */
+ GHashTable *unmatched;
+ GHashTable *matched;
+
+ /* This table is used to track TID->services for a conversation */
+ GHashTable *tid_service;
+ gboolean raw_ntlmssp; /* Do extended security exc use raw ntlmssp */
+} conv_tables_t;
+
+typedef struct smb_info {
+ guint8 cmd;
+ int tid, pid, uid, mid;
+ gboolean unicode; /* Are strings in this SMB Unicode? */
+ gboolean request; /* Is this a request? */
+ gboolean unidir;
+ int info_level;
+ int info_count;
+ smb_saved_info_t *sip; /* smb_saved_info_t, if any, for this */
+ conv_tables_t *ct;
+} smb_info_t;
+
+/*
+ * Show file data for a read or write.
+ */
+extern int dissect_file_data(tvbuff_t *tvb, proto_tree *tree, int offset,
+ guint16 bc, guint16 datalen);
+
+/*
+ * Add a FID to the protocol tree and the Info column.
+ */
+extern void add_fid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
+ int offset, int len, guint16 fid);
+
+/*
+ * Dissect named pipe state information.
+ */
+extern int dissect_ipc_state(tvbuff_t *tvb, proto_tree *parent_tree,
+ int offset, gboolean setstate);
+
+extern gboolean smb_dcerpc_reassembly;
+
+#endif
diff --git a/epan/x264_prt_id.h b/epan/x264_prt_id.h
new file mode 100644
index 0000000000..3cf75f352f
--- /dev/null
+++ b/epan/x264_prt_id.h
@@ -0,0 +1,35 @@
+/* x264_prt_id.h
+ * Definitions of X.264/ISO 11570 transport protocol IDs
+ *
+ * $Id$
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@ethereal.com>
+ * Copyright 1998 Gerald Combs
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __X264_PRT_ID_H__
+#define __X264_PRT_ID_H__
+
+/* X.264 / ISO 11570 transport protocol ID values. */
+
+#define PRT_ID_ISO_8073 0x01 /* X.224/ISO 8073 COTP */
+#define PRT_ID_ISO_8602 0x02 /* X.234/ISO 8602 CLTP */
+#define PRT_ID_ISO_10736_ISO_8073 0x03 /* X.274/ISO 10736 + X.224/ISO 8073 */
+#define PRT_ID_ISO_10736_ISO_8602 0x04 /* X.274/ISO 10736 + X.234/ISO 8602 */
+
+#endif