From 6b466a9e4fccae694c2ae6607ad5c5b28dfff303 Mon Sep 17 00:00:00 2001 From: Felix Ruess Date: Mon, 9 Oct 2017 17:01:24 +0200 Subject: [gvcp] fix extendedblockids check and resend cmd parsing Change-Id: I9e0314ae2e975a1c50cfaf2b00e469ad7f640357 Reviewed-on: https://code.wireshark.org/review/23866 Reviewed-by: Michael Mann Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman --- epan/dissectors/packet-gvcp.c | 6 +++--- 1 file 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) -- cgit v1.2.3