fix warnings

 * fix signess (guint32 -> gint32)
 * remove some unused variables
 * add <epan/expert.h> as needed
 * include handler.h in isi-packet.c

19 files changed, 285 insertions, 275 deletions

diff --git a/src/isi-call.c b/src/isi-call.c
index 45329b4..ae708dd 100644
--- a/src/isi-call.c
+++ b/src/isi-call.c
@@ -23,6 +23,7 @@
 #include <glib.h>
 #include <epan/prefs.h>
 #include <epan/packet.h>
+#include <epan/expert.h>
 
 #include "packet-isi.h"
 #include "isi-call.h"
@@ -273,12 +274,12 @@ static const value_string isi_call_cause[] = {
 static dissector_handle_t isi_call_handle;
 static void dissect_isi_call(tvbuff_t *tvb, packet_info *pinfo, proto_item *tree);
 
-static guint32 hf_isi_call_cmd = -1;
-static guint32 hf_isi_call_subblock_type = -1;
-static guint32 hf_isi_call_id = -1;
-static guint32 hf_isi_call_status_mode = -1;
-static guint32 hf_isi_call_cause_type = -1;
-static guint32 hf_isi_call_cause = -1;
+static gint32 hf_isi_call_cmd = -1;
+static gint32 hf_isi_call_subblock_type = -1;
+static gint32 hf_isi_call_id = -1;
+static gint32 hf_isi_call_status_mode = -1;
+static gint32 hf_isi_call_cause_type = -1;
+static gint32 hf_isi_call_cause = -1;
 
 
 void proto_reg_handoff_isi_call(void) {
@@ -417,7 +418,7 @@ static void dissect_isi_call_subblock(guint8 sptype, tvbuff_t *tvb, packet_info
 static void dissect_isi_call(tvbuff_t *tvb, packet_info *pinfo, proto_item *isitree) {
 	proto_item *item = NULL;
 	proto_tree *tree = NULL;
-	guint8 cmd, code;
+	guint8 cmd;
 
 	if(isitree) {
 		item = proto_tree_add_text(isitree, tvb, 0, -1, "Payload");
diff --git a/src/isi-commgr.c b/src/isi-commgr.c
index 0f7da89..dd3d26a 100644
--- a/src/isi-commgr.c
+++ b/src/isi-commgr.c
@@ -23,6 +23,7 @@
 #include <glib.h>
 #include <epan/prefs.h>
 #include <epan/packet.h>
+#include <epan/expert.h>
 
 #include "packet-isi.h"
 #include "isi-commgr.h"
@@ -39,8 +40,8 @@ static const value_string isi_commgr_id[] = {
 static dissector_handle_t isi_commgr_handle;
 static void dissect_isi_commgr(tvbuff_t *tvb, packet_info *pinfo, proto_item *tree);
 
-static guint32 hf_isi_commgr_cmd = -1;
-static guint32 hf_isi_commgr_resource_count = -1;
+static gint32 hf_isi_commgr_cmd = -1;
+static gint32 hf_isi_commgr_resource_count = -1;
 
 
 void proto_reg_handoff_isi_commgr(void) {
@@ -77,7 +78,7 @@ static void _show_resources(tvbuff_t *tvb, proto_tree *tree) {
 static void dissect_isi_commgr(tvbuff_t *tvb, packet_info *pinfo, proto_item *isitree) {
 	proto_item *item = NULL;
 	proto_tree *tree = NULL;
-	guint8 cmd, code;
+	guint8 cmd;
 
 	if(isitree) {
 		item = proto_tree_add_text(isitree, tvb, 0, -1, "Payload");
diff --git a/src/isi-gpds.c b/src/isi-gpds.c
index 3bdd771..dc3deec 100644
--- a/src/isi-gpds.c
+++ b/src/isi-gpds.c
@@ -23,6 +23,7 @@
 #include <glib.h>
 #include <epan/prefs.h>
 #include <epan/packet.h>
+#include <epan/expert.h>
 
 #include "packet-isi.h"
 #include "isi-gpds.h"
@@ -502,51 +503,51 @@ static const value_string isi_gpds_rel5_sgn_ind_flag[] = {
 static dissector_handle_t isi_gpds_handle;
 static void dissect_isi_gpds(tvbuff_t *tvb, packet_info *pinfo, proto_item *tree);
 
-static guint32 hf_isi_gpds_cmd = -1;
-static guint32 hf_isi_gpds_subblock_type = -1;
-static guint32 hf_isi_gpds_cid = -1;
-static guint32 hf_isi_gpds_primary_cid = -1;
-static guint32 hf_isi_gpds_pipe_handle = -1;
-static guint32 hf_isi_gpds_ppp_mode = -1;
-static guint32 hf_isi_gpds_status = -1;
-static guint32 hf_isi_gpds_pdp_type = -1;
-static guint32 hf_isi_gpds_context_type = -1;
-static guint32 hf_isi_gpds_cause = -1;
-static guint32 hf_isi_gpds_attach_type = -1;
-static guint32 hf_isi_gpds_context_count = -1;
-static guint32 hf_isi_gpds_tx_byte_count = -1;
-static guint32 hf_isi_gpds_rx_byte_count = -1;
-static guint32 hf_isi_gpds_transfer_status = -1;
-static guint32 hf_isi_gpds_transfer_cause = -1;
-static guint32 hf_isi_gpds_attach_status = -1;
-static guint32 hf_isi_gpds_client_type = -1;
-static guint32 hf_isi_gpds_mt_act_mode = -1;
-static guint32 hf_isi_gpds_aol_context = -1;
-static guint32 hf_isi_gpds_classc_mode = -1;
-static guint32 hf_isi_gpds_attach_mode = -1;
-static guint32 hf_isi_gpds_apn = -1;
-static guint32 hf_isi_gpds_pdp_address = -1;
-static guint32 hf_isi_gpds_reliability = -1;
-static guint32 hf_isi_gpds_delay = -1;
-static guint32 hf_isi_gpds_precedence = -1;
-static guint32 hf_isi_gpds_peak_throughput = -1;
-static guint32 hf_isi_gpds_mean_throughput = -1;
-static guint32 hf_isi_gpds_traffic_class = -1;
-static guint32 hf_isi_gpds_delivery_order = -1;
-static guint32 hf_isi_gpds_delivery_of_erroneous_sdus = -1;
-static guint32 hf_isi_gpds_residual_ber = -1;
-static guint32 hf_isi_gpds_error_ratio = -1;
-static guint32 hf_isi_gpds_transfer_delay = -1;
-static guint32 hf_isi_gpds_max_sdu_size = -1;
-static guint32 hf_isi_gpds_max_bitrate_uplink = -1;
-static guint32 hf_isi_gpds_max_bitrate_downlink = -1;
-static guint32 hf_isi_gpds_gua_bitrate_uplink = -1;
-static guint32 hf_isi_gpds_gua_bitrate_downlink = -1;
-static guint32 hf_isi_gpds_priority = -1;
-static guint32 hf_isi_gpds_rel5_source_desc = -1;
-static guint32 hf_isi_gpds_rel5_sgn_ind_flag = -1;
-static guint32 hf_isi_gpds_pdns_address = -1;
-static guint32 hf_isi_gpds_sdns_address = -1;
+static gint32 hf_isi_gpds_cmd = -1;
+static gint32 hf_isi_gpds_subblock_type = -1;
+static gint32 hf_isi_gpds_cid = -1;
+static gint32 hf_isi_gpds_primary_cid = -1;
+static gint32 hf_isi_gpds_pipe_handle = -1;
+static gint32 hf_isi_gpds_ppp_mode = -1;
+static gint32 hf_isi_gpds_status = -1;
+static gint32 hf_isi_gpds_pdp_type = -1;
+static gint32 hf_isi_gpds_context_type = -1;
+static gint32 hf_isi_gpds_cause = -1;
+static gint32 hf_isi_gpds_attach_type = -1;
+static gint32 hf_isi_gpds_context_count = -1;
+static gint32 hf_isi_gpds_tx_byte_count = -1;
+static gint32 hf_isi_gpds_rx_byte_count = -1;
+static gint32 hf_isi_gpds_transfer_status = -1;
+static gint32 hf_isi_gpds_transfer_cause = -1;
+static gint32 hf_isi_gpds_attach_status = -1;
+static gint32 hf_isi_gpds_client_type = -1;
+static gint32 hf_isi_gpds_mt_act_mode = -1;
+static gint32 hf_isi_gpds_aol_context = -1;
+static gint32 hf_isi_gpds_classc_mode = -1;
+static gint32 hf_isi_gpds_attach_mode = -1;
+static gint32 hf_isi_gpds_apn = -1;
+static gint32 hf_isi_gpds_pdp_address = -1;
+static gint32 hf_isi_gpds_reliability = -1;
+static gint32 hf_isi_gpds_delay = -1;
+static gint32 hf_isi_gpds_precedence = -1;
+static gint32 hf_isi_gpds_peak_throughput = -1;
+static gint32 hf_isi_gpds_mean_throughput = -1;
+static gint32 hf_isi_gpds_traffic_class = -1;
+static gint32 hf_isi_gpds_delivery_order = -1;
+static gint32 hf_isi_gpds_delivery_of_erroneous_sdus = -1;
+static gint32 hf_isi_gpds_residual_ber = -1;
+static gint32 hf_isi_gpds_error_ratio = -1;
+static gint32 hf_isi_gpds_transfer_delay = -1;
+static gint32 hf_isi_gpds_max_sdu_size = -1;
+static gint32 hf_isi_gpds_max_bitrate_uplink = -1;
+static gint32 hf_isi_gpds_max_bitrate_downlink = -1;
+static gint32 hf_isi_gpds_gua_bitrate_uplink = -1;
+static gint32 hf_isi_gpds_gua_bitrate_downlink = -1;
+static gint32 hf_isi_gpds_priority = -1;
+static gint32 hf_isi_gpds_rel5_source_desc = -1;
+static gint32 hf_isi_gpds_rel5_sgn_ind_flag = -1;
+static gint32 hf_isi_gpds_pdns_address = -1;
+static gint32 hf_isi_gpds_sdns_address = -1;
 
 
 
@@ -769,7 +770,7 @@ static void dissect_isi_gpds_subblock(guint8 sptype, tvbuff_t *tvb, packet_info
 static void dissect_isi_gpds(tvbuff_t *tvb, packet_info *pinfo, proto_item *isitree) {
 	proto_item *item = NULL;
 	proto_tree *tree = NULL;
-	guint8 cmd, code;
+	guint8 cmd;
 
 	if(isitree) {
 		item = proto_tree_add_text(isitree, tvb, 0, -1, "Payload");
diff --git a/src/isi-gps.c b/src/isi-gps.c
index 3ed3787..8a2c8aa 100644
--- a/src/isi-gps.c
+++ b/src/isi-gps.c
@@ -70,39 +70,39 @@ static const value_string isi_gps_status[] = {
 static dissector_handle_t isi_gps_handle;
 static void dissect_isi_gps(tvbuff_t *tvb, packet_info *pinfo, proto_item *tree);
 
-static guint32 hf_isi_gps_cmd = -1;
-static guint32 hf_isi_gps_sub_pkgs = -1;
-static guint32 hf_isi_gps_sub_type = -1;
-static guint32 hf_isi_gps_sub_len = -1;
-static guint32 hf_isi_gps_status = -1;
-static guint32 hf_isi_gps_year = -1;
-static guint32 hf_isi_gps_month = -1;
-static guint32 hf_isi_gps_day = -1;
-static guint32 hf_isi_gps_hour = -1;
-static guint32 hf_isi_gps_minute = -1;
-static guint32 hf_isi_gps_second = -1;
-static guint32 hf_isi_gps_latitude = -1;
-static guint32 hf_isi_gps_longitude = -1;
-static guint32 hf_isi_gps_eph = -1;
-static guint32 hf_isi_gps_altitude = -1;
-static guint32 hf_isi_gps_epv = -1;
-static guint32 hf_isi_gps_course = -1;
-static guint32 hf_isi_gps_epd = -1;
-static guint32 hf_isi_gps_speed = -1;
-static guint32 hf_isi_gps_eps = -1;
-static guint32 hf_isi_gps_climb = -1;
-static guint32 hf_isi_gps_epc = -1;
-static guint32 hf_isi_gps_mcc = -1;
-static guint32 hf_isi_gps_mnc = -1;
-static guint32 hf_isi_gps_lac = -1;
-static guint32 hf_isi_gps_cid = -1;
-static guint32 hf_isi_gps_ucid = -1;
-static guint32 hf_isi_gps_satellites = -1;
-static guint32 hf_isi_gps_prn = -1;
-static guint32 hf_isi_gps_sat_used = -1;
-static guint32 hf_isi_gps_sat_strength = -1;
-static guint32 hf_isi_gps_sat_elevation = -1;
-static guint32 hf_isi_gps_sat_azimuth = -1;
+static gint32 hf_isi_gps_cmd = -1;
+static gint32 hf_isi_gps_sub_pkgs = -1;
+static gint32 hf_isi_gps_sub_type = -1;
+static gint32 hf_isi_gps_sub_len = -1;
+static gint32 hf_isi_gps_status = -1;
+static gint32 hf_isi_gps_year = -1;
+static gint32 hf_isi_gps_month = -1;
+static gint32 hf_isi_gps_day = -1;
+static gint32 hf_isi_gps_hour = -1;
+static gint32 hf_isi_gps_minute = -1;
+static gint32 hf_isi_gps_second = -1;
+static gint32 hf_isi_gps_latitude = -1;
+static gint32 hf_isi_gps_longitude = -1;
+static gint32 hf_isi_gps_eph = -1;
+static gint32 hf_isi_gps_altitude = -1;
+static gint32 hf_isi_gps_epv = -1;
+static gint32 hf_isi_gps_course = -1;
+static gint32 hf_isi_gps_epd = -1;
+static gint32 hf_isi_gps_speed = -1;
+static gint32 hf_isi_gps_eps = -1;
+static gint32 hf_isi_gps_climb = -1;
+static gint32 hf_isi_gps_epc = -1;
+static gint32 hf_isi_gps_mcc = -1;
+static gint32 hf_isi_gps_mnc = -1;
+static gint32 hf_isi_gps_lac = -1;
+static gint32 hf_isi_gps_cid = -1;
+static gint32 hf_isi_gps_ucid = -1;
+static gint32 hf_isi_gps_satellites = -1;
+static gint32 hf_isi_gps_prn = -1;
+static gint32 hf_isi_gps_sat_used = -1;
+static gint32 hf_isi_gps_sat_strength = -1;
+static gint32 hf_isi_gps_sat_elevation = -1;
+static gint32 hf_isi_gps_sat_azimuth = -1;
 
 void proto_reg_handoff_isi_gps(void) {
 	static gboolean initialized=FALSE;
@@ -188,7 +188,6 @@ void proto_register_isi_gps(void) {
 }
 
 static void dissect_isi_gps_data(tvbuff_t *tvb, packet_info *pinfo, proto_item *item, proto_tree *tree) {
-	guint8 len = tvb->length;
 	int i;
 
 	guint8 pkgcount = tvb_get_guint8(tvb, 0x07);
diff --git a/src/isi-gss.c b/src/isi-gss.c
index a3fbcd6..edcfbe5 100644
--- a/src/isi-gss.c
+++ b/src/isi-gss.c
@@ -59,12 +59,12 @@ static const value_string isi_gss_common_message_id[] = {
 static dissector_handle_t isi_gss_handle;
 static void dissect_isi_gss(tvbuff_t *tvb, packet_info *pinfo, proto_item *tree);
 
-static guint32 hf_isi_gss_message_id = -1;
-static guint32 hf_isi_gss_subblock = -1;
-static guint32 hf_isi_gss_operation = -1;
-static guint32 hf_isi_gss_subblock_count = -1;
-static guint32 hf_isi_gss_cause = -1;
-static guint32 hf_isi_gss_common_message_id = -1;
+static gint32 hf_isi_gss_message_id = -1;
+static gint32 hf_isi_gss_subblock = -1;
+static gint32 hf_isi_gss_operation = -1;
+static gint32 hf_isi_gss_subblock_count = -1;
+static gint32 hf_isi_gss_cause = -1;
+static gint32 hf_isi_gss_common_message_id = -1;
 
 void proto_reg_handoff_isi_gss(void) {
 	static gboolean initialized=FALSE;
diff --git a/src/isi-light.c b/src/isi-light.c
index c0bd9b6..9b001e9 100644
--- a/src/isi-light.c
+++ b/src/isi-light.c
@@ -23,6 +23,7 @@
 #include <glib.h>
 #include <epan/prefs.h>
 #include <epan/packet.h>
+#include <epan/expert.h>
 
 #include "packet-isi.h"
 #include "isi-light.h"
@@ -92,7 +93,7 @@ static const value_string isi_light_id[] = {
 static dissector_handle_t isi_light_handle;
 static void dissect_isi_light(tvbuff_t *tvb, packet_info *pinfo, proto_item *tree);
 
-static guint32 hf_isi_light_cmd = -1;
+static gint32 hf_isi_light_cmd = -1;
 
 
 void proto_reg_handoff_isi_light(void) {
@@ -118,7 +119,7 @@ void proto_register_isi_light(void) {
 static void dissect_isi_light(tvbuff_t *tvb, packet_info *pinfo, proto_item *isitree) {
 	proto_item *item = NULL;
 	proto_tree *tree = NULL;
-	guint8 cmd, code;
+	guint8 cmd;
 
 	if(isitree) {
 		item = proto_tree_add_text(isitree, tvb, 0, -1, "Payload");
diff --git a/src/isi-mtc.c b/src/isi-mtc.c
index 459a350..1b2488f 100644
--- a/src/isi-mtc.c
+++ b/src/isi-mtc.c
@@ -23,6 +23,7 @@
 #include <glib.h>
 #include <epan/prefs.h>
 #include <epan/packet.h>
+#include <epan/expert.h>
 
 #include "packet-isi.h"
 #include "isi-mtc.h"
@@ -203,24 +204,24 @@ static const value_string isi_mtc_rat[] = {
 static dissector_handle_t isi_mtc_handle;
 static void dissect_isi_mtc(tvbuff_t *tvb, packet_info *pinfo, proto_item *tree);
 
-static guint32 hf_isi_mtc_cmd = -1;
-static guint32 hf_isi_mtc_subblock = -1;
-static guint32 hf_isi_mtc_current_state = -1;
-static guint32 hf_isi_mtc_target_state = -1;
-static guint32 hf_isi_mtc_status = -1;
-static guint32 hf_isi_mtc_action = -1;
-static guint32 hf_isi_mtc_reset_type = -1;
-static guint32 hf_isi_mtc_sleep_type = -1;
-static guint32 hf_isi_mtc_clock_type = -1;
-static guint32 hf_isi_mtc_clock_action = -1;
-static guint32 hf_isi_mtc_wd_action = -1;
-static guint32 hf_isi_mtc_wd_mask = -1;
-static guint32 hf_isi_mtc_force_action = -1;
-static guint32 hf_isi_mtc_rat_state = -1;
-static guint32 hf_isi_mtc_rat = -1;
-static guint32 hf_isi_mtc_mem_user = -1;
-static guint32 hf_isi_mtc_mem_blocks = -1;
-static guint32 hf_isi_mtc_timeout = -1;
+static gint32 hf_isi_mtc_cmd = -1;
+static gint32 hf_isi_mtc_subblock = -1;
+static gint32 hf_isi_mtc_current_state = -1;
+static gint32 hf_isi_mtc_target_state = -1;
+static gint32 hf_isi_mtc_status = -1;
+static gint32 hf_isi_mtc_action = -1;
+static gint32 hf_isi_mtc_reset_type = -1;
+static gint32 hf_isi_mtc_sleep_type = -1;
+static gint32 hf_isi_mtc_clock_type = -1;
+static gint32 hf_isi_mtc_clock_action = -1;
+static gint32 hf_isi_mtc_wd_action = -1;
+static gint32 hf_isi_mtc_wd_mask = -1;
+static gint32 hf_isi_mtc_force_action = -1;
+static gint32 hf_isi_mtc_rat_state = -1;
+static gint32 hf_isi_mtc_rat = -1;
+static gint32 hf_isi_mtc_mem_user = -1;
+static gint32 hf_isi_mtc_mem_blocks = -1;
+static gint32 hf_isi_mtc_timeout = -1;
 
 
 void proto_reg_handoff_isi_mtc(void) {
@@ -293,7 +294,7 @@ static void dissect_isi_mtc_subblock(guint8 sptype, tvbuff_t *tvb, packet_info *
 static void dissect_isi_mtc(tvbuff_t *tvb, packet_info *pinfo, proto_item *isitree) {
 	proto_item *item = NULL;
 	proto_tree *tree = NULL;
-	guint8 cmd, code;
+	guint8 cmd;
 
 	if(isitree) {
 		item = proto_tree_add_text(isitree, tvb, 0, -1, "Payload");
diff --git a/src/isi-nameservice.c b/src/isi-nameservice.c
index c317188..c942425 100644
--- a/src/isi-nameservice.c
+++ b/src/isi-nameservice.c
@@ -23,6 +23,7 @@
 #include <glib.h>
 #include <epan/prefs.h>
 #include <epan/packet.h>
+#include <epan/expert.h>
 
 #include "packet-isi.h"
 #include "isi-nameservice.h"
@@ -49,15 +50,15 @@ static const value_string isi_nameservice_reason[] = {
 static dissector_handle_t isi_nameservice_handle;
 static void dissect_isi_nameservice(tvbuff_t *tvb, packet_info *pinfo, proto_item *tree);
 
-static guint32 hf_isi_nameservice_cmd = -1;
-static guint32 hf_isi_nameservice_name = -1;
-static guint32 hf_isi_nameservice_dev = -1;
-static guint32 hf_isi_nameservice_obj = -1;
-static guint32 hf_isi_nameservice_flags = -1;
-static guint32 hf_isi_nameservice_reason = -1;
-static guint32 hf_isi_nameservice_bitmask = -1;
-static guint32 hf_isi_nameservice_matches_total = -1;
-static guint32 hf_isi_nameservice_matches = -1;
+static gint32 hf_isi_nameservice_cmd = -1;
+static gint32 hf_isi_nameservice_name = -1;
+static gint32 hf_isi_nameservice_dev = -1;
+static gint32 hf_isi_nameservice_obj = -1;
+static gint32 hf_isi_nameservice_flags = -1;
+static gint32 hf_isi_nameservice_reason = -1;
+static gint32 hf_isi_nameservice_bitmask = -1;
+static gint32 hf_isi_nameservice_matches_total = -1;
+static gint32 hf_isi_nameservice_matches = -1;
 
 
 void proto_reg_handoff_isi_nameservice(void) {
@@ -111,7 +112,7 @@ static void dissect_isi_nameservice_name(guint32 count, guint32 offset, tvbuff_t
 static void dissect_isi_nameservice(tvbuff_t *tvb, packet_info *pinfo, proto_item *isitree) {
 	proto_item *item = NULL;
 	proto_tree *tree = NULL;
-	guint8 cmd, code;
+	guint8 cmd;
 
 	if(isitree) {
 		item = proto_tree_add_text(isitree, tvb, 0, -1, "Payload");
diff --git a/src/isi-network.c b/src/isi-network.c
index ba61468..a078b2c 100644
--- a/src/isi-network.c
+++ b/src/isi-network.c
@@ -22,6 +22,7 @@
 #include <glib.h>
 #include <epan/prefs.h>
 #include <epan/packet.h>
+#include <epan/expert.h>
 
 #include "packet-isi.h"
 #include "isi-network.h"
@@ -282,51 +283,50 @@ static const value_string isi_network_gsm_band_info[] = {
 static dissector_handle_t isi_network_handle;
 static void dissect_isi_network(tvbuff_t *tvb, packet_info *pinfo, proto_item *tree);
 
-static guint32 hf_isi_network_cmd = -1;
-static guint32 hf_isi_network_data_sub_pkgs = -1;
-static guint32 hf_isi_network_data_sub_type = -1;
-static guint32 hf_isi_network_data_sub_len = -1;
-static guint32 hf_isi_network_status_sub_lac = -1;
-static guint32 hf_isi_network_status_sub_cid = -1;
-static guint32 hf_isi_network_status_sub_msg = -1;
-static guint32 hf_isi_network_status_sub_msg_len = -1;
-static guint32 hf_isi_network_gsm_band_info = -1;
-static guint32 hf_isi_network_gsm_band_900 = -1;
-static guint32 hf_isi_network_gsm_band_1800 = -1;
-static guint32 hf_isi_network_gsm_band_1900 = -1;
-static guint32 hf_isi_network_gsm_band_850 = -1;
-static guint32 hf_isi_network_rat_type = -1;
-static guint32 hf_isi_network_rat_name = -1;
-static guint32 hf_isi_network_rat_info = -1;
-static guint32 hf_isi_network_success_code = -1;
-static guint32 hf_isi_network_uarfcn = -1;
-static guint32 hf_isi_network_ciphering_status = -1;
-static guint32 hf_isi_network_ciphering_key_status = -1;
-static guint32 hf_isi_network_ciphering_context = -1;
-static guint32 hf_isi_network_registration_status = -1;
-static guint32 hf_isi_network_registration_protocol = -1;
-static guint32 hf_isi_network_selection_mode = -1;
-static guint32 hf_isi_network_search_mode = -1;
-static guint32 hf_isi_network_cs_type = -1;
-static guint32 hf_isi_network_cs_state = -1;
-static guint32 hf_isi_network_cs_operation = -1;
-static guint32 hf_isi_network_cs_services = -1;
-static guint32 hf_isi_network_measurement_type = -1;
-static guint32 hf_isi_network_rssi_bars = -1;
-static guint32 hf_isi_network_rssi_db = -1;
-static guint32 hf_isi_network_operator_code = -1;
-static guint32 hf_isi_network_service_status = -1;
-static guint32 hf_isi_network_type = -1;
-static guint32 hf_isi_network_name_type = -1;
-static guint32 hf_isi_network_country_initials = -1;
-static guint32 hf_isi_network_gprs_support = -1;
-static guint32 hf_isi_network_gprs_mode = -1;
-static guint32 hf_isi_network_gprs_services = -1;
-static guint32 hf_isi_network_egprs_support = -1;
-static guint32 hf_isi_network_dtm_support = -1;
-static guint32 hf_isi_network_current_rac = -1;
-static guint32 hf_isi_network_hdspa_available = -1;
-static guint32 hf_isi_network_hsupa_available = -1;
+static gint32 hf_isi_network_cmd = -1;
+static gint32 hf_isi_network_data_sub_pkgs = -1;
+static gint32 hf_isi_network_data_sub_type = -1;
+static gint32 hf_isi_network_status_sub_lac = -1;
+static gint32 hf_isi_network_status_sub_cid = -1;
+static gint32 hf_isi_network_status_sub_msg = -1;
+static gint32 hf_isi_network_status_sub_msg_len = -1;
+static gint32 hf_isi_network_gsm_band_info = -1;
+static gint32 hf_isi_network_gsm_band_900 = -1;
+static gint32 hf_isi_network_gsm_band_1800 = -1;
+static gint32 hf_isi_network_gsm_band_1900 = -1;
+static gint32 hf_isi_network_gsm_band_850 = -1;
+static gint32 hf_isi_network_rat_type = -1;
+static gint32 hf_isi_network_rat_name = -1;
+static gint32 hf_isi_network_rat_info = -1;
+static gint32 hf_isi_network_success_code = -1;
+static gint32 hf_isi_network_uarfcn = -1;
+static gint32 hf_isi_network_ciphering_status = -1;
+static gint32 hf_isi_network_ciphering_key_status = -1;
+static gint32 hf_isi_network_ciphering_context = -1;
+static gint32 hf_isi_network_registration_status = -1;
+static gint32 hf_isi_network_registration_protocol = -1;
+static gint32 hf_isi_network_selection_mode = -1;
+static gint32 hf_isi_network_search_mode = -1;
+static gint32 hf_isi_network_cs_type = -1;
+static gint32 hf_isi_network_cs_state = -1;
+static gint32 hf_isi_network_cs_operation = -1;
+static gint32 hf_isi_network_cs_services = -1;
+static gint32 hf_isi_network_measurement_type = -1;
+static gint32 hf_isi_network_rssi_bars = -1;
+static gint32 hf_isi_network_rssi_db = -1;
+static gint32 hf_isi_network_operator_code = -1;
+static gint32 hf_isi_network_service_status = -1;
+static gint32 hf_isi_network_type = -1;
+static gint32 hf_isi_network_name_type = -1;
+static gint32 hf_isi_network_country_initials = -1;
+static gint32 hf_isi_network_gprs_support = -1;
+static gint32 hf_isi_network_gprs_mode = -1;
+static gint32 hf_isi_network_gprs_services = -1;
+static gint32 hf_isi_network_egprs_support = -1;
+static gint32 hf_isi_network_dtm_support = -1;
+static gint32 hf_isi_network_current_rac = -1;
+static gint32 hf_isi_network_hdspa_available = -1;
+static gint32 hf_isi_network_hsupa_available = -1;
 
 
 
@@ -595,7 +595,7 @@ static void dissect_isi_network_subpacket(guint8 sptype, tvbuff_t *tvb, packet_i
 static void dissect_isi_network(tvbuff_t *tvb, packet_info *pinfo, proto_item *isitree) {
 	proto_item *item = NULL;
 	proto_tree *tree = NULL;
-	guint8 cmd, code;
+	guint8 cmd;
 
 	if(isitree) {
 		item = proto_tree_add_text(isitree, tvb, 0, -1, "Payload");
diff --git a/src/isi-phoneinfo.c b/src/isi-phoneinfo.c
index 86dfb2c..67d2abc 100644
--- a/src/isi-phoneinfo.c
+++ b/src/isi-phoneinfo.c
@@ -23,6 +23,7 @@
 #include <glib.h>
 #include <epan/prefs.h>
 #include <epan/packet.h>
+#include <epan/expert.h>
 
 #include "packet-isi.h"
 #include "isi-phoneinfo.h"
@@ -251,18 +252,18 @@ static value_string isi_phoneinfo_version_target2[] = {
 static dissector_handle_t isi_phoneinfo_handle;
 static void dissect_isi_phoneinfo(tvbuff_t *tvb, packet_info *pinfo, proto_item *tree);
 
-static guint32 hf_isi_phoneinfo_cmd = -1;
-static guint32 hf_isi_phoneinfo_status = -1;
-static guint32 hf_isi_phoneinfo_product_target = -1;
-static guint32 hf_isi_phoneinfo_subblock_count = -1;
-static guint32 hf_isi_phoneinfo_subblock_type = -1;
-static guint32 hf_isi_phoneinfo_subblock_length = -1;
-static guint32 hf_isi_phoneinfo_subblock_value = -1;
-static guint32 hf_isi_phoneinfo_snr_type = -1;
-static guint32 hf_isi_phoneinfo_version_target = -1;
-static guint32 hf_isi_phoneinfo_version_target2 = -1;
-static guint32 hf_isi_phoneinfo_version = -1;
-static guint32 hf_isi_phoneinfo_serial = -1;
+static gint32 hf_isi_phoneinfo_cmd = -1;
+static gint32 hf_isi_phoneinfo_status = -1;
+static gint32 hf_isi_phoneinfo_product_target = -1;
+static gint32 hf_isi_phoneinfo_subblock_count = -1;
+static gint32 hf_isi_phoneinfo_subblock_type = -1;
+static gint32 hf_isi_phoneinfo_subblock_length = -1;
+static gint32 hf_isi_phoneinfo_subblock_value = -1;
+static gint32 hf_isi_phoneinfo_snr_type = -1;
+static gint32 hf_isi_phoneinfo_version_target = -1;
+static gint32 hf_isi_phoneinfo_version_target2 = -1;
+static gint32 hf_isi_phoneinfo_version = -1;
+static gint32 hf_isi_phoneinfo_serial = -1;
 
 
 void proto_reg_handoff_isi_phoneinfo(void) {
@@ -458,7 +459,7 @@ static void dissect_isi_phoneinfo_subpacket(guint8 sptype, tvbuff_t *tvb, packet
 static void dissect_isi_phoneinfo(tvbuff_t *tvb, packet_info *pinfo, proto_item *isitree) {
 	proto_item *item = NULL;
 	proto_tree *tree = NULL;
-	guint8 cmd, code;
+	guint8 cmd;
 
 	if(isitree) {
 		item = proto_tree_add_text(isitree, tvb, 0, -1, "Payload");
diff --git a/src/isi-pipe.c b/src/isi-pipe.c
index 7845e5e..b0171fc 100644
--- a/src/isi-pipe.c
+++ b/src/isi-pipe.c
@@ -24,6 +24,7 @@
 #include <glib.h>
 #include <epan/prefs.h>
 #include <epan/packet.h>
+#include <epan/expert.h>
 
 #include "packet-isi.h"
 #include "isi-pipe.h"
@@ -137,24 +138,24 @@ static const value_string isi_pipe_error[] = {
 static dissector_handle_t isi_pipe_handle;
 static void dissect_isi_pipe(tvbuff_t *tvb, packet_info *pinfo, proto_item *tree);
 
-static guint32 hf_isi_pipe_cmd = -1;
-static guint32 hf_isi_pipe_subblock_type = -1;
-static guint32 hf_isi_pipe_pipe_state_after = -1;
-static guint32 hf_isi_pipe_pep_state_after = -1;
-static guint32 hf_isi_pipe_priority = -1;
-static guint32 hf_isi_pipe_first_pep_dev = -1;
-static guint32 hf_isi_pipe_first_pep_obj = -1;
-static guint32 hf_isi_pipe_first_pep_type = -1;
-static guint32 hf_isi_pipe_second_pep_dev = -1;
-static guint32 hf_isi_pipe_second_pep_obj = -1;
-static guint32 hf_isi_pipe_second_pep_type = -1;
-static guint32 hf_isi_pipe_handle = -1;
-static guint32 hf_isi_pipe_error = -1;
-static guint32 hf_isi_pipe_pep1_error = -1;
-static guint32 hf_isi_pipe_pep2_error = -1;
-static guint32 hf_isi_pipe_other_pep_type = -1;
-static guint32 hf_isi_pipe_pep_type = -1;
-static guint32 hf_isi_pipe_indication_id = -1;
+static gint32 hf_isi_pipe_cmd = -1;
+static gint32 hf_isi_pipe_subblock_type = -1;
+static gint32 hf_isi_pipe_pipe_state_after = -1;
+static gint32 hf_isi_pipe_pep_state_after = -1;
+static gint32 hf_isi_pipe_priority = -1;
+static gint32 hf_isi_pipe_first_pep_dev = -1;
+static gint32 hf_isi_pipe_first_pep_obj = -1;
+static gint32 hf_isi_pipe_first_pep_type = -1;
+static gint32 hf_isi_pipe_second_pep_dev = -1;
+static gint32 hf_isi_pipe_second_pep_obj = -1;
+static gint32 hf_isi_pipe_second_pep_type = -1;
+static gint32 hf_isi_pipe_handle = -1;
+static gint32 hf_isi_pipe_error = -1;
+static gint32 hf_isi_pipe_pep1_error = -1;
+static gint32 hf_isi_pipe_pep2_error = -1;
+static gint32 hf_isi_pipe_other_pep_type = -1;
+static gint32 hf_isi_pipe_pep_type = -1;
+static gint32 hf_isi_pipe_indication_id = -1;
 
 void proto_reg_handoff_isi_pipe(void) {
 	static gboolean initialized=FALSE;
@@ -227,7 +228,7 @@ static void dissect_isi_pipe_subblock(guint8 sptype, tvbuff_t *tvb, packet_info
 static void dissect_isi_pipe(tvbuff_t *tvb, packet_info *pinfo, proto_item *isitree) {
 	proto_item *item = NULL;
 	proto_tree *tree = NULL;
-	guint8 cmd, code;
+	guint8 cmd;
 
 	if(isitree) {
 		item = proto_tree_add_text(isitree, tvb, 0, -1, "Payload");
diff --git a/src/isi-radiosettings.c b/src/isi-radiosettings.c
index 61461b9..79a30aa 100644
--- a/src/isi-radiosettings.c
+++ b/src/isi-radiosettings.c
@@ -23,6 +23,7 @@
 #include <glib.h>
 #include <epan/prefs.h>
 #include <epan/packet.h>
+#include <epan/expert.h>
 
 #include "packet-isi.h"
 #include "isi-radiosettings.h"
@@ -34,7 +35,7 @@ static const value_string isi_radiosettings_id[] = {
 static dissector_handle_t isi_radiosettings_handle;
 static void dissect_isi_radiosettings(tvbuff_t *tvb, packet_info *pinfo, proto_item *tree);
 
-static guint32 hf_isi_radiosettings_cmd = -1;
+static gint32 hf_isi_radiosettings_cmd = -1;
 
 
 void proto_reg_handoff_isi_radiosettings(void) {
@@ -60,7 +61,7 @@ void proto_register_isi_radiosettings(void) {
 static void dissect_isi_radiosettings(tvbuff_t *tvb, packet_info *pinfo, proto_item *isitree) {
 	proto_item *item = NULL;
 	proto_tree *tree = NULL;
-	guint8 cmd, code;
+	guint8 cmd;
 
 	if(isitree) {
 		item = proto_tree_add_text(isitree, tvb, 0, -1, "Payload");
diff --git a/src/isi-selftest.c b/src/isi-selftest.c
index 7576d1b..7e16fd9 100644
--- a/src/isi-selftest.c
+++ b/src/isi-selftest.c
@@ -23,6 +23,7 @@
 #include <glib.h>
 #include <epan/prefs.h>
 #include <epan/packet.h>
+#include <epan/expert.h>
 
 #include "packet-isi.h"
 #include "isi-selftest.h"
@@ -244,13 +245,13 @@ static value_string isi_selftest_id[] = {
 static dissector_handle_t isi_selftest_handle;
 static void dissect_isi_selftest(tvbuff_t *tvb, packet_info *pinfo, proto_item *tree);
 
-static guint32 hf_isi_selftest_cmd = -1;
-static guint32 hf_isi_selftest_subblock_type = -1;
-static guint32 hf_isi_selftest_subblock_count = -1;
-static guint32 hf_isi_selftest_action = -1;
-static guint32 hf_isi_selftest_type = -1;
-static guint32 hf_isi_selftest_status = -1;
-static guint32 hf_isi_selftest_id = -1;
+static gint32 hf_isi_selftest_cmd = -1;
+static gint32 hf_isi_selftest_subblock_type = -1;
+static gint32 hf_isi_selftest_subblock_count = -1;
+static gint32 hf_isi_selftest_action = -1;
+static gint32 hf_isi_selftest_type = -1;
+static gint32 hf_isi_selftest_status = -1;
+static gint32 hf_isi_selftest_id = -1;
 
 
 void proto_reg_handoff_isi_selftest(void) {
@@ -308,7 +309,7 @@ static void dissect_isi_selftest_subblock(guint8 sptype, tvbuff_t *tvb, packet_i
 static void dissect_isi_selftest(tvbuff_t *tvb, packet_info *pinfo, proto_item *isitree) {
 	proto_item *item = NULL;
 	proto_tree *tree = NULL;
-	guint8 cmd, code;
+	guint8 cmd;
 
 	if(isitree) {
 		item = proto_tree_add_text(isitree, tvb, 0, -1, "Payload");
diff --git a/src/isi-sim.c b/src/isi-sim.c
index 0d63cf0..086704a 100644
--- a/src/isi-sim.c
+++ b/src/isi-sim.c
@@ -167,19 +167,19 @@ static const value_string isi_sim_pb_tag[] = {
 static dissector_handle_t isi_sim_handle;
 static void dissect_isi_sim(tvbuff_t *tvb, packet_info *pinfo, proto_item *tree);
 
-static guint32 hf_isi_sim_message_id = -1;
-static guint32 hf_isi_sim_service_type = -1;
-static guint32 hf_isi_sim_cause = -1;
-static guint32 hf_isi_sim_secondary_cause = -1;
+static gint32 hf_isi_sim_message_id = -1;
+static gint32 hf_isi_sim_service_type = -1;
+static gint32 hf_isi_sim_cause = -1;
+static gint32 hf_isi_sim_secondary_cause = -1;
 
 static int hf_isi_sim_subblock_count = -1;
 static int hf_isi_sim_subblock_size = -1;
 
-static guint32 hf_isi_sim_pb_subblock = -1;
-static guint32 hf_isi_sim_pb_type = -1;
-static guint32 hf_isi_sim_pb_location = -1;
-static guint32 hf_isi_sim_pb_tag_count = -1;
-static guint32 hf_isi_sim_pb_tag = -1;
+static gint32 hf_isi_sim_pb_subblock = -1;
+static gint32 hf_isi_sim_pb_type = -1;
+static gint32 hf_isi_sim_pb_location = -1;
+static gint32 hf_isi_sim_pb_tag_count = -1;
+static gint32 hf_isi_sim_pb_tag = -1;
 
 /* static int hf_isi_sim_imsi_byte_1 = -1;
 static int hf_isi_sim_imsi_byte_2 = -1; */
diff --git a/src/isi-simauth.c b/src/isi-simauth.c
index 779b7fe..bd3eb3f 100644
--- a/src/isi-simauth.c
+++ b/src/isi-simauth.c
@@ -82,16 +82,16 @@ static const value_string isi_sim_auth_indication_cfg[] = {
 static dissector_handle_t isi_sim_auth_handle;
 static void dissect_isi_sim_auth(tvbuff_t *tvb, packet_info *pinfo, proto_item *tree);
 
-static guint32 hf_isi_sim_auth_cmd = -1;
-static guint32 hf_isi_sim_auth_status_rsp = -1;
-static guint32 hf_isi_sim_auth_protection_req = -1;
-static guint32 hf_isi_sim_auth_protection_rsp = -1;
-static guint32 hf_isi_sim_auth_pin = -1;
-static guint32 hf_isi_sim_auth_puk = -1;
-static guint32 hf_isi_sim_auth_new_pin = -1;
-static guint32 hf_isi_sim_auth_pw_type = -1;
-static guint32 hf_isi_sim_auth_indication = -1;
-static guint32 hf_isi_sim_auth_indication_cfg = -1;
+static gint32 hf_isi_sim_auth_cmd = -1;
+static gint32 hf_isi_sim_auth_status_rsp = -1;
+static gint32 hf_isi_sim_auth_protection_req = -1;
+static gint32 hf_isi_sim_auth_protection_rsp = -1;
+static gint32 hf_isi_sim_auth_pin = -1;
+static gint32 hf_isi_sim_auth_puk = -1;
+static gint32 hf_isi_sim_auth_new_pin = -1;
+static gint32 hf_isi_sim_auth_pw_type = -1;
+static gint32 hf_isi_sim_auth_indication = -1;
+static gint32 hf_isi_sim_auth_indication_cfg = -1;
 
 void proto_reg_handoff_isi_sim_auth(void) {
 	static gboolean initialized=FALSE;
diff --git a/src/isi-sms.c b/src/isi-sms.c
index 7b8545b..f147025 100644
--- a/src/isi-sms.c
+++ b/src/isi-sms.c
@@ -144,13 +144,13 @@ static const value_string isi_sms_common_message_id[] = {
 static dissector_handle_t isi_sms_handle;
 static void dissect_isi_sms(tvbuff_t *tvb, packet_info *pinfo, proto_item *tree);
 
-static guint32 hf_isi_sms_message_id = -1;
-static guint32 hf_isi_sms_routing_command = -1;
-static guint32 hf_isi_sms_routing_mode = -1;
-static guint32 hf_isi_sms_route = -1;
-static guint32 hf_isi_sms_subblock_count = -1;
-static guint32 hf_isi_sms_send_status = -1;
-static guint32 hf_isi_sms_common_message_id = -1;
+static gint32 hf_isi_sms_message_id = -1;
+static gint32 hf_isi_sms_routing_command = -1;
+static gint32 hf_isi_sms_routing_mode = -1;
+static gint32 hf_isi_sms_route = -1;
+static gint32 hf_isi_sms_subblock_count = -1;
+static gint32 hf_isi_sms_send_status = -1;
+static gint32 hf_isi_sms_common_message_id = -1;
 
 void proto_reg_handoff_isi_sms(void) {
 	static gboolean initialized=FALSE;
diff --git a/src/isi-ss.c b/src/isi-ss.c
index 9a4f758..f37626f 100644
--- a/src/isi-ss.c
+++ b/src/isi-ss.c
@@ -106,17 +106,16 @@ static const value_string isi_ss_common_message_id[] = {
 static dissector_handle_t isi_ss_handle;
 static void dissect_isi_ss(tvbuff_t *tvb, packet_info *pinfo, proto_item *tree);
 
-static guint32 hf_isi_ss_message_id = -1;
-static guint32 hf_isi_ss_ussd_type = -1;
-static guint32 hf_isi_ss_subblock_count = -1;
-static guint32 hf_isi_ss_subblock = -1;
-static guint32 hf_isi_ss_operation = -1;
-static guint32 hf_isi_ss_service_code = -1;
-static guint32 hf_isi_ss_status_indication = -1;
-static guint32 hf_isi_ss_ussd_length = -1;
-static guint8 hf_isi_ss_ussd_content = -1;
-
-static guint32 hf_isi_ss_common_message_id = -1;
+static gint32 hf_isi_ss_message_id = -1;
+static gint32 hf_isi_ss_ussd_type = -1;
+static gint32 hf_isi_ss_subblock_count = -1;
+static gint32 hf_isi_ss_subblock = -1;
+static gint32 hf_isi_ss_operation = -1;
+static gint32 hf_isi_ss_service_code = -1;
+static gint32 hf_isi_ss_status_indication = -1;
+static gint32 hf_isi_ss_ussd_length = -1;
+
+static gint32 hf_isi_ss_common_message_id = -1;
 
 void proto_reg_handoff_isi_ss(void) {
 	static gboolean initialized=FALSE;
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;
diff --git a/src/packet-isi.h b/src/packet-isi.h
index d9e74cd..9cdfb34 100644
--- a/src/packet-isi.h
+++ b/src/packet-isi.h
@@ -5,13 +5,13 @@
 extern int proto_isi;
 
 /* Subtree variables */
-extern guint32 ett_isi_msg;
-extern guint32 ett_isi_network_gsm_band_info;
-extern guint32 ett_isi_info;
+extern gint32 ett_isi_msg;
+extern gint32 ett_isi_network_gsm_band_info;
+extern gint32 ett_isi_info;
 
-extern guint32 hf_isi_res;
+extern gint32 hf_isi_res;
 
 void dissect_isi_common(const char *resource, tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
-void dissect_isi_subpacket(guint32 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*));
+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*));
 
 #endif