Move a pile of protocol-related headers from the top-level source
authorguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>
Sat, 17 Sep 2005 00:02:31 +0000 (00:02 +0000)
committerguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>
Sat, 17 Sep 2005 00:02:31 +0000 (00:02 +0000)
directory to the epan directory.  Some of them should perhaps ultimately
be moved to epan/dissectors, if they pertain only to stuff exported by a
particular dissector.

Fix Gerald's e-mail address in files we're moving.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@15844 f5534014-38df-0310-8fa8-9805f1628bb7

160 files changed:
Makefile.common
asn1/h248/packet-h248-template.c
configure.in
epan/Makefile.common
epan/aftypes.h [moved from aftypes.h with 96% similarity]
epan/arcnet_pids.h [moved from arcnet_pids.h with 100% similarity]
epan/bridged_pids.h [moved from bridged_pids.h with 97% similarity]
epan/chdlctypes.h [moved from chdlctypes.h with 100% similarity]
epan/dissectors/packet-3com-xns.c
epan/dissectors/packet-aarp.c
epan/dissectors/packet-ap1394.c
epan/dissectors/packet-arcnet.c
epan/dissectors/packet-arp.c
epan/dissectors/packet-asap.c
epan/dissectors/packet-atalk.c
epan/dissectors/packet-atm.c
epan/dissectors/packet-bacnet.c
epan/dissectors/packet-bpdu.c
epan/dissectors/packet-brdwlk.c
epan/dissectors/packet-cdp.c
epan/dissectors/packet-chdlc.c
epan/dissectors/packet-cisco-oui.c
epan/dissectors/packet-cisco-wireless.c
epan/dissectors/packet-clnp.c
epan/dissectors/packet-cops.c
epan/dissectors/packet-dec-bpdu.c
epan/dissectors/packet-dec-dnart.c
epan/dissectors/packet-dua.c
epan/dissectors/packet-eap.c
epan/dissectors/packet-eapol.c
epan/dissectors/packet-enc.c
epan/dissectors/packet-enrp.c
epan/dissectors/packet-esis.c
epan/dissectors/packet-eth.c
epan/dissectors/packet-ethertype.c
epan/dissectors/packet-extreme.c
epan/dissectors/packet-fc.c
epan/dissectors/packet-fcct.c
epan/dissectors/packet-fcdns.c
epan/dissectors/packet-fcels.c
epan/dissectors/packet-fcfcs.c
epan/dissectors/packet-fcfzs.c
epan/dissectors/packet-fclctl.c
epan/dissectors/packet-fcp.c
epan/dissectors/packet-fcsb3.c
epan/dissectors/packet-fcsp.c
epan/dissectors/packet-fcswils.c
epan/dissectors/packet-fr.c
epan/dissectors/packet-fw1.c
epan/dissectors/packet-g723.c
epan/dissectors/packet-gmrp.c
epan/dissectors/packet-gre.c
epan/dissectors/packet-gvrp.c
epan/dissectors/packet-h248.c
epan/dissectors/packet-h261.c
epan/dissectors/packet-h263.c
epan/dissectors/packet-hpext.c
epan/dissectors/packet-hpsw.c
epan/dissectors/packet-iapp.c
epan/dissectors/packet-iax2.c
epan/dissectors/packet-idp.c
epan/dissectors/packet-ieee80211.c
epan/dissectors/packet-ieee802a.c
epan/dissectors/packet-ip.c
epan/dissectors/packet-ipfc.c
epan/dissectors/packet-ipv6.c
epan/dissectors/packet-ipx.c
epan/dissectors/packet-isis-clv.c
epan/dissectors/packet-isis.c
epan/dissectors/packet-isl.c
epan/dissectors/packet-ismp.c
epan/dissectors/packet-isup.c
epan/dissectors/packet-iua.c
epan/dissectors/packet-juniper.c
epan/dissectors/packet-lapbether.c
epan/dissectors/packet-lapd.c
epan/dissectors/packet-llc.c
epan/dissectors/packet-lldp.c
epan/dissectors/packet-lmi.c
epan/dissectors/packet-lmp.c
epan/dissectors/packet-loop.c
epan/dissectors/packet-m2pa.c
epan/dissectors/packet-m2tp.c
epan/dissectors/packet-m2ua.c
epan/dissectors/packet-m3ua.c
epan/dissectors/packet-maccontrol.c
epan/dissectors/packet-mip6.c
epan/dissectors/packet-mpeg1.c
epan/dissectors/packet-mpls.c
epan/dissectors/packet-ndmp.c
epan/dissectors/packet-netbios.c
epan/dissectors/packet-nt-oui.c
epan/dissectors/packet-nt-sonmp.c
epan/dissectors/packet-null.c
epan/dissectors/packet-osi-options.c
epan/dissectors/packet-osi.c
epan/dissectors/packet-pagp.c
epan/dissectors/packet-pflog.c
epan/dissectors/packet-ppp.c
epan/dissectors/packet-pppoe.c
epan/dissectors/packet-q2931.c
epan/dissectors/packet-q931.c
epan/dissectors/packet-q933.c
epan/dissectors/packet-redback.c
epan/dissectors/packet-retix-bpdu.c
epan/dissectors/packet-rmp.c
epan/dissectors/packet-rpc.c
epan/dissectors/packet-rpl.c
epan/dissectors/packet-rsvp.c
epan/dissectors/packet-rtp.c
epan/dissectors/packet-sctp.c
epan/dissectors/packet-sdp.c
epan/dissectors/packet-sll.c
epan/dissectors/packet-slowprotocols.c
epan/dissectors/packet-smb-browse.c
epan/dissectors/packet-smb-mailslot.c
epan/dissectors/packet-smb-pipe.c
epan/dissectors/packet-smb-sidsnooping.c
epan/dissectors/packet-smb.c
epan/dissectors/packet-sna.c
epan/dissectors/packet-snaeth.c
epan/dissectors/packet-snmp.c
epan/dissectors/packet-sua.c
epan/dissectors/packet-symantec.c
epan/dissectors/packet-tcp.c
epan/dissectors/packet-teimanagement.c
epan/dissectors/packet-vines.c
epan/dissectors/packet-vj.c
epan/dissectors/packet-vlan.c
epan/dissectors/packet-wcp.c
epan/dissectors/packet-wfleet-hdlc.c
epan/dissectors/packet-windows-common.c
epan/dissectors/packet-x25.c
epan/dissectors/packet-x29.c
epan/etypes.h [moved from etypes.h with 100% similarity]
epan/format-oid.h [moved from format-oid.h with 100% similarity]
epan/greproto.h [moved from greproto.h with 100% similarity]
epan/iax2_codec_type.h [moved from iax2_codec_type.h with 100% similarity]
epan/ip_opts.h [moved from ip_opts.h with 100% similarity]
epan/lapd_sapi.h [moved from lapd_sapi.h with 100% similarity]
epan/llcsaps.h [moved from llcsaps.h with 100% similarity]
epan/nlpid.h [moved from nlpid.h with 100% similarity]
epan/oui.h [moved from oui.h with 100% similarity]
epan/ppptypes.h [moved from ppptypes.h with 99% similarity]
epan/rpc_defrag.h [moved from rpc_defrag.h with 100% similarity]
epan/rtp_pt.h [moved from rtp_pt.h with 100% similarity]
epan/sctpppids.h [moved from sctpppids.h with 100% similarity]
epan/smb.h [moved from smb.h with 100% similarity]
epan/x264_prt_id.h [moved from x264_prt_id.h with 100% similarity]
gtk/rtp_analysis.c
gtk/rtp_stream_dlg.c
gtk/smb_stat.c
gtk/tcp_graph.c
gtk/voip_calls.c
plugins/megaco/packet-megaco.c
plugins/rdm/packet-rdm.c
plugins/rtnet/packet-rtnet.c
plugins/v5ua/packet-v5ua.c
tap-smbsids.c
tap-smbstat.c

index 4ec024251fe572d86444f80bbda57d986e80837b..9e76c9b750a413cd6e82ea7dbb6a8e299097f124 100644 (file)
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-# Header files for dissector helpers
-# XXX - these should be moved to epan/dissectors
+#
+# XXX - this is used by dissectors and by other parts of Ethereal.
+# Ultimately, we need to handle strings "right", so that we can handle
+# strings in protocols that are in various encodings, and figure out
+# properly whether a given character can be {displayed in the GUI,
+# printed to a printout, written to a file} internally to the routines
+# handling that, with a scheme more sophisticated than "if it ain't
+# ASCII it ain't ....".
+#
 DISSECTOR_SUPPORT_INCLUDES =   \
-       aftypes.h       \
-       arcnet_pids.h   \
-       bridged_pids.h  \
-       chdlctypes.h    \
-       etypes.h        \
-       format-oid.h    \
-       greproto.h      \
-       iax2_codec_type.h       \
-       ip_opts.h       \
-       isprint.h       \
-       lapd_sapi.h     \
-       llcsaps.h       \
-       nlpid.h \
-       oui.h   \
-       ppptypes.h      \
-       rpc_defrag.h    \
-       rtp_pt.h        \
-       sctpppids.h     \
-       smb.h   \
-       x264_prt_id.h
+       isprint.h
 
 # "BUILT_SOURCES" are built before any "make all" or "make check" targets.
 BUILT_HEADER_FILES =   \
index 4a72d9d1426caebbb8bbd7b71dd6ef0519e54e00..cfec0b3d0d3ed15e465e1f7a9678ef1b81e7f37d 100644 (file)
@@ -40,7 +40,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"
index 365b6f1d15e0480cd5412f7ff2e7962c223bddfa..b97fbeefd065652523f66adcfdaaa15f4b9f913a 100644 (file)
@@ -1,6 +1,6 @@
 # $Id$
 #
-AC_INIT(etypes.h)
+AC_INIT(cfile.h)
 
 AC_PREREQ(2.52)
 
index 670bc3b668cba14fabc0571355a9f33947effe04..d985485cca2a011c7648ae4853ad906c66c94c08 100644 (file)
@@ -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
 
similarity index 96%
rename from aftypes.h
rename to epan/aftypes.h
index a0efad1a5ce40628ce6cc069c198fb5c989758fa..d49cb10d5901d352e63d9f5bbfe408bef246978f 100644 (file)
--- a/aftypes.h
@@ -4,7 +4,7 @@
  * $Id$
  *
  * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@zing.org>
+ * By Gerald Combs <gerald@ethereal.com>
  *
  * This file created and by Mike Hall <mlh@io.com>
  * Copyright 1998
similarity index 100%
rename from arcnet_pids.h
rename to epan/arcnet_pids.h
similarity index 97%
rename from bridged_pids.h
rename to epan/bridged_pids.h
index 4a1c8751aece4aaeac32a4e10bf2f02ed391047e..27e11bff0b824b93137251fc7820f4c4c6b09cfa 100644 (file)
@@ -5,10 +5,9 @@
  * $Id$
  *
  * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@zing.org>
+ * 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
similarity index 100%
rename from chdlctypes.h
rename to epan/chdlctypes.h
index c604c55f850d09e81290fd2ecfd54d8acd95661b..cbbe699d5641092ad9ac8cc82077655554fa11bc 100644 (file)
@@ -29,7 +29,7 @@
 
 #include <glib.h>
 #include <epan/packet.h>
-#include "etypes.h"
+#include <epan/etypes.h>
 
 static int proto_3com_xns = -1;
 
index 01ecf3185f77b04ebb236e4721c8e09ff3446341..22f080bb24120551800ed93ac33f205d4ab07bb5 100644 (file)
@@ -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;
index c7b130203e5835a2833161838a422c73a675791a..98866ef628d7b4d60807538c78785283077ca9dd 100644 (file)
@@ -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;
index 9fe970b3e07075125fa7b02d4844b200a20d6751..e030e755a38f5a4aa2926de7dfdcee4fb4ed2d73 100644 (file)
@@ -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 */
index 79eb5424693fb62620b0f0dfb18a7019a0af41ae..949f57cb7975089987688fcf2f5ed9a646454174 100644 (file)
@@ -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;
index 7268caff99d32debf0527359a56b2ece7ab56f9e..8d3ff3b49f90284ac97e97f97b6205644f7d9d59 100644 (file)
@@ -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;
index 721357bf40b751a6d8d76052ca5420ba1505bbb0..f2057e1281bf7a073b79fc793468e0994cdeca95 100644 (file)
 #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>
 
index d73cb95a3b67c1be9163f2efdd2e1a3ae7a8a0a5..0cf1c96728da7605863b1a15523a8a9ce7a7cf9c 100644 (file)
@@ -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"
index 111faace5210df825e9001856097a0acba4cabfc..47ae6cc767b4c75a647db9fd575456423d0e596e 100644 (file)
@@ -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;
index a0d097a64b0c9f01edcf7bf079fba1c2cb2a9ecf..676c4f5f6bf975b7574ef9783436a5e756cf7f26 100644 (file)
@@ -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 */
index 10545e8e53049be23096393ab518fe731c488714..2d90f9b5ed31ce0108557006b56d8f384deb6489 100644 (file)
@@ -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
index a24e48505821cc7ab82df0d6cf83cfe8efc9c733..91de5529866b35b15515e5197e85d10ae684eed8 100644 (file)
@@ -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>
 
 
 /*
index c000e0310e5f705c65263bb0e5b2ea1d999d8a92..8067feef35b250ecb19cf47aee014651b20eef06 100644 (file)
 
 #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"
index 505f3ebbdbd032a286d5a0a5ada2d0fb0121f25d..276e160e20f0e31dff0c2f127a86bead4cff3d8a 100644 (file)
@@ -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;
 
index a33e7efbdf2f0793f2f24d9b9e9a53d9c368b7ab..08d0ee64f96db39b41fbe9c3ee7c1a97e23e9eb9 100644 (file)
@@ -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;
 
index f717a08dd25f0a4d7da3712f9513b9a65c719d14..974e832395e7f54dc4422938f519321e24376cd9 100644 (file)
@@ -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>
 
index ad115dd4023f77f1bca0d092648083287ed8b247..ea6e9cdedd9cda8d0214a713b3f3351c08609b67 100644 (file)
@@ -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>
 
index 93dc6db819565b42a14efa45331fb50dc8f32d92..f0347f4accb4a9f3542c8436e83f560bc4d8f999 100644 (file)
@@ -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 */
 
index 03fc21aac0a67f7c73e9246fab40304bec1e5e0a..752f8bb3da0b741b3974557fdfa021042272d6b1 100644 (file)
@@ -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,
index 1337b2290acdc917a97d6e7ca7fadd85b8f00af5..89dd1b99928835b3781706c7609408a34493895d 100644 (file)
@@ -38,7 +38,7 @@
 
 #include <epan/packet.h>
 #include <epan/prefs.h>
-#include "sctpppids.h"
+#include <epan/sctpppids.h>
 
 #define NETWORK_BYTE_ORDER          FALSE
 
index defbf2573a0154a79f0ff97fe768c1760261d943..f82a093804fb9092c2f6b14589c3bef16f77fcf3 100644 (file)
@@ -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>
 
index f98827415b3eb9fbc78f100103ffe18cdd24ecbb..d772c647841ae0538cb6d30e424a08219143a4c4 100644 (file)
@@ -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;
index 4804eb3f3a482342efa7c547069995cd6be5cdec..701e2294e91c40127d106a50398453145d3a5238 100644 (file)
@@ -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"
index 5e289cbc2be6cb6791ea746434f94b3f3a3ece7a..a5af8602fee33ccb32ff3d2731c5de0a8025bb09 100644 (file)
@@ -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;
index 793e86bcfb4de6201208ab877c67a4c1333e1582..b4f4c15d63eeef8bda4b5faafa96433989fbd556 100644 (file)
@@ -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"
index a50f3e89a9e0afc0d0ac7c81ef4b2697501d3d73..06bbd86b6f6611a376edf33c89ab6435ea72e4b5 100644 (file)
@@ -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"
index 0d76c7186d470c568b9833d13770eeebc5a96fed..ae795f85ac07648b5cb7e33e956a016009e5bda7 100644 (file)
@@ -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;
 
index 4df01180f9ce51583d9a0c7a519973ac5eb8e44d..c008df0c1581ec8c4479fbacca985fc230e5fb43 100644 (file)
@@ -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;
 
index f9f46f92661ca99bc5b6bdd833a0465432c82b03..a71f0d5aaa67f75d9cedae9efb6289524a85ba6c 100644 (file)
@@ -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"
index 46c3361242483fd17046f448f70f44546ba7e672..15f211ecfeb8eb164d2062deb5811bf2fddcf589 100644 (file)
@@ -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"
 
index bcb02dedd620afc48f68666aa61285a7b05c4193..eb027f360fac8fb67e58455653caf1c777e22071 100644 (file)
@@ -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"
index 53b482f56faf381bc56e8f1602902701cce3666d..521838128920e64fd117baff06cbf02c8a61b8a2 100644 (file)
@@ -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"
 
index fc86218d8d9e06b85edf7a186f66eb20fd786daf..978a11ddbf9282c70f748d9084c188fb63172e99 100644 (file)
@@ -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"
index dbf5e8cc0afffdfd25cb12fefb6decd09e3b56c3..ad343936457bd8b13a49773a222e57971fa68bff 100644 (file)
@@ -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"
index f635c17f4df466268899b6276fb5978c57320fb3..8f87bb386bce09038408b0f7b0b0ae812baa7559 100644 (file)
@@ -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"
 
index df9604901d3c0cde1d3b384be10fbbff0da045c5..225722508bfa851985eeaa46627a7f669a33dcb9 100644 (file)
@@ -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"
index d3850119d5515a960b9ca042c01f2cc81307bad8..c4cf169a55f79ec8d9963e4310fd02f33e82b0fa 100644 (file)
@@ -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"
 
index 954e2518ff73f0e06b42cc5015eaceff46ba4b00..d532220957c38d95acf6fa9f790e3616dadff7aa 100644 (file)
@@ -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 */
index 8257810bd71746d3c278e0b99806bb2de954497a..063c5528a8de03fc7f1f580c7e1e218b17a290b8 100644 (file)
@@ -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"
index 9d0894adf3b977a56fee4995e7aa79a6cc680a32..a4158eeb741b9ed7d5eb91b781c01129796f90b3 100644 (file)
 #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.
index 43f4bfe56eb04810c7a3df4747a7e947a3290f96..a04bd39e338ce0dad5373a2760953711cd5aada9 100644 (file)
@@ -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;
index d5598324c60ab2a99ec7186a2c70289b6508fd34..6bbdf2be31cbe91981895730264536a6b1793361 100644 (file)
@@ -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 */
index 872eb92a08be002a9991e6ecefbf2b2181618a4c..9b1a74e4c730d173960414740ffce8338f69ff0a 100644 (file)
@@ -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;
index 4e105cf3373179fbe14602fb6362e2c32ee077e0..13b6d984ab02b1b03aa0e41bef3b233182381701 100644 (file)
 #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
index 80fd96ad057a3b4413701b3d191953c9799a27ca..d20d2fe4897c269f0424dbe7e084c376a096046d 100644 (file)
@@ -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;
index f6a0f7c36ce0dfe9554b8a2f42300a0f36af78c5..87710b71c9ff1d5d367ea51fb85173ae5bfeea43 100644 (file)
@@ -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"
index 8b291d2e9b527c9d2dabebdcfa0bd0f0047a0adb..0061b215f0d7d911b00b13209fb0f27866d0e369 100644 (file)
@@ -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;
index b44e11dc29606b57a18b5e53bd0d762c09aba28e..10b83a56e68495e34bf797f82d842f8a27ac8711 100644 (file)
@@ -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;
index 8a461e028babad7b201a551aca200be66ddc2bc2..91b0c09da6bc539d13325cf709d772c0873301dd 100644 (file)
@@ -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;
index f05c8f97466044df0d182653de4730ee87f939cc..24c9886a529928c6afa8d32cabb642ebd8b9d300 100644 (file)
@@ -29,7 +29,7 @@
 
 #include <glib.h>
 #include <epan/packet.h>
-#include "etypes.h"
+#include <epan/etypes.h>
 
 #include "packet-hpext.h"
 
index e95f77d4d9e9d3ae86b5cfa4215812400b185604..a81362bafb0821cd4dd7e694a9ee05d23186495e 100644 (file)
@@ -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;
index a7653ad1105d71449ad2c53ca39fd7a345b933bc..7d6bc016fc8d1773dab427fab418bbd19f22870f 100644 (file)
@@ -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"
index 6a73bb7e5ea4daa52c6cb43915201e4b07d1b8bb..95f36fa64a82b94aaf315ca64e1d1d95840db584 100644 (file)
@@ -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;
index 255600db18fca9f83e9274ae6231e6e6145bb90a..b32e7aa727a57dbb7be4d40197c8453a675d763e 100644 (file)
@@ -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>
index a5929e2d31e2e06a4781253880e2d1da96913653..4a28b56be484ec78a812cc8952ce616f11f27291 100644 (file)
@@ -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"
 
index 752b14ace9c1157af5d956edfa7a680a04934844..299820704c97fa816d2d5cdff1f4b59fa7cb9105 100644 (file)
 #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>
 
index 2845dfe7ea93db1e6c3366cbe82b25d7b59fb685..4a613ab24f273aebd865cfae05c4138dc9cbb24b 100644 (file)
@@ -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"
index 45a73a4d1c65023f17ac99e4dc099cc6329082a8..b8706d168daa3b637d44c8e81174f3b98ad287f6 100644 (file)
 #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.
index 2952e26850d236febfdacff947a607609e36338c..678ae15a1337d5e4f6c5025024bca44745f8ec56 100644 (file)
 #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>
index fb855d2aedb5ea5239259bb2517a88f6bf76ce63..334c3a96432ff34f0dac2c15e493e0b0827058a6 100644 (file)
@@ -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()
index 35486aedd90289dda0c47103d898fa423c534443..318252196078d3a186e17233a389e665ace831ec 100644 (file)
@@ -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"
index 66ef0c3984af53eb901ffb1ab4dbc5856b0d220c..e5bd09131f07169584b7a851794049b543afe4be 100644 (file)
@@ -32,7 +32,7 @@
 #include "packet-eth.h"
 #include "packet-tr.h"
 #include "packet-frame.h"
-#include "etypes.h"
+#include <epan/etypes.h>
 
 /*
  * See
index e5242ea7942e6f1d39b7ddc72ffd7e730ca51e04..f2276106266bb4b92fdc887750afeac85a02c440 100644 (file)
@@ -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 */
index 6c8321d9310714ecb62093af69e99285797ec460..a00ddd90bb293a70da714587787ac4d5fe2b6fab 100644 (file)
@@ -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
index c4224cfe47ee2bf23d4b826a4f0e6ee864025081..694cce1088ba8e6484f7c8f7957801682332562c 100644 (file)
@@ -37,7 +37,7 @@
 
 #include <epan/packet.h>
 #include <epan/prefs.h>
-#include "sctpppids.h"
+#include <epan/sctpppids.h>
 
 #define NETWORK_BYTE_ORDER          FALSE
 
index 450ad7c442d556ed6f10c12c36371c78113f28c0..231758de2896fbb188cc33f4bf585c7cc2512105 100644 (file)
 
 #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 */
index 5257e7f383732ef995968fdee33cc6b1458c2384..d083d9ffb03ab828c39e9944face2d6701d177a6 100644 (file)
@@ -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;
 
index 328f5d273f74268e9ab2374c5dbc6ae8d961ff1d..609f68af41e9a50fcd8257b86112a0101b8f1ad4 100644 (file)
@@ -33,7 +33,7 @@
 #include <epan/packet.h>
 #include <epan/xdlc.h>
 
-#include "lapd_sapi.h"
+#include <epan/lapd_sapi.h>
 
 /* ISDN/LAPD references:
  *
index 59a9b524d5d5b147864a66c4eaea134972d8ea2a..923250f8caf020e5b23d5e3e80b1ed2fbdff6a36 100644 (file)
 
 #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"
index e377ae7b0a9815f7b7af4cb7d2633026a14bc4c5..6b52d9c88d32257191d5f16048b65f2ad3f2480a 100644 (file)
@@ -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 */
index 7a37bcb50930a2dddcf12b771420e3aaf8d5111b..874d91718d0c659dd0a04d595433436b37ca2cb5 100644 (file)
@@ -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;
index 7dc51b05f7cd85751f223a667f8eb3d55ad1dfcd..3d2fd0463813b7b095cde6f73f873105d5cd958b 100644 (file)
@@ -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"
index 32c9e1ceb50450d7a869838fab1e3f9257038477..698c63bc7bfd2229f1b3c9d227b2cfeddaadce85 100644 (file)
@@ -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;
index ce1be95a634a3e9010ffed5620190a64d448a659..42ce06f55ad713606737923d2d375eff15d1469d 100644 (file)
@@ -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
index e17b80f31a2f80b837c466e56324751c942c4c10..d05bd2fddbf925e422a28a4231ed8b321583fc4c 100644 (file)
@@ -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) */
 
index cea32ec0a60c4b5f5473164e97655657c03b3fff..337d4f595cf03f411846b2aebac877b018e40f7c 100644 (file)
@@ -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
index a3f97e98b707c149a9806ab542e9f3ebfa62bef9..4f0862d23acce638c32e92b60d1012e28d20e815 100644 (file)
@@ -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
index 0d53d33a4325252dd2d5020d90f2381a5920c0f1..6fc2801b109339709bc3cd72f3c755e325250d52 100644 (file)
@@ -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;
 
index 779c2cc987f3400ff5f93b53a7fcd5ad06f18cd8..2c8339473e602d050242f5fce02518124368ce32 100644 (file)
@@ -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 */
index e0a94920e18d3277f77de3f4450a56f1977846d6..b466676f7e93e39a9217493fcd3bda8aff7fc464 100644 (file)
@@ -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 )
index abad7c198c5288501dd19de7818babaa1a8b00d2..6dbd90ff6520335383d6f0069945c73699c2ca58 100644 (file)
@@ -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"
index 1420f6eab54ea6e12ac045cbaf58b9e077bb05ea..12ddfa13b97b6b09edb66718c2e711a091b02449 100644 (file)
@@ -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
index 4534364801e68388a07ddb6bcef7120a97fec46e..8b39fdea701494a712548522abff6536eb16510f 100644 (file)
@@ -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"
index 5a471943cf1fb4668f116f37e553a809691258be..a6e19fd8a85a0dd66eee8a34e19790db0a56f383 100644 (file)
@@ -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;
 
index 7d129215a6afdd43fd5850bb56e51a5a077ace3c..68c09c4af85597c4a95d067c03aae93ba681e49c 100644 (file)
@@ -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 :-)
index b302bf735ccddd04d4e7738c510998c580f50711..722ecc627d043a883a85de7d3455da36252756ef 100644 (file)
@@ -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;
 
index 65c595c0130ee21d612e68552382c3b233d5c38a..705ac9f55da90419e1df5e6aaa73f15e6392f07b 100644 (file)
@@ -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"
index 2223e42e0123e960d90ade1f6b9d1df445a92ca0..892c2135086dcd9ea956bb0fdb74e32618afb6a9 100644 (file)
 #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"
index 60bf86f211a3e1dd2c8f73cbde0594b5839f39d0..0df2ce41e102e77c7a58fc66d1220c8380d6ad60 100644 (file)
@@ -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>
 
index 197b166a6c890c599e59bdeca6c610ca4f7f6f6d..122eeb8e27783b34126ebd462802d3f25e135cec 100644 (file)
@@ -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"
index 962b68a19b3de10e175df9832dab199cb94474e2..bc9c1a317f6564b8fef7f6210390ffbd48f460b7 100644 (file)
 #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>
 
index 9f540c58fed792e13383da8253ecaf200eefbd47..3b6870cc7297006e4686c34cbedabff2b74bb0a8 100644 (file)
@@ -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;
 
index 167fbda1ee3f6ab025dc964349962504d840e0ce..5dcb48f71aa686bccedf35f7d09b064ee1884847 100644 (file)
@@ -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"
 
index b3e5bf2b8e246d88cc7e9a003eeec4ee08d803f1..3e34a32719bcbffad6a5a82a2e280a8ad1497132 100644 (file)
 #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:
index 5ed24804e99d6e58764cf0339bf4c4e3bdf75b37..351aa8039e716538e4f537b88f5d94e16f0a2787 100644 (file)
@@ -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;
index 6b684734f911dafeebeeec34271ed9c44e19c548..120b34d887ce57da7855c5a448b4e7f908b09b9a 100644 (file)
@@ -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"
index 8cd7b3505066b263b04cd0bffd9cd204aa95fa2a..950247ed97ca3ca9d5da9f487275bff6fb292feb 100644 (file)
@@ -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>
 
index bef71585812bc4b2be20d6ffd5a5d79ac153f130..9ee506b4ccdb94ee68c513319f4972a66481785d 100644 (file)
@@ -29,7 +29,7 @@
 
 #include <glib.h>
 #include <epan/packet.h>
-#include "etypes.h"
+#include <epan/etypes.h>
 
 #include "packet-hpext.h"
 
index 3a2edc817ba6a72eb3112a87bf83841474b0687f..2676ac25256ca2de6b7fdd9c0970f2a13b445bcc 100644 (file)
@@ -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>
index 9fc84ac5afe6590397bd001baf4451adc7d79c4f..8ed71b90ae3f9d7a905f4e79b9d74c2622f53ed6 100644 (file)
@@ -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;
index ec7991803fd8eba40c7589f0c147f79ea320b3d9..095240f8fbd87f5f7cc913355b10754ca1160828 100644 (file)
@@ -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>
index 5b5097b82fa762a0cd33114860fc46f188048c5e..aa7405a904db6b1cbf80914914cb53da747f9097 100644 (file)
@@ -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>
 
index 7f479d070bdec1e652e1e213b83181b93aec09df..6435e8142feb6df943ca93875d7e4d28b3be2a9f 100644 (file)
@@ -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)
index 4572dd8d0f2dd608ad4c2fd43299998ac00b0323..37755ca7cb5fe089a5d55e7aa478ab3d0b99bc8e 100644 (file)
@@ -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"
index 768e0c4a53c6c2fc89bf7eefb1f01c7ea43cf45e..1f24276d05b7326f34fa45b8e9ffaf22af203f27 100644 (file)
@@ -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;
index 5b666e582edcc944679f45e77023b41a5cb071ad..fc59f05d173c353f71d256ffbffe21cc4a140a04 100644 (file)
@@ -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 */
index 7ad75984ba1b972c3403a7a1bce668d54e5d8e9c..0edf5f43220640008f06d1d89ce549cf439bd3c9 100644 (file)
@@ -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"
index 3dc01cb5828f9e0e59fa600d0ca88cbbf14bc811..53e23435b51ca0aa25a2bde8327a2552df75777f 100644 (file)
@@ -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"
index c751317f838f3af3b37a2818d695a3a9336ad6eb..77bf1340ad60ada8c88be1e391f2c928b01464e9 100644 (file)
@@ -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"
index 89ac02000259d4f23df8a378f5c4435c77773a3f..d3dd92140297e0affb40ef884399539376eb4164 100644 (file)
@@ -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;
index 74c85b6e5197368937af65027c54fd48d1efb9d5..3714429bdd08fc1d771ab3c86374fd8b3c0ecbe9 100644 (file)
@@ -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>
index 7a29a2e75870f6dfc2c7f1997a053f872ef8a612..f4a690d554778db9789b34926586f344aa7772b6 100644 (file)
@@ -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>
index b4e055a9171c76c54410093966f12d1a7e8ecdc3..b5abe93acf773be2e1191f661ce3d4d51f56faba 100644 (file)
@@ -28,7 +28,7 @@
 
 #include <glib.h>
 #include <epan/packet.h>
-#include "etypes.h"
+#include <epan/etypes.h>
 
 /*
  * See
index b655a13f52024e1c11f43a602a71a9092eaa91e1..284bf96ff4c8628cb9fddd7e0ca635a740f31c5a 100644 (file)
@@ -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>
 #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,
index 66f9e5530c378f40cc776673cc2fa7a5367f7fd4..4b8a540a66e7a543e0f8fdc099d117f1d1f29e29 100644 (file)
@@ -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
index bece54d0986e91893d7cb1182313ce176fe7b717..95e584e2dcd20f53e2625f1f69de500bd653a6c0 100644 (file)
@@ -30,7 +30,7 @@
 
 #include <epan/packet.h>
 
-#include "etypes.h"
+#include <epan/etypes.h>
 
 static dissector_table_t ethertype_dissector_table;
 
index 9d84cd4ff4bf8c5d0f988d50dce34381e4d4c1e1..ba13eb7f765f5fe15e5526d8320761894bc15cac 100644 (file)
@@ -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"
index 8d6dab4d41c807f7f52228cc338f7b1217b61f6c..0a6bc86c65cf22e3e9b642bd1dfc5e5d0b876139 100644 (file)
@@ -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:
  *
index c1a35516fb3c5b9e06734cb0da815af6d5b453e4..c463e90957ac15026e783879c71d4c54145c4abf 100644 (file)
 #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
 
index 203bc214596fe90a8ef288539310daa024fdafd4..79b2a60f615ee72a5cb23785807ebd524125f672 100644 (file)
@@ -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>
index bae7d8b03c409485029f6552fbbc04802a25b874..f2f14dc1161b96143509ddc1bac0dc328ccb6e23 100644 (file)
@@ -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;
index df464b85d3e7ecc7e5df3a8191c338044a1632b6..ef7a4fe7084c56994d372cdc7f74687719b26e1e 100644 (file)
 #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 */
index 51f6712375230878b0114a7a16fdba5d20f2556d..0511b362aca0b39528f14f04a7b2022e93888295 100644 (file)
@@ -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"
index 6c74c2f3fa35b338dd9f14f3bec01c20b75ef97b..45d30981491d8886aec099bb3233e6e867725f74 100644 (file)
@@ -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;
index b07e108b46d0f5c6f7adf8120804b4cec9d9828b..8724b54a587b41a9e44218ab919f6c98329240d7 100644 (file)
 #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.
index 5d7b937b47bc82876af04d5a9ef51175c29f58e7..eabde3108b26b3ceb156bdc496226b5398943ce5 100644 (file)
@@ -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;
similarity index 100%
rename from etypes.h
rename to epan/etypes.h
similarity index 100%
rename from format-oid.h
rename to epan/format-oid.h
similarity index 100%
rename from greproto.h
rename to epan/greproto.h
similarity index 100%
rename from iax2_codec_type.h
rename to epan/iax2_codec_type.h
similarity index 100%
rename from ip_opts.h
rename to epan/ip_opts.h
similarity index 100%
rename from lapd_sapi.h
rename to epan/lapd_sapi.h
similarity index 100%
rename from llcsaps.h
rename to epan/llcsaps.h
similarity index 100%
rename from nlpid.h
rename to epan/nlpid.h
similarity index 100%
rename from oui.h
rename to epan/oui.h
similarity index 99%
rename from ppptypes.h
rename to epan/ppptypes.h
index 3dbf3b02382ffbe2eab9f0f8cfdad6b5206048e8..352470946b7d8ceb2d1e6b34e1a32dae1a3471ad 100644 (file)
@@ -4,7 +4,7 @@
  * $Id$
  *
  * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@zing.org>
+ * By Gerald Combs <gerald@ethereal.com>
  * Copyright 1998 Gerald Combs
  *
  *
similarity index 100%
rename from rpc_defrag.h
rename to epan/rpc_defrag.h
similarity index 100%
rename from rtp_pt.h
rename to epan/rtp_pt.h
similarity index 100%
rename from sctpppids.h
rename to epan/sctpppids.h
similarity index 100%
rename from smb.h
rename to epan/smb.h
similarity index 100%
rename from x264_prt_id.h
rename to epan/x264_prt_id.h
index c6c9ca999a45264d1c9b8721c5427fd6a1ed672e..fb915bdd8384781adf249eb00b6cd6f3ac6e97f1 100644 (file)
@@ -56,7 +56,7 @@
 #include "register.h"
 #include <epan/dissectors/packet-rtp.h>
 #include "g711.h"
-#include "rtp_pt.h"
+#include <epan/rtp_pt.h>
 #include <epan/addr_resolv.h>
 
 /* in /gtk ... */
index 0903fd35d2191015cdd1869bc8bae31185f2ff21..5c729c6f77e988af73acc1ebdda25e7bc08a8458 100644 (file)
@@ -46,7 +46,7 @@
 #include "image/clist_ascend.xpm"
 #include "image/clist_descend.xpm"
 
-#include "rtp_pt.h"
+#include <epan/rtp_pt.h>
 
 #include <epan/address.h>
 
index dccb7b1a8a7d1681116e591c41a388466766047e..f63d262063568d3ba7b9033376689d435de3a68d 100644 (file)
@@ -39,7 +39,7 @@
 #include <epan/value_string.h>
 
 #include <epan/tap.h>
-#include "../smb.h"
+#include <epan/smb.h>
 #include "../register.h"
 #include "../timestats.h"
 #include "compat_macros.h"
index a074210a278d207125c92afe6e813e762d3b51fa..2c7e481ee433d108364eb982d2ef961140fb0ac3 100644 (file)
@@ -41,8 +41,8 @@
 #include "gui_utils.h"
 #include "color.h"
 #include "compat_macros.h"
-#include "etypes.h"
-#include "ppptypes.h"
+#include <epan/etypes.h>
+#include <epan/ppptypes.h>
 #include "dlg_utils.h"
 #include <epan/epan_dissect.h>
 #include "../stat_menu.h"
index 8d7b793fabc0ef5fa5d3dc33fe21c608d651918e..034828436e069b08baf2c529302251802f499ba9 100644 (file)
@@ -58,7 +58,7 @@
 #include <epan/dissectors/packet-rtp.h>
 #include <epan/dissectors/packet-rtp-events.h>
 #include <epan/conversation.h>
-#include "rtp_pt.h"
+#include <epan/rtp_pt.h>
 
 #include "alert_box.h"
 #include "simple_dialog.h"
index 368bc89e12be14a1bf9c1abc705b7202c1b14b9e..f3d6ef7b1c5a966dc845fb5fa8a3e5d553e8679a 100644 (file)
@@ -54,7 +54,7 @@
 #include <epan/addr_resolv.h>
 #include <epan/prefs.h>
 #include <epan/strutil.h>
-#include "sctpppids.h"
+#include <epan/sctpppids.h>
 #include <epan/dissectors/packet-tpkt.h>
 
 #ifndef ENABLE_STATIC
index 8e897a1d600e1da6c31a076b9acf350e9961543a..6d7874b59a9e5a56d4a574e3c5f4441bec842419 100644 (file)
@@ -40,7 +40,7 @@
 #include <string.h>
 #include <epan/packet.h>
 #include <epan/addr_resolv.h>
-#include "etypes.h"
+#include <epan/etypes.h>
 #include <epan/strutil.h>
 
 /* Define version if we are not building ethereal statically */
index c5929453d102895fa04ded1aac79b232f2146632..d2efa414a37cb77961148fe992b8d5a92ca25cb6 100644 (file)
@@ -41,7 +41,7 @@
 #include <string.h>
 #include <epan/packet.h>
 #include <epan/addr_resolv.h>
-#include "etypes.h"
+#include <epan/etypes.h>
 #include <epan/strutil.h>
 
 /* Define version if we are not building ethereal statically */
index f02901605bad0f15e73c386e61640aaab79cbaf5..e559deb8a7d9c5c87544238be932dbcb49e51caa 100644 (file)
@@ -47,7 +47,7 @@ G_MODULE_EXPORT const gchar version[] = VERSION;
 #include <epan/packet.h>
 #include <epan/addr_resolv.h>
 #include <epan/strutil.h>
-#include "sctpppids.h"      /* include V5UA payload protocol ID */
+#include <epan/sctpppids.h>      /* include V5UA payload protocol ID */
 
 
 #include <epan/packet.h>
index b9319e6bf14e45ba8b9f9aad73371a521f4c9d60..51b39e1637b2da25dce6b1225a4c7fd6355c9e56 100644 (file)
@@ -39,7 +39,7 @@
 #include <epan/tap.h>
 #include <epan/stat_cmd_args.h>
 #include "epan/value_string.h"
-#include "smb.h"
+#include <epan/smb.h>
 
 
 static int
index eac0346c20cd82278c9825071bd0d3fec6c45115..a1ff557ca9b02693d65e0d8302781ea38cad4727 100644 (file)
@@ -37,7 +37,7 @@
 #include <epan/tap.h>
 #include <epan/stat_cmd_args.h>
 #include "epan/value_string.h"
-#include "smb.h"
+#include <epan/smb.h>
 #include "register.h"
 #include "timestats.h"