aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors
diff options
context:
space:
mode:
authorStig Bjørlykke <stig@bjorlykke.org>2011-08-30 14:17:40 +0000
committerStig Bjørlykke <stig@bjorlykke.org>2011-08-30 14:17:40 +0000
commit71f903b956ff151f553b791bb43a52959a8be983 (patch)
treef39d52e05bd3785b6e26c6bda1d4d89f4f4e48cb /epan/dissectors
parentebb63d8a7f18802d4fd7aec469fddcd3afed1de0 (diff)
Revert r38800, as the crc routines contains some tvb functions.
svn path=/trunk/; revision=38803
Diffstat (limited to 'epan/dissectors')
-rw-r--r--epan/dissectors/packet-assa_r3.c2
-rw-r--r--epan/dissectors/packet-dcp-etsi.c2
-rw-r--r--epan/dissectors/packet-dmp.c2
-rw-r--r--epan/dissectors/packet-eth.c2
-rw-r--r--epan/dissectors/packet-fc.c2
-rw-r--r--epan/dissectors/packet-fcoe.c2
-rw-r--r--epan/dissectors/packet-fcoib.c2
-rw-r--r--epan/dissectors/packet-ieee80211.c2
-rw-r--r--epan/dissectors/packet-ieee802154.c2
-rw-r--r--epan/dissectors/packet-iscsi.c2
-rw-r--r--epan/dissectors/packet-iuup.c4
-rw-r--r--epan/dissectors/packet-iwarp-mpa.c2
-rw-r--r--epan/dissectors/packet-lapd.c2
-rw-r--r--epan/dissectors/packet-mtp2.c2
-rw-r--r--epan/dissectors/packet-mux27010.c2
-rw-r--r--epan/dissectors/packet-nfs.c4
-rw-r--r--epan/dissectors/packet-ntlmssp.c2
-rw-r--r--epan/dissectors/packet-ppp.c4
-rw-r--r--epan/dissectors/packet-radiotap.c2
-rw-r--r--epan/dissectors/packet-sctp.c2
-rw-r--r--epan/dissectors/packet-srp.c2
-rw-r--r--epan/dissectors/packet-synphasor.c2
-rw-r--r--epan/dissectors/packet-teamspeak2.c2
-rw-r--r--epan/dissectors/packet-zrtp.c2
24 files changed, 27 insertions, 27 deletions
diff --git a/epan/dissectors/packet-assa_r3.c b/epan/dissectors/packet-assa_r3.c
index 4921ef8070..0e5d379fa9 100644
--- a/epan/dissectors/packet-assa_r3.c
+++ b/epan/dissectors/packet-assa_r3.c
@@ -3213,7 +3213,7 @@ static mfgFieldDissectorParser_t r3upstreammfgfield_dissect [] =
/*
* ***************************************************************************
*
- * Cannot use wsutil/crc routines as ccitt-x25 uses a starting value of 0xffff
+ * Cannot use epan/crc routines as ccitt-x25 uses a starting value of 0xffff
* and we use 0x0000 (legacy compatibility). If an override method to set
* the starting value existed, these could be replaced.
*/
diff --git a/epan/dissectors/packet-dcp-etsi.c b/epan/dissectors/packet-dcp-etsi.c
index d60836182b..32cef5d7f5 100644
--- a/epan/dissectors/packet-dcp-etsi.c
+++ b/epan/dissectors/packet-dcp-etsi.c
@@ -32,7 +32,7 @@
#include <epan/packet.h>
#include <epan/reassemble.h>
-#include <wsutil/crcdrm.h>
+#include <epan/crcdrm.h>
#include <epan/reedsolomon.h>
#include <epan/emem.h>
#include <string.h>
diff --git a/epan/dissectors/packet-dmp.c b/epan/dissectors/packet-dmp.c
index c6b8e7ed32..44586de447 100644
--- a/epan/dissectors/packet-dmp.c
+++ b/epan/dissectors/packet-dmp.c
@@ -50,7 +50,7 @@
#include <epan/prefs.h>
#include <epan/emem.h>
#include <epan/expert.h>
-#include <wsutil/crc16.h>
+#include <epan/crc16.h>
#include <epan/asn1.h>
#include <epan/strutil.h>
#include <epan/uat.h>
diff --git a/epan/dissectors/packet-eth.c b/epan/dissectors/packet-eth.c
index 8f34f9449b..6c1c720767 100644
--- a/epan/dissectors/packet-eth.c
+++ b/epan/dissectors/packet-eth.c
@@ -38,7 +38,7 @@
#include "packet-llc.h"
#include "packet-sll.h"
#include "packet-usb.h"
-#include <wsutil/crc32.h>
+#include <epan/crc32.h>
#include <epan/tap.h>
#include <epan/expert.h>
diff --git a/epan/dissectors/packet-fc.c b/epan/dissectors/packet-fc.c
index 6191117a8d..7aecad064d 100644
--- a/epan/dissectors/packet-fc.c
+++ b/epan/dissectors/packet-fc.c
@@ -53,7 +53,7 @@
#include "packet-fcbls.h"
#include <epan/tap.h>
#include <epan/emem.h>
-#include <wsutil/crc32.h>
+#include <epan/crc32.h>
#include <epan/expert.h>
#define FC_HEADER_SIZE 24
diff --git a/epan/dissectors/packet-fcoe.c b/epan/dissectors/packet-fcoe.c
index cedf49790b..09094df5f6 100644
--- a/epan/dissectors/packet-fcoe.c
+++ b/epan/dissectors/packet-fcoe.c
@@ -40,7 +40,7 @@
#include <epan/packet.h>
#include <epan/prefs.h>
-#include <wsutil/crc32.h>
+#include <epan/crc32.h>
#include <epan/etypes.h>
#include <epan/expert.h>
diff --git a/epan/dissectors/packet-fcoib.c b/epan/dissectors/packet-fcoib.c
index ffd7ae6a9d..c4c298d818 100644
--- a/epan/dissectors/packet-fcoib.c
+++ b/epan/dissectors/packet-fcoib.c
@@ -33,7 +33,7 @@
#include <stdlib.h>
#include <epan/packet.h>
#include <epan/prefs.h>
-#include <wsutil/crc32.h>
+#include <epan/crc32.h>
#include <epan/etypes.h>
#include <epan/expert.h>
#include <errno.h>
diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c
index 56de89dfb2..dfa5331b64 100644
--- a/epan/dissectors/packet-ieee80211.c
+++ b/epan/dissectors/packet-ieee80211.c
@@ -116,7 +116,7 @@
#include <epan/etypes.h>
#include <epan/greproto.h>
#include <epan/oui.h>
-#include <wsutil/crc32.h>
+#include <epan/crc32.h>
#include <epan/tap.h>
#include <epan/emem.h>
#include <epan/crypt/wep-wpadefs.h>
diff --git a/epan/dissectors/packet-ieee802154.c b/epan/dissectors/packet-ieee802154.c
index bb04e04c0a..5c970fa6e4 100644
--- a/epan/dissectors/packet-ieee802154.c
+++ b/epan/dissectors/packet-ieee802154.c
@@ -75,7 +75,7 @@
#include <epan/emem.h>
#include <epan/packet.h>
-#include <wsutil/crc16.h>
+#include <epan/crc16.h>
#include <epan/expert.h>
#include <epan/addr_resolv.h>
#include <epan/prefs.h>
diff --git a/epan/dissectors/packet-iscsi.c b/epan/dissectors/packet-iscsi.c
index 1bad474973..bbbdcf877a 100644
--- a/epan/dissectors/packet-iscsi.c
+++ b/epan/dissectors/packet-iscsi.c
@@ -49,7 +49,7 @@
#include <epan/nstime.h>
#include <epan/emem.h>
#include <epan/range.h>
-#include <wsutil/crc32.h>
+#include <epan/crc32.h>
/* the absolute values of these constants don't matter as long as
* latter revisions of the protocol are assigned a larger number */
diff --git a/epan/dissectors/packet-iuup.c b/epan/dissectors/packet-iuup.c
index 20d2b92991..e9ae3a0755 100644
--- a/epan/dissectors/packet-iuup.c
+++ b/epan/dissectors/packet-iuup.c
@@ -40,8 +40,8 @@
#include <epan/prefs.h>
#include <epan/emem.h>
#include <epan/expert.h>
-#include <wsutil/crc10.h>
-#include <wsutil/crc6.h>
+#include <epan/crc10.h>
+#include <epan/crc6.h>
typedef struct _iuup_rfci_t {
diff --git a/epan/dissectors/packet-iwarp-mpa.c b/epan/dissectors/packet-iwarp-mpa.c
index 62e4a81f8e..ec85288d90 100644
--- a/epan/dissectors/packet-iwarp-mpa.c
+++ b/epan/dissectors/packet-iwarp-mpa.c
@@ -36,7 +36,7 @@
#include <epan/conversation.h>
#include <epan/dissectors/packet-tcp.h>
#include <epan/expert.h>
-#include <wsutil/crc32.h>
+#include <epan/crc32.h>
/* DEFINES */
diff --git a/epan/dissectors/packet-lapd.c b/epan/dissectors/packet-lapd.c
index df07cabd37..9453808d6f 100644
--- a/epan/dissectors/packet-lapd.c
+++ b/epan/dissectors/packet-lapd.c
@@ -46,7 +46,7 @@
#include <epan/packet.h>
#include <epan/conversation.h>
#include <epan/xdlc.h>
-#include <wsutil/crc16.h>
+#include <epan/crc16.h>
#include <epan/prefs.h>
#include <epan/lapd_sapi.h>
diff --git a/epan/dissectors/packet-mtp2.c b/epan/dissectors/packet-mtp2.c
index eff9502069..24c0519810 100644
--- a/epan/dissectors/packet-mtp2.c
+++ b/epan/dissectors/packet-mtp2.c
@@ -35,7 +35,7 @@
#include <glib.h>
#include <epan/packet.h>
#include <epan/prefs.h>
-#include <wsutil/crc16.h>
+#include <epan/crc16.h>
#include <epan/expert.h>
/* Initialize the protocol and registered fields */
diff --git a/epan/dissectors/packet-mux27010.c b/epan/dissectors/packet-mux27010.c
index 9d2d9bd9b1..5e6c6b6eaa 100644
--- a/epan/dissectors/packet-mux27010.c
+++ b/epan/dissectors/packet-mux27010.c
@@ -30,7 +30,7 @@
#include <glib.h>
#include <epan/packet.h>
#include <epan/reassemble.h>
-#include <wsutil/crc8.h>
+#include <epan/crc8.h>
#include <expert.h>
#include <string.h>
diff --git a/epan/dissectors/packet-nfs.c b/epan/dissectors/packet-nfs.c
index 14674ac551..a775228620 100644
--- a/epan/dissectors/packet-nfs.c
+++ b/epan/dissectors/packet-nfs.c
@@ -40,10 +40,10 @@
#include <epan/packet.h>
#include <epan/emem.h>
#include <epan/strutil.h>
-#include <wsutil/crc32.h>
+#include <epan/crc32.h>
#include <epan/expert.h>
-#include <wsutil/crc16.h>
+#include <epan/crc16.h>
#include <glib.h>
#include <glib/gprintf.h>
diff --git a/epan/dissectors/packet-ntlmssp.c b/epan/dissectors/packet-ntlmssp.c
index 0fa3783b69..8fcb676332 100644
--- a/epan/dissectors/packet-ntlmssp.c
+++ b/epan/dissectors/packet-ntlmssp.c
@@ -53,7 +53,7 @@
#include <epan/crypt/crypt-des.h>
#include "packet-dcerpc.h"
#include "packet-gssapi.h"
-#include <wsutil/crc32.h>
+#include <epan/crc32.h>
#include "packet-ntlmssp.h"
diff --git a/epan/dissectors/packet-ppp.c b/epan/dissectors/packet-ppp.c
index b5760e9bb3..63145bb636 100644
--- a/epan/dissectors/packet-ppp.c
+++ b/epan/dissectors/packet-ppp.c
@@ -43,8 +43,8 @@
#include "packet-ipx.h"
#include "packet-vines.h"
#include <epan/nlpid.h>
-#include <wsutil/crc16.h>
-#include <wsutil/crc32.h>
+#include <epan/crc16.h>
+#include <epan/crc32.h>
#include <epan/ipproto.h>
#include "packet-usb.h"
#include "packet-sll.h"
diff --git a/epan/dissectors/packet-radiotap.c b/epan/dissectors/packet-radiotap.c
index 86be04c18b..6a7f9e4cdb 100644
--- a/epan/dissectors/packet-radiotap.c
+++ b/epan/dissectors/packet-radiotap.c
@@ -33,7 +33,7 @@
#include <errno.h>
#include <epan/packet.h>
-#include <wsutil/crc32.h>
+#include <epan/crc32.h>
#include <epan/frequency-utils.h>
#include <epan/tap.h>
#include <epan/prefs.h>
diff --git a/epan/dissectors/packet-sctp.c b/epan/dissectors/packet-sctp.c
index 081f5ea8c1..45bed6cadc 100644
--- a/epan/dissectors/packet-sctp.c
+++ b/epan/dissectors/packet-sctp.c
@@ -65,7 +65,7 @@
#include <epan/emem.h>
#include <epan/expert.h>
#include <packet-frame.h>
-#include <wsutil/crc32.h>
+#include <epan/crc32.h>
#include <epan/adler32.h>
#define LT(x, y) ((gint32)((x) - (y)) < 0)
diff --git a/epan/dissectors/packet-srp.c b/epan/dissectors/packet-srp.c
index a104e7b0b8..415a3057db 100644
--- a/epan/dissectors/packet-srp.c
+++ b/epan/dissectors/packet-srp.c
@@ -33,7 +33,7 @@
#include <epan/circuit.h>
#include <epan/stream.h>
/* #include <epan/reassemble.h> */
-#include <wsutil/crc16.h>
+#include <epan/crc16.h>
/* Wireshark ID of the protocols */
static int proto_srp = -1;
diff --git a/epan/dissectors/packet-synphasor.c b/epan/dissectors/packet-synphasor.c
index 5aebc8d37b..799b8ea80f 100644
--- a/epan/dissectors/packet-synphasor.c
+++ b/epan/dissectors/packet-synphasor.c
@@ -30,7 +30,7 @@
#include <glib.h>
#include <epan/conversation.h>
-#include <wsutil/crc16.h>
+#include <epan/crc16.h>
#include <epan/dissectors/packet-tcp.h>
#include <epan/packet.h>
#include <epan/prefs.h>
diff --git a/epan/dissectors/packet-teamspeak2.c b/epan/dissectors/packet-teamspeak2.c
index 0e931bdcff..8873becac4 100644
--- a/epan/dissectors/packet-teamspeak2.c
+++ b/epan/dissectors/packet-teamspeak2.c
@@ -29,7 +29,7 @@
#endif
#include <epan/packet.h>
-#include <wsutil/crc32.h>
+#include <epan/crc32.h>
#include <epan/reassemble.h>
#include <epan/conversation.h>
#include <stdlib.h>
diff --git a/epan/dissectors/packet-zrtp.c b/epan/dissectors/packet-zrtp.c
index 5ce53ceddb..b9d00d8771 100644
--- a/epan/dissectors/packet-zrtp.c
+++ b/epan/dissectors/packet-zrtp.c
@@ -34,7 +34,7 @@
#include <glib.h>
#include <epan/packet.h>
#include <epan/strutil.h>
-#include <wsutil/crc32.h>
+#include <epan/crc32.h>
#include "packet-rtp.h"
#include "packet-rtcp.h"