diff options
Diffstat (limited to 'epan/dissectors')
24 files changed, 27 insertions, 27 deletions
diff --git a/epan/dissectors/packet-assa_r3.c b/epan/dissectors/packet-assa_r3.c index 0e5d379fa9..4921ef8070 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 epan/crc routines as ccitt-x25 uses a starting value of 0xffff + * Cannot use wsutil/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 32cef5d7f5..d60836182b 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 <epan/crcdrm.h> +#include <wsutil/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 44586de447..c6b8e7ed32 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 <epan/crc16.h> +#include <wsutil/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 6c1c720767..8f34f9449b 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 <epan/crc32.h> +#include <wsutil/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 7aecad064d..6191117a8d 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 <epan/crc32.h> +#include <wsutil/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 09094df5f6..cedf49790b 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 <epan/crc32.h> +#include <wsutil/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 c4c298d818..ffd7ae6a9d 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 <epan/crc32.h> +#include <wsutil/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 dfa5331b64..56de89dfb2 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 <epan/crc32.h> +#include <wsutil/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 5c970fa6e4..bb04e04c0a 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 <epan/crc16.h> +#include <wsutil/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 bbbdcf877a..1bad474973 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 <epan/crc32.h> +#include <wsutil/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 e9ae3a0755..20d2b92991 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 <epan/crc10.h> -#include <epan/crc6.h> +#include <wsutil/crc10.h> +#include <wsutil/crc6.h> typedef struct _iuup_rfci_t { diff --git a/epan/dissectors/packet-iwarp-mpa.c b/epan/dissectors/packet-iwarp-mpa.c index ec85288d90..62e4a81f8e 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 <epan/crc32.h> +#include <wsutil/crc32.h> /* DEFINES */ diff --git a/epan/dissectors/packet-lapd.c b/epan/dissectors/packet-lapd.c index 9453808d6f..df07cabd37 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 <epan/crc16.h> +#include <wsutil/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 24c0519810..eff9502069 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 <epan/crc16.h> +#include <wsutil/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 5e6c6b6eaa..9d2d9bd9b1 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 <epan/crc8.h> +#include <wsutil/crc8.h> #include <expert.h> #include <string.h> diff --git a/epan/dissectors/packet-nfs.c b/epan/dissectors/packet-nfs.c index a775228620..14674ac551 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 <epan/crc32.h> +#include <wsutil/crc32.h> #include <epan/expert.h> -#include <epan/crc16.h> +#include <wsutil/crc16.h> #include <glib.h> #include <glib/gprintf.h> diff --git a/epan/dissectors/packet-ntlmssp.c b/epan/dissectors/packet-ntlmssp.c index 8fcb676332..0fa3783b69 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 <epan/crc32.h> +#include <wsutil/crc32.h> #include "packet-ntlmssp.h" diff --git a/epan/dissectors/packet-ppp.c b/epan/dissectors/packet-ppp.c index 63145bb636..b5760e9bb3 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 <epan/crc16.h> -#include <epan/crc32.h> +#include <wsutil/crc16.h> +#include <wsutil/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 6a7f9e4cdb..86be04c18b 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 <epan/crc32.h> +#include <wsutil/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 45bed6cadc..081f5ea8c1 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 <epan/crc32.h> +#include <wsutil/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 415a3057db..a104e7b0b8 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 <epan/crc16.h> +#include <wsutil/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 799b8ea80f..5aebc8d37b 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 <epan/crc16.h> +#include <wsutil/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 8873becac4..0e931bdcff 100644 --- a/epan/dissectors/packet-teamspeak2.c +++ b/epan/dissectors/packet-teamspeak2.c @@ -29,7 +29,7 @@ #endif #include <epan/packet.h> -#include <epan/crc32.h> +#include <wsutil/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 b9d00d8771..5ce53ceddb 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 <epan/crc32.h> +#include <wsutil/crc32.h> #include "packet-rtp.h" #include "packet-rtcp.h" |