osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

From Michal Labedzki: 

Bluetooth: minor fix in HID
Applied by hand and changed offset to be signed as per WS convention.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7639

svn path=/trunk/; revision=44896
This commit is contained in:
Anders Broman 2012-09-14 11:27:57 +00:00
parent 19f6a77cee
commit 6292b7c119
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -3469,6 +3469,7 @@ Tobias Rutz <tobias.rutz[at]work-microwave.de> {
Michal Labedzki <michal.labedzki[at]tieto.com> {
Bluetooth BNEP dissector
Bluetooth HID dissector
}

10
epan/dissectors/packet-bthid.c
View File

@ -399,8 +399,8 @@ static const value_string keycode_vals[] = {
value_string_ext keycode_vals_ext = VALUE_STRING_EXT_INIT(keycode_vals);
static unsigned int
dissect_hid_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset, unsigned int report_type)
static int
dissect_hid_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, unsigned int report_type)
{
unsigned int protocol_code;
unsigned int shortcut_helper = 0;
@ -681,7 +681,7 @@ dissect_bthid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
proto_item *ti;
proto_tree *bthid_tree;
unsigned int offset = 0;
int offset = 0;
unsigned int transaction_type;
unsigned int parameter;
unsigned int protocol;
@ -711,7 +711,7 @@ dissect_bthid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
break;
}
ti = proto_tree_add_item(tree, proto_bthid, tvb, offset, -1, FALSE);
ti = proto_tree_add_item(tree, proto_bthid, tvb, offset, -1, ENC_NA);
bthid_tree = proto_item_add_subtree(ti, ett_bthid);
proto_tree_add_item(bthid_tree, hf_bthid_transaction_type, tvb, offset, 1, ENC_BIG_ENDIAN);
@ -806,7 +806,7 @@ dissect_bthid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
break;
}
if (tvb_length(tvb) > offset) {
if ((int)tvb_length(tvb) > offset) {
proto_tree_add_item(bthid_tree, hf_bthid_data, tvb, offset, -1, ENC_BIG_ENDIAN);
offset += tvb_length_remaining(tvb, offset);
}