summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Reichel <sre@ring0.de>2012-07-04 01:50:58 +0200
committerSebastian Reichel <sre@ring0.de>2012-07-04 01:50:58 +0200
commit51e96ec112b48585b787a4a8c3e6c01b1f1888fd (patch)
treef1b8b913e4c845c9c3b699c4386074831d542554
parent5b281808784466eb317ffa96afbaf86de7ae10a2 (diff)
downloadisi-wireshark-plugin-51e96ec112b48585b787a4a8c3e6c01b1f1888fd.tar.bz2
update for usage with wireshark 1.8
-rw-r--r--config.mk2
-rw-r--r--src/packet-isi.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/config.mk b/config.mk
index 2850bee..c39d47c 100644
--- a/config.mk
+++ b/config.mk
@@ -1,5 +1,5 @@
#use this to compile with USB support
#CFLAGS?=-DISI_USB
PREFIX?=/usr
-PLUGINDIR?=lib/wireshark/libwireshark1/plugins
+PLUGINDIR?=lib/wireshark/libwireshark2/plugins
WIRESHARKDIR?=/usr/include/wireshark
diff --git a/src/packet-isi.c b/src/packet-isi.c
index a92800b..0868f83 100644
--- a/src/packet-isi.c
+++ b/src/packet-isi.c
@@ -520,9 +520,9 @@ static void dissect_isi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
dst = tvb_get_guint8(tvb, 0);
src = tvb_get_guint8(tvb, 1);
- if(tvb->length - 8 < length) {
- expert_add_info_format(pinfo, item, PI_PROTOCOL, PI_WARN, "Broken Length (%d > %d)", length, tvb->length-8);
- length = tvb->length - 8;
+ if(tvb_length(tvb) - 8 < length) {
+ expert_add_info_format(pinfo, item, PI_PROTOCOL, PI_WARN, "Broken Length (%d > %d)", length, tvb_length(tvb)-8);
+ length = tvb_length(tvb) - 8;
}
col_set_str(pinfo->cinfo, COL_DEF_SRC, val_to_str_const(src, hf_isi_device, "Unknown"));