diff options
| author | Felix Ruess <felix.ruess@roboception.de> | 2017-10-09 17:01:24 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2017-10-10 08:23:27 +0000 |
| commit | 6b466a9e4fccae694c2ae6607ad5c5b28dfff303 (patch) | |
| tree | 01a528abb77907cb88c90ea550021b96ae26e9f2 | |
| parent | d72a18faad55d6f47af47acfb9d9270015bad2e2 (diff) | |
[gvcp] fix extendedblockids check and resend cmd parsing
Change-Id: I9e0314ae2e975a1c50cfaf2b00e469ad7f640357
Reviewed-on: https://code.wireshark.org/review/23866
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
| -rw-r--r-- | epan/dissectors/packet-gvcp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-gvcp.c b/epan/dissectors/packet-gvcp.c index 85e7294317..f969bf8919 100644 --- a/epan/dissectors/packet-gvcp.c +++ b/epan/dissectors/packet-gvcp.c @@ -1343,8 +1343,8 @@ static void dissect_packetresend_cmd(proto_tree *gvcp_telegram_tree, tvbuff_t *t { guint64 highid; guint64 lowid; - highid = tvb_get_ntoh64(tvb, offset + 12); - lowid = tvb_get_ntoh64(tvb, offset + 16); + highid = tvb_get_ntohl(tvb, offset + 12); + lowid = tvb_get_ntohl(tvb, offset + 16); block_id = lowid | (highid << 32); } @@ -2196,7 +2196,7 @@ static int dissect_gvcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi offset++; /* Add the flags */ - flags = (gchar) tvb_get_guint8(tvb, offset + 1); + flags = (gchar) tvb_get_guint8(tvb, offset); item = proto_tree_add_item(gvcp_tree, hf_gvcp_flag, tvb, offset, 1, ENC_BIG_ENDIAN); gvcp_tree_flag = proto_item_add_subtree(item, ett_gvcp_flags); if (command == GVCP_ACTION_CMD) |