Move the tap infrastructure to the epan directory.
authorguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>
Wed, 29 Sep 2004 00:06:36 +0000 (00:06 +0000)
committerguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>
Wed, 29 Sep 2004 00:06:36 +0000 (00:06 +0000)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@12128 f5534014-38df-0310-8fa8-9805f1628bb7

102 files changed:
Makefile.common
epan/Makefile.common
epan/dissectors/packet-ansi_a.c
epan/dissectors/packet-ansi_map.c
epan/dissectors/packet-bootp.c
epan/dissectors/packet-dcerpc.c
epan/dissectors/packet-eth.c
epan/dissectors/packet-fc.c
epan/dissectors/packet-fddi.c
epan/dissectors/packet-frame.c
epan/dissectors/packet-gsm_a.c
epan/dissectors/packet-gsm_map.c
epan/dissectors/packet-gsm_ss.c
epan/dissectors/packet-h225.c
epan/dissectors/packet-http.c
epan/dissectors/packet-ip.c
epan/dissectors/packet-ipx.c
epan/dissectors/packet-ldap.c
epan/dissectors/packet-mtp3.c
epan/dissectors/packet-rpc.c
epan/dissectors/packet-rtp.c
epan/dissectors/packet-sctp.c
epan/dissectors/packet-sip.c
epan/dissectors/packet-smb-sidsnooping.c
epan/dissectors/packet-smb.c
epan/dissectors/packet-tcp.c
epan/dissectors/packet-teredo.c
epan/dissectors/packet-tr.c
epan/dissectors/packet-udp.c
epan/dissectors/packet-wsp.c
epan/epan.c
epan/plugins.c
epan/tap.c [moved from tap.c with 99% similarity]
epan/tap.h [moved from tap.h with 100% similarity]
file.c
gtk/ansi_a_stat.c
gtk/ansi_map_stat.c
gtk/bootp_stat.c
gtk/conversations_eth.c
gtk/conversations_fc.c
gtk/conversations_fddi.c
gtk/conversations_ip.c
gtk/conversations_ipx.c
gtk/conversations_table.c
gtk/conversations_tcpip.c
gtk/conversations_tr.c
gtk/conversations_udpip.c
gtk/dcerpc_stat.c
gtk/fc_stat.c
gtk/gsm_a_stat.c
gtk/gsm_map_stat.c
gtk/gsm_map_summary.c
gtk/h225_counter.c
gtk/h225_ras_srt.c
gtk/hostlist_eth.c
gtk/hostlist_fc.c
gtk/hostlist_fddi.c
gtk/hostlist_ip.c
gtk/hostlist_ipx.c
gtk/hostlist_table.c
gtk/hostlist_tcpip.c
gtk/hostlist_tr.c
gtk/hostlist_udpip.c
gtk/http_stat.c
gtk/io_stat.c
gtk/isup_stat.c
gtk/ldap_stat.c
gtk/main.c
gtk/menu.c
gtk/mgcp_stat.c
gtk/mtp3_stat.c
gtk/mtp3_summary.c
gtk/rpc_progs.c
gtk/rpc_stat.c
gtk/rtp_analysis.c
gtk/rtp_stream.c
gtk/sctp_stat.c
gtk/sip_stat.c
gtk/smb_stat.c
gtk/wsp_stat.c
plugins/mgcp/packet-mgcp.c
plugins/plugin_api.h
plugins/plugin_api_list.c
tap-ansi_astat.c
tap-bootpstat.c
tap-dcerpcstat.c
tap-gsm_astat.c
tap-h225counter.c
tap-h225rassrt.c
tap-httpstat.c
tap-iostat.c
tap-iousers.c
tap-mgcpstat.c
tap-protocolinfo.c
tap-protohierstat.c
tap-rpcprogs.c
tap-rpcstat.c
tap-sipstat.c
tap-smbsids.c
tap-smbstat.c
tap-wspstat.c
tethereal.c

index 0c43779fbf539703892d2c9bb977cbf6f9e37fe5..cd18cf1d341f1e9306fadc7eee3b3ca99fac2381 100644 (file)
@@ -56,7 +56,6 @@ DISSECTOR_SUPPORT_INCLUDES =  \
        sctpppids.h     \
        smb.h   \
        t35.h   \
-       tap.h   \
        x264_prt_id.h   \
        xmlstub.h
 
index 994de14fdf6af1b1aa5016a5d20b9d6b2f11aa66..fcc409c07b9cc024c5dd871f59db605da466bc9b 100644 (file)
@@ -55,6 +55,7 @@ LIBETHEREAL_SRC =             \
        sha1.c                  \
        sna-utils.c             \
        strutil.c               \
+       tap.c                   \
        timestamp.c             \
        to_str.c                \
        tvbuff.c                \
@@ -104,6 +105,7 @@ LIBETHEREAL_INCLUDES =              \
        slab.h                  \
        sna-utils.h             \
        strutil.h               \
+       tap.h                   \
        timestamp.h             \
        to_str.h                \
        tvbuff.h                \
@@ -122,6 +124,5 @@ DISSECTOR_SUPPORT_SRC =     \
        ../reassemble.c \
        ../req_resp_hdrs.c      \
        ../t35.c        \
-       ../tap.c        \
        ../xmlstub.c
 
index 1d16dc539e7c20f7f744bb7db80b76c6d8853ed3..93d65c33c375ffb3512aa489449690852e8ab9ff 100644 (file)
@@ -41,7 +41,7 @@
 
 #include "epan/packet.h"
 #include <epan/prefs.h>
-#include "tap.h"
+#include <epan/tap.h>
 
 #include "packet-bssap.h"
 #include "packet-ansi_a.h"
index 3cc58ede9409c99be0ab804245f2f78df87a1163..ad5928a32eece92c2664486f440eb7dd1dee4e42 100644 (file)
 
 #include "epan/packet.h"
 #include "asn1.h"
-#include "tap.h"
+#include <epan/tap.h>
 
 #include "packet-ansi_a.h"
 #include "packet-ansi_map.h"
index 5b9e3e60935d79b41da1d6c7d7991c1c91d24d77..1fbcd3c73877aa0f87dfd33874f2173cd2a51607 100644 (file)
@@ -51,7 +51,7 @@
 #include "packet-dns.h"                                /* for get_dns_name() */
 
 #include <epan/prefs.h>
-#include "tap.h"
+#include <epan/tap.h>
  
 static int bootp_dhcp_tap = -1;
 static int proto_bootp = -1;
index 8faf2cc931632b0cd1c93d120a32a73b85e8d950..dd6f0a3cf4bbec4f2fe63fcc96ea966b85dcfe58 100644 (file)
@@ -37,7 +37,7 @@
 #include <epan/conversation.h>
 #include <epan/prefs.h>
 #include "reassemble.h"
-#include "tap.h"
+#include <epan/tap.h>
 #include <epan/dissectors/packet-frame.h>
 #include <epan/dissectors/packet-dcerpc-nt.h>
 
index 8147c7ea12a50406db8ca9dbe7e9b318ce90e2bb..5d0f617ae55808d0a20551384930579b996b2400 100644 (file)
@@ -37,7 +37,7 @@
 #include "packet-isl.h"
 #include "packet-llc.h"
 #include <epan/crc32.h>
-#include "tap.h"
+#include <epan/tap.h>
 
 /* Interpret capture file as FW1 monitor file */
 static gboolean eth_interpret_as_fw1_monitor = FALSE;
index 8285b6072e079a39ada0452d8d9be6ea92e84fec..fe25f3cc29c3b27bb93ac7ccf66282d1f2bddad4 100644 (file)
@@ -56,7 +56,7 @@
 #include "packet-fc.h"
 #include "packet-fclctl.h"
 #include "packet-fcbls.h"
-#include "tap.h"
+#include <epan/tap.h>
 
 #define FC_HEADER_SIZE         24
 #define FC_RCTL_EISL           0x50
index b9ca93c5087c860332683e8b2e9dd61d0845d18e..9eb1de066462b509ad27388e789744a9b29ac937 100644 (file)
@@ -36,7 +36,7 @@
 #include <epan/prefs.h>
 #include "packet-fddi.h"
 #include "packet-llc.h"
-#include "tap.h"
+#include <epan/tap.h>
 
 #include <epan/addr_resolv.h>
 
index 45221d7b5a8a658792debf5887513c2135f4a485..0a1e40e71f4e0c138bfd5573a8cc0ae6a9f4c3be 100644 (file)
@@ -33,7 +33,7 @@
 #include <epan/tvbuff.h>
 #include "packet-frame.h"
 #include <epan/prefs.h>
-#include "tap.h"
+#include <epan/tap.h>
 
 int proto_frame = -1;
 int hf_frame_arrival_time = -1;
index 7ee33fd642e3fc8e3264b6285f96db3aef6f2b1f..e6d2d07075bb752adcb85682be946aecc980d3aa 100644 (file)
@@ -70,7 +70,7 @@
 
 #include "epan/packet.h"
 #include <epan/prefs.h>
-#include "tap.h"
+#include <epan/tap.h>
 #include "asn1.h"
 
 #include "packet-tcap.h"
index aa357c722758e3b3ce095feb81aecfbfba291cce..182a8ac4f89a6217e81cd3bddbd40c80a053fa9f 100644 (file)
@@ -43,7 +43,7 @@
 #include <string.h>
 
 #include "epan/packet.h"
-#include "tap.h"
+#include <epan/tap.h>
 #include "asn1.h"
 
 #include "packet-tcap.h"
index 01963aa7567d6b510ea37f2cd804de0c38eef2a9..2be9f7aef52753cd208ecb84974de52d17293b45 100644 (file)
@@ -55,7 +55,7 @@
 #include <string.h>
 
 #include "epan/packet.h"
-#include "tap.h"
+#include <epan/tap.h>
 #include "asn1.h"
 
 #include "packet-tcap.h"
index 590a93a3c7f86928f015aa245a9594ef64655634..6f018d7523f9eef7d21837e95235c56c29647e11 100644 (file)
@@ -37,7 +37,7 @@
 #include <string.h>
 
 #include <epan/prefs.h>
-#include "tap.h"
+#include <epan/tap.h>
 #include "packet-tpkt.h"
 #include "packet-per.h"
 #include "packet-h225.h"
index 7d502d2c9bef44af3fd14e9c1f839e70e908a8ef..3233ae07ccb5edb28be118b711ff52804adde947 100644 (file)
@@ -53,7 +53,7 @@ typedef enum _http_type {
        HTTP_OTHERS
 } http_type_t;
 
-#include "tap.h"
+#include <epan/tap.h>
 
 static int http_tap = -1;
 
index 9cb368abed8c5a9a358e84da66ca6ecc761091e9..7bb95d8da12781c790d617e54faa3f2126fcb977 100644 (file)
@@ -50,7 +50,7 @@
 #include "packet-ipsec.h"
 #include <epan/in_cksum.h>
 #include "nlpid.h"
-#include "tap.h"
+#include <epan/tap.h>
 
 static int ip_tap = -1;
 
index 4332eac66ce35e1fc5da3d6d7d6a319202003d62..db3fabeec5fe57efa8a75ba6074bc89456c9a672 100644 (file)
@@ -43,7 +43,7 @@
 #include "aftypes.h"
 #include "arcnet_pids.h"
 #include <epan/conversation.h>
-#include "tap.h"
+#include <epan/tap.h>
 
 static int ipx_tap = -1;
 
index 476e21d7d650ceb730db72d89c131ee7935bf7ef..ceac5ca335713aa94f88fe9496602310bf85f2f9 100644 (file)
@@ -76,7 +76,7 @@
 #include <epan/prefs.h>
 #include <epan/conversation.h>
 #include "packet-frame.h"
-#include "tap.h"
+#include <epan/tap.h>
 #include "packet-ber.h"
 #include "packet-ldap.h"
 
index 86f2fb542a8e8b7f5b0524cc98faf2e05c7f04b4..c4061c20407e4bfa2f5596fc7506475c39604701 100644 (file)
@@ -44,7 +44,7 @@
 #endif
 
 #include <epan/packet.h>
-#include "tap.h"
+#include <epan/tap.h>
 #include <epan/prefs.h>
 
 /* Initialize the protocol and registered fields */
index a904ad38b6c30109295bb74e6519625d784085ba..151bde4e04022ada554bc62838e02e9107f97890 100644 (file)
@@ -42,7 +42,7 @@
 #include "reassemble.h"
 #include "rpc_defrag.h"
 #include "packet-nfs.h"
-#include "tap.h"
+#include <epan/tap.h>
 
 /*
  * See:
index c6952c586538a4952382045a57a7650ee13f6a68..6dd725636ea794f4deb1bae62e5c33d0b9150d55 100644 (file)
@@ -64,7 +64,7 @@
 #include "packet-rtp.h"
 #include "rtp_pt.h"
 #include <epan/conversation.h>
-#include "tap.h"
+#include <epan/tap.h>
 
 #include <epan/prefs.h>
 
index ba959a002b53228f1d901dad6a04d2c10f19837b..632b758639a82c7334f488f7e94d4689feb952cd 100644 (file)
@@ -48,7 +48,7 @@
 #include <string.h>
 #include <epan/prefs.h>
 #include <epan/packet.h>
-#include "tap.h"
+#include <epan/tap.h>
 #include "ipproto.h"
 #include "packet-sctp.h"
 #include "sctpppids.h"
index 9fd487f1d93825ff57dc9579185400b9425b8eb4..a3c315ca097c32c770005b29c2018bf2386840b2 100644 (file)
@@ -56,7 +56,7 @@
 #include <epan/packet.h>
 
 #include "packet-sip.h"
-#include "tap.h"
+#include <epan/tap.h>
 
 #define TCP_PORT_SIP 5060
 #define UDP_PORT_SIP 5060
index 84cdb8125e7db7cd50243166825cdbd874711f1c..0ee0d4f99965675ef6cbea0e382010ed4772e710 100644 (file)
@@ -32,7 +32,7 @@
 #include "epan/packet_info.h"
 #include "epan/epan_dissect.h"
 #include "epan/proto.h"
-#include "tap.h"
+#include <epan/tap.h>
 #include "packet-dcerpc.h"
 #include "packet-dcerpc-nt.h"
 #include "register.h"
index 5626603cb3fc4b5e12322c82dadc609d3de3f265..b7887907697a388e6ee16f606c4c80379e99c9d9 100644 (file)
@@ -42,7 +42,7 @@
 #include <epan/strutil.h>
 #include <epan/prefs.h>
 #include "reassemble.h"
-#include "tap.h"
+#include <epan/tap.h>
 #include "packet-ipx.h"
 
 #include "packet-windows-common.h"
index 3a229b40b10059bc7e3e4c492d831d4b186208be..bd6470aded3a77a2810cbdcf3da254753e158e0e 100644 (file)
@@ -43,7 +43,7 @@
 #include <epan/conversation.h>
 #include <epan/strutil.h>
 #include "reassemble.h"
-#include "tap.h"
+#include <epan/tap.h>
 
 static int tcp_tap = -1;
 
index 052f97048943fb1a619869af26c4c437cfe1d791..56c97abb63fad801b02b88c8fbb9389e55bfb2d0 100644 (file)
@@ -42,7 +42,7 @@
 #include <epan/prefs.h>
 
 #include "packet-ip.h"
-#include "tap.h"
+#include <epan/tap.h>
 
 #define UDP_PORT_TEREDO 3544
 
index d47c12e385b4be3223b1ff7bd8db221c862c5ff2..1668cea4bb657257149d57dddaa5313e754a3191 100644 (file)
@@ -34,7 +34,7 @@
 #include "packet-tr.h"
 #include "packet-llc.h"
 #include <epan/prefs.h>
-#include "tap.h"
+#include <epan/tap.h>
 
 static int proto_tr = -1;
 static int hf_tr_dst = -1;
index 209048fdd754ce73329753bf5f8669aa24683041..a737d7e57bcf615c5c64f1ad01f8628c86a95f24 100644 (file)
@@ -44,7 +44,7 @@
 
 #include "packet-ip.h"
 #include <epan/conversation.h>
-#include "tap.h"
+#include <epan/tap.h>
 
 static int udp_tap = -1;
 
index e05bc1874c3be3952fb444d5767c9becef3cdad8..13c5a9d2ed25f36caf8e7cb3723672b779cdfbf6 100644 (file)
@@ -82,7 +82,7 @@
 #endif
 
 /* Statistics (see doc/README.tapping) */
-#include "tap.h"
+#include <epan/tap.h>
 static int wsp_tap = -1;
 
 
index 8331113361f663acea8f89315c180b6e4a3c4b7e..e623d418dc4bfb16f6693df6733a0358f79687af 100644 (file)
@@ -19,7 +19,7 @@
 #include "except.h"
 #include "packet.h"
 #include "column-utils.h"
-#include "../tap.h"
+#include "tap.h"
 #include "addr_resolv.h"
 
 static void (*report_failure_func)(const char *, va_list);
index 1e9f9c9575b69aba82535b10370534d9985db762..79a4306fe1b15244b7386be3b0ad5f8806d50858 100644 (file)
@@ -66,7 +66,7 @@
 #include <epan/dissectors/packet-tpkt.h>
 #include <epan/dissectors/packet-tcp.h>
 #include <epan/dissectors/packet-rpc.h>
-#include "tap.h"
+#include <epan/tap.h>
 #include "asn1.h"
 #include <epan/dissectors/packet-per.h>
 #include <epan/dissectors/packet-ber.h>
similarity index 99%
rename from tap.c
rename to epan/tap.c
index fb9d0bf994c0a3b739f7be1b7a993f7d9b0df12a..e73ab58a6f0464b15d7ad5e8de2c3eefbe71061d 100644 (file)
--- a/tap.c
@@ -39,7 +39,7 @@
 #include <string.h>
 #include "epan/packet_info.h"
 #include "epan/dfilter/dfilter.h"
-#include "tap.h"
+#include <epan/tap.h>
 
 static gboolean tapping_is_active=FALSE;
 int num_tap_filters=0;
similarity index 100%
rename from tap.h
rename to epan/tap.h
diff --git a/file.c b/file.c
index 7dd9643e37114b66c9267e0325bb3be344726183..5d5bf9784f113bdd7697887a024eb4a4b02c3318 100644 (file)
--- a/file.c
+++ b/file.c
@@ -85,7 +85,7 @@
 #include <epan/conversation.h>
 #include "globals.h"
 #include <epan/epan_dissect.h>
-#include "tap.h"
+#include <epan/tap.h>
 #include "tap_dfilter_dlg.h"
 #include <epan/dissectors/packet-data.h>
 
index d28f5e2272292019044969238214976c80756d07..6cc9feeef99fb257bd47afc796c0d876133a50ba 100644 (file)
@@ -45,7 +45,7 @@
 #include "image/clist_descend.xpm"
 #include "simple_dialog.h"
 #include "dlg_utils.h"
-#include "tap.h"
+#include <epan/tap.h>
 #include "../register.h"
 #include <epan/dissectors/packet-bssap.h>
 #include <epan/dissectors/packet-ansi_a.h>
index 43e852894f319687de23a907143aaf7f974b79f1..e8714019b27d2143757831f9678183d6b82d8b1d 100644 (file)
@@ -45,7 +45,7 @@
 #include "image/clist_descend.xpm"
 #include "simple_dialog.h"
 #include "dlg_utils.h"
-#include "tap.h"
+#include <epan/tap.h>
 #include "../register.h"
 #include "../globals.h"
 #include "filter_dlg.h"
index 6af60e1b8f4fa2e79c16d582ec8143f3606d5b1c..a6df442882222e6dccd3f9588260cbd7d0103adb 100644 (file)
@@ -37,7 +37,7 @@
 #include "simple_dialog.h"
 #include "ui_util.h"
 #include "dlg_utils.h"
-#include "tap.h"
+#include <epan/tap.h>
 #include "../register.h"
 #include "../globals.h"
 #include "compat_macros.h"
index 568bdcf83f1ad9c6164440803fbc8c192f2941fc..681b64657eb58f48c44806546baf9a10f5dc81a8 100644 (file)
@@ -34,7 +34,7 @@
 #include <string.h>
 #include "epan/packet.h"
 #include "tap_menu.h"
-#include "../tap.h"
+#include <epan/tap.h>
 #include "../register.h"
 #include "conversations_table.h"
 #include <epan/dissectors/packet-eth.h>
index 82f479f13eedea522065f6b2b82e9b74d4ec4fe2..b584197063a64aaff37cd1d2cc09d0a50a726a3d 100644 (file)
@@ -34,7 +34,7 @@
 #include <string.h>
 #include "epan/packet.h"
 #include "tap_menu.h"
-#include "../tap.h"
+#include <epan/tap.h>
 #include "../register.h"
 #include "conversations_table.h"
 #include <epan/dissectors/packet-fc.h>
index 8bf8a6f1c30ca492ab3e82a1055eec5977d893d4..be6222652dfe75bd94385886f44a544de2565902 100644 (file)
@@ -34,7 +34,7 @@
 #include <string.h>
 #include "epan/packet.h"
 #include "tap_menu.h"
-#include "../tap.h"
+#include <epan/tap.h>
 #include "../register.h"
 #include "conversations_table.h"
 #include <epan/dissectors/packet-fddi.h>
index ef487a1015785fcfbe8295c708c7d06c08da61c7..5a94f97f59bf306dda5c49a1b005c064cd581061 100644 (file)
@@ -34,7 +34,7 @@
 #include <string.h>
 #include "epan/packet.h"
 #include "tap_menu.h"
-#include "../tap.h"
+#include <epan/tap.h>
 #include "../register.h"
 #include "conversations_table.h"
 #include <epan/dissectors/packet-ip.h>
index e623fdebd120cdea05f36b59b6a204141e3e53d0..4b90e2a3a24b99710c1d51a3aa4f2dce09d563cd 100644 (file)
@@ -34,7 +34,7 @@
 #include <string.h>
 #include "epan/packet.h"
 #include "tap_menu.h"
-#include "../tap.h"
+#include <epan/tap.h>
 #include "../register.h"
 #include "conversations_table.h"
 #include <epan/dissectors/packet-ipx.h>
index ebd61d14639332b76bb9046b6f0f51d4ef6260e7..325f19c4707f3401741945d8c47ad31abea8d158 100644 (file)
@@ -46,7 +46,7 @@
 #include "image/clist_descend.xpm"
 #include "simple_dialog.h"
 #include "globals.h"
-#include "tap.h"
+#include <epan/tap.h>
 #include "gtk/find_dlg.h"
 #include "color.h"
 #include "gtk/color_dlg.h"
index c8a37f7c283a848daf68ffbf257f4455fadb1461..de201e87ef920ad4678c6694b66fc945a066b8ce 100644 (file)
@@ -34,7 +34,7 @@
 #include <string.h>
 #include "epan/packet.h"
 #include "tap_menu.h"
-#include "../tap.h"
+#include <epan/tap.h>
 #include "../register.h"
 #include "conversations_table.h"
 #include <epan/dissectors/packet-tcp.h>
index d05f3ef5818504dc0e63c6d7a1234b9d32667a93..c01807fcbc3471393aedbc09c70c9aa6cf35878c 100644 (file)
@@ -34,7 +34,7 @@
 #include <string.h>
 #include "epan/packet.h"
 #include "tap_menu.h"
-#include "../tap.h"
+#include <epan/tap.h>
 #include "../register.h"
 #include "conversations_table.h"
 #include <epan/dissectors/packet-tr.h>
index 601abebb563b1fff449cfb0a0819b5fc96d3d8ca..5a695c0e1fcd20c991bd26f37248bde1f77b4bdc 100644 (file)
@@ -34,7 +34,7 @@
 #include <string.h>
 #include "epan/packet.h"
 #include "tap_menu.h"
-#include "../tap.h"
+#include <epan/tap.h>
 #include "../register.h"
 #include "conversations_table.h"
 #include <epan/dissectors/packet-udp.h>
index 729d0287e525abb01f66f30d1475c088aca09dab..e9a532c37be193f13ae756d4c169fbab3a4c1afd 100644 (file)
@@ -44,7 +44,7 @@
 #include "simple_dialog.h"
 #include "dlg_utils.h"
 #include "ui_util.h"
-#include "tap.h"
+#include <epan/tap.h>
 #include "../register.h"
 #include <epan/dissectors/packet-dcerpc.h>
 #include "../globals.h"
index edc06c706a2ae5dc5f247c96c67a7ddfb15f3153..13d9c94046afdd2e2e0fcdd4b2f18ee3d0953250 100644 (file)
@@ -39,7 +39,7 @@
 #include <epan/value_string.h>
 
 #include "tap_menu.h"
-#include "../tap.h"
+#include <epan/tap.h>
 #include <epan/dissectors/packet-fc.h>
 #include "../register.h"
 #include "../timestats.h"
index e02da74d735f8a6f523926f6ce774581fc185d13..37f90a8af50adc2222e211a1e97f6e6df60bee77 100644 (file)
@@ -45,7 +45,7 @@
 #include "image/clist_descend.xpm"
 #include "simple_dialog.h"
 #include "dlg_utils.h"
-#include "tap.h"
+#include <epan/tap.h>
 #include "../register.h"
 #include <epan/dissectors/packet-bssap.h>
 #include <epan/dissectors/packet-gsm_a.h>
index d68083622dc896f2ea8f80e48c9097a86c08adcf..b8a0e4df74f32a62a7f540b08cebb1569211a3de 100644 (file)
@@ -46,7 +46,7 @@
 #include "simple_dialog.h"
 #include "dlg_utils.h"
 #include "ui_util.h"
-#include "tap.h"
+#include <epan/tap.h>
 #include "../register.h"
 #include "../globals.h"
 #include "filter_dlg.h"
index e8c913b85d6973a960de52774202c5cf072c4247..b70f5650af3fdb60f3ffb9c60757eefb91d0b65d 100644 (file)
@@ -43,7 +43,7 @@
 #include "dlg_utils.h"
 #include "ui_util.h"
 #include "compat_macros.h"
-#include "tap.h"
+#include <epan/tap.h>
 
 #include <epan/dissectors/packet-gsm_map.h>
 #include "gsm_map_stat.h"
index e393120edd55a47b727accec53a0caf670f070cd..5fd792a2af599fa54ff23b25572ca7db39f3d530 100644 (file)
@@ -40,7 +40,7 @@
 #include <epan/value_string.h>
 
 #include "tap_menu.h"
-#include "../tap.h"
+#include <epan/tap.h>
 #include "../register.h"
 #include <epan/dissectors/packet-h225.h>
 #include "gtk_stat_util.h"
index a82aee1725018658dab95b0c52b34f9181ee7251..a0fea7ad381bac4ea8fd891c0e8e88f41657e3d4 100644 (file)
@@ -40,7 +40,7 @@
 #include <epan/value_string.h>
 
 #include "tap_menu.h"
-#include "../tap.h"
+#include <epan/tap.h>
 #include "../register.h"
 #include <epan/dissectors/packet-h225.h>
 #include "../timestats.h"
index 330a7ca2f44f1c17f6a006ae8feb33a5de7a313f..814645c5b5a8bdf11df90762eb7097d289f47474 100644 (file)
@@ -34,7 +34,7 @@
 #include <string.h>
 #include "epan/packet.h"
 #include "tap_menu.h"
-#include "../tap.h"
+#include <epan/tap.h>
 #include "../register.h"
 #include "hostlist_table.h"
 #include <epan/dissectors/packet-eth.h>
index 30cef350e1d8d044873619737015b524cb3bbe79..e3b4c44687122554278369309fde77a9f59246ac 100644 (file)
@@ -34,7 +34,7 @@
 #include <string.h>
 #include "epan/packet.h"
 #include "tap_menu.h"
-#include "../tap.h"
+#include <epan/tap.h>
 #include "../register.h"
 #include "hostlist_table.h"
 #include <epan/dissectors/packet-fc.h>
index 63c23b6598e997298f43759e3142c9e6a3438d0d..0ca976dd5d8ba7a7721c8fda91d54a00bfefdcdf 100644 (file)
@@ -34,7 +34,7 @@
 #include <string.h>
 #include "epan/packet.h"
 #include "tap_menu.h"
-#include "../tap.h"
+#include <epan/tap.h>
 #include "../register.h"
 #include "hostlist_table.h"
 #include <epan/dissectors/packet-fddi.h>
index 32544c4f2bfca81948319bd48eb17c85bb462aef..0f95fcce5190425df6b728251b0f731f01df126c 100644 (file)
@@ -36,7 +36,7 @@
 #include <string.h>
 #include "epan/packet.h"
 #include "tap_menu.h"
-#include "../tap.h"
+#include <epan/tap.h>
 #include "../register.h"
 #include "hostlist_table.h"
 #include <epan/dissectors/packet-ip.h>
index 12be5b2aa3f4db308cd6ec568bfafae61962acf7..a59a85d5f0fefdc15d6da2568f356e1e140ab580 100644 (file)
@@ -34,7 +34,7 @@
 #include <string.h>
 #include "epan/packet.h"
 #include "tap_menu.h"
-#include "../tap.h"
+#include <epan/tap.h>
 #include "../register.h"
 #include "hostlist_table.h"
 #include <epan/dissectors/packet-ipx.h>
index 4d9903afeb05254dbda65d7422860e91190d3eeb..84e3cc4589b4702e10c96f871960a7615880c684 100644 (file)
@@ -41,7 +41,7 @@
 #include "image/clist_descend.xpm"
 #include "simple_dialog.h"
 #include "globals.h"
-#include "tap.h"
+#include <epan/tap.h>
 #include "gtk/find_dlg.h"
 #include "color.h"
 #include "gtk/color_dlg.h"
index 1b75b93fd62fe1d2c73ae42efb11147e98929290..049086666784e1b3648944d4fb6486caa1c39a2a 100644 (file)
@@ -34,7 +34,7 @@
 #include <string.h>
 #include "epan/packet.h"
 #include "tap_menu.h"
-#include "../tap.h"
+#include <epan/tap.h>
 #include "../register.h"
 #include "hostlist_table.h"
 #include <epan/dissectors/packet-tcp.h>
index e0cd79d62a0c0c0640bbbcc8b806b76efadd9ab9..3109521fefab01b53528b644b3c1d1f70da0f727 100644 (file)
@@ -34,7 +34,7 @@
 #include <string.h>
 #include "epan/packet.h"
 #include "tap_menu.h"
-#include "../tap.h"
+#include <epan/tap.h>
 #include "../register.h"
 #include "hostlist_table.h"
 #include <epan/dissectors/packet-tr.h>
index 5574ad20c3fb3044fae25d90a8a553a841e3b3cc..b7c048051efdd9f20a99ea9c1a1911f081799122 100644 (file)
@@ -34,7 +34,7 @@
 #include <string.h>
 #include "epan/packet.h"
 #include "tap_menu.h"
-#include "../tap.h"
+#include <epan/tap.h>
 #include "../register.h"
 #include "hostlist_table.h"
 #include <epan/dissectors/packet-udp.h>
index 982c928095fef0d02091b60d790f7d929796955f..32ad427fd0476144d99376549007eaba4d9f2148 100644 (file)
@@ -37,7 +37,7 @@
 #include "simple_dialog.h"
 #include "ui_util.h"
 #include "dlg_utils.h"
-#include "tap.h"
+#include <epan/tap.h>
 #include "../register.h"
 #include <epan/dissectors/packet-http.h>
 #include "../globals.h"
index 2329062d8913dd53deb9be8d7780c28a8c695859..2518492a285a17a2bcf74bf400bd2c6791c2ac7b 100644 (file)
@@ -43,7 +43,7 @@
 #include "gtkglobals.h"
 #include "ui_util.h"
 #include "tap_menu.h"
-#include "../tap.h"
+#include <epan/tap.h>
 #include "../register.h"
 #include "alert_box.h"
 #include "simple_dialog.h"
index 37f8a2680554dda6f2221f0c32428e882c53fb57..286fb9532b527d5ce5f01e37b6126bf2bbbc1178 100644 (file)
@@ -45,7 +45,7 @@
 #include "image/clist_descend.xpm"
 #include "simple_dialog.h"
 #include "dlg_utils.h"
-#include "tap.h"
+#include <epan/tap.h>
 #include "../register.h"
 #include "../globals.h"
 #include "filter_dlg.h"
index e5f4621404453f5e6a488cb792ccaec2263109f1..c63497cb6f50798014cb96bfbf9ac72a517bb646 100644 (file)
@@ -39,7 +39,7 @@
 #include <epan/value_string.h>
 
 #include "tap_menu.h"
-#include "../tap.h"
+#include <epan/tap.h>
 #include <epan/dissectors/packet-ldap.h>
 #include "../register.h"
 #include "../timestats.h"
index b4771686e7ee0b5427e5689fa587a09806eed48d..f9b6ed8e2b85a7a26ef4e93f37167c1829868d0e 100644 (file)
@@ -96,7 +96,7 @@
 #include "prefs-int.h"
 #include "ringbuffer.h"
 #include "../ui_util.h"     /* beware: ui_util.h exists twice! */
-#include "tap.h"
+#include <epan/tap.h>
 #include "util.h"
 #include "clopts_common.h"
 #include "version_info.h"
index 4bcd04647d5a577d931844814c758e1f0779e756..03a860d1c138ad654c13c36b1ef8895424eb0905 100644 (file)
@@ -36,6 +36,9 @@
 #include <epan/packet.h>
 #include <epan/addr_resolv.h>
 #include <epan/prefs.h>
+#include <epan/tap.h>
+#include <epan/timestamp.h>
+
 #include "about_dlg.h"
 #include "capture_dlg.h"
 #include "color_dlg.h"
@@ -61,7 +64,6 @@
 #include "toolbar.h"
 #include "gtkglobals.h"
 #include "register.h"
-#include "../tap.h"
 #include "../menu.h"
 #include "../ipproto.h"
 #include "packet_list.h"
@@ -72,7 +74,6 @@
 #include "conversations_table.h"
 #include "hostlist_table.h"
 #include "simple_dialog.h"
-#include <epan/timestamp.h>
 
 GtkWidget *popup_menu_object;
 
index 247ee317ca974f5abe8e582d3ebd781dc9599f43..699e9ebc4ef25b0ece7b5d86911cc6974c8fbf94 100644 (file)
@@ -40,7 +40,7 @@
 #include <epan/value_string.h>
 
 #include "tap_menu.h"
-#include "../tap.h"
+#include <epan/tap.h>
 #include "../register.h"
 #include "../plugins/mgcp/packet-mgcp.h"
 #include "../timestats.h"
index f2596346bf1428e21c3f744cb447e1eebddd813f..ad748016512c34ec15c2a258b82b30a37a3be111 100644 (file)
@@ -45,7 +45,7 @@
 #include "image/clist_descend.xpm"
 #include "simple_dialog.h"
 #include "dlg_utils.h"
-#include "tap.h"
+#include <epan/tap.h>
 #include "../register.h"
 #include "../globals.h"
 #include "filter_dlg.h"
index 1716ef1029c287871dea35dd99a5c3a8ae4b365c..5bdbd73a21e4d462c2c97f27e81101ac4b673148 100644 (file)
@@ -46,7 +46,7 @@
 #include "dlg_utils.h"
 #include "ui_util.h"
 #include "compat_macros.h"
-#include "tap.h"
+#include <epan/tap.h>
 
 #include <epan/dissectors/packet-mtp3.h>
 #include "mtp3_stat.h"
index d24996c4058c779d2a45d02cb169bc16dfd3ecba..2474f6bcff5aa5efe48ad47ab91029ea54ac4147 100644 (file)
@@ -38,7 +38,7 @@
 #include <epan/epan.h>
 
 #include "tap_menu.h"
-#include "tap.h"
+#include <epan/tap.h>
 #include "../register.h"
 #include <epan/dissectors/packet-rpc.h>
 #include "../globals.h"
index bf64e4893946c3ee83bc1378decffef107b81fbf..31f58edd23824e9ba49418bcc9df90cc965bda85 100644 (file)
@@ -41,7 +41,7 @@
 #include "simple_dialog.h"
 #include "ui_util.h"
 #include "dlg_utils.h"
-#include "tap.h"
+#include <epan/tap.h>
 #include "../register.h"
 #include <epan/dissectors/packet-rpc.h>
 #include "../globals.h"
index cddea86e6f0cb07b53be8daa63f54c1a07d57e1b..431db1c4a5a2775a829c50bd82c610a74e400a3f 100644 (file)
@@ -48,7 +48,7 @@
 #include <epan/filesystem.h>
 
 #include "util.h"
-#include "tap.h"
+#include <epan/tap.h>
 #include "register.h"
 #include <epan/dissectors/packet-rtp.h>
 #include "g711.h"
index eb7365deebea4add9a8f0cc62ea5c74ba0349904..96ed9a2b7d5f2a55f5f943ef15d811430e277211 100644 (file)
@@ -34,7 +34,7 @@
 
 #include "globals.h"
 
-#include "tap.h"
+#include <epan/tap.h>
 #include "register.h"
 #include <epan/dissectors/packet-rtp.h>
 
index 831b0554baa6567f9bab0b02da444e0a40d405bb..52dfbed234d04adb3ef2dea79e6d1e607fd2f010 100644 (file)
@@ -31,7 +31,7 @@
 #include "simple_dialog.h"      /* Both is used for error handling */
 #include "globals.h"
 #include "epan/packet_info.h"   /* Needed for packet_info */
-#include "tap.h"                /* Needed for register_tap_listener */
+#include <epan/tap.h>                /* Needed for register_tap_listener */
 #include "tap_menu.h"
 #include "dlg_utils.h"
 #include "compat_macros.h"
index a50e57a56690fb9b3c54d3a494c115597c07bb25..efd2e9a5cd9c95b6936c6f23f68ec7b76bfded28 100644 (file)
@@ -38,7 +38,7 @@
 #include "simple_dialog.h"
 #include "ui_util.h"
 #include "dlg_utils.h"
-#include "tap.h"
+#include <epan/tap.h>
 #include "../register.h"
 #include <epan/dissectors/packet-sip.h>
 #include "../globals.h"
index f193494f91953b682a121c4932deddd72d2964b3..c9197e32cf4b81fbae4abc02b726e2d679938eac 100644 (file)
@@ -39,7 +39,7 @@
 #include <epan/value_string.h>
 
 #include "tap_menu.h"
-#include "../tap.h"
+#include <epan/tap.h>
 #include "../smb.h"
 #include "../register.h"
 #include "../timestats.h"
index 4a30dbc65f27e539501ab1e013c958f93b1b05a3..45868c3235d787a31ed2445c9325e5baf802d82a 100644 (file)
@@ -38,7 +38,7 @@
 #include "simple_dialog.h"
 #include "ui_util.h"
 #include "dlg_utils.h"
-#include "tap.h"
+#include <epan/tap.h>
 #include "../register.h"
 #include "../globals.h"
 #include "compat_macros.h"
index 1efdd2df54022d3c9458feece8c7e317300c976b..154b68b5acd758f3ac1c9f4ec35098c0662a16d0 100644 (file)
@@ -53,8 +53,8 @@
 #include <epan/prefs.h>
 #include <epan/strutil.h>
 #include <epan/conversation.h>
+#include <epan/tap.h>
 #include "packet-mgcp.h"
-#include "../../tap.h"
 
 #ifndef HAVE_WIN32_LIBETHEREAL_LIB
 #include "plugins/plugin_api_defs.h"
index 90f1694e4a29deec66a6ce5f813e3479f9bc29d4..c2e651138be44b3d4b1de9c2e79537d62b6c44f3 100644 (file)
@@ -52,7 +52,7 @@
 #include <epan/dissectors/packet-tpkt.h>
 #include <epan/dissectors/packet-tcp.h>
 #include <epan/dissectors/packet-rpc.h>
-#include "tap.h"
+#include <epan/tap.h>
 #include "asn1.h"
 #include <epan/dissectors/packet-per.h>
 #include <epan/dissectors/packet-ber.h>
index 80bb9a7c33f2a55053fde0664691d7d9342826b1..5e5d356190a12b17805bde3f084bad46869219f6 100644 (file)
@@ -41,7 +41,7 @@
 #include <epan/dissectors/packet-rpc.h>
 #include <epan/dissectors/packet-rtp.h>
 #include <epan/dissectors/packet-rtcp.h>
-#include "tap.h"
+#include <epan/tap.h>
 #include "asn1.h"
 #include <epan/xdlc.h>
 #include <epan/crc16.h>
index 6f6f9d1fb6ed1146f6f9723ae1a0a5f207e1c9e4..4c5d847efbf2f57653af16f4a86587eacd67a094 100644 (file)
@@ -45,7 +45,7 @@
 #include <string.h>
 #include "epan/packet_info.h"
 #include "epan/value_string.h"
-#include "tap.h"
+#include <epan/tap.h>
 #include <epan/dissectors/packet-bssap.h>
 #include <epan/dissectors/packet-ansi_a.h>
 #include "register.h"
index 5b3b05c278ffa3ab47461a7a629f4d31fc1b4348..da2a2e29a36087c184ea225a2dd0e3bb1f85b280 100644 (file)
@@ -29,7 +29,7 @@
 #include <stdio.h>
 
 #include "epan/packet_info.h"
-#include "tap.h"
+#include <epan/tap.h>
 #include "register.h"
 #include <string.h>
 
index 2a9993b10435d973abc67a20bd4b1e9ed5812e02..1b824dc89fbe94a7f54d84e933429d5f8c9f560e 100644 (file)
@@ -34,7 +34,7 @@
 
 #include <string.h>
 #include "epan/packet_info.h"
-#include "tap.h"
+#include <epan/tap.h>
 #include <epan/dissectors/packet-dcerpc.h>
 #include "register.h"
 
index 25e83cbe025a7106b100e5e9c808d34c315c884b..07bc874571d81ba5c531d4b39a88e4dc7438c656 100644 (file)
@@ -45,7 +45,7 @@
 #include <string.h>
 #include "epan/packet_info.h"
 #include "epan/value_string.h"
-#include "tap.h"
+#include <epan/tap.h>
 #include <epan/dissectors/packet-bssap.h>
 #include <epan/dissectors/packet-gsm_a.h>
 #include "register.h"
index 878cf591c45a24c2c44ecde8a8269d9565d6cb1f..2c8c44fc48fe9b7d503c5d4c0bfb35049aa88e76 100644 (file)
@@ -39,7 +39,7 @@
 
 #include <string.h>
 #include "epan/packet_info.h"
-#include "tap.h"
+#include <epan/tap.h>
 #include "epan/value_string.h"
 #include "register.h"
 #include <epan/dissectors/packet-h225.h>
index f908e780b9c17da7dcbfbdf38c96c6d57296ece1..998f00c063ae75ede5f1e0946cf0beaf0ae62178 100644 (file)
@@ -35,7 +35,7 @@
 
 #include <string.h>
 #include "epan/packet_info.h"
-#include "tap.h"
+#include <epan/tap.h>
 #include "epan/value_string.h"
 #include "register.h"
 #include <epan/dissectors/packet-h225.h>
index 57ac1b67db9ac2d5357272e930f7f9bf4410442e..3e537d7fd57fc35b023c05b23b785a3a9cb2d15d 100644 (file)
@@ -31,7 +31,7 @@
 
 #include "epan/packet_info.h"
 #include "epan/value_string.h"
-#include "tap.h"
+#include <epan/tap.h>
 #include "register.h"
 #include <epan/dissectors/packet-http.h>
 
index d36faa05c43a9f3c30c8322c9337b8b9f819997c..da84b631f6a0ddc5a46435447314607aaff46e4d 100644 (file)
@@ -35,7 +35,7 @@
 #include <string.h>
 #include "epan/epan_dissect.h"
 #include "epan/packet_info.h"
-#include "tap.h"
+#include <epan/tap.h>
 #include "register.h"
 
 
index 2b334580123205d2a095a6c502fafddcdd1fbd5b..b63100ff6fb7b37b919903b6d7f6cd893bb1ecaf 100644 (file)
@@ -36,7 +36,7 @@
 #include <epan/packet_info.h>
 #include <epan/packet.h>
 #include <epan/addr_resolv.h>
-#include "tap.h"
+#include <epan/tap.h>
 #include "register.h"
 #include <epan/dissectors/packet-ip.h>
 #include <epan/dissectors/packet-ipx.h>
index a7905ed03e7c77f667668903f4b7f965e7926b85..f6853db127a181151486b156838f50bd6249a9c5 100644 (file)
@@ -34,7 +34,7 @@
 
 #include <string.h>
 #include "epan/packet_info.h"
-#include "tap.h"
+#include <epan/tap.h>
 #include "epan/value_string.h"
 #include "register.h"
 #include "plugins/mgcp/packet-mgcp.h"
index 229e59575f191cb748c429aaf560b4c0fcefc20c..1e1483caa89d623dc4fe787853a4f2f17717f7ea 100644 (file)
@@ -38,7 +38,7 @@
 #include "epan/epan_dissect.h"
 #include "epan/column-utils.h"
 #include "epan/proto.h"
-#include "tap.h"
+#include <epan/tap.h>
 #include "register.h"
 
 typedef struct _pci_t {
index d6966676b110b206b8261ac98f0c0b0a9b84a56c..bc074c4c37bbc720a3c9f7cfdda4cef9d298f29d 100644 (file)
@@ -38,7 +38,7 @@
 #include "epan/packet_info.h"
 #include "epan/epan_dissect.h"
 #include "epan/proto.h"
-#include "tap.h"
+#include <epan/tap.h>
 #include "register.h"
 
 typedef struct _phs_t {
index 3c7b48842031aa7ee1ba074e78cea7a816841843..2d0129cafba3f60194bf88e84ec840c187d39b03 100644 (file)
@@ -38,7 +38,7 @@
 
 #include <string.h>
 #include "epan/packet_info.h"
-#include "tap.h"
+#include <epan/tap.h>
 #include <epan/dissectors/packet-rpc.h>
 #include "register.h"
 
index 337fdcabd1a9b50466f2d15db4828fb4cdacc2b9..61471d7dc882a57663ff1458466d21152a88bd95 100644 (file)
@@ -44,7 +44,7 @@
 
 #include <string.h>
 #include "epan/packet_info.h"
-#include "tap.h"
+#include <epan/tap.h>
 #include <epan/dissectors/packet-rpc.h>
 #include "register.h"
 
index 791c7b1fc5b5ac428b8043276531de5a690f6f6a..ac9cd316f50750f4d9ac5fbdd46452bc6eb85270 100644 (file)
@@ -35,7 +35,7 @@
 
 #include <string.h>
 #include "epan/packet_info.h"
-#include "tap.h"
+#include <epan/tap.h>
 #include "epan/value_string.h"
 #include "register.h"
 #include <epan/dissectors/packet-sip.h>
index 4543676d3a36c13435d2dea2cd14f48bf6531043..2d0cdf3d0eb440b94b6b3294f7b1a41ca2237cdb 100644 (file)
@@ -40,7 +40,7 @@
 #include "epan/packet_info.h"
 #include <epan/dissectors/packet-smb-sidsnooping.h>
 #include "register.h"
-#include "tap.h"
+#include <epan/tap.h>
 #include "epan/value_string.h"
 #include "smb.h"
 
index 4c0efe62bc85056dd86d2fdf724d5ca75c777589..4c6b4ef4a4da2e7c0193d2351e6b45834df7f287 100644 (file)
@@ -38,7 +38,7 @@
 
 #include <string.h>
 #include "epan/packet_info.h"
-#include "tap.h"
+#include <epan/tap.h>
 #include "epan/value_string.h"
 #include "smb.h"
 #include "register.h"
index a43a165ac6e77a2a203269bf2348cb1e8376a775..b12255c8b42fe2abcd6f88c0705d6a35e74cb2ca 100644 (file)
@@ -43,7 +43,7 @@
 
 #include <string.h>
 #include "epan/packet_info.h"
-#include "tap.h"
+#include <epan/tap.h>
 #include "register.h"
 #include "epan/value_string.h"
 #include <epan/dissectors/packet-wsp.h>
index 3567ce6876aadfec66da30b51d12514b190981d5..7af7592da137cf6830da30e7acbb633414b12223 100644 (file)
 #include "capture_stop_conditions.h"
 #include "ringbuffer.h"
 #include <epan/epan_dissect.h>
-#include "tap.h"
+#include <epan/tap.h>
 #include <epan/timestamp.h>
 
 #ifdef HAVE_LIBPCAP