diff options
| author | Guy Harris <guy@alum.mit.edu> | 2005-09-17 00:02:31 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2005-09-17 00:02:31 +0000 |
| commit | b7b80d94bee66b7edbd606c5ce6afdeb009bd5b8 (patch) | |
| tree | 56b81de26d3859239959edef327f0779f660c99b | |
| parent | ef461aa94b31f7f10b710ecfbfcb4a375690c049 (diff) | |
Move a pile of protocol-related headers from the top-level source
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.
svn path=/trunk/; revision=15844
160 files changed, 243 insertions, 237 deletions
diff --git a/Makefile.common b/Makefile.common index 4ec024251f..9e76c9b750 100644 --- a/Makefile.common +++ b/Makefile.common @@ -23,29 +23,17 @@ # 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 = \ diff --git a/asn1/h248/packet-h248-template.c b/asn1/h248/packet-h248-template.c index 4a72d9d142..cfec0b3d0d 100644 --- a/asn1/h248/packet-h248-template.c +++ b/asn1/h248/packet-h248-template.c @@ -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" diff --git a/configure.in b/configure.in index 365b6f1d15..b97fbeefd0 100644 --- a/configure.in +++ b/configure.in @@ -1,6 +1,6 @@ # $Id$ # -AC_INIT(etypes.h) +AC_INIT(cfile.h) AC_PREREQ(2.52) 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/aftypes.h b/epan/aftypes.h index a0efad1a5c..d49cb10d59 100644 --- a/aftypes.h +++ b/epan/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 diff --git a/arcnet_pids.h b/epan/arcnet_pids.h index 59b815f29d..59b815f29d 100644 --- a/arcnet_pids.h +++ b/epan/arcnet_pids.h diff --git a/bridged_pids.h b/epan/bridged_pids.h index 4a1c8751ae..27e11bff0b 100644 --- a/bridged_pids.h +++ b/epan/bridged_pids.h @@ -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 diff --git a/chdlctypes.h b/epan/chdlctypes.h index 4237cfe4ca..4237cfe4ca 100644 --- a/chdlctypes.h +++ b/epan/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/etypes.h b/epan/etypes.h index 3655f5111e..3655f5111e 100644 --- a/etypes.h +++ b/epan/etypes.h diff --git a/format-oid.h b/epan/format-oid.h index 07c33cb231..07c33cb231 100644 --- a/format-oid.h +++ b/epan/format-oid.h diff --git a/greproto.h b/epan/greproto.h index c52bd5355f..c52bd5355f 100644 --- a/greproto.h +++ b/epan/greproto.h diff --git a/iax2_codec_type.h b/epan/iax2_codec_type.h index c373a35bf8..c373a35bf8 100644 --- a/iax2_codec_type.h +++ b/epan/iax2_codec_type.h diff --git a/ip_opts.h b/epan/ip_opts.h index 997983976a..997983976a 100644 --- a/ip_opts.h +++ b/epan/ip_opts.h diff --git a/lapd_sapi.h b/epan/lapd_sapi.h index 7fe486dee5..7fe486dee5 100644 --- a/lapd_sapi.h +++ b/epan/lapd_sapi.h diff --git a/llcsaps.h b/epan/llcsaps.h index 43b336d144..43b336d144 100644 --- a/llcsaps.h +++ b/epan/llcsaps.h diff --git a/nlpid.h b/epan/nlpid.h index 0b9370d9bf..0b9370d9bf 100644 --- a/nlpid.h +++ b/epan/nlpid.h diff --git a/ppptypes.h b/epan/ppptypes.h index 3dbf3b0238..352470946b 100644 --- a/ppptypes.h +++ b/epan/ppptypes.h @@ -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 * * diff --git a/rpc_defrag.h b/epan/rpc_defrag.h index c84317c467..c84317c467 100644 --- a/rpc_defrag.h +++ b/epan/rpc_defrag.h diff --git a/rtp_pt.h b/epan/rtp_pt.h index 890c433707..890c433707 100644 --- a/rtp_pt.h +++ b/epan/rtp_pt.h diff --git a/sctpppids.h b/epan/sctpppids.h index dc74f18882..dc74f18882 100644 --- a/sctpppids.h +++ b/epan/sctpppids.h diff --git a/x264_prt_id.h b/epan/x264_prt_id.h index 3cf75f352f..3cf75f352f 100644 --- a/x264_prt_id.h +++ b/epan/x264_prt_id.h diff --git a/gtk/rtp_analysis.c b/gtk/rtp_analysis.c index c6c9ca999a..fb915bdd83 100644 --- a/gtk/rtp_analysis.c +++ b/gtk/rtp_analysis.c @@ -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 ... */ diff --git a/gtk/rtp_stream_dlg.c b/gtk/rtp_stream_dlg.c index 0903fd35d2..5c729c6f77 100644 --- a/gtk/rtp_stream_dlg.c +++ b/gtk/rtp_stream_dlg.c @@ -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> diff --git a/gtk/smb_stat.c b/gtk/smb_stat.c index dccb7b1a8a..f63d262063 100644 --- a/gtk/smb_stat.c +++ b/gtk/smb_stat.c @@ -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" diff --git a/gtk/tcp_graph.c b/gtk/tcp_graph.c index a074210a27..2c7e481ee4 100644 --- a/gtk/tcp_graph.c +++ b/gtk/tcp_graph.c @@ -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" diff --git a/gtk/voip_calls.c b/gtk/voip_calls.c index 8d7b793fab..034828436e 100644 --- a/gtk/voip_calls.c +++ b/gtk/voip_calls.c @@ -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" diff --git a/plugins/megaco/packet-megaco.c b/plugins/megaco/packet-megaco.c index 368bc89e12..f3d6ef7b1c 100644 --- a/plugins/megaco/packet-megaco.c +++ b/plugins/megaco/packet-megaco.c @@ -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 diff --git a/plugins/rdm/packet-rdm.c b/plugins/rdm/packet-rdm.c index 8e897a1d60..6d7874b59a 100644 --- a/plugins/rdm/packet-rdm.c +++ b/plugins/rdm/packet-rdm.c @@ -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 */ diff --git a/plugins/rtnet/packet-rtnet.c b/plugins/rtnet/packet-rtnet.c index c5929453d1..d2efa414a3 100644 --- a/plugins/rtnet/packet-rtnet.c +++ b/plugins/rtnet/packet-rtnet.c @@ -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 */ diff --git a/plugins/v5ua/packet-v5ua.c b/plugins/v5ua/packet-v5ua.c index f02901605b..e559deb8a7 100644 --- a/plugins/v5ua/packet-v5ua.c +++ b/plugins/v5ua/packet-v5ua.c @@ -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> diff --git a/tap-smbsids.c b/tap-smbsids.c index b9319e6bf1..51b39e1637 100644 --- a/tap-smbsids.c +++ b/tap-smbsids.c @@ -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 diff --git a/tap-smbstat.c b/tap-smbstat.c index eac0346c20..a1ff557ca9 100644 --- a/tap-smbstat.c +++ b/tap-smbstat.c @@ -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" |