diff options
49 files changed, 52 insertions, 52 deletions
diff --git a/Makefile.common b/Makefile.common index 0d5c9f7912..66d220121e 100644 --- a/Makefile.common +++ b/Makefile.common @@ -26,7 +26,6 @@ # Header files for dissector helpers # XXX - these should be moved to epan/dissectors DISSECTOR_SUPPORT_INCLUDES = \ - afn.h \ aftypes.h \ arcnet_pids.h \ asn1.h \ @@ -40,7 +39,6 @@ DISSECTOR_SUPPORT_INCLUDES = \ h225-persistentdata.h \ iax2_codec_type.h \ ip_opts.h \ - ipproto.h \ isprint.h \ lapd_sapi.h \ llcsaps.h \ @@ -54,7 +52,6 @@ DISSECTOR_SUPPORT_INCLUDES = \ rtp_pt.h \ sctpppids.h \ smb.h \ - t35.h \ x264_prt_id.h \ xmlstub.h diff --git a/epan/Makefile.common b/epan/Makefile.common index 4f857b129e..46bc39a7df 100644 --- a/epan/Makefile.common +++ b/epan/Makefile.common @@ -27,6 +27,7 @@ LIBETHEREAL_SRC = \ addr_and_mask.c \ addr_resolv.c \ adler32.c \ + afn.c \ atalk-utils.c \ base64.c \ bitswap.c \ @@ -45,6 +46,7 @@ LIBETHEREAL_SRC = \ filesystem.c \ frame_data.c \ in_cksum.c \ + ipproto.c \ ipv4.c \ osi-utils.c \ packet.c \ @@ -56,6 +58,7 @@ LIBETHEREAL_SRC = \ sha1.c \ sna-utils.c \ strutil.c \ + t35.c \ tap.c \ timestamp.c \ to_str.c \ @@ -68,6 +71,7 @@ LIBETHEREAL_INCLUDES = \ addr_resolv.h \ address.h \ adler32.h \ + afn.h \ atalk-utils.h \ base64.h \ bitswap.h \ @@ -90,6 +94,7 @@ LIBETHEREAL_INCLUDES = \ frame_data.h \ gdebug.h \ in_cksum.h \ + ipproto.h \ ipv4.h \ ipv6-utils.h \ nstime.h \ @@ -107,6 +112,7 @@ LIBETHEREAL_INCLUDES = \ slab.h \ sna-utils.h \ strutil.h \ + t35.h \ tap.h \ timestamp.h \ to_str.h \ @@ -116,14 +122,11 @@ LIBETHEREAL_INCLUDES = \ # dissector helpers (needed from the dissectors, but not a dissector itself) DISSECTOR_SUPPORT_SRC = \ - ../afn.c \ ../asn1.c \ ../column.c \ ../follow.c \ ../h225-persistentdata.c \ - ../ipproto.c \ ../ptvcursor.c \ ../reassemble.c \ - ../t35.c \ ../xmlstub.c @@ -27,7 +27,7 @@ #endif #include <epan/packet.h> -#include "afn.h" +#include <epan/afn.h> const value_string afn_vals[] = { { 0, "Reserved" }, diff --git a/epan/dissectors/packet-bgp.c b/epan/dissectors/packet-bgp.c index 1dd350108e..4cb64750e1 100644 --- a/epan/dissectors/packet-bgp.c +++ b/epan/dissectors/packet-bgp.c @@ -60,7 +60,7 @@ #include "packet-bgp.h" #include "packet-ipv6.h" #include "packet-frame.h" -#include "afn.h" +#include <epan/afn.h> #include <epan/prefs.h> static const value_string bgptypevals[] = { diff --git a/epan/dissectors/packet-clnp.c b/epan/dissectors/packet-clnp.c index 8386dcc7a2..365d323c24 100644 --- a/epan/dissectors/packet-clnp.c +++ b/epan/dissectors/packet-clnp.c @@ -39,7 +39,7 @@ #include "packet-isis.h" #include "packet-esis.h" #include "nlpid.h" -#include "ipproto.h" +#include <epan/ipproto.h> /* protocols and fields */ diff --git a/epan/dissectors/packet-cpha.c b/epan/dissectors/packet-cpha.c index 77f7a75543..6ce650c535 100644 --- a/epan/dissectors/packet-cpha.c +++ b/epan/dissectors/packet-cpha.c @@ -37,7 +37,7 @@ #endif #include <epan/packet.h> -#include "ipproto.h" +#include <epan/ipproto.h> static int proto_cphap = -1; diff --git a/epan/dissectors/packet-dns.c b/epan/dissectors/packet-dns.c index 55d46f1fbb..95d3841baa 100644 --- a/epan/dissectors/packet-dns.c +++ b/epan/dissectors/packet-dns.c @@ -37,7 +37,7 @@ #include <glib.h> #include <epan/ipv6-utils.h> #include <epan/packet.h> -#include "ipproto.h" +#include <epan/ipproto.h> #include <epan/addr_resolv.h> #include "packet-dns.h" #include "packet-tcp.h" diff --git a/epan/dissectors/packet-dvmrp.c b/epan/dissectors/packet-dvmrp.c index 9c919385fe..dbb776a5d1 100644 --- a/epan/dissectors/packet-dvmrp.c +++ b/epan/dissectors/packet-dvmrp.c @@ -60,7 +60,7 @@ #include <glib.h> #include <epan/packet.h> -#include "ipproto.h" +#include <epan/ipproto.h> #include "packet-igmp.h" #include "packet-dvmrp.h" diff --git a/epan/dissectors/packet-eigrp.c b/epan/dissectors/packet-eigrp.c index 7f28ed6a9f..f44dccc27f 100644 --- a/epan/dissectors/packet-eigrp.c +++ b/epan/dissectors/packet-eigrp.c @@ -33,7 +33,7 @@ #include <epan/atalk-utils.h> #include <epan/addr_and_mask.h> -#include "ipproto.h" +#include <epan/ipproto.h> #include "packet-ipx.h" /* diff --git a/epan/dissectors/packet-etherip.c b/epan/dissectors/packet-etherip.c index 302a422579..b24e2e89dd 100644 --- a/epan/dissectors/packet-etherip.c +++ b/epan/dissectors/packet-etherip.c @@ -30,7 +30,7 @@ #include <string.h> #include <glib.h> #include <epan/packet.h> -#include "ipproto.h" +#include <epan/ipproto.h> static int proto_etherip = -1; static int hf_etherip_ver = -1; diff --git a/epan/dissectors/packet-gre.c b/epan/dissectors/packet-gre.c index f1c090325f..8dd12afc3c 100644 --- a/epan/dissectors/packet-gre.c +++ b/epan/dissectors/packet-gre.c @@ -33,7 +33,7 @@ #include <epan/in_cksum.h> #include "etypes.h" #include "greproto.h" -#include "ipproto.h" +#include <epan/ipproto.h> #include "llcsaps.h" /* diff --git a/epan/dissectors/packet-h225.c b/epan/dissectors/packet-h225.c index 6f018d7523..1d848267d6 100644 --- a/epan/dissectors/packet-h225.c +++ b/epan/dissectors/packet-h225.c @@ -43,7 +43,7 @@ #include "packet-h225.h" #include "packet-h235.h" #include "packet-h245.h" -#include "t35.h" +#include <epan/t35.h> #include "h225-persistentdata.h" #define UDP_PORT_RAS1 1718 diff --git a/epan/dissectors/packet-h245.c b/epan/dissectors/packet-h245.c index 8653bffd44..46f10cf7a2 100644 --- a/epan/dissectors/packet-h245.c +++ b/epan/dissectors/packet-h245.c @@ -41,7 +41,7 @@ #include <epan/prefs.h> #include "packet-tpkt.h" #include "packet-per.h" -#include "t35.h" +#include <epan/t35.h> #include "packet-rtp.h" #include "packet-rtcp.h" diff --git a/epan/dissectors/packet-icmpv6.c b/epan/dissectors/packet-icmpv6.c index fd8675b593..e7badf1f18 100644 --- a/epan/dissectors/packet-icmpv6.c +++ b/epan/dissectors/packet-icmpv6.c @@ -50,7 +50,7 @@ #include "packet-dns.h" #include <epan/in_cksum.h> #include <epan/addr_resolv.h> -#include "ipproto.h" +#include <epan/ipproto.h> #ifndef offsetof #define offsetof(type, member) ((size_t)(&((type *)0)->member)) diff --git a/epan/dissectors/packet-igmp.c b/epan/dissectors/packet-igmp.c index fcec8a7569..bd6839b946 100644 --- a/epan/dissectors/packet-igmp.c +++ b/epan/dissectors/packet-igmp.c @@ -108,7 +108,7 @@ #endif #include <epan/packet.h> -#include "ipproto.h" +#include <epan/ipproto.h> #include <epan/in_cksum.h> #include "packet-dvmrp.h" #include "packet-pim.h" diff --git a/epan/dissectors/packet-igrp.c b/epan/dissectors/packet-igrp.c index bbbc4b60be..555e2dbe3d 100644 --- a/epan/dissectors/packet-igrp.c +++ b/epan/dissectors/packet-igrp.c @@ -36,7 +36,7 @@ #include <string.h> #include <glib.h> #include <epan/packet.h> -#include "ipproto.h" +#include <epan/ipproto.h> #define IGRP_HEADER_LENGTH 12 #define IGRP_ENTRY_LENGTH 14 diff --git a/epan/dissectors/packet-ip.c b/epan/dissectors/packet-ip.c index 7bb95d8da1..029a960f66 100644 --- a/epan/dissectors/packet-ip.c +++ b/epan/dissectors/packet-ip.c @@ -36,7 +36,7 @@ #include <epan/packet.h> #include <epan/addr_resolv.h> -#include "ipproto.h" +#include <epan/ipproto.h> #include "ip_opts.h" #include <epan/prefs.h> #include "reassemble.h" diff --git a/epan/dissectors/packet-ipdc.c b/epan/dissectors/packet-ipdc.c index 7f91eb09ab..3fafa560cc 100644 --- a/epan/dissectors/packet-ipdc.c +++ b/epan/dissectors/packet-ipdc.c @@ -45,7 +45,7 @@ #include "packet-ipdc.h" #include "packet-tcp.h" #include <epan/packet.h> -#include "ipproto.h" +#include <epan/ipproto.h> #include <epan/prefs.h> static int proto_ipdc = -1; diff --git a/epan/dissectors/packet-ipsec.c b/epan/dissectors/packet-ipsec.c index 673affdb54..fd1cc8d961 100644 --- a/epan/dissectors/packet-ipsec.c +++ b/epan/dissectors/packet-ipsec.c @@ -33,7 +33,7 @@ #include <epan/packet.h> #include "packet-ipsec.h" #include <epan/addr_resolv.h> -#include "ipproto.h" +#include <epan/ipproto.h> #include <epan/prefs.h> /* Place AH payload in sub tree */ diff --git a/epan/dissectors/packet-ipv6.c b/epan/dissectors/packet-ipv6.c index edd485e0cb..1b026a6f6b 100644 --- a/epan/dissectors/packet-ipv6.c +++ b/epan/dissectors/packet-ipv6.c @@ -38,7 +38,7 @@ #include <epan/addr_resolv.h> #include <epan/prefs.h> #include "reassemble.h" -#include "ipproto.h" +#include <epan/ipproto.h> #include "etypes.h" #include "ppptypes.h" #include "aftypes.h" diff --git a/epan/dissectors/packet-ipvs-syncd.c b/epan/dissectors/packet-ipvs-syncd.c index 97f7abe324..3b974beb23 100644 --- a/epan/dissectors/packet-ipvs-syncd.c +++ b/epan/dissectors/packet-ipvs-syncd.c @@ -35,7 +35,7 @@ #endif #include <epan/packet.h> -#include "ipproto.h" +#include <epan/ipproto.h> #include <epan/in_cksum.h> static int proto_ipvs_syncd = -1; diff --git a/epan/dissectors/packet-isakmp.c b/epan/dissectors/packet-isakmp.c index ff71dc8566..fe3f44812f 100644 --- a/epan/dissectors/packet-isakmp.c +++ b/epan/dissectors/packet-isakmp.c @@ -40,7 +40,7 @@ #include <epan/packet.h> #include <epan/ipv6-utils.h> -#include "ipproto.h" +#include <epan/ipproto.h> #include <epan/dissectors/packet-x509if.h> #define isakmp_min(a, b) ((a<b) ? a : b) diff --git a/epan/dissectors/packet-ldp.c b/epan/dissectors/packet-ldp.c index 7c1586fa9c..7589ea44d2 100644 --- a/epan/dissectors/packet-ldp.c +++ b/epan/dissectors/packet-ldp.c @@ -40,7 +40,7 @@ #include <epan/packet.h> #include <epan/addr_resolv.h> #include <epan/prefs.h> -#include "afn.h" +#include <epan/afn.h> #include "packet-frame.h" #include "packet-diffserv-mpls-common.h" diff --git a/epan/dissectors/packet-lmp.c b/epan/dissectors/packet-lmp.c index 4cc7902993..dead87a5bb 100644 --- a/epan/dissectors/packet-lmp.c +++ b/epan/dissectors/packet-lmp.c @@ -53,7 +53,7 @@ #include <prefs.h> #include <epan/in_cksum.h> #include "etypes.h" -#include "ipproto.h" +#include <epan/ipproto.h> #include "packet-ip.h" #include "packet-rsvp.h" diff --git a/epan/dissectors/packet-mip6.c b/epan/dissectors/packet-mip6.c index cf0cf16b37..607cb49e2d 100644 --- a/epan/dissectors/packet-mip6.c +++ b/epan/dissectors/packet-mip6.c @@ -30,7 +30,7 @@ #include <epan/packet.h> -#include "ipproto.h" +#include <epan/ipproto.h> #include "ip_opts.h" #include "packet-mip6.h" diff --git a/epan/dissectors/packet-ospf.c b/epan/dissectors/packet-ospf.c index 5ec4ea2ac2..eca05fe7e7 100644 --- a/epan/dissectors/packet-ospf.c +++ b/epan/dissectors/packet-ospf.c @@ -44,7 +44,7 @@ #include <glib.h> #include <epan/packet.h> -#include "ipproto.h" +#include <epan/ipproto.h> #include <epan/in_cksum.h> #include "packet-rsvp.h" diff --git a/epan/dissectors/packet-pgm.c b/epan/dissectors/packet-pgm.c index 1e49807ab8..6b90fbdb06 100644 --- a/epan/dissectors/packet-pgm.c +++ b/epan/dissectors/packet-pgm.c @@ -34,8 +34,8 @@ #include <time.h> #include <string.h> #include <epan/packet.h> -#include "afn.h" -#include "ipproto.h" +#include <epan/afn.h> +#include <epan/ipproto.h> #include <epan/in_cksum.h> #include <epan/addr_resolv.h> #include <epan/strutil.h> diff --git a/epan/dissectors/packet-pim.c b/epan/dissectors/packet-pim.c index 124e2ab346..ef997f5744 100644 --- a/epan/dissectors/packet-pim.c +++ b/epan/dissectors/packet-pim.c @@ -36,8 +36,8 @@ #endif #include <epan/packet.h> -#include "ipproto.h" -#include "afn.h" +#include <epan/ipproto.h> +#include <epan/afn.h> #include "packet-ipv6.h" #include <epan/in_cksum.h> diff --git a/epan/dissectors/packet-portmap.c b/epan/dissectors/packet-portmap.c index 72b55e6beb..724f8a95b4 100644 --- a/epan/dissectors/packet-portmap.c +++ b/epan/dissectors/packet-portmap.c @@ -32,7 +32,7 @@ #include "packet-rpc.h" #include "packet-portmap.h" -#include "ipproto.h" +#include <epan/ipproto.h> #include "epan/conversation.h" #include "epan/packet_info.h" diff --git a/epan/dissectors/packet-rsvp.c b/epan/dissectors/packet-rsvp.c index 3e213fe802..28c7ded946 100644 --- a/epan/dissectors/packet-rsvp.c +++ b/epan/dissectors/packet-rsvp.c @@ -71,7 +71,7 @@ #include <prefs.h> #include <epan/in_cksum.h> #include "etypes.h" -#include "ipproto.h" +#include <epan/ipproto.h> #include "packet-rsvp.h" #include "packet-ip.h" diff --git a/epan/dissectors/packet-sctp.c b/epan/dissectors/packet-sctp.c index 632b758639..68af7772d7 100644 --- a/epan/dissectors/packet-sctp.c +++ b/epan/dissectors/packet-sctp.c @@ -49,7 +49,7 @@ #include <epan/prefs.h> #include <epan/packet.h> #include <epan/tap.h> -#include "ipproto.h" +#include <epan/ipproto.h> #include "packet-sctp.h" #include "sctpppids.h" diff --git a/epan/dissectors/packet-t38.c b/epan/dissectors/packet-t38.c index 160ae00e51..d14086e76d 100644 --- a/epan/dissectors/packet-t38.c +++ b/epan/dissectors/packet-t38.c @@ -55,7 +55,7 @@ #include <string.h> #include <epan/prefs.h> -#include "ipproto.h" +#include <epan/ipproto.h> #include "packet-per.h" #include <epan/prefs.h> #include "packet-tpkt.h" diff --git a/epan/dissectors/packet-tcp.c b/epan/dissectors/packet-tcp.c index bd6470aded..4ce03a0a88 100644 --- a/epan/dissectors/packet-tcp.c +++ b/epan/dissectors/packet-tcp.c @@ -33,7 +33,7 @@ #include <epan/packet.h> #include <epan/addr_resolv.h> -#include "ipproto.h" +#include <epan/ipproto.h> #include "ip_opts.h" #include "follow.h" #include <epan/prefs.h> diff --git a/epan/dissectors/packet-teredo.c b/epan/dissectors/packet-teredo.c index 56c97abb63..36b0935849 100644 --- a/epan/dissectors/packet-teredo.c +++ b/epan/dissectors/packet-teredo.c @@ -38,7 +38,7 @@ #include <glib.h> #include <epan/packet.h> #include <epan/addr_resolv.h> -#include "ipproto.h" +#include <epan/ipproto.h> #include <epan/prefs.h> #include "packet-ip.h" diff --git a/epan/dissectors/packet-udp.c b/epan/dissectors/packet-udp.c index a737d7e57b..02fd247727 100644 --- a/epan/dissectors/packet-udp.c +++ b/epan/dissectors/packet-udp.c @@ -36,7 +36,7 @@ #include <glib.h> #include <epan/packet.h> #include <epan/addr_resolv.h> -#include "ipproto.h" +#include <epan/ipproto.h> #include <epan/in_cksum.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-vines.c b/epan/dissectors/packet-vines.c index 4440012385..80b86f5e26 100644 --- a/epan/dissectors/packet-vines.c +++ b/epan/dissectors/packet-vines.c @@ -35,7 +35,7 @@ #include "packet-vines.h" #include "etypes.h" #include "ppptypes.h" -#include "ipproto.h" +#include <epan/ipproto.h> #include "arcnet_pids.h" #include "llcsaps.h" diff --git a/epan/dissectors/packet-vj.c b/epan/dissectors/packet-vj.c index 6329b8a48a..015478816e 100644 --- a/epan/dissectors/packet-vj.c +++ b/epan/dissectors/packet-vj.c @@ -69,7 +69,7 @@ #include <epan/prefs.h> #include "packet-ppp.h" #include "ppptypes.h" -#include "ipproto.h" +#include <epan/ipproto.h> #include <epan/in_cksum.h> /* Define relevant IP/TCP parameters */ diff --git a/epan/dissectors/packet-vrrp.c b/epan/dissectors/packet-vrrp.c index a470f77815..dda91030ea 100644 --- a/epan/dissectors/packet-vrrp.c +++ b/epan/dissectors/packet-vrrp.c @@ -32,7 +32,7 @@ #include <string.h> #include <glib.h> #include <epan/packet.h> -#include "ipproto.h" +#include <epan/ipproto.h> #include <epan/in_cksum.h> static gint proto_vrrp = -1; diff --git a/ipproto.c b/epan/ipproto.c index cf6ea2860d..77d9bb4702 100644 --- a/ipproto.c +++ b/epan/ipproto.c @@ -32,7 +32,7 @@ #include <glib.h> -#include "ipproto.h" +#include <epan/ipproto.h> #include <epan/packet.h> #include <epan/addr_resolv.h> #include <epan/dissectors/packet-ip.h> diff --git a/ipproto.h b/epan/ipproto.h index fe112c5cf9..fe112c5cf9 100644 --- a/ipproto.h +++ b/epan/ipproto.h @@ -23,7 +23,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "t35.h" +#include <epan/t35.h> /* Recommendation T.35 (02/2000) */ /* Annex to ITU Operational Bulletin No. 766 - 15.VI.2002 */ diff --git a/gtk/decode_as_dcerpc.c b/gtk/decode_as_dcerpc.c index 7009921a1b..af3e5dacae 100644 --- a/gtk/decode_as_dcerpc.c +++ b/gtk/decode_as_dcerpc.c @@ -33,7 +33,7 @@ #include "globals.h" #include "simple_dialog.h" #include <epan/packet.h> -#include "ipproto.h" +#include <epan/ipproto.h> #include "ui_util.h" #include <epan/epan_dissect.h> #include "compat_macros.h" diff --git a/gtk/decode_as_dlg.c b/gtk/decode_as_dlg.c index 20690403a5..43d456af3e 100644 --- a/gtk/decode_as_dlg.c +++ b/gtk/decode_as_dlg.c @@ -34,7 +34,7 @@ #include "globals.h" #include "simple_dialog.h" #include <epan/packet.h> -#include "ipproto.h" +#include <epan/ipproto.h> #include "ui_util.h" #include <epan/epan_dissect.h> #include "compat_macros.h" diff --git a/gtk/follow_dlg.c b/gtk/follow_dlg.c index f7208fc48e..74985ca7d0 100644 --- a/gtk/follow_dlg.c +++ b/gtk/follow_dlg.c @@ -62,7 +62,7 @@ #include <epan/epan_dissect.h> #include <epan/filesystem.h> #include "compat_macros.h" -#include "ipproto.h" +#include <epan/ipproto.h> #include "tap_menu.h" #include "print_mswin.h" #include "font_utils.h" diff --git a/gtk/menu.c b/gtk/menu.c index 03a860d1c1..eae4b3f487 100644 --- a/gtk/menu.c +++ b/gtk/menu.c @@ -38,6 +38,7 @@ #include <epan/prefs.h> #include <epan/tap.h> #include <epan/timestamp.h> +#include <epan/ipproto.h> #include "about_dlg.h" #include "capture_dlg.h" @@ -65,7 +66,6 @@ #include "gtkglobals.h" #include "register.h" #include "../menu.h" -#include "../ipproto.h" #include "packet_list.h" #include "ethclist.h" #include "recent.h" diff --git a/gtk/tcp_graph.c b/gtk/tcp_graph.c index f287fbf5b9..f0289b520a 100644 --- a/gtk/tcp_graph.c +++ b/gtk/tcp_graph.c @@ -33,7 +33,7 @@ #include <math.h> /* rint() */ #include <string.h> -#include "ipproto.h" +#include <epan/ipproto.h> #include "globals.h" /* cfile */ #include <epan/packet.h> /* frame_data */ #include "gtkglobals.h" /* packet_list */ diff --git a/plugins/asn1/packet-asn1.c b/plugins/asn1/packet-asn1.c index 5edd07fdc2..0e7ada9700 100644 --- a/plugins/asn1/packet-asn1.c +++ b/plugins/asn1/packet-asn1.c @@ -92,7 +92,7 @@ #include <gtk/gtk.h> #endif -#include <ipproto.h> +#include <epan/ipproto.h> /* Define version if we are not building ethereal statically */ |