summaryrefslogtreecommitdiffstats
path: root/src/packet-isi.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/packet-isi.c')
-rw-r--r--src/packet-isi.c38
1 files changed, 20 insertions, 18 deletions
diff --git a/src/packet-isi.c b/src/packet-isi.c
index 2234afa..d8fee09 100644
--- a/src/packet-isi.c
+++ b/src/packet-isi.c
@@ -23,7 +23,9 @@
#include <glib.h>
#include <epan/prefs.h>
#include <epan/packet.h>
+#include <epan/expert.h>
+#include "handler.h"
#include "packet-isi.h"
#define ISI_LTYPE 0xF5
@@ -308,25 +310,25 @@ static const value_string isi_common_cmd[] = {
};
-static guint32 hf_isi_rdev = -1;
-static guint32 hf_isi_sdev = -1;
-guint32 hf_isi_res = -1;
-static guint32 hf_isi_len = -1;
-static guint32 hf_isi_robj = -1;
-static guint32 hf_isi_sobj = -1;
-static guint32 hf_isi_id = -1;
-static guint32 hf_isi_comcmd = -1;
-static guint32 hf_isi_version_major = -1;
-static guint32 hf_isi_version_minor = -1;
-static guint32 hf_isi_sub_pkgcount = -1;
-static guint32 hf_isi_sub_length = -1;
+static gint32 hf_isi_rdev = -1;
+static gint32 hf_isi_sdev = -1;
+gint32 hf_isi_res = -1;
+static gint32 hf_isi_len = -1;
+static gint32 hf_isi_robj = -1;
+static gint32 hf_isi_sobj = -1;
+static gint32 hf_isi_id = -1;
+static gint32 hf_isi_comcmd = -1;
+static gint32 hf_isi_version_major = -1;
+static gint32 hf_isi_version_minor = -1;
+static gint32 hf_isi_sub_pkgcount = -1;
+static gint32 hf_isi_sub_length = -1;
/* Subtree handles: set by register_subtree_array */
-static guint32 ett_isi = -1;
-guint32 ett_isi_msg = -1;
-guint32 ett_isi_network_gsm_band_info = -1;
-guint32 ett_isi_nameservice_entry = -1;
-guint32 ett_isi_info = -1;
+static gint32 ett_isi = -1;
+gint32 ett_isi_msg = -1;
+gint32 ett_isi_network_gsm_band_info = -1;
+gint32 ett_isi_nameservice_entry = -1;
+gint32 ett_isi_info = -1;
#ifdef ISI_USB
/* Experimental approach based upon the one used for PPP*/
@@ -448,7 +450,7 @@ void proto_register_isi(void) {
proto_register_isi_selftest();
}
-void dissect_isi_subpacket(guint32 hf_sub_type, guint8 offset, tvbuff_t *tvb,
+void dissect_isi_subpacket(gint32 hf_sub_type, guint8 offset, tvbuff_t *tvb,
packet_info *pinfo, proto_item *item, proto_tree *tree,
void (*detail_cb)(guint8, tvbuff_t*, packet_info*, proto_item*, proto_tree*)) {
tvbuff_t *content = NULL;