aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-adb_cs.c
diff options
context:
space:
mode:
Diffstat (limited to 'epan/dissectors/packet-adb_cs.c')
-rw-r--r--epan/dissectors/packet-adb_cs.c34
1 files changed, 17 insertions, 17 deletions
diff --git a/epan/dissectors/packet-adb_cs.c b/epan/dissectors/packet-adb_cs.c
index 61f6d89458..e05013716d 100644
--- a/epan/dissectors/packet-adb_cs.c
+++ b/epan/dissectors/packet-adb_cs.c
@@ -19,20 +19,20 @@
#include "packet-adb_service.h"
-static int proto_adb_cs = -1;
+static int proto_adb_cs;
-static int hf_role = -1;
-static int hf_hex_ascii_length = -1;
-static int hf_length = -1;
-static int hf_service = -1;
-static int hf_status = -1;
-static int hf_data = -1;
-static int hf_fail_reason = -1;
+static int hf_role;
+static int hf_hex_ascii_length;
+static int hf_length;
+static int hf_service;
+static int hf_status;
+static int hf_data;
+static int hf_fail_reason;
-static gint ett_adb_cs = -1;
-static gint ett_length = -1;
+static gint ett_adb_cs;
+static gint ett_length;
-static expert_field ei_incomplete_message = EI_INIT;
+static expert_field ei_incomplete_message;
static dissector_handle_t adb_cs_handle;
static dissector_handle_t adb_service_handle;
@@ -163,7 +163,7 @@ dissect_adb_cs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _
adb_service_data.session_key[1] = pinfo->destport;
adb_service_data.session_key[2] = pinfo->srcport;
- next_tvb = tvb_new_subset_length_caplen(tvb, offset, tvb_captured_length_remaining(tvb, offset), tvb_captured_length_remaining(tvb, offset));
+ next_tvb = tvb_new_subset_remaining(tvb, offset);
call_dissector_with_data(adb_service_handle, next_tvb, pinfo, tree, &adb_service_data);
return tvb_captured_length(tvb);
@@ -338,7 +338,7 @@ dissect_adb_cs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _
adb_service_data.session_key[1] = pinfo->destport;
adb_service_data.session_key[2] = pinfo->srcport;
- next_tvb = tvb_new_subset_length_caplen(tvb, offset, tvb_captured_length_remaining(tvb, offset), tvb_captured_length_remaining(tvb, offset));
+ next_tvb = tvb_new_subset_remaining(tvb, offset);
call_dissector_with_data(adb_service_handle, next_tvb, pinfo, tree, &adb_service_data);
offset = tvb_captured_length(tvb);
} else {
@@ -369,7 +369,7 @@ proto_register_adb_cs(void)
},
{ &hf_hex_ascii_length,
{ "Hex ASCII Length", "adb_cs.hex_ascii_length",
- FT_STRING, STR_ASCII, NULL, 0x00,
+ FT_STRING, BASE_NONE, NULL, 0x00,
NULL, HFILL }
},
{ &hf_length,
@@ -379,17 +379,17 @@ proto_register_adb_cs(void)
},
{ &hf_service,
{ "Service", "adb_cs.service",
- FT_STRING, STR_ASCII, NULL, 0x00,
+ FT_STRING, BASE_NONE, NULL, 0x00,
NULL, HFILL }
},
{ &hf_fail_reason,
{ "Fail Reason", "adb_cs.fail_reason",
- FT_STRING, STR_ASCII, NULL, 0x00,
+ FT_STRING, BASE_NONE, NULL, 0x00,
NULL, HFILL }
},
{ &hf_status,
{ "Status", "adb_cs.status",
- FT_STRING, STR_ASCII, NULL, 0x00,
+ FT_STRING, BASE_NONE, NULL, 0x00,
NULL, HFILL }
},
{ &hf_data,